#
# gdb helper commands and functions for Linux kernel debugging
#
#  loader module
#
# Copyright (c) Siemens AG, 2012, 2013
#
# Authors:
#  Jan Kiszka <jan.kiszka@siemens.com>
#
# This work is licensed under the terms of the GNU GPL version 2.
#

import os

sys.path.insert(0, os.path.dirname(__file__) + "/scripts/gdb")

try:
    gdb.parse_and_eval("0")
    gdb.execute("", to_string=True)
except:
    gdb.write("NOTE: gdb 7.2 or later required for Linux helper scripts to "
              "work.\n")
else:
    import linux.utils
    import linux.symbols
    import linux.modules
    import linux.dmesg
    import linux.tasks
    import linux.config
    import linux.cpus
    import linux.lists
    import linux.rbtree
    import linux.proc
    import linux.constants
    import linux.timerlist
    import linux.clk
    import linux.genpd
    import linux.device
rnel tree</td><td class='sub right'>Russell King</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit/linux.git/'>summary</a><a href='/cgit/linux.git/refs/?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>refs</a><a href='/cgit/linux.git/log/'>log</a><a href='/cgit/linux.git/tree/?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>tree</a><a href='/cgit/linux.git/commit/?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>commit</a><a class='active' href='/cgit/linux.git/diff/?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/linux.git/log/'>
<input type='hidden' name='id' value='e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><div class='diffstat-header'><a href='/cgit/linux.git/diff/?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Diffstat</a></div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/.mailmap?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>.mailmap</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/00-INDEX?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/00-INDEX</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/ABI/testing/sysfs-class-regulator?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/ABI/testing/sysfs-class-regulator</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/ABI/testing/sysfs-firmware-sgi_uv?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/ABI/testing/sysfs-firmware-sgi_uv</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/ABI/testing/sysfs-gpio?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/ABI/testing/sysfs-gpio</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/DocBook/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/kgdb.tmpl?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/DocBook/kgdb.tmpl</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/procfs_example.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/DocBook/procfs_example.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/s390-drivers.tmpl?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/DocBook/s390-drivers.tmpl</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/DocBook/sh.tmpl?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/DocBook/sh.tmpl</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/videobook.tmpl?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/DocBook/videobook.tmpl</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/z8530book.tmpl?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/DocBook/z8530book.tmpl</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/accounting/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/accounting/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/accounting/getdelays.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/accounting/getdelays.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/arm/IXP4xx?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/arm/IXP4xx</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/arm/Interrupts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/arm/Interrupts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/arm/README?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/arm/README</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/arm/Samsung-S3C24XX/GPIO.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/arm/Samsung-S3C24XX/GPIO.txt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/arm/Samsung-S3C24XX/Overview.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/arm/Samsung-S3C24XX/Overview.txt</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/arm/Samsung-S3C24XX/USB-Host.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/arm/Samsung-S3C24XX/USB-Host.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/auxdisplay/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/auxdisplay/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/cciss.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/cciss.txt</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/Documentation/cli-sti-removal.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/cli-sti-removal.txt</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/connector/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/connector/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/cpu-hotplug.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/cpu-hotplug.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/cpusets.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/cpusets.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/devices.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/devices.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/dontdiff?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/dontdiff</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/feature-removal-schedule.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/feature-removal-schedule.txt</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/Locking?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/Locking</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/filesystems/configfs/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/configfs/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/configfs/configfs.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/configfs/configfs.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/Documentation/filesystems/configfs/configfs_example_explicit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/configfs/configfs_example_explicit.c</a> (renamed from Documentation/filesystems/configfs/configfs_example.c)</td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/filesystems/configfs/configfs_example_macros.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/configfs/configfs_example_macros.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/ext4.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/ext4.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/ntfs.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/ntfs.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/proc.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/proc.txt</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/quota.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/quota.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/ubifs.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/ubifs.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/ftrace.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/ftrace.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/hwmon/dme1737?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/hwmon/dme1737</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/hwmon/ibmaem?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/hwmon/ibmaem</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/hwmon/it87?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/hwmon/it87</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/hwmon/lm85?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/hwmon/lm85</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/hwmon/w83627hf?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/hwmon/w83627hf</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/hwmon/w83791d?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/hwmon/w83791d</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/ia64/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/ia64/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/ioctl-number.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/ioctl-number.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/ja_JP/HOWTO?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/ja_JP/HOWTO</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/ja_JP/SubmitChecklist?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/ja_JP/SubmitChecklist</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/kernel-parameters.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/kernel-parameters.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/laptops/thinkpad-acpi.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/laptops/thinkpad-acpi.txt</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/lguest/lguest.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/lguest/lguest.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/networking/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/networking/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/networking/ifenslave.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/networking/ifenslave.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/pcmcia/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/pcmcia/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/pcmcia/crc32hash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/pcmcia/crc32hash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/power/pm_qos_interface.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/power/pm_qos_interface.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/power/power_supply_class.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/power/power_supply_class.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/power/regulator/consumer.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/power/regulator/consumer.txt</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/power/regulator/machine.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/power/regulator/machine.txt</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/power/regulator/overview.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/power/regulator/overview.txt</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/power/regulator/regulator.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/power/regulator/regulator.txt</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/powerpc/00-INDEX?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/powerpc/00-INDEX</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/Documentation/powerpc/SBC8260_memory_mapping.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/powerpc/SBC8260_memory_mapping.txt</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/powerpc/booting-without-of.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/powerpc/booting-without-of.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/powerpc/dts-bindings/fsl/cpm_qe/serial.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/powerpc/dts-bindings/fsl/cpm_qe/serial.txt</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/powerpc/eeh-pci-error-recovery.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/powerpc/eeh-pci-error-recovery.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/rfkill.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/rfkill.txt</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/scsi/ChangeLog.megaraid_sas?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/scsi/ChangeLog.megaraid_sas</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/sound/alsa/ALSA-Configuration.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/sound/alsa/ALSA-Configuration.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/spi/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/spi/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/spi/pxa2xx?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/spi/pxa2xx</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/spi/spi-summary?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/spi/spi-summary</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/Documentation/usb/auerswald.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/usb/auerswald.txt</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/usb/power-management.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/usb/power-management.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/CARDLIST.au0828?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/video4linux/CARDLIST.au0828</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/video4linux/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/video4linux/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/gspca.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/video4linux/gspca.txt</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/vm/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/vm/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/vm/page_migration?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/vm/page_migration</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/watchdog/src/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/watchdog/src/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/MAINTAINERS?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>MAINTAINERS</a></td><td class='right'>354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/8253pit.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/8253pit.h</a> (renamed from include/asm-alpha/8253pit.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/Kbuild</a> (renamed from include/asm-alpha/Kbuild)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/a.out-core.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/a.out-core.h</a> (renamed from include/asm-alpha/a.out-core.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/a.out.h</a> (renamed from include/asm-alpha/a.out.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/agp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/agp.h</a> (renamed from include/asm-alpha/agp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/agp_backend.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/agp_backend.h</a> (renamed from include/asm-alpha/agp_backend.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/atomic.h</a> (renamed from include/asm-alpha/atomic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/auxvec.h</a> (renamed from include/asm-alpha/auxvec.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/barrier.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/barrier.h</a> (renamed from include/asm-alpha/barrier.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/bitops.h</a> (renamed from include/asm-alpha/bitops.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/bug.h</a> (renamed from include/asm-alpha/bug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/bugs.h</a> (renamed from include/asm-alpha/bugs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/byteorder.h</a> (renamed from include/asm-alpha/byteorder.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/cache.h</a> (renamed from include/asm-alpha/cache.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/cacheflush.h</a> (renamed from include/asm-alpha/cacheflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/checksum.h</a> (renamed from include/asm-alpha/checksum.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/compiler.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/compiler.h</a> (renamed from include/asm-alpha/compiler.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/console.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/console.h</a> (renamed from include/asm-alpha/console.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/core_apecs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_apecs.h</a> (renamed from include/asm-alpha/core_apecs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/core_cia.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_cia.h</a> (renamed from include/asm-alpha/core_cia.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/core_irongate.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_irongate.h</a> (renamed from include/asm-alpha/core_irongate.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/core_lca.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_lca.h</a> (renamed from include/asm-alpha/core_lca.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/core_marvel.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_marvel.h</a> (renamed from include/asm-alpha/core_marvel.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/core_mcpcia.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_mcpcia.h</a> (renamed from include/asm-alpha/core_mcpcia.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/core_polaris.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_polaris.h</a> (renamed from include/asm-alpha/core_polaris.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/core_t2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_t2.h</a> (renamed from include/asm-alpha/core_t2.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/core_titan.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_titan.h</a> (renamed from include/asm-alpha/core_titan.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/core_tsunami.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_tsunami.h</a> (renamed from include/asm-alpha/core_tsunami.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/core_wildfire.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_wildfire.h</a> (renamed from include/asm-alpha/core_wildfire.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/cputime.h</a> (renamed from include/asm-alpha/cputime.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/current.h</a> (renamed from include/asm-alpha/current.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/delay.h</a> (renamed from include/asm-alpha/delay.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/device.h</a> (renamed from include/asm-alpha/device.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/div64.h</a> (renamed from include/asm-alpha/div64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/dma-mapping.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/dma-mapping.h</a> (renamed from include/asm-alpha/dma-mapping.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/dma.h</a> (renamed from include/asm-alpha/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/elf.h</a> (renamed from include/asm-alpha/elf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/emergency-restart.h</a> (renamed from include/asm-alpha/emergency-restart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/err_common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/err_common.h</a> (renamed from include/asm-alpha/err_common.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/err_ev6.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/err_ev6.h</a> (renamed from include/asm-alpha/err_ev6.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/err_ev7.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/err_ev7.h</a> (renamed from include/asm-alpha/err_ev7.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/errno.h</a> (renamed from include/asm-alpha/errno.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/fb.h</a> (renamed from include/asm-alpha/fb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/fcntl.h</a> (renamed from include/asm-alpha/fcntl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/floppy.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/floppy.h</a> (renamed from include/asm-alpha/floppy.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/fpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/fpu.h</a> (renamed from include/asm-alpha/fpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/futex.h</a> (renamed from include/asm-alpha/futex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/gct.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/gct.h</a> (renamed from include/asm-alpha/gct.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/gentrap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/gentrap.h</a> (renamed from include/asm-alpha/gentrap.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/hardirq.h</a> (renamed from include/asm-alpha/hardirq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/hw_irq.h</a> (renamed from include/asm-alpha/hw_irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/hwrpb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/hwrpb.h</a> (renamed from include/asm-alpha/hwrpb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/io.h</a> (renamed from include/asm-alpha/io.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/io_trivial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/io_trivial.h</a> (renamed from include/asm-alpha/io_trivial.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/ioctl.h</a> (renamed from include/asm-alpha/ioctl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/ioctls.h</a> (renamed from include/asm-alpha/ioctls.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/ipcbuf.h</a> (renamed from include/asm-alpha/ipcbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/irq.h</a> (renamed from include/asm-alpha/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/irq_regs.h</a> (renamed from include/asm-alpha/irq_regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/jensen.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/jensen.h</a> (renamed from include/asm-alpha/jensen.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/kdebug.h</a> (renamed from include/asm-alpha/kdebug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/kmap_types.h</a> (renamed from include/asm-alpha/kmap_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/linkage.h</a> (renamed from include/asm-alpha/linkage.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/local.h</a> (renamed from include/asm-alpha/local.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/machvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/machvec.h</a> (renamed from include/asm-alpha/machvec.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/mc146818rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/mc146818rtc.h</a> (renamed from include/asm-alpha/mc146818rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/md.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/md.h</a> (renamed from include/asm-alpha/md.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/mman.h</a> (renamed from include/asm-alpha/mman.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/mmu.h</a> (renamed from include/asm-alpha/mmu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/mmu_context.h</a> (renamed from include/asm-alpha/mmu_context.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/mmzone.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/mmzone.h</a> (renamed from include/asm-alpha/mmzone.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/module.h</a> (renamed from include/asm-alpha/module.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/msgbuf.h</a> (renamed from include/asm-alpha/msgbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/mutex.h</a> (renamed from include/asm-alpha/mutex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/page.h</a> (renamed from include/asm-alpha/page.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/pal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/pal.h</a> (renamed from include/asm-alpha/pal.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/param.h</a> (renamed from include/asm-alpha/param.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/parport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/parport.h</a> (renamed from include/asm-alpha/parport.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/pci.h</a> (renamed from include/asm-alpha/pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/percpu.h</a> (renamed from include/asm-alpha/percpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/pgalloc.h</a> (renamed from include/asm-alpha/pgalloc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/pgtable.h</a> (renamed from include/asm-alpha/pgtable.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/poll.h</a> (renamed from include/asm-alpha/poll.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/posix_types.h</a> (renamed from include/asm-alpha/posix_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/processor.h</a> (renamed from include/asm-alpha/processor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/ptrace.h</a> (renamed from include/asm-alpha/ptrace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/reg.h</a> (renamed from include/asm-alpha/reg.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/regdef.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/regdef.h</a> (renamed from include/asm-alpha/regdef.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/resource.h</a> (renamed from include/asm-alpha/resource.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/rtc.h</a> (renamed from include/asm-alpha/rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/rwsem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/rwsem.h</a> (renamed from include/asm-alpha/rwsem.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/scatterlist.h</a> (renamed from include/asm-alpha/scatterlist.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/sections.h</a> (renamed from include/asm-alpha/sections.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/segment.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/segment.h</a> (renamed from include/asm-alpha/segment.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/sembuf.h</a> (renamed from include/asm-alpha/sembuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/serial.h</a> (renamed from include/asm-alpha/serial.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/setup.h</a> (renamed from include/asm-alpha/setup.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/sfp-machine.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/sfp-machine.h</a> (renamed from include/asm-alpha/sfp-machine.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/shmbuf.h</a> (renamed from include/asm-alpha/shmbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/shmparam.h</a> (renamed from include/asm-alpha/shmparam.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/sigcontext.h</a> (renamed from include/asm-alpha/sigcontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/siginfo.h</a> (renamed from include/asm-alpha/siginfo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/signal.h</a> (renamed from include/asm-alpha/signal.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/smp.h</a> (renamed from include/asm-alpha/smp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/socket.h</a> (renamed from include/asm-alpha/socket.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/sockios.h</a> (renamed from include/asm-alpha/sockios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/spinlock.h</a> (renamed from include/asm-alpha/spinlock.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/spinlock_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/spinlock_types.h</a> (renamed from include/asm-alpha/spinlock_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/stat.h</a> (renamed from include/asm-alpha/stat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/statfs.h</a> (renamed from include/asm-alpha/statfs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/string.h</a> (renamed from include/asm-alpha/string.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/suspend.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/suspend.h</a> (renamed from include/asm-alpha/suspend.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/sysinfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/sysinfo.h</a> (renamed from include/asm-alpha/sysinfo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/system.h</a> (renamed from include/asm-alpha/system.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/termbits.h</a> (renamed from include/asm-alpha/termbits.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/termios.h</a> (renamed from include/asm-alpha/termios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/thread_info.h</a> (renamed from include/asm-alpha/thread_info.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/timex.h</a> (renamed from include/asm-alpha/timex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/tlb.h</a> (renamed from include/asm-alpha/tlb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/tlbflush.h</a> (renamed from include/asm-alpha/tlbflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/topology.h</a> (renamed from include/asm-alpha/topology.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/types.h</a> (renamed from include/asm-alpha/types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/uaccess.h</a> (renamed from include/asm-alpha/uaccess.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/ucontext.h</a> (renamed from include/asm-alpha/ucontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/unaligned.h</a> (renamed from include/asm-alpha/unaligned.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/unistd.h</a> (renamed from include/asm-alpha/unistd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/user.h</a> (renamed from include/asm-alpha/user.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/vga.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/vga.h</a> (renamed from include/asm-alpha/vga.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/xor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/xor.h</a> (renamed from include/asm-alpha/xor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/osf_sys.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/kernel/osf_sys.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/Makefile</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/compressed/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/boot/compressed/.gitignore</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/compressed/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/boot/compressed/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/compressed/head-xscale.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/boot/compressed/head-xscale.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/compressed/head.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/boot/compressed/head.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/compressed/misc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/boot/compressed/misc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/dmabounce.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/common/dmabounce.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/locomo.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/common/locomo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/sa1111.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/common/sa1111.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/sharpsl_pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/common/sharpsl_pm.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/time-acorn.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/common/time-acorn.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/uengine.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/common/uengine.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/ams_delta_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/ams_delta_defconfig</a></td><td class='right'>1314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/at91cap9adk_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/at91cap9adk_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/at91sam9260ek_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/at91sam9260ek_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/at91sam9261ek_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/at91sam9261ek_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/at91sam9263ek_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/at91sam9263ek_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/at91sam9g20ek_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/at91sam9g20ek_defconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/at91sam9rlek_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/at91sam9rlek_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/cam60_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/cam60_defconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/n770_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/n770_defconfig</a></td><td class='right'>1421</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/omap_2430sdp_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_2430sdp_defconfig</a></td><td class='right'>1304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/omap_apollon_2420_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_apollon_2420_defconfig</a></td><td class='right'>962</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/omap_generic_1510_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_generic_1510_defconfig</a></td><td class='right'>1172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/omap_generic_1610_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_generic_1610_defconfig</a></td><td class='right'>1178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/omap_generic_1710_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_generic_1710_defconfig</a></td><td class='right'>1088</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/omap_generic_2420_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_generic_2420_defconfig</a></td><td class='right'>655</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/omap_h2_1610_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_h2_1610_defconfig</a></td><td class='right'>509</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/omap_h4_2420_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_h4_2420_defconfig</a></td><td class='right'>1120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/omap_innovator_1510_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_innovator_1510_defconfig</a></td><td class='right'>1253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/omap_innovator_1610_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_innovator_1610_defconfig</a></td><td class='right'>839</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/omap_osk_5912_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_osk_5912_defconfig</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/omap_perseus2_730_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_perseus2_730_defconfig</a></td><td class='right'>928</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/orion5x_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/orion5x_defconfig</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/palmte_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/palmte_defconfig</a></td><td class='right'>761</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/palmtt_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/palmtt_defconfig</a></td><td class='right'>844</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/palmz71_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/palmz71_defconfig</a></td><td class='right'>891</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/qil-a9260_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/qil-a9260_defconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/sam9_l9260_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/sam9_l9260_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/sx1_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/sx1_defconfig</a></td><td class='right'>1118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/usb-a9260_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/usb-a9260_defconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/usb-a9263_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/usb-a9263_defconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/yl9200_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/yl9200_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/Kbuild</a> (renamed from include/asm-arm/Kbuild)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/a.out-core.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/a.out-core.h</a> (renamed from include/asm-arm/a.out-core.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/a.out.h</a> (renamed from include/asm-arm/a.out.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/assembler.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/assembler.h</a> (renamed from include/asm-arm/assembler.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/atomic.h</a> (renamed from include/asm-arm/atomic.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/auxvec.h</a> (renamed from include/asm-arm/auxvec.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/bitops.h</a> (renamed from include/asm-arm/bitops.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/bug.h</a> (renamed from include/asm-arm/bug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/bugs.h</a> (renamed from include/asm-arm/bugs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/byteorder.h</a> (renamed from include/asm-arm/byteorder.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/cache.h</a> (renamed from include/asm-arm/cache.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/cacheflush.h</a> (renamed from include/asm-arm/cacheflush.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/checksum.h</a> (renamed from include/asm-arm/checksum.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/cnt32_to_63.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/cnt32_to_63.h</a> (renamed from include/asm-arm/cnt32_to_63.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/cpu-multi32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/cpu-multi32.h</a> (renamed from include/asm-arm/cpu-multi32.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/cpu-single.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/cpu-single.h</a> (renamed from include/asm-arm/cpu-single.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/cpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/cpu.h</a> (renamed from include/asm-arm/cpu.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/cputime.h</a> (renamed from include/asm-arm/cputime.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/current.h</a> (renamed from include/asm-arm/current.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/delay.h</a> (renamed from include/asm-arm/delay.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/device.h</a> (renamed from include/asm-arm/device.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/div64.h</a> (renamed from include/asm-arm/div64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/dma-mapping.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/dma-mapping.h</a> (renamed from include/asm-arm/dma-mapping.h)</td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/dma.h</a> (renamed from include/asm-arm/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/domain.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/domain.h</a> (renamed from include/asm-arm/domain.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/ecard.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/ecard.h</a> (renamed from include/asm-arm/ecard.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/elf.h</a> (renamed from include/asm-arm/elf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/emergency-restart.h</a> (renamed from include/asm-arm/emergency-restart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/errno.h</a> (renamed from include/asm-arm/errno.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/fb.h</a> (renamed from include/asm-arm/fb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/fcntl.h</a> (renamed from include/asm-arm/fcntl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/fiq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/fiq.h</a> (renamed from include/asm-arm/fiq.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/flat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/flat.h</a> (renamed from include/asm-arm/flat.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/floppy.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/floppy.h</a> (renamed from include/asm-arm/floppy.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/fpstate.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/fpstate.h</a> (renamed from include/asm-arm/fpstate.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/ftrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/ftrace.h</a> (renamed from include/asm-arm/ftrace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/futex.h</a> (renamed from include/asm-arm/futex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/glue.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/glue.h</a> (renamed from include/asm-arm/glue.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/gpio.h</a> (renamed from include/asm-arm/gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardirq.h</a> (renamed from include/asm-arm/hardirq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/arm_timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/arm_timer.h</a> (renamed from include/asm-arm/hardware/arm_timer.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/arm_twd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/arm_twd.h</a> (renamed from include/asm-arm/hardware/arm_twd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/cache-l2x0.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/cache-l2x0.h</a> (renamed from include/asm-arm/hardware/cache-l2x0.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/clps7111.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/clps7111.h</a> (renamed from include/asm-arm/hardware/clps7111.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/cs89712.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/cs89712.h</a> (renamed from include/asm-arm/hardware/cs89712.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/debug-8250.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/debug-8250.S</a> (renamed from include/asm-arm/hardware/debug-8250.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/debug-pl01x.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/debug-pl01x.S</a> (renamed from include/asm-arm/hardware/debug-pl01x.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/dec21285.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/dec21285.h</a> (renamed from include/asm-arm/hardware/dec21285.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/entry-macro-iomd.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/entry-macro-iomd.S</a> (renamed from include/asm-arm/hardware/entry-macro-iomd.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/ep7211.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/ep7211.h</a> (renamed from include/asm-arm/hardware/ep7211.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/ep7212.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/ep7212.h</a> (renamed from include/asm-arm/hardware/ep7212.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/gic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/gic.h</a> (renamed from include/asm-arm/hardware/gic.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/icst307.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/icst307.h</a> (renamed from include/asm-arm/hardware/icst307.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/icst525.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/icst525.h</a> (renamed from include/asm-arm/hardware/icst525.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/ioc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/ioc.h</a> (renamed from include/asm-arm/hardware/ioc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/iomd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/iomd.h</a> (renamed from include/asm-arm/hardware/iomd.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/iop3xx-adma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/iop3xx-adma.h</a> (renamed from include/asm-arm/hardware/iop3xx-adma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/iop3xx-gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/iop3xx-gpio.h</a> (renamed from include/asm-arm/hardware/iop3xx-gpio.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/iop3xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/iop3xx.h</a> (renamed from include/asm-arm/hardware/iop3xx.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/iop_adma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/iop_adma.h</a> (renamed from include/asm-arm/hardware/iop_adma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/it8152.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/it8152.h</a> (renamed from include/asm-arm/hardware/it8152.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/linkup-l1110.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/linkup-l1110.h</a> (renamed from include/asm-arm/hardware/linkup-l1110.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/locomo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/locomo.h</a> (renamed from include/asm-arm/hardware/locomo.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/memc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/memc.h</a> (renamed from include/asm-arm/hardware/memc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/pci_v3.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/pci_v3.h</a> (renamed from include/asm-arm/hardware/pci_v3.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/sa1111.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/sa1111.h</a> (renamed from include/asm-arm/hardware/sa1111.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/scoop.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/scoop.h</a> (renamed from include/asm-arm/hardware/scoop.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/sharpsl_pm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/sharpsl_pm.h</a> (renamed from include/asm-arm/hardware/sharpsl_pm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/ssp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/ssp.h</a> (renamed from include/asm-arm/hardware/ssp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/uengine.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/uengine.h</a> (renamed from include/asm-arm/hardware/uengine.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/vic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/vic.h</a> (renamed from include/asm-arm/hardware/vic.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hw_irq.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hwcap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hwcap.h</a> (renamed from include/asm-arm/hwcap.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/ide.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/ide.h</a> (renamed from include/asm-arm/ide.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/io.h</a> (renamed from include/asm-arm/io.h)</td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/ioctl.h</a> (renamed from include/asm-arm/ioctl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/ioctls.h</a> (renamed from include/asm-arm/ioctls.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/ipcbuf.h</a> (renamed from include/asm-arm/ipcbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/irq.h</a> (renamed from include/asm-arm/irq.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/irq_regs.h</a> (renamed from include/asm-arm/irq_regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/irqflags.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/irqflags.h</a> (renamed from include/asm-arm/irqflags.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/kdebug.h</a> (renamed from include/asm-arm/kdebug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/kexec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/kexec.h</a> (renamed from include/asm-arm/kexec.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/kgdb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/kgdb.h</a> (renamed from include/asm-arm/kgdb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/kmap_types.h</a> (renamed from include/asm-arm/kmap_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/kprobes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/kprobes.h</a> (renamed from include/asm-arm/kprobes.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/leds.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/leds.h</a> (renamed from include/asm-arm/leds.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/limits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/limits.h</a> (renamed from include/asm-arm/limits.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/linkage.h</a> (renamed from include/asm-arm/linkage.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/local.h</a> (renamed from include/asm-arm/local.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/locks.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/locks.h</a> (renamed from include/asm-arm/locks.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mach/arch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/arch.h</a> (renamed from include/asm-arm/mach/arch.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/dma.h</a> (renamed from include/asm-arm/mach/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mach/flash.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/flash.h</a> (renamed from include/asm-arm/mach/flash.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mach/irda.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/irda.h</a> (renamed from include/asm-arm/mach/irda.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/irq.h</a> (renamed from include/asm-arm/mach/irq.h)</td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mach/map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/map.h</a> (renamed from include/asm-arm/mach/map.h)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mach/mmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/mmc.h</a> (renamed from include/asm-arm/mach/mmc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mach/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/pci.h</a> (renamed from include/asm-arm/mach/pci.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mach/serial_at91.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/serial_at91.h</a> (renamed from include/asm-avr32/mach/serial_at91.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mach/serial_sa1100.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/serial_sa1100.h</a> (renamed from include/asm-arm/mach/serial_sa1100.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mach/sharpsl_param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/sharpsl_param.h</a> (renamed from include/asm-arm/mach/sharpsl_param.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mach/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/time.h</a> (renamed from include/asm-arm/mach/time.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mach/udc_pxa2xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/udc_pxa2xx.h</a> (renamed from include/asm-arm/mach/udc_pxa2xx.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mc146818rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mc146818rtc.h</a> (renamed from include/asm-arm/mc146818rtc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/memory.h</a> (renamed from include/asm-arm/memory.h)</td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mman.h</a> (renamed from include/asm-arm/mman.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mmu.h</a> (renamed from include/asm-arm/mmu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mmu_context.h</a> (renamed from include/asm-arm/mmu_context.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mmzone.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mmzone.h</a> (renamed from include/asm-arm/mmzone.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/module.h</a> (renamed from include/asm-arm/module.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/msgbuf.h</a> (renamed from include/asm-arm/msgbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mtd-xip.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mtd-xip.h</a> (renamed from include/asm-arm/mtd-xip.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mutex.h</a> (renamed from include/asm-arm/mutex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/nwflash.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/nwflash.h</a> (renamed from include/asm-arm/nwflash.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/page-nommu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/page-nommu.h</a> (renamed from include/asm-arm/page-nommu.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/page.h</a> (renamed from include/asm-arm/page.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/param.h</a> (renamed from include/asm-arm/param.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/parport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/parport.h</a> (renamed from include/asm-arm/parport.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/pci.h</a> (renamed from include/asm-arm/pci.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/percpu.h</a> (renamed from include/asm-arm/percpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/pgalloc.h</a> (renamed from include/asm-arm/pgalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/pgtable-hwdef.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/pgtable-hwdef.h</a> (renamed from include/asm-arm/pgtable-hwdef.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/pgtable-nommu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/pgtable-nommu.h</a> (renamed from include/asm-arm/pgtable-nommu.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/pgtable.h</a> (renamed from include/asm-arm/pgtable.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/poll.h</a> (renamed from include/asm-arm/poll.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/posix_types.h</a> (renamed from include/asm-arm/posix_types.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/proc-fns.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/proc-fns.h</a> (renamed from include/asm-arm/proc-fns.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/processor.h</a> (renamed from include/asm-arm/processor.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/procinfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/procinfo.h</a> (renamed from include/asm-arm/procinfo.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/ptrace.h</a> (renamed from include/asm-arm/ptrace.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/resource.h</a> (renamed from include/asm-arm/resource.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/scatterlist.h</a> (renamed from include/asm-arm/scatterlist.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/sections.h</a> (renamed from include/asm-arm/sections.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/segment.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/segment.h</a> (renamed from include/asm-arm/segment.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/sembuf.h</a> (renamed from include/asm-arm/sembuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/serial.h</a> (renamed from include/asm-arm/serial.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/setup.h</a> (renamed from include/asm-arm/setup.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/shmbuf.h</a> (renamed from include/asm-arm/shmbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/shmparam.h</a> (renamed from include/asm-arm/shmparam.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/sigcontext.h</a> (renamed from include/asm-arm/sigcontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/siginfo.h</a> (renamed from include/asm-arm/siginfo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/signal.h</a> (renamed from include/asm-arm/signal.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/sizes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/sizes.h</a> (renamed from include/asm-arm/sizes.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/smp.h</a> (renamed from include/asm-arm/smp.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/socket.h</a> (renamed from include/asm-arm/socket.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/sockios.h</a> (renamed from include/asm-arm/sockios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/sparsemem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/sparsemem.h</a> (renamed from include/asm-arm/sparsemem.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/spinlock.h</a> (renamed from include/asm-arm/spinlock.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/spinlock_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/spinlock_types.h</a> (renamed from include/asm-arm/spinlock_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/stat.h</a> (renamed from include/asm-arm/stat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/statfs.h</a> (renamed from include/asm-arm/statfs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/string.h</a> (renamed from include/asm-arm/string.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/suspend.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/suspend.h</a> (renamed from include/asm-arm/suspend.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/system.h</a> (renamed from include/asm-arm/system.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/termbits.h</a> (renamed from include/asm-arm/termbits.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/termios.h</a> (renamed from include/asm-arm/termios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/therm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/therm.h</a> (renamed from include/asm-arm/therm.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/thread_info.h</a> (renamed from include/asm-arm/thread_info.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/thread_notify.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/thread_notify.h</a> (renamed from include/asm-arm/thread_notify.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/timex.h</a> (renamed from include/asm-arm/timex.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/tlb.h</a> (renamed from include/asm-arm/tlb.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/tlbflush.h</a> (renamed from include/asm-arm/tlbflush.h)</td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/topology.h</a> (renamed from include/asm-arm/topology.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/traps.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/traps.h</a> (renamed from include/asm-arm/traps.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/types.h</a> (renamed from include/asm-arm/types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/uaccess.h</a> (renamed from include/asm-arm/uaccess.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/ucontext.h</a> (renamed from include/asm-arm/ucontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/unaligned.h</a> (renamed from include/asm-arm/unaligned.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/unistd.h</a> (renamed from include/asm-arm/unistd.h)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/user.h</a> (renamed from include/asm-arm/user.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/vfp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/vfp.h</a> (renamed from include/asm-arm/vfp.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/vfpmacros.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/vfpmacros.h</a> (renamed from include/asm-arm/vfpmacros.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/vga.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/vga.h</a> (renamed from include/asm-arm/vga.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/include/asm/xor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/xor.h</a> (renamed from include/asm-arm/xor.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/kernel/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/calls.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/calls.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/crunch-bits.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/crunch-bits.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/crunch.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/crunch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/debug.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/debug.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/ecard.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/ecard.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/entry-armv.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/entry-armv.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/entry-common.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/entry-common.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/head-common.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/head-common.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/head-nommu.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/head-nommu.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/irq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/machine_kexec.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/machine_kexec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/process.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/process.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/setup.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/smp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/smp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/traps.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/traps.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/ecard.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/lib/ecard.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/getuser.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/lib/getuser.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/io-readsw-armv3.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/lib/io-readsw-armv3.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/io-writesw-armv3.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/lib/io-writesw-armv3.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/putuser.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/lib/putuser.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/sha1.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/lib/sha1.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-aaec2000/aaed2000.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/aaed2000.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-aaec2000/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-aaec2000/include/mach/aaec2000.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/aaec2000.h</a> (renamed from include/asm-arm/arch-aaec2000/aaec2000.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-aaec2000/include/mach/aaed2000.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/aaed2000.h</a> (renamed from include/asm-arm/arch-aaec2000/aaed2000.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-aaec2000/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-aaec2000/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-aaec2000/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/dma.h</a> (renamed from include/asm-arm/arch-aaec2000/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-aaec2000/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-aaec2000/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-aaec2000/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-aaec2000/hardware.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-aaec2000/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/io.h</a> (renamed from include/asm-arm/arch-aaec2000/io.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-aaec2000/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-aaec2000/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-aaec2000/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/memory.h</a> (renamed from include/asm-arm/arch-aaec2000/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-aaec2000/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/system.h</a> (renamed from include/asm-arm/arch-aaec2000/system.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-aaec2000/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/timex.h</a> (renamed from include/asm-arm/arch-aaec2000/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-aaec2000/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-aaec2000/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-aaec2000/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-aaec2000/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91cap9.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91cap9.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91cap9_devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91cap9_devices.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91rm9200.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91rm9200.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91rm9200_devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91rm9200_devices.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91rm9200_time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91rm9200_time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9260.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam9260.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9260_devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam9260_devices.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9261.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam9261.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9261_devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam9261_devices.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9263.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam9263.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9263_devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam9263_devices.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam926x_time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam926x_time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9rl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam9rl.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9rl_devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam9rl_devices.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91x40.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91x40.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91x40_time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91x40_time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-1arm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-1arm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-cam60.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-cam60.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-cap9adk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-cap9adk.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-carmeva.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-carmeva.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-csb337.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-csb337.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-csb637.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-csb637.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-dk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-dk.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-eb01.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-eb01.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-eb9200.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-eb9200.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-ecbat91.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-ecbat91.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-ek.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-ek.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-kafa.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-kafa.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-kb9202.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-kb9202.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-picotux200.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-picotux200.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-qil-a9260.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-qil-a9260.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-sam9-l9260.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-sam9-l9260.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-sam9260ek.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-sam9260ek.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-sam9261ek.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-sam9261ek.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-sam9263ek.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-sam9263ek.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-sam9g20ek.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-sam9g20ek.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-sam9rlek.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-sam9rlek.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-usb-a9260.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-usb-a9260.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-usb-a9263.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-usb-a9263.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-yl-9200.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-yl-9200.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/clock.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/gpio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_adc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_adc.h</a> (renamed from include/asm-arm/arch-at91/at91_adc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_aic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_aic.h</a> (renamed from include/asm-arm/arch-at91/at91_aic.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_dbgu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_dbgu.h</a> (renamed from include/asm-arm/arch-at91/at91_dbgu.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_mci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_mci.h</a> (renamed from include/asm-arm/arch-at91/at91_mci.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_pio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_pio.h</a> (renamed from include/asm-arm/arch-at91/at91_pio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_pit.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_pit.h</a> (renamed from include/asm-arm/arch-at91/at91_pit.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_pmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_pmc.h</a> (renamed from include/asm-arm/arch-at91/at91_pmc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_rstc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_rstc.h</a> (renamed from include/asm-arm/arch-at91/at91_rstc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_rtc.h</a> (renamed from include/asm-arm/arch-at91/at91_rtc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_rtt.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_rtt.h</a> (renamed from include/asm-arm/arch-at91/at91_rtt.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_shdwc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_shdwc.h</a> (renamed from include/asm-arm/arch-at91/at91_shdwc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_spi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_spi.h</a> (renamed from include/asm-arm/arch-at91/at91_spi.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_ssc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_ssc.h</a> (renamed from include/asm-arm/arch-at91/at91_ssc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_st.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_st.h</a> (renamed from include/asm-arm/arch-at91/at91_st.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_tc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_tc.h</a> (renamed from include/asm-arm/arch-at91/at91_tc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_twi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_twi.h</a> (renamed from include/asm-arm/arch-at91/at91_twi.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_wdt.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_wdt.h</a> (renamed from include/asm-arm/arch-at91/at91_wdt.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91cap9.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91cap9.h</a> (renamed from include/asm-arm/arch-at91/at91cap9.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h</a> (renamed from include/asm-arm/arch-at91/at91cap9_ddrsdr.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91cap9_matrix.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91cap9_matrix.h</a> (renamed from include/asm-arm/arch-at91/at91cap9_matrix.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91rm9200.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91rm9200.h</a> (renamed from include/asm-arm/arch-at91/at91rm9200.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91rm9200_emac.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91rm9200_emac.h</a> (renamed from include/asm-arm/arch-at91/at91rm9200_emac.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91rm9200_mc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91rm9200_mc.h</a> (renamed from include/asm-arm/arch-at91/at91rm9200_mc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9260.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9260.h</a> (renamed from include/asm-arm/arch-at91/at91sam9260.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9260_matrix.h</a> (renamed from include/asm-arm/arch-at91/at91sam9260_matrix.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9261.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9261.h</a> (renamed from include/asm-arm/arch-at91/at91sam9261.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9261_matrix.h</a> (renamed from include/asm-arm/arch-at91/at91sam9261_matrix.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9263.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9263.h</a> (renamed from include/asm-arm/arch-at91/at91sam9263.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9263_matrix.h</a> (renamed from include/asm-arm/arch-at91/at91sam9263_matrix.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9_sdramc.h</a> (renamed from include/asm-arm/arch-at91/at91sam9_sdramc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9_smc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9_smc.h</a> (renamed from include/asm-arm/arch-at91/at91sam9_smc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9rl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9rl.h</a> (renamed from include/asm-arm/arch-at91/at91sam9rl.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h</a> (renamed from include/asm-arm/arch-at91/at91sam9rl_matrix.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91x40.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91x40.h</a> (renamed from include/asm-arm/arch-at91/at91x40.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/board.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/board.h</a> (renamed from include/asm-arm/arch-at91/board.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/cpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/cpu.h</a> (renamed from include/asm-arm/arch-at91/cpu.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-at91/debug-macro.S)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/dma.h</a> (renamed from include/asm-arm/arch-at91/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-at91/entry-macro.S)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-at91/gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-at91/hardware.h)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/io.h</a> (renamed from include/asm-arm/arch-at91/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-at91/irqs.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/memory.h</a> (renamed from include/asm-arm/arch-at91/memory.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/system.h</a> (renamed from include/asm-arm/arch-at91/system.h)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/timex.h</a> (renamed from include/asm-arm/arch-at91/timex.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-at91/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-at91/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/irq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/leds.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/pm.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/autcpu12.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/autcpu12.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/cdb89712.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/cdb89712.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/ceiva.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/ceiva.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/edb7211-mm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/edb7211-mm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/fortunet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/fortunet.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/include/mach/autcpu12.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/autcpu12.h</a> (renamed from include/asm-arm/arch-clps711x/autcpu12.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-clps711x/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/dma.h</a> (renamed from include/asm-arm/arch-clps711x/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-clps711x/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-clps711x/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/io.h</a> (renamed from include/asm-arm/arch-clps711x/io.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-clps711x/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/memory.h</a> (renamed from include/asm-arm/arch-clps711x/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/include/mach/syspld.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/syspld.h</a> (renamed from include/asm-arm/arch-clps711x/syspld.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/system.h</a> (renamed from include/asm-arm/arch-clps711x/system.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/include/mach/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/time.h</a> (renamed from include/asm-arm/arch-clps711x/time.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/timex.h</a> (renamed from include/asm-arm/arch-clps711x/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-clps711x/uncompress.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-clps711x/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/mm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/mm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/p720t-leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/p720t-leds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/p720t.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/p720t.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps7500/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps7500/include/mach/acornfb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/acornfb.h</a> (renamed from include/asm-arm/arch-cl7500/acornfb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps7500/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-cl7500/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps7500/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/dma.h</a> (renamed from include/asm-arm/arch-cl7500/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps7500/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-rpc/entry-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps7500/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-cl7500/hardware.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps7500/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/io.h</a> (renamed from include/asm-arm/arch-cl7500/io.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps7500/include/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/irq.h</a> (renamed from include/asm-arm/arch-cl7500/irq.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps7500/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-cl7500/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps7500/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/memory.h</a> (renamed from include/asm-arm/arch-cl7500/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps7500/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/system.h</a> (renamed from include/asm-arm/arch-cl7500/system.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps7500/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/timex.h</a> (renamed from include/asm-arm/arch-cl7500/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps7500/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-cl7500/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps7500/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-cl7500/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/board-evm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/board-evm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/clock.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/gpio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/clock.h</a> (renamed from include/asm-arm/arch-davinci/clock.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/common.h</a> (renamed from include/asm-arm/arch-davinci/common.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-davinci/debug-macro.S)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/dma.h</a> (renamed from include/asm-arm/arch-davinci/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-davinci/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-davinci/gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-davinci/hardware.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/i2c.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/i2c.h</a> (renamed from include/asm-arm/arch-davinci/i2c.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/io.h</a> (renamed from include/asm-arm/arch-davinci/io.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-davinci/irqs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/memory.h</a> (renamed from include/asm-arm/arch-davinci/memory.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/mux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/mux.h</a> (renamed from include/asm-arm/arch-davinci/mux.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/psc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/psc.h</a> (renamed from include/asm-arm/arch-davinci/psc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/serial.h</a> (renamed from include/asm-arm/arch-davinci/serial.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/system.h</a> (renamed from include/asm-arm/arch-davinci/system.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/timex.h</a> (renamed from include/asm-arm/arch-davinci/timex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-davinci/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-davinci/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/io.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/mux.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/mux.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/psc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/psc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/serial.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-ebsa110/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/dma.h</a> (renamed from include/asm-arm/arch-ebsa110/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-ebsa110/entry-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-ebsa110/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/io.h</a> (renamed from include/asm-arm/arch-ebsa110/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-ebsa110/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/memory.h</a> (renamed from include/asm-arm/arch-ebsa110/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/system.h</a> (renamed from include/asm-arm/arch-ebsa110/system.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/timex.h</a> (renamed from include/asm-arm/arch-ebsa110/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-ebsa110/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-ebsa110/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/io.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/leds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/adssphere.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/adssphere.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/clock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/edb9302.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/edb9302.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/edb9302a.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/edb9302a.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/edb9307.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/edb9307.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/edb9312.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/edb9312.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/edb9315.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/edb9315.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/edb9315a.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/edb9315a.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/gesbc9312.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/gesbc9312.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-ep93xx/debug-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/dma.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-ep93xx/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h</a> (renamed from include/asm-arm/arch-ep93xx/ep93xx-regs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/gesbc9312.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/gesbc9312.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-ep93xx/gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-ep93xx/hardware.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/io.h</a> (renamed from include/asm-arm/arch-ep93xx/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-ep93xx/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/memory.h</a> (renamed from include/asm-arm/arch-kirkwood/memory.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/platform.h</a> (renamed from include/asm-arm/arch-ep93xx/platform.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/system.h</a> (renamed from include/asm-arm/arch-ep93xx/system.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/timex.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/ts72xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/ts72xx.h</a> (renamed from include/asm-arm/arch-ep93xx/ts72xx.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-ep93xx/uncompress.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/vmalloc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/micro9.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/micro9.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/ts72xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/ts72xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/cats-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/cats-pci.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/ebsa285-leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/ebsa285-leds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-ebsa285/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/dma.h</a> (renamed from include/asm-arm/arch-ebsa285/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-ebsa285/entry-macro.S)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-ebsa285/hardware.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/io.h</a> (renamed from include/asm-arm/arch-ebsa285/io.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-ebsa285/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/memory.h</a> (renamed from include/asm-arm/arch-ebsa285/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/system.h</a> (renamed from include/asm-arm/arch-ebsa285/system.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/timex.h</a> (renamed from include/asm-arm/arch-ebsa285/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-ebsa285/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-ebsa285/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/isa-irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/isa-irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/netwinder-leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/netwinder-leds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/time.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/common.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/cpu-h7201.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/cpu-h7201.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/cpu-h7202.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/cpu-h7202.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/h7201-eval.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/h7201-eval.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/h7202-eval.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/h7202-eval.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/include/mach/boards.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/boards.h</a> (renamed from include/asm-arm/arch-h720x/boards.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-h720x/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/dma.h</a> (renamed from include/asm-arm/arch-h720x/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-h720x/entry-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/include/mach/h7201-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/h7201-regs.h</a> (renamed from include/asm-arm/arch-h720x/h7201-regs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/include/mach/h7202-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/h7202-regs.h</a> (renamed from include/asm-arm/arch-h720x/h7202-regs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-h720x/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/io.h</a> (renamed from include/asm-arm/arch-h720x/io.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-h720x/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/memory.h</a> (renamed from include/asm-arm/arch-h720x/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/system.h</a> (renamed from include/asm-arm/arch-h720x/system.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/timex.h</a> (renamed from include/asm-arm/arch-h720x/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-h720x/uncompress.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-h720x/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/clock.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/cpufreq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/cpufreq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/dma.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/generic.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-imx/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/dma.h</a> (renamed from include/asm-arm/arch-imx/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-imx/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-imx/gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-imx/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/imx-dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/imx-dma.h</a> (renamed from include/asm-arm/arch-imx/imx-dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/imx-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/imx-regs.h</a> (renamed from include/asm-arm/arch-imx/imx-regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/imx-uart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/imx-uart.h</a> (renamed from include/asm-arm/arch-imx/imx-uart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/imxfb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/imxfb.h</a> (renamed from include/asm-arm/arch-imx/imxfb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/io.h</a> (renamed from include/asm-arm/arch-imx/io.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-imx/irqs.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/memory.h</a> (renamed from include/asm-arm/arch-imx/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/mmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/mmc.h</a> (renamed from include/asm-arm/arch-imx/mmc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/mx1ads.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/mx1ads.h</a> (renamed from include/asm-arm/arch-imx/mx1ads.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/spi_imx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/spi_imx.h</a> (renamed from include/asm-arm/arch-imx/spi_imx.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/system.h</a> (renamed from include/asm-arm/arch-imx/system.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/timex.h</a> (renamed from include/asm-arm/arch-imx/timex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-imx/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-imx/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/leds-mx1ads.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/leds-mx1ads.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mx1ads.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/mx1ads.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/cpu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/cpu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/impd1.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/impd1.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/bits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/bits.h</a> (renamed from include/asm-arm/arch-integrator/bits.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/cm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/cm.h</a> (renamed from include/asm-arm/arch-integrator/cm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-integrator/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/dma.h</a> (renamed from include/asm-arm/arch-integrator/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-integrator/entry-macro.S)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-integrator/hardware.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/impd1.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/impd1.h</a> (renamed from include/asm-arm/arch-integrator/impd1.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/io.h</a> (renamed from include/asm-arm/arch-integrator/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-integrator/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/lm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/lm.h</a> (renamed from include/asm-arm/arch-integrator/lm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/memory.h</a> (renamed from include/asm-arm/arch-integrator/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/platform.h</a> (renamed from include/asm-arm/arch-integrator/platform.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/system.h</a> (renamed from include/asm-arm/arch-integrator/system.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/timex.h</a> (renamed from include/asm-arm/arch-integrator/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-integrator/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-integrator/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/integrator_ap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/integrator_ap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/integrator_cp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/integrator_cp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/leds.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/lm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/lm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/pci_v3.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/pci_v3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/adma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/adma.h</a> (renamed from include/asm-arm/arch-iop13xx/adma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-iop13xx/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/dma.h</a> (renamed from include/asm-arm/arch-iop13xx/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-iop13xx/entry-macro.S)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-iop13xx/hardware.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/io.h</a> (renamed from include/asm-arm/arch-iop13xx/io.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/iop13xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/iop13xx.h</a> (renamed from include/asm-arm/arch-iop13xx/iop13xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/iq81340.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/iq81340.h</a> (renamed from include/asm-arm/arch-iop13xx/iq81340.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-iop13xx/irqs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/memory.h</a> (renamed from include/asm-arm/arch-iop13xx/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/msi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/msi.h</a> (renamed from include/asm-arm/arch-iop13xx/msi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/pci.h</a> (renamed from include/asm-arm/arch-iop13xx/pci.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/system.h</a> (renamed from include/asm-arm/arch-iop13xx/system.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/time.h</a> (renamed from include/asm-arm/arch-iop13xx/time.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/timex.h</a> (renamed from include/asm-arm/arch-iop13xx/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-iop13xx/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-iop13xx/vmalloc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/io.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/iq81340mc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/iq81340mc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/iq81340sc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/iq81340sc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/irq.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/pci.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/em7210.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/em7210.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/glantank.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/glantank.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/adma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/adma.h</a> (renamed from include/asm-arm/arch-iop32x/adma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-iop32x/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/dma.h</a> (renamed from include/asm-arm/arch-iop33x/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-iop32x/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/glantank.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/glantank.h</a> (renamed from include/asm-arm/arch-iop32x/glantank.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-iop32x/gpio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-iop32x/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/io.h</a> (renamed from include/asm-arm/arch-iop32x/io.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/iop32x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/iop32x.h</a> (renamed from include/asm-arm/arch-iop32x/iop32x.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/iq31244.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/iq31244.h</a> (renamed from include/asm-arm/arch-iop32x/iq31244.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/iq80321.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/iq80321.h</a> (renamed from include/asm-arm/arch-iop32x/iq80321.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-iop32x/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/memory.h</a> (renamed from include/asm-arm/arch-iop32x/memory.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/n2100.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/n2100.h</a> (renamed from include/asm-arm/arch-iop32x/n2100.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/system.h</a> (renamed from include/asm-arm/arch-iop32x/system.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/time.h</a> (renamed from include/asm-arm/arch-iop32x/time.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/timex.h</a> (renamed from include/asm-arm/arch-iop32x/timex.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-iop32x/uncompress.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/vmalloc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/iq31244.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/iq31244.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/iq80321.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/iq80321.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/n2100.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/n2100.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/adma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/adma.h</a> (renamed from include/asm-arm/arch-iop33x/adma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-iop33x/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/dma.h</a> (renamed from include/asm-arm/arch-iop32x/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-iop33x/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-iop33x/gpio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-iop33x/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/io.h</a> (renamed from include/asm-arm/arch-iop33x/io.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/iop33x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/iop33x.h</a> (renamed from include/asm-arm/arch-iop33x/iop33x.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/iq80331.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/iq80331.h</a> (renamed from include/asm-arm/arch-iop33x/iq80331.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/iq80332.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/iq80332.h</a> (renamed from include/asm-arm/arch-iop33x/iq80332.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-iop33x/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/memory.h</a> (renamed from include/asm-arm/arch-iop33x/memory.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/system.h</a> (renamed from include/asm-arm/arch-iop33x/system.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/time.h</a> (renamed from include/asm-arm/arch-iop33x/time.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/timex.h</a> (renamed from include/asm-arm/arch-iop33x/timex.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-iop33x/uncompress.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/vmalloc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/iq80331.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/iq80331.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/iq80332.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/iq80332.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/uart.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/uart.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/enp2611.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/enp2611.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-ixp2000/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/dma.h</a> (renamed from include/asm-arm/arch-ixp2000/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/enp2611.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/enp2611.h</a> (renamed from include/asm-arm/arch-ixp2000/enp2611.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-ixp2000/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-ixp2000/gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-ixp2000/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/io.h</a> (renamed from include/asm-arm/arch-ixp2000/io.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-ixp2000/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/ixdp2x00.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/ixdp2x00.h</a> (renamed from include/asm-arm/arch-ixp2000/ixdp2x00.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/ixdp2x01.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/ixdp2x01.h</a> (renamed from include/asm-arm/arch-ixp2000/ixdp2x01.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h</a> (renamed from include/asm-arm/arch-ixp2000/ixp2000-regs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/memory.h</a> (renamed from include/asm-arm/arch-ixp2000/memory.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/platform.h</a> (renamed from include/asm-arm/arch-ixp2000/platform.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/system.h</a> (renamed from include/asm-arm/arch-ixp2000/system.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/timex.h</a> (renamed from include/asm-arm/arch-ixp2000/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-ixp2000/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-ixp2000/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/ixdp2400.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/ixdp2400.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/ixdp2800.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/ixdp2800.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/ixdp2x00.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/ixdp2x00.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/ixdp2x01.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/ixdp2x01.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/espresso.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/espresso.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-ixp23xx/debug-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/dma.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-ixp23xx/entry-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-ixp23xx/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/io.h</a> (renamed from include/asm-arm/arch-ixp23xx/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-ixp23xx/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/ixdp2351.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/ixdp2351.h</a> (renamed from include/asm-arm/arch-ixp23xx/ixdp2351.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/ixp23xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/ixp23xx.h</a> (renamed from include/asm-arm/arch-ixp23xx/ixp23xx.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/memory.h</a> (renamed from include/asm-arm/arch-ixp23xx/memory.h)</td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/platform.h</a> (renamed from include/asm-arm/arch-ixp23xx/platform.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/system.h</a> (renamed from include/asm-arm/arch-ixp23xx/system.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/time.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/timex.h</a> (renamed from include/asm-arm/arch-ixp23xx/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-ixp23xx/uncompress.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-ixp23xx/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/ixdp2351.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/ixdp2351.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/pci.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/roadrunner.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/roadrunner.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/avila-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/avila-pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/avila-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/avila-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/common-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/common-pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/common.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/coyote-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/coyote-pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/coyote-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/coyote-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/fsg-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/fsg-setup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/gateway7001-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/gateway7001-pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/gateway7001-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/gateway7001-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/gtwx5715-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/gtwx5715-pci.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/gtwx5715-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/gtwx5715-setup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/avila.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/avila.h</a> (renamed from include/asm-arm/arch-ixp4xx/avila.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/coyote.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/coyote.h</a> (renamed from include/asm-arm/arch-ixp4xx/coyote.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/cpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/cpu.h</a> (renamed from include/asm-arm/arch-ixp4xx/cpu.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-ixp4xx/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/dma.h</a> (renamed from include/asm-arm/arch-ixp4xx/dma.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/dsmg600.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/dsmg600.h</a> (renamed from include/asm-arm/arch-ixp4xx/dsmg600.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-ixp4xx/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/fsg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/fsg.h</a> (renamed from include/asm-arm/arch-ixp4xx/fsg.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-ixp4xx/gpio.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/gtwx5715.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/gtwx5715.h</a> (renamed from include/asm-arm/arch-ixp4xx/gtwx5715.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-ixp4xx/hardware.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/io.h</a> (renamed from include/asm-arm/arch-ixp4xx/io.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-ixp4xx/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/ixdp425.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/ixdp425.h</a> (renamed from include/asm-arm/arch-ixp4xx/ixdp425.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h</a> (renamed from include/asm-arm/arch-ixp4xx/ixp4xx-regs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/memory.h</a> (renamed from include/asm-arm/arch-ixp4xx/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/nas100d.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/nas100d.h</a> (renamed from include/asm-arm/arch-ixp4xx/nas100d.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/npe.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/npe.h</a> (renamed from include/asm-arm/arch-ixp4xx/npe.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/nslu2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/nslu2.h</a> (renamed from include/asm-arm/arch-ixp4xx/nslu2.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/platform.h</a> (renamed from include/asm-arm/arch-ixp4xx/platform.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/prpmc1100.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/prpmc1100.h</a> (renamed from include/asm-arm/arch-ixp4xx/prpmc1100.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/qmgr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/qmgr.h</a> (renamed from include/asm-arm/arch-ixp4xx/qmgr.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/system.h</a> (renamed from include/asm-arm/arch-ixp4xx/system.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/timex.h</a> (renamed from include/asm-arm/arch-ixp4xx/timex.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/udc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/udc.h</a> (renamed from include/asm-arm/arch-ixp4xx/udc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-ixp4xx/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-ixp4xx/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/ixdp425-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/ixdp425-pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/ixdp425-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/ixdp425-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/ixdpg425-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/ixdpg425-pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/ixp4xx_npe.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/ixp4xx_npe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/ixp4xx_qmgr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/wg302v2-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/wg302v2-pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/wg302v2-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/wg302v2-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/addr-map.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/addr-map.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/common.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/common.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/db88f6281-bp-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/db88f6281-bp-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-kirkwood/debug-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/dma.h</a> (renamed from include/asm-arm/arch-kirkwood/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-kirkwood/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-kirkwood/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/io.h</a> (renamed from include/asm-arm/arch-kirkwood/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-kirkwood/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/include/mach/kirkwood.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/kirkwood.h</a> (renamed from include/asm-arm/arch-kirkwood/kirkwood.h)</td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/memory.h</a> (renamed from include/asm-arm/arch-loki/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/system.h</a> (renamed from include/asm-arm/arch-mv78xx0/system.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/timex.h</a> (renamed from include/asm-arm/arch-kirkwood/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-kirkwood/uncompress.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/vmalloc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/pcie.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/pcie.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/rd88f6192-nas-setup.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/rd88f6281-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/rd88f6281-setup.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/board-micrel.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/board-micrel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/cpu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/cpu.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/devices.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/gpio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-ks8695/debug-macro.S)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/devices.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/devices.h</a> (renamed from include/asm-arm/arch-ks8695/devices.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/dma.h</a> (renamed from include/asm-arm/arch-ks8695/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-ks8695/entry-macro.S)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-ks8695/gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-ks8695/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/io.h</a> (renamed from include/asm-arm/arch-ks8695/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-ks8695/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/memory.h</a> (renamed from include/asm-arm/arch-ks8695/memory.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/regs-gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-gpio.h</a> (renamed from include/asm-arm/arch-ks8695/regs-gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/regs-hpna.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-hpna.h</a> (renamed from include/asm-arm/arch-ks8695/regs-hpna.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/regs-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-irq.h</a> (renamed from include/asm-arm/arch-ks8695/regs-irq.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/regs-lan.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-lan.h</a> (renamed from include/asm-arm/arch-ks8695/regs-lan.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/regs-mem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-mem.h</a> (renamed from include/asm-arm/arch-ks8695/regs-mem.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/regs-misc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-misc.h</a> (renamed from include/asm-arm/arch-ks8695/regs-misc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/regs-pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-pci.h</a> (renamed from include/asm-arm/arch-ks8695/regs-pci.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/regs-switch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-switch.h</a> (renamed from include/asm-arm/arch-ks8695/regs-switch.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/regs-sys.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-sys.h</a> (renamed from include/asm-arm/arch-ks8695/regs-sys.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/regs-timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-timer.h</a> (renamed from include/asm-arm/arch-ks8695/regs-timer.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/regs-uart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-uart.h</a> (renamed from include/asm-arm/arch-ks8695/regs-uart.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/regs-wan.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-wan.h</a> (renamed from include/asm-arm/arch-ks8695/regs-wan.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/system.h</a> (renamed from include/asm-arm/arch-ks8695/system.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/timex.h</a> (renamed from include/asm-arm/arch-ks8695/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-ks8695/uncompress.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-ks8695/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/irq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/leds.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/pci.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/aux_reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/aux_reg.h</a> (renamed from include/asm-arm/arch-l7200/aux_reg.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-l7200/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/dma.h</a> (renamed from include/asm-arm/arch-l7200/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-l7200/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/gp_timers.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/gp_timers.h</a> (renamed from include/asm-arm/arch-l7200/gp_timers.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-l7200/gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-l7200/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/io.h</a> (renamed from include/asm-arm/arch-l7200/io.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-l7200/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/memory.h</a> (renamed from include/asm-arm/arch-l7200/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/pmpcon.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/pmpcon.h</a> (renamed from include/asm-arm/arch-l7200/pmpcon.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/pmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/pmu.h</a> (renamed from include/asm-arm/arch-l7200/pmu.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/serial.h</a> (renamed from include/asm-arm/arch-l7200/serial.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/serial_l7200.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/serial_l7200.h</a> (renamed from include/asm-arm/arch-l7200/serial_l7200.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/sib.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/sib.h</a> (renamed from include/asm-arm/arch-l7200/sib.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/sys-clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/sys-clock.h</a> (renamed from include/asm-arm/arch-l7200/sys-clock.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/system.h</a> (renamed from include/asm-arm/arch-l7200/system.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/time.h</a> (renamed from include/asm-arm/arch-l7200/time.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/timex.h</a> (renamed from include/asm-arm/arch-l7200/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-l7200/uncompress.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-l7200/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/arch-kev7a400.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/arch-kev7a400.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/arch-lpd7a40x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/arch-lpd7a40x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/clcd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/clcd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/clocks.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/clocks.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/include/mach/clocks.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/clocks.h</a> (renamed from include/asm-arm/arch-lh7a40x/clocks.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/include/mach/constants.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/constants.h</a> (renamed from include/asm-arm/arch-lh7a40x/constants.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-lh7a40x/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/dma.h</a> (renamed from include/asm-arm/arch-lh7a40x/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-lh7a40x/entry-macro.S)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-lh7a40x/hardware.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/io.h</a> (renamed from include/asm-arm/arch-lh7a40x/io.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-lh7a40x/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/memory.h</a> (renamed from include/asm-arm/arch-lh7a40x/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/include/mach/registers.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/registers.h</a> (renamed from include/asm-arm/arch-lh7a40x/registers.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/include/mach/ssp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/ssp.h</a> (renamed from include/asm-arm/arch-lh7a40x/ssp.h)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/system.h</a> (renamed from include/asm-arm/arch-lh7a40x/system.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/timex.h</a> (renamed from include/asm-arm/arch-lh7a40x/timex.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-lh7a40x/uncompress.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-lh7a40x/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/irq-lh7a400.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/irq-lh7a400.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/irq-lh7a404.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/irq-lh7a404.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/irq-lpd7a40x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/irq-lpd7a40x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/lcd-panel.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/lcd-panel.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/ssp-cpld.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/ssp-cpld.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-loki/addr-map.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/addr-map.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-loki/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/common.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-loki/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-loki/debug-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-loki/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/dma.h</a> (renamed from include/asm-arm/arch-loki/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-loki/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-loki/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-loki/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-loki/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-loki/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/io.h</a> (renamed from include/asm-arm/arch-loki/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-loki/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-loki/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-loki/include/mach/loki.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/loki.h</a> (renamed from include/asm-arm/arch-loki/loki.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-loki/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/memory.h</a> (renamed from include/asm-arm/arch-mv78xx0/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-loki/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/system.h</a> (renamed from include/asm-arm/arch-loki/system.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-loki/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/timex.h</a> (renamed from include/asm-arm/arch-loki/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-loki/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-loki/uncompress.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-loki/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/vmalloc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-loki/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-loki/lb88rc8480-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/lb88rc8480-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/board-halibut.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/board-halibut.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/common.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/idle.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/idle.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/board.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/board.h</a> (renamed from include/asm-arm/arch-msm/board.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-msm/debug-macro.S)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/dma.h</a> (renamed from include/asm-arm/arch-msm/dma.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-msm/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-msm/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/io.h</a> (renamed from include/asm-arm/arch-msm/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-msm/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/memory.h</a> (renamed from include/asm-arm/arch-msm/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/msm_iomap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/msm_iomap.h</a> (renamed from include/asm-arm/arch-msm/msm_iomap.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/system.h</a> (renamed from include/asm-arm/arch-msm/system.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/timex.h</a> (renamed from include/asm-arm/arch-msm/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-msm/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-msm/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/io.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/timer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/timer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/common.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/db78x00-bp-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/db78x00-bp-setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-mv78xx0/debug-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/dma.h</a> (renamed from include/asm-arm/arch-mv78xx0/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-mv78xx0/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-mv78xx0/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/io.h</a> (renamed from include/asm-arm/arch-mv78xx0/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-mv78xx0/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/memory.h</a> (renamed from include/asm-arm/arch-ep93xx/memory.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/mv78xx0.h</a> (renamed from include/asm-arm/arch-mv78xx0/mv78xx0.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/system.h</a> (renamed from include/asm-arm/arch-kirkwood/system.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/timex.h</a> (renamed from include/asm-arm/arch-mv78xx0/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-mv78xx0/uncompress.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/vmalloc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/pcie.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/pcie.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx2/clock_imx27.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/clock_imx27.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx2/cpu_imx27.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/cpu_imx27.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx2/crm_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/crm_regs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx2/devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/devices.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx2/generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/generic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx2/mx27ads.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/mx27ads.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx2/pcm038.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/pcm038.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx2/pcm970-baseboard.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/pcm970-baseboard.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx2/serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/serial.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx2/system.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/system.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx3/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx3/clock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx3/devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx3/devices.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx3/iomux.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx3/iomux.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx3/mm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx3/mm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx3/mx31ads.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx3/mx31ads.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx3/mx31lite.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx3/mx31lite.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx3/pcm037.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx3/pcm037.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/fb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/fb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/generic.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-netx/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/dma.h</a> (renamed from include/asm-arm/arch-netx/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-netx/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/eth.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/eth.h</a> (renamed from include/asm-arm/arch-netx/eth.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-netx/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/io.h</a> (renamed from include/asm-arm/arch-netx/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-netx/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/memory.h</a> (renamed from include/asm-arm/arch-netx/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/netx-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/netx-regs.h</a> (renamed from include/asm-arm/arch-netx/netx-regs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/param.h</a> (renamed from include/asm-arm/arch-netx/param.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/pfifo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/pfifo.h</a> (renamed from include/asm-arm/arch-netx/pfifo.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/system.h</a> (renamed from include/asm-arm/arch-netx/system.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/timex.h</a> (renamed from include/asm-arm/arch-netx/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-netx/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-netx/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/xc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/xc.h</a> (renamed from include/asm-arm/arch-netx/xc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/nxdb500.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/nxdb500.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/nxdkn.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/nxdkn.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/nxeb500hmi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/nxeb500hmi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/pfifo.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/pfifo.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/xc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/xc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/board-a9m9750dev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/board-a9m9750dev.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/gpio-ns9360.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/gpio-ns9360.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/gpio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/board.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/board.h</a> (renamed from include/asm-arm/arch-ns9xxx/board.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-ns9xxx/debug-macro.S)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/dma.h</a> (renamed from include/asm-arm/arch-ns9xxx/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-ns9xxx/entry-macro.S)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-ns9xxx/gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-ns9xxx/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/io.h</a> (renamed from include/asm-arm/arch-ns9xxx/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-ns9xxx/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/memory.h</a> (renamed from include/asm-arm/arch-ns9xxx/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/module.h</a> (renamed from include/asm-arm/arch-ns9xxx/module.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h</a> (renamed from include/asm-arm/arch-ns9xxx/processor-ns9360.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/processor.h</a> (renamed from include/asm-arm/arch-ns9xxx/processor.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/regs-bbu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/regs-bbu.h</a> (renamed from include/asm-arm/arch-ns9xxx/regs-bbu.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h</a> (renamed from include/asm-arm/arch-ns9xxx/regs-board-a9m9750dev.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/regs-mem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/regs-mem.h</a> (renamed from include/asm-arm/arch-ns9xxx/regs-mem.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h</a> (renamed from include/asm-arm/arch-ns9xxx/regs-sys-common.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h</a> (renamed from include/asm-arm/arch-ns9xxx/regs-sys-ns9360.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/system.h</a> (renamed from include/asm-arm/arch-ns9xxx/system.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/timex.h</a> (renamed from include/asm-arm/arch-ns9xxx/timex.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-ns9xxx/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-ns9xxx/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/irq.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/mach-cc9p9360dev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/mach-cc9p9360dev.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/mach-cc9p9360js.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/mach-cc9p9360js.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/plat-serial8250.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/plat-serial8250.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/processor-ns9360.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/processor-ns9360.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ns9xxx/time-ns9360.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/time-ns9360.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-ams-delta.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-ams-delta.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-fsample.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-fsample.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-generic.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-h2-mmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-h2-mmc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-h2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-h2.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-h3-mmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-h3-mmc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-h3.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-h3.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-innovator.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-innovator.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-nokia770.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-nokia770.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-osk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-osk.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-palmte.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-palmte.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-palmtt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-palmtt.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-palmz71.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-palmz71.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-perseus2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-perseus2.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-sx1-mmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-sx1-mmc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-sx1.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-sx1.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-voiceblue.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-voiceblue.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/clock.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/devices.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/fpga.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/fpga.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/io.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/irq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/leds-h2p2-debug.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/leds-h2p2-debug.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/leds-innovator.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/leds-innovator.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/leds-osk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/leds-osk.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/leds.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/mailbox.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/mailbox.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/mcbsp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/mcbsp.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/mux.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/mux.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/pm.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/serial.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/sleep.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/sleep.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/sram.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/sram.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/timer32k.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/timer32k.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-2430sdp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/board-2430sdp.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-apollon.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/board-apollon.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/board-generic.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-h4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/board-h4.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/clock.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/clock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/clock24xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/clock24xx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/clock34xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/clock34xx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/clock34xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/clock34xx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/control.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/control.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/devices.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/gpmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/gpmc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/id.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/id.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/io.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/mailbox.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/mailbox.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/mcbsp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/mcbsp.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/memory.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/memory.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/mux.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/mux.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/pm.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/prcm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/prcm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/sdrc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/sdrc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/serial.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/sleep.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/sleep.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/sram242x.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/sram242x.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/sram243x.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/sram243x.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/timer-gp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/timer-gp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/usb-tusb6010.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/usb-tusb6010.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/addr-map.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/addr-map.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/common.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/db88f5281-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/db88f5281-setup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/dns323-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/dns323-setup.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-orion5x/debug-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/dma.h</a> (renamed from include/asm-arm/arch-orion5x/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-orion5x/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-orion5x/gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-orion5x/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/io.h</a> (renamed from include/asm-arm/arch-orion5x/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-orion5x/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/memory.h</a> (renamed from include/asm-arm/arch-orion5x/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/orion5x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/orion5x.h</a> (renamed from include/asm-arm/arch-orion5x/orion5x.h)</td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/system.h</a> (renamed from include/asm-arm/arch-orion5x/system.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/timex.h</a> (renamed from include/asm-arm/arch-orion5x/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-orion5x/uncompress.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/vmalloc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/kurobox_pro-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/kurobox_pro-setup.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/mpp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/mpp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/mss2-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/mss2-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/mv2120-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/mv2120-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/pci.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/rd88f5181l-ge-setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/rd88f5182-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/rd88f5182-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/ts209-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/ts209-setup.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/ts409-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/ts409-setup.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/ts78xx-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/ts78xx-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/wnr854t-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/wnr854t-setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/wrt350n-v2-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/wrt350n-v2-setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/clock.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/core.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/dma.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/gpio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/i2c.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/i2c.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/clock.h</a> (renamed from include/asm-arm/arch-pnx4008/clock.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-pnx4008/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/dma.h</a> (renamed from include/asm-arm/arch-pnx4008/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-pnx4008/entry-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-pnx4008/gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-pnx4008/hardware.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/i2c.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/i2c.h</a> (renamed from include/asm-arm/arch-pnx4008/i2c.h)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/io.h</a> (renamed from include/asm-arm/arch-pnx4008/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/irq.h</a> (renamed from include/asm-arm/arch-pnx4008/irq.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-pnx4008/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/memory.h</a> (renamed from include/asm-arm/arch-pnx4008/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/param.h</a> (renamed from include/asm-arm/arch-pnx4008/param.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/platform.h</a> (renamed from include/asm-arm/arch-pnx4008/platform.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/pm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/pm.h</a> (renamed from include/asm-arm/arch-pnx4008/pm.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/system.h</a> (renamed from include/asm-arm/arch-pnx4008/system.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/timex.h</a> (renamed from include/asm-arm/arch-pnx4008/timex.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-pnx4008/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-pnx4008/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/irq.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/pm.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/serial.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/sleep.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/sleep.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/akita-ioexp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/akita-ioexp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/clock.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/clock.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/cm-x270-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/cm-x270-pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/cm-x270.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/cm-x270.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/colibri.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/colibri.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/corgi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/corgi.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/corgi_lcd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/corgi_lcd.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/corgi_pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/corgi_pm.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/corgi_ssp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/corgi_ssp.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/cpu-pxa.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/cpu-pxa.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/devices.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/dma.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/e400_lcd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/e400_lcd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/em-x270.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/em-x270.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/eseries.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/eseries.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/eseries_udc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/eseries_udc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/ezx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/ezx.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/generic.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/generic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/generic.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/gpio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/gumstix.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/gumstix.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/idp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/idp.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/akita.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/akita.h</a> (renamed from include/asm-arm/arch-pxa/akita.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/audio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/audio.h</a> (renamed from include/asm-arm/arch-pxa/audio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/bitfield.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/bitfield.h</a> (renamed from include/asm-arm/arch-pxa/bitfield.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/camera.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/camera.h</a> (renamed from include/asm-arm/arch-pxa/camera.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/colibri.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/colibri.h</a> (renamed from include/asm-arm/arch-pxa/colibri.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/corgi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/corgi.h</a> (renamed from include/asm-arm/arch-pxa/corgi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-pxa/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/dma.h</a> (renamed from include/asm-arm/arch-pxa/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-pxa/entry-macro.S)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/eseries-gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/eseries-gpio.h</a> (renamed from include/asm-arm/arch-pxa/eseries-gpio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/eseries-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/eseries-irq.h</a> (renamed from include/asm-arm/arch-pxa/eseries-irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-pxa/gpio.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/gumstix.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/gumstix.h</a> (renamed from include/asm-arm/arch-pxa/gumstix.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-pxa/hardware.h)</td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/i2c.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/i2c.h</a> (renamed from include/asm-arm/arch-pxa/i2c.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/idp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/idp.h</a> (renamed from include/asm-arm/arch-pxa/idp.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/io.h</a> (renamed from include/asm-arm/arch-pxa/io.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/irda.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/irda.h</a> (renamed from include/asm-arm/arch-pxa/irda.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-pxa/irqs.h)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/littleton.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/littleton.h</a> (renamed from include/asm-arm/arch-pxa/littleton.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/lpd270.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/lpd270.h</a> (renamed from include/asm-arm/arch-pxa/lpd270.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/lubbock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/lubbock.h</a> (renamed from include/asm-arm/arch-pxa/lubbock.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/magician.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/magician.h</a> (renamed from include/asm-arm/arch-pxa/magician.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/mainstone.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mainstone.h</a> (renamed from include/asm-arm/arch-pxa/mainstone.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/memory.h</a> (renamed from include/asm-arm/arch-pxa/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mfp-pxa25x.h</a> (renamed from include/asm-arm/arch-pxa/mfp-pxa25x.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mfp-pxa27x.h</a> (renamed from include/asm-arm/arch-pxa/mfp-pxa27x.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h</a> (renamed from include/asm-arm/arch-pxa/mfp-pxa2xx.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/mfp-pxa300.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mfp-pxa300.h</a> (renamed from include/asm-arm/arch-pxa/mfp-pxa300.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/mfp-pxa320.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mfp-pxa320.h</a> (renamed from include/asm-arm/arch-pxa/mfp-pxa320.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/mfp-pxa3xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mfp-pxa3xx.h</a> (renamed from include/asm-arm/arch-pxa/mfp-pxa3xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/mfp-pxa930.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mfp-pxa930.h</a> (renamed from include/asm-arm/arch-pxa/mfp-pxa930.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/mfp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mfp.h</a> (renamed from include/asm-arm/arch-pxa/mfp.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/mmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mmc.h</a> (renamed from include/asm-arm/arch-pxa/mmc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/mtd-xip.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mtd-xip.h</a> (renamed from include/asm-arm/arch-pxa/mtd-xip.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/ohci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/ohci.h</a> (renamed from include/asm-arm/arch-pxa/ohci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/palmtx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/palmtx.h</a> (renamed from include/asm-arm/arch-pxa/palmtx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/pcm027.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pcm027.h</a> (renamed from include/asm-arm/arch-pxa/pcm027.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pcm990_baseboard.h</a> (renamed from include/asm-arm/arch-pxa/pcm990_baseboard.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/pm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pm.h</a> (renamed from include/asm-arm/arch-pxa/pm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/poodle.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/poodle.h</a> (renamed from include/asm-arm/arch-pxa/poodle.h)</td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/pxa-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa-regs.h</a> (renamed from include/asm-arm/arch-pxa/pxa-regs.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/pxa25x-udc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa25x-udc.h</a> (renamed from include/asm-arm/arch-pxa/pxa25x-udc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/pxa27x-udc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa27x-udc.h</a> (renamed from include/asm-arm/arch-pxa/pxa27x-udc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa27x_keypad.h</a> (renamed from include/asm-arm/arch-pxa/pxa27x_keypad.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h</a> (renamed from include/asm-arm/arch-pxa/pxa2xx-gpio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa2xx-regs.h</a> (renamed from include/asm-arm/arch-pxa/pxa2xx-regs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/pxa2xx_spi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa2xx_spi.h</a> (renamed from include/asm-arm/arch-pxa/pxa2xx_spi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa3xx-regs.h</a> (renamed from include/asm-arm/arch-pxa/pxa3xx-regs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa3xx_nand.h</a> (renamed from include/asm-arm/arch-pxa/pxa3xx_nand.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/pxafb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxafb.h</a> (renamed from include/asm-arm/arch-pxa/pxafb.h)</td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/regs-lcd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/regs-lcd.h</a> (renamed from include/asm-arm/arch-pxa/regs-lcd.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/regs-ssp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/regs-ssp.h</a> (renamed from include/asm-arm/arch-pxa/regs-ssp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/reset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/reset.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/sharpsl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/sharpsl.h</a> (renamed from include/asm-arm/arch-pxa/sharpsl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/spitz.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/spitz.h</a> (renamed from include/asm-arm/arch-pxa/spitz.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/ssp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/ssp.h</a> (renamed from include/asm-arm/arch-pxa/ssp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/system.h</a> (renamed from include/asm-arm/arch-pxa/system.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/timex.h</a> (renamed from include/asm-arm/arch-pxa/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/tosa.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/tosa.h</a> (renamed from include/asm-arm/arch-pxa/tosa.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/tosa_bt.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/tosa_bt.h</a> (renamed from include/asm-arm/arch-pxa/tosa_bt.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/trizeps4.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/trizeps4.h</a> (renamed from include/asm-arm/arch-pxa/trizeps4.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/udc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/udc.h</a> (renamed from include/asm-arm/arch-pxa/udc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-pxa/uncompress.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-pxa/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/zylonite.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/zylonite.h</a> (renamed from include/asm-arm/arch-pxa/zylonite.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/leds-idp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/leds-idp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/leds-lubbock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/leds-lubbock.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/leds-mainstone.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/leds-mainstone.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/leds-trizeps4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/leds-trizeps4.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/littleton.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/littleton.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/lpd270.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/lpd270.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/lubbock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/lubbock.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/magician.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/magician.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/mainstone.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/mainstone.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/mfp-pxa2xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/mfp-pxa2xx.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/mfp-pxa3xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/mfp-pxa3xx.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/palmtx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/palmtx.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pcm027.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pcm027.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pcm990-baseboard.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pcm990-baseboard.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pm.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/poodle.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/poodle.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pwm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pwm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pxa25x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pxa25x.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pxa27x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pxa27x.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pxa2xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pxa2xx.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pxa300.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pxa300.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pxa320.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pxa320.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pxa3xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pxa3xx.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pxa930.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pxa930.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/reset.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/reset.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/saar.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/saar.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/sharpsl_pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/sharpsl_pm.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/sleep.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/sleep.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/spitz.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/spitz.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/spitz_pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/spitz_pm.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/ssp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/ssp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/standby.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/standby.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/tavorevb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/tavorevb.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/tosa-bt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/tosa-bt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/tosa.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/tosa.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/trizeps4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/trizeps4.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/zylonite.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/zylonite.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/zylonite_pxa300.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/zylonite_pxa300.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/zylonite_pxa320.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/zylonite_pxa320.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/board-eb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/board-eb.h</a> (renamed from include/asm-arm/arch-realview/board-eb.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/board-pb1176.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/board-pb1176.h</a> (renamed from include/asm-arm/arch-realview/board-pb1176.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/board-pb11mp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/board-pb11mp.h</a> (renamed from include/asm-arm/arch-realview/board-pb11mp.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-realview/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/dma.h</a> (renamed from include/asm-arm/arch-realview/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-realview/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-realview/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/io.h</a> (renamed from include/asm-arm/arch-realview/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-realview/irqs.h)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/memory.h</a> (renamed from include/asm-arm/arch-realview/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/platform.h</a> (renamed from include/asm-arm/arch-realview/platform.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/scu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/scu.h</a> (renamed from include/asm-arm/arch-realview/scu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/smp.h</a> (renamed from include/asm-arm/arch-realview/smp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/system.h</a> (renamed from include/asm-arm/arch-realview/system.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/timex.h</a> (renamed from include/asm-arm/arch-realview/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-realview/uncompress.h)</td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-realview/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/localtimer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/localtimer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/platsmp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/platsmp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/realview_eb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/realview_eb.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/realview_pb1176.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/realview_pb1176.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/realview_pb11mp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/realview_pb11mp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/include/mach/acornfb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/acornfb.h</a> (renamed from include/asm-arm/arch-rpc/acornfb.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-rpc/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/dma.h</a> (renamed from include/asm-arm/arch-rpc/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-cl7500/entry-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-rpc/hardware.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/io.h</a> (renamed from include/asm-arm/arch-rpc/io.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-rpc/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/memory.h</a> (renamed from include/asm-arm/arch-rpc/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/system.h</a> (renamed from include/asm-arm/arch-rpc/system.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/timex.h</a> (renamed from include/asm-arm/arch-rpc/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-rpc/uncompress.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-rpc/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/riscpc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/riscpc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2400/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2400/gpio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2400/include/mach/map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2400/include/mach/map.h</a> (renamed from include/asm-arm/arch-s3c2400/map.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2400/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2400/include/mach/memory.h</a> (renamed from include/asm-arm/arch-s3c2400/memory.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/bast-ide.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/bast-ide.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/bast-irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/bast-irq.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/clock.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/dma.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/gpio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/h1940-bluetooth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/h1940-bluetooth.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/anubis-cpld.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/anubis-cpld.h</a> (renamed from include/asm-arm/arch-s3c2410/anubis-cpld.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/anubis-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/anubis-irq.h</a> (renamed from include/asm-arm/arch-s3c2410/anubis-irq.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/anubis-map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/anubis-map.h</a> (renamed from include/asm-arm/arch-s3c2410/anubis-map.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/audio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/audio.h</a> (renamed from include/asm-arm/arch-s3c2410/audio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/bast-cpld.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/bast-cpld.h</a> (renamed from include/asm-arm/arch-s3c2410/bast-cpld.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/bast-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/bast-irq.h</a> (renamed from include/asm-arm/arch-s3c2410/bast-irq.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/bast-map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/bast-map.h</a> (renamed from include/asm-arm/arch-s3c2410/bast-map.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/bast-pmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/bast-pmu.h</a> (renamed from include/asm-arm/arch-s3c2410/bast-pmu.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-s3c2410/debug-macro.S)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/dma.h</a> (renamed from include/asm-arm/arch-s3c2410/dma.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-s3c2410/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/fb.h</a> (renamed from include/asm-arm/arch-s3c2410/fb.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-s3c2410/gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/h1940-latch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/h1940-latch.h</a> (renamed from include/asm-arm/arch-s3c2410/h1940-latch.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/h1940.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/h1940.h</a> (renamed from include/asm-arm/arch-s3c2410/h1940.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-s3c2410/hardware.h)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/idle.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/idle.h</a> (renamed from include/asm-arm/arch-s3c2410/idle.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/io.h</a> (renamed from include/asm-arm/arch-s3c2410/io.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-s3c2410/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/leds-gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/leds-gpio.h</a> (renamed from include/asm-arm/arch-s3c2410/leds-gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/map.h</a> (renamed from include/asm-arm/arch-s3c2410/map.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/memory.h</a> (renamed from include/asm-arm/arch-s3c2410/memory.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/osiris-cpld.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/osiris-cpld.h</a> (renamed from include/asm-arm/arch-s3c2410/osiris-cpld.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/osiris-map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/osiris-map.h</a> (renamed from include/asm-arm/arch-s3c2410/osiris-map.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/otom-map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/otom-map.h</a> (renamed from include/asm-arm/arch-s3c2410/otom-map.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/regs-clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-clock.h</a> (renamed from include/asm-arm/arch-s3c2410/regs-clock.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/regs-dsc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-dsc.h</a> (renamed from include/asm-arm/arch-s3c2410/regs-dsc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/regs-gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-gpio.h</a> (renamed from include/asm-arm/arch-s3c2410/regs-gpio.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/regs-gpioj.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-gpioj.h</a> (renamed from include/asm-arm/arch-s3c2410/regs-gpioj.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/regs-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-irq.h</a> (renamed from include/asm-arm/arch-s3c2410/regs-irq.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/regs-lcd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-lcd.h</a> (renamed from include/asm-arm/arch-s3c2410/regs-lcd.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/regs-mem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-mem.h</a> (renamed from include/asm-arm/arch-s3c2410/regs-mem.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/regs-power.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-power.h</a> (renamed from include/asm-arm/arch-s3c2410/regs-power.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h</a> (renamed from include/asm-arm/arch-s3c2410/regs-s3c2412-mem.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h</a> (renamed from include/asm-arm/arch-s3c2410/regs-s3c2412.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h</a> (renamed from include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h)</td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/regs-sdi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-sdi.h</a> (renamed from include/asm-arm/arch-s3c2410/regs-sdi.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/reset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/reset.h</a> (renamed from include/asm-arm/arch-s3c2410/reset.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/spi-gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/spi-gpio.h</a> (renamed from include/asm-arm/arch-s3c2410/spi-gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/spi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/spi.h</a> (renamed from include/asm-arm/arch-s3c2410/spi.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/system-reset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/system-reset.h</a> (renamed from include/asm-arm/arch-s3c2410/system-reset.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/system.h</a> (renamed from include/asm-arm/arch-s3c2410/system.h)</td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/timex.h</a> (renamed from include/asm-arm/arch-s3c2410/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-s3c2410/uncompress.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/usb-control.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/usb-control.h</a> (renamed from include/asm-arm/arch-s3c2410/usb-control.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-s3c2410/vmalloc.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h</a> (renamed from include/asm-arm/arch-s3c2410/vr1000-cpld.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/vr1000-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/vr1000-irq.h</a> (renamed from include/asm-arm/arch-s3c2410/vr1000-irq.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/vr1000-map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/vr1000-map.h</a> (renamed from include/asm-arm/arch-s3c2410/vr1000-map.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-amlm5900.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-amlm5900.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-bast.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-bast.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-h1940.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-h1940.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-n30.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-n30.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-otom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-otom.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-qt2410.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-qt2410.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-smdk2410.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-smdk2410.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-tct_hammer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-tct_hammer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-vr1000.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-vr1000.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/nor-simtec.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/nor-simtec.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/pm-h1940.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/pm-h1940.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/pm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c2410.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/s3c2410.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/sleep.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/sleep.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/usb-simtec.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/usb-simtec.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/clock.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/dma.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/gpio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/irq.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/mach-jive.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/mach-jive.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/mach-smdk2413.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/mach-smdk2413.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/mach-vstms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/mach-vstms.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/pm.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/s3c2412.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/s3c2412.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/sleep.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/sleep.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/clock.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/dma.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/dsc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/dsc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/irq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/mach-anubis.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/mach-anubis.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/mach-at2440evb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/mach-at2440evb.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/mach-nexcoder.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/mach-nexcoder.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/mach-osiris.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/mach-osiris.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/mach-rx3715.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/mach-rx3715.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/mach-smdk2440.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/mach-smdk2440.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/s3c2440.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/s3c2440.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2442/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2442/clock.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2443/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2443/clock.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2443/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2443/dma.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2443/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2443/irq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2443/mach-smdk2443.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2443/mach-smdk2443.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2443/s3c2443.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2443/s3c2443.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/assabet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/assabet.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/badge4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/badge4.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/cerf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/cerf.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/clock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/collie.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/collie.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/collie_pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/collie_pm.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/cpu-sa1100.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/cpu-sa1100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/cpu-sa1110.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/cpu-sa1110.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/dma.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/generic.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/h3600.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/h3600.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/hackkit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/hackkit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/SA-1100.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/SA-1100.h</a> (renamed from include/asm-arm/arch-sa1100/SA-1100.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/SA-1101.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/SA-1101.h</a> (renamed from include/asm-arm/arch-sa1100/SA-1101.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/SA-1111.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/SA-1111.h</a> (renamed from include/asm-arm/arch-sa1100/SA-1111.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/assabet.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/assabet.h</a> (renamed from include/asm-arm/arch-sa1100/assabet.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/badge4.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/badge4.h</a> (renamed from include/asm-arm/arch-sa1100/badge4.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/bitfield.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/bitfield.h</a> (renamed from include/asm-arm/arch-sa1100/bitfield.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/cerf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/cerf.h</a> (renamed from include/asm-arm/arch-sa1100/cerf.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/collie.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/collie.h</a> (renamed from include/asm-arm/arch-sa1100/collie.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-sa1100/debug-macro.S)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/dma.h</a> (renamed from include/asm-arm/arch-sa1100/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-sa1100/entry-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-sa1100/gpio.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/h3600.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/h3600.h</a> (renamed from include/asm-arm/arch-sa1100/h3600.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/h3600_gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/h3600_gpio.h</a> (renamed from include/asm-arm/arch-sa1100/h3600_gpio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-sa1100/hardware.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/ide.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/ide.h</a> (renamed from include/asm-arm/arch-sa1100/ide.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/io.h</a> (renamed from include/asm-arm/arch-sa1100/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-sa1100/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/jornada720.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/jornada720.h</a> (renamed from include/asm-arm/arch-sa1100/jornada720.h)</td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/lart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/lart.h</a> (renamed from include/asm-arm/arch-sa1100/lart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/mcp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/mcp.h</a> (renamed from include/asm-arm/arch-sa1100/mcp.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/memory.h</a> (renamed from include/asm-arm/arch-sa1100/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/mtd-xip.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/mtd-xip.h</a> (renamed from include/asm-arm/arch-sa1100/mtd-xip.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/neponset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/neponset.h</a> (renamed from include/asm-arm/arch-sa1100/neponset.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/reset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/reset.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/shannon.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/shannon.h</a> (renamed from include/asm-arm/arch-sa1100/shannon.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/simpad.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/simpad.h</a> (renamed from include/asm-arm/arch-sa1100/simpad.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/system.h</a> (renamed from include/asm-arm/arch-sa1100/system.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/timex.h</a> (renamed from include/asm-arm/arch-sa1100/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-sa1100/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/vmalloc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/jornada720.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/jornada720.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/jornada720_ssp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/jornada720_ssp.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/lart.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/lart.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/leds-assabet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/leds-assabet.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/leds-badge4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/leds-badge4.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/leds-cerf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/leds-cerf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/leds-hackkit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/leds-hackkit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/leds-lart.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/leds-lart.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/leds-simpad.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/leds-simpad.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/neponset.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/neponset.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/pleb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/pleb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/shannon.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/shannon.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/simpad.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/simpad.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/sleep.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/sleep.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/ssp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/ssp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-shark/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/dma.h</a> (renamed from include/asm-arm/arch-shark/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-shark/entry-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-shark/hardware.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/io.h</a> (renamed from include/asm-arm/arch-shark/io.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-shark/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/memory.h</a> (renamed from include/asm-arm/arch-shark/memory.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/system.h</a> (renamed from include/asm-arm/arch-shark/system.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/timex.h</a> (renamed from include/asm-arm/arch-shark/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-shark/uncompress.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-shark/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/leds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-versatile/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/dma.h</a> (renamed from include/asm-arm/arch-versatile/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-versatile/entry-macro.S)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-versatile/hardware.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/io.h</a> (renamed from include/asm-arm/arch-versatile/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-versatile/irqs.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/memory.h</a> (renamed from include/asm-arm/arch-versatile/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/include/mach/platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/platform.h</a> (renamed from include/asm-arm/arch-versatile/platform.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/system.h</a> (renamed from include/asm-arm/arch-versatile/system.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/timex.h</a> (renamed from include/asm-arm/arch-versatile/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-versatile/uncompress.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-versatile/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/versatile_ab.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/versatile_ab.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/versatile_pb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/versatile_pb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/cache-feroceon-l2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/cache-feroceon-l2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/cache-v3.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/cache-v3.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/cache-v4.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/cache-v4.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/cache-v4wt.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/cache-v4wt.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mm/cache-xsc3l2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/cache-xsc3l2.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/init.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/ioremap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/ioremap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/mmu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/mmu.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-arm720.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/proc-arm720.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-arm940.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/proc-arm940.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-arm946.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/proc-arm946.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-sa110.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/proc-sa110.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-sa1100.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/proc-sa1100.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-xsc3.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/proc-xsc3.S</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/nwfpe/fpa11.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/nwfpe/fpa11.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/oprofile/op_model_mpcore.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/oprofile/op_model_mpcore.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-iop/adma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-iop/adma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-iop/i2c.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-iop/i2c.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-iop/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-iop/io.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-iop/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-iop/pci.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-iop/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-iop/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/clock.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/board-mx27ads.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/board-mx27ads.h</a> (renamed from include/asm-arm/arch-mxc/board-mx27ads.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/board-mx31ads.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/board-mx31ads.h</a> (renamed from include/asm-arm/arch-mxc/board-mx31ads.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/board-mx31lite.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/board-mx31lite.h</a> (renamed from include/asm-arm/arch-mxc/board-mx31lite.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/board-pcm037.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/board-pcm037.h</a> (renamed from include/asm-arm/arch-mxc/board-pcm037.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/board-pcm038.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/board-pcm038.h</a> (renamed from include/asm-arm/arch-mxc/board-pcm038.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/clock.h</a> (renamed from include/asm-arm/arch-mxc/clock.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/common.h</a> (renamed from include/asm-arm/arch-mxc/common.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-mxc/debug-macro.S)</td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/dma.h</a> (renamed from include/asm-arm/arch-mxc/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-mxc/entry-macro.S)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-mxc/gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-mxc/hardware.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/iim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/iim.h</a> (renamed from include/asm-arm/arch-mxc/iim.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/imx-uart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/imx-uart.h</a> (renamed from include/asm-arm/arch-mxc/imx-uart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/io.h</a> (renamed from include/asm-arm/arch-mxc/io.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h</a> (renamed from include/asm-arm/arch-mxc/iomux-mx1-mx2.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/iomux-mx3.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/iomux-mx3.h</a> (renamed from include/asm-arm/arch-mxc/iomux-mx3.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-mxc/irqs.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/memory.h</a> (renamed from include/asm-arm/arch-mxc/memory.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/mx27.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/mx27.h</a> (renamed from include/asm-arm/arch-mxc/mx27.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/mx31.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/mx31.h</a> (renamed from include/asm-arm/arch-mxc/mx31.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/mxc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/mxc.h</a> (renamed from include/asm-arm/arch-mxc/mxc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/mxc_timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/mxc_timer.h</a> (renamed from include/asm-arm/arch-mxc/mxc_timer.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/system.h</a> (renamed from include/asm-arm/arch-mxc/system.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/timex.h</a> (renamed from include/asm-arm/arch-mxc/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-mxc/uncompress.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-mxc/vmalloc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/iomux-mx1-mx2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/iomux-mx1-mx2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/time.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/clock.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/common.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/cpu-omap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/cpu-omap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/debug-devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/debug-devices.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/debug-leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/debug-leds.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/devices.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/dma.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/dmtimer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/dmtimer.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/fb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/fb.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/gpio.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/i2c.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/i2c.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/aic23.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/aic23.h</a> (renamed from include/asm-arm/arch-omap/aic23.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/blizzard.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/blizzard.h</a> (renamed from include/asm-arm/arch-omap/blizzard.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board-2430sdp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-2430sdp.h</a> (renamed from include/asm-arm/arch-omap/board-2430sdp.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board-ams-delta.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-ams-delta.h</a> (renamed from include/asm-arm/arch-omap/board-ams-delta.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board-apollon.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-apollon.h</a> (renamed from include/asm-arm/arch-omap/board-apollon.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board-fsample.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-fsample.h</a> (renamed from include/asm-arm/arch-omap/board-fsample.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board-h2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-h2.h</a> (renamed from include/asm-arm/arch-omap/board-h2.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board-h3.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-h3.h</a> (renamed from include/asm-arm/arch-omap/board-h3.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board-h4.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-h4.h</a> (renamed from include/asm-arm/arch-omap/board-h4.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board-innovator.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-innovator.h</a> (renamed from include/asm-arm/arch-omap/board-innovator.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board-nokia.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-nokia.h</a> (renamed from include/asm-arm/arch-omap/board-nokia.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board-osk.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-osk.h</a> (renamed from include/asm-arm/arch-omap/board-osk.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board-palmte.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-palmte.h</a> (renamed from include/asm-arm/arch-omap/board-palmte.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board-palmtt.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-palmtt.h</a> (renamed from include/asm-arm/arch-omap/board-palmtt.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board-palmz71.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-palmz71.h</a> (renamed from include/asm-arm/arch-omap/board-palmz71.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board-perseus2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-perseus2.h</a> (renamed from include/asm-arm/arch-omap/board-perseus2.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board-sx1.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-sx1.h</a> (renamed from include/asm-arm/arch-omap/board-sx1.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board-voiceblue.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-voiceblue.h</a> (renamed from include/asm-arm/arch-omap/board-voiceblue.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/board.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board.h</a> (renamed from include/asm-arm/arch-omap/board.h)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/clock.h</a> (renamed from include/asm-arm/arch-omap/clock.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/common.h</a> (renamed from include/asm-arm/arch-omap/common.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/control.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/control.h</a> (renamed from include/asm-arm/arch-omap/control.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/cpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/cpu.h</a> (renamed from include/asm-arm/arch-omap/cpu.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/debug-macro.S</a> (renamed from include/asm-arm/arch-omap/debug-macro.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/dma.h</a> (renamed from include/asm-arm/arch-omap/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/dmtimer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/dmtimer.h</a> (renamed from include/asm-arm/arch-omap/dmtimer.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/dsp_common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/dsp_common.h</a> (renamed from include/asm-arm/arch-omap/dsp_common.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/eac.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/eac.h</a> (renamed from include/asm-arm/arch-omap/eac.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/entry-macro.S</a> (renamed from include/asm-arm/arch-omap/entry-macro.S)</td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/fpga.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/fpga.h</a> (renamed from include/asm-arm/arch-omap/fpga.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/gpio-switch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/gpio-switch.h</a> (renamed from include/asm-arm/arch-omap/gpio-switch.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/gpio.h</a> (renamed from include/asm-arm/arch-omap/gpio.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/gpioexpander.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/gpioexpander.h</a> (renamed from include/asm-arm/arch-omap/gpioexpander.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/gpmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/gpmc.h</a> (renamed from include/asm-arm/arch-omap/gpmc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/hardware.h</a> (renamed from include/asm-arm/arch-omap/hardware.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/hwa742.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/hwa742.h</a> (renamed from include/asm-arm/arch-omap/hwa742.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/io.h</a> (renamed from include/asm-arm/arch-omap/io.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/irda.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/irda.h</a> (renamed from include/asm-arm/arch-omap/irda.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/irqs.h</a> (renamed from include/asm-arm/arch-omap/irqs.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/keypad.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/keypad.h</a> (renamed from include/asm-arm/arch-omap/keypad.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/lcd_mipid.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/lcd_mipid.h</a> (renamed from include/asm-arm/arch-omap/lcd_mipid.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/led.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/led.h</a> (renamed from include/asm-arm/arch-omap/led.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/mailbox.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/mailbox.h</a> (renamed from include/asm-arm/arch-omap/mailbox.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/mcbsp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/mcbsp.h</a> (renamed from include/asm-arm/arch-omap/mcbsp.h)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/mcspi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/mcspi.h</a> (renamed from include/asm-arm/arch-omap/mcspi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/memory.h</a> (renamed from include/asm-arm/arch-omap/memory.h)</td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/menelaus.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/menelaus.h</a> (renamed from include/asm-arm/arch-omap/menelaus.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/mmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/mmc.h</a> (renamed from include/asm-arm/arch-omap/mmc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/mtd-xip.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/mtd-xip.h</a> (renamed from include/asm-arm/arch-omap/mtd-xip.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/mux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/mux.h</a> (renamed from include/asm-arm/arch-omap/mux.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/nand.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/nand.h</a> (renamed from include/asm-arm/arch-omap/nand.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/omap-alsa.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/omap-alsa.h</a> (renamed from include/asm-arm/arch-omap/omap-alsa.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/omap1510.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/omap1510.h</a> (renamed from include/asm-arm/arch-omap/omap1510.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/omap16xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/omap16xx.h</a> (renamed from include/asm-arm/arch-omap/omap16xx.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/omap24xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/omap24xx.h</a> (renamed from include/asm-arm/arch-omap/omap24xx.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/omap34xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/omap34xx.h</a> (renamed from include/asm-arm/arch-omap/omap34xx.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/omap730.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/omap730.h</a> (renamed from include/asm-arm/arch-omap/omap730.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/omapfb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/omapfb.h</a> (renamed from include/asm-arm/arch-omap/omapfb.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/onenand.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/onenand.h</a> (renamed from include/asm-arm/arch-omap/onenand.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/param.h</a> (renamed from include/asm-arm/arch-omap/param.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/pm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/pm.h</a> (renamed from include/asm-arm/arch-omap/pm.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/prcm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/prcm.h</a> (renamed from include/asm-arm/arch-omap/prcm.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/sdrc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/sdrc.h</a> (renamed from include/asm-arm/arch-omap/sdrc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/serial.h</a> (renamed from include/asm-arm/arch-omap/serial.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/sram.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/sram.h</a> (renamed from include/asm-arm/arch-omap/sram.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/system.h</a> (renamed from include/asm-arm/arch-omap/system.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/tc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/tc.h</a> (renamed from include/asm-arm/arch-omap/tc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/timex.h</a> (renamed from include/asm-arm/arch-omap/timex.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/uncompress.h</a> (renamed from include/asm-arm/arch-omap/uncompress.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/usb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/usb.h</a> (renamed from include/asm-arm/arch-omap/usb.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/vmalloc.h</a> (renamed from include/asm-arm/arch-omap/vmalloc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/mailbox.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/mailbox.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/mcbsp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/mcbsp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/mux.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/mux.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/ocpi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/ocpi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/sram.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/sram.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/usb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/usb.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/include/plat/cache-feroceon-l2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/include/plat/cache-feroceon-l2.h</a> (renamed from include/asm-arm/plat-orion/cache-feroceon-l2.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/include/plat/ehci-orion.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/include/plat/ehci-orion.h</a> (renamed from include/asm-arm/plat-orion/ehci-orion.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/include/plat/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/include/plat/irq.h</a> (renamed from include/asm-arm/plat-orion/irq.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/include/plat/mv_xor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/include/plat/mv_xor.h</a> (renamed from include/asm-arm/plat-orion/mv_xor.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/include/plat/orion_nand.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/include/plat/orion_nand.h</a> (renamed from include/asm-arm/plat-orion/orion_nand.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/include/plat/pcie.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/include/plat/pcie.h</a> (renamed from include/asm-arm/plat-orion/pcie.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/include/plat/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/include/plat/time.h</a> (renamed from include/asm-arm/plat-orion/time.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/pcie.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/pcie.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/clock.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/common-smdk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/common-smdk.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/cpu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/cpu.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/devs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/devs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/dma.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/gpio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/gpiolib.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/gpiolib.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/irq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/pm-simtec.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/pm-simtec.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/pm.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/pwm-clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/pwm-clock.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/pwm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/pwm.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/s3c244x-clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/s3c244x-clock.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/s3c244x-irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/s3c244x-irq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/s3c244x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/s3c244x.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/sleep.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/sleep.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/tools/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/tools/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/tools/mach-types?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/tools/mach-types</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/boards/atngw100/flash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/boards/atngw100/flash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/boards/atngw100/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/boards/atngw100/setup.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/boards/atstk1000/atstk1002.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/boards/atstk1000/atstk1002.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/boards/atstk1000/atstk1003.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/boards/atstk1000/atstk1003.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/boards/atstk1000/atstk1004.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/boards/atstk1000/atstk1004.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/boards/atstk1000/flash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/boards/atstk1000/flash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/boards/atstk1000/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/boards/atstk1000/setup.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/avr32/boot/images/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/boot/images/.gitignore</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/configs/atngw100_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/configs/atngw100_defconfig</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/configs/atstk1002_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/configs/atstk1002_defconfig</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/configs/atstk1003_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/configs/atstk1003_defconfig</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/configs/atstk1004_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/configs/atstk1004_defconfig</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/avr32/configs/atstk1006_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/configs/atstk1006_defconfig</a></td><td class='right'>1304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/Kbuild</a> (renamed from include/asm-avr32/Kbuild)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/a.out.h</a> (renamed from include/asm-avr32/a.out.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/addrspace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/addrspace.h</a> (renamed from include/asm-avr32/addrspace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/asm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/asm.h</a> (renamed from include/asm-avr32/asm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/atmel-mci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/atmel-mci.h</a> (renamed from include/asm-avr32/atmel-mci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/atomic.h</a> (renamed from include/asm-avr32/atomic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/auxvec.h</a> (renamed from include/asm-avr32/auxvec.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/bitops.h</a> (renamed from include/asm-avr32/bitops.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/bug.h</a> (renamed from include/asm-avr32/bug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/bugs.h</a> (renamed from include/asm-avr32/bugs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/byteorder.h</a> (renamed from include/asm-avr32/byteorder.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/cache.h</a> (renamed from include/asm-avr32/cache.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/cachectl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/cachectl.h</a> (renamed from include/asm-avr32/cachectl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/cacheflush.h</a> (renamed from include/asm-avr32/cacheflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/checksum.h</a> (renamed from include/asm-avr32/checksum.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/cputime.h</a> (renamed from include/asm-avr32/cputime.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/current.h</a> (renamed from include/asm-avr32/current.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/delay.h</a> (renamed from include/asm-avr32/delay.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/device.h</a> (renamed from include/asm-avr32/device.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/div64.h</a> (renamed from include/asm-avr32/div64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/dma-mapping.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/dma-mapping.h</a> (renamed from include/asm-avr32/dma-mapping.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/dma.h</a> (renamed from include/asm-avr32/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/elf.h</a> (renamed from include/asm-avr32/elf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/emergency-restart.h</a> (renamed from include/asm-avr32/emergency-restart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/errno.h</a> (renamed from include/asm-avr32/errno.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/fb.h</a> (renamed from include/asm-avr32/fb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/fcntl.h</a> (renamed from include/asm-avr32/fcntl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/futex.h</a> (renamed from include/asm-avr32/futex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/gpio.h</a> (renamed from include/asm-avr32/gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/hardirq.h</a> (renamed from include/asm-avr32/hardirq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/hw_irq.h</a> (renamed from include/asm-avr32/hw_irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/io.h</a> (renamed from include/asm-avr32/io.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/ioctl.h</a> (renamed from include/asm-avr32/ioctl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/ioctls.h</a> (renamed from include/asm-avr32/ioctls.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/ipcbuf.h</a> (renamed from include/asm-avr32/ipcbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/irq.h</a> (renamed from include/asm-avr32/irq.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/irq_regs.h</a> (renamed from include/asm-avr32/irq_regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/irqflags.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/irqflags.h</a> (renamed from include/asm-avr32/irqflags.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/kdebug.h</a> (renamed from include/asm-avr32/kdebug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/kmap_types.h</a> (renamed from include/asm-avr32/kmap_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/kprobes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/kprobes.h</a> (renamed from include/asm-avr32/kprobes.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/linkage.h</a> (renamed from include/asm-avr32/linkage.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/local.h</a> (renamed from include/asm-avr32/local.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/mach/serial_at91.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/mach/serial_at91.h</a> (renamed from include/asm-arm/mach/serial_at91.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/mman.h</a> (renamed from include/asm-avr32/mman.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/mmu.h</a> (renamed from include/asm-avr32/mmu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/mmu_context.h</a> (renamed from include/asm-avr32/mmu_context.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/module.h</a> (renamed from include/asm-avr32/module.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/msgbuf.h</a> (renamed from include/asm-avr32/msgbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/mutex.h</a> (renamed from include/asm-avr32/mutex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/numnodes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/numnodes.h</a> (renamed from include/asm-avr32/numnodes.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/ocd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/ocd.h</a> (renamed from include/asm-avr32/ocd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/page.h</a> (renamed from include/asm-avr32/page.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/param.h</a> (renamed from include/asm-avr32/param.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/pci.h</a> (renamed from include/asm-avr32/pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/percpu.h</a> (renamed from include/asm-avr32/percpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/pgalloc.h</a> (renamed from include/asm-avr32/pgalloc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/pgtable-2level.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/pgtable-2level.h</a> (renamed from include/asm-avr32/pgtable-2level.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/pgtable.h</a> (renamed from include/asm-avr32/pgtable.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/poll.h</a> (renamed from include/asm-avr32/poll.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/posix_types.h</a> (renamed from include/asm-avr32/posix_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/processor.h</a> (renamed from include/asm-avr32/processor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/ptrace.h</a> (renamed from include/asm-avr32/ptrace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/resource.h</a> (renamed from include/asm-avr32/resource.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/scatterlist.h</a> (renamed from include/asm-avr32/scatterlist.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/sections.h</a> (renamed from include/asm-avr32/sections.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/sembuf.h</a> (renamed from include/asm-avr32/sembuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/serial.h</a> (renamed from include/asm-avr32/serial.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/setup.h</a> (renamed from include/asm-avr32/setup.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/shmbuf.h</a> (renamed from include/asm-avr32/shmbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/shmparam.h</a> (renamed from include/asm-avr32/shmparam.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/sigcontext.h</a> (renamed from include/asm-avr32/sigcontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/siginfo.h</a> (renamed from include/asm-avr32/siginfo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/signal.h</a> (renamed from include/asm-avr32/signal.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/socket.h</a> (renamed from include/asm-avr32/socket.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/sockios.h</a> (renamed from include/asm-avr32/sockios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/stat.h</a> (renamed from include/asm-avr32/stat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/statfs.h</a> (renamed from include/asm-avr32/statfs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/string.h</a> (renamed from include/asm-avr32/string.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/sysreg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/sysreg.h</a> (renamed from include/asm-avr32/sysreg.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/system.h</a> (renamed from include/asm-avr32/system.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/termbits.h</a> (renamed from include/asm-avr32/termbits.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/termios.h</a> (renamed from include/asm-avr32/termios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/thread_info.h</a> (renamed from include/asm-avr32/thread_info.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/timex.h</a> (renamed from include/asm-avr32/timex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/tlb.h</a> (renamed from include/asm-avr32/tlb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/tlbflush.h</a> (renamed from include/asm-avr32/tlbflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/topology.h</a> (renamed from include/asm-avr32/topology.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/traps.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/traps.h</a> (renamed from include/asm-avr32/traps.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/types.h</a> (renamed from include/asm-avr32/types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/uaccess.h</a> (renamed from include/asm-avr32/uaccess.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/ucontext.h</a> (renamed from include/asm-avr32/ucontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/unaligned.h</a> (renamed from include/asm-avr32/unaligned.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/unistd.h</a> (renamed from include/asm-avr32/unistd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/user.h</a> (renamed from include/asm-avr32/user.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/xor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/xor.h</a> (renamed from include/asm-avr32/xor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/avr32/kernel/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/kernel/asm-offsets.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/asm-offsets.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/kernel/avr32_ksyms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/avr32_ksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/kernel/entry-avr32b.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/entry-avr32b.S</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/kernel/process.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/process.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/kernel/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/setup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/kernel/syscall-stubs.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/syscall-stubs.S</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/kernel/syscall_table.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/syscall_table.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/kernel/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/kernel/traps.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/traps.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/lib/findbit.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/lib/findbit.S</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/at32ap700x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/at32ap700x.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/clock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/hmatrix.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/hmatrix.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/hmatrix.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/hmatrix.h</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/hsmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/hsmc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/include/mach/at32ap700x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/at32ap700x.h</a> (renamed from include/asm-avr32/arch-at32ap/at32ap700x.h)</td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/include/mach/board.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/board.h</a> (renamed from include/asm-avr32/arch-at32ap/board.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/include/mach/chip.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/chip.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/include/mach/cpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/cpu.h</a> (renamed from include/asm-avr32/arch-at32ap/cpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/gpio.h</a> (renamed from include/asm-avr32/arch-at32ap/gpio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/include/mach/hmatrix.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/hmatrix.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/include/mach/init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/init.h</a> (renamed from include/asm-avr32/arch-at32ap/init.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/io.h</a> (renamed from include/asm-avr32/arch-at32ap/io.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/include/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/irq.h</a> (renamed from include/asm-avr32/arch-at32ap/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/include/mach/pm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/pm.h</a> (renamed from include/asm-avr32/arch-at32ap/pm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/include/mach/portmux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/portmux.h</a> (renamed from include/asm-avr32/arch-at32ap/portmux.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/include/mach/smc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/smc.h</a> (renamed from include/asm-avr32/arch-at32ap/smc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/include/mach/sram.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/sram.h</a> (renamed from include/asm-avr32/arch-at32ap/sram.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/pio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/pio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/pm-at32ap700x.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/pm-at32ap700x.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/pm.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/pm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/pm.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/Kconfig</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/Makefile</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/blackfin/configs/BlackStamp_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/configs/BlackStamp_defconfig</a></td><td class='right'>1195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/blackfin/configs/TCM-BF537_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/configs/TCM-BF537_defconfig</a></td><td class='right'>693</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/.gitignore</a> (renamed from include/asm-blackfin/.gitignore)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/Kbuild</a> (renamed from include/asm-blackfin/Kbuild)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/a.out.h</a> (renamed from include/asm-blackfin/a.out.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/atomic.h</a> (renamed from include/asm-blackfin/atomic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/auxvec.h</a> (renamed from include/asm-blackfin/auxvec.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/bfin-global.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/bfin-global.h</a> (renamed from include/asm-blackfin/bfin-global.h)</td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/bfin5xx_spi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/bfin5xx_spi.h</a> (renamed from include/asm-blackfin/bfin5xx_spi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/bfin_simple_timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/bfin_simple_timer.h</a> (renamed from include/asm-blackfin/bfin_simple_timer.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/bfin_sport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/bfin_sport.h</a> (renamed from include/asm-blackfin/bfin_sport.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/bitops.h</a> (renamed from include/asm-blackfin/bitops.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/blackfin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/blackfin.h</a> (renamed from include/asm-blackfin/blackfin.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/bug.h</a> (renamed from include/asm-blackfin/bug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/bugs.h</a> (renamed from include/asm-blackfin/bugs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/byteorder.h</a> (renamed from include/asm-blackfin/byteorder.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/cache.h</a> (renamed from include/asm-blackfin/cache.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/cacheflush.h</a> (renamed from include/asm-blackfin/cacheflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/cdef_LPBlackfin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/cdef_LPBlackfin.h</a> (renamed from include/asm-blackfin/mach-common/cdef_LPBlackfin.h)</td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/checksum.h</a> (renamed from include/asm-blackfin/checksum.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/clocks.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/clocks.h</a> (renamed from include/asm-blackfin/mach-common/clocks.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/context.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/context.S</a> (renamed from include/asm-blackfin/mach-common/context.S)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/cplb-mpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/cplb-mpu.h</a> (renamed from include/asm-blackfin/cplb-mpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/cplb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/cplb.h</a> (renamed from include/asm-blackfin/cplb.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/cplbinit.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/cplbinit.h</a> (renamed from include/asm-blackfin/cplbinit.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/cpumask.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/cpumask.h</a> (renamed from include/asm-blackfin/cpumask.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/cputime.h</a> (renamed from include/asm-blackfin/cputime.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/current.h</a> (renamed from include/asm-blackfin/current.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/def_LPBlackfin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/def_LPBlackfin.h</a> (renamed from include/asm-blackfin/mach-common/def_LPBlackfin.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/delay.h</a> (renamed from include/asm-blackfin/delay.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/device.h</a> (renamed from include/asm-blackfin/device.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/div64.h</a> (renamed from include/asm-blackfin/div64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/dma-mapping.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/dma-mapping.h</a> (renamed from include/asm-blackfin/dma-mapping.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/dma.h</a> (renamed from include/asm-blackfin/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/dpmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/dpmc.h</a> (renamed from include/asm-blackfin/dpmc.h)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/early_printk.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/early_printk.h</a> (renamed from include/asm-blackfin/early_printk.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/elf.h</a> (renamed from include/asm-blackfin/elf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/emergency-restart.h</a> (renamed from include/asm-blackfin/emergency-restart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/entry.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/entry.h</a> (renamed from include/asm-blackfin/entry.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/errno.h</a> (renamed from include/asm-blackfin/errno.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/fb.h</a> (renamed from include/asm-blackfin/fb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/fcntl.h</a> (renamed from include/asm-blackfin/fcntl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/fixed_code.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/fixed_code.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/flat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/flat.h</a> (renamed from include/asm-blackfin/flat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/futex.h</a> (renamed from include/asm-blackfin/futex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/gpio.h</a> (renamed from include/asm-blackfin/gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/gptimers.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/gptimers.h</a> (renamed from include/asm-blackfin/gptimers.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/hardirq.h</a> (renamed from include/asm-blackfin/hardirq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/hw_irq.h</a> (renamed from include/asm-blackfin/hw_irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/io.h</a> (renamed from include/asm-blackfin/io.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/ioctl.h</a> (renamed from include/asm-blackfin/ioctl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/ioctls.h</a> (renamed from include/asm-blackfin/ioctls.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/ipcbuf.h</a> (renamed from include/asm-blackfin/ipcbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/irq.h</a> (renamed from include/asm-blackfin/irq.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/irq_handler.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/irq_handler.h</a> (renamed from include/asm-blackfin/irq_handler.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/irq_regs.h</a> (renamed from include/asm-blackfin/irq_regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/kdebug.h</a> (renamed from include/asm-blackfin/kdebug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/kgdb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/kgdb.h</a> (renamed from include/asm-blackfin/kgdb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/kmap_types.h</a> (renamed from include/asm-blackfin/kmap_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/l1layout.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/l1layout.h</a> (renamed from include/asm-blackfin/l1layout.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/linkage.h</a> (renamed from include/asm-blackfin/linkage.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/local.h</a> (renamed from include/asm-blackfin/local.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/mem_map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/mem_map.h</a> (renamed from include/asm-blackfin/mem_map.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/mman.h</a> (renamed from include/asm-blackfin/mman.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/mmu.h</a> (renamed from include/asm-blackfin/mmu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/mmu_context.h</a> (renamed from include/asm-blackfin/mmu_context.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/module.h</a> (renamed from include/asm-blackfin/module.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/msgbuf.h</a> (renamed from include/asm-blackfin/msgbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/mutex.h</a> (renamed from include/asm-blackfin/mutex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/nand.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/nand.h</a> (renamed from include/asm-blackfin/nand.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/page.h</a> (renamed from include/asm-blackfin/page.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/page_offset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/page_offset.h</a> (renamed from include/asm-blackfin/page_offset.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/param.h</a> (renamed from include/asm-blackfin/param.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/pci.h</a> (renamed from include/asm-blackfin/pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/percpu.h</a> (renamed from include/asm-blackfin/percpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/pgalloc.h</a> (renamed from include/asm-blackfin/pgalloc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/pgtable.h</a> (renamed from include/asm-blackfin/pgtable.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/poll.h</a> (renamed from include/asm-blackfin/poll.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/portmux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/portmux.h</a> (renamed from include/asm-blackfin/portmux.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/posix_types.h</a> (renamed from include/asm-blackfin/posix_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/processor.h</a> (renamed from include/asm-blackfin/processor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/ptrace.h</a> (renamed from include/asm-blackfin/ptrace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/reboot.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/reboot.h</a> (renamed from include/asm-blackfin/reboot.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/resource.h</a> (renamed from include/asm-blackfin/resource.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/scatterlist.h</a> (renamed from include/asm-blackfin/scatterlist.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/sections.h</a> (renamed from include/asm-blackfin/sections.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/segment.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/segment.h</a> (renamed from include/asm-blackfin/segment.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/sembuf.h</a> (renamed from include/asm-blackfin/sembuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/serial.h</a> (renamed from include/asm-blackfin/serial.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/setup.h</a> (renamed from include/asm-blackfin/setup.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/shmbuf.h</a> (renamed from include/asm-blackfin/shmbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/shmparam.h</a> (renamed from include/asm-blackfin/shmparam.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/sigcontext.h</a> (renamed from include/asm-blackfin/sigcontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/siginfo.h</a> (renamed from include/asm-blackfin/siginfo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/signal.h</a> (renamed from include/asm-blackfin/signal.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/socket.h</a> (renamed from include/asm-blackfin/socket.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/sockios.h</a> (renamed from include/asm-blackfin/sockios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/spinlock.h</a> (renamed from include/asm-blackfin/spinlock.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/stat.h</a> (renamed from include/asm-blackfin/stat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/statfs.h</a> (renamed from include/asm-blackfin/statfs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/string.h</a> (renamed from include/asm-blackfin/string.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/system.h</a> (renamed from include/asm-blackfin/system.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/termbits.h</a> (renamed from include/asm-blackfin/termbits.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/termios.h</a> (renamed from include/asm-blackfin/termios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/thread_info.h</a> (renamed from include/asm-blackfin/thread_info.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/time.h</a> (renamed from include/asm-blackfin/time.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/timex.h</a> (renamed from include/asm-blackfin/timex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/tlb.h</a> (renamed from include/asm-blackfin/tlb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/tlbflush.h</a> (renamed from include/asm-blackfin/tlbflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/topology.h</a> (renamed from include/asm-blackfin/topology.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/trace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/trace.h</a> (renamed from include/asm-blackfin/trace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/traps.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/traps.h</a> (renamed from include/asm-blackfin/traps.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/types.h</a> (renamed from include/asm-blackfin/types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/uaccess.h</a> (renamed from include/asm-blackfin/uaccess.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/ucontext.h</a> (renamed from include/asm-blackfin/ucontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/unaligned.h</a> (renamed from include/asm-blackfin/unaligned.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/unistd.h</a> (renamed from include/asm-blackfin/unistd.h)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/user.h</a> (renamed from include/asm-blackfin/user.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/kernel/cplb-mpu/cacheinit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/kernel/cplb-mpu/cacheinit.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/kernel/cplb-nompu/cacheinit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/kernel/cplb-nompu/cacheinit.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/kernel/cplb-nompu/cplbinit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/kernel/cplb-nompu/cplbinit.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/kernel/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/kernel/entry.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/kernel/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/kernel/setup.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/kernel/traps.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/kernel/traps.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/kernel/vmlinux.lds.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/kernel/vmlinux.lds.S</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/lib/ins.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/lib/ins.S</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/boards/cm_bf527.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/boards/cm_bf527.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/boards/ezkit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/boards/ezkit.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/head.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/head.S</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/anomaly.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/anomaly.h</a> (renamed from include/asm-blackfin/mach-bf527/anomaly.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/bf527.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/bf527.h</a> (renamed from include/asm-blackfin/mach-bf527/bf527.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h</a> (renamed from include/asm-blackfin/mach-bf527/bfin_serial_5xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/bfin_sir.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/bfin_sir.h</a> (renamed from include/asm-blackfin/mach-bf527/bfin_sir.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/blackfin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/blackfin.h</a> (renamed from include/asm-blackfin/mach-bf527/blackfin.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/cdefBF522.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/cdefBF522.h</a> (renamed from include/asm-blackfin/mach-bf527/cdefBF522.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/cdefBF525.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/cdefBF525.h</a> (renamed from include/asm-blackfin/mach-bf527/cdefBF525.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/cdefBF527.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/cdefBF527.h</a> (renamed from include/asm-blackfin/mach-bf527/cdefBF527.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h</a> (renamed from include/asm-blackfin/mach-bf527/cdefBF52x_base.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/defBF522.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/defBF522.h</a> (renamed from include/asm-blackfin/mach-bf527/defBF522.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/defBF525.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/defBF525.h</a> (renamed from include/asm-blackfin/mach-bf527/defBF525.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/defBF527.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/defBF527.h</a> (renamed from include/asm-blackfin/mach-bf527/defBF527.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/defBF52x_base.h</a> (renamed from include/asm-blackfin/mach-bf527/defBF52x_base.h)</td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/dma.h</a> (renamed from include/asm-blackfin/mach-bf527/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/irq.h</a> (renamed from include/asm-blackfin/mach-bf527/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/mem_init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/mem_init.h</a> (renamed from include/asm-blackfin/mach-bf527/mem_init.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/mem_map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/mem_map.h</a> (renamed from include/asm-blackfin/mach-bf527/mem_map.h)</td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/include/mach/portmux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/portmux.h</a> (renamed from include/asm-blackfin/mach-bf527/portmux.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/ints-priority.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/ints-priority.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/boards/H8606.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/boards/H8606.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/boards/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/boards/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/boards/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/boards/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/boards/blackstamp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/boards/blackstamp.c</a></td><td class='right'>401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/boards/cm_bf533.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/boards/cm_bf533.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/boards/ezkit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/boards/ezkit.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/boards/stamp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/boards/stamp.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/head.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/head.S</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/include/mach/anomaly.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/anomaly.h</a> (renamed from include/asm-blackfin/mach-bf533/anomaly.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/include/mach/bf533.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/bf533.h</a> (renamed from include/asm-blackfin/mach-bf533/bf533.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h</a> (renamed from include/asm-blackfin/mach-bf533/bfin_serial_5xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/include/mach/bfin_sir.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/bfin_sir.h</a> (renamed from include/asm-blackfin/mach-bf533/bfin_sir.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/include/mach/blackfin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/blackfin.h</a> (renamed from include/asm-blackfin/mach-bf533/blackfin.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/include/mach/cdefBF532.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/cdefBF532.h</a> (renamed from include/asm-blackfin/mach-bf533/cdefBF532.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/include/mach/defBF532.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/defBF532.h</a> (renamed from include/asm-blackfin/mach-bf533/defBF532.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/dma.h</a> (renamed from include/asm-blackfin/mach-bf533/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/include/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/irq.h</a> (renamed from include/asm-blackfin/mach-bf533/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/include/mach/mem_init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/mem_init.h</a> (renamed from include/asm-blackfin/mach-bf533/mem_init.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/include/mach/mem_map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/mem_map.h</a> (renamed from include/asm-blackfin/mach-bf533/mem_map.h)</td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/include/mach/portmux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/portmux.h</a> (renamed from include/asm-blackfin/mach-bf533/portmux.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/ints-priority.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/ints-priority.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/boards/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/boards/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/boards/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/boards/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/boards/cm_bf537.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/boards/cm_bf537.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/boards/generic_board.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/boards/generic_board.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/boards/minotaur.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/boards/minotaur.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/boards/pnav10.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/boards/pnav10.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/boards/stamp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/boards/stamp.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/boards/tcm_bf537.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/boards/tcm_bf537.c</a></td><td class='right'>590</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/head.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/head.S</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/include/mach/anomaly.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/anomaly.h</a> (renamed from include/asm-blackfin/mach-bf537/anomaly.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/include/mach/bf537.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/bf537.h</a> (renamed from include/asm-blackfin/mach-bf537/bf537.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h</a> (renamed from include/asm-blackfin/mach-bf537/bfin_serial_5xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/include/mach/bfin_sir.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/bfin_sir.h</a> (renamed from include/asm-blackfin/mach-bf537/bfin_sir.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/include/mach/blackfin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/blackfin.h</a> (renamed from include/asm-blackfin/mach-bf537/blackfin.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/include/mach/cdefBF534.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/cdefBF534.h</a> (renamed from include/asm-blackfin/mach-bf537/cdefBF534.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/include/mach/cdefBF537.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/cdefBF537.h</a> (renamed from include/asm-blackfin/mach-bf537/cdefBF537.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/include/mach/defBF534.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/defBF534.h</a> (renamed from include/asm-blackfin/mach-bf537/defBF534.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/include/mach/defBF537.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/defBF537.h</a> (renamed from include/asm-blackfin/mach-bf537/defBF537.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/dma.h</a> (renamed from include/asm-blackfin/mach-bf537/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/include/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/irq.h</a> (renamed from include/asm-blackfin/mach-bf537/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/include/mach/mem_init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/mem_init.h</a> (renamed from include/asm-blackfin/mach-bf537/mem_init.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/include/mach/mem_map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/mem_map.h</a> (renamed from include/asm-blackfin/mach-bf537/mem_map.h)</td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/include/mach/portmux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/portmux.h</a> (renamed from include/asm-blackfin/mach-bf537/portmux.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/ints-priority.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/ints-priority.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/boards/cm_bf548.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/boards/cm_bf548.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/boards/ezkit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/boards/ezkit.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/head.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/head.S</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/anomaly.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/anomaly.h</a> (renamed from include/asm-blackfin/mach-bf548/anomaly.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/bf548.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/bf548.h</a> (renamed from include/asm-blackfin/mach-bf548/bf548.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/bf54x-lq043.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/bf54x-lq043.h</a> (renamed from include/asm-blackfin/mach-bf548/bf54x-lq043.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/bf54x_keys.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/bf54x_keys.h</a> (renamed from include/asm-blackfin/mach-bf548/bf54x_keys.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h</a> (renamed from include/asm-blackfin/mach-bf548/bfin_serial_5xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/bfin_sir.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/bfin_sir.h</a> (renamed from include/asm-blackfin/mach-bf548/bfin_sir.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/blackfin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/blackfin.h</a> (renamed from include/asm-blackfin/mach-bf548/blackfin.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/cdefBF542.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/cdefBF542.h</a> (renamed from include/asm-blackfin/mach-bf548/cdefBF542.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/cdefBF544.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/cdefBF544.h</a> (renamed from include/asm-blackfin/mach-bf548/cdefBF544.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/cdefBF547.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/cdefBF547.h</a> (renamed from include/asm-blackfin/mach-bf548/cdefBF547.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/cdefBF548.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/cdefBF548.h</a> (renamed from include/asm-blackfin/mach-bf548/cdefBF548.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/cdefBF549.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/cdefBF549.h</a> (renamed from include/asm-blackfin/mach-bf548/cdefBF549.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h</a> (renamed from include/asm-blackfin/mach-bf548/cdefBF54x_base.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/defBF542.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/defBF542.h</a> (renamed from include/asm-blackfin/mach-bf548/defBF542.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/defBF544.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/defBF544.h</a> (renamed from include/asm-blackfin/mach-bf548/defBF544.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/defBF547.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/defBF547.h</a> (renamed from include/asm-blackfin/mach-bf548/defBF547.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/defBF548.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/defBF548.h</a> (renamed from include/asm-blackfin/mach-bf548/defBF548.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/defBF549.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/defBF549.h</a> (renamed from include/asm-blackfin/mach-bf548/defBF549.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/defBF54x_base.h</a> (renamed from include/asm-blackfin/mach-bf548/defBF54x_base.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/dma.h</a> (renamed from include/asm-blackfin/mach-bf548/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/gpio.h</a> (renamed from include/asm-blackfin/mach-bf548/gpio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/irq.h</a> (renamed from include/asm-blackfin/mach-bf548/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/mem_init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/mem_init.h</a> (renamed from include/asm-blackfin/mach-bf548/mem_init.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/mem_map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/mem_map.h</a> (renamed from include/asm-blackfin/mach-bf548/mem_map.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/include/mach/portmux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/portmux.h</a> (renamed from include/asm-blackfin/mach-bf548/portmux.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/ints-priority.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/ints-priority.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/boards/cm_bf561.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/boards/cm_bf561.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/boards/ezkit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/boards/ezkit.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/head.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/head.S</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/include/mach/anomaly.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/anomaly.h</a> (renamed from include/asm-blackfin/mach-bf561/anomaly.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/include/mach/bf561.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/bf561.h</a> (renamed from include/asm-blackfin/mach-bf561/bf561.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h</a> (renamed from include/asm-blackfin/mach-bf561/bfin_serial_5xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/include/mach/bfin_sir.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/bfin_sir.h</a> (renamed from include/asm-blackfin/mach-bf561/bfin_sir.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/include/mach/blackfin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/blackfin.h</a> (renamed from include/asm-blackfin/mach-bf561/blackfin.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/include/mach/cdefBF561.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/cdefBF561.h</a> (renamed from include/asm-blackfin/mach-bf561/cdefBF561.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/include/mach/defBF561.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/defBF561.h</a> (renamed from include/asm-blackfin/mach-bf561/defBF561.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/dma.h</a> (renamed from include/asm-blackfin/mach-bf561/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/include/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/irq.h</a> (renamed from include/asm-blackfin/mach-bf561/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/include/mach/mem_init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/mem_init.h</a> (renamed from include/asm-blackfin/mach-bf561/mem_init.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/include/mach/mem_map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/mem_map.h</a> (renamed from include/asm-blackfin/mach-bf561/mem_map.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/include/mach/portmux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/portmux.h</a> (renamed from include/asm-blackfin/mach-bf561/portmux.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/ints-priority.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/ints-priority.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-common/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-common/arch_checks.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/arch_checks.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-common/cache.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/cache.S</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/blackfin/mach-common/cacheinit.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/cacheinit.S</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-common/dpmc_modes.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/dpmc_modes.S</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-common/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/entry.S</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/blackfin/mach-common/head.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/head.S</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-common/interrupt.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/interrupt.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-common/ints-priority.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/ints-priority.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-common/lock.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/lock.S</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-common/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/pm.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mm/blackfin_sram.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mm/blackfin_sram.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/kernel/fasttimer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/cris/arch-v32/kernel/fasttimer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/frv/kernel/entry.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/Kbuild</a> (renamed from include/asm-h8300/Kbuild)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/a.out.h</a> (renamed from include/asm-h8300/a.out.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/atomic.h</a> (renamed from include/asm-h8300/atomic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/auxvec.h</a> (renamed from include/asm-h8300/auxvec.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/bitops.h</a> (renamed from include/asm-h8300/bitops.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/bootinfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/bootinfo.h</a> (renamed from include/asm-h8300/bootinfo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/bug.h</a> (renamed from include/asm-h8300/bug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/bugs.h</a> (renamed from include/asm-h8300/bugs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/byteorder.h</a> (renamed from include/asm-h8300/byteorder.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/cache.h</a> (renamed from include/asm-h8300/cache.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/cachectl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/cachectl.h</a> (renamed from include/asm-h8300/cachectl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/cacheflush.h</a> (renamed from include/asm-h8300/cacheflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/checksum.h</a> (renamed from include/asm-h8300/checksum.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/cputime.h</a> (renamed from include/asm-h8300/cputime.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/current.h</a> (renamed from include/asm-h8300/current.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/dbg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/dbg.h</a> (renamed from include/asm-h8300/dbg.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/delay.h</a> (renamed from include/asm-h8300/delay.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/device.h</a> (renamed from include/asm-h8300/device.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/div64.h</a> (renamed from include/asm-h8300/div64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/dma.h</a> (renamed from include/asm-h8300/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/elf.h</a> (renamed from include/asm-h8300/elf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/emergency-restart.h</a> (renamed from include/asm-h8300/emergency-restart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/errno.h</a> (renamed from include/asm-h8300/errno.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/fb.h</a> (renamed from include/asm-h8300/fb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/fcntl.h</a> (renamed from include/asm-h8300/fcntl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/flat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/flat.h</a> (renamed from include/asm-h8300/flat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/fpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/fpu.h</a> (renamed from include/asm-h8300/fpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/futex.h</a> (renamed from include/asm-h8300/futex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/gpio.h</a> (renamed from include/asm-h8300/gpio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/hardirq.h</a> (renamed from include/asm-h8300/hardirq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/hw_irq.h</a> (renamed from include/asm-h8300/hw_irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/io.h</a> (renamed from include/asm-h8300/io.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/ioctl.h</a> (renamed from include/asm-h8300/ioctl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/ioctls.h</a> (renamed from include/asm-h8300/ioctls.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/ipcbuf.h</a> (renamed from include/asm-h8300/ipcbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/irq.h</a> (renamed from include/asm-h8300/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/irq_regs.h</a> (renamed from include/asm-h8300/irq_regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/kdebug.h</a> (renamed from include/asm-h8300/kdebug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/kmap_types.h</a> (renamed from include/asm-h8300/kmap_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/linkage.h</a> (renamed from include/asm-h8300/linkage.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/local.h</a> (renamed from include/asm-h8300/local.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/mc146818rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/mc146818rtc.h</a> (renamed from include/asm-h8300/mc146818rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/md.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/md.h</a> (renamed from include/asm-h8300/md.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/mman.h</a> (renamed from include/asm-h8300/mman.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/mmu.h</a> (renamed from include/asm-h8300/mmu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/mmu_context.h</a> (renamed from include/asm-h8300/mmu_context.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/module.h</a> (renamed from include/asm-h8300/module.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/msgbuf.h</a> (renamed from include/asm-h8300/msgbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/mutex.h</a> (renamed from include/asm-h8300/mutex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/page.h</a> (renamed from include/asm-h8300/page.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/page_offset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/page_offset.h</a> (renamed from include/asm-h8300/page_offset.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/param.h</a> (renamed from include/asm-h8300/param.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/pci.h</a> (renamed from include/asm-h8300/pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/percpu.h</a> (renamed from include/asm-h8300/percpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/pgalloc.h</a> (renamed from include/asm-h8300/pgalloc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/pgtable.h</a> (renamed from include/asm-h8300/pgtable.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/poll.h</a> (renamed from include/asm-h8300/poll.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/posix_types.h</a> (renamed from include/asm-h8300/posix_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/processor.h</a> (renamed from include/asm-h8300/processor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/ptrace.h</a> (renamed from include/asm-h8300/ptrace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/regs267x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/regs267x.h</a> (renamed from include/asm-h8300/regs267x.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/regs306x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/regs306x.h</a> (renamed from include/asm-h8300/regs306x.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/resource.h</a> (renamed from include/asm-h8300/resource.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/scatterlist.h</a> (renamed from include/asm-h8300/scatterlist.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/sections.h</a> (renamed from include/asm-h8300/sections.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/segment.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/segment.h</a> (renamed from include/asm-h8300/segment.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/sembuf.h</a> (renamed from include/asm-h8300/sembuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/setup.h</a> (renamed from include/asm-h8300/setup.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/sh_bios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/sh_bios.h</a> (renamed from include/asm-h8300/sh_bios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/shm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/shm.h</a> (renamed from include/asm-h8300/shm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/shmbuf.h</a> (renamed from include/asm-h8300/shmbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/shmparam.h</a> (renamed from include/asm-h8300/shmparam.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/sigcontext.h</a> (renamed from include/asm-h8300/sigcontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/siginfo.h</a> (renamed from include/asm-h8300/siginfo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/signal.h</a> (renamed from include/asm-h8300/signal.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/smp.h</a> (renamed from include/asm-h8300/smp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/socket.h</a> (renamed from include/asm-h8300/socket.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/sockios.h</a> (renamed from include/asm-h8300/sockios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/spinlock.h</a> (renamed from include/asm-h8300/spinlock.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/stat.h</a> (renamed from include/asm-h8300/stat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/statfs.h</a> (renamed from include/asm-h8300/statfs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/string.h</a> (renamed from include/asm-h8300/string.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/system.h</a> (renamed from include/asm-h8300/system.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/target_time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/target_time.h</a> (renamed from include/asm-h8300/target_time.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/termbits.h</a> (renamed from include/asm-h8300/termbits.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/termios.h</a> (renamed from include/asm-h8300/termios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/thread_info.h</a> (renamed from include/asm-h8300/thread_info.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/timex.h</a> (renamed from include/asm-h8300/timex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/tlb.h</a> (renamed from include/asm-h8300/tlb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/tlbflush.h</a> (renamed from include/asm-h8300/tlbflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/topology.h</a> (renamed from include/asm-h8300/topology.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/traps.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/traps.h</a> (renamed from include/asm-h8300/traps.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/types.h</a> (renamed from include/asm-h8300/types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/uaccess.h</a> (renamed from include/asm-h8300/uaccess.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/ucontext.h</a> (renamed from include/asm-h8300/ucontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/unaligned.h</a> (renamed from include/asm-h8300/unaligned.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/unistd.h</a> (renamed from include/asm-h8300/unistd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/user.h</a> (renamed from include/asm-h8300/user.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/virtconvert.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/virtconvert.h</a> (renamed from include/asm-h8300/virtconvert.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/mm/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/mm/init.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/configs/generic_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/configs/generic_defconfig</a></td><td class='right'>586</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/ia64/configs/sn2_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/configs/sn2_defconfig</a></td><td class='right'>1285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.0%;'/><td class='none' style='width: 85.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/ia32/ia32_entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/ia32/ia32_entry.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/ia32/ia32priv.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/ia32/ia32priv.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/ia32/sys_ia32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/ia32/sys_ia32.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/Kbuild</a> (renamed from include/asm-ia64/Kbuild)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/a.out.h</a> (renamed from include/asm-ia64/a.out.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/acpi-ext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/acpi-ext.h</a> (renamed from include/asm-ia64/acpi-ext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/acpi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/acpi.h</a> (renamed from include/asm-ia64/acpi.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/agp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/agp.h</a> (renamed from include/asm-ia64/agp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/asmmacro.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/asmmacro.h</a> (renamed from include/asm-ia64/asmmacro.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/atomic.h</a> (renamed from include/asm-ia64/atomic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/auxvec.h</a> (renamed from include/asm-ia64/auxvec.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/bitops.h</a> (renamed from include/asm-ia64/bitops.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/break.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/break.h</a> (renamed from include/asm-ia64/break.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/bug.h</a> (renamed from include/asm-ia64/bug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/bugs.h</a> (renamed from include/asm-ia64/bugs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/byteorder.h</a> (renamed from include/asm-ia64/byteorder.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/cache.h</a> (renamed from include/asm-ia64/cache.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/cacheflush.h</a> (renamed from include/asm-ia64/cacheflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/checksum.h</a> (renamed from include/asm-ia64/checksum.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/compat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/compat.h</a> (renamed from include/asm-ia64/compat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/cpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/cpu.h</a> (renamed from include/asm-ia64/cpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/cputime.h</a> (renamed from include/asm-ia64/cputime.h)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/current.h</a> (renamed from include/asm-ia64/current.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/cyclone.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/cyclone.h</a> (renamed from include/asm-ia64/cyclone.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/delay.h</a> (renamed from include/asm-ia64/delay.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/device.h</a> (renamed from include/asm-ia64/device.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/div64.h</a> (renamed from include/asm-ia64/div64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/dma-mapping.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/dma-mapping.h</a> (renamed from include/asm-ia64/dma-mapping.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/dma.h</a> (renamed from include/asm-ia64/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/dmi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/dmi.h</a> (renamed from include/asm-ia64/dmi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/elf.h</a> (renamed from include/asm-ia64/elf.h)</td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/emergency-restart.h</a> (renamed from include/asm-ia64/emergency-restart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/errno.h</a> (renamed from include/asm-ia64/errno.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/esi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/esi.h</a> (renamed from include/asm-ia64/esi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/fb.h</a> (renamed from include/asm-ia64/fb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/fcntl.h</a> (renamed from include/asm-ia64/fcntl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/fpswa.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/fpswa.h</a> (renamed from include/asm-ia64/fpswa.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/fpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/fpu.h</a> (renamed from include/asm-ia64/fpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/futex.h</a> (renamed from include/asm-ia64/futex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/gcc_intrin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/gcc_intrin.h</a> (renamed from include/asm-ia64/gcc_intrin.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/hardirq.h</a> (renamed from include/asm-ia64/hardirq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/hpsim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/hpsim.h</a> (renamed from include/asm-ia64/hpsim.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/hugetlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/hugetlb.h</a> (renamed from include/asm-ia64/hugetlb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/hw_irq.h</a> (renamed from include/asm-ia64/hw_irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/ia32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ia32.h</a> (renamed from include/asm-ia64/ia32.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/ia64regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ia64regs.h</a> (renamed from include/asm-ia64/ia64regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/intel_intrin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/intel_intrin.h</a> (renamed from include/asm-ia64/intel_intrin.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/intrinsics.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/intrinsics.h</a> (renamed from include/asm-ia64/intrinsics.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/io.h</a> (renamed from include/asm-ia64/io.h)</td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ioctl.h</a> (renamed from include/asm-ia64/ioctl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ioctls.h</a> (renamed from include/asm-ia64/ioctls.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/iosapic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/iosapic.h</a> (renamed from include/asm-ia64/iosapic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ipcbuf.h</a> (renamed from include/asm-ia64/ipcbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/irq.h</a> (renamed from include/asm-ia64/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/irq_regs.h</a> (renamed from include/asm-ia64/irq_regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/kdebug.h</a> (renamed from include/asm-ia64/kdebug.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/kexec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/kexec.h</a> (renamed from include/asm-ia64/kexec.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/kmap_types.h</a> (renamed from include/asm-ia64/kmap_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/kprobes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/kprobes.h</a> (renamed from include/asm-ia64/kprobes.h)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/kregs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/kregs.h</a> (renamed from include/asm-ia64/kregs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/kvm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/kvm.h</a> (renamed from include/asm-ia64/kvm.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/kvm_host.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/kvm_host.h</a> (renamed from include/asm-ia64/kvm_host.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/kvm_para.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/kvm_para.h</a> (renamed from include/asm-ia64/kvm_para.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/libata-portmap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/libata-portmap.h</a> (renamed from include/asm-ia64/libata-portmap.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/linkage.h</a> (renamed from include/asm-ia64/linkage.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/local.h</a> (renamed from include/asm-ia64/local.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/machvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/machvec.h</a> (renamed from include/asm-ia64/machvec.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/machvec_dig.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/machvec_dig.h</a> (renamed from include/asm-ia64/machvec_dig.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/machvec_hpsim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/machvec_hpsim.h</a> (renamed from include/asm-ia64/machvec_hpsim.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/machvec_hpzx1.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/machvec_hpzx1.h</a> (renamed from include/asm-ia64/machvec_hpzx1.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/machvec_hpzx1_swiotlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/machvec_hpzx1_swiotlb.h</a> (renamed from include/asm-ia64/machvec_hpzx1_swiotlb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/machvec_init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/machvec_init.h</a> (renamed from include/asm-ia64/machvec_init.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/machvec_sn2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/machvec_sn2.h</a> (renamed from include/asm-ia64/machvec_sn2.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/machvec_uv.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/machvec_uv.h</a> (renamed from include/asm-ia64/machvec_uv.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/mc146818rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/mc146818rtc.h</a> (renamed from include/asm-ia64/mc146818rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/mca.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/mca.h</a> (renamed from include/asm-ia64/mca.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/mca_asm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/mca_asm.h</a> (renamed from include/asm-ia64/mca_asm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/meminit.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/meminit.h</a> (renamed from include/asm-ia64/meminit.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/mman.h</a> (renamed from include/asm-ia64/mman.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/mmu.h</a> (renamed from include/asm-ia64/mmu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/mmu_context.h</a> (renamed from include/asm-ia64/mmu_context.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/mmzone.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/mmzone.h</a> (renamed from include/asm-ia64/mmzone.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/module.h</a> (renamed from include/asm-ia64/module.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/msgbuf.h</a> (renamed from include/asm-ia64/msgbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/mutex.h</a> (renamed from include/asm-ia64/mutex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/native/inst.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/native/inst.h</a> (renamed from include/asm-ia64/native/inst.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/native/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/native/irq.h</a> (renamed from include/asm-ia64/native/irq.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/nodedata.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/nodedata.h</a> (renamed from include/asm-ia64/nodedata.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/numa.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/numa.h</a> (renamed from include/asm-ia64/numa.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/page.h</a> (renamed from include/asm-ia64/page.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/pal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/pal.h</a> (renamed from include/asm-ia64/pal.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/param.h</a> (renamed from include/asm-ia64/param.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/paravirt.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/paravirt.h</a> (renamed from include/asm-ia64/paravirt.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/paravirt_privop.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/paravirt_privop.h</a> (renamed from include/asm-ia64/paravirt_privop.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/parport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/parport.h</a> (renamed from include/asm-ia64/parport.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/patch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/patch.h</a> (renamed from include/asm-ia64/patch.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/pci.h</a> (renamed from include/asm-ia64/pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/percpu.h</a> (renamed from include/asm-ia64/percpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/perfmon.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/perfmon.h</a> (renamed from include/asm-ia64/perfmon.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/perfmon_default_smpl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/perfmon_default_smpl.h</a> (renamed from include/asm-ia64/perfmon_default_smpl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/pgalloc.h</a> (renamed from include/asm-ia64/pgalloc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/pgtable.h</a> (renamed from include/asm-ia64/pgtable.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/poll.h</a> (renamed from include/asm-ia64/poll.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/posix_types.h</a> (renamed from include/asm-ia64/posix_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/processor.h</a> (renamed from include/asm-ia64/processor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ptrace.h</a> (renamed from include/asm-ia64/ptrace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/ptrace_offsets.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ptrace_offsets.h</a> (renamed from include/asm-ia64/ptrace_offsets.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/resource.h</a> (renamed from include/asm-ia64/resource.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/rse.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/rse.h</a> (renamed from include/asm-ia64/rse.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/rwsem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/rwsem.h</a> (renamed from include/asm-ia64/rwsem.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sal.h</a> (renamed from include/asm-ia64/sal.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/scatterlist.h</a> (renamed from include/asm-ia64/scatterlist.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sections.h</a> (renamed from include/asm-ia64/sections.h)</td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/segment.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/segment.h</a> (renamed from include/asm-ia64/segment.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sembuf.h</a> (renamed from include/asm-ia64/sembuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/serial.h</a> (renamed from include/asm-ia64/serial.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/setup.h</a> (renamed from include/asm-ia64/setup.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/shmbuf.h</a> (renamed from include/asm-ia64/shmbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/shmparam.h</a> (renamed from include/asm-ia64/shmparam.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sigcontext.h</a> (renamed from include/asm-ia64/sigcontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/siginfo.h</a> (renamed from include/asm-ia64/siginfo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/signal.h</a> (renamed from include/asm-ia64/signal.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/smp.h</a> (renamed from include/asm-ia64/smp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/acpi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/acpi.h</a> (renamed from include/asm-ia64/sn/acpi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/addrs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/addrs.h</a> (renamed from include/asm-ia64/sn/addrs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/arch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/arch.h</a> (renamed from include/asm-ia64/sn/arch.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/bte.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/bte.h</a> (renamed from include/asm-ia64/sn/bte.h)</td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/clksupport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/clksupport.h</a> (renamed from include/asm-ia64/sn/clksupport.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/geo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/geo.h</a> (renamed from include/asm-ia64/sn/geo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/intr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/intr.h</a> (renamed from include/asm-ia64/sn/intr.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/io.h</a> (renamed from include/asm-ia64/sn/io.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/ioc3.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/ioc3.h</a> (renamed from include/asm-ia64/sn/ioc3.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/klconfig.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/klconfig.h</a> (renamed from include/asm-ia64/sn/klconfig.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/l1.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/l1.h</a> (renamed from include/asm-ia64/sn/l1.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/leds.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/leds.h</a> (renamed from include/asm-ia64/sn/leds.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/module.h</a> (renamed from include/asm-ia64/sn/module.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/mspec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/mspec.h</a> (renamed from include/asm-ia64/sn/mspec.h)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/nodepda.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/nodepda.h</a> (renamed from include/asm-ia64/sn/nodepda.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/pcibr_provider.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/pcibr_provider.h</a> (renamed from include/asm-ia64/sn/pcibr_provider.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/pcibus_provider_defs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/pcibus_provider_defs.h</a> (renamed from include/asm-ia64/sn/pcibus_provider_defs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/pcidev.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/pcidev.h</a> (renamed from include/asm-ia64/sn/pcidev.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/pda.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/pda.h</a> (renamed from include/asm-ia64/sn/pda.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/pic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/pic.h</a> (renamed from include/asm-ia64/sn/pic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/rw_mmr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/rw_mmr.h</a> (renamed from include/asm-ia64/sn/rw_mmr.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/shub_mmr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/shub_mmr.h</a> (renamed from include/asm-ia64/sn/shub_mmr.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/shubio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/shubio.h</a> (renamed from include/asm-ia64/sn/shubio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/simulator.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/simulator.h</a> (renamed from include/asm-ia64/sn/simulator.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/sn2/sn_hwperf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/sn2/sn_hwperf.h</a> (renamed from include/asm-ia64/sn/sn2/sn_hwperf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/sn_cpuid.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/sn_cpuid.h</a> (renamed from include/asm-ia64/sn/sn_cpuid.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/sn_feature_sets.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/sn_feature_sets.h</a> (renamed from include/asm-ia64/sn/sn_feature_sets.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/sn_sal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/sn_sal.h</a> (renamed from include/asm-ia64/sn/sn_sal.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/tioca.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/tioca.h</a> (renamed from include/asm-ia64/sn/tioca.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/tioca_provider.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/tioca_provider.h</a> (renamed from include/asm-ia64/sn/tioca_provider.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/tioce.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/tioce.h</a> (renamed from include/asm-ia64/sn/tioce.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/tioce_provider.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/tioce_provider.h</a> (renamed from include/asm-ia64/sn/tioce_provider.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/tiocp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/tiocp.h</a> (renamed from include/asm-ia64/sn/tiocp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/tiocx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/tiocx.h</a> (renamed from include/asm-ia64/sn/tiocx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sn/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/types.h</a> (renamed from include/asm-ia64/sn/types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/socket.h</a> (renamed from include/asm-ia64/socket.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sockios.h</a> (renamed from include/asm-ia64/sockios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/sparsemem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sparsemem.h</a> (renamed from include/asm-ia64/sparsemem.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/spinlock.h</a> (renamed from include/asm-ia64/spinlock.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/spinlock_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/spinlock_types.h</a> (renamed from include/asm-ia64/spinlock_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/stat.h</a> (renamed from include/asm-ia64/stat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/statfs.h</a> (renamed from include/asm-ia64/statfs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/string.h</a> (renamed from include/asm-ia64/string.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/suspend.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/suspend.h</a> (renamed from include/asm-ia64/suspend.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/system.h</a> (renamed from include/asm-ia64/system.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/termbits.h</a> (renamed from include/asm-ia64/termbits.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/termios.h</a> (renamed from include/asm-ia64/termios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/thread_info.h</a> (renamed from include/asm-ia64/thread_info.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/timex.h</a> (renamed from include/asm-ia64/timex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/tlb.h</a> (renamed from include/asm-ia64/tlb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/tlbflush.h</a> (renamed from include/asm-ia64/tlbflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/topology.h</a> (renamed from include/asm-ia64/topology.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/types.h</a> (renamed from include/asm-ia64/types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/uaccess.h</a> (renamed from include/asm-ia64/uaccess.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ucontext.h</a> (renamed from include/asm-ia64/ucontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/unaligned.h</a> (renamed from include/asm-ia64/unaligned.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/uncached.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/uncached.h</a> (renamed from include/asm-ia64/uncached.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/unistd.h</a> (renamed from include/asm-ia64/unistd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/unwind.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/unwind.h</a> (renamed from include/asm-ia64/unwind.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/user.h</a> (renamed from include/asm-ia64/user.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/ustack.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ustack.h</a> (renamed from include/asm-ia64/ustack.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/uv/uv_hub.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/uv/uv_hub.h</a> (renamed from include/asm-ia64/uv/uv_hub.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/uv/uv_mmrs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/uv/uv_mmrs.h</a> (renamed from include/asm-ia64/uv/uv_mmrs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/vga.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/vga.h</a> (renamed from include/asm-ia64/vga.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/xor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/xor.h</a> (renamed from include/asm-ia64/xor.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/asm-offsets.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/asm-offsets.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/head.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/head.S</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/iosapic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/iosapic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/ivt.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/ivt.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/jprobes.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/jprobes.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/module.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/module.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/nr-irqs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/nr-irqs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/setup.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/smp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/smp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/smpboot.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/smpboot.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/vmlinux.lds.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/vmlinux.lds.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kvm/kvm-ia64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kvm/kvm-ia64.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/mm/contig.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/mm/contig.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/mm/discontig.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/mm/discontig.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/mm/hugetlbpage.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/mm/hugetlbpage.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/pci/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/pci/pci.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/kernel/iomv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/sn/kernel/iomv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/pci/tioca_provider.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/sn/pci/tioca_provider.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/atari/atakeyb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/atari/atakeyb.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/configs/amiga_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/amiga_defconfig</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/configs/apollo_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/apollo_defconfig</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/configs/atari_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/atari_defconfig</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/configs/bvme6000_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/bvme6000_defconfig</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/configs/hp300_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/hp300_defconfig</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/configs/mac_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/mac_defconfig</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/configs/multi_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/multi_defconfig</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/configs/mvme147_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/mvme147_defconfig</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/configs/mvme16x_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/mvme16x_defconfig</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/configs/q40_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/q40_defconfig</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/configs/sun3_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/sun3_defconfig</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/configs/sun3x_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/sun3x_defconfig</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/kernel/entry.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/baboon.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/mac/baboon.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/via.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/mac/via.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/Kbuild</a> (renamed from include/asm-m68knommu/Kbuild)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/MC68328.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/MC68328.h</a> (renamed from include/asm-m68knommu/MC68328.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/MC68332.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/MC68332.h</a> (renamed from include/asm-m68knommu/MC68332.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/MC68EZ328.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/MC68EZ328.h</a> (renamed from include/asm-m68knommu/MC68EZ328.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/MC68VZ328.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/MC68VZ328.h</a> (renamed from include/asm-m68knommu/MC68VZ328.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/a.out.h</a> (renamed from include/asm-m68knommu/a.out.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/anchor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/anchor.h</a> (renamed from include/asm-m68knommu/anchor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/atomic.h</a> (renamed from include/asm-m68knommu/atomic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/auxvec.h</a> (renamed from include/asm-m68knommu/auxvec.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/bitops.h</a> (renamed from include/asm-m68knommu/bitops.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/bootinfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/bootinfo.h</a> (renamed from include/asm-m68knommu/bootinfo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/bootstd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/bootstd.h</a> (renamed from include/asm-m68knommu/bootstd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/bug.h</a> (renamed from include/asm-m68knommu/bug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/bugs.h</a> (renamed from include/asm-m68knommu/bugs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/byteorder.h</a> (renamed from include/asm-m68knommu/byteorder.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/cache.h</a> (renamed from include/asm-m68knommu/cache.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/cachectl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/cachectl.h</a> (renamed from include/asm-m68knommu/cachectl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/cacheflush.h</a> (renamed from include/asm-m68knommu/cacheflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/checksum.h</a> (renamed from include/asm-m68knommu/checksum.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/coldfire.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/coldfire.h</a> (renamed from include/asm-m68knommu/coldfire.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/commproc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/commproc.h</a> (renamed from include/asm-m68knommu/commproc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/cputime.h</a> (renamed from include/asm-m68knommu/cputime.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/current.h</a> (renamed from include/asm-m68knommu/current.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/dbg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/dbg.h</a> (renamed from include/asm-m68knommu/dbg.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/delay.h</a> (renamed from include/asm-m68knommu/delay.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/device.h</a> (renamed from include/asm-m68knommu/device.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/div64.h</a> (renamed from include/asm-m68knommu/div64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/dma-mapping.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/dma-mapping.h</a> (renamed from include/asm-m68knommu/dma-mapping.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/dma.h</a> (renamed from include/asm-m68knommu/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/elf.h</a> (renamed from include/asm-m68knommu/elf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/elia.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/elia.h</a> (renamed from include/asm-m68knommu/elia.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/emergency-restart.h</a> (renamed from include/asm-m68knommu/emergency-restart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/entry.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/entry.h</a> (renamed from include/asm-m68knommu/entry.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/errno.h</a> (renamed from include/asm-m68knommu/errno.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/fb.h</a> (renamed from include/asm-m68knommu/fb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/fcntl.h</a> (renamed from include/asm-m68knommu/fcntl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/flat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/flat.h</a> (renamed from include/asm-m68knommu/flat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/fpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/fpu.h</a> (renamed from include/asm-m68knommu/fpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/futex.h</a> (renamed from include/asm-m68knommu/futex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/hardirq.h</a> (renamed from include/asm-m68knommu/hardirq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/hw_irq.h</a> (renamed from include/asm-m68knommu/hw_irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/hwtest.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/hwtest.h</a> (renamed from include/asm-m68knommu/hwtest.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/io.h</a> (renamed from include/asm-m68knommu/io.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/ioctl.h</a> (renamed from include/asm-m68knommu/ioctl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/ioctls.h</a> (renamed from include/asm-m68knommu/ioctls.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/ipcbuf.h</a> (renamed from include/asm-m68knommu/ipcbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/irq.h</a> (renamed from include/asm-m68knommu/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/irq_regs.h</a> (renamed from include/asm-m68knommu/irq_regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/kdebug.h</a> (renamed from include/asm-m68knommu/kdebug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/kmap_types.h</a> (renamed from include/asm-m68knommu/kmap_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/linkage.h</a> (renamed from include/asm-m68knommu/linkage.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/local.h</a> (renamed from include/asm-m68knommu/local.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/m5206sim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m5206sim.h</a> (renamed from include/asm-m68knommu/m5206sim.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/m520xsim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m520xsim.h</a> (renamed from include/asm-m68knommu/m520xsim.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/m523xsim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m523xsim.h</a> (renamed from include/asm-m68knommu/m523xsim.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/m5249sim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m5249sim.h</a> (renamed from include/asm-m68knommu/m5249sim.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/m5272sim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m5272sim.h</a> (renamed from include/asm-m68knommu/m5272sim.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/m527xsim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m527xsim.h</a> (renamed from include/asm-m68knommu/m527xsim.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/m528xsim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m528xsim.h</a> (renamed from include/asm-m68knommu/m528xsim.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/m5307sim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m5307sim.h</a> (renamed from include/asm-m68knommu/m5307sim.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/m532xsim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m532xsim.h</a> (renamed from include/asm-m68knommu/m532xsim.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/m5407sim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m5407sim.h</a> (renamed from include/asm-m68knommu/m5407sim.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/m68360.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m68360.h</a> (renamed from include/asm-m68knommu/m68360.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/m68360_enet.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m68360_enet.h</a> (renamed from include/asm-m68knommu/m68360_enet.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/m68360_pram.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m68360_pram.h</a> (renamed from include/asm-m68knommu/m68360_pram.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/m68360_quicc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m68360_quicc.h</a> (renamed from include/asm-m68knommu/m68360_quicc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/m68360_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m68360_regs.h</a> (renamed from include/asm-m68knommu/m68360_regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/machdep.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/machdep.h</a> (renamed from include/asm-m68knommu/machdep.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/math-emu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/math-emu.h</a> (renamed from include/asm-m68knommu/math-emu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/mc146818rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mc146818rtc.h</a> (renamed from include/asm-m68knommu/mc146818rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/mcfcache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfcache.h</a> (renamed from include/asm-m68knommu/mcfcache.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/mcfdma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfdma.h</a> (renamed from include/asm-m68knommu/mcfdma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/mcfmbus.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfmbus.h</a> (renamed from include/asm-m68knommu/mcfmbus.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/mcfne.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfne.h</a> (renamed from include/asm-m68knommu/mcfne.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/mcfpci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfpci.h</a> (renamed from include/asm-m68knommu/mcfpci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/mcfpit.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfpit.h</a> (renamed from include/asm-m68knommu/mcfpit.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/mcfsim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfsim.h</a> (renamed from include/asm-m68knommu/mcfsim.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/mcfsmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfsmc.h</a> (renamed from include/asm-m68knommu/mcfsmc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/mcftimer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcftimer.h</a> (renamed from include/asm-m68knommu/mcftimer.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/mcfuart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfuart.h</a> (renamed from include/asm-m68knommu/mcfuart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/mcfwdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfwdebug.h</a> (renamed from include/asm-m68knommu/mcfwdebug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/md.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/md.h</a> (renamed from include/asm-m68knommu/md.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mman.h</a> (renamed from include/asm-m68knommu/mman.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mmu.h</a> (renamed from include/asm-m68knommu/mmu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mmu_context.h</a> (renamed from include/asm-m68knommu/mmu_context.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/module.h</a> (renamed from include/asm-m68knommu/module.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/movs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/movs.h</a> (renamed from include/asm-m68knommu/movs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/msgbuf.h</a> (renamed from include/asm-m68knommu/msgbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mutex.h</a> (renamed from include/asm-m68knommu/mutex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/nettel.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/nettel.h</a> (renamed from include/asm-m68knommu/nettel.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/openprom.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/openprom.h</a> (renamed from include/asm-m68knommu/openprom.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/oplib.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/oplib.h</a> (renamed from include/asm-m68knommu/oplib.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/page.h</a> (renamed from include/asm-m68knommu/page.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/page_offset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/page_offset.h</a> (renamed from include/asm-m68knommu/page_offset.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/param.h</a> (renamed from include/asm-m68knommu/param.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/pci.h</a> (renamed from include/asm-m68knommu/pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/percpu.h</a> (renamed from include/asm-m68knommu/percpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/pgalloc.h</a> (renamed from include/asm-m68knommu/pgalloc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/pgtable.h</a> (renamed from include/asm-m68knommu/pgtable.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/poll.h</a> (renamed from include/asm-m68knommu/poll.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/posix_types.h</a> (renamed from include/asm-m68knommu/posix_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/processor.h</a> (renamed from include/asm-m68knommu/processor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/ptrace.h</a> (renamed from include/asm-m68knommu/ptrace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/quicc_simple.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/quicc_simple.h</a> (renamed from include/asm-m68knommu/quicc_simple.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/resource.h</a> (renamed from include/asm-m68knommu/resource.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/rtc.h</a> (renamed from include/asm-m68knommu/rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/scatterlist.h</a> (renamed from include/asm-m68knommu/scatterlist.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/sections.h</a> (renamed from include/asm-m68knommu/sections.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/segment.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/segment.h</a> (renamed from include/asm-m68knommu/segment.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/sembuf.h</a> (renamed from include/asm-m68knommu/sembuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/setup.h</a> (renamed from include/asm-m68knommu/setup.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/shm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/shm.h</a> (renamed from include/asm-m68knommu/shm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/shmbuf.h</a> (renamed from include/asm-m68knommu/shmbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/shmparam.h</a> (renamed from include/asm-m68knommu/shmparam.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/sigcontext.h</a> (renamed from include/asm-m68knommu/sigcontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/siginfo.h</a> (renamed from include/asm-m68knommu/siginfo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/signal.h</a> (renamed from include/asm-m68knommu/signal.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/smp.h</a> (renamed from include/asm-m68knommu/smp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/socket.h</a> (renamed from include/asm-m68knommu/socket.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/sockios.h</a> (renamed from include/asm-m68knommu/sockios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/spinlock.h</a> (renamed from include/asm-m68knommu/spinlock.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/stat.h</a> (renamed from include/asm-m68knommu/stat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/statfs.h</a> (renamed from include/asm-m68knommu/statfs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/string.h</a> (renamed from include/asm-m68knommu/string.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/system.h</a> (renamed from include/asm-m68knommu/system.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/termbits.h</a> (renamed from include/asm-m68knommu/termbits.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/termios.h</a> (renamed from include/asm-m68knommu/termios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/thread_info.h</a> (renamed from include/asm-m68knommu/thread_info.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/timex.h</a> (renamed from include/asm-m68knommu/timex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/tlb.h</a> (renamed from include/asm-m68knommu/tlb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/tlbflush.h</a> (renamed from include/asm-m68knommu/tlbflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/topology.h</a> (renamed from include/asm-m68knommu/topology.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/traps.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/traps.h</a> (renamed from include/asm-m68knommu/traps.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/types.h</a> (renamed from include/asm-m68knommu/types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/uaccess.h</a> (renamed from include/asm-m68knommu/uaccess.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/ucontext.h</a> (renamed from include/asm-m68knommu/ucontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/unaligned.h</a> (renamed from include/asm-m68knommu/unaligned.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/unistd.h</a> (renamed from include/asm-m68knommu/unistd.h)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68knommu/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/user.h</a> (renamed from include/asm-m68knommu/user.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/kernel/syscalltable.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/kernel/syscalltable.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/Kconfig.debug?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/Kconfig.debug</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/common/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/dbg_io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/common/dbg_io.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/db1x00/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/db1x00/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/mtx-1/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/mtx-1/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/pb1000/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/pb1000/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/pb1100/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/pb1100/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/pb1200/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/pb1200/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/pb1500/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/pb1500/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/pb1550/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/pb1550/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/xxs1500/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/xxs1500/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/basler/excite/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/basler/excite/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/basler/excite/excite_dbg_io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/basler/excite/excite_dbg_io.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/basler/excite/excite_irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/basler/excite/excite_irq.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/basler/excite/excite_setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/basler/excite/excite_setup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/cobalt_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/cobalt_defconfig</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/db1000_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/db1000_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/db1100_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/db1100_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/db1200_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/db1200_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/db1500_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/db1500_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/db1550_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/db1550_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/excite_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/excite_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/ip27_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/ip27_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/msp71xx_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/msp71xx_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/mtx1_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/mtx1_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/pb1100_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/pb1100_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/pb1500_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/pb1500_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/pb1550_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/pb1550_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/pnx8550-jbs_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/pnx8550-jbs_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/pnx8550-stb810_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/pnx8550-stb810_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/rbtx49xx_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/rbtx49xx_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/sb1250-swarm_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/sb1250-swarm_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/yosemite_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/yosemite_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/emma2rh/markeins/platform.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/emma2rh/markeins/platform.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/emma2rh/markeins/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/emma2rh/markeins/setup.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/jazz/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/jazz/setup.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/kernel/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/cpu-probe.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/cpu-probe.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/kernel/gdb-low.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/gdb-low.S</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/kernel/gdb-stub.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/gdb-stub.c</a></td><td class='right'>1155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.5%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/genex.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/genex.S</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/irq.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/kernel/kgdb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/kgdb.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/process.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/process.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/scall32-o32.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/scall32-o32.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/scall64-64.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/scall64-64.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/scall64-n32.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/scall64-n32.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/scall64-o32.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/scall64-o32.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/setup.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/traps.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/traps.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/vmlinux.lds.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lib/csum_partial.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/lib/csum_partial.S</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/c-r3k.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mm/c-r3k.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/c-r4k.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mm/c-r4k.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/c-tx39.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mm/c-tx39.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/cache.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mm/cache.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/tlb-r3k.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mm/tlb-r3k.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/tlbex.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mm/tlbex.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mti-malta/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mti-malta/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mti-malta/malta-init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mti-malta/malta-init.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/mti-malta/malta-kgdb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mti-malta/malta-kgdb.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mti-malta/malta-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mti-malta/malta-setup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/nxp/pnx8550/common/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/nxp/pnx8550/common/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/nxp/pnx8550/common/gdb_hook.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/nxp/pnx8550/common/gdb_hook.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/nxp/pnx8550/common/int.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/nxp/pnx8550/common/int.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/nxp/pnx8550/common/proc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/nxp/pnx8550/common/proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/nxp/pnx8550/common/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/nxp/pnx8550/common/setup.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/ops-tx3927.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pci/ops-tx3927.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/ops-tx4927.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pci/ops-tx4927.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-ip27.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pci/pci-ip27.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-tx4927.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pci/pci-tx4927.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-tx4938.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pci/pci-tx4938.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pci/pci.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pmc-sierra/msp71xx/msp_serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pmc-sierra/msp71xx/msp_serial.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pmc-sierra/yosemite/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pmc-sierra/yosemite/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/pmc-sierra/yosemite/dbg_io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pmc-sierra/yosemite/dbg_io.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pmc-sierra/yosemite/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pmc-sierra/yosemite/irq.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/rb532/devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/rb532/devices.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/rb532/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/rb532/gpio.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/rb532/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/rb532/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip22/ip22-platform.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/sgi-ip22/ip22-platform.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip22/ip22-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/sgi-ip22/ip22-setup.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip27/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/sgi-ip27/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip27/ip27-dbgio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/sgi-ip27/ip27-dbgio.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sibyte/bcm1480/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/sibyte/bcm1480/irq.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sibyte/cfe/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/sibyte/cfe/setup.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sibyte/sb1250/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/sibyte/sb1250/irq.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sibyte/swarm/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/sibyte/swarm/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/sibyte/swarm/dbg_io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/sibyte/swarm/dbg_io.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/Kconfig</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/generic/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/txx9/generic/dbgio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/dbgio.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/txx9/generic/irq_tx3927.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/irq_tx3927.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/generic/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/pci.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/generic/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/setup.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/txx9/generic/setup_tx3927.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/setup_tx3927.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/generic/setup_tx4927.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/setup_tx4927.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/generic/setup_tx4938.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/setup_tx4938.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/generic/smsc_fdc37m81x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/smsc_fdc37m81x.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/jmr3927/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/jmr3927/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/jmr3927/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/jmr3927/irq.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/txx9/jmr3927/kgdb_io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/jmr3927/kgdb_io.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/jmr3927/prom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/jmr3927/prom.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/jmr3927/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/jmr3927/setup.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/rbtx4927/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/rbtx4927/irq.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/rbtx4927/prom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/rbtx4927/prom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/rbtx4927/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/rbtx4927/setup.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/rbtx4938/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/rbtx4938/irq.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/rbtx4938/prom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/rbtx4938/prom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/rbtx4938/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/rbtx4938/setup.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/vr41xx/common/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/vr41xx/common/irq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mn10300/kernel/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mn10300/kernel/entry.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mn10300/kernel/mn10300-serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mn10300/kernel/mn10300-serial.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mn10300/kernel/module.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mn10300/kernel/module.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mn10300/mm/fault.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mn10300/mm/fault.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/hpux/fs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/parisc/hpux/fs.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/module.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/parisc/kernel/module.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/powerpc/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/Kconfig.debug?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/Kconfig.debug</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc832x_mds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc832x_mds.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc832x_rdb.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc832x_rdb.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8349emitx.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8349emitx.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8349emitxgp.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8349emitxgp.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc834x_mds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc834x_mds.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc836x_mds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc836x_mds.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc836x_rdk.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc836x_rdk.dts</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8377_mds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8377_mds.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8378_mds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8378_mds.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8379_mds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8379_mds.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8536ds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8536ds.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8540ads.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8540ads.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8541cds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8541cds.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8544ds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8544ds.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8548cds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8548cds.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8555cds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8555cds.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8560ads.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8560ads.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8568mds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8568mds.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8572ds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8572ds.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8610_hpcd.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8610_hpcd.dts</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8641_hpcn.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8641_hpcn.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/tqm8548-bigflash.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/tqm8548-bigflash.dts</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/tqm8548.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/tqm8548.dts</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/warp.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/warp.dts</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/io.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/wrapper?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/wrapper</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/40x/ep405_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/40x/ep405_defconfig</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/40x/kilauea_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/40x/kilauea_defconfig</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/40x/makalu_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/40x/makalu_defconfig</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/40x/walnut_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/40x/walnut_defconfig</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/44x/bamboo_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/bamboo_defconfig</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/44x/canyonlands_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/canyonlands_defconfig</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/44x/ebony_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/ebony_defconfig</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/44x/katmai_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/katmai_defconfig</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/44x/rainier_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/rainier_defconfig</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/44x/sam440ep_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/sam440ep_defconfig</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/44x/sequoia_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/sequoia_defconfig</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/44x/taishan_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/taishan_defconfig</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/44x/virtex5_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/virtex5_defconfig</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/44x/warp_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/warp_defconfig</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/configs/83xx/asp8347_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/asp8347_defconfig</a> (renamed from arch/powerpc/configs/asp8347_defconfig)</td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc8313_rdb_defconfig</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc8315_rdb_defconfig</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/83xx/mpc832x_mds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc832x_mds_defconfig</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc832x_rdb_defconfig</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/83xx/mpc834x_itx_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc834x_itx_defconfig</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/83xx/mpc834x_mds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc834x_mds_defconfig</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/83xx/mpc836x_mds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc836x_mds_defconfig</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc836x_rdk_defconfig</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/83xx/mpc837x_mds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc837x_mds_defconfig</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc837x_rdb_defconfig</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/83xx/sbc834x_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/sbc834x_defconfig</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/85xx/ksi8560_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/ksi8560_defconfig</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/configs/85xx/mpc8536_ds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/mpc8536_ds_defconfig</a> (renamed from arch/powerpc/configs/mpc8536_ds_defconfig)</td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/85xx/mpc8540_ads_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/mpc8540_ads_defconfig</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/85xx/mpc8544_ds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/mpc8544_ds_defconfig</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/85xx/mpc8560_ads_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/mpc8560_ads_defconfig</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/85xx/mpc8568mds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/mpc8568mds_defconfig</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/85xx/mpc8572_ds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/mpc8572_ds_defconfig</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/mpc85xx_cds_defconfig</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/85xx/sbc8548_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/sbc8548_defconfig</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/85xx/sbc8560_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/sbc8560_defconfig</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/85xx/stx_gp3_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/stx_gp3_defconfig</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/85xx/tqm8540_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/tqm8540_defconfig</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/85xx/tqm8541_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/tqm8541_defconfig</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/85xx/tqm8548_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/tqm8548_defconfig</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/85xx/tqm8555_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/tqm8555_defconfig</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/85xx/tqm8560_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/tqm8560_defconfig</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/adder875_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/adder875_defconfig</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/c2k_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/c2k_defconfig</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/chrp32_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/chrp32_defconfig</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/ep8248e_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/ep8248e_defconfig</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/ep88xc_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/ep88xc_defconfig</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/g5_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/g5_defconfig</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/iseries_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/iseries_defconfig</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/linkstation_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/linkstation_defconfig</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/maple_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/maple_defconfig</a></td><td class='right'>381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/mpc7448_hpc2_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/mpc7448_hpc2_defconfig</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/mpc8272_ads_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/mpc8272_ads_defconfig</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/mpc83xx_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/mpc83xx_defconfig</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/mpc85xx_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/mpc85xx_defconfig</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/mpc8610_hpcd_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/mpc8610_hpcd_defconfig</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/mpc8641_hpcn_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/mpc8641_hpcn_defconfig</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/mpc866_ads_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/mpc866_ads_defconfig</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/mpc885_ads_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/mpc885_ads_defconfig</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/pmac32_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/pmac32_defconfig</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/ppc40x_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/ppc40x_defconfig</a></td><td class='right'>374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/ppc44x_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/ppc44x_defconfig</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/ppc64_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/ppc64_defconfig</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/ppc6xx_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/ppc6xx_defconfig</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/pq2fads_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/pq2fads_defconfig</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/prpmc2800_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/prpmc2800_defconfig</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/ps3_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/ps3_defconfig</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/pseries_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/pseries_defconfig</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/sbc8641d_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/sbc8641d_defconfig</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/storcenter_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/storcenter_defconfig</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/8253pit.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/8253pit.h</a> (renamed from include/asm-powerpc/8253pit.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/8xx_immap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/8xx_immap.h</a> (renamed from include/asm-powerpc/8xx_immap.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/Kbuild</a> (renamed from include/asm-powerpc/Kbuild)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/a.out.h</a> (renamed from include/asm-powerpc/a.out.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/abs_addr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/abs_addr.h</a> (renamed from include/asm-powerpc/abs_addr.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/agp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/agp.h</a> (renamed from include/asm-powerpc/agp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/asm-compat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/asm-compat.h</a> (renamed from include/asm-powerpc/asm-compat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/atomic.h</a> (renamed from include/asm-powerpc/atomic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/auxvec.h</a> (renamed from include/asm-powerpc/auxvec.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/backlight.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/backlight.h</a> (renamed from include/asm-powerpc/backlight.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/bitops.h</a> (renamed from include/asm-powerpc/bitops.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/bootx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/bootx.h</a> (renamed from include/asm-powerpc/bootx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/btext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/btext.h</a> (renamed from include/asm-powerpc/btext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/bug.h</a> (renamed from include/asm-powerpc/bug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/bugs.h</a> (renamed from include/asm-powerpc/bugs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/byteorder.h</a> (renamed from include/asm-powerpc/byteorder.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cache.h</a> (renamed from include/asm-powerpc/cache.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cacheflush.h</a> (renamed from include/asm-powerpc/cacheflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/cell-pmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cell-pmu.h</a> (renamed from include/asm-powerpc/cell-pmu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/cell-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cell-regs.h</a> (renamed from include/asm-powerpc/cell-regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/checksum.h</a> (renamed from include/asm-powerpc/checksum.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/clk_interface.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/clk_interface.h</a> (renamed from include/asm-powerpc/clk_interface.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/code-patching.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/code-patching.h</a> (renamed from include/asm-powerpc/code-patching.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/compat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/compat.h</a> (renamed from include/asm-powerpc/compat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/cpm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cpm.h</a> (renamed from include/asm-powerpc/cpm.h)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/cpm1.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cpm1.h</a> (renamed from include/asm-powerpc/cpm1.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/cpm2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cpm2.h</a> (renamed from include/asm-powerpc/cpm2.h)</td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/cputable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cputable.h</a> (renamed from include/asm-powerpc/cputable.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/cputhreads.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cputhreads.h</a> (renamed from include/asm-powerpc/cputhreads.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cputime.h</a> (renamed from include/asm-powerpc/cputime.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/current.h</a> (renamed from include/asm-powerpc/current.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/dbdma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/dbdma.h</a> (renamed from include/asm-powerpc/dbdma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/dcr-generic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/dcr-generic.h</a> (renamed from include/asm-powerpc/dcr-generic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/dcr-mmio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/dcr-mmio.h</a> (renamed from include/asm-powerpc/dcr-mmio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/dcr-native.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/dcr-native.h</a> (renamed from include/asm-powerpc/dcr-native.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/dcr-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/dcr-regs.h</a> (renamed from include/asm-powerpc/dcr-regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/dcr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/dcr.h</a> (renamed from include/asm-powerpc/dcr.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/delay.h</a> (renamed from include/asm-powerpc/delay.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/device.h</a> (renamed from include/asm-powerpc/device.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/div64.h</a> (renamed from include/asm-powerpc/div64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/dma-mapping.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/dma-mapping.h</a> (renamed from include/asm-powerpc/dma-mapping.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/dma.h</a> (renamed from include/asm-powerpc/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/edac.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/edac.h</a> (renamed from include/asm-powerpc/edac.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/eeh.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/eeh.h</a> (renamed from include/asm-powerpc/eeh.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/eeh_event.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/eeh_event.h</a> (renamed from include/asm-powerpc/eeh_event.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/elf.h</a> (renamed from include/asm-powerpc/elf.h)</td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/emergency-restart.h</a> (renamed from include/asm-powerpc/emergency-restart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/errno.h</a> (renamed from include/asm-powerpc/errno.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/exception.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/exception.h</a> (renamed from include/asm-powerpc/exception.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/fb.h</a> (renamed from include/asm-powerpc/fb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/fcntl.h</a> (renamed from include/asm-powerpc/fcntl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/feature-fixups.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/feature-fixups.h</a> (renamed from include/asm-powerpc/feature-fixups.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/firmware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/firmware.h</a> (renamed from include/asm-powerpc/firmware.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/fixmap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/fixmap.h</a> (renamed from include/asm-powerpc/fixmap.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/floppy.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/floppy.h</a> (renamed from include/asm-powerpc/floppy.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/fs_pd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/fs_pd.h</a> (renamed from include/asm-powerpc/fs_pd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/fsl_gtm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/fsl_gtm.h</a> (renamed from include/asm-powerpc/fsl_gtm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/fsl_lbc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/fsl_lbc.h</a> (renamed from include/asm-powerpc/fsl_lbc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ftrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ftrace.h</a> (renamed from include/asm-powerpc/ftrace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/futex.h</a> (renamed from include/asm-powerpc/futex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/gpio.h</a> (renamed from include/asm-powerpc/gpio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/grackle.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/grackle.h</a> (renamed from include/asm-powerpc/grackle.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/hardirq.h</a> (renamed from include/asm-powerpc/hardirq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/heathrow.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/heathrow.h</a> (renamed from include/asm-powerpc/heathrow.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/highmem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/highmem.h</a> (renamed from include/asm-powerpc/highmem.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/hugetlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/hugetlb.h</a> (renamed from include/asm-powerpc/hugetlb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/hvcall.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/hvcall.h</a> (renamed from include/asm-powerpc/hvcall.h)</td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/hvconsole.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/hvconsole.h</a> (renamed from include/asm-powerpc/hvconsole.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/hvcserver.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/hvcserver.h</a> (renamed from include/asm-powerpc/hvcserver.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/hw_irq.h</a> (renamed from include/asm-powerpc/hw_irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/hydra.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/hydra.h</a> (renamed from include/asm-powerpc/hydra.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/i8259.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/i8259.h</a> (renamed from include/asm-powerpc/i8259.h)</td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ibmebus.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ibmebus.h</a> (renamed from include/asm-powerpc/ibmebus.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ide.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ide.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/immap_86xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/immap_86xx.h</a> (renamed from include/asm-powerpc/immap_86xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/immap_cpm2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/immap_cpm2.h</a> (renamed from include/asm-powerpc/immap_cpm2.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/immap_qe.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/immap_qe.h</a> (renamed from include/asm-powerpc/immap_qe.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/io-defs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/io-defs.h</a> (renamed from include/asm-powerpc/io-defs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/io.h</a> (renamed from include/asm-powerpc/io.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ioctl.h</a> (renamed from include/asm-powerpc/ioctl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ioctls.h</a> (renamed from include/asm-powerpc/ioctls.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/iommu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iommu.h</a> (renamed from include/asm-powerpc/iommu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ipcbuf.h</a> (renamed from include/asm-powerpc/ipcbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ipic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ipic.h</a> (renamed from include/asm-powerpc/ipic.h)</td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/irq.h</a> (renamed from include/asm-powerpc/irq.h)</td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/irq_regs.h</a> (renamed from include/asm-powerpc/irq_regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/irqflags.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/irqflags.h</a> (renamed from include/asm-powerpc/irqflags.h)</td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/iseries/alpaca.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/alpaca.h</a> (renamed from include/asm-powerpc/iseries/alpaca.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/iseries/hv_call.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/hv_call.h</a> (renamed from include/asm-powerpc/iseries/hv_call.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/iseries/hv_call_event.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/hv_call_event.h</a> (renamed from include/asm-powerpc/iseries/hv_call_event.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/iseries/hv_call_sc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/hv_call_sc.h</a> (renamed from include/asm-powerpc/iseries/hv_call_sc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/iseries/hv_call_xm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/hv_call_xm.h</a> (renamed from include/asm-powerpc/iseries/hv_call_xm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/iseries/hv_lp_config.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/hv_lp_config.h</a> (renamed from include/asm-powerpc/iseries/hv_lp_config.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/iseries/hv_lp_event.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/hv_lp_event.h</a> (renamed from include/asm-powerpc/iseries/hv_lp_event.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/iseries/hv_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/hv_types.h</a> (renamed from include/asm-powerpc/iseries/hv_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/iseries/iommu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/iommu.h</a> (renamed from include/asm-powerpc/iseries/iommu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/iseries/it_lp_queue.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/it_lp_queue.h</a> (renamed from include/asm-powerpc/iseries/it_lp_queue.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/iseries/lpar_map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/lpar_map.h</a> (renamed from include/asm-powerpc/iseries/lpar_map.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/iseries/mf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/mf.h</a> (renamed from include/asm-powerpc/iseries/mf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/iseries/vio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/vio.h</a> (renamed from include/asm-powerpc/iseries/vio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kdebug.h</a> (renamed from include/asm-powerpc/kdebug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/kdump.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kdump.h</a> (renamed from include/asm-powerpc/kdump.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/kexec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kexec.h</a> (renamed from include/asm-powerpc/kexec.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/keylargo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/keylargo.h</a> (renamed from include/asm-powerpc/keylargo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/kgdb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kgdb.h</a> (renamed from include/asm-powerpc/kgdb.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kmap_types.h</a> (renamed from include/asm-powerpc/kmap_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/kprobes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kprobes.h</a> (renamed from include/asm-powerpc/kprobes.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/kvm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kvm.h</a> (renamed from include/asm-powerpc/kvm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/kvm_asm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kvm_asm.h</a> (renamed from include/asm-powerpc/kvm_asm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/kvm_host.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kvm_host.h</a> (renamed from include/asm-powerpc/kvm_host.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/kvm_para.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kvm_para.h</a> (renamed from include/asm-powerpc/kvm_para.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/kvm_ppc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kvm_ppc.h</a> (renamed from include/asm-powerpc/kvm_ppc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/libata-portmap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/libata-portmap.h</a> (renamed from include/asm-powerpc/libata-portmap.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/linkage.h</a> (renamed from include/asm-powerpc/linkage.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/lmb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/lmb.h</a> (renamed from include/asm-powerpc/lmb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/local.h</a> (renamed from include/asm-powerpc/local.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/lppaca.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/lppaca.h</a> (renamed from include/asm-powerpc/lppaca.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/lv1call.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/lv1call.h</a> (renamed from include/asm-powerpc/lv1call.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/machdep.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/machdep.h</a> (renamed from include/asm-powerpc/machdep.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/macio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/macio.h</a> (renamed from include/asm-powerpc/macio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mc146818rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mc146818rtc.h</a> (renamed from include/asm-powerpc/mc146818rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mediabay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mediabay.h</a> (renamed from include/asm-powerpc/mediabay.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mman.h</a> (renamed from include/asm-powerpc/mman.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mmu-40x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmu-40x.h</a> (renamed from include/asm-powerpc/mmu-40x.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mmu-44x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmu-44x.h</a> (renamed from include/asm-powerpc/mmu-44x.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mmu-8xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmu-8xx.h</a> (renamed from include/asm-powerpc/mmu-8xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mmu-fsl-booke.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmu-fsl-booke.h</a> (renamed from include/asm-powerpc/mmu-fsl-booke.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mmu-hash32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmu-hash32.h</a> (renamed from include/asm-powerpc/mmu-hash32.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mmu-hash64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmu-hash64.h</a> (renamed from include/asm-powerpc/mmu-hash64.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmu.h</a> (renamed from include/asm-powerpc/mmu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmu_context.h</a> (renamed from include/asm-powerpc/mmu_context.h)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mmzone.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmzone.h</a> (renamed from include/asm-powerpc/mmzone.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/module.h</a> (renamed from include/asm-powerpc/module.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mpc512x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mpc512x.h</a> (renamed from include/asm-powerpc/mpc512x.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mpc52xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mpc52xx.h</a> (renamed from include/asm-powerpc/mpc52xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mpc52xx_psc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mpc52xx_psc.h</a> (renamed from include/asm-powerpc/mpc52xx_psc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mpc6xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mpc6xx.h</a> (renamed from include/asm-powerpc/mpc6xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mpc8260.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mpc8260.h</a> (renamed from include/asm-powerpc/mpc8260.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mpc86xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mpc86xx.h</a> (renamed from include/asm-powerpc/mpc86xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mpc8xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mpc8xx.h</a> (renamed from include/asm-powerpc/mpc8xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mpic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mpic.h</a> (renamed from include/asm-powerpc/mpic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/msgbuf.h</a> (renamed from include/asm-powerpc/msgbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mutex.h</a> (renamed from include/asm-powerpc/mutex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/nvram.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/nvram.h</a> (renamed from include/asm-powerpc/nvram.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/of_device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/of_device.h</a> (renamed from include/asm-powerpc/of_device.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/of_platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/of_platform.h</a> (renamed from include/asm-powerpc/of_platform.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ohare.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ohare.h</a> (renamed from include/asm-powerpc/ohare.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/oprofile_impl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/oprofile_impl.h</a> (renamed from include/asm-powerpc/oprofile_impl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pSeries_reconfig.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pSeries_reconfig.h</a> (renamed from include/asm-powerpc/pSeries_reconfig.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/paca.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/paca.h</a> (renamed from include/asm-powerpc/paca.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/page.h</a> (renamed from include/asm-powerpc/page.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/page_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/page_32.h</a> (renamed from include/asm-powerpc/page_32.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/page_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/page_64.h</a> (renamed from include/asm-powerpc/page_64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/param.h</a> (renamed from include/asm-powerpc/param.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/parport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/parport.h</a> (renamed from include/asm-powerpc/parport.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pasemi_dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pasemi_dma.h</a> (renamed from include/asm-powerpc/pasemi_dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pci-bridge.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pci-bridge.h</a> (renamed from include/asm-powerpc/pci-bridge.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pci.h</a> (renamed from include/asm-powerpc/pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/percpu.h</a> (renamed from include/asm-powerpc/percpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pgalloc-32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pgalloc-32.h</a> (renamed from include/asm-powerpc/pgalloc-32.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pgalloc-64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pgalloc-64.h</a> (renamed from include/asm-powerpc/pgalloc-64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pgalloc.h</a> (renamed from include/asm-powerpc/pgalloc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pgtable-4k.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pgtable-4k.h</a> (renamed from include/asm-powerpc/pgtable-4k.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pgtable-64k.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pgtable-64k.h</a> (renamed from include/asm-powerpc/pgtable-64k.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pgtable-ppc32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pgtable-ppc32.h</a> (renamed from include/asm-powerpc/pgtable-ppc32.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pgtable-ppc64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pgtable-ppc64.h</a> (renamed from include/asm-powerpc/pgtable-ppc64.h)</td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pgtable.h</a> (renamed from include/asm-powerpc/pgtable.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/phyp_dump.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/phyp_dump.h</a> (renamed from include/asm-powerpc/phyp_dump.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pmac_feature.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pmac_feature.h</a> (renamed from include/asm-powerpc/pmac_feature.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pmac_low_i2c.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pmac_low_i2c.h</a> (renamed from include/asm-powerpc/pmac_low_i2c.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pmac_pfunc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pmac_pfunc.h</a> (renamed from include/asm-powerpc/pmac_pfunc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pmc.h</a> (renamed from include/asm-powerpc/pmc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pmi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pmi.h</a> (renamed from include/asm-powerpc/pmi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/poll.h</a> (renamed from include/asm-powerpc/poll.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/posix_types.h</a> (renamed from include/asm-powerpc/posix_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ppc-pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ppc-pci.h</a> (renamed from include/asm-powerpc/ppc-pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ppc4xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ppc4xx.h</a> (renamed from include/asm-powerpc/ppc4xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ppc_asm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ppc_asm.h</a> (renamed from include/asm-powerpc/ppc_asm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/processor.h</a> (renamed from include/asm-powerpc/processor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/prom.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/prom.h</a> (renamed from include/asm-powerpc/prom.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ps3.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ps3.h</a> (renamed from include/asm-powerpc/ps3.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ps3av.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ps3av.h</a> (renamed from include/asm-powerpc/ps3av.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ps3fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ps3fb.h</a> (renamed from include/asm-powerpc/ps3fb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ps3stor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ps3stor.h</a> (renamed from include/asm-powerpc/ps3stor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ptrace.h</a> (renamed from include/asm-powerpc/ptrace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/qe.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/qe.h</a> (renamed from include/asm-powerpc/qe.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/qe_ic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/qe_ic.h</a> (renamed from include/asm-powerpc/qe_ic.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/reg.h</a> (renamed from include/asm-powerpc/reg.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/reg_8xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/reg_8xx.h</a> (renamed from include/asm-powerpc/reg_8xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/reg_booke.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/reg_booke.h</a> (renamed from include/asm-powerpc/reg_booke.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/reg_fsl_emb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/reg_fsl_emb.h</a> (renamed from include/asm-powerpc/reg_fsl_emb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/resource.h</a> (renamed from include/asm-powerpc/resource.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/rheap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/rheap.h</a> (renamed from include/asm-powerpc/rheap.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/rio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/rio.h</a> (renamed from include/asm-powerpc/rio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/rtas.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/rtas.h</a> (renamed from include/asm-powerpc/rtas.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/rtc.h</a> (renamed from include/asm-powerpc/rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/rwsem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/rwsem.h</a> (renamed from include/asm-powerpc/rwsem.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/scatterlist.h</a> (renamed from include/asm-powerpc/scatterlist.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/seccomp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/seccomp.h</a> (renamed from include/asm-powerpc/seccomp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/sections.h</a> (renamed from include/asm-powerpc/sections.h)</td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/sembuf.h</a> (renamed from include/asm-powerpc/sembuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/serial.h</a> (renamed from include/asm-powerpc/serial.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/setjmp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/setjmp.h</a> (renamed from include/asm-powerpc/setjmp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/setup.h</a> (renamed from include/asm-powerpc/setup.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/shmbuf.h</a> (renamed from include/asm-powerpc/shmbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/shmparam.h</a> (renamed from include/asm-powerpc/shmparam.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/sigcontext.h</a> (renamed from include/asm-powerpc/sigcontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/siginfo.h</a> (renamed from include/asm-powerpc/siginfo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/signal.h</a> (renamed from include/asm-powerpc/signal.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/smp.h</a> (renamed from include/asm-powerpc/smp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/smu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/smu.h</a> (renamed from include/asm-powerpc/smu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/socket.h</a> (renamed from include/asm-powerpc/socket.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/sockios.h</a> (renamed from include/asm-powerpc/sockios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/sparsemem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/sparsemem.h</a> (renamed from include/asm-powerpc/sparsemem.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/spinlock.h</a> (renamed from include/asm-powerpc/spinlock.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/spinlock_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/spinlock_types.h</a> (renamed from include/asm-powerpc/spinlock_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/spu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/spu.h</a> (renamed from include/asm-powerpc/spu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/spu_csa.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/spu_csa.h</a> (renamed from include/asm-powerpc/spu_csa.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/spu_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/spu_info.h</a> (renamed from include/asm-powerpc/spu_info.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/spu_priv1.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/spu_priv1.h</a> (renamed from include/asm-powerpc/spu_priv1.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/sstep.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/sstep.h</a> (renamed from include/asm-powerpc/sstep.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/stat.h</a> (renamed from include/asm-powerpc/stat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/statfs.h</a> (renamed from include/asm-powerpc/statfs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/string.h</a> (renamed from include/asm-powerpc/string.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/suspend.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/suspend.h</a> (renamed from include/asm-powerpc/suspend.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/synch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/synch.h</a> (renamed from include/asm-powerpc/synch.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/syscall.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/syscall.h</a> (renamed from include/asm-powerpc/syscall.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/syscalls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/syscalls.h</a> (renamed from include/asm-powerpc/syscalls.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/systbl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/systbl.h</a> (renamed from include/asm-powerpc/systbl.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/system.h</a> (renamed from include/asm-powerpc/system.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/tce.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/tce.h</a> (renamed from include/asm-powerpc/tce.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/termbits.h</a> (renamed from include/asm-powerpc/termbits.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/termios.h</a> (renamed from include/asm-powerpc/termios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/thread_info.h</a> (renamed from include/asm-powerpc/thread_info.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/time.h</a> (renamed from include/asm-powerpc/time.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/timex.h</a> (renamed from include/asm-powerpc/timex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/tlb.h</a> (renamed from include/asm-powerpc/tlb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/tlbflush.h</a> (renamed from include/asm-powerpc/tlbflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/topology.h</a> (renamed from include/asm-powerpc/topology.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/tsi108.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/tsi108.h</a> (renamed from include/asm-powerpc/tsi108.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/tsi108_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/tsi108_irq.h</a> (renamed from include/asm-powerpc/tsi108_irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/tsi108_pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/tsi108_pci.h</a> (renamed from include/asm-powerpc/tsi108_pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/types.h</a> (renamed from include/asm-powerpc/types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/uaccess.h</a> (renamed from include/asm-powerpc/uaccess.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ucc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ucc.h</a> (renamed from include/asm-powerpc/ucc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ucc_fast.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ucc_fast.h</a> (renamed from include/asm-powerpc/ucc_fast.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ucc_slow.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ucc_slow.h</a> (renamed from include/asm-powerpc/ucc_slow.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ucontext.h</a> (renamed from include/asm-powerpc/ucontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/udbg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/udbg.h</a> (renamed from include/asm-powerpc/udbg.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/uic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/uic.h</a> (renamed from include/asm-powerpc/uic.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/unaligned.h</a> (renamed from include/asm-powerpc/unaligned.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/uninorth.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/uninorth.h</a> (renamed from include/asm-powerpc/uninorth.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/unistd.h</a> (renamed from include/asm-powerpc/unistd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/user.h</a> (renamed from include/asm-powerpc/user.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/vdso.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/vdso.h</a> (renamed from include/asm-powerpc/vdso.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/vdso_datapage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/vdso_datapage.h</a> (renamed from include/asm-powerpc/vdso_datapage.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/vga.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/vga.h</a> (renamed from include/asm-powerpc/vga.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/vio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/vio.h</a> (renamed from include/asm-powerpc/vio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/xilinx_intc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/xilinx_intc.h</a> (renamed from include/asm-powerpc/xilinx_intc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/xmon.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/xmon.h</a> (renamed from include/asm-powerpc/xmon.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/xor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/xor.h</a> (renamed from include/asm-powerpc/xor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/align.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/align.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/cpu_setup_44x.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/cpu_setup_44x.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/crash_dump.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/crash_dump.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/head_32.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/head_32.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/ibmebus.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/ibmebus.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/idle_6xx.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/idle_6xx.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/idle_e500.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/idle_e500.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/irq.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/lparcfg.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/lparcfg.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/machine_kexec_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/machine_kexec_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/misc_32.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/misc_32.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/module.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/module.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/module_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/module_64.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/pci-common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/pci-common.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/process.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/process.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/ptrace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/ptrace.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/ptrace32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/ptrace32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/rtas.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/rtas.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/sys_ppc32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/sys_ppc32.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/vdso.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/vdso.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/vio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/vio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/vmlinux.lds.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/vmlinux.lds.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/lib/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/lib/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/mm/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/mm/gup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/mm/gup.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/hash_utils_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/mm/hash_utils_64.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/init_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/mm/init_64.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/mem.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/mm/mem.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/ppc_mmu_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/mm/ppc_mmu_32.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/tlb_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/mm/tlb_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/44x/warp-nand.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/44x/warp-nand.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/44x/warp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/44x/warp.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/52xx/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/52xx/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc832x_mds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/83xx/mpc832x_mds.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc832x_rdb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/83xx/mpc832x_rdb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc834x_itx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/83xx/mpc834x_itx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc834x_mds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/83xx/mpc834x_mds.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc836x_mds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/83xx/mpc836x_mds.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/sbc834x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/83xx/sbc834x.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/ksi8560.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/85xx/ksi8560.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/mpc8536_ds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/85xx/mpc8536_ds.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/mpc85xx_ads.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/85xx/mpc85xx_ads.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/mpc85xx_ds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/85xx/mpc85xx_ds.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/mpc85xx_mds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/85xx/mpc85xx_mds.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/sbc8560.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/85xx/sbc8560.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/86xx/mpc86xx_smp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/86xx/mpc86xx_smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/8xx/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/8xx/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spufs/run.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/cell/spufs/run.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spufs/sched.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/cell/spufs/sched.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/iseries/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/powermac/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/ps3/htab.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/ps3/htab.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/ps3/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/ps3/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/ps3/spu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/ps3/spu.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/plpar_wrappers.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/pseries/plpar_wrappers.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/pseries/setup.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/sysdev/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/bestcomm/gen_bd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/sysdev/bestcomm/gen_bd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/cpm1.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/sysdev/cpm1.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/cpm2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/sysdev/cpm2.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/cpm_common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/sysdev/cpm_common.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/qe_lib/ucc_fast.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/sysdev/qe_lib/ucc_fast.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/qe_lib/ucc_slow.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/sysdev/qe_lib/ucc_slow.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/rtc_cmos_setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/sysdev/rtc_cmos_setup.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/defconfig</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/Kbuild</a> (renamed from include/asm-s390/Kbuild)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/airq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/airq.h</a> (renamed from include/asm-s390/airq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/appldata.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/appldata.h</a> (renamed from include/asm-s390/appldata.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/atomic.h</a> (renamed from include/asm-s390/atomic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/auxvec.h</a> (renamed from include/asm-s390/auxvec.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/bitops.h</a> (renamed from include/asm-s390/bitops.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/bug.h</a> (renamed from include/asm-s390/bug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/bugs.h</a> (renamed from include/asm-s390/bugs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/byteorder.h</a> (renamed from include/asm-s390/byteorder.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/cache.h</a> (renamed from include/asm-s390/cache.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/cacheflush.h</a> (renamed from include/asm-s390/cacheflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/ccwdev.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ccwdev.h</a> (renamed from include/asm-s390/ccwdev.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/ccwgroup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ccwgroup.h</a> (renamed from include/asm-s390/ccwgroup.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/checksum.h</a> (renamed from include/asm-s390/checksum.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/chpid.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/chpid.h</a> (renamed from include/asm-s390/chpid.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/chsc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/chsc.h</a> (renamed from include/asm-s390/chsc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/cio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/cio.h</a> (renamed from include/asm-s390/cio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/cmb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/cmb.h</a> (renamed from include/asm-s390/cmb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/compat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/compat.h</a> (renamed from include/asm-s390/compat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/cpcmd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/cpcmd.h</a> (renamed from include/asm-s390/cpcmd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/cpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/cpu.h</a> (renamed from include/asm-s390/cpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/cputime.h</a> (renamed from include/asm-s390/cputime.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/current.h</a> (renamed from include/asm-s390/current.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/dasd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/dasd.h</a> (renamed from include/asm-s390/dasd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/debug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/debug.h</a> (renamed from include/asm-s390/debug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/delay.h</a> (renamed from include/asm-s390/delay.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/device.h</a> (renamed from include/asm-s390/device.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/diag.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/diag.h</a> (renamed from include/asm-s390/diag.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/div64.h</a> (renamed from include/asm-s390/div64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/dma.h</a> (renamed from include/asm-s390/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/ebcdic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ebcdic.h</a> (renamed from include/asm-s390/ebcdic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/elf.h</a> (renamed from include/asm-s390/elf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/emergency-restart.h</a> (renamed from include/asm-s390/emergency-restart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/errno.h</a> (renamed from include/asm-s390/errno.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/etr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/etr.h</a> (renamed from include/asm-s390/etr.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/extmem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/extmem.h</a> (renamed from include/asm-s390/extmem.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/fb.h</a> (renamed from include/asm-s390/fb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/fcntl.h</a> (renamed from include/asm-s390/fcntl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/fcx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/fcx.h</a> (renamed from include/asm-s390/fcx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/futex.h</a> (renamed from include/asm-s390/futex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/hardirq.h</a> (renamed from include/asm-s390/hardirq.h)</td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/hugetlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/hugetlb.h</a> (renamed from include/asm-s390/hugetlb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/idals.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/idals.h</a> (renamed from include/asm-s390/idals.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/io.h</a> (renamed from include/asm-s390/io.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ioctl.h</a> (renamed from include/asm-s390/ioctl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ioctls.h</a> (renamed from include/asm-s390/ioctls.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ipcbuf.h</a> (renamed from include/asm-s390/ipcbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/ipl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ipl.h</a> (renamed from include/asm-s390/ipl.h)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/irq.h</a> (renamed from include/asm-s390/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/irq_regs.h</a> (renamed from include/asm-s390/irq_regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/irqflags.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/irqflags.h</a> (renamed from include/asm-s390/irqflags.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/isc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/isc.h</a> (renamed from include/asm-s390/isc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/itcw.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/itcw.h</a> (renamed from include/asm-s390/itcw.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/kdebug.h</a> (renamed from include/asm-s390/kdebug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/kexec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/kexec.h</a> (renamed from include/asm-s390/kexec.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/kmap_types.h</a> (renamed from include/asm-s390/kmap_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/kprobes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/kprobes.h</a> (renamed from include/asm-s390/kprobes.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/kvm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/kvm.h</a> (renamed from include/asm-s390/kvm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/kvm_host.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/kvm_host.h</a> (renamed from include/asm-s390/kvm_host.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/kvm_para.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/kvm_para.h</a> (renamed from include/asm-s390/kvm_para.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/kvm_virtio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/kvm_virtio.h</a> (renamed from include/asm-s390/kvm_virtio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/linkage.h</a> (renamed from include/asm-s390/linkage.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/local.h</a> (renamed from include/asm-s390/local.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/lowcore.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/lowcore.h</a> (renamed from include/asm-s390/lowcore.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/mathemu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/mathemu.h</a> (renamed from include/asm-s390/mathemu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/mman.h</a> (renamed from include/asm-s390/mman.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/mmu.h</a> (renamed from include/asm-s390/mmu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/mmu_context.h</a> (renamed from include/asm-s390/mmu_context.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/module.h</a> (renamed from include/asm-s390/module.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/monwriter.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/monwriter.h</a> (renamed from include/asm-s390/monwriter.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/msgbuf.h</a> (renamed from include/asm-s390/msgbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/mutex.h</a> (renamed from include/asm-s390/mutex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/page.h</a> (renamed from include/asm-s390/page.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/param.h</a> (renamed from include/asm-s390/param.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/pci.h</a> (renamed from include/asm-s390/pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/percpu.h</a> (renamed from include/asm-s390/percpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/pgalloc.h</a> (renamed from include/asm-s390/pgalloc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/pgtable.h</a> (renamed from include/asm-s390/pgtable.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/poll.h</a> (renamed from include/asm-s390/poll.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/posix_types.h</a> (renamed from include/asm-s390/posix_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/processor.h</a> (renamed from include/asm-s390/processor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ptrace.h</a> (renamed from include/asm-s390/ptrace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/qdio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/qdio.h</a> (renamed from include/asm-s390/qdio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/qeth.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/qeth.h</a> (renamed from include/asm-s390/qeth.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/reset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/reset.h</a> (renamed from include/asm-s390/reset.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/resource.h</a> (renamed from include/asm-s390/resource.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/rwsem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/rwsem.h</a> (renamed from include/asm-s390/rwsem.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/s390_ext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/s390_ext.h</a> (renamed from include/asm-s390/s390_ext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/s390_rdev.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/s390_rdev.h</a> (renamed from include/asm-s390/s390_rdev.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/scatterlist.h</a> (renamed from include/asm-s390/scatterlist.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/schid.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/schid.h</a> (renamed from include/asm-s390/schid.h)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/sclp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sclp.h</a> (renamed from include/asm-s390/sclp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sections.h</a> (renamed from include/asm-s390/sections.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/segment.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/segment.h</a> (renamed from include/asm-s390/segment.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sembuf.h</a> (renamed from include/asm-s390/sembuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/setup.h</a> (renamed from include/asm-s390/setup.h)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/sfp-machine.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sfp-machine.h</a> (renamed from include/asm-s390/sfp-machine.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/sfp-util.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sfp-util.h</a> (renamed from include/asm-s390/sfp-util.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/shmbuf.h</a> (renamed from include/asm-s390/shmbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/shmparam.h</a> (renamed from include/asm-s390/shmparam.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sigcontext.h</a> (renamed from include/asm-s390/sigcontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/siginfo.h</a> (renamed from include/asm-s390/siginfo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/signal.h</a> (renamed from include/asm-s390/signal.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/sigp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sigp.h</a> (renamed from include/asm-s390/sigp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/smp.h</a> (renamed from include/asm-s390/smp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/socket.h</a> (renamed from include/asm-s390/socket.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sockios.h</a> (renamed from include/asm-s390/sockios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/sparsemem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sparsemem.h</a> (renamed from include/asm-s390/sparsemem.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/spinlock.h</a> (renamed from include/asm-s390/spinlock.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/spinlock_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/spinlock_types.h</a> (renamed from include/asm-s390/spinlock_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/stat.h</a> (renamed from include/asm-s390/stat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/statfs.h</a> (renamed from include/asm-s390/statfs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/string.h</a> (renamed from include/asm-s390/string.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/suspend.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/suspend.h</a> (renamed from include/asm-s390/suspend.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/sysinfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sysinfo.h</a> (renamed from include/asm-s390/sysinfo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/system.h</a> (renamed from include/asm-s390/system.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/tape390.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/tape390.h</a> (renamed from include/asm-s390/tape390.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/termbits.h</a> (renamed from include/asm-s390/termbits.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/termios.h</a> (renamed from include/asm-s390/termios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/thread_info.h</a> (renamed from include/asm-s390/thread_info.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/timer.h</a> (renamed from include/asm-s390/timer.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/timex.h</a> (renamed from include/asm-s390/timex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/tlb.h</a> (renamed from include/asm-s390/tlb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/tlbflush.h</a> (renamed from include/asm-s390/tlbflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/todclk.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/todclk.h</a> (renamed from include/asm-s390/todclk.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/topology.h</a> (renamed from include/asm-s390/topology.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/types.h</a> (renamed from include/asm-s390/types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/uaccess.h</a> (renamed from include/asm-s390/uaccess.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ucontext.h</a> (renamed from include/asm-s390/ucontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/unaligned.h</a> (renamed from include/asm-s390/unaligned.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/unistd.h</a> (renamed from include/asm-s390/unistd.h)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/user.h</a> (renamed from include/asm-s390/user.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/vtoc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/vtoc.h</a> (renamed from include/asm-s390/vtoc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/xor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/xor.h</a> (renamed from include/asm-s390/xor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/s390/include/asm/zcrypt.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/zcrypt.h</a> (renamed from include/asm-s390/zcrypt.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/compat_ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/compat_ptrace.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/compat_wrapper.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/compat_wrapper.S</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/ipl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/ipl.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/mem_detect.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/mem_detect.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/process.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/process.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/ptrace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/ptrace.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/smp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/syscalls.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/syscalls.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/vmlinux.lds.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/vmlinux.lds.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kvm/priv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kvm/priv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/lib/delay.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/lib/delay.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/mm/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/mm/init.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/Kconfig</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/Kconfig.debug?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/Kconfig.debug</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/Makefile</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sh/boards/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/Kconfig</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sh/boards/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/board-ap325rxa.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/board-ap325rxa.c</a> (renamed from arch/sh/boards/renesas/ap325rxa/setup.c)</td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/board-magicpanelr2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/board-magicpanelr2.c</a> (renamed from arch/sh/boards/magicpanelr2/setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/board-rsk7203.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/board-rsk7203.c</a> (renamed from arch/sh/boards/renesas/rsk7203/setup.c)</td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/board-sh7785lcr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/board-sh7785lcr.c</a> (renamed from arch/sh/boards/renesas/sh7785lcr/setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/board-shmin.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/board-shmin.c</a> (renamed from arch/sh/boards/shmin/setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-cayman/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-cayman/Makefile</a> (renamed from arch/sh/boards/cayman/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-cayman/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-cayman/irq.c</a> (renamed from arch/sh/boards/cayman/irq.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-cayman/led.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-cayman/led.c</a> (renamed from arch/sh/boards/cayman/led.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-cayman/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-cayman/setup.c</a> (renamed from arch/sh/boards/cayman/setup.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-dreamcast/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-dreamcast/Makefile</a> (renamed from arch/sh/boards/dreamcast/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-dreamcast/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-dreamcast/irq.c</a> (renamed from arch/sh/boards/dreamcast/irq.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-dreamcast/rtc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-dreamcast/rtc.c</a> (renamed from arch/sh/boards/dreamcast/rtc.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-dreamcast/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-dreamcast/setup.c</a> (renamed from arch/sh/boards/dreamcast/setup.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-edosk7705/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-edosk7705/Makefile</a> (renamed from arch/sh/boards/renesas/edosk7705/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-edosk7705/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-edosk7705/io.c</a> (renamed from arch/sh/boards/renesas/edosk7705/io.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-edosk7705/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-edosk7705/setup.c</a> (renamed from arch/sh/boards/renesas/edosk7705/setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-highlander/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-highlander/Kconfig</a> (renamed from arch/sh/boards/renesas/r7780rp/Kconfig)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-highlander/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-highlander/Makefile</a> (renamed from arch/sh/boards/renesas/r7780rp/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-highlander/irq-r7780mp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-highlander/irq-r7780mp.c</a> (renamed from arch/sh/boards/renesas/r7780rp/irq-r7780mp.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-highlander/irq-r7780rp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-highlander/irq-r7780rp.c</a> (renamed from arch/sh/boards/renesas/r7780rp/irq-r7780rp.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-highlander/irq-r7785rp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-highlander/irq-r7785rp.c</a> (renamed from arch/sh/boards/renesas/r7780rp/irq-r7785rp.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-highlander/psw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-highlander/psw.c</a> (renamed from arch/sh/boards/renesas/r7780rp/psw.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-highlander/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-highlander/setup.c</a> (renamed from arch/sh/boards/renesas/r7780rp/setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-hp6xx/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-hp6xx/Makefile</a> (renamed from arch/sh/boards/hp6xx/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-hp6xx/hp6xx_apm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-hp6xx/hp6xx_apm.c</a> (renamed from arch/sh/boards/hp6xx/hp6xx_apm.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-hp6xx/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-hp6xx/pm.c</a> (renamed from arch/sh/boards/hp6xx/pm.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-hp6xx/pm_wakeup.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-hp6xx/pm_wakeup.S</a> (renamed from arch/sh/boards/hp6xx/pm_wakeup.S)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-hp6xx/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-hp6xx/setup.c</a> (renamed from arch/sh/boards/hp6xx/setup.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-landisk/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-landisk/Makefile</a> (renamed from arch/sh/boards/landisk/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-landisk/gio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-landisk/gio.c</a> (renamed from arch/sh/boards/landisk/gio.c)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-landisk/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-landisk/irq.c</a> (renamed from arch/sh/boards/landisk/irq.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-landisk/psw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-landisk/psw.c</a> (renamed from arch/sh/boards/landisk/psw.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-landisk/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-landisk/setup.c</a> (renamed from arch/sh/boards/landisk/setup.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-lboxre2/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-lboxre2/Makefile</a> (renamed from arch/sh/boards/lboxre2/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-lboxre2/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-lboxre2/irq.c</a> (renamed from arch/sh/boards/lboxre2/irq.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-lboxre2/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-lboxre2/setup.c</a> (renamed from arch/sh/boards/lboxre2/setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-microdev/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-microdev/Makefile</a> (renamed from arch/sh/boards/superh/microdev/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-microdev/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-microdev/io.c</a> (renamed from arch/sh/boards/superh/microdev/io.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-microdev/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-microdev/irq.c</a> (renamed from arch/sh/boards/superh/microdev/irq.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-microdev/led.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-microdev/led.c</a> (renamed from arch/sh/boards/superh/microdev/led.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-microdev/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-microdev/setup.c</a> (renamed from arch/sh/boards/superh/microdev/setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-migor/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-migor/Kconfig</a> (renamed from arch/sh/boards/renesas/migor/Kconfig)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-migor/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-migor/Makefile</a> (renamed from arch/sh/boards/renesas/migor/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-migor/lcd_qvga.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-migor/lcd_qvga.c</a> (renamed from arch/sh/boards/renesas/migor/lcd_qvga.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-migor/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-migor/setup.c</a> (renamed from arch/sh/boards/renesas/migor/setup.c)</td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-r2d/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-r2d/Kconfig</a> (renamed from arch/sh/boards/renesas/rts7751r2d/Kconfig)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-r2d/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-r2d/Makefile</a> (renamed from arch/sh/boards/renesas/rts7751r2d/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-r2d/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-r2d/irq.c</a> (renamed from arch/sh/boards/renesas/rts7751r2d/irq.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-r2d/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-r2d/setup.c</a> (renamed from arch/sh/boards/renesas/rts7751r2d/setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-sdk7780/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sdk7780/Kconfig</a> (renamed from arch/sh/boards/renesas/sdk7780/Kconfig)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-sdk7780/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sdk7780/Makefile</a> (renamed from arch/sh/boards/renesas/sdk7780/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-sdk7780/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sdk7780/irq.c</a> (renamed from arch/sh/boards/renesas/sdk7780/irq.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-sdk7780/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sdk7780/setup.c</a> (renamed from arch/sh/boards/renesas/sdk7780/setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7206/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7206/Makefile</a> (renamed from arch/sh/boards/se/7206/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7206/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7206/io.c</a> (renamed from arch/sh/boards/se/7206/io.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7206/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7206/irq.c</a> (renamed from arch/sh/boards/se/7206/irq.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7206/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7206/setup.c</a> (renamed from arch/sh/boards/se/7206/setup.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7343/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7343/Makefile</a> (renamed from arch/sh/boards/se/7343/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7343/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7343/io.c</a> (renamed from arch/sh/boards/se/7343/io.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7343/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7343/irq.c</a> (renamed from arch/sh/boards/se/7343/irq.c)</td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7343/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7343/setup.c</a> (renamed from arch/sh/boards/se/7343/setup.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/770x/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/770x/Makefile</a> (renamed from arch/sh/boards/se/770x/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/770x/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/770x/io.c</a> (renamed from arch/sh/boards/se/770x/io.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/770x/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/770x/irq.c</a> (renamed from arch/sh/boards/se/770x/irq.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/770x/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/770x/setup.c</a> (renamed from arch/sh/boards/se/770x/setup.c)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7721/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7721/Makefile</a> (renamed from arch/sh/boards/se/7721/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7721/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7721/irq.c</a> (renamed from arch/sh/boards/se/7721/irq.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7721/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7721/setup.c</a> (renamed from arch/sh/boards/se/7721/setup.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7722/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7722/Makefile</a> (renamed from arch/sh/boards/se/7722/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7722/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7722/irq.c</a> (renamed from arch/sh/boards/se/7722/irq.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7722/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7722/setup.c</a> (renamed from arch/sh/boards/se/7722/setup.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7751/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7751/Makefile</a> (renamed from arch/sh/boards/se/7751/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7751/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7751/io.c</a> (renamed from arch/sh/boards/se/7751/io.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7751/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7751/irq.c</a> (renamed from arch/sh/boards/se/7751/irq.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7751/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7751/pci.c</a> (renamed from arch/sh/boards/se/7751/pci.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7751/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7751/setup.c</a> (renamed from arch/sh/boards/se/7751/setup.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7780/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7780/Makefile</a> (renamed from arch/sh/boards/se/7780/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7780/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7780/irq.c</a> (renamed from arch/sh/boards/se/7780/irq.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7780/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7780/setup.c</a> (renamed from arch/sh/boards/se/7780/setup.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/board-se7619.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/board-se7619.c</a> (renamed from arch/sh/boards/se/7619/setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-sh03/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sh03/Makefile</a> (renamed from arch/sh/boards/sh03/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-sh03/rtc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sh03/rtc.c</a> (renamed from arch/sh/boards/sh03/rtc.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-sh03/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sh03/setup.c</a> (renamed from arch/sh/boards/sh03/setup.c)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-sh7763rdp/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sh7763rdp/Makefile</a> (renamed from arch/sh/boards/renesas/sh7763rdp/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-sh7763rdp/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sh7763rdp/irq.c</a> (renamed from arch/sh/boards/renesas/sh7763rdp/irq.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-sh7763rdp/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sh7763rdp/setup.c</a> (renamed from arch/sh/boards/renesas/sh7763rdp/setup.c)</td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-snapgear/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-snapgear/Makefile</a> (renamed from arch/sh/boards/snapgear/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-snapgear/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-snapgear/io.c</a> (renamed from arch/sh/boards/snapgear/io.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-snapgear/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-snapgear/setup.c</a> (renamed from arch/sh/boards/snapgear/setup.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-systemh/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-systemh/Makefile</a> (renamed from arch/sh/boards/renesas/systemh/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-systemh/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-systemh/io.c</a> (renamed from arch/sh/boards/renesas/systemh/io.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-systemh/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-systemh/irq.c</a> (renamed from arch/sh/boards/renesas/systemh/irq.c)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-systemh/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-systemh/setup.c</a> (renamed from arch/sh/boards/renesas/systemh/setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-titan/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-titan/Makefile</a> (renamed from arch/sh/boards/titan/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-titan/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-titan/io.c</a> (renamed from arch/sh/boards/titan/io.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-titan/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-titan/setup.c</a> (renamed from arch/sh/boards/titan/setup.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-x3proto/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-x3proto/Makefile</a> (renamed from arch/sh/boards/renesas/x3proto/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-x3proto/ilsel.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-x3proto/ilsel.c</a> (renamed from arch/sh/boards/renesas/x3proto/ilsel.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-x3proto/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-x3proto/setup.c</a> (renamed from arch/sh/boards/renesas/x3proto/setup.c)</td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/sh/boards/magicpanelr2/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/magicpanelr2/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/sh/boards/magicpanelr2/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/magicpanelr2/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/sh/boards/renesas/ap325rxa/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/renesas/ap325rxa/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/sh/boards/renesas/rsk7203/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/renesas/rsk7203/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/sh/boards/renesas/sh7785lcr/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/renesas/sh7785lcr/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/sh/boards/se/7619/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/se/7619/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/sh/boards/shmin/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/shmin/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boot/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boot/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boot/compressed/head_64.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boot/compressed/head_64.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/ap325rxa_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/ap325rxa_defconfig</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/dreamcast_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/dreamcast_defconfig</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/hp6xx_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/hp6xx_defconfig</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/landisk_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/landisk_defconfig</a></td><td class='right'>894</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 5.8%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/lboxre2_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/lboxre2_defconfig</a></td><td class='right'>725</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/magicpanelr2_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/magicpanelr2_defconfig</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/microdev_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/microdev_defconfig</a></td><td class='right'>630</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/migor_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/migor_defconfig</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/r7780mp_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/r7780mp_defconfig</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/r7785rp_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/r7785rp_defconfig</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/rsk7203_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/rsk7203_defconfig</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/rts7751r2d1_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/rts7751r2d1_defconfig</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/rts7751r2dplus_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/rts7751r2dplus_defconfig</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/sdk7780_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/sdk7780_defconfig</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/se7206_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/se7206_defconfig</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/se7343_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/se7343_defconfig</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/se7619_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/se7619_defconfig</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/configs/sh7763rdp_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/sh7763rdp_defconfig</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/dma/dma-g2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/dma/dma-g2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/dma/dma-pvr2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/dma/dma-pvr2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/dma/dma-sh.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/dma/dma-sh.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/dma/dma-sh.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/dma/dma-sh.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/pci/fixups-dreamcast.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/pci/fixups-dreamcast.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/pci/ops-cayman.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/pci/ops-cayman.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/pci/ops-dreamcast.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/pci/ops-dreamcast.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/pci/ops-se7780.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/pci/ops-se7780.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/pci/pci-sh5.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/pci/pci-sh5.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/.gitignore</a> (renamed from include/asm-sh/.gitignore)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/Kbuild</a> (renamed from include/asm-sh/Kbuild)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/adc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/adc.h</a> (renamed from include/asm-sh/adc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/addrspace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/addrspace.h</a> (renamed from include/asm-sh/addrspace.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/atomic-grb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/atomic-grb.h</a> (renamed from include/asm-sh/atomic-grb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/atomic-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/atomic-irq.h</a> (renamed from include/asm-sh/atomic-irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/atomic-llsc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/atomic-llsc.h</a> (renamed from include/asm-sh/atomic-llsc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/atomic.h</a> (renamed from include/asm-sh/atomic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/auxvec.h</a> (renamed from include/asm-sh/auxvec.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/bitops-grb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/bitops-grb.h</a> (renamed from include/asm-sh/bitops-grb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/bitops-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/bitops-irq.h</a> (renamed from include/asm-sh/bitops-irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/bitops.h</a> (renamed from include/asm-sh/bitops.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/bug.h</a> (renamed from include/asm-sh/bug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/bugs.h</a> (renamed from include/asm-sh/bugs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/byteorder.h</a> (renamed from include/asm-sh/byteorder.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/cache.h</a> (renamed from include/asm-sh/cache.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/cacheflush.h</a> (renamed from include/asm-sh/cacheflush.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/checksum.h</a> (renamed from include/asm-sh/checksum.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/checksum_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/checksum_32.h</a> (renamed from include/asm-sh/checksum_32.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/checksum_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/checksum_64.h</a> (renamed from include/asm-sh/checksum_64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/clock.h</a> (renamed from include/asm-sh/clock.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/cmpxchg-grb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/cmpxchg-grb.h</a> (renamed from include/asm-sh/cmpxchg-grb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/cmpxchg-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/cmpxchg-irq.h</a> (renamed from include/asm-sh/cmpxchg-irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/cpu-features.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/cpu-features.h</a> (renamed from include/asm-sh/cpu-features.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/cputime.h</a> (renamed from include/asm-sh/cputime.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/current.h</a> (renamed from include/asm-sh/current.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/delay.h</a> (renamed from include/asm-sh/delay.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/device.h</a> (renamed from include/asm-sh/device.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/div64.h</a> (renamed from include/asm-sh/div64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/dma-mapping.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/dma-mapping.h</a> (renamed from include/asm-sh/dma-mapping.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/dma.h</a> (renamed from include/asm-sh/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/dmabrg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/dmabrg.h</a> (renamed from include/asm-sh/dmabrg.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/edosk7705.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/edosk7705.h</a> (renamed from include/asm-sh/edosk7705.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/elf.h</a> (renamed from include/asm-sh/elf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/emergency-restart.h</a> (renamed from include/asm-sh/emergency-restart.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/entry-macros.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/entry-macros.S</a> (renamed from include/asm-sh/entry-macros.S)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/errno.h</a> (renamed from include/asm-sh/errno.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/fb.h</a> (renamed from include/asm-sh/fb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/fcntl.h</a> (renamed from include/asm-sh/fcntl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/fixmap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/fixmap.h</a> (renamed from include/asm-sh/fixmap.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/flat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/flat.h</a> (renamed from include/asm-sh/flat.h)</td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/fpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/fpu.h</a> (renamed from include/asm-sh/fpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/freq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/freq.h</a> (renamed from include/asm-sh/freq.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/futex-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/futex-irq.h</a> (renamed from include/asm-sh/futex-irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/futex.h</a> (renamed from include/asm-sh/futex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/gpio.h</a> (renamed from include/asm-sh/gpio.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/hardirq.h</a> (renamed from include/asm-sh/hardirq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/hd64461.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/hd64461.h</a> (renamed from include/asm-sh/hd64461.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/hd64465/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/hd64465/gpio.h</a> (renamed from include/asm-sh/hd64465/gpio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/hd64465/hd64465.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/hd64465/hd64465.h</a> (renamed from include/asm-sh/hd64465/hd64465.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/hd64465/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/hd64465/io.h</a> (renamed from include/asm-sh/hd64465/io.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/heartbeat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/heartbeat.h</a> (renamed from include/asm-sh/heartbeat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/hp6xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/hp6xx.h</a> (renamed from include/asm-sh/hp6xx.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/hugetlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/hugetlb.h</a> (renamed from include/asm-sh/hugetlb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/hw_irq.h</a> (renamed from include/asm-sh/hw_irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/i2c-sh7760.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/i2c-sh7760.h</a> (renamed from include/asm-sh/i2c-sh7760.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/ilsel.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/ilsel.h</a> (renamed from include/asm-sh/ilsel.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/io.h</a> (renamed from include/asm-sh/io.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/io_generic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/io_generic.h</a> (renamed from include/asm-sh/io_generic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/io_trapped.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/io_trapped.h</a> (renamed from include/asm-sh/io_trapped.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/ioctl.h</a> (renamed from include/asm-sh/ioctl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/ioctls.h</a> (renamed from include/asm-sh/ioctls.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/ipcbuf.h</a> (renamed from include/asm-sh/ipcbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/irq.h</a> (renamed from include/asm-sh/irq.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/irq_regs.h</a> (renamed from include/asm-sh/irq_regs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/irqflags.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/irqflags.h</a> (renamed from include/asm-sh/irqflags.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/irqflags_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/irqflags_32.h</a> (renamed from include/asm-sh/irqflags_32.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/irqflags_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/irqflags_64.h</a> (renamed from include/asm-sh/irqflags_64.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/kdebug.h</a> (renamed from include/asm-sh/kdebug.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/kexec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/kexec.h</a> (renamed from include/asm-sh/kexec.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/kgdb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/kgdb.h</a> (renamed from include/asm-sh/kgdb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/kmap_types.h</a> (renamed from include/asm-sh/kmap_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/lboxre2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/lboxre2.h</a> (renamed from include/asm-sh/lboxre2.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/linkage.h</a> (renamed from include/asm-sh/linkage.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/local.h</a> (renamed from include/asm-sh/local.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/machvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/machvec.h</a> (renamed from include/asm-sh/machvec.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/magicpanelr2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/magicpanelr2.h</a> (renamed from include/asm-sh/magicpanelr2.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/mc146818rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/mc146818rtc.h</a> (renamed from include/asm-sh/mc146818rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/microdev.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/microdev.h</a> (renamed from include/asm-sh/microdev.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/migor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/migor.h</a> (renamed from include/asm-sh/migor.h)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/mman.h</a> (renamed from include/asm-sh/mman.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/mmu.h</a> (renamed from include/asm-sh/mmu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/mmu_context.h</a> (renamed from include/asm-sh/mmu_context.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/mmu_context_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/mmu_context_32.h</a> (renamed from include/asm-sh/mmu_context_32.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/mmu_context_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/mmu_context_64.h</a> (renamed from include/asm-sh/mmu_context_64.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/mmzone.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/mmzone.h</a> (renamed from include/asm-sh/mmzone.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/module.h</a> (renamed from include/asm-sh/module.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/msgbuf.h</a> (renamed from include/asm-sh/msgbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/mutex.h</a> (renamed from include/asm-sh/mutex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/page.h</a> (renamed from include/asm-sh/page.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/param.h</a> (renamed from include/asm-sh/param.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/parport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/parport.h</a> (renamed from include/asm-sh/parport.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/pci.h</a> (renamed from include/asm-sh/pci.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/percpu.h</a> (renamed from include/asm-sh/percpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/pgalloc.h</a> (renamed from include/asm-sh/pgalloc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/pgtable.h</a> (renamed from include/asm-sh/pgtable.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/pgtable_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/pgtable_32.h</a> (renamed from include/asm-sh/pgtable_32.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/pgtable_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/pgtable_64.h</a> (renamed from include/asm-sh/pgtable_64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/pm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/pm.h</a> (renamed from include/asm-sh/pm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/poll.h</a> (renamed from include/asm-sh/poll.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/posix_types.h</a> (renamed from include/asm-sh/posix_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/posix_types_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/posix_types_32.h</a> (renamed from include/asm-sh/posix_types_32.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/posix_types_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/posix_types_64.h</a> (renamed from include/asm-sh/posix_types_64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/processor.h</a> (renamed from include/asm-sh/processor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/processor_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/processor_32.h</a> (renamed from include/asm-sh/processor_32.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/processor_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/processor_64.h</a> (renamed from include/asm-sh/processor_64.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/ptrace.h</a> (renamed from include/asm-sh/ptrace.h)</td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/push-switch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/push-switch.h</a> (renamed from include/asm-sh/push-switch.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/r7780rp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/r7780rp.h</a> (renamed from include/asm-sh/r7780rp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/resource.h</a> (renamed from include/asm-sh/resource.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/rtc.h</a> (renamed from include/asm-sh/rtc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/rts7751r2d.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/rts7751r2d.h</a> (renamed from include/asm-sh/rts7751r2d.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/rwsem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/rwsem.h</a> (renamed from include/asm-sh/rwsem.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/scatterlist.h</a> (renamed from include/asm-sh/scatterlist.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/sdk7780.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sdk7780.h</a> (renamed from include/asm-sh/sdk7780.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sh/include/asm/seccomp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/seccomp.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sections.h</a> (renamed from include/asm-sh/sections.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/segment.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/segment.h</a> (renamed from include/asm-sh/segment.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sembuf.h</a> (renamed from include/asm-sh/sembuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/serial.h</a> (renamed from include/asm-sh/serial.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/setup.h</a> (renamed from include/asm-sh/setup.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/sfp-machine.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sfp-machine.h</a> (renamed from include/asm-sh/sfp-machine.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/sh7760fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sh7760fb.h</a> (renamed from include/asm-sh/sh7760fb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/sh7763rdp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sh7763rdp.h</a> (renamed from include/asm-sh/sh7763rdp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/sh7785lcr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sh7785lcr.h</a> (renamed from include/asm-sh/sh7785lcr.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/sh_bios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sh_bios.h</a> (renamed from include/asm-sh/sh_bios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sh/include/asm/sh_eth.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sh_eth.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/sh_keysc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sh_keysc.h</a> (renamed from include/asm-sh/sh_keysc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/sh_mobile_lcdc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sh_mobile_lcdc.h</a> (renamed from include/asm-sh/sh_mobile_lcdc.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/shmbuf.h</a> (renamed from include/asm-sh/shmbuf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/shmin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/shmin.h</a> (renamed from include/asm-sh/shmin.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/shmparam.h</a> (renamed from include/asm-sh/shmparam.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sigcontext.h</a> (renamed from include/asm-sh/sigcontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/siginfo.h</a> (renamed from include/asm-sh/siginfo.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/signal.h</a> (renamed from include/asm-sh/signal.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/smc37c93x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/smc37c93x.h</a> (renamed from include/asm-sh/smc37c93x.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/smp.h</a> (renamed from include/asm-sh/smp.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/snapgear.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/snapgear.h</a> (renamed from include/asm-sh/snapgear.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/socket.h</a> (renamed from include/asm-sh/socket.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sockios.h</a> (renamed from include/asm-sh/sockios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/sparsemem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sparsemem.h</a> (renamed from include/asm-sh/sparsemem.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/spi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/spi.h</a> (renamed from include/asm-sh/spi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/spinlock.h</a> (renamed from include/asm-sh/spinlock.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/spinlock_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/spinlock_types.h</a> (renamed from include/asm-sh/spinlock_types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/stat.h</a> (renamed from include/asm-sh/stat.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/statfs.h</a> (renamed from include/asm-sh/statfs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/string.h</a> (renamed from include/asm-sh/string.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/string_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/string_32.h</a> (renamed from include/asm-sh/string_32.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/string_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/string_64.h</a> (renamed from include/asm-sh/string_64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/system.h</a> (renamed from include/asm-sh/system.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/system_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/system_32.h</a> (renamed from include/asm-sh/system_32.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/system_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/system_64.h</a> (renamed from include/asm-sh/system_64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/systemh7751.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/systemh7751.h</a> (renamed from include/asm-sh/systemh7751.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/termbits.h</a> (renamed from include/asm-sh/termbits.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/termios.h</a> (renamed from include/asm-sh/termios.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/thread_info.h</a> (renamed from include/asm-sh/thread_info.h)</td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/timer.h</a> (renamed from include/asm-sh/timer.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/timex.h</a> (renamed from include/asm-sh/timex.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/titan.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/titan.h</a> (renamed from include/asm-sh/titan.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/tlb.h</a> (renamed from include/asm-sh/tlb.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/tlb_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/tlb_64.h</a> (renamed from include/asm-sh/tlb_64.h)</td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/tlbflush.h</a> (renamed from include/asm-sh/tlbflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/topology.h</a> (renamed from include/asm-sh/topology.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/types.h</a> (renamed from include/asm-sh/types.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/uaccess.h</a> (renamed from include/asm-sh/uaccess.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/uaccess_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/uaccess_32.h</a> (renamed from include/asm-sh/uaccess_32.h)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/uaccess_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/uaccess_64.h</a> (renamed from include/asm-sh/uaccess_64.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/ubc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/ubc.h</a> (renamed from include/asm-sh/ubc.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/ucontext.h</a> (renamed from include/asm-sh/ucontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/unaligned.h</a> (renamed from include/asm-sh/unaligned.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/unistd.h</a> (renamed from include/asm-sh/unistd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/unistd_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/unistd_32.h</a> (renamed from include/asm-sh/unistd_32.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/unistd_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/unistd_64.h</a> (renamed from include/asm-sh/unistd_64.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/user.h</a> (renamed from include/asm-sh/user.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/vga.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/vga.h</a> (renamed from include/asm-sh/vga.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/watchdog.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/watchdog.h</a> (renamed from include/asm-sh/watchdog.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/asm/xor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/xor.h</a> (renamed from include/asm-sh/xor.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-common/cpu/addrspace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-common/cpu/addrspace.h</a> (renamed from include/asm-sh/cpu-sh2/addrspace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-common/cpu/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-common/cpu/cacheflush.h</a> (renamed from include/asm-sh/cpu-sh2/cacheflush.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-common/cpu/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-common/cpu/mmu_context.h</a> (renamed from include/asm-sh/cpu-sh2/mmu_context.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-common/cpu/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-common/cpu/rtc.h</a> (renamed from include/asm-sh/cpu-sh2/rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-common/cpu/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-common/cpu/sigcontext.h</a> (renamed from include/asm-sh/cpu-sh2/sigcontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-common/cpu/timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-common/cpu/timer.h</a> (renamed from include/asm-sh/cpu-sh2/timer.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh2/cpu/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2/cpu/cache.h</a> (renamed from include/asm-sh/cpu-sh2/cache.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh2/cpu/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2/cpu/dma.h</a> (renamed from include/asm-sh/cpu-sh2/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh2/cpu/freq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2/cpu/freq.h</a> (renamed from include/asm-sh/cpu-sh2/freq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh2/cpu/ubc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2/cpu/ubc.h</a> (renamed from include/asm-sh/cpu-sh2/ubc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh2/cpu/watchdog.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2/cpu/watchdog.h</a> (renamed from include/asm-sh/cpu-sh2/watchdog.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh2a/cpu/addrspace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2a/cpu/addrspace.h</a> (renamed from include/asm-sh/cpu-sh2a/addrspace.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh2a/cpu/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2a/cpu/cache.h</a> (renamed from include/asm-sh/cpu-sh2a/cache.h)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh2a/cpu/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2a/cpu/cacheflush.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh2a/cpu/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2a/cpu/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh2a/cpu/freq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2a/cpu/freq.h</a> (renamed from include/asm-sh/cpu-sh2a/freq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh2a/cpu/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2a/cpu/rtc.h</a> (renamed from include/asm-sh/cpu-sh2a/rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh2a/cpu/ubc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2a/cpu/ubc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh2a/cpu/watchdog.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2a/cpu/watchdog.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh3/cpu/adc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/adc.h</a> (renamed from include/asm-sh/cpu-sh3/adc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh3/cpu/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/cache.h</a> (renamed from include/asm-sh/cpu-sh3/cache.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh3/cpu/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/cacheflush.h</a> (renamed from include/asm-sh/cpu-sh3/cacheflush.h)</td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh3/cpu/dac.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/dac.h</a> (renamed from include/asm-sh/cpu-sh3/dac.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh3/cpu/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/dma.h</a> (renamed from include/asm-sh/cpu-sh3/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh3/cpu/freq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/freq.h</a> (renamed from include/asm-sh/cpu-sh3/freq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh3/cpu/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/gpio.h</a> (renamed from include/asm-sh/cpu-sh3/gpio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh3/cpu/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/mmu_context.h</a> (renamed from include/asm-sh/cpu-sh3/mmu_context.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh3/cpu/timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/timer.h</a> (renamed from include/asm-sh/cpu-sh3/timer.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh3/cpu/ubc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/ubc.h</a> (renamed from include/asm-sh/cpu-sh3/ubc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh3/cpu/watchdog.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/watchdog.h</a> (renamed from include/asm-sh/cpu-sh3/watchdog.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/addrspace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/addrspace.h</a> (renamed from include/asm-sh/cpu-sh4/addrspace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/cache.h</a> (renamed from include/asm-sh/cpu-sh4/cache.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/cacheflush.h</a> (renamed from include/asm-sh/cpu-sh4/cacheflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/dma-sh7780.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/dma-sh7780.h</a> (renamed from include/asm-sh/cpu-sh4/dma-sh7780.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/dma.h</a> (renamed from include/asm-sh/cpu-sh4/dma.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/fpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/fpu.h</a> (renamed from include/asm-sh/cpu-sh4/fpu.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/freq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/freq.h</a> (renamed from include/asm-sh/cpu-sh4/freq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/mmu_context.h</a> (renamed from include/asm-sh/cpu-sh4/mmu_context.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/rtc.h</a> (renamed from include/asm-sh/cpu-sh4/rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/sigcontext.h</a> (renamed from include/asm-sh/cpu-sh4/sigcontext.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/sq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/sq.h</a> (renamed from include/asm-sh/cpu-sh4/sq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/timer.h</a> (renamed from include/asm-sh/cpu-sh4/timer.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/ubc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/ubc.h</a> (renamed from include/asm-sh/cpu-sh4/ubc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/watchdog.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/watchdog.h</a> (renamed from include/asm-sh/cpu-sh4/watchdog.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh5/cpu/addrspace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh5/cpu/addrspace.h</a> (renamed from include/asm-sh/cpu-sh5/addrspace.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh5/cpu/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh5/cpu/cache.h</a> (renamed from include/asm-sh/cpu-sh5/cache.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh5/cpu/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh5/cpu/cacheflush.h</a> (renamed from include/asm-sh/cpu-sh5/cacheflush.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh5/cpu/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh5/cpu/dma.h</a> (renamed from include/asm-sh/cpu-sh5/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh5/cpu/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh5/cpu/irq.h</a> (renamed from include/asm-sh/cpu-sh5/irq.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh5/cpu/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh5/cpu/mmu_context.h</a> (renamed from include/asm-sh/cpu-sh5/mmu_context.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh5/cpu/registers.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh5/cpu/registers.h</a> (renamed from include/asm-sh/cpu-sh5/registers.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh5/cpu/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh5/cpu/rtc.h</a> (renamed from include/asm-sh/cpu-sh5/rtc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/mach-dreamcast/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-dreamcast/mach/dma.h</a> (renamed from include/asm-sh/dreamcast/dma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/mach-dreamcast/mach/maple.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-dreamcast/mach/maple.h</a> (renamed from include/asm-sh/dreamcast/maple.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/mach-dreamcast/mach/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-dreamcast/mach/pci.h</a> (renamed from include/asm-sh/dreamcast/pci.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/mach-dreamcast/mach/sysasic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-dreamcast/mach/sysasic.h</a> (renamed from include/asm-sh/dreamcast/sysasic.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/mach-landisk/mach/gio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-landisk/mach/gio.h</a> (renamed from include/asm-sh/landisk/gio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/mach-landisk/mach/iodata_landisk.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-landisk/mach/iodata_landisk.h</a> (renamed from include/asm-sh/landisk/iodata_landisk.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/mach-se/mach/se.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-se/mach/se.h</a> (renamed from include/asm-sh/se.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/mach-se/mach/se7206.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-se/mach/se7206.h</a> (renamed from include/asm-sh/se7206.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/mach-se/mach/se7343.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-se/mach/se7343.h</a> (renamed from include/asm-sh/se7343.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/mach-se/mach/se7721.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-se/mach/se7721.h</a> (renamed from include/asm-sh/se7721.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/mach-se/mach/se7722.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-se/mach/se7722.h</a> (renamed from include/asm-sh/se7722.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/mach-se/mach/se7751.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-se/mach/se7751.h</a> (renamed from include/asm-sh/se7751.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/mach-se/mach/se7780.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-se/mach/se7780.h</a> (renamed from include/asm-sh/se7780.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/mach-sh03/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-sh03/mach/io.h</a> (renamed from include/asm-sh/sh03/io.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/sh/include/mach-sh03/mach/sh03.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-sh03/mach/sh03.h</a> (renamed from include/asm-sh/sh03/sh03.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sh/kernel/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cf-enabler.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cf-enabler.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/irq/intc-sh5.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/irq/intc-sh5.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh2/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/sh2/entry.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh2a/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/sh2a/entry.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh3/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/sh3/entry.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4/fpu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/sh4/fpu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4/softfloat.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/sh4/softfloat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4/sq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/sh4/sq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4a/setup-sh7723.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/sh4a/setup-sh7723.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh5/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/sh5/entry.S</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/entry-common.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/entry-common.S</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/head_64.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/head_64.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/machine_kexec.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/machine_kexec.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/module.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/module.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/ptrace_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/ptrace_32.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/ptrace_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/ptrace_64.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/setup.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/sh_ksyms_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/sh_ksyms_32.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/signal_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/signal_32.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/signal_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/signal_64.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/sys_sh.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/sys_sh.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/time_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/time_64.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/lib64/panic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/lib64/panic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/mm/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/mm/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/mm/Makefile_32?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/mm/Makefile_32</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/mm/cache-sh2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/mm/cache-sh2.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sh/mm/cache-sh2a.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/mm/cache-sh2a.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/mm/consistent.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/mm/consistent.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/mm/fault_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/mm/fault_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/mm/tlb-sh5.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/mm/tlb-sh5.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/boot/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/boot/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/ebus_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/ebus_32.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/ebus_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/ebus_64.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/futex_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/futex_64.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/irq_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/irq_64.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/of_device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/of_device.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/of_platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/of_platform.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/of_platform_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/of_platform_32.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/of_platform_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/of_platform_64.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/parport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/parport.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/ptrace_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/ptrace_32.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/ptrace_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/ptrace_64.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/sbus_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/sbus_32.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/sbus_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/sbus_64.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/smp_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/smp_32.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/ioport.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/kernel/ioport.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/of_device.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/kernel/of_device.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/ptrace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/kernel/ptrace.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/sun4d_smp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/kernel/sun4d_smp.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/sun4m_smp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/kernel/sun4m_smp.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/auxio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/auxio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/ebus.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/ebus.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/irq.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/kstack.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/kstack.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/of_device.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/of_device.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/pci_common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/pci_common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/pci_psycho.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/pci_psycho.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/pci_sabre.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/pci_sabre.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/pci_schizo.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/pci_schizo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/power.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/power.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/process.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/process.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/prom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/prom.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/ptrace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/ptrace.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/signal.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/signal.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/smp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/smp.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/sparc64_ksyms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/sparc64_ksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/stacktrace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/stacktrace.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/sys_sparc32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/sys_sparc32.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/systbls.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/systbls.S</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/traps.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/traps.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/lib/mcount.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/lib/mcount.S</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/mm/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/mm/init.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/mm/tsb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/mm/tsb.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/mm/ultra.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/mm/ultra.S</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/drivers/line.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/um/drivers/line.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/Kconfig</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/Kconfig.cpu?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/Kconfig.cpu</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/boot/boot.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/boot/boot.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/boot/cpu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/boot/cpu.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/boot/cpucheck.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/boot/cpucheck.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/boot/main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/boot/main.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/boot/memory.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/boot/memory.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/configs/i386_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/configs/i386_defconfig</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/configs/x86_64_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/configs/x86_64_defconfig</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/acpi/boot.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/acpi/boot.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/acpi/sleep.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/acpi/sleep.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/alternative.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/alternative.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/amd_iommu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/amd_iommu.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/amd_iommu_init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/amd_iommu_init.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/apic_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/apic_32.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/apic_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/apic_64.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/addon_cpuid_features.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/addon_cpuid_features.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/amd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/amd.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/bugs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/bugs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/centaur.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/centaur.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/common.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/common_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/common_64.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/cpufreq/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/cpufreq/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/cpufreq/elanfreq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/cpufreq/elanfreq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/cpufreq/powernow-k8.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/cpufreq/powernow-k8.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/cyrix.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/cyrix.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/feature_names.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/feature_names.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/mcheck/mce_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/mcheck/mce_64.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/mcheck/mce_amd_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/mcheck/mce_amd_64.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/mtrr/generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/mtrr/generic.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/mtrr/main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/mtrr/main.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/perfctr-watchdog.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/perfctr-watchdog.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpuid.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpuid.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/e820.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/e820.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/efi_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/efi_32.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/genapic_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/genapic_64.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/genx2apic_uv_x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/genx2apic_uv_x.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/head64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/head64.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/hpet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/hpet.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/io_apic_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/io_apic_32.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/io_apic_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/io_apic_64.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/io_delay.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/io_delay.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/kdebugfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/kdebugfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/machine_kexec_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/machine_kexec_32.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/mfgpt_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/mfgpt_32.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/mmconf-fam10h_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/mmconf-fam10h_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/mpparse.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/mpparse.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/msr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/msr.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/nmi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/nmi.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/numaq_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/numaq_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/paravirt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/paravirt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/pci-calgary_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/pci-calgary_64.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/pci-dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/pci-dma.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/process_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/process_32.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/process_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/process_64.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/relocate_kernel_32.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/relocate_kernel_32.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/setup.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/signal_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/signal_64.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/smpboot.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/smpboot.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/smpcommon.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/smpcommon.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/tlb_uv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/tlb_uv.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/traps_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/traps_64.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/tsc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/tsc.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/tsc_sync.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/tsc_sync.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/visws_quirks.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/visws_quirks.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/vmi_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/vmi_32.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/vmlinux_32.lds.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/vmlinux_32.lds.S</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/mmu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kvm/mmu.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/paging_tmpl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kvm/paging_tmpl.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/svm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kvm/svm.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/vmx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kvm/vmx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/vmx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kvm/vmx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/x86.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kvm/x86.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/lib/copy_user_64.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/lib/copy_user_64.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/lib/copy_user_nocache_64.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/lib/copy_user_nocache_64.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/lib/msr-on-cpu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/lib/msr-on-cpu.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mach-rdc321x/platform.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mach-rdc321x/platform.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/init_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/init_32.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/init_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/init_64.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/ioremap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/ioremap.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/mmio-mod.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/mmio-mod.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/pageattr-test.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/pageattr-test.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/pageattr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/pageattr.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/pat.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/pat.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/pgtable.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/pgtable.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/srat_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/srat_32.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/oprofile/nmi_int.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/oprofile/nmi_int.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/pci/amd_bus.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/pci/amd_bus.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/pci/i386.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/pci/i386.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/pci/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/pci/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/pci/legacy.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/pci/legacy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/pci/mmconfig-shared.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/pci/mmconfig-shared.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/power/cpu_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/power/cpu_32.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/power/hibernate_asm_32.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/power/hibernate_asm_32.S</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/xen/enlighten.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/xen/enlighten.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/xen/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/xen/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/xtensa_ksyms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/xtensa/kernel/xtensa_ksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/blk-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>block/blk-core.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/blk-tag.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>block/blk-tag.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/bsg.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>block/bsg.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/cmd-filter.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>block/cmd-filter.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/genhd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>block/genhd.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/scsi_ioctl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>block/scsi_ioctl.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/async_tx/async_tx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>crypto/async_tx/async_tx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/async_tx/async_xor.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>crypto/async_tx/async_xor.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/authenc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>crypto/authenc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/camellia.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>crypto/camellia.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/digest.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>crypto/digest.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/tcrypt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>crypto/tcrypt.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/asus_acpi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/asus_acpi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/dispatcher/dsobject.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/dispatcher/dsobject.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/dock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/dock.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/ec.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/ec.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exconfig.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/executer/exconfig.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nsnames.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/namespace/nsnames.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/pci_link.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/pci_link.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/processor_core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/processor_core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/processor_idle.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/processor_idle.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/processor_perflib.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/processor_perflib.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/resources/rscalc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/resources/rscalc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/sbshc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/sbshc.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/tables.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/tables.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utalloc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/utilities/utalloc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utdelete.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/utilities/utdelete.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utobject.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/utilities/utobject.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/wmi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/wmi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/ahci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/ahci.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/ata_piix.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/ata_piix.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/libata-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/libata-core.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/libata-eh.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/libata-eh.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/libata-scsi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/libata-scsi.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/libata-sff.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/libata-sff.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/libata.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/libata.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_acpi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_acpi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_ali.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_ali.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_at32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_at32.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_atiixp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_atiixp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_cs5530.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_cs5530.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_it821x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_it821x.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_marvell.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_marvell.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_oldpiix.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_oldpiix.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_sc1200.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_sc1200.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_sil680.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_sil680.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_via.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_via.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/sata_inic162x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/sata_inic162x.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/sata_mv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/sata_mv.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/sata_nv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/sata_nv.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/adummy.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/atm/adummy.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/iphase.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/atm/iphase.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/class.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/base/class.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/base/core.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/driver.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/base/driver.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/power/main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/base/power/main.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/power/power.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/base/power/power.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/aoe/aoenet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/block/aoe/aoenet.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/brd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/block/brd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/cciss.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/block/cciss.c</a></td><td class='right'>750</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/cciss.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/block/cciss.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/cciss_scsi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/block/cciss_scsi.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/nbd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/block/nbd.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/pktcdvd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/block/pktcdvd.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/xen-blkfront.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/block/xen-blkfront.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/bcm203x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/bcm203x.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/bfusb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/bfusb.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/bpa10x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/bpa10x.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/bt3c_cs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/bt3c_cs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/btusb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/btusb.c</a></td><td class='right'>441</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/hci_ldisc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/hci_ldisc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/hci_usb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/hci_usb.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/hci_vhci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/hci_vhci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cdrom/cdrom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/cdrom/cdrom.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cdrom/gdrom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/cdrom/gdrom.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cdrom/viocd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/cdrom/viocd.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/agp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/agp.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/ali-agp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/ali-agp.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/amd-k7-agp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/amd-k7-agp.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/amd64-agp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/amd64-agp.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/ati-agp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/ati-agp.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/backend.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/backend.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/generic.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/intel-agp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/intel-agp.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/isoch.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/isoch.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/sis-agp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/sis-agp.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/sworks-agp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/sworks-agp.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/uninorth-agp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/uninorth-agp.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/amiserial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/amiserial.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ds1620.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/ds1620.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/efirtc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/efirtc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hvc_console.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/hvc_console.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hvc_console.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/hvc_console.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hvcs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/hvcs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hw_random/ixp4xx-rng.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/hw_random/ixp4xx-rng.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hw_random/via-rng.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/hw_random/via-rng.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ipmi/ipmi_si_intf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/ipmi/ipmi_si_intf.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/mxser.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/mxser.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/pcmcia/ipwireless/tty.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/pcmcia/ipwireless/tty.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/pcmcia/synclink_cs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/pcmcia/synclink_cs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/random.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/random.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rtc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/rtc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/synclink.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/synclink.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/synclink_gt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/synclink_gt.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/synclinkmp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/synclinkmp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tty_io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/tty_io.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tty_ioctl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/tty_ioctl.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tty_ldisc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/tty_ldisc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/char/viocons.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/viocons.c</a></td><td class='right'>1171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.7%;'/><td class='none' style='width: 86.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/vt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/vt.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/vt_ioctl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/vt_ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/xilinx_hwicap/buffer_icap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/xilinx_hwicap/buffer_icap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/xilinx_hwicap/fifo_icap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/xilinx_hwicap/fifo_icap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/xilinx_hwicap/xilinx_hwicap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/xilinx_hwicap/xilinx_hwicap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/xilinx_hwicap/xilinx_hwicap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/xilinx_hwicap/xilinx_hwicap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/clocksource/acpi_pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/clocksource/acpi_pm.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpufreq/cpufreq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/cpufreq/cpufreq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpufreq/cpufreq_conservative.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/cpufreq/cpufreq_conservative.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpuidle/governors/ladder.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/cpuidle/governors/ladder.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpuidle/governors/menu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/cpuidle/governors/menu.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpuidle/sysfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/cpuidle/sysfs.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/crypto/ixp4xx_crypto.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/crypto/ixp4xx_crypto.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/crypto/padlock-aes.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/crypto/padlock-aes.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/crypto/padlock-sha.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/crypto/padlock-sha.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/crypto/talitos.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/crypto/talitos.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/ioat_dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/dma/ioat_dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/iop-adma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/dma/iop-adma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/mv_xor.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/dma/mv_xor.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/edac_core.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/edac/edac_core.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/firewire/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/firewire/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/firewire/fw-cdev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/firewire/fw-cdev.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/firmware/iscsi_ibft.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/firmware/iscsi_ibft.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/firmware/iscsi_ibft_find.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/firmware/iscsi_ibft_find.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/firmware/memmap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/firmware/memmap.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/drm_irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/gpu/drm/drm_irq.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/drm_lock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/gpu/drm/drm_lock.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/r300_cmdbuf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/gpu/drm/radeon/r300_cmdbuf.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/r300_reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/gpu/drm/radeon/r300_reg.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_cp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/gpu/drm/radeon/radeon_cp.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_drv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/gpu/drm/radeon/radeon_drv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_drv.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/gpu/drm/radeon/radeon_drv.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/usbhid/hid-quirks.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hid/usbhid/hid-quirks.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/Kconfig</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/abituguru3.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/abituguru3.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/hwmon/ad7414.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/ad7414.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/hwmon/adcxx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/adcxx.c</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/adt7473.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/adt7473.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/applesmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/applesmc.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/atxp1.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/atxp1.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/coretemp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/coretemp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/dme1737.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/dme1737.c</a></td><td class='right'>523</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/f71882fg.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/f71882fg.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/hwmon-vid.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/hwmon-vid.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/i5k_amb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/i5k_amb.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/ibmaem.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/ibmaem.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/it87.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/it87.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/lm75.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/lm75.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/lm85.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/lm85.c</a></td><td class='right'>672</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/thmc50.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/thmc50.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/w83627hf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/w83627hf.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/w83791d.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/w83791d.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/algos/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/algos/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-acorn.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-acorn.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-amd756-s4882.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-amd756-s4882.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-at91.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-at91.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-davinci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-davinci.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-ixp2000.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-ixp2000.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-nforce2-s4985.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-nforce2-s4985.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-pnx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-pnx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-pxa.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-pxa.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-s3c2410.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-s3c2410.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-sh_mobile.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-sh_mobile.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/chips/at24.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/chips/at24.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/chips/isp1301_omap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/chips/isp1301_omap.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/chips/menelaus.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/chips/menelaus.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/i2c-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/i2c-core.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/i2c-dev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/i2c-dev.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/arm/ide_arm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/arm/ide_arm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/arm/palm_bk3710.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/arm/palm_bk3710.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-cd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/ide-cd.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-disk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/ide-disk.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/ide-dma.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-floppy.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/ide-floppy.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-iops.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/ide-iops.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-tape.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/ide-tape.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/aec62xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/aec62xx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/alim15x3.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/alim15x3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/amd74xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/amd74xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/atiixp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/atiixp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/cmd64x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/cmd64x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/cs5520.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/cs5520.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/cs5535.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/cs5535.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/cy82c693.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/cy82c693.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/hpt366.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/hpt366.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/it8213.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/it8213.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/it821x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/it821x.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/jmicron.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/jmicron.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/pdc202xx_new.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/pdc202xx_new.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/pdc202xx_old.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/pdc202xx_old.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/piix.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/piix.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/scc_pata.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/scc_pata.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/serverworks.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/serverworks.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/sgiioc4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/sgiioc4.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/siimage.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/siimage.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/sis5513.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/sis5513.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/slc90e66.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/slc90e66.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/tc86c001.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/tc86c001.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/via82cxxx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/via82cxxx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ppc/pmac.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/ppc/pmac.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/nodemgr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ieee1394/nodemgr.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/nodemgr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ieee1394/nodemgr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/sbp2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ieee1394/sbp2.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/cma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/core/cma.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/mad_rmpp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/core/mad_rmpp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/ucma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/core/ucma.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/cxgb3/cxio_hal.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/cxgb3/cxio_hal.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/cxgb3/iwch_provider.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/cxgb3/iwch_provider.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/cxgb3/iwch_provider.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/cxgb3/iwch_provider.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/cxgb3/iwch_qp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/cxgb3/iwch_qp.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ehca/ehca_classes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ehca/ehca_classes.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ehca/ehca_qes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ehca/ehca_qes.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ehca/ehca_qp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ehca/ehca_qp.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ehca/ehca_reqs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ehca/ehca_reqs.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ehca/ehca_tools.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ehca/ehca_tools.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_driver.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ipath/ipath_driver.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_fs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ipath/ipath_fs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_iba7220.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ipath/ipath_iba7220.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_intr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ipath/ipath_intr.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_ud.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ipath/ipath_ud.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_verbs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ipath/ipath_verbs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mlx4/cq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/mlx4/cq.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mlx4/mr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/mlx4/mr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mlx4/qp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/mlx4/qp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/nes/nes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/nes/nes.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/nes/nes_cm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/nes/nes_cm.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/ipoib/ipoib.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/ulp/ipoib/ipoib.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/ipoib/ipoib_cm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/ulp/ipoib/ipoib_cm.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/ipoib/ipoib_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/ulp/ipoib/ipoib_main.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/ipoib/ipoib_multicast.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/ulp/ipoib/ipoib_multicast.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/iser/iser_verbs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/ulp/iser/iser_verbs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/evdev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/evdev.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/xpad.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/joystick/xpad.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/aaed2000_kbd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/aaed2000_kbd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/bf54x-keys.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/bf54x-keys.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/corgikbd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/corgikbd.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/gpio_keys.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/gpio_keys.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/jornada720_kbd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/jornada720_kbd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/maple_keyb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/maple_keyb.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/omap-keypad.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/omap-keypad.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/pxa27x_keypad.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/pxa27x_keypad.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/spitzkbd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/spitzkbd.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/tosakbd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/tosakbd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/cobalt_btns.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/misc/cobalt_btns.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/ixp4xx-beeper.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/misc/ixp4xx-beeper.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/mouse/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/mouse/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/input/mouse/bcm5974.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/mouse/bcm5974.c</a></td><td class='right'>721</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/gpio_mouse.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/mouse/gpio_mouse.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/rpcmouse.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/mouse/rpcmouse.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/i8042-sparcio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/serio/i8042-sparcio.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/i8042-x86ia64io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/serio/i8042-x86ia64io.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/rpckbd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/serio/rpckbd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/xilinx_ps2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/serio/xilinx_ps2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/tablet/gtco.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/tablet/gtco.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/corgi_ts.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/corgi_ts.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/h3600_ts_input.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/h3600_ts_input.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/jornada720_ts.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/jornada720_ts.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/mainstone-wm97xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/mainstone-wm97xx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/migor_ts.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/migor_ts.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/wm9705.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/wm9705.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/wm9712.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/wm9712.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/wm9713.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/wm9713.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/wm97xx-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/wm97xx-core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/isdn/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/gigaset/isocdata.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/isdn/gigaset/isocdata.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/mISDN/hfcmulti.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/isdn/hardware/mISDN/hfcmulti.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/mISDN/hfcpci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/isdn/hardware/mISDN/hfcpci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hysdn/hysdn_pof.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/isdn/hysdn/hysdn_pof.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/mISDN/l1oip_core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/isdn/mISDN/l1oip_core.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/mISDN/socket.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/isdn/mISDN/socket.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-ams-delta.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/leds/leds-ams-delta.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-cm-x270.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/leds/leds-cm-x270.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-corgi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/leds/leds-corgi.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-fsg.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/leds/leds-fsg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-h1940.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/leds/leds-h1940.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-locomo.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/leds/leds-locomo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-s3c24xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/leds/leds-s3c24xx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-spitz.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/leds/leds-spitz.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/lguest/lguest_device.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/lguest/lguest_device.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/lguest/page_tables.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/lguest/page_tables.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/mediabay.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/macintosh/mediabay.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/bitmap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/md/bitmap.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-table.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/md/dm-table.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/md.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/md/md.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/raid10.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/md/raid10.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/raid5.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/md/raid5.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/saa7146_video.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/saa7146_video.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/mt2131.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/mt2131.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/mt2131.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/mt2131.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/mt2131_priv.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/mt2131_priv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/mxl5005s.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/mxl5005s.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/mxl5005s.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/mxl5005s.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/tuner-simple.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/tuner-simple.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/xc5000.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/xc5000.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/xc5000.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/xc5000.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/xc5000_priv.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/xc5000_priv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/b2c2/flexcop-fe-tuner.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/b2c2/flexcop-fe-tuner.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/b2c2/flexcop-i2c.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/b2c2/flexcop-i2c.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/bt8xx/dst.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/bt8xx/dst.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dmxdev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/dvb-core/dmxdev.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dvb_ca_en50221.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/dvb-core/dvb_ca_en50221.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dvb_frontend.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/dvb-core/dvb_frontend.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/cxusb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/dvb-usb/cxusb.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dib0700_devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/dvb-usb/dib0700_devices.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dvb-usb-ids.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/dvb-usb/dvb-usb-ids.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/au8522.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/au8522.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/au8522.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/au8522.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx22702.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/cx22702.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx22702.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/cx22702.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx24123.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/cx24123.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx24123.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/cx24123.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/s5h1409.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/s5h1409.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/s5h1409.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/s5h1409.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/s5h1411.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/s5h1411.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/s5h1411.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/s5h1411.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/s5h1420.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/s5h1420.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda10048.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/tda10048.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda10048.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/tda10048.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/siano/sms-cards.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/siano/sms-cards.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/siano/sms-cards.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/siano/sms-cards.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/siano/smscoreapi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/siano/smscoreapi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/siano/smscoreapi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/siano/smscoreapi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/siano/smsdvb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/siano/smsdvb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/siano/smsusb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/siano/smsusb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/budget-patch.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/ttpci/budget-patch.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/budget.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/ttpci/budget.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/dsbr100.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/dsbr100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/media/radio/miropcm20-radio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/miropcm20-radio.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/media/radio/miropcm20-rds-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/miropcm20-rds-core.c</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/media/radio/miropcm20-rds-core.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/miropcm20-rds-core.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/media/radio/miropcm20-rds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/miropcm20-rds.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-aimslab.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-aimslab.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-aztech.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-aztech.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-cadet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-cadet.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-gemtek-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-gemtek-pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-gemtek.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-gemtek.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-maestro.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-maestro.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-maxiradio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-maxiradio.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-rtrack2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-rtrack2.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-sf16fmi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-sf16fmi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-si470x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-si470x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-terratec.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-terratec.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-trust.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-trust.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-zoltrix.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-zoltrix.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/arv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/arv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/au0828/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/au0828/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/au0828/au0828-cards.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/au0828/au0828-cards.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/au0828/au0828-cards.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/au0828/au0828-cards.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/au0828/au0828-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/au0828/au0828-core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/au0828/au0828-dvb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/au0828/au0828-dvb.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/au0828/au0828-i2c.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/au0828/au0828-i2c.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/au0828/au0828-reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/au0828/au0828-reg.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/au0828/au0828.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/au0828/au0828.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/bt8xx/bttv-cards.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/bt8xx/bttv-cards.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/bt8xx/bttv-driver.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/bt8xx/bttv-driver.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/bt8xx/bttv-risc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/bt8xx/bttv-risc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/bt8xx/bttvp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/bt8xx/bttvp.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/btcx-risc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/btcx-risc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/btcx-risc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/btcx-risc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/bw-qcam.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/bw-qcam.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/c-qcam.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/c-qcam.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cpia.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cpia.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cpia2/cpia2_v4l.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cpia2/cpia2_v4l.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cs5345.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cs5345.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cs53l32a.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cs53l32a.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx18/cx18-av-firmware.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx18/cx18-av-firmware.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx18/cx18-driver.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx18/cx18-driver.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx18/cx18-dvb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx18/cx18-dvb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx18/cx18-dvb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx18/cx18-dvb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx18/cx18-irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx18/cx18-irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx18/cx18-queue.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx18/cx18-queue.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx18/cx18-queue.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx18/cx18-queue.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx23885/cx23885-417.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885-417.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx23885/cx23885-cards.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885-cards.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx23885/cx23885-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885-core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx23885/cx23885-dvb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885-dvb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx23885/cx23885-i2c.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885-i2c.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx23885/cx23885-reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885-reg.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx23885/cx23885-vbi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885-vbi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx23885/cx23885-video.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885-video.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx23885/cx23885.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25840/cx25840-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx25840/cx25840-core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/dabusb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/dabusb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/em28xx/em28xx-cards.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/em28xx/em28xx-cards.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/et61x251/et61x251_core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/et61x251/et61x251_core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/conex.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/conex.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/etoms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/etoms.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/gspca.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/gspca.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/gspca.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/gspca.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/mars.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/mars.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/ov519.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/ov519.c</a></td><td class='right'>1589</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.4%;'/><td class='rem' style='width: 9.1%;'/><td class='none' style='width: 81.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/pac207.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/pac207.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/pac7311.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/pac7311.c</a></td><td class='right'>1116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 87.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/pac_common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/pac_common.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/sonixb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/sonixb.c</a></td><td class='right'>596</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/sonixj.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/sonixj.c</a></td><td class='right'>786</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/spca500.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/spca500.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/spca501.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/spca501.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/spca505.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/spca505.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/spca506.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/spca506.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/spca508.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/spca508.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/spca561.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/spca561.c</a></td><td class='right'>751</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/stk014.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/stk014.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/sunplus.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/sunplus.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/t613.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/t613.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/tv8532.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/tv8532.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/vc032x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/vc032x.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/zc3xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/zc3xx.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ivtv/ivtv-driver.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ivtv/ivtv-driver.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ivtv/ivtv-driver.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ivtv/ivtv-driver.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ivtv/ivtv-irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ivtv/ivtv-irq.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ivtv/ivtv-queue.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ivtv/ivtv-queue.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ivtv/ivtv-streams.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ivtv/ivtv-streams.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ivtv/ivtv-vbi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ivtv/ivtv-vbi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ivtv/ivtv-version.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ivtv/ivtv-version.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ks0127.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ks0127.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/meye.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/meye.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/mt9v022.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/mt9v022.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/mxb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/mxb.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ov511.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ov511.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/media/video/planb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/planb.c</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/media/video/planb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/planb.h</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/pms.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-ctrl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/pwc/pwc-ctrl.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pxa_camera.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/pxa_camera.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7115.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/saa7115.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/media/video/saa7196.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/saa7196.h</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/se401.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/se401.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/sh_mobile_ceu_camera.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/sh_mobile_ceu_camera.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/sn9c102/sn9c102_core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/sn9c102/sn9c102_core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/sn9c102/sn9c102_devtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/sn9c102/sn9c102_devtable.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/soc_camera.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/soc_camera.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/soc_camera_platform.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/soc_camera_platform.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/stv680.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/stv680.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/usbvideo/ibmcam.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/usbvideo/ibmcam.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/usbvideo/vicam.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/usbvideo/vicam.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/uvc/uvc_ctrl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/uvc/uvc_ctrl.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/uvc/uvc_driver.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/uvc/uvc_driver.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/uvc/uvc_video.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/uvc/uvc_video.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/v4l2-dev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/v4l2-dev.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/v4l2-ioctl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/v4l2-ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/media/video/videodev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/videodev.c</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/vino.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/vino.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/vivi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/vivi.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/w9966.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/w9966.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zc0301/zc0301_core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/zc0301/zc0301_core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zc0301/zc0301_sensor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/zc0301/zc0301_sensor.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/memstick/core/memstick.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/memstick/core/memstick.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/memstick/core/mspro_block.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/memstick/core/mspro_block.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/memstick/host/jmb38x_ms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/memstick/host/jmb38x_ms.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/asic3.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/asic3.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/mcp-sa11x0.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/mcp-sa11x0.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mfd/t7l66xb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/t7l66xb.c</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mfd/tc6387xb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/tc6387xb.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/tc6393xb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/tc6393xb.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/ucb1x00-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/ucb1x00-core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/ucb1x00-ts.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/ucb1x00-ts.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/Kconfig</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/acer-wmi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/acer-wmi.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/eeepc-laptop.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/eeepc-laptop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/eeprom_93cx6.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/eeprom_93cx6.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/fujitsu-laptop.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/fujitsu-laptop.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/hp-wmi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/hp-wmi.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-gru/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-gru/gru.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/gru.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-gru/gru_instructions.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/gru_instructions.h</a></td><td class='right'>669</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-gru/grufault.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/grufault.c</a></td><td class='right'>633</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-gru/grufile.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/grufile.c</a></td><td class='right'>488</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-gru/gruhandles.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/gruhandles.h</a></td><td class='right'>663</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-gru/grukservices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/grukservices.c</a></td><td class='right'>679</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-gru/grukservices.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/grukservices.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-gru/grulib.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/grulib.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-gru/grumain.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/grumain.c</a></td><td class='right'>802</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-gru/gruprocfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/gruprocfs.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-gru/grutables.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/grutables.h</a></td><td class='right'>609</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-gru/grutlbpurge.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/grutlbpurge.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/sgi-xp/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/sgi-xp/xp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xp.h</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/sgi-xp/xp_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xp_main.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-xp/xp_sn2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xp_sn2.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-xp/xp_uv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xp_uv.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/sgi-xp/xpc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xpc.h</a></td><td class='right'>1200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 8.0%;'/><td class='none' style='width: 86.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/sgi-xp/xpc_channel.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xpc_channel.c</a></td><td class='right'>1585</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 16.6%;'/><td class='none' style='width: 81.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/sgi-xp/xpc_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xpc_main.c</a></td><td class='right'>974</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 5.2%;'/><td class='none' style='width: 88.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/sgi-xp/xpc_partition.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xpc_partition.c</a></td><td class='right'>928</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 9.2%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-xp/xpc_sn2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xpc_sn2.c</a></td><td class='right'>2404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 28.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 72.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/sgi-xp/xpc_uv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xpc_uv.c</a></td><td class='right'>1443</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/sgi-xp/xpnet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xpnet.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/thinkpad_acpi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/thinkpad_acpi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/card/block.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/card/block.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/card/mmc_test.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/card/mmc_test.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/core/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/core/core.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/at91_mci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/at91_mci.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/atmel-mci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/atmel-mci.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/au1xmmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/au1xmmc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/imxmmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/imxmmc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/omap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/omap.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/pxamci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/pxamci.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/s3cmci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/s3cmci.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/sdhci-pci.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/sdhci.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/sdhci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdricoh_cs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/sdricoh_cs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mmc/host/tmio_mmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/tmio_mmc.c</a></td><td class='right'>691</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mmc/host/tmio_mmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/tmio_mmc.h</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/chips/jedec_probe.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/chips/jedec_probe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/mtd_dataflash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/devices/mtd_dataflash.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/amd76xrom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/amd76xrom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/autcpu12-nvram.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/autcpu12-nvram.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/cdb89712.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/cdb89712.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/ceiva.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/ceiva.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/ck804xrom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/ck804xrom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/esb2rom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/esb2rom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/h720x-flash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/h720x-flash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/integrator-flash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/integrator-flash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/ipaq-flash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/ipaq-flash.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/ixp2000.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/ixp2000.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/omap_nor.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/omap_nor.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/pxa2xx-flash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/pxa2xx-flash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/sa1100-flash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/sa1100-flash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/mtdchar.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/mtdchar.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/mtdsuper.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/mtdsuper.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/ams-delta.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/ams-delta.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/atmel_nand.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/atmel_nand.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/au1550nd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/au1550nd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/autcpu12.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/autcpu12.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/bf5xx_nand.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/bf5xx_nand.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/cmx270_nand.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/cmx270_nand.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/diskonchip.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/diskonchip.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/edb7312.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/edb7312.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/fsl_elbc_nand.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/fsl_elbc_nand.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/h1910.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/h1910.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/nandsim.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/nandsim.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/orion_nand.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/orion_nand.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/pxa3xx_nand.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/pxa3xx_nand.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/sharpsl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/sharpsl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mtd/nand/tmio_nand.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/tmio_nand.c</a></td><td class='right'>556</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/ts7250.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/ts7250.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/3c523.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/3c523.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/3c527.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/3c527.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/3c59x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/3c59x.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/8390.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/8390.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/8390p.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/8390p.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/acenic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/acenic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/arm/am79c961a.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/arm/am79c961a.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/arm/at91_ether.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/arm/at91_ether.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/arm/ep93xx_eth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/arm/ep93xx_eth.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/arm/ixp4xx_eth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/arm/ixp4xx_eth.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/atl1e/atl1e_ethtool.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/atl1e/atl1e_ethtool.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/atl1e/atl1e_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/atl1e/atl1e_main.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/atlx/atl1.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/atlx/atl1.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/atp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/atp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/au1000_eth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/au1000_eth.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ax88796.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ax88796.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bfin_mac.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bfin_mac.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bnx2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bnx2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bnx2x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bnx2x_fw_defs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x_fw_defs.h</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bnx2x_hsi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x_hsi.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bnx2x_init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x_init.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bnx2x_init_values.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x_init_values.h</a></td><td class='right'>533</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bnx2x_link.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x_link.c</a></td><td class='right'>1259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.4%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 85.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bnx2x_link.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x_link.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bnx2x_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x_main.c</a></td><td class='right'>1387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 7.1%;'/><td class='none' style='width: 83.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bnx2x_reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x_reg.h</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bonding/bond_3ad.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bonding/bond_3ad.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bonding/bond_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bonding/bond_main.c</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bonding/bond_sysfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bonding/bond_sysfs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/cpmac.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/cpmac.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/cs89x0.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/cs89x0.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/cxgb3/t3_hw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/cxgb3/t3_hw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/de620.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/de620.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/dm9000.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/dm9000.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e100.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/e100.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e1000/e1000_hw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/e1000/e1000_hw.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e1000/e1000_param.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/e1000/e1000_param.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e1000e/defines.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/e1000e/defines.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e1000e/e1000.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/e1000e/e1000.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e1000e/ethtool.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/e1000e/ethtool.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e1000e/netdev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/e1000e/netdev.c</a></td><td class='right'>427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e1000e/param.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/e1000e/param.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/eepro.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/eepro.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ehea/ehea_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ehea/ehea_main.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/enc28j60.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/enc28j60.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/eth16i.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/eth16i.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/forcedeth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/forcedeth.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/fs_enet/fs_enet-main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/fs_enet/fs_enet-main.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/fs_enet/mac-fcc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/fs_enet/mac-fcc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/fs_enet/mac-scc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/fs_enet/mac-scc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/gianfar.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/gianfar.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/gianfar.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/gianfar.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/gianfar_sysfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/gianfar_sysfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/hamradio/mkiss.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/hamradio/mkiss.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/hp-plus.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/hp-plus.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibm_newemac/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ibm_newemac/core.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibmveth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ibmveth.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ifb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ifb.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/igb/e1000_82575.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/e1000_82575.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/igb/e1000_82575.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/e1000_82575.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/igb/e1000_defines.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/e1000_defines.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/igb/e1000_hw.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/e1000_hw.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/igb/e1000_mac.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/e1000_mac.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/igb/e1000_mac.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/e1000_mac.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/igb/e1000_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/e1000_regs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/igb/igb_ethtool.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/igb_ethtool.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/igb/igb_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/igb_main.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ipg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ipg.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/act200l-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/act200l-sir.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/actisys-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/actisys-sir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/ali-ircc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/ali-ircc.c</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/donauboe.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/donauboe.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/ep7211-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/ep7211-sir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/girbil-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/girbil-sir.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/irda-usb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/irda-usb.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/irtty-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/irtty-sir.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/kingsun-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/kingsun-sir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/litelink-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/litelink-sir.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/ma600-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/ma600-sir.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/mcp2120-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/mcp2120-sir.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/nsc-ircc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/nsc-ircc.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/nsc-ircc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/nsc-ircc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/old_belkin-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/old_belkin-sir.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/pxaficp_ir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/pxaficp_ir.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/sa1100_ir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/sa1100_ir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/sir_dev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/sir_dev.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/sir_dongle.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/sir_dongle.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/smsc-ircc2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/smsc-ircc2.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/tekram-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/tekram-sir.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/toim3232-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/toim3232-sir.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/via-ircc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/via-ircc.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/vlsi_ir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/vlsi_ir.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/vlsi_ir.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/vlsi_ir.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/w83977af_ir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/w83977af_ir.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixgbe/ixgbe_82598.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ixgbe/ixgbe_82598.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixgbe/ixgbe_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ixgbe/ixgbe_main.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixgbe/ixgbe_type.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ixgbe/ixgbe_type.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixp2000/ixp2400-msf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ixp2000/ixp2400-msf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixp2000/ixpdev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ixp2000/ixpdev.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/loopback.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/loopback.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/lp486e.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/lp486e.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/macb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/macb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/meth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/meth.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/mlx4/mr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/mlx4/mr.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/mv643xx_eth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/mv643xx_eth.c</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/myri10ge/myri10ge.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/myri10ge/myri10ge.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/myri10ge/myri10ge_mcp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/myri10ge/myri10ge_mcp.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/myri10ge/myri10ge_mcp_gen_header.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/myri10ge/myri10ge_mcp_gen_header.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ne.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ne.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/netconsole.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netconsole.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/netx-eth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netx-eth.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/netxen/netxen_nic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/netxen/netxen_nic_ctx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_ctx.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/netxen/netxen_nic_ethtool.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_ethtool.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/netxen/netxen_nic_hdr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_hdr.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/netxen/netxen_nic_hw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_hw.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/netxen/netxen_nic_hw.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_hw.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/netxen/netxen_nic_init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_init.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/netxen/netxen_nic_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_main.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/netxen/netxen_nic_niu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_niu.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/netxen/netxen_nic_phan_reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_phan_reg.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ni5010.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ni5010.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ni52.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ni52.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/niu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/niu.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/pcmcia/axnet_cs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/pcmcia/axnet_cs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/pcmcia/pcnet_cs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/pcmcia/pcnet_cs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ppp_mppe.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ppp_mppe.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/pppol2tp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/pppol2tp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ps3_gelic_wireless.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ps3_gelic_wireless.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/qla3xxx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/qla3xxx.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/qla3xxx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/qla3xxx.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/r6040.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/r6040.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/r8169.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/r8169.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/s2io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/s2io.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sh_eth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/sh_eth.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sh_eth.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/sh_eth.h</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/skfp/ess.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/skfp/ess.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/skfp/smt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/skfp/smt.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sky2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/sky2.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sky2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/sky2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/smc911x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/smc911x.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/smc91x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/smc91x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/smc91x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/smc91x.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/stnic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/stnic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sun3_82586.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/sun3_82586.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tehuti.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/tehuti.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tg3.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/tg3.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tg3.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/tg3.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tlan.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/tlan.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tokenring/3c359.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/tokenring/3c359.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tokenring/lanstreamer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/tokenring/lanstreamer.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tokenring/lanstreamer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/tokenring/lanstreamer.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tun.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/tun.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/typhoon.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/typhoon.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/usb/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/dm9601.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/usb/dm9601.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/hso.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/usb/hso.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/mcs7830.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/usb/mcs7830.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/pegasus.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/usb/pegasus.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/via-velocity.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/via-velocity.c</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/via-velocity.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/via-velocity.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/cosa.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/cosa.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/dscc4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/dscc4.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/farsync.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/farsync.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/farsync.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/farsync.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/hdlc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/hdlc.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/hdlc_cisco.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/hdlc_cisco.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/hdlc_fr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/hdlc_fr.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/hdlc_ppp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/hdlc_ppp.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/hdlc_raw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/hdlc_raw.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/hdlc_raw_eth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/hdlc_raw_eth.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/hdlc_x25.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/hdlc_x25.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/hostess_sv11.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/hostess_sv11.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/lmc/lmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/lmc/lmc_debug.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc_debug.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/lmc/lmc_debug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc_debug.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/lmc/lmc_ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc_ioctl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/lmc/lmc_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc_main.c</a></td><td class='right'>672</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/lmc/lmc_media.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc_media.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/lmc/lmc_proto.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc_proto.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/lmc/lmc_proto.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc_proto.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/lmc/lmc_var.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc_var.h</a></td><td class='right'>360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/pc300.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/pc300.h</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/pc300_drv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/pc300_drv.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/sbni.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/sbni.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/sealevel.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/sealevel.c</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/syncppp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/syncppp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/z85230.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/z85230.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/z85230.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/z85230.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath5k/ath5k.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/ath5k.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath5k/base.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/base.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath5k/base.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/base.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath5k/debug.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/debug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath5k/debug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/debug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath5k/hw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/hw.c</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath5k/initvals.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/initvals.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath5k/phy.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/phy.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath5k/reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/reg.h</a></td><td class='right'>934</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/ath9k.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/ath9k.h</a></td><td class='right'>1021</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/beacon.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/beacon.c</a></td><td class='right'>992</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/core.c</a></td><td class='right'>1923</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/core.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/core.h</a></td><td class='right'>1073</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/hw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/hw.c</a></td><td class='right'>8575</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 100.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/hw.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/hw.h</a></td><td class='right'>969</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/initvals.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/initvals.h</a></td><td class='right'>3146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 36.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 63.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/main.c</a></td><td class='right'>1494</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/phy.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/phy.c</a></td><td class='right'>436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/phy.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/phy.h</a></td><td class='right'>543</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/rc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/rc.c</a></td><td class='right'>2126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 75.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/rc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/rc.h</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/recv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/recv.c</a></td><td class='right'>1319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/reg.h</a></td><td class='right'>1385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/regd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/regd.c</a></td><td class='right'>1026</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/regd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/regd.h</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/regd_common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/regd_common.h</a></td><td class='right'>1915</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath9k/xmit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/xmit.c</a></td><td class='right'>2871</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 33.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 66.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/atmel.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/atmel.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/b43/main.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/rfkill.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/b43/rfkill.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/xmit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/b43/xmit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43legacy/main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/b43legacy/main.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43legacy/rfkill.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/b43legacy/rfkill.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43legacy/xmit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/b43legacy/xmit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ipw2100.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ipw2100.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ipw2200.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ipw2200.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/Kconfig</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-3945-led.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-3945-led.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-3945-led.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-3945-led.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-3945.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-3945.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-4965.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-4965.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-5000.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-5000.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn-rs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-agn-rs.c</a> (renamed from drivers/net/wireless/iwlwifi/iwl-4965-rs.c)</td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn-rs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-agn-rs.h</a> (renamed from drivers/net/wireless/iwlwifi/iwl-4965-rs.h)</td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-agn.c</a> (renamed from drivers/net/wireless/iwlwifi/iwl4965-base.c)</td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-commands.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-commands.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-core.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-core.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-core.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-csr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-csr.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-debug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-debug.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-debugfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-debugfs.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-dev.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-dev.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-eeprom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-eeprom.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-fh.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-fh.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-hcmd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-hcmd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-led.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-led.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-led.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-led.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-power.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-power.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-power.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-power.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-prph.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-prph.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-rfkill.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-rfkill.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-rx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-rx.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-scan.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-scan.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-sta.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-sta.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-tx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl-tx.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl3945-base.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/iwlwifi/iwl3945-base.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/libertas/if_cs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/libertas/if_cs.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/libertas/main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/libertas/main.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/libertas/persistcfg.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/libertas/persistcfg.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mac80211_hwsim.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/mac80211_hwsim.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/orinoco.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/orinoco.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/p54/p54.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/p54/p54.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/p54/p54common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/p54/p54common.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/p54/p54common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/p54/p54common.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/p54/p54usb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/p54/p54usb.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/prism54/isl_ioctl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/prism54/isl_ioctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2500pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rt2x00/rt2500pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2500usb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rt2x00/rt2500usb.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rt2x00/rt2x00.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00config.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rt2x00/rt2x00config.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00debug.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rt2x00/rt2x00debug.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00dev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rt2x00/rt2x00dev.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00lib.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rt2x00/rt2x00lib.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00mac.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rt2x00/rt2x00mac.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00queue.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rt2x00/rt2x00queue.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00queue.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rt2x00/rt2x00queue.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rt2x00/rt2x00reg.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00usb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rt2x00/rt2x00usb.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00usb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rt2x00/rt2x00usb.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt61pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rt2x00/rt61pci.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt73usb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rt2x00/rt73usb.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtl8187.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rtl8187.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtl8187_dev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/rtl8187_dev.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wavelan.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/wavelan.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wavelan_cs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/wavelan_cs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_mac.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/zd1211rw/zd_mac.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/xen-netfront.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/xen-netfront.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/of/device.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/of/device.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/oprofile/cpu_buffer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/oprofile/cpu_buffer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/oprofile/event_buffer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/oprofile/event_buffer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/acpi_pcihp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pci/hotplug/acpi_pcihp.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/fakephp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pci/hotplug/fakephp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/pciehp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pci/hotplug/pciehp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/pciehp_core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pci/hotplug/pciehp_core.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/pciehp_hpc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pci/hotplug/pciehp_hpc.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/shpchp_core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pci/hotplug/shpchp_core.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/intel-iommu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pci/intel-iommu.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/msi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pci/msi.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pci/pci.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/pcie/aer/aerdrv_acpi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pci/pcie/aer/aerdrv_acpi.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/probe.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pci/probe.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/quirks.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pci/quirks.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/search.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pci/search.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/setup-bus.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pci/setup-bus.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/at91_cf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/at91_cf.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/omap_cf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/omap_cf.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pxa2xx_base.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/pxa2xx_base.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pxa2xx_cm_x270.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/pxa2xx_cm_x270.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pxa2xx_lubbock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/pxa2xx_lubbock.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pxa2xx_mainstone.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/pxa2xx_mainstone.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pxa2xx_palmtx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/pxa2xx_palmtx.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pxa2xx_sharpsl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/pxa2xx_sharpsl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/rsrc_nonstatic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/rsrc_nonstatic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/sa1100_assabet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/sa1100_assabet.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/sa1100_badge4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/sa1100_badge4.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/sa1100_cerf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/sa1100_cerf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/sa1100_h3600.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/sa1100_h3600.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/sa1100_jornada720.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/sa1100_jornada720.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/sa1100_neponset.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/sa1100_neponset.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/sa1100_shannon.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/sa1100_shannon.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/sa1100_simpad.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/sa1100_simpad.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/sa1111_generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/sa1111_generic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/sa11xx_base.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/sa11xx_base.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/soc_common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pcmcia/soc_common.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pnp/pnpacpi/rsparser.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pnp/pnpacpi/rsparser.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pnp/support.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/pnp/support.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/power/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/power/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/olpc_battery.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/power/olpc_battery.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/palmtx_battery.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/power/palmtx_battery.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/power_supply_sysfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/power/power_supply_sysfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/power/tosa_battery.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/power/tosa_battery.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/regulator/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/regulator/Kconfig</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/regulator/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/regulator/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/regulator/bq24022.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/regulator/bq24022.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/regulator/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/regulator/core.c</a></td><td class='right'>1903</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/regulator/fixed.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/regulator/fixed.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/regulator/virtual.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/regulator/virtual.c</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/rtc/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/interface.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/rtc/interface.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-at91rm9200.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/rtc/rtc-at91rm9200.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-at91sam9.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/rtc/rtc-at91sam9.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-bfin.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/rtc/rtc-bfin.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-cmos.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/rtc/rtc-cmos.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-dev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/rtc/rtc-dev.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-ds1374.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/rtc/rtc-ds1374.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-ep93xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/rtc/rtc-ep93xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-isl1208.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/rtc/rtc-isl1208.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-lib.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/rtc/rtc-lib.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-max6902.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/rtc/rtc-max6902.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-r9701.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/rtc/rtc-r9701.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-s3c.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/rtc/rtc-s3c.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-sa1100.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/rtc/rtc-sa1100.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/block/dasd.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_alias.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/block/dasd_alias.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_devmap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/block/dasd_devmap.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_eckd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/block/dasd_eckd.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_eckd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/block/dasd_eckd.h</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_eer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/block/dasd_eer.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_int.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/block/dasd_int.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dcssblk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/block/dcssblk.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/sclp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/char/sclp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/sclp_cmd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/char/sclp_cmd.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/sclp_config.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/char/sclp_config.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/tape_char.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/char/tape_char.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/tape_std.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/char/tape_std.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/ccwgroup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/cio/ccwgroup.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/chp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/cio/chp.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/cio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/cio/cio.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/css.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/cio/css.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/device.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/cio/device.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/cio/device.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/device_fsm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/cio/device_fsm.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/idset.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/cio/idset.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/qdio_debug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/cio/qdio_debug.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/qdio_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/cio/qdio_main.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/qdio_perf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/cio/qdio_perf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/qdio_setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/cio/qdio_setup.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/qdio_thinint.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/cio/qdio_thinint.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/kvm/kvm_virtio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/kvm/kvm_virtio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/claw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/net/claw.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/ctcm_fsms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/net/ctcm_fsms.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/ctcm_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/net/ctcm_main.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/ctcm_main.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/net/ctcm_main.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/ctcm_mpc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/net/ctcm_mpc.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/lcs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/net/lcs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/qeth_core.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/net/qeth_core.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/qeth_core_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/net/qeth_core_main.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/qeth_l2_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/net/qeth_l2_main.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/qeth_l3_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/net/qeth_l3_main.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/qeth_l3_sys.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/net/qeth_l3_sys.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_ccw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/scsi/zfcp_ccw.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_fc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/scsi/zfcp_fc.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_fsf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/scsi/zfcp_fsf.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_qdio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/s390/scsi/zfcp_qdio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sbus/sbus.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/sbus/sbus.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/arm/acornscsi-io.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/arm/acornscsi-io.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/device_handler/scsi_dh_alua.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/device_handler/scsi_dh_alua.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/device_handler/scsi_dh_emc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/device_handler/scsi_dh_emc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/device_handler/scsi_dh_hp_sw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/device_handler/scsi_dh_hp_sw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/device_handler/scsi_dh_rdac.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/device_handler/scsi_dh_rdac.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/dpt/dpti_i2o.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/dpt/dpti_i2o.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/hptiop.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/hptiop.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ibmvscsi/ibmvfc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/ibmvscsi/ibmvfc.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ibmvscsi/ibmvfc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/ibmvscsi/ibmvfc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ibmvscsi/ibmvscsi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/ibmvscsi/ibmvscsi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ide-scsi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/ide-scsi.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ips.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/ips.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ips.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/ips.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_debugfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/lpfc/lpfc_debugfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/megaraid/megaraid_sas.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/megaraid/megaraid_sas.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/megaraid/megaraid_sas.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/megaraid/megaraid_sas.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/nsp32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/nsp32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/nsp32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/nsp32.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/pcmcia/nsp_cs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/pcmcia/nsp_cs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_attr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/qla2xxx/qla_attr.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_def.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/qla2xxx/qla_def.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/qla2xxx/qla_init.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_isr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/qla2xxx/qla_isr.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_mbx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/qla2xxx/qla_mbx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_mid.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/qla2xxx/qla_mid.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_os.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/qla2xxx/qla_os.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_version.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/qla2xxx/qla_version.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_error.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/scsi_error.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_scan.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/scsi_scan.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_transport_spi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/scsi_transport_spi.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ses.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/ses.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sg.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/scsi/sg.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/21285.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/21285.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/8250.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/8250.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/8250.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/8250.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/atmel_serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/atmel_serial.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/bfin_5xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/bfin_5xx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/clps711x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/clps711x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/cpm_uart/cpm_uart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/cpm_uart/cpm_uart.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/cpm_uart/cpm_uart_core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/cpm_uart/cpm_uart_core.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/crisv10.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/crisv10.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/crisv10.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/crisv10.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/imx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/imx.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/netx-serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/netx-serial.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/pxa.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/pxa.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/s3c2400.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/s3c2400.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/s3c2410.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/s3c2410.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/s3c2412.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/s3c2412.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/s3c2440.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/s3c2440.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/sa1100.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/sa1100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/samsung.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/samsung.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/serial_ks8695.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/serial_ks8695.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/sh-sci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/sh-sci.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/sunhv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/sunhv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/sunsab.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/sunsab.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/sunsu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/sunsu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/sunzilog.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/sunzilog.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/serial/v850e_uart.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/serial/v850e_uart.c</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.4%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sh/maple/maple.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/sh/maple/maple.c</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/spi/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/spi/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/atmel_spi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/spi/atmel_spi.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/omap2_mcspi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/spi/omap2_mcspi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/omap_uwire.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/spi/omap_uwire.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/spi/orion_spi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/spi/orion_spi.c</a></td><td class='right'>574</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/pxa2xx_spi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/spi/pxa2xx_spi.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/spi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/spi/spi.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/spi_imx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/spi/spi_imx.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/spi_mpc83xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/spi/spi_mpc83xx.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/spi_s3c24xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/spi/spi_s3c24xx.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/spi_s3c24xx_gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/spi/spi_s3c24xx_gpio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ssb/main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ssb/main.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/uio/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/uio/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/uio/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/uio/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/uio/uio_pdrv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/uio/uio_pdrv.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/uio/uio_pdrv_genirq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/uio/uio_pdrv_genirq.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/atm/cxacru.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/atm/cxacru.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/atm/ueagle-atm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/atm/ueagle-atm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/class/cdc-acm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/class/cdc-acm.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/class/cdc-acm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/class/cdc-acm.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/driver.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/core/driver.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/hcd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/core/hcd.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/hcd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/core/hcd.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/hub.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/core/hub.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/message.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/core/message.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/urb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/core/urb.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/usb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/core/usb.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/usb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/core/usb.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/amd5536udc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/amd5536udc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/at91_udc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/at91_udc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/atmel_usba_udc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/atmel_usba_udc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/dummy_hcd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/dummy_hcd.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/f_acm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/f_acm.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/f_ecm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/f_ecm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/f_rndis.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/f_rndis.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/f_serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/f_serial.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/f_subset.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/f_subset.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/gadget_chips.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/gadget_chips.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/lh7a40x_udc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/lh7a40x_udc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/m66592-udc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/m66592-udc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/omap_udc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/omap_udc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/pxa25x_udc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/pxa25x_udc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/pxa25x_udc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/pxa25x_udc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/pxa27x_udc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/pxa27x_udc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/s3c2410_udc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/s3c2410_udc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/u_serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/u_serial.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/u_serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/gadget/u_serial.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-orion.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ehci-orion.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-q.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ehci-q.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/isp1760-hcd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/isp1760-hcd.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/isp1760-hcd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/isp1760-hcd.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-at91.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-at91.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-au1xxx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-au1xxx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-ep93xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-ep93xx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-hcd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-hcd.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-hub.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-hub.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-lh7a404.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-lh7a404.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-omap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-omap.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-pci.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-pnx4008.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-pnx4008.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-pnx8550.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-pnx8550.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-ppc-of.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-ppc-of.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-ppc-soc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-ppc-soc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-ps3.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-ps3.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-pxa27x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-pxa27x.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-q.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-q.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-s3c2410.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-s3c2410.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-sa1111.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-sa1111.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-sh.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-sh.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-sm501.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-sm501.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-ssb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci-ssb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/ohci.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/r8a66597-hcd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/r8a66597-hcd.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/u132-hcd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/host/u132-hcd.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/misc/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/misc/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/usb/misc/auerswald.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/misc/auerswald.c</a></td><td class='right'>2152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 25.1%;'/><td class='none' style='width: 74.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/iowarrior.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/misc/iowarrior.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/isight_firmware.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/misc/isight_firmware.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/sisusbvga/sisusb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/misc/sisusbvga/sisusb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/Kconfig</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/Makefile</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/cppi_dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/cppi_dma.c</a></td><td class='right'>1540</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/cppi_dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/cppi_dma.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/davinci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/davinci.c</a></td><td class='right'>462</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/davinci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/davinci.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/musb_core.c</a></td><td class='right'>2253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 26.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 73.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_core.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/musb_core.h</a></td><td class='right'>488</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_debug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/musb_debug.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/musb_dma.h</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_gadget.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/musb_gadget.c</a></td><td class='right'>2031</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 76.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_gadget.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/musb_gadget.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_gadget_ep0.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/musb_gadget_ep0.c</a></td><td class='right'>983</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_host.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/musb_host.c</a></td><td class='right'>2170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_host.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/musb_host.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/musb_io.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/musb_regs.h</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_virthub.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/musb_virthub.c</a></td><td class='right'>425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/musbhsdma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/musbhsdma.c</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/omap2430.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/omap2430.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/omap2430.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/omap2430.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/tusb6010.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/tusb6010.c</a></td><td class='right'>1151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/tusb6010.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/tusb6010.h</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/musb/tusb6010_omap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/musb/tusb6010_omap.c</a></td><td class='right'>719</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/serial/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/console.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/serial/console.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ftdi_sio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/serial/ftdi_sio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ftdi_sio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/serial/ftdi_sio.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/garmin_gps.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/serial/garmin_gps.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/option.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/serial/option.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/pl2303.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/serial/pl2303.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/pl2303.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/serial/pl2303.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/sierra.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/serial/sierra.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/usb-serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/serial/usb-serial.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/storage/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/storage/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/freecom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/storage/freecom.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/storage/sierra_ms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/storage/sierra_ms.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/storage/sierra_ms.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/storage/sierra_ms.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/transport.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/storage/transport.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/unusual_devs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/storage/unusual_devs.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/usb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/usb/storage/usb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/acornfb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/acornfb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/am200epd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/am200epd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/arkfb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/arkfb.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/atmel_lcdfb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/atmel_lcdfb.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/aty/atyfb_base.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/aty/atyfb_base.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/aty/radeon_accel.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/aty/radeon_accel.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/aty/radeon_i2c.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/aty/radeon_i2c.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/hp680_bl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/backlight/hp680_bl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/omap1_bl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/backlight/omap1_bl.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/platform_lcd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/backlight/platform_lcd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/pwm_bl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/backlight/pwm_bl.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/bf54x-lq043fb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/bf54x-lq043fb.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/cirrusfb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/cirrusfb.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/clps711xfb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/clps711xfb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/console/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/console/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/fbcon.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/console/fbcon.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/fbcon.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/console/fbcon.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/sticore.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/console/sticore.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/cyber2000fb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/cyber2000fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/epson1355fb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/epson1355fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/fb_defio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/fb_defio.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/fbmem.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/fbmem.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/fsl-diu-fb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/fsl-diu-fb.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/gbefb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/gbefb.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/hitfb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/hitfb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/imxfb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/imxfb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/matrox/i2c-matroxfb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/matrox/i2c-matroxfb.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/matrox/matroxfb_base.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/matrox/matroxfb_base.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/matrox/matroxfb_maven.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/matrox/matroxfb_maven.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/blizzard.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/omap/blizzard.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/dispc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/omap/dispc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/hwa742.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/omap/hwa742.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_h3.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/omap/lcd_h3.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_h4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/omap/lcd_h4.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_inn1510.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/omap/lcd_inn1510.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_inn1610.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/omap/lcd_inn1610.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_osk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/omap/lcd_osk.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_palmte.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/omap/lcd_palmte.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_palmtt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/omap/lcd_palmtt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_palmz71.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/omap/lcd_palmz71.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_sx1.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/omap/lcd_sx1.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcdc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/omap/lcdc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/omapfb_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/omap/omapfb_main.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/rfbi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/omap/rfbi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/sossi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/omap/sossi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/pm2fb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/pm2fb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/pnx4008/dum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/pnx4008/dum.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/pnx4008/sdum.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/pnx4008/sdum.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/pvr2fb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/pvr2fb.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/pxafb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/pxafb.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/s3c2410fb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/s3c2410fb.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/s3fb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/s3fb.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sa1100fb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/sa1100fb.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sh_mobile_lcdcfb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/sh_mobile_lcdcfb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/tdfxfb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/tdfxfb.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/vermilion/vermilion.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/vermilion/vermilion.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/vt8623fb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/vt8623fb.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/xilinxfb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/video/xilinxfb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/virtio/virtio_balloon.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/virtio/virtio_balloon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/Kconfig</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/acquirewdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/acquirewdt.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/advantechwdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/advantechwdt.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/alim1535_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/alim1535_wdt.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/alim7101_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/alim7101_wdt.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/ar7_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/ar7_wdt.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/at32ap700x_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/at32ap700x_wdt.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/at91rm9200_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/at91rm9200_wdt.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/bfin_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/bfin_wdt.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/booke_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/booke_wdt.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/cpu5wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/cpu5wdt.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/davinci_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/davinci_wdt.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/ep93xx_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/ep93xx_wdt.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/eurotechwdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/eurotechwdt.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/geodewdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/geodewdt.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/hpwdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/hpwdt.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/i6300esb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/i6300esb.c</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/watchdog/iTCO_vendor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/iTCO_vendor.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/iTCO_vendor_support.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/iTCO_vendor_support.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/iTCO_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/iTCO_wdt.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/ib700wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/ib700wdt.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/ibmasr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/ibmasr.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/indydog.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/indydog.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/iop_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/iop_wdt.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/it8712f_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/it8712f_wdt.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/ixp2000_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/ixp2000_wdt.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/ixp4xx_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/ixp4xx_wdt.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/ks8695_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/ks8695_wdt.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/machzwd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/machzwd.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/mixcomwd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/mixcomwd.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/mpc5200_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/mpc5200_wdt.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/watchdog/mpc83xx_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/mpc83xx_wdt.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/watchdog/mpc8xx_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/mpc8xx_wdt.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/watchdog/mpc8xxx_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/mpc8xxx_wdt.c</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/mpcore_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/mpcore_wdt.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/mtx-1_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/mtx-1_wdt.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/mv64x60_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/mv64x60_wdt.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/omap_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/omap_wdt.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/pc87413_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/pc87413_wdt.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/pcwd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/pcwd.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/pcwd_pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/pcwd_pci.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/pcwd_usb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/pcwd_usb.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/pnx4008_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/pnx4008_wdt.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/watchdog/rc32434_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/rc32434_wdt.c</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/watchdog/rdc321x_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/rdc321x_wdt.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/rm9k_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/rm9k_wdt.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/s3c2410_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/s3c2410_wdt.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/sa1100_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/sa1100_wdt.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/sb_wdog.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/sb_wdog.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/sbc60xxwdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/sbc60xxwdt.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/sbc7240_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/sbc7240_wdt.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/sbc8360.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/sbc8360.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/sbc_epx_c3.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/sbc_epx_c3.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/sc1200wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/sc1200wdt.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/sc520_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/sc520_wdt.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/scx200_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/scx200_wdt.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/shwdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/shwdt.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/smsc37b787_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/smsc37b787_wdt.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/softdog.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/softdog.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/txx9wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/txx9wdt.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/w83627hf_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/w83627hf_wdt.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/w83697hf_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/w83697hf_wdt.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/w83877f_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/w83877f_wdt.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/w83977f_wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/w83977f_wdt.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/wafer5823wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/wafer5823wdt.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/wd501p.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/wd501p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/wdrtas.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/wdrtas.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/wdt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/wdt.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/wdt285.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/wdt285.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/wdt977.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/wdt977.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/wdt_pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/watchdog/wdt_pci.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/balloon.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/xen/balloon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/manage.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/xen/manage.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/firmware/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>firmware/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/firmware/ihex2fw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>firmware/ihex2fw.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/vfs_dir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/9p/vfs_dir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/adfs/dir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/adfs/dir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/affs/dir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/affs/dir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/afs/mntpt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/afs/mntpt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/afs/write.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/afs/write.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/autofs4/root.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/autofs4/root.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/befs/linuxvfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/befs/linuxvfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/bfs/dir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/bfs/dir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/binfmt_flat.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/binfmt_flat.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/binfmt_misc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/binfmt_misc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/bio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/bio.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/block_dev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/block_dev.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/buffer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/buffer.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/CHANGES?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/CHANGES</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/README?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/README</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/asn1.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/asn1.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifs_debug.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/cifs_debug.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifs_dfs_ref.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/cifs_dfs_ref.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifs_spnego.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/cifs_spnego.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifs_spnego.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/cifs_spnego.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifsencrypt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/cifsencrypt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifsfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/cifsfs.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifsfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/cifsfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifsglob.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/cifsglob.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifspdu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/cifspdu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifsproto.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/cifsproto.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifssmb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/cifssmb.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/connect.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/connect.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/dir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/dir.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/dns_resolve.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/dns_resolve.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/file.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/file.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/inode.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/inode.c</a></td><td class='right'>423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/sess.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/sess.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/transport.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cifs/transport.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/compat.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/compat.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/configfs/configfs_internal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/configfs/configfs_internal.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/configfs/dir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/configfs/dir.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/configfs/symlink.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/configfs/symlink.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cramfs/inode.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/cramfs/inode.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dcache.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/dcache.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/devpts/inode.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/devpts/inode.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dlm/config.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/dlm/config.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dlm/user.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/dlm/user.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dquot.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/dquot.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/efs/namei.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/efs/namei.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/eventpoll.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/eventpoll.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/super.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ext3/super.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/acl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ext4/acl.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/balloc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ext4/balloc.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/dir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ext4/dir.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/ext4.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ext4/ext4.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/ext4_extents.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ext4/ext4_extents.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/ext4_jbd2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ext4/ext4_jbd2.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/extents.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ext4/extents.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/ialloc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ext4/ialloc.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/inode.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ext4/inode.c</a></td><td class='right'>634</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/mballoc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ext4/mballoc.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/mballoc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ext4/mballoc.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/migrate.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ext4/migrate.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/resize.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ext4/resize.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/super.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ext4/super.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/xattr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ext4/xattr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fat/file.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/fat/file.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fat/inode.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/fat/inode.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fcntl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/fcntl.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/file.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/file.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/inode.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/inode.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ioprio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ioprio.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd/commit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/jbd/commit.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd/transaction.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/jbd/transaction.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd2/commit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/jbd2/commit.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd2/journal.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/jbd2/journal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd2/transaction.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/jbd2/transaction.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/jffs2_fs_i.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/jffs2/jffs2_fs_i.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/summary.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/jffs2/summary.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/summary.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/jffs2/summary.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/libfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/libfs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/lockd/svc4proc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/lockd/svc4proc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/lockd/svcproc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/lockd/svcproc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/namei.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/namei.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/namespace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/namespace.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/namespace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/nfs/namespace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/nfsroot.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/nfs/nfsroot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/super.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/nfs/super.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/export.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/nfsd/export.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfs4acl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/nfsd/nfs4acl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfs4proc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/nfsd/nfs4proc.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ntfs/aops.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ntfs/aops.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ntfs/compress.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ntfs/compress.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ntfs/mft.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ntfs/mft.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ntfs/namei.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ntfs/namei.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ntfs/usnjrnl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ntfs/usnjrnl.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/aops.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ocfs2/aops.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/cluster/netdebug.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ocfs2/cluster/netdebug.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/cluster/tcp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ocfs2/cluster/tcp.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/cluster/tcp_internal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ocfs2/cluster/tcp_internal.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/dir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ocfs2/dir.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/file.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ocfs2/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/journal.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ocfs2/journal.c</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/journal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ocfs2/journal.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/ocfs2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ocfs2/ocfs2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/ocfs2_fs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ocfs2/ocfs2_fs.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/stackglue.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ocfs2/stackglue.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/super.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ocfs2/super.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/omfs/bitmap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/omfs/bitmap.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/omfs/dir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/omfs/dir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/omfs/file.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/omfs/file.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/omfs/inode.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/omfs/inode.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/open.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/open.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/partitions/check.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/partitions/check.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/array.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/proc/array.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/base.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/proc/base.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/proc/generic.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/nommu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/proc/nommu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/proc_misc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/proc/proc_misc.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/task_mmu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/proc/task_mmu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/readdir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/readdir.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/inode.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/reiserfs/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/journal.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/reiserfs/journal.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/super.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/reiserfs/super.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/romfs/inode.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/romfs/inode.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/seq_file.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/seq_file.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/splice.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/splice.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/budget.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/budget.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/commit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/commit.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/debug.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/debug.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/debug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/debug.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/dir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/dir.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/file.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/file.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/find.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/find.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/gc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/gc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/io.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/journal.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/journal.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/log.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/log.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/misc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/misc.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/orphan.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/orphan.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/super.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/super.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/tnc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/tnc.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/tnc_commit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/tnc_commit.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/ubifs-media.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/ubifs-media.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/ubifs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/ubifs.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/xattr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ubifs/xattr.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/udf/file.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/udf/file.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/udf/ialloc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/udf/ialloc.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ufs/super.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/ufs/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/kmem.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/kmem.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/kmem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/kmem.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/sema.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/sema.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_aops.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_aops.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_buf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_buf.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_buf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_buf.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_export.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_export.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_file.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_file.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_fs_subr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_fs_subr.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_ioctl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_ioctl.c</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_iops.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_iops.c</a></td><td class='right'>531</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_iops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_iops.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_linux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_linux.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_lrw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_lrw.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_stats.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_stats.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_stats.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_stats.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_super.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_super.c</a></td><td class='right'>1107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 87.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_super.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_super.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_sysctl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_sysctl.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_sysctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_sysctl.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_vnode.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_vnode.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_vnode.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_vnode.h</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_xattr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/linux-2.6/xfs_xattr.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/quota/xfs_dquot.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/quota/xfs_dquot.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/quota/xfs_dquot.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/quota/xfs_dquot.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/quota/xfs_dquot_item.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/quota/xfs_dquot_item.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/quota/xfs_qm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/quota/xfs_qm.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/quota/xfs_qm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/quota/xfs_qm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/quota/xfs_qm_bhv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/quota/xfs_qm_bhv.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/quota/xfs_qm_syscalls.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/quota/xfs_qm_syscalls.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/quota/xfs_quota_priv.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/quota/xfs_quota_priv.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/support/ktrace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/support/ktrace.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/support/uuid.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/support/uuid.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/support/uuid.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/support/uuid.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_acl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_acl.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_acl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_acl.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_arch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_arch.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_attr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_attr.c</a></td><td class='right'>718</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 6.5%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_attr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_attr.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_attr_leaf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_attr_leaf.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_attr_leaf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_attr_leaf.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_attr_sf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_attr_sf.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_bit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_bit.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_bit.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_bit.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_bmap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_bmap.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_bmap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_bmap.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_bmap_btree.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_bmap_btree.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_btree.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_btree.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_btree.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_btree.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_buf_item.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_buf_item.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_clnt.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_clnt.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_da_btree.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_da_btree.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_da_btree.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_da_btree.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dfrag.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_dfrag.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_dir2.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_dir2.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2_block.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_dir2_block.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2_data.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_dir2_data.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2_leaf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_dir2_leaf.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2_node.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_dir2_node.c</a></td><td class='right'>402</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2_sf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_dir2_sf.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2_sf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_dir2_sf.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2_trace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_dir2_trace.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dmapi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_dmapi.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_error.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_error.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_error.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_error.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_extfree_item.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_extfree_item.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_filestream.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_filestream.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_fs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_fs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_fsops.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_fsops.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_ialloc_btree.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_ialloc_btree.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_iget.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_iget.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_inode.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_inode.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_inode.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_inode.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_inode_item.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_inode_item.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_iomap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_iomap.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_itable.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_itable.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_log.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_log.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_log.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_log.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_log_priv.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_log_priv.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_log_recover.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_log_recover.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_mount.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_mount.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_mount.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_mount.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_mru_cache.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_mru_cache.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_rename.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_rename.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_rtalloc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_rtalloc.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_rw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_rw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_sb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_sb.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_trans.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_trans.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_trans.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_trans.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_trans_buf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_trans_buf.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_trans_inode.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_trans_inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_trans_item.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_trans_item.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_utils.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_utils.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_utils.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_utils.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_vfsops.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_vfsops.c</a></td><td class='right'>623</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 7.2%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_vfsops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_vfsops.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_vnodeops.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_vnodeops.c</a></td><td class='right'>934</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 7.7%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_vnodeops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>fs/xfs/xfs_vnodeops.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acnamesp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/acpi/acnamesp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ep93xx/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/arch-ep93xx/dma.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ep93xx/gesbc9312.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/arch-ep93xx/gesbc9312.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ep93xx/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/arch-ep93xx/timex.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ep93xx/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/arch-ep93xx/vmalloc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-arm/arch-iop32x/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/arch-iop32x/vmalloc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-arm/arch-iop33x/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/arch-iop33x/vmalloc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ixp23xx/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/arch-ixp23xx/dma.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ixp23xx/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/arch-ixp23xx/time.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-arm/arch-kirkwood/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/arch-kirkwood/vmalloc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-arm/arch-loki/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/arch-loki/vmalloc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-arm/arch-mv78xx0/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/arch-mv78xx0/vmalloc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-arm/arch-orion5x/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/arch-orion5x/vmalloc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-arm/arch-sa1100/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/arch-sa1100/vmalloc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-arm/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/hardware.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-arm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/hw_irq.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/plat-s3c/iic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/plat-s3c/iic.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/plat-s3c/nand.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/plat-s3c/nand.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/plat-s3c/regs-ac97.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/plat-s3c/regs-ac97.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/plat-s3c/regs-adc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/plat-s3c/regs-adc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/plat-s3c/regs-iic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/plat-s3c/regs-iic.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/plat-s3c/regs-nand.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/plat-s3c/regs-nand.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/plat-s3c/regs-rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/plat-s3c/regs-rtc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/plat-s3c/regs-serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/plat-s3c/regs-serial.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/plat-s3c/regs-timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/plat-s3c/regs-timer.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/plat-s3c/regs-watchdog.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/plat-s3c/regs-watchdog.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/plat-s3c24xx/regs-iis.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/plat-s3c24xx/regs-iis.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/plat-s3c24xx/regs-spi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/plat-s3c24xx/regs-spi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/plat-s3c24xx/regs-udc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/plat-s3c24xx/regs-udc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/plat-s3c24xx/s3c2410.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/plat-s3c24xx/s3c2410.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/plat-s3c24xx/udc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-arm/plat-s3c24xx/udc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-blackfin/fixed_code.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-blackfin/fixed_code.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-cris/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-frv/io.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-frv/unistd.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/Kbuild.asm?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-generic/Kbuild.asm</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-generic/bug.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-generic/ioctl.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-generic/rtc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-generic/sections.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/syscall.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-generic/syscall.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/vmlinux.lds.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-generic/vmlinux.lds.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/contregs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-m68k/contregs.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/fbio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-m68k/fbio.h</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/idprom.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-m68k/idprom.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-m68k/unistd.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/cacheflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-mips/gdb-stub.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/gdb-stub.h</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/kdebug.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/kexec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/kexec.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-mips/kgdb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/kgdb.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/pci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/txx9/generic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/txx9/generic.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/txx9/jmr3927.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/txx9/jmr3927.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/txx9/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/txx9/pci.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/txx9/smsc_fdc37m81x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/txx9/smsc_fdc37m81x.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/txx9/tx3927.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/txx9/tx3927.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/txx9/tx4927.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/txx9/tx4927.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/txx9/tx4927pcic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/txx9/tx4927pcic.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/txx9/tx4938.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/txx9/tx4938.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-mips/txx9/txx927.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/txx9/txx927.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/txx9irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/txx9irq.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mips/unistd.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mn10300/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mn10300/io.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mn10300/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-mn10300/unistd.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-parisc/sections.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-powerpc/ide.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-powerpc/ide.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-sh/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-sh/a.out.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-sh/cpu-sh2a/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-sh/cpu-sh2a/cacheflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-sh/cpu-sh2a/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-sh/cpu-sh2a/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-sh/cpu-sh2a/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-sh/cpu-sh2a/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-sh/cpu-sh2a/timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-sh/cpu-sh2a/timer.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-sh/cpu-sh2a/ubc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-sh/cpu-sh2a/ubc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-sh/cpu-sh2a/watchdog.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-sh/cpu-sh2a/watchdog.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-sh/cpu-sh3/addrspace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-sh/cpu-sh3/addrspace.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-sh/cpu-sh3/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-sh/cpu-sh3/rtc.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-sh/cpu-sh3/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-sh/cpu-sh3/sigcontext.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-sh/cpu-sh5/timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-sh/cpu-sh5/timer.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/amd_iommu_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/amd_iommu_types.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/atomic_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/atomic_64.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/cpufeature.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/cpufeature.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/efi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/efi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/genapic_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/genapic_32.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/genapic_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/genapic_64.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/geode.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/geode.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/hw_irq.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/i387.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/i387.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/io.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/iommu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/iommu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/irq_vectors.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/irq_vectors.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/kexec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/kexec.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/kvm_host.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/kvm_host.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/mce.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/mce.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/mman.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/mmconfig.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/mmconfig.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/mmzone_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/mmzone_32.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/msr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/msr.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/percpu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/pgtable_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/pgtable_64.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/processor.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/required-features.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/required-features.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/spinlock.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/uv/uv_bau.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/uv/uv_bau.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86/xen/hypervisor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/asm-x86/xen/hypervisor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/crypto/hash.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/crypto/hash.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/Kbuild</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/agp_backend.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/agp_backend.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ata.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/ata.h</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/bitmap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/bitmap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/blkdev.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/blkdev.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/bootmem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/bootmem.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/buffer_head.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/buffer_head.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/byteorder.h</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/capability.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/capability.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/clockchips.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/clockchips.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/completion.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/completion.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/configfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/configfs.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/connector.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/connector.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cpufreq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/cpufreq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cpumask.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/cpumask.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cpuset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/cpuset.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/cred.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/cred.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/dcache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/dcache.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/device.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/dm9000.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/dm9000.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ethtool.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/ethtool.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/exportfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/exportfs.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/fb.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/file.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/file.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/firmware-map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/firmware-map.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/fs_uart_pd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/fs_uart_pd.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ftrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/ftrace.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/genhd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/genhd.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/linux/harrier_defs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/harrier_defs.h</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/i2c-id.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/i2c-id.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/i2c-pnx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/i2c-pnx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/i2c.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/i2c.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ide.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/ide.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ieee80211.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/ieee80211.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/if_tun.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/if_tun.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ihex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/ihex.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/init.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/interrupt.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/interrupt.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/iommu-helper.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/iommu-helper.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ioport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/ioport.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/ip_vs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/ip_vs.h</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ivtv.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/ivtv.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ivtvfb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/ivtvfb.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kallsyms.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/kallsyms.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kernel.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/kernel.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kexec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/kexec.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kvm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/kvm.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kvm_host.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/kvm_host.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/libata.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/libata.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/list.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/list.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/lockdep.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/lockdep.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mISDNif.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/mISDNif.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/maple.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/maple.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/memstick.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/memstick.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/mfd/t7l66xb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/mfd/t7l66xb.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/mfd/tc6387xb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/mfd/tc6387xb.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mfd/tc6393xb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/mfd/tc6393xb.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mfd/tmio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/mfd/tmio.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mlx4/cq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/mlx4/cq.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mlx4/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/mlx4/device.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/mm.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mm_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/mm_types.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mmzone.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/mmzone.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mount.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/mount.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mroute.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/mroute.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mroute6.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/mroute6.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/mtd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/mtd/mtd.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/nand.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/mtd/nand.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/net.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/net.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netdevice.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/netdevice.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter/nf_conntrack_tcp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/netfilter/nf_conntrack_tcp.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/page-flags.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/page-flags.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pagemap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/pagemap.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/parser.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/parser.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pci-acpi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/pci-acpi.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/pci.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pci_ids.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/pci_ids.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pid.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/pid.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/pim.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pm_qos_params.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/pm_qos_params.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pnp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/pnp.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/power_supply.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/power_supply.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/ptrace.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/quicklist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/quicklist.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/quotaops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/quotaops.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/raid/md_k.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/raid/md_k.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/rcuclassic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/rcuclassic.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/reboot.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/reboot.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/regulator/bq24022.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/regulator/bq24022.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/regulator/consumer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/regulator/consumer.h</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/regulator/driver.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/regulator/driver.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/regulator/fixed.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/regulator/fixed.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/regulator/machine.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/regulator/machine.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/res_counter.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/res_counter.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/rfkill.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/rfkill.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/rmap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/rmap.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sched.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/sched.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/security.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/security.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/seq_file.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/seq_file.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/skbuff.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/skbuff.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/slub_def.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/slub_def.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/snmp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/snmp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/spi/orion_spi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/spi/orion_spi.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/spinlock.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/spinlock_api_smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/spinlock_api_smp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/stop_machine.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/stop_machine.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sunrpc/svc_rdma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/sunrpc/svc_rdma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/suspend.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/suspend.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/swab.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/swab.h</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/tick.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/tick.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/tracehook.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/tracehook.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/tty.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/tty.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/tty_driver.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/tty_driver.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/usb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/usb.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/usb/musb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/usb/musb.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/usb/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/usb/serial.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/videodev2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/videodev2.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/vmalloc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/vt_kern.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/linux/vt_kern.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/media/audiochip.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/media/audiochip.h</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/soc_camera.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/media/soc_camera.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/addrconf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/net/addrconf.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/bluetooth/hci_core.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/net/bluetooth/hci_core.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/dst.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/net/dst.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/flow.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/net/flow.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/inet_timewait_sock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/net/inet_timewait_sock.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ip6_route.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/net/ip6_route.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ip_vs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/net/ip_vs.h</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/mac80211.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/net/mac80211.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/netlink.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/net/netlink.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/pkt_sched.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/net/pkt_sched.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/request_sock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/net/request_sock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/sch_generic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/net/sch_generic.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/sctp/structs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/net/sctp/structs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/syncppp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/net/syncppp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/rdma/rdma_cm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/rdma/rdma_cm.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/scsi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/scsi/scsi.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/scsi_device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/scsi/scsi_device.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/soc-dapm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/sound/soc-dapm.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/video/atmel_lcdc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/video/atmel_lcdc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/video/radeon.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>include/video/radeon.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>init/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/calibrate.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>init/calibrate.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>init/main.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/Kconfig.hz?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/Kconfig.hz</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/audit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/audit.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/auditfilter.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/auditfilter.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/auditsc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/auditsc.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/capability.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/capability.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/cgroup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/cgroup.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/cpu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/cpu.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/cpuset.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/cpuset.c</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/dma-coherent.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/dma-coherent.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/exit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/exit.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/irq/manage.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/irq/manage.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/irq/proc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/irq/proc.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/kexec.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/kexec.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/kgdb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/kgdb.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/lockdep.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/lockdep.c</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/lockdep_internals.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/lockdep_internals.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/lockdep_proc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/lockdep_proc.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/marker.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/marker.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/module.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/module.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/mutex.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/mutex.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/nsproxy.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/nsproxy.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/pid_namespace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/pid_namespace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/pm_qos_params.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/pm_qos_params.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/posix-timers.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/posix-timers.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/disk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/power/disk.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/power/main.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/swap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/power/swap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/printk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/printk.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/ptrace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/ptrace.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/rcupdate.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/rcupdate.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/relay.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/relay.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/resource.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/resource.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/sched.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/sched.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/sched_clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/sched_clock.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/sched_fair.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/sched_fair.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/sched_features.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/sched_features.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/sched_rt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/sched_rt.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/semaphore.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/semaphore.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/signal.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/signal.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/smp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/smp.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/softlockup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/softlockup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/spinlock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/spinlock.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/stop_machine.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/stop_machine.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/sys.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/sys.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/sysctl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/sysctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/time/clockevents.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/time/clockevents.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/time/ntp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/time/ntp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/time/tick-broadcast.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/time/tick-broadcast.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/time/tick-common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/time/tick-common.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/time/tick-internal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/time/tick-internal.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/time/tick-oneshot.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/time/tick-oneshot.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/time/tick-sched.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/time/tick-sched.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/user_namespace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/user_namespace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/utsname.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/utsname.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/utsname_sysctl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/utsname_sysctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/workqueue.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>kernel/workqueue.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/Kconfig.debug?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>lib/Kconfig.debug</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/Kconfig.kgdb?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>lib/Kconfig.kgdb</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/bitmap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>lib/bitmap.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/debug_locks.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>lib/debug_locks.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/debugobjects.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>lib/debugobjects.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/iommu-helper.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>lib/iommu-helper.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/kobject.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>lib/kobject.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/lmb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>lib/lmb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/random32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>lib/random32.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/scatterlist.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>lib/scatterlist.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/swiotlb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>lib/swiotlb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/vsprintf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>lib/vsprintf.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/bootmem.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/bootmem.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/filemap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/filemap.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/filemap_xip.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/filemap_xip.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/hugetlb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/hugetlb.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/madvise.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/madvise.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/memcontrol.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/memcontrol.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/memory.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/memory.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/mempolicy.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/mempolicy.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/migrate.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/migrate.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/mlock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/mlock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/mm_init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/mm_init.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/mmap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/mmap.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/mmzone.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/mmzone.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/nommu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/nommu.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/oom_kill.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/oom_kill.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/page_alloc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/page_alloc.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/page_isolation.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/page_isolation.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/quicklist.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/quicklist.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/rmap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/rmap.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/shmem.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/shmem.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/slab.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/slab.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/slob.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/slob.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/slub.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/slub.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/sparse.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/sparse.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/swap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/swap.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/swap_state.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/swap_state.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/swapfile.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/swapfile.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/truncate.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/truncate.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/util.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/util.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/vmscan.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/vmscan.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/vmstat.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>mm/vmstat.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/mpc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/atm/mpc.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ax25/sysctl_net_ax25.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ax25/sysctl_net_ax25.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/af_bluetooth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/bluetooth/af_bluetooth.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/bnep/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/bluetooth/bnep/core.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hci_conn.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/bluetooth/hci_conn.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hci_core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/bluetooth/hci_core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hci_event.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/bluetooth/hci_event.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hci_sysfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/bluetooth/hci_sysfs.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/l2cap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/bluetooth/l2cap.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/rfcomm/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/bluetooth/rfcomm/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/sco.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/bluetooth/sco.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_device.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/bridge/br_device.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_if.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/bridge/br_if.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_ioctl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/bridge/br_ioctl.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_netfilter.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/bridge/br_netfilter.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_private.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/bridge/br_private.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_stp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/bridge/br_stp.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_sysfs_br.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/bridge/br_sysfs_br.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/datagram.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/core/datagram.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/dev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/core/dev.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/neighbour.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/core/neighbour.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/netpoll.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/core/netpoll.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/pktgen.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/core/pktgen.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/skbuff.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/core/skbuff.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/dccp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/dccp/dccp.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/input.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/dccp/input.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/minisocks.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/dccp/minisocks.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/proto.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/dccp/proto.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/devinet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/devinet.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/esp4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/esp4.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/icmp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/icmp.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/igmp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/igmp.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/inet_timewait_sock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/inet_timewait_sock.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_app.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_app.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_conn.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_conn.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_ctl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_ctl.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_dh.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_dh.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_est.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_est.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_lblc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_lblc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_lblcr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_lblcr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_lc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_lc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_nq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_nq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_proto.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_proto.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_rr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_rr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_sched.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_sched.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_sed.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_sed.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_sh.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_sh.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_sync.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_sync.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_wlc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_wlc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_wrr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/ipvs/ip_vs_wrr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ipt_CLUSTERIP.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/netfilter/ipt_CLUSTERIP.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ipt_addrtype.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/netfilter/ipt_addrtype.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ipt_recent.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/netfilter/ipt_recent.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_proto_common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/netfilter/nf_nat_proto_common.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/proc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/route.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/route.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/sysctl_net_ipv4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/sysctl_net_ipv4.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_ipv4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/tcp_ipv4.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_minisocks.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/tcp_minisocks.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_output.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/tcp_output.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/udp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/udp.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/xfrm4_mode_beet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv4/xfrm4_mode_beet.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/addrconf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/addrconf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/datagram.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/datagram.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/esp6.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/esp6.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/fib6_rules.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/fib6_rules.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/icmp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/icmp.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ip6_fib.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/ip6_fib.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ip6_output.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/ip6_output.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ipv6_sockglue.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/ipv6_sockglue.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ndisc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/ndisc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/proc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/raw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/raw.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/route.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/route.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/syncookies.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/syncookies.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/sysctl_net_ipv6.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/sysctl_net_ipv6.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/tcp_ipv6.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/tcp_ipv6.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/udp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/udp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/xfrm6_mode_beet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/xfrm6_mode_beet.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/xfrm6_policy.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/ipv6/xfrm6_policy.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/cfg.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/mac80211/cfg.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/debugfs_key.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/mac80211/debugfs_key.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/debugfs_netdev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/mac80211/debugfs_netdev.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/ieee80211_i.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/mac80211/ieee80211_i.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/mac80211/main.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/mesh.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/mac80211/mesh.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/mesh.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/mac80211/mesh.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/mesh_hwmp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/mac80211/mesh_hwmp.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/mesh_pathtbl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/mac80211/mesh_pathtbl.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/mlme.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/mac80211/mlme.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/rx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/mac80211/rx.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/tx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/mac80211/tx.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/util.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/mac80211/util.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/wep.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/mac80211/wep.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/wme.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/mac80211/wme.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/netfilter/nf_conntrack_core.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_irc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/netfilter/nf_conntrack_irc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_netlink.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/netfilter/nf_conntrack_netlink.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_proto_gre.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/netfilter/nf_conntrack_proto_gre.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_proto_tcp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/netfilter/nf_conntrack_proto_tcp.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_sip.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/netfilter/nf_conntrack_sip.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_standalone.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/netfilter/nf_conntrack_standalone.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_hashlimit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/netfilter/xt_hashlimit.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rfkill/rfkill-input.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/rfkill/rfkill-input.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rfkill/rfkill.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/rfkill/rfkill.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rxrpc/ar-accept.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/rxrpc/ar-accept.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/act_api.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sched/act_api.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/cls_api.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sched/cls_api.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/cls_route.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sched/cls_route.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_api.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sched/sch_api.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_atm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sched/sch_atm.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_cbq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sched/sch_cbq.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_dsmark.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sched/sch_dsmark.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sched/sch_generic.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_hfsc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sched/sch_hfsc.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_htb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sched/sch_htb.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_netem.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sched/sch_netem.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_prio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sched/sch_prio.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_red.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sched/sch_red.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_sfq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sched/sch_sfq.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_tbf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sched/sch_tbf.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_teql.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sched/sch_teql.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/associola.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sctp/associola.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/auth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sctp/auth.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/endpointola.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sctp/endpointola.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/ipv6.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sctp/ipv6.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/output.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sctp/output.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/protocol.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sctp/protocol.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/sm_make_chunk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sctp/sm_make_chunk.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/socket.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sctp/socket.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/sysctl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sunrpc/sysctl.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sunrpc/xprtrdma/svc_rdma_recvfrom.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/xprtrdma/svc_rdma_transport.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/sunrpc/xprtrdma/svc_rdma_transport.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/bcast.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/bcast.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/bcast.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/bcast.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/bearer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/bearer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/bearer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/bearer.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/cluster.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/cluster.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/cluster.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/cluster.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/discover.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/discover.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/link.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/link.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/link.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/link.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/name_table.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/name_table.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/net.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/net.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/net.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/net.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/node.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/node.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/node.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/node.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/node_subscr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/node_subscr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/node_subscr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/node_subscr.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/port.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/port.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/subscr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/subscr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/zone.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/zone.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/zone.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/tipc/zone.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wanrouter/wanmain.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/wanrouter/wanmain.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/wireless/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/nl80211.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/wireless/nl80211.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/wext.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/wireless/wext.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/xfrm/xfrm_output.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/xfrm/xfrm_output.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/xfrm/xfrm_policy.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/xfrm/xfrm_policy.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/xfrm/xfrm_state.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>net/xfrm/xfrm_state.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/Makefile.fwinst?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>scripts/Makefile.fwinst</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/genksyms/genksyms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>scripts/genksyms/genksyms.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/genksyms/lex.c_shipped?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>scripts/genksyms/lex.c_shipped</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/genksyms/lex.l?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>scripts/genksyms/lex.l</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/genksyms/parse.c_shipped?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>scripts/genksyms/parse.c_shipped</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/genksyms/parse.y?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>scripts/genksyms/parse.y</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/conf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>scripts/kconfig/conf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/confdata.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>scripts/kconfig/confdata.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/lex.zconf.c_shipped?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>scripts/kconfig/lex.zconf.c_shipped</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/zconf.l?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>scripts/kconfig/zconf.l</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kernel-doc?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>scripts/kernel-doc</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/mod/file2alias.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>scripts/mod/file2alias.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/mod/modpost.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>scripts/mod/modpost.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/patch-kernel?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>scripts/patch-kernel</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/ver_linux?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>scripts/ver_linux</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/capability.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>security/capability.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/commoncap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>security/commoncap.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/device_cgroup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>security/device_cgroup.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/root_plug.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>security/root_plug.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/security.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>security/security.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/hooks.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>security/selinux/hooks.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/ss/services.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>security/selinux/ss/services.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/smack/smack_lsm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>security/smack/smack_lsm.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/arm/pxa2xx-ac97.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/arm/pxa2xx-ac97.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/arm/pxa2xx-pcm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/arm/pxa2xx-pcm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/arm/sa11xx-uda1341.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/arm/sa11xx-uda1341.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/seq/oss/seq_oss_synth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/core/seq/oss/seq_oss_synth.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/mips/au1x00.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/mips/au1x00.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/vidc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/oss/vidc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/vidc_fill.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/oss/vidc_fill.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/waveartist.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/oss/waveartist.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/pci/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ca0106/ca0106_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/pci/ca0106/ca0106_main.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/hda_intel.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/pci/hda/hda_intel.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/patch_realtek.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/pci/hda/patch_realtek.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/patch_sigmatel.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/pci/hda/patch_sigmatel.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/oxygen/hifier.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/pci/oxygen/hifier.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/oxygen/oxygen.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/pci/oxygen/oxygen.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/oxygen/oxygen_mixer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/pci/oxygen/oxygen_mixer.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/oxygen/virtuoso.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/pci/oxygen/virtuoso.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/sh/aica.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/sh/aica.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/at32/playpaq_wm8510.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/at32/playpaq_wm8510.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/at91/at91-pcm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/at91/at91-pcm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/at91/at91-pcm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/at91/at91-pcm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/at91/at91-ssc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/at91/at91-ssc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/at91/eti_b1_wm8731.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/at91/eti_b1_wm8731.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/ak4535.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/codecs/ak4535.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/tlv320aic3x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/codecs/tlv320aic3x.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/uda1380.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/codecs/uda1380.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8510.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/codecs/wm8510.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8731.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/codecs/wm8731.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8750.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/codecs/wm8750.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8753.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/codecs/wm8753.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8990.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/codecs/wm8990.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8990.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/codecs/wm8990.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm9712.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/codecs/wm9712.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/davinci/davinci-evm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/davinci/davinci-evm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/fsl/fsl_dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/fsl/fsl_dma.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/fsl/fsl_ssi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/fsl/fsl_ssi.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/n810.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/omap/n810.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/omap-mcbsp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/omap/omap-mcbsp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/omap-pcm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/omap/omap-pcm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/corgi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/pxa/corgi.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/e800_wm9712.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/pxa/e800_wm9712.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/em-x270.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/pxa/em-x270.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/poodle.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/pxa/poodle.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/pxa2xx-ac97.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/pxa/pxa2xx-ac97.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/pxa2xx-i2s.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/pxa/pxa2xx-i2s.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/pxa2xx-pcm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/pxa/pxa2xx-pcm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/spitz.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/pxa/spitz.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/tosa.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/pxa/tosa.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/s3c24xx/neo1973_wm8753.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/s3c24xx/neo1973_wm8753.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/s3c24xx/s3c2412-i2s.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/s3c24xx/s3c2412-i2s.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/s3c24xx/s3c2443-ac97.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/s3c24xx/s3c2443-ac97.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/s3c24xx/s3c24xx-i2s.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/s3c24xx/s3c24xx-i2s.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/s3c24xx/s3c24xx-pcm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/s3c24xx/s3c24xx-pcm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/soc-dapm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>sound/soc/soc-dapm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/virt/kvm/kvm_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>virt/kvm/kvm_main.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>6053 files changed, 158330 insertions, 63064 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/.mailmap b/.mailmap<br/>index 726084286d33..dfab12f809ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/.mailmap?id=d4738792fb86600b6cb7220459d9c47e819b3580'>.mailmap</a><br/>+++ b/<a href='/cgit/linux.git/tree/.mailmap?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>.mailmap</a></div><div class='hunk'>@@ -96,4 +96,6 @@ Tejun Heo &lt;htejun@gmail.com&gt;</div><div class='ctx'> Thomas Graf &lt;tgraf@suug.ch&gt;</div><div class='ctx'> Tony Luck &lt;tony.luck@intel.com&gt;</div><div class='ctx'> Tsuneo Yoshioka &lt;Tsuneo.Yoshioka@f-secure.com&gt;</div><div class='add'>+Uwe Kleine-König &lt;Uwe.Kleine-Koenig@digi.com&gt;</div><div class='add'>+Uwe Kleine-König &lt;ukleinek@informatik.uni-freiburg.de&gt;</div><div class='ctx'> Valdis Kletnieks &lt;Valdis.Kletnieks@vt.edu&gt;</div><div class='head'>diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX<br/>index 6de71308a906..5b5aba404aac 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/00-INDEX?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/00-INDEX</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/00-INDEX?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/00-INDEX</a></div><div class='hunk'>@@ -89,8 +89,6 @@ cciss.txt</div><div class='ctx'> 	- info, major/minor #'s for Compaq's SMART Array Controllers.</div><div class='ctx'> cdrom/</div><div class='ctx'> 	- directory with information on the CD-ROM drivers that Linux has.</div><div class='del'>-cli-sti-removal.txt</div><div class='del'>-	- cli()/sti() removal guide.</div><div class='ctx'> computone.txt</div><div class='ctx'> 	- info on Computone Intelliport II/Plus Multiport Serial Driver.</div><div class='ctx'> connector/</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-class-regulator b/Documentation/ABI/testing/sysfs-class-regulator<br/>new file mode 100644<br/>index 000000000000..79a4a75b2d2c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-class-regulator?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/ABI/testing/sysfs-class-regulator</a></div><div class='hunk'>@@ -0,0 +1,315 @@</div><div class='add'>+What:		/sys/class/regulator/.../state</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		state. This holds the regulator output state.</div><div class='add'>+</div><div class='add'>+		This will be one of the following strings:</div><div class='add'>+</div><div class='add'>+		'enabled'</div><div class='add'>+		'disabled'</div><div class='add'>+		'unknown'</div><div class='add'>+</div><div class='add'>+		'enabled' means the regulator output is ON and is supplying</div><div class='add'>+		power to the system.</div><div class='add'>+</div><div class='add'>+		'disabled' means the regulator output is OFF and is not</div><div class='add'>+		supplying power to the system..</div><div class='add'>+</div><div class='add'>+		'unknown' means software cannot determine the state.</div><div class='add'>+</div><div class='add'>+		NOTE: this field can be used in conjunction with microvolts</div><div class='add'>+		and microamps to determine regulator output levels.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../type</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		type. This holds the regulator type.</div><div class='add'>+</div><div class='add'>+		This will be one of the following strings:</div><div class='add'>+</div><div class='add'>+		'voltage'</div><div class='add'>+		'current'</div><div class='add'>+		'unknown'</div><div class='add'>+</div><div class='add'>+		'voltage' means the regulator output voltage can be controlled</div><div class='add'>+		by software.</div><div class='add'>+</div><div class='add'>+		'current' means the regulator output current limit can be</div><div class='add'>+		controlled by software.</div><div class='add'>+</div><div class='add'>+		'unknown' means software cannot control either voltage or</div><div class='add'>+		current limit.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../microvolts</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		microvolts. This holds the regulator output voltage setting</div><div class='add'>+		measured in microvolts (i.e. E-6 Volts).</div><div class='add'>+</div><div class='add'>+		NOTE: This value should not be used to determine the regulator</div><div class='add'>+		output voltage level as this value is the same regardless of</div><div class='add'>+		whether the regulator is enabled or disabled.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../microamps</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		microamps. This holds the regulator output current limit</div><div class='add'>+		setting measured in microamps (i.e. E-6 Amps).</div><div class='add'>+</div><div class='add'>+		NOTE: This value should not be used to determine the regulator</div><div class='add'>+		output current level as this value is the same regardless of</div><div class='add'>+		whether the regulator is enabled or disabled.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../opmode</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		opmode. This holds the regulator operating mode setting.</div><div class='add'>+</div><div class='add'>+		The opmode value can be one of the following strings:</div><div class='add'>+</div><div class='add'>+		'fast'</div><div class='add'>+		'normal'</div><div class='add'>+		'idle'</div><div class='add'>+		'standby'</div><div class='add'>+		'unknown'</div><div class='add'>+</div><div class='add'>+		The modes are described in include/linux/regulator/regulator.h</div><div class='add'>+</div><div class='add'>+		NOTE: This value should not be used to determine the regulator</div><div class='add'>+		output operating mode as this value is the same regardless of</div><div class='add'>+		whether the regulator is enabled or disabled.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../min_microvolts</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		min_microvolts. This holds the minimum safe working regulator</div><div class='add'>+		output voltage setting for this domain measured in microvolts.</div><div class='add'>+</div><div class='add'>+		NOTE: this will return the string 'constraint not defined' if</div><div class='add'>+		the power domain has no min microvolts constraint defined by</div><div class='add'>+		platform code.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../max_microvolts</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		max_microvolts. This holds the maximum safe working regulator</div><div class='add'>+		output voltage setting for this domain measured in microvolts.</div><div class='add'>+</div><div class='add'>+		NOTE: this will return the string 'constraint not defined' if</div><div class='add'>+		the power domain has no max microvolts constraint defined by</div><div class='add'>+		platform code.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../min_microamps</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		min_microamps. This holds the minimum safe working regulator</div><div class='add'>+		output current limit setting for this domain measured in</div><div class='add'>+		microamps.</div><div class='add'>+</div><div class='add'>+		NOTE: this will return the string 'constraint not defined' if</div><div class='add'>+		the power domain has no min microamps constraint defined by</div><div class='add'>+		platform code.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../max_microamps</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		max_microamps. This holds the maximum safe working regulator</div><div class='add'>+		output current limit setting for this domain measured in</div><div class='add'>+		microamps.</div><div class='add'>+</div><div class='add'>+		NOTE: this will return the string 'constraint not defined' if</div><div class='add'>+		the power domain has no max microamps constraint defined by</div><div class='add'>+		platform code.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../num_users</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		num_users. This holds the number of consumer devices that</div><div class='add'>+		have called regulator_enable() on this regulator.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../requested_microamps</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		requested_microamps. This holds the total requested load</div><div class='add'>+		current in microamps for this regulator from all its consumer</div><div class='add'>+		devices.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../parent</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Some regulator directories will contain a link called parent.</div><div class='add'>+		This points to the parent or supply regulator if one exists.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../suspend_mem_microvolts</div><div class='add'>+Date:		May 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		suspend_mem_microvolts. This holds the regulator output</div><div class='add'>+		voltage setting for this domain measured in microvolts when</div><div class='add'>+		the system is suspended to memory.</div><div class='add'>+</div><div class='add'>+		NOTE: this will return the string 'not defined' if</div><div class='add'>+		the power domain has no suspend to memory voltage defined by</div><div class='add'>+		platform code.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../suspend_disk_microvolts</div><div class='add'>+Date:		May 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		suspend_disk_microvolts. This holds the regulator output</div><div class='add'>+		voltage setting for this domain measured in microvolts when</div><div class='add'>+		the system is suspended to disk.</div><div class='add'>+</div><div class='add'>+		NOTE: this will return the string 'not defined' if</div><div class='add'>+		the power domain has no suspend to disk voltage defined by</div><div class='add'>+		platform code.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../suspend_standby_microvolts</div><div class='add'>+Date:		May 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		suspend_standby_microvolts. This holds the regulator output</div><div class='add'>+		voltage setting for this domain measured in microvolts when</div><div class='add'>+		the system is suspended to standby.</div><div class='add'>+</div><div class='add'>+		NOTE: this will return the string 'not defined' if</div><div class='add'>+		the power domain has no suspend to standby voltage defined by</div><div class='add'>+		platform code.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../suspend_mem_mode</div><div class='add'>+Date:		May 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		suspend_mem_mode. This holds the regulator operating mode</div><div class='add'>+		setting for this domain when the system is suspended to</div><div class='add'>+		memory.</div><div class='add'>+</div><div class='add'>+		NOTE: this will return the string 'not defined' if</div><div class='add'>+		the power domain has no suspend to memory mode defined by</div><div class='add'>+		platform code.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../suspend_disk_mode</div><div class='add'>+Date:		May 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		suspend_disk_mode. This holds the regulator operating mode</div><div class='add'>+		setting for this domain when the system is suspended to disk.</div><div class='add'>+</div><div class='add'>+		NOTE: this will return the string 'not defined' if</div><div class='add'>+		the power domain has no suspend to disk mode defined by</div><div class='add'>+		platform code.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../suspend_standby_mode</div><div class='add'>+Date:		May 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		suspend_standby_mode. This holds the regulator operating mode</div><div class='add'>+		setting for this domain when the system is suspended to</div><div class='add'>+		standby.</div><div class='add'>+</div><div class='add'>+		NOTE: this will return the string 'not defined' if</div><div class='add'>+		the power domain has no suspend to standby mode defined by</div><div class='add'>+		platform code.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../suspend_mem_state</div><div class='add'>+Date:		May 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		suspend_mem_state. This holds the regulator operating state</div><div class='add'>+		when suspended to memory.</div><div class='add'>+</div><div class='add'>+		This will be one of the following strings:</div><div class='add'>+</div><div class='add'>+		'enabled'</div><div class='add'>+		'disabled'</div><div class='add'>+		'not defined'</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../suspend_disk_state</div><div class='add'>+Date:		May 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		suspend_disk_state. This holds the regulator operating state</div><div class='add'>+		when suspended to disk.</div><div class='add'>+</div><div class='add'>+		This will be one of the following strings:</div><div class='add'>+</div><div class='add'>+		'enabled'</div><div class='add'>+		'disabled'</div><div class='add'>+		'not defined'</div><div class='add'>+</div><div class='add'>+What:		/sys/class/regulator/.../suspend_standby_state</div><div class='add'>+Date:		May 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Each regulator directory will contain a field called</div><div class='add'>+		suspend_standby_state. This holds the regulator operating</div><div class='add'>+		state when suspended to standby.</div><div class='add'>+</div><div class='add'>+		This will be one of the following strings:</div><div class='add'>+</div><div class='add'>+		'enabled'</div><div class='add'>+		'disabled'</div><div class='add'>+		'not defined'</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-firmware-sgi_uv b/Documentation/ABI/testing/sysfs-firmware-sgi_uv<br/>new file mode 100644<br/>index 000000000000..4573fd4b7876<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-firmware-sgi_uv?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/ABI/testing/sysfs-firmware-sgi_uv</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+What:		/sys/firmware/sgi_uv/</div><div class='add'>+Date:		August 2008</div><div class='add'>+Contact:	Russ Anderson &lt;rja@sgi.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The /sys/firmware/sgi_uv directory contains information</div><div class='add'>+		about the SGI UV platform.</div><div class='add'>+</div><div class='add'>+		Under that directory are a number of files:</div><div class='add'>+</div><div class='add'>+			partition_id</div><div class='add'>+			coherence_id</div><div class='add'>+</div><div class='add'>+		The partition_id entry contains the partition id.</div><div class='add'>+		SGI UV systems can be partitioned into multiple physical</div><div class='add'>+		machines, which each partition running a unique copy</div><div class='add'>+		of the operating system.  Each partition will have a unique</div><div class='add'>+		partition id.  To display the partition id, use the command:</div><div class='add'>+</div><div class='add'>+			cat /sys/firmware/sgi_uv/partition_id</div><div class='add'>+</div><div class='add'>+		The coherence_id entry contains the coherence id.</div><div class='add'>+		A partitioned SGI UV system can have one or more coherence</div><div class='add'>+		domain.  The coherence id indicates which coherence domain</div><div class='add'>+		this partition is in.  To display the coherence id, use the</div><div class='add'>+		command:</div><div class='add'>+</div><div class='add'>+			cat /sys/firmware/sgi_uv/coherence_id</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-gpio b/Documentation/ABI/testing/sysfs-gpio<br/>new file mode 100644<br/>index 000000000000..8aab8092ad35<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-gpio?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/ABI/testing/sysfs-gpio</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+What:		/sys/class/gpio/</div><div class='add'>+Date:		July 2008</div><div class='add'>+KernelVersion:	2.6.27</div><div class='add'>+Contact:	David Brownell &lt;dbrownell@users.sourceforge.net&gt;</div><div class='add'>+Description:</div><div class='add'>+</div><div class='add'>+  As a Kconfig option, individual GPIO signals may be accessed from</div><div class='add'>+  userspace.  GPIOs are only made available to userspace by an explicit</div><div class='add'>+  "export" operation.  If a given GPIO is not claimed for use by</div><div class='add'>+  kernel code, it may be exported by userspace (and unexported later).</div><div class='add'>+  Kernel code may export it for complete or partial access.</div><div class='add'>+</div><div class='add'>+  GPIOs are identified as they are inside the kernel, using integers in</div><div class='add'>+  the range 0..INT_MAX.  See Documentation/gpio.txt for more information.</div><div class='add'>+</div><div class='add'>+    /sys/class/gpio</div><div class='add'>+	/export ... asks the kernel to export a GPIO to userspace</div><div class='add'>+	/unexport ... to return a GPIO to the kernel</div><div class='add'>+	/gpioN ... for each exported GPIO #N</div><div class='add'>+	    /value ... always readable, writes fail for input GPIOs</div><div class='add'>+	    /direction ... r/w as: in, out (default low); write: high, low</div><div class='add'>+	/gpiochipN ... for each gpiochip; #N is its first GPIO</div><div class='add'>+	    /base ... (r/o) same as N</div><div class='add'>+	    /label ... (r/o) descriptive, not necessarily unique</div><div class='add'>+	    /ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile<br/>index 0eb0d027eb32..1615350b7b53 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/DocBook/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/DocBook/Makefile</a></div><div class='hunk'>@@ -12,7 +12,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \</div><div class='ctx'> 	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \</div><div class='ctx'> 	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \</div><div class='ctx'> 	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \</div><div class='del'>-	    mac80211.xml debugobjects.xml</div><div class='add'>+	    mac80211.xml debugobjects.xml sh.xml</div><div class='ctx'> </div><div class='ctx'> ###</div><div class='ctx'> # The build process is as follows (targets):</div><div class='hunk'>@@ -102,6 +102,13 @@ C-procfs-example = procfs_example.xml</div><div class='ctx'> C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example))</div><div class='ctx'> $(obj)/procfs-guide.xml: $(C-procfs-example2)</div><div class='ctx'> </div><div class='add'>+# List of programs to build</div><div class='add'>+##oops, this is a kernel module::hostprogs-y := procfs_example</div><div class='add'>+obj-m += procfs_example.o</div><div class='add'>+</div><div class='add'>+# Tell kbuild to always build the programs</div><div class='add'>+always := $(hostprogs-y)</div><div class='add'>+</div><div class='ctx'> notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \</div><div class='ctx'> 		   exit 1</div><div class='ctx'> db2xtemplate = db2TYPE -o $(dir $@) $&lt;</div><div class='head'>diff --git a/Documentation/DocBook/kgdb.tmpl b/Documentation/DocBook/kgdb.tmpl<br/>index e8acd1f03456..372dec20c8da 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/kgdb.tmpl?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/DocBook/kgdb.tmpl</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/kgdb.tmpl?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/DocBook/kgdb.tmpl</a></div><div class='hunk'>@@ -98,6 +98,24 @@</div><div class='ctx'>     "Kernel debugging" select "KGDB: kernel debugging with remote gdb".</div><div class='ctx'>     &lt;/para&gt;</div><div class='ctx'>     &lt;para&gt;</div><div class='add'>+    It is advised, but not required that you turn on the</div><div class='add'>+    CONFIG_FRAME_POINTER kernel option.  This option inserts code to</div><div class='add'>+    into the compiled executable which saves the frame information in</div><div class='add'>+    registers or on the stack at different points which will allow a</div><div class='add'>+    debugger such as gdb to more accurately construct stack back traces</div><div class='add'>+    while debugging the kernel.</div><div class='add'>+    &lt;/para&gt;</div><div class='add'>+    &lt;para&gt;</div><div class='add'>+    If the architecture that you are using supports the kernel option</div><div class='add'>+    CONFIG_DEBUG_RODATA, you should consider turning it off.  This</div><div class='add'>+    option will prevent the use of software breakpoints because it</div><div class='add'>+    marks certain regions of the kernel's memory space as read-only.</div><div class='add'>+    If kgdb supports it for the architecture you are using, you can</div><div class='add'>+    use hardware breakpoints if you desire to run with the</div><div class='add'>+    CONFIG_DEBUG_RODATA option turned on, else you need to turn off</div><div class='add'>+    this option.</div><div class='add'>+    &lt;/para&gt;</div><div class='add'>+    &lt;para&gt;</div><div class='ctx'>     Next you should choose one of more I/O drivers to interconnect debugging</div><div class='ctx'>     host and debugged target.  Early boot debugging requires a KGDB</div><div class='ctx'>     I/O driver that supports early debugging and the driver must be</div><div class='head'>diff --git a/Documentation/DocBook/procfs_example.c b/Documentation/DocBook/procfs_example.c<br/>index 7064084c1c5e..2f3de0fb8365 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/procfs_example.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/DocBook/procfs_example.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/procfs_example.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/DocBook/procfs_example.c</a></div><div class='hunk'>@@ -189,8 +189,6 @@ static int __init init_procfs_example(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> no_symlink:</div><div class='del'>-	remove_proc_entry("tty", example_dir);</div><div class='del'>-no_tty:</div><div class='ctx'> 	remove_proc_entry("bar", example_dir);</div><div class='ctx'> no_bar:</div><div class='ctx'> 	remove_proc_entry("foo", example_dir);</div><div class='hunk'>@@ -206,7 +204,6 @@ out:</div><div class='ctx'> static void __exit cleanup_procfs_example(void)</div><div class='ctx'> {</div><div class='ctx'> 	remove_proc_entry("jiffies_too", example_dir);</div><div class='del'>-	remove_proc_entry("tty", example_dir);</div><div class='ctx'> 	remove_proc_entry("bar", example_dir);</div><div class='ctx'> 	remove_proc_entry("foo", example_dir);</div><div class='ctx'> 	remove_proc_entry("jiffies", example_dir);</div><div class='hunk'>@@ -222,3 +219,4 @@ module_exit(cleanup_procfs_example);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Erik Mouw");</div><div class='ctx'> MODULE_DESCRIPTION("procfs examples");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/Documentation/DocBook/s390-drivers.tmpl b/Documentation/DocBook/s390-drivers.tmpl<br/>index 4acc73240a6d..95bfc12e5439 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/s390-drivers.tmpl?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/DocBook/s390-drivers.tmpl</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/s390-drivers.tmpl?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/DocBook/s390-drivers.tmpl</a></div><div class='hunk'>@@ -100,7 +100,7 @@</div><div class='ctx'>       the hardware structures represented here, please consult the Principles</div><div class='ctx'>       of Operation.</div><div class='ctx'>     &lt;/para&gt;</div><div class='del'>-!Iinclude/asm-s390/cio.h</div><div class='add'>+!Iarch/s390/include/asm/cio.h</div><div class='ctx'>     &lt;/sect1&gt;</div><div class='ctx'>     &lt;sect1 id="ccwdev"&gt;</div><div class='ctx'>      &lt;title&gt;ccw devices&lt;/title&gt;</div><div class='hunk'>@@ -114,7 +114,7 @@</div><div class='ctx'>       ccw device structure. Device drivers must not bypass those functions</div><div class='ctx'>       or strange side effects may happen.</div><div class='ctx'>     &lt;/para&gt;</div><div class='del'>-!Iinclude/asm-s390/ccwdev.h</div><div class='add'>+!Iarch/s390/include/asm/ccwdev.h</div><div class='ctx'> !Edrivers/s390/cio/device.c</div><div class='ctx'> !Edrivers/s390/cio/device_ops.c</div><div class='ctx'>     &lt;/sect1&gt;</div><div class='hunk'>@@ -125,7 +125,7 @@</div><div class='ctx'> 	measurement data which is made available by the channel subsystem</div><div class='ctx'> 	for each channel attached device.</div><div class='ctx'>   &lt;/para&gt;</div><div class='del'>-!Iinclude/asm-s390/cmb.h</div><div class='add'>+!Iarch/s390/include/asm/cmb.h</div><div class='ctx'> !Edrivers/s390/cio/cmf.c</div><div class='ctx'>     &lt;/sect1&gt;</div><div class='ctx'>   &lt;/chapter&gt;</div><div class='hunk'>@@ -142,7 +142,7 @@</div><div class='ctx'>   &lt;/para&gt;</div><div class='ctx'>    &lt;sect1 id="ccwgroupdevices"&gt;</div><div class='ctx'>     &lt;title&gt;ccw group devices&lt;/title&gt;</div><div class='del'>-!Iinclude/asm-s390/ccwgroup.h</div><div class='add'>+!Iarch/s390/include/asm/ccwgroup.h</div><div class='ctx'> !Edrivers/s390/cio/ccwgroup.c</div><div class='ctx'>    &lt;/sect1&gt;</div><div class='ctx'>   &lt;/chapter&gt;</div><div class='head'>diff --git a/Documentation/DocBook/sh.tmpl b/Documentation/DocBook/sh.tmpl<br/>new file mode 100644<br/>index 000000000000..0c3dc4c69dd1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/sh.tmpl?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/DocBook/sh.tmpl</a></div><div class='hunk'>@@ -0,0 +1,105 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='add'>+&lt;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"</div><div class='add'>+	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []&gt;</div><div class='add'>+</div><div class='add'>+&lt;book id="sh-drivers"&gt;</div><div class='add'>+ &lt;bookinfo&gt;</div><div class='add'>+  &lt;title&gt;SuperH Interfaces Guide&lt;/title&gt;</div><div class='add'>+  </div><div class='add'>+  &lt;authorgroup&gt;</div><div class='add'>+   &lt;author&gt;</div><div class='add'>+    &lt;firstname&gt;Paul&lt;/firstname&gt;</div><div class='add'>+    &lt;surname&gt;Mundt&lt;/surname&gt;</div><div class='add'>+    &lt;affiliation&gt;</div><div class='add'>+     &lt;address&gt;</div><div class='add'>+      &lt;email&gt;lethal@linux-sh.org&lt;/email&gt;</div><div class='add'>+     &lt;/address&gt;</div><div class='add'>+    &lt;/affiliation&gt;</div><div class='add'>+   &lt;/author&gt;</div><div class='add'>+  &lt;/authorgroup&gt;</div><div class='add'>+</div><div class='add'>+  &lt;copyright&gt;</div><div class='add'>+   &lt;year&gt;2008&lt;/year&gt;</div><div class='add'>+   &lt;holder&gt;Paul Mundt&lt;/holder&gt;</div><div class='add'>+  &lt;/copyright&gt;</div><div class='add'>+  &lt;copyright&gt;</div><div class='add'>+   &lt;year&gt;2008&lt;/year&gt;</div><div class='add'>+   &lt;holder&gt;Renesas Technology Corp.&lt;/holder&gt;</div><div class='add'>+  &lt;/copyright&gt;</div><div class='add'>+</div><div class='add'>+  &lt;legalnotice&gt;</div><div class='add'>+   &lt;para&gt;</div><div class='add'>+     This documentation is free software; you can redistribute</div><div class='add'>+     it and/or modify it under the terms of the GNU General Public</div><div class='add'>+     License version 2 as published by the Free Software Foundation.</div><div class='add'>+   &lt;/para&gt;</div><div class='add'>+      </div><div class='add'>+   &lt;para&gt;</div><div class='add'>+     This program is distributed in the hope that it will be</div><div class='add'>+     useful, but WITHOUT ANY WARRANTY; without even the implied</div><div class='add'>+     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</div><div class='add'>+     See the GNU General Public License for more details.</div><div class='add'>+   &lt;/para&gt;</div><div class='add'>+      </div><div class='add'>+   &lt;para&gt;</div><div class='add'>+     You should have received a copy of the GNU General Public</div><div class='add'>+     License along with this program; if not, write to the Free</div><div class='add'>+     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,</div><div class='add'>+     MA 02111-1307 USA</div><div class='add'>+   &lt;/para&gt;</div><div class='add'>+      </div><div class='add'>+   &lt;para&gt;</div><div class='add'>+     For more details see the file COPYING in the source</div><div class='add'>+     distribution of Linux.</div><div class='add'>+   &lt;/para&gt;</div><div class='add'>+  &lt;/legalnotice&gt;</div><div class='add'>+ &lt;/bookinfo&gt;</div><div class='add'>+</div><div class='add'>+&lt;toc&gt;&lt;/toc&gt;</div><div class='add'>+</div><div class='add'>+  &lt;chapter id="mm"&gt;</div><div class='add'>+    &lt;title&gt;Memory Management&lt;/title&gt;</div><div class='add'>+    &lt;sect1 id="sh4"&gt;</div><div class='add'>+    &lt;title&gt;SH-4&lt;/title&gt;</div><div class='add'>+      &lt;sect2 id="sq"&gt;</div><div class='add'>+        &lt;title&gt;Store Queue API&lt;/title&gt;</div><div class='add'>+!Earch/sh/kernel/cpu/sh4/sq.c</div><div class='add'>+      &lt;/sect2&gt;</div><div class='add'>+    &lt;/sect1&gt;</div><div class='add'>+    &lt;sect1 id="sh5"&gt;</div><div class='add'>+      &lt;title&gt;SH-5&lt;/title&gt;</div><div class='add'>+      &lt;sect2 id="tlb"&gt;</div><div class='add'>+	&lt;title&gt;TLB Interfaces&lt;/title&gt;</div><div class='add'>+!Iarch/sh/mm/tlb-sh5.c</div><div class='add'>+!Iarch/sh/include/asm/tlb_64.h</div><div class='add'>+      &lt;/sect2&gt;</div><div class='add'>+    &lt;/sect1&gt;</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+  &lt;chapter id="clk"&gt;</div><div class='add'>+    &lt;title&gt;Clock Framework Extensions&lt;/title&gt;</div><div class='add'>+!Iarch/sh/include/asm/clock.h</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+  &lt;chapter id="mach"&gt;</div><div class='add'>+    &lt;title&gt;Machine Specific Interfaces&lt;/title&gt;</div><div class='add'>+    &lt;sect1 id="dreamcast"&gt;</div><div class='add'>+      &lt;title&gt;mach-dreamcast&lt;/title&gt;</div><div class='add'>+!Iarch/sh/boards/mach-dreamcast/rtc.c</div><div class='add'>+    &lt;/sect1&gt;</div><div class='add'>+    &lt;sect1 id="x3proto"&gt;</div><div class='add'>+      &lt;title&gt;mach-x3proto&lt;/title&gt;</div><div class='add'>+!Earch/sh/boards/mach-x3proto/ilsel.c</div><div class='add'>+    &lt;/sect1&gt;</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+  &lt;chapter id="busses"&gt;</div><div class='add'>+    &lt;title&gt;Busses&lt;/title&gt;</div><div class='add'>+    &lt;sect1 id="superhyway"&gt;</div><div class='add'>+      &lt;title&gt;SuperHyway&lt;/title&gt;</div><div class='add'>+!Edrivers/sh/superhyway/superhyway.c</div><div class='add'>+    &lt;/sect1&gt;</div><div class='add'>+</div><div class='add'>+    &lt;sect1 id="maple"&gt;</div><div class='add'>+      &lt;title&gt;Maple&lt;/title&gt;</div><div class='add'>+!Edrivers/sh/maple/maple.c</div><div class='add'>+    &lt;/sect1&gt;</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+&lt;/book&gt;</div><div class='head'>diff --git a/Documentation/DocBook/videobook.tmpl b/Documentation/DocBook/videobook.tmpl<br/>index 89817795e668..0bc25949b668 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/videobook.tmpl?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/DocBook/videobook.tmpl</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/videobook.tmpl?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/DocBook/videobook.tmpl</a></div><div class='hunk'>@@ -1648,7 +1648,7 @@ static struct video_buffer capture_fb;</div><div class='ctx'> </div><div class='ctx'>   &lt;chapter id="pubfunctions"&gt;</div><div class='ctx'>      &lt;title&gt;Public Functions Provided&lt;/title&gt;</div><div class='del'>-!Edrivers/media/video/videodev.c</div><div class='add'>+!Edrivers/media/video/v4l2-dev.c</div><div class='ctx'>   &lt;/chapter&gt;</div><div class='ctx'> </div><div class='ctx'> &lt;/book&gt;</div><div class='head'>diff --git a/Documentation/DocBook/z8530book.tmpl b/Documentation/DocBook/z8530book.tmpl<br/>index 42c75ba71ba2..a42a8a4c7689 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/z8530book.tmpl?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/DocBook/z8530book.tmpl</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/z8530book.tmpl?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/DocBook/z8530book.tmpl</a></div><div class='hunk'>@@ -69,12 +69,6 @@</div><div class='ctx'> 	device to be used as both a tty interface and as a synchronous </div><div class='ctx'> 	controller is a project for Linux post the 2.4 release</div><div class='ctx'>   &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-	The support code handles most common card configurations and</div><div class='del'>-	supports running both Cisco HDLC and Synchronous PPP. With extra</div><div class='del'>-	glue the frame relay and X.25 protocols can also be used with this</div><div class='del'>-	driver.</div><div class='del'>-  &lt;/para&gt;</div><div class='ctx'>   &lt;/chapter&gt;</div><div class='ctx'>   </div><div class='ctx'>   &lt;chapter id="Driver_Modes"&gt;</div><div class='hunk'>@@ -179,35 +173,27 @@</div><div class='ctx'>   &lt;para&gt;</div><div class='ctx'> 	If you wish to use the network interface facilities of the driver,</div><div class='ctx'> 	then you need to attach a network device to each channel that is</div><div class='del'>-	present and in use. In addition to use the SyncPPP and Cisco HDLC</div><div class='add'>+	present and in use. In addition to use the generic HDLC</div><div class='ctx'> 	you need to follow some additional plumbing rules. They may seem </div><div class='ctx'> 	complex but a look at the example hostess_sv11 driver should</div><div class='ctx'> 	reassure you.</div><div class='ctx'>   &lt;/para&gt;</div><div class='ctx'>   &lt;para&gt;</div><div class='ctx'> 	The network device used for each channel should be pointed to by</div><div class='del'>-	the netdevice field of each channel. The dev-&amp;gt; priv field of the</div><div class='add'>+	the netdevice field of each channel. The hdlc-&amp;gt; priv field of the</div><div class='ctx'> 	network device points to your private data - you will need to be</div><div class='del'>-	able to find your ppp device from this. In addition to use the</div><div class='del'>-	sync ppp layer the private data must start with a void * pointer</div><div class='del'>-	to the syncppp structures.</div><div class='add'>+	able to find your private data from this.</div><div class='ctx'>   &lt;/para&gt;</div><div class='ctx'>   &lt;para&gt;</div><div class='ctx'> 	The way most drivers approach this particular problem is to</div><div class='ctx'> 	create a structure holding the Z8530 device definition and</div><div class='del'>-	put that and the syncppp pointer into the private field of</div><div class='del'>-	the network device. The network device fields of the channels</div><div class='del'>-	then point back to the network devices. The ppp_device can also</div><div class='del'>-	be put in the private structure conveniently.</div><div class='add'>+	put that into the private field of the network device. The</div><div class='add'>+	network device fields of the channels then point back to the</div><div class='add'>+	network devices.</div><div class='ctx'>   &lt;/para&gt;</div><div class='ctx'>   &lt;para&gt;</div><div class='del'>-	If you wish to use the synchronous ppp then you need to attach</div><div class='del'>-	the syncppp layer to the network device. You should do this before</div><div class='del'>-	you register the network device. The</div><div class='del'>-	&lt;function&gt;sppp_attach&lt;/function&gt; requires that the first void *</div><div class='del'>-	pointer in your private data is pointing to an empty struct</div><div class='del'>-	ppp_device. The function fills in the initial data for the</div><div class='del'>-	ppp/hdlc layer.</div><div class='add'>+	If you wish to use the generic HDLC then you need to register</div><div class='add'>+	the HDLC device.</div><div class='ctx'>   &lt;/para&gt;</div><div class='ctx'>   &lt;para&gt;</div><div class='ctx'> 	Before you register your network device you will also need to</div><div class='hunk'>@@ -314,10 +300,10 @@</div><div class='ctx'> 	buffer in sk_buff format and queues it for transmission. The</div><div class='ctx'> 	caller must provide the entire packet with the exception of the</div><div class='ctx'> 	bitstuffing and CRC. This is normally done by the caller via</div><div class='del'>-	the syncppp interface layer. It returns 0 if the buffer has been </div><div class='del'>-        queued and non zero values  for queue full. If the function accepts </div><div class='del'>-	the buffer it becomes property of the Z8530 layer and the caller </div><div class='del'>-	should not free it. </div><div class='add'>+	the generic HDLC interface layer. It returns 0 if the buffer has been</div><div class='add'>+	queued and non zero values for queue full. If the function accepts</div><div class='add'>+	the buffer it becomes property of the Z8530 layer and the caller</div><div class='add'>+	should not free it.</div><div class='ctx'>   &lt;/para&gt;</div><div class='ctx'>   &lt;para&gt;</div><div class='ctx'> 	The function &lt;function&gt;z8530_get_stats&lt;/function&gt; returns a pointer</div><div class='head'>diff --git a/Documentation/Makefile b/Documentation/Makefile<br/>new file mode 100644<br/>index 000000000000..94b945733534<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+obj-m := DocBook/ accounting/ auxdisplay/ connector/ \</div><div class='add'>+	filesystems/configfs/ ia64/ networking/ \</div><div class='add'>+	pcmcia/ spi/ video4linux/ vm/ watchdog/src/</div><div class='head'>diff --git a/Documentation/accounting/Makefile b/Documentation/accounting/Makefile<br/>new file mode 100644<br/>index 000000000000..31929eb875b1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/accounting/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/accounting/Makefile</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# kbuild trick to avoid linker error. Can be omitted if a module is built.</div><div class='add'>+obj- := dummy.o</div><div class='add'>+</div><div class='add'>+# List of programs to build</div><div class='add'>+hostprogs-y := getdelays</div><div class='add'>+</div><div class='add'>+# Tell kbuild to always build the programs</div><div class='add'>+always := $(hostprogs-y)</div><div class='add'>+</div><div class='add'>+HOSTCFLAGS_getdelays.o += -I$(objtree)/usr/include</div><div class='head'>diff --git a/Documentation/accounting/getdelays.c b/Documentation/accounting/getdelays.c<br/>index 3f7755f3963f..cc49400b4af8 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/accounting/getdelays.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/accounting/getdelays.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/accounting/getdelays.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/accounting/getdelays.c</a></div><div class='hunk'>@@ -201,13 +201,19 @@ void print_delayacct(struct taskstats *t)</div><div class='ctx'> 	       "RECLAIM  %12s%15s\n"</div><div class='ctx'> 	       "      %15llu%15llu\n",</div><div class='ctx'> 	       "count", "real total", "virtual total", "delay total",</div><div class='del'>-	       t-&gt;cpu_count, t-&gt;cpu_run_real_total, t-&gt;cpu_run_virtual_total,</div><div class='del'>-	       t-&gt;cpu_delay_total,</div><div class='add'>+	       (unsigned long long)t-&gt;cpu_count,</div><div class='add'>+	       (unsigned long long)t-&gt;cpu_run_real_total,</div><div class='add'>+	       (unsigned long long)t-&gt;cpu_run_virtual_total,</div><div class='add'>+	       (unsigned long long)t-&gt;cpu_delay_total,</div><div class='ctx'> 	       "count", "delay total",</div><div class='del'>-	       t-&gt;blkio_count, t-&gt;blkio_delay_total,</div><div class='del'>-	       "count", "delay total", t-&gt;swapin_count, t-&gt;swapin_delay_total,</div><div class='add'>+	       (unsigned long long)t-&gt;blkio_count,</div><div class='add'>+	       (unsigned long long)t-&gt;blkio_delay_total,</div><div class='ctx'> 	       "count", "delay total",</div><div class='del'>-	       t-&gt;freepages_count, t-&gt;freepages_delay_total);</div><div class='add'>+	       (unsigned long long)t-&gt;swapin_count,</div><div class='add'>+	       (unsigned long long)t-&gt;swapin_delay_total,</div><div class='add'>+	       "count", "delay total",</div><div class='add'>+	       (unsigned long long)t-&gt;freepages_count,</div><div class='add'>+	       (unsigned long long)t-&gt;freepages_delay_total);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void task_context_switch_counts(struct taskstats *t)</div><div class='hunk'>@@ -215,14 +221,17 @@ void task_context_switch_counts(struct taskstats *t)</div><div class='ctx'> 	printf("\n\nTask   %15s%15s\n"</div><div class='ctx'> 	       "       %15llu%15llu\n",</div><div class='ctx'> 	       "voluntary", "nonvoluntary",</div><div class='del'>-	       t-&gt;nvcsw, t-&gt;nivcsw);</div><div class='add'>+	       (unsigned long long)t-&gt;nvcsw, (unsigned long long)t-&gt;nivcsw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void print_cgroupstats(struct cgroupstats *c)</div><div class='ctx'> {</div><div class='ctx'> 	printf("sleeping %llu, blocked %llu, running %llu, stopped %llu, "</div><div class='del'>-		"uninterruptible %llu\n", c-&gt;nr_sleeping, c-&gt;nr_io_wait,</div><div class='del'>-		c-&gt;nr_running, c-&gt;nr_stopped, c-&gt;nr_uninterruptible);</div><div class='add'>+		"uninterruptible %llu\n", (unsigned long long)c-&gt;nr_sleeping,</div><div class='add'>+		(unsigned long long)c-&gt;nr_io_wait,</div><div class='add'>+		(unsigned long long)c-&gt;nr_running,</div><div class='add'>+		(unsigned long long)c-&gt;nr_stopped,</div><div class='add'>+		(unsigned long long)c-&gt;nr_uninterruptible);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/arm/IXP4xx b/Documentation/arm/IXP4xx<br/>index 43edb4ecf27d..72fbcc4fcab0 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/arm/IXP4xx?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/arm/IXP4xx</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/arm/IXP4xx?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/arm/IXP4xx</a></div><div class='hunk'>@@ -32,7 +32,7 @@ Linux currently supports the following features on the IXP4xx chips:</div><div class='ctx'> - Flash access (MTD/JFFS)</div><div class='ctx'> - I2C through GPIO on IXP42x</div><div class='ctx'> - GPIO for input/output/interrupts </div><div class='del'>-  See include/asm-arm/arch-ixp4xx/platform.h for access functions.</div><div class='add'>+  See arch/arm/mach-ixp4xx/include/mach/platform.h for access functions.</div><div class='ctx'> - Timers (watchdog, OS)</div><div class='ctx'> </div><div class='ctx'> The following components of the chips are not supported by Linux and</div><div class='head'>diff --git a/Documentation/arm/Interrupts b/Documentation/arm/Interrupts<br/>index c202ed35d7d6..f09ab1b90ef1 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/arm/Interrupts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/arm/Interrupts</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/arm/Interrupts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/arm/Interrupts</a></div><div class='hunk'>@@ -158,7 +158,7 @@ So, what's changed?</div><div class='ctx'>    be re-checked for pending events.  (see the Neponset IRQ handler for</div><div class='ctx'>    details).</div><div class='ctx'> </div><div class='del'>-7. fixup_irq() is gone, as is include/asm-arm/arch-*/irq.h</div><div class='add'>+7. fixup_irq() is gone, as is arch/arm/mach-*/include/mach/irq.h</div><div class='ctx'> </div><div class='ctx'> Please note that this will not solve all problems - some of them are</div><div class='ctx'> hardware based.  Mixing level-based and edge-based IRQs on the same</div><div class='head'>diff --git a/Documentation/arm/README b/Documentation/arm/README<br/>index 9b9c8226fdc4..d98783fbe0c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/arm/README?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/arm/README</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/arm/README?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/arm/README</a></div><div class='hunk'>@@ -79,7 +79,7 @@ Machine/Platform support</div><div class='ctx'>   To this end, we now have arch/arm/mach-$(MACHINE) directories which are</div><div class='ctx'>   designed to house the non-driver files for a particular machine (eg, PCI,</div><div class='ctx'>   memory management, architecture definitions etc).  For all future</div><div class='del'>-  machines, there should be a corresponding include/asm-arm/arch-$(MACHINE)</div><div class='add'>+  machines, there should be a corresponding arch/arm/mach-$(MACHINE)/include/mach</div><div class='ctx'>   directory.</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -176,7 +176,7 @@ Kernel entry (head.S)</div><div class='ctx'>   class typically based around one or more system on a chip devices, and</div><div class='ctx'>   acts as a natural container around the actual implementations.  These</div><div class='ctx'>   classes are given directories - arch/arm/mach-&lt;class&gt; and</div><div class='del'>-  include/asm-arm/arch-&lt;class&gt; - which contain the source files to</div><div class='add'>+  arch/arm/mach-&lt;class&gt; - which contain the source files to/include/mach</div><div class='ctx'>   support the machine class.  This directories also contain any machine</div><div class='ctx'>   specific supporting code.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/arm/Samsung-S3C24XX/GPIO.txt b/Documentation/arm/Samsung-S3C24XX/GPIO.txt<br/>index 8caea8c237ee..ea7ccfc4b274 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/arm/Samsung-S3C24XX/GPIO.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/arm/Samsung-S3C24XX/GPIO.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/arm/Samsung-S3C24XX/GPIO.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/arm/Samsung-S3C24XX/GPIO.txt</a></div><div class='hunk'>@@ -13,16 +13,31 @@ Introduction</div><div class='ctx'>   data-sheet/users manual to find out the complete list.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+GPIOLIB</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+  With the event of the GPIOLIB in drivers/gpio, support for some</div><div class='add'>+  of the GPIO functions such as reading and writing a pin will</div><div class='add'>+  be removed in favour of this common access method.</div><div class='add'>+</div><div class='add'>+  Once all the extant drivers have been converted, the functions</div><div class='add'>+  listed below will be removed (they may be marked as __deprecated</div><div class='add'>+  in the near future).</div><div class='add'>+</div><div class='add'>+  - s3c2410_gpio_getpin</div><div class='add'>+  - s3c2410_gpio_setpin</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Headers</div><div class='ctx'> -------</div><div class='ctx'> </div><div class='del'>-  See include/asm-arm/arch-s3c2410/regs-gpio.h for the list</div><div class='add'>+  See arch/arm/mach-s3c2410/include/mach/regs-gpio.h for the list</div><div class='ctx'>   of GPIO pins, and the configuration values for them. This</div><div class='del'>-  is included by using #include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+  is included by using #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'>   The GPIO management functions are defined in the hardware</div><div class='del'>-  header include/asm-arm/arch-s3c2410/hardware.h which can be</div><div class='del'>-  included by #include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+  header arch/arm/mach-s3c2410/include/mach/hardware.h which can be</div><div class='add'>+  included by #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'>   A useful amount of documentation can be found in the hardware</div><div class='ctx'>   header on how the GPIO functions (and others) work.</div><div class='head'>diff --git a/Documentation/arm/Samsung-S3C24XX/Overview.txt b/Documentation/arm/Samsung-S3C24XX/Overview.txt<br/>index d04e1e30c47f..cff6227b4484 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/arm/Samsung-S3C24XX/Overview.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/arm/Samsung-S3C24XX/Overview.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/arm/Samsung-S3C24XX/Overview.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/arm/Samsung-S3C24XX/Overview.txt</a></div><div class='hunk'>@@ -8,9 +8,10 @@ Introduction</div><div class='ctx'> </div><div class='ctx'>   The Samsung S3C24XX range of ARM9 System-on-Chip CPUs are supported</div><div class='ctx'>   by the 's3c2410' architecture of ARM Linux. Currently the S3C2410,</div><div class='del'>-  S3C2412, S3C2413, S3C2440 and S3C2442 devices are supported.</div><div class='add'>+  S3C2412, S3C2413, S3C2440, S3C2442 and S3C2443 devices are supported.</div><div class='add'>+</div><div class='add'>+  Support for the S3C2400 and S3C24A0 series are in progress.</div><div class='ctx'> </div><div class='del'>-  Support for the S3C2400 series is in progress.</div><div class='ctx'> </div><div class='ctx'> Configuration</div><div class='ctx'> -------------</div><div class='hunk'>@@ -36,7 +37,23 @@ Layout</div><div class='ctx'>   in arch/arm/mach-s3c2410 and S3C2440 in arch/arm/mach-s3c2440</div><div class='ctx'> </div><div class='ctx'>   Register, kernel and platform data definitions are held in the</div><div class='del'>-  include/asm-arm/arch-s3c2410 directory.</div><div class='add'>+  arch/arm/mach-s3c2410 directory./include/mach</div><div class='add'>+</div><div class='add'>+arch/arm/plat-s3c24xx:</div><div class='add'>+</div><div class='add'>+  Files in here are either common to all the s3c24xx family,</div><div class='add'>+  or are common to only some of them with names to indicate this</div><div class='add'>+  status. The files that are not common to all are generally named</div><div class='add'>+  with the initial cpu they support in the series to ensure a short</div><div class='add'>+  name without any possibility of confusion with newer devices.</div><div class='add'>+</div><div class='add'>+  As an example, initially s3c244x would cover s3c2440 and s3c2442, but</div><div class='add'>+  with the s3c2443 which does not share many of the same drivers in</div><div class='add'>+  this directory, the name becomes invalid. We stick to s3c2440-&lt;x&gt;</div><div class='add'>+  to indicate a driver that is s3c2440 and s3c2442 compatible.</div><div class='add'>+</div><div class='add'>+  This does mean that to find the status of any given SoC, a number</div><div class='add'>+  of directories may need to be searched.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Machines</div><div class='hunk'>@@ -159,6 +176,17 @@ NAND</div><div class='ctx'>   For more information see Documentation/arm/Samsung-S3C24XX/NAND.txt</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+SD/MMC</div><div class='add'>+------</div><div class='add'>+</div><div class='add'>+  The SD/MMC hardware pre S3C2443 is supported in the current</div><div class='add'>+  kernel, the driver is drivers/mmc/host/s3cmci.c and supports</div><div class='add'>+  1 and 4 bit SD or MMC cards.</div><div class='add'>+</div><div class='add'>+  The SDIO behaviour of this driver has not been fully tested. There is no</div><div class='add'>+  current support for hardware SDIO interrupts.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Serial</div><div class='ctx'> ------</div><div class='ctx'> </div><div class='hunk'>@@ -178,6 +206,9 @@ GPIO</div><div class='ctx'>   The core contains support for manipulating the GPIO, see the</div><div class='ctx'>   documentation in GPIO.txt in the same directory as this file.</div><div class='ctx'> </div><div class='add'>+  Newer kernels carry GPIOLIB, and support is being moved towards</div><div class='add'>+  this with some of the older support in line to be removed.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Clock Management</div><div class='ctx'> ----------------</div><div class='head'>diff --git a/Documentation/arm/Samsung-S3C24XX/USB-Host.txt b/Documentation/arm/Samsung-S3C24XX/USB-Host.txt<br/>index b93b68e2b143..67671eba4231 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/arm/Samsung-S3C24XX/USB-Host.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/arm/Samsung-S3C24XX/USB-Host.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/arm/Samsung-S3C24XX/USB-Host.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/arm/Samsung-S3C24XX/USB-Host.txt</a></div><div class='hunk'>@@ -49,7 +49,7 @@ Board Support</div><div class='ctx'> Platform Data</div><div class='ctx'> -------------</div><div class='ctx'> </div><div class='del'>-  See linux/include/asm-arm/arch-s3c2410/usb-control.h for the</div><div class='add'>+  See arch/arm/mach-s3c2410/include/mach/usb-control.h for the</div><div class='ctx'>   descriptions of the platform device data. An implementation</div><div class='ctx'>   can be found in linux/arch/arm/mach-s3c2410/usb-simtec.c .</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/auxdisplay/Makefile b/Documentation/auxdisplay/Makefile<br/>new file mode 100644<br/>index 000000000000..51fe23332c81<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/auxdisplay/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/auxdisplay/Makefile</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# kbuild trick to avoid linker error. Can be omitted if a module is built.</div><div class='add'>+obj- := dummy.o</div><div class='add'>+</div><div class='add'>+# List of programs to build</div><div class='add'>+hostprogs-y := cfag12864b-example</div><div class='add'>+</div><div class='add'>+# Tell kbuild to always build the programs</div><div class='add'>+always := $(hostprogs-y)</div><div class='add'>+</div><div class='add'>+HOSTCFLAGS_cfag12864b-example.o += -I$(objtree)/usr/include</div><div class='head'>diff --git a/Documentation/cciss.txt b/Documentation/cciss.txt<br/>index 63e59b8847c5..8244c6442faa 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/cciss.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/cciss.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/cciss.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/cciss.txt</a></div><div class='hunk'>@@ -112,27 +112,18 @@ Hot plug support for SCSI tape drives</div><div class='ctx'> </div><div class='ctx'> Hot plugging of SCSI tape drives is supported, with some caveats.</div><div class='ctx'> The cciss driver must be informed that changes to the SCSI bus</div><div class='del'>-have been made, in addition to and prior to informing the SCSI </div><div class='del'>-mid layer.  This may be done via the /proc filesystem.  For example:</div><div class='add'>+have been made.  This may be done via the /proc filesystem.</div><div class='add'>+For example:</div><div class='ctx'> </div><div class='ctx'> 	echo "rescan" &gt; /proc/scsi/cciss0/1</div><div class='ctx'> </div><div class='del'>-This causes the adapter to query the adapter about changes to the </div><div class='del'>-physical SCSI buses and/or fibre channel arbitrated loop and the </div><div class='add'>+This causes the driver to query the adapter about changes to the</div><div class='add'>+physical SCSI buses and/or fibre channel arbitrated loop and the</div><div class='ctx'> driver to make note of any new or removed sequential access devices</div><div class='ctx'> or medium changers.  The driver will output messages indicating what </div><div class='ctx'> devices have been added or removed and the controller, bus, target and </div><div class='del'>-lun used to address the device.  Once this is done, the SCSI mid layer </div><div class='del'>-can be informed of changes to the virtual SCSI bus which the driver </div><div class='del'>-presents to it in the usual way. For example: </div><div class='del'>-</div><div class='del'>-	echo scsi add-single-device 3 2 1 0 &gt; /proc/scsi/scsi</div><div class='del'>- </div><div class='del'>-to add a device on controller 3, bus 2, target 1, lun 0.   Note that</div><div class='del'>-the driver makes an effort to preserve the devices positions</div><div class='del'>-in the virtual SCSI bus, so if you are only moving tape drives </div><div class='del'>-around on the same adapter and not adding or removing tape drives </div><div class='del'>-from the adapter, informing the SCSI mid layer may not be necessary.</div><div class='add'>+lun used to address the device.  It then notifies the SCSI mid layer</div><div class='add'>+of these changes.</div><div class='ctx'> </div><div class='ctx'> Note that the naming convention of the /proc filesystem entries </div><div class='ctx'> contains a number in addition to the driver name.  (E.g. "cciss0" </div><div class='head'>diff --git a/Documentation/cli-sti-removal.txt b/Documentation/cli-sti-removal.txt<br/>deleted file mode 100644<br/>index 60932b02fcb3..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/cli-sti-removal.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/cli-sti-removal.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,133 +0,0 @@</div><div class='del'>-</div><div class='del'>-#### cli()/sti() removal guide, started by Ingo Molnar &lt;mingo@redhat.com&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-as of 2.5.28, five popular macros have been removed on SMP, and</div><div class='del'>-are being phased out on UP:</div><div class='del'>-</div><div class='del'>- cli(), sti(), save_flags(flags), save_flags_cli(flags), restore_flags(flags)</div><div class='del'>-</div><div class='del'>-until now it was possible to protect driver code against interrupt</div><div class='del'>-handlers via a cli(), but from now on other, more lightweight methods</div><div class='del'>-have to be used for synchronization, such as spinlocks or semaphores.</div><div class='del'>-</div><div class='del'>-for example, driver code that used to do something like:</div><div class='del'>-</div><div class='del'>-	struct driver_data;</div><div class='del'>-</div><div class='del'>-	irq_handler (...)</div><div class='del'>-	{</div><div class='del'>-		....</div><div class='del'>-		driver_data.finish = 1;</div><div class='del'>-		driver_data.new_work = 0;</div><div class='del'>-		....</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	...</div><div class='del'>-</div><div class='del'>-	ioctl_func (...)</div><div class='del'>-	{</div><div class='del'>-		...</div><div class='del'>-		cli();</div><div class='del'>-		...</div><div class='del'>-		driver_data.finish = 0;</div><div class='del'>-		driver_data.new_work = 2;</div><div class='del'>-		...</div><div class='del'>-		sti();</div><div class='del'>-		...</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-was SMP-correct because the cli() function ensured that no</div><div class='del'>-interrupt handler (amongst them the above irq_handler()) function</div><div class='del'>-would execute while the cli()-ed section is executing.</div><div class='del'>-</div><div class='del'>-but from now on a more direct method of locking has to be used:</div><div class='del'>-</div><div class='del'>-	DEFINE_SPINLOCK(driver_lock);</div><div class='del'>-	struct driver_data;</div><div class='del'>-</div><div class='del'>-	irq_handler (...)</div><div class='del'>-	{</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		....</div><div class='del'>-		spin_lock_irqsave(&amp;driver_lock, flags);</div><div class='del'>-		....</div><div class='del'>-		driver_data.finish = 1;</div><div class='del'>-		driver_data.new_work = 0;</div><div class='del'>-		....</div><div class='del'>-		spin_unlock_irqrestore(&amp;driver_lock, flags);</div><div class='del'>-		....</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	...</div><div class='del'>-</div><div class='del'>-	ioctl_func (...)</div><div class='del'>-	{</div><div class='del'>-		...</div><div class='del'>-		spin_lock_irq(&amp;driver_lock);</div><div class='del'>-		...</div><div class='del'>-		driver_data.finish = 0;</div><div class='del'>-		driver_data.new_work = 2;</div><div class='del'>-		...</div><div class='del'>-		spin_unlock_irq(&amp;driver_lock);</div><div class='del'>-		...</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-the above code has a number of advantages:</div><div class='del'>-</div><div class='del'>-- the locking relation is easier to understand - actual lock usage</div><div class='del'>-  pinpoints the critical sections. cli() usage is too opaque.</div><div class='del'>-  Easier to understand means it's easier to debug.</div><div class='del'>-</div><div class='del'>-- it's faster, because spinlocks are faster to acquire than the</div><div class='del'>-  potentially heavily-used IRQ lock. Furthermore, your driver does</div><div class='del'>-  not have to wait eg. for a big heavy SCSI interrupt to finish,</div><div class='del'>-  because the driver_lock spinlock is only used by your driver.</div><div class='del'>-  cli() on the other hand was used by many drivers, and extended</div><div class='del'>-  the critical section to the whole IRQ handler function - creating</div><div class='del'>-  serious lock contention.</div><div class='del'>-</div><div class='del'>- </div><div class='del'>-to make the transition easier, we've still kept the cli(), sti(),</div><div class='del'>-save_flags(), save_flags_cli() and restore_flags() macros defined</div><div class='del'>-on UP systems - but their usage will be phased out until 2.6 is</div><div class='del'>-released.</div><div class='del'>-</div><div class='del'>-drivers that want to disable local interrupts (interrupts on the</div><div class='del'>-current CPU), can use the following five macros:</div><div class='del'>-</div><div class='del'>-  local_irq_disable(), local_irq_enable(), local_save_flags(flags),</div><div class='del'>-  local_irq_save(flags), local_irq_restore(flags)</div><div class='del'>-</div><div class='del'>-but beware, their meaning and semantics are much simpler, far from</div><div class='del'>-that of the old cli(), sti(), save_flags(flags) and restore_flags(flags)</div><div class='del'>-SMP meaning:</div><div class='del'>-</div><div class='del'>-    local_irq_disable()       =&gt; turn local IRQs off</div><div class='del'>-</div><div class='del'>-    local_irq_enable()        =&gt; turn local IRQs on</div><div class='del'>-</div><div class='del'>-    local_save_flags(flags)   =&gt; save the current IRQ state into flags. The</div><div class='del'>-                                 state can be on or off. (on some</div><div class='del'>-                                 architectures there's even more bits in it.)</div><div class='del'>-</div><div class='del'>-    local_irq_save(flags)     =&gt; save the current IRQ state into flags and</div><div class='del'>-                                 disable interrupts.</div><div class='del'>-</div><div class='del'>-    local_irq_restore(flags)  =&gt; restore the IRQ state from flags.</div><div class='del'>-</div><div class='del'>-(local_irq_save can save both irqs on and irqs off state, and</div><div class='del'>-local_irq_restore can restore into both irqs on and irqs off state.)</div><div class='del'>-</div><div class='del'>-another related change is that synchronize_irq() now takes a parameter:</div><div class='del'>-synchronize_irq(irq). This change too has the purpose of making SMP</div><div class='del'>-synchronization more lightweight - this way you can wait for your own</div><div class='del'>-interrupt handler to finish, no need to wait for other IRQ sources.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-why were these changes done? The main reason was the architectural burden</div><div class='del'>-of maintaining the cli()/sti() interface - it became a real problem. The</div><div class='del'>-new interrupt system is much more streamlined, easier to understand, debug,</div><div class='del'>-and it's also a bit faster - the same happened to it that will happen to</div><div class='del'>-cli()/sti() using drivers once they convert to spinlocks :-)</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/connector/Makefile b/Documentation/connector/Makefile<br/>new file mode 100644<br/>index 000000000000..8df1a7285a06<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/connector/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/connector/Makefile</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+ifneq ($(CONFIG_CONNECTOR),)</div><div class='add'>+obj-m += cn_test.o</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+# List of programs to build</div><div class='add'>+hostprogs-y := ucon</div><div class='add'>+</div><div class='add'>+# Tell kbuild to always build the programs</div><div class='add'>+always := $(hostprogs-y)</div><div class='add'>+</div><div class='add'>+HOSTCFLAGS_ucon.o += -I$(objtree)/usr/include</div><div class='head'>diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt<br/>index ba0aacde94fb..94bbc27ddd4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/cpu-hotplug.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/cpu-hotplug.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/cpu-hotplug.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/cpu-hotplug.txt</a></div><div class='hunk'>@@ -59,15 +59,10 @@ apicid values in those tables for disabled apics. In the event BIOS doesn't</div><div class='ctx'> mark such hot-pluggable cpus as disabled entries, one could use this</div><div class='ctx'> parameter "additional_cpus=x" to represent those cpus in the cpu_possible_map.</div><div class='ctx'> </div><div class='del'>-s390 uses the number of cpus it detects at IPL time to also the number of bits</div><div class='del'>-in cpu_possible_map. If it is desired to add additional cpus at a later time</div><div class='del'>-the number should be specified using this option or the possible_cpus option.</div><div class='del'>-</div><div class='ctx'> possible_cpus=n		[s390 only] use this to set hotpluggable cpus.</div><div class='ctx'> 			This option sets possible_cpus bits in</div><div class='ctx'> 			cpu_possible_map. Thus keeping the numbers of bits set</div><div class='ctx'> 			constant even if the machine gets rebooted.</div><div class='del'>-			This option overrides additional_cpus.</div><div class='ctx'> </div><div class='ctx'> CPU maps and such</div><div class='ctx'> -----------------</div><div class='head'>diff --git a/Documentation/cpusets.txt b/Documentation/cpusets.txt<br/>index 1f5a924d1e56..47e568a9370a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/cpusets.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/cpusets.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/cpusets.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/cpusets.txt</a></div><div class='hunk'>@@ -635,14 +635,16 @@ prior 'mems' setting, will not be moved.</div><div class='ctx'> </div><div class='ctx'> There is an exception to the above.  If hotplug functionality is used</div><div class='ctx'> to remove all the CPUs that are currently assigned to a cpuset,</div><div class='del'>-then the kernel will automatically update the cpus_allowed of all</div><div class='del'>-tasks attached to CPUs in that cpuset to allow all CPUs.  When memory</div><div class='del'>-hotplug functionality for removing Memory Nodes is available, a</div><div class='del'>-similar exception is expected to apply there as well.  In general,</div><div class='del'>-the kernel prefers to violate cpuset placement, over starving a task</div><div class='del'>-that has had all its allowed CPUs or Memory Nodes taken offline.  User</div><div class='del'>-code should reconfigure cpusets to only refer to online CPUs and Memory</div><div class='del'>-Nodes when using hotplug to add or remove such resources.</div><div class='add'>+then all the tasks in that cpuset will be moved to the nearest ancestor</div><div class='add'>+with non-empty cpus.  But the moving of some (or all) tasks might fail if</div><div class='add'>+cpuset is bound with another cgroup subsystem which has some restrictions</div><div class='add'>+on task attaching.  In this failing case, those tasks will stay</div><div class='add'>+in the original cpuset, and the kernel will automatically update</div><div class='add'>+their cpus_allowed to allow all online CPUs.  When memory hotplug</div><div class='add'>+functionality for removing Memory Nodes is available, a similar exception</div><div class='add'>+is expected to apply there as well.  In general, the kernel prefers to</div><div class='add'>+violate cpuset placement, over starving a task that has had all</div><div class='add'>+its allowed CPUs or Memory Nodes taken offline.</div><div class='ctx'> </div><div class='ctx'> There is a second exception to the above.  GFP_ATOMIC requests are</div><div class='ctx'> kernel internal allocations that must be satisfied, immediately.</div><div class='head'>diff --git a/Documentation/devices.txt b/Documentation/devices.txt<br/>index e6244cde26e9..05c80645e4ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/devices.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/devices.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devices.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/devices.txt</a></div><div class='hunk'>@@ -2560,9 +2560,6 @@ Your cooperation is appreciated.</div><div class='ctx'> 		 96 = /dev/usb/hiddev0	1st USB HID device</div><div class='ctx'> 		    ...</div><div class='ctx'> 		111 = /dev/usb/hiddev15	16th USB HID device</div><div class='del'>-		112 = /dev/usb/auer0	1st auerswald ISDN device</div><div class='del'>-		    ...</div><div class='del'>-		127 = /dev/usb/auer15	16th auerswald ISDN device</div><div class='ctx'> 		128 = /dev/usb/brlvgr0	First Braille Voyager device</div><div class='ctx'> 		    ...</div><div class='ctx'> 		131 = /dev/usb/brlvgr3	Fourth Braille Voyager device</div><div class='head'>diff --git a/Documentation/dontdiff b/Documentation/dontdiff<br/>index 881e6dd03aea..27809357da58 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/dontdiff?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/dontdiff</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/dontdiff?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/dontdiff</a></div><div class='hunk'>@@ -5,6 +5,8 @@</div><div class='ctx'> *.css</div><div class='ctx'> *.dvi</div><div class='ctx'> *.eps</div><div class='add'>+*.fw.gen.S</div><div class='add'>+*.fw</div><div class='ctx'> *.gif</div><div class='ctx'> *.grep</div><div class='ctx'> *.grp</div><div class='head'>diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt<br/>index c23955404bf5..83c88cae1eda 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/feature-removal-schedule.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/feature-removal-schedule.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/feature-removal-schedule.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/feature-removal-schedule.txt</a></div><div class='hunk'>@@ -19,15 +19,6 @@ Who:	Pavel Machek &lt;pavel@suse.cz&gt;</div><div class='ctx'> </div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='del'>-What:	old NCR53C9x driver</div><div class='del'>-When:	October 2007</div><div class='del'>-Why:	Replaced by the much better esp_scsi driver.  Actual low-level</div><div class='del'>-	driver can be ported over almost trivially.</div><div class='del'>-Who:	David Miller &lt;davem@davemloft.net&gt;</div><div class='del'>-	Christoph Hellwig &lt;hch@lst.de&gt;</div><div class='del'>-</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='ctx'> What:	Video4Linux API 1 ioctls and video_decoder.h from Video devices.</div><div class='ctx'> When:	December 2008</div><div class='ctx'> Files:	include/linux/video_decoder.h include/linux/videodev.h</div><div class='hunk'>@@ -205,19 +196,6 @@ Who:  Tejun Heo &lt;htejun@gmail.com&gt;</div><div class='ctx'> </div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='del'>-What: The arch/ppc and include/asm-ppc directories</div><div class='del'>-When: Jun 2008</div><div class='del'>-Why:  The arch/powerpc tree is the merged architecture for ppc32 and ppc64</div><div class='del'>-      platforms.  Currently there are efforts underway to port the remaining</div><div class='del'>-      arch/ppc platforms to the merged tree.  New submissions to the arch/ppc</div><div class='del'>-      tree have been frozen with the 2.6.22 kernel release and that tree will</div><div class='del'>-      remain in bug-fix only mode until its scheduled removal.  Platforms</div><div class='del'>-      that are not ported by June 2008 will be removed due to the lack of an</div><div class='del'>-      interested maintainer.</div><div class='del'>-Who:  linuxppc-dev@ozlabs.org</div><div class='del'>-</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='ctx'> What:	i386/x86_64 bzImage symlinks</div><div class='ctx'> When:	April 2010</div><div class='ctx'> </div><div class='hunk'>@@ -344,3 +322,11 @@ Why:  Accounting can now be enabled/disabled without kernel recompilation.</div><div class='ctx'>       controlled by a kernel/module/sysfs/sysctl parameter.</div><div class='ctx'> Who:  Krzysztof Piotr Oledzki &lt;ole@ans.pl&gt;</div><div class='ctx'> </div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+What: ide-scsi (BLK_DEV_IDESCSI)</div><div class='add'>+When: 2.6.29</div><div class='add'>+Why:  The 2.6 kernel supports direct writing to ide CD drives, which</div><div class='add'>+      eliminates the need for ide-scsi. The new method is more</div><div class='add'>+      efficient in every way.</div><div class='add'>+Who:  FUJITA Tomonori &lt;fujita.tomonori@lab.ntt.co.jp&gt;</div><div class='head'>diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking<br/>index 680fb566b928..8362860e21a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/Locking?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/filesystems/Locking</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/Locking?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/Locking</a></div><div class='hunk'>@@ -144,8 +144,8 @@ prototypes:</div><div class='ctx'> 	void (*kill_sb) (struct super_block *);</div><div class='ctx'> locking rules:</div><div class='ctx'> 		may block	BKL</div><div class='del'>-get_sb		yes		yes</div><div class='del'>-kill_sb		yes		yes</div><div class='add'>+get_sb		yes		no</div><div class='add'>+kill_sb		yes		no</div><div class='ctx'> </div><div class='ctx'> -&gt;get_sb() returns error or 0 with locked superblock attached to the vfsmount</div><div class='ctx'> (exclusive on -&gt;s_umount).</div><div class='hunk'>@@ -409,12 +409,12 @@ ioctl:			yes	(see below)</div><div class='ctx'> unlocked_ioctl:		no	(see below)</div><div class='ctx'> compat_ioctl:		no</div><div class='ctx'> mmap:			no</div><div class='del'>-open:			maybe	(see below)</div><div class='add'>+open:			no</div><div class='ctx'> flush:			no</div><div class='ctx'> release:		no</div><div class='ctx'> fsync:			no	(see below)</div><div class='ctx'> aio_fsync:		no</div><div class='del'>-fasync:			yes	(see below)</div><div class='add'>+fasync:			no</div><div class='ctx'> lock:			yes</div><div class='ctx'> readv:			no</div><div class='ctx'> writev:			no</div><div class='hunk'>@@ -431,13 +431,6 @@ For many filesystems, it is probably safe to acquire the inode</div><div class='ctx'> semaphore.  Note some filesystems (i.e. remote ones) provide no</div><div class='ctx'> protection for i_size so you will need to use the BKL.</div><div class='ctx'> </div><div class='del'>--&gt;open() locking is in-transit: big lock partially moved into the methods.</div><div class='del'>-The only exception is -&gt;open() in the instances of file_operations that never</div><div class='del'>-end up in -&gt;i_fop/-&gt;proc_fops, i.e. ones that belong to character devices</div><div class='del'>-(chrdev_open() takes lock before replacing -&gt;f_op and calling the secondary</div><div class='del'>-method. As soon as we fix the handling of module reference counters all</div><div class='del'>-instances of -&gt;open() will be called without the BKL.</div><div class='del'>-</div><div class='ctx'> Note: ext2_release() was *the* source of contention on fs-intensive</div><div class='ctx'> loads and dropping BKL on -&gt;release() helps to get rid of that (we still</div><div class='ctx'> grab BKL for cases when we close a file that had been opened r/w, but that</div><div class='head'>diff --git a/Documentation/filesystems/configfs/Makefile b/Documentation/filesystems/configfs/Makefile<br/>new file mode 100644<br/>index 000000000000..be7ec5e67dbc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/configfs/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/configfs/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+ifneq ($(CONFIG_CONFIGFS_FS),)</div><div class='add'>+obj-m += configfs_example_explicit.o configfs_example_macros.o</div><div class='add'>+endif</div><div class='head'>diff --git a/Documentation/filesystems/configfs/configfs.txt b/Documentation/filesystems/configfs/configfs.txt<br/>index 44c97e6accb2..fabcb0e00f25 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/configfs/configfs.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/filesystems/configfs/configfs.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/configfs/configfs.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/configfs/configfs.txt</a></div><div class='hunk'>@@ -311,9 +311,20 @@ the subsystem must be ready for it.</div><div class='ctx'> [An Example]</div><div class='ctx'> </div><div class='ctx'> The best example of these basic concepts is the simple_children</div><div class='del'>-subsystem/group and the simple_child item in configfs_example.c  It</div><div class='del'>-shows a trivial object displaying and storing an attribute, and a simple</div><div class='del'>-group creating and destroying these children.</div><div class='add'>+subsystem/group and the simple_child item in configfs_example_explicit.c</div><div class='add'>+and configfs_example_macros.c.  It shows a trivial object displaying and</div><div class='add'>+storing an attribute, and a simple group creating and destroying these</div><div class='add'>+children.</div><div class='add'>+</div><div class='add'>+The only difference between configfs_example_explicit.c and</div><div class='add'>+configfs_example_macros.c is how the attributes of the childless item</div><div class='add'>+are defined.  The childless item has extended attributes, each with</div><div class='add'>+their own show()/store() operation.  This follows a convention commonly</div><div class='add'>+used in sysfs.  configfs_example_explicit.c creates these attributes</div><div class='add'>+by explicitly defining the structures involved.  Conversely</div><div class='add'>+configfs_example_macros.c uses some convenience macros from configfs.h</div><div class='add'>+to define the attributes.  These macros are similar to their sysfs</div><div class='add'>+counterparts.</div><div class='ctx'> </div><div class='ctx'> [Hierarchy Navigation and the Subsystem Mutex]</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/filesystems/configfs/configfs_example.c b/Documentation/filesystems/configfs/configfs_example_explicit.c<br/>index 039648791701..d428cc9f07f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/configfs/configfs_example.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/filesystems/configfs/configfs_example.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/configfs/configfs_example_explicit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/configfs/configfs_example_explicit.c</a></div><div class='hunk'>@@ -1,8 +1,10 @@</div><div class='ctx'> /*</div><div class='ctx'>  * vim: noexpandtab ts=8 sts=0 sw=8:</div><div class='ctx'>  *</div><div class='del'>- * configfs_example.c - This file is a demonstration module containing</div><div class='del'>- *      a number of configfs subsystems.</div><div class='add'>+ * configfs_example_explicit.c - This file is a demonstration module</div><div class='add'>+ *      containing a number of configfs subsystems.  It explicitly defines</div><div class='add'>+ *      each structure without using the helper macros defined in</div><div class='add'>+ *      configfs.h.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or</div><div class='ctx'>  * modify it under the terms of the GNU General Public</div><div class='hunk'>@@ -281,7 +283,6 @@ static struct config_item *simple_children_make_item(struct config_group *group,</div><div class='ctx'> 	if (!simple_child)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	config_item_init_type_name(&amp;simple_child-&gt;item, name,</div><div class='ctx'> 				   &amp;simple_child_type);</div><div class='ctx'> </div><div class='hunk'>@@ -302,8 +303,8 @@ static struct configfs_attribute *simple_children_attrs[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static ssize_t simple_children_attr_show(struct config_item *item,</div><div class='del'>-			   		 struct configfs_attribute *attr,</div><div class='del'>-			   		 char *page)</div><div class='add'>+					 struct configfs_attribute *attr,</div><div class='add'>+					 char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(page,</div><div class='ctx'> "[02-simple-children]\n"</div><div class='hunk'>@@ -318,7 +319,7 @@ static void simple_children_release(struct config_item *item)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct configfs_item_operations simple_children_item_ops = {</div><div class='del'>-	.release 	= simple_children_release,</div><div class='add'>+	.release	= simple_children_release,</div><div class='ctx'> 	.show_attribute	= simple_children_attr_show,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -368,7 +369,6 @@ static struct config_group *group_children_make_group(struct config_group *group</div><div class='ctx'> 	if (!simple_children)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	config_group_init_type_name(&amp;simple_children-&gt;group, name,</div><div class='ctx'> 				    &amp;simple_children_type);</div><div class='ctx'> </div><div class='hunk'>@@ -387,8 +387,8 @@ static struct configfs_attribute *group_children_attrs[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static ssize_t group_children_attr_show(struct config_item *item,</div><div class='del'>-			   		struct configfs_attribute *attr,</div><div class='del'>-			   		char *page)</div><div class='add'>+					struct configfs_attribute *attr,</div><div class='add'>+					char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(page,</div><div class='ctx'> "[03-group-children]\n"</div><div class='head'>diff --git a/Documentation/filesystems/configfs/configfs_example_macros.c b/Documentation/filesystems/configfs/configfs_example_macros.c<br/>new file mode 100644<br/>index 000000000000..d8e30a0378aa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/configfs/configfs_example_macros.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/configfs/configfs_example_macros.c</a></div><div class='hunk'>@@ -0,0 +1,448 @@</div><div class='add'>+/*</div><div class='add'>+ * vim: noexpandtab ts=8 sts=0 sw=8:</div><div class='add'>+ *</div><div class='add'>+ * configfs_example_macros.c - This file is a demonstration module</div><div class='add'>+ *      containing a number of configfs subsystems.  It uses the helper</div><div class='add'>+ *      macros defined by configfs.h</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License as published by the Free Software Foundation; either</div><div class='add'>+ * version 2 of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public</div><div class='add'>+ * License along with this program; if not, write to the</div><div class='add'>+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='add'>+ * Boston, MA 021110-1307, USA.</div><div class='add'>+ *</div><div class='add'>+ * Based on sysfs:</div><div class='add'>+ * 	sysfs is Copyright (C) 2001, 2002, 2003 Patrick Mochel</div><div class='add'>+ *</div><div class='add'>+ * configfs Copyright (C) 2005 Oracle.  All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/configfs.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 01-childless</div><div class='add'>+ *</div><div class='add'>+ * This first example is a childless subsystem.  It cannot create</div><div class='add'>+ * any config_items.  It just has attributes.</div><div class='add'>+ *</div><div class='add'>+ * Note that we are enclosing the configfs_subsystem inside a container.</div><div class='add'>+ * This is not necessary if a subsystem has no attributes directly</div><div class='add'>+ * on the subsystem.  See the next example, 02-simple-children, for</div><div class='add'>+ * such a subsystem.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct childless {</div><div class='add'>+	struct configfs_subsystem subsys;</div><div class='add'>+	int showme;</div><div class='add'>+	int storeme;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct childless *to_childless(struct config_item *item)</div><div class='add'>+{</div><div class='add'>+	return item ? container_of(to_configfs_subsystem(to_config_group(item)), struct childless, subsys) : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+CONFIGFS_ATTR_STRUCT(childless);</div><div class='add'>+#define CHILDLESS_ATTR(_name, _mode, _show, _store)	\</div><div class='add'>+struct childless_attribute childless_attr_##_name = __CONFIGFS_ATTR(_name, _mode, _show, _store)</div><div class='add'>+#define CHILDLESS_ATTR_RO(_name, _show)	\</div><div class='add'>+struct childless_attribute childless_attr_##_name = __CONFIGFS_ATTR_RO(_name, _show);</div><div class='add'>+</div><div class='add'>+static ssize_t childless_showme_read(struct childless *childless,</div><div class='add'>+				     char *page)</div><div class='add'>+{</div><div class='add'>+	ssize_t pos;</div><div class='add'>+</div><div class='add'>+	pos = sprintf(page, "%d\n", childless-&gt;showme);</div><div class='add'>+	childless-&gt;showme++;</div><div class='add'>+</div><div class='add'>+	return pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t childless_storeme_read(struct childless *childless,</div><div class='add'>+				      char *page)</div><div class='add'>+{</div><div class='add'>+	return sprintf(page, "%d\n", childless-&gt;storeme);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t childless_storeme_write(struct childless *childless,</div><div class='add'>+				       const char *page,</div><div class='add'>+				       size_t count)</div><div class='add'>+{</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+	char *p = (char *) page;</div><div class='add'>+</div><div class='add'>+	tmp = simple_strtoul(p, &amp;p, 10);</div><div class='add'>+	if (!p || (*p &amp;&amp; (*p != '\n')))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (tmp &gt; INT_MAX)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	childless-&gt;storeme = tmp;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t childless_description_read(struct childless *childless,</div><div class='add'>+					  char *page)</div><div class='add'>+{</div><div class='add'>+	return sprintf(page,</div><div class='add'>+"[01-childless]\n"</div><div class='add'>+"\n"</div><div class='add'>+"The childless subsystem is the simplest possible subsystem in\n"</div><div class='add'>+"configfs.  It does not support the creation of child config_items.\n"</div><div class='add'>+"It only has a few attributes.  In fact, it isn't much different\n"</div><div class='add'>+"than a directory in /proc.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+CHILDLESS_ATTR_RO(showme, childless_showme_read);</div><div class='add'>+CHILDLESS_ATTR(storeme, S_IRUGO | S_IWUSR, childless_storeme_read,</div><div class='add'>+	       childless_storeme_write);</div><div class='add'>+CHILDLESS_ATTR_RO(description, childless_description_read);</div><div class='add'>+</div><div class='add'>+static struct configfs_attribute *childless_attrs[] = {</div><div class='add'>+	&amp;childless_attr_showme.attr,</div><div class='add'>+	&amp;childless_attr_storeme.attr,</div><div class='add'>+	&amp;childless_attr_description.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+CONFIGFS_ATTR_OPS(childless);</div><div class='add'>+static struct configfs_item_operations childless_item_ops = {</div><div class='add'>+	.show_attribute		= childless_attr_show,</div><div class='add'>+	.store_attribute	= childless_attr_store,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct config_item_type childless_type = {</div><div class='add'>+	.ct_item_ops	= &amp;childless_item_ops,</div><div class='add'>+	.ct_attrs	= childless_attrs,</div><div class='add'>+	.ct_owner	= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct childless childless_subsys = {</div><div class='add'>+	.subsys = {</div><div class='add'>+		.su_group = {</div><div class='add'>+			.cg_item = {</div><div class='add'>+				.ci_namebuf = "01-childless",</div><div class='add'>+				.ci_type = &amp;childless_type,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* ----------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 02-simple-children</div><div class='add'>+ *</div><div class='add'>+ * This example merely has a simple one-attribute child.  Note that</div><div class='add'>+ * there is no extra attribute structure, as the child's attribute is</div><div class='add'>+ * known from the get-go.  Also, there is no container for the</div><div class='add'>+ * subsystem, as it has no attributes of its own.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct simple_child {</div><div class='add'>+	struct config_item item;</div><div class='add'>+	int storeme;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct simple_child *to_simple_child(struct config_item *item)</div><div class='add'>+{</div><div class='add'>+	return item ? container_of(item, struct simple_child, item) : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct configfs_attribute simple_child_attr_storeme = {</div><div class='add'>+	.ca_owner = THIS_MODULE,</div><div class='add'>+	.ca_name = "storeme",</div><div class='add'>+	.ca_mode = S_IRUGO | S_IWUSR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct configfs_attribute *simple_child_attrs[] = {</div><div class='add'>+	&amp;simple_child_attr_storeme,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t simple_child_attr_show(struct config_item *item,</div><div class='add'>+				      struct configfs_attribute *attr,</div><div class='add'>+				      char *page)</div><div class='add'>+{</div><div class='add'>+	ssize_t count;</div><div class='add'>+	struct simple_child *simple_child = to_simple_child(item);</div><div class='add'>+</div><div class='add'>+	count = sprintf(page, "%d\n", simple_child-&gt;storeme);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t simple_child_attr_store(struct config_item *item,</div><div class='add'>+				       struct configfs_attribute *attr,</div><div class='add'>+				       const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct simple_child *simple_child = to_simple_child(item);</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+	char *p = (char *) page;</div><div class='add'>+</div><div class='add'>+	tmp = simple_strtoul(p, &amp;p, 10);</div><div class='add'>+	if (!p || (*p &amp;&amp; (*p != '\n')))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (tmp &gt; INT_MAX)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	simple_child-&gt;storeme = tmp;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void simple_child_release(struct config_item *item)</div><div class='add'>+{</div><div class='add'>+	kfree(to_simple_child(item));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct configfs_item_operations simple_child_item_ops = {</div><div class='add'>+	.release		= simple_child_release,</div><div class='add'>+	.show_attribute		= simple_child_attr_show,</div><div class='add'>+	.store_attribute	= simple_child_attr_store,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct config_item_type simple_child_type = {</div><div class='add'>+	.ct_item_ops	= &amp;simple_child_item_ops,</div><div class='add'>+	.ct_attrs	= simple_child_attrs,</div><div class='add'>+	.ct_owner	= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct simple_children {</div><div class='add'>+	struct config_group group;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct simple_children *to_simple_children(struct config_item *item)</div><div class='add'>+{</div><div class='add'>+	return item ? container_of(to_config_group(item), struct simple_children, group) : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct config_item *simple_children_make_item(struct config_group *group, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct simple_child *simple_child;</div><div class='add'>+</div><div class='add'>+	simple_child = kzalloc(sizeof(struct simple_child), GFP_KERNEL);</div><div class='add'>+	if (!simple_child)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	config_item_init_type_name(&amp;simple_child-&gt;item, name,</div><div class='add'>+				   &amp;simple_child_type);</div><div class='add'>+</div><div class='add'>+	simple_child-&gt;storeme = 0;</div><div class='add'>+</div><div class='add'>+	return &amp;simple_child-&gt;item;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct configfs_attribute simple_children_attr_description = {</div><div class='add'>+	.ca_owner = THIS_MODULE,</div><div class='add'>+	.ca_name = "description",</div><div class='add'>+	.ca_mode = S_IRUGO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct configfs_attribute *simple_children_attrs[] = {</div><div class='add'>+	&amp;simple_children_attr_description,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t simple_children_attr_show(struct config_item *item,</div><div class='add'>+					 struct configfs_attribute *attr,</div><div class='add'>+					 char *page)</div><div class='add'>+{</div><div class='add'>+	return sprintf(page,</div><div class='add'>+"[02-simple-children]\n"</div><div class='add'>+"\n"</div><div class='add'>+"This subsystem allows the creation of child config_items.  These\n"</div><div class='add'>+"items have only one attribute that is readable and writeable.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void simple_children_release(struct config_item *item)</div><div class='add'>+{</div><div class='add'>+	kfree(to_simple_children(item));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct configfs_item_operations simple_children_item_ops = {</div><div class='add'>+	.release	= simple_children_release,</div><div class='add'>+	.show_attribute	= simple_children_attr_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Note that, since no extra work is required on -&gt;drop_item(),</div><div class='add'>+ * no -&gt;drop_item() is provided.</div><div class='add'>+ */</div><div class='add'>+static struct configfs_group_operations simple_children_group_ops = {</div><div class='add'>+	.make_item	= simple_children_make_item,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct config_item_type simple_children_type = {</div><div class='add'>+	.ct_item_ops	= &amp;simple_children_item_ops,</div><div class='add'>+	.ct_group_ops	= &amp;simple_children_group_ops,</div><div class='add'>+	.ct_attrs	= simple_children_attrs,</div><div class='add'>+	.ct_owner	= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct configfs_subsystem simple_children_subsys = {</div><div class='add'>+	.su_group = {</div><div class='add'>+		.cg_item = {</div><div class='add'>+			.ci_namebuf = "02-simple-children",</div><div class='add'>+			.ci_type = &amp;simple_children_type,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* ----------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 03-group-children</div><div class='add'>+ *</div><div class='add'>+ * This example reuses the simple_children group from above.  However,</div><div class='add'>+ * the simple_children group is not the subsystem itself, it is a</div><div class='add'>+ * child of the subsystem.  Creation of a group in the subsystem creates</div><div class='add'>+ * a new simple_children group.  That group can then have simple_child</div><div class='add'>+ * children of its own.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct config_group *group_children_make_group(struct config_group *group, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct simple_children *simple_children;</div><div class='add'>+</div><div class='add'>+	simple_children = kzalloc(sizeof(struct simple_children),</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (!simple_children)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	config_group_init_type_name(&amp;simple_children-&gt;group, name,</div><div class='add'>+				    &amp;simple_children_type);</div><div class='add'>+</div><div class='add'>+	return &amp;simple_children-&gt;group;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct configfs_attribute group_children_attr_description = {</div><div class='add'>+	.ca_owner = THIS_MODULE,</div><div class='add'>+	.ca_name = "description",</div><div class='add'>+	.ca_mode = S_IRUGO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct configfs_attribute *group_children_attrs[] = {</div><div class='add'>+	&amp;group_children_attr_description,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t group_children_attr_show(struct config_item *item,</div><div class='add'>+					struct configfs_attribute *attr,</div><div class='add'>+					char *page)</div><div class='add'>+{</div><div class='add'>+	return sprintf(page,</div><div class='add'>+"[03-group-children]\n"</div><div class='add'>+"\n"</div><div class='add'>+"This subsystem allows the creation of child config_groups.  These\n"</div><div class='add'>+"groups are like the subsystem simple-children.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct configfs_item_operations group_children_item_ops = {</div><div class='add'>+	.show_attribute	= group_children_attr_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Note that, since no extra work is required on -&gt;drop_item(),</div><div class='add'>+ * no -&gt;drop_item() is provided.</div><div class='add'>+ */</div><div class='add'>+static struct configfs_group_operations group_children_group_ops = {</div><div class='add'>+	.make_group	= group_children_make_group,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct config_item_type group_children_type = {</div><div class='add'>+	.ct_item_ops	= &amp;group_children_item_ops,</div><div class='add'>+	.ct_group_ops	= &amp;group_children_group_ops,</div><div class='add'>+	.ct_attrs	= group_children_attrs,</div><div class='add'>+	.ct_owner	= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct configfs_subsystem group_children_subsys = {</div><div class='add'>+	.su_group = {</div><div class='add'>+		.cg_item = {</div><div class='add'>+			.ci_namebuf = "03-group-children",</div><div class='add'>+			.ci_type = &amp;group_children_type,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ----------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We're now done with our subsystem definitions.</div><div class='add'>+ * For convenience in this module, here's a list of them all.  It</div><div class='add'>+ * allows the init function to easily register them.  Most modules</div><div class='add'>+ * will only have one subsystem, and will only call register_subsystem</div><div class='add'>+ * on it directly.</div><div class='add'>+ */</div><div class='add'>+static struct configfs_subsystem *example_subsys[] = {</div><div class='add'>+	&amp;childless_subsys.subsys,</div><div class='add'>+	&amp;simple_children_subsys,</div><div class='add'>+	&amp;group_children_subsys,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init configfs_example_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+	struct configfs_subsystem *subsys;</div><div class='add'>+</div><div class='add'>+	for (i = 0; example_subsys[i]; i++) {</div><div class='add'>+		subsys = example_subsys[i];</div><div class='add'>+</div><div class='add'>+		config_group_init(&amp;subsys-&gt;su_group);</div><div class='add'>+		mutex_init(&amp;subsys-&gt;su_mutex);</div><div class='add'>+		ret = configfs_register_subsystem(subsys);</div><div class='add'>+		if (ret) {</div><div class='add'>+			printk(KERN_ERR "Error %d while registering subsystem %s\n",</div><div class='add'>+			       ret,</div><div class='add'>+			       subsys-&gt;su_group.cg_item.ci_namebuf);</div><div class='add'>+			goto out_unregister;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_unregister:</div><div class='add'>+	for (; i &gt;= 0; i--) {</div><div class='add'>+		configfs_unregister_subsystem(example_subsys[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit configfs_example_exit(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; example_subsys[i]; i++) {</div><div class='add'>+		configfs_unregister_subsystem(example_subsys[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(configfs_example_init);</div><div class='add'>+module_exit(configfs_example_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt<br/>index 80e193d82e2e..0d5394920a31 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/ext4.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/filesystems/ext4.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/ext4.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/ext4.txt</a></div><div class='hunk'>@@ -26,6 +26,12 @@ Mailing list: linux-ext4@vger.kernel.org</div><div class='ctx'> </div><div class='ctx'>     git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git</div><div class='ctx'> </div><div class='add'>+  - Note that it is highly important to install the mke2fs.conf file</div><div class='add'>+    that comes with the e2fsprogs 1.41.x sources in /etc/mke2fs.conf. If</div><div class='add'>+    you have edited the /etc/mke2fs.conf file installed on your system,</div><div class='add'>+    you will need to merge your changes with the version from e2fsprogs</div><div class='add'>+    1.41.x.</div><div class='add'>+</div><div class='ctx'>   - Create a new filesystem using the ext4dev filesystem type:</div><div class='ctx'> </div><div class='ctx'>     	# mke2fs -t ext4dev /dev/hda1</div><div class='head'>diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt<br/>index e79ee2db183a..ac2a261c5f7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/ntfs.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/filesystems/ntfs.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/ntfs.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/ntfs.txt</a></div><div class='hunk'>@@ -40,7 +40,7 @@ Web site</div><div class='ctx'> ========</div><div class='ctx'> </div><div class='ctx'> There is plenty of additional information on the linux-ntfs web site</div><div class='del'>-at http://linux-ntfs.sourceforge.net/</div><div class='add'>+at http://www.linux-ntfs.org/</div><div class='ctx'> </div><div class='ctx'> The web site has a lot of additional information, such as a comprehensive</div><div class='ctx'> FAQ, documentation on the NTFS on-disk format, information on the Linux-NTFS</div><div class='hunk'>@@ -272,7 +272,7 @@ And you would know that /dev/hda2 has a size of 37768814 - 4209030 + 1 =</div><div class='ctx'> For Win2k and later dynamic disks, you can for example use the ldminfo utility</div><div class='ctx'> which is part of the Linux LDM tools (the latest version at the time of</div><div class='ctx'> writing is linux-ldm-0.0.8.tar.bz2).  You can download it from:</div><div class='del'>-	http://linux-ntfs.sourceforge.net/downloads.html</div><div class='add'>+	http://www.linux-ntfs.org/</div><div class='ctx'> Simply extract the downloaded archive (tar xvjf linux-ldm-0.0.8.tar.bz2), go</div><div class='ctx'> into it (cd linux-ldm-0.0.8) and change to the test directory (cd test).  You</div><div class='ctx'> will find the precompiled (i386) ldminfo utility there.  NOTE: You will not be</div><div class='head'>diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt<br/>index 64557821ee59..f566ad9bcb7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/proc.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/filesystems/proc.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/proc.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/proc.txt</a></div><div class='hunk'>@@ -1339,6 +1339,25 @@ Enables/Disables the protection of the per-process proc entries "maps" and</div><div class='ctx'> "smaps".  When enabled, the contents of these files are visible only to</div><div class='ctx'> readers that are allowed to ptrace() the given process.</div><div class='ctx'> </div><div class='add'>+msgmni</div><div class='add'>+------</div><div class='add'>+</div><div class='add'>+Maximum number of message queue ids on the system.</div><div class='add'>+This value scales to the amount of lowmem. It is automatically recomputed</div><div class='add'>+upon memory add/remove or ipc namespace creation/removal.</div><div class='add'>+When a value is written into this file, msgmni's value becomes fixed, i.e. it</div><div class='add'>+is not recomputed anymore when one of the above events occurs.</div><div class='add'>+Use auto_msgmni to change this behavior.</div><div class='add'>+</div><div class='add'>+auto_msgmni</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+Enables/Disables automatic recomputing of msgmni upon memory add/remove or</div><div class='add'>+upon ipc namespace creation/removal (see the msgmni description above).</div><div class='add'>+Echoing "1" into this file enables msgmni automatic recomputing.</div><div class='add'>+Echoing "0" turns it off.</div><div class='add'>+auto_msgmni default value is 1.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 2.4 /proc/sys/vm - The virtual memory subsystem</div><div class='ctx'> -----------------------------------------------</div><div class='hunk'>@@ -2394,6 +2413,8 @@ The following 4 memory types are supported:</div><div class='ctx'>   - (bit 1) anonymous shared memory</div><div class='ctx'>   - (bit 2) file-backed private memory</div><div class='ctx'>   - (bit 3) file-backed shared memory</div><div class='add'>+  - (bit 4) ELF header pages in file-backed private memory areas (it is</div><div class='add'>+            effective only if the bit 2 is cleared)</div><div class='ctx'> </div><div class='ctx'>   Note that MMIO pages such as frame buffer are never dumped and vDSO pages</div><div class='ctx'>   are always dumped regardless of the bitmask status.</div><div class='head'>diff --git a/Documentation/filesystems/quota.txt b/Documentation/filesystems/quota.txt<br/>index a590c4093eff..5e8de25bf0f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/quota.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/filesystems/quota.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/quota.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/quota.txt</a></div><div class='hunk'>@@ -3,14 +3,14 @@ Quota subsystem</div><div class='ctx'> ===============</div><div class='ctx'> </div><div class='ctx'> Quota subsystem allows system administrator to set limits on used space and</div><div class='del'>-number of used inodes (inode is a filesystem structure which is associated</div><div class='del'>-with each file or directory) for users and/or groups. For both used space and</div><div class='del'>-number of used inodes there are actually two limits. The first one is called</div><div class='del'>-softlimit and the second one hardlimit.  An user can never exceed a hardlimit</div><div class='del'>-for any resource. User is allowed to exceed softlimit but only for limited</div><div class='del'>-period of time. This period is called "grace period" or "grace time". When</div><div class='del'>-grace time is over, user is not able to allocate more space/inodes until he</div><div class='del'>-frees enough of them to get below softlimit.</div><div class='add'>+number of used inodes (inode is a filesystem structure which is associated with</div><div class='add'>+each file or directory) for users and/or groups. For both used space and number</div><div class='add'>+of used inodes there are actually two limits. The first one is called softlimit</div><div class='add'>+and the second one hardlimit.  An user can never exceed a hardlimit for any</div><div class='add'>+resource (unless he has CAP_SYS_RESOURCE capability). User is allowed to exceed</div><div class='add'>+softlimit but only for limited period of time. This period is called "grace</div><div class='add'>+period" or "grace time". When grace time is over, user is not able to allocate</div><div class='add'>+more space/inodes until he frees enough of them to get below softlimit.</div><div class='ctx'> </div><div class='ctx'> Quota limits (and amount of grace time) are set independently for each</div><div class='ctx'> filesystem.</div><div class='hunk'>@@ -53,6 +53,12 @@ in parentheses):</div><div class='ctx'> 		QUOTA_NL_BSOFTLONGWARN - space (block) softlimit is exceeded</div><div class='ctx'> 		  longer than given grace period.</div><div class='ctx'> 		QUOTA_NL_BSOFTWARN - space (block) softlimit</div><div class='add'>+	  - four warnings are also defined for the event when user stops</div><div class='add'>+	    exceeding some limit:</div><div class='add'>+		QUOTA_NL_IHARDBELOW - inode hardlimit</div><div class='add'>+		QUOTA_NL_ISOFTBELOW - inode softlimit</div><div class='add'>+		QUOTA_NL_BHARDBELOW - space (block) hardlimit</div><div class='add'>+		QUOTA_NL_BSOFTBELOW - space (block) softlimit</div><div class='ctx'>         QUOTA_NL_A_DEV_MAJOR (u32)</div><div class='ctx'> 	  - major number of a device with the affected filesystem</div><div class='ctx'>         QUOTA_NL_A_DEV_MINOR (u32)</div><div class='head'>diff --git a/Documentation/filesystems/ubifs.txt b/Documentation/filesystems/ubifs.txt<br/>index 540e9e7f59c5..6a0d70a22f05 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/ubifs.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/filesystems/ubifs.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/ubifs.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/filesystems/ubifs.txt</a></div><div class='hunk'>@@ -57,7 +57,7 @@ Similarly to JFFS2, UBIFS supports on-the-flight compression which makes</div><div class='ctx'> it possible to fit quite a lot of data to the flash.</div><div class='ctx'> </div><div class='ctx'> Similarly to JFFS2, UBIFS is tolerant of unclean reboots and power-cuts.</div><div class='del'>-It does not need stuff like ckfs.ext2. UBIFS automatically replays its</div><div class='add'>+It does not need stuff like fsck.ext2. UBIFS automatically replays its</div><div class='ctx'> journal and recovers from crashes, ensuring that the on-flash data</div><div class='ctx'> structures are consistent.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/ftrace.txt b/Documentation/ftrace.txt<br/>index f218f616ff6b..d330fe3103da 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/ftrace.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/ftrace.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ftrace.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/ftrace.txt</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> Copyright 2008 Red Hat Inc.</div><div class='ctx'>    Author:   Steven Rostedt &lt;srostedt@redhat.com&gt;</div><div class='ctx'>   License:   The GNU Free Documentation License, Version 1.2</div><div class='add'>+               (dual licensed under the GPL v2)</div><div class='ctx'> Reviewers:   Elias Oltmanns, Randy Dunlap, Andrew Morton,</div><div class='ctx'> 	     John Kacur, and David Teigland.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/dme1737 b/Documentation/hwmon/dme1737<br/>index 8f446070e64a..001d2e70bc11 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/hwmon/dme1737?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/hwmon/dme1737</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/dme1737?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/hwmon/dme1737</a></div><div class='hunk'>@@ -10,6 +10,10 @@ Supported chips:</div><div class='ctx'>     Prefix: 'sch311x'</div><div class='ctx'>     Addresses scanned: none, address read from Super-I/O config space</div><div class='ctx'>     Datasheet: http://www.nuhorizons.com/FeaturedProducts/Volume1/SMSC/311x.pdf</div><div class='add'>+  * SMSC SCH5027</div><div class='add'>+    Prefix: 'sch5027'</div><div class='add'>+    Addresses scanned: I2C 0x2c, 0x2d, 0x2e</div><div class='add'>+    Datasheet: Provided by SMSC upon request and under NDA</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='ctx'>     Juerg Haefliger &lt;juergh@gmail.com&gt;</div><div class='hunk'>@@ -22,34 +26,36 @@ Module Parameters</div><div class='ctx'> 			and PWM output control functions. Using this parameter</div><div class='ctx'> 			shouldn't be required since the BIOS usually takes care</div><div class='ctx'> 			of this.</div><div class='del'>-</div><div class='del'>-Note that there is no need to use this parameter if the driver loads without</div><div class='del'>-complaining. The driver will say so if it is necessary.</div><div class='add'>+* probe_all_addr: bool	Include non-standard LPC addresses 0x162e and 0x164e</div><div class='add'>+			when probing for ISA devices. This is required for the</div><div class='add'>+			following boards:</div><div class='add'>+			- VIA EPIA SN18000</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='ctx'> </div><div class='ctx'> This driver implements support for the hardware monitoring capabilities of the</div><div class='del'>-SMSC DME1737 and Asus A8000 (which are the same) and SMSC SCH311x Super-I/O</div><div class='del'>-chips. These chips feature monitoring of 3 temp sensors temp[1-3] (2 remote</div><div class='del'>-diodes and 1 internal), 7 voltages in[0-6] (6 external and 1 internal) and up</div><div class='del'>-to 6 fan speeds fan[1-6]. Additionally, the chips implement up to 5 PWM</div><div class='del'>-outputs pwm[1-3,5-6] for controlling fan speeds both manually and</div><div class='add'>+SMSC DME1737 and Asus A8000 (which are the same), SMSC SCH5027, and SMSC</div><div class='add'>+SCH311x Super-I/O chips. These chips feature monitoring of 3 temp sensors</div><div class='add'>+temp[1-3] (2 remote diodes and 1 internal), 7 voltages in[0-6] (6 external and</div><div class='add'>+1 internal) and up to 6 fan speeds fan[1-6]. Additionally, the chips implement</div><div class='add'>+up to 5 PWM outputs pwm[1-3,5-6] for controlling fan speeds both manually and</div><div class='ctx'> automatically.</div><div class='ctx'> </div><div class='del'>-For the DME1737 and A8000, fan[1-2] and pwm[1-2] are always present. Fan[3-6]</div><div class='del'>-and pwm[3,5-6] are optional features and their availability depends on the</div><div class='del'>-configuration of the chip. The driver will detect which features are present</div><div class='del'>-during initialization and create the sysfs attributes accordingly.</div><div class='add'>+For the DME1737, A8000 and SCH5027, fan[1-2] and pwm[1-2] are always present.</div><div class='add'>+Fan[3-6] and pwm[3,5-6] are optional features and their availability depends on</div><div class='add'>+the configuration of the chip. The driver will detect which features are</div><div class='add'>+present during initialization and create the sysfs attributes accordingly.</div><div class='ctx'> </div><div class='ctx'> For the SCH311x, fan[1-3] and pwm[1-3] are always present and fan[4-6] and</div><div class='ctx'> pwm[5-6] don't exist.</div><div class='ctx'> </div><div class='del'>-The hardware monitoring features of the DME1737 and A8000 are only accessible</div><div class='del'>-via SMBus, while the SCH311x only provides access via the ISA bus. The driver</div><div class='del'>-will therefore register itself as an I2C client driver if it detects a DME1737</div><div class='del'>-or A8000 and as a platform driver if it detects a SCH311x chip.</div><div class='add'>+The hardware monitoring features of the DME1737, A8000, and SCH5027 are only</div><div class='add'>+accessible via SMBus, while the SCH311x only provides access via the ISA bus.</div><div class='add'>+The driver will therefore register itself as an I2C client driver if it detects</div><div class='add'>+a DME1737, A8000, or SCH5027 and as a platform driver if it detects a SCH311x</div><div class='add'>+chip.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Voltage Monitoring</div><div class='hunk'>@@ -60,6 +66,7 @@ scaling resistors. The values returned by the driver therefore reflect true</div><div class='ctx'> millivolts and don't need scaling. The voltage inputs are mapped as follows</div><div class='ctx'> (the last column indicates the input ranges):</div><div class='ctx'> </div><div class='add'>+DME1737, A8000:</div><div class='ctx'> 	in0: +5VTR	(+5V standby)		0V - 6.64V</div><div class='ctx'> 	in1: Vccp	(processor core)	0V - 3V</div><div class='ctx'> 	in2: VCC	(internal +3.3V)	0V - 4.38V</div><div class='hunk'>@@ -68,6 +75,24 @@ millivolts and don't need scaling. The voltage inputs are mapped as follows</div><div class='ctx'> 	in5: VTR	(+3.3V standby)		0V - 4.38V</div><div class='ctx'> 	in6: Vbat	(+3.0V)			0V - 4.38V</div><div class='ctx'> </div><div class='add'>+SCH311x:</div><div class='add'>+	in0: +2.5V				0V - 6.64V</div><div class='add'>+	in1: Vccp	(processor core)	0V - 2V</div><div class='add'>+	in2: VCC	(internal +3.3V)	0V - 4.38V</div><div class='add'>+	in3: +5V				0V - 6.64V</div><div class='add'>+	in4: +12V				0V - 16V</div><div class='add'>+	in5: VTR	(+3.3V standby)		0V - 4.38V</div><div class='add'>+	in6: Vbat	(+3.0V)			0V - 4.38V</div><div class='add'>+</div><div class='add'>+SCH5027:</div><div class='add'>+	in0: +5VTR	(+5V standby)		0V - 6.64V</div><div class='add'>+	in1: Vccp	(processor core)	0V - 3V</div><div class='add'>+	in2: VCC	(internal +3.3V)	0V - 4.38V</div><div class='add'>+	in3: V2_IN				0V - 1.5V</div><div class='add'>+	in4: V1_IN				0V - 1.5V</div><div class='add'>+	in5: VTR	(+3.3V standby)		0V - 4.38V</div><div class='add'>+	in6: Vbat	(+3.0V)			0V - 4.38V</div><div class='add'>+</div><div class='ctx'> Each voltage input has associated min and max limits which trigger an alarm</div><div class='ctx'> when crossed.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/ibmaem b/Documentation/hwmon/ibmaem<br/>index 2fefaf582a43..e98bdfea3467 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/hwmon/ibmaem?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/hwmon/ibmaem</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/ibmaem?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/hwmon/ibmaem</a></div><div class='hunk'>@@ -1,8 +1,11 @@</div><div class='ctx'> Kernel driver ibmaem</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='add'>+This driver talks to the IBM Systems Director Active Energy Manager, known</div><div class='add'>+henceforth as AEM.</div><div class='add'>+</div><div class='ctx'> Supported systems:</div><div class='del'>-  * Any recent IBM System X server with Active Energy Manager support.</div><div class='add'>+  * Any recent IBM System X server with AEM support.</div><div class='ctx'>     This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2,</div><div class='ctx'>     x3950 M2, and certain HS2x/LS2x/QS2x blades.  The IPMI host interface</div><div class='ctx'>     driver ("ipmi-si") needs to be loaded for this driver to do anything.</div><div class='hunk'>@@ -14,24 +17,22 @@ Author: Darrick J. Wong</div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='ctx'> </div><div class='del'>-This driver implements sensor reading support for the energy and power</div><div class='del'>-meters available on various IBM System X hardware through the BMC.  All</div><div class='del'>-sensor banks will be exported as platform devices; this driver can talk</div><div class='del'>-to both v1 and v2 interfaces.  This driver is completely separate from the</div><div class='del'>-older ibmpex driver.</div><div class='add'>+This driver implements sensor reading support for the energy and power meters</div><div class='add'>+available on various IBM System X hardware through the BMC.  All sensor banks</div><div class='add'>+will be exported as platform devices; this driver can talk to both v1 and v2</div><div class='add'>+interfaces.  This driver is completely separate from the older ibmpex driver.</div><div class='ctx'> </div><div class='del'>-The v1 AEM interface has a simple set of features to monitor energy use.</div><div class='del'>-There is a register that displays an estimate of raw energy consumption</div><div class='del'>-since the last BMC reset, and a power sensor that returns average power</div><div class='del'>-use over a configurable interval.</div><div class='add'>+The v1 AEM interface has a simple set of features to monitor energy use.  There</div><div class='add'>+is a register that displays an estimate of raw energy consumption since the</div><div class='add'>+last BMC reset, and a power sensor that returns average power use over a</div><div class='add'>+configurable interval.</div><div class='ctx'> </div><div class='del'>-The v2 AEM interface is a bit more sophisticated, being able to present</div><div class='del'>-a wider range of energy and power use registers, the power cap as</div><div class='del'>-set by the AEM software, and temperature sensors.</div><div class='add'>+The v2 AEM interface is a bit more sophisticated, being able to present a wider</div><div class='add'>+range of energy and power use registers, the power cap as set by the AEM</div><div class='add'>+software, and temperature sensors.</div><div class='ctx'> </div><div class='ctx'> Special Features</div><div class='ctx'> ----------------</div><div class='ctx'> </div><div class='del'>-The "power_cap" value displays the current system power cap, as set by</div><div class='del'>-the Active Energy Manager software.  Setting the power cap from the host</div><div class='del'>-is not currently supported.</div><div class='add'>+The "power_cap" value displays the current system power cap, as set by the AEM</div><div class='add'>+software.  Setting the power cap from the host is not currently supported.</div><div class='head'>diff --git a/Documentation/hwmon/it87 b/Documentation/hwmon/it87<br/>index f4ce1fdbeff6..3496b7020e7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/hwmon/it87?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/hwmon/it87</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/it87?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/hwmon/it87</a></div><div class='hunk'>@@ -6,12 +6,14 @@ Supported chips:</div><div class='ctx'>     Prefix: 'it87'</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='ctx'>     Datasheet: Publicly available at the ITE website</div><div class='del'>-               http://www.ite.com.tw/</div><div class='add'>+               http://www.ite.com.tw/product_info/file/pc/IT8705F_V.0.4.1.pdf</div><div class='ctx'>   * IT8712F</div><div class='ctx'>     Prefix: 'it8712'</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='ctx'>     Datasheet: Publicly available at the ITE website</div><div class='del'>-               http://www.ite.com.tw/</div><div class='add'>+               http://www.ite.com.tw/product_info/file/pc/IT8712F_V0.9.1.pdf</div><div class='add'>+               http://www.ite.com.tw/product_info/file/pc/Errata%20V0.1%20for%20IT8712F%20V0.9.1.pdf</div><div class='add'>+               http://www.ite.com.tw/product_info/file/pc/IT8712F_V0.9.3.pdf</div><div class='ctx'>   * IT8716F/IT8726F</div><div class='ctx'>     Prefix: 'it8716'</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='hunk'>@@ -90,14 +92,13 @@ upper VID bits share their pins with voltage inputs (in5 and in6) so you</div><div class='ctx'> can't have both on a given board.</div><div class='ctx'> </div><div class='ctx'> The IT8716F, IT8718F and later IT8712F revisions have support for</div><div class='del'>-2 additional fans. They are supported by the driver for the IT8716F and</div><div class='del'>-IT8718F but not for the IT8712F</div><div class='add'>+2 additional fans. The additional fans are supported by the driver.</div><div class='ctx'> </div><div class='ctx'> The IT8716F and IT8718F, and late IT8712F and IT8705F also have optional</div><div class='ctx'> 16-bit tachometer counters for fans 1 to 3. This is better (no more fan</div><div class='ctx'> clock divider mess) but not compatible with the older chips and</div><div class='del'>-revisions. For now, the driver only uses the 16-bit mode on the</div><div class='del'>-IT8716F and IT8718F.</div><div class='add'>+revisions. The 16-bit tachometer mode is enabled by the driver when one</div><div class='add'>+of the above chips is detected.</div><div class='ctx'> </div><div class='ctx'> The IT8726F is just bit enhanced IT8716F with additional hardware</div><div class='ctx'> for AMD power sequencing. Therefore the chip will appear as IT8716F</div><div class='head'>diff --git a/Documentation/hwmon/lm85 b/Documentation/hwmon/lm85<br/>index 9549237530cf..6d41db7f17f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/hwmon/lm85?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/hwmon/lm85</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/lm85?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/hwmon/lm85</a></div><div class='hunk'>@@ -96,11 +96,6 @@ initial testing of the ADM1027 it was 1.00 degC steps. Analog Devices has</div><div class='ctx'> confirmed this "bug". The ADT7463 is reported to work as described in the</div><div class='ctx'> documentation. The current lm85 driver does not show the offset register.</div><div class='ctx'> </div><div class='del'>-The ADT7463 has a THERM asserted counter. This counter has a 22.76ms</div><div class='del'>-resolution and a range of 5.8 seconds. The driver implements a 32-bit</div><div class='del'>-accumulator of the counter value to extend the range to over a year. The</div><div class='del'>-counter will stay at it's max value until read.</div><div class='del'>-</div><div class='ctx'> See the vendor datasheets for more information. There is application note</div><div class='ctx'> from National (AN-1260) with some additional information about the LM85.</div><div class='ctx'> The Analog Devices datasheet is very detailed and describes a procedure for</div><div class='hunk'>@@ -206,13 +201,15 @@ Configuration choices:</div><div class='ctx'> </div><div class='ctx'> The National LM85's have two vendor specific configuration</div><div class='ctx'> features. Tach. mode and Spinup Control. For more details on these,</div><div class='del'>-see the LM85 datasheet or Application Note AN-1260.</div><div class='add'>+see the LM85 datasheet or Application Note AN-1260. These features</div><div class='add'>+are not currently supported by the lm85 driver.</div><div class='ctx'> </div><div class='ctx'> The Analog Devices ADM1027 has several vendor specific enhancements.</div><div class='ctx'> The number of pulses-per-rev of the fans can be set, Tach monitoring</div><div class='ctx'> can be optimized for PWM operation, and an offset can be applied to</div><div class='ctx'> the temperatures to compensate for systemic errors in the</div><div class='del'>-measurements.</div><div class='add'>+measurements. These features are not currently supported by the lm85</div><div class='add'>+driver.</div><div class='ctx'> </div><div class='ctx'> In addition to the ADM1027 features, the ADT7463 also has Tmin control</div><div class='ctx'> and THERM asserted counts. Automatic Tmin control acts to adjust the</div><div class='head'>diff --git a/Documentation/hwmon/w83627hf b/Documentation/hwmon/w83627hf<br/>index 880a59f53da9..6ee36dbafd64 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/hwmon/w83627hf?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/hwmon/w83627hf</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/w83627hf?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/hwmon/w83627hf</a></div><div class='hunk'>@@ -40,10 +40,6 @@ Module Parameters</div><div class='ctx'>   (default is 1)</div><div class='ctx'>   Use 'init=0' to bypass initializing the chip.</div><div class='ctx'>   Try this if your computer crashes when you load the module.</div><div class='del'>-* reset: int</div><div class='del'>-  (default is 0)</div><div class='del'>-  The driver used to reset the chip on load, but does no more. Use</div><div class='del'>-  'reset=1' to restore the old behavior. Report if you need to do this.</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='head'>diff --git a/Documentation/hwmon/w83791d b/Documentation/hwmon/w83791d<br/>index f153b2f6d62c..a67d3b7a7098 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/hwmon/w83791d?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/hwmon/w83791d</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/w83791d?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/hwmon/w83791d</a></div><div class='hunk'>@@ -22,6 +22,7 @@ Credits:</div><div class='ctx'> </div><div class='ctx'> Additional contributors:</div><div class='ctx'>     Sven Anders &lt;anders@anduras.de&gt;</div><div class='add'>+    Marc Hulsman &lt;m.hulsman@tudelft.nl&gt;</div><div class='ctx'> </div><div class='ctx'> Module Parameters</div><div class='ctx'> -----------------</div><div class='hunk'>@@ -67,9 +68,8 @@ on until the temperature falls below the Hysteresis value.</div><div class='ctx'> </div><div class='ctx'> Fan rotation speeds are reported in RPM (rotations per minute). An alarm is</div><div class='ctx'> triggered if the rotation speed has dropped below a programmable limit. Fan</div><div class='del'>-readings can be divided by a programmable divider (1, 2, 4, 8 for fan 1/2/3</div><div class='del'>-and 1, 2, 4, 8, 16, 32, 64 or 128 for fan 4/5) to give the readings more</div><div class='del'>-range or accuracy.</div><div class='add'>+readings can be divided by a programmable divider (1, 2, 4, 8, 16,</div><div class='add'>+32, 64 or 128 for all fans) to give the readings more range or accuracy.</div><div class='ctx'> </div><div class='ctx'> Voltage sensors (also known as IN sensors) report their values in millivolts.</div><div class='ctx'> An alarm is triggered if the voltage has crossed a programmable minimum</div><div class='head'>diff --git a/Documentation/ia64/Makefile b/Documentation/ia64/Makefile<br/>new file mode 100644<br/>index 000000000000..b75db69ec483<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ia64/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/ia64/Makefile</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+# kbuild trick to avoid linker error. Can be omitted if a module is built.</div><div class='add'>+obj- := dummy.o</div><div class='add'>+</div><div class='add'>+# List of programs to build</div><div class='add'>+hostprogs-y := aliasing-test</div><div class='add'>+</div><div class='add'>+# Tell kbuild to always build the programs</div><div class='add'>+always := $(hostprogs-y)</div><div class='head'>diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt<br/>index 3bb5f466a90d..1c6b545635a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/ioctl-number.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/ioctl-number.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ioctl-number.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/ioctl-number.txt</a></div><div class='hunk'>@@ -105,7 +105,6 @@ Code	Seq#	Include File		Comments</div><div class='ctx'> 'T'	all	linux/soundcard.h	conflict!</div><div class='ctx'> 'T'	all	asm-i386/ioctls.h	conflict!</div><div class='ctx'> 'U'	00-EF	linux/drivers/usb/usb.h</div><div class='del'>-'U'	F0-FF	drivers/usb/auerswald.c</div><div class='ctx'> 'V'	all	linux/vt.h</div><div class='ctx'> 'W'	00-1F	linux/watchdog.h	conflict!</div><div class='ctx'> 'W'	00-1F	linux/wanrouter.h	conflict!</div><div class='head'>diff --git a/Documentation/ja_JP/HOWTO b/Documentation/ja_JP/HOWTO<br/>index 488c77fa3aae..0775cf4798b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/ja_JP/HOWTO?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/ja_JP/HOWTO</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ja_JP/HOWTO?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/ja_JP/HOWTO</a></div><div class='hunk'>@@ -11,14 +11,14 @@ for non English (read: Japanese) speakers and is not intended as a</div><div class='ctx'> fork. So if you have any comments or updates for this file, please try</div><div class='ctx'> to update the original English file first.</div><div class='ctx'> </div><div class='del'>-Last Updated: 2007/11/16</div><div class='add'>+Last Updated: 2008/08/21</div><div class='ctx'> ==================================</div><div class='ctx'> ã�“ã‚Œã�¯ã€�</div><div class='del'>-linux-2.6.24/Documentation/HOWTO</div><div class='add'>+linux-2.6.27/Documentation/HOWTO</div><div class='ctx'> ã�®å’Œè¨³ã�§ã�™ã€‚</div><div class='ctx'> </div><div class='ctx'> 翻訳団体： JF プロジェクト &lt; http://www.linux.or.jp/JF/ &gt;</div><div class='del'>-翻訳日： 2007/11/10</div><div class='add'>+翻訳日： 2008/8/5</div><div class='ctx'> 翻訳者： Tsugikazu Shibata &lt;tshibata at ab dot jp dot nec dot com&gt;</div><div class='ctx'> 校正者： æ�¾å€‰ã�•ã‚“ &lt;nbh--mats at nifty dot com&gt;</div><div class='ctx'>          å°�æž— é›…å…¸ã�•ã‚“ (Masanori Kobayasi) &lt;zap03216 at nifty dot ne dot jp&gt;</div><div class='hunk'>@@ -287,13 +287,15 @@ Linux カーãƒ�ルã�®é–‹ç™ºãƒ—ロセスã�¯ç�¾åœ¨å¹¾ã�¤ã�‹ã�®ç•°ã�ªã‚‹ãƒ¡ã‚¤ãƒ³ã‚</div><div class='ctx'>     ã�«å®‰å®šã�—ã�ŸçŠ¶æ…‹ã�«ã�‚ã‚‹ã�¨åˆ¤æ–­ã�—ã�Ÿã�¨ã��ã�«ãƒªãƒªãƒ¼ã‚¹ã�•ã‚Œã�¾ã�™ã€‚目標ã�¯æ¯Žé€±æ–°</div><div class='ctx'>     ã�—ã�„ -rc カーãƒ�ルをリリースã�™ã‚‹ã�“ã�¨ã�§ã�™ã€‚</div><div class='ctx'> </div><div class='del'>-   - 以下ã�® URL ã�§å�„ -rc リリースã�«å­˜åœ¨ã�™ã‚‹æ—¢çŸ¥ã�®å¾Œæˆ»ã‚Šå•�é¡Œã�®ãƒªã‚¹ãƒˆ</div><div class='del'>-     ã�Œè¿½è·¡ã�•ã‚Œã�¾ã�™-</div><div class='del'>-     http://kernelnewbies.org/known_regressions</div><div class='del'>-</div><div class='ctx'>   - ã�“ã�®ãƒ—ロセスã�¯ã‚«ãƒ¼ãƒ�ルã�Œ 「準備ã�Œã�§ã��ã�Ÿã€�ã�¨è€ƒã�ˆã‚‰ã‚Œã‚‹ã�¾ã�§ç¶™ç¶šã�—ã�¾</div><div class='ctx'>     ã�™ã€‚ã�“ã�®ãƒ—ロセスã�¯ã� ã�„ã�Ÿã�„ 6週間継続ã�—ã�¾ã�™ã€‚</div><div class='ctx'> </div><div class='add'>+  - å�„リリースã�§ã�®æ—¢çŸ¥ã�®å¾Œæˆ»ã‚Šå•�é¡Œ(regression: ã�“ã�®ãƒªãƒªãƒ¼ã‚¹ã�®ä¸­ã�§æ–°è¦�</div><div class='add'>+    ã�«ä½œã‚Šè¾¼ã�¾ã‚Œã�Ÿå•�題を指ã�™) ã�¯ã��ã�®éƒ½åº¦ Linux-kernel メーリングリスト</div><div class='add'>+    ã�«æŠ•ç¨¿ã�•ã‚Œã�¾ã�™ã€‚ゴールã�¨ã�—ã�¦ã�¯ã€�カーãƒ�ルã�Œ 「準備ã�Œã�§ã��ã�Ÿã€�ã�¨å®£è¨€</div><div class='add'>+    ã�™ã‚‹å‰�ã�«ã�“ã�®ãƒªã‚¹ãƒˆã�®é•·ã�•ã‚’ゼロã�«æ¸›ã‚‰ã�™ã�“ã�¨ã�§ã�™ã�Œã€�ç�¾å®Ÿã�«ã�¯ã€�数個ã�®</div><div class='add'>+    後戻りå•�é¡Œã�Œãƒªãƒªãƒ¼ã‚¹æ™‚ã�«ã�Ÿã�³ã�Ÿã�³æ®‹ã�£ã�¦ã�—ã�¾ã�„ã�¾ã�™ã€‚</div><div class='add'>+</div><div class='ctx'> Andrew Morton ã�Œ Linux-kernel メーリングリストã�«ã‚«ãƒ¼ãƒ�ルリリースã�«ã�¤ã�„</div><div class='ctx'> ã�¦æ›¸ã�„ã�Ÿã�“ã�¨ã‚’ã�“ã�“ã�§è¨€ã�£ã�¦ã�Šã��ã�“ã�¨ã�¯ä¾¡å€¤ã�Œã�‚ã‚Šã�¾ã�™-</div><div class='ctx'>   「カーãƒ�ルã�Œã�„ã�¤ãƒªãƒªãƒ¼ã‚¹ã�•ã‚Œã‚‹ã�‹ã�¯èª°ã‚‚知りã�¾ã�›ã‚“。ã�ªã�œã�ªã‚‰ã€�ã�“ã‚Œã�¯ç�¾</div><div class='hunk'>@@ -303,18 +305,20 @@ Andrew Morton ã�Œ Linux-kernel メーリングリストã�«ã‚«ãƒ¼ãƒ�ルリリーã</div><div class='ctx'> 2.6.x.y -stable カーãƒ�ルツリー</div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='del'>-ãƒ�ージョンã�«4ã�¤ç›®ã�®æ•°å­—ã�Œã�¤ã�„ã�Ÿã‚«ãƒ¼ãƒ�ルã�¯ -stable カーãƒ�ルã�§ã�™ã€‚ã�“ã‚Œã�«</div><div class='del'>-ã�¯ã€�2.6.x カーãƒ�ルã�§è¦‹ã�¤ã�‹ã�£ã�Ÿã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£å•�題やé‡�大ã�ªå¾Œæˆ»ã‚Šã�«å¯¾ã�™ã‚‹æ¯”</div><div class='del'>-較的å°�ã�•ã�„é‡�è¦�ã�ªä¿®æ­£ã�Œå�«ã�¾ã‚Œã�¾ã�™ã€‚</div><div class='add'>+ãƒ�ージョン番å�·ã�Œ4ã�¤ã�®æ•°å­—ã�«åˆ†ã�‹ã‚Œã�¦ã�„るカーãƒ�ルã�¯ -stable カーãƒ�ルã�§ã�™ã€‚</div><div class='add'>+ã�“ã‚Œã�«ã�¯ã€�2.6.x カーãƒ�ルã�§è¦‹ã�¤ã�‹ã�£ã�Ÿã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£å•�題やé‡�大ã�ªå¾Œæˆ»ã‚Šã�«å¯¾</div><div class='add'>+ã�™ã‚‹æ¯”較的å°�ã�•ã�„é‡�è¦�ã�ªä¿®æ­£ã�Œå�«ã�¾ã‚Œã�¾ã�™ã€‚</div><div class='ctx'> </div><div class='ctx'> ã�“ã‚Œã�¯ã€�開発/実験的ãƒ�ージョンã�®ãƒ†ã‚¹ãƒˆã�«å�”力ã�™ã‚‹ã�“ã�¨ã�«èˆˆå‘³ã�Œç„¡ã��ã€�</div><div class='ctx'> 最新ã�®å®‰å®šã�—ã�Ÿã‚«ãƒ¼ãƒ�ルを使ã�„ã�Ÿã�„ユーザã�«æŽ¨å¥¨ã�™ã‚‹ãƒ–ランãƒ�ã�§ã�™ã€‚</div><div class='ctx'> </div><div class='del'>-ã‚‚ã�—ã€�2.6.x.y カーãƒ�ルã�Œå­˜åœ¨ã�—ã�ªã�„å ´å�ˆã�«ã�¯ã€�番å�·ã�Œä¸€ç•ªå¤§ã��ã�„ 2.6.x</div><div class='del'>-ã�Œæœ€æ–°ã�®å®‰å®šç‰ˆã‚«ãƒ¼ãƒ�ルã�§ã�™ã€‚</div><div class='add'>+ã‚‚ã�—ã€�2.6.x.y カーãƒ�ルã�Œå­˜åœ¨ã�—ã�ªã�„å ´å�ˆã�«ã�¯ã€�番å�·ã�Œä¸€ç•ªå¤§ã��ã�„ 2.6.x ã�Œ</div><div class='add'>+最新ã�®å®‰å®šç‰ˆã‚«ãƒ¼ãƒ�ルã�§ã�™ã€‚</div><div class='ctx'> </div><div class='del'>-2.6.x.y ã�¯ "stable" ãƒ�ーム &lt;stable@kernel.org&gt; ã�§ãƒ¡ãƒ³ãƒ†ã�•ã‚Œã�¦ã�Šã‚Šã€�ã� </div><div class='del'>-ã�„ã�Ÿã�„隔週ã�§ãƒªãƒªãƒ¼ã‚¹ã�•ã‚Œã�¦ã�„ã�¾ã�™ã€‚</div><div class='add'>+2.6.x.y ã�¯ "stable" ãƒ�ーム &lt;stable@kernel.org&gt; ã�§ãƒ¡ãƒ³ãƒ†ã�•ã‚Œã�¦ã�Šã‚Šã€�å¿…</div><div class='add'>+è¦�ã�«å¿œã�˜ã�¦ãƒªãƒªãƒ¼ã‚¹ã�•ã‚Œã�¾ã�™ã€‚通常ã�®ãƒªãƒªãƒ¼ã‚¹æœŸé–“ã�¯ 2週間毎ã�§ã�™ã�Œã€�å·®ã�—è¿«ã�£</div><div class='add'>+ã�Ÿå•�é¡Œã�Œã�ªã�‘ã‚Œã�°ã‚‚ã�†å°‘ã�—é•·ã��ã�ªã‚‹ã�“ã�¨ã‚‚ã�‚ã‚Šã�¾ã�™ã€‚セキュリティ関連ã�®å•�é¡Œ</div><div class='add'>+ã�®å ´å�ˆã�¯ã�“ã‚Œã�«å¯¾ã�—ã�¦ã� ã�„ã�Ÿã�„ã�®å ´å�ˆã€�ã�™ã��ã�«ãƒªãƒªãƒ¼ã‚¹ã�Œã�•ã‚Œã�¾ã�™ã€‚</div><div class='ctx'> </div><div class='ctx'> カーãƒ�ルツリーã�«å…¥ã�£ã�¦ã�„ã‚‹ã€�Documentation/stable_kernel_rules.txt ファ</div><div class='ctx'> イルã�«ã�¯ã�©ã�®ã‚ˆã�†ã�ªç¨®é¡žã�®å¤‰æ›´ã�Œ -stable ツリーã�«å�—ã�‘入れå�¯èƒ½ã�‹ã€�ã�¾ã�Ÿãƒª</div><div class='hunk'>@@ -341,7 +345,9 @@ linux-kernel メーリングリストã�§å�Žé›†ã�•ã‚Œã�Ÿå¤šæ•°ã�®ãƒ‘ッãƒ�ã�¨å�Œæ</div><div class='ctx'> メインラインã�¸å…¥ã‚Œã‚‹ã‚ˆã�†ã�« Linus ã�«ãƒ—ッシュã�—ã�¾ã�™ã€‚</div><div class='ctx'> </div><div class='ctx'> メインカーãƒ�ルツリーã�«å�«ã‚�ã‚‹ã�Ÿã‚�ã�« Linus ã�«é€�ã‚‹å‰�ã�«ã€�ã�™ã�¹ã�¦ã�®æ–°ã�—ã�„パッ</div><div class='del'>-ãƒ�ã�Œ -mm ツリーã�§ãƒ†ã‚¹ãƒˆã�•ã‚Œã‚‹ã�“ã�¨ã�Œå¼·ã��推奨ã�•ã‚Œã�¾ã�™ã€‚</div><div class='add'>+ãƒ�ã�Œ -mm ツリーã�§ãƒ†ã‚¹ãƒˆã�•ã‚Œã‚‹ã�“ã�¨ã�Œå¼·ã��推奨ã�•ã‚Œã�¦ã�„ã�¾ã�™ã€‚マージウィン</div><div class='add'>+ドウã�Œé–‹ã��å‰�ã�« -mm ツリーã�«ç�¾ã‚Œã�ªã�‹ã�£ã�Ÿãƒ‘ッãƒ�ã�¯ãƒ¡ã‚¤ãƒ³ãƒ©ã‚¤ãƒ³ã�«ãƒžãƒ¼ã‚¸ã�•</div><div class='add'>+れるã�“ã�¨ã�¯å›°é›£ã�«ã�ªã‚Šã�¾ã�™ã€‚</div><div class='ctx'> </div><div class='ctx'> ã�“れらã�®ã‚«ãƒ¼ãƒ�ルã�¯å®‰å®šã�—ã�¦å‹•ä½œã�™ã�¹ã��システムã�¨ã�—ã�¦ä½¿ã�†ã�®ã�«ã�¯é�©åˆ‡ã�§ã�¯ã�‚</div><div class='ctx'> ã‚Šã�¾ã�›ã‚“ã�—ã€�カーãƒ�ルブランãƒ�ã�®ä¸­ã�§ã‚‚ã‚‚ã�£ã�¨ã‚‚動作ã�«ãƒªã‚¹ã‚¯ã�Œé«˜ã�„ã‚‚ã�®ã�§ã�™ã€‚</div><div class='hunk'>@@ -395,13 +401,15 @@ linux-kernel メーリングリストã�§å�Žé›†ã�•ã‚Œã�Ÿå¤šæ•°ã�®ãƒ‘ッãƒ�ã�¨å�Œæ</div><div class='ctx'>     - pcmcia, Dominik Brodowski &lt;linux@dominikbrodowski.net&gt;</div><div class='ctx'> 	git.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git</div><div class='ctx'> </div><div class='del'>-    - SCSI, James Bottomley &lt;James.Bottomley@SteelEye.com&gt;</div><div class='add'>+    - SCSI, James Bottomley &lt;James.Bottomley@hansenpartnership.com&gt;</div><div class='ctx'> 	git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git</div><div class='ctx'> </div><div class='add'>+    - x86, Ingo Molnar &lt;mingo@elte.hu&gt;</div><div class='add'>+	git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git</div><div class='add'>+</div><div class='ctx'>   quilt ツリー-</div><div class='del'>-    - USB, PCI ドライãƒ�コアã�¨ I2C, Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='add'>+    - USB, ドライãƒ�コアã�¨ I2C, Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='ctx'> 	kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/</div><div class='del'>-    - x86-64 ã�¨ i386 ã�®ä»²é–“ Andi Kleen &lt;ak@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'>   ã��ã�®ä»–ã�®ã‚«ãƒ¼ãƒ�ルツリーã�¯ http://git.kernel.org/ ã�¨ MAINTAINERS ファ</div><div class='ctx'>   イルã�«ä¸€è¦§è¡¨ã�Œã�‚ã‚Šã�¾ã�™ã€‚</div><div class='hunk'>@@ -412,13 +420,32 @@ linux-kernel メーリングリストã�§å�Žé›†ã�•ã‚Œã�Ÿå¤šæ•°ã�®ãƒ‘ッãƒ�ã�¨å�Œæ</div><div class='ctx'> bugzilla.kernel.org ã�¯ Linux カーãƒ�ル開発者ã�Œã‚«ãƒ¼ãƒ�ルã�®ãƒ�グを追跡ã�™ã‚‹</div><div class='ctx'> 場所ã�§ã�™ã€‚ユーザã�¯è¦‹ã�¤ã�‘ã�Ÿãƒ�ã‚°ã�®å…¨ã�¦ã‚’ã�“ã�®ãƒ„ールã�§å ±å‘Šã�™ã�¹ã��ã�§ã�™ã€‚</div><div class='ctx'> ã�©ã�† kernel bugzilla を使ã�†ã�‹ã�®è©³ç´°ã�¯ã€�以下をå�‚ç…§ã�—ã�¦ã��ã� ã�•ã�„-</div><div class='del'>-	http://test.kernel.org/bugzilla/faq.html</div><div class='del'>-</div><div class='add'>+	http://bugzilla.kernel.org/page.cgi?id=faq.html</div><div class='ctx'> メインカーãƒ�ルソースディレクトリã�«ã�‚るファイル REPORTING-BUGS ã�¯ã‚«ãƒ¼ãƒ�</div><div class='ctx'> ルãƒ�グらã�—ã�„ã‚‚ã�®ã�«ã�¤ã�„ã�¦ã�©ã�†ãƒ¬ãƒ�ートã�™ã‚‹ã�‹ã�®è‰¯ã�„テンプレートã�§ã�‚ã‚Šã€�å•�</div><div class='ctx'> é¡Œã�®è¿½è·¡ã‚’助ã�‘ã‚‹ã�Ÿã‚�ã�«ã‚«ãƒ¼ãƒ�ル開発者ã�«ã�¨ã�£ã�¦ã�©ã‚“ã�ªæƒ…å ±ã�Œå¿…è¦�ã�ªã�®ã�‹ã�®è©³</div><div class='ctx'> ç´°ã�Œæ›¸ã�‹ã‚Œã�¦ã�„ã�¾ã�™ã€‚</div><div class='ctx'> </div><div class='add'>+ãƒ�グレãƒ�ートã�®ç®¡ç�†</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+ã�‚ã�ªã�Ÿã�®ãƒ�ッキングã�®ã‚¹ã‚­ãƒ«ã‚’訓練ã�™ã‚‹æœ€é«˜ã�®æ–¹æ³•ã�®ã�²ã�¨ã�¤ã�«ã€�他人ã�Œãƒ¬ãƒ�ー</div><div class='add'>+トã�—ã�Ÿãƒ�グを修正ã�™ã‚‹ã�“ã�¨ã�Œã�‚ã‚Šã�¾ã�™ã€‚ã�‚ã�ªã�Ÿã�Œã‚«ãƒ¼ãƒ�ルをより安定化ã�•ã�›ã‚‹</div><div class='add'>+ã�“ã�«å¯„与ã�™ã‚‹ã�¨ã�„ã�†ã�“ã�¨ã� ã�‘ã�§ã�ªã��ã€�ã�‚ã�ªã�Ÿã�¯ ç�¾å®Ÿã�®å•�題を修正ã�™ã‚‹ã�“ã�¨ã‚’</div><div class='add'>+å­¦ã�³ã€�自分ã�®ã‚¹ã‚­ãƒ«ã‚‚強化ã�§ã��ã€�ã�¾ã�Ÿä»–ã�®é–‹ç™ºè€…ã�Œã�‚ã�ªã�Ÿã�®å­˜åœ¨ã�«æ°—ã�Œã�¤ã��</div><div class='add'>+ã�¾ã�™ã€‚ãƒ�グを修正ã�™ã‚‹ã�“ã�¨ã�¯ã€�多ã��ã�®é–‹ç™ºè€…ã�®ä¸­ã�‹ã‚‰è‡ªåˆ†ã�ŒåŠŸç¸¾ã‚’ã�‚ã�’る最善</div><div class='add'>+ã�®é�“ã�§ã�™ã€�ã�ªã�œã�ªã‚‰å¤šã��ã�®äººã�¯ä»–人ã�®ãƒ�ã‚°ã�®ä¿®æ­£ã�«æ™‚間を浪費ã�™ã‚‹ã�“ã�¨ã‚’好ã�¾</div><div class='add'>+ã�ªã�„ã�‹ã‚‰ã�§ã�™ã€‚</div><div class='add'>+</div><div class='add'>+ã�™ã�§ã�«ãƒ¬ãƒ�ートã�•ã‚Œã�Ÿãƒ�ã‚°ã�®ã�Ÿã‚�ã�«ä»•äº‹ã‚’ã�™ã‚‹ã�Ÿã‚�ã�«ã�¯ã€�</div><div class='add'>+http://bugzilla.kernel.org ã�«è¡Œã�£ã�¦ã��ã� ã�•ã�„。もã�—今後ã�®ãƒ�グレãƒ�ートã�«</div><div class='add'>+ã�¤ã�„ã�¦ã‚¢ãƒ‰ãƒ�イスをå�—ã�‘ã�Ÿã�„ã�®ã�§ã�‚ã‚Œã�°ã€�bugme-new メーリングリスト(æ–°ã�—</div><div class='add'>+ã�„ãƒ�グレãƒ�ートã� ã�‘ã�Œã�“ã�“ã�«ãƒ¡ãƒ¼ãƒ«ã�•ã‚Œã‚‹) ã�¾ã�Ÿã�¯ bugme-janitor メーリン</div><div class='add'>+グリスト(bugzilla ã�®å¤‰æ›´æ¯Žã�«ã�“ã�“ã�«ãƒ¡ãƒ¼ãƒ«ã�•ã‚Œã‚‹)を購読ã�§ã��ã�¾ã�™ã€‚</div><div class='add'>+</div><div class='add'>+	http://lists.linux-foundation.org/mailman/listinfo/bugme-new</div><div class='add'>+	http://lists.linux-foundation.org/mailman/listinfo/bugme-janitors</div><div class='add'>+</div><div class='ctx'> メーリングリスト</div><div class='ctx'> -------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/ja_JP/SubmitChecklist b/Documentation/ja_JP/SubmitChecklist<br/>new file mode 100644<br/>index 000000000000..6c42e071d723<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ja_JP/SubmitChecklist?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/ja_JP/SubmitChecklist</a></div><div class='hunk'>@@ -0,0 +1,111 @@</div><div class='add'>+NOTE:</div><div class='add'>+This is a version of Documentation/SubmitChecklist into Japanese.</div><div class='add'>+This document is maintained by Takenori Nagano &lt;t-nagano@ah.jp.nec.com&gt;</div><div class='add'>+and the JF Project team &lt;http://www.linux.or.jp/JF/&gt;.</div><div class='add'>+If you find any difference between this document and the original file</div><div class='add'>+or a problem with the translation,</div><div class='add'>+please contact the maintainer of this file or JF project.</div><div class='add'>+</div><div class='add'>+Please also note that the purpose of this file is to be easier to read</div><div class='add'>+for non English (read: Japanese) speakers and is not intended as a</div><div class='add'>+fork. So if you have any comments or updates of this file, please try</div><div class='add'>+to update the original English file first.</div><div class='add'>+</div><div class='add'>+Last Updated: 2008/07/14</div><div class='add'>+==================================</div><div class='add'>+ã�“ã‚Œã�¯ã€�</div><div class='add'>+linux-2.6.26/Documentation/SubmitChecklist ã�®å’Œè¨³ã�§ã�™ã€‚</div><div class='add'>+</div><div class='add'>+翻訳団体： JF プロジェクト &lt; http://www.linux.or.jp/JF/ &gt;</div><div class='add'>+翻訳日： 2008/07/14</div><div class='add'>+翻訳者： Takenori Nagano &lt;t-nagano at ah dot jp dot nec dot com&gt;</div><div class='add'>+校正者： Masanori Kobayashi ã�•ã‚“ &lt;zap03216 at nifty dot ne dot jp&gt;</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Linux カーãƒ�ルパッãƒ�投稿者å�‘ã�‘ãƒ�ェックリスト</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+本書ã�§ã�¯ã€�パッãƒ�をより素早ã��å�–り込んã�§ã‚‚らã�„ã�Ÿã�„開発者ã�Œå®Ÿè·µã�™ã�¹ã��基本的ã�ªäº‹æŸ„</div><div class='add'>+ã‚’ã�„ã��ã�¤ã�‹ç´¹ä»‹ã�—ã�¾ã�™ã€‚ã�“ã�“ã�«ã�‚ã‚‹å…¨ã�¦ã�®äº‹æŸ„ã�¯ã€�Documentation/SubmittingPatches</div><div class='add'>+ã�ªã�©ã�®Linuxカーãƒ�ルパッãƒ�投稿ã�«éš›ã�—ã�¦ã�®å¿ƒå¾—を補足ã�™ã‚‹ã‚‚ã�®ã�§ã�™ã€‚</div><div class='add'>+</div><div class='add'>+ 1: 妥当ã�ªCONFIGオプションや変更ã�•ã‚Œã�ŸCONFIGオプションã€�ã�¤ã�¾ã‚Š =y, =m, =n</div><div class='add'>+    å…¨ã�¦ã�§æ­£ã�—ã��ビルドã�§ã��ã‚‹ã�“ã�¨ã‚’確èª�ã�—ã�¦ã��ã� ã�•ã�„。ã��ã�®éš›ã€�gccå�Šã�³ãƒªãƒ³ã‚«ã�Œ</div><div class='add'>+    warningã‚„errorを出ã�—ã�¦ã�„ã�ªã�„ã�“ã�¨ã‚‚確èª�ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+ 2: allnoconfig, allmodconfig オプションを用ã�„ã�¦æ­£ã�—ã��ビルドã�§ã��ã‚‹ã�“ã�¨ã‚’</div><div class='add'>+    確èª�ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+ 3: 手許ã�®ã‚¯ãƒ­ã‚¹ã‚³ãƒ³ãƒ‘イルツールやOSDLã�®PLMã�®ã‚ˆã�†ã�ªã‚‚ã�®ã‚’用ã�„ã�¦ã€�複数ã�®</div><div class='add'>+    アーキテクãƒ�ャã�«ã�Šã�„ã�¦ã‚‚æ­£ã�—ã��ビルドã�§ã��ã‚‹ã�“ã�¨ã‚’確èª�ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+ 4: 64bité•·ã�®'unsigned long'を使用ã�—ã�¦ã�„ã‚‹ppc64ã�¯ã€�クロスコンパイルã�§ã�®</div><div class='add'>+    ãƒ�ェックã�«é�©å½“ã�ªã‚¢ãƒ¼ã‚­ãƒ†ã‚¯ãƒ�ャã�§ã�™ã€‚</div><div class='add'>+</div><div class='add'>+ 5: カーãƒ�ルコーディングスタイルã�«æº–æ‹ ã�—ã�¦ã�„ã‚‹ã�‹ã�©ã�†ã�‹ç¢ºèª�ã�—ã�¦ã��ã� ã�•ã�„(!)</div><div class='add'>+</div><div class='add'>+ 6: CONFIGオプションã�®è¿½åŠ ãƒ»å¤‰æ›´ã‚’ã�—ã�Ÿå ´å�ˆã�«ã�¯ã€�CONFIGメニューã�Œå£Šã‚Œã�¦ã�„ã�ªã�„</div><div class='add'>+    ã�“ã�¨ã‚’確èª�ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+ 7: æ–°ã�—ã��Kconfigã�®ã‚ªãƒ—ションを追加ã�™ã‚‹éš›ã�«ã�¯ã€�å¿…ã�šã��ã�®helpも記述ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+ 8: é�©åˆ‡ã�ªKconfigã�®ä¾�存関係を考ã�ˆã�ªã�Œã‚‰æ…Žé‡�ã�«ãƒ�ェックã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+    ã�Ÿã� ã�—ã€�ã�“ã�®ä½œæ¥­ã�¯ãƒžã‚·ãƒ³ã‚’使ã�£ã�Ÿãƒ†ã‚¹ãƒˆã�§ã��ã�¡ã‚“ã�¨è¡Œã�†ã�®ã�Œã�¨ã�¦ã‚‚困難ã�§ã�™ã€‚</div><div class='add'>+    ã�†ã�¾ã��ã‚„ã‚‹ã�«ã�¯ã€�自分ã�®é ­ã�§è€ƒã�ˆã‚‹ã�“ã�¨ã�§ã�™ã€‚</div><div class='add'>+</div><div class='add'>+ 9: sparseを利用ã�—ã�¦ã�¡ã‚ƒã‚“ã�¨ã�—ã�Ÿã‚³ãƒ¼ãƒ‰ãƒ�ェックをã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+10: 'make checkstack' ã�¨ 'make namespacecheck' を利用ã�—ã€�å•�é¡Œã�Œç™ºè¦‹ã�•ã‚Œã�Ÿã‚‰</div><div class='add'>+    修正ã�—ã�¦ã��ã� ã�•ã�„。'make checkstack' ã�¯æ˜Žç¤ºçš„ã�«å•�題を示ã�—ã�¾ã�›ã‚“ã�Œã€�ã�©ã‚Œã�‹</div><div class='add'>+    １ã�¤ã�®é–¢æ•°ã�Œ512ãƒ�イトより大ã��ã�„スタックを使ã�£ã�¦ã�„ã‚Œã�°ã€�修正ã�™ã�¹ã��候補ã�¨</div><div class='add'>+    ã�ªã‚Šã�¾ã�™ã€‚</div><div class='add'>+</div><div class='add'>+11: グローãƒ�ルã�ªkernel API を説明ã�™ã‚‹ kernel-doc をソースã�®ä¸­ã�«å�«ã‚�ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+    ( staticã�ªé–¢æ•°ã�«ã�Šã�„ã�¦ã�¯å¿…é ˆã�§ã�¯ã�‚ã‚Šã�¾ã�›ã‚“ã�Œã€�å�«ã‚�ã�¦ã‚‚らã�£ã�¦ã‚‚çµ�構ã�§ã�™ )</div><div class='add'>+    ã��ã�—ã�¦ã€�'make htmldocs' ã‚‚ã�—ã��ã�¯ 'make mandocs' を利用ã�—ã�¦è¿½è¨˜ã�—ã�Ÿ</div><div class='add'>+    ドキュメントã�®ãƒ�ェックを行ã�„ã€�å•�é¡Œã�Œè¦‹ã�¤ã�‹ã�£ã�Ÿå ´å�ˆã�«ã�¯ä¿®æ­£ã‚’è¡Œã�£ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+12: CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT, CONFIG_DEBUG_SLAB,</div><div class='add'>+    CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES, CONFIG_DEBUG_SPINLOCK,</div><div class='add'>+    CONFIG_DEBUG_SPINLOCK_SLEEP ã�“れら全ã�¦ã‚’å�Œæ™‚ã�«æœ‰åŠ¹ã�«ã�—ã�¦å‹•ä½œç¢ºèª�ã‚’</div><div class='add'>+    è¡Œã�£ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+13: CONFIG_SMP, CONFIG_PREEMPT を有効ã�«ã�—ã�Ÿå ´å�ˆã�¨ç„¡åŠ¹ã�«ã�—ã�Ÿå ´å�ˆã�®ä¸¡æ–¹ã�§</div><div class='add'>+    ビルドã�—ã�Ÿä¸Šã€�動作確èª�ã‚’è¡Œã�£ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+14: ã‚‚ã�—パッãƒ�ã�Œãƒ‡ã‚£ã‚¹ã‚¯ã�®I/O性能ã�ªã�©ã�«å½±éŸ¿ã‚’与ã�ˆã‚‹ã‚ˆã�†ã�§ã�‚ã‚Œã�°ã€�</div><div class='add'>+    'CONFIG_LBD'オプションを有効ã�«ã�—ã�Ÿå ´å�ˆã�¨ç„¡åŠ¹ã�«ã�—ã�Ÿå ´å�ˆã�®ä¸¡æ–¹ã�§</div><div class='add'>+    テストを実施ã�—ã�¦ã�¿ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+15: lockdepã�®æ©Ÿèƒ½ã‚’å…¨ã�¦æœ‰åŠ¹ã�«ã�—ã�Ÿä¸Šã�§ã€�å…¨ã�¦ã�®ã‚³ãƒ¼ãƒ‰ãƒ‘スを評価ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+16: /proc ã�«æ–°ã�—ã�„エントリを追加ã�—ã�Ÿå ´å�ˆã�«ã�¯ã€�Documentation/ é…�下ã�«</div><div class='add'>+    å¿…ã�šãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã‚’追加ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+17: æ–°ã�—ã�„ブートパラメータを追加ã�—ã�Ÿå ´å�ˆã�«ã�¯ã€�</div><div class='add'>+    å¿…ã�šDocumentation/kernel-parameters.txt ã�«èª¬æ˜Žã‚’追加ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+18: æ–°ã�—ã��moduleã�«ãƒ‘ラメータを追加ã�—ã�Ÿå ´å�ˆã�«ã�¯ã€�MODULE_PARM_DESC()ã‚’</div><div class='add'>+    利用ã�—ã�¦å¿…ã�šã��ã�®èª¬æ˜Žã‚’記述ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+19: æ–°ã�—ã�„userspaceインタフェースを作æˆ�ã�—ã�Ÿå ´å�ˆã�«ã�¯ã€�Documentation/ABI/ ã�«</div><div class='add'>+    Documentation/ABI/README ã‚’å�‚考ã�«ã�—ã�¦å¿…ã�šãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã‚’追加ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+20: 'make headers_check'を実行ã�—ã�¦å…¨ã��å•�é¡Œã�Œã�ªã�„ã�“ã�¨ã‚’確èª�ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+21: å°‘ã�ªã��ã�¨ã‚‚slabアロケーションã�¨pageアロケーションã�«å¤±æ•—ã�—ã�Ÿå ´å�ˆã�®</div><div class='add'>+    挙動ã�«ã�¤ã�„ã�¦ã€�fault-injectionを利用ã�—ã�¦ç¢ºèª�ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+    Documentation/fault-injection/ ã‚’å�‚ç…§ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+</div><div class='add'>+    追加ã�—ã�Ÿã‚³ãƒ¼ãƒ‰ã�Œã�‹ã�ªã‚Šã�®é‡�ã�§ã�‚ã�£ã�Ÿã�ªã‚‰ã�°ã€�サブシステム特有ã�®</div><div class='add'>+    fault-injectionを追加ã�—ã�Ÿã�»ã�†ã�Œè‰¯ã�„ã�‹ã‚‚ã�—ã‚Œã�¾ã�›ã‚“。</div><div class='add'>+</div><div class='add'>+22: æ–°ã�Ÿã�«è¿½åŠ ã�—ã�Ÿã‚³ãƒ¼ãƒ‰ã�¯ã€�`gcc -W'ã�§ã‚³ãƒ³ãƒ‘イルã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+    ã�“ã�®ã‚ªãƒ—ションã�¯å¤§é‡�ã�®ä¸�è¦�ã�ªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’出力ã�—ã�¾ã�™ã�Œã€�</div><div class='add'>+    "warning: comparison between signed and unsigned" ã�®ã‚ˆã�†ã�ªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã�¯ã€�</div><div class='add'>+    ãƒ�グを見ã�¤ã�‘ã‚‹ã�®ã�«å½¹ã�«ç«‹ã�¡ã�¾ã�™ã€‚</div><div class='add'>+</div><div class='add'>+23: 投稿ã�—ã�Ÿãƒ‘ッãƒ�ã�Œ -mm パッãƒ�セットã�«ãƒžãƒ¼ã‚¸ã�•ã‚Œã�Ÿå¾Œã€�å…¨ã�¦ã�®æ—¢å­˜ã�®ãƒ‘ッãƒ�ã‚„</div><div class='add'>+    VM, VFS ã�Šã‚ˆã�³ã��ã�®ä»–ã�®ã‚µãƒ–システムã�«é–¢ã�™ã‚‹æ§˜ã€…ã�ªå¤‰æ›´ã�¨ã€�ç�¾æ™‚点ã�§ã‚‚共存</div><div class='add'>+    ã�§ã��ã‚‹ã�“ã�¨ã‚’確èª�ã�™ã‚‹ãƒ†ã‚¹ãƒˆã‚’è¡Œã�£ã�¦ã��ã� ã�•ã�„。</div><div class='head'>diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt<br/>index e7bea3e85304..1150444a21ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/kernel-parameters.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/kernel-parameters.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/kernel-parameters.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/kernel-parameters.txt</a></div><div class='hunk'>@@ -365,6 +365,8 @@ and is between 256 and 4096 characters. It is defined in the file</div><div class='ctx'> 			no delay (0).</div><div class='ctx'> 			Format: integer</div><div class='ctx'> </div><div class='add'>+	bootmem_debug	[KNL] Enable bootmem allocator debug messages.</div><div class='add'>+</div><div class='ctx'> 	bttv.card=	[HW,V4L] bttv (bt848 + bt878 based grabber cards)</div><div class='ctx'> 	bttv.radio=	Most important insmod options are available as</div><div class='ctx'> 			kernel args too.</div><div class='hunk'>@@ -1072,6 +1074,9 @@ and is between 256 and 4096 characters. It is defined in the file</div><div class='ctx'> </div><div class='ctx'> 			* [no]ncq: Turn on or off NCQ.</div><div class='ctx'> </div><div class='add'>+			* nohrst, nosrst, norst: suppress hard, soft</div><div class='add'>+                          and both resets.</div><div class='add'>+</div><div class='ctx'> 			If there are multiple matching configurations changing</div><div class='ctx'> 			the same attribute, the last one is used.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt<br/>index 02dc748b76c4..71f0fe1fc1b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/laptops/thinkpad-acpi.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/laptops/thinkpad-acpi.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/laptops/thinkpad-acpi.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/laptops/thinkpad-acpi.txt</a></div><div class='hunk'>@@ -44,7 +44,7 @@ detailed description):</div><div class='ctx'> 	- LCD brightness control</div><div class='ctx'> 	- Volume control</div><div class='ctx'> 	- Fan control and monitoring: fan speed, fan enable/disable</div><div class='del'>-	- Experimental: WAN enable and disable</div><div class='add'>+	- WAN enable and disable</div><div class='ctx'> </div><div class='ctx'> A compatibility table by model and feature is maintained on the web</div><div class='ctx'> site, http://ibm-acpi.sf.net/. I appreciate any success or failure</div><div class='hunk'>@@ -1375,18 +1375,13 @@ with EINVAL, try to set pwm1_enable to 1 and pwm1 to at least 128 (255</div><div class='ctx'> would be the safest choice, though).</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXPERIMENTAL: WAN</div><div class='del'>------------------</div><div class='add'>+WAN</div><div class='add'>+---</div><div class='ctx'> </div><div class='ctx'> procfs: /proc/acpi/ibm/wan</div><div class='ctx'> sysfs device attribute: wwan_enable (deprecated)</div><div class='ctx'> sysfs rfkill class: switch "tpacpi_wwan_sw"</div><div class='ctx'> </div><div class='del'>-This feature is marked EXPERIMENTAL because the implementation</div><div class='del'>-directly accesses hardware registers and may not work as expected. USE</div><div class='del'>-WITH CAUTION! To use this feature, you need to supply the</div><div class='del'>-experimental=1 parameter when loading the module.</div><div class='del'>-</div><div class='ctx'> This feature shows the presence and current state of a W-WAN (Sierra</div><div class='ctx'> Wireless EV-DO) device.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c<br/>index b88b0ea54e90..7228369d1014 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/lguest/lguest.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/lguest/lguest.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/lguest/lguest.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/lguest/lguest.c</a></div><div class='hunk'>@@ -895,6 +895,9 @@ static void handle_console_output(int fd, struct virtqueue *vq, bool timeout)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* This is called when we no longer want to hear about Guest changes to a</div><div class='add'>+ * virtqueue.  This is more efficient in high-traffic cases, but it means we</div><div class='add'>+ * have to set a timer to check if any more changes have occurred. */</div><div class='ctx'> static void block_vq(struct virtqueue *vq)</div><div class='ctx'> {</div><div class='ctx'> 	struct itimerval itm;</div><div class='hunk'>@@ -939,6 +942,11 @@ static void handle_net_output(int fd, struct virtqueue *vq, bool timeout)</div><div class='ctx'> 	if (!timeout &amp;&amp; num)</div><div class='ctx'> 		block_vq(vq);</div><div class='ctx'> </div><div class='add'>+	/* We never quite know how long should we wait before we check the</div><div class='add'>+	 * queue again for more packets.  We start at 500 microseconds, and if</div><div class='add'>+	 * we get fewer packets than last time, we assume we made the timeout</div><div class='add'>+	 * too small and increase it by 10 microseconds.  Otherwise, we drop it</div><div class='add'>+	 * by one microsecond every time.  It seems to work well enough. */</div><div class='ctx'> 	if (timeout) {</div><div class='ctx'> 		if (num &lt; last_timeout_num)</div><div class='ctx'> 			timeout_usec += 10;</div><div class='hunk'>@@ -1447,21 +1455,6 @@ static void configure_device(int fd, const char *tapif, u32 ipaddr)</div><div class='ctx'> 		err(1, "Bringing interface %s up", tapif);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void get_mac(int fd, const char *tapif, unsigned char hwaddr[6])</div><div class='del'>-{</div><div class='del'>-	struct ifreq ifr;</div><div class='del'>-</div><div class='del'>-	memset(&amp;ifr, 0, sizeof(ifr));</div><div class='del'>-	strcpy(ifr.ifr_name, tapif);</div><div class='del'>-</div><div class='del'>-	/* SIOC stands for Socket I/O Control.  G means Get (vs S for Set</div><div class='del'>-	 * above).  IF means Interface, and HWADDR is hardware address.</div><div class='del'>-	 * Simple! */</div><div class='del'>-	if (ioctl(fd, SIOCGIFHWADDR, &amp;ifr) != 0)</div><div class='del'>-		err(1, "getting hw address for %s", tapif);</div><div class='del'>-	memcpy(hwaddr, ifr.ifr_hwaddr.sa_data, 6);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int get_tun_device(char tapif[IFNAMSIZ])</div><div class='ctx'> {</div><div class='ctx'> 	struct ifreq ifr;</div><div class='hunk'>@@ -1531,11 +1524,8 @@ static void setup_tun_net(char *arg)</div><div class='ctx'> 	p = strchr(arg, ':');</div><div class='ctx'> 	if (p) {</div><div class='ctx'> 		str2mac(p+1, conf.mac);</div><div class='add'>+		add_feature(dev, VIRTIO_NET_F_MAC);</div><div class='ctx'> 		*p = '\0';</div><div class='del'>-	} else {</div><div class='del'>-		p = arg + strlen(arg);</div><div class='del'>-		/* None supplied; query the randomly assigned mac. */</div><div class='del'>-		get_mac(ipfd, tapif, conf.mac);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* arg is now either an IP address or a bridge name */</div><div class='hunk'>@@ -1547,13 +1537,10 @@ static void setup_tun_net(char *arg)</div><div class='ctx'> 	/* Set up the tun device. */</div><div class='ctx'> 	configure_device(ipfd, tapif, ip);</div><div class='ctx'> </div><div class='del'>-	/* Tell Guest what MAC address to use. */</div><div class='del'>-	add_feature(dev, VIRTIO_NET_F_MAC);</div><div class='ctx'> 	add_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY);</div><div class='ctx'> 	/* Expect Guest to handle everything except UFO */</div><div class='ctx'> 	add_feature(dev, VIRTIO_NET_F_CSUM);</div><div class='ctx'> 	add_feature(dev, VIRTIO_NET_F_GUEST_CSUM);</div><div class='del'>-	add_feature(dev, VIRTIO_NET_F_MAC);</div><div class='ctx'> 	add_feature(dev, VIRTIO_NET_F_GUEST_TSO4);</div><div class='ctx'> 	add_feature(dev, VIRTIO_NET_F_GUEST_TSO6);</div><div class='ctx'> 	add_feature(dev, VIRTIO_NET_F_GUEST_ECN);</div><div class='head'>diff --git a/Documentation/networking/Makefile b/Documentation/networking/Makefile<br/>new file mode 100644<br/>index 000000000000..6d8af1ac56c4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/networking/Makefile</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+# kbuild trick to avoid linker error. Can be omitted if a module is built.</div><div class='add'>+obj- := dummy.o</div><div class='add'>+</div><div class='add'>+# List of programs to build</div><div class='add'>+hostprogs-y := ifenslave</div><div class='add'>+</div><div class='add'>+# Tell kbuild to always build the programs</div><div class='add'>+always := $(hostprogs-y)</div><div class='head'>diff --git a/Documentation/networking/ifenslave.c b/Documentation/networking/ifenslave.c<br/>index a12059886755..1b96ccda3836 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/networking/ifenslave.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/networking/ifenslave.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/ifenslave.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/networking/ifenslave.c</a></div><div class='hunk'>@@ -1081,7 +1081,7 @@ static int set_if_addr(char *master_ifname, char *slave_ifname)</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ipaddr = ifr.ifr_addr.sa_data;</div><div class='add'>+		ipaddr = (unsigned char *)ifr.ifr_addr.sa_data;</div><div class='ctx'> 		v_print("Interface '%s': set IP %s to %d.%d.%d.%d\n",</div><div class='ctx'> 			slave_ifname, ifra[i].desc,</div><div class='ctx'> 			ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]);</div><div class='head'>diff --git a/Documentation/pcmcia/Makefile b/Documentation/pcmcia/Makefile<br/>new file mode 100644<br/>index 000000000000..accde871ae77<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/pcmcia/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/pcmcia/Makefile</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# kbuild trick to avoid linker error. Can be omitted if a module is built.</div><div class='add'>+obj- := dummy.o</div><div class='add'>+</div><div class='add'>+# List of programs to build</div><div class='add'>+hostprogs-y := crc32hash</div><div class='add'>+</div><div class='add'>+# Tell kbuild to always build the programs</div><div class='add'>+always := $(hostprogs-y)</div><div class='add'>+</div><div class='add'>+HOSTCFLAGS_crc32hash.o += -I$(objtree)/usr/include</div><div class='head'>diff --git a/Documentation/pcmcia/crc32hash.c b/Documentation/pcmcia/crc32hash.c<br/>index cbc36d299af8..4210e5abab8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/pcmcia/crc32hash.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/pcmcia/crc32hash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/pcmcia/crc32hash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/pcmcia/crc32hash.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@ int main(int argc, char **argv) {</div><div class='ctx'> 		printf("no string passed as argument\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='del'>-	result = crc32(argv[1], strlen(argv[1]));</div><div class='add'>+	result = crc32((unsigned char const *)argv[1], strlen(argv[1]));</div><div class='ctx'> 	printf("0x%x\n", result);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/Documentation/power/pm_qos_interface.txt b/Documentation/power/pm_qos_interface.txt<br/>index 49adb1a33514..c40866e8b957 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/power/pm_qos_interface.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/power/pm_qos_interface.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/power/pm_qos_interface.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/power/pm_qos_interface.txt</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-PM quality of Service interface.</div><div class='add'>+PM Quality Of Service Interface.</div><div class='ctx'> </div><div class='ctx'> This interface provides a kernel and user mode interface for registering</div><div class='ctx'> performance expectations by drivers, subsystems and user space applications on</div><div class='hunk'>@@ -7,6 +7,11 @@ one of the parameters.</div><div class='ctx'> Currently we have {cpu_dma_latency, network_latency, network_throughput} as the</div><div class='ctx'> initial set of pm_qos parameters.</div><div class='ctx'> </div><div class='add'>+Each parameters have defined units:</div><div class='add'>+ * latency: usec</div><div class='add'>+ * timeout: usec</div><div class='add'>+ * throughput: kbs (kilo bit / sec)</div><div class='add'>+</div><div class='ctx'> The infrastructure exposes multiple misc device nodes one per implemented</div><div class='ctx'> parameter.  The set of parameters implement is defined by pm_qos_power_init()</div><div class='ctx'> and pm_qos_params.h.  This is done because having the available parameters</div><div class='head'>diff --git a/Documentation/power/power_supply_class.txt b/Documentation/power/power_supply_class.txt<br/>index a8686e5a6857..c6cd4956047c 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/power/power_supply_class.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/power/power_supply_class.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/power/power_supply_class.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/power/power_supply_class.txt</a></div><div class='hunk'>@@ -101,6 +101,10 @@ of charge when battery became full/empty". It also could mean "value of</div><div class='ctx'> charge when battery considered full/empty at given conditions (temperature,</div><div class='ctx'> age)". I.e. these attributes represents real thresholds, not design values.</div><div class='ctx'> </div><div class='add'>+CHARGE_COUNTER - the current charge counter (in µAh).  This could easily</div><div class='add'>+be negative; there is no empty or full value.  It is only useful for</div><div class='add'>+relative, time-based measurements.</div><div class='add'>+</div><div class='ctx'> ENERGY_FULL, ENERGY_EMPTY - same as above but for energy.</div><div class='ctx'> </div><div class='ctx'> CAPACITY - capacity in percents.</div><div class='head'>diff --git a/Documentation/power/regulator/consumer.txt b/Documentation/power/regulator/consumer.txt<br/>new file mode 100644<br/>index 000000000000..82b7a43aadba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/power/regulator/consumer.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/power/regulator/consumer.txt</a></div><div class='hunk'>@@ -0,0 +1,182 @@</div><div class='add'>+Regulator Consumer Driver Interface</div><div class='add'>+===================================</div><div class='add'>+</div><div class='add'>+This text describes the regulator interface for consumer device drivers.</div><div class='add'>+Please see overview.txt for a description of the terms used in this text.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1. Consumer Regulator Access (static &amp; dynamic drivers)</div><div class='add'>+=======================================================</div><div class='add'>+</div><div class='add'>+A consumer driver can get access to it's supply regulator by calling :-</div><div class='add'>+</div><div class='add'>+regulator = regulator_get(dev, "Vcc");</div><div class='add'>+</div><div class='add'>+The consumer passes in it's struct device pointer and power supply ID. The core</div><div class='add'>+then finds the correct regulator by consulting a machine specific lookup table.</div><div class='add'>+If the lookup is successful then this call will return a pointer to the struct</div><div class='add'>+regulator that supplies this consumer.</div><div class='add'>+</div><div class='add'>+To release the regulator the consumer driver should call :-</div><div class='add'>+</div><div class='add'>+regulator_put(regulator);</div><div class='add'>+</div><div class='add'>+Consumers can be supplied by more than one regulator e.g. codec consumer with</div><div class='add'>+analog and digital supplies :-</div><div class='add'>+</div><div class='add'>+digital = regulator_get(dev, "Vcc");  /* digital core */</div><div class='add'>+analog = regulator_get(dev, "Avdd");  /* analog */</div><div class='add'>+</div><div class='add'>+The regulator access functions regulator_get() and regulator_put() will</div><div class='add'>+usually be called in your device drivers probe() and remove() respectively.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2. Regulator Output Enable &amp; Disable (static &amp; dynamic drivers)</div><div class='add'>+====================================================================</div><div class='add'>+</div><div class='add'>+A consumer can enable it's power supply by calling:-</div><div class='add'>+</div><div class='add'>+int regulator_enable(regulator);</div><div class='add'>+</div><div class='add'>+NOTE: The supply may already be enabled before regulator_enabled() is called.</div><div class='add'>+This may happen if the consumer shares the regulator or the regulator has been</div><div class='add'>+previously enabled by bootloader or kernel board initialization code.</div><div class='add'>+</div><div class='add'>+A consumer can determine if a regulator is enabled by calling :-</div><div class='add'>+</div><div class='add'>+int regulator_is_enabled(regulator);</div><div class='add'>+</div><div class='add'>+This will return &gt; zero when the regulator is enabled.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+A consumer can disable it's supply when no longer needed by calling :-</div><div class='add'>+</div><div class='add'>+int regulator_disable(regulator);</div><div class='add'>+</div><div class='add'>+NOTE: This may not disable the supply if it's shared with other consumers. The</div><div class='add'>+regulator will only be disabled when the enabled reference count is zero.</div><div class='add'>+</div><div class='add'>+Finally, a regulator can be forcefully disabled in the case of an emergency :-</div><div class='add'>+</div><div class='add'>+int regulator_force_disable(regulator);</div><div class='add'>+</div><div class='add'>+NOTE: this will immediately and forcefully shutdown the regulator output. All</div><div class='add'>+consumers will be powered off.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3. Regulator Voltage Control &amp; Status (dynamic drivers)</div><div class='add'>+======================================================</div><div class='add'>+</div><div class='add'>+Some consumer drivers need to be able to dynamically change their supply</div><div class='add'>+voltage to match system operating points. e.g. CPUfreq drivers can scale</div><div class='add'>+voltage along with frequency to save power, SD drivers may need to select the</div><div class='add'>+correct card voltage, etc.</div><div class='add'>+</div><div class='add'>+Consumers can control their supply voltage by calling :-</div><div class='add'>+</div><div class='add'>+int regulator_set_voltage(regulator, min_uV, max_uV);</div><div class='add'>+</div><div class='add'>+Where min_uV and max_uV are the minimum and maximum acceptable voltages in</div><div class='add'>+microvolts.</div><div class='add'>+</div><div class='add'>+NOTE: this can be called when the regulator is enabled or disabled. If called</div><div class='add'>+when enabled, then the voltage changes instantly, otherwise the voltage</div><div class='add'>+configuration changes and the voltage is physically set when the regulator is</div><div class='add'>+next enabled.</div><div class='add'>+</div><div class='add'>+The regulators configured voltage output can be found by calling :-</div><div class='add'>+</div><div class='add'>+int regulator_get_voltage(regulator);</div><div class='add'>+</div><div class='add'>+NOTE: get_voltage() will return the configured output voltage whether the</div><div class='add'>+regulator is enabled or disabled and should NOT be used to determine regulator</div><div class='add'>+output state. However this can be used in conjunction with is_enabled() to</div><div class='add'>+determine the regulator physical output voltage.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4. Regulator Current Limit Control &amp; Status (dynamic drivers)</div><div class='add'>+===========================================================</div><div class='add'>+</div><div class='add'>+Some consumer drivers need to be able to dynamically change their supply</div><div class='add'>+current limit to match system operating points. e.g. LCD backlight driver can</div><div class='add'>+change the current limit to vary the backlight brightness, USB drivers may want</div><div class='add'>+to set the limit to 500mA when supplying power.</div><div class='add'>+</div><div class='add'>+Consumers can control their supply current limit by calling :-</div><div class='add'>+</div><div class='add'>+int regulator_set_current_limit(regulator, min_uV, max_uV);</div><div class='add'>+</div><div class='add'>+Where min_uA and max_uA are the minimum and maximum acceptable current limit in</div><div class='add'>+microamps.</div><div class='add'>+</div><div class='add'>+NOTE: this can be called when the regulator is enabled or disabled. If called</div><div class='add'>+when enabled, then the current limit changes instantly, otherwise the current</div><div class='add'>+limit configuration changes and the current limit is physically set when the</div><div class='add'>+regulator is next enabled.</div><div class='add'>+</div><div class='add'>+A regulators current limit can be found by calling :-</div><div class='add'>+</div><div class='add'>+int regulator_get_current_limit(regulator);</div><div class='add'>+</div><div class='add'>+NOTE: get_current_limit() will return the current limit whether the regulator</div><div class='add'>+is enabled or disabled and should not be used to determine regulator current</div><div class='add'>+load.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5. Regulator Operating Mode Control &amp; Status (dynamic drivers)</div><div class='add'>+=============================================================</div><div class='add'>+</div><div class='add'>+Some consumers can further save system power by changing the operating mode of</div><div class='add'>+their supply regulator to be more efficient when the consumers operating state</div><div class='add'>+changes. e.g. consumer driver is idle and subsequently draws less current</div><div class='add'>+</div><div class='add'>+Regulator operating mode can be changed indirectly or directly.</div><div class='add'>+</div><div class='add'>+Indirect operating mode control.</div><div class='add'>+--------------------------------</div><div class='add'>+Consumer drivers can request a change in their supply regulator operating mode</div><div class='add'>+by calling :-</div><div class='add'>+</div><div class='add'>+int regulator_set_optimum_mode(struct regulator *regulator, int load_uA);</div><div class='add'>+</div><div class='add'>+This will cause the core to recalculate the total load on the regulator (based</div><div class='add'>+on all it's consumers) and change operating mode (if necessary and permitted)</div><div class='add'>+to best match the current operating load.</div><div class='add'>+</div><div class='add'>+The load_uA value can be determined from the consumers datasheet. e.g.most</div><div class='add'>+datasheets have tables showing the max current consumed in certain situations.</div><div class='add'>+</div><div class='add'>+Most consumers will use indirect operating mode control since they have no</div><div class='add'>+knowledge of the regulator or whether the regulator is shared with other</div><div class='add'>+consumers.</div><div class='add'>+</div><div class='add'>+Direct operating mode control.</div><div class='add'>+------------------------------</div><div class='add'>+Bespoke or tightly coupled drivers may want to directly control regulator</div><div class='add'>+operating mode depending on their operating point. This can be achieved by</div><div class='add'>+calling :-</div><div class='add'>+</div><div class='add'>+int regulator_set_mode(struct regulator *regulator, unsigned int mode);</div><div class='add'>+unsigned int regulator_get_mode(struct regulator *regulator);</div><div class='add'>+</div><div class='add'>+Direct mode will only be used by consumers that *know* about the regulator and</div><div class='add'>+are not sharing the regulator with other consumers.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+6. Regulator Events</div><div class='add'>+===================</div><div class='add'>+Regulators can notify consumers of external events. Events could be received by</div><div class='add'>+consumers under regulator stress or failure conditions.</div><div class='add'>+</div><div class='add'>+Consumers can register interest in regulator events by calling :-</div><div class='add'>+</div><div class='add'>+int regulator_register_notifier(struct regulator *regulator,</div><div class='add'>+			      struct notifier_block *nb);</div><div class='add'>+</div><div class='add'>+Consumers can uregister interest by calling :-</div><div class='add'>+</div><div class='add'>+int regulator_unregister_notifier(struct regulator *regulator,</div><div class='add'>+				struct notifier_block *nb);</div><div class='add'>+</div><div class='add'>+Regulators use the kernel notifier framework to send event to thier interested</div><div class='add'>+consumers.</div><div class='head'>diff --git a/Documentation/power/regulator/machine.txt b/Documentation/power/regulator/machine.txt<br/>new file mode 100644<br/>index 000000000000..c9a35665cf70<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/power/regulator/machine.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/power/regulator/machine.txt</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+Regulator Machine Driver Interface</div><div class='add'>+===================================</div><div class='add'>+</div><div class='add'>+The regulator machine driver interface is intended for board/machine specific</div><div class='add'>+initialisation code to configure the regulator subsystem. Typical things that</div><div class='add'>+machine drivers would do are :-</div><div class='add'>+</div><div class='add'>+ 1. Regulator -&gt; Device mapping.</div><div class='add'>+ 2. Regulator supply configuration.</div><div class='add'>+ 3. Power Domain constraint setting.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1. Regulator -&gt; device mapping</div><div class='add'>+==============================</div><div class='add'>+Consider the following machine :-</div><div class='add'>+</div><div class='add'>+  Regulator-1 -+-&gt; Regulator-2 --&gt; [Consumer A @ 1.8 - 2.0V]</div><div class='add'>+               |</div><div class='add'>+               +-&gt; [Consumer B @ 3.3V]</div><div class='add'>+</div><div class='add'>+The drivers for consumers A &amp; B must be mapped to the correct regulator in</div><div class='add'>+order to control their power supply. This mapping can be achieved in machine</div><div class='add'>+initialisation code by calling :-</div><div class='add'>+</div><div class='add'>+int regulator_set_device_supply(const char *regulator, struct device *dev,</div><div class='add'>+				const char *supply);</div><div class='add'>+</div><div class='add'>+and is shown with the following code :-</div><div class='add'>+</div><div class='add'>+regulator_set_device_supply("Regulator-1", devB, "Vcc");</div><div class='add'>+regulator_set_device_supply("Regulator-2", devA, "Vcc");</div><div class='add'>+</div><div class='add'>+This maps Regulator-1 to the 'Vcc' supply for Consumer B and maps Regulator-2</div><div class='add'>+to the 'Vcc' supply for Consumer A.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2. Regulator supply configuration.</div><div class='add'>+==================================</div><div class='add'>+Consider the following machine (again) :-</div><div class='add'>+</div><div class='add'>+  Regulator-1 -+-&gt; Regulator-2 --&gt; [Consumer A @ 1.8 - 2.0V]</div><div class='add'>+               |</div><div class='add'>+               +-&gt; [Consumer B @ 3.3V]</div><div class='add'>+</div><div class='add'>+Regulator-1 supplies power to Regulator-2. This relationship must be registered</div><div class='add'>+with the core so that Regulator-1 is also enabled when Consumer A enables it's</div><div class='add'>+supply (Regulator-2).</div><div class='add'>+</div><div class='add'>+This relationship can be register with the core via :-</div><div class='add'>+</div><div class='add'>+int regulator_set_supply(const char *regulator, const char *regulator_supply);</div><div class='add'>+</div><div class='add'>+In this example we would use the following code :-</div><div class='add'>+</div><div class='add'>+regulator_set_supply("Regulator-2", "Regulator-1");</div><div class='add'>+</div><div class='add'>+Relationships can be queried by calling :-</div><div class='add'>+</div><div class='add'>+const char *regulator_get_supply(const char *regulator);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3. Power Domain constraint setting.</div><div class='add'>+===================================</div><div class='add'>+Each power domain within a system has physical constraints on voltage and</div><div class='add'>+current. This must be defined in software so that the power domain is always</div><div class='add'>+operated within specifications.</div><div class='add'>+</div><div class='add'>+Consider the following machine (again) :-</div><div class='add'>+</div><div class='add'>+  Regulator-1 -+-&gt; Regulator-2 --&gt; [Consumer A @ 1.8 - 2.0V]</div><div class='add'>+               |</div><div class='add'>+               +-&gt; [Consumer B @ 3.3V]</div><div class='add'>+</div><div class='add'>+This gives us two regulators and two power domains:</div><div class='add'>+</div><div class='add'>+                   Domain 1: Regulator-2, Consumer B.</div><div class='add'>+                   Domain 2: Consumer A.</div><div class='add'>+</div><div class='add'>+Constraints can be registered by calling :-</div><div class='add'>+</div><div class='add'>+int regulator_set_platform_constraints(const char *regulator,</div><div class='add'>+	struct regulation_constraints *constraints);</div><div class='add'>+</div><div class='add'>+The example is defined as follows :-</div><div class='add'>+</div><div class='add'>+struct regulation_constraints domain_1 = {</div><div class='add'>+	.min_uV = 3300000,</div><div class='add'>+	.max_uV = 3300000,</div><div class='add'>+	.valid_modes_mask = REGULATOR_MODE_NORMAL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct regulation_constraints domain_2 = {</div><div class='add'>+	.min_uV = 1800000,</div><div class='add'>+	.max_uV = 2000000,</div><div class='add'>+	.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,</div><div class='add'>+	.valid_modes_mask = REGULATOR_MODE_NORMAL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+regulator_set_platform_constraints("Regulator-1", &amp;domain_1);</div><div class='add'>+regulator_set_platform_constraints("Regulator-2", &amp;domain_2);</div><div class='head'>diff --git a/Documentation/power/regulator/overview.txt b/Documentation/power/regulator/overview.txt<br/>new file mode 100644<br/>index 000000000000..bdcb332bd7fb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/power/regulator/overview.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/power/regulator/overview.txt</a></div><div class='hunk'>@@ -0,0 +1,171 @@</div><div class='add'>+Linux voltage and current regulator framework</div><div class='add'>+=============================================</div><div class='add'>+</div><div class='add'>+About</div><div class='add'>+=====</div><div class='add'>+</div><div class='add'>+This framework is designed to provide a standard kernel interface to control</div><div class='add'>+voltage and current regulators.</div><div class='add'>+</div><div class='add'>+The intention is to allow systems to dynamically control regulator power output</div><div class='add'>+in order to save power and prolong battery life. This applies to both voltage</div><div class='add'>+regulators (where voltage output is controllable) and current sinks (where</div><div class='add'>+current limit is controllable).</div><div class='add'>+</div><div class='add'>+(C) 2008  Wolfson Microelectronics PLC.</div><div class='add'>+Author: Liam Girdwood &lt;lg@opensource.wolfsonmicro.com&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Nomenclature</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+Some terms used in this document:-</div><div class='add'>+</div><div class='add'>+  o Regulator    - Electronic device that supplies power to other devices.</div><div class='add'>+                   Most regulators can enable and disable their output whilst</div><div class='add'>+                   some can control their output voltage and or current.</div><div class='add'>+</div><div class='add'>+                   Input Voltage -&gt; Regulator -&gt; Output Voltage</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  o PMIC         - Power Management IC. An IC that contains numerous regulators</div><div class='add'>+                   and often contains other susbsystems.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  o Consumer     - Electronic device that is supplied power by a regulator.</div><div class='add'>+                   Consumers can be classified into two types:-</div><div class='add'>+</div><div class='add'>+                   Static: consumer does not change it's supply voltage or</div><div class='add'>+                   current limit. It only needs to enable or disable it's</div><div class='add'>+                   power supply. It's supply voltage is set by the hardware,</div><div class='add'>+                   bootloader, firmware or kernel board initialisation code.</div><div class='add'>+</div><div class='add'>+                   Dynamic: consumer needs to change it's supply voltage or</div><div class='add'>+                   current limit to meet operation demands.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  o Power Domain - Electronic circuit that is supplied it's input power by the</div><div class='add'>+                   output power of a regulator, switch or by another power</div><div class='add'>+                   domain.</div><div class='add'>+</div><div class='add'>+                   The supply regulator may be behind a switch(s). i.e.</div><div class='add'>+</div><div class='add'>+                   Regulator -+-&gt; Switch-1 -+-&gt; Switch-2 --&gt; [Consumer A]</div><div class='add'>+                              |             |</div><div class='add'>+                              |             +-&gt; [Consumer B], [Consumer C]</div><div class='add'>+                              |</div><div class='add'>+                              +-&gt; [Consumer D], [Consumer E]</div><div class='add'>+</div><div class='add'>+                   That is one regulator and three power domains:</div><div class='add'>+</div><div class='add'>+                   Domain 1: Switch-1, Consumers D &amp; E.</div><div class='add'>+                   Domain 2: Switch-2, Consumers B &amp; C.</div><div class='add'>+                   Domain 3: Consumer A.</div><div class='add'>+</div><div class='add'>+                   and this represents a "supplies" relationship:</div><div class='add'>+</div><div class='add'>+                   Domain-1 --&gt; Domain-2 --&gt; Domain-3.</div><div class='add'>+</div><div class='add'>+                   A power domain may have regulators that are supplied power</div><div class='add'>+                   by other regulators. i.e.</div><div class='add'>+</div><div class='add'>+                   Regulator-1 -+-&gt; Regulator-2 -+-&gt; [Consumer A]</div><div class='add'>+                                |</div><div class='add'>+                                +-&gt; [Consumer B]</div><div class='add'>+</div><div class='add'>+                   This gives us two regulators and two power domains:</div><div class='add'>+</div><div class='add'>+                   Domain 1: Regulator-2, Consumer B.</div><div class='add'>+                   Domain 2: Consumer A.</div><div class='add'>+</div><div class='add'>+                   and a "supplies" relationship:</div><div class='add'>+</div><div class='add'>+                   Domain-1 --&gt; Domain-2</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  o Constraints  - Constraints are used to define power levels for performance</div><div class='add'>+                   and hardware protection. Constraints exist at three levels:</div><div class='add'>+</div><div class='add'>+                   Regulator Level: This is defined by the regulator hardware</div><div class='add'>+                   operating parameters and is specified in the regulator</div><div class='add'>+                   datasheet. i.e.</div><div class='add'>+</div><div class='add'>+                     - voltage output is in the range 800mV -&gt; 3500mV.</div><div class='add'>+                     - regulator current output limit is 20mA @ 5V but is</div><div class='add'>+                       10mA @ 10V.</div><div class='add'>+</div><div class='add'>+                   Power Domain Level: This is defined in software by kernel</div><div class='add'>+                   level board initialisation code. It is used to constrain a</div><div class='add'>+                   power domain to a particular power range. i.e.</div><div class='add'>+</div><div class='add'>+                     - Domain-1 voltage is 3300mV</div><div class='add'>+                     - Domain-2 voltage is 1400mV -&gt; 1600mV</div><div class='add'>+                     - Domain-3 current limit is 0mA -&gt; 20mA.</div><div class='add'>+</div><div class='add'>+                   Consumer Level: This is defined by consumer drivers</div><div class='add'>+                   dynamically setting voltage or current limit levels.</div><div class='add'>+</div><div class='add'>+                   e.g. a consumer backlight driver asks for a current increase</div><div class='add'>+                   from 5mA to 10mA to increase LCD illumination. This passes</div><div class='add'>+                   to through the levels as follows :-</div><div class='add'>+</div><div class='add'>+                   Consumer: need to increase LCD brightness. Lookup and</div><div class='add'>+                   request next current mA value in brightness table (the</div><div class='add'>+                   consumer driver could be used on several different</div><div class='add'>+                   personalities based upon the same reference device).</div><div class='add'>+</div><div class='add'>+                   Power Domain: is the new current limit within the domain</div><div class='add'>+                   operating limits for this domain and system state (e.g.</div><div class='add'>+                   battery power, USB power)</div><div class='add'>+</div><div class='add'>+                   Regulator Domains: is the new current limit within the</div><div class='add'>+                   regulator operating parameters for input/ouput voltage.</div><div class='add'>+</div><div class='add'>+                   If the regulator request passes all the constraint tests</div><div class='add'>+                   then the new regulator value is applied.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Design</div><div class='add'>+======</div><div class='add'>+</div><div class='add'>+The framework is designed and targeted at SoC based devices but may also be</div><div class='add'>+relevant to non SoC devices and is split into the following four interfaces:-</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+   1. Consumer driver interface.</div><div class='add'>+</div><div class='add'>+      This uses a similar API to the kernel clock interface in that consumer</div><div class='add'>+      drivers can get and put a regulator (like they can with clocks atm) and</div><div class='add'>+      get/set voltage, current limit, mode, enable and disable. This should</div><div class='add'>+      allow consumers complete control over their supply voltage and current</div><div class='add'>+      limit. This also compiles out if not in use so drivers can be reused in</div><div class='add'>+      systems with no regulator based power control.</div><div class='add'>+</div><div class='add'>+        See Documentation/power/regulator/consumer.txt</div><div class='add'>+</div><div class='add'>+   2. Regulator driver interface.</div><div class='add'>+</div><div class='add'>+      This allows regulator drivers to register their regulators and provide</div><div class='add'>+      operations to the core. It also has a notifier call chain for propagating</div><div class='add'>+      regulator events to clients.</div><div class='add'>+</div><div class='add'>+        See Documentation/power/regulator/regulator.txt</div><div class='add'>+</div><div class='add'>+   3. Machine interface.</div><div class='add'>+</div><div class='add'>+      This interface is for machine specific code and allows the creation of</div><div class='add'>+      voltage/current domains (with constraints) for each regulator. It can</div><div class='add'>+      provide regulator constraints that will prevent device damage through</div><div class='add'>+      overvoltage or over current caused by buggy client drivers. It also</div><div class='add'>+      allows the creation of a regulator tree whereby some regulators are</div><div class='add'>+      supplied by others (similar to a clock tree).</div><div class='add'>+</div><div class='add'>+        See Documentation/power/regulator/machine.txt</div><div class='add'>+</div><div class='add'>+   4. Userspace ABI.</div><div class='add'>+</div><div class='add'>+      The framework also exports a lot of useful voltage/current/opmode data to</div><div class='add'>+      userspace via sysfs. This could be used to help monitor device power</div><div class='add'>+      consumption and status.</div><div class='add'>+</div><div class='add'>+        See Documentation/ABI/testing/regulator-sysfs.txt</div><div class='head'>diff --git a/Documentation/power/regulator/regulator.txt b/Documentation/power/regulator/regulator.txt<br/>new file mode 100644<br/>index 000000000000..a69050143592<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/power/regulator/regulator.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/power/regulator/regulator.txt</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+Regulator Driver Interface</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+The regulator driver interface is relatively simple and designed to allow</div><div class='add'>+regulator drivers to register their services with the core framework.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Registration</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+Drivers can register a regulator by calling :-</div><div class='add'>+</div><div class='add'>+struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,</div><div class='add'>+					  void *reg_data);</div><div class='add'>+</div><div class='add'>+This will register the regulators capabilities and operations the regulator</div><div class='add'>+core. The core does not touch reg_data (private to regulator driver).</div><div class='add'>+</div><div class='add'>+Regulators can be unregistered by calling :-</div><div class='add'>+</div><div class='add'>+void regulator_unregister(struct regulator_dev *rdev);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Regulator Events</div><div class='add'>+================</div><div class='add'>+Regulators can send events (e.g. over temp, under voltage, etc) to consumer</div><div class='add'>+drivers by calling :-</div><div class='add'>+</div><div class='add'>+int regulator_notifier_call_chain(struct regulator_dev *rdev,</div><div class='add'>+				  unsigned long event, void *data);</div><div class='head'>diff --git a/Documentation/powerpc/00-INDEX b/Documentation/powerpc/00-INDEX<br/>index 3be84aa38dfe..29d839ce7327 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/powerpc/00-INDEX?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/powerpc/00-INDEX</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/powerpc/00-INDEX?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/powerpc/00-INDEX</a></div><div class='hunk'>@@ -20,8 +20,6 @@ mpc52xx-device-tree-bindings.txt</div><div class='ctx'> 	- MPC5200 Device Tree Bindings</div><div class='ctx'> ppc_htab.txt</div><div class='ctx'> 	- info about the Linux/PPC /proc/ppc_htab entry</div><div class='del'>-SBC8260_memory_mapping.txt</div><div class='del'>-	- EST SBC8260 board info</div><div class='ctx'> smp.txt</div><div class='ctx'> 	- use and state info about Linux/PPC on MP machines</div><div class='ctx'> sound.txt</div><div class='head'>diff --git a/Documentation/powerpc/SBC8260_memory_mapping.txt b/Documentation/powerpc/SBC8260_memory_mapping.txt<br/>deleted file mode 100644<br/>index e6e9ee0506c3..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/powerpc/SBC8260_memory_mapping.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/powerpc/SBC8260_memory_mapping.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,197 +0,0 @@</div><div class='del'>-Please mail me (Jon Diekema, diekema_jon@si.com or diekema@cideas.com)</div><div class='del'>-if you have questions, comments or corrections.</div><div class='del'>-</div><div class='del'>-	* EST SBC8260 Linux memory mapping rules</div><div class='del'>-</div><div class='del'>-	http://www.estc.com/ </div><div class='del'>-	http://www.estc.com/products/boards/SBC8260-8240_ds.html</div><div class='del'>-</div><div class='del'>-	Initial conditions:</div><div class='del'>-	-------------------</div><div class='del'>-	</div><div class='del'>-	Tasks that need to be perform by the boot ROM before control is</div><div class='del'>-	transferred to zImage (compressed Linux kernel):</div><div class='del'>-</div><div class='del'>-	- Define the IMMR to 0xf0000000</div><div class='del'>-</div><div class='del'>-	- Initialize the memory controller so that RAM is available at</div><div class='del'>-	  physical address 0x00000000.  On the SBC8260 is this 16M (64M)</div><div class='del'>-	  SDRAM.</div><div class='del'>-</div><div class='del'>-	- The boot ROM should only clear the RAM that it is using.</div><div class='del'>-</div><div class='del'>-	  The reason for doing this is to enhances the chances of a</div><div class='del'>-	  successful post mortem on a Linux panic.  One of the first</div><div class='del'>-	  items to examine is the 16k (LOG_BUF_LEN) circular console</div><div class='del'>-	  buffer called log_buf which is defined in kernel/printk.c.</div><div class='del'>-</div><div class='del'>-	- To enhance boot ROM performance, the I-cache can be enabled.</div><div class='del'>-</div><div class='del'>-	  Date: Mon, 22 May 2000 14:21:10 -0700</div><div class='del'>-	  From: Neil Russell &lt;caret@c-side.com&gt;</div><div class='del'>-</div><div class='del'>-	  LiMon (LInux MONitor) runs with and starts Linux with MMU</div><div class='del'>-	  off, I-cache enabled, D-cache disabled.  The I-cache doesn't</div><div class='del'>-	  need hints from the MMU to work correctly as the D-cache</div><div class='del'>-	  does.  No D-cache means no special code to handle devices in</div><div class='del'>-	  the presence of cache (no snooping, etc). The use of the</div><div class='del'>-	  I-cache means that the monitor can run acceptably fast</div><div class='del'>-	  directly from ROM, rather than having to copy it to RAM.</div><div class='del'>-</div><div class='del'>-	- Build the board information structure (see </div><div class='del'>-	  include/asm-ppc/est8260.h for its definition)</div><div class='del'>-</div><div class='del'>-	- The compressed Linux kernel (zImage) contains a bootstrap loader </div><div class='del'>-	  that is position independent; you can load it into any RAM, </div><div class='del'>-	  ROM or FLASH memory address &gt;= 0x00500000 (above 5 MB), or</div><div class='del'>-	  at its link address of 0x00400000 (4 MB).</div><div class='del'>-</div><div class='del'>-	  Note: If zImage is loaded at its link address of 0x00400000 (4 MB),</div><div class='del'>-	        then zImage will skip the step of moving itself to </div><div class='del'>-		its link address.</div><div class='del'>-</div><div class='del'>-	- Load R3 with the address of the board information structure</div><div class='del'>-</div><div class='del'>-	- Transfer control to zImage</div><div class='del'>-</div><div class='del'>-	- The Linux console port is SMC1, and the baud rate is controlled</div><div class='del'>-	  from the bi_baudrate field of the board information structure.</div><div class='del'>-	  On thing to keep in mind when picking the baud rate, is that</div><div class='del'>-	  there is no flow control on the SMC ports.  I would stick</div><div class='del'>-	  with something safe and standard like 19200.</div><div class='del'>-</div><div class='del'>-	  On the EST SBC8260, the SMC1 port is on the COM1 connector of</div><div class='del'>-	  the board.</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	EST SBC8260 defaults:</div><div class='del'>-	---------------------</div><div class='del'>-</div><div class='del'>-                                Chip</div><div class='del'>-        Memory                  Sel  Bus   Use</div><div class='del'>-        ---------------------   ---  ---   ----------------------------------</div><div class='del'>-	0x00000000-0x03FFFFFF   CS2  60x   (16M or 64M)/64M SDRAM</div><div class='del'>-	0x04000000-0x04FFFFFF   CS4  local  4M/16M SDRAM (soldered to the board)</div><div class='del'>-	0x21000000-0x21000000   CS7  60x    1B/64K Flash present detect (from the flash SIMM)</div><div class='del'>-	0x21000001-0x21000001   CS7  60x    1B/64K Switches (read) and LEDs (write)</div><div class='del'>-	0x22000000-0x2200FFFF   CS5  60x    8K/64K EEPROM</div><div class='del'>-	0xFC000000-0xFCFFFFFF   CS6  60x    2M/16M flash (8 bits wide, soldered to the board)</div><div class='del'>-	0xFE000000-0xFFFFFFFF   CS0  60x    4M/16M flash (SIMM)</div><div class='del'>-</div><div class='del'>-	Notes:</div><div class='del'>-	------</div><div class='del'>-</div><div class='del'>-	- The chip selects can map 32K blocks and up (powers of 2)</div><div class='del'>-</div><div class='del'>-	- The SDRAM machine can handled up to 128Mbytes per chip select</div><div class='del'>-</div><div class='del'>-	- Linux uses the 60x bus memory (the SDRAM DIMM) for the </div><div class='del'>-	  communications buffers.</div><div class='del'>-</div><div class='del'>-	- BATs can map 128K-256Mbytes each.  There are four data BATs and</div><div class='del'>-	  four instruction BATs.  Generally the data and instruction BATs</div><div class='del'>-	  are mapped the same.</div><div class='del'>-</div><div class='del'>-	- The IMMR must be set above the kernel virtual memory addresses,</div><div class='del'>-	  which start at 0xC0000000.  Otherwise, the kernel may crash as</div><div class='del'>-	  soon as you start any threads or processes due to VM collisions </div><div class='del'>-	  in the kernel or user process space.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  Details from Dan Malek &lt;dan_malek@mvista.com&gt; on 10/29/1999:</div><div class='del'>-</div><div class='del'>-	  The user application virtual space consumes the first 2 Gbytes</div><div class='del'>-	  (0x00000000 to 0x7FFFFFFF).  The kernel virtual text starts at</div><div class='del'>-	  0xC0000000, with data following.  There is a "protection hole"</div><div class='del'>-	  between the end of kernel data and the start of the kernel</div><div class='del'>-	  dynamically allocated space, but this space is still within</div><div class='del'>-	  0xCxxxxxxx.</div><div class='del'>-</div><div class='del'>-	  Obviously the kernel can't map any physical addresses 1:1 in</div><div class='del'>-	  these ranges.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  Details from Dan Malek &lt;dan_malek@mvista.com&gt; on 5/19/2000:</div><div class='del'>-</div><div class='del'>-	  During the early kernel initialization, the kernel virtual</div><div class='del'>-	  memory allocator is not operational.  Prior to this KVM</div><div class='del'>-	  initialization, we choose to map virtual to physical addresses</div><div class='del'>-	  1:1.  That is, the kernel virtual address exactly matches the</div><div class='del'>-	  physical address on the bus.  These mappings are typically done</div><div class='del'>-	  in arch/ppc/kernel/head.S, or arch/ppc/mm/init.c.  Only</div><div class='del'>-	  absolutely necessary mappings should be done at this time, for</div><div class='del'>-	  example board control registers or a serial uart.  Normal device</div><div class='del'>-	  driver initialization should map resources later when necessary.</div><div class='del'>-</div><div class='del'>-	  Although platform dependent, and certainly the case for embedded</div><div class='del'>-	  8xx, traditionally memory is mapped at physical address zero,</div><div class='del'>-	  and I/O devices above physical address 0x80000000.  The lowest</div><div class='del'>-	  and highest (above 0xf0000000) I/O addresses are traditionally </div><div class='del'>-	  used for devices or registers we need to map during kernel </div><div class='del'>-	  initialization and prior to KVM operation.  For this reason, </div><div class='del'>-	  and since it followed prior PowerPC platform examples, I chose </div><div class='del'>-	  to map the embedded 8xx kernel to the 0xc0000000 virtual address.</div><div class='del'>-	  This way, we can enable the MMU to map the kernel for proper </div><div class='del'>-	  operation, and still map a few windows before the KVM is operational.</div><div class='del'>-</div><div class='del'>-	  On some systems, you could possibly run the kernel at the </div><div class='del'>-	  0x80000000 or any other virtual address.  It just depends upon </div><div class='del'>-	  mapping that must be done prior to KVM operational.  You can never </div><div class='del'>-	  map devices or kernel spaces that overlap with the user virtual </div><div class='del'>-	  space.  This is why default IMMR mapping used by most BDM tools </div><div class='del'>-	  won't work.  They put the IMMR at something like 0x10000000 or </div><div class='del'>-	  0x02000000 for example.  You simply can't map these addresses early</div><div class='del'>-	  in the kernel, and continue proper system operation.</div><div class='del'>-</div><div class='del'>-	  The embedded 8xx/82xx kernel is mature enough that all you should </div><div class='del'>-	  need to do is map the IMMR someplace at or above 0xf0000000 and it </div><div class='del'>-	  should boot far enough to get serial console messages and KGDB </div><div class='del'>-	  connected on any platform.  There are lots of other subtle memory </div><div class='del'>-	  management design features that you simply don't need to worry </div><div class='del'>-	  about.  If you are changing functions related to MMU initialization,</div><div class='del'>-	  you are likely breaking things that are known to work and are </div><div class='del'>-	  heading down a path of disaster and frustration.  Your changes </div><div class='del'>-	  should be to make the flexibility of the processor fit Linux, </div><div class='del'>-	  not force arbitrary and non-workable memory mappings into Linux.</div><div class='del'>-</div><div class='del'>-	- You don't want to change KERNELLOAD or KERNELBASE, otherwise the</div><div class='del'>-	  virtual memory and MMU code will get confused.</div><div class='del'>-	</div><div class='del'>-	  arch/ppc/Makefile:KERNELLOAD = 0xc0000000</div><div class='del'>-</div><div class='del'>-	  include/asm-ppc/page.h:#define PAGE_OFFSET    0xc0000000</div><div class='del'>-	  include/asm-ppc/page.h:#define KERNELBASE     PAGE_OFFSET</div><div class='del'>-</div><div class='del'>-	- RAM is at physical address 0x00000000, and gets mapped to </div><div class='del'>-	  virtual address 0xC0000000 for the kernel.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	Physical addresses used by the Linux kernel:</div><div class='del'>-	--------------------------------------------</div><div class='del'>-</div><div class='del'>-	0x00000000-0x3FFFFFFF   1GB reserved for RAM</div><div class='del'>-	0xF0000000-0xF001FFFF   128K IMMR  64K used for dual port memory,</div><div class='del'>-                                 64K for 8260 registers</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-        Logical addresses used by the Linux kernel:</div><div class='del'>-	-------------------------------------------</div><div class='del'>-</div><div class='del'>-	0xF0000000-0xFFFFFFFF   256M BAT0 (IMMR: dual port RAM, registers)</div><div class='del'>-	0xE0000000-0xEFFFFFFF   256M BAT1 (I/O space for custom boards)</div><div class='del'>-	0xC0000000-0xCFFFFFFF   256M BAT2 (RAM)</div><div class='del'>-	0xD0000000-0xDFFFFFFF   256M BAT3 (if RAM &gt; 256MByte)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	EST SBC8260 Linux mapping:</div><div class='del'>-	--------------------------</div><div class='del'>-</div><div class='del'>-	DBAT0, IBAT0, cache inhibited:</div><div class='del'>-</div><div class='del'>-                                Chip</div><div class='del'>-        Memory                  Sel  Use</div><div class='del'>-        ---------------------   ---  ---------------------------------</div><div class='del'>-        0xF0000000-0xF001FFFF   n/a  IMMR: dual port RAM, registers</div><div class='del'>-</div><div class='del'>-        DBAT1, IBAT1, cache inhibited:</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt<br/>index 928a79ceb7aa..de4063cb4fdc 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/powerpc/booting-without-of.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/powerpc/booting-without-of.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/powerpc/booting-without-of.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/powerpc/booting-without-of.txt</a></div><div class='hunk'>@@ -278,7 +278,7 @@ it with special cases.</div><div class='ctx'>         a 64-bit platform.</div><div class='ctx'> </div><div class='ctx'>         d) request and get assigned a platform number (see PLATFORM_*</div><div class='del'>-        constants in include/asm-powerpc/processor.h</div><div class='add'>+        constants in arch/powerpc/include/asm/processor.h</div><div class='ctx'> </div><div class='ctx'> 32-bit embedded kernels:</div><div class='ctx'> </div><div class='hunk'>@@ -340,7 +340,7 @@ the block to RAM before passing it to the kernel.</div><div class='ctx'> ---------</div><div class='ctx'> </div><div class='ctx'>    The kernel is entered with r3 pointing to an area of memory that is</div><div class='del'>-   roughly described in include/asm-powerpc/prom.h by the structure</div><div class='add'>+   roughly described in arch/powerpc/include/asm/prom.h by the structure</div><div class='ctx'>    boot_param_header:</div><div class='ctx'> </div><div class='ctx'> struct boot_param_header {</div><div class='head'>diff --git a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/serial.txt b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/serial.txt<br/>index b35f3482e3e4..2ea76d9d137c 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/powerpc/dts-bindings/fsl/cpm_qe/serial.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/powerpc/dts-bindings/fsl/cpm_qe/serial.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/powerpc/dts-bindings/fsl/cpm_qe/serial.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/powerpc/dts-bindings/fsl/cpm_qe/serial.txt</a></div><div class='hunk'>@@ -7,6 +7,15 @@ Currently defined compatibles:</div><div class='ctx'> - fsl,cpm2-scc-uart</div><div class='ctx'> - fsl,qe-uart</div><div class='ctx'> </div><div class='add'>+Modem control lines connected to GPIO controllers are listed in the gpios</div><div class='add'>+property as described in booting-without-of.txt, section IX.1 in the following</div><div class='add'>+order:</div><div class='add'>+</div><div class='add'>+CTS, RTS, DCD, DSR, DTR, and RI.</div><div class='add'>+</div><div class='add'>+The gpios property is optional and can be left out when control lines are</div><div class='add'>+not used.</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> 	serial@11a00 {</div><div class='hunk'>@@ -18,4 +27,6 @@ Example:</div><div class='ctx'> 		interrupt-parent = &lt;&amp;PIC&gt;;</div><div class='ctx'> 		fsl,cpm-brg = &lt;1&gt;;</div><div class='ctx'> 		fsl,cpm-command = &lt;00800000&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio_c 15 0</div><div class='add'>+			 &amp;gpio_d 29 0&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/powerpc/eeh-pci-error-recovery.txt b/Documentation/powerpc/eeh-pci-error-recovery.txt<br/>index df7afe43d462..9d4e33df624c 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/powerpc/eeh-pci-error-recovery.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/powerpc/eeh-pci-error-recovery.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/powerpc/eeh-pci-error-recovery.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/powerpc/eeh-pci-error-recovery.txt</a></div><div class='hunk'>@@ -133,7 +133,7 @@ error.  Given an arbitrary address, the routine</div><div class='ctx'> pci_get_device_by_addr() will find the pci device associated</div><div class='ctx'> with that address (if any).</div><div class='ctx'> </div><div class='del'>-The default include/asm-powerpc/io.h macros readb(), inb(), insb(),</div><div class='add'>+The default arch/powerpc/include/asm/io.h macros readb(), inb(), insb(),</div><div class='ctx'> etc. include a check to see if the i/o read returned all-0xff's.</div><div class='ctx'> If so, these make a call to eeh_dn_check_failure(), which in turn</div><div class='ctx'> asks the firmware if the all-ff's value is the sign of a true EEH</div><div class='head'>diff --git a/Documentation/rfkill.txt b/Documentation/rfkill.txt<br/>index 0843ed0163a5..6fcb3060dec5 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/rfkill.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/rfkill.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/rfkill.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/rfkill.txt</a></div><div class='hunk'>@@ -363,6 +363,11 @@ This rule exists because users of the rfkill subsystem expect to get (and set,</div><div class='ctx'> when possible) the overall transmitter rfkill state, not of a particular rfkill</div><div class='ctx'> line.</div><div class='ctx'> </div><div class='add'>+5. During suspend, the rfkill class will attempt to soft-block the radio</div><div class='add'>+through a call to rfkill-&gt;toggle_radio, and will try to restore its previous</div><div class='add'>+state during resume.  After a rfkill class is suspended, it will *not* call</div><div class='add'>+rfkill-&gt;toggle_radio until it is resumed.</div><div class='add'>+</div><div class='ctx'> Example of a WLAN wireless driver connected to the rfkill subsystem:</div><div class='ctx'> --------------------------------------------------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -390,9 +395,10 @@ rfkill lines are inactive, it must return RFKILL_STATE_SOFT_BLOCKED if its soft</div><div class='ctx'> rfkill input line is active.  Only if none of the rfkill input lines are</div><div class='ctx'> active, will it return RFKILL_STATE_UNBLOCKED.</div><div class='ctx'> </div><div class='del'>-If it doesn't implement the get_state() hook, it must make sure that its calls</div><div class='del'>-to rfkill_force_state() are enough to keep the status always up-to-date, and it</div><div class='del'>-must do a rfkill_force_state() on resume from sleep.</div><div class='add'>+Since the device has a hardware rfkill line, it IS subject to state changes</div><div class='add'>+external to rfkill.  Therefore, the driver must make sure that it calls</div><div class='add'>+rfkill_force_state() to keep the status always up-to-date, and it must do a</div><div class='add'>+rfkill_force_state() on resume from sleep.</div><div class='ctx'> </div><div class='ctx'> Every time the driver gets a notification from the card that one of its rfkill</div><div class='ctx'> lines changed state (polling might be needed on badly designed cards that don't</div><div class='hunk'>@@ -422,13 +428,24 @@ of the hardware is unknown), or read-write (where the hardware can be queried</div><div class='ctx'> about its current state).</div><div class='ctx'> </div><div class='ctx'> The rfkill class will call the get_state hook of a device every time it needs</div><div class='del'>-to know the *real* current state of the hardware.  This can happen often.</div><div class='add'>+to know the *real* current state of the hardware.  This can happen often, but</div><div class='add'>+it does not do any polling, so it is not enough on hardware that is subject</div><div class='add'>+to state changes outside of the rfkill subsystem.</div><div class='add'>+</div><div class='add'>+Therefore, calling rfkill_force_state() when a state change happens is</div><div class='add'>+mandatory when the device has a hardware rfkill line, or when something else</div><div class='add'>+like the firmware could cause its state to be changed without going through the</div><div class='add'>+rfkill class.</div><div class='ctx'> </div><div class='ctx'> Some hardware provides events when its status changes.  In these cases, it is</div><div class='ctx'> best for the driver to not provide a get_state hook, and instead register the</div><div class='ctx'> rfkill class *already* with the correct status, and keep it updated using</div><div class='ctx'> rfkill_force_state() when it gets an event from the hardware.</div><div class='ctx'> </div><div class='add'>+rfkill_force_state() must be used on the device resume handlers to update the</div><div class='add'>+rfkill status, should there be any chance of the device status changing during</div><div class='add'>+the sleep.</div><div class='add'>+</div><div class='ctx'> There is no provision for a statically-allocated rfkill struct.  You must</div><div class='ctx'> use rfkill_allocate() to allocate one.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/scsi/ChangeLog.megaraid_sas b/Documentation/scsi/ChangeLog.megaraid_sas<br/>index 716fcc1cafb5..c851ef497795 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/scsi/ChangeLog.megaraid_sas?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/scsi/ChangeLog.megaraid_sas</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/scsi/ChangeLog.megaraid_sas?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/scsi/ChangeLog.megaraid_sas</a></div><div class='hunk'>@@ -1,3 +1,26 @@</div><div class='add'>+</div><div class='add'>+1 Release Date    : Thur.July. 24 11:41:51 PST 2008 -</div><div class='add'>+                       (emaild-id:megaraidlinux@lsi.com)</div><div class='add'>+                       Sumant Patro</div><div class='add'>+                       Bo Yang</div><div class='add'>+</div><div class='add'>+2 Current Version : 00.00.04.01</div><div class='add'>+3 Older Version   : 00.00.03.22</div><div class='add'>+</div><div class='add'>+1. Add the new controller (0078, 0079) support to the driver</div><div class='add'>+       Those controllers are LSI's next generatation(gen2) SAS controllers.</div><div class='add'>+</div><div class='add'>+1 Release Date    : Mon.June. 23 10:12:45 PST 2008 -</div><div class='add'>+                       (emaild-id:megaraidlinux@lsi.com)</div><div class='add'>+                       Sumant Patro</div><div class='add'>+                       Bo Yang</div><div class='add'>+</div><div class='add'>+2 Current Version : 00.00.03.22</div><div class='add'>+3 Older Version   : 00.00.03.20</div><div class='add'>+</div><div class='add'>+1. Add shutdown DCMD cmd to the shutdown routine to make FW shutdown proper.</div><div class='add'>+2. Unexpected interrupt occurs in HWR Linux driver, add the dumy readl pci flush will fix this issue.</div><div class='add'>+</div><div class='ctx'> 1 Release Date    : Mon. March 10 11:02:31 PDT 2008 -</div><div class='ctx'> 			(emaild-id:megaraidlinux@lsi.com)</div><div class='ctx'> 			Sumant Patro</div><div class='head'>diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt<br/>index 6f6d117ac7e2..b117e42a6166 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/sound/alsa/ALSA-Configuration.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/sound/alsa/ALSA-Configuration.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/sound/alsa/ALSA-Configuration.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/sound/alsa/ALSA-Configuration.txt</a></div><div class='hunk'>@@ -1144,8 +1144,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> </div><div class='ctx'>     This module supports autoprobe and multiple cards.</div><div class='ctx'> </div><div class='del'>-    Power management is _not_ supported.</div><div class='del'>-</div><div class='ctx'>   Module snd-ice1712</div><div class='ctx'>   ------------------</div><div class='ctx'> </div><div class='hunk'>@@ -1628,8 +1626,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> </div><div class='ctx'>     This module supports autoprobe and multiple cards.</div><div class='ctx'> </div><div class='del'>-    Power management is _not_ supported.</div><div class='del'>-</div><div class='ctx'>   Module snd-pcsp</div><div class='ctx'>   -----------------</div><div class='ctx'> </div><div class='hunk'>@@ -2081,13 +2077,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'>   Module snd-virtuoso</div><div class='ctx'>   -------------------</div><div class='ctx'> </div><div class='del'>-    Module for sound cards based on the Asus AV200 chip, i.e.,</div><div class='del'>-    Xonar D2 and Xonar D2X.</div><div class='add'>+    Module for sound cards based on the Asus AV100/AV200 chips,</div><div class='add'>+    i.e., Xonar D1, DX, D2 and D2X.</div><div class='ctx'> </div><div class='ctx'>     This module supports autoprobe and multiple cards.</div><div class='ctx'> </div><div class='del'>-    Power management is _not_ supported.</div><div class='del'>-</div><div class='ctx'>   Module snd-vx222</div><div class='ctx'>   ----------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/spi/Makefile b/Documentation/spi/Makefile<br/>new file mode 100644<br/>index 000000000000..a5b03c88beae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/spi/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/spi/Makefile</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+# kbuild trick to avoid linker error. Can be omitted if a module is built.</div><div class='add'>+obj- := dummy.o</div><div class='add'>+</div><div class='add'>+# List of programs to build</div><div class='add'>+hostprogs-y := spidev_test spidev_fdx</div><div class='add'>+</div><div class='add'>+# Tell kbuild to always build the programs</div><div class='add'>+always := $(hostprogs-y)</div><div class='add'>+</div><div class='add'>+HOSTCFLAGS_spidev_test.o += -I$(objtree)/usr/include</div><div class='add'>+HOSTCFLAGS_spidev_fdx.o += -I$(objtree)/usr/include</div><div class='head'>diff --git a/Documentation/spi/pxa2xx b/Documentation/spi/pxa2xx<br/>index f3853cc37bde..bbe8dee681a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/spi/pxa2xx?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/spi/pxa2xx</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/spi/pxa2xx?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/spi/pxa2xx</a></div><div class='hunk'>@@ -19,7 +19,7 @@ Declaring PXA2xx Master Controllers</div><div class='ctx'> -----------------------------------</div><div class='ctx'> Typically a SPI master is defined in the arch/.../mach-*/board-*.c as a</div><div class='ctx'> "platform device".  The master configuration is passed to the driver via a table</div><div class='del'>-found in include/asm-arm/arch-pxa/pxa2xx_spi.h:</div><div class='add'>+found in arch/arm/mach-pxa/include/mach/pxa2xx_spi.h:</div><div class='ctx'> </div><div class='ctx'> struct pxa2xx_spi_master {</div><div class='ctx'> 	enum pxa_ssp_type ssp_type;</div><div class='hunk'>@@ -94,7 +94,7 @@ using the "spi_board_info" structure found in "linux/spi/spi.h". See</div><div class='ctx'> </div><div class='ctx'> Each slave device attached to the PXA must provide slave specific configuration</div><div class='ctx'> information via the structure "pxa2xx_spi_chip" found in</div><div class='del'>-"include/asm-arm/arch-pxa/pxa2xx_spi.h".  The pxa2xx_spi master controller driver</div><div class='add'>+"arch/arm/mach-pxa/include/mach/pxa2xx_spi.h".  The pxa2xx_spi master controller driver</div><div class='ctx'> will uses the configuration whenever the driver communicates with the slave</div><div class='ctx'> device.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/spi/spi-summary b/Documentation/spi/spi-summary<br/>index 6d5f18143c50..8bae2f018d34 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/spi/spi-summary?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/spi/spi-summary</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/spi/spi-summary?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/spi/spi-summary</a></div><div class='hunk'>@@ -210,7 +210,7 @@ board should normally be set up and registered.</div><div class='ctx'> </div><div class='ctx'> So for example arch/.../mach-*/board-*.c files might have code like:</div><div class='ctx'> </div><div class='del'>-	#include &lt;asm/arch/spi.h&gt;	/* for mysoc_spi_data */</div><div class='add'>+	#include &lt;mach/spi.h&gt;	/* for mysoc_spi_data */</div><div class='ctx'> </div><div class='ctx'> 	/* if your mach-* infrastructure doesn't support kernels that can</div><div class='ctx'> 	 * run on multiple boards, pdata wouldn't benefit from "__init".</div><div class='hunk'>@@ -227,7 +227,7 @@ So for example arch/.../mach-*/board-*.c files might have code like:</div><div class='ctx'> </div><div class='ctx'> And SOC-specific utility code might look something like:</div><div class='ctx'> </div><div class='del'>-	#include &lt;asm/arch/spi.h&gt;</div><div class='add'>+	#include &lt;mach/spi.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	static struct platform_device spi2 = { ... };</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/usb/auerswald.txt b/Documentation/usb/auerswald.txt<br/>deleted file mode 100644<br/>index 7ee4d8f69116..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/usb/auerswald.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/usb/auerswald.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-		Auerswald USB kernel driver</div><div class='del'>-		===========================</div><div class='del'>-</div><div class='del'>-What is it? What can I do with it?</div><div class='del'>-==================================</div><div class='del'>-The auerswald USB kernel driver connects your linux 2.4.x</div><div class='del'>-system to the auerswald usb-enabled devices.</div><div class='del'>-</div><div class='del'>-There are two types of auerswald usb devices:</div><div class='del'>-a) small PBX systems (ISDN)</div><div class='del'>-b) COMfort system telephones (ISDN)</div><div class='del'>-</div><div class='del'>-The driver installation creates the devices</div><div class='del'>-/dev/usb/auer0..15. These devices carry a vendor-</div><div class='del'>-specific protocol. You may run all auerswald java</div><div class='del'>-software on it. The java software needs a native</div><div class='del'>-library "libAuerUsbJNINative.so" installed on</div><div class='del'>-your system. This library is available from</div><div class='del'>-auerswald and shipped as part of the java software.</div><div class='del'>-</div><div class='del'>-You may create the devices with:</div><div class='del'>-	mknod -m 666 /dev/usb/auer0 c 180 112</div><div class='del'>-	...</div><div class='del'>-	mknod -m 666 /dev/usb/auer15 c 180 127</div><div class='del'>-</div><div class='del'>-Future plans</div><div class='del'>-============</div><div class='del'>-- Connection to ISDN4LINUX (the hisax interface)</div><div class='del'>-</div><div class='del'>-The maintainer of this driver is wolfgang@iksw-muees.de</div><div class='head'>diff --git a/Documentation/usb/power-management.txt b/Documentation/usb/power-management.txt<br/>index b2fc4d4a9917..9d31140e3f5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/usb/power-management.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/usb/power-management.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/usb/power-management.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/usb/power-management.txt</a></div><div class='hunk'>@@ -436,7 +436,12 @@ post_reset; the USB core guarantees that this is true of internal</div><div class='ctx'> suspend/resume events as well.</div><div class='ctx'> </div><div class='ctx'> If a driver wants to block all suspend/resume calls during some</div><div class='del'>-critical section, it can simply acquire udev-&gt;pm_mutex.</div><div class='add'>+critical section, it can simply acquire udev-&gt;pm_mutex. Note that</div><div class='add'>+calls to resume may be triggered indirectly. Block IO due to memory</div><div class='add'>+allocations can make the vm subsystem resume a device. Thus while</div><div class='add'>+holding this lock you must not allocate memory with GFP_KERNEL or</div><div class='add'>+GFP_NOFS.</div><div class='add'>+</div><div class='ctx'> Alternatively, if the critical section might call some of the</div><div class='ctx'> usb_autopm_* routines, the driver can avoid deadlock by doing:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.au0828 b/Documentation/video4linux/CARDLIST.au0828<br/>index eedc399e8deb..aa05e5bb22fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.au0828?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/video4linux/CARDLIST.au0828</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.au0828?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/video4linux/CARDLIST.au0828</a></div><div class='hunk'>@@ -3,3 +3,4 @@</div><div class='ctx'>   2 -&gt; Hauppauge HVR850                         (au0828)        [2040:7240]</div><div class='ctx'>   3 -&gt; DViCO FusionHDTV USB                     (au0828)        [0fe9:d620]</div><div class='ctx'>   4 -&gt; Hauppauge HVR950Q rev xxF8               (au0828)        [2040:7201,2040:7211,2040:7281]</div><div class='add'>+  5 -&gt; Hauppauge Woodbury                       (au0828)        [2040:8200]</div><div class='head'>diff --git a/Documentation/video4linux/Makefile b/Documentation/video4linux/Makefile<br/>new file mode 100644<br/>index 000000000000..1ed0e98d057d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/video4linux/Makefile</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+# kbuild trick to avoid linker error. Can be omitted if a module is built.</div><div class='add'>+obj- := dummy.o</div><div class='add'>+</div><div class='add'>+# List of programs to build</div><div class='add'>+hostprogs-y := v4lgrab</div><div class='add'>+</div><div class='add'>+# Tell kbuild to always build the programs</div><div class='add'>+always := $(hostprogs-y)</div><div class='head'>diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt<br/>index bcaf4ab383be..0f03900c48fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/gspca.txt?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/video4linux/gspca.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/gspca.txt?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/video4linux/gspca.txt</a></div><div class='hunk'>@@ -88,14 +88,14 @@ zc3xx		0471:0325	Philips SPC 200 NC</div><div class='ctx'> zc3xx		0471:0326	Philips SPC 300 NC</div><div class='ctx'> sonixj		0471:0327	Philips SPC 600 NC</div><div class='ctx'> sonixj		0471:0328	Philips SPC 700 NC</div><div class='del'>-zc3xx		0471:032d	Philips spc210nc</div><div class='del'>-zc3xx		0471:032e	Philips spc315nc</div><div class='del'>-sonixj		0471:0330	Philips SPC 710NC</div><div class='add'>+zc3xx		0471:032d	Philips SPC 210 NC</div><div class='add'>+zc3xx		0471:032e	Philips SPC 315 NC</div><div class='add'>+sonixj		0471:0330	Philips SPC 710 NC</div><div class='ctx'> spca501		0497:c001	Smile International</div><div class='ctx'> sunplus		04a5:3003	Benq DC 1300</div><div class='ctx'> sunplus		04a5:3008	Benq DC 1500</div><div class='del'>-sunplus		04a5:300a	Benq DC3410</div><div class='del'>-spca500		04a5:300c	Benq DC1016</div><div class='add'>+sunplus		04a5:300a	Benq DC 3410</div><div class='add'>+spca500		04a5:300c	Benq DC 1016</div><div class='ctx'> sunplus		04f1:1001	JVC GC A50</div><div class='ctx'> spca561		04fc:0561	Flexcam 100</div><div class='ctx'> sunplus		04fc:500c	Sunplus CA500C</div><div class='hunk'>@@ -175,19 +175,21 @@ sunplus		08ca:2060	Aiptek PocketDV5300</div><div class='ctx'> tv8532		0923:010f	ICM532 cams</div><div class='ctx'> mars		093a:050f	Mars-Semi Pc-Camera</div><div class='ctx'> pac207		093a:2460	PAC207 Qtec Webcam 100</div><div class='del'>-pac207		093a:2463	Philips spc200nc pac207</div><div class='add'>+pac207		093a:2463	Philips SPC 220 NC</div><div class='ctx'> pac207		093a:2464	Labtec Webcam 1200</div><div class='ctx'> pac207		093a:2468	PAC207</div><div class='ctx'> pac207		093a:2470	Genius GF112</div><div class='del'>-pac207		093a:2471	PAC207 Genius VideoCam ge111</div><div class='del'>-pac207		093a:2472	PAC207 Genius VideoCam ge110</div><div class='add'>+pac207		093a:2471	Genius VideoCam ge111</div><div class='add'>+pac207		093a:2472	Genius VideoCam ge110</div><div class='ctx'> pac7311		093a:2600	PAC7311 Typhoon</div><div class='del'>-pac7311		093a:2601	PAC7311 Phillips SPC610NC</div><div class='add'>+pac7311		093a:2601	Philips SPC 610 NC</div><div class='ctx'> pac7311		093a:2603	PAC7312</div><div class='del'>-pac7311		093a:2608	PAC7311 Trust WB-3300p</div><div class='del'>-pac7311		093a:260e	PAC7311 Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350</div><div class='del'>-pac7311		093a:260f	PAC7311 SnakeCam</div><div class='add'>+pac7311		093a:2608	Trust WB-3300p</div><div class='add'>+pac7311		093a:260e	Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350</div><div class='add'>+pac7311		093a:260f	SnakeCam</div><div class='ctx'> pac7311		093a:2621	PAC731x</div><div class='add'>+pac7311		093a:2624	PAC7302</div><div class='add'>+pac7311		093a:2626	Labtec 2200</div><div class='ctx'> zc3xx		0ac8:0302	Z-star Vimicro zc0302</div><div class='ctx'> vc032x		0ac8:0321	Vimicro generic vc0321</div><div class='ctx'> vc032x		0ac8:0323	Vimicro Vc0323</div><div class='hunk'>@@ -220,12 +222,14 @@ sonixj		0c45:60c0	Sangha Sn535</div><div class='ctx'> sonixj		0c45:60ec	SN9C105+MO4000</div><div class='ctx'> sonixj		0c45:60fb	Surfer NoName</div><div class='ctx'> sonixj		0c45:60fc	LG-LIC300</div><div class='add'>+sonixj		0c45:6128	Microdia/Sonix SNP325</div><div class='ctx'> sonixj		0c45:612a	Avant Camera</div><div class='ctx'> sonixj		0c45:612c	Typhoon Rasy Cam 1.3MPix</div><div class='ctx'> sonixj		0c45:6130	Sonix Pccam</div><div class='ctx'> sonixj		0c45:6138	Sn9c120 Mo4000</div><div class='ctx'> sonixj		0c45:613b	Surfer SN-206</div><div class='ctx'> sonixj		0c45:613c	Sonix Pccam168</div><div class='add'>+sonixj		0c45:6143	Sonix Pccam168</div><div class='ctx'> sunplus		0d64:0303	Sunplus FashionCam DXG</div><div class='ctx'> etoms		102c:6151	Qcam Sangha CIF</div><div class='ctx'> etoms		102c:6251	Qcam xxxxxx VGA</div><div class='hunk'>@@ -233,7 +237,7 @@ zc3xx		10fd:0128	Typhoon Webshot II USB 300k 0x0128</div><div class='ctx'> spca561		10fd:7e50	FlyCam Usb 100</div><div class='ctx'> zc3xx		10fd:8050	Typhoon Webshot II USB 300k</div><div class='ctx'> spca501		1776:501c	Arowana 300K CMOS Camera</div><div class='del'>-t613		17a1:0128	T613/TAS5130A</div><div class='add'>+t613		17a1:0128	TASCORP JPEG Webcam, NGS Cyclops</div><div class='ctx'> vc032x		17ef:4802	Lenovo Vc0323+MI1310_SOC</div><div class='ctx'> pac207		2001:f115	D-Link DSB-C120</div><div class='ctx'> spca500		2899:012c	Toptro Industrial</div><div class='head'>diff --git a/Documentation/vm/Makefile b/Documentation/vm/Makefile<br/>new file mode 100644<br/>index 000000000000..6f562f778b28<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/vm/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/vm/Makefile</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+# kbuild trick to avoid linker error. Can be omitted if a module is built.</div><div class='add'>+obj- := dummy.o</div><div class='add'>+</div><div class='add'>+# List of programs to build</div><div class='add'>+hostprogs-y := slabinfo</div><div class='add'>+</div><div class='add'>+# Tell kbuild to always build the programs</div><div class='add'>+always := $(hostprogs-y)</div><div class='head'>diff --git a/Documentation/vm/page_migration b/Documentation/vm/page_migration<br/>index 99f89aa10169..d5fdfd34bbaf 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/vm/page_migration?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Documentation/vm/page_migration</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/vm/page_migration?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/vm/page_migration</a></div><div class='hunk'>@@ -18,10 +18,11 @@ migrate_pages function call takes two sets of nodes and moves pages of a</div><div class='ctx'> process that are located on the from nodes to the destination nodes.</div><div class='ctx'> Page migration functions are provided by the numactl package by Andi Kleen</div><div class='ctx'> (a version later than 0.9.3 is required. Get it from</div><div class='del'>-ftp://ftp.suse.com/pub/people/ak). numactl provided libnuma which</div><div class='del'>-provides an interface similar to other numa functionality for page migration.</div><div class='del'>-cat /proc/&lt;pid&gt;/numa_maps allows an easy review of where the pages of</div><div class='del'>-a process are located. See also the numa_maps manpage in the numactl package.</div><div class='add'>+ftp://oss.sgi.com/www/projects/libnuma/download/). numactl provides libnuma</div><div class='add'>+which provides an interface similar to other numa functionality for page</div><div class='add'>+migration.  cat /proc/&lt;pid&gt;/numa_maps allows an easy review of where the</div><div class='add'>+pages of a process are located. See also the numa_maps documentation in the</div><div class='add'>+proc(5) man page.</div><div class='ctx'> </div><div class='ctx'> Manual migration is useful if for example the scheduler has relocated</div><div class='ctx'> a process to a processor on a distant node. A batch scheduler or an</div><div class='head'>diff --git a/Documentation/watchdog/src/Makefile b/Documentation/watchdog/src/Makefile<br/>new file mode 100644<br/>index 000000000000..40e5f46e4740<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/watchdog/src/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Documentation/watchdog/src/Makefile</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+# kbuild trick to avoid linker error. Can be omitted if a module is built.</div><div class='add'>+obj- := dummy.o</div><div class='add'>+</div><div class='add'>+# List of programs to build</div><div class='add'>+hostprogs-y := watchdog-simple watchdog-test</div><div class='add'>+</div><div class='add'>+# Tell kbuild to always build the programs</div><div class='add'>+always := $(hostprogs-y)</div><div class='head'>diff --git a/MAINTAINERS b/MAINTAINERS<br/>index 4bfa468ceae2..b5154c12ca27 100644<br/>--- a/<a href='/cgit/linux.git/tree/MAINTAINERS?id=d4738792fb86600b6cb7220459d9c47e819b3580'>MAINTAINERS</a><br/>+++ b/<a href='/cgit/linux.git/tree/MAINTAINERS?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>MAINTAINERS</a></div><div class='hunk'>@@ -175,12 +175,18 @@ M:	bcrl@kvack.org</div><div class='ctx'> L:	linux-aio@kvack.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='del'>-ABIT UGURU HARDWARE MONITOR DRIVER</div><div class='add'>+ABIT UGURU 1,2 HARDWARE MONITOR DRIVER</div><div class='ctx'> P:	Hans de Goede</div><div class='ctx'> M:	j.w.r.degoede@hhs.nl</div><div class='ctx'> L:	lm-sensors@lm-sensors.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+ABIT UGURU 3 HARDWARE MONITOR DRIVER</div><div class='add'>+P:	Alistair John Strachan</div><div class='add'>+M:	alistair@devzero.co.uk</div><div class='add'>+L:	lm-sensors@lm-sensors.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> ACENIC DRIVER</div><div class='ctx'> P:	Jes Sorensen</div><div class='ctx'> M:	jes@trained-monkey.org</div><div class='hunk'>@@ -216,8 +222,7 @@ W:	http://code.google.com/p/aceracpi</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> ACPI</div><div class='del'>-P:	Andi Kleen</div><div class='del'>-M:	ak@linux.intel.com</div><div class='add'>+P:	Len Brown</div><div class='ctx'> M:	lenb@kernel.org</div><div class='ctx'> L:	linux-acpi@vger.kernel.org</div><div class='ctx'> W:	http://www.lesswatts.org/projects/acpi/</div><div class='hunk'>@@ -266,20 +271,20 @@ W:	http://www.lesswatts.org/projects/acpi/</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='ctx'> ACPI WMI DRIVER</div><div class='del'>-P:      Carlos Corbacho</div><div class='del'>-M:      carlos@strangeworlds.co.uk</div><div class='del'>-L:      linux-acpi@vger.kernel.org</div><div class='del'>-W:      http://www.lesswatts.org/projects/acpi/</div><div class='del'>-S:      Maintained</div><div class='add'>+P:	Carlos Corbacho</div><div class='add'>+M:	carlos@strangeworlds.co.uk</div><div class='add'>+L:	linux-acpi@vger.kernel.org</div><div class='add'>+W:	http://www.lesswatts.org/projects/acpi/</div><div class='add'>+S:	Maintained</div><div class='ctx'> </div><div class='ctx'> AD1889 ALSA SOUND DRIVER</div><div class='del'>-P:     Kyle McMartin</div><div class='del'>-M:     kyle@mcmartin.ca</div><div class='del'>-P:     Thibaut Varene</div><div class='del'>-M:     T-Bone@parisc-linux.org</div><div class='del'>-W:     http://wiki.parisc-linux.org/AD1889</div><div class='del'>-L:     linux-parisc@vger.kernel.org</div><div class='del'>-S:     Maintained</div><div class='add'>+P:	Kyle McMartin</div><div class='add'>+M:	kyle@mcmartin.ca</div><div class='add'>+P:	Thibaut Varene</div><div class='add'>+M:	T-Bone@parisc-linux.org</div><div class='add'>+W:	http://wiki.parisc-linux.org/AD1889</div><div class='add'>+L:	linux-parisc@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='ctx'> </div><div class='ctx'> ADM1025 HARDWARE MONITOR DRIVER</div><div class='ctx'> P:	Jean Delvare</div><div class='hunk'>@@ -418,6 +423,12 @@ L:	linux-laptop@vger.kernel.org</div><div class='ctx'> W:	http://www.canb.auug.org.au/~sfr/</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='add'>+APPLE BCM5974 MULTITOUCH DRIVER</div><div class='add'>+P:	Henrik Rydberg</div><div class='add'>+M:	rydberg@euromail.se</div><div class='add'>+L:	linux-input@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> APPLE SMC DRIVER</div><div class='ctx'> P:	Nicolas Boichat</div><div class='ctx'> M:	nicolas@boichat.ch</div><div class='hunk'>@@ -467,11 +478,11 @@ L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> ARM/ATMEL AT91RM9200 ARM ARCHITECTURE</div><div class='del'>-P:      Andrew Victor</div><div class='del'>-M:      linux@maxim.org.za</div><div class='del'>-L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)</div><div class='del'>-W:      http://maxim.org.za/at91_26.html</div><div class='del'>-S:      Maintained</div><div class='add'>+P:	Andrew Victor</div><div class='add'>+M:	linux@maxim.org.za</div><div class='add'>+L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)</div><div class='add'>+W:	http://maxim.org.za/at91_26.html</div><div class='add'>+S:	Maintained</div><div class='ctx'> </div><div class='ctx'> ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE</div><div class='ctx'> P:	Lennert Buytenhek</div><div class='hunk'>@@ -507,6 +518,12 @@ L:	openezx-devel@lists.openezx.org (subscribers-only)</div><div class='ctx'> W:	http://www.openezx.org/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+ARM/FREESCALE IMX / MXC ARM ARCHITECTURE</div><div class='add'>+P:	Sascha Hauer</div><div class='add'>+M:	kernel@pengutronix.de</div><div class='add'>+L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> ARM/GLOMATION GESBC9312SX MACHINE SUPPORT</div><div class='ctx'> P:	Lennert Buytenhek</div><div class='ctx'> M:	kernel@wantstofly.org</div><div class='hunk'>@@ -520,10 +537,10 @@ L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> ARM/HP JORNADA 7XX MACHINE SUPPORT</div><div class='del'>-P:      Kristoffer Ericson</div><div class='del'>-M:      kristoffer.ericson@gmail.com</div><div class='del'>-W:      www.jlime.com</div><div class='del'>-S:      Maintained</div><div class='add'>+P:	Kristoffer Ericson</div><div class='add'>+M:	kristoffer.ericson@gmail.com</div><div class='add'>+W:	www.jlime.com</div><div class='add'>+S:	Maintained</div><div class='ctx'> </div><div class='ctx'> ARM/INTEL IOP32X ARM ARCHITECTURE</div><div class='ctx'> P:	Lennert Buytenhek</div><div class='hunk'>@@ -593,6 +610,11 @@ M:	kernel@wantstofly.org</div><div class='ctx'> L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+ARM/MAGICIAN MACHINE SUPPORT</div><div class='add'>+P:	Philipp Zabel</div><div class='add'>+M:	philipp.zabel@gmail.com</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> ARM/TOSA MACHINE SUPPORT</div><div class='ctx'> P:	Dmitry Baryshkov</div><div class='ctx'> M:	dbaryshkov@gmail.com</div><div class='hunk'>@@ -719,16 +741,27 @@ L:	linux-wireless@vger.kernel.org</div><div class='ctx'> L:	ath5k-devel@lists.ath5k.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+ATHEROS ATH9K WIRELESS DRIVER</div><div class='add'>+P:	Luis R. Rodriguez</div><div class='add'>+M:	lrodriguez@atheros.com</div><div class='add'>+P:	Jouni Malinen</div><div class='add'>+M:	jmalinen@atheros.com</div><div class='add'>+L:	linux-wireless@vger.kernel.org</div><div class='add'>+L:	ath9k-devel@lists.ath9k.org</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> ATI_REMOTE2 DRIVER</div><div class='ctx'> P:	Ville Syrjala</div><div class='ctx'> M:	syrjala@sci.fi</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-ATL1 ETHERNET DRIVER</div><div class='add'>+ATLX ETHERNET DRIVERS</div><div class='ctx'> P:	Jay Cliburn</div><div class='ctx'> M:	jcliburn@gmail.com</div><div class='ctx'> P:	Chris Snook</div><div class='ctx'> M:	csnook@redhat.com</div><div class='add'>+P:	Jie Yang</div><div class='add'>+M:	jie.yang@atheros.com</div><div class='ctx'> L:	atl1-devel@lists.sourceforge.net</div><div class='ctx'> W:	http://sourceforge.net/projects/atl1</div><div class='ctx'> W:	http://atl1.sourceforge.net</div><div class='hunk'>@@ -921,94 +954,19 @@ M:	joern@lazybastard.org</div><div class='ctx'> L:	linux-mtd@lists.infradead.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-BLUETOOTH SUBSYSTEM</div><div class='add'>+BLUETOOTH DRIVERS</div><div class='ctx'> P:	Marcel Holtmann</div><div class='ctx'> M:	marcel@holtmann.org</div><div class='del'>-P:	Maxim Krasnyansky</div><div class='del'>-M:	maxk@qualcomm.com</div><div class='ctx'> L:	linux-bluetooth@vger.kernel.org</div><div class='del'>-W:	http://bluez.sf.net</div><div class='del'>-W:	http://www.bluez.org</div><div class='del'>-W:	http://www.holtmann.org/linux/bluetooth/</div><div class='del'>-T:	git kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-BLUETOOTH RFCOMM LAYER</div><div class='del'>-P:	Marcel Holtmann</div><div class='del'>-M:	marcel@holtmann.org</div><div class='del'>-P:	Maxim Krasnyansky</div><div class='del'>-M:	maxk@qualcomm.com</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-BLUETOOTH BNEP LAYER</div><div class='del'>-P:	Marcel Holtmann</div><div class='del'>-M:	marcel@holtmann.org</div><div class='del'>-P:	Maxim Krasnyansky</div><div class='del'>-M:	maxk@qualcomm.com</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-BLUETOOTH CMTP LAYER</div><div class='del'>-P:	Marcel Holtmann</div><div class='del'>-M:	marcel@holtmann.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-BLUETOOTH HIDP LAYER</div><div class='del'>-P:	Marcel Holtmann</div><div class='del'>-M:	marcel@holtmann.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-BLUETOOTH HCI UART DRIVER</div><div class='del'>-P:	Marcel Holtmann</div><div class='del'>-M:	marcel@holtmann.org</div><div class='del'>-P:	Maxim Krasnyansky</div><div class='del'>-M:	maxk@qualcomm.com</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-BLUETOOTH HCI USB DRIVER</div><div class='del'>-P:	Marcel Holtmann</div><div class='del'>-M:	marcel@holtmann.org</div><div class='del'>-P:	Maxim Krasnyansky</div><div class='del'>-M:	maxk@qualcomm.com</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-BLUETOOTH HCI BCM203X DRIVER</div><div class='del'>-P:	Marcel Holtmann</div><div class='del'>-M:	marcel@holtmann.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-BLUETOOTH HCI BPA10X DRIVER</div><div class='del'>-P:	Marcel Holtmann</div><div class='del'>-M:	marcel@holtmann.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-BLUETOOTH HCI BFUSB DRIVER</div><div class='del'>-P:	Marcel Holtmann</div><div class='del'>-M:	marcel@holtmann.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-BLUETOOTH HCI DTL1 DRIVER</div><div class='del'>-P:	Marcel Holtmann</div><div class='del'>-M:	marcel@holtmann.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-BLUETOOTH HCI BLUECARD DRIVER</div><div class='del'>-P:	Marcel Holtmann</div><div class='del'>-M:	marcel@holtmann.org</div><div class='add'>+W:	http://www.bluez.org/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-BLUETOOTH HCI BT3C DRIVER</div><div class='del'>-P:	Marcel Holtmann</div><div class='del'>-M:	marcel@holtmann.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-BLUETOOTH HCI BTUART DRIVER</div><div class='add'>+BLUETOOTH SUBSYSTEM</div><div class='ctx'> P:	Marcel Holtmann</div><div class='ctx'> M:	marcel@holtmann.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-BLUETOOTH HCI VHCI DRIVER</div><div class='del'>-P:	Maxim Krasnyansky</div><div class='del'>-M:	maxk@qualcomm.com</div><div class='add'>+L:	linux-bluetooth@vger.kernel.org</div><div class='add'>+W:	http://www.bluez.org/</div><div class='add'>+T:	git kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> BONDING DRIVER</div><div class='hunk'>@@ -1064,7 +1022,7 @@ T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER</div><div class='del'>-P:   	Jonathan Corbet</div><div class='add'>+P:	Jonathan Corbet</div><div class='ctx'> M:	corbet@lwn.net</div><div class='ctx'> L:	video4linux-list@redhat.com</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -1234,7 +1192,7 @@ S:	Maintained</div><div class='ctx'> CPU FREQUENCY DRIVERS</div><div class='ctx'> P:	Dave Jones</div><div class='ctx'> M:	davej@codemonkey.org.uk</div><div class='del'>-L:	cpufreq@lists.linux.org.uk</div><div class='add'>+L:	cpufreq@vger.kernel.org</div><div class='ctx'> W:	http://www.codemonkey.org.uk/projects/cpufreq/</div><div class='ctx'> T:	git kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -1406,7 +1364,7 @@ P:	Digi International, Inc</div><div class='ctx'> M:	Eng.Linux@digi.com</div><div class='ctx'> L:	Eng.Linux@digi.com</div><div class='ctx'> W:	http://www.digi.com</div><div class='del'>-S:	Orphaned</div><div class='add'>+S:	Orphan</div><div class='ctx'> </div><div class='ctx'> DIRECTORY NOTIFICATION</div><div class='ctx'> P:	Stephen Rothwell</div><div class='hunk'>@@ -1470,12 +1428,12 @@ L:	linux-acpi@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='ctx'> DOCUMENTATION (/Documentation directory)</div><div class='del'>-P:     Michael Kerrisk</div><div class='del'>-M:     mtk.manpages@gmail.com</div><div class='del'>-P:     Randy Dunlap</div><div class='del'>-M:     rdunlap@xenotime.net</div><div class='del'>-L:     linux-doc@vger.kernel.org</div><div class='del'>-S:     Maintained</div><div class='add'>+P:	Michael Kerrisk</div><div class='add'>+M:	mtk.manpages@gmail.com</div><div class='add'>+P:	Randy Dunlap</div><div class='add'>+M:	rdunlap@xenotime.net</div><div class='add'>+L:	linux-doc@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='ctx'> </div><div class='ctx'> DOUBLETALK DRIVER</div><div class='ctx'> P:	James R. Van Zandt</div><div class='hunk'>@@ -1506,7 +1464,7 @@ S:	Maintained</div><div class='ctx'> DVB SUBSYSTEM AND DRIVERS</div><div class='ctx'> P:	LinuxTV.org Project</div><div class='ctx'> M:	v4l-dvb-maintainer@linuxtv.org</div><div class='del'>-L: 	linux-dvb@linuxtv.org (subscription required)</div><div class='add'>+L:	linux-dvb@linuxtv.org (subscription required)</div><div class='ctx'> W:	http://linuxtv.org/</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -1642,7 +1600,7 @@ S:	Supported</div><div class='ctx'> EMBEDDED LINUX</div><div class='ctx'> P:	Paul Gortmaker</div><div class='ctx'> M:	paul.gortmaker@windriver.com</div><div class='del'>-P	David Woodhouse</div><div class='add'>+P:	David Woodhouse</div><div class='ctx'> M:	dwmw2@infradead.org</div><div class='ctx'> L:	linux-embedded@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -1844,7 +1802,7 @@ FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)</div><div class='ctx'> P:	Rik Faith</div><div class='ctx'> M:	faith@cs.unc.edu</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='del'>-S:	Odd fixes (e.g., new signatures)</div><div class='add'>+S:	Odd Fixes (e.g., new signatures)</div><div class='ctx'> </div><div class='ctx'> GDT SCSI DISK ARRAY CONTROLLER DRIVER</div><div class='ctx'> P:	Achim Leubner</div><div class='hunk'>@@ -1883,16 +1841,12 @@ W:	http://gigaset307x.sourceforge.net/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> HARDWARE MONITORING</div><div class='del'>-P:	Mark M. Hoffman</div><div class='del'>-M:	mhoffman@lightlink.com</div><div class='ctx'> L:	lm-sensors@lm-sensors.org</div><div class='ctx'> W:	http://www.lm-sensors.org/</div><div class='del'>-T:	git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git testing</div><div class='del'>-T:	git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git release</div><div class='del'>-S:	Maintained</div><div class='add'>+S:	Orphan</div><div class='ctx'> </div><div class='ctx'> HARDWARE RANDOM NUMBER GENERATOR CORE</div><div class='del'>-S:	Orphaned</div><div class='add'>+S:	Orphan</div><div class='ctx'> </div><div class='ctx'> HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER</div><div class='ctx'> P:	Robert Love</div><div class='hunk'>@@ -2159,7 +2113,7 @@ M:	rolandd@cisco.com</div><div class='ctx'> P:	Sean Hefty</div><div class='ctx'> M:	sean.hefty@intel.com</div><div class='ctx'> P:	Hal Rosenstock</div><div class='del'>-M:	hal.rosenstock@gmail.com </div><div class='add'>+M:	hal.rosenstock@gmail.com</div><div class='ctx'> L:	general@lists.openfabrics.org</div><div class='ctx'> W:	http://www.openib.org/</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git</div><div class='hunk'>@@ -2451,7 +2405,7 @@ L:	kernel-janitors@vger.kernel.org</div><div class='ctx'> W:	http://www.kerneljanitors.org/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-KERNEL NFSD</div><div class='add'>+KERNEL NFSD, SUNRPC, AND LOCKD SERVERS</div><div class='ctx'> P:	J. Bruce Fields</div><div class='ctx'> M:	bfields@fieldses.org</div><div class='ctx'> P:	Neil Brown</div><div class='hunk'>@@ -2747,17 +2701,17 @@ S:	Maintained</div><div class='ctx'> </div><div class='ctx'> MARVELL YUKON / SYSKONNECT DRIVER</div><div class='ctx'> P:	Mirko Lindner</div><div class='del'>-M: 	mlindner@syskonnect.de</div><div class='add'>+M:	mlindner@syskonnect.de</div><div class='ctx'> P:	Ralph Roesler</div><div class='del'>-M: 	rroesler@syskonnect.de</div><div class='del'>-W: 	http://www.syskonnect.com</div><div class='del'>-S: 	Supported</div><div class='add'>+M:	rroesler@syskonnect.de</div><div class='add'>+W:	http://www.syskonnect.com</div><div class='add'>+S:	Supported</div><div class='ctx'> </div><div class='ctx'> MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7</div><div class='ctx'> P:	Michael Kerrisk</div><div class='ctx'> M:	mtk.manpages@gmail.com</div><div class='del'>-W:     http://www.kernel.org/doc/man-pages</div><div class='del'>-S:     Supported</div><div class='add'>+W:	http://www.kernel.org/doc/man-pages</div><div class='add'>+S:	Supported</div><div class='ctx'> </div><div class='ctx'> MARVELL LIBERTAS WIRELESS DRIVER</div><div class='ctx'> P:	Dan Williams</div><div class='hunk'>@@ -2786,7 +2740,7 @@ S:	Maintained</div><div class='ctx'> MEGARAID SCSI DRIVERS</div><div class='ctx'> P:	Neela Syam Kolli</div><div class='ctx'> M:	megaraidlinux@lsi.com</div><div class='del'>-S:	linux-scsi@vger.kernel.org</div><div class='add'>+L:	linux-scsi@vger.kernel.org</div><div class='ctx'> W:	http://megaraid.lsilogic.com</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='hunk'>@@ -2904,7 +2858,7 @@ MULTIMEDIA CARD (MMC) ETC. OVER SPI</div><div class='ctx'> P:	David Brownell</div><div class='ctx'> M:	dbrownell@users.sourceforge.net</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='del'>-S:	Odd fixes</div><div class='add'>+S:	Odd Fixes</div><div class='ctx'> </div><div class='ctx'> MULTISOUND SOUND DRIVER</div><div class='ctx'> P:	Andrew Veliath</div><div class='hunk'>@@ -2917,6 +2871,12 @@ M:	jirislaby@gmail.com</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER</div><div class='add'>+P:	Felipe Balbi</div><div class='add'>+M:	felipe.balbi@nokia.com</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)</div><div class='ctx'> P:	Andrew Gallatin</div><div class='ctx'> M:	gallatin@myri.com</div><div class='hunk'>@@ -2927,7 +2887,7 @@ W:	http://www.myri.com/scs/download-Myri10GE.html</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='ctx'> NATSEMI ETHERNET DRIVER (DP8381x)</div><div class='del'>-P: 	Tim Hockin</div><div class='add'>+P:	Tim Hockin</div><div class='ctx'> M:	thockin@hockin.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='hunk'>@@ -3065,9 +3025,10 @@ M:	horms@verge.net.au</div><div class='ctx'> P:	Julian Anastasov</div><div class='ctx'> M:	ja@ssi.bg</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='add'>+L:	lvs-devel@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-NFS CLIENT</div><div class='add'>+NFS, SUNRPC, AND LOCKD CLIENTS</div><div class='ctx'> P:	Trond Myklebust</div><div class='ctx'> M:	Trond.Myklebust@netapp.com</div><div class='ctx'> L:	linux-nfs@vger.kernel.org</div><div class='hunk'>@@ -3102,7 +3063,7 @@ P:	Anton Altaparmakov</div><div class='ctx'> M:	aia21@cantab.net</div><div class='ctx'> L:	linux-ntfs-dev@lists.sourceforge.net</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='del'>-W:	http://linux-ntfs.sf.net/</div><div class='add'>+W:	http://www.linux-ntfs.org/</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='hunk'>@@ -3145,7 +3106,7 @@ M:	laforge@gnumonks.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> OMNIVISION OV7670 SENSOR DRIVER</div><div class='del'>-P:   	Jonathan Corbet</div><div class='add'>+P:	Jonathan Corbet</div><div class='ctx'> M:	corbet@lwn.net</div><div class='ctx'> L:	video4linux-list@redhat.com</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -3255,7 +3216,7 @@ T:	git kernel.org:/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='ctx'> PCI HOTPLUG CORE</div><div class='del'>-P: 	Kristen Carlson Accardi</div><div class='add'>+P:	Kristen Carlson Accardi</div><div class='ctx'> M:	kristen.c.accardi@intel.com</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='hunk'>@@ -3694,7 +3655,7 @@ M:	jmorris@namei.org</div><div class='ctx'> P:	Eric Paris</div><div class='ctx'> M:	eparis@parisplace.org</div><div class='ctx'> L:	linux-kernel@vger.kernel.org (kernel issues)</div><div class='del'>-L: 	selinux@tycho.nsa.gov (subscribers-only, general discussion)</div><div class='add'>+L:	selinux@tycho.nsa.gov (subscribers-only, general discussion)</div><div class='ctx'> W:	http://www.nsa.gov/selinux</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='hunk'>@@ -3730,6 +3691,16 @@ L:	linux-visws-devel@lists.sf.net</div><div class='ctx'> W:	http://linux-visws.sf.net</div><div class='ctx'> S:	Maintained for 2.6.</div><div class='ctx'> </div><div class='add'>+SGI GRU DRIVER</div><div class='add'>+P:	Jack Steiner</div><div class='add'>+M:	steiner@sgi.com</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+SGI XP/XPC/XPNET DRIVER</div><div class='add'>+P:	Dean Nelson</div><div class='add'>+M:	dcn@sgi.com</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> SIMTEC EB110ATX (Chalice CATS)</div><div class='ctx'> P:	Ben Dooks</div><div class='ctx'> P:	Vincent Sanders</div><div class='hunk'>@@ -3802,10 +3773,10 @@ M:	bn@niasdigital.com</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> SOC-CAMERA V4L2 SUBSYSTEM</div><div class='del'>-P:     Guennadi Liakhovetski</div><div class='del'>-M:     g.liakhovetski@gmx.de</div><div class='del'>-L:     video4linux-list@redhat.com</div><div class='del'>-S:     Maintained</div><div class='add'>+P:	Guennadi Liakhovetski</div><div class='add'>+M:	g.liakhovetski@gmx.de</div><div class='add'>+L:	video4linux-list@redhat.com</div><div class='add'>+S:	Maintained</div><div class='ctx'> </div><div class='ctx'> SOFTWARE RAID (Multiple Disks) SUPPORT</div><div class='ctx'> P:	Ingo Molnar</div><div class='hunk'>@@ -3959,7 +3930,7 @@ S:	Maintained</div><div class='ctx'> </div><div class='ctx'> STARMODE RADIO IP (STRIP) PROTOCOL DRIVER</div><div class='ctx'> W:	http://mosquitonet.Stanford.EDU/strip.html</div><div class='del'>-S:	Unsupported ?</div><div class='add'>+S:	Orphan</div><div class='ctx'> </div><div class='ctx'> STRADIS MPEG-2 DECODER DRIVER</div><div class='ctx'> P:	Nathan Laredo</div><div class='hunk'>@@ -3973,7 +3944,7 @@ M:	lethal@linux-sh.org</div><div class='ctx'> L:	linux-sh@vger.kernel.org</div><div class='ctx'> W:	http://www.linux-sh.org</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git</div><div class='del'>-S:	Maintained</div><div class='add'>+S:	Supported</div><div class='ctx'> </div><div class='ctx'> SUN3/3X</div><div class='ctx'> P:	Sam Creasey</div><div class='hunk'>@@ -4040,13 +4011,13 @@ T:	git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> TI FLASH MEDIA INTERFACE DRIVER</div><div class='del'>-P:      Alex Dubov</div><div class='del'>-M:      oakad@yahoo.com</div><div class='del'>-S:      Maintained</div><div class='add'>+P:	Alex Dubov</div><div class='add'>+M:	oakad@yahoo.com</div><div class='add'>+S:	Maintained</div><div class='ctx'> </div><div class='ctx'> TI OMAP MMC INTERFACE DRIVER</div><div class='ctx'> P:	Carlos Aguiar, Anderson Briglia and Syed Khasim</div><div class='del'>-M:	linux-omap-open-source@linux.omap.com (subscribers only)</div><div class='add'>+M:	linux-omap@vger.kernel.org</div><div class='ctx'> W:	http://linux.omap.com</div><div class='ctx'> W:	http://www.muru.com/linux/omap/</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -4184,23 +4155,17 @@ M:	oliver@neukum.name</div><div class='ctx'> L:	linux-usb@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-USB AUERSWALD DRIVER</div><div class='del'>-P:	Wolfgang Muees</div><div class='del'>-M:	wolfgang@iksw-muees.de</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> USB BLOCK DRIVER (UB ub)</div><div class='ctx'> P:	Pete Zaitcev</div><div class='ctx'> M:	zaitcev@redhat.com</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='ctx'> USB CDC ETHERNET DRIVER</div><div class='ctx'> P:	Greg Kroah-Hartman</div><div class='ctx'> M:	greg@kroah.com</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> W:	http://www.kroah.com/linux-usb/</div><div class='ctx'> </div><div class='hunk'>@@ -4227,13 +4192,13 @@ S:	Maintained</div><div class='ctx'> USB EHCI DRIVER</div><div class='ctx'> P:	David Brownell</div><div class='ctx'> M:	dbrownell@users.sourceforge.net</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> S:	Odd Fixes</div><div class='ctx'> </div><div class='ctx'> USB ET61X[12]51 DRIVER</div><div class='ctx'> P:	Luca Risolia</div><div class='ctx'> M:	luca.risolia@studio.unibo.it</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> L:	video4linux-list@redhat.com</div><div class='ctx'> W:	http://www.linux-projects.org</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -4241,33 +4206,33 @@ S:	Maintained</div><div class='ctx'> USB GADGET/PERIPHERAL SUBSYSTEM</div><div class='ctx'> P:	David Brownell</div><div class='ctx'> M:	dbrownell@users.sourceforge.net</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> W:	http://www.linux-usb.org/gadget</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)</div><div class='ctx'> P:	Jiri Kosina</div><div class='ctx'> M:	jkosina@suse.cz</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/git/jikos/hid.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> USB ISP116X DRIVER</div><div class='ctx'> P:	Olav Kongas</div><div class='ctx'> M:	ok@artecdesign.ee</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> USB KAWASAKI LSI DRIVER</div><div class='ctx'> P:	Oliver Neukum</div><div class='ctx'> M:	oliver@neukum.name</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> USB MASS STORAGE DRIVER</div><div class='ctx'> P:	Matthew Dharm</div><div class='ctx'> M:	mdharm-usb@one-eyed-alien.net</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> L:	usb-storage@lists.one-eyed-alien.net</div><div class='ctx'> S:	Maintained</div><div class='ctx'> W:	http://www.one-eyed-alien.net/~mdharm/linux-usb/</div><div class='hunk'>@@ -4275,26 +4240,26 @@ W:	http://www.one-eyed-alien.net/~mdharm/linux-usb/</div><div class='ctx'> USB OHCI DRIVER</div><div class='ctx'> P:	David Brownell</div><div class='ctx'> M:	dbrownell@users.sourceforge.net</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> S:	Odd Fixes</div><div class='ctx'> </div><div class='ctx'> USB OPTION-CARD DRIVER</div><div class='ctx'> P:	Matthias Urlichs</div><div class='ctx'> M:	smurf@smurf.noris.de</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> USB OV511 DRIVER</div><div class='ctx'> P:	Mark McClelland</div><div class='ctx'> M:	mmcclell@bigfoot.com</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> W:	http://alpha.dyndns.org/ov511/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> USB PEGASUS DRIVER</div><div class='ctx'> P:	Petko Manolov</div><div class='ctx'> M:	petkan@users.sourceforge.net</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> W:	http://pegasus2.sourceforge.net/</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -4302,13 +4267,13 @@ S:	Maintained</div><div class='ctx'> USB PRINTER DRIVER (usblp)</div><div class='ctx'> P:	Pete Zaitcev</div><div class='ctx'> M:	zaitcev@redhat.com</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='ctx'> USB RTL8150 DRIVER</div><div class='ctx'> P:	Petko Manolov</div><div class='ctx'> M:	petkan@users.sourceforge.net</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> W:	http://pegasus2.sourceforge.net/</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -4316,20 +4281,20 @@ S:	Maintained</div><div class='ctx'> USB SE401 DRIVER</div><div class='ctx'> P:	Jeroen Vreeken</div><div class='ctx'> M:	pe1rxq@amsat.org</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> W:	http://www.chello.nl/~j.vreeken/se401/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> USB SERIAL BELKIN F5U103 DRIVER</div><div class='ctx'> P:	William Greathouse</div><div class='ctx'> M:	wgreathouse@smva.com</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> USB SERIAL CYPRESS M8 DRIVER</div><div class='ctx'> P:	Lonnie Mendez</div><div class='ctx'> M:	dignome@gmail.com</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> W:	http://geocities.com/i0xox0i</div><div class='ctx'> W:	http://firstlight.net/cvs</div><div class='hunk'>@@ -4344,39 +4309,39 @@ USB SERIAL DIGI ACCELEPORT DRIVER</div><div class='ctx'> P:	Peter Berger and Al Borchers</div><div class='ctx'> M:	pberger@brimson.com</div><div class='ctx'> M:	alborchers@steinerpoint.com</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> USB SERIAL DRIVER</div><div class='ctx'> P:	Greg Kroah-Hartman</div><div class='ctx'> M:	gregkh@suse.de</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='ctx'> USB SERIAL EMPEG EMPEG-CAR MARK I/II DRIVER</div><div class='ctx'> P:	Gary Brubaker</div><div class='ctx'> M:	xavyer@ix.netcom.com</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> USB SERIAL KEYSPAN DRIVER</div><div class='ctx'> P:	Greg Kroah-Hartman</div><div class='ctx'> M:	greg@kroah.com</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> W:	http://www.kroah.com/linux/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> USB SERIAL WHITEHEAT DRIVER</div><div class='ctx'> P:	Support Department</div><div class='ctx'> M:	support@connecttech.com</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> W:	http://www.connecttech.com</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='ctx'> USB SN9C1xx DRIVER</div><div class='ctx'> P:	Luca Risolia</div><div class='ctx'> M:	luca.risolia@studio.unibo.it</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> L:	video4linux-list@redhat.com</div><div class='ctx'> W:	http://www.linux-projects.org</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -4384,7 +4349,7 @@ S:	Maintained</div><div class='ctx'> USB SUBSYSTEM</div><div class='ctx'> P:	Greg Kroah-Hartman</div><div class='ctx'> M:	gregkh@suse.de</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> W:	http://www.linux-usb.org</div><div class='ctx'> T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -4392,7 +4357,7 @@ S:	Supported</div><div class='ctx'> USB UHCI DRIVER</div><div class='ctx'> P:	Alan Stern</div><div class='ctx'> M:	stern@rowland.harvard.edu</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> USB "USBNET" DRIVER FRAMEWORK</div><div class='hunk'>@@ -4405,7 +4370,7 @@ S:	Maintained</div><div class='ctx'> USB VIDEO CLASS</div><div class='ctx'> P:	Laurent Pinchart</div><div class='ctx'> M:	laurent.pinchart@skynet.be</div><div class='del'>-L:	linx-uvc-devel@berlios.de</div><div class='add'>+L:	linux-uvc-devel@lists.berlios.de</div><div class='ctx'> L:	video4linux-list@redhat.com</div><div class='ctx'> W:	http://linux-uvc.berlios.de</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -4413,7 +4378,7 @@ S:	Maintained</div><div class='ctx'> USB W996[87]CF DRIVER</div><div class='ctx'> P:	Luca Risolia</div><div class='ctx'> M:	luca.risolia@studio.unibo.it</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> L:	video4linux-list@redhat.com</div><div class='ctx'> W:	http://www.linux-projects.org</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -4427,7 +4392,7 @@ S:	Maintained</div><div class='ctx'> USB ZC0301 DRIVER</div><div class='ctx'> P:	Luca Risolia</div><div class='ctx'> M:	luca.risolia@studio.unibo.it</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> L:	video4linux-list@redhat.com</div><div class='ctx'> W:	http://www.linux-projects.org</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -4435,14 +4400,14 @@ S:	Maintained</div><div class='ctx'> USB ZD1201 DRIVER</div><div class='ctx'> P:	Jeroen Vreeken</div><div class='ctx'> M:	pe1rxq@amsat.org</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> W:	http://linux-lc100020.sourceforge.net</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> USB ZR364XX DRIVER</div><div class='ctx'> P:	Antoine Jacquet</div><div class='ctx'> M:	royale@zerezo.com</div><div class='del'>-L:      linux-usb@vger.kernel.org</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='ctx'> L:	video4linux-list@redhat.com</div><div class='ctx'> W:	http://royale.zerezo.com/zr364xx/</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -4509,6 +4474,15 @@ M:	kaber@trash.net</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+VOLTAGE AND CURRENT REGULATOR FRAMEWORK</div><div class='add'>+P:	Liam Girdwood</div><div class='add'>+M:	lg@opensource.wolfsonmicro.com</div><div class='add'>+P:	Mark Brown</div><div class='add'>+M:	broonie@opensource.wolfsonmicro.com</div><div class='add'>+W:	http://opensource.wolfsonmicro.com/node/15</div><div class='add'>+T:	git kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> VT1211 HARDWARE MONITOR DRIVER</div><div class='ctx'> P:	Juerg Haefliger</div><div class='ctx'> M:	juergh@gmail.com</div><div class='hunk'>@@ -4663,12 +4637,6 @@ L:	linux-wireless@vger.kernel.org</div><div class='ctx'> L:	zd1211-devs@lists.sourceforge.net (subscribers-only)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-ZF MACHZ WATCHDOG</div><div class='del'>-P:	Fernando Fuganti</div><div class='del'>-M:	fuganti@netbank.com.br</div><div class='del'>-W:	http://cvs.conectiva.com.br/drivers/ZFL-watchdog/</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> ZR36067 VIDEO FOR LINUX DRIVER</div><div class='ctx'> P:	Ronald Bultje</div><div class='ctx'> M:	rbultje@ronald.bitfreak.net</div><div class='head'>diff --git a/Makefile b/Makefile<br/>index aa527a46c807..cab896a97296 100644<br/>--- a/<a href='/cgit/linux.git/tree/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>Makefile</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> VERSION = 2</div><div class='ctx'> PATCHLEVEL = 6</div><div class='ctx'> SUBLEVEL = 27</div><div class='del'>-EXTRAVERSION = -rc1</div><div class='add'>+EXTRAVERSION = -rc7</div><div class='ctx'> NAME = Rotary Wombat</div><div class='ctx'> </div><div class='ctx'> # *DOCUMENTATION*</div><div class='hunk'>@@ -822,6 +822,9 @@ endif</div><div class='ctx'> ifdef CONFIG_SAMPLES</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=samples</div><div class='ctx'> endif</div><div class='add'>+ifdef CONFIG_BUILD_DOCSRC</div><div class='add'>+	$(Q)$(MAKE) $(build)=Documentation</div><div class='add'>+endif</div><div class='ctx'> 	$(call vmlinux-modpost)</div><div class='ctx'> 	$(call if_changed_rule,vmlinux__)</div><div class='ctx'> 	$(Q)rm -f .old_version</div><div class='hunk'>@@ -929,10 +932,10 @@ ifneq ($(KBUILD_SRC),)</div><div class='ctx'> 		echo "  in the '$(srctree)' directory.";\</div><div class='ctx'> 		/bin/false; \</div><div class='ctx'> 	fi;</div><div class='del'>-	$(Q)if [ ! -d include2 ]; then mkdir -p include2; fi;</div><div class='del'>-	$(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/system.h ]; then  \</div><div class='add'>+	$(Q)if [ ! -d include2 ]; then                                  \</div><div class='add'>+	    mkdir -p include2;                                          \</div><div class='ctx'> 	    ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm;     \</div><div class='del'>-	    fi</div><div class='add'>+	fi</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> # prepare2 creates a makefile if using a separate output directory</div><div class='hunk'>@@ -1166,7 +1169,7 @@ MRPROPER_FILES += .config .config.old include/asm .version .old_version \</div><div class='ctx'> #</div><div class='ctx'> clean: rm-dirs  := $(CLEAN_DIRS)</div><div class='ctx'> clean: rm-files := $(CLEAN_FILES)</div><div class='del'>-clean-dirs      := $(addprefix _clean_,$(srctree) $(vmlinux-alldirs))</div><div class='add'>+clean-dirs      := $(addprefix _clean_,$(srctree) $(vmlinux-alldirs) Documentation)</div><div class='ctx'> </div><div class='ctx'> PHONY += $(clean-dirs) clean archclean</div><div class='ctx'> $(clean-dirs):</div><div class='hunk'>@@ -1492,7 +1495,7 @@ quiet_cmd_cscope-file = FILELST cscope.files</div><div class='ctx'>       cmd_cscope-file = (echo \-k; echo \-q; $(all-sources)) &gt; cscope.files</div><div class='ctx'> </div><div class='ctx'> quiet_cmd_cscope = MAKE    cscope.out</div><div class='del'>-      cmd_cscope = cscope -b</div><div class='add'>+      cmd_cscope = cscope -b -f cscope.out</div><div class='ctx'> </div><div class='ctx'> cscope: FORCE</div><div class='ctx'> 	$(call cmd,cscope-file)</div><div class='head'>diff --git a/include/asm-alpha/8253pit.h b/arch/alpha/include/asm/8253pit.h<br/>index fef5c1450e47..fef5c1450e47 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/8253pit.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/8253pit.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/8253pit.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/8253pit.h</a></div><div class='head'>diff --git a/include/asm-alpha/Kbuild b/arch/alpha/include/asm/Kbuild<br/>index b7c8f188b313..b7c8f188b313 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/Kbuild?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/Kbuild</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/Kbuild</a></div><div class='head'>diff --git a/include/asm-alpha/a.out-core.h b/arch/alpha/include/asm/a.out-core.h<br/>index 9e33e92e524c..9e33e92e524c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/a.out-core.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/a.out-core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/a.out-core.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/a.out-core.h</a></div><div class='head'>diff --git a/include/asm-alpha/a.out.h b/arch/alpha/include/asm/a.out.h<br/>index 02ce8473870a..02ce8473870a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/a.out.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/a.out.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/a.out.h</a></div><div class='head'>diff --git a/include/asm-alpha/agp.h b/arch/alpha/include/asm/agp.h<br/>index 26c179135293..26c179135293 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/agp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/agp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/agp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/agp.h</a></div><div class='head'>diff --git a/include/asm-alpha/agp_backend.h b/arch/alpha/include/asm/agp_backend.h<br/>index 55dd44a2cea7..55dd44a2cea7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/agp_backend.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/agp_backend.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/agp_backend.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/agp_backend.h</a></div><div class='head'>diff --git a/include/asm-alpha/atomic.h b/arch/alpha/include/asm/atomic.h<br/>index ca88e54dec93..ca88e54dec93 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/atomic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/atomic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/atomic.h</a></div><div class='head'>diff --git a/include/asm-alpha/auxvec.h b/arch/alpha/include/asm/auxvec.h<br/>index e96fe880e310..e96fe880e310 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/auxvec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/auxvec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/auxvec.h</a></div><div class='head'>diff --git a/include/asm-alpha/barrier.h b/arch/alpha/include/asm/barrier.h<br/>index ac78eba909bc..ac78eba909bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/barrier.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/barrier.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/barrier.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/barrier.h</a></div><div class='head'>diff --git a/include/asm-alpha/bitops.h b/arch/alpha/include/asm/bitops.h<br/>index 15f3ae25c511..15f3ae25c511 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/bitops.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/bitops.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/bitops.h</a></div><div class='head'>diff --git a/include/asm-alpha/bug.h b/arch/alpha/include/asm/bug.h<br/>index 695a5ee4b5d3..695a5ee4b5d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/bug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/bug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/bug.h</a></div><div class='head'>diff --git a/include/asm-alpha/bugs.h b/arch/alpha/include/asm/bugs.h<br/>index 78030d1c7e7e..78030d1c7e7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/bugs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/bugs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/bugs.h</a></div><div class='head'>diff --git a/include/asm-alpha/byteorder.h b/arch/alpha/include/asm/byteorder.h<br/>index 58e958fc7f1b..58e958fc7f1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/byteorder.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/byteorder.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/byteorder.h</a></div><div class='head'>diff --git a/include/asm-alpha/cache.h b/arch/alpha/include/asm/cache.h<br/>index f199e69a5d0b..f199e69a5d0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/cache.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/cache.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/cache.h</a></div><div class='head'>diff --git a/include/asm-alpha/cacheflush.h b/arch/alpha/include/asm/cacheflush.h<br/>index b686cc7fc44e..b686cc7fc44e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/cacheflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/cacheflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/cacheflush.h</a></div><div class='head'>diff --git a/include/asm-alpha/checksum.h b/arch/alpha/include/asm/checksum.h<br/>index d3854bbf0a9e..d3854bbf0a9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/checksum.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/checksum.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/checksum.h</a></div><div class='head'>diff --git a/include/asm-alpha/compiler.h b/arch/alpha/include/asm/compiler.h<br/>index da6bb199839c..da6bb199839c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/compiler.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/compiler.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/compiler.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/compiler.h</a></div><div class='head'>diff --git a/include/asm-alpha/console.h b/arch/alpha/include/asm/console.h<br/>index a3ce4e62249b..a3ce4e62249b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/console.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/console.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/console.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/console.h</a></div><div class='head'>diff --git a/include/asm-alpha/core_apecs.h b/arch/alpha/include/asm/core_apecs.h<br/>index 6785ff7e02bc..6785ff7e02bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/core_apecs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/core_apecs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/core_apecs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_apecs.h</a></div><div class='head'>diff --git a/include/asm-alpha/core_cia.h b/arch/alpha/include/asm/core_cia.h<br/>index 9e0516c0ca27..9e0516c0ca27 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/core_cia.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/core_cia.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/core_cia.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_cia.h</a></div><div class='head'>diff --git a/include/asm-alpha/core_irongate.h b/arch/alpha/include/asm/core_irongate.h<br/>index 24b2db541501..24b2db541501 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/core_irongate.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/core_irongate.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/core_irongate.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_irongate.h</a></div><div class='head'>diff --git a/include/asm-alpha/core_lca.h b/arch/alpha/include/asm/core_lca.h<br/>index f7cb4b460954..f7cb4b460954 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/core_lca.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/core_lca.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/core_lca.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_lca.h</a></div><div class='head'>diff --git a/include/asm-alpha/core_marvel.h b/arch/alpha/include/asm/core_marvel.h<br/>index 30d55fe7aaf6..30d55fe7aaf6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/core_marvel.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/core_marvel.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/core_marvel.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_marvel.h</a></div><div class='head'>diff --git a/include/asm-alpha/core_mcpcia.h b/arch/alpha/include/asm/core_mcpcia.h<br/>index acf55b483472..acf55b483472 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/core_mcpcia.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/core_mcpcia.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/core_mcpcia.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_mcpcia.h</a></div><div class='head'>diff --git a/include/asm-alpha/core_polaris.h b/arch/alpha/include/asm/core_polaris.h<br/>index 2f966b64659d..2f966b64659d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/core_polaris.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/core_polaris.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/core_polaris.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_polaris.h</a></div><div class='head'>diff --git a/include/asm-alpha/core_t2.h b/arch/alpha/include/asm/core_t2.h<br/>index 46bfff58f670..46bfff58f670 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/core_t2.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/core_t2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/core_t2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_t2.h</a></div><div class='head'>diff --git a/include/asm-alpha/core_titan.h b/arch/alpha/include/asm/core_titan.h<br/>index a17f6f33b68e..a17f6f33b68e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/core_titan.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/core_titan.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/core_titan.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_titan.h</a></div><div class='head'>diff --git a/include/asm-alpha/core_tsunami.h b/arch/alpha/include/asm/core_tsunami.h<br/>index 58d4fe48742c..58d4fe48742c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/core_tsunami.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/core_tsunami.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/core_tsunami.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_tsunami.h</a></div><div class='head'>diff --git a/include/asm-alpha/core_wildfire.h b/arch/alpha/include/asm/core_wildfire.h<br/>index cd562f544ba2..cd562f544ba2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/core_wildfire.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/core_wildfire.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/core_wildfire.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/core_wildfire.h</a></div><div class='head'>diff --git a/include/asm-alpha/cputime.h b/arch/alpha/include/asm/cputime.h<br/>index 19577fd93230..19577fd93230 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/cputime.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/cputime.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/cputime.h</a></div><div class='head'>diff --git a/include/asm-alpha/current.h b/arch/alpha/include/asm/current.h<br/>index 094d285a1b34..094d285a1b34 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/current.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/current.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/current.h</a></div><div class='head'>diff --git a/include/asm-alpha/delay.h b/arch/alpha/include/asm/delay.h<br/>index 2aa3f410f7e6..2aa3f410f7e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/delay.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/delay.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/delay.h</a></div><div class='head'>diff --git a/include/asm-alpha/device.h b/arch/alpha/include/asm/device.h<br/>index d8f9872b0e2d..d8f9872b0e2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/device.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/device.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/device.h</a></div><div class='head'>diff --git a/include/asm-alpha/div64.h b/arch/alpha/include/asm/div64.h<br/>index 6cd978cefb28..6cd978cefb28 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/div64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/div64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/div64.h</a></div><div class='head'>diff --git a/include/asm-alpha/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h<br/>index a5801ae02e4b..a5801ae02e4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/dma-mapping.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/dma-mapping.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/dma-mapping.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/dma-mapping.h</a></div><div class='head'>diff --git a/include/asm-alpha/dma.h b/arch/alpha/include/asm/dma.h<br/>index 87cfdbdf08fc..87cfdbdf08fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/dma.h</a></div><div class='head'>diff --git a/include/asm-alpha/elf.h b/arch/alpha/include/asm/elf.h<br/>index fc1002ea1e0c..fc1002ea1e0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/elf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/elf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/elf.h</a></div><div class='head'>diff --git a/include/asm-alpha/emergency-restart.h b/arch/alpha/include/asm/emergency-restart.h<br/>index 108d8c48e42e..108d8c48e42e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/emergency-restart.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/emergency-restart.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/emergency-restart.h</a></div><div class='head'>diff --git a/include/asm-alpha/err_common.h b/arch/alpha/include/asm/err_common.h<br/>index c25095942107..c25095942107 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/err_common.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/err_common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/err_common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/err_common.h</a></div><div class='head'>diff --git a/include/asm-alpha/err_ev6.h b/arch/alpha/include/asm/err_ev6.h<br/>index ea637791e4a9..ea637791e4a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/err_ev6.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/err_ev6.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/err_ev6.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/err_ev6.h</a></div><div class='head'>diff --git a/include/asm-alpha/err_ev7.h b/arch/alpha/include/asm/err_ev7.h<br/>index 87f99777c2e4..87f99777c2e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/err_ev7.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/err_ev7.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/err_ev7.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/err_ev7.h</a></div><div class='head'>diff --git a/include/asm-alpha/errno.h b/arch/alpha/include/asm/errno.h<br/>index 69e2655249d2..69e2655249d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/errno.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/errno.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/errno.h</a></div><div class='head'>diff --git a/include/asm-alpha/fb.h b/arch/alpha/include/asm/fb.h<br/>index fa9bbb96b2b3..fa9bbb96b2b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/fb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/fb.h</a></div><div class='head'>diff --git a/include/asm-alpha/fcntl.h b/arch/alpha/include/asm/fcntl.h<br/>index 25da0017ec87..25da0017ec87 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/fcntl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/fcntl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/fcntl.h</a></div><div class='head'>diff --git a/include/asm-alpha/floppy.h b/arch/alpha/include/asm/floppy.h<br/>index 0be50413b2b5..0be50413b2b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/floppy.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/floppy.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/floppy.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/floppy.h</a></div><div class='head'>diff --git a/include/asm-alpha/fpu.h b/arch/alpha/include/asm/fpu.h<br/>index ecb17a72acc3..ecb17a72acc3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/fpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/fpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/fpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/fpu.h</a></div><div class='head'>diff --git a/include/asm-alpha/futex.h b/arch/alpha/include/asm/futex.h<br/>index 6a332a9f099c..6a332a9f099c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/futex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/futex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/futex.h</a></div><div class='head'>diff --git a/include/asm-alpha/gct.h b/arch/alpha/include/asm/gct.h<br/>index 3504c704927c..3504c704927c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/gct.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/gct.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/gct.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/gct.h</a></div><div class='head'>diff --git a/include/asm-alpha/gentrap.h b/arch/alpha/include/asm/gentrap.h<br/>index ae50cc3192c7..ae50cc3192c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/gentrap.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/gentrap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/gentrap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/gentrap.h</a></div><div class='head'>diff --git a/include/asm-alpha/hardirq.h b/arch/alpha/include/asm/hardirq.h<br/>index d953e234daa8..d953e234daa8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/hardirq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/hardirq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/hardirq.h</a></div><div class='head'>diff --git a/include/asm-alpha/hw_irq.h b/arch/alpha/include/asm/hw_irq.h<br/>index a37db0f95092..a37db0f95092 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/hw_irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/hw_irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/hw_irq.h</a></div><div class='head'>diff --git a/include/asm-alpha/hwrpb.h b/arch/alpha/include/asm/hwrpb.h<br/>index 8e8f871af7cf..8e8f871af7cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/hwrpb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/hwrpb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/hwrpb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/hwrpb.h</a></div><div class='head'>diff --git a/include/asm-alpha/io.h b/arch/alpha/include/asm/io.h<br/>index e971ab000f95..e971ab000f95 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/io.h</a></div><div class='head'>diff --git a/include/asm-alpha/io_trivial.h b/arch/alpha/include/asm/io_trivial.h<br/>index 1c77f10b4b36..1c77f10b4b36 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/io_trivial.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/io_trivial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/io_trivial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/io_trivial.h</a></div><div class='head'>diff --git a/include/asm-alpha/ioctl.h b/arch/alpha/include/asm/ioctl.h<br/>index fc63727f4178..fc63727f4178 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/ioctl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/ioctl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/ioctl.h</a></div><div class='head'>diff --git a/include/asm-alpha/ioctls.h b/arch/alpha/include/asm/ioctls.h<br/>index 67bb9f6fdbe4..67bb9f6fdbe4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/ioctls.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/ioctls.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/ioctls.h</a></div><div class='head'>diff --git a/include/asm-alpha/ipcbuf.h b/arch/alpha/include/asm/ipcbuf.h<br/>index d9c0e1a50702..d9c0e1a50702 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/ipcbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/ipcbuf.h</a></div><div class='head'>diff --git a/include/asm-alpha/irq.h b/arch/alpha/include/asm/irq.h<br/>index 06377400dc09..06377400dc09 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/irq.h</a></div><div class='head'>diff --git a/include/asm-alpha/irq_regs.h b/arch/alpha/include/asm/irq_regs.h<br/>index 3dd9c0b70270..3dd9c0b70270 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/irq_regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/irq_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/irq_regs.h</a></div><div class='head'>diff --git a/include/asm-alpha/jensen.h b/arch/alpha/include/asm/jensen.h<br/>index 964b06ead43b..964b06ead43b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/jensen.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/jensen.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/jensen.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/jensen.h</a></div><div class='head'>diff --git a/include/asm-alpha/kdebug.h b/arch/alpha/include/asm/kdebug.h<br/>index 6ece1b037665..6ece1b037665 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/kdebug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/kdebug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/kdebug.h</a></div><div class='head'>diff --git a/include/asm-alpha/kmap_types.h b/arch/alpha/include/asm/kmap_types.h<br/>index 3e6735a34c57..3e6735a34c57 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/kmap_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/kmap_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/kmap_types.h</a></div><div class='head'>diff --git a/include/asm-alpha/linkage.h b/arch/alpha/include/asm/linkage.h<br/>index 291c2d01c44f..291c2d01c44f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/linkage.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/linkage.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/linkage.h</a></div><div class='head'>diff --git a/include/asm-alpha/local.h b/arch/alpha/include/asm/local.h<br/>index 6ad3ea696421..6ad3ea696421 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/local.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/local.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/local.h</a></div><div class='head'>diff --git a/include/asm-alpha/machvec.h b/arch/alpha/include/asm/machvec.h<br/>index a86c083cdf7f..a86c083cdf7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/machvec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/machvec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/machvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/machvec.h</a></div><div class='head'>diff --git a/include/asm-alpha/mc146818rtc.h b/arch/alpha/include/asm/mc146818rtc.h<br/>index 097703f1c8cb..097703f1c8cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/mc146818rtc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/mc146818rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/mc146818rtc.h</a></div><div class='head'>diff --git a/include/asm-alpha/md.h b/arch/alpha/include/asm/md.h<br/>index 6c9b8222a4f2..6c9b8222a4f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/md.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/md.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/md.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/md.h</a></div><div class='head'>diff --git a/include/asm-alpha/mman.h b/arch/alpha/include/asm/mman.h<br/>index 90d7c35d2867..90d7c35d2867 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/mman.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/mman.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/mman.h</a></div><div class='head'>diff --git a/include/asm-alpha/mmu.h b/arch/alpha/include/asm/mmu.h<br/>index 3dc127779329..3dc127779329 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/mmu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/mmu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/mmu.h</a></div><div class='head'>diff --git a/include/asm-alpha/mmu_context.h b/arch/alpha/include/asm/mmu_context.h<br/>index 86c08a02d239..86c08a02d239 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/mmu_context.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/mmu_context.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/mmu_context.h</a></div><div class='head'>diff --git a/include/asm-alpha/mmzone.h b/arch/alpha/include/asm/mmzone.h<br/>index 8af56ce346ad..8af56ce346ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/mmzone.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/mmzone.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/mmzone.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/mmzone.h</a></div><div class='head'>diff --git a/include/asm-alpha/module.h b/arch/alpha/include/asm/module.h<br/>index 7b63743c534a..7b63743c534a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/module.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/module.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/module.h</a></div><div class='head'>diff --git a/include/asm-alpha/msgbuf.h b/arch/alpha/include/asm/msgbuf.h<br/>index 98496501a2bb..98496501a2bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/msgbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/msgbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/msgbuf.h</a></div><div class='head'>diff --git a/include/asm-alpha/mutex.h b/arch/alpha/include/asm/mutex.h<br/>index 458c1f7fbc18..458c1f7fbc18 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/mutex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/mutex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/mutex.h</a></div><div class='head'>diff --git a/include/asm-alpha/page.h b/arch/alpha/include/asm/page.h<br/>index 0995f9d13417..0995f9d13417 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/page.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/page.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/page.h</a></div><div class='head'>diff --git a/include/asm-alpha/pal.h b/arch/alpha/include/asm/pal.h<br/>index 9b4ba0d6f00b..9b4ba0d6f00b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/pal.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/pal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/pal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/pal.h</a></div><div class='head'>diff --git a/include/asm-alpha/param.h b/arch/alpha/include/asm/param.h<br/>index e691ecfedb2c..e691ecfedb2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/param.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/param.h</a></div><div class='head'>diff --git a/include/asm-alpha/parport.h b/arch/alpha/include/asm/parport.h<br/>index c5ee7cbb2fcd..c5ee7cbb2fcd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/parport.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/parport.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/parport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/parport.h</a></div><div class='head'>diff --git a/include/asm-alpha/pci.h b/arch/alpha/include/asm/pci.h<br/>index 2a14302c17a3..2a14302c17a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/pci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/pci.h</a></div><div class='head'>diff --git a/include/asm-alpha/percpu.h b/arch/alpha/include/asm/percpu.h<br/>index 3495e8e00d70..3495e8e00d70 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/percpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/percpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/percpu.h</a></div><div class='head'>diff --git a/include/asm-alpha/pgalloc.h b/arch/alpha/include/asm/pgalloc.h<br/>index fd090155dccd..fd090155dccd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/pgalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/pgalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/pgalloc.h</a></div><div class='head'>diff --git a/include/asm-alpha/pgtable.h b/arch/alpha/include/asm/pgtable.h<br/>index 3f0c59f6d8aa..3f0c59f6d8aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/pgtable.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/pgtable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/pgtable.h</a></div><div class='head'>diff --git a/include/asm-alpha/poll.h b/arch/alpha/include/asm/poll.h<br/>index c98509d3149e..c98509d3149e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/poll.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/poll.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/poll.h</a></div><div class='head'>diff --git a/include/asm-alpha/posix_types.h b/arch/alpha/include/asm/posix_types.h<br/>index db167413300b..db167413300b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/posix_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/posix_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/posix_types.h</a></div><div class='head'>diff --git a/include/asm-alpha/processor.h b/arch/alpha/include/asm/processor.h<br/>index 94afe5859301..94afe5859301 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/processor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/processor.h</a></div><div class='head'>diff --git a/include/asm-alpha/ptrace.h b/arch/alpha/include/asm/ptrace.h<br/>index 32c7a5cddd59..32c7a5cddd59 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/ptrace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/ptrace.h</a></div><div class='head'>diff --git a/include/asm-alpha/reg.h b/arch/alpha/include/asm/reg.h<br/>index 86ff916fb069..86ff916fb069 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/reg.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/reg.h</a></div><div class='head'>diff --git a/include/asm-alpha/regdef.h b/arch/alpha/include/asm/regdef.h<br/>index 142df9c4f8b8..142df9c4f8b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/regdef.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/regdef.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/regdef.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/regdef.h</a></div><div class='head'>diff --git a/include/asm-alpha/resource.h b/arch/alpha/include/asm/resource.h<br/>index c10874ff5973..c10874ff5973 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/resource.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/resource.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/resource.h</a></div><div class='head'>diff --git a/include/asm-alpha/rtc.h b/arch/alpha/include/asm/rtc.h<br/>index 4e854b1333eb..4e854b1333eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/rtc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/rtc.h</a></div><div class='head'>diff --git a/include/asm-alpha/rwsem.h b/arch/alpha/include/asm/rwsem.h<br/>index 1570c0b54336..1570c0b54336 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/rwsem.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/rwsem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/rwsem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/rwsem.h</a></div><div class='head'>diff --git a/include/asm-alpha/scatterlist.h b/arch/alpha/include/asm/scatterlist.h<br/>index 440747ca6349..440747ca6349 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/scatterlist.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/scatterlist.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/scatterlist.h</a></div><div class='head'>diff --git a/include/asm-alpha/sections.h b/arch/alpha/include/asm/sections.h<br/>index 43b40edd6e44..43b40edd6e44 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/sections.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/sections.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/sections.h</a></div><div class='head'>diff --git a/include/asm-alpha/segment.h b/arch/alpha/include/asm/segment.h<br/>index 0453d97daae7..0453d97daae7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/segment.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/segment.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/segment.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/segment.h</a></div><div class='head'>diff --git a/include/asm-alpha/sembuf.h b/arch/alpha/include/asm/sembuf.h<br/>index 7b38b1534784..7b38b1534784 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/sembuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/sembuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/sembuf.h</a></div><div class='head'>diff --git a/include/asm-alpha/serial.h b/arch/alpha/include/asm/serial.h<br/>index 9d263e8d8ccc..9d263e8d8ccc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/serial.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/serial.h</a></div><div class='head'>diff --git a/include/asm-alpha/setup.h b/arch/alpha/include/asm/setup.h<br/>index 2e023a4aa317..2e023a4aa317 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/setup.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/setup.h</a></div><div class='head'>diff --git a/include/asm-alpha/sfp-machine.h b/arch/alpha/include/asm/sfp-machine.h<br/>index 5fe63afbd474..5fe63afbd474 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/sfp-machine.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/sfp-machine.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/sfp-machine.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/sfp-machine.h</a></div><div class='head'>diff --git a/include/asm-alpha/shmbuf.h b/arch/alpha/include/asm/shmbuf.h<br/>index 37ee84f05085..37ee84f05085 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/shmbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/shmbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/shmbuf.h</a></div><div class='head'>diff --git a/include/asm-alpha/shmparam.h b/arch/alpha/include/asm/shmparam.h<br/>index cc901d58aebb..cc901d58aebb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/shmparam.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/shmparam.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/shmparam.h</a></div><div class='head'>diff --git a/include/asm-alpha/sigcontext.h b/arch/alpha/include/asm/sigcontext.h<br/>index 323cdb026198..323cdb026198 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/sigcontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/sigcontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/sigcontext.h</a></div><div class='head'>diff --git a/include/asm-alpha/siginfo.h b/arch/alpha/include/asm/siginfo.h<br/>index 9822362a8424..9822362a8424 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/siginfo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/siginfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/siginfo.h</a></div><div class='head'>diff --git a/include/asm-alpha/signal.h b/arch/alpha/include/asm/signal.h<br/>index 13c2305d35ef..13c2305d35ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/signal.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/signal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/signal.h</a></div><div class='head'>diff --git a/include/asm-alpha/smp.h b/arch/alpha/include/asm/smp.h<br/>index 544c69af8168..544c69af8168 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/smp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/smp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/smp.h</a></div><div class='head'>diff --git a/include/asm-alpha/socket.h b/arch/alpha/include/asm/socket.h<br/>index a1057c2d95e7..a1057c2d95e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/socket.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/socket.h</a></div><div class='head'>diff --git a/include/asm-alpha/sockios.h b/arch/alpha/include/asm/sockios.h<br/>index 7932c7ab4a4d..7932c7ab4a4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/sockios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/sockios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/sockios.h</a></div><div class='head'>diff --git a/include/asm-alpha/spinlock.h b/arch/alpha/include/asm/spinlock.h<br/>index aeeb125f6851..aeeb125f6851 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/spinlock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/spinlock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/spinlock.h</a></div><div class='head'>diff --git a/include/asm-alpha/spinlock_types.h b/arch/alpha/include/asm/spinlock_types.h<br/>index 8141eb5ebf0d..8141eb5ebf0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/spinlock_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/spinlock_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/spinlock_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/spinlock_types.h</a></div><div class='head'>diff --git a/include/asm-alpha/stat.h b/arch/alpha/include/asm/stat.h<br/>index 07ad3e6b3f3e..07ad3e6b3f3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/stat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/stat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/stat.h</a></div><div class='head'>diff --git a/include/asm-alpha/statfs.h b/arch/alpha/include/asm/statfs.h<br/>index ad15830baefe..ad15830baefe 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/statfs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/statfs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/statfs.h</a></div><div class='head'>diff --git a/include/asm-alpha/string.h b/arch/alpha/include/asm/string.h<br/>index b02b8a282940..b02b8a282940 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/string.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/string.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/string.h</a></div><div class='head'>diff --git a/include/asm-alpha/suspend.h b/arch/alpha/include/asm/suspend.h<br/>index c7042d575851..c7042d575851 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/suspend.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/suspend.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/suspend.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/suspend.h</a></div><div class='head'>diff --git a/include/asm-alpha/sysinfo.h b/arch/alpha/include/asm/sysinfo.h<br/>index 086aba284df2..086aba284df2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/sysinfo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/sysinfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/sysinfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/sysinfo.h</a></div><div class='head'>diff --git a/include/asm-alpha/system.h b/arch/alpha/include/asm/system.h<br/>index afe20fa58c99..afe20fa58c99 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/system.h</a></div><div class='head'>diff --git a/include/asm-alpha/termbits.h b/arch/alpha/include/asm/termbits.h<br/>index ad854a4a3af6..ad854a4a3af6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/termbits.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/termbits.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/termbits.h</a></div><div class='head'>diff --git a/include/asm-alpha/termios.h b/arch/alpha/include/asm/termios.h<br/>index fa13716a11c3..fa13716a11c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/termios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/termios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/termios.h</a></div><div class='head'>diff --git a/include/asm-alpha/thread_info.h b/arch/alpha/include/asm/thread_info.h<br/>index 15fda4344424..15fda4344424 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/thread_info.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/thread_info.h</a></div><div class='head'>diff --git a/include/asm-alpha/timex.h b/arch/alpha/include/asm/timex.h<br/>index afa0c45e3e98..afa0c45e3e98 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/timex.h</a></div><div class='head'>diff --git a/include/asm-alpha/tlb.h b/arch/alpha/include/asm/tlb.h<br/>index c13636575fba..c13636575fba 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/tlb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/tlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/tlb.h</a></div><div class='head'>diff --git a/include/asm-alpha/tlbflush.h b/arch/alpha/include/asm/tlbflush.h<br/>index 9d87aaa08c0d..9d87aaa08c0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/tlbflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/tlbflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/tlbflush.h</a></div><div class='head'>diff --git a/include/asm-alpha/topology.h b/arch/alpha/include/asm/topology.h<br/>index 149532e162c4..149532e162c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/topology.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/topology.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/topology.h</a></div><div class='head'>diff --git a/include/asm-alpha/types.h b/arch/alpha/include/asm/types.h<br/>index c1541353ccef..c1541353ccef 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/types.h</a></div><div class='head'>diff --git a/include/asm-alpha/uaccess.h b/arch/alpha/include/asm/uaccess.h<br/>index 22de3b434a22..22de3b434a22 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/uaccess.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/uaccess.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/uaccess.h</a></div><div class='head'>diff --git a/include/asm-alpha/ucontext.h b/arch/alpha/include/asm/ucontext.h<br/>index 47578ab42152..47578ab42152 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/ucontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/ucontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/ucontext.h</a></div><div class='head'>diff --git a/include/asm-alpha/unaligned.h b/arch/alpha/include/asm/unaligned.h<br/>index 3787c60aed3f..3787c60aed3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/unaligned.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/unaligned.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/unaligned.h</a></div><div class='head'>diff --git a/include/asm-alpha/unistd.h b/arch/alpha/include/asm/unistd.h<br/>index 5b5c17485942..5b5c17485942 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/unistd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/unistd.h</a></div><div class='head'>diff --git a/include/asm-alpha/user.h b/arch/alpha/include/asm/user.h<br/>index a4eb6a4ca8d1..a4eb6a4ca8d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/user.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/user.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/user.h</a></div><div class='head'>diff --git a/include/asm-alpha/vga.h b/arch/alpha/include/asm/vga.h<br/>index c00106bac521..c00106bac521 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/vga.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/vga.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/vga.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/vga.h</a></div><div class='head'>diff --git a/include/asm-alpha/xor.h b/arch/alpha/include/asm/xor.h<br/>index 5ee1c2bc0499..5ee1c2bc0499 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-alpha/xor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-alpha/xor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/xor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/include/asm/xor.h</a></div><div class='head'>diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c<br/>index 6e943135f0e0..8509dad31204 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/osf_sys.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/alpha/kernel/osf_sys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/osf_sys.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/alpha/kernel/osf_sys.c</a></div><div class='hunk'>@@ -121,24 +121,29 @@ osf_filldir(void *__buf, const char *name, int namlen, loff_t offset,</div><div class='ctx'> 	if (reclen &gt; buf-&gt;count)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	d_ino = ino;</div><div class='del'>-	if (sizeof(d_ino) &lt; sizeof(ino) &amp;&amp; d_ino != ino)</div><div class='add'>+	if (sizeof(d_ino) &lt; sizeof(ino) &amp;&amp; d_ino != ino) {</div><div class='add'>+		buf-&gt;error = -EOVERFLOW;</div><div class='ctx'> 		return -EOVERFLOW;</div><div class='add'>+	}</div><div class='ctx'> 	if (buf-&gt;basep) {</div><div class='ctx'> 		if (put_user(offset, buf-&gt;basep))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+			goto Efault;</div><div class='ctx'> 		buf-&gt;basep = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	dirent = buf-&gt;dirent;</div><div class='del'>-	put_user(d_ino, &amp;dirent-&gt;d_ino);</div><div class='del'>-	put_user(namlen, &amp;dirent-&gt;d_namlen);</div><div class='del'>-	put_user(reclen, &amp;dirent-&gt;d_reclen);</div><div class='del'>-	if (copy_to_user(dirent-&gt;d_name, name, namlen) ||</div><div class='add'>+	if (put_user(d_ino, &amp;dirent-&gt;d_ino) ||</div><div class='add'>+	    put_user(namlen, &amp;dirent-&gt;d_namlen) ||</div><div class='add'>+	    put_user(reclen, &amp;dirent-&gt;d_reclen) ||</div><div class='add'>+	    copy_to_user(dirent-&gt;d_name, name, namlen) ||</div><div class='ctx'> 	    put_user(0, dirent-&gt;d_name + namlen))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+		goto Efault;</div><div class='ctx'> 	dirent = (void __user *)dirent + reclen;</div><div class='ctx'> 	buf-&gt;dirent = dirent;</div><div class='ctx'> 	buf-&gt;count -= reclen;</div><div class='ctx'> 	return 0;</div><div class='add'>+Efault:</div><div class='add'>+	buf-&gt;error = -EFAULT;</div><div class='add'>+	return -EFAULT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> asmlinkage int</div><div class='head'>diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig<br/>index 257033c691f2..70dba1668907 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/Kconfig</a></div><div class='hunk'>@@ -810,6 +810,11 @@ config OABI_COMPAT</div><div class='ctx'> 	  UNPREDICTABLE (in fact it can be predicted that it won't work</div><div class='ctx'> 	  at all). If in doubt say Y.</div><div class='ctx'> </div><div class='add'>+config ARCH_FLATMEM_HAS_HOLES</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+	depends on FLATMEM</div><div class='add'>+</div><div class='ctx'> config ARCH_DISCONTIGMEM_ENABLE</div><div class='ctx'> 	bool</div><div class='ctx'> 	default (ARCH_LH7A40X &amp;&amp; !LH7A40X_CONTIGMEM)</div><div class='hunk'>@@ -1225,6 +1230,8 @@ source "drivers/dma/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/dca/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/regulator/Kconfig"</div><div class='add'>+</div><div class='ctx'> source "drivers/uio/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='head'>diff --git a/arch/arm/Makefile b/arch/arm/Makefile<br/>index 2f0747744236..703a44fa0f9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/Makefile</a></div><div class='hunk'>@@ -97,9 +97,7 @@ textofs-y	:= 0x00008000</div><div class='ctx'>  machine-$(CONFIG_ARCH_RPC)	   := rpc</div><div class='ctx'>  machine-$(CONFIG_ARCH_EBSA110)	   := ebsa110</div><div class='ctx'>  machine-$(CONFIG_ARCH_CLPS7500)   := clps7500</div><div class='del'>-  incdir-$(CONFIG_ARCH_CLPS7500)   := cl7500</div><div class='ctx'>  machine-$(CONFIG_FOOTBRIDGE)	   := footbridge</div><div class='del'>-  incdir-$(CONFIG_FOOTBRIDGE)	   := ebsa285</div><div class='ctx'>  machine-$(CONFIG_ARCH_SHARK)	   := shark</div><div class='ctx'>  machine-$(CONFIG_ARCH_SA1100)	   := sa1100</div><div class='ctx'> ifeq ($(CONFIG_ARCH_SA1100),y)</div><div class='hunk'>@@ -114,13 +112,15 @@ endif</div><div class='ctx'>  machine-$(CONFIG_ARCH_IOP32X)	   := iop32x</div><div class='ctx'>  machine-$(CONFIG_ARCH_IOP33X)	   := iop33x</div><div class='ctx'>  machine-$(CONFIG_ARCH_IOP13XX)	   := iop13xx</div><div class='add'>+    plat-$(CONFIG_PLAT_IOP)	   := iop</div><div class='ctx'>  machine-$(CONFIG_ARCH_IXP4XX)	   := ixp4xx</div><div class='ctx'>  machine-$(CONFIG_ARCH_IXP2000)    := ixp2000</div><div class='ctx'>  machine-$(CONFIG_ARCH_IXP23XX)    := ixp23xx</div><div class='ctx'>  machine-$(CONFIG_ARCH_OMAP1)	   := omap1</div><div class='ctx'>  machine-$(CONFIG_ARCH_OMAP2)	   := omap2</div><div class='del'>-  incdir-$(CONFIG_ARCH_OMAP)	   := omap</div><div class='del'>- machine-$(CONFIG_ARCH_S3C2410)	   := s3c2410</div><div class='add'>+    plat-$(CONFIG_ARCH_OMAP)	   := omap</div><div class='add'>+ machine-$(CONFIG_ARCH_S3C2410)	   := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443</div><div class='add'>+    plat-$(CONFIG_PLAT_S3C24XX)	   := s3c24xx</div><div class='ctx'>  machine-$(CONFIG_ARCH_LH7A40X)	   := lh7a40x</div><div class='ctx'>  machine-$(CONFIG_ARCH_VERSATILE)  := versatile</div><div class='ctx'>  machine-$(CONFIG_ARCH_IMX)	   := imx</div><div class='hunk'>@@ -135,10 +135,11 @@ endif</div><div class='ctx'>  machine-$(CONFIG_ARCH_DAVINCI)	   := davinci</div><div class='ctx'>  machine-$(CONFIG_ARCH_KIRKWOOD)   := kirkwood</div><div class='ctx'>  machine-$(CONFIG_ARCH_KS8695)     := ks8695</div><div class='del'>-  incdir-$(CONFIG_ARCH_MXC)	   := mxc</div><div class='add'>+    plat-$(CONFIG_ARCH_MXC)	   := mxc</div><div class='ctx'>  machine-$(CONFIG_ARCH_MX2)	   := mx2</div><div class='ctx'>  machine-$(CONFIG_ARCH_MX3)	   := mx3</div><div class='ctx'>  machine-$(CONFIG_ARCH_ORION5X)	   := orion5x</div><div class='add'>+    plat-$(CONFIG_PLAT_ORION)	   := orion</div><div class='ctx'>  machine-$(CONFIG_ARCH_MSM7X00A)   := msm</div><div class='ctx'>  machine-$(CONFIG_ARCH_LOKI)       := loki</div><div class='ctx'>  machine-$(CONFIG_ARCH_MV78XX0)    := mv78xx0</div><div class='hunk'>@@ -153,17 +154,22 @@ endif</div><div class='ctx'> # The byte offset of the kernel image in RAM from the start of RAM.</div><div class='ctx'> TEXT_OFFSET := $(textofs-y)</div><div class='ctx'> </div><div class='del'>-ifeq ($(incdir-y),)</div><div class='del'>-incdir-y := $(machine-y)</div><div class='del'>-endif</div><div class='del'>-INCDIR   := arch-$(incdir-y)</div><div class='del'>-</div><div class='add'>+# The first directory contains additional information for the boot setup code</div><div class='ctx'> ifneq ($(machine-y),)</div><div class='del'>-MACHINE  := arch/arm/mach-$(machine-y)/</div><div class='add'>+MACHINE  := arch/arm/mach-$(word 1,$(machine-y))/</div><div class='ctx'> else</div><div class='ctx'> MACHINE  :=</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='add'>+machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))</div><div class='add'>+platdirs := $(patsubst %,arch/arm/plat-%/,$(plat-y))</div><div class='add'>+</div><div class='add'>+ifeq ($(KBUILD_SRC),)</div><div class='add'>+KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs))</div><div class='add'>+else</div><div class='add'>+KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs))</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> export	TEXT_OFFSET GZFLAGS MMUEXT</div><div class='ctx'> </div><div class='ctx'> # Do we have FASTFPE?</div><div class='hunk'>@@ -174,23 +180,11 @@ endif</div><div class='ctx'> </div><div class='ctx'> # If we have a machine-specific directory, then include it in the build.</div><div class='ctx'> core-y				+= arch/arm/kernel/ arch/arm/mm/ arch/arm/common/</div><div class='del'>-core-y				+= $(MACHINE)</div><div class='del'>-core-$(CONFIG_ARCH_S3C2410)	+= arch/arm/mach-s3c2400/</div><div class='del'>-core-$(CONFIG_ARCH_S3C2410)	+= arch/arm/mach-s3c2412/</div><div class='del'>-core-$(CONFIG_ARCH_S3C2410)	+= arch/arm/mach-s3c2440/</div><div class='del'>-core-$(CONFIG_ARCH_S3C2410)	+= arch/arm/mach-s3c2442/</div><div class='del'>-core-$(CONFIG_ARCH_S3C2410)	+= arch/arm/mach-s3c2443/</div><div class='add'>+core-y				+= $(machdirs) $(platdirs)</div><div class='ctx'> core-$(CONFIG_FPE_NWFPE)	+= arch/arm/nwfpe/</div><div class='ctx'> core-$(CONFIG_FPE_FASTFPE)	+= $(FASTFPE_OBJ)</div><div class='ctx'> core-$(CONFIG_VFP)		+= arch/arm/vfp/</div><div class='ctx'> </div><div class='del'>-# If we have a common platform directory, then include it in the build.</div><div class='del'>-core-$(CONFIG_PLAT_IOP)		+= arch/arm/plat-iop/</div><div class='del'>-core-$(CONFIG_PLAT_ORION)		+= arch/arm/plat-orion/</div><div class='del'>-core-$(CONFIG_ARCH_OMAP)	+= arch/arm/plat-omap/</div><div class='del'>-core-$(CONFIG_PLAT_S3C24XX)		+= arch/arm/plat-s3c24xx/</div><div class='del'>-core-$(CONFIG_ARCH_MXC)		+= arch/arm/plat-mxc/</div><div class='del'>-</div><div class='ctx'> drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/</div><div class='ctx'> </div><div class='ctx'> libs-y				:= arch/arm/lib/ $(libs-y)</div><div class='hunk'>@@ -210,20 +204,10 @@ boot := arch/arm/boot</div><div class='ctx'> #	them changed.  We use .arch to indicate when they were updated</div><div class='ctx'> #	last, otherwise make uses the target directory mtime.</div><div class='ctx'> </div><div class='del'>-include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf</div><div class='del'>-	@echo '  SYMLINK include/asm-arm/arch -&gt; include/asm-arm/$(INCDIR)'</div><div class='del'>-ifneq ($(KBUILD_SRC),)</div><div class='del'>-	$(Q)mkdir -p include/asm-arm</div><div class='del'>-	$(Q)ln -fsn $(srctree)/include/asm-arm/$(INCDIR) include/asm-arm/arch</div><div class='del'>-else</div><div class='del'>-	$(Q)ln -fsn $(INCDIR) include/asm-arm/arch</div><div class='del'>-endif</div><div class='del'>-	@touch $@</div><div class='del'>-</div><div class='ctx'> archprepare: maketools</div><div class='ctx'> </div><div class='ctx'> PHONY += maketools FORCE</div><div class='del'>-maketools: include/linux/version.h include/asm-arm/.arch FORCE</div><div class='add'>+maketools: include/linux/version.h FORCE</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h</div><div class='ctx'> </div><div class='ctx'> # Convert bzImage to zImage</div><div class='head'>diff --git a/arch/arm/boot/compressed/.gitignore b/arch/arm/boot/compressed/.gitignore<br/>index b15f927a5926..ab204db594d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/.gitignore?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/boot/compressed/.gitignore</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/boot/compressed/.gitignore</a></div><div class='hunk'>@@ -1,2 +1,3 @@</div><div class='del'>-piggy.gz</div><div class='ctx'> font.c</div><div class='add'>+piggy.gz</div><div class='add'>+vmlinux.lds</div><div class='head'>diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile<br/>index 95baac4939e0..94462a097f86 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/boot/compressed/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/boot/compressed/Makefile</a></div><div class='hunk'>@@ -112,6 +112,3 @@ $(obj)/font.c: $(FONTC)</div><div class='ctx'> </div><div class='ctx'> $(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config</div><div class='ctx'> 	@sed "$(SEDFLAGS)" &lt; $&lt; &gt; $@</div><div class='del'>-</div><div class='del'>-$(obj)/misc.o: $(obj)/misc.c include/asm/arch/uncompress.h lib/inflate.c</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S<br/>index dd3fbd6766e1..aa5ee49c5c5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head-xscale.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/boot/compressed/head-xscale.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head-xscale.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/boot/compressed/head-xscale.S</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.section        ".start", "ax"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S<br/>index de41daeab5e9..d42f89b7760b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/boot/compressed/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/boot/compressed/head.S</a></div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/debug-macro.S&gt;</div><div class='add'>+#include &lt;mach/debug-macro.S&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	writeb,	ch, rb</div><div class='ctx'> 		senduart \ch, \rb</div><div class='head'>diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c<br/>index 7145cc7c04f0..65ce8fff29db 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/misc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/boot/compressed/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/misc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/boot/compressed/misc.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@ unsigned int __machine_arch_type;</div><div class='ctx'> static void putstr(const char *ptr);</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;asm/arch/uncompress.h&gt;</div><div class='add'>+#include &lt;mach/uncompress.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_ICEDCC</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c<br/>index 69130f365904..aecc6c3f908f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/dmabounce.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/common/dmabounce.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/dmabounce.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/common/dmabounce.c</a></div><div class='hunk'>@@ -246,9 +246,9 @@ map_single(struct device *dev, void *ptr, size_t size,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		dev_dbg(dev,</div><div class='del'>-			"%s: unsafe buffer %p (phy=%p) mapped to %p (phy=%p)\n",</div><div class='del'>-			__func__, buf-&gt;ptr, (void *) virt_to_dma(dev, buf-&gt;ptr),</div><div class='del'>-			buf-&gt;safe, (void *) buf-&gt;safe_dma_addr);</div><div class='add'>+			"%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n",</div><div class='add'>+			__func__, buf-&gt;ptr, virt_to_dma(dev, buf-&gt;ptr),</div><div class='add'>+			buf-&gt;safe, buf-&gt;safe_dma_addr);</div><div class='ctx'> </div><div class='ctx'> 		if ((dir == DMA_TO_DEVICE) ||</div><div class='ctx'> 		    (dir == DMA_BIDIRECTIONAL)) {</div><div class='hunk'>@@ -292,9 +292,9 @@ unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='ctx'> 		BUG_ON(buf-&gt;size != size);</div><div class='ctx'> </div><div class='ctx'> 		dev_dbg(dev,</div><div class='del'>-			"%s: unsafe buffer %p (phy=%p) mapped to %p (phy=%p)\n",</div><div class='del'>-			__func__, buf-&gt;ptr, (void *) virt_to_dma(dev, buf-&gt;ptr),</div><div class='del'>-			buf-&gt;safe, (void *) buf-&gt;safe_dma_addr);</div><div class='add'>+			"%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n",</div><div class='add'>+			__func__, buf-&gt;ptr, virt_to_dma(dev, buf-&gt;ptr),</div><div class='add'>+			buf-&gt;safe, buf-&gt;safe_dma_addr);</div><div class='ctx'> </div><div class='ctx'> 		DO_STATS ( device_info-&gt;bounce_count++ );</div><div class='ctx'> </div><div class='hunk'>@@ -321,9 +321,8 @@ unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-sync_single(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='del'>-		enum dma_data_direction dir)</div><div class='add'>+static int sync_single(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='add'>+			enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='ctx'> 	struct dmabounce_device_info *device_info = dev-&gt;archdata.dmabounce;</div><div class='ctx'> 	struct safe_buffer *buf = NULL;</div><div class='hunk'>@@ -355,9 +354,9 @@ sync_single(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		dev_dbg(dev,</div><div class='del'>-			"%s: unsafe buffer %p (phy=%p) mapped to %p (phy=%p)\n",</div><div class='del'>-			__func__, buf-&gt;ptr, (void *) virt_to_dma(dev, buf-&gt;ptr),</div><div class='del'>-			buf-&gt;safe, (void *) buf-&gt;safe_dma_addr);</div><div class='add'>+			"%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n",</div><div class='add'>+			__func__, buf-&gt;ptr, virt_to_dma(dev, buf-&gt;ptr),</div><div class='add'>+			buf-&gt;safe, buf-&gt;safe_dma_addr);</div><div class='ctx'> </div><div class='ctx'> 		DO_STATS ( device_info-&gt;bounce_count++ );</div><div class='ctx'> </div><div class='hunk'>@@ -383,8 +382,9 @@ sync_single(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='ctx'> 		 * No need to sync the safe buffer - it was allocated</div><div class='ctx'> 		 * via the coherent allocators.</div><div class='ctx'> 		 */</div><div class='add'>+		return 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		dma_cache_maint(dma_to_virt(dev, dma_addr), size, dir);</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -474,25 +474,29 @@ dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='del'>-				enum dma_data_direction dir)</div><div class='add'>+void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_addr,</div><div class='add'>+				   unsigned long offset, size_t size,</div><div class='add'>+				   enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",</div><div class='del'>-		__func__, (void *) dma_addr, size, dir);</div><div class='add'>+	dev_dbg(dev, "%s(dma=%#x,off=%#lx,size=%zx,dir=%x)\n",</div><div class='add'>+		__func__, dma_addr, offset, size, dir);</div><div class='ctx'> </div><div class='del'>-	sync_single(dev, dma_addr, size, dir);</div><div class='add'>+	if (sync_single(dev, dma_addr, offset + size, dir))</div><div class='add'>+		dma_cache_maint(dma_to_virt(dev, dma_addr) + offset, size, dir);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(dma_sync_single_range_for_cpu);</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-dma_sync_single_for_device(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='del'>-				enum dma_data_direction dir)</div><div class='add'>+void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_addr,</div><div class='add'>+				      unsigned long offset, size_t size,</div><div class='add'>+				      enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",</div><div class='del'>-		__func__, (void *) dma_addr, size, dir);</div><div class='add'>+	dev_dbg(dev, "%s(dma=%#x,off=%#lx,size=%zx,dir=%x)\n",</div><div class='add'>+		__func__, dma_addr, offset, size, dir);</div><div class='ctx'> </div><div class='del'>-	sync_single(dev, dma_addr, size, dir);</div><div class='add'>+	if (sync_single(dev, dma_addr, offset + size, dir))</div><div class='add'>+		dma_cache_maint(dma_to_virt(dev, dma_addr) + offset, size, dir);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(dma_sync_single_range_for_device);</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nents,</div><div class='hunk'>@@ -644,8 +648,6 @@ EXPORT_SYMBOL(dma_map_single);</div><div class='ctx'> EXPORT_SYMBOL(dma_unmap_single);</div><div class='ctx'> EXPORT_SYMBOL(dma_map_sg);</div><div class='ctx'> EXPORT_SYMBOL(dma_unmap_sg);</div><div class='del'>-EXPORT_SYMBOL(dma_sync_single_for_cpu);</div><div class='del'>-EXPORT_SYMBOL(dma_sync_single_for_device);</div><div class='ctx'> EXPORT_SYMBOL(dma_sync_sg_for_cpu);</div><div class='ctx'> EXPORT_SYMBOL(dma_sync_sg_for_device);</div><div class='ctx'> EXPORT_SYMBOL(dmabounce_register_dev);</div><div class='head'>diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c<br/>index 85579654d3b7..283051eaf931 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/locomo.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/common/locomo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/locomo.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/common/locomo.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='head'>diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c<br/>index f6d3fdda7067..ec8a5471bf06 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/sa1111.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/common/sa1111.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/sa1111.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/common/sa1111.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c<br/>index 8822b684d474..db8309161408 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/sharpsl_pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/common/sharpsl_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/sharpsl_pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/common/sharpsl_pm.c</a></div><div class='hunk'>@@ -26,13 +26,12 @@</div><div class='ctx'> #include &lt;linux/apm-emulation.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/pm.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/sharpsl.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/sharpsl.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/sharpsl_pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/common/time-acorn.c b/arch/arm/common/time-acorn.c<br/>index d544da414731..df0983aafe69 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/time-acorn.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/common/time-acorn.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/time-acorn.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/common/time-acorn.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/ioc.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/common/uengine.c b/arch/arm/common/uengine.c<br/>index 117cab30bd36..7ecd3c0ab011 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/uengine.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/common/uengine.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/uengine.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/common/uengine.c</a></div><div class='hunk'>@@ -16,8 +16,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/uengine.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/configs/ams_delta_defconfig b/arch/arm/configs/ams_delta_defconfig<br/>new file mode 100644<br/>index 000000000000..2c4aa11f0b0d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/ams_delta_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/ams_delta_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1314 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.22-rc1-omap1</div><div class='add'>+# Thu Jun  7 04:28:32 2007</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+# CONFIG_SWAP is not set</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+# CONFIG_IPC_NS is not set</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP1=y</div><div class='add'>+# CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+# CONFIG_OMAP_BOOT_TAG is not set</div><div class='add'>+# CONFIG_OMAP_GPIO_SWITCH is not set</div><div class='add'>+CONFIG_OMAP_MUX=y</div><div class='add'>+# CONFIG_OMAP_MUX_DEBUG is not set</div><div class='add'>+CONFIG_OMAP_MUX_WARNINGS=y</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+CONFIG_OMAP_MMU_FWK=y</div><div class='add'>+CONFIG_OMAP_MBOX_FWK=m</div><div class='add'>+CONFIG_OMAP_MPU_TIMER=y</div><div class='add'>+# CONFIG_OMAP_32K_TIMER is not set</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART1=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART3 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_LCD is not set</div><div class='add'>+CONFIG_OMAP_SERIAL_WAKE=y</div><div class='add'>+CONFIG_OMAP_DSP=m</div><div class='add'>+# CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set</div><div class='add'>+# CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set</div><div class='add'>+# CONFIG_OMAP_DSP_FBEXPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Core Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_OMAP730 is not set</div><div class='add'>+CONFIG_ARCH_OMAP15XX=y</div><div class='add'>+# CONFIG_ARCH_OMAP16XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_MACH_OMAP_INNOVATOR is not set</div><div class='add'>+# CONFIG_MACH_VOICEBLUE is not set</div><div class='add'>+# CONFIG_MACH_OMAP_PALMTE is not set</div><div class='add'>+# CONFIG_MACH_OMAP_PALMZ71 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_PALMTT is not set</div><div class='add'>+# CONFIG_MACH_SX1 is not set</div><div class='add'>+CONFIG_MACH_AMS_DELTA=y</div><div class='add'>+# CONFIG_MACH_OMAP_GENERIC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP CPU Speed</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set</div><div class='add'>+# CONFIG_OMAP_ARM_168MHZ is not set</div><div class='add'>+CONFIG_OMAP_ARM_150MHZ=y</div><div class='add'>+# CONFIG_OMAP_ARM_120MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_60MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_30MHZ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM925T=y</div><div class='add'>+CONFIG_CPU_32v4T=y</div><div class='add'>+CONFIG_CPU_ABRT_EV4T=y</div><div class='add'>+CONFIG_CPU_CACHE_V4WT=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARM_THUMB is not set</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+CONFIG_CPU_DCACHE_WRITETHROUGH=y</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="mem=32M console=ttyS0,115200n8 root=/dev/ram0 initrd=0x11c00000,4M"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+# CONFIG_IP_PNP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+CONFIG_INET_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+CONFIG_IPV6=y</div><div class='add'>+# CONFIG_IPV6_PRIVACY is not set</div><div class='add'>+# CONFIG_IPV6_ROUTER_PREF is not set</div><div class='add'>+# CONFIG_IPV6_OPTIMISTIC_DAD is not set</div><div class='add'>+# CONFIG_INET6_AH is not set</div><div class='add'>+# CONFIG_INET6_ESP is not set</div><div class='add'>+# CONFIG_INET6_IPCOMP is not set</div><div class='add'>+# CONFIG_IPV6_MIP6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET6_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set</div><div class='add'>+CONFIG_IPV6_SIT=y</div><div class='add'>+# CONFIG_IPV6_TUNNEL is not set</div><div class='add'>+# CONFIG_IPV6_MULTIPLE_TABLES is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_CFI is not set</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+CONFIG_MTD_NAND=y</div><div class='add'>+# CONFIG_MTD_NAND_VERIFY_WRITE is not set</div><div class='add'>+# CONFIG_MTD_NAND_ECC_SMC is not set</div><div class='add'>+# CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='add'>+CONFIG_MTD_NAND_AMS_DELTA=y</div><div class='add'>+CONFIG_MTD_NAND_IDS=y</div><div class='add'>+# CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='add'>+# CONFIG_MTD_NAND_NANDSIM is not set</div><div class='add'>+# CONFIG_MTD_NAND_PLATFORM is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PNPACPI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='add'>+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+# CONFIG_CHR_DEV_SG is not set</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI low-level drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_ESP_CORE is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_CATC=y</div><div class='add'>+CONFIG_USB_KAWETH=y</div><div class='add'>+CONFIG_USB_PEGASUS=y</div><div class='add'>+CONFIG_USB_RTL8150=y</div><div class='add'>+CONFIG_USB_USBNET_MII=y</div><div class='add'>+CONFIG_USB_USBNET=y</div><div class='add'>+CONFIG_USB_NET_AX8817X=y</div><div class='add'>+CONFIG_USB_NET_CDCETHER=y</div><div class='add'>+# CONFIG_USB_NET_DM9601 is not set</div><div class='add'>+# CONFIG_USB_NET_GL620A is not set</div><div class='add'>+CONFIG_USB_NET_NET1080=y</div><div class='add'>+# CONFIG_USB_NET_PLUSB is not set</div><div class='add'>+# CONFIG_USB_NET_MCS7830 is not set</div><div class='add'>+# CONFIG_USB_NET_RNDIS_HOST is not set</div><div class='add'>+CONFIG_USB_NET_CDC_SUBSET=y</div><div class='add'>+# CONFIG_USB_ALI_M5632 is not set</div><div class='add'>+# CONFIG_USB_AN2720 is not set</div><div class='add'>+CONFIG_USB_BELKIN=y</div><div class='add'>+CONFIG_USB_ARMLINUX=y</div><div class='add'>+# CONFIG_USB_EPSON2888 is not set</div><div class='add'>+# CONFIG_USB_KC2190 is not set</div><div class='add'>+CONFIG_USB_NET_ZAURUS=y</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+CONFIG_PPP=y</div><div class='add'>+CONFIG_PPP_MULTILINK=y</div><div class='add'>+# CONFIG_PPP_FILTER is not set</div><div class='add'>+# CONFIG_PPP_ASYNC is not set</div><div class='add'>+# CONFIG_PPP_SYNC_TTY is not set</div><div class='add'>+# CONFIG_PPP_DEFLATE is not set</div><div class='add'>+# CONFIG_PPP_BSDCOMP is not set</div><div class='add'>+# CONFIG_PPP_MPPE is not set</div><div class='add'>+# CONFIG_PPPOE is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+CONFIG_SLHC=y</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+CONFIG_KEYBOARD_ATKBD=y</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_OMAP=y</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+CONFIG_SERIO_LIBPS2=y</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_ALGOBIT=y</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+CONFIG_I2C_OMAP=y</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='add'>+# CONFIG_SENSORS_TLV320AIC23 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLINK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+CONFIG_NEW_LEDS=y</div><div class='add'>+CONFIG_LEDS_CLASS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_LEDS_AMS_DELTA=y</div><div class='add'>+# CONFIG_LEDS_OMAP_DEBUG is not set</div><div class='add'>+# CONFIG_LEDS_OMAP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+CONFIG_LEDS_TRIGGERS=y</div><div class='add'>+CONFIG_LEDS_TRIGGER_TIMER=y</div><div class='add'>+CONFIG_LEDS_TRIGGER_HEARTBEAT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+CONFIG_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+# CONFIG_FB_CFB_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_CFB_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+CONFIG_FB_DEFERRED_IO=y</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+CONFIG_FB_OMAP=y</div><div class='add'>+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set</div><div class='add'>+# CONFIG_FB_OMAP_LCD_MIPID is not set</div><div class='add'>+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set</div><div class='add'>+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2</div><div class='add'>+# CONFIG_FB_OMAP_DMA_TUNE is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+CONFIG_FONTS=y</div><div class='add'>+# CONFIG_FONT_8x8 is not set</div><div class='add'>+# CONFIG_FONT_8x16 is not set</div><div class='add'>+CONFIG_FONT_6x11=y</div><div class='add'>+# CONFIG_FONT_7x14 is not set</div><div class='add'>+# CONFIG_FONT_PEARL_8x8 is not set</div><div class='add'>+# CONFIG_FONT_ACORN_8x8 is not set</div><div class='add'>+# CONFIG_FONT_MINI_4x6 is not set</div><div class='add'>+# CONFIG_FONT_CLEAN_4x6 is not set</div><div class='add'>+# CONFIG_FONT_CLEAN_5x8 is not set</div><div class='add'>+# CONFIG_FONT_SUN8x16 is not set</div><div class='add'>+# CONFIG_FONT_SUN12x22 is not set</div><div class='add'>+# CONFIG_FONT_10x18 is not set</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+# CONFIG_LOGO_LINUX_MONO is not set</div><div class='add'>+# CONFIG_LOGO_LINUX_VGA16 is not set</div><div class='add'>+CONFIG_LOGO_LINUX_CLUT224=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# HID Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+# CONFIG_USB_DEVICE_CLASS is not set</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Serial Converter support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB DSL modem support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_DRV_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_AUTOFS_FS=y</div><div class='add'>+CONFIG_AUTOFS4_FS=y</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+CONFIG_JFFS2_SUMMARY=y</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+# CONFIG_NFS_V3 is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_SUNRPC_BIND34 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+CONFIG_NLS_CODEPAGE_850=y</div><div class='add'>+CONFIG_NLS_CODEPAGE_852=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+CONFIG_NLS_ISO8859_1=y</div><div class='add'>+CONFIG_NLS_ISO8859_2=y</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Distributed Lock Manager</div><div class='add'>+#</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+CONFIG_DEBUG_PREEMPT=y</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+# CONFIG_DEBUG_ERRORS is not set</div><div class='add'>+# CONFIG_DEBUG_LL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/at91cap9adk_defconfig b/arch/arm/configs/at91cap9adk_defconfig<br/>index be2b2f38fd94..bf97801a1068 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/at91cap9adk_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/configs/at91cap9adk_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/at91cap9adk_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/at91cap9adk_defconfig</a></div><div class='hunk'>@@ -170,7 +170,7 @@ CONFIG_MACH_AT91CAP9ADK=y</div><div class='ctx'> # AT91 Board Options</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MTD_AT91_DATAFLASH_CARD=y</div><div class='del'>-# CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AT91 Feature Selections</div><div class='hunk'>@@ -442,7 +442,7 @@ CONFIG_MTD_NAND=y</div><div class='ctx'> # CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='ctx'> CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> # CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='del'>-CONFIG_MTD_NAND_AT91=y</div><div class='add'>+CONFIG_MTD_NAND_ATMEL=y</div><div class='ctx'> # CONFIG_MTD_NAND_NANDSIM is not set</div><div class='ctx'> # CONFIG_MTD_NAND_PLATFORM is not set</div><div class='ctx'> # CONFIG_MTD_ALAUDA is not set</div><div class='head'>diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig<br/>index 2011adfa6758..38e6a0abeb4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/at91sam9260ek_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/configs/at91sam9260ek_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/at91sam9260ek_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/at91sam9260ek_defconfig</a></div><div class='hunk'>@@ -176,7 +176,7 @@ CONFIG_MACH_AT91SAM9260EK=y</div><div class='ctx'> # AT91 Board Options</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_AT91_DATAFLASH_CARD is not set</div><div class='del'>-# CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AT91 Feature Selections</div><div class='head'>diff --git a/arch/arm/configs/at91sam9261ek_defconfig b/arch/arm/configs/at91sam9261ek_defconfig<br/>index 4049768962d2..93b779f94b41 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/at91sam9261ek_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/configs/at91sam9261ek_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/at91sam9261ek_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/at91sam9261ek_defconfig</a></div><div class='hunk'>@@ -169,7 +169,7 @@ CONFIG_MACH_AT91SAM9261EK=y</div><div class='ctx'> # AT91 Board Options</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_AT91_DATAFLASH_CARD is not set</div><div class='del'>-# CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AT91 Feature Selections</div><div class='hunk'>@@ -433,7 +433,7 @@ CONFIG_MTD_NAND=y</div><div class='ctx'> # CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='ctx'> CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> # CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='del'>-CONFIG_MTD_NAND_AT91=y</div><div class='add'>+CONFIG_MTD_NAND_ATMEL=y</div><div class='ctx'> # CONFIG_MTD_NAND_NANDSIM is not set</div><div class='ctx'> # CONFIG_MTD_NAND_PLATFORM is not set</div><div class='ctx'> # CONFIG_MTD_ALAUDA is not set</div><div class='head'>diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig<br/>index fa1c5aecb5a8..a7ddd94363ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/at91sam9263ek_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/configs/at91sam9263ek_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/at91sam9263ek_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/at91sam9263ek_defconfig</a></div><div class='hunk'>@@ -169,7 +169,7 @@ CONFIG_MACH_AT91SAM9263EK=y</div><div class='ctx'> # AT91 Board Options</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MTD_AT91_DATAFLASH_CARD=y</div><div class='del'>-# CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AT91 Feature Selections</div><div class='hunk'>@@ -428,7 +428,7 @@ CONFIG_MTD_NAND=y</div><div class='ctx'> # CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='ctx'> CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> # CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='del'>-CONFIG_MTD_NAND_AT91=y</div><div class='add'>+CONFIG_MTD_NAND_ATMEL=y</div><div class='ctx'> # CONFIG_MTD_NAND_NANDSIM is not set</div><div class='ctx'> # CONFIG_MTD_NAND_PLATFORM is not set</div><div class='ctx'> # CONFIG_MTD_ALAUDA is not set</div><div class='head'>diff --git a/arch/arm/configs/at91sam9g20ek_defconfig b/arch/arm/configs/at91sam9g20ek_defconfig<br/>index c06863847364..df0d6ee672b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/at91sam9g20ek_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/configs/at91sam9g20ek_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/at91sam9g20ek_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/at91sam9g20ek_defconfig</a></div><div class='hunk'>@@ -168,7 +168,7 @@ CONFIG_MACH_AT91SAM9G20EK=y</div><div class='ctx'> # AT91 Board Options</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_AT91_DATAFLASH_CARD is not set</div><div class='del'>-# CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AT91 Feature Selections</div><div class='hunk'>@@ -442,10 +442,10 @@ CONFIG_MTD_NAND=y</div><div class='ctx'> # CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='ctx'> CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> # CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='del'>-CONFIG_MTD_NAND_AT91=y</div><div class='del'>-CONFIG_MTD_NAND_AT91_ECC_SOFT=y</div><div class='del'>-# CONFIG_MTD_NAND_AT91_ECC_HW is not set</div><div class='del'>-# CONFIG_MTD_NAND_AT91_ECC_NONE is not set</div><div class='add'>+CONFIG_MTD_NAND_ATMEL=y</div><div class='add'>+CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_ECC_HW is not set</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set</div><div class='ctx'> # CONFIG_MTD_NAND_NANDSIM is not set</div><div class='ctx'> # CONFIG_MTD_NAND_PLATFORM is not set</div><div class='ctx'> # CONFIG_MTD_ALAUDA is not set</div><div class='head'>diff --git a/arch/arm/configs/at91sam9rlek_defconfig b/arch/arm/configs/at91sam9rlek_defconfig<br/>index d8ec5f9ca6ec..1c76642272a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/at91sam9rlek_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/configs/at91sam9rlek_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/at91sam9rlek_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/at91sam9rlek_defconfig</a></div><div class='hunk'>@@ -392,7 +392,7 @@ CONFIG_MTD_NAND=y</div><div class='ctx'> # CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='ctx'> CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> # CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='del'>-CONFIG_MTD_NAND_AT91=y</div><div class='add'>+CONFIG_MTD_NAND_ATMEL=y</div><div class='ctx'> # CONFIG_MTD_NAND_NANDSIM is not set</div><div class='ctx'> # CONFIG_MTD_NAND_PLATFORM is not set</div><div class='ctx'> # CONFIG_MTD_ONENAND is not set</div><div class='head'>diff --git a/arch/arm/configs/cam60_defconfig b/arch/arm/configs/cam60_defconfig<br/>index f3cd4a95373a..f945105d6cd6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/cam60_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/configs/cam60_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/cam60_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/cam60_defconfig</a></div><div class='hunk'>@@ -466,10 +466,10 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y</div><div class='ctx'> # CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='ctx'> CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> # CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='del'>-CONFIG_MTD_NAND_AT91=y</div><div class='del'>-# CONFIG_MTD_NAND_AT91_ECC_SOFT is not set</div><div class='del'>-CONFIG_MTD_NAND_AT91_ECC_HW=y</div><div class='del'>-# CONFIG_MTD_NAND_AT91_ECC_NONE is not set</div><div class='add'>+CONFIG_MTD_NAND_ATMEL=y</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_ECC_SOFT is not set</div><div class='add'>+CONFIG_MTD_NAND_ATMEL_ECC_HW=y</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set</div><div class='ctx'> # CONFIG_MTD_NAND_NANDSIM is not set</div><div class='ctx'> # CONFIG_MTD_NAND_PLATFORM is not set</div><div class='ctx'> # CONFIG_MTD_ALAUDA is not set</div><div class='head'>diff --git a/arch/arm/configs/n770_defconfig b/arch/arm/configs/n770_defconfig<br/>new file mode 100644<br/>index 000000000000..568ef1770d5f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/n770_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/n770_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1421 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.24-rc8-omap1</div><div class='add'>+# Fri Jan 18 10:21:06 2008</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+CONFIG_FAIR_GROUP_SCHED=y</div><div class='add'>+CONFIG_FAIR_USER_SCHED=y</div><div class='add'>+# CONFIG_FAIR_CGROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_BLK_DEV_INITRD is not set</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+# CONFIG_IOSCHED_AS is not set</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+CONFIG_DEFAULT_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP_OTG=y</div><div class='add'>+CONFIG_ARCH_OMAP1=y</div><div class='add'>+# CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+# CONFIG_ARCH_OMAP3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+CONFIG_OMAP_DEBUG_SRAM_PATCH=y</div><div class='add'>+CONFIG_OMAP_RESET_CLOCKS=y</div><div class='add'>+CONFIG_OMAP_BOOT_TAG=y</div><div class='add'>+CONFIG_OMAP_BOOT_REASON=y</div><div class='add'>+CONFIG_OMAP_COMPONENT_VERSION=y</div><div class='add'>+CONFIG_OMAP_GPIO_SWITCH=y</div><div class='add'>+# CONFIG_OMAP_MUX is not set</div><div class='add'>+CONFIG_OMAP_STI=y</div><div class='add'>+CONFIG_OMAP_STI_CONSOLE=y</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+CONFIG_OMAP_MMU_FWK=y</div><div class='add'>+CONFIG_OMAP_MBOX_FWK=y</div><div class='add'>+# CONFIG_OMAP_MPU_TIMER is not set</div><div class='add'>+CONFIG_OMAP_32K_TIMER=y</div><div class='add'>+CONFIG_OMAP_32K_TIMER_HZ=128</div><div class='add'>+CONFIG_OMAP_DM_TIMER=y</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART1=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Core Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_OMAP730 is not set</div><div class='add'>+# CONFIG_ARCH_OMAP15XX is not set</div><div class='add'>+CONFIG_ARCH_OMAP16XX=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_MACH_OMAP_INNOVATOR is not set</div><div class='add'>+# CONFIG_MACH_OMAP_H2 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_H3 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_OSK is not set</div><div class='add'>+CONFIG_MACH_NOKIA770=y</div><div class='add'>+# CONFIG_MACH_OMAP_GENERIC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP CPU Speed</div><div class='add'>+#</div><div class='add'>+CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y</div><div class='add'>+CONFIG_OMAP_ARM_216MHZ=y</div><div class='add'>+# CONFIG_OMAP_ARM_192MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_168MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_120MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_60MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_30MHZ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM926T=y</div><div class='add'>+CONFIG_CPU_32v5=y</div><div class='add'>+CONFIG_CPU_ABRT_EV5TJ=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_HZ=128</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="root=1f03 rootfstype=jffs2 time"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+# CONFIG_VFP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+# CONFIG_PM_LEGACY is not set</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND_UP_POSSIBLE=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+# CONFIG_APM_EMULATION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+# CONFIG_INET_DIAG is not set</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IP_VS is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETLABEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+CONFIG_NETFILTER=y</div><div class='add'>+# CONFIG_NETFILTER_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Core Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+CONFIG_NETFILTER_NETLINK=y</div><div class='add'>+# CONFIG_NETFILTER_NETLINK_QUEUE is not set</div><div class='add'>+# CONFIG_NETFILTER_NETLINK_LOG is not set</div><div class='add'>+# CONFIG_NF_CONNTRACK_ENABLED is not set</div><div class='add'>+# CONFIG_NF_CONNTRACK is not set</div><div class='add'>+# CONFIG_NETFILTER_XTABLES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IP: Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_NF_QUEUE is not set</div><div class='add'>+# CONFIG_IP_NF_IPTABLES is not set</div><div class='add'>+# CONFIG_IP_NF_ARPTABLES is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+CONFIG_BT=y</div><div class='add'>+CONFIG_BT_L2CAP=y</div><div class='add'>+CONFIG_BT_SCO=y</div><div class='add'>+CONFIG_BT_RFCOMM=y</div><div class='add'>+CONFIG_BT_RFCOMM_TTY=y</div><div class='add'>+CONFIG_BT_BNEP=y</div><div class='add'>+# CONFIG_BT_BNEP_MC_FILTER is not set</div><div class='add'>+# CONFIG_BT_BNEP_PROTO_FILTER is not set</div><div class='add'>+CONFIG_BT_HIDP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bluetooth device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_BT_HCIUSB is not set</div><div class='add'>+# CONFIG_BT_HCIBTUSB is not set</div><div class='add'>+# CONFIG_BT_HCIBTSDIO is not set</div><div class='add'>+# CONFIG_BT_HCIUART is not set</div><div class='add'>+# CONFIG_BT_HCIBCM203X is not set</div><div class='add'>+# CONFIG_BT_HCIBPA10X is not set</div><div class='add'>+# CONFIG_BT_HCIBFUSB is not set</div><div class='add'>+CONFIG_BT_HCIBRF6150=y</div><div class='add'>+# CONFIG_BT_HCIH4P is not set</div><div class='add'>+# CONFIG_BT_HCIVHCI is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+CONFIG_CONNECTOR=y</div><div class='add'>+# CONFIG_PROC_EVENTS is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_CFI is not set</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DATAFLASH is not set</div><div class='add'>+# CONFIG_MTD_M25P80 is not set</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+CONFIG_MTD_NAND=y</div><div class='add'>+# CONFIG_MTD_NAND_VERIFY_WRITE is not set</div><div class='add'>+# CONFIG_MTD_NAND_ECC_SMC is not set</div><div class='add'>+# CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='add'>+CONFIG_MTD_NAND_OMAP_HW=y</div><div class='add'>+CONFIG_MTD_NAND_IDS=y</div><div class='add'>+# CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='add'>+# CONFIG_MTD_NAND_NANDSIM is not set</div><div class='add'>+# CONFIG_MTD_NAND_PLATFORM is not set</div><div class='add'>+# CONFIG_MTD_ALAUDA is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+# CONFIG_BLK_DEV_RAM is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_SCSI_PROC_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+# CONFIG_CHR_DEV_SG is not set</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+CONFIG_TUN=y</div><div class='add'>+# CONFIG_VETH is not set</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+CONFIG_USB_USBNET=y</div><div class='add'>+# CONFIG_USB_NET_AX8817X is not set</div><div class='add'>+CONFIG_USB_NET_CDCETHER=y</div><div class='add'>+# CONFIG_USB_NET_DM9601 is not set</div><div class='add'>+# CONFIG_USB_NET_GL620A is not set</div><div class='add'>+CONFIG_USB_NET_NET1080=y</div><div class='add'>+# CONFIG_USB_NET_PLUSB is not set</div><div class='add'>+# CONFIG_USB_NET_MCS7830 is not set</div><div class='add'>+# CONFIG_USB_NET_RNDIS_HOST is not set</div><div class='add'>+# CONFIG_USB_NET_CDC_SUBSET is not set</div><div class='add'>+CONFIG_USB_NET_ZAURUS=y</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+CONFIG_PPP=y</div><div class='add'>+# CONFIG_PPP_MULTILINK is not set</div><div class='add'>+CONFIG_PPP_FILTER=y</div><div class='add'>+CONFIG_PPP_ASYNC=y</div><div class='add'>+# CONFIG_PPP_SYNC_TTY is not set</div><div class='add'>+CONFIG_PPP_DEFLATE=y</div><div class='add'>+CONFIG_PPP_BSDCOMP=y</div><div class='add'>+# CONFIG_PPP_MPPE is not set</div><div class='add'>+# CONFIG_PPPOE is not set</div><div class='add'>+# CONFIG_PPPOL2TP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+CONFIG_SLHC=y</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+# CONFIG_KEYBOARD_ATKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_OMAP=y</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+CONFIG_INPUT_TOUCHSCREEN=y</div><div class='add'>+CONFIG_TOUCHSCREEN_ADS7846=y</div><div class='add'>+# CONFIG_TOUCHSCREEN_FUJITSU is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_GUNZE is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_ELO is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MTOUCH is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MK712 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_PENMOUNT is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_UCB1400 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TSC2102 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TSC210X is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+CONFIG_HW_RANDOM=m</div><div class='add'>+CONFIG_HW_RANDOM_OMAP=m</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+# CONFIG_I2C_CHARDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALGOBIT is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+CONFIG_I2C_OMAP=y</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_ISP1301_OMAP is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='add'>+CONFIG_SENSORS_TLV320AIC23=y</div><div class='add'>+# CONFIG_GPIOEXPANDER_OMAP is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+# CONFIG_SPI_DEBUG is not set</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Master Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI_BITBANG=y</div><div class='add'>+CONFIG_SPI_OMAP_UWIRE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Protocol Masters</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_AT25 is not set</div><div class='add'>+# CONFIG_SPI_TSC2101 is not set</div><div class='add'>+# CONFIG_SPI_TSC2102 is not set</div><div class='add'>+# CONFIG_SPI_TSC210X is not set</div><div class='add'>+# CONFIG_SPI_TSC2301 is not set</div><div class='add'>+# CONFIG_SPI_SPIDEV is not set</div><div class='add'>+# CONFIG_SPI_TLE62X0 is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+CONFIG_OMAP_WATCHDOG=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_USBPCWATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=y</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=y</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='add'>+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+CONFIG_FB_DEFERRED_IO=y</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_UVESA is not set</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+CONFIG_FB_OMAP=y</div><div class='add'>+CONFIG_FB_OMAP_LCDC_EXTERNAL=y</div><div class='add'>+CONFIG_FB_OMAP_LCDC_HWA742=y</div><div class='add'>+# CONFIG_FB_OMAP_LCDC_BLIZZARD is not set</div><div class='add'>+CONFIG_FB_OMAP_MANUAL_UPDATE=y</div><div class='add'>+# CONFIG_FB_OMAP_LCD_MIPID is not set</div><div class='add'>+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set</div><div class='add'>+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2</div><div class='add'>+# CONFIG_FB_OMAP_DMA_TUNE is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE is not set</div><div class='add'>+# CONFIG_LOGO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+CONFIG_SOUND=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced Linux Sound Architecture</div><div class='add'>+#</div><div class='add'>+CONFIG_SND=y</div><div class='add'>+CONFIG_SND_TIMER=y</div><div class='add'>+CONFIG_SND_PCM=y</div><div class='add'>+CONFIG_SND_HWDEP=y</div><div class='add'>+CONFIG_SND_RAWMIDI=y</div><div class='add'>+# CONFIG_SND_SEQUENCER is not set</div><div class='add'>+# CONFIG_SND_MIXER_OSS is not set</div><div class='add'>+# CONFIG_SND_PCM_OSS is not set</div><div class='add'>+# CONFIG_SND_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_SND_SUPPORT_OLD_API is not set</div><div class='add'>+CONFIG_SND_VERBOSE_PROCFS=y</div><div class='add'>+# CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='add'>+# CONFIG_SND_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic devices</div><div class='add'>+#</div><div class='add'>+CONFIG_SND_DUMMY=y</div><div class='add'>+# CONFIG_SND_MTPAV is not set</div><div class='add'>+# CONFIG_SND_SERIAL_U16550 is not set</div><div class='add'>+# CONFIG_SND_MPU401 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ALSA ARM devices</div><div class='add'>+#</div><div class='add'>+CONFIG_SND_OMAP_AIC23=y</div><div class='add'>+# CONFIG_SND_OMAP_TSC2101 is not set</div><div class='add'>+# CONFIG_SND_SX1 is not set</div><div class='add'>+# CONFIG_SND_OMAP_TSC2102 is not set</div><div class='add'>+# CONFIG_SND_OMAP24XX_EAC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB devices</div><div class='add'>+#</div><div class='add'>+CONFIG_SND_USB_AUDIO=y</div><div class='add'>+# CONFIG_SND_USB_CAIAQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System on Chip audio support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SND_SOC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SoC Audio support for SuperH</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Open Sound System</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND_PRIME is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+CONFIG_HID_DEBUG=y</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+CONFIG_USB_DEVICE_CLASS=y</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+CONFIG_USB_SUSPEND=y</div><div class='add'>+# CONFIG_USB_PERSIST is not set</div><div class='add'>+CONFIG_USB_OTG=y</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='add'>+# CONFIG_USB_GADGET_MUSB_HDRC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ISD200 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+# CONFIG_USB_MON is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Serial Converter support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_SERIAL=y</div><div class='add'>+CONFIG_USB_SERIAL_CONSOLE=y</div><div class='add'>+# CONFIG_USB_SERIAL_GENERIC is not set</div><div class='add'>+# CONFIG_USB_SERIAL_AIRCABLE is not set</div><div class='add'>+# CONFIG_USB_SERIAL_AIRPRIME is not set</div><div class='add'>+# CONFIG_USB_SERIAL_ARK3116 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_BELKIN is not set</div><div class='add'>+# CONFIG_USB_SERIAL_CH341 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_WHITEHEAT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_CP2101 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_EMPEG is not set</div><div class='add'>+# CONFIG_USB_SERIAL_FTDI_SIO is not set</div><div class='add'>+# CONFIG_USB_SERIAL_FUNSOFT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_VISOR is not set</div><div class='add'>+# CONFIG_USB_SERIAL_IPAQ is not set</div><div class='add'>+# CONFIG_USB_SERIAL_IR is not set</div><div class='add'>+# CONFIG_USB_SERIAL_EDGEPORT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set</div><div class='add'>+# CONFIG_USB_SERIAL_GARMIN is not set</div><div class='add'>+# CONFIG_USB_SERIAL_IPW is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KLSI is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KOBIL_SCT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_MCT_U232 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_MOS7720 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_MOS7840 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_NAVMAN is not set</div><div class='add'>+CONFIG_USB_SERIAL_PL2303=y</div><div class='add'>+# CONFIG_USB_SERIAL_OTI6858 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_HP4X is not set</div><div class='add'>+# CONFIG_USB_SERIAL_SAFE is not set</div><div class='add'>+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set</div><div class='add'>+# CONFIG_USB_SERIAL_TI is not set</div><div class='add'>+# CONFIG_USB_SERIAL_CYBERJACK is not set</div><div class='add'>+# CONFIG_USB_SERIAL_XIRCOM is not set</div><div class='add'>+# CONFIG_USB_SERIAL_OPTION is not set</div><div class='add'>+# CONFIG_USB_SERIAL_OMNINET is not set</div><div class='add'>+# CONFIG_USB_SERIAL_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB DSL modem support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_GADGET=y</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG is not set</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG_FILES is not set</div><div class='add'>+CONFIG_USB_GADGET_SELECTED=y</div><div class='add'>+# CONFIG_USB_GADGET_AMD5536UDC is not set</div><div class='add'>+# CONFIG_USB_GADGET_ATMEL_USBA is not set</div><div class='add'>+# CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='add'>+# CONFIG_USB_GADGET_NET2280 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_M66592 is not set</div><div class='add'>+# CONFIG_USB_GADGET_GOKU is not set</div><div class='add'>+# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='add'>+CONFIG_USB_GADGET_OMAP=y</div><div class='add'>+CONFIG_USB_OMAP=y</div><div class='add'>+# CONFIG_USB_GADGET_S3C2410 is not set</div><div class='add'>+# CONFIG_USB_GADGET_AT91 is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUMMY_HCD is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUALSPEED is not set</div><div class='add'>+# CONFIG_USB_ZERO is not set</div><div class='add'>+CONFIG_USB_ETH=m</div><div class='add'>+CONFIG_USB_ETH_RNDIS=y</div><div class='add'>+# CONFIG_USB_GADGETFS is not set</div><div class='add'>+CONFIG_USB_FILE_STORAGE=m</div><div class='add'>+CONFIG_USB_FILE_STORAGE_TEST=y</div><div class='add'>+# CONFIG_USB_G_SERIAL is not set</div><div class='add'>+# CONFIG_USB_MIDI_GADGET is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+# CONFIG_SDIO_UART is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_OMAP=y</div><div class='add'>+# CONFIG_MMC_SPI is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+CONFIG_CBUS=y</div><div class='add'>+CONFIG_CBUS_TAHVO=y</div><div class='add'>+CONFIG_CBUS_TAHVO_USER=y</div><div class='add'>+CONFIG_CBUS_TAHVO_USB=y</div><div class='add'>+# CONFIG_CBUS_TAHVO_USB_HOST_BY_DEFAULT is not set</div><div class='add'>+CONFIG_CBUS_RETU=y</div><div class='add'>+CONFIG_CBUS_RETU_USER=y</div><div class='add'>+CONFIG_CBUS_RETU_POWERBUTTON=y</div><div class='add'>+CONFIG_CBUS_RETU_RTC=y</div><div class='add'>+CONFIG_CBUS_RETU_WDT=y</div><div class='add'>+# CONFIG_CBUS_RETU_HEADSET is not set</div><div class='add'>+CONFIG_OMAP_DSP=y</div><div class='add'>+# CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set</div><div class='add'>+CONFIG_OMAP_DSP_FBEXPORT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_INOTIFY is not set</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set</div><div class='add'>+CONFIG_JFFS2_SUMMARY=y</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+CONFIG_JFFS2_COMPRESSION_OPTIONS=y</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+# CONFIG_JFFS2_LZO is not set</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+# CONFIG_JFFS2_CMODE_NONE is not set</div><div class='add'>+CONFIG_JFFS2_CMODE_PRIORITY=y</div><div class='add'>+# CONFIG_JFFS2_CMODE_SIZE is not set</div><div class='add'>+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+# CONFIG_ROOT_NFS is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_SUNRPC_BIND34 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+CONFIG_NLS_CODEPAGE_852=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+CONFIG_NLS_ISO8859_1=y</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+CONFIG_NLS_ISO8859_15=y</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+CONFIG_NLS_UTF8=y</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+CONFIG_INSTRUMENTATION=y</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+# CONFIG_DEBUG_SG is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+CONFIG_DEBUG_ERRORS=y</div><div class='add'>+# CONFIG_DEBUG_LL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+CONFIG_SECURITY=y</div><div class='add'>+# CONFIG_SECURITY_NETWORK is not set</div><div class='add'>+# CONFIG_SECURITY_CAPABILITIES is not set</div><div class='add'>+# CONFIG_SECURITY_ROOTPLUG is not set</div><div class='add'>+# CONFIG_SECURITY_LOWMEM is not set</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/omap_2430sdp_defconfig b/arch/arm/configs/omap_2430sdp_defconfig<br/>new file mode 100644<br/>index 000000000000..b0617c0da2a1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/omap_2430sdp_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_2430sdp_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1304 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.23-rc6-omap1</div><div class='add'>+# Tue Sep 18 11:47:37 2007</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+# CONFIG_SYSCTL_SYSCALL is not set</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+CONFIG_MODVERSIONS=y</div><div class='add'>+CONFIG_MODULE_SRCVERSION_ALL=y</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_OMAP1 is not set</div><div class='add'>+CONFIG_ARCH_OMAP2=y</div><div class='add'>+# CONFIG_ARCH_OMAP3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+CONFIG_OMAP_BOOT_TAG=y</div><div class='add'>+# CONFIG_OMAP_BOOT_REASON is not set</div><div class='add'>+# CONFIG_OMAP_COMPONENT_VERSION is not set</div><div class='add'>+# CONFIG_OMAP_GPIO_SWITCH is not set</div><div class='add'>+CONFIG_OMAP_MUX=y</div><div class='add'>+# CONFIG_OMAP_MUX_DEBUG is not set</div><div class='add'>+# CONFIG_OMAP_MUX_WARNINGS is not set</div><div class='add'>+# CONFIG_OMAP_STI is not set</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+# CONFIG_OMAP_MMU_FWK is not set</div><div class='add'>+# CONFIG_OMAP_MBOX_FWK is not set</div><div class='add'>+CONFIG_OMAP_MPU_TIMER=y</div><div class='add'>+# CONFIG_OMAP_32K_TIMER is not set</div><div class='add'>+CONFIG_OMAP_DM_TIMER=y</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART1=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART3 is not set</div><div class='add'>+CONFIG_OMAP_SERIAL_WAKE=y</div><div class='add'>+# CONFIG_OMAP_DSP is not set</div><div class='add'>+# CONFIG_MACH_OMAP_GENERIC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Core Type</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP24XX=y</div><div class='add'>+# CONFIG_ARCH_OMAP2420 is not set</div><div class='add'>+CONFIG_ARCH_OMAP2430=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_MACH_NOKIA_N800 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_H4 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_APOLLON is not set</div><div class='add'>+# CONFIG_MACH_OMAP_APOLLON_PLUS is not set</div><div class='add'>+CONFIG_MACH_OMAP_2430SDP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_V6=y</div><div class='add'>+# CONFIG_CPU_32v6K is not set</div><div class='add'>+CONFIG_CPU_32v6=y</div><div class='add'>+CONFIG_CPU_ABRT_EV6=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_V6=y</div><div class='add'>+CONFIG_CPU_CACHE_VIPT=y</div><div class='add'>+CONFIG_CPU_COPY_V6=y</div><div class='add'>+CONFIG_CPU_TLB_V6=y</div><div class='add'>+CONFIG_CPU_HAS_ASID=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_BPREDICT_DISABLE is not set</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+CONFIG_AEABI=y</div><div class='add'>+CONFIG_OABI_COMPAT=y</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="root=/dev/ram0 rw console=ttyS0,115200n8 initrd=0x80600000,8M ramdisk_size=8192"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+# CONFIG_VFP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+CONFIG_BINFMT_MISC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+# CONFIG_PM_LEGACY is not set</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND_UP_POSSIBLE=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+# CONFIG_APM_EMULATION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+CONFIG_NET_KEY=y</div><div class='add'>+# CONFIG_NET_KEY_MIGRATE is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+# CONFIG_IP_PNP_BOOTP is not set</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+CONFIG_MTD_CONCAT=y</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+# CONFIG_MTD_CFI_ADV_OPTIONS is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+CONFIG_MTD_CFI_INTELEXT=y</div><div class='add'>+# CONFIG_MTD_CFI_AMDSTD is not set</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PHYSMAP is not set</div><div class='add'>+# CONFIG_MTD_ARM_INTEGRATOR is not set</div><div class='add'>+CONFIG_MTD_OMAP_NOR=y</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DATAFLASH is not set</div><div class='add'>+# CONFIG_MTD_M25P80 is not set</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+CONFIG_MTD_ONENAND=y</div><div class='add'>+CONFIG_MTD_ONENAND_VERIFY_WRITE=y</div><div class='add'>+# CONFIG_MTD_ONENAND_GENERIC is not set</div><div class='add'>+CONFIG_MTD_ONENAND_OMAP2=y</div><div class='add'>+# CONFIG_MTD_ONENAND_OTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=16384</div><div class='add'>+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=m</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=m</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+CONFIG_CHR_DEV_SG=m</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='add'>+CONFIG_SMC91X=y</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+# CONFIG_USB_USBNET_MII is not set</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+# CONFIG_KEYBOARD_ATKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+# CONFIG_KEYBOARD_OMAP is not set</div><div class='add'>+CONFIG_KEYBOARD_TWL4030=y</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+CONFIG_INPUT_TOUCHSCREEN=y</div><div class='add'>+CONFIG_TOUCHSCREEN_ADS7846=y</div><div class='add'>+# CONFIG_TOUCHSCREEN_FUJITSU is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_GUNZE is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_ELO is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MTOUCH is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MK712 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_PENMOUNT is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_UCB1400 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TSC2102 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TSC210X is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=32</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_EXTENDED=y</div><div class='add'>+CONFIG_SERIAL_8250_MANY_PORTS=y</div><div class='add'>+CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_DETECT_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_RSA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+CONFIG_OMAP_WATCHDOG=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_USBPCWATCHDOG is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+CONFIG_HW_RANDOM_OMAP=y</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALGOBIT is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+CONFIG_I2C_OMAP=y</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='add'>+# CONFIG_SENSORS_TLV320AIC23 is not set</div><div class='add'>+# CONFIG_GPIOEXPANDER_OMAP is not set</div><div class='add'>+CONFIG_TWL4030_CORE=y</div><div class='add'>+CONFIG_TWL4030_GPIO=y</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_MENELAUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+# CONFIG_SPI_DEBUG is not set</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Master Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_BITBANG is not set</div><div class='add'>+# CONFIG_SPI_OMAP24XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Protocol Masters</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_AT25 is not set</div><div class='add'>+# CONFIG_SPI_TSC2101 is not set</div><div class='add'>+# CONFIG_SPI_TSC2102 is not set</div><div class='add'>+# CONFIG_SPI_TSC210X is not set</div><div class='add'>+# CONFIG_SPI_TSC2301 is not set</div><div class='add'>+# CONFIG_SPI_SPIDEV is not set</div><div class='add'>+# CONFIG_SPI_TLE62X0 is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+CONFIG_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+# CONFIG_FB_CFB_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_CFB_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+CONFIG_FB_DEFERRED_IO=y</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+CONFIG_FB_OMAP=y</div><div class='add'>+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set</div><div class='add'>+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set</div><div class='add'>+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+# CONFIG_FONTS is not set</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+# CONFIG_LOGO_LINUX_MONO is not set</div><div class='add'>+# CONFIG_LOGO_LINUX_VGA16 is not set</div><div class='add'>+CONFIG_LOGO_LINUX_CLUT224=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=m</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB HID Boot Protocol drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_KBD is not set</div><div class='add'>+# CONFIG_USB_MOUSE is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=m</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_DEVICEFS is not set</div><div class='add'>+# CONFIG_USB_DEVICE_CLASS is not set</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+CONFIG_USB_SUSPEND=y</div><div class='add'>+# CONFIG_USB_PERSIST is not set</div><div class='add'>+CONFIG_USB_OTG=y</div><div class='add'>+CONFIG_USB_OTG_WHITELIST=y</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_OHCI_HCD is not set</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+CONFIG_USB_MUSB_HDRC=m</div><div class='add'>+CONFIG_USB_MUSB_SOC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP 243x high speed USB support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MUSB_HOST is not set</div><div class='add'>+# CONFIG_USB_MUSB_PERIPHERAL is not set</div><div class='add'>+CONFIG_USB_MUSB_OTG=y</div><div class='add'>+CONFIG_USB_GADGET_MUSB_HDRC=y</div><div class='add'>+CONFIG_USB_MUSB_HDRC_HCD=y</div><div class='add'>+# CONFIG_MUSB_PIO_ONLY is not set</div><div class='add'>+CONFIG_USB_INVENTRA_DMA=y</div><div class='add'>+# CONFIG_USB_TI_CPPI_DMA is not set</div><div class='add'>+CONFIG_USB_MUSB_LOGLEVEL=0</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=m</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Serial Converter support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB DSL modem support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_GADGET=m</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG is not set</div><div class='add'>+CONFIG_USB_GADGET_DEBUG_FILES=y</div><div class='add'>+CONFIG_USB_GADGET_SELECTED=y</div><div class='add'>+# CONFIG_USB_GADGET_AMD5536UDC is not set</div><div class='add'>+# CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='add'>+# CONFIG_USB_GADGET_NET2280 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_M66592 is not set</div><div class='add'>+# CONFIG_USB_GADGET_GOKU is not set</div><div class='add'>+# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='add'>+# CONFIG_USB_GADGET_OMAP is not set</div><div class='add'>+# CONFIG_USB_GADGET_S3C2410 is not set</div><div class='add'>+# CONFIG_USB_GADGET_AT91 is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUMMY_HCD is not set</div><div class='add'>+CONFIG_USB_GADGET_DUALSPEED=y</div><div class='add'>+CONFIG_USB_ZERO=m</div><div class='add'>+# CONFIG_USB_ZERO_HNPTEST is not set</div><div class='add'>+CONFIG_USB_ETH=m</div><div class='add'>+CONFIG_USB_ETH_RNDIS=y</div><div class='add'>+CONFIG_USB_GADGETFS=m</div><div class='add'>+CONFIG_USB_FILE_STORAGE=m</div><div class='add'>+# CONFIG_USB_FILE_STORAGE_TEST is not set</div><div class='add'>+CONFIG_USB_G_SERIAL=m</div><div class='add'>+# CONFIG_USB_MIDI_GADGET is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_OMAP_HS=y</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+# CONFIG_EXT3_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+CONFIG_QUOTA=y</div><div class='add'>+# CONFIG_QFMT_V1 is not set</div><div class='add'>+CONFIG_QFMT_V2=y</div><div class='add'>+CONFIG_QUOTACTL=y</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+CONFIG_JFFS2_COMPRESSION_OPTIONS=y</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+# CONFIG_JFFS2_CMODE_NONE is not set</div><div class='add'>+CONFIG_JFFS2_CMODE_PRIORITY=y</div><div class='add'>+# CONFIG_JFFS2_CMODE_SIZE is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_SUNRPC_BIND34 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_1 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Distributed Lock Manager</div><div class='add'>+#</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+CONFIG_TIMER_STATS=y</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+CONFIG_DEBUG_PREEMPT=y</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+# CONFIG_DEBUG_ERRORS is not set</div><div class='add'>+# CONFIG_DEBUG_LL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_BLKCIPHER=y</div><div class='add'>+CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=m</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+CONFIG_CRYPTO_PCBC=m</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+CONFIG_LIBCRC32C=y</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/omap_apollon_2420_defconfig b/arch/arm/configs/omap_apollon_2420_defconfig<br/>new file mode 100644<br/>index 000000000000..bb39dfc72d69<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/omap_apollon_2420_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_apollon_2420_defconfig</a></div><div class='hunk'>@@ -0,0 +1,962 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.23-rc6-omap1</div><div class='add'>+# Tue Sep 18 12:07:29 2007</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+# CONFIG_LOCALVERSION_AUTO is not set</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_BLK_DEV_INITRD is not set</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+CONFIG_DEFAULT_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP_OTG=y</div><div class='add'>+# CONFIG_ARCH_OMAP1 is not set</div><div class='add'>+CONFIG_ARCH_OMAP2=y</div><div class='add'>+# CONFIG_ARCH_OMAP3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+# CONFIG_OMAP_BOOT_TAG is not set</div><div class='add'>+# CONFIG_OMAP_GPIO_SWITCH is not set</div><div class='add'>+CONFIG_OMAP_MUX=y</div><div class='add'>+# CONFIG_OMAP_MUX_DEBUG is not set</div><div class='add'>+CONFIG_OMAP_MUX_WARNINGS=y</div><div class='add'>+# CONFIG_OMAP_STI is not set</div><div class='add'>+# CONFIG_OMAP_MCBSP is not set</div><div class='add'>+# CONFIG_OMAP_MMU_FWK is not set</div><div class='add'>+# CONFIG_OMAP_MBOX_FWK is not set</div><div class='add'>+# CONFIG_OMAP_MPU_TIMER is not set</div><div class='add'>+CONFIG_OMAP_32K_TIMER=y</div><div class='add'>+CONFIG_OMAP_32K_TIMER_HZ=128</div><div class='add'>+CONFIG_OMAP_DM_TIMER=y</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART1=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART3 is not set</div><div class='add'>+CONFIG_OMAP_SERIAL_WAKE=y</div><div class='add'>+# CONFIG_OMAP_DSP is not set</div><div class='add'>+# CONFIG_MACH_OMAP_GENERIC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Core Type</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP24XX=y</div><div class='add'>+CONFIG_ARCH_OMAP2420=y</div><div class='add'>+# CONFIG_ARCH_OMAP2430 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_MACH_NOKIA_N800 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_H4 is not set</div><div class='add'>+CONFIG_MACH_OMAP_APOLLON=y</div><div class='add'>+# CONFIG_MACH_OMAP_APOLLON_PLUS is not set</div><div class='add'>+# CONFIG_MACH_OMAP_2430SDP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_V6=y</div><div class='add'>+# CONFIG_CPU_32v6K is not set</div><div class='add'>+CONFIG_CPU_32v6=y</div><div class='add'>+CONFIG_CPU_ABRT_EV6=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_V6=y</div><div class='add'>+CONFIG_CPU_CACHE_VIPT=y</div><div class='add'>+CONFIG_CPU_COPY_V6=y</div><div class='add'>+CONFIG_CPU_TLB_V6=y</div><div class='add'>+CONFIG_CPU_HAS_ASID=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARM_THUMB is not set</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_BPREDICT_DISABLE is not set</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+CONFIG_HZ=128</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="root=/dev/ram0 rw mem=128M console=ttyS0,115200n8 initrd=0x80600000,8M ramdisk_size=8192"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+# CONFIG_FPE_NWFPE is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+CONFIG_VFP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+CONFIG_SUSPEND_UP_POSSIBLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+CONFIG_MTD_CONCAT=y</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_CFI is not set</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DATAFLASH is not set</div><div class='add'>+# CONFIG_MTD_M25P80 is not set</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+CONFIG_MTD_ONENAND=y</div><div class='add'>+# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set</div><div class='add'>+CONFIG_MTD_ONENAND_GENERIC=y</div><div class='add'>+# CONFIG_MTD_ONENAND_OMAP2 is not set</div><div class='add'>+# CONFIG_MTD_ONENAND_OTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_RAM is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_DMA is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='add'>+CONFIG_SMC91X=y</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=32</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_EXTENDED=y</div><div class='add'>+CONFIG_SERIAL_8250_MANY_PORTS=y</div><div class='add'>+CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_DETECT_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_RSA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+# CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+CONFIG_OMAP_WATCHDOG=y</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+CONFIG_HW_RANDOM_OMAP=y</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+# CONFIG_SPI_DEBUG is not set</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Master Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_BITBANG is not set</div><div class='add'>+CONFIG_SPI_OMAP24XX=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Protocol Masters</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_AT25 is not set</div><div class='add'>+# CONFIG_SPI_TSC2101 is not set</div><div class='add'>+# CONFIG_SPI_TSC2102 is not set</div><div class='add'>+# CONFIG_SPI_TSC210X is not set</div><div class='add'>+# CONFIG_SPI_TSC2301 is not set</div><div class='add'>+# CONFIG_SPI_SPIDEV is not set</div><div class='add'>+# CONFIG_SPI_TLE62X0 is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+CONFIG_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+# CONFIG_FB_CFB_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_CFB_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+CONFIG_FB_DEFERRED_IO=y</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+CONFIG_FB_OMAP=y</div><div class='add'>+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set</div><div class='add'>+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set</div><div class='add'>+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+CONFIG_FONTS=y</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='add'>+# CONFIG_FONT_6x11 is not set</div><div class='add'>+# CONFIG_FONT_7x14 is not set</div><div class='add'>+# CONFIG_FONT_PEARL_8x8 is not set</div><div class='add'>+# CONFIG_FONT_ACORN_8x8 is not set</div><div class='add'>+# CONFIG_FONT_MINI_4x6 is not set</div><div class='add'>+# CONFIG_FONT_SUN8x16 is not set</div><div class='add'>+# CONFIG_FONT_SUN12x22 is not set</div><div class='add'>+# CONFIG_FONT_10x18 is not set</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+# CONFIG_LOGO_LINUX_MONO is not set</div><div class='add'>+# CONFIG_LOGO_LINUX_VGA16 is not set</div><div class='add'>+CONFIG_LOGO_LINUX_CLUT224=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+# CONFIG_HID is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='add'>+# CONFIG_USB_GADGET_MUSB_HDRC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_GADGET=y</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG is not set</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG_FILES is not set</div><div class='add'>+CONFIG_USB_GADGET_SELECTED=y</div><div class='add'>+# CONFIG_USB_GADGET_AMD5536UDC is not set</div><div class='add'>+# CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='add'>+# CONFIG_USB_GADGET_NET2280 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_M66592 is not set</div><div class='add'>+# CONFIG_USB_GADGET_GOKU is not set</div><div class='add'>+# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='add'>+CONFIG_USB_GADGET_OMAP=y</div><div class='add'>+CONFIG_USB_OMAP=y</div><div class='add'>+# CONFIG_USB_GADGET_S3C2410 is not set</div><div class='add'>+# CONFIG_USB_GADGET_AT91 is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUMMY_HCD is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUALSPEED is not set</div><div class='add'>+# CONFIG_USB_ZERO is not set</div><div class='add'>+CONFIG_USB_ETH=m</div><div class='add'>+CONFIG_USB_ETH_RNDIS=y</div><div class='add'>+# CONFIG_USB_GADGETFS is not set</div><div class='add'>+CONFIG_USB_FILE_STORAGE=m</div><div class='add'>+# CONFIG_USB_FILE_STORAGE_TEST is not set</div><div class='add'>+# CONFIG_USB_G_SERIAL is not set</div><div class='add'>+# CONFIG_USB_MIDI_GADGET is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_OMAP=y</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_INOTIFY is not set</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+CONFIG_AUTOFS4_FS=y</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_SUNRPC_BIND34 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NLS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Distributed Lock Manager</div><div class='add'>+#</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+CONFIG_DEBUG_PREEMPT=y</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+CONFIG_DEBUG_SPINLOCK=y</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+CONFIG_DEBUG_SPINLOCK_SLEEP=y</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+# CONFIG_DEBUG_ERRORS is not set</div><div class='add'>+# CONFIG_DEBUG_LL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+CONFIG_LIBCRC32C=y</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/omap_generic_1510_defconfig b/arch/arm/configs/omap_generic_1510_defconfig<br/>new file mode 100644<br/>index 000000000000..4b1c252f2091<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/omap_generic_1510_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_generic_1510_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1172 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.23-rc6-omap1</div><div class='add'>+# Tue Sep 18 12:20:19 2007</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+CONFIG_DEFAULT_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP1=y</div><div class='add'>+# CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+# CONFIG_ARCH_OMAP3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+# CONFIG_OMAP_BOOT_TAG is not set</div><div class='add'>+# CONFIG_OMAP_GPIO_SWITCH is not set</div><div class='add'>+CONFIG_OMAP_MUX=y</div><div class='add'>+# CONFIG_OMAP_MUX_DEBUG is not set</div><div class='add'>+CONFIG_OMAP_MUX_WARNINGS=y</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+# CONFIG_OMAP_MMU_FWK is not set</div><div class='add'>+# CONFIG_OMAP_MBOX_FWK is not set</div><div class='add'>+CONFIG_OMAP_MPU_TIMER=y</div><div class='add'>+# CONFIG_OMAP_32K_TIMER is not set</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART1=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART3 is not set</div><div class='add'>+CONFIG_OMAP_SERIAL_WAKE=y</div><div class='add'>+# CONFIG_OMAP_DSP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Core Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_OMAP730 is not set</div><div class='add'>+CONFIG_ARCH_OMAP15XX=y</div><div class='add'>+# CONFIG_ARCH_OMAP16XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_MACH_OMAP_INNOVATOR is not set</div><div class='add'>+# CONFIG_MACH_VOICEBLUE is not set</div><div class='add'>+# CONFIG_MACH_OMAP_PALMTE is not set</div><div class='add'>+# CONFIG_MACH_OMAP_PALMZ71 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_PALMTT is not set</div><div class='add'>+# CONFIG_MACH_SX1 is not set</div><div class='add'>+# CONFIG_MACH_AMS_DELTA is not set</div><div class='add'>+CONFIG_MACH_OMAP_GENERIC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP CPU Speed</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set</div><div class='add'>+CONFIG_OMAP_ARM_168MHZ=y</div><div class='add'>+# CONFIG_OMAP_ARM_150MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_120MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_60MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_30MHZ is not set</div><div class='add'>+# CONFIG_MACH_OMAP_APOLLON_PLUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM925T=y</div><div class='add'>+CONFIG_CPU_32v4T=y</div><div class='add'>+CONFIG_CPU_ABRT_EV4T=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_V4WT=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARM_THUMB is not set</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+CONFIG_CPU_DCACHE_WRITETHROUGH=y</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="mem=64M console=ttyS2,115200 root=0803 ro init=/bin/sh"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+# CONFIG_PM_LEGACY is not set</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND_UP_POSSIBLE=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+# CONFIG_APM_EMULATION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='add'>+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+CONFIG_BLK_DEV_SR=y</div><div class='add'>+# CONFIG_BLK_DEV_SR_VENDOR is not set</div><div class='add'>+CONFIG_CHR_DEV_SG=y</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+CONFIG_SCSI_MULTI_LUN=y</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+CONFIG_USB_RTL8150=y</div><div class='add'>+CONFIG_USB_USBNET_MII=y</div><div class='add'>+CONFIG_USB_USBNET=y</div><div class='add'>+CONFIG_USB_NET_AX8817X=y</div><div class='add'>+CONFIG_USB_NET_CDCETHER=y</div><div class='add'>+# CONFIG_USB_NET_DM9601 is not set</div><div class='add'>+# CONFIG_USB_NET_GL620A is not set</div><div class='add'>+CONFIG_USB_NET_NET1080=y</div><div class='add'>+# CONFIG_USB_NET_PLUSB is not set</div><div class='add'>+# CONFIG_USB_NET_MCS7830 is not set</div><div class='add'>+# CONFIG_USB_NET_RNDIS_HOST is not set</div><div class='add'>+CONFIG_USB_NET_CDC_SUBSET=y</div><div class='add'>+# CONFIG_USB_ALI_M5632 is not set</div><div class='add'>+CONFIG_USB_AN2720=y</div><div class='add'>+CONFIG_USB_BELKIN=y</div><div class='add'>+CONFIG_USB_ARMLINUX=y</div><div class='add'>+CONFIG_USB_EPSON2888=y</div><div class='add'>+# CONFIG_USB_KC2190 is not set</div><div class='add'>+CONFIG_USB_NET_ZAURUS=y</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+CONFIG_PPP=y</div><div class='add'>+CONFIG_PPP_MULTILINK=y</div><div class='add'>+# CONFIG_PPP_FILTER is not set</div><div class='add'>+# CONFIG_PPP_ASYNC is not set</div><div class='add'>+# CONFIG_PPP_SYNC_TTY is not set</div><div class='add'>+# CONFIG_PPP_DEFLATE is not set</div><div class='add'>+# CONFIG_PPP_BSDCOMP is not set</div><div class='add'>+# CONFIG_PPP_MPPE is not set</div><div class='add'>+# CONFIG_PPPOE is not set</div><div class='add'>+# CONFIG_PPPOL2TP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+CONFIG_SLHC=y</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+CONFIG_KEYBOARD_ATKBD=y</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_OMAP=y</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+CONFIG_SERIO_LIBPS2=y</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+CONFIG_HW_RANDOM=m</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_ALGOBIT=y</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_OMAP is not set</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU3 is not set</div><div class='add'>+# CONFIG_SENSORS_AD7418 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1021 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1025 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1026 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1029 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1031 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM9240 is not set</div><div class='add'>+# CONFIG_SENSORS_ASB100 is not set</div><div class='add'>+# CONFIG_SENSORS_ATXP1 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_FSCHER is not set</div><div class='add'>+# CONFIG_SENSORS_FSCPOS is not set</div><div class='add'>+# CONFIG_SENSORS_GL518SM is not set</div><div class='add'>+# CONFIG_SENSORS_GL520SM is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM63 is not set</div><div class='add'>+# CONFIG_SENSORS_LM75 is not set</div><div class='add'>+# CONFIG_SENSORS_LM77 is not set</div><div class='add'>+# CONFIG_SENSORS_LM78 is not set</div><div class='add'>+# CONFIG_SENSORS_LM80 is not set</div><div class='add'>+# CONFIG_SENSORS_LM83 is not set</div><div class='add'>+# CONFIG_SENSORS_LM85 is not set</div><div class='add'>+# CONFIG_SENSORS_LM87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM90 is not set</div><div class='add'>+# CONFIG_SENSORS_LM92 is not set</div><div class='add'>+# CONFIG_SENSORS_LM93 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX1619 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6650 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_DME1737 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_THMC50 is not set</div><div class='add'>+# CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='add'>+# CONFIG_SENSORS_W83792D is not set</div><div class='add'>+# CONFIG_SENSORS_W83793 is not set</div><div class='add'>+# CONFIG_SENSORS_W83L785TS is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+CONFIG_USB_DEBUG=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+# CONFIG_USB_DEVICE_CLASS is not set</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_SUSPEND is not set</div><div class='add'>+# CONFIG_USB_PERSIST is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+CONFIG_USB_STORAGE_DATAFAB=y</div><div class='add'>+CONFIG_USB_STORAGE_FREECOM=y</div><div class='add'>+CONFIG_USB_STORAGE_DPCM=y</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+CONFIG_USB_STORAGE_SDDR09=y</div><div class='add'>+CONFIG_USB_STORAGE_SDDR55=y</div><div class='add'>+CONFIG_USB_STORAGE_JUMPSHOT=y</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Serial Converter support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB DSL modem support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_OMAP=y</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M41T80 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_DRV_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_AUTOFS_FS=y</div><div class='add'>+CONFIG_AUTOFS4_FS=y</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_ISO9660_FS=y</div><div class='add'>+CONFIG_JOLIET=y</div><div class='add'>+# CONFIG_ZISOFS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=m</div><div class='add'>+CONFIG_MSDOS_FS=m</div><div class='add'>+CONFIG_VFAT_FS=m</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+# CONFIG_TMPFS is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+# CONFIG_NFS_V3 is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+# CONFIG_ROOT_NFS is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_SUNRPC_BIND34 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+# CONFIG_NLS_CODEPAGE_437 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_1 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Distributed Lock Manager</div><div class='add'>+#</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+CONFIG_DEBUG_PREEMPT=y</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+# CONFIG_DEBUG_ERRORS is not set</div><div class='add'>+# CONFIG_DEBUG_LL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/omap_generic_1610_defconfig b/arch/arm/configs/omap_generic_1610_defconfig<br/>new file mode 100644<br/>index 000000000000..fc66f019d56c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/omap_generic_1610_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_generic_1610_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1178 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.23-rc6-omap1</div><div class='add'>+# Tue Sep 18 13:01:27 2007</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+CONFIG_DEFAULT_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP_OTG=y</div><div class='add'>+CONFIG_ARCH_OMAP1=y</div><div class='add'>+# CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+# CONFIG_ARCH_OMAP3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+# CONFIG_OMAP_BOOT_TAG is not set</div><div class='add'>+# CONFIG_OMAP_GPIO_SWITCH is not set</div><div class='add'>+CONFIG_OMAP_MUX=y</div><div class='add'>+# CONFIG_OMAP_MUX_DEBUG is not set</div><div class='add'>+CONFIG_OMAP_MUX_WARNINGS=y</div><div class='add'>+# CONFIG_OMAP_STI is not set</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+# CONFIG_OMAP_MMU_FWK is not set</div><div class='add'>+# CONFIG_OMAP_MBOX_FWK is not set</div><div class='add'>+CONFIG_OMAP_MPU_TIMER=y</div><div class='add'>+# CONFIG_OMAP_32K_TIMER is not set</div><div class='add'>+# CONFIG_OMAP_DM_TIMER is not set</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART1=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART3 is not set</div><div class='add'>+CONFIG_OMAP_SERIAL_WAKE=y</div><div class='add'>+# CONFIG_OMAP_DSP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Core Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_OMAP730 is not set</div><div class='add'>+# CONFIG_ARCH_OMAP15XX is not set</div><div class='add'>+CONFIG_ARCH_OMAP16XX=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_MACH_OMAP_INNOVATOR is not set</div><div class='add'>+# CONFIG_MACH_OMAP_H2 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_H3 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_OSK is not set</div><div class='add'>+# CONFIG_MACH_NOKIA770 is not set</div><div class='add'>+CONFIG_MACH_OMAP_GENERIC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP CPU Speed</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set</div><div class='add'>+# CONFIG_OMAP_ARM_216MHZ is not set</div><div class='add'>+CONFIG_OMAP_ARM_192MHZ=y</div><div class='add'>+# CONFIG_OMAP_ARM_168MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_120MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_60MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_30MHZ is not set</div><div class='add'>+# CONFIG_MACH_OMAP_APOLLON_PLUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM926T=y</div><div class='add'>+CONFIG_CPU_32v5=y</div><div class='add'>+CONFIG_CPU_ABRT_EV5TJ=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARM_THUMB is not set</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="mem=64M console=ttyS2,115200 root=0803 ro init=/bin/sh"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+# CONFIG_VFP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+# CONFIG_PM_LEGACY is not set</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND_UP_POSSIBLE=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+# CONFIG_APM_EMULATION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='add'>+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+CONFIG_BLK_DEV_SR=y</div><div class='add'>+# CONFIG_BLK_DEV_SR_VENDOR is not set</div><div class='add'>+CONFIG_CHR_DEV_SG=y</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+CONFIG_SCSI_MULTI_LUN=y</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+CONFIG_USB_RTL8150=y</div><div class='add'>+CONFIG_USB_USBNET_MII=y</div><div class='add'>+CONFIG_USB_USBNET=y</div><div class='add'>+CONFIG_USB_NET_AX8817X=y</div><div class='add'>+CONFIG_USB_NET_CDCETHER=y</div><div class='add'>+# CONFIG_USB_NET_DM9601 is not set</div><div class='add'>+# CONFIG_USB_NET_GL620A is not set</div><div class='add'>+CONFIG_USB_NET_NET1080=y</div><div class='add'>+# CONFIG_USB_NET_PLUSB is not set</div><div class='add'>+# CONFIG_USB_NET_MCS7830 is not set</div><div class='add'>+# CONFIG_USB_NET_RNDIS_HOST is not set</div><div class='add'>+CONFIG_USB_NET_CDC_SUBSET=y</div><div class='add'>+CONFIG_USB_ALI_M5632=y</div><div class='add'>+CONFIG_USB_AN2720=y</div><div class='add'>+CONFIG_USB_BELKIN=y</div><div class='add'>+CONFIG_USB_ARMLINUX=y</div><div class='add'>+CONFIG_USB_EPSON2888=y</div><div class='add'>+# CONFIG_USB_KC2190 is not set</div><div class='add'>+CONFIG_USB_NET_ZAURUS=y</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+CONFIG_PPP=y</div><div class='add'>+CONFIG_PPP_MULTILINK=y</div><div class='add'>+# CONFIG_PPP_FILTER is not set</div><div class='add'>+# CONFIG_PPP_ASYNC is not set</div><div class='add'>+# CONFIG_PPP_SYNC_TTY is not set</div><div class='add'>+# CONFIG_PPP_DEFLATE is not set</div><div class='add'>+# CONFIG_PPP_BSDCOMP is not set</div><div class='add'>+# CONFIG_PPP_MPPE is not set</div><div class='add'>+# CONFIG_PPPOE is not set</div><div class='add'>+# CONFIG_PPPOL2TP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+CONFIG_SLHC=y</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+CONFIG_KEYBOARD_ATKBD=y</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_OMAP=y</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+CONFIG_SERIO_LIBPS2=y</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+CONFIG_HW_RANDOM=m</div><div class='add'>+CONFIG_HW_RANDOM_OMAP=m</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_ALGOBIT=y</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_OMAP is not set</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_ISP1301_OMAP is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='add'>+# CONFIG_GPIOEXPANDER_OMAP is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU3 is not set</div><div class='add'>+# CONFIG_SENSORS_AD7418 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1021 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1025 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1026 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1029 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1031 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM9240 is not set</div><div class='add'>+# CONFIG_SENSORS_ASB100 is not set</div><div class='add'>+# CONFIG_SENSORS_ATXP1 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_FSCHER is not set</div><div class='add'>+# CONFIG_SENSORS_FSCPOS is not set</div><div class='add'>+# CONFIG_SENSORS_GL518SM is not set</div><div class='add'>+# CONFIG_SENSORS_GL520SM is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM63 is not set</div><div class='add'>+# CONFIG_SENSORS_LM75 is not set</div><div class='add'>+# CONFIG_SENSORS_LM77 is not set</div><div class='add'>+# CONFIG_SENSORS_LM78 is not set</div><div class='add'>+# CONFIG_SENSORS_LM80 is not set</div><div class='add'>+# CONFIG_SENSORS_LM83 is not set</div><div class='add'>+# CONFIG_SENSORS_LM85 is not set</div><div class='add'>+# CONFIG_SENSORS_LM87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM90 is not set</div><div class='add'>+# CONFIG_SENSORS_LM92 is not set</div><div class='add'>+# CONFIG_SENSORS_LM93 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX1619 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6650 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_DME1737 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_THMC50 is not set</div><div class='add'>+# CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='add'>+# CONFIG_SENSORS_W83792D is not set</div><div class='add'>+# CONFIG_SENSORS_W83793 is not set</div><div class='add'>+# CONFIG_SENSORS_W83L785TS is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+CONFIG_USB_DEBUG=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+# CONFIG_USB_DEVICE_CLASS is not set</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_SUSPEND is not set</div><div class='add'>+# CONFIG_USB_PERSIST is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+CONFIG_USB_STORAGE_DATAFAB=y</div><div class='add'>+CONFIG_USB_STORAGE_FREECOM=y</div><div class='add'>+CONFIG_USB_STORAGE_DPCM=y</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+CONFIG_USB_STORAGE_SDDR09=y</div><div class='add'>+CONFIG_USB_STORAGE_SDDR55=y</div><div class='add'>+CONFIG_USB_STORAGE_JUMPSHOT=y</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Serial Converter support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB DSL modem support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_OMAP=y</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M41T80 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_DRV_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_AUTOFS_FS=y</div><div class='add'>+CONFIG_AUTOFS4_FS=y</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_ISO9660_FS=y</div><div class='add'>+CONFIG_JOLIET=y</div><div class='add'>+# CONFIG_ZISOFS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=m</div><div class='add'>+CONFIG_MSDOS_FS=m</div><div class='add'>+CONFIG_VFAT_FS=m</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+# CONFIG_TMPFS is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+# CONFIG_NFS_V3 is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+# CONFIG_ROOT_NFS is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_SUNRPC_BIND34 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+# CONFIG_NLS_CODEPAGE_437 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_1 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Distributed Lock Manager</div><div class='add'>+#</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+CONFIG_DEBUG_PREEMPT=y</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+# CONFIG_DEBUG_ERRORS is not set</div><div class='add'>+# CONFIG_DEBUG_LL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/omap_generic_1710_defconfig b/arch/arm/configs/omap_generic_1710_defconfig<br/>new file mode 100644<br/>index 000000000000..0a00a708a4fc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/omap_generic_1710_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_generic_1710_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1088 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.23-rc6-omap1</div><div class='add'>+# Tue Sep 18 13:02:08 2007</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLUB_DEBUG=y</div><div class='add'>+# CONFIG_SLAB is not set</div><div class='add'>+CONFIG_SLUB=y</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_MODULES is not set</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+CONFIG_DEFAULT_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP_OTG=y</div><div class='add'>+CONFIG_ARCH_OMAP1=y</div><div class='add'>+# CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+# CONFIG_ARCH_OMAP3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+CONFIG_OMAP_BOOT_TAG=y</div><div class='add'>+# CONFIG_OMAP_BOOT_REASON is not set</div><div class='add'>+# CONFIG_OMAP_COMPONENT_VERSION is not set</div><div class='add'>+# CONFIG_OMAP_GPIO_SWITCH is not set</div><div class='add'>+# CONFIG_OMAP_MUX is not set</div><div class='add'>+# CONFIG_OMAP_STI is not set</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+# CONFIG_OMAP_MMU_FWK is not set</div><div class='add'>+# CONFIG_OMAP_MBOX_FWK is not set</div><div class='add'>+CONFIG_OMAP_MPU_TIMER=y</div><div class='add'>+# CONFIG_OMAP_32K_TIMER is not set</div><div class='add'>+# CONFIG_OMAP_DM_TIMER is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART1 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART3=y</div><div class='add'>+# CONFIG_OMAP_DSP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Core Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_OMAP730 is not set</div><div class='add'>+# CONFIG_ARCH_OMAP15XX is not set</div><div class='add'>+CONFIG_ARCH_OMAP16XX=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_MACH_OMAP_INNOVATOR is not set</div><div class='add'>+# CONFIG_MACH_OMAP_H2 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_H3 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_OSK is not set</div><div class='add'>+# CONFIG_MACH_NOKIA770 is not set</div><div class='add'>+CONFIG_MACH_OMAP_GENERIC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP CPU Speed</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set</div><div class='add'>+# CONFIG_OMAP_ARM_216MHZ is not set</div><div class='add'>+CONFIG_OMAP_ARM_192MHZ=y</div><div class='add'>+# CONFIG_OMAP_ARM_168MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_120MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_60MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_30MHZ is not set</div><div class='add'>+# CONFIG_MACH_OMAP_APOLLON_PLUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM926T=y</div><div class='add'>+CONFIG_CPU_32v5=y</div><div class='add'>+CONFIG_CPU_ABRT_EV5TJ=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARM_THUMB is not set</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="mem=64M console=tty0 console=ttyS2,115200 root=0801"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+# CONFIG_VFP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+CONFIG_ARTHUR=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+# CONFIG_PM_LEGACY is not set</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND_UP_POSSIBLE=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+# CONFIG_APM_EMULATION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETLABEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='add'>+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+# CONFIG_CHR_DEV_SG is not set</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+CONFIG_USB_USBNET_MII=y</div><div class='add'>+CONFIG_USB_USBNET=y</div><div class='add'>+CONFIG_USB_NET_AX8817X=y</div><div class='add'>+CONFIG_USB_NET_CDCETHER=y</div><div class='add'>+# CONFIG_USB_NET_DM9601 is not set</div><div class='add'>+# CONFIG_USB_NET_GL620A is not set</div><div class='add'>+CONFIG_USB_NET_NET1080=y</div><div class='add'>+# CONFIG_USB_NET_PLUSB is not set</div><div class='add'>+# CONFIG_USB_NET_MCS7830 is not set</div><div class='add'>+# CONFIG_USB_NET_RNDIS_HOST is not set</div><div class='add'>+CONFIG_USB_NET_CDC_SUBSET=y</div><div class='add'>+CONFIG_USB_ALI_M5632=y</div><div class='add'>+# CONFIG_USB_AN2720 is not set</div><div class='add'>+# CONFIG_USB_BELKIN is not set</div><div class='add'>+# CONFIG_USB_ARMLINUX is not set</div><div class='add'>+# CONFIG_USB_EPSON2888 is not set</div><div class='add'>+# CONFIG_USB_KC2190 is not set</div><div class='add'>+CONFIG_USB_NET_ZAURUS=y</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+CONFIG_PPP=y</div><div class='add'>+# CONFIG_PPP_MULTILINK is not set</div><div class='add'>+# CONFIG_PPP_FILTER is not set</div><div class='add'>+# CONFIG_PPP_ASYNC is not set</div><div class='add'>+# CONFIG_PPP_SYNC_TTY is not set</div><div class='add'>+# CONFIG_PPP_DEFLATE is not set</div><div class='add'>+# CONFIG_PPP_BSDCOMP is not set</div><div class='add'>+# CONFIG_PPP_MPPE is not set</div><div class='add'>+# CONFIG_PPPOE is not set</div><div class='add'>+# CONFIG_PPPOL2TP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+CONFIG_SLHC=y</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+CONFIG_KEYBOARD_ATKBD=y</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_OMAP=y</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+CONFIG_SERIO_LIBPS2=y</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+CONFIG_HW_RANDOM_OMAP=y</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU3 is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+CONFIG_HID_DEBUG=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+CONFIG_USB_DEBUG=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+CONFIG_USB_DEVICE_CLASS=y</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_SUSPEND is not set</div><div class='add'>+# CONFIG_USB_PERSIST is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Serial Converter support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB DSL modem support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_OMAP=y</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+# CONFIG_ROOT_NFS is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+# CONFIG_SUNRPC_BIND34 is not set</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+CONFIG_NLS_CODEPAGE_852=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+CONFIG_NLS_ISO8859_1=y</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+CONFIG_NLS_ISO8859_15=y</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Distributed Lock Manager</div><div class='add'>+#</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_SLUB_DEBUG_ON is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+CONFIG_DEBUG_SPINLOCK=y</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+CONFIG_DEBUG_ERRORS=y</div><div class='add'>+# CONFIG_DEBUG_LL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+CONFIG_SECURITY=y</div><div class='add'>+# CONFIG_SECURITY_NETWORK is not set</div><div class='add'>+CONFIG_SECURITY_CAPABILITIES=y</div><div class='add'>+# CONFIG_SECURITY_ROOTPLUG is not set</div><div class='add'>+# CONFIG_SECURITY_LOWMEM is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_BLKCIPHER=y</div><div class='add'>+CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+CONFIG_CRYPTO_PCBC=y</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/omap_generic_2420_defconfig b/arch/arm/configs/omap_generic_2420_defconfig<br/>new file mode 100644<br/>index 000000000000..cf4073b47aaa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/omap_generic_2420_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_generic_2420_defconfig</a></div><div class='hunk'>@@ -0,0 +1,655 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.23-rc6-omap1</div><div class='add'>+# Tue Sep 18 11:44:48 2007</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLUB_DEBUG=y</div><div class='add'>+# CONFIG_SLAB is not set</div><div class='add'>+CONFIG_SLUB=y</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+CONFIG_DEFAULT_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP_OTG=y</div><div class='add'>+# CONFIG_ARCH_OMAP1 is not set</div><div class='add'>+CONFIG_ARCH_OMAP2=y</div><div class='add'>+# CONFIG_ARCH_OMAP3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+CONFIG_OMAP_BOOT_TAG=y</div><div class='add'>+# CONFIG_OMAP_BOOT_REASON is not set</div><div class='add'>+# CONFIG_OMAP_COMPONENT_VERSION is not set</div><div class='add'>+# CONFIG_OMAP_GPIO_SWITCH is not set</div><div class='add'>+# CONFIG_OMAP_MUX is not set</div><div class='add'>+# CONFIG_OMAP_STI is not set</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+# CONFIG_OMAP_MMU_FWK is not set</div><div class='add'>+# CONFIG_OMAP_MBOX_FWK is not set</div><div class='add'>+CONFIG_OMAP_MPU_TIMER=y</div><div class='add'>+# CONFIG_OMAP_32K_TIMER is not set</div><div class='add'>+CONFIG_OMAP_DM_TIMER=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART1 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART3=y</div><div class='add'>+# CONFIG_OMAP_DSP is not set</div><div class='add'>+CONFIG_MACH_OMAP_GENERIC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Core Type</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP24XX=y</div><div class='add'>+CONFIG_ARCH_OMAP2420=y</div><div class='add'>+# CONFIG_ARCH_OMAP2430 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_MACH_NOKIA_N800 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_H4 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_APOLLON is not set</div><div class='add'>+# CONFIG_MACH_OMAP_APOLLON_PLUS is not set</div><div class='add'>+# CONFIG_MACH_OMAP_2430SDP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_V6=y</div><div class='add'>+# CONFIG_CPU_32v6K is not set</div><div class='add'>+CONFIG_CPU_32v6=y</div><div class='add'>+CONFIG_CPU_ABRT_EV6=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_V6=y</div><div class='add'>+CONFIG_CPU_CACHE_VIPT=y</div><div class='add'>+CONFIG_CPU_COPY_V6=y</div><div class='add'>+CONFIG_CPU_TLB_V6=y</div><div class='add'>+CONFIG_CPU_HAS_ASID=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_BPREDICT_DISABLE is not set</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_LEDS=y</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x10C08000</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x10200000</div><div class='add'>+# CONFIG_ZBOOT_ROM is not set</div><div class='add'>+CONFIG_CMDLINE=""</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+# CONFIG_VFP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+CONFIG_SUSPEND_UP_POSSIBLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+# CONFIG_BLK_DEV_LOOP is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='add'>+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_DMA is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+# CONFIG_OMAP_WATCHDOG is not set</div><div class='add'>+CONFIG_HW_RANDOM=m</div><div class='add'>+CONFIG_HW_RANDOM_OMAP=m</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU3 is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+CONFIG_HID_DEBUG=y</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_EXT2_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT2_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT2_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+CONFIG_ROMFS_FS=y</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+# CONFIG_TMPFS is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NLS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_SLUB_DEBUG_ON is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_INFO=y</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+CONFIG_DEBUG_USER=y</div><div class='add'>+CONFIG_DEBUG_ERRORS=y</div><div class='add'>+CONFIG_DEBUG_LL=y</div><div class='add'>+# CONFIG_DEBUG_ICEDCC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/omap_h2_1610_defconfig b/arch/arm/configs/omap_h2_1610_defconfig<br/>index 323c1deeb953..c03507202f3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/omap_h2_1610_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/configs/omap_h2_1610_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/omap_h2_1610_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_h2_1610_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25-rc3</div><div class='del'>-# Mon Mar  3 03:39:48 2008</div><div class='add'>+# Linux kernel version: 2.6.25-rc2-omap1</div><div class='add'>+# Wed Feb 20 17:12:36 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ARM=y</div><div class='ctx'> CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='hunk'>@@ -31,7 +31,6 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXPERIMENTAL=y</div><div class='ctx'> CONFIG_BROKEN_ON_SMP=y</div><div class='del'>-CONFIG_LOCK_KERNEL=y</div><div class='ctx'> CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='ctx'> CONFIG_LOCALVERSION=""</div><div class='ctx'> CONFIG_LOCALVERSION_AUTO=y</div><div class='hunk'>@@ -50,7 +49,7 @@ CONFIG_FAIR_GROUP_SCHED=y</div><div class='ctx'> # CONFIG_RT_GROUP_SCHED is not set</div><div class='ctx'> CONFIG_USER_SCHED=y</div><div class='ctx'> # CONFIG_CGROUP_SCHED is not set</div><div class='del'>-# CONFIG_SYSFS_DEPRECATED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='ctx'> CONFIG_NAMESPACES=y</div><div class='ctx'> # CONFIG_UTS_NS is not set</div><div class='hunk'>@@ -65,6 +64,7 @@ CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='hunk'>@@ -165,20 +165,28 @@ CONFIG_ARCH_OMAP=y</div><div class='ctx'> CONFIG_ARCH_OMAP_OTG=y</div><div class='ctx'> CONFIG_ARCH_OMAP1=y</div><div class='ctx'> # CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+# CONFIG_ARCH_OMAP3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # OMAP Feature Selections</div><div class='ctx'> #</div><div class='add'>+CONFIG_OMAP_DEBUG_SRAM_PATCH=y</div><div class='ctx'> # CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+CONFIG_OMAP_BOOT_TAG=y</div><div class='add'>+# CONFIG_OMAP_BOOT_REASON is not set</div><div class='add'>+# CONFIG_OMAP_COMPONENT_VERSION is not set</div><div class='add'>+CONFIG_OMAP_GPIO_SWITCH=y</div><div class='ctx'> CONFIG_OMAP_MUX=y</div><div class='del'>-# CONFIG_OMAP_MUX_DEBUG is not set</div><div class='add'>+CONFIG_OMAP_MUX_DEBUG=y</div><div class='ctx'> CONFIG_OMAP_MUX_WARNINGS=y</div><div class='add'>+# CONFIG_OMAP_STI is not set</div><div class='ctx'> CONFIG_OMAP_MCBSP=y</div><div class='ctx'> # CONFIG_OMAP_MMU_FWK is not set</div><div class='add'>+# CONFIG_OMAP_MBOX_FWK is not set</div><div class='ctx'> # CONFIG_OMAP_MPU_TIMER is not set</div><div class='ctx'> CONFIG_OMAP_32K_TIMER=y</div><div class='ctx'> CONFIG_OMAP_32K_TIMER_HZ=128</div><div class='del'>-# CONFIG_OMAP_DM_TIMER is not set</div><div class='add'>+CONFIG_OMAP_DM_TIMER=y</div><div class='ctx'> CONFIG_OMAP_LL_DEBUG_UART1=y</div><div class='ctx'> # CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='ctx'> # CONFIG_OMAP_LL_DEBUG_UART3 is not set</div><div class='hunk'>@@ -206,10 +214,10 @@ CONFIG_MACH_OMAP_H2=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set</div><div class='ctx'> # CONFIG_OMAP_ARM_216MHZ is not set</div><div class='del'>-CONFIG_OMAP_ARM_192MHZ=y</div><div class='add'>+# CONFIG_OMAP_ARM_192MHZ is not set</div><div class='ctx'> # CONFIG_OMAP_ARM_168MHZ is not set</div><div class='ctx'> # CONFIG_OMAP_ARM_120MHZ is not set</div><div class='del'>-# CONFIG_OMAP_ARM_60MHZ is not set</div><div class='add'>+CONFIG_OMAP_ARM_60MHZ=y</div><div class='ctx'> # CONFIG_OMAP_ARM_30MHZ is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -227,6 +235,7 @@ CONFIG_CPU_32=y</div><div class='ctx'> CONFIG_CPU_ARM926T=y</div><div class='ctx'> CONFIG_CPU_32v5=y</div><div class='ctx'> CONFIG_CPU_ABRT_EV5TJ=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='ctx'> CONFIG_CPU_CACHE_VIVT=y</div><div class='ctx'> CONFIG_CPU_COPY_V4WB=y</div><div class='ctx'> CONFIG_CPU_TLB_V4WBI=y</div><div class='hunk'>@@ -257,10 +266,9 @@ CONFIG_TICK_ONESHOT=y</div><div class='ctx'> CONFIG_NO_HZ=y</div><div class='ctx'> CONFIG_HIGH_RES_TIMERS=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='del'>-CONFIG_PREEMPT=y</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='ctx'> CONFIG_HZ=128</div><div class='del'>-CONFIG_AEABI=y</div><div class='del'>-CONFIG_OABI_COMPAT=y</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='ctx'> # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='hunk'>@@ -275,7 +283,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='del'>-# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_LEDS=y</div><div class='add'>+# CONFIG_LEDS_CPU is not set</div><div class='ctx'> CONFIG_ALIGNMENT_TRAP=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -283,7 +292,7 @@ CONFIG_ALIGNMENT_TRAP=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='ctx'> CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='del'>-CONFIG_CMDLINE="mem=32M console=ttyS0,115200n8 root=0801 ro init=/bin/sh"</div><div class='add'>+CONFIG_CMDLINE="mem=32M console=ttyS0,115200n8 root=/dev/ram0 rw initrd=0x10600000,8M ramdisk_size=8192"</div><div class='ctx'> # CONFIG_XIP_KERNEL is not set</div><div class='ctx'> # CONFIG_KEXEC is not set</div><div class='ctx'> # CONFIG_ATAGS_PROC is not set</div><div class='hunk'>@@ -291,20 +300,7 @@ CONFIG_CMDLINE="mem=32M console=ttyS0,115200n8 root=0801 ro init=/bin/sh"</div><div class='ctx'> #</div><div class='ctx'> # CPU Frequency scaling</div><div class='ctx'> #</div><div class='del'>-CONFIG_CPU_FREQ=y</div><div class='del'>-CONFIG_CPU_FREQ_TABLE=y</div><div class='del'>-# CONFIG_CPU_FREQ_DEBUG is not set</div><div class='del'>-CONFIG_CPU_FREQ_STAT=y</div><div class='del'>-# CONFIG_CPU_FREQ_STAT_DETAILS is not set</div><div class='del'>-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set</div><div class='del'>-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y</div><div class='del'>-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set</div><div class='del'>-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set</div><div class='del'>-# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set</div><div class='del'>-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set</div><div class='del'>-CONFIG_CPU_FREQ_GOV_USERSPACE=y</div><div class='del'>-# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set</div><div class='del'>-# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Floating point emulation</div><div class='hunk'>@@ -322,8 +318,9 @@ CONFIG_FPE_NWFPE=y</div><div class='ctx'> # Userspace binary formats</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='del'>-CONFIG_BINFMT_AOUT=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Power management options</div><div class='hunk'>@@ -433,21 +430,102 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='add'>+CONFIG_DEBUG_DRIVER=y</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='del'>-# CONFIG_MTD is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+CONFIG_MTD_DEBUG=y</div><div class='add'>+CONFIG_MTD_DEBUG_VERBOSE=3</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+# CONFIG_MTD_CFI_ADV_OPTIONS is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+CONFIG_MTD_CFI_INTELEXT=y</div><div class='add'>+# CONFIG_MTD_CFI_AMDSTD is not set</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PHYSMAP is not set</div><div class='add'>+# CONFIG_MTD_ARM_INTEGRATOR is not set</div><div class='add'>+# CONFIG_MTD_OMAP_NOR is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DATAFLASH is not set</div><div class='add'>+# CONFIG_MTD_M25P80 is not set</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> # CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='del'>-CONFIG_ATA_OVER_ETH=m</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -457,42 +535,9 @@ CONFIG_MISC_DEVICES=y</div><div class='ctx'> # SCSI device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_RAID_ATTRS is not set</div><div class='del'>-CONFIG_SCSI=y</div><div class='del'>-CONFIG_SCSI_DMA=y</div><div class='del'>-# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_DMA is not set</div><div class='ctx'> # CONFIG_SCSI_NETLINK is not set</div><div class='del'>-CONFIG_SCSI_PROC_FS=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SCSI support type (disk, tape, CD-ROM)</div><div class='del'>-#</div><div class='del'>-# CONFIG_BLK_DEV_SD is not set</div><div class='del'>-# CONFIG_CHR_DEV_ST is not set</div><div class='del'>-# CONFIG_CHR_DEV_OSST is not set</div><div class='del'>-# CONFIG_BLK_DEV_SR is not set</div><div class='del'>-# CONFIG_CHR_DEV_SG is not set</div><div class='del'>-# CONFIG_CHR_DEV_SCH is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='del'>-#</div><div class='del'>-# CONFIG_SCSI_MULTI_LUN is not set</div><div class='del'>-# CONFIG_SCSI_CONSTANTS is not set</div><div class='del'>-# CONFIG_SCSI_LOGGING is not set</div><div class='del'>-# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='del'>-CONFIG_SCSI_WAIT_SCAN=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SCSI Transports</div><div class='del'>-#</div><div class='del'>-# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='del'>-# CONFIG_SCSI_FC_ATTRS is not set</div><div class='del'>-# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='del'>-# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='del'>-# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='del'>-CONFIG_SCSI_LOWLEVEL=y</div><div class='del'>-# CONFIG_ISCSI_TCP is not set</div><div class='del'>-# CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='hunk'>@@ -509,6 +554,7 @@ CONFIG_MII=y</div><div class='ctx'> # CONFIG_AX88796 is not set</div><div class='ctx'> CONFIG_SMC91X=y</div><div class='ctx'> # CONFIG_DM9000 is not set</div><div class='add'>+# CONFIG_ENC28J60 is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='hunk'>@@ -523,6 +569,15 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> CONFIG_PPP=y</div><div class='ctx'> # CONFIG_PPP_MULTILINK is not set</div><div class='hunk'>@@ -612,7 +667,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-# CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_HW_RANDOM=m</div><div class='add'>+CONFIG_HW_RANDOM_OMAP=m</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='hunk'>@@ -638,6 +694,7 @@ CONFIG_I2C_OMAP=y</div><div class='ctx'> # CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_TAOS_EVM is not set</div><div class='ctx'> # CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='hunk'>@@ -647,8 +704,10 @@ CONFIG_I2C_OMAP=y</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='del'>-# CONFIG_ISP1301_OMAP is not set</div><div class='add'>+CONFIG_ISP1301_OMAP=y</div><div class='ctx'> CONFIG_TPS65010=y</div><div class='add'>+# CONFIG_SENSORS_TLV320AIC23 is not set</div><div class='add'>+# CONFIG_GPIOEXPANDER_OMAP is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CORE is not set</div><div class='hunk'>@@ -659,8 +718,26 @@ CONFIG_TPS65010=y</div><div class='ctx'> #</div><div class='ctx'> # SPI support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+# CONFIG_SPI_DEBUG is not set</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Master Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI_BITBANG=y</div><div class='add'>+CONFIG_SPI_OMAP_UWIRE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Protocol Masters</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_AT25 is not set</div><div class='add'>+CONFIG_SPI_TSC2101=y</div><div class='add'>+# CONFIG_SPI_TSC2102 is not set</div><div class='add'>+# CONFIG_SPI_TSC210X is not set</div><div class='add'>+# CONFIG_SPI_TSC2301 is not set</div><div class='add'>+# CONFIG_SPI_SPIDEV is not set</div><div class='add'>+# CONFIG_SPI_TLE62X0 is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='hunk'>@@ -673,7 +750,6 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_ADM1031 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM9240 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7470 is not set</div><div class='del'>-# CONFIG_SENSORS_ADT7473 is not set</div><div class='ctx'> # CONFIG_SENSORS_ATXP1 is not set</div><div class='ctx'> # CONFIG_SENSORS_DS1621 is not set</div><div class='ctx'> # CONFIG_SENSORS_F71805F is not set</div><div class='hunk'>@@ -683,6 +759,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_GL520SM is not set</div><div class='ctx'> # CONFIG_SENSORS_IT87 is not set</div><div class='ctx'> # CONFIG_SENSORS_LM63 is not set</div><div class='add'>+# CONFIG_SENSORS_LM70 is not set</div><div class='ctx'> # CONFIG_SENSORS_LM75 is not set</div><div class='ctx'> # CONFIG_SENSORS_LM77 is not set</div><div class='ctx'> # CONFIG_SENSORS_LM78 is not set</div><div class='hunk'>@@ -712,6 +789,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83L786NG is not set</div><div class='ctx'> # CONFIG_SENSORS_W83627HF is not set</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_SENSORS_TSC210X is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='hunk'>@@ -723,6 +801,11 @@ CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='ctx'> # CONFIG_OMAP_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# USB-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_USBPCWATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Sonics Silicon Backplane</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SSB_POSSIBLE=y</div><div class='hunk'>@@ -740,6 +823,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='ctx'> CONFIG_DAB=y</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='hunk'>@@ -749,9 +833,9 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> CONFIG_FIRMWARE_EDID=y</div><div class='ctx'> # CONFIG_FB_DDC is not set</div><div class='del'>-# CONFIG_FB_CFB_FILLRECT is not set</div><div class='del'>-# CONFIG_FB_CFB_COPYAREA is not set</div><div class='del'>-# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=y</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=y</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set</div><div class='ctx'> # CONFIG_FB_SYS_FILLRECT is not set</div><div class='ctx'> # CONFIG_FB_SYS_COPYAREA is not set</div><div class='hunk'>@@ -769,7 +853,11 @@ CONFIG_FB_MODE_HELPERS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_FB_S1D13XXX is not set</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='del'>-# CONFIG_FB_OMAP is not set</div><div class='add'>+CONFIG_FB_OMAP=y</div><div class='add'>+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set</div><div class='add'>+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set</div><div class='add'>+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2</div><div class='add'>+# CONFIG_FB_OMAP_DMA_TUNE is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -785,17 +873,9 @@ CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='ctx'> # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set</div><div class='ctx'> # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='del'>-CONFIG_FONTS=y</div><div class='add'>+# CONFIG_FONTS is not set</div><div class='ctx'> CONFIG_FONT_8x8=y</div><div class='ctx'> CONFIG_FONT_8x16=y</div><div class='del'>-# CONFIG_FONT_6x11 is not set</div><div class='del'>-# CONFIG_FONT_7x14 is not set</div><div class='del'>-# CONFIG_FONT_PEARL_8x8 is not set</div><div class='del'>-# CONFIG_FONT_ACORN_8x8 is not set</div><div class='del'>-# CONFIG_FONT_MINI_4x6 is not set</div><div class='del'>-# CONFIG_FONT_SUN8x16 is not set</div><div class='del'>-# CONFIG_FONT_SUN12x22 is not set</div><div class='del'>-# CONFIG_FONT_10x18 is not set</div><div class='ctx'> CONFIG_LOGO=y</div><div class='ctx'> # CONFIG_LOGO_LINUX_MONO is not set</div><div class='ctx'> # CONFIG_LOGO_LINUX_VGA16 is not set</div><div class='hunk'>@@ -804,37 +884,204 @@ CONFIG_LOGO_LINUX_CLUT224=y</div><div class='ctx'> #</div><div class='ctx'> # Sound</div><div class='ctx'> #</div><div class='del'>-CONFIG_SOUND=y</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='add'>+# USB Input Devices</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SND is not set</div><div class='add'>+# CONFIG_USB_HID is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Open Sound System</div><div class='add'>+# USB HID Boot Protocol drivers</div><div class='ctx'> #</div><div class='del'>-CONFIG_SOUND_PRIME=y</div><div class='del'>-# CONFIG_SOUND_MSNDCLAS is not set</div><div class='del'>-# CONFIG_SOUND_MSNDPIN is not set</div><div class='del'>-CONFIG_HID_SUPPORT=y</div><div class='del'>-CONFIG_HID=y</div><div class='del'>-CONFIG_HID_DEBUG=y</div><div class='del'>-# CONFIG_HIDRAW is not set</div><div class='add'>+# CONFIG_USB_KBD is not set</div><div class='add'>+# CONFIG_USB_MOUSE is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> # CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='del'>-# CONFIG_USB is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+# CONFIG_USB_DEVICE_CLASS is not set</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+CONFIG_USB_SUSPEND=y</div><div class='add'>+# CONFIG_USB_PERSIST is not set</div><div class='add'>+CONFIG_USB_OTG=y</div><div class='add'>+CONFIG_USB_OTG_WHITELIST=y</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='add'>+# CONFIG_USB_GADGET_MUSB_HDRC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='del'>-# CONFIG_USB_GADGET is not set</div><div class='del'>-# CONFIG_MMC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+CONFIG_USB_TEST=y</div><div class='add'>+CONFIG_USB_GADGET=y</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG is not set</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG_FILES is not set</div><div class='add'>+CONFIG_USB_GADGET_SELECTED=y</div><div class='add'>+# CONFIG_USB_GADGET_AMD5536UDC is not set</div><div class='add'>+# CONFIG_USB_GADGET_ATMEL_USBA is not set</div><div class='add'>+# CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='add'>+# CONFIG_USB_GADGET_NET2280 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_M66592 is not set</div><div class='add'>+# CONFIG_USB_GADGET_GOKU is not set</div><div class='add'>+# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='add'>+CONFIG_USB_GADGET_OMAP=y</div><div class='add'>+CONFIG_USB_OMAP=y</div><div class='add'>+# CONFIG_USB_GADGET_S3C2410 is not set</div><div class='add'>+# CONFIG_USB_GADGET_AT91 is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUMMY_HCD is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUALSPEED is not set</div><div class='add'>+# CONFIG_USB_ZERO is not set</div><div class='add'>+CONFIG_USB_ETH=y</div><div class='add'>+CONFIG_USB_ETH_RNDIS=y</div><div class='add'>+# CONFIG_USB_GADGETFS is not set</div><div class='add'>+# CONFIG_USB_FILE_STORAGE is not set</div><div class='add'>+# CONFIG_USB_G_SERIAL is not set</div><div class='add'>+# CONFIG_USB_MIDI_GADGET is not set</div><div class='add'>+# CONFIG_USB_G_PRINTER is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+# CONFIG_SDIO_UART is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_OMAP=y</div><div class='add'>+# CONFIG_MMC_SPI is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> CONFIG_RTC_LIB=y</div><div class='del'>-# CONFIG_RTC_CLASS is not set</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1374 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M41T80 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_MAX6902 is not set</div><div class='add'>+# CONFIG_RTC_DRV_R9701 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C348 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_DRV_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+# CONFIG_OMAP_DSP is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='hunk'>@@ -894,6 +1141,17 @@ CONFIG_SYSFS=y</div><div class='ctx'> # CONFIG_BEFS_FS is not set</div><div class='ctx'> # CONFIG_BFS_FS is not set</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+# CONFIG_JFFS2_LZO is not set</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='hunk'>@@ -904,19 +1162,16 @@ CONFIG_ROMFS_FS=y</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='ctx'> CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='del'>-CONFIG_NFS_V3=y</div><div class='del'>-# CONFIG_NFS_V3_ACL is not set</div><div class='del'>-CONFIG_NFS_V4=y</div><div class='add'>+# CONFIG_NFS_V3 is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='ctx'> # CONFIG_NFS_DIRECTIO is not set</div><div class='ctx'> # CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='del'>-CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-CONFIG_SUNRPC_GSS=y</div><div class='ctx'> # CONFIG_SUNRPC_BIND34 is not set</div><div class='del'>-CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='hunk'>@@ -981,11 +1236,38 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='del'>-# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_INFO=y</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+# CONFIG_DEBUG_SG is not set</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='del'>-# CONFIG_DEBUG_USER is not set</div><div class='add'>+CONFIG_DEBUG_USER=y</div><div class='add'>+CONFIG_DEBUG_ERRORS=y</div><div class='add'>+# CONFIG_DEBUG_STACK_USAGE is not set</div><div class='add'>+# CONFIG_DEBUG_LL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='hunk'>@@ -994,31 +1276,29 @@ CONFIG_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='del'>-CONFIG_CRYPTO_ALGAPI=y</div><div class='del'>-CONFIG_CRYPTO_BLKCIPHER=y</div><div class='ctx'> # CONFIG_CRYPTO_SEQIV is not set</div><div class='del'>-CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_MANAGER is not set</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='ctx'> # CONFIG_CRYPTO_NULL is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='del'>-CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='ctx'> # CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=m</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=m</div><div class='add'>+# CONFIG_CRYPTO_ECB is not set</div><div class='add'>+# CONFIG_CRYPTO_CBC is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='ctx'> # CONFIG_CRYPTO_LRW is not set</div><div class='ctx'> # CONFIG_CRYPTO_XTS is not set</div><div class='ctx'> # CONFIG_CRYPTO_CTR is not set</div><div class='ctx'> # CONFIG_CRYPTO_GCM is not set</div><div class='ctx'> # CONFIG_CRYPTO_CCM is not set</div><div class='ctx'> # CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_DES is not set</div><div class='ctx'> # CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_BLOWFISH is not set</div><div class='ctx'> # CONFIG_CRYPTO_TWOFISH is not set</div><div class='hunk'>@@ -1052,6 +1332,7 @@ CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='ctx'> CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='head'>diff --git a/arch/arm/configs/omap_h4_2420_defconfig b/arch/arm/configs/omap_h4_2420_defconfig<br/>new file mode 100644<br/>index 000000000000..5bc89185a64f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/omap_h4_2420_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_h4_2420_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1120 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.23-rc6-omap1</div><div class='add'>+# Tue Sep 18 11:44:58 2007</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+CONFIG_MODVERSIONS=y</div><div class='add'>+CONFIG_MODULE_SRCVERSION_ALL=y</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP_OTG=y</div><div class='add'>+# CONFIG_ARCH_OMAP1 is not set</div><div class='add'>+CONFIG_ARCH_OMAP2=y</div><div class='add'>+# CONFIG_ARCH_OMAP3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+CONFIG_OMAP_DEBUG_DEVICES=y</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+CONFIG_OMAP_BOOT_TAG=y</div><div class='add'>+# CONFIG_OMAP_BOOT_REASON is not set</div><div class='add'>+# CONFIG_OMAP_COMPONENT_VERSION is not set</div><div class='add'>+# CONFIG_OMAP_GPIO_SWITCH is not set</div><div class='add'>+CONFIG_OMAP_MUX=y</div><div class='add'>+CONFIG_OMAP_MUX_DEBUG=y</div><div class='add'>+CONFIG_OMAP_MUX_WARNINGS=y</div><div class='add'>+# CONFIG_OMAP_STI is not set</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+# CONFIG_OMAP_MMU_FWK is not set</div><div class='add'>+# CONFIG_OMAP_MBOX_FWK is not set</div><div class='add'>+CONFIG_OMAP_MPU_TIMER=y</div><div class='add'>+# CONFIG_OMAP_32K_TIMER is not set</div><div class='add'>+CONFIG_OMAP_DM_TIMER=y</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART1=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART3 is not set</div><div class='add'>+CONFIG_OMAP_SERIAL_WAKE=y</div><div class='add'>+# CONFIG_OMAP_DSP is not set</div><div class='add'>+# CONFIG_MACH_OMAP_GENERIC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Core Type</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP24XX=y</div><div class='add'>+CONFIG_ARCH_OMAP2420=y</div><div class='add'>+# CONFIG_ARCH_OMAP2430 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_MACH_NOKIA_N800 is not set</div><div class='add'>+CONFIG_MACH_OMAP_H4=y</div><div class='add'>+# CONFIG_MACH_OMAP_H4_TUSB is not set</div><div class='add'>+# CONFIG_MACH_OMAP_H4_OTG is not set</div><div class='add'>+# CONFIG_MACH_OMAP2_H4_USB1 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_APOLLON is not set</div><div class='add'>+# CONFIG_MACH_OMAP_APOLLON_PLUS is not set</div><div class='add'>+# CONFIG_MACH_OMAP_2430SDP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_V6=y</div><div class='add'>+# CONFIG_CPU_32v6K is not set</div><div class='add'>+CONFIG_CPU_32v6=y</div><div class='add'>+CONFIG_CPU_ABRT_EV6=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_V6=y</div><div class='add'>+CONFIG_CPU_CACHE_VIPT=y</div><div class='add'>+CONFIG_CPU_COPY_V6=y</div><div class='add'>+CONFIG_CPU_TLB_V6=y</div><div class='add'>+CONFIG_CPU_HAS_ASID=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_BPREDICT_DISABLE is not set</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+CONFIG_AEABI=y</div><div class='add'>+CONFIG_OABI_COMPAT=y</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="root=/dev/ram0 rw console=ttyS0,115200n8 initrd=0x80600000,8M ramdisk_size=8192"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+# CONFIG_VFP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+CONFIG_BINFMT_MISC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+CONFIG_SUSPEND_UP_POSSIBLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+CONFIG_NET_KEY=y</div><div class='add'>+# CONFIG_NET_KEY_MIGRATE is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+# CONFIG_IP_PNP_BOOTP is not set</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+CONFIG_IRDA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IrDA protocols</div><div class='add'>+#</div><div class='add'>+CONFIG_IRLAN=y</div><div class='add'>+CONFIG_IRCOMM=y</div><div class='add'>+# CONFIG_IRDA_ULTRA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IrDA options</div><div class='add'>+#</div><div class='add'>+# CONFIG_IRDA_CACHE_LAST_LSAP is not set</div><div class='add'>+# CONFIG_IRDA_FAST_RR is not set</div><div class='add'>+# CONFIG_IRDA_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Infrared-port device drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SIR device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_IRTTY_SIR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dongle support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Old SIR device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_IRPORT_SIR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Old Serial dongle support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# FIR device drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_OMAP_IR=y</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+CONFIG_MTD_CONCAT=y</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+# CONFIG_MTD_CFI_ADV_OPTIONS is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+CONFIG_MTD_CFI_INTELEXT=y</div><div class='add'>+# CONFIG_MTD_CFI_AMDSTD is not set</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PHYSMAP is not set</div><div class='add'>+# CONFIG_MTD_ARM_INTEGRATOR is not set</div><div class='add'>+CONFIG_MTD_OMAP_NOR=y</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=16384</div><div class='add'>+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_DMA is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='add'>+CONFIG_SMC91X=y</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+# CONFIG_KEYBOARD_ATKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_OMAP=y</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=32</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_EXTENDED=y</div><div class='add'>+CONFIG_SERIAL_8250_MANY_PORTS=y</div><div class='add'>+CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_DETECT_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_RSA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+CONFIG_OMAP_WATCHDOG=y</div><div class='add'>+CONFIG_HW_RANDOM=m</div><div class='add'>+CONFIG_HW_RANDOM_OMAP=m</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+# CONFIG_I2C_CHARDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALGOBIT is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+CONFIG_I2C_OMAP=y</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_ISP1301_OMAP is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='add'>+# CONFIG_SENSORS_TLV320AIC23 is not set</div><div class='add'>+CONFIG_GPIOEXPANDER_OMAP=y</div><div class='add'>+# CONFIG_TWL4030_CORE is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+CONFIG_MENELAUS=y</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+CONFIG_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+# CONFIG_FB_CFB_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_CFB_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+CONFIG_FB_DEFERRED_IO=y</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+CONFIG_FB_OMAP=y</div><div class='add'>+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set</div><div class='add'>+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set</div><div class='add'>+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+# CONFIG_FONTS is not set</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+# CONFIG_LOGO_LINUX_MONO is not set</div><div class='add'>+# CONFIG_LOGO_LINUX_VGA16 is not set</div><div class='add'>+CONFIG_LOGO_LINUX_CLUT224=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_OMAP=y</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+# CONFIG_EXT3_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+CONFIG_QUOTA=y</div><div class='add'>+# CONFIG_QFMT_V1 is not set</div><div class='add'>+CONFIG_QFMT_V2=y</div><div class='add'>+CONFIG_QUOTACTL=y</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+# CONFIG_SUNRPC_BIND34 is not set</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_1 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Distributed Lock Manager</div><div class='add'>+#</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+# CONFIG_DEBUG_ERRORS is not set</div><div class='add'>+CONFIG_DEBUG_LL=y</div><div class='add'>+# CONFIG_DEBUG_ICEDCC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_BLKCIPHER=y</div><div class='add'>+CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=m</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+CONFIG_CRYPTO_PCBC=m</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+CONFIG_LIBCRC32C=y</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/omap_innovator_1510_defconfig b/arch/arm/configs/omap_innovator_1510_defconfig<br/>new file mode 100644<br/>index 000000000000..55b2611bd90a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/omap_innovator_1510_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_innovator_1510_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1253 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.23-rc6-omap1</div><div class='add'>+# Tue Sep 18 11:45:02 2007</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+CONFIG_DEFAULT_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP1=y</div><div class='add'>+# CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+# CONFIG_ARCH_OMAP3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+# CONFIG_OMAP_BOOT_TAG is not set</div><div class='add'>+# CONFIG_OMAP_GPIO_SWITCH is not set</div><div class='add'>+CONFIG_OMAP_MUX=y</div><div class='add'>+# CONFIG_OMAP_MUX_DEBUG is not set</div><div class='add'>+CONFIG_OMAP_MUX_WARNINGS=y</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+# CONFIG_OMAP_MMU_FWK is not set</div><div class='add'>+# CONFIG_OMAP_MBOX_FWK is not set</div><div class='add'>+CONFIG_OMAP_MPU_TIMER=y</div><div class='add'>+# CONFIG_OMAP_32K_TIMER is not set</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART1=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART3 is not set</div><div class='add'>+CONFIG_OMAP_SERIAL_WAKE=y</div><div class='add'>+# CONFIG_OMAP_DSP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Core Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_OMAP730 is not set</div><div class='add'>+CONFIG_ARCH_OMAP15XX=y</div><div class='add'>+# CONFIG_ARCH_OMAP16XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+CONFIG_MACH_OMAP_INNOVATOR=y</div><div class='add'>+# CONFIG_MACH_VOICEBLUE is not set</div><div class='add'>+# CONFIG_MACH_OMAP_PALMTE is not set</div><div class='add'>+# CONFIG_MACH_OMAP_PALMZ71 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_PALMTT is not set</div><div class='add'>+# CONFIG_MACH_SX1 is not set</div><div class='add'>+# CONFIG_MACH_AMS_DELTA is not set</div><div class='add'>+# CONFIG_MACH_OMAP_GENERIC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP CPU Speed</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set</div><div class='add'>+CONFIG_OMAP_ARM_168MHZ=y</div><div class='add'>+# CONFIG_OMAP_ARM_150MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_120MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_60MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_30MHZ is not set</div><div class='add'>+# CONFIG_MACH_OMAP_APOLLON_PLUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM925T=y</div><div class='add'>+CONFIG_CPU_32v4T=y</div><div class='add'>+CONFIG_CPU_ABRT_EV4T=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_V4WT=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+CONFIG_CPU_DCACHE_WRITETHROUGH=y</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_LEDS=y</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="console=ttyS0,115200n8 root=/dev/nfs ip=bootp noinitrd"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+# CONFIG_PM_LEGACY is not set</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND_UP_POSSIBLE=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+# CONFIG_APM_EMULATION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='add'>+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+CONFIG_CHR_DEV_ST=y</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+CONFIG_BLK_DEV_SR=y</div><div class='add'>+# CONFIG_BLK_DEV_SR_VENDOR is not set</div><div class='add'>+CONFIG_CHR_DEV_SG=y</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+CONFIG_SCSI_MULTI_LUN=y</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='add'>+CONFIG_SMC91X=y</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+CONFIG_USB_RTL8150=y</div><div class='add'>+CONFIG_USB_USBNET_MII=y</div><div class='add'>+CONFIG_USB_USBNET=y</div><div class='add'>+CONFIG_USB_NET_AX8817X=y</div><div class='add'>+CONFIG_USB_NET_CDCETHER=y</div><div class='add'>+# CONFIG_USB_NET_DM9601 is not set</div><div class='add'>+# CONFIG_USB_NET_GL620A is not set</div><div class='add'>+CONFIG_USB_NET_NET1080=y</div><div class='add'>+# CONFIG_USB_NET_PLUSB is not set</div><div class='add'>+# CONFIG_USB_NET_MCS7830 is not set</div><div class='add'>+# CONFIG_USB_NET_RNDIS_HOST is not set</div><div class='add'>+# CONFIG_USB_NET_CDC_SUBSET is not set</div><div class='add'>+CONFIG_USB_NET_ZAURUS=y</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+CONFIG_PPP=y</div><div class='add'>+CONFIG_PPP_MULTILINK=y</div><div class='add'>+# CONFIG_PPP_FILTER is not set</div><div class='add'>+CONFIG_PPP_ASYNC=y</div><div class='add'>+# CONFIG_PPP_SYNC_TTY is not set</div><div class='add'>+CONFIG_PPP_DEFLATE=y</div><div class='add'>+CONFIG_PPP_BSDCOMP=y</div><div class='add'>+# CONFIG_PPP_MPPE is not set</div><div class='add'>+# CONFIG_PPPOE is not set</div><div class='add'>+# CONFIG_PPPOL2TP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+CONFIG_SLHC=y</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=240</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+# CONFIG_KEYBOARD_ATKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_OMAP=y</div><div class='add'>+CONFIG_OMAP_PS2=m</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+CONFIG_HW_RANDOM=m</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+# CONFIG_I2C_CHARDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALGOBIT is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_OMAP is not set</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU3 is not set</div><div class='add'>+# CONFIG_SENSORS_AD7418 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1021 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1025 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1026 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1029 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1031 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM9240 is not set</div><div class='add'>+# CONFIG_SENSORS_ASB100 is not set</div><div class='add'>+# CONFIG_SENSORS_ATXP1 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_FSCHER is not set</div><div class='add'>+# CONFIG_SENSORS_FSCPOS is not set</div><div class='add'>+# CONFIG_SENSORS_GL518SM is not set</div><div class='add'>+# CONFIG_SENSORS_GL520SM is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM63 is not set</div><div class='add'>+# CONFIG_SENSORS_LM75 is not set</div><div class='add'>+# CONFIG_SENSORS_LM77 is not set</div><div class='add'>+# CONFIG_SENSORS_LM78 is not set</div><div class='add'>+# CONFIG_SENSORS_LM80 is not set</div><div class='add'>+# CONFIG_SENSORS_LM83 is not set</div><div class='add'>+# CONFIG_SENSORS_LM85 is not set</div><div class='add'>+# CONFIG_SENSORS_LM87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM90 is not set</div><div class='add'>+# CONFIG_SENSORS_LM92 is not set</div><div class='add'>+# CONFIG_SENSORS_LM93 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX1619 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6650 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_DME1737 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_THMC50 is not set</div><div class='add'>+# CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='add'>+# CONFIG_SENSORS_W83792D is not set</div><div class='add'>+# CONFIG_SENSORS_W83793 is not set</div><div class='add'>+# CONFIG_SENSORS_W83L785TS is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+# CONFIG_FB_CFB_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_CFB_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+CONFIG_FB_DEFERRED_IO=y</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+CONFIG_FB_OMAP=y</div><div class='add'>+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set</div><div class='add'>+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set</div><div class='add'>+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2</div><div class='add'>+# CONFIG_FB_OMAP_DMA_TUNE is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+CONFIG_FONTS=y</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='add'>+# CONFIG_FONT_6x11 is not set</div><div class='add'>+# CONFIG_FONT_7x14 is not set</div><div class='add'>+# CONFIG_FONT_PEARL_8x8 is not set</div><div class='add'>+# CONFIG_FONT_ACORN_8x8 is not set</div><div class='add'>+# CONFIG_FONT_MINI_4x6 is not set</div><div class='add'>+# CONFIG_FONT_SUN8x16 is not set</div><div class='add'>+# CONFIG_FONT_SUN12x22 is not set</div><div class='add'>+# CONFIG_FONT_10x18 is not set</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+CONFIG_LOGO_LINUX_MONO=y</div><div class='add'>+CONFIG_LOGO_LINUX_VGA16=y</div><div class='add'>+CONFIG_LOGO_LINUX_CLUT224=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+CONFIG_USB_DEBUG=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+# CONFIG_USB_DEVICE_CLASS is not set</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+CONFIG_USB_SUSPEND=y</div><div class='add'>+# CONFIG_USB_PERSIST is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+CONFIG_USB_STORAGE_DATAFAB=y</div><div class='add'>+CONFIG_USB_STORAGE_FREECOM=y</div><div class='add'>+CONFIG_USB_STORAGE_DPCM=y</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+CONFIG_USB_STORAGE_SDDR09=y</div><div class='add'>+CONFIG_USB_STORAGE_SDDR55=y</div><div class='add'>+CONFIG_USB_STORAGE_JUMPSHOT=y</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Serial Converter support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB DSL modem support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_OMAP=y</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M41T80 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_DRV_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_AUTOFS_FS=y</div><div class='add'>+CONFIG_AUTOFS4_FS=y</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_ISO9660_FS=y</div><div class='add'>+CONFIG_JOLIET=y</div><div class='add'>+# CONFIG_ZISOFS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=m</div><div class='add'>+CONFIG_MSDOS_FS=m</div><div class='add'>+CONFIG_VFAT_FS=m</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+# CONFIG_SUNRPC_BIND34 is not set</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+# CONFIG_NLS_CODEPAGE_437 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_1 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Distributed Lock Manager</div><div class='add'>+#</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+CONFIG_DEBUG_PREEMPT=y</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+# CONFIG_DEBUG_ERRORS is not set</div><div class='add'>+# CONFIG_DEBUG_LL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_BLKCIPHER=y</div><div class='add'>+CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=m</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+CONFIG_CRYPTO_PCBC=m</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/omap_innovator_1610_defconfig b/arch/arm/configs/omap_innovator_1610_defconfig<br/>new file mode 100644<br/>index 000000000000..95d9f2be53e0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/omap_innovator_1610_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_innovator_1610_defconfig</a></div><div class='hunk'>@@ -0,0 +1,839 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.23-rc6-omap1</div><div class='add'>+# Tue Sep 18 11:45:05 2007</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLUB_DEBUG=y</div><div class='add'>+# CONFIG_SLAB is not set</div><div class='add'>+CONFIG_SLUB=y</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+CONFIG_DEFAULT_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP_OTG=y</div><div class='add'>+CONFIG_ARCH_OMAP1=y</div><div class='add'>+# CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+# CONFIG_ARCH_OMAP3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+# CONFIG_OMAP_BOOT_TAG is not set</div><div class='add'>+# CONFIG_OMAP_GPIO_SWITCH is not set</div><div class='add'>+CONFIG_OMAP_MUX=y</div><div class='add'>+# CONFIG_OMAP_MUX_DEBUG is not set</div><div class='add'>+CONFIG_OMAP_MUX_WARNINGS=y</div><div class='add'>+# CONFIG_OMAP_STI is not set</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+# CONFIG_OMAP_MMU_FWK is not set</div><div class='add'>+# CONFIG_OMAP_MBOX_FWK is not set</div><div class='add'>+CONFIG_OMAP_MPU_TIMER=y</div><div class='add'>+# CONFIG_OMAP_32K_TIMER is not set</div><div class='add'>+# CONFIG_OMAP_DM_TIMER is not set</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART1=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART3 is not set</div><div class='add'>+CONFIG_OMAP_SERIAL_WAKE=y</div><div class='add'>+# CONFIG_OMAP_DSP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Core Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_OMAP730 is not set</div><div class='add'>+# CONFIG_ARCH_OMAP15XX is not set</div><div class='add'>+CONFIG_ARCH_OMAP16XX=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+CONFIG_MACH_OMAP_INNOVATOR=y</div><div class='add'>+# CONFIG_MACH_OMAP_H2 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_H3 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_OSK is not set</div><div class='add'>+# CONFIG_MACH_NOKIA770 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_GENERIC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP CPU Speed</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set</div><div class='add'>+# CONFIG_OMAP_ARM_216MHZ is not set</div><div class='add'>+CONFIG_OMAP_ARM_192MHZ=y</div><div class='add'>+# CONFIG_OMAP_ARM_168MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_120MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_60MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_30MHZ is not set</div><div class='add'>+# CONFIG_MACH_OMAP_APOLLON_PLUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM926T=y</div><div class='add'>+CONFIG_CPU_32v5=y</div><div class='add'>+CONFIG_CPU_ABRT_EV5TJ=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARM_THUMB is not set</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+CONFIG_CPU_DCACHE_WRITETHROUGH=y</div><div class='add'>+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="mem=32M console=tty0 console=ttyS0,115200 initrd=0x10200000,8M root=/dev/ram0 rw"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+# CONFIG_VFP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+CONFIG_SUSPEND_UP_POSSIBLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=m</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='add'>+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_DMA is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='add'>+CONFIG_SMC91X=y</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+CONFIG_PPP=y</div><div class='add'>+CONFIG_PPP_MULTILINK=y</div><div class='add'>+# CONFIG_PPP_FILTER is not set</div><div class='add'>+# CONFIG_PPP_ASYNC is not set</div><div class='add'>+# CONFIG_PPP_SYNC_TTY is not set</div><div class='add'>+# CONFIG_PPP_DEFLATE is not set</div><div class='add'>+# CONFIG_PPP_BSDCOMP is not set</div><div class='add'>+# CONFIG_PPP_MPPE is not set</div><div class='add'>+# CONFIG_PPPOE is not set</div><div class='add'>+# CONFIG_PPPOL2TP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+CONFIG_SLHC=y</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+# CONFIG_KEYBOARD_ATKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_OMAP=y</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+CONFIG_HW_RANDOM=m</div><div class='add'>+CONFIG_HW_RANDOM_OMAP=m</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU3 is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+# CONFIG_FB_CFB_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_CFB_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+CONFIG_FB_DEFERRED_IO=y</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+CONFIG_FB_MODE_HELPERS=y</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+CONFIG_FB_OMAP=y</div><div class='add'>+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set</div><div class='add'>+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set</div><div class='add'>+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2</div><div class='add'>+# CONFIG_FB_OMAP_DMA_TUNE is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+CONFIG_FONTS=y</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='add'>+# CONFIG_FONT_6x11 is not set</div><div class='add'>+# CONFIG_FONT_7x14 is not set</div><div class='add'>+# CONFIG_FONT_PEARL_8x8 is not set</div><div class='add'>+# CONFIG_FONT_ACORN_8x8 is not set</div><div class='add'>+# CONFIG_FONT_MINI_4x6 is not set</div><div class='add'>+# CONFIG_FONT_SUN8x16 is not set</div><div class='add'>+# CONFIG_FONT_SUN12x22 is not set</div><div class='add'>+# CONFIG_FONT_10x18 is not set</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+CONFIG_LOGO_LINUX_MONO=y</div><div class='add'>+CONFIG_LOGO_LINUX_VGA16=y</div><div class='add'>+CONFIG_LOGO_LINUX_CLUT224=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+CONFIG_HID_DEBUG=y</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_AUTOFS_FS=y</div><div class='add'>+CONFIG_AUTOFS4_FS=y</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+# CONFIG_TMPFS is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+# CONFIG_ROOT_NFS is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_SUNRPC_BIND34 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NLS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Distributed Lock Manager</div><div class='add'>+#</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+# CONFIG_SLUB_DEBUG_ON is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/omap_osk_5912_defconfig b/arch/arm/configs/omap_osk_5912_defconfig<br/>index d4ca5e6e4ffa..b68e0144cab5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/omap_osk_5912_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/configs/omap_osk_5912_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/omap_osk_5912_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_osk_5912_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25-rc3</div><div class='del'>-# Mon Mar  3 03:35:17 2008</div><div class='add'>+# Linux kernel version: 2.6.24-rc3-omap1</div><div class='add'>+# Fri Nov 23 12:24:12 2007</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ARM=y</div><div class='ctx'> CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='hunk'>@@ -21,7 +21,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='del'>-CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_VECTORS_BASE=0xffff0000</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -40,22 +39,17 @@ CONFIG_SYSVIPC_SYSCTL=y</div><div class='ctx'> # CONFIG_POSIX_MQUEUE is not set</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT is not set</div><div class='ctx'> # CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_CGROUPS is not set</div><div class='del'>-CONFIG_GROUP_SCHED=y</div><div class='ctx'> CONFIG_FAIR_GROUP_SCHED=y</div><div class='del'>-# CONFIG_RT_GROUP_SCHED is not set</div><div class='del'>-CONFIG_USER_SCHED=y</div><div class='del'>-# CONFIG_CGROUP_SCHED is not set</div><div class='del'>-# CONFIG_SYSFS_DEPRECATED is not set</div><div class='add'>+CONFIG_FAIR_USER_SCHED=y</div><div class='add'>+# CONFIG_FAIR_CGROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='del'>-CONFIG_NAMESPACES=y</div><div class='del'>-# CONFIG_UTS_NS is not set</div><div class='del'>-# CONFIG_IPC_NS is not set</div><div class='del'>-# CONFIG_USER_NS is not set</div><div class='del'>-# CONFIG_PID_NS is not set</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='ctx'> CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='hunk'>@@ -69,26 +63,18 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='del'>-CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_ANON_INODES=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SIGNALFD=y</div><div class='del'>-CONFIG_TIMERFD=y</div><div class='ctx'> CONFIG_EVENTFD=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_VM_EVENT_COUNTERS=y</div><div class='del'>-CONFIG_SLAB=y</div><div class='del'>-# CONFIG_SLUB is not set</div><div class='add'>+CONFIG_SLUB_DEBUG=y</div><div class='add'>+# CONFIG_SLAB is not set</div><div class='add'>+CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='del'>-# CONFIG_PROFILING is not set</div><div class='del'>-# CONFIG_MARKERS is not set</div><div class='del'>-CONFIG_HAVE_OPROFILE=y</div><div class='del'>-# CONFIG_KPROBES is not set</div><div class='del'>-CONFIG_HAVE_KPROBES=y</div><div class='del'>-CONFIG_PROC_PAGE_MONITOR=y</div><div class='del'>-CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='hunk'>@@ -116,8 +102,6 @@ CONFIG_IOSCHED_CFQ=y</div><div class='ctx'> CONFIG_DEFAULT_CFQ=y</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='del'>-CONFIG_CLASSIC_RCU=y</div><div class='del'>-# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # System Type</div><div class='hunk'>@@ -146,7 +130,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # CONFIG_ARCH_KS8695 is not set</div><div class='ctx'> # CONFIG_ARCH_NS9XXX is not set</div><div class='ctx'> # CONFIG_ARCH_MXC is not set</div><div class='del'>-# CONFIG_ARCH_ORION is not set</div><div class='ctx'> # CONFIG_ARCH_PNX4008 is not set</div><div class='ctx'> # CONFIG_ARCH_PXA is not set</div><div class='ctx'> # CONFIG_ARCH_RPC is not set</div><div class='hunk'>@@ -156,7 +139,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # CONFIG_ARCH_LH7A40X is not set</div><div class='ctx'> # CONFIG_ARCH_DAVINCI is not set</div><div class='ctx'> CONFIG_ARCH_OMAP=y</div><div class='del'>-# CONFIG_ARCH_MSM7X00A is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # TI OMAP Implementations</div><div class='hunk'>@@ -164,16 +146,22 @@ CONFIG_ARCH_OMAP=y</div><div class='ctx'> CONFIG_ARCH_OMAP_OTG=y</div><div class='ctx'> CONFIG_ARCH_OMAP1=y</div><div class='ctx'> # CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+# CONFIG_ARCH_OMAP3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # OMAP Feature Selections</div><div class='ctx'> #</div><div class='add'>+CONFIG_OMAP_DEBUG_SRAM_PATCH=y</div><div class='ctx'> CONFIG_OMAP_RESET_CLOCKS=y</div><div class='add'>+# CONFIG_OMAP_BOOT_TAG is not set</div><div class='add'>+# CONFIG_OMAP_GPIO_SWITCH is not set</div><div class='ctx'> CONFIG_OMAP_MUX=y</div><div class='ctx'> # CONFIG_OMAP_MUX_DEBUG is not set</div><div class='ctx'> CONFIG_OMAP_MUX_WARNINGS=y</div><div class='add'>+# CONFIG_OMAP_STI is not set</div><div class='ctx'> CONFIG_OMAP_MCBSP=y</div><div class='ctx'> # CONFIG_OMAP_MMU_FWK is not set</div><div class='add'>+# CONFIG_OMAP_MBOX_FWK is not set</div><div class='ctx'> # CONFIG_OMAP_MPU_TIMER is not set</div><div class='ctx'> CONFIG_OMAP_32K_TIMER=y</div><div class='ctx'> CONFIG_OMAP_32K_TIMER_HZ=128</div><div class='hunk'>@@ -182,6 +170,7 @@ CONFIG_OMAP_LL_DEBUG_UART1=y</div><div class='ctx'> # CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='ctx'> # CONFIG_OMAP_LL_DEBUG_UART3 is not set</div><div class='ctx'> CONFIG_OMAP_SERIAL_WAKE=y</div><div class='add'>+# CONFIG_OMAP_DSP is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # OMAP Core Type</div><div class='hunk'>@@ -193,13 +182,13 @@ CONFIG_ARCH_OMAP16XX=y</div><div class='ctx'> #</div><div class='ctx'> # OMAP Board Type</div><div class='ctx'> #</div><div class='del'>-CONFIG_MACH_OMAP_INNOVATOR=y</div><div class='del'>-CONFIG_MACH_OMAP_H2=y</div><div class='del'>-CONFIG_MACH_OMAP_H3=y</div><div class='add'>+# CONFIG_MACH_OMAP_INNOVATOR is not set</div><div class='add'>+# CONFIG_MACH_OMAP_H2 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_H3 is not set</div><div class='ctx'> CONFIG_MACH_OMAP_OSK=y</div><div class='ctx'> # CONFIG_OMAP_OSK_MISTRAL is not set</div><div class='del'>-CONFIG_MACH_NOKIA770=y</div><div class='del'>-CONFIG_MACH_OMAP_GENERIC=y</div><div class='add'>+# CONFIG_MACH_NOKIA770 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_GENERIC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # OMAP CPU Speed</div><div class='hunk'>@@ -227,6 +216,7 @@ CONFIG_CPU_32=y</div><div class='ctx'> CONFIG_CPU_ARM926T=y</div><div class='ctx'> CONFIG_CPU_32v5=y</div><div class='ctx'> CONFIG_CPU_ABRT_EV5TJ=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='ctx'> CONFIG_CPU_CACHE_VIVT=y</div><div class='ctx'> CONFIG_CPU_COPY_V4WB=y</div><div class='ctx'> CONFIG_CPU_TLB_V4WBI=y</div><div class='hunk'>@@ -264,12 +254,11 @@ CONFIG_OMAP_CF=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_TICK_ONESHOT=y</div><div class='ctx'> CONFIG_NO_HZ=y</div><div class='del'>-CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='ctx'> CONFIG_HZ=128</div><div class='del'>-CONFIG_AEABI=y</div><div class='del'>-CONFIG_OABI_COMPAT=y</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='ctx'> # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='hunk'>@@ -295,7 +284,6 @@ CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='ctx'> CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw"</div><div class='ctx'> # CONFIG_XIP_KERNEL is not set</div><div class='ctx'> # CONFIG_KEXEC is not set</div><div class='del'>-# CONFIG_ATAGS_PROC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CPU Frequency scaling</div><div class='hunk'>@@ -320,6 +308,7 @@ CONFIG_FPE_NWFPE=y</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_AOUT is not set</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Power management options</div><div class='hunk'>@@ -328,10 +317,9 @@ CONFIG_PM=y</div><div class='ctx'> # CONFIG_PM_LEGACY is not set</div><div class='ctx'> # CONFIG_PM_DEBUG is not set</div><div class='ctx'> CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND_UP_POSSIBLE=y</div><div class='ctx'> CONFIG_SUSPEND=y</div><div class='del'>-CONFIG_SUSPEND_FREEZER=y</div><div class='ctx'> # CONFIG_APM_EMULATION is not set</div><div class='del'>-CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Networking</div><div class='hunk'>@@ -348,7 +336,6 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> # CONFIG_XFRM_MIGRATE is not set</div><div class='del'>-# CONFIG_XFRM_STATISTICS is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_MULTICAST=y</div><div class='hunk'>@@ -404,7 +391,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_PKTGEN is not set</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='del'>-# CONFIG_CAN is not set</div><div class='ctx'> # CONFIG_IRDA is not set</div><div class='ctx'> # CONFIG_BT is not set</div><div class='ctx'> # CONFIG_AF_RXRPC is not set</div><div class='hunk'>@@ -517,13 +503,11 @@ CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='del'>-# CONFIG_BLK_DEV_XIP is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='del'>-# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='del'>-CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=m</div><div class='ctx'> CONFIG_BLK_DEV_IDE=m</div><div class='ctx'> </div><div class='hunk'>@@ -545,6 +529,7 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_IDE_GENERIC is not set</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='add'>+# CONFIG_IDE_ARM is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDEDMA is not set</div><div class='ctx'> CONFIG_IDE_ARCH_OBSOLETE_INIT=y</div><div class='ctx'> # CONFIG_BLK_DEV_HD is not set</div><div class='hunk'>@@ -578,7 +563,6 @@ CONFIG_SMC91X=y</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -600,6 +584,7 @@ CONFIG_PPP_MULTILINK=y</div><div class='ctx'> # CONFIG_PPPOL2TP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='ctx'> CONFIG_SLHC=y</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='ctx'> # CONFIG_NET_POLL_CONTROLLER is not set</div><div class='hunk'>@@ -696,7 +681,6 @@ CONFIG_HW_RANDOM_OMAP=m</div><div class='ctx'> # CONFIG_SYNCLINK_CS is not set</div><div class='ctx'> # CONFIG_CARDMAN_4000 is not set</div><div class='ctx'> # CONFIG_CARDMAN_4040 is not set</div><div class='del'>-# CONFIG_IPWIRELESS is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_I2C=y</div><div class='hunk'>@@ -724,13 +708,17 @@ CONFIG_I2C_OMAP=y</div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='del'>-# CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_ISP1301_OMAP is not set</div><div class='ctx'> CONFIG_TPS65010=y</div><div class='add'>+# CONFIG_SENSORS_TLV320AIC23 is not set</div><div class='add'>+# CONFIG_GPIOEXPANDER_OMAP is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CORE is not set</div><div class='hunk'>@@ -755,7 +743,6 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_ADM1031 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM9240 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7470 is not set</div><div class='del'>-# CONFIG_SENSORS_ADT7473 is not set</div><div class='ctx'> # CONFIG_SENSORS_ATXP1 is not set</div><div class='ctx'> # CONFIG_SENSORS_DS1621 is not set</div><div class='ctx'> # CONFIG_SENSORS_F71805F is not set</div><div class='hunk'>@@ -783,7 +770,6 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M1 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M192 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47B397 is not set</div><div class='del'>-# CONFIG_SENSORS_ADS7828 is not set</div><div class='ctx'> # CONFIG_SENSORS_THMC50 is not set</div><div class='ctx'> # CONFIG_SENSORS_VT1211 is not set</div><div class='ctx'> # CONFIG_SENSORS_W83781D is not set</div><div class='hunk'>@@ -791,7 +777,6 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83792D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83793 is not set</div><div class='ctx'> # CONFIG_SENSORS_W83L785TS is not set</div><div class='del'>-# CONFIG_SENSORS_W83L786NG is not set</div><div class='ctx'> # CONFIG_SENSORS_W83627HF is not set</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='hunk'>@@ -807,7 +792,6 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='del'>-# CONFIG_MFD_ASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -822,11 +806,11 @@ CONFIG_DAB=y</div><div class='ctx'> # CONFIG_VGASTATE is not set</div><div class='ctx'> CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> CONFIG_FB=y</div><div class='del'>-CONFIG_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB_DDC is not set</div><div class='del'>-# CONFIG_FB_CFB_FILLRECT is not set</div><div class='del'>-# CONFIG_FB_CFB_COPYAREA is not set</div><div class='del'>-# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=y</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=y</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set</div><div class='ctx'> # CONFIG_FB_SYS_FILLRECT is not set</div><div class='ctx'> # CONFIG_FB_SYS_COPYAREA is not set</div><div class='hunk'>@@ -844,7 +828,11 @@ CONFIG_FB_MODE_HELPERS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_FB_S1D13XXX is not set</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='del'>-# CONFIG_FB_OMAP is not set</div><div class='add'>+CONFIG_FB_OMAP=y</div><div class='add'>+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set</div><div class='add'>+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set</div><div class='add'>+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2</div><div class='add'>+# CONFIG_FB_OMAP_DMA_TUNE is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -891,8 +879,16 @@ CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> # CONFIG_USB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='hunk'>@@ -900,6 +896,11 @@ CONFIG_RTC_LIB=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -913,10 +914,12 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='ctx'> # CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='del'>-CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_AUTOFS_FS=y</div><div class='ctx'> CONFIG_AUTOFS4_FS=y</div><div class='ctx'> # CONFIG_FUSE_FS is not set</div><div class='hunk'>@@ -970,10 +973,8 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> # CONFIG_JFFS2_RUBIN is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='del'>-# CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='del'>-# CONFIG_ROMFS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='ctx'> CONFIG_NETWORK_FILESYSTEMS=y</div><div class='hunk'>@@ -1043,6 +1044,9 @@ CONFIG_NLS_ISO8859_1=m</div><div class='ctx'> # CONFIG_NLS_KOI8_U is not set</div><div class='ctx'> # CONFIG_NLS_UTF8 is not set</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='add'>+CONFIG_INSTRUMENTATION=y</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -1055,6 +1059,7 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+# CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='hunk'>@@ -1066,51 +1071,7 @@ CONFIG_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_KEYS is not set</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='del'>-CONFIG_CRYPTO=y</div><div class='del'>-# CONFIG_CRYPTO_SEQIV is not set</div><div class='del'>-# CONFIG_CRYPTO_MANAGER is not set</div><div class='del'>-# CONFIG_CRYPTO_HMAC is not set</div><div class='del'>-# CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='del'>-# CONFIG_CRYPTO_MD4 is not set</div><div class='del'>-# CONFIG_CRYPTO_MD5 is not set</div><div class='del'>-# CONFIG_CRYPTO_SHA1 is not set</div><div class='del'>-# CONFIG_CRYPTO_SHA256 is not set</div><div class='del'>-# CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='del'>-# CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-# CONFIG_CRYPTO_ECB is not set</div><div class='del'>-# CONFIG_CRYPTO_CBC is not set</div><div class='del'>-# CONFIG_CRYPTO_PCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CTR is not set</div><div class='del'>-# CONFIG_CRYPTO_GCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-# CONFIG_CRYPTO_DES is not set</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='del'>-# CONFIG_CRYPTO_AES is not set</div><div class='del'>-# CONFIG_CRYPTO_CAST5 is not set</div><div class='del'>-# CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='del'>-# CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='del'>-# CONFIG_CRYPTO_SALSA20 is not set</div><div class='del'>-# CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='del'>-# CONFIG_CRYPTO_LZO is not set</div><div class='del'>-CONFIG_CRYPTO_HW=y</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='head'>diff --git a/arch/arm/configs/omap_perseus2_730_defconfig b/arch/arm/configs/omap_perseus2_730_defconfig<br/>new file mode 100644<br/>index 000000000000..b94800c0e000<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/omap_perseus2_730_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/omap_perseus2_730_defconfig</a></div><div class='hunk'>@@ -0,0 +1,928 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.23-rc6-omap1</div><div class='add'>+# Tue Sep 18 11:45:12 2007</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+CONFIG_DEFAULT_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_MXC is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP_OTG=y</div><div class='add'>+CONFIG_ARCH_OMAP1=y</div><div class='add'>+# CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+# CONFIG_ARCH_OMAP3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+# CONFIG_OMAP_BOOT_TAG is not set</div><div class='add'>+# CONFIG_OMAP_GPIO_SWITCH is not set</div><div class='add'>+CONFIG_OMAP_MUX=y</div><div class='add'>+# CONFIG_OMAP_MUX_DEBUG is not set</div><div class='add'>+CONFIG_OMAP_MUX_WARNINGS=y</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+# CONFIG_OMAP_MMU_FWK is not set</div><div class='add'>+# CONFIG_OMAP_MBOX_FWK is not set</div><div class='add'>+CONFIG_OMAP_MPU_TIMER=y</div><div class='add'>+# CONFIG_OMAP_32K_TIMER is not set</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART1=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART3 is not set</div><div class='add'>+CONFIG_OMAP_SERIAL_WAKE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Core Type</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP730=y</div><div class='add'>+# CONFIG_ARCH_OMAP15XX is not set</div><div class='add'>+# CONFIG_ARCH_OMAP16XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+CONFIG_MACH_OMAP_PERSEUS2=y</div><div class='add'>+# CONFIG_MACH_OMAP_FSAMPLE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP CPU Speed</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set</div><div class='add'>+# CONFIG_OMAP_ARM_195MHZ is not set</div><div class='add'>+CONFIG_OMAP_ARM_182MHZ=y</div><div class='add'>+# CONFIG_OMAP_ARM_168MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_120MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_60MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_30MHZ is not set</div><div class='add'>+# CONFIG_MACH_OMAP_APOLLON_PLUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM926T=y</div><div class='add'>+CONFIG_CPU_32v5=y</div><div class='add'>+CONFIG_CPU_ABRT_EV5TJ=y</div><div class='add'>+CONFIG_CPU_PABRT_NOIFAR=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARM_THUMB is not set</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI_SYSCALL is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_BOUNCE=y</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_LEDS=y</div><div class='add'>+CONFIG_LEDS_CPU=y</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="mem=32M console=ttyS0,115200 ip=dhcp"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+# CONFIG_VFP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+# CONFIG_PM_LEGACY is not set</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND_UP_POSSIBLE=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+# CONFIG_APM_EMULATION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+# CONFIG_MTD_CFI_ADV_OPTIONS is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+CONFIG_MTD_CFI_INTELEXT=y</div><div class='add'>+# CONFIG_MTD_CFI_AMDSTD is not set</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PHYSMAP is not set</div><div class='add'>+# CONFIG_MTD_ARM_INTEGRATOR is not set</div><div class='add'>+CONFIG_MTD_OMAP_NOR=y</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+CONFIG_MTD_NAND=y</div><div class='add'>+# CONFIG_MTD_NAND_VERIFY_WRITE is not set</div><div class='add'>+# CONFIG_MTD_NAND_ECC_SMC is not set</div><div class='add'>+# CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='add'>+CONFIG_MTD_NAND_OMAP=y</div><div class='add'>+CONFIG_MTD_NAND_IDS=y</div><div class='add'>+# CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='add'>+# CONFIG_MTD_NAND_NANDSIM is not set</div><div class='add'>+# CONFIG_MTD_NAND_PLATFORM is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='add'>+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_DMA is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='add'>+CONFIG_SMC91X=y</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+# CONFIG_KEYBOARD_ATKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_OMAP=y</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+CONFIG_HW_RANDOM=m</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU3 is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+# CONFIG_FB_CFB_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_CFB_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+CONFIG_FB_SYS_FILLRECT=y</div><div class='add'>+CONFIG_FB_SYS_COPYAREA=y</div><div class='add'>+CONFIG_FB_SYS_IMAGEBLIT=y</div><div class='add'>+CONFIG_FB_SYS_FOPS=y</div><div class='add'>+CONFIG_FB_DEFERRED_IO=y</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+CONFIG_FB_MODE_HELPERS=y</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+# CONFIG_FB_OMAP is not set</div><div class='add'>+CONFIG_FB_VIRTUAL=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE is not set</div><div class='add'>+# CONFIG_LOGO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_DRV_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+# CONFIG_TMPFS is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+# CONFIG_NFS_V3 is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_SUNRPC_BIND34 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NLS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Distributed Lock Manager</div><div class='add'>+#</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig<br/>index 9578b5d9f9c7..4017d83c9d2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/orion5x_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/configs/orion5x_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/orion5x_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/orion5x_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Mon Jun  2 23:54:48 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Fri Aug 22 12:38:51 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ARM=y</div><div class='ctx'> CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='hunk'>@@ -12,6 +12,7 @@ CONFIG_MMU=y</div><div class='ctx'> # CONFIG_NO_IOPORT is not set</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> CONFIG_HARDIRQS_SW_RESEND=y</div><div class='hunk'>@@ -23,6 +24,7 @@ CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y</div><div class='ctx'> CONFIG_VECTORS_BASE=0xffff0000</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='hunk'>@@ -56,7 +58,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -83,11 +84,17 @@ CONFIG_PROFILING=y</div><div class='ctx'> CONFIG_OPROFILE=y</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> CONFIG_KPROBES=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='ctx'> CONFIG_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_HAVE_GENERIC_DMA_COHERENT=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='hunk'>@@ -97,12 +104,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -128,7 +136,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # CONFIG_ARCH_AT91 is not set</div><div class='ctx'> # CONFIG_ARCH_CLPS7500 is not set</div><div class='ctx'> # CONFIG_ARCH_CLPS711X is not set</div><div class='del'>-# CONFIG_ARCH_CO285 is not set</div><div class='ctx'> # CONFIG_ARCH_EBSA110 is not set</div><div class='ctx'> # CONFIG_ARCH_EP93XX is not set</div><div class='ctx'> # CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='hunk'>@@ -142,8 +149,11 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # CONFIG_ARCH_IXP2000 is not set</div><div class='ctx'> # CONFIG_ARCH_IXP4XX is not set</div><div class='ctx'> # CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KIRKWOOD is not set</div><div class='ctx'> # CONFIG_ARCH_KS8695 is not set</div><div class='ctx'> # CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_LOKI is not set</div><div class='add'>+# CONFIG_ARCH_MV78XX0 is not set</div><div class='ctx'> # CONFIG_ARCH_MXC is not set</div><div class='ctx'> CONFIG_ARCH_ORION5X=y</div><div class='ctx'> # CONFIG_ARCH_PNX4008 is not set</div><div class='hunk'>@@ -195,7 +205,7 @@ CONFIG_CPU_ABRT_EV5T=y</div><div class='ctx'> CONFIG_CPU_PABRT_NOIFAR=y</div><div class='ctx'> CONFIG_CPU_CACHE_VIVT=y</div><div class='ctx'> CONFIG_CPU_COPY_FEROCEON=y</div><div class='del'>-CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_TLB_FEROCEON=y</div><div class='ctx'> CONFIG_CPU_CP15=y</div><div class='ctx'> CONFIG_CPU_CP15_MMU=y</div><div class='ctx'> </div><div class='hunk'>@@ -280,10 +290,6 @@ CONFIG_BINFMT_ELF=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -361,6 +367,7 @@ CONFIG_NET_PKTGEN=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> # CONFIG_IEEE80211 is not set</div><div class='ctx'> # CONFIG_RFKILL is not set</div><div class='hunk'>@@ -377,6 +384,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -499,6 +508,7 @@ CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -575,6 +585,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='hunk'>@@ -641,11 +652,14 @@ CONFIG_SATA_MV=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -694,7 +708,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -710,6 +723,7 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> CONFIG_MV643XX_ETH=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> # CONFIG_NETDEV_10000 is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='hunk'>@@ -757,7 +771,14 @@ CONFIG_INPUT_EVDEV=y</div><div class='ctx'> #</div><div class='ctx'> # Input Device Drivers</div><div class='ctx'> #</div><div class='del'>-# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+# CONFIG_KEYBOARD_ATKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_GPIO=y</div><div class='ctx'> # CONFIG_INPUT_MOUSE is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='ctx'> # CONFIG_INPUT_TABLET is not set</div><div class='hunk'>@@ -808,44 +829,65 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='del'>-# CONFIG_I2C_GPIO is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+CONFIG_I2C_MV64XXX=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='del'>-CONFIG_I2C_MV64XXX=y</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -858,6 +900,7 @@ CONFIG_I2C_MV64XXX=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -877,7 +920,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_GL520SM is not set</div><div class='ctx'> # CONFIG_SENSORS_IT87 is not set</div><div class='ctx'> # CONFIG_SENSORS_LM63 is not set</div><div class='del'>-# CONFIG_SENSORS_LM75 is not set</div><div class='add'>+CONFIG_SENSORS_LM75=y</div><div class='ctx'> # CONFIG_SENSORS_LM77 is not set</div><div class='ctx'> # CONFIG_SENSORS_LM78 is not set</div><div class='ctx'> # CONFIG_SENSORS_LM80 is not set</div><div class='hunk'>@@ -921,9 +964,12 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='del'>-# CONFIG_MFD_ASIC3 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='add'>+# CONFIG_MFD_T7L66XB is not set</div><div class='add'>+# CONFIG_MFD_TC6387XB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -954,10 +1000,6 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -988,6 +1030,7 @@ CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+# CONFIG_USB_MON is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1030,6 +1073,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1038,7 +1082,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-# CONFIG_USB_MON is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1051,7 +1094,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1077,7 +1119,9 @@ CONFIG_LEDS_CLASS=y</div><div class='ctx'> #</div><div class='ctx'> # LED drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_LEDS_PCA9532 is not set</div><div class='ctx'> CONFIG_LEDS_GPIO=y</div><div class='add'>+# CONFIG_LEDS_PCA955X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # LED Triggers</div><div class='hunk'>@@ -1111,11 +1155,12 @@ CONFIG_RTC_DRV_DS1307=y</div><div class='ctx'> CONFIG_RTC_DRV_RS5C372=y</div><div class='ctx'> # CONFIG_RTC_DRV_ISL1208 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_X1205 is not set</div><div class='del'>-# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+CONFIG_RTC_DRV_PCF8563=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> CONFIG_RTC_DRV_M41T80=y</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80_WDT is not set</div><div class='del'>-# CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+CONFIG_RTC_DRV_S35390A=y</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -1136,6 +1181,27 @@ CONFIG_RTC_DRV_M41T80=y</div><div class='ctx'> #</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='add'>+CONFIG_DMADEVICES=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_MV_XOR=y</div><div class='add'>+CONFIG_DMA_ENGINE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_DMA is not set</div><div class='add'>+# CONFIG_DMATEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Voltage and Current regulators</div><div class='add'>+#</div><div class='add'>+# CONFIG_REGULATOR is not set</div><div class='add'>+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set</div><div class='add'>+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set</div><div class='add'>+# CONFIG_REGULATOR_BQ24022 is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1215,6 +1281,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1225,13 +1292,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1317,6 +1383,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> CONFIG_SCHEDSTATS=y</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1331,11 +1399,13 @@ CONFIG_DEBUG_PREEMPT=y</div><div class='ctx'> # CONFIG_LOCK_STAT is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='ctx'> # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+CONFIG_STACKTRACE=y</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='hunk'>@@ -1345,7 +1415,18 @@ CONFIG_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_LKDTM is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+CONFIG_LATENCYTOP=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_IRQSOFF_TRACER is not set</div><div class='add'>+# CONFIG_PREEMPT_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> CONFIG_DEBUG_USER=y</div><div class='ctx'> CONFIG_DEBUG_ERRORS=y</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='hunk'>@@ -1358,6 +1439,7 @@ CONFIG_DEBUG_LL=y</div><div class='ctx'> # CONFIG_KEYS is not set</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+CONFIG_ASYNC_CORE=y</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1403,6 +1485,10 @@ CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1444,6 +1530,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/arm/configs/palmte_defconfig b/arch/arm/configs/palmte_defconfig<br/>new file mode 100644<br/>index 000000000000..40fc6a778e00<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/palmte_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/palmte_defconfig</a></div><div class='hunk'>@@ -0,0 +1,761 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.22-rc1-omap1</div><div class='add'>+# Sat May 19 11:04:27 2007</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+# CONFIG_SWAP is not set</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+# CONFIG_IPC_NS is not set</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_BLK_DEV_INITRD is not set</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MODULES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP1=y</div><div class='add'>+# CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+# CONFIG_OMAP_BOOT_TAG is not set</div><div class='add'>+CONFIG_OMAP_GPIO_SWITCH=y</div><div class='add'>+CONFIG_OMAP_MUX=y</div><div class='add'>+# CONFIG_OMAP_MUX_DEBUG is not set</div><div class='add'>+CONFIG_OMAP_MUX_WARNINGS=y</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+# CONFIG_OMAP_MMU_FWK is not set</div><div class='add'>+# CONFIG_OMAP_MBOX_FWK is not set</div><div class='add'>+CONFIG_OMAP_MPU_TIMER=y</div><div class='add'>+# CONFIG_OMAP_32K_TIMER is not set</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART1=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART3 is not set</div><div class='add'>+CONFIG_OMAP_SERIAL_WAKE=y</div><div class='add'>+# CONFIG_OMAP_DSP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Core Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_OMAP730 is not set</div><div class='add'>+CONFIG_ARCH_OMAP15XX=y</div><div class='add'>+# CONFIG_ARCH_OMAP16XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_MACH_OMAP_INNOVATOR is not set</div><div class='add'>+# CONFIG_MACH_VOICEBLUE is not set</div><div class='add'>+CONFIG_MACH_OMAP_PALMTE=y</div><div class='add'>+# CONFIG_MACH_OMAP_PALMZ71 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_PALMTT is not set</div><div class='add'>+# CONFIG_MACH_SX1 is not set</div><div class='add'>+# CONFIG_MACH_AMS_DELTA is not set</div><div class='add'>+# CONFIG_MACH_OMAP_GENERIC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP CPU Speed</div><div class='add'>+#</div><div class='add'>+CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y</div><div class='add'>+# CONFIG_OMAP_ARM_168MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_150MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_120MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_60MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_30MHZ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM925T=y</div><div class='add'>+CONFIG_CPU_32v4T=y</div><div class='add'>+CONFIG_CPU_ABRT_EV4T=y</div><div class='add'>+CONFIG_CPU_CACHE_V4WT=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARM_THUMB is not set</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE=""</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+# CONFIG_STANDALONE is not set</div><div class='add'>+# CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PNPACPI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+# CONFIG_BLK_DEV_LOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_RAM is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=320</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+CONFIG_OMAP_RTC=y</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLINK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+# CONFIG_FB_CFB_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_CFB_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+CONFIG_FB_DEFERRED_IO=y</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+CONFIG_FB_OMAP=y</div><div class='add'>+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set</div><div class='add'>+# CONFIG_FB_OMAP_LCD_MIPID is not set</div><div class='add'>+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set</div><div class='add'>+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2</div><div class='add'>+# CONFIG_FB_OMAP_DMA_TUNE is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+# CONFIG_FONTS is not set</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+# CONFIG_LOGO_LINUX_MONO is not set</div><div class='add'>+# CONFIG_LOGO_LINUX_VGA16 is not set</div><div class='add'>+CONFIG_LOGO_LINUX_CLUT224=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# HID Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='add'>+# CONFIG_USB_GADGET_MUSB_HDRC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_GADGET=y</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG_FILES is not set</div><div class='add'>+CONFIG_USB_GADGET_SELECTED=y</div><div class='add'>+# CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='add'>+# CONFIG_USB_GADGET_NET2280 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_GOKU is not set</div><div class='add'>+# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='add'>+CONFIG_USB_GADGET_OMAP=y</div><div class='add'>+CONFIG_USB_OMAP=y</div><div class='add'>+# CONFIG_USB_GADGET_AT91 is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUMMY_HCD is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUALSPEED is not set</div><div class='add'>+CONFIG_USB_ZERO=y</div><div class='add'>+# CONFIG_USB_ETH is not set</div><div class='add'>+# CONFIG_USB_GADGETFS is not set</div><div class='add'>+# CONFIG_USB_FILE_STORAGE is not set</div><div class='add'>+# CONFIG_USB_G_SERIAL is not set</div><div class='add'>+# CONFIG_USB_MIDI_GADGET is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_INOTIFY is not set</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=850</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+# CONFIG_NLS_CODEPAGE_437 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+CONFIG_NLS_CODEPAGE_850=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+CONFIG_NLS_ISO8859_1=y</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/palmtt_defconfig b/arch/arm/configs/palmtt_defconfig<br/>new file mode 100644<br/>index 000000000000..e54ced41217e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/palmtt_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/palmtt_defconfig</a></div><div class='hunk'>@@ -0,0 +1,844 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.19-rc3-omap1</div><div class='add'>+# Sun Oct 29 00:36:12 2006</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+# CONFIG_GENERIC_TIME is not set</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+# CONFIG_IPC_NS is not set</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+# CONFIG_SYSCTL_SYSCALL is not set</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MODULES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+# CONFIG_IOSCHED_AS is not set</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+CONFIG_DEFAULT_NOOP=y</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="noop"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP1=y</div><div class='add'>+# CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+# CONFIG_OMAP_BOOT_TAG is not set</div><div class='add'>+# CONFIG_OMAP_GPIO_SWITCH is not set</div><div class='add'>+CONFIG_OMAP_MUX=y</div><div class='add'>+# CONFIG_OMAP_MUX_DEBUG is not set</div><div class='add'>+CONFIG_OMAP_MUX_WARNINGS=y</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+CONFIG_OMAP_MPU_TIMER=y</div><div class='add'>+# CONFIG_OMAP_32K_TIMER is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART1 is not set</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART2=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART3 is not set</div><div class='add'>+CONFIG_OMAP_SERIAL_WAKE=y</div><div class='add'>+CONFIG_OMAP_DSP=y</div><div class='add'>+# CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set</div><div class='add'>+# CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set</div><div class='add'>+CONFIG_OMAP_DSP_FBEXPORT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Core Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_OMAP730 is not set</div><div class='add'>+CONFIG_ARCH_OMAP15XX=y</div><div class='add'>+# CONFIG_ARCH_OMAP16XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_MACH_OMAP_INNOVATOR is not set</div><div class='add'>+# CONFIG_MACH_VOICEBLUE is not set</div><div class='add'>+# CONFIG_MACH_OMAP_PALMTE is not set</div><div class='add'>+# CONFIG_MACH_OMAP_PALMZ71 is not set</div><div class='add'>+CONFIG_MACH_OMAP_PALMTT=y</div><div class='add'>+# CONFIG_MACH_AMS_DELTA is not set</div><div class='add'>+# CONFIG_MACH_OMAP_GENERIC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP CPU Speed</div><div class='add'>+#</div><div class='add'>+CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y</div><div class='add'>+# CONFIG_OMAP_ARM_168MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_150MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_120MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_60MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_30MHZ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM925T=y</div><div class='add'>+CONFIG_CPU_32v4T=y</div><div class='add'>+CONFIG_CPU_ABRT_EV4T=y</div><div class='add'>+CONFIG_CPU_CACHE_V4WT=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+# CONFIG_NO_IDLE_HZ is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="root=/dev/mmcblk0p2 rw init=/init"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+# CONFIG_APM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+CONFIG_NET_KEY=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+# CONFIG_IP_PNP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='add'>+# CONFIG_INET_DIAG is not set</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+# CONFIG_BLK_DEV_LOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_RAM is not set</div><div class='add'>+# CONFIG_BLK_DEV_INITRD is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEVICES is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=320</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+CONFIG_INPUT_TSDEV=y</div><div class='add'>+CONFIG_INPUT_TSDEV_SCREEN_X=320</div><div class='add'>+CONFIG_INPUT_TSDEV_SCREEN_Y=320</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+CONFIG_INPUT_TOUCHSCREEN=y</div><div class='add'>+CONFIG_TOUCHSCREEN_ADS7846=y</div><div class='add'>+# CONFIG_TOUCHSCREEN_GUNZE is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_ELO is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MTOUCH is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MK712 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_PENMOUNT is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TSC2102 is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_OMAP_RTC is not set</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Master Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI_BITBANG=y</div><div class='add'>+CONFIG_SPI_OMAP_UWIRE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Protocol Masters</div><div class='add'>+#</div><div class='add'>+# CONFIG_TSC2102 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware Monitoring support</div><div class='add'>+#</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_LM70 is not set</div><div class='add'>+# CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_SGI_IOC4 is not set</div><div class='add'>+# CONFIG_TIFM_CORE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+CONFIG_NEW_LEDS=y</div><div class='add'>+CONFIG_LEDS_CLASS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_LEDS_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+CONFIG_LEDS_TRIGGERS=y</div><div class='add'>+CONFIG_LEDS_TRIGGER_TIMER=y</div><div class='add'>+CONFIG_LEDS_TRIGGER_HEARTBEAT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+CONFIG_FIRMWARE_EDID=y</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+# CONFIG_FB_CFB_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_CFB_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+CONFIG_FB_OMAP=y</div><div class='add'>+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set</div><div class='add'>+# CONFIG_FB_OMAP_LCD_MIPID is not set</div><div class='add'>+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set</div><div class='add'>+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2</div><div class='add'>+# CONFIG_FB_OMAP_DMA_TUNE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+# CONFIG_FONTS is not set</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Logo configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_LOGO is not set</div><div class='add'>+CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='add'>+CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='add'>+CONFIG_BACKLIGHT_DEVICE=y</div><div class='add'>+CONFIG_LCD_CLASS_DEVICE=y</div><div class='add'>+CONFIG_LCD_DEVICE=y</div><div class='add'>+CONFIG_BACKLIGHT_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+CONFIG_RTC_DRV_OMAP=y</div><div class='add'>+# CONFIG_RTC_DRV_RS5C348 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6902 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Synchronous Serial Interfaces (SSI)</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_UWIRE is not set</div><div class='add'>+# CONFIG_OMAP_TSC2101 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_INOTIFY is not set</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+# CONFIG_TMPFS is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+# CONFIG_NFS_FS is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NLS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_UNWIND_INFO is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='add'>+CONFIG_CRC16=y</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+CONFIG_LIBCRC32C=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/arm/configs/palmz71_defconfig b/arch/arm/configs/palmz71_defconfig<br/>new file mode 100644<br/>index 000000000000..6361922e71c1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/palmz71_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/palmz71_defconfig</a></div><div class='hunk'>@@ -0,0 +1,891 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.22-rc1-omap1</div><div class='add'>+# Thu Jun  7 05:13:00 2007</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION="-z71"</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+# CONFIG_IPC_NS is not set</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_BLK_DEV_INITRD is not set</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MODULES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+# CONFIG_IOSCHED_AS is not set</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+CONFIG_DEFAULT_NOOP=y</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="noop"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP1=y</div><div class='add'>+# CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+# CONFIG_OMAP_BOOT_TAG is not set</div><div class='add'>+# CONFIG_OMAP_GPIO_SWITCH is not set</div><div class='add'>+CONFIG_OMAP_MUX=y</div><div class='add'>+# CONFIG_OMAP_MUX_DEBUG is not set</div><div class='add'>+CONFIG_OMAP_MUX_WARNINGS=y</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+# CONFIG_OMAP_MMU_FWK is not set</div><div class='add'>+# CONFIG_OMAP_MBOX_FWK is not set</div><div class='add'>+CONFIG_OMAP_MPU_TIMER=y</div><div class='add'>+# CONFIG_OMAP_32K_TIMER is not set</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART1=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART3 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_LCD is not set</div><div class='add'>+CONFIG_OMAP_SERIAL_WAKE=y</div><div class='add'>+# CONFIG_OMAP_DSP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Core Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_OMAP730 is not set</div><div class='add'>+CONFIG_ARCH_OMAP15XX=y</div><div class='add'>+# CONFIG_ARCH_OMAP16XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_MACH_OMAP_INNOVATOR is not set</div><div class='add'>+# CONFIG_MACH_VOICEBLUE is not set</div><div class='add'>+# CONFIG_MACH_OMAP_PALMTE is not set</div><div class='add'>+CONFIG_MACH_OMAP_PALMZ71=y</div><div class='add'>+# CONFIG_MACH_OMAP_PALMTT is not set</div><div class='add'>+# CONFIG_MACH_SX1 is not set</div><div class='add'>+# CONFIG_MACH_AMS_DELTA is not set</div><div class='add'>+# CONFIG_MACH_OMAP_GENERIC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP CPU Speed</div><div class='add'>+#</div><div class='add'>+CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y</div><div class='add'>+# CONFIG_OMAP_ARM_168MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_150MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_120MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_60MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_30MHZ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM925T=y</div><div class='add'>+CONFIG_CPU_32v4T=y</div><div class='add'>+CONFIG_CPU_ABRT_EV4T=y</div><div class='add'>+CONFIG_CPU_CACHE_V4WT=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARM_THUMB is not set</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE=""</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+CONFIG_NET_KEY=y</div><div class='add'>+# CONFIG_NET_KEY_MIGRATE is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+# CONFIG_IP_PNP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET_DIAG is not set</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PNPACPI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+# CONFIG_BLK_DEV_LOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_RAM is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEVICES is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=320</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+CONFIG_INPUT_TSDEV=y</div><div class='add'>+CONFIG_INPUT_TSDEV_SCREEN_X=320</div><div class='add'>+CONFIG_INPUT_TSDEV_SCREEN_Y=320</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+CONFIG_INPUT_TOUCHSCREEN=y</div><div class='add'>+CONFIG_TOUCHSCREEN_ADS7846=y</div><div class='add'>+# CONFIG_TOUCHSCREEN_GUNZE is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_ELO is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MTOUCH is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MK712 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_PENMOUNT is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_UCB1400 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TSC210X is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TSC2046 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=16</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Master Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI_BITBANG=y</div><div class='add'>+CONFIG_SPI_OMAP_UWIRE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Protocol Masters</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_AT25 is not set</div><div class='add'>+# CONFIG_SPI_TSC2101 is not set</div><div class='add'>+# CONFIG_SPI_TSC2102 is not set</div><div class='add'>+# CONFIG_SPI_TSC210X is not set</div><div class='add'>+# CONFIG_SPI_TSC2301 is not set</div><div class='add'>+# CONFIG_SPI_SPIDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_LM70 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_TSC210X is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLINK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='add'>+CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='add'>+CONFIG_LCD_CLASS_DEVICE=y</div><div class='add'>+CONFIG_BACKLIGHT_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+CONFIG_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+# CONFIG_FB_CFB_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_CFB_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+CONFIG_FB_DEFERRED_IO=y</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+CONFIG_FB_OMAP=y</div><div class='add'>+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set</div><div class='add'>+# CONFIG_FB_OMAP_LCD_MIPID is not set</div><div class='add'>+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set</div><div class='add'>+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2</div><div class='add'>+# CONFIG_FB_OMAP_DMA_TUNE is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+# CONFIG_FONTS is not set</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='add'>+# CONFIG_LOGO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# HID Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_RS5C348 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6902 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_DRV_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_INOTIFY is not set</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+# CONFIG_TMPFS is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+# CONFIG_NFS_FS is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NLS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Distributed Lock Manager</div><div class='add'>+#</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='add'>+CONFIG_CRC16=y</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+CONFIG_LIBCRC32C=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/qil-a9260_defconfig b/arch/arm/configs/qil-a9260_defconfig<br/>index ef903bed061e..5cbd81589647 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/qil-a9260_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/configs/qil-a9260_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/qil-a9260_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/qil-a9260_defconfig</a></div><div class='hunk'>@@ -458,10 +458,10 @@ CONFIG_MTD_NAND=y</div><div class='ctx'> # CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='ctx'> CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> # CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='del'>-CONFIG_MTD_NAND_AT91=y</div><div class='del'>-CONFIG_MTD_NAND_AT91_ECC_SOFT=y</div><div class='del'>-# CONFIG_MTD_NAND_AT91_ECC_HW is not set</div><div class='del'>-# CONFIG_MTD_NAND_AT91_ECC_NONE is not set</div><div class='add'>+CONFIG_MTD_NAND_ATMEL=y</div><div class='add'>+CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_ECC_HW is not set</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set</div><div class='ctx'> # CONFIG_MTD_NAND_NANDSIM is not set</div><div class='ctx'> # CONFIG_MTD_NAND_PLATFORM is not set</div><div class='ctx'> # CONFIG_MTD_ALAUDA is not set</div><div class='head'>diff --git a/arch/arm/configs/sam9_l9260_defconfig b/arch/arm/configs/sam9_l9260_defconfig<br/>index 8688362bcf7b..1174e2764875 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/sam9_l9260_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/configs/sam9_l9260_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/sam9_l9260_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/sam9_l9260_defconfig</a></div><div class='hunk'>@@ -429,7 +429,7 @@ CONFIG_MTD_NAND=y</div><div class='ctx'> # CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='ctx'> CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> # CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='del'>-CONFIG_MTD_NAND_AT91=y</div><div class='add'>+CONFIG_MTD_NAND_ATMEL=y</div><div class='ctx'> # CONFIG_MTD_NAND_NANDSIM is not set</div><div class='ctx'> CONFIG_MTD_NAND_PLATFORM=y</div><div class='ctx'> # CONFIG_MTD_ONENAND is not set</div><div class='head'>diff --git a/arch/arm/configs/sx1_defconfig b/arch/arm/configs/sx1_defconfig<br/>new file mode 100644<br/>index 000000000000..853dcdd9f2e0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/sx1_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/sx1_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1118 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.22-rc1-omap1</div><div class='add'>+# Thu Jun  7 05:16:10 2007</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+# CONFIG_NO_IOPORT is not set</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+# CONFIG_IPC_NS is not set</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+# CONFIG_IKCONFIG_PROC is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_BLK_DEV_INITRD is not set</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+# CONFIG_KALLSYMS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+# CONFIG_ELF_CORE is not set</div><div class='add'>+# CONFIG_BASE_FULL is not set</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+# CONFIG_SHMEM is not set</div><div class='add'>+# CONFIG_VM_EVENT_COUNTERS is not set</div><div class='add'>+# CONFIG_SLAB is not set</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+CONFIG_SLOB=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+CONFIG_TINY_SHMEM=y</div><div class='add'>+CONFIG_BASE_SMALL=1</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+# CONFIG_IOSCHED_AS is not set</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+CONFIG_DEFAULT_DEADLINE=y</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="deadline"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP13XX is not set</div><div class='add'>+# CONFIG_ARCH_IOP32X is not set</div><div class='add'>+# CONFIG_ARCH_IOP33X is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_KS8695 is not set</div><div class='add'>+# CONFIG_ARCH_NS9XXX is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_DAVINCI is not set</div><div class='add'>+CONFIG_ARCH_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TI OMAP Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_OMAP1=y</div><div class='add'>+# CONFIG_ARCH_OMAP2 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_RESET_CLOCKS is not set</div><div class='add'>+CONFIG_OMAP_BOOT_TAG=y</div><div class='add'>+# CONFIG_OMAP_BOOT_REASON is not set</div><div class='add'>+# CONFIG_OMAP_COMPONENT_VERSION is not set</div><div class='add'>+CONFIG_OMAP_GPIO_SWITCH=y</div><div class='add'>+CONFIG_OMAP_MUX=y</div><div class='add'>+# CONFIG_OMAP_MUX_DEBUG is not set</div><div class='add'>+CONFIG_OMAP_MUX_WARNINGS=y</div><div class='add'>+CONFIG_OMAP_MCBSP=y</div><div class='add'>+CONFIG_OMAP_MMU_FWK=y</div><div class='add'>+CONFIG_OMAP_MBOX_FWK=y</div><div class='add'>+CONFIG_OMAP_MPU_TIMER=y</div><div class='add'>+# CONFIG_OMAP_32K_TIMER is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART1 is not set</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_UART2 is not set</div><div class='add'>+CONFIG_OMAP_LL_DEBUG_UART3=y</div><div class='add'>+# CONFIG_OMAP_LL_DEBUG_LCD is not set</div><div class='add'>+CONFIG_OMAP_SERIAL_WAKE=y</div><div class='add'>+CONFIG_OMAP_DSP=y</div><div class='add'>+# CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set</div><div class='add'>+# CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set</div><div class='add'>+# CONFIG_OMAP_DSP_FBEXPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Core Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_OMAP730 is not set</div><div class='add'>+CONFIG_ARCH_OMAP15XX=y</div><div class='add'>+# CONFIG_ARCH_OMAP16XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_MACH_OMAP_INNOVATOR is not set</div><div class='add'>+# CONFIG_MACH_VOICEBLUE is not set</div><div class='add'>+# CONFIG_MACH_OMAP_PALMTE is not set</div><div class='add'>+# CONFIG_MACH_OMAP_PALMZ71 is not set</div><div class='add'>+# CONFIG_MACH_OMAP_PALMTT is not set</div><div class='add'>+CONFIG_MACH_SX1=y</div><div class='add'>+# CONFIG_MACH_AMS_DELTA is not set</div><div class='add'>+# CONFIG_MACH_OMAP_GENERIC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OMAP CPU Speed</div><div class='add'>+#</div><div class='add'>+# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set</div><div class='add'>+CONFIG_OMAP_ARM_168MHZ=y</div><div class='add'>+# CONFIG_OMAP_ARM_150MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_120MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_60MHZ is not set</div><div class='add'>+# CONFIG_OMAP_ARM_30MHZ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM925T=y</div><div class='add'>+CONFIG_CPU_32v4T=y</div><div class='add'>+CONFIG_CPU_ABRT_EV4T=y</div><div class='add'>+CONFIG_CPU_CACHE_V4WT=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+CONFIG_CPU_CP15=y</div><div class='add'>+CONFIG_CPU_CP15_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+# CONFIG_OUTER_CACHE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE=""</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+CONFIG_BINFMT_MISC=y</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+CONFIG_PACKET_MMAP=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+# CONFIG_IP_PNP_DHCP is not set</div><div class='add'>+# CONFIG_IP_PNP_BOOTP is not set</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='add'>+# CONFIG_INET_DIAG is not set</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+CONFIG_CONNECTOR=y</div><div class='add'>+# CONFIG_PROC_EVENTS is not set</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PNPACPI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=m</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=m</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=2</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='add'>+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+# CONFIG_VITESSE_PHY is not set</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='add'>+# CONFIG_BROADCOM_PHY is not set</div><div class='add'>+# CONFIG_FIXED_PHY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+# CONFIG_KEYBOARD_ATKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_OMAP=y</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+# CONFIG_SERIAL_8250_CONSOLE is not set</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=3</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=3</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALGOBIT is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+CONFIG_I2C_OMAP=y</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='add'>+# CONFIG_SENSORS_TLV320AIC23 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLINK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+# CONFIG_FB_CFB_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_CFB_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+CONFIG_FB_DEFERRED_IO=y</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+CONFIG_FB_OMAP=y</div><div class='add'>+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set</div><div class='add'>+# CONFIG_FB_OMAP_LCD_MIPID is not set</div><div class='add'>+CONFIG_FB_OMAP_BOOTLOADER_INIT=y</div><div class='add'>+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2</div><div class='add'>+# CONFIG_FB_OMAP_DMA_TUNE is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+CONFIG_FONTS=y</div><div class='add'>+# CONFIG_FONT_8x8 is not set</div><div class='add'>+# CONFIG_FONT_8x16 is not set</div><div class='add'>+# CONFIG_FONT_6x11 is not set</div><div class='add'>+# CONFIG_FONT_7x14 is not set</div><div class='add'>+# CONFIG_FONT_PEARL_8x8 is not set</div><div class='add'>+# CONFIG_FONT_ACORN_8x8 is not set</div><div class='add'>+CONFIG_FONT_MINI_4x6=y</div><div class='add'>+# CONFIG_FONT_CLEAN_4x6 is not set</div><div class='add'>+# CONFIG_FONT_CLEAN_5x8 is not set</div><div class='add'>+# CONFIG_FONT_SUN8x16 is not set</div><div class='add'>+# CONFIG_FONT_SUN12x22 is not set</div><div class='add'>+# CONFIG_FONT_10x18 is not set</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+# CONFIG_LOGO_LINUX_MONO is not set</div><div class='add'>+# CONFIG_LOGO_LINUX_VGA16 is not set</div><div class='add'>+CONFIG_LOGO_LINUX_CLUT224=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+CONFIG_SOUND=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced Linux Sound Architecture</div><div class='add'>+#</div><div class='add'>+CONFIG_SND=y</div><div class='add'>+CONFIG_SND_TIMER=y</div><div class='add'>+CONFIG_SND_PCM=y</div><div class='add'>+# CONFIG_SND_SEQUENCER is not set</div><div class='add'>+CONFIG_SND_OSSEMUL=y</div><div class='add'>+CONFIG_SND_MIXER_OSS=y</div><div class='add'>+CONFIG_SND_PCM_OSS=y</div><div class='add'>+CONFIG_SND_PCM_OSS_PLUGINS=y</div><div class='add'>+# CONFIG_SND_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_SND_SUPPORT_OLD_API is not set</div><div class='add'>+# CONFIG_SND_VERBOSE_PROCFS is not set</div><div class='add'>+# CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='add'>+# CONFIG_SND_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_SND_DUMMY is not set</div><div class='add'>+# CONFIG_SND_MTPAV is not set</div><div class='add'>+# CONFIG_SND_SERIAL_U16550 is not set</div><div class='add'>+# CONFIG_SND_MPU401 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ALSA ARM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_SND_OMAP_AIC23 is not set</div><div class='add'>+# CONFIG_SND_OMAP_TSC2101 is not set</div><div class='add'>+CONFIG_SND_SX1=y</div><div class='add'>+# CONFIG_SND_OMAP_TSC2102 is not set</div><div class='add'>+# CONFIG_SND_OMAP24XX_EAC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System on Chip audio support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SND_SOC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Open Sound System</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND_PRIME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# HID Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='add'>+# CONFIG_USB_GADGET_MUSB_HDRC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_GADGET=y</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG_FILES is not set</div><div class='add'>+CONFIG_USB_GADGET_SELECTED=y</div><div class='add'>+# CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='add'>+# CONFIG_USB_GADGET_NET2280 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_GOKU is not set</div><div class='add'>+# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='add'>+CONFIG_USB_GADGET_OMAP=y</div><div class='add'>+CONFIG_USB_OMAP=y</div><div class='add'>+# CONFIG_USB_GADGET_AT91 is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUMMY_HCD is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUALSPEED is not set</div><div class='add'>+# CONFIG_USB_ZERO is not set</div><div class='add'>+CONFIG_USB_ETH=y</div><div class='add'>+CONFIG_USB_ETH_RNDIS=y</div><div class='add'>+# CONFIG_USB_GADGETFS is not set</div><div class='add'>+# CONFIG_USB_FILE_STORAGE is not set</div><div class='add'>+# CONFIG_USB_G_SERIAL is not set</div><div class='add'>+# CONFIG_USB_MIDI_GADGET is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_CMOS is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_DRV_OMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CBUS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CBUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=866</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="koi8-r"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+# CONFIG_NFS_V3 is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_SUNRPC_BIND34 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+# CONFIG_SYSV68_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+CONFIG_NLS_CODEPAGE_866=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+CONFIG_NLS_CODEPAGE_1251=y</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+CONFIG_NLS_ISO8859_1=y</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+CONFIG_NLS_ISO8859_5=y</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+CONFIG_NLS_KOI8_R=y</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+CONFIG_NLS_UTF8=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Distributed Lock Manager</div><div class='add'>+#</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+CONFIG_PROFILING=y</div><div class='add'>+CONFIG_OPROFILE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+# CONFIG_DETECT_SOFTLOCKUP is not set</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+CONFIG_DEBUG_PREEMPT=y</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+# CONFIG_DEBUG_ERRORS is not set</div><div class='add'>+# CONFIG_DEBUG_LL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='add'>+CONFIG_CRC16=y</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+CONFIG_LIBCRC32C=y</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/arm/configs/usb-a9260_defconfig b/arch/arm/configs/usb-a9260_defconfig<br/>index 3680bd2df26d..fcb4aaabd439 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/usb-a9260_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/configs/usb-a9260_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/usb-a9260_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/usb-a9260_defconfig</a></div><div class='hunk'>@@ -458,10 +458,10 @@ CONFIG_MTD_NAND=y</div><div class='ctx'> # CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='ctx'> CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> # CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='del'>-CONFIG_MTD_NAND_AT91=y</div><div class='del'>-CONFIG_MTD_NAND_AT91_ECC_SOFT=y</div><div class='del'>-# CONFIG_MTD_NAND_AT91_ECC_HW is not set</div><div class='del'>-# CONFIG_MTD_NAND_AT91_ECC_NONE is not set</div><div class='add'>+CONFIG_MTD_NAND_ATMEL=y</div><div class='add'>+CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_ECC_HW is not set</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set</div><div class='ctx'> # CONFIG_MTD_NAND_NANDSIM is not set</div><div class='ctx'> # CONFIG_MTD_NAND_PLATFORM is not set</div><div class='ctx'> # CONFIG_MTD_ALAUDA is not set</div><div class='head'>diff --git a/arch/arm/configs/usb-a9263_defconfig b/arch/arm/configs/usb-a9263_defconfig<br/>index 48d455bc7363..b786e0407e8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/usb-a9263_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/configs/usb-a9263_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/usb-a9263_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/usb-a9263_defconfig</a></div><div class='hunk'>@@ -450,10 +450,10 @@ CONFIG_MTD_NAND=y</div><div class='ctx'> # CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='ctx'> CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> # CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='del'>-CONFIG_MTD_NAND_AT91=y</div><div class='del'>-CONFIG_MTD_NAND_AT91_ECC_SOFT=y</div><div class='del'>-# CONFIG_MTD_NAND_AT91_ECC_HW is not set</div><div class='del'>-# CONFIG_MTD_NAND_AT91_ECC_NONE is not set</div><div class='add'>+CONFIG_MTD_NAND_ATMEL=y</div><div class='add'>+CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_ECC_HW is not set</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set</div><div class='ctx'> # CONFIG_MTD_NAND_NANDSIM is not set</div><div class='ctx'> # CONFIG_MTD_NAND_PLATFORM is not set</div><div class='ctx'> # CONFIG_MTD_ALAUDA is not set</div><div class='head'>diff --git a/arch/arm/configs/yl9200_defconfig b/arch/arm/configs/yl9200_defconfig<br/>index 26de37f74686..a9f41c24c9dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/yl9200_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/configs/yl9200_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/yl9200_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/configs/yl9200_defconfig</a></div><div class='hunk'>@@ -421,7 +421,7 @@ CONFIG_MTD_NAND=y</div><div class='ctx'> # CONFIG_MTD_NAND_ECC_SMC is not set</div><div class='ctx'> # CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='ctx'> CONFIG_MTD_NAND_IDS=y</div><div class='del'>-CONFIG_MTD_NAND_AT91=y</div><div class='add'>+CONFIG_MTD_NAND_ATMEL=y</div><div class='ctx'> # CONFIG_MTD_NAND_NANDSIM is not set</div><div class='ctx'> CONFIG_MTD_NAND_PLATFORM=y</div><div class='ctx'> # CONFIG_MTD_ALAUDA is not set</div><div class='head'>diff --git a/include/asm-arm/Kbuild b/arch/arm/include/asm/Kbuild<br/>index 73237bd130a2..73237bd130a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/Kbuild?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/Kbuild</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/Kbuild</a></div><div class='head'>diff --git a/include/asm-arm/a.out-core.h b/arch/arm/include/asm/a.out-core.h<br/>index 93d04acaa31f..93d04acaa31f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/a.out-core.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/a.out-core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/a.out-core.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/a.out-core.h</a></div><div class='head'>diff --git a/include/asm-arm/a.out.h b/arch/arm/include/asm/a.out.h<br/>index 79489fdcc8b8..79489fdcc8b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/a.out.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/a.out.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/a.out.h</a></div><div class='head'>diff --git a/include/asm-arm/assembler.h b/arch/arm/include/asm/assembler.h<br/>index 911393b2c6f0..6116e4893c0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/assembler.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/assembler.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/assembler.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/assembler.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/assembler.h</div><div class='add'>+ *  arch/arm/include/asm/assembler.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996-2000 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/atomic.h b/arch/arm/include/asm/atomic.h<br/>index 3b59f94b5a3d..325f881ccb50 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/atomic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/atomic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/atomic.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/atomic.h</div><div class='add'>+ *  arch/arm/include/asm/atomic.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996 Russell King.</div><div class='ctx'>  *  Copyright (C) 2002 Deep Blue Solutions Ltd.</div><div class='head'>diff --git a/include/asm-arm/auxvec.h b/arch/arm/include/asm/auxvec.h<br/>index c0536f6b29a7..c0536f6b29a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/auxvec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/auxvec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/auxvec.h</a></div><div class='head'>diff --git a/include/asm-arm/bitops.h b/arch/arm/include/asm/bitops.h<br/>index 9a1db20e032a..9a1db20e032a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/bitops.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/bitops.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/bitops.h</a></div><div class='head'>diff --git a/include/asm-arm/bug.h b/arch/arm/include/asm/bug.h<br/>index 7b62351f097d..7b62351f097d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/bug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/bug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/bug.h</a></div><div class='head'>diff --git a/include/asm-arm/bugs.h b/arch/arm/include/asm/bugs.h<br/>index ca54eb0f12d7..a97f1ea708d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/bugs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/bugs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/bugs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/bugs.h</div><div class='add'>+ *  arch/arm/include/asm/bugs.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1995-2003 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/byteorder.h b/arch/arm/include/asm/byteorder.h<br/>index e6f7fcdc73b0..4fbfb22f65a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/byteorder.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/byteorder.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/byteorder.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/byteorder.h</div><div class='add'>+ *  arch/arm/include/asm/byteorder.h</div><div class='ctx'>  *</div><div class='ctx'>  * ARM Endian-ness.  In little endian mode, the data bus is connected such</div><div class='ctx'>  * that byte accesses appear as:</div><div class='head'>diff --git a/include/asm-arm/cache.h b/arch/arm/include/asm/cache.h<br/>index 31332c8ac04e..cb7a9e97fd7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/cache.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/cache.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/cache.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/cache.h</div><div class='add'>+ *  arch/arm/include/asm/cache.h</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __ASMARM_CACHE_H</div><div class='ctx'> #define __ASMARM_CACHE_H</div><div class='head'>diff --git a/include/asm-arm/cacheflush.h b/arch/arm/include/asm/cacheflush.h<br/>index e68a1cbcc852..9073d9c6567e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/cacheflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/cacheflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/cacheflush.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/cacheflush.h</div><div class='add'>+ *  arch/arm/include/asm/cacheflush.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999-2002 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/checksum.h b/arch/arm/include/asm/checksum.h<br/>index eaa0efd8d0d4..6dcc16430868 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/checksum.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/checksum.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/checksum.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/checksum.h</div><div class='add'>+ *  arch/arm/include/asm/checksum.h</div><div class='ctx'>  *</div><div class='ctx'>  * IP checksum routines</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/cnt32_to_63.h b/arch/arm/include/asm/cnt32_to_63.h<br/>index 480c873fa746..480c873fa746 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/cnt32_to_63.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/cnt32_to_63.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/cnt32_to_63.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/cnt32_to_63.h</a></div><div class='head'>diff --git a/include/asm-arm/cpu-multi32.h b/arch/arm/include/asm/cpu-multi32.h<br/>index 3479de9266e5..e2b5b0b2116a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/cpu-multi32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/cpu-multi32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/cpu-multi32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/cpu-multi32.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/cpu-multi32.h</div><div class='add'>+ *  arch/arm/include/asm/cpu-multi32.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/cpu-single.h b/arch/arm/include/asm/cpu-single.h<br/>index 0b120ee36091..f073a6d2a406 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/cpu-single.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/cpu-single.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/cpu-single.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/cpu-single.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/cpu-single.h</div><div class='add'>+ *  arch/arm/include/asm/cpu-single.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/cpu.h b/arch/arm/include/asm/cpu.h<br/>index 715426b9b08e..634b2d7c612a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/cpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/cpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/cpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/cpu.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/cpu.h</div><div class='add'>+ *  arch/arm/include/asm/cpu.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004-2005 ARM Ltd.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/cputime.h b/arch/arm/include/asm/cputime.h<br/>index 3a8002a5fec7..3a8002a5fec7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/cputime.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/cputime.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/cputime.h</a></div><div class='head'>diff --git a/include/asm-arm/current.h b/arch/arm/include/asm/current.h<br/>index 75d21e2a3ff7..75d21e2a3ff7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/current.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/current.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/current.h</a></div><div class='head'>diff --git a/include/asm-arm/delay.h b/arch/arm/include/asm/delay.h<br/>index b2deda181549..b2deda181549 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/delay.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/delay.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/delay.h</a></div><div class='head'>diff --git a/include/asm-arm/device.h b/arch/arm/include/asm/device.h<br/>index c61642b40603..c61642b40603 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/device.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/device.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/device.h</a></div><div class='head'>diff --git a/include/asm-arm/div64.h b/arch/arm/include/asm/div64.h<br/>index 5001390be958..5001390be958 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/div64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/div64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/div64.h</a></div><div class='head'>diff --git a/include/asm-arm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h<br/>index 45329fca1b64..7b95d2058395 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/dma-mapping.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/dma-mapping.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/dma-mapping.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -3,11 +3,48 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/mm.h&gt; /* need struct page */</div><div class='del'>-</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/dma-coherent.h&gt;</div><div class='add'>+#include &lt;asm/memory.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * page_to_dma/dma_to_virt/virt_to_dma are architecture private functions</div><div class='add'>+ * used internally by the DMA-mapping API to provide DMA addresses. They</div><div class='add'>+ * must not be used by drivers.</div><div class='add'>+ */</div><div class='add'>+#ifndef __arch_page_to_dma</div><div class='add'>+static inline dma_addr_t page_to_dma(struct device *dev, struct page *page)</div><div class='add'>+{</div><div class='add'>+	return (dma_addr_t)__virt_to_bus((unsigned long)page_address(page));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *dma_to_virt(struct device *dev, dma_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	return (void *)__bus_to_virt(addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)</div><div class='add'>+{</div><div class='add'>+	return (dma_addr_t)__virt_to_bus((unsigned long)(addr));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline dma_addr_t page_to_dma(struct device *dev, struct page *page)</div><div class='add'>+{</div><div class='add'>+	return __arch_page_to_dma(dev, page);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *dma_to_virt(struct device *dev, dma_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	return __arch_dma_to_virt(dev, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)</div><div class='add'>+{</div><div class='add'>+	return __arch_virt_to_dma(dev, addr);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * DMA-consistent mapping functions.  These allocate/free a region of</div><div class='hunk'>@@ -169,7 +206,7 @@ dma_map_single(struct device *dev, void *cpu_addr, size_t size,</div><div class='ctx'> 	if (!arch_is_coherent())</div><div class='ctx'> 		dma_cache_maint(cpu_addr, size, dir);</div><div class='ctx'> </div><div class='del'>-	return virt_to_dma(dev, (unsigned long)cpu_addr);</div><div class='add'>+	return virt_to_dma(dev, cpu_addr);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> extern dma_addr_t dma_map_single(struct device *,void *, size_t, enum dma_data_direction);</div><div class='hunk'>@@ -195,7 +232,7 @@ dma_map_page(struct device *dev, struct page *page,</div><div class='ctx'> 	     unsigned long offset, size_t size,</div><div class='ctx'> 	     enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	return dma_map_single(dev, page_address(page) + offset, size, (int)dir);</div><div class='add'>+	return dma_map_single(dev, page_address(page) + offset, size, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -241,7 +278,7 @@ static inline void</div><div class='ctx'> dma_unmap_page(struct device *dev, dma_addr_t handle, size_t size,</div><div class='ctx'> 	       enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	dma_unmap_single(dev, handle, size, (int)dir);</div><div class='add'>+	dma_unmap_single(dev, handle, size, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -314,11 +351,12 @@ extern void dma_unmap_sg(struct device *, struct scatterlist *, int, enum dma_da</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * dma_sync_single_for_cpu</div><div class='add'>+ * dma_sync_single_range_for_cpu</div><div class='ctx'>  * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices</div><div class='ctx'>  * @handle: DMA address of buffer</div><div class='del'>- * @size: size of buffer to map</div><div class='del'>- * @dir: DMA transfer direction</div><div class='add'>+ * @offset: offset of region to start sync</div><div class='add'>+ * @size: size of region to sync</div><div class='add'>+ * @dir: DMA transfer direction (same as passed to dma_map_single)</div><div class='ctx'>  *</div><div class='ctx'>  * Make physical memory consistent for a single streaming mode DMA</div><div class='ctx'>  * translation after a transfer.</div><div class='hunk'>@@ -332,25 +370,41 @@ extern void dma_unmap_sg(struct device *, struct scatterlist *, int, enum dma_da</div><div class='ctx'>  */</div><div class='ctx'> #ifndef CONFIG_DMABOUNCE</div><div class='ctx'> static inline void</div><div class='del'>-dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle, size_t size,</div><div class='del'>-			enum dma_data_direction dir)</div><div class='add'>+dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t handle,</div><div class='add'>+			      unsigned long offset, size_t size,</div><div class='add'>+			      enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='ctx'> 	if (!arch_is_coherent())</div><div class='del'>-		dma_cache_maint((void *)dma_to_virt(dev, handle), size, dir);</div><div class='add'>+		dma_cache_maint(dma_to_virt(dev, handle) + offset, size, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-dma_sync_single_for_device(struct device *dev, dma_addr_t handle, size_t size,</div><div class='del'>-			   enum dma_data_direction dir)</div><div class='add'>+dma_sync_single_range_for_device(struct device *dev, dma_addr_t handle,</div><div class='add'>+				 unsigned long offset, size_t size,</div><div class='add'>+				 enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='ctx'> 	if (!arch_is_coherent())</div><div class='del'>-		dma_cache_maint((void *)dma_to_virt(dev, handle), size, dir);</div><div class='add'>+		dma_cache_maint(dma_to_virt(dev, handle) + offset, size, dir);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-extern void dma_sync_single_for_cpu(struct device*, dma_addr_t, size_t, enum dma_data_direction);</div><div class='del'>-extern void dma_sync_single_for_device(struct device*, dma_addr_t, size_t, enum dma_data_direction);</div><div class='add'>+extern void dma_sync_single_range_for_cpu(struct device *, dma_addr_t, unsigned long, size_t, enum dma_data_direction);</div><div class='add'>+extern void dma_sync_single_range_for_device(struct device *, dma_addr_t, unsigned long, size_t, enum dma_data_direction);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline void</div><div class='add'>+dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle, size_t size,</div><div class='add'>+			enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	dma_sync_single_range_for_cpu(dev, handle, 0, size, dir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+dma_sync_single_for_device(struct device *dev, dma_addr_t handle, size_t size,</div><div class='add'>+			   enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	dma_sync_single_range_for_device(dev, handle, 0, size, dir);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dma_sync_sg_for_cpu</div><div class='head'>diff --git a/include/asm-arm/dma.h b/arch/arm/include/asm/dma.h<br/>index 9f2c5305c260..75154b193117 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/dma.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@ typedef unsigned int dmach_t;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/scatterlist.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is the maximum virtual address which can be DMA'd from.</div><div class='head'>diff --git a/include/asm-arm/domain.h b/arch/arm/include/asm/domain.h<br/>index 3c12a7625304..cc7ef4080711 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/domain.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/domain.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/domain.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/domain.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/domain.h</div><div class='add'>+ *  arch/arm/include/asm/domain.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/ecard.h b/arch/arm/include/asm/ecard.h<br/>index 5e22881a630d..29f2610efc70 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/ecard.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/ecard.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/ecard.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/ecard.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/ecard.h</div><div class='add'>+ * arch/arm/include/asm/ecard.h</div><div class='ctx'>  *</div><div class='ctx'>  * definitions for expansion cards</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/elf.h b/arch/arm/include/asm/elf.h<br/>index 4ca751627489..4ca751627489 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/elf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/elf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/elf.h</a></div><div class='head'>diff --git a/include/asm-arm/emergency-restart.h b/arch/arm/include/asm/emergency-restart.h<br/>index 108d8c48e42e..108d8c48e42e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/emergency-restart.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/emergency-restart.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/emergency-restart.h</a></div><div class='head'>diff --git a/include/asm-arm/errno.h b/arch/arm/include/asm/errno.h<br/>index 6e60f0612bb6..6e60f0612bb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/errno.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/errno.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/errno.h</a></div><div class='head'>diff --git a/include/asm-arm/fb.h b/arch/arm/include/asm/fb.h<br/>index d92e99cd8c8a..d92e99cd8c8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/fb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/fb.h</a></div><div class='head'>diff --git a/include/asm-arm/fcntl.h b/arch/arm/include/asm/fcntl.h<br/>index a80b6607b2ef..a80b6607b2ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/fcntl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/fcntl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/fcntl.h</a></div><div class='head'>diff --git a/include/asm-arm/fiq.h b/arch/arm/include/asm/fiq.h<br/>index a3bad09e825c..2242ce22ec6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/fiq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/fiq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/fiq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/fiq.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/fiq.h</div><div class='add'>+ *  arch/arm/include/asm/fiq.h</div><div class='ctx'>  *</div><div class='ctx'>  * Support for FIQ on ARM architectures.</div><div class='ctx'>  * Written by Philip Blundell &lt;philb@gnu.org&gt;, 1998</div><div class='head'>diff --git a/include/asm-arm/flat.h b/arch/arm/include/asm/flat.h<br/>index 9918aa46d9e5..1d77e51907f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/flat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/flat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/flat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/flat.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/flat.h -- uClinux flat-format executables</div><div class='add'>+ * arch/arm/include/asm/flat.h -- uClinux flat-format executables</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ARM_FLAT_H__</div><div class='head'>diff --git a/include/asm-arm/floppy.h b/arch/arm/include/asm/floppy.h<br/>index 41a5e9d6bb69..c9f03eccc9d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/floppy.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/floppy.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/floppy.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/floppy.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/floppy.h</div><div class='add'>+ *  arch/arm/include/asm/floppy.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996-2000 Russell King</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #ifndef __ASM_ARM_FLOPPY_H</div><div class='ctx'> #define __ASM_ARM_FLOPPY_H</div><div class='ctx'> #if 0</div><div class='del'>-#include &lt;asm/arch/floppy.h&gt;</div><div class='add'>+#include &lt;mach/floppy.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define fd_outb(val,port)			\</div><div class='head'>diff --git a/include/asm-arm/fpstate.h b/arch/arm/include/asm/fpstate.h<br/>index 392eb5332323..ee5e03efc1bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/fpstate.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/fpstate.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/fpstate.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/fpstate.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/fpstate.h</div><div class='add'>+ *  arch/arm/include/asm/fpstate.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1995 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/ftrace.h b/arch/arm/include/asm/ftrace.h<br/>index 584ef9a8e5a5..584ef9a8e5a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/ftrace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/ftrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/ftrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/ftrace.h</a></div><div class='head'>diff --git a/include/asm-arm/futex.h b/arch/arm/include/asm/futex.h<br/>index 6a332a9f099c..6a332a9f099c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/futex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/futex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/futex.h</a></div><div class='head'>diff --git a/include/asm-arm/glue.h b/arch/arm/include/asm/glue.h<br/>index a97a182ba287..a0e39d5d00c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/glue.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/glue.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/glue.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/glue.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/glue.h</div><div class='add'>+ *  arch/arm/include/asm/glue.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997-1999 Russell King</div><div class='ctx'>  *  Copyright (C) 2000-2002 Deep Blue Solutions Ltd.</div><div class='head'>diff --git a/include/asm-arm/gpio.h b/arch/arm/include/asm/gpio.h<br/>index fff4f800ee42..166a7a3e2840 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/gpio.h</a></div><div class='hunk'>@@ -2,6 +2,6 @@</div><div class='ctx'> #define _ARCH_ARM_GPIO_H</div><div class='ctx'> </div><div class='ctx'> /* not all ARM platforms necessarily support this API ... */</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* _ARCH_ARM_GPIO_H */</div><div class='head'>diff --git a/include/asm-arm/hardirq.h b/arch/arm/include/asm/hardirq.h<br/>index 182310b99195..182310b99195 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardirq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardirq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardirq.h</a></div><div class='head'>diff --git a/include/asm-arm/hardware/arm_timer.h b/arch/arm/include/asm/hardware/arm_timer.h<br/>index 04be3bdf46b8..04be3bdf46b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/arm_timer.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/arm_timer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/arm_timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/arm_timer.h</a></div><div class='head'>diff --git a/include/asm-arm/hardware/arm_twd.h b/arch/arm/include/asm/hardware/arm_twd.h<br/>index e521b70713c8..e521b70713c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/arm_twd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/arm_twd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/arm_twd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/arm_twd.h</a></div><div class='head'>diff --git a/include/asm-arm/hardware/cache-l2x0.h b/arch/arm/include/asm/hardware/cache-l2x0.h<br/>index 54029a740396..64f2252a25cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/cache-l2x0.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/cache-l2x0.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/cache-l2x0.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/cache-l2x0.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/hardware/cache-l2x0.h</div><div class='add'>+ * arch/arm/include/asm/hardware/cache-l2x0.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 ARM Limited</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/hardware/clps7111.h b/arch/arm/include/asm/hardware/clps7111.h<br/>index 8d3228dc1778..44477225aed6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/clps7111.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/clps7111.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/clps7111.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/clps7111.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/hardware/clps7111.h</div><div class='add'>+ *  arch/arm/include/asm/hardware/clps7111.h</div><div class='ctx'>  *</div><div class='ctx'>  *  This file contains the hardware definitions of the CLPS7111 internal</div><div class='ctx'>  *  registers.</div><div class='head'>diff --git a/include/asm-arm/hardware/cs89712.h b/arch/arm/include/asm/hardware/cs89712.h<br/>index ad99a3e1b802..f75626933e94 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/cs89712.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/cs89712.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/cs89712.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/cs89712.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/hardware/cs89712.h</div><div class='add'>+ *  arch/arm/include/asm/hardware/cs89712.h</div><div class='ctx'>  *</div><div class='ctx'>  *  This file contains the hardware definitions of the CS89712</div><div class='ctx'>  *  additional internal registers.</div><div class='head'>diff --git a/include/asm-arm/hardware/debug-8250.S b/arch/arm/include/asm/hardware/debug-8250.S<br/>index 07c97fb233fc..22c689255e6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/debug-8250.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/debug-8250.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/debug-8250.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/debug-8250.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/hardware/debug-8250.S</div><div class='add'>+ * arch/arm/include/asm/hardware/debug-8250.S</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1994-1999 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/hardware/debug-pl01x.S b/arch/arm/include/asm/hardware/debug-pl01x.S<br/>index 23c541a9e89a..f9fd083eff63 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/debug-pl01x.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/debug-pl01x.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/debug-pl01x.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/debug-pl01x.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/hardware/debug-pl01x.S</div><div class='add'>+/* arch/arm/include/asm/hardware/debug-pl01x.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/hardware/dec21285.h b/arch/arm/include/asm/hardware/dec21285.h<br/>index 546f7077be9c..0d7552751aaf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/dec21285.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/dec21285.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/dec21285.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/dec21285.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/hardware/dec21285.h</div><div class='add'>+ *  arch/arm/include/asm/hardware/dec21285.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1998 Russell King</div><div class='ctx'>  *</div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #define DC21285_PCI_MEM			0x80000000</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #define DC21285_IO(x)		((volatile unsigned long *)(ARMCSR_BASE+(x)))</div><div class='ctx'> #else</div><div class='ctx'> #define DC21285_IO(x)		(x)</div><div class='head'>diff --git a/include/asm-arm/hardware/entry-macro-iomd.S b/arch/arm/include/asm/hardware/entry-macro-iomd.S<br/>index 9bb580a5b15e..e0af4983723f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/entry-macro-iomd.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/entry-macro-iomd.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/entry-macro-iomd.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/entry-macro-iomd.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/hardware/entry-macro-iomd.S</div><div class='add'>+ * arch/arm/include/asm/hardware/entry-macro-iomd.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for IOC/IOMD based platforms</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/hardware/ep7211.h b/arch/arm/include/asm/hardware/ep7211.h<br/>index 017aa68f612d..654d5f625c49 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/ep7211.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/ep7211.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/ep7211.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/ep7211.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/hardware/ep7211.h</div><div class='add'>+ *  arch/arm/include/asm/hardware/ep7211.h</div><div class='ctx'>  *</div><div class='ctx'>  *  This file contains the hardware definitions of the EP7211 internal</div><div class='ctx'>  *  registers.</div><div class='head'>diff --git a/include/asm-arm/hardware/ep7212.h b/arch/arm/include/asm/hardware/ep7212.h<br/>index 0e952e747073..3b43bbeaf1db 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/ep7212.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/ep7212.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/ep7212.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/ep7212.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/hardware/ep7212.h</div><div class='add'>+ *  arch/arm/include/asm/hardware/ep7212.h</div><div class='ctx'>  *</div><div class='ctx'>  *  This file contains the hardware definitions of the EP7212 internal</div><div class='ctx'>  *  registers.</div><div class='head'>diff --git a/include/asm-arm/hardware/gic.h b/arch/arm/include/asm/hardware/gic.h<br/>index 966e428ad32c..4924914af188 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/gic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/gic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/gic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/gic.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/hardware/gic.h</div><div class='add'>+ *  arch/arm/include/asm/hardware/gic.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2002 ARM Limited, All Rights Reserved.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/hardware/icst307.h b/arch/arm/include/asm/hardware/icst307.h<br/>index ff8618a441c0..554f128a1046 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/icst307.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/icst307.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/icst307.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/icst307.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/hardware/icst307.h</div><div class='add'>+ *  arch/arm/include/asm/hardware/icst307.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/hardware/icst525.h b/arch/arm/include/asm/hardware/icst525.h<br/>index edd5a5704406..58f0dc43e2ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/icst525.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/icst525.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/icst525.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/icst525.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/hardware/icst525.h</div><div class='add'>+ *  arch/arm/include/asm/hardware/icst525.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/hardware/ioc.h b/arch/arm/include/asm/hardware/ioc.h<br/>index b3b46ef65943..1f6b8013becb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/ioc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/ioc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/ioc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/ioc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/hardware/ioc.h</div><div class='add'>+ *  arch/arm/include/asm/hardware/ioc.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/hardware/iomd.h b/arch/arm/include/asm/hardware/iomd.h<br/>index 396e55ad06c6..9c5afbd71a69 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/iomd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/iomd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/iomd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/iomd.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/hardware/iomd.h</div><div class='add'>+ *  arch/arm/include/asm/hardware/iomd.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/hardware/iop3xx-adma.h b/arch/arm/include/asm/hardware/iop3xx-adma.h<br/>index af64676650a2..87bff09633aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/iop3xx-adma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/iop3xx-adma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/iop3xx-adma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/iop3xx-adma.h</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #define _ADMA_H</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iop_adma.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Memory copy units */</div><div class='head'>diff --git a/include/asm-arm/hardware/iop3xx-gpio.h b/arch/arm/include/asm/hardware/iop3xx-gpio.h<br/>index 0c9331f9ac24..b69d972b1f7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/iop3xx-gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/iop3xx-gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/iop3xx-gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/iop3xx-gpio.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/hardware/iop3xx-gpio.h</div><div class='add'>+ * arch/arm/include/asm/hardware/iop3xx-gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  * IOP3xx GPIO wrappers</div><div class='ctx'>  *</div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #ifndef __ASM_ARM_HARDWARE_IOP3XX_GPIO_H</div><div class='ctx'> #define __ASM_ARM_HARDWARE_IOP3XX_GPIO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm-generic/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IOP3XX_N_GPIOS	8</div><div class='head'>diff --git a/include/asm-arm/hardware/iop3xx.h b/arch/arm/include/asm/hardware/iop3xx.h<br/>index 18f6937f5010..4b8e7f559929 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/iop3xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/iop3xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/iop3xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/iop3xx.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/hardware/iop3xx.h</div><div class='add'>+ * arch/arm/include/asm/hardware/iop3xx.h</div><div class='ctx'>  *</div><div class='ctx'>  * Intel IOP32X and IOP33X register definitions</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/hardware/iop_adma.h b/arch/arm/include/asm/hardware/iop_adma.h<br/>index cb7e3611bcba..cb7e3611bcba 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/iop_adma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/iop_adma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/iop_adma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/iop_adma.h</a></div><div class='head'>diff --git a/include/asm-arm/hardware/it8152.h b/arch/arm/include/asm/hardware/it8152.h<br/>index 74b5fff7f575..74b5fff7f575 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/it8152.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/it8152.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/it8152.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/it8152.h</a></div><div class='head'>diff --git a/include/asm-arm/hardware/linkup-l1110.h b/arch/arm/include/asm/hardware/linkup-l1110.h<br/>index 7ec91168a576..7ec91168a576 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/linkup-l1110.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/linkup-l1110.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/linkup-l1110.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/linkup-l1110.h</a></div><div class='head'>diff --git a/include/asm-arm/hardware/locomo.h b/arch/arm/include/asm/hardware/locomo.h<br/>index fb0645de6f31..954b1be991b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/locomo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/locomo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/locomo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/locomo.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/hardware/locomo.h</div><div class='add'>+ * arch/arm/include/asm/hardware/locomo.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file contains the definitions for the LoCoMo G/A Chip</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/hardware/memc.h b/arch/arm/include/asm/hardware/memc.h<br/>index 8aef5aa0e01b..42ba7c167d1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/memc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/memc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/memc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/memc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/hardware/memc.h</div><div class='add'>+ *  arch/arm/include/asm/hardware/memc.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/hardware/pci_v3.h b/arch/arm/include/asm/hardware/pci_v3.h<br/>index 4d497bdb9a97..2811c7e2cfdf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/pci_v3.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/pci_v3.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/pci_v3.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/pci_v3.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/hardware/pci_v3.h</div><div class='add'>+ *  arch/arm/include/asm/hardware/pci_v3.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Internal header file PCI V3 chip</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/hardware/sa1111.h b/arch/arm/include/asm/hardware/sa1111.h<br/>index 61b1d05c7df7..5da2595759e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/sa1111.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/sa1111.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/sa1111.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/sa1111.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/hardware/sa1111.h</div><div class='add'>+ * arch/arm/include/asm/hardware/sa1111.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 John G Dorsey &lt;john+@cs.cmu.edu&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #ifndef _ASM_ARCH_SA1111</div><div class='ctx'> #define _ASM_ARCH_SA1111</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/bitfield.h&gt;</div><div class='add'>+#include &lt;mach/bitfield.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The SA1111 is always located at virtual 0xf4000000, and is always</div><div class='head'>diff --git a/include/asm-arm/hardware/scoop.h b/arch/arm/include/asm/hardware/scoop.h<br/>index dfb8330599f9..dfb8330599f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/scoop.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/scoop.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/scoop.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/scoop.h</a></div><div class='head'>diff --git a/include/asm-arm/hardware/sharpsl_pm.h b/arch/arm/include/asm/hardware/sharpsl_pm.h<br/>index 2d00db22b981..2d00db22b981 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/sharpsl_pm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/sharpsl_pm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/sharpsl_pm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/sharpsl_pm.h</a></div><div class='head'>diff --git a/include/asm-arm/hardware/ssp.h b/arch/arm/include/asm/hardware/ssp.h<br/>index 3b42e181997c..3b42e181997c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/ssp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/ssp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/ssp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/ssp.h</a></div><div class='head'>diff --git a/include/asm-arm/hardware/uengine.h b/arch/arm/include/asm/hardware/uengine.h<br/>index b442d65c6593..b442d65c6593 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/uengine.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/uengine.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/uengine.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/uengine.h</a></div><div class='head'>diff --git a/include/asm-arm/hardware/vic.h b/arch/arm/include/asm/hardware/vic.h<br/>index ed9ca3736a0b..263f2c362a30 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hardware/vic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hardware/vic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/vic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hardware/vic.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/hardware/vic.h</div><div class='add'>+ *  arch/arm/include/asm/hardware/vic.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) ARM Limited 2003.  All rights reserved.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/include/asm/hw_irq.h b/arch/arm/include/asm/hw_irq.h<br/>new file mode 100644<br/>index 000000000000..90831f6f5f5c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hw_irq.h</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+/*</div><div class='add'>+ * Nothing to see here yet</div><div class='add'>+ */</div><div class='add'>+#ifndef _ARCH_ARM_HW_IRQ_H</div><div class='add'>+#define _ARCH_ARM_HW_IRQ_H</div><div class='add'>+</div><div class='add'>+static inline void ack_bad_irq(int irq)</div><div class='add'>+{</div><div class='add'>+	extern unsigned long irq_err_count;</div><div class='add'>+	irq_err_count++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Obsolete inline function for calling irq descriptor handlers.</div><div class='add'>+ */</div><div class='add'>+static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	desc-&gt;handle_irq(irq, desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void set_irq_flags(unsigned int irq, unsigned int flags);</div><div class='add'>+</div><div class='add'>+#define IRQF_VALID	(1 &lt;&lt; 0)</div><div class='add'>+#define IRQF_PROBE	(1 &lt;&lt; 1)</div><div class='add'>+#define IRQF_NOAUTOEN	(1 &lt;&lt; 2)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/asm-arm/hwcap.h b/arch/arm/include/asm/hwcap.h<br/>index 81f4c899a555..81f4c899a555 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/hwcap.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/hwcap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hwcap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/hwcap.h</a></div><div class='head'>diff --git a/include/asm-arm/ide.h b/arch/arm/include/asm/ide.h<br/>index a48019f99d08..b507ce8e5019 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/ide.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/ide.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/ide.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/ide.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/ide.h</div><div class='add'>+ *  arch/arm/include/asm/ide.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1994-1996  Linus Torvalds &amp; authors</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/io.h b/arch/arm/include/asm/io.h<br/>index eebe56e74d6d..71934856fc22 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/io.h</div><div class='add'>+ *  arch/arm/include/asm/io.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996-2000 Russell King</div><div class='ctx'>  *</div><div class='hunk'>@@ -61,8 +61,9 @@ extern void __raw_readsl(const void __iomem *addr, void *data, int longlen);</div><div class='ctx'> #define MT_DEVICE_NONSHARED	1</div><div class='ctx'> #define MT_DEVICE_CACHED	2</div><div class='ctx'> #define MT_DEVICE_IXP2000	3</div><div class='add'>+#define MT_DEVICE_WC		4</div><div class='ctx'> /*</div><div class='del'>- * types 4 onwards can be found in asm/mach/map.h and are undefined</div><div class='add'>+ * types 5 onwards can be found in asm/mach/map.h and are undefined</div><div class='ctx'>  * for ioremap</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -82,7 +83,7 @@ extern void __readwrite_bug(const char *fn);</div><div class='ctx'> /*</div><div class='ctx'>  * Now, pick up the machine-defined IO definitions</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/arch/io.h&gt;</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  IO port access primitives</div><div class='hunk'>@@ -215,11 +216,13 @@ extern void _memset_io(volatile void __iomem *, int, size_t);</div><div class='ctx'> #define ioremap(cookie,size)		__arm_ioremap(cookie, size, MT_DEVICE)</div><div class='ctx'> #define ioremap_nocache(cookie,size)	__arm_ioremap(cookie, size, MT_DEVICE)</div><div class='ctx'> #define ioremap_cached(cookie,size)	__arm_ioremap(cookie, size, MT_DEVICE_CACHED)</div><div class='add'>+#define ioremap_wc(cookie,size)		__arm_ioremap(cookie, size, MT_DEVICE_WC)</div><div class='ctx'> #define iounmap(cookie)			__iounmap(cookie)</div><div class='ctx'> #else</div><div class='ctx'> #define ioremap(cookie,size)		__arch_ioremap((cookie), (size), MT_DEVICE)</div><div class='ctx'> #define ioremap_nocache(cookie,size)	__arch_ioremap((cookie), (size), MT_DEVICE)</div><div class='ctx'> #define ioremap_cached(cookie,size)	__arch_ioremap((cookie), (size), MT_DEVICE_CACHED)</div><div class='add'>+#define ioremap_wc(cookie,size)		__arch_ioremap((cookie), (size), MT_DEVICE_WC)</div><div class='ctx'> #define iounmap(cookie)			__arch_iounmap(cookie)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/ioctl.h b/arch/arm/include/asm/ioctl.h<br/>index b279fe06dfe5..b279fe06dfe5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/ioctl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/ioctl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/ioctl.h</a></div><div class='head'>diff --git a/include/asm-arm/ioctls.h b/arch/arm/include/asm/ioctls.h<br/>index a91d8a1523cf..a91d8a1523cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/ioctls.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/ioctls.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/ioctls.h</a></div><div class='head'>diff --git a/include/asm-arm/ipcbuf.h b/arch/arm/include/asm/ipcbuf.h<br/>index 97683975f7df..97683975f7df 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/ipcbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/ipcbuf.h</a></div><div class='head'>diff --git a/include/asm-arm/irq.h b/arch/arm/include/asm/irq.h<br/>index 9cb01907e43b..d6786090d02c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/irq.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #ifndef __ASM_ARM_IRQ_H</div><div class='ctx'> #define __ASM_ARM_IRQ_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef irq_canonicalize</div><div class='ctx'> #define irq_canonicalize(i)	(i)</div><div class='head'>diff --git a/include/asm-arm/irq_regs.h b/arch/arm/include/asm/irq_regs.h<br/>index 3dd9c0b70270..3dd9c0b70270 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/irq_regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/irq_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/irq_regs.h</a></div><div class='head'>diff --git a/include/asm-arm/irqflags.h b/arch/arm/include/asm/irqflags.h<br/>index 6d09974e6646..6d09974e6646 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/irqflags.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/irqflags.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/irqflags.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/irqflags.h</a></div><div class='head'>diff --git a/include/asm-arm/kdebug.h b/arch/arm/include/asm/kdebug.h<br/>index 6ece1b037665..6ece1b037665 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/kdebug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/kdebug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/kdebug.h</a></div><div class='head'>diff --git a/include/asm-arm/kexec.h b/arch/arm/include/asm/kexec.h<br/>index c8986bb99ed5..df15a0dc228e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/kexec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/kexec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/kexec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/kexec.h</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> /* Maximum address we can use for the control code buffer */</div><div class='ctx'> #define KEXEC_CONTROL_MEMORY_LIMIT (-1UL)</div><div class='ctx'> </div><div class='del'>-#define KEXEC_CONTROL_CODE_SIZE	4096</div><div class='add'>+#define KEXEC_CONTROL_PAGE_SIZE	4096</div><div class='ctx'> </div><div class='ctx'> #define KEXEC_ARCH KEXEC_ARCH_ARM</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/kgdb.h b/arch/arm/include/asm/kgdb.h<br/>index 67af4b841984..67af4b841984 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/kgdb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/kgdb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/kgdb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/kgdb.h</a></div><div class='head'>diff --git a/include/asm-arm/kmap_types.h b/arch/arm/include/asm/kmap_types.h<br/>index 45def13ee17a..45def13ee17a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/kmap_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/kmap_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/kmap_types.h</a></div><div class='head'>diff --git a/include/asm-arm/kprobes.h b/arch/arm/include/asm/kprobes.h<br/>index b1a37876942d..a5d0d99ad387 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/kprobes.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/kprobes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/kprobes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/kprobes.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/kprobes.h</div><div class='add'>+ * arch/arm/include/asm/kprobes.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006, 2007 Motorola Inc.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/leds.h b/arch/arm/include/asm/leds.h<br/>index 12290ea55801..c545739f39b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/leds.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/leds.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/leds.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/leds.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/leds.h</div><div class='add'>+ *  arch/arm/include/asm/leds.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1998 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/limits.h b/arch/arm/include/asm/limits.h<br/>index 08d8c6600804..08d8c6600804 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/limits.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/limits.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/limits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/limits.h</a></div><div class='head'>diff --git a/include/asm-arm/linkage.h b/arch/arm/include/asm/linkage.h<br/>index 5a25632b1bc0..5a25632b1bc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/linkage.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/linkage.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/linkage.h</a></div><div class='head'>diff --git a/include/asm-arm/local.h b/arch/arm/include/asm/local.h<br/>index c11c530f74d0..c11c530f74d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/local.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/local.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/local.h</a></div><div class='head'>diff --git a/include/asm-arm/locks.h b/arch/arm/include/asm/locks.h<br/>index 852220eecdbc..ef4c897772d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/locks.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/locks.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/locks.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/locks.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/locks.h</div><div class='add'>+ *  arch/arm/include/asm/locks.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/mach/arch.h b/arch/arm/include/asm/mach/arch.h<br/>index bcc8aed7c9a9..c59842dc7cb8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mach/arch.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mach/arch.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/arch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/arch.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/mach/arch.h</div><div class='add'>+ *  arch/arm/include/asm/mach/arch.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/mach/dma.h b/arch/arm/include/asm/mach/dma.h<br/>index e7c4a20aad53..fc7278ea7146 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mach/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mach/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/mach/dma.h</div><div class='add'>+ *  arch/arm/include/asm/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1998-2000 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/mach/flash.h b/arch/arm/include/asm/mach/flash.h<br/>index 05b029ef6371..4ca69fe2c850 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mach/flash.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mach/flash.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/flash.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/flash.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/mach/flash.h</div><div class='add'>+ *  arch/arm/include/asm/mach/flash.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 Russell King, All Rights Reserved.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/mach/irda.h b/arch/arm/include/asm/mach/irda.h<br/>index 58984d9c0b0b..38f77b5e56cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mach/irda.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mach/irda.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/irda.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/irda.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/mach/irda.h</div><div class='add'>+ *  arch/arm/include/asm/mach/irda.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/mach/irq.h b/arch/arm/include/asm/mach/irq.h<br/>index eb0bfba6570d..acac5302e4ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mach/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mach/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/irq.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/mach/irq.h</div><div class='add'>+ *  arch/arm/include/asm/mach/irq.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1995-2000 Russell King.</div><div class='ctx'>  *</div><div class='hunk'>@@ -22,20 +22,6 @@ extern void init_FIQ(void);</div><div class='ctx'> extern int show_fiq_list(struct seq_file *, void *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Obsolete inline function for calling irq descriptor handlers.</div><div class='del'>- */</div><div class='del'>-static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	desc-&gt;handle_irq(irq, desc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void set_irq_flags(unsigned int irq, unsigned int flags);</div><div class='del'>-</div><div class='del'>-#define IRQF_VALID	(1 &lt;&lt; 0)</div><div class='del'>-#define IRQF_PROBE	(1 &lt;&lt; 1)</div><div class='del'>-#define IRQF_NOAUTOEN	(1 &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * This is for easy migration, but should be changed in the source</div><div class='ctx'>  */</div><div class='ctx'> #define do_bad_IRQ(irq,desc)				\</div><div class='hunk'>@@ -45,10 +31,4 @@ do {							\</div><div class='ctx'> 	spin_unlock(&amp;desc-&gt;lock);			\</div><div class='ctx'> } while(0)</div><div class='ctx'> </div><div class='del'>-extern unsigned long irq_err_count;</div><div class='del'>-static inline void ack_bad_irq(int irq)</div><div class='del'>-{</div><div class='del'>-	irq_err_count++;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/asm-arm/mach/map.h b/arch/arm/include/asm/mach/map.h<br/>index 7ef3c8390180..9eb936e49cc3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mach/map.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mach/map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/map.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/map.h</div><div class='add'>+ *  arch/arm/include/asm/map.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999-2000 Russell King</div><div class='ctx'>  *</div><div class='hunk'>@@ -18,13 +18,13 @@ struct map_desc {</div><div class='ctx'> 	unsigned int type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* types 0-3 are defined in asm/io.h */</div><div class='del'>-#define MT_CACHECLEAN		4</div><div class='del'>-#define MT_MINICLEAN		5</div><div class='del'>-#define MT_LOW_VECTORS		6</div><div class='del'>-#define MT_HIGH_VECTORS		7</div><div class='del'>-#define MT_MEMORY		8</div><div class='del'>-#define MT_ROM			9</div><div class='add'>+/* types 0-4 are defined in asm/io.h */</div><div class='add'>+#define MT_CACHECLEAN		5</div><div class='add'>+#define MT_MINICLEAN		6</div><div class='add'>+#define MT_LOW_VECTORS		7</div><div class='add'>+#define MT_HIGH_VECTORS		8</div><div class='add'>+#define MT_MEMORY		9</div><div class='add'>+#define MT_ROM			10</div><div class='ctx'> </div><div class='ctx'> #define MT_NONSHARED_DEVICE	MT_DEVICE_NONSHARED</div><div class='ctx'> #define MT_IXP2000_DEVICE	MT_DEVICE_IXP2000</div><div class='head'>diff --git a/include/asm-arm/mach/mmc.h b/arch/arm/include/asm/mach/mmc.h<br/>index eb91145c00c4..4da332b03144 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mach/mmc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mach/mmc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/mmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/mmc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/mach/mmc.h</div><div class='add'>+ *  arch/arm/include/asm/mach/mmc.h</div><div class='ctx'>  */</div><div class='ctx'> #ifndef ASMARM_MACH_MMC_H</div><div class='ctx'> #define ASMARM_MACH_MMC_H</div><div class='head'>diff --git a/include/asm-arm/mach/pci.h b/arch/arm/include/asm/mach/pci.h<br/>index 9d4f6b5ea419..32da1ae17e06 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mach/pci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mach/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/pci.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/mach/pci.h</div><div class='add'>+ *  arch/arm/include/asm/mach/pci.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-avr32/mach/serial_at91.h b/arch/arm/include/asm/mach/serial_at91.h<br/>index 55b317a89061..ea6d063923b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/mach/serial_at91.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/mach/serial_at91.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/serial_at91.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/serial_at91.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/mach/serial_at91.h</div><div class='add'>+ *  arch/arm/include/asm/mach/serial_at91.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Based on serial_sa1100.h  by Nicolas Pitre</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/mach/serial_sa1100.h b/arch/arm/include/asm/mach/serial_sa1100.h<br/>index 20c22bb218d9..d09064bf95a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mach/serial_sa1100.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mach/serial_sa1100.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/serial_sa1100.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/serial_sa1100.h</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/mach/serial_sa1100.h</div><div class='add'>+ *  arch/arm/include/asm/mach/serial_sa1100.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Author: Nicolas Pitre</div><div class='ctx'>  *</div><div class='del'>- * Moved to include/asm-arm/mach and changed lots, Russell King</div><div class='add'>+ * Moved and changed lots, Russell King</div><div class='ctx'>  *</div><div class='ctx'>  * Low level machine dependent UART functions.</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/mach/sharpsl_param.h b/arch/arm/include/asm/mach/sharpsl_param.h<br/>index 7a24ecf04220..7a24ecf04220 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mach/sharpsl_param.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mach/sharpsl_param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/sharpsl_param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/sharpsl_param.h</a></div><div class='head'>diff --git a/include/asm-arm/mach/time.h b/arch/arm/include/asm/mach/time.h<br/>index 2fd36ea0130d..b2cc1fcd0400 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mach/time.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mach/time.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/time.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/mach/time.h</div><div class='add'>+ * arch/arm/include/asm/mach/time.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004 MontaVista Software, Inc.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/mach/udc_pxa2xx.h b/arch/arm/include/asm/mach/udc_pxa2xx.h<br/>index 9e5ed7c0f27f..270902c353fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mach/udc_pxa2xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mach/udc_pxa2xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/udc_pxa2xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mach/udc_pxa2xx.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/mach/udc_pxa2xx.h</div><div class='add'>+ * arch/arm/include/asm/mach/udc_pxa2xx.h</div><div class='ctx'>  *</div><div class='ctx'>  * This supports machine-specific differences in how the PXA2xx</div><div class='ctx'>  * USB Device Controller (UDC) is wired.</div><div class='head'>diff --git a/include/asm-arm/mc146818rtc.h b/arch/arm/include/asm/mc146818rtc.h<br/>index 7b81e0c42543..e1ca48a9e973 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mc146818rtc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mc146818rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mc146818rtc.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> #ifndef _ASM_MC146818RTC_H</div><div class='ctx'> #define _ASM_MC146818RTC_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef RTC_PORT</div><div class='head'>diff --git a/include/asm-arm/memory.h b/arch/arm/include/asm/memory.h<br/>index 9ba4d7136e6b..bf7c737c9226 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/memory.h</div><div class='add'>+ *  arch/arm/include/asm/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000-2002 Russell King</div><div class='ctx'>  *  modification for nommu, Hyok S. Choi, 2004</div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;asm/arch/memory.h&gt;</div><div class='add'>+#include &lt;mach/memory.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='hunk'>@@ -150,6 +150,14 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Amount of memory reserved for the vmalloc() area, and minimum</div><div class='add'>+ * address for vmalloc mappings.</div><div class='add'>+ */</div><div class='add'>+extern unsigned long vmalloc_reserve;</div><div class='add'>+</div><div class='add'>+#define VMALLOC_MIN		(void *)(VMALLOC_END - vmalloc_reserve)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * PFNs are used to describe any physical page; this means</div><div class='ctx'>  * PFN 0 == physical address 0.</div><div class='ctx'>  *</div><div class='hunk'>@@ -306,20 +314,6 @@ static inline __deprecated void *bus_to_virt(unsigned long x)</div><div class='ctx'> #define page_to_phys(page)	(page_to_pfn(page) &lt;&lt; PAGE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Optional device DMA address remapping. Do _not_ use directly!</div><div class='del'>- * We should really eliminate virt_to_bus() here - it's deprecated.</div><div class='del'>- */</div><div class='del'>-#ifndef __arch_page_to_dma</div><div class='del'>-#define page_to_dma(dev, page)		((dma_addr_t)__virt_to_bus((unsigned long)page_address(page)))</div><div class='del'>-#define dma_to_virt(dev, addr)		((void *)__bus_to_virt(addr))</div><div class='del'>-#define virt_to_dma(dev, addr)		((dma_addr_t)__virt_to_bus((unsigned long)(addr)))</div><div class='del'>-#else</div><div class='del'>-#define page_to_dma(dev, page)		(__arch_page_to_dma(dev, page))</div><div class='del'>-#define dma_to_virt(dev, addr)		(__arch_dma_to_virt(dev, addr))</div><div class='del'>-#define virt_to_dma(dev, addr)		(__arch_virt_to_dma(dev, addr))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Optional coherency support.  Currently used only by selected</div><div class='ctx'>  * Intel XSC3-based systems.</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/mman.h b/arch/arm/include/asm/mman.h<br/>index 54570d2e95b7..54570d2e95b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mman.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mman.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mman.h</a></div><div class='head'>diff --git a/include/asm-arm/mmu.h b/arch/arm/include/asm/mmu.h<br/>index 53099d4ee421..53099d4ee421 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mmu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mmu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mmu.h</a></div><div class='head'>diff --git a/include/asm-arm/mmu_context.h b/arch/arm/include/asm/mmu_context.h<br/>index 91b9dfdfed52..a301e446007f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mmu_context.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mmu_context.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/mmu_context.h</div><div class='add'>+ *  arch/arm/include/asm/mmu_context.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/mmzone.h b/arch/arm/include/asm/mmzone.h<br/>index b87de151f0a4..ae63a4fd28c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mmzone.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mmzone.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mmzone.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mmzone.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/mmzone.h</div><div class='add'>+ *  arch/arm/include/asm/mmzone.h</div><div class='ctx'>  *</div><div class='ctx'>  *  1999-12-29	Nicolas Pitre		Created</div><div class='ctx'>  *</div><div class='hunk'>@@ -25,6 +25,6 @@ extern pg_data_t discontig_node_data[];</div><div class='ctx'>  */</div><div class='ctx'> #define NODE_MEM_MAP(nid)	(NODE_DATA(nid)-&gt;node_mem_map)</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/memory.h&gt;</div><div class='add'>+#include &lt;mach/memory.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/asm-arm/module.h b/arch/arm/include/asm/module.h<br/>index 24b168dc31a3..24b168dc31a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/module.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/module.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/module.h</a></div><div class='head'>diff --git a/include/asm-arm/msgbuf.h b/arch/arm/include/asm/msgbuf.h<br/>index 33b35b946eaa..33b35b946eaa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/msgbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/msgbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/msgbuf.h</a></div><div class='head'>diff --git a/include/asm-arm/mtd-xip.h b/arch/arm/include/asm/mtd-xip.h<br/>index 9eb127cc7db2..d8fbe2d9b8b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mtd-xip.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mtd-xip.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mtd-xip.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mtd-xip.h</a></div><div class='hunk'>@@ -10,15 +10,13 @@</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * $Id: xip.h,v 1.2 2004/12/01 15:49:10 nico Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ARM_MTD_XIP_H__</div><div class='ctx'> #define __ARM_MTD_XIP_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/mtd-xip.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/mtd-xip.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* fill instruction prefetch */</div><div class='ctx'> #define xip_iprefetch() 	do { asm volatile (".rep 8; nop; .endr"); } while (0)</div><div class='head'>diff --git a/include/asm-arm/mutex.h b/arch/arm/include/asm/mutex.h<br/>index 020bd98710a1..93226cf23ae0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mutex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mutex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/mutex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/mutex.h</div><div class='add'>+ * arch/arm/include/asm/mutex.h</div><div class='ctx'>  *</div><div class='ctx'>  * ARM optimized mutex locking primitives</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/nwflash.h b/arch/arm/include/asm/nwflash.h<br/>index 04e5a557a884..04e5a557a884 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/nwflash.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/nwflash.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/nwflash.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/nwflash.h</a></div><div class='head'>diff --git a/include/asm-arm/page-nommu.h b/arch/arm/include/asm/page-nommu.h<br/>index ea1cde84f500..3574c0deb37f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/page-nommu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/page-nommu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/page-nommu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/page-nommu.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/page-nommu.h</div><div class='add'>+ *  arch/arm/include/asm/page-nommu.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 Hyok S. Choi</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/page.h b/arch/arm/include/asm/page.h<br/>index 7c5fc5582e5d..cf2e2680daaa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/page.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/page.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/page.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/page.h</div><div class='add'>+ *  arch/arm/include/asm/page.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1995-2003 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/param.h b/arch/arm/include/asm/param.h<br/>index 15806468ba72..8b24bf94c06b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/param.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/param.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/param.h</div><div class='add'>+ *  arch/arm/include/asm/param.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1995-1999 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/parport.h b/arch/arm/include/asm/parport.h<br/>index f2f90c76ddd1..26e94b09035a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/parport.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/parport.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/parport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/parport.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/parport.h: ARM-specific parport initialisation</div><div class='add'>+ *  arch/arm/include/asm/parport.h: ARM-specific parport initialisation</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999, 2000  Tim Waugh &lt;tim@cyberelk.demon.co.uk&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/pci.h b/arch/arm/include/asm/pci.h<br/>index 2d84792f2e12..918d0cbbf064 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/pci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/pci.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> #include &lt;asm-generic/pci-dma-compat.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt; /* for PCIBIOS_MIN_* */</div><div class='add'>+#include &lt;mach/hardware.h&gt; /* for PCIBIOS_MIN_* */</div><div class='ctx'> </div><div class='ctx'> #define pcibios_scan_all_fns(a, b)	0</div><div class='ctx'> </div><div class='hunk'>@@ -30,7 +30,7 @@ static inline void pcibios_penalize_isa_irq(int irq, int active)</div><div class='ctx'>  * The networking and block device layers use this boolean for bounce</div><div class='ctx'>  * buffer decisions.</div><div class='ctx'>  */</div><div class='del'>-#define PCI_DMA_BUS_IS_PHYS     (0)</div><div class='add'>+#define PCI_DMA_BUS_IS_PHYS     (1)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Whether pci_unmap_{single,page} is a nop depends upon the</div><div class='head'>diff --git a/include/asm-arm/percpu.h b/arch/arm/include/asm/percpu.h<br/>index b4e32d8ec072..b4e32d8ec072 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/percpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/percpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/percpu.h</a></div><div class='head'>diff --git a/include/asm-arm/pgalloc.h b/arch/arm/include/asm/pgalloc.h<br/>index 163b0305dd76..3dcd64bf1824 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/pgalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/pgalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/pgalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/pgalloc.h</div><div class='add'>+ *  arch/arm/include/asm/pgalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000-2001 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/pgtable-hwdef.h b/arch/arm/include/asm/pgtable-hwdef.h<br/>index f3b5120c99fe..fd1521d5cb9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/pgtable-hwdef.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/pgtable-hwdef.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pgtable-hwdef.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/pgtable-hwdef.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/pgtable-hwdef.h</div><div class='add'>+ *  arch/arm/include/asm/pgtable-hwdef.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1995-2002 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/pgtable-nommu.h b/arch/arm/include/asm/pgtable-nommu.h<br/>index 386fcc10a973..b011f2e939aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/pgtable-nommu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/pgtable-nommu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pgtable-nommu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/pgtable-nommu.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/pgtable-nommu.h</div><div class='add'>+ *  arch/arm/include/asm/pgtable-nommu.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1995-2002 Russell King</div><div class='ctx'>  *  Copyright (C) 2004  Hyok S. Choi</div><div class='head'>diff --git a/include/asm-arm/pgtable.h b/arch/arm/include/asm/pgtable.h<br/>index 5571c13c3f3b..8e21ef15bd74 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/pgtable.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/pgtable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/pgtable.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/pgtable.h</div><div class='add'>+ *  arch/arm/include/asm/pgtable.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1995-2002 Russell King</div><div class='ctx'>  *</div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;asm/arch/vmalloc.h&gt;</div><div class='add'>+#include &lt;mach/vmalloc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/include/asm-arm/poll.h b/arch/arm/include/asm/poll.h<br/>index c98509d3149e..c98509d3149e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/poll.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/poll.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/poll.h</a></div><div class='head'>diff --git a/include/asm-arm/posix_types.h b/arch/arm/include/asm/posix_types.h<br/>index c37379dadcb2..2446d23bfdbf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/posix_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/posix_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/posix_types.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/posix_types.h</div><div class='add'>+ *  arch/arm/include/asm/posix_types.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996-1998 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/proc-fns.h b/arch/arm/include/asm/proc-fns.h<br/>index 75ec760f4c74..db80203b68e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/proc-fns.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/proc-fns.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/proc-fns.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/proc-fns.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/proc-fns.h</div><div class='add'>+ *  arch/arm/include/asm/proc-fns.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997-1999 Russell King</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd</div><div class='head'>diff --git a/include/asm-arm/processor.h b/arch/arm/include/asm/processor.h<br/>index bd8029e8dc67..517a4d6ffc74 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/processor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/processor.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/processor.h</div><div class='add'>+ *  arch/arm/include/asm/processor.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1995-1999 Russell King</div><div class='ctx'>  *</div><div class='hunk'>@@ -112,9 +112,9 @@ extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);</div><div class='ctx'> static inline void prefetch(const void *ptr)</div><div class='ctx'> {</div><div class='ctx'> 	__asm__ __volatile__(</div><div class='del'>-		"pld\t%0"</div><div class='add'>+		"pld\t%a0"</div><div class='ctx'> 		:</div><div class='del'>-		: "o" (*(char *)ptr)</div><div class='add'>+		: "p" (ptr)</div><div class='ctx'> 		: "cc");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/procinfo.h b/arch/arm/include/asm/procinfo.h<br/>index 4d3c685075e0..ca52e584ef74 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/procinfo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/procinfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/procinfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/procinfo.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/procinfo.h</div><div class='add'>+ *  arch/arm/include/asm/procinfo.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996-1999 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/ptrace.h b/arch/arm/include/asm/ptrace.h<br/>index 8382b7510f94..b415c0e85458 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/ptrace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/ptrace.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/ptrace.h</div><div class='add'>+ *  arch/arm/include/asm/ptrace.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996-2003 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/resource.h b/arch/arm/include/asm/resource.h<br/>index 734b581b5b6a..734b581b5b6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/resource.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/resource.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/resource.h</a></div><div class='head'>diff --git a/include/asm-arm/scatterlist.h b/arch/arm/include/asm/scatterlist.h<br/>index ca0a37d03400..ca0a37d03400 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/scatterlist.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/scatterlist.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/scatterlist.h</a></div><div class='head'>diff --git a/include/asm-arm/sections.h b/arch/arm/include/asm/sections.h<br/>index 2b8c5160388f..2b8c5160388f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/sections.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/sections.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/sections.h</a></div><div class='head'>diff --git a/include/asm-arm/segment.h b/arch/arm/include/asm/segment.h<br/>index 9e24c21f6304..9e24c21f6304 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/segment.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/segment.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/segment.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/segment.h</a></div><div class='head'>diff --git a/include/asm-arm/sembuf.h b/arch/arm/include/asm/sembuf.h<br/>index 1c0283954289..1c0283954289 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/sembuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/sembuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/sembuf.h</a></div><div class='head'>diff --git a/include/asm-arm/serial.h b/arch/arm/include/asm/serial.h<br/>index 015b262dc145..ebb049091e26 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/serial.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/serial.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/serial.h</div><div class='add'>+ *  arch/arm/include/asm/serial.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/setup.h b/arch/arm/include/asm/setup.h<br/>index 7bbf105463f1..7bbf105463f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/setup.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/setup.h</a></div><div class='head'>diff --git a/include/asm-arm/shmbuf.h b/arch/arm/include/asm/shmbuf.h<br/>index 2e5c67ba1c97..2e5c67ba1c97 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/shmbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/shmbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/shmbuf.h</a></div><div class='head'>diff --git a/include/asm-arm/shmparam.h b/arch/arm/include/asm/shmparam.h<br/>index a5223b3a9bf9..a5223b3a9bf9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/shmparam.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/shmparam.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/shmparam.h</a></div><div class='head'>diff --git a/include/asm-arm/sigcontext.h b/arch/arm/include/asm/sigcontext.h<br/>index fc0b80b6a6fc..fc0b80b6a6fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/sigcontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/sigcontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/sigcontext.h</a></div><div class='head'>diff --git a/include/asm-arm/siginfo.h b/arch/arm/include/asm/siginfo.h<br/>index 5e21852e6039..5e21852e6039 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/siginfo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/siginfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/siginfo.h</a></div><div class='head'>diff --git a/include/asm-arm/signal.h b/arch/arm/include/asm/signal.h<br/>index d0fb487aba4f..d0fb487aba4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/signal.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/signal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/signal.h</a></div><div class='head'>diff --git a/include/asm-arm/sizes.h b/arch/arm/include/asm/sizes.h<br/>index 503843db1565..503843db1565 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/sizes.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/sizes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/sizes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/sizes.h</a></div><div class='head'>diff --git a/include/asm-arm/smp.h b/arch/arm/include/asm/smp.h<br/>index 7fffa2404b8e..727b5c042e52 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/smp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/smp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/smp.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/smp.h</div><div class='add'>+ *  arch/arm/include/asm/smp.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004-2005 ARM Ltd.</div><div class='ctx'>  *</div><div class='hunk'>@@ -14,10 +14,10 @@</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/smp.h&gt;</div><div class='add'>+#include &lt;mach/smp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_SMP</div><div class='del'>-# error "&lt;asm-arm/smp.h&gt; included in non-SMP build"</div><div class='add'>+# error "&lt;asm/smp.h&gt; included in non-SMP build"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define raw_smp_processor_id() (current_thread_info()-&gt;cpu)</div><div class='head'>diff --git a/include/asm-arm/socket.h b/arch/arm/include/asm/socket.h<br/>index 6817be9573a6..6817be9573a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/socket.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/socket.h</a></div><div class='head'>diff --git a/include/asm-arm/sockios.h b/arch/arm/include/asm/sockios.h<br/>index a2588a2512df..a2588a2512df 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/sockios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/sockios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/sockios.h</a></div><div class='head'>diff --git a/include/asm-arm/sparsemem.h b/arch/arm/include/asm/sparsemem.h<br/>index 277158191a0d..277158191a0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/sparsemem.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/sparsemem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/sparsemem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/sparsemem.h</a></div><div class='head'>diff --git a/include/asm-arm/spinlock.h b/arch/arm/include/asm/spinlock.h<br/>index 2b41ebbfa7ff..2b41ebbfa7ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/spinlock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/spinlock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/spinlock.h</a></div><div class='head'>diff --git a/include/asm-arm/spinlock_types.h b/arch/arm/include/asm/spinlock_types.h<br/>index 43e83f6d2ee5..43e83f6d2ee5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/spinlock_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/spinlock_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/spinlock_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/spinlock_types.h</a></div><div class='head'>diff --git a/include/asm-arm/stat.h b/arch/arm/include/asm/stat.h<br/>index 42c0c13999d5..42c0c13999d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/stat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/stat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/stat.h</a></div><div class='head'>diff --git a/include/asm-arm/statfs.h b/arch/arm/include/asm/statfs.h<br/>index a02e6a8c3d70..a02e6a8c3d70 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/statfs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/statfs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/statfs.h</a></div><div class='head'>diff --git a/include/asm-arm/string.h b/arch/arm/include/asm/string.h<br/>index e50c4a39b699..e50c4a39b699 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/string.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/string.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/string.h</a></div><div class='head'>diff --git a/include/asm-arm/suspend.h b/arch/arm/include/asm/suspend.h<br/>index cf0d0bdee74d..cf0d0bdee74d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/suspend.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/suspend.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/suspend.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/suspend.h</a></div><div class='head'>diff --git a/include/asm-arm/system.h b/arch/arm/include/asm/system.h<br/>index 514af792a598..514af792a598 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/system.h</a></div><div class='head'>diff --git a/include/asm-arm/termbits.h b/arch/arm/include/asm/termbits.h<br/>index f784d11f40b5..f784d11f40b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/termbits.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/termbits.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/termbits.h</a></div><div class='head'>diff --git a/include/asm-arm/termios.h b/arch/arm/include/asm/termios.h<br/>index 293e3f1bc3f2..293e3f1bc3f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/termios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/termios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/termios.h</a></div><div class='head'>diff --git a/include/asm-arm/therm.h b/arch/arm/include/asm/therm.h<br/>index e51c923ecdf3..f002f0197d78 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/therm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/therm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/therm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/therm.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/therm.h: Definitions for Dallas Semiconductor</div><div class='add'>+ * arch/arm/include/asm/therm.h: Definitions for Dallas Semiconductor</div><div class='ctx'>  *  DS1620 thermometer driver (as used in the Rebel.com NetWinder)</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __ASM_THERM_H</div><div class='head'>diff --git a/include/asm-arm/thread_info.h b/arch/arm/include/asm/thread_info.h<br/>index d4be2d646160..e56fa48e4ae7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/thread_info.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/thread_info.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/thread_info.h</div><div class='add'>+ *  arch/arm/include/asm/thread_info.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2002 Russell King.</div><div class='ctx'>  *</div><div class='hunk'>@@ -117,7 +117,7 @@ extern void iwmmxt_task_switch(struct thread_info *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We use bit 30 of the preempt_count to indicate that kernel</div><div class='del'>- * preemption is occurring.  See include/asm-arm/hardirq.h.</div><div class='add'>+ * preemption is occurring.  See &lt;asm/hardirq.h&gt;.</div><div class='ctx'>  */</div><div class='ctx'> #define PREEMPT_ACTIVE	0x40000000</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/thread_notify.h b/arch/arm/include/asm/thread_notify.h<br/>index 8866e5216840..f27379d7f72a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/thread_notify.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/thread_notify.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/thread_notify.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/thread_notify.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/thread_notify.h</div><div class='add'>+ *  arch/arm/include/asm/thread_notify.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2006 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/timex.h b/arch/arm/include/asm/timex.h<br/>index 7b8d4cb24be0..3be8de3adaba 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/timex.h</div><div class='add'>+ *  arch/arm/include/asm/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997,1998 Russell King</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #ifndef _ASMARM_TIMEX_H</div><div class='ctx'> #define _ASMARM_TIMEX_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/timex.h&gt;</div><div class='add'>+#include &lt;mach/timex.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef unsigned long cycles_t;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/tlb.h b/arch/arm/include/asm/tlb.h<br/>index 36bd402a21cb..857f1dfac794 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/tlb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/tlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/tlb.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/tlb.h</div><div class='add'>+ *  arch/arm/include/asm/tlb.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2002 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/tlbflush.h b/arch/arm/include/asm/tlbflush.h<br/>index 909656c747ef..b543a054a17e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/tlbflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/tlbflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/tlbflush.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/tlbflush.h</div><div class='add'>+ *  arch/arm/include/asm/tlbflush.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999-2003 Russell King</div><div class='ctx'>  *</div><div class='hunk'>@@ -54,6 +54,7 @@</div><div class='ctx'>  *	  v4wbi - ARMv4 with write buffer with I TLB flush entry instruction</div><div class='ctx'>  *	  fr    - Feroceon (v4wbi with non-outer-cacheable page table walks)</div><div class='ctx'>  *	  v6wbi - ARMv6 with write buffer with I TLB flush entry instruction</div><div class='add'>+ *	  v7wbi - identical to v6wbi</div><div class='ctx'>  */</div><div class='ctx'> #undef _TLB</div><div class='ctx'> #undef MULTI_TLB</div><div class='hunk'>@@ -266,14 +267,16 @@ extern struct cpu_tlb_fns cpu_tlb;</div><div class='ctx'> 				 v4wbi_possible_flags | \</div><div class='ctx'> 				 fr_possible_flags | \</div><div class='ctx'> 				 v4wb_possible_flags | \</div><div class='del'>-				 v6wbi_possible_flags)</div><div class='add'>+				 v6wbi_possible_flags | \</div><div class='add'>+				 v7wbi_possible_flags)</div><div class='ctx'> </div><div class='ctx'> #define always_tlb_flags	(v3_always_flags &amp; \</div><div class='ctx'> 				 v4_always_flags &amp; \</div><div class='ctx'> 				 v4wbi_always_flags &amp; \</div><div class='ctx'> 				 fr_always_flags &amp; \</div><div class='ctx'> 				 v4wb_always_flags &amp; \</div><div class='del'>-				 v6wbi_always_flags)</div><div class='add'>+				 v6wbi_always_flags &amp; \</div><div class='add'>+				 v7wbi_always_flags)</div><div class='ctx'> </div><div class='ctx'> #define tlb_flag(f)	((always_tlb_flags &amp; (f)) || (__tlb_flag &amp; possible_tlb_flags &amp; (f)))</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/topology.h b/arch/arm/include/asm/topology.h<br/>index accbd7cad9b5..accbd7cad9b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/topology.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/topology.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/topology.h</a></div><div class='head'>diff --git a/include/asm-arm/traps.h b/arch/arm/include/asm/traps.h<br/>index aa399aec568e..aa399aec568e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/traps.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/traps.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/traps.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/traps.h</a></div><div class='head'>diff --git a/include/asm-arm/types.h b/arch/arm/include/asm/types.h<br/>index 345df01534a4..345df01534a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/types.h</a></div><div class='head'>diff --git a/include/asm-arm/uaccess.h b/arch/arm/include/asm/uaccess.h<br/>index 4c1a3fa9f259..d0f51ff900b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/uaccess.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/uaccess.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/uaccess.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/uaccess.h</div><div class='add'>+ *  arch/arm/include/asm/uaccess.h</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='head'>diff --git a/include/asm-arm/ucontext.h b/arch/arm/include/asm/ucontext.h<br/>index bf65e9f4525d..bf65e9f4525d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/ucontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/ucontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/ucontext.h</a></div><div class='head'>diff --git a/include/asm-arm/unaligned.h b/arch/arm/include/asm/unaligned.h<br/>index 44593a894903..44593a894903 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/unaligned.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/unaligned.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/unaligned.h</a></div><div class='head'>diff --git a/include/asm-arm/unistd.h b/arch/arm/include/asm/unistd.h<br/>index 7c570082b1e0..010618487cf1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/unistd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/unistd.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/unistd.h</div><div class='add'>+ *  arch/arm/include/asm/unistd.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2001-2005 Russell King</div><div class='ctx'>  *</div><div class='hunk'>@@ -381,6 +381,12 @@</div><div class='ctx'> #define __NR_fallocate			(__NR_SYSCALL_BASE+352)</div><div class='ctx'> #define __NR_timerfd_settime		(__NR_SYSCALL_BASE+353)</div><div class='ctx'> #define __NR_timerfd_gettime		(__NR_SYSCALL_BASE+354)</div><div class='add'>+#define __NR_signalfd4			(__NR_SYSCALL_BASE+355)</div><div class='add'>+#define __NR_eventfd2			(__NR_SYSCALL_BASE+356)</div><div class='add'>+#define __NR_epoll_create1		(__NR_SYSCALL_BASE+357)</div><div class='add'>+#define __NR_dup3			(__NR_SYSCALL_BASE+358)</div><div class='add'>+#define __NR_pipe2			(__NR_SYSCALL_BASE+359)</div><div class='add'>+#define __NR_inotify_init1		(__NR_SYSCALL_BASE+360)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The following SWIs are ARM private.</div><div class='head'>diff --git a/include/asm-arm/user.h b/arch/arm/include/asm/user.h<br/>index 825c1e7c582d..825c1e7c582d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/user.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/user.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/user.h</a></div><div class='head'>diff --git a/include/asm-arm/vfp.h b/arch/arm/include/asm/vfp.h<br/>index 5f9a2cb3d452..f4ab34fd4f72 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/vfp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/vfp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/vfp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/vfp.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/vfp.h</div><div class='add'>+ * arch/arm/include/asm/vfp.h</div><div class='ctx'>  *</div><div class='ctx'>  * VFP register definitions.</div><div class='ctx'>  * First, the standard VFP set.</div><div class='head'>diff --git a/include/asm-arm/vfpmacros.h b/arch/arm/include/asm/vfpmacros.h<br/>index cccb3892e73c..422f3cc204a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/vfpmacros.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/vfpmacros.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/vfpmacros.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/vfpmacros.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/vfpmacros.h</div><div class='add'>+ * arch/arm/include/asm/vfpmacros.h</div><div class='ctx'>  *</div><div class='ctx'>  * Assembler-only file containing VFP macros and register definitions.</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/vga.h b/arch/arm/include/asm/vga.h<br/>index 1e0b913c3d71..6a3cd2a2f670 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/vga.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/vga.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/vga.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/vga.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #ifndef ASMARM_VGA_H</div><div class='ctx'> #define ASMARM_VGA_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define VGA_MAP_MEM(x,s)	(PCIMEM_BASE + (x))</div><div class='head'>diff --git a/include/asm-arm/xor.h b/arch/arm/include/asm/xor.h<br/>index e7c4cf58bed1..7604673dc427 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/xor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/xor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/xor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/include/asm/xor.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/xor.h</div><div class='add'>+ *  arch/arm/include/asm/xor.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2001 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/kernel/.gitignore b/arch/arm/kernel/.gitignore<br/>new file mode 100644<br/>index 000000000000..c5f676c3c224<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/.gitignore</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+vmlinux.lds</div><div class='head'>diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S<br/>index 30a67a5a40a8..09a061cb7838 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/calls.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/kernel/calls.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/calls.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/calls.S</a></div><div class='hunk'>@@ -262,10 +262,10 @@</div><div class='ctx'> /* 250 */	CALL(sys_epoll_create)</div><div class='ctx'> 		CALL(ABI(sys_epoll_ctl, sys_oabi_epoll_ctl))</div><div class='ctx'> 		CALL(ABI(sys_epoll_wait, sys_oabi_epoll_wait))</div><div class='del'>-	 	CALL(sys_remap_file_pages)</div><div class='add'>+		CALL(sys_remap_file_pages)</div><div class='ctx'> 		CALL(sys_ni_syscall)	/* sys_set_thread_area */</div><div class='ctx'> /* 255 */	CALL(sys_ni_syscall)	/* sys_get_thread_area */</div><div class='del'>- 		CALL(sys_set_tid_address)</div><div class='add'>+		CALL(sys_set_tid_address)</div><div class='ctx'> 		CALL(sys_timer_create)</div><div class='ctx'> 		CALL(sys_timer_settime)</div><div class='ctx'> 		CALL(sys_timer_gettime)</div><div class='hunk'>@@ -364,6 +364,12 @@</div><div class='ctx'> 		CALL(sys_fallocate)</div><div class='ctx'> 		CALL(sys_timerfd_settime)</div><div class='ctx'> 		CALL(sys_timerfd_gettime)</div><div class='add'>+/* 355 */	CALL(sys_signalfd4)</div><div class='add'>+		CALL(sys_eventfd2)</div><div class='add'>+		CALL(sys_epoll_create1)</div><div class='add'>+		CALL(sys_dup3)</div><div class='add'>+		CALL(sys_pipe2)</div><div class='add'>+/* 360 */	CALL(sys_inotify_init1)</div><div class='ctx'> #ifndef syscalls_counted</div><div class='ctx'> .equ syscalls_padding, ((NR_syscalls + 3) &amp; ~3) - NR_syscalls</div><div class='ctx'> #define syscalls_counted</div><div class='head'>diff --git a/arch/arm/kernel/crunch-bits.S b/arch/arm/kernel/crunch-bits.S<br/>index a26886758c67..0ec9bb48fab9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/crunch-bits.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/kernel/crunch-bits.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/crunch-bits.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/crunch-bits.S</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#include &lt;asm/arch/ep93xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/ep93xx-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We can't use hex constants here due to a bug in gas.</div><div class='head'>diff --git a/arch/arm/kernel/crunch.c b/arch/arm/kernel/crunch.c<br/>index 627d79414c9d..3b6a1c293ee4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/crunch.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/kernel/crunch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/crunch.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/crunch.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/arch/ep93xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/ep93xx-regs.h&gt;</div><div class='ctx'> #include &lt;asm/thread_notify.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S<br/>index 5617566477b4..9550ff0ddde4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/debug.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/kernel/debug.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/debug.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/debug.S</a></div><div class='hunk'>@@ -80,7 +80,7 @@</div><div class='ctx'> #endif	/* CONFIG_CPU_V6 */</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='del'>-#include &lt;asm/arch/debug-macro.S&gt;</div><div class='add'>+#include &lt;mach/debug-macro.S&gt;</div><div class='ctx'> #endif	/* CONFIG_DEBUG_ICEDCC */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c<br/>index f5cfdabcb87d..7a50575a8d4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/ecard.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/kernel/ecard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/ecard.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/ecard.c</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/ecard.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='head'>diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S<br/>index 7dca225752c1..617e509d60df 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/entry-armv.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/kernel/entry-armv.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/entry-armv.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/entry-armv.S</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/glue.h&gt;</div><div class='ctx'> #include &lt;asm/vfpmacros.h&gt;</div><div class='del'>-#include &lt;asm/arch/entry-macro.S&gt;</div><div class='add'>+#include &lt;mach/entry-macro.S&gt;</div><div class='ctx'> #include &lt;asm/thread_notify.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "entry-header.S"</div><div class='head'>diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S<br/>index 84694e88b428..060d7e2e9f64 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/entry-common.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/kernel/entry-common.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/entry-common.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/entry-common.S</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/ftrace.h&gt;</div><div class='del'>-#include &lt;asm/arch/entry-macro.S&gt;</div><div class='add'>+#include &lt;mach/entry-macro.S&gt;</div><div class='ctx'> </div><div class='ctx'> #include "entry-header.S"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S<br/>index 7e9c00a8a412..1c3c6ea5f9e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/head-common.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/kernel/head-common.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/head-common.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/head-common.S</a></div><div class='hunk'>@@ -181,7 +181,7 @@ ENTRY(lookup_processor_type)</div><div class='ctx'> 	ldmfd	sp!, {r4 - r7, r9, pc}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Look in include/asm-arm/procinfo.h and arch/arm/kernel/arch.[ch] for</div><div class='add'>+ * Look in &lt;asm/procinfo.h&gt; and arch/arm/kernel/arch.[ch] for</div><div class='ctx'>  * more information about the __proc_info and __arch_info structures.</div><div class='ctx'>  */</div><div class='ctx'> 	.long	__proc_info_begin</div><div class='head'>diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S<br/>index 5d78ffb8a9a7..27329bd32037 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/head-nommu.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/kernel/head-nommu.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/head-nommu.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/head-nommu.S</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='head'>diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c<br/>index 11dcd52e51be..f88efb135b70 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/irq.c</a></div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c<br/>index db8f54a3451f..fae5beb3c3d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/machine_kexec.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/kernel/machine_kexec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/machine_kexec.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/machine_kexec.c</a></div><div class='hunk'>@@ -71,7 +71,7 @@ void machine_kexec(struct kimage *image)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	flush_icache_range((unsigned long) reboot_code_buffer,</div><div class='del'>-			   (unsigned long) reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE);</div><div class='add'>+			   (unsigned long) reboot_code_buffer + KEXEC_CONTROL_PAGE_SIZE);</div><div class='ctx'> 	printk(KERN_INFO "Bye!\n");</div><div class='ctx'> </div><div class='ctx'> 	cpu_proc_fin();</div><div class='head'>diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c<br/>index 89bfded70a1f..3fd882337064 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/process.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/process.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/process.c</a></div><div class='hunk'>@@ -51,7 +51,7 @@ extern void setup_mm_for_reboot(char mode);</div><div class='ctx'> </div><div class='ctx'> static volatile int hlt_counter;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/system.h&gt;</div><div class='add'>+#include &lt;mach/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> void disable_hlt(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c<br/>index 38f0e7940a13..2ca7038b67a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/setup.c</a></div><div class='hunk'>@@ -81,6 +81,8 @@ EXPORT_SYMBOL(system_serial_high);</div><div class='ctx'> unsigned int elf_hwcap;</div><div class='ctx'> EXPORT_SYMBOL(elf_hwcap);</div><div class='ctx'> </div><div class='add'>+unsigned long __initdata vmalloc_reserve = 128 &lt;&lt; 20;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #ifdef MULTI_CPU</div><div class='ctx'> struct processor processor;</div><div class='hunk'>@@ -501,6 +503,17 @@ static void __init early_mem(char **p)</div><div class='ctx'> __early_param("mem=", early_mem);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * vmalloc=size forces the vmalloc area to be exactly 'size'</div><div class='add'>+ * bytes. This can be used to increase (or decrease) the vmalloc</div><div class='add'>+ * area - the default is 128m.</div><div class='add'>+ */</div><div class='add'>+static void __init early_vmalloc(char **arg)</div><div class='add'>+{</div><div class='add'>+	vmalloc_reserve = memparse(*arg, arg);</div><div class='add'>+}</div><div class='add'>+__early_param("vmalloc=", early_vmalloc);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Initial parsing of the command line.</div><div class='ctx'>  */</div><div class='ctx'> static void __init parse_cmdline(char **cmdline_p, char *from)</div><div class='head'>diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c<br/>index 5a7c09564d13..e9842f6767f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/smp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/smp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/smp.c</a></div><div class='hunk'>@@ -100,7 +100,7 @@ int __cpuinit __cpu_up(unsigned int cpu)</div><div class='ctx'> 	 * a 1:1 mapping for the physical address of the kernel.</div><div class='ctx'> 	 */</div><div class='ctx'> 	pgd = pgd_alloc(&amp;init_mm);</div><div class='del'>-	pmd = pmd_offset(pgd, PHYS_OFFSET);</div><div class='add'>+	pmd = pmd_offset(pgd + pgd_index(PHYS_OFFSET), PHYS_OFFSET);</div><div class='ctx'> 	*pmd = __pmd((PHYS_OFFSET &amp; PGDIR_MASK) |</div><div class='ctx'> 		     PMD_TYPE_SECT | PMD_SECT_AP_WRITE);</div><div class='ctx'> </div><div class='hunk'>@@ -139,7 +139,7 @@ int __cpuinit __cpu_up(unsigned int cpu)</div><div class='ctx'> 	secondary_data.stack = NULL;</div><div class='ctx'> 	secondary_data.pgdir = 0;</div><div class='ctx'> </div><div class='del'>-	*pmd_offset(pgd, PHYS_OFFSET) = __pmd(0);</div><div class='add'>+	*pmd = __pmd(0);</div><div class='ctx'> 	pgd_free(&amp;init_mm, pgd);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='head'>diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c<br/>index 7277aef83098..872f1f8fbb57 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/traps.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/traps.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/kernel/traps.c</a></div><div class='hunk'>@@ -288,14 +288,28 @@ void unregister_undef_hook(struct undef_hook *hook)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;undef_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int call_undef_hook(struct pt_regs *regs, unsigned int instr)</div><div class='add'>+{</div><div class='add'>+	struct undef_hook *hook;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int (*fn)(struct pt_regs *regs, unsigned int instr) = NULL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;undef_lock, flags);</div><div class='add'>+	list_for_each_entry(hook, &amp;undef_hook, node)</div><div class='add'>+		if ((instr &amp; hook-&gt;instr_mask) == hook-&gt;instr_val &amp;&amp;</div><div class='add'>+		    (regs-&gt;ARM_cpsr &amp; hook-&gt;cpsr_mask) == hook-&gt;cpsr_val)</div><div class='add'>+			fn = hook-&gt;fn;</div><div class='add'>+	spin_unlock_irqrestore(&amp;undef_lock, flags);</div><div class='add'>+</div><div class='add'>+	return fn ? fn(regs, instr) : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> asmlinkage void __exception do_undefinstr(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int correction = thumb_mode(regs) ? 2 : 4;</div><div class='ctx'> 	unsigned int instr;</div><div class='del'>-	struct undef_hook *hook;</div><div class='ctx'> 	siginfo_t info;</div><div class='ctx'> 	void __user *pc;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * According to the ARM ARM, PC is 2 or 4 bytes ahead,</div><div class='hunk'>@@ -325,17 +339,8 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;undef_lock, flags);</div><div class='del'>-	list_for_each_entry(hook, &amp;undef_hook, node) {</div><div class='del'>-		if ((instr &amp; hook-&gt;instr_mask) == hook-&gt;instr_val &amp;&amp;</div><div class='del'>-		    (regs-&gt;ARM_cpsr &amp; hook-&gt;cpsr_mask) == hook-&gt;cpsr_val) {</div><div class='del'>-			if (hook-&gt;fn(regs, instr) == 0) {</div><div class='del'>-				spin_unlock_irqrestore(&amp;undef_lock, flags);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;undef_lock, flags);</div><div class='add'>+	if (call_undef_hook(regs, instr) == 0)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_USER</div><div class='ctx'> 	if (user_debug &amp; UDBG_UNDEFINED) {</div><div class='head'>diff --git a/arch/arm/lib/ecard.S b/arch/arm/lib/ecard.S<br/>index c55aaa2a2088..8678eb2b7a60 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/ecard.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/lib/ecard.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/ecard.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/lib/ecard.S</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CPSR2SPSR(rt) \</div><div class='ctx'> 		mrs	rt, cpsr; \</div><div class='head'>diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S<br/>index 1dd8ea4f9a9c..2034d4dbe6ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/getuser.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/lib/getuser.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/getuser.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/lib/getuser.S</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'>  *		r2, r3 contains the zero-extended value</div><div class='ctx'>  *		lr corrupted</div><div class='ctx'>  *</div><div class='del'>- * No other registers must be altered.  (see include/asm-arm/uaccess.h</div><div class='add'>+ * No other registers must be altered.  (see &lt;asm/uaccess.h&gt;</div><div class='ctx'>  * for specific ASM register usage).</div><div class='ctx'>  *</div><div class='ctx'>  * Note that ADDR_LIMIT is either 0 or 0xc0000000.</div><div class='head'>diff --git a/arch/arm/lib/io-readsw-armv3.S b/arch/arm/lib/io-readsw-armv3.S<br/>index 4ef904185142..9aaf7c72065d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/io-readsw-armv3.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/lib/io-readsw-armv3.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/io-readsw-armv3.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/lib/io-readsw-armv3.S</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> .Linsw_bad_alignment:</div><div class='ctx'> 		adr	r0, .Linsw_bad_align_msg</div><div class='head'>diff --git a/arch/arm/lib/io-writesw-armv3.S b/arch/arm/lib/io-writesw-armv3.S<br/>index 1607a29f49b7..cd34503e424d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/io-writesw-armv3.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/lib/io-writesw-armv3.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/io-writesw-armv3.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/lib/io-writesw-armv3.S</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> .Loutsw_bad_alignment:</div><div class='ctx'> 		adr	r0, .Loutsw_bad_align_msg</div><div class='head'>diff --git a/arch/arm/lib/putuser.S b/arch/arm/lib/putuser.S<br/>index 8620afe54f72..08ec7dffa52e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/putuser.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/lib/putuser.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/putuser.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/lib/putuser.S</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'>  * Outputs:	r0 is the error code</div><div class='ctx'>  *		lr corrupted</div><div class='ctx'>  *</div><div class='del'>- * No other registers must be altered.  (see include/asm-arm/uaccess.h</div><div class='add'>+ * No other registers must be altered.  (see &lt;asm/uaccess.h&gt;</div><div class='ctx'>  * for specific ASM register usage).</div><div class='ctx'>  *</div><div class='ctx'>  * Note that ADDR_LIMIT is either 0 or 0xc0000000</div><div class='head'>diff --git a/arch/arm/lib/sha1.S b/arch/arm/lib/sha1.S<br/>index ff6ece487ffc..67c2bf4774b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/sha1.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/lib/sha1.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/sha1.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/lib/sha1.S</a></div><div class='hunk'>@@ -29,7 +29,7 @@ ENTRY(sha_transform)</div><div class='ctx'> 	stmfd	sp!, {r4 - r8, lr}</div><div class='ctx'> </div><div class='ctx'> 	@ for (i = 0; i &lt; 16; i++)</div><div class='del'>-	@         W[i] = be32_to_cpu(in[i]); */</div><div class='add'>+	@         W[i] = be32_to_cpu(in[i]);</div><div class='ctx'> </div><div class='ctx'> #ifdef __ARMEB__</div><div class='ctx'> 	mov	r4, r0</div><div class='head'>diff --git a/arch/arm/mach-aaec2000/aaed2000.c b/arch/arm/mach-aaec2000/aaed2000.c<br/>index 83f57da3184c..81a3ecc0d104 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/aaed2000.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-aaec2000/aaed2000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/aaed2000.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/aaed2000.c</a></div><div class='hunk'>@@ -20,14 +20,14 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/aaed2000.h&gt;</div><div class='add'>+#include &lt;mach/aaed2000.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c<br/>index b016be2b0e35..dfb26bc23d1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-aaec2000/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/core.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-aaec2000/aaec2000.h b/arch/arm/mach-aaec2000/include/mach/aaec2000.h<br/>index a6d1ee0980f2..bc729c42f843 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-aaec2000/aaec2000.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-aaec2000/aaec2000.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/include/mach/aaec2000.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/aaec2000.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-aaec2000/aaec2000.h</div><div class='add'>+ *  arch/arm/mach-aaec2000/include/mach/aaec2000.h</div><div class='ctx'>  *</div><div class='ctx'>  *  AAEC-2000 registers definition</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-aaec2000/aaed2000.h b/arch/arm/mach-aaec2000/include/mach/aaed2000.h<br/>index bc76d2badb91..f821295ca71b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-aaec2000/aaed2000.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-aaec2000/aaed2000.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/include/mach/aaed2000.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/aaed2000.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-aaec2000/aaed2000.h</div><div class='add'>+ *  arch/arm/mach-aaec2000/include/mach/aaed2000.h</div><div class='ctx'>  *</div><div class='ctx'>  *  AAED-2000 specific bits definition</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-aaec2000/debug-macro.S b/arch/arm/mach-aaec2000/include/mach/debug-macro.S<br/>index 7b1fce021d8a..0b6351d7c389 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-aaec2000/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-aaec2000/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/*  linux/include/asm-arm/arch-aaec2000/debug-macro.S</div><div class='add'>+/*  arch/arm/mach-aaec2000/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  *  Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-aaec2000/dma.h b/arch/arm/mach-aaec2000/include/mach/dma.h<br/>index e100b1e526fe..2da846c72fe7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-aaec2000/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-aaec2000/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-aaec2000/dma.h</div><div class='add'>+ *  arch/arm/mach-aaec2000/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) 2005 Nicolas Bellido Y Ortega</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-aaec2000/entry-macro.S b/arch/arm/mach-aaec2000/include/mach/entry-macro.S<br/>index 83fdf68f6b7c..c8fb34469007 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-aaec2000/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-aaec2000/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-aaec2000/entry-macro.S</div><div class='add'>+ *  arch/arm/mach-aaec2000/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  *  Low-level IRQ helper for aaec-2000 based platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  *  published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='head'>diff --git a/include/asm-arm/arch-aaec2000/hardware.h b/arch/arm/mach-aaec2000/include/mach/hardware.h<br/>index 153506fd06ed..965a6f6672d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-aaec2000/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-aaec2000/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-aaec2000/hardware.h</div><div class='add'>+ *  arch/arm/mach-aaec2000/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) 2005 Nicolas Bellido Y Ortega</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #define __ASM_ARCH_HARDWARE_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='del'>-#include &lt;asm/arch/aaec2000.h&gt;</div><div class='add'>+#include &lt;mach/aaec2000.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* The kernel is loaded at physical address 0xf8000000.</div><div class='ctx'>  * We map the IO space a bit after</div><div class='head'>diff --git a/include/asm-arm/arch-aaec2000/io.h b/arch/arm/mach-aaec2000/include/mach/io.h<br/>index d710204ac747..c87c24de1110 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-aaec2000/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-aaec2000/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/io.h</a></div><div class='hunk'>@@ -1,12 +1,12 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-aaec2000/io.h</div><div class='add'>+ *  arch/arm/mach-aaec2000/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copied from asm/arch/sa1100/io.h</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __ASM_ARM_ARCH_IO_H</div><div class='ctx'> #define __ASM_ARM_ARCH_IO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT 0xffffffff</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-aaec2000/irqs.h b/arch/arm/mach-aaec2000/include/mach/irqs.h<br/>index de252220e806..bf45c6d2f294 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-aaec2000/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-aaec2000/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-aaec2000/irqs.h</div><div class='add'>+ *  arch/arm/mach-aaec2000/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) 2005 Nicolas Bellido Y Ortega</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-aaec2000/memory.h b/arch/arm/mach-aaec2000/include/mach/memory.h<br/>index 9eceb4148922..56ae900a482e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-aaec2000/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-aaec2000/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-aaec2000/memory.h</div><div class='add'>+ *  arch/arm/mach-aaec2000/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) 2005 Nicolas Bellido Y Ortega</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-aaec2000/system.h b/arch/arm/mach-aaec2000/include/mach/system.h<br/>index 08de97b407a8..8f4115d734ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-aaec2000/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-aaec2000/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-aaed2000/system.h</div><div class='add'>+ *  arch/arm/mach-aaed2000/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) 2005 Nicolas Bellido Y Ortega</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-aaec2000/timex.h b/arch/arm/mach-aaec2000/include/mach/timex.h<br/>index f5708b38fb7f..6c8edf4a8828 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-aaec2000/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-aaec2000/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-aaec2000/timex.h</div><div class='add'>+ *  arch/arm/mach-aaec2000/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  *  AAEC-2000 Architecture timex specification</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-aaec2000/uncompress.h b/arch/arm/mach-aaec2000/include/mach/uncompress.h<br/>index 300f4bf3bc74..381ecad1a1bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-aaec2000/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-aaec2000/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-aaec2000/uncompress.h</div><div class='add'>+ *  arch/arm/mach-aaec2000/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) 2005 Nicolas Bellido Y Ortega</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-aaec2000/vmalloc.h b/arch/arm/mach-aaec2000/include/mach/vmalloc.h<br/>index ecb991e2e4ff..551f68f666bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-aaec2000/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-aaec2000/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-aaec2000/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-aaec2000/vmalloc.h</div><div class='add'>+ *  arch/arm/mach-aaec2000/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) 2005 Nicolas Bellido Y Ortega</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig<br/>index 5bad6b9b00d7..a048b92cb407 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/Kconfig</a></div><div class='hunk'>@@ -297,7 +297,7 @@ config MTD_AT91_DATAFLASH_CARD</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable support for the DataFlash card.</div><div class='ctx'> </div><div class='del'>-config MTD_NAND_AT91_BUSWIDTH_16</div><div class='add'>+config MTD_NAND_ATMEL_BUSWIDTH_16</div><div class='ctx'> 	bool "Enable 16-bit data bus interface to NAND flash"</div><div class='ctx'> 	depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_AT91CAP9ADK)</div><div class='ctx'> 	help</div><div class='head'>diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c<br/>index 933fa8f55cbc..638948c16770 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91cap9.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/at91cap9.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91cap9.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91cap9.c</a></div><div class='hunk'>@@ -17,10 +17,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91cap9.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_pmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_rstc.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_shdwc.h&gt;</div><div class='add'>+#include &lt;mach/at91cap9.h&gt;</div><div class='add'>+#include &lt;mach/at91_pmc.h&gt;</div><div class='add'>+#include &lt;mach/at91_rstc.h&gt;</div><div class='add'>+#include &lt;mach/at91_shdwc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "clock.h"</div><div class='head'>diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c<br/>index dc8b40783d94..abb4aac8fa98 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91cap9_devices.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/at91cap9_devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91cap9_devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91cap9_devices.c</a></div><div class='hunk'>@@ -20,11 +20,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/atmel_lcdc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91cap9.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91cap9_matrix.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9_smc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/at91cap9.h&gt;</div><div class='add'>+#include &lt;mach/at91cap9_matrix.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9_smc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -376,7 +376,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}</div><div class='ctx'>  *  NAND / SmartMedia</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)</div><div class='add'>+#if defined(CONFIG_MTD_NAND_ATMEL) || defined(CONFIG_MTD_NAND_ATMEL_MODULE)</div><div class='ctx'> static struct atmel_nand_data nand_data;</div><div class='ctx'> </div><div class='ctx'> #define NAND_BASE	AT91_CHIPSELECT_3</div><div class='head'>diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c<br/>index d688c1dbd925..28594fcc88e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91rm9200.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/at91rm9200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91rm9200.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91rm9200.c</a></div><div class='hunk'>@@ -14,9 +14,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91rm9200.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_pmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_st.h&gt;</div><div class='add'>+#include &lt;mach/at91rm9200.h&gt;</div><div class='add'>+#include &lt;mach/at91_pmc.h&gt;</div><div class='add'>+#include &lt;mach/at91_st.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "clock.h"</div><div class='head'>diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c<br/>index 8ced9bc82099..9338825cfcd7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91rm9200_devices.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/at91rm9200_devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91rm9200_devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91rm9200_devices.c</a></div><div class='hunk'>@@ -17,10 +17,10 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91rm9200.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91rm9200_mc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/at91rm9200.h&gt;</div><div class='add'>+#include &lt;mach/at91rm9200_mc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -368,7 +368,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}</div><div class='ctx'>  *  NAND / SmartMedia</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)</div><div class='add'>+#if defined(CONFIG_MTD_NAND_ATMEL) || defined(CONFIG_MTD_NAND_ATMEL_MODULE)</div><div class='ctx'> static struct atmel_nand_data nand_data;</div><div class='ctx'> </div><div class='ctx'> #define NAND_BASE	AT91_CHIPSELECT_3</div><div class='head'>diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c<br/>index 50392ff71513..a72e798a2a40 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91rm9200_time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/at91rm9200_time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91rm9200_time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91rm9200_time.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/at91_st.h&gt;</div><div class='add'>+#include &lt;mach/at91_st.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned long last_crtr;</div><div class='ctx'> static u32 irqmask;</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c<br/>index 380f12a12200..accb69ec478e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9260.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/at91sam9260.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9260.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam9260.c</a></div><div class='hunk'>@@ -15,11 +15,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9260.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_pmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_rstc.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_shdwc.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9260.h&gt;</div><div class='add'>+#include &lt;mach/at91_pmc.h&gt;</div><div class='add'>+#include &lt;mach/at91_rstc.h&gt;</div><div class='add'>+#include &lt;mach/at91_shdwc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "clock.h"</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c<br/>index cae5f52f1278..7774d17dde74 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9260_devices.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/at91sam9260_devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9260_devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam9260_devices.c</a></div><div class='hunk'>@@ -16,12 +16,12 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9260.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9260_matrix.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9_smc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9260.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9260_matrix.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9_smc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -283,7 +283,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}</div><div class='ctx'>  *  NAND / SmartMedia</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)</div><div class='add'>+#if defined(CONFIG_MTD_NAND_ATMEL) || defined(CONFIG_MTD_NAND_ATMEL_MODULE)</div><div class='ctx'> static struct atmel_nand_data nand_data;</div><div class='ctx'> </div><div class='ctx'> #define NAND_BASE	AT91_CHIPSELECT_3</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c<br/>index 35bf6fd52516..7b51a59ae8b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9261.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/at91sam9261.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9261.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam9261.c</a></div><div class='hunk'>@@ -15,10 +15,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9261.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_pmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_rstc.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_shdwc.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9261.h&gt;</div><div class='add'>+#include &lt;mach/at91_pmc.h&gt;</div><div class='add'>+#include &lt;mach/at91_rstc.h&gt;</div><div class='add'>+#include &lt;mach/at91_shdwc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "clock.h"</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c<br/>index 483d436af22d..6b89172310c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9261_devices.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/at91sam9261_devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9261_devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam9261_devices.c</a></div><div class='hunk'>@@ -20,11 +20,11 @@</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;video/atmel_lcdc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9261.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9261_matrix.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9_smc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9261.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9261_matrix.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9_smc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -198,7 +198,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}</div><div class='ctx'>  *  NAND / SmartMedia</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)</div><div class='add'>+#if defined(CONFIG_MTD_NAND_ATMEL) || defined(CONFIG_MTD_NAND_ATMEL_MODULE)</div><div class='ctx'> static struct atmel_nand_data nand_data;</div><div class='ctx'> </div><div class='ctx'> #define NAND_BASE	AT91_CHIPSELECT_3</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c<br/>index 052074a9f2d3..80bfab5680e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9263.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/at91sam9263.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9263.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam9263.c</a></div><div class='hunk'>@@ -15,10 +15,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9263.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_pmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_rstc.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_shdwc.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9263.h&gt;</div><div class='add'>+#include &lt;mach/at91_pmc.h&gt;</div><div class='add'>+#include &lt;mach/at91_rstc.h&gt;</div><div class='add'>+#include &lt;mach/at91_shdwc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "clock.h"</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c<br/>index 9762b15f658a..c93992f55dc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9263_devices.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/at91sam9263_devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9263_devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam9263_devices.c</a></div><div class='hunk'>@@ -19,11 +19,11 @@</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;video/atmel_lcdc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9263.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9263_matrix.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9_smc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9263.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9263_matrix.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9_smc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -352,7 +352,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}</div><div class='ctx'>  *  NAND / SmartMedia</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)</div><div class='add'>+#if defined(CONFIG_MTD_NAND_ATMEL) || defined(CONFIG_MTD_NAND_ATMEL_MODULE)</div><div class='ctx'> static struct atmel_nand_data nand_data;</div><div class='ctx'> </div><div class='ctx'> #define NAND_BASE	AT91_CHIPSELECT_3</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c<br/>index 5cecbd7de6a6..122fd77ed580 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam926x_time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/at91sam926x_time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam926x_time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam926x_time.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/at91_pit.h&gt;</div><div class='add'>+#include &lt;mach/at91_pit.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define PIT_CPIV(x)	((x) &amp; AT91_PIT_CPIV)</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c<br/>index 902c79893ec7..556bddf35b45 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9rl.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/at91sam9rl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9rl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam9rl.c</a></div><div class='hunk'>@@ -14,11 +14,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9rl.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_pmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_rstc.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_shdwc.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9rl.h&gt;</div><div class='add'>+#include &lt;mach/at91_pmc.h&gt;</div><div class='add'>+#include &lt;mach/at91_rstc.h&gt;</div><div class='add'>+#include &lt;mach/at91_shdwc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "clock.h"</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c<br/>index 5f3094870cad..620886341fb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9rl_devices.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/at91sam9rl_devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9rl_devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91sam9rl_devices.c</a></div><div class='hunk'>@@ -16,11 +16,11 @@</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;video/atmel_lcdc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9rl.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9rl_matrix.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9_smc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9rl.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9rl_matrix.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9_smc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -194,7 +194,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}</div><div class='ctx'>  *  NAND / SmartMedia</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)</div><div class='add'>+#if defined(CONFIG_MTD_NAND_ATMEL) || defined(CONFIG_MTD_NAND_ATMEL_MODULE)</div><div class='ctx'> static struct atmel_nand_data nand_data;</div><div class='ctx'> </div><div class='ctx'> #define NAND_BASE	AT91_CHIPSELECT_3</div><div class='head'>diff --git a/arch/arm/mach-at91/at91x40.c b/arch/arm/mach-at91/at91x40.c<br/>index f44647738ee4..ad3ec85b2790 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91x40.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/at91x40.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91x40.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91x40.c</a></div><div class='hunk'>@@ -14,9 +14,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91x40.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_st.h&gt;</div><div class='del'>-#include &lt;asm/arch/timex.h&gt;</div><div class='add'>+#include &lt;mach/at91x40.h&gt;</div><div class='add'>+#include &lt;mach/at91_st.h&gt;</div><div class='add'>+#include &lt;mach/timex.h&gt;</div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-at91/at91x40_time.c b/arch/arm/mach-at91/at91x40_time.c<br/>index eddc882f1b4a..869b5e28d195 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91x40_time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/at91x40_time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91x40_time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/at91x40_time.c</a></div><div class='hunk'>@@ -23,10 +23,10 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_tc.h&gt;</div><div class='add'>+#include &lt;mach/at91_tc.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	3 counter/timer units present.</div><div class='head'>diff --git a/arch/arm/mach-at91/board-1arm.c b/arch/arm/mach-at91/board-1arm.c<br/>index 2d3d4b6f7b02..9b27d167bff0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-1arm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-1arm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-1arm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-1arm.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -33,8 +33,8 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c<br/>index af2c33aff1a8..cdddca54b938 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-cam60.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-cam60.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-cam60.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-cam60.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spi/flash.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -37,8 +37,8 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-cap9adk.c b/arch/arm/mach-at91/board-cap9adk.c<br/>index 117cf6c9afce..196199552eb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-cap9adk.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-cap9adk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-cap9adk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-cap9adk.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/atmel_lcdc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -42,10 +42,10 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91cap9_matrix.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9_smc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/at91cap9_matrix.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9_smc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -188,7 +188,7 @@ static struct atmel_nand_data __initdata cap9adk_nand_data = {</div><div class='ctx'> //	.rdy_pin	= ... not connected</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PD15,</div><div class='ctx'> 	.partition_info	= nand_partitions,</div><div class='del'>-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)</div><div class='add'>+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)</div><div class='ctx'> 	.bus_width_16	= 1,</div><div class='ctx'> #else</div><div class='ctx'> 	.bus_width_16	= 0,</div><div class='head'>diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c<br/>index 9854fc3dd1f2..afa1ff0e9577 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-carmeva.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-carmeva.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-carmeva.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-carmeva.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -34,8 +34,8 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c<br/>index 81f1ebb4e964..cb7c9a8fa487 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-csb337.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-csb337.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-csb337.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-csb337.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -37,8 +37,8 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-csb637.c b/arch/arm/mach-at91/board-csb637.c<br/>index bb1a5474ddab..8db8bd8babd9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-csb637.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-csb637.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-csb637.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-csb637.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -34,8 +34,8 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-dk.c b/arch/arm/mach-at91/board-dk.c<br/>index 02a70b2f355b..43e1aa7ecef7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-dk.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-dk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-dk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-dk.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -38,9 +38,9 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91rm9200_mc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/at91rm9200_mc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-eb01.c b/arch/arm/mach-at91/board-eb01.c<br/>index 0c1e3858e7df..1f9d3cb64c50 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-eb01.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-eb01.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-eb01.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-eb01.c</a></div><div class='hunk'>@@ -24,10 +24,10 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='ctx'> static void __init at91eb01_map_io(void)</div><div class='head'>diff --git a/arch/arm/mach-at91/board-eb9200.c b/arch/arm/mach-at91/board-eb9200.c<br/>index 3fe054e0056b..528656761ff7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-eb9200.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-eb9200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-eb9200.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-eb9200.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -34,8 +34,8 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c<br/>index e77fad443835..bfeee8a2af28 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-ecbat91.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-ecbat91.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-ecbat91.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-ecbat91.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spi/flash.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -36,8 +36,8 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-ek.c b/arch/arm/mach-at91/board-ek.c<br/>index 74aa4325eab3..60626e7a3490 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-ek.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-ek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-ek.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-ek.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -38,9 +38,9 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91rm9200_mc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/at91rm9200_mc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-kafa.c b/arch/arm/mach-at91/board-kafa.c<br/>index cf1b7b2f76fb..a87956c0a74f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-kafa.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-kafa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-kafa.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-kafa.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -33,8 +33,8 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-kb9202.c b/arch/arm/mach-at91/board-kb9202.c<br/>index 082ed59365a4..fe9b9913fa3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-kb9202.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-kb9202.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-kb9202.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-kb9202.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -34,10 +34,10 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/at91rm9200_mc.h&gt;</div><div class='add'>+#include &lt;mach/at91rm9200_mc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-picotux200.c b/arch/arm/mach-at91/board-picotux200.c<br/>index 6acb55c09ae5..dbc912d633c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-picotux200.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-picotux200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-picotux200.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-picotux200.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -36,9 +36,9 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91rm9200_mc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/at91rm9200_mc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c<br/>index 99b4ec3818d6..4c28413426c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-qil-a9260.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-qil-a9260.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-qil-a9260.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-qil-a9260.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -39,9 +39,9 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_shdwc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/at91_shdwc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -140,14 +140,14 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio</div><div class='ctx'> 	return ek_nand_partition;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct at91_nand_data __initdata ek_nand_data = {</div><div class='add'>+static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.ale		= 21,</div><div class='ctx'> 	.cle		= 22,</div><div class='ctx'> //	.det_pin	= ... not connected</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC13,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC14,</div><div class='ctx'> 	.partition_info	= nand_partitions,</div><div class='del'>-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)</div><div class='add'>+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)</div><div class='ctx'> 	.bus_width_16	= 1,</div><div class='ctx'> #else</div><div class='ctx'> 	.bus_width_16	= 0,</div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c<br/>index 57a6221943ed..e4910cb26c16 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9-l9260.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-sam9-l9260.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9-l9260.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-sam9-l9260.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -36,8 +36,8 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -148,7 +148,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC13,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC14,</div><div class='ctx'> 	.partition_info	= nand_partitions,</div><div class='del'>-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)</div><div class='add'>+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)</div><div class='ctx'> 	.bus_width_16	= 1,</div><div class='ctx'> #else</div><div class='ctx'> 	.bus_width_16	= 0,</div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c<br/>index 6a680795c3c8..cb20e70b3b06 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9260ek.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-sam9260ek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9260ek.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-sam9260ek.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/spi/at73c213.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -37,8 +37,8 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -185,7 +185,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC13,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC14,</div><div class='ctx'> 	.partition_info	= nand_partitions,</div><div class='del'>-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)</div><div class='add'>+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)</div><div class='ctx'> 	.bus_width_16	= 1,</div><div class='ctx'> #else</div><div class='ctx'> 	.bus_width_16	= 0,</div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c<br/>index 43dfbd0d543a..1a9963b811c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9261ek.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-sam9261ek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9261ek.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-sam9261ek.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/atmel_lcdc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -44,9 +44,9 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9_smc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9_smc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -190,7 +190,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC15,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC14,</div><div class='ctx'> 	.partition_info	= nand_partitions,</div><div class='del'>-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)</div><div class='add'>+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)</div><div class='ctx'> 	.bus_width_16	= 1,</div><div class='ctx'> #else</div><div class='ctx'> 	.bus_width_16	= 0,</div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c<br/>index 6605a0980117..b1d11960a735 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9263ek.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-sam9263ek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9263ek.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-sam9263ek.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/atmel_lcdc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -41,9 +41,9 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9_smc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9_smc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -194,7 +194,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PA22,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PD15,</div><div class='ctx'> 	.partition_info	= nand_partitions,</div><div class='del'>-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)</div><div class='add'>+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)</div><div class='ctx'> 	.bus_width_16	= 1,</div><div class='ctx'> #else</div><div class='ctx'> 	.bus_width_16	= 0,</div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c<br/>index 45617c201240..d4eba5c0ce02 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9g20ek.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-sam9g20ek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9g20ek.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-sam9g20ek.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/spi/at73c213.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -35,8 +35,8 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -143,13 +143,13 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* det_pin is not connected */</div><div class='del'>-static struct at91_nand_data __initdata ek_nand_data = {</div><div class='add'>+static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.ale		= 21,</div><div class='ctx'> 	.cle		= 22,</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC13,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC14,</div><div class='ctx'> 	.partition_info	= nand_partitions,</div><div class='del'>-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)</div><div class='add'>+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)</div><div class='ctx'> 	.bus_width_16	= 1,</div><div class='ctx'> #else</div><div class='ctx'> 	.bus_width_16	= 0,</div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c<br/>index 66e77bb2e079..c6dce49c388c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9rlek.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-sam9rlek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9rlek.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-sam9rlek.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/atmel_lcdc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -27,9 +27,9 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91sam9_smc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9_smc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-usb-a9260.c b/arch/arm/mach-at91/board-usb-a9260.c<br/>index 837aedf8ffeb..f9d0b65da40b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-usb-a9260.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-usb-a9260.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-usb-a9260.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-usb-a9260.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -39,9 +39,9 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_shdwc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/at91_shdwc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -114,14 +114,14 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio</div><div class='ctx'> 	return ek_nand_partition;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct at91_nand_data __initdata ek_nand_data = {</div><div class='add'>+static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.ale		= 21,</div><div class='ctx'> 	.cle		= 22,</div><div class='ctx'> //	.det_pin	= ... not connected</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC13,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC14,</div><div class='ctx'> 	.partition_info	= nand_partitions,</div><div class='del'>-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)</div><div class='add'>+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)</div><div class='ctx'> 	.bus_width_16	= 1,</div><div class='ctx'> #else</div><div class='ctx'> 	.bus_width_16	= 0,</div><div class='head'>diff --git a/arch/arm/mach-at91/board-usb-a9263.c b/arch/arm/mach-at91/board-usb-a9263.c<br/>index 95800d32bd49..673e5c27214d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-usb-a9263.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-usb-a9263.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-usb-a9263.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-usb-a9263.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -38,9 +38,9 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_shdwc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/at91_shdwc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -127,14 +127,14 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio</div><div class='ctx'> 	return ek_nand_partition;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct at91_nand_data __initdata ek_nand_data = {</div><div class='add'>+static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.ale		= 21,</div><div class='ctx'> 	.cle		= 22,</div><div class='ctx'> //	.det_pin	= ... not connected</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PA22,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PD15,</div><div class='ctx'> 	.partition_info	= nand_partitions,</div><div class='del'>-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)</div><div class='add'>+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)</div><div class='ctx'> 	.bus_width_16	= 1,</div><div class='ctx'> #else</div><div class='ctx'> 	.bus_width_16	= 0,</div><div class='head'>diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c<br/>index bbbfd06f5e0c..36b380aad006 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-yl-9200.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/board-yl-9200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-yl-9200.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/board-yl-9200.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -42,9 +42,9 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91rm9200_mc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/at91rm9200_mc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c<br/>index 464bdbbf74df..f5c2847161f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/clock.c</a></div><div class='hunk'>@@ -24,11 +24,10 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_pmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/at91_pmc.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "clock.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c<br/>index ee4964abcaf5..8392d5b517f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/gpio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/gpio.c</a></div><div class='hunk'>@@ -20,9 +20,9 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_pio.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/at91_pio.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_adc.h b/arch/arm/mach-at91/include/mach/at91_adc.h<br/>index 6d71ea2637b1..8e7ed5c90817 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_adc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_adc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_adc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_adc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_adc.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_adc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) SAN People</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_aic.h b/arch/arm/mach-at91/include/mach/at91_aic.h<br/>index df44c12a12d4..03566799d3be 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_aic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_aic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_aic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_aic.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_aic.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_aic.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Ivan Kokshaysky</div><div class='ctx'>  * Copyright (C) SAN People</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_dbgu.h b/arch/arm/mach-at91/include/mach/at91_dbgu.h<br/>index 8019ffd0ad3b..6dcaa7716871 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_dbgu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_dbgu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_dbgu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_dbgu.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_dbgu.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_dbgu.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Ivan Kokshaysky</div><div class='ctx'>  * Copyright (C) SAN People</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_mci.h b/arch/arm/mach-at91/include/mach/at91_mci.h<br/>index 400ec10014b4..550d503a1bca 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_mci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_mci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_mci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_mci.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_mci.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_mci.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Ivan Kokshaysky</div><div class='ctx'>  * Copyright (C) SAN People</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_pio.h b/arch/arm/mach-at91/include/mach/at91_pio.h<br/>index 84c3866d309f..c6a31bf8a5c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_pio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_pio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_pio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_pio.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_pio.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_pio.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Ivan Kokshaysky</div><div class='ctx'>  * Copyright (C) SAN People</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_pit.h b/arch/arm/mach-at91/include/mach/at91_pit.h<br/>index 5026325a5ae4..0448ac36eadb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_pit.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_pit.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_pit.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_pit.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_pit.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_pit.h</div><div class='ctx'>  *</div><div class='ctx'>  * Periodic Interval Timer (PIT) - System peripherals regsters.</div><div class='ctx'>  * Based on AT91SAM9261 datasheet revision D.</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_pmc.h b/arch/arm/mach-at91/include/mach/at91_pmc.h<br/>index 2001e81f2267..2e3f2894b704 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_pmc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_pmc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_pmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_pmc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_pmc.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_pmc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Ivan Kokshaysky</div><div class='ctx'>  * Copyright (C) SAN People</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_rstc.h b/arch/arm/mach-at91/include/mach/at91_rstc.h<br/>index fb8d1618a231..7cd1b39aaa43 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_rstc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_rstc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_rstc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_rstc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_rstc.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_rstc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Reset Controller (RSTC) - System peripherals regsters.</div><div class='ctx'>  * Based on AT91SAM9261 datasheet revision D.</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_rtc.h b/arch/arm/mach-at91/include/mach/at91_rtc.h<br/>index af9bd28174c0..e56f4701a3e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_rtc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_rtc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_rtc.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_rtc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Ivan Kokshaysky</div><div class='ctx'>  * Copyright (C) SAN People</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_rtt.h b/arch/arm/mach-at91/include/mach/at91_rtt.h<br/>index 39a32633b275..71782e5d2159 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_rtt.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_rtt.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_rtt.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_rtt.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_rtt.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_rtt.h</div><div class='ctx'>  *</div><div class='ctx'>  * Real-time Timer (RTT) - System peripherals regsters.</div><div class='ctx'>  * Based on AT91SAM9261 datasheet revision D.</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_shdwc.h b/arch/arm/mach-at91/include/mach/at91_shdwc.h<br/>index 581fa41d90e8..60be5ae624f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_shdwc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_shdwc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_shdwc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_shdwc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_shdwc.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_shdwc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Shutdown Controller (SHDWC) - System peripherals regsters.</div><div class='ctx'>  * Based on AT91SAM9261 datasheet revision D.</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_spi.h b/arch/arm/mach-at91/include/mach/at91_spi.h<br/>index f9b9a8464997..2f6ba0c5636e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_spi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_spi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_spi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_spi.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_spi.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_spi.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Ivan Kokshaysky</div><div class='ctx'>  * Copyright (C) SAN People</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_ssc.h b/arch/arm/mach-at91/include/mach/at91_ssc.h<br/>index 0ecc73460b50..a81114c11c74 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_ssc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_ssc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_ssc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_ssc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_ssc.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_ssc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) SAN People</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_st.h b/arch/arm/mach-at91/include/mach/at91_st.h<br/>index 30446e2ea772..8847173e4101 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_st.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_st.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_st.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_st.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_st.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_st.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Ivan Kokshaysky</div><div class='ctx'>  * Copyright (C) SAN People</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_tc.h b/arch/arm/mach-at91/include/mach/at91_tc.h<br/>index b85d3faeef5c..46a317fd7164 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_tc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_tc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_tc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_tc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_tc.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_tc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) SAN People</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_twi.h b/arch/arm/mach-at91/include/mach/at91_twi.h<br/>index f9f2e3cd95c5..bb2880f6ba37 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_twi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_twi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_twi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_twi.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_twi.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_twi.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Ivan Kokshaysky</div><div class='ctx'>  * Copyright (C) SAN People</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91_wdt.h b/arch/arm/mach-at91/include/mach/at91_wdt.h<br/>index 1014e9bf181f..973b4526a98e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91_wdt.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91_wdt.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_wdt.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91_wdt.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91_wdt.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91_wdt.h</div><div class='ctx'>  *</div><div class='ctx'>  * Watchdog Timer (WDT) - System peripherals regsters.</div><div class='ctx'>  * Based on AT91SAM9261 datasheet revision D.</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91cap9.h b/arch/arm/mach-at91/include/mach/at91cap9.h<br/>index 6f14d9053ac7..4a4b64135a92 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91cap9.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91cap9.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91cap9.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91cap9.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91cap9.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91cap9.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2007 Stelian Pop &lt;stelian.pop@leadtechdesign.com&gt;</div><div class='ctx'>  *  Copyright (C) 2007 Lead Tech Design &lt;www.leadtechdesign.com&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91cap9_ddrsdr.h b/arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h<br/>index efdb23af1ee4..bca878f3bd87 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91cap9_ddrsdr.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91cap9_ddrsdr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91cap9_ddrsdr.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h</div><div class='ctx'>  *</div><div class='ctx'>  * DDR/SDR Controller (DDRSDRC) - System peripherals registers.</div><div class='ctx'>  * Based on AT91CAP9 datasheet revision B.</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91cap9_matrix.h b/arch/arm/mach-at91/include/mach/at91cap9_matrix.h<br/>index ddbd4873c842..4b9d4aff4b4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91cap9_matrix.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91cap9_matrix.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91cap9_matrix.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91cap9_matrix.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91cap9_matrix.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91cap9_matrix.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2007 Stelian Pop &lt;stelian.pop@leadtechdesign.com&gt;</div><div class='ctx'>  *  Copyright (C) 2007 Lead Tech Design &lt;www.leadtechdesign.com&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h<br/>index e8fc0b1c33f4..78983155a074 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91rm9200.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91rm9200.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91rm9200.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91rm9200.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91rm9200.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91rm9200.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Ivan Kokshaysky</div><div class='ctx'>  * Copyright (C) SAN People</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91rm9200_emac.h b/arch/arm/mach-at91/include/mach/at91rm9200_emac.h<br/>index 0c417af5fe7f..b8260cd8041c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91rm9200_emac.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91rm9200_emac.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91rm9200_emac.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91rm9200_emac.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91rm9200_emac.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91rm9200_emac.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Ivan Kokshaysky</div><div class='ctx'>  * Copyright (C) SAN People</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91rm9200_mc.h b/arch/arm/mach-at91/include/mach/at91rm9200_mc.h<br/>index 24d012939cc4..d34e4ed89349 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91rm9200_mc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91rm9200_mc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91rm9200_mc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91rm9200_mc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91rm9200_mc.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91rm9200_mc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Ivan Kokshaysky</div><div class='ctx'>  * Copyright (C) SAN People</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h<br/>index 889872a3f2a9..43c396b9b4cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91sam9260.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91sam9260.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9260.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9260.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91sam9260.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91sam9260.h</div><div class='ctx'>  *</div><div class='ctx'>  * (C) 2006 Andrew Victor</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91sam9260_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h<br/>index a8e9fec6c735..f027de5df956 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91sam9260_matrix.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91sam9260_matrix.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9260_matrix.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91sam9260_matrix.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91sam9260_matrix.h</div><div class='ctx'>  *</div><div class='ctx'>  * Memory Controllers (MATRIX, EBI) - System peripherals registers.</div><div class='ctx'>  * Based on AT91SAM9260 datasheet revision B.</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91sam9261.h b/arch/arm/mach-at91/include/mach/at91sam9261.h<br/>index c7c4778dac49..3a348ca20773 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91sam9261.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91sam9261.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9261.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9261.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91sam9261.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91sam9261.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) SAN People</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91sam9261_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h<br/>index 6f072421be5b..db62b1f18300 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91sam9261_matrix.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91sam9261_matrix.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9261_matrix.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91sam9261_matrix.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91sam9261_matrix.h</div><div class='ctx'>  *</div><div class='ctx'>  * Memory Controllers (MATRIX, EBI) - System peripherals registers.</div><div class='ctx'>  * Based on AT91SAM9261 datasheet revision D.</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h<br/>index 018a647311da..2091f1e42d43 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91sam9263.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91sam9263.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9263.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9263.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91sam9263.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91sam9263.h</div><div class='ctx'>  *</div><div class='ctx'>  * (C) 2007 Atmel Corporation.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91sam9263_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h<br/>index 72f6e668e414..9b3efd3eb2f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91sam9263_matrix.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91sam9263_matrix.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9263_matrix.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91sam9263_matrix.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91sam9263_matrix.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2006 Atmel Corporation.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91sam9_sdramc.h b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h<br/>index d3b8b3da6b4d..1921181c63ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91sam9_sdramc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91sam9_sdramc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9_sdramc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91sam9_sdramc.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91sam9_sdramc.h</div><div class='ctx'>  *</div><div class='ctx'>  * SDRAM Controllers (SDRAMC) - System peripherals registers.</div><div class='ctx'>  * Based on AT91SAM9261 datasheet revision D.</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91sam9_smc.h b/arch/arm/mach-at91/include/mach/at91sam9_smc.h<br/>index 9e49eed31e50..ec6ad1338b5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91sam9_smc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91sam9_smc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9_smc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9_smc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91sam9_smc.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91sam9_smc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Static Memory Controllers (SMC) - System peripherals registers.</div><div class='ctx'>  * Based on AT91SAM9261 datasheet revision D.</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91sam9rl.h b/arch/arm/mach-at91/include/mach/at91sam9rl.h<br/>index 622e56f81d42..fc2de6c09c86 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91sam9rl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91sam9rl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9rl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9rl.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91sam9260.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91sam9260.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2007 Atmel Corporation</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91sam9rl_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h<br/>index 84224174e6a1..5f9149071fe5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91sam9rl_matrix.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91sam9rl_matrix.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91sam9rl_matrix.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2007 Atmel Corporation</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-at91/at91x40.h b/arch/arm/mach-at91/include/mach/at91x40.h<br/>index 612203e0177f..d34cdb8abdca 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/at91x40.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/at91x40.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91x40.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/at91x40.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/at91x40.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/at91x40.h</div><div class='ctx'>  *</div><div class='ctx'>  * (C) Copyright 2007, Greg Ungerer &lt;gerg@snapgear.com&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-at91/board.h b/arch/arm/mach-at91/include/mach/board.h<br/>index 48bbd854f57d..acd60f2a0724 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/board.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/board.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/board.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/board.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/board.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/board.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2005 HP Labs</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-at91/cpu.h b/arch/arm/mach-at91/include/mach/cpu.h<br/>index 52df794205cb..dbfd9f73f80b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/cpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/cpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/cpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/cpu.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/cpu.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/cpu.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2006 SAN People</div><div class='ctx'>  *</div><div class='hunk'>@@ -13,8 +13,8 @@</div><div class='ctx'> #ifndef __ASM_ARCH_CPU_H</div><div class='ctx'> #define __ASM_ARCH_CPU_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_dbgu.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/at91_dbgu.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define ARCH_ID_AT91RM9200	0x09290780</div><div class='head'>diff --git a/include/asm-arm/arch-at91/debug-macro.S b/arch/arm/mach-at91/include/mach/debug-macro.S<br/>index 13e9f5e1d4ff..29052ba66ada 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/debug-macro.S</div><div class='add'>+ * arch/arm/mach-at91/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003-2005 SAN People</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'>  *</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_dbgu.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/at91_dbgu.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro	addruart,rx</div><div class='ctx'> 	mrc	p15, 0, \rx, c1, c0</div><div class='head'>diff --git a/include/asm-arm/arch-at91/dma.h b/arch/arm/mach-at91/include/mach/dma.h<br/>index 774565412beb..e4f90c177616 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/dma.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 SAN People</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-at91/entry-macro.S b/arch/arm/mach-at91/include/mach/entry-macro.S<br/>index 1005eee6219b..7ab68f972227 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/entry-macro.S</div><div class='add'>+ * arch/arm/mach-at91/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003-2005 SAN People</div><div class='ctx'>  *</div><div class='hunk'>@@ -10,8 +10,8 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_aic.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/at91_aic.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro	disable_fiq</div><div class='ctx'> 	.endm</div><div class='head'>diff --git a/include/asm-arm/arch-at91/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h<br/>index 0a241e2fb672..76d76e2fa69e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/gpio.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/gpio.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2005 HP Labs</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-at91/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h<br/>index 016a3a3f6633..da0b681c652c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/hardware.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 SAN People</div><div class='ctx'>  *  Copyright (C) 2003 ATMEL</div><div class='hunk'>@@ -17,19 +17,19 @@</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ARCH_AT91RM9200)</div><div class='del'>-#include &lt;asm/arch/at91rm9200.h&gt;</div><div class='add'>+#include &lt;mach/at91rm9200.h&gt;</div><div class='ctx'> #elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20)</div><div class='del'>-#include &lt;asm/arch/at91sam9260.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9260.h&gt;</div><div class='ctx'> #elif defined(CONFIG_ARCH_AT91SAM9261)</div><div class='del'>-#include &lt;asm/arch/at91sam9261.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9261.h&gt;</div><div class='ctx'> #elif defined(CONFIG_ARCH_AT91SAM9263)</div><div class='del'>-#include &lt;asm/arch/at91sam9263.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9263.h&gt;</div><div class='ctx'> #elif defined(CONFIG_ARCH_AT91SAM9RL)</div><div class='del'>-#include &lt;asm/arch/at91sam9rl.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9rl.h&gt;</div><div class='ctx'> #elif defined(CONFIG_ARCH_AT91CAP9)</div><div class='del'>-#include &lt;asm/arch/at91cap9.h&gt;</div><div class='add'>+#include &lt;mach/at91cap9.h&gt;</div><div class='ctx'> #elif defined(CONFIG_ARCH_AT91X40)</div><div class='del'>-#include &lt;asm/arch/at91x40.h&gt;</div><div class='add'>+#include &lt;mach/at91x40.h&gt;</div><div class='ctx'> #else</div><div class='ctx'> #error "Unsupported AT91 processor"</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/asm-arm/arch-at91/io.h b/arch/arm/mach-at91/include/mach/io.h<br/>index f8beaa228467..1611bd03f528 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/io.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 SAN People</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-at91/irqs.h b/arch/arm/mach-at91/include/mach/irqs.h<br/>index 70b1216dce5d..bda29ccbcd94 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/irqs.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 SAN People</div><div class='ctx'>  *</div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #define __ASM_ARCH_IRQS_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_aic.h&gt;</div><div class='add'>+#include &lt;mach/at91_aic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define NR_AIC_IRQS 32</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-at91/memory.h b/arch/arm/mach-at91/include/mach/memory.h<br/>index 4835d6784509..9dd1b8c79b08 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/memory.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 SAN People</div><div class='ctx'>  *</div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_MEMORY_H</div><div class='ctx'> #define __ASM_ARCH_MEMORY_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PHYS_OFFSET	(AT91_SDRAM_BASE)</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-at91/system.h b/arch/arm/mach-at91/include/mach/system.h<br/>index 6bf846098ea9..e712658d966c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/system.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 SAN People</div><div class='ctx'>  *</div><div class='hunk'>@@ -21,9 +21,9 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_st.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_dbgu.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/at91_st.h&gt;</div><div class='add'>+#include &lt;mach/at91_dbgu.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-at91/timex.h b/arch/arm/mach-at91/include/mach/timex.h<br/>index 298d8313cdac..d84c9948becf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/timex.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 SAN People</div><div class='ctx'>  *</div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_TIMEX_H</div><div class='ctx'> #define __ASM_ARCH_TIMEX_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ARCH_AT91RM9200)</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-at91/uncompress.h b/arch/arm/mach-at91/include/mach/uncompress.h<br/>index f5636a8f6132..0410d548e9b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/uncompress.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 SAN People</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-at91/vmalloc.h b/arch/arm/mach-at91/include/mach/vmalloc.h<br/>index bb05e70e932a..8eb459f3f5b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-at91/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-at91/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-at91/vmalloc.h</div><div class='add'>+ * arch/arm/mach-at91/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 SAN People</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-at91/irq.c b/arch/arm/mach-at91/irq.c<br/>index ca87587b2b4b..da3494a53423 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/irq.c</a></div><div class='hunk'>@@ -25,9 +25,8 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-at91/leds.c b/arch/arm/mach-at91/leds.c<br/>index 9cdcda500fe8..fec03c59ff94 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/leds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/leds.c</a></div><div class='hunk'>@@ -13,9 +13,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------------- */</div><div class='head'>diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c<br/>index 8ab4feb1ec5b..ec2fe4ca1e27 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-at91/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-at91/pm.c</a></div><div class='hunk'>@@ -23,16 +23,15 @@</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/at91_pmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='add'>+#include &lt;mach/at91_pmc.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_AT91RM9200</div><div class='del'>-#include &lt;asm/arch/at91rm9200_mc.h&gt;</div><div class='add'>+#include &lt;mach/at91rm9200_mc.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The AT91RM9200 goes into self-refresh mode with this command, and will</div><div class='hunk'>@@ -42,7 +41,7 @@</div><div class='ctx'> #define sdram_selfrefresh_disable()	do {} while (0)</div><div class='ctx'> </div><div class='ctx'> #elif defined(CONFIG_ARCH_AT91CAP9)</div><div class='del'>-#include &lt;asm/arch/at91cap9_ddrsdr.h&gt;</div><div class='add'>+#include &lt;mach/at91cap9_ddrsdr.h&gt;</div><div class='ctx'> </div><div class='ctx'> static u32 saved_lpr;</div><div class='ctx'> </div><div class='hunk'>@@ -59,7 +58,7 @@ static inline void sdram_selfrefresh_enable(void)</div><div class='ctx'> #define sdram_selfrefresh_disable()	at91_sys_write(AT91_DDRSDRC_LPR, saved_lpr)</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='del'>-#include &lt;asm/arch/at91sam9_sdramc.h&gt;</div><div class='add'>+#include &lt;mach/at91sam9_sdramc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_AT91SAM9263</div><div class='ctx'> /*</div><div class='hunk'>@@ -92,8 +91,8 @@ static inline void sdram_selfrefresh_enable(void)</div><div class='ctx'>  */</div><div class='ctx'> #if defined(AT91_SHDWC)</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/at91_rstc.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_shdwc.h&gt;</div><div class='add'>+#include &lt;mach/at91_rstc.h&gt;</div><div class='add'>+#include &lt;mach/at91_shdwc.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void __init show_reset_status(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-clps711x/autcpu12.c b/arch/arm/mach-clps711x/autcpu12.c<br/>index c13ca6c56baa..474616dcd7a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/autcpu12.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-clps711x/autcpu12.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/autcpu12.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/autcpu12.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/autcpu12.h&gt;</div><div class='add'>+#include &lt;mach/autcpu12.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c<br/>index 831df007f6c7..aa02aa5a01f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/cdb89712.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-clps711x/cdb89712.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/cdb89712.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/cdb89712.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-clps711x/ceiva.c b/arch/arm/mach-clps711x/ceiva.c<br/>index e2b2c5ac8a83..8ada20184978 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/ceiva.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-clps711x/ceiva.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/ceiva.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/ceiva.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-clps711x/edb7211-mm.c b/arch/arm/mach-clps711x/edb7211-mm.c<br/>index 0d52e0851251..c58e32ec4c5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/edb7211-mm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-clps711x/edb7211-mm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/edb7211-mm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/edb7211-mm.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c<br/>index 3792ab4f0996..7122b3d21043 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/fortunet.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-clps711x/fortunet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/fortunet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/fortunet.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-clps711x/autcpu12.h b/arch/arm/mach-clps711x/include/mach/autcpu12.h<br/>index 1588a365f610..1588a365f610 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-clps711x/autcpu12.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-clps711x/autcpu12.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/autcpu12.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/autcpu12.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-clps711x/debug-macro.S b/arch/arm/mach-clps711x/include/mach/debug-macro.S<br/>index bc0a5760722b..64baf9f87408 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-clps711x/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-clps711x/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-clps711x/debug-macro.S</div><div class='add'>+/* arch/arm/mach-clps711x/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-clps711x/dma.h b/arch/arm/mach-clps711x/include/mach/dma.h<br/>index 610997938423..0d620e869536 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-clps711x/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-clps711x/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-clps711x/dma.h</div><div class='add'>+ *  arch/arm/mach-clps711x/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997,1998 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-clps711x/entry-macro.S b/arch/arm/mach-clps711x/include/mach/entry-macro.S<br/>index cd8c5a0bc7bc..90fa2f70489f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-clps711x/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-clps711x/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-clps711x/entry-macro.S</div><div class='add'>+ * arch/arm/mach-clps711x/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for CLPS711X-based platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/clps7111.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='head'>diff --git a/include/asm-arm/arch-clps711x/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h<br/>index 0fdbe72fff2a..4c3e101b96c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-clps711x/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-clps711x/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-clps711x/hardware.h</div><div class='add'>+ *  arch/arm/mach-clps711x/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  *  This file contains the hardware definitions of the Prospector P720T.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-clps711x/io.h b/arch/arm/mach-clps711x/include/mach/io.h<br/>index 53d790202c19..4c8440087679 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-clps711x/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-clps711x/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-clps711x/io.h</div><div class='add'>+ *  arch/arm/mach-clps711x/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 ARM Limited</div><div class='ctx'>  *</div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #ifndef __ASM_ARM_ARCH_IO_H</div><div class='ctx'> #define __ASM_ARM_ARCH_IO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT 0xffffffff</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-clps711x/irqs.h b/arch/arm/mach-clps711x/include/mach/irqs.h<br/>index 76025dc87637..30b7e97285a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-clps711x/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-clps711x/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-clps711x/irqs.h</div><div class='add'>+ *  arch/arm/mach-clps711x/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-clps711x/memory.h b/arch/arm/mach-clps711x/include/mach/memory.h<br/>index 42768cc8bfb4..71c2fa70c8e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-clps711x/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-clps711x/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-clps711x/memory.h</div><div class='add'>+ *  arch/arm/mach-clps711x/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 ARM Limited</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-clps711x/syspld.h b/arch/arm/mach-clps711x/include/mach/syspld.h<br/>index 960578a22a8e..f7f4c1201898 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-clps711x/syspld.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-clps711x/syspld.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/syspld.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/syspld.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-clps711x/syspld.h</div><div class='add'>+ *  arch/arm/mach-clps711x/include/mach/syspld.h</div><div class='ctx'>  *</div><div class='ctx'>  *  System Control PLD register definitions.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-clps711x/system.h b/arch/arm/mach-clps711x/include/mach/system.h<br/>index 11e1491535a8..a8eade40317f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-clps711x/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-clps711x/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-clps711x/system.h</div><div class='add'>+ *  arch/arm/mach-clps711x/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd</div><div class='ctx'>  *</div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/clps7111.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-clps711x/time.h b/arch/arm/mach-clps711x/include/mach/time.h<br/>index 5edaae1c61d3..8fe283ccd1f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-clps711x/time.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-clps711x/time.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/time.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-clps711x/time.h</div><div class='add'>+ *  arch/arm/mach-clps711x/include/mach/time.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-clps711x/timex.h b/arch/arm/mach-clps711x/include/mach/timex.h<br/>index dcbb381da3dd..ac8823ccff93 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-clps711x/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-clps711x/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-clps711x/timex.h</div><div class='add'>+ *  arch/arm/mach-clps711x/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Prospector 720T architecture timex specifications</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-clps711x/uncompress.h b/arch/arm/mach-clps711x/include/mach/uncompress.h<br/>index 03d233ae87ce..7164310dea7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-clps711x/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-clps711x/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-clps711x/uncompress.h</div><div class='add'>+ *  arch/arm/mach-clps711x/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd</div><div class='ctx'>  *</div><div class='hunk'>@@ -17,8 +17,8 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/arch/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/clps7111.h&gt;</div><div class='ctx'> </div><div class='ctx'> #undef CLPS7111_BASE</div><div class='head'>diff --git a/include/asm-arm/arch-clps711x/vmalloc.h b/arch/arm/mach-clps711x/include/mach/vmalloc.h<br/>index a5dfe96abc96..ea6cc7beff28 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-clps711x/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-clps711x/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-clps711x/vmalloc.h</div><div class='add'>+ *  arch/arm/mach-clps711x/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-clps711x/irq.c b/arch/arm/mach-clps711x/irq.c<br/>index ca102960f528..38623cfcac5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-clps711x/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/irq.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-clps711x/mm.c b/arch/arm/mach-clps711x/mm.c<br/>index a00f77ef8df8..a7b4591205a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/mm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-clps711x/mm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/mm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/mm.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-clps711x/p720t-leds.c b/arch/arm/mach-clps711x/p720t-leds.c<br/>index 4915b3524963..262c3c361453 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/p720t-leds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-clps711x/p720t-leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/p720t-leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/p720t-leds.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-clps711x/p720t.c b/arch/arm/mach-clps711x/p720t.c<br/>index c8ecd2480c27..f51f97d4f212 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/p720t.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-clps711x/p720t.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/p720t.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/p720t.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/syspld.h&gt;</div><div class='add'>+#include &lt;mach/syspld.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-clps711x/time.c b/arch/arm/mach-clps711x/time.c<br/>index e5dc33f1f95c..ef1fcd17189e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-clps711x/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps711x/time.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c<br/>index 2ac63671ea5f..cc1b82179e83 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-clps7500/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/core.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iomd.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-cl7500/acornfb.h b/arch/arm/mach-clps7500/include/mach/acornfb.h<br/>index aea6330c9745..aea6330c9745 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-cl7500/acornfb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-cl7500/acornfb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/include/mach/acornfb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/acornfb.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-cl7500/debug-macro.S b/arch/arm/mach-clps7500/include/mach/debug-macro.S<br/>index 9a2b67d24098..af4104e7e84a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-cl7500/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-cl7500/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-cl7500/debug-macro.S</div><div class='add'>+/* arch/arm/mach-clps7500/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-cl7500/dma.h b/arch/arm/mach-clps7500/include/mach/dma.h<br/>index 591ed2551892..63fcde505498 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-cl7500/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-cl7500/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-cl7500/dma.h</div><div class='add'>+ * arch/arm/mach-clps7500/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1999 Nexus Electronics Ltd.</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-rpc/entry-macro.S b/arch/arm/mach-clps7500/include/mach/entry-macro.S<br/>index 038b761fdadc..4e7e54144093 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-rpc/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-rpc/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/entry-macro-iomd.S&gt;</div><div class='ctx'> </div><div class='ctx'> 	.equ	ioc_base_high, IOC_BASE &amp; 0xff000000</div><div class='head'>diff --git a/include/asm-arm/arch-cl7500/hardware.h b/arch/arm/mach-clps7500/include/mach/hardware.h<br/>index 1adfd18e6154..d66578a3371c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-cl7500/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-cl7500/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-cl7500/hardware.h</div><div class='add'>+ * arch/arm/mach-clps7500/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1996-1999 Russell King.</div><div class='ctx'>  * Copyright (C) 1999 Nexus Electronics Ltd.</div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_HARDWARE_H</div><div class='ctx'> #define __ASM_ARCH_HARDWARE_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/memory.h&gt;</div><div class='add'>+#include &lt;mach/memory.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iomd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef __ASSEMBLY__</div><div class='head'>diff --git a/include/asm-arm/arch-cl7500/io.h b/arch/arm/mach-clps7500/include/mach/io.h<br/>index 89a33287f4fe..2ff2860889ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-cl7500/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-cl7500/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/io.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-cl7500/io.h</div><div class='del'>- *  from linux/include/asm-arm/arch-rpc/io.h</div><div class='add'>+ * arch/arm/mach-clps7500/include/mach/io.h</div><div class='add'>+ *  from arch/arm/mach-rpc/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1997 Russell King</div><div class='ctx'>  *</div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #ifndef __ASM_ARM_ARCH_IO_H</div><div class='ctx'> #define __ASM_ARM_ARCH_IO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT 0xffffffff</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-cl7500/irq.h b/arch/arm/mach-clps7500/include/mach/irq.h<br/>index 4b286331f3f8..e8da3c58df76 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-cl7500/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-cl7500/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/include/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/irq.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-cl7500/irq.h</div><div class='add'>+ * arch/arm/mach-clps7500/include/mach/irq.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1996 Russell King</div><div class='ctx'>  * Copyright (C) 1999, 2001 Nexus Electronics Ltd.</div><div class='head'>diff --git a/include/asm-arm/arch-cl7500/irqs.h b/arch/arm/mach-clps7500/include/mach/irqs.h<br/>index f20996eadf19..bee66b487f59 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-cl7500/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-cl7500/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-cl7500/irqs.h</div><div class='add'>+ * arch/arm/mach-clps7500/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1999 Nexus Electronics Ltd</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-cl7500/memory.h b/arch/arm/mach-clps7500/include/mach/memory.h<br/>index 3178140e24ca..3326aa99d3ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-cl7500/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-cl7500/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-cl7500/memory.h</div><div class='add'>+ * arch/arm/mach-clps7500/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 1996,1997,1998 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-cl7500/system.h b/arch/arm/mach-clps7500/include/mach/system.h<br/>index a9505d6a74d7..624fc2830ae0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-cl7500/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-cl7500/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-cl7500/system.h</div><div class='add'>+ * arch/arm/mach-clps7500/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 1999 Nexus Electronics Ltd.</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-cl7500/timex.h b/arch/arm/mach-clps7500/include/mach/timex.h<br/>index 8a4175fc0106..dfaa9b425757 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-cl7500/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-cl7500/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-cl7500/timex.h</div><div class='add'>+ * arch/arm/mach-clps7500/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * CL7500 architecture timex specifications</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-cl7500/uncompress.h b/arch/arm/mach-clps7500/include/mach/uncompress.h<br/>index c437e0c88c3f..d7d0af4b49fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-cl7500/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-cl7500/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-cl7500/uncompress.h</div><div class='add'>+ * arch/arm/mach-clps7500/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1999, 2000 Nexus Electronics Ltd.</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-cl7500/vmalloc.h b/arch/arm/mach-clps7500/include/mach/vmalloc.h<br/>index ba8d7a84456a..8fc5406d1b6d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-cl7500/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-cl7500/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-clps7500/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-cl7500/vmalloc.h</div><div class='add'>+ * arch/arm/mach-clps7500/include/mach/vmalloc.h</div><div class='ctx'>  */</div><div class='ctx'> #define VMALLOC_END       (PAGE_OFFSET + 0x1c000000)</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-evm.c b/arch/arm/mach-davinci/board-evm.c<br/>index 9e4024c4965f..134355787814 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-evm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-davinci/board-evm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-evm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/board-evm.c</a></div><div class='hunk'>@@ -20,13 +20,13 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* other misc. init functions */</div><div class='ctx'> void __init davinci_psc_init(void);</div><div class='head'>diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c<br/>index c6b94f60e0b2..d46c69b55aaa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-davinci/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/clock.c</a></div><div class='hunk'>@@ -17,10 +17,10 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/psc.h&gt;</div><div class='add'>+#include &lt;mach/psc.h&gt;</div><div class='ctx'> #include "clock.h"</div><div class='ctx'> </div><div class='ctx'> /* PLL/Reset register offsets */</div><div class='head'>diff --git a/arch/arm/mach-davinci/gpio.c b/arch/arm/mach-davinci/gpio.c<br/>index 9c67886e7189..c9cb4f09b18f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/gpio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-davinci/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/gpio.c</a></div><div class='hunk'>@@ -20,9 +20,9 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-davinci/clock.h b/arch/arm/mach-davinci/include/mach/clock.h<br/>index cc168b7a14f2..38bdd49bc181 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/clock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/clock.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-davinci/clock.h</div><div class='add'>+ * arch/arm/mach-davinci/include/mach/clock.h</div><div class='ctx'>  *</div><div class='ctx'>  * Clock control driver for DaVinci - header file</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-davinci/common.h b/arch/arm/mach-davinci/include/mach/common.h<br/>index a97dfbb15e57..a97dfbb15e57 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/common.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/common.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-davinci/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S<br/>index e6c0f0d5d062..e6c0f0d5d062 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/debug-macro.S</a></div><div class='head'>diff --git a/include/asm-arm/arch-davinci/dma.h b/arch/arm/mach-davinci/include/mach/dma.h<br/>index 8e2f2d0ba667..8e2f2d0ba667 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/dma.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-davinci/entry-macro.S b/arch/arm/mach-davinci/include/mach/entry-macro.S<br/>index 3ebfcc5cb58e..039b84f933b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -8,8 +8,8 @@</div><div class='ctx'>  * is licensed "as is" without any warranty of any kind, whether express</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/arch/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='head'>diff --git a/include/asm-arm/arch-davinci/gpio.h b/arch/arm/mach-davinci/include/mach/gpio.h<br/>index ff8de30b2fb3..ec151ccf1e8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/gpio.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #define	__DAVINCI_GPIO_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * basic gpio routines</div><div class='head'>diff --git a/include/asm-arm/arch-davinci/hardware.h b/arch/arm/mach-davinci/include/mach/hardware.h<br/>index a2e8969afaca..a2e8969afaca 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/hardware.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-davinci/i2c.h b/arch/arm/mach-davinci/include/mach/i2c.h<br/>index e2f54168abd1..e2f54168abd1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/i2c.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/i2c.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/i2c.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/i2c.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-davinci/io.h b/arch/arm/mach-davinci/include/mach/io.h<br/>index e7accb910864..e7accb910864 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/io.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-davinci/irqs.h b/arch/arm/mach-davinci/include/mach/irqs.h<br/>index f4c5ca6da9f4..f4c5ca6da9f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/irqs.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-davinci/memory.h b/arch/arm/mach-davinci/include/mach/memory.h<br/>index dd1625c23cf4..dd1625c23cf4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/memory.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-davinci/mux.h b/arch/arm/mach-davinci/include/mach/mux.h<br/>index c24b6782804d..c24b6782804d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/mux.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/mux.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/mux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/mux.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-davinci/psc.h b/arch/arm/mach-davinci/include/mach/psc.h<br/>index 4977aa071e1e..4977aa071e1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/psc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/psc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/psc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/psc.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-davinci/serial.h b/arch/arm/mach-davinci/include/mach/serial.h<br/>index ed418ef76805..fb8cb229bfd2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/serial.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/serial.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SERIAL_H</div><div class='ctx'> #define __ASM_ARCH_SERIAL_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/io.h&gt;</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DAVINCI_UART0_BASE   (IO_PHYS + 0x20000)</div><div class='ctx'> #define DAVINCI_UART1_BASE   (IO_PHYS + 0x20400)</div><div class='head'>diff --git a/include/asm-arm/arch-davinci/system.h b/arch/arm/mach-davinci/include/mach/system.h<br/>index 440ac515804b..84ff77aeb738 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/system.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void davinci_watchdog_reset(void);</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-davinci/timex.h b/arch/arm/mach-davinci/include/mach/timex.h<br/>index 52827567841d..52827567841d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/timex.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-davinci/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h<br/>index f6d1570f7206..8c165def37b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/uncompress.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='del'>-#include &lt;asm/arch/serial.h&gt;</div><div class='add'>+#include &lt;mach/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* PORT_16C550A, in polled non-fifo mode */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-davinci/vmalloc.h b/arch/arm/mach-davinci/include/mach/vmalloc.h<br/>index 9b47fa89b333..b98bd9e92fd6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-davinci/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-davinci/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;asm/arch/io.h&gt;</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Allow vmalloc range until the IO virtual range minus a 2M "hole" */</div><div class='ctx'> #define VMALLOC_END	  (IO_VIRT - (2&lt;&lt;20))</div><div class='head'>diff --git a/arch/arm/mach-davinci/io.c b/arch/arm/mach-davinci/io.c<br/>index 47787ff84a6a..5bb66b61c1a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-davinci/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/io.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void davinci_check_revision(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c<br/>index 1333d84d2e45..12ca9f29f847 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-davinci/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/irq.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-davinci/mux.c b/arch/arm/mach-davinci/mux.c<br/>index 92d26bd305b7..8ff9d8aca60b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/mux.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-davinci/mux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/mux.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/mux.c</a></div><div class='hunk'>@@ -11,9 +11,9 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* System control register offsets */</div><div class='ctx'> #define PINMUX0         0x00</div><div class='head'>diff --git a/arch/arm/mach-davinci/psc.c b/arch/arm/mach-davinci/psc.c<br/>index 1334416559ad..aa2fc375a325 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/psc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-davinci/psc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/psc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/psc.c</a></div><div class='hunk'>@@ -23,9 +23,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/psc.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/psc.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* PSC register offsets */</div><div class='ctx'> #define EPCPR		0x070</div><div class='hunk'>@@ -70,9 +70,6 @@ void davinci_psc_config(unsigned int domain, unsigned int id, char enable)</div><div class='ctx'> {</div><div class='ctx'> 	u32 epcpr, ptcmd, ptstat, pdstat, pdctl1, mdstat, mdctl, mdstat_mask;</div><div class='ctx'> </div><div class='del'>-	if (id &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	mdctl = davinci_readl(DAVINCI_PWR_SLEEP_CNTRL_BASE + MDCTL + 4 * id);</div><div class='ctx'> 	if (enable)</div><div class='ctx'> 		mdctl |= 0x00000003;	/* Enable Module */</div><div class='head'>diff --git a/arch/arm/mach-davinci/serial.c b/arch/arm/mach-davinci/serial.c<br/>index 8368c93c788d..caf101e2cc62 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/serial.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-davinci/serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/serial.c</a></div><div class='hunk'>@@ -29,9 +29,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/serial.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define UART_DAVINCI_PWREMU 0x0c</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c<br/>index e96a3dcdc1a7..206e80d41717 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-davinci/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-davinci/time.c</a></div><div class='hunk'>@@ -17,13 +17,13 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='del'>-#include &lt;asm/arch/io.h&gt;</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct clock_event_device clockevent_davinci;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c<br/>index 7710e14b5268..65cc7c271917 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ebsa110/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/core.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa110/debug-macro.S b/arch/arm/mach-ebsa110/include/mach/debug-macro.S<br/>index 9213bfe4831d..1dde8227f3a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa110/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa110/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-ebsa110/debug-macro.S</div><div class='add'>+/* arch/arm/mach-ebsa110/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa110/dma.h b/arch/arm/mach-ebsa110/include/mach/dma.h<br/>index c52f9e2ab0bb..780a04c8bbe9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa110/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa110/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa110/dma.h</div><div class='add'>+ *  arch/arm/mach-ebsa110/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997,1998 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa110/entry-macro.S b/arch/arm/mach-ebsa110/include/mach/entry-macro.S<br/>index f242be5c49ba..cc3e5992f6b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa110/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa110/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ebsa110/entry-macro.S</div><div class='add'>+ * arch/arm/mach-ebsa110/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for ebsa110 platform.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa110/hardware.h b/arch/arm/mach-ebsa110/include/mach/hardware.h<br/>index 3ce864def41e..4b2fb7743909 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa110/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa110/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa110/hardware.h</div><div class='add'>+ *  arch/arm/mach-ebsa110/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996-2000 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa110/io.h b/arch/arm/mach-ebsa110/include/mach/io.h<br/>index 44a4001de807..f68daa632af0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa110/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa110/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa110/io.h</div><div class='add'>+ *  arch/arm/mach-ebsa110/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997,1998 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa110/irqs.h b/arch/arm/mach-ebsa110/include/mach/irqs.h<br/>index ded9bd9d7b8b..a8f3771bc060 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa110/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa110/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa110/irqs.h</div><div class='add'>+ *  arch/arm/mach-ebsa110/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa110/memory.h b/arch/arm/mach-ebsa110/include/mach/memory.h<br/>index c7c500e176d0..eea4b75b657b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa110/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa110/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa110/memory.h</div><div class='add'>+ *  arch/arm/mach-ebsa110/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996-1999 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa110/system.h b/arch/arm/mach-ebsa110/include/mach/system.h<br/>index d7c8fece0bc5..350a028997ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa110/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa110/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa110/system.h</div><div class='add'>+ *  arch/arm/mach-ebsa110/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996-2000 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa110/timex.h b/arch/arm/mach-ebsa110/include/mach/timex.h<br/>index 1e9ef045092b..4fb43b22a102 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa110/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa110/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa110/timex.h</div><div class='add'>+ *  arch/arm/mach-ebsa110/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997, 1998 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa110/uncompress.h b/arch/arm/mach-ebsa110/include/mach/uncompress.h<br/>index ae5b775eb0b7..32041509fbf8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa110/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa110/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa110/uncompress.h</div><div class='add'>+ *  arch/arm/mach-ebsa110/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996,1997,1998 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa110/vmalloc.h b/arch/arm/mach-ebsa110/include/mach/vmalloc.h<br/>index 26674ba4683c..9b44c19e95ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa110/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa110/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa110/vmalloc.h</div><div class='add'>+ *  arch/arm/mach-ebsa110/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1998 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-ebsa110/io.c b/arch/arm/mach-ebsa110/io.c<br/>index 6b2380e153ef..53748f5462e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ebsa110/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/io.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ebsa110/leds.c b/arch/arm/mach-ebsa110/leds.c<br/>index 3bc8c5e708e6..6a6ea57c2a4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/leds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ebsa110/leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ebsa110/leds.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c<br/>index ac5d5818eb7b..aa1fb352fb8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/adssphere.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ep93xx/adssphere.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/adssphere.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/adssphere.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c<br/>index f62c35500bb7..6062e47f2043 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ep93xx/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/clock.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct clk {</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c<br/>index 5fed57608507..f99f43669392 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ep93xx/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/core.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb9302.c b/arch/arm/mach-ep93xx/edb9302.c<br/>index 0315615b74da..97550c0ad7b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb9302.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ep93xx/edb9302.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb9302.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/edb9302.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb9302a.c b/arch/arm/mach-ep93xx/edb9302a.c<br/>index 62e064bab1d2..99b01d44bf1c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb9302a.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ep93xx/edb9302a.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb9302a.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/edb9302a.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb9307.c b/arch/arm/mach-ep93xx/edb9307.c<br/>index d6a5698da91f..9fb72d01a36c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb9307.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ep93xx/edb9307.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb9307.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/edb9307.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb9312.c b/arch/arm/mach-ep93xx/edb9312.c<br/>index e310e4d72990..87267a574f5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb9312.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ep93xx/edb9312.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb9312.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/edb9312.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb9315.c b/arch/arm/mach-ep93xx/edb9315.c<br/>index 249ca9e57bc6..7e373950be4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb9315.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ep93xx/edb9315.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb9315.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/edb9315.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb9315a.c b/arch/arm/mach-ep93xx/edb9315a.c<br/>index 7ca0e6170a41..08a7c9bfb689 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb9315a.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ep93xx/edb9315a.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb9315a.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/edb9315a.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c<br/>index 694590a451c1..9b41ec1f089e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/gesbc9312.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ep93xx/gesbc9312.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/gesbc9312.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/gesbc9312.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ep93xx/gpio.c b/arch/arm/mach-ep93xx/gpio.c<br/>index dc2e4c00d989..0f3fb87ca4be 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/gpio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ep93xx/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/gpio.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/ep93xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/ep93xx-regs.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-ep93xx/debug-macro.S b/arch/arm/mach-ep93xx/include/mach/debug-macro.S<br/>index 397565a0c671..802858bc8095 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ep93xx/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ep93xx/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ep93xx/debug-macro.S</div><div class='add'>+ * arch/arm/mach-ep93xx/include/mach/debug-macro.S</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Lennert Buytenhek &lt;buytenh@wantstofly.org&gt;</div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * the Free Software Foundation; either version 2 of the License, or (at</div><div class='ctx'>  * your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/arch/ep93xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/ep93xx-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	addruart,rx</div><div class='ctx'> 		mrc	p15, 0, \rx, c1, c0</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/include/mach/dma.h b/arch/arm/mach-ep93xx/include/mach/dma.h<br/>new file mode 100644<br/>index 000000000000..d0fa9656e92f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/dma.h</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-ep93xx/include/mach/dma.h</div><div class='add'>+ */</div><div class='head'>diff --git a/include/asm-arm/arch-ep93xx/entry-macro.S b/arch/arm/mach-ep93xx/include/mach/entry-macro.S<br/>index 241ec221a047..96b85e2c2c0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ep93xx/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ep93xx/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ep93xx/entry-macro.S</div><div class='add'>+ * arch/arm/mach-ep93xx/include/mach/entry-macro.S</div><div class='ctx'>  * IRQ demultiplexing for EP93xx</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Lennert Buytenhek &lt;buytenh@wantstofly.org&gt;</div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * the Free Software Foundation; either version 2 of the License, or (at</div><div class='ctx'>  * your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/arch/ep93xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/ep93xx-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='head'>diff --git a/include/asm-arm/arch-ep93xx/ep93xx-regs.h b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h<br/>index 625c6f0abc03..9f4458c8e070 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ep93xx/ep93xx-regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ep93xx/ep93xx-regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ep93xx/ep93xx-regs.h</div><div class='add'>+ * arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_EP93XX_REGS_H</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/include/mach/gesbc9312.h b/arch/arm/mach-ep93xx/include/mach/gesbc9312.h<br/>new file mode 100644<br/>index 000000000000..21fe2b922aa5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/gesbc9312.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/gesbc9312.h</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-ep93xx/include/mach/gesbc9312.h</div><div class='add'>+ */</div><div class='head'>diff --git a/include/asm-arm/arch-ep93xx/gpio.h b/arch/arm/mach-ep93xx/include/mach/gpio.h<br/>index 186e7c715f8a..f7020414c5df 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ep93xx/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ep93xx/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/gpio.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ep93xx/gpio.h</div><div class='add'>+ * arch/arm/mach-ep93xx/include/mach/gpio.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_GPIO_H</div><div class='head'>diff --git a/include/asm-arm/arch-ep93xx/hardware.h b/arch/arm/mach-ep93xx/include/mach/hardware.h<br/>index 9b69f454065d..529807d182bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ep93xx/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ep93xx/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ep93xx/hardware.h</div><div class='add'>+ * arch/arm/mach-ep93xx/include/mach/hardware.h</div><div class='ctx'>  */</div><div class='add'>+#ifndef __ASM_ARCH_HARDWARE_H</div><div class='add'>+#define __ASM_ARCH_HARDWARE_H</div><div class='ctx'> </div><div class='ctx'> #include "ep93xx-regs.h"</div><div class='ctx'> </div><div class='hunk'>@@ -10,3 +12,5 @@</div><div class='ctx'> </div><div class='ctx'> #include "gesbc9312.h"</div><div class='ctx'> #include "ts72xx.h"</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/asm-arm/arch-ep93xx/io.h b/arch/arm/mach-ep93xx/include/mach/io.h<br/>index 7b4d25e29060..1ab9a90ad339 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ep93xx/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ep93xx/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ep93xx/io.h</div><div class='add'>+ * arch/arm/mach-ep93xx/include/mach/io.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT		0xffffffff</div><div class='head'>diff --git a/include/asm-arm/arch-ep93xx/irqs.h b/arch/arm/mach-ep93xx/include/mach/irqs.h<br/>index 53d4a68bfc88..ff98390bbf0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ep93xx/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ep93xx/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ep93xx/irqs.h</div><div class='add'>+ * arch/arm/mach-ep93xx/include/mach/irqs.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_IRQS_H</div><div class='head'>diff --git a/include/asm-arm/arch-kirkwood/memory.h b/arch/arm/mach-ep93xx/include/mach/memory.h<br/>index e5108f408ce6..f1b633590752 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-kirkwood/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-kirkwood/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-kirkwood/memory.h</div><div class='add'>+ * arch/arm/mach-ep93xx/include/mach/memory.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_MEMORY_H</div><div class='hunk'>@@ -7,8 +7,8 @@</div><div class='ctx'> </div><div class='ctx'> #define PHYS_OFFSET		UL(0x00000000)</div><div class='ctx'> </div><div class='del'>-#define __virt_to_bus(x)	__virt_to_phys(x)</div><div class='ctx'> #define __bus_to_virt(x)	__phys_to_virt(x)</div><div class='add'>+#define __virt_to_bus(x)	__virt_to_phys(x)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/asm-arm/arch-ep93xx/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h<br/>index 44eccec2cba4..b5c182473f5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ep93xx/platform.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ep93xx/platform.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/platform.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ep93xx/platform.h</div><div class='add'>+ * arch/arm/mach-ep93xx/include/mach/platform.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='head'>diff --git a/include/asm-arm/arch-ep93xx/system.h b/arch/arm/mach-ep93xx/include/mach/system.h<br/>index 79b718586746..67789d0f329e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ep93xx/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ep93xx/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/system.h</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ep93xx/system.h</div><div class='add'>+ * arch/arm/mach-ep93xx/include/mach/system.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/include/mach/timex.h b/arch/arm/mach-ep93xx/include/mach/timex.h<br/>new file mode 100644<br/>index 000000000000..6b3503b01fa6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/timex.h</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-ep93xx/include/mach/timex.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define CLOCK_TICK_RATE		983040</div><div class='head'>diff --git a/include/asm-arm/arch-ep93xx/ts72xx.h b/arch/arm/mach-ep93xx/include/mach/ts72xx.h<br/>index a94f63ff0535..30b318aa1a1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ep93xx/ts72xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ep93xx/ts72xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/ts72xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/ts72xx.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ep93xx/ts72xx.h</div><div class='add'>+ * arch/arm/mach-ep93xx/include/mach/ts72xx.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/include/asm-arm/arch-ep93xx/uncompress.h b/arch/arm/mach-ep93xx/include/mach/uncompress.h<br/>index c15274c85d5d..1fd2f17de325 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ep93xx/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ep93xx/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ep93xx/uncompress.h</div><div class='add'>+ * arch/arm/mach-ep93xx/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Lennert Buytenhek &lt;buytenh@wantstofly.org&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/ep93xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/ep93xx-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned char __raw_readb(unsigned int ptr)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/include/mach/vmalloc.h b/arch/arm/mach-ep93xx/include/mach/vmalloc.h<br/>new file mode 100644<br/>index 000000000000..aed21cd3fe2d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-ep93xx/include/mach/vmalloc.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define VMALLOC_END	0xfe800000</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c<br/>index f28c1294cae1..de047a5c8112 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/micro9.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ep93xx/micro9.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/micro9.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/micro9.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c<br/>index 3a4bf90ba832..c3cbff126d0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/ts72xx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ep93xx/ts72xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/ts72xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ep93xx/ts72xx.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/m48t86.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-footbridge/cats-pci.c b/arch/arm/mach-footbridge/cats-pci.c<br/>index 35eb232a649a..ae3e1c8c7583 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/cats-pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-footbridge/cats-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/cats-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/cats-pci.c</a></div><div class='hunk'>@@ -18,6 +18,9 @@ static int irqmap_cats[] __initdata = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 };</div><div class='ctx'> </div><div class='ctx'> static int __init cats_map_irq(struct pci_dev *dev, u8 slot, u8 pin)</div><div class='ctx'> {</div><div class='add'>+	if (dev-&gt;irq &gt;= 255)</div><div class='add'>+		return -1;	/* not a valid interrupt. */</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;irq &gt;= 128)</div><div class='ctx'> 		return dev-&gt;irq &amp; 0x1f;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-footbridge/ebsa285-leds.c b/arch/arm/mach-footbridge/ebsa285-leds.c<br/>index 09c1fbc51876..4e10090cd87f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/ebsa285-leds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-footbridge/ebsa285-leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/ebsa285-leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/ebsa285-leds.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa285/debug-macro.S b/arch/arm/mach-footbridge/include/mach/debug-macro.S<br/>index b48cec4a0c45..4329b8123570 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa285/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa285/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-ebsa285/debug-macro.S</div><div class='add'>+/* arch/arm/mach-footbridge/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa285/dma.h b/arch/arm/mach-footbridge/include/mach/dma.h<br/>index 0259ad45d33c..62afd213effb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa285/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa285/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa285/dma.h</div><div class='add'>+ *  arch/arm/mach-footbridge/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Architecture DMA routines</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa285/entry-macro.S b/arch/arm/mach-footbridge/include/mach/entry-macro.S<br/>index e63064edb734..d3847be0c667 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa285/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa285/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ebsa285/entry-macro.S</div><div class='add'>+ * arch/arm/mach-footbridge/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for footbridge-based platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,8 +7,8 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/dec21285.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.equ	dc21285_high, ARMCSR_BASE &amp; 0xff000000</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa285/hardware.h b/arch/arm/mach-footbridge/include/mach/hardware.h<br/>index 74610c2c63d4..ffaea90486f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa285/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa285/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa285/hardware.h</div><div class='add'>+ *  arch/arm/mach-footbridge/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1998-1999 Russell King.</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_HARDWARE_H</div><div class='ctx'> #define __ASM_ARCH_HARDWARE_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/memory.h&gt;</div><div class='add'>+#include &lt;mach/memory.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*   Virtual      Physical	Size</div><div class='ctx'>  * 0xff800000	0x40000000	1MB	X-Bus</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa285/io.h b/arch/arm/mach-footbridge/include/mach/io.h<br/>index f9c729141860..a7b066239996 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa285/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa285/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa285/io.h</div><div class='add'>+ *  arch/arm/mach-footbridge/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997-1999 Russell King</div><div class='ctx'>  *</div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #ifndef __ASM_ARM_ARCH_IO_H</div><div class='ctx'> #define __ASM_ARM_ARCH_IO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT 0xffff</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-ebsa285/irqs.h b/arch/arm/mach-footbridge/include/mach/irqs.h<br/>index 3e766f1cecf1..400551e43e4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa285/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa285/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ebsa285/irqs.h</div><div class='add'>+ * arch/arm/mach-footbridge/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998 Russell King</div><div class='ctx'>  * Copyright (C) 1998 Phil Blundell</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa285/memory.h b/arch/arm/mach-footbridge/include/mach/memory.h<br/>index 9019a3bf5ab9..e9cae99dd1f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa285/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa285/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa285/memory.h</div><div class='add'>+ *  arch/arm/mach-footbridge/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996-1999 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa285/system.h b/arch/arm/mach-footbridge/include/mach/system.h<br/>index bf91c695c4b5..01c9f407f498 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa285/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa285/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa285/system.h</div><div class='add'>+ *  arch/arm/mach-footbridge/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996-1999 Russell King.</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/hardware/dec21285.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-ebsa285/timex.h b/arch/arm/mach-footbridge/include/mach/timex.h<br/>index df60b3812d96..d0fea9d6d4ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa285/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa285/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa285/timex.h</div><div class='add'>+ *  arch/arm/mach-footbridge/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1998 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa285/uncompress.h b/arch/arm/mach-footbridge/include/mach/uncompress.h<br/>index 86142c882b3a..5dfa44287346 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa285/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa285/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa285/uncompress.h</div><div class='add'>+ *  arch/arm/mach-footbridge/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996-1999 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ebsa285/vmalloc.h b/arch/arm/mach-footbridge/include/mach/vmalloc.h<br/>index e487d7e8c8a6..d0958d860a3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ebsa285/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ebsa285/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa285/vmalloc.h</div><div class='add'>+ *  arch/arm/mach-footbridge/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='head'>diff --git a/arch/arm/mach-footbridge/isa-irq.c b/arch/arm/mach-footbridge/isa-irq.c<br/>index 79443ffc8916..7132e522c366 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/isa-irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-footbridge/isa-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/isa-irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/isa-irq.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/dec21285.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-footbridge/netwinder-leds.c b/arch/arm/mach-footbridge/netwinder-leds.c<br/>index 8e9cac5a213b..d91a4f4a32dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/netwinder-leds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-footbridge/netwinder-leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/netwinder-leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/netwinder-leds.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-footbridge/time.c b/arch/arm/mach-footbridge/time.c<br/>index d5cfcda385d6..004819ea85c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-footbridge/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-footbridge/time.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-ebsa285/time.h</div><div class='add'>+ *  arch/arm/mach-footbridge/include/mach/time.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1998 Russell King.</div><div class='ctx'>  *  Copyright (C) 1998 Phil Blundell</div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/mc146818rtc.h&gt;</div><div class='ctx'> #include &lt;linux/bcd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='hunk'>@@ -49,12 +49,12 @@ static unsigned long __init get_isa_cmos_time(void)</div><div class='ctx'> 	} while (sec != CMOS_READ(RTC_SECONDS));</div><div class='ctx'> </div><div class='ctx'> 	if (!(CMOS_READ(RTC_CONTROL) &amp; RTC_DM_BINARY) || RTC_ALWAYS_BCD) {</div><div class='del'>-		BCD_TO_BIN(sec);</div><div class='del'>-		BCD_TO_BIN(min);</div><div class='del'>-		BCD_TO_BIN(hour);</div><div class='del'>-		BCD_TO_BIN(day);</div><div class='del'>-		BCD_TO_BIN(mon);</div><div class='del'>-		BCD_TO_BIN(year);</div><div class='add'>+		sec = bcd2bin(sec);</div><div class='add'>+		min = bcd2bin(min);</div><div class='add'>+		hour = bcd2bin(hour);</div><div class='add'>+		day = bcd2bin(day);</div><div class='add'>+		mon = bcd2bin(mon);</div><div class='add'>+		year = bcd2bin(year);</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((year += 1900) &lt; 1970)</div><div class='ctx'> 		year += 100;</div><div class='hunk'>@@ -76,7 +76,7 @@ static int set_isa_cmos_time(void)</div><div class='ctx'> </div><div class='ctx'> 	cmos_minutes = CMOS_READ(RTC_MINUTES);</div><div class='ctx'> 	if (!(save_control &amp; RTC_DM_BINARY) || RTC_ALWAYS_BCD)</div><div class='del'>-		BCD_TO_BIN(cmos_minutes);</div><div class='add'>+		cmos_minutes = bcd2bin(cmos_minutes);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * since we're only adjusting minutes and seconds,</div><div class='hunk'>@@ -92,8 +92,8 @@ static int set_isa_cmos_time(void)</div><div class='ctx'> </div><div class='ctx'> 	if (abs(real_minutes - cmos_minutes) &lt; 30) {</div><div class='ctx'> 		if (!(save_control &amp; RTC_DM_BINARY) || RTC_ALWAYS_BCD) {</div><div class='del'>-			BIN_TO_BCD(real_seconds);</div><div class='del'>-			BIN_TO_BCD(real_minutes);</div><div class='add'>+			real_seconds = bin2bcd(real_seconds);</div><div class='add'>+			real_minutes = bin2bcd(real_minutes);</div><div class='ctx'> 		}</div><div class='ctx'> 		CMOS_WRITE(real_seconds,RTC_SECONDS);</div><div class='ctx'> 		CMOS_WRITE(real_minutes,RTC_MINUTES);</div><div class='head'>diff --git a/arch/arm/mach-h720x/common.c b/arch/arm/mach-h720x/common.c<br/>index 45144ad2bed9..b5f9741ae13c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/common.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-h720x/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/common.c</a></div><div class='hunk'>@@ -23,11 +23,11 @@</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/dma.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-h720x/cpu-h7201.c b/arch/arm/mach-h720x/cpu-h7201.c<br/>index c2a431f482f0..24df2a349a98 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/cpu-h7201.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-h720x/cpu-h7201.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/cpu-h7201.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/cpu-h7201.c</a></div><div class='hunk'>@@ -17,9 +17,9 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='head'>diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c<br/>index c627fa124eb3..53e1f62f2e79 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/cpu-h7202.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-h720x/cpu-h7202.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/cpu-h7202.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/cpu-h7202.c</a></div><div class='hunk'>@@ -17,9 +17,9 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-h720x/h7201-eval.c b/arch/arm/mach-h720x/h7201-eval.c<br/>index 407cd4c0aa8a..78be457dc324 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/h7201-eval.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-h720x/h7201-eval.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/h7201-eval.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/h7201-eval.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(H7201, "Hynix GMS30C7201")</div><div class='head'>diff --git a/arch/arm/mach-h720x/h7202-eval.c b/arch/arm/mach-h720x/h7202-eval.c<br/>index bf2acdce62e5..56161d55cf47 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/h7202-eval.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-h720x/h7202-eval.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/h7202-eval.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/h7202-eval.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> static struct resource cirrus_resources[] = {</div><div class='head'>diff --git a/include/asm-arm/arch-h720x/boards.h b/arch/arm/mach-h720x/include/mach/boards.h<br/>index 8021f81f0742..079b279e1242 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-h720x/boards.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-h720x/boards.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/boards.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/boards.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-h720x/boards.h</div><div class='add'>+ * arch/arm/mach-h720x/include/mach/boards.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2003 Thomas Gleixner &lt;tglx@linutronix.de&gt;</div><div class='ctx'>  *           (C) 2003 Robert Schwebel &lt;r.schwebel@pengutronix.de&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-h720x/debug-macro.S b/arch/arm/mach-h720x/include/mach/debug-macro.S<br/>index 82822d362733..6294a1344dda 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-h720x/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-h720x/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-h720x/debug-macro.S</div><div class='add'>+/* arch/arm/mach-h720x/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-h720x/dma.h b/arch/arm/mach-h720x/include/mach/dma.h<br/>index bfc6636679f7..0a9d86ee84fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-h720x/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-h720x/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-h720x/dma.h</div><div class='add'>+ * arch/arm/mach-h720x/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  * Architecture DMA routes</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-h720x/entry-macro.S b/arch/arm/mach-h720x/include/mach/entry-macro.S<br/>index 38dd63ae104e..6d3b917c4a18 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-h720x/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-h720x/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-h720x/entry-macro.S</div><div class='add'>+ * arch/arm/mach-h720x/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for Hynix HMS720x based platforms</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-h720x/h7201-regs.h b/arch/arm/mach-h720x/include/mach/h7201-regs.h<br/>index 49d4f6bd3080..611b4947ccfc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-h720x/h7201-regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-h720x/h7201-regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/h7201-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/h7201-regs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-h720x/h7201-regs.h</div><div class='add'>+ * arch/arm/mach-h720x/include/mach/h7201-regs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc.</div><div class='ctx'>  *           (C) 2003 Thomas Gleixner &lt;tglx@linutronix.de&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-h720x/h7202-regs.h b/arch/arm/mach-h720x/include/mach/h7202-regs.h<br/>index 43d8ba8a6013..17c12eb34995 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-h720x/h7202-regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-h720x/h7202-regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/h7202-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/h7202-regs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-h720x/h7202-regs.h</div><div class='add'>+ * arch/arm/mach-h720x/include/mach/h7202-regs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc.</div><div class='ctx'>  *           (C) 2003 Thomas Gleixner &lt;tglx@linutronix.de&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-h720x/hardware.h b/arch/arm/mach-h720x/include/mach/hardware.h<br/>index dfb778906a9f..6c19156e2a42 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-h720x/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-h720x/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-h720x/hardware.h</div><div class='add'>+ * arch/arm/mach-h720x/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc.</div><div class='ctx'>  *           (C) 2003 Thomas Gleixner &lt;tglx@linutronix.de&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-h720x/io.h b/arch/arm/mach-h720x/include/mach/io.h<br/>index d3ccfd8172b7..1dab74ce88c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-h720x/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-h720x/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/io.h</a></div><div class='hunk'>@@ -1,12 +1,12 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-h720x/io.h</div><div class='add'>+ * arch/arm/mach-h720x/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 Steve Hill (sjhill@cotw.com)</div><div class='ctx'>  *</div><div class='ctx'>  * Changelog:</div><div class='ctx'>  *</div><div class='ctx'>  *  09-19-2001	JJKIM</div><div class='del'>- *  		Created from linux/include/asm-arm/arch-l7200/io.h</div><div class='add'>+ *  		Created from arch/arm/mach-l7200/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  *  03-27-2003  Robert Schwebel &lt;r.schwebel@pengutronix.de&gt;:</div><div class='ctx'>  *  		re-unified header files for h720x</div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #ifndef __ASM_ARM_ARCH_IO_H</div><div class='ctx'> #define __ASM_ARM_ARCH_IO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT 0xffffffff</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-h720x/irqs.h b/arch/arm/mach-h720x/include/mach/irqs.h<br/>index 8244413988be..430a92b492f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-h720x/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-h720x/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-h720x/irqs.h</div><div class='add'>+ * arch/arm/mach-h720x/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 Jungjun Kim</div><div class='ctx'>  *           (C) 2003 Robert Schwebel &lt;r.schwebel@pengutronix.de&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-h720x/memory.h b/arch/arm/mach-h720x/include/mach/memory.h<br/>index 53e923dba76e..cb26f49cc4e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-h720x/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-h720x/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-h720x/memory.h</div><div class='add'>+ * arch/arm/mach-h720x/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2000 Jungjun Kim</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-h720x/system.h b/arch/arm/mach-h720x/include/mach/system.h<br/>index 8dc1460b2305..e4a7c760d52a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-h720x/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-h720x/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/system.h</a></div><div class='hunk'>@@ -1,18 +1,18 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-h720x/system.h</div><div class='add'>+ * arch/arm/mach-h720x/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2001-2002 Jungjun Kim, Hynix Semiconductor Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='del'>- * linux/include/asm-arm/arch-h720x/system.h</div><div class='add'>+ * arch/arm/mach-h720x/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-h720x/timex.h b/arch/arm/mach-h720x/include/mach/timex.h<br/>index 48a391c4080f..3f2f447ff36b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-h720x/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-h720x/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-h720x/timex.h</div><div class='add'>+ * arch/arm/mach-h720x/include/mach/timex.h</div><div class='ctx'>  * Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='head'>diff --git a/include/asm-arm/arch-h720x/uncompress.h b/arch/arm/mach-h720x/include/mach/uncompress.h<br/>index 18c69e0f3585..d6623234f61e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-h720x/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-h720x/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-h720x/uncompress.h</div><div class='add'>+ * arch/arm/mach-h720x/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2001-2002 Jungjun Kim</div><div class='ctx'>  */</div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_UNCOMPRESS_H</div><div class='ctx'> #define __ASM_ARCH_UNCOMPRESS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define LSR 	0x14</div><div class='ctx'> #define TEMPTY 	0x40</div><div class='head'>diff --git a/include/asm-arm/arch-h720x/vmalloc.h b/arch/arm/mach-h720x/include/mach/vmalloc.h<br/>index b4693cb821ef..ff1460d6841b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-h720x/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-h720x/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-h720x/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-h720x/vmalloc.h</div><div class='add'>+ * arch/arm/mach-h720x/include/mach/vmalloc.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ARCH_ARM_VMALLOC_H</div><div class='head'>diff --git a/arch/arm/mach-imx/clock.c b/arch/arm/mach-imx/clock.c<br/>index 6a90fe5578df..4b4230db3765 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-imx/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/clock.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/imx-regs.h&gt;</div><div class='add'>+#include &lt;mach/imx-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Very simple approach: We can't disable clocks, so we do</div><div class='hunk'>@@ -172,24 +172,29 @@ found:</div><div class='ctx'> </div><div class='ctx'> 	return clk;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(clk_get);</div><div class='ctx'> </div><div class='ctx'> void clk_put(struct clk *clk)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(clk_put);</div><div class='ctx'> </div><div class='ctx'> int clk_enable(struct clk *clk)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(clk_enable);</div><div class='ctx'> </div><div class='ctx'> void clk_disable(struct clk *clk)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(clk_disable);</div><div class='ctx'> </div><div class='ctx'> unsigned long clk_get_rate(struct clk *clk)</div><div class='ctx'> {</div><div class='ctx'> 	return clk-&gt;get_rate();</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(clk_get_rate);</div><div class='ctx'> </div><div class='ctx'> int imx_clocks_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-imx/cpufreq.c b/arch/arm/mach-imx/cpufreq.c<br/>index be0809b33e08..434b4ca0af67 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/cpufreq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-imx/cpufreq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/cpufreq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/cpufreq.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-imx/dma.c b/arch/arm/mach-imx/dma.c<br/>index ee1c6f06ff64..c10810c936b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/dma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-imx/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/dma.c</a></div><div class='hunk'>@@ -30,9 +30,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/imx-dma.h&gt;</div><div class='add'>+#include &lt;mach/imx-dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct imx_dma_channel imx_dma_channels[IMX_DMA_CHANNELS];</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-imx/generic.c b/arch/arm/mach-imx/generic.c<br/>index 98ddd8a6d05f..fa72174dd95c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/generic.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-imx/generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/generic.c</a></div><div class='hunk'>@@ -29,13 +29,13 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='del'>-#include &lt;asm/arch/imxfb.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/imx-regs.h&gt;</div><div class='add'>+#include &lt;mach/imxfb.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/imx-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned long imx_gpio_alloc_map[(GPIO_PORT_MAX + 1) * 32 / BITS_PER_LONG];</div><div class='ctx'> </div><div class='hunk'>@@ -251,7 +251,6 @@ void __init set_imx_fb_info(struct imxfb_mach_info *hard_imx_fb_info)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(&amp;imx_fb_info,hard_imx_fb_info,sizeof(struct imxfb_mach_info));</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(set_imx_fb_info);</div><div class='ctx'> </div><div class='ctx'> static struct resource imxfb_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='head'>diff --git a/include/asm-arm/arch-imx/debug-macro.S b/arch/arm/mach-imx/include/mach/debug-macro.S<br/>index c611871643a2..87802bbfe633 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-imx/debug-macro.S</div><div class='add'>+/* arch/arm/mach-imx/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-imx/dma.h b/arch/arm/mach-imx/include/mach/dma.h<br/>index 621ff2c730f2..621ff2c730f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/dma.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-imx/entry-macro.S b/arch/arm/mach-imx/include/mach/entry-macro.S<br/>index 0b84e81031c3..e4db679f7766 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-imx/entry-macro.S</div><div class='add'>+ * arch/arm/mach-imx/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for iMX-based platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='head'>diff --git a/include/asm-arm/arch-imx/gpio.h b/arch/arm/mach-imx/include/mach/gpio.h<br/>index 486023263f32..6e3d795f2264 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/gpio.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #ifndef _IMX_GPIO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/imx-regs.h&gt;</div><div class='add'>+#include &lt;mach/imx-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IMX_GPIO_ALLOC_MODE_NORMAL	0</div><div class='ctx'> #define IMX_GPIO_ALLOC_MODE_NO_ALLOC	1</div><div class='head'>diff --git a/include/asm-arm/arch-imx/hardware.h b/arch/arm/mach-imx/include/mach/hardware.h<br/>index 6542ca5e8c33..c73e9e724c75 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-imx/hardware.h</div><div class='add'>+ *  arch/arm/mach-imx/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 ARM Limited.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-imx/imx-dma.h b/arch/arm/mach-imx/include/mach/imx-dma.h<br/>index 44d89c35539a..44d89c35539a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/imx-dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/imx-dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/imx-dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/imx-dma.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-imx/imx-regs.h b/arch/arm/mach-imx/include/mach/imx-regs.h<br/>index fb9de2733879..fb9de2733879 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/imx-regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/imx-regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/imx-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/imx-regs.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-imx/imx-uart.h b/arch/arm/mach-imx/include/mach/imx-uart.h<br/>index d54eb1d48026..d54eb1d48026 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/imx-uart.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/imx-uart.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/imx-uart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/imx-uart.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-imx/imxfb.h b/arch/arm/mach-imx/include/mach/imxfb.h<br/>index 3ed9ec8b9f00..3ed9ec8b9f00 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/imxfb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/imxfb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/imxfb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/imxfb.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-imx/io.h b/arch/arm/mach-imx/include/mach/io.h<br/>index b191cdd05576..c50c5fa6fb81 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-imxads/io.h</div><div class='add'>+ *  arch/arm/mach-imxads/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 ARM Limited</div><div class='ctx'>  *</div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #ifndef __ASM_ARM_ARCH_IO_H</div><div class='ctx'> #define __ASM_ARM_ARCH_IO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT 0xffffffff</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-imx/irqs.h b/arch/arm/mach-imx/include/mach/irqs.h<br/>index f195542898e0..eb8d5bd05d56 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-imxads/irqs.h</div><div class='add'>+ *  arch/arm/mach-imxads/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd.</div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #define __ARM_IRQS_H__</div><div class='ctx'> </div><div class='ctx'> /* Use the imx definitions */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  IMX Interrupt numbers</div><div class='head'>diff --git a/include/asm-arm/arch-imx/memory.h b/arch/arm/mach-imx/include/mach/memory.h<br/>index 5ad90127915f..5c453063c0ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-imx/memory.h</div><div class='add'>+ *  arch/arm/mach-imx/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2002 Shane Nay (shane@minirl.com)</div><div class='head'>diff --git a/include/asm-arm/arch-imx/mmc.h b/arch/arm/mach-imx/include/mach/mmc.h<br/>index 4712f354dcca..4712f354dcca 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/mmc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/mmc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/mmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/mmc.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-imx/mx1ads.h b/arch/arm/mach-imx/include/mach/mx1ads.h<br/>index d90fa4b49ce1..def05d510eb3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/mx1ads.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/mx1ads.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/mx1ads.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/mx1ads.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-imx/mx1ads.h</div><div class='add'>+ * arch/arm/mach-imx/include/mach/mx1ads.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004 Robert Schwebel, Pengutronix</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-imx/spi_imx.h b/arch/arm/mach-imx/include/mach/spi_imx.h<br/>index 2165449e976e..4186430feecf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/spi_imx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/spi_imx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/spi_imx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/spi_imx.h</a></div><div class='hunk'>@@ -1,11 +1,11 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-imx/spi_imx.h</div><div class='add'>+ * arch/arm/mach-imx/include/mach/spi_imx.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 SWAPP</div><div class='ctx'>  *	Andrea Paterniani &lt;a.paterniani@swapp-eng.it&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Initial version inspired by:</div><div class='del'>- *	linux-2.6.17-rc3-mm1/include/asm-arm/arch-pxa/pxa2xx_spi.h</div><div class='add'>+ *	linux-2.6.17-rc3-mm1/arch/arm/mach-pxa/include/mach/pxa2xx_spi.h</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/include/asm-arm/arch-imx/system.h b/arch/arm/mach-imx/include/mach/system.h<br/>index c645fe9afb9d..adee7e51bab2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-imxads/system.h</div><div class='add'>+ *  arch/arm/mach-imxads/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd</div><div class='head'>diff --git a/include/asm-arm/arch-imx/timex.h b/arch/arm/mach-imx/include/mach/timex.h<br/>index e22ba789546c..e22ba789546c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/timex.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-imx/uncompress.h b/arch/arm/mach-imx/include/mach/uncompress.h<br/>index da333f69136f..70523e67a8f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-imxads/uncompress.h</div><div class='add'>+ *  arch/arm/mach-imxads/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-imx/vmalloc.h b/arch/arm/mach-imx/include/mach/vmalloc.h<br/>index cb6169127068..7d7cb0bde3e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-imx/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-imx/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-imx/vmalloc.h</div><div class='add'>+ *  arch/arm/mach-imx/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c<br/>index e1b1f028b930..798f221eb3b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-imx/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/irq.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-imx/leds-mx1ads.c b/arch/arm/mach-imx/leds-mx1ads.c<br/>index 79236404aec2..af81621f689b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/leds-mx1ads.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-imx/leds-mx1ads.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/leds-mx1ads.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/leds-mx1ads.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c<br/>index 9635d5812bcd..87fa1ff43b0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mx1ads.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-imx/mx1ads.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mx1ads.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/mx1ads.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -25,8 +25,8 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/imx-uart.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/imx-uart.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -125,7 +125,7 @@ static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;imx_uart2_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MMC_IMX</div><div class='add'>+#if defined(CONFIG_MMC_IMX) || defined(CONFIG_MMC_IMX_MODULE)</div><div class='ctx'> static int mx1ads_mmc_card_present(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* MMC/SD Card Detect is PB 20 on MX1ADS V1.0.7 */</div><div class='hunk'>@@ -143,7 +143,7 @@ mx1ads_init(void)</div><div class='ctx'> #ifdef CONFIG_LEDS</div><div class='ctx'> 	imx_gpio_mode(GPIO_PORTA | GPIO_OUT | 2);</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_MMC_IMX</div><div class='add'>+#if defined(CONFIG_MMC_IMX) || defined(CONFIG_MMC_IMX_MODULE)</div><div class='ctx'> 	/* SD/MMC card detect */</div><div class='ctx'> 	imx_gpio_mode(GPIO_PORTB | GPIO_GIUS | GPIO_IN | 20);</div><div class='ctx'> 	imx_set_mmc_info(&amp;mx1ads_mmc_info);</div><div class='head'>diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c<br/>index 5a41e96e8586..08be3875c59e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-imx/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-imx/time.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c<br/>index 7fbbc17f8e8b..8bacf6d4d097 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-integrator/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/core.c</a></div><div class='hunk'>@@ -20,11 +20,11 @@</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/serial.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/arm_timer.h&gt;</div><div class='del'>-#include &lt;asm/arch/cm.h&gt;</div><div class='add'>+#include &lt;mach/cm.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c<br/>index 71c58bff304c..7c49d55e6b27 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/cpu.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-integrator/cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/cpu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/cpu.c</a></div><div class='hunk'>@@ -3,8 +3,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2001-2002 Deep Blue Solutions Ltd.</div><div class='ctx'>  *</div><div class='del'>- *  $Id: cpu.c,v 1.6 2002/07/18 13:58:51 rmk Exp $</div><div class='del'>- *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='hunk'>@@ -20,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/icst525.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c<br/>index 5a1588cf8242..3c8383dbe9e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/impd1.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-integrator/impd1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/impd1.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/impd1.c</a></div><div class='hunk'>@@ -23,8 +23,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/icst525.h&gt;</div><div class='del'>-#include &lt;asm/arch/lm.h&gt;</div><div class='del'>-#include &lt;asm/arch/impd1.h&gt;</div><div class='add'>+#include &lt;mach/lm.h&gt;</div><div class='add'>+#include &lt;mach/impd1.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "clock.h"</div><div class='hunk'>@@ -405,7 +405,7 @@ static int impd1_probe(struct lm_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		ret = amba_device_register(d, &amp;dev-&gt;resource);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			dev_err(&amp;d-&gt;dev, "unable to register device: %d\n");</div><div class='add'>+			dev_err(&amp;d-&gt;dev, "unable to register device: %d\n", ret);</div><div class='ctx'> 			kfree(d);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/include/asm-arm/arch-integrator/bits.h b/arch/arm/mach-integrator/include/mach/bits.h<br/>index 09b024e0496a..09b024e0496a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-integrator/bits.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-integrator/bits.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/bits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/bits.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-integrator/cm.h b/arch/arm/mach-integrator/include/mach/cm.h<br/>index 1ab353e23595..1ab353e23595 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-integrator/cm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-integrator/cm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/cm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/cm.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-integrator/debug-macro.S b/arch/arm/mach-integrator/include/mach/debug-macro.S<br/>index 85b327c352df..d347d659ea30 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-integrator/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-integrator/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-integrator/debug-macro.S</div><div class='add'>+/* arch/arm/mach-integrator/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-integrator/dma.h b/arch/arm/mach-integrator/include/mach/dma.h<br/>index 83fd6bbaf9d3..fbebe85a2db7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-integrator/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-integrator/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-integrator/dma.h</div><div class='add'>+ *  arch/arm/mach-integrator/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997,1998 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-integrator/entry-macro.S b/arch/arm/mach-integrator/include/mach/entry-macro.S<br/>index 491af1a23de5..7649c57acb53 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-integrator/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-integrator/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-integrator/entry-macro.S</div><div class='add'>+ * arch/arm/mach-integrator/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for Integrator platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,8 +7,8 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'>  		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='head'>diff --git a/include/asm-arm/arch-integrator/hardware.h b/arch/arm/mach-integrator/include/mach/hardware.h<br/>index 6f0947bc500d..1251319ef9ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-integrator/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-integrator/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-integrator/hardware.h</div><div class='add'>+ *  arch/arm/mach-integrator/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  *  This file contains the hardware definitions of the Integrator.</div><div class='ctx'>  *</div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #define __ASM_ARCH_HARDWARE_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='del'>-#include &lt;asm/arch/platform.h&gt;</div><div class='add'>+#include &lt;mach/platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Where in virtual memory the IO devices (timers, system controllers</div><div class='head'>diff --git a/include/asm-arm/arch-integrator/impd1.h b/arch/arm/mach-integrator/include/mach/impd1.h<br/>index d75de4b14237..d75de4b14237 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-integrator/impd1.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-integrator/impd1.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/impd1.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/impd1.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-integrator/io.h b/arch/arm/mach-integrator/include/mach/io.h<br/>index c8f2175948bd..f21bb5493dd9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-integrator/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-integrator/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-integrator/io.h</div><div class='add'>+ *  arch/arm/mach-integrator/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 ARM Limited</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-integrator/irqs.h b/arch/arm/mach-integrator/include/mach/irqs.h<br/>index ba7b3afee445..1fbe6d190222 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-integrator/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-integrator/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-integrator/irqs.h</div><div class='add'>+ *  arch/arm/mach-integrator/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd.</div><div class='head'>diff --git a/include/asm-arm/arch-integrator/lm.h b/arch/arm/mach-integrator/include/mach/lm.h<br/>index 28186b6f2c09..28186b6f2c09 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-integrator/lm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-integrator/lm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/lm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/lm.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-integrator/memory.h b/arch/arm/mach-integrator/include/mach/memory.h<br/>index 1ab56d783e7c..be7e63c21d25 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-integrator/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-integrator/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-integrator/memory.h</div><div class='add'>+ *  arch/arm/mach-integrator/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 ARM Limited</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-integrator/platform.h b/arch/arm/mach-integrator/include/mach/platform.h<br/>index 83c4c1ceb411..028b87839c0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-integrator/platform.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-integrator/platform.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/platform.h</a></div><div class='hunk'>@@ -26,8 +26,6 @@</div><div class='ctx'>  * 	NOTE: This is a multi-hosted header file for use with uHAL and</div><div class='ctx'>  * 	      supported debuggers.</div><div class='ctx'>  *</div><div class='del'>- * 	$Id: platform.s,v 1.32 2000/02/18 10:51:39 asims Exp $</div><div class='del'>- *</div><div class='ctx'>  * ***********************************************************************/</div><div class='ctx'> </div><div class='ctx'> #ifndef __address_h</div><div class='head'>diff --git a/include/asm-arm/arch-integrator/system.h b/arch/arm/mach-integrator/include/mach/system.h<br/>index 8ea442237d20..c485345c8c77 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-integrator/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-integrator/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-integrator/system.h</div><div class='add'>+ *  arch/arm/mach-integrator/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd</div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/cm.h&gt;</div><div class='add'>+#include &lt;mach/cm.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-integrator/timex.h b/arch/arm/mach-integrator/include/mach/timex.h<br/>index 87a762818ba2..1dcb42028c82 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-integrator/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-integrator/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-integrator/timex.h</div><div class='add'>+ *  arch/arm/mach-integrator/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Integrator architecture timex specifications</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-integrator/uncompress.h b/arch/arm/mach-integrator/include/mach/uncompress.h<br/>index f61825c4d901..30452f00a164 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-integrator/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-integrator/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-integrator/uncompress.h</div><div class='add'>+ *  arch/arm/mach-integrator/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 ARM Limited</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-integrator/vmalloc.h b/arch/arm/mach-integrator/include/mach/vmalloc.h<br/>index 170cccece523..e87ab0b37bdd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-integrator/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-integrator/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-integrator/vmalloc.h</div><div class='add'>+ *  arch/arm/mach-integrator/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c<br/>index df37e93c6fc9..6e472b5f8f26 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/integrator_ap.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-integrator/integrator_ap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/integrator_ap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/integrator_ap.c</a></div><div class='hunk'>@@ -28,14 +28,14 @@</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/kmi.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/param.h&gt;		/* HZ */</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/lm.h&gt;</div><div class='add'>+#include &lt;mach/lm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c<br/>index 913f64b22405..6b99e9c258bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/integrator_cp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-integrator/integrator_cp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/integrator_cp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/integrator_cp.c</a></div><div class='hunk'>@@ -20,15 +20,15 @@</div><div class='ctx'> #include &lt;linux/amba/kmi.h&gt;</div><div class='ctx'> #include &lt;linux/amba/clcd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/icst525.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/cm.h&gt;</div><div class='del'>-#include &lt;asm/arch/lm.h&gt;</div><div class='add'>+#include &lt;mach/cm.h&gt;</div><div class='add'>+#include &lt;mach/lm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-integrator/leds.c b/arch/arm/mach-integrator/leds.c<br/>index f1436e683b49..7bc6881434ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/leds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-integrator/leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/leds.c</a></div><div class='hunk'>@@ -25,12 +25,12 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/arch/cm.h&gt;</div><div class='add'>+#include &lt;mach/cm.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int saved_leds;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-integrator/lm.c b/arch/arm/mach-integrator/lm.c<br/>index f939c5091405..f52c7af31eaa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/lm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-integrator/lm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/lm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/lm.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/lm.h&gt;</div><div class='add'>+#include &lt;mach/lm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define to_lm_device(d)	container_of(d, struct lm_device, dev)</div><div class='ctx'> #define to_lm_driver(d)	container_of(d, struct lm_driver, drv)</div><div class='head'>diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c<br/>index c07f497000ca..9f2b1ea8fb20 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/pci_v3.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-integrator/pci_v3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/pci_v3.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-integrator/pci_v3.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/adma.h b/arch/arm/mach-iop13xx/include/mach/adma.h<br/>index ef4f5da2029f..60019c8e6465 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/adma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/adma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/adma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/adma.h</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #define _ADMA_H</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iop_adma.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define ADMA_ACCR(chan)	(chan-&gt;mmr_base + 0x0)</div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/debug-macro.S b/arch/arm/mach-iop13xx/include/mach/debug-macro.S<br/>index 788b4e386c16..9037d2e8557c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop13xx/debug-macro.S</div><div class='add'>+ * arch/arm/mach-iop13xx/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/dma.h b/arch/arm/mach-iop13xx/include/mach/dma.h<br/>index d79846fbb394..d79846fbb394 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/dma.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/entry-macro.S b/arch/arm/mach-iop13xx/include/mach/entry-macro.S<br/>index a624a7870c64..a624a7870c64 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/entry-macro.S</a></div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/hardware.h b/arch/arm/mach-iop13xx/include/mach/hardware.h<br/>index 8e1d56289846..8e1d56289846 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/hardware.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/io.h b/arch/arm/mach-iop13xx/include/mach/io.h<br/>index a6e0f9e6ddcf..a6e0f9e6ddcf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/io.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/iop13xx.h b/arch/arm/mach-iop13xx/include/mach/iop13xx.h<br/>index 52b7fab7ef60..52b7fab7ef60 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/iop13xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/iop13xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/iop13xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/iop13xx.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/iq81340.h b/arch/arm/mach-iop13xx/include/mach/iq81340.h<br/>index ba2cf931e9ce..ba2cf931e9ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/iq81340.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/iq81340.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/iq81340.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/iq81340.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/irqs.h b/arch/arm/mach-iop13xx/include/mach/irqs.h<br/>index 054e7acb5bfa..054e7acb5bfa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/irqs.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/memory.h b/arch/arm/mach-iop13xx/include/mach/memory.h<br/>index 031a0fa78eff..e8b59d8f1bb9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/memory.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_MEMORY_H</div><div class='ctx'> #define __ASM_ARCH_MEMORY_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Physical DRAM offset.</div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/msi.h b/arch/arm/mach-iop13xx/include/mach/msi.h<br/>index b80c5ae17e99..b80c5ae17e99 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/msi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/msi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/msi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/msi.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/pci.h b/arch/arm/mach-iop13xx/include/mach/pci.h<br/>index 4041f30d4cd3..17b5515af8b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/pci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/pci.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #ifndef _IOP13XX_PCI_H_</div><div class='ctx'> #define _IOP13XX_PCI_H_</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct pci_sys_data;</div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/system.h b/arch/arm/mach-iop13xx/include/mach/system.h<br/>index 8575af8db78c..c7127f416e1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-iop13xx/system.h</div><div class='add'>+ * arch/arm/mach-iop13xx/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 Intel Corp.</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/arch/iop13xx.h&gt;</div><div class='add'>+#include &lt;mach/iop13xx.h&gt;</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/time.h b/arch/arm/mach-iop13xx/include/mach/time.h<br/>index 49213d9d7cad..49213d9d7cad 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/time.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/time.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/time.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/timex.h b/arch/arm/mach-iop13xx/include/mach/timex.h<br/>index f0c51dd97ed8..5b1f1c8a8270 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/timex.h</a></div><div class='hunk'>@@ -1,3 +1,3 @@</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CLOCK_TICK_RATE (100 * HZ)</div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/uncompress.h b/arch/arm/mach-iop13xx/include/mach/uncompress.h<br/>index dd9c2934190e..fa4f80522fad 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define UART_BASE ((volatile u32 *)IOP13XX_UART1_PHYS)</div><div class='ctx'> #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE)</div><div class='head'>diff --git a/include/asm-arm/arch-iop13xx/vmalloc.h b/arch/arm/mach-iop13xx/include/mach/vmalloc.h<br/>index c53456740345..c53456740345 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop13xx/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop13xx/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/include/mach/vmalloc.h</a></div><div class='head'>diff --git a/arch/arm/mach-iop13xx/io.c b/arch/arm/mach-iop13xx/io.c<br/>index 5b22fdeca52c..26cfa318142c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-iop13xx/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/io.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> void * __iomem __iop13xx_io(unsigned long io_addr)</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/iq81340mc.c b/arch/arm/mach-iop13xx/iq81340mc.c<br/>index 77b24cd1d88d..5051c03d437c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/iq81340mc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-iop13xx/iq81340mc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/iq81340mc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/iq81340mc.c</a></div><div class='hunk'>@@ -18,14 +18,14 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/arch/pci.h&gt;</div><div class='add'>+#include &lt;mach/pci.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/arch/time.h&gt;</div><div class='add'>+#include &lt;mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern int init_atu; /* Flag to select which ATU(s) to initialize / disable */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-iop13xx/iq81340sc.c b/arch/arm/mach-iop13xx/iq81340sc.c<br/>index e8522b3b8163..bc443073a8e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/iq81340sc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-iop13xx/iq81340sc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/iq81340sc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/iq81340sc.c</a></div><div class='hunk'>@@ -18,14 +18,14 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/arch/pci.h&gt;</div><div class='add'>+#include &lt;mach/pci.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/arch/time.h&gt;</div><div class='add'>+#include &lt;mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern int init_atu;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-iop13xx/irq.c b/arch/arm/mach-iop13xx/irq.c<br/>index 69f07b25b3c9..0d099ca87bdf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-iop13xx/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/irq.c</a></div><div class='hunk'>@@ -23,10 +23,9 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='del'>-#include &lt;asm/arch/msi.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='add'>+#include &lt;mach/msi.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* INTCTL0 CP6 R0 Page 4</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c<br/>index 7825c1aaa27b..673b0db22034 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-iop13xx/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/pci.c</a></div><div class='hunk'>@@ -21,11 +21,11 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> #include &lt;asm/signal.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/pci.h&gt;</div><div class='add'>+#include &lt;mach/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IOP13XX_PCI_DEBUG 0</div><div class='ctx'> #define PRINTK(x...) ((void)(IOP13XX_PCI_DEBUG &amp;&amp; printk(x)))</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c<br/>index 246f6d478720..b17ccc8cb471 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-iop13xx/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop13xx/setup.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iop_adma.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-iop32x/em7210.c b/arch/arm/mach-iop32x/em7210.c<br/>index 4877597c8758..3ad4696ade42 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/em7210.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-iop32x/em7210.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/em7210.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/em7210.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/arch/time.h&gt;</div><div class='add'>+#include &lt;mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void __init em7210_timer_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-iop32x/glantank.c b/arch/arm/mach-iop32x/glantank.c<br/>index d4fca75ce542..45d61276d233 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/glantank.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-iop32x/glantank.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/glantank.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/glantank.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/arch/time.h&gt;</div><div class='add'>+#include &lt;mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * GLAN Tank timer tick configuration.</div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/adma.h b/arch/arm/mach-iop32x/include/mach/adma.h<br/>index 5ed92037dd10..5ed92037dd10 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/adma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/adma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/adma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/adma.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/debug-macro.S b/arch/arm/mach-iop32x/include/mach/debug-macro.S<br/>index 9022b6849e23..58b01664ffba 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop32x/debug-macro.S</div><div class='add'>+ * arch/arm/mach-iop32x/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-iop33x/dma.h b/arch/arm/mach-iop32x/include/mach/dma.h<br/>index b7775fdc5ad3..f8bd817f205d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop33x/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop33x/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop33x/dma.h</div><div class='add'>+ * arch/arm/mach-iop32x/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004 Intel Corp.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/entry-macro.S b/arch/arm/mach-iop32x/include/mach/entry-macro.S<br/>index 207db99dfbd2..b02fb56bafcc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop32x/entry-macro.S</div><div class='add'>+ * arch/arm/mach-iop32x/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for IOP32x-based platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/arch/iop32x.h&gt;</div><div class='add'>+#include &lt;mach/iop32x.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro	disable_fiq</div><div class='ctx'> 	.endm</div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/glantank.h b/arch/arm/mach-iop32x/include/mach/glantank.h<br/>index bf0665acc1c1..958eb91c0913 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/glantank.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/glantank.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/glantank.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/glantank.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop32x/glantank.h</div><div class='add'>+ * arch/arm/mach-iop32x/include/mach/glantank.h</div><div class='ctx'>  *</div><div class='ctx'>  * IO-Data GLAN Tank board registers</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/gpio.h b/arch/arm/mach-iop32x/include/mach/gpio.h<br/>index 708f4ec9db1d..708f4ec9db1d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/gpio.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/hardware.h b/arch/arm/mach-iop32x/include/mach/hardware.h<br/>index 6556ed5eee31..d559c4e6095a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop32x/hardware.h</div><div class='add'>+ * arch/arm/mach-iop32x/include/mach/hardware.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __HARDWARE_H</div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/io.h b/arch/arm/mach-iop32x/include/mach/io.h<br/>index 958af751a484..ce54705ba3d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop32x/io.h</div><div class='add'>+ * arch/arm/mach-iop32x/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2001 MontaVista Software, Inc.</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef __IO_H</div><div class='ctx'> #define __IO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size,</div><div class='ctx'> 	unsigned int mtype);</div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/iop32x.h b/arch/arm/mach-iop32x/include/mach/iop32x.h<br/>index 0d8af57221a1..abd9eb49f103 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/iop32x.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/iop32x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/iop32x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/iop32x.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop32x/iop32x.h</div><div class='add'>+ * arch/arm/mach-iop32x/include/mach/iop32x.h</div><div class='ctx'>  *</div><div class='ctx'>  * Intel IOP32X Chip definitions</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/iq31244.h b/arch/arm/mach-iop32x/include/mach/iq31244.h<br/>index fff4eafa1f6b..6b6b369e781c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/iq31244.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/iq31244.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/iq31244.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/iq31244.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop32x/iq31244.h</div><div class='add'>+ * arch/arm/mach-iop32x/include/mach/iq31244.h</div><div class='ctx'>  *</div><div class='ctx'>  * Intel IQ31244 evaluation board registers</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/iq80321.h b/arch/arm/mach-iop32x/include/mach/iq80321.h<br/>index eb69db9b9a06..498819b737e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/iq80321.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/iq80321.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/iq80321.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/iq80321.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop32x/iq80321.h</div><div class='add'>+ * arch/arm/mach-iop32x/include/mach/iq80321.h</div><div class='ctx'>  *</div><div class='ctx'>  * Intel IQ80321 evaluation board registers</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/irqs.h b/arch/arm/mach-iop32x/include/mach/irqs.h<br/>index bbaef873afce..33573e09914c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop32x/irqs.h</div><div class='add'>+ * arch/arm/mach-iop32x/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Author:	Rory Bolt &lt;rorybolt@pacbell.net&gt;</div><div class='ctx'>  * Copyright:	(C) 2002 Rory Bolt</div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/memory.h b/arch/arm/mach-iop32x/include/mach/memory.h<br/>index c51072af214e..42cd4bf3148c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/memory.h</a></div><div class='hunk'>@@ -1,11 +1,11 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop32x/memory.h</div><div class='add'>+ * arch/arm/mach-iop32x/include/mach/memory.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MEMORY_H</div><div class='ctx'> #define __MEMORY_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Physical DRAM offset.</div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/n2100.h b/arch/arm/mach-iop32x/include/mach/n2100.h<br/>index 77a8af476629..40b8a532b064 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/n2100.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/n2100.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/n2100.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/n2100.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop32x/n2100.h</div><div class='add'>+ * arch/arm/mach-iop32x/include/mach/n2100.h</div><div class='ctx'>  *</div><div class='ctx'>  * Thecus N2100 board registers</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/system.h b/arch/arm/mach-iop32x/include/mach/system.h<br/>index 17b7eb7e9c0d..20f923e54f46 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop32x/system.h</div><div class='add'>+ * arch/arm/mach-iop32x/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2001 MontaVista Software, Inc.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/time.h b/arch/arm/mach-iop32x/include/mach/time.h<br/>index 0f28c9949623..0f28c9949623 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/time.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/time.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/time.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/timex.h b/arch/arm/mach-iop32x/include/mach/timex.h<br/>index 9934b087311b..a541afced3cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/timex.h</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop32x/timex.h</div><div class='add'>+ * arch/arm/mach-iop32x/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * IOP32x architecture timex specifications</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CLOCK_TICK_RATE		(100 * HZ)</div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/uncompress.h b/arch/arm/mach-iop32x/include/mach/uncompress.h<br/>index 070f15818fe7..b247551b6f5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,11 +1,11 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop32x/uncompress.h</div><div class='add'>+ * arch/arm/mach-iop32x/include/mach/uncompress.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> static volatile u8 *uart_base;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-iop32x/include/mach/vmalloc.h b/arch/arm/mach-iop32x/include/mach/vmalloc.h<br/>new file mode 100644<br/>index 000000000000..85ceb09d85f0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-iop32x/include/mach/vmalloc.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define VMALLOC_END	0xfe000000</div><div class='head'>diff --git a/arch/arm/mach-iop32x/iq31244.c b/arch/arm/mach-iop32x/iq31244.c<br/>index 4a89823bcebb..082818aaa205 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/iq31244.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-iop32x/iq31244.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/iq31244.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/iq31244.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/arch/time.h&gt;</div><div class='add'>+#include &lt;mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Until March of 2007 iq31244 platforms and ep80219 platforms shared the</div><div class='head'>diff --git a/arch/arm/mach-iop32x/iq80321.c b/arch/arm/mach-iop32x/iq80321.c<br/>index 1da3c911edd3..d735539808b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/iq80321.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-iop32x/iq80321.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/iq80321.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/iq80321.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/arch/time.h&gt;</div><div class='add'>+#include &lt;mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * IQ80321 timer tick configuration.</div><div class='head'>diff --git a/arch/arm/mach-iop32x/irq.c b/arch/arm/mach-iop32x/irq.c<br/>index 55cf0162e8c1..ba59b2d17db1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-iop32x/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/irq.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> static u32 iop32x_mask;</div><div class='head'>diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c<br/>index 28f164ea4726..3173f9c5835d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/n2100.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-iop32x/n2100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/n2100.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop32x/n2100.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -40,7 +40,7 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/arch/time.h&gt;</div><div class='add'>+#include &lt;mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * N2100 timer tick configuration.</div><div class='head'>diff --git a/include/asm-arm/arch-iop33x/adma.h b/arch/arm/mach-iop33x/include/mach/adma.h<br/>index 4b92f795f90e..4b92f795f90e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop33x/adma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop33x/adma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/adma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/adma.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-iop33x/debug-macro.S b/arch/arm/mach-iop33x/include/mach/debug-macro.S<br/>index 9e7132ebe6a7..a60c9ef05cc3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop33x/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop33x/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop33x/debug-macro.S</div><div class='add'>+ * arch/arm/mach-iop33x/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-iop32x/dma.h b/arch/arm/mach-iop33x/include/mach/dma.h<br/>index e977a9ef3160..d8b42232931d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop32x/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop32x/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop32x/dma.h</div><div class='add'>+ * arch/arm/mach-iop33x/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004 Intel Corp.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-iop33x/entry-macro.S b/arch/arm/mach-iop33x/include/mach/entry-macro.S<br/>index b8e3d449e882..4e1f7282b354 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop33x/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop33x/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop33x/entry-macro.S</div><div class='add'>+ * arch/arm/mach-iop33x/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for IOP33x-based platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/arch/iop33x.h&gt;</div><div class='add'>+#include &lt;mach/iop33x.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro	disable_fiq</div><div class='ctx'> 	.endm</div><div class='head'>diff --git a/include/asm-arm/arch-iop33x/gpio.h b/arch/arm/mach-iop33x/include/mach/gpio.h<br/>index ddd55bba9bb9..ddd55bba9bb9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop33x/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop33x/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/gpio.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-iop33x/hardware.h b/arch/arm/mach-iop33x/include/mach/hardware.h<br/>index 0659cf94d040..8c10e430655e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop33x/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop33x/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop33x/hardware.h</div><div class='add'>+ * arch/arm/mach-iop33x/include/mach/hardware.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __HARDWARE_H</div><div class='head'>diff --git a/include/asm-arm/arch-iop33x/io.h b/arch/arm/mach-iop33x/include/mach/io.h<br/>index fec9c53e2b10..158874631217 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop33x/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop33x/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop33x/io.h</div><div class='add'>+ * arch/arm/mach-iop33x/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2001  MontaVista Software, Inc.</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef __IO_H</div><div class='ctx'> #define __IO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size,</div><div class='ctx'> 	unsigned int mtype);</div><div class='head'>diff --git a/include/asm-arm/arch-iop33x/iop33x.h b/arch/arm/mach-iop33x/include/mach/iop33x.h<br/>index 766985b9a723..24567316ec88 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop33x/iop33x.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop33x/iop33x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/iop33x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/iop33x.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop33x/iop33x.h</div><div class='add'>+ * arch/arm/mach-iop33x/include/mach/iop33x.h</div><div class='ctx'>  *</div><div class='ctx'>  * Intel IOP33X Chip definitions</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-iop33x/iq80331.h b/arch/arm/mach-iop33x/include/mach/iq80331.h<br/>index 79b9302017ea..fe406b0127f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop33x/iq80331.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop33x/iq80331.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/iq80331.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/iq80331.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop33x/iq80331.h</div><div class='add'>+ * arch/arm/mach-iop33x/include/mach/iq80331.h</div><div class='ctx'>  *</div><div class='ctx'>  * Intel IQ80331 evaluation board registers</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-iop33x/iq80332.h b/arch/arm/mach-iop33x/include/mach/iq80332.h<br/>index 053165629492..8325d71f2ed5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop33x/iq80332.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop33x/iq80332.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/iq80332.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/iq80332.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop33x/iq80332.h</div><div class='add'>+ * arch/arm/mach-iop33x/include/mach/iq80332.h</div><div class='ctx'>  *</div><div class='ctx'>  * Intel IQ80332 evaluation board registers</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-iop33x/irqs.h b/arch/arm/mach-iop33x/include/mach/irqs.h<br/>index d045f8403396..707628a600ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop33x/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop33x/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop33x/irqs.h</div><div class='add'>+ * arch/arm/mach-iop33x/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Author:	Dave Jiang (dave.jiang@intel.com)</div><div class='ctx'>  * Copyright:	(C) 2003 Intel Corp.</div><div class='head'>diff --git a/include/asm-arm/arch-iop33x/memory.h b/arch/arm/mach-iop33x/include/mach/memory.h<br/>index c8749127d6ab..2cef0bbb354f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop33x/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop33x/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/memory.h</a></div><div class='hunk'>@@ -1,11 +1,11 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop33x/memory.h</div><div class='add'>+ * arch/arm/mach-iop33x/include/mach/memory.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MEMORY_H</div><div class='ctx'> #define __MEMORY_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Physical DRAM offset.</div><div class='head'>diff --git a/include/asm-arm/arch-iop33x/system.h b/arch/arm/mach-iop33x/include/mach/system.h<br/>index 00dd07ece262..7bf3bfb49446 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop33x/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop33x/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop33x/system.h</div><div class='add'>+ * arch/arm/mach-iop33x/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2001 MontaVista Software, Inc.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-iop33x/time.h b/arch/arm/mach-iop33x/include/mach/time.h<br/>index 4ac4d7664f85..4ac4d7664f85 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop33x/time.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop33x/time.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/time.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-iop33x/timex.h b/arch/arm/mach-iop33x/include/mach/timex.h<br/>index fe3e1e369ff9..c75760844d49 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop33x/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop33x/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/timex.h</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop33x/timex.h</div><div class='add'>+ * arch/arm/mach-iop33x/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * IOP3xx architecture timex specifications</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CLOCK_TICK_RATE		(100 * HZ)</div><div class='head'>diff --git a/include/asm-arm/arch-iop33x/uncompress.h b/arch/arm/mach-iop33x/include/mach/uncompress.h<br/>index e17fbc05877b..b42423f63302 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-iop33x/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-iop33x/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,11 +1,11 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-iop33x/uncompress.h</div><div class='add'>+ * arch/arm/mach-iop33x/include/mach/uncompress.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> static volatile u32 *uart_base;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-iop33x/include/mach/vmalloc.h b/arch/arm/mach-iop33x/include/mach/vmalloc.h<br/>new file mode 100644<br/>index 000000000000..f9f99dea9bc4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-iop33x/include/mach/vmalloc.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define VMALLOC_END	0xfe000000</div><div class='head'>diff --git a/arch/arm/mach-iop33x/iq80331.c b/arch/arm/mach-iop33x/iq80331.c<br/>index de39fd778579..c7d99f9fafed 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/iq80331.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-iop33x/iq80331.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/iq80331.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/iq80331.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/arch/time.h&gt;</div><div class='add'>+#include &lt;mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * IQ80331 timer tick configuration.</div><div class='head'>diff --git a/arch/arm/mach-iop33x/iq80332.c b/arch/arm/mach-iop33x/iq80332.c<br/>index 4904fd78445f..af616c5f4fb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/iq80332.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-iop33x/iq80332.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/iq80332.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/iq80332.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/arch/time.h&gt;</div><div class='add'>+#include &lt;mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * IQ80332 timer tick configuration.</div><div class='head'>diff --git a/arch/arm/mach-iop33x/irq.c b/arch/arm/mach-iop33x/irq.c<br/>index f09dd054b9c0..abb4ea2ed4fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-iop33x/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/irq.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> static u32 iop33x_mask0;</div><div class='head'>diff --git a/arch/arm/mach-iop33x/uart.c b/arch/arm/mach-iop33x/uart.c<br/>index ac297cd0276c..8c21870fa808 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/uart.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-iop33x/uart.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/uart.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-iop33x/uart.c</a></div><div class='hunk'>@@ -24,9 +24,8 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iop3xx.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IOP33X_UART_XTAL 33334000</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c<br/>index daf28074134b..a6a4f93085fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp2000/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/core.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='hunk'>@@ -39,7 +39,7 @@</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(ixp2000_slowport_lock);</div><div class='ctx'> static unsigned long ixp2000_slowport_irq_flags;</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c<br/>index 9c49435d42c3..c62ed655c1a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/enp2611.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp2000/enp2611.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/enp2611.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/enp2611.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/debug-macro.S b/arch/arm/mach-ixp2000/include/mach/debug-macro.S<br/>index bc8b39654793..904ff56d2246 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-ixp2000/debug-macro.S</div><div class='add'>+/* arch/arm/mach-ixp2000/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/dma.h b/arch/arm/mach-ixp2000/include/mach/dma.h<br/>index 548d8dc507eb..26063d60f622 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ixp2000/dma.h</div><div class='add'>+ * arch/arm/mach-ixp2000/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2002 Intel Corp.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/enp2611.h b/arch/arm/mach-ixp2000/include/mach/enp2611.h<br/>index 42f3c28dc5c4..9ce3690061d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/enp2611.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/enp2611.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/enp2611.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/enp2611.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp2000/enp2611.h</div><div class='add'>+ * arch/arm/mach-ixp2000/include/mach/enp2611.h</div><div class='ctx'>  *</div><div class='ctx'>  * Register and other defines for Radisys ENP-2611</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/entry-macro.S b/arch/arm/mach-ixp2000/include/mach/entry-macro.S<br/>index 11d512ad5945..5850ffc8c751 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp2000/entry-macro.S</div><div class='add'>+ * arch/arm/mach-ixp2000/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for IXP2000-based platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro  disable_fiq</div><div class='ctx'> 		.endm</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/gpio.h b/arch/arm/mach-ixp2000/include/mach/gpio.h<br/>index 03cbbe1fd9d8..4a88d2c33dac 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/gpio.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp2000/gpio.h</div><div class='add'>+ * arch/arm/mach-ixp2000/include/mach/gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2002 Intel Corporation.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/hardware.h b/arch/arm/mach-ixp2000/include/mach/hardware.h<br/>index e7ea781c48aa..f033de4e7493 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ixp2000/hardware.h</div><div class='add'>+ * arch/arm/mach-ixp2000/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * Hardware definitions for IXP2400/2800 based systems</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/io.h b/arch/arm/mach-ixp2000/include/mach/io.h<br/>index c0ff2c6c66e7..859e584914d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ixp2000/io.h</div><div class='add'>+ * arch/arm/mach-ixp2000/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Original Author: Naeem M Afzal &lt;naeem.m.afzal@intel.com&gt;</div><div class='ctx'>  * Maintainer: Deepak Saxena &lt;dsaxena@plexity.net&gt;</div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #ifndef __ASM_ARM_ARCH_IO_H</div><div class='ctx'> #define __ASM_ARM_ARCH_IO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT		0xffffffff</div><div class='ctx'> #define __mem_pci(a)		(a)</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/irqs.h b/arch/arm/mach-ixp2000/include/mach/irqs.h<br/>index 62f09c7ff420..bee96bcafdca 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ixp2000/irqs.h</div><div class='add'>+ * arch/arm/mach-ixp2000/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Original Author: Naeem Afzal &lt;naeem.m.afzal@intel.com&gt;</div><div class='ctx'>  * Maintainer: Deepak Saxena &lt;dsaxena@plexity.net&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/ixdp2x00.h b/arch/arm/mach-ixp2000/include/mach/ixdp2x00.h<br/>index 546e2e8e27b8..5df8479d9481 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/ixdp2x00.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/ixdp2x00.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/ixdp2x00.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/ixdp2x00.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp2000/ixdp2x00.h</div><div class='add'>+ * arch/arm/mach-ixp2000/include/mach/ixdp2x00.h</div><div class='ctx'>  *</div><div class='ctx'>  * Register and other defines for IXDP2[48]00 platforms</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/ixdp2x01.h b/arch/arm/mach-ixp2000/include/mach/ixdp2x01.h<br/>index c6d51426e98f..4c1f04083e54 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/ixdp2x01.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/ixdp2x01.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/ixdp2x01.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/ixdp2x01.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp2000/ixdp2x01.h</div><div class='add'>+ * arch/arm/mach-ixp2000/include/mach/ixdp2x01.h</div><div class='ctx'>  *</div><div class='ctx'>  * Platform definitions for IXDP2X01 &amp;&amp; IXDP2801 systems</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/ixp2000-regs.h b/arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h<br/>index ccae4bec92c5..19d80379a3e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/ixp2000-regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/ixp2000-regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp2000/ixp2000-regs.h</div><div class='add'>+ * arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Chipset register definitions for IXP2400/2800 based systems.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/memory.h b/arch/arm/mach-ixp2000/include/mach/memory.h<br/>index 21e1de51e3f6..241529a7c52d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ixp2000/memory.h</div><div class='add'>+ * arch/arm/mach-ixp2000/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2002 Intel Corp.</div><div class='ctx'>  * Copyright (c) 2003-2004 MontaVista Software, Inc.</div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'>  * bus_to_virt: Used to convert an address for DMA operations</div><div class='ctx'>  *		to an address that the kernel can use.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/arch/ixp2000-regs.h&gt;</div><div class='add'>+#include &lt;mach/ixp2000-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __virt_to_bus(v) \</div><div class='ctx'> 	(((__virt_to_phys(v) - 0x0) + (*IXP2000_PCI_SDRAM_BAR &amp; 0xfffffff0)))</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/platform.h b/arch/arm/mach-ixp2000/include/mach/platform.h<br/>index a66317ab2071..42182c79ed90 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/platform.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/platform.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/platform.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp2000/platform.h</div><div class='add'>+ * arch/arm/mach-ixp2000/include/mach/platform.h</div><div class='ctx'>  *</div><div class='ctx'>  * Various bits of code used by platform-level code.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/system.h b/arch/arm/mach-ixp2000/include/mach/system.h<br/>index 3cc9a04f68cb..2e9c68f95a24 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ixp2000/system.h</div><div class='add'>+ * arch/arm/mach-ixp2000/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2002 Intel Corp.</div><div class='ctx'>  * Copyricht (C) 2003-2005 MontaVista Software, Inc.</div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/timex.h b/arch/arm/mach-ixp2000/include/mach/timex.h<br/>index b78a183d4698..835e659f93d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ixp2000/timex.h</div><div class='add'>+ * arch/arm/mach-ixp2000/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * IXP2000 architecture timex specifications</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/uncompress.h b/arch/arm/mach-ixp2000/include/mach/uncompress.h<br/>index f66b408f363e..ce363087df78 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ixp2000/uncompress.h</div><div class='add'>+ * arch/arm/mach-ixp2000/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='ctx'>  * Original Author: Naeem Afzal &lt;naeem.m.afzal@intel.com&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-ixp2000/vmalloc.h b/arch/arm/mach-ixp2000/include/mach/vmalloc.h<br/>index 275136963a0c..d195e35aed3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp2000/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp2000/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ixp2000/vmalloc.h</div><div class='add'>+ * arch/arm/mach-ixp2000/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Naeem Afzal &lt;naeem.m.afzal@intel.com&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c<br/>index ce7c15c73004..c673b9ef9f69 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2400.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp2000/ixdp2400.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2400.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/ixdp2400.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c<br/>index 14f09b80ab77..6715b50829a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2800.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp2000/ixdp2800.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2800.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/ixdp2800.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c<br/>index 73c651e83d92..5a781fd9757a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2x00.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp2000/ixdp2x00.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2x00.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/ixdp2x00.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*************************************************************************</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c<br/>index d3d730d2fc2b..78a2341dee2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2x01.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp2000/ixdp2x01.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2x01.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/ixdp2x01.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/pci.c b/arch/arm/mach-ixp2000/pci.c<br/>index 03f4cf7f9dec..03d916fbe531 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp2000/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp2000/pci.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c<br/>index df16a4eac490..68b4ac5b2481 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp23xx/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/core.c</a></div><div class='hunk'>@@ -32,8 +32,7 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/espresso.c b/arch/arm/mach-ixp23xx/espresso.c<br/>index d3a779a7a35f..1c06bfc5a7ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/espresso.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp23xx/espresso.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/espresso.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/espresso.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-ixp23xx/debug-macro.S b/arch/arm/mach-ixp23xx/include/mach/debug-macro.S<br/>index 2b25e640247d..905db3188724 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp23xx/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp23xx/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp23xx/debug-macro.S</div><div class='add'>+ * arch/arm/mach-ixp23xx/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/arch/ixp23xx.h&gt;</div><div class='add'>+#include &lt;mach/ixp23xx.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	addruart,rx</div><div class='ctx'> 		mrc	p15, 0, \rx, c1, c0</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/include/mach/dma.h b/arch/arm/mach-ixp23xx/include/mach/dma.h<br/>new file mode 100644<br/>index 000000000000..8886544b93f7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/dma.h</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-ixp23xx/include/mach/dma.h</div><div class='add'>+ */</div><div class='head'>diff --git a/include/asm-arm/arch-ixp23xx/entry-macro.S b/arch/arm/mach-ixp23xx/include/mach/entry-macro.S<br/>index ec9dd6fc2d0f..3f5338a7bbdd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp23xx/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp23xx/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp23xx/entry-macro.S</div><div class='add'>+ * arch/arm/mach-ixp23xx/include/mach/entry-macro.S</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='head'>diff --git a/include/asm-arm/arch-ixp23xx/hardware.h b/arch/arm/mach-ixp23xx/include/mach/hardware.h<br/>index c0010d21a684..c3192009a886 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp23xx/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp23xx/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp23xx/hardware.h</div><div class='add'>+ * arch/arm/mach-ixp23xx/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2002-2004 Intel Corporation.</div><div class='ctx'>  * Copyricht (C) 2005 MontaVista Software, Inc.</div><div class='head'>diff --git a/include/asm-arm/arch-ixp23xx/io.h b/arch/arm/mach-ixp23xx/include/mach/io.h<br/>index 66f5bafc315c..305ea1808c71 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp23xx/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp23xx/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp23xx/io.h</div><div class='add'>+ * arch/arm/mach-ixp23xx/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Original Author: Naeem M Afzal &lt;naeem.m.afzal@intel.com&gt;</div><div class='ctx'>  * Maintainer: Deepak Saxena &lt;dsaxena@plexity.net&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-ixp23xx/irqs.h b/arch/arm/mach-ixp23xx/include/mach/irqs.h<br/>index 27c580898958..3af33a04b8a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp23xx/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp23xx/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp23xx/irqs.h</div><div class='add'>+ * arch/arm/mach-ixp23xx/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * IRQ definitions for IXP23XX based systems</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ixp23xx/ixdp2351.h b/arch/arm/mach-ixp23xx/include/mach/ixdp2351.h<br/>index d5e8a43d7bbd..663951027de5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp23xx/ixdp2351.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp23xx/ixdp2351.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/ixdp2351.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/ixdp2351.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp23xx/ixdp2351.h</div><div class='add'>+ * arch/arm/mach-ixp23xx/include/mach/ixdp2351.h</div><div class='ctx'>  *</div><div class='ctx'>  * Register and other defines for IXDP2351</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ixp23xx/ixp23xx.h b/arch/arm/mach-ixp23xx/include/mach/ixp23xx.h<br/>index 3927b1d61b17..6d02481b1d6d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp23xx/ixp23xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp23xx/ixp23xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/ixp23xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/ixp23xx.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp23xx/ixp23xx.h</div><div class='add'>+ * arch/arm/mach-ixp23xx/include/mach/ixp23xx.h</div><div class='ctx'>  *</div><div class='ctx'>  * Register definitions for IXP23XX</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ixp23xx/memory.h b/arch/arm/mach-ixp23xx/include/mach/memory.h<br/>index 6d859d742d7f..9d40115f7ebe 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp23xx/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp23xx/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp23xx/memory.h</div><div class='add'>+ * arch/arm/mach-ixp23xx/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003-2004 Intel Corp.</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_MEMORY_H</div><div class='ctx'> #define __ASM_ARCH_MEMORY_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Physical DRAM offset.</div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  *		to an address that the kernel can use.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __virt_to_bus(v)						\</div><div class='ctx'> 	({ unsigned int ret;						\</div><div class='head'>diff --git a/include/asm-arm/arch-ixp23xx/platform.h b/arch/arm/mach-ixp23xx/include/mach/platform.h<br/>index db8aa304c93d..db9d9416e5e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp23xx/platform.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp23xx/platform.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/platform.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp23xx/platform.h</div><div class='add'>+ * arch/arm/mach-ixp23xx/include/mach/platform.h</div><div class='ctx'>  *</div><div class='ctx'>  * Various bits of code used by platform-level code.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ixp23xx/system.h b/arch/arm/mach-ixp23xx/include/mach/system.h<br/>index 925e6b0c338b..d57c3fc10f1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp23xx/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp23xx/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp23xx/system.h</div><div class='add'>+ * arch/arm/mach-ixp23xx/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2003 Intel Corporation.</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/include/mach/time.h b/arch/arm/mach-ixp23xx/include/mach/time.h<br/>new file mode 100644<br/>index 000000000000..b61dafc884ac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/time.h</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-ixp23xx/include/mach/time.h</div><div class='add'>+ */</div><div class='head'>diff --git a/include/asm-arm/arch-ixp23xx/timex.h b/arch/arm/mach-ixp23xx/include/mach/timex.h<br/>index 516f72fe6082..e341e9cf9c37 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp23xx/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp23xx/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp23xx/timex.h</div><div class='add'>+ * arch/arm/mach-ixp23xx/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * XScale architecture timex specifications</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-ixp23xx/uncompress.h b/arch/arm/mach-ixp23xx/include/mach/uncompress.h<br/>index 16c1110f2304..8b4c358d2c04 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp23xx/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp23xx/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp23xx/uncompress.h</div><div class='add'>+ * arch/arm/mach-ixp23xx/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2002-2004 Intel Corporation.</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_UNCOMPRESS_H</div><div class='ctx'> #define __ASM_ARCH_UNCOMPRESS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/ixp23xx.h&gt;</div><div class='add'>+#include &lt;mach/ixp23xx.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define UART_BASE	((volatile u32 *)IXP23XX_UART1_PHYS)</div><div class='head'>diff --git a/include/asm-arm/arch-ixp23xx/vmalloc.h b/arch/arm/mach-ixp23xx/include/mach/vmalloc.h<br/>index 9f2566658541..dd519f678d10 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp23xx/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp23xx/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp23xx/vmalloc.h</div><div class='add'>+ * arch/arm/mach-ixp23xx/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2005 MontaVista Software, Inc.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/ixdp2351.c b/arch/arm/mach-ixp23xx/ixdp2351.c<br/>index 5c5d4d66dee8..b6e0bfa44df9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/ixdp2351.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp23xx/ixdp2351.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/ixdp2351.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/ixdp2351.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/pci.c b/arch/arm/mach-ixp23xx/pci.c<br/>index 227f808dc0ec..701d60aa0efd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp23xx/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/pci.c</a></div><div class='hunk'>@@ -31,8 +31,7 @@</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern int (*external_fault) (unsigned long, struct pt_regs *);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/roadrunner.c b/arch/arm/mach-ixp23xx/roadrunner.c<br/>index 896ff9f840d9..6d38d769761c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/roadrunner.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp23xx/roadrunner.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/roadrunner.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp23xx/roadrunner.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/avila-pci.c b/arch/arm/mach-ixp4xx/avila-pci.c<br/>index c6e044befccb..08d65dcdb5fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/avila-pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/avila-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/avila-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/avila-pci.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> void __init avila_pci_preinit(void)</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/avila-setup.c b/arch/arm/mach-ixp4xx/avila-setup.c<br/>index e38f45fa58ae..797995ce18b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/avila-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/avila-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/avila-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/avila-setup.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c<br/>index 64be341109b3..192538a04575 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/common-pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/common-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/common-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/common-pci.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c<br/>index 3947c506b4f3..58bd2842a6f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/common.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/common.c</a></div><div class='hunk'>@@ -29,8 +29,8 @@</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/udc.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/coyote-pci.c b/arch/arm/mach-ixp4xx/coyote-pci.c<br/>index be4f4a208b90..efddf01ed17b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/coyote-pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/coyote-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/coyote-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/coyote-pci.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c<br/>index 13f8a7ac3ba9..aab1954e2747 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/coyote-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/coyote-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/coyote-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/coyote-setup.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c<br/>index 0db3a909ae61..501dfdcc39fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/fsg-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/fsg-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/fsg-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/fsg-setup.c</a></div><div class='hunk'>@@ -64,7 +64,7 @@ static struct platform_device fsg_i2c_gpio = {</div><div class='ctx'> </div><div class='ctx'> static struct i2c_board_info __initdata fsg_i2c_board_info [] = {</div><div class='ctx'> 	{</div><div class='del'>-		I2C_BOARD_INFO("rtc-isl1208", 0x6f),</div><div class='add'>+		I2C_BOARD_INFO("isl1208", 0x6f),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -179,7 +179,6 @@ static void __init fsg_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	DECLARE_MAC_BUF(mac_buf);</div><div class='ctx'> 	uint8_t __iomem *f;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	ixp4xx_sys_init();</div><div class='ctx'> </div><div class='hunk'>@@ -228,6 +227,7 @@ static void __init fsg_init(void)</div><div class='ctx'> 	f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x400000);</div><div class='ctx'> 	if (f) {</div><div class='ctx'> #ifdef __ARMEB__</div><div class='add'>+		int i;</div><div class='ctx'> 		for (i = 0; i &lt; 6; i++) {</div><div class='ctx'> 			fsg_plat_eth[0].hwaddr[i] = readb(f + 0x3C0422 + i);</div><div class='ctx'> 			fsg_plat_eth[1].hwaddr[i] = readb(f + 0x3C043B + i);</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/gateway7001-pci.c b/arch/arm/mach-ixp4xx/gateway7001-pci.c<br/>index afd1dc14e597..7e93a0975c4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/gateway7001-pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/gateway7001-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/gateway7001-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/gateway7001-pci.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/gateway7001-setup.c b/arch/arm/mach-ixp4xx/gateway7001-setup.c<br/>index 37876832e141..59b73a0ddfa9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/gateway7001-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/gateway7001-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/gateway7001-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/gateway7001-setup.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/gtwx5715-pci.c b/arch/arm/mach-ixp4xx/gtwx5715-pci.c<br/>index 20960704183b..7b8a2c323840 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/gtwx5715-pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/gtwx5715-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/gtwx5715-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/gtwx5715-pci.c</a></div><div class='hunk'>@@ -28,8 +28,8 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/gtwx5715.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/gtwx5715.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c<br/>index dc6725bda3c4..25c21d6665ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/gtwx5715-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/gtwx5715-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/gtwx5715-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/gtwx5715-setup.c</a></div><div class='hunk'>@@ -32,12 +32,12 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='del'>-#include &lt;asm/arch/gtwx5715.h&gt;</div><div class='add'>+#include &lt;mach/gtwx5715.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Xscale UART registers are 32 bits wide with only the least</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/avila.h b/arch/arm/mach-ixp4xx/include/mach/avila.h<br/>index 0dfea0ccd6ba..1640cb61972b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/avila.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/avila.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/avila.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/avila.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/avila.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/avila.h</div><div class='ctx'>  *</div><div class='ctx'>  * Gateworks Avila platform specific definitions</div><div class='ctx'>  *</div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_HARDWARE_H__</div><div class='del'>-#error "Do not include this directly, instead #include &lt;asm/hardware.h&gt;"</div><div class='add'>+#error "Do not include this directly, instead #include &lt;mach/hardware.h&gt;"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define	AVILA_SDA_PIN		7</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/coyote.h b/arch/arm/mach-ixp4xx/include/mach/coyote.h<br/>index 7ac9ba2c035c..717ac6d16f55 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/coyote.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/coyote.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/coyote.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/coyote.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/coyote.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/coyote.h</div><div class='ctx'>  *</div><div class='ctx'>  * ADI Engineering platform specific definitions</div><div class='ctx'>  *</div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_HARDWARE_H__</div><div class='del'>-#error "Do not include this directly, instead #include &lt;asm/hardware.h&gt;"</div><div class='add'>+#error "Do not include this directly, instead #include &lt;mach/hardware.h&gt;"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* PCI controller GPIO to IRQ pin mappings */</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/cpu.h b/arch/arm/mach-ixp4xx/include/mach/cpu.h<br/>index 2fa3d6b8dbb8..ff8aa2393bf9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/cpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/cpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/cpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/cpu.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/cpu.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/cpu.h</div><div class='ctx'>  *</div><div class='ctx'>  * IXP4XX cpu type detection</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/debug-macro.S b/arch/arm/mach-ixp4xx/include/mach/debug-macro.S<br/>index 37bc8ef23e67..7c6a6912acde 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-ixp4xx/debug-macro.S</div><div class='add'>+/* arch/arm/mach-ixp4xx/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/dma.h b/arch/arm/mach-ixp4xx/include/mach/dma.h<br/>index 2c7f5327d80f..00c5070c0201 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/dma.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2001-2004 MontaVista Software, Inc.</div><div class='ctx'>  *</div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MAX_DMA_ADDRESS		(PAGE_OFFSET + SZ_64M)</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/dsmg600.h b/arch/arm/mach-ixp4xx/include/mach/dsmg600.h<br/>index b7673e171abe..dc087a34a268 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/dsmg600.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/dsmg600.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/dsmg600.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/dsmg600.h</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_HARDWARE_H__</div><div class='del'>-#error "Do not include this directly, instead #include &lt;asm/hardware.h&gt;"</div><div class='add'>+#error "Do not include this directly, instead #include &lt;mach/hardware.h&gt;"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define DSMG600_SDA_PIN		5</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/entry-macro.S b/arch/arm/mach-ixp4xx/include/mach/entry-macro.S<br/>index f144a005ed95..f2e14e94ed15 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/entry-macro.S</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for IXP4xx-based platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/fsg.h b/arch/arm/mach-ixp4xx/include/mach/fsg.h<br/>index c0100cc7981c..1f02b7e22a13 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/fsg.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/fsg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/fsg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/fsg.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/fsg.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/fsg.h</div><div class='ctx'>  *</div><div class='ctx'>  * Freecom FSG-3 platform specific definitions</div><div class='ctx'>  *</div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_HARDWARE_H__</div><div class='del'>-#error "Do not include this directly, instead #include &lt;asm/hardware.h&gt;"</div><div class='add'>+#error "Do not include this directly, instead #include &lt;mach/hardware.h&gt;"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define FSG_SDA_PIN		12</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/gpio.h b/arch/arm/mach-ixp4xx/include/mach/gpio.h<br/>index 3a4c5b8ae9e1..9fbde177920f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/gpio.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ixp4xx/gpio.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  * IXP4XX GPIO wrappers for arch-neutral GPIO calls</div><div class='ctx'>  *</div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_IXP4XX_GPIO_H</div><div class='ctx'> #define __ASM_ARCH_IXP4XX_GPIO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline int gpio_request(unsigned gpio, const char *label)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/gtwx5715.h b/arch/arm/mach-ixp4xx/include/mach/gtwx5715.h<br/>index c3069d67c00e..5d5e201cac7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/gtwx5715.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/gtwx5715.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/gtwx5715.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/gtwx5715.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/gtwx5715.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/gtwx5715.h</div><div class='ctx'>  *</div><div class='ctx'>  * Gemtek GTWX5715 Gateway (Linksys WRV54G)</div><div class='ctx'>  *</div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_HARDWARE_H__</div><div class='del'>-#error "Do not include this directly, instead #include &lt;asm/hardware.h&gt;"</div><div class='add'>+#error "Do not include this directly, instead #include &lt;mach/hardware.h&gt;"</div><div class='ctx'> #endif</div><div class='ctx'> #include "irqs.h"</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/hardware.h b/arch/arm/mach-ixp4xx/include/mach/hardware.h<br/>index fa723a627854..f58a43a23966 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/hardware.h </div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/hardware.h </div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2002 Intel Corporation.</div><div class='ctx'>  * Copyright (C) 2003-2004 MontaVista Software, Inc.</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include "ixp4xx-regs.h"</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLER__</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Platform helper functions and definitions */</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/io.h b/arch/arm/mach-ixp4xx/include/mach/io.h<br/>index de181ce958db..319948e31bec 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ixp4xx/io.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Deepak Saxena &lt;dsaxena@plexity.net&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT 0xffff0000</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/irqs.h b/arch/arm/mach-ixp4xx/include/mach/irqs.h<br/>index 674af4a84147..f4d74de1566a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/irqs.h </div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/irqs.h </div><div class='ctx'>  *</div><div class='ctx'>  * IRQ definitions for IXP4XX based systems</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/ixdp425.h b/arch/arm/mach-ixp4xx/include/mach/ixdp425.h<br/>index e0791af3bfea..2cafe65ebfee 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/ixdp425.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/ixdp425.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/ixdp425.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/ixdp425.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/ixdp425.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/ixdp425.h</div><div class='ctx'>  *</div><div class='ctx'>  * IXDP425 platform specific definitions</div><div class='ctx'>  *</div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_HARDWARE_H__</div><div class='del'>-#error "Do not include this directly, instead #include &lt;asm/hardware.h&gt;"</div><div class='add'>+#error "Do not include this directly, instead #include &lt;mach/hardware.h&gt;"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define	IXDP425_SDA_PIN		7</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h b/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h<br/>index 68aca8554f5a..ad9c888dd850 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/ixp4xx-regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/ixp4xx-regs.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Register definitions for IXP4xx chipset. This file contains </div><div class='ctx'>  * register location and bit definitions only. Platform specific </div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/memory.h b/arch/arm/mach-ixp4xx/include/mach/memory.h<br/>index af9667b57ab3..c4d2830ac987 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ixp4xx/memory.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2001-2004 MontaVista Software, Inc.</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/nas100d.h b/arch/arm/mach-ixp4xx/include/mach/nas100d.h<br/>index 98d937897bce..3771d62a9748 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/nas100d.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/nas100d.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/nas100d.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/nas100d.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/nas100d.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/nas100d.h</div><div class='ctx'>  *</div><div class='ctx'>  * NAS100D platform specific definitions</div><div class='ctx'>  *</div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_HARDWARE_H__</div><div class='del'>-#error "Do not include this directly, instead #include &lt;asm/hardware.h&gt;"</div><div class='add'>+#error "Do not include this directly, instead #include &lt;mach/hardware.h&gt;"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define NAS100D_SDA_PIN		5</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/npe.h b/arch/arm/mach-ixp4xx/include/mach/npe.h<br/>index 37d0511689dc..37d0511689dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/npe.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/npe.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/npe.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/npe.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/nslu2.h b/arch/arm/mach-ixp4xx/include/mach/nslu2.h<br/>index 714bbc65126a..85d00adbfb92 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/nslu2.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/nslu2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/nslu2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/nslu2.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/nslu2.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/nslu2.h</div><div class='ctx'>  *</div><div class='ctx'>  * NSLU2 platform specific definitions</div><div class='ctx'>  *</div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_HARDWARE_H__</div><div class='del'>-#error "Do not include this directly, instead #include &lt;asm/hardware.h&gt;"</div><div class='add'>+#error "Do not include this directly, instead #include &lt;mach/hardware.h&gt;"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define NSLU2_SDA_PIN		7</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/platform.h b/arch/arm/mach-ixp4xx/include/mach/platform.h<br/>index a1f2b5404db1..e824c02c825a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/platform.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/platform.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/platform.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/platform.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/platform.h</div><div class='ctx'>  *</div><div class='ctx'>  * Constants and functions that are useful to IXP4xx platform-specific code</div><div class='ctx'>  * and device drivers.</div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_HARDWARE_H__</div><div class='del'>-#error "Do not include this directly, instead #include &lt;asm/hardware.h&gt;"</div><div class='add'>+#error "Do not include this directly, instead #include &lt;mach/hardware.h&gt;"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/prpmc1100.h b/arch/arm/mach-ixp4xx/include/mach/prpmc1100.h<br/>index e2532ab7f48f..17274a2e3dec 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/prpmc1100.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/prpmc1100.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/prpmc1100.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/prpmc1100.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/prpmc1100.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/prpmc1100.h</div><div class='ctx'>  *</div><div class='ctx'>  * Motorolla PrPMC1100 platform specific definitions</div><div class='ctx'>  *</div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_HARDWARE_H__</div><div class='del'>-#error "Do not include this directly, instead #include &lt;asm/hardware.h&gt;"</div><div class='add'>+#error "Do not include this directly, instead #include &lt;mach/hardware.h&gt;"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define	PRPMC1100_FLASH_BASE	IXP4XX_EXP_BUS_CS0_BASE_PHYS</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/qmgr.h b/arch/arm/mach-ixp4xx/include/mach/qmgr.h<br/>index 1e52b95cede5..1e52b95cede5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/qmgr.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/qmgr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/qmgr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/qmgr.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/system.h b/arch/arm/mach-ixp4xx/include/mach/system.h<br/>index 8e1db423b1cc..92a7e8ddf69a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/system.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2002 Intel Corporation.</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/timex.h b/arch/arm/mach-ixp4xx/include/mach/timex.h<br/>index 3745e35cc030..89ce3ee84698 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/timex.h</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ixp4xx/timex.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/timex.h</div><div class='ctx'>  * </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We use IXP425 General purpose timer for our timer needs, it runs at </div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/udc.h b/arch/arm/mach-ixp4xx/include/mach/udc.h<br/>index dbdec36ff0d1..80d6da2eafac 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/udc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/udc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/udc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/udc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ixp4xx/udc.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/udc.h</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/mach/udc_pxa2xx.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/uncompress.h b/arch/arm/mach-ixp4xx/include/mach/uncompress.h<br/>index 34ef48fe327e..2db0078a8cf2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ixp4xx/uncompress.h </div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/uncompress.h </div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2002 Intel Corporation.</div><div class='ctx'>  * Copyright (C) 2003-2004 MontaVista Software, Inc.</div><div class='head'>diff --git a/include/asm-arm/arch-ixp4xx/vmalloc.h b/arch/arm/mach-ixp4xx/include/mach/vmalloc.h<br/>index 050d46e6b126..7b3580b53adf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ixp4xx/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ixp4xx/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ixp4xx/vmalloc.h</div><div class='add'>+ * arch/arm/mach-ixp4xx/include/mach/vmalloc.h</div><div class='ctx'>  */</div><div class='ctx'> #define VMALLOC_END       (0xFF000000)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c b/arch/arm/mach-ixp4xx/ixdp425-pci.c<br/>index 7d9bb4d23104..64c29aacaac9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/ixdp425-pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/ixdp425-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/ixdp425-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/ixdp425-pci.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> void __init ixdp425_pci_preinit(void)</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c<br/>index 44584afb34a3..9b2d2ec14c80 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/ixdp425-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/ixdp425-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/ixdp425-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/ixdp425-setup.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/ixdpg425-pci.c b/arch/arm/mach-ixp4xx/ixdpg425-pci.c<br/>index 37d9f2e8f602..4ed7ac614920 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/ixdpg425-pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/ixdpg425-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/ixdpg425-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/ixdpg425-pci.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c<br/>index 63a23fa4aab4..c73a94d0ca2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/ixp4xx_npe.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/ixp4xx_npe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/ixp4xx_npe.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/ixp4xx_npe.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/arch/npe.h&gt;</div><div class='add'>+#include &lt;mach/npe.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DEBUG_MSG			0</div><div class='ctx'> #define DEBUG_FW			0</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c<br/>index fab94eaecee7..c6cb069a5a83 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/ixp4xx_qmgr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/ixp4xx_qmgr.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/arch/qmgr.h&gt;</div><div class='add'>+#include &lt;mach/qmgr.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DEBUG		0</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/wg302v2-pci.c b/arch/arm/mach-ixp4xx/wg302v2-pci.c<br/>index 0f00feab67f8..9b59ed03b151 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/wg302v2-pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/wg302v2-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/wg302v2-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/wg302v2-pci.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/wg302v2-setup.c b/arch/arm/mach-ixp4xx/wg302v2-setup.c<br/>index f7e09ad804e8..7ea782021d1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/wg302v2-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ixp4xx/wg302v2-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/wg302v2-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ixp4xx/wg302v2-setup.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/addr-map.c b/arch/arm/mach-kirkwood/addr-map.c<br/>index a39f0f3c4730..c79f492072f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/addr-map.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-kirkwood/addr-map.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/addr-map.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/addr-map.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c<br/>index 5938a3b33cdc..189f16f3619d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/common.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-kirkwood/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/common.c</a></div><div class='hunk'>@@ -15,15 +15,17 @@</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;linux/mv643xx_eth.h&gt;</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='add'>+#include &lt;linux/spi/orion_spi.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/timex.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/arch/kirkwood.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/cache-feroceon-l2.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/ehci-orion.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/orion_nand.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/time.h&gt;</div><div class='add'>+#include &lt;mach/kirkwood.h&gt;</div><div class='add'>+#include &lt;plat/cache-feroceon-l2.h&gt;</div><div class='add'>+#include &lt;plat/ehci-orion.h&gt;</div><div class='add'>+#include &lt;plat/mv_xor.h&gt;</div><div class='add'>+#include &lt;plat/orion_nand.h&gt;</div><div class='add'>+#include &lt;plat/time.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -196,6 +198,37 @@ void __init kirkwood_sata_init(struct mv_sata_platform_data *sata_data)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='add'>+ * SPI</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+static struct orion_spi_info kirkwood_spi_plat_data = {</div><div class='add'>+	.tclk		= KIRKWOOD_TCLK,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource kirkwood_spi_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= SPI_PHYS_BASE,</div><div class='add'>+		.end	= SPI_PHYS_BASE + SZ_512 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device kirkwood_spi = {</div><div class='add'>+	.name		= "orion_spi",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.resource	= kirkwood_spi_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;kirkwood_spi_plat_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(kirkwood_spi_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init kirkwood_spi_init()</div><div class='add'>+{</div><div class='add'>+	platform_device_register(&amp;kirkwood_spi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='ctx'>  * UART0</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> static struct plat_serial8250_port kirkwood_uart0_data[] = {</div><div class='hunk'>@@ -284,6 +317,212 @@ void __init kirkwood_uart1_init(void)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='add'>+ * XOR</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+static struct mv_xor_platform_shared_data kirkwood_xor_shared_data = {</div><div class='add'>+	.dram		= &amp;kirkwood_mbus_dram_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 kirkwood_xor_dmamask = DMA_32BIT_MASK;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * XOR0</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+static struct resource kirkwood_xor0_shared_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "xor 0 low",</div><div class='add'>+		.start	= XOR0_PHYS_BASE,</div><div class='add'>+		.end	= XOR0_PHYS_BASE + 0xff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.name	= "xor 0 high",</div><div class='add'>+		.start	= XOR0_HIGH_PHYS_BASE,</div><div class='add'>+		.end	= XOR0_HIGH_PHYS_BASE + 0xff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device kirkwood_xor0_shared = {</div><div class='add'>+	.name		= MV_XOR_SHARED_NAME,</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;kirkwood_xor_shared_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(kirkwood_xor0_shared_resources),</div><div class='add'>+	.resource	= kirkwood_xor0_shared_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource kirkwood_xor00_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= IRQ_KIRKWOOD_XOR_00,</div><div class='add'>+		.end	= IRQ_KIRKWOOD_XOR_00,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mv_xor_platform_data kirkwood_xor00_data = {</div><div class='add'>+	.shared		= &amp;kirkwood_xor0_shared,</div><div class='add'>+	.hw_id		= 0,</div><div class='add'>+	.pool_size	= PAGE_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device kirkwood_xor00_channel = {</div><div class='add'>+	.name		= MV_XOR_NAME,</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(kirkwood_xor00_resources),</div><div class='add'>+	.resource	= kirkwood_xor00_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.dma_mask		= &amp;kirkwood_xor_dmamask,</div><div class='add'>+		.coherent_dma_mask	= DMA_64BIT_MASK,</div><div class='add'>+		.platform_data		= (void *)&amp;kirkwood_xor00_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource kirkwood_xor01_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= IRQ_KIRKWOOD_XOR_01,</div><div class='add'>+		.end	= IRQ_KIRKWOOD_XOR_01,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mv_xor_platform_data kirkwood_xor01_data = {</div><div class='add'>+	.shared		= &amp;kirkwood_xor0_shared,</div><div class='add'>+	.hw_id		= 1,</div><div class='add'>+	.pool_size	= PAGE_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device kirkwood_xor01_channel = {</div><div class='add'>+	.name		= MV_XOR_NAME,</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(kirkwood_xor01_resources),</div><div class='add'>+	.resource	= kirkwood_xor01_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.dma_mask		= &amp;kirkwood_xor_dmamask,</div><div class='add'>+		.coherent_dma_mask	= DMA_64BIT_MASK,</div><div class='add'>+		.platform_data		= (void *)&amp;kirkwood_xor01_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init kirkwood_xor0_init(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_register(&amp;kirkwood_xor0_shared);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * two engines can't do memset simultaneously, this limitation</div><div class='add'>+	 * satisfied by removing memset support from one of the engines.</div><div class='add'>+	 */</div><div class='add'>+	dma_cap_set(DMA_MEMCPY, kirkwood_xor00_data.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_XOR, kirkwood_xor00_data.cap_mask);</div><div class='add'>+	platform_device_register(&amp;kirkwood_xor00_channel);</div><div class='add'>+</div><div class='add'>+	dma_cap_set(DMA_MEMCPY, kirkwood_xor01_data.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_MEMSET, kirkwood_xor01_data.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_XOR, kirkwood_xor01_data.cap_mask);</div><div class='add'>+	platform_device_register(&amp;kirkwood_xor01_channel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * XOR1</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+static struct resource kirkwood_xor1_shared_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "xor 1 low",</div><div class='add'>+		.start	= XOR1_PHYS_BASE,</div><div class='add'>+		.end	= XOR1_PHYS_BASE + 0xff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.name	= "xor 1 high",</div><div class='add'>+		.start	= XOR1_HIGH_PHYS_BASE,</div><div class='add'>+		.end	= XOR1_HIGH_PHYS_BASE + 0xff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device kirkwood_xor1_shared = {</div><div class='add'>+	.name		= MV_XOR_SHARED_NAME,</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;kirkwood_xor_shared_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(kirkwood_xor1_shared_resources),</div><div class='add'>+	.resource	= kirkwood_xor1_shared_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource kirkwood_xor10_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= IRQ_KIRKWOOD_XOR_10,</div><div class='add'>+		.end	= IRQ_KIRKWOOD_XOR_10,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mv_xor_platform_data kirkwood_xor10_data = {</div><div class='add'>+	.shared		= &amp;kirkwood_xor1_shared,</div><div class='add'>+	.hw_id		= 0,</div><div class='add'>+	.pool_size	= PAGE_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device kirkwood_xor10_channel = {</div><div class='add'>+	.name		= MV_XOR_NAME,</div><div class='add'>+	.id		= 2,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(kirkwood_xor10_resources),</div><div class='add'>+	.resource	= kirkwood_xor10_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.dma_mask		= &amp;kirkwood_xor_dmamask,</div><div class='add'>+		.coherent_dma_mask	= DMA_64BIT_MASK,</div><div class='add'>+		.platform_data		= (void *)&amp;kirkwood_xor10_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource kirkwood_xor11_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= IRQ_KIRKWOOD_XOR_11,</div><div class='add'>+		.end	= IRQ_KIRKWOOD_XOR_11,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mv_xor_platform_data kirkwood_xor11_data = {</div><div class='add'>+	.shared		= &amp;kirkwood_xor1_shared,</div><div class='add'>+	.hw_id		= 1,</div><div class='add'>+	.pool_size	= PAGE_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device kirkwood_xor11_channel = {</div><div class='add'>+	.name		= MV_XOR_NAME,</div><div class='add'>+	.id		= 3,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(kirkwood_xor11_resources),</div><div class='add'>+	.resource	= kirkwood_xor11_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.dma_mask		= &amp;kirkwood_xor_dmamask,</div><div class='add'>+		.coherent_dma_mask	= DMA_64BIT_MASK,</div><div class='add'>+		.platform_data		= (void *)&amp;kirkwood_xor11_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init kirkwood_xor1_init(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_register(&amp;kirkwood_xor1_shared);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * two engines can't do memset simultaneously, this limitation</div><div class='add'>+	 * satisfied by removing memset support from one of the engines.</div><div class='add'>+	 */</div><div class='add'>+	dma_cap_set(DMA_MEMCPY, kirkwood_xor10_data.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_XOR, kirkwood_xor10_data.cap_mask);</div><div class='add'>+	platform_device_register(&amp;kirkwood_xor10_channel);</div><div class='add'>+</div><div class='add'>+	dma_cap_set(DMA_MEMCPY, kirkwood_xor11_data.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_MEMSET, kirkwood_xor11_data.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_XOR, kirkwood_xor11_data.cap_mask);</div><div class='add'>+	platform_device_register(&amp;kirkwood_xor11_channel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='ctx'>  * Time handling</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> static void kirkwood_timer_init(void)</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h<br/>index 5dee2f6b40a5..69cd113af03a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/common.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-kirkwood/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/common.h</a></div><div class='hunk'>@@ -33,8 +33,11 @@ void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data);</div><div class='ctx'> void kirkwood_pcie_init(void);</div><div class='ctx'> void kirkwood_rtc_init(void);</div><div class='ctx'> void kirkwood_sata_init(struct mv_sata_platform_data *sata_data);</div><div class='add'>+void kirkwood_spi_init(void);</div><div class='ctx'> void kirkwood_uart0_init(void);</div><div class='ctx'> void kirkwood_uart1_init(void);</div><div class='add'>+void kirkwood_xor0_init(void);</div><div class='add'>+void kirkwood_xor1_init(void);</div><div class='ctx'> </div><div class='ctx'> extern struct sys_timer kirkwood_timer;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c<br/>index d5c482c628e3..610fb24d8ae2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/db88f6281-bp-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-kirkwood/db88f6281-bp-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/db88f6281-bp-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/db88f6281-bp-setup.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/kirkwood.h&gt;</div><div class='add'>+#include &lt;mach/kirkwood.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data db88f6281_ge00_data = {</div><div class='head'>diff --git a/include/asm-arm/arch-kirkwood/debug-macro.S b/arch/arm/mach-kirkwood/include/mach/debug-macro.S<br/>index f55fb8ad9ee4..c0cc5b5c82ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-kirkwood/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-kirkwood/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,12 +1,12 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-kirkwood/debug-macro.S</div><div class='add'>+ * arch/arm/mach-kirkwood/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/kirkwood.h&gt;</div><div class='add'>+#include &lt;mach/kirkwood.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro	addruart,rx</div><div class='ctx'> 	mrc	p15, 0, \rx, c1, c0</div><div class='head'>diff --git a/include/asm-arm/arch-kirkwood/dma.h b/arch/arm/mach-kirkwood/include/mach/dma.h<br/>index 40a8c178f10d..40a8c178f10d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-kirkwood/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-kirkwood/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/dma.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-kirkwood/entry-macro.S b/arch/arm/mach-kirkwood/include/mach/entry-macro.S<br/>index fc6a43d9355c..83e0cba77b36 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-kirkwood/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-kirkwood/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-kirkwood/entry-macro.S</div><div class='add'>+ * arch/arm/mach-kirkwood/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for Marvell Kirkwood platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/kirkwood.h&gt;</div><div class='add'>+#include &lt;mach/kirkwood.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro  disable_fiq</div><div class='ctx'> 	.endm</div><div class='head'>diff --git a/include/asm-arm/arch-kirkwood/hardware.h b/arch/arm/mach-kirkwood/include/mach/hardware.h<br/>index e695719771a5..cde85283f7d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-kirkwood/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-kirkwood/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-kirkwood/hardware.h</div><div class='add'>+ * arch/arm/mach-kirkwood/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='head'>diff --git a/include/asm-arm/arch-kirkwood/io.h b/arch/arm/mach-kirkwood/include/mach/io.h<br/>index 0ef6e95f5d5b..be07be0ef522 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-kirkwood/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-kirkwood/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-kirkwood/io.h</div><div class='add'>+ * arch/arm/mach-kirkwood/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2.  This program is licensed "as is" without any</div><div class='head'>diff --git a/include/asm-arm/arch-kirkwood/irqs.h b/arch/arm/mach-kirkwood/include/mach/irqs.h<br/>index 2e7b5da6335c..6fd05838c72d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-kirkwood/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-kirkwood/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-kirkwood/irqs.h</div><div class='add'>+ * arch/arm/mach-kirkwood/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * IRQ definitions for Marvell Kirkwood SoCs</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-kirkwood/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h<br/>index bb31b315c350..5c69992295e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-kirkwood/kirkwood.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-kirkwood/kirkwood.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/kirkwood.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/kirkwood.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-kirkwood/kirkwood.h</div><div class='add'>+ * arch/arm/mach-kirkwood/include/mach/kirkwood.h</div><div class='ctx'>  *</div><div class='ctx'>  * Generic definitions for Marvell Kirkwood SoC flavors:</div><div class='ctx'>  *  88F6180, 88F6192 and 88F6281.</div><div class='hunk'>@@ -88,6 +88,15 @@</div><div class='ctx'> </div><div class='ctx'> #define USB_PHYS_BASE		(KIRKWOOD_REGS_PHYS_BASE | 0x50000)</div><div class='ctx'> </div><div class='add'>+#define XOR0_PHYS_BASE		(KIRKWOOD_REGS_PHYS_BASE | 0x60800)</div><div class='add'>+#define XOR0_VIRT_BASE		(KIRKWOOD_REGS_VIRT_BASE | 0x60800)</div><div class='add'>+#define XOR1_PHYS_BASE		(KIRKWOOD_REGS_PHYS_BASE | 0x60900)</div><div class='add'>+#define XOR1_VIRT_BASE		(KIRKWOOD_REGS_VIRT_BASE | 0x60900)</div><div class='add'>+#define XOR0_HIGH_PHYS_BASE	(KIRKWOOD_REGS_PHYS_BASE | 0x60A00)</div><div class='add'>+#define XOR0_HIGH_VIRT_BASE	(KIRKWOOD_REGS_VIRT_BASE | 0x60A00)</div><div class='add'>+#define XOR1_HIGH_PHYS_BASE	(KIRKWOOD_REGS_PHYS_BASE | 0x60B00)</div><div class='add'>+#define XOR1_HIGH_VIRT_BASE	(KIRKWOOD_REGS_VIRT_BASE | 0x60B00)</div><div class='add'>+</div><div class='ctx'> #define GE00_PHYS_BASE		(KIRKWOOD_REGS_PHYS_BASE | 0x70000)</div><div class='ctx'> #define GE01_PHYS_BASE		(KIRKWOOD_REGS_PHYS_BASE | 0x74000)</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-loki/memory.h b/arch/arm/mach-kirkwood/include/mach/memory.h<br/>index 835101e49875..b5fb34bdccd5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-loki/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-loki/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-loki/memory.h</div><div class='add'>+ * arch/arm/mach-kirkwood/include/mach/memory.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_MEMORY_H</div><div class='head'>diff --git a/include/asm-arm/arch-mv78xx0/system.h b/arch/arm/mach-kirkwood/include/mach/system.h<br/>index 7eb47d376db9..8510f6cfdabf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mv78xx0/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mv78xx0/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-mv78xx0/system.h</div><div class='add'>+ * arch/arm/mach-kirkwood/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2.  This program is licensed "as is" without any</div><div class='hunk'>@@ -9,8 +9,8 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/mv78xx0.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/kirkwood.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-kirkwood/timex.h b/arch/arm/mach-kirkwood/include/mach/timex.h<br/>index 82122e134e3c..f77ef4a32c5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-kirkwood/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-kirkwood/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-kirkwood/timex.h</div><div class='add'>+ * arch/arm/mach-kirkwood/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2.  This program is licensed "as is" without any</div><div class='head'>diff --git a/include/asm-arm/arch-kirkwood/uncompress.h b/arch/arm/mach-kirkwood/include/mach/uncompress.h<br/>index a9062b6d7680..75d5497df3a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-kirkwood/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-kirkwood/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-kirkwood/uncompress.h</div><div class='add'>+ * arch/arm/mach-kirkwood/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2.  This program is licensed "as is" without any</div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='del'>-#include &lt;asm/arch/kirkwood.h&gt;</div><div class='add'>+#include &lt;mach/kirkwood.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SERIAL_BASE	((unsigned char *)UART0_PHYS_BASE)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-kirkwood/include/mach/vmalloc.h b/arch/arm/mach-kirkwood/include/mach/vmalloc.h<br/>new file mode 100644<br/>index 000000000000..8f48260dcdad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-kirkwood/include/mach/vmalloc.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define VMALLOC_END	0xfe800000</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/irq.c b/arch/arm/mach-kirkwood/irq.c<br/>index 302bb2cf6669..5790643ffe07 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-kirkwood/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/irq.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/irq.h&gt;</div><div class='add'>+#include &lt;plat/irq.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> void __init kirkwood_init_irq(void)</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c<br/>index 8282d0ff84bf..2195fa31f6b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/pcie.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-kirkwood/pcie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/pcie.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/pcie.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/pcie.h&gt;</div><div class='add'>+#include &lt;plat/pcie.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c<br/>index 6cf642c504d3..a3012d445971 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-kirkwood/rd88f6192-nas-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/rd88f6192-nas-setup.c</a></div><div class='hunk'>@@ -18,10 +18,13 @@</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/mv643xx_eth.h&gt;</div><div class='add'>+#include &lt;linux/spi/flash.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/orion_spi.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/kirkwood.h&gt;</div><div class='add'>+#include &lt;mach/kirkwood.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> #define RD88F6192_GPIO_USB_VBUS		10</div><div class='hunk'>@@ -34,6 +37,21 @@ static struct mv_sata_platform_data rd88f6192_sata_data = {</div><div class='ctx'> 	.n_ports	= 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct flash_platform_data rd88F6192_spi_slave_data = {</div><div class='add'>+	.type		= "m25p128",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_board_info __initdata rd88F6192_spi_slave_info[] = {</div><div class='add'>+	{</div><div class='add'>+		.modalias	= "m25p80",</div><div class='add'>+		.platform_data	= &amp;rd88F6192_spi_slave_data,</div><div class='add'>+		.irq		= -1,</div><div class='add'>+		.max_speed_hz	= 20000000,</div><div class='add'>+		.bus_num	= 0,</div><div class='add'>+		.chip_select	= 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init rd88f6192_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -45,7 +63,12 @@ static void __init rd88f6192_init(void)</div><div class='ctx'> 	kirkwood_ge00_init(&amp;rd88f6192_ge00_data);</div><div class='ctx'> 	kirkwood_rtc_init();</div><div class='ctx'> 	kirkwood_sata_init(&amp;rd88f6192_sata_data);</div><div class='add'>+	spi_register_board_info(rd88F6192_spi_slave_info,</div><div class='add'>+				ARRAY_SIZE(rd88F6192_spi_slave_info));</div><div class='add'>+	kirkwood_spi_init();</div><div class='ctx'> 	kirkwood_uart0_init();</div><div class='add'>+	kirkwood_xor0_init();</div><div class='add'>+	kirkwood_xor1_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init rd88f6192_pci_init(void)</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c<br/>index e1f8de2c74a2..d96487a0f18b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/rd88f6281-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-kirkwood/rd88f6281-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/rd88f6281-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-kirkwood/rd88f6281-setup.c</a></div><div class='hunk'>@@ -18,11 +18,12 @@</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/mv643xx_eth.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/kirkwood.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/orion_nand.h&gt;</div><div class='add'>+#include &lt;mach/kirkwood.h&gt;</div><div class='add'>+#include &lt;plat/orion_nand.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> static struct mtd_partition rd88f6281_nand_parts[] = {</div><div class='hunk'>@@ -69,6 +70,8 @@ static struct platform_device rd88f6281_nand_flash = {</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data rd88f6281_ge00_data = {</div><div class='ctx'> 	.phy_addr	= -1,</div><div class='add'>+	.speed		= SPEED_1000,</div><div class='add'>+	.duplex		= DUPLEX_FULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mv_sata_platform_data rd88f6281_sata_data = {</div><div class='head'>diff --git a/arch/arm/mach-ks8695/board-micrel.c b/arch/arm/mach-ks8695/board-micrel.c<br/>index 05ac2bd04020..0468e93b7d3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/board-micrel.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ks8695/board-micrel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/board-micrel.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/board-micrel.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/devices.h&gt;</div><div class='add'>+#include &lt;mach/devices.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ks8695/cpu.c b/arch/arm/mach-ks8695/cpu.c<br/>index 407d255e42bf..c6c08e800233 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/cpu.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ks8695/cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/cpu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/cpu.c</a></div><div class='hunk'>@@ -25,13 +25,13 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-sys.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-misc.h&gt;</div><div class='add'>+#include &lt;mach/regs-sys.h&gt;</div><div class='add'>+#include &lt;mach/regs-misc.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct __initdata map_desc ks8695_io_desc[] = {</div><div class='head'>diff --git a/arch/arm/mach-ks8695/devices.c b/arch/arm/mach-ks8695/devices.c<br/>index 3db2ec61d06f..4bd251482c8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/devices.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ks8695/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/devices.c</a></div><div class='hunk'>@@ -22,9 +22,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-wan.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lan.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-hpna.h&gt;</div><div class='add'>+#include &lt;mach/regs-wan.h&gt;</div><div class='add'>+#include &lt;mach/regs-lan.h&gt;</div><div class='add'>+#include &lt;mach/regs-hpna.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='head'>diff --git a/arch/arm/mach-ks8695/gpio.c b/arch/arm/mach-ks8695/gpio.c<br/>index 5e46191c0af9..3624e65cd89b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/gpio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ks8695/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/gpio.c</a></div><div class='hunk'>@@ -25,11 +25,11 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Configure a GPIO line for either GPIO function, or its internal</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/debug-macro.S b/arch/arm/mach-ks8695/include/mach/debug-macro.S<br/>index cd5f2fb1f06e..3782c3559497 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/debug-macro.S</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='ctx'>  * Copyright (C) 2006 Simtec Electronics</div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-uart.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/regs-uart.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro	addruart, rx</div><div class='ctx'> 		mrc	p15, 0, \rx, c1, c0</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/devices.h b/arch/arm/mach-ks8695/include/mach/devices.h<br/>index 7ad2c656e162..2744fecb429c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/devices.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/devices.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/devices.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/devices.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/devices.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/devices.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Andrew Victor</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/dma.h b/arch/arm/mach-ks8695/include/mach/dma.h<br/>index e5159ed42a4b..561206280089 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/dma.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/entry-macro.S b/arch/arm/mach-ks8695/include/mach/entry-macro.S<br/>index e34bdf85920e..b4fe0c11c6ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/entry-macro.S</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='ctx'>  * Copyright (C) 2006 Simtec Electronics</div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-irq.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/regs-irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro	disable_fiq</div><div class='ctx'> 	.endm</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/gpio.h b/arch/arm/mach-ks8695/include/mach/gpio.h<br/>index 65ceea28607b..73c84168761c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/gpio.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/gpio.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Andrew Victor</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/hardware.h b/arch/arm/mach-ks8695/include/mach/hardware.h<br/>index cb732bff3288..1d640d075b7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/hardware.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='ctx'>  * Copyright (C) 2006 Simtec Electronics</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/io.h b/arch/arm/mach-ks8695/include/mach/io.h<br/>index 8edc4bd6aadf..f364f24ffe1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/io.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Andrew Victor</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/irqs.h b/arch/arm/mach-ks8695/include/mach/irqs.h<br/>index 8b1c4fe96a81..86fc9e6ce404 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ks8695/irqs.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Simtec Electronics</div><div class='ctx'>  *   Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/memory.h b/arch/arm/mach-ks8695/include/mach/memory.h<br/>index 24f6a6e4a302..dadbe66cb75c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/memory.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Andrew Victor</div><div class='ctx'>  *</div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_MEMORY_H</div><div class='ctx'> #define __ASM_ARCH_MEMORY_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Physical SRAM offset.</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/regs-gpio.h b/arch/arm/mach-ks8695/include/mach/regs-gpio.h<br/>index 6b95d77aea19..0df6fe61d1ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/regs-gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/regs-gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-gpio.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/regs-gpio.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/regs-gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Andrew Victor</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/regs-hpna.h b/arch/arm/mach-ks8695/include/mach/regs-hpna.h<br/>index 14091cdec103..815ce5c2e3b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/regs-hpna.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/regs-hpna.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-hpna.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-hpna.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/regs-wan.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/regs-wan.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Andrew Victor</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/regs-irq.h b/arch/arm/mach-ks8695/include/mach/regs-irq.h<br/>index 70b193f6b756..352b7e8704d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/regs-irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/regs-irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-irq.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/regs-irq.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/regs-irq.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='ctx'>  * Copyright (C) 2006 Simtec Electronics</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/regs-lan.h b/arch/arm/mach-ks8695/include/mach/regs-lan.h<br/>index a63bd61c64ed..9ef409901e76 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/regs-lan.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/regs-lan.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-lan.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-lan.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/regs-lan.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/regs-lan.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Andrew Victor</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/regs-mem.h b/arch/arm/mach-ks8695/include/mach/regs-mem.h<br/>index 76b38e0862e6..55806bc68ce3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/regs-mem.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/regs-mem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-mem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-mem.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/regs-mem.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/regs-mem.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Andrew Victor</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/regs-misc.h b/arch/arm/mach-ks8695/include/mach/regs-misc.h<br/>index 632ca6601a94..2740c52494a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/regs-misc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/regs-misc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-misc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-misc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/regs-misc.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/regs-misc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Andrew Victor</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/regs-pci.h b/arch/arm/mach-ks8695/include/mach/regs-pci.h<br/>index 286d6d488df8..75a9db6edbd9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/regs-pci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/regs-pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-pci.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/regs-pci.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/regs-pci.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='ctx'>  * Copyright (C) 2006 Simtec Electronics</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/regs-switch.h b/arch/arm/mach-ks8695/include/mach/regs-switch.h<br/>index 5f37be3f2f60..56d12e8de895 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/regs-switch.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/regs-switch.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-switch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-switch.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/regs-switch.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/regs-switch.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Andrew Victor</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/regs-sys.h b/arch/arm/mach-ks8695/include/mach/regs-sys.h<br/>index f3179815b8ee..57c20be0c129 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/regs-sys.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/regs-sys.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-sys.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-sys.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/regs-sys.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/regs-sys.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='ctx'>  * Copyright (C) 2006 Simtec Electronics</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/regs-timer.h b/arch/arm/mach-ks8695/include/mach/regs-timer.h<br/>index 0a9f7f99ec52..e620cda99d2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/regs-timer.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/regs-timer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-timer.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/regs-timer.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/regs-timer.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='ctx'>  * Copyright (C) 2006 Simtec Electronics</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/regs-uart.h b/arch/arm/mach-ks8695/include/mach/regs-uart.h<br/>index a27cb20502a3..8581fbc6245f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/regs-uart.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/regs-uart.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-uart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-uart.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ks8695/regs-uart.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/regs-uart.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='ctx'>  * Copyright (C) 2006 Simtec Electronics</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/regs-wan.h b/arch/arm/mach-ks8695/include/mach/regs-wan.h<br/>index 52e35b0d65e4..eb494ec6e956 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/regs-wan.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/regs-wan.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/regs-wan.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/regs-wan.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/regs-wan.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/regs-wan.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Andrew Victor</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/system.h b/arch/arm/mach-ks8695/include/mach/system.h<br/>index 3bc28106d937..2a6f91869056 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-s3c2410/system.h</div><div class='add'>+ * arch/arm/mach-s3c2410/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-timer.h&gt;</div><div class='add'>+#include &lt;mach/regs-timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/timex.h b/arch/arm/mach-ks8695/include/mach/timex.h<br/>index 8320d528b903..4682e350369b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/timex.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/uncompress.h b/arch/arm/mach-ks8695/include/mach/uncompress.h<br/>index 733a50855b5d..0eee37a69075 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/uncompress.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='ctx'>  * Copyright (C) 2006 Simtec Electronics</div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #define __ASM_ARCH_UNCOMPRESS_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-uart.h&gt;</div><div class='add'>+#include &lt;mach/regs-uart.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void putc(char c)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-ks8695/vmalloc.h b/arch/arm/mach-ks8695/include/mach/vmalloc.h<br/>index d1d88e58117d..744ac66be3a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ks8695/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ks8695/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ks8695/vmalloc.h</div><div class='add'>+ * arch/arm/mach-ks8695/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Ben Dooks</div><div class='ctx'>  * Copyright (C) 2006 Simtec Electronics &lt;linux@simtec.co.uk&gt;</div><div class='head'>diff --git a/arch/arm/mach-ks8695/irq.c b/arch/arm/mach-ks8695/irq.c<br/>index 0b06941a1eed..e5e71f4dbb84 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ks8695/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/irq.c</a></div><div class='hunk'>@@ -25,14 +25,14 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-irq.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void ks8695_irq_mask(unsigned int irqno)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-ks8695/leds.c b/arch/arm/mach-ks8695/leds.c<br/>index d61762ae50d8..184ef74e4bee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/leds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ks8695/leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/leds.c</a></div><div class='hunk'>@@ -12,10 +12,9 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='del'>-#include &lt;asm/arch/devices.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/devices.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static inline void ks8695_led_on(unsigned int led)</div><div class='head'>diff --git a/arch/arm/mach-ks8695/pci.c b/arch/arm/mach-ks8695/pci.c<br/>index 3f4e0330cb1a..1746c67af176 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ks8695/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/pci.c</a></div><div class='hunk'>@@ -31,10 +31,10 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/signal.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/devices.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-pci.h&gt;</div><div class='add'>+#include &lt;mach/devices.h&gt;</div><div class='add'>+#include &lt;mach/regs-pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int pci_dbg;</div><div class='head'>diff --git a/arch/arm/mach-ks8695/time.c b/arch/arm/mach-ks8695/time.c<br/>index 02f766b3121d..940888dffc16 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ks8695/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ks8695/time.c</a></div><div class='hunk'>@@ -28,8 +28,8 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-timer.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-irq.h&gt;</div><div class='add'>+#include &lt;mach/regs-timer.h&gt;</div><div class='add'>+#include &lt;mach/regs-irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-l7200/core.c b/arch/arm/mach-l7200/core.c<br/>index 561a0fe7095d..50d23246d4f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-l7200/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/core.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/aux_reg.h b/arch/arm/mach-l7200/include/mach/aux_reg.h<br/>index 5b4396de16a0..4671558cdd51 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/aux_reg.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/aux_reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/aux_reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/aux_reg.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-l7200/aux_reg.h</div><div class='add'>+ * arch/arm/mach-l7200/include/mach/aux_reg.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 Steve Hill (sjhill@cotw.com)</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #ifndef _ASM_ARCH_AUXREG_H</div><div class='ctx'> #define _ASM_ARCH_AUXREG_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define l7200aux_reg	*((volatile unsigned int *) (AUX_BASE))</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-l7200/debug-macro.S b/arch/arm/mach-l7200/include/mach/debug-macro.S<br/>index 846473318e8b..34eed2a63e69 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-l7200/debug-macro.S</div><div class='add'>+/* arch/arm/mach-l7200/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/dma.h b/arch/arm/mach-l7200/include/mach/dma.h<br/>index 4c7eca63f035..c7e48bd4590c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-l7200/dma.h</div><div class='add'>+ * arch/arm/mach-l7200/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 Steve Hill (sjhill@cotw.com)</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/entry-macro.S b/arch/arm/mach-l7200/include/mach/entry-macro.S<br/>index 63411d3e9df4..1726d91fc1d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-l7200/entry-macro.S</div><div class='add'>+ * arch/arm/mach-l7200/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for L7200-based platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.equ	irq_base_addr,	IO_BASE_2</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-l7200/gp_timers.h b/arch/arm/mach-l7200/include/mach/gp_timers.h<br/>index 9c4804d13578..2b7086a26b81 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/gp_timers.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/gp_timers.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/gp_timers.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/gp_timers.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-l7200/gp_timers.h</div><div class='add'>+ * arch/arm/mach-l7200/include/mach/gp_timers.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 Steve Hill (sjhill@cotw.com)</div><div class='ctx'>  *</div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #ifndef _ASM_ARCH_GPTIMERS_H</div><div class='ctx'> #define _ASM_ARCH_GPTIMERS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Layout of L7200 general purpose timer registers</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/gpio.h b/arch/arm/mach-l7200/include/mach/gpio.h<br/>index 0b63e4239bdd..c7b0a5d7b8bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/gpio.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> /*</div><div class='del'>- *      linux/include/asm-arm/arch-l7200/gpio.h</div><div class='add'>+ *      arch/arm/mach-l7200/include/mach/gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  *      Registers and  helper functions for the L7200 Link-Up Systems</div><div class='ctx'>  *      GPIO.</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/hardware.h b/arch/arm/mach-l7200/include/mach/hardware.h<br/>index 2ab43f3a4a8d..c31909cfc254 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-l7200/hardware.h</div><div class='add'>+ * arch/arm/mach-l7200/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net)</div><div class='ctx'>  *                    Steve Hill (sjhill@cotw.com)</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/io.h b/arch/arm/mach-l7200/include/mach/io.h<br/>index 645dbdfb3908..d432ba9e5dff 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/io.h</a></div><div class='hunk'>@@ -1,16 +1,16 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-l7200/io.h</div><div class='add'>+ * arch/arm/mach-l7200/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 Steve Hill (sjhill@cotw.com)</div><div class='ctx'>  *</div><div class='ctx'>  * Changelog:</div><div class='del'>- *  03-21-2000	SJH	Created from linux/include/asm-arm/arch-nexuspci/io.h</div><div class='add'>+ *  03-21-2000	SJH	Created from arch/arm/mach-nexuspci/include/mach/io.h</div><div class='ctx'>  *  08-31-2000	SJH	Added in IO functions necessary for new drivers</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __ASM_ARM_ARCH_IO_H</div><div class='ctx'> #define __ASM_ARM_ARCH_IO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT 0xffffffff</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-l7200/irqs.h b/arch/arm/mach-l7200/include/mach/irqs.h<br/>index 7120c016e29e..7edffd713c5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-l7200/irqs.h</div><div class='add'>+ * arch/arm/mach-l7200/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net)</div><div class='ctx'>  *                    Steve Hill (sjhill@cotw.com)</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/memory.h b/arch/arm/mach-l7200/include/mach/memory.h<br/>index 402df637e740..f338cf3ffd93 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-l7200/memory.h</div><div class='add'>+ * arch/arm/mach-l7200/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2000 Steve Hill (sjhill@cotw.com)</div><div class='ctx'>  * Copyright (c) 2000 Rob Scott (rscott@mtrob.fdns.net)</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/pmpcon.h b/arch/arm/mach-l7200/include/mach/pmpcon.h<br/>index 730056c194be..3959871e8361 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/pmpcon.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/pmpcon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/pmpcon.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/pmpcon.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-l7200/pmpcon.h</div><div class='add'>+ *  arch/arm/mach-l7200/include/mach/pmpcon.h</div><div class='ctx'>  *</div><div class='ctx'>  *   Registers and  helper functions for the L7200 Link-Up Systems</div><div class='ctx'>  *   DC/DC converter register.</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/pmu.h b/arch/arm/mach-l7200/include/mach/pmu.h<br/>index 57faea76d1b3..a2da7aedf208 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/pmu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/pmu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/pmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/pmu.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-l7200/pmu.h</div><div class='add'>+ *  arch/arm/mach-l7200/include/mach/pmu.h</div><div class='ctx'>  *</div><div class='ctx'>  *   Registers and  helper functions for the L7200 Link-Up Systems</div><div class='ctx'>  *   Power Management Unit (PMU).</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/serial.h b/arch/arm/mach-l7200/include/mach/serial.h<br/>index defb8b7fca73..adc05e5f8378 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/serial.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/serial.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-l7200/serial.h</div><div class='add'>+ * arch/arm/mach-l7200/include/mach/serial.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2000 Rob Scott (rscott@mtrob.fdns.net)</div><div class='ctx'>  *                    Steve Hill (sjhill@cotw.com)</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/serial_l7200.h b/arch/arm/mach-l7200/include/mach/serial_l7200.h<br/>index b1008a9d23e5..645f1c5e568d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/serial_l7200.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/serial_l7200.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/serial_l7200.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/serial_l7200.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-l7200/serial_l7200.h</div><div class='add'>+ * arch/arm/mach-l7200/include/mach/serial_l7200.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2000 Steven Hill (sjhill@cotw.com)</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SERIAL_L7200_H</div><div class='ctx'> #define __ASM_ARCH_SERIAL_L7200_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/memory.h&gt;</div><div class='add'>+#include &lt;mach/memory.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This assumes you have a 3.6864 MHz clock for your UART.</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/sib.h b/arch/arm/mach-l7200/include/mach/sib.h<br/>index bf4364ee2535..965728712cf3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/sib.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/sib.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/sib.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/sib.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-l7200/sib.h</div><div class='add'>+ *  arch/arm/mach-l7200/include/mach/sib.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Registers and helper functions for the Serial Interface Bus.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/sys-clock.h b/arch/arm/mach-l7200/include/mach/sys-clock.h<br/>index 771c774f4815..2d7722be60ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/sys-clock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/sys-clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/sys-clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/sys-clock.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-l7200/sys-clock.h</div><div class='add'>+ *  arch/arm/mach-l7200/include/mach/sys-clock.h</div><div class='ctx'>  *</div><div class='ctx'>  *   Registers and  helper functions for the L7200 Link-Up Systems</div><div class='ctx'>  *   System clocks.</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/system.h b/arch/arm/mach-l7200/include/mach/system.h<br/>index 18825cf071ba..5272abee0d0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-l7200/system.h</div><div class='add'>+ * arch/arm/mach-l7200/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2000 Steve Hill (sjhill@cotw.com)</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/time.h b/arch/arm/mach-l7200/include/mach/time.h<br/>index ea22f7fff9cd..061771c2c2bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/time.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/time.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/time.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-l7200/time.h</div><div class='add'>+ * arch/arm/mach-l7200/include/mach/time.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net)</div><div class='ctx'>  *                    Steve Hill (sjhill@cotw.com)</div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef _ASM_ARCH_TIME_H</div><div class='ctx'> #define _ASM_ARCH_TIME_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * RTC base register address</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/timex.h b/arch/arm/mach-l7200/include/mach/timex.h<br/>index 3c3202620f00..ffc96a63b5a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-l7200/timex.h</div><div class='add'>+ * arch/arm/mach-l7200/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net)</div><div class='ctx'>  *                    Steve Hill (sjhill@cotw.com)</div><div class='head'>diff --git a/include/asm-arm/arch-l7200/uncompress.h b/arch/arm/mach-l7200/include/mach/uncompress.h<br/>index 04be2a088639..591c962bb315 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-l7200/uncompress.h</div><div class='add'>+ * arch/arm/mach-l7200/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 Steve Hill (sjhill@cotw.com)</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  *  07-26-2000	SJH	Removed hard coded baud rate</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_UART  IO_START + 0x00044000</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-l7200/vmalloc.h b/arch/arm/mach-l7200/include/mach/vmalloc.h<br/>index 816231eedaac..85f0abbf15f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-l7200/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-l7200/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-l7200/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-l7200/vmalloc.h</div><div class='add'>+ * arch/arm/mach-l7200/include/mach/vmalloc.h</div><div class='ctx'>  */</div><div class='ctx'> #define VMALLOC_END       (PAGE_OFFSET + 0x10000000)</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/arch-kev7a400.c b/arch/arm/mach-lh7a40x/arch-kev7a400.c<br/>index 2ef7d0097b38..551b97261826 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/arch-kev7a400.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-lh7a40x/arch-kev7a400.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/arch-kev7a400.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/arch-kev7a400.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c<br/>index fe64946f9e18..e373fb8e2699 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/arch-lpd7a40x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-lh7a40x/arch-lpd7a40x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/arch-lpd7a40x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/arch-lpd7a40x.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/clcd.c b/arch/arm/mach-lh7a40x/clcd.c<br/>index 1992db4c2523..a2a543258fc3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/clcd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-lh7a40x/clcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/clcd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/clcd.c</a></div><div class='hunk'>@@ -17,14 +17,13 @@</div><div class='ctx'> </div><div class='ctx'> //#include &lt;linux/module.h&gt;</div><div class='ctx'> //#include &lt;linux/time.h&gt;</div><div class='del'>-//#include &lt;asm/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> //#include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/clcd.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/clocks.c b/arch/arm/mach-lh7a40x/clocks.c<br/>index 7530a95c15a6..4fb23ac6b5ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/clocks.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-lh7a40x/clocks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/clocks.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/clocks.c</a></div><div class='hunk'>@@ -9,8 +9,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/clocks.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/clocks.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct module;</div><div class='head'>diff --git a/include/asm-arm/arch-lh7a40x/clocks.h b/arch/arm/mach-lh7a40x/include/mach/clocks.h<br/>index 7d0ba18ad578..fe2e0255c084 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-lh7a40x/clocks.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-lh7a40x/clocks.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/clocks.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/clocks.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* include/asm-arm/arch-lh7a40x/clocks.h</div><div class='add'>+/* arch/arm/mach-lh7a40x/include/mach/clocks.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 Marc Singer</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-lh7a40x/constants.h b/arch/arm/mach-lh7a40x/include/mach/constants.h<br/>index 51de96e87faf..55c6edbc2dfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-lh7a40x/constants.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-lh7a40x/constants.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/constants.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/constants.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* include/asm-arm/arch-lh7a40x/constants.h</div><div class='add'>+/* arch/arm/mach-lh7a40x/include/mach/constants.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 Coastal Environmental Systems</div><div class='ctx'>  *  Copyright (C) 2004 Logic Product Development</div><div class='head'>diff --git a/include/asm-arm/arch-lh7a40x/debug-macro.S b/arch/arm/mach-lh7a40x/include/mach/debug-macro.S<br/>index 421dcd6a8506..85141ed5383d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-lh7a40x/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-lh7a40x/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-lh7a40x/debug-macro.S</div><div class='add'>+/* arch/arm/mach-lh7a40x/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-lh7a40x/dma.h b/arch/arm/mach-lh7a40x/include/mach/dma.h<br/>index a8cbd14bbf9d..baa3f8dbd04b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-lh7a40x/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-lh7a40x/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/dma.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* include/asm-arm/arch-lh7a40x/dma.h</div><div class='add'>+/* arch/arm/mach-lh7a40x/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2005 Marc Singer</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-lh7a40x/entry-macro.S b/arch/arm/mach-lh7a40x/include/mach/entry-macro.S<br/>index ffe397250f0c..069bb4cefff7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-lh7a40x/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-lh7a40x/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-lh7a40x/entry-macro.S</div><div class='add'>+ * arch/arm/mach-lh7a40x/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for LH7A40x platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,8 +7,8 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* In order to allow there to be support for both of the processor</div><div class='ctx'>    classes at the same time, we make a hack here that isn't very</div><div class='head'>diff --git a/include/asm-arm/arch-lh7a40x/hardware.h b/arch/arm/mach-lh7a40x/include/mach/hardware.h<br/>index e9ff74fd7939..48e827d2fa56 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-lh7a40x/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-lh7a40x/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='del'>-/* include/asm-arm/arch-lh7a40x/hardware.h</div><div class='add'>+/* arch/arm/mach-lh7a40x/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 Coastal Environmental Systems</div><div class='ctx'>  *</div><div class='del'>- *  [ Substantially cribbed from include/asm-arm/arch-pxa/hardware.h ]</div><div class='add'>+ *  [ Substantially cribbed from arch/arm/mach-pxa/include/mach/hardware.h ]</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or</div><div class='ctx'>  *  modify it under the terms of the GNU General Public License</div><div class='head'>diff --git a/include/asm-arm/arch-lh7a40x/io.h b/arch/arm/mach-lh7a40x/include/mach/io.h<br/>index 17bc94097481..031d26f9163c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-lh7a40x/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-lh7a40x/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/io.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* include/asm-arm/arch-lh7a40x/io.h</div><div class='add'>+/* arch/arm/mach-lh7a40x/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 Coastal Environmental Systems</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_IO_H</div><div class='ctx'> #define __ASM_ARCH_IO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT 0xffffffff</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-lh7a40x/irqs.h b/arch/arm/mach-lh7a40x/include/mach/irqs.h<br/>index afe8c7cbad6a..0f9b83675935 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-lh7a40x/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-lh7a40x/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* include/asm-arm/arch-lh7a40x/irqs.h</div><div class='add'>+/* arch/arm/mach-lh7a40x/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 Coastal Environmental Systems</div><div class='ctx'>  *  Copyright (C) 2004 Logic Product Development</div><div class='head'>diff --git a/include/asm-arm/arch-lh7a40x/memory.h b/arch/arm/mach-lh7a40x/include/mach/memory.h<br/>index 9b0c8012e713..f7107b4c197a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-lh7a40x/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-lh7a40x/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/memory.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* include/asm-arm/arch-lh7a40x/memory.h</div><div class='add'>+/* arch/arm/mach-lh7a40x/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 Coastal Environmental Systems</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-lh7a40x/registers.h b/arch/arm/mach-lh7a40x/include/mach/registers.h<br/>index b4f09b3e2d03..ea44396383a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-lh7a40x/registers.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-lh7a40x/registers.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/registers.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/registers.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* include/asm-arm/arch-lh7a40x/registers.h</div><div class='add'>+/* arch/arm/mach-lh7a40x/include/mach/registers.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 Coastal Environmental Systems</div><div class='ctx'>  *  Copyright (C) 2004 Logic Product Development</div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/constants.h&gt;</div><div class='add'>+#include &lt;mach/constants.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_REGISTERS_H</div><div class='ctx'> #define __ASM_ARCH_REGISTERS_H</div><div class='head'>diff --git a/include/asm-arm/arch-lh7a40x/ssp.h b/arch/arm/mach-lh7a40x/include/mach/ssp.h<br/>index 132b1c4d5ce6..509916182e34 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-lh7a40x/ssp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-lh7a40x/ssp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/ssp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/ssp.h</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='ctx'> /* ssp.h</div><div class='del'>-     $Id$</div><div class='ctx'> </div><div class='ctx'>    written by Marc Singer</div><div class='ctx'>    6 Dec 2004</div><div class='head'>diff --git a/include/asm-arm/arch-lh7a40x/system.h b/arch/arm/mach-lh7a40x/include/mach/system.h<br/>index e1df8aa460f2..fa46bb1ef07b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-lh7a40x/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-lh7a40x/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/system.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* include/asm-arm/arch-lh7a40x/system.h</div><div class='add'>+/* arch/arm/mach-lh7a40x/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 Coastal Environmental Systems</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-lh7a40x/timex.h b/arch/arm/mach-lh7a40x/include/mach/timex.h<br/>index fa726b670829..08028cef1b3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-lh7a40x/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-lh7a40x/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/timex.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* include/asm-arm/arch-lh7a40x/timex.h</div><div class='add'>+/* arch/arm/mach-lh7a40x/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 Coastal Environmental Systems</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/constants.h&gt;</div><div class='add'>+#include &lt;mach/constants.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CLOCK_TICK_RATE		(PLL_CLOCK/6/16)</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-lh7a40x/uncompress.h b/arch/arm/mach-lh7a40x/include/mach/uncompress.h<br/>index 3d1ce0426a33..55b80d479eb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-lh7a40x/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-lh7a40x/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* include/asm-arm/arch-lh7a40x/uncompress.h</div><div class='add'>+/* arch/arm/mach-lh7a40x/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 Coastal Environmental Systems</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/registers.h&gt;</div><div class='add'>+#include &lt;mach/registers.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef UART_R_DATA</div><div class='ctx'> # define UART_R_DATA	(0x00)</div><div class='head'>diff --git a/include/asm-arm/arch-lh7a40x/vmalloc.h b/arch/arm/mach-lh7a40x/include/mach/vmalloc.h<br/>index 8163e45109b9..3fbd49490bb9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-lh7a40x/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-lh7a40x/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* include/asm-arm/arch-lh7a40x/vmalloc.h</div><div class='add'>+/* arch/arm/mach-lh7a40x/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 Coastal Environmental Systems</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/irq-lh7a400.c b/arch/arm/mach-lh7a40x/irq-lh7a400.c<br/>index 9472bbebd8ab..1ad3afcf6b3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/irq-lh7a400.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-lh7a40x/irq-lh7a400.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/irq-lh7a400.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/irq-lh7a400.c</a></div><div class='hunk'>@@ -12,10 +12,10 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/irq-lh7a404.c b/arch/arm/mach-lh7a40x/irq-lh7a404.c<br/>index 9b28389035e6..12b045b688c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/irq-lh7a404.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-lh7a40x/irq-lh7a404.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/irq-lh7a404.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/irq-lh7a404.c</a></div><div class='hunk'>@@ -12,10 +12,10 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/irq-lpd7a40x.c b/arch/arm/mach-lh7a40x/irq-lpd7a40x.c<br/>index 66e1ed3961ea..0d5063ebda10 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/irq-lpd7a40x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-lh7a40x/irq-lpd7a40x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/irq-lpd7a40x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/irq-lpd7a40x.c</a></div><div class='hunk'>@@ -13,10 +13,10 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/lcd-panel.h b/arch/arm/mach-lh7a40x/lcd-panel.h<br/>index df6e38ed425b..a7f5027b2f78 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/lcd-panel.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-lh7a40x/lcd-panel.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/lcd-panel.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/lcd-panel.h</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='ctx'> /* lcd-panel.h</div><div class='del'>-     $Id$</div><div class='ctx'> </div><div class='ctx'>    written by Marc Singer</div><div class='ctx'>    18 Jul 2005</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/ssp-cpld.c b/arch/arm/mach-lh7a40x/ssp-cpld.c<br/>index a10830186dac..51fbef9601b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/ssp-cpld.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-lh7a40x/ssp-cpld.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/ssp-cpld.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/ssp-cpld.c</a></div><div class='hunk'>@@ -46,9 +46,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/ssp.h&gt;</div><div class='add'>+#include &lt;mach/ssp.h&gt;</div><div class='ctx'> </div><div class='ctx'> //#define TALK</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/time.c b/arch/arm/mach-lh7a40x/time.c<br/>index e50e60b33851..7fe9e06cf662 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-lh7a40x/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-lh7a40x/time.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-loki/addr-map.c b/arch/arm/mach-loki/addr-map.c<br/>index ba25e56ade58..70ca56bb6f33 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/addr-map.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-loki/addr-map.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/addr-map.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/addr-map.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-loki/common.c b/arch/arm/mach-loki/common.c<br/>index 410f50399dd3..c0d2d9d12e74 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/common.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-loki/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/common.c</a></div><div class='hunk'>@@ -18,9 +18,9 @@</div><div class='ctx'> #include &lt;asm/timex.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/arch/loki.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/orion_nand.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/time.h&gt;</div><div class='add'>+#include &lt;mach/loki.h&gt;</div><div class='add'>+#include &lt;plat/orion_nand.h&gt;</div><div class='add'>+#include &lt;plat/time.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='head'>diff --git a/include/asm-arm/arch-loki/debug-macro.S b/arch/arm/mach-loki/include/mach/debug-macro.S<br/>index 585502e96513..a8c20bd2f951 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-loki/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-loki/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,12 +1,12 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-loki/debug-macro.S</div><div class='add'>+ * arch/arm/mach-loki/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/loki.h&gt;</div><div class='add'>+#include &lt;mach/loki.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro	addruart,rx</div><div class='ctx'> 	mrc	p15, 0, \rx, c1, c0</div><div class='head'>diff --git a/include/asm-arm/arch-loki/dma.h b/arch/arm/mach-loki/include/mach/dma.h<br/>index 40a8c178f10d..40a8c178f10d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-loki/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-loki/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/dma.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-loki/entry-macro.S b/arch/arm/mach-loki/include/mach/entry-macro.S<br/>index 693257cdbeb8..332af38ec13c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-loki/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-loki/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-loki/entry-macro.S</div><div class='add'>+ * arch/arm/mach-loki/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for Marvell Loki (88RC8480) platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/loki.h&gt;</div><div class='add'>+#include &lt;mach/loki.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro  disable_fiq</div><div class='ctx'> 	.endm</div><div class='head'>diff --git a/include/asm-arm/arch-loki/hardware.h b/arch/arm/mach-loki/include/mach/hardware.h<br/>index f65b01c733b6..d7bfc8f17729 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-loki/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-loki/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-loki/hardware.h</div><div class='add'>+ * arch/arm/mach-loki/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='head'>diff --git a/include/asm-arm/arch-loki/io.h b/arch/arm/mach-loki/include/mach/io.h<br/>index e7418a915e75..a373cd582c84 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-loki/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-loki/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-loki/io.h</div><div class='add'>+ * arch/arm/mach-loki/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2.  This program is licensed "as is" without any</div><div class='head'>diff --git a/include/asm-arm/arch-loki/irqs.h b/arch/arm/mach-loki/include/mach/irqs.h<br/>index 7e4971438072..9fbd3326867b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-loki/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-loki/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-loki/irqs.h</div><div class='add'>+ * arch/arm/mach-loki/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * IRQ definitions for Marvell Loki (88RC8480) SoCs</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-loki/loki.h b/arch/arm/mach-loki/include/mach/loki.h<br/>index 5dd05ee0a4e6..c00af6ba5578 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-loki/loki.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-loki/loki.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/include/mach/loki.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/loki.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-loki/loki.h</div><div class='add'>+ * arch/arm/mach-loki/include/mach/loki.h</div><div class='ctx'>  *</div><div class='ctx'>  * Generic definitions for Marvell Loki (88RC8480) SoC flavors</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-mv78xx0/memory.h b/arch/arm/mach-loki/include/mach/memory.h<br/>index 721a6b185b91..a39533ab489d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mv78xx0/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mv78xx0/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-mv78xx0/memory.h</div><div class='add'>+ * arch/arm/mach-loki/include/mach/memory.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_MEMORY_H</div><div class='head'>diff --git a/include/asm-arm/arch-loki/system.h b/arch/arm/mach-loki/include/mach/system.h<br/>index a3568ac8ec35..8db1147d4ec5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-loki/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-loki/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-loki/system.h</div><div class='add'>+ * arch/arm/mach-loki/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2.  This program is licensed "as is" without any</div><div class='hunk'>@@ -9,8 +9,8 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/loki.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/loki.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-loki/timex.h b/arch/arm/mach-loki/include/mach/timex.h<br/>index 940014f97cae..9df210915297 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-loki/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-loki/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-loki/timex.h</div><div class='add'>+ * arch/arm/mach-loki/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2.  This program is licensed "as is" without any</div><div class='head'>diff --git a/include/asm-arm/arch-loki/uncompress.h b/arch/arm/mach-loki/include/mach/uncompress.h<br/>index 89a0cf88d3a5..90b2a7e65da3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-loki/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-loki/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-loki/uncompress.h</div><div class='add'>+ * arch/arm/mach-loki/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2.  This program is licensed "as is" without any</div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='del'>-#include &lt;asm/arch/loki.h&gt;</div><div class='add'>+#include &lt;mach/loki.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SERIAL_BASE	((unsigned char *)UART0_PHYS_BASE)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-loki/include/mach/vmalloc.h b/arch/arm/mach-loki/include/mach/vmalloc.h<br/>new file mode 100644<br/>index 000000000000..8dc3bfcbf9f0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-loki/include/mach/vmalloc.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define VMALLOC_END	0xfe800000</div><div class='head'>diff --git a/arch/arm/mach-loki/irq.c b/arch/arm/mach-loki/irq.c<br/>index d839af91fe03..5a487930cb2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-loki/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/irq.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/irq.h&gt;</div><div class='add'>+#include &lt;plat/irq.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> void __init loki_init_irq(void)</div><div class='head'>diff --git a/arch/arm/mach-loki/lb88rc8480-setup.c b/arch/arm/mach-loki/lb88rc8480-setup.c<br/>index d1b9e6e6253a..2cc9ac9b488f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/lb88rc8480-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-loki/lb88rc8480-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-loki/lb88rc8480-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-loki/lb88rc8480-setup.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/mv643xx_eth.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/arch/loki.h&gt;</div><div class='add'>+#include &lt;mach/loki.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> #define LB88RC8480_FLASH_BOOT_CS_BASE	0xf8000000</div><div class='head'>diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c<br/>index 86dfb2b5261c..995afc4ade4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/board-halibut.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-msm/board-halibut.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/board-halibut.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/board-halibut.c</a></div><div class='hunk'>@@ -19,14 +19,14 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/msm_iomap.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/msm_iomap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-msm/common.c b/arch/arm/mach-msm/common.c<br/>index 3f5d3362f887..3a511368a5d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/common.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-msm/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/common.c</a></div><div class='hunk'>@@ -28,9 +28,9 @@</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/msm_iomap.h&gt;</div><div class='add'>+#include &lt;mach/msm_iomap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct flash_platform_data msm_nand_data = {</div><div class='ctx'> 	.parts		= 0,</div><div class='head'>diff --git a/arch/arm/mach-msm/dma.c b/arch/arm/mach-msm/dma.c<br/>index 8b0f339b3274..9de08265d974 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/dma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-msm/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/dma.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MSM_DMOV_CHANNEL_COUNT 16</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-msm/idle.S b/arch/arm/mach-msm/idle.S<br/>index 2b1cb7f16943..6a94f0527137 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/idle.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-msm/idle.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/idle.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/idle.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-msm/idle.S</div><div class='add'>+/* arch/arm/mach-msm/include/mach/idle.S</div><div class='ctx'>  *</div><div class='ctx'>  * Idle processing for MSM7K - work around bugs with SWFI.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-msm/board.h b/arch/arm/mach-msm/include/mach/board.h<br/>index 763051f8ba14..a7639493c095 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-msm/board.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-msm/board.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/board.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/board.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-msm/board.h</div><div class='add'>+/* arch/arm/mach-msm/include/mach/board.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Google, Inc.</div><div class='ctx'>  * Author: Brian Swetland &lt;swetland@google.com&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-msm/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S<br/>index 393d5272e506..528eef4b605c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-msm/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-msm/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* include/asm-arm/arch-msm7200/debug-macro.S</div><div class='add'>+/* arch/arm/mach-msm7200/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Google, Inc.</div><div class='ctx'>  * Author: Brian Swetland &lt;swetland@google.com&gt;</div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/msm_iomap.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/msm_iomap.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro	addruart,rx</div><div class='ctx'> 	@ see if the MMU is enabled and select appropriate base address</div><div class='head'>diff --git a/include/asm-arm/arch-msm/dma.h b/arch/arm/mach-msm/include/mach/dma.h<br/>index e4b565b27b35..ad1c87f86d10 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-msm/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-msm/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/dma.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-msm/dma.h</div><div class='add'>+/* arch/arm/mach-msm/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Google, Inc.</div><div class='ctx'>  *</div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_MSM_DMA_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;asm/arch/msm_iomap.h&gt;</div><div class='add'>+#include &lt;mach/msm_iomap.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct msm_dmov_cmd {</div><div class='ctx'> 	struct list_head list;</div><div class='head'>diff --git a/include/asm-arm/arch-msm/entry-macro.S b/arch/arm/mach-msm/include/mach/entry-macro.S<br/>index ee24aece4cb0..d2259486bcb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-msm/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-msm/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* include/asm-arm/arch-msm7200/entry-macro.S</div><div class='add'>+/* arch/arm/mach-msm7200/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Google, Inc.</div><div class='ctx'>  * Author: Brian Swetland &lt;swetland@google.com&gt;</div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/msm_iomap.h&gt;</div><div class='add'>+#include &lt;mach/msm_iomap.h&gt;</div><div class='ctx'> </div><div class='ctx'>  	.macro	disable_fiq</div><div class='ctx'> 	.endm</div><div class='head'>diff --git a/include/asm-arm/arch-msm/hardware.h b/arch/arm/mach-msm/include/mach/hardware.h<br/>index 89af2b70182f..2d126091ae41 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-msm/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-msm/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-msm/hardware.h</div><div class='add'>+/* arch/arm/mach-msm/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Google, Inc.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-msm/io.h b/arch/arm/mach-msm/include/mach/io.h<br/>index 4645ae26b62a..c6a2feb268b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-msm/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-msm/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/io.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* include/asm-arm/arch-msm/io.h</div><div class='add'>+/* arch/arm/mach-msm/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Google, Inc.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-msm/irqs.h b/arch/arm/mach-msm/include/mach/irqs.h<br/>index e62a108b1857..9dd4cf8a2693 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-msm/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-msm/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-msm/irqs.h</div><div class='add'>+/* arch/arm/mach-msm/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Google, Inc.</div><div class='ctx'>  * Author: Brian Swetland &lt;swetland@google.com&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-msm/memory.h b/arch/arm/mach-msm/include/mach/memory.h<br/>index b5ce0e9ac86d..63fd47f2e62e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-msm/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-msm/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/memory.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-msm/memory.h</div><div class='add'>+/* arch/arm/mach-msm/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Google, Inc.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-msm/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h<br/>index b8955cc26fec..e221f58ceea3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-msm/msm_iomap.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-msm/msm_iomap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/msm_iomap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/msm_iomap.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-msm/msm_iomap.h</div><div class='add'>+/* arch/arm/mach-msm/include/mach/msm_iomap.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Google, Inc.</div><div class='ctx'>  * Author: Brian Swetland &lt;swetland@google.com&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-msm/system.h b/arch/arm/mach-msm/include/mach/system.h<br/>index 7c5544bdd0c7..f05ad2e0f235 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-msm/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-msm/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/system.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-msm/system.h</div><div class='add'>+/* arch/arm/mach-msm/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Google, Inc.</div><div class='ctx'>  *</div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> void arch_idle(void);</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-msm/timex.h b/arch/arm/mach-msm/include/mach/timex.h<br/>index 8724487ab4c9..a62e6b215aec 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-msm/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-msm/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/timex.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-msm/timex.h</div><div class='add'>+/* arch/arm/mach-msm/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Google, Inc.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-msm/uncompress.h b/arch/arm/mach-msm/include/mach/uncompress.h<br/>index e91ed786ffec..026e8955ace9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-msm/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-msm/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-msm/uncompress.h</div><div class='add'>+/* arch/arm/mach-msm/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Google, Inc.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-msm/vmalloc.h b/arch/arm/mach-msm/include/mach/vmalloc.h<br/>index 60f8d910e825..05f81fd8623c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-msm/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-msm/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-msm/vmalloc.h</div><div class='add'>+/* arch/arm/mach-msm/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Google, Inc.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c<br/>index c39edb994a88..5976200de99b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-msm/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/io.c</a></div><div class='hunk'>@@ -19,13 +19,13 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/arch/msm_iomap.h&gt;</div><div class='add'>+#include &lt;mach/msm_iomap.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MSM_DEVICE(name) { \</div><div class='ctx'> 		.virtual = MSM_##name##_BASE, \</div><div class='head'>diff --git a/arch/arm/mach-msm/irq.c b/arch/arm/mach-msm/irq.c<br/>index 24158040b789..66901baf8c8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-msm/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/irq.c</a></div><div class='hunk'>@@ -21,11 +21,11 @@</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/msm_iomap.h&gt;</div><div class='add'>+#include &lt;mach/msm_iomap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define VIC_REG(off) (MSM_VIC_BASE + (off))</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c<br/>index bd4732d1ab3e..9f02d7dca985 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/timer.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-msm/timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/timer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-msm/timer.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/arch/msm_iomap.h&gt;</div><div class='add'>+#include &lt;mach/msm_iomap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c<br/>index d27b83b7bf62..953a26c469cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/common.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mv78xx0/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/common.c</a></div><div class='hunk'>@@ -17,11 +17,11 @@</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/arch/mv78xx0.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/cache-feroceon-l2.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/ehci-orion.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/orion_nand.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/time.h&gt;</div><div class='add'>+#include &lt;mach/mv78xx0.h&gt;</div><div class='add'>+#include &lt;plat/cache-feroceon-l2.h&gt;</div><div class='add'>+#include &lt;plat/ehci-orion.h&gt;</div><div class='add'>+#include &lt;plat/orion_nand.h&gt;</div><div class='add'>+#include &lt;plat/time.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/db78x00-bp-setup.c b/arch/arm/mach-mv78xx0/db78x00-bp-setup.c<br/>index 0c93d19193df..a2d0c9783604 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/db78x00-bp-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mv78xx0/db78x00-bp-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/db78x00-bp-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/db78x00-bp-setup.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/mv643xx_eth.h&gt;</div><div class='del'>-#include &lt;asm/arch/mv78xx0.h&gt;</div><div class='add'>+#include &lt;mach/mv78xx0.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='head'>diff --git a/include/asm-arm/arch-mv78xx0/debug-macro.S b/arch/arm/mach-mv78xx0/include/mach/debug-macro.S<br/>index d0595bd645e5..a06442fbd341 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mv78xx0/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mv78xx0/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,12 +1,12 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-mv78xx0/debug-macro.S</div><div class='add'>+ * arch/arm/mach-mv78xx0/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mv78xx0.h&gt;</div><div class='add'>+#include &lt;mach/mv78xx0.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro	addruart,rx</div><div class='ctx'> 	mrc	p15, 0, \rx, c1, c0</div><div class='head'>diff --git a/include/asm-arm/arch-mv78xx0/dma.h b/arch/arm/mach-mv78xx0/include/mach/dma.h<br/>index 40a8c178f10d..40a8c178f10d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mv78xx0/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mv78xx0/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/dma.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mv78xx0/entry-macro.S b/arch/arm/mach-mv78xx0/include/mach/entry-macro.S<br/>index e9a606b12669..ed4a46bcd3b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mv78xx0/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mv78xx0/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-mv78xx0/entry-macro.S</div><div class='add'>+ * arch/arm/mach-mv78xx0/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for Marvell MV78xx0 platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mv78xx0.h&gt;</div><div class='add'>+#include &lt;mach/mv78xx0.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro  disable_fiq</div><div class='ctx'> 	.endm</div><div class='head'>diff --git a/include/asm-arm/arch-mv78xx0/hardware.h b/arch/arm/mach-mv78xx0/include/mach/hardware.h<br/>index 8e17926086c6..5d887557e123 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mv78xx0/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mv78xx0/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-mv78xx0/hardware.h</div><div class='add'>+ * arch/arm/mach-mv78xx0/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2.  This program is licensed "as is" without any</div><div class='head'>diff --git a/include/asm-arm/arch-mv78xx0/io.h b/arch/arm/mach-mv78xx0/include/mach/io.h<br/>index 415d4c98e3d1..450e0e1ad092 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mv78xx0/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mv78xx0/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-mv78xx0/io.h</div><div class='add'>+ * arch/arm/mach-mv78xx0/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2.  This program is licensed "as is" without any</div><div class='head'>diff --git a/include/asm-arm/arch-mv78xx0/irqs.h b/arch/arm/mach-mv78xx0/include/mach/irqs.h<br/>index 75930450cd65..995d7fb8d06f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mv78xx0/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mv78xx0/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-mv78xx0/irqs.h</div><div class='add'>+ * arch/arm/mach-mv78xx0/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * IRQ definitions for Marvell MV78xx0 SoCs</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-ep93xx/memory.h b/arch/arm/mach-mv78xx0/include/mach/memory.h<br/>index 4b1a5c7c8363..9e47a140ff7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ep93xx/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ep93xx/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-ep93xx/memory.h</div><div class='add'>+ * arch/arm/mach-mv78xx0/include/mach/memory.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_MEMORY_H</div><div class='hunk'>@@ -7,8 +7,8 @@</div><div class='ctx'> </div><div class='ctx'> #define PHYS_OFFSET		UL(0x00000000)</div><div class='ctx'> </div><div class='del'>-#define __bus_to_virt(x)	__phys_to_virt(x)</div><div class='ctx'> #define __virt_to_bus(x)	__virt_to_phys(x)</div><div class='add'>+#define __bus_to_virt(x)	__phys_to_virt(x)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/asm-arm/arch-mv78xx0/mv78xx0.h b/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h<br/>index 9f5d83c73faa..ad664178d6e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mv78xx0/mv78xx0.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mv78xx0/mv78xx0.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/mv78xx0.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-mv78xx0/mv78xx0.h</div><div class='add'>+ * arch/arm/mach-mv78xx0/include/mach/mv78xx0.h</div><div class='ctx'>  *</div><div class='ctx'>  * Generic definitions for Marvell MV78xx0 SoC flavors:</div><div class='ctx'>  *  MV781x0 and MV782x0.</div><div class='head'>diff --git a/include/asm-arm/arch-kirkwood/system.h b/arch/arm/mach-mv78xx0/include/mach/system.h<br/>index 8dde7e379855..7d5179408832 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-kirkwood/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-kirkwood/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-kirkwood/system.h</div><div class='add'>+ * arch/arm/mach-mv78xx0/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2.  This program is licensed "as is" without any</div><div class='hunk'>@@ -9,8 +9,8 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/kirkwood.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/mv78xx0.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-mv78xx0/timex.h b/arch/arm/mach-mv78xx0/include/mach/timex.h<br/>index a854b1ccbd01..0e8c443c723a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mv78xx0/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mv78xx0/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-mv78xx0/timex.h</div><div class='add'>+ * arch/arm/mach-mv78xx0/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2.  This program is licensed "as is" without any</div><div class='head'>diff --git a/include/asm-arm/arch-mv78xx0/uncompress.h b/arch/arm/mach-mv78xx0/include/mach/uncompress.h<br/>index 3bfe0a293ef7..365264298e79 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mv78xx0/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mv78xx0/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-mv78xx0/uncompress.h</div><div class='add'>+ * arch/arm/mach-mv78xx0/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2.  This program is licensed "as is" without any</div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='del'>-#include &lt;asm/arch/mv78xx0.h&gt;</div><div class='add'>+#include &lt;mach/mv78xx0.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SERIAL_BASE	((unsigned char *)UART0_PHYS_BASE)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/include/mach/vmalloc.h b/arch/arm/mach-mv78xx0/include/mach/vmalloc.h<br/>new file mode 100644<br/>index 000000000000..1c4954386a84<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-mv78xx0/include/mach/vmalloc.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define VMALLOC_END	0xfe000000</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/irq.c b/arch/arm/mach-mv78xx0/irq.c<br/>index 60f4ee4d4532..28248d37b999 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mv78xx0/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/irq.c</a></div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/mv78xx0.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/irq.h&gt;</div><div class='add'>+#include &lt;mach/mv78xx0.h&gt;</div><div class='add'>+#include &lt;plat/irq.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> void __init mv78xx0_init_irq(void)</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c<br/>index b78e1443159f..430ea84d587d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/pcie.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mv78xx0/pcie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/pcie.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mv78xx0/pcie.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/pcie.h&gt;</div><div class='add'>+#include &lt;plat/pcie.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> struct pcie_port {</div><div class='head'>diff --git a/arch/arm/mach-mx2/clock_imx27.c b/arch/arm/mach-mx2/clock_imx27.c<br/>index 0a29ef29c73a..c69896d011a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/clock_imx27.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx2/clock_imx27.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/clock_imx27.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/clock_imx27.c</a></div><div class='hunk'>@@ -22,10 +22,9 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "crm_regs.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mx2/cpu_imx27.c b/arch/arm/mach-mx2/cpu_imx27.c<br/>index d6b5c2e3377f..239308fe6652 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/cpu_imx27.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx2/cpu_imx27.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/cpu_imx27.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/cpu_imx27.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "crm_regs.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mx2/crm_regs.h b/arch/arm/mach-mx2/crm_regs.h<br/>index a40a9b950ce9..94644cd0a0fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/crm_regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx2/crm_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/crm_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/crm_regs.h</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #ifndef __ARCH_ARM_MACH_MX2_CRM_REGS_H__</div><div class='ctx'> #define __ARCH_ARM_MACH_MX2_CRM_REGS_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Register offsets */</div><div class='ctx'> #define CCM_CSCR                (IO_ADDRESS(CCM_BASE_ADDR) + 0x0)</div><div class='head'>diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-mx2/devices.c<br/>index a1f44c3c5315..bd0559d5933e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/devices.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx2/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/devices.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Resource definition for the MXC IrDA</div><div class='head'>diff --git a/arch/arm/mach-mx2/generic.c b/arch/arm/mach-mx2/generic.c<br/>index 07875cf00de9..dea6521d4d5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/generic.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx2/generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/generic.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mx2/mx27ads.c b/arch/arm/mach-mx2/mx27ads.c<br/>index a9ff01fff137..4ce56ef4d8d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/mx27ads.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx2/mx27ads.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/mx27ads.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/mx27ads.c</a></div><div class='hunk'>@@ -23,16 +23,16 @@</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/imx-uart.h&gt;</div><div class='del'>-#include &lt;asm/arch/iomux-mx1-mx2.h&gt;</div><div class='del'>-#include &lt;asm/arch/board-mx27ads.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/imx-uart.h&gt;</div><div class='add'>+#include &lt;mach/iomux-mx1-mx2.h&gt;</div><div class='add'>+#include &lt;mach/board-mx27ads.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* ADS's NOR flash */</div><div class='ctx'> static struct physmap_flash_data mx27ads_flash_data = {</div><div class='head'>diff --git a/arch/arm/mach-mx2/pcm038.c b/arch/arm/mach-mx2/pcm038.c<br/>index a9a28f58e714..1028f453cfc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/pcm038.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx2/pcm038.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/pcm038.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/pcm038.c</a></div><div class='hunk'>@@ -21,12 +21,12 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/iomux-mx1-mx2.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/iomux-mx1-mx2.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/arch/imx-uart.h&gt;</div><div class='del'>-#include &lt;asm/arch/board-pcm038.h&gt;</div><div class='add'>+#include &lt;mach/imx-uart.h&gt;</div><div class='add'>+#include &lt;mach/board-pcm038.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Phytec's phyCORE-i.MX27 comes with 32MiB flash,</div><div class='head'>diff --git a/arch/arm/mach-mx2/pcm970-baseboard.c b/arch/arm/mach-mx2/pcm970-baseboard.c<br/>index 028ac4d33684..a560cd6ad23d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/pcm970-baseboard.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx2/pcm970-baseboard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/pcm970-baseboard.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/pcm970-baseboard.c</a></div><div class='hunk'>@@ -17,8 +17,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-mx2/serial.c b/arch/arm/mach-mx2/serial.c<br/>index 570c02b8e5df..e31fd44f7941 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/serial.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx2/serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/serial.c</a></div><div class='hunk'>@@ -20,8 +20,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/imx-uart.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/imx-uart.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct resource uart0[] = {</div><div class='ctx'> 	{</div><div class='head'>diff --git a/arch/arm/mach-mx2/system.c b/arch/arm/mach-mx2/system.c<br/>index 99304645299d..7b8269719d11 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/system.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx2/system.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx2/system.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx2/system.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/proc-fns.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mx3/clock.c b/arch/arm/mach-mx3/clock.c<br/>index 2f3635943e70..9f14a871ee7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx3/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx3/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx3/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx3/clock.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "crm_regs.h"</div><div class='head'>diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c<br/>index 5c0320fce5b6..e08c6a8ac56b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx3/devices.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx3/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx3/devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx3/devices.c</a></div><div class='hunk'>@@ -21,8 +21,8 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/imx-uart.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/imx-uart.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct resource uart0[] = {</div><div class='ctx'> 	{</div><div class='head'>diff --git a/arch/arm/mach-mx3/iomux.c b/arch/arm/mach-mx3/iomux.c<br/>index adc51feefc1d..3dda1fe23cbf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx3/iomux.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx3/iomux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx3/iomux.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx3/iomux.c</a></div><div class='hunk'>@@ -21,9 +21,9 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/iomux-mx3.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/iomux-mx3.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * IOMUX register (base) addresses</div><div class='head'>diff --git a/arch/arm/mach-mx3/mm.c b/arch/arm/mach-mx3/mm.c<br/>index 41dad485ded9..30d842bd4d64 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx3/mm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx3/mm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx3/mm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx3/mm.c</a></div><div class='hunk'>@@ -22,10 +22,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>  * @file mm.c</div><div class='head'>diff --git a/arch/arm/mach-mx3/mx31ads.c b/arch/arm/mach-mx3/mx31ads.c<br/>index eba3e0cd4283..60fb4e0d5acd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx3/mx31ads.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx3/mx31ads.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx3/mx31ads.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx3/mx31ads.c</a></div><div class='hunk'>@@ -23,14 +23,14 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/board-mx31ads.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/board-mx31ads.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>  * @file mx31ads.c</div><div class='head'>diff --git a/arch/arm/mach-mx3/mx31lite.c b/arch/arm/mach-mx3/mx31lite.c<br/>index 1372c1a1fc3f..d363a6e79f80 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx3/mx31lite.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx3/mx31lite.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx3/mx31lite.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx3/mx31lite.c</a></div><div class='hunk'>@@ -23,15 +23,15 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/memory.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/arch/board-mx31lite.h&gt;</div><div class='add'>+#include &lt;mach/board-mx31lite.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This file contains the board-specific initialization routines.</div><div class='head'>diff --git a/arch/arm/mach-mx3/pcm037.c b/arch/arm/mach-mx3/pcm037.c<br/>index a34ae6de266f..df8582a6231b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx3/pcm037.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-mx3/pcm037.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx3/pcm037.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-mx3/pcm037.c</a></div><div class='hunk'>@@ -23,15 +23,15 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/memory.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/imx-uart.h&gt;</div><div class='del'>-#include &lt;asm/arch/iomux-mx3.h&gt;</div><div class='del'>-#include &lt;asm/arch/board-pcm037.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/imx-uart.h&gt;</div><div class='add'>+#include &lt;mach/iomux-mx3.h&gt;</div><div class='add'>+#include &lt;mach/board-pcm037.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct physmap_flash_data pcm037_flash_data = {</div><div class='ctx'> 	.width  = 2,</div><div class='hunk'>@@ -54,7 +54,7 @@ static struct platform_device pcm037_flash = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct imxuart_platform_data uart_pdata = {</div><div class='del'>-	.flags = 0,</div><div class='add'>+	.flags = IMXUART_HAVE_RTSCTS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *devices[] __initdata = {</div><div class='head'>diff --git a/arch/arm/mach-netx/fb.c b/arch/arm/mach-netx/fb.c<br/>index ef0ab6115c0b..24c79650f9f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/fb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-netx/fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/fb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/fb.c</a></div><div class='hunk'>@@ -23,8 +23,8 @@</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/clcd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/netx-regs.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/netx-regs.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct clk {};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c<br/>index 99d4fb19a08a..1b40483ea753 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/generic.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-netx/generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/generic.c</a></div><div class='hunk'>@@ -22,11 +22,11 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/netx-regs.h&gt;</div><div class='add'>+#include &lt;mach/netx-regs.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct map_desc netx_io_desc[] __initdata = {</div><div class='head'>diff --git a/include/asm-arm/arch-netx/debug-macro.S b/arch/arm/mach-netx/include/mach/debug-macro.S<br/>index a940d0e80cb2..11b9d5b46390 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-netx/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-netx/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-netx/debug-macro.S</div><div class='add'>+/* arch/arm/mach-netx/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-netx/dma.h b/arch/arm/mach-netx/include/mach/dma.h<br/>index 4eda5feed81c..690b3ebc43ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-netx/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-netx/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-netx/dma.h</div><div class='add'>+ *  arch/arm/mach-netx/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-netx/entry-macro.S b/arch/arm/mach-netx/include/mach/entry-macro.S<br/>index 83ad188a0847..a1952a0feda6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-netx/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-netx/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-netx/entry-macro.S</div><div class='add'>+ * arch/arm/mach-netx/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for Hilscher netX based platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro  disable_fiq</div><div class='ctx'> 		.endm</div><div class='head'>diff --git a/include/asm-arm/arch-netx/eth.h b/arch/arm/mach-netx/include/mach/eth.h<br/>index 643c90ef8b72..88af1ac28ead 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-netx/eth.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-netx/eth.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/eth.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/eth.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-netx/eth.h</div><div class='add'>+ * arch/arm/mach-netx/include/mach/eth.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-netx/hardware.h b/arch/arm/mach-netx/include/mach/hardware.h<br/>index 7786c45455cd..517a2bd37842 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-netx/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-netx/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-netx/hardware.h</div><div class='add'>+ * arch/arm/mach-netx/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-netx/io.h b/arch/arm/mach-netx/include/mach/io.h<br/>index a7a53f80165d..468b92a82585 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-netx/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-netx/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-netx/io.h</div><div class='add'>+ *  arch/arm/mach-netx/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-netx/irqs.h b/arch/arm/mach-netx/include/mach/irqs.h<br/>index a487dc6e2661..6ce914d54a30 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-netx/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-netx/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-netx/irqs.h</div><div class='add'>+ * arch/arm/mach-netx/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-netx/memory.h b/arch/arm/mach-netx/include/mach/memory.h<br/>index 6d8d2df3e99d..53745a1378de 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-netx/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-netx/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-netx/memory.h</div><div class='add'>+ *  arch/arm/mach-netx/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-netx/netx-regs.h b/arch/arm/mach-netx/include/mach/netx-regs.h<br/>index fc9aa21f360c..5104a00d40f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-netx/netx-regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-netx/netx-regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/netx-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/netx-regs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-netx/netx-regs.h</div><div class='add'>+ * arch/arm/mach-netx/include/mach/netx-regs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-netx/param.h b/arch/arm/mach-netx/include/mach/param.h<br/>index 7a80c26178a8..a771459206aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-netx/param.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-netx/param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/param.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-netx/param.h</div><div class='add'>+ *  arch/arm/mach-netx/include/mach/param.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-netx/pfifo.h b/arch/arm/mach-netx/include/mach/pfifo.h<br/>index 4af2ee4a32c1..42c59068f8d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-netx/pfifo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-netx/pfifo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/pfifo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/pfifo.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-netx/pfifo.h</div><div class='add'>+ * arch/arm/mach-netx/include/mach/pfifo.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-netx/system.h b/arch/arm/mach-netx/include/mach/system.h<br/>index 52adf368d765..27d8ef8e8e29 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-netx/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-netx/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-netx/system.h</div><div class='add'>+ * arch/arm/mach-netx/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='ctx'>  *</div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include "netx-regs.h"</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='head'>diff --git a/include/asm-arm/arch-netx/timex.h b/arch/arm/mach-netx/include/mach/timex.h<br/>index 7fdb42da0b40..1120dd0ba393 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-netx/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-netx/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-netx/timex.h</div><div class='add'>+ * arch/arm/mach-netx/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-netx/uncompress.h b/arch/arm/mach-netx/include/mach/uncompress.h<br/>index f89434547102..84f91284f612 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-netx/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-netx/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-netx/uncompress.h</div><div class='add'>+ * arch/arm/mach-netx/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-netx/vmalloc.h b/arch/arm/mach-netx/include/mach/vmalloc.h<br/>index da2da5a595da..25d5cc676e0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-netx/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-netx/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-netx/vmalloc.h</div><div class='add'>+ *  arch/arm/mach-netx/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-netx/xc.h b/arch/arm/mach-netx/include/mach/xc.h<br/>index 659af19512a9..0c0011d4fc2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-netx/xc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-netx/xc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/xc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/include/mach/xc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-netx/xc.h</div><div class='add'>+ *  arch/arm/mach-netx/include/mach/xc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-netx/nxdb500.c b/arch/arm/mach-netx/nxdb500.c<br/>index e4a133d62846..c9b174bc8ccf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/nxdb500.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-netx/nxdb500.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/nxdb500.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/nxdb500.c</a></div><div class='hunk'>@@ -25,11 +25,11 @@</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/clcd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/arch/netx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/eth.h&gt;</div><div class='add'>+#include &lt;mach/netx-regs.h&gt;</div><div class='add'>+#include &lt;mach/eth.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "fb.h"</div><div class='head'>diff --git a/arch/arm/mach-netx/nxdkn.c b/arch/arm/mach-netx/nxdkn.c<br/>index 7e26c42d1ac7..15b54c62d60f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/nxdkn.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-netx/nxdkn.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/nxdkn.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/nxdkn.c</a></div><div class='hunk'>@@ -25,11 +25,11 @@</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/clcd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/arch/netx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/eth.h&gt;</div><div class='add'>+#include &lt;mach/netx-regs.h&gt;</div><div class='add'>+#include &lt;mach/eth.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-netx/nxeb500hmi.c b/arch/arm/mach-netx/nxeb500hmi.c<br/>index 53e10a9849f9..1061c01ff679 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/nxeb500hmi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-netx/nxeb500hmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/nxeb500hmi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/nxeb500hmi.c</a></div><div class='hunk'>@@ -25,11 +25,11 @@</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/clcd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/arch/netx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/eth.h&gt;</div><div class='add'>+#include &lt;mach/netx-regs.h&gt;</div><div class='add'>+#include &lt;mach/eth.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "fb.h"</div><div class='head'>diff --git a/arch/arm/mach-netx/pfifo.c b/arch/arm/mach-netx/pfifo.c<br/>index 44dea61a9de4..19ae0a72bea3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/pfifo.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-netx/pfifo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/pfifo.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/pfifo.c</a></div><div class='hunk'>@@ -22,9 +22,9 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/netx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pfifo.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/netx-regs.h&gt;</div><div class='add'>+#include &lt;mach/pfifo.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(pfifo_lock);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c<br/>index ea07b54afa59..ac8e5bfed691 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-netx/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/time.c</a></div><div class='hunk'>@@ -22,10 +22,10 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/arch/netx-regs.h&gt;</div><div class='add'>+#include &lt;mach/netx-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * IRQ handler for the timer</div><div class='head'>diff --git a/arch/arm/mach-netx/xc.c b/arch/arm/mach-netx/xc.c<br/>index ca9c5b61283a..04c34e82fe6d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/xc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-netx/xc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/xc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-netx/xc.c</a></div><div class='hunk'>@@ -23,10 +23,10 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/netx-regs.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/netx-regs.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/xc.h&gt;</div><div class='add'>+#include &lt;mach/xc.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(xc_lock);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ns9xxx/board-a9m9750dev.c b/arch/arm/mach-ns9xxx/board-a9m9750dev.c<br/>index a494b71c0195..a22a608a7aba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/board-a9m9750dev.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ns9xxx/board-a9m9750dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/board-a9m9750dev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/board-a9m9750dev.c</a></div><div class='hunk'>@@ -13,12 +13,12 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch-ns9xxx/board.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/processor-ns9360.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/regs-sys-ns9360.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/regs-mem.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/regs-bbu.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/regs-board-a9m9750dev.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/processor-ns9360.h&gt;</div><div class='add'>+#include &lt;mach/regs-sys-ns9360.h&gt;</div><div class='add'>+#include &lt;mach/regs-mem.h&gt;</div><div class='add'>+#include &lt;mach/regs-bbu.h&gt;</div><div class='add'>+#include &lt;mach/regs-board-a9m9750dev.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "board-a9m9750dev.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ns9xxx/gpio-ns9360.c b/arch/arm/mach-ns9xxx/gpio-ns9360.c<br/>index cabfb879dda9..377330c1b250 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/gpio-ns9360.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ns9xxx/gpio-ns9360.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/gpio-ns9360.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/gpio-ns9360.c</a></div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch-ns9xxx/regs-bbu.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/processor-ns9360.h&gt;</div><div class='add'>+#include &lt;mach/regs-bbu.h&gt;</div><div class='add'>+#include &lt;mach/processor-ns9360.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "gpio-ns9360.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ns9xxx/gpio.c b/arch/arm/mach-ns9xxx/gpio.c<br/>index b3c963b0c8f5..804c30075960 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/gpio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ns9xxx/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/gpio.c</a></div><div class='hunk'>@@ -13,9 +13,9 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch-ns9xxx/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/processor.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/processor-ns9360.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/processor.h&gt;</div><div class='add'>+#include &lt;mach/processor-ns9360.h&gt;</div><div class='ctx'> #include &lt;asm/bug.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/bitops.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/board.h b/arch/arm/mach-ns9xxx/include/mach/board.h<br/>index e57443bdbbd9..f7e9196eb9ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/board.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/board.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/board.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/board.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/board.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/board.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006,2007 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/debug-macro.S b/arch/arm/mach-ns9xxx/include/mach/debug-macro.S<br/>index b21b93eb2dbc..c9530fba00aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/debug-macro.S</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/debug-macro.S</div><div class='ctx'>  * Copyright (C) 2006 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,9 +7,9 @@</div><div class='ctx'>  * under the terms of the GNU General Public License version 2 as published by</div><div class='ctx'>  * the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch-ns9xxx/regs-board-a9m9750dev.h&gt;</div><div class='add'>+#include &lt;mach/regs-board-a9m9750dev.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	addruart,rx</div><div class='ctx'> 		mrc	p15, 0, \rx, c1, c0</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/dma.h b/arch/arm/mach-ns9xxx/include/mach/dma.h<br/>index a67cbbe009c4..3f50d8c9e5c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/dma.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/entry-macro.S b/arch/arm/mach-ns9xxx/include/mach/entry-macro.S<br/>index 89a21c530468..71ca0319b547 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/entry-macro.S</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006,2007 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='hunk'>@@ -8,8 +8,8 @@</div><div class='ctx'>  * under the terms of the GNU General Public License version 2 as published by</div><div class='ctx'>  * the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/regs-sys-common.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/regs-sys-common.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	get_irqnr_preamble, base, tmp</div><div class='ctx'> 		ldr	\base, =SYS_ISRADDR</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/gpio.h b/arch/arm/mach-ns9xxx/include/mach/gpio.h<br/>index adbca08583c0..5eb349032579 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/gpio.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/gpio.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/hardware.h b/arch/arm/mach-ns9xxx/include/mach/hardware.h<br/>index 0dca11ce21fc..6dbb2030f563 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/hardware.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/io.h b/arch/arm/mach-ns9xxx/include/mach/io.h<br/>index 6f82d28af120..027bf649645a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/io.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/irqs.h b/arch/arm/mach-ns9xxx/include/mach/irqs.h<br/>index e83d48ec42c9..13483949e210 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/irqs.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006,2007 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/memory.h b/arch/arm/mach-ns9xxx/include/mach/memory.h<br/>index ce1343e593e1..649ee6235b94 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/memory.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/module.h b/arch/arm/mach-ns9xxx/include/mach/module.h<br/>index ac08a31111e4..f851a6b7da6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/module.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/module.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/module.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/module.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/module.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/processor-ns9360.h b/arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h<br/>index f3aa6c50dbe5..f41deda5129e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/processor-ns9360.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/processor-ns9360.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/processor-ns9360.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/processor.h b/arch/arm/mach-ns9xxx/include/mach/processor.h<br/>index f7b53b65de81..9f77f746a386 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/processor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/processor.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/processor.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/processor.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006,2007 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_PROCESSOR_H</div><div class='ctx'> #define __ASM_ARCH_PROCESSOR_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch-ns9xxx/module.h&gt;</div><div class='add'>+#include &lt;mach/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define processor_is_ns9210()	(0			\</div><div class='ctx'> 		|| module_is_cc7ucamry()		\</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/regs-bbu.h b/arch/arm/mach-ns9xxx/include/mach/regs-bbu.h<br/>index 7ee194dc6354..af227c058fb9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/regs-bbu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/regs-bbu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/regs-bbu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/regs-bbu.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/regs-bbu.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/regs-bbu.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_REGSBBU_H</div><div class='ctx'> #define __ASM_ARCH_REGSBBU_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* BBus Utility */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/regs-board-a9m9750dev.h b/arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h<br/>index afa3a9db3e1d..cd1593693f56 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/regs-board-a9m9750dev.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/regs-board-a9m9750dev.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/regs-board-a9m9750dev.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_REGSBOARDA9M9750_H</div><div class='ctx'> #define __ASM_ARCH_REGSBOARDA9M9750_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define FPGA_UARTA_BASE	io_p2v(NS9XXX_CSxSTAT_PHYS(0))</div><div class='ctx'> #define FPGA_UARTB_BASE	io_p2v(NS9XXX_CSxSTAT_PHYS(0) + 0x08)</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/regs-mem.h b/arch/arm/mach-ns9xxx/include/mach/regs-mem.h<br/>index fb455a0ed845..f1625bf8cdce 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/regs-mem.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/regs-mem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/regs-mem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/regs-mem.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/regs-mem.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/regs-mem.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_REGSMEM_H</div><div class='ctx'> #define __ASM_ARCH_REGSMEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Memory Module */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/regs-sys-common.h b/arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h<br/>index 956c57cb781f..14f91dfd5736 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/regs-sys-common.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/regs-sys-common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/regs-sys-common.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_REGSSYSCOMMON_H</div><div class='ctx'> #define __ASM_ARCH_REGSSYSCOMMON_H</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Interrupt Vector Address Register Level x */</div><div class='ctx'> #define SYS_IVA(x)	__REG2(0xa09000c4, (x))</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/regs-sys-ns9360.h b/arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h<br/>index 318b6945afb6..8ff254d9901c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/regs-sys-ns9360.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/regs-sys-ns9360.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/regs-sys-ns9360.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006,2007 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_REGSSYSNS9360_H</div><div class='ctx'> #define __ASM_ARCH_REGSSYSNS9360_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* System Control Module */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/system.h b/arch/arm/mach-ns9xxx/include/mach/system.h<br/>index 1348073afe48..e2068c57415f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/system.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006,2007 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='hunk'>@@ -12,8 +12,8 @@</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/proc-fns.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/processor.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/processor-ns9360.h&gt;</div><div class='add'>+#include &lt;mach/processor.h&gt;</div><div class='add'>+#include &lt;mach/processor-ns9360.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/timex.h b/arch/arm/mach-ns9xxx/include/mach/timex.h<br/>index f776cbd2622d..734a8d8bd578 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/timex.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005-2006 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #define __ASM_ARCH_TIMEX_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * value for CLOCK_TICK_RATE stolen from include/asm-arm/arch-s3c2410/timex.h.</div><div class='add'>+ * value for CLOCK_TICK_RATE stolen from arch/arm/mach-s3c2410/include/mach/timex.h.</div><div class='ctx'>  * See there for an explanation.</div><div class='ctx'>  */</div><div class='ctx'> #define CLOCK_TICK_RATE         12000000</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/uncompress.h b/arch/arm/mach-ns9xxx/include/mach/uncompress.h<br/>index 71066baceab7..5dbc3c5167c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/uncompress.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='head'>diff --git a/include/asm-arm/arch-ns9xxx/vmalloc.h b/arch/arm/mach-ns9xxx/include/mach/vmalloc.h<br/>index 2f3cb6f6be24..fe964d3bcc47 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-ns9xxx/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-ns9xxx/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-ns9xxx/vmalloc.h</div><div class='add'>+ * arch/arm/mach-ns9xxx/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 by Digi International Inc.</div><div class='ctx'>  * All rights reserved.</div><div class='head'>diff --git a/arch/arm/mach-ns9xxx/irq.c b/arch/arm/mach-ns9xxx/irq.c<br/>index ca85d24cf39f..38260d5f849b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ns9xxx/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/irq.c</a></div><div class='hunk'>@@ -12,10 +12,9 @@</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/regs-sys-common.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/irqs.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/board.h&gt;</div><div class='add'>+#include &lt;mach/regs-sys-common.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ns9xxx/mach-cc9p9360dev.c b/arch/arm/mach-ns9xxx/mach-cc9p9360dev.c<br/>index 9623fff6b3bc..2858417d8d8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/mach-cc9p9360dev.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ns9xxx/mach-cc9p9360dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/mach-cc9p9360dev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/mach-cc9p9360dev.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch-ns9xxx/processor-ns9360.h&gt;</div><div class='add'>+#include &lt;mach/processor-ns9360.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "board-a9m9750dev.h"</div><div class='ctx'> #include "generic.h"</div><div class='head'>diff --git a/arch/arm/mach-ns9xxx/mach-cc9p9360js.c b/arch/arm/mach-ns9xxx/mach-cc9p9360js.c<br/>index fcc815bdd291..729f68da4293 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/mach-cc9p9360js.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ns9xxx/mach-cc9p9360js.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/mach-cc9p9360js.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/mach-cc9p9360js.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch-ns9xxx/processor-ns9360.h&gt;</div><div class='add'>+#include &lt;mach/processor-ns9360.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "board-jscc9p9360.h"</div><div class='ctx'> #include "generic.h"</div><div class='head'>diff --git a/arch/arm/mach-ns9xxx/plat-serial8250.c b/arch/arm/mach-ns9xxx/plat-serial8250.c<br/>index 5aa5d9baf8c8..795b15e8982a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/plat-serial8250.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ns9xxx/plat-serial8250.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/plat-serial8250.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/plat-serial8250.c</a></div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch-ns9xxx/regs-board-a9m9750dev.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/board.h&gt;</div><div class='add'>+#include &lt;mach/regs-board-a9m9750dev.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME "serial8250"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ns9xxx/processor-ns9360.c b/arch/arm/mach-ns9xxx/processor-ns9360.c<br/>index 2bee0b7fccbb..abee8338735d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/processor-ns9360.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ns9xxx/processor-ns9360.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/processor-ns9360.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/processor-ns9360.c</a></div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/processor-ns9360.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/regs-sys-ns9360.h&gt;</div><div class='add'>+#include &lt;mach/processor-ns9360.h&gt;</div><div class='add'>+#include &lt;mach/regs-sys-ns9360.h&gt;</div><div class='ctx'> </div><div class='ctx'> void ns9360_reset(char mode)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-ns9xxx/time-ns9360.c b/arch/arm/mach-ns9xxx/time-ns9360.c<br/>index 4d573c9793ed..a63424d083d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/time-ns9360.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-ns9xxx/time-ns9360.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ns9xxx/time-ns9360.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-ns9xxx/time-ns9360.c</a></div><div class='hunk'>@@ -15,10 +15,10 @@</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch-ns9xxx/processor-ns9360.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/regs-sys-ns9360.h&gt;</div><div class='del'>-#include &lt;asm/arch-ns9xxx/irqs.h&gt;</div><div class='del'>-#include &lt;asm/arch/system.h&gt;</div><div class='add'>+#include &lt;mach/processor-ns9360.h&gt;</div><div class='add'>+#include &lt;mach/regs-sys-ns9360.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='add'>+#include &lt;mach/system.h&gt;</div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='ctx'> #define TIMER_CLOCKSOURCE 0</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c<br/>index 8b102ad59c14..2e618391cc51 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-ams-delta.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-ams-delta.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-ams-delta.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-ams-delta.c</a></div><div class='hunk'>@@ -17,18 +17,18 @@</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board-ams-delta.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/keypad.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='add'>+#include &lt;mach/board-ams-delta.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/keypad.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='ctx'> </div><div class='ctx'> static u8 ams_delta_latch1_reg;</div><div class='ctx'> static u16 ams_delta_latch2_reg;</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c<br/>index 1bdb66638e29..db789461fca4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-fsample.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-fsample.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-fsample.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-fsample.c</a></div><div class='hunk'>@@ -20,21 +20,21 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/fpga.h&gt;</div><div class='del'>-#include &lt;asm/arch/nand.h&gt;</div><div class='del'>-#include &lt;asm/arch/keypad.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/board-fsample.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/fpga.h&gt;</div><div class='add'>+#include &lt;mach/nand.h&gt;</div><div class='add'>+#include &lt;mach/keypad.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/board-fsample.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int fsample_keymap[] = {</div><div class='ctx'> 	KEY(0,0,KEY_UP),</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c<br/>index c711bf23f7b4..7d2670205373 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-generic.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-generic.c</a></div><div class='hunk'>@@ -17,16 +17,16 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void __init omap_generic_init_irq(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c<br/>index 6fdc78406b21..ab9ee5820c48 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-h2-mmc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-h2-mmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-h2-mmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-h2-mmc.c</a></div><div class='hunk'>@@ -12,8 +12,8 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMC_OMAP</div><div class='ctx'> static int slot_cover_open;</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c<br/>index 4b444fdaafea..3b65914b9141 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-h2.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-h2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-h2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-h2.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/i2c/tps65010.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='hunk'>@@ -37,16 +37,16 @@</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio-switch.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='del'>-#include &lt;asm/arch/nand.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='del'>-#include &lt;asm/arch/keypad.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcbsp.h&gt;</div><div class='del'>-#include &lt;asm/arch/omap-alsa.h&gt;</div><div class='add'>+#include &lt;mach/gpio-switch.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='add'>+#include &lt;mach/nand.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='add'>+#include &lt;mach/keypad.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/mcbsp.h&gt;</div><div class='add'>+#include &lt;mach/omap-alsa.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int h2_keymap[] = {</div><div class='ctx'> 	KEY(0, 0, KEY_LEFT),</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-h3-mmc.c b/arch/arm/mach-omap1/board-h3-mmc.c<br/>index 66ecc437928f..36085819098c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-h3-mmc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-h3-mmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-h3-mmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-h3-mmc.c</a></div><div class='hunk'>@@ -12,8 +12,8 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMC_OMAP</div><div class='ctx'> static int slot_cover_open;</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c<br/>index 7fbaa8d648cd..2ced6d9984d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-h3.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-h3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-h3.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-h3.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='hunk'>@@ -39,18 +39,18 @@</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpioexpander.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='del'>-#include &lt;asm/arch/nand.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='del'>-#include &lt;asm/arch/keypad.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcbsp.h&gt;</div><div class='del'>-#include &lt;asm/arch/omap-alsa.h&gt;</div><div class='add'>+#include &lt;mach/gpioexpander.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='add'>+#include &lt;mach/nand.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='add'>+#include &lt;mach/keypad.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/mcbsp.h&gt;</div><div class='add'>+#include &lt;mach/omap-alsa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define H3_TS_GPIO	48</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c<br/>index 4b8ae3ee0d05..cbc11be5cd2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-innovator.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-innovator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-innovator.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-innovator.c</a></div><div class='hunk'>@@ -24,21 +24,21 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/fpga.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='del'>-#include &lt;asm/arch/keypad.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcbsp.h&gt;</div><div class='del'>-#include &lt;asm/arch/omap-alsa.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/fpga.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='add'>+#include &lt;mach/keypad.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/mcbsp.h&gt;</div><div class='add'>+#include &lt;mach/omap-alsa.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int innovator_keymap[] = {</div><div class='ctx'> 	KEY(0, 0, KEY_F1),</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c<br/>index 3f39e0e79c9f..38d9783ac6d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-nokia770.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-nokia770.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-nokia770.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-nokia770.c</a></div><div class='hunk'>@@ -20,21 +20,21 @@</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/keypad.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/dsp_common.h&gt;</div><div class='del'>-#include &lt;asm/arch/aic23.h&gt;</div><div class='del'>-#include &lt;asm/arch/omapfb.h&gt;</div><div class='del'>-#include &lt;asm/arch/lcd_mipid.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/keypad.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/dsp_common.h&gt;</div><div class='add'>+#include &lt;mach/aic23.h&gt;</div><div class='add'>+#include &lt;mach/omapfb.h&gt;</div><div class='add'>+#include &lt;mach/lcd_mipid.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define ADS7846_PENDOWN_GPIO	15</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c<br/>index 41f94f6fc15c..3e766e49f7cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-osk.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-osk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-osk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-osk.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/i2c/tps65010.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='hunk'>@@ -47,12 +47,12 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcbsp.h&gt;</div><div class='del'>-#include &lt;asm/arch/omap-alsa.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/mcbsp.h&gt;</div><div class='add'>+#include &lt;mach/omap-alsa.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct mtd_partition osk_partitions[] = {</div><div class='ctx'> 	/* bootloader (U-Boot, etc) in first sector */</div><div class='hunk'>@@ -340,7 +340,7 @@ static struct omap_board_config_kernel osk_config[] __initdata = {</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spi/ads7846.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/keypad.h&gt;</div><div class='add'>+#include &lt;mach/keypad.h&gt;</div><div class='ctx'> </div><div class='ctx'> static const int osk_keymap[] = {</div><div class='ctx'> 	/* KEY(col, row, code) */</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c<br/>index a4d20127a60e..b58043644a6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-palmte.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-palmte.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-palmte.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-palmte.c</a></div><div class='hunk'>@@ -27,23 +27,23 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/apm-emulation.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/keypad.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcbsp.h&gt;</div><div class='del'>-#include &lt;asm/arch/omap-alsa.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/keypad.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/mcbsp.h&gt;</div><div class='add'>+#include &lt;mach/omap-alsa.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void __init omap_palmte_init_irq(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c<br/>index 2a033689f9f4..40f9860a09df 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-palmtt.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-palmtt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-palmtt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-palmtt.c</a></div><div class='hunk'>@@ -23,24 +23,24 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/led.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcbsp.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/keypad.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/omap-alsa.h&gt;</div><div class='add'>+#include &lt;mach/led.h&gt;</div><div class='add'>+#include &lt;mach/mcbsp.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/keypad.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/omap-alsa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spi/ads7846.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c<br/>index 34389b63b0ec..e719294250b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-palmz71.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-palmz71.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-palmz71.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-palmz71.c</a></div><div class='hunk'>@@ -26,23 +26,23 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mcbsp.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/keypad.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/omap-alsa.h&gt;</div><div class='add'>+#include &lt;mach/mcbsp.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/keypad.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/omap-alsa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spi/ads7846.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c<br/>index 94bc0745ab2c..b715917bfdaf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-perseus2.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-perseus2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-perseus2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-perseus2.c</a></div><div class='hunk'>@@ -20,20 +20,20 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/fpga.h&gt;</div><div class='del'>-#include &lt;asm/arch/nand.h&gt;</div><div class='del'>-#include &lt;asm/arch/keypad.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/fpga.h&gt;</div><div class='add'>+#include &lt;mach/nand.h&gt;</div><div class='add'>+#include &lt;mach/keypad.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int p2_keymap[] = {</div><div class='ctx'> 	KEY(0,0,KEY_UP),</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-sx1-mmc.c b/arch/arm/mach-omap1/board-sx1-mmc.c<br/>index 8c93d47719e8..0be4ebaa2842 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-sx1-mmc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-sx1-mmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-sx1-mmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-sx1-mmc.c</a></div><div class='hunk'>@@ -12,9 +12,9 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMC_OMAP</div><div class='ctx'> static int slot_cover_open;</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c<br/>index e473fa6d4a5f..130bcc6fd082 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-sx1.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-sx1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-sx1.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-sx1.c</a></div><div class='hunk'>@@ -26,22 +26,22 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcbsp.h&gt;</div><div class='del'>-#include &lt;asm/arch/omap-alsa.h&gt;</div><div class='del'>-#include &lt;asm/arch/keypad.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/mcbsp.h&gt;</div><div class='add'>+#include &lt;mach/omap-alsa.h&gt;</div><div class='add'>+#include &lt;mach/keypad.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Write to I2C device */</div><div class='ctx'> int sx1_i2c_write_byte(u8 devaddr, u8 regoffset, u8 value)</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c<br/>index 8948d45a2769..213b48787102 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-voiceblue.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/board-voiceblue.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-voiceblue.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/board-voiceblue.c</a></div><div class='hunk'>@@ -22,17 +22,17 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct plat_serial8250_port voiceblue_ports[] = {</div><div class='ctx'> 	{</div><div class='head'>diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c<br/>index 4ea2933f887d..5965cf09f8c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/clock.c</a></div><div class='hunk'>@@ -21,10 +21,10 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/sram.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='add'>+#include &lt;mach/sram.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "clock.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c<br/>index da8a3ac47e13..ab708d4c597e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/devices.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/devices.c</a></div><div class='hunk'>@@ -14,15 +14,14 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c<br/>index d963125ed755..4449d86095f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/fpga.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/fpga.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/fpga.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/fpga.c</a></div><div class='hunk'>@@ -22,13 +22,13 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/fpga.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/fpga.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void fpga_mask_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c<br/>index 81c4e738506c..2b9750b200ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/io.c</a></div><div class='hunk'>@@ -15,8 +15,8 @@</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern int omap1_clk_init(void);</div><div class='ctx'> extern void omap_check_revision(void);</div><div class='head'>diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c<br/>index 1da9d59a0347..0ec6c1ec4250 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/irq.c</a></div><div class='hunk'>@@ -41,11 +41,11 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/leds-h2p2-debug.c b/arch/arm/mach-omap1/leds-h2p2-debug.c<br/>index 8976fbb21f7c..610f51f18741 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/leds-h2p2-debug.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/leds-h2p2-debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/leds-h2p2-debug.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/leds-h2p2-debug.c</a></div><div class='hunk'>@@ -14,13 +14,13 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/fpga.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/fpga.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "leds.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/leds-innovator.c b/arch/arm/mach-omap1/leds-innovator.c<br/>index e7835d6f53a0..9b99c2894623 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/leds-innovator.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/leds-innovator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/leds-innovator.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/leds-innovator.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c<br/>index 754383dde807..98e789622dfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/leds-osk.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/leds-osk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/leds-osk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/leds-osk.c</a></div><div class='hunk'>@@ -5,11 +5,11 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "leds.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/leds.c b/arch/arm/mach-omap1/leds.c<br/>index 3f9dcac4fd41..6cdad93c4a00 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/leds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/leds.c</a></div><div class='hunk'>@@ -9,8 +9,8 @@</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "leds.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c<br/>index bad1e7152d8e..af44eab1ed24 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/mailbox.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/mailbox.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/mailbox.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/mailbox.c</a></div><div class='hunk'>@@ -13,8 +13,8 @@</div><div class='ctx'> #include &lt;linux/resource.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/arch/mailbox.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/mailbox.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MAILBOX_ARM2DSP1		0x00</div><div class='head'>diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c<br/>index 2d2c2522b048..2baeaeb0c900 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/mcbsp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/mcbsp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/mcbsp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/mcbsp.c</a></div><div class='hunk'>@@ -17,11 +17,11 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcbsp.h&gt;</div><div class='del'>-#include &lt;asm/arch/dsp_common.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='add'>+#include &lt;mach/mcbsp.h&gt;</div><div class='add'>+#include &lt;mach/dsp_common.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DPS_RSTCT2_PER_EN	(1 &lt;&lt; 0)</div><div class='ctx'> #define DSP_RSTCT2_WD_PER_EN	(1 &lt;&lt; 1)</div><div class='hunk'>@@ -159,6 +159,7 @@ static struct omap_mcbsp_ops omap1_mcbsp_ops = {</div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP730</div><div class='ctx'> static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = {</div><div class='ctx'> 	{</div><div class='add'>+		.phys_base	= OMAP730_MCBSP1_BASE,</div><div class='ctx'> 		.virt_base	= io_p2v(OMAP730_MCBSP1_BASE),</div><div class='ctx'> 		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,</div><div class='hunk'>@@ -167,6 +168,7 @@ static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = {</div><div class='ctx'> 		.ops		= &amp;omap1_mcbsp_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.phys_base	= OMAP730_MCBSP2_BASE,</div><div class='ctx'> 		.virt_base	= io_p2v(OMAP730_MCBSP2_BASE),</div><div class='ctx'> 		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,</div><div class='hunk'>@@ -184,6 +186,7 @@ static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = {</div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP15XX</div><div class='ctx'> static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {</div><div class='ctx'> 	{</div><div class='add'>+		.phys_base	= OMAP1510_MCBSP1_BASE,</div><div class='ctx'> 		.virt_base	= OMAP1510_MCBSP1_BASE,</div><div class='ctx'> 		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,</div><div class='hunk'>@@ -193,6 +196,7 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {</div><div class='ctx'> 		.clk_name	= "mcbsp_clk",</div><div class='ctx'> 		},</div><div class='ctx'> 	{</div><div class='add'>+		.phys_base	= OMAP1510_MCBSP2_BASE,</div><div class='ctx'> 		.virt_base	= io_p2v(OMAP1510_MCBSP2_BASE),</div><div class='ctx'> 		.dma_rx_sync	= OMAP_DMA_MCBSP2_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP_DMA_MCBSP2_TX,</div><div class='hunk'>@@ -201,6 +205,7 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {</div><div class='ctx'> 		.ops		= &amp;omap1_mcbsp_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.phys_base	= OMAP1510_MCBSP3_BASE,</div><div class='ctx'> 		.virt_base	= OMAP1510_MCBSP3_BASE,</div><div class='ctx'> 		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,</div><div class='hunk'>@@ -219,6 +224,7 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {</div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP16XX</div><div class='ctx'> static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {</div><div class='ctx'> 	{</div><div class='add'>+		.phys_base	= OMAP1610_MCBSP1_BASE,</div><div class='ctx'> 		.virt_base	= OMAP1610_MCBSP1_BASE,</div><div class='ctx'> 		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,</div><div class='hunk'>@@ -228,6 +234,7 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {</div><div class='ctx'> 		.clk_name	= "mcbsp_clk",</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.phys_base	= OMAP1610_MCBSP2_BASE,</div><div class='ctx'> 		.virt_base	= io_p2v(OMAP1610_MCBSP2_BASE),</div><div class='ctx'> 		.dma_rx_sync	= OMAP_DMA_MCBSP2_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP_DMA_MCBSP2_TX,</div><div class='hunk'>@@ -236,6 +243,7 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {</div><div class='ctx'> 		.ops		= &amp;omap1_mcbsp_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.phys_base	= OMAP1610_MCBSP3_BASE,</div><div class='ctx'> 		.virt_base	= OMAP1610_MCBSP3_BASE,</div><div class='ctx'> 		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,</div><div class='head'>diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c<br/>index e207bf7cb853..898516e362e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/mux.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/mux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/mux.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/mux.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_OMAP_MUX</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c<br/>index 742f79e73bd7..63c4ea18b1ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/pm.c</a></div><div class='hunk'>@@ -47,17 +47,16 @@</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/sram.h&gt;</div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='del'>-#include &lt;asm/arch/pm.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/dmtimer.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='add'>+#include &lt;mach/sram.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='add'>+#include &lt;mach/dmtimer.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE];</div><div class='ctx'> static unsigned short dsp_sleep_save[DSP_SLEEP_SAVE_SIZE];</div><div class='head'>diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c<br/>index 10a4fe88b2fd..0e25a996bb4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/serial.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/serial.c</a></div><div class='hunk'>@@ -22,12 +22,12 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/fpga.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/fpga.h&gt;</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-#include &lt;asm/arch/pm.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct clk * uart1_ck;</div><div class='head'>diff --git a/arch/arm/mach-omap1/sleep.S b/arch/arm/mach-omap1/sleep.S<br/>index 68f5b39030b6..f3eac932092d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/sleep.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/sleep.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/sleep.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/sleep.S</a></div><div class='hunk'>@@ -34,8 +34,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/arch/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/pm.h&gt;</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.text</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/sram.S b/arch/arm/mach-omap1/sram.S<br/>index 126d252062d7..261cdc48228b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/sram.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/sram.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/sram.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/sram.S</a></div><div class='hunk'>@@ -10,8 +10,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/arch/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c<br/>index 5d2b270935a2..e54708595ecf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/time.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c<br/>index fbbdb806c95a..e67760189d14 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/timer32k.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap1/timer32k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/timer32k.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap1/timer32k.c</a></div><div class='hunk'>@@ -46,13 +46,13 @@</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/arch/dmtimer.h&gt;</div><div class='add'>+#include &lt;mach/dmtimer.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct sys_timer omap_timer;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c<br/>index 1682eb77c46d..b72ca13b3acb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-2430sdp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/board-2430sdp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-2430sdp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/board-2430sdp.c</a></div><div class='hunk'>@@ -22,17 +22,17 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpmc.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/gpmc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -103,7 +103,7 @@ static struct resource sdp2430_smc91x_resources[] = {</div><div class='ctx'> 	[1] = {</div><div class='ctx'> 		.start	= OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ),</div><div class='ctx'> 		.end	= OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ),</div><div class='del'>-		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='add'>+		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c<br/>index 870b34972d3b..989ad152d7f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-apollon.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/board-apollon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-apollon.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/board-apollon.c</a></div><div class='hunk'>@@ -29,19 +29,19 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/led.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/control.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/led.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/gpmc.h&gt;</div><div class='add'>+#include &lt;mach/control.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* LED &amp; Switch macros */</div><div class='ctx'> #define LED0_GPIO13		13</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c<br/>index df8be081e159..9ba097868e72 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-generic.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/board-generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/board-generic.c</a></div><div class='hunk'>@@ -20,16 +20,16 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void __init omap_generic_init_irq(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c<br/>index 0d28f6897c8e..9e2624ca70a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-h4.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/board-h4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-h4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/board-h4.c</a></div><div class='hunk'>@@ -22,24 +22,24 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/control.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpioexpander.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/keypad.h&gt;</div><div class='del'>-#include &lt;asm/arch/menelaus.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpmc.h&gt;</div><div class='add'>+#include &lt;mach/control.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/gpioexpander.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/keypad.h&gt;</div><div class='add'>+#include &lt;mach/menelaus.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='add'>+#include &lt;mach/gpmc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c<br/>index 15675bce8012..1d891e4a6933 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/clock.c</a></div><div class='hunk'>@@ -25,9 +25,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/sram.h&gt;</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='add'>+#include &lt;mach/sram.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "memory.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h<br/>index 3cd37cb57c5a..626e5fa93b6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/clock.h</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #ifndef __ARCH_ARM_MACH_OMAP2_CLOCK_H</div><div class='ctx'> #define __ARCH_ARM_MACH_OMAP2_CLOCK_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* The maximum error between a target DPLL rate and the rounded rate in Hz */</div><div class='ctx'> #define DEFAULT_DPLL_RATE_TOLERANCE	50000</div><div class='head'>diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c<br/>index aa567876651d..295e671e9cfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock24xx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/clock24xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock24xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/clock24xx.c</a></div><div class='hunk'>@@ -28,8 +28,8 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/sram.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='add'>+#include &lt;mach/sram.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> #include &lt;asm/bitops.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c<br/>index 4263099b1ad3..3ff74952f835 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock34xx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/clock34xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock34xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/clock34xx.c</a></div><div class='hunk'>@@ -26,8 +26,8 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/limits.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/sram.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='add'>+#include &lt;mach/sram.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> #include &lt;asm/bitops.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h<br/>index 05757eb032bc..ec664457a11a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock34xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/clock34xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock34xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/clock34xx.h</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #ifndef __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H</div><div class='ctx'> #define __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/control.h&gt;</div><div class='add'>+#include &lt;mach/control.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "clock.h"</div><div class='ctx'> #include "cm.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c<br/>index 51f70300996f..5f3aad977842 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/control.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/control.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/control.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/control.c</a></div><div class='hunk'>@@ -15,8 +15,8 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/control.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/control.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void __iomem *omap2_ctrl_base;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c<br/>index b603bc5f8e5b..7a7f02559075 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/devices.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/devices.c</a></div><div class='hunk'>@@ -14,15 +14,15 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if	defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)</div><div class='ctx'> </div><div class='hunk'>@@ -142,7 +142,7 @@ static inline void omap_init_sti(void) {}</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SPI_OMAP24XX)</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mcspi.h&gt;</div><div class='add'>+#include &lt;mach/mcspi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define OMAP2_MCSPI1_BASE		0x48098000</div><div class='ctx'> #define OMAP2_MCSPI2_BASE		0x4809a000</div><div class='head'>diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c<br/>index dbf68dc50ae2..f51d69bc457d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/gpmc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/gpmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/gpmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/gpmc.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpmc.h&gt;</div><div class='add'>+#include &lt;mach/gpmc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c<br/>index dff4b16cead6..a5d4526ac4d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/id.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/id.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/id.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/id.c</a></div><div class='hunk'>@@ -17,8 +17,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/control.h&gt;</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='add'>+#include &lt;mach/control.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ARCH_OMAP2420)</div><div class='ctx'> #define TAP_BASE	io_p2v(0x48014000)</div><div class='head'>diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c<br/>index 69c8174f3aac..987351f07d7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/io.c</a></div><div class='hunk'>@@ -21,8 +21,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/omapfb.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/omapfb.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void omap_sram_init(void);</div><div class='ctx'> extern int omap2_clk_init(void);</div><div class='head'>diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c<br/>index f064f725e724..9ef15b31d8fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/irq.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c<br/>index 4799561c5a9e..a480b96948e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/mailbox.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/mailbox.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/mailbox.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/mailbox.c</a></div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/arch/mailbox.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/mailbox.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MAILBOX_REVISION		0x00</div><div class='head'>diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c<br/>index 17cf199d1130..b261f1f80b5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/mcbsp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/mcbsp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/mcbsp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/mcbsp.c</a></div><div class='hunk'>@@ -17,10 +17,10 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcbsp.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='add'>+#include &lt;mach/mcbsp.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct mcbsp_internal_clk {</div><div class='ctx'> 	struct clk clk;</div><div class='hunk'>@@ -134,6 +134,7 @@ static struct omap_mcbsp_ops omap2_mcbsp_ops = {</div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP24XX</div><div class='ctx'> static struct omap_mcbsp_platform_data omap24xx_mcbsp_pdata[] = {</div><div class='ctx'> 	{</div><div class='add'>+		.phys_base	= OMAP24XX_MCBSP1_BASE,</div><div class='ctx'> 		.virt_base	= IO_ADDRESS(OMAP24XX_MCBSP1_BASE),</div><div class='ctx'> 		.dma_rx_sync	= OMAP24XX_DMA_MCBSP1_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP1_TX,</div><div class='hunk'>@@ -143,6 +144,7 @@ static struct omap_mcbsp_platform_data omap24xx_mcbsp_pdata[] = {</div><div class='ctx'> 		.clk_name	= "mcbsp_clk",</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.phys_base	= OMAP24XX_MCBSP2_BASE,</div><div class='ctx'> 		.virt_base	= IO_ADDRESS(OMAP24XX_MCBSP2_BASE),</div><div class='ctx'> 		.dma_rx_sync	= OMAP24XX_DMA_MCBSP2_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP2_TX,</div><div class='hunk'>@@ -161,6 +163,7 @@ static struct omap_mcbsp_platform_data omap24xx_mcbsp_pdata[] = {</div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP34XX</div><div class='ctx'> static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {</div><div class='ctx'> 	{</div><div class='add'>+		.phys_base	= OMAP34XX_MCBSP1_BASE,</div><div class='ctx'> 		.virt_base	= IO_ADDRESS(OMAP34XX_MCBSP1_BASE),</div><div class='ctx'> 		.dma_rx_sync	= OMAP24XX_DMA_MCBSP1_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP1_TX,</div><div class='hunk'>@@ -170,6 +173,7 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {</div><div class='ctx'> 		.clk_name	= "mcbsp_clk",</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.phys_base	= OMAP34XX_MCBSP2_BASE,</div><div class='ctx'> 		.virt_base	= IO_ADDRESS(OMAP34XX_MCBSP2_BASE),</div><div class='ctx'> 		.dma_rx_sync	= OMAP24XX_DMA_MCBSP2_RX,</div><div class='ctx'> 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP2_TX,</div><div class='head'>diff --git a/arch/arm/mach-omap2/memory.c b/arch/arm/mach-omap2/memory.c<br/>index 73cadb2c75cf..6b49cc9cbdcb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/memory.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/memory.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/memory.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/memory.c</a></div><div class='hunk'>@@ -24,9 +24,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/sram.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='add'>+#include &lt;mach/sram.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "prm.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c<br/>index 8f98b20f30a1..443d07fef7f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/mux.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/mux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/mux.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/mux.c</a></div><div class='hunk'>@@ -29,8 +29,8 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/control.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='add'>+#include &lt;mach/control.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_OMAP_MUX</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c<br/>index d6c9de82ca0c..8671e1079ab5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/pm.c</a></div><div class='hunk'>@@ -30,12 +30,11 @@</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/sram.h&gt;</div><div class='del'>-#include &lt;asm/arch/pm.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='add'>+#include &lt;mach/sram.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct clk *vclk;</div><div class='ctx'> static void (*omap2_sram_idle)(void);</div><div class='head'>diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c<br/>index fd92a80f38f2..f945156d5585 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prcm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/prcm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prcm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/prcm.c</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/prcm.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/prcm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "clock.h"</div><div class='ctx'> #include "prm.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/sdrc.h b/arch/arm/mach-omap2/sdrc.h<br/>index 1b1fe4f6e030..1a8bbd094066 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sdrc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/sdrc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sdrc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/sdrc.h</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/sdrc.h&gt;</div><div class='add'>+#include &lt;mach/sdrc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLER__</div><div class='ctx'> extern void __iomem *omap2_sdrc_base;</div><div class='head'>diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c<br/>index e9c367fc9f61..adc8a26a8fb0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/serial.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/serial.c</a></div><div class='hunk'>@@ -20,8 +20,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct clk * uart1_ick = NULL;</div><div class='ctx'> static struct clk * uart1_fck = NULL;</div><div class='head'>diff --git a/arch/arm/mach-omap2/sleep.S b/arch/arm/mach-omap2/sleep.S<br/>index 46ccb9b8b583..87a706fd5f82 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sleep.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/sleep.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sleep.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/sleep.S</a></div><div class='hunk'>@@ -23,8 +23,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/arch/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/pm.h&gt;</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sdrc.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/sram242x.S b/arch/arm/mach-omap2/sram242x.S<br/>index 4c274510f3e9..af4bd3490227 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sram242x.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/sram242x.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sram242x.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/sram242x.S</a></div><div class='hunk'>@@ -24,8 +24,8 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/arch/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "prm.h"</div><div class='ctx'> #include "cm.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/sram243x.S b/arch/arm/mach-omap2/sram243x.S<br/>index a3fa48dc08cd..84363e269e8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sram243x.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/sram243x.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sram243x.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/sram243x.S</a></div><div class='hunk'>@@ -24,8 +24,8 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/arch/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "prm.h"</div><div class='ctx'> #include "cm.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c<br/>index 557603f99313..589393bedade 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/timer-gp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/timer-gp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/timer-gp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/timer-gp.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/arch/dmtimer.h&gt;</div><div class='add'>+#include &lt;mach/dmtimer.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct omap_dm_timer *gptimer;</div><div class='ctx'> static struct clock_event_device clockevent_gpt;</div><div class='head'>diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c<br/>index 80bb42eb5082..10ef464d6be7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/usb-tusb6010.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-omap2/usb-tusb6010.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/usb-tusb6010.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-omap2/usb-tusb6010.c</a></div><div class='hunk'>@@ -15,9 +15,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/usb/musb.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='add'>+#include &lt;mach/gpmc.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static u8		async_cs, sync_cs;</div><div class='hunk'>@@ -317,7 +317,6 @@ tusb6010_setup_interface(struct musb_hdrc_platform_data *data,</div><div class='ctx'> 		printk(error, 6, status);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	data-&gt;multipoint = 1;</div><div class='ctx'> 	tusb_device.dev.platform_data = data;</div><div class='ctx'> </div><div class='ctx'> 	/* REVISIT let the driver know what DMA channels work */</div><div class='head'>diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c<br/>index 6f0dbda6c44c..bea37972120a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/addr-map.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/addr-map.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/addr-map.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/addr-map.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c<br/>index faf4e3211918..7b11e552bc5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/common.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/common.c</a></div><div class='hunk'>@@ -24,11 +24,12 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/ehci-orion.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/orion_nand.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/time.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='add'>+#include &lt;plat/ehci-orion.h&gt;</div><div class='add'>+#include &lt;plat/mv_xor.h&gt;</div><div class='add'>+#include &lt;plat/orion_nand.h&gt;</div><div class='add'>+#include &lt;plat/time.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -355,6 +356,103 @@ void __init orion5x_uart1_init(void)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='add'>+ * XOR engine</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+static struct resource orion5x_xor_shared_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "xor low",</div><div class='add'>+		.start	= ORION5X_XOR_PHYS_BASE,</div><div class='add'>+		.end	= ORION5X_XOR_PHYS_BASE + 0xff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.name	= "xor high",</div><div class='add'>+		.start	= ORION5X_XOR_PHYS_BASE + 0x200,</div><div class='add'>+		.end	= ORION5X_XOR_PHYS_BASE + 0x2ff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device orion5x_xor_shared = {</div><div class='add'>+	.name		= MV_XOR_SHARED_NAME,</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(orion5x_xor_shared_resources),</div><div class='add'>+	.resource	= orion5x_xor_shared_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 orion5x_xor_dmamask = DMA_32BIT_MASK;</div><div class='add'>+</div><div class='add'>+static struct resource orion5x_xor0_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= IRQ_ORION5X_XOR0,</div><div class='add'>+		.end	= IRQ_ORION5X_XOR0,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mv_xor_platform_data orion5x_xor0_data = {</div><div class='add'>+	.shared		= &amp;orion5x_xor_shared,</div><div class='add'>+	.hw_id		= 0,</div><div class='add'>+	.pool_size	= PAGE_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device orion5x_xor0_channel = {</div><div class='add'>+	.name		= MV_XOR_NAME,</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(orion5x_xor0_resources),</div><div class='add'>+	.resource	= orion5x_xor0_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.dma_mask		= &amp;orion5x_xor_dmamask,</div><div class='add'>+		.coherent_dma_mask	= DMA_64BIT_MASK,</div><div class='add'>+		.platform_data		= (void *)&amp;orion5x_xor0_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource orion5x_xor1_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= IRQ_ORION5X_XOR1,</div><div class='add'>+		.end	= IRQ_ORION5X_XOR1,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mv_xor_platform_data orion5x_xor1_data = {</div><div class='add'>+	.shared		= &amp;orion5x_xor_shared,</div><div class='add'>+	.hw_id		= 1,</div><div class='add'>+	.pool_size	= PAGE_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device orion5x_xor1_channel = {</div><div class='add'>+	.name		= MV_XOR_NAME,</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(orion5x_xor1_resources),</div><div class='add'>+	.resource	= orion5x_xor1_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.dma_mask		= &amp;orion5x_xor_dmamask,</div><div class='add'>+		.coherent_dma_mask	= DMA_64BIT_MASK,</div><div class='add'>+		.platform_data		= (void *)&amp;orion5x_xor1_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init orion5x_xor_init(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_register(&amp;orion5x_xor_shared);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * two engines can't do memset simultaneously, this limitation</div><div class='add'>+	 * satisfied by removing memset support from one of the engines.</div><div class='add'>+	 */</div><div class='add'>+	dma_cap_set(DMA_MEMCPY, orion5x_xor0_data.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_XOR, orion5x_xor0_data.cap_mask);</div><div class='add'>+	platform_device_register(&amp;orion5x_xor0_channel);</div><div class='add'>+</div><div class='add'>+	dma_cap_set(DMA_MEMCPY, orion5x_xor1_data.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_MEMSET, orion5x_xor1_data.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_XOR, orion5x_xor1_data.cap_mask);</div><div class='add'>+	platform_device_register(&amp;orion5x_xor1_channel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='ctx'>  * Time handling</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> static void orion5x_timer_init(void)</div><div class='hunk'>@@ -382,6 +480,8 @@ static void __init orion5x_id(u32 *dev, u32 *rev, char **dev_name)</div><div class='ctx'> 			*dev_name = "MV88F5281-D2";</div><div class='ctx'> 		} else if (*rev == MV88F5281_REV_D1) {</div><div class='ctx'> 			*dev_name = "MV88F5281-D1";</div><div class='add'>+		} else if (*rev == MV88F5281_REV_D0) {</div><div class='add'>+			*dev_name = "MV88F5281-D0";</div><div class='ctx'> 		} else {</div><div class='ctx'> 			*dev_name = "MV88F5281-Rev-Unsupported";</div><div class='ctx'> 		}</div><div class='hunk'>@@ -416,6 +516,15 @@ void __init orion5x_init(void)</div><div class='ctx'> 	 * Setup Orion address map</div><div class='ctx'> 	 */</div><div class='ctx'> 	orion5x_setup_cpu_mbus_bridge();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Don't issue "Wait for Interrupt" instruction if we are</div><div class='add'>+	 * running on D0 5281 silicon.</div><div class='add'>+	 */</div><div class='add'>+	if (dev == MV88F5281_DEV_ID &amp;&amp; rev == MV88F5281_REV_D0) {</div><div class='add'>+		printk(KERN_INFO "Orion: Applying 5281 D0 WFI workaround.\n");</div><div class='add'>+		disable_hlt();</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h<br/>index f72cf0e77544..0bd195551a27 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/common.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/common.h</a></div><div class='hunk'>@@ -32,6 +32,7 @@ void orion5x_i2c_init(void);</div><div class='ctx'> void orion5x_sata_init(struct mv_sata_platform_data *sata_data);</div><div class='ctx'> void orion5x_uart0_init(void);</div><div class='ctx'> void orion5x_uart1_init(void);</div><div class='add'>+void orion5x_xor_init(void);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PCIe/PCI functions.</div><div class='hunk'>@@ -40,6 +41,7 @@ struct pci_bus;</div><div class='ctx'> struct pci_sys_data;</div><div class='ctx'> </div><div class='ctx'> void orion5x_pcie_id(u32 *dev, u32 *rev);</div><div class='add'>+void orion5x_pci_disable(void);</div><div class='ctx'> void orion5x_pci_set_cardbus_mode(void);</div><div class='ctx'> int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys);</div><div class='ctx'> struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys);</div><div class='head'>diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c<br/>index 40a0bee4fbb3..ff13e9060b18 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/db88f5281-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/db88f5281-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/db88f5281-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/db88f5281-setup.c</a></div><div class='hunk'>@@ -24,8 +24,8 @@</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/orion_nand.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='add'>+#include &lt;plat/orion_nand.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "mpp.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c<br/>index 3791ca6f001a..b38c65ccfb15 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/dns323-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/dns323-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/dns323-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/dns323-setup.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "mpp.h"</div><div class='ctx'> </div><div class='hunk'>@@ -245,12 +245,8 @@ static struct orion5x_mpp_mode dns323_mpp_modes[] __initdata = {</div><div class='ctx'> static struct i2c_board_info __initdata dns323_i2c_devices[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		I2C_BOARD_INFO("g760a", 0x3e),</div><div class='del'>-#if 0</div><div class='del'>-	/* this entry requires the new-style driver model lm75 driver,</div><div class='del'>-	 * for the meantime "insmod lm75.ko force_lm75=0,0x48" is needed */</div><div class='ctx'> 	}, {</div><div class='del'>-		I2C_BOARD_INFO("g751", 0x48),</div><div class='del'>-#endif</div><div class='add'>+		I2C_BOARD_INFO("lm75", 0x48),</div><div class='ctx'> 	}, {</div><div class='ctx'> 		I2C_BOARD_INFO("m41t80", 0x68),</div><div class='ctx'> 	},</div><div class='head'>diff --git a/arch/arm/mach-orion5x/gpio.c b/arch/arm/mach-orion5x/gpio.c<br/>index d09797990f41..cd8a16f67d2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/gpio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/gpio.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(gpio_lock);</div><div class='head'>diff --git a/include/asm-arm/arch-orion5x/debug-macro.S b/arch/arm/mach-orion5x/include/mach/debug-macro.S<br/>index 4f98f3ba2929..c7f808bfe272 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-orion5x/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-orion5x/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-orion5x/debug-macro.S</div><div class='add'>+ * arch/arm/mach-orion5x/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro  addruart,rx</div><div class='ctx'> 	mrc	p15, 0, \rx, c1, c0</div><div class='head'>diff --git a/include/asm-arm/arch-orion5x/dma.h b/arch/arm/mach-orion5x/include/mach/dma.h<br/>index 40a8c178f10d..40a8c178f10d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-orion5x/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-orion5x/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/dma.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-orion5x/entry-macro.S b/arch/arm/mach-orion5x/include/mach/entry-macro.S<br/>index d8ef54c0ee9a..4351937035cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-orion5x/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-orion5x/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-orion5x/entry-macro.S</div><div class='add'>+ * arch/arm/mach-orion5x/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for Orion platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro  disable_fiq</div><div class='ctx'> 	.endm</div><div class='head'>diff --git a/include/asm-arm/arch-orion5x/gpio.h b/arch/arm/mach-orion5x/include/mach/gpio.h<br/>index c85e498388b6..65dc136a86f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-orion5x/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-orion5x/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/gpio.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-orion5x/gpio.h</div><div class='add'>+ * arch/arm/mach-orion5x/include/mach/gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='head'>diff --git a/include/asm-arm/arch-orion5x/hardware.h b/arch/arm/mach-orion5x/include/mach/hardware.h<br/>index 5d2d8e0b5630..e51aaf4bf2b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-orion5x/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-orion5x/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-orion5x/hardware.h</div><div class='add'>+ * arch/arm/mach-orion5x/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='head'>diff --git a/include/asm-arm/arch-orion5x/io.h b/arch/arm/mach-orion5x/include/mach/io.h<br/>index 59f1bc96a23b..f24b2513f7f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-orion5x/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-orion5x/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-orion5x/io.h</div><div class='add'>+ * arch/arm/mach-orion5x/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Tzachi Perelstein &lt;tzachi@marvell.com&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-orion5x/irqs.h b/arch/arm/mach-orion5x/include/mach/irqs.h<br/>index abdd61a4833a..d5b0fbf6b965 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-orion5x/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-orion5x/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-orion5x/irqs.h</div><div class='add'>+ * arch/arm/mach-orion5x/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * IRQ definitions for Orion SoC</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-orion5x/memory.h b/arch/arm/mach-orion5x/include/mach/memory.h<br/>index 80053a7afc7a..54dd76b013f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-orion5x/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-orion5x/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-orion5x/memory.h</div><div class='add'>+ * arch/arm/mach-orion5x/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  * Marvell Orion memory definitions</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-orion5x/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h<br/>index 10257f5c5e9e..61eb74a88862 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-orion5x/orion5x.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-orion5x/orion5x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/orion5x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/orion5x.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-orion5x/orion5x.h</div><div class='add'>+ * arch/arm/mach-orion5x/include/mach/orion5x.h</div><div class='ctx'>  *</div><div class='ctx'>  * Generic definitions of Orion SoC flavors:</div><div class='ctx'>  *  Orion-1, Orion-VoIP, Orion-NAS, and Orion-2.</div><div class='hunk'>@@ -73,6 +73,7 @@</div><div class='ctx'> #define MV88F5182_REV_A2	2</div><div class='ctx'> /* Orion-2 (88F5281) */</div><div class='ctx'> #define MV88F5281_DEV_ID	0x5281</div><div class='add'>+#define MV88F5281_REV_D0	4</div><div class='ctx'> #define MV88F5281_REV_D1	5</div><div class='ctx'> #define MV88F5281_REV_D2	6</div><div class='ctx'> </div><div class='hunk'>@@ -105,6 +106,10 @@</div><div class='ctx'> #define ORION5X_USB0_VIRT_BASE		(ORION5X_REGS_VIRT_BASE | 0x50000)</div><div class='ctx'> #define ORION5X_USB0_REG(x)		(ORION5X_USB0_VIRT_BASE | (x))</div><div class='ctx'> </div><div class='add'>+#define ORION5X_XOR_PHYS_BASE		(ORION5X_REGS_PHYS_BASE | 0x60900)</div><div class='add'>+#define ORION5X_XOR_VIRT_BASE		(ORION5X_REGS_VIRT_BASE | 0x60900)</div><div class='add'>+#define ORION5X_XOR_REG(x)		(ORION5X_XOR_VIRT_BASE | (x))</div><div class='add'>+</div><div class='ctx'> #define ORION5X_ETH_PHYS_BASE		(ORION5X_REGS_PHYS_BASE | 0x70000)</div><div class='ctx'> #define ORION5X_ETH_VIRT_BASE		(ORION5X_REGS_VIRT_BASE | 0x70000)</div><div class='ctx'> #define ORION5X_ETH_REG(x)		(ORION5X_ETH_VIRT_BASE | (x))</div><div class='head'>diff --git a/include/asm-arm/arch-orion5x/system.h b/arch/arm/mach-orion5x/include/mach/system.h<br/>index 3f1d1e2d38f8..08e430757890 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-orion5x/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-orion5x/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-orion5x/system.h</div><div class='add'>+ * arch/arm/mach-orion5x/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Tzachi Perelstein &lt;tzachi@marvell.com&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-orion5x/timex.h b/arch/arm/mach-orion5x/include/mach/timex.h<br/>index 31c568e28cc3..e82e44db7629 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-orion5x/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-orion5x/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-orion5x/timex.h</div><div class='add'>+ * arch/arm/mach-orion5x/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * Tzachi Perelstein &lt;tzachi@marvell.com&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-orion5x/uncompress.h b/arch/arm/mach-orion5x/include/mach/uncompress.h<br/>index 7548cedf2d76..4322dba468a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-orion5x/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-orion5x/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-orion5x/uncompress.h</div><div class='add'>+ * arch/arm/mach-orion5x/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * Tzachi Perelstein &lt;tzachi@marvell.com&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SERIAL_BASE	((unsigned char *)UART0_PHYS_BASE)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-orion5x/include/mach/vmalloc.h b/arch/arm/mach-orion5x/include/mach/vmalloc.h<br/>new file mode 100644<br/>index 000000000000..7147a297e97f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-orion5x/include/mach/vmalloc.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define VMALLOC_END       0xfd800000</div><div class='head'>diff --git a/arch/arm/mach-orion5x/irq.c b/arch/arm/mach-orion5x/irq.c<br/>index 9ae3f6dc7839..2545ff9e5830 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/irq.c</a></div><div class='hunk'>@@ -15,8 +15,8 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/irq.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='add'>+#include &lt;plat/irq.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='head'>diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c<br/>index 84feac4a1fe2..e321ec331839 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/kurobox_pro-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/kurobox_pro-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/kurobox_pro-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/kurobox_pro-setup.c</a></div><div class='hunk'>@@ -24,8 +24,8 @@</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/orion_nand.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='add'>+#include &lt;plat/orion_nand.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "mpp.h"</div><div class='ctx'> </div><div class='hunk'>@@ -146,8 +146,10 @@ static struct hw_pci kurobox_pro_pci __initdata = {</div><div class='ctx'> </div><div class='ctx'> static int __init kurobox_pro_pci_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (machine_is_kurobox_pro())</div><div class='add'>+	if (machine_is_kurobox_pro()) {</div><div class='add'>+		orion5x_pci_disable();</div><div class='ctx'> 		pci_common_init(&amp;kurobox_pro_pci);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -356,6 +358,7 @@ static void __init kurobox_pro_init(void)</div><div class='ctx'> 	orion5x_sata_init(&amp;kurobox_pro_sata_data);</div><div class='ctx'> 	orion5x_uart0_init();</div><div class='ctx'> 	orion5x_uart1_init();</div><div class='add'>+	orion5x_xor_init();</div><div class='ctx'> </div><div class='ctx'> 	orion5x_setup_dev_boot_win(KUROBOX_PRO_NOR_BOOT_BASE,</div><div class='ctx'> 				   KUROBOX_PRO_NOR_BOOT_SIZE);</div><div class='head'>diff --git a/arch/arm/mach-orion5x/mpp.c b/arch/arm/mach-orion5x/mpp.c<br/>index a48cadb01590..c04ab0e16ea1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/mpp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/mpp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/mpp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/mpp.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "mpp.h"</div><div class='head'>diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c<br/>index 7ce9e407d9d1..53ff1893b883 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/mss2-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/mss2-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/mss2-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/mss2-setup.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "mpp.h"</div><div class='ctx'> </div><div class='hunk'>@@ -239,6 +239,7 @@ static void __init mss2_init(void)</div><div class='ctx'> 	orion5x_i2c_init();</div><div class='ctx'> 	orion5x_sata_init(&amp;mss2_sata_data);</div><div class='ctx'> 	orion5x_uart0_init();</div><div class='add'>+	orion5x_xor_init();</div><div class='ctx'> </div><div class='ctx'> 	orion5x_setup_dev_boot_win(MSS2_NOR_BOOT_BASE, MSS2_NOR_BOOT_SIZE);</div><div class='ctx'> 	platform_device_register(&amp;mss2_nor_flash);</div><div class='head'>diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion5x/mv2120-setup.c<br/>index 55f3b0fdef8b..978d4d599396 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/mv2120-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/mv2120-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/mv2120-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/mv2120-setup.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "mpp.h"</div><div class='ctx'> </div><div class='hunk'>@@ -203,6 +203,7 @@ static void __init mv2120_init(void)</div><div class='ctx'> 	orion5x_i2c_init();</div><div class='ctx'> 	orion5x_sata_init(&amp;mv2120_sata_data);</div><div class='ctx'> 	orion5x_uart0_init();</div><div class='add'>+	orion5x_xor_init();</div><div class='ctx'> </div><div class='ctx'> 	orion5x_setup_dev_boot_win(MV2120_NOR_BOOT_BASE, MV2120_NOR_BOOT_SIZE);</div><div class='ctx'> 	platform_device_register(&amp;mv2120_nor_flash);</div><div class='head'>diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c<br/>index 256a4f680935..a7b7d77b1b09 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/pci.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/pcie.h&gt;</div><div class='add'>+#include &lt;plat/pcie.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -541,6 +541,13 @@ static void __devinit rc_pci_fixup(struct pci_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup);</div><div class='ctx'> </div><div class='add'>+static int orion5x_pci_disabled __initdata;</div><div class='add'>+</div><div class='add'>+void __init orion5x_pci_disable(void)</div><div class='add'>+{</div><div class='add'>+	orion5x_pci_disabled = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init orion5x_pci_set_cardbus_mode(void)</div><div class='ctx'> {</div><div class='ctx'> 	orion5x_pci_cardbus_mode = 1;</div><div class='hunk'>@@ -553,7 +560,7 @@ int __init orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	if (nr == 0) {</div><div class='ctx'> 		orion_pcie_set_local_bus_nr(PCIE_BASE, sys-&gt;busnr);</div><div class='ctx'> 		ret = pcie_setup(sys);</div><div class='del'>-	} else if (nr == 1) {</div><div class='add'>+	} else if (nr == 1 &amp;&amp; !orion5x_pci_disabled) {</div><div class='ctx'> 		orion5x_pci_set_bus_nr(sys-&gt;busnr);</div><div class='ctx'> 		ret = pci_setup(sys);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -567,7 +574,7 @@ struct pci_bus __init *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys</div><div class='ctx'> </div><div class='ctx'> 	if (nr == 0) {</div><div class='ctx'> 		bus = pci_scan_bus(sys-&gt;busnr, &amp;pcie_ops, sys);</div><div class='del'>-	} else if (nr == 1) {</div><div class='add'>+	} else if (nr == 1 &amp;&amp; !orion5x_pci_disabled) {</div><div class='ctx'> 		bus = pci_scan_bus(sys-&gt;busnr, &amp;pci_ops, sys);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bus = NULL;</div><div class='hunk'>@@ -584,7 +591,7 @@ int __init orion5x_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * PCIe endpoint?</div><div class='ctx'> 	 */</div><div class='del'>-	if (bus &lt; orion5x_pci_local_bus_nr())</div><div class='add'>+	if (orion5x_pci_disabled || bus &lt; orion5x_pci_local_bus_nr())</div><div class='ctx'> 		return IRQ_ORION5X_PCIE0_INT;</div><div class='ctx'> </div><div class='ctx'> 	return -1;</div><div class='head'>diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c<br/>index d50e3650a09e..e72fe1e065e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c</a></div><div class='hunk'>@@ -15,12 +15,13 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/mv643xx_eth.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "mpp.h"</div><div class='ctx'> </div><div class='hunk'>@@ -88,6 +89,8 @@ static struct orion5x_mpp_mode rd88f5181l_fxo_mpp_modes[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data rd88f5181l_fxo_eth_data = {</div><div class='ctx'> 	.phy_addr	= -1,</div><div class='add'>+	.speed		= SPEED_1000,</div><div class='add'>+	.duplex		= DUPLEX_FULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init rd88f5181l_fxo_init(void)</div><div class='head'>diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c<br/>index b56447d32e17..a1fe3257320d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/rd88f5181l-ge-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/rd88f5181l-ge-setup.c</a></div><div class='hunk'>@@ -15,13 +15,14 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/mv643xx_eth.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "mpp.h"</div><div class='ctx'> </div><div class='hunk'>@@ -89,6 +90,8 @@ static struct orion5x_mpp_mode rd88f5181l_ge_mpp_modes[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data rd88f5181l_ge_eth_data = {</div><div class='ctx'> 	.phy_addr	= -1,</div><div class='add'>+	.speed		= SPEED_1000,</div><div class='add'>+	.duplex		= DUPLEX_FULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct i2c_board_info __initdata rd88f5181l_ge_i2c_rtc = {</div><div class='head'>diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c<br/>index 2a46d27209c1..4c3bcd76ac85 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/rd88f5182-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/rd88f5182-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/rd88f5182-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/rd88f5182-setup.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "mpp.h"</div><div class='ctx'> </div><div class='hunk'>@@ -292,6 +292,7 @@ static void __init rd88f5182_init(void)</div><div class='ctx'> 	orion5x_i2c_init();</div><div class='ctx'> 	orion5x_sata_init(&amp;rd88f5182_sata_data);</div><div class='ctx'> 	orion5x_uart0_init();</div><div class='add'>+	orion5x_xor_init();</div><div class='ctx'> </div><div class='ctx'> 	orion5x_setup_dev_boot_win(RD88F5182_NOR_BOOT_BASE,</div><div class='ctx'> 				   RD88F5182_NOR_BOOT_SIZE);</div><div class='head'>diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c<br/>index f270ada2def9..9d6890514199 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/ts209-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/ts209-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/ts209-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/ts209-setup.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "mpp.h"</div><div class='ctx'> #include "tsx09-common.h"</div><div class='hunk'>@@ -207,12 +207,12 @@ static struct i2c_board_info __initdata qnap_ts209_i2c_rtc = {</div><div class='ctx'> </div><div class='ctx'> static struct gpio_keys_button qnap_ts209_buttons[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.code		= KEY_RESTART,</div><div class='add'>+		.code		= KEY_COPY,</div><div class='ctx'> 		.gpio		= QNAP_TS209_GPIO_KEY_MEDIA,</div><div class='ctx'> 		.desc		= "USB Copy Button",</div><div class='ctx'> 		.active_low	= 1,</div><div class='ctx'> 	}, {</div><div class='del'>-		.code		= KEY_POWER,</div><div class='add'>+		.code		= KEY_RESTART,</div><div class='ctx'> 		.gpio		= QNAP_TS209_GPIO_KEY_RESET,</div><div class='ctx'> 		.desc		= "Reset Button",</div><div class='ctx'> 		.active_low	= 1,</div><div class='hunk'>@@ -287,6 +287,10 @@ static void __init qnap_ts209_init(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Configure peripherals.</div><div class='ctx'> 	 */</div><div class='add'>+	orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE,</div><div class='add'>+				   QNAP_TS209_NOR_BOOT_SIZE);</div><div class='add'>+	platform_device_register(&amp;qnap_ts209_nor_flash);</div><div class='add'>+</div><div class='ctx'> 	orion5x_ehci0_init();</div><div class='ctx'> 	orion5x_ehci1_init();</div><div class='ctx'> 	qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE +</div><div class='hunk'>@@ -296,10 +300,8 @@ static void __init qnap_ts209_init(void)</div><div class='ctx'> 	orion5x_i2c_init();</div><div class='ctx'> 	orion5x_sata_init(&amp;qnap_ts209_sata_data);</div><div class='ctx'> 	orion5x_uart0_init();</div><div class='del'>-</div><div class='del'>-	orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE,</div><div class='del'>-				   QNAP_TS209_NOR_BOOT_SIZE);</div><div class='del'>-	platform_device_register(&amp;qnap_ts209_nor_flash);</div><div class='add'>+	orion5x_uart1_init();</div><div class='add'>+	orion5x_xor_init();</div><div class='ctx'> </div><div class='ctx'> 	platform_device_register(&amp;qnap_ts209_button_device);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c<br/>index 32f0ff073b7e..d85588ac7ef8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/ts409-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/ts409-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/ts409-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/ts409-setup.c</a></div><div class='hunk'>@@ -3,6 +3,9 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Maintainer: Sylver Bruneau &lt;sylver.bruneau@gmail.com&gt;</div><div class='ctx'>  *</div><div class='add'>+ * Copyright (C) 2008  Sylver Bruneau &lt;sylver.bruneau@gmail.com&gt;</div><div class='add'>+ * Copyright (C) 2008  Martin Michlmayr &lt;tbm@cyrius.com&gt;</div><div class='add'>+ *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or</div><div class='ctx'>  * modify it under the terms of the GNU General Public License</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='hunk'>@@ -16,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/mv643xx_eth.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='hunk'>@@ -24,7 +28,7 @@</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "mpp.h"</div><div class='ctx'> #include "tsx09-common.h"</div><div class='hunk'>@@ -162,16 +166,59 @@ static struct i2c_board_info __initdata qnap_ts409_i2c_rtc = {</div><div class='ctx'> 	I2C_BOARD_INFO("s35390a", 0x30),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*****************************************************************************</div><div class='add'>+ * LEDs attached to GPIO</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+</div><div class='add'>+static struct gpio_led ts409_led_pins[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "ts409:red:sata1",</div><div class='add'>+		.gpio		= 4,</div><div class='add'>+		.active_low	= 1,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "ts409:red:sata2",</div><div class='add'>+		.gpio		= 5,</div><div class='add'>+		.active_low	= 1,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "ts409:red:sata3",</div><div class='add'>+		.gpio		= 6,</div><div class='add'>+		.active_low	= 1,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "ts409:red:sata4",</div><div class='add'>+		.gpio		= 7,</div><div class='add'>+		.active_low	= 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_led_platform_data ts409_led_data = {</div><div class='add'>+	.leds		= ts409_led_pins,</div><div class='add'>+	.num_leds	= ARRAY_SIZE(ts409_led_pins),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device ts409_leds = {</div><div class='add'>+	.name	= "leds-gpio",</div><div class='add'>+	.id	= -1,</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data	= &amp;ts409_led_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /****************************************************************************</div><div class='ctx'>  * GPIO Attached Keys</div><div class='ctx'>  *     Power button is attached to the PIC microcontroller</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='add'>+#define QNAP_TS409_GPIO_KEY_RESET	14</div><div class='ctx'> #define QNAP_TS409_GPIO_KEY_MEDIA	15</div><div class='ctx'> </div><div class='ctx'> static struct gpio_keys_button qnap_ts409_buttons[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.code		= KEY_RESTART,</div><div class='add'>+		.gpio		= QNAP_TS409_GPIO_KEY_RESET,</div><div class='add'>+		.desc		= "Reset Button",</div><div class='add'>+		.active_low	= 1,</div><div class='add'>+	}, {</div><div class='add'>+		.code		= KEY_COPY,</div><div class='ctx'> 		.gpio		= QNAP_TS409_GPIO_KEY_MEDIA,</div><div class='ctx'> 		.desc		= "USB Copy Button",</div><div class='ctx'> 		.active_low	= 1,</div><div class='hunk'>@@ -231,6 +278,10 @@ static void __init qnap_ts409_init(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Configure peripherals.</div><div class='ctx'> 	 */</div><div class='add'>+	orion5x_setup_dev_boot_win(QNAP_TS409_NOR_BOOT_BASE,</div><div class='add'>+				   QNAP_TS409_NOR_BOOT_SIZE);</div><div class='add'>+	platform_device_register(&amp;qnap_ts409_nor_flash);</div><div class='add'>+</div><div class='ctx'> 	orion5x_ehci0_init();</div><div class='ctx'> 	qnap_tsx09_find_mac_addr(QNAP_TS409_NOR_BOOT_BASE +</div><div class='ctx'> 				 qnap_ts409_partitions[5].offset,</div><div class='hunk'>@@ -238,10 +289,7 @@ static void __init qnap_ts409_init(void)</div><div class='ctx'> 	orion5x_eth_init(&amp;qnap_tsx09_eth_data);</div><div class='ctx'> 	orion5x_i2c_init();</div><div class='ctx'> 	orion5x_uart0_init();</div><div class='del'>-</div><div class='del'>-	orion5x_setup_dev_boot_win(QNAP_TS409_NOR_BOOT_BASE,</div><div class='del'>-				   QNAP_TS409_NOR_BOOT_SIZE);</div><div class='del'>-	platform_device_register(&amp;qnap_ts409_nor_flash);</div><div class='add'>+	orion5x_uart1_init();</div><div class='ctx'> </div><div class='ctx'> 	platform_device_register(&amp;qnap_ts409_button_device);</div><div class='ctx'> </div><div class='hunk'>@@ -255,6 +303,7 @@ static void __init qnap_ts409_init(void)</div><div class='ctx'> 	if (qnap_ts409_i2c_rtc.irq == 0)</div><div class='ctx'> 		pr_warning("qnap_ts409_init: failed to get RTC IRQ\n");</div><div class='ctx'> 	i2c_register_board_info(0, &amp;qnap_ts409_i2c_rtc, 1);</div><div class='add'>+	platform_device_register(&amp;ts409_leds);</div><div class='ctx'> </div><div class='ctx'> 	/* register tsx09 specific power-off method */</div><div class='ctx'> 	pm_power_off = qnap_tsx09_power_off;</div><div class='head'>diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c<br/>index 77e9f351f07a..ae0a5dccd2a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/ts78xx-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/ts78xx-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/ts78xx-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/ts78xx-setup.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "mpp.h"</div><div class='ctx'> </div><div class='hunk'>@@ -256,6 +256,7 @@ static void __init ts78xx_init(void)</div><div class='ctx'> 	orion5x_sata_init(&amp;ts78xx_sata_data);</div><div class='ctx'> 	orion5x_uart0_init();</div><div class='ctx'> 	orion5x_uart1_init();</div><div class='add'>+	orion5x_xor_init();</div><div class='ctx'> </div><div class='ctx'> 	orion5x_setup_dev_boot_win(TS78XX_NOR_BOOT_BASE,</div><div class='ctx'> 				   TS78XX_NOR_BOOT_SIZE);</div><div class='head'>diff --git a/arch/arm/mach-orion5x/wnr854t-setup.c b/arch/arm/mach-orion5x/wnr854t-setup.c<br/>index 1af093ff8cf3..b6bc43e07eed 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/wnr854t-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/wnr854t-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/wnr854t-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/wnr854t-setup.c</a></div><div class='hunk'>@@ -14,11 +14,12 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/mv643xx_eth.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "mpp.h"</div><div class='ctx'> </div><div class='hunk'>@@ -92,6 +93,8 @@ static struct platform_device wnr854t_nor_flash = {</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data wnr854t_eth_data = {</div><div class='ctx'> 	.phy_addr	= -1,</div><div class='add'>+	.speed		= SPEED_1000,</div><div class='add'>+	.duplex		= DUPLEX_FULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init wnr854t_init(void)</div><div class='head'>diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c<br/>index aeab55c6a82d..b10da17b3fbd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/wrt350n-v2-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-orion5x/wrt350n-v2-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/wrt350n-v2-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-orion5x/wrt350n-v2-setup.c</a></div><div class='hunk'>@@ -14,11 +14,12 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/mv643xx_eth.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/orion5x.h&gt;</div><div class='add'>+#include &lt;mach/orion5x.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "mpp.h"</div><div class='ctx'> </div><div class='hunk'>@@ -100,6 +101,8 @@ static struct platform_device wrt350n_v2_nor_flash = {</div><div class='ctx'> </div><div class='ctx'> static struct mv643xx_eth_platform_data wrt350n_v2_eth_data = {</div><div class='ctx'> 	.phy_addr	= -1,</div><div class='add'>+	.speed		= SPEED_1000,</div><div class='add'>+	.duplex		= DUPLEX_FULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init wrt350n_v2_init(void)</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/clock.c b/arch/arm/mach-pnx4008/clock.c<br/>index a5268c3ac5a7..24d036a24a72 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pnx4008/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/clock.c</a></div><div class='hunk'>@@ -21,10 +21,10 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='ctx'> #include "clock.h"</div><div class='ctx'> </div><div class='ctx'> /*forward declaration*/</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/core.c b/arch/arm/mach-pnx4008/core.c<br/>index 429c796938be..3ba46ede9bbd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pnx4008/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/core.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='hunk'>@@ -38,9 +38,9 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='add'>+#include &lt;mach/irq.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct resource spipnx_0_resources[] = {</div><div class='ctx'> 	{</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/dma.c b/arch/arm/mach-pnx4008/dma.c<br/>index fe152e82590b..833c56be7344 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/dma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pnx4008/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/dma.c</a></div><div class='hunk'>@@ -23,12 +23,12 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct dma_channel {</div><div class='ctx'> 	char *name;</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/gpio.c b/arch/arm/mach-pnx4008/gpio.c<br/>index ef179cab80e2..fb51f7279e95 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/gpio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pnx4008/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/gpio.c</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/platform.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/platform.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* register definitions */</div><div class='ctx'> #define PIO_VA_BASE	IO_ADDRESS(PNX4008_PIO_BASE)</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/i2c.c b/arch/arm/mach-pnx4008/i2c.c<br/>index 6f308827c4fe..87c093286ff9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/i2c.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pnx4008/i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/i2c.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/i2c.c</a></div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'> #include &lt;linux/i2c-pnx.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;asm/arch/platform.h&gt;</div><div class='del'>-#include &lt;asm/arch/i2c.h&gt;</div><div class='add'>+#include &lt;mach/platform.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int set_clock_run(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/clock.h b/arch/arm/mach-pnx4008/include/mach/clock.h<br/>index ce155e161269..8d2a5ef52c90 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/clock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/clock.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-pnx4008/clock.h</div><div class='add'>+ * arch/arm/mach-pnx4008/include/mach/clock.h</div><div class='ctx'>  *</div><div class='ctx'>  * Clock control driver for PNX4008 - header file</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/debug-macro.S b/arch/arm/mach-pnx4008/include/mach/debug-macro.S<br/>index 67d18a203d23..6d1407f319f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-pnx4008/debug-macro.S</div><div class='add'>+/* arch/arm/mach-pnx4008/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/dma.h b/arch/arm/mach-pnx4008/include/mach/dma.h<br/>index 418f15283ff1..5442d04fc575 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-pnx4008/dma.h</div><div class='add'>+ *  arch/arm/mach-pnx4008/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  *  PNX4008 DMA header file</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/entry-macro.S b/arch/arm/mach-pnx4008/include/mach/entry-macro.S<br/>index f11731974e5d..8003037578ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-pnx4008/entry-macro.S</div><div class='add'>+ * arch/arm/mach-pnx4008/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for PNX4008-based platforms</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/gpio.h b/arch/arm/mach-pnx4008/include/mach/gpio.h<br/>index d01bf83d55c2..9591467eb9ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/gpio.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-pnx4008/gpio.h</div><div class='add'>+ * arch/arm/mach-pnx4008/include/mach/gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  * PNX4008 GPIO driver - header file</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/hardware.h b/arch/arm/mach-pnx4008/include/mach/hardware.h<br/>index a4410397a921..7b98b828d368 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pnx4008/hardware.h</div><div class='add'>+ * arch/arm/mach-pnx4008/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2005 MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #define __ASM_ARCH_HARDWARE_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='del'>-#include &lt;asm/arch/platform.h&gt;</div><div class='add'>+#include &lt;mach/platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Start of virtual addresses for IO devices */</div><div class='ctx'> #define IO_BASE         0xF0000000</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/i2c.h b/arch/arm/mach-pnx4008/include/mach/i2c.h<br/>index 92e8d65006f7..259ac53abf40 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/i2c.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/i2c.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/i2c.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/i2c.h</a></div><div class='hunk'>@@ -12,9 +12,6 @@</div><div class='ctx'> #ifndef __ASM_ARCH_I2C_H__</div><div class='ctx'> #define __ASM_ARCH_I2C_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='ctx'> enum {</div><div class='ctx'> 	mstatus_tdi = 0x00000001,</div><div class='ctx'> 	mstatus_afi = 0x00000002,</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/io.h b/arch/arm/mach-pnx4008/include/mach/io.h<br/>index 29ee43955c52..c6206f25839d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/io.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  include/asm-arm/arch-pnx4008/io.h</div><div class='add'>+ *  arch/arm/mach-pnx4008/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Dmitry Chigirev &lt;chigirev@ru.mvista.com&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/irq.h b/arch/arm/mach-pnx4008/include/mach/irq.h<br/>index fabff5dc337f..2a690ca33870 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/irq.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-pnx4008/irq.h</div><div class='add'>+ * arch/arm/mach-pnx4008/include/mach/irq.h</div><div class='ctx'>  *</div><div class='ctx'>  * PNX4008 IRQ controller driver - header file</div><div class='ctx'>  * this one is used in entry-arnv.S as well so it cannot contain C code</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/irqs.h b/arch/arm/mach-pnx4008/include/mach/irqs.h<br/>index a25d18f2d87a..f6b33cf23ae2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-pnx4008/irqs.h</div><div class='add'>+ * arch/arm/mach-pnx4008/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * PNX4008 IRQ controller driver - header file</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/memory.h b/arch/arm/mach-pnx4008/include/mach/memory.h<br/>index 0d8268a95261..5789a2d16f5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pnx4008/memory.h</div><div class='add'>+ * arch/arm/mach-pnx4008/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2005 Philips Semiconductors</div><div class='ctx'>  * Copyright (c) 2005 MontaVista Software, Inc.</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/param.h b/arch/arm/mach-pnx4008/include/mach/param.h<br/>index 95d5f547b416..6ea02f2176b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/param.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/param.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-pnx4008/param.h</div><div class='add'>+ *  arch/arm/mach-pnx4008/include/mach/param.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 ARM Limited</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/platform.h b/arch/arm/mach-pnx4008/include/mach/platform.h<br/>index 2613c7c669b1..368c2c10a308 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/platform.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/platform.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/platform.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-pnx4008/platform.h</div><div class='add'>+ * arch/arm/mach-pnx4008/include/mach/platform.h</div><div class='ctx'>  *</div><div class='ctx'>  * PNX4008 Base addresses - header file</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/pm.h b/arch/arm/mach-pnx4008/include/mach/pm.h<br/>index bac1634cb3e0..2fa685bff858 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/pm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/pm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/pm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/pm.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-pnx4008/pm.h</div><div class='add'>+ * arch/arm/mach-pnx4008/include/mach/pm.h</div><div class='ctx'>  *</div><div class='ctx'>  * PNX4008 Power Management Routiness - header file</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/system.h b/arch/arm/mach-pnx4008/include/mach/system.h<br/>index 6e3da70ab107..8985a4622b8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pnx4008/system.h</div><div class='add'>+ * arch/arm/mach-pnx4008/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2003 Philips Semiconductors</div><div class='ctx'>  * Copyright (C) 2005 MontaVista Software, Inc.</div><div class='hunk'>@@ -21,9 +21,9 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/platform.h&gt;</div><div class='add'>+#include &lt;mach/platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/timex.h b/arch/arm/mach-pnx4008/include/mach/timex.h<br/>index ee470a39089a..956fbd8e977c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-pnx4008/timex.h</div><div class='add'>+ * arch/arm/mach-pnx4008/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * PNX4008 timers header file</div><div class='ctx'>  *</div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #ifndef __PNX4008_TIMEX_H</div><div class='ctx'> #define __PNX4008_TIMEX_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CLOCK_TICK_RATE		1000000</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/uncompress.h b/arch/arm/mach-pnx4008/include/mach/uncompress.h<br/>index 8fa4d24b72b4..bb4751ee2539 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-pnx4008/uncompress.h</div><div class='add'>+ *  arch/arm/mach-pnx4008/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2006 MontaVista Software, Inc.</div><div class='head'>diff --git a/include/asm-arm/arch-pnx4008/vmalloc.h b/arch/arm/mach-pnx4008/include/mach/vmalloc.h<br/>index 140d925f6f37..2ad398378aed 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pnx4008/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pnx4008/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-pnx4008/vmalloc.h</div><div class='add'>+ * arch/arm/mach-pnx4008/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Vitaly Wool &lt;source@mvista.com&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/irq.c b/arch/arm/mach-pnx4008/irq.c<br/>index 5ed67e1947a8..5c4f55af5d4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pnx4008/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/irq.c</a></div><div class='hunk'>@@ -23,17 +23,16 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/irq.h&gt;</div><div class='add'>+#include &lt;mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> static u8 pnx4008_irq_type[NR_IRQS] = PNX4008_IRQ_TYPES;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pnx4008/pm.c b/arch/arm/mach-pnx4008/pm.c<br/>index 40116d254349..f970906d8848 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pnx4008/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/pm.c</a></div><div class='hunk'>@@ -20,10 +20,9 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/arch/pm.h&gt;</div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SRAM_VA IO_ADDRESS(PNX4008_IRAM_BASE)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pnx4008/serial.c b/arch/arm/mach-pnx4008/serial.c<br/>index 95a1b3f964a2..9be84bbb30e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/serial.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pnx4008/serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/serial.c</a></div><div class='hunk'>@@ -15,14 +15,14 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/platform.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/platform.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define UART_3		0</div><div class='ctx'> #define UART_4		1</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/sleep.S b/arch/arm/mach-pnx4008/sleep.S<br/>index fea1e17a3650..f4eed495d295 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/sleep.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pnx4008/sleep.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/sleep.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/sleep.S</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PWRMAN_VA_BASE IO_ADDRESS(PNX4008_PWRMAN_BASE)</div><div class='ctx'> #define PWR_CTRL_REG_OFFS 0x44</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/time.c b/arch/arm/mach-pnx4008/time.c<br/>index 6d4ca8fc0cb4..180975244f96 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pnx4008/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pnx4008/time.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/akita-ioexp.c b/arch/arm/mach-pxa/akita-ioexp.c<br/>index 254892ac30cd..5c67b188a3ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/akita-ioexp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/akita-ioexp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/akita-ioexp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/akita-ioexp.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;asm/arch/akita.h&gt;</div><div class='add'>+#include &lt;mach/akita.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* MAX7310 Regiser Map */</div><div class='ctx'> #define MAX7310_INPUT    0x00</div><div class='head'>diff --git a/arch/arm/mach-pxa/clock.c b/arch/arm/mach-pxa/clock.c<br/>index 630063ffa6fc..ca8e20538157 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/clock.c</a></div><div class='hunk'>@@ -12,9 +12,9 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "devices.h"</div><div class='ctx'> #include "generic.h"</div><div class='hunk'>@@ -125,3 +125,28 @@ void clks_register(struct clk *clks, size_t num)</div><div class='ctx'> 		list_add(&amp;clks[i].node, &amp;clocks);</div><div class='ctx'> 	mutex_unlock(&amp;clocks_mutex);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int clk_add_alias(char *alias, struct device *alias_dev, char *id,</div><div class='add'>+	struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct clk *r = clk_lookup(dev, id);</div><div class='add'>+	struct clk *new;</div><div class='add'>+</div><div class='add'>+	if (!r)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	new = kzalloc(sizeof(struct clk), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!new)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	new-&gt;name = alias;</div><div class='add'>+	new-&gt;dev = alias_dev;</div><div class='add'>+	new-&gt;other = r;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;clocks_mutex);</div><div class='add'>+	list_add(&amp;new-&gt;node, &amp;clocks);</div><div class='add'>+	mutex_unlock(&amp;clocks_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-pxa/clock.h b/arch/arm/mach-pxa/clock.h<br/>index 1ec8f9178aaf..73be795fe3bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/clock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/clock.h</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+</div><div class='ctx'> struct clk;</div><div class='ctx'> </div><div class='ctx'> struct clkops {</div><div class='hunk'>@@ -86,3 +88,6 @@ extern void clk_pxa3xx_cken_disable(struct clk *);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void clks_register(struct clk *clks, size_t num);</div><div class='add'>+int clk_add_alias(char *alias, struct device *alias_dev, char *id,</div><div class='add'>+	struct device *dev);</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-pxa/cm-x270-pci.c b/arch/arm/mach-pxa/cm-x270-pci.c<br/>index 31f5bd411ced..2d5bcea1e520 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/cm-x270-pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/cm-x270-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/cm-x270-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/cm-x270-pci.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/it8152.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c<br/>index 402e807eae54..af003a269534 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/cm-x270.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/cm-x270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/cm-x270.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/cm-x270.c</a></div><div class='hunk'>@@ -23,14 +23,14 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa27x.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/audio.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='del'>-#include &lt;asm/arch/ohci.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/bitfield.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/audio.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/bitfield.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/it8152.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/colibri.c b/arch/arm/mach-pxa/colibri.c<br/>index 574839d7c132..abce13c846c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/colibri.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/colibri.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/colibri.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/colibri.c</a></div><div class='hunk'>@@ -21,16 +21,16 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/colibri.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/colibri.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "devices.h"</div><div class='head'>diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c<br/>index e58504edb140..e703a8d209e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/corgi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/corgi.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -35,14 +35,15 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/udc.h&gt;</div><div class='del'>-#include &lt;asm/arch/corgi.h&gt;</div><div class='del'>-#include &lt;asm/arch/sharpsl.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+#include &lt;mach/corgi.h&gt;</div><div class='add'>+#include &lt;mach/sharpsl.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/sharpsl_param.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/scoop.h&gt;</div><div class='hunk'>@@ -532,6 +533,7 @@ static void __init corgi_init(void)</div><div class='ctx'>  	pxa_set_udc_info(&amp;udc_info);</div><div class='ctx'> 	pxa_set_mci_info(&amp;corgi_mci_platform_data);</div><div class='ctx'> 	pxa_set_ficp_info(&amp;corgi_ficp_platform_data);</div><div class='add'>+	pxa_set_i2c_info(NULL);</div><div class='ctx'> </div><div class='ctx'> 	platform_scoop_config = &amp;corgi_pcmcia_config;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/corgi_lcd.c b/arch/arm/mach-pxa/corgi_lcd.c<br/>index 9328df37afd1..311baf149b07 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi_lcd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/corgi_lcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi_lcd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/corgi_lcd.c</a></div><div class='hunk'>@@ -20,12 +20,12 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;asm/arch/akita.h&gt;</div><div class='del'>-#include &lt;asm/arch/corgi.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/sharpsl.h&gt;</div><div class='del'>-#include &lt;asm/arch/spitz.h&gt;</div><div class='add'>+#include &lt;mach/akita.h&gt;</div><div class='add'>+#include &lt;mach/corgi.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/sharpsl.h&gt;</div><div class='add'>+#include &lt;mach/spitz.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/scoop.h&gt;</div><div class='ctx'> #include &lt;asm/mach/sharpsl_param.h&gt;</div><div class='ctx'> #include "generic.h"</div><div class='head'>diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c<br/>index e91c0f26c412..35bbfccd2df3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi_pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/corgi_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi_pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/corgi_pm.c</a></div><div class='hunk'>@@ -20,14 +20,14 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/scoop.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/sharpsl.h&gt;</div><div class='del'>-#include &lt;asm/arch/corgi.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/sharpsl.h&gt;</div><div class='add'>+#include &lt;mach/corgi.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='ctx'> #include "sharpsl.h"</div><div class='ctx'> </div><div class='ctx'> #define SHARPSL_CHARGE_ON_VOLT         0x99  /* 2.9V */</div><div class='head'>diff --git a/arch/arm/mach-pxa/corgi_ssp.c b/arch/arm/mach-pxa/corgi_ssp.c<br/>index eccc45d21f75..8e2f2215c4ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi_ssp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/corgi_ssp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi_ssp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/corgi_ssp.c</a></div><div class='hunk'>@@ -16,13 +16,13 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/ssp.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-ssp.h&gt;</div><div class='add'>+#include &lt;mach/ssp.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-ssp.h&gt;</div><div class='ctx'> #include "sharpsl.h"</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(corgi_ssp_lock);</div><div class='head'>diff --git a/arch/arm/mach-pxa/cpu-pxa.c b/arch/arm/mach-pxa/cpu-pxa.c<br/>index fb9ba1ab2826..6f5569bac131 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/cpu-pxa.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/cpu-pxa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/cpu-pxa.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/cpu-pxa.c</a></div><div class='hunk'>@@ -37,9 +37,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> static unsigned int freq_debug;</div><div class='head'>diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c<br/>index 84489dc51d81..35736fc08634 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/devices.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/devices.c</a></div><div class='hunk'>@@ -4,19 +4,19 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/udc.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/i2c.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa27x.h&gt;</div><div class='del'>-#include &lt;asm/arch/ohci.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa27x_keypad.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx_spi.h&gt;</div><div class='del'>-#include &lt;asm/arch/camera.h&gt;</div><div class='del'>-#include &lt;asm/arch/audio.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa3xx_nand.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='add'>+#include &lt;mach/pxa27x_keypad.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx_spi.h&gt;</div><div class='add'>+#include &lt;mach/camera.h&gt;</div><div class='add'>+#include &lt;mach/audio.h&gt;</div><div class='add'>+#include &lt;mach/pxa3xx_nand.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "devices.h"</div><div class='ctx'> #include "generic.h"</div><div class='head'>diff --git a/arch/arm/mach-pxa/dma.c b/arch/arm/mach-pxa/dma.c<br/>index 3215316d7b06..c0be17e0ab82 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/dma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/dma.c</a></div><div class='hunk'>@@ -20,10 +20,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct dma_channel {</div><div class='ctx'> 	char *name;</div><div class='head'>diff --git a/arch/arm/mach-pxa/e400_lcd.c b/arch/arm/mach-pxa/e400_lcd.c<br/>index 16c023630626..263884165f57 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/e400_lcd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/e400_lcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/e400_lcd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/e400_lcd.c</a></div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct pxafb_mode_info e400_pxafb_mode_info = {</div><div class='ctx'> 	.pixclock       = 140703,</div><div class='head'>diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c<br/>index e5cc6ca63c75..7a0a681a5847 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/em-x270.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/em-x270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/em-x270.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/em-x270.c</a></div><div class='hunk'>@@ -23,14 +23,14 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mfp-pxa27x.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa27x-udc.h&gt;</div><div class='del'>-#include &lt;asm/arch/audio.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='del'>-#include &lt;asm/arch/ohci.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa27x_keypad.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa27x-udc.h&gt;</div><div class='add'>+#include &lt;mach/audio.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/pxa27x_keypad.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c<br/>index c29b7b21c11b..001a252bd514 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/eseries.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/eseries.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/eseries.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/eseries.c</a></div><div class='hunk'>@@ -10,18 +10,78 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='add'>+static unsigned long e740_pin_config[] __initdata = {</div><div class='add'>+	/* Chip selects */</div><div class='add'>+	GPIO15_nCS_1,   /* CS1 - Flash */</div><div class='add'>+	GPIO79_nCS_3,   /* CS3 - IMAGEON */</div><div class='add'>+	GPIO80_nCS_4,   /* CS4 - TMIO */</div><div class='add'>+</div><div class='add'>+	/* Clocks */</div><div class='add'>+	GPIO12_32KHz,</div><div class='add'>+</div><div class='add'>+	/* BTUART */</div><div class='add'>+	GPIO42_BTUART_RXD,</div><div class='add'>+	GPIO43_BTUART_TXD,</div><div class='add'>+	GPIO44_BTUART_CTS,</div><div class='add'>+	GPIO45_GPIO, /* Used by TMIO for #SUSPEND */</div><div class='add'>+</div><div class='add'>+	/* PC Card */</div><div class='add'>+	GPIO8_GPIO,   /* CD0 */</div><div class='add'>+	GPIO44_GPIO,  /* CD1 */</div><div class='add'>+	GPIO11_GPIO,  /* IRQ0 */</div><div class='add'>+	GPIO6_GPIO,   /* IRQ1 */</div><div class='add'>+	GPIO27_GPIO,  /* RST0 */</div><div class='add'>+	GPIO24_GPIO,  /* RST1 */</div><div class='add'>+	GPIO20_GPIO,  /* PWR0 */</div><div class='add'>+	GPIO23_GPIO,  /* PWR1 */</div><div class='add'>+	GPIO48_nPOE,</div><div class='add'>+	GPIO49_nPWE,</div><div class='add'>+	GPIO50_nPIOR,</div><div class='add'>+	GPIO51_nPIOW,</div><div class='add'>+	GPIO52_nPCE_1,</div><div class='add'>+	GPIO53_nPCE_2,</div><div class='add'>+	GPIO54_nPSKTSEL,</div><div class='add'>+	GPIO55_nPREG,</div><div class='add'>+	GPIO56_nPWAIT,</div><div class='add'>+	GPIO57_nIOIS16,</div><div class='add'>+</div><div class='add'>+	/* wakeup */</div><div class='add'>+	GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned long e400_pin_config[] __initdata = {</div><div class='add'>+	/* Chip selects */</div><div class='add'>+	GPIO15_nCS_1,   /* CS1 - Flash */</div><div class='add'>+	GPIO80_nCS_4,   /* CS4 - TMIO */</div><div class='add'>+</div><div class='add'>+	/* Clocks */</div><div class='add'>+	GPIO12_32KHz,</div><div class='add'>+</div><div class='add'>+	/* BTUART */</div><div class='add'>+	GPIO42_BTUART_RXD,</div><div class='add'>+	GPIO43_BTUART_TXD,</div><div class='add'>+	GPIO44_BTUART_CTS,</div><div class='add'>+	GPIO45_GPIO, /* Used by TMIO for #SUSPEND */</div><div class='add'>+</div><div class='add'>+	/* wakeup */</div><div class='add'>+	GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Only e800 has 128MB RAM */</div><div class='ctx'> static void __init eseries_fixup(struct machine_desc *desc,</div><div class='del'>-                      struct tag *tags, char **cmdline, struct meminfo *mi)</div><div class='add'>+	struct tag *tags, char **cmdline, struct meminfo *mi)</div><div class='ctx'> {</div><div class='ctx'> 	mi-&gt;nr_banks=1;</div><div class='ctx'> 	mi-&gt;bank[0].start = 0xa0000000;</div><div class='hunk'>@@ -32,83 +92,95 @@ static void __init eseries_fixup(struct machine_desc *desc,</div><div class='ctx'> 		mi-&gt;bank[0].size = (64*1024*1024);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init e740_init(void)</div><div class='add'>+{</div><div class='add'>+	pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init e400_init(void)</div><div class='add'>+{</div><div class='add'>+	pxa2xx_mfp_config(ARRAY_AND_SIZE(e400_pin_config));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* e-series machine definitions */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_E330</div><div class='ctx'> MACHINE_START(E330, "Toshiba e330")</div><div class='del'>-        /* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='del'>-        .phys_io        = 0x40000000,</div><div class='del'>-        .io_pg_offst    = (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='del'>-        .boot_params    = 0xa0000100,</div><div class='del'>-        .map_io         = pxa_map_io,</div><div class='del'>-        .init_irq       = pxa25x_init_irq,</div><div class='del'>-        .fixup          = eseries_fixup,</div><div class='del'>-        .timer = &amp;pxa_timer,</div><div class='add'>+	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.map_io		= pxa_map_io,</div><div class='add'>+	.init_irq	= pxa25x_init_irq,</div><div class='add'>+	.fixup		= eseries_fixup,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_E350</div><div class='ctx'> MACHINE_START(E350, "Toshiba e350")</div><div class='ctx'> 	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='del'>-	.phys_io        = 0x40000000,</div><div class='del'>-	.io_pg_offst    = (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='del'>-	.boot_params    = 0xa0000100,</div><div class='del'>-	.map_io         = pxa_map_io,</div><div class='del'>-	.init_irq       = pxa25x_init_irq,</div><div class='del'>-	.fixup          = eseries_fixup,</div><div class='del'>-	.timer = &amp;pxa_timer,</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.map_io		= pxa_map_io,</div><div class='add'>+	.init_irq	= pxa25x_init_irq,</div><div class='add'>+	.fixup		= eseries_fixup,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_E740</div><div class='ctx'> MACHINE_START(E740, "Toshiba e740")</div><div class='del'>-        /* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='del'>-        .phys_io        = 0x40000000,</div><div class='del'>-        .io_pg_offst    = (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='del'>-        .boot_params    = 0xa0000100,</div><div class='del'>-        .map_io         = pxa_map_io,</div><div class='del'>-        .init_irq       = pxa25x_init_irq,</div><div class='del'>-        .fixup          = eseries_fixup,</div><div class='del'>-        .timer = &amp;pxa_timer,</div><div class='add'>+	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.map_io		= pxa_map_io,</div><div class='add'>+	.init_irq	= pxa25x_init_irq,</div><div class='add'>+	.fixup		= eseries_fixup,</div><div class='add'>+	.init_machine	= e740_init,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_E750</div><div class='ctx'> MACHINE_START(E750, "Toshiba e750")</div><div class='del'>-        /* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='del'>-        .phys_io        = 0x40000000,</div><div class='del'>-        .io_pg_offst    = (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='del'>-        .boot_params    = 0xa0000100,</div><div class='del'>-        .map_io         = pxa_map_io,</div><div class='del'>-        .init_irq       = pxa25x_init_irq,</div><div class='del'>-        .fixup          = eseries_fixup,</div><div class='del'>-        .timer = &amp;pxa_timer,</div><div class='add'>+	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.map_io		= pxa_map_io,</div><div class='add'>+	.init_irq	= pxa25x_init_irq,</div><div class='add'>+	.fixup		= eseries_fixup,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_E400</div><div class='ctx'> MACHINE_START(E400, "Toshiba e400")</div><div class='del'>-        /* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='del'>-        .phys_io        = 0x40000000,</div><div class='del'>-        .io_pg_offst    = (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='del'>-        .boot_params    = 0xa0000100,</div><div class='del'>-        .map_io         = pxa_map_io,</div><div class='del'>-        .init_irq       = pxa25x_init_irq,</div><div class='del'>-        .fixup          = eseries_fixup,</div><div class='del'>-        .timer = &amp;pxa_timer,</div><div class='add'>+	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.map_io		= pxa_map_io,</div><div class='add'>+	.init_irq	= pxa25x_init_irq,</div><div class='add'>+	.fixup		= eseries_fixup,</div><div class='add'>+	.init_machine	= e400_init,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_E800</div><div class='ctx'> MACHINE_START(E800, "Toshiba e800")</div><div class='del'>-        /* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='del'>-        .phys_io        = 0x40000000,</div><div class='del'>-        .io_pg_offst    = (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='del'>-        .boot_params    = 0xa0000100,</div><div class='del'>-        .map_io         = pxa_map_io,</div><div class='del'>-        .init_irq       = pxa25x_init_irq,</div><div class='del'>-        .fixup          = eseries_fixup,</div><div class='del'>-        .timer = &amp;pxa_timer,</div><div class='add'>+	/* Maintainer: Ian Molton (spyro@f2s.com) */</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0xa0000100,</div><div class='add'>+	.map_io		= pxa_map_io,</div><div class='add'>+	.init_irq	= pxa25x_init_irq,</div><div class='add'>+	.fixup		= eseries_fixup,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/eseries_udc.c b/arch/arm/mach-pxa/eseries_udc.c<br/>index 362847a10998..d622c04c0d44 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/eseries_udc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/eseries_udc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/eseries_udc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/eseries_udc.c</a></div><div class='hunk'>@@ -14,10 +14,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/udc.h&gt;</div><div class='del'>-#include &lt;asm/arch/eseries-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+#include &lt;mach/eseries-gpio.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c<br/>index 0143eed65398..cc3d850cc0b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/ezx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/ezx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/ezx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/ezx.c</a></div><div class='hunk'>@@ -18,13 +18,13 @@</div><div class='ctx'> #include &lt;linux/pwm_backlight.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='del'>-#include &lt;asm/arch/ohci.h&gt;</div><div class='del'>-#include &lt;asm/arch/i2c.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mfp-pxa27x.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c<br/>index ca053226fba0..ceaed0076366 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/generic.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/generic.c</a></div><div class='hunk'>@@ -20,15 +20,25 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/reset.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='add'>+void clear_reset_status(unsigned int mask)</div><div class='add'>+{</div><div class='add'>+	if (cpu_is_pxa2xx())</div><div class='add'>+		pxa2xx_clear_reset_status(mask);</div><div class='add'>+</div><div class='add'>+	if (cpu_is_pxa3xx())</div><div class='add'>+		pxa3xx_clear_reset_status(mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Get the clock frequency as reflected by CCCR and the turbo flag.</div><div class='ctx'>  * We assume these values have been applied via a fcs.</div><div class='head'>diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h<br/>index 5bb7ae757831..041c048320e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/generic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/generic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/generic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/generic.h</a></div><div class='hunk'>@@ -47,12 +47,20 @@ extern unsigned pxa27x_get_memclk_frequency_10khz(void);</div><div class='ctx'> #define pxa27x_get_memclk_frequency_10khz()	(0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)</div><div class='add'>+extern void pxa2xx_clear_reset_status(unsigned int);</div><div class='add'>+#else</div><div class='add'>+static inline void pxa2xx_clear_reset_status(unsigned int mask) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PXA3xx</div><div class='ctx'> extern unsigned pxa3xx_get_clk_frequency_khz(int);</div><div class='ctx'> extern unsigned pxa3xx_get_memclk_frequency_10khz(void);</div><div class='add'>+extern void pxa3xx_clear_reset_status(unsigned int);</div><div class='ctx'> #else</div><div class='ctx'> #define pxa3xx_get_clk_frequency_khz(x)		(0)</div><div class='ctx'> #define pxa3xx_get_memclk_frequency_10khz()	(0)</div><div class='add'>+static inline void pxa3xx_clear_reset_status(unsigned int mask) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> extern struct sysdev_class pxa_irq_sysclass;</div><div class='head'>diff --git a/arch/arm/mach-pxa/gpio.c b/arch/arm/mach-pxa/gpio.c<br/>index 7d3e16970be0..07acc1b23857 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/gpio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/gpio.c</a></div><div class='hunk'>@@ -18,10 +18,10 @@</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c<br/>index bdf239754037..c0092472fa58 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/gumstix.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/gumstix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/gumstix.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/gumstix.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -34,13 +34,13 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/udc.h&gt;</div><div class='del'>-#include &lt;asm/arch/gumstix.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+#include &lt;mach/gumstix.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c<br/>index 2637633f9166..5aa0270d5605 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/idp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/idp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/idp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/idp.c</a></div><div class='hunk'>@@ -25,18 +25,18 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/idp.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='del'>-#include &lt;asm/arch/bitfield.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/idp.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/bitfield.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "devices.h"</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/akita.h b/arch/arm/mach-pxa/include/mach/akita.h<br/>index 5d8cc1d9cb10..5d8cc1d9cb10 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/akita.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/akita.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/akita.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/akita.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/audio.h b/arch/arm/mach-pxa/include/mach/audio.h<br/>index f82f96dd1053..f82f96dd1053 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/audio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/audio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/audio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/audio.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/bitfield.h b/arch/arm/mach-pxa/include/mach/bitfield.h<br/>index f1f0e3387d9c..f1f0e3387d9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/bitfield.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/bitfield.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/bitfield.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/bitfield.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/camera.h b/arch/arm/mach-pxa/include/mach/camera.h<br/>index 39516ced8b1f..39516ced8b1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/camera.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/camera.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/camera.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/camera.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/colibri.h b/arch/arm/mach-pxa/include/mach/colibri.h<br/>index 2ae373fb5675..2ae373fb5675 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/colibri.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/colibri.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/colibri.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/colibri.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/corgi.h b/arch/arm/mach-pxa/include/mach/corgi.h<br/>index bf856503baf6..bf856503baf6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/corgi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/corgi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/corgi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/corgi.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/debug-macro.S b/arch/arm/mach-pxa/include/mach/debug-macro.S<br/>index 9012cbc0ad8b..55d6a175ab19 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-pxa/debug-macro.S</div><div class='add'>+/* arch/arm/mach-pxa/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/dma.h b/arch/arm/mach-pxa/include/mach/dma.h<br/>index dbe110ee2666..955bfe606067 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-pxa/dma.h</div><div class='add'>+ *  arch/arm/mach-pxa/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Author:	Nicolas Pitre</div><div class='ctx'>  *  Created:	Jun 15, 2001</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/entry-macro.S b/arch/arm/mach-pxa/include/mach/entry-macro.S<br/>index c145bb01bc8f..de16c12d5232 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-pxa/entry-macro.S</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for PXA-based platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,8 +7,8 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/eseries-gpio.h b/arch/arm/mach-pxa/include/mach/eseries-gpio.h<br/>index 4c90b1310270..4c90b1310270 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/eseries-gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/eseries-gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/eseries-gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/eseries-gpio.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/eseries-irq.h b/arch/arm/mach-pxa/include/mach/eseries-irq.h<br/>index f2a93d5e31d3..f2a93d5e31d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/eseries-irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/eseries-irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/eseries-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/eseries-irq.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/gpio.h b/arch/arm/mach-pxa/include/mach/gpio.h<br/>index bdbf5f9ffdd5..2c538d8c362d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/gpio.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pxa/gpio.h</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  * PXA GPIO wrappers for arch-neutral GPIO calls</div><div class='ctx'>  *</div><div class='hunk'>@@ -24,9 +24,9 @@</div><div class='ctx'> #ifndef __ASM_ARCH_PXA_GPIO_H</div><div class='ctx'> #define __ASM_ARCH_PXA_GPIO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/gpio.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-pxa/gumstix.h b/arch/arm/mach-pxa/include/mach/gumstix.h<br/>index 6fa85c4f94f8..42ee1956750e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/gumstix.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/gumstix.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/gumstix.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/gumstix.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-pxa/gumstix.h</div><div class='add'>+ *  arch/arm/mach-pxa/include/mach/gumstix.h</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h<br/>index 979a45695d7d..e89df4d0d239 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-pxa/hardware.h</div><div class='add'>+ *  arch/arm/mach-pxa/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Author:	Nicolas Pitre</div><div class='ctx'>  *  Created:	Jun 15, 2001</div><div class='hunk'>@@ -224,11 +224,6 @@ extern void pxa_gpio_set_value(unsigned gpio, int value);</div><div class='ctx'>  */</div><div class='ctx'> extern unsigned int get_memclk_frequency_10khz(void);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * register GPIO as reset generator</div><div class='del'>- */</div><div class='del'>-extern int init_gpio_reset(int gpio);</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MACH_ARMCORE) &amp;&amp; defined(CONFIG_PCI)</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/i2c.h b/arch/arm/mach-pxa/include/mach/i2c.h<br/>index 80596b013443..80596b013443 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/i2c.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/i2c.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/i2c.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/i2c.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/idp.h b/arch/arm/mach-pxa/include/mach/idp.h<br/>index 21aa8ac35c1c..5eff96fcc944 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/idp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/idp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/idp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/idp.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-pxa/idp.h</div><div class='add'>+ *  arch/arm/mach-pxa/include/mach/idp.h</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/io.h b/arch/arm/mach-pxa/include/mach/io.h<br/>index 7f8d817b446f..600fd4f76603 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/io.h</a></div><div class='hunk'>@@ -1,12 +1,12 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pxa/io.h</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copied from asm/arch/sa1100/io.h</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __ASM_ARM_ARCH_IO_H</div><div class='ctx'> #define __ASM_ARM_ARCH_IO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT 0xffffffff</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-pxa/irda.h b/arch/arm/mach-pxa/include/mach/irda.h<br/>index 0a50c3c763df..0a50c3c763df 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/irda.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/irda.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/irda.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/irda.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h<br/>index 9413121b0ed9..108b5db9b2af 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-pxa/irqs.h</div><div class='add'>+ *  arch/arm/mach-pxa/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Author:	Nicolas Pitre</div><div class='ctx'>  *  Created:	Jun 15, 2001</div><div class='hunk'>@@ -183,6 +183,7 @@</div><div class='ctx'>       defined(CONFIG_MACH_TOSA) || \</div><div class='ctx'>       defined(CONFIG_MACH_MAINSTONE) || \</div><div class='ctx'>       defined(CONFIG_MACH_PCM027) || \</div><div class='add'>+      defined(CONFIG_ARCH_PXA_ESERIES) || \</div><div class='ctx'>       defined(CONFIG_MACH_MAGICIAN)</div><div class='ctx'> #define NR_IRQS			(IRQ_BOARD_END)</div><div class='ctx'> #elif defined(CONFIG_MACH_ZYLONITE)</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/littleton.h b/arch/arm/mach-pxa/include/mach/littleton.h<br/>index 79d209b826f4..79d209b826f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/littleton.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/littleton.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/littleton.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/littleton.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/lpd270.h b/arch/arm/mach-pxa/include/mach/lpd270.h<br/>index 501d240ac120..f89fb715266b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/lpd270.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/lpd270.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/lpd270.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/lpd270.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-pxa/lpd270.h</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/lpd270.h</div><div class='ctx'>  *</div><div class='ctx'>  * Author:	Lennert Buytenhek</div><div class='ctx'>  * Created:	Feb 10, 2006</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/lubbock.h b/arch/arm/mach-pxa/include/mach/lubbock.h<br/>index 11ee73593fc3..4cb24154a5a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/lubbock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/lubbock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/lubbock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/lubbock.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-pxa/lubbock.h</div><div class='add'>+ *  arch/arm/mach-pxa/include/mach/lubbock.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Author:	Nicolas Pitre</div><div class='ctx'>  *  Created:	Jun 15, 2001</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/magician.h b/arch/arm/mach-pxa/include/mach/magician.h<br/>index 169b374f9921..38d68d99f585 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/magician.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/magician.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/magician.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/magician.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #ifndef _MAGICIAN_H_</div><div class='ctx'> #define _MAGICIAN_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PXA GPIOs</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/mainstone.h b/arch/arm/mach-pxa/include/mach/mainstone.h<br/>index 14c862adcaa1..3461c4302ff4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/mainstone.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/mainstone.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/mainstone.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mainstone.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-pxa/mainstone.h</div><div class='add'>+ *  arch/arm/mach-pxa/include/mach/mainstone.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Author:	Nicolas Pitre</div><div class='ctx'>  *  Created:	Nov 14, 2002</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/memory.h b/arch/arm/mach-pxa/include/mach/memory.h<br/>index bee81d66c184..552eb7fa6579 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-pxa/memory.h</div><div class='add'>+ *  arch/arm/mach-pxa/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  * Author:	Nicolas Pitre</div><div class='ctx'>  * Copyright:	(C) 2001 MontaVista Software Inc.</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/mfp-pxa25x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h<br/>index 0499323010ba..6c8e72238bfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/mfp-pxa25x.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/mfp-pxa25x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mfp-pxa25x.h</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> #ifndef __ASM_ARCH_MFP_PXA25X_H</div><div class='ctx'> #define __ASM_ARCH_MFP_PXA25X_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mfp.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa2xx.h&gt;</div><div class='add'>+#include &lt;mach/mfp.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa2xx.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* GPIO */</div><div class='ctx'> #define GPIO2_GPIO		MFP_CFG_IN(GPIO2, AF0)</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/mfp-pxa27x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h<br/>index bc73ab84167c..122bdbd53182 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/mfp-pxa27x.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/mfp-pxa27x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mfp-pxa27x.h</a></div><div class='hunk'>@@ -8,8 +8,8 @@</div><div class='ctx'>  * specific controller, and this should work in most cases.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mfp.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa2xx.h&gt;</div><div class='add'>+#include &lt;mach/mfp.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa2xx.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* GPIO */</div><div class='ctx'> #define GPIO85_GPIO		MFP_CFG_IN(GPIO85, AF0)</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/mfp-pxa2xx.h b/arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h<br/>index 8de1c0dae624..3e9211591e20 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/mfp-pxa2xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/mfp-pxa2xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_MFP_PXA2XX_H</div><div class='ctx'> #define __ASM_ARCH_MFP_PXA2XX_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mfp.h&gt;</div><div class='add'>+#include &lt;mach/mfp.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * the following MFP_xxx bit definitions in mfp.h are re-used for pxa2xx:</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/mfp-pxa300.h b/arch/arm/mach-pxa/include/mach/mfp-pxa300.h<br/>index bb410313556f..bc1fb33a6e70 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/mfp-pxa300.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/mfp-pxa300.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/mfp-pxa300.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mfp-pxa300.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pxa/mfp-pxa300.h</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/mfp-pxa300.h</div><div class='ctx'>  *</div><div class='ctx'>  * PXA300/PXA310 specific MFP configuration definitions</div><div class='ctx'>  *</div><div class='hunk'>@@ -15,8 +15,8 @@</div><div class='ctx'> #ifndef __ASM_ARCH_MFP_PXA300_H</div><div class='ctx'> #define __ASM_ARCH_MFP_PXA300_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mfp.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa3xx.h&gt;</div><div class='add'>+#include &lt;mach/mfp.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa3xx.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* GPIO */</div><div class='ctx'> #define GPIO46_GPIO		MFP_CFG(GPIO46, AF1)</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/mfp-pxa320.h b/arch/arm/mach-pxa/include/mach/mfp-pxa320.h<br/>index 576aa46d90fc..74990510cf34 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/mfp-pxa320.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/mfp-pxa320.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/mfp-pxa320.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mfp-pxa320.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pxa/mfp-pxa320.h</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/mfp-pxa320.h</div><div class='ctx'>  *</div><div class='ctx'>  * PXA320 specific MFP configuration definitions</div><div class='ctx'>  *</div><div class='hunk'>@@ -15,8 +15,8 @@</div><div class='ctx'> #ifndef __ASM_ARCH_MFP_PXA320_H</div><div class='ctx'> #define __ASM_ARCH_MFP_PXA320_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mfp.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa3xx.h&gt;</div><div class='add'>+#include &lt;mach/mfp.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa3xx.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* GPIO */</div><div class='ctx'> #define GPIO46_GPIO		MFP_CFG(GPIO46, AF0)</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/mfp-pxa3xx.h b/arch/arm/mach-pxa/include/mach/mfp-pxa3xx.h<br/>index 1f6b35c015d0..1f6b35c015d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/mfp-pxa3xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/mfp-pxa3xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/mfp-pxa3xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mfp-pxa3xx.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/mfp-pxa930.h b/arch/arm/mach-pxa/include/mach/mfp-pxa930.h<br/>index c4e945ab1923..fabd9b4df827 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/mfp-pxa930.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/mfp-pxa930.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/mfp-pxa930.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mfp-pxa930.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pxa/mfp-pxa930.h</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/mfp-pxa930.h</div><div class='ctx'>  *</div><div class='ctx'>  * PXA930 specific MFP configuration definitions</div><div class='ctx'>  *</div><div class='hunk'>@@ -13,8 +13,8 @@</div><div class='ctx'> #ifndef __ASM_ARCH_MFP_PXA9xx_H</div><div class='ctx'> #define __ASM_ARCH_MFP_PXA9xx_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mfp.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa3xx.h&gt;</div><div class='add'>+#include &lt;mach/mfp.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa3xx.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* GPIO */</div><div class='ctx'> #define GPIO46_GPIO		MFP_CFG(GPIO46, AF0)</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/mfp.h b/arch/arm/mach-pxa/include/mach/mfp.h<br/>index e7d58798da67..8769567b389b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/mfp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/mfp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/mfp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mfp.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pxa/mfp.h</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/mfp.h</div><div class='ctx'>  *</div><div class='ctx'>  * Multi-Function Pin Definitions</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/mmc.h b/arch/arm/mach-pxa/include/mach/mmc.h<br/>index 6d1304c9270f..6d1304c9270f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/mmc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/mmc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/mmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mmc.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/mtd-xip.h b/arch/arm/mach-pxa/include/mach/mtd-xip.h<br/>index 8704dbceb432..4d452fcb1508 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/mtd-xip.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/mtd-xip.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/mtd-xip.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/mtd-xip.h</a></div><div class='hunk'>@@ -10,14 +10,12 @@</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * $Id: xip.h,v 1.2 2004/12/01 15:49:10 nico Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ARCH_PXA_MTD_XIP_H__</div><div class='ctx'> #define __ARCH_PXA_MTD_XIP_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define xip_irqpending()	(ICIP &amp; ICMR)</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-pxa/ohci.h b/arch/arm/mach-pxa/include/mach/ohci.h<br/>index e848a47128cd..e848a47128cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/ohci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/ohci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/ohci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/ohci.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/palmtx.h b/arch/arm/mach-pxa/include/mach/palmtx.h<br/>index 1e8bccbda510..1e8bccbda510 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/palmtx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/palmtx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/palmtx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/palmtx.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/pcm027.h b/arch/arm/mach-pxa/include/mach/pcm027.h<br/>index 7beae1472c3e..4dcd2e8baa61 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/pcm027.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/pcm027.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pcm027.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pcm027.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pxa/pcm027.h</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/pcm027.h</div><div class='ctx'>  *</div><div class='ctx'>  * (c) 2003 Phytec Messtechnik GmbH &lt;armlinux@phytec.de&gt;</div><div class='ctx'>  * (c) 2007 Juergen Beisert &lt;j.beisert@pengutronix.de&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/pcm990_baseboard.h b/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h<br/>index 2e2013179063..8a4383b776d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/pcm990_baseboard.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/pcm990_baseboard.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pcm990_baseboard.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-pxa/pcm990_baseboard.h</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/pcm990_baseboard.h</div><div class='ctx'>  *</div><div class='ctx'>  * (c) 2003 Phytec Messtechnik GmbH &lt;armlinux@phytec.de&gt;</div><div class='ctx'>  * (c) 2007 Juergen Beisert &lt;j.beisert@pengutronix.de&gt;</div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pcm027.h&gt;</div><div class='add'>+#include &lt;mach/pcm027.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * definitions relevant only when the PCM-990</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/pm.h b/arch/arm/mach-pxa/include/mach/pm.h<br/>index 261e5bc958db..261e5bc958db 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/pm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/pm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pm.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/poodle.h b/arch/arm/mach-pxa/include/mach/poodle.h<br/>index 4d6a40315764..67debc47e8c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/poodle.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/poodle.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/poodle.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/poodle.h</a></div><div class='hunk'>@@ -1,11 +1,11 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pxa/poodle.h</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/poodle.h</div><div class='ctx'>  *</div><div class='ctx'>  * May be copied or modified under the terms of the GNU General Public</div><div class='ctx'>  * License.  See linux/COPYING for more information.</div><div class='ctx'>  *</div><div class='ctx'>  * Based on:</div><div class='del'>- *   linux/include/asm-arm/arch-sa1100/collie.h</div><div class='add'>+ *   arch/arm/mach-sa1100/include/mach/collie.h</div><div class='ctx'>  *</div><div class='ctx'>  * ChangeLog:</div><div class='ctx'>  *   04-06-2001 Lineo Japan, Inc.</div><div class='hunk'>@@ -70,6 +70,12 @@</div><div class='ctx'> #define POODLE_SCOOP_IO_DIR	( POODLE_SCOOP_VPEN | POODLE_SCOOP_HS_OUT )</div><div class='ctx'> #define POODLE_SCOOP_IO_OUT	( 0 )</div><div class='ctx'> </div><div class='add'>+#define POODLE_LOCOMO_GPIO_AMP_ON      LOCOMO_GPIO(8)</div><div class='add'>+#define POODLE_LOCOMO_GPIO_MUTE_L      LOCOMO_GPIO(10)</div><div class='add'>+#define POODLE_LOCOMO_GPIO_MUTE_R      LOCOMO_GPIO(11)</div><div class='add'>+#define POODLE_LOCOMO_GPIO_232VCC_ON   LOCOMO_GPIO(12)</div><div class='add'>+#define POODLE_LOCOMO_GPIO_JK_B        LOCOMO_GPIO(13)</div><div class='add'>+</div><div class='ctx'> extern struct platform_device poodle_locomo_device;</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_ARCH_POODLE_H  */</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/arch/arm/mach-pxa/include/mach/pxa-regs.h<br/>index dce9308626b7..12288ca3cbb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/pxa-regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/pxa-regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pxa-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa-regs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-pxa/pxa-regs.h</div><div class='add'>+ *  arch/arm/mach-pxa/include/mach/pxa-regs.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Author:	Nicolas Pitre</div><div class='ctx'>  *  Created:	Jun 15, 2001</div><div class='hunk'>@@ -829,7 +829,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * SSP Serial Port Registers - see include/asm-arm/arch-pxa/regs-ssp.h</div><div class='add'>+ * SSP Serial Port Registers - see arch/arm/mach-pxa/include/mach/regs-ssp.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -837,7 +837,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Core Clock - see include/asm-arm/arch-pxa/pxa2xx-regs.h</div><div class='add'>+ * Core Clock - see arch/arm/mach-pxa/include/mach/pxa2xx-regs.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PXA27x</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/pxa25x-udc.h b/arch/arm/mach-pxa/include/mach/pxa25x-udc.h<br/>index 1b80a4805a60..1b80a4805a60 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/pxa25x-udc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/pxa25x-udc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pxa25x-udc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa25x-udc.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/pxa27x-udc.h b/arch/arm/mach-pxa/include/mach/pxa27x-udc.h<br/>index ab1443f8bd89..ab1443f8bd89 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/pxa27x-udc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/pxa27x-udc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pxa27x-udc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa27x-udc.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/pxa27x_keypad.h b/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h<br/>index d5a48a96dea7..d5a48a96dea7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/pxa27x_keypad.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/pxa27x_keypad.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa27x_keypad.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/pxa2xx-gpio.h b/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h<br/>index 6ef1dd09970b..6ef1dd09970b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/pxa2xx-gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/pxa2xx-gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/pxa2xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h<br/>index 73e0a329cf7f..806ecfea44bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/pxa2xx-regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/pxa2xx-regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa2xx-regs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-pxa/pxa2xx-regs.h</div><div class='add'>+ *  arch/arm/mach-pxa/include/mach/pxa2xx-regs.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Taken from pxa-regs.h by Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/pxa2xx_spi.h b/arch/arm/mach-pxa/include/mach/pxa2xx_spi.h<br/>index 2206cb61a9f9..2206cb61a9f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/pxa2xx_spi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/pxa2xx_spi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pxa2xx_spi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa2xx_spi.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/pxa3xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h<br/>index fe9364c83a28..39eb68319e28 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/pxa3xx-regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/pxa3xx-regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa3xx-regs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pxa/pxa3xx-regs.h</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/pxa3xx-regs.h</div><div class='ctx'>  *</div><div class='ctx'>  * PXA3xx specific register definitions</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/pxa3xx_nand.h b/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h<br/>index eb4b190b6657..eb4b190b6657 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/pxa3xx_nand.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/pxa3xx_nand.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxa3xx_nand.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/pxafb.h b/arch/arm/mach-pxa/include/mach/pxafb.h<br/>index daf018d0c604..8e591118371e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/pxafb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/pxafb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pxafb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/pxafb.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-pxa/pxafb.h</div><div class='add'>+ *  arch/arm/mach-pxa/include/mach/pxafb.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Support for the xscale frame buffer.</div><div class='ctx'>  *</div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Supported LCD connections</div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'>  * bits 10-17 : for AC Bias Pin Frequency</div><div class='ctx'>  * bit     18 : for output enable polarity</div><div class='ctx'>  * bit     19 : for pixel clock edge</div><div class='add'>+ * bit     20 : for output pixel format when base is RGBT16</div><div class='ctx'>  */</div><div class='ctx'> #define LCD_CONN_TYPE(_x)	((_x) &amp; 0x0f)</div><div class='ctx'> #define LCD_CONN_WIDTH(_x)	(((_x) &gt;&gt; 4) &amp; 0x1f)</div><div class='hunk'>@@ -53,10 +54,11 @@</div><div class='ctx'> #define LCD_SMART_PANEL_18BPP	((18 &lt;&lt; 4) | LCD_TYPE_SMART_PANEL)</div><div class='ctx'> </div><div class='ctx'> #define LCD_AC_BIAS_FREQ(x)	(((x) &amp; 0xff) &lt;&lt; 10)</div><div class='del'>-#define LCD_BIAS_ACTIVE_HIGH	(0 &lt;&lt; 17)</div><div class='del'>-#define LCD_BIAS_ACTIVE_LOW	(1 &lt;&lt; 17)</div><div class='del'>-#define LCD_PCLK_EDGE_RISE	(0 &lt;&lt; 18)</div><div class='del'>-#define LCD_PCLK_EDGE_FALL	(1 &lt;&lt; 18)</div><div class='add'>+#define LCD_BIAS_ACTIVE_HIGH	(0 &lt;&lt; 18)</div><div class='add'>+#define LCD_BIAS_ACTIVE_LOW	(1 &lt;&lt; 18)</div><div class='add'>+#define LCD_PCLK_EDGE_RISE	(0 &lt;&lt; 19)</div><div class='add'>+#define LCD_PCLK_EDGE_FALL	(1 &lt;&lt; 19)</div><div class='add'>+#define LCD_ALTERNATE_MAPPING	(1 &lt;&lt; 20)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This structure describes the machine which we are running on.</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/regs-lcd.h b/arch/arm/mach-pxa/include/mach/regs-lcd.h<br/>index 820a189684a9..c689c4ea769c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/regs-lcd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/regs-lcd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/regs-lcd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/regs-lcd.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_REGS_LCD_H</div><div class='ctx'> #define __ASM_ARCH_REGS_LCD_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/bitfield.h&gt;</div><div class='add'>+#include &lt;mach/bitfield.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * LCD Controller Registers and Bits Definitions</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/regs-ssp.h b/arch/arm/mach-pxa/include/mach/regs-ssp.h<br/>index 3c04cde2cf1f..3c04cde2cf1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/regs-ssp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/regs-ssp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/regs-ssp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/regs-ssp.h</a></div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/reset.h b/arch/arm/mach-pxa/include/mach/reset.h<br/>new file mode 100644<br/>index 000000000000..9489a48871a8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/reset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/reset.h</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+#ifndef __ASM_ARCH_RESET_H</div><div class='add'>+#define __ASM_ARCH_RESET_H</div><div class='add'>+</div><div class='add'>+#define RESET_STATUS_HARDWARE	(1 &lt;&lt; 0)	/* Hardware Reset */</div><div class='add'>+#define RESET_STATUS_WATCHDOG	(1 &lt;&lt; 1)	/* Watchdog Reset */</div><div class='add'>+#define RESET_STATUS_LOWPOWER	(1 &lt;&lt; 2)	/* Low Power/Sleep Exit */</div><div class='add'>+#define RESET_STATUS_GPIO	(1 &lt;&lt; 3)	/* GPIO Reset */</div><div class='add'>+#define RESET_STATUS_ALL	(0xf)</div><div class='add'>+</div><div class='add'>+extern unsigned int reset_status;</div><div class='add'>+extern void clear_reset_status(unsigned int mask);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * register GPIO as reset generator</div><div class='add'>+ */</div><div class='add'>+extern int init_gpio_reset(int gpio);</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_ARCH_RESET_H */</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/sharpsl.h b/arch/arm/mach-pxa/include/mach/sharpsl.h<br/>index 3b1d4a72d4d1..3b1d4a72d4d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/sharpsl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/sharpsl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/sharpsl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/sharpsl.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/spitz.h b/arch/arm/mach-pxa/include/mach/spitz.h<br/>index bd14365f7ed5..bd14365f7ed5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/spitz.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/spitz.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/spitz.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/spitz.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/ssp.h b/arch/arm/mach-pxa/include/mach/ssp.h<br/>index a012882c9ee6..a012882c9ee6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/ssp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/ssp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/ssp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/ssp.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/system.h b/arch/arm/mach-pxa/include/mach/system.h<br/>index 6956fc5235f8..0f381e692999 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pxa/system.h</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Author:	Nicolas Pitre</div><div class='ctx'>  * Created:	Jun 15, 2001</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/timex.h b/arch/arm/mach-pxa/include/mach/timex.h<br/>index 8d882f0b6a16..b05fc6683c47 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pxa/timex.h</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * Author:	Nicolas Pitre</div><div class='ctx'>  * Created:	Jun 15, 2001</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/tosa.h b/arch/arm/mach-pxa/include/mach/tosa.h<br/>index a72803f0461b..a72803f0461b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/tosa.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/tosa.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/tosa.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/tosa.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/tosa_bt.h b/arch/arm/mach-pxa/include/mach/tosa_bt.h<br/>index efc3c3d3b75d..efc3c3d3b75d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/tosa_bt.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/tosa_bt.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/tosa_bt.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/tosa_bt.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/trizeps4.h b/arch/arm/mach-pxa/include/mach/trizeps4.h<br/>index 641d0ec110bb..641d0ec110bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/trizeps4.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/trizeps4.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/trizeps4.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/trizeps4.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-pxa/udc.h b/arch/arm/mach-pxa/include/mach/udc.h<br/>index 27aa3a91012f..2f82332e81a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/udc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/udc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/udc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/udc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pxa/udc.h</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/udc.h</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/mach/udc_pxa2xx.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/uncompress.h b/arch/arm/mach-pxa/include/mach/uncompress.h<br/>index f4551269aaf2..21e3e890af98 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pxa/uncompress.h</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * Author:	Nicolas Pitre</div><div class='ctx'>  * Copyright:	(C) 2001 MontaVista Software Inc.</div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __REG(x)       ((volatile unsigned long *)x)</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/vmalloc.h b/arch/arm/mach-pxa/include/mach/vmalloc.h<br/>index 5bb450c7aa2c..e90c5eeb81dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-pxa/vmalloc.h</div><div class='add'>+ * arch/arm/mach-pxa/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Author:	Nicolas Pitre</div><div class='ctx'>  * Copyright:	(C) 2001 MontaVista Software Inc.</div><div class='head'>diff --git a/include/asm-arm/arch-pxa/zylonite.h b/arch/arm/mach-pxa/include/mach/zylonite.h<br/>index 0d35ca04731e..0d35ca04731e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-pxa/zylonite.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-pxa/zylonite.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/zylonite.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/include/mach/zylonite.h</a></div><div class='head'>diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c<br/>index fbff557bb225..5e95c5372fec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/irq.c</a></div><div class='hunk'>@@ -17,10 +17,10 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/leds-idp.c b/arch/arm/mach-pxa/leds-idp.c<br/>index 38aa9270540e..18b20d469410 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds-idp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/leds-idp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds-idp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/leds-idp.c</a></div><div class='hunk'>@@ -14,12 +14,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/idp.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/idp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "leds.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/leds-lubbock.c b/arch/arm/mach-pxa/leds-lubbock.c<br/>index afbc6698e27c..1a258029c33c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds-lubbock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/leds-lubbock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds-lubbock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/leds-lubbock.c</a></div><div class='hunk'>@@ -13,11 +13,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/lubbock.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/lubbock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "leds.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/leds-mainstone.c b/arch/arm/mach-pxa/leds-mainstone.c<br/>index 065293eb0d82..95e06b849634 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds-mainstone.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/leds-mainstone.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds-mainstone.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/leds-mainstone.c</a></div><div class='hunk'>@@ -12,12 +12,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/mainstone.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/mainstone.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "leds.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/leds-trizeps4.c b/arch/arm/mach-pxa/leds-trizeps4.c<br/>index 21880daabafe..3bc29007df3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds-trizeps4.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/leds-trizeps4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds-trizeps4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/leds-trizeps4.c</a></div><div class='hunk'>@@ -12,14 +12,14 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/trizeps4.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/trizeps4.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "leds.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c<br/>index dd759d03a9fd..58f3402a0375 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/littleton.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/littleton.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/littleton.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/littleton.c</a></div><div class='hunk'>@@ -26,21 +26,21 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa300.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='del'>-#include &lt;asm/arch/ssp.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa27x_keypad.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa3xx_nand.h&gt;</div><div class='del'>-#include &lt;asm/arch/littleton.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa300.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/ssp.h&gt;</div><div class='add'>+#include &lt;mach/pxa27x_keypad.h&gt;</div><div class='add'>+#include &lt;mach/pxa3xx_nand.h&gt;</div><div class='add'>+#include &lt;mach/littleton.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c<br/>index 8d1ab54e7b20..b7038948d1d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/lpd270.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/lpd270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/lpd270.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/lpd270.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -38,15 +38,15 @@</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/lpd270.h&gt;</div><div class='del'>-#include &lt;asm/arch/audio.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/ohci.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/lpd270.h&gt;</div><div class='add'>+#include &lt;mach/audio.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "devices.h"</div><div class='head'>diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c<br/>index af7375bb46a4..4ffdff2d9ff1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/lubbock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/lubbock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/lubbock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/lubbock.c</a></div><div class='hunk'>@@ -25,12 +25,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spi/ads7846.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx_spi.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx_spi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -41,17 +41,18 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/sa1111.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa25x.h&gt;</div><div class='del'>-#include &lt;asm/arch/audio.h&gt;</div><div class='del'>-#include &lt;asm/arch/lubbock.h&gt;</div><div class='del'>-#include &lt;asm/arch/udc.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='add'>+#include &lt;mach/audio.h&gt;</div><div class='add'>+#include &lt;mach/lubbock.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='add'>+#include "clock.h"</div><div class='ctx'> #include "devices.h"</div><div class='ctx'> </div><div class='ctx'> static unsigned long lubbock_pin_config[] __initdata = {</div><div class='hunk'>@@ -224,7 +225,7 @@ static struct platform_device sa1111_device = {</div><div class='ctx'>  * for the temperature sensors.</div><div class='ctx'>  */</div><div class='ctx'> static struct pxa2xx_spi_master pxa_ssp_master_info = {</div><div class='del'>-	.num_chipselect	= 0,</div><div class='add'>+	.num_chipselect	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int lubbock_ads7846_pendown_state(void)</div><div class='hunk'>@@ -485,6 +486,7 @@ static void __init lubbock_init(void)</div><div class='ctx'> </div><div class='ctx'> 	pxa2xx_mfp_config(ARRAY_AND_SIZE(lubbock_pin_config));</div><div class='ctx'> </div><div class='add'>+	clk_add_alias("SA1111_CLK", NULL, "GPIO11_CLK", NULL);</div><div class='ctx'> 	pxa_set_udc_info(&amp;udc_info);</div><div class='ctx'> 	set_pxa_fb_info(&amp;sharp_lm8v31);</div><div class='ctx'> 	pxa_set_mci_info(&amp;lubbock_mci_platform_data);</div><div class='head'>diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c<br/>index c9d274f0048f..143f28adaf95 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/magician.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/magician.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/magician.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/magician.c</a></div><div class='hunk'>@@ -26,18 +26,18 @@</div><div class='ctx'> #include &lt;linux/pda_power.h&gt;</div><div class='ctx'> #include &lt;linux/pwm_backlight.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/arch/magician.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa27x.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='del'>-#include &lt;asm/arch/i2c.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/ohci.h&gt;</div><div class='add'>+#include &lt;mach/magician.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "devices.h"</div><div class='ctx'> #include "generic.h"</div><div class='head'>diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c<br/>index c8e38b5ff1c4..d44af761564d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mainstone.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/mainstone.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mainstone.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/mainstone.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -41,17 +41,17 @@</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa27x.h&gt;</div><div class='del'>-#include &lt;asm/arch/mainstone.h&gt;</div><div class='del'>-#include &lt;asm/arch/audio.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='del'>-#include &lt;asm/arch/i2c.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/ohci.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa27x_keypad.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='add'>+#include &lt;mach/mainstone.h&gt;</div><div class='add'>+#include &lt;mach/audio.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='add'>+#include &lt;mach/pxa27x_keypad.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "devices.h"</div><div class='head'>diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c<br/>index fd4545eab803..925575f10acf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mfp-pxa2xx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/mfp-pxa2xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mfp-pxa2xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/mfp-pxa2xx.c</a></div><div class='hunk'>@@ -18,10 +18,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa2xx.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa2xx.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/mfp-pxa3xx.c b/arch/arm/mach-pxa/mfp-pxa3xx.c<br/>index 3a5b0fcbaf1f..eb197a6e8e94 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mfp-pxa3xx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/mfp-pxa3xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mfp-pxa3xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/mfp-pxa3xx.c</a></div><div class='hunk'>@@ -19,10 +19,10 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa3xx.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa3xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/mfp.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa3xx.h&gt;</div><div class='add'>+#include &lt;mach/pxa3xx-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* mfp_spin_lock is used to ensure that MFP register configuration</div><div class='ctx'>  * (most likely a read-modify-write operation) is atomic, and that</div><div class='head'>diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c<br/>index 408657a24f8c..fe924a23debe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/palmtx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/palmtx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/palmtx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/palmtx.c</a></div><div class='hunk'>@@ -30,15 +30,15 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/audio.h&gt;</div><div class='del'>-#include &lt;asm/arch/palmtx.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa27x.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa27x_keypad.h&gt;</div><div class='del'>-#include &lt;asm/arch/udc.h&gt;</div><div class='add'>+#include &lt;mach/audio.h&gt;</div><div class='add'>+#include &lt;mach/palmtx.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/pxa27x_keypad.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "devices.h"</div><div class='head'>diff --git a/arch/arm/mach-pxa/pcm027.c b/arch/arm/mach-pxa/pcm027.c<br/>index 377f3be8ce57..730b9f6ede1d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pcm027.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/pcm027.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pcm027.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pcm027.c</a></div><div class='hunk'>@@ -29,12 +29,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx_spi.h&gt;</div><div class='del'>-#include &lt;asm/arch/pcm027.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx_spi.h&gt;</div><div class='add'>+#include &lt;mach/pcm027.h&gt;</div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c<br/>index 30023b00e476..420c9b3813f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pcm990-baseboard.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/pcm990-baseboard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pcm990-baseboard.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pcm990-baseboard.c</a></div><div class='hunk'>@@ -22,23 +22,22 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/pwm_backlight.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;media/soc_camera.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/i2c.h&gt;</div><div class='del'>-#include &lt;asm/arch/camera.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='add'>+#include &lt;mach/camera.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/audio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/ohci.h&gt;</div><div class='del'>-#include &lt;asm/arch/pcm990_baseboard.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa27x.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/audio.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='add'>+#include &lt;mach/pcm990_baseboard.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "devices.h"</div><div class='ctx'> #include "generic.h"</div><div class='head'>diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c<br/>index 7d4debbdcca3..1b539e675579 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pm.c</a></div><div class='hunk'>@@ -16,12 +16,12 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/arch/pm.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/lubbock.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/lubbock.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct pxa_cpu_pm_fns *pxa_cpu_pm_fns;</div><div class='head'>diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c<br/>index 39612cfa0b4d..3f5f484549b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/poodle.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/poodle.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/poodle.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/poodle.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -31,16 +31,17 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/udc.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/poodle.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='del'>-#include &lt;asm/arch/sharpsl.h&gt;</div><div class='del'>-#include &lt;asm/arch/ssp.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/poodle.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/sharpsl.h&gt;</div><div class='add'>+#include &lt;mach/ssp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/scoop.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/locomo.h&gt;</div><div class='hunk'>@@ -387,6 +388,7 @@ static void __init poodle_init(void)</div><div class='ctx'> 	pxa_set_udc_info(&amp;udc_info);</div><div class='ctx'> 	pxa_set_mci_info(&amp;poodle_mci_platform_data);</div><div class='ctx'> 	pxa_set_ficp_info(&amp;poodle_ficp_platform_data);</div><div class='add'>+	pxa_set_i2c_info(NULL);</div><div class='ctx'> </div><div class='ctx'> 	platform_scoop_config = &amp;poodle_pcmcia_config;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/pwm.c b/arch/arm/mach-pxa/pwm.c<br/>index ce28cd9fed16..316cd986da5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pwm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/pwm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pwm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pwm.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/pwm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* PWM registers and bits definitions */</div><div class='ctx'> #define PWMCR		(0x00)</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c<br/>index c5b845b935bb..305452b56e91 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa25x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/pxa25x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa25x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pxa25x.c</a></div><div class='hunk'>@@ -23,13 +23,14 @@</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa25x.h&gt;</div><div class='del'>-#include &lt;asm/arch/pm.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='add'>+#include &lt;mach/reset.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "devices.h"</div><div class='hunk'>@@ -165,8 +166,7 @@ static struct clk pxa25x_hwuart_clk =</div><div class='ctx'> ;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * PXA 2xx clock declarations. Order is important (see aliases below)</div><div class='del'>- * Please be careful not to disrupt the ordering.</div><div class='add'>+ * PXA 2xx clock declarations.</div><div class='ctx'>  */</div><div class='ctx'> static struct clk pxa25x_clks[] = {</div><div class='ctx'> 	INIT_CK("LCDCLK", LCD, &amp;clk_pxa25x_lcd_ops, &amp;pxa_device_fb.dev),</div><div class='hunk'>@@ -193,11 +193,6 @@ static struct clk pxa25x_clks[] = {</div><div class='ctx'> 	INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk pxa2xx_clk_aliases[] = {</div><div class='del'>-	INIT_CKOTHER("GPIO7_CLK", &amp;pxa25x_clks[4], NULL),</div><div class='del'>-	INIT_CKOTHER("SA1111_CLK", &amp;pxa25x_clks[5], NULL),</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> </div><div class='ctx'> #define SAVE(x)		sleep_save[SLEEP_SAVE_##x] = x</div><div class='hunk'>@@ -348,6 +343,9 @@ static int __init pxa25x_init(void)</div><div class='ctx'> 		clks_register(&amp;pxa25x_hwuart_clk, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_is_pxa21x() || cpu_is_pxa25x()) {</div><div class='add'>+</div><div class='add'>+		reset_status = RCSR;</div><div class='add'>+</div><div class='ctx'> 		clks_register(pxa25x_clks, ARRAY_SIZE(pxa25x_clks));</div><div class='ctx'> </div><div class='ctx'> 		if ((ret = pxa_init_dma(16)))</div><div class='hunk'>@@ -371,8 +369,6 @@ static int __init pxa25x_init(void)</div><div class='ctx'> 	if (cpu_is_pxa255())</div><div class='ctx'> 		ret = platform_device_register(&amp;pxa_device_hwuart);</div><div class='ctx'> </div><div class='del'>-	clks_register(pxa2xx_clk_aliases, ARRAY_SIZE(pxa2xx_clk_aliases));</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c<br/>index d5d14ea33f27..f9f6a9c31f4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa27x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/pxa27x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa27x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pxa27x.c</a></div><div class='hunk'>@@ -18,16 +18,17 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa27x.h&gt;</div><div class='del'>-#include &lt;asm/arch/ohci.h&gt;</div><div class='del'>-#include &lt;asm/arch/pm.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/i2c.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa27x.h&gt;</div><div class='add'>+#include &lt;mach/reset.h&gt;</div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "devices.h"</div><div class='hunk'>@@ -384,6 +385,9 @@ static int __init pxa27x_init(void)</div><div class='ctx'> 	int i, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_is_pxa27x()) {</div><div class='add'>+</div><div class='add'>+		reset_status = RCSR;</div><div class='add'>+</div><div class='ctx'> 		clks_register(pxa27x_clks, ARRAY_SIZE(pxa27x_clks));</div><div class='ctx'> </div><div class='ctx'> 		if ((ret = pxa_init_dma(32)))</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa2xx.c b/arch/arm/mach-pxa/pxa2xx.c<br/>index d4f6415e8413..73d04d81c75a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa2xx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/pxa2xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa2xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pxa2xx.c</a></div><div class='hunk'>@@ -14,9 +14,18 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mfp-pxa2xx.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa25x.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa2xx.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='add'>+#include &lt;mach/reset.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+</div><div class='add'>+void pxa2xx_clear_reset_status(unsigned int mask)</div><div class='add'>+{</div><div class='add'>+	/* RESET_STATUS_* has a 1:1 mapping with RCSR */</div><div class='add'>+	RCSR = mask;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static unsigned long pxa2xx_mfp_fir[] = {</div><div class='ctx'> 	GPIO46_FICP_RXD,</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c<br/>index da92e9733886..9adc7fc4618a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa300.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/pxa300.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa300.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pxa300.c</a></div><div class='hunk'>@@ -17,9 +17,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa3xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa300.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa3xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa300.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "devices.h"</div><div class='hunk'>@@ -90,7 +90,9 @@ static struct clk common_clks[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk pxa310_clks[] = {</div><div class='add'>+#ifdef CONFIG_CPU_PXA310</div><div class='ctx'> 	PXA3xx_CKEN("MMCCLK", MMC3, 19500000, 0, &amp;pxa3xx_device_mci3.dev),</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init pxa300_init(void)</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c<br/>index c557c23a1efe..016eb18f01a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa320.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/pxa320.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa320.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pxa320.c</a></div><div class='hunk'>@@ -17,10 +17,10 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa3xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa320.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/mfp.h&gt;</div><div class='add'>+#include &lt;mach/pxa3xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa320.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "devices.h"</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c<br/>index f491025a0c82..03cbc38103ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa3xx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/pxa3xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa3xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pxa3xx.c</a></div><div class='hunk'>@@ -22,12 +22,13 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa3xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/ohci.h&gt;</div><div class='del'>-#include &lt;asm/arch/pm.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/ssp.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa3xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/reset.h&gt;</div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='add'>+#include &lt;mach/ssp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "devices.h"</div><div class='hunk'>@@ -109,6 +110,12 @@ unsigned int pxa3xx_get_memclk_frequency_10khz(void)</div><div class='ctx'> 	return (clk / 10000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void pxa3xx_clear_reset_status(unsigned int mask)</div><div class='add'>+{</div><div class='add'>+	/* RESET_STATUS_* has a 1:1 mapping with ARSR */</div><div class='add'>+	ARSR = mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Return the current AC97 clock frequency.</div><div class='ctx'>  */</div><div class='hunk'>@@ -532,6 +539,9 @@ static int __init pxa3xx_init(void)</div><div class='ctx'> 	int i, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_is_pxa3xx()) {</div><div class='add'>+</div><div class='add'>+		reset_status = ARSR;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * clear RDH bit every time after reset</div><div class='ctx'> 		 *</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa930.c b/arch/arm/mach-pxa/pxa930.c<br/>index 9503897d049c..13e6bfdfff60 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa930.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/pxa930.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa930.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/pxa930.c</a></div><div class='hunk'>@@ -16,8 +16,8 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa930.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa930.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct pxa3xx_mfp_addr_map pxa930_mfp_addr_map[] __initdata = {</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c<br/>index 9d39dea57ce2..9996c612c3d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/reset.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/reset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/reset.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/reset.c</a></div><div class='hunk'>@@ -10,8 +10,11 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/proc-fns.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/reset.h&gt;</div><div class='add'>+</div><div class='add'>+unsigned int reset_status;</div><div class='add'>+EXPORT_SYMBOL(reset_status);</div><div class='ctx'> </div><div class='ctx'> static void do_hw_reset(void);</div><div class='ctx'> </div><div class='hunk'>@@ -77,8 +80,7 @@ static void do_hw_reset(void)</div><div class='ctx'> </div><div class='ctx'> void arch_reset(char mode)</div><div class='ctx'> {</div><div class='del'>-	if (cpu_is_pxa2xx())</div><div class='del'>-		RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;</div><div class='add'>+	clear_reset_status(RESET_STATUS_ALL);</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case 's':</div><div class='head'>diff --git a/arch/arm/mach-pxa/saar.c b/arch/arm/mach-pxa/saar.c<br/>index d02bc6f8bb93..e7ea91ce7f02 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/saar.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/saar.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/saar.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/saar.c</a></div><div class='hunk'>@@ -21,9 +21,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa3xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa930.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa3xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa930.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "devices.h"</div><div class='ctx'> #include "generic.h"</div><div class='head'>diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c<br/>index 23e9b9283301..e804ae09370c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/sharpsl_pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/sharpsl_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/sharpsl_pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/sharpsl_pm.c</a></div><div class='hunk'>@@ -22,12 +22,12 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/apm-emulation.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/arch/pm.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/sharpsl.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/sharpsl.h&gt;</div><div class='ctx'> #include "sharpsl.h"</div><div class='ctx'> </div><div class='ctx'> struct battery_thresh spitz_battery_levels_acin[] = {</div><div class='head'>diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S<br/>index 784716eb7fc5..a62c8375eb53 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/sleep.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/sleep.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/sleep.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/sleep.S</a></div><div class='hunk'>@@ -13,10 +13,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MDREFR_KDIV	0x200a4000	// all banks</div><div class='ctx'> #define CCCR_SLEEP	0x00000107	// L=7 2N=2 A=0 PPDIS=0 CPDIS=0</div><div class='head'>diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c<br/>index 762249c03ded..b569f3b4cf3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/spitz.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/spitz.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/spitz.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/spitz.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -35,18 +35,20 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa27x-udc.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/ohci.h&gt;</div><div class='del'>-#include &lt;asm/arch/udc.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='del'>-#include &lt;asm/arch/akita.h&gt;</div><div class='del'>-#include &lt;asm/arch/spitz.h&gt;</div><div class='del'>-#include &lt;asm/arch/sharpsl.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/pxa27x-udc.h&gt;</div><div class='add'>+#include &lt;mach/reset.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/akita.h&gt;</div><div class='add'>+#include &lt;mach/spitz.h&gt;</div><div class='add'>+#include &lt;mach/sharpsl.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/sharpsl_param.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/scoop.h&gt;</div><div class='hunk'>@@ -573,6 +575,7 @@ static void __init common_init(void)</div><div class='ctx'> 	pxa_set_ficp_info(&amp;spitz_ficp_platform_data);</div><div class='ctx'> 	set_pxa_fb_parent(&amp;spitzssp_device.dev);</div><div class='ctx'> 	set_pxa_fb_info(&amp;spitz_pxafb_info);</div><div class='add'>+	pxa_set_i2c_info(NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI)</div><div class='head'>diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c<br/>index 360354084ae4..8a40505dfd28 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/spitz_pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/spitz_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/spitz_pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/spitz_pm.c</a></div><div class='hunk'>@@ -20,14 +20,14 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/scoop.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/sharpsl.h&gt;</div><div class='del'>-#include &lt;asm/arch/spitz.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/sharpsl.h&gt;</div><div class='add'>+#include &lt;mach/spitz.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='ctx'> #include "sharpsl.h"</div><div class='ctx'> </div><div class='ctx'> #define SHARPSL_CHARGE_ON_VOLT         0x99  /* 2.9V */</div><div class='head'>diff --git a/arch/arm/mach-pxa/ssp.c b/arch/arm/mach-pxa/ssp.c<br/>index 89f38683787e..9bd93c5f28b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/ssp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/ssp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/ssp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/ssp.c</a></div><div class='hunk'>@@ -31,10 +31,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/ssp.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-ssp.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/ssp.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/regs-ssp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define TIMEOUT 100000</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/standby.S b/arch/arm/mach-pxa/standby.S<br/>index 40bb70eff3fe..f3821cfda72f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/standby.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/standby.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/standby.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/standby.S</a></div><div class='hunk'>@@ -11,10 +11,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.text</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/tavorevb.c b/arch/arm/mach-pxa/tavorevb.c<br/>index ac283507e423..589d32b4fc46 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/tavorevb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/tavorevb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/tavorevb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/tavorevb.c</a></div><div class='hunk'>@@ -21,9 +21,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa3xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa930.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa3xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa930.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "devices.h"</div><div class='ctx'> #include "generic.h"</div><div class='head'>diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c<br/>index 7b7c0179795b..67e18509d7bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/time.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;asm/cnt32_to_63.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-pxa/tosa-bt.c b/arch/arm/mach-pxa/tosa-bt.c<br/>index 7d8505466e54..fb0294bd4310 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/tosa-bt.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/tosa-bt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/tosa-bt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/tosa-bt.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/rfkill.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/tosa_bt.h&gt;</div><div class='add'>+#include &lt;mach/tosa_bt.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void tosa_bt_on(struct tosa_bt_data *data)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c<br/>index fea17ce6b55f..9f3ef9eb32e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/tosa.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/tosa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/tosa.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/tosa.c</a></div><div class='hunk'>@@ -34,21 +34,23 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa25x.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/i2c.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/udc.h&gt;</div><div class='del'>-#include &lt;asm/arch/tosa_bt.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa25x.h&gt;</div><div class='add'>+#include &lt;mach/reset.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/udc.h&gt;</div><div class='add'>+#include &lt;mach/tosa_bt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/arch/tosa.h&gt;</div><div class='add'>+#include &lt;mach/tosa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/scoop.h&gt;</div><div class='ctx'> #include &lt;asm/mach/sharpsl_param.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='add'>+#include "clock.h"</div><div class='ctx'> #include "devices.h"</div><div class='ctx'> </div><div class='ctx'> static unsigned long tosa_pin_config[] = {</div><div class='hunk'>@@ -520,6 +522,14 @@ static struct gpio_keys_button tosa_gpio_keys[] = {</div><div class='ctx'> 		.wakeup	= 1,</div><div class='ctx'> 		.active_low = 1,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.type	= EV_SW,</div><div class='add'>+		.code	= SW_HEADPHONE_INSERT,</div><div class='add'>+		.gpio	= TOSA_GPIO_EAR_IN,</div><div class='add'>+		.desc	= "HeadPhone insert",</div><div class='add'>+		.active_low = 1,</div><div class='add'>+		.debounce_interval = 300,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct gpio_keys_platform_data tosa_gpio_keys_platform_data = {</div><div class='hunk'>@@ -791,6 +801,8 @@ static void __init tosa_init(void)</div><div class='ctx'> 	pxa_set_i2c_info(NULL);</div><div class='ctx'> 	platform_scoop_config = &amp;tosa_pcmcia_config;</div><div class='ctx'> </div><div class='add'>+	clk_add_alias("CLK_CK3P6MI", &amp;tc6393xb_device.dev, "GPIO11_CLK", NULL);</div><div class='add'>+</div><div class='ctx'> 	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c<br/>index 12811b7aea07..3ed757e6bcc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/trizeps4.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/trizeps4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/trizeps4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/trizeps4.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -40,15 +40,15 @@</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/trizeps4.h&gt;</div><div class='del'>-#include &lt;asm/arch/audio.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/ohci.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/trizeps4.h&gt;</div><div class='add'>+#include &lt;mach/audio.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "devices.h"</div><div class='head'>diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c<br/>index 8fca6d890b7d..0cb65b5772fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/zylonite.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/zylonite.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/zylonite.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/zylonite.c</a></div><div class='hunk'>@@ -23,14 +23,14 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/audio.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxafb.h&gt;</div><div class='del'>-#include &lt;asm/arch/zylonite.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa27x_keypad.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa3xx_nand.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/audio.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/pxafb.h&gt;</div><div class='add'>+#include &lt;mach/zylonite.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/pxa27x_keypad.h&gt;</div><div class='add'>+#include &lt;mach/pxa3xx_nand.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "devices.h"</div><div class='ctx'> #include "generic.h"</div><div class='head'>diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c<br/>index b28d46e081d3..095f5c648236 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/zylonite_pxa300.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/zylonite_pxa300.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/zylonite_pxa300.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/zylonite_pxa300.c</a></div><div class='hunk'>@@ -20,9 +20,9 @@</div><div class='ctx'> #include &lt;linux/i2c/pca953x.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa300.h&gt;</div><div class='del'>-#include &lt;asm/arch/i2c.h&gt;</div><div class='del'>-#include &lt;asm/arch/zylonite.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa300.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='add'>+#include &lt;mach/zylonite.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c<br/>index 2b7fba7a2921..9879d7da2df5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/zylonite_pxa320.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-pxa/zylonite_pxa320.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/zylonite_pxa320.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-pxa/zylonite_pxa320.c</a></div><div class='hunk'>@@ -17,9 +17,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mfp-pxa320.h&gt;</div><div class='del'>-#include &lt;asm/arch/zylonite.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/mfp-pxa320.h&gt;</div><div class='add'>+#include &lt;mach/zylonite.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c<br/>index 131990d196f5..4f9c84ab781c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-realview/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/core.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-realview/board-eb.h b/arch/arm/mach-realview/include/mach/board-eb.h<br/>index 206f7a752882..8d699fd324d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/board-eb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/board-eb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/board-eb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/board-eb.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-realview/board-eb.h</div><div class='add'>+ * arch/arm/mach-realview/include/mach/board-eb.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 ARM Limited</div><div class='ctx'>  *</div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_BOARD_EB_H</div><div class='ctx'> #define __ASM_ARCH_BOARD_EB_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/platform.h&gt;</div><div class='add'>+#include &lt;mach/platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * RealView EB + ARM11MPCore peripheral addresses</div><div class='head'>diff --git a/include/asm-arm/arch-realview/board-pb1176.h b/arch/arm/mach-realview/include/mach/board-pb1176.h<br/>index 48ce9c833705..858eea7b1adc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/board-pb1176.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/board-pb1176.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/board-pb1176.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/board-pb1176.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-realview/board-pb1176.h</div><div class='add'>+ * arch/arm/mach-realview/include/mach/board-pb1176.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2008 ARM Limited</div><div class='ctx'>  *</div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_BOARD_PB1176_H</div><div class='ctx'> #define __ASM_ARCH_BOARD_PB1176_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/platform.h&gt;</div><div class='add'>+#include &lt;mach/platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Peripheral addresses</div><div class='head'>diff --git a/include/asm-arm/arch-realview/board-pb11mp.h b/arch/arm/mach-realview/include/mach/board-pb11mp.h<br/>index a1294d915fa8..ecd80e58631e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/board-pb11mp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/board-pb11mp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/board-pb11mp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/board-pb11mp.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-realview/board-pb11mp.h</div><div class='add'>+ * arch/arm/mach-realview/include/mach/board-pb11mp.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2008 ARM Limited</div><div class='ctx'>  *</div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_BOARD_PB11MP_H</div><div class='ctx'> #define __ASM_ARCH_BOARD_PB11MP_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/platform.h&gt;</div><div class='add'>+#include &lt;mach/platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Peripheral addresses</div><div class='head'>diff --git a/include/asm-arm/arch-realview/debug-macro.S b/arch/arm/mach-realview/include/mach/debug-macro.S<br/>index c8c860c3c26e..7196bcadff0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-realview/debug-macro.S</div><div class='add'>+/* arch/arm/mach-realview/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-realview/dma.h b/arch/arm/mach-realview/include/mach/dma.h<br/>index 8342e3f9d6ec..f1a5a1a10952 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-realview/dma.h</div><div class='add'>+ *  arch/arm/mach-realview/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 ARM Limited.</div><div class='ctx'>  *  Copyright (C) 1997,1998 Russell King</div><div class='head'>diff --git a/include/asm-arm/arch-realview/entry-macro.S b/arch/arm/mach-realview/include/mach/entry-macro.S<br/>index cd26306d8e57..340a5c276946 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-realview/entry-macro.S</div><div class='add'>+ * arch/arm/mach-realview/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for RealView platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='head'>diff --git a/include/asm-arm/arch-realview/hardware.h b/arch/arm/mach-realview/include/mach/hardware.h<br/>index 1ee8313ceb6a..79a93b3dfca9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-realview/hardware.h</div><div class='add'>+ *  arch/arm/mach-realview/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  *  This file contains the hardware definitions of the RealView boards.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-realview/io.h b/arch/arm/mach-realview/include/mach/io.h<br/>index c70f1dfbe135..aa069424d310 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-realview/io.h</div><div class='add'>+ *  arch/arm/mach-realview/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 ARM Limited</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-realview/irqs.h b/arch/arm/mach-realview/include/mach/irqs.h<br/>index ccbac59235c6..02a918529db3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-realview/irqs.h</div><div class='add'>+ *  arch/arm/mach-realview/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd.</div><div class='hunk'>@@ -22,9 +22,9 @@</div><div class='ctx'> #ifndef __ASM_ARCH_IRQS_H</div><div class='ctx'> #define __ASM_ARCH_IRQS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board-eb.h&gt;</div><div class='del'>-#include &lt;asm/arch/board-pb11mp.h&gt;</div><div class='del'>-#include &lt;asm/arch/board-pb1176.h&gt;</div><div class='add'>+#include &lt;mach/board-eb.h&gt;</div><div class='add'>+#include &lt;mach/board-pb11mp.h&gt;</div><div class='add'>+#include &lt;mach/board-pb1176.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IRQ_LOCALTIMER		29</div><div class='ctx'> #define IRQ_LOCALWDOG		30</div><div class='head'>diff --git a/include/asm-arm/arch-realview/memory.h b/arch/arm/mach-realview/include/mach/memory.h<br/>index ed370abb638f..0e673483a141 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-realview/memory.h</div><div class='add'>+ *  arch/arm/mach-realview/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 ARM Limited</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-realview/platform.h b/arch/arm/mach-realview/include/mach/platform.h<br/>index 424c0aaf46a0..4034b54950c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/platform.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/platform.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/platform.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-realview/platform.h</div><div class='add'>+ * arch/arm/mach-realview/include/mach/platform.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) ARM Limited 2003.  All rights reserved.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-realview/scu.h b/arch/arm/mach-realview/include/mach/scu.h<br/>index d55802d645af..d55802d645af 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/scu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/scu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/scu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/scu.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-realview/smp.h b/arch/arm/mach-realview/include/mach/smp.h<br/>index 515819efd046..515819efd046 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/smp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/smp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/smp.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-realview/system.h b/arch/arm/mach-realview/include/mach/system.h<br/>index 6f3d0ce0ca1e..4d3c8f3f8053 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-realview/system.h</div><div class='add'>+ *  arch/arm/mach-realview/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd</div><div class='hunk'>@@ -21,9 +21,9 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/platform.h&gt;</div><div class='add'>+#include &lt;mach/platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-realview/timex.h b/arch/arm/mach-realview/include/mach/timex.h<br/>index 5b9d82d0a5e0..4eeb069373c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-realview/timex.h</div><div class='add'>+ *  arch/arm/mach-realview/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  *  RealView architecture timex specifications</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-realview/uncompress.h b/arch/arm/mach-realview/include/mach/uncompress.h<br/>index 4c905d7a13a1..79f50f218e77 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-realview/uncompress.h</div><div class='add'>+ *  arch/arm/mach-realview/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 ARM Limited</div><div class='ctx'>  *</div><div class='hunk'>@@ -17,12 +17,12 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board-eb.h&gt;</div><div class='del'>-#include &lt;asm/arch/board-pb11mp.h&gt;</div><div class='del'>-#include &lt;asm/arch/board-pb1176.h&gt;</div><div class='add'>+#include &lt;mach/board-eb.h&gt;</div><div class='add'>+#include &lt;mach/board-pb11mp.h&gt;</div><div class='add'>+#include &lt;mach/board-pb1176.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define AMBA_UART_DR(base)	(*(volatile unsigned char *)((base) + 0x00))</div><div class='ctx'> #define AMBA_UART_LCRH(base)	(*(volatile unsigned char *)((base) + 0x2c))</div><div class='head'>diff --git a/include/asm-arm/arch-realview/vmalloc.h b/arch/arm/mach-realview/include/mach/vmalloc.h<br/>index 0ad49af186af..48cbcc873db2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-realview/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-realview/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-realview/vmalloc.h</div><div class='add'>+ *  arch/arm/mach-realview/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Russell King.</div><div class='head'>diff --git a/arch/arm/mach-realview/localtimer.c b/arch/arm/mach-realview/localtimer.c<br/>index 50604360479f..82fa1f26e026 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/localtimer.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-realview/localtimer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/localtimer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/localtimer.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/arm_twd.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/gic.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c<br/>index 8e813ed57519..1907d22f4fed 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/platsmp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-realview/platsmp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/platsmp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/platsmp.c</a></div><div class='hunk'>@@ -15,13 +15,13 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board-eb.h&gt;</div><div class='del'>-#include &lt;asm/arch/board-pb11mp.h&gt;</div><div class='del'>-#include &lt;asm/arch/scu.h&gt;</div><div class='add'>+#include &lt;mach/board-eb.h&gt;</div><div class='add'>+#include &lt;mach/board-pb11mp.h&gt;</div><div class='add'>+#include &lt;mach/scu.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void realview_secondary_startup(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c<br/>index 5782d83fd886..19a9968fc5b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_eb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-realview/realview_eb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_eb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/realview_eb.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='hunk'>@@ -38,8 +38,8 @@</div><div class='ctx'> #include &lt;asm/mach/mmc.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board-eb.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/board-eb.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "clock.h"</div><div class='head'>diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c<br/>index cf7f576a5860..0986cbd15943 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_pb1176.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-realview/realview_pb1176.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_pb1176.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/realview_pb1176.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='hunk'>@@ -39,8 +39,8 @@</div><div class='ctx'> #include &lt;asm/mach/mmc.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board-pb1176.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/board-pb1176.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "clock.h"</div><div class='head'>diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c<br/>index f7ce1c5a178a..f4e7135e3eb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_pb11mp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-realview/realview_pb11mp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_pb11mp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-realview/realview_pb11mp.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='hunk'>@@ -39,8 +39,8 @@</div><div class='ctx'> #include &lt;asm/mach/mmc.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board-pb11mp.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/board-pb11mp.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "clock.h"</div><div class='head'>diff --git a/arch/arm/mach-rpc/dma.c b/arch/arm/mach-rpc/dma.c<br/>index 596379a4cf82..4b19fe484190 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/dma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-rpc/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/dma.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;asm/fiq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/dma.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-rpc/acornfb.h b/arch/arm/mach-rpc/include/mach/acornfb.h<br/>index ecb7733a0949..395d76288ffe 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-rpc/acornfb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-rpc/acornfb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/include/mach/acornfb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/acornfb.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-rpc/acornfb.h</div><div class='add'>+ *  arch/arm/mach-rpc/include/mach/acornfb.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-rpc/debug-macro.S b/arch/arm/mach-rpc/include/mach/debug-macro.S<br/>index c634c8d8f4a1..b2a939ffdcde 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-rpc/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-rpc/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-rpc/debug-macro.S</div><div class='add'>+/* arch/arm/mach-rpc/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-rpc/dma.h b/arch/arm/mach-rpc/include/mach/dma.h<br/>index d24a27e30b93..360b56f8f29f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-rpc/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-rpc/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-rpc/dma.h</div><div class='add'>+ *  arch/arm/mach-rpc/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-cl7500/entry-macro.S b/arch/arm/mach-rpc/include/mach/entry-macro.S<br/>index 038b761fdadc..4e7e54144093 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-cl7500/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-cl7500/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/entry-macro-iomd.S&gt;</div><div class='ctx'> </div><div class='ctx'> 	.equ	ioc_base_high, IOC_BASE &amp; 0xff000000</div><div class='head'>diff --git a/include/asm-arm/arch-rpc/hardware.h b/arch/arm/mach-rpc/include/mach/hardware.h<br/>index 7480f4e8d974..dde6b3c0e299 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-rpc/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-rpc/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-rpc/hardware.h</div><div class='add'>+ *  arch/arm/mach-rpc/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996-1999 Russell King.</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_HARDWARE_H</div><div class='ctx'> #define __ASM_ARCH_HARDWARE_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/memory.h&gt;</div><div class='add'>+#include &lt;mach/memory.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> #define IOMEM(x) ((void __iomem *)(unsigned long)(x))</div><div class='head'>diff --git a/include/asm-arm/arch-rpc/io.h b/arch/arm/mach-rpc/include/mach/io.h<br/>index 6bd2295c0e01..9f0553b7ec28 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-rpc/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-rpc/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-rpc/io.h</div><div class='add'>+ *  arch/arm/mach-rpc/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997 Russell King</div><div class='ctx'>  *</div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #ifndef __ASM_ARM_ARCH_IO_H</div><div class='ctx'> #define __ASM_ARM_ARCH_IO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT 0xffffffff</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-rpc/irqs.h b/arch/arm/mach-rpc/include/mach/irqs.h<br/>index 27c35b05b27d..4ce6ca97f669 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-rpc/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-rpc/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-rpc/irqs.h</div><div class='add'>+ *  arch/arm/mach-rpc/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-rpc/memory.h b/arch/arm/mach-rpc/include/mach/memory.h<br/>index 303c424ce673..05425d558ee7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-rpc/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-rpc/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-rpc/memory.h</div><div class='add'>+ *  arch/arm/mach-rpc/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996,1997,1998 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-rpc/system.h b/arch/arm/mach-rpc/include/mach/system.h<br/>index 729c2ae4b513..54d6e3f2d319 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-rpc/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-rpc/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-rpc/system.h</div><div class='add'>+ *  arch/arm/mach-rpc/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996-1999 Russell King.</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iomd.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-rpc/timex.h b/arch/arm/mach-rpc/include/mach/timex.h<br/>index ed7df64d960b..dd75e7387bbe 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-rpc/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-rpc/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-rpc/timex.h</div><div class='add'>+ *  arch/arm/mach-rpc/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997, 1998 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-rpc/uncompress.h b/arch/arm/mach-rpc/include/mach/uncompress.h<br/>index b8e29efd8c5b..baa9c866d7bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-rpc/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-rpc/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-rpc/uncompress.h</div><div class='add'>+ *  arch/arm/mach-rpc/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996 Russell King</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #define VIDMEM ((char *)SCREEN_START)</div><div class='ctx'>  </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-rpc/vmalloc.h b/arch/arm/mach-rpc/include/mach/vmalloc.h<br/>index 077046bb2f36..9a96fd69e705 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-rpc/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-rpc/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-rpc/vmalloc.h</div><div class='add'>+ *  arch/arm/mach-rpc/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c<br/>index eca558c6bf5d..ce8470fea887 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/riscpc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-rpc/riscpc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/riscpc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-rpc/riscpc.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/domain.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2400/gpio.c b/arch/arm/mach-s3c2400/gpio.c<br/>index 758e160410e9..148d0ddef3e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2400/gpio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2400/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2400/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2400/gpio.c</a></div><div class='hunk'>@@ -25,11 +25,11 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> int s3c2400_gpio_getirq(unsigned int pin)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2400/map.h b/arch/arm/mach-s3c2400/include/mach/map.h<br/>index 1184d907b31e..1535540edc82 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2400/map.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2400/map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2400/include/mach/map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2400/include/mach/map.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2400/map.h</div><div class='add'>+/* arch/arm/mach-s3c2400/include/mach/map.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2003,2007  Simtec Electronics</div><div class='ctx'>  *	http://armlinux.simtec.co.uk/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2400/memory.h b/arch/arm/mach-s3c2400/include/mach/memory.h<br/>index fb0381dde704..8f4878e4f591 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2400/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2400/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2400/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2400/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2400/memory.h</div><div class='del'>- *  from linux/include/asm-arm/arch-rpc/memory.h</div><div class='add'>+/* arch/arm/mach-s3c2400/include/mach/memory.h</div><div class='add'>+ *  from arch/arm/mach-rpc/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright 2007 Simtec Electronics</div><div class='ctx'>  *	http://armlinux.simtec.co.uk/</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/bast-ide.c b/arch/arm/mach-s3c2410/bast-ide.c<br/>index df95fe37cdc8..298ececfa366 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/bast-ide.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/bast-ide.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/bast-ide.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/bast-ide.c</a></div><div class='hunk'>@@ -24,9 +24,9 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/bast-map.h&gt;</div><div class='del'>-#include &lt;asm/arch/bast-irq.h&gt;</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='add'>+#include &lt;mach/bast-map.h&gt;</div><div class='add'>+#include &lt;mach/bast-irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* IDE ports */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c<br/>index 76a7cb15f3be..c66021b5fa4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/bast-irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/bast-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/bast-irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/bast-irq.c</a></div><div class='hunk'>@@ -28,15 +28,15 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/bast-map.h&gt;</div><div class='del'>-#include &lt;asm/arch/bast-irq.h&gt;</div><div class='add'>+#include &lt;mach/regs-irq.h&gt;</div><div class='add'>+#include &lt;mach/bast-map.h&gt;</div><div class='add'>+#include &lt;mach/bast-irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/irq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c<br/>index 2bfaa6102025..1322851d1acb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/clock.c</a></div><div class='hunk'>@@ -34,12 +34,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c<br/>index 8f12e855ef5f..8730797749e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/dma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/dma.c</a></div><div class='hunk'>@@ -18,17 +18,17 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-ac97.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-mem.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-sdi.h&gt;</div><div class='add'>+#include &lt;mach/regs-mem.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-sdi.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/regs-iis.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/regs-spi.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2410/gpio.c b/arch/arm/mach-s3c2410/gpio.c<br/>index 01e795d1146e..c6eefb1d590c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/gpio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/gpio.c</a></div><div class='hunk'>@@ -26,11 +26,11 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,</div><div class='ctx'> 			   unsigned int config)</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/h1940-bluetooth.c b/arch/arm/mach-s3c2410/h1940-bluetooth.c<br/>index 3c48886521e7..5a6bc56f186b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/h1940-bluetooth.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/h1940-bluetooth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/h1940-bluetooth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/h1940-bluetooth.c</a></div><div class='hunk'>@@ -16,9 +16,9 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/h1940-latch.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/h1940-latch.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME              "h1940-bt"</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/anubis-cpld.h b/arch/arm/mach-s3c2410/include/mach/anubis-cpld.h<br/>index 168b93fee529..1b614d5a81f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/anubis-cpld.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/anubis-cpld.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/anubis-cpld.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/anubis-cpld.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/anubis-cpld.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/anubis-cpld.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2005 Simtec Electronics</div><div class='ctx'>  *	http://www.simtec.co.uk/products/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/anubis-irq.h b/arch/arm/mach-s3c2410/include/mach/anubis-irq.h<br/>index cd77a70d45c0..a2a328134e34 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/anubis-irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/anubis-irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/anubis-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/anubis-irq.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/anubis-irq.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/anubis-irq.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2005 Simtec Electronics</div><div class='ctx'>  *	http://www.simtec.co.uk/products/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/anubis-map.h b/arch/arm/mach-s3c2410/include/mach/anubis-map.h<br/>index 830d114261da..c9deb3a5b2c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/anubis-map.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/anubis-map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/anubis-map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/anubis-map.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/anubis-map.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/anubis-map.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2005 Simtec Electronics</div><div class='ctx'>  *	http://www.simtec.co.uk/products/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/audio.h b/arch/arm/mach-s3c2410/include/mach/audio.h<br/>index 0a6977fb5770..de0e8da48bc3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/audio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/audio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/audio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/audio.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/audio.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/audio.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2004-2005 Simtec Electronics</div><div class='ctx'>  *	http://www.simtec.co.uk/products/SWLINUX/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/bast-cpld.h b/arch/arm/mach-s3c2410/include/mach/bast-cpld.h<br/>index 034d2c5a47c4..20493b048360 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/bast-cpld.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/bast-cpld.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/bast-cpld.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/bast-cpld.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/bast-cpld.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/bast-cpld.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003,2004 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/bast-irq.h b/arch/arm/mach-s3c2410/include/mach/bast-irq.h<br/>index 726c0466f85a..501c202b53cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/bast-irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/bast-irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/bast-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/bast-irq.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/bast-irq.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/bast-irq.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003,2004 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/bast-map.h b/arch/arm/mach-s3c2410/include/mach/bast-map.h<br/>index 86ac1c108db8..c2c5baf07345 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/bast-map.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/bast-map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/bast-map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/bast-map.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/bast-map.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/bast-map.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003,2004 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/bast-pmu.h b/arch/arm/mach-s3c2410/include/mach/bast-pmu.h<br/>index 37a11fe54a78..61684cb8ce59 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/bast-pmu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/bast-pmu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/bast-pmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/bast-pmu.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/bast-pmu.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/bast-pmu.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003,2004 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/debug-macro.S b/arch/arm/mach-s3c2410/include/mach/debug-macro.S<br/>index 89076c322726..682df23087ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/debug-macro.S</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,8 +12,8 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define S3C2410_UART1_OFF (0x4000)</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/dma.h b/arch/arm/mach-s3c2410/include/mach/dma.h<br/>index 4f291d9b7d93..891b53cd69b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/dma.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/dma.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2003,2004,2006 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #define __ASM_ARCH_DMA_H __FILE__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is the maximum DMA address(physical address) that can be DMAd to.</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/entry-macro.S b/arch/arm/mach-s3c2410/include/mach/entry-macro.S<br/>index bbec0a8ff158..473b3cd37d9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-s3c2410/entry-macro.S</div><div class='add'>+ * arch/arm/mach-s3c2410/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for S3C2410-based platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #define INTPND		(0x10)</div><div class='ctx'> #define INTOFFSET	(0x14)</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro  get_irqnr_preamble, base, tmp</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/fb.h b/arch/arm/mach-s3c2410/include/mach/fb.h<br/>index 5d0262601a7e..eee0654eb8fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/fb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/fb.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/fb.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/fb.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2004 Arnaud Patard &lt;arnaud.patard@rtp-net.org&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #ifndef __ASM_ARM_FB_H</div><div class='ctx'> #define __ASM_ARM_FB_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct s3c2410fb_hw {</div><div class='ctx'> 	unsigned long	lcdcon1;</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/gpio.h b/arch/arm/mach-s3c2410/include/mach/gpio.h<br/>index 18e10d2c35ea..3b52b86498a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/gpio.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/gpio.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2008 Simtec Electronics</div><div class='ctx'>  *	http://armlinux.simtec.co.uk/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/h1940-latch.h b/arch/arm/mach-s3c2410/include/mach/h1940-latch.h<br/>index c3de5ab102eb..d8a832729a8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/h1940-latch.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/h1940-latch.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/h1940-latch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/h1940-latch.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/h1940-latch.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/h1940-latch.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2005 Simtec Electronics</div><div class='ctx'>  *	http://armlinux.simtec.co.uk/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/h1940.h b/arch/arm/mach-s3c2410/include/mach/h1940.h<br/>index 6135592e60f2..4559784129c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/h1940.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/h1940.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/h1940.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/h1940.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/h1940.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/h1940.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Ben Dooks &lt;ben-linux@fluff.org&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/hardware.h b/arch/arm/mach-s3c2410/include/mach/hardware.h<br/>index 29592c3ebf22..74d5a1a4024c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/hardware.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='hunk'>@@ -13,10 +13,6 @@</div><div class='ctx'> #ifndef __ASM_ARCH_HARDWARE_H</div><div class='ctx'> #define __ASM_ARCH_HARDWARE_H</div><div class='ctx'> </div><div class='del'>-#ifndef __ASM_HARDWARE_H</div><div class='del'>-#error "Do not include this directly, instead #include &lt;asm/hardware.h&gt;"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> /* external functions for GPIO support</div><div class='hunk'>@@ -131,7 +127,7 @@ extern int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state);</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='del'>-#include &lt;asm/arch/map.h&gt;</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* machine specific hardware definitions should go after this */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/idle.h b/arch/arm/mach-s3c2410/include/mach/idle.h<br/>index eed450608f9c..e9ddd706b16e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/idle.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/idle.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/idle.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/idle.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/idle.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/idle.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2004 Simtec Electronics &lt;linux@simtec.co.uk&gt;</div><div class='ctx'>  *		http://www.simtec.co.uk/products/SWLINUX/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/io.h b/arch/arm/mach-s3c2410/include/mach/io.h<br/>index 6b35a4f2630e..9813dbf2ae4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/io.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-s3c2410/io.h</div><div class='del'>- *  from linux/include/asm-arm/arch-rpc/io.h</div><div class='add'>+ * arch/arm/mach-s3c2410/include/mach/io.h</div><div class='add'>+ *  from arch/arm/mach-rpc/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1997 Russell King</div><div class='ctx'>  *	     (C) 2003 Simtec Electronics</div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #ifndef __ASM_ARM_ARCH_IO_H</div><div class='ctx'> #define __ASM_ARM_ARCH_IO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT 0xffffffff</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/irqs.h b/arch/arm/mach-s3c2410/include/mach/irqs.h<br/>index f5435d8c3769..950c71bf1489 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/irqs.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003-2005 Simtec Electronics</div><div class='ctx'>  *   Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/leds-gpio.h b/arch/arm/mach-s3c2410/include/mach/leds-gpio.h<br/>index 800846ebddba..d8a7672519b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/leds-gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/leds-gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/leds-gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/leds-gpio.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/leds-gpio.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/leds-gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2006 Simtec Electronics</div><div class='ctx'>  *	http://armlinux.simtec.co.uk/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/map.h b/arch/arm/mach-s3c2410/include/mach/map.h<br/>index b33ed3b05ef5..64bf7e94a5bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/map.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/map.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/map.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/map.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/memory.h b/arch/arm/mach-s3c2410/include/mach/memory.h<br/>index 533e2436e707..93782628a786 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/memory.h</div><div class='del'>- *  from linux/include/asm-arm/arch-rpc/memory.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/memory.h</div><div class='add'>+ *  from arch/arm/mach-rpc/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1996,1997,1998 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/osiris-cpld.h b/arch/arm/mach-s3c2410/include/mach/osiris-cpld.h<br/>index 229ab2351db6..e9e36b0abbac 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/osiris-cpld.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/osiris-cpld.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/osiris-cpld.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/osiris-cpld.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/osiris-cpld.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/osiris-cpld.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2005 Simtec Electronics</div><div class='ctx'>  *	http://www.simtec.co.uk/products/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/osiris-map.h b/arch/arm/mach-s3c2410/include/mach/osiris-map.h<br/>index b5c74d2b9aaa..639eff523d4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/osiris-map.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/osiris-map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/osiris-map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/osiris-map.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/osiris-map.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/osiris-map.h</div><div class='ctx'>  *</div><div class='ctx'>  * (c) 2005 Simtec Electronics</div><div class='ctx'>  *	http://www.simtec.co.uk/products/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/otom-map.h b/arch/arm/mach-s3c2410/include/mach/otom-map.h<br/>index e40c93429854..f9277a52c145 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/otom-map.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/otom-map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/otom-map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/otom-map.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/otom-map.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/otom-map.h</div><div class='ctx'>  *</div><div class='ctx'>  * (c) 2005 Guillaume GOURAT / NexVision</div><div class='ctx'>  *          guillaume.gourat@nexvision.fr</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/regs-clock.h b/arch/arm/mach-s3c2410/include/mach/regs-clock.h<br/>index 37661358b42b..b3f90aa78076 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/regs-clock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/regs-clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/regs-clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-clock.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/regs-clock.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/regs-clock.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003,2004,2005,2006 Simtec Electronics &lt;linux@simtec.co.uk&gt;</div><div class='ctx'>  *		      http://armlinux.simtec.co.uk/</div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARM_REGS_CLOCK</div><div class='del'>-#define __ASM_ARM_REGS_CLOCK "$Id: clock.h,v 1.4 2003/04/30 14:50:51 ben Exp $"</div><div class='add'>+#define __ASM_ARM_REGS_CLOCK</div><div class='ctx'> </div><div class='ctx'> #define S3C2410_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR)</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/regs-dsc.h b/arch/arm/mach-s3c2410/include/mach/regs-dsc.h<br/>index 1235df70f34e..3c3853cd3cf7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/regs-dsc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/regs-dsc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/regs-dsc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-dsc.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/regs-dsc.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/regs-dsc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2004 Simtec Electronics &lt;linux@simtec.co.uk&gt;</div><div class='ctx'>  *		      http://www.simtec.co.uk/products/SWLINUX/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/regs-gpio.h b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h<br/>index 497dd06e2c99..528080ceac44 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/regs-gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/regs-gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/regs-gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-gpio.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/regs-gpio.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/regs-gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003,2004 Simtec Electronics &lt;linux@simtec.co.uk&gt;</div><div class='ctx'>  *		           http://www.simtec.co.uk/products/SWLINUX/</div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_REGS_GPIO_H</div><div class='del'>-#define __ASM_ARCH_REGS_GPIO_H "$Id: gpio.h,v 1.5 2003/05/19 12:51:08 ben Exp $"</div><div class='add'>+#define __ASM_ARCH_REGS_GPIO_H</div><div class='ctx'> </div><div class='ctx'> #define S3C2410_GPIONO(bank,offset) ((bank) + (offset))</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/regs-gpioj.h b/arch/arm/mach-s3c2410/include/mach/regs-gpioj.h<br/>index 0362332faaf0..1202ca5e99f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/regs-gpioj.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/regs-gpioj.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/regs-gpioj.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-gpioj.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/regs-gpioj.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/regs-gpioj.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2004 Simtec Electronics &lt;linux@simtec.co.uk&gt;</div><div class='ctx'>  *		      http://www.simtec.co.uk/products/SWLINUX/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/regs-irq.h b/arch/arm/mach-s3c2410/include/mach/regs-irq.h<br/>index 498184cb8adc..de86ee8812bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/regs-irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/regs-irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/regs-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-irq.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/regs-irq.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/regs-irq.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003 Simtec Electronics &lt;linux@simtec.co.uk&gt;</div><div class='ctx'>  *		      http://www.simtec.co.uk/products/SWLINUX/</div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifndef ___ASM_ARCH_REGS_IRQ_H</div><div class='del'>-#define ___ASM_ARCH_REGS_IRQ_H "$Id: irq.h,v 1.3 2003/03/25 21:29:06 ben Exp $"</div><div class='add'>+#define ___ASM_ARCH_REGS_IRQ_H</div><div class='ctx'> </div><div class='ctx'> /* interrupt controller */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/regs-lcd.h b/arch/arm/mach-s3c2410/include/mach/regs-lcd.h<br/>index bd854845697f..ee8f040aff5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/regs-lcd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/regs-lcd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/regs-lcd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-lcd.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/regs-lcd.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/regs-lcd.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003 Simtec Electronics &lt;linux@simtec.co.uk&gt;</div><div class='ctx'>  *		      http://www.simtec.co.uk/products/SWLINUX/</div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifndef ___ASM_ARCH_REGS_LCD_H</div><div class='del'>-#define ___ASM_ARCH_REGS_LCD_H "$Id: lcd.h,v 1.3 2003/06/26 13:25:06 ben Exp $"</div><div class='add'>+#define ___ASM_ARCH_REGS_LCD_H</div><div class='ctx'> </div><div class='ctx'> #define S3C2410_LCDREG(x)	(x)</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/regs-mem.h b/arch/arm/mach-s3c2410/include/mach/regs-mem.h<br/>index 312ff93b63c6..57759804e2fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/regs-mem.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/regs-mem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/regs-mem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-mem.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/regs-mem.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/regs-mem.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2004 Simtec Electronics &lt;linux@simtec.co.uk&gt;</div><div class='ctx'>  *		http://www.simtec.co.uk/products/SWLINUX/</div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARM_MEMREGS_H</div><div class='del'>-#define __ASM_ARM_MEMREGS_H "$Id: regs.h,v 1.8 2003/05/01 15:55:41 ben Exp $"</div><div class='add'>+#define __ASM_ARM_MEMREGS_H</div><div class='ctx'> </div><div class='ctx'> #ifndef S3C2410_MEMREG</div><div class='ctx'> #define S3C2410_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x))</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/regs-power.h b/arch/arm/mach-s3c2410/include/mach/regs-power.h<br/>index 13d13b7cfe98..2d36353f57d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/regs-power.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/regs-power.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/regs-power.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-power.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/regs-power.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/regs-power.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003,2004,2005,2006 Simtec Electronics &lt;linux@simtec.co.uk&gt;</div><div class='ctx'>  *		      http://armlinux.simtec.co.uk/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/regs-s3c2412-mem.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h<br/>index c8c793e78936..a4bf27123170 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/regs-s3c2412-mem.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/regs-s3c2412-mem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/regs-s3c2412-mem.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2008 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/regs-s3c2412.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h<br/>index 783b18f5bcea..aa69dc79bc38 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/regs-s3c2412.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/regs-s3c2412.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/regs-s3c2412.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2007 Simtec Electronics</div><div class='ctx'>  *	http://armlinux.simtec.co.uk/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h<br/>index c1414658d1c5..6026d091a2fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2007 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='hunk'>@@ -48,11 +48,11 @@</div><div class='ctx'> #define S3C2443_CLKSRC_I2S_EPLLREF3	(3&lt;&lt;14)</div><div class='ctx'> #define S3C2443_CLKSRC_I2S_MASK		(3&lt;&lt;14)</div><div class='ctx'> </div><div class='del'>-#define S3C2443_CLKSRC_EPLLREF_XTAL	(2&lt;&lt;8)</div><div class='del'>-#define S3C2443_CLKSRC_EPLLREF_EXTCLK	(3&lt;&lt;8)</div><div class='del'>-#define S3C2443_CLKSRC_EPLLREF_MPLLREF	(0&lt;&lt;8)</div><div class='del'>-#define S3C2443_CLKSRC_EPLLREF_MPLLREF2	(1&lt;&lt;8)</div><div class='del'>-#define S3C2443_CLKSRC_EPLLREF_MASK	(3&lt;&lt;8)</div><div class='add'>+#define S3C2443_CLKSRC_EPLLREF_XTAL	(2&lt;&lt;7)</div><div class='add'>+#define S3C2443_CLKSRC_EPLLREF_EXTCLK	(3&lt;&lt;7)</div><div class='add'>+#define S3C2443_CLKSRC_EPLLREF_MPLLREF	(0&lt;&lt;7)</div><div class='add'>+#define S3C2443_CLKSRC_EPLLREF_MPLLREF2	(1&lt;&lt;7)</div><div class='add'>+#define S3C2443_CLKSRC_EPLLREF_MASK	(3&lt;&lt;7)</div><div class='ctx'> </div><div class='ctx'> #define S3C2443_CLKSRC_ESYSCLK_EPLL	(1&lt;&lt;6)</div><div class='ctx'> #define S3C2443_CLKSRC_MSYSCLK_MPLL	(1&lt;&lt;4)</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/regs-sdi.h b/arch/arm/mach-s3c2410/include/mach/regs-sdi.h<br/>index bfb222fa4abb..cbf2d8884e30 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/regs-sdi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/regs-sdi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/regs-sdi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/regs-sdi.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/regs-sdi.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/regs-sdi.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2004 Simtec Electronics &lt;linux@simtec.co.uk&gt;</div><div class='ctx'>  *		      http://www.simtec.co.uk/products/SWLINUX/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/reset.h b/arch/arm/mach-s3c2410/include/mach/reset.h<br/>index 4f866cdecab0..f8c9387b049d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/reset.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/reset.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/reset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/reset.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/reset.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/reset.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2007 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/spi-gpio.h b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h<br/>index 73803731142a..3fe8be9ca110 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/spi-gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/spi-gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/spi-gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/spi-gpio.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/spi-gpio.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/spi-gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2006 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/spi.h b/arch/arm/mach-s3c2410/include/mach/spi.h<br/>index 442169887d3b..921b13b4f0a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/spi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/spi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/spi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/spi.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/spi.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/spi.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2006 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/system-reset.h b/arch/arm/mach-s3c2410/include/mach/system-reset.h<br/>index 1615bce0c026..ec2defebf0d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/system-reset.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/system-reset.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/system-reset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/system-reset.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/system-reset.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/system-reset.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2008 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='hunk'>@@ -10,11 +10,11 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-watchdog.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/system.h b/arch/arm/mach-s3c2410/include/mach/system.h<br/>index ad258085e53b..e9f676bc0116 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/system.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/system.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='hunk'>@@ -10,14 +10,14 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/idle.h&gt;</div><div class='del'>-#include &lt;asm/arch/reset.h&gt;</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='add'>+#include &lt;mach/idle.h&gt;</div><div class='add'>+#include &lt;mach/reset.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> void (*s3c24xx_idle)(void);</div><div class='ctx'> void (*s3c24xx_reset_hook)(void);</div><div class='hunk'>@@ -55,4 +55,4 @@ static void arch_idle(void)</div><div class='ctx'> 		s3c24xx_default_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/system-reset.h&gt;</div><div class='add'>+#include &lt;mach/system-reset.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/timex.h b/arch/arm/mach-s3c2410/include/mach/timex.h<br/>index c16a99c5a59a..2a425ed0a7e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/timex.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/timex.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003-2005 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/uncompress.h b/arch/arm/mach-s3c2410/include/mach/uncompress.h<br/>index 48a5731ee988..708e47459ffc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/uncompress.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003, 2007 Simtec Electronics</div><div class='ctx'>  *	http://armlinux.simtec.co.uk/</div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'> #ifndef __ASM_ARCH_UNCOMPRESS_H</div><div class='ctx'> #define __ASM_ARCH_UNCOMPRESS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/map.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* working in physical space... */</div><div class='ctx'> #undef S3C2410_GPIOREG</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/usb-control.h b/arch/arm/mach-s3c2410/include/mach/usb-control.h<br/>index 5bfa376e33dc..cd91d1591f31 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/usb-control.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/usb-control.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/usb-control.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/usb-control.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/usb-control.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/usb-control.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2004 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_USBCONTROL_H</div><div class='del'>-#define __ASM_ARCH_USBCONTROL_H "include/asm-arm/arch-s3c2410/usb-control.h"</div><div class='add'>+#define __ASM_ARCH_USBCONTROL_H "arch/arm/mach-s3c2410/include/mach/usb-control.h"</div><div class='ctx'> </div><div class='ctx'> #define S3C_HCDFLG_USED	(1)</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/vmalloc.h b/arch/arm/mach-s3c2410/include/mach/vmalloc.h<br/>index 0ae3bdb7e03b..315b0078a34d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/vmalloc.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='del'>- * from linux/include/asm-arm/arch-iop3xx/vmalloc.h</div><div class='add'>+ * from arch/arm/mach-iop3xx/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003 Simtec Electronics &lt;linux@simtec.co.uk&gt;</div><div class='ctx'>  *		      http://www.simtec.co.uk/products/SWLINUX/</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/vr1000-cpld.h b/arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h<br/>index 0557b0a5ab1d..e4119913d7c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/vr1000-cpld.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/vr1000-cpld.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/vr1000-cpld.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/vr1000-irq.h b/arch/arm/mach-s3c2410/include/mach/vr1000-irq.h<br/>index 890937083c61..f53f85b4ad8b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/vr1000-irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/vr1000-irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/vr1000-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/vr1000-irq.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/vr1000-irq.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/vr1000-irq.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003,2004 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-s3c2410/vr1000-map.h b/arch/arm/mach-s3c2410/include/mach/vr1000-map.h<br/>index 92a56a724a8c..99612fcc4eb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-s3c2410/vr1000-map.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-s3c2410/vr1000-map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/vr1000-map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/include/mach/vr1000-map.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-s3c2410/vr1000-map.h</div><div class='add'>+/* arch/arm/mach-s3c2410/include/mach/vr1000-map.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003-2005 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_VR1000MAP_H</div><div class='ctx'> #define __ASM_ARCH_VR1000MAP_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/bast-map.h&gt;</div><div class='add'>+#include &lt;mach/bast-map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define VR1000_IOADDR(x) BAST_IOADDR(x)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c<br/>index a67a0685664d..f0de3c23ce78 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-amlm5900.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/mach-amlm5900.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-amlm5900.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-amlm5900.c</a></div><div class='hunk'>@@ -42,15 +42,15 @@</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/arch/fb.h&gt;</div><div class='add'>+#include &lt;mach/fb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c<br/>index 965f27129707..24c6334fac89 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-bast.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/mach-bast.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-bast.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-bast.c</a></div><div class='hunk'>@@ -29,24 +29,24 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/bast-map.h&gt;</div><div class='del'>-#include &lt;asm/arch/bast-irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/bast-cpld.h&gt;</div><div class='add'>+#include &lt;mach/bast-map.h&gt;</div><div class='add'>+#include &lt;mach/bast-irq.h&gt;</div><div class='add'>+#include &lt;mach/bast-cpld.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> //#include &lt;asm/debug-ll.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-mem.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-mem.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/nand.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/iic.h&gt;</div><div class='del'>-#include &lt;asm/arch/fb.h&gt;</div><div class='add'>+#include &lt;mach/fb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='hunk'>@@ -562,7 +562,7 @@ static struct platform_device *bast_devices[] __initdata = {</div><div class='ctx'> 	&amp;bast_sio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk *bast_clocks[] = {</div><div class='add'>+static struct clk *bast_clocks[] __initdata = {</div><div class='ctx'> 	&amp;s3c24xx_dclk0,</div><div class='ctx'> 	&amp;s3c24xx_dclk1,</div><div class='ctx'> 	&amp;s3c24xx_clkout0,</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c<br/>index 7c1145e87c12..e35933a46d10 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-h1940.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/mach-h1940.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-h1940.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-h1940.c</a></div><div class='hunk'>@@ -25,19 +25,19 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/h1940.h&gt;</div><div class='del'>-#include &lt;asm/arch/h1940-latch.h&gt;</div><div class='del'>-#include &lt;asm/arch/fb.h&gt;</div><div class='add'>+#include &lt;mach/h1940.h&gt;</div><div class='add'>+#include &lt;mach/h1940-latch.h&gt;</div><div class='add'>+#include &lt;mach/fb.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/udc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c<br/>index 43c2e915c5bf..80fe2ed0775c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-n30.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/mach-n30.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-n30.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-n30.c</a></div><div class='hunk'>@@ -26,15 +26,15 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/fb.h&gt;</div><div class='del'>-#include &lt;asm/arch/leds-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/fb.h&gt;</div><div class='add'>+#include &lt;mach/leds-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-otom.c b/arch/arm/mach-s3c2410/mach-otom.c<br/>index 717af40e4477..606ee15911b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-otom.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/mach-otom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-otom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-otom.c</a></div><div class='hunk'>@@ -22,15 +22,15 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/otom-map.h&gt;</div><div class='add'>+#include &lt;mach/otom-map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c<br/>index a1caf4b0adac..7d34844debde 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-qt2410.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/mach-qt2410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-qt2410.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-qt2410.c</a></div><div class='hunk'>@@ -42,19 +42,19 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/leds-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/leds-gpio.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/fb.h&gt;</div><div class='add'>+#include &lt;mach/fb.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/nand.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/udc.h&gt;</div><div class='del'>-#include &lt;asm/arch/spi.h&gt;</div><div class='del'>-#include &lt;asm/arch/spi-gpio.h&gt;</div><div class='add'>+#include &lt;mach/spi.h&gt;</div><div class='add'>+#include &lt;mach/spi-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/common-smdk.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-smdk2410.c b/arch/arm/mach-s3c2410/mach-smdk2410.c<br/>index 226550504c85..b88939d72282 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-smdk2410.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/mach-smdk2410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-smdk2410.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-smdk2410.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * Copyright (C) 2004 by FS Forth-Systeme GmbH</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * $Id: mach-smdk2410.c,v 1.1 2004/05/11 14:15:38 mpietrek Exp $</div><div class='ctx'>  * @Author: Jonas Dietsche</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or</div><div class='hunk'>@@ -42,7 +41,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-tct_hammer.c b/arch/arm/mach-s3c2410/mach-tct_hammer.c<br/>index d90d445ccfb4..ec87306a8c24 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-tct_hammer.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/mach-tct_hammer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-tct_hammer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-tct_hammer.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c<br/>index 9a0965ac5e11..fbc0213d5485 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-vr1000.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/mach-vr1000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-vr1000.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/mach-vr1000.c</a></div><div class='hunk'>@@ -30,19 +30,19 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/bast-map.h&gt;</div><div class='del'>-#include &lt;asm/arch/vr1000-map.h&gt;</div><div class='del'>-#include &lt;asm/arch/vr1000-irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/vr1000-cpld.h&gt;</div><div class='add'>+#include &lt;mach/bast-map.h&gt;</div><div class='add'>+#include &lt;mach/vr1000-map.h&gt;</div><div class='add'>+#include &lt;mach/vr1000-irq.h&gt;</div><div class='add'>+#include &lt;mach/vr1000-cpld.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/leds-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/leds-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='hunk'>@@ -344,7 +344,7 @@ static struct platform_device *vr1000_devices[] __initdata = {</div><div class='ctx'> 	&amp;vr1000_led3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk *vr1000_clocks[] = {</div><div class='add'>+static struct clk *vr1000_clocks[] __initdata = {</div><div class='ctx'> 	&amp;s3c24xx_dclk0,</div><div class='ctx'> 	&amp;s3c24xx_dclk1,</div><div class='ctx'> 	&amp;s3c24xx_clkout0,</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/nor-simtec.c b/arch/arm/mach-s3c2410/nor-simtec.c<br/>index f44e21b9c3ba..598d130633dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/nor-simtec.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/nor-simtec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/nor-simtec.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/nor-simtec.c</a></div><div class='hunk'>@@ -26,10 +26,11 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/bast-map.h&gt;</div><div class='del'>-#include &lt;asm/arch/bast-cpld.h&gt;</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='add'>+#include &lt;mach/bast-map.h&gt;</div><div class='add'>+#include &lt;mach/bast-cpld.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "nor-simtec.h"</div><div class='ctx'> </div><div class='ctx'> static void simtec_nor_vpp(struct map_info *map, int vpp)</div><div class='ctx'> {</div><div class='hunk'>@@ -50,7 +51,7 @@ static void simtec_nor_vpp(struct map_info *map, int vpp)</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct physmap_flash_data simtec_nor_pdata = {</div><div class='add'>+static struct physmap_flash_data simtec_nor_pdata = {</div><div class='ctx'> 	.width		= 2,</div><div class='ctx'> 	.set_vpp	= simtec_nor_vpp,</div><div class='ctx'> 	.nr_parts	= 0,</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/pm-h1940.S b/arch/arm/mach-s3c2410/pm-h1940.S<br/>index 7d66de7ff7db..c93bf2db9f4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/pm-h1940.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/pm-h1940.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/pm-h1940.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/pm-h1940.S</a></div><div class='hunk'>@@ -20,10 +20,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/map.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='ctx'> 	.global	h1940_pm_return</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c<br/>index 3b3a7db4e0dd..ba43ff9e8164 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/pm.c</a></div><div class='hunk'>@@ -26,13 +26,13 @@</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/h1940.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/h1940.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c<br/>index 0e7991940f81..5d977f9c88ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2410.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/s3c2410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2410.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/s3c2410.c</a></div><div class='hunk'>@@ -24,11 +24,11 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/sleep.S b/arch/arm/mach-s3c2410/sleep.S<br/>index 8a9c5a2bb252..be37f221a177 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/sleep.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/sleep.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/sleep.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/sleep.S</a></div><div class='hunk'>@@ -26,12 +26,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/map.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-mem.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-mem.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	/* s3c2410_cpu_suspend</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c<br/>index 6aec86a5da56..4dacf8a1750d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/usb-simtec.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2410/usb-simtec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/usb-simtec.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2410/usb-simtec.c</a></div><div class='hunk'>@@ -26,12 +26,12 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/bast-map.h&gt;</div><div class='del'>-#include &lt;asm/arch/bast-irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb-control.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/bast-map.h&gt;</div><div class='add'>+#include &lt;mach/bast-irq.h&gt;</div><div class='add'>+#include &lt;mach/usb-control.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c<br/>index 1157b5a16263..af4b2ce516f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2412/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/clock.c</a></div><div class='hunk'>@@ -34,12 +34,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2412.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/dma.c b/arch/arm/mach-s3c2412/dma.c<br/>index 1dd864993566..22fc04a3b533 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/dma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2412/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/dma.c</a></div><div class='hunk'>@@ -18,18 +18,18 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/dma.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-ac97.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-mem.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-sdi.h&gt;</div><div class='add'>+#include &lt;mach/regs-mem.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-sdi.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/regs-s3c2412-iis.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/regs-iis.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/regs-spi.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/gpio.c b/arch/arm/mach-s3c2412/gpio.c<br/>index 8e55c3a2eab8..f7afece7fc38 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/gpio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2412/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/gpio.c</a></div><div class='hunk'>@@ -20,9 +20,9 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/irq.c b/arch/arm/mach-s3c2412/irq.c<br/>index cc1917bf952a..ac62b79044f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2412/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/irq.c</a></div><div class='hunk'>@@ -25,15 +25,15 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-power.h&gt;</div><div class='add'>+#include &lt;mach/regs-irq.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-power.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/irq.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c<br/>index 7f5924713485..ad980a1690c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/mach-jive.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2412/mach-jive.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/mach-jive.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/mach-jive.c</a></div><div class='hunk'>@@ -26,9 +26,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/mtd/mtd.h&gt;</div><div class='del'>-#include &lt;linux/mtd/partitions.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='hunk'>@@ -37,12 +34,12 @@</div><div class='ctx'> #include &lt;asm/plat-s3c/nand.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/iic.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-power.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-mem.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='del'>-#include &lt;asm/arch/spi-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/fb.h&gt;</div><div class='add'>+#include &lt;mach/regs-power.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-mem.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/spi-gpio.h&gt;</div><div class='add'>+#include &lt;mach/fb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -398,7 +395,7 @@ static void jive_lcd_spi_chipselect(struct s3c2410_spigpio_info *spi, int cs)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct s3c2410_spigpio_info jive_lcd_spi = {</div><div class='del'>-	.bus_num	= 0,</div><div class='add'>+	.bus_num	= 1,</div><div class='ctx'> 	.pin_clk	= S3C2410_GPG8,</div><div class='ctx'> 	.pin_mosi	= S3C2410_GPB8,</div><div class='ctx'> 	.chip_select	= jive_lcd_spi_chipselect,</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/mach-smdk2413.c b/arch/arm/mach-s3c2412/mach-smdk2413.c<br/>index b126a530daa6..80affb1ee4cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/mach-smdk2413.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2412/mach-smdk2413.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/mach-smdk2413.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/mach-smdk2413.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iomd.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -33,12 +33,12 @@</div><div class='ctx'> </div><div class='ctx'> //#include &lt;asm/debug-ll.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/idle.h&gt;</div><div class='add'>+#include &lt;mach/idle.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/udc.h&gt;</div><div class='del'>-#include &lt;asm/arch/fb.h&gt;</div><div class='add'>+#include &lt;mach/fb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2412.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/mach-vstms.c b/arch/arm/mach-s3c2412/mach-vstms.c<br/>index 32982547cd63..7a08b3789915 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/mach-vstms.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2412/mach-vstms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/mach-vstms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/mach-vstms.c</a></div><div class='hunk'>@@ -27,18 +27,18 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/idle.h&gt;</div><div class='del'>-#include &lt;asm/arch/fb.h&gt;</div><div class='add'>+#include &lt;mach/idle.h&gt;</div><div class='add'>+#include &lt;mach/fb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/nand.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c<br/>index d4ffb2d98076..737523a4e037 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2412/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/pm.c</a></div><div class='hunk'>@@ -19,14 +19,14 @@</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-power.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpioj.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-dsc.h&gt;</div><div class='add'>+#include &lt;mach/regs-power.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpioj.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-dsc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c<br/>index 98a0de924c22..d278010b9f60 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/s3c2412.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2412/s3c2412.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/s3c2412.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/s3c2412.c</a></div><div class='hunk'>@@ -25,22 +25,22 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/proc-fns.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/reset.h&gt;</div><div class='del'>-#include &lt;asm/arch/idle.h&gt;</div><div class='add'>+#include &lt;mach/reset.h&gt;</div><div class='add'>+#include &lt;mach/idle.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-power.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpioj.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-dsc.h&gt;</div><div class='add'>+#include &lt;mach/regs-power.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpioj.h&gt;</div><div class='add'>+#include &lt;mach/regs-dsc.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/regs-spi.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-s3c2412.h&gt;</div><div class='add'>+#include &lt;mach/regs-s3c2412.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2412.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/sleep.S b/arch/arm/mach-s3c2412/sleep.S<br/>index db32cac4199a..c82418ed714d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/sleep.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2412/sleep.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/sleep.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2412/sleep.S</a></div><div class='hunk'>@@ -22,10 +22,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/map.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-irq.h&gt;</div><div class='add'>+#include &lt;mach/regs-irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2440/clock.c b/arch/arm/mach-s3c2440/clock.c<br/>index 184d804934c9..95567e6daea1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2440/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/clock.c</a></div><div class='hunk'>@@ -34,12 +34,12 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c<br/>index 0b1260827ac6..cdd4e6e79ac0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/dma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2440/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/dma.c</a></div><div class='hunk'>@@ -18,17 +18,17 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/dma.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-ac97.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-mem.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-sdi.h&gt;</div><div class='add'>+#include &lt;mach/regs-mem.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-sdi.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/regs-iis.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/regs-spi.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2440/dsc.c b/arch/arm/mach-s3c2440/dsc.c<br/>index 2995ff5681bb..c0c67438d0a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/dsc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2440/dsc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/dsc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/dsc.c</a></div><div class='hunk'>@@ -20,12 +20,12 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-dsc.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-dsc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2440.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/irq.c b/arch/arm/mach-s3c2440/irq.c<br/>index a87608bc1a03..276b823f4e27 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2440/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/irq.c</a></div><div class='hunk'>@@ -25,14 +25,14 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-irq.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c<br/>index 09af8b23500b..441f4bc09472 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-anubis.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2440/mach-anubis.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-anubis.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/mach-anubis.c</a></div><div class='hunk'>@@ -27,19 +27,19 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/anubis-map.h&gt;</div><div class='del'>-#include &lt;asm/arch/anubis-irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/anubis-cpld.h&gt;</div><div class='add'>+#include &lt;mach/anubis-map.h&gt;</div><div class='add'>+#include &lt;mach/anubis-irq.h&gt;</div><div class='add'>+#include &lt;mach/anubis-cpld.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-mem.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-mem.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/nand.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='hunk'>@@ -414,7 +414,7 @@ static struct platform_device *anubis_devices[] __initdata = {</div><div class='ctx'> 	&amp;anubis_device_sm501,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk *anubis_clocks[] = {</div><div class='add'>+static struct clk *anubis_clocks[] __initdata = {</div><div class='ctx'> 	&amp;s3c24xx_dclk0,</div><div class='ctx'> 	&amp;s3c24xx_dclk1,</div><div class='ctx'> 	&amp;s3c24xx_clkout0,</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c<br/>index f5e3c7f27639..f0f0cc6afcf4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-at2440evb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2440/mach-at2440evb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-at2440evb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/mach-at2440evb.c</a></div><div class='hunk'>@@ -27,14 +27,14 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-mem.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-mem.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/nand.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-nexcoder.c b/arch/arm/mach-s3c2440/mach-nexcoder.c<br/>index afe0d7b7e389..1a5e7027b41b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-nexcoder.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2440/mach-nexcoder.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-nexcoder.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/mach-nexcoder.c</a></div><div class='hunk'>@@ -29,13 +29,13 @@</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> //#include &lt;asm/debug-ll.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c<br/>index af996b0e91e8..8b83f93b6102 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-osiris.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2440/mach-osiris.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-osiris.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/mach-osiris.c</a></div><div class='hunk'>@@ -25,18 +25,18 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/osiris-map.h&gt;</div><div class='del'>-#include &lt;asm/arch/osiris-cpld.h&gt;</div><div class='add'>+#include &lt;mach/osiris-map.h&gt;</div><div class='add'>+#include &lt;mach/osiris-cpld.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-mem.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-mem.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/nand.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='hunk'>@@ -341,7 +341,7 @@ static struct platform_device *osiris_devices[] __initdata = {</div><div class='ctx'> 	&amp;osiris_pcmcia,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk *osiris_clocks[] = {</div><div class='add'>+static struct clk *osiris_clocks[] __initdata = {</div><div class='ctx'> 	&amp;s3c24xx_dclk0,</div><div class='ctx'> 	&amp;s3c24xx_dclk1,</div><div class='ctx'> 	&amp;s3c24xx_clkout0,</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c<br/>index bac40c4878a5..e0b07e6a0a18 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-rx3715.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2440/mach-rx3715.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-rx3715.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/mach-rx3715.c</a></div><div class='hunk'>@@ -33,18 +33,18 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/h1940.h&gt;</div><div class='add'>+#include &lt;mach/h1940.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/nand.h&gt;</div><div class='del'>-#include &lt;asm/arch/fb.h&gt;</div><div class='add'>+#include &lt;mach/fb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c<br/>index 4552828bf800..327c8f371984 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-smdk2440.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2440/mach-smdk2440.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-smdk2440.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/mach-smdk2440.c</a></div><div class='hunk'>@@ -26,17 +26,17 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/idle.h&gt;</div><div class='del'>-#include &lt;asm/arch/fb.h&gt;</div><div class='add'>+#include &lt;mach/idle.h&gt;</div><div class='add'>+#include &lt;mach/fb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2440.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/s3c2440.c b/arch/arm/mach-s3c2440/s3c2440.c<br/>index 90e1da61fbc3..d6b9a92d284e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c2440.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2440/s3c2440.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c2440.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2440/s3c2440.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2442/clock.c b/arch/arm/mach-s3c2442/clock.c<br/>index 2d030d439fe9..569b5c3d334a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2442/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2442/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2442/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2442/clock.c</a></div><div class='hunk'>@@ -34,12 +34,12 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c<br/>index 17f064fabdaf..6a8d7cced4a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2443/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2443/clock.c</a></div><div class='hunk'>@@ -34,10 +34,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-s3c2443-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-s3c2443-clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2443.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2443/dma.c b/arch/arm/mach-s3c2443/dma.c<br/>index f6c006d4297b..c1ff03aebfda 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/dma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2443/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2443/dma.c</a></div><div class='hunk'>@@ -18,18 +18,18 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/dma.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-ac97.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-mem.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-sdi.h&gt;</div><div class='add'>+#include &lt;mach/regs-mem.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-sdi.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/regs-iis.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/regs-spi.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2443/irq.c b/arch/arm/mach-s3c2443/irq.c<br/>index f9ad498a6fc0..9674de7223fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2443/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2443/irq.c</a></div><div class='hunk'>@@ -25,14 +25,14 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-irq.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2443/mach-smdk2443.c b/arch/arm/mach-s3c2443/mach-smdk2443.c<br/>index 8cd93130ef36..e3c0d587bd10 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/mach-smdk2443.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2443/mach-smdk2443.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/mach-smdk2443.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2443/mach-smdk2443.c</a></div><div class='hunk'>@@ -26,17 +26,17 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-lcd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/idle.h&gt;</div><div class='del'>-#include &lt;asm/arch/fb.h&gt;</div><div class='add'>+#include &lt;mach/idle.h&gt;</div><div class='add'>+#include &lt;mach/fb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2440.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2443/s3c2443.c b/arch/arm/mach-s3c2443/s3c2443.c<br/>index 9ce490560af9..37793f924b5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/s3c2443.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-s3c2443/s3c2443.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/s3c2443.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-s3c2443/s3c2443.c</a></div><div class='hunk'>@@ -25,12 +25,12 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-s3c2443-clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/reset.h&gt;</div><div class='add'>+#include &lt;mach/regs-s3c2443-clock.h&gt;</div><div class='add'>+#include &lt;mach/reset.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2443.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile<br/>index 8e0244631d65..8a5546e6d547 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/Makefile</a></div><div class='hunk'>@@ -46,9 +46,6 @@ led-$(CONFIG_SA1100_SIMPAD)		+= leds-simpad.o</div><div class='ctx'> # LEDs support</div><div class='ctx'> obj-$(CONFIG_LEDS) += $(led-y)</div><div class='ctx'> </div><div class='del'>-# SA1110 USB client support</div><div class='del'>-#obj-$(CONFIG_SA1100_USB)		+= usb/</div><div class='del'>-</div><div class='ctx'> # Miscelaneous functions</div><div class='ctx'> obj-$(CONFIG_PM)			+= pm.o sleep.o</div><div class='ctx'> obj-$(CONFIG_SA1100_SSP)		+= ssp.o</div><div class='head'>diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c<br/>index be06d668a3c9..55e64477a876 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/assabet.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/assabet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/assabet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/assabet.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -34,8 +34,8 @@</div><div class='ctx'> #include &lt;asm/mach/irda.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/serial_sa1100.h&gt;</div><div class='del'>-#include &lt;asm/arch/assabet.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcp.h&gt;</div><div class='add'>+#include &lt;mach/assabet.h&gt;</div><div class='add'>+#include &lt;mach/mcp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c<br/>index 842d9e6dc5ff..3efefbdd2527 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/badge4.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/badge4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/badge4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/badge4.c</a></div><div class='hunk'>@@ -23,10 +23,10 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #include &lt;asm/hardware/sa1111.h&gt;</div><div class='ctx'> #include &lt;asm/mach/serial_sa1100.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/badge4.h&gt;</div><div class='add'>+#include &lt;mach/badge4.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c<br/>index 56d3ee01baae..fd3ad9cfc912 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/cerf.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/cerf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/cerf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/cerf.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='hunk'>@@ -28,8 +28,8 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/serial_sa1100.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/cerf.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcp.h&gt;</div><div class='add'>+#include &lt;mach/cerf.h&gt;</div><div class='add'>+#include &lt;mach/mcp.h&gt;</div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='ctx'> static struct resource cerfuart2_resources[] = {</div><div class='head'>diff --git a/arch/arm/mach-sa1100/clock.c b/arch/arm/mach-sa1100/clock.c<br/>index b5809c51d13f..43c30f84abf2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/clock.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Very simple clock implementation - we only have one clock to</div><div class='head'>diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c<br/>index 2f772a3965c4..fe289997cfaf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/collie.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/collie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/collie.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/collie.c</a></div><div class='hunk'>@@ -26,11 +26,11 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/arch/collie.h&gt;</div><div class='add'>+#include &lt;mach/collie.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='hunk'>@@ -40,7 +40,7 @@</div><div class='ctx'> #include &lt;asm/hardware/scoop.h&gt;</div><div class='ctx'> #include &lt;asm/mach/sharpsl_param.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/locomo.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcp.h&gt;</div><div class='add'>+#include &lt;mach/mcp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/collie_pm.c b/arch/arm/mach-sa1100/collie_pm.c<br/>index 94620be7bfac..b1161fc80602 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/collie_pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/collie_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/collie_pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/collie_pm.c</a></div><div class='hunk'>@@ -24,11 +24,10 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/scoop.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/collie.h&gt;</div><div class='add'>+#include &lt;mach/collie.h&gt;</div><div class='ctx'> #include &lt;asm/mach/sharpsl_param.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/sharpsl_pm.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/cpu-sa1100.c b/arch/arm/mach-sa1100/cpu-sa1100.c<br/>index 343368aa82de..da3a898a6d66 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/cpu-sa1100.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/cpu-sa1100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/cpu-sa1100.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/cpu-sa1100.c</a></div><div class='hunk'>@@ -88,7 +88,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c<br/>index 36b47ff5af11..029dbfbbafcf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/cpu-sa1110.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/cpu-sa1110.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/cpu-sa1110.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/cpu-sa1110.c</a></div><div class='hunk'>@@ -3,8 +3,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2001 Russell King</div><div class='ctx'>  *</div><div class='del'>- *  $Id: cpu-sa1110.c,v 1.9 2002/07/06 16:53:18 rmk Exp $</div><div class='del'>- *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='hunk'>@@ -26,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/dma.c b/arch/arm/mach-sa1100/dma.c<br/>index e5080286060e..f990a3e85846 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/dma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/dma.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -76,7 +76,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)</div><div class='ctx'>  * 	address of the hardware registers for that channel as the channel</div><div class='ctx'>  * 	identifier. This identifier is written to the location pointed by</div><div class='ctx'>  * 	@dma_regs. The list of possible values for @device are listed into</div><div class='del'>- * 	linux/include/asm-arm/arch-sa1100/dma.h as a dma_device_t enum.</div><div class='add'>+ * 	arch/arm/mach-sa1100/include/mach/dma.h as a dma_device_t enum.</div><div class='ctx'>  *</div><div class='ctx'>  * 	Note that reading from a port and writing to the same port are</div><div class='ctx'>  * 	actually considered as two different streams requiring separate</div><div class='head'>diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c<br/>index 0c2fa1c4fb4c..1362994c78aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/generic.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/generic.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> #include &lt;asm/cnt32_to_63.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -31,6 +31,9 @@</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='add'>+unsigned int reset_status;</div><div class='add'>+EXPORT_SYMBOL(reset_status);</div><div class='add'>+</div><div class='ctx'> #define NR_FREQS	16</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-sa1100/gpio.c b/arch/arm/mach-sa1100/gpio.c<br/>index 372f1f4f54a1..0d3829a8c2c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/gpio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/gpio.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='ctx'> static int sa1100_gpio_get(struct gpio_chip *chip, unsigned offset)</div><div class='head'>diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c<br/>index b34ff42bbd75..af25a78d705d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/h3600.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/h3600.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/h3600.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/h3600.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -41,14 +41,14 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/serial_sa1100.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/h3600.h&gt;</div><div class='add'>+#include &lt;mach/h3600.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined (CONFIG_SA1100_H3600) || defined (CONFIG_SA1100_H3100)</div><div class='del'>-#include &lt;asm/arch/h3600_gpio.h&gt;</div><div class='add'>+#include &lt;mach/h3600_gpio.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SA1100_H3800</div><div class='del'>-#include &lt;asm/arch/h3600_asic.h&gt;</div><div class='add'>+#include &lt;mach/h3600_asic.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='hunk'>@@ -681,7 +681,7 @@ static struct ipaq_model_ops h3800_model_ops __initdata = {</div><div class='ctx'> </div><div class='ctx'> #define MAX_ASIC_ISR_LOOPS    20</div><div class='ctx'> </div><div class='del'>-/* The order of these is important - see #include &lt;asm/arch/irqs.h&gt; */</div><div class='add'>+/* The order of these is important - see #include &lt;mach/irqs.h&gt; */</div><div class='ctx'> static u32 kpio_irq_mask[] = {</div><div class='ctx'> 	KPIO_KEY_ALL,</div><div class='ctx'> 	KPIO_SPI_INT,</div><div class='head'>diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c<br/>index 046b213efd5b..e7056c0b562c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/hackkit.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/hackkit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/hackkit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/hackkit.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/SA-1100.h b/arch/arm/mach-sa1100/include/mach/SA-1100.h<br/>index 62aaf04a3906..62aaf04a3906 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/SA-1100.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/SA-1100.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/SA-1100.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/SA-1100.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/SA-1101.h b/arch/arm/mach-sa1100/include/mach/SA-1101.h<br/>index 65ca8c79e6d2..5d2ad7db991c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/SA-1101.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/SA-1101.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/SA-1101.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/SA-1101.h</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> #define SA1101_p2v(PhAdd)  (PhAdd)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/bitfield.h&gt;</div><div class='add'>+#include &lt;mach/bitfield.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define C               0</div><div class='ctx'> #define Assembly        1</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/SA-1111.h b/arch/arm/mach-sa1100/include/mach/SA-1111.h<br/>index c38f60915cb6..c38f60915cb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/SA-1111.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/SA-1111.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/SA-1111.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/SA-1111.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/assabet.h b/arch/arm/mach-sa1100/include/mach/assabet.h<br/>index d6a1bb5b4944..3959b20d5d1c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/assabet.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/assabet.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/assabet.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/assabet.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-sa1100/assabet.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/assabet.h</div><div class='ctx'>  *</div><div class='ctx'>  * Created 2000/06/05 by Nicolas Pitre &lt;nico@cam.org&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/badge4.h b/arch/arm/mach-sa1100/include/mach/badge4.h<br/>index 8d7a671492db..44d2e1bfc04b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/badge4.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/badge4.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/badge4.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/badge4.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-sa1100/badge4.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/badge4.h</div><div class='ctx'>  *</div><div class='ctx'>  *   Tim Connors &lt;connors@hpl.hp.com&gt;</div><div class='ctx'>  *   Christopher Hoover &lt;ch@hpl.hp.com&gt;</div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_HARDWARE_H</div><div class='del'>-#error "include &lt;asm/hardware.h&gt; instead"</div><div class='add'>+#error "include &lt;mach/hardware.h&gt; instead"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define BADGE4_SA1111_BASE		(0x48000000)</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/bitfield.h b/arch/arm/mach-sa1100/include/mach/bitfield.h<br/>index f1f0e3387d9c..f1f0e3387d9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/bitfield.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/bitfield.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/bitfield.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/bitfield.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/cerf.h b/arch/arm/mach-sa1100/include/mach/cerf.h<br/>index 9a19c3d07c1e..c3ac3d0f9465 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/cerf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/cerf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/cerf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/cerf.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-sa1100/cerf.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/cerf.h</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/collie.h b/arch/arm/mach-sa1100/include/mach/collie.h<br/>index 762eba535813..69e962416e3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/collie.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/collie.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/collie.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/collie.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-sa1100/collie.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/collie.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file contains the hardware specific definitions for Assabet</div><div class='ctx'>  * Only include this file from SA1100-specific files.</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/debug-macro.S b/arch/arm/mach-sa1100/include/mach/debug-macro.S<br/>index 267c317a7408..1f0634d92702 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-sa1100/debug-macro.S</div><div class='add'>+/* arch/arm/mach-sa1100/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='ctx'> */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	addruart,rx</div><div class='ctx'> 		mrc	p15, 0, \rx, c1, c0</div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> 		movne	\rx, #0xf8000000	@ virtual address</div><div class='ctx'> </div><div class='ctx'> 		@ We probe for the active serial port here, coherently with</div><div class='del'>-		@ the comment in include/asm-arm/arch-sa1100/uncompress.h.</div><div class='add'>+		@ the comment in arch/arm/mach-sa1100/include/mach/uncompress.h.</div><div class='ctx'> 		@ We assume r1 can be clobbered.</div><div class='ctx'> </div><div class='ctx'> 		@ see if Ser3 is active</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/dma.h b/arch/arm/mach-sa1100/include/mach/dma.h<br/>index 6b7917a2e77a..dda1b351310d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-sa1100/dma.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  * Generic SA1100 DMA support</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/entry-macro.S b/arch/arm/mach-sa1100/include/mach/entry-macro.S<br/>index 127db4aaf4f2..6aa13c46c5d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-sa1100/entry-macro.S</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for SA1100-based platforms</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/gpio.h b/arch/arm/mach-sa1100/include/mach/gpio.h<br/>index 93d3395b102d..582a0c92da53 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/gpio.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-sa1100/gpio.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  * SA1100 GPIO wrappers for arch-neutral GPIO calls</div><div class='ctx'>  *</div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SA1100_GPIO_H</div><div class='ctx'> #define __ASM_ARCH_SA1100_GPIO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm-generic/gpio.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/h3600.h b/arch/arm/mach-sa1100/include/mach/h3600.h<br/>index 3ca0ecf095e6..3ca0ecf095e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/h3600.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/h3600.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/h3600.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/h3600.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/h3600_gpio.h b/arch/arm/mach-sa1100/include/mach/h3600_gpio.h<br/>index 62b0b7879685..62b0b7879685 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/h3600_gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/h3600_gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/h3600_gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/h3600_gpio.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/hardware.h b/arch/arm/mach-sa1100/include/mach/hardware.h<br/>index 1abd7cfc8bce..5976435f42c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-sa1100/hardware.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998 Nicolas Pitre &lt;nico@cam.org&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/ide.h b/arch/arm/mach-sa1100/include/mach/ide.h<br/>index 193f6c15f4dd..4c99c8f5e617 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/ide.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/ide.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/ide.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/ide.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-sa1100/ide.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/ide.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 1998 Hugo Fiennes &amp; Nicolas Pitre</div><div class='ctx'>  *</div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #error "This code is broken and needs update to match with current ide support"</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/io.h b/arch/arm/mach-sa1100/include/mach/io.h<br/>index 0756269404b1..0c070a6149bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-sa1100/io.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1997-1999 Russell King</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/irqs.h b/arch/arm/mach-sa1100/include/mach/irqs.h<br/>index 7bf80484bb77..0cb36609b3ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-sa1100/irqs.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1996 Russell King</div><div class='ctx'>  * Copyright (C) 1998 Deborah Wallach (updates for SA1100/Brutus).</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/jornada720.h b/arch/arm/mach-sa1100/include/mach/jornada720.h<br/>index 45d2bb59f9d0..cc6b4bfcecf6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/jornada720.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/jornada720.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/jornada720.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/jornada720.h</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-sa1100/jornada720.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/jornada720.h</div><div class='ctx'>  *</div><div class='del'>- * This file contains SSP/MCU communication definitions for HP Jornada 710/720/728</div><div class='add'>+ * SSP/MCU communication definitions for HP Jornada 710/720/728</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2007 Kristoffer Ericson &lt;Kristoffer.Ericson@gmail.com&gt;</div><div class='del'>- *  Copyright (C) 2000 John Ankcorn &lt;jca@lcs.mit.edu&gt;</div><div class='add'>+ * Copyright 2007,2008 Kristoffer Ericson &lt;Kristoffer.Ericson@gmail.com&gt;</div><div class='add'>+ *  Copyright 2000 John Ankcorn &lt;jca@lcs.mit.edu&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='hunk'>@@ -25,3 +25,8 @@</div><div class='ctx'> #define PWMOFF			0xDF</div><div class='ctx'> #define TXDUMMY			0x11</div><div class='ctx'> #define ERRORCODE		0x00</div><div class='add'>+</div><div class='add'>+extern void jornada_ssp_start(void);</div><div class='add'>+extern void jornada_ssp_end(void);</div><div class='add'>+extern int jornada_ssp_inout(u8 byte);</div><div class='add'>+extern int jornada_ssp_byte(u8 byte);</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/lart.h b/arch/arm/mach-sa1100/include/mach/lart.h<br/>index 8a5482d908db..8a5482d908db 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/lart.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/lart.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/lart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/lart.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/mcp.h b/arch/arm/mach-sa1100/include/mach/mcp.h<br/>index f58a22755c61..fb8b09a57ad7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/mcp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/mcp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/mcp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/mcp.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-sa1100/mcp.h</div><div class='add'>+ *  arch/arm/mach-sa1100/include/mach/mcp.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2005 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/memory.h b/arch/arm/mach-sa1100/include/mach/memory.h<br/>index 0e907fc6d42a..29f639e2afc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-sa1100/memory.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1999-2000 Nicolas Pitre &lt;nico@cam.org&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/mtd-xip.h b/arch/arm/mach-sa1100/include/mach/mtd-xip.h<br/>index 80cfdac2b944..eaa09e86ad16 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/mtd-xip.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/mtd-xip.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/mtd-xip.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/mtd-xip.h</a></div><div class='hunk'>@@ -10,8 +10,6 @@</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * $Id: xip.h,v 1.2 2004/12/01 15:49:10 nico Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ARCH_SA1100_MTD_XIP_H__</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/neponset.h b/arch/arm/mach-sa1100/include/mach/neponset.h<br/>index 09ec9e2bd182..d3f044f92c00 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/neponset.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/neponset.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/neponset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/neponset.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-sa1100/neponset.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/neponset.h</div><div class='ctx'>  *</div><div class='ctx'>  * Created 2000/06/05 by Nicolas Pitre &lt;nico@cam.org&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-sa1100/include/mach/reset.h b/arch/arm/mach-sa1100/include/mach/reset.h<br/>new file mode 100644<br/>index 000000000000..f61957e6842a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/reset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/reset.h</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+#ifndef __ASM_ARCH_RESET_H</div><div class='add'>+#define __ASM_ARCH_RESET_H</div><div class='add'>+</div><div class='add'>+#include "hardware.h"</div><div class='add'>+</div><div class='add'>+#define RESET_STATUS_HARDWARE	(1 &lt;&lt; 0)	/* Hardware Reset */</div><div class='add'>+#define RESET_STATUS_WATCHDOG	(1 &lt;&lt; 1)	/* Watchdog Reset */</div><div class='add'>+#define RESET_STATUS_LOWPOWER	(1 &lt;&lt; 2)	/* Exit from Low Power/Sleep */</div><div class='add'>+#define RESET_STATUS_GPIO	(1 &lt;&lt; 3)	/* GPIO Reset */</div><div class='add'>+#define RESET_STATUS_ALL	(0xf)</div><div class='add'>+</div><div class='add'>+extern unsigned int reset_status;</div><div class='add'>+static inline void clear_reset_status(unsigned int mask)</div><div class='add'>+{</div><div class='add'>+	RCSR = mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_ARCH_RESET_H */</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/shannon.h b/arch/arm/mach-sa1100/include/mach/shannon.h<br/>index ec27d6e12140..ec27d6e12140 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/shannon.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/shannon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/shannon.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/shannon.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/simpad.h b/arch/arm/mach-sa1100/include/mach/simpad.h<br/>index 034301d23f60..9296c4513ce1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/simpad.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/simpad.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/simpad.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/simpad.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-sa1100/simpad.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/simpad.h</div><div class='ctx'>  *</div><div class='ctx'>  * based of assabet.h same as HUW_Webpanel</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/system.h b/arch/arm/mach-sa1100/include/mach/system.h<br/>index aef91e3b63fe..63755ca5b1b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/system.h</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-sa1100/system.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 1999 Nicolas Pitre &lt;nico@cam.org&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/timex.h b/arch/arm/mach-sa1100/include/mach/timex.h<br/>index 837be9b797dd..7a5d017b58b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-sa1100/timex.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * SA1100 architecture timex specifications</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-sa1100/uncompress.h b/arch/arm/mach-sa1100/include/mach/uncompress.h<br/>index 17e64d232e7d..714160b03d7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-sa1100/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-sa1100/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-sa1100/uncompress.h</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * (C) 1999 Nicolas Pitre &lt;nico@cam.org&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-sa1100/include/mach/vmalloc.h b/arch/arm/mach-sa1100/include/mach/vmalloc.h<br/>new file mode 100644<br/>index 000000000000..ec8fdc5a3606<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-sa1100/include/mach/vmalloc.h</div><div class='add'>+ */</div><div class='add'>+#define VMALLOC_END       (0xe8000000)</div><div class='head'>diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c<br/>index c5e438b12ec7..86369a8f0cea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/irq.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='head'>diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c<br/>index 52ac37d1e23a..81848aa96424 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/jornada720.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/jornada720.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/jornada720.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/jornada720.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;video/s1d13xxxfb.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/sa1111.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/jornada720_ssp.c b/arch/arm/mach-sa1100/jornada720_ssp.c<br/>index 395c39bed7d8..28cf36967977 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/jornada720_ssp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/jornada720_ssp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/jornada720_ssp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/jornada720_ssp.c</a></div><div class='hunk'>@@ -20,9 +20,9 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/jornada720.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/ssp.h&gt;</div><div class='del'>-#include &lt;asm/arch/jornada720.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(jornada_ssp_lock);</div><div class='ctx'> static unsigned long jornada_ssp_flags;</div><div class='hunk'>@@ -109,12 +109,12 @@ EXPORT_SYMBOL(jornada_ssp_inout);</div><div class='ctx'>  * jornada_ssp_start - enable mcu</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-int jornada_ssp_start()</div><div class='add'>+void jornada_ssp_start(void)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock_irqsave(&amp;jornada_ssp_lock, jornada_ssp_flags);</div><div class='ctx'> 	GPCR = GPIO_GPIO25;</div><div class='ctx'> 	udelay(50);</div><div class='del'>-	return 0;</div><div class='add'>+	return;</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(jornada_ssp_start);</div><div class='ctx'> </div><div class='hunk'>@@ -122,11 +122,11 @@ EXPORT_SYMBOL(jornada_ssp_start);</div><div class='ctx'>  * jornada_ssp_end - disable mcu and turn off lock</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-int jornada_ssp_end()</div><div class='add'>+void jornada_ssp_end(void)</div><div class='ctx'> {</div><div class='ctx'> 	GPSR = GPIO_GPIO25;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;jornada_ssp_lock, jornada_ssp_flags);</div><div class='del'>-	return 0;</div><div class='add'>+	return;</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(jornada_ssp_end);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c<br/>index 07d3a696ae7f..0cd52692d2f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/lart.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/lart.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/lart.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/lart.c</a></div><div class='hunk'>@@ -6,14 +6,14 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/serial_sa1100.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcp.h&gt;</div><div class='add'>+#include &lt;mach/mcp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/leds-assabet.c b/arch/arm/mach-sa1100/leds-assabet.c<br/>index ee9788989875..64e9b4b11b54 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-assabet.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/leds-assabet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-assabet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/leds-assabet.c</a></div><div class='hunk'>@@ -11,10 +11,10 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/arch/assabet.h&gt;</div><div class='add'>+#include &lt;mach/assabet.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "leds.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/leds-badge4.c b/arch/arm/mach-sa1100/leds-badge4.c<br/>index 280929be972d..cf1e38458b81 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-badge4.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/leds-badge4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-badge4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/leds-badge4.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/leds-cerf.c b/arch/arm/mach-sa1100/leds-cerf.c<br/>index f38eeddbef10..259b48e0be89 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-cerf.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/leds-cerf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-cerf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/leds-cerf.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/leds-hackkit.c b/arch/arm/mach-sa1100/leds-hackkit.c<br/>index 7e91cc90b5ae..2bce137462e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-hackkit.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/leds-hackkit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-hackkit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/leds-hackkit.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/leds-lart.c b/arch/arm/mach-sa1100/leds-lart.c<br/>index 2d27d76cfc6b..0505a1fdcdb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-lart.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/leds-lart.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-lart.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/leds-lart.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/leds-simpad.c b/arch/arm/mach-sa1100/leds-simpad.c<br/>index def090a87385..d50f4eeaa12e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-simpad.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/leds-simpad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-simpad.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/leds-simpad.c</a></div><div class='hunk'>@@ -5,10 +5,10 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/arch/simpad.h&gt;</div><div class='add'>+#include &lt;mach/simpad.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "leds.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c<br/>index 967a48454f6b..4856a6bd2482 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/neponset.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/neponset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/neponset.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/neponset.c</a></div><div class='hunk'>@@ -10,14 +10,14 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/serial_sa1100.h&gt;</div><div class='del'>-#include &lt;asm/arch/assabet.h&gt;</div><div class='del'>-#include &lt;asm/arch/neponset.h&gt;</div><div class='add'>+#include &lt;mach/assabet.h&gt;</div><div class='add'>+#include &lt;mach/neponset.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/sa1111.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c<br/>index 69a71f11625e..83be1c6c5f80 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/pleb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/pleb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/pleb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/pleb.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> #include &lt;asm/mach/serial_sa1100.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c<br/>index 1693d447a224..111cce67ad2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/pm.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c<br/>index 8acab7b1e4c2..9ccdd09cf69f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/shannon.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/shannon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/shannon.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/shannon.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -17,8 +17,8 @@</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/serial_sa1100.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcp.h&gt;</div><div class='del'>-#include &lt;asm/arch/shannon.h&gt;</div><div class='add'>+#include &lt;mach/mcp.h&gt;</div><div class='add'>+#include &lt;mach/shannon.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c<br/>index a9ae1b581aa6..8dd635317959 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/simpad.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/simpad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/simpad.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/simpad.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='hunk'>@@ -22,8 +22,8 @@</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/serial_sa1100.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcp.h&gt;</div><div class='del'>-#include &lt;asm/arch/simpad.h&gt;</div><div class='add'>+#include &lt;mach/mcp.h&gt;</div><div class='add'>+#include &lt;mach/simpad.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/sleep.S b/arch/arm/mach-sa1100/sleep.S<br/>index 5a84062f92af..171441f96710 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/sleep.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/sleep.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/sleep.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/sleep.S</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/ssp.c b/arch/arm/mach-sa1100/ssp.c<br/>index 06206ceb312e..641f361c56f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/ssp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/ssp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/ssp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/ssp.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/ssp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define TIMEOUT 100000</div><div class='head'>diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c<br/>index a9799cb35b74..24c0a4bae850 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-sa1100/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-sa1100/time.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MIN_OSCR_DELTA 2</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-shark/debug-macro.S b/arch/arm/mach-shark/include/mach/debug-macro.S<br/>index 7cb37f78825e..0836cb78b29a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-shark/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-shark/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-shark/debug-macro.S</div><div class='add'>+/* arch/arm/mach-shark/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-shark/dma.h b/arch/arm/mach-shark/include/mach/dma.h<br/>index fc985d5e62af..c0a29bd2a74f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-shark/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-shark/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-shark/dma.h</div><div class='add'>+ * arch/arm/mach-shark/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  * by Alexander Schulz</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-shark/entry-macro.S b/arch/arm/mach-shark/include/mach/entry-macro.S<br/>index 82463f30f3df..e2853c0a3333 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-shark/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-shark/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-shark/entry-macro.S</div><div class='add'>+ * arch/arm/mach-shark/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for Shark platform</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-shark/hardware.h b/arch/arm/mach-shark/include/mach/hardware.h<br/>index ecba45260898..cb0ee2943c1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-shark/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-shark/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-shark/hardware.h</div><div class='add'>+ * arch/arm/mach-shark/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * by Alexander Schulz</div><div class='ctx'>  *</div><div class='ctx'>  * derived from:</div><div class='del'>- * linux/include/asm-arm/arch-ebsa110/hardware.h</div><div class='add'>+ * arch/arm/mach-ebsa110/include/mach/hardware.h</div><div class='ctx'>  * Copyright (C) 1996-1999 Russell King.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __ASM_ARCH_HARDWARE_H</div><div class='head'>diff --git a/include/asm-arm/arch-shark/io.h b/arch/arm/mach-shark/include/mach/io.h<br/>index 87ffa27f2962..92475922c068 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-shark/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-shark/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/io.h</a></div><div class='hunk'>@@ -1,17 +1,17 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-shark/io.h</div><div class='add'>+ * arch/arm/mach-shark/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * by Alexander Schulz</div><div class='ctx'>  *</div><div class='ctx'>  * derived from:</div><div class='del'>- * linux/include/asm-arm/arch-ebsa110/io.h</div><div class='add'>+ * arch/arm/mach-ebsa110/include/mach/io.h</div><div class='ctx'>  * Copyright (C) 1997,1998 Russell King</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARM_ARCH_IO_H</div><div class='ctx'> #define __ASM_ARM_ARCH_IO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT 0xffffffff</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-shark/irqs.h b/arch/arm/mach-shark/include/mach/irqs.h<br/>index b36cc975b290..0586acd7cdd5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-shark/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-shark/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-shark/irqs.h</div><div class='add'>+ * arch/arm/mach-shark/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  * by Alexander Schulz</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-shark/memory.h b/arch/arm/mach-shark/include/mach/memory.h<br/>index 6968d6103ea0..b7874ad9f9f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-shark/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-shark/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/memory.h</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-shark/memory.h</div><div class='add'>+ * arch/arm/mach-shark/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  * by Alexander Schulz</div><div class='ctx'>  *</div><div class='ctx'>  * derived from:</div><div class='del'>- * linux/include/asm-arm/arch-ebsa110/memory.h</div><div class='add'>+ * arch/arm/mach-ebsa110/include/mach/memory.h</div><div class='ctx'>  * Copyright (c) 1996-1999 Russell King.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __ASM_ARCH_MEMORY_H</div><div class='head'>diff --git a/include/asm-arm/arch-shark/system.h b/arch/arm/mach-shark/include/mach/system.h<br/>index f12d771ab4ce..85aceef6f874 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-shark/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-shark/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-shark/system.h</div><div class='add'>+ * arch/arm/mach-shark/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  * by Alexander Schulz</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-shark/timex.h b/arch/arm/mach-shark/include/mach/timex.h<br/>index 0d02d255513b..bb6eeaebed86 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-shark/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-shark/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-shark/timex.h</div><div class='add'>+ * arch/arm/mach-shark/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * by Alexander Schulz</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-shark/uncompress.h b/arch/arm/mach-shark/include/mach/uncompress.h<br/>index 7eca6534f1bb..3725e1633418 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-shark/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-shark/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-shark/uncompress.h</div><div class='add'>+ * arch/arm/mach-shark/include/mach/uncompress.h</div><div class='ctx'>  * by Alexander Schulz</div><div class='ctx'>  *</div><div class='ctx'>  * derived from:</div><div class='del'>- * linux/include/asm-arm/arch-ebsa285/uncompress.h</div><div class='add'>+ * arch/arm/mach-footbridge/include/mach/uncompress.h</div><div class='ctx'>  * Copyright (C) 1996,1997,1998 Russell King</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-shark/vmalloc.h b/arch/arm/mach-shark/include/mach/vmalloc.h<br/>index fac37c636b38..f6c6837c5451 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-shark/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-shark/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-shark/vmalloc.h</div><div class='add'>+ * arch/arm/mach-shark/include/mach/vmalloc.h</div><div class='ctx'>  */</div><div class='ctx'> #define VMALLOC_END       (PAGE_OFFSET + 0x10000000)</div><div class='head'>diff --git a/arch/arm/mach-shark/irq.c b/arch/arm/mach-shark/irq.c<br/>index 5b0c6af44ec6..44b0811b400c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-shark/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/irq.c</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  * by Alexander Schulz</div><div class='ctx'>  *</div><div class='ctx'>  * derived from linux/arch/ppc/kernel/i8259.c and:</div><div class='del'>- * include/asm-arm/arch-ebsa110/irq.h</div><div class='add'>+ * arch/arm/mach-ebsa110/include/mach/irq.h</div><div class='ctx'>  * Copyright (C) 1996-1998 Russell King</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-shark/leds.c b/arch/arm/mach-shark/leds.c<br/>index 5386a81f796a..b1896471aa3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/leds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-shark/leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-shark/leds.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c<br/>index a7dd09436cbc..d75e795c893e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-versatile/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/core.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cnt32_to_63.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-versatile/debug-macro.S b/arch/arm/mach-versatile/include/mach/debug-macro.S<br/>index fe106d184e62..b4ac00eacf68 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-versatile/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-versatile/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-versatile/debug-macro.S</div><div class='add'>+/* arch/arm/mach-versatile/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-versatile/dma.h b/arch/arm/mach-versatile/include/mach/dma.h<br/>index 642577348623..0aabf12c8834 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-versatile/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-versatile/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-versatile/dma.h</div><div class='add'>+ *  arch/arm/mach-versatile/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 ARM Limited.</div><div class='ctx'>  *  Copyright (C) 1997,1998 Russell King</div><div class='head'>diff --git a/include/asm-arm/arch-versatile/entry-macro.S b/arch/arm/mach-versatile/include/mach/entry-macro.S<br/>index 924d1a8fe360..8c8020980585 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-versatile/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-versatile/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-versatile/entry-macro.S</div><div class='add'>+ * arch/arm/mach-versatile/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for Versatile platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='head'>diff --git a/include/asm-arm/arch-versatile/hardware.h b/arch/arm/mach-versatile/include/mach/hardware.h<br/>index edc06598d187..7aa906c93154 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-versatile/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-versatile/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-versatile/hardware.h</div><div class='add'>+ *  arch/arm/mach-versatile/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  *  This file contains the hardware definitions of the Versatile boards.</div><div class='ctx'>  *</div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #define __ASM_ARCH_HARDWARE_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='del'>-#include &lt;asm/arch/platform.h&gt;</div><div class='add'>+#include &lt;mach/platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PCI space virtual addresses</div><div class='head'>diff --git a/include/asm-arm/arch-versatile/io.h b/arch/arm/mach-versatile/include/mach/io.h<br/>index c4d01948e00b..c0b9dd1d0257 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-versatile/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-versatile/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/io.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-versatile/io.h</div><div class='add'>+ *  arch/arm/mach-versatile/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 ARM Limited</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-versatile/irqs.h b/arch/arm/mach-versatile/include/mach/irqs.h<br/>index f7263b99403b..216a1312e62e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-versatile/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-versatile/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-versatile/irqs.h</div><div class='add'>+ *  arch/arm/mach-versatile/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd.</div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/platform.h&gt;</div><div class='add'>+#include &lt;mach/platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* </div><div class='ctx'>  *  IRQ interrupts definitions are the same as the INT definitions</div><div class='head'>diff --git a/include/asm-arm/arch-versatile/memory.h b/arch/arm/mach-versatile/include/mach/memory.h<br/>index a9370976cc5e..b6315c0602ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-versatile/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-versatile/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/memory.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-versatile/memory.h</div><div class='add'>+ *  arch/arm/mach-versatile/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 ARM Limited</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-versatile/platform.h b/arch/arm/mach-versatile/include/mach/platform.h<br/>index 2af9d7c9c63c..27cbe6a3f220 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-versatile/platform.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-versatile/platform.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/platform.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-versatile/platform.h</div><div class='add'>+ * arch/arm/mach-versatile/include/mach/platform.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) ARM Limited 2003.  All rights reserved.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-versatile/system.h b/arch/arm/mach-versatile/include/mach/system.h<br/>index 71c6254c0d9b..91fa559c7cca 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-versatile/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-versatile/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-versatile/system.h</div><div class='add'>+ *  arch/arm/mach-versatile/include/mach/system.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd</div><div class='hunk'>@@ -21,9 +21,9 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/platform.h&gt;</div><div class='add'>+#include &lt;mach/platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-arm/arch-versatile/timex.h b/arch/arm/mach-versatile/include/mach/timex.h<br/>index 38fd04fc9141..426199b1add5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-versatile/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-versatile/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-versatile/timex.h</div><div class='add'>+ *  arch/arm/mach-versatile/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Versatile architecture timex specifications</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-versatile/uncompress.h b/arch/arm/mach-versatile/include/mach/uncompress.h<br/>index 7215133d0514..3dd0048afb34 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-versatile/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-versatile/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-versatile/uncompress.h</div><div class='add'>+ *  arch/arm/mach-versatile/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 ARM Limited</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-versatile/vmalloc.h b/arch/arm/mach-versatile/include/mach/vmalloc.h<br/>index ac780df62156..427e3612db5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-versatile/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-versatile/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-versatile/vmalloc.h</div><div class='add'>+ *  arch/arm/mach-versatile/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Russell King.</div><div class='head'>diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c<br/>index ca8290159432..36f23f896503 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-versatile/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/pci.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-versatile/versatile_ab.c b/arch/arm/mach-versatile/versatile_ab.c<br/>index b257ef78ef45..76375c64413a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/versatile_ab.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-versatile/versatile_ab.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/versatile_ab.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/versatile_ab.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c<br/>index be439bb9d450..1725f019fc85 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/versatile_pb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mach-versatile/versatile_pb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/versatile_pb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mach-versatile/versatile_pb.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig<br/>index 3a6c8ec34cd9..ed15f876c725 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mm/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/Kconfig</a></div><div class='hunk'>@@ -187,7 +187,7 @@ config CPU_ARM926T</div><div class='ctx'> 		ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \</div><div class='ctx'> 		ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \</div><div class='ctx'> 		ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \</div><div class='del'>-		ARCH_NS9XXX || ARCH_DAVINCI</div><div class='add'>+		ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2</div><div class='ctx'> 	default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || \</div><div class='ctx'> 		ARCH_OMAP730 || ARCH_OMAP16XX || \</div><div class='ctx'> 		ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \</div><div class='hunk'>@@ -742,3 +742,11 @@ config CACHE_L2X0</div><div class='ctx'> 	select OUTER_CACHE</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables the L2x0 PrimeCell.</div><div class='add'>+</div><div class='add'>+config CACHE_XSC3L2</div><div class='add'>+	bool "Enable the L2 cache on XScale3"</div><div class='add'>+	depends on CPU_XSC3</div><div class='add'>+	default y</div><div class='add'>+	select OUTER_CACHE</div><div class='add'>+	help</div><div class='add'>+	  This option enables the L2 cache on XScale3.</div><div class='head'>diff --git a/arch/arm/mm/cache-feroceon-l2.c b/arch/arm/mm/cache-feroceon-l2.c<br/>index 20eec4ba173f..7b5a25d81576 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/cache-feroceon-l2.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mm/cache-feroceon-l2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/cache-feroceon-l2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/cache-feroceon-l2.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/cache-feroceon-l2.h&gt;</div><div class='add'>+#include &lt;plat/cache-feroceon-l2.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mm/cache-v3.S b/arch/arm/mm/cache-v3.S<br/>index e1994788cf0e..3b3639eb7ca5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/cache-v3.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mm/cache-v3.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/cache-v3.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/cache-v3.S</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include "proc-macros.S"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/cache-v4.S b/arch/arm/mm/cache-v4.S<br/>index b2908063ed6a..33926c9fcda6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/cache-v4.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mm/cache-v4.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/cache-v4.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/cache-v4.S</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include "proc-macros.S"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/cache-v4wt.S b/arch/arm/mm/cache-v4wt.S<br/>index 9bcabd86c6f3..51a9b0b273b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/cache-v4wt.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mm/cache-v4wt.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/cache-v4wt.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/cache-v4wt.S</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include "proc-macros.S"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/cache-xsc3l2.c b/arch/arm/mm/cache-xsc3l2.c<br/>new file mode 100644<br/>index 000000000000..158bd96763d3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/cache-xsc3l2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/cache-xsc3l2.c</a></div><div class='hunk'>@@ -0,0 +1,182 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mm/cache-xsc3l2.c - XScale3 L2 cache controller support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007 ARM Limited</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#define CR_L2	(1 &lt;&lt; 26)</div><div class='add'>+</div><div class='add'>+#define CACHE_LINE_SIZE		32</div><div class='add'>+#define CACHE_LINE_SHIFT	5</div><div class='add'>+#define CACHE_WAY_PER_SET	8</div><div class='add'>+</div><div class='add'>+#define CACHE_WAY_SIZE(l2ctype)	(8192 &lt;&lt; (((l2ctype) &gt;&gt; 8) &amp; 0xf))</div><div class='add'>+#define CACHE_SET_SIZE(l2ctype)	(CACHE_WAY_SIZE(l2ctype) &gt;&gt; CACHE_LINE_SHIFT)</div><div class='add'>+</div><div class='add'>+static inline int xsc3_l2_present(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long l2ctype;</div><div class='add'>+</div><div class='add'>+	__asm__("mrc p15, 1, %0, c0, c0, 1" : "=r" (l2ctype));</div><div class='add'>+</div><div class='add'>+	return !!(l2ctype &amp; 0xf8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void xsc3_l2_clean_mva(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	__asm__("mcr p15, 1, %0, c7, c11, 1" : : "r" (addr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void xsc3_l2_clean_pa(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	xsc3_l2_clean_mva(__phys_to_virt(addr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void xsc3_l2_inv_mva(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	__asm__("mcr p15, 1, %0, c7, c7, 1" : : "r" (addr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void xsc3_l2_inv_pa(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	xsc3_l2_inv_mva(__phys_to_virt(addr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void xsc3_l2_inv_all(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long l2ctype, set_way;</div><div class='add'>+	int set, way;</div><div class='add'>+</div><div class='add'>+	__asm__("mrc p15, 1, %0, c0, c0, 1" : "=r" (l2ctype));</div><div class='add'>+</div><div class='add'>+	for (set = 0; set &lt; CACHE_SET_SIZE(l2ctype); set++) {</div><div class='add'>+		for (way = 0; way &lt; CACHE_WAY_PER_SET; way++) {</div><div class='add'>+			set_way = (way &lt;&lt; 29) | (set &lt;&lt; 5);</div><div class='add'>+			__asm__("mcr p15, 1, %0, c7, c11, 2" : : "r"(set_way));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xsc3_l2_inv_range(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	if (start == 0 &amp;&amp; end == -1ul) {</div><div class='add'>+		xsc3_l2_inv_all();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clean and invalidate partial first cache line.</div><div class='add'>+	 */</div><div class='add'>+	if (start &amp; (CACHE_LINE_SIZE - 1)) {</div><div class='add'>+		xsc3_l2_clean_pa(start &amp; ~(CACHE_LINE_SIZE - 1));</div><div class='add'>+		xsc3_l2_inv_pa(start &amp; ~(CACHE_LINE_SIZE - 1));</div><div class='add'>+		start = (start | (CACHE_LINE_SIZE - 1)) + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clean and invalidate partial last cache line.</div><div class='add'>+	 */</div><div class='add'>+	if (end &amp; (CACHE_LINE_SIZE - 1)) {</div><div class='add'>+		xsc3_l2_clean_pa(end &amp; ~(CACHE_LINE_SIZE - 1));</div><div class='add'>+		xsc3_l2_inv_pa(end &amp; ~(CACHE_LINE_SIZE - 1));</div><div class='add'>+		end &amp;= ~(CACHE_LINE_SIZE - 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Invalidate all full cache lines between 'start' and 'end'.</div><div class='add'>+	 */</div><div class='add'>+	while (start != end) {</div><div class='add'>+		xsc3_l2_inv_pa(start);</div><div class='add'>+		start += CACHE_LINE_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xsc3_l2_clean_range(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	start &amp;= ~(CACHE_LINE_SIZE - 1);</div><div class='add'>+	while (start &lt; end) {</div><div class='add'>+		xsc3_l2_clean_pa(start);</div><div class='add'>+		start += CACHE_LINE_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * optimize L2 flush all operation by set/way format</div><div class='add'>+ */</div><div class='add'>+static inline void xsc3_l2_flush_all(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long l2ctype, set_way;</div><div class='add'>+	int set, way;</div><div class='add'>+</div><div class='add'>+	__asm__("mrc p15, 1, %0, c0, c0, 1" : "=r" (l2ctype));</div><div class='add'>+</div><div class='add'>+	for (set = 0; set &lt; CACHE_SET_SIZE(l2ctype); set++) {</div><div class='add'>+		for (way = 0; way &lt; CACHE_WAY_PER_SET; way++) {</div><div class='add'>+			set_way = (way &lt;&lt; 29) | (set &lt;&lt; 5);</div><div class='add'>+			__asm__("mcr p15, 1, %0, c7, c15, 2" : : "r"(set_way));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xsc3_l2_flush_range(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	if (start == 0 &amp;&amp; end == -1ul) {</div><div class='add'>+		xsc3_l2_flush_all();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	start &amp;= ~(CACHE_LINE_SIZE - 1);</div><div class='add'>+	while (start &lt; end) {</div><div class='add'>+		xsc3_l2_clean_pa(start);</div><div class='add'>+		xsc3_l2_inv_pa(start);</div><div class='add'>+		start += CACHE_LINE_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init xsc3_l2_init(void)</div><div class='add'>+{</div><div class='add'>+	if (!cpu_is_xsc3() || !xsc3_l2_present())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!(get_cr() &amp; CR_L2)) {</div><div class='add'>+		pr_info("XScale3 L2 cache enabled.\n");</div><div class='add'>+		adjust_cr(CR_L2, CR_L2);</div><div class='add'>+		xsc3_l2_inv_all();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	outer_cache.inv_range = xsc3_l2_inv_range;</div><div class='add'>+	outer_cache.clean_range = xsc3_l2_clean_range;</div><div class='add'>+	outer_cache.flush_range = xsc3_l2_flush_range;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+core_initcall(xsc3_l2_init);</div><div class='head'>diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c<br/>index e6352946dde0..30a69d67d673 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/init.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/init.c</a></div><div class='hunk'>@@ -156,9 +156,9 @@ static int __init check_initrd(struct meminfo *mi)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (initrd_node == -1) {</div><div class='del'>-		printk(KERN_ERR "initrd (0x%08lx - 0x%08lx) extends beyond "</div><div class='add'>+		printk(KERN_ERR "INITRD: 0x%08lx+0x%08lx extends beyond "</div><div class='ctx'> 		       "physical memory - disabling initrd\n",</div><div class='del'>-		       phys_initrd_start, end);</div><div class='add'>+		       phys_initrd_start, phys_initrd_size);</div><div class='ctx'> 		phys_initrd_start = phys_initrd_size = 0;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -239,25 +239,33 @@ bootmem_init_node(int node, int initrd_node, struct meminfo *mi)</div><div class='ctx'> 	reserve_bootmem_node(pgdat, boot_pfn &lt;&lt; PAGE_SHIFT,</div><div class='ctx'> 			     boot_pages &lt;&lt; PAGE_SHIFT, BOOTMEM_DEFAULT);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Reserve any special node zero regions.</div><div class='add'>+	 */</div><div class='add'>+	if (node == 0)</div><div class='add'>+		reserve_node_zero(pgdat);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_INITRD</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the initrd is in this node, reserve its memory.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (node == initrd_node) {</div><div class='del'>-		reserve_bootmem_node(pgdat, phys_initrd_start,</div><div class='del'>-				     phys_initrd_size, BOOTMEM_DEFAULT);</div><div class='del'>-		initrd_start = __phys_to_virt(phys_initrd_start);</div><div class='del'>-		initrd_end = initrd_start + phys_initrd_size;</div><div class='add'>+		int res = reserve_bootmem_node(pgdat, phys_initrd_start,</div><div class='add'>+				     phys_initrd_size, BOOTMEM_EXCLUSIVE);</div><div class='add'>+</div><div class='add'>+		if (res == 0) {</div><div class='add'>+			initrd_start = __phys_to_virt(phys_initrd_start);</div><div class='add'>+			initrd_end = initrd_start + phys_initrd_size;</div><div class='add'>+		} else {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+				"INITRD: 0x%08lx+0x%08lx overlaps in-use "</div><div class='add'>+				"memory region - disabling initrd\n",</div><div class='add'>+				phys_initrd_start, phys_initrd_size);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Finally, reserve any node zero regions.</div><div class='del'>-	 */</div><div class='del'>-	if (node == 0)</div><div class='del'>-		reserve_node_zero(pgdat);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * initialise the zones within this node.</div><div class='ctx'> 	 */</div><div class='ctx'> 	memset(zone_size, 0, sizeof(zone_size));</div><div class='head'>diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c<br/>index 303a7ff6bfd2..b81dbf9ffb77 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/ioremap.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mm/ioremap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/ioremap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/ioremap.c</a></div><div class='hunk'>@@ -259,7 +259,7 @@ remap_area_supersections(unsigned long virt, unsigned long pfn,</div><div class='ctx'>  * caller shouldn't need to know that small detail.</div><div class='ctx'>  *</div><div class='ctx'>  * 'flags' are the extra L_PTE_ flags that you want to specify for this</div><div class='del'>- * mapping.  See include/asm-arm/proc-armv/pgtable.h for more information.</div><div class='add'>+ * mapping.  See &lt;asm/pgtable.h&gt; for more information.</div><div class='ctx'>  */</div><div class='ctx'> void __iomem *</div><div class='ctx'> __arm_ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,</div><div class='head'>diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c<br/>index 2d6d682c206a..a713e40e1f1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/mmu.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mm/mmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/mmu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/mmu.c</a></div><div class='hunk'>@@ -211,6 +211,12 @@ static struct mem_type mem_types[] = {</div><div class='ctx'> 				  PMD_SECT_TEX(1),</div><div class='ctx'> 		.domain		= DOMAIN_IO,</div><div class='ctx'> 	},</div><div class='add'>+	[MT_DEVICE_WC] = {	/* ioremap_wc */</div><div class='add'>+		.prot_pte	= PROT_PTE_DEVICE,</div><div class='add'>+		.prot_l1	= PMD_TYPE_TABLE,</div><div class='add'>+		.prot_sect	= PROT_SECT_DEVICE,</div><div class='add'>+		.domain		= DOMAIN_IO,</div><div class='add'>+	},</div><div class='ctx'> 	[MT_CACHECLEAN] = {</div><div class='ctx'> 		.prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,</div><div class='ctx'> 		.domain    = DOMAIN_KERNEL,</div><div class='hunk'>@@ -273,6 +279,20 @@ static void __init build_mem_type_table(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * On non-Xscale3 ARMv5-and-older systems, use CB=01</div><div class='add'>+	 * (Uncached/Buffered) for ioremap_wc() mappings.  On XScale3</div><div class='add'>+	 * and ARMv6+, use TEXCB=00100 mappings (Inner/Outer Uncacheable</div><div class='add'>+	 * in xsc3 parlance, Uncached Normal in ARMv6 parlance).</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_is_xsc3() || cpu_arch &gt;= CPU_ARCH_ARMv6) {</div><div class='add'>+		mem_types[MT_DEVICE_WC].prot_pte_ext |= PTE_EXT_TEX(1);</div><div class='add'>+		mem_types[MT_DEVICE_WC].prot_sect |= PMD_SECT_TEX(1);</div><div class='add'>+	} else {</div><div class='add'>+		mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_BUFFERABLE;</div><div class='add'>+		mem_types[MT_DEVICE_WC].prot_sect |= PMD_SECT_BUFFERABLE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * ARMv5 and lower, bit 4 must be set for page tables.</div><div class='ctx'> 	 * (was: cache "update-able on write" bit on ARM610)</div><div class='ctx'> 	 * However, Xscale cores require this bit to be cleared.</div><div class='hunk'>@@ -568,6 +588,55 @@ void __init iotable_init(struct map_desc *io_desc, int nr)</div><div class='ctx'> 		create_mapping(io_desc + i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __init check_membank_valid(struct membank *mb)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Check whether this memory region has non-zero size.</div><div class='add'>+	 */</div><div class='add'>+	if (mb-&gt;size == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check whether this memory region would entirely overlap</div><div class='add'>+	 * the vmalloc area.</div><div class='add'>+	 */</div><div class='add'>+	if (phys_to_virt(mb-&gt;start) &gt;= VMALLOC_MIN) {</div><div class='add'>+		printk(KERN_NOTICE "Ignoring RAM at %.8lx-%.8lx "</div><div class='add'>+			"(vmalloc region overlap).\n",</div><div class='add'>+			mb-&gt;start, mb-&gt;start + mb-&gt;size - 1);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check whether this memory region would partially overlap</div><div class='add'>+	 * the vmalloc area.</div><div class='add'>+	 */</div><div class='add'>+	if (phys_to_virt(mb-&gt;start + mb-&gt;size) &lt; phys_to_virt(mb-&gt;start) ||</div><div class='add'>+	    phys_to_virt(mb-&gt;start + mb-&gt;size) &gt; VMALLOC_MIN) {</div><div class='add'>+		unsigned long newsize = VMALLOC_MIN - phys_to_virt(mb-&gt;start);</div><div class='add'>+</div><div class='add'>+		printk(KERN_NOTICE "Truncating RAM at %.8lx-%.8lx "</div><div class='add'>+			"to -%.8lx (vmalloc region overlap).\n",</div><div class='add'>+			mb-&gt;start, mb-&gt;start + mb-&gt;size - 1,</div><div class='add'>+			mb-&gt;start + newsize - 1);</div><div class='add'>+		mb-&gt;size = newsize;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init sanity_check_meminfo(struct meminfo *mi)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	for (i = 0, j = 0; i &lt; mi-&gt;nr_banks; i++) {</div><div class='add'>+		if (check_membank_valid(&amp;mi-&gt;bank[i]))</div><div class='add'>+			mi-&gt;bank[j++] = mi-&gt;bank[i];</div><div class='add'>+	}</div><div class='add'>+	mi-&gt;nr_banks = j;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void prepare_page_table(struct meminfo *mi)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr;</div><div class='hunk'>@@ -753,6 +822,7 @@ void __init paging_init(struct meminfo *mi, struct machine_desc *mdesc)</div><div class='ctx'> 	void *zero_page;</div><div class='ctx'> </div><div class='ctx'> 	build_mem_type_table();</div><div class='add'>+	sanity_check_meminfo(mi);</div><div class='ctx'> 	prepare_page_table(mi);</div><div class='ctx'> 	bootmem_init(mi);</div><div class='ctx'> 	devicemaps_init(mdesc);</div><div class='head'>diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S<br/>index d64f8e6f75ab..eda733d30455 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm720.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mm/proc-arm720.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm720.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/proc-arm720.S</a></div><div class='hunk'>@@ -231,7 +231,7 @@ cpu_arm720_name:</div><div class='ctx'> 		.align</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * See linux/include/asm-arm/procinfo.h for a definition of this structure.</div><div class='add'>+ * See &lt;asm/procinfo.h&gt; for a definition of this structure.</div><div class='ctx'>  */</div><div class='ctx'> 	</div><div class='ctx'> 		.section ".proc.info.init", #alloc, #execinstr</div><div class='head'>diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S<br/>index 1a3d63df8e90..551244d5ca19 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm940.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mm/proc-arm940.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm940.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/proc-arm940.S</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include "proc-macros.S"</div><div class='ctx'> </div><div class='ctx'> /* ARM940T has a 4KB DCache comprising 256 lines of 4 words */</div><div class='ctx'> #define CACHE_DLINESIZE	16</div><div class='head'>diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S<br/>index 82d579ac9b98..6168c6160dee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm946.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mm/proc-arm946.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm946.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/proc-arm946.S</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include "proc-macros.S"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ARM946E-S is synthesizable to have 0KB to 1MB sized D-Cache,</div><div class='head'>diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S<br/>index 9818195dbf11..bbe10576c861 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-sa110.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mm/proc-sa110.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-sa110.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/proc-sa110.S</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S<br/>index c5fe27ad2892..871ba018252e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-sa1100.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mm/proc-sa1100.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-sa1100.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/proc-sa1100.S</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S<br/>index 3533741a76f6..7bd9e7197f60 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-xsc3.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/mm/proc-xsc3.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-xsc3.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/mm/proc-xsc3.S</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -52,11 +52,6 @@</div><div class='ctx'> #define CACHESIZE	32768</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Run with L2 enabled.</div><div class='del'>- */</div><div class='del'>-#define L2_CACHE_ENABLE	1</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * This macro is used to wait for a CP15 write and is needed when we</div><div class='ctx'>  * have to ensure that the last operation to the coprocessor was</div><div class='ctx'>  * completed before continuing with operation.</div><div class='hunk'>@@ -265,12 +260,9 @@ ENTRY(xsc3_dma_inv_range)</div><div class='ctx'> 	tst	r0, #CACHELINESIZE - 1</div><div class='ctx'> 	bic	r0, r0, #CACHELINESIZE - 1</div><div class='ctx'> 	mcrne	p15, 0, r0, c7, c10, 1		@ clean L1 D line</div><div class='del'>-	mcrne	p15, 1, r0, c7, c11, 1		@ clean L2 line</div><div class='ctx'> 	tst	r1, #CACHELINESIZE - 1</div><div class='ctx'> 	mcrne	p15, 0, r1, c7, c10, 1		@ clean L1 D line</div><div class='del'>-	mcrne	p15, 1, r1, c7, c11, 1		@ clean L2 line</div><div class='ctx'> 1:	mcr	p15, 0, r0, c7, c6, 1		@ invalidate L1 D line</div><div class='del'>-	mcr	p15, 1, r0, c7, c7, 1		@ invalidate L2 line</div><div class='ctx'> 	add	r0, r0, #CACHELINESIZE</div><div class='ctx'> 	cmp	r0, r1</div><div class='ctx'> 	blo	1b</div><div class='hunk'>@@ -288,7 +280,6 @@ ENTRY(xsc3_dma_inv_range)</div><div class='ctx'> ENTRY(xsc3_dma_clean_range)</div><div class='ctx'> 	bic	r0, r0, #CACHELINESIZE - 1</div><div class='ctx'> 1:	mcr	p15, 0, r0, c7, c10, 1		@ clean L1 D line</div><div class='del'>-	mcr	p15, 1, r0, c7, c11, 1		@ clean L2 line</div><div class='ctx'> 	add	r0, r0, #CACHELINESIZE</div><div class='ctx'> 	cmp	r0, r1</div><div class='ctx'> 	blo	1b</div><div class='hunk'>@@ -306,8 +297,6 @@ ENTRY(xsc3_dma_clean_range)</div><div class='ctx'> ENTRY(xsc3_dma_flush_range)</div><div class='ctx'> 	bic	r0, r0, #CACHELINESIZE - 1</div><div class='ctx'> 1:	mcr	p15, 0, r0, c7, c14, 1		@ clean/invalidate L1 D line</div><div class='del'>-	mcr	p15, 1, r0, c7, c11, 1		@ clean L2 line</div><div class='del'>-	mcr	p15, 1, r0, c7, c7, 1		@ invalidate L2 line</div><div class='ctx'> 	add	r0, r0, #CACHELINESIZE</div><div class='ctx'> 	cmp	r0, r1</div><div class='ctx'> 	blo	1b</div><div class='hunk'>@@ -347,9 +336,7 @@ ENTRY(cpu_xsc3_switch_mm)</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c5, 0		@ invalidate L1 I cache and BTB</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c10, 4		@ data write barrier</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c5, 4		@ prefetch flush</div><div class='del'>-#ifdef L2_CACHE_ENABLE</div><div class='ctx'> 	orr	r0, r0, #0x18			@ cache the page table in L2</div><div class='del'>-#endif</div><div class='ctx'> 	mcr	p15, 0, r0, c2, c0, 0		@ load page table pointer</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I and D TLBs</div><div class='ctx'> 	cpwait_ret lr, ip</div><div class='hunk'>@@ -378,12 +365,10 @@ ENTRY(cpu_xsc3_set_pte_ext)</div><div class='ctx'> 	orreq	r2, r2, #PTE_EXT_AP_UNO_SRW	@ yes -&gt; user n/a, system r/w</div><div class='ctx'> 						@ combined with user -&gt; user r/w</div><div class='ctx'> </div><div class='del'>-#if L2_CACHE_ENABLE</div><div class='ctx'> 	@ If it's cacheable, it needs to be in L2 also.</div><div class='ctx'> 	eor	ip, r1, #L_PTE_CACHEABLE</div><div class='ctx'> 	tst	ip, #L_PTE_CACHEABLE</div><div class='ctx'> 	orreq	r2, r2, #PTE_EXT_TEX(0x5)</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	tst	r3, #L_PTE_PRESENT | L_PTE_YOUNG	@ present and young?</div><div class='ctx'> 	movne	r2, #0				@ no -&gt; fault</div><div class='hunk'>@@ -408,9 +393,7 @@ __xsc3_setup:</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c10, 4		@ data write barrier</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c5, 4		@ prefetch flush</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I and D TLBs</div><div class='del'>-#if L2_CACHE_ENABLE</div><div class='ctx'> 	orr	r4, r4, #0x18			@ cache the page table in L2</div><div class='del'>-#endif</div><div class='ctx'> 	mcr	p15, 0, r4, c2, c0, 0		@ load page table pointer</div><div class='ctx'> </div><div class='ctx'> 	mov	r0, #0				@ don't allow CP access</div><div class='hunk'>@@ -418,9 +401,7 @@ __xsc3_setup:</div><div class='ctx'> </div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0, 1		@ get auxiliary control reg</div><div class='ctx'> 	and	r0, r0, #2			@ preserve bit P bit setting</div><div class='del'>-#if L2_CACHE_ENABLE</div><div class='ctx'> 	orr	r0, r0, #(1 &lt;&lt; 10)		@ enable L2 for LLR cache</div><div class='del'>-#endif</div><div class='ctx'> 	mcr	p15, 0, r0, c1, c0, 1		@ set auxiliary control reg</div><div class='ctx'> </div><div class='ctx'> 	adr	r5, xsc3_crval</div><div class='hunk'>@@ -429,9 +410,6 @@ __xsc3_setup:</div><div class='ctx'> 	bic	r0, r0, r5			@ ..V. ..R. .... ..A.</div><div class='ctx'> 	orr	r0, r0, r6			@ ..VI Z..S .... .C.M (mmu)</div><div class='ctx'> 						@ ...I Z..S .... .... (uc)</div><div class='del'>-#if L2_CACHE_ENABLE</div><div class='del'>-	orr 	r0, r0, #0x04000000		@ L2 enable</div><div class='del'>-#endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> 	.size	__xsc3_setup, . - __xsc3_setup</div><div class='head'>diff --git a/arch/arm/nwfpe/fpa11.h b/arch/arm/nwfpe/fpa11.h<br/>index 4a4d02c09112..386cbd13eaf4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpa11.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/nwfpe/fpa11.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpa11.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/nwfpe/fpa11.h</a></div><div class='hunk'>@@ -69,7 +69,7 @@ typedef union tagFPREG {</div><div class='ctx'>  * This structure is exported to user space.  Do not re-order.</div><div class='ctx'>  * Only add new stuff to the end, and do not change the size of</div><div class='ctx'>  * any element.  Elements of this structure are used by user</div><div class='del'>- * space, and must match struct user_fp in include/asm-arm/user.h.</div><div class='add'>+ * space, and must match struct user_fp in &lt;asm/user.h&gt;.</div><div class='ctx'>  * We include the byte offsets below for documentation purposes.</div><div class='ctx'>  *</div><div class='ctx'>  * The size of this structure and FPREG are checked by fpmodule.c</div><div class='head'>diff --git a/arch/arm/oprofile/op_model_mpcore.c b/arch/arm/oprofile/op_model_mpcore.c<br/>index 4458705021e0..92db6e035c65 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/oprofile/op_model_mpcore.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/oprofile/op_model_mpcore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/oprofile/op_model_mpcore.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/oprofile/op_model_mpcore.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "op_counter.h"</div><div class='head'>diff --git a/arch/arm/plat-iop/adma.c b/arch/arm/plat-iop/adma.c<br/>index 53c5e9a52eb1..f72420821619 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/adma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-iop/adma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/adma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-iop/adma.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iop3xx.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;asm/arch/adma.h&gt;</div><div class='add'>+#include &lt;mach/adma.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iop_adma.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_IOP32X</div><div class='head'>diff --git a/arch/arm/plat-iop/i2c.c b/arch/arm/plat-iop/i2c.c<br/>index e99909bdba71..6dcbcc4ad419 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/i2c.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-iop/i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/i2c.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-iop/i2c.c</a></div><div class='hunk'>@@ -25,9 +25,8 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iop3xx.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_IOP32X</div><div class='head'>diff --git a/arch/arm/plat-iop/io.c b/arch/arm/plat-iop/io.c<br/>index 498675d028d0..39dcfb4bdc71 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-iop/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-iop/io.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> void * __iomem __iop3xx_ioremap(unsigned long cookie, size_t size,</div><div class='head'>diff --git a/arch/arm/plat-iop/pci.c b/arch/arm/plat-iop/pci.c<br/>index d9bc15a69e5d..54708bf9cb15 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-iop/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-iop/pci.c</a></div><div class='hunk'>@@ -21,10 +21,9 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/signal.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iop3xx.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> // #define DEBUG</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c<br/>index 6fe481ff4fdf..c53fefb6aac4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-iop/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-iop/time.c</a></div><div class='hunk'>@@ -18,13 +18,13 @@</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/arch/time.h&gt;</div><div class='add'>+#include &lt;mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned long ticks_per_jiffy;</div><div class='ctx'> static unsigned long ticks_per_usec;</div><div class='head'>diff --git a/arch/arm/plat-mxc/clock.c b/arch/arm/plat-mxc/clock.c<br/>index 1aa86fd60d71..0a38f0b396eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-mxc/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/clock.c</a></div><div class='hunk'>@@ -37,9 +37,8 @@</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/semaphore.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(clocks);</div><div class='ctx'> static DEFINE_MUTEX(clocks_mutex);</div><div class='head'>diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c<br/>index 318b268f938e..733e0acac916 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/gpio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-mxc/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/gpio.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm-generic/bug.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct mxc_gpio_port *mxc_gpio_ports;</div><div class='head'>diff --git a/include/asm-arm/arch-mxc/board-mx27ads.h b/arch/arm/plat-mxc/include/mach/board-mx27ads.h<br/>index 61e66dac90ef..61e66dac90ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/board-mx27ads.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/board-mx27ads.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/board-mx27ads.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/board-mx27ads.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/board-mx31ads.h b/arch/arm/plat-mxc/include/mach/board-mx31ads.h<br/>index 1bc6fb0f9a83..1bc6fb0f9a83 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/board-mx31ads.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/board-mx31ads.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/board-mx31ads.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/board-mx31ads.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/board-mx31lite.h b/arch/arm/plat-mxc/include/mach/board-mx31lite.h<br/>index e4e5cf5ad7db..e4e5cf5ad7db 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/board-mx31lite.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/board-mx31lite.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/board-mx31lite.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/board-mx31lite.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/board-pcm037.h b/arch/arm/plat-mxc/include/mach/board-pcm037.h<br/>index 82232ba3c8fc..82232ba3c8fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/board-pcm037.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/board-pcm037.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/board-pcm037.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/board-pcm037.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/board-pcm038.h b/arch/arm/plat-mxc/include/mach/board-pcm038.h<br/>index 750c62afd90f..750c62afd90f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/board-pcm038.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/board-pcm038.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/board-pcm038.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/board-pcm038.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/clock.h b/arch/arm/plat-mxc/include/mach/clock.h<br/>index 24caa2b7c91d..24caa2b7c91d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/clock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/clock.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/common.h b/arch/arm/plat-mxc/include/mach/common.h<br/>index a6d2e24aab15..a6d2e24aab15 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/common.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/common.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S<br/>index 575087f8561a..b9907bebba3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-imx/debug-macro.S</div><div class='add'>+/* arch/arm/mach-imx/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,22 +11,22 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_MX31ADS</div><div class='del'>-#include &lt;asm/arch/board-mx31ads.h&gt;</div><div class='add'>+#include &lt;mach/board-mx31ads.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_MACH_PCM037</div><div class='del'>-#include &lt;asm/arch/board-pcm037.h&gt;</div><div class='add'>+#include &lt;mach/board-pcm037.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_MACH_MX31LITE</div><div class='del'>-#include &lt;asm/arch/board-mx31lite.h&gt;</div><div class='add'>+#include &lt;mach/board-mx31lite.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_MACH_MX27ADS</div><div class='del'>-#include &lt;asm/arch/board-mx27ads.h&gt;</div><div class='add'>+#include &lt;mach/board-mx27ads.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_MACH_PCM038</div><div class='del'>-#include &lt;asm/arch/board-pcm038.h&gt;</div><div class='add'>+#include &lt;mach/board-pcm038.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> 		.macro	addruart,rx</div><div class='ctx'> 		mrc	p15, 0, \rx, c1, c0</div><div class='head'>diff --git a/include/asm-arm/arch-mxc/dma.h b/arch/arm/plat-mxc/include/mach/dma.h<br/>index c822d569a05e..c822d569a05e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/dma.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/entry-macro.S b/arch/arm/plat-mxc/include/mach/entry-macro.S<br/>index b542433afb1b..b542433afb1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/entry-macro.S</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/gpio.h b/arch/arm/plat-mxc/include/mach/gpio.h<br/>index d393e15f5a6b..65eedc0d196f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/gpio.h</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_MXC_GPIO_H__</div><div class='ctx'> #define __ASM_ARCH_MXC_GPIO_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm-generic/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* use gpiolib dispatchers */</div><div class='head'>diff --git a/include/asm-arm/arch-mxc/hardware.h b/arch/arm/plat-mxc/include/mach/hardware.h<br/>index 37cddbaaade7..3caadeeda701 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/hardware.h</a></div><div class='hunk'>@@ -23,15 +23,15 @@</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_MX3</div><div class='del'>-# include &lt;asm/arch/mx31.h&gt;</div><div class='add'>+# include &lt;mach/mx31.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_MX2</div><div class='ctx'> # ifdef CONFIG_MACH_MX27</div><div class='del'>-#  include &lt;asm/arch/mx27.h&gt;</div><div class='add'>+#  include &lt;mach/mx27.h&gt;</div><div class='ctx'> # endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/mxc.h&gt;</div><div class='add'>+#include &lt;mach/mxc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_ARCH_MXC_HARDWARE_H__ */</div><div class='head'>diff --git a/include/asm-arm/arch-mxc/iim.h b/arch/arm/plat-mxc/include/mach/iim.h<br/>index 315bffadafda..315bffadafda 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/iim.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/iim.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/iim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/iim.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/imx-uart.h b/arch/arm/plat-mxc/include/mach/imx-uart.h<br/>index 83fb72c4048a..83fb72c4048a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/imx-uart.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/imx-uart.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/imx-uart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/imx-uart.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/io.h b/arch/arm/plat-mxc/include/mach/io.h<br/>index 65b6810124c1..65b6810124c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/io.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/iomux-mx1-mx2.h b/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h<br/>index 076d37b38eb2..076d37b38eb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/iomux-mx1-mx2.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/iomux-mx1-mx2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/iomux-mx3.h b/arch/arm/plat-mxc/include/mach/iomux-mx3.h<br/>index 7509e7692f08..7509e7692f08 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/iomux-mx3.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/iomux-mx3.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/iomux-mx3.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/iomux-mx3.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/irqs.h b/arch/arm/plat-mxc/include/mach/irqs.h<br/>index f416130718cf..228c4f68ccdf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/irqs.h</a></div><div class='hunk'>@@ -11,6 +11,6 @@</div><div class='ctx'> #ifndef __ASM_ARCH_MXC_IRQS_H__</div><div class='ctx'> #define __ASM_ARCH_MXC_IRQS_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_ARCH_MXC_IRQS_H__ */</div><div class='head'>diff --git a/include/asm-arm/arch-mxc/memory.h b/arch/arm/plat-mxc/include/mach/memory.h<br/>index 059f83023a10..d7a8d3ebed57 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/memory.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_MXC_MEMORY_H__</div><div class='ctx'> #define __ASM_ARCH_MXC_MEMORY_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Virtual view &lt;-&gt; DMA view memory address translations</div><div class='head'>diff --git a/include/asm-arm/arch-mxc/mx27.h b/arch/arm/plat-mxc/include/mach/mx27.h<br/>index 212ecc246626..212ecc246626 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/mx27.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/mx27.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/mx27.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/mx27.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/mx31.h b/arch/arm/plat-mxc/include/mach/mx31.h<br/>index a7373e4a56cb..a7373e4a56cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/mx31.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/mx31.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/mx31.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/mx31.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h<br/>index 332eda4dbd3b..332eda4dbd3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/mxc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/mxc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/mxc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/mxc.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/mxc_timer.h b/arch/arm/plat-mxc/include/mach/mxc_timer.h<br/>index 6cb11f4f1a06..130aebfbe168 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/mxc_timer.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/mxc_timer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/mxc_timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/mxc_timer.h</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #define __PLAT_MXC_TIMER_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_IMX</div><div class='ctx'> #define TIMER_BASE		IO_ADDRESS(TIM1_BASE_ADDR)</div><div class='head'>diff --git a/include/asm-arm/arch-mxc/system.h b/arch/arm/plat-mxc/include/mach/system.h<br/>index bbfc37465fc5..bbfc37465fc5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/system.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-mxc/timex.h b/arch/arm/plat-mxc/include/mach/timex.h<br/>index 59019fa58f82..0b0af0253e91 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/timex.h</a></div><div class='hunk'>@@ -20,6 +20,6 @@</div><div class='ctx'> #ifndef __ASM_ARCH_MXC_TIMEX_H__</div><div class='ctx'> #define __ASM_ARCH_MXC_TIMEX_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;	/* for CLOCK_TICK_RATE */</div><div class='add'>+#include &lt;mach/hardware.h&gt;	/* for CLOCK_TICK_RATE */</div><div class='ctx'> </div><div class='ctx'> #endif				/* __ASM_ARCH_MXC_TIMEX_H__ */</div><div class='head'>diff --git a/include/asm-arm/arch-mxc/uncompress.h b/arch/arm/plat-mxc/include/mach/uncompress.h<br/>index 42cc0cb3fefd..de6fe0365982 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  include/asm-arm/arch-mxc/uncompress.h</div><div class='add'>+ *  arch/arm/plat-mxc/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> #define __MXC_BOOT_UNCOMPRESS</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define UART(x) (*(volatile unsigned long *)(serial_port + (x)))</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-mxc/vmalloc.h b/arch/arm/plat-mxc/include/mach/vmalloc.h<br/>index 62d97623412f..62d97623412f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-mxc/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-mxc/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/include/mach/vmalloc.h</a></div><div class='head'>diff --git a/arch/arm/plat-mxc/iomux-mx1-mx2.c b/arch/arm/plat-mxc/iomux-mx1-mx2.c<br/>index 1985571eb40c..d97387aa9a42 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/iomux-mx1-mx2.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-mxc/iomux-mx1-mx2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/iomux-mx1-mx2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/iomux-mx1-mx2.c</a></div><div class='hunk'>@@ -30,9 +30,9 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/iomux-mx1-mx2.h&gt;</div><div class='add'>+#include &lt;mach/iomux-mx1-mx2.h&gt;</div><div class='ctx'> </div><div class='ctx'> void mxc_gpio_mode(int gpio_mode)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/plat-mxc/irq.c b/arch/arm/plat-mxc/irq.c<br/>index 1fbe01da6925..1053b666c676 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-mxc/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/irq.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define AVIC_BASE		IO_ADDRESS(AVIC_BASE_ADDR)</div><div class='ctx'> #define AVIC_INTCNTL		(AVIC_BASE + 0x00)	/* int control reg */</div><div class='head'>diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/plat-mxc/time.c<br/>index 3bf86343fdf4..fd28f5194f71 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-mxc/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-mxc/time.c</a></div><div class='hunk'>@@ -26,10 +26,10 @@</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/mxc_timer.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/mxc_timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct clock_event_device clockevent_mxc;</div><div class='ctx'> static enum clock_event_mode clockevent_mode = CLOCK_EVT_MODE_UNUSED;</div><div class='head'>diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c<br/>index c2e741de0203..197974defbe4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/clock.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -26,7 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(clocks);</div><div class='ctx'> static DEFINE_MUTEX(clocks_mutex);</div><div class='head'>diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c<br/>index 8d04929a3c75..f4dff423ae7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/common.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/common.c</a></div><div class='hunk'>@@ -19,20 +19,20 @@</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/common.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/control.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/fpga.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/control.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/fpga.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)</div><div class='ctx'> # include "../mach-omap2/sdrc.h"</div><div class='head'>diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c<br/>index d719c15daa55..ae1de308aaad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/cpu-omap.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/cpu-omap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/cpu-omap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/cpu-omap.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/debug-devices.c b/arch/arm/plat-omap/debug-devices.c<br/>index f455233af082..5b73bb274452 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/debug-devices.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/debug-devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/debug-devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/debug-devices.c</a></div><div class='hunk'>@@ -13,11 +13,11 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Many OMAP development platforms reuse the same "debug board"; these</div><div class='head'>diff --git a/arch/arm/plat-omap/debug-leds.c b/arch/arm/plat-omap/debug-leds.c<br/>index 9128a80d228f..9422dee7de84 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/debug-leds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/debug-leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/debug-leds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/debug-leds.c</a></div><div class='hunk'>@@ -13,13 +13,13 @@</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/fpga.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/fpga.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Many OMAP development platforms reuse the same "debug board"; these</div><div class='head'>diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c<br/>index 81002b722da1..01da719a7453 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/devices.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/devices.c</a></div><div class='hunk'>@@ -14,17 +14,18 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/menelaus.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcbsp.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/menelaus.h&gt;</div><div class='add'>+#include &lt;mach/mcbsp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if	defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)</div><div class='ctx'> </div><div class='hunk'>@@ -194,25 +195,38 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-#if	defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)</div><div class='add'>+#if	defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \</div><div class='add'>+	defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARCH_OMAP24XX</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)</div><div class='ctx'> #define	OMAP_MMC1_BASE		0x4809c000</div><div class='del'>-#define OMAP_MMC1_INT		INT_24XX_MMC_IRQ</div><div class='add'>+#define	OMAP_MMC1_END		(OMAP_MMC1_BASE + 0x1fc)</div><div class='add'>+#define	OMAP_MMC1_INT		INT_24XX_MMC_IRQ</div><div class='add'>+</div><div class='add'>+#define	OMAP_MMC2_BASE		0x480b4000</div><div class='add'>+#define	OMAP_MMC2_END		(OMAP_MMC2_BASE + 0x1fc)</div><div class='add'>+#define	OMAP_MMC2_INT		INT_24XX_MMC2_IRQ</div><div class='add'>+</div><div class='ctx'> #else</div><div class='add'>+</div><div class='ctx'> #define	OMAP_MMC1_BASE		0xfffb7800</div><div class='add'>+#define	OMAP_MMC1_END		(OMAP_MMC1_BASE + 0x7f)</div><div class='ctx'> #define OMAP_MMC1_INT		INT_MMC</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> #define	OMAP_MMC2_BASE		0xfffb7c00	/* omap16xx only */</div><div class='add'>+#define	OMAP_MMC2_END		(OMAP_MMC2_BASE + 0x7f)</div><div class='add'>+#define	OMAP_MMC2_INT		INT_1610_MMC2</div><div class='add'>+</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-static struct omap_mmc_conf mmc1_conf;</div><div class='add'>+static struct omap_mmc_platform_data mmc1_data;</div><div class='ctx'> </div><div class='ctx'> static u64 mmc1_dmamask = 0xffffffff;</div><div class='ctx'> </div><div class='ctx'> static struct resource mmc1_resources[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.start		= OMAP_MMC1_BASE,</div><div class='del'>-		.end		= OMAP_MMC1_BASE + 0x7f,</div><div class='add'>+		.end		= OMAP_MMC1_END,</div><div class='ctx'> 		.flags		= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -226,26 +240,27 @@ static struct platform_device mmc_omap_device1 = {</div><div class='ctx'> 	.id		= 1,</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.dma_mask	= &amp;mmc1_dmamask,</div><div class='del'>-		.platform_data	= &amp;mmc1_conf,</div><div class='add'>+		.platform_data	= &amp;mmc1_data,</div><div class='ctx'> 	},</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(mmc1_resources),</div><div class='ctx'> 	.resource	= mmc1_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef	CONFIG_ARCH_OMAP16XX</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2430) || \</div><div class='add'>+	defined(CONFIG_ARCH_OMAP34XX)</div><div class='ctx'> </div><div class='del'>-static struct omap_mmc_conf mmc2_conf;</div><div class='add'>+static struct omap_mmc_platform_data mmc2_data;</div><div class='ctx'> </div><div class='ctx'> static u64 mmc2_dmamask = 0xffffffff;</div><div class='ctx'> </div><div class='ctx'> static struct resource mmc2_resources[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.start		= OMAP_MMC2_BASE,</div><div class='del'>-		.end		= OMAP_MMC2_BASE + 0x7f,</div><div class='add'>+		.end		= OMAP_MMC2_END,</div><div class='ctx'> 		.flags		= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.start		= INT_1610_MMC2,</div><div class='add'>+		.start		= OMAP_MMC2_INT,</div><div class='ctx'> 		.flags		= IORESOURCE_IRQ,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -255,26 +270,19 @@ static struct platform_device mmc_omap_device2 = {</div><div class='ctx'> 	.id		= 2,</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.dma_mask	= &amp;mmc2_dmamask,</div><div class='del'>-		.platform_data	= &amp;mmc2_conf,</div><div class='add'>+		.platform_data	= &amp;mmc2_data,</div><div class='ctx'> 	},</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(mmc2_resources),</div><div class='ctx'> 	.resource	= mmc2_resources,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void __init omap_init_mmc(void)</div><div class='add'>+static inline void omap_init_mmc_conf(const struct omap_mmc_config *mmc_conf)</div><div class='ctx'> {</div><div class='del'>-	const struct omap_mmc_config	*mmc_conf;</div><div class='del'>-	const struct omap_mmc_conf	*mmc;</div><div class='del'>-</div><div class='del'>-	/* NOTE:  assumes MMC was never (wrongly) enabled */</div><div class='del'>-	mmc_conf = omap_get_config(OMAP_TAG_MMC, struct omap_mmc_config);</div><div class='del'>-	if (!mmc_conf)</div><div class='add'>+	if (cpu_is_omap2430() || cpu_is_omap34xx())</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* block 1 is always available and has just one pinout option */</div><div class='del'>-	mmc = &amp;mmc_conf-&gt;mmc[0];</div><div class='del'>-	if (mmc-&gt;enabled) {</div><div class='add'>+	if (mmc_conf-&gt;mmc[0].enabled) {</div><div class='ctx'> 		if (cpu_is_omap24xx()) {</div><div class='ctx'> 			omap_cfg_reg(H18_24XX_MMC_CMD);</div><div class='ctx'> 			omap_cfg_reg(H15_24XX_MMC_CLKI);</div><div class='hunk'>@@ -292,7 +300,7 @@ static void __init omap_init_mmc(void)</div><div class='ctx'> 				omap_cfg_reg(P20_1710_MMC_DATDIR0);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		if (mmc-&gt;wire4) {</div><div class='add'>+		if (mmc_conf-&gt;mmc[0].wire4) {</div><div class='ctx'> 			if (cpu_is_omap24xx()) {</div><div class='ctx'> 				omap_cfg_reg(H14_24XX_MMC_DAT1);</div><div class='ctx'> 				omap_cfg_reg(E19_24XX_MMC_DAT2);</div><div class='hunk'>@@ -303,25 +311,22 @@ static void __init omap_init_mmc(void)</div><div class='ctx'> 			} else {</div><div class='ctx'> 				omap_cfg_reg(MMC_DAT1);</div><div class='ctx'> 				/* NOTE:  DAT2 can be on W10 (here) or M15 */</div><div class='del'>-				if (!mmc-&gt;nomux)</div><div class='add'>+				if (!mmc_conf-&gt;mmc[0].nomux)</div><div class='ctx'> 					omap_cfg_reg(MMC_DAT2);</div><div class='ctx'> 				omap_cfg_reg(MMC_DAT3);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		mmc1_conf = *mmc;</div><div class='del'>-		(void) platform_device_register(&amp;mmc_omap_device1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef	CONFIG_ARCH_OMAP16XX</div><div class='ctx'> 	/* block 2 is on newer chips, and has many pinout options */</div><div class='del'>-	mmc = &amp;mmc_conf-&gt;mmc[1];</div><div class='del'>-	if (mmc-&gt;enabled) {</div><div class='del'>-		if (!mmc-&gt;nomux) {</div><div class='add'>+	if (mmc_conf-&gt;mmc[1].enabled) {</div><div class='add'>+		if (!mmc_conf-&gt;mmc[1].nomux) {</div><div class='ctx'> 			omap_cfg_reg(Y8_1610_MMC2_CMD);</div><div class='ctx'> 			omap_cfg_reg(Y10_1610_MMC2_CLK);</div><div class='ctx'> 			omap_cfg_reg(R18_1610_MMC2_CLKIN);</div><div class='ctx'> 			omap_cfg_reg(W8_1610_MMC2_DAT0);</div><div class='del'>-			if (mmc-&gt;wire4) {</div><div class='add'>+			if (mmc_conf-&gt;mmc[1].wire4) {</div><div class='ctx'> 				omap_cfg_reg(V8_1610_MMC2_DAT1);</div><div class='ctx'> 				omap_cfg_reg(W15_1610_MMC2_DAT2);</div><div class='ctx'> 				omap_cfg_reg(R10_1610_MMC2_DAT3);</div><div class='hunk'>@@ -337,14 +342,55 @@ static void __init omap_init_mmc(void)</div><div class='ctx'> 		if (cpu_is_omap1710())</div><div class='ctx'> 			omap_writel(omap_readl(MOD_CONF_CTRL_1) | (1 &lt;&lt; 24),</div><div class='ctx'> 				     MOD_CONF_CTRL_1);</div><div class='del'>-		mmc2_conf = *mmc;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init omap_init_mmc(void)</div><div class='add'>+{</div><div class='add'>+	const struct omap_mmc_config	*mmc_conf;</div><div class='add'>+</div><div class='add'>+	/* NOTE:  assumes MMC was never (wrongly) enabled */</div><div class='add'>+	mmc_conf = omap_get_config(OMAP_TAG_MMC, struct omap_mmc_config);</div><div class='add'>+	if (!mmc_conf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	omap_init_mmc_conf(mmc_conf);</div><div class='add'>+</div><div class='add'>+	if (mmc_conf-&gt;mmc[0].enabled) {</div><div class='add'>+		mmc1_data.conf = mmc_conf-&gt;mmc[0];</div><div class='add'>+		(void) platform_device_register(&amp;mmc_omap_device1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2430) || \</div><div class='add'>+	defined(CONFIG_ARCH_OMAP34XX)</div><div class='add'>+	if (mmc_conf-&gt;mmc[1].enabled) {</div><div class='add'>+		mmc2_data.conf = mmc_conf-&gt;mmc[1];</div><div class='ctx'> 		(void) platform_device_register(&amp;mmc_omap_device2);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void omap_set_mmc_info(int host, const struct omap_mmc_platform_data *info)</div><div class='add'>+{</div><div class='add'>+	switch (host) {</div><div class='add'>+	case 1:</div><div class='add'>+		mmc1_data = *info;</div><div class='add'>+		break;</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2430) || \</div><div class='add'>+	defined(CONFIG_ARCH_OMAP34XX)</div><div class='add'>+	case 2:</div><div class='add'>+		mmc2_data = *info;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> static inline void omap_init_mmc(void) {}</div><div class='add'>+void omap_set_mmc_info(int host, const struct omap_mmc_platform_data *info) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='head'>diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c<br/>index fac8e994f588..a63b644ad305 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/dma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/dma.c</a></div><div class='hunk'>@@ -28,10 +28,10 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c<br/>index f22506af0e67..743a4abcd85d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/dmtimer.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/dmtimer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/dmtimer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/dmtimer.c</a></div><div class='hunk'>@@ -32,10 +32,10 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/dmtimer.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/dmtimer.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* register offsets */</div><div class='ctx'> #define _OMAP_TIMER_ID_OFFSET		0x00</div><div class='head'>diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c<br/>index 5d107520e6b9..17a92a31e746 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/fb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/fb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/fb.c</a></div><div class='hunk'>@@ -28,14 +28,13 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/sram.h&gt;</div><div class='del'>-#include &lt;asm/arch/omapfb.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/sram.h&gt;</div><div class='add'>+#include &lt;mach/omapfb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c<br/>index 63e094342ef6..9e1341ebc14e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/gpio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/gpio.c</a></div><div class='hunk'>@@ -18,10 +18,10 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -1488,7 +1488,7 @@ static int __init _omap_gpio_init(void)</div><div class='ctx'> 		bank-&gt;chip.set = gpio_set;</div><div class='ctx'> 		if (bank_is_mpuio(bank)) {</div><div class='ctx'> 			bank-&gt;chip.label = "mpuio";</div><div class='del'>-#ifdef CONFIG_ARCH_OMAP1</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP16XX</div><div class='ctx'> 			bank-&gt;chip.dev = &amp;omap_mpuio_device.dev;</div><div class='ctx'> #endif</div><div class='ctx'> 			bank-&gt;chip.base = OMAP_MPUIO(0);</div><div class='head'>diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c<br/>index 7990ab185bb1..0e6d147ab6f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/i2c.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/i2c.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/i2c.c</a></div><div class='hunk'>@@ -26,8 +26,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define OMAP_I2C_SIZE		0x3f</div><div class='ctx'> #define OMAP1_I2C_BASE		0xfffb3800</div><div class='head'>diff --git a/include/asm-arm/arch-omap/aic23.h b/arch/arm/plat-omap/include/mach/aic23.h<br/>index aec2d6563622..5ccedac77526 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/aic23.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/aic23.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/aic23.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/aic23.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/aic23.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/aic23.h</div><div class='ctx'>  *</div><div class='ctx'>  * Hardware definitions for TI TLV320AIC23 audio codec</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/blizzard.h b/arch/arm/plat-omap/include/mach/blizzard.h<br/>index 8d160f171372..8d160f171372 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/blizzard.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/blizzard.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/blizzard.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/blizzard.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-omap/board-2430sdp.h b/arch/arm/plat-omap/include/mach/board-2430sdp.h<br/>index c7db9004ec31..cf1dc0223949 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board-2430sdp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board-2430sdp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board-2430sdp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-2430sdp.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/board-2430sdp.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/board-2430sdp.h</div><div class='ctx'>  *</div><div class='ctx'>  * Hardware definitions for TI OMAP2430 SDP board.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/board-ams-delta.h b/arch/arm/plat-omap/include/mach/board-ams-delta.h<br/>index 9aee15d97145..51b102dc906b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board-ams-delta.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board-ams-delta.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board-ams-delta.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-ams-delta.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/board-ams-delta.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/board-ams-delta.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Jonathan McDowell &lt;noodles@earth.li&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/board-apollon.h b/arch/arm/plat-omap/include/mach/board-apollon.h<br/>index 547125a4695e..d6f2a8e963d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board-apollon.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board-apollon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board-apollon.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-apollon.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/board-apollon.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/board-apollon.h</div><div class='ctx'>  *</div><div class='ctx'>  * Hardware definitions for Samsung OMAP24XX Apollon board.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/board-fsample.h b/arch/arm/plat-omap/include/mach/board-fsample.h<br/>index 89a1e529fb6f..cb3c5ae12776 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board-fsample.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board-fsample.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board-fsample.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-fsample.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/board-fsample.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/board-fsample.h</div><div class='ctx'>  *</div><div class='ctx'>  * Board-specific goodies for TI F-Sample.</div><div class='ctx'>  *</div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #define __ASM_ARCH_OMAP_FSAMPLE_H</div><div class='ctx'> </div><div class='ctx'> /* fsample is pretty close to p2-sample */</div><div class='del'>-#include &lt;asm/arch/board-perseus2.h&gt;</div><div class='add'>+#include &lt;mach/board-perseus2.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define fsample_cpld_read(reg) __raw_readb(reg)</div><div class='ctx'> #define fsample_cpld_write(val, reg) __raw_writeb(val, reg)</div><div class='head'>diff --git a/include/asm-arm/arch-omap/board-h2.h b/arch/arm/plat-omap/include/mach/board-h2.h<br/>index c322796d0d26..2a050e9be65f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board-h2.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board-h2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board-h2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-h2.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/board-h2.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/board-h2.h</div><div class='ctx'>  *</div><div class='ctx'>  * Hardware definitions for TI OMAP1610 H2 board.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/board-h3.h b/arch/arm/plat-omap/include/mach/board-h3.h<br/>index c5d0f32a40ac..14909dc7858a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board-h3.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board-h3.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board-h3.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-h3.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/board-h3.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/board-h3.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2001 RidgeRun, Inc.</div><div class='ctx'>  * Copyright (C) 2004 Texas Instruments, Inc.</div><div class='head'>diff --git a/include/asm-arm/arch-omap/board-h4.h b/arch/arm/plat-omap/include/mach/board-h4.h<br/>index 7e0efef4bb65..1470cd3e519b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board-h4.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board-h4.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board-h4.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-h4.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/board-h4.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/board-h4.h</div><div class='ctx'>  *</div><div class='ctx'>  * Hardware definitions for TI OMAP1610 H4 board.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/board-innovator.h b/arch/arm/plat-omap/include/mach/board-innovator.h<br/>index 9ca03dec9d36..5ae3e79b9f9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board-innovator.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board-innovator.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board-innovator.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-innovator.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/board-innovator.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/board-innovator.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2001 RidgeRun, Inc.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/board-nokia.h b/arch/arm/plat-omap/include/mach/board-nokia.h<br/>index 72deea203493..2abbe001af8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board-nokia.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board-nokia.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board-nokia.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-nokia.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-omap/board-nokia.h</div><div class='add'>+ *  arch/arm/plat-omap/include/mach/board-nokia.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Information structures for Nokia-specific board config data</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/board-osk.h b/arch/arm/plat-omap/include/mach/board-osk.h<br/>index 94926090e475..3850cb1f220a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board-osk.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board-osk.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board-osk.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-osk.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/board-osk.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/board-osk.h</div><div class='ctx'>  *</div><div class='ctx'>  * Hardware definitions for TI OMAP5912 OSK board.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/board-palmte.h b/arch/arm/plat-omap/include/mach/board-palmte.h<br/>index 6fac2c8935be..6906cdebbcfb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board-palmte.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board-palmte.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board-palmte.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-palmte.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/board-palmte.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/board-palmte.h</div><div class='ctx'>  *</div><div class='ctx'>  * Hardware definitions for the Palm Tungsten E device.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/board-palmtt.h b/arch/arm/plat-omap/include/mach/board-palmtt.h<br/>index d9590b0ec90e..e79f382b5931 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board-palmtt.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board-palmtt.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board-palmtt.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-palmtt.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/board-palmte.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/board-palmte.h</div><div class='ctx'>  *</div><div class='ctx'>  * Hardware definitions for the Palm Tungsten|T device.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/board-palmz71.h b/arch/arm/plat-omap/include/mach/board-palmz71.h<br/>index 1252a859787d..b1d7d579b313 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board-palmz71.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board-palmz71.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board-palmz71.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-palmz71.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/board-palmz71.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/board-palmz71.h</div><div class='ctx'>  *</div><div class='ctx'>  * Hardware definitions for the Palm Zire71 device.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/board-perseus2.h b/arch/arm/plat-omap/include/mach/board-perseus2.h<br/>index d7429cb0f726..c06c3d717d57 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board-perseus2.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board-perseus2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board-perseus2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-perseus2.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-omap/board-perseus2.h</div><div class='add'>+ *  arch/arm/plat-omap/include/mach/board-perseus2.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright 2003 by Texas Instruments Incorporated</div><div class='ctx'>  *    OMAP730 / Perseus2 support by Jean Pihet</div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_OMAP_PERSEUS2_H</div><div class='ctx'> #define __ASM_ARCH_OMAP_PERSEUS2_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/fpga.h&gt;</div><div class='add'>+#include &lt;mach/fpga.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef OMAP_SDRAM_DEVICE</div><div class='ctx'> #define OMAP_SDRAM_DEVICE		D256M_1X16_4B</div><div class='head'>diff --git a/include/asm-arm/arch-omap/board-sx1.h b/arch/arm/plat-omap/include/mach/board-sx1.h<br/>index 355adbdaae33..355adbdaae33 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board-sx1.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board-sx1.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board-sx1.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-sx1.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-omap/board-voiceblue.h b/arch/arm/plat-omap/include/mach/board-voiceblue.h<br/>index ed6d346ee123..ed6d346ee123 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board-voiceblue.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board-voiceblue.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board-voiceblue.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board-voiceblue.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-omap/board.h b/arch/arm/plat-omap/include/mach/board.h<br/>index db44c5d1f1a0..54445642f35d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/board.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/board.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/board.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/board.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-omap/board.h</div><div class='add'>+ *  arch/arm/plat-omap/include/mach/board.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Information structures for board-specific data</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio-switch.h&gt;</div><div class='add'>+#include &lt;mach/gpio-switch.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Different peripheral ids */</div><div class='ctx'> #define OMAP_TAG_CLOCK		0x4f01</div><div class='hunk'>@@ -125,7 +125,7 @@ struct omap_pwm_led_platform_data {</div><div class='ctx'> 	void (*set_power)(struct omap_pwm_led_platform_data *self, int on_off);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* See include/asm-arm/arch-omap/gpio-switch.h for definitions */</div><div class='add'>+/* See arch/arm/plat-omap/include/mach/gpio-switch.h for definitions */</div><div class='ctx'> struct omap_gpio_switch_config {</div><div class='ctx'> 	char name[12];</div><div class='ctx'> 	u16 gpio;</div><div class='hunk'>@@ -154,7 +154,7 @@ struct omap_version_config {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;asm-arm/arch-omap/board-nokia.h&gt;</div><div class='add'>+#include &lt;mach/board-nokia.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct omap_board_config_entry {</div><div class='ctx'> 	u16 tag;</div><div class='head'>diff --git a/include/asm-arm/arch-omap/clock.h b/arch/arm/plat-omap/include/mach/clock.h<br/>index 4c7b3514f71a..92f7c7238fcd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/clock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/clock.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-omap/clock.h</div><div class='add'>+ *  arch/arm/plat-omap/include/mach/clock.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 - 2005 Nokia corporation</div><div class='ctx'>  *  Written by Tuukka Tikkanen &lt;tuukka.tikkanen@elektrobit.com&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-omap/common.h b/arch/arm/plat-omap/include/mach/common.h<br/>index 8ac03071f60c..06093112b665 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/common.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/common.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/common.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/common.h</div><div class='ctx'>  *</div><div class='ctx'>  * Header for code common to all OMAP machines.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/control.h b/arch/arm/plat-omap/include/mach/control.h<br/>index 987553e3eeb9..e3fd62d9a995 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/control.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/control.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/control.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/control.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> #define __ASM_ARCH_CONTROL_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-omap/control.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/control.h</div><div class='ctx'>  *</div><div class='ctx'>  * OMAP2/3 System Control Module definitions</div><div class='ctx'>  *</div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'>  * the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/io.h&gt;</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define OMAP242X_CTRL_REGADDR(reg)					\</div><div class='ctx'> 	(void __iomem *)IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))</div><div class='head'>diff --git a/include/asm-arm/arch-omap/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h<br/>index 52db09f83281..05aee0eda34f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/cpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/cpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/cpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/cpu.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/cpu.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/cpu.h</div><div class='ctx'>  *</div><div class='ctx'>  * OMAP cpu type detection</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/debug-macro.S b/arch/arm/plat-omap/include/mach/debug-macro.S<br/>index ca4f577f9675..1b0039bdeb4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/debug-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/debug-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-omap/debug-macro.S</div><div class='add'>+/* arch/arm/plat-omap/include/mach/debug-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Debugging macro include header</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/dma.h b/arch/arm/plat-omap/include/mach/dma.h<br/>index f4dcb9587869..54fe9665b182 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/dma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-omap/dma.h</div><div class='add'>+ *  arch/arm/plat-omap/include/mach/dma.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 Nokia Corporation</div><div class='ctx'>  *  Author: Juha Yrjölä &lt;juha.yrjola@nokia.com&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-omap/dmtimer.h b/arch/arm/plat-omap/include/mach/dmtimer.h<br/>index 02b29e8437ae..6dc703138210 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/dmtimer.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/dmtimer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/dmtimer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/dmtimer.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/dmtimer.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/dmtimer.h</div><div class='ctx'>  *</div><div class='ctx'>  * OMAP Dual-Mode Timers</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/dsp_common.h b/arch/arm/plat-omap/include/mach/dsp_common.h<br/>index da97736f3efa..da97736f3efa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/dsp_common.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/dsp_common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/dsp_common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/dsp_common.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-omap/eac.h b/arch/arm/plat-omap/include/mach/eac.h<br/>index ccee3b0700b3..9e62cf030270 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/eac.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/eac.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/eac.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/eac.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap2/eac.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach2/eac.h</div><div class='ctx'>  *</div><div class='ctx'>  * Defines for Enhanced Audio Controller</div><div class='ctx'>  *</div><div class='hunk'>@@ -27,8 +27,8 @@</div><div class='ctx'> #ifndef __ASM_ARM_ARCH_OMAP2_EAC_H</div><div class='ctx'> #define __ASM_ARM_ARCH_OMAP2_EAC_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-omap/entry-macro.S b/arch/arm/plat-omap/include/mach/entry-macro.S<br/>index 369093a45fcf..d4e9043bf201 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/entry-macro.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/entry-macro.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-omap/entry-macro.S</div><div class='add'>+ * arch/arm/plat-omap/include/mach/entry-macro.S</div><div class='ctx'>  *</div><div class='ctx'>  * Low-level IRQ helper macros for OMAP-based platforms</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,9 +7,9 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ARCH_OMAP1)</div><div class='ctx'> </div><div class='hunk'>@@ -57,7 +57,7 @@</div><div class='ctx'> </div><div class='ctx'> #elif defined(CONFIG_ARCH_OMAP24XX)</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/omap24xx.h&gt;</div><div class='add'>+#include &lt;mach/omap24xx.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='head'>diff --git a/include/asm-arm/arch-omap/fpga.h b/arch/arm/plat-omap/include/mach/fpga.h<br/>index f420881d2a3b..c92e4b42b289 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/fpga.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/fpga.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/fpga.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/fpga.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/fpga.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/fpga.h</div><div class='ctx'>  *</div><div class='ctx'>  * Interrupt handler for OMAP-1510 FPGA</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/gpio-switch.h b/arch/arm/plat-omap/include/mach/gpio-switch.h<br/>index 10da0e07c0cf..10da0e07c0cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/gpio-switch.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/gpio-switch.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/gpio-switch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/gpio-switch.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-omap/gpio.h b/arch/arm/plat-omap/include/mach/gpio.h<br/>index 5ee6a49864c3..94ce2780e8ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/gpio.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/gpio.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/gpio.h</div><div class='ctx'>  *</div><div class='ctx'>  * OMAP GPIO handling defines and functions</div><div class='ctx'>  *</div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_OMAP_GPIO_H</div><div class='ctx'> #define __ASM_ARCH_OMAP_GPIO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define OMAP_MPUIO_BASE			(void __iomem *)0xfffb5000</div><div class='head'>diff --git a/include/asm-arm/arch-omap/gpioexpander.h b/arch/arm/plat-omap/include/mach/gpioexpander.h<br/>index 4eed1f80e2fb..90444a0d6b1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/gpioexpander.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/gpioexpander.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/gpioexpander.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/gpioexpander.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/gpioexpander.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/gpioexpander.h</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004 Texas Instruments, Inc.</div><div class='head'>diff --git a/include/asm-arm/arch-omap/gpmc.h b/arch/arm/plat-omap/include/mach/gpmc.h<br/>index 6a8e07ffc2d0..6a8e07ffc2d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/gpmc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/gpmc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/gpmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/gpmc.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-omap/hardware.h b/arch/arm/plat-omap/include/mach/hardware.h<br/>index 45fdfccbd5d4..07f5d7f21528 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/hardware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/hardware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/hardware.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/hardware.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/hardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * Hardware definitions for TI OMAP processors and boards</div><div class='ctx'>  *</div><div class='hunk'>@@ -39,9 +39,9 @@</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> #ifndef __ASSEMBLER__</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-#include &lt;asm/arch/serial.h&gt;</div><div class='add'>+#include &lt;mach/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ---------------------------------------------------------------------------</div><div class='head'>diff --git a/include/asm-arm/arch-omap/hwa742.h b/arch/arm/plat-omap/include/mach/hwa742.h<br/>index 577f492f2d3c..577f492f2d3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/hwa742.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/hwa742.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/hwa742.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/hwa742.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-omap/io.h b/arch/arm/plat-omap/include/mach/io.h<br/>index 0b13557fd30b..2a30b7d88cde 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/io.h</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/io.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/io.h</div><div class='ctx'>  *</div><div class='ctx'>  * IO definitions for TI OMAP processors and boards</div><div class='ctx'>  *</div><div class='del'>- * Copied from linux/include/asm-arm/arch-sa1100/io.h</div><div class='add'>+ * Copied from arch/arm/mach-sa1100/include/mach/io.h</div><div class='ctx'>  * Copyright (C) 1997-1999 Russell King</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify it</div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #ifndef __ASM_ARM_ARCH_IO_H</div><div class='ctx'> #define __ASM_ARM_ARCH_IO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT 0xffffffff</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-omap/irda.h b/arch/arm/plat-omap/include/mach/irda.h<br/>index 96bb12fab438..8372a00d8e0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/irda.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/irda.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/irda.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/irda.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-omap/irda.h</div><div class='add'>+ *  arch/arm/plat-omap/include/mach/irda.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2005-2006 Komal Shah &lt;komal_shah802003@yahoo.com&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/irqs.h b/arch/arm/plat-omap/include/mach/irqs.h<br/>index 7464c694859b..17248bbf3f27 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/irqs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/irqs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-omap/irqs.h</div><div class='add'>+ *  arch/arm/plat-omap/include/mach/irqs.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) Greg Lonnon 2001</div><div class='ctx'>  *  Updated for OMAP-1610 by Tony Lindgren &lt;tony@atomide.com&gt;</div><div class='hunk'>@@ -327,6 +327,6 @@</div><div class='ctx'> extern void omap_init_irq(void);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/asm-arm/arch-omap/keypad.h b/arch/arm/plat-omap/include/mach/keypad.h<br/>index b7f83075436e..232923aaf61d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/keypad.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/keypad.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/keypad.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/keypad.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-omap/keypad.h</div><div class='add'>+ *  arch/arm/plat-omap/include/mach/keypad.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2006 Komal Shah &lt;komal_shah802003@yahoo.com&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/lcd_mipid.h b/arch/arm/plat-omap/include/mach/lcd_mipid.h<br/>index f8fbc4801e52..f8fbc4801e52 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/lcd_mipid.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/lcd_mipid.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/lcd_mipid.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/lcd_mipid.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-omap/led.h b/arch/arm/plat-omap/include/mach/led.h<br/>index f3acae28e2da..25e451e7e2fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/led.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/led.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/led.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/led.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-omap/led.h</div><div class='add'>+ *  arch/arm/plat-omap/include/mach/led.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2006 Samsung Electronics</div><div class='ctx'>  *  Kyungmin Park &lt;kyungmin.park@samsung.com&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-omap/mailbox.h b/arch/arm/plat-omap/include/mach/mailbox.h<br/>index 7cbed9332e16..7cbed9332e16 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/mailbox.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/mailbox.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/mailbox.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/mailbox.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-omap/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h<br/>index 26c78f67dc8e..8fdb95e26fcd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/mcbsp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/mcbsp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/mcbsp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/mcbsp.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/mcbsp.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/mcbsp.h</div><div class='ctx'>  *</div><div class='ctx'>  * Defines for Multi-Channel Buffered Serial Port</div><div class='ctx'>  *</div><div class='hunk'>@@ -27,8 +27,8 @@</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/clock.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define OMAP730_MCBSP1_BASE	0xfffb1000</div><div class='ctx'> #define OMAP730_MCBSP2_BASE	0xfffb1800</div><div class='hunk'>@@ -315,6 +315,7 @@ struct omap_mcbsp_ops {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct omap_mcbsp_platform_data {</div><div class='add'>+	unsigned long phys_base;</div><div class='ctx'> 	u32 virt_base;</div><div class='ctx'> 	u8 dma_rx_sync, dma_tx_sync;</div><div class='ctx'> 	u16 rx_irq, tx_irq;</div><div class='hunk'>@@ -324,6 +325,7 @@ struct omap_mcbsp_platform_data {</div><div class='ctx'> </div><div class='ctx'> struct omap_mcbsp {</div><div class='ctx'> 	struct device *dev;</div><div class='add'>+	unsigned long phys_base;</div><div class='ctx'> 	u32 io_base;</div><div class='ctx'> 	u8 id;</div><div class='ctx'> 	u8 free;</div><div class='head'>diff --git a/include/asm-arm/arch-omap/mcspi.h b/arch/arm/plat-omap/include/mach/mcspi.h<br/>index 1254e4945b6f..1254e4945b6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/mcspi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/mcspi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/mcspi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/mcspi.h</a></div><div class='head'>diff --git a/include/asm-arm/arch-omap/memory.h b/arch/arm/plat-omap/include/mach/memory.h<br/>index 14cba97c18ad..a325caf80d04 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/memory.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/memory.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/memory.h</a></div><div class='hunk'>@@ -1,12 +1,12 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/memory.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/memory.h</div><div class='ctx'>  *</div><div class='ctx'>  * Memory map for OMAP-1510 and 1610</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 RidgeRun, Inc.</div><div class='ctx'>  * Author: Greg Lonnon &lt;glonnon@ridgerun.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * This file was derived from linux/include/asm-arm/arch-intergrator/memory.h</div><div class='add'>+ * This file was derived from arch/arm/mach-intergrator/include/mach/memory.h</div><div class='ctx'>  * Copyright (C) 1999 ARM Limited</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify it</div><div class='hunk'>@@ -76,13 +76,14 @@</div><div class='ctx'> 					(dma_addr_t)virt_to_lbus(page_address(page)) : \</div><div class='ctx'> 					(dma_addr_t)__virt_to_bus(page_address(page));})</div><div class='ctx'> </div><div class='del'>-#define __arch_dma_to_virt(dev, addr)	({is_lbus_device(dev) ? \</div><div class='del'>-					lbus_to_virt(addr) : \</div><div class='del'>-					__bus_to_virt(addr);})</div><div class='add'>+#define __arch_dma_to_virt(dev, addr)	({ (void *) (is_lbus_device(dev) ? \</div><div class='add'>+						lbus_to_virt(addr) : \</div><div class='add'>+						__bus_to_virt(addr)); })</div><div class='ctx'> </div><div class='del'>-#define __arch_virt_to_dma(dev, addr)	({is_lbus_device(dev) ? \</div><div class='del'>-					virt_to_lbus(addr) : \</div><div class='del'>-					__virt_to_bus(addr);})</div><div class='add'>+#define __arch_virt_to_dma(dev, addr)	({ unsigned long __addr = (unsigned long)(addr); \</div><div class='add'>+					   (dma_addr_t) (is_lbus_device(dev) ? \</div><div class='add'>+						virt_to_lbus(__addr) : \</div><div class='add'>+						__virt_to_bus(__addr)); })</div><div class='ctx'> </div><div class='ctx'> #endif	/* CONFIG_ARCH_OMAP15XX */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-omap/menelaus.h b/arch/arm/plat-omap/include/mach/menelaus.h<br/>index 69ed7ee40179..3122bf68c7ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/menelaus.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/menelaus.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/menelaus.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/menelaus.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/menelaus.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/menelaus.h</div><div class='ctx'>  *</div><div class='ctx'>  * Functions to access Menelaus power management chip</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/asm-arm/arch-omap/mmc.h b/arch/arm/plat-omap/include/mach/mmc.h<br/>index 7cfc5f258560..fc15d13058fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/mmc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/mmc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/mmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/mmc.h</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define OMAP_MMC_MAX_SLOTS	2</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-omap/mtd-xip.h b/arch/arm/plat-omap/include/mach/mtd-xip.h<br/>index a73a28571fee..5cee7e16a1b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/mtd-xip.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/mtd-xip.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/mtd-xip.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/mtd-xip.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #ifndef __ARCH_OMAP_MTD_XIP_H__</div><div class='ctx'> #define __ARCH_OMAP_MTD_XIP_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #define OMAP_MPU_TIMER_BASE	(0xfffec500)</div><div class='ctx'> #define OMAP_MPU_TIMER_OFFSET	0x100</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-omap/mux.h b/arch/arm/plat-omap/include/mach/mux.h<br/>index ff9a5b5575fd..614b2c1327c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/mux.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/mux.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/mux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/mux.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/mux.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/mux.h</div><div class='ctx'>  *</div><div class='ctx'>  * Table of the Omap register configurations for the FUNC_MUX and</div><div class='ctx'>  * PULL_DWN combinations.</div><div class='head'>diff --git a/include/asm-arm/arch-omap/nand.h b/arch/arm/plat-omap/include/mach/nand.h<br/>index 17ae26e35353..631a7bed1eef 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/nand.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/nand.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/nand.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/nand.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-omap/nand.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/nand.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Micron Technology Inc.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/omap-alsa.h b/arch/arm/plat-omap/include/mach/omap-alsa.h<br/>index faa0ed23d4ba..bdf30a0f87f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/omap-alsa.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/omap-alsa.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/omap-alsa.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/omap-alsa.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/omap-alsa.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/omap-alsa.h</div><div class='ctx'>  *</div><div class='ctx'>  * Alsa Driver for AIC23 and TSC2101 codecs on OMAP platform boards.</div><div class='ctx'>  *</div><div class='hunk'>@@ -40,10 +40,10 @@</div><div class='ctx'> #ifndef __OMAP_ALSA_H</div><div class='ctx'> #define __OMAP_ALSA_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcbsp.h&gt;</div><div class='add'>+#include &lt;mach/mcbsp.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DMA_BUF_SIZE	(1024 * 8)</div><div class='head'>diff --git a/include/asm-arm/arch-omap/omap1510.h b/arch/arm/plat-omap/include/mach/omap1510.h<br/>index c575d354850f..505a38af8b22 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/omap1510.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/omap1510.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/omap1510.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/omap1510.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-omap/omap1510.h</div><div class='add'>+/* arch/arm/plat-omap/include/mach/omap1510.h</div><div class='ctx'>  *</div><div class='ctx'>  * Hardware definitions for TI OMAP1510 processor.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/omap16xx.h b/arch/arm/plat-omap/include/mach/omap16xx.h<br/>index f7f5cdfdccce..c6c93afb2788 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/omap16xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/omap16xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/omap16xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/omap16xx.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-omap/omap16xx.h</div><div class='add'>+/* arch/arm/plat-omap/include/mach/omap16xx.h</div><div class='ctx'>  *</div><div class='ctx'>  * Hardware definitions for TI OMAP1610/5912/1710 processors.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/omap24xx.h b/arch/arm/plat-omap/include/mach/omap24xx.h<br/>index b9fcaae287c8..bb8319d66e9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/omap24xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/omap24xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/omap24xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/omap24xx.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-omap/omap24xx.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/omap24xx.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file contains the processor specific definitions</div><div class='ctx'>  * of the TI OMAP24XX.</div><div class='head'>diff --git a/include/asm-arm/arch-omap/omap34xx.h b/arch/arm/plat-omap/include/mach/omap34xx.h<br/>index aa30c6d10abd..8e0479fff05a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/omap34xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/omap34xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/omap34xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/omap34xx.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-omap/omap34xx.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/omap34xx.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file contains the processor specific definitions of the TI OMAP34XX.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/omap730.h b/arch/arm/plat-omap/include/mach/omap730.h<br/>index 755b64c5e9f0..14272bc1a6fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/omap730.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/omap730.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/omap730.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/omap730.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* linux/include/asm-arm/arch-omap/omap730.h</div><div class='add'>+/* arch/arm/plat-omap/include/mach/omap730.h</div><div class='ctx'>  *</div><div class='ctx'>  * Hardware definitions for TI OMAP730 processor.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/omapfb.h b/arch/arm/plat-omap/include/mach/omapfb.h<br/>index 46d7a4f60854..cae037d13079 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/omapfb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/omapfb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/omapfb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/omapfb.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * File: include/asm-arm/arch-omap/omapfb.h</div><div class='add'>+ * File: arch/arm/plat-omap/include/mach/omapfb.h</div><div class='ctx'>  *</div><div class='ctx'>  * Framebuffer driver for TI OMAP boards</div><div class='ctx'>  *</div><div class='hunk'>@@ -167,7 +167,7 @@ enum omapfb_update_mode {</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define OMAP_LCDC_INV_VSYNC             0x0001</div><div class='ctx'> #define OMAP_LCDC_INV_HSYNC             0x0002</div><div class='head'>diff --git a/include/asm-arm/arch-omap/onenand.h b/arch/arm/plat-omap/include/mach/onenand.h<br/>index 6c959d0ce470..d57f20226b28 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/onenand.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/onenand.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/onenand.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/onenand.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/arch-omap/onenand.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/onenand.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Nokia Corporation</div><div class='ctx'>  * Author: Juha Yrjola</div><div class='head'>diff --git a/include/asm-arm/arch-omap/param.h b/arch/arm/plat-omap/include/mach/param.h<br/>index face9ad41e97..1eb4dc326979 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/param.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/param.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-omap/param.h</div><div class='add'>+ *  arch/arm/plat-omap/include/mach/param.h</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-omap/pm.h b/arch/arm/plat-omap/include/mach/pm.h<br/>index 14588059981f..bfa09325a5ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/pm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/pm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/pm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/pm.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/pm.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/pm.h</div><div class='ctx'>  *</div><div class='ctx'>  * Header file for OMAP Power Management Routines</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/prcm.h b/arch/arm/plat-omap/include/mach/prcm.h<br/>index 7bcaf94bde9f..56eba0fd6f6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/prcm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/prcm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/prcm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/prcm.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/prcm.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/prcm.h</div><div class='ctx'>  *</div><div class='ctx'>  * Access definations for use in OMAP24XX clock and power management</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/sdrc.h b/arch/arm/plat-omap/include/mach/sdrc.h<br/>index 673b3965befc..787b7acec546 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/sdrc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/sdrc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/sdrc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/sdrc.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/io.h&gt;</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SDRC register offsets - read/write with sdrc_{read,write}_reg() */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-omap/serial.h b/arch/arm/plat-omap/include/mach/serial.h<br/>index 79a5297af9fc..cc6bfa51ccb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/serial.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/serial.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-omap/serial.h</div><div class='add'>+ *  arch/arm/plat-omap/include/mach/serial.h</div><div class='ctx'>  *</div><div class='ctx'>  * This program is distributed in the hope that it will be useful,</div><div class='ctx'>  * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='head'>diff --git a/include/asm-arm/arch-omap/sram.h b/arch/arm/plat-omap/include/mach/sram.h<br/>index be59f4a9828b..e09323449981 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/sram.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/sram.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/sram.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/sram.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/sram.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/sram.h</div><div class='ctx'>  *</div><div class='ctx'>  * Interface for functions that need to be run in internal SRAM</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/system.h b/arch/arm/plat-omap/include/mach/system.h<br/>index ac2bfa433f06..06a28c7b98de 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/system.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copied from linux/include/asm-arm/arch-sa1100/system.h</div><div class='add'>+ * Copied from arch/arm/mach-sa1100/include/mach/system.h</div><div class='ctx'>  * Copyright (c) 1999 Nicolas Pitre &lt;nico@cam.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_MACH_VOICEBLUE</div><div class='ctx'> #define voiceblue_reset()		do {} while (0)</div><div class='head'>diff --git a/include/asm-arm/arch-omap/tc.h b/arch/arm/plat-omap/include/mach/tc.h<br/>index 65a9c82d3bf7..d2fcd789bb9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/tc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/tc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/tc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/tc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/tc.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/tc.h</div><div class='ctx'>  *</div><div class='ctx'>  * OMAP Traffic Controller</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/arch-omap/timex.h b/arch/arm/plat-omap/include/mach/timex.h<br/>index 21f2e367185a..6d35767bc48f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/timex.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/timex.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/timex.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 RidgeRun, Inc.</div><div class='ctx'>  * Author:  Greg Lonnon &lt;glonnon@ridgerun.com&gt;</div><div class='head'>diff --git a/include/asm-arm/arch-omap/uncompress.h b/arch/arm/plat-omap/include/mach/uncompress.h<br/>index aca0adfef1b8..0814c5f210c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/uncompress.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/uncompress.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-arm/arch-omap/uncompress.h</div><div class='add'>+ * arch/arm/plat-omap/include/mach/uncompress.h</div><div class='ctx'>  *</div><div class='ctx'>  * Serial port stubs for kernel decompress status messages</div><div class='ctx'>  *</div><div class='ctx'>  * Initially based on:</div><div class='del'>- * linux-2.4.15-rmk1-dsplinux1.6/include/asm-arm/arch-omap1510/uncompress.h</div><div class='add'>+ * linux-2.4.15-rmk1-dsplinux1.6/arch/arm/plat-omap/include/mach1510/uncompress.h</div><div class='ctx'>  * Copyright (C) 2000 RidgeRun, Inc.</div><div class='ctx'>  * Author: Greg Lonnon &lt;glonnon@ridgerun.com&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='del'>-#include &lt;asm/arch/serial.h&gt;</div><div class='add'>+#include &lt;mach/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned int system_rev;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-omap/usb.h b/arch/arm/plat-omap/include/mach/usb.h<br/>index ddf1861e6df9..a56a610950c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/usb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/usb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/usb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/usb.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> #ifndef	__ASM_ARCH_OMAP_USB_H</div><div class='ctx'> #define	__ASM_ARCH_OMAP_USB_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/arch-omap/vmalloc.h b/arch/arm/plat-omap/include/mach/vmalloc.h<br/>index 5b8bd8dae8be..dc104cd96197 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/arch-omap/vmalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/arch-omap/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/mach/vmalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/include/mach/vmalloc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/include/asm-arm/arch-omap/vmalloc.h</div><div class='add'>+ *  arch/arm/plat-omap/include/mach/vmalloc.h</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Russell King.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c<br/>index ff1413eae0b8..1d7aec1a691a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/mailbox.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/mailbox.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/mailbox.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/mailbox.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/mailbox.h&gt;</div><div class='add'>+#include &lt;mach/mailbox.h&gt;</div><div class='ctx'> #include "mailbox.h"</div><div class='ctx'> </div><div class='ctx'> static struct omap_mbox *mboxes;</div><div class='head'>diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c<br/>index c7f74064696c..014d26574bb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/mcbsp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/mcbsp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/mcbsp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/mcbsp.c</a></div><div class='hunk'>@@ -24,8 +24,8 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcbsp.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='add'>+#include &lt;mach/mcbsp.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct omap_mcbsp mcbsp[OMAP_MAX_MCBSP_COUNT];</div><div class='ctx'> </div><div class='hunk'>@@ -651,7 +651,7 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer,</div><div class='ctx'> 	omap_set_dma_dest_params(mcbsp[id].dma_tx_lch,</div><div class='ctx'> 				 src_port,</div><div class='ctx'> 				 OMAP_DMA_AMODE_CONSTANT,</div><div class='del'>-				 mcbsp[id].io_base + OMAP_MCBSP_REG_DXR1,</div><div class='add'>+				 mcbsp[id].phys_base + OMAP_MCBSP_REG_DXR1,</div><div class='ctx'> 				 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	omap_set_dma_src_params(mcbsp[id].dma_tx_lch,</div><div class='hunk'>@@ -712,7 +712,7 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer,</div><div class='ctx'> 	omap_set_dma_src_params(mcbsp[id].dma_rx_lch,</div><div class='ctx'> 				src_port,</div><div class='ctx'> 				OMAP_DMA_AMODE_CONSTANT,</div><div class='del'>-				mcbsp[id].io_base + OMAP_MCBSP_REG_DRR1,</div><div class='add'>+				mcbsp[id].phys_base + OMAP_MCBSP_REG_DRR1,</div><div class='ctx'> 				0, 0);</div><div class='ctx'> </div><div class='ctx'> 	omap_set_dma_dest_params(mcbsp[id].dma_rx_lch,</div><div class='hunk'>@@ -830,6 +830,7 @@ static int __init omap_mcbsp_probe(struct platform_device *pdev)</div><div class='ctx'> 	mcbsp[id].dma_tx_lch = -1;</div><div class='ctx'> 	mcbsp[id].dma_rx_lch = -1;</div><div class='ctx'> </div><div class='add'>+	mcbsp[id].phys_base = pdata-&gt;phys_base;</div><div class='ctx'> 	mcbsp[id].io_base = pdata-&gt;virt_base;</div><div class='ctx'> 	/* Default I/O is IRQ based */</div><div class='ctx'> 	mcbsp[id].io_type = OMAP_MCBSP_IRQ_IO;</div><div class='head'>diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c<br/>index 6f3f459731c8..847df208c46c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/mux.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/mux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/mux.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/mux.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_OMAP_MUX</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/ocpi.c b/arch/arm/plat-omap/ocpi.c<br/>index b5d307026c82..8bdbf979a257 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/ocpi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/ocpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/ocpi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/ocpi.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define OCPI_BASE		0xfffec320</div><div class='ctx'> #define OCPI_FAULT		(OCPI_BASE + 0x00)</div><div class='head'>diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c<br/>index 554ee58e1294..ac67eeb6ca6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/sram.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/sram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/sram.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/sram.c</a></div><div class='hunk'>@@ -22,10 +22,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/sram.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;mach/sram.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/control.h&gt;</div><div class='add'>+#include &lt;mach/control.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)</div><div class='ctx'> # include "../mach-omap2/prm.h"</div><div class='head'>diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c<br/>index 2699c16d4da0..777485e0636b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/usb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-omap/usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/usb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-omap/usb.c</a></div><div class='hunk'>@@ -31,12 +31,12 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/control.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;mach/control.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP1</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/plat-orion/cache-feroceon-l2.h b/arch/arm/plat-orion/include/plat/cache-feroceon-l2.h<br/>index ba4e016d3ec0..06f982d55697 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/plat-orion/cache-feroceon-l2.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/plat-orion/cache-feroceon-l2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/cache-feroceon-l2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/include/plat/cache-feroceon-l2.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/plat-orion/cache-feroceon-l2.h</div><div class='add'>+ * arch/arm/plat-orion/include/plat/cache-feroceon-l2.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2008 Marvell Semiconductor</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-arm/plat-orion/ehci-orion.h b/arch/arm/plat-orion/include/plat/ehci-orion.h<br/>index 785705651e24..64343051095a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/plat-orion/ehci-orion.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/plat-orion/ehci-orion.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/ehci-orion.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/include/plat/ehci-orion.h</a></div><div class='hunk'>@@ -1,13 +1,13 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/plat-orion/ehci-orion.h</div><div class='add'>+ * arch/arm/plat-orion/include/plat/ehci-orion.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2.  This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef __ASM_PLAT_ORION_EHCI_ORION_H</div><div class='del'>-#define __ASM_PLAT_ORION_EHCI_ORION_H</div><div class='add'>+#ifndef __PLAT_EHCI_ORION_H</div><div class='add'>+#define __PLAT_EHCI_ORION_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/plat-orion/irq.h b/arch/arm/plat-orion/include/plat/irq.h<br/>index 94aeed919d5b..f05eeab94968 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/plat-orion/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/plat-orion/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/include/plat/irq.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/plat-orion/irq.h</div><div class='add'>+ * arch/arm/plat-orion/include/plat/irq.h</div><div class='ctx'>  *</div><div class='ctx'>  * Marvell Orion SoC IRQ handling.</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,8 +8,8 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef __ASM_PLAT_ORION_IRQ_H</div><div class='del'>-#define __ASM_PLAT_ORION_IRQ_H</div><div class='add'>+#ifndef __PLAT_IRQ_H</div><div class='add'>+#define __PLAT_IRQ_H</div><div class='ctx'> </div><div class='ctx'> void orion_irq_init(unsigned int irq_start, void __iomem *maskaddr);</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-arm/plat-orion/mv_xor.h b/arch/arm/plat-orion/include/plat/mv_xor.h<br/>index c349e8ff5cc0..bd5f3bdb4ae3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/plat-orion/mv_xor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/plat-orion/mv_xor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/mv_xor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/include/plat/mv_xor.h</a></div><div class='hunk'>@@ -1,9 +1,11 @@</div><div class='ctx'> /*</div><div class='add'>+ * arch/arm/plat-orion/include/plat/mv_xor.h</div><div class='add'>+ *</div><div class='ctx'>  * Marvell XOR platform device data definition file.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef __ASM_PLAT_ORION_MV_XOR_H</div><div class='del'>-#define __ASM_PLAT_ORION_MV_XOR_H</div><div class='add'>+#ifndef __PLAT_MV_XOR_H</div><div class='add'>+#define __PLAT_MV_XOR_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dmaengine.h&gt;</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='head'>diff --git a/include/asm-arm/plat-orion/orion_nand.h b/arch/arm/plat-orion/include/plat/orion_nand.h<br/>index ad4ce94c1998..d6a4cfa37785 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/plat-orion/orion_nand.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/plat-orion/orion_nand.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/orion_nand.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/include/plat/orion_nand.h</a></div><div class='hunk'>@@ -1,13 +1,13 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/plat-orion/orion_nand.h</div><div class='add'>+ * arch/arm/plat-orion/include/plat/orion_nand.h</div><div class='ctx'>  *</div><div class='ctx'>  * This file is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2.  This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef __ASM_PLAT_ORION_ORION_NAND_H</div><div class='del'>-#define __ASM_PLAT_ORION_ORION_NAND_H</div><div class='add'>+#ifndef __PLAT_ORION_NAND_H</div><div class='add'>+#define __PLAT_ORION_NAND_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Device bus NAND private data</div><div class='head'>diff --git a/include/asm-arm/plat-orion/pcie.h b/arch/arm/plat-orion/include/plat/pcie.h<br/>index e61b7bd97af5..3ebfef72b4e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/plat-orion/pcie.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/plat-orion/pcie.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/pcie.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/include/plat/pcie.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/plat-orion/pcie.h</div><div class='add'>+ * arch/arm/plat-orion/include/plat/pcie.h</div><div class='ctx'>  *</div><div class='ctx'>  * Marvell Orion SoC PCIe handling.</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,8 +8,8 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef __ASM_PLAT_ORION_PCIE_H</div><div class='del'>-#define __ASM_PLAT_ORION_PCIE_H</div><div class='add'>+#ifndef __PLAT_PCIE_H</div><div class='add'>+#define __PLAT_PCIE_H</div><div class='ctx'> </div><div class='ctx'> u32 orion_pcie_dev_id(void __iomem *base);</div><div class='ctx'> u32 orion_pcie_rev(void __iomem *base);</div><div class='head'>diff --git a/include/asm-arm/plat-orion/time.h b/arch/arm/plat-orion/include/plat/time.h<br/>index 0e85cc8f44d9..c06ca35f3613 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/plat-orion/time.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/plat-orion/time.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/include/plat/time.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-arm/plat-orion/time.h</div><div class='add'>+ * arch/arm/plat-orion/include/plat/time.h</div><div class='ctx'>  *</div><div class='ctx'>  * Marvell Orion SoC time handling.</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,8 +8,8 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef __ASM_PLAT_ORION_TIME_H</div><div class='del'>-#define __ASM_PLAT_ORION_TIME_H</div><div class='add'>+#ifndef __PLAT_TIME_H</div><div class='add'>+#define __PLAT_TIME_H</div><div class='ctx'> </div><div class='ctx'> void orion_time_init(unsigned int irq, unsigned int tclk);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-orion/irq.c b/arch/arm/plat-orion/irq.c<br/>index fe66a1835169..3f9d34fc738c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-orion/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/irq.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/irq.h&gt;</div><div class='add'>+#include &lt;plat/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void orion_irq_mask(u32 irq)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/plat-orion/pcie.c b/arch/arm/plat-orion/pcie.c<br/>index ca32c60e14d7..883902fead89 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/pcie.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-orion/pcie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/pcie.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/pcie.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/pcie.h&gt;</div><div class='add'>+#include &lt;plat/pcie.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PCIe unit register offsets.</div><div class='head'>diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c<br/>index 93c4ef9f0067..544d6b327f3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-orion/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-orion/time.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Number of timer ticks per jiffy.</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/clock.c b/arch/arm/plat-s3c24xx/clock.c<br/>index 3ac8d8d781b3..54d4b8e2263c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/clock.c</a></div><div class='hunk'>@@ -40,12 +40,12 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c<br/>index 398c7ac25296..1863a1b1bc49 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/common-smdk.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/common-smdk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/common-smdk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/common-smdk.c</a></div><div class='hunk'>@@ -31,12 +31,12 @@</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/leds-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/leds-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/nand.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c<br/>index f5699cadb0c3..89ce60eabd5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/cpu.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/cpu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/cpu.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='hunk'>@@ -39,9 +39,9 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/system-reset.h&gt;</div><div class='add'>+#include &lt;mach/system-reset.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='hunk'>@@ -169,9 +169,7 @@ static struct map_desc s3c_iodesc[] __initdata = {</div><div class='ctx'> 	IODESC_ENT(UART)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static struct cpu_table *</div><div class='del'>-s3c_lookup_cpu(unsigned long idcode)</div><div class='add'>+static struct cpu_table * __init s3c_lookup_cpu(unsigned long idcode)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpu_table *tab;</div><div class='ctx'> 	int count;</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c<br/>index eea3b32ff798..d6fb76578b11 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/devs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/devs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/devs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/devs.c</a></div><div class='hunk'>@@ -23,8 +23,8 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/fb.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/fb.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c<br/>index 8c5e656d5d8c..08c2aaf14c41 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/dma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/dma.c</a></div><div class='hunk'>@@ -29,12 +29,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/map.h&gt;</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/dma.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/gpio.c b/arch/arm/plat-s3c24xx/gpio.c<br/>index ee99dcc7f0bd..dd27334e3d7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/gpio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/gpio.c</a></div><div class='hunk'>@@ -27,11 +27,11 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int function)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c<br/>index 825d8d0c5ca2..3caec6bad3eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/gpiolib.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/gpiolib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/gpiolib.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/gpiolib.c</a></div><div class='hunk'>@@ -19,10 +19,10 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct s3c24xx_gpio_chip {</div><div class='ctx'> 	struct gpio_chip	chip;</div><div class='hunk'>@@ -39,7 +39,7 @@ static inline struct s3c24xx_gpio_chip *to_s3c_chip(struct gpio_chip *gpc)</div><div class='ctx'>  * drivers themsevles.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int s3c24xx_gpiolib_input(struct gpio_chip *chip, unsigned offset)</div><div class='add'>+static int s3c24xx_gpiolib_input(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip);</div><div class='ctx'> 	void __iomem *base = ourchip-&gt;base;</div><div class='hunk'>@@ -58,7 +58,7 @@ int s3c24xx_gpiolib_input(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int s3c24xx_gpiolib_output(struct gpio_chip *chip,</div><div class='add'>+static int s3c24xx_gpiolib_output(struct gpio_chip *chip,</div><div class='ctx'> 				  unsigned offset, int value)</div><div class='ctx'> {</div><div class='ctx'> 	struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip);</div><div class='hunk'>@@ -86,7 +86,8 @@ int s3c24xx_gpiolib_output(struct gpio_chip *chip,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void s3c24xx_gpiolib_set(struct gpio_chip *chip, unsigned offset, int value)</div><div class='add'>+static void s3c24xx_gpiolib_set(struct gpio_chip *chip,</div><div class='add'>+				unsigned offset, int value)</div><div class='ctx'> {</div><div class='ctx'> 	struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip);</div><div class='ctx'> 	void __iomem *base = ourchip-&gt;base;</div><div class='hunk'>@@ -104,7 +105,7 @@ void s3c24xx_gpiolib_set(struct gpio_chip *chip, unsigned offset, int value)</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int s3c24xx_gpiolib_get(struct gpio_chip *chip, unsigned offset)</div><div class='add'>+static int s3c24xx_gpiolib_get(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip);</div><div class='ctx'> 	unsigned long val;</div><div class='hunk'>@@ -150,8 +151,7 @@ static int s3c24xx_gpiolib_banka_output(struct gpio_chip *chip,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-struct s3c24xx_gpio_chip gpios[] = {</div><div class='add'>+static struct s3c24xx_gpio_chip gpios[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.base	= S3C24XX_GPIO_BASE(S3C2410_GPA0),</div><div class='ctx'> 		.chip	= {</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c<br/>index 001436c04b13..36cefe176835 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/irq.c</a></div><div class='hunk'>@@ -56,14 +56,14 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-irq.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/pm-simtec.c b/arch/arm/plat-s3c24xx/pm-simtec.c<br/>index cb0b3a4ccf1b..e6705014b2a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/pm-simtec.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/pm-simtec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/pm-simtec.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/pm-simtec.c</a></div><div class='hunk'>@@ -24,12 +24,12 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/map.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-mem.h&gt;</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-mem.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c<br/>index bf5581a9aeea..fc4b731a949c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/pm.c</a></div><div class='hunk'>@@ -37,14 +37,14 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-mem.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-irq.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-mem.h&gt;</div><div class='add'>+#include &lt;mach/regs-irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/pwm-clock.c b/arch/arm/plat-s3c24xx/pwm-clock.c<br/>index 2cda3e3c6786..306cc9c6f9ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/pwm-clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/pwm-clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/pwm-clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/pwm-clock.c</a></div><div class='hunk'>@@ -18,11 +18,11 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='hunk'>@@ -89,7 +89,7 @@ static unsigned long clk_pwm_scaler_getrate(struct clk *clk)</div><div class='ctx'> </div><div class='ctx'> /* TODO - add set rate calls. */</div><div class='ctx'> </div><div class='del'>-struct clk clk_timer_scaler[] = {</div><div class='add'>+static struct clk clk_timer_scaler[] = {</div><div class='ctx'> 	[0]	= {</div><div class='ctx'> 		.name		= "pwm-scaler0",</div><div class='ctx'> 		.id		= -1,</div><div class='hunk'>@@ -102,7 +102,7 @@ struct clk clk_timer_scaler[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct clk clk_timer_tclk[] = {</div><div class='add'>+static struct clk clk_timer_tclk[] = {</div><div class='ctx'> 	[0]	= {</div><div class='ctx'> 		.name		= "pwm-tclk0",</div><div class='ctx'> 		.id		= -1,</div><div class='hunk'>@@ -232,7 +232,7 @@ static int clk_pwm_tdiv_set_rate(struct clk *clk, unsigned long rate)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct pwm_tdiv_clk clk_timer_tdiv[] = {</div><div class='add'>+static struct pwm_tdiv_clk clk_timer_tdiv[] = {</div><div class='ctx'> 	[0]	= {</div><div class='ctx'> 		.clk	= {</div><div class='ctx'> 			.name		= "pwm-tdiv",</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/pwm.c b/arch/arm/plat-s3c24xx/pwm.c<br/>index 18c4bdc49a05..7a92c938542a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/pwm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/pwm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/pwm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/pwm.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/pwm.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/plat-s3c24xx/devs.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct pwm_device {</div><div class='hunk'>@@ -38,7 +39,7 @@ struct pwm_device {</div><div class='ctx'> 	unsigned char		 pwm_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define pwm_dbg(_pwm, msg...) dev_info(&amp;(_pwm)-&gt;pdev-&gt;dev, msg)</div><div class='add'>+#define pwm_dbg(_pwm, msg...) dev_dbg(&amp;(_pwm)-&gt;pdev-&gt;dev, msg)</div><div class='ctx'> </div><div class='ctx'> static struct clk *clk_scaler[2];</div><div class='ctx'> </div><div class='hunk'>@@ -168,7 +169,7 @@ void pwm_disable(struct pwm_device *pwm)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(pwm_disable);</div><div class='ctx'> </div><div class='del'>-unsigned long pwm_calc_tin(struct pwm_device *pwm, unsigned long freq)</div><div class='add'>+static unsigned long pwm_calc_tin(struct pwm_device *pwm, unsigned long freq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long tin_parent_rate;</div><div class='ctx'> 	unsigned int div;</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/s3c244x-clock.c b/arch/arm/plat-s3c24xx/s3c244x-clock.c<br/>index faf3e0f9f4e2..8a5fffde6631 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/s3c244x-clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/s3c244x-clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/s3c244x-clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/s3c244x-clock.c</a></div><div class='hunk'>@@ -34,12 +34,12 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/s3c244x-irq.c b/arch/arm/plat-s3c24xx/s3c244x-irq.c<br/>index 2dbb2606d448..f3dc38cf1de4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/s3c244x-irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/s3c244x-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/s3c244x-irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/s3c244x-irq.c</a></div><div class='hunk'>@@ -25,14 +25,14 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-irq.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/pm.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c<br/>index 2f01af5f64c4..281b4804ed38 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/s3c244x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/s3c244x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/s3c244x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/s3c244x.c</a></div><div class='hunk'>@@ -25,15 +25,15 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpioj.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-dsc.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpioj.h&gt;</div><div class='add'>+#include &lt;mach/regs-dsc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2410.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c24xx/s3c2440.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/sleep.S b/arch/arm/plat-s3c24xx/sleep.S<br/>index a646cbe8244c..4981a08b6ebb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/sleep.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/sleep.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/sleep.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/sleep.S</a></div><div class='hunk'>@@ -26,12 +26,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/map.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-clock.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-mem.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-mem.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* CONFIG_DEBUG_RESUME is dangerous if your bootloader does not</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/time.c b/arch/arm/plat-s3c24xx/time.c<br/>index 766473b3f98b..b471a21ae2e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/plat-s3c24xx/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/plat-s3c24xx/time.c</a></div><div class='hunk'>@@ -32,9 +32,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/map.h&gt;</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-timer.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-irq.h&gt;</div><div class='add'>+#include &lt;mach/regs-irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/clock.h&gt;</div><div class='head'>diff --git a/arch/arm/tools/Makefile b/arch/arm/tools/Makefile<br/>index c2a4993a724c..1dbaa29ac4d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/tools/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/tools/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/tools/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/tools/Makefile</a></div><div class='hunk'>@@ -6,4 +6,5 @@</div><div class='ctx'> </div><div class='ctx'> include/asm-arm/mach-types.h: $(src)/gen-mach-types $(src)/mach-types</div><div class='ctx'> 	@echo '  Generating $@'</div><div class='add'>+	@mkdir -p $(dir $@)</div><div class='ctx'> 	$(Q)$(AWK) -f $^ &gt; $@ || { rm -f $@; /bin/false; }</div><div class='head'>diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types<br/>index 8b8f564c3aa2..56281c030a7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/tools/mach-types?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/arm/tools/mach-types</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/tools/mach-types?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/arm/tools/mach-types</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #</div><div class='ctx'> #   http://www.arm.linux.org.uk/developer/machines/?action=new</div><div class='ctx'> #</div><div class='del'>-# Last update: Sun Jul 13 12:04:05 2008</div><div class='add'>+# Last update: Wed Aug 13 21:56:02 2008</div><div class='ctx'> #</div><div class='ctx'> # machine_is_xxx	CONFIG_xxxx		MACH_TYPE_xxx		number</div><div class='ctx'> #</div><div class='hunk'>@@ -843,7 +843,7 @@ borzoi			MACH_BORZOI		BORZOI			831</div><div class='ctx'> gecko			MACH_GECKO		GECKO			832</div><div class='ctx'> ds101			MACH_DS101		DS101			833</div><div class='ctx'> omap_palmtt2		MACH_OMAP_PALMTT2	OMAP_PALMTT2		834</div><div class='del'>-xscale_palmld		MACH_XSCALE_PALMLD	XSCALE_PALMLD		835</div><div class='add'>+palmld			MACH_PALMLD		PALMLD			835</div><div class='ctx'> cc9c			MACH_CC9C		CC9C			836</div><div class='ctx'> sbc1670			MACH_SBC1670		SBC1670			837</div><div class='ctx'> ixdp28x5		MACH_IXDP28X5		IXDP28X5		838</div><div class='hunk'>@@ -852,7 +852,7 @@ ml696k			MACH_ML696K		ML696K			840</div><div class='ctx'> arcom_zeus		MACH_ARCOM_ZEUS		ARCOM_ZEUS		841</div><div class='ctx'> osiris			MACH_OSIRIS		OSIRIS			842</div><div class='ctx'> maestro			MACH_MAESTRO		MAESTRO			843</div><div class='del'>-tunge2			MACH_TUNGE2		TUNGE2			844</div><div class='add'>+palmte2			MACH_PALMTE2		PALMTE2			844</div><div class='ctx'> ixbbm			MACH_IXBBM		IXBBM			845</div><div class='ctx'> mx27ads			MACH_MX27ADS		MX27ADS			846</div><div class='ctx'> ax8004			MACH_AX8004		AX8004			847</div><div class='hunk'>@@ -916,7 +916,7 @@ nxdb500			MACH_NXDB500		NXDB500			905</div><div class='ctx'> apf9328			MACH_APF9328		APF9328			906</div><div class='ctx'> omap_wipoq		MACH_OMAP_WIPOQ		OMAP_WIPOQ		907</div><div class='ctx'> omap_twip		MACH_OMAP_TWIP		OMAP_TWIP		908</div><div class='del'>-palmtreo650		MACH_PALMTREO650	PALMTREO650		909</div><div class='add'>+palmt650		MACH_PALMT650		PALMT650		909</div><div class='ctx'> acumen			MACH_ACUMEN		ACUMEN			910</div><div class='ctx'> xp100			MACH_XP100		XP100			911</div><div class='ctx'> fs2410			MACH_FS2410		FS2410			912</div><div class='hunk'>@@ -1096,7 +1096,7 @@ atc6			MACH_ATC6		ATC6			1086</div><div class='ctx'> multmdw			MACH_MULTMDW		MULTMDW			1087</div><div class='ctx'> mba2440			MACH_MBA2440		MBA2440			1088</div><div class='ctx'> ecsd			MACH_ECSD		ECSD			1089</div><div class='del'>-zire31			MACH_ZIRE31		ZIRE31			1090</div><div class='add'>+palmz31			MACH_PALMZ31		PALMZ31			1090</div><div class='ctx'> fsg			MACH_FSG		FSG			1091</div><div class='ctx'> razor101		MACH_RAZOR101		RAZOR101		1092</div><div class='ctx'> opera_tdm		MACH_OPERA_TDM		OPERA_TDM		1093</div><div class='hunk'>@@ -1810,7 +1810,7 @@ kriss_sensor		MACH_KRISS_SENSOR	KRISS_SENSOR		1819</div><div class='ctx'> pilz_pmi5		MACH_PILZ_PMI5		PILZ_PMI5		1820</div><div class='ctx'> jade			MACH_JADE		JADE			1821</div><div class='ctx'> ks8695_softplc		MACH_KS8695_SOFTPLC	KS8695_SOFTPLC		1822</div><div class='del'>-gprisc4			MACH_GPRISC4		GPRISC4			1823</div><div class='add'>+gprisc3			MACH_GPRISC4		GPRISC4			1823</div><div class='ctx'> stamp9260		MACH_STAMP9260		STAMP9260		1824</div><div class='ctx'> smdk6430		MACH_SMDK6430		SMDK6430		1825</div><div class='ctx'> smdkc100		MACH_SMDKC100		SMDKC100		1826</div><div class='hunk'>@@ -1820,3 +1820,44 @@ deister_eyecam		MACH_DEISTER_EYECAM	DEISTER_EYECAM		1829</div><div class='ctx'> at91sam9m10ek		MACH_AT91SAM9M10EK	AT91SAM9M10EK		1830</div><div class='ctx'> linkstation_produo	MACH_LINKSTATION_PRODUO	LINKSTATION_PRODUO	1831</div><div class='ctx'> hit_b0			MACH_HIT_B0		HIT_B0			1832</div><div class='add'>+adx_rmu			MACH_ADX_RMU		ADX_RMU			1833</div><div class='add'>+xg_cpe_main		MACH_XG_CPE_MAIN	XG_CPE_MAIN		1834</div><div class='add'>+edb9407a		MACH_EDB9407A		EDB9407A		1835</div><div class='add'>+dtb9608			MACH_DTB9608		DTB9608			1836</div><div class='add'>+em104v1			MACH_EM104V1		EM104V1			1837</div><div class='add'>+demo			MACH_DEMO		DEMO			1838</div><div class='add'>+logi9260		MACH_LOGI9260		LOGI9260		1839</div><div class='add'>+mx31_exm32		MACH_MX31_EXM32		MX31_EXM32		1840</div><div class='add'>+usb_a9g20		MACH_USB_A9G20		USB_A9G20		1841</div><div class='add'>+picproje2008		MACH_PICPROJE2008	PICPROJE2008		1842</div><div class='add'>+cs_e9315		MACH_CS_E9315		CS_E9315		1843</div><div class='add'>+qil_a9g20		MACH_QIL_A9G20		QIL_A9G20		1844</div><div class='add'>+sha_pon020		MACH_SHA_PON020		SHA_PON020		1845</div><div class='add'>+nad			MACH_NAD		NAD			1846</div><div class='add'>+sbc35_a9260		MACH_SBC35_A9260	SBC35_A9260		1847</div><div class='add'>+sbc35_a9g20		MACH_SBC35_A9G20	SBC35_A9G20		1848</div><div class='add'>+davinci_beginning	MACH_DAVINCI_BEGINNING	DAVINCI_BEGINNING	1849</div><div class='add'>+uwc			MACH_UWC		UWC			1850</div><div class='add'>+mxlads			MACH_MXLADS		MXLADS			1851</div><div class='add'>+htcnike			MACH_HTCNIKE		HTCNIKE			1852</div><div class='add'>+deister_pxa270		MACH_DEISTER_PXA270	DEISTER_PXA270		1853</div><div class='add'>+cme9210js		MACH_CME9210JS		CME9210JS		1854</div><div class='add'>+cc9p9360		MACH_CC9P9360		CC9P9360		1855</div><div class='add'>+mocha			MACH_MOCHA		MOCHA			1856</div><div class='add'>+wapd170ag		MACH_WAPD170AG		WAPD170AG		1857</div><div class='add'>+linkstation_mini	MACH_LINKSTATION_MINI	LINKSTATION_MINI	1858</div><div class='add'>+afeb9260		MACH_AFEB9260		AFEB9260		1859</div><div class='add'>+w90x900			MACH_W90X900		W90X900			1860</div><div class='add'>+w90x700			MACH_W90X700		W90X700			1861</div><div class='add'>+kt300ip			MACH_KT300IP		KT300IP			1862</div><div class='add'>+kt300ip_g20		MACH_KT300IP_G20	KT300IP_G20		1863</div><div class='add'>+srcm			MACH_SRCM		SRCM			1864</div><div class='add'>+wlnx_9260		MACH_WLNX_9260		WLNX_9260		1865</div><div class='add'>+openmoko_gta03		MACH_OPENMOKO_GTA03	OPENMOKO_GTA03		1866</div><div class='add'>+osprey2			MACH_OSPREY2		OSPREY2			1867</div><div class='add'>+kbio9260		MACH_KBIO9260		KBIO9260		1868</div><div class='add'>+ginza			MACH_GINZA		GINZA			1869</div><div class='add'>+a636n			MACH_A636N		A636N			1870</div><div class='add'>+imx27ipcam		MACH_IMX27IPCAM		IMX27IPCAM		1871</div><div class='add'>+nenoc			MACH_NEMOC		NEMOC			1872</div><div class='add'>+geneva			MACH_GENEVA		GENEVA			1873</div><div class='head'>diff --git a/arch/avr32/Makefile b/arch/avr32/Makefile<br/>index 17a3529341dd..c9e1f0b47fd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/Makefile</a></div><div class='hunk'>@@ -23,9 +23,14 @@ KBUILD_AFLAGS	+= $(cpuflags-y)</div><div class='ctx'> </div><div class='ctx'> CHECKFLAGS	+= -D__avr32__ -D__BIG_ENDIAN</div><div class='ctx'> </div><div class='add'>+machine-$(CONFIG_PLATFORM_AT32AP) := at32ap</div><div class='add'>+machdirs	:= $(patsubst %,arch/avr32/mach-%/, $(machine-y))</div><div class='add'>+</div><div class='add'>+KBUILD_CPPFLAGS	+= $(patsubst %,-I$(srctree)/%include,$(machdirs))</div><div class='add'>+</div><div class='ctx'> head-$(CONFIG_LOADER_U_BOOT)		+= arch/avr32/boot/u-boot/head.o</div><div class='ctx'> head-y					+= arch/avr32/kernel/head.o</div><div class='del'>-core-$(CONFIG_PLATFORM_AT32AP)		+= arch/avr32/mach-at32ap/</div><div class='add'>+core-y					+= $(machdirs)</div><div class='ctx'> core-$(CONFIG_BOARD_ATSTK1000)		+= arch/avr32/boards/atstk1000/</div><div class='ctx'> core-$(CONFIG_BOARD_ATNGW100)		+= arch/avr32/boards/atngw100/</div><div class='ctx'> core-$(CONFIG_LOADER_U_BOOT)		+= arch/avr32/boot/u-boot/</div><div class='hunk'>@@ -34,20 +39,6 @@ core-y					+= arch/avr32/mm/</div><div class='ctx'> drivers-$(CONFIG_OPROFILE)		+= arch/avr32/oprofile/</div><div class='ctx'> libs-y					+= arch/avr32/lib/</div><div class='ctx'> </div><div class='del'>-archincdir-$(CONFIG_PLATFORM_AT32AP)	:= arch-at32ap</div><div class='del'>-</div><div class='del'>-include/asm-avr32/.arch: $(wildcard include/config/platform/*.h) include/config/auto.conf</div><div class='del'>-	@echo '  SYMLINK include/asm-avr32/arch -&gt; include/asm-avr32/$(archincdir-y)'</div><div class='del'>-ifneq ($(KBUILD_SRC),)</div><div class='del'>-	$(Q)mkdir -p include/asm-avr32</div><div class='del'>-	$(Q)ln -fsn $(srctree)/include/asm-avr32/$(archincdir-y) include/asm-avr32/arch</div><div class='del'>-else</div><div class='del'>-	$(Q)ln -fsn $(archincdir-y) include/asm-avr32/arch</div><div class='del'>-endif</div><div class='del'>-	@touch $@</div><div class='del'>-</div><div class='del'>-archprepare: include/asm-avr32/.arch</div><div class='del'>-</div><div class='ctx'> CLEAN_FILES += include/asm-avr32/.arch include/asm-avr32/arch</div><div class='ctx'> </div><div class='ctx'> BOOT_TARGETS := vmlinux.elf vmlinux.bin uImage uImage.srec</div><div class='head'>diff --git a/arch/avr32/boards/atngw100/flash.c b/arch/avr32/boards/atngw100/flash.c<br/>index b07ae63aa548..55ccc9ce4892 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/boards/atngw100/flash.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/boards/atngw100/flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/boards/atngw100/flash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/boards/atngw100/flash.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/smc.h&gt;</div><div class='add'>+#include &lt;mach/smc.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct smc_timing flash_timing __initdata = {</div><div class='ctx'> 	.ncs_read_setup		= 0,</div><div class='head'>diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c<br/>index c7fe94d03a1e..b8286f1ce854 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/boards/atngw100/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/boards/atngw100/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/boards/atngw100/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/boards/atngw100/setup.c</a></div><div class='hunk'>@@ -23,10 +23,10 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/at32ap700x.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/init.h&gt;</div><div class='del'>-#include &lt;asm/arch/portmux.h&gt;</div><div class='add'>+#include &lt;mach/at32ap700x.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/init.h&gt;</div><div class='add'>+#include &lt;mach/portmux.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Oscillator frequencies. These are board-specific */</div><div class='ctx'> unsigned long at32_board_osc_rates[3] = {</div><div class='hunk'>@@ -47,7 +47,7 @@ static struct eth_platform_data __initdata eth_data[2];</div><div class='ctx'> static struct spi_board_info spi0_board_info[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.modalias	= "mtd_dataflash",</div><div class='del'>-		.max_speed_hz	= 10000000,</div><div class='add'>+		.max_speed_hz	= 8000000,</div><div class='ctx'> 		.chip_select	= 0,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c<br/>index 8538ba75ef92..dfc3443e23aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/boards/atstk1000/atstk1002.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/boards/atstk1000/atstk1002.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/boards/atstk1000/atstk1002.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/boards/atstk1000/atstk1002.c</a></div><div class='hunk'>@@ -23,10 +23,10 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/atmel-mci.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/at32ap700x.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/init.h&gt;</div><div class='del'>-#include &lt;asm/arch/portmux.h&gt;</div><div class='add'>+#include &lt;mach/at32ap700x.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/init.h&gt;</div><div class='add'>+#include &lt;mach/portmux.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "atstk1000.h"</div><div class='ctx'> </div><div class='hunk'>@@ -49,7 +49,7 @@ unsigned long at32_board_osc_rates[3] = {</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_BOARD_ATSTK1006</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='del'>-#include &lt;asm/arch/smc.h&gt;</div><div class='add'>+#include &lt;mach/smc.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct smc_timing nand_timing __initdata = {</div><div class='ctx'> 	.ncs_read_setup		= 0,</div><div class='hunk'>@@ -96,7 +96,7 @@ static struct mtd_partition *nand_part_info(int size, int *num_partitions)</div><div class='ctx'> 	return nand_partitions;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct atmel_nand_data atstk1006_nand_data __initdata = {</div><div class='add'>+static struct atmel_nand_data atstk1006_nand_data __initdata = {</div><div class='ctx'> 	.cle		= 21,</div><div class='ctx'> 	.ale		= 22,</div><div class='ctx'> 	.rdy_pin	= GPIO_PIN_PB(30),</div><div class='hunk'>@@ -325,7 +325,7 @@ static int __init atstk1002_init(void)</div><div class='ctx'> #ifdef CONFIG_BOARD_ATSTK100X_SPI1</div><div class='ctx'> 	at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));</div><div class='ctx'> #endif</div><div class='del'>-#ifndef CONFIG_BOARD_ATSTK1002_SW2_CUSTOM</div><div class='add'>+#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM</div><div class='ctx'> 	at32_add_device_mci(0, MCI_PDATA);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM</div><div class='head'>diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c<br/>index 591fc73b554a..0cf664174c17 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/boards/atstk1000/atstk1003.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/boards/atstk1000/atstk1003.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/boards/atstk1000/atstk1003.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/boards/atstk1000/atstk1003.c</a></div><div class='hunk'>@@ -20,10 +20,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/at32ap700x.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/init.h&gt;</div><div class='del'>-#include &lt;asm/arch/portmux.h&gt;</div><div class='add'>+#include &lt;mach/at32ap700x.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/init.h&gt;</div><div class='add'>+#include &lt;mach/portmux.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "atstk1000.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c<br/>index d9c5e0a21256..50a5273e5916 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/boards/atstk1000/atstk1004.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/boards/atstk1000/atstk1004.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/boards/atstk1000/atstk1004.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/boards/atstk1000/atstk1004.c</a></div><div class='hunk'>@@ -22,10 +22,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/at32ap700x.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/init.h&gt;</div><div class='del'>-#include &lt;asm/arch/portmux.h&gt;</div><div class='add'>+#include &lt;mach/at32ap700x.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/init.h&gt;</div><div class='add'>+#include &lt;mach/portmux.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "atstk1000.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/avr32/boards/atstk1000/flash.c b/arch/avr32/boards/atstk1000/flash.c<br/>index 3d0a102ad45e..6e4d561977ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/boards/atstk1000/flash.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/boards/atstk1000/flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/boards/atstk1000/flash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/boards/atstk1000/flash.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/smc.h&gt;</div><div class='add'>+#include &lt;mach/smc.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct smc_timing flash_timing __initdata = {</div><div class='ctx'> 	.ncs_read_setup		= 0,</div><div class='head'>diff --git a/arch/avr32/boards/atstk1000/setup.c b/arch/avr32/boards/atstk1000/setup.c<br/>index 8bedf93876a3..2d6b560115d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/boards/atstk1000/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/boards/atstk1000/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/boards/atstk1000/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/boards/atstk1000/setup.c</a></div><div class='hunk'>@@ -18,9 +18,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/at32ap700x.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/portmux.h&gt;</div><div class='add'>+#include &lt;mach/at32ap700x.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/portmux.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "atstk1000.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/avr32/boot/images/.gitignore b/arch/avr32/boot/images/.gitignore<br/>new file mode 100644<br/>index 000000000000..64ea9d0141d2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/boot/images/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/boot/images/.gitignore</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+uImage</div><div class='add'>+uImage.srec</div><div class='add'>+vmlinux.cso</div><div class='add'>+sfdwarf.log</div><div class='head'>diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig<br/>index 119edb839ac3..541520912c55 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/configs/atngw100_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/configs/atngw100_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/configs/atngw100_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/configs/atngw100_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc3</div><div class='del'>-# Mon May 26 13:30:59 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 16:00:47 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_AVR32=y</div><div class='ctx'> CONFIG_GENERIC_GPIO=y</div><div class='hunk'>@@ -78,10 +78,16 @@ CONFIG_PROFILING=y</div><div class='ctx'> CONFIG_OPROFILE=m</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> CONFIG_KPROBES=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -98,6 +104,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -142,6 +149,7 @@ CONFIG_PHYS_OFFSET=0x10000000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_QUICKLIST=y</div><div class='ctx'> # CONFIG_HAVE_ARCH_BOOTMEM_NODE is not set</div><div class='ctx'> # CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set</div><div class='ctx'> # CONFIG_NEED_NODE_MEMMAP_SIZE is not set</div><div class='hunk'>@@ -160,6 +168,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=0</div><div class='add'>+CONFIG_NR_QUICK=2</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> # CONFIG_OWNERSHIP_TRACE is not set</div><div class='ctx'> CONFIG_NMI_DEBUGGING=y</div><div class='hunk'>@@ -174,6 +183,12 @@ CONFIG_CMDLINE=""</div><div class='ctx'> #</div><div class='ctx'> # Power management options</div><div class='ctx'> #</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+CONFIG_SUSPEND_FREEZER=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CPU Frequency scaling</div><div class='hunk'>@@ -205,10 +220,6 @@ CONFIG_CPU_FREQ_AT32AP=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -222,6 +233,7 @@ CONFIG_XFRM_USER=y</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> # CONFIG_XFRM_MIGRATE is not set</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=y</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> # CONFIG_NET_KEY_MIGRATE is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -339,8 +351,10 @@ CONFIG_IP6_NF_MANGLE=m</div><div class='ctx'> # CONFIG_IP_SCTP is not set</div><div class='ctx'> # CONFIG_TIPC is not set</div><div class='ctx'> # CONFIG_ATM is not set</div><div class='add'>+CONFIG_STP=m</div><div class='ctx'> CONFIG_BRIDGE=m</div><div class='ctx'> CONFIG_VLAN_8021Q=m</div><div class='add'>+# CONFIG_VLAN_8021Q_GVRP is not set</div><div class='ctx'> # CONFIG_DECNET is not set</div><div class='ctx'> CONFIG_LLC=m</div><div class='ctx'> # CONFIG_LLC2 is not set</div><div class='hunk'>@@ -499,7 +513,6 @@ CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -607,21 +620,35 @@ CONFIG_I2C_ALGOBIT=m</div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='ctx'> CONFIG_I2C_GPIO=m</div><div class='ctx'> # CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+CONFIG_AT24=m</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_TPS65010 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='hunk'>@@ -646,27 +673,32 @@ CONFIG_SPI_ATMEL=y</div><div class='ctx'> # CONFIG_SPI_AT25 is not set</div><div class='ctx'> CONFIG_SPI_SPIDEV=m</div><div class='ctx'> # CONFIG_SPI_TLE62X0 is not set</div><div class='del'>-CONFIG_HAVE_GPIO_LIB=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# GPIO Support</div><div class='del'>-#</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='ctx'> # CONFIG_DEBUG_GPIO is not set</div><div class='add'>+CONFIG_GPIO_SYSFS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C GPIO expanders:</div><div class='ctx'> #</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='ctx'> # CONFIG_GPIO_PCA953X is not set</div><div class='ctx'> # CONFIG_GPIO_PCF857X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # SPI GPIO expanders:</div><div class='ctx'> #</div><div class='add'>+# CONFIG_GPIO_MAX7301 is not set</div><div class='ctx'> # CONFIG_GPIO_MCP23S08 is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -685,6 +717,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -716,10 +749,6 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> # CONFIG_USB_ARCH_HAS_HCD is not set</div><div class='hunk'>@@ -740,7 +769,7 @@ CONFIG_USB_GADGET_ATMEL_USBA=y</div><div class='ctx'> CONFIG_USB_ATMEL_USBA=y</div><div class='ctx'> # CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='ctx'> # CONFIG_USB_GADGET_NET2280 is not set</div><div class='del'>-# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA25X is not set</div><div class='ctx'> # CONFIG_USB_GADGET_M66592 is not set</div><div class='ctx'> # CONFIG_USB_GADGET_PXA27X is not set</div><div class='ctx'> # CONFIG_USB_GADGET_GOKU is not set</div><div class='hunk'>@@ -759,21 +788,24 @@ CONFIG_USB_FILE_STORAGE=m</div><div class='ctx'> CONFIG_USB_G_SERIAL=m</div><div class='ctx'> # CONFIG_USB_MIDI_GADGET is not set</div><div class='ctx'> # CONFIG_USB_G_PRINTER is not set</div><div class='del'>-CONFIG_MMC=m</div><div class='add'>+CONFIG_USB_CDC_COMPOSITE=m</div><div class='add'>+CONFIG_MMC=y</div><div class='ctx'> # CONFIG_MMC_DEBUG is not set</div><div class='ctx'> # CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MMC/SD Card Drivers</div><div class='ctx'> #</div><div class='del'>-CONFIG_MMC_BLOCK=m</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='ctx'> CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='ctx'> # CONFIG_SDIO_UART is not set</div><div class='del'>-# CONFIG_MMC_TEST is not set</div><div class='add'>+CONFIG_MMC_TEST=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MMC/SD Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MMC_SDHCI is not set</div><div class='add'>+CONFIG_MMC_ATMELMCI=y</div><div class='ctx'> CONFIG_MMC_SPI=m</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> CONFIG_NEW_LEDS=y</div><div class='hunk'>@@ -783,6 +815,7 @@ CONFIG_LEDS_CLASS=y</div><div class='ctx'> # LED drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_LEDS_GPIO=y</div><div class='add'>+# CONFIG_LEDS_PCA955X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # LED Triggers</div><div class='hunk'>@@ -821,10 +854,13 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_M41T94 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1305 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_MAX6902 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_R9701 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_RS5C348 is not set</div><div class='hunk'>@@ -844,6 +880,19 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_RTC_DRV_AT32AP700X=y</div><div class='add'>+CONFIG_DMADEVICES=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_DW_DMAC=y</div><div class='add'>+CONFIG_DMA_ENGINE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_DMA is not set</div><div class='add'>+CONFIG_DMATEST=m</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -921,6 +970,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -931,17 +981,16 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=m</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=m</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='hunk'>@@ -1017,6 +1066,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1037,6 +1088,7 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='hunk'>@@ -1101,6 +1153,10 @@ CONFIG_CRYPTO_HMAC=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=y</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1141,12 +1197,14 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> CONFIG_CRC7=m</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_GENERIC_ALLOCATOR=y</div><div class='ctx'> CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='head'>diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig<br/>index c6d02eac8791..69fce6b6a783 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/configs/atstk1002_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/configs/atstk1002_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/configs/atstk1002_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/configs/atstk1002_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc3</div><div class='del'>-# Mon May 26 13:30:20 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Mon Aug  4 16:02:27 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_AVR32=y</div><div class='ctx'> CONFIG_GENERIC_GPIO=y</div><div class='hunk'>@@ -77,10 +77,16 @@ CONFIG_PROFILING=y</div><div class='ctx'> CONFIG_OPROFILE=m</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> CONFIG_KPROBES=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -91,12 +97,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -130,6 +137,7 @@ CONFIG_BOARD_ATSTK1000=y</div><div class='ctx'> CONFIG_BOARD_ATSTK1002=y</div><div class='ctx'> # CONFIG_BOARD_ATSTK1003 is not set</div><div class='ctx'> # CONFIG_BOARD_ATSTK1004 is not set</div><div class='add'>+# CONFIG_BOARD_ATSTK1006 is not set</div><div class='ctx'> # CONFIG_BOARD_ATSTK100X_CUSTOM is not set</div><div class='ctx'> # CONFIG_BOARD_ATSTK100X_SPI1 is not set</div><div class='ctx'> # CONFIG_BOARD_ATSTK1000_J2_LED is not set</div><div class='hunk'>@@ -150,6 +158,7 @@ CONFIG_PHYS_OFFSET=0x10000000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_QUICKLIST=y</div><div class='ctx'> # CONFIG_HAVE_ARCH_BOOTMEM_NODE is not set</div><div class='ctx'> # CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set</div><div class='ctx'> # CONFIG_NEED_NODE_MEMMAP_SIZE is not set</div><div class='hunk'>@@ -168,6 +177,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=0</div><div class='add'>+CONFIG_NR_QUICK=2</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> # CONFIG_OWNERSHIP_TRACE is not set</div><div class='ctx'> CONFIG_NMI_DEBUGGING=y</div><div class='hunk'>@@ -182,6 +192,12 @@ CONFIG_CMDLINE=""</div><div class='ctx'> #</div><div class='ctx'> # Power management options</div><div class='ctx'> #</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+CONFIG_SUSPEND_FREEZER=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CPU Frequency scaling</div><div class='hunk'>@@ -213,10 +229,6 @@ CONFIG_CPU_FREQ_AT32AP=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -230,6 +242,7 @@ CONFIG_XFRM_USER=m</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> # CONFIG_XFRM_MIGRATE is not set</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=m</div><div class='ctx'> # CONFIG_NET_KEY_MIGRATE is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -284,6 +297,7 @@ CONFIG_IPV6_TUNNEL=m</div><div class='ctx'> # CONFIG_IP_SCTP is not set</div><div class='ctx'> # CONFIG_TIPC is not set</div><div class='ctx'> # CONFIG_ATM is not set</div><div class='add'>+CONFIG_STP=m</div><div class='ctx'> CONFIG_BRIDGE=m</div><div class='ctx'> # CONFIG_VLAN_8021Q is not set</div><div class='ctx'> # CONFIG_DECNET is not set</div><div class='hunk'>@@ -474,6 +488,7 @@ CONFIG_SCSI_WAIT_SCAN=m</div><div class='ctx'> # CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='ctx'> # CONFIG_SCSI_SRP_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_LOWLEVEL is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=m</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_SATA_PMP is not set</div><div class='hunk'>@@ -483,7 +498,6 @@ CONFIG_PATA_AT32=m</div><div class='ctx'> # CONFIG_PATA_PLATFORM is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -625,21 +639,35 @@ CONFIG_I2C_ALGOBIT=m</div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='ctx'> CONFIG_I2C_GPIO=m</div><div class='ctx'> # CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+CONFIG_AT24=m</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_TPS65010 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='hunk'>@@ -664,27 +692,32 @@ CONFIG_SPI_ATMEL=y</div><div class='ctx'> # CONFIG_SPI_AT25 is not set</div><div class='ctx'> CONFIG_SPI_SPIDEV=m</div><div class='ctx'> # CONFIG_SPI_TLE62X0 is not set</div><div class='del'>-CONFIG_HAVE_GPIO_LIB=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# GPIO Support</div><div class='del'>-#</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='ctx'> # CONFIG_DEBUG_GPIO is not set</div><div class='add'>+CONFIG_GPIO_SYSFS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C GPIO expanders:</div><div class='ctx'> #</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='ctx'> # CONFIG_GPIO_PCA953X is not set</div><div class='ctx'> # CONFIG_GPIO_PCF857X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # SPI GPIO expanders:</div><div class='ctx'> #</div><div class='add'>+# CONFIG_GPIO_MAX7301 is not set</div><div class='ctx'> # CONFIG_GPIO_MCP23S08 is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -703,6 +736,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -754,6 +788,9 @@ CONFIG_FB_ATMEL=y</div><div class='ctx'> CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='ctx'> CONFIG_LCD_CLASS_DEVICE=y</div><div class='ctx'> CONFIG_LCD_LTV350QV=y</div><div class='add'>+# CONFIG_LCD_ILI9320 is not set</div><div class='add'>+# CONFIG_LCD_VGG2432A4 is not set</div><div class='add'>+# CONFIG_LCD_PLATFORM is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_CLASS_DEVICE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -761,15 +798,7 @@ CONFIG_LCD_LTV350QV=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='ctx'> # CONFIG_LOGO is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=m</div><div class='ctx'> CONFIG_SND_TIMER=m</div><div class='ctx'> CONFIG_SND_PCM=m</div><div class='hunk'>@@ -783,37 +812,11 @@ CONFIG_SND_PCM_OSS_PLUGINS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PROCFS is not set</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_SND_DUMMY is not set</div><div class='del'>-# CONFIG_SND_MTPAV is not set</div><div class='del'>-# CONFIG_SND_SERIAL_U16550 is not set</div><div class='del'>-# CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_SND_DRIVERS is not set</div><div class='add'>+CONFIG_SND_SPI=y</div><div class='ctx'> CONFIG_SND_AT73C213=m</div><div class='ctx'> CONFIG_SND_AT73C213_TARGET_BITRATE=48000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio for the Texas Instruments OMAP</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> # CONFIG_HID_SUPPORT is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='hunk'>@@ -836,7 +839,7 @@ CONFIG_USB_GADGET_ATMEL_USBA=y</div><div class='ctx'> CONFIG_USB_ATMEL_USBA=y</div><div class='ctx'> # CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='ctx'> # CONFIG_USB_GADGET_NET2280 is not set</div><div class='del'>-# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA25X is not set</div><div class='ctx'> # CONFIG_USB_GADGET_M66592 is not set</div><div class='ctx'> # CONFIG_USB_GADGET_PXA27X is not set</div><div class='ctx'> # CONFIG_USB_GADGET_GOKU is not set</div><div class='hunk'>@@ -855,21 +858,24 @@ CONFIG_USB_FILE_STORAGE=m</div><div class='ctx'> CONFIG_USB_G_SERIAL=m</div><div class='ctx'> # CONFIG_USB_MIDI_GADGET is not set</div><div class='ctx'> # CONFIG_USB_G_PRINTER is not set</div><div class='del'>-CONFIG_MMC=m</div><div class='add'>+CONFIG_USB_CDC_COMPOSITE=m</div><div class='add'>+CONFIG_MMC=y</div><div class='ctx'> # CONFIG_MMC_DEBUG is not set</div><div class='ctx'> # CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MMC/SD Card Drivers</div><div class='ctx'> #</div><div class='del'>-CONFIG_MMC_BLOCK=m</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='ctx'> CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='ctx'> # CONFIG_SDIO_UART is not set</div><div class='del'>-CONFIG_MMC_TEST=m</div><div class='add'>+# CONFIG_MMC_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MMC/SD Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MMC_SDHCI is not set</div><div class='add'>+CONFIG_MMC_ATMELMCI=y</div><div class='ctx'> CONFIG_MMC_SPI=m</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> CONFIG_NEW_LEDS=y</div><div class='hunk'>@@ -879,7 +885,9 @@ CONFIG_LEDS_CLASS=m</div><div class='ctx'> # LED drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_LEDS_ATMEL_PWM=m</div><div class='add'>+# CONFIG_LEDS_PCA9532 is not set</div><div class='ctx'> CONFIG_LEDS_GPIO=m</div><div class='add'>+# CONFIG_LEDS_PCA955X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # LED Triggers</div><div class='hunk'>@@ -918,10 +926,13 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_M41T94 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1305 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_MAX6902 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_R9701 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_RS5C348 is not set</div><div class='hunk'>@@ -941,18 +952,31 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_RTC_DRV_AT32AP700X=y</div><div class='add'>+CONFIG_DMADEVICES=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_DW_DMAC=y</div><div class='add'>+CONFIG_DMA_ENGINE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_DMA is not set</div><div class='add'>+CONFIG_DMATEST=m</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='del'>-CONFIG_EXT2_FS=m</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_EXT2_FS_XATTR is not set</div><div class='ctx'> # CONFIG_EXT2_FS_XIP is not set</div><div class='del'>-CONFIG_EXT3_FS=m</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='ctx'> # CONFIG_EXT3_FS_XATTR is not set</div><div class='ctx'> # CONFIG_EXT4DEV_FS is not set</div><div class='del'>-CONFIG_JBD=m</div><div class='add'>+CONFIG_JBD=y</div><div class='ctx'> # CONFIG_JBD_DEBUG is not set</div><div class='ctx'> # CONFIG_REISERFS_FS is not set</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='hunk'>@@ -1018,6 +1042,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> CONFIG_MINIX_FS=m</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1028,13 +1053,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1104,6 +1128,8 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1124,6 +1150,7 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='hunk'>@@ -1188,6 +1215,10 @@ CONFIG_CRYPTO_HMAC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=m</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1228,12 +1259,14 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=m</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> CONFIG_CRC7=m</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_GENERIC_ALLOCATOR=y</div><div class='ctx'> CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='head'>diff --git a/arch/avr32/configs/atstk1003_defconfig b/arch/avr32/configs/atstk1003_defconfig<br/>index 5a4ae6b5d28f..5477ed3183b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/configs/atstk1003_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/configs/atstk1003_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/configs/atstk1003_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/configs/atstk1003_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc3</div><div class='del'>-# Mon May 26 13:33:05 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 15:34:44 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_AVR32=y</div><div class='ctx'> CONFIG_GENERIC_GPIO=y</div><div class='hunk'>@@ -80,10 +80,16 @@ CONFIG_PROFILING=y</div><div class='ctx'> CONFIG_OPROFILE=m</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> CONFIG_KPROBES=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=1</div><div class='hunk'>@@ -93,12 +99,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -132,6 +139,7 @@ CONFIG_BOARD_ATSTK1000=y</div><div class='ctx'> # CONFIG_BOARD_ATSTK1002 is not set</div><div class='ctx'> CONFIG_BOARD_ATSTK1003=y</div><div class='ctx'> # CONFIG_BOARD_ATSTK1004 is not set</div><div class='add'>+# CONFIG_BOARD_ATSTK1006 is not set</div><div class='ctx'> # CONFIG_BOARD_ATSTK100X_CUSTOM is not set</div><div class='ctx'> # CONFIG_BOARD_ATSTK100X_SPI1 is not set</div><div class='ctx'> # CONFIG_BOARD_ATSTK1000_J2_LED is not set</div><div class='hunk'>@@ -152,6 +160,7 @@ CONFIG_PHYS_OFFSET=0x10000000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_QUICKLIST=y</div><div class='ctx'> # CONFIG_HAVE_ARCH_BOOTMEM_NODE is not set</div><div class='ctx'> # CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set</div><div class='ctx'> # CONFIG_NEED_NODE_MEMMAP_SIZE is not set</div><div class='hunk'>@@ -170,6 +179,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=0</div><div class='add'>+CONFIG_NR_QUICK=2</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> # CONFIG_OWNERSHIP_TRACE is not set</div><div class='ctx'> CONFIG_NMI_DEBUGGING=y</div><div class='hunk'>@@ -184,6 +194,12 @@ CONFIG_CMDLINE=""</div><div class='ctx'> #</div><div class='ctx'> # Power management options</div><div class='ctx'> #</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+CONFIG_SUSPEND_FREEZER=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CPU Frequency scaling</div><div class='hunk'>@@ -215,10 +231,6 @@ CONFIG_CPU_FREQ_AT32AP=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -449,6 +461,7 @@ CONFIG_SCSI_WAIT_SCAN=m</div><div class='ctx'> CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_ISCSI_TCP is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=m</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_SATA_PMP is not set</div><div class='hunk'>@@ -458,7 +471,6 @@ CONFIG_PATA_AT32=m</div><div class='ctx'> # CONFIG_PATA_PLATFORM is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -575,21 +587,35 @@ CONFIG_I2C_ALGOBIT=m</div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='ctx'> CONFIG_I2C_GPIO=m</div><div class='ctx'> # CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+CONFIG_AT24=m</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_TPS65010 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='hunk'>@@ -614,27 +640,32 @@ CONFIG_SPI_ATMEL=y</div><div class='ctx'> # CONFIG_SPI_AT25 is not set</div><div class='ctx'> CONFIG_SPI_SPIDEV=m</div><div class='ctx'> # CONFIG_SPI_TLE62X0 is not set</div><div class='del'>-CONFIG_HAVE_GPIO_LIB=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# GPIO Support</div><div class='del'>-#</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='ctx'> # CONFIG_DEBUG_GPIO is not set</div><div class='add'>+CONFIG_GPIO_SYSFS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C GPIO expanders:</div><div class='ctx'> #</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='ctx'> # CONFIG_GPIO_PCA953X is not set</div><div class='ctx'> # CONFIG_GPIO_PCF857X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # SPI GPIO expanders:</div><div class='ctx'> #</div><div class='add'>+# CONFIG_GPIO_MAX7301 is not set</div><div class='ctx'> # CONFIG_GPIO_MCP23S08 is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -653,6 +684,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -684,15 +716,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=m</div><div class='ctx'> CONFIG_SND_TIMER=m</div><div class='ctx'> CONFIG_SND_PCM=m</div><div class='hunk'>@@ -706,37 +730,11 @@ CONFIG_SND_SUPPORT_OLD_API=y</div><div class='ctx'> CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_SND_DUMMY is not set</div><div class='del'>-# CONFIG_SND_MTPAV is not set</div><div class='del'>-# CONFIG_SND_SERIAL_U16550 is not set</div><div class='del'>-# CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_SND_DRIVERS is not set</div><div class='add'>+CONFIG_SND_SPI=y</div><div class='ctx'> CONFIG_SND_AT73C213=m</div><div class='ctx'> CONFIG_SND_AT73C213_TARGET_BITRATE=48000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio for the Texas Instruments OMAP</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> # CONFIG_HID_SUPPORT is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='hunk'>@@ -759,7 +757,7 @@ CONFIG_USB_GADGET_ATMEL_USBA=y</div><div class='ctx'> CONFIG_USB_ATMEL_USBA=y</div><div class='ctx'> # CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='ctx'> # CONFIG_USB_GADGET_NET2280 is not set</div><div class='del'>-# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA25X is not set</div><div class='ctx'> # CONFIG_USB_GADGET_M66592 is not set</div><div class='ctx'> # CONFIG_USB_GADGET_PXA27X is not set</div><div class='ctx'> # CONFIG_USB_GADGET_GOKU is not set</div><div class='hunk'>@@ -778,21 +776,24 @@ CONFIG_USB_FILE_STORAGE=m</div><div class='ctx'> CONFIG_USB_G_SERIAL=m</div><div class='ctx'> # CONFIG_USB_MIDI_GADGET is not set</div><div class='ctx'> # CONFIG_USB_G_PRINTER is not set</div><div class='del'>-CONFIG_MMC=m</div><div class='add'>+CONFIG_USB_CDC_COMPOSITE=m</div><div class='add'>+CONFIG_MMC=y</div><div class='ctx'> # CONFIG_MMC_DEBUG is not set</div><div class='ctx'> # CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MMC/SD Card Drivers</div><div class='ctx'> #</div><div class='del'>-CONFIG_MMC_BLOCK=m</div><div class='del'>-# CONFIG_MMC_BLOCK_BOUNCE is not set</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='ctx'> # CONFIG_SDIO_UART is not set</div><div class='del'>-# CONFIG_MMC_TEST is not set</div><div class='add'>+CONFIG_MMC_TEST=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MMC/SD Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MMC_SDHCI is not set</div><div class='add'>+CONFIG_MMC_ATMELMCI=y</div><div class='ctx'> CONFIG_MMC_SPI=m</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> CONFIG_NEW_LEDS=y</div><div class='hunk'>@@ -802,7 +803,9 @@ CONFIG_LEDS_CLASS=y</div><div class='ctx'> # LED drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_LEDS_ATMEL_PWM=m</div><div class='add'>+# CONFIG_LEDS_PCA9532 is not set</div><div class='ctx'> CONFIG_LEDS_GPIO=y</div><div class='add'>+# CONFIG_LEDS_PCA955X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # LED Triggers</div><div class='hunk'>@@ -841,10 +844,13 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_M41T94 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1305 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_MAX6902 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_R9701 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_RS5C348 is not set</div><div class='hunk'>@@ -864,8 +870,20 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_RTC_DRV_AT32AP700X=y</div><div class='del'>-CONFIG_UIO=m</div><div class='del'>-# CONFIG_UIO_SMX is not set</div><div class='add'>+CONFIG_DMADEVICES=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_DW_DMAC=y</div><div class='add'>+CONFIG_DMA_ENGINE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_DMA is not set</div><div class='add'>+CONFIG_DMATEST=m</div><div class='add'>+# CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='hunk'>@@ -943,6 +961,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1011,6 +1030,8 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1029,6 +1050,7 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='hunk'>@@ -1056,6 +1078,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=m</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> CONFIG_CRC7=m</div><div class='hunk'>@@ -1063,6 +1086,7 @@ CONFIG_CRC7=m</div><div class='ctx'> CONFIG_AUDIT_GENERIC=y</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_GENERIC_ALLOCATOR=y</div><div class='ctx'> CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='head'>diff --git a/arch/avr32/configs/atstk1004_defconfig b/arch/avr32/configs/atstk1004_defconfig<br/>index a0912fb7c92e..69e6c0d08ce8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/configs/atstk1004_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/configs/atstk1004_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/configs/atstk1004_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/configs/atstk1004_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc3</div><div class='del'>-# Mon May 26 13:34:57 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 15:38:56 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_AVR32=y</div><div class='ctx'> CONFIG_GENERIC_GPIO=y</div><div class='hunk'>@@ -69,10 +69,16 @@ CONFIG_SLOB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> # CONFIG_PROC_PAGE_MONITOR is not set</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=1</div><div class='ctx'> # CONFIG_MODULES is not set</div><div class='hunk'>@@ -97,6 +103,7 @@ CONFIG_BOARD_ATSTK1000=y</div><div class='ctx'> # CONFIG_BOARD_ATSTK1002 is not set</div><div class='ctx'> # CONFIG_BOARD_ATSTK1003 is not set</div><div class='ctx'> CONFIG_BOARD_ATSTK1004=y</div><div class='add'>+# CONFIG_BOARD_ATSTK1006 is not set</div><div class='ctx'> # CONFIG_BOARD_ATSTK100X_CUSTOM is not set</div><div class='ctx'> # CONFIG_BOARD_ATSTK100X_SPI1 is not set</div><div class='ctx'> # CONFIG_BOARD_ATSTK1000_J2_LED is not set</div><div class='hunk'>@@ -115,6 +122,7 @@ CONFIG_PHYS_OFFSET=0x10000000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_QUICKLIST=y</div><div class='ctx'> # CONFIG_HAVE_ARCH_BOOTMEM_NODE is not set</div><div class='ctx'> # CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set</div><div class='ctx'> # CONFIG_NEED_NODE_MEMMAP_SIZE is not set</div><div class='hunk'>@@ -133,6 +141,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=0</div><div class='add'>+CONFIG_NR_QUICK=2</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> # CONFIG_OWNERSHIP_TRACE is not set</div><div class='ctx'> # CONFIG_NMI_DEBUGGING is not set</div><div class='hunk'>@@ -147,6 +156,8 @@ CONFIG_CMDLINE=""</div><div class='ctx'> #</div><div class='ctx'> # Power management options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CPU Frequency scaling</div><div class='hunk'>@@ -164,10 +175,6 @@ CONFIG_CMDLINE=""</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -390,24 +397,28 @@ CONFIG_SPI_ATMEL=y</div><div class='ctx'> # CONFIG_SPI_AT25 is not set</div><div class='ctx'> # CONFIG_SPI_SPIDEV is not set</div><div class='ctx'> # CONFIG_SPI_TLE62X0 is not set</div><div class='del'>-CONFIG_HAVE_GPIO_LIB=y</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIO_SYSFS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# GPIO Support</div><div class='add'>+# I2C GPIO expanders:</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# I2C GPIO expanders:</div><div class='add'>+# PCI GPIO expanders:</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI GPIO expanders:</div><div class='ctx'> #</div><div class='add'>+# CONFIG_GPIO_MAX7301 is not set</div><div class='ctx'> # CONFIG_GPIO_MCP23S08 is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -426,6 +437,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -477,6 +489,9 @@ CONFIG_FB_ATMEL=y</div><div class='ctx'> CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='ctx'> CONFIG_LCD_CLASS_DEVICE=y</div><div class='ctx'> CONFIG_LCD_LTV350QV=y</div><div class='add'>+# CONFIG_LCD_ILI9320 is not set</div><div class='add'>+# CONFIG_LCD_VGG2432A4 is not set</div><div class='add'>+# CONFIG_LCD_PLATFORM is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_CLASS_DEVICE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -484,10 +499,6 @@ CONFIG_LCD_LTV350QV=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='ctx'> # CONFIG_LOGO is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> # CONFIG_USB_ARCH_HAS_HCD is not set</div><div class='hunk'>@@ -507,7 +518,7 @@ CONFIG_USB_GADGET_ATMEL_USBA=y</div><div class='ctx'> CONFIG_USB_ATMEL_USBA=y</div><div class='ctx'> # CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='ctx'> # CONFIG_USB_GADGET_NET2280 is not set</div><div class='del'>-# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA25X is not set</div><div class='ctx'> # CONFIG_USB_GADGET_M66592 is not set</div><div class='ctx'> # CONFIG_USB_GADGET_PXA27X is not set</div><div class='ctx'> # CONFIG_USB_GADGET_GOKU is not set</div><div class='hunk'>@@ -525,6 +536,7 @@ CONFIG_USB_ETH=y</div><div class='ctx'> # CONFIG_USB_G_SERIAL is not set</div><div class='ctx'> # CONFIG_USB_MIDI_GADGET is not set</div><div class='ctx'> # CONFIG_USB_G_PRINTER is not set</div><div class='add'>+# CONFIG_USB_CDC_COMPOSITE is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='hunk'>@@ -547,6 +559,8 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_M41T94 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1305 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_MAX6902 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_R9701 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_RS5C348 is not set</div><div class='hunk'>@@ -566,6 +580,7 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_RTC_DRV_AT32AP700X=y</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -620,6 +635,7 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -638,12 +654,14 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_GENERIC_ALLOCATOR=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='ctx'> CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig<br/>new file mode 100644<br/>index 000000000000..8b6e54c9946a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/configs/atstk1006_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/configs/atstk1006_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1304 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 15:40:26 2008</div><div class='add'>+#</div><div class='add'>+CONFIG_AVR32=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_GENERIC_BUG=y</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+# CONFIG_LOCALVERSION_AUTO is not set</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+CONFIG_RELAY=y</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+# CONFIG_SYSCTL_SYSCALL is not set</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+# CONFIG_COMPAT_BRK is not set</div><div class='add'>+# CONFIG_BASE_FULL is not set</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLUB_DEBUG=y</div><div class='add'>+# CONFIG_SLAB is not set</div><div class='add'>+CONFIG_SLUB=y</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_PROFILING=y</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_OPROFILE=m</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_KPROBES=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+# CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=1</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+# CONFIG_IOSCHED_AS is not set</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+CONFIG_DEFAULT_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type and features</div><div class='add'>+#</div><div class='add'>+CONFIG_TICK_ONESHOT=y</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+CONFIG_SUBARCH_AVR32B=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_PERFORMANCE_COUNTERS=y</div><div class='add'>+CONFIG_PLATFORM_AT32AP=y</div><div class='add'>+CONFIG_CPU_AT32AP700X=y</div><div class='add'>+CONFIG_CPU_AT32AP7000=y</div><div class='add'>+CONFIG_BOARD_ATSTK1000=y</div><div class='add'>+# CONFIG_BOARD_ATNGW100 is not set</div><div class='add'>+# CONFIG_BOARD_ATSTK1002 is not set</div><div class='add'>+# CONFIG_BOARD_ATSTK1003 is not set</div><div class='add'>+# CONFIG_BOARD_ATSTK1004 is not set</div><div class='add'>+CONFIG_BOARD_ATSTK1006=y</div><div class='add'>+# CONFIG_BOARD_ATSTK100X_CUSTOM is not set</div><div class='add'>+# CONFIG_BOARD_ATSTK100X_SPI1 is not set</div><div class='add'>+# CONFIG_BOARD_ATSTK1000_J2_LED is not set</div><div class='add'>+# CONFIG_BOARD_ATSTK1000_J2_LED8 is not set</div><div class='add'>+# CONFIG_BOARD_ATSTK1000_J2_RGB is not set</div><div class='add'>+CONFIG_BOARD_ATSTK1000_EXTDAC=y</div><div class='add'>+CONFIG_LOADER_U_BOOT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Atmel AVR32 AP options</div><div class='add'>+#</div><div class='add'>+# CONFIG_AP700X_32_BIT_SMC is not set</div><div class='add'>+CONFIG_AP700X_16_BIT_SMC=y</div><div class='add'>+# CONFIG_AP700X_8_BIT_SMC is not set</div><div class='add'>+CONFIG_LOAD_ADDRESS=0x10000000</div><div class='add'>+CONFIG_ENTRY_ADDRESS=0x90000000</div><div class='add'>+CONFIG_PHYS_OFFSET=0x10000000</div><div class='add'>+CONFIG_PREEMPT_NONE=y</div><div class='add'>+# CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_QUICKLIST=y</div><div class='add'>+# CONFIG_HAVE_ARCH_BOOTMEM_NODE is not set</div><div class='add'>+# CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set</div><div class='add'>+# CONFIG_NEED_NODE_MEMMAP_SIZE is not set</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+# CONFIG_ARCH_SPARSEMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=0</div><div class='add'>+CONFIG_NR_QUICK=2</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+# CONFIG_OWNERSHIP_TRACE is not set</div><div class='add'>+CONFIG_NMI_DEBUGGING=y</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+CONFIG_HZ_250=y</div><div class='add'>+# CONFIG_HZ_300 is not set</div><div class='add'>+# CONFIG_HZ_1000 is not set</div><div class='add'>+CONFIG_HZ=250</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_CMDLINE=""</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+CONFIG_SUSPEND_FREEZER=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_FREQ=y</div><div class='add'>+CONFIG_CPU_FREQ_TABLE=y</div><div class='add'>+# CONFIG_CPU_FREQ_DEBUG is not set</div><div class='add'>+# CONFIG_CPU_FREQ_STAT is not set</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set</div><div class='add'>+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set</div><div class='add'>+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y</div><div class='add'>+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set</div><div class='add'>+CONFIG_CPU_FREQ_GOV_USERSPACE=y</div><div class='add'>+CONFIG_CPU_FREQ_GOV_ONDEMAND=y</div><div class='add'>+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set</div><div class='add'>+CONFIG_CPU_FREQ_AT32AP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus options</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Executable file formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+CONFIG_PACKET_MMAP=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+CONFIG_XFRM_USER=m</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='add'>+CONFIG_NET_KEY=m</div><div class='add'>+# CONFIG_NET_KEY_MIGRATE is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+# CONFIG_IP_PNP_BOOTP is not set</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+CONFIG_NET_IPIP=m</div><div class='add'>+CONFIG_NET_IPGRE=m</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+CONFIG_INET_AH=m</div><div class='add'>+CONFIG_INET_ESP=m</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+CONFIG_INET_TUNNEL=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=m</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+CONFIG_IPV6=m</div><div class='add'>+# CONFIG_IPV6_PRIVACY is not set</div><div class='add'>+# CONFIG_IPV6_ROUTER_PREF is not set</div><div class='add'>+# CONFIG_IPV6_OPTIMISTIC_DAD is not set</div><div class='add'>+CONFIG_INET6_AH=m</div><div class='add'>+CONFIG_INET6_ESP=m</div><div class='add'>+CONFIG_INET6_IPCOMP=m</div><div class='add'>+# CONFIG_IPV6_MIP6 is not set</div><div class='add'>+CONFIG_INET6_XFRM_TUNNEL=m</div><div class='add'>+CONFIG_INET6_TUNNEL=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_BEET=m</div><div class='add'>+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set</div><div class='add'>+CONFIG_IPV6_SIT=m</div><div class='add'>+CONFIG_IPV6_NDISC_NODETYPE=y</div><div class='add'>+CONFIG_IPV6_TUNNEL=m</div><div class='add'>+# CONFIG_IPV6_MULTIPLE_TABLES is not set</div><div class='add'>+# CONFIG_IPV6_MROUTE is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+CONFIG_STP=m</div><div class='add'>+CONFIG_BRIDGE=m</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+CONFIG_LLC=m</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_NET_TCPPROBE is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+# CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_DEBUG_DEVRES is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+# CONFIG_MTD_CFI_ADV_OPTIONS is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_CFI_INTELEXT is not set</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+CONFIG_MTD_PHYSMAP=y</div><div class='add'>+CONFIG_MTD_PHYSMAP_START=0x8000000</div><div class='add'>+CONFIG_MTD_PHYSMAP_LEN=0x0</div><div class='add'>+CONFIG_MTD_PHYSMAP_BANKWIDTH=2</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_DATAFLASH=m</div><div class='add'>+CONFIG_MTD_M25P80=m</div><div class='add'>+CONFIG_M25PXX_USE_FAST_READ=y</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+CONFIG_MTD_NAND=y</div><div class='add'>+# CONFIG_MTD_NAND_VERIFY_WRITE is not set</div><div class='add'>+# CONFIG_MTD_NAND_ECC_SMC is not set</div><div class='add'>+# CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='add'>+CONFIG_MTD_NAND_IDS=y</div><div class='add'>+# CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='add'>+CONFIG_MTD_NAND_ATMEL=y</div><div class='add'>+CONFIG_MTD_NAND_ATMEL_ECC_HW=y</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_ECC_SOFT is not set</div><div class='add'>+# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set</div><div class='add'>+# CONFIG_MTD_NAND_NANDSIM is not set</div><div class='add'>+# CONFIG_MTD_NAND_PLATFORM is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_UBI=y</div><div class='add'>+CONFIG_MTD_UBI_WL_THRESHOLD=4096</div><div class='add'>+CONFIG_MTD_UBI_BEB_RESERVE=1</div><div class='add'>+# CONFIG_MTD_UBI_GLUEBI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI debugging options</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI_DEBUG is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=m</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+CONFIG_BLK_DEV_NBD=m</div><div class='add'>+CONFIG_BLK_DEV_RAM=m</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+CONFIG_ATMEL_PWM=m</div><div class='add'>+CONFIG_ATMEL_TCLIB=y</div><div class='add'>+CONFIG_ATMEL_TCB_CLKSRC=y</div><div class='add'>+CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+CONFIG_ATMEL_SSC=m</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HAVE_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=m</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_SCSI_PROC_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=m</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+CONFIG_BLK_DEV_SR=m</div><div class='add'>+# CONFIG_BLK_DEV_SR_VENDOR is not set</div><div class='add'>+# CONFIG_CHR_DEV_SG is not set</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_LOWLEVEL is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='add'>+CONFIG_ATA=m</div><div class='add'>+# CONFIG_ATA_NONSTANDARD is not set</div><div class='add'>+# CONFIG_SATA_PMP is not set</div><div class='add'>+CONFIG_ATA_SFF=y</div><div class='add'>+# CONFIG_SATA_MV is not set</div><div class='add'>+CONFIG_PATA_AT32=m</div><div class='add'>+# CONFIG_PATA_PLATFORM is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+CONFIG_TUN=m</div><div class='add'>+# CONFIG_VETH is not set</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+# CONFIG_VITESSE_PHY is not set</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='add'>+# CONFIG_BROADCOM_PHY is not set</div><div class='add'>+# CONFIG_ICPLUS_PHY is not set</div><div class='add'>+# CONFIG_REALTEK_PHY is not set</div><div class='add'>+# CONFIG_FIXED_PHY is not set</div><div class='add'>+# CONFIG_MDIO_BITBANG is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+# CONFIG_MII is not set</div><div class='add'>+CONFIG_MACB=y</div><div class='add'>+# CONFIG_ENC28J60 is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+# CONFIG_NETDEV_1000 is not set</div><div class='add'>+# CONFIG_NETDEV_10000 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+CONFIG_PPP=m</div><div class='add'>+# CONFIG_PPP_MULTILINK is not set</div><div class='add'>+# CONFIG_PPP_FILTER is not set</div><div class='add'>+CONFIG_PPP_ASYNC=m</div><div class='add'>+# CONFIG_PPP_SYNC_TTY is not set</div><div class='add'>+CONFIG_PPP_DEFLATE=m</div><div class='add'>+CONFIG_PPP_BSDCOMP=m</div><div class='add'>+# CONFIG_PPP_MPPE is not set</div><div class='add'>+# CONFIG_PPPOE is not set</div><div class='add'>+# CONFIG_PPPOL2TP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+CONFIG_SLHC=m</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+# CONFIG_PHONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=m</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+CONFIG_INPUT_POLLDEV=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=m</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=m</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+# CONFIG_KEYBOARD_ATKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_GPIO=m</div><div class='add'>+CONFIG_INPUT_MOUSE=y</div><div class='add'>+# CONFIG_MOUSE_PS2 is not set</div><div class='add'>+# CONFIG_MOUSE_SERIAL is not set</div><div class='add'>+# CONFIG_MOUSE_VSXXXAA is not set</div><div class='add'>+CONFIG_MOUSE_GPIO=m</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+# CONFIG_DEVKMEM is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_ATMEL=y</div><div class='add'>+CONFIG_SERIAL_ATMEL_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_ATMEL_PDC=y</div><div class='add'>+# CONFIG_SERIAL_ATMEL_TTYAT is not set</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=m</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=m</div><div class='add'>+CONFIG_I2C_ALGOBIT=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_GPIO=m</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+# CONFIG_SPI_DEBUG is not set</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Master Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI_ATMEL=y</div><div class='add'>+# CONFIG_SPI_BITBANG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Protocol Masters</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_AT25 is not set</div><div class='add'>+CONFIG_SPI_SPIDEV=m</div><div class='add'>+# CONFIG_SPI_TLE62X0 is not set</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_DEBUG_GPIO is not set</div><div class='add'>+CONFIG_GPIO_SYSFS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='add'>+# CONFIG_GPIO_PCA953X is not set</div><div class='add'>+# CONFIG_GPIO_PCF857X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX7301 is not set</div><div class='add'>+# CONFIG_GPIO_MCP23S08 is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+# CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+CONFIG_AT32AP700X_WDT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_DAB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=y</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=y</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='add'>+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_FOREIGN_ENDIAN is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+CONFIG_FB_ATMEL=y</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='add'>+CONFIG_LCD_CLASS_DEVICE=y</div><div class='add'>+CONFIG_LCD_LTV350QV=y</div><div class='add'>+# CONFIG_LCD_ILI9320 is not set</div><div class='add'>+# CONFIG_LCD_VGG2432A4 is not set</div><div class='add'>+# CONFIG_LCD_PLATFORM is not set</div><div class='add'>+# CONFIG_BACKLIGHT_CLASS_DEVICE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_LOGO is not set</div><div class='add'>+CONFIG_SOUND=m</div><div class='add'>+CONFIG_SND=m</div><div class='add'>+CONFIG_SND_TIMER=m</div><div class='add'>+CONFIG_SND_PCM=m</div><div class='add'>+# CONFIG_SND_SEQUENCER is not set</div><div class='add'>+CONFIG_SND_OSSEMUL=y</div><div class='add'>+CONFIG_SND_MIXER_OSS=m</div><div class='add'>+CONFIG_SND_PCM_OSS=m</div><div class='add'>+CONFIG_SND_PCM_OSS_PLUGINS=y</div><div class='add'>+# CONFIG_SND_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_SND_SUPPORT_OLD_API is not set</div><div class='add'>+# CONFIG_SND_VERBOSE_PROCFS is not set</div><div class='add'>+# CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='add'>+# CONFIG_SND_DEBUG is not set</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='add'>+# CONFIG_SND_DUMMY is not set</div><div class='add'>+# CONFIG_SND_MTPAV is not set</div><div class='add'>+# CONFIG_SND_SERIAL_U16550 is not set</div><div class='add'>+# CONFIG_SND_MPU401 is not set</div><div class='add'>+CONFIG_SND_SPI=y</div><div class='add'>+CONFIG_SND_AT73C213=m</div><div class='add'>+CONFIG_SND_AT73C213_TARGET_BITRATE=48000</div><div class='add'>+# CONFIG_SND_SOC is not set</div><div class='add'>+# CONFIG_SOUND_PRIME is not set</div><div class='add'>+# CONFIG_HID_SUPPORT is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_HCD is not set</div><div class='add'>+# CONFIG_USB_ARCH_HAS_OHCI is not set</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_GADGET=y</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG is not set</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG_FILES is not set</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG_FS is not set</div><div class='add'>+CONFIG_USB_GADGET_SELECTED=y</div><div class='add'>+# CONFIG_USB_GADGET_AMD5536UDC is not set</div><div class='add'>+CONFIG_USB_GADGET_ATMEL_USBA=y</div><div class='add'>+CONFIG_USB_ATMEL_USBA=y</div><div class='add'>+# CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='add'>+# CONFIG_USB_GADGET_NET2280 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA25X is not set</div><div class='add'>+# CONFIG_USB_GADGET_M66592 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA27X is not set</div><div class='add'>+# CONFIG_USB_GADGET_GOKU is not set</div><div class='add'>+# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='add'>+# CONFIG_USB_GADGET_OMAP is not set</div><div class='add'>+# CONFIG_USB_GADGET_S3C2410 is not set</div><div class='add'>+# CONFIG_USB_GADGET_AT91 is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUMMY_HCD is not set</div><div class='add'>+CONFIG_USB_GADGET_DUALSPEED=y</div><div class='add'>+CONFIG_USB_ZERO=m</div><div class='add'>+CONFIG_USB_ETH=m</div><div class='add'>+CONFIG_USB_ETH_RNDIS=y</div><div class='add'>+CONFIG_USB_GADGETFS=m</div><div class='add'>+CONFIG_USB_FILE_STORAGE=m</div><div class='add'>+# CONFIG_USB_FILE_STORAGE_TEST is not set</div><div class='add'>+CONFIG_USB_G_SERIAL=m</div><div class='add'>+# CONFIG_USB_MIDI_GADGET is not set</div><div class='add'>+# CONFIG_USB_G_PRINTER is not set</div><div class='add'>+# CONFIG_USB_CDC_COMPOSITE is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+# CONFIG_SDIO_UART is not set</div><div class='add'>+# CONFIG_MMC_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC_SDHCI is not set</div><div class='add'>+CONFIG_MMC_ATMELMCI=y</div><div class='add'>+CONFIG_MMC_SPI=m</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='add'>+CONFIG_NEW_LEDS=y</div><div class='add'>+CONFIG_LEDS_CLASS=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_LEDS_ATMEL_PWM=m</div><div class='add'>+# CONFIG_LEDS_PCA9532 is not set</div><div class='add'>+CONFIG_LEDS_GPIO=m</div><div class='add'>+# CONFIG_LEDS_PCA955X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+CONFIG_LEDS_TRIGGERS=y</div><div class='add'>+CONFIG_LEDS_TRIGGER_TIMER=m</div><div class='add'>+CONFIG_LEDS_TRIGGER_HEARTBEAT=m</div><div class='add'>+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1374 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M41T80 is not set</div><div class='add'>+# CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_M41T94 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1305 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6902 is not set</div><div class='add'>+# CONFIG_RTC_DRV_R9701 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C348 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_DRV_AT32AP700X=y</div><div class='add'>+CONFIG_DMADEVICES=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_DW_DMAC=y</div><div class='add'>+CONFIG_DMA_ENGINE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_DMA is not set</div><div class='add'>+CONFIG_DMATEST=m</div><div class='add'>+# CONFIG_UIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=m</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=m</div><div class='add'>+# CONFIG_EXT3_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=m</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+CONFIG_FUSE_FS=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=m</div><div class='add'>+CONFIG_MSDOS_FS=m</div><div class='add'>+CONFIG_VFAT_FS=m</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+# CONFIG_JFFS2_FS_WRITEBUFFER is not set</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+# CONFIG_JFFS2_LZO is not set</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+CONFIG_UBIFS_FS=y</div><div class='add'>+CONFIG_UBIFS_FS_XATTR=y</div><div class='add'>+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set</div><div class='add'>+CONFIG_UBIFS_FS_LZO=y</div><div class='add'>+CONFIG_UBIFS_FS_ZLIB=y</div><div class='add'>+# CONFIG_UBIFS_FS_DEBUG is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+CONFIG_MINIX_FS=m</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+CONFIG_NLS=m</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=m</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+CONFIG_NLS_ISO8859_1=m</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+CONFIG_NLS_UTF8=m</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+CONFIG_DEBUG_FS=y</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_DEBUG_SHIRQ is not set</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='add'>+CONFIG_SCHED_DEBUG=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='add'>+# CONFIG_SLUB_DEBUG_ON is not set</div><div class='add'>+# CONFIG_SLUB_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_DEBUG_LIST is not set</div><div class='add'>+# CONFIG_DEBUG_SG is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_KPROBES_SANITY_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='add'>+# CONFIG_LKDTM is not set</div><div class='add'>+# CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_AEAD=m</div><div class='add'>+CONFIG_CRYPTO_BLKCIPHER=m</div><div class='add'>+CONFIG_CRYPTO_HASH=m</div><div class='add'>+CONFIG_CRYPTO_MANAGER=m</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+CONFIG_CRYPTO_AUTHENC=m</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=m</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+# CONFIG_CRYPTO_ECB is not set</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_HMAC=m</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+CONFIG_CRYPTO_MD5=m</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='add'>+CONFIG_CRYPTO_SHA1=m</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=m</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_DEFLATE=y</div><div class='add'>+CONFIG_CRYPTO_LZO=y</div><div class='add'>+# CONFIG_CRYPTO_HW is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='add'>+# CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='add'>+CONFIG_CRC_CCITT=m</div><div class='add'>+CONFIG_CRC16=y</div><div class='add'>+CONFIG_CRC_T10DIF=m</div><div class='add'>+CONFIG_CRC_ITU_T=m</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+CONFIG_CRC7=m</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_LZO_COMPRESS=y</div><div class='add'>+CONFIG_LZO_DECOMPRESS=y</div><div class='add'>+CONFIG_GENERIC_ALLOCATOR=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/include/asm-avr32/Kbuild b/arch/avr32/include/asm/Kbuild<br/>index 3136628ba8d2..3136628ba8d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/Kbuild?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/Kbuild</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/Kbuild</a></div><div class='head'>diff --git a/include/asm-avr32/a.out.h b/arch/avr32/include/asm/a.out.h<br/>index e46375a34a72..e46375a34a72 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/a.out.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/a.out.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/a.out.h</a></div><div class='head'>diff --git a/include/asm-avr32/addrspace.h b/arch/avr32/include/asm/addrspace.h<br/>index 366794858ec7..366794858ec7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/addrspace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/addrspace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/addrspace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/addrspace.h</a></div><div class='head'>diff --git a/include/asm-avr32/asm.h b/arch/avr32/include/asm/asm.h<br/>index a2c64f404b98..a2c64f404b98 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/asm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/asm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/asm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/asm.h</a></div><div class='head'>diff --git a/include/asm-avr32/atmel-mci.h b/arch/avr32/include/asm/atmel-mci.h<br/>index c2ea6e1c9aa1..c2ea6e1c9aa1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/atmel-mci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/atmel-mci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/atmel-mci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/atmel-mci.h</a></div><div class='head'>diff --git a/include/asm-avr32/atomic.h b/arch/avr32/include/asm/atomic.h<br/>index 7ef3862a73d0..7ef3862a73d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/atomic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/atomic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/atomic.h</a></div><div class='head'>diff --git a/include/asm-avr32/auxvec.h b/arch/avr32/include/asm/auxvec.h<br/>index d5dd435bf8f4..d5dd435bf8f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/auxvec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/auxvec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/auxvec.h</a></div><div class='head'>diff --git a/include/asm-avr32/bitops.h b/arch/avr32/include/asm/bitops.h<br/>index 1a50b69b1a19..1a50b69b1a19 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/bitops.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/bitops.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/bitops.h</a></div><div class='head'>diff --git a/include/asm-avr32/bug.h b/arch/avr32/include/asm/bug.h<br/>index 331d45bab18f..331d45bab18f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/bug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/bug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/bug.h</a></div><div class='head'>diff --git a/include/asm-avr32/bugs.h b/arch/avr32/include/asm/bugs.h<br/>index 7635e770622e..7635e770622e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/bugs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/bugs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/bugs.h</a></div><div class='head'>diff --git a/include/asm-avr32/byteorder.h b/arch/avr32/include/asm/byteorder.h<br/>index d77b48ba7338..d77b48ba7338 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/byteorder.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/byteorder.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/byteorder.h</a></div><div class='head'>diff --git a/include/asm-avr32/cache.h b/arch/avr32/include/asm/cache.h<br/>index d3cf35ab11ab..d3cf35ab11ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/cache.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/cache.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/cache.h</a></div><div class='head'>diff --git a/include/asm-avr32/cachectl.h b/arch/avr32/include/asm/cachectl.h<br/>index 4faf1ce60061..4faf1ce60061 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/cachectl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/cachectl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/cachectl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/cachectl.h</a></div><div class='head'>diff --git a/include/asm-avr32/cacheflush.h b/arch/avr32/include/asm/cacheflush.h<br/>index 670674749b20..670674749b20 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/cacheflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/cacheflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/cacheflush.h</a></div><div class='head'>diff --git a/include/asm-avr32/checksum.h b/arch/avr32/include/asm/checksum.h<br/>index 4ddbfd2486af..4ddbfd2486af 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/checksum.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/checksum.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/checksum.h</a></div><div class='head'>diff --git a/include/asm-avr32/cputime.h b/arch/avr32/include/asm/cputime.h<br/>index e87e0f81cbeb..e87e0f81cbeb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/cputime.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/cputime.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/cputime.h</a></div><div class='head'>diff --git a/include/asm-avr32/current.h b/arch/avr32/include/asm/current.h<br/>index c7b0549eab8a..c7b0549eab8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/current.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/current.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/current.h</a></div><div class='head'>diff --git a/include/asm-avr32/delay.h b/arch/avr32/include/asm/delay.h<br/>index a0ed9a9839a5..a0ed9a9839a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/delay.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/delay.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/delay.h</a></div><div class='head'>diff --git a/include/asm-avr32/device.h b/arch/avr32/include/asm/device.h<br/>index d8f9872b0e2d..d8f9872b0e2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/device.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/device.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/device.h</a></div><div class='head'>diff --git a/include/asm-avr32/div64.h b/arch/avr32/include/asm/div64.h<br/>index d7ddd4fdeca6..d7ddd4fdeca6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/div64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/div64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/div64.h</a></div><div class='head'>diff --git a/include/asm-avr32/dma-mapping.h b/arch/avr32/include/asm/dma-mapping.h<br/>index 0399359ab5d8..0399359ab5d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/dma-mapping.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/dma-mapping.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/dma-mapping.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/dma-mapping.h</a></div><div class='head'>diff --git a/include/asm-avr32/dma.h b/arch/avr32/include/asm/dma.h<br/>index 9e91205590ac..9e91205590ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/dma.h</a></div><div class='head'>diff --git a/include/asm-avr32/elf.h b/arch/avr32/include/asm/elf.h<br/>index 64ce40ee1d58..64ce40ee1d58 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/elf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/elf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/elf.h</a></div><div class='head'>diff --git a/include/asm-avr32/emergency-restart.h b/arch/avr32/include/asm/emergency-restart.h<br/>index 3e7e014776ba..3e7e014776ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/emergency-restart.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/emergency-restart.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/emergency-restart.h</a></div><div class='head'>diff --git a/include/asm-avr32/errno.h b/arch/avr32/include/asm/errno.h<br/>index 558a7249f06d..558a7249f06d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/errno.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/errno.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/errno.h</a></div><div class='head'>diff --git a/include/asm-avr32/fb.h b/arch/avr32/include/asm/fb.h<br/>index 41baf84ad402..41baf84ad402 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/fb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/fb.h</a></div><div class='head'>diff --git a/include/asm-avr32/fcntl.h b/arch/avr32/include/asm/fcntl.h<br/>index 14c0c4402b11..14c0c4402b11 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/fcntl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/fcntl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/fcntl.h</a></div><div class='head'>diff --git a/include/asm-avr32/futex.h b/arch/avr32/include/asm/futex.h<br/>index 10419f14a68a..10419f14a68a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/futex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/futex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/futex.h</a></div><div class='head'>diff --git a/include/asm-avr32/gpio.h b/arch/avr32/include/asm/gpio.h<br/>index 19e8ccc77db3..b771f7105964 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/gpio.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #ifndef __ASM_AVR32_GPIO_H</div><div class='ctx'> #define __ASM_AVR32_GPIO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_AVR32_GPIO_H */</div><div class='head'>diff --git a/include/asm-avr32/hardirq.h b/arch/avr32/include/asm/hardirq.h<br/>index 267354356f60..267354356f60 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/hardirq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/hardirq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/hardirq.h</a></div><div class='head'>diff --git a/include/asm-avr32/hw_irq.h b/arch/avr32/include/asm/hw_irq.h<br/>index 218b0a6bfd1b..218b0a6bfd1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/hw_irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/hw_irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/hw_irq.h</a></div><div class='head'>diff --git a/include/asm-avr32/io.h b/arch/avr32/include/asm/io.h<br/>index 8be7ea9c9047..a520f77ead96 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/io.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/io.h&gt;</div><div class='add'>+#include &lt;mach/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* virt_to_phys will only work when address is in P1 or P2 */</div><div class='ctx'> static __inline__ unsigned long virt_to_phys(volatile void *address)</div><div class='head'>diff --git a/include/asm-avr32/ioctl.h b/arch/avr32/include/asm/ioctl.h<br/>index c8472c1398ef..c8472c1398ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/ioctl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/ioctl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/ioctl.h</a></div><div class='head'>diff --git a/include/asm-avr32/ioctls.h b/arch/avr32/include/asm/ioctls.h<br/>index 0cf2c0a4502b..0cf2c0a4502b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/ioctls.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/ioctls.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/ioctls.h</a></div><div class='head'>diff --git a/include/asm-avr32/ipcbuf.h b/arch/avr32/include/asm/ipcbuf.h<br/>index 1552c9698f5e..1552c9698f5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/ipcbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/ipcbuf.h</a></div><div class='head'>diff --git a/include/asm-avr32/irq.h b/arch/avr32/include/asm/irq.h<br/>index c563b7720c1a..6fa8913f8548 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/irq.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> #define NR_INTERNAL_IRQS	64</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/irq.h&gt;</div><div class='add'>+#include &lt;mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef NR_IRQS</div><div class='ctx'> #define NR_IRQS			(NR_INTERNAL_IRQS)</div><div class='head'>diff --git a/include/asm-avr32/irq_regs.h b/arch/avr32/include/asm/irq_regs.h<br/>index 3dd9c0b70270..3dd9c0b70270 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/irq_regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/irq_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/irq_regs.h</a></div><div class='head'>diff --git a/include/asm-avr32/irqflags.h b/arch/avr32/include/asm/irqflags.h<br/>index 93570daac38a..93570daac38a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/irqflags.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/irqflags.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/irqflags.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/irqflags.h</a></div><div class='head'>diff --git a/include/asm-avr32/kdebug.h b/arch/avr32/include/asm/kdebug.h<br/>index ca4f9542365a..ca4f9542365a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/kdebug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/kdebug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/kdebug.h</a></div><div class='head'>diff --git a/include/asm-avr32/kmap_types.h b/arch/avr32/include/asm/kmap_types.h<br/>index b7f5c6870107..b7f5c6870107 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/kmap_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/kmap_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/kmap_types.h</a></div><div class='head'>diff --git a/include/asm-avr32/kprobes.h b/arch/avr32/include/asm/kprobes.h<br/>index 996cb656474e..996cb656474e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/kprobes.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/kprobes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/kprobes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/kprobes.h</a></div><div class='head'>diff --git a/include/asm-avr32/linkage.h b/arch/avr32/include/asm/linkage.h<br/>index f7b285e910d4..f7b285e910d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/linkage.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/linkage.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/linkage.h</a></div><div class='head'>diff --git a/include/asm-avr32/local.h b/arch/avr32/include/asm/local.h<br/>index 1c1619694da3..1c1619694da3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/local.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/local.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/local.h</a></div><div class='head'>diff --git a/include/asm-arm/mach/serial_at91.h b/arch/avr32/include/asm/mach/serial_at91.h<br/>index 55b317a89061..55b317a89061 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-arm/mach/serial_at91.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-arm/mach/serial_at91.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/mach/serial_at91.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/mach/serial_at91.h</a></div><div class='head'>diff --git a/include/asm-avr32/mman.h b/arch/avr32/include/asm/mman.h<br/>index 648f91e7187a..648f91e7187a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/mman.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/mman.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/mman.h</a></div><div class='head'>diff --git a/include/asm-avr32/mmu.h b/arch/avr32/include/asm/mmu.h<br/>index 60c2d2650d32..60c2d2650d32 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/mmu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/mmu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/mmu.h</a></div><div class='head'>diff --git a/include/asm-avr32/mmu_context.h b/arch/avr32/include/asm/mmu_context.h<br/>index 27ff23407100..27ff23407100 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/mmu_context.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/mmu_context.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/mmu_context.h</a></div><div class='head'>diff --git a/include/asm-avr32/module.h b/arch/avr32/include/asm/module.h<br/>index 451444538a1b..451444538a1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/module.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/module.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/module.h</a></div><div class='head'>diff --git a/include/asm-avr32/msgbuf.h b/arch/avr32/include/asm/msgbuf.h<br/>index ac18bc4da7f7..ac18bc4da7f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/msgbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/msgbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/msgbuf.h</a></div><div class='head'>diff --git a/include/asm-avr32/mutex.h b/arch/avr32/include/asm/mutex.h<br/>index 458c1f7fbc18..458c1f7fbc18 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/mutex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/mutex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/mutex.h</a></div><div class='head'>diff --git a/include/asm-avr32/numnodes.h b/arch/avr32/include/asm/numnodes.h<br/>index 0b864d7ce330..0b864d7ce330 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/numnodes.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/numnodes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/numnodes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/numnodes.h</a></div><div class='head'>diff --git a/include/asm-avr32/ocd.h b/arch/avr32/include/asm/ocd.h<br/>index 6bef09490235..6bef09490235 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/ocd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/ocd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/ocd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/ocd.h</a></div><div class='head'>diff --git a/include/asm-avr32/page.h b/arch/avr32/include/asm/page.h<br/>index f805d1cb11bc..f805d1cb11bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/page.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/page.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/page.h</a></div><div class='head'>diff --git a/include/asm-avr32/param.h b/arch/avr32/include/asm/param.h<br/>index 34bc8d4c3b29..34bc8d4c3b29 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/param.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/param.h</a></div><div class='head'>diff --git a/include/asm-avr32/pci.h b/arch/avr32/include/asm/pci.h<br/>index a32a02372017..a32a02372017 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/pci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/pci.h</a></div><div class='head'>diff --git a/include/asm-avr32/percpu.h b/arch/avr32/include/asm/percpu.h<br/>index 69227b4cd0d4..69227b4cd0d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/percpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/percpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/percpu.h</a></div><div class='head'>diff --git a/include/asm-avr32/pgalloc.h b/arch/avr32/include/asm/pgalloc.h<br/>index 640821323943..640821323943 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/pgalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/pgalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/pgalloc.h</a></div><div class='head'>diff --git a/include/asm-avr32/pgtable-2level.h b/arch/avr32/include/asm/pgtable-2level.h<br/>index 425dd567b5b9..425dd567b5b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/pgtable-2level.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/pgtable-2level.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/pgtable-2level.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/pgtable-2level.h</a></div><div class='head'>diff --git a/include/asm-avr32/pgtable.h b/arch/avr32/include/asm/pgtable.h<br/>index fecdda16f444..fecdda16f444 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/pgtable.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/pgtable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/pgtable.h</a></div><div class='head'>diff --git a/include/asm-avr32/poll.h b/arch/avr32/include/asm/poll.h<br/>index c98509d3149e..c98509d3149e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/poll.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/poll.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/poll.h</a></div><div class='head'>diff --git a/include/asm-avr32/posix_types.h b/arch/avr32/include/asm/posix_types.h<br/>index fe0c0c014389..fe0c0c014389 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/posix_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/posix_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/posix_types.h</a></div><div class='head'>diff --git a/include/asm-avr32/processor.h b/arch/avr32/include/asm/processor.h<br/>index 49a88f5a9d2f..49a88f5a9d2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/processor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/processor.h</a></div><div class='head'>diff --git a/include/asm-avr32/ptrace.h b/arch/avr32/include/asm/ptrace.h<br/>index 9e2d44f4e0fe..9e2d44f4e0fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/ptrace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/ptrace.h</a></div><div class='head'>diff --git a/include/asm-avr32/resource.h b/arch/avr32/include/asm/resource.h<br/>index c6dd101472b1..c6dd101472b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/resource.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/resource.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/resource.h</a></div><div class='head'>diff --git a/include/asm-avr32/scatterlist.h b/arch/avr32/include/asm/scatterlist.h<br/>index 377320e3bd17..377320e3bd17 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/scatterlist.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/scatterlist.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/scatterlist.h</a></div><div class='head'>diff --git a/include/asm-avr32/sections.h b/arch/avr32/include/asm/sections.h<br/>index aa14252e4181..aa14252e4181 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/sections.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/sections.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/sections.h</a></div><div class='head'>diff --git a/include/asm-avr32/sembuf.h b/arch/avr32/include/asm/sembuf.h<br/>index e472216e0c97..e472216e0c97 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/sembuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/sembuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/sembuf.h</a></div><div class='head'>diff --git a/include/asm-avr32/serial.h b/arch/avr32/include/asm/serial.h<br/>index 5ecaebc22b02..5ecaebc22b02 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/serial.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/serial.h</a></div><div class='head'>diff --git a/include/asm-avr32/setup.h b/arch/avr32/include/asm/setup.h<br/>index ff5b7cf6be4d..ff5b7cf6be4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/setup.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/setup.h</a></div><div class='head'>diff --git a/include/asm-avr32/shmbuf.h b/arch/avr32/include/asm/shmbuf.h<br/>index c62fba41739a..c62fba41739a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/shmbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/shmbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/shmbuf.h</a></div><div class='head'>diff --git a/include/asm-avr32/shmparam.h b/arch/avr32/include/asm/shmparam.h<br/>index 3681266c77f7..3681266c77f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/shmparam.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/shmparam.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/shmparam.h</a></div><div class='head'>diff --git a/include/asm-avr32/sigcontext.h b/arch/avr32/include/asm/sigcontext.h<br/>index e04062b5f39f..e04062b5f39f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/sigcontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/sigcontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/sigcontext.h</a></div><div class='head'>diff --git a/include/asm-avr32/siginfo.h b/arch/avr32/include/asm/siginfo.h<br/>index 5ee93f40a8a8..5ee93f40a8a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/siginfo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/siginfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/siginfo.h</a></div><div class='head'>diff --git a/include/asm-avr32/signal.h b/arch/avr32/include/asm/signal.h<br/>index caffefeeba1f..caffefeeba1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/signal.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/signal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/signal.h</a></div><div class='head'>diff --git a/include/asm-avr32/socket.h b/arch/avr32/include/asm/socket.h<br/>index 35863f260929..35863f260929 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/socket.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/socket.h</a></div><div class='head'>diff --git a/include/asm-avr32/sockios.h b/arch/avr32/include/asm/sockios.h<br/>index 0802d742f97d..0802d742f97d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/sockios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/sockios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/sockios.h</a></div><div class='head'>diff --git a/include/asm-avr32/stat.h b/arch/avr32/include/asm/stat.h<br/>index e72881e10230..e72881e10230 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/stat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/stat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/stat.h</a></div><div class='head'>diff --git a/include/asm-avr32/statfs.h b/arch/avr32/include/asm/statfs.h<br/>index 2961bd18c50e..2961bd18c50e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/statfs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/statfs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/statfs.h</a></div><div class='head'>diff --git a/include/asm-avr32/string.h b/arch/avr32/include/asm/string.h<br/>index c91a623cd585..c91a623cd585 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/string.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/string.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/string.h</a></div><div class='head'>diff --git a/include/asm-avr32/sysreg.h b/arch/avr32/include/asm/sysreg.h<br/>index d4e0950170ca..d4e0950170ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/sysreg.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/sysreg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/sysreg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/sysreg.h</a></div><div class='head'>diff --git a/include/asm-avr32/system.h b/arch/avr32/include/asm/system.h<br/>index 9702c2213e1e..9702c2213e1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/system.h</a></div><div class='head'>diff --git a/include/asm-avr32/termbits.h b/arch/avr32/include/asm/termbits.h<br/>index db2daab31fdb..db2daab31fdb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/termbits.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/termbits.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/termbits.h</a></div><div class='head'>diff --git a/include/asm-avr32/termios.h b/arch/avr32/include/asm/termios.h<br/>index 0152aba35154..0152aba35154 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/termios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/termios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/termios.h</a></div><div class='head'>diff --git a/include/asm-avr32/thread_info.h b/arch/avr32/include/asm/thread_info.h<br/>index 294b25f9323d..294b25f9323d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/thread_info.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/thread_info.h</a></div><div class='head'>diff --git a/include/asm-avr32/timex.h b/arch/avr32/include/asm/timex.h<br/>index 187dcf38b210..187dcf38b210 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/timex.h</a></div><div class='head'>diff --git a/include/asm-avr32/tlb.h b/arch/avr32/include/asm/tlb.h<br/>index 5c55f9ce7c7d..5c55f9ce7c7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/tlb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/tlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/tlb.h</a></div><div class='head'>diff --git a/include/asm-avr32/tlbflush.h b/arch/avr32/include/asm/tlbflush.h<br/>index bf90a786f6be..bf90a786f6be 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/tlbflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/tlbflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/tlbflush.h</a></div><div class='head'>diff --git a/include/asm-avr32/topology.h b/arch/avr32/include/asm/topology.h<br/>index 5b766cbb4806..5b766cbb4806 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/topology.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/topology.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/topology.h</a></div><div class='head'>diff --git a/include/asm-avr32/traps.h b/arch/avr32/include/asm/traps.h<br/>index 6a8fb944f414..6a8fb944f414 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/traps.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/traps.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/traps.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/traps.h</a></div><div class='head'>diff --git a/include/asm-avr32/types.h b/arch/avr32/include/asm/types.h<br/>index 9cefda6f534a..9cefda6f534a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/types.h</a></div><div class='head'>diff --git a/include/asm-avr32/uaccess.h b/arch/avr32/include/asm/uaccess.h<br/>index ed092395215e..ed092395215e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/uaccess.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/uaccess.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/uaccess.h</a></div><div class='head'>diff --git a/include/asm-avr32/ucontext.h b/arch/avr32/include/asm/ucontext.h<br/>index ac7259c2a799..ac7259c2a799 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/ucontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/ucontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/ucontext.h</a></div><div class='head'>diff --git a/include/asm-avr32/unaligned.h b/arch/avr32/include/asm/unaligned.h<br/>index 041877290470..041877290470 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/unaligned.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/unaligned.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/unaligned.h</a></div><div class='head'>diff --git a/include/asm-avr32/unistd.h b/arch/avr32/include/asm/unistd.h<br/>index 89861a27543e..89861a27543e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/unistd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/unistd.h</a></div><div class='head'>diff --git a/include/asm-avr32/user.h b/arch/avr32/include/asm/user.h<br/>index 7e9152f81f5e..7e9152f81f5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/user.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/user.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/user.h</a></div><div class='head'>diff --git a/include/asm-avr32/xor.h b/arch/avr32/include/asm/xor.h<br/>index 99c87aa0af4f..99c87aa0af4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/xor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/xor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/xor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/include/asm/xor.h</a></div><div class='head'>diff --git a/arch/avr32/kernel/.gitignore b/arch/avr32/kernel/.gitignore<br/>new file mode 100644<br/>index 000000000000..c5f676c3c224<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/kernel/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/.gitignore</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+vmlinux.lds</div><div class='head'>diff --git a/arch/avr32/kernel/asm-offsets.c b/arch/avr32/kernel/asm-offsets.c<br/>index e4796c67a831..d6a8193a1d2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/kernel/asm-offsets.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/kernel/asm-offsets.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -4,6 +4,8 @@</div><div class='ctx'>  * to extract and format the required data.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> #include &lt;linux/kbuild.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -17,4 +19,8 @@ void foo(void)</div><div class='ctx'> 	OFFSET(TI_rar_saved, thread_info, rar_saved);</div><div class='ctx'> 	OFFSET(TI_rsr_saved, thread_info, rsr_saved);</div><div class='ctx'> 	OFFSET(TI_restart_block, thread_info, restart_block);</div><div class='add'>+	BLANK();</div><div class='add'>+	OFFSET(TSK_active_mm, task_struct, active_mm);</div><div class='add'>+	BLANK();</div><div class='add'>+	OFFSET(MM_pgd, mm_struct, pgd);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/avr32/kernel/avr32_ksyms.c b/arch/avr32/kernel/avr32_ksyms.c<br/>index 84a7d44edc67..11e310c567a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/kernel/avr32_ksyms.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/kernel/avr32_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/kernel/avr32_ksyms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/avr32_ksyms.c</a></div><div class='hunk'>@@ -58,6 +58,7 @@ EXPORT_SYMBOL(find_first_zero_bit);</div><div class='ctx'> EXPORT_SYMBOL(find_next_zero_bit);</div><div class='ctx'> EXPORT_SYMBOL(find_first_bit);</div><div class='ctx'> EXPORT_SYMBOL(find_next_bit);</div><div class='add'>+EXPORT_SYMBOL(generic_find_next_le_bit);</div><div class='ctx'> EXPORT_SYMBOL(generic_find_next_zero_le_bit);</div><div class='ctx'> </div><div class='ctx'> /* I/O primitives (lib/io-*.S) */</div><div class='head'>diff --git a/arch/avr32/kernel/entry-avr32b.S b/arch/avr32/kernel/entry-avr32b.S<br/>index 2b398cae110c..33d49377b8be 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/kernel/entry-avr32b.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/kernel/entry-avr32b.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/kernel/entry-avr32b.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/entry-avr32b.S</a></div><div class='hunk'>@@ -334,9 +334,64 @@ save_full_context_ex:</div><div class='ctx'> </div><div class='ctx'> 	/* Low-level exception handlers */</div><div class='ctx'> handle_critical:</div><div class='add'>+	/*</div><div class='add'>+	 * AT32AP700x errata:</div><div class='add'>+	 *</div><div class='add'>+	 * After a Java stack overflow or underflow trap, any CPU</div><div class='add'>+	 * memory access may cause erratic behavior. This will happen</div><div class='add'>+	 * when the four least significant bits of the JOSP system</div><div class='add'>+	 * register contains any value between 9 and 15 (inclusive).</div><div class='add'>+	 *</div><div class='add'>+	 * Possible workarounds:</div><div class='add'>+	 *   - Don't use the Java Extension Module</div><div class='add'>+	 *   - Ensure that the stack overflow and underflow trap</div><div class='add'>+	 *     handlers do not do any memory access or trigger any</div><div class='add'>+	 *     exceptions before the overflow/underflow condition is</div><div class='add'>+	 *     cleared (by incrementing or decrementing the JOSP)</div><div class='add'>+	 *   - Make sure that JOSP does not contain any problematic</div><div class='add'>+	 *     value before doing any exception or interrupt</div><div class='add'>+	 *     processing.</div><div class='add'>+	 *   - Set up a critical exception handler which writes a</div><div class='add'>+	 *     known-to-be-safe value, e.g. 4, to JOSP before doing</div><div class='add'>+	 *     any further processing.</div><div class='add'>+	 *</div><div class='add'>+	 * We'll use the last workaround for now since we cannot</div><div class='add'>+	 * guarantee that user space processes don't use Java mode.</div><div class='add'>+	 * Non-well-behaving userland will be terminated with extreme</div><div class='add'>+	 * prejudice.</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_CPU_AT32AP700X</div><div class='add'>+	/*</div><div class='add'>+	 * There's a chance we can't touch memory, so temporarily</div><div class='add'>+	 * borrow PTBR to save the stack pointer while we fix things</div><div class='add'>+	 * up...</div><div class='add'>+	 */</div><div class='add'>+	mtsr	SYSREG_PTBR, sp</div><div class='add'>+	mov	sp, 4</div><div class='add'>+	mtsr	SYSREG_JOSP, sp</div><div class='add'>+	mfsr	sp, SYSREG_PTBR</div><div class='add'>+	sub	pc, -2</div><div class='add'>+</div><div class='add'>+	/* Push most of pt_regs on stack. We'll do the rest later */</div><div class='ctx'> 	sub	sp, 4</div><div class='del'>-	stmts	--sp, r0-lr</div><div class='del'>-	rcall	save_full_context_ex</div><div class='add'>+	pushm	r0-r12</div><div class='add'>+</div><div class='add'>+	/* PTBR mirrors current_thread_info()-&gt;task-&gt;active_mm-&gt;pgd */</div><div class='add'>+	get_thread_info r0</div><div class='add'>+	ld.w	r1, r0[TI_task]</div><div class='add'>+	ld.w	r2, r1[TSK_active_mm]</div><div class='add'>+	ld.w	r3, r2[MM_pgd]</div><div class='add'>+	mtsr	SYSREG_PTBR, r3</div><div class='add'>+#else</div><div class='add'>+	sub	sp, 4</div><div class='add'>+	pushm	r0-r12</div><div class='add'>+#endif</div><div class='add'>+	sub	r0, sp, -(14 * 4)</div><div class='add'>+	mov	r1, lr</div><div class='add'>+	mfsr	r2, SYSREG_RAR_EX</div><div class='add'>+	mfsr	r3, SYSREG_RSR_EX</div><div class='add'>+	pushm	r0-r3</div><div class='add'>+</div><div class='ctx'> 	mfsr	r12, SYSREG_ECR</div><div class='ctx'> 	mov	r11, sp</div><div class='ctx'> 	rcall	do_critical_exception</div><div class='head'>diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c<br/>index ff820a9e743a..2c08ac992ac3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/kernel/process.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/kernel/process.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/process.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;asm/sysreg.h&gt;</div><div class='ctx'> #include &lt;asm/ocd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pm.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> void (*pm_power_off)(void) = NULL;</div><div class='ctx'> EXPORT_SYMBOL(pm_power_off);</div><div class='head'>diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c<br/>index ce48c14f4349..d8e623c426c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/kernel/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/kernel/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/setup.c</a></div><div class='hunk'>@@ -26,8 +26,8 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/sysreg.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/init.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern int root_mountflags;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/avr32/kernel/syscall-stubs.S b/arch/avr32/kernel/syscall-stubs.S<br/>index 890286a1e62b..673178e235f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/kernel/syscall-stubs.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/kernel/syscall-stubs.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/kernel/syscall-stubs.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/syscall-stubs.S</a></div><div class='hunk'>@@ -109,3 +109,12 @@ __sys_epoll_pwait:</div><div class='ctx'> 	rcall	sys_epoll_pwait</div><div class='ctx'> 	sub	sp, -4</div><div class='ctx'> 	popm	pc</div><div class='add'>+</div><div class='add'>+	.global __sys_sync_file_range</div><div class='add'>+	.type	__sys_sync_file_range,@function</div><div class='add'>+__sys_sync_file_range:</div><div class='add'>+	pushm	lr</div><div class='add'>+	st.w	--sp, ARG6</div><div class='add'>+	rcall	sys_sync_file_range</div><div class='add'>+	sub	sp, -4</div><div class='add'>+	popm	pc</div><div class='head'>diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S<br/>index 478bda4c4a09..7ee0057613b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/kernel/syscall_table.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/kernel/syscall_table.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/kernel/syscall_table.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/syscall_table.S</a></div><div class='hunk'>@@ -275,7 +275,7 @@ sys_call_table:</div><div class='ctx'> 	.long	sys_set_robust_list</div><div class='ctx'> 	.long	sys_get_robust_list	/* 260 */</div><div class='ctx'> 	.long	__sys_splice</div><div class='del'>-	.long	sys_sync_file_range</div><div class='add'>+	.long	__sys_sync_file_range</div><div class='ctx'> 	.long	sys_tee</div><div class='ctx'> 	.long	sys_vmsplice</div><div class='ctx'> 	.long	__sys_epoll_pwait	/* 265 */</div><div class='head'>diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c<br/>index 7e7f32771ae1..283481d74a5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/kernel/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/kernel/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/time.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sysreg.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pm.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static cycle_t read_cycle_count(void)</div><div class='head'>diff --git a/arch/avr32/kernel/traps.c b/arch/avr32/kernel/traps.c<br/>index b835c4c01368..0d987373bc01 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/kernel/traps.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/kernel/traps.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/kernel/traps.c</a></div><div class='hunk'>@@ -116,15 +116,15 @@ asmlinkage void do_nmi(unsigned long ecr, struct pt_regs *regs)</div><div class='ctx'> 	switch (ret) {</div><div class='ctx'> 	case NOTIFY_OK:</div><div class='ctx'> 	case NOTIFY_STOP:</div><div class='del'>-		return;</div><div class='add'>+		break;</div><div class='ctx'> 	case NOTIFY_BAD:</div><div class='ctx'> 		die("Fatal Non-Maskable Interrupt", regs, SIGINT);</div><div class='ctx'> 	default:</div><div class='add'>+		printk(KERN_ALERT "Got NMI, but nobody cared. Disabling...\n");</div><div class='add'>+		nmi_disable();</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_ALERT "Got NMI, but nobody cared. Disabling...\n");</div><div class='del'>-	nmi_disable();</div><div class='add'>+	nmi_exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> asmlinkage void do_critical_exception(unsigned long ecr, struct pt_regs *regs)</div><div class='head'>diff --git a/arch/avr32/lib/findbit.S b/arch/avr32/lib/findbit.S<br/>index c6b91dee857c..997b33b2288a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/lib/findbit.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/lib/findbit.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/lib/findbit.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/lib/findbit.S</a></div><div class='hunk'>@@ -123,6 +123,36 @@ ENTRY(find_next_bit)</div><div class='ctx'> 	brgt	1b</div><div class='ctx'> 	retal	r11</div><div class='ctx'> </div><div class='add'>+ENTRY(generic_find_next_le_bit)</div><div class='add'>+	lsr	r8, r10, 5</div><div class='add'>+	sub	r9, r11, r10</div><div class='add'>+	retle	r11</div><div class='add'>+</div><div class='add'>+	lsl	r8, 2</div><div class='add'>+	add	r12, r8</div><div class='add'>+	andl	r10, 31, COH</div><div class='add'>+	breq	1f</div><div class='add'>+</div><div class='add'>+	/* offset is not word-aligned. Handle the first (32 - r10) bits */</div><div class='add'>+	ldswp.w	r8, r12[0]</div><div class='add'>+	sub	r12, -4</div><div class='add'>+	lsr	r8, r8, r10</div><div class='add'>+	brne	.L_found</div><div class='add'>+</div><div class='add'>+	/* r9 = r9 - (32 - r10) = r9 + r10 - 32 */</div><div class='add'>+	add	r9, r10</div><div class='add'>+	sub	r9, 32</div><div class='add'>+	retle	r11</div><div class='add'>+</div><div class='add'>+	/* Main loop. offset must be word-aligned */</div><div class='add'>+1:	ldswp.w	r8, r12[0]</div><div class='add'>+	cp.w	r8, 0</div><div class='add'>+	brne	.L_found</div><div class='add'>+	sub	r12, -4</div><div class='add'>+	sub	r9, 32</div><div class='add'>+	brgt	1b</div><div class='add'>+	retal	r11</div><div class='add'>+</div><div class='ctx'> ENTRY(generic_find_next_zero_le_bit)</div><div class='ctx'> 	lsr	r8, r10, 5</div><div class='ctx'> 	sub	r9, r11, r10</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/Makefile b/arch/avr32/mach-at32ap/Makefile<br/>index d5018e2eed25..514c9a9b009a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/mach-at32ap/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/Makefile</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> obj-y				+= pdc.o clock.o intc.o extint.o pio.o hsmc.o</div><div class='add'>+obj-y				+= hmatrix.o</div><div class='ctx'> obj-$(CONFIG_CPU_AT32AP700X)	+= at32ap700x.o pm-at32ap700x.o</div><div class='ctx'> obj-$(CONFIG_CPU_FREQ_AT32AP)	+= cpufreq.o</div><div class='ctx'> obj-$(CONFIG_PM)		+= pm.o</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c<br/>index 1617048c86c5..e01dbe4ebb40 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/at32ap700x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/mach-at32ap/at32ap700x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/at32ap700x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/at32ap700x.c</a></div><div class='hunk'>@@ -20,15 +20,15 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/at32ap700x.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/portmux.h&gt;</div><div class='del'>-#include &lt;asm/arch/sram.h&gt;</div><div class='add'>+#include &lt;mach/at32ap700x.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/hmatrix.h&gt;</div><div class='add'>+#include &lt;mach/portmux.h&gt;</div><div class='add'>+#include &lt;mach/sram.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/atmel_lcdc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "clock.h"</div><div class='del'>-#include "hmatrix.h"</div><div class='ctx'> #include "pio.h"</div><div class='ctx'> #include "pm.h"</div><div class='ctx'> </div><div class='hunk'>@@ -725,7 +725,7 @@ static struct clk pico_clk = {</div><div class='ctx'>  * HMATRIX</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct clk hmatrix_clk = {</div><div class='add'>+struct clk at32_hmatrix_clk = {</div><div class='ctx'> 	.name		= "hmatrix_clk",</div><div class='ctx'> 	.parent		= &amp;pbb_clk,</div><div class='ctx'> 	.mode		= pbb_clk_mode,</div><div class='hunk'>@@ -733,12 +733,6 @@ static struct clk hmatrix_clk = {</div><div class='ctx'> 	.index		= 2,</div><div class='ctx'> 	.users		= 1,</div><div class='ctx'> };</div><div class='del'>-#define HMATRIX_BASE	((void __iomem *)0xfff00800)</div><div class='del'>-</div><div class='del'>-#define hmatrix_readl(reg)					\</div><div class='del'>-	__raw_readl((HMATRIX_BASE) + HMATRIX_##reg)</div><div class='del'>-#define hmatrix_writel(reg,value)				\</div><div class='del'>-	__raw_writel((value), (HMATRIX_BASE) + HMATRIX_##reg)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Set bits in the HMATRIX Special Function Register (SFR) used by the</div><div class='hunk'>@@ -748,13 +742,7 @@ static struct clk hmatrix_clk = {</div><div class='ctx'>  */</div><div class='ctx'> static inline void set_ebi_sfr_bits(u32 mask)</div><div class='ctx'> {</div><div class='del'>-	u32 sfr;</div><div class='del'>-</div><div class='del'>-	clk_enable(&amp;hmatrix_clk);</div><div class='del'>-	sfr = hmatrix_readl(SFR4);</div><div class='del'>-	sfr |= mask;</div><div class='del'>-	hmatrix_writel(SFR4, sfr);</div><div class='del'>-	clk_disable(&amp;hmatrix_clk);</div><div class='add'>+	hmatrix_sfr_set_bits(HMATRIX_SLAVE_EBI, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='hunk'>@@ -1779,7 +1767,7 @@ static int __init at32_init_ide_or_cf(struct platform_device *pdev,</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='ctx'> 		select_peripheral(PE(21), PERIPH_A, 0); /* NCS4   -&gt; OE_N  */</div><div class='del'>-		set_ebi_sfr_bits(HMATRIX_BIT(CS4A));</div><div class='add'>+		hmatrix_sfr_set_bits(HMATRIX_SLAVE_EBI, HMATRIX_EBI_CF0_ENABLE);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 5:</div><div class='ctx'> 		ret = platform_device_add_resources(pdev,</div><div class='hunk'>@@ -1789,7 +1777,7 @@ static int __init at32_init_ide_or_cf(struct platform_device *pdev,</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='ctx'> 		select_peripheral(PE(22), PERIPH_A, 0); /* NCS5   -&gt; OE_N  */</div><div class='del'>-		set_ebi_sfr_bits(HMATRIX_BIT(CS5A));</div><div class='add'>+		hmatrix_sfr_set_bits(HMATRIX_SLAVE_EBI, HMATRIX_EBI_CF1_ENABLE);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1905,7 +1893,7 @@ at32_add_device_nand(unsigned int id, struct atmel_nand_data *data)</div><div class='ctx'> 				sizeof(struct atmel_nand_data)))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	set_ebi_sfr_bits(HMATRIX_BIT(CS3A));</div><div class='add'>+	hmatrix_sfr_set_bits(HMATRIX_SLAVE_EBI, HMATRIX_EBI_NAND_ENABLE);</div><div class='ctx'> 	if (data-&gt;enable_pin)</div><div class='ctx'> 		at32_select_gpio(data-&gt;enable_pin,</div><div class='ctx'> 				AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);</div><div class='hunk'>@@ -2097,7 +2085,7 @@ struct clk *at32_clock_list[] = {</div><div class='ctx'> 	&amp;pbb_clk,</div><div class='ctx'> 	&amp;at32_pm_pclk,</div><div class='ctx'> 	&amp;at32_intc0_pclk,</div><div class='del'>-	&amp;hmatrix_clk,</div><div class='add'>+	&amp;at32_hmatrix_clk,</div><div class='ctx'> 	&amp;ebi_clk,</div><div class='ctx'> 	&amp;hramc_clk,</div><div class='ctx'> 	&amp;sdramc_clk,</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/clock.c b/arch/avr32/mach-at32ap/clock.c<br/>index 4642117cc9ab..6c27ddac5adf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/clock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/mach-at32ap/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/clock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/clock.c</a></div><div class='hunk'>@@ -16,6 +16,8 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/chip.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "clock.h"</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(clk_lock);</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/hmatrix.c b/arch/avr32/mach-at32ap/hmatrix.c<br/>new file mode 100644<br/>index 000000000000..48f5ede77468<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/hmatrix.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/hmatrix.c</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+/*</div><div class='add'>+ * High-Speed Bus Matrix helper functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Atmel Corporation</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/chip.h&gt;</div><div class='add'>+#include &lt;mach/hmatrix.h&gt;</div><div class='add'>+</div><div class='add'>+static inline void __hmatrix_write_reg(unsigned long offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(value, (void __iomem __force *)(HMATRIX_BASE + offset));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 __hmatrix_read_reg(unsigned long offset)</div><div class='add'>+{</div><div class='add'>+	return __raw_readl((void __iomem __force *)(HMATRIX_BASE + offset));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmatrix_write_reg - write HMATRIX configuration register</div><div class='add'>+ * @offset: register offset</div><div class='add'>+ * @value: value to be written to the register at @offset</div><div class='add'>+ */</div><div class='add'>+void hmatrix_write_reg(unsigned long offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	clk_enable(&amp;at32_hmatrix_clk);</div><div class='add'>+	__hmatrix_write_reg(offset, value);</div><div class='add'>+	__hmatrix_read_reg(offset);</div><div class='add'>+	clk_disable(&amp;at32_hmatrix_clk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmatrix_read_reg - read HMATRIX configuration register</div><div class='add'>+ * @offset: register offset</div><div class='add'>+ *</div><div class='add'>+ * Returns the value of the register at @offset.</div><div class='add'>+ */</div><div class='add'>+u32 hmatrix_read_reg(unsigned long offset)</div><div class='add'>+{</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	clk_enable(&amp;at32_hmatrix_clk);</div><div class='add'>+	value = __hmatrix_read_reg(offset);</div><div class='add'>+	clk_disable(&amp;at32_hmatrix_clk);</div><div class='add'>+</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmatrix_sfr_set_bits - set bits in a slave's Special Function Register</div><div class='add'>+ * @slave_id: operate on the SFR belonging to this slave</div><div class='add'>+ * @mask: mask of bits to be set in the SFR</div><div class='add'>+ */</div><div class='add'>+void hmatrix_sfr_set_bits(unsigned int slave_id, u32 mask)</div><div class='add'>+{</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	clk_enable(&amp;at32_hmatrix_clk);</div><div class='add'>+	value = __hmatrix_read_reg(HMATRIX_SFR(slave_id));</div><div class='add'>+	value |= mask;</div><div class='add'>+	__hmatrix_write_reg(HMATRIX_SFR(slave_id), value);</div><div class='add'>+	__hmatrix_read_reg(HMATRIX_SFR(slave_id));</div><div class='add'>+	clk_disable(&amp;at32_hmatrix_clk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmatrix_sfr_set_bits - clear bits in a slave's Special Function Register</div><div class='add'>+ * @slave_id: operate on the SFR belonging to this slave</div><div class='add'>+ * @mask: mask of bits to be cleared in the SFR</div><div class='add'>+ */</div><div class='add'>+void hmatrix_sfr_clear_bits(unsigned int slave_id, u32 mask)</div><div class='add'>+{</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	clk_enable(&amp;at32_hmatrix_clk);</div><div class='add'>+	value = __hmatrix_read_reg(HMATRIX_SFR(slave_id));</div><div class='add'>+	value &amp;= ~mask;</div><div class='add'>+	__hmatrix_write_reg(HMATRIX_SFR(slave_id), value);</div><div class='add'>+	__hmatrix_read_reg(HMATRIX_SFR(slave_id));</div><div class='add'>+	clk_disable(&amp;at32_hmatrix_clk);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/hmatrix.h b/arch/avr32/mach-at32ap/hmatrix.h<br/>deleted file mode 100644<br/>index d10bfb60d68d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/hmatrix.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/mach-at32ap/hmatrix.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,182 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Register definitions for High-Speed Bus Matrix</div><div class='del'>- */</div><div class='del'>-#ifndef __HMATRIX_H</div><div class='del'>-#define __HMATRIX_H</div><div class='del'>-</div><div class='del'>-/* HMATRIX register offsets */</div><div class='del'>-#define HMATRIX_MCFG0				0x0000</div><div class='del'>-#define HMATRIX_MCFG1				0x0004</div><div class='del'>-#define HMATRIX_MCFG2				0x0008</div><div class='del'>-#define HMATRIX_MCFG3				0x000c</div><div class='del'>-#define HMATRIX_MCFG4				0x0010</div><div class='del'>-#define HMATRIX_MCFG5				0x0014</div><div class='del'>-#define HMATRIX_MCFG6				0x0018</div><div class='del'>-#define HMATRIX_MCFG7				0x001c</div><div class='del'>-#define HMATRIX_MCFG8				0x0020</div><div class='del'>-#define HMATRIX_MCFG9				0x0024</div><div class='del'>-#define HMATRIX_MCFG10				0x0028</div><div class='del'>-#define HMATRIX_MCFG11				0x002c</div><div class='del'>-#define HMATRIX_MCFG12				0x0030</div><div class='del'>-#define HMATRIX_MCFG13				0x0034</div><div class='del'>-#define HMATRIX_MCFG14				0x0038</div><div class='del'>-#define HMATRIX_MCFG15				0x003c</div><div class='del'>-#define HMATRIX_SCFG0				0x0040</div><div class='del'>-#define HMATRIX_SCFG1				0x0044</div><div class='del'>-#define HMATRIX_SCFG2				0x0048</div><div class='del'>-#define HMATRIX_SCFG3				0x004c</div><div class='del'>-#define HMATRIX_SCFG4				0x0050</div><div class='del'>-#define HMATRIX_SCFG5				0x0054</div><div class='del'>-#define HMATRIX_SCFG6				0x0058</div><div class='del'>-#define HMATRIX_SCFG7				0x005c</div><div class='del'>-#define HMATRIX_SCFG8				0x0060</div><div class='del'>-#define HMATRIX_SCFG9				0x0064</div><div class='del'>-#define HMATRIX_SCFG10				0x0068</div><div class='del'>-#define HMATRIX_SCFG11				0x006c</div><div class='del'>-#define HMATRIX_SCFG12				0x0070</div><div class='del'>-#define HMATRIX_SCFG13				0x0074</div><div class='del'>-#define HMATRIX_SCFG14				0x0078</div><div class='del'>-#define HMATRIX_SCFG15				0x007c</div><div class='del'>-#define HMATRIX_PRAS0				0x0080</div><div class='del'>-#define HMATRIX_PRBS0				0x0084</div><div class='del'>-#define HMATRIX_PRAS1				0x0088</div><div class='del'>-#define HMATRIX_PRBS1				0x008c</div><div class='del'>-#define HMATRIX_PRAS2				0x0090</div><div class='del'>-#define HMATRIX_PRBS2				0x0094</div><div class='del'>-#define HMATRIX_PRAS3				0x0098</div><div class='del'>-#define HMATRIX_PRBS3				0x009c</div><div class='del'>-#define HMATRIX_PRAS4				0x00a0</div><div class='del'>-#define HMATRIX_PRBS4				0x00a4</div><div class='del'>-#define HMATRIX_PRAS5				0x00a8</div><div class='del'>-#define HMATRIX_PRBS5				0x00ac</div><div class='del'>-#define HMATRIX_PRAS6				0x00b0</div><div class='del'>-#define HMATRIX_PRBS6				0x00b4</div><div class='del'>-#define HMATRIX_PRAS7				0x00b8</div><div class='del'>-#define HMATRIX_PRBS7				0x00bc</div><div class='del'>-#define HMATRIX_PRAS8				0x00c0</div><div class='del'>-#define HMATRIX_PRBS8				0x00c4</div><div class='del'>-#define HMATRIX_PRAS9				0x00c8</div><div class='del'>-#define HMATRIX_PRBS9				0x00cc</div><div class='del'>-#define HMATRIX_PRAS10				0x00d0</div><div class='del'>-#define HMATRIX_PRBS10				0x00d4</div><div class='del'>-#define HMATRIX_PRAS11				0x00d8</div><div class='del'>-#define HMATRIX_PRBS11				0x00dc</div><div class='del'>-#define HMATRIX_PRAS12				0x00e0</div><div class='del'>-#define HMATRIX_PRBS12				0x00e4</div><div class='del'>-#define HMATRIX_PRAS13				0x00e8</div><div class='del'>-#define HMATRIX_PRBS13				0x00ec</div><div class='del'>-#define HMATRIX_PRAS14				0x00f0</div><div class='del'>-#define HMATRIX_PRBS14				0x00f4</div><div class='del'>-#define HMATRIX_PRAS15				0x00f8</div><div class='del'>-#define HMATRIX_PRBS15				0x00fc</div><div class='del'>-#define HMATRIX_MRCR				0x0100</div><div class='del'>-#define HMATRIX_SFR0				0x0110</div><div class='del'>-#define HMATRIX_SFR1				0x0114</div><div class='del'>-#define HMATRIX_SFR2				0x0118</div><div class='del'>-#define HMATRIX_SFR3				0x011c</div><div class='del'>-#define HMATRIX_SFR4				0x0120</div><div class='del'>-#define HMATRIX_SFR5				0x0124</div><div class='del'>-#define HMATRIX_SFR6				0x0128</div><div class='del'>-#define HMATRIX_SFR7				0x012c</div><div class='del'>-#define HMATRIX_SFR8				0x0130</div><div class='del'>-#define HMATRIX_SFR9				0x0134</div><div class='del'>-#define HMATRIX_SFR10				0x0138</div><div class='del'>-#define HMATRIX_SFR11				0x013c</div><div class='del'>-#define HMATRIX_SFR12				0x0140</div><div class='del'>-#define HMATRIX_SFR13				0x0144</div><div class='del'>-#define HMATRIX_SFR14				0x0148</div><div class='del'>-#define HMATRIX_SFR15				0x014c</div><div class='del'>-</div><div class='del'>-/* Bitfields in MCFGx */</div><div class='del'>-#define HMATRIX_ULBT_OFFSET			0</div><div class='del'>-#define HMATRIX_ULBT_SIZE			3</div><div class='del'>-</div><div class='del'>-/* Bitfields in SCFGx */</div><div class='del'>-#define HMATRIX_SLOT_CYCLE_OFFSET		0</div><div class='del'>-#define HMATRIX_SLOT_CYCLE_SIZE			8</div><div class='del'>-#define HMATRIX_DEFMSTR_TYPE_OFFSET		16</div><div class='del'>-#define HMATRIX_DEFMSTR_TYPE_SIZE		2</div><div class='del'>-#define HMATRIX_FIXED_DEFMSTR_OFFSET		18</div><div class='del'>-#define HMATRIX_FIXED_DEFMSTR_SIZE		4</div><div class='del'>-#define HMATRIX_ARBT_OFFSET			24</div><div class='del'>-#define HMATRIX_ARBT_SIZE			2</div><div class='del'>-</div><div class='del'>-/* Bitfields in PRASx */</div><div class='del'>-#define HMATRIX_M0PR_OFFSET			0</div><div class='del'>-#define HMATRIX_M0PR_SIZE			4</div><div class='del'>-#define HMATRIX_M1PR_OFFSET			4</div><div class='del'>-#define HMATRIX_M1PR_SIZE			4</div><div class='del'>-#define HMATRIX_M2PR_OFFSET			8</div><div class='del'>-#define HMATRIX_M2PR_SIZE			4</div><div class='del'>-#define HMATRIX_M3PR_OFFSET			12</div><div class='del'>-#define HMATRIX_M3PR_SIZE			4</div><div class='del'>-#define HMATRIX_M4PR_OFFSET			16</div><div class='del'>-#define HMATRIX_M4PR_SIZE			4</div><div class='del'>-#define HMATRIX_M5PR_OFFSET			20</div><div class='del'>-#define HMATRIX_M5PR_SIZE			4</div><div class='del'>-#define HMATRIX_M6PR_OFFSET			24</div><div class='del'>-#define HMATRIX_M6PR_SIZE			4</div><div class='del'>-#define HMATRIX_M7PR_OFFSET			28</div><div class='del'>-#define HMATRIX_M7PR_SIZE			4</div><div class='del'>-</div><div class='del'>-/* Bitfields in PRBSx */</div><div class='del'>-#define HMATRIX_M8PR_OFFSET			0</div><div class='del'>-#define HMATRIX_M8PR_SIZE			4</div><div class='del'>-#define HMATRIX_M9PR_OFFSET			4</div><div class='del'>-#define HMATRIX_M9PR_SIZE			4</div><div class='del'>-#define HMATRIX_M10PR_OFFSET			8</div><div class='del'>-#define HMATRIX_M10PR_SIZE			4</div><div class='del'>-#define HMATRIX_M11PR_OFFSET			12</div><div class='del'>-#define HMATRIX_M11PR_SIZE			4</div><div class='del'>-#define HMATRIX_M12PR_OFFSET			16</div><div class='del'>-#define HMATRIX_M12PR_SIZE			4</div><div class='del'>-#define HMATRIX_M13PR_OFFSET			20</div><div class='del'>-#define HMATRIX_M13PR_SIZE			4</div><div class='del'>-#define HMATRIX_M14PR_OFFSET			24</div><div class='del'>-#define HMATRIX_M14PR_SIZE			4</div><div class='del'>-#define HMATRIX_M15PR_OFFSET			28</div><div class='del'>-#define HMATRIX_M15PR_SIZE			4</div><div class='del'>-</div><div class='del'>-/* Bitfields in SFR4 */</div><div class='del'>-#define HMATRIX_CS1A_OFFSET			1</div><div class='del'>-#define HMATRIX_CS1A_SIZE			1</div><div class='del'>-#define HMATRIX_CS3A_OFFSET			3</div><div class='del'>-#define HMATRIX_CS3A_SIZE			1</div><div class='del'>-#define HMATRIX_CS4A_OFFSET			4</div><div class='del'>-#define HMATRIX_CS4A_SIZE			1</div><div class='del'>-#define HMATRIX_CS5A_OFFSET			5</div><div class='del'>-#define HMATRIX_CS5A_SIZE			1</div><div class='del'>-#define HMATRIX_DBPUC_OFFSET			8</div><div class='del'>-#define HMATRIX_DBPUC_SIZE			1</div><div class='del'>-</div><div class='del'>-/* Constants for ULBT */</div><div class='del'>-#define HMATRIX_ULBT_INFINITE			0</div><div class='del'>-#define HMATRIX_ULBT_SINGLE			1</div><div class='del'>-#define HMATRIX_ULBT_FOUR_BEAT			2</div><div class='del'>-#define HMATRIX_ULBT_EIGHT_BEAT			3</div><div class='del'>-#define HMATRIX_ULBT_SIXTEEN_BEAT		4</div><div class='del'>-</div><div class='del'>-/* Constants for DEFMSTR_TYPE */</div><div class='del'>-#define HMATRIX_DEFMSTR_TYPE_NO_DEFAULT		0</div><div class='del'>-#define HMATRIX_DEFMSTR_TYPE_LAST_DEFAULT	1</div><div class='del'>-#define HMATRIX_DEFMSTR_TYPE_FIXED_DEFAULT	2</div><div class='del'>-</div><div class='del'>-/* Constants for ARBT */</div><div class='del'>-#define HMATRIX_ARBT_ROUND_ROBIN		0</div><div class='del'>-#define HMATRIX_ARBT_FIXED_PRIORITY		1</div><div class='del'>-</div><div class='del'>-/* Bit manipulation macros */</div><div class='del'>-#define HMATRIX_BIT(name)					\</div><div class='del'>-	(1 &lt;&lt; HMATRIX_##name##_OFFSET)</div><div class='del'>-#define HMATRIX_BF(name,value)					\</div><div class='del'>-	(((value) &amp; ((1 &lt;&lt; HMATRIX_##name##_SIZE) - 1))		\</div><div class='del'>-	 &lt;&lt; HMATRIX_##name##_OFFSET)</div><div class='del'>-#define HMATRIX_BFEXT(name,value)				\</div><div class='del'>-	(((value) &gt;&gt; HMATRIX_##name##_OFFSET)			\</div><div class='del'>-	 &amp; ((1 &lt;&lt; HMATRIX_##name##_SIZE) - 1))</div><div class='del'>-#define HMATRIX_BFINS(name,value,old)				\</div><div class='del'>-	(((old) &amp; ~(((1 &lt;&lt; HMATRIX_##name##_SIZE) - 1)		\</div><div class='del'>-		    &lt;&lt; HMATRIX_##name##_OFFSET))		\</div><div class='del'>-	 | HMATRIX_BF(name,value))</div><div class='del'>-</div><div class='del'>-#endif /* __HMATRIX_H */</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/hsmc.c b/arch/avr32/mach-at32ap/hsmc.c<br/>index b2d9bc61a35c..2875c11be95d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/hsmc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/mach-at32ap/hsmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/hsmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/hsmc.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/smc.h&gt;</div><div class='add'>+#include &lt;mach/smc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "hsmc.h"</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-avr32/arch-at32ap/at32ap700x.h b/arch/avr32/mach-at32ap/include/mach/at32ap700x.h<br/>index d18a3053be0d..1e9852d65cca 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/arch-at32ap/at32ap700x.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/arch-at32ap/at32ap700x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/include/mach/at32ap700x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/at32ap700x.h</a></div><div class='hunk'>@@ -46,4 +46,41 @@</div><div class='ctx'> #define DMAC_DMAREQ_2		9</div><div class='ctx'> #define DMAC_DMAREQ_3		10</div><div class='ctx'> </div><div class='add'>+/* HSB master IDs */</div><div class='add'>+#define HMATRIX_MASTER_CPU_DCACHE		0</div><div class='add'>+#define HMATRIX_MASTER_CPU_ICACHE		1</div><div class='add'>+#define HMATRIX_MASTER_PDC			2</div><div class='add'>+#define HMATRIX_MASTER_ISI			3</div><div class='add'>+#define HMATRIX_MASTER_USBA			4</div><div class='add'>+#define HMATRIX_MASTER_LCDC			5</div><div class='add'>+#define HMATRIX_MASTER_MACB0			6</div><div class='add'>+#define HMATRIX_MASTER_MACB1			7</div><div class='add'>+#define HMATRIX_MASTER_DMACA_M0			8</div><div class='add'>+#define HMATRIX_MASTER_DMACA_M1			9</div><div class='add'>+</div><div class='add'>+/* HSB slave IDs */</div><div class='add'>+#define HMATRIX_SLAVE_SRAM0			0</div><div class='add'>+#define HMATRIX_SLAVE_SRAM1			1</div><div class='add'>+#define HMATRIX_SLAVE_PBA			2</div><div class='add'>+#define HMATRIX_SLAVE_PBB			3</div><div class='add'>+#define HMATRIX_SLAVE_EBI			4</div><div class='add'>+#define HMATRIX_SLAVE_USBA			5</div><div class='add'>+#define HMATRIX_SLAVE_LCDC			6</div><div class='add'>+#define HMATRIX_SLAVE_DMACA			7</div><div class='add'>+</div><div class='add'>+/* Bits in HMATRIX SFR4 (EBI) */</div><div class='add'>+#define HMATRIX_EBI_SDRAM_ENABLE		(1 &lt;&lt; 1)</div><div class='add'>+#define HMATRIX_EBI_NAND_ENABLE			(1 &lt;&lt; 3)</div><div class='add'>+#define HMATRIX_EBI_CF0_ENABLE			(1 &lt;&lt; 4)</div><div class='add'>+#define HMATRIX_EBI_CF1_ENABLE			(1 &lt;&lt; 5)</div><div class='add'>+#define HMATRIX_EBI_PULLUP_DISABLE		(1 &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Base addresses of controllers that may be accessed early by</div><div class='add'>+ * platform code.</div><div class='add'>+ */</div><div class='add'>+#define PM_BASE		0xfff00000</div><div class='add'>+#define HMATRIX_BASE	0xfff00800</div><div class='add'>+#define SDRAMC_BASE	0xfff03800</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_ARCH_AT32AP700X_H__ */</div><div class='head'>diff --git a/include/asm-avr32/arch-at32ap/board.h b/arch/avr32/mach-at32ap/include/mach/board.h<br/>index e60e9076544d..e60e9076544d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/arch-at32ap/board.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/arch-at32ap/board.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/include/mach/board.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/board.h</a></div><div class='head'>diff --git a/arch/avr32/mach-at32ap/include/mach/chip.h b/arch/avr32/mach-at32ap/include/mach/chip.h<br/>new file mode 100644<br/>index 000000000000..5efca6da6acb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/include/mach/chip.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/chip.h</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+/*</div><div class='add'>+ * AVR32 chip-specific definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Atmel Corporation</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef __ASM_AVR32_ARCH_CHIP_H__</div><div class='add'>+#define __ASM_AVR32_ARCH_CHIP_H__</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_AT32AP700X)</div><div class='add'>+# include &lt;mach/at32ap700x.h&gt;</div><div class='add'>+#else</div><div class='add'>+# error Unknown chip type selected</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_AVR32_ARCH_CHIP_H__ */</div><div class='head'>diff --git a/include/asm-avr32/arch-at32ap/cpu.h b/arch/avr32/mach-at32ap/include/mach/cpu.h<br/>index 44d0bfa1f409..44d0bfa1f409 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/arch-at32ap/cpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/arch-at32ap/cpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/include/mach/cpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/cpu.h</a></div><div class='head'>diff --git a/include/asm-avr32/arch-at32ap/gpio.h b/arch/avr32/mach-at32ap/include/mach/gpio.h<br/>index 0180f584ef03..0180f584ef03 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/arch-at32ap/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/arch-at32ap/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/gpio.h</a></div><div class='head'>diff --git a/arch/avr32/mach-at32ap/include/mach/hmatrix.h b/arch/avr32/mach-at32ap/include/mach/hmatrix.h<br/>new file mode 100644<br/>index 000000000000..7a368f227ebc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/include/mach/hmatrix.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/hmatrix.h</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+/*</div><div class='add'>+ * High-Speed Bus Matrix configuration registers</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Atmel Corporation</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef __HMATRIX_H</div><div class='add'>+#define __HMATRIX_H</div><div class='add'>+</div><div class='add'>+extern struct clk at32_hmatrix_clk;</div><div class='add'>+</div><div class='add'>+void hmatrix_write_reg(unsigned long offset, u32 value);</div><div class='add'>+u32 hmatrix_read_reg(unsigned long offset);</div><div class='add'>+</div><div class='add'>+void hmatrix_sfr_set_bits(unsigned int slave_id, u32 mask);</div><div class='add'>+void hmatrix_sfr_clear_bits(unsigned int slave_id, u32 mask);</div><div class='add'>+</div><div class='add'>+/* Master Configuration register */</div><div class='add'>+#define HMATRIX_MCFG(m)			(0x0000 + 4 * (m))</div><div class='add'>+/* Undefined length burst limit */</div><div class='add'>+# define HMATRIX_MCFG_ULBT_INFINITE	0	/* Infinite length */</div><div class='add'>+# define HMATRIX_MCFG_ULBT_SINGLE	1	/* Single Access */</div><div class='add'>+# define HMATRIX_MCFG_ULBT_FOUR_BEAT	2	/* Four beat */</div><div class='add'>+# define HMATRIX_MCFG_ULBT_EIGHT_BEAT	3	/* Eight beat */</div><div class='add'>+# define HMATRIX_MCFG_ULBT_SIXTEEN_BEAT	4	/* Sixteen beat */</div><div class='add'>+</div><div class='add'>+/* Slave Configuration register */</div><div class='add'>+#define HMATRIX_SCFG(s)			(0x0040 + 4 * (s))</div><div class='add'>+# define HMATRIX_SCFG_SLOT_CYCLE(x)	((x) &lt;&lt;  0)	/* Max burst cycles */</div><div class='add'>+# define HMATRIX_SCFG_DEFMSTR_NONE	(  0 &lt;&lt; 16)	/* No default master */</div><div class='add'>+# define HMATRIX_SCFG_DEFMSTR_LAST	(  1 &lt;&lt; 16)	/* Last def master */</div><div class='add'>+# define HMATRIX_SCFG_DEFMSTR_FIXED	(  2 &lt;&lt; 16)	/* Fixed def master */</div><div class='add'>+# define HMATRIX_SCFG_FIXED_DEFMSTR(m)	((m) &lt;&lt; 18)	/* Fixed master ID */</div><div class='add'>+# define HMATRIX_SCFG_ARBT_ROUND_ROBIN	(  0 &lt;&lt; 24)	/* RR arbitration */</div><div class='add'>+# define HMATRIX_SCFG_ARBT_FIXED_PRIO	(  1 &lt;&lt; 24)	/* Fixed priority */</div><div class='add'>+</div><div class='add'>+/* Slave Priority register A (master 0..7) */</div><div class='add'>+#define HMATRIX_PRAS(s)			(0x0080 + 8 * (s))</div><div class='add'>+# define HMATRIX_PRAS_PRIO(m, p)	((p) &lt;&lt; ((m) * 4))</div><div class='add'>+</div><div class='add'>+/* Slave Priority register A (master 8..15) */</div><div class='add'>+#define HMATRIX_PRBS(s)			(0x0084 + 8 * (s))</div><div class='add'>+# define HMATRIX_PRBS_PRIO(m, p)	((p) &lt;&lt; (((m) - 8) * 4))</div><div class='add'>+</div><div class='add'>+/* Master Remap Control Register */</div><div class='add'>+#define HMATRIX_MRCR				0x0100</div><div class='add'>+# define HMATRIX_MRCR_REMAP(m)		(  1 &lt;&lt; (m))	/* Remap master m */</div><div class='add'>+</div><div class='add'>+/* Special Function Register. Bit definitions are chip-specific */</div><div class='add'>+#define HMATRIX_SFR(s)			(0x0110 + 4 * (s))</div><div class='add'>+</div><div class='add'>+#endif /* __HMATRIX_H */</div><div class='head'>diff --git a/include/asm-avr32/arch-at32ap/init.h b/arch/avr32/mach-at32ap/include/mach/init.h<br/>index bc40e3d46150..bc40e3d46150 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/arch-at32ap/init.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/arch-at32ap/init.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/include/mach/init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/init.h</a></div><div class='head'>diff --git a/include/asm-avr32/arch-at32ap/io.h b/arch/avr32/mach-at32ap/include/mach/io.h<br/>index 4ec6abc68ea3..4ec6abc68ea3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/arch-at32ap/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/arch-at32ap/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/include/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/io.h</a></div><div class='head'>diff --git a/include/asm-avr32/arch-at32ap/irq.h b/arch/avr32/mach-at32ap/include/mach/irq.h<br/>index 608e350368c7..608e350368c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/arch-at32ap/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/arch-at32ap/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/include/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/irq.h</a></div><div class='head'>diff --git a/include/asm-avr32/arch-at32ap/pm.h b/arch/avr32/mach-at32ap/include/mach/pm.h<br/>index 979b355b77b6..979b355b77b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/arch-at32ap/pm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/arch-at32ap/pm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/include/mach/pm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/pm.h</a></div><div class='head'>diff --git a/include/asm-avr32/arch-at32ap/portmux.h b/arch/avr32/mach-at32ap/include/mach/portmux.h<br/>index b1abe6b4e4ef..b1abe6b4e4ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/arch-at32ap/portmux.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/arch-at32ap/portmux.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/include/mach/portmux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/portmux.h</a></div><div class='head'>diff --git a/include/asm-avr32/arch-at32ap/smc.h b/arch/avr32/mach-at32ap/include/mach/smc.h<br/>index c98eea44a70a..c98eea44a70a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/arch-at32ap/smc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/arch-at32ap/smc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/include/mach/smc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/smc.h</a></div><div class='head'>diff --git a/include/asm-avr32/arch-at32ap/sram.h b/arch/avr32/mach-at32ap/include/mach/sram.h<br/>index 4838dae7601a..4838dae7601a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-avr32/arch-at32ap/sram.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-avr32/arch-at32ap/sram.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/include/mach/sram.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/include/mach/sram.h</a></div><div class='head'>diff --git a/arch/avr32/mach-at32ap/pio.c b/arch/avr32/mach-at32ap/pio.c<br/>index 296294f8ed81..405ee6bad4ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/pio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/mach-at32ap/pio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/pio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/pio.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/portmux.h&gt;</div><div class='add'>+#include &lt;mach/portmux.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pio.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/avr32/mach-at32ap/pm-at32ap700x.S b/arch/avr32/mach-at32ap/pm-at32ap700x.S<br/>index 0a53ad314ff4..17503b0ed6c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/pm-at32ap700x.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/mach-at32ap/pm-at32ap700x.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/pm-at32ap700x.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/pm-at32ap700x.S</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='del'>-#include &lt;asm/arch/pm.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pm.h"</div><div class='ctx'> #include "sdramc.h"</div><div class='hunk'>@@ -134,7 +134,7 @@ pm_standby:</div><div class='ctx'> 	mov	r11, SDRAMC_LPR_LPCB_SELF_RFR</div><div class='ctx'> 	bfins	r10, r11, 0, 2		/* LPCB &lt;- self Refresh */</div><div class='ctx'> 	sync	0			/* flush write buffer */</div><div class='del'>-	st.w	r12[SDRAMC_LPR], r11	/* put SDRAM in self-refresh mode */</div><div class='add'>+	st.w	r12[SDRAMC_LPR], r10	/* put SDRAM in self-refresh mode */</div><div class='ctx'> 	ld.w	r11, r12[SDRAMC_LPR]</div><div class='ctx'> 	unmask_interrupts</div><div class='ctx'> 	sleep	CPU_SLEEP_FROZEN</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/pm.c b/arch/avr32/mach-at32ap/pm.c<br/>index 0b764320135d..f021edfeaab0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/mach-at32ap/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/pm.c</a></div><div class='hunk'>@@ -14,11 +14,9 @@</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/sysreg.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pm.h&gt;</div><div class='del'>-#include &lt;asm/arch/sram.h&gt;</div><div class='del'>-</div><div class='del'>-/* FIXME: This is only valid for AP7000 */</div><div class='del'>-#define SDRAMC_BASE	0xfff03800</div><div class='add'>+#include &lt;mach/chip.h&gt;</div><div class='add'>+#include &lt;mach/pm.h&gt;</div><div class='add'>+#include &lt;mach/sram.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sdramc.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/avr32/mach-at32ap/pm.h b/arch/avr32/mach-at32ap/pm.h<br/>index 694d521edc2f..532a3732c214 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/pm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/avr32/mach-at32ap/pm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/pm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/avr32/mach-at32ap/pm.h</a></div><div class='hunk'>@@ -4,14 +4,6 @@</div><div class='ctx'> #ifndef __ARCH_AVR32_MACH_AT32AP_PM_H__</div><div class='ctx'> #define __ARCH_AVR32_MACH_AT32AP_PM_H__</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * We can reduce the code size a bit by using a constant here. Since</div><div class='del'>- * this file is only used on AVR32 AP CPUs with segmentation enabled,</div><div class='del'>- * it's safe to not use ioremap. Generic drivers should of course</div><div class='del'>- * never do this.</div><div class='del'>- */</div><div class='del'>-#define AT32_PM_BASE	0xfff00000</div><div class='del'>-</div><div class='ctx'> /* PM register offsets */</div><div class='ctx'> #define PM_MCCTRL				0x0000</div><div class='ctx'> #define PM_CKSEL				0x0004</div><div class='hunk'>@@ -113,8 +105,8 @@</div><div class='ctx'> </div><div class='ctx'> /* Register access macros */</div><div class='ctx'> #define pm_readl(reg)							\</div><div class='del'>-	__raw_readl((void __iomem __force *)AT32_PM_BASE + PM_##reg)</div><div class='add'>+	__raw_readl((void __iomem __force *)PM_BASE + PM_##reg)</div><div class='ctx'> #define pm_writel(reg,value)						\</div><div class='del'>-	__raw_writel((value), (void __iomem __force *)AT32_PM_BASE + PM_##reg)</div><div class='add'>+	__raw_writel((value), (void __iomem __force *)PM_BASE + PM_##reg)</div><div class='ctx'> </div><div class='ctx'> #endif /* __ARCH_AVR32_MACH_AT32AP_PM_H__ */</div><div class='head'>diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig<br/>index 5a097c46bc46..4154ff1101fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/Kconfig</a></div><div class='hunk'>@@ -249,7 +249,7 @@ config MEM_MT48LC8M32B2B5_7</div><div class='ctx'> </div><div class='ctx'> config MEM_MT48LC32M16A2TG_75</div><div class='ctx'> 	bool</div><div class='del'>-	depends on (BFIN527_EZKIT || BFIN532_IP0X)</div><div class='add'>+	depends on (BFIN527_EZKIT || BFIN532_IP0X || BLACKSTAMP)</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> source "arch/blackfin/mach-bf527/Kconfig"</div><div class='hunk'>@@ -292,7 +292,7 @@ config CLKIN_HZ</div><div class='ctx'> 	int "Frequency of the crystal on the board in Hz"</div><div class='ctx'> 	default "11059200" if BFIN533_STAMP</div><div class='ctx'> 	default "27000000" if BFIN533_EZKIT</div><div class='del'>-	default "25000000" if (BFIN537_STAMP || BFIN527_EZKIT || H8606_HVSISTEMAS)</div><div class='add'>+	default "25000000" if (BFIN537_STAMP || BFIN527_EZKIT || H8606_HVSISTEMAS || BLACKSTAMP)</div><div class='ctx'> 	default "30000000" if BFIN561_EZKIT</div><div class='ctx'> 	default "24576000" if PNAV10</div><div class='ctx'> 	default "10000000" if BFIN532_IP0X</div><div class='hunk'>@@ -332,7 +332,7 @@ config VCO_MULT</div><div class='ctx'> 	default "22" if BFIN533_BLUETECHNIX_CM</div><div class='ctx'> 	default "20" if (BFIN537_BLUETECHNIX_CM || BFIN527_BLUETECHNIX_CM || BFIN561_BLUETECHNIX_CM)</div><div class='ctx'> 	default "20" if BFIN561_EZKIT</div><div class='del'>-	default "16" if H8606_HVSISTEMAS</div><div class='add'>+	default "16" if (H8606_HVSISTEMAS || BLACKSTAMP)</div><div class='ctx'> 	help</div><div class='ctx'> 	  This controls the frequency of the on-chip PLL. This can be between 1 and 64.</div><div class='ctx'> 	  PLL Frequency = (Crystal Frequency) * (this setting)</div><div class='hunk'>@@ -622,6 +622,33 @@ config CPLB_SWITCH_TAB_L1</div><div class='ctx'> 	  If enabled, the CPLB Switch Tables are linked</div><div class='ctx'> 	  into L1 data memory. (less latency)</div><div class='ctx'> </div><div class='add'>+comment "Speed Optimizations"</div><div class='add'>+config BFIN_INS_LOWOVERHEAD</div><div class='add'>+	bool "ins[bwl] low overhead, higher interrupt latency"</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Reads on the Blackfin are speculative. In Blackfin terms, this means</div><div class='add'>+	  they can be interrupted at any time (even after they have been issued</div><div class='add'>+	  on to the external bus), and re-issued after the interrupt occurs.</div><div class='add'>+	  For memory - this is not a big deal, since memory does not change if</div><div class='add'>+	  it sees a read.</div><div class='add'>+</div><div class='add'>+	  If a FIFO is sitting on the end of the read, it will see two reads,</div><div class='add'>+	  when the core only sees one since the FIFO receives both the read</div><div class='add'>+	  which is cancelled (and not delivered to the core) and the one which</div><div class='add'>+	  is re-issued (which is delivered to the core).</div><div class='add'>+</div><div class='add'>+	  To solve this, interrupts are turned off before reads occur to</div><div class='add'>+	  I/O space. This option controls which the overhead/latency of</div><div class='add'>+	  controlling interrupts during this time</div><div class='add'>+	   "n" turns interrupts off every read</div><div class='add'>+		(higher overhead, but lower interrupt latency)</div><div class='add'>+	   "y" turns interrupts off every loop</div><div class='add'>+		(low overhead, but longer interrupt latency)</div><div class='add'>+</div><div class='add'>+	  default behavior is to leave this set to on (type "Y"). If you are experiencing</div><div class='add'>+	  interrupt latency issues, it is safe and OK to turn this off.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -828,6 +855,7 @@ menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"</div><div class='ctx'> </div><div class='ctx'> config PCI</div><div class='ctx'> 	bool "PCI support"</div><div class='add'>+	depends on BROKEN</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for PCI bus.</div><div class='ctx'> </div><div class='hunk'>@@ -933,13 +961,6 @@ endchoice</div><div class='ctx'> comment "Possible Suspend Mem / Hibernate Wake-Up Sources"</div><div class='ctx'> 	depends on PM</div><div class='ctx'> </div><div class='del'>-config PM_BFIN_WAKE_RTC</div><div class='del'>-	bool "Allow Wake-Up from RESET and on-chip RTC"</div><div class='del'>-	depends on PM</div><div class='del'>-	default n</div><div class='del'>-	help</div><div class='del'>-	  Enable RTC Wake-Up (Voltage Regulator Power-Up)</div><div class='del'>-</div><div class='ctx'> config PM_BFIN_WAKE_PH6</div><div class='ctx'> 	bool "Allow Wake-Up from on-chip PHY or PH6 GP"</div><div class='ctx'> 	depends on PM &amp;&amp; (BF52x || BF534 || BF536 || BF537)</div><div class='hunk'>@@ -947,41 +968,12 @@ config PM_BFIN_WAKE_PH6</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable PHY and PH6 GP Wake-Up (Voltage Regulator Power-Up)</div><div class='ctx'> </div><div class='del'>-config PM_BFIN_WAKE_CAN</div><div class='del'>-	bool "Allow Wake-Up from on-chip CAN0/1"</div><div class='del'>-	depends on PM &amp;&amp; (BF54x || BF534 || BF536 || BF537)</div><div class='del'>-	default n</div><div class='del'>-	help</div><div class='del'>-	  Enable CAN0/1 Wake-Up (Voltage Regulator Power-Up)</div><div class='del'>-</div><div class='ctx'> config PM_BFIN_WAKE_GP</div><div class='ctx'> 	bool "Allow Wake-Up from GPIOs"</div><div class='ctx'> 	depends on PM &amp;&amp; BF54x</div><div class='ctx'> 	default n</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable General-Purpose Wake-Up (Voltage Regulator Power-Up)</div><div class='del'>-</div><div class='del'>-config PM_BFIN_WAKE_USB</div><div class='del'>-	bool "Allow Wake-Up from on-chip USB"</div><div class='del'>-	depends on PM &amp;&amp; (BF54x || BF52x)</div><div class='del'>-	default n</div><div class='del'>-	help</div><div class='del'>-	  Enable USB Wake-Up (Voltage Regulator Power-Up)</div><div class='del'>-</div><div class='del'>-config PM_BFIN_WAKE_KEYPAD</div><div class='del'>-	bool "Allow Wake-Up from on-chip Keypad"</div><div class='del'>-	depends on PM &amp;&amp; BF54x</div><div class='del'>-	default n</div><div class='del'>-	help</div><div class='del'>-	  Enable Keypad Wake-Up (Voltage Regulator Power-Up)</div><div class='del'>-</div><div class='del'>-config PM_BFIN_WAKE_ROTARY</div><div class='del'>-	bool "Allow Wake-Up from on-chip Rotary"</div><div class='del'>-	depends on PM &amp;&amp; BF54x</div><div class='del'>-	default n</div><div class='del'>-	help</div><div class='del'>-	  Enable Rotary Wake-Up (Voltage Regulator Power-Up)</div><div class='del'>-</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> menu "CPU Frequency scaling"</div><div class='head'>diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile<br/>index 9564731ad3a8..eac0533d6e4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/Makefile</a></div><div class='hunk'>@@ -98,36 +98,20 @@ libs-y   += arch/$(ARCH)/lib/</div><div class='ctx'> </div><div class='ctx'> drivers-$(CONFIG_OPROFILE) += arch/$(ARCH)/oprofile/</div><div class='ctx'> </div><div class='add'>+machdirs	:= $(patsubst %,arch/blackfin/mach-%/, $(machine-y))</div><div class='ctx'> </div><div class='add'>+KBUILD_CFLAGS += -Iarch/$(ARCH)/include/</div><div class='add'>+KBUILD_CFLAGS += -Iarch/$(ARCH)/mach-$(MACHINE)/include</div><div class='ctx'> </div><div class='del'>-#	Update machine arch symlinks if something which affects</div><div class='del'>-#	them changed.  We use .mach to indicate when they were updated</div><div class='del'>-#	last, otherwise make uses the target directory mtime.</div><div class='del'>-</div><div class='del'>-       show_mach_symlink = :</div><div class='del'>- quiet_show_mach_symlink = echo '  SYMLINK include/asm-$(ARCH)/mach-$(MACHINE) -&gt; include/asm-$(ARCH)/mach'</div><div class='del'>-silent_show_mach_symlink = :</div><div class='del'>-include/asm-blackfin/.mach: $(wildcard include/config/arch/*.h) include/config/auto.conf</div><div class='del'>-	@$($(quiet)show_mach_symlink)</div><div class='del'>-ifneq ($(KBUILD_SRC),)</div><div class='del'>-	$(Q)mkdir -p include/asm-$(ARCH)</div><div class='del'>-	$(Q)ln -fsn $(srctree)/include/asm-$(ARCH)/mach-$(MACHINE) include/asm-$(ARCH)/mach</div><div class='del'>-else</div><div class='del'>-	$(Q)ln -fsn mach-$(MACHINE) include/asm-$(ARCH)/mach</div><div class='del'>-endif</div><div class='del'>-	@touch $@</div><div class='add'>+KBUILD_CPPFLAGS	+= $(patsubst %,-I$(srctree)/%include,$(machdirs))</div><div class='ctx'> </div><div class='ctx'> CLEAN_FILES += \</div><div class='del'>-	include/asm-$(ARCH)/asm-offsets.h \</div><div class='add'>+	arch/$(ARCH)/include/asm/asm-offsets.h \</div><div class='ctx'> 	arch/$(ARCH)/kernel/asm-offsets.s \</div><div class='del'>-	include/asm-$(ARCH)/mach \</div><div class='del'>-	include/asm-$(ARCH)/.mach</div><div class='ctx'> </div><div class='del'>-archprepare: include/asm-blackfin/.mach</div><div class='ctx'> archclean:</div><div class='ctx'> 	$(Q)$(MAKE) $(clean)=$(boot)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> INSTALL_PATH ?= /tftpboot</div><div class='ctx'> boot := arch/$(ARCH)/boot</div><div class='ctx'> BOOT_TARGETS = vmImage</div><div class='head'>diff --git a/arch/blackfin/configs/BlackStamp_defconfig b/arch/blackfin/configs/BlackStamp_defconfig<br/>new file mode 100644<br/>index 000000000000..2921f9952d5f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BlackStamp_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/configs/BlackStamp_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1195 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.26.2</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMU is not set</div><div class='add'>+# CONFIG_FPU is not set</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set</div><div class='add'>+CONFIG_BLACKFIN=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=14</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_TASKSTATS is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+CONFIG_TINY_SHMEM=y</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='add'>+# CONFIG_PREEMPT_NONE is not set</div><div class='add'>+CONFIG_PREEMPT_VOLUNTARY=y</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Blackfin Processor Options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor and Board Settings</div><div class='add'>+#</div><div class='add'>+# CONFIG_BF522 is not set</div><div class='add'>+# CONFIG_BF523 is not set</div><div class='add'>+# CONFIG_BF524 is not set</div><div class='add'>+# CONFIG_BF525 is not set</div><div class='add'>+# CONFIG_BF526 is not set</div><div class='add'>+# CONFIG_BF527 is not set</div><div class='add'>+# CONFIG_BF531 is not set</div><div class='add'>+CONFIG_BF532=y</div><div class='add'>+# CONFIG_BF533 is not set</div><div class='add'>+# CONFIG_BF534 is not set</div><div class='add'>+# CONFIG_BF536 is not set</div><div class='add'>+# CONFIG_BF537 is not set</div><div class='add'>+# CONFIG_BF542 is not set</div><div class='add'>+# CONFIG_BF544 is not set</div><div class='add'>+# CONFIG_BF547 is not set</div><div class='add'>+# CONFIG_BF548 is not set</div><div class='add'>+# CONFIG_BF549 is not set</div><div class='add'>+# CONFIG_BF561 is not set</div><div class='add'>+# CONFIG_BF_REV_0_0 is not set</div><div class='add'>+# CONFIG_BF_REV_0_1 is not set</div><div class='add'>+# CONFIG_BF_REV_0_2 is not set</div><div class='add'>+# CONFIG_BF_REV_0_3 is not set</div><div class='add'>+# CONFIG_BF_REV_0_4 is not set</div><div class='add'>+CONFIG_BF_REV_0_5=y</div><div class='add'>+# CONFIG_BF_REV_ANY is not set</div><div class='add'>+# CONFIG_BF_REV_NONE is not set</div><div class='add'>+CONFIG_BF53x=y</div><div class='add'>+CONFIG_MEM_MT48LC32M16A2TG_75=y</div><div class='add'>+# CONFIG_BFIN533_EZKIT is not set</div><div class='add'>+# CONFIG_BFIN533_STAMP is not set</div><div class='add'>+# CONFIG_BFIN533_BLUETECHNIX_CM is not set</div><div class='add'>+# CONFIG_H8606_HVSISTEMAS is not set</div><div class='add'>+# CONFIG_BFIN532_IP0X is not set</div><div class='add'>+CONFIG_BLACKSTAMP=y</div><div class='add'>+# CONFIG_GENERIC_BF533_BOARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# BF533/2/1 Specific Configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Interrupt Priority Assignment</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Priority</div><div class='add'>+#</div><div class='add'>+CONFIG_UART_ERROR=7</div><div class='add'>+CONFIG_SPORT0_ERROR=7</div><div class='add'>+CONFIG_SPI_ERROR=7</div><div class='add'>+CONFIG_SPORT1_ERROR=7</div><div class='add'>+CONFIG_PPI_ERROR=7</div><div class='add'>+CONFIG_DMA_ERROR=7</div><div class='add'>+CONFIG_PLLWAKE_ERROR=7</div><div class='add'>+CONFIG_RTC_ERROR=8</div><div class='add'>+CONFIG_DMA0_PPI=8</div><div class='add'>+CONFIG_DMA1_SPORT0RX=9</div><div class='add'>+CONFIG_DMA2_SPORT0TX=9</div><div class='add'>+CONFIG_DMA3_SPORT1RX=9</div><div class='add'>+CONFIG_DMA4_SPORT1TX=9</div><div class='add'>+CONFIG_DMA5_SPI=10</div><div class='add'>+CONFIG_DMA6_UARTRX=10</div><div class='add'>+CONFIG_DMA7_UARTTX=10</div><div class='add'>+CONFIG_TIMER0=11</div><div class='add'>+CONFIG_TIMER1=11</div><div class='add'>+CONFIG_TIMER2=11</div><div class='add'>+CONFIG_PFA=12</div><div class='add'>+CONFIG_PFB=12</div><div class='add'>+CONFIG_MEMDMA0=13</div><div class='add'>+CONFIG_MEMDMA1=13</div><div class='add'>+CONFIG_WDTIMER=13</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Board customizations</div><div class='add'>+#</div><div class='add'>+# CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_BOOT_LOAD=0x1000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Clock/PLL Setup</div><div class='add'>+#</div><div class='add'>+CONFIG_CLKIN_HZ=25000000</div><div class='add'>+# CONFIG_BFIN_KERNEL_CLOCK is not set</div><div class='add'>+# CONFIG_PLL_BYPASS is not set</div><div class='add'>+# CONFIG_CLKIN_HALF is not set</div><div class='add'>+CONFIG_VCO_MULT=16</div><div class='add'>+CONFIG_CCLK_DIV_1=y</div><div class='add'>+# CONFIG_CCLK_DIV_2 is not set</div><div class='add'>+# CONFIG_CCLK_DIV_4 is not set</div><div class='add'>+# CONFIG_CCLK_DIV_8 is not set</div><div class='add'>+CONFIG_SCLK_DIV=3</div><div class='add'>+CONFIG_MAX_MEM_SIZE=64</div><div class='add'>+CONFIG_MAX_VCO_HZ=400000000</div><div class='add'>+CONFIG_MIN_VCO_HZ=50000000</div><div class='add'>+CONFIG_MAX_SCLK_HZ=133333333</div><div class='add'>+CONFIG_MIN_SCLK_HZ=27000000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Timer/Scheduler</div><div class='add'>+#</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+CONFIG_HZ_250=y</div><div class='add'>+# CONFIG_HZ_300 is not set</div><div class='add'>+# CONFIG_HZ_1000 is not set</div><div class='add'>+CONFIG_HZ=250</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+# CONFIG_CYCLES_CLOCKSOURCE is not set</div><div class='add'>+CONFIG_TICK_ONESHOT=y</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Setup</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc</div><div class='add'>+#</div><div class='add'>+CONFIG_BFIN_SCRATCH_REG_RETN=y</div><div class='add'>+# CONFIG_BFIN_SCRATCH_REG_RETE is not set</div><div class='add'>+# CONFIG_BFIN_SCRATCH_REG_CYCLES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Blackfin Kernel Optimizations</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Optimizations</div><div class='add'>+#</div><div class='add'>+CONFIG_I_ENTRY_L1=y</div><div class='add'>+CONFIG_EXCPT_IRQ_SYSC_L1=y</div><div class='add'>+CONFIG_DO_IRQ_L1=y</div><div class='add'>+CONFIG_CORE_TIMER_IRQ_L1=y</div><div class='add'>+CONFIG_IDLE_L1=y</div><div class='add'>+CONFIG_SCHEDULE_L1=y</div><div class='add'>+CONFIG_ARITHMETIC_OPS_L1=y</div><div class='add'>+CONFIG_ACCESS_OK_L1=y</div><div class='add'>+CONFIG_MEMSET_L1=y</div><div class='add'>+CONFIG_MEMCPY_L1=y</div><div class='add'>+CONFIG_SYS_BFIN_SPINLOCK_L1=y</div><div class='add'>+# CONFIG_IP_CHECKSUM_L1 is not set</div><div class='add'>+CONFIG_CACHELINE_ALIGNED_L1=y</div><div class='add'>+# CONFIG_SYSCALL_TAB_L1 is not set</div><div class='add'>+# CONFIG_CPLB_SWITCH_TAB_L1 is not set</div><div class='add'>+# CONFIG_RAMKERNEL is not set</div><div class='add'>+CONFIG_ROMKERNEL=y</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_BFIN_GPTIMERS=y</div><div class='add'>+CONFIG_BFIN_DMA_5XX=y</div><div class='add'>+# CONFIG_DMA_UNCACHED_4M is not set</div><div class='add'>+# CONFIG_DMA_UNCACHED_2M is not set</div><div class='add'>+CONFIG_DMA_UNCACHED_1M=y</div><div class='add'>+# CONFIG_DMA_UNCACHED_NONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cache Support</div><div class='add'>+#</div><div class='add'>+CONFIG_BFIN_ICACHE=y</div><div class='add'>+CONFIG_BFIN_DCACHE=y</div><div class='add'>+# CONFIG_BFIN_DCACHE_BANKA is not set</div><div class='add'>+# CONFIG_BFIN_ICACHE_LOCK is not set</div><div class='add'>+# CONFIG_BFIN_WB is not set</div><div class='add'>+CONFIG_BFIN_WT=y</div><div class='add'>+# CONFIG_MPU is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Asynchonous Memory Configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# EBIU_AMGCTL Global Control</div><div class='add'>+#</div><div class='add'>+CONFIG_C_AMCKEN=y</div><div class='add'>+CONFIG_C_CDPRIO=y</div><div class='add'>+# CONFIG_C_AMBEN is not set</div><div class='add'>+# CONFIG_C_AMBEN_B0 is not set</div><div class='add'>+# CONFIG_C_AMBEN_B0_B1 is not set</div><div class='add'>+# CONFIG_C_AMBEN_B0_B1_B2 is not set</div><div class='add'>+CONFIG_C_AMBEN_ALL=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# EBIU_AMBCTL Control</div><div class='add'>+#</div><div class='add'>+CONFIG_BANK_0=0x7BB0</div><div class='add'>+CONFIG_BANK_1=0x7BB0</div><div class='add'>+CONFIG_BANK_2=0x7BB0</div><div class='add'>+CONFIG_BANK_3=0xAAC2</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus options (PCI, PCMCIA, EISA, MCA, ISA)</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Executable file formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF_FDPIC=y</div><div class='add'>+CONFIG_BINFMT_FLAT=y</div><div class='add'>+CONFIG_BINFMT_ZFLAT=y</div><div class='add'>+CONFIG_BINFMT_SHARED_FLAT=y</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+CONFIG_SUSPEND_FREEZER=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='add'>+CONFIG_PM_BFIN_SLEEP_DEEPER=y</div><div class='add'>+# CONFIG_PM_BFIN_SLEEP is not set</div><div class='add'>+# CONFIG_PM_WAKEUP_BY_GPIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Possible Suspend Mem / Hibernate Wake-Up Sources</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+# CONFIG_IP_PNP_DHCP is not set</div><div class='add'>+# CONFIG_IP_PNP_BOOTP is not set</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+CONFIG_SYN_COOKIES=y</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_NETLABEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=m</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=m</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_GEN_PROBE=m</div><div class='add'>+# CONFIG_MTD_CFI_ADV_OPTIONS is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_CFI_INTELEXT is not set</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=m</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_CFI_UTIL=m</div><div class='add'>+CONFIG_MTD_RAM=y</div><div class='add'>+CONFIG_MTD_ROM=m</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_COMPLEX_MAPPINGS=y</div><div class='add'>+# CONFIG_MTD_PHYSMAP is not set</div><div class='add'>+# CONFIG_MTD_GPIO_ADDR is not set</div><div class='add'>+# CONFIG_MTD_UCLINUX is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DATAFLASH is not set</div><div class='add'>+CONFIG_MTD_M25P80=y</div><div class='add'>+# CONFIG_M25PXX_USE_FAST_READ is not set</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+CONFIG_BLK_DEV_NBD=y</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_DMA is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+# CONFIG_VETH is not set</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+CONFIG_SMC91X=y</div><div class='add'>+# CONFIG_SMSC911X is not set</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+# CONFIG_ENC28J60 is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+# CONFIG_NETDEV_1000 is not set</div><div class='add'>+# CONFIG_NETDEV_10000 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN</div><div class='add'>+#</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+# CONFIG_PHONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=m</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_AD9960 is not set</div><div class='add'>+# CONFIG_SPI_ADC_BF533 is not set</div><div class='add'>+# CONFIG_BF5xx_PPIFCD is not set</div><div class='add'>+# CONFIG_BFIN_SIMPLE_TIMER is not set</div><div class='add'>+CONFIG_BF5xx_PPI=y</div><div class='add'>+CONFIG_BFIN_SPORT=y</div><div class='add'>+# CONFIG_BFIN_TIMER_LATENCY is not set</div><div class='add'>+# CONFIG_TWI_LCD is not set</div><div class='add'>+CONFIG_SIMPLE_GPIO=m</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_BFIN=y</div><div class='add'>+CONFIG_SERIAL_BFIN_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_BFIN_DMA=y</div><div class='add'>+# CONFIG_SERIAL_BFIN_PIO is not set</div><div class='add'>+CONFIG_SERIAL_BFIN_UART0=y</div><div class='add'>+# CONFIG_BFIN_UART0_CTSRTS is not set</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_BFIN_SPORT is not set</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CAN, the car bus and industrial fieldbus</div><div class='add'>+#</div><div class='add'>+# CONFIG_CAN4LINUX is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_I2C=m</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=m</div><div class='add'>+CONFIG_I2C_ALGOBIT=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_GPIO=m</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_SENSORS_AD5252 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Master Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI_BFIN=y</div><div class='add'>+# CONFIG_SPI_BITBANG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Protocol Masters</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI_AT25=y</div><div class='add'>+CONFIG_SPI_SPIDEV=m</div><div class='add'>+# CONFIG_SPI_TLE62X0 is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7418 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1021 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1025 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1026 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1029 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1031 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM9240 is not set</div><div class='add'>+# CONFIG_SENSORS_ADT7470 is not set</div><div class='add'>+# CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_ATXP1 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_F71882FG is not set</div><div class='add'>+# CONFIG_SENSORS_F75375S is not set</div><div class='add'>+# CONFIG_SENSORS_GL518SM is not set</div><div class='add'>+# CONFIG_SENSORS_GL520SM is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM63 is not set</div><div class='add'>+# CONFIG_SENSORS_LM70 is not set</div><div class='add'>+# CONFIG_SENSORS_LM75 is not set</div><div class='add'>+# CONFIG_SENSORS_LM77 is not set</div><div class='add'>+# CONFIG_SENSORS_LM78 is not set</div><div class='add'>+# CONFIG_SENSORS_LM80 is not set</div><div class='add'>+# CONFIG_SENSORS_LM83 is not set</div><div class='add'>+# CONFIG_SENSORS_LM85 is not set</div><div class='add'>+# CONFIG_SENSORS_LM87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM90 is not set</div><div class='add'>+# CONFIG_SENSORS_LM92 is not set</div><div class='add'>+# CONFIG_SENSORS_LM93 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX1619 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6650 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_DME1737 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_ADS7828 is not set</div><div class='add'>+# CONFIG_SENSORS_THMC50 is not set</div><div class='add'>+# CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='add'>+# CONFIG_SENSORS_W83792D is not set</div><div class='add'>+# CONFIG_SENSORS_W83793 is not set</div><div class='add'>+# CONFIG_SENSORS_W83L785TS is not set</div><div class='add'>+# CONFIG_SENSORS_W83L786NG is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+# CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+CONFIG_BFIN_WDT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_DAB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+# CONFIG_SDIO_UART is not set</div><div class='add'>+# CONFIG_MMC_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_SPI=y</div><div class='add'>+# CONFIG_SPI_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+# CONFIG_RTC_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1374 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6900 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_ISL1208 is not set</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M41T80 is not set</div><div class='add'>+# CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_MAX6902 is not set</div><div class='add'>+# CONFIG_RTC_DRV_R9701 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C348 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# on-CPU RTC drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_DRV_BFIN=y</div><div class='add'>+# CONFIG_UIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+# CONFIG_EXT2_FS is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+# CONFIG_TMPFS is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_YAFFS_FS=m</div><div class='add'>+CONFIG_YAFFS_YAFFS1=y</div><div class='add'>+# CONFIG_YAFFS_9BYTE_TAGS is not set</div><div class='add'>+# CONFIG_YAFFS_DOES_ECC is not set</div><div class='add'>+CONFIG_YAFFS_YAFFS2=y</div><div class='add'>+CONFIG_YAFFS_AUTO_YAFFS2=y</div><div class='add'>+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set</div><div class='add'>+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set</div><div class='add'>+# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set</div><div class='add'>+CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+# CONFIG_JFFS2_LZO is not set</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+# CONFIG_ROOT_NFS is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+# CONFIG_SUNRPC_BIND34 is not set</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+CONFIG_SMB_FS=y</div><div class='add'>+# CONFIG_SMB_NLS_DEFAULT is not set</div><div class='add'>+CONFIG_CIFS=y</div><div class='add'>+# CONFIG_CIFS_STATS is not set</div><div class='add'>+# CONFIG_CIFS_WEAK_PW_HASH is not set</div><div class='add'>+# CONFIG_CIFS_XATTR is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='add'>+# CONFIG_CIFS_EXPERIMENTAL is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+CONFIG_NLS_ASCII=y</div><div class='add'>+# CONFIG_NLS_ISO8859_1 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+CONFIG_NLS_UTF8=y</div><div class='add'>+# CONFIG_DLM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+CONFIG_DEBUG_FS=y</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_DEBUG_MMRS=y</div><div class='add'>+CONFIG_DEBUG_HUNT_FOR_ZERO=y</div><div class='add'>+CONFIG_DEBUG_BFIN_HWTRACE_ON=y</div><div class='add'>+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_OFF=y</div><div class='add'>+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE is not set</div><div class='add'>+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_TWO is not set</div><div class='add'>+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION=0</div><div class='add'>+# CONFIG_DEBUG_BFIN_HWTRACE_EXPAND is not set</div><div class='add'>+# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set</div><div class='add'>+CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_CPLB_INFO=y</div><div class='add'>+CONFIG_ACCESS_CHECK=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+CONFIG_SECURITY=y</div><div class='add'>+# CONFIG_SECURITY_NETWORK is not set</div><div class='add'>+# CONFIG_SECURITY_CAPABILITIES is not set</div><div class='add'>+CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_BLKCIPHER=y</div><div class='add'>+CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+# CONFIG_CRYPTO_ECB is not set</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='add'>+CONFIG_CRC_CCITT=m</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_ITU_T=y</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+CONFIG_CRC7=y</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/blackfin/configs/TCM-BF537_defconfig b/arch/blackfin/configs/TCM-BF537_defconfig<br/>new file mode 100644<br/>index 000000000000..c482ee171f9e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/TCM-BF537_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/configs/TCM-BF537_defconfig</a></div><div class='hunk'>@@ -0,0 +1,693 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.24.7</div><div class='add'>+# Thu Jul 31 00:53:15 2008</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMU is not set</div><div class='add'>+# CONFIG_FPU is not set</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set</div><div class='add'>+CONFIG_BLACKFIN=y</div><div class='add'>+CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_SEMAPHORE_SLEEPERS=y</div><div class='add'>+CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=14</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+CONFIG_FAIR_GROUP_SCHED=y</div><div class='add'>+CONFIG_FAIR_USER_SCHED=y</div><div class='add'>+# CONFIG_FAIR_CGROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_BLK_DEV_INITRD is not set</div><div class='add'>+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+# CONFIG_UID16 is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+# CONFIG_HOTPLUG is not set</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+CONFIG_TINY_SHMEM=y</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+# CONFIG_IOSCHED_AS is not set</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+CONFIG_DEFAULT_NOOP=y</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="noop"</div><div class='add'>+CONFIG_PREEMPT_NONE=y</div><div class='add'>+# CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Blackfin Processor Options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor and Board Settings</div><div class='add'>+#</div><div class='add'>+# CONFIG_BF522 is not set</div><div class='add'>+# CONFIG_BF523 is not set</div><div class='add'>+# CONFIG_BF524 is not set</div><div class='add'>+# CONFIG_BF525 is not set</div><div class='add'>+# CONFIG_BF526 is not set</div><div class='add'>+# CONFIG_BF527 is not set</div><div class='add'>+# CONFIG_BF531 is not set</div><div class='add'>+# CONFIG_BF532 is not set</div><div class='add'>+# CONFIG_BF533 is not set</div><div class='add'>+# CONFIG_BF534 is not set</div><div class='add'>+# CONFIG_BF536 is not set</div><div class='add'>+CONFIG_BF537=y</div><div class='add'>+# CONFIG_BF542 is not set</div><div class='add'>+# CONFIG_BF544 is not set</div><div class='add'>+# CONFIG_BF547 is not set</div><div class='add'>+# CONFIG_BF548 is not set</div><div class='add'>+# CONFIG_BF549 is not set</div><div class='add'>+# CONFIG_BF561 is not set</div><div class='add'>+# CONFIG_BF_REV_0_0 is not set</div><div class='add'>+# CONFIG_BF_REV_0_1 is not set</div><div class='add'>+CONFIG_BF_REV_0_2=y</div><div class='add'>+# CONFIG_BF_REV_0_3 is not set</div><div class='add'>+# CONFIG_BF_REV_0_4 is not set</div><div class='add'>+# CONFIG_BF_REV_0_5 is not set</div><div class='add'>+# CONFIG_BF_REV_ANY is not set</div><div class='add'>+# CONFIG_BF_REV_NONE is not set</div><div class='add'>+CONFIG_BF53x=y</div><div class='add'>+CONFIG_IRQ_PLL_WAKEUP=7</div><div class='add'>+CONFIG_IRQ_RTC=8</div><div class='add'>+CONFIG_IRQ_PPI=8</div><div class='add'>+CONFIG_IRQ_SPORT0_RX=9</div><div class='add'>+CONFIG_IRQ_SPORT0_TX=9</div><div class='add'>+CONFIG_IRQ_SPORT1_RX=9</div><div class='add'>+CONFIG_IRQ_SPORT1_TX=9</div><div class='add'>+CONFIG_IRQ_TWI=10</div><div class='add'>+CONFIG_IRQ_SPI=10</div><div class='add'>+CONFIG_IRQ_UART0_RX=10</div><div class='add'>+CONFIG_IRQ_UART0_TX=10</div><div class='add'>+CONFIG_IRQ_UART1_RX=10</div><div class='add'>+CONFIG_IRQ_UART1_TX=10</div><div class='add'>+CONFIG_IRQ_MAC_RX=11</div><div class='add'>+CONFIG_IRQ_MAC_TX=11</div><div class='add'>+CONFIG_IRQ_TMR0=12</div><div class='add'>+CONFIG_IRQ_TMR1=12</div><div class='add'>+CONFIG_IRQ_TMR2=12</div><div class='add'>+CONFIG_IRQ_TMR3=12</div><div class='add'>+CONFIG_IRQ_TMR4=12</div><div class='add'>+CONFIG_IRQ_TMR5=12</div><div class='add'>+CONFIG_IRQ_TMR6=12</div><div class='add'>+CONFIG_IRQ_TMR7=12</div><div class='add'>+CONFIG_IRQ_PORTG_INTB=12</div><div class='add'>+CONFIG_IRQ_MEM_DMA0=13</div><div class='add'>+CONFIG_IRQ_MEM_DMA1=13</div><div class='add'>+CONFIG_IRQ_WATCH=13</div><div class='add'>+# CONFIG_BFIN537_STAMP is not set</div><div class='add'>+# CONFIG_BFIN537_BLUETECHNIX_CM is not set</div><div class='add'>+CONFIG_BFIN537_BLUETECHNIX_TCM=y</div><div class='add'>+# CONFIG_PNAV10 is not set</div><div class='add'>+# CONFIG_CAMSIG_MINOTAUR is not set</div><div class='add'>+# CONFIG_GENERIC_BF537_BOARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# BF537 Specific Configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Interrupt Priority Assignment</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Priority</div><div class='add'>+#</div><div class='add'>+CONFIG_IRQ_DMA_ERROR=7</div><div class='add'>+CONFIG_IRQ_ERROR=7</div><div class='add'>+CONFIG_IRQ_CAN_RX=11</div><div class='add'>+CONFIG_IRQ_CAN_TX=11</div><div class='add'>+CONFIG_IRQ_PROG_INTA=12</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Board customizations</div><div class='add'>+#</div><div class='add'>+# CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_BOOT_LOAD=0x1000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Clock/PLL Setup</div><div class='add'>+#</div><div class='add'>+CONFIG_CLKIN_HZ=25000000</div><div class='add'>+# CONFIG_BFIN_KERNEL_CLOCK is not set</div><div class='add'>+CONFIG_MAX_MEM_SIZE=32</div><div class='add'>+CONFIG_MAX_VCO_HZ=600000000</div><div class='add'>+CONFIG_MIN_VCO_HZ=50000000</div><div class='add'>+CONFIG_MAX_SCLK_HZ=133333333</div><div class='add'>+CONFIG_MIN_SCLK_HZ=27000000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Timer/Scheduler</div><div class='add'>+#</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+CONFIG_HZ_250=y</div><div class='add'>+# CONFIG_HZ_300 is not set</div><div class='add'>+# CONFIG_HZ_1000 is not set</div><div class='add'>+CONFIG_HZ=250</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+# CONFIG_CYCLES_CLOCKSOURCE is not set</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc</div><div class='add'>+#</div><div class='add'>+CONFIG_BFIN_SCRATCH_REG_RETN=y</div><div class='add'>+# CONFIG_BFIN_SCRATCH_REG_RETE is not set</div><div class='add'>+# CONFIG_BFIN_SCRATCH_REG_CYCLES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Blackfin Kernel Optimizations</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Optimizations</div><div class='add'>+#</div><div class='add'>+CONFIG_I_ENTRY_L1=y</div><div class='add'>+CONFIG_EXCPT_IRQ_SYSC_L1=y</div><div class='add'>+CONFIG_DO_IRQ_L1=y</div><div class='add'>+CONFIG_CORE_TIMER_IRQ_L1=y</div><div class='add'>+CONFIG_IDLE_L1=y</div><div class='add'>+CONFIG_SCHEDULE_L1=y</div><div class='add'>+CONFIG_ARITHMETIC_OPS_L1=y</div><div class='add'>+CONFIG_ACCESS_OK_L1=y</div><div class='add'>+CONFIG_MEMSET_L1=y</div><div class='add'>+CONFIG_MEMCPY_L1=y</div><div class='add'>+CONFIG_SYS_BFIN_SPINLOCK_L1=y</div><div class='add'>+CONFIG_IP_CHECKSUM_L1=y</div><div class='add'>+CONFIG_CACHELINE_ALIGNED_L1=y</div><div class='add'>+CONFIG_SYSCALL_TAB_L1=y</div><div class='add'>+CONFIG_CPLB_SWITCH_TAB_L1=y</div><div class='add'>+CONFIG_RAMKERNEL=y</div><div class='add'>+# CONFIG_ROMKERNEL is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=1</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+# CONFIG_BFIN_GPTIMERS is not set</div><div class='add'>+CONFIG_BFIN_DMA_5XX=y</div><div class='add'>+# CONFIG_DMA_UNCACHED_4M is not set</div><div class='add'>+# CONFIG_DMA_UNCACHED_2M is not set</div><div class='add'>+CONFIG_DMA_UNCACHED_1M=y</div><div class='add'>+# CONFIG_DMA_UNCACHED_NONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cache Support</div><div class='add'>+#</div><div class='add'>+CONFIG_BFIN_ICACHE=y</div><div class='add'>+CONFIG_BFIN_DCACHE=y</div><div class='add'>+# CONFIG_BFIN_DCACHE_BANKA is not set</div><div class='add'>+# CONFIG_BFIN_ICACHE_LOCK is not set</div><div class='add'>+CONFIG_BFIN_WB=y</div><div class='add'>+# CONFIG_BFIN_WT is not set</div><div class='add'>+# CONFIG_MPU is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Asynchonous Memory Configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# EBIU_AMGCTL Global Control</div><div class='add'>+#</div><div class='add'>+CONFIG_C_AMCKEN=y</div><div class='add'>+CONFIG_C_CDPRIO=y</div><div class='add'>+# CONFIG_C_AMBEN is not set</div><div class='add'>+# CONFIG_C_AMBEN_B0 is not set</div><div class='add'>+# CONFIG_C_AMBEN_B0_B1 is not set</div><div class='add'>+# CONFIG_C_AMBEN_B0_B1_B2 is not set</div><div class='add'>+CONFIG_C_AMBEN_ALL=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# EBIU_AMBCTL Control</div><div class='add'>+#</div><div class='add'>+CONFIG_BANK_0=0x7BB0</div><div class='add'>+CONFIG_BANK_1=0x7BB0</div><div class='add'>+CONFIG_BANK_2=0x7BB0</div><div class='add'>+CONFIG_BANK_3=0xFFC2</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus options (PCI, PCMCIA, EISA, MCA, ISA)</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCI is not set</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Executable file formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF_FDPIC=y</div><div class='add'>+CONFIG_BINFMT_FLAT=y</div><div class='add'>+CONFIG_BINFMT_ZFLAT=y</div><div class='add'>+CONFIG_BINFMT_SHARED_FLAT=y</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+CONFIG_SUSPEND_UP_POSSIBLE=y</div><div class='add'>+# CONFIG_PM_WAKEUP_BY_GPIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU Frequency scaling</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_CFI is not set</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+CONFIG_MTD_RAM=y</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_GPIO_ADDR is not set</div><div class='add'>+CONFIG_MTD_UCLINUX=y</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DATAFLASH is not set</div><div class='add'>+# CONFIG_MTD_M25P80 is not set</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+# CONFIG_BLK_DEV_LOOP is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='add'>+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_DMA is not set</div><div class='add'>+# CONFIG_SCSI_NETLINK is not set</div><div class='add'>+# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+# CONFIG_PHONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_AD9960 is not set</div><div class='add'>+# CONFIG_SPI_ADC_BF533 is not set</div><div class='add'>+# CONFIG_BF5xx_PPIFCD is not set</div><div class='add'>+# CONFIG_BFIN_SIMPLE_TIMER is not set</div><div class='add'>+# CONFIG_BF5xx_PPI is not set</div><div class='add'>+CONFIG_BFIN_SPORT=y</div><div class='add'>+# CONFIG_BFIN_TIMER_LATENCY is not set</div><div class='add'>+# CONFIG_SIMPLE_GPIO is not set</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_BFIN=y</div><div class='add'>+CONFIG_SERIAL_BFIN_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_BFIN_DMA=y</div><div class='add'>+# CONFIG_SERIAL_BFIN_PIO is not set</div><div class='add'>+CONFIG_SERIAL_BFIN_UART0=y</div><div class='add'>+# CONFIG_BFIN_UART0_CTSRTS is not set</div><div class='add'>+CONFIG_SERIAL_BFIN_UART1=y</div><div class='add'>+# CONFIG_BFIN_UART1_CTSRTS is not set</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_BFIN_SPORT is not set</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CAN, the car bus and industrial fieldbus</div><div class='add'>+#</div><div class='add'>+# CONFIG_CAN4LINUX is not set</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_GEN_RTC is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Master Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI_BFIN=y</div><div class='add'>+# CONFIG_SPI_BITBANG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Protocol Masters</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_AT25 is not set</div><div class='add'>+# CONFIG_SPI_SPIDEV is not set</div><div class='add'>+# CONFIG_SPI_TLE62X0 is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+# CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+CONFIG_BFIN_WDT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DAB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace I/O</div><div class='add'>+#</div><div class='add'>+# CONFIG_UIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_EXT2_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT2_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT2_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_GFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+# CONFIG_TMPFS is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_YAFFS_FS is not set</div><div class='add'>+# CONFIG_JFFS2_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_NLS is not set</div><div class='add'>+# CONFIG_INSTRUMENTATION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+CONFIG_DEBUG_FS=y</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_DEBUG_MMRS=y</div><div class='add'>+CONFIG_DEBUG_HUNT_FOR_ZERO=y</div><div class='add'>+CONFIG_DEBUG_BFIN_HWTRACE_ON=y</div><div class='add'>+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_OFF=y</div><div class='add'>+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE is not set</div><div class='add'>+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_TWO is not set</div><div class='add'>+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION=0</div><div class='add'>+# CONFIG_DEBUG_BFIN_HWTRACE_EXPAND is not set</div><div class='add'>+# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set</div><div class='add'>+# CONFIG_EARLY_PRINTK is not set</div><div class='add'>+CONFIG_CPLB_INFO=y</div><div class='add'>+CONFIG_ACCESS_CHECK=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+CONFIG_SECURITY=y</div><div class='add'>+# CONFIG_SECURITY_NETWORK is not set</div><div class='add'>+CONFIG_SECURITY_CAPABILITIES=y</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='add'>+# CONFIG_CRC32 is not set</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/include/asm-blackfin/.gitignore b/arch/blackfin/include/asm/.gitignore<br/>index 7858564a4466..7858564a4466 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/.gitignore?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/.gitignore</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/.gitignore</a></div><div class='head'>diff --git a/include/asm-blackfin/Kbuild b/arch/blackfin/include/asm/Kbuild<br/>index 71f8fe783258..606ecfdcc962 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/Kbuild?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/Kbuild</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,3 +1,3 @@</div><div class='ctx'> include include/asm-generic/Kbuild.asm</div><div class='ctx'> </div><div class='del'>-header-y += fixed_code.h</div><div class='add'>+unifdef-y += fixed_code.h</div><div class='head'>diff --git a/include/asm-blackfin/a.out.h b/arch/blackfin/include/asm/a.out.h<br/>index 6c3d652ebd33..6c3d652ebd33 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/a.out.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/a.out.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/a.out.h</a></div><div class='head'>diff --git a/include/asm-blackfin/atomic.h b/arch/blackfin/include/asm/atomic.h<br/>index 7cf508718605..7cf508718605 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/atomic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/atomic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/atomic.h</a></div><div class='head'>diff --git a/include/asm-blackfin/auxvec.h b/arch/blackfin/include/asm/auxvec.h<br/>index 215506cd87b7..215506cd87b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/auxvec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/auxvec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/auxvec.h</a></div><div class='head'>diff --git a/include/asm-blackfin/bfin-global.h b/arch/blackfin/include/asm/bfin-global.h<br/>index 320aa5e167e9..7ba70de66f2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/bfin-global.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/bfin-global.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/bfin-global.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/bfin-global.h</a></div><div class='hunk'>@@ -56,37 +56,20 @@ extern void dump_bfin_process(struct pt_regs *regs);</div><div class='ctx'> extern void dump_bfin_mem(struct pt_regs *regs);</div><div class='ctx'> extern void dump_bfin_trace_buffer(void);</div><div class='ctx'> </div><div class='add'>+/* init functions only */</div><div class='ctx'> extern int init_arch_irq(void);</div><div class='del'>-extern void bfin_reset(void);</div><div class='del'>-extern void _cplb_hdr(void);</div><div class='del'>-/* Blackfin cache functions */</div><div class='ctx'> extern void bfin_icache_init(void);</div><div class='ctx'> extern void bfin_dcache_init(void);</div><div class='del'>-extern int read_iloc(void);</div><div class='del'>-extern int bfin_console_init(void);</div><div class='del'>-extern asmlinkage void lower_to_irq14(void);</div><div class='del'>-extern asmlinkage void bfin_return_from_exception(void);</div><div class='ctx'> extern void init_exception_vectors(void);</div><div class='del'>-extern void init_dma(void);</div><div class='ctx'> extern void program_IAR(void);</div><div class='del'>-extern void evt14_softirq(void);</div><div class='add'>+</div><div class='add'>+extern void bfin_reset(void);</div><div class='add'>+extern asmlinkage void lower_to_irq14(void);</div><div class='add'>+extern asmlinkage void bfin_return_from_exception(void);</div><div class='add'>+extern asmlinkage void evt14_softirq(void);</div><div class='ctx'> extern asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs);</div><div class='del'>-extern void bfin_gpio_interrupt_setup(int irq, int irq_pfx, int type);</div><div class='ctx'> extern int bfin_internal_set_wake(unsigned int irq, unsigned int state);</div><div class='ctx'> </div><div class='del'>-extern asmlinkage void finish_atomic_sections (struct pt_regs *regs);</div><div class='del'>-extern char fixed_code_start;</div><div class='del'>-extern char fixed_code_end;</div><div class='del'>-extern int atomic_xchg32(void);</div><div class='del'>-extern int atomic_cas32(void);</div><div class='del'>-extern int atomic_add32(void);</div><div class='del'>-extern int atomic_sub32(void);</div><div class='del'>-extern int atomic_ior32(void);</div><div class='del'>-extern int atomic_and32(void);</div><div class='del'>-extern int atomic_xor32(void);</div><div class='del'>-extern void safe_user_instruction(void);</div><div class='del'>-extern void sigreturn_stub(void);</div><div class='del'>-</div><div class='ctx'> extern void *l1_data_A_sram_alloc(size_t);</div><div class='ctx'> extern void *l1_data_B_sram_alloc(size_t);</div><div class='ctx'> extern void *l1_inst_sram_alloc(size_t);</div><div class='hunk'>@@ -110,11 +93,10 @@ extern void *sram_alloc_with_lsl(size_t, unsigned long);</div><div class='ctx'> extern int sram_free_with_lsl(const void*);</div><div class='ctx'> </div><div class='ctx'> extern const char bfin_board_name[];</div><div class='del'>-extern unsigned long wall_jiffies;</div><div class='ctx'> </div><div class='ctx'> extern unsigned long bfin_sic_iwr[];</div><div class='add'>+extern unsigned vr_wakeup;</div><div class='ctx'> extern u16 _bfin_swrst; /* shadow for Software Reset Register (SWRST) */</div><div class='del'>-extern struct file_operations dpmc_fops;</div><div class='ctx'> extern unsigned long _ramstart, _ramend, _rambase;</div><div class='ctx'> extern unsigned long memory_start, memory_end, physical_mem_end;</div><div class='ctx'> extern char _stext_l1[], _etext_l1[], _sdata_l1[], _edata_l1[], _sbss_l1[],</div><div class='hunk'>@@ -122,8 +104,12 @@ extern char _stext_l1[], _etext_l1[], _sdata_l1[], _edata_l1[], _sbss_l1[],</div><div class='ctx'> 	_stext_l2[], _etext_l2[], _sdata_l2[], _edata_l2[], _sbss_l2[],</div><div class='ctx'> 	_ebss_l2[], _l2_lma_start[];</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MTD_UCLINUX</div><div class='add'>+/* only used when CONFIG_MTD_UCLINUX */</div><div class='ctx'> extern unsigned long memory_mtd_start, memory_mtd_end, mtd_size;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BFIN_ICACHE_LOCK</div><div class='add'>+extern void cache_grab_lock(int way);</div><div class='add'>+extern void cache_lock(int way);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/asm-blackfin/bfin5xx_spi.h b/arch/blackfin/include/asm/bfin5xx_spi.h<br/>index 9fa19158e38d..9fa19158e38d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/bfin5xx_spi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/bfin5xx_spi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/bfin5xx_spi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/bfin5xx_spi.h</a></div><div class='head'>diff --git a/include/asm-blackfin/bfin_simple_timer.h b/arch/blackfin/include/asm/bfin_simple_timer.h<br/>index fccbb595464a..fccbb595464a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/bfin_simple_timer.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/bfin_simple_timer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/bfin_simple_timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/bfin_simple_timer.h</a></div><div class='head'>diff --git a/include/asm-blackfin/bfin_sport.h b/arch/blackfin/include/asm/bfin_sport.h<br/>index c76ed8def302..c76ed8def302 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/bfin_sport.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/bfin_sport.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/bfin_sport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/bfin_sport.h</a></div><div class='head'>diff --git a/include/asm-blackfin/bitops.h b/arch/blackfin/include/asm/bitops.h<br/>index b39a175c79c1..b39a175c79c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/bitops.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/bitops.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/bitops.h</a></div><div class='head'>diff --git a/include/asm-blackfin/blackfin.h b/arch/blackfin/include/asm/blackfin.h<br/>index 984b74f0a2ec..8749b0e321ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/blackfin.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/blackfin.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/blackfin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/blackfin.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #define HI(con32) (((con32) &gt;&gt; 16) &amp; 0xFFFF)</div><div class='ctx'> #define hi(con32) (((con32) &gt;&gt; 16) &amp; 0xFFFF)</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach/anomaly.h&gt;</div><div class='add'>+#include &lt;mach/anomaly.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='hunk'>@@ -86,7 +86,7 @@ static inline void CSYNC(void)</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach/blackfin.h&gt;</div><div class='add'>+#include &lt;mach/blackfin.h&gt;</div><div class='ctx'> #include &lt;asm/bfin-global.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif				/* _BLACKFIN_H_ */</div><div class='head'>diff --git a/include/asm-blackfin/bug.h b/arch/blackfin/include/asm/bug.h<br/>index 6d3e11b1fc57..6d3e11b1fc57 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/bug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/bug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/bug.h</a></div><div class='head'>diff --git a/include/asm-blackfin/bugs.h b/arch/blackfin/include/asm/bugs.h<br/>index 9093c9c1fb81..9093c9c1fb81 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/bugs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/bugs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/bugs.h</a></div><div class='head'>diff --git a/include/asm-blackfin/byteorder.h b/arch/blackfin/include/asm/byteorder.h<br/>index 6a673d42da18..6a673d42da18 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/byteorder.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/byteorder.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/byteorder.h</a></div><div class='head'>diff --git a/include/asm-blackfin/cache.h b/arch/blackfin/include/asm/cache.h<br/>index 023d72133b5a..023d72133b5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/cache.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/cache.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/cache.h</a></div><div class='head'>diff --git a/include/asm-blackfin/cacheflush.h b/arch/blackfin/include/asm/cacheflush.h<br/>index d81a77545a04..d81a77545a04 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/cacheflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/cacheflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/cacheflush.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-common/cdef_LPBlackfin.h b/arch/blackfin/include/asm/cdef_LPBlackfin.h<br/>index ede210eca4ec..35f841bce57d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-common/cdef_LPBlackfin.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-common/cdef_LPBlackfin.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/cdef_LPBlackfin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/cdef_LPBlackfin.h</a></div><div class='hunk'>@@ -33,17 +33,13 @@</div><div class='ctx'> #warning cdef_LPBlackfin.h should only be included for 532 compatible chips.</div><div class='ctx'> #endif</div><div class='ctx'> */</div><div class='del'>-#include &lt;asm/mach-common/def_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/def_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*Cache &amp; SRAM Memory*/</div><div class='ctx'> #define bfin_read_SRAM_BASE_ADDRESS()        bfin_read32(SRAM_BASE_ADDRESS)</div><div class='ctx'> #define bfin_write_SRAM_BASE_ADDRESS(val)    bfin_write32(SRAM_BASE_ADDRESS,val)</div><div class='ctx'> #define bfin_read_DMEM_CONTROL()             bfin_read32(DMEM_CONTROL)</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-extern void bfin_write_DMEM_CONTROL(unsigned int val);</div><div class='del'>-#else</div><div class='ctx'> #define bfin_write_DMEM_CONTROL(val)         bfin_write32(DMEM_CONTROL,val)</div><div class='del'>-#endif</div><div class='ctx'> #define bfin_read_DCPLB_STATUS()             bfin_read32(DCPLB_STATUS)</div><div class='ctx'> #define bfin_write_DCPLB_STATUS(val)         bfin_write32(DCPLB_STATUS,val)</div><div class='ctx'> #define bfin_read_DCPLB_FAULT_ADDR()         bfin_read32(DCPLB_FAULT_ADDR)</div><div class='hunk'>@@ -129,11 +125,7 @@ extern void bfin_write_DMEM_CONTROL(unsigned int val);</div><div class='ctx'> #define DTEST_DATA3            0xFFE0040C</div><div class='ctx'> */</div><div class='ctx'> #define bfin_read_IMEM_CONTROL()             bfin_read32(IMEM_CONTROL)</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-extern void bfin_write_IMEM_CONTROL(unsigned int val);</div><div class='del'>-#else</div><div class='ctx'> #define bfin_write_IMEM_CONTROL(val)         bfin_write32(IMEM_CONTROL,val)</div><div class='del'>-#endif</div><div class='ctx'> #define bfin_read_ICPLB_STATUS()             bfin_read32(ICPLB_STATUS)</div><div class='ctx'> #define bfin_write_ICPLB_STATUS(val)         bfin_write32(ICPLB_STATUS,val)</div><div class='ctx'> #define bfin_read_ICPLB_FAULT_ADDR()         bfin_read32(ICPLB_FAULT_ADDR)</div><div class='head'>diff --git a/include/asm-blackfin/checksum.h b/arch/blackfin/include/asm/checksum.h<br/>index 6f6af2b8e9e0..6f6af2b8e9e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/checksum.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/checksum.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/checksum.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-common/clocks.h b/arch/blackfin/include/asm/clocks.h<br/>index 033bba92d61c..033bba92d61c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-common/clocks.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-common/clocks.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/clocks.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/clocks.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-common/context.S b/arch/blackfin/include/asm/context.S<br/>index c0e630edfb9a..c0e630edfb9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-common/context.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-common/context.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/context.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/context.S</a></div><div class='head'>diff --git a/include/asm-blackfin/cplb-mpu.h b/arch/blackfin/include/asm/cplb-mpu.h<br/>index 75c67b99d607..75c67b99d607 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/cplb-mpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/cplb-mpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/cplb-mpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/cplb-mpu.h</a></div><div class='head'>diff --git a/include/asm-blackfin/cplb.h b/arch/blackfin/include/asm/cplb.h<br/>index 5b0da9a69b67..05d6f05fb748 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/cplb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/cplb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/cplb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/cplb.h</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #define _CPLB_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='del'>-#include &lt;asm/mach/anomaly.h&gt;</div><div class='add'>+#include &lt;mach/anomaly.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SDRAM_IGENERIC    (CPLB_L1_CHBL | CPLB_USER_RD | CPLB_VALID | CPLB_PORTPRIO)</div><div class='ctx'> #define SDRAM_IKERNEL     (SDRAM_IGENERIC | CPLB_LOCK)</div><div class='head'>diff --git a/include/asm-blackfin/cplbinit.h b/arch/blackfin/include/asm/cplbinit.h<br/>index 0eb1c1b685a7..0eb1c1b685a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/cplbinit.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/cplbinit.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/cplbinit.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/cplbinit.h</a></div><div class='head'>diff --git a/include/asm-blackfin/cpumask.h b/arch/blackfin/include/asm/cpumask.h<br/>index b20a8e9012cb..b20a8e9012cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/cpumask.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/cpumask.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/cpumask.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/cpumask.h</a></div><div class='head'>diff --git a/include/asm-blackfin/cputime.h b/arch/blackfin/include/asm/cputime.h<br/>index 2b19705f9885..2b19705f9885 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/cputime.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/cputime.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/cputime.h</a></div><div class='head'>diff --git a/include/asm-blackfin/current.h b/arch/blackfin/include/asm/current.h<br/>index 31918d29122c..31918d29122c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/current.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/current.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/current.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-common/def_LPBlackfin.h b/arch/blackfin/include/asm/def_LPBlackfin.h<br/>index e8967f6124f7..6341eebff3dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-common/def_LPBlackfin.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-common/def_LPBlackfin.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/def_LPBlackfin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/def_LPBlackfin.h</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #ifndef _DEF_LPBLACKFIN_H</div><div class='ctx'> #define _DEF_LPBLACKFIN_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach/anomaly.h&gt;</div><div class='add'>+#include &lt;mach/anomaly.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MK_BMSK_(x) (1&lt;&lt;x)</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/delay.h b/arch/blackfin/include/asm/delay.h<br/>index 473a8113277f..0889c3abb593 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/delay.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/delay.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/delay.h</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #ifndef __ASM_DELAY_H__</div><div class='ctx'> #define __ASM_DELAY_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach/anomaly.h&gt;</div><div class='add'>+#include &lt;mach/anomaly.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void __delay(unsigned long loops)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-blackfin/device.h b/arch/blackfin/include/asm/device.h<br/>index d8f9872b0e2d..d8f9872b0e2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/device.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/device.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/device.h</a></div><div class='head'>diff --git a/include/asm-blackfin/div64.h b/arch/blackfin/include/asm/div64.h<br/>index 6cd978cefb28..6cd978cefb28 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/div64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/div64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/div64.h</a></div><div class='head'>diff --git a/include/asm-blackfin/dma-mapping.h b/arch/blackfin/include/asm/dma-mapping.h<br/>index 1a13c2fc3667..1a13c2fc3667 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/dma-mapping.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/dma-mapping.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/dma-mapping.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/dma-mapping.h</a></div><div class='head'>diff --git a/include/asm-blackfin/dma.h b/arch/blackfin/include/asm/dma.h<br/>index 3cd4b522aa3f..6509733bb0f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/dma.h</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include &lt;asm/signal.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;asm/mach/dma.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='head'>diff --git a/include/asm-blackfin/dpmc.h b/arch/blackfin/include/asm/dpmc.h<br/>index de28e6e018b3..96e8208f929a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/dpmc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/dpmc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/dpmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/dpmc.h</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> void sleep_mode(u32 sic_iwr0, u32 sic_iwr1, u32 sic_iwr2);</div><div class='del'>-void deep_sleep(u32 sic_iwr0, u32 sic_iwr1, u32 sic_iwr2);</div><div class='ctx'> void hibernate_mode(u32 sic_iwr0, u32 sic_iwr1, u32 sic_iwr2);</div><div class='ctx'> void sleep_deeper(u32 sic_iwr0, u32 sic_iwr1, u32 sic_iwr2);</div><div class='ctx'> void do_hibernate(int wakeup);</div><div class='head'>diff --git a/include/asm-blackfin/early_printk.h b/arch/blackfin/include/asm/early_printk.h<br/>index 110f1c1f845c..110f1c1f845c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/early_printk.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/early_printk.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/early_printk.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/early_printk.h</a></div><div class='head'>diff --git a/include/asm-blackfin/elf.h b/arch/blackfin/include/asm/elf.h<br/>index 67a03a8a353e..67a03a8a353e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/elf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/elf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/elf.h</a></div><div class='head'>diff --git a/include/asm-blackfin/emergency-restart.h b/arch/blackfin/include/asm/emergency-restart.h<br/>index 27f6c785d103..27f6c785d103 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/emergency-restart.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/emergency-restart.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/emergency-restart.h</a></div><div class='head'>diff --git a/include/asm-blackfin/entry.h b/arch/blackfin/include/asm/entry.h<br/>index c4f721e0d00d..c4f721e0d00d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/entry.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/entry.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/entry.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/entry.h</a></div><div class='head'>diff --git a/include/asm-blackfin/errno.h b/arch/blackfin/include/asm/errno.h<br/>index 164e4f39bb57..164e4f39bb57 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/errno.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/errno.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/errno.h</a></div><div class='head'>diff --git a/include/asm-blackfin/fb.h b/arch/blackfin/include/asm/fb.h<br/>index c7df38030992..c7df38030992 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/fb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/fb.h</a></div><div class='head'>diff --git a/include/asm-blackfin/fcntl.h b/arch/blackfin/include/asm/fcntl.h<br/>index 9c4037127857..9c4037127857 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/fcntl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/fcntl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/fcntl.h</a></div><div class='head'>diff --git a/arch/blackfin/include/asm/fixed_code.h b/arch/blackfin/include/asm/fixed_code.h<br/>new file mode 100644<br/>index 000000000000..32c4d495d847<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/fixed_code.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/fixed_code.h</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+/* This file defines the fixed addresses where userspace programs can find</div><div class='add'>+   atomic code sequences.  */</div><div class='add'>+</div><div class='add'>+#ifndef __BFIN_ASM_FIXED_CODE_H__</div><div class='add'>+#define __BFIN_ASM_FIXED_CODE_H__</div><div class='add'>+</div><div class='add'>+#ifdef __KERNEL__</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+extern asmlinkage void finish_atomic_sections(struct pt_regs *regs);</div><div class='add'>+extern char fixed_code_start;</div><div class='add'>+extern char fixed_code_end;</div><div class='add'>+extern int atomic_xchg32(void);</div><div class='add'>+extern int atomic_cas32(void);</div><div class='add'>+extern int atomic_add32(void);</div><div class='add'>+extern int atomic_sub32(void);</div><div class='add'>+extern int atomic_ior32(void);</div><div class='add'>+extern int atomic_and32(void);</div><div class='add'>+extern int atomic_xor32(void);</div><div class='add'>+extern void safe_user_instruction(void);</div><div class='add'>+extern void sigreturn_stub(void);</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define FIXED_CODE_START	0x400</div><div class='add'>+</div><div class='add'>+#define SIGRETURN_STUB		0x400</div><div class='add'>+</div><div class='add'>+#define ATOMIC_SEQS_START	0x410</div><div class='add'>+</div><div class='add'>+#define ATOMIC_XCHG32		0x410</div><div class='add'>+#define ATOMIC_CAS32		0x420</div><div class='add'>+#define ATOMIC_ADD32		0x430</div><div class='add'>+#define ATOMIC_SUB32		0x440</div><div class='add'>+#define ATOMIC_IOR32		0x450</div><div class='add'>+#define ATOMIC_AND32		0x460</div><div class='add'>+#define ATOMIC_XOR32		0x470</div><div class='add'>+</div><div class='add'>+#define ATOMIC_SEQS_END		0x480</div><div class='add'>+</div><div class='add'>+#define SAFE_USER_INSTRUCTION   0x480</div><div class='add'>+</div><div class='add'>+#define FIXED_CODE_END		0x490</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/asm-blackfin/flat.h b/arch/blackfin/include/asm/flat.h<br/>index e70074e05f4e..e70074e05f4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/flat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/flat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/flat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/flat.h</a></div><div class='head'>diff --git a/include/asm-blackfin/futex.h b/arch/blackfin/include/asm/futex.h<br/>index 6a332a9f099c..6a332a9f099c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/futex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/futex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/futex.h</a></div><div class='head'>diff --git a/include/asm-blackfin/gpio.h b/arch/blackfin/include/asm/gpio.h<br/>index 168f1251eb4d..ad33ac271fd9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/gpio.h</a></div><div class='hunk'>@@ -224,7 +224,7 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef BF548_FAMILY</div><div class='del'>-#include &lt;asm-blackfin/mach-bf548/gpio.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef BF561_FAMILY</div><div class='head'>diff --git a/include/asm-blackfin/gptimers.h b/arch/blackfin/include/asm/gptimers.h<br/>index 0520d2aac8f3..0520d2aac8f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/gptimers.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/gptimers.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/gptimers.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/gptimers.h</a></div><div class='head'>diff --git a/include/asm-blackfin/hardirq.h b/arch/blackfin/include/asm/hardirq.h<br/>index b6b19f1b9dab..b6b19f1b9dab 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/hardirq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/hardirq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/hardirq.h</a></div><div class='head'>diff --git a/include/asm-blackfin/hw_irq.h b/arch/blackfin/include/asm/hw_irq.h<br/>index 5b51eaec012c..5b51eaec012c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/hw_irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/hw_irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/hw_irq.h</a></div><div class='head'>diff --git a/include/asm-blackfin/io.h b/arch/blackfin/include/asm/io.h<br/>index cbbf7ffdbbff..cbbf7ffdbbff 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/io.h</a></div><div class='head'>diff --git a/include/asm-blackfin/ioctl.h b/arch/blackfin/include/asm/ioctl.h<br/>index b279fe06dfe5..b279fe06dfe5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/ioctl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/ioctl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/ioctl.h</a></div><div class='head'>diff --git a/include/asm-blackfin/ioctls.h b/arch/blackfin/include/asm/ioctls.h<br/>index 895e3173165d..895e3173165d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/ioctls.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/ioctls.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/ioctls.h</a></div><div class='head'>diff --git a/include/asm-blackfin/ipcbuf.h b/arch/blackfin/include/asm/ipcbuf.h<br/>index 8f0899cdf4d2..8f0899cdf4d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/ipcbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/ipcbuf.h</a></div><div class='head'>diff --git a/include/asm-blackfin/irq.h b/arch/blackfin/include/asm/irq.h<br/>index 86b67834354d..89f59e18af93 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/irq.h</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #ifndef _BFIN_IRQ_H_</div><div class='ctx'> #define _BFIN_IRQ_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+#include &lt;mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'>  *   interrupts apart (just the TX/RX for the various devices)</div><div class='ctx'>  *******************************************************************************/</div><div class='ctx'> </div><div class='del'>-/* SYS_IRQS and NR_IRQS are defined in &lt;asm/mach-bf5xx/irq.h&gt;*/</div><div class='add'>+/* SYS_IRQS and NR_IRQS are defined in &lt;mach-bf5xx/irq.h&gt;*/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Machine specific interrupt sources.</div><div class='head'>diff --git a/include/asm-blackfin/irq_handler.h b/arch/blackfin/include/asm/irq_handler.h<br/>index 139b5208f9d8..139b5208f9d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/irq_handler.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/irq_handler.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/irq_handler.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/irq_handler.h</a></div><div class='head'>diff --git a/include/asm-blackfin/irq_regs.h b/arch/blackfin/include/asm/irq_regs.h<br/>index 3dd9c0b70270..3dd9c0b70270 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/irq_regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/irq_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/irq_regs.h</a></div><div class='head'>diff --git a/include/asm-blackfin/kdebug.h b/arch/blackfin/include/asm/kdebug.h<br/>index 6ece1b037665..6ece1b037665 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/kdebug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/kdebug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/kdebug.h</a></div><div class='head'>diff --git a/include/asm-blackfin/kgdb.h b/arch/blackfin/include/asm/kgdb.h<br/>index 0f73847fd6bc..0f73847fd6bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/kgdb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/kgdb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/kgdb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/kgdb.h</a></div><div class='head'>diff --git a/include/asm-blackfin/kmap_types.h b/arch/blackfin/include/asm/kmap_types.h<br/>index e215f7104974..e215f7104974 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/kmap_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/kmap_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/kmap_types.h</a></div><div class='head'>diff --git a/include/asm-blackfin/l1layout.h b/arch/blackfin/include/asm/l1layout.h<br/>index c13ded777828..c13ded777828 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/l1layout.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/l1layout.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/l1layout.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/l1layout.h</a></div><div class='head'>diff --git a/include/asm-blackfin/linkage.h b/arch/blackfin/include/asm/linkage.h<br/>index 5a822bb790f7..5a822bb790f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/linkage.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/linkage.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/linkage.h</a></div><div class='head'>diff --git a/include/asm-blackfin/local.h b/arch/blackfin/include/asm/local.h<br/>index 75afffbc6421..75afffbc6421 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/local.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/local.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/local.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mem_map.h b/arch/blackfin/include/asm/mem_map.h<br/>index 42d1f37f6d9c..88d04a707708 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mem_map.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mem_map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/mem_map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/mem_map.h</a></div><div class='hunk'>@@ -7,6 +7,6 @@</div><div class='ctx'> #ifndef _MEM_MAP_H_</div><div class='ctx'> #define _MEM_MAP_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach/mem_map.h&gt;</div><div class='add'>+#include &lt;mach/mem_map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif				/* _MEM_MAP_H_ */</div><div class='head'>diff --git a/include/asm-blackfin/mman.h b/arch/blackfin/include/asm/mman.h<br/>index b58f5ad3f024..b58f5ad3f024 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mman.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mman.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/mman.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mmu.h b/arch/blackfin/include/asm/mmu.h<br/>index 757e43906ed4..757e43906ed4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mmu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mmu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/mmu.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mmu_context.h b/arch/blackfin/include/asm/mmu_context.h<br/>index f55ec3c23a92..8529552a981f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mmu_context.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mmu_context.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -173,8 +173,10 @@ static inline void protect_page(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> </div><div class='ctx'> static inline void update_protections(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	flush_switched_cplbs();</div><div class='del'>-	set_mask_dcplbs(mm-&gt;context.page_rwx_mask);</div><div class='add'>+	if (mm-&gt;context.page_rwx_mask == current_rwx_mask) {</div><div class='add'>+		flush_switched_cplbs();</div><div class='add'>+		set_mask_dcplbs(mm-&gt;context.page_rwx_mask);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/module.h b/arch/blackfin/include/asm/module.h<br/>index e3128df139d6..e3128df139d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/module.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/module.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/module.h</a></div><div class='head'>diff --git a/include/asm-blackfin/msgbuf.h b/arch/blackfin/include/asm/msgbuf.h<br/>index 6fcbe8cd801d..6fcbe8cd801d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/msgbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/msgbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/msgbuf.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mutex.h b/arch/blackfin/include/asm/mutex.h<br/>index 458c1f7fbc18..458c1f7fbc18 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mutex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mutex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/mutex.h</a></div><div class='head'>diff --git a/include/asm-blackfin/nand.h b/arch/blackfin/include/asm/nand.h<br/>index afbaafa793f1..afbaafa793f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/nand.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/nand.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/nand.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/nand.h</a></div><div class='head'>diff --git a/include/asm-blackfin/page.h b/arch/blackfin/include/asm/page.h<br/>index 344f6a8c1f22..344f6a8c1f22 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/page.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/page.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/page.h</a></div><div class='head'>diff --git a/include/asm-blackfin/page_offset.h b/arch/blackfin/include/asm/page_offset.h<br/>index cbaff24b4b25..cbaff24b4b25 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/page_offset.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/page_offset.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/page_offset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/page_offset.h</a></div><div class='head'>diff --git a/include/asm-blackfin/param.h b/arch/blackfin/include/asm/param.h<br/>index 41564a6347f8..41564a6347f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/param.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/param.h</a></div><div class='head'>diff --git a/include/asm-blackfin/pci.h b/arch/blackfin/include/asm/pci.h<br/>index 61277358c865..61277358c865 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/pci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/pci.h</a></div><div class='head'>diff --git a/include/asm-blackfin/percpu.h b/arch/blackfin/include/asm/percpu.h<br/>index 78dd61f6b39f..78dd61f6b39f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/percpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/percpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/percpu.h</a></div><div class='head'>diff --git a/include/asm-blackfin/pgalloc.h b/arch/blackfin/include/asm/pgalloc.h<br/>index c686e0542fd0..c686e0542fd0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/pgalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/pgalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/pgalloc.h</a></div><div class='head'>diff --git a/include/asm-blackfin/pgtable.h b/arch/blackfin/include/asm/pgtable.h<br/>index b11b114689c0..f11684e4ade7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/pgtable.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/pgtable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/pgtable.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> #include &lt;asm-generic/4level-fixup.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/mach-common/def_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/def_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef pte_t *pte_addr_t;</div><div class='ctx'> /*</div><div class='head'>diff --git a/include/asm-blackfin/poll.h b/arch/blackfin/include/asm/poll.h<br/>index 94cc2636e0e2..94cc2636e0e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/poll.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/poll.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/poll.h</a></div><div class='head'>diff --git a/include/asm-blackfin/portmux.h b/arch/blackfin/include/asm/portmux.h<br/>index 0807b286cd9e..88eb5c07cc24 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/portmux.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/portmux.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/portmux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/portmux.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@ int peripheral_request_list(const unsigned short per[], const char *label);</div><div class='ctx'> void peripheral_free_list(const unsigned short per[]);</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='del'>-#include &lt;asm/mach/portmux.h&gt;</div><div class='add'>+#include &lt;mach/portmux.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef P_SPORT2_TFS</div><div class='ctx'> #define P_SPORT2_TFS P_UNDEF</div><div class='head'>diff --git a/include/asm-blackfin/posix_types.h b/arch/blackfin/include/asm/posix_types.h<br/>index 23aa1f8c1bd1..23aa1f8c1bd1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/posix_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/posix_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/posix_types.h</a></div><div class='head'>diff --git a/include/asm-blackfin/processor.h b/arch/blackfin/include/asm/processor.h<br/>index 6f3995b119d8..6f3995b119d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/processor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/processor.h</a></div><div class='head'>diff --git a/include/asm-blackfin/ptrace.h b/arch/blackfin/include/asm/ptrace.h<br/>index a45a80e54adc..a45a80e54adc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/ptrace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/ptrace.h</a></div><div class='head'>diff --git a/include/asm-blackfin/reboot.h b/arch/blackfin/include/asm/reboot.h<br/>index 6d448b5f5985..6d448b5f5985 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/reboot.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/reboot.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/reboot.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/reboot.h</a></div><div class='head'>diff --git a/include/asm-blackfin/resource.h b/arch/blackfin/include/asm/resource.h<br/>index 091355ab3495..091355ab3495 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/resource.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/resource.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/resource.h</a></div><div class='head'>diff --git a/include/asm-blackfin/scatterlist.h b/arch/blackfin/include/asm/scatterlist.h<br/>index 04f448711cd0..04f448711cd0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/scatterlist.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/scatterlist.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/scatterlist.h</a></div><div class='head'>diff --git a/include/asm-blackfin/sections.h b/arch/blackfin/include/asm/sections.h<br/>index 1443c3353a8c..1443c3353a8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/sections.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/sections.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/sections.h</a></div><div class='head'>diff --git a/include/asm-blackfin/segment.h b/arch/blackfin/include/asm/segment.h<br/>index 02cfd09b5a99..02cfd09b5a99 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/segment.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/segment.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/segment.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/segment.h</a></div><div class='head'>diff --git a/include/asm-blackfin/sembuf.h b/arch/blackfin/include/asm/sembuf.h<br/>index 18deb5c7fa5d..18deb5c7fa5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/sembuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/sembuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/sembuf.h</a></div><div class='head'>diff --git a/include/asm-blackfin/serial.h b/arch/blackfin/include/asm/serial.h<br/>index 994dd869558c..994dd869558c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/serial.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/serial.h</a></div><div class='head'>diff --git a/include/asm-blackfin/setup.h b/arch/blackfin/include/asm/setup.h<br/>index 01c8c6cbe6fc..01c8c6cbe6fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/setup.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/setup.h</a></div><div class='head'>diff --git a/include/asm-blackfin/shmbuf.h b/arch/blackfin/include/asm/shmbuf.h<br/>index 612436303e89..612436303e89 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/shmbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/shmbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/shmbuf.h</a></div><div class='head'>diff --git a/include/asm-blackfin/shmparam.h b/arch/blackfin/include/asm/shmparam.h<br/>index 3c03906b7664..3c03906b7664 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/shmparam.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/shmparam.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/shmparam.h</a></div><div class='head'>diff --git a/include/asm-blackfin/sigcontext.h b/arch/blackfin/include/asm/sigcontext.h<br/>index ce00b03c2775..ce00b03c2775 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/sigcontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/sigcontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/sigcontext.h</a></div><div class='head'>diff --git a/include/asm-blackfin/siginfo.h b/arch/blackfin/include/asm/siginfo.h<br/>index eca4565cea37..eca4565cea37 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/siginfo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/siginfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/siginfo.h</a></div><div class='head'>diff --git a/include/asm-blackfin/signal.h b/arch/blackfin/include/asm/signal.h<br/>index 87951d251458..87951d251458 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/signal.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/signal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/signal.h</a></div><div class='head'>diff --git a/include/asm-blackfin/socket.h b/arch/blackfin/include/asm/socket.h<br/>index 2ca702e44d47..2ca702e44d47 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/socket.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/socket.h</a></div><div class='head'>diff --git a/include/asm-blackfin/sockios.h b/arch/blackfin/include/asm/sockios.h<br/>index 426b89bfaa8b..426b89bfaa8b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/sockios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/sockios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/sockios.h</a></div><div class='head'>diff --git a/include/asm-blackfin/spinlock.h b/arch/blackfin/include/asm/spinlock.h<br/>index 64e908a50646..64e908a50646 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/spinlock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/spinlock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/spinlock.h</a></div><div class='head'>diff --git a/include/asm-blackfin/stat.h b/arch/blackfin/include/asm/stat.h<br/>index d2b6f11ec231..d2b6f11ec231 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/stat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/stat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/stat.h</a></div><div class='head'>diff --git a/include/asm-blackfin/statfs.h b/arch/blackfin/include/asm/statfs.h<br/>index 350672091ba3..350672091ba3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/statfs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/statfs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/statfs.h</a></div><div class='head'>diff --git a/include/asm-blackfin/string.h b/arch/blackfin/include/asm/string.h<br/>index 321f4d96e4ae..321f4d96e4ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/string.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/string.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/string.h</a></div><div class='head'>diff --git a/include/asm-blackfin/system.h b/arch/blackfin/include/asm/system.h<br/>index 51494ef5bb41..8f1627d8bf09 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/system.h</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;asm/mach/anomaly.h&gt;</div><div class='add'>+#include &lt;mach/anomaly.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Interrupt configuring macros.</div><div class='head'>diff --git a/include/asm-blackfin/termbits.h b/arch/blackfin/include/asm/termbits.h<br/>index f37feb7cf895..f37feb7cf895 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/termbits.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/termbits.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/termbits.h</a></div><div class='head'>diff --git a/include/asm-blackfin/termios.h b/arch/blackfin/include/asm/termios.h<br/>index d50d063c605a..d50d063c605a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/termios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/termios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/termios.h</a></div><div class='head'>diff --git a/include/asm-blackfin/thread_info.h b/arch/blackfin/include/asm/thread_info.h<br/>index 642769329d12..642769329d12 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/thread_info.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/thread_info.h</a></div><div class='head'>diff --git a/include/asm-blackfin/time.h b/arch/blackfin/include/asm/time.h<br/>index ddc43ce38533..ddc43ce38533 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/time.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/time.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/time.h</a></div><div class='head'>diff --git a/include/asm-blackfin/timex.h b/arch/blackfin/include/asm/timex.h<br/>index 22b0806161bb..22b0806161bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/timex.h</a></div><div class='head'>diff --git a/include/asm-blackfin/tlb.h b/arch/blackfin/include/asm/tlb.h<br/>index 89a12ee916d8..89a12ee916d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/tlb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/tlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/tlb.h</a></div><div class='head'>diff --git a/include/asm-blackfin/tlbflush.h b/arch/blackfin/include/asm/tlbflush.h<br/>index 277b400924b8..277b400924b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/tlbflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/tlbflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/tlbflush.h</a></div><div class='head'>diff --git a/include/asm-blackfin/topology.h b/arch/blackfin/include/asm/topology.h<br/>index acee23987897..acee23987897 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/topology.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/topology.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/topology.h</a></div><div class='head'>diff --git a/include/asm-blackfin/trace.h b/arch/blackfin/include/asm/trace.h<br/>index 312b596b9731..312b596b9731 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/trace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/trace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/trace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/trace.h</a></div><div class='head'>diff --git a/include/asm-blackfin/traps.h b/arch/blackfin/include/asm/traps.h<br/>index f0e5f940d9ca..f0e5f940d9ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/traps.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/traps.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/traps.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/traps.h</a></div><div class='head'>diff --git a/include/asm-blackfin/types.h b/arch/blackfin/include/asm/types.h<br/>index 8441cbc2bf9e..8441cbc2bf9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/types.h</a></div><div class='head'>diff --git a/include/asm-blackfin/uaccess.h b/arch/blackfin/include/asm/uaccess.h<br/>index d928b8099056..d928b8099056 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/uaccess.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/uaccess.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/uaccess.h</a></div><div class='head'>diff --git a/include/asm-blackfin/ucontext.h b/arch/blackfin/include/asm/ucontext.h<br/>index 4a4e3856beba..4a4e3856beba 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/ucontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/ucontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/ucontext.h</a></div><div class='head'>diff --git a/include/asm-blackfin/unaligned.h b/arch/blackfin/include/asm/unaligned.h<br/>index fd8a1d634945..fd8a1d634945 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/unaligned.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/unaligned.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/unaligned.h</a></div><div class='head'>diff --git a/include/asm-blackfin/unistd.h b/arch/blackfin/include/asm/unistd.h<br/>index 42955d0c439b..1e57b636e0bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/unistd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/unistd.h</a></div><div class='hunk'>@@ -372,8 +372,14 @@</div><div class='ctx'> #define __NR_semtimedop		357</div><div class='ctx'> #define __NR_timerfd_settime	358</div><div class='ctx'> #define __NR_timerfd_gettime	359</div><div class='add'>+#define __NR_signalfd4		360</div><div class='add'>+#define __NR_eventfd2		361</div><div class='add'>+#define __NR_epoll_create1	362</div><div class='add'>+#define __NR_dup3		363</div><div class='add'>+#define __NR_pipe2		364</div><div class='add'>+#define __NR_inotify_init1	365</div><div class='ctx'> </div><div class='del'>-#define __NR_syscall		360</div><div class='add'>+#define __NR_syscall		366</div><div class='ctx'> #define NR_syscalls		__NR_syscall</div><div class='ctx'> </div><div class='ctx'> /* Old optional stuff no one actually uses */</div><div class='head'>diff --git a/include/asm-blackfin/user.h b/arch/blackfin/include/asm/user.h<br/>index afe6a0e1f7ce..afe6a0e1f7ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/user.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/user.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/include/asm/user.h</a></div><div class='head'>diff --git a/arch/blackfin/kernel/cplb-mpu/cacheinit.c b/arch/blackfin/kernel/cplb-mpu/cacheinit.c<br/>index 9eecfa403187..a8b712a24c59 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/cplb-mpu/cacheinit.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/kernel/cplb-mpu/cacheinit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/cplb-mpu/cacheinit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/kernel/cplb-mpu/cacheinit.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;asm/cplbinit.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_BFIN_ICACHE)</div><div class='del'>-void bfin_icache_init(void)</div><div class='add'>+void __init bfin_icache_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ctrl;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -43,7 +43,7 @@ void bfin_icache_init(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_BFIN_DCACHE)</div><div class='del'>-void bfin_dcache_init(void)</div><div class='add'>+void __init bfin_dcache_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ctrl;</div><div class='ctx'> 	int i;</div><div class='head'>diff --git a/arch/blackfin/kernel/cplb-nompu/cacheinit.c b/arch/blackfin/kernel/cplb-nompu/cacheinit.c<br/>index 8a18399f6072..bd0831592c2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/cplb-nompu/cacheinit.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/kernel/cplb-nompu/cacheinit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/cplb-nompu/cacheinit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/kernel/cplb-nompu/cacheinit.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;asm/cplbinit.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_BFIN_ICACHE)</div><div class='del'>-void bfin_icache_init(void)</div><div class='add'>+void __init bfin_icache_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long *table = icplb_table;</div><div class='ctx'> 	unsigned long ctrl;</div><div class='hunk'>@@ -47,7 +47,7 @@ void bfin_icache_init(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_BFIN_DCACHE)</div><div class='del'>-void bfin_dcache_init(void)</div><div class='add'>+void __init bfin_dcache_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long *table = dcplb_table;</div><div class='ctx'> 	unsigned long ctrl;</div><div class='head'>diff --git a/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/arch/blackfin/kernel/cplb-nompu/cplbinit.c<br/>index 224e7cc30bc5..728f708d3981 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/cplb-nompu/cplbinit.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/kernel/cplb-nompu/cplbinit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/cplb-nompu/cplbinit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/kernel/cplb-nompu/cplbinit.c</a></div><div class='hunk'>@@ -164,17 +164,13 @@ static struct cplb_desc cplb_data[] = {</div><div class='ctx'> 		.name = "Asynchronous Memory Banks",</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-#ifdef L2_START</div><div class='ctx'> 		.start = L2_START,</div><div class='ctx'> 		.end = L2_START + L2_LENGTH,</div><div class='ctx'> 		.psize = SIZE_1M,</div><div class='ctx'> 		.attr = SWITCH_T | I_CPLB | D_CPLB,</div><div class='ctx'> 		.i_conf = L2_MEMORY,</div><div class='ctx'> 		.d_conf = L2_MEMORY,</div><div class='del'>-		.valid = 1,</div><div class='del'>-#else</div><div class='del'>-		.valid = 0,</div><div class='del'>-#endif</div><div class='add'>+		.valid = (L2_LENGTH &gt; 0),</div><div class='ctx'> 		.name = "L2 Memory",</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='head'>diff --git a/arch/blackfin/kernel/entry.S b/arch/blackfin/kernel/entry.S<br/>index 31bd9bf3efae..faea88ebb2ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/entry.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/kernel/entry.S</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach-common/context.S&gt;</div><div class='add'>+#include &lt;asm/context.S&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EXCPT_IRQ_SYSC_L1</div><div class='ctx'> .section .l1.text</div><div class='head'>diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c<br/>index 23e637eb78da..7a82d10b4ebf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/kernel/setup.c</a></div><div class='hunk'>@@ -52,6 +52,7 @@ EXPORT_SYMBOL(mtd_size);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> char __initdata command_line[COMMAND_LINE_SIZE];</div><div class='add'>+unsigned int __initdata *__retx;</div><div class='ctx'> </div><div class='ctx'> /* boot memmap, for parsing "memmap=" */</div><div class='ctx'> #define BFIN_MEMMAP_MAX		128 /* number of entries in bfin_memmap */</div><div class='hunk'>@@ -131,14 +132,14 @@ void __init bf53x_relocate_l1_mem(void)</div><div class='ctx'> 	dma_memcpy(_sdata_b_l1, _l1_lma_start + l1_code_length +</div><div class='ctx'> 			l1_data_a_length, l1_data_b_length);</div><div class='ctx'> </div><div class='del'>-#ifdef L2_LENGTH</div><div class='del'>-	l2_length = _ebss_l2 - _stext_l2;</div><div class='del'>-	if (l2_length &gt; L2_LENGTH)</div><div class='del'>-		panic("L2 SRAM Overflow\n");</div><div class='add'>+	if (L2_LENGTH != 0) {</div><div class='add'>+		l2_length = _ebss_l2 - _stext_l2;</div><div class='add'>+		if (l2_length &gt; L2_LENGTH)</div><div class='add'>+			panic("L2 SRAM Overflow\n");</div><div class='ctx'> </div><div class='del'>-	/* Copy _stext_l2 to _edata_l2 to L2 SRAM */</div><div class='del'>-	dma_memcpy(_stext_l2, _l2_lma_start, l2_length);</div><div class='del'>-#endif</div><div class='add'>+		/* Copy _stext_l2 to _edata_l2 to L2 SRAM */</div><div class='add'>+		dma_memcpy(_stext_l2, _l2_lma_start, l2_length);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* add_memory_region to memmap */</div><div class='hunk'>@@ -738,6 +739,16 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> </div><div class='ctx'> 	memory_setup();</div><div class='ctx'> </div><div class='add'>+	/* Initialize Async memory banks */</div><div class='add'>+	bfin_write_EBIU_AMBCTL0(AMBCTL0VAL);</div><div class='add'>+	bfin_write_EBIU_AMBCTL1(AMBCTL1VAL);</div><div class='add'>+	bfin_write_EBIU_AMGCTL(AMGCTLVAL);</div><div class='add'>+#ifdef CONFIG_EBIU_MBSCTLVAL</div><div class='add'>+	bfin_write_EBIU_MBSCTL(CONFIG_EBIU_MBSCTLVAL);</div><div class='add'>+	bfin_write_EBIU_MODE(CONFIG_EBIU_MODEVAL);</div><div class='add'>+	bfin_write_EBIU_FCTL(CONFIG_EBIU_FCTLVAL);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	cclk = get_cclk();</div><div class='ctx'> 	sclk = get_sclk();</div><div class='ctx'> </div><div class='hunk'>@@ -775,7 +786,11 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	bfin_write_SWRST(DOUBLE_FAULT);</div><div class='ctx'> </div><div class='ctx'> 	if (_bfin_swrst &amp; RESET_DOUBLE)</div><div class='del'>-		printk(KERN_INFO "Recovering from Double Fault event\n");</div><div class='add'>+		/*</div><div class='add'>+		 * don't decode the address, since you don't know if this</div><div class='add'>+		 * kernel's symbol map is the same as the crashing kernel</div><div class='add'>+		 */</div><div class='add'>+		printk(KERN_INFO "Recovering from Double Fault event at %pF\n", __retx);</div><div class='ctx'> 	else if (_bfin_swrst &amp; RESET_WDOG)</div><div class='ctx'> 		printk(KERN_INFO "Recovering from Watchdog event\n");</div><div class='ctx'> 	else if (_bfin_swrst &amp; RESET_SOFTWARE)</div><div class='hunk'>@@ -1049,7 +1064,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> 		   dsup_banks, BFIN_DSUBBANKS, BFIN_DWAYS,</div><div class='ctx'> 		   BFIN_DLINES);</div><div class='ctx'> #ifdef CONFIG_BFIN_ICACHE_LOCK</div><div class='del'>-	switch (read_iloc()) {</div><div class='add'>+	switch ((bfin_read_IMEM_CONTROL() &gt;&gt; 3) &amp; WAYALL_L) {</div><div class='ctx'> 	case WAY0_L:</div><div class='ctx'> 		seq_printf(m, "Way0 Locked-Down\n");</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c<br/>index ad922ab91543..9a9d5083acfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/traps.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/traps.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/kernel/traps.c</a></div><div class='hunk'>@@ -567,7 +567,7 @@ bool get_instruction(unsigned short *val, unsigned short *address)</div><div class='ctx'> 	 * we don't read something in the async space that can hang forever</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((addr &gt;= FIXED_CODE_START &amp;&amp; (addr + 2) &lt;= physical_mem_end) ||</div><div class='del'>-#ifdef L2_START</div><div class='add'>+#if L2_LENGTH != 0</div><div class='ctx'> 	    (addr &gt;= L2_START &amp;&amp; (addr + 2) &lt;= (L2_START + L2_LENGTH)) ||</div><div class='ctx'> #endif</div><div class='ctx'> 	    (addr &gt;= BOOT_ROM_START &amp;&amp; (addr + 2) &lt;= (BOOT_ROM_START + BOOT_ROM_LENGTH)) ||</div><div class='hunk'>@@ -601,12 +601,55 @@ bool get_instruction(unsigned short *val, unsigned short *address)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* </div><div class='add'>+ * decode the instruction if we are printing out the trace, as it</div><div class='add'>+ * makes things easier to follow, without running it through objdump</div><div class='add'>+ * These are the normal instructions which cause change of flow, which</div><div class='add'>+ * would be at the source of the trace buffer</div><div class='add'>+ */</div><div class='add'>+void decode_instruction(unsigned short *address)</div><div class='add'>+{</div><div class='add'>+	unsigned short opcode;</div><div class='add'>+</div><div class='add'>+	if (get_instruction(&amp;opcode, address)) {</div><div class='add'>+		if (opcode == 0x0010)</div><div class='add'>+			printk("RTS");</div><div class='add'>+		else if (opcode == 0x0011)</div><div class='add'>+			printk("RTI");</div><div class='add'>+		else if (opcode == 0x0012)</div><div class='add'>+			printk("RTX");</div><div class='add'>+		else if (opcode &gt;= 0x0050 &amp;&amp; opcode &lt;= 0x0057)</div><div class='add'>+			printk("JUMP (P%i)", opcode &amp; 7);</div><div class='add'>+		else if (opcode &gt;= 0x0060 &amp;&amp; opcode &lt;= 0x0067)</div><div class='add'>+			printk("CALL (P%i)", opcode &amp; 7);</div><div class='add'>+		else if (opcode &gt;= 0x0070 &amp;&amp; opcode &lt;= 0x0077)</div><div class='add'>+			printk("CALL (PC+P%i)", opcode &amp; 7);</div><div class='add'>+		else if (opcode &gt;= 0x0080 &amp;&amp; opcode &lt;= 0x0087)</div><div class='add'>+			printk("JUMP (PC+P%i)", opcode &amp; 7);</div><div class='add'>+		else if ((opcode &gt;= 0x1000 &amp;&amp; opcode &lt;= 0x13FF) || (opcode &gt;= 0x1800 &amp;&amp; opcode &lt;= 0x1BFF))</div><div class='add'>+			printk("IF !CC JUMP");</div><div class='add'>+		else if ((opcode &gt;= 0x1400 &amp;&amp; opcode &lt;= 0x17ff) || (opcode &gt;= 0x1c00 &amp;&amp; opcode &lt;= 0x1fff))</div><div class='add'>+			printk("IF CC JUMP");</div><div class='add'>+		else if (opcode &gt;= 0x2000 &amp;&amp; opcode &lt;= 0x2fff)</div><div class='add'>+			printk("JUMP.S");</div><div class='add'>+		else if (opcode &gt;= 0xe080 &amp;&amp; opcode &lt;= 0xe0ff)</div><div class='add'>+			printk("LSETUP");</div><div class='add'>+		else if (opcode &gt;= 0xe200 &amp;&amp; opcode &lt;= 0xe2ff)</div><div class='add'>+			printk("JUMP.L");</div><div class='add'>+		else if (opcode &gt;= 0xe300 &amp;&amp; opcode &lt;= 0xe3ff)</div><div class='add'>+			printk("CALL pcrel");</div><div class='add'>+		else</div><div class='add'>+			printk("0x%04x", opcode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void dump_bfin_trace_buffer(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_DEBUG_BFIN_HWTRACE_ON</div><div class='ctx'> 	int tflags, i = 0;</div><div class='ctx'> 	char buf[150];</div><div class='del'>-	unsigned short val = 0, *addr;</div><div class='add'>+	unsigned short *addr;</div><div class='ctx'> #ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND</div><div class='ctx'> 	int j, index;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -615,6 +658,10 @@ void dump_bfin_trace_buffer(void)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_NOTICE "Hardware Trace:\n");</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND</div><div class='add'>+	printk(KERN_NOTICE "WARNING: Expanded trace turned on - can not trace exceptions\n");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (likely(bfin_read_TBUFSTAT() &amp; TBUFCNT)) {</div><div class='ctx'> 		for (; bfin_read_TBUFSTAT() &amp; TBUFCNT; i++) {</div><div class='ctx'> 			decode_address(buf, (unsigned long)bfin_read_TBUF());</div><div class='hunk'>@@ -622,45 +669,14 @@ void dump_bfin_trace_buffer(void)</div><div class='ctx'> 			addr = (unsigned short *)bfin_read_TBUF();</div><div class='ctx'> 			decode_address(buf, (unsigned long)addr);</div><div class='ctx'> 			printk(KERN_NOTICE "     Source : %s ", buf);</div><div class='del'>-			if (get_instruction(&amp;val, addr)) {</div><div class='del'>-				if (val == 0x0010)</div><div class='del'>-					printk("RTS");</div><div class='del'>-				else if (val == 0x0011)</div><div class='del'>-					printk("RTI");</div><div class='del'>-				else if (val == 0x0012)</div><div class='del'>-					printk("RTX");</div><div class='del'>-				else if (val &gt;= 0x0050 &amp;&amp; val &lt;= 0x0057)</div><div class='del'>-					printk("JUMP (P%i)", val &amp; 7);</div><div class='del'>-				else if (val &gt;= 0x0060 &amp;&amp; val &lt;= 0x0067)</div><div class='del'>-					printk("CALL (P%i)", val &amp; 7);</div><div class='del'>-				else if (val &gt;= 0x0070 &amp;&amp; val &lt;= 0x0077)</div><div class='del'>-					printk("CALL (PC+P%i)", val &amp; 7);</div><div class='del'>-				else if (val &gt;= 0x0080 &amp;&amp; val &lt;= 0x0087)</div><div class='del'>-					printk("JUMP (PC+P%i)", val &amp; 7);</div><div class='del'>-				else if ((val &gt;= 0x1000 &amp;&amp; val &lt;= 0x13FF) ||</div><div class='del'>-				    (val &gt;= 0x1800 &amp;&amp; val &lt;= 0x1BFF))</div><div class='del'>-					printk("IF !CC JUMP");</div><div class='del'>-				else if ((val &gt;= 0x1400 &amp;&amp; val &lt;= 0x17ff) ||</div><div class='del'>-				    (val &gt;= 0x1c00 &amp;&amp; val &lt;= 0x1fff))</div><div class='del'>-					printk("IF CC JUMP");</div><div class='del'>-				else if (val &gt;= 0x2000 &amp;&amp; val &lt;= 0x2fff)</div><div class='del'>-					printk("JUMP.S");</div><div class='del'>-				else if (val &gt;= 0xe080 &amp;&amp; val &lt;= 0xe0ff)</div><div class='del'>-					printk("LSETUP");</div><div class='del'>-				else if (val &gt;= 0xe200 &amp;&amp; val &lt;= 0xe2ff)</div><div class='del'>-					printk("JUMP.L");</div><div class='del'>-				else if (val &gt;= 0xe300 &amp;&amp; val &lt;= 0xe3ff)</div><div class='del'>-					printk("CALL pcrel");</div><div class='del'>-				else</div><div class='del'>-					printk("0x%04x", val);</div><div class='del'>-			}</div><div class='add'>+			decode_instruction(addr);</div><div class='ctx'> 			printk("\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND</div><div class='ctx'> 	if (trace_buff_offset)</div><div class='del'>-		index = trace_buff_offset/4 - 1;</div><div class='add'>+		index = trace_buff_offset / 4;</div><div class='ctx'> 	else</div><div class='ctx'> 		index = EXPAND_LEN;</div><div class='ctx'> </div><div class='hunk'>@@ -672,7 +688,9 @@ void dump_bfin_trace_buffer(void)</div><div class='ctx'> 		if (index &lt; 0 )</div><div class='ctx'> 			index = EXPAND_LEN;</div><div class='ctx'> 		decode_address(buf, software_trace_buff[index]);</div><div class='del'>-		printk(KERN_NOTICE "     Source : %s\n", buf);</div><div class='add'>+		printk(KERN_NOTICE "     Source : %s ", buf);</div><div class='add'>+		decode_instruction((unsigned short *)software_trace_buff[index]);</div><div class='add'>+		printk("\n");</div><div class='ctx'> 		index -= 1;</div><div class='ctx'> 		if (index &lt; 0)</div><div class='ctx'> 			index = EXPAND_LEN;</div><div class='head'>diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S<br/>index 0896e38d6108..7d12c6692a65 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/vmlinux.lds.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/vmlinux.lds.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -83,6 +83,7 @@ SECTIONS</div><div class='ctx'> #if !L1_DATA_B_LENGTH</div><div class='ctx'> 		*(.l1.bss.B)</div><div class='ctx'> #endif</div><div class='add'>+		. = ALIGN(4);</div><div class='ctx'> 		___bss_stop = .;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -101,7 +102,7 @@ SECTIONS</div><div class='ctx'> #if !L1_DATA_B_LENGTH</div><div class='ctx'> 		*(.l1.data.B)</div><div class='ctx'> #endif</div><div class='del'>-#ifndef L2_LENGTH</div><div class='add'>+#if !L2_LENGTH</div><div class='ctx'> 		. = ALIGN(32);</div><div class='ctx'> 		*(.data_l2.cacheline_aligned)</div><div class='ctx'> 		*(.l2.data)</div><div class='hunk'>@@ -211,20 +212,19 @@ SECTIONS</div><div class='ctx'> 		__ebss_b_l1 = .;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef L2_LENGTH</div><div class='ctx'> 	__l2_lma_start = .;</div><div class='ctx'> </div><div class='ctx'> 	.text_data_l2 L2_START : AT(LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1))</div><div class='ctx'> 	{</div><div class='ctx'> 		. = ALIGN(4);</div><div class='ctx'> 		__stext_l2 = .;</div><div class='del'>-		*(.l1.text)</div><div class='add'>+		*(.l2.text)</div><div class='ctx'> 		. = ALIGN(4);</div><div class='ctx'> 		__etext_l2 = .;</div><div class='ctx'> </div><div class='ctx'> 		. = ALIGN(4);</div><div class='ctx'> 		__sdata_l2 = .;</div><div class='del'>-		*(.l1.data)</div><div class='add'>+		*(.l2.data)</div><div class='ctx'> 		__edata_l2 = .;</div><div class='ctx'> </div><div class='ctx'> 		. = ALIGN(32);</div><div class='hunk'>@@ -232,11 +232,10 @@ SECTIONS</div><div class='ctx'> </div><div class='ctx'> 		. = ALIGN(4);</div><div class='ctx'> 		__sbss_l2 = .;</div><div class='del'>-		*(.l1.bss)</div><div class='add'>+		*(.l2.bss)</div><div class='ctx'> 		. = ALIGN(4);</div><div class='ctx'> 		__ebss_l2 = .;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Force trailing alignment of our init section so that when we</div><div class='ctx'> 	 * free our init memory, we don't leave behind a partial page.</div><div class='head'>diff --git a/arch/blackfin/lib/ins.S b/arch/blackfin/lib/ins.S<br/>index eba2343b1b59..d60554dce87b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/lib/ins.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/lib/ins.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/lib/ins.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/lib/ins.S</a></div><div class='hunk'>@@ -33,7 +33,28 @@</div><div class='ctx'> </div><div class='ctx'> .align 2</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Reads on the Blackfin are speculative. In Blackfin terms, this means they</div><div class='add'>+ * can be interrupted at any time (even after they have been issued on to the</div><div class='add'>+ * external bus), and re-issued after the interrupt occurs.</div><div class='add'>+ *</div><div class='add'>+ * If a FIFO is sitting on the end of the read, it will see two reads,</div><div class='add'>+ * when the core only sees one. The FIFO receives the read which is cancelled,</div><div class='add'>+ * and not delivered to the core.</div><div class='add'>+ *</div><div class='add'>+ * To solve this, interrupts are turned off before reads occur to I/O space.</div><div class='add'>+ * There are 3 versions of all these functions</div><div class='add'>+ *  - turns interrupts off every read (higher overhead, but lower latency)</div><div class='add'>+ *  - turns interrupts off every loop (low overhead, but longer latency)</div><div class='add'>+ *  - DMA version, which do not suffer from this issue. DMA versions have</div><div class='add'>+ *      different name (prefixed by dma_ ), and are located in</div><div class='add'>+ *      ../kernel/bfin_dma_5xx.c</div><div class='add'>+ * Using the dma related functions are recommended for transfering large</div><div class='add'>+ * buffers in/out of FIFOs.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> ENTRY(_insl)</div><div class='add'>+#ifdef CONFIG_BFIN_INS_LOWOVERHEAD</div><div class='ctx'> 	P0 = R0;	/* P0 = port */</div><div class='ctx'> 	cli R3;</div><div class='ctx'> 	P1 = R1;	/* P1 = address */</div><div class='hunk'>@@ -46,9 +67,26 @@ ENTRY(_insl)</div><div class='ctx'> .Llong_loop_e: 	NOP;</div><div class='ctx'> 	sti R3;</div><div class='ctx'> 	RTS;</div><div class='add'>+#else</div><div class='add'>+	P0 = R0;	/* P0 = port */</div><div class='add'>+	P1 = R1;	/* P1 = address */</div><div class='add'>+	P2 = R2;	/* P2 = count */</div><div class='add'>+	SSYNC;</div><div class='add'>+	LSETUP( .Llong_loop_s, .Llong_loop_e) LC0 = P2;</div><div class='add'>+.Llong_loop_s:</div><div class='add'>+	CLI R3;</div><div class='add'>+	NOP; NOP; NOP;</div><div class='add'>+	R0 = [P0];</div><div class='add'>+	[P1++] = R0;</div><div class='add'>+.Llong_loop_e:</div><div class='add'>+	STI R3;</div><div class='add'>+</div><div class='add'>+	RTS;</div><div class='add'>+#endif</div><div class='ctx'> ENDPROC(_insl)</div><div class='ctx'> </div><div class='ctx'> ENTRY(_insw)</div><div class='add'>+#ifdef CONFIG_BFIN_INS_LOWOVERHEAD</div><div class='ctx'> 	P0 = R0;	/* P0 = port */</div><div class='ctx'> 	cli R3;</div><div class='ctx'> 	P1 = R1;	/* P1 = address */</div><div class='hunk'>@@ -61,9 +99,26 @@ ENTRY(_insw)</div><div class='ctx'> .Lword_loop_e: 	NOP;</div><div class='ctx'> 	sti R3;</div><div class='ctx'> 	RTS;</div><div class='add'>+#else</div><div class='add'>+	P0 = R0;	/* P0 = port */</div><div class='add'>+	P1 = R1;	/* P1 = address */</div><div class='add'>+	P2 = R2;	/* P2 = count */</div><div class='add'>+	SSYNC;</div><div class='add'>+	LSETUP( .Lword_loop_s, .Lword_loop_e) LC0 = P2;</div><div class='add'>+.Lword_loop_s:</div><div class='add'>+	CLI R3;</div><div class='add'>+	NOP; NOP; NOP;</div><div class='add'>+	R0 = W[P0];</div><div class='add'>+	W[P1++] = R0;</div><div class='add'>+.Lword_loop_e:</div><div class='add'>+	STI R3;</div><div class='add'>+	RTS;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='ctx'> ENDPROC(_insw)</div><div class='ctx'> </div><div class='ctx'> ENTRY(_insw_8)</div><div class='add'>+#ifdef CONFIG_BFIN_INS_LOWOVERHEAD</div><div class='ctx'> 	P0 = R0;	/* P0 = port */</div><div class='ctx'> 	cli R3;</div><div class='ctx'> 	P1 = R1;	/* P1 = address */</div><div class='hunk'>@@ -78,9 +133,29 @@ ENTRY(_insw_8)</div><div class='ctx'> .Lword8_loop_e: NOP;</div><div class='ctx'> 	sti R3;</div><div class='ctx'> 	RTS;</div><div class='add'>+#else</div><div class='add'>+	P0 = R0;	/* P0 = port */</div><div class='add'>+	P1 = R1;	/* P1 = address */</div><div class='add'>+	P2 = R2;	/* P2 = count */</div><div class='add'>+	SSYNC;</div><div class='add'>+	LSETUP( .Lword8_loop_s, .Lword8_loop_e) LC0 = P2;</div><div class='add'>+.Lword8_loop_s:</div><div class='add'>+	CLI R3;</div><div class='add'>+	NOP; NOP; NOP;</div><div class='add'>+	R0 = W[P0];</div><div class='add'>+	B[P1++] = R0;</div><div class='add'>+	R0 = R0 &gt;&gt; 8;</div><div class='add'>+	B[P1++] = R0;</div><div class='add'>+	NOP;</div><div class='add'>+.Lword8_loop_e:</div><div class='add'>+	STI R3;</div><div class='add'>+</div><div class='add'>+	RTS;</div><div class='add'>+#endif</div><div class='ctx'> ENDPROC(_insw_8)</div><div class='ctx'> </div><div class='ctx'> ENTRY(_insb)</div><div class='add'>+#ifdef CONFIG_BFIN_INS_LOWOVERHEAD</div><div class='ctx'> 	P0 = R0;	/* P0 = port */</div><div class='ctx'> 	cli R3;</div><div class='ctx'> 	P1 = R1;	/* P1 = address */</div><div class='hunk'>@@ -93,9 +168,26 @@ ENTRY(_insb)</div><div class='ctx'> .Lbyte_loop_e:  NOP;</div><div class='ctx'> 	sti R3;</div><div class='ctx'> 	RTS;</div><div class='add'>+#else</div><div class='add'>+	P0 = R0;        /* P0 = port */</div><div class='add'>+	P1 = R1;        /* P1 = address */</div><div class='add'>+	P2 = R2;        /* P2 = count */</div><div class='add'>+	SSYNC;</div><div class='add'>+	LSETUP( .Lbyte_loop_s, .Lbyte_loop_e) LC0 = P2;</div><div class='add'>+.Lbyte_loop_s:</div><div class='add'>+	CLI R3;</div><div class='add'>+	NOP; NOP; NOP;</div><div class='add'>+	R0 = B[P0];</div><div class='add'>+	B[P1++] = R0;</div><div class='add'>+.Lbyte_loop_e:</div><div class='add'>+	STI R3;</div><div class='add'>+</div><div class='add'>+	RTS;</div><div class='add'>+#endif</div><div class='ctx'> ENDPROC(_insb)</div><div class='ctx'> </div><div class='ctx'> ENTRY(_insl_16)</div><div class='add'>+#ifdef CONFIG_BFIN_INS_LOWOVERHEAD</div><div class='ctx'> 	P0 = R0;	/* P0 = port */</div><div class='ctx'> 	cli R3;</div><div class='ctx'> 	P1 = R1;	/* P1 = address */</div><div class='hunk'>@@ -110,4 +202,21 @@ ENTRY(_insl_16)</div><div class='ctx'> .Llong16_loop_e:  NOP;</div><div class='ctx'> 	sti R3;</div><div class='ctx'> 	RTS;</div><div class='add'>+#else</div><div class='add'>+	P0 = R0;	/* P0 = port */</div><div class='add'>+	P1 = R1;	/* P1 = address */</div><div class='add'>+	P2 = R2;	/* P2 = count */</div><div class='add'>+	SSYNC;</div><div class='add'>+	LSETUP( .Llong16_loop_s, .Llong16_loop_e) LC0 = P2;</div><div class='add'>+.Llong16_loop_s:</div><div class='add'>+	CLI R3;</div><div class='add'>+	NOP; NOP; NOP;</div><div class='add'>+	R0 = [P0];</div><div class='add'>+	W[P1++] = R0;</div><div class='add'>+	R0 = R0 &gt;&gt; 16;</div><div class='add'>+	W[P1++] = R0;</div><div class='add'>+.Llong16_loop_e:</div><div class='add'>+	STI R3;</div><div class='add'>+	RTS;</div><div class='add'>+#endif</div><div class='ctx'> ENDPROC(_insl_16)</div><div class='head'>diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c<br/>index 0b26ae2de5ee..d22bc7773717 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/boards/cm_bf527.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf527/boards/cm_bf527.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/boards/cm_bf527.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/boards/cm_bf527.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'> #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)</div><div class='ctx'> #include &lt;linux/usb/isp1362.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-#include &lt;linux/pata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -160,15 +159,15 @@ static struct platform_device musb_device = {</div><div class='ctx'> #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)</div><div class='ctx'> static struct mtd_partition ezkit_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name       = "Bootloader",</div><div class='add'>+		.name       = "bootloader(nor)",</div><div class='ctx'> 		.size       = 0x40000,</div><div class='ctx'> 		.offset     = 0,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name       = "Kernel",</div><div class='add'>+		.name       = "linux kernel(nor)",</div><div class='ctx'> 		.size       = 0x1C0000,</div><div class='ctx'> 		.offset     = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name       = "RootFS",</div><div class='add'>+		.name       = "file system(nor)",</div><div class='ctx'> 		.size       = MTDPART_SIZ_FULL,</div><div class='ctx'> 		.offset     = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -200,12 +199,12 @@ static struct platform_device ezkit_flash_device = {</div><div class='ctx'> #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)</div><div class='ctx'> static struct mtd_partition partition_info[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "Linux Kernel",</div><div class='add'>+		.name = "linux kernel(nand)",</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.size = 4 * SIZE_1M,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.name = "File System",</div><div class='add'>+		.name = "file system(nand)",</div><div class='ctx'> 		.offset = MTDPART_OFS_APPEND,</div><div class='ctx'> 		.size = MTDPART_SIZ_FULL,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -438,12 +437,12 @@ static struct platform_device net2272_bfin_device = {</div><div class='ctx'> 	|| defined(CONFIG_MTD_M25P80_MODULE)</div><div class='ctx'> static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "bootloader",</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='ctx'> 		.size = 0x00040000,</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.mask_flags = MTD_CAP_ROM</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "linux kernel",</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='ctx'> 		.size = MTDPART_SIZ_FULL,</div><div class='ctx'> 		.offset = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -799,43 +798,6 @@ static struct platform_device bfin_sport1_uart_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-#define PATA_INT	55</div><div class='del'>-</div><div class='del'>-static struct pata_platform_info bfin_pata_platform_data = {</div><div class='del'>-	.ioport_shift = 1,</div><div class='del'>-	.irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource bfin_pata_resources[] = {</div><div class='del'>-	{</div><div class='del'>-		.start = 0x20314020,</div><div class='del'>-		.end = 0x2031403F,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start = 0x2031401C,</div><div class='del'>-		.end = 0x2031401F,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start = PATA_INT,</div><div class='del'>-		.end = PATA_INT,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device bfin_pata_device = {</div><div class='del'>-	.name = "pata_platform",</div><div class='del'>-	.id = -1,</div><div class='del'>-	.num_resources = ARRAY_SIZE(bfin_pata_resources),</div><div class='del'>-	.resource = bfin_pata_resources,</div><div class='del'>-	.dev = {</div><div class='del'>-		.platform_data = &amp;bfin_pata_platform_data,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='hunk'>@@ -961,10 +923,6 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> 	&amp;bfin_sport1_uart_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-	&amp;bfin_pata_device,</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)</div><div class='ctx'> 	&amp;bfin_device_gpiokeys,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -987,10 +945,6 @@ static int __init stamp_init(void)</div><div class='ctx'> </div><div class='ctx'> 	platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));</div><div class='ctx'> 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;</div><div class='del'>-#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c<br/>index 689b69c98ee4..762f754c06cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/boards/ezkit.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf527/boards/ezkit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/boards/ezkit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/boards/ezkit.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'> #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)</div><div class='ctx'> #include &lt;linux/usb/isp1362.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-#include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -177,15 +176,15 @@ static struct platform_device bf52x_t350mcqb_device = {</div><div class='ctx'> #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)</div><div class='ctx'> static struct mtd_partition ezkit_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name       = "Bootloader",</div><div class='add'>+		.name       = "bootloader(nor)",</div><div class='ctx'> 		.size       = 0x40000,</div><div class='ctx'> 		.offset     = 0,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name       = "Kernel",</div><div class='add'>+		.name       = "linux kernel(nor)",</div><div class='ctx'> 		.size       = 0x1C0000,</div><div class='ctx'> 		.offset     = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name       = "RootFS",</div><div class='add'>+		.name       = "file system(nor)",</div><div class='ctx'> 		.size       = MTDPART_SIZ_FULL,</div><div class='ctx'> 		.offset     = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -217,12 +216,12 @@ static struct platform_device ezkit_flash_device = {</div><div class='ctx'> #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)</div><div class='ctx'> static struct mtd_partition partition_info[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "Linux Kernel",</div><div class='add'>+		.name = "linux kernel(nand)",</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.size = 4 * SIZE_1M,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.name = "File System",</div><div class='add'>+		.name = "file system(nand)",</div><div class='ctx'> 		.offset = MTDPART_OFS_APPEND,</div><div class='ctx'> 		.size = MTDPART_SIZ_FULL,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -460,12 +459,12 @@ static struct platform_device net2272_bfin_device = {</div><div class='ctx'> 	|| defined(CONFIG_MTD_M25P80_MODULE)</div><div class='ctx'> static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "bootloader",</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='ctx'> 		.size = 0x00040000,</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.mask_flags = MTD_CAP_ROM</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "linux kernel",</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='ctx'> 		.size = MTDPART_SIZ_FULL,</div><div class='ctx'> 		.offset = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -825,43 +824,6 @@ static struct platform_device bfin_sport1_uart_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-#define PATA_INT	55</div><div class='del'>-</div><div class='del'>-static struct pata_platform_info bfin_pata_platform_data = {</div><div class='del'>-	.ioport_shift = 1,</div><div class='del'>-	.irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource bfin_pata_resources[] = {</div><div class='del'>-	{</div><div class='del'>-		.start = 0x20314020,</div><div class='del'>-		.end = 0x2031403F,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start = 0x2031401C,</div><div class='del'>-		.end = 0x2031401F,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start = PATA_INT,</div><div class='del'>-		.end = PATA_INT,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device bfin_pata_device = {</div><div class='del'>-	.name = "pata_platform",</div><div class='del'>-	.id = -1,</div><div class='del'>-	.num_resources = ARRAY_SIZE(bfin_pata_resources),</div><div class='del'>-	.resource = bfin_pata_resources,</div><div class='del'>-	.dev = {</div><div class='del'>-		.platform_data = &amp;bfin_pata_platform_data,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='hunk'>@@ -996,10 +958,6 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> 	&amp;bfin_sport1_uart_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-	&amp;bfin_pata_device,</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)</div><div class='ctx'> 	&amp;bfin_device_gpiokeys,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1022,10 +980,6 @@ static int __init stamp_init(void)</div><div class='ctx'> </div><div class='ctx'> 	platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));</div><div class='ctx'> 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;</div><div class='del'>-#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf527/head.S b/arch/blackfin/mach-bf527/head.S<br/>index fe05cc1ef174..28c486191209 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/head.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf527/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/head.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/head.S</a></div><div class='hunk'>@@ -30,292 +30,10 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='del'>-#include &lt;asm/trace.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='del'>-#include &lt;asm/mach-common/clocks.h&gt;</div><div class='del'>-#include &lt;asm/mach/mem_init.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-.extern ___bss_stop</div><div class='del'>-.extern ___bss_start</div><div class='del'>-.extern _bf53x_relocate_l1_mem</div><div class='del'>-</div><div class='del'>-#define INITIAL_STACK	0xFFB01000</div><div class='del'>-</div><div class='del'>-__INIT</div><div class='del'>-</div><div class='del'>-ENTRY(__start)</div><div class='del'>-	/* R0: argument of command line string, passed from uboot, save it */</div><div class='del'>-	R7 = R0;</div><div class='del'>-	/* Enable Cycle Counter and Nesting Of Interrupts */</div><div class='del'>-#ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES</div><div class='del'>-	R0 = SYSCFG_SNEN;</div><div class='del'>-#else</div><div class='del'>-	R0 = SYSCFG_SNEN | SYSCFG_CCEN;</div><div class='del'>-#endif</div><div class='del'>-	SYSCFG = R0;</div><div class='del'>-	R0 = 0;</div><div class='del'>-</div><div class='del'>-	/* Clear Out All the data and pointer Registers */</div><div class='del'>-	R1 = R0;</div><div class='del'>-	R2 = R0;</div><div class='del'>-	R3 = R0;</div><div class='del'>-	R4 = R0;</div><div class='del'>-	R5 = R0;</div><div class='del'>-	R6 = R0;</div><div class='del'>-</div><div class='del'>-	P0 = R0;</div><div class='del'>-	P1 = R0;</div><div class='del'>-	P2 = R0;</div><div class='del'>-	P3 = R0;</div><div class='del'>-	P4 = R0;</div><div class='del'>-	P5 = R0;</div><div class='del'>-</div><div class='del'>-	LC0 = r0;</div><div class='del'>-	LC1 = r0;</div><div class='del'>-	L0 = r0;</div><div class='del'>-	L1 = r0;</div><div class='del'>-	L2 = r0;</div><div class='del'>-	L3 = r0;</div><div class='del'>-</div><div class='del'>-	/* Clear Out All the DAG Registers */</div><div class='del'>-	B0 = r0;</div><div class='del'>-	B1 = r0;</div><div class='del'>-	B2 = r0;</div><div class='del'>-	B3 = r0;</div><div class='del'>-</div><div class='del'>-	I0 = r0;</div><div class='del'>-	I1 = r0;</div><div class='del'>-	I2 = r0;</div><div class='del'>-	I3 = r0;</div><div class='del'>-</div><div class='del'>-	M0 = r0;</div><div class='del'>-	M1 = r0;</div><div class='del'>-	M2 = r0;</div><div class='del'>-	M3 = r0;</div><div class='del'>-</div><div class='del'>-	trace_buffer_init(p0,r0);</div><div class='del'>-	P0 = R1;</div><div class='del'>-	R0 = R1;</div><div class='del'>-</div><div class='del'>-	/* Turn off the icache */</div><div class='del'>-	p0.l = LO(IMEM_CONTROL);</div><div class='del'>-	p0.h = HI(IMEM_CONTROL);</div><div class='del'>-	R1 = [p0];</div><div class='del'>-	R0 = ~ENICPLB;</div><div class='del'>-	R0 = R0 &amp; R1;</div><div class='del'>-</div><div class='del'>-	/* Anomaly 05000125 */</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-	CLI R2;</div><div class='del'>-	SSYNC;</div><div class='del'>-#endif</div><div class='del'>-	[p0] = R0;</div><div class='del'>-	SSYNC;</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-	STI R2;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Turn off the dcache */</div><div class='del'>-	p0.l = LO(DMEM_CONTROL);</div><div class='del'>-	p0.h = HI(DMEM_CONTROL);</div><div class='del'>-	R1 = [p0];</div><div class='del'>-	R0 = ~ENDCPLB;</div><div class='del'>-	R0 = R0 &amp; R1;</div><div class='del'>-</div><div class='del'>-	/* Anomaly 05000125 */</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-	CLI R2;</div><div class='del'>-	SSYNC;</div><div class='del'>-#endif</div><div class='del'>-	[p0] = R0;</div><div class='del'>-	SSYNC;</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-	STI R2;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_BF527)</div><div class='del'>-	p0.h = hi(EMAC_SYSTAT);</div><div class='del'>-	p0.l = lo(EMAC_SYSTAT);</div><div class='del'>-	R0.h = 0xFFFF; /* Clear EMAC Interrupt Status bits */</div><div class='del'>-	R0.l = 0xFFFF;</div><div class='del'>-	[P0] = R0;</div><div class='del'>-	SSYNC;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Initialise UART - when booting from u-boot, the UART is not disabled</div><div class='del'>-	 * so if we dont initalize here, our serial console gets hosed */</div><div class='del'>-	p0.h = hi(UART1_LCR);</div><div class='del'>-	p0.l = lo(UART1_LCR);</div><div class='del'>-	r0 = 0x0(Z);</div><div class='del'>-	w[p0] = r0.L;	/* To enable DLL writes */</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p0.h = hi(UART1_DLL);</div><div class='del'>-	p0.l = lo(UART1_DLL);</div><div class='del'>-	r0 = 0x0(Z);</div><div class='del'>-	w[p0] = r0.L;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p0.h = hi(UART1_DLH);</div><div class='del'>-	p0.l = lo(UART1_DLH);</div><div class='del'>-	r0 = 0x00(Z);</div><div class='del'>-	w[p0] = r0.L;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p0.h = hi(UART1_GCTL);</div><div class='del'>-	p0.l = lo(UART1_GCTL);</div><div class='del'>-	r0 = 0x0(Z);</div><div class='del'>-	w[p0] = r0.L;	/* To enable UART clock */</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	/* Initialize stack pointer */</div><div class='del'>-	sp.l = lo(INITIAL_STACK);</div><div class='del'>-	sp.h = hi(INITIAL_STACK);</div><div class='del'>-	fp = sp;</div><div class='del'>-	usp = sp;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_EARLY_PRINTK</div><div class='del'>-	SP += -12;</div><div class='del'>-	call _init_early_exception_vectors;</div><div class='del'>-	SP += 12;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */</div><div class='del'>-	call _bf53x_relocate_l1_mem;</div><div class='ctx'> #ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='del'>-	call _start_dma_code;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Code for initializing Async memory banks */</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_AMBCTL1);</div><div class='del'>-	p2.l = lo(EBIU_AMBCTL1);</div><div class='del'>-	r0.h = hi(AMBCTL1VAL);</div><div class='del'>-	r0.l = lo(AMBCTL1VAL);</div><div class='del'>-	[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_AMBCTL0);</div><div class='del'>-	p2.l = lo(EBIU_AMBCTL0);</div><div class='del'>-	r0.h = hi(AMBCTL0VAL);</div><div class='del'>-	r0.l = lo(AMBCTL0VAL);</div><div class='del'>-	[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_AMGCTL);</div><div class='del'>-	p2.l = lo(EBIU_AMGCTL);</div><div class='del'>-	r0 = AMGCTLVAL;</div><div class='del'>-	w[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	/* This section keeps the processor in supervisor mode</div><div class='del'>-	 * during kernel boot.  Switches to user mode at end of boot.</div><div class='del'>-	 * See page 3-9 of Hardware Reference manual for documentation.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* EVT15 = _real_start */</div><div class='del'>-</div><div class='del'>-	p0.l = lo(EVT15);</div><div class='del'>-	p0.h = hi(EVT15);</div><div class='del'>-	p1.l = _real_start;</div><div class='del'>-	p1.h = _real_start;</div><div class='del'>-	[p0] = p1;</div><div class='del'>-	csync;</div><div class='del'>-</div><div class='del'>-	p0.l = lo(IMASK);</div><div class='del'>-	p0.h = hi(IMASK);</div><div class='del'>-	p1.l = IMASK_IVG15;</div><div class='del'>-	p1.h = 0x0;</div><div class='del'>-	[p0] = p1;</div><div class='del'>-	csync;</div><div class='del'>-</div><div class='del'>-	raise 15;</div><div class='del'>-	p0.l = .LWAIT_HERE;</div><div class='del'>-	p0.h = .LWAIT_HERE;</div><div class='del'>-	reti = p0;</div><div class='del'>-#if ANOMALY_05000281</div><div class='del'>-	nop; nop; nop;</div><div class='add'>+#include &lt;asm/clocks.h&gt;</div><div class='add'>+#include &lt;mach/mem_init.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-	rti;</div><div class='del'>-</div><div class='del'>-.LWAIT_HERE:</div><div class='del'>-	jump .LWAIT_HERE;</div><div class='del'>-ENDPROC(__start)</div><div class='del'>-</div><div class='del'>-ENTRY(_real_start)</div><div class='del'>-	[ -- sp ] = reti;</div><div class='del'>-	p0.l = lo(WDOG_CTL);</div><div class='del'>-	p0.h = hi(WDOG_CTL);</div><div class='del'>-	r0 = 0xAD6(z);</div><div class='del'>-	w[p0] = r0;	/* watchdog off for now */</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	/* Code update for BSS size == 0</div><div class='del'>-	 * Zero out the bss region.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	p1.l = ___bss_start;</div><div class='del'>-	p1.h = ___bss_start;</div><div class='del'>-	p2.l = ___bss_stop;</div><div class='del'>-	p2.h = ___bss_stop;</div><div class='del'>-	r0 = 0;</div><div class='del'>-	p2 -= p1;</div><div class='del'>-	lsetup (.L_clear_bss, .L_clear_bss) lc0 = p2;</div><div class='del'>-.L_clear_bss:</div><div class='del'>-	B[p1++] = r0;</div><div class='del'>-</div><div class='del'>-	/* In case there is a NULL pointer reference</div><div class='del'>-	 * Zero out region before stext</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	p1.l = 0x0;</div><div class='del'>-	p1.h = 0x0;</div><div class='del'>-	r0.l = __stext;</div><div class='del'>-	r0.h = __stext;</div><div class='del'>-	r0 = r0 &gt;&gt; 1;</div><div class='del'>-	p2 = r0;</div><div class='del'>-	r0 = 0;</div><div class='del'>-	lsetup (.L_clear_zero, .L_clear_zero) lc0 = p2;</div><div class='del'>-.L_clear_zero:</div><div class='del'>-	W[p1++] = r0;</div><div class='del'>-</div><div class='del'>-	/* pass the uboot arguments to the global value command line */</div><div class='del'>-	R0 = R7;</div><div class='del'>-	call _cmdline_init;</div><div class='del'>-</div><div class='del'>-	p1.l = __rambase;</div><div class='del'>-	p1.h = __rambase;</div><div class='del'>-	r0.l = __sdata;</div><div class='del'>-	r0.h = __sdata;</div><div class='del'>-	[p1] = r0;</div><div class='del'>-</div><div class='del'>-	p1.l = __ramstart;</div><div class='del'>-	p1.h = __ramstart;</div><div class='del'>-	p3.l = ___bss_stop;</div><div class='del'>-	p3.h = ___bss_stop;</div><div class='del'>-</div><div class='del'>-	r1 = p3;</div><div class='del'>-	[p1] = r1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * load the current thread pointer and stack</div><div class='del'>-	 */</div><div class='del'>-	r1.l = _init_thread_union;</div><div class='del'>-	r1.h = _init_thread_union;</div><div class='del'>-</div><div class='del'>-	r2.l = 0x2000;</div><div class='del'>-	r2.h = 0x0000;</div><div class='del'>-	r1 = r1 + r2;</div><div class='del'>-	sp = r1;</div><div class='del'>-	usp = sp;</div><div class='del'>-	fp = sp;</div><div class='del'>-	jump.l _start_kernel;</div><div class='del'>-ENDPROC(_real_start)</div><div class='del'>-</div><div class='del'>-__FINIT</div><div class='ctx'> </div><div class='ctx'> .section .l1.text</div><div class='ctx'> #ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='hunk'>@@ -420,13 +138,6 @@ ENTRY(_start_dma_code)</div><div class='ctx'> 	[P2] = R1;</div><div class='ctx'> 	SSYNC;</div><div class='ctx'> </div><div class='del'>-	p0.h = hi(SIC_IWR0);</div><div class='del'>-	p0.l = lo(SIC_IWR0);</div><div class='del'>-	r0.l = lo(IWR_ENABLE_ALL);</div><div class='del'>-	r0.h = hi(IWR_ENABLE_ALL);</div><div class='del'>-	[p0] = r0;</div><div class='del'>-	SSYNC;</div><div class='del'>-</div><div class='ctx'> 	RTS;</div><div class='ctx'> ENDPROC(_start_dma_code)</div><div class='ctx'> #endif /* CONFIG_BFIN_KERNEL_CLOCK */</div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/anomaly.h b/arch/blackfin/mach-bf527/include/mach/anomaly.h<br/>index b7b166f4f064..b7b166f4f064 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/anomaly.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/anomaly.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/anomaly.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/anomaly.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/bf527.h b/arch/blackfin/mach-bf527/include/mach/bf527.h<br/>index 056eb4b9cd25..056eb4b9cd25 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/bf527.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/bf527.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/bf527.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/bf527.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h b/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h<br/>index 2526b6ed6faa..2526b6ed6faa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/bfin_serial_5xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/bfin_sir.h b/arch/blackfin/mach-bf527/include/mach/bfin_sir.h<br/>index cfd8ad4f1f2c..cfd8ad4f1f2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/bfin_sir.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/bfin_sir.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/bfin_sir.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/bfin_sir.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/blackfin.h b/arch/blackfin/mach-bf527/include/mach/blackfin.h<br/>index 297821e2d79a..297821e2d79a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/blackfin.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/blackfin.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/blackfin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/blackfin.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/cdefBF522.h b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h<br/>index 52c06494b886..663c2bbdfd91 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/cdefBF522.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/cdefBF522.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/cdefBF522.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/cdefBF522.h</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> #include "defBF522.h"</div><div class='ctx'> </div><div class='ctx'> /* include core specific register pointer definitions */</div><div class='del'>-#include &lt;asm/mach-common/cdef_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/cdef_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SYSTEM &amp; MMR ADDRESS DEFINITIONS FOR ADSP-BF522 */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/cdefBF525.h b/arch/blackfin/mach-bf527/include/mach/cdefBF525.h<br/>index 2cc67e4b4d86..00377eb59b75 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/cdefBF525.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/cdefBF525.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/cdefBF525.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/cdefBF525.h</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> #include "defBF525.h"</div><div class='ctx'> </div><div class='ctx'> /* include core specific register pointer definitions */</div><div class='del'>-#include &lt;asm/mach-common/cdef_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/cdef_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SYSTEM &amp; MMR ADDRESS DEFINITIONS FOR ADSP-BF525 */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/cdefBF527.h b/arch/blackfin/mach-bf527/include/mach/cdefBF527.h<br/>index 5bd1a8601743..fca8db708119 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/cdefBF527.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/cdefBF527.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/cdefBF527.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/cdefBF527.h</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> #include "defBF527.h"</div><div class='ctx'> </div><div class='ctx'> /* include core specific register pointer definitions */</div><div class='del'>-#include &lt;asm/mach-common/cdef_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/cdef_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SYSTEM &amp; MMR ADDRESS DEFINITIONS FOR ADSP-BF527 */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/cdefBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h<br/>index 9dbdbec8ea1b..9a814b9a12b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/cdefBF52x_base.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/cdefBF52x_base.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h</a></div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> #include "defBF52x_base.h"</div><div class='ctx'> </div><div class='ctx'> /* Include core specific register pointer definitions 								*/</div><div class='del'>-#include &lt;asm/mach-common/cdef_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/cdef_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* ==== begin from cdefBF534.h ==== */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/defBF522.h b/arch/blackfin/mach-bf527/include/mach/defBF522.h<br/>index 9671d8f2c5ef..0a8cdcdf0b49 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/defBF522.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/defBF522.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/defBF522.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/defBF522.h</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #define _DEF_BF522_H</div><div class='ctx'> </div><div class='ctx'> /* Include all Core registers and bit definitions */</div><div class='del'>-#include &lt;asm/mach-common/def_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/def_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SYSTEM &amp; MMR ADDRESS DEFINITIONS FOR ADSP-BF522 */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/defBF525.h b/arch/blackfin/mach-bf527/include/mach/defBF525.h<br/>index 6a375a084acc..5cd7576fef76 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/defBF525.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/defBF525.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/defBF525.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/defBF525.h</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #define _DEF_BF525_H</div><div class='ctx'> </div><div class='ctx'> /* Include all Core registers and bit definitions */</div><div class='del'>-#include &lt;asm/mach-common/def_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/def_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SYSTEM &amp; MMR ADDRESS DEFINITIONS FOR ADSP-BF525 */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/defBF527.h b/arch/blackfin/mach-bf527/include/mach/defBF527.h<br/>index f1a70db70cb8..f040f364afa3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/defBF527.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/defBF527.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/defBF527.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/defBF527.h</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #define _DEF_BF527_H</div><div class='ctx'> </div><div class='ctx'> /* Include all Core registers and bit definitions */</div><div class='del'>-#include &lt;asm/mach-common/def_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/def_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SYSTEM &amp; MMR ADDRESS DEFINITIONS FOR ADSP-BF527 */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/defBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h<br/>index fc69cf93f149..6ac2ed7026eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/defBF52x_base.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/defBF52x_base.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/defBF52x_base.h</a></div><div class='hunk'>@@ -151,7 +151,7 @@</div><div class='ctx'> #define TIMER7_CONFIG		0xFFC00670	/* Timer 7 Configuration Register  			*/</div><div class='ctx'> #define TIMER7_COUNTER		0xFFC00674	/* Timer 7 Counter Register        			*/</div><div class='ctx'> #define TIMER7_PERIOD		0xFFC00678	/* Timer 7 Period Register         			*/</div><div class='del'>-#define TIMER7_WIDTH		0xFFC0067C	/* Timer 7 Width Register       			*/   </div><div class='add'>+#define TIMER7_WIDTH		0xFFC0067C	/* Timer 7 Width Register       			*/</div><div class='ctx'> </div><div class='ctx'> #define TIMER_ENABLE		0xFFC00680	/* Timer Enable Register					*/</div><div class='ctx'> #define TIMER_DISABLE		0xFFC00684	/* Timer Disable Register					*/</div><div class='hunk'>@@ -634,18 +634,9 @@</div><div class='ctx'> /* PLL_DIV Macros														*/</div><div class='ctx'> #define SET_SSEL(x)		((x)&amp;0xF)		/* Set SSEL = 0-15 --&gt; SCLK = VCO/SSEL	*/</div><div class='ctx'> </div><div class='del'>-/* VR_CTL Masks																	*/</div><div class='del'>-#define	FREQ			0x0003	/* Switching Oscillator Frequency For Regulator	*/</div><div class='add'>+/* VR_CTL Masks	*/</div><div class='add'>+#define	FREQ			0x3000	/* Switching Oscillator Frequency For Regulator	*/</div><div class='ctx'> #define	HIBERNATE		0x0000	/* 		Powerdown/Bypass On-Board Regulation	*/</div><div class='del'>-#define	FREQ_333		0x0001	/* 		Switching Frequency Is 333 kHz			*/</div><div class='del'>-#define	FREQ_667		0x0002	/* 		Switching Frequency Is 667 kHz			*/</div><div class='del'>-#define	FREQ_1000		0x0003	/* 		Switching Frequency Is 1 MHz			*/</div><div class='del'>-</div><div class='del'>-#define GAIN			0x000C	/* Voltage Level Gain	*/</div><div class='del'>-#define	GAIN_5			0x0000	/* 		GAIN = 5		*/</div><div class='del'>-#define	GAIN_10			0x0004	/* 		GAIN = 10		*/</div><div class='del'>-#define	GAIN_20			0x0008	/* 		GAIN = 20		*/</div><div class='del'>-#define	GAIN_50			0x000C	/* 		GAIN = 50		*/</div><div class='ctx'> </div><div class='ctx'> #define	VLEV			0x00F0	/* Internal Voltage Level					*/</div><div class='ctx'> #define	VLEV_085 		0x0060	/* 		VLEV = 0.85 V (-5% - +10% Accuracy)	*/</div><div class='hunk'>@@ -660,7 +651,7 @@</div><div class='ctx'> #define	VLEV_130		0x00F0	/* 		VLEV = 1.30 V (-5% - +10% Accuracy)	*/</div><div class='ctx'> </div><div class='ctx'> #define	WAKE			0x0100	/* Enable RTC/Reset Wakeup From Hibernate	*/</div><div class='del'>-#define	CANWE			0x0200	/* Enable CAN Wakeup From Hibernate			*/</div><div class='add'>+#define	USBWE			0x0200	/* Enable USB Wakeup From Hibernate			*/</div><div class='ctx'> #define	PHYWE			0x0400	/* Enable PHY Wakeup From Hibernate			*/</div><div class='ctx'> #define	CLKBUFOE		0x4000	/* CLKIN Buffer Output Enable */</div><div class='ctx'> #define	PHYCLKOE		CLKBUFOE	/* Alternative legacy name for the above */</div><div class='hunk'>@@ -697,16 +688,16 @@</div><div class='ctx'> </div><div class='ctx'> #define IRQ_ERROR1      0x00000002  /* Error Interrupt (DMA, DMARx Block, DMARx Overflow) */</div><div class='ctx'> #define IRQ_ERROR2      0x00000004  /* Error Interrupt (CAN, Ethernet, SPORTx, PPI, SPI, UARTx) */</div><div class='del'>-#define IRQ_RTC			0x00000008	/* Real Time Clock Interrupt 						*/ </div><div class='del'>-#define IRQ_DMA0		0x00000010	/* DMA Channel 0 (PPI) Interrupt 					*/ </div><div class='del'>-#define IRQ_DMA3		0x00000020	/* DMA Channel 3 (SPORT0 RX) Interrupt 				*/ </div><div class='add'>+#define IRQ_RTC			0x00000008	/* Real Time Clock Interrupt 						*/</div><div class='add'>+#define IRQ_DMA0		0x00000010	/* DMA Channel 0 (PPI) Interrupt 					*/</div><div class='add'>+#define IRQ_DMA3		0x00000020	/* DMA Channel 3 (SPORT0 RX) Interrupt 				*/</div><div class='ctx'> #define IRQ_DMA4		0x00000040	/* DMA Channel 4 (SPORT0 TX) Interrupt 				*/</div><div class='ctx'> #define IRQ_DMA5		0x00000080	/* DMA Channel 5 (SPORT1 RX) Interrupt 				*/</div><div class='ctx'> </div><div class='ctx'> #define IRQ_DMA6		0x00000100	/* DMA Channel 6 (SPORT1 TX) Interrupt 		 		*/</div><div class='ctx'> #define IRQ_TWI			0x00000200	/* TWI Interrupt									*/</div><div class='ctx'> #define IRQ_DMA7		0x00000400	/* DMA Channel 7 (SPI) Interrupt 					*/</div><div class='del'>-#define IRQ_DMA8		0x00000800	/* DMA Channel 8 (UART0 RX) Interrupt 				*/ </div><div class='add'>+#define IRQ_DMA8		0x00000800	/* DMA Channel 8 (UART0 RX) Interrupt 				*/</div><div class='ctx'> #define IRQ_DMA9		0x00001000	/* DMA Channel 9 (UART0 TX) Interrupt 				*/</div><div class='ctx'> #define IRQ_DMA10		0x00002000	/* DMA Channel 10 (UART1 RX) Interrupt 				*/</div><div class='ctx'> #define IRQ_DMA11		0x00004000	/* DMA Channel 11 (UART1 TX) Interrupt 				*/</div><div class='hunk'>@@ -801,7 +792,7 @@</div><div class='ctx'> #define WDEV_NONE 0x0006 /* no event on roll over */</div><div class='ctx'> #define WDEN 0x0FF0 /* enable watchdog */</div><div class='ctx'> #define WDDIS 0x0AD0 /* disable watchdog */</div><div class='del'>-#define WDRO 0x8000 /* watchdog rolled over latch */ </div><div class='add'>+#define WDRO 0x8000 /* watchdog rolled over latch */</div><div class='ctx'> </div><div class='ctx'> /* depreciated WDOG_CTL Register Masks for legacy code */</div><div class='ctx'> </div><div class='hunk'>@@ -882,7 +873,7 @@</div><div class='ctx'> #define NINT		0x01		/* Pending Interrupt					*/</div><div class='ctx'> #define IIR_TX_READY    0x02		/* UART_THR empty                               */</div><div class='ctx'> #define IIR_RX_READY    0x04		/* Receive data ready                           */</div><div class='del'>-#define IIR_LINE_CHANGE 0x06		/* Receive line status    			*/ </div><div class='add'>+#define IIR_LINE_CHANGE 0x06		/* Receive line status    			*/</div><div class='ctx'> #define IIR_STATUS	0x06		/* Highest Priority Pending Interrupt	*/</div><div class='ctx'> </div><div class='ctx'> /* UARTx_GCTL Masks													*/</div><div class='hunk'>@@ -1638,12 +1629,12 @@</div><div class='ctx'> </div><div class='ctx'> /* entry addresses of the user-callable Boot ROM functions */</div><div class='ctx'> </div><div class='del'>-#define _BOOTROM_RESET 0xEF000000 </div><div class='del'>-#define _BOOTROM_FINAL_INIT 0xEF000002 </div><div class='add'>+#define _BOOTROM_RESET 0xEF000000</div><div class='add'>+#define _BOOTROM_FINAL_INIT 0xEF000002</div><div class='ctx'> #define _BOOTROM_DO_MEMORY_DMA 0xEF000006</div><div class='del'>-#define _BOOTROM_BOOT_DXE_FLASH 0xEF000008 </div><div class='del'>-#define _BOOTROM_BOOT_DXE_SPI 0xEF00000A </div><div class='del'>-#define _BOOTROM_BOOT_DXE_TWI 0xEF00000C </div><div class='add'>+#define _BOOTROM_BOOT_DXE_FLASH 0xEF000008</div><div class='add'>+#define _BOOTROM_BOOT_DXE_SPI 0xEF00000A</div><div class='add'>+#define _BOOTROM_BOOT_DXE_TWI 0xEF00000C</div><div class='ctx'> #define _BOOTROM_GET_DXE_ADDRESS_FLASH 0xEF000010</div><div class='ctx'> #define _BOOTROM_GET_DXE_ADDRESS_SPI 0xEF000012</div><div class='ctx'> #define _BOOTROM_GET_DXE_ADDRESS_TWI 0xEF000014</div><div class='hunk'>@@ -1771,71 +1762,71 @@</div><div class='ctx'> /* Bit masks for CNT_CONFIG */</div><div class='ctx'> </div><div class='ctx'> #define                      CNTE  0x1        /* Counter Enable */</div><div class='del'>-#define                     nCNTE  0x0       </div><div class='add'>+#define                     nCNTE  0x0</div><div class='ctx'> #define                      DEBE  0x2        /* Debounce Enable */</div><div class='del'>-#define                     nDEBE  0x0       </div><div class='add'>+#define                     nDEBE  0x0</div><div class='ctx'> #define                    CDGINV  0x10       /* CDG Pin Polarity Invert */</div><div class='del'>-#define                   nCDGINV  0x0       </div><div class='add'>+#define                   nCDGINV  0x0</div><div class='ctx'> #define                    CUDINV  0x20       /* CUD Pin Polarity Invert */</div><div class='del'>-#define                   nCUDINV  0x0       </div><div class='add'>+#define                   nCUDINV  0x0</div><div class='ctx'> #define                    CZMINV  0x40       /* CZM Pin Polarity Invert */</div><div class='del'>-#define                   nCZMINV  0x0       </div><div class='add'>+#define                   nCZMINV  0x0</div><div class='ctx'> #define                   CNTMODE  0x700      /* Counter Operating Mode */</div><div class='ctx'> #define                      ZMZC  0x800      /* CZM Zeroes Counter Enable */</div><div class='del'>-#define                     nZMZC  0x0       </div><div class='add'>+#define                     nZMZC  0x0</div><div class='ctx'> #define                   BNDMODE  0x3000     /* Boundary register Mode */</div><div class='ctx'> #define                    INPDIS  0x8000     /* CUG and CDG Input Disable */</div><div class='del'>-#define                   nINPDIS  0x0       </div><div class='add'>+#define                   nINPDIS  0x0</div><div class='ctx'> </div><div class='ctx'> /* Bit masks for CNT_IMASK */</div><div class='ctx'> </div><div class='ctx'> #define                      ICIE  0x1        /* Illegal Gray/Binary Code Interrupt Enable */</div><div class='del'>-#define                     nICIE  0x0       </div><div class='add'>+#define                     nICIE  0x0</div><div class='ctx'> #define                      UCIE  0x2        /* Up count Interrupt Enable */</div><div class='del'>-#define                     nUCIE  0x0       </div><div class='add'>+#define                     nUCIE  0x0</div><div class='ctx'> #define                      DCIE  0x4        /* Down count Interrupt Enable */</div><div class='del'>-#define                     nDCIE  0x0       </div><div class='add'>+#define                     nDCIE  0x0</div><div class='ctx'> #define                    MINCIE  0x8        /* Min Count Interrupt Enable */</div><div class='del'>-#define                   nMINCIE  0x0       </div><div class='add'>+#define                   nMINCIE  0x0</div><div class='ctx'> #define                    MAXCIE  0x10       /* Max Count Interrupt Enable */</div><div class='del'>-#define                   nMAXCIE  0x0       </div><div class='add'>+#define                   nMAXCIE  0x0</div><div class='ctx'> #define                   COV31IE  0x20       /* Bit 31 Overflow Interrupt Enable */</div><div class='del'>-#define                  nCOV31IE  0x0       </div><div class='add'>+#define                  nCOV31IE  0x0</div><div class='ctx'> #define                   COV15IE  0x40       /* Bit 15 Overflow Interrupt Enable */</div><div class='del'>-#define                  nCOV15IE  0x0       </div><div class='add'>+#define                  nCOV15IE  0x0</div><div class='ctx'> #define                   CZEROIE  0x80       /* Count to Zero Interrupt Enable */</div><div class='del'>-#define                  nCZEROIE  0x0       </div><div class='add'>+#define                  nCZEROIE  0x0</div><div class='ctx'> #define                     CZMIE  0x100      /* CZM Pin Interrupt Enable */</div><div class='del'>-#define                    nCZMIE  0x0       </div><div class='add'>+#define                    nCZMIE  0x0</div><div class='ctx'> #define                    CZMEIE  0x200      /* CZM Error Interrupt Enable */</div><div class='del'>-#define                   nCZMEIE  0x0       </div><div class='add'>+#define                   nCZMEIE  0x0</div><div class='ctx'> #define                    CZMZIE  0x400      /* CZM Zeroes Counter Interrupt Enable */</div><div class='del'>-#define                   nCZMZIE  0x0       </div><div class='add'>+#define                   nCZMZIE  0x0</div><div class='ctx'> </div><div class='ctx'> /* Bit masks for CNT_STATUS */</div><div class='ctx'> </div><div class='ctx'> #define                      ICII  0x1        /* Illegal Gray/Binary Code Interrupt Identifier */</div><div class='del'>-#define                     nICII  0x0       </div><div class='add'>+#define                     nICII  0x0</div><div class='ctx'> #define                      UCII  0x2        /* Up count Interrupt Identifier */</div><div class='del'>-#define                     nUCII  0x0       </div><div class='add'>+#define                     nUCII  0x0</div><div class='ctx'> #define                      DCII  0x4        /* Down count Interrupt Identifier */</div><div class='del'>-#define                     nDCII  0x0       </div><div class='add'>+#define                     nDCII  0x0</div><div class='ctx'> #define                    MINCII  0x8        /* Min Count Interrupt Identifier */</div><div class='del'>-#define                   nMINCII  0x0       </div><div class='add'>+#define                   nMINCII  0x0</div><div class='ctx'> #define                    MAXCII  0x10       /* Max Count Interrupt Identifier */</div><div class='del'>-#define                   nMAXCII  0x0       </div><div class='add'>+#define                   nMAXCII  0x0</div><div class='ctx'> #define                   COV31II  0x20       /* Bit 31 Overflow Interrupt Identifier */</div><div class='del'>-#define                  nCOV31II  0x0       </div><div class='add'>+#define                  nCOV31II  0x0</div><div class='ctx'> #define                   COV15II  0x40       /* Bit 15 Overflow Interrupt Identifier */</div><div class='del'>-#define                  nCOV15II  0x0       </div><div class='add'>+#define                  nCOV15II  0x0</div><div class='ctx'> #define                   CZEROII  0x80       /* Count to Zero Interrupt Identifier */</div><div class='del'>-#define                  nCZEROII  0x0       </div><div class='add'>+#define                  nCZEROII  0x0</div><div class='ctx'> #define                     CZMII  0x100      /* CZM Pin Interrupt Identifier */</div><div class='del'>-#define                    nCZMII  0x0       </div><div class='add'>+#define                    nCZMII  0x0</div><div class='ctx'> #define                    CZMEII  0x200      /* CZM Error Interrupt Identifier */</div><div class='del'>-#define                   nCZMEII  0x0       </div><div class='add'>+#define                   nCZMEII  0x0</div><div class='ctx'> #define                    CZMZII  0x400      /* CZM Zeroes Counter Interrupt Identifier */</div><div class='del'>-#define                   nCZMZII  0x0       </div><div class='add'>+#define                   nCZMZII  0x0</div><div class='ctx'> </div><div class='ctx'> /* Bit masks for CNT_COMMAND */</div><div class='ctx'> </div><div class='hunk'>@@ -1843,7 +1834,7 @@</div><div class='ctx'> #define                    W1LMIN  0xf0       /* Load Min Register */</div><div class='ctx'> #define                    W1LMAX  0xf00      /* Load Max Register */</div><div class='ctx'> #define                  W1ZMONCE  0x1000     /* Enable CZM Clear Counter Once */</div><div class='del'>-#define                 nW1ZMONCE  0x0       </div><div class='add'>+#define                 nW1ZMONCE  0x0</div><div class='ctx'> </div><div class='ctx'> /* Bit masks for CNT_DEBOUNCE */</div><div class='ctx'> </div><div class='hunk'>@@ -1853,15 +1844,15 @@</div><div class='ctx'> </div><div class='ctx'> #define                FUSE_FADDR  0x1ff      /* OTP/Fuse Address */</div><div class='ctx'> #define                      FIEN  0x800      /* OTP/Fuse Interrupt Enable */</div><div class='del'>-#define                     nFIEN  0x0       </div><div class='add'>+#define                     nFIEN  0x0</div><div class='ctx'> #define                  FTESTDEC  0x1000     /* OTP/Fuse Test Decoder */</div><div class='del'>-#define                 nFTESTDEC  0x0       </div><div class='add'>+#define                 nFTESTDEC  0x0</div><div class='ctx'> #define                   FWRTEST  0x2000     /* OTP/Fuse Write Test */</div><div class='del'>-#define                  nFWRTEST  0x0       </div><div class='add'>+#define                  nFWRTEST  0x0</div><div class='ctx'> #define                     FRDEN  0x4000     /* OTP/Fuse Read Enable */</div><div class='del'>-#define                    nFRDEN  0x0       </div><div class='add'>+#define                    nFRDEN  0x0</div><div class='ctx'> #define                     FWREN  0x8000     /* OTP/Fuse Write Enable */</div><div class='del'>-#define                    nFWREN  0x0       </div><div class='add'>+#define                    nFWREN  0x0</div><div class='ctx'> </div><div class='ctx'> /* Bit masks for OTP_BEN */</div><div class='ctx'> </div><div class='hunk'>@@ -1870,15 +1861,15 @@</div><div class='ctx'> /* Bit masks for OTP_STATUS */</div><div class='ctx'> </div><div class='ctx'> #define                     FCOMP  0x1        /* OTP/Fuse Access Complete */</div><div class='del'>-#define                    nFCOMP  0x0       </div><div class='add'>+#define                    nFCOMP  0x0</div><div class='ctx'> #define                    FERROR  0x2        /* OTP/Fuse Access Error */</div><div class='del'>-#define                   nFERROR  0x0       </div><div class='add'>+#define                   nFERROR  0x0</div><div class='ctx'> #define                  MMRGLOAD  0x10       /* Memory Mapped Register Gasket Load */</div><div class='del'>-#define                 nMMRGLOAD  0x0       </div><div class='add'>+#define                 nMMRGLOAD  0x0</div><div class='ctx'> #define                  MMRGLOCK  0x20       /* Memory Mapped Register Gasket Lock */</div><div class='del'>-#define                 nMMRGLOCK  0x0       </div><div class='add'>+#define                 nMMRGLOCK  0x0</div><div class='ctx'> #define                    FPGMEN  0x40       /* OTP/Fuse Program Enable */</div><div class='del'>-#define                   nFPGMEN  0x0       </div><div class='add'>+#define                   nFPGMEN  0x0</div><div class='ctx'> </div><div class='ctx'> /* Bit masks for OTP_TIMING */</div><div class='ctx'> </div><div class='hunk'>@@ -1892,42 +1883,42 @@</div><div class='ctx'> /* Bit masks for SECURE_SYSSWT */</div><div class='ctx'> </div><div class='ctx'> #define                   EMUDABL  0x1        /* Emulation Disable. */</div><div class='del'>-#define                  nEMUDABL  0x0       </div><div class='add'>+#define                  nEMUDABL  0x0</div><div class='ctx'> #define                   RSTDABL  0x2        /* Reset Disable */</div><div class='del'>-#define                  nRSTDABL  0x0       </div><div class='add'>+#define                  nRSTDABL  0x0</div><div class='ctx'> #define                   L1IDABL  0x1c       /* L1 Instruction Memory Disable. */</div><div class='ctx'> #define                  L1DADABL  0xe0       /* L1 Data Bank A Memory Disable. */</div><div class='ctx'> #define                  L1DBDABL  0x700      /* L1 Data Bank B Memory Disable. */</div><div class='ctx'> #define                   DMA0OVR  0x800      /* DMA0 Memory Access Override */</div><div class='del'>-#define                  nDMA0OVR  0x0       </div><div class='add'>+#define                  nDMA0OVR  0x0</div><div class='ctx'> #define                   DMA1OVR  0x1000     /* DMA1 Memory Access Override */</div><div class='del'>-#define                  nDMA1OVR  0x0       </div><div class='add'>+#define                  nDMA1OVR  0x0</div><div class='ctx'> #define                    EMUOVR  0x4000     /* Emulation Override */</div><div class='del'>-#define                   nEMUOVR  0x0       </div><div class='add'>+#define                   nEMUOVR  0x0</div><div class='ctx'> #define                    OTPSEN  0x8000     /* OTP Secrets Enable. */</div><div class='del'>-#define                   nOTPSEN  0x0       </div><div class='add'>+#define                   nOTPSEN  0x0</div><div class='ctx'> #define                    L2DABL  0x70000    /* L2 Memory Disable. */</div><div class='ctx'> </div><div class='ctx'> /* Bit masks for SECURE_CONTROL */</div><div class='ctx'> </div><div class='ctx'> #define                   SECURE0  0x1        /* SECURE 0 */</div><div class='del'>-#define                  nSECURE0  0x0       </div><div class='add'>+#define                  nSECURE0  0x0</div><div class='ctx'> #define                   SECURE1  0x2        /* SECURE 1 */</div><div class='del'>-#define                  nSECURE1  0x0       </div><div class='add'>+#define                  nSECURE1  0x0</div><div class='ctx'> #define                   SECURE2  0x4        /* SECURE 2 */</div><div class='del'>-#define                  nSECURE2  0x0       </div><div class='add'>+#define                  nSECURE2  0x0</div><div class='ctx'> #define                   SECURE3  0x8        /* SECURE 3 */</div><div class='del'>-#define                  nSECURE3  0x0       </div><div class='add'>+#define                  nSECURE3  0x0</div><div class='ctx'> </div><div class='ctx'> /* Bit masks for SECURE_STATUS */</div><div class='ctx'> </div><div class='ctx'> #define                   SECMODE  0x3        /* Secured Mode Control State */</div><div class='ctx'> #define                       NMI  0x4        /* Non Maskable Interrupt */</div><div class='del'>-#define                      nNMI  0x0       </div><div class='add'>+#define                      nNMI  0x0</div><div class='ctx'> #define                   AFVALID  0x8        /* Authentication Firmware Valid */</div><div class='del'>-#define                  nAFVALID  0x0       </div><div class='add'>+#define                  nAFVALID  0x0</div><div class='ctx'> #define                    AFEXIT  0x10       /* Authentication Firmware Exit */</div><div class='del'>-#define                   nAFEXIT  0x0       </div><div class='add'>+#define                   nAFEXIT  0x0</div><div class='ctx'> #define                   SECSTAT  0xe0       /* Secure Status */</div><div class='ctx'> </div><div class='ctx'> /* Bit masks for NFC_CTL */</div><div class='hunk'>@@ -1935,60 +1926,60 @@</div><div class='ctx'> #define                    WR_DLY  0xf        /* Write Strobe Delay */</div><div class='ctx'> #define                    RD_DLY  0xf0       /* Read Strobe Delay */</div><div class='ctx'> #define                    NWIDTH  0x100      /* NAND Data Width */</div><div class='del'>-#define                   nNWIDTH  0x0       </div><div class='add'>+#define                   nNWIDTH  0x0</div><div class='ctx'> #define                   PG_SIZE  0x200      /* Page Size */</div><div class='del'>-#define                  nPG_SIZE  0x0       </div><div class='add'>+#define                  nPG_SIZE  0x0</div><div class='ctx'> </div><div class='ctx'> /* Bit masks for NFC_STAT */</div><div class='ctx'> </div><div class='ctx'> #define                     NBUSY  0x1        /* Not Busy */</div><div class='del'>-#define                    nNBUSY  0x0       </div><div class='add'>+#define                    nNBUSY  0x0</div><div class='ctx'> #define                   WB_FULL  0x2        /* Write Buffer Full */</div><div class='del'>-#define                  nWB_FULL  0x0       </div><div class='add'>+#define                  nWB_FULL  0x0</div><div class='ctx'> #define                PG_WR_STAT  0x4        /* Page Write Pending */</div><div class='del'>-#define               nPG_WR_STAT  0x0       </div><div class='add'>+#define               nPG_WR_STAT  0x0</div><div class='ctx'> #define                PG_RD_STAT  0x8        /* Page Read Pending */</div><div class='del'>-#define               nPG_RD_STAT  0x0       </div><div class='add'>+#define               nPG_RD_STAT  0x0</div><div class='ctx'> #define                  WB_EMPTY  0x10       /* Write Buffer Empty */</div><div class='del'>-#define                 nWB_EMPTY  0x0       </div><div class='add'>+#define                 nWB_EMPTY  0x0</div><div class='ctx'> </div><div class='ctx'> /* Bit masks for NFC_IRQSTAT */</div><div class='ctx'> </div><div class='ctx'> #define                  NBUSYIRQ  0x1        /* Not Busy IRQ */</div><div class='del'>-#define                 nNBUSYIRQ  0x0       </div><div class='add'>+#define                 nNBUSYIRQ  0x0</div><div class='ctx'> #define                    WB_OVF  0x2        /* Write Buffer Overflow */</div><div class='del'>-#define                   nWB_OVF  0x0       </div><div class='add'>+#define                   nWB_OVF  0x0</div><div class='ctx'> #define                   WB_EDGE  0x4        /* Write Buffer Edge Detect */</div><div class='del'>-#define                  nWB_EDGE  0x0       </div><div class='add'>+#define                  nWB_EDGE  0x0</div><div class='ctx'> #define                    RD_RDY  0x8        /* Read Data Ready */</div><div class='del'>-#define                   nRD_RDY  0x0       </div><div class='add'>+#define                   nRD_RDY  0x0</div><div class='ctx'> #define                   WR_DONE  0x10       /* Page Write Done */</div><div class='del'>-#define                  nWR_DONE  0x0       </div><div class='add'>+#define                  nWR_DONE  0x0</div><div class='ctx'> </div><div class='ctx'> /* Bit masks for NFC_IRQMASK */</div><div class='ctx'> </div><div class='ctx'> #define              MASK_BUSYIRQ  0x1        /* Mask Not Busy IRQ */</div><div class='del'>-#define             nMASK_BUSYIRQ  0x0       </div><div class='add'>+#define             nMASK_BUSYIRQ  0x0</div><div class='ctx'> #define                MASK_WBOVF  0x2        /* Mask Write Buffer Overflow */</div><div class='del'>-#define               nMASK_WBOVF  0x0       </div><div class='add'>+#define               nMASK_WBOVF  0x0</div><div class='ctx'> #define              MASK_WBEMPTY  0x4        /* Mask Write Buffer Empty */</div><div class='del'>-#define             nMASK_WBEMPTY  0x0       </div><div class='add'>+#define             nMASK_WBEMPTY  0x0</div><div class='ctx'> #define                MASK_RDRDY  0x8        /* Mask Read Data Ready */</div><div class='del'>-#define               nMASK_RDRDY  0x0       </div><div class='add'>+#define               nMASK_RDRDY  0x0</div><div class='ctx'> #define               MASK_WRDONE  0x10       /* Mask Write Done */</div><div class='del'>-#define              nMASK_WRDONE  0x0       </div><div class='add'>+#define              nMASK_WRDONE  0x0</div><div class='ctx'> </div><div class='ctx'> /* Bit masks for NFC_RST */</div><div class='ctx'> </div><div class='ctx'> #define                   ECC_RST  0x1        /* ECC (and NFC counters) Reset */</div><div class='del'>-#define                  nECC_RST  0x0       </div><div class='add'>+#define                  nECC_RST  0x0</div><div class='ctx'> </div><div class='ctx'> /* Bit masks for NFC_PGCTL */</div><div class='ctx'> </div><div class='ctx'> #define               PG_RD_START  0x1        /* Page Read Start */</div><div class='del'>-#define              nPG_RD_START  0x0       </div><div class='add'>+#define              nPG_RD_START  0x0</div><div class='ctx'> #define               PG_WR_START  0x2        /* Page Write Start */</div><div class='del'>-#define              nPG_WR_START  0x0       </div><div class='add'>+#define              nPG_WR_START  0x0</div><div class='ctx'> </div><div class='ctx'> /* Bit masks for NFC_ECC0 */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/dma.h b/arch/blackfin/mach-bf527/include/mach/dma.h<br/>index 49dd693223e8..49dd693223e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/dma.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/irq.h b/arch/blackfin/mach-bf527/include/mach/irq.h<br/>index 4e2b3f2020e5..4e2b3f2020e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/irq.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/mem_init.h b/arch/blackfin/mach-bf527/include/mach/mem_init.h<br/>index cbe03f4a5698..cbe03f4a5698 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/mem_init.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/mem_init.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/mem_init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/mem_init.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/mem_map.h b/arch/blackfin/mach-bf527/include/mach/mem_map.h<br/>index 193082deaa4e..ef46dc991cd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/mem_map.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/mem_map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/mem_map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/mem_map.h</a></div><div class='hunk'>@@ -89,6 +89,11 @@</div><div class='ctx'> #define BFIN_DSUPBANKS	0</div><div class='ctx'> #endif				/*CONFIG_BFIN_DCACHE */</div><div class='ctx'> </div><div class='add'>+/* Level 2 Memory - none */</div><div class='add'>+</div><div class='add'>+#define L2_START	0</div><div class='add'>+#define L2_LENGTH	0</div><div class='add'>+</div><div class='ctx'> /* Scratch Pad Memory */</div><div class='ctx'> </div><div class='ctx'> #define L1_SCRATCH_START	0xFFB00000</div><div class='head'>diff --git a/include/asm-blackfin/mach-bf527/portmux.h b/arch/blackfin/mach-bf527/include/mach/portmux.h<br/>index ae4d205bfcf5..ae4d205bfcf5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf527/portmux.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf527/portmux.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/include/mach/portmux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/include/mach/portmux.h</a></div><div class='head'>diff --git a/arch/blackfin/mach-bf527/ints-priority.c b/arch/blackfin/mach-bf527/ints-priority.c<br/>index 1fa389793968..8a2367403d2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/ints-priority.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf527/ints-priority.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/ints-priority.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf527/ints-priority.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='ctx'> </div><div class='del'>-void program_IAR(void)</div><div class='add'>+void __init program_IAR(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Program the IAR0 Register with the configured priority */</div><div class='ctx'> 	bfin_write_SIC_IAR0(((CONFIG_IRQ_PLL_WAKEUP - 7) &lt;&lt; IRQ_PLL_WAKEUP_POS) |</div><div class='head'>diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c<br/>index 4103a97c1a70..c66a68f30239 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/H8606.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf533/boards/H8606.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/H8606.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/boards/H8606.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'> #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)</div><div class='ctx'> #include &lt;linux/usb/isp1362.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-#include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='hunk'>@@ -141,16 +140,16 @@ static struct platform_device net2272_bfin_device = {</div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='ctx'> static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "bootloader",</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='ctx'> 		.size = 0x00060000,</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.mask_flags = MTD_CAP_ROM</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "kernel",</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='ctx'> 		.size = 0x100000,</div><div class='ctx'> 		.offset = 0x60000</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "file system",</div><div class='add'>+		.name = "file system(spi)",</div><div class='ctx'> 		.size = 0x6a0000,</div><div class='ctx'> 		.offset = 0x00160000,</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/blackfin/mach-bf533/boards/Kconfig b/arch/blackfin/mach-bf533/boards/Kconfig<br/>index 840059241fbe..308c98dc5aba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf533/boards/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/boards/Kconfig</a></div><div class='hunk'>@@ -14,6 +14,12 @@ config BFIN533_STAMP</div><div class='ctx'> 	help</div><div class='ctx'> 	  BF533-STAMP board support.</div><div class='ctx'> </div><div class='add'>+config BLACKSTAMP</div><div class='add'>+	bool "BlackStamp"</div><div class='add'>+	help</div><div class='add'>+	  Support for the BlackStamp board.  Hardware info available at</div><div class='add'>+	  http://blackfin.uclinux.org/gf/project/blackstamp/</div><div class='add'>+</div><div class='ctx'> config BFIN533_BLUETECHNIX_CM</div><div class='ctx'> 	bool "Bluetechnix CM-BF533"</div><div class='ctx'> 	depends on (BF533)</div><div class='head'>diff --git a/arch/blackfin/mach-bf533/boards/Makefile b/arch/blackfin/mach-bf533/boards/Makefile<br/>index b7a1a1d79bda..9afbe72b484f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf533/boards/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/boards/Makefile</a></div><div class='hunk'>@@ -7,4 +7,5 @@ obj-$(CONFIG_BFIN533_STAMP)            += stamp.o</div><div class='ctx'> obj-$(CONFIG_BFIN532_IP0X)             += ip0x.o</div><div class='ctx'> obj-$(CONFIG_BFIN533_EZKIT)            += ezkit.o</div><div class='ctx'> obj-$(CONFIG_BFIN533_BLUETECHNIX_CM)   += cm_bf533.o</div><div class='add'>+obj-$(CONFIG_BLACKSTAMP)               += blackstamp.o</div><div class='ctx'> obj-$(CONFIG_H8606_HVSISTEMAS)         += H8606.o</div><div class='head'>diff --git a/arch/blackfin/mach-bf533/boards/blackstamp.c b/arch/blackfin/mach-bf533/boards/blackstamp.c<br/>new file mode 100644<br/>index 000000000000..d064ded87719<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/blackstamp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/boards/blackstamp.c</a></div><div class='hunk'>@@ -0,0 +1,401 @@</div><div class='add'>+/*</div><div class='add'>+ * File:         arch/blackfin/mach-bf533/blackstamp.c</div><div class='add'>+ * Based on:     arch/blackfin/mach-bf533/stamp.c</div><div class='add'>+ * Author:       Benjamin Matthews &lt;bmat@lle.rochester.edu&gt;</div><div class='add'>+ *               Aidan Williams &lt;aidan@nicta.com.au&gt;</div><div class='add'>+ *</div><div class='add'>+ * Created:      2008</div><div class='add'>+ * Description:  Board Info File for the BlackStamp</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2005 National ICT Australia (NICTA)</div><div class='add'>+ * Copyright 2004-2008 Analog Devices Inc.</div><div class='add'>+ *</div><div class='add'>+ * Enter bugs at http://blackfin.uclinux.org/</div><div class='add'>+ *</div><div class='add'>+ * More info about the BlackStamp at:</div><div class='add'>+ * 	http://blackfin.uclinux.org/gf/project/blackstamp/</div><div class='add'>+ *</div><div class='add'>+ * Licensed under the GPL-2 or later.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/flash.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;asm/dma.h&gt;</div><div class='add'>+#include &lt;asm/bfin5xx_spi.h&gt;</div><div class='add'>+#include &lt;asm/portmux.h&gt;</div><div class='add'>+#include &lt;asm/dpmc.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Name the Board for the /proc/cpuinfo</div><div class='add'>+ */</div><div class='add'>+const char bfin_board_name[] = "BlackStamp";</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)</div><div class='add'>+static struct platform_device rtc_device = {</div><div class='add'>+	.name = "rtc-bfin",</div><div class='add'>+	.id   = -1,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Driver needs to know address, irq and flag pin.</div><div class='add'>+ */</div><div class='add'>+#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)</div><div class='add'>+static struct resource smc91x_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "smc91x-regs",</div><div class='add'>+		.start = 0x20300300,</div><div class='add'>+		.end = 0x20300300 + 16,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start = IRQ_PF3,</div><div class='add'>+		.end = IRQ_PF3,</div><div class='add'>+		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device smc91x_device = {</div><div class='add'>+	.name = "smc91x",</div><div class='add'>+	.id = 0,</div><div class='add'>+	.num_resources = ARRAY_SIZE(smc91x_resources),</div><div class='add'>+	.resource = smc91x_resources,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='add'>+static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='add'>+		.size = 0x00040000,</div><div class='add'>+		.offset = 0,</div><div class='add'>+		.mask_flags = MTD_CAP_ROM</div><div class='add'>+	}, {</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='add'>+		.size = 0x180000,</div><div class='add'>+		.offset = MTDPART_OFS_APPEND,</div><div class='add'>+	}, {</div><div class='add'>+		.name = "file system(spi)",</div><div class='add'>+		.size = MTDPART_SIZ_FULL,</div><div class='add'>+		.offset = MTDPART_OFS_APPEND,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct flash_platform_data bfin_spi_flash_data = {</div><div class='add'>+	.name = "m25p80",</div><div class='add'>+	.parts = bfin_spi_flash_partitions,</div><div class='add'>+	.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),</div><div class='add'>+	.type = "m25p64",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SPI flash chip (m25p64) */</div><div class='add'>+static struct bfin5xx_spi_chip spi_flash_chip_info = {</div><div class='add'>+	.enable_dma = 0,         /* use dma transfer with this chip*/</div><div class='add'>+	.bits_per_word = 8,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)</div><div class='add'>+static struct bfin5xx_spi_chip spi_mmc_chip_info = {</div><div class='add'>+	.enable_dma = 1,</div><div class='add'>+	.bits_per_word = 8,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)</div><div class='add'>+static struct bfin5xx_spi_chip spidev_chip_info = {</div><div class='add'>+	.enable_dma = 0,</div><div class='add'>+	.bits_per_word = 8,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='add'>+#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='add'>+	{</div><div class='add'>+		/* the modalias must be the same as spi device driver name */</div><div class='add'>+		.modalias = "m25p80", /* Name of spi_driver for this device */</div><div class='add'>+		.max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0, /* Framework bus number */</div><div class='add'>+		.chip_select = 2, /* Framework chip select. */</div><div class='add'>+		.platform_data = &amp;bfin_spi_flash_data,</div><div class='add'>+		.controller_data = &amp;spi_flash_chip_info,</div><div class='add'>+		.mode = SPI_MODE_3,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)</div><div class='add'>+	{</div><div class='add'>+		.modalias = "spi_mmc_dummy",</div><div class='add'>+		.max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0,</div><div class='add'>+		.chip_select = 0,</div><div class='add'>+		.platform_data = NULL,</div><div class='add'>+		.controller_data = &amp;spi_mmc_chip_info,</div><div class='add'>+		.mode = SPI_MODE_3,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.modalias = "spi_mmc",</div><div class='add'>+		.max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0,</div><div class='add'>+		.chip_select = CONFIG_SPI_MMC_CS_CHAN,</div><div class='add'>+		.platform_data = NULL,</div><div class='add'>+		.controller_data = &amp;spi_mmc_chip_info,</div><div class='add'>+		.mode = SPI_MODE_3,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)</div><div class='add'>+	{</div><div class='add'>+		.modalias = "spidev",</div><div class='add'>+		.max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0,</div><div class='add'>+		.chip_select = 7,</div><div class='add'>+		.controller_data = &amp;spidev_chip_info,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+/* SPI (0) */</div><div class='add'>+static struct resource bfin_spi0_resource[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start = SPI0_REGBASE,</div><div class='add'>+		.end   = SPI0_REGBASE + 0xFF,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start = CH_SPI,</div><div class='add'>+		.end   = CH_SPI,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SPI controller data */</div><div class='add'>+static struct bfin5xx_spi_master bfin_spi0_info = {</div><div class='add'>+	.num_chipselect = 8,</div><div class='add'>+	.enable_dma = 1,  /* master has the ability to do dma transfer */</div><div class='add'>+	.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_spi0_device = {</div><div class='add'>+	.name = "bfin-spi",</div><div class='add'>+	.id = 0, /* Bus number */</div><div class='add'>+	.num_resources = ARRAY_SIZE(bfin_spi0_resource),</div><div class='add'>+	.resource = bfin_spi0_resource,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;bfin_spi0_info, /* Passed to driver */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif  /* spi master and devices */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)</div><div class='add'>+static struct resource bfin_uart_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = 0xFFC00400,</div><div class='add'>+		.end = 0xFFC004FF,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_uart_device = {</div><div class='add'>+	.name = "bfin-uart",</div><div class='add'>+	.id = 1,</div><div class='add'>+	.num_resources = ARRAY_SIZE(bfin_uart_resources),</div><div class='add'>+	.resource = bfin_uart_resources,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)</div><div class='add'>+static struct resource bfin_sir_resources[] = {</div><div class='add'>+#ifdef CONFIG_BFIN_SIR0</div><div class='add'>+	{</div><div class='add'>+		.start = 0xFFC00400,</div><div class='add'>+		.end = 0xFFC004FF,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_sir_device = {</div><div class='add'>+	.name = "bfin_sir",</div><div class='add'>+	.id = 0,</div><div class='add'>+	.num_resources = ARRAY_SIZE(bfin_sir_resources),</div><div class='add'>+	.resource = bfin_sir_resources,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)</div><div class='add'>+static struct platform_device bfin_sport0_uart_device = {</div><div class='add'>+	.name = "bfin-sport-uart",</div><div class='add'>+	.id = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_sport1_uart_device = {</div><div class='add'>+	.name = "bfin-sport-uart",</div><div class='add'>+	.id = 1,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/gpio_keys.h&gt;</div><div class='add'>+</div><div class='add'>+static struct gpio_keys_button bfin_gpio_keys_table[] = {</div><div class='add'>+	{BTN_0, GPIO_PF4, 0, "gpio-keys: BTN0"},</div><div class='add'>+	{BTN_1, GPIO_PF5, 0, "gpio-keys: BTN1"},</div><div class='add'>+	{BTN_2, GPIO_PF6, 0, "gpio-keys: BTN2"},</div><div class='add'>+}; /* Mapped to the first three PF Test Points */</div><div class='add'>+</div><div class='add'>+static struct gpio_keys_platform_data bfin_gpio_keys_data = {</div><div class='add'>+	.buttons        = bfin_gpio_keys_table,</div><div class='add'>+	.nbuttons       = ARRAY_SIZE(bfin_gpio_keys_table),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_device_gpiokeys = {</div><div class='add'>+	.name      = "gpio-keys",</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;bfin_gpio_keys_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct resource bfin_gpios_resources = {</div><div class='add'>+	.start = 0,</div><div class='add'>+	.end   = MAX_BLACKFIN_GPIOS - 1,</div><div class='add'>+	.flags = IORESOURCE_IRQ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_gpios_device = {</div><div class='add'>+	.name = "simple-gpio",</div><div class='add'>+	.id = -1,</div><div class='add'>+	.num_resources = 1,</div><div class='add'>+	.resource = &amp;bfin_gpios_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)</div><div class='add'>+#include &lt;linux/i2c-gpio.h&gt;</div><div class='add'>+</div><div class='add'>+static struct i2c_gpio_platform_data i2c_gpio_data = {</div><div class='add'>+	.sda_pin		= 8,</div><div class='add'>+	.scl_pin		= 9,</div><div class='add'>+	.sda_is_open_drain	= 0,</div><div class='add'>+	.scl_is_open_drain	= 0,</div><div class='add'>+	.udelay			= 40,</div><div class='add'>+}; /* This hasn't actually been used these pins</div><div class='add'>+    * are (currently) free pins on the expansion connector */</div><div class='add'>+</div><div class='add'>+static struct platform_device i2c_gpio_device = {</div><div class='add'>+	.name		= "i2c-gpio",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;i2c_gpio_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_I2C_BOARDINFO</div><div class='add'>+static struct i2c_board_info __initdata bfin_i2c_board_info[] = {</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const unsigned int cclk_vlev_datasheet[] =</div><div class='add'>+{</div><div class='add'>+	VRPAIR(VLEV_085, 250000000),</div><div class='add'>+	VRPAIR(VLEV_090, 376000000),</div><div class='add'>+	VRPAIR(VLEV_095, 426000000),</div><div class='add'>+	VRPAIR(VLEV_100, 426000000),</div><div class='add'>+	VRPAIR(VLEV_105, 476000000),</div><div class='add'>+	VRPAIR(VLEV_110, 476000000),</div><div class='add'>+	VRPAIR(VLEV_115, 476000000),</div><div class='add'>+	VRPAIR(VLEV_120, 600000000),</div><div class='add'>+	VRPAIR(VLEV_125, 600000000),</div><div class='add'>+	VRPAIR(VLEV_130, 600000000),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bfin_dpmc_platform_data bfin_dmpc_vreg_data = {</div><div class='add'>+	.tuple_tab = cclk_vlev_datasheet,</div><div class='add'>+	.tabsize = ARRAY_SIZE(cclk_vlev_datasheet),</div><div class='add'>+	.vr_settling_time = 25 /* us */,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_dpmc = {</div><div class='add'>+	.name = "bfin dpmc",</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;bfin_dmpc_vreg_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *stamp_devices[] __initdata = {</div><div class='add'>+</div><div class='add'>+	&amp;bfin_dpmc,</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)</div><div class='add'>+	&amp;rtc_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)</div><div class='add'>+	&amp;smc91x_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+	&amp;bfin_spi0_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)</div><div class='add'>+	&amp;bfin_uart_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)</div><div class='add'>+	&amp;bfin_sir_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)</div><div class='add'>+	&amp;bfin_sport0_uart_device,</div><div class='add'>+	&amp;bfin_sport1_uart_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)</div><div class='add'>+	&amp;bfin_device_gpiokeys,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)</div><div class='add'>+	&amp;i2c_gpio_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	&amp;bfin_gpios_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init blackstamp_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s(): registering device resources\n", __func__);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_I2C_BOARDINFO</div><div class='add'>+	i2c_register_board_info(0, bfin_i2c_board_info,</div><div class='add'>+				ARRAY_SIZE(bfin_i2c_board_info));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	ret = platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)</div><div class='add'>+	/* setup BF533_STAMP CPLD to route AMS3 to Ethernet MAC */</div><div class='add'>+	bfin_write_FIO_DIR(bfin_read_FIO_DIR() | PF0);</div><div class='add'>+	bfin_write_FIO_FLAG_S(PF0);</div><div class='add'>+	SSYNC();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(blackstamp_init);</div><div class='head'>diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c<br/>index ed2b0b8f5dc9..575843f6d9ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/cm_bf533.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf533/boards/cm_bf533.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/cm_bf533.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/boards/cm_bf533.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'> #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)</div><div class='ctx'> #include &lt;linux/usb/isp1362.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-#include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/bfin5xx_spi.h&gt;</div><div class='hunk'>@@ -53,16 +52,16 @@ const char bfin_board_name[] = "Bluetechnix CM BF533";</div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='ctx'> static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "bootloader",</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='ctx'> 		.size = 0x00020000,</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.mask_flags = MTD_CAP_ROM</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "kernel",</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='ctx'> 		.size = 0xe0000,</div><div class='ctx'> 		.offset = 0x20000</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "file system",</div><div class='add'>+		.name = "file system(spi)",</div><div class='ctx'> 		.size = 0x700000,</div><div class='ctx'> 		.offset = 0x00100000,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -307,43 +306,6 @@ static struct platform_device isp1362_hcd_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-#define PATA_INT	38</div><div class='del'>-</div><div class='del'>-static struct pata_platform_info bfin_pata_platform_data = {</div><div class='del'>-	.ioport_shift = 2,</div><div class='del'>-	.irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource bfin_pata_resources[] = {</div><div class='del'>-	{</div><div class='del'>-		.start = 0x2030C000,</div><div class='del'>-		.end = 0x2030C01F,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start = 0x2030D018,</div><div class='del'>-		.end = 0x2030D01B,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start = PATA_INT,</div><div class='del'>-		.end = PATA_INT,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device bfin_pata_device = {</div><div class='del'>-	.name = "pata_platform",</div><div class='del'>-	.id = -1,</div><div class='del'>-	.num_resources = ARRAY_SIZE(bfin_pata_resources),</div><div class='del'>-	.resource = bfin_pata_resources,</div><div class='del'>-	.dev = {</div><div class='del'>-		.platform_data = &amp;bfin_pata_platform_data,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static const unsigned int cclk_vlev_datasheet[] =</div><div class='ctx'> {</div><div class='ctx'> 	VRPAIR(VLEV_085, 250000000),</div><div class='hunk'>@@ -403,10 +365,6 @@ static struct platform_device *cm_bf533_devices[] __initdata = {</div><div class='ctx'> #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-	&amp;bfin_pata_device,</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init cm_bf533_init(void)</div><div class='hunk'>@@ -416,10 +374,6 @@ static int __init cm_bf533_init(void)</div><div class='ctx'> #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='ctx'> 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;</div><div class='del'>-#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c<br/>index 079389cbd859..cc2e7eeb1d5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/ezkit.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf533/boards/ezkit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/ezkit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/boards/ezkit.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'> #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)</div><div class='ctx'> #include &lt;linux/usb/isp1362.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-#include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/bfin5xx_spi.h&gt;</div><div class='hunk'>@@ -90,16 +89,16 @@ static struct platform_device smc91x_device = {</div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='ctx'> static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "bootloader",</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='ctx'> 		.size = 0x00020000,</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.mask_flags = MTD_CAP_ROM</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "kernel",</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='ctx'> 		.size = 0xe0000,</div><div class='ctx'> 		.offset = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "file system",</div><div class='add'>+		.name = "file system(spi)",</div><div class='ctx'> 		.size = MTDPART_SIZ_FULL,</div><div class='ctx'> 		.offset = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -255,43 +254,6 @@ static struct platform_device bfin_sir_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-#define PATA_INT	55</div><div class='del'>-</div><div class='del'>-static struct pata_platform_info bfin_pata_platform_data = {</div><div class='del'>-	.ioport_shift = 1,</div><div class='del'>-	.irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource bfin_pata_resources[] = {</div><div class='del'>-	{</div><div class='del'>-		.start = 0x20314020,</div><div class='del'>-		.end = 0x2031403F,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start = 0x2031401C,</div><div class='del'>-		.end = 0x2031401F,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start = PATA_INT,</div><div class='del'>-		.end = PATA_INT,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device bfin_pata_device = {</div><div class='del'>-	.name = "pata_platform",</div><div class='del'>-	.id = -1,</div><div class='del'>-	.num_resources = ARRAY_SIZE(bfin_pata_resources),</div><div class='del'>-	.resource = bfin_pata_resources,</div><div class='del'>-	.dev = {</div><div class='del'>-		.platform_data = &amp;bfin_pata_platform_data,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='hunk'>@@ -404,10 +366,6 @@ static struct platform_device *ezkit_devices[] __initdata = {</div><div class='ctx'> 	&amp;bfin_sir_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-	&amp;bfin_pata_device,</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)</div><div class='ctx'> 	&amp;bfin_device_gpiokeys,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -424,10 +382,6 @@ static int __init ezkit_init(void)</div><div class='ctx'> 	printk(KERN_INFO "%s(): registering device resources\n", __func__);</div><div class='ctx'> 	platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices));</div><div class='ctx'> 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;</div><div class='del'>-#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c<br/>index 13ae49515f73..050ffca53530 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/stamp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf533/boards/stamp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/stamp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/boards/stamp.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'> #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)</div><div class='ctx'> #include &lt;linux/usb/isp1362.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-#include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='hunk'>@@ -114,15 +113,15 @@ static struct platform_device net2272_bfin_device = {</div><div class='ctx'> #if defined(CONFIG_MTD_BFIN_ASYNC) || defined(CONFIG_MTD_BFIN_ASYNC_MODULE)</div><div class='ctx'> static struct mtd_partition stamp_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name   = "Bootloader",</div><div class='add'>+		.name   = "bootloader(nor)",</div><div class='ctx'> 		.size   = 0x40000,</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name   = "Kernel",</div><div class='add'>+		.name   = "linux kernel(nor)",</div><div class='ctx'> 		.size   = 0xE0000,</div><div class='ctx'> 		.offset = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name   = "RootFS",</div><div class='add'>+		.name   = "file system(nor)",</div><div class='ctx'> 		.size   = MTDPART_SIZ_FULL,</div><div class='ctx'> 		.offset = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -164,16 +163,16 @@ static struct platform_device stamp_flash_device = {</div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='ctx'> static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "bootloader",</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='ctx'> 		.size = 0x00040000,</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.mask_flags = MTD_CAP_ROM</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "kernel",</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='ctx'> 		.size = 0xe0000,</div><div class='ctx'> 		.offset = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "file system",</div><div class='add'>+		.name = "file system(spi)",</div><div class='ctx'> 		.size = MTDPART_SIZ_FULL,</div><div class='ctx'> 		.offset = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -404,43 +403,6 @@ static struct platform_device bfin_sport1_uart_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-#define PATA_INT	55</div><div class='del'>-</div><div class='del'>-static struct pata_platform_info bfin_pata_platform_data = {</div><div class='del'>-	.ioport_shift = 1,</div><div class='del'>-	.irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource bfin_pata_resources[] = {</div><div class='del'>-	{</div><div class='del'>-		.start = 0x20314020,</div><div class='del'>-		.end = 0x2031403F,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start = 0x2031401C,</div><div class='del'>-		.end = 0x2031401F,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start = PATA_INT,</div><div class='del'>-		.end = PATA_INT,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device bfin_pata_device = {</div><div class='del'>-	.name = "pata_platform",</div><div class='del'>-	.id = -1,</div><div class='del'>-	.num_resources = ARRAY_SIZE(bfin_pata_resources),</div><div class='del'>-	.resource = bfin_pata_resources,</div><div class='del'>-	.dev = {</div><div class='del'>-		.platform_data = &amp;bfin_pata_platform_data,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='hunk'>@@ -583,10 +545,6 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> 	&amp;bfin_sport1_uart_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-	&amp;bfin_pata_device,</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)</div><div class='ctx'> 	&amp;bfin_device_gpiokeys,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -625,10 +583,6 @@ static int __init stamp_init(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;</div><div class='del'>-#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf533/head.S b/arch/blackfin/mach-bf533/head.S<br/>index c671e8549b17..01b2b7ead5ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/head.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf533/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/head.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/head.S</a></div><div class='hunk'>@@ -30,294 +30,11 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='del'>-#include &lt;asm/trace.h&gt;</div><div class='ctx'> #ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='del'>-#include &lt;asm/mach-common/clocks.h&gt;</div><div class='del'>-#include &lt;asm/mach/mem_init.h&gt;</div><div class='add'>+#include &lt;asm/clocks.h&gt;</div><div class='add'>+#include &lt;mach/mem_init.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-.extern ___bss_stop</div><div class='del'>-.extern ___bss_start</div><div class='del'>-.extern _bf53x_relocate_l1_mem</div><div class='del'>-</div><div class='del'>-#define INITIAL_STACK	0xFFB01000</div><div class='del'>-</div><div class='del'>-__INIT</div><div class='del'>-</div><div class='del'>-ENTRY(__start)</div><div class='del'>-	/* R0: argument of command line string, passed from uboot, save it */</div><div class='del'>-	R7 = R0;</div><div class='del'>-	/* Enable Cycle Counter and Nesting Of Interrupts */</div><div class='del'>-#ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES</div><div class='del'>-	R0 = SYSCFG_SNEN;</div><div class='del'>-#else</div><div class='del'>-	R0 = SYSCFG_SNEN | SYSCFG_CCEN;</div><div class='del'>-#endif</div><div class='del'>-	SYSCFG = R0;</div><div class='del'>-	R0 = 0;</div><div class='del'>-</div><div class='del'>-	/* Clear Out All the data and pointer Registers */</div><div class='del'>-	R1 = R0;</div><div class='del'>-	R2 = R0;</div><div class='del'>-	R3 = R0;</div><div class='del'>-	R4 = R0;</div><div class='del'>-	R5 = R0;</div><div class='del'>-	R6 = R0;</div><div class='del'>-</div><div class='del'>-	P0 = R0;</div><div class='del'>-	P1 = R0;</div><div class='del'>-	P2 = R0;</div><div class='del'>-	P3 = R0;</div><div class='del'>-	P4 = R0;</div><div class='del'>-	P5 = R0;</div><div class='del'>-</div><div class='del'>-	LC0 = r0;</div><div class='del'>-	LC1 = r0;</div><div class='del'>-	L0 = r0;</div><div class='del'>-	L1 = r0;</div><div class='del'>-	L2 = r0;</div><div class='del'>-	L3 = r0;</div><div class='del'>-</div><div class='del'>-	/* Clear Out All the DAG Registers */</div><div class='del'>-	B0 = r0;</div><div class='del'>-	B1 = r0;</div><div class='del'>-	B2 = r0;</div><div class='del'>-	B3 = r0;</div><div class='del'>-</div><div class='del'>-	I0 = r0;</div><div class='del'>-	I1 = r0;</div><div class='del'>-	I2 = r0;</div><div class='del'>-	I3 = r0;</div><div class='del'>-</div><div class='del'>-	M0 = r0;</div><div class='del'>-	M1 = r0;</div><div class='del'>-	M2 = r0;</div><div class='del'>-	M3 = r0;</div><div class='del'>-</div><div class='del'>-	trace_buffer_init(p0,r0);</div><div class='del'>-	P0 = R1;</div><div class='del'>-	R0 = R1;</div><div class='del'>-</div><div class='del'>-	p0.h = hi(FIO_MASKA_C);</div><div class='del'>-	p0.l = lo(FIO_MASKA_C);</div><div class='del'>-	r0 = 0xFFFF(Z);</div><div class='del'>-	w[p0] = r0.L;	/* Disable all interrupts */</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p0.h = hi(FIO_MASKB_C);</div><div class='del'>-	p0.l = lo(FIO_MASKB_C);</div><div class='del'>-	r0 = 0xFFFF(Z);</div><div class='del'>-	w[p0] = r0.L;	/* Disable all interrupts */</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	/* Turn off the icache */</div><div class='del'>-	p0.l = LO(IMEM_CONTROL);</div><div class='del'>-	p0.h = HI(IMEM_CONTROL);</div><div class='del'>-	R1 = [p0];</div><div class='del'>-	R0 = ~ENICPLB;</div><div class='del'>-	R0 = R0 &amp; R1;</div><div class='del'>-</div><div class='del'>-	/* Anomaly 05000125 */</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-	CLI R2;</div><div class='del'>-	SSYNC;</div><div class='del'>-#endif</div><div class='del'>-	[p0] = R0;</div><div class='del'>-	SSYNC;</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-	STI R2;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Turn off the dcache */</div><div class='del'>-	p0.l = LO(DMEM_CONTROL);</div><div class='del'>-	p0.h = HI(DMEM_CONTROL);</div><div class='del'>-	R1 = [p0];</div><div class='del'>-	R0 = ~ENDCPLB;</div><div class='del'>-	R0 = R0 &amp; R1;</div><div class='del'>-</div><div class='del'>-	/* Anomaly 05000125 */</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-	CLI R2;</div><div class='del'>-	SSYNC;</div><div class='del'>-#endif</div><div class='del'>-	[p0] = R0;</div><div class='del'>-	SSYNC;</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-	STI R2;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Initialise UART - when booting from u-boot, the UART is not disabled</div><div class='del'>-	 * so if we dont initalize here, our serial console gets hosed */</div><div class='del'>-	p0.h = hi(BFIN_UART_LCR);</div><div class='del'>-	p0.l = lo(BFIN_UART_LCR);</div><div class='del'>-	r0 = 0x0(Z);</div><div class='del'>-	w[p0] = r0.L;	/* To enable DLL writes */</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p0.h = hi(BFIN_UART_DLL);</div><div class='del'>-	p0.l = lo(BFIN_UART_DLL);</div><div class='del'>-	r0 = 0x0(Z);</div><div class='del'>-	w[p0] = r0.L;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p0.h = hi(BFIN_UART_DLH);</div><div class='del'>-	p0.l = lo(BFIN_UART_DLH);</div><div class='del'>-	r0 = 0x00(Z);</div><div class='del'>-	w[p0] = r0.L;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p0.h = hi(BFIN_UART_GCTL);</div><div class='del'>-	p0.l = lo(BFIN_UART_GCTL);</div><div class='del'>-	r0 = 0x0(Z);</div><div class='del'>-	w[p0] = r0.L;	/* To enable UART clock */</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	/* Initialize stack pointer */</div><div class='del'>-	sp.l = lo(INITIAL_STACK);</div><div class='del'>-	sp.h = hi(INITIAL_STACK);</div><div class='del'>-	fp = sp;</div><div class='del'>-	usp = sp;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_EARLY_PRINTK</div><div class='del'>-	SP += -12;</div><div class='del'>-	call _init_early_exception_vectors;</div><div class='del'>-	SP += 12;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */</div><div class='del'>-	call _bf53x_relocate_l1_mem;</div><div class='del'>-#ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='del'>-	call _start_dma_code;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Code for initializing Async memory banks */</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_AMBCTL1);</div><div class='del'>-	p2.l = lo(EBIU_AMBCTL1);</div><div class='del'>-	r0.h = hi(AMBCTL1VAL);</div><div class='del'>-	r0.l = lo(AMBCTL1VAL);</div><div class='del'>-	[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_AMBCTL0);</div><div class='del'>-	p2.l = lo(EBIU_AMBCTL0);</div><div class='del'>-	r0.h = hi(AMBCTL0VAL);</div><div class='del'>-	r0.l = lo(AMBCTL0VAL);</div><div class='del'>-	[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_AMGCTL);</div><div class='del'>-	p2.l = lo(EBIU_AMGCTL);</div><div class='del'>-	r0 = AMGCTLVAL;</div><div class='del'>-	w[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	/* This section keeps the processor in supervisor mode</div><div class='del'>-	 * during kernel boot.  Switches to user mode at end of boot.</div><div class='del'>-	 * See page 3-9 of Hardware Reference manual for documentation.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* EVT15 = _real_start */</div><div class='del'>-</div><div class='del'>-	p0.l = lo(EVT15);</div><div class='del'>-	p0.h = hi(EVT15);</div><div class='del'>-	p1.l = _real_start;</div><div class='del'>-	p1.h = _real_start;</div><div class='del'>-	[p0] = p1;</div><div class='del'>-	csync;</div><div class='del'>-</div><div class='del'>-	p0.l = lo(IMASK);</div><div class='del'>-	p0.h = hi(IMASK);</div><div class='del'>-	p1.l = IMASK_IVG15;</div><div class='del'>-	p1.h = 0x0;</div><div class='del'>-	[p0] = p1;</div><div class='del'>-	csync;</div><div class='del'>-</div><div class='del'>-	raise 15;</div><div class='del'>-	p0.l = .LWAIT_HERE;</div><div class='del'>-	p0.h = .LWAIT_HERE;</div><div class='del'>-	reti = p0;</div><div class='del'>-#if ANOMALY_05000281</div><div class='del'>-	nop; nop; nop;</div><div class='del'>-#endif</div><div class='del'>-	rti;</div><div class='del'>-</div><div class='del'>-.LWAIT_HERE:</div><div class='del'>-	jump .LWAIT_HERE;</div><div class='del'>-ENDPROC(__start)</div><div class='del'>-</div><div class='del'>-ENTRY(_real_start)</div><div class='del'>-	[ -- sp ] = reti;</div><div class='del'>-	p0.l = lo(WDOG_CTL);</div><div class='del'>-	p0.h = hi(WDOG_CTL);</div><div class='del'>-	r0 = 0xAD6(z);</div><div class='del'>-	w[p0] = r0;	/* watchdog off for now */</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	/* Code update for BSS size == 0</div><div class='del'>-	 * Zero out the bss region.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	p1.l = ___bss_start;</div><div class='del'>-	p1.h = ___bss_start;</div><div class='del'>-	p2.l = ___bss_stop;</div><div class='del'>-	p2.h = ___bss_stop;</div><div class='del'>-	r0 = 0;</div><div class='del'>-	p2 -= p1;</div><div class='del'>-	lsetup (.L_clear_bss, .L_clear_bss) lc0 = p2;</div><div class='del'>-.L_clear_bss:</div><div class='del'>-	B[p1++] = r0;</div><div class='del'>-</div><div class='del'>-	/* In case there is a NULL pointer reference</div><div class='del'>-	 * Zero out region before stext</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	p1.l = 0x0;</div><div class='del'>-	p1.h = 0x0;</div><div class='del'>-	r0.l = __stext;</div><div class='del'>-	r0.h = __stext;</div><div class='del'>-	r0 = r0 &gt;&gt; 1;</div><div class='del'>-	p2 = r0;</div><div class='del'>-	r0 = 0;</div><div class='del'>-	lsetup (.L_clear_zero, .L_clear_zero) lc0 = p2;</div><div class='del'>-.L_clear_zero:</div><div class='del'>-	W[p1++] = r0;</div><div class='del'>-</div><div class='del'>-	/* pass the uboot arguments to the global value command line */</div><div class='del'>-	R0 = R7;</div><div class='del'>-	call _cmdline_init;</div><div class='del'>-</div><div class='del'>-	p1.l = __rambase;</div><div class='del'>-	p1.h = __rambase;</div><div class='del'>-	r0.l = __sdata;</div><div class='del'>-	r0.h = __sdata;</div><div class='del'>-	[p1] = r0;</div><div class='del'>-</div><div class='del'>-	p1.l = __ramstart;</div><div class='del'>-	p1.h = __ramstart;</div><div class='del'>-	p3.l = ___bss_stop;</div><div class='del'>-	p3.h = ___bss_stop;</div><div class='del'>-</div><div class='del'>-	r1 = p3;</div><div class='del'>-	[p1] = r1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * load the current thread pointer and stack</div><div class='del'>-	 */</div><div class='del'>-	r1.l = _init_thread_union;</div><div class='del'>-	r1.h = _init_thread_union;</div><div class='del'>-</div><div class='del'>-	r2.l = 0x2000;</div><div class='del'>-	r2.h = 0x0000;</div><div class='del'>-	r1 = r1 + r2;</div><div class='del'>-	sp = r1;</div><div class='del'>-	usp = sp;</div><div class='del'>-	fp = sp;</div><div class='del'>-	jump.l _start_kernel;</div><div class='del'>-ENDPROC(_real_start)</div><div class='del'>-</div><div class='del'>-__FINIT</div><div class='del'>-</div><div class='ctx'> .section .l1.text</div><div class='ctx'> #ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='ctx'> ENTRY(_start_dma_code)</div><div class='hunk'>@@ -412,13 +129,6 @@ ENTRY(_start_dma_code)</div><div class='ctx'> 	[P2] = R1;</div><div class='ctx'> 	SSYNC;</div><div class='ctx'> </div><div class='del'>-	p0.h = hi(SIC_IWR);</div><div class='del'>-	p0.l = lo(SIC_IWR);</div><div class='del'>-	r0.l = lo(IWR_ENABLE_ALL);</div><div class='del'>-	r0.h = hi(IWR_ENABLE_ALL);</div><div class='del'>-	[p0] = r0;</div><div class='del'>-	SSYNC;</div><div class='del'>-</div><div class='ctx'> 	RTS;</div><div class='ctx'> ENDPROC(_start_dma_code)</div><div class='ctx'> #endif /* CONFIG_BFIN_KERNEL_CLOCK */</div><div class='head'>diff --git a/include/asm-blackfin/mach-bf533/anomaly.h b/arch/blackfin/mach-bf533/include/mach/anomaly.h<br/>index 8f7ea112fd3a..8f7ea112fd3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf533/anomaly.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf533/anomaly.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/include/mach/anomaly.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/anomaly.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf533/bf533.h b/arch/blackfin/mach-bf533/include/mach/bf533.h<br/>index 12a416931991..12a416931991 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf533/bf533.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf533/bf533.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/include/mach/bf533.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/bf533.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h b/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h<br/>index ebf592b59aab..ebf592b59aab 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf533/bfin_serial_5xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf533/bfin_sir.h b/arch/blackfin/mach-bf533/include/mach/bfin_sir.h<br/>index 9bb87e9e2e9b..9bb87e9e2e9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf533/bfin_sir.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf533/bfin_sir.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/include/mach/bfin_sir.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/bfin_sir.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf533/blackfin.h b/arch/blackfin/mach-bf533/include/mach/blackfin.h<br/>index d80971b4e3aa..d80971b4e3aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf533/blackfin.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf533/blackfin.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/include/mach/blackfin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/blackfin.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf533/cdefBF532.h b/arch/blackfin/mach-bf533/include/mach/cdefBF532.h<br/>index 154655452d4c..3d8978a52c17 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf533/cdefBF532.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf533/cdefBF532.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/include/mach/cdefBF532.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/cdefBF532.h</a></div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> #include "defBF532.h"</div><div class='ctx'> </div><div class='ctx'> /*include core specific register pointer definitions*/</div><div class='del'>-#include &lt;asm/mach-common/cdef_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/cdef_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf533/defBF532.h b/arch/blackfin/mach-bf533/include/mach/defBF532.h<br/>index 0ab4dd7494cf..7f4633223e6d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf533/defBF532.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf533/defBF532.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/include/mach/defBF532.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/defBF532.h</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> #define _DEF_BF532_H</div><div class='ctx'> </div><div class='ctx'> /* include all Core registers and bit definitions */</div><div class='del'>-#include &lt;asm/mach-common/def_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/def_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*********************************************************************************** */</div><div class='ctx'> /* System MMR Register Map */</div><div class='head'>diff --git a/include/asm-blackfin/mach-bf533/dma.h b/arch/blackfin/mach-bf533/include/mach/dma.h<br/>index bd9d5e94307d..bd9d5e94307d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf533/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf533/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/dma.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf533/irq.h b/arch/blackfin/mach-bf533/include/mach/irq.h<br/>index 5aa38e5da6b7..5aa38e5da6b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf533/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf533/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/include/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/irq.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf533/mem_init.h b/arch/blackfin/mach-bf533/include/mach/mem_init.h<br/>index 995c06b2b1ef..ed2034bf10ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf533/mem_init.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf533/mem_init.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/include/mach/mem_init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/mem_init.h</a></div><div class='hunk'>@@ -47,7 +47,7 @@</div><div class='ctx'> #define SDRAM_tRCD      TRCD_2</div><div class='ctx'> #define SDRAM_tWR       TWR_2</div><div class='ctx'> #endif</div><div class='del'>-#if (CONFIG_SCLK_HZ &gt; 8955223) &amp;&amp; (CONFIG_SCLK_HZ &lt;= 104477612)</div><div class='add'>+#if (CONFIG_SCLK_HZ &gt; 89552239) &amp;&amp; (CONFIG_SCLK_HZ &lt;= 104477612)</div><div class='ctx'> #define SDRAM_tRP       TRP_2</div><div class='ctx'> #define SDRAM_tRP_num   2</div><div class='ctx'> #define SDRAM_tRAS      TRAS_5</div><div class='head'>diff --git a/include/asm-blackfin/mach-bf533/mem_map.h b/arch/blackfin/mach-bf533/include/mach/mem_map.h<br/>index bd30b6f3be00..581fc6eea789 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf533/mem_map.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf533/mem_map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/include/mach/mem_map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/mem_map.h</a></div><div class='hunk'>@@ -158,6 +158,11 @@</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Level 2 Memory - none */</div><div class='add'>+</div><div class='add'>+#define L2_START	0</div><div class='add'>+#define L2_LENGTH	0</div><div class='add'>+</div><div class='ctx'> /* Scratch Pad Memory */</div><div class='ctx'> </div><div class='ctx'> #define L1_SCRATCH_START	0xFFB00000</div><div class='head'>diff --git a/include/asm-blackfin/mach-bf533/portmux.h b/arch/blackfin/mach-bf533/include/mach/portmux.h<br/>index 685a2651dcda..685a2651dcda 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf533/portmux.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf533/portmux.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/include/mach/portmux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/include/mach/portmux.h</a></div><div class='head'>diff --git a/arch/blackfin/mach-bf533/ints-priority.c b/arch/blackfin/mach-bf533/ints-priority.c<br/>index 7d79e0f9503d..f51994b7a2b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/ints-priority.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf533/ints-priority.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/ints-priority.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf533/ints-priority.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='ctx'> </div><div class='del'>-void program_IAR(void)</div><div class='add'>+void __init program_IAR(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Program the IAR0 Register with the configured priority */</div><div class='ctx'> 	bfin_write_SIC_IAR0(((CONFIG_PLLWAKE_ERROR - 7) &lt;&lt; PLLWAKE_ERROR_POS) |</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/boards/Kconfig b/arch/blackfin/mach-bf537/boards/Kconfig<br/>index 7e789dbef036..42a57b0acb29 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf537/boards/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/boards/Kconfig</a></div><div class='hunk'>@@ -15,6 +15,12 @@ config BFIN537_BLUETECHNIX_CM</div><div class='ctx'> 	help</div><div class='ctx'> 	  CM-BF537 support for EVAL- and DEV-Board.</div><div class='ctx'> </div><div class='add'>+config BFIN537_BLUETECHNIX_TCM</div><div class='add'>+	bool "Bluetechnix TCM-BF537"</div><div class='add'>+	depends on (BF537)</div><div class='add'>+	help</div><div class='add'>+	  TCM-BF537 support for EVAL- and DEV-Board.</div><div class='add'>+</div><div class='ctx'> config PNAV10</div><div class='ctx'> 	bool "PNAV board"</div><div class='ctx'> 	depends on (BF537)</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/boards/Makefile b/arch/blackfin/mach-bf537/boards/Makefile<br/>index c94f7a5b8211..7168cc14afd8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf537/boards/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/boards/Makefile</a></div><div class='hunk'>@@ -5,5 +5,6 @@</div><div class='ctx'> obj-$(CONFIG_GENERIC_BF537_BOARD)      += generic_board.o</div><div class='ctx'> obj-$(CONFIG_BFIN537_STAMP)            += stamp.o</div><div class='ctx'> obj-$(CONFIG_BFIN537_BLUETECHNIX_CM)   += cm_bf537.o</div><div class='add'>+obj-$(CONFIG_BFIN537_BLUETECHNIX_TCM)  += tcm_bf537.o</div><div class='ctx'> obj-$(CONFIG_PNAV10)                   += pnav10.o</div><div class='ctx'> obj-$(CONFIG_CAMSIG_MINOTAUR)          += minotaur.o</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c<br/>index 73f2142875e2..dde14720b0ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/cm_bf537.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf537/boards/cm_bf537.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/cm_bf537.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/boards/cm_bf537.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spi/flash.h&gt;</div><div class='ctx'> #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)</div><div class='hunk'>@@ -56,16 +57,16 @@ const char bfin_board_name[] = "Bluetechnix CM BF537";</div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='ctx'> static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "bootloader",</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='ctx'> 		.size = 0x00020000,</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.mask_flags = MTD_CAP_ROM</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "kernel",</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='ctx'> 		.size = 0xe0000,</div><div class='ctx'> 		.offset = 0x20000</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "file system",</div><div class='add'>+		.name = "file system(spi)",</div><div class='ctx'> 		.size = 0x700000,</div><div class='ctx'> 		.offset = 0x00100000,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -307,6 +308,55 @@ static struct platform_device net2272_bfin_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE)</div><div class='add'>+static struct mtd_partition cm_partitions[] = {</div><div class='add'>+	{</div><div class='add'>+		.name   = "bootloader(nor)",</div><div class='add'>+		.size   = 0x40000,</div><div class='add'>+		.offset = 0,</div><div class='add'>+	}, {</div><div class='add'>+		.name   = "linux kernel(nor)",</div><div class='add'>+		.size   = 0xE0000,</div><div class='add'>+		.offset = MTDPART_OFS_APPEND,</div><div class='add'>+	}, {</div><div class='add'>+		.name   = "file system(nor)",</div><div class='add'>+		.size   = MTDPART_SIZ_FULL,</div><div class='add'>+		.offset = MTDPART_OFS_APPEND,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct physmap_flash_data cm_flash_data = {</div><div class='add'>+	.width    = 2,</div><div class='add'>+	.parts    = cm_partitions,</div><div class='add'>+	.nr_parts = ARRAY_SIZE(cm_partitions),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned cm_flash_gpios[] = { GPIO_PF4 };</div><div class='add'>+</div><div class='add'>+static struct resource cm_flash_resource[] = {</div><div class='add'>+	{</div><div class='add'>+		.name  = "cfi_probe",</div><div class='add'>+		.start = 0x20000000,</div><div class='add'>+		.end   = 0x201fffff,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start = (unsigned long)cm_flash_gpios,</div><div class='add'>+		.end   = ARRAY_SIZE(cm_flash_gpios),</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device cm_flash_device = {</div><div class='add'>+	.name          = "gpio-addr-flash",</div><div class='add'>+	.id            = 0,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;cm_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources = ARRAY_SIZE(cm_flash_resource),</div><div class='add'>+	.resource      = cm_flash_resource,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)</div><div class='ctx'> static struct resource bfin_uart_resources[] = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -395,7 +445,7 @@ static struct platform_device bfin_mac_device = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-#define PATA_INT	64</div><div class='add'>+#define PATA_INT	IRQ_PF14</div><div class='ctx'> </div><div class='ctx'> static struct pata_platform_info bfin_pata_platform_data = {</div><div class='ctx'> 	.ioport_shift = 2,</div><div class='hunk'>@@ -510,6 +560,10 @@ static struct platform_device *cm_bf537_devices[] __initdata = {</div><div class='ctx'> #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='ctx'> 	&amp;bfin_pata_device,</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE)</div><div class='add'>+	&amp;cm_flash_device,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init cm_bf537_init(void)</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c<br/>index 01b63e2ec18f..78a13d5bfd55 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/generic_board.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf537/boards/generic_board.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/generic_board.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/boards/generic_board.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'> #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)</div><div class='ctx'> #include &lt;linux/usb/isp1362.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-#include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/usb/sl811.h&gt;</div><div class='hunk'>@@ -307,16 +306,16 @@ static struct platform_device net2272_bfin_device = {</div><div class='ctx'> 	|| defined(CONFIG_MTD_M25P80_MODULE)</div><div class='ctx'> static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "bootloader",</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='ctx'> 		.size = 0x00020000,</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.mask_flags = MTD_CAP_ROM</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "kernel",</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='ctx'> 		.size = 0xe0000,</div><div class='ctx'> 		.offset = 0x20000</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "file system",</div><div class='add'>+		.name = "file system(spi)",</div><div class='ctx'> 		.size = 0x700000,</div><div class='ctx'> 		.offset = 0x00100000,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -619,43 +618,6 @@ static struct platform_device bfin_sport1_uart_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-#define PATA_INT	55</div><div class='del'>-</div><div class='del'>-static struct pata_platform_info bfin_pata_platform_data = {</div><div class='del'>-	.ioport_shift = 1,</div><div class='del'>-	.irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource bfin_pata_resources[] = {</div><div class='del'>-	{</div><div class='del'>-		.start = 0x20314020,</div><div class='del'>-		.end = 0x2031403F,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start = 0x2031401C,</div><div class='del'>-		.end = 0x2031401F,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start = PATA_INT,</div><div class='del'>-		.end = PATA_INT,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device bfin_pata_device = {</div><div class='del'>-	.name = "pata_platform",</div><div class='del'>-	.id = -1,</div><div class='del'>-	.num_resources = ARRAY_SIZE(bfin_pata_resources),</div><div class='del'>-	.resource = bfin_pata_resources,</div><div class='del'>-	.dev = {</div><div class='del'>-		.platform_data = &amp;bfin_pata_platform_data,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)</div><div class='ctx'> 	&amp;bfin_pcmcia_cf_device,</div><div class='hunk'>@@ -717,10 +679,6 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> 	&amp;bfin_sport0_uart_device,</div><div class='ctx'> 	&amp;bfin_sport1_uart_device,</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-	&amp;bfin_pata_device,</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init stamp_init(void)</div><div class='hunk'>@@ -732,9 +690,6 @@ static int __init stamp_init(void)</div><div class='ctx'> 				ARRAY_SIZE(bfin_spi_board_info));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;</div><div class='del'>-#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c<br/>index 18ddf7a52005..48c4cd2d1be6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/minotaur.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf537/boards/minotaur.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/minotaur.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/boards/minotaur.c</a></div><div class='hunk'>@@ -100,16 +100,16 @@ static struct platform_device net2272_bfin_device = {</div><div class='ctx'> </div><div class='ctx'> static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name       = "uboot",</div><div class='add'>+		.name       = "bootloader(spi)",</div><div class='ctx'> 		.size       = PSIZE_UBOOT,</div><div class='ctx'> 		.offset     = 0x000000,</div><div class='ctx'> 		.mask_flags = MTD_CAP_ROM</div><div class='ctx'> 	}, {</div><div class='del'>-		.name       = "initramfs",</div><div class='add'>+		.name       = "initramfs(spi)",</div><div class='ctx'> 		.size       = PSIZE_INITRAMFS,</div><div class='ctx'> 		.offset     = PSIZE_UBOOT</div><div class='ctx'> 	}, {</div><div class='del'>-		.name       = "opt",</div><div class='add'>+		.name       = "opt(spi)",</div><div class='ctx'> 		.size       = FLASH_SIZE - (PSIZE_UBOOT + PSIZE_INITRAMFS),</div><div class='ctx'> 		.offset     = PSIZE_UBOOT + PSIZE_INITRAMFS,</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c<br/>index 51c3bab14a69..f9174c11cbd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/pnav10.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf537/boards/pnav10.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/pnav10.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/boards/pnav10.c</a></div><div class='hunk'>@@ -231,16 +231,16 @@ static struct platform_device net2272_bfin_device = {</div><div class='ctx'> 	|| defined(CONFIG_MTD_M25P80_MODULE)</div><div class='ctx'> static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "bootloader",</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='ctx'> 		.size = 0x00020000,</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.mask_flags = MTD_CAP_ROM</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "kernel",</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='ctx'> 		.size = 0xe0000,</div><div class='ctx'> 		.offset = 0x20000</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "file system",</div><div class='add'>+		.name = "file system(spi)",</div><div class='ctx'> 		.size = 0x700000,</div><div class='ctx'> 		.offset = 0x00100000,</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c<br/>index 6dbc76fb080b..8482d22321f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/stamp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf537/boards/stamp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/stamp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/boards/stamp.c</a></div><div class='hunk'>@@ -364,11 +364,11 @@ const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };</div><div class='ctx'> </div><div class='ctx'> static struct mtd_partition bfin_plat_nand_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name   = "linux kernel",</div><div class='add'>+		.name   = "linux kernel(nand)",</div><div class='ctx'> 		.size   = 0x400000,</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name   = "file system",</div><div class='add'>+		.name   = "file system(nand)",</div><div class='ctx'> 		.size   = MTDPART_SIZ_FULL,</div><div class='ctx'> 		.offset = MTDPART_OFS_APPEND,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -439,19 +439,19 @@ static void bfin_plat_nand_init(void) {}</div><div class='ctx'> #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)</div><div class='ctx'> static struct mtd_partition stamp_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name       = "Bootloader",</div><div class='add'>+		.name       = "bootloader(nor)",</div><div class='ctx'> 		.size       = 0x40000,</div><div class='ctx'> 		.offset     = 0,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name       = "Kernel",</div><div class='add'>+		.name       = "linux kernel(nor)",</div><div class='ctx'> 		.size       = 0xE0000,</div><div class='ctx'> 		.offset     = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name       = "RootFS",</div><div class='add'>+		.name       = "file system(nor)",</div><div class='ctx'> 		.size       = 0x400000 - 0x40000 - 0xE0000 - 0x10000,</div><div class='ctx'> 		.offset     = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name       = "MAC Address",</div><div class='add'>+		.name       = "MAC Address(nor)",</div><div class='ctx'> 		.size       = MTDPART_SIZ_FULL,</div><div class='ctx'> 		.offset     = 0x3F0000,</div><div class='ctx'> 		.mask_flags = MTD_WRITEABLE,</div><div class='hunk'>@@ -485,16 +485,16 @@ static struct platform_device stamp_flash_device = {</div><div class='ctx'> 	|| defined(CONFIG_MTD_M25P80_MODULE)</div><div class='ctx'> static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "bootloader",</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='ctx'> 		.size = 0x00040000,</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.mask_flags = MTD_CAP_ROM</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "kernel",</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='ctx'> 		.size = 0xe0000,</div><div class='ctx'> 		.offset = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "file system",</div><div class='add'>+		.name = "file system(spi)",</div><div class='ctx'> 		.size = MTDPART_SIZ_FULL,</div><div class='ctx'> 		.offset = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -584,6 +584,30 @@ static struct bfin5xx_spi_chip spidev_chip_info = {</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MTD_DATAFLASH) \</div><div class='ctx'> 	|| defined(CONFIG_MTD_DATAFLASH_MODULE)</div><div class='add'>+</div><div class='add'>+static struct mtd_partition bfin_spi_dataflash_partitions[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='add'>+		.size = 0x00040000,</div><div class='add'>+		.offset = 0,</div><div class='add'>+		.mask_flags = MTD_CAP_ROM</div><div class='add'>+	}, {</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='add'>+		.size = 0xe0000,</div><div class='add'>+		.offset = MTDPART_OFS_APPEND,</div><div class='add'>+	}, {</div><div class='add'>+		.name = "file system(spi)",</div><div class='add'>+		.size = MTDPART_SIZ_FULL,</div><div class='add'>+		.offset = MTDPART_OFS_APPEND,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct flash_platform_data bfin_spi_dataflash_data = {</div><div class='add'>+	.name = "SPI Dataflash",</div><div class='add'>+	.parts = bfin_spi_dataflash_partitions,</div><div class='add'>+	.nr_parts = ARRAY_SIZE(bfin_spi_dataflash_partitions),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* DataFlash chip */</div><div class='ctx'> static struct bfin5xx_spi_chip data_flash_chip_info = {</div><div class='ctx'> 	.enable_dma = 0,         /* use dma transfer with this chip*/</div><div class='hunk'>@@ -609,9 +633,10 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> 	|| defined(CONFIG_MTD_DATAFLASH_MODULE)</div><div class='ctx'> 	{	/* DataFlash chip */</div><div class='ctx'> 		.modalias = "mtd_dataflash",</div><div class='del'>-		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.max_speed_hz = 33250000,     /* max spi clock (SCK) speed in HZ */</div><div class='ctx'> 		.bus_num = 0, /* Framework bus number */</div><div class='ctx'> 		.chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/</div><div class='add'>+		.platform_data = &amp;bfin_spi_dataflash_data,</div><div class='ctx'> 		.controller_data = &amp;data_flash_chip_info,</div><div class='ctx'> 		.mode = SPI_MODE_3,</div><div class='ctx'> 	},</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c<br/>new file mode 100644<br/>index 000000000000..d5ff705a5129<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/tcm_bf537.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/boards/tcm_bf537.c</a></div><div class='hunk'>@@ -0,0 +1,590 @@</div><div class='add'>+/*</div><div class='add'>+ * File:         arch/blackfin/mach-bf537/boards/tcm_bf537.c</div><div class='add'>+ * Based on:     arch/blackfin/mach-bf533/boards/cm_bf537.c</div><div class='add'>+ * Author:       Aidan Williams &lt;aidan@nicta.com.au&gt;</div><div class='add'>+ *</div><div class='add'>+ * Created:      2005</div><div class='add'>+ * Description:  Board description file</div><div class='add'>+ *</div><div class='add'>+ * Modified:</div><div class='add'>+ *               Copyright 2005 National ICT Australia (NICTA)</div><div class='add'>+ *               Copyright 2004-2006 Analog Devices Inc.</div><div class='add'>+ *</div><div class='add'>+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, see the file COPYING, or write</div><div class='add'>+ * to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/flash.h&gt;</div><div class='add'>+#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)</div><div class='add'>+#include &lt;linux/usb/isp1362.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#include &lt;linux/ata_platform.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;asm/dma.h&gt;</div><div class='add'>+#include &lt;asm/bfin5xx_spi.h&gt;</div><div class='add'>+#include &lt;asm/portmux.h&gt;</div><div class='add'>+#include &lt;asm/dpmc.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Name the Board for the /proc/cpuinfo</div><div class='add'>+ */</div><div class='add'>+const char bfin_board_name[] = "Bluetechnix TCM BF537";</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+/* all SPI peripherals info goes here */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='add'>+static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='add'>+		.size = 0x00020000,</div><div class='add'>+		.offset = 0,</div><div class='add'>+		.mask_flags = MTD_CAP_ROM</div><div class='add'>+	}, {</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='add'>+		.size = 0xe0000,</div><div class='add'>+		.offset = 0x20000</div><div class='add'>+	}, {</div><div class='add'>+		.name = "file system(spi)",</div><div class='add'>+		.size = 0x700000,</div><div class='add'>+		.offset = 0x00100000,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct flash_platform_data bfin_spi_flash_data = {</div><div class='add'>+	.name = "m25p80",</div><div class='add'>+	.parts = bfin_spi_flash_partitions,</div><div class='add'>+	.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),</div><div class='add'>+	.type = "m25p64",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SPI flash chip (m25p64) */</div><div class='add'>+static struct bfin5xx_spi_chip spi_flash_chip_info = {</div><div class='add'>+	.enable_dma = 0,         /* use dma transfer with this chip*/</div><div class='add'>+	.bits_per_word = 8,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_ADC_BF533) || defined(CONFIG_SPI_ADC_BF533_MODULE)</div><div class='add'>+/* SPI ADC chip */</div><div class='add'>+static struct bfin5xx_spi_chip spi_adc_chip_info = {</div><div class='add'>+	.enable_dma = 1,         /* use dma transfer with this chip*/</div><div class='add'>+	.bits_per_word = 16,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)</div><div class='add'>+static struct bfin5xx_spi_chip ad1836_spi_chip_info = {</div><div class='add'>+	.enable_dma = 0,</div><div class='add'>+	.bits_per_word = 16,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)</div><div class='add'>+static struct bfin5xx_spi_chip ad9960_spi_chip_info = {</div><div class='add'>+	.enable_dma = 0,</div><div class='add'>+	.bits_per_word = 16,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)</div><div class='add'>+static struct bfin5xx_spi_chip spi_mmc_chip_info = {</div><div class='add'>+	.enable_dma = 1,</div><div class='add'>+	.bits_per_word = 8,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='add'>+#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='add'>+	{</div><div class='add'>+		/* the modalias must be the same as spi device driver name */</div><div class='add'>+		.modalias = "m25p80", /* Name of spi_driver for this device */</div><div class='add'>+		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0, /* Framework bus number */</div><div class='add'>+		.chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/</div><div class='add'>+		.platform_data = &amp;bfin_spi_flash_data,</div><div class='add'>+		.controller_data = &amp;spi_flash_chip_info,</div><div class='add'>+		.mode = SPI_MODE_3,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_ADC_BF533) || defined(CONFIG_SPI_ADC_BF533_MODULE)</div><div class='add'>+	{</div><div class='add'>+		.modalias = "bfin_spi_adc", /* Name of spi_driver for this device */</div><div class='add'>+		.max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0, /* Framework bus number */</div><div class='add'>+		.chip_select = 1, /* Framework chip select. */</div><div class='add'>+		.platform_data = NULL, /* No spi_driver specific config */</div><div class='add'>+		.controller_data = &amp;spi_adc_chip_info,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)</div><div class='add'>+	{</div><div class='add'>+		.modalias = "ad1836-spi",</div><div class='add'>+		.max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0,</div><div class='add'>+		.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,</div><div class='add'>+		.controller_data = &amp;ad1836_spi_chip_info,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)</div><div class='add'>+	{</div><div class='add'>+		.modalias = "ad9960-spi",</div><div class='add'>+		.max_speed_hz = 10000000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0,</div><div class='add'>+		.chip_select = 1,</div><div class='add'>+		.controller_data = &amp;ad9960_spi_chip_info,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)</div><div class='add'>+	{</div><div class='add'>+		.modalias = "spi_mmc_dummy",</div><div class='add'>+		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0,</div><div class='add'>+		.chip_select = 7,</div><div class='add'>+		.platform_data = NULL,</div><div class='add'>+		.controller_data = &amp;spi_mmc_chip_info,</div><div class='add'>+		.mode = SPI_MODE_3,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.modalias = "spi_mmc",</div><div class='add'>+		.max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */</div><div class='add'>+		.bus_num = 0,</div><div class='add'>+		.chip_select = CONFIG_SPI_MMC_CS_CHAN,</div><div class='add'>+		.platform_data = NULL,</div><div class='add'>+		.controller_data = &amp;spi_mmc_chip_info,</div><div class='add'>+		.mode = SPI_MODE_3,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SPI (0) */</div><div class='add'>+static struct resource bfin_spi0_resource[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start = SPI0_REGBASE,</div><div class='add'>+		.end   = SPI0_REGBASE + 0xFF,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+		},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start = CH_SPI,</div><div class='add'>+		.end   = CH_SPI,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SPI controller data */</div><div class='add'>+static struct bfin5xx_spi_master bfin_spi0_info = {</div><div class='add'>+	.num_chipselect = 8,</div><div class='add'>+	.enable_dma = 1,  /* master has the ability to do dma transfer */</div><div class='add'>+	.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_spi0_device = {</div><div class='add'>+	.name = "bfin-spi",</div><div class='add'>+	.id = 0, /* Bus number */</div><div class='add'>+	.num_resources = ARRAY_SIZE(bfin_spi0_resource),</div><div class='add'>+	.resource = bfin_spi0_resource,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;bfin_spi0_info, /* Passed to driver */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif  /* spi master and devices */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)</div><div class='add'>+static struct platform_device rtc_device = {</div><div class='add'>+	.name = "rtc-bfin",</div><div class='add'>+	.id   = -1,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE)</div><div class='add'>+static struct platform_device hitachi_fb_device = {</div><div class='add'>+	.name = "hitachi-tx09",</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)</div><div class='add'>+static struct resource smc91x_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = 0x20200300,</div><div class='add'>+		.end = 0x20200300 + 16,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start = IRQ_PF14,</div><div class='add'>+		.end = IRQ_PF14,</div><div class='add'>+		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,</div><div class='add'>+		},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device smc91x_device = {</div><div class='add'>+	.name = "smc91x",</div><div class='add'>+	.id = 0,</div><div class='add'>+	.num_resources = ARRAY_SIZE(smc91x_resources),</div><div class='add'>+	.resource = smc91x_resources,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)</div><div class='add'>+static struct resource isp1362_hcd_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = 0x20308000,</div><div class='add'>+		.end = 0x20308000,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start = 0x20308004,</div><div class='add'>+		.end = 0x20308004,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start = IRQ_PG15,</div><div class='add'>+		.end = IRQ_PG15,</div><div class='add'>+		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct isp1362_platform_data isp1362_priv = {</div><div class='add'>+	.sel15Kres = 1,</div><div class='add'>+	.clknotstop = 0,</div><div class='add'>+	.oc_enable = 0,</div><div class='add'>+	.int_act_high = 0,</div><div class='add'>+	.int_edge_triggered = 0,</div><div class='add'>+	.remote_wakeup_connected = 0,</div><div class='add'>+	.no_power_switching = 1,</div><div class='add'>+	.power_switching_mode = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device isp1362_hcd_device = {</div><div class='add'>+	.name = "isp1362-hcd",</div><div class='add'>+	.id = 0,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;isp1362_priv,</div><div class='add'>+	},</div><div class='add'>+	.num_resources = ARRAY_SIZE(isp1362_hcd_resources),</div><div class='add'>+	.resource = isp1362_hcd_resources,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)</div><div class='add'>+static struct resource net2272_bfin_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = 0x20200000,</div><div class='add'>+		.end = 0x20200000 + 0x100,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start = IRQ_PH14,</div><div class='add'>+		.end = IRQ_PH14,</div><div class='add'>+		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device net2272_bfin_device = {</div><div class='add'>+	.name = "net2272",</div><div class='add'>+	.id = -1,</div><div class='add'>+	.num_resources = ARRAY_SIZE(net2272_bfin_resources),</div><div class='add'>+	.resource = net2272_bfin_resources,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE)</div><div class='add'>+static struct mtd_partition cm_partitions[] = {</div><div class='add'>+	{</div><div class='add'>+		.name   = "bootloader(nor)",</div><div class='add'>+		.size   = 0x40000,</div><div class='add'>+		.offset = 0,</div><div class='add'>+	}, {</div><div class='add'>+		.name   = "linux kernel(nor)",</div><div class='add'>+		.size   = 0xE0000,</div><div class='add'>+		.offset = MTDPART_OFS_APPEND,</div><div class='add'>+	}, {</div><div class='add'>+		.name   = "file system(nor)",</div><div class='add'>+		.size   = MTDPART_SIZ_FULL,</div><div class='add'>+		.offset = MTDPART_OFS_APPEND,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct physmap_flash_data cm_flash_data = {</div><div class='add'>+	.width    = 2,</div><div class='add'>+	.parts    = cm_partitions,</div><div class='add'>+	.nr_parts = ARRAY_SIZE(cm_partitions),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned cm_flash_gpios[] = { GPIO_PF4, GPIO_PF5 };</div><div class='add'>+</div><div class='add'>+static struct resource cm_flash_resource[] = {</div><div class='add'>+	{</div><div class='add'>+		.name  = "cfi_probe",</div><div class='add'>+		.start = 0x20000000,</div><div class='add'>+		.end   = 0x201fffff,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start = (unsigned long)cm_flash_gpios,</div><div class='add'>+		.end   = ARRAY_SIZE(cm_flash_gpios),</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device cm_flash_device = {</div><div class='add'>+	.name          = "gpio-addr-flash",</div><div class='add'>+	.id            = 0,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;cm_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources = ARRAY_SIZE(cm_flash_resource),</div><div class='add'>+	.resource      = cm_flash_resource,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)</div><div class='add'>+static struct resource bfin_uart_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = 0xFFC00400,</div><div class='add'>+		.end = 0xFFC004FF,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start = 0xFFC02000,</div><div class='add'>+		.end = 0xFFC020FF,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_uart_device = {</div><div class='add'>+	.name = "bfin-uart",</div><div class='add'>+	.id = 1,</div><div class='add'>+	.num_resources = ARRAY_SIZE(bfin_uart_resources),</div><div class='add'>+	.resource = bfin_uart_resources,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)</div><div class='add'>+static struct resource bfin_sir_resources[] = {</div><div class='add'>+#ifdef CONFIG_BFIN_SIR0</div><div class='add'>+	{</div><div class='add'>+		.start = 0xFFC00400,</div><div class='add'>+		.end = 0xFFC004FF,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_BFIN_SIR1</div><div class='add'>+	{</div><div class='add'>+		.start = 0xFFC02000,</div><div class='add'>+		.end = 0xFFC020FF,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_sir_device = {</div><div class='add'>+	.name = "bfin_sir",</div><div class='add'>+	.id = 0,</div><div class='add'>+	.num_resources = ARRAY_SIZE(bfin_sir_resources),</div><div class='add'>+	.resource = bfin_sir_resources,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)</div><div class='add'>+static struct resource bfin_twi0_resource[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start = TWI0_REGBASE,</div><div class='add'>+		.end   = TWI0_REGBASE,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start = IRQ_TWI,</div><div class='add'>+		.end   = IRQ_TWI,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device i2c_bfin_twi_device = {</div><div class='add'>+	.name = "i2c-bfin-twi",</div><div class='add'>+	.id = 0,</div><div class='add'>+	.num_resources = ARRAY_SIZE(bfin_twi0_resource),</div><div class='add'>+	.resource = bfin_twi0_resource,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)</div><div class='add'>+static struct platform_device bfin_sport0_uart_device = {</div><div class='add'>+	.name = "bfin-sport-uart",</div><div class='add'>+	.id = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_sport1_uart_device = {</div><div class='add'>+	.name = "bfin-sport-uart",</div><div class='add'>+	.id = 1,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)</div><div class='add'>+static struct platform_device bfin_mac_device = {</div><div class='add'>+	.name = "bfin_mac",</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='add'>+#define PATA_INT	IRQ_PF14</div><div class='add'>+</div><div class='add'>+static struct pata_platform_info bfin_pata_platform_data = {</div><div class='add'>+	.ioport_shift = 2,</div><div class='add'>+	.irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource bfin_pata_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = 0x2030C000,</div><div class='add'>+		.end = 0x2030C01F,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = 0x2030D018,</div><div class='add'>+		.end = 0x2030D01B,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = PATA_INT,</div><div class='add'>+		.end = PATA_INT,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_pata_device = {</div><div class='add'>+	.name = "pata_platform",</div><div class='add'>+	.id = -1,</div><div class='add'>+	.num_resources = ARRAY_SIZE(bfin_pata_resources),</div><div class='add'>+	.resource = bfin_pata_resources,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;bfin_pata_platform_data,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const unsigned int cclk_vlev_datasheet[] =</div><div class='add'>+{</div><div class='add'>+	VRPAIR(VLEV_085, 250000000),</div><div class='add'>+	VRPAIR(VLEV_090, 376000000),</div><div class='add'>+	VRPAIR(VLEV_095, 426000000),</div><div class='add'>+	VRPAIR(VLEV_100, 426000000),</div><div class='add'>+	VRPAIR(VLEV_105, 476000000),</div><div class='add'>+	VRPAIR(VLEV_110, 476000000),</div><div class='add'>+	VRPAIR(VLEV_115, 476000000),</div><div class='add'>+	VRPAIR(VLEV_120, 500000000),</div><div class='add'>+	VRPAIR(VLEV_125, 533000000),</div><div class='add'>+	VRPAIR(VLEV_130, 600000000),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bfin_dpmc_platform_data bfin_dmpc_vreg_data = {</div><div class='add'>+	.tuple_tab = cclk_vlev_datasheet,</div><div class='add'>+	.tabsize = ARRAY_SIZE(cclk_vlev_datasheet),</div><div class='add'>+	.vr_settling_time = 25 /* us */,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_dpmc = {</div><div class='add'>+	.name = "bfin dpmc",</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;bfin_dmpc_vreg_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *cm_bf537_devices[] __initdata = {</div><div class='add'>+</div><div class='add'>+	&amp;bfin_dpmc,</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE)</div><div class='add'>+	&amp;hitachi_fb_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)</div><div class='add'>+	&amp;rtc_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)</div><div class='add'>+	&amp;bfin_uart_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)</div><div class='add'>+	&amp;bfin_sir_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)</div><div class='add'>+	&amp;i2c_bfin_twi_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)</div><div class='add'>+	&amp;bfin_sport0_uart_device,</div><div class='add'>+	&amp;bfin_sport1_uart_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)</div><div class='add'>+	&amp;isp1362_hcd_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)</div><div class='add'>+	&amp;smc91x_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)</div><div class='add'>+	&amp;bfin_mac_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)</div><div class='add'>+	&amp;net2272_bfin_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+	&amp;bfin_spi0_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='add'>+	&amp;bfin_pata_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE)</div><div class='add'>+	&amp;cm_flash_device,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init cm_bf537_init(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO "%s(): registering device resources\n", __func__);</div><div class='add'>+	platform_add_devices(cm_bf537_devices, ARRAY_SIZE(cm_bf537_devices));</div><div class='add'>+#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='add'>+	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(cm_bf537_init);</div><div class='add'>+</div><div class='add'>+void bfin_get_ether_addr(char *addr)</div><div class='add'>+{</div><div class='add'>+	random_ether_addr(addr);</div><div class='add'>+	printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(bfin_get_ether_addr);</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/head.S b/arch/blackfin/mach-bf537/head.S<br/>index 6b019eaee0b6..12eb5cc571d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/head.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf537/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/head.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/head.S</a></div><div class='hunk'>@@ -30,324 +30,10 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='del'>-#include &lt;asm/trace.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='del'>-#include &lt;asm/mach-common/clocks.h&gt;</div><div class='del'>-#include &lt;asm/mach/mem_init.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-.extern ___bss_stop</div><div class='del'>-.extern ___bss_start</div><div class='del'>-.extern _bf53x_relocate_l1_mem</div><div class='del'>-</div><div class='del'>-#define INITIAL_STACK	0xFFB01000</div><div class='del'>-</div><div class='del'>-__INIT</div><div class='del'>-</div><div class='del'>-ENTRY(__start)</div><div class='del'>-	/* R0: argument of command line string, passed from uboot, save it */</div><div class='del'>-	R7 = R0;</div><div class='del'>-	/* Enable Cycle Counter and Nesting Of Interrupts */</div><div class='del'>-#ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES</div><div class='del'>-	R0 = SYSCFG_SNEN;</div><div class='del'>-#else</div><div class='del'>-	R0 = SYSCFG_SNEN | SYSCFG_CCEN;</div><div class='del'>-#endif</div><div class='del'>-	SYSCFG = R0;</div><div class='del'>-	R0 = 0;</div><div class='del'>-</div><div class='del'>-	/* Clear Out All the data and pointer Registers */</div><div class='del'>-	R1 = R0;</div><div class='del'>-	R2 = R0;</div><div class='del'>-	R3 = R0;</div><div class='del'>-	R4 = R0;</div><div class='del'>-	R5 = R0;</div><div class='del'>-	R6 = R0;</div><div class='del'>-</div><div class='del'>-	P0 = R0;</div><div class='del'>-	P1 = R0;</div><div class='del'>-	P2 = R0;</div><div class='del'>-	P3 = R0;</div><div class='del'>-	P4 = R0;</div><div class='del'>-	P5 = R0;</div><div class='del'>-</div><div class='del'>-	LC0 = r0;</div><div class='del'>-	LC1 = r0;</div><div class='del'>-	L0 = r0;</div><div class='del'>-	L1 = r0;</div><div class='del'>-	L2 = r0;</div><div class='del'>-	L3 = r0;</div><div class='del'>-</div><div class='del'>-	/* Clear Out All the DAG Registers */</div><div class='del'>-	B0 = r0;</div><div class='del'>-	B1 = r0;</div><div class='del'>-	B2 = r0;</div><div class='del'>-	B3 = r0;</div><div class='del'>-</div><div class='del'>-	I0 = r0;</div><div class='del'>-	I1 = r0;</div><div class='del'>-	I2 = r0;</div><div class='del'>-	I3 = r0;</div><div class='del'>-</div><div class='del'>-	M0 = r0;</div><div class='del'>-	M1 = r0;</div><div class='del'>-	M2 = r0;</div><div class='del'>-	M3 = r0;</div><div class='del'>-</div><div class='del'>-	trace_buffer_init(p0,r0);</div><div class='del'>-	P0 = R1;</div><div class='del'>-	R0 = R1;</div><div class='del'>-</div><div class='del'>-	/* Turn off the icache */</div><div class='del'>-	p0.l = LO(IMEM_CONTROL);</div><div class='del'>-	p0.h = HI(IMEM_CONTROL);</div><div class='del'>-	R1 = [p0];</div><div class='del'>-	R0 = ~ENICPLB;</div><div class='del'>-	R0 = R0 &amp; R1;</div><div class='del'>-</div><div class='del'>-	/* Anomaly 05000125 */</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-	CLI R2;</div><div class='del'>-	SSYNC;</div><div class='del'>-#endif</div><div class='del'>-	[p0] = R0;</div><div class='del'>-	SSYNC;</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-	STI R2;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Turn off the dcache */</div><div class='del'>-	p0.l = LO(DMEM_CONTROL);</div><div class='del'>-	p0.h = HI(DMEM_CONTROL);</div><div class='del'>-	R1 = [p0];</div><div class='del'>-	R0 = ~ENDCPLB;</div><div class='del'>-	R0 = R0 &amp; R1;</div><div class='del'>-</div><div class='del'>-	/* Anomaly 05000125 */</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-	CLI R2;</div><div class='del'>-	SSYNC;</div><div class='del'>-#endif</div><div class='del'>-	[p0] = R0;</div><div class='del'>-	SSYNC;</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-	STI R2;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Initialise General-Purpose I/O Modules on BF537 */</div><div class='del'>-	/* Rev 0.0 Anomaly 05000212 - PORTx_FER,</div><div class='del'>-	 * PORT_MUX Registers Do Not accept "writes" correctly:</div><div class='del'>-	 */</div><div class='del'>-	p0.h = hi(BFIN_PORT_MUX);</div><div class='del'>-	p0.l = lo(BFIN_PORT_MUX);</div><div class='del'>-#if ANOMALY_05000212</div><div class='del'>-	R0.L = W[P0]; /* Read */</div><div class='del'>-	SSYNC;</div><div class='del'>-#endif</div><div class='del'>-	R0 = (PGDE_UART | PFTE_UART)(Z);</div><div class='del'>-#if ANOMALY_05000212</div><div class='del'>-	W[P0] = R0.L; /* Write */</div><div class='del'>-	SSYNC;</div><div class='del'>-#endif</div><div class='del'>-	W[P0] = R0.L; /* Enable both UARTS */</div><div class='del'>-	SSYNC;</div><div class='del'>-</div><div class='del'>-	p0.h = hi(PORTF_FER);</div><div class='del'>-	p0.l = lo(PORTF_FER);</div><div class='del'>-#if ANOMALY_05000212</div><div class='del'>-	R0.L = W[P0]; /* Read */</div><div class='del'>-	SSYNC;</div><div class='del'>-#endif</div><div class='del'>-	R0 = 0x000F(Z);</div><div class='del'>-#if ANOMALY_05000212</div><div class='del'>-	W[P0] = R0.L; /* Write */</div><div class='del'>-	SSYNC;</div><div class='del'>-#endif</div><div class='del'>-	/* Enable peripheral function of PORTF for UART0 and UART1 */</div><div class='del'>-	W[P0] = R0.L;</div><div class='del'>-	SSYNC;</div><div class='del'>-</div><div class='del'>-#if !defined(CONFIG_BF534)</div><div class='del'>-	p0.h = hi(EMAC_SYSTAT);</div><div class='del'>-	p0.l = lo(EMAC_SYSTAT);</div><div class='del'>-	R0.h = 0xFFFF; /* Clear EMAC Interrupt Status bits */</div><div class='del'>-	R0.l = 0xFFFF;</div><div class='del'>-	[P0] = R0;</div><div class='del'>-	SSYNC;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Initialise UART - when booting from u-boot, the UART is not disabled</div><div class='del'>-	 * so if we dont initalize here, our serial console gets hosed */</div><div class='del'>-	p0.h = hi(BFIN_UART_LCR);</div><div class='del'>-	p0.l = lo(BFIN_UART_LCR);</div><div class='del'>-	r0 = 0x0(Z);</div><div class='del'>-	w[p0] = r0.L;	/* To enable DLL writes */</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p0.h = hi(BFIN_UART_DLL);</div><div class='del'>-	p0.l = lo(BFIN_UART_DLL);</div><div class='del'>-	r0 = 0x0(Z);</div><div class='del'>-	w[p0] = r0.L;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p0.h = hi(BFIN_UART_DLH);</div><div class='del'>-	p0.l = lo(BFIN_UART_DLH);</div><div class='del'>-	r0 = 0x00(Z);</div><div class='del'>-	w[p0] = r0.L;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p0.h = hi(BFIN_UART_GCTL);</div><div class='del'>-	p0.l = lo(BFIN_UART_GCTL);</div><div class='del'>-	r0 = 0x0(Z);</div><div class='del'>-	w[p0] = r0.L;	/* To enable UART clock */</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	/* Initialize stack pointer */</div><div class='del'>-	sp.l = lo(INITIAL_STACK);</div><div class='del'>-	sp.h = hi(INITIAL_STACK);</div><div class='del'>-	fp = sp;</div><div class='del'>-	usp = sp;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_EARLY_PRINTK</div><div class='del'>-	SP += -12;</div><div class='del'>-	call _init_early_exception_vectors;</div><div class='del'>-	SP += 12;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */</div><div class='del'>-	call _bf53x_relocate_l1_mem;</div><div class='ctx'> #ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='del'>-	call _start_dma_code;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Code for initializing Async memory banks */</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_AMBCTL1);</div><div class='del'>-	p2.l = lo(EBIU_AMBCTL1);</div><div class='del'>-	r0.h = hi(AMBCTL1VAL);</div><div class='del'>-	r0.l = lo(AMBCTL1VAL);</div><div class='del'>-	[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_AMBCTL0);</div><div class='del'>-	p2.l = lo(EBIU_AMBCTL0);</div><div class='del'>-	r0.h = hi(AMBCTL0VAL);</div><div class='del'>-	r0.l = lo(AMBCTL0VAL);</div><div class='del'>-	[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_AMGCTL);</div><div class='del'>-	p2.l = lo(EBIU_AMGCTL);</div><div class='del'>-	r0 = AMGCTLVAL;</div><div class='del'>-	w[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	/* This section keeps the processor in supervisor mode</div><div class='del'>-	 * during kernel boot.  Switches to user mode at end of boot.</div><div class='del'>-	 * See page 3-9 of Hardware Reference manual for documentation.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* EVT15 = _real_start */</div><div class='del'>-</div><div class='del'>-	p0.l = lo(EVT15);</div><div class='del'>-	p0.h = hi(EVT15);</div><div class='del'>-	p1.l = _real_start;</div><div class='del'>-	p1.h = _real_start;</div><div class='del'>-	[p0] = p1;</div><div class='del'>-	csync;</div><div class='del'>-</div><div class='del'>-	p0.l = lo(IMASK);</div><div class='del'>-	p0.h = hi(IMASK);</div><div class='del'>-	p1.l = IMASK_IVG15;</div><div class='del'>-	p1.h = 0x0;</div><div class='del'>-	[p0] = p1;</div><div class='del'>-	csync;</div><div class='del'>-</div><div class='del'>-	raise 15;</div><div class='del'>-	p0.l = .LWAIT_HERE;</div><div class='del'>-	p0.h = .LWAIT_HERE;</div><div class='del'>-	reti = p0;</div><div class='del'>-#if ANOMALY_05000281</div><div class='del'>-	nop; nop; nop;</div><div class='add'>+#include &lt;asm/clocks.h&gt;</div><div class='add'>+#include &lt;mach/mem_init.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-	rti;</div><div class='del'>-</div><div class='del'>-.LWAIT_HERE:</div><div class='del'>-	jump .LWAIT_HERE;</div><div class='del'>-ENDPROC(__start)</div><div class='del'>-</div><div class='del'>-ENTRY(_real_start)</div><div class='del'>-	[ -- sp ] = reti;</div><div class='del'>-	p0.l = lo(WDOG_CTL);</div><div class='del'>-	p0.h = hi(WDOG_CTL);</div><div class='del'>-	r0 = 0xAD6(z);</div><div class='del'>-	w[p0] = r0;	/* watchdog off for now */</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	/* Code update for BSS size == 0</div><div class='del'>-	 * Zero out the bss region.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	p1.l = ___bss_start;</div><div class='del'>-	p1.h = ___bss_start;</div><div class='del'>-	p2.l = ___bss_stop;</div><div class='del'>-	p2.h = ___bss_stop;</div><div class='del'>-	r0 = 0;</div><div class='del'>-	p2 -= p1;</div><div class='del'>-	lsetup (.L_clear_bss, .L_clear_bss) lc0 = p2;</div><div class='del'>-.L_clear_bss:</div><div class='del'>-	B[p1++] = r0;</div><div class='del'>-</div><div class='del'>-	/* In case there is a NULL pointer reference</div><div class='del'>-	 * Zero out region before stext</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	p1.l = 0x0;</div><div class='del'>-	p1.h = 0x0;</div><div class='del'>-	r0.l = __stext;</div><div class='del'>-	r0.h = __stext;</div><div class='del'>-	r0 = r0 &gt;&gt; 1;</div><div class='del'>-	p2 = r0;</div><div class='del'>-	r0 = 0;</div><div class='del'>-	lsetup (.L_clear_zero, .L_clear_zero) lc0 = p2;</div><div class='del'>-.L_clear_zero:</div><div class='del'>-	W[p1++] = r0;</div><div class='del'>-</div><div class='del'>-	/* pass the uboot arguments to the global value command line */</div><div class='del'>-	R0 = R7;</div><div class='del'>-	call _cmdline_init;</div><div class='del'>-</div><div class='del'>-	p1.l = __rambase;</div><div class='del'>-	p1.h = __rambase;</div><div class='del'>-	r0.l = __sdata;</div><div class='del'>-	r0.h = __sdata;</div><div class='del'>-	[p1] = r0;</div><div class='del'>-</div><div class='del'>-	p1.l = __ramstart;</div><div class='del'>-	p1.h = __ramstart;</div><div class='del'>-	p3.l = ___bss_stop;</div><div class='del'>-	p3.h = ___bss_stop;</div><div class='del'>-</div><div class='del'>-	r1 = p3;</div><div class='del'>-	[p1] = r1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * load the current thread pointer and stack</div><div class='del'>-	 */</div><div class='del'>-	r1.l = _init_thread_union;</div><div class='del'>-	r1.h = _init_thread_union;</div><div class='del'>-</div><div class='del'>-	r2.l = 0x2000;</div><div class='del'>-	r2.h = 0x0000;</div><div class='del'>-	r1 = r1 + r2;</div><div class='del'>-	sp = r1;</div><div class='del'>-	usp = sp;</div><div class='del'>-	fp = sp;</div><div class='del'>-	jump.l _start_kernel;</div><div class='del'>-ENDPROC(_real_start)</div><div class='del'>-</div><div class='del'>-__FINIT</div><div class='ctx'> </div><div class='ctx'> .section .l1.text</div><div class='ctx'> #ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='hunk'>@@ -452,13 +138,6 @@ ENTRY(_start_dma_code)</div><div class='ctx'> 	[P2] = R1;</div><div class='ctx'> 	SSYNC;</div><div class='ctx'> </div><div class='del'>-	p0.h = hi(SIC_IWR);</div><div class='del'>-	p0.l = lo(SIC_IWR);</div><div class='del'>-	r0.l = lo(IWR_ENABLE_ALL);</div><div class='del'>-	r0.h = hi(IWR_ENABLE_ALL);</div><div class='del'>-	[p0] = r0;</div><div class='del'>-	SSYNC;</div><div class='del'>-</div><div class='ctx'> 	RTS;</div><div class='ctx'> ENDPROC(_start_dma_code)</div><div class='ctx'> #endif /* CONFIG_BFIN_KERNEL_CLOCK */</div><div class='head'>diff --git a/include/asm-blackfin/mach-bf537/anomaly.h b/arch/blackfin/mach-bf537/include/mach/anomaly.h<br/>index 8460ab9c324f..8460ab9c324f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf537/anomaly.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf537/anomaly.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/include/mach/anomaly.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/anomaly.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf537/bf537.h b/arch/blackfin/mach-bf537/include/mach/bf537.h<br/>index cfe2a221112e..cfe2a221112e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf537/bf537.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf537/bf537.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/include/mach/bf537.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/bf537.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h b/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h<br/>index 1bf56ffa22f9..1bf56ffa22f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf537/bfin_serial_5xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf537/bfin_sir.h b/arch/blackfin/mach-bf537/include/mach/bfin_sir.h<br/>index cfd8ad4f1f2c..cfd8ad4f1f2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf537/bfin_sir.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf537/bfin_sir.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/include/mach/bfin_sir.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/bfin_sir.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf537/blackfin.h b/arch/blackfin/mach-bf537/include/mach/blackfin.h<br/>index cffc786b2a2b..cffc786b2a2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf537/blackfin.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf537/blackfin.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/include/mach/blackfin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/blackfin.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf537/cdefBF534.h b/arch/blackfin/mach-bf537/include/mach/cdefBF534.h<br/>index 82de526f8097..88d491cd9f36 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf537/cdefBF534.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf537/cdefBF534.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/include/mach/cdefBF534.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/cdefBF534.h</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> #include "defBF534.h"</div><div class='ctx'> </div><div class='ctx'> /* Include core specific register pointer definitions 								*/</div><div class='del'>-#include &lt;asm/mach-common/cdef_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/cdef_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf537/cdefBF537.h b/arch/blackfin/mach-bf537/include/mach/cdefBF537.h<br/>index b8fc949a991f..b8fc949a991f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf537/cdefBF537.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf537/cdefBF537.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/include/mach/cdefBF537.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/cdefBF537.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf537/defBF534.h b/arch/blackfin/mach-bf537/include/mach/defBF534.h<br/>index d0d80d3152ba..a3227f9003ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf537/defBF534.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf537/defBF534.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/include/mach/defBF534.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/defBF534.h</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #define _DEF_BF534_H</div><div class='ctx'> </div><div class='ctx'> /* Include all Core registers and bit definitions */</div><div class='del'>-#include &lt;asm/mach-common/def_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/def_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /************************************************************************************</div><div class='ctx'> ** System MMR Register Map</div><div class='head'>diff --git a/include/asm-blackfin/mach-bf537/defBF537.h b/arch/blackfin/mach-bf537/include/mach/defBF537.h<br/>index abde24c6d3b1..3d6c83e31b1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf537/defBF537.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf537/defBF537.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/include/mach/defBF537.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/defBF537.h</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #define _DEF_BF537_H</div><div class='ctx'> </div><div class='ctx'> /* Include all Core registers and bit definitions*/</div><div class='del'>-#include &lt;asm/mach-common/cdef_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/cdef_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Include all MMR and bit defines common to BF534 */</div><div class='ctx'> #include "defBF534.h"</div><div class='head'>diff --git a/include/asm-blackfin/mach-bf537/dma.h b/arch/blackfin/mach-bf537/include/mach/dma.h<br/>index 7a964040870a..7a964040870a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf537/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf537/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/dma.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf537/irq.h b/arch/blackfin/mach-bf537/include/mach/irq.h<br/>index 2e68a8a1e730..2e68a8a1e730 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf537/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf537/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/include/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/irq.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf537/mem_init.h b/arch/blackfin/mach-bf537/include/mach/mem_init.h<br/>index f67698f670ca..f67698f670ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf537/mem_init.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf537/mem_init.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/include/mach/mem_init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/mem_init.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf537/mem_map.h b/arch/blackfin/mach-bf537/include/mach/mem_map.h<br/>index 5c6726d6f3b1..5078b669431f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf537/mem_map.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf537/mem_map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/include/mach/mem_map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/mem_map.h</a></div><div class='hunk'>@@ -166,6 +166,11 @@</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Level 2 Memory - none */</div><div class='add'>+</div><div class='add'>+#define L2_START	0</div><div class='add'>+#define L2_LENGTH	0</div><div class='add'>+</div><div class='ctx'> /* Scratch Pad Memory */</div><div class='ctx'> </div><div class='ctx'> #define L1_SCRATCH_START	0xFFB00000</div><div class='head'>diff --git a/include/asm-blackfin/mach-bf537/portmux.h b/arch/blackfin/mach-bf537/include/mach/portmux.h<br/>index 78fee6e0f237..78fee6e0f237 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf537/portmux.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf537/portmux.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/include/mach/portmux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/include/mach/portmux.h</a></div><div class='head'>diff --git a/arch/blackfin/mach-bf537/ints-priority.c b/arch/blackfin/mach-bf537/ints-priority.c<br/>index a8b915f202ec..b1300b3f1812 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/ints-priority.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf537/ints-priority.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/ints-priority.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf537/ints-priority.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='ctx'> </div><div class='del'>-void program_IAR(void)</div><div class='add'>+void __init program_IAR(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Program the IAR0 Register with the configured priority */</div><div class='ctx'> 	bfin_write_SIC_IAR0(((CONFIG_IRQ_PLL_WAKEUP - 7) &lt;&lt; IRQ_PLL_WAKEUP_POS) |</div><div class='head'>diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c<br/>index 4f4ae8787edf..ce934ee174e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/boards/cm_bf548.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf548/boards/cm_bf548.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/boards/cm_bf548.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/boards/cm_bf548.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/nand.h&gt;</div><div class='ctx'> #include &lt;asm/portmux.h&gt;</div><div class='del'>-#include &lt;asm/mach/bf54x_keys.h&gt;</div><div class='add'>+#include &lt;mach/bf54x_keys.h&gt;</div><div class='ctx'> #include &lt;asm/dpmc.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/spi/ad7877.h&gt;</div><div class='hunk'>@@ -61,7 +61,7 @@ const char bfin_board_name[] = "Bluetechnix CM-BF548";</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach/bf54x-lq043.h&gt;</div><div class='add'>+#include &lt;mach/bf54x-lq043.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct bfin_bf54xfb_mach_info bf54x_lq043_data = {</div><div class='ctx'> 	.width =	480,</div><div class='hunk'>@@ -319,12 +319,12 @@ static struct platform_device bfin_atapi_device = {</div><div class='ctx'> #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)</div><div class='ctx'> static struct mtd_partition partition_info[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "Linux Kernel",</div><div class='add'>+		.name = "linux kernel(nand)",</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.size = 4 * SIZE_1M,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.name = "File System",</div><div class='add'>+		.name = "file system(nand)",</div><div class='ctx'> 		.offset = 4 * SIZE_1M,</div><div class='ctx'> 		.size = (256 - 4) * SIZE_1M,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -377,12 +377,12 @@ static struct platform_device bf54x_sdh_device = {</div><div class='ctx'> /* SPI flash chip (m25p16) */</div><div class='ctx'> static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "bootloader",</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='ctx'> 		.size = 0x00040000,</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.mask_flags = MTD_CAP_ROM</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "linux kernel",</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='ctx'> 		.size = 0x1c0000,</div><div class='ctx'> 		.offset = 0x40000</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c<br/>index 166fa2201ee7..39357693046d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/boards/ezkit.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf548/boards/ezkit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/boards/ezkit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/boards/ezkit.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> #include &lt;asm/nand.h&gt;</div><div class='ctx'> #include &lt;asm/dpmc.h&gt;</div><div class='ctx'> #include &lt;asm/portmux.h&gt;</div><div class='del'>-#include &lt;asm/mach/bf54x_keys.h&gt;</div><div class='add'>+#include &lt;mach/bf54x_keys.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/spi/ad7877.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -106,7 +106,7 @@ arch_initcall(bfin_isp1761_init);</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach/bf54x-lq043.h&gt;</div><div class='add'>+#include &lt;mach/bf54x-lq043.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct bfin_bf54xfb_mach_info bf54x_lq043_data = {</div><div class='ctx'> 	.width =	480,</div><div class='hunk'>@@ -365,12 +365,12 @@ static struct platform_device bfin_atapi_device = {</div><div class='ctx'> #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)</div><div class='ctx'> static struct mtd_partition partition_info[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "Linux Kernel",</div><div class='add'>+		.name = "linux kernel(nand)",</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.size = 4 * SIZE_1M,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.name = "File System",</div><div class='add'>+		.name = "file system(nand)",</div><div class='ctx'> 		.offset = MTDPART_OFS_APPEND,</div><div class='ctx'> 		.size = MTDPART_SIZ_FULL,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -419,15 +419,15 @@ static struct platform_device bf54x_sdh_device = {</div><div class='ctx'> #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)</div><div class='ctx'> static struct mtd_partition ezkit_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name       = "Bootloader",</div><div class='add'>+		.name       = "bootloader(nor)",</div><div class='ctx'> 		.size       = 0x40000,</div><div class='ctx'> 		.offset     = 0,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name       = "Kernel",</div><div class='add'>+		.name       = "linux kernel(nor)",</div><div class='ctx'> 		.size       = 0x1C0000,</div><div class='ctx'> 		.offset     = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name       = "RootFS",</div><div class='add'>+		.name       = "file system(nor)",</div><div class='ctx'> 		.size       = MTDPART_SIZ_FULL,</div><div class='ctx'> 		.offset     = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -461,12 +461,12 @@ static struct platform_device ezkit_flash_device = {</div><div class='ctx'> /* SPI flash chip (m25p16) */</div><div class='ctx'> static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "bootloader",</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='ctx'> 		.size = 0x00040000,</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.mask_flags = MTD_CAP_ROM</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "linux kernel",</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='ctx'> 		.size = MTDPART_SIZ_FULL,</div><div class='ctx'> 		.offset = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/blackfin/mach-bf548/head.S b/arch/blackfin/mach-bf548/head.S<br/>index 06b9178cfcfe..4d5cfeacb123 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/head.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf548/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/head.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/head.S</a></div><div class='hunk'>@@ -30,263 +30,11 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='del'>-#include &lt;asm/trace.h&gt;</div><div class='ctx'> #ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='del'>-#include &lt;asm/mach-common/clocks.h&gt;</div><div class='del'>-#include &lt;asm/mach/mem_init.h&gt;</div><div class='add'>+#include &lt;asm/clocks.h&gt;</div><div class='add'>+#include &lt;mach/mem_init.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-.extern ___bss_stop</div><div class='del'>-.extern ___bss_start</div><div class='del'>-.extern _bf53x_relocate_l1_mem</div><div class='del'>-</div><div class='del'>-#define INITIAL_STACK   0xFFB01000</div><div class='del'>-</div><div class='del'>-__INIT</div><div class='del'>-</div><div class='del'>-ENTRY(__start)</div><div class='del'>-	/* R0: argument of command line string, passed from uboot, save it */</div><div class='del'>-	R7 = R0;</div><div class='del'>-	/* Enable Cycle Counter and Nesting Of Interrupts */</div><div class='del'>-#ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES</div><div class='del'>-	R0 = SYSCFG_SNEN;</div><div class='del'>-#else</div><div class='del'>-	R0 = SYSCFG_SNEN | SYSCFG_CCEN;</div><div class='del'>-#endif</div><div class='del'>-	SYSCFG = R0;</div><div class='del'>-	R0 = 0;</div><div class='del'>-</div><div class='del'>-	/* Clear Out All the data and pointer  Registers*/</div><div class='del'>-	R1 = R0;</div><div class='del'>-	R2 = R0;</div><div class='del'>-	R3 = R0;</div><div class='del'>-	R4 = R0;</div><div class='del'>-	R5 = R0;</div><div class='del'>-	R6 = R0;</div><div class='del'>-</div><div class='del'>-	P0 = R0;</div><div class='del'>-	P1 = R0;</div><div class='del'>-	P2 = R0;</div><div class='del'>-	P3 = R0;</div><div class='del'>-	P4 = R0;</div><div class='del'>-	P5 = R0;</div><div class='del'>-</div><div class='del'>-	LC0 = r0;</div><div class='del'>-	LC1 = r0;</div><div class='del'>-	L0 = r0;</div><div class='del'>-	L1 = r0;</div><div class='del'>-	L2 = r0;</div><div class='del'>-	L3 = r0;</div><div class='del'>-</div><div class='del'>-	/* Clear Out All the DAG Registers*/</div><div class='del'>-	B0 = r0;</div><div class='del'>-	B1 = r0;</div><div class='del'>-	B2 = r0;</div><div class='del'>-	B3 = r0;</div><div class='del'>-</div><div class='del'>-	I0 = r0;</div><div class='del'>-	I1 = r0;</div><div class='del'>-	I2 = r0;</div><div class='del'>-	I3 = r0;</div><div class='del'>-</div><div class='del'>-	M0 = r0;</div><div class='del'>-	M1 = r0;</div><div class='del'>-	M2 = r0;</div><div class='del'>-	M3 = r0;</div><div class='del'>-</div><div class='del'>-	trace_buffer_init(p0,r0);</div><div class='del'>-	P0 = R1;</div><div class='del'>-	R0 = R1;</div><div class='del'>-</div><div class='del'>-	/* Turn off the icache */</div><div class='del'>-	p0.l = LO(IMEM_CONTROL);</div><div class='del'>-	p0.h = HI(IMEM_CONTROL);</div><div class='del'>-	R1 = [p0];</div><div class='del'>-	R0 = ~ENICPLB;</div><div class='del'>-	R0 = R0 &amp; R1;</div><div class='del'>-	[p0] = R0;</div><div class='del'>-	SSYNC;</div><div class='del'>-</div><div class='del'>-	/* Turn off the dcache */</div><div class='del'>-	p0.l = LO(DMEM_CONTROL);</div><div class='del'>-	p0.h = HI(DMEM_CONTROL);</div><div class='del'>-	R1 = [p0];</div><div class='del'>-	R0 = ~ENDCPLB;</div><div class='del'>-	R0 = R0 &amp; R1;</div><div class='del'>-	[p0] = R0;</div><div class='del'>-	SSYNC;</div><div class='del'>-</div><div class='del'>-	/* Initialize stack pointer */</div><div class='del'>-	SP.L = LO(INITIAL_STACK);</div><div class='del'>-	SP.H = HI(INITIAL_STACK);</div><div class='del'>-	FP = SP;</div><div class='del'>-	USP = SP;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_EARLY_PRINTK</div><div class='del'>-	SP += -12;</div><div class='del'>-	call _init_early_exception_vectors;</div><div class='del'>-	SP += 12;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */</div><div class='del'>-	call _bf53x_relocate_l1_mem;</div><div class='del'>-#ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='del'>-	call _start_dma_code;</div><div class='del'>-#endif</div><div class='del'>-	/* Code for initializing Async memory banks */</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_AMBCTL1);</div><div class='del'>-	p2.l = lo(EBIU_AMBCTL1);</div><div class='del'>-	r0.h = hi(AMBCTL1VAL);</div><div class='del'>-	r0.l = lo(AMBCTL1VAL);</div><div class='del'>-	[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_AMBCTL0);</div><div class='del'>-	p2.l = lo(EBIU_AMBCTL0);</div><div class='del'>-	r0.h = hi(AMBCTL0VAL);</div><div class='del'>-	r0.l = lo(AMBCTL0VAL);</div><div class='del'>-	[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_AMGCTL);</div><div class='del'>-	p2.l = lo(EBIU_AMGCTL);</div><div class='del'>-	r0 = AMGCTLVAL;</div><div class='del'>-	w[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_MBSCTL);</div><div class='del'>-	p2.l = lo(EBIU_MBSCTL);</div><div class='del'>-	r0.h = hi(CONFIG_EBIU_MBSCTLVAL);</div><div class='del'>-	r0.l = lo(CONFIG_EBIU_MBSCTLVAL);</div><div class='del'>-	[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_MODE);</div><div class='del'>-	p2.l = lo(EBIU_MODE);</div><div class='del'>-	r0.h = hi(CONFIG_EBIU_MODEVAL);</div><div class='del'>-	r0.l = lo(CONFIG_EBIU_MODEVAL);</div><div class='del'>-	[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_FCTL);</div><div class='del'>-	p2.l = lo(EBIU_FCTL);</div><div class='del'>-	r0.h = hi(CONFIG_EBIU_FCTLVAL);</div><div class='del'>-	r0.l = lo(CONFIG_EBIU_FCTLVAL);</div><div class='del'>-	[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	/* This section keeps the processor in supervisor mode</div><div class='del'>-	 * during kernel boot.  Switches to user mode at end of boot.</div><div class='del'>-	 * See page 3-9 of Hardware Reference manual for documentation.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* EVT15 = _real_start */</div><div class='del'>-</div><div class='del'>-	p0.l = lo(EVT15);</div><div class='del'>-	p0.h = hi(EVT15);</div><div class='del'>-	p1.l = _real_start;</div><div class='del'>-	p1.h = _real_start;</div><div class='del'>-	[p0] = p1;</div><div class='del'>-	csync;</div><div class='del'>-</div><div class='del'>-	p0.l = lo(IMASK);</div><div class='del'>-	p0.h = hi(IMASK);</div><div class='del'>-	p1.l = IMASK_IVG15;</div><div class='del'>-	p1.h = 0x0;</div><div class='del'>-	[p0] = p1;</div><div class='del'>-	csync;</div><div class='del'>-</div><div class='del'>-	raise 15;</div><div class='del'>-	p0.l = .LWAIT_HERE;</div><div class='del'>-	p0.h = .LWAIT_HERE;</div><div class='del'>-	reti = p0;</div><div class='del'>-#if ANOMALY_05000281</div><div class='del'>-	nop;</div><div class='del'>-	nop;</div><div class='del'>-	nop;</div><div class='del'>-#endif</div><div class='del'>-	rti;</div><div class='del'>-</div><div class='del'>-.LWAIT_HERE:</div><div class='del'>-	jump .LWAIT_HERE;</div><div class='del'>-ENDPROC(__start)</div><div class='del'>-</div><div class='del'>-ENTRY(_real_start)</div><div class='del'>-	[ -- sp ] = reti;</div><div class='del'>-	p0.l = lo(WDOG_CTL);</div><div class='del'>-	p0.h = hi(WDOG_CTL);</div><div class='del'>-	r0 = 0xAD6(z);</div><div class='del'>-	w[p0] = r0;	/* watchdog off for now */</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	/* Code update for BSS size == 0</div><div class='del'>-	 * Zero out the bss region.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	p1.l = ___bss_start;</div><div class='del'>-	p1.h = ___bss_start;</div><div class='del'>-	p2.l = ___bss_stop;</div><div class='del'>-	p2.h = ___bss_stop;</div><div class='del'>-	r0 = 0;</div><div class='del'>-	p2 -= p1;</div><div class='del'>-	lsetup (.L_clear_bss, .L_clear_bss ) lc0 = p2;</div><div class='del'>-.L_clear_bss:</div><div class='del'>-	B[p1++] = r0;</div><div class='del'>-</div><div class='del'>-	/* In case there is a NULL pointer reference</div><div class='del'>-	 * Zero out region before stext</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	p1.l = 0x0;</div><div class='del'>-	p1.h = 0x0;</div><div class='del'>-	r0.l = __stext;</div><div class='del'>-	r0.h = __stext;</div><div class='del'>-	r0 = r0 &gt;&gt; 1;</div><div class='del'>-	p2 = r0;</div><div class='del'>-	r0 = 0;</div><div class='del'>-	lsetup (.L_clear_zero, .L_clear_zero ) lc0 = p2;</div><div class='del'>-.L_clear_zero:</div><div class='del'>-	W[p1++] = r0;</div><div class='del'>-</div><div class='del'>-	/* pass the uboot arguments to the global value command line */</div><div class='del'>-	R0 = R7;</div><div class='del'>-	call _cmdline_init;</div><div class='del'>-</div><div class='del'>-	p1.l = __rambase;</div><div class='del'>-	p1.h = __rambase;</div><div class='del'>-	r0.l = __sdata;</div><div class='del'>-	r0.h = __sdata;</div><div class='del'>-	[p1] = r0;</div><div class='del'>-</div><div class='del'>-	p1.l = __ramstart;</div><div class='del'>-	p1.h = __ramstart;</div><div class='del'>-	p3.l = ___bss_stop;</div><div class='del'>-	p3.h = ___bss_stop;</div><div class='del'>-</div><div class='del'>-	r1 = p3;</div><div class='del'>-	[p1] = r1;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *  load the current thread pointer and stack</div><div class='del'>-	 */</div><div class='del'>-	r1.l = _init_thread_union;</div><div class='del'>-	r1.h = _init_thread_union;</div><div class='del'>-</div><div class='del'>-	r2.l = 0x2000;</div><div class='del'>-	r2.h = 0x0000;</div><div class='del'>-	r1 = r1 + r2;</div><div class='del'>-	sp = r1;</div><div class='del'>-	usp = sp;</div><div class='del'>-	fp = sp;</div><div class='del'>-	call _start_kernel;</div><div class='del'>-.L_exit:</div><div class='del'>-	jump.s	.L_exit;</div><div class='del'>-ENDPROC(_real_start)</div><div class='del'>-</div><div class='del'>-__FINIT</div><div class='del'>-</div><div class='ctx'> .section .l1.text</div><div class='ctx'> #ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='ctx'> ENTRY(_start_dma_code)</div><div class='hunk'>@@ -443,13 +191,6 @@ ENTRY(_start_dma_code)</div><div class='ctx'> 	SSYNC;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	p0.h = hi(SIC_IWR0);</div><div class='del'>-	p0.l = lo(SIC_IWR0);</div><div class='del'>-	r0.l = lo(IWR_ENABLE_ALL);</div><div class='del'>-	r0.h = hi(IWR_ENABLE_ALL);</div><div class='del'>-	[p0] = r0;</div><div class='del'>-	SSYNC;</div><div class='del'>-</div><div class='ctx'> 	RTS;</div><div class='ctx'> ENDPROC(_start_dma_code)</div><div class='ctx'> #endif /* CONFIG_BFIN_KERNEL_CLOCK */</div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/anomaly.h b/arch/blackfin/mach-bf548/include/mach/anomaly.h<br/>index 3ad59655881a..3ad59655881a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/anomaly.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/anomaly.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/anomaly.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/anomaly.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/bf548.h b/arch/blackfin/mach-bf548/include/mach/bf548.h<br/>index e748588e8930..e748588e8930 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/bf548.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/bf548.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/bf548.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/bf548.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/bf54x-lq043.h b/arch/blackfin/mach-bf548/include/mach/bf54x-lq043.h<br/>index 9c7ca62a45eb..9c7ca62a45eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/bf54x-lq043.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/bf54x-lq043.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/bf54x-lq043.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/bf54x-lq043.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/bf54x_keys.h b/arch/blackfin/mach-bf548/include/mach/bf54x_keys.h<br/>index 1fb4ec77cc25..1fb4ec77cc25 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/bf54x_keys.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/bf54x_keys.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/bf54x_keys.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/bf54x_keys.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h b/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h<br/>index 5e29446a8e03..5e29446a8e03 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/bfin_serial_5xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/bfin_sir.h b/arch/blackfin/mach-bf548/include/mach/bfin_sir.h<br/>index c41f9cf00268..c41f9cf00268 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/bfin_sir.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/bfin_sir.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/bfin_sir.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/bfin_sir.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/blackfin.h b/arch/blackfin/mach-bf548/include/mach/blackfin.h<br/>index d6ee74ac0460..d6ee74ac0460 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/blackfin.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/blackfin.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/blackfin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/blackfin.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/cdefBF542.h b/arch/blackfin/mach-bf548/include/mach/cdefBF542.h<br/>index 60b9f77576f1..07aefb9ed79b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/cdefBF542.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/cdefBF542.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/cdefBF542.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/cdefBF542.h</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include "defBF542.h"</div><div class='ctx'> </div><div class='ctx'> /* include core sbfin_read_()ecific register pointer definitions */</div><div class='del'>-#include &lt;asm/mach-common/cdef_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/cdef_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SYSTEM &amp; MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/cdefBF544.h b/arch/blackfin/mach-bf548/include/mach/cdefBF544.h<br/>index ea9b4ab496f3..431a69278991 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/cdefBF544.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/cdefBF544.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/cdefBF544.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/cdefBF544.h</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include "defBF544.h"</div><div class='ctx'> </div><div class='ctx'> /* include core sbfin_read_()ecific register pointer definitions */</div><div class='del'>-#include &lt;asm/mach-common/cdef_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/cdef_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SYSTEM &amp; MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/cdefBF547.h b/arch/blackfin/mach-bf548/include/mach/cdefBF547.h<br/>index ba716277c00d..93376e90dfc5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/cdefBF547.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/cdefBF547.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/cdefBF547.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/cdefBF547.h</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include "defBF548.h"</div><div class='ctx'> </div><div class='ctx'> /* include core sbfin_read_()ecific register pointer definitions */</div><div class='del'>-#include &lt;asm/mach-common/cdef_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/cdef_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SYSTEM &amp; MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/cdefBF548.h b/arch/blackfin/mach-bf548/include/mach/cdefBF548.h<br/>index ae971ebff6a0..9cd74384136f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/cdefBF548.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/cdefBF548.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/cdefBF548.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/cdefBF548.h</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include "defBF548.h"</div><div class='ctx'> </div><div class='ctx'> /* include core sbfin_read_()ecific register pointer definitions */</div><div class='del'>-#include &lt;asm/mach-common/cdef_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/cdef_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SYSTEM &amp; MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/cdefBF549.h b/arch/blackfin/mach-bf548/include/mach/cdefBF549.h<br/>index 92d07d961999..ead360b69dea 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/cdefBF549.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/cdefBF549.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/cdefBF549.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/cdefBF549.h</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include "defBF549.h"</div><div class='ctx'> </div><div class='ctx'> /* include core sbfin_read_()ecific register pointer definitions */</div><div class='del'>-#include &lt;asm/mach-common/cdef_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/cdef_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SYSTEM &amp; MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/cdefBF54x_base.h b/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h<br/>index 57ac8cb9b1f6..57ac8cb9b1f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/cdefBF54x_base.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/cdefBF54x_base.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/defBF542.h b/arch/blackfin/mach-bf548/include/mach/defBF542.h<br/>index a7c809f29ede..b1316541b8d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/defBF542.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/defBF542.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/defBF542.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/defBF542.h</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #define _DEF_BF542_H</div><div class='ctx'> </div><div class='ctx'> /* Include all Core registers and bit definitions */</div><div class='del'>-#include &lt;asm/mach-common/def_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/def_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SYSTEM &amp; MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/defBF544.h b/arch/blackfin/mach-bf548/include/mach/defBF544.h<br/>index b8b9870e2697..c2c785bdc5fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/defBF544.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/defBF544.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/defBF544.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/defBF544.h</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #define _DEF_BF544_H</div><div class='ctx'> </div><div class='ctx'> /* Include all Core registers and bit definitions */</div><div class='del'>-#include &lt;asm/mach-common/def_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/def_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SYSTEM &amp; MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/defBF547.h b/arch/blackfin/mach-bf548/include/mach/defBF547.h<br/>index 3a3a18ebb10e..661f0d877bd1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/defBF547.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/defBF547.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/defBF547.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/defBF547.h</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #define _DEF_BF548_H</div><div class='ctx'> </div><div class='ctx'> /* Include all Core registers and bit definitions */</div><div class='del'>-#include &lt;asm/mach-common/def_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/def_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SYSTEM &amp; MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/defBF548.h b/arch/blackfin/mach-bf548/include/mach/defBF548.h<br/>index 1d7c96edb038..85d4bade911d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/defBF548.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/defBF548.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/defBF548.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/defBF548.h</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #define _DEF_BF548_H</div><div class='ctx'> </div><div class='ctx'> /* Include all Core registers and bit definitions */</div><div class='del'>-#include &lt;asm/mach-common/def_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/def_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SYSTEM &amp; MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/defBF549.h b/arch/blackfin/mach-bf548/include/mach/defBF549.h<br/>index fcb72b41e007..096734541644 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/defBF549.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/defBF549.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/defBF549.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/defBF549.h</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #define _DEF_BF549_H</div><div class='ctx'> </div><div class='ctx'> /* Include all Core registers and bit definitions */</div><div class='del'>-#include &lt;asm/mach-common/def_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/def_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* SYSTEM &amp; MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */</div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/defBF54x_base.h b/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h<br/>index e022e896cb18..e022e896cb18 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/defBF54x_base.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/defBF54x_base.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/defBF54x_base.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/dma.h b/arch/blackfin/mach-bf548/include/mach/dma.h<br/>index 36a2ef7e7849..36a2ef7e7849 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/dma.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/gpio.h b/arch/blackfin/mach-bf548/include/mach/gpio.h<br/>index bba82dc75f16..bba82dc75f16 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/gpio.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/irq.h b/arch/blackfin/mach-bf548/include/mach/irq.h<br/>index ad380d1f5872..ad380d1f5872 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/irq.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/mem_init.h b/arch/blackfin/mach-bf548/include/mach/mem_init.h<br/>index ab0b863eee66..ab0b863eee66 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/mem_init.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/mem_init.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/mem_init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/mem_init.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/mem_map.h b/arch/blackfin/mach-bf548/include/mach/mem_map.h<br/>index f99f47bc3a07..f99f47bc3a07 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/mem_map.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/mem_map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/mem_map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/mem_map.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf548/portmux.h b/arch/blackfin/mach-bf548/include/mach/portmux.h<br/>index 8177a567dcdb..8177a567dcdb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf548/portmux.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf548/portmux.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/include/mach/portmux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/include/mach/portmux.h</a></div><div class='head'>diff --git a/arch/blackfin/mach-bf548/ints-priority.c b/arch/blackfin/mach-bf548/ints-priority.c<br/>index 2665653cee37..9dd0fa3ac4de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/ints-priority.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf548/ints-priority.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/ints-priority.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf548/ints-priority.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='ctx'> </div><div class='del'>-void program_IAR(void)</div><div class='add'>+void __init program_IAR(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Program the IAR0 Register with the configured priority */</div><div class='ctx'> 	bfin_write_SIC_IAR0(((CONFIG_IRQ_PLL_WAKEUP - 7) &lt;&lt; IRQ_PLL_WAKEUP_POS) |</div><div class='head'>diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c<br/>index 466ef5929a25..8f40990eea2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/boards/cm_bf561.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf561/boards/cm_bf561.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/boards/cm_bf561.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/boards/cm_bf561.c</a></div><div class='hunk'>@@ -54,16 +54,16 @@ const char bfin_board_name[] = "Bluetechnix CM BF561";</div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='ctx'> static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "bootloader",</div><div class='add'>+		.name = "bootloader(spi)",</div><div class='ctx'> 		.size = 0x00020000,</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.mask_flags = MTD_CAP_ROM</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "kernel",</div><div class='add'>+		.name = "linux kernel(spi)",</div><div class='ctx'> 		.size = 0xe0000,</div><div class='ctx'> 		.offset = 0x20000</div><div class='ctx'> 	}, {</div><div class='del'>-		.name = "file system",</div><div class='add'>+		.name = "file system(spi)",</div><div class='ctx'> 		.size = 0x700000,</div><div class='ctx'> 		.offset = 0x00100000,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -306,7 +306,7 @@ static struct platform_device bfin_sir_device = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-#define PATA_INT	119</div><div class='add'>+#define PATA_INT	IRQ_PF46</div><div class='ctx'> </div><div class='ctx'> static struct pata_platform_info bfin_pata_platform_data = {</div><div class='ctx'> 	.ioport_shift = 2,</div><div class='head'>diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c<br/>index bc6feded8569..50b4cdceccfe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/boards/ezkit.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf561/boards/ezkit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/boards/ezkit.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/boards/ezkit.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/bfin5xx_spi.h&gt;</div><div class='ctx'> #include &lt;asm/portmux.h&gt;</div><div class='hunk'>@@ -243,15 +242,15 @@ static struct platform_device bfin_sir_device = {</div><div class='ctx'> #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)</div><div class='ctx'> static struct mtd_partition ezkit_partitions[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name       = "Bootloader",</div><div class='add'>+		.name       = "bootloader(nor)",</div><div class='ctx'> 		.size       = 0x40000,</div><div class='ctx'> 		.offset     = 0,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name       = "Kernel",</div><div class='add'>+		.name       = "linux kernel(nor)",</div><div class='ctx'> 		.size       = 0x1C0000,</div><div class='ctx'> 		.offset     = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name       = "RootFS",</div><div class='add'>+		.name       = "file system(nor)",</div><div class='ctx'> 		.size       = MTDPART_SIZ_FULL,</div><div class='ctx'> 		.offset     = MTDPART_OFS_APPEND,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -350,43 +349,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-#define PATA_INT	55</div><div class='del'>-</div><div class='del'>-static struct pata_platform_info bfin_pata_platform_data = {</div><div class='del'>-	.ioport_shift = 1,</div><div class='del'>-	.irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource bfin_pata_resources[] = {</div><div class='del'>-	{</div><div class='del'>-		.start = 0x20314020,</div><div class='del'>-		.end = 0x2031403F,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start = 0x2031401C,</div><div class='del'>-		.end = 0x2031401F,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start = PATA_INT,</div><div class='del'>-		.end = PATA_INT,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device bfin_pata_device = {</div><div class='del'>-	.name = "pata_platform",</div><div class='del'>-	.id = -1,</div><div class='del'>-	.num_resources = ARRAY_SIZE(bfin_pata_resources),</div><div class='del'>-	.resource = bfin_pata_resources,</div><div class='del'>-	.dev = {</div><div class='del'>-		.platform_data = &amp;bfin_pata_platform_data,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='hunk'>@@ -499,10 +461,6 @@ static struct platform_device *ezkit_devices[] __initdata = {</div><div class='ctx'> 	&amp;bfin_sir_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-	&amp;bfin_pata_device,</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)</div><div class='ctx'> 	&amp;bfin_device_gpiokeys,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -538,10 +496,6 @@ static int __init ezkit_init(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)</div><div class='del'>-	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;</div><div class='del'>-#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf561/head.S b/arch/blackfin/mach-bf561/head.S<br/>index cf1a2dff01e7..75ea6a905829 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/head.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf561/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/head.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/head.S</a></div><div class='hunk'>@@ -30,284 +30,13 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='del'>-#include &lt;asm/trace.h&gt;</div><div class='del'>-</div><div class='del'>-#if CONFIG_BFIN_KERNEL_CLOCK</div><div class='del'>-#include &lt;asm/mach-common/clocks.h&gt;</div><div class='del'>-#include &lt;asm/mach/mem_init.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-.extern ___bss_stop</div><div class='del'>-.extern ___bss_start</div><div class='del'>-.extern _bf53x_relocate_l1_mem</div><div class='del'>-</div><div class='del'>-#define INITIAL_STACK	0xFFB01000</div><div class='del'>-</div><div class='del'>-__INIT</div><div class='del'>-</div><div class='del'>-ENTRY(__start)</div><div class='del'>-	/* R0: argument of command line string, passed from uboot, save it */</div><div class='del'>-	R7 = R0;</div><div class='del'>-	/* Enable Cycle Counter and Nesting Of Interrupts */</div><div class='del'>-#ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES</div><div class='del'>-	R0 = SYSCFG_SNEN;</div><div class='del'>-#else</div><div class='del'>-	R0 = SYSCFG_SNEN | SYSCFG_CCEN;</div><div class='del'>-#endif</div><div class='del'>-	SYSCFG = R0;</div><div class='del'>-	R0 = 0;</div><div class='del'>-</div><div class='del'>-	/* Clear Out All the data and pointer Registers */</div><div class='del'>-	R1 = R0;</div><div class='del'>-	R2 = R0;</div><div class='del'>-	R3 = R0;</div><div class='del'>-	R4 = R0;</div><div class='del'>-	R5 = R0;</div><div class='del'>-	R6 = R0;</div><div class='del'>-</div><div class='del'>-	P0 = R0;</div><div class='del'>-	P1 = R0;</div><div class='del'>-	P2 = R0;</div><div class='del'>-	P3 = R0;</div><div class='del'>-	P4 = R0;</div><div class='del'>-	P5 = R0;</div><div class='del'>-</div><div class='del'>-	LC0 = r0;</div><div class='del'>-	LC1 = r0;</div><div class='del'>-	L0 = r0;</div><div class='del'>-	L1 = r0;</div><div class='del'>-	L2 = r0;</div><div class='del'>-	L3 = r0;</div><div class='del'>-</div><div class='del'>-	/* Clear Out All the DAG Registers */</div><div class='del'>-	B0 = r0;</div><div class='del'>-	B1 = r0;</div><div class='del'>-	B2 = r0;</div><div class='del'>-	B3 = r0;</div><div class='del'>-</div><div class='del'>-	I0 = r0;</div><div class='del'>-	I1 = r0;</div><div class='del'>-	I2 = r0;</div><div class='del'>-	I3 = r0;</div><div class='del'>-</div><div class='del'>-	M0 = r0;</div><div class='del'>-	M1 = r0;</div><div class='del'>-	M2 = r0;</div><div class='del'>-	M3 = r0;</div><div class='del'>-</div><div class='del'>-	trace_buffer_init(p0,r0);</div><div class='del'>-	P0 = R1;</div><div class='del'>-	R0 = R1;</div><div class='del'>-</div><div class='del'>-	/* Turn off the icache */</div><div class='del'>-	p0.l = LO(IMEM_CONTROL);</div><div class='del'>-	p0.h = HI(IMEM_CONTROL);</div><div class='del'>-	R1 = [p0];</div><div class='del'>-	R0 = ~ENICPLB;</div><div class='del'>-	R0 = R0 &amp; R1;</div><div class='del'>-</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-	CLI R2;</div><div class='del'>-	SSYNC;</div><div class='del'>-#endif</div><div class='del'>-	[p0] = R0;</div><div class='del'>-	SSYNC;</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-	STI R2;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Turn off the dcache */</div><div class='del'>-	p0.l = LO(DMEM_CONTROL);</div><div class='del'>-	p0.h = HI(DMEM_CONTROL);</div><div class='del'>-	R1 = [p0];</div><div class='del'>-	R0 = ~ENDCPLB;</div><div class='del'>-	R0 = R0 &amp; R1;</div><div class='del'>-</div><div class='del'>-	/* Anomaly 05000125 */</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-	CLI R2;</div><div class='del'>-	SSYNC;</div><div class='del'>-#endif</div><div class='del'>-	[p0] = R0;</div><div class='del'>-	SSYNC;</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-	STI R2;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Initialise UART - when booting from u-boot, the UART is not disabled</div><div class='del'>-	 * so if we dont initalize here, our serial console gets hosed */</div><div class='del'>-	p0.h = hi(BFIN_UART_LCR);</div><div class='del'>-	p0.l = lo(BFIN_UART_LCR);</div><div class='del'>-	r0 = 0x0(Z);</div><div class='del'>-	w[p0] = r0.L;	/* To enable DLL writes */</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p0.h = hi(BFIN_UART_DLL);</div><div class='del'>-	p0.l = lo(BFIN_UART_DLL);</div><div class='del'>-	r0 = 0x0(Z);</div><div class='del'>-	w[p0] = r0.L;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p0.h = hi(BFIN_UART_DLH);</div><div class='del'>-	p0.l = lo(BFIN_UART_DLH);</div><div class='del'>-	r0 = 0x00(Z);</div><div class='del'>-	w[p0] = r0.L;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p0.h = hi(BFIN_UART_GCTL);</div><div class='del'>-	p0.l = lo(BFIN_UART_GCTL);</div><div class='del'>-	r0 = 0x0(Z);</div><div class='del'>-	w[p0] = r0.L;	/* To enable UART clock */</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	/* Initialize stack pointer */</div><div class='del'>-	sp.l = lo(INITIAL_STACK);</div><div class='del'>-	sp.h = hi(INITIAL_STACK);</div><div class='del'>-	fp = sp;</div><div class='del'>-	usp = sp;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_EARLY_PRINTK</div><div class='del'>-	SP += -12;</div><div class='del'>-	call _init_early_exception_vectors;</div><div class='del'>-	SP += 12;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */</div><div class='del'>-	call _bf53x_relocate_l1_mem;</div><div class='del'>-#if CONFIG_BFIN_KERNEL_CLOCK</div><div class='del'>-	call _start_dma_code;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Code for initializing Async memory banks */</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_AMBCTL1);</div><div class='del'>-	p2.l = lo(EBIU_AMBCTL1);</div><div class='del'>-	r0.h = hi(AMBCTL1VAL);</div><div class='del'>-	r0.l = lo(AMBCTL1VAL);</div><div class='del'>-	[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_AMBCTL0);</div><div class='del'>-	p2.l = lo(EBIU_AMBCTL0);</div><div class='del'>-	r0.h = hi(AMBCTL0VAL);</div><div class='del'>-	r0.l = lo(AMBCTL0VAL);</div><div class='del'>-	[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	p2.h = hi(EBIU_AMGCTL);</div><div class='del'>-	p2.l = lo(EBIU_AMGCTL);</div><div class='del'>-	r0 = AMGCTLVAL;</div><div class='del'>-	w[p2] = r0;</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	/* This section keeps the processor in supervisor mode</div><div class='del'>-	 * during kernel boot.  Switches to user mode at end of boot.</div><div class='del'>-	 * See page 3-9 of Hardware Reference manual for documentation.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* EVT15 = _real_start */</div><div class='del'>-</div><div class='del'>-	p0.l = lo(EVT15);</div><div class='del'>-	p0.h = hi(EVT15);</div><div class='del'>-	p1.l = _real_start;</div><div class='del'>-	p1.h = _real_start;</div><div class='del'>-	[p0] = p1;</div><div class='del'>-	csync;</div><div class='del'>-</div><div class='del'>-	p0.l = lo(IMASK);</div><div class='del'>-	p0.h = hi(IMASK);</div><div class='del'>-	p1.l = IMASK_IVG15;</div><div class='del'>-	p1.h = 0x0;</div><div class='del'>-	[p0] = p1;</div><div class='del'>-	csync;</div><div class='del'>-</div><div class='del'>-	raise 15;</div><div class='del'>-	p0.l = .LWAIT_HERE;</div><div class='del'>-	p0.h = .LWAIT_HERE;</div><div class='del'>-	reti = p0;</div><div class='del'>-#if ANOMALY_05000281</div><div class='del'>-	nop; nop; nop;</div><div class='add'>+#ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='add'>+#include &lt;asm/clocks.h&gt;</div><div class='add'>+#include &lt;mach/mem_init.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-	rti;</div><div class='del'>-</div><div class='del'>-.LWAIT_HERE:</div><div class='del'>-	jump .LWAIT_HERE;</div><div class='del'>-ENDPROC(__start)</div><div class='del'>-</div><div class='del'>-ENTRY(_real_start)</div><div class='del'>-	[ -- sp ] = reti;</div><div class='del'>-	p0.l = lo(WDOGA_CTL);</div><div class='del'>-	p0.h = hi(WDOGA_CTL);</div><div class='del'>-	r0 = 0xAD6(z);</div><div class='del'>-	w[p0] = r0;	/* watchdog off for now */</div><div class='del'>-	ssync;</div><div class='del'>-</div><div class='del'>-	/* Code update for BSS size == 0</div><div class='del'>-	 * Zero out the bss region.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	p1.l = ___bss_start;</div><div class='del'>-	p1.h = ___bss_start;</div><div class='del'>-	p2.l = ___bss_stop;</div><div class='del'>-	p2.h = ___bss_stop;</div><div class='del'>-	r0 = 0;</div><div class='del'>-	p2 -= p1;</div><div class='del'>-	lsetup (.L_clear_bss, .L_clear_bss) lc0 = p2;</div><div class='del'>-.L_clear_bss:</div><div class='del'>-	B[p1++] = r0;</div><div class='del'>-</div><div class='del'>-	/* In case there is a NULL pointer reference</div><div class='del'>-	 * Zero out region before stext</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	p1.l = 0x0;</div><div class='del'>-	p1.h = 0x0;</div><div class='del'>-	r0.l = __stext;</div><div class='del'>-	r0.h = __stext;</div><div class='del'>-	r0 = r0 &gt;&gt; 1;</div><div class='del'>-	p2 = r0;</div><div class='del'>-	r0 = 0;</div><div class='del'>-	lsetup (.L_clear_zero, .L_clear_zero) lc0 = p2;</div><div class='del'>-.L_clear_zero:</div><div class='del'>-	W[p1++] = r0;</div><div class='del'>-</div><div class='del'>-	/* pass the uboot arguments to the global value command line */</div><div class='del'>-	R0 = R7;</div><div class='del'>-	call _cmdline_init;</div><div class='del'>-</div><div class='del'>-	p1.l = __rambase;</div><div class='del'>-	p1.h = __rambase;</div><div class='del'>-	r0.l = __sdata;</div><div class='del'>-	r0.h = __sdata;</div><div class='del'>-	[p1] = r0;</div><div class='del'>-</div><div class='del'>-	p1.l = __ramstart;</div><div class='del'>-	p1.h = __ramstart;</div><div class='del'>-	p3.l = ___bss_stop;</div><div class='del'>-	p3.h = ___bss_stop;</div><div class='del'>-</div><div class='del'>-	r1 = p3;</div><div class='del'>-	[p1] = r1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * load the current thread pointer and stack</div><div class='del'>-	 */</div><div class='del'>-	r1.l = _init_thread_union;</div><div class='del'>-	r1.h = _init_thread_union;</div><div class='del'>-</div><div class='del'>-	r2.l = 0x2000;</div><div class='del'>-	r2.h = 0x0000;</div><div class='del'>-	r1 = r1 + r2;</div><div class='del'>-	sp = r1;</div><div class='del'>-	usp = sp;</div><div class='del'>-	fp = sp;</div><div class='del'>-	jump.l _start_kernel;</div><div class='del'>-ENDPROC(_real_start)</div><div class='del'>-</div><div class='del'>-__FINIT</div><div class='ctx'> </div><div class='ctx'> .section .l1.text</div><div class='del'>-#if CONFIG_BFIN_KERNEL_CLOCK</div><div class='add'>+#ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='ctx'> ENTRY(_start_dma_code)</div><div class='ctx'> 	p0.h = hi(SICA_IWR0);</div><div class='ctx'> 	p0.l = lo(SICA_IWR0);</div><div class='head'>diff --git a/include/asm-blackfin/mach-bf561/anomaly.h b/arch/blackfin/mach-bf561/include/mach/anomaly.h<br/>index 5c5d7d7d695f..5c5d7d7d695f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf561/anomaly.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf561/anomaly.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/include/mach/anomaly.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/anomaly.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf561/bf561.h b/arch/blackfin/mach-bf561/include/mach/bf561.h<br/>index 3ef9e5f36136..3ef9e5f36136 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf561/bf561.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf561/bf561.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/include/mach/bf561.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/bf561.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h b/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h<br/>index 8aa02780e642..8aa02780e642 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf561/bfin_serial_5xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf561/bfin_sir.h b/arch/blackfin/mach-bf561/include/mach/bfin_sir.h<br/>index 9bb87e9e2e9b..9bb87e9e2e9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf561/bfin_sir.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf561/bfin_sir.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/include/mach/bfin_sir.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/bfin_sir.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf561/blackfin.h b/arch/blackfin/mach-bf561/include/mach/blackfin.h<br/>index 0ea8666e6764..0ea8666e6764 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf561/blackfin.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf561/blackfin.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/include/mach/blackfin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/blackfin.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf561/cdefBF561.h b/arch/blackfin/mach-bf561/include/mach/cdefBF561.h<br/>index b07ffccd66dd..c14d63402e70 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf561/cdefBF561.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf561/cdefBF561.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/include/mach/cdefBF561.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/cdefBF561.h</a></div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> #include "defBF561.h"</div><div class='ctx'> </div><div class='ctx'> /*include core specific register pointer definitions*/</div><div class='del'>-#include &lt;asm/mach-common/cdef_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/cdef_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-blackfin/mach-bf561/defBF561.h b/arch/blackfin/mach-bf561/include/mach/defBF561.h<br/>index 1ab50e906fe7..4eca2026bb92 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf561/defBF561.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf561/defBF561.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/include/mach/defBF561.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/defBF561.h</a></div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> #endif</div><div class='ctx'> */</div><div class='ctx'> /* include all Core registers and bit definitions */</div><div class='del'>-#include &lt;asm/mach-common/def_LPBlackfin.h&gt;</div><div class='add'>+#include &lt;asm/def_LPBlackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*********************************************************************************** */</div><div class='ctx'> /* System MMR Register Map */</div><div class='head'>diff --git a/include/asm-blackfin/mach-bf561/dma.h b/arch/blackfin/mach-bf561/include/mach/dma.h<br/>index 8bc46cd89a02..8bc46cd89a02 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf561/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf561/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/include/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/dma.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf561/irq.h b/arch/blackfin/mach-bf561/include/mach/irq.h<br/>index 6698389c5564..6698389c5564 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf561/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf561/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/include/mach/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/irq.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf561/mem_init.h b/arch/blackfin/mach-bf561/include/mach/mem_init.h<br/>index e163260bca18..e163260bca18 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf561/mem_init.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf561/mem_init.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/include/mach/mem_init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/mem_init.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf561/mem_map.h b/arch/blackfin/mach-bf561/include/mach/mem_map.h<br/>index c26d8486cc4b..c26d8486cc4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf561/mem_map.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf561/mem_map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/include/mach/mem_map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/mem_map.h</a></div><div class='head'>diff --git a/include/asm-blackfin/mach-bf561/portmux.h b/arch/blackfin/mach-bf561/include/mach/portmux.h<br/>index a6ee8206efb6..a6ee8206efb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-blackfin/mach-bf561/portmux.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-blackfin/mach-bf561/portmux.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/include/mach/portmux.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/include/mach/portmux.h</a></div><div class='head'>diff --git a/arch/blackfin/mach-bf561/ints-priority.c b/arch/blackfin/mach-bf561/ints-priority.c<br/>index 09b541b0f7c2..9d2f23344720 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/ints-priority.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-bf561/ints-priority.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/ints-priority.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-bf561/ints-priority.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='ctx'> </div><div class='del'>-void program_IAR(void)</div><div class='add'>+void __init program_IAR(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Program the IAR0 Register with the configured priority */</div><div class='ctx'> 	bfin_write_SICA_IAR0(((CONFIG_IRQ_PLL_WAKEUP - 7) &lt;&lt; IRQ_PLL_WAKEUP_POS) |</div><div class='head'>diff --git a/arch/blackfin/mach-common/Makefile b/arch/blackfin/mach-common/Makefile<br/>index 422bfee34adc..e6ed57c56d4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-common/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/Makefile</a></div><div class='hunk'>@@ -3,9 +3,10 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-y := \</div><div class='del'>-	cache.o cacheinit.o entry.o \</div><div class='del'>-	interrupt.o lock.o irqpanic.o arch_checks.o ints-priority.o</div><div class='add'>+	cache.o entry.o head.o \</div><div class='add'>+	interrupt.o irqpanic.o arch_checks.o ints-priority.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_BFIN_ICACHE_LOCK) += lock.o</div><div class='ctx'> obj-$(CONFIG_PM)          += pm.o dpmc_modes.o</div><div class='ctx'> obj-$(CONFIG_CPU_FREQ)    += cpufreq.o</div><div class='ctx'> obj-$(CONFIG_CPU_VOLTAGE) += dpmc.o</div><div class='head'>diff --git a/arch/blackfin/mach-common/arch_checks.c b/arch/blackfin/mach-common/arch_checks.c<br/>index f9160d83b91f..98133b968f7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/arch_checks.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-common/arch_checks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/arch_checks.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/arch_checks.c</a></div><div class='hunk'>@@ -27,8 +27,9 @@</div><div class='ctx'>  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach/anomaly.h&gt;</div><div class='del'>-#include &lt;asm/mach-common/clocks.h&gt;</div><div class='add'>+#include &lt;asm/fixed_code.h&gt;</div><div class='add'>+#include &lt;mach/anomaly.h&gt;</div><div class='add'>+#include &lt;asm/clocks.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='ctx'> </div><div class='hunk'>@@ -53,3 +54,11 @@</div><div class='ctx'> # endif</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_BFIN_KERNEL_CLOCK */</div><div class='add'>+</div><div class='add'>+#if CONFIG_BOOT_LOAD &lt; FIXED_CODE_END</div><div class='add'>+# error "The kernel load address must be after the fixed code section"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (CONFIG_BOOT_LOAD &amp; 0x3)</div><div class='add'>+# error "The kernel load address must be 4 byte aligned"</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/blackfin/mach-common/cache.S b/arch/blackfin/mach-common/cache.S<br/>index 0521b1588204..85f8c79b3c37 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/cache.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-common/cache.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/cache.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/cache.S</a></div><div class='hunk'>@@ -34,81 +34,6 @@</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> </div><div class='ctx'> .text</div><div class='del'>-.align 2</div><div class='del'>-ENTRY(_cache_invalidate)</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Icache or DcacheA or DcacheB Invalidation</div><div class='del'>-	 * or any combination thereof</div><div class='del'>-	 * R0 has bits</div><div class='del'>-	 * CPLB_ENABLE_ICACHE_P,CPLB_ENABLE_DCACHE_P,CPLB_ENABLE_DCACHE2_P</div><div class='del'>-	 * set as required</div><div class='del'>-	 */</div><div class='del'>-	[--SP] = R7;</div><div class='del'>-</div><div class='del'>-	R7 = R0;</div><div class='del'>-	CC = BITTST(R7,CPLB_ENABLE_ICACHE_P);</div><div class='del'>-	IF !CC JUMP .Lno_icache;</div><div class='del'>-	[--SP] = RETS;</div><div class='del'>-	CALL _icache_invalidate;</div><div class='del'>-	RETS = [SP++];</div><div class='del'>-.Lno_icache:</div><div class='del'>-	CC = BITTST(R7,CPLB_ENABLE_DCACHE_P);</div><div class='del'>-	IF !CC JUMP .Lno_dcache_a;</div><div class='del'>-	R0 = 0;         /* specifies bank A */</div><div class='del'>-	[--SP] = RETS;</div><div class='del'>-	CALL _dcache_invalidate;</div><div class='del'>-	RETS = [SP++];</div><div class='del'>-.Lno_dcache_a:</div><div class='del'>-	CC = BITTST(R7,CPLB_ENABLE_DCACHE2_P);</div><div class='del'>-	IF !CC JUMP .Lno_dcache_b;</div><div class='del'>-	R0 = 0;</div><div class='del'>-	BITSET(R0, 23);		/* specifies bank B */</div><div class='del'>-	[--SP] = RETS;</div><div class='del'>-	CALL  _dcache_invalidate;</div><div class='del'>-	RETS = [SP++];</div><div class='del'>-.Lno_dcache_b:</div><div class='del'>-	R7 = [SP++];</div><div class='del'>-	RTS;</div><div class='del'>-ENDPROC(_cache_invalidate)</div><div class='del'>-</div><div class='del'>-/* Invalidate the Entire Instruction cache by</div><div class='del'>- * disabling IMC bit</div><div class='del'>- */</div><div class='del'>-ENTRY(_icache_invalidate)</div><div class='del'>-ENTRY(_invalidate_entire_icache)</div><div class='del'>-	[--SP] = ( R7:5);</div><div class='del'>-</div><div class='del'>-	P0.L = LO(IMEM_CONTROL);</div><div class='del'>-	P0.H = HI(IMEM_CONTROL);</div><div class='del'>-	R7 = [P0];</div><div class='del'>-</div><div class='del'>-	/* Clear the IMC bit , All valid bits in the instruction</div><div class='del'>-	 * cache are set to the invalid state</div><div class='del'>-	 */</div><div class='del'>-	BITCLR(R7,IMC_P);</div><div class='del'>-	CLI R6;</div><div class='del'>-	SSYNC;		/* SSYNC required before invalidating cache. */</div><div class='del'>-	.align 8;</div><div class='del'>-	[P0] = R7;</div><div class='del'>-	SSYNC;</div><div class='del'>-	STI R6;</div><div class='del'>-</div><div class='del'>-	/* Configures the instruction cache agian */</div><div class='del'>-	R6 = (IMC | ENICPLB);</div><div class='del'>-	R7 = R7 | R6;</div><div class='del'>-</div><div class='del'>-	CLI R6;</div><div class='del'>-	SSYNC;		/* SSYNC required before writing to IMEM_CONTROL. */</div><div class='del'>-	.align 8;</div><div class='del'>-	[P0] = R7;</div><div class='del'>-	SSYNC;</div><div class='del'>-	STI R6;</div><div class='del'>-</div><div class='del'>-	( R7:5) = [SP++];</div><div class='del'>-	RTS;</div><div class='del'>-ENDPROC(_invalidate_entire_icache)</div><div class='del'>-ENDPROC(_icache_invalidate)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * blackfin_cache_flush_range(start, end)</div><div class='hunk'>@@ -190,46 +115,6 @@ ENTRY(_blackfin_dcache_invalidate_range)</div><div class='ctx'> 	RTS;</div><div class='ctx'> ENDPROC(_blackfin_dcache_invalidate_range)</div><div class='ctx'> </div><div class='del'>-/* Invalidate the Entire Data cache by</div><div class='del'>- * clearing DMC[1:0] bits</div><div class='del'>- */</div><div class='del'>-ENTRY(_invalidate_entire_dcache)</div><div class='del'>-ENTRY(_dcache_invalidate)</div><div class='del'>-	[--SP] = ( R7:6);</div><div class='del'>-</div><div class='del'>-	P0.L = LO(DMEM_CONTROL);</div><div class='del'>-	P0.H = HI(DMEM_CONTROL);</div><div class='del'>-	R7 = [P0];</div><div class='del'>-</div><div class='del'>-	/* Clear the DMC[1:0] bits, All valid bits in the data</div><div class='del'>-	 * cache are set to the invalid state</div><div class='del'>-	 */</div><div class='del'>-	BITCLR(R7,DMC0_P);</div><div class='del'>-	BITCLR(R7,DMC1_P);</div><div class='del'>-	CLI R6;</div><div class='del'>-	SSYNC;		/* SSYNC required before writing to DMEM_CONTROL. */</div><div class='del'>-	.align 8;</div><div class='del'>-	[P0] = R7;</div><div class='del'>-	SSYNC;</div><div class='del'>-	STI R6;</div><div class='del'>-</div><div class='del'>-	/* Configures the data cache again */</div><div class='del'>-</div><div class='del'>-	R6 = DMEM_CNTR;</div><div class='del'>-	R7 = R7 | R6;</div><div class='del'>-</div><div class='del'>-	CLI R6;</div><div class='del'>-	SSYNC;		/* SSYNC required before writing to DMEM_CONTROL. */</div><div class='del'>-	.align 8;</div><div class='del'>-	[P0] = R7;</div><div class='del'>-	SSYNC;</div><div class='del'>-	STI R6;</div><div class='del'>-</div><div class='del'>-	( R7:6) = [SP++];</div><div class='del'>-	RTS;</div><div class='del'>-ENDPROC(_dcache_invalidate)</div><div class='del'>-ENDPROC(_invalidate_entire_dcache)</div><div class='del'>-</div><div class='ctx'> ENTRY(_blackfin_dcache_flush_range)</div><div class='ctx'> 	R2 = -L1_CACHE_BYTES;</div><div class='ctx'> 	R2 = R0 &amp; R2;</div><div class='head'>diff --git a/arch/blackfin/mach-common/cacheinit.S b/arch/blackfin/mach-common/cacheinit.S<br/>deleted file mode 100644<br/>index 22fada0c1cb3..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/cacheinit.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-common/cacheinit.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * File:         arch/blackfin/mach-common/cacheinit.S</div><div class='del'>- * Based on:</div><div class='del'>- * Author:       LG Soft India</div><div class='del'>- *</div><div class='del'>- * Created:      ?</div><div class='del'>- * Description:  cache initialization</div><div class='del'>- *</div><div class='del'>- * Modified:</div><div class='del'>- *               Copyright 2004-2006 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Bugs:         Enter bugs at http://blackfin.uclinux.org/</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see the file COPYING, or write</div><div class='del'>- * to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* This function sets up the data and instruction cache. The</div><div class='del'>- * tables like icplb table, dcplb table and Page Descriptor table</div><div class='del'>- * are defined in cplbtab.h. You can configure those tables for</div><div class='del'>- * your suitable requirements</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;asm/blackfin.h&gt;</div><div class='del'>-</div><div class='del'>-.text</div><div class='del'>-</div><div class='del'>-#if ANOMALY_05000125</div><div class='del'>-#if defined(CONFIG_BFIN_ICACHE)</div><div class='del'>-ENTRY(_bfin_write_IMEM_CONTROL)</div><div class='del'>-</div><div class='del'>-	/* Enable Instruction Cache */</div><div class='del'>-	P0.l = LO(IMEM_CONTROL);</div><div class='del'>-	P0.h = HI(IMEM_CONTROL);</div><div class='del'>-</div><div class='del'>-	/* Anomaly 05000125 */</div><div class='del'>-	CLI R1;</div><div class='del'>-	SSYNC;		/* SSYNC required before writing to IMEM_CONTROL. */</div><div class='del'>-	.align 8;</div><div class='del'>-	[P0] = R0;</div><div class='del'>-	SSYNC;</div><div class='del'>-	STI R1;</div><div class='del'>-	RTS;</div><div class='del'>-</div><div class='del'>-ENDPROC(_bfin_write_IMEM_CONTROL)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_BFIN_DCACHE)</div><div class='del'>-ENTRY(_bfin_write_DMEM_CONTROL)</div><div class='del'>-	P0.l = LO(DMEM_CONTROL);</div><div class='del'>-	P0.h = HI(DMEM_CONTROL);</div><div class='del'>-</div><div class='del'>-	CLI R1;</div><div class='del'>-	SSYNC;		/* SSYNC required before writing to DMEM_CONTROL. */</div><div class='del'>-	.align 8;</div><div class='del'>-	[P0] = R0;</div><div class='del'>-	SSYNC;</div><div class='del'>-	STI R1;</div><div class='del'>-	RTS;</div><div class='del'>-</div><div class='del'>-ENDPROC(_bfin_write_DMEM_CONTROL)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/blackfin/mach-common/dpmc_modes.S b/arch/blackfin/mach-common/dpmc_modes.S<br/>index 5e3f1d8a4fb8..ad5431e2cd05 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/dpmc_modes.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-common/dpmc_modes.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/dpmc_modes.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/dpmc_modes.S</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='del'>-#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+#include &lt;mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/dpmc.h&gt;</div><div class='ctx'> </div><div class='ctx'> .section .l1.text</div><div class='hunk'>@@ -78,62 +78,6 @@ ENTRY(_hibernate_mode)</div><div class='ctx'> 	jump .Lforever;</div><div class='ctx'> ENDPROC(_hibernate_mode)</div><div class='ctx'> </div><div class='del'>-ENTRY(_deep_sleep)</div><div class='del'>-	[--SP] = ( R7:0, P5:0 );</div><div class='del'>-	[--SP] =  RETS;</div><div class='del'>-</div><div class='del'>-	CLI R4;</div><div class='del'>-</div><div class='del'>-	R0 = IWR_ENABLE(0);</div><div class='del'>-	R1 = IWR_DISABLE_ALL;</div><div class='del'>-	R2 = IWR_DISABLE_ALL;</div><div class='del'>-</div><div class='del'>-	call _set_sic_iwr;</div><div class='del'>-</div><div class='del'>-	call _set_dram_srfs;</div><div class='del'>-</div><div class='del'>-	/* Clear all the interrupts,bits sticky */</div><div class='del'>-	R0 = 0xFFFF (Z);</div><div class='del'>-	call _set_rtc_istat</div><div class='del'>-</div><div class='del'>-	P0.H = hi(PLL_CTL);</div><div class='del'>-	P0.L = lo(PLL_CTL);</div><div class='del'>-	R0 = W[P0](z);</div><div class='del'>-	BITSET (R0, 5);</div><div class='del'>-	W[P0] = R0.L;</div><div class='del'>-</div><div class='del'>-	call _test_pll_locked;</div><div class='del'>-</div><div class='del'>-	SSYNC;</div><div class='del'>-	IDLE;</div><div class='del'>-</div><div class='del'>-	call _unset_dram_srfs;</div><div class='del'>-</div><div class='del'>-	call _test_pll_locked;</div><div class='del'>-</div><div class='del'>-	R0 = IWR_ENABLE(0);</div><div class='del'>-	R1 = IWR_DISABLE_ALL;</div><div class='del'>-	R2 = IWR_DISABLE_ALL;</div><div class='del'>-</div><div class='del'>-	call _set_sic_iwr;</div><div class='del'>-</div><div class='del'>-	P0.H = hi(PLL_CTL);</div><div class='del'>-	P0.L = lo(PLL_CTL);</div><div class='del'>-	R0 = w[p0](z);</div><div class='del'>-	BITCLR (R0, 3);</div><div class='del'>-	BITCLR (R0, 5);</div><div class='del'>-	BITCLR (R0, 8);</div><div class='del'>-	w[p0] = R0;</div><div class='del'>-	IDLE;</div><div class='del'>-	call _test_pll_locked;</div><div class='del'>-</div><div class='del'>-	STI R4;</div><div class='del'>-</div><div class='del'>-	RETS = [SP++];</div><div class='del'>-	( R7:0, P5:0 ) = [SP++];</div><div class='del'>-	RTS;</div><div class='del'>-ENDPROC(_deep_sleep)</div><div class='del'>-</div><div class='ctx'> ENTRY(_sleep_deeper)</div><div class='ctx'> 	[--SP] = ( R7:0, P5:0 );</div><div class='ctx'> 	[--SP] =  RETS;</div><div class='head'>diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S<br/>index eceb484d90f9..847c172a99eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/entry.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-common/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/entry.S</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/trace.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach-common/context.S&gt;</div><div class='add'>+#include &lt;asm/context.S&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_BFIN_SCRATCH_REG_RETN)</div><div class='ctx'> # define EX_SCRATCH_REG RETN</div><div class='hunk'>@@ -158,14 +158,16 @@ ENTRY(_ex_single_step)</div><div class='ctx'> 	cc = r7 == r6;</div><div class='ctx'> 	if cc jump _bfin_return_from_exception;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KGDB</div><div class='ctx'> 	/* Don't do single step in hardware exception handler */</div><div class='ctx'>         p5.l = lo(IPEND);</div><div class='ctx'>         p5.h = hi(IPEND);</div><div class='ctx'> 	r6 = [p5];</div><div class='add'>+	cc = bittst(r6, 4);</div><div class='add'>+	if cc jump _bfin_return_from_exception;</div><div class='ctx'> 	cc = bittst(r6, 5);</div><div class='ctx'> 	if cc jump _bfin_return_from_exception;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='ctx'> 	/* skip single step if current interrupt priority is higher than</div><div class='ctx'> 	 * that of the first instruction, from which gdb starts single step */</div><div class='ctx'> 	r6 &gt;&gt;= 6;</div><div class='hunk'>@@ -186,17 +188,27 @@ ENTRY(_ex_single_step)</div><div class='ctx'> 	if cc jump .Ldo_single_step;</div><div class='ctx'> 	r6 += -1;</div><div class='ctx'> 	cc = r6 &lt; r7;</div><div class='del'>-	if cc jump _bfin_return_from_exception;</div><div class='add'>+	if cc jump 1f;</div><div class='ctx'> .Ldo_single_step:</div><div class='del'>-#endif</div><div class='del'>-</div><div class='add'>+#else</div><div class='ctx'> 	/* If we were in user mode, do the single step normally.  */</div><div class='add'>+	p5.l = lo(IPEND);</div><div class='add'>+	p5.h = hi(IPEND);</div><div class='ctx'> 	r6 = [p5];</div><div class='ctx'> 	r7 = 0xffe0 (z);</div><div class='ctx'> 	r7 = r7 &amp; r6;</div><div class='ctx'> 	cc = r7 == 0;</div><div class='del'>-	if cc jump 1f;</div><div class='add'>+	if !cc jump 1f;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+	/* Single stepping only a single instruction, so clear the trace</div><div class='add'>+	 * bit here.  */</div><div class='add'>+	r7 = syscfg;</div><div class='add'>+	bitclr (r7, 0);</div><div class='add'>+	syscfg = R7;</div><div class='add'>+	jump _ex_trap_c;</div><div class='add'>+</div><div class='add'>+1:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We were in an interrupt handler.  By convention, all of them save</div><div class='ctx'> 	 * SYSCFG with their first instruction, so by checking whether our</div><div class='hunk'>@@ -224,15 +236,11 @@ ENTRY(_ex_single_step)</div><div class='ctx'> 	cc = R7 == R6;</div><div class='ctx'> 	if !cc jump _bfin_return_from_exception;</div><div class='ctx'> </div><div class='del'>-1:</div><div class='del'>-	/* Single stepping only a single instruction, so clear the trace</div><div class='del'>-	 * bit here.  */</div><div class='ctx'> 	r7 = syscfg;</div><div class='ctx'> 	bitclr (r7, 0);</div><div class='ctx'> 	syscfg = R7;</div><div class='ctx'> </div><div class='del'>-	jump _ex_trap_c;</div><div class='del'>-</div><div class='add'>+	/* Fall through to _bfin_return_from_exception.  */</div><div class='ctx'> ENDPROC(_ex_single_step)</div><div class='ctx'> </div><div class='ctx'> ENTRY(_bfin_return_from_exception)</div><div class='hunk'>@@ -1414,6 +1422,12 @@ ENTRY(_sys_call_table)</div><div class='ctx'> 	.long _sys_semtimedop</div><div class='ctx'> 	.long _sys_timerfd_settime</div><div class='ctx'> 	.long _sys_timerfd_gettime</div><div class='add'>+	.long _sys_signalfd4		/* 360 */</div><div class='add'>+	.long _sys_eventfd2</div><div class='add'>+	.long _sys_epoll_create1</div><div class='add'>+	.long _sys_dup3</div><div class='add'>+	.long _sys_pipe2</div><div class='add'>+	.long _sys_inotify_init1	/* 365 */</div><div class='ctx'> </div><div class='ctx'> 	.rept NR_syscalls-(.-_sys_call_table)/4</div><div class='ctx'> 	.long _sys_ni_syscall</div><div class='head'>diff --git a/arch/blackfin/mach-common/head.S b/arch/blackfin/mach-common/head.S<br/>new file mode 100644<br/>index 000000000000..191b4e974c4b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/head.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/head.S</a></div><div class='hunk'>@@ -0,0 +1,207 @@</div><div class='add'>+/*</div><div class='add'>+ * Common Blackfin startup code</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2004-2008 Analog Devices Inc.</div><div class='add'>+ *</div><div class='add'>+ * Enter bugs at http://blackfin.uclinux.org/</div><div class='add'>+ *</div><div class='add'>+ * Licensed under the GPL-2 or later.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;asm/blackfin.h&gt;</div><div class='add'>+#include &lt;asm/thread_info.h&gt;</div><div class='add'>+#include &lt;asm/trace.h&gt;</div><div class='add'>+</div><div class='add'>+__INIT</div><div class='add'>+</div><div class='add'>+#define INITIAL_STACK	(L1_SCRATCH_START + L1_SCRATCH_LENGTH - 12)</div><div class='add'>+</div><div class='add'>+ENTRY(__start)</div><div class='add'>+	/* R0: argument of command line string, passed from uboot, save it */</div><div class='add'>+	R7 = R0;</div><div class='add'>+	/* Enable Cycle Counter and Nesting Of Interrupts */</div><div class='add'>+#ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES</div><div class='add'>+	R0 = SYSCFG_SNEN;</div><div class='add'>+#else</div><div class='add'>+	R0 = SYSCFG_SNEN | SYSCFG_CCEN;</div><div class='add'>+#endif</div><div class='add'>+	SYSCFG = R0;</div><div class='add'>+	R0 = 0;</div><div class='add'>+</div><div class='add'>+	/* Clear Out All the data and pointer Registers */</div><div class='add'>+	R1 = R0;</div><div class='add'>+	R2 = R0;</div><div class='add'>+	R3 = R0;</div><div class='add'>+	R4 = R0;</div><div class='add'>+	R5 = R0;</div><div class='add'>+	R6 = R0;</div><div class='add'>+</div><div class='add'>+	P0 = R0;</div><div class='add'>+	P1 = R0;</div><div class='add'>+	P2 = R0;</div><div class='add'>+	P3 = R0;</div><div class='add'>+	P4 = R0;</div><div class='add'>+	P5 = R0;</div><div class='add'>+</div><div class='add'>+	LC0 = r0;</div><div class='add'>+	LC1 = r0;</div><div class='add'>+	L0 = r0;</div><div class='add'>+	L1 = r0;</div><div class='add'>+	L2 = r0;</div><div class='add'>+	L3 = r0;</div><div class='add'>+</div><div class='add'>+	/* Clear Out All the DAG Registers */</div><div class='add'>+	B0 = r0;</div><div class='add'>+	B1 = r0;</div><div class='add'>+	B2 = r0;</div><div class='add'>+	B3 = r0;</div><div class='add'>+</div><div class='add'>+	I0 = r0;</div><div class='add'>+	I1 = r0;</div><div class='add'>+	I2 = r0;</div><div class='add'>+	I3 = r0;</div><div class='add'>+</div><div class='add'>+	M0 = r0;</div><div class='add'>+	M1 = r0;</div><div class='add'>+	M2 = r0;</div><div class='add'>+	M3 = r0;</div><div class='add'>+</div><div class='add'>+	trace_buffer_init(p0,r0);</div><div class='add'>+	P0 = R1;</div><div class='add'>+	R0 = R1;</div><div class='add'>+</div><div class='add'>+	/* Turn off the icache */</div><div class='add'>+	p0.l = LO(IMEM_CONTROL);</div><div class='add'>+	p0.h = HI(IMEM_CONTROL);</div><div class='add'>+	R1 = [p0];</div><div class='add'>+	R0 = ~ENICPLB;</div><div class='add'>+	R0 = R0 &amp; R1;</div><div class='add'>+	[p0] = R0;</div><div class='add'>+	SSYNC;</div><div class='add'>+</div><div class='add'>+	/* Turn off the dcache */</div><div class='add'>+	p0.l = LO(DMEM_CONTROL);</div><div class='add'>+	p0.h = HI(DMEM_CONTROL);</div><div class='add'>+	R1 = [p0];</div><div class='add'>+	R0 = ~ENDCPLB;</div><div class='add'>+	R0 = R0 &amp; R1;</div><div class='add'>+	[p0] = R0;</div><div class='add'>+	SSYNC;</div><div class='add'>+</div><div class='add'>+	/* Save RETX, in case of doublefault */</div><div class='add'>+	p0.l = ___retx;</div><div class='add'>+	p0.h = ___retx;</div><div class='add'>+	R0 = RETX;</div><div class='add'>+	[P0] = R0;</div><div class='add'>+</div><div class='add'>+	/* Initialize stack pointer */</div><div class='add'>+	sp.l = lo(INITIAL_STACK);</div><div class='add'>+	sp.h = hi(INITIAL_STACK);</div><div class='add'>+	fp = sp;</div><div class='add'>+	usp = sp;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_EARLY_PRINTK</div><div class='add'>+	call _init_early_exception_vectors;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */</div><div class='add'>+	call _bf53x_relocate_l1_mem;</div><div class='add'>+#ifdef CONFIG_BFIN_KERNEL_CLOCK</div><div class='add'>+	call _start_dma_code;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* This section keeps the processor in supervisor mode</div><div class='add'>+	 * during kernel boot.  Switches to user mode at end of boot.</div><div class='add'>+	 * See page 3-9 of Hardware Reference manual for documentation.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* EVT15 = _real_start */</div><div class='add'>+</div><div class='add'>+	p0.l = lo(EVT15);</div><div class='add'>+	p0.h = hi(EVT15);</div><div class='add'>+	p1.l = _real_start;</div><div class='add'>+	p1.h = _real_start;</div><div class='add'>+	[p0] = p1;</div><div class='add'>+	csync;</div><div class='add'>+</div><div class='add'>+	p0.l = lo(IMASK);</div><div class='add'>+	p0.h = hi(IMASK);</div><div class='add'>+	p1.l = IMASK_IVG15;</div><div class='add'>+	p1.h = 0x0;</div><div class='add'>+	[p0] = p1;</div><div class='add'>+	csync;</div><div class='add'>+</div><div class='add'>+	raise 15;</div><div class='add'>+	p0.l = .LWAIT_HERE;</div><div class='add'>+	p0.h = .LWAIT_HERE;</div><div class='add'>+	reti = p0;</div><div class='add'>+#if ANOMALY_05000281</div><div class='add'>+	nop; nop; nop;</div><div class='add'>+#endif</div><div class='add'>+	rti;</div><div class='add'>+</div><div class='add'>+.LWAIT_HERE:</div><div class='add'>+	jump .LWAIT_HERE;</div><div class='add'>+ENDPROC(__start)</div><div class='add'>+</div><div class='add'>+/* A little BF561 glue ... */</div><div class='add'>+#ifndef WDOG_CTL</div><div class='add'>+# define WDOG_CTL WDOGA_CTL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+ENTRY(_real_start)</div><div class='add'>+	/* Enable nested interrupts */</div><div class='add'>+	[--sp] = reti;</div><div class='add'>+</div><div class='add'>+	/* watchdog off for now */</div><div class='add'>+	p0.l = lo(WDOG_CTL);</div><div class='add'>+	p0.h = hi(WDOG_CTL);</div><div class='add'>+	r0 = 0xAD6(z);</div><div class='add'>+	w[p0] = r0;</div><div class='add'>+	ssync;</div><div class='add'>+</div><div class='add'>+	/* Zero out the bss region</div><div class='add'>+	 * Note: this will fail if bss is 0 bytes ...</div><div class='add'>+	 */</div><div class='add'>+	r0 = 0 (z);</div><div class='add'>+	r1.l = ___bss_start;</div><div class='add'>+	r1.h = ___bss_start;</div><div class='add'>+	r2.l = ___bss_stop;</div><div class='add'>+	r2.h = ___bss_stop;</div><div class='add'>+	r2 = r2 - r1;</div><div class='add'>+	r2 &gt;&gt;= 2;</div><div class='add'>+	p1 = r1;</div><div class='add'>+	p2 = r2;</div><div class='add'>+	lsetup (.L_clear_bss, .L_clear_bss) lc0 = p2;</div><div class='add'>+.L_clear_bss:</div><div class='add'>+	[p1++] = r0;</div><div class='add'>+</div><div class='add'>+	/* In case there is a NULL pointer reference,</div><div class='add'>+	 * zero out region before stext</div><div class='add'>+	 */</div><div class='add'>+	p1 = r0;</div><div class='add'>+	r2.l = __stext;</div><div class='add'>+	r2.h = __stext;</div><div class='add'>+	r2 &gt;&gt;= 2;</div><div class='add'>+	p2 = r2;</div><div class='add'>+	lsetup (.L_clear_zero, .L_clear_zero) lc0 = p2;</div><div class='add'>+.L_clear_zero:</div><div class='add'>+	[p1++] = r0;</div><div class='add'>+</div><div class='add'>+	/* Pass the u-boot arguments to the global value command line */</div><div class='add'>+	R0 = R7;</div><div class='add'>+	call _cmdline_init;</div><div class='add'>+</div><div class='add'>+	/* Load the current thread pointer and stack */</div><div class='add'>+	sp.l = _init_thread_union;</div><div class='add'>+	sp.h = _init_thread_union;</div><div class='add'>+	p1 = THREAD_SIZE (z);</div><div class='add'>+	sp = sp + p1;</div><div class='add'>+	usp = sp;</div><div class='add'>+	fp = sp;</div><div class='add'>+	jump.l _start_kernel;</div><div class='add'>+ENDPROC(_real_start)</div><div class='add'>+</div><div class='add'>+__FINIT</div><div class='head'>diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S<br/>index 7f752c87fe46..b27e59d32401 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/interrupt.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-common/interrupt.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/interrupt.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/interrupt.S</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='del'>-#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+#include &lt;mach/irq.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/entry.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach-common/context.S&gt;</div><div class='add'>+#include &lt;asm/context.S&gt;</div><div class='ctx'> </div><div class='ctx'> .extern _ret_from_exception</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c<br/>index 64d746114e4b..5fa536727c61 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/ints-priority.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-common/ints-priority.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/ints-priority.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/ints-priority.c</a></div><div class='hunk'>@@ -71,6 +71,7 @@ atomic_t num_spurious;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> unsigned long bfin_sic_iwr[3];	/* Up to 3 SIC_IWRx registers */</div><div class='add'>+unsigned vr_wakeup;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct ivgx {</div><div class='hunk'>@@ -184,17 +185,56 @@ static void bfin_internal_unmask_irq(unsigned int irq)</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> int bfin_internal_set_wake(unsigned int irq, unsigned int state)</div><div class='ctx'> {</div><div class='del'>-	unsigned bank, bit;</div><div class='add'>+	unsigned bank, bit, wakeup = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	bank = SIC_SYSIRQ(irq) / 32;</div><div class='ctx'> 	bit = SIC_SYSIRQ(irq) % 32;</div><div class='ctx'> </div><div class='add'>+	switch (irq) {</div><div class='add'>+#ifdef IRQ_RTC</div><div class='add'>+	case IRQ_RTC:</div><div class='add'>+	wakeup |= WAKE;</div><div class='add'>+	break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef IRQ_CAN0_RX</div><div class='add'>+	case IRQ_CAN0_RX:</div><div class='add'>+	wakeup |= CANWE;</div><div class='add'>+	break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef IRQ_CAN1_RX</div><div class='add'>+	case IRQ_CAN1_RX:</div><div class='add'>+	wakeup |= CANWE;</div><div class='add'>+	break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef IRQ_USB_INT0</div><div class='add'>+	case IRQ_USB_INT0:</div><div class='add'>+	wakeup |= USBWE;</div><div class='add'>+	break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef IRQ_KEY</div><div class='add'>+	case IRQ_KEY:</div><div class='add'>+	wakeup |= KPADWE;</div><div class='add'>+	break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_BF54x</div><div class='add'>+	case IRQ_CNT:</div><div class='add'>+	wakeup |= ROTWE;</div><div class='add'>+	break;</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+	break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='del'>-	if (state)</div><div class='add'>+	if (state) {</div><div class='ctx'> 		bfin_sic_iwr[bank] |= (1 &lt;&lt; bit);</div><div class='del'>-	else</div><div class='add'>+		vr_wakeup  |= wakeup;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='ctx'> 		bfin_sic_iwr[bank] &amp;= ~(1 &lt;&lt; bit);</div><div class='add'>+		vr_wakeup  &amp;= ~wakeup;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> </div><div class='hunk'>@@ -943,6 +983,11 @@ int __init init_arch_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> </div><div class='add'>+#if (defined(CONFIG_BF537) || defined(CONFIG_BF536))</div><div class='add'>+	/* Clear EMAC Interrupt Status bits so we can demux it later */</div><div class='add'>+	bfin_write_EMAC_SYSTAT(-1);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BF54x</div><div class='ctx'> # ifdef CONFIG_PINTx_REASSIGN</div><div class='ctx'> 	pint[0]-&gt;assign = CONFIG_PINT0_ASSIGN;</div><div class='hunk'>@@ -1028,13 +1073,22 @@ int __init init_arch_irq(void)</div><div class='ctx'> 	    IMASK_IVG10 | IMASK_IVG9 | IMASK_IVG8 | IMASK_IVG7 | IMASK_IVGHW;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_BF54x) || defined(CONFIG_BF52x) || defined(CONFIG_BF561)</div><div class='del'>-	bfin_write_SIC_IWR0(IWR_ENABLE_ALL);</div><div class='del'>-	bfin_write_SIC_IWR1(IWR_ENABLE_ALL);</div><div class='add'>+	bfin_write_SIC_IWR0(IWR_DISABLE_ALL);</div><div class='add'>+#if defined(CONFIG_BF52x)</div><div class='add'>+	/* BF52x system reset does not properly reset SIC_IWR1 which</div><div class='add'>+	 * will screw up the bootrom as it relies on MDMA0/1 waking it</div><div class='add'>+	 * up from IDLE instructions.  See this report for more info:</div><div class='add'>+	 * http://blackfin.uclinux.org/gf/tracker/4323</div><div class='add'>+	 */</div><div class='add'>+	bfin_write_SIC_IWR1(IWR_ENABLE(10) | IWR_ENABLE(11));</div><div class='add'>+#else</div><div class='add'>+	bfin_write_SIC_IWR1(IWR_DISABLE_ALL);</div><div class='add'>+#endif</div><div class='ctx'> # ifdef CONFIG_BF54x</div><div class='del'>-	bfin_write_SIC_IWR2(IWR_ENABLE_ALL);</div><div class='add'>+	bfin_write_SIC_IWR2(IWR_DISABLE_ALL);</div><div class='ctx'> # endif</div><div class='ctx'> #else</div><div class='del'>-	bfin_write_SIC_IWR(IWR_ENABLE_ALL);</div><div class='add'>+	bfin_write_SIC_IWR(IWR_DISABLE_ALL);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/blackfin/mach-common/lock.S b/arch/blackfin/mach-common/lock.S<br/>index 30b887e67dd6..9daf01201e9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/lock.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-common/lock.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/lock.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/lock.S</a></div><div class='hunk'>@@ -28,13 +28,10 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;asm/cplb.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='ctx'> </div><div class='ctx'> .text</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BFIN_ICACHE_LOCK</div><div class='del'>-</div><div class='ctx'> /* When you come here, it is assumed that</div><div class='ctx'>  * R0 - Which way to be locked</div><div class='ctx'>  */</div><div class='hunk'>@@ -189,18 +186,38 @@ ENTRY(_cache_lock)</div><div class='ctx'> 	RTS;</div><div class='ctx'> ENDPROC(_cache_lock)</div><div class='ctx'> </div><div class='del'>-#endif	/* BFIN_ICACHE_LOCK */</div><div class='del'>-</div><div class='del'>-/* Return the ILOC bits of IMEM_CONTROL</div><div class='add'>+/* Invalidate the Entire Instruction cache by</div><div class='add'>+ * disabling IMC bit</div><div class='ctx'>  */</div><div class='add'>+ENTRY(_invalidate_entire_icache)</div><div class='add'>+	[--SP] = ( R7:5);</div><div class='ctx'> </div><div class='del'>-ENTRY(_read_iloc)</div><div class='del'>-	P1.H = HI(IMEM_CONTROL);</div><div class='del'>-	P1.L = LO(IMEM_CONTROL);</div><div class='del'>-	R1 = 0xF;</div><div class='del'>-	R0 = [P1];</div><div class='del'>-	R0 = R0 &gt;&gt; 3;</div><div class='del'>-	R0 = R0 &amp; R1;</div><div class='add'>+	P0.L = LO(IMEM_CONTROL);</div><div class='add'>+	P0.H = HI(IMEM_CONTROL);</div><div class='add'>+	R7 = [P0];</div><div class='add'>+</div><div class='add'>+	/* Clear the IMC bit , All valid bits in the instruction</div><div class='add'>+	 * cache are set to the invalid state</div><div class='add'>+	 */</div><div class='add'>+	BITCLR(R7,IMC_P);</div><div class='add'>+	CLI R6;</div><div class='add'>+	SSYNC;		/* SSYNC required before invalidating cache. */</div><div class='add'>+	.align 8;</div><div class='add'>+	[P0] = R7;</div><div class='add'>+	SSYNC;</div><div class='add'>+	STI R6;</div><div class='add'>+</div><div class='add'>+	/* Configures the instruction cache agian */</div><div class='add'>+	R6 = (IMC | ENICPLB);</div><div class='add'>+	R7 = R7 | R6;</div><div class='add'>+</div><div class='add'>+	CLI R6;</div><div class='add'>+	SSYNC;		/* SSYNC required before writing to IMEM_CONTROL. */</div><div class='add'>+	.align 8;</div><div class='add'>+	[P0] = R7;</div><div class='add'>+	SSYNC;</div><div class='add'>+	STI R6;</div><div class='ctx'> </div><div class='add'>+	( R7:5) = [SP++];</div><div class='ctx'> 	RTS;</div><div class='del'>-ENDPROC(_read_iloc)</div><div class='add'>+ENDPROC(_invalidate_entire_icache)</div><div class='head'>diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c<br/>index 4fe6a2366b13..e28c6af1f415 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mach-common/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mach-common/pm.c</a></div><div class='hunk'>@@ -83,13 +83,22 @@ void bfin_pm_suspend_standby_enter(void)</div><div class='ctx'> 	bfin_pm_standby_restore();</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_BF54x) || defined(CONFIG_BF52x)  || defined(CONFIG_BF561)</div><div class='del'>-	bfin_write_SIC_IWR0(IWR_ENABLE_ALL);</div><div class='del'>-	bfin_write_SIC_IWR1(IWR_ENABLE_ALL);</div><div class='add'>+	bfin_write_SIC_IWR0(IWR_DISABLE_ALL);</div><div class='add'>+#if defined(CONFIG_BF52x)</div><div class='add'>+	/* BF52x system reset does not properly reset SIC_IWR1 which</div><div class='add'>+	 * will screw up the bootrom as it relies on MDMA0/1 waking it</div><div class='add'>+	 * up from IDLE instructions.  See this report for more info:</div><div class='add'>+	 * http://blackfin.uclinux.org/gf/tracker/4323</div><div class='add'>+	 */</div><div class='add'>+	bfin_write_SIC_IWR1(IWR_ENABLE(10) | IWR_ENABLE(11));</div><div class='add'>+#else</div><div class='add'>+	bfin_write_SIC_IWR1(IWR_DISABLE_ALL);</div><div class='add'>+#endif</div><div class='ctx'> # ifdef CONFIG_BF54x</div><div class='del'>-	bfin_write_SIC_IWR2(IWR_ENABLE_ALL);</div><div class='add'>+	bfin_write_SIC_IWR2(IWR_DISABLE_ALL);</div><div class='ctx'> # endif</div><div class='ctx'> #else</div><div class='del'>-	bfin_write_SIC_IWR(IWR_ENABLE_ALL);</div><div class='add'>+	bfin_write_SIC_IWR(IWR_DISABLE_ALL);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='hunk'>@@ -229,28 +238,12 @@ int bfin_pm_suspend_mem_enter(void)</div><div class='ctx'> 	wakeup = bfin_read_VR_CTL() &amp; ~FREQ;</div><div class='ctx'> 	wakeup |= SCKELOW;</div><div class='ctx'> </div><div class='del'>-	/* FIXME: merge this somehow with set_irq_wake */</div><div class='del'>-#ifdef CONFIG_PM_BFIN_WAKE_RTC</div><div class='del'>-	wakeup |= WAKE;</div><div class='del'>-#endif</div><div class='ctx'> #ifdef CONFIG_PM_BFIN_WAKE_PH6</div><div class='ctx'> 	wakeup |= PHYWE;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_PM_BFIN_WAKE_CAN</div><div class='del'>-	wakeup |= CANWE;</div><div class='del'>-#endif</div><div class='ctx'> #ifdef CONFIG_PM_BFIN_WAKE_GP</div><div class='ctx'> 	wakeup |= GPWE;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_PM_BFIN_WAKE_USB</div><div class='del'>-	wakeup |= USBWE;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_PM_BFIN_WAKE_KEYPAD</div><div class='del'>-	wakeup |= KPADWE;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_PM_BFIN_WAKE_ROTARY</div><div class='del'>-	wakeup |= ROTWE;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='hunk'>@@ -268,7 +261,7 @@ int bfin_pm_suspend_mem_enter(void)</div><div class='ctx'> 	icache_disable();</div><div class='ctx'> 	bf53x_suspend_l1_mem(memptr);</div><div class='ctx'> </div><div class='del'>-	do_hibernate(wakeup);	/* Goodbye */</div><div class='add'>+	do_hibernate(wakeup | vr_wakeup);	/* Goodbye */</div><div class='ctx'> </div><div class='ctx'> 	bf53x_resume_l1_mem(memptr);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mm/blackfin_sram.c b/arch/blackfin/mm/blackfin_sram.c<br/>index 5af3c31c9365..4f5e887a0d96 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mm/blackfin_sram.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/blackfin/mm/blackfin_sram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mm/blackfin_sram.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/blackfin/mm/blackfin_sram.c</a></div><div class='hunk'>@@ -66,7 +66,7 @@ static struct sram_piece free_l1_data_B_sram_head, used_l1_data_B_sram_head;</div><div class='ctx'> static struct sram_piece free_l1_inst_sram_head, used_l1_inst_sram_head;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef L2_LENGTH</div><div class='add'>+#if L2_LENGTH != 0</div><div class='ctx'> static struct sram_piece free_l2_sram_head, used_l2_sram_head;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -175,7 +175,7 @@ static void __init l1_inst_sram_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __init l2_sram_init(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef L2_LENGTH</div><div class='add'>+#if L2_LENGTH != 0</div><div class='ctx'> 	free_l2_sram_head.next =</div><div class='ctx'> 		kmem_cache_alloc(sram_piece_cache, GFP_KERNEL);</div><div class='ctx'> 	if (!free_l2_sram_head.next) {</div><div class='hunk'>@@ -335,7 +335,7 @@ static int _sram_free(const void *addr,</div><div class='ctx'> 		plast-&gt;size += pavail-&gt;size;</div><div class='ctx'> 		kmem_cache_free(sram_piece_cache, pavail);</div><div class='ctx'> 	} else {</div><div class='del'>-		pavail-&gt;next = plast;</div><div class='add'>+		pavail-&gt;next = plast-&gt;next;</div><div class='ctx'> 		plast-&gt;next = pavail;</div><div class='ctx'> 		plast = pavail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -367,7 +367,7 @@ int sram_free(const void *addr)</div><div class='ctx'> 		 &amp;&amp; addr &lt; (void *)(L1_DATA_B_START + L1_DATA_B_LENGTH))</div><div class='ctx'> 		return l1_data_B_sram_free(addr);</div><div class='ctx'> #endif</div><div class='del'>-#ifdef L2_LENGTH</div><div class='add'>+#if L2_LENGTH != 0</div><div class='ctx'> 	else if (addr &gt;= (void *)L2_START</div><div class='ctx'> 		 &amp;&amp; addr &lt; (void *)(L2_START + L2_LENGTH))</div><div class='ctx'> 		return l2_sram_free(addr);</div><div class='hunk'>@@ -379,7 +379,7 @@ EXPORT_SYMBOL(sram_free);</div><div class='ctx'> </div><div class='ctx'> void *l1_data_A_sram_alloc(size_t size)</div><div class='ctx'> {</div><div class='del'>-	unsigned flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	void *addr = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* add mutex operation */</div><div class='hunk'>@@ -402,7 +402,7 @@ EXPORT_SYMBOL(l1_data_A_sram_alloc);</div><div class='ctx'> </div><div class='ctx'> int l1_data_A_sram_free(const void *addr)</div><div class='ctx'> {</div><div class='del'>-	unsigned flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* add mutex operation */</div><div class='hunk'>@@ -425,7 +425,7 @@ EXPORT_SYMBOL(l1_data_A_sram_free);</div><div class='ctx'> void *l1_data_B_sram_alloc(size_t size)</div><div class='ctx'> {</div><div class='ctx'> #if L1_DATA_B_LENGTH != 0</div><div class='del'>-	unsigned flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	void *addr;</div><div class='ctx'> </div><div class='ctx'> 	/* add mutex operation */</div><div class='hunk'>@@ -450,7 +450,7 @@ EXPORT_SYMBOL(l1_data_B_sram_alloc);</div><div class='ctx'> int l1_data_B_sram_free(const void *addr)</div><div class='ctx'> {</div><div class='ctx'> #if L1_DATA_B_LENGTH != 0</div><div class='del'>-	unsigned flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* add mutex operation */</div><div class='hunk'>@@ -504,7 +504,7 @@ EXPORT_SYMBOL(l1_data_sram_free);</div><div class='ctx'> void *l1_inst_sram_alloc(size_t size)</div><div class='ctx'> {</div><div class='ctx'> #if L1_CODE_LENGTH != 0</div><div class='del'>-	unsigned flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	void *addr;</div><div class='ctx'> </div><div class='ctx'> 	/* add mutex operation */</div><div class='hunk'>@@ -529,7 +529,7 @@ EXPORT_SYMBOL(l1_inst_sram_alloc);</div><div class='ctx'> int l1_inst_sram_free(const void *addr)</div><div class='ctx'> {</div><div class='ctx'> #if L1_CODE_LENGTH != 0</div><div class='del'>-	unsigned flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* add mutex operation */</div><div class='hunk'>@@ -551,7 +551,7 @@ EXPORT_SYMBOL(l1_inst_sram_free);</div><div class='ctx'> /* L1 Scratchpad memory allocate function */</div><div class='ctx'> void *l1sram_alloc(size_t size)</div><div class='ctx'> {</div><div class='del'>-	unsigned flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	void *addr;</div><div class='ctx'> </div><div class='ctx'> 	/* add mutex operation */</div><div class='hunk'>@@ -569,7 +569,7 @@ void *l1sram_alloc(size_t size)</div><div class='ctx'> /* L1 Scratchpad memory allocate function */</div><div class='ctx'> void *l1sram_alloc_max(size_t *psize)</div><div class='ctx'> {</div><div class='del'>-	unsigned flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	void *addr;</div><div class='ctx'> </div><div class='ctx'> 	/* add mutex operation */</div><div class='hunk'>@@ -587,7 +587,7 @@ void *l1sram_alloc_max(size_t *psize)</div><div class='ctx'> /* L1 Scratchpad memory free function */</div><div class='ctx'> int l1sram_free(const void *addr)</div><div class='ctx'> {</div><div class='del'>-	unsigned flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* add mutex operation */</div><div class='hunk'>@@ -604,8 +604,8 @@ int l1sram_free(const void *addr)</div><div class='ctx'> </div><div class='ctx'> void *l2_sram_alloc(size_t size)</div><div class='ctx'> {</div><div class='del'>-#ifdef L2_LENGTH</div><div class='del'>-	unsigned flags;</div><div class='add'>+#if L2_LENGTH != 0</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	void *addr;</div><div class='ctx'> </div><div class='ctx'> 	/* add mutex operation */</div><div class='hunk'>@@ -640,8 +640,8 @@ EXPORT_SYMBOL(l2_sram_zalloc);</div><div class='ctx'> </div><div class='ctx'> int l2_sram_free(const void *addr)</div><div class='ctx'> {</div><div class='del'>-#ifdef L2_LENGTH</div><div class='del'>-	unsigned flags;</div><div class='add'>+#if L2_LENGTH != 0</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* add mutex operation */</div><div class='hunk'>@@ -779,7 +779,7 @@ static int sram_proc_read(char *buf, char **start, off_t offset, int count,</div><div class='ctx'> 			&amp;free_l1_inst_sram_head, &amp;used_l1_inst_sram_head))</div><div class='ctx'> 		goto not_done;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef L2_LENGTH</div><div class='add'>+#if L2_LENGTH != 0</div><div class='ctx'> 	if (_sram_proc_read(buf, &amp;len, count, "L2",</div><div class='ctx'> 			&amp;free_l2_sram_head, &amp;used_l2_sram_head))</div><div class='ctx'> 		goto not_done;</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/fasttimer.c b/arch/cris/arch-v32/kernel/fasttimer.c<br/>index 2de9d5849ef0..111caa1a2efb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/fasttimer.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/cris/arch-v32/kernel/fasttimer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/fasttimer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/cris/arch-v32/kernel/fasttimer.c</a></div><div class='hunk'>@@ -19,8 +19,6 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;hwregs/reg_map.h&gt;</div><div class='ctx'> #include &lt;hwregs/reg_rdwr.h&gt;</div><div class='ctx'> #include &lt;hwregs/timer_defs.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S<br/>index b8a4b94779b1..99060ab507ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/entry.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/frv/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/frv/kernel/entry.S</a></div><div class='hunk'>@@ -1519,6 +1519,11 @@ sys_call_table:</div><div class='ctx'> 	.long sys_fallocate</div><div class='ctx'> 	.long sys_timerfd_settime	/* 325 */</div><div class='ctx'> 	.long sys_timerfd_gettime</div><div class='del'>-</div><div class='add'>+	.long sys_signalfd4</div><div class='add'>+	.long sys_eventfd2</div><div class='add'>+	.long sys_epoll_create1</div><div class='add'>+	.long sys_dup3			/* 330 */</div><div class='add'>+	.long sys_pipe2</div><div class='add'>+	.long sys_inotify_init1</div><div class='ctx'> </div><div class='ctx'> syscall_table_size = (. - sys_call_table)</div><div class='head'>diff --git a/include/asm-h8300/Kbuild b/arch/h8300/include/asm/Kbuild<br/>index c68e1680da01..c68e1680da01 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/Kbuild?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/Kbuild</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/Kbuild</a></div><div class='head'>diff --git a/include/asm-h8300/a.out.h b/arch/h8300/include/asm/a.out.h<br/>index ded780f0a492..ded780f0a492 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/a.out.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/a.out.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/a.out.h</a></div><div class='head'>diff --git a/include/asm-h8300/atomic.h b/arch/h8300/include/asm/atomic.h<br/>index b4cf0ea97ede..b4cf0ea97ede 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/atomic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/atomic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/atomic.h</a></div><div class='head'>diff --git a/include/asm-h8300/auxvec.h b/arch/h8300/include/asm/auxvec.h<br/>index 1d36fe38b088..1d36fe38b088 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/auxvec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/auxvec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/auxvec.h</a></div><div class='head'>diff --git a/include/asm-h8300/bitops.h b/arch/h8300/include/asm/bitops.h<br/>index cb18e3b0aa94..cb18e3b0aa94 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/bitops.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/bitops.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/bitops.h</a></div><div class='head'>diff --git a/include/asm-h8300/bootinfo.h b/arch/h8300/include/asm/bootinfo.h<br/>index 5bed7e7aac0a..5bed7e7aac0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/bootinfo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/bootinfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/bootinfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/bootinfo.h</a></div><div class='head'>diff --git a/include/asm-h8300/bug.h b/arch/h8300/include/asm/bug.h<br/>index edddf5b086e5..edddf5b086e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/bug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/bug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/bug.h</a></div><div class='head'>diff --git a/include/asm-h8300/bugs.h b/arch/h8300/include/asm/bugs.h<br/>index 1cb4afba6eb1..1cb4afba6eb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/bugs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/bugs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/bugs.h</a></div><div class='head'>diff --git a/include/asm-h8300/byteorder.h b/arch/h8300/include/asm/byteorder.h<br/>index 36e597d61619..36e597d61619 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/byteorder.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/byteorder.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/byteorder.h</a></div><div class='head'>diff --git a/include/asm-h8300/cache.h b/arch/h8300/include/asm/cache.h<br/>index c6350283649d..c6350283649d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/cache.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/cache.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/cache.h</a></div><div class='head'>diff --git a/include/asm-h8300/cachectl.h b/arch/h8300/include/asm/cachectl.h<br/>index c464022d8e26..c464022d8e26 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/cachectl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/cachectl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/cachectl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/cachectl.h</a></div><div class='head'>diff --git a/include/asm-h8300/cacheflush.h b/arch/h8300/include/asm/cacheflush.h<br/>index 5ffdca217b95..5ffdca217b95 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/cacheflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/cacheflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/cacheflush.h</a></div><div class='head'>diff --git a/include/asm-h8300/checksum.h b/arch/h8300/include/asm/checksum.h<br/>index 98724e12508c..98724e12508c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/checksum.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/checksum.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/checksum.h</a></div><div class='head'>diff --git a/include/asm-h8300/cputime.h b/arch/h8300/include/asm/cputime.h<br/>index 092e187c7b08..092e187c7b08 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/cputime.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/cputime.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/cputime.h</a></div><div class='head'>diff --git a/include/asm-h8300/current.h b/arch/h8300/include/asm/current.h<br/>index 57d74ee55a14..57d74ee55a14 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/current.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/current.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/current.h</a></div><div class='head'>diff --git a/include/asm-h8300/dbg.h b/arch/h8300/include/asm/dbg.h<br/>index 2c6d1cbcf736..2c6d1cbcf736 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/dbg.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/dbg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/dbg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/dbg.h</a></div><div class='head'>diff --git a/include/asm-h8300/delay.h b/arch/h8300/include/asm/delay.h<br/>index 743beba70f82..743beba70f82 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/delay.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/delay.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/delay.h</a></div><div class='head'>diff --git a/include/asm-h8300/device.h b/arch/h8300/include/asm/device.h<br/>index d8f9872b0e2d..d8f9872b0e2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/device.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/device.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/device.h</a></div><div class='head'>diff --git a/include/asm-h8300/div64.h b/arch/h8300/include/asm/div64.h<br/>index 6cd978cefb28..6cd978cefb28 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/div64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/div64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/div64.h</a></div><div class='head'>diff --git a/include/asm-h8300/dma.h b/arch/h8300/include/asm/dma.h<br/>index 3edbaaaedf5b..3edbaaaedf5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/dma.h</a></div><div class='head'>diff --git a/include/asm-h8300/elf.h b/arch/h8300/include/asm/elf.h<br/>index a8b57d1f4128..a8b57d1f4128 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/elf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/elf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/elf.h</a></div><div class='head'>diff --git a/include/asm-h8300/emergency-restart.h b/arch/h8300/include/asm/emergency-restart.h<br/>index 108d8c48e42e..108d8c48e42e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/emergency-restart.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/emergency-restart.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/emergency-restart.h</a></div><div class='head'>diff --git a/include/asm-h8300/errno.h b/arch/h8300/include/asm/errno.h<br/>index 0c2f5641fdcc..0c2f5641fdcc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/errno.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/errno.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/errno.h</a></div><div class='head'>diff --git a/include/asm-h8300/fb.h b/arch/h8300/include/asm/fb.h<br/>index c7df38030992..c7df38030992 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/fb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/fb.h</a></div><div class='head'>diff --git a/include/asm-h8300/fcntl.h b/arch/h8300/include/asm/fcntl.h<br/>index 1952cb2e3b06..1952cb2e3b06 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/fcntl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/fcntl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/fcntl.h</a></div><div class='head'>diff --git a/include/asm-h8300/flat.h b/arch/h8300/include/asm/flat.h<br/>index 2a873508a9a1..2a873508a9a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/flat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/flat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/flat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/flat.h</a></div><div class='head'>diff --git a/include/asm-h8300/fpu.h b/arch/h8300/include/asm/fpu.h<br/>index 4fc416e80bef..4fc416e80bef 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/fpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/fpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/fpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/fpu.h</a></div><div class='head'>diff --git a/include/asm-h8300/futex.h b/arch/h8300/include/asm/futex.h<br/>index 6a332a9f099c..6a332a9f099c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/futex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/futex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/futex.h</a></div><div class='head'>diff --git a/include/asm-h8300/gpio.h b/arch/h8300/include/asm/gpio.h<br/>index a714f0c0efbc..a714f0c0efbc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/gpio.h</a></div><div class='head'>diff --git a/include/asm-h8300/hardirq.h b/arch/h8300/include/asm/hardirq.h<br/>index 9d7f7a7462b2..9d7f7a7462b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/hardirq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/hardirq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/hardirq.h</a></div><div class='head'>diff --git a/include/asm-h8300/hw_irq.h b/arch/h8300/include/asm/hw_irq.h<br/>index d75a5a1119e8..d75a5a1119e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/hw_irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/hw_irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/hw_irq.h</a></div><div class='head'>diff --git a/include/asm-h8300/io.h b/arch/h8300/include/asm/io.h<br/>index 26dc6ccd9441..26dc6ccd9441 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/io.h</a></div><div class='head'>diff --git a/include/asm-h8300/ioctl.h b/arch/h8300/include/asm/ioctl.h<br/>index b279fe06dfe5..b279fe06dfe5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/ioctl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/ioctl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/ioctl.h</a></div><div class='head'>diff --git a/include/asm-h8300/ioctls.h b/arch/h8300/include/asm/ioctls.h<br/>index 98a53d067269..98a53d067269 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/ioctls.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/ioctls.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/ioctls.h</a></div><div class='head'>diff --git a/include/asm-h8300/ipcbuf.h b/arch/h8300/include/asm/ipcbuf.h<br/>index 2cd1ebcc109d..2cd1ebcc109d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/ipcbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/ipcbuf.h</a></div><div class='head'>diff --git a/include/asm-h8300/irq.h b/arch/h8300/include/asm/irq.h<br/>index 13d7c601cd0a..13d7c601cd0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/irq.h</a></div><div class='head'>diff --git a/include/asm-h8300/irq_regs.h b/arch/h8300/include/asm/irq_regs.h<br/>index 3dd9c0b70270..3dd9c0b70270 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/irq_regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/irq_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/irq_regs.h</a></div><div class='head'>diff --git a/include/asm-h8300/kdebug.h b/arch/h8300/include/asm/kdebug.h<br/>index 6ece1b037665..6ece1b037665 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/kdebug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/kdebug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/kdebug.h</a></div><div class='head'>diff --git a/include/asm-h8300/kmap_types.h b/arch/h8300/include/asm/kmap_types.h<br/>index 1ec8a3427120..1ec8a3427120 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/kmap_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/kmap_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/kmap_types.h</a></div><div class='head'>diff --git a/include/asm-h8300/linkage.h b/arch/h8300/include/asm/linkage.h<br/>index 6f4df7d46180..6f4df7d46180 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/linkage.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/linkage.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/linkage.h</a></div><div class='head'>diff --git a/include/asm-h8300/local.h b/arch/h8300/include/asm/local.h<br/>index fdd4efe437cd..fdd4efe437cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/local.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/local.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/local.h</a></div><div class='head'>diff --git a/include/asm-h8300/mc146818rtc.h b/arch/h8300/include/asm/mc146818rtc.h<br/>index ab9d9646d241..ab9d9646d241 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/mc146818rtc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/mc146818rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/mc146818rtc.h</a></div><div class='head'>diff --git a/include/asm-h8300/md.h b/arch/h8300/include/asm/md.h<br/>index 1a47dc6691fb..1a47dc6691fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/md.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/md.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/md.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/md.h</a></div><div class='head'>diff --git a/include/asm-h8300/mman.h b/arch/h8300/include/asm/mman.h<br/>index b9f104f22a36..b9f104f22a36 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/mman.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/mman.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/mman.h</a></div><div class='head'>diff --git a/include/asm-h8300/mmu.h b/arch/h8300/include/asm/mmu.h<br/>index 2ce06ea46104..2ce06ea46104 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/mmu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/mmu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/mmu.h</a></div><div class='head'>diff --git a/include/asm-h8300/mmu_context.h b/arch/h8300/include/asm/mmu_context.h<br/>index f44b730da54d..f44b730da54d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/mmu_context.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/mmu_context.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/mmu_context.h</a></div><div class='head'>diff --git a/include/asm-h8300/module.h b/arch/h8300/include/asm/module.h<br/>index de23231f3196..de23231f3196 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/module.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/module.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/module.h</a></div><div class='head'>diff --git a/include/asm-h8300/msgbuf.h b/arch/h8300/include/asm/msgbuf.h<br/>index 6b148cd09aa5..6b148cd09aa5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/msgbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/msgbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/msgbuf.h</a></div><div class='head'>diff --git a/include/asm-h8300/mutex.h b/arch/h8300/include/asm/mutex.h<br/>index 458c1f7fbc18..458c1f7fbc18 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/mutex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/mutex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/mutex.h</a></div><div class='head'>diff --git a/include/asm-h8300/page.h b/arch/h8300/include/asm/page.h<br/>index 0b6acf0b03aa..0b6acf0b03aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/page.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/page.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/page.h</a></div><div class='head'>diff --git a/include/asm-h8300/page_offset.h b/arch/h8300/include/asm/page_offset.h<br/>index f8706463008c..f8706463008c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/page_offset.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/page_offset.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/page_offset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/page_offset.h</a></div><div class='head'>diff --git a/include/asm-h8300/param.h b/arch/h8300/include/asm/param.h<br/>index 1c72fb8080ff..1c72fb8080ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/param.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/param.h</a></div><div class='head'>diff --git a/include/asm-h8300/pci.h b/arch/h8300/include/asm/pci.h<br/>index 97389b35aa35..97389b35aa35 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/pci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/pci.h</a></div><div class='head'>diff --git a/include/asm-h8300/percpu.h b/arch/h8300/include/asm/percpu.h<br/>index 72c03e3666d8..72c03e3666d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/percpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/percpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/percpu.h</a></div><div class='head'>diff --git a/include/asm-h8300/pgalloc.h b/arch/h8300/include/asm/pgalloc.h<br/>index c2e89a286d23..c2e89a286d23 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/pgalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/pgalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/pgalloc.h</a></div><div class='head'>diff --git a/include/asm-h8300/pgtable.h b/arch/h8300/include/asm/pgtable.h<br/>index a09230a08e02..a09230a08e02 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/pgtable.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/pgtable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/pgtable.h</a></div><div class='head'>diff --git a/include/asm-h8300/poll.h b/arch/h8300/include/asm/poll.h<br/>index f61540c22d94..f61540c22d94 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/poll.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/poll.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/poll.h</a></div><div class='head'>diff --git a/include/asm-h8300/posix_types.h b/arch/h8300/include/asm/posix_types.h<br/>index 5c553927fc53..5c553927fc53 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/posix_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/posix_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/posix_types.h</a></div><div class='head'>diff --git a/include/asm-h8300/processor.h b/arch/h8300/include/asm/processor.h<br/>index 69e8a34eb6d5..69e8a34eb6d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/processor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/processor.h</a></div><div class='head'>diff --git a/include/asm-h8300/ptrace.h b/arch/h8300/include/asm/ptrace.h<br/>index c2e05e4b512e..c2e05e4b512e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/ptrace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/ptrace.h</a></div><div class='head'>diff --git a/include/asm-h8300/regs267x.h b/arch/h8300/include/asm/regs267x.h<br/>index 1bff731a9f77..1bff731a9f77 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/regs267x.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/regs267x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/regs267x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/regs267x.h</a></div><div class='head'>diff --git a/include/asm-h8300/regs306x.h b/arch/h8300/include/asm/regs306x.h<br/>index 027dd633fa25..027dd633fa25 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/regs306x.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/regs306x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/regs306x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/regs306x.h</a></div><div class='head'>diff --git a/include/asm-h8300/resource.h b/arch/h8300/include/asm/resource.h<br/>index 46c5f4391607..46c5f4391607 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/resource.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/resource.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/resource.h</a></div><div class='head'>diff --git a/include/asm-h8300/scatterlist.h b/arch/h8300/include/asm/scatterlist.h<br/>index d3ecdd87ac90..d3ecdd87ac90 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/scatterlist.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/scatterlist.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/scatterlist.h</a></div><div class='head'>diff --git a/include/asm-h8300/sections.h b/arch/h8300/include/asm/sections.h<br/>index a81743e8b743..a81743e8b743 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/sections.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/sections.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/sections.h</a></div><div class='head'>diff --git a/include/asm-h8300/segment.h b/arch/h8300/include/asm/segment.h<br/>index b79a82d0f99d..b79a82d0f99d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/segment.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/segment.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/segment.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/segment.h</a></div><div class='head'>diff --git a/include/asm-h8300/sembuf.h b/arch/h8300/include/asm/sembuf.h<br/>index e04a3ec0cb92..e04a3ec0cb92 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/sembuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/sembuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/sembuf.h</a></div><div class='head'>diff --git a/include/asm-h8300/setup.h b/arch/h8300/include/asm/setup.h<br/>index e2c600e96733..e2c600e96733 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/setup.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/setup.h</a></div><div class='head'>diff --git a/include/asm-h8300/sh_bios.h b/arch/h8300/include/asm/sh_bios.h<br/>index b6bb6e58295c..b6bb6e58295c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/sh_bios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/sh_bios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/sh_bios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/sh_bios.h</a></div><div class='head'>diff --git a/include/asm-h8300/shm.h b/arch/h8300/include/asm/shm.h<br/>index ed6623c0545d..ed6623c0545d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/shm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/shm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/shm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/shm.h</a></div><div class='head'>diff --git a/include/asm-h8300/shmbuf.h b/arch/h8300/include/asm/shmbuf.h<br/>index 64e77993a7a9..64e77993a7a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/shmbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/shmbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/shmbuf.h</a></div><div class='head'>diff --git a/include/asm-h8300/shmparam.h b/arch/h8300/include/asm/shmparam.h<br/>index d1863953ec64..d1863953ec64 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/shmparam.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/shmparam.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/shmparam.h</a></div><div class='head'>diff --git a/include/asm-h8300/sigcontext.h b/arch/h8300/include/asm/sigcontext.h<br/>index e4b81505f8f8..e4b81505f8f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/sigcontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/sigcontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/sigcontext.h</a></div><div class='head'>diff --git a/include/asm-h8300/siginfo.h b/arch/h8300/include/asm/siginfo.h<br/>index bc8fbea931a5..bc8fbea931a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/siginfo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/siginfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/siginfo.h</a></div><div class='head'>diff --git a/include/asm-h8300/signal.h b/arch/h8300/include/asm/signal.h<br/>index 7bc15048a64f..7bc15048a64f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/signal.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/signal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/signal.h</a></div><div class='head'>diff --git a/include/asm-h8300/smp.h b/arch/h8300/include/asm/smp.h<br/>index 9e9bd7e58922..9e9bd7e58922 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/smp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/smp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/smp.h</a></div><div class='head'>diff --git a/include/asm-h8300/socket.h b/arch/h8300/include/asm/socket.h<br/>index da2520dbf254..da2520dbf254 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/socket.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/socket.h</a></div><div class='head'>diff --git a/include/asm-h8300/sockios.h b/arch/h8300/include/asm/sockios.h<br/>index e9c7ec810c23..e9c7ec810c23 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/sockios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/sockios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/sockios.h</a></div><div class='head'>diff --git a/include/asm-h8300/spinlock.h b/arch/h8300/include/asm/spinlock.h<br/>index d5407fa173e4..d5407fa173e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/spinlock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/spinlock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/spinlock.h</a></div><div class='head'>diff --git a/include/asm-h8300/stat.h b/arch/h8300/include/asm/stat.h<br/>index 62c3cc24dfe6..62c3cc24dfe6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/stat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/stat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/stat.h</a></div><div class='head'>diff --git a/include/asm-h8300/statfs.h b/arch/h8300/include/asm/statfs.h<br/>index b96efa712aac..b96efa712aac 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/statfs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/statfs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/statfs.h</a></div><div class='head'>diff --git a/include/asm-h8300/string.h b/arch/h8300/include/asm/string.h<br/>index ca5034897d87..ca5034897d87 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/string.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/string.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/string.h</a></div><div class='head'>diff --git a/include/asm-h8300/system.h b/arch/h8300/include/asm/system.h<br/>index 4b8e475908ae..4b8e475908ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/system.h</a></div><div class='head'>diff --git a/include/asm-h8300/target_time.h b/arch/h8300/include/asm/target_time.h<br/>index 9f2a9aa1fe6f..9f2a9aa1fe6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/target_time.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/target_time.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/target_time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/target_time.h</a></div><div class='head'>diff --git a/include/asm-h8300/termbits.h b/arch/h8300/include/asm/termbits.h<br/>index 31eca81db3f7..31eca81db3f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/termbits.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/termbits.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/termbits.h</a></div><div class='head'>diff --git a/include/asm-h8300/termios.h b/arch/h8300/include/asm/termios.h<br/>index 70eea64b4213..70eea64b4213 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/termios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/termios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/termios.h</a></div><div class='head'>diff --git a/include/asm-h8300/thread_info.h b/arch/h8300/include/asm/thread_info.h<br/>index aafd4d322ec3..aafd4d322ec3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/thread_info.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/thread_info.h</a></div><div class='head'>diff --git a/include/asm-h8300/timex.h b/arch/h8300/include/asm/timex.h<br/>index 23e67013439f..23e67013439f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/timex.h</a></div><div class='head'>diff --git a/include/asm-h8300/tlb.h b/arch/h8300/include/asm/tlb.h<br/>index 3dea80ad9e6f..3dea80ad9e6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/tlb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/tlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/tlb.h</a></div><div class='head'>diff --git a/include/asm-h8300/tlbflush.h b/arch/h8300/include/asm/tlbflush.h<br/>index 41c148a9208e..41c148a9208e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/tlbflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/tlbflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/tlbflush.h</a></div><div class='head'>diff --git a/include/asm-h8300/topology.h b/arch/h8300/include/asm/topology.h<br/>index fdc121924d4c..fdc121924d4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/topology.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/topology.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/topology.h</a></div><div class='head'>diff --git a/include/asm-h8300/traps.h b/arch/h8300/include/asm/traps.h<br/>index 41cf6be02f68..41cf6be02f68 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/traps.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/traps.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/traps.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/traps.h</a></div><div class='head'>diff --git a/include/asm-h8300/types.h b/arch/h8300/include/asm/types.h<br/>index 12875190b156..12875190b156 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/types.h</a></div><div class='head'>diff --git a/include/asm-h8300/uaccess.h b/arch/h8300/include/asm/uaccess.h<br/>index 356068cd0879..356068cd0879 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/uaccess.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/uaccess.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/uaccess.h</a></div><div class='head'>diff --git a/include/asm-h8300/ucontext.h b/arch/h8300/include/asm/ucontext.h<br/>index 0bcf8f85fab9..0bcf8f85fab9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/ucontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/ucontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/ucontext.h</a></div><div class='head'>diff --git a/include/asm-h8300/unaligned.h b/arch/h8300/include/asm/unaligned.h<br/>index b8d06c70c2da..b8d06c70c2da 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/unaligned.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/unaligned.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/unaligned.h</a></div><div class='head'>diff --git a/include/asm-h8300/unistd.h b/arch/h8300/include/asm/unistd.h<br/>index 99f3c3561ecb..99f3c3561ecb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/unistd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/unistd.h</a></div><div class='head'>diff --git a/include/asm-h8300/user.h b/arch/h8300/include/asm/user.h<br/>index 14a9e18950f1..14a9e18950f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/user.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/user.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/user.h</a></div><div class='head'>diff --git a/include/asm-h8300/virtconvert.h b/arch/h8300/include/asm/virtconvert.h<br/>index 19cfd62b11c3..19cfd62b11c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-h8300/virtconvert.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-h8300/virtconvert.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/virtconvert.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/include/asm/virtconvert.h</a></div><div class='head'>diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c<br/>index a1d228f5e4e6..9942f24aff9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/mm/init.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/h8300/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/mm/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/h8300/mm/init.c</a></div><div class='hunk'>@@ -40,9 +40,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-extern void die_if_kernel(char *,struct pt_regs *,long);</div><div class='del'>-extern void free_initmem(void);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * BAD_PAGE is the page that is used for page faults when linux</div><div class='ctx'>  * is out-of-memory. Older versions of linux just did a</div><div class='hunk'>@@ -73,7 +70,7 @@ extern unsigned long memory_end;</div><div class='ctx'>  * The parameters are pointers to where to stick the starting and ending</div><div class='ctx'>  * addresses of available kernel virtual memory.</div><div class='ctx'>  */</div><div class='del'>-void paging_init(void)</div><div class='add'>+void __init paging_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure start_mem is page aligned,  otherwise bootmem and</div><div class='hunk'>@@ -122,7 +119,7 @@ void paging_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mem_init(void)</div><div class='add'>+void __init mem_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int codek = 0, datak = 0, initk = 0;</div><div class='ctx'> 	/* DAVIDM look at setup memory map generically with reserved area */</div><div class='hunk'>@@ -178,7 +175,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void</div><div class='del'>-free_initmem()</div><div class='add'>+free_initmem(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_RAMKERNEL</div><div class='ctx'> 	unsigned long addr;</div><div class='head'>diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig<br/>index 451f2ffb137b..48e496fe1e75 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/Kconfig</a></div><div class='hunk'>@@ -171,8 +171,8 @@ config IA64_SGI_SN2</div><div class='ctx'> 	  to select this option.  If in doubt, select ia64 generic support</div><div class='ctx'> 	  instead.</div><div class='ctx'> </div><div class='del'>-config IA64_SGI_UV`</div><div class='del'>-	bool "SGI-UV`"</div><div class='add'>+config IA64_SGI_UV</div><div class='add'>+	bool "SGI-UV"</div><div class='ctx'> 	select NUMA</div><div class='ctx'> 	select ACPI_NUMA</div><div class='ctx'> 	select SWIOTLB</div><div class='hunk'>@@ -321,10 +321,10 @@ config SMP</div><div class='ctx'> 	  If you don't know what to do here, say N.</div><div class='ctx'> </div><div class='ctx'> config NR_CPUS</div><div class='del'>-	int "Maximum number of CPUs (2-1024)"</div><div class='del'>-	range 2 1024</div><div class='add'>+	int "Maximum number of CPUs (2-4096)"</div><div class='add'>+	range 2 4096</div><div class='ctx'> 	depends on SMP</div><div class='del'>-	default "1024"</div><div class='add'>+	default "4096"</div><div class='ctx'> 	help</div><div class='ctx'> 	  You should set this to the number of CPUs in your system, but</div><div class='ctx'> 	  keep in mind that a kernel compiled for, e.g., 2 CPUs will boot but</div><div class='head'>diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig<br/>index 0210545e7f61..9f483976228f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/configs/generic_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/configs/generic_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/configs/generic_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/configs/generic_defconfig</a></div><div class='hunk'>@@ -1,20 +1,16 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.22</div><div class='del'>-# Thu Jul 19 13:55:32 2007</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Mon Aug  4 15:38:01 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Code maturity level options</div><div class='add'>+# General setup</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXPERIMENTAL=y</div><div class='ctx'> CONFIG_LOCK_KERNEL=y</div><div class='ctx'> CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# General setup</div><div class='del'>-#</div><div class='ctx'> CONFIG_LOCALVERSION=""</div><div class='ctx'> CONFIG_LOCALVERSION_AUTO=y</div><div class='ctx'> CONFIG_SWAP=y</div><div class='hunk'>@@ -23,20 +19,34 @@ CONFIG_SYSVIPC_SYSCTL=y</div><div class='ctx'> CONFIG_POSIX_MQUEUE=y</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT is not set</div><div class='ctx'> # CONFIG_TASKSTATS is not set</div><div class='del'>-# CONFIG_USER_NS is not set</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> CONFIG_IKCONFIG=y</div><div class='ctx'> CONFIG_IKCONFIG_PROC=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=20</div><div class='del'>-# CONFIG_CPUSETS is not set</div><div class='add'>+CONFIG_CGROUPS=y</div><div class='add'>+# CONFIG_CGROUP_DEBUG is not set</div><div class='add'>+# CONFIG_CGROUP_NS is not set</div><div class='add'>+# CONFIG_CGROUP_DEVICE is not set</div><div class='add'>+CONFIG_CPUSETS=y</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='add'>+# CONFIG_CGROUP_CPUACCT is not set</div><div class='add'>+# CONFIG_RESOURCE_COUNTERS is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+CONFIG_PROC_PID_CPUSET=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_IPC_NS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='ctx'> CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -44,6 +54,7 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_ANON_INODES=y</div><div class='hunk'>@@ -53,12 +64,30 @@ CONFIG_TIMERFD=y</div><div class='ctx'> CONFIG_EVENTFD=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLUB_DEBUG=y</div><div class='add'>+# CONFIG_SLAB is not set</div><div class='ctx'> CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+CONFIG_HAVE_DMA_ATTRS=y</div><div class='add'>+CONFIG_USE_GENERIC_SMP_HELPERS=y</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> CONFIG_MODVERSIONS=y</div><div class='hunk'>@@ -68,6 +97,8 @@ CONFIG_STOP_MACHINE=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='add'>+CONFIG_BLOCK_COMPAT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -81,6 +112,7 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_CFQ is not set</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Processor type and features</div><div class='hunk'>@@ -91,22 +123,28 @@ CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_QUICKLIST=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='ctx'> CONFIG_SWIOTLB=y</div><div class='add'>+CONFIG_IOMMU_HELPER=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='add'>+CONFIG_HAVE_SETUP_PER_CPU_AREA=y</div><div class='ctx'> CONFIG_DMI=y</div><div class='ctx'> CONFIG_EFI=y</div><div class='ctx'> CONFIG_GENERIC_IOMAP=y</div><div class='ctx'> CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_IA64_UNCACHED_ALLOCATOR=y</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_IA64_GENERIC=y</div><div class='ctx'> # CONFIG_IA64_DIG is not set</div><div class='ctx'> # CONFIG_IA64_HP_ZX1 is not set</div><div class='ctx'> # CONFIG_IA64_HP_ZX1_SWIOTLB is not set</div><div class='ctx'> # CONFIG_IA64_SGI_SN2 is not set</div><div class='add'>+# CONFIG_IA64_SGI_UV is not set</div><div class='ctx'> # CONFIG_IA64_HP_SIM is not set</div><div class='ctx'> # CONFIG_ITANIUM is not set</div><div class='ctx'> CONFIG_MCKINLEY=y</div><div class='hunk'>@@ -116,22 +154,26 @@ CONFIG_MCKINLEY=y</div><div class='ctx'> CONFIG_IA64_PAGE_SIZE_64KB=y</div><div class='ctx'> CONFIG_PGTABLE_3=y</div><div class='ctx'> # CONFIG_PGTABLE_4 is not set</div><div class='add'>+CONFIG_HZ=250</div><div class='ctx'> # CONFIG_HZ_100 is not set</div><div class='ctx'> CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='del'>-CONFIG_HZ=250</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='ctx'> CONFIG_IA64_L1_CACHE_SHIFT=7</div><div class='ctx'> CONFIG_IA64_CYCLONE=y</div><div class='ctx'> CONFIG_IOSAPIC=y</div><div class='del'>-# CONFIG_IA64_SGI_SN_XP is not set</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=17</div><div class='add'>+# CONFIG_VIRT_CPU_ACCOUNTING is not set</div><div class='ctx'> CONFIG_SMP=y</div><div class='del'>-CONFIG_NR_CPUS=512</div><div class='add'>+CONFIG_NR_CPUS=4096</div><div class='ctx'> CONFIG_HOTPLUG_CPU=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='ctx'> # CONFIG_SCHED_SMT is not set</div><div class='ctx'> # CONFIG_PERMIT_BSP_REMOVE is not set</div><div class='add'>+CONFIG_PREEMPT_NONE=y</div><div class='add'>+# CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> # CONFIG_FLATMEM_MANUAL is not set</div><div class='hunk'>@@ -141,6 +183,8 @@ CONFIG_DISCONTIGMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> CONFIG_NEED_MULTIPLE_NODES=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='hunk'>@@ -148,6 +192,7 @@ CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_NR_QUICK=1</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_MMU_NOTIFIER=y</div><div class='ctx'> CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_ARCH_DISCONTIGMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='hunk'>@@ -162,12 +207,14 @@ CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y</div><div class='ctx'> CONFIG_HAVE_ARCH_NODEDATA_EXTENSION=y</div><div class='ctx'> CONFIG_IA32_SUPPORT=y</div><div class='ctx'> CONFIG_COMPAT=y</div><div class='add'>+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y</div><div class='ctx'> CONFIG_IA64_MCA_RECOVERY=y</div><div class='ctx'> CONFIG_PERFMON=y</div><div class='ctx'> CONFIG_IA64_PALINFO=y</div><div class='ctx'> # CONFIG_IA64_MC_ERR_INJECT is not set</div><div class='ctx'> CONFIG_SGI_SN=y</div><div class='ctx'> # CONFIG_IA64_ESI is not set</div><div class='add'>+# CONFIG_IA64_HP_AML_NFW is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SN Devices</div><div class='hunk'>@@ -179,6 +226,7 @@ CONFIG_CRASH_DUMP=y</div><div class='ctx'> #</div><div class='ctx'> # Firmware Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_MEMMAP is not set</div><div class='ctx'> CONFIG_EFI_VARS=y</div><div class='ctx'> CONFIG_EFI_PCDP=y</div><div class='ctx'> CONFIG_DMIID=y</div><div class='hunk'>@@ -189,24 +237,25 @@ CONFIG_BINFMT_MISC=m</div><div class='ctx'> # Power management and ACPI</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PM=y</div><div class='del'>-CONFIG_PM_LEGACY=y</div><div class='ctx'> # CONFIG_PM_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ACPI (Advanced Configuration and Power Interface) Support</div><div class='del'>-#</div><div class='ctx'> CONFIG_ACPI=y</div><div class='ctx'> CONFIG_ACPI_PROCFS=y</div><div class='add'>+CONFIG_ACPI_PROCFS_POWER=y</div><div class='add'>+CONFIG_ACPI_SYSFS_POWER=y</div><div class='add'>+CONFIG_ACPI_PROC_EVENT=y</div><div class='ctx'> CONFIG_ACPI_BUTTON=m</div><div class='ctx'> CONFIG_ACPI_FAN=m</div><div class='del'>-# CONFIG_ACPI_DOCK is not set</div><div class='add'>+CONFIG_ACPI_DOCK=y</div><div class='add'>+# CONFIG_ACPI_BAY is not set</div><div class='ctx'> CONFIG_ACPI_PROCESSOR=m</div><div class='ctx'> CONFIG_ACPI_HOTPLUG_CPU=y</div><div class='ctx'> CONFIG_ACPI_THERMAL=m</div><div class='ctx'> CONFIG_ACPI_NUMA=y</div><div class='add'>+# CONFIG_ACPI_CUSTOM_DSDT is not set</div><div class='ctx'> CONFIG_ACPI_BLACKLIST_YEAR=0</div><div class='ctx'> # CONFIG_ACPI_DEBUG is not set</div><div class='ctx'> CONFIG_ACPI_EC=y</div><div class='add'>+# CONFIG_ACPI_PCI_SLOT is not set</div><div class='ctx'> CONFIG_ACPI_POWER=y</div><div class='ctx'> CONFIG_ACPI_SYSTEM=y</div><div class='ctx'> CONFIG_ACPI_CONTAINER=m</div><div class='hunk'>@@ -225,6 +274,7 @@ CONFIG_PCI_SYSCALL=y</div><div class='ctx'> # CONFIG_PCIEPORTBUS is not set</div><div class='ctx'> CONFIG_ARCH_SUPPORTS_MSI=y</div><div class='ctx'> # CONFIG_PCI_MSI is not set</div><div class='add'>+CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCI_DEBUG is not set</div><div class='ctx'> CONFIG_HOTPLUG_PCI=m</div><div class='ctx'> # CONFIG_HOTPLUG_PCI_FAKE is not set</div><div class='hunk'>@@ -233,15 +283,7 @@ CONFIG_HOTPLUG_PCI_ACPI=m</div><div class='ctx'> # CONFIG_HOTPLUG_PCI_CPCI is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI_SHPC is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI_SGI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCCARD (PCMCIA/CardBus) support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -254,6 +296,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> # CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_MULTICAST=y</div><div class='hunk'>@@ -273,6 +316,7 @@ CONFIG_SYN_COOKIES=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+CONFIG_INET_LRO=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -280,8 +324,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -298,10 +340,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_LAPB is not set</div><div class='ctx'> # CONFIG_ECONET is not set</div><div class='ctx'> # CONFIG_WAN_ROUTER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# QoS and/or fair queueing</div><div class='del'>-#</div><div class='ctx'> # CONFIG_NET_SCHED is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -309,6 +347,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_PKTGEN is not set</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='ctx'> # CONFIG_IRDA is not set</div><div class='ctx'> # CONFIG_BT is not set</div><div class='ctx'> # CONFIG_AF_RXRPC is not set</div><div class='hunk'>@@ -330,13 +369,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> #</div><div class='ctx'> # Generic Driver Options</div><div class='ctx'> #</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='del'>-# CONFIG_CONNECTOR is not set</div><div class='add'>+CONFIG_CONNECTOR=y</div><div class='add'>+CONFIG_PROC_EVENTS=y</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_PNP=y</div><div class='hunk'>@@ -360,25 +403,35 @@ CONFIG_BLK_DEV_NBD=m</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='del'>-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> CONFIG_SGI_IOC4=y</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+CONFIG_SGI_XP=m</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='add'>+CONFIG_SGI_GRU=m</div><div class='add'>+# CONFIG_SGI_GRU_DEBUG is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='ctx'> CONFIG_IDE_MAX_HWIFS=4</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Please see Documentation/ide.txt for help/info on IDE drives</div><div class='add'>+# Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_TIMINGS=y</div><div class='add'>+CONFIG_IDE_ATAPI=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDECD=y</div><div class='add'>+CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDETAPE is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEFLOPPY=y</div><div class='ctx'> CONFIG_BLK_DEV_IDESCSI=m</div><div class='hunk'>@@ -390,25 +443,26 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_IDE_GENERIC is not set</div><div class='add'>+# CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDEPNP is not set</div><div class='add'>+CONFIG_BLK_DEV_IDEDMA_SFF=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI IDE chipsets support</div><div class='add'>+#</div><div class='ctx'> CONFIG_BLK_DEV_IDEPCI=y</div><div class='del'>-CONFIG_IDEPCI_SHARE_IRQ=y</div><div class='ctx'> CONFIG_IDEPCI_PCIBUS_ORDER=y</div><div class='ctx'> # CONFIG_BLK_DEV_OFFBOARD is not set</div><div class='ctx'> CONFIG_BLK_DEV_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_OPTI621 is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='del'>-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set</div><div class='del'>-# CONFIG_IDEDMA_ONLYDISK is not set</div><div class='ctx'> # CONFIG_BLK_DEV_AEC62XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_ALI15X3 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> CONFIG_BLK_DEV_CMD64X=y</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -425,10 +479,7 @@ CONFIG_BLK_DEV_SGIIOC4=y</div><div class='ctx'> # CONFIG_BLK_DEV_TRM290 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_VIA82CXXX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TC86C001 is not set</div><div class='del'>-# CONFIG_IDE_ARM is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_IDEDMA_IVB is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -468,10 +519,8 @@ CONFIG_SCSI_FC_ATTRS=y</div><div class='ctx'> # CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='ctx'> CONFIG_SCSI_SAS_ATTRS=y</div><div class='ctx'> # CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SCSI low-level drivers</div><div class='del'>-#</div><div class='add'>+# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_ISCSI_TCP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_3W_XXXX_RAID is not set</div><div class='ctx'> # CONFIG_SCSI_3W_9XXX is not set</div><div class='hunk'>@@ -481,6 +530,8 @@ CONFIG_SCSI_SAS_ATTRS=y</div><div class='ctx'> # CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='ctx'> # CONFIG_SCSI_AIC79XX is not set</div><div class='ctx'> # CONFIG_SCSI_AIC94XX is not set</div><div class='add'>+# CONFIG_SCSI_DPT_I2O is not set</div><div class='add'>+# CONFIG_SCSI_ADVANSYS is not set</div><div class='ctx'> # CONFIG_SCSI_ARCMSR is not set</div><div class='ctx'> # CONFIG_MEGARAID_NEWGEN is not set</div><div class='ctx'> # CONFIG_MEGARAID_LEGACY is not set</div><div class='hunk'>@@ -491,12 +542,14 @@ CONFIG_SCSI_SAS_ATTRS=y</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='ctx'> # CONFIG_SCSI_INITIO is not set</div><div class='ctx'> # CONFIG_SCSI_INIA100 is not set</div><div class='add'>+# CONFIG_SCSI_MVSAS is not set</div><div class='ctx'> # CONFIG_SCSI_STEX is not set</div><div class='ctx'> CONFIG_SCSI_SYM53C8XX_2=y</div><div class='ctx'> CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1</div><div class='ctx'> CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16</div><div class='ctx'> CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64</div><div class='ctx'> CONFIG_SCSI_SYM53C8XX_MMIO=y</div><div class='add'>+# CONFIG_SCSI_IPR is not set</div><div class='ctx'> CONFIG_SCSI_QLOGIC_1280=y</div><div class='ctx'> # CONFIG_SCSI_QLA_FC is not set</div><div class='ctx'> # CONFIG_SCSI_QLA_ISCSI is not set</div><div class='hunk'>@@ -505,7 +558,68 @@ CONFIG_SCSI_QLOGIC_1280=y</div><div class='ctx'> # CONFIG_SCSI_DC390T is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='del'>-# CONFIG_ATA is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_ATA_NONSTANDARD=y</div><div class='add'>+CONFIG_ATA_ACPI=y</div><div class='add'>+CONFIG_SATA_PMP=y</div><div class='add'>+# CONFIG_SATA_AHCI is not set</div><div class='add'>+# CONFIG_SATA_SIL24 is not set</div><div class='add'>+CONFIG_ATA_SFF=y</div><div class='add'>+# CONFIG_SATA_SVW is not set</div><div class='add'>+CONFIG_ATA_PIIX=y</div><div class='add'>+# CONFIG_SATA_MV is not set</div><div class='add'>+# CONFIG_SATA_NV is not set</div><div class='add'>+# CONFIG_PDC_ADMA is not set</div><div class='add'>+# CONFIG_SATA_QSTOR is not set</div><div class='add'>+# CONFIG_SATA_PROMISE is not set</div><div class='add'>+# CONFIG_SATA_SX4 is not set</div><div class='add'>+# CONFIG_SATA_SIL is not set</div><div class='add'>+# CONFIG_SATA_SIS is not set</div><div class='add'>+# CONFIG_SATA_ULI is not set</div><div class='add'>+# CONFIG_SATA_VIA is not set</div><div class='add'>+# CONFIG_SATA_VITESSE is not set</div><div class='add'>+# CONFIG_SATA_INIC162X is not set</div><div class='add'>+# CONFIG_PATA_ACPI is not set</div><div class='add'>+# CONFIG_PATA_ALI is not set</div><div class='add'>+# CONFIG_PATA_AMD is not set</div><div class='add'>+# CONFIG_PATA_ARTOP is not set</div><div class='add'>+# CONFIG_PATA_ATIIXP is not set</div><div class='add'>+# CONFIG_PATA_CMD640_PCI is not set</div><div class='add'>+# CONFIG_PATA_CMD64X is not set</div><div class='add'>+# CONFIG_PATA_CS5520 is not set</div><div class='add'>+# CONFIG_PATA_CS5530 is not set</div><div class='add'>+# CONFIG_PATA_CYPRESS is not set</div><div class='add'>+# CONFIG_PATA_EFAR is not set</div><div class='add'>+# CONFIG_ATA_GENERIC is not set</div><div class='add'>+# CONFIG_PATA_HPT366 is not set</div><div class='add'>+# CONFIG_PATA_HPT37X is not set</div><div class='add'>+# CONFIG_PATA_HPT3X2N is not set</div><div class='add'>+# CONFIG_PATA_HPT3X3 is not set</div><div class='add'>+# CONFIG_PATA_IT821X is not set</div><div class='add'>+# CONFIG_PATA_IT8213 is not set</div><div class='add'>+# CONFIG_PATA_JMICRON is not set</div><div class='add'>+# CONFIG_PATA_TRIFLEX is not set</div><div class='add'>+# CONFIG_PATA_MARVELL is not set</div><div class='add'>+# CONFIG_PATA_MPIIX is not set</div><div class='add'>+# CONFIG_PATA_OLDPIIX is not set</div><div class='add'>+# CONFIG_PATA_NETCELL is not set</div><div class='add'>+# CONFIG_PATA_NINJA32 is not set</div><div class='add'>+# CONFIG_PATA_NS87410 is not set</div><div class='add'>+# CONFIG_PATA_NS87415 is not set</div><div class='add'>+# CONFIG_PATA_OPTI is not set</div><div class='add'>+# CONFIG_PATA_OPTIDMA is not set</div><div class='add'>+# CONFIG_PATA_PDC_OLD is not set</div><div class='add'>+# CONFIG_PATA_RADISYS is not set</div><div class='add'>+# CONFIG_PATA_RZ1000 is not set</div><div class='add'>+# CONFIG_PATA_SC1200 is not set</div><div class='add'>+# CONFIG_PATA_SERVERWORKS is not set</div><div class='add'>+# CONFIG_PATA_PDC2027X is not set</div><div class='add'>+# CONFIG_PATA_SIL680 is not set</div><div class='add'>+# CONFIG_PATA_SIS is not set</div><div class='add'>+# CONFIG_PATA_VIA is not set</div><div class='add'>+# CONFIG_PATA_WINBOND is not set</div><div class='add'>+# CONFIG_PATA_SCH is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='hunk'>@@ -522,36 +636,52 @@ CONFIG_DM_SNAPSHOT=m</div><div class='ctx'> CONFIG_DM_MIRROR=m</div><div class='ctx'> CONFIG_DM_ZERO=m</div><div class='ctx'> CONFIG_DM_MULTIPATH=m</div><div class='del'>-# CONFIG_DM_MULTIPATH_EMC is not set</div><div class='del'>-# CONFIG_DM_MULTIPATH_RDAC is not set</div><div class='ctx'> # CONFIG_DM_DELAY is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Fusion MPT device support</div><div class='del'>-#</div><div class='add'>+# CONFIG_DM_UEVENT is not set</div><div class='ctx'> CONFIG_FUSION=y</div><div class='ctx'> CONFIG_FUSION_SPI=y</div><div class='ctx'> CONFIG_FUSION_FC=m</div><div class='ctx'> CONFIG_FUSION_SAS=y</div><div class='ctx'> CONFIG_FUSION_MAX_SGE=128</div><div class='ctx'> # CONFIG_FUSION_CTL is not set</div><div class='add'>+# CONFIG_FUSION_LOGGING is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='add'>+# CONFIG_VETH is not set</div><div class='ctx'> # CONFIG_NET_SB1000 is not set</div><div class='ctx'> # CONFIG_ARCNET is not set</div><div class='del'>-# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+# CONFIG_VITESSE_PHY is not set</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='add'>+# CONFIG_BROADCOM_PHY is not set</div><div class='add'>+# CONFIG_ICPLUS_PHY is not set</div><div class='add'>+# CONFIG_REALTEK_PHY is not set</div><div class='add'>+# CONFIG_FIXED_PHY is not set</div><div class='add'>+# CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=m</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='hunk'>@@ -569,13 +699,16 @@ CONFIG_TULIP=m</div><div class='ctx'> # CONFIG_DM9102 is not set</div><div class='ctx'> # CONFIG_ULI526X is not set</div><div class='ctx'> # CONFIG_HP100 is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='ctx'> CONFIG_NET_PCI=y</div><div class='ctx'> # CONFIG_PCNET32 is not set</div><div class='ctx'> # CONFIG_AMD8111_ETH is not set</div><div class='ctx'> # CONFIG_ADAPTEC_STARFIRE is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='ctx'> # CONFIG_FORCEDETH is not set</div><div class='del'>-# CONFIG_DGRS is not set</div><div class='ctx'> CONFIG_EEPRO100=m</div><div class='ctx'> CONFIG_E100=m</div><div class='ctx'> # CONFIG_FEALNX is not set</div><div class='hunk'>@@ -583,17 +716,22 @@ CONFIG_E100=m</div><div class='ctx'> # CONFIG_NE2K_PCI is not set</div><div class='ctx'> # CONFIG_8139CP is not set</div><div class='ctx'> # CONFIG_8139TOO is not set</div><div class='add'>+# CONFIG_R6040 is not set</div><div class='ctx'> # CONFIG_SIS900 is not set</div><div class='ctx'> # CONFIG_EPIC100 is not set</div><div class='ctx'> # CONFIG_SUNDANCE is not set</div><div class='add'>+# CONFIG_TLAN is not set</div><div class='ctx'> # CONFIG_VIA_RHINE is not set</div><div class='ctx'> # CONFIG_SC92031 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_ACENIC is not set</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> CONFIG_E1000=y</div><div class='del'>-# CONFIG_E1000_NAPI is not set</div><div class='ctx'> # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set</div><div class='add'>+# CONFIG_E1000E is not set</div><div class='add'>+# CONFIG_IP1000 is not set</div><div class='add'>+CONFIG_IGB=y</div><div class='add'>+# CONFIG_IGB_LRO is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='ctx'> # CONFIG_HAMACHI is not set</div><div class='ctx'> # CONFIG_YELLOWFIN is not set</div><div class='hunk'>@@ -606,14 +744,20 @@ CONFIG_TIGON3=y</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='add'>+# CONFIG_IXGBE is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='ctx'> # CONFIG_MYRI10GE is not set</div><div class='ctx'> # CONFIG_NETXEN_NIC is not set</div><div class='add'>+# CONFIG_NIU is not set</div><div class='ctx'> # CONFIG_MLX4_CORE is not set</div><div class='add'>+# CONFIG_TEHUTI is not set</div><div class='add'>+# CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -621,6 +765,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Network Adapters</div><div class='hunk'>@@ -629,7 +774,6 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_USB_KAWETH is not set</div><div class='ctx'> # CONFIG_USB_PEGASUS is not set</div><div class='ctx'> # CONFIG_USB_RTL8150 is not set</div><div class='del'>-# CONFIG_USB_USBNET_MII is not set</div><div class='ctx'> # CONFIG_USB_USBNET is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='hunk'>@@ -637,8 +781,8 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='ctx'> # CONFIG_NET_FC is not set</div><div class='del'>-# CONFIG_SHAPER is not set</div><div class='ctx'> CONFIG_NETCONSOLE=y</div><div class='add'>+# CONFIG_NETCONSOLE_DYNAMIC is not set</div><div class='ctx'> CONFIG_NETPOLL=y</div><div class='ctx'> # CONFIG_NETPOLL_TRAP is not set</div><div class='ctx'> CONFIG_NET_POLL_CONTROLLER=y</div><div class='hunk'>@@ -660,7 +804,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='ctx'> CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='ctx'> CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='ctx'> # CONFIG_INPUT_JOYDEV is not set</div><div class='del'>-# CONFIG_INPUT_TSDEV is not set</div><div class='ctx'> # CONFIG_INPUT_EVDEV is not set</div><div class='ctx'> # CONFIG_INPUT_EVBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -709,9 +852,11 @@ CONFIG_GAMEPORT=m</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> CONFIG_SERIAL_NONSTANDARD=y</div><div class='ctx'> # CONFIG_COMPUTONE is not set</div><div class='ctx'> # CONFIG_ROCKETPORT is not set</div><div class='hunk'>@@ -719,15 +864,16 @@ CONFIG_SERIAL_NONSTANDARD=y</div><div class='ctx'> # CONFIG_DIGIEPCA is not set</div><div class='ctx'> # CONFIG_MOXA_INTELLIO is not set</div><div class='ctx'> # CONFIG_MOXA_SMARTIO is not set</div><div class='del'>-# CONFIG_MOXA_SMARTIO_NEW is not set</div><div class='ctx'> # CONFIG_ISI is not set</div><div class='ctx'> # CONFIG_SYNCLINKMP is not set</div><div class='ctx'> # CONFIG_SYNCLINK_GT is not set</div><div class='ctx'> # CONFIG_N_HDLC is not set</div><div class='add'>+# CONFIG_RISCOM8 is not set</div><div class='ctx'> # CONFIG_SPECIALIX is not set</div><div class='ctx'> # CONFIG_SX is not set</div><div class='ctx'> # CONFIG_RIO is not set</div><div class='ctx'> # CONFIG_STALDRV is not set</div><div class='add'>+# CONFIG_NOZOMI is not set</div><div class='ctx'> CONFIG_SGI_SNSC=y</div><div class='ctx'> CONFIG_SGI_TIOCX=y</div><div class='ctx'> CONFIG_SGI_MBCS=m</div><div class='hunk'>@@ -759,76 +905,100 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-# CONFIG_WATCHDOG is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_EFI_RTC=y</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_APPLICOM is not set</div><div class='del'>-CONFIG_AGP=m</div><div class='del'>-CONFIG_AGP_I460=m</div><div class='del'>-CONFIG_AGP_HP_ZX1=m</div><div class='del'>-CONFIG_AGP_SGI_TIOCA=m</div><div class='del'>-CONFIG_DRM=m</div><div class='del'>-CONFIG_DRM_TDFX=m</div><div class='del'>-CONFIG_DRM_R128=m</div><div class='del'>-CONFIG_DRM_RADEON=m</div><div class='del'>-CONFIG_DRM_MGA=m</div><div class='del'>-CONFIG_DRM_SIS=m</div><div class='del'>-# CONFIG_DRM_VIA is not set</div><div class='del'>-# CONFIG_DRM_SAVAGE is not set</div><div class='ctx'> CONFIG_RAW_DRIVER=m</div><div class='ctx'> CONFIG_MAX_RAW_DEVS=256</div><div class='ctx'> CONFIG_HPET=y</div><div class='del'>-# CONFIG_HPET_RTC_IRQ is not set</div><div class='ctx'> CONFIG_HPET_MMAP=y</div><div class='ctx'> # CONFIG_HANGCHECK_TIMER is not set</div><div class='ctx'> CONFIG_MMTIMER=y</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='del'>-# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+CONFIG_POWER_SUPPLY=y</div><div class='add'>+# CONFIG_POWER_SUPPLY_DEBUG is not set</div><div class='add'>+# CONFIG_PDA_POWER is not set</div><div class='add'>+# CONFIG_BATTERY_DS2760 is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='del'>-# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_I5K_AMB is not set</div><div class='ctx'> # CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_F71882FG is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='ctx'> # CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_SIS5595 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M1 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_VIA686A is not set</div><div class='ctx'> # CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_VT8231 is not set</div><div class='ctx'> # CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+CONFIG_THERMAL=m</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> CONFIG_DAB=y</div><div class='ctx'> # CONFIG_USB_DABUSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+CONFIG_AGP=m</div><div class='add'>+CONFIG_AGP_I460=m</div><div class='add'>+CONFIG_AGP_HP_ZX1=m</div><div class='add'>+CONFIG_AGP_SGI_TIOCA=m</div><div class='add'>+CONFIG_DRM=m</div><div class='add'>+CONFIG_DRM_TDFX=m</div><div class='add'>+CONFIG_DRM_R128=m</div><div class='add'>+CONFIG_DRM_RADEON=m</div><div class='add'>+CONFIG_DRM_MGA=m</div><div class='add'>+CONFIG_DRM_SIS=m</div><div class='add'>+# CONFIG_DRM_VIA is not set</div><div class='add'>+# CONFIG_DRM_SAVAGE is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+# CONFIG_FB is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-# CONFIG_VGASTATE is not set</div><div class='del'>-# CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Console display driver support</div><div class='hunk'>@@ -836,15 +1006,7 @@ CONFIG_DAB=y</div><div class='ctx'> CONFIG_VGA_CONSOLE=y</div><div class='ctx'> # CONFIG_VGACON_SOFT_SCROLLBACK is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=m</div><div class='ctx'> CONFIG_SND_TIMER=m</div><div class='ctx'> CONFIG_SND_PCM=m</div><div class='hunk'>@@ -862,22 +1024,18 @@ CONFIG_SND_SUPPORT_OLD_API=y</div><div class='ctx'> CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> CONFIG_SND_VERBOSE_PRINTK=y</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_VMASTER=y</div><div class='ctx'> CONFIG_SND_MPU401_UART=m</div><div class='ctx'> CONFIG_SND_OPL3_LIB=m</div><div class='ctx'> CONFIG_SND_AC97_CODEC=m</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='ctx'> CONFIG_SND_DUMMY=m</div><div class='ctx'> CONFIG_SND_VIRMIDI=m</div><div class='ctx'> CONFIG_SND_MTPAV=m</div><div class='ctx'> CONFIG_SND_SERIAL_U16550=m</div><div class='ctx'> CONFIG_SND_MPU401=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='add'>+CONFIG_SND_PCI=y</div><div class='ctx'> # CONFIG_SND_AD1889 is not set</div><div class='ctx'> # CONFIG_SND_ALS300 is not set</div><div class='ctx'> # CONFIG_SND_ALI5451 is not set</div><div class='hunk'>@@ -886,10 +1044,12 @@ CONFIG_SND_MPU401=m</div><div class='ctx'> # CONFIG_SND_AU8810 is not set</div><div class='ctx'> # CONFIG_SND_AU8820 is not set</div><div class='ctx'> # CONFIG_SND_AU8830 is not set</div><div class='add'>+# CONFIG_SND_AW2 is not set</div><div class='ctx'> # CONFIG_SND_AZT3328 is not set</div><div class='ctx'> # CONFIG_SND_BT87X is not set</div><div class='ctx'> # CONFIG_SND_CA0106 is not set</div><div class='ctx'> # CONFIG_SND_CMIPCI is not set</div><div class='add'>+# CONFIG_SND_OXYGEN is not set</div><div class='ctx'> CONFIG_SND_CS4281=m</div><div class='ctx'> CONFIG_SND_CS46XX=m</div><div class='ctx'> CONFIG_SND_CS46XX_NEW_DSP=y</div><div class='hunk'>@@ -912,10 +1072,10 @@ CONFIG_SND_EMU10K1=m</div><div class='ctx'> # CONFIG_SND_ES1938 is not set</div><div class='ctx'> # CONFIG_SND_ES1968 is not set</div><div class='ctx'> CONFIG_SND_FM801=m</div><div class='del'>-# CONFIG_SND_FM801_TEA575X_BOOL is not set</div><div class='ctx'> # CONFIG_SND_HDA_INTEL is not set</div><div class='ctx'> # CONFIG_SND_HDSP is not set</div><div class='ctx'> # CONFIG_SND_HDSPM is not set</div><div class='add'>+# CONFIG_SND_HIFIER is not set</div><div class='ctx'> # CONFIG_SND_ICE1712 is not set</div><div class='ctx'> # CONFIG_SND_ICE1724 is not set</div><div class='ctx'> # CONFIG_SND_INTEL8X0 is not set</div><div class='hunk'>@@ -933,29 +1093,19 @@ CONFIG_SND_FM801=m</div><div class='ctx'> # CONFIG_SND_TRIDENT is not set</div><div class='ctx'> # CONFIG_SND_VIA82XX is not set</div><div class='ctx'> # CONFIG_SND_VIA82XX_MODEM is not set</div><div class='add'>+# CONFIG_SND_VIRTUOSO is not set</div><div class='ctx'> # CONFIG_SND_VX222 is not set</div><div class='ctx'> # CONFIG_SND_YMFPCI is not set</div><div class='del'>-# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_USB=y</div><div class='ctx'> # CONFIG_SND_USB_AUDIO is not set</div><div class='ctx'> # CONFIG_SND_USB_CAIAQ is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> CONFIG_AC97_BUS=m</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='ctx'> # CONFIG_HID_DEBUG is not set</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Input Devices</div><div class='hunk'>@@ -976,6 +1126,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> CONFIG_USB=m</div><div class='ctx'> # CONFIG_USB_DEBUG is not set</div><div class='add'>+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous USB options</div><div class='hunk'>@@ -984,17 +1135,17 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> # CONFIG_USB_SUSPEND is not set</div><div class='del'>-# CONFIG_USB_PERSIST is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='ctx'> CONFIG_USB_EHCI_HCD=m</div><div class='del'>-# CONFIG_USB_EHCI_SPLIT_ISO is not set</div><div class='ctx'> # CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='ctx'> # CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=m</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='hunk'>@@ -1008,6 +1159,7 @@ CONFIG_USB_UHCI_HCD=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> # CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -1027,7 +1179,9 @@ CONFIG_USB_STORAGE=m</div><div class='ctx'> # CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1040,10 +1194,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='ctx'> #</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Serial Converter support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_USB_SERIAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1069,67 +1219,32 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB DSL modem support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Gadget Support</div><div class='del'>-#</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# LED devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# LED drivers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# LED Triggers</div><div class='del'>-#</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> CONFIG_INFINIBAND=m</div><div class='ctx'> # CONFIG_INFINIBAND_USER_MAD is not set</div><div class='ctx'> # CONFIG_INFINIBAND_USER_ACCESS is not set</div><div class='ctx'> CONFIG_INFINIBAND_ADDR_TRANS=y</div><div class='ctx'> CONFIG_INFINIBAND_MTHCA=m</div><div class='ctx'> CONFIG_INFINIBAND_MTHCA_DEBUG=y</div><div class='add'>+# CONFIG_INFINIBAND_IPATH is not set</div><div class='ctx'> # CONFIG_INFINIBAND_AMSO1100 is not set</div><div class='ctx'> # CONFIG_MLX4_INFINIBAND is not set</div><div class='add'>+# CONFIG_INFINIBAND_NES is not set</div><div class='ctx'> CONFIG_INFINIBAND_IPOIB=m</div><div class='ctx'> # CONFIG_INFINIBAND_IPOIB_CM is not set</div><div class='ctx'> CONFIG_INFINIBAND_IPOIB_DEBUG=y</div><div class='ctx'> # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set</div><div class='ctx'> # CONFIG_INFINIBAND_SRP is not set</div><div class='ctx'> # CONFIG_INFINIBAND_ISER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Real Time Clock</div><div class='del'>-#</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Engine support</div><div class='del'>-#</div><div class='del'>-# CONFIG_DMA_ENGINE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Clients</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='del'>-# CONFIG_MSPEC is not set</div><div class='add'>+CONFIG_MSPEC=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='hunk'>@@ -1145,7 +1260,6 @@ CONFIG_EXT3_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_EXT3_FS_SECURITY=y</div><div class='ctx'> # CONFIG_EXT4DEV_FS is not set</div><div class='ctx'> CONFIG_JBD=y</div><div class='del'>-# CONFIG_JBD_DEBUG is not set</div><div class='ctx'> CONFIG_FS_MBCACHE=y</div><div class='ctx'> CONFIG_REISERFS_FS=y</div><div class='ctx'> # CONFIG_REISERFS_CHECK is not set</div><div class='hunk'>@@ -1157,17 +1271,15 @@ CONFIG_REISERFS_FS_SECURITY=y</div><div class='ctx'> CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_XFS_FS=y</div><div class='ctx'> # CONFIG_XFS_QUOTA is not set</div><div class='del'>-# CONFIG_XFS_SECURITY is not set</div><div class='ctx'> # CONFIG_XFS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_RT is not set</div><div class='add'>+# CONFIG_XFS_DEBUG is not set</div><div class='ctx'> # CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='del'>-# CONFIG_MINIX_FS is not set</div><div class='del'>-# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='del'>-CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_AUTOFS_FS=y</div><div class='ctx'> CONFIG_AUTOFS4_FS=y</div><div class='ctx'> # CONFIG_FUSE_FS is not set</div><div class='hunk'>@@ -1205,7 +1317,6 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_TMPFS_POSIX_ACL is not set</div><div class='ctx'> CONFIG_HUGETLBFS=y</div><div class='ctx'> CONFIG_HUGETLB_PAGE=y</div><div class='del'>-CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_CONFIGFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1220,32 +1331,30 @@ CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Network File Systems</div><div class='del'>-#</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=m</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-CONFIG_NFS_DIRECTIO=y</div><div class='ctx'> CONFIG_NFSD=m</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> CONFIG_NFSD_V4=y</div><div class='del'>-CONFIG_NFSD_TCP=y</div><div class='ctx'> CONFIG_LOCKD=m</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=m</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=m</div><div class='ctx'> CONFIG_SUNRPC_GSS=m</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='del'>-CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+CONFIG_SUNRPC_XPRT_RDMA=m</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=m</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='ctx'> CONFIG_SMB_NLS_DEFAULT=y</div><div class='hunk'>@@ -1281,10 +1390,6 @@ CONFIG_SGI_PARTITION=y</div><div class='ctx'> # CONFIG_KARMA_PARTITION is not set</div><div class='ctx'> CONFIG_EFI_PARTITION=y</div><div class='ctx'> # CONFIG_SYSV68_PARTITION is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Native Language Support</div><div class='del'>-#</div><div class='ctx'> CONFIG_NLS=y</div><div class='ctx'> CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> CONFIG_NLS_CODEPAGE_437=y</div><div class='hunk'>@@ -1325,22 +1430,24 @@ CONFIG_NLS_ISO8859_15=m</div><div class='ctx'> CONFIG_NLS_KOI8_R=m</div><div class='ctx'> CONFIG_NLS_KOI8_U=m</div><div class='ctx'> CONFIG_NLS_UTF8=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Distributed Lock Manager</div><div class='del'>-#</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='add'>+CONFIG_HAVE_KVM=y</div><div class='add'>+CONFIG_VIRTUALIZATION=y</div><div class='add'>+# CONFIG_KVM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='del'>-# CONFIG_CRC_ITU_T is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='add'>+CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_GENERIC_ALLOCATOR=y</div><div class='ctx'> CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='hunk'>@@ -1358,16 +1465,12 @@ CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> # CONFIG_HP_SIMSCSI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Instrumentation Support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PROFILING is not set</div><div class='del'>-# CONFIG_KPROBES is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # Kernel hacking</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=2048</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1375,10 +1478,14 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='del'>-# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='add'>+# CONFIG_SLUB_DEBUG_ON is not set</div><div class='add'>+# CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='ctx'> # CONFIG_RT_MUTEX_TESTER is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='hunk'>@@ -1388,10 +1495,15 @@ CONFIG_DEBUG_MUTEXES=y</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='del'>-CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_DEBUG_SG is not set</div><div class='add'>+# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='ctx'> CONFIG_IA64_GRANULE_16MB=y</div><div class='ctx'> # CONFIG_IA64_GRANULE_64MB is not set</div><div class='ctx'> # CONFIG_IA64_PRINT_HAZARDS is not set</div><div class='hunk'>@@ -1405,41 +1517,85 @@ CONFIG_SYSVIPC_COMPAT=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_KEYS is not set</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=m</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=m</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=m</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=m</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=m</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=m</div><div class='del'>-CONFIG_CRYPTO_CBC=m</div><div class='del'>-CONFIG_CRYPTO_PCBC=m</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=m</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=m</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='add'>+# CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='head'>diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig<br/>deleted file mode 100644<br/>index 7f6b2377d13f..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/configs/sn2_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/configs/sn2_defconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1285 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.23</div><div class='del'>-# Thu Oct 18 16:03:40 2007</div><div class='del'>-#</div><div class='del'>-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# General setup</div><div class='del'>-#</div><div class='del'>-CONFIG_EXPERIMENTAL=y</div><div class='del'>-CONFIG_LOCK_KERNEL=y</div><div class='del'>-CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='del'>-CONFIG_LOCALVERSION=""</div><div class='del'>-# CONFIG_LOCALVERSION_AUTO is not set</div><div class='del'>-CONFIG_SWAP=y</div><div class='del'>-CONFIG_SYSVIPC=y</div><div class='del'>-CONFIG_SYSVIPC_SYSCTL=y</div><div class='del'>-CONFIG_POSIX_MQUEUE=y</div><div class='del'>-# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='del'>-CONFIG_TASKSTATS=y</div><div class='del'>-# CONFIG_TASK_DELAY_ACCT is not set</div><div class='del'>-CONFIG_TASK_XACCT=y</div><div class='del'>-CONFIG_TASK_IO_ACCOUNTING=y</div><div class='del'>-# CONFIG_USER_NS is not set</div><div class='del'>-# CONFIG_AUDIT is not set</div><div class='del'>-# CONFIG_IKCONFIG is not set</div><div class='del'>-CONFIG_LOG_BUF_SHIFT=20</div><div class='del'>-CONFIG_CGROUPS=y</div><div class='del'>-CONFIG_CPUSETS=y</div><div class='del'>-CONFIG_FAIR_GROUP_SCHED=y</div><div class='del'>-CONFIG_FAIR_USER_SCHED=y</div><div class='del'>-CONFIG_SYSFS_DEPRECATED=y</div><div class='del'>-CONFIG_RELAY=y</div><div class='del'>-CONFIG_BLK_DEV_INITRD=y</div><div class='del'>-CONFIG_INITRAMFS_SOURCE=""</div><div class='del'>-CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='del'>-CONFIG_SYSCTL=y</div><div class='del'>-# CONFIG_EMBEDDED is not set</div><div class='del'>-CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_KALLSYMS=y</div><div class='del'>-CONFIG_KALLSYMS_ALL=y</div><div class='del'>-# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='del'>-CONFIG_HOTPLUG=y</div><div class='del'>-CONFIG_PRINTK=y</div><div class='del'>-CONFIG_BUG=y</div><div class='del'>-CONFIG_ELF_CORE=y</div><div class='del'>-CONFIG_BASE_FULL=y</div><div class='del'>-CONFIG_FUTEX=y</div><div class='del'>-CONFIG_ANON_INODES=y</div><div class='del'>-CONFIG_EPOLL=y</div><div class='del'>-CONFIG_SIGNALFD=y</div><div class='del'>-CONFIG_EVENTFD=y</div><div class='del'>-CONFIG_SHMEM=y</div><div class='del'>-CONFIG_VM_EVENT_COUNTERS=y</div><div class='del'>-CONFIG_SLUB_DEBUG=y</div><div class='del'>-# CONFIG_SLAB is not set</div><div class='del'>-CONFIG_SLUB=y</div><div class='del'>-# CONFIG_SLOB is not set</div><div class='del'>-CONFIG_RT_MUTEXES=y</div><div class='del'>-# CONFIG_TINY_SHMEM is not set</div><div class='del'>-CONFIG_BASE_SMALL=0</div><div class='del'>-CONFIG_MODULES=y</div><div class='del'>-CONFIG_MODULE_UNLOAD=y</div><div class='del'>-# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='del'>-# CONFIG_MODVERSIONS is not set</div><div class='del'>-# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-CONFIG_KMOD=y</div><div class='del'>-CONFIG_STOP_MACHINE=y</div><div class='del'>-CONFIG_BLOCK=y</div><div class='del'>-# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='del'>-CONFIG_BLK_DEV_BSG=y</div><div class='del'>-CONFIG_BLOCK_COMPAT=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IO Schedulers</div><div class='del'>-#</div><div class='del'>-CONFIG_IOSCHED_NOOP=y</div><div class='del'>-CONFIG_IOSCHED_AS=y</div><div class='del'>-CONFIG_IOSCHED_DEADLINE=y</div><div class='del'>-CONFIG_IOSCHED_CFQ=y</div><div class='del'>-CONFIG_DEFAULT_AS=y</div><div class='del'>-# CONFIG_DEFAULT_DEADLINE is not set</div><div class='del'>-# CONFIG_DEFAULT_CFQ is not set</div><div class='del'>-# CONFIG_DEFAULT_NOOP is not set</div><div class='del'>-CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Processor type and features</div><div class='del'>-#</div><div class='del'>-CONFIG_IA64=y</div><div class='del'>-CONFIG_64BIT=y</div><div class='del'>-CONFIG_QUICKLIST=y</div><div class='del'>-CONFIG_MMU=y</div><div class='del'>-CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='del'>-# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='del'>-# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='del'>-CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y</div><div class='del'>-CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='del'>-CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='del'>-CONFIG_GENERIC_TIME=y</div><div class='del'>-CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='del'>-CONFIG_DMI=y</div><div class='del'>-CONFIG_EFI=y</div><div class='del'>-CONFIG_GENERIC_IOMAP=y</div><div class='del'>-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='del'>-CONFIG_IA64_UNCACHED_ALLOCATOR=y</div><div class='del'>-CONFIG_AUDIT_ARCH=y</div><div class='del'>-# CONFIG_IA64_GENERIC is not set</div><div class='del'>-# CONFIG_IA64_DIG is not set</div><div class='del'>-# CONFIG_IA64_HP_ZX1 is not set</div><div class='del'>-# CONFIG_IA64_HP_ZX1_SWIOTLB is not set</div><div class='del'>-CONFIG_IA64_SGI_SN2=y</div><div class='del'>-# CONFIG_IA64_HP_SIM is not set</div><div class='del'>-# CONFIG_ITANIUM is not set</div><div class='del'>-CONFIG_MCKINLEY=y</div><div class='del'>-# CONFIG_IA64_PAGE_SIZE_4KB is not set</div><div class='del'>-# CONFIG_IA64_PAGE_SIZE_8KB is not set</div><div class='del'>-# CONFIG_IA64_PAGE_SIZE_16KB is not set</div><div class='del'>-CONFIG_IA64_PAGE_SIZE_64KB=y</div><div class='del'>-CONFIG_PGTABLE_3=y</div><div class='del'>-# CONFIG_PGTABLE_4 is not set</div><div class='del'>-# CONFIG_HZ_100 is not set</div><div class='del'>-CONFIG_HZ_250=y</div><div class='del'>-# CONFIG_HZ_300 is not set</div><div class='del'>-# CONFIG_HZ_1000 is not set</div><div class='del'>-CONFIG_HZ=250</div><div class='del'>-CONFIG_IA64_L1_CACHE_SHIFT=7</div><div class='del'>-# CONFIG_IA64_CYCLONE is not set</div><div class='del'>-CONFIG_IOSAPIC=y</div><div class='del'>-CONFIG_IA64_SGI_SN_XP=m</div><div class='del'>-CONFIG_FORCE_MAX_ZONEORDER=17</div><div class='del'>-CONFIG_SMP=y</div><div class='del'>-CONFIG_NR_CPUS=1024</div><div class='del'>-# CONFIG_HOTPLUG_CPU is not set</div><div class='del'>-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='del'>-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='del'>-CONFIG_SCHED_SMT=y</div><div class='del'>-CONFIG_PREEMPT_NONE=y</div><div class='del'>-# CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='del'>-# CONFIG_PREEMPT is not set</div><div class='del'>-CONFIG_PREEMPT_BKL=y</div><div class='del'>-CONFIG_SELECT_MEMORY_MODEL=y</div><div class='del'>-# CONFIG_FLATMEM_MANUAL is not set</div><div class='del'>-CONFIG_DISCONTIGMEM_MANUAL=y</div><div class='del'>-# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='del'>-CONFIG_DISCONTIGMEM=y</div><div class='del'>-CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='del'>-CONFIG_NEED_MULTIPLE_NODES=y</div><div class='del'>-# CONFIG_SPARSEMEM_STATIC is not set</div><div class='del'>-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y</div><div class='del'>-CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='del'>-CONFIG_MIGRATION=y</div><div class='del'>-CONFIG_RESOURCES_64BIT=y</div><div class='del'>-CONFIG_ZONE_DMA_FLAG=0</div><div class='del'>-CONFIG_NR_QUICK=1</div><div class='del'>-CONFIG_VIRT_TO_BUS=y</div><div class='del'>-CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='del'>-CONFIG_ARCH_DISCONTIGMEM_ENABLE=y</div><div class='del'>-CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='del'>-CONFIG_ARCH_SPARSEMEM_ENABLE=y</div><div class='del'>-CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y</div><div class='del'>-CONFIG_NUMA=y</div><div class='del'>-CONFIG_NODES_SHIFT=10</div><div class='del'>-CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='del'>-CONFIG_VIRTUAL_MEM_MAP=y</div><div class='del'>-CONFIG_HOLES_IN_ZONE=y</div><div class='del'>-CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y</div><div class='del'>-CONFIG_HAVE_ARCH_NODEDATA_EXTENSION=y</div><div class='del'>-CONFIG_IA32_SUPPORT=y</div><div class='del'>-CONFIG_COMPAT=y</div><div class='del'>-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y</div><div class='del'>-CONFIG_IA64_MCA_RECOVERY=y</div><div class='del'>-CONFIG_PERFMON=y</div><div class='del'>-CONFIG_IA64_PALINFO=y</div><div class='del'>-CONFIG_IA64_MC_ERR_INJECT=y</div><div class='del'>-CONFIG_SGI_SN=y</div><div class='del'>-# CONFIG_IA64_ESI is not set</div><div class='del'>-# CONFIG_IA64_HP_AML_NFW is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SN Devices</div><div class='del'>-#</div><div class='del'>-CONFIG_SGI_IOC3=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Firmware Drivers</div><div class='del'>-#</div><div class='del'>-CONFIG_EFI_VARS=y</div><div class='del'>-CONFIG_EFI_PCDP=y</div><div class='del'>-CONFIG_DMIID=y</div><div class='del'>-CONFIG_BINFMT_ELF=y</div><div class='del'>-# CONFIG_BINFMT_MISC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Power management and ACPI</div><div class='del'>-#</div><div class='del'>-CONFIG_PM=y</div><div class='del'>-# CONFIG_PM_LEGACY is not set</div><div class='del'>-# CONFIG_PM_DEBUG is not set</div><div class='del'>-CONFIG_ACPI=y</div><div class='del'>-# CONFIG_ACPI_PROCFS is not set</div><div class='del'>-CONFIG_ACPI_PROC_EVENT=y</div><div class='del'>-# CONFIG_ACPI_BUTTON is not set</div><div class='del'>-# CONFIG_ACPI_FAN is not set</div><div class='del'>-# CONFIG_ACPI_DOCK is not set</div><div class='del'>-# CONFIG_ACPI_PROCESSOR is not set</div><div class='del'>-CONFIG_ACPI_NUMA=y</div><div class='del'>-CONFIG_ACPI_BLACKLIST_YEAR=0</div><div class='del'>-# CONFIG_ACPI_DEBUG is not set</div><div class='del'>-CONFIG_ACPI_EC=y</div><div class='del'>-CONFIG_ACPI_POWER=y</div><div class='del'>-CONFIG_ACPI_SYSTEM=y</div><div class='del'>-# CONFIG_ACPI_CONTAINER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# CPU Frequency scaling</div><div class='del'>-#</div><div class='del'>-# CONFIG_CPU_FREQ is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Bus options (PCI, PCMCIA)</div><div class='del'>-#</div><div class='del'>-CONFIG_PCI=y</div><div class='del'>-CONFIG_PCI_DOMAINS=y</div><div class='del'>-CONFIG_PCI_SYSCALL=y</div><div class='del'>-CONFIG_PCIEPORTBUS=y</div><div class='del'>-CONFIG_HOTPLUG_PCI_PCIE=y</div><div class='del'>-CONFIG_PCIEAER=y</div><div class='del'>-CONFIG_ARCH_SUPPORTS_MSI=y</div><div class='del'>-# CONFIG_PCI_MSI is not set</div><div class='del'>-# CONFIG_PCI_DEBUG is not set</div><div class='del'>-CONFIG_HOTPLUG_PCI=y</div><div class='del'>-# CONFIG_HOTPLUG_PCI_FAKE is not set</div><div class='del'>-# CONFIG_HOTPLUG_PCI_ACPI is not set</div><div class='del'>-# CONFIG_HOTPLUG_PCI_CPCI is not set</div><div class='del'>-# CONFIG_HOTPLUG_PCI_SHPC is not set</div><div class='del'>-CONFIG_HOTPLUG_PCI_SGI=y</div><div class='del'>-# CONFIG_PCCARD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='del'>-CONFIG_NET=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking options</div><div class='del'>-#</div><div class='del'>-CONFIG_PACKET=y</div><div class='del'>-CONFIG_PACKET_MMAP=y</div><div class='del'>-CONFIG_UNIX=y</div><div class='del'>-CONFIG_XFRM=y</div><div class='del'>-# CONFIG_XFRM_USER is not set</div><div class='del'>-# CONFIG_XFRM_SUB_POLICY is not set</div><div class='del'>-# CONFIG_XFRM_MIGRATE is not set</div><div class='del'>-# CONFIG_NET_KEY is not set</div><div class='del'>-CONFIG_INET=y</div><div class='del'>-CONFIG_IP_MULTICAST=y</div><div class='del'>-# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='del'>-CONFIG_IP_FIB_HASH=y</div><div class='del'>-# CONFIG_IP_PNP is not set</div><div class='del'>-# CONFIG_NET_IPIP is not set</div><div class='del'>-# CONFIG_NET_IPGRE is not set</div><div class='del'>-# CONFIG_IP_MROUTE is not set</div><div class='del'>-# CONFIG_ARPD is not set</div><div class='del'>-CONFIG_SYN_COOKIES=y</div><div class='del'>-# CONFIG_INET_AH is not set</div><div class='del'>-# CONFIG_INET_ESP is not set</div><div class='del'>-# CONFIG_INET_IPCOMP is not set</div><div class='del'>-# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='del'>-CONFIG_INET_TUNNEL=m</div><div class='del'>-CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='del'>-CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='del'>-CONFIG_INET_XFRM_MODE_BEET=y</div><div class='del'>-CONFIG_INET_LRO=y</div><div class='del'>-CONFIG_INET_DIAG=m</div><div class='del'>-CONFIG_INET_TCP_DIAG=m</div><div class='del'>-# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='del'>-CONFIG_TCP_CONG_CUBIC=y</div><div class='del'>-CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='del'>-# CONFIG_TCP_MD5SIG is not set</div><div class='del'>-CONFIG_IPV6=m</div><div class='del'>-# CONFIG_IPV6_PRIVACY is not set</div><div class='del'>-# CONFIG_IPV6_ROUTER_PREF is not set</div><div class='del'>-# CONFIG_IPV6_OPTIMISTIC_DAD is not set</div><div class='del'>-# CONFIG_INET6_AH is not set</div><div class='del'>-# CONFIG_INET6_ESP is not set</div><div class='del'>-# CONFIG_INET6_IPCOMP is not set</div><div class='del'>-# CONFIG_IPV6_MIP6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='del'>-CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='del'>-CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='del'>-CONFIG_INET6_XFRM_MODE_BEET=m</div><div class='del'>-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set</div><div class='del'>-CONFIG_IPV6_SIT=m</div><div class='del'>-# CONFIG_IPV6_TUNNEL is not set</div><div class='del'>-# CONFIG_IPV6_MULTIPLE_TABLES is not set</div><div class='del'>-# CONFIG_NETWORK_SECMARK is not set</div><div class='del'>-# CONFIG_NETFILTER is not set</div><div class='del'>-# CONFIG_IP_DCCP is not set</div><div class='del'>-# CONFIG_IP_SCTP is not set</div><div class='del'>-# CONFIG_TIPC is not set</div><div class='del'>-# CONFIG_ATM is not set</div><div class='del'>-# CONFIG_BRIDGE is not set</div><div class='del'>-# CONFIG_VLAN_8021Q is not set</div><div class='del'>-# CONFIG_DECNET is not set</div><div class='del'>-# CONFIG_LLC2 is not set</div><div class='del'>-# CONFIG_IPX is not set</div><div class='del'>-# CONFIG_ATALK is not set</div><div class='del'>-# CONFIG_X25 is not set</div><div class='del'>-# CONFIG_LAPB is not set</div><div class='del'>-# CONFIG_ECONET is not set</div><div class='del'>-# CONFIG_WAN_ROUTER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# QoS and/or fair queueing</div><div class='del'>-#</div><div class='del'>-# CONFIG_NET_SCHED is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Network testing</div><div class='del'>-#</div><div class='del'>-# CONFIG_NET_PKTGEN is not set</div><div class='del'>-# CONFIG_HAMRADIO is not set</div><div class='del'>-# CONFIG_IRDA is not set</div><div class='del'>-# CONFIG_BT is not set</div><div class='del'>-# CONFIG_AF_RXRPC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Wireless</div><div class='del'>-#</div><div class='del'>-# CONFIG_CFG80211 is not set</div><div class='del'>-# CONFIG_WIRELESS_EXT is not set</div><div class='del'>-# CONFIG_MAC80211 is not set</div><div class='del'>-# CONFIG_IEEE80211 is not set</div><div class='del'>-# CONFIG_RFKILL is not set</div><div class='del'>-# CONFIG_NET_9P is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Device Drivers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic Driver Options</div><div class='del'>-#</div><div class='del'>-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='del'>-CONFIG_STANDALONE=y</div><div class='del'>-CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=y</div><div class='del'>-# CONFIG_DEBUG_DRIVER is not set</div><div class='del'>-# CONFIG_DEBUG_DEVRES is not set</div><div class='del'>-# CONFIG_SYS_HYPERVISOR is not set</div><div class='del'>-# CONFIG_CONNECTOR is not set</div><div class='del'>-# CONFIG_MTD is not set</div><div class='del'>-# CONFIG_PARPORT is not set</div><div class='del'>-CONFIG_PNP=y</div><div class='del'>-# CONFIG_PNP_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Protocols</div><div class='del'>-#</div><div class='del'>-CONFIG_PNPACPI=y</div><div class='del'>-CONFIG_BLK_DEV=y</div><div class='del'>-# CONFIG_BLK_CPQ_DA is not set</div><div class='del'>-# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='del'>-# CONFIG_BLK_DEV_DAC960 is not set</div><div class='del'>-# CONFIG_BLK_DEV_UMEM is not set</div><div class='del'>-# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='del'>-CONFIG_BLK_DEV_LOOP=y</div><div class='del'>-CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='del'>-CONFIG_BLK_DEV_NBD=m</div><div class='del'>-# CONFIG_BLK_DEV_SX8 is not set</div><div class='del'>-# CONFIG_BLK_DEV_UB is not set</div><div class='del'>-CONFIG_BLK_DEV_RAM=y</div><div class='del'>-CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='del'>-CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='del'>-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='del'>-# CONFIG_CDROM_PKTCDVD is not set</div><div class='del'>-CONFIG_ATA_OVER_ETH=m</div><div class='del'>-CONFIG_MISC_DEVICES=y</div><div class='del'>-# CONFIG_PHANTOM is not set</div><div class='del'>-# CONFIG_EEPROM_93CX6 is not set</div><div class='del'>-CONFIG_SGI_IOC4=y</div><div class='del'>-# CONFIG_TIFM_CORE is not set</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_IDE_MAX_HWIFS=4</div><div class='del'>-CONFIG_BLK_DEV_IDE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Please see Documentation/ide.txt for help/info on IDE drives</div><div class='del'>-#</div><div class='del'>-# CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='del'>-CONFIG_BLK_DEV_IDEDISK=y</div><div class='del'>-# CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='del'>-CONFIG_BLK_DEV_IDECD=y</div><div class='del'>-# CONFIG_BLK_DEV_IDETAPE is not set</div><div class='del'>-# CONFIG_BLK_DEV_IDEFLOPPY is not set</div><div class='del'>-# CONFIG_BLK_DEV_IDESCSI is not set</div><div class='del'>-# CONFIG_BLK_DEV_IDEACPI is not set</div><div class='del'>-# CONFIG_IDE_TASK_IOCTL is not set</div><div class='del'>-CONFIG_IDE_PROC_FS=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IDE chipset support/bugfixes</div><div class='del'>-#</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='del'>-# CONFIG_BLK_DEV_PLATFORM is not set</div><div class='del'>-# CONFIG_BLK_DEV_IDEPNP is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI IDE chipsets support</div><div class='del'>-#</div><div class='del'>-CONFIG_BLK_DEV_IDEPCI=y</div><div class='del'>-CONFIG_IDEPCI_SHARE_IRQ=y</div><div class='del'>-CONFIG_IDEPCI_PCIBUS_ORDER=y</div><div class='del'>-# CONFIG_BLK_DEV_OFFBOARD is not set</div><div class='del'>-# CONFIG_BLK_DEV_GENERIC is not set</div><div class='del'>-# CONFIG_BLK_DEV_OPTI621 is not set</div><div class='del'>-CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='del'>-# CONFIG_BLK_DEV_AEC62XX is not set</div><div class='del'>-# CONFIG_BLK_DEV_ALI15X3 is not set</div><div class='del'>-# CONFIG_BLK_DEV_AMD74XX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CMD64X is not set</div><div class='del'>-# CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='del'>-# CONFIG_BLK_DEV_CS5520 is not set</div><div class='del'>-# CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT366 is not set</div><div class='del'>-# CONFIG_BLK_DEV_JMICRON is not set</div><div class='del'>-# CONFIG_BLK_DEV_SC1200 is not set</div><div class='del'>-# CONFIG_BLK_DEV_PIIX is not set</div><div class='del'>-# CONFIG_BLK_DEV_IT8213 is not set</div><div class='del'>-# CONFIG_BLK_DEV_IT821X is not set</div><div class='del'>-# CONFIG_BLK_DEV_NS87415 is not set</div><div class='del'>-# CONFIG_BLK_DEV_PDC202XX_OLD is not set</div><div class='del'>-# CONFIG_BLK_DEV_PDC202XX_NEW is not set</div><div class='del'>-# CONFIG_BLK_DEV_SVWKS is not set</div><div class='del'>-CONFIG_BLK_DEV_SGIIOC4=y</div><div class='del'>-# CONFIG_BLK_DEV_SIIMAGE is not set</div><div class='del'>-# CONFIG_BLK_DEV_SLC90E66 is not set</div><div class='del'>-# CONFIG_BLK_DEV_TRM290 is not set</div><div class='del'>-# CONFIG_BLK_DEV_VIA82CXXX is not set</div><div class='del'>-# CONFIG_BLK_DEV_TC86C001 is not set</div><div class='del'>-# CONFIG_IDE_ARM is not set</div><div class='del'>-CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SCSI device support</div><div class='del'>-#</div><div class='del'>-# CONFIG_RAID_ATTRS is not set</div><div class='del'>-CONFIG_SCSI=y</div><div class='del'>-CONFIG_SCSI_DMA=y</div><div class='del'>-# CONFIG_SCSI_TGT is not set</div><div class='del'>-CONFIG_SCSI_NETLINK=y</div><div class='del'>-CONFIG_SCSI_PROC_FS=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SCSI support type (disk, tape, CD-ROM)</div><div class='del'>-#</div><div class='del'>-CONFIG_BLK_DEV_SD=y</div><div class='del'>-CONFIG_CHR_DEV_ST=m</div><div class='del'>-# CONFIG_CHR_DEV_OSST is not set</div><div class='del'>-CONFIG_BLK_DEV_SR=m</div><div class='del'>-# CONFIG_BLK_DEV_SR_VENDOR is not set</div><div class='del'>-CONFIG_CHR_DEV_SG=m</div><div class='del'>-CONFIG_CHR_DEV_SCH=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='del'>-#</div><div class='del'>-# CONFIG_SCSI_MULTI_LUN is not set</div><div class='del'>-CONFIG_SCSI_CONSTANTS=y</div><div class='del'>-# CONFIG_SCSI_LOGGING is not set</div><div class='del'>-# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='del'>-CONFIG_SCSI_WAIT_SCAN=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SCSI Transports</div><div class='del'>-#</div><div class='del'>-CONFIG_SCSI_SPI_ATTRS=y</div><div class='del'>-CONFIG_SCSI_FC_ATTRS=y</div><div class='del'>-CONFIG_SCSI_ISCSI_ATTRS=m</div><div class='del'>-CONFIG_SCSI_SAS_ATTRS=y</div><div class='del'>-CONFIG_SCSI_SAS_LIBSAS=y</div><div class='del'>-# CONFIG_SCSI_SAS_ATA is not set</div><div class='del'>-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set</div><div class='del'>-CONFIG_SCSI_SRP_ATTRS=y</div><div class='del'>-CONFIG_SCSI_LOWLEVEL=y</div><div class='del'>-CONFIG_ISCSI_TCP=m</div><div class='del'>-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set</div><div class='del'>-# CONFIG_SCSI_3W_9XXX is not set</div><div class='del'>-# CONFIG_SCSI_ACARD is not set</div><div class='del'>-# CONFIG_SCSI_AACRAID is not set</div><div class='del'>-# CONFIG_SCSI_AIC7XXX is not set</div><div class='del'>-# CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='del'>-# CONFIG_SCSI_AIC79XX is not set</div><div class='del'>-# CONFIG_SCSI_AIC94XX is not set</div><div class='del'>-# CONFIG_SCSI_ADVANSYS is not set</div><div class='del'>-# CONFIG_SCSI_ARCMSR is not set</div><div class='del'>-# CONFIG_MEGARAID_NEWGEN is not set</div><div class='del'>-# CONFIG_MEGARAID_LEGACY is not set</div><div class='del'>-# CONFIG_MEGARAID_SAS is not set</div><div class='del'>-# CONFIG_SCSI_HPTIOP is not set</div><div class='del'>-# CONFIG_SCSI_DMX3191D is not set</div><div class='del'>-# CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='del'>-# CONFIG_SCSI_IPS is not set</div><div class='del'>-# CONFIG_SCSI_INITIO is not set</div><div class='del'>-# CONFIG_SCSI_INIA100 is not set</div><div class='del'>-# CONFIG_SCSI_STEX is not set</div><div class='del'>-# CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='del'>-# CONFIG_SCSI_IPR is not set</div><div class='del'>-CONFIG_SCSI_QLOGIC_1280=y</div><div class='del'>-CONFIG_SCSI_QLA_FC=y</div><div class='del'>-# CONFIG_SCSI_QLA_ISCSI is not set</div><div class='del'>-# CONFIG_SCSI_LPFC is not set</div><div class='del'>-# CONFIG_SCSI_DC395x is not set</div><div class='del'>-# CONFIG_SCSI_DC390T is not set</div><div class='del'>-# CONFIG_SCSI_DEBUG is not set</div><div class='del'>-# CONFIG_SCSI_SRP is not set</div><div class='del'>-CONFIG_ATA=y</div><div class='del'>-CONFIG_ATA_NONSTANDARD=y</div><div class='del'>-CONFIG_ATA_ACPI=y</div><div class='del'>-# CONFIG_SATA_AHCI is not set</div><div class='del'>-# CONFIG_SATA_SVW is not set</div><div class='del'>-# CONFIG_ATA_PIIX is not set</div><div class='del'>-# CONFIG_SATA_MV is not set</div><div class='del'>-# CONFIG_SATA_NV is not set</div><div class='del'>-# CONFIG_PDC_ADMA is not set</div><div class='del'>-# CONFIG_SATA_QSTOR is not set</div><div class='del'>-# CONFIG_SATA_PROMISE is not set</div><div class='del'>-# CONFIG_SATA_SX4 is not set</div><div class='del'>-# CONFIG_SATA_SIL is not set</div><div class='del'>-# CONFIG_SATA_SIL24 is not set</div><div class='del'>-# CONFIG_SATA_SIS is not set</div><div class='del'>-# CONFIG_SATA_ULI is not set</div><div class='del'>-# CONFIG_SATA_VIA is not set</div><div class='del'>-CONFIG_SATA_VITESSE=y</div><div class='del'>-# CONFIG_SATA_INIC162X is not set</div><div class='del'>-# CONFIG_PATA_ACPI is not set</div><div class='del'>-# CONFIG_PATA_ALI is not set</div><div class='del'>-# CONFIG_PATA_AMD is not set</div><div class='del'>-# CONFIG_PATA_ARTOP is not set</div><div class='del'>-# CONFIG_PATA_ATIIXP is not set</div><div class='del'>-# CONFIG_PATA_CMD640_PCI is not set</div><div class='del'>-# CONFIG_PATA_CMD64X is not set</div><div class='del'>-# CONFIG_PATA_CS5520 is not set</div><div class='del'>-# CONFIG_PATA_CS5530 is not set</div><div class='del'>-# CONFIG_PATA_CYPRESS is not set</div><div class='del'>-# CONFIG_PATA_EFAR is not set</div><div class='del'>-# CONFIG_ATA_GENERIC is not set</div><div class='del'>-# CONFIG_PATA_HPT366 is not set</div><div class='del'>-# CONFIG_PATA_HPT37X is not set</div><div class='del'>-# CONFIG_PATA_HPT3X2N is not set</div><div class='del'>-# CONFIG_PATA_HPT3X3 is not set</div><div class='del'>-# CONFIG_PATA_IT821X is not set</div><div class='del'>-# CONFIG_PATA_IT8213 is not set</div><div class='del'>-# CONFIG_PATA_JMICRON is not set</div><div class='del'>-# CONFIG_PATA_TRIFLEX is not set</div><div class='del'>-# CONFIG_PATA_MARVELL is not set</div><div class='del'>-# CONFIG_PATA_MPIIX is not set</div><div class='del'>-# CONFIG_PATA_OLDPIIX is not set</div><div class='del'>-# CONFIG_PATA_NETCELL is not set</div><div class='del'>-# CONFIG_PATA_NS87410 is not set</div><div class='del'>-# CONFIG_PATA_NS87415 is not set</div><div class='del'>-# CONFIG_PATA_OPTI is not set</div><div class='del'>-# CONFIG_PATA_OPTIDMA is not set</div><div class='del'>-# CONFIG_PATA_PDC_OLD is not set</div><div class='del'>-# CONFIG_PATA_RADISYS is not set</div><div class='del'>-# CONFIG_PATA_RZ1000 is not set</div><div class='del'>-# CONFIG_PATA_SC1200 is not set</div><div class='del'>-# CONFIG_PATA_SERVERWORKS is not set</div><div class='del'>-# CONFIG_PATA_PDC2027X is not set</div><div class='del'>-# CONFIG_PATA_SIL680 is not set</div><div class='del'>-# CONFIG_PATA_SIS is not set</div><div class='del'>-# CONFIG_PATA_VIA is not set</div><div class='del'>-# CONFIG_PATA_WINBOND is not set</div><div class='del'>-CONFIG_MD=y</div><div class='del'>-CONFIG_BLK_DEV_MD=y</div><div class='del'>-CONFIG_MD_LINEAR=y</div><div class='del'>-CONFIG_MD_RAID0=y</div><div class='del'>-CONFIG_MD_RAID1=y</div><div class='del'>-# CONFIG_MD_RAID10 is not set</div><div class='del'>-CONFIG_MD_RAID456=y</div><div class='del'>-# CONFIG_MD_RAID5_RESHAPE is not set</div><div class='del'>-CONFIG_MD_MULTIPATH=y</div><div class='del'>-# CONFIG_MD_FAULTY is not set</div><div class='del'>-CONFIG_BLK_DEV_DM=y</div><div class='del'>-# CONFIG_DM_DEBUG is not set</div><div class='del'>-CONFIG_DM_CRYPT=m</div><div class='del'>-CONFIG_DM_SNAPSHOT=m</div><div class='del'>-CONFIG_DM_MIRROR=m</div><div class='del'>-CONFIG_DM_ZERO=m</div><div class='del'>-CONFIG_DM_MULTIPATH=m</div><div class='del'>-CONFIG_DM_MULTIPATH_EMC=m</div><div class='del'>-# CONFIG_DM_MULTIPATH_RDAC is not set</div><div class='del'>-# CONFIG_DM_DELAY is not set</div><div class='del'>-CONFIG_FUSION=y</div><div class='del'>-CONFIG_FUSION_SPI=y</div><div class='del'>-CONFIG_FUSION_FC=y</div><div class='del'>-CONFIG_FUSION_SAS=y</div><div class='del'>-CONFIG_FUSION_MAX_SGE=128</div><div class='del'>-CONFIG_FUSION_CTL=m</div><div class='del'>-CONFIG_FUSION_LOGGING=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IEEE 1394 (FireWire) support</div><div class='del'>-#</div><div class='del'>-# CONFIG_FIREWIRE is not set</div><div class='del'>-# CONFIG_IEEE1394 is not set</div><div class='del'>-# CONFIG_I2O is not set</div><div class='del'>-CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='del'>-# CONFIG_DUMMY is not set</div><div class='del'>-# CONFIG_BONDING is not set</div><div class='del'>-# CONFIG_MACVLAN is not set</div><div class='del'>-# CONFIG_EQUALIZER is not set</div><div class='del'>-# CONFIG_TUN is not set</div><div class='del'>-# CONFIG_VETH is not set</div><div class='del'>-# CONFIG_NET_SB1000 is not set</div><div class='del'>-# CONFIG_IP1000 is not set</div><div class='del'>-# CONFIG_ARCNET is not set</div><div class='del'>-# CONFIG_NET_ETHERNET is not set</div><div class='del'>-CONFIG_NETDEV_1000=y</div><div class='del'>-# CONFIG_ACENIC is not set</div><div class='del'>-# CONFIG_DL2K is not set</div><div class='del'>-# CONFIG_E1000 is not set</div><div class='del'>-# CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_NS83820 is not set</div><div class='del'>-# CONFIG_HAMACHI is not set</div><div class='del'>-# CONFIG_YELLOWFIN is not set</div><div class='del'>-# CONFIG_R8169 is not set</div><div class='del'>-# CONFIG_SIS190 is not set</div><div class='del'>-# CONFIG_SKGE is not set</div><div class='del'>-# CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='del'>-# CONFIG_VIA_VELOCITY is not set</div><div class='del'>-CONFIG_TIGON3=y</div><div class='del'>-# CONFIG_BNX2 is not set</div><div class='del'>-# CONFIG_QLA3XXX is not set</div><div class='del'>-# CONFIG_ATL1 is not set</div><div class='del'>-CONFIG_NETDEV_10000=y</div><div class='del'>-CONFIG_CHELSIO_T1=m</div><div class='del'>-CONFIG_CHELSIO_T1_1G=y</div><div class='del'>-# CONFIG_CHELSIO_T1_NAPI is not set</div><div class='del'>-CONFIG_CHELSIO_T3=m</div><div class='del'>-CONFIG_IXGBE=m</div><div class='del'>-# CONFIG_IXGB is not set</div><div class='del'>-CONFIG_S2IO=m</div><div class='del'>-# CONFIG_S2IO_NAPI is not set</div><div class='del'>-# CONFIG_MYRI10GE is not set</div><div class='del'>-# CONFIG_NETXEN_NIC is not set</div><div class='del'>-# CONFIG_NIU is not set</div><div class='del'>-# CONFIG_MLX4_CORE is not set</div><div class='del'>-# CONFIG_TEHUTI is not set</div><div class='del'>-# CONFIG_TR is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Wireless LAN</div><div class='del'>-#</div><div class='del'>-# CONFIG_WLAN_PRE80211 is not set</div><div class='del'>-# CONFIG_WLAN_80211 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Network Adapters</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_CATC is not set</div><div class='del'>-# CONFIG_USB_KAWETH is not set</div><div class='del'>-# CONFIG_USB_PEGASUS is not set</div><div class='del'>-# CONFIG_USB_RTL8150 is not set</div><div class='del'>-# CONFIG_USB_USBNET_MII is not set</div><div class='del'>-# CONFIG_USB_USBNET is not set</div><div class='del'>-# CONFIG_WAN is not set</div><div class='del'>-# CONFIG_FDDI is not set</div><div class='del'>-# CONFIG_HIPPI is not set</div><div class='del'>-# CONFIG_PPP is not set</div><div class='del'>-# CONFIG_SLIP is not set</div><div class='del'>-# CONFIG_NET_FC is not set</div><div class='del'>-# CONFIG_SHAPER is not set</div><div class='del'>-CONFIG_NETCONSOLE=y</div><div class='del'>-# CONFIG_NETCONSOLE_DYNAMIC is not set</div><div class='del'>-CONFIG_NETPOLL=y</div><div class='del'>-# CONFIG_NETPOLL_TRAP is not set</div><div class='del'>-CONFIG_NET_POLL_CONTROLLER=y</div><div class='del'>-# CONFIG_ISDN is not set</div><div class='del'>-# CONFIG_PHONE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Input device support</div><div class='del'>-#</div><div class='del'>-CONFIG_INPUT=y</div><div class='del'>-# CONFIG_INPUT_FF_MEMLESS is not set</div><div class='del'>-# CONFIG_INPUT_POLLDEV is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userland interfaces</div><div class='del'>-#</div><div class='del'>-CONFIG_INPUT_MOUSEDEV=y</div><div class='del'>-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set</div><div class='del'>-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='del'>-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='del'>-# CONFIG_INPUT_JOYDEV is not set</div><div class='del'>-# CONFIG_INPUT_EVDEV is not set</div><div class='del'>-# CONFIG_INPUT_EVBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Input Device Drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_INPUT_KEYBOARD is not set</div><div class='del'>-# CONFIG_INPUT_MOUSE is not set</div><div class='del'>-# CONFIG_INPUT_JOYSTICK is not set</div><div class='del'>-# CONFIG_INPUT_TABLET is not set</div><div class='del'>-# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='del'>-# CONFIG_INPUT_MISC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Hardware I/O ports</div><div class='del'>-#</div><div class='del'>-# CONFIG_SERIO is not set</div><div class='del'>-# CONFIG_GAMEPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Character devices</div><div class='del'>-#</div><div class='del'>-CONFIG_VT=y</div><div class='del'>-# CONFIG_VT_UNICODE is not set</div><div class='del'>-CONFIG_VT_CONSOLE=y</div><div class='del'>-CONFIG_HW_CONSOLE=y</div><div class='del'>-# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='del'>-CONFIG_SERIAL_NONSTANDARD=y</div><div class='del'>-# CONFIG_COMPUTONE is not set</div><div class='del'>-# CONFIG_ROCKETPORT is not set</div><div class='del'>-# CONFIG_CYCLADES is not set</div><div class='del'>-# CONFIG_DIGIEPCA is not set</div><div class='del'>-# CONFIG_MOXA_INTELLIO is not set</div><div class='del'>-# CONFIG_MOXA_SMARTIO is not set</div><div class='del'>-# CONFIG_MOXA_SMARTIO_NEW is not set</div><div class='del'>-# CONFIG_ISI is not set</div><div class='del'>-# CONFIG_SYNCLINKMP is not set</div><div class='del'>-# CONFIG_SYNCLINK_GT is not set</div><div class='del'>-# CONFIG_N_HDLC is not set</div><div class='del'>-# CONFIG_SPECIALIX is not set</div><div class='del'>-# CONFIG_SX is not set</div><div class='del'>-# CONFIG_RIO is not set</div><div class='del'>-# CONFIG_STALDRV is not set</div><div class='del'>-CONFIG_SGI_SNSC=y</div><div class='del'>-CONFIG_SGI_TIOCX=y</div><div class='del'>-CONFIG_SGI_MBCS=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Serial drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_SERIAL_8250 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Non-8250 serial port support</div><div class='del'>-#</div><div class='del'>-CONFIG_SERIAL_CORE=y</div><div class='del'>-CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='del'>-CONFIG_SERIAL_SGI_L1_CONSOLE=y</div><div class='del'>-# CONFIG_SERIAL_JSM is not set</div><div class='del'>-CONFIG_SERIAL_SGI_IOC4=y</div><div class='del'>-CONFIG_SERIAL_SGI_IOC3=y</div><div class='del'>-CONFIG_UNIX98_PTYS=y</div><div class='del'>-CONFIG_LEGACY_PTYS=y</div><div class='del'>-CONFIG_LEGACY_PTY_COUNT=256</div><div class='del'>-# CONFIG_IPMI_HANDLER is not set</div><div class='del'>-# CONFIG_WATCHDOG is not set</div><div class='del'>-# CONFIG_HW_RANDOM is not set</div><div class='del'>-CONFIG_EFI_RTC=y</div><div class='del'>-# CONFIG_R3964 is not set</div><div class='del'>-# CONFIG_APPLICOM is not set</div><div class='del'>-CONFIG_RAW_DRIVER=m</div><div class='del'>-CONFIG_MAX_RAW_DEVS=256</div><div class='del'>-# CONFIG_HPET is not set</div><div class='del'>-# CONFIG_HANGCHECK_TIMER is not set</div><div class='del'>-CONFIG_MMTIMER=y</div><div class='del'>-# CONFIG_TCG_TPM is not set</div><div class='del'>-CONFIG_DEVPORT=y</div><div class='del'>-# CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='del'>-# CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='del'>-# CONFIG_W1 is not set</div><div class='del'>-# CONFIG_POWER_SUPPLY is not set</div><div class='del'>-# CONFIG_HWMON is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sonics Silicon Backplane</div><div class='del'>-#</div><div class='del'>-CONFIG_SSB_POSSIBLE=y</div><div class='del'>-# CONFIG_SSB is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Multifunction device drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_MFD_SM501 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Multimedia devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_VIDEO_DEV is not set</div><div class='del'>-# CONFIG_DVB_CORE is not set</div><div class='del'>-# CONFIG_DAB is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Graphics support</div><div class='del'>-#</div><div class='del'>-CONFIG_AGP=y</div><div class='del'>-CONFIG_AGP_SGI_TIOCA=y</div><div class='del'>-# CONFIG_DRM is not set</div><div class='del'>-# CONFIG_VGASTATE is not set</div><div class='del'>-CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='del'>-# CONFIG_FB is not set</div><div class='del'>-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Display device support</div><div class='del'>-#</div><div class='del'>-# CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Console display driver support</div><div class='del'>-#</div><div class='del'>-CONFIG_VGA_CONSOLE=y</div><div class='del'>-# CONFIG_VGACON_SOFT_SCROLLBACK is not set</div><div class='del'>-CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='del'>-# CONFIG_SOUND is not set</div><div class='del'>-CONFIG_HID_SUPPORT=y</div><div class='del'>-CONFIG_HID=y</div><div class='del'>-CONFIG_HID_DEBUG=y</div><div class='del'>-# CONFIG_HIDRAW is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Input Devices</div><div class='del'>-#</div><div class='del'>-CONFIG_USB_HID=m</div><div class='del'>-# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='del'>-# CONFIG_HID_FF is not set</div><div class='del'>-# CONFIG_USB_HIDDEV is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB HID Boot Protocol drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_KBD is not set</div><div class='del'>-# CONFIG_USB_MOUSE is not set</div><div class='del'>-CONFIG_USB_SUPPORT=y</div><div class='del'>-CONFIG_USB_ARCH_HAS_HCD=y</div><div class='del'>-CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='del'>-CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='del'>-CONFIG_USB=m</div><div class='del'>-# CONFIG_USB_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Miscellaneous USB options</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_DEVICEFS is not set</div><div class='del'>-CONFIG_USB_DEVICE_CLASS=y</div><div class='del'>-# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='del'>-# CONFIG_USB_SUSPEND is not set</div><div class='del'>-# CONFIG_USB_PERSIST is not set</div><div class='del'>-# CONFIG_USB_OTG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Host Controller Drivers</div><div class='del'>-#</div><div class='del'>-CONFIG_USB_EHCI_HCD=m</div><div class='del'>-# CONFIG_USB_EHCI_SPLIT_ISO is not set</div><div class='del'>-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='del'>-# CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='del'>-# CONFIG_USB_ISP116X_HCD is not set</div><div class='del'>-CONFIG_USB_OHCI_HCD=m</div><div class='del'>-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='del'>-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='del'>-CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='del'>-CONFIG_USB_UHCI_HCD=m</div><div class='del'>-# CONFIG_USB_SL811_HCD is not set</div><div class='del'>-# CONFIG_USB_R8A66597_HCD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Device Class drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_ACM is not set</div><div class='del'>-# CONFIG_USB_PRINTER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# may also be needed; see USB_STORAGE Help for more information</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_STORAGE is not set</div><div class='del'>-# CONFIG_USB_LIBUSUAL is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Imaging devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_MDC800 is not set</div><div class='del'>-# CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB port drivers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Serial Converter support</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_SERIAL is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Miscellaneous drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_EMI62 is not set</div><div class='del'>-# CONFIG_USB_EMI26 is not set</div><div class='del'>-# CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='del'>-# CONFIG_USB_RIO500 is not set</div><div class='del'>-# CONFIG_USB_LEGOTOWER is not set</div><div class='del'>-# CONFIG_USB_LCD is not set</div><div class='del'>-# CONFIG_USB_BERRY_CHARGE is not set</div><div class='del'>-# CONFIG_USB_LED is not set</div><div class='del'>-# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='del'>-# CONFIG_USB_CYTHERM is not set</div><div class='del'>-# CONFIG_USB_PHIDGET is not set</div><div class='del'>-# CONFIG_USB_IDMOUSE is not set</div><div class='del'>-# CONFIG_USB_FTDI_ELAN is not set</div><div class='del'>-# CONFIG_USB_APPLEDISPLAY is not set</div><div class='del'>-# CONFIG_USB_SISUSBVGA is not set</div><div class='del'>-# CONFIG_USB_LD is not set</div><div class='del'>-# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='del'>-# CONFIG_USB_IOWARRIOR is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB DSL modem support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Gadget Support</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_GADGET is not set</div><div class='del'>-# CONFIG_MMC is not set</div><div class='del'>-# CONFIG_NEW_LEDS is not set</div><div class='del'>-CONFIG_INFINIBAND=m</div><div class='del'>-# CONFIG_INFINIBAND_USER_MAD is not set</div><div class='del'>-CONFIG_INFINIBAND_USER_ACCESS=m</div><div class='del'>-CONFIG_INFINIBAND_USER_MEM=y</div><div class='del'>-CONFIG_INFINIBAND_ADDR_TRANS=y</div><div class='del'>-CONFIG_INFINIBAND_MTHCA=m</div><div class='del'>-CONFIG_INFINIBAND_MTHCA_DEBUG=y</div><div class='del'>-# CONFIG_INFINIBAND_AMSO1100 is not set</div><div class='del'>-# CONFIG_INFINIBAND_CXGB3 is not set</div><div class='del'>-# CONFIG_MLX4_INFINIBAND is not set</div><div class='del'>-CONFIG_INFINIBAND_IPOIB=m</div><div class='del'>-# CONFIG_INFINIBAND_IPOIB_CM is not set</div><div class='del'>-CONFIG_INFINIBAND_IPOIB_DEBUG=y</div><div class='del'>-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set</div><div class='del'>-CONFIG_INFINIBAND_SRP=m</div><div class='del'>-# CONFIG_INFINIBAND_ISER is not set</div><div class='del'>-# CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='del'>-# CONFIG_UIO is not set</div><div class='del'>-CONFIG_MSPEC=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# File systems</div><div class='del'>-#</div><div class='del'>-CONFIG_EXT2_FS=y</div><div class='del'>-CONFIG_EXT2_FS_XATTR=y</div><div class='del'>-CONFIG_EXT2_FS_POSIX_ACL=y</div><div class='del'>-CONFIG_EXT2_FS_SECURITY=y</div><div class='del'>-# CONFIG_EXT2_FS_XIP is not set</div><div class='del'>-CONFIG_EXT3_FS=y</div><div class='del'>-CONFIG_EXT3_FS_XATTR=y</div><div class='del'>-CONFIG_EXT3_FS_POSIX_ACL=y</div><div class='del'>-CONFIG_EXT3_FS_SECURITY=y</div><div class='del'>-# CONFIG_EXT4DEV_FS is not set</div><div class='del'>-CONFIG_JBD=y</div><div class='del'>-# CONFIG_JBD_DEBUG is not set</div><div class='del'>-CONFIG_FS_MBCACHE=y</div><div class='del'>-CONFIG_REISERFS_FS=y</div><div class='del'>-# CONFIG_REISERFS_CHECK is not set</div><div class='del'>-# CONFIG_REISERFS_PROC_INFO is not set</div><div class='del'>-CONFIG_REISERFS_FS_XATTR=y</div><div class='del'>-CONFIG_REISERFS_FS_POSIX_ACL=y</div><div class='del'>-CONFIG_REISERFS_FS_SECURITY=y</div><div class='del'>-# CONFIG_JFS_FS is not set</div><div class='del'>-CONFIG_FS_POSIX_ACL=y</div><div class='del'>-CONFIG_XFS_FS=y</div><div class='del'>-CONFIG_XFS_QUOTA=y</div><div class='del'>-# CONFIG_XFS_SECURITY is not set</div><div class='del'>-CONFIG_XFS_POSIX_ACL=y</div><div class='del'>-CONFIG_XFS_RT=y</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='del'>-# CONFIG_OCFS2_FS is not set</div><div class='del'>-# CONFIG_MINIX_FS is not set</div><div class='del'>-# CONFIG_ROMFS_FS is not set</div><div class='del'>-CONFIG_INOTIFY=y</div><div class='del'>-CONFIG_INOTIFY_USER=y</div><div class='del'>-CONFIG_QUOTA=y</div><div class='del'>-CONFIG_QUOTA_NETLINK_INTERFACE=y</div><div class='del'>-CONFIG_PRINT_QUOTA_WARNING=y</div><div class='del'>-# CONFIG_QFMT_V1 is not set</div><div class='del'>-# CONFIG_QFMT_V2 is not set</div><div class='del'>-CONFIG_QUOTACTL=y</div><div class='del'>-CONFIG_DNOTIFY=y</div><div class='del'>-CONFIG_AUTOFS_FS=m</div><div class='del'>-CONFIG_AUTOFS4_FS=m</div><div class='del'>-CONFIG_FUSE_FS=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# CD-ROM/DVD Filesystems</div><div class='del'>-#</div><div class='del'>-CONFIG_ISO9660_FS=y</div><div class='del'>-CONFIG_JOLIET=y</div><div class='del'>-# CONFIG_ZISOFS is not set</div><div class='del'>-CONFIG_UDF_FS=m</div><div class='del'>-CONFIG_UDF_NLS=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DOS/FAT/NT Filesystems</div><div class='del'>-#</div><div class='del'>-CONFIG_FAT_FS=y</div><div class='del'>-# CONFIG_MSDOS_FS is not set</div><div class='del'>-CONFIG_VFAT_FS=y</div><div class='del'>-CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='del'>-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='del'>-# CONFIG_NTFS_FS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Pseudo filesystems</div><div class='del'>-#</div><div class='del'>-CONFIG_PROC_FS=y</div><div class='del'>-CONFIG_PROC_KCORE=y</div><div class='del'>-CONFIG_PROC_SYSCTL=y</div><div class='del'>-CONFIG_SYSFS=y</div><div class='del'>-CONFIG_TMPFS=y</div><div class='del'>-# CONFIG_TMPFS_POSIX_ACL is not set</div><div class='del'>-CONFIG_HUGETLBFS=y</div><div class='del'>-CONFIG_HUGETLB_PAGE=y</div><div class='del'>-# CONFIG_CONFIGFS_FS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Miscellaneous filesystems</div><div class='del'>-#</div><div class='del'>-# CONFIG_ADFS_FS is not set</div><div class='del'>-# CONFIG_AFFS_FS is not set</div><div class='del'>-# CONFIG_HFS_FS is not set</div><div class='del'>-# CONFIG_HFSPLUS_FS is not set</div><div class='del'>-# CONFIG_BEFS_FS is not set</div><div class='del'>-# CONFIG_BFS_FS is not set</div><div class='del'>-# CONFIG_EFS_FS is not set</div><div class='del'>-# CONFIG_CRAMFS is not set</div><div class='del'>-# CONFIG_VXFS_FS is not set</div><div class='del'>-# CONFIG_HPFS_FS is not set</div><div class='del'>-# CONFIG_QNX4FS_FS is not set</div><div class='del'>-# CONFIG_SYSV_FS is not set</div><div class='del'>-# CONFIG_UFS_FS is not set</div><div class='del'>-CONFIG_NETWORK_FILESYSTEMS=y</div><div class='del'>-CONFIG_NFS_FS=m</div><div class='del'>-CONFIG_NFS_V3=y</div><div class='del'>-# CONFIG_NFS_V3_ACL is not set</div><div class='del'>-CONFIG_NFS_V4=y</div><div class='del'>-CONFIG_NFS_DIRECTIO=y</div><div class='del'>-CONFIG_NFSD=m</div><div class='del'>-CONFIG_NFSD_V3=y</div><div class='del'>-# CONFIG_NFSD_V3_ACL is not set</div><div class='del'>-CONFIG_NFSD_V4=y</div><div class='del'>-CONFIG_NFSD_TCP=y</div><div class='del'>-CONFIG_LOCKD=m</div><div class='del'>-CONFIG_LOCKD_V4=y</div><div class='del'>-CONFIG_EXPORTFS=m</div><div class='del'>-CONFIG_NFS_COMMON=y</div><div class='del'>-CONFIG_SUNRPC=m</div><div class='del'>-CONFIG_SUNRPC_GSS=m</div><div class='del'>-CONFIG_SUNRPC_XPRT_RDMA=m</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='del'>-CONFIG_RPCSEC_GSS_KRB5=m</div><div class='del'>-# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='del'>-CONFIG_SMB_FS=m</div><div class='del'>-# CONFIG_SMB_NLS_DEFAULT is not set</div><div class='del'>-CONFIG_CIFS=m</div><div class='del'>-# CONFIG_CIFS_STATS is not set</div><div class='del'>-# CONFIG_CIFS_WEAK_PW_HASH is not set</div><div class='del'>-# CONFIG_CIFS_XATTR is not set</div><div class='del'>-# CONFIG_CIFS_DEBUG2 is not set</div><div class='del'>-# CONFIG_CIFS_EXPERIMENTAL is not set</div><div class='del'>-# CONFIG_NCP_FS is not set</div><div class='del'>-# CONFIG_CODA_FS is not set</div><div class='del'>-# CONFIG_AFS_FS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Partition Types</div><div class='del'>-#</div><div class='del'>-CONFIG_PARTITION_ADVANCED=y</div><div class='del'>-# CONFIG_ACORN_PARTITION is not set</div><div class='del'>-# CONFIG_OSF_PARTITION is not set</div><div class='del'>-# CONFIG_AMIGA_PARTITION is not set</div><div class='del'>-# CONFIG_ATARI_PARTITION is not set</div><div class='del'>-# CONFIG_MAC_PARTITION is not set</div><div class='del'>-CONFIG_MSDOS_PARTITION=y</div><div class='del'>-# CONFIG_BSD_DISKLABEL is not set</div><div class='del'>-# CONFIG_MINIX_SUBPARTITION is not set</div><div class='del'>-# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='del'>-# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='del'>-# CONFIG_LDM_PARTITION is not set</div><div class='del'>-CONFIG_SGI_PARTITION=y</div><div class='del'>-# CONFIG_ULTRIX_PARTITION is not set</div><div class='del'>-# CONFIG_SUN_PARTITION is not set</div><div class='del'>-# CONFIG_KARMA_PARTITION is not set</div><div class='del'>-CONFIG_EFI_PARTITION=y</div><div class='del'>-# CONFIG_SYSV68_PARTITION is not set</div><div class='del'>-CONFIG_NLS=y</div><div class='del'>-CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='del'>-CONFIG_NLS_CODEPAGE_437=y</div><div class='del'>-# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='del'>-# CONFIG_NLS_ISO8859_8 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='del'>-# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='del'>-# CONFIG_NLS_ASCII is not set</div><div class='del'>-CONFIG_NLS_ISO8859_1=y</div><div class='del'>-# CONFIG_NLS_ISO8859_2 is not set</div><div class='del'>-# CONFIG_NLS_ISO8859_3 is not set</div><div class='del'>-# CONFIG_NLS_ISO8859_4 is not set</div><div class='del'>-# CONFIG_NLS_ISO8859_5 is not set</div><div class='del'>-# CONFIG_NLS_ISO8859_6 is not set</div><div class='del'>-# CONFIG_NLS_ISO8859_7 is not set</div><div class='del'>-# CONFIG_NLS_ISO8859_9 is not set</div><div class='del'>-# CONFIG_NLS_ISO8859_13 is not set</div><div class='del'>-# CONFIG_NLS_ISO8859_14 is not set</div><div class='del'>-# CONFIG_NLS_ISO8859_15 is not set</div><div class='del'>-# CONFIG_NLS_KOI8_R is not set</div><div class='del'>-# CONFIG_NLS_KOI8_U is not set</div><div class='del'>-CONFIG_NLS_UTF8=y</div><div class='del'>-# CONFIG_DLM is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Library routines</div><div class='del'>-#</div><div class='del'>-CONFIG_BITREVERSE=y</div><div class='del'>-# CONFIG_CRC_CCITT is not set</div><div class='del'>-CONFIG_CRC16=m</div><div class='del'>-# CONFIG_CRC_ITU_T is not set</div><div class='del'>-CONFIG_CRC32=y</div><div class='del'>-# CONFIG_CRC7 is not set</div><div class='del'>-CONFIG_LIBCRC32C=m</div><div class='del'>-CONFIG_ZLIB_INFLATE=m</div><div class='del'>-CONFIG_ZLIB_DEFLATE=m</div><div class='del'>-CONFIG_GENERIC_ALLOCATOR=y</div><div class='del'>-CONFIG_PLIST=y</div><div class='del'>-CONFIG_HAS_IOMEM=y</div><div class='del'>-CONFIG_HAS_IOPORT=y</div><div class='del'>-CONFIG_HAS_DMA=y</div><div class='del'>-CONFIG_GENERIC_HARDIRQS=y</div><div class='del'>-CONFIG_GENERIC_IRQ_PROBE=y</div><div class='del'>-CONFIG_GENERIC_PENDING_IRQ=y</div><div class='del'>-CONFIG_IRQ_PER_CPU=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Instrumentation Support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PROFILING is not set</div><div class='del'>-# CONFIG_KPROBES is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Kernel hacking</div><div class='del'>-#</div><div class='del'>-# CONFIG_PRINTK_TIME is not set</div><div class='del'>-CONFIG_ENABLE_MUST_CHECK=y</div><div class='del'>-CONFIG_MAGIC_SYSRQ=y</div><div class='del'>-# CONFIG_UNUSED_SYMBOLS is not set</div><div class='del'>-# CONFIG_DEBUG_FS is not set</div><div class='del'>-# CONFIG_HEADERS_CHECK is not set</div><div class='del'>-CONFIG_DEBUG_KERNEL=y</div><div class='del'>-# CONFIG_DEBUG_SHIRQ is not set</div><div class='del'>-CONFIG_DETECT_SOFTLOCKUP=y</div><div class='del'>-CONFIG_SCHED_DEBUG=y</div><div class='del'>-# CONFIG_SCHEDSTATS is not set</div><div class='del'>-# CONFIG_TIMER_STATS is not set</div><div class='del'>-# CONFIG_SLUB_DEBUG_ON is not set</div><div class='del'>-# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='del'>-# CONFIG_RT_MUTEX_TESTER is not set</div><div class='del'>-# CONFIG_DEBUG_SPINLOCK is not set</div><div class='del'>-# CONFIG_DEBUG_MUTEXES is not set</div><div class='del'>-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='del'>-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='del'>-# CONFIG_DEBUG_KOBJECT is not set</div><div class='del'>-CONFIG_DEBUG_INFO=y</div><div class='del'>-# CONFIG_DEBUG_VM is not set</div><div class='del'>-# CONFIG_DEBUG_LIST is not set</div><div class='del'>-CONFIG_FORCED_INLINING=y</div><div class='del'>-# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='del'>-# CONFIG_RCU_TORTURE_TEST is not set</div><div class='del'>-# CONFIG_FAULT_INJECTION is not set</div><div class='del'>-CONFIG_IA64_GRANULE_16MB=y</div><div class='del'>-# CONFIG_IA64_GRANULE_64MB is not set</div><div class='del'>-# CONFIG_IA64_PRINT_HAZARDS is not set</div><div class='del'>-# CONFIG_DISABLE_VHPT is not set</div><div class='del'>-# CONFIG_IA64_DEBUG_CMPXCHG is not set</div><div class='del'>-# CONFIG_IA64_DEBUG_IRQ is not set</div><div class='del'>-CONFIG_SYSVIPC_COMPAT=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Security options</div><div class='del'>-#</div><div class='del'>-# CONFIG_KEYS is not set</div><div class='del'>-# CONFIG_SECURITY is not set</div><div class='del'>-# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='del'>-CONFIG_XOR_BLOCKS=y</div><div class='del'>-CONFIG_ASYNC_CORE=y</div><div class='del'>-CONFIG_ASYNC_MEMCPY=y</div><div class='del'>-CONFIG_ASYNC_XOR=y</div><div class='del'>-CONFIG_CRYPTO=y</div><div class='del'>-CONFIG_CRYPTO_ALGAPI=y</div><div class='del'>-CONFIG_CRYPTO_BLKCIPHER=m</div><div class='del'>-CONFIG_CRYPTO_HASH=y</div><div class='del'>-CONFIG_CRYPTO_MANAGER=y</div><div class='del'>-CONFIG_CRYPTO_HMAC=y</div><div class='del'>-# CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='del'>-# CONFIG_CRYPTO_MD4 is not set</div><div class='del'>-CONFIG_CRYPTO_MD5=y</div><div class='del'>-CONFIG_CRYPTO_SHA1=m</div><div class='del'>-# CONFIG_CRYPTO_SHA256 is not set</div><div class='del'>-# CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='del'>-# CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=m</div><div class='del'>-CONFIG_CRYPTO_CBC=m</div><div class='del'>-CONFIG_CRYPTO_PCBC=m</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=m</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='del'>-# CONFIG_CRYPTO_AES is not set</div><div class='del'>-# CONFIG_CRYPTO_CAST5 is not set</div><div class='del'>-# CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='del'>-# CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='del'>-CONFIG_CRYPTO_DEFLATE=m</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-CONFIG_CRYPTO_CRC32C=m</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='del'>-# CONFIG_CRYPTO_HW is not set</div><div class='head'>diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S<br/>index 06efd1f9b800..ff88c48c5d19 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/ia32/ia32_entry.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/ia32/ia32_entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/ia32/ia32_entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/ia32/ia32_entry.S</a></div><div class='hunk'>@@ -262,7 +262,7 @@ ia32_syscall_table:</div><div class='ctx'> 	data8 sys_uselib</div><div class='ctx'> 	data8 sys_swapon</div><div class='ctx'> 	data8 sys_reboot</div><div class='del'>-	data8 sys32_readdir</div><div class='add'>+	data8 compat_sys_old_readdir</div><div class='ctx'> 	data8 sys32_mmap	  /* 90 */</div><div class='ctx'> 	data8 sys32_munmap</div><div class='ctx'> 	data8 sys_truncate</div><div class='head'>diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h<br/>index c5c872b250da..dd0c53687a96 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/ia32/ia32priv.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/ia32/ia32priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/ia32/ia32priv.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/ia32/ia32priv.h</a></div><div class='hunk'>@@ -276,13 +276,6 @@ typedef struct compat_siginfo {</div><div class='ctx'> 	} _sifields;</div><div class='ctx'> } compat_siginfo_t;</div><div class='ctx'> </div><div class='del'>-struct old_linux32_dirent {</div><div class='del'>-	u32	d_ino;</div><div class='del'>-	u32	d_offset;</div><div class='del'>-	u16	d_namlen;</div><div class='del'>-	char	d_name[1];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * IA-32 ELF specific definitions for IA-64.</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c<br/>index 465116aecb85..bf196cbb3796 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/ia32/sys_ia32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/ia32/sys_ia32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/ia32/sys_ia32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/ia32/sys_ia32.c</a></div><div class='hunk'>@@ -1210,138 +1210,6 @@ sys32_settimeofday (struct compat_timeval __user *tv, struct timezone __user *tz</div><div class='ctx'> 	return do_sys_settimeofday(tv ? &amp;kts : NULL, tz ? &amp;ktz : NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct getdents32_callback {</div><div class='del'>-	struct compat_dirent __user *current_dir;</div><div class='del'>-	struct compat_dirent __user *previous;</div><div class='del'>-	int count;</div><div class='del'>-	int error;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct readdir32_callback {</div><div class='del'>-	struct old_linux32_dirent __user * dirent;</div><div class='del'>-	int count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-filldir32 (void *__buf, const char *name, int namlen, loff_t offset, u64 ino,</div><div class='del'>-	   unsigned int d_type)</div><div class='del'>-{</div><div class='del'>-	struct compat_dirent __user * dirent;</div><div class='del'>-	struct getdents32_callback * buf = (struct getdents32_callback *) __buf;</div><div class='del'>-	int reclen = ROUND_UP(offsetof(struct compat_dirent, d_name) + namlen + 1, 4);</div><div class='del'>-	u32 d_ino;</div><div class='del'>-</div><div class='del'>-	buf-&gt;error = -EINVAL;	/* only used if we fail.. */</div><div class='del'>-	if (reclen &gt; buf-&gt;count)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	d_ino = ino;</div><div class='del'>-	if (sizeof(d_ino) &lt; sizeof(ino) &amp;&amp; d_ino != ino)</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-	buf-&gt;error = -EFAULT;	/* only used if we fail.. */</div><div class='del'>-	dirent = buf-&gt;previous;</div><div class='del'>-	if (dirent)</div><div class='del'>-		if (put_user(offset, &amp;dirent-&gt;d_off))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	dirent = buf-&gt;current_dir;</div><div class='del'>-	buf-&gt;previous = dirent;</div><div class='del'>-	if (put_user(d_ino, &amp;dirent-&gt;d_ino)</div><div class='del'>-	    || put_user(reclen, &amp;dirent-&gt;d_reclen)</div><div class='del'>-	    || copy_to_user(dirent-&gt;d_name, name, namlen)</div><div class='del'>-	    || put_user(0, dirent-&gt;d_name + namlen))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	dirent = (struct compat_dirent __user *) ((char __user *) dirent + reclen);</div><div class='del'>-	buf-&gt;current_dir = dirent;</div><div class='del'>-	buf-&gt;count -= reclen;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long</div><div class='del'>-sys32_getdents (unsigned int fd, struct compat_dirent __user *dirent, unsigned int count)</div><div class='del'>-{</div><div class='del'>-	struct file * file;</div><div class='del'>-	struct compat_dirent __user * lastdirent;</div><div class='del'>-	struct getdents32_callback buf;</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	error = -EFAULT;</div><div class='del'>-	if (!access_ok(VERIFY_WRITE, dirent, count))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	error = -EBADF;</div><div class='del'>-	file = fget(fd);</div><div class='del'>-	if (!file)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	buf.current_dir = dirent;</div><div class='del'>-	buf.previous = NULL;</div><div class='del'>-	buf.count = count;</div><div class='del'>-	buf.error = 0;</div><div class='del'>-</div><div class='del'>-	error = vfs_readdir(file, filldir32, &amp;buf);</div><div class='del'>-	if (error &lt; 0)</div><div class='del'>-		goto out_putf;</div><div class='del'>-	error = buf.error;</div><div class='del'>-	lastdirent = buf.previous;</div><div class='del'>-	if (lastdirent) {</div><div class='del'>-		if (put_user(file-&gt;f_pos, &amp;lastdirent-&gt;d_off))</div><div class='del'>-			error = -EFAULT;</div><div class='del'>-		else</div><div class='del'>-			error = count - buf.count;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out_putf:</div><div class='del'>-	fput(file);</div><div class='del'>-out:</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, u64 ino,</div><div class='del'>-	      unsigned int d_type)</div><div class='del'>-{</div><div class='del'>-	struct readdir32_callback * buf = (struct readdir32_callback *) __buf;</div><div class='del'>-	struct old_linux32_dirent __user * dirent;</div><div class='del'>-	u32 d_ino;</div><div class='del'>-</div><div class='del'>-	if (buf-&gt;count)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	d_ino = ino;</div><div class='del'>-	if (sizeof(d_ino) &lt; sizeof(ino) &amp;&amp; d_ino != ino)</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-	buf-&gt;count++;</div><div class='del'>-	dirent = buf-&gt;dirent;</div><div class='del'>-	if (put_user(d_ino, &amp;dirent-&gt;d_ino)</div><div class='del'>-	    || put_user(offset, &amp;dirent-&gt;d_offset)</div><div class='del'>-	    || put_user(namlen, &amp;dirent-&gt;d_namlen)</div><div class='del'>-	    || copy_to_user(dirent-&gt;d_name, name, namlen)</div><div class='del'>-	    || put_user(0, dirent-&gt;d_name + namlen))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long</div><div class='del'>-sys32_readdir (unsigned int fd, void __user *dirent, unsigned int count)</div><div class='del'>-{</div><div class='del'>-	int error;</div><div class='del'>-	struct file * file;</div><div class='del'>-	struct readdir32_callback buf;</div><div class='del'>-</div><div class='del'>-	error = -EBADF;</div><div class='del'>-	file = fget(fd);</div><div class='del'>-	if (!file)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	buf.count = 0;</div><div class='del'>-	buf.dirent = dirent;</div><div class='del'>-</div><div class='del'>-	error = vfs_readdir(file, fillonedir32, &amp;buf);</div><div class='del'>-	if (error &gt;= 0)</div><div class='del'>-		error = buf.count;</div><div class='del'>-	fput(file);</div><div class='del'>-out:</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct sel_arg_struct {</div><div class='ctx'> 	unsigned int n;</div><div class='ctx'> 	unsigned int inp;</div><div class='head'>diff --git a/include/asm-ia64/Kbuild b/arch/ia64/include/asm/Kbuild<br/>index ccbe8ae47a61..ccbe8ae47a61 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/Kbuild?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/Kbuild</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/Kbuild</a></div><div class='head'>diff --git a/include/asm-ia64/a.out.h b/arch/ia64/include/asm/a.out.h<br/>index 193dcfb67596..193dcfb67596 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/a.out.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/a.out.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/a.out.h</a></div><div class='head'>diff --git a/include/asm-ia64/acpi-ext.h b/arch/ia64/include/asm/acpi-ext.h<br/>index 734d137dda6e..734d137dda6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/acpi-ext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/acpi-ext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/acpi-ext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/acpi-ext.h</a></div><div class='head'>diff --git a/include/asm-ia64/acpi.h b/arch/ia64/include/asm/acpi.h<br/>index fcfad326f4c7..0f82cc2934e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/acpi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/acpi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/acpi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/acpi.h</a></div><div class='hunk'>@@ -1,6 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- *  asm-ia64/acpi.h</div><div class='del'>- *</div><div class='ctx'>  *  Copyright (C) 1999 VA Linux Systems</div><div class='ctx'>  *  Copyright (C) 1999 Walt Drummond &lt;drummond@valinux.com&gt;</div><div class='ctx'>  *  Copyright (C) 2000,2001 J.I. Lee &lt;jung-ik.lee@intel.com&gt;</div><div class='head'>diff --git a/include/asm-ia64/agp.h b/arch/ia64/include/asm/agp.h<br/>index c11fdd8ab4d7..c11fdd8ab4d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/agp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/agp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/agp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/agp.h</a></div><div class='head'>diff --git a/include/asm-ia64/asmmacro.h b/arch/ia64/include/asm/asmmacro.h<br/>index c1642fd64029..c1642fd64029 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/asmmacro.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/asmmacro.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/asmmacro.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/asmmacro.h</a></div><div class='head'>diff --git a/include/asm-ia64/atomic.h b/arch/ia64/include/asm/atomic.h<br/>index 50c2b83fd5a0..50c2b83fd5a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/atomic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/atomic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/atomic.h</a></div><div class='head'>diff --git a/include/asm-ia64/auxvec.h b/arch/ia64/include/asm/auxvec.h<br/>index 23cebe5685b9..23cebe5685b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/auxvec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/auxvec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/auxvec.h</a></div><div class='head'>diff --git a/include/asm-ia64/bitops.h b/arch/ia64/include/asm/bitops.h<br/>index e2ca80037335..e2ca80037335 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/bitops.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/bitops.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/bitops.h</a></div><div class='head'>diff --git a/include/asm-ia64/break.h b/arch/ia64/include/asm/break.h<br/>index f03402039896..f03402039896 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/break.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/break.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/break.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/break.h</a></div><div class='head'>diff --git a/include/asm-ia64/bug.h b/arch/ia64/include/asm/bug.h<br/>index 823616b5020b..823616b5020b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/bug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/bug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/bug.h</a></div><div class='head'>diff --git a/include/asm-ia64/bugs.h b/arch/ia64/include/asm/bugs.h<br/>index 433523e3b2ed..433523e3b2ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/bugs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/bugs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/bugs.h</a></div><div class='head'>diff --git a/include/asm-ia64/byteorder.h b/arch/ia64/include/asm/byteorder.h<br/>index 69bd41d7c26e..69bd41d7c26e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/byteorder.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/byteorder.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/byteorder.h</a></div><div class='head'>diff --git a/include/asm-ia64/cache.h b/arch/ia64/include/asm/cache.h<br/>index e7482bd628ff..e7482bd628ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/cache.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/cache.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/cache.h</a></div><div class='head'>diff --git a/include/asm-ia64/cacheflush.h b/arch/ia64/include/asm/cacheflush.h<br/>index afcfbda76e20..afcfbda76e20 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/cacheflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/cacheflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/cacheflush.h</a></div><div class='head'>diff --git a/include/asm-ia64/checksum.h b/arch/ia64/include/asm/checksum.h<br/>index 97af155057e4..97af155057e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/checksum.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/checksum.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/checksum.h</a></div><div class='head'>diff --git a/include/asm-ia64/compat.h b/arch/ia64/include/asm/compat.h<br/>index dfcf75b8426d..dfcf75b8426d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/compat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/compat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/compat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/compat.h</a></div><div class='head'>diff --git a/include/asm-ia64/cpu.h b/arch/ia64/include/asm/cpu.h<br/>index fcca30b9f110..fcca30b9f110 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/cpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/cpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/cpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/cpu.h</a></div><div class='head'>diff --git a/include/asm-ia64/cputime.h b/arch/ia64/include/asm/cputime.h<br/>index f9abdec6577a..d20b998cb91d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/cputime.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/cputime.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/cputime.h</a></div><div class='hunk'>@@ -1,6 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-ia64/cputime.h:</div><div class='del'>- *		Definitions for measuring cputime on ia64 machines.</div><div class='add'>+ * Definitions for measuring cputime on ia64 machines.</div><div class='ctx'>  *</div><div class='ctx'>  * Based on &lt;asm-powerpc/cputime.h&gt;.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-ia64/current.h b/arch/ia64/include/asm/current.h<br/>index c659f90fbfd9..c659f90fbfd9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/current.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/current.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/current.h</a></div><div class='head'>diff --git a/include/asm-ia64/cyclone.h b/arch/ia64/include/asm/cyclone.h<br/>index 88f6500e84ab..88f6500e84ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/cyclone.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/cyclone.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/cyclone.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/cyclone.h</a></div><div class='head'>diff --git a/include/asm-ia64/delay.h b/arch/ia64/include/asm/delay.h<br/>index a30a62f235e1..a30a62f235e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/delay.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/delay.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/delay.h</a></div><div class='head'>diff --git a/include/asm-ia64/device.h b/arch/ia64/include/asm/device.h<br/>index 3db6daf7f251..3db6daf7f251 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/device.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/device.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/device.h</a></div><div class='head'>diff --git a/include/asm-ia64/div64.h b/arch/ia64/include/asm/div64.h<br/>index 6cd978cefb28..6cd978cefb28 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/div64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/div64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/div64.h</a></div><div class='head'>diff --git a/include/asm-ia64/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h<br/>index 9f0df9bd46b7..9f0df9bd46b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/dma-mapping.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/dma-mapping.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/dma-mapping.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/dma-mapping.h</a></div><div class='head'>diff --git a/include/asm-ia64/dma.h b/arch/ia64/include/asm/dma.h<br/>index 4d97f60f1ef5..4d97f60f1ef5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/dma.h</a></div><div class='head'>diff --git a/include/asm-ia64/dmi.h b/arch/ia64/include/asm/dmi.h<br/>index 00eb1b130b63..00eb1b130b63 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/dmi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/dmi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/dmi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/dmi.h</a></div><div class='head'>diff --git a/include/asm-ia64/elf.h b/arch/ia64/include/asm/elf.h<br/>index 5e0c1a6bce8d..2acb6b6543c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/elf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/elf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/elf.h</a></div><div class='hunk'>@@ -266,4 +266,19 @@ do {									\</div><div class='ctx'> 	}								\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * format for entries in the Global Offset Table</div><div class='add'>+ */</div><div class='add'>+struct got_entry {</div><div class='add'>+	uint64_t val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Layout of the Function Descriptor</div><div class='add'>+ */</div><div class='add'>+struct fdesc {</div><div class='add'>+	uint64_t ip;</div><div class='add'>+	uint64_t gp;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_IA64_ELF_H */</div><div class='head'>diff --git a/include/asm-ia64/emergency-restart.h b/arch/ia64/include/asm/emergency-restart.h<br/>index 108d8c48e42e..108d8c48e42e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/emergency-restart.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/emergency-restart.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/emergency-restart.h</a></div><div class='head'>diff --git a/include/asm-ia64/errno.h b/arch/ia64/include/asm/errno.h<br/>index 4c82b503d92f..4c82b503d92f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/errno.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/errno.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/errno.h</a></div><div class='head'>diff --git a/include/asm-ia64/esi.h b/arch/ia64/include/asm/esi.h<br/>index 40991c6ba647..40991c6ba647 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/esi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/esi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/esi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/esi.h</a></div><div class='head'>diff --git a/include/asm-ia64/fb.h b/arch/ia64/include/asm/fb.h<br/>index 89a397cee90a..89a397cee90a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/fb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/fb.h</a></div><div class='head'>diff --git a/include/asm-ia64/fcntl.h b/arch/ia64/include/asm/fcntl.h<br/>index 1dd275dc8f65..1dd275dc8f65 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/fcntl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/fcntl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/fcntl.h</a></div><div class='head'>diff --git a/include/asm-ia64/fpswa.h b/arch/ia64/include/asm/fpswa.h<br/>index 62edfceadaa6..62edfceadaa6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/fpswa.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/fpswa.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/fpswa.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/fpswa.h</a></div><div class='head'>diff --git a/include/asm-ia64/fpu.h b/arch/ia64/include/asm/fpu.h<br/>index 3859558ff0a4..3859558ff0a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/fpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/fpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/fpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/fpu.h</a></div><div class='head'>diff --git a/include/asm-ia64/futex.h b/arch/ia64/include/asm/futex.h<br/>index c7f0f062239c..c7f0f062239c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/futex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/futex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/futex.h</a></div><div class='head'>diff --git a/include/asm-ia64/gcc_intrin.h b/arch/ia64/include/asm/gcc_intrin.h<br/>index 0f5b55921758..0f5b55921758 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/gcc_intrin.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/gcc_intrin.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/gcc_intrin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/gcc_intrin.h</a></div><div class='head'>diff --git a/include/asm-ia64/hardirq.h b/arch/ia64/include/asm/hardirq.h<br/>index 140e495b8e0e..140e495b8e0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/hardirq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/hardirq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/hardirq.h</a></div><div class='head'>diff --git a/include/asm-ia64/hpsim.h b/arch/ia64/include/asm/hpsim.h<br/>index 892ab198a9da..892ab198a9da 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/hpsim.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/hpsim.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/hpsim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/hpsim.h</a></div><div class='head'>diff --git a/include/asm-ia64/hugetlb.h b/arch/ia64/include/asm/hugetlb.h<br/>index da55c63728e0..da55c63728e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/hugetlb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/hugetlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/hugetlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/hugetlb.h</a></div><div class='head'>diff --git a/include/asm-ia64/hw_irq.h b/arch/ia64/include/asm/hw_irq.h<br/>index 5c99cbcb8a0d..5c99cbcb8a0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/hw_irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/hw_irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/hw_irq.h</a></div><div class='head'>diff --git a/include/asm-ia64/ia32.h b/arch/ia64/include/asm/ia32.h<br/>index 2390ee145aa1..2390ee145aa1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/ia32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/ia32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/ia32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ia32.h</a></div><div class='head'>diff --git a/include/asm-ia64/ia64regs.h b/arch/ia64/include/asm/ia64regs.h<br/>index 1757f1c11ad4..1757f1c11ad4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/ia64regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/ia64regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/ia64regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ia64regs.h</a></div><div class='head'>diff --git a/include/asm-ia64/intel_intrin.h b/arch/ia64/include/asm/intel_intrin.h<br/>index 53cec577558a..53cec577558a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/intel_intrin.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/intel_intrin.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/intel_intrin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/intel_intrin.h</a></div><div class='head'>diff --git a/include/asm-ia64/intrinsics.h b/arch/ia64/include/asm/intrinsics.h<br/>index 47d686dba1eb..47d686dba1eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/intrinsics.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/intrinsics.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/intrinsics.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/intrinsics.h</a></div><div class='head'>diff --git a/include/asm-ia64/io.h b/arch/ia64/include/asm/io.h<br/>index 260a85ac9d6a..7f257507cd86 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/io.h</a></div><div class='hunk'>@@ -19,6 +19,8 @@</div><div class='ctx'>  * Copyright (C) 1999 Don Dugger &lt;don.dugger@intel.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/unaligned.h&gt;</div><div class='add'>+</div><div class='ctx'> /* We don't use IO slowdowns on the ia64, but.. */</div><div class='ctx'> #define __SLOW_DOWN_IO	do { } while (0)</div><div class='ctx'> #define SLOW_DOWN_IO	do { } while (0)</div><div class='hunk'>@@ -241,7 +243,7 @@ __insw (unsigned long port, void *dst, unsigned long count)</div><div class='ctx'> 	unsigned short *dp = dst;</div><div class='ctx'> </div><div class='ctx'> 	while (count--)</div><div class='del'>-		*dp++ = platform_inw(port);</div><div class='add'>+		put_unaligned(platform_inw(port), dp++);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='hunk'>@@ -250,7 +252,7 @@ __insl (unsigned long port, void *dst, unsigned long count)</div><div class='ctx'> 	unsigned int *dp = dst;</div><div class='ctx'> </div><div class='ctx'> 	while (count--)</div><div class='del'>-		*dp++ = platform_inl(port);</div><div class='add'>+		put_unaligned(platform_inl(port), dp++);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='hunk'>@@ -268,7 +270,7 @@ __outsw (unsigned long port, const void *src, unsigned long count)</div><div class='ctx'> 	const unsigned short *sp = src;</div><div class='ctx'> </div><div class='ctx'> 	while (count--)</div><div class='del'>-		platform_outw(*sp++, port);</div><div class='add'>+		platform_outw(get_unaligned(sp++), port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='hunk'>@@ -277,7 +279,7 @@ __outsl (unsigned long port, const void *src, unsigned long count)</div><div class='ctx'> 	const unsigned int *sp = src;</div><div class='ctx'> </div><div class='ctx'> 	while (count--)</div><div class='del'>-		platform_outl(*sp++, port);</div><div class='add'>+		platform_outl(get_unaligned(sp++), port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/include/asm-ia64/ioctl.h b/arch/ia64/include/asm/ioctl.h<br/>index b279fe06dfe5..b279fe06dfe5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/ioctl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/ioctl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ioctl.h</a></div><div class='head'>diff --git a/include/asm-ia64/ioctls.h b/arch/ia64/include/asm/ioctls.h<br/>index f41b636a0bf6..f41b636a0bf6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/ioctls.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/ioctls.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ioctls.h</a></div><div class='head'>diff --git a/include/asm-ia64/iosapic.h b/arch/ia64/include/asm/iosapic.h<br/>index b9c102e15f22..b9c102e15f22 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/iosapic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/iosapic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/iosapic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/iosapic.h</a></div><div class='head'>diff --git a/include/asm-ia64/ipcbuf.h b/arch/ia64/include/asm/ipcbuf.h<br/>index 079899ae7d32..079899ae7d32 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/ipcbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ipcbuf.h</a></div><div class='head'>diff --git a/include/asm-ia64/irq.h b/arch/ia64/include/asm/irq.h<br/>index 3627116fb0e2..3627116fb0e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/irq.h</a></div><div class='head'>diff --git a/include/asm-ia64/irq_regs.h b/arch/ia64/include/asm/irq_regs.h<br/>index 3dd9c0b70270..3dd9c0b70270 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/irq_regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/irq_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/irq_regs.h</a></div><div class='head'>diff --git a/include/asm-ia64/kdebug.h b/arch/ia64/include/asm/kdebug.h<br/>index 35e49407d06c..d11a69855036 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/kdebug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/kdebug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/kdebug.h</a></div><div class='hunk'>@@ -1,8 +1,6 @@</div><div class='ctx'> #ifndef _IA64_KDEBUG_H</div><div class='ctx'> #define _IA64_KDEBUG_H 1</div><div class='ctx'> /*</div><div class='del'>- * include/asm-ia64/kdebug.h</div><div class='del'>- *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='ctx'>  * the Free Software Foundation; either version 2 of the License, or</div><div class='head'>diff --git a/include/asm-ia64/kexec.h b/arch/ia64/include/asm/kexec.h<br/>index 541be835fc5a..e1d58f819d78 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/kexec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/kexec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/kexec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/kexec.h</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> /* Maximum address we can use for the control code buffer */</div><div class='ctx'> #define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE</div><div class='ctx'> </div><div class='del'>-#define KEXEC_CONTROL_CODE_SIZE (8192 + 8192 + 4096)</div><div class='add'>+#define KEXEC_CONTROL_PAGE_SIZE (8192 + 8192 + 4096)</div><div class='ctx'> </div><div class='ctx'> /* The native architecture */</div><div class='ctx'> #define KEXEC_ARCH KEXEC_ARCH_IA_64</div><div class='head'>diff --git a/include/asm-ia64/kmap_types.h b/arch/ia64/include/asm/kmap_types.h<br/>index 5d1658aa2b3b..5d1658aa2b3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/kmap_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/kmap_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/kmap_types.h</a></div><div class='head'>diff --git a/include/asm-ia64/kprobes.h b/arch/ia64/include/asm/kprobes.h<br/>index ef71b57fc2f4..dbf83fb28db3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/kprobes.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/kprobes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/kprobes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/kprobes.h</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'> #define _ASM_KPROBES_H</div><div class='ctx'> /*</div><div class='ctx'>  *  Kernel Probes (KProbes)</div><div class='del'>- *  include/asm-ia64/kprobes.h</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/include/asm-ia64/kregs.h b/arch/ia64/include/asm/kregs.h<br/>index aefcdfee7f23..aefcdfee7f23 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/kregs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/kregs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/kregs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/kregs.h</a></div><div class='head'>diff --git a/include/asm-ia64/kvm.h b/arch/ia64/include/asm/kvm.h<br/>index 3f6a090cbd9a..f38472ac2267 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/kvm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/kvm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/kvm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/kvm.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> #define __ASM_IA64_KVM_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * asm-ia64/kvm.h: kvm structure definitions  for ia64</div><div class='add'>+ * kvm structure definitions  for ia64</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Xiantao Zhang &lt;xiantao.zhang@intel.com&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-ia64/kvm_host.h b/arch/ia64/include/asm/kvm_host.h<br/>index 1efe513a9941..1efe513a9941 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/kvm_host.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/kvm_host.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/kvm_host.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/kvm_host.h</a></div><div class='head'>diff --git a/include/asm-ia64/kvm_para.h b/arch/ia64/include/asm/kvm_para.h<br/>index 9f9796bb3441..0d6d8ca07b8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/kvm_para.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/kvm_para.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/kvm_para.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/kvm_para.h</a></div><div class='hunk'>@@ -2,8 +2,6 @@</div><div class='ctx'> #define __IA64_KVM_PARA_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * asm-ia64/kvm_para.h</div><div class='del'>- *</div><div class='ctx'>  * Copyright (C) 2007 Xiantao Zhang &lt;xiantao.zhang@intel.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify it</div><div class='head'>diff --git a/include/asm-ia64/libata-portmap.h b/arch/ia64/include/asm/libata-portmap.h<br/>index 0e00c9a9f410..0e00c9a9f410 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/libata-portmap.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/libata-portmap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/libata-portmap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/libata-portmap.h</a></div><div class='head'>diff --git a/include/asm-ia64/linkage.h b/arch/ia64/include/asm/linkage.h<br/>index ef22a45c1890..ef22a45c1890 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/linkage.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/linkage.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/linkage.h</a></div><div class='head'>diff --git a/include/asm-ia64/local.h b/arch/ia64/include/asm/local.h<br/>index c11c530f74d0..c11c530f74d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/local.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/local.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/local.h</a></div><div class='head'>diff --git a/include/asm-ia64/machvec.h b/arch/ia64/include/asm/machvec.h<br/>index a6d50c77b6bf..2b850ccafef5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/machvec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/machvec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/machvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/machvec.h</a></div><div class='hunk'>@@ -290,7 +290,7 @@ extern void machvec_init (const char *name);</div><div class='ctx'> extern void machvec_init_from_cmdline(const char *cmdline);</div><div class='ctx'> </div><div class='ctx'> # else</div><div class='del'>-#  error Unknown configuration.  Update asm-ia64/machvec.h.</div><div class='add'>+#  error Unknown configuration.  Update arch/ia64/include/asm/machvec.h.</div><div class='ctx'> # endif /* CONFIG_IA64_GENERIC */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/include/asm-ia64/machvec_dig.h b/arch/ia64/include/asm/machvec_dig.h<br/>index 8a0752f40987..8a0752f40987 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/machvec_dig.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/machvec_dig.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/machvec_dig.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/machvec_dig.h</a></div><div class='head'>diff --git a/include/asm-ia64/machvec_hpsim.h b/arch/ia64/include/asm/machvec_hpsim.h<br/>index cf72fc87fdfe..cf72fc87fdfe 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/machvec_hpsim.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/machvec_hpsim.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/machvec_hpsim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/machvec_hpsim.h</a></div><div class='head'>diff --git a/include/asm-ia64/machvec_hpzx1.h b/arch/ia64/include/asm/machvec_hpzx1.h<br/>index 2f57f5144b9f..2f57f5144b9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/machvec_hpzx1.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/machvec_hpzx1.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/machvec_hpzx1.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/machvec_hpzx1.h</a></div><div class='head'>diff --git a/include/asm-ia64/machvec_hpzx1_swiotlb.h b/arch/ia64/include/asm/machvec_hpzx1_swiotlb.h<br/>index a842cdda827b..a842cdda827b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/machvec_hpzx1_swiotlb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/machvec_hpzx1_swiotlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/machvec_hpzx1_swiotlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/machvec_hpzx1_swiotlb.h</a></div><div class='head'>diff --git a/include/asm-ia64/machvec_init.h b/arch/ia64/include/asm/machvec_init.h<br/>index 7f21249fba3f..7f21249fba3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/machvec_init.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/machvec_init.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/machvec_init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/machvec_init.h</a></div><div class='head'>diff --git a/include/asm-ia64/machvec_sn2.h b/arch/ia64/include/asm/machvec_sn2.h<br/>index 781308ea7b88..781308ea7b88 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/machvec_sn2.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/machvec_sn2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/machvec_sn2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/machvec_sn2.h</a></div><div class='head'>diff --git a/include/asm-ia64/machvec_uv.h b/arch/ia64/include/asm/machvec_uv.h<br/>index 2931447f3813..2931447f3813 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/machvec_uv.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/machvec_uv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/machvec_uv.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/machvec_uv.h</a></div><div class='head'>diff --git a/include/asm-ia64/mc146818rtc.h b/arch/ia64/include/asm/mc146818rtc.h<br/>index 407787a237ba..407787a237ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/mc146818rtc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/mc146818rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/mc146818rtc.h</a></div><div class='head'>diff --git a/include/asm-ia64/mca.h b/arch/ia64/include/asm/mca.h<br/>index 18a4321349a3..18a4321349a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/mca.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/mca.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/mca.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/mca.h</a></div><div class='head'>diff --git a/include/asm-ia64/mca_asm.h b/arch/ia64/include/asm/mca_asm.h<br/>index dd2a5b134390..dd2a5b134390 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/mca_asm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/mca_asm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/mca_asm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/mca_asm.h</a></div><div class='head'>diff --git a/include/asm-ia64/meminit.h b/arch/ia64/include/asm/meminit.h<br/>index 7245a5781594..7245a5781594 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/meminit.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/meminit.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/meminit.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/meminit.h</a></div><div class='head'>diff --git a/include/asm-ia64/mman.h b/arch/ia64/include/asm/mman.h<br/>index c73b87832a1e..c73b87832a1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/mman.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/mman.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/mman.h</a></div><div class='head'>diff --git a/include/asm-ia64/mmu.h b/arch/ia64/include/asm/mmu.h<br/>index 611432ba579c..611432ba579c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/mmu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/mmu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/mmu.h</a></div><div class='head'>diff --git a/include/asm-ia64/mmu_context.h b/arch/ia64/include/asm/mmu_context.h<br/>index 040bc87db930..040bc87db930 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/mmu_context.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/mmu_context.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/mmu_context.h</a></div><div class='head'>diff --git a/include/asm-ia64/mmzone.h b/arch/ia64/include/asm/mmzone.h<br/>index 34efe88eb849..34efe88eb849 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/mmzone.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/mmzone.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/mmzone.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/mmzone.h</a></div><div class='head'>diff --git a/include/asm-ia64/module.h b/arch/ia64/include/asm/module.h<br/>index d2da61e4c49b..d2da61e4c49b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/module.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/module.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/module.h</a></div><div class='head'>diff --git a/include/asm-ia64/msgbuf.h b/arch/ia64/include/asm/msgbuf.h<br/>index 6c64c0d2aae1..6c64c0d2aae1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/msgbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/msgbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/msgbuf.h</a></div><div class='head'>diff --git a/include/asm-ia64/mutex.h b/arch/ia64/include/asm/mutex.h<br/>index bed73a643a56..bed73a643a56 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/mutex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/mutex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/mutex.h</a></div><div class='head'>diff --git a/include/asm-ia64/native/inst.h b/arch/ia64/include/asm/native/inst.h<br/>index c953a2ca4fce..c8efbf7b849e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/native/inst.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/native/inst.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/native/inst.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/native/inst.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /******************************************************************************</div><div class='del'>- * include/asm-ia64/native/inst.h</div><div class='add'>+ * arch/ia64/include/asm/native/inst.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2008 Isaku Yamahata &lt;yamahata at valinux co jp&gt;</div><div class='ctx'>  *                    VA Linux Systems Japan K.K.</div><div class='head'>diff --git a/include/asm-ia64/native/irq.h b/arch/ia64/include/asm/native/irq.h<br/>index efe9ff74a3c4..887a228e2edb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/native/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/native/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/native/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/native/irq.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /******************************************************************************</div><div class='del'>- * include/asm-ia64/native/irq.h</div><div class='add'>+ * arch/ia64/include/asm/native/irq.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2008 Isaku Yamahata &lt;yamahata at valinux co jp&gt;</div><div class='ctx'>  *                    VA Linux Systems Japan K.K.</div><div class='hunk'>@@ -17,8 +17,6 @@</div><div class='ctx'>  * You should have received a copy of the GNU General Public License</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='del'>- *</div><div class='del'>- * moved from linux/include/asm-ia64/irq.h.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _ASM_IA64_NATIVE_IRQ_H</div><div class='head'>diff --git a/include/asm-ia64/nodedata.h b/arch/ia64/include/asm/nodedata.h<br/>index 2fb337b0e9b7..2fb337b0e9b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/nodedata.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/nodedata.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/nodedata.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/nodedata.h</a></div><div class='head'>diff --git a/include/asm-ia64/numa.h b/arch/ia64/include/asm/numa.h<br/>index 3499ff57bf42..3499ff57bf42 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/numa.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/numa.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/numa.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/numa.h</a></div><div class='head'>diff --git a/include/asm-ia64/page.h b/arch/ia64/include/asm/page.h<br/>index 5f271bc712ee..5f271bc712ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/page.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/page.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/page.h</a></div><div class='head'>diff --git a/include/asm-ia64/pal.h b/arch/ia64/include/asm/pal.h<br/>index 67b02901ead4..67b02901ead4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/pal.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/pal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/pal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/pal.h</a></div><div class='head'>diff --git a/include/asm-ia64/param.h b/arch/ia64/include/asm/param.h<br/>index 0964c32c1358..0964c32c1358 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/param.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/param.h</a></div><div class='head'>diff --git a/include/asm-ia64/paravirt.h b/arch/ia64/include/asm/paravirt.h<br/>index 1b4df129f579..660cab044834 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/paravirt.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/paravirt.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/paravirt.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/paravirt.h</a></div><div class='hunk'>@@ -1,6 +1,4 @@</div><div class='ctx'> /******************************************************************************</div><div class='del'>- * include/asm-ia64/paravirt.h</div><div class='del'>- *</div><div class='ctx'>  * Copyright (c) 2008 Isaku Yamahata &lt;yamahata at valinux co jp&gt;</div><div class='ctx'>  *                    VA Linux Systems Japan K.K.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-ia64/paravirt_privop.h b/arch/ia64/include/asm/paravirt_privop.h<br/>index 52482e6940ac..d577aac11835 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/paravirt_privop.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/paravirt_privop.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/paravirt_privop.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/paravirt_privop.h</a></div><div class='hunk'>@@ -1,6 +1,4 @@</div><div class='ctx'> /******************************************************************************</div><div class='del'>- * include/asm-ia64/paravirt_privops.h</div><div class='del'>- *</div><div class='ctx'>  * Copyright (c) 2008 Isaku Yamahata &lt;yamahata at valinux co jp&gt;</div><div class='ctx'>  *                    VA Linux Systems Japan K.K.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-ia64/parport.h b/arch/ia64/include/asm/parport.h<br/>index 67e16adfcd25..67e16adfcd25 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/parport.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/parport.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/parport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/parport.h</a></div><div class='head'>diff --git a/include/asm-ia64/patch.h b/arch/ia64/include/asm/patch.h<br/>index 295fe6ab4584..295fe6ab4584 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/patch.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/patch.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/patch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/patch.h</a></div><div class='head'>diff --git a/include/asm-ia64/pci.h b/arch/ia64/include/asm/pci.h<br/>index 0149097b736d..0149097b736d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/pci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/pci.h</a></div><div class='head'>diff --git a/include/asm-ia64/percpu.h b/arch/ia64/include/asm/percpu.h<br/>index 77f30b664b4e..77f30b664b4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/percpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/percpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/percpu.h</a></div><div class='head'>diff --git a/include/asm-ia64/perfmon.h b/arch/ia64/include/asm/perfmon.h<br/>index 7f3333dd00e4..7f3333dd00e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/perfmon.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/perfmon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/perfmon.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/perfmon.h</a></div><div class='head'>diff --git a/include/asm-ia64/perfmon_default_smpl.h b/arch/ia64/include/asm/perfmon_default_smpl.h<br/>index 48822c0811d8..48822c0811d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/perfmon_default_smpl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/perfmon_default_smpl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/perfmon_default_smpl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/perfmon_default_smpl.h</a></div><div class='head'>diff --git a/include/asm-ia64/pgalloc.h b/arch/ia64/include/asm/pgalloc.h<br/>index b9ac1a6fc216..b9ac1a6fc216 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/pgalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/pgalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/pgalloc.h</a></div><div class='head'>diff --git a/include/asm-ia64/pgtable.h b/arch/ia64/include/asm/pgtable.h<br/>index 7a9bff47564f..7a9bff47564f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/pgtable.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/pgtable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/pgtable.h</a></div><div class='head'>diff --git a/include/asm-ia64/poll.h b/arch/ia64/include/asm/poll.h<br/>index c98509d3149e..c98509d3149e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/poll.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/poll.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/poll.h</a></div><div class='head'>diff --git a/include/asm-ia64/posix_types.h b/arch/ia64/include/asm/posix_types.h<br/>index 17885567b731..17885567b731 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/posix_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/posix_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/posix_types.h</a></div><div class='head'>diff --git a/include/asm-ia64/processor.h b/arch/ia64/include/asm/processor.h<br/>index f88fa054d01d..f88fa054d01d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/processor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/processor.h</a></div><div class='head'>diff --git a/include/asm-ia64/ptrace.h b/arch/ia64/include/asm/ptrace.h<br/>index 15f8dcfe6eee..15f8dcfe6eee 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/ptrace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ptrace.h</a></div><div class='head'>diff --git a/include/asm-ia64/ptrace_offsets.h b/arch/ia64/include/asm/ptrace_offsets.h<br/>index b712773c759e..b712773c759e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/ptrace_offsets.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/ptrace_offsets.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/ptrace_offsets.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ptrace_offsets.h</a></div><div class='head'>diff --git a/include/asm-ia64/resource.h b/arch/ia64/include/asm/resource.h<br/>index ba2272a87fc7..ba2272a87fc7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/resource.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/resource.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/resource.h</a></div><div class='head'>diff --git a/include/asm-ia64/rse.h b/arch/ia64/include/asm/rse.h<br/>index 02830a3b0196..02830a3b0196 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/rse.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/rse.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/rse.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/rse.h</a></div><div class='head'>diff --git a/include/asm-ia64/rwsem.h b/arch/ia64/include/asm/rwsem.h<br/>index 8aba06a7b038..fbee74b15782 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/rwsem.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/rwsem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/rwsem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/rwsem.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * asm-ia64/rwsem.h: R/W semaphores for ia64</div><div class='add'>+ * R/W semaphores for ia64</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2003 Ken Chen &lt;kenneth.w.chen@intel.com&gt;</div><div class='ctx'>  * Copyright (C) 2003 Asit Mallick &lt;asit.k.mallick@intel.com&gt;</div><div class='head'>diff --git a/include/asm-ia64/sal.h b/arch/ia64/include/asm/sal.h<br/>index 89594b442f83..ea310c0812aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sal.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sal.h</a></div><div class='hunk'>@@ -236,7 +236,7 @@ extern struct ia64_sal_desc_ptc *ia64_ptc_domain_info;</div><div class='ctx'> </div><div class='ctx'> extern unsigned short sal_revision;	/* supported SAL spec revision */</div><div class='ctx'> extern unsigned short sal_version;	/* SAL version; OEM dependent */</div><div class='del'>-#define SAL_VERSION_CODE(major, minor) ((BIN2BCD(major) &lt;&lt; 8) | BIN2BCD(minor))</div><div class='add'>+#define SAL_VERSION_CODE(major, minor) ((bin2bcd(major) &lt;&lt; 8) | bin2bcd(minor))</div><div class='ctx'> </div><div class='ctx'> extern const char *ia64_sal_strerror (long status);</div><div class='ctx'> extern void ia64_sal_init (struct ia64_sal_systab *sal_systab);</div><div class='head'>diff --git a/include/asm-ia64/scatterlist.h b/arch/ia64/include/asm/scatterlist.h<br/>index d6f57874041d..d6f57874041d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/scatterlist.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/scatterlist.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/scatterlist.h</a></div><div class='head'>diff --git a/include/asm-ia64/sections.h b/arch/ia64/include/asm/sections.h<br/>index 7286e4a9fe84..f66799891036 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sections.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sections.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sections.h</a></div><div class='hunk'>@@ -6,6 +6,8 @@</div><div class='ctx'>  *	David Mosberger-Tang &lt;davidm@hpl.hp.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/elf.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm-generic/sections.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern char __per_cpu_start[], __per_cpu_end[], __phys_per_cpu_start[];</div><div class='hunk'>@@ -21,5 +23,17 @@ extern char __start_gate_brl_fsys_bubble_down_patchlist[], __end_gate_brl_fsys_b</div><div class='ctx'> extern char __start_unwind[], __end_unwind[];</div><div class='ctx'> extern char __start_ivt_text[], __end_ivt_text[];</div><div class='ctx'> </div><div class='add'>+#undef dereference_function_descriptor</div><div class='add'>+static inline void *dereference_function_descriptor(void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct fdesc *desc = ptr;</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	if (!probe_kernel_address(&amp;desc-&gt;ip, p))</div><div class='add'>+		ptr = p;</div><div class='add'>+	return ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_IA64_SECTIONS_H */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-ia64/segment.h b/arch/ia64/include/asm/segment.h<br/>index b89e2b3d648f..b89e2b3d648f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/segment.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/segment.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/segment.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/segment.h</a></div><div class='head'>diff --git a/include/asm-ia64/sembuf.h b/arch/ia64/include/asm/sembuf.h<br/>index 1340fbc04d3e..1340fbc04d3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sembuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sembuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sembuf.h</a></div><div class='head'>diff --git a/include/asm-ia64/serial.h b/arch/ia64/include/asm/serial.h<br/>index 0c7a2f3dcf13..068be11583df 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/serial.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/serial.h</a></div><div class='hunk'>@@ -1,6 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-ia64/serial.h</div><div class='del'>- *</div><div class='ctx'>  * Derived from the i386 version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-ia64/setup.h b/arch/ia64/include/asm/setup.h<br/>index 4399a44355b3..4399a44355b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/setup.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/setup.h</a></div><div class='head'>diff --git a/include/asm-ia64/shmbuf.h b/arch/ia64/include/asm/shmbuf.h<br/>index 585002a77acd..585002a77acd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/shmbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/shmbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/shmbuf.h</a></div><div class='head'>diff --git a/include/asm-ia64/shmparam.h b/arch/ia64/include/asm/shmparam.h<br/>index d07508dc54ae..d07508dc54ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/shmparam.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/shmparam.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/shmparam.h</a></div><div class='head'>diff --git a/include/asm-ia64/sigcontext.h b/arch/ia64/include/asm/sigcontext.h<br/>index 57ff777bcc40..57ff777bcc40 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sigcontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sigcontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sigcontext.h</a></div><div class='head'>diff --git a/include/asm-ia64/siginfo.h b/arch/ia64/include/asm/siginfo.h<br/>index 9294e4b0c8bc..9294e4b0c8bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/siginfo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/siginfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/siginfo.h</a></div><div class='head'>diff --git a/include/asm-ia64/signal.h b/arch/ia64/include/asm/signal.h<br/>index 4f5ca5643cb1..4f5ca5643cb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/signal.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/signal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/signal.h</a></div><div class='head'>diff --git a/include/asm-ia64/smp.h b/arch/ia64/include/asm/smp.h<br/>index 12d96e0cd513..12d96e0cd513 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/smp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/smp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/smp.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/acpi.h b/arch/ia64/include/asm/sn/acpi.h<br/>index 9ce2801cbd57..9ce2801cbd57 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/acpi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/acpi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/acpi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/acpi.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/addrs.h b/arch/ia64/include/asm/sn/addrs.h<br/>index e715c794b186..e715c794b186 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/addrs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/addrs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/addrs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/addrs.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/arch.h b/arch/ia64/include/asm/sn/arch.h<br/>index 7caa1f44cd95..7caa1f44cd95 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/arch.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/arch.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/arch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/arch.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/bte.h b/arch/ia64/include/asm/sn/bte.h<br/>index a0d214f43115..5efecf06c9a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/bte.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/bte.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/bte.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/bte.h</a></div><div class='hunk'>@@ -223,10 +223,11 @@ extern void bte_error_handler(unsigned long);</div><div class='ctx'>  * until the transfer is complete.  In order to get the asynch</div><div class='ctx'>  * version of bte_copy, you must perform this check yourself.</div><div class='ctx'>  */</div><div class='del'>-#define BTE_UNALIGNED_COPY(src, dest, len, mode)                        \</div><div class='del'>-	(((len &amp; L1_CACHE_MASK) || (src &amp; L1_CACHE_MASK) ||             \</div><div class='del'>-	  (dest &amp; L1_CACHE_MASK)) ?                                     \</div><div class='del'>-	 bte_unaligned_copy(src, dest, len, mode) :              	\</div><div class='add'>+#define BTE_UNALIGNED_COPY(src, dest, len, mode)			\</div><div class='add'>+	(((len &amp; (L1_CACHE_BYTES - 1)) ||				\</div><div class='add'>+	  (src &amp; (L1_CACHE_BYTES - 1)) ||				\</div><div class='add'>+	  (dest &amp; (L1_CACHE_BYTES - 1))) ?				\</div><div class='add'>+	 bte_unaligned_copy(src, dest, len, mode) :			\</div><div class='ctx'> 	 bte_copy(src, dest, len, mode, NULL))</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-ia64/sn/clksupport.h b/arch/ia64/include/asm/sn/clksupport.h<br/>index d340c365a824..d340c365a824 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/clksupport.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/clksupport.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/clksupport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/clksupport.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/geo.h b/arch/ia64/include/asm/sn/geo.h<br/>index f083c9434066..f083c9434066 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/geo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/geo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/geo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/geo.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/intr.h b/arch/ia64/include/asm/sn/intr.h<br/>index e0487aa97418..e0487aa97418 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/intr.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/intr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/intr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/intr.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/io.h b/arch/ia64/include/asm/sn/io.h<br/>index 41c73a735628..41c73a735628 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/io.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/ioc3.h b/arch/ia64/include/asm/sn/ioc3.h<br/>index 95ed6cc83cf1..95ed6cc83cf1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/ioc3.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/ioc3.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/ioc3.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/ioc3.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/klconfig.h b/arch/ia64/include/asm/sn/klconfig.h<br/>index bcbf209d63be..bcbf209d63be 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/klconfig.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/klconfig.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/klconfig.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/klconfig.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/l1.h b/arch/ia64/include/asm/sn/l1.h<br/>index 344bf44bb356..344bf44bb356 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/l1.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/l1.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/l1.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/l1.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/leds.h b/arch/ia64/include/asm/sn/leds.h<br/>index 66cf8c4d92c9..66cf8c4d92c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/leds.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/leds.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/leds.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/leds.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/module.h b/arch/ia64/include/asm/sn/module.h<br/>index 734e980ece2f..734e980ece2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/module.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/module.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/module.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/mspec.h b/arch/ia64/include/asm/sn/mspec.h<br/>index dbe13c6121a8..c1d3c50c3223 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/mspec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/mspec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/mspec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/mspec.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  * License.  See the file "COPYING" in the main directory of this archive</div><div class='ctx'>  * for more details.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2001-2004 Silicon Graphics, Inc.  All rights reserved.</div><div class='add'>+ * Copyright (c) 2001-2008 Silicon Graphics, Inc.  All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _ASM_IA64_SN_MSPEC_H</div><div class='hunk'>@@ -32,26 +32,26 @@</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Each Atomic Memory Operation (AMO formerly known as fetchop)</div><div class='add'>+ * Each Atomic Memory Operation (amo, formerly known as fetchop)</div><div class='ctx'>  * variable is 64 bytes long.  The first 8 bytes are used.  The</div><div class='ctx'>  * remaining 56 bytes are unaddressable due to the operation taking</div><div class='ctx'>  * that portion of the address.</div><div class='ctx'>  *</div><div class='del'>- * NOTE: The AMO_t _MUST_ be placed in either the first or second half</div><div class='del'>- * of the cache line.  The cache line _MUST NOT_ be used for anything</div><div class='del'>- * other than additional AMO_t entries.  This is because there are two</div><div class='add'>+ * NOTE: The amo structure _MUST_ be placed in either the first or second</div><div class='add'>+ * half of the cache line.  The cache line _MUST NOT_ be used for anything</div><div class='add'>+ * other than additional amo entries.  This is because there are two</div><div class='ctx'>  * addresses which reference the same physical cache line.  One will</div><div class='ctx'>  * be a cached entry with the memory type bits all set.  This address</div><div class='del'>- * may be loaded into processor cache.  The AMO_t will be referenced</div><div class='add'>+ * may be loaded into processor cache.  The amo will be referenced</div><div class='ctx'>  * uncached via the memory special memory type.  If any portion of the</div><div class='ctx'>  * cached cache-line is modified, when that line is flushed, it will</div><div class='ctx'>  * overwrite the uncached value in physical memory and lead to</div><div class='ctx'>  * inconsistency.</div><div class='ctx'>  */</div><div class='del'>-typedef struct {</div><div class='add'>+struct amo {</div><div class='ctx'>         u64 variable;</div><div class='ctx'>         u64 unused[7];</div><div class='del'>-} AMO_t;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='head'>diff --git a/include/asm-ia64/sn/nodepda.h b/arch/ia64/include/asm/sn/nodepda.h<br/>index ee118b901de4..ee118b901de4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/nodepda.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/nodepda.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/nodepda.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/nodepda.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/pcibr_provider.h b/arch/ia64/include/asm/sn/pcibr_provider.h<br/>index da205b7cdaac..da205b7cdaac 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/pcibr_provider.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/pcibr_provider.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/pcibr_provider.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/pcibr_provider.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/pcibus_provider_defs.h b/arch/ia64/include/asm/sn/pcibus_provider_defs.h<br/>index 8f7c83d0f6d3..8f7c83d0f6d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/pcibus_provider_defs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/pcibus_provider_defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/pcibus_provider_defs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/pcibus_provider_defs.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/pcidev.h b/arch/ia64/include/asm/sn/pcidev.h<br/>index 1c2382cea807..1c2382cea807 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/pcidev.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/pcidev.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/pcidev.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/pcidev.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/pda.h b/arch/ia64/include/asm/sn/pda.h<br/>index 1c5108d44d8b..1c5108d44d8b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/pda.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/pda.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/pda.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/pda.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/pic.h b/arch/ia64/include/asm/sn/pic.h<br/>index 5f9da5fd6e56..5f9da5fd6e56 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/pic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/pic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/pic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/pic.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/rw_mmr.h b/arch/ia64/include/asm/sn/rw_mmr.h<br/>index 2d78f4c5a45e..2d78f4c5a45e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/rw_mmr.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/rw_mmr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/rw_mmr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/rw_mmr.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/shub_mmr.h b/arch/ia64/include/asm/sn/shub_mmr.h<br/>index 7de1d1d4b71a..7de1d1d4b71a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/shub_mmr.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/shub_mmr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/shub_mmr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/shub_mmr.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/shubio.h b/arch/ia64/include/asm/sn/shubio.h<br/>index 22a6f18a5313..22a6f18a5313 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/shubio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/shubio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/shubio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/shubio.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/simulator.h b/arch/ia64/include/asm/sn/simulator.h<br/>index c2611f6cfe33..c2611f6cfe33 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/simulator.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/simulator.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/simulator.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/simulator.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/sn2/sn_hwperf.h b/arch/ia64/include/asm/sn/sn2/sn_hwperf.h<br/>index e61ebac38cdd..e61ebac38cdd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/sn2/sn_hwperf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/sn2/sn_hwperf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/sn2/sn_hwperf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/sn2/sn_hwperf.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/sn_cpuid.h b/arch/ia64/include/asm/sn/sn_cpuid.h<br/>index a676dd9ace3e..a676dd9ace3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/sn_cpuid.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/sn_cpuid.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/sn_cpuid.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/sn_cpuid.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/sn_feature_sets.h b/arch/ia64/include/asm/sn/sn_feature_sets.h<br/>index 8e83ac117ace..8e83ac117ace 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/sn_feature_sets.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/sn_feature_sets.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/sn_feature_sets.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/sn_feature_sets.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/sn_sal.h b/arch/ia64/include/asm/sn/sn_sal.h<br/>index 676b31a08c61..57e649d388b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/sn_sal.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/sn_sal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/sn_sal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/sn_sal.h</a></div><div class='hunk'>@@ -1094,7 +1094,7 @@ ia64_sn_get_sn_info(int fc, u8 *shubtype, u16 *nasid_bitmask, u8 *nasid_shift,</div><div class='ctx'> /*</div><div class='ctx'>  * This is the access point to the Altix PROM hardware performance</div><div class='ctx'>  * and status monitoring interface. For info on using this, see</div><div class='del'>- * include/asm-ia64/sn/sn2/sn_hwperf.h</div><div class='add'>+ * arch/ia64/include/asm/sn/sn2/sn_hwperf.h</div><div class='ctx'>  */</div><div class='ctx'> static inline int</div><div class='ctx'> ia64_sn_hwperf_op(nasid_t nasid, u64 opcode, u64 a0, u64 a1, u64 a2,</div><div class='head'>diff --git a/include/asm-ia64/sn/tioca.h b/arch/ia64/include/asm/sn/tioca.h<br/>index 666222d7f0f6..666222d7f0f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/tioca.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/tioca.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/tioca.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/tioca.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/tioca_provider.h b/arch/ia64/include/asm/sn/tioca_provider.h<br/>index 9a820ac61be3..9a820ac61be3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/tioca_provider.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/tioca_provider.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/tioca_provider.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/tioca_provider.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/tioce.h b/arch/ia64/include/asm/sn/tioce.h<br/>index 893468e1b41b..893468e1b41b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/tioce.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/tioce.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/tioce.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/tioce.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/tioce_provider.h b/arch/ia64/include/asm/sn/tioce_provider.h<br/>index 32c32f30b099..32c32f30b099 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/tioce_provider.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/tioce_provider.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/tioce_provider.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/tioce_provider.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/tiocp.h b/arch/ia64/include/asm/sn/tiocp.h<br/>index e8ad0bb5b6c5..e8ad0bb5b6c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/tiocp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/tiocp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/tiocp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/tiocp.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/tiocx.h b/arch/ia64/include/asm/sn/tiocx.h<br/>index d29728492f36..d29728492f36 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/tiocx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/tiocx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/tiocx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/tiocx.h</a></div><div class='head'>diff --git a/include/asm-ia64/sn/types.h b/arch/ia64/include/asm/sn/types.h<br/>index 8e04ee211e59..8e04ee211e59 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sn/types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sn/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sn/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sn/types.h</a></div><div class='head'>diff --git a/include/asm-ia64/socket.h b/arch/ia64/include/asm/socket.h<br/>index d5ef0aa3e312..d5ef0aa3e312 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/socket.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/socket.h</a></div><div class='head'>diff --git a/include/asm-ia64/sockios.h b/arch/ia64/include/asm/sockios.h<br/>index 15c92468ad38..15c92468ad38 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sockios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sockios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sockios.h</a></div><div class='head'>diff --git a/include/asm-ia64/sparsemem.h b/arch/ia64/include/asm/sparsemem.h<br/>index 67a7c40ec27f..67a7c40ec27f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/sparsemem.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/sparsemem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/sparsemem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/sparsemem.h</a></div><div class='head'>diff --git a/include/asm-ia64/spinlock.h b/arch/ia64/include/asm/spinlock.h<br/>index 0229fb95fb38..0229fb95fb38 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/spinlock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/spinlock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/spinlock.h</a></div><div class='head'>diff --git a/include/asm-ia64/spinlock_types.h b/arch/ia64/include/asm/spinlock_types.h<br/>index 474e46f1ab4a..474e46f1ab4a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/spinlock_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/spinlock_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/spinlock_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/spinlock_types.h</a></div><div class='head'>diff --git a/include/asm-ia64/stat.h b/arch/ia64/include/asm/stat.h<br/>index 367bb90cdffa..367bb90cdffa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/stat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/stat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/stat.h</a></div><div class='head'>diff --git a/include/asm-ia64/statfs.h b/arch/ia64/include/asm/statfs.h<br/>index 811097974f31..811097974f31 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/statfs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/statfs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/statfs.h</a></div><div class='head'>diff --git a/include/asm-ia64/string.h b/arch/ia64/include/asm/string.h<br/>index 85fd65c52a8c..85fd65c52a8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/string.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/string.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/string.h</a></div><div class='head'>diff --git a/include/asm-ia64/suspend.h b/arch/ia64/include/asm/suspend.h<br/>index b05bbb6074e2..b05bbb6074e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/suspend.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/suspend.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/suspend.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/suspend.h</a></div><div class='head'>diff --git a/include/asm-ia64/system.h b/arch/ia64/include/asm/system.h<br/>index 927a381c20ca..927a381c20ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/system.h</a></div><div class='head'>diff --git a/include/asm-ia64/termbits.h b/arch/ia64/include/asm/termbits.h<br/>index 9f162e0089ad..9f162e0089ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/termbits.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/termbits.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/termbits.h</a></div><div class='head'>diff --git a/include/asm-ia64/termios.h b/arch/ia64/include/asm/termios.h<br/>index 689d218c0c28..689d218c0c28 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/termios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/termios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/termios.h</a></div><div class='head'>diff --git a/include/asm-ia64/thread_info.h b/arch/ia64/include/asm/thread_info.h<br/>index 7c60fcdd2efd..7c60fcdd2efd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/thread_info.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/thread_info.h</a></div><div class='head'>diff --git a/include/asm-ia64/timex.h b/arch/ia64/include/asm/timex.h<br/>index 05a6baf8a472..05a6baf8a472 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/timex.h</a></div><div class='head'>diff --git a/include/asm-ia64/tlb.h b/arch/ia64/include/asm/tlb.h<br/>index 20d8a39680c2..20d8a39680c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/tlb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/tlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/tlb.h</a></div><div class='head'>diff --git a/include/asm-ia64/tlbflush.h b/arch/ia64/include/asm/tlbflush.h<br/>index 3be25dfed164..3be25dfed164 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/tlbflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/tlbflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/tlbflush.h</a></div><div class='head'>diff --git a/include/asm-ia64/topology.h b/arch/ia64/include/asm/topology.h<br/>index 32863b3bb1d3..35bcb641c9e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/topology.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/topology.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/topology.h</a></div><div class='hunk'>@@ -1,6 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/include/asm-ia64/topology.h</div><div class='del'>- *</div><div class='ctx'>  * Copyright (C) 2002, Erich Focht, NEC</div><div class='ctx'>  *</div><div class='ctx'>  * All rights reserved.</div><div class='head'>diff --git a/include/asm-ia64/types.h b/arch/ia64/include/asm/types.h<br/>index e36b3716e718..e36b3716e718 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/types.h</a></div><div class='head'>diff --git a/include/asm-ia64/uaccess.h b/arch/ia64/include/asm/uaccess.h<br/>index 449c8c0fa2bd..449c8c0fa2bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/uaccess.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/uaccess.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/uaccess.h</a></div><div class='head'>diff --git a/include/asm-ia64/ucontext.h b/arch/ia64/include/asm/ucontext.h<br/>index bf573dc8ca6a..bf573dc8ca6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/ucontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/ucontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ucontext.h</a></div><div class='head'>diff --git a/include/asm-ia64/unaligned.h b/arch/ia64/include/asm/unaligned.h<br/>index 7bddc7f58584..7bddc7f58584 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/unaligned.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/unaligned.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/unaligned.h</a></div><div class='head'>diff --git a/include/asm-ia64/uncached.h b/arch/ia64/include/asm/uncached.h<br/>index 13d7e65ca3cc..13d7e65ca3cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/uncached.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/uncached.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/uncached.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/uncached.h</a></div><div class='head'>diff --git a/include/asm-ia64/unistd.h b/arch/ia64/include/asm/unistd.h<br/>index d535833aab5e..d535833aab5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/unistd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/unistd.h</a></div><div class='head'>diff --git a/include/asm-ia64/unwind.h b/arch/ia64/include/asm/unwind.h<br/>index 1af3875f1a57..1af3875f1a57 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/unwind.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/unwind.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/unwind.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/unwind.h</a></div><div class='head'>diff --git a/include/asm-ia64/user.h b/arch/ia64/include/asm/user.h<br/>index 8b9821110348..8b9821110348 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/user.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/user.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/user.h</a></div><div class='head'>diff --git a/include/asm-ia64/ustack.h b/arch/ia64/include/asm/ustack.h<br/>index 504167c35b8b..504167c35b8b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/ustack.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/ustack.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/ustack.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/ustack.h</a></div><div class='head'>diff --git a/include/asm-ia64/uv/uv_hub.h b/arch/ia64/include/asm/uv/uv_hub.h<br/>index f607018af4a1..f607018af4a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/uv/uv_hub.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/uv/uv_hub.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/uv/uv_hub.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/uv/uv_hub.h</a></div><div class='head'>diff --git a/include/asm-ia64/uv/uv_mmrs.h b/arch/ia64/include/asm/uv/uv_mmrs.h<br/>index c149ef085437..c149ef085437 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/uv/uv_mmrs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/uv/uv_mmrs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/uv/uv_mmrs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/uv/uv_mmrs.h</a></div><div class='head'>diff --git a/include/asm-ia64/vga.h b/arch/ia64/include/asm/vga.h<br/>index 02184ecd8208..02184ecd8208 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/vga.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/vga.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/vga.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/vga.h</a></div><div class='head'>diff --git a/include/asm-ia64/xor.h b/arch/ia64/include/asm/xor.h<br/>index 41fb8744d17a..a349e23dea15 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-ia64/xor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-ia64/xor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/xor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/include/asm/xor.h</a></div><div class='hunk'>@@ -1,6 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-ia64/xor.h</div><div class='del'>- *</div><div class='ctx'>  * Optimized RAID-5 checksumming functions for IA-64.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='head'>diff --git a/arch/ia64/kernel/.gitignore b/arch/ia64/kernel/.gitignore<br/>index 98307759a3b8..21cb0da5ded8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/.gitignore?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/kernel/.gitignore</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/.gitignore</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='ctx'> gate.lds</div><div class='add'>+vmlinux.lds</div><div class='head'>diff --git a/arch/ia64/kernel/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c<br/>index c64a55af9b95..94c44b1ccfd0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/asm-offsets.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/asm-offsets.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -10,11 +10,11 @@</div><div class='ctx'> #include &lt;linux/pid.h&gt;</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/kbuild.h&gt;</div><div class='del'>-#include &lt;asm-ia64/processor.h&gt;</div><div class='del'>-#include &lt;asm-ia64/ptrace.h&gt;</div><div class='del'>-#include &lt;asm-ia64/siginfo.h&gt;</div><div class='del'>-#include &lt;asm-ia64/sigcontext.h&gt;</div><div class='del'>-#include &lt;asm-ia64/mca.h&gt;</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/siginfo.h&gt;</div><div class='add'>+#include &lt;asm/sigcontext.h&gt;</div><div class='add'>+#include &lt;asm/mca.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "../kernel/sigframe.h"</div><div class='ctx'> #include "../kernel/fsyscall_gtod_data.h"</div><div class='head'>diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S<br/>index db540e58c783..8bdea8eb62e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/head.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/head.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/head.S</a></div><div class='hunk'>@@ -359,7 +359,31 @@ start_ap:</div><div class='ctx'> 	mov ar.rsc=0		// place RSE in enforced lazy mode</div><div class='ctx'> 	;;</div><div class='ctx'> 	loadrs			// clear the dirty partition</div><div class='del'>-	mov IA64_KR(PER_CPU_DATA)=r0	// clear physical per-CPU base</div><div class='add'>+	movl r19=__phys_per_cpu_start</div><div class='add'>+	mov r18=PERCPU_PAGE_SIZE</div><div class='add'>+	;;</div><div class='add'>+#ifndef CONFIG_SMP</div><div class='add'>+	add r19=r19,r18</div><div class='add'>+	;;</div><div class='add'>+#else</div><div class='add'>+(isAP)	br.few 2f</div><div class='add'>+	mov r20=r19</div><div class='add'>+	sub r19=r19,r18</div><div class='add'>+	;;</div><div class='add'>+	shr.u r18=r18,3</div><div class='add'>+1:</div><div class='add'>+	ld8 r21=[r20],8;;</div><div class='add'>+	st8[r19]=r21,8</div><div class='add'>+	adds r18=-1,r18;;</div><div class='add'>+	cmp4.lt p7,p6=0,r18</div><div class='add'>+(p7)	br.cond.dptk.few 1b</div><div class='add'>+2:</div><div class='add'>+#endif</div><div class='add'>+	tpa r19=r19</div><div class='add'>+	;;</div><div class='add'>+	.pred.rel.mutex isBP,isAP</div><div class='add'>+(isBP)	mov IA64_KR(PER_CPU_DATA)=r19	// per-CPU base for cpu0</div><div class='add'>+(isAP)	mov IA64_KR(PER_CPU_DATA)=r0	// clear physical per-CPU base</div><div class='ctx'> 	;;</div><div class='ctx'> 	mov ar.bspstore=r2	// establish the new RSE stack</div><div class='ctx'> 	;;</div><div class='hunk'>@@ -1123,7 +1147,7 @@ SET_REG(b5);</div><div class='ctx'> 	 *   p15    - used to track flag status.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * If you patch this code to use more registers, do not forget to update</div><div class='del'>-	 * the clobber lists for spin_lock() in include/asm-ia64/spinlock.h.</div><div class='add'>+	 * the clobber lists for spin_lock() in arch/ia64/include/asm/spinlock.h.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> #if (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ &lt; 3)</div><div class='head'>diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c<br/>index 3bc2fa64f87f..5c4674ae8aea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/iosapic.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/kernel/iosapic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/iosapic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/iosapic.c</a></div><div class='hunk'>@@ -69,7 +69,7 @@</div><div class='ctx'>  *     systems, we use one-to-one mapping between IA-64 vector and IRQ.  A</div><div class='ctx'>  *     platform can implement platform_irq_to_vector(irq) and</div><div class='ctx'>  *     platform_local_vector_to_irq(vector) APIs to differentiate the mapping.</div><div class='del'>- *     Please see also include/asm-ia64/hw_irq.h for those APIs.</div><div class='add'>+ *     Please see also arch/ia64/include/asm/hw_irq.h for those APIs.</div><div class='ctx'>  *</div><div class='ctx'>  * To sum up, there are three levels of mappings involved:</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S<br/>index c39627df3cde..416a952b19bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/ivt.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/kernel/ivt.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/ivt.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/ivt.S</a></div><div class='hunk'>@@ -1243,11 +1243,11 @@ ENTRY(speculation_vector)</div><div class='ctx'> </div><div class='ctx'> 	add r17=r17,r18			// now add the offset</div><div class='ctx'> 	;;</div><div class='del'>-	MOV_FROM_IIP(r17)</div><div class='add'>+	MOV_TO_IIP(r17, r19)</div><div class='ctx'> 	dep r16=0,r16,41,2		// clear EI</div><div class='ctx'> 	;;</div><div class='ctx'> </div><div class='del'>-	MOV_FROM_IPSR(p0, r16)</div><div class='add'>+	MOV_TO_IPSR(p0, r16, r19)</div><div class='ctx'> 	;;</div><div class='ctx'> </div><div class='ctx'> 	RFI</div><div class='head'>diff --git a/arch/ia64/kernel/jprobes.S b/arch/ia64/kernel/jprobes.S<br/>index 621630256c4a..f69389c7be1d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/jprobes.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/kernel/jprobes.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/jprobes.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/jprobes.S</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'>  * to the correct location.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='del'>-#include &lt;asm-ia64/break.h&gt;</div><div class='add'>+#include &lt;asm/break.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * void jprobe_break(void)</div><div class='head'>diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c<br/>index 29aad349e0c4..aaa7d901521f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/module.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/kernel/module.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/module.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/module.c</a></div><div class='hunk'>@@ -135,15 +135,6 @@ static const char *reloc_name[256] = {</div><div class='ctx'> </div><div class='ctx'> #undef N</div><div class='ctx'> </div><div class='del'>-struct got_entry {</div><div class='del'>-	uint64_t val;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct fdesc {</div><div class='del'>-	uint64_t ip;</div><div class='del'>-	uint64_t gp;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Opaque struct for insns, to protect against derefs. */</div><div class='ctx'> struct insn;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/nr-irqs.c b/arch/ia64/kernel/nr-irqs.c<br/>index 1ae049181e83..8273afc32db8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/nr-irqs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/kernel/nr-irqs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/nr-irqs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/nr-irqs.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kbuild.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='del'>-#include &lt;asm-ia64/native/irq.h&gt;</div><div class='add'>+#include &lt;asm/native/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> void foo(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c<br/>index e5c2de9b29a5..c27d5b2c182b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/setup.c</a></div><div class='hunk'>@@ -314,7 +314,7 @@ static inline void __init setup_crashkernel(unsigned long total, int *n)</div><div class='ctx'>  *</div><div class='ctx'>  * Setup the reserved memory areas set aside for the boot parameters,</div><div class='ctx'>  * initrd, etc.  There are currently %IA64_MAX_RSVD_REGIONS defined,</div><div class='del'>- * see include/asm-ia64/meminit.h if you need to define more.</div><div class='add'>+ * see arch/ia64/include/asm/meminit.h if you need to define more.</div><div class='ctx'>  */</div><div class='ctx'> void __init</div><div class='ctx'> reserve_memory (void)</div><div class='hunk'>@@ -927,17 +927,19 @@ cpu_init (void)</div><div class='ctx'> 	if (smp_processor_id() == 0) {</div><div class='ctx'> 		cpu_set(0, per_cpu(cpu_sibling_map, 0));</div><div class='ctx'> 		cpu_set(0, cpu_core_map[0]);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Set ar.k3 so that assembly code in MCA handler can compute</div><div class='add'>+		 * physical addresses of per cpu variables with a simple:</div><div class='add'>+		 *   phys = ar.k3 + &amp;per_cpu_var</div><div class='add'>+		 * and the alt-dtlb-miss handler can set per-cpu mapping into</div><div class='add'>+		 * the TLB when needed. head.S already did this for cpu0.</div><div class='add'>+		 */</div><div class='add'>+		ia64_set_kr(IA64_KR_PER_CPU_DATA,</div><div class='add'>+			    ia64_tpa(cpu_data) - (long) __per_cpu_start);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We set ar.k3 so that assembly code in MCA handler can compute</div><div class='del'>-	 * physical addresses of per cpu variables with a simple:</div><div class='del'>-	 *   phys = ar.k3 + &amp;per_cpu_var</div><div class='del'>-	 */</div><div class='del'>-	ia64_set_kr(IA64_KR_PER_CPU_DATA,</div><div class='del'>-		    ia64_tpa(cpu_data) - (long) __per_cpu_start);</div><div class='del'>-</div><div class='ctx'> 	get_max_cacheline_size();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c<br/>index 3676468612b6..da8f020d82c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/smp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/smp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/smp.c</a></div><div class='hunk'>@@ -58,7 +58,7 @@ static struct local_tlb_flush_counts {</div><div class='ctx'> 	unsigned int count;</div><div class='ctx'> } __attribute__((__aligned__(32))) local_tlb_flush_counts[NR_CPUS];</div><div class='ctx'> </div><div class='del'>-static DEFINE_PER_CPU(unsigned int, shadow_flush_counts[NR_CPUS]) ____cacheline_aligned;</div><div class='add'>+static DEFINE_PER_CPU(unsigned short, shadow_flush_counts[NR_CPUS]) ____cacheline_aligned;</div><div class='ctx'> </div><div class='ctx'> #define IPI_CALL_FUNC		0</div><div class='ctx'> #define IPI_CPU_STOP		1</div><div class='hunk'>@@ -254,7 +254,7 @@ smp_local_flush_tlb(void)</div><div class='ctx'> void</div><div class='ctx'> smp_flush_tlb_cpumask(cpumask_t xcpumask)</div><div class='ctx'> {</div><div class='del'>-	unsigned int *counts = __ia64_per_cpu_var(shadow_flush_counts);</div><div class='add'>+	unsigned short *counts = __ia64_per_cpu_var(shadow_flush_counts);</div><div class='ctx'> 	cpumask_t cpumask = xcpumask;</div><div class='ctx'> 	int mycpu, cpu, flush_mycpu = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -262,7 +262,7 @@ smp_flush_tlb_cpumask(cpumask_t xcpumask)</div><div class='ctx'> 	mycpu = smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	for_each_cpu_mask(cpu, cpumask)</div><div class='del'>-		counts[cpu] = local_tlb_flush_counts[cpu].count;</div><div class='add'>+		counts[cpu] = local_tlb_flush_counts[cpu].count &amp; 0xffff;</div><div class='ctx'> </div><div class='ctx'> 	mb();</div><div class='ctx'> 	for_each_cpu_mask(cpu, cpumask) {</div><div class='hunk'>@@ -276,7 +276,7 @@ smp_flush_tlb_cpumask(cpumask_t xcpumask)</div><div class='ctx'> 		smp_local_flush_tlb();</div><div class='ctx'> </div><div class='ctx'> 	for_each_cpu_mask(cpu, cpumask)</div><div class='del'>-		while(counts[cpu] == local_tlb_flush_counts[cpu].count)</div><div class='add'>+		while(counts[cpu] == (local_tlb_flush_counts[cpu].count &amp; 0xffff))</div><div class='ctx'> 			udelay(FLUSH_DELAY);</div><div class='ctx'> </div><div class='ctx'> 	preempt_enable();</div><div class='head'>diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c<br/>index 03f1a9908afc..d8f05e504fbf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/smpboot.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/kernel/smpboot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/smpboot.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/smpboot.c</a></div><div class='hunk'>@@ -138,6 +138,7 @@ cpumask_t cpu_possible_map = CPU_MASK_NONE;</div><div class='ctx'> EXPORT_SYMBOL(cpu_possible_map);</div><div class='ctx'> </div><div class='ctx'> cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned;</div><div class='add'>+EXPORT_SYMBOL(cpu_core_map);</div><div class='ctx'> DEFINE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map);</div><div class='ctx'> EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);</div><div class='ctx'> </div><div class='hunk'>@@ -467,7 +468,9 @@ start_secondary (void *unused)</div><div class='ctx'> {</div><div class='ctx'> 	/* Early console may use I/O ports */</div><div class='ctx'> 	ia64_set_kr(IA64_KR_IO_BASE, __pa(ia64_iobase));</div><div class='add'>+#ifndef CONFIG_PRINTK_TIME</div><div class='ctx'> 	Dprintk("start_secondary: starting CPU 0x%x\n", hard_smp_processor_id());</div><div class='add'>+#endif</div><div class='ctx'> 	efi_map_pal_code();</div><div class='ctx'> 	cpu_init();</div><div class='ctx'> 	preempt_disable();</div><div class='hunk'>@@ -738,16 +741,14 @@ int __cpu_disable(void)</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cpu_clear(cpu, cpu_online_map);</div><div class='del'>-</div><div class='ctx'> 	if (migrate_platform_irqs(cpu)) {</div><div class='ctx'> 		cpu_set(cpu, cpu_online_map);</div><div class='ctx'> 		return (-EBUSY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	remove_siblinginfo(cpu);</div><div class='del'>-	cpu_clear(cpu, cpu_online_map);</div><div class='ctx'> 	fixup_irqs();</div><div class='add'>+	cpu_clear(cpu, cpu_online_map);</div><div class='ctx'> 	local_flush_tlb_all();</div><div class='ctx'> 	cpu_clear(cpu, cpu_callin_map);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S<br/>index 5a77206c2492..de71da811cd6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/vmlinux.lds.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/vmlinux.lds.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -215,6 +215,9 @@ SECTIONS</div><div class='ctx'>   /* Per-cpu data: */</div><div class='ctx'>   percpu : { } :percpu</div><div class='ctx'>   . = ALIGN(PERCPU_PAGE_SIZE);</div><div class='add'>+#ifdef	CONFIG_SMP</div><div class='add'>+  . = . + PERCPU_PAGE_SIZE;	/* cpu0 per-cpu space */</div><div class='add'>+#endif</div><div class='ctx'>   __phys_per_cpu_start = .;</div><div class='ctx'>   .data.percpu PERCPU_ADDR : AT(__phys_per_cpu_start - LOAD_OFFSET)</div><div class='ctx'> 	{</div><div class='head'>diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c<br/>index 7a37d06376be..cd0d1a7284b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kvm/kvm-ia64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/kvm/kvm-ia64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kvm/kvm-ia64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/kvm/kvm-ia64.c</a></div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='add'>+#include &lt;asm/elf.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "misc.h"</div><div class='ctx'> #include "vti.h"</div><div class='hunk'>@@ -61,12 +62,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {</div><div class='ctx'> 	{ NULL }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-struct fdesc{</div><div class='del'>-    unsigned long ip;</div><div class='del'>-    unsigned long gp;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void kvm_flush_icache(unsigned long start, unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	int l;</div><div class='head'>diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c<br/>index 798bf9835a51..e566ff43884a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/mm/contig.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/mm/contig.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/mm/contig.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/mm/contig.c</a></div><div class='hunk'>@@ -163,8 +163,14 @@ per_cpu_init (void)</div><div class='ctx'> 	 * get_zeroed_page().</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (first_time) {</div><div class='add'>+		void *cpu0_data = __phys_per_cpu_start - PERCPU_PAGE_SIZE;</div><div class='add'>+</div><div class='ctx'> 		first_time=0;</div><div class='del'>-		for (cpu = 0; cpu &lt; NR_CPUS; cpu++) {</div><div class='add'>+</div><div class='add'>+		__per_cpu_offset[0] = (char *) cpu0_data - __per_cpu_start;</div><div class='add'>+		per_cpu(local_per_cpu_offset, 0) = __per_cpu_offset[0];</div><div class='add'>+</div><div class='add'>+		for (cpu = 1; cpu &lt; NR_CPUS; cpu++) {</div><div class='ctx'> 			memcpy(cpu_data, __phys_per_cpu_start, __per_cpu_end - __per_cpu_start);</div><div class='ctx'> 			__per_cpu_offset[cpu] = (char *) cpu_data - __per_cpu_start;</div><div class='ctx'> 			cpu_data += PERCPU_PAGE_SIZE;</div><div class='hunk'>@@ -177,7 +183,7 @@ per_cpu_init (void)</div><div class='ctx'> static inline void</div><div class='ctx'> alloc_per_cpu_data(void)</div><div class='ctx'> {</div><div class='del'>-	cpu_data = __alloc_bootmem(PERCPU_PAGE_SIZE * NR_CPUS,</div><div class='add'>+	cpu_data = __alloc_bootmem(PERCPU_PAGE_SIZE * NR_CPUS-1,</div><div class='ctx'> 				   PERCPU_PAGE_SIZE, __pa(MAX_DMA_ADDRESS));</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c<br/>index d83125e1ed27..78026aabaa7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/mm/discontig.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/mm/discontig.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/mm/discontig.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/mm/discontig.c</a></div><div class='hunk'>@@ -143,7 +143,11 @@ static void *per_cpu_node_setup(void *cpu_data, int node)</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_early_cpu(cpu) {</div><div class='del'>-		if (node == node_cpuid[cpu].nid) {</div><div class='add'>+		if (cpu == 0) {</div><div class='add'>+			void *cpu0_data = __phys_per_cpu_start - PERCPU_PAGE_SIZE;</div><div class='add'>+			__per_cpu_offset[cpu] = (char*)cpu0_data -</div><div class='add'>+				__per_cpu_start;</div><div class='add'>+		} else if (node == node_cpuid[cpu].nid) {</div><div class='ctx'> 			memcpy(__va(cpu_data), __phys_per_cpu_start,</div><div class='ctx'> 			       __per_cpu_end - __per_cpu_start);</div><div class='ctx'> 			__per_cpu_offset[cpu] = (char*)__va(cpu_data) -</div><div class='head'>diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c<br/>index c45fc7f5a979..b0f615759e97 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/mm/hugetlbpage.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/mm/hugetlbpage.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/mm/hugetlbpage.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/mm/hugetlbpage.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/hugetlb.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='hunk'>@@ -21,7 +22,8 @@</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='del'>-unsigned int hpage_shift=HPAGE_SHIFT_DEFAULT;</div><div class='add'>+unsigned int hpage_shift = HPAGE_SHIFT_DEFAULT;</div><div class='add'>+EXPORT_SYMBOL(hpage_shift);</div><div class='ctx'> </div><div class='ctx'> pte_t *</div><div class='ctx'> huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz)</div><div class='head'>diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c<br/>index 77b15f80f101..7545037a8625 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/pci/pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/pci/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/pci/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/pci/pci.c</a></div><div class='hunk'>@@ -324,7 +324,6 @@ pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl)</div><div class='ctx'> struct pci_bus * __devinit</div><div class='ctx'> pci_acpi_scan_root(struct acpi_device *device, int domain, int bus)</div><div class='ctx'> {</div><div class='del'>-	struct pci_root_info info;</div><div class='ctx'> 	struct pci_controller *controller;</div><div class='ctx'> 	unsigned int windows = 0;</div><div class='ctx'> 	struct pci_bus *pbus;</div><div class='hunk'>@@ -346,22 +345,24 @@ pci_acpi_scan_root(struct acpi_device *device, int domain, int bus)</div><div class='ctx'> 	acpi_walk_resources(device-&gt;handle, METHOD_NAME__CRS, count_window,</div><div class='ctx'> 			&amp;windows);</div><div class='ctx'> 	if (windows) {</div><div class='add'>+		struct pci_root_info info;</div><div class='add'>+</div><div class='ctx'> 		controller-&gt;window =</div><div class='ctx'> 			kmalloc_node(sizeof(*controller-&gt;window) * windows,</div><div class='ctx'> 				     GFP_KERNEL, controller-&gt;node);</div><div class='ctx'> 		if (!controller-&gt;window)</div><div class='ctx'> 			goto out2;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	name = kmalloc(16, GFP_KERNEL);</div><div class='del'>-	if (!name)</div><div class='del'>-		goto out3;</div><div class='add'>+		name = kmalloc(16, GFP_KERNEL);</div><div class='add'>+		if (!name)</div><div class='add'>+			goto out3;</div><div class='ctx'> </div><div class='del'>-	sprintf(name, "PCI Bus %04x:%02x", domain, bus);</div><div class='del'>-	info.controller = controller;</div><div class='del'>-	info.name = name;</div><div class='del'>-	acpi_walk_resources(device-&gt;handle, METHOD_NAME__CRS, add_window,</div><div class='del'>-			&amp;info);</div><div class='add'>+		sprintf(name, "PCI Bus %04x:%02x", domain, bus);</div><div class='add'>+		info.controller = controller;</div><div class='add'>+		info.name = name;</div><div class='add'>+		acpi_walk_resources(device-&gt;handle, METHOD_NAME__CRS,</div><div class='add'>+			add_window, &amp;info);</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * See arch/x86/pci/acpi.c.</div><div class='ctx'> 	 * The desired pci bus might already be scanned in a quirk. We</div><div class='head'>diff --git a/arch/ia64/sn/kernel/iomv.c b/arch/ia64/sn/kernel/iomv.c<br/>index ab7e2fd40798..c77ebdf98119 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/iomv.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/sn/kernel/iomv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/iomv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/sn/kernel/iomv.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ EXPORT_SYMBOL(sn_io_addr);</div><div class='ctx'> /**</div><div class='ctx'>  * __sn_mmiowb - I/O space memory barrier</div><div class='ctx'>  *</div><div class='del'>- * See include/asm-ia64/io.h and Documentation/DocBook/deviceiobook.tmpl</div><div class='add'>+ * See arch/ia64/include/asm/io.h and Documentation/DocBook/deviceiobook.tmpl</div><div class='ctx'>  * for details.</div><div class='ctx'>  *</div><div class='ctx'>  * On SN2, we wait for the PIO_WRITE_STATUS SHub register to clear.</div><div class='head'>diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c<br/>index 529462c01570..79165122501c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/pci/tioca_provider.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/ia64/sn/pci/tioca_provider.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/pci/tioca_provider.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/ia64/sn/pci/tioca_provider.c</a></div><div class='hunk'>@@ -420,8 +420,10 @@ tioca_dma_mapped(struct pci_dev *pdev, u64 paddr, size_t req_size)</div><div class='ctx'> 		entry = find_next_zero_bit(map, mapsize, last_entry);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (entry &gt; mapsize)</div><div class='add'>+	if (entry &gt; mapsize) {</div><div class='add'>+		kfree(ca_dmamap);</div><div class='ctx'> 		goto map_return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; entries; i++)</div><div class='ctx'> 		set_bit(entry + i, map);</div><div class='head'>diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c<br/>index 8a2a53b33616..bb959fbab2dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/atari/atakeyb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68k/atari/atakeyb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/atari/atakeyb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/atari/atakeyb.c</a></div><div class='hunk'>@@ -580,13 +580,15 @@ int atari_keyb_init(void)</div><div class='ctx'> 	do {</div><div class='ctx'> 		/* reset IKBD ACIA */</div><div class='ctx'> 		acia.key_ctrl = ACIA_RESET |</div><div class='del'>-				(atari_switches &amp; ATARI_SWITCH_IKBD) ? ACIA_RHTID : 0;</div><div class='add'>+				((atari_switches &amp; ATARI_SWITCH_IKBD) ?</div><div class='add'>+				 ACIA_RHTID : 0);</div><div class='ctx'> 		(void)acia.key_ctrl;</div><div class='ctx'> 		(void)acia.key_data;</div><div class='ctx'> </div><div class='ctx'> 		/* reset MIDI ACIA */</div><div class='ctx'> 		acia.mid_ctrl = ACIA_RESET |</div><div class='del'>-				(atari_switches &amp; ATARI_SWITCH_MIDI) ? ACIA_RHTID : 0;</div><div class='add'>+				((atari_switches &amp; ATARI_SWITCH_MIDI) ?</div><div class='add'>+				 ACIA_RHTID : 0);</div><div class='ctx'> 		(void)acia.mid_ctrl;</div><div class='ctx'> 		(void)acia.mid_data;</div><div class='ctx'> </div><div class='hunk'>@@ -599,7 +601,8 @@ int atari_keyb_init(void)</div><div class='ctx'> 				 ACIA_RHTID : ACIA_RLTID);</div><div class='ctx'> </div><div class='ctx'> 		acia.mid_ctrl = ACIA_DIV16 | ACIA_D8N1S |</div><div class='del'>-				(atari_switches &amp; ATARI_SWITCH_MIDI) ? ACIA_RHTID : 0;</div><div class='add'>+				((atari_switches &amp; ATARI_SWITCH_MIDI) ?</div><div class='add'>+				 ACIA_RHTID : 0);</div><div class='ctx'> </div><div class='ctx'> 	/* make sure the interrupt line is up */</div><div class='ctx'> 	} while ((mfp.par_dt_reg &amp; 0x10) == 0);</div><div class='head'>diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig<br/>index 8e2a0f5faf53..8bd61a640fc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/amiga_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68k/configs/amiga_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/amiga_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/amiga_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Wed May 28 22:47:35 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc6</div><div class='add'>+# Wed Sep 10 09:02:00 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_M68K=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='hunk'>@@ -52,7 +52,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='hunk'>@@ -75,10 +74,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> # CONFIG_HAVE_OPROFILE is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -95,6 +100,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -166,10 +172,6 @@ CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='ctx'> CONFIG_ZORRO_NAMES=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -183,6 +185,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_NET_KEY_MIGRATE=y</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -413,6 +416,7 @@ CONFIG_NET_CLS_ROUTE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+# CONFIG_WIRELESS_EXT_SYSFS is not set</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> CONFIG_IEEE80211=m</div><div class='ctx'> # CONFIG_IEEE80211_DEBUG is not set</div><div class='hunk'>@@ -432,7 +436,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='hunk'>@@ -460,6 +466,7 @@ CONFIG_CDROM_PKTCDVD=m</div><div class='ctx'> CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='ctx'> CONFIG_ATA_OVER_ETH=m</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -470,6 +477,7 @@ CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_ATAPI=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='hunk'>@@ -489,8 +497,6 @@ CONFIG_BLK_DEV_GAYLE=y</div><div class='ctx'> CONFIG_BLK_DEV_IDEDOUBLER=y</div><div class='ctx'> CONFIG_BLK_DEV_BUDDHA=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDEDMA is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -556,6 +562,7 @@ CONFIG_A2091_SCSI=y</div><div class='ctx'> CONFIG_GVP11_SCSI=y</div><div class='ctx'> CONFIG_SCSI_A4000T=y</div><div class='ctx'> CONFIG_SCSI_ZORRO7XX=y</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='hunk'>@@ -564,7 +571,7 @@ CONFIG_MD_RAID1=m</div><div class='ctx'> # CONFIG_MD_RAID10 is not set</div><div class='ctx'> CONFIG_MD_RAID456=m</div><div class='ctx'> CONFIG_MD_RAID5_RESHAPE=y</div><div class='del'>-CONFIG_MD_MULTIPATH=m</div><div class='add'>+# CONFIG_MD_MULTIPATH is not set</div><div class='ctx'> # CONFIG_MD_FAULTY is not set</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='ctx'> # CONFIG_DM_DEBUG is not set</div><div class='hunk'>@@ -573,13 +580,9 @@ CONFIG_DM_SNAPSHOT=m</div><div class='ctx'> CONFIG_DM_MIRROR=m</div><div class='ctx'> CONFIG_DM_ZERO=m</div><div class='ctx'> CONFIG_DM_MULTIPATH=m</div><div class='del'>-CONFIG_DM_MULTIPATH_EMC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_RDAC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_HP=m</div><div class='ctx'> # CONFIG_DM_DELAY is not set</div><div class='ctx'> CONFIG_DM_UEVENT=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> CONFIG_MACVLAN=m</div><div class='hunk'>@@ -722,6 +725,7 @@ CONFIG_INPUT_M68K_BEEP=m</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -757,6 +761,7 @@ CONFIG_GEN_RTC_X=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -768,8 +773,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -844,10 +851,6 @@ CONFIG_LOGO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_MONO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_VGA16=y</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=m</div><div class='ctx'> CONFIG_DMASOUND_PAULA=m</div><div class='ctx'> CONFIG_DMASOUND=m</div><div class='hunk'>@@ -861,6 +864,7 @@ CONFIG_HIDRAW=y</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_AUXDISPLAY is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='hunk'>@@ -899,6 +903,7 @@ CONFIG_XFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS_O2CB=m</div><div class='ctx'> CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m</div><div class='add'>+# CONFIG_OCFS2_FS_STATS is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -958,6 +963,7 @@ CONFIG_HFSPLUS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -980,7 +986,6 @@ CONFIG_EXPORTFS=m</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=m</div><div class='ctx'> CONFIG_SUNRPC_GSS=m</div><div class='del'>-CONFIG_SUNRPC_BIND34=y</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=m</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='hunk'>@@ -989,7 +994,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> CONFIG_CODA_FS=m</div><div class='del'>-# CONFIG_CODA_FS_OLD_API is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1054,6 +1058,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1113,6 +1119,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=m</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_RMD128=m</div><div class='add'>+CONFIG_CRYPTO_RMD160=m</div><div class='add'>+CONFIG_CRYPTO_RMD256=m</div><div class='add'>+CONFIG_CRYPTO_RMD320=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='hunk'>@@ -1154,6 +1164,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> CONFIG_CRC16=m</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig<br/>index e2d511e2a1d1..c41b854c0284 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/apollo_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68k/configs/apollo_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/apollo_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/apollo_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Wed May 28 22:47:35 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc6</div><div class='add'>+# Wed Sep 10 09:02:01 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_M68K=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='hunk'>@@ -52,7 +52,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='hunk'>@@ -75,10 +74,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> # CONFIG_HAVE_OPROFILE is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -95,6 +100,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -161,10 +167,6 @@ CONFIG_HEARTBEAT=y</div><div class='ctx'> CONFIG_PROC_HARDWARE=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -178,6 +180,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_NET_KEY_MIGRATE=y</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -411,6 +414,7 @@ CONFIG_NET_CLS_ROUTE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+# CONFIG_WIRELESS_EXT_SYSFS is not set</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> CONFIG_IEEE80211=m</div><div class='ctx'> # CONFIG_IEEE80211_DEBUG is not set</div><div class='hunk'>@@ -430,7 +434,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='hunk'>@@ -448,6 +454,7 @@ CONFIG_CDROM_PKTCDVD=m</div><div class='ctx'> CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='ctx'> CONFIG_ATA_OVER_ETH=m</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -499,6 +506,7 @@ CONFIG_SCSI_SRP_TGT_ATTRS=y</div><div class='ctx'> CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> CONFIG_ISCSI_TCP=m</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='hunk'>@@ -507,7 +515,7 @@ CONFIG_MD_RAID1=m</div><div class='ctx'> # CONFIG_MD_RAID10 is not set</div><div class='ctx'> CONFIG_MD_RAID456=m</div><div class='ctx'> CONFIG_MD_RAID5_RESHAPE=y</div><div class='del'>-CONFIG_MD_MULTIPATH=m</div><div class='add'>+# CONFIG_MD_MULTIPATH is not set</div><div class='ctx'> # CONFIG_MD_FAULTY is not set</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='ctx'> # CONFIG_DM_DEBUG is not set</div><div class='hunk'>@@ -516,13 +524,9 @@ CONFIG_DM_SNAPSHOT=m</div><div class='ctx'> CONFIG_DM_MIRROR=m</div><div class='ctx'> CONFIG_DM_ZERO=m</div><div class='ctx'> CONFIG_DM_MULTIPATH=m</div><div class='del'>-CONFIG_DM_MULTIPATH_EMC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_RDAC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_HP=m</div><div class='ctx'> # CONFIG_DM_DELAY is not set</div><div class='ctx'> CONFIG_DM_UEVENT=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> CONFIG_MACVLAN=m</div><div class='hunk'>@@ -532,7 +536,6 @@ CONFIG_VETH=m</div><div class='ctx'> # CONFIG_PHYLIB is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> # CONFIG_MII is not set</div><div class='del'>-CONFIG_APOLLO_ELPLUS=y</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='hunk'>@@ -627,6 +630,7 @@ CONFIG_SERIO_LIBPS2=m</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -657,6 +661,7 @@ CONFIG_GEN_RTC_X=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -668,8 +673,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -738,10 +745,6 @@ CONFIG_LOGO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_MONO=y</div><div class='ctx'> # CONFIG_LOGO_LINUX_VGA16 is not set</div><div class='ctx'> # CONFIG_LOGO_LINUX_CLUT224 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=m</div><div class='hunk'>@@ -753,6 +756,7 @@ CONFIG_HIDRAW=y</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -789,6 +793,7 @@ CONFIG_XFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS_O2CB=m</div><div class='ctx'> CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m</div><div class='add'>+# CONFIG_OCFS2_FS_STATS is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -848,6 +853,7 @@ CONFIG_HFSPLUS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -860,18 +866,17 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=m</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=m</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-CONFIG_SUNRPC_BIND34=y</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='hunk'>@@ -880,7 +885,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> CONFIG_CODA_FS=m</div><div class='del'>-# CONFIG_CODA_FS_OLD_API is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -944,6 +948,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1003,6 +1009,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_RMD128=m</div><div class='add'>+CONFIG_CRYPTO_RMD160=m</div><div class='add'>+CONFIG_CRYPTO_RMD256=m</div><div class='add'>+CONFIG_CRYPTO_RMD320=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='hunk'>@@ -1044,6 +1054,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> CONFIG_CRC16=m</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig<br/>index 6e20d656adaf..654c5acb9e86 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/atari_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68k/configs/atari_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/atari_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/atari_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Wed May 28 22:47:35 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc6</div><div class='add'>+# Wed Sep 10 09:02:02 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_M68K=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='hunk'>@@ -52,7 +52,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='hunk'>@@ -75,10 +74,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> # CONFIG_HAVE_OPROFILE is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -95,6 +100,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -162,10 +168,6 @@ CONFIG_HEARTBEAT=y</div><div class='ctx'> CONFIG_PROC_HARDWARE=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -179,6 +181,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_NET_KEY_MIGRATE=y</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -409,6 +412,7 @@ CONFIG_NET_CLS_ROUTE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+# CONFIG_WIRELESS_EXT_SYSFS is not set</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> CONFIG_IEEE80211=m</div><div class='ctx'> # CONFIG_IEEE80211_DEBUG is not set</div><div class='hunk'>@@ -428,7 +432,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='hunk'>@@ -452,6 +458,7 @@ CONFIG_CDROM_PKTCDVD=m</div><div class='ctx'> CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='ctx'> CONFIG_ATA_OVER_ETH=m</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -462,6 +469,7 @@ CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_ATAPI=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='hunk'>@@ -479,8 +487,6 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> CONFIG_BLK_DEV_FALCON_IDE=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDEDMA is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -530,6 +536,7 @@ CONFIG_ISCSI_TCP=m</div><div class='ctx'> CONFIG_ATARI_SCSI=y</div><div class='ctx'> # CONFIG_ATARI_SCSI_TOSHIBA_DELAY is not set</div><div class='ctx'> # CONFIG_ATARI_SCSI_RESET_BOOT is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='hunk'>@@ -538,7 +545,7 @@ CONFIG_MD_RAID1=m</div><div class='ctx'> # CONFIG_MD_RAID10 is not set</div><div class='ctx'> CONFIG_MD_RAID456=m</div><div class='ctx'> CONFIG_MD_RAID5_RESHAPE=y</div><div class='del'>-CONFIG_MD_MULTIPATH=m</div><div class='add'>+# CONFIG_MD_MULTIPATH is not set</div><div class='ctx'> # CONFIG_MD_FAULTY is not set</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='ctx'> # CONFIG_DM_DEBUG is not set</div><div class='hunk'>@@ -547,13 +554,9 @@ CONFIG_DM_SNAPSHOT=m</div><div class='ctx'> CONFIG_DM_MIRROR=m</div><div class='ctx'> CONFIG_DM_ZERO=m</div><div class='ctx'> CONFIG_DM_MULTIPATH=m</div><div class='del'>-CONFIG_DM_MULTIPATH_EMC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_RDAC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_HP=m</div><div class='ctx'> # CONFIG_DM_DELAY is not set</div><div class='ctx'> CONFIG_DM_UEVENT=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> CONFIG_MACVLAN=m</div><div class='hunk'>@@ -666,6 +669,7 @@ CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -700,6 +704,7 @@ CONFIG_GEN_RTC_X=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -711,8 +716,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -782,10 +789,6 @@ CONFIG_LOGO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_MONO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_VGA16=y</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=m</div><div class='ctx'> CONFIG_DMASOUND_ATARI=m</div><div class='ctx'> CONFIG_DMASOUND=m</div><div class='hunk'>@@ -799,6 +802,7 @@ CONFIG_HIDRAW=y</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_AUXDISPLAY is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='hunk'>@@ -806,11 +810,8 @@ CONFIG_HIDRAW=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ATARI_MFPSER=m</div><div class='del'>-CONFIG_ATARI_SCC=y</div><div class='del'>-CONFIG_ATARI_SCC_DMA=y</div><div class='ctx'> CONFIG_ATARI_MIDI=m</div><div class='ctx'> CONFIG_ATARI_DSP56K=m</div><div class='del'>-# CONFIG_SERIAL_CONSOLE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='hunk'>@@ -820,8 +821,10 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_EXT2_FS_XIP is not set</div><div class='ctx'> CONFIG_EXT3_FS=y</div><div class='ctx'> # CONFIG_EXT3_FS_XATTR is not set</div><div class='del'>-# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_EXT4DEV_FS=y</div><div class='add'>+# CONFIG_EXT4DEV_FS_XATTR is not set</div><div class='ctx'> CONFIG_JBD=y</div><div class='add'>+CONFIG_JBD2=y</div><div class='ctx'> CONFIG_REISERFS_FS=m</div><div class='ctx'> # CONFIG_REISERFS_CHECK is not set</div><div class='ctx'> # CONFIG_REISERFS_PROC_INFO is not set</div><div class='hunk'>@@ -840,6 +843,7 @@ CONFIG_XFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS_O2CB=m</div><div class='ctx'> CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m</div><div class='add'>+# CONFIG_OCFS2_FS_STATS is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -899,6 +903,7 @@ CONFIG_HFSPLUS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -920,7 +925,6 @@ CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=m</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=m</div><div class='del'>-CONFIG_SUNRPC_BIND34=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='hunk'>@@ -929,7 +933,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> CONFIG_CODA_FS=m</div><div class='del'>-# CONFIG_CODA_FS_OLD_API is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -994,6 +997,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1053,6 +1058,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=m</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_RMD128=m</div><div class='add'>+CONFIG_CRYPTO_RMD160=m</div><div class='add'>+CONFIG_CRYPTO_RMD256=m</div><div class='add'>+CONFIG_CRYPTO_RMD320=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='hunk'>@@ -1094,6 +1103,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> CONFIG_CRC16=y</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig<br/>index a0a9b30bb502..2e44af0fe54a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/bvme6000_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68k/configs/bvme6000_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/bvme6000_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/bvme6000_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Wed May 28 22:47:35 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc6</div><div class='add'>+# Wed Sep 10 09:02:03 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_M68K=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='hunk'>@@ -52,7 +52,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='hunk'>@@ -75,10 +74,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> # CONFIG_HAVE_OPROFILE is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -95,6 +100,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -163,10 +169,6 @@ CONFIG_BINFMT_MISC=m</div><div class='ctx'> CONFIG_PROC_HARDWARE=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -180,6 +182,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_NET_KEY_MIGRATE=y</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -413,6 +416,7 @@ CONFIG_NET_CLS_ROUTE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+# CONFIG_WIRELESS_EXT_SYSFS is not set</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> CONFIG_IEEE80211=m</div><div class='ctx'> # CONFIG_IEEE80211_DEBUG is not set</div><div class='hunk'>@@ -432,7 +436,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='hunk'>@@ -450,6 +456,7 @@ CONFIG_CDROM_PKTCDVD=m</div><div class='ctx'> CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='ctx'> CONFIG_ATA_OVER_ETH=m</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -503,6 +510,7 @@ CONFIG_ISCSI_TCP=m</div><div class='ctx'> CONFIG_53C700_BE_BUS=y</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> CONFIG_BVME6000_SCSI=y</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='hunk'>@@ -511,7 +519,7 @@ CONFIG_MD_RAID1=m</div><div class='ctx'> # CONFIG_MD_RAID10 is not set</div><div class='ctx'> CONFIG_MD_RAID456=m</div><div class='ctx'> CONFIG_MD_RAID5_RESHAPE=y</div><div class='del'>-CONFIG_MD_MULTIPATH=m</div><div class='add'>+# CONFIG_MD_MULTIPATH is not set</div><div class='ctx'> # CONFIG_MD_FAULTY is not set</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='ctx'> # CONFIG_DM_DEBUG is not set</div><div class='hunk'>@@ -520,13 +528,9 @@ CONFIG_DM_SNAPSHOT=m</div><div class='ctx'> CONFIG_DM_MIRROR=m</div><div class='ctx'> CONFIG_DM_ZERO=m</div><div class='ctx'> CONFIG_DM_MULTIPATH=m</div><div class='del'>-CONFIG_DM_MULTIPATH_EMC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_RDAC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_HP=m</div><div class='ctx'> # CONFIG_DM_DELAY is not set</div><div class='ctx'> CONFIG_DM_UEVENT=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> CONFIG_MACVLAN=m</div><div class='hunk'>@@ -631,6 +635,7 @@ CONFIG_SERIO_LIBPS2=m</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -661,6 +666,7 @@ CONFIG_GEN_RTC_X=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -672,8 +678,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -708,10 +716,6 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Console display driver support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=m</div><div class='hunk'>@@ -723,6 +727,7 @@ CONFIG_HIDRAW=y</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -759,6 +764,7 @@ CONFIG_XFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS_O2CB=m</div><div class='ctx'> CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m</div><div class='add'>+# CONFIG_OCFS2_FS_STATS is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -818,6 +824,7 @@ CONFIG_HFSPLUS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -830,18 +837,17 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=m</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=m</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-CONFIG_SUNRPC_BIND34=y</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='hunk'>@@ -850,7 +856,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> CONFIG_CODA_FS=m</div><div class='del'>-# CONFIG_CODA_FS_OLD_API is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -915,6 +920,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -974,6 +981,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_RMD128=m</div><div class='add'>+CONFIG_CRYPTO_RMD160=m</div><div class='add'>+CONFIG_CRYPTO_RMD256=m</div><div class='add'>+CONFIG_CRYPTO_RMD320=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='hunk'>@@ -1015,6 +1026,7 @@ CONFIG_BITREVERSE=m</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> CONFIG_CRC16=m</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=m</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig<br/>index 6778041de262..3570fc89b089 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/hp300_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68k/configs/hp300_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/hp300_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/hp300_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Wed May 28 22:47:35 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc6</div><div class='add'>+# Wed Sep 10 09:02:04 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_M68K=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='hunk'>@@ -52,7 +52,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='hunk'>@@ -75,10 +74,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> # CONFIG_HAVE_OPROFILE is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -95,6 +100,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -162,10 +168,6 @@ CONFIG_HEARTBEAT=y</div><div class='ctx'> CONFIG_PROC_HARDWARE=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -179,6 +181,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_NET_KEY_MIGRATE=y</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -412,6 +415,7 @@ CONFIG_NET_CLS_ROUTE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+# CONFIG_WIRELESS_EXT_SYSFS is not set</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> CONFIG_IEEE80211=m</div><div class='ctx'> # CONFIG_IEEE80211_DEBUG is not set</div><div class='hunk'>@@ -431,7 +435,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='hunk'>@@ -449,6 +455,7 @@ CONFIG_CDROM_PKTCDVD=m</div><div class='ctx'> CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='ctx'> CONFIG_ATA_OVER_ETH=m</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -500,6 +507,7 @@ CONFIG_SCSI_SRP_TGT_ATTRS=y</div><div class='ctx'> CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> CONFIG_ISCSI_TCP=m</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='hunk'>@@ -508,7 +516,7 @@ CONFIG_MD_RAID1=m</div><div class='ctx'> # CONFIG_MD_RAID10 is not set</div><div class='ctx'> CONFIG_MD_RAID456=m</div><div class='ctx'> CONFIG_MD_RAID5_RESHAPE=y</div><div class='del'>-CONFIG_MD_MULTIPATH=m</div><div class='add'>+# CONFIG_MD_MULTIPATH is not set</div><div class='ctx'> # CONFIG_MD_FAULTY is not set</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='ctx'> # CONFIG_DM_DEBUG is not set</div><div class='hunk'>@@ -517,13 +525,9 @@ CONFIG_DM_SNAPSHOT=m</div><div class='ctx'> CONFIG_DM_MIRROR=m</div><div class='ctx'> CONFIG_DM_ZERO=m</div><div class='ctx'> CONFIG_DM_MULTIPATH=m</div><div class='del'>-CONFIG_DM_MULTIPATH_EMC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_RDAC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_HP=m</div><div class='ctx'> # CONFIG_DM_DELAY is not set</div><div class='ctx'> CONFIG_DM_UEVENT=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> CONFIG_MACVLAN=m</div><div class='hunk'>@@ -636,6 +640,7 @@ CONFIG_SERIO_LIBPS2=m</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -666,6 +671,7 @@ CONFIG_GEN_RTC_X=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -677,8 +683,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -747,10 +755,6 @@ CONFIG_LOGO=y</div><div class='ctx'> # CONFIG_LOGO_LINUX_MONO is not set</div><div class='ctx'> # CONFIG_LOGO_LINUX_VGA16 is not set</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=m</div><div class='hunk'>@@ -762,6 +766,7 @@ CONFIG_HIDRAW=y</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -796,6 +801,7 @@ CONFIG_XFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS_O2CB=m</div><div class='ctx'> CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m</div><div class='add'>+# CONFIG_OCFS2_FS_STATS is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -855,6 +861,7 @@ CONFIG_HFSPLUS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -867,18 +874,17 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=m</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=m</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-CONFIG_SUNRPC_BIND34=y</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='hunk'>@@ -887,7 +893,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> CONFIG_CODA_FS=m</div><div class='del'>-# CONFIG_CODA_FS_OLD_API is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -951,6 +956,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1010,6 +1017,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_RMD128=m</div><div class='add'>+CONFIG_CRYPTO_RMD160=m</div><div class='add'>+CONFIG_CRYPTO_RMD256=m</div><div class='add'>+CONFIG_CRYPTO_RMD320=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='hunk'>@@ -1051,6 +1062,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> CONFIG_CRC16=m</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig<br/>index 7cd375740348..db6e8822594a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/mac_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68k/configs/mac_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/mac_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/mac_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Wed May 28 22:47:35 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc6</div><div class='add'>+# Wed Sep 10 09:02:06 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_M68K=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='hunk'>@@ -52,7 +52,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='hunk'>@@ -75,10 +74,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> # CONFIG_HAVE_OPROFILE is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -95,6 +100,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -163,10 +169,6 @@ CONFIG_BINFMT_MISC=m</div><div class='ctx'> CONFIG_PROC_HARDWARE=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -180,6 +182,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_NET_KEY_MIGRATE=y</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -413,6 +416,7 @@ CONFIG_NET_CLS_ROUTE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+# CONFIG_WIRELESS_EXT_SYSFS is not set</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> CONFIG_IEEE80211=m</div><div class='ctx'> # CONFIG_IEEE80211_DEBUG is not set</div><div class='hunk'>@@ -432,7 +436,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='hunk'>@@ -450,6 +456,7 @@ CONFIG_CDROM_PKTCDVD=m</div><div class='ctx'> CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='ctx'> CONFIG_ATA_OVER_ETH=m</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -460,6 +467,7 @@ CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_ATAPI=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='hunk'>@@ -477,8 +485,6 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> CONFIG_BLK_DEV_MAC_IDE=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDEDMA is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -527,6 +533,7 @@ CONFIG_ISCSI_TCP=m</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> CONFIG_MAC_SCSI=y</div><div class='ctx'> CONFIG_SCSI_MAC_ESP=y</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='hunk'>@@ -535,7 +542,7 @@ CONFIG_MD_RAID1=m</div><div class='ctx'> # CONFIG_MD_RAID10 is not set</div><div class='ctx'> CONFIG_MD_RAID456=m</div><div class='ctx'> CONFIG_MD_RAID5_RESHAPE=y</div><div class='del'>-CONFIG_MD_MULTIPATH=m</div><div class='add'>+# CONFIG_MD_MULTIPATH is not set</div><div class='ctx'> # CONFIG_MD_FAULTY is not set</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='ctx'> # CONFIG_DM_DEBUG is not set</div><div class='hunk'>@@ -544,9 +551,6 @@ CONFIG_DM_SNAPSHOT=m</div><div class='ctx'> CONFIG_DM_MIRROR=m</div><div class='ctx'> CONFIG_DM_ZERO=m</div><div class='ctx'> CONFIG_DM_MULTIPATH=m</div><div class='del'>-CONFIG_DM_MULTIPATH_EMC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_RDAC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_HP=m</div><div class='ctx'> # CONFIG_DM_DELAY is not set</div><div class='ctx'> CONFIG_DM_UEVENT=y</div><div class='ctx'> CONFIG_MACINTOSH_DRIVERS=y</div><div class='hunk'>@@ -559,7 +563,6 @@ CONFIG_ADB_CUDA=y</div><div class='ctx'> CONFIG_INPUT_ADBHID=y</div><div class='ctx'> CONFIG_MAC_EMUMOUSEBTN=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> CONFIG_MACVLAN=m</div><div class='hunk'>@@ -670,6 +673,7 @@ CONFIG_SERIO_LIBPS2=m</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -700,6 +704,7 @@ CONFIG_GEN_RTC_X=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -711,8 +716,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -784,10 +791,6 @@ CONFIG_LOGO_LINUX_MONO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_VGA16=y</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='ctx'> CONFIG_LOGO_MAC_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=m</div><div class='hunk'>@@ -799,6 +802,7 @@ CONFIG_HIDRAW=y</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -836,6 +840,7 @@ CONFIG_XFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS_O2CB=m</div><div class='ctx'> CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m</div><div class='add'>+# CONFIG_OCFS2_FS_STATS is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -895,6 +900,7 @@ CONFIG_HFSPLUS_FS=y</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -917,7 +923,6 @@ CONFIG_EXPORTFS=m</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=m</div><div class='ctx'> CONFIG_SUNRPC_GSS=m</div><div class='del'>-CONFIG_SUNRPC_BIND34=y</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=m</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='hunk'>@@ -926,7 +931,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> CONFIG_CODA_FS=m</div><div class='del'>-# CONFIG_CODA_FS_OLD_API is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -991,6 +995,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1050,6 +1056,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=m</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_RMD128=m</div><div class='add'>+CONFIG_CRYPTO_RMD160=m</div><div class='add'>+CONFIG_CRYPTO_RMD256=m</div><div class='add'>+CONFIG_CRYPTO_RMD320=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='hunk'>@@ -1091,6 +1101,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> CONFIG_CRC16=m</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig<br/>index 0747fa3984df..1a806102b999 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/multi_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68k/configs/multi_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/multi_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/multi_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Wed May 28 22:47:35 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc6</div><div class='add'>+# Wed Sep 10 09:02:07 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_M68K=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='hunk'>@@ -52,7 +52,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='hunk'>@@ -75,10 +74,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> # CONFIG_HAVE_OPROFILE is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -95,6 +100,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -173,10 +179,6 @@ CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='ctx'> CONFIG_ZORRO_NAMES=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -190,6 +192,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_NET_KEY_MIGRATE=y</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -427,6 +430,7 @@ CONFIG_NET_CLS_ROUTE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+# CONFIG_WIRELESS_EXT_SYSFS is not set</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> CONFIG_IEEE80211=m</div><div class='ctx'> # CONFIG_IEEE80211_DEBUG is not set</div><div class='hunk'>@@ -446,7 +450,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='hunk'>@@ -476,6 +482,7 @@ CONFIG_CDROM_PKTCDVD=m</div><div class='ctx'> CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='ctx'> CONFIG_ATA_OVER_ETH=m</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -486,6 +493,7 @@ CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_ATAPI=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='hunk'>@@ -508,8 +516,6 @@ CONFIG_BLK_DEV_FALCON_IDE=y</div><div class='ctx'> CONFIG_BLK_DEV_MAC_IDE=y</div><div class='ctx'> CONFIG_BLK_DEV_Q40IDE=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDEDMA is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -584,6 +590,7 @@ CONFIG_MVME147_SCSI=y</div><div class='ctx'> CONFIG_MVME16x_SCSI=y</div><div class='ctx'> CONFIG_BVME6000_SCSI=y</div><div class='ctx'> CONFIG_SUN3X_ESP=y</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='hunk'>@@ -592,7 +599,7 @@ CONFIG_MD_RAID1=m</div><div class='ctx'> # CONFIG_MD_RAID10 is not set</div><div class='ctx'> CONFIG_MD_RAID456=m</div><div class='ctx'> CONFIG_MD_RAID5_RESHAPE=y</div><div class='del'>-CONFIG_MD_MULTIPATH=m</div><div class='add'>+# CONFIG_MD_MULTIPATH is not set</div><div class='ctx'> # CONFIG_MD_FAULTY is not set</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='ctx'> # CONFIG_DM_DEBUG is not set</div><div class='hunk'>@@ -601,9 +608,6 @@ CONFIG_DM_SNAPSHOT=m</div><div class='ctx'> CONFIG_DM_MIRROR=m</div><div class='ctx'> CONFIG_DM_ZERO=m</div><div class='ctx'> CONFIG_DM_MULTIPATH=m</div><div class='del'>-CONFIG_DM_MULTIPATH_EMC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_RDAC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_HP=m</div><div class='ctx'> # CONFIG_DM_DELAY is not set</div><div class='ctx'> CONFIG_DM_UEVENT=y</div><div class='ctx'> CONFIG_MACINTOSH_DRIVERS=y</div><div class='hunk'>@@ -616,7 +620,6 @@ CONFIG_ADB_CUDA=y</div><div class='ctx'> CONFIG_INPUT_ADBHID=y</div><div class='ctx'> CONFIG_MAC_EMUMOUSEBTN=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> CONFIG_MACVLAN=m</div><div class='hunk'>@@ -632,7 +635,6 @@ CONFIG_A2065=m</div><div class='ctx'> CONFIG_HYDRA=m</div><div class='ctx'> CONFIG_ZORRO8390=m</div><div class='ctx'> CONFIG_APNE=m</div><div class='del'>-CONFIG_APOLLO_ELPLUS=y</div><div class='ctx'> CONFIG_MAC8390=y</div><div class='ctx'> CONFIG_MAC89x0=m</div><div class='ctx'> CONFIG_MACSONIC=m</div><div class='hunk'>@@ -791,6 +793,7 @@ CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -827,6 +830,7 @@ CONFIG_GEN_RTC_X=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -838,8 +842,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -923,10 +929,6 @@ CONFIG_LOGO_LINUX_MONO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_VGA16=y</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='ctx'> CONFIG_LOGO_MAC_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=m</div><div class='ctx'> CONFIG_DMASOUND_ATARI=m</div><div class='ctx'> CONFIG_DMASOUND_PAULA=m</div><div class='hunk'>@@ -942,6 +944,7 @@ CONFIG_HIDRAW=y</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_AUXDISPLAY is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='hunk'>@@ -949,8 +952,6 @@ CONFIG_HIDRAW=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ATARI_MFPSER=m</div><div class='del'>-CONFIG_ATARI_SCC=y</div><div class='del'>-CONFIG_ATARI_SCC_DMA=y</div><div class='ctx'> CONFIG_ATARI_MIDI=m</div><div class='ctx'> CONFIG_ATARI_DSP56K=m</div><div class='ctx'> CONFIG_AMIGA_BUILTIN_SERIAL=y</div><div class='hunk'>@@ -972,8 +973,10 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_EXT2_FS_XIP is not set</div><div class='ctx'> CONFIG_EXT3_FS=y</div><div class='ctx'> # CONFIG_EXT3_FS_XATTR is not set</div><div class='del'>-# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_EXT4DEV_FS=y</div><div class='add'>+# CONFIG_EXT4DEV_FS_XATTR is not set</div><div class='ctx'> CONFIG_JBD=y</div><div class='add'>+CONFIG_JBD2=y</div><div class='ctx'> CONFIG_REISERFS_FS=m</div><div class='ctx'> # CONFIG_REISERFS_CHECK is not set</div><div class='ctx'> # CONFIG_REISERFS_PROC_INFO is not set</div><div class='hunk'>@@ -992,6 +995,7 @@ CONFIG_XFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS_O2CB=m</div><div class='ctx'> CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m</div><div class='add'>+# CONFIG_OCFS2_FS_STATS is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -1051,6 +1055,7 @@ CONFIG_HFSPLUS_FS=y</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1063,18 +1068,17 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=m</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=m</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-CONFIG_SUNRPC_BIND34=y</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='hunk'>@@ -1083,7 +1087,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> CONFIG_CODA_FS=m</div><div class='del'>-# CONFIG_CODA_FS_OLD_API is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1152,6 +1155,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1211,6 +1216,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_RMD128=m</div><div class='add'>+CONFIG_CRYPTO_RMD160=m</div><div class='add'>+CONFIG_CRYPTO_RMD256=m</div><div class='add'>+CONFIG_CRYPTO_RMD320=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='hunk'>@@ -1252,6 +1261,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> CONFIG_CRC16=y</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig<br/>index e7a8246840b5..cacb5aef6a37 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/mvme147_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68k/configs/mvme147_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/mvme147_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/mvme147_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Wed May 28 22:47:35 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc6</div><div class='add'>+# Wed Sep 10 09:02:08 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_M68K=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='hunk'>@@ -52,7 +52,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='hunk'>@@ -75,10 +74,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> # CONFIG_HAVE_OPROFILE is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -95,6 +100,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -163,10 +169,6 @@ CONFIG_BINFMT_MISC=m</div><div class='ctx'> CONFIG_PROC_HARDWARE=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -180,6 +182,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_NET_KEY_MIGRATE=y</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -413,6 +416,7 @@ CONFIG_NET_CLS_ROUTE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+# CONFIG_WIRELESS_EXT_SYSFS is not set</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> CONFIG_IEEE80211=m</div><div class='ctx'> # CONFIG_IEEE80211_DEBUG is not set</div><div class='hunk'>@@ -432,7 +436,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='hunk'>@@ -450,6 +456,7 @@ CONFIG_CDROM_PKTCDVD=m</div><div class='ctx'> CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='ctx'> CONFIG_ATA_OVER_ETH=m</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -502,6 +509,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> CONFIG_ISCSI_TCP=m</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> CONFIG_MVME147_SCSI=y</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='hunk'>@@ -510,7 +518,7 @@ CONFIG_MD_RAID1=m</div><div class='ctx'> # CONFIG_MD_RAID10 is not set</div><div class='ctx'> CONFIG_MD_RAID456=m</div><div class='ctx'> CONFIG_MD_RAID5_RESHAPE=y</div><div class='del'>-CONFIG_MD_MULTIPATH=m</div><div class='add'>+# CONFIG_MD_MULTIPATH is not set</div><div class='ctx'> # CONFIG_MD_FAULTY is not set</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='ctx'> # CONFIG_DM_DEBUG is not set</div><div class='hunk'>@@ -519,13 +527,9 @@ CONFIG_DM_SNAPSHOT=m</div><div class='ctx'> CONFIG_DM_MIRROR=m</div><div class='ctx'> CONFIG_DM_ZERO=m</div><div class='ctx'> CONFIG_DM_MULTIPATH=m</div><div class='del'>-CONFIG_DM_MULTIPATH_EMC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_RDAC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_HP=m</div><div class='ctx'> # CONFIG_DM_DELAY is not set</div><div class='ctx'> CONFIG_DM_UEVENT=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> CONFIG_MACVLAN=m</div><div class='hunk'>@@ -630,6 +634,7 @@ CONFIG_SERIO_LIBPS2=m</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -660,6 +665,7 @@ CONFIG_GEN_RTC_X=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -671,8 +677,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -707,10 +715,6 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Console display driver support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=m</div><div class='hunk'>@@ -722,6 +726,7 @@ CONFIG_HIDRAW=y</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -758,6 +763,7 @@ CONFIG_XFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS_O2CB=m</div><div class='ctx'> CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m</div><div class='add'>+# CONFIG_OCFS2_FS_STATS is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -817,6 +823,7 @@ CONFIG_HFSPLUS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -829,18 +836,17 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=m</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=m</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-CONFIG_SUNRPC_BIND34=y</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='hunk'>@@ -849,7 +855,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> CONFIG_CODA_FS=m</div><div class='del'>-# CONFIG_CODA_FS_OLD_API is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -914,6 +919,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -973,6 +980,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_RMD128=m</div><div class='add'>+CONFIG_CRYPTO_RMD160=m</div><div class='add'>+CONFIG_CRYPTO_RMD256=m</div><div class='add'>+CONFIG_CRYPTO_RMD320=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='hunk'>@@ -1014,6 +1025,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> CONFIG_CRC16=m</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig<br/>index ab536eb172bb..a183e25e348d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/mvme16x_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68k/configs/mvme16x_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/mvme16x_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/mvme16x_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Wed May 28 22:47:35 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc6</div><div class='add'>+# Wed Sep 10 09:02:09 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_M68K=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='hunk'>@@ -52,7 +52,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='hunk'>@@ -75,10 +74,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> # CONFIG_HAVE_OPROFILE is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -95,6 +100,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -163,10 +169,6 @@ CONFIG_BINFMT_MISC=m</div><div class='ctx'> CONFIG_PROC_HARDWARE=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -180,6 +182,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_NET_KEY_MIGRATE=y</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -413,6 +416,7 @@ CONFIG_NET_CLS_ROUTE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+# CONFIG_WIRELESS_EXT_SYSFS is not set</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> CONFIG_IEEE80211=m</div><div class='ctx'> # CONFIG_IEEE80211_DEBUG is not set</div><div class='hunk'>@@ -432,7 +436,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='hunk'>@@ -450,6 +456,7 @@ CONFIG_CDROM_PKTCDVD=m</div><div class='ctx'> CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='ctx'> CONFIG_ATA_OVER_ETH=m</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -503,6 +510,7 @@ CONFIG_ISCSI_TCP=m</div><div class='ctx'> CONFIG_53C700_BE_BUS=y</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> CONFIG_MVME16x_SCSI=y</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='hunk'>@@ -511,7 +519,7 @@ CONFIG_MD_RAID1=m</div><div class='ctx'> # CONFIG_MD_RAID10 is not set</div><div class='ctx'> CONFIG_MD_RAID456=m</div><div class='ctx'> CONFIG_MD_RAID5_RESHAPE=y</div><div class='del'>-CONFIG_MD_MULTIPATH=m</div><div class='add'>+# CONFIG_MD_MULTIPATH is not set</div><div class='ctx'> # CONFIG_MD_FAULTY is not set</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='ctx'> # CONFIG_DM_DEBUG is not set</div><div class='hunk'>@@ -520,13 +528,9 @@ CONFIG_DM_SNAPSHOT=m</div><div class='ctx'> CONFIG_DM_MIRROR=m</div><div class='ctx'> CONFIG_DM_ZERO=m</div><div class='ctx'> CONFIG_DM_MULTIPATH=m</div><div class='del'>-CONFIG_DM_MULTIPATH_EMC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_RDAC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_HP=m</div><div class='ctx'> # CONFIG_DM_DELAY is not set</div><div class='ctx'> CONFIG_DM_UEVENT=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> CONFIG_MACVLAN=m</div><div class='hunk'>@@ -631,6 +635,7 @@ CONFIG_SERIO_LIBPS2=m</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -661,6 +666,7 @@ CONFIG_GEN_RTC_X=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -672,8 +678,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -708,10 +716,6 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Console display driver support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=m</div><div class='hunk'>@@ -723,6 +727,7 @@ CONFIG_HIDRAW=y</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -760,6 +765,7 @@ CONFIG_XFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS_O2CB=m</div><div class='ctx'> CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m</div><div class='add'>+# CONFIG_OCFS2_FS_STATS is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -819,6 +825,7 @@ CONFIG_HFSPLUS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -831,18 +838,17 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=m</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=m</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-CONFIG_SUNRPC_BIND34=y</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='hunk'>@@ -851,7 +857,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> CONFIG_CODA_FS=m</div><div class='del'>-# CONFIG_CODA_FS_OLD_API is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -916,6 +921,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -975,6 +982,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_RMD128=m</div><div class='add'>+CONFIG_CRYPTO_RMD160=m</div><div class='add'>+CONFIG_CRYPTO_RMD256=m</div><div class='add'>+CONFIG_CRYPTO_RMD320=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='hunk'>@@ -1016,6 +1027,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> CONFIG_CRC16=m</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig<br/>index e05be687b500..72eaff0776b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/q40_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68k/configs/q40_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/q40_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/q40_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Wed May 28 22:47:35 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc6</div><div class='add'>+# Wed Sep 10 09:02:10 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_M68K=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='hunk'>@@ -52,7 +52,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='hunk'>@@ -75,10 +74,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> # CONFIG_HAVE_OPROFILE is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -95,6 +100,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -163,10 +169,6 @@ CONFIG_ISA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -180,6 +182,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_NET_KEY_MIGRATE=y</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -410,6 +413,7 @@ CONFIG_NET_CLS_ROUTE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+# CONFIG_WIRELESS_EXT_SYSFS is not set</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> CONFIG_IEEE80211=m</div><div class='ctx'> # CONFIG_IEEE80211_DEBUG is not set</div><div class='hunk'>@@ -429,7 +433,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='hunk'>@@ -448,6 +454,7 @@ CONFIG_CDROM_PKTCDVD=m</div><div class='ctx'> CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='ctx'> CONFIG_ATA_OVER_ETH=m</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -458,6 +465,7 @@ CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_ATAPI=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='hunk'>@@ -475,8 +483,6 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> CONFIG_BLK_DEV_Q40IDE=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDEDMA is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -536,6 +542,7 @@ CONFIG_ISCSI_TCP=m</div><div class='ctx'> # CONFIG_SCSI_SYM53C416 is not set</div><div class='ctx'> # CONFIG_SCSI_T128 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='hunk'>@@ -544,7 +551,7 @@ CONFIG_MD_RAID1=m</div><div class='ctx'> # CONFIG_MD_RAID10 is not set</div><div class='ctx'> CONFIG_MD_RAID456=m</div><div class='ctx'> CONFIG_MD_RAID5_RESHAPE=y</div><div class='del'>-CONFIG_MD_MULTIPATH=m</div><div class='add'>+# CONFIG_MD_MULTIPATH is not set</div><div class='ctx'> # CONFIG_MD_FAULTY is not set</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='ctx'> # CONFIG_DM_DEBUG is not set</div><div class='hunk'>@@ -553,13 +560,9 @@ CONFIG_DM_SNAPSHOT=m</div><div class='ctx'> CONFIG_DM_MIRROR=m</div><div class='ctx'> CONFIG_DM_ZERO=m</div><div class='ctx'> CONFIG_DM_MULTIPATH=m</div><div class='del'>-CONFIG_DM_MULTIPATH_EMC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_RDAC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_HP=m</div><div class='ctx'> # CONFIG_DM_DELAY is not set</div><div class='ctx'> CONFIG_DM_UEVENT=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> CONFIG_MACVLAN=m</div><div class='hunk'>@@ -680,6 +683,7 @@ CONFIG_SERIO_LIBPS2=m</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -711,6 +715,7 @@ CONFIG_GEN_RTC_X=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -722,8 +727,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -792,10 +799,6 @@ CONFIG_LOGO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_MONO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_VGA16=y</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=m</div><div class='ctx'> CONFIG_DMASOUND_Q40=m</div><div class='ctx'> CONFIG_DMASOUND=m</div><div class='hunk'>@@ -809,6 +812,7 @@ CONFIG_HIDRAW=y</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -843,6 +847,7 @@ CONFIG_XFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS_O2CB=m</div><div class='ctx'> CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m</div><div class='add'>+# CONFIG_OCFS2_FS_STATS is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -902,6 +907,7 @@ CONFIG_HFSPLUS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -924,7 +930,6 @@ CONFIG_EXPORTFS=m</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-CONFIG_SUNRPC_BIND34=y</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='hunk'>@@ -933,7 +938,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> CONFIG_CODA_FS=m</div><div class='del'>-# CONFIG_CODA_FS_OLD_API is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -997,6 +1001,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1056,6 +1062,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_RMD128=m</div><div class='add'>+CONFIG_CRYPTO_RMD160=m</div><div class='add'>+CONFIG_CRYPTO_RMD256=m</div><div class='add'>+CONFIG_CRYPTO_RMD320=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='hunk'>@@ -1097,6 +1107,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> CONFIG_CRC16=m</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig<br/>index 296340d2b315..cb62b96d766e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/sun3_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68k/configs/sun3_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/sun3_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/sun3_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Wed May 28 22:47:35 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc6</div><div class='add'>+# Wed Sep 10 09:02:11 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_M68K=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='hunk'>@@ -52,7 +52,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='hunk'>@@ -75,10 +74,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> # CONFIG_HAVE_OPROFILE is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -95,6 +100,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -149,10 +155,6 @@ CONFIG_BINFMT_MISC=m</div><div class='ctx'> CONFIG_PROC_HARDWARE=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -166,6 +168,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_NET_KEY_MIGRATE=y</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -399,6 +402,7 @@ CONFIG_NET_CLS_ROUTE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+# CONFIG_WIRELESS_EXT_SYSFS is not set</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> CONFIG_IEEE80211=m</div><div class='ctx'> # CONFIG_IEEE80211_DEBUG is not set</div><div class='hunk'>@@ -418,7 +422,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='hunk'>@@ -436,6 +442,7 @@ CONFIG_CDROM_PKTCDVD=m</div><div class='ctx'> CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='ctx'> CONFIG_ATA_OVER_ETH=m</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -488,6 +495,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> CONFIG_ISCSI_TCP=m</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> CONFIG_SUN3_SCSI=y</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='hunk'>@@ -496,7 +504,7 @@ CONFIG_MD_RAID1=m</div><div class='ctx'> # CONFIG_MD_RAID10 is not set</div><div class='ctx'> CONFIG_MD_RAID456=m</div><div class='ctx'> CONFIG_MD_RAID5_RESHAPE=y</div><div class='del'>-CONFIG_MD_MULTIPATH=m</div><div class='add'>+# CONFIG_MD_MULTIPATH is not set</div><div class='ctx'> # CONFIG_MD_FAULTY is not set</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='ctx'> # CONFIG_DM_DEBUG is not set</div><div class='hunk'>@@ -505,13 +513,9 @@ CONFIG_DM_SNAPSHOT=m</div><div class='ctx'> CONFIG_DM_MIRROR=m</div><div class='ctx'> CONFIG_DM_ZERO=m</div><div class='ctx'> CONFIG_DM_MULTIPATH=m</div><div class='del'>-CONFIG_DM_MULTIPATH_EMC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_RDAC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_HP=m</div><div class='ctx'> # CONFIG_DM_DELAY is not set</div><div class='ctx'> CONFIG_DM_UEVENT=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> CONFIG_MACVLAN=m</div><div class='hunk'>@@ -527,7 +531,6 @@ CONFIG_SUN3_82586=y</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='del'>-# CONFIG_B44 is not set</div><div class='ctx'> # CONFIG_NETDEV_1000 is not set</div><div class='ctx'> # CONFIG_NETDEV_10000 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -617,6 +620,7 @@ CONFIG_SERIO_LIBPS2=m</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -647,19 +651,20 @@ CONFIG_GEN_RTC_X=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Sonics Silicon Backplane</div><div class='ctx'> #</div><div class='del'>-CONFIG_SSB_POSSIBLE=y</div><div class='del'>-# CONFIG_SSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -727,10 +732,6 @@ CONFIG_LOGO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_MONO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_VGA16=y</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=m</div><div class='hunk'>@@ -776,6 +777,7 @@ CONFIG_XFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS_O2CB=m</div><div class='ctx'> CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m</div><div class='add'>+# CONFIG_OCFS2_FS_STATS is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -835,6 +837,7 @@ CONFIG_HFSPLUS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -847,18 +850,17 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=m</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=m</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-CONFIG_SUNRPC_BIND34=y</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='hunk'>@@ -867,7 +869,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> CONFIG_CODA_FS=m</div><div class='del'>-# CONFIG_CODA_FS_OLD_API is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -932,6 +933,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -991,6 +994,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_RMD128=m</div><div class='add'>+CONFIG_CRYPTO_RMD160=m</div><div class='add'>+CONFIG_CRYPTO_RMD256=m</div><div class='add'>+CONFIG_CRYPTO_RMD320=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='hunk'>@@ -1032,6 +1039,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> CONFIG_CRC16=m</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig<br/>index 8d3a416c92bf..04b4363a7050 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/sun3x_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68k/configs/sun3x_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/sun3x_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/configs/sun3x_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Wed May 28 22:47:35 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc6</div><div class='add'>+# Wed Sep 10 09:02:12 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_M68K=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='hunk'>@@ -52,7 +52,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='hunk'>@@ -75,10 +74,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> # CONFIG_HAVE_OPROFILE is not set</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -95,6 +100,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -160,10 +166,6 @@ CONFIG_BINFMT_MISC=m</div><div class='ctx'> CONFIG_PROC_HARDWARE=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -177,6 +179,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_NET_KEY_MIGRATE=y</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -410,6 +413,7 @@ CONFIG_NET_CLS_ROUTE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+# CONFIG_WIRELESS_EXT_SYSFS is not set</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> CONFIG_IEEE80211=m</div><div class='ctx'> # CONFIG_IEEE80211_DEBUG is not set</div><div class='hunk'>@@ -429,7 +433,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='hunk'>@@ -447,6 +453,7 @@ CONFIG_CDROM_PKTCDVD=m</div><div class='ctx'> CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='ctx'> CONFIG_ATA_OVER_ETH=m</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -499,6 +506,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> CONFIG_ISCSI_TCP=m</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> CONFIG_SUN3X_ESP=y</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='hunk'>@@ -507,7 +515,7 @@ CONFIG_MD_RAID1=m</div><div class='ctx'> # CONFIG_MD_RAID10 is not set</div><div class='ctx'> CONFIG_MD_RAID456=m</div><div class='ctx'> CONFIG_MD_RAID5_RESHAPE=y</div><div class='del'>-CONFIG_MD_MULTIPATH=m</div><div class='add'>+# CONFIG_MD_MULTIPATH is not set</div><div class='ctx'> # CONFIG_MD_FAULTY is not set</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='ctx'> # CONFIG_DM_DEBUG is not set</div><div class='hunk'>@@ -516,13 +524,9 @@ CONFIG_DM_SNAPSHOT=m</div><div class='ctx'> CONFIG_DM_MIRROR=m</div><div class='ctx'> CONFIG_DM_ZERO=m</div><div class='ctx'> CONFIG_DM_MULTIPATH=m</div><div class='del'>-CONFIG_DM_MULTIPATH_EMC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_RDAC=m</div><div class='del'>-CONFIG_DM_MULTIPATH_HP=m</div><div class='ctx'> # CONFIG_DM_DELAY is not set</div><div class='ctx'> CONFIG_DM_UEVENT=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> CONFIG_MACVLAN=m</div><div class='hunk'>@@ -627,6 +631,7 @@ CONFIG_SERIO_LIBPS2=m</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -657,6 +662,7 @@ CONFIG_GEN_RTC_X=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -668,8 +674,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -737,10 +745,6 @@ CONFIG_LOGO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_MONO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_VGA16=y</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=m</div><div class='hunk'>@@ -752,6 +756,7 @@ CONFIG_HIDRAW=y</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -786,6 +791,7 @@ CONFIG_XFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS_O2CB=m</div><div class='ctx'> CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m</div><div class='add'>+# CONFIG_OCFS2_FS_STATS is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -845,6 +851,7 @@ CONFIG_HFSPLUS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -857,18 +864,17 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=m</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=m</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-CONFIG_SUNRPC_BIND34=y</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='hunk'>@@ -877,7 +883,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> CONFIG_CODA_FS=m</div><div class='del'>-# CONFIG_CODA_FS_OLD_API is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -942,6 +947,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1001,6 +1008,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_RMD128=m</div><div class='add'>+CONFIG_CRYPTO_RMD160=m</div><div class='add'>+CONFIG_CRYPTO_RMD256=m</div><div class='add'>+CONFIG_CRYPTO_RMD320=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='hunk'>@@ -1042,6 +1053,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> CONFIG_CRC16=m</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S<br/>index 18a9c5f4b00d..f28404d9a2bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/entry.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68k/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/kernel/entry.S</a></div><div class='hunk'>@@ -747,4 +747,10 @@ sys_call_table:</div><div class='ctx'> 	.long sys_fallocate		/* 320 */</div><div class='ctx'> 	.long sys_timerfd_settime</div><div class='ctx'> 	.long sys_timerfd_gettime</div><div class='add'>+	.long sys_signalfd4</div><div class='add'>+	.long sys_eventfd2</div><div class='add'>+	.long sys_epoll_create1		/* 325 */</div><div class='add'>+	.long sys_dup3</div><div class='add'>+	.long sys_pipe2</div><div class='add'>+	.long sys_inotify_init1</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c<br/>index dae9c982aa89..c7b25b0aacff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/baboon.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68k/mac/baboon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/baboon.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/mac/baboon.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/ide.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='head'>diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c<br/>index f3b27d04a31f..1bdb03c73c0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/via.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68k/mac/via.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/via.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68k/mac/via.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='head'>diff --git a/include/asm-m68knommu/Kbuild b/arch/m68knommu/include/asm/Kbuild<br/>index c68e1680da01..c68e1680da01 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/Kbuild?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/Kbuild</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/Kbuild</a></div><div class='head'>diff --git a/include/asm-m68knommu/MC68328.h b/arch/m68knommu/include/asm/MC68328.h<br/>index a337e56d09bf..a337e56d09bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/MC68328.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/MC68328.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/MC68328.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/MC68328.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/MC68332.h b/arch/m68knommu/include/asm/MC68332.h<br/>index 6bb8f02685a2..6bb8f02685a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/MC68332.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/MC68332.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/MC68332.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/MC68332.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/MC68EZ328.h b/arch/m68knommu/include/asm/MC68EZ328.h<br/>index 69b7f9139e5e..69b7f9139e5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/MC68EZ328.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/MC68EZ328.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/MC68EZ328.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/MC68EZ328.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/MC68VZ328.h b/arch/m68knommu/include/asm/MC68VZ328.h<br/>index 2b9bf626a0a5..2b9bf626a0a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/MC68VZ328.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/MC68VZ328.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/MC68VZ328.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/MC68VZ328.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/a.out.h b/arch/m68knommu/include/asm/a.out.h<br/>index ce18ef99de04..ce18ef99de04 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/a.out.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/a.out.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/a.out.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/anchor.h b/arch/m68knommu/include/asm/anchor.h<br/>index 871c0d5cfc3d..871c0d5cfc3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/anchor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/anchor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/anchor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/anchor.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/atomic.h b/arch/m68knommu/include/asm/atomic.h<br/>index d5632a305dae..d5632a305dae 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/atomic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/atomic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/atomic.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/auxvec.h b/arch/m68knommu/include/asm/auxvec.h<br/>index 844d6d52204b..844d6d52204b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/auxvec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/auxvec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/auxvec.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/bitops.h b/arch/m68knommu/include/asm/bitops.h<br/>index 6f3685eab44c..6f3685eab44c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/bitops.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/bitops.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/bitops.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/bootinfo.h b/arch/m68knommu/include/asm/bootinfo.h<br/>index c12e526f5189..c12e526f5189 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/bootinfo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/bootinfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/bootinfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/bootinfo.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/bootstd.h b/arch/m68knommu/include/asm/bootstd.h<br/>index bdc1a4ac4fe9..bdc1a4ac4fe9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/bootstd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/bootstd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/bootstd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/bootstd.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/bug.h b/arch/m68knommu/include/asm/bug.h<br/>index 70e7dc0af21a..70e7dc0af21a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/bug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/bug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/bug.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/bugs.h b/arch/m68knommu/include/asm/bugs.h<br/>index 5f382dac3a60..5f382dac3a60 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/bugs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/bugs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/bugs.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/byteorder.h b/arch/m68knommu/include/asm/byteorder.h<br/>index 20bb4426b610..20bb4426b610 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/byteorder.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/byteorder.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/byteorder.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/cache.h b/arch/m68knommu/include/asm/cache.h<br/>index 24e9eace5f8c..24e9eace5f8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/cache.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/cache.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/cache.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/cachectl.h b/arch/m68knommu/include/asm/cachectl.h<br/>index bcf5a6a9dd52..bcf5a6a9dd52 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/cachectl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/cachectl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/cachectl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/cachectl.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/cacheflush.h b/arch/m68knommu/include/asm/cacheflush.h<br/>index 87e5dc0413b4..87e5dc0413b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/cacheflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/cacheflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/cacheflush.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/checksum.h b/arch/m68knommu/include/asm/checksum.h<br/>index 81883482ffb1..81883482ffb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/checksum.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/checksum.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/checksum.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/coldfire.h b/arch/m68knommu/include/asm/coldfire.h<br/>index 83a9fa4e618a..83a9fa4e618a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/coldfire.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/coldfire.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/coldfire.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/coldfire.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/commproc.h b/arch/m68knommu/include/asm/commproc.h<br/>index edf5eb6c08d2..edf5eb6c08d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/commproc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/commproc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/commproc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/commproc.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/cputime.h b/arch/m68knommu/include/asm/cputime.h<br/>index a0c4a660878d..a0c4a660878d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/cputime.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/cputime.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/cputime.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/current.h b/arch/m68knommu/include/asm/current.h<br/>index 53ee0f9f7cef..53ee0f9f7cef 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/current.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/current.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/current.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/dbg.h b/arch/m68knommu/include/asm/dbg.h<br/>index 27af3270f671..27af3270f671 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/dbg.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/dbg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/dbg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/dbg.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/delay.h b/arch/m68knommu/include/asm/delay.h<br/>index 55cbd6294ab6..55cbd6294ab6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/delay.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/delay.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/delay.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/device.h b/arch/m68knommu/include/asm/device.h<br/>index d8f9872b0e2d..d8f9872b0e2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/device.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/device.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/device.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/div64.h b/arch/m68knommu/include/asm/div64.h<br/>index 6cd978cefb28..6cd978cefb28 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/div64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/div64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/div64.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/dma-mapping.h b/arch/m68knommu/include/asm/dma-mapping.h<br/>index 6aeab18e58bd..6aeab18e58bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/dma-mapping.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/dma-mapping.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/dma-mapping.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/dma-mapping.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/dma.h b/arch/m68knommu/include/asm/dma.h<br/>index 939a02056217..939a02056217 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/dma.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/elf.h b/arch/m68knommu/include/asm/elf.h<br/>index 27f0ec70fba8..27f0ec70fba8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/elf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/elf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/elf.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/elia.h b/arch/m68knommu/include/asm/elia.h<br/>index e037d4e2de33..e037d4e2de33 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/elia.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/elia.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/elia.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/elia.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/emergency-restart.h b/arch/m68knommu/include/asm/emergency-restart.h<br/>index 108d8c48e42e..108d8c48e42e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/emergency-restart.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/emergency-restart.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/emergency-restart.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/entry.h b/arch/m68knommu/include/asm/entry.h<br/>index c2553d26273d..c2553d26273d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/entry.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/entry.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/entry.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/entry.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/errno.h b/arch/m68knommu/include/asm/errno.h<br/>index 7e8c22b9a5e6..7e8c22b9a5e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/errno.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/errno.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/errno.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/fb.h b/arch/m68knommu/include/asm/fb.h<br/>index c7df38030992..c7df38030992 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/fb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/fb.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/fcntl.h b/arch/m68knommu/include/asm/fcntl.h<br/>index f6a552cda4cd..f6a552cda4cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/fcntl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/fcntl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/fcntl.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/flat.h b/arch/m68knommu/include/asm/flat.h<br/>index 814b5174a8e0..814b5174a8e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/flat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/flat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/flat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/flat.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/fpu.h b/arch/m68knommu/include/asm/fpu.h<br/>index b16b2e4fca2a..b16b2e4fca2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/fpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/fpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/fpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/fpu.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/futex.h b/arch/m68knommu/include/asm/futex.h<br/>index 6a332a9f099c..6a332a9f099c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/futex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/futex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/futex.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/hardirq.h b/arch/m68knommu/include/asm/hardirq.h<br/>index bfad28149a49..bfad28149a49 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/hardirq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/hardirq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/hardirq.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/hw_irq.h b/arch/m68knommu/include/asm/hw_irq.h<br/>index f3ec9e5ae049..f3ec9e5ae049 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/hw_irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/hw_irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/hw_irq.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/hwtest.h b/arch/m68knommu/include/asm/hwtest.h<br/>index 700626a1b1bf..700626a1b1bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/hwtest.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/hwtest.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/hwtest.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/hwtest.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/io.h b/arch/m68knommu/include/asm/io.h<br/>index 6adef1ee2082..6adef1ee2082 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/io.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/ioctl.h b/arch/m68knommu/include/asm/ioctl.h<br/>index b279fe06dfe5..b279fe06dfe5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/ioctl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/ioctl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/ioctl.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/ioctls.h b/arch/m68knommu/include/asm/ioctls.h<br/>index 0b1eb4d85059..0b1eb4d85059 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/ioctls.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/ioctls.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/ioctls.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/ipcbuf.h b/arch/m68knommu/include/asm/ipcbuf.h<br/>index e4a7be6dd706..e4a7be6dd706 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/ipcbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/ipcbuf.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/irq.h b/arch/m68knommu/include/asm/irq.h<br/>index 9373c31ac87d..9373c31ac87d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/irq.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/irq_regs.h b/arch/m68knommu/include/asm/irq_regs.h<br/>index 3dd9c0b70270..3dd9c0b70270 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/irq_regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/irq_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/irq_regs.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/kdebug.h b/arch/m68knommu/include/asm/kdebug.h<br/>index 6ece1b037665..6ece1b037665 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/kdebug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/kdebug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/kdebug.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/kmap_types.h b/arch/m68knommu/include/asm/kmap_types.h<br/>index bfb6707575d1..bfb6707575d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/kmap_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/kmap_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/kmap_types.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/linkage.h b/arch/m68knommu/include/asm/linkage.h<br/>index c288a19ff489..c288a19ff489 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/linkage.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/linkage.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/linkage.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/local.h b/arch/m68knommu/include/asm/local.h<br/>index 84a39c1b86f8..84a39c1b86f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/local.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/local.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/local.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/m5206sim.h b/arch/m68knommu/include/asm/m5206sim.h<br/>index 7e3594dea88b..7e3594dea88b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/m5206sim.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/m5206sim.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/m5206sim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m5206sim.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/m520xsim.h b/arch/m68knommu/include/asm/m520xsim.h<br/>index 49d016e6391a..49d016e6391a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/m520xsim.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/m520xsim.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/m520xsim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m520xsim.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/m523xsim.h b/arch/m68knommu/include/asm/m523xsim.h<br/>index bf397313e93f..bf397313e93f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/m523xsim.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/m523xsim.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/m523xsim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m523xsim.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/m5249sim.h b/arch/m68knommu/include/asm/m5249sim.h<br/>index 366eb8602d2f..366eb8602d2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/m5249sim.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/m5249sim.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/m5249sim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m5249sim.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/m5272sim.h b/arch/m68knommu/include/asm/m5272sim.h<br/>index 6217edc21139..6217edc21139 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/m5272sim.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/m5272sim.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/m5272sim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m5272sim.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/m527xsim.h b/arch/m68knommu/include/asm/m527xsim.h<br/>index 1f63ab3fb3e6..1f63ab3fb3e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/m527xsim.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/m527xsim.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/m527xsim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m527xsim.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/m528xsim.h b/arch/m68knommu/include/asm/m528xsim.h<br/>index 28bf783a5d6d..28bf783a5d6d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/m528xsim.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/m528xsim.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/m528xsim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m528xsim.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/m5307sim.h b/arch/m68knommu/include/asm/m5307sim.h<br/>index 5886728409c0..5886728409c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/m5307sim.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/m5307sim.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/m5307sim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m5307sim.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/m532xsim.h b/arch/m68knommu/include/asm/m532xsim.h<br/>index 1835fd20a82c..1835fd20a82c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/m532xsim.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/m532xsim.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/m532xsim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m532xsim.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/m5407sim.h b/arch/m68knommu/include/asm/m5407sim.h<br/>index cc22c4a53005..cc22c4a53005 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/m5407sim.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/m5407sim.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/m5407sim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m5407sim.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/m68360.h b/arch/m68knommu/include/asm/m68360.h<br/>index eb7d39ef2855..eb7d39ef2855 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/m68360.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/m68360.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/m68360.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m68360.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/m68360_enet.h b/arch/m68knommu/include/asm/m68360_enet.h<br/>index c36f4d059203..c36f4d059203 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/m68360_enet.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/m68360_enet.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/m68360_enet.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m68360_enet.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/m68360_pram.h b/arch/m68knommu/include/asm/m68360_pram.h<br/>index e6088bbce93d..e6088bbce93d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/m68360_pram.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/m68360_pram.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/m68360_pram.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m68360_pram.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/m68360_quicc.h b/arch/m68knommu/include/asm/m68360_quicc.h<br/>index 6d40f4d18e10..6d40f4d18e10 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/m68360_quicc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/m68360_quicc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/m68360_quicc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m68360_quicc.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/m68360_regs.h b/arch/m68knommu/include/asm/m68360_regs.h<br/>index d57217ca4f27..d57217ca4f27 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/m68360_regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/m68360_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/m68360_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/m68360_regs.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/machdep.h b/arch/m68knommu/include/asm/machdep.h<br/>index de9f47a51cc2..de9f47a51cc2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/machdep.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/machdep.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/machdep.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/machdep.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/math-emu.h b/arch/m68knommu/include/asm/math-emu.h<br/>index 7e7090517b72..7e7090517b72 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/math-emu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/math-emu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/math-emu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/math-emu.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/mc146818rtc.h b/arch/m68knommu/include/asm/mc146818rtc.h<br/>index 907a0481a140..907a0481a140 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/mc146818rtc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/mc146818rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mc146818rtc.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/mcfcache.h b/arch/m68knommu/include/asm/mcfcache.h<br/>index c042634fadaa..c042634fadaa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/mcfcache.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/mcfcache.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/mcfcache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfcache.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/mcfdma.h b/arch/m68knommu/include/asm/mcfdma.h<br/>index 705c52c79cd8..705c52c79cd8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/mcfdma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/mcfdma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/mcfdma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfdma.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/mcfmbus.h b/arch/m68knommu/include/asm/mcfmbus.h<br/>index 319899c47a2c..319899c47a2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/mcfmbus.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/mcfmbus.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/mcfmbus.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfmbus.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/mcfne.h b/arch/m68knommu/include/asm/mcfne.h<br/>index 431f63aadd0e..431f63aadd0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/mcfne.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/mcfne.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/mcfne.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfne.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/mcfpci.h b/arch/m68knommu/include/asm/mcfpci.h<br/>index f1507dd06ec6..f1507dd06ec6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/mcfpci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/mcfpci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/mcfpci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfpci.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/mcfpit.h b/arch/m68knommu/include/asm/mcfpit.h<br/>index f570cf64fd29..f570cf64fd29 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/mcfpit.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/mcfpit.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/mcfpit.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfpit.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/mcfsim.h b/arch/m68knommu/include/asm/mcfsim.h<br/>index da3f2ceff3a4..da3f2ceff3a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/mcfsim.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/mcfsim.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/mcfsim.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfsim.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/mcfsmc.h b/arch/m68knommu/include/asm/mcfsmc.h<br/>index 2d7a4dbd9683..2d7a4dbd9683 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/mcfsmc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/mcfsmc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/mcfsmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfsmc.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/mcftimer.h b/arch/m68knommu/include/asm/mcftimer.h<br/>index 0f90f6d2227a..0f90f6d2227a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/mcftimer.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/mcftimer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/mcftimer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcftimer.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/mcfuart.h b/arch/m68knommu/include/asm/mcfuart.h<br/>index ef2293873612..ef2293873612 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/mcfuart.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/mcfuart.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/mcfuart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfuart.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/mcfwdebug.h b/arch/m68knommu/include/asm/mcfwdebug.h<br/>index 27f70e45d700..27f70e45d700 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/mcfwdebug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/mcfwdebug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/mcfwdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mcfwdebug.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/md.h b/arch/m68knommu/include/asm/md.h<br/>index d810c78de5ff..d810c78de5ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/md.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/md.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/md.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/md.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/mman.h b/arch/m68knommu/include/asm/mman.h<br/>index 4846c682efed..4846c682efed 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/mman.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/mman.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mman.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/mmu.h b/arch/m68knommu/include/asm/mmu.h<br/>index 5fa6b68353ba..5fa6b68353ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/mmu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/mmu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mmu.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/mmu_context.h b/arch/m68knommu/include/asm/mmu_context.h<br/>index 9ccee4278c97..9ccee4278c97 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/mmu_context.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/mmu_context.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mmu_context.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/module.h b/arch/m68knommu/include/asm/module.h<br/>index 2e45ab50b232..2e45ab50b232 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/module.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/module.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/module.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/movs.h b/arch/m68knommu/include/asm/movs.h<br/>index 81a16779e833..81a16779e833 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/movs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/movs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/movs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/movs.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/msgbuf.h b/arch/m68knommu/include/asm/msgbuf.h<br/>index bdfadec4d52d..bdfadec4d52d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/msgbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/msgbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/msgbuf.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/mutex.h b/arch/m68knommu/include/asm/mutex.h<br/>index 458c1f7fbc18..458c1f7fbc18 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/mutex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/mutex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/mutex.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/nettel.h b/arch/m68knommu/include/asm/nettel.h<br/>index 0299f6a2deeb..0299f6a2deeb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/nettel.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/nettel.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/nettel.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/nettel.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/openprom.h b/arch/m68knommu/include/asm/openprom.h<br/>index fdba7953ff9f..fdba7953ff9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/openprom.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/openprom.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/openprom.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/openprom.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/oplib.h b/arch/m68knommu/include/asm/oplib.h<br/>index ce079dc332d9..ce079dc332d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/oplib.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/oplib.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/oplib.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/oplib.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/page.h b/arch/m68knommu/include/asm/page.h<br/>index 3a1ede4544cb..3a1ede4544cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/page.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/page.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/page.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/page_offset.h b/arch/m68knommu/include/asm/page_offset.h<br/>index d4e73e0ba646..d4e73e0ba646 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/page_offset.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/page_offset.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/page_offset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/page_offset.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/param.h b/arch/m68knommu/include/asm/param.h<br/>index 6044397adb64..6044397adb64 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/param.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/param.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/pci.h b/arch/m68knommu/include/asm/pci.h<br/>index a13f3cc87451..a13f3cc87451 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/pci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/pci.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/percpu.h b/arch/m68knommu/include/asm/percpu.h<br/>index 5de72c327efd..5de72c327efd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/percpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/percpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/percpu.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/pgalloc.h b/arch/m68knommu/include/asm/pgalloc.h<br/>index d6352f671ec0..d6352f671ec0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/pgalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/pgalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/pgalloc.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/pgtable.h b/arch/m68knommu/include/asm/pgtable.h<br/>index 46251016e821..46251016e821 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/pgtable.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/pgtable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/pgtable.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/poll.h b/arch/m68knommu/include/asm/poll.h<br/>index ee1b6cb549ca..ee1b6cb549ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/poll.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/poll.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/poll.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/posix_types.h b/arch/m68knommu/include/asm/posix_types.h<br/>index 6205fb9392a3..6205fb9392a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/posix_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/posix_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/posix_types.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/processor.h b/arch/m68knommu/include/asm/processor.h<br/>index 91cba18acdd3..91cba18acdd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/processor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/processor.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/ptrace.h b/arch/m68knommu/include/asm/ptrace.h<br/>index 8c9194b98548..8c9194b98548 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/ptrace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/ptrace.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/quicc_simple.h b/arch/m68knommu/include/asm/quicc_simple.h<br/>index c3636932d4bc..c3636932d4bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/quicc_simple.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/quicc_simple.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/quicc_simple.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/quicc_simple.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/resource.h b/arch/m68knommu/include/asm/resource.h<br/>index 7fa63d5ea576..7fa63d5ea576 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/resource.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/resource.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/resource.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/rtc.h b/arch/m68knommu/include/asm/rtc.h<br/>index eaf18ec83c8e..eaf18ec83c8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/rtc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/rtc.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/scatterlist.h b/arch/m68knommu/include/asm/scatterlist.h<br/>index afc4788b0d2c..afc4788b0d2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/scatterlist.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/scatterlist.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/scatterlist.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/sections.h b/arch/m68knommu/include/asm/sections.h<br/>index dd0ecb98ec08..dd0ecb98ec08 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/sections.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/sections.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/sections.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/segment.h b/arch/m68knommu/include/asm/segment.h<br/>index 42318ebec7ec..42318ebec7ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/segment.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/segment.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/segment.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/segment.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/sembuf.h b/arch/m68knommu/include/asm/sembuf.h<br/>index 3a634f9ecf50..3a634f9ecf50 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/sembuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/sembuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/sembuf.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/setup.h b/arch/m68knommu/include/asm/setup.h<br/>index fb86bb2a6078..fb86bb2a6078 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/setup.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/setup.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/shm.h b/arch/m68knommu/include/asm/shm.h<br/>index cc8e522d9050..cc8e522d9050 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/shm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/shm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/shm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/shm.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/shmbuf.h b/arch/m68knommu/include/asm/shmbuf.h<br/>index bc34cf8eefce..bc34cf8eefce 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/shmbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/shmbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/shmbuf.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/shmparam.h b/arch/m68knommu/include/asm/shmparam.h<br/>index d7ee69648ebf..d7ee69648ebf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/shmparam.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/shmparam.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/shmparam.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/sigcontext.h b/arch/m68knommu/include/asm/sigcontext.h<br/>index 36c293fc133d..36c293fc133d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/sigcontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/sigcontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/sigcontext.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/siginfo.h b/arch/m68knommu/include/asm/siginfo.h<br/>index b18e5f4064ae..b18e5f4064ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/siginfo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/siginfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/siginfo.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/signal.h b/arch/m68knommu/include/asm/signal.h<br/>index 216c08be54a0..216c08be54a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/signal.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/signal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/signal.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/smp.h b/arch/m68knommu/include/asm/smp.h<br/>index 9e9bd7e58922..9e9bd7e58922 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/smp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/smp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/smp.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/socket.h b/arch/m68knommu/include/asm/socket.h<br/>index ac5478bf6371..ac5478bf6371 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/socket.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/socket.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/sockios.h b/arch/m68knommu/include/asm/sockios.h<br/>index dcc6a8900ce2..dcc6a8900ce2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/sockios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/sockios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/sockios.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/spinlock.h b/arch/m68knommu/include/asm/spinlock.h<br/>index 6bb1f06c4781..6bb1f06c4781 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/spinlock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/spinlock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/spinlock.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/stat.h b/arch/m68knommu/include/asm/stat.h<br/>index 3d4b260e7c03..3d4b260e7c03 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/stat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/stat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/stat.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/statfs.h b/arch/m68knommu/include/asm/statfs.h<br/>index 2ce99eaf0970..2ce99eaf0970 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/statfs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/statfs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/statfs.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/string.h b/arch/m68knommu/include/asm/string.h<br/>index af09e17000fc..af09e17000fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/string.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/string.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/string.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/system.h b/arch/m68knommu/include/asm/system.h<br/>index 40f49de69821..40f49de69821 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/system.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/termbits.h b/arch/m68knommu/include/asm/termbits.h<br/>index 05dd6bc27285..05dd6bc27285 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/termbits.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/termbits.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/termbits.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/termios.h b/arch/m68knommu/include/asm/termios.h<br/>index e7337881a985..e7337881a985 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/termios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/termios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/termios.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/thread_info.h b/arch/m68knommu/include/asm/thread_info.h<br/>index 0c9bc095f3f0..0c9bc095f3f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/thread_info.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/thread_info.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/timex.h b/arch/m68knommu/include/asm/timex.h<br/>index 109050f3fe91..109050f3fe91 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/timex.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/tlb.h b/arch/m68knommu/include/asm/tlb.h<br/>index 77a7c51ca299..77a7c51ca299 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/tlb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/tlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/tlb.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/tlbflush.h b/arch/m68knommu/include/asm/tlbflush.h<br/>index a470cfb803eb..a470cfb803eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/tlbflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/tlbflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/tlbflush.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/topology.h b/arch/m68knommu/include/asm/topology.h<br/>index ca173e9f26ff..ca173e9f26ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/topology.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/topology.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/topology.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/traps.h b/arch/m68knommu/include/asm/traps.h<br/>index d0671e5f8e29..d0671e5f8e29 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/traps.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/traps.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/traps.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/traps.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/types.h b/arch/m68knommu/include/asm/types.h<br/>index 031238c2d180..031238c2d180 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/types.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/uaccess.h b/arch/m68knommu/include/asm/uaccess.h<br/>index 68bbe9b312f1..68bbe9b312f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/uaccess.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/uaccess.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/uaccess.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/ucontext.h b/arch/m68knommu/include/asm/ucontext.h<br/>index 713a27f901cd..713a27f901cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/ucontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/ucontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/ucontext.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/unaligned.h b/arch/m68knommu/include/asm/unaligned.h<br/>index eb1ea4cb9a59..eb1ea4cb9a59 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/unaligned.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/unaligned.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/unaligned.h</a></div><div class='head'>diff --git a/include/asm-m68knommu/unistd.h b/arch/m68knommu/include/asm/unistd.h<br/>index 4ba98b9c5d79..b034a2f7b444 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/unistd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/unistd.h</a></div><div class='hunk'>@@ -326,10 +326,16 @@</div><div class='ctx'> #define __NR_fallocate		320</div><div class='ctx'> #define __NR_timerfd_settime	321</div><div class='ctx'> #define __NR_timerfd_gettime	322</div><div class='add'>+#define __NR_signalfd4		323</div><div class='add'>+#define __NR_eventfd2		324</div><div class='add'>+#define __NR_epoll_create1	325</div><div class='add'>+#define __NR_dup3		326</div><div class='add'>+#define __NR_pipe2		327</div><div class='add'>+#define __NR_inotify_init1	328</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='del'>-#define NR_syscalls		323</div><div class='add'>+#define NR_syscalls		329</div><div class='ctx'> </div><div class='ctx'> #define __ARCH_WANT_IPC_PARSE_VERSION</div><div class='ctx'> #define __ARCH_WANT_OLD_READDIR</div><div class='head'>diff --git a/include/asm-m68knommu/user.h b/arch/m68knommu/include/asm/user.h<br/>index a5a555b761c4..a5a555b761c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-m68knommu/user.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-m68knommu/user.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/include/asm/user.h</a></div><div class='head'>diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S<br/>index fca2e49917a3..812f8d8b7a85 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/syscalltable.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/m68knommu/kernel/syscalltable.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/syscalltable.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/m68knommu/kernel/syscalltable.S</a></div><div class='hunk'>@@ -341,6 +341,12 @@ ENTRY(sys_call_table)</div><div class='ctx'> 	.long sys_fallocate		/* 320 */</div><div class='ctx'> 	.long sys_timerfd_settime</div><div class='ctx'> 	.long sys_timerfd_gettime</div><div class='add'>+	.long sys_signalfd4</div><div class='add'>+	.long sys_eventfd2</div><div class='add'>+	.long sys_epoll_create1		/* 325 */</div><div class='add'>+	.long sys_dup3</div><div class='add'>+	.long sys_pipe2</div><div class='add'>+	.long sys_inotify_init1</div><div class='ctx'> </div><div class='ctx'> 	.rept NR_syscalls-(.-sys_call_table)/4</div><div class='ctx'> 		.long sys_ni_syscall</div><div class='head'>diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig<br/>index b4c4eaa5dd26..49896a2a1d72 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/Kconfig</a></div><div class='hunk'>@@ -3,6 +3,7 @@ config MIPS</div><div class='ctx'> 	default y</div><div class='ctx'> 	select HAVE_IDE</div><div class='ctx'> 	select HAVE_OPROFILE</div><div class='add'>+	select HAVE_ARCH_KGDB</div><div class='ctx'> 	# Horrible source of confusion.  Die, die, die ...</div><div class='ctx'> 	select EMBEDDED</div><div class='ctx'> 	select RTC_LIB</div><div class='hunk'>@@ -34,7 +35,6 @@ config BASLER_EXCITE</div><div class='ctx'> 	select SYS_HAS_CPU_RM9000</div><div class='ctx'> 	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='del'>-	select SYS_SUPPORTS_KGDB</div><div class='ctx'> 	help</div><div class='ctx'> 	  The eXcite is a smart camera platform manufactured by</div><div class='ctx'> 	  Basler Vision Technologies AG.</div><div class='hunk'>@@ -280,7 +280,6 @@ config PMC_MSP</div><div class='ctx'> 	select SYS_HAS_CPU_MIPS32_R2</div><div class='ctx'> 	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='del'>-	select SYS_SUPPORTS_KGDB</div><div class='ctx'> 	select IRQ_CPU</div><div class='ctx'> 	select SERIAL_8250</div><div class='ctx'> 	select SERIAL_8250_CONSOLE</div><div class='hunk'>@@ -306,7 +305,6 @@ config PMC_YOSEMITE</div><div class='ctx'> 	select SYS_SUPPORTS_64BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='ctx'> 	select SYS_SUPPORTS_HIGHMEM</div><div class='del'>-	select SYS_SUPPORTS_KGDB</div><div class='ctx'> 	select SYS_SUPPORTS_SMP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Yosemite is an evaluation board for the RM9000x2 processor</div><div class='hunk'>@@ -359,7 +357,6 @@ config SGI_IP27</div><div class='ctx'> 	select SYS_HAS_CPU_R10000</div><div class='ctx'> 	select SYS_SUPPORTS_64BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='del'>-	select SYS_SUPPORTS_KGDB</div><div class='ctx'> 	select SYS_SUPPORTS_NUMA</div><div class='ctx'> 	select SYS_SUPPORTS_SMP</div><div class='ctx'> 	select GENERIC_HARDIRQS_NO__DO_IRQ</div><div class='hunk'>@@ -475,7 +472,6 @@ config SIBYTE_SWARM</div><div class='ctx'> 	select SYS_HAS_CPU_SB1</div><div class='ctx'> 	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='ctx'> 	select SYS_SUPPORTS_HIGHMEM</div><div class='del'>-	select SYS_SUPPORTS_KGDB</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> 	select ZONE_DMA32 if 64BIT</div><div class='ctx'> </div><div class='hunk'>@@ -868,7 +864,6 @@ config SOC_PNX8550</div><div class='ctx'> 	select SYS_HAS_EARLY_PRINTK</div><div class='ctx'> 	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	select GENERIC_HARDIRQS_NO__DO_IRQ</div><div class='del'>-	select SYS_SUPPORTS_KGDB</div><div class='ctx'> 	select GENERIC_GPIO</div><div class='ctx'> </div><div class='ctx'> config SWAP_IO_SPACE</div><div class='hunk'>@@ -1891,6 +1886,15 @@ config STACKTRACE_SUPPORT</div><div class='ctx'> </div><div class='ctx'> source "init/Kconfig"</div><div class='ctx'> </div><div class='add'>+config PROBE_INITRD_HEADER</div><div class='add'>+	bool "Probe initrd header created by addinitrd"</div><div class='add'>+	depends on BLK_DEV_INITRD</div><div class='add'>+	help</div><div class='add'>+	  Probe initrd header at the last page of kernel image.</div><div class='add'>+	  Say Y here if you are using arch/mips/boot/addinitrd.c to</div><div class='add'>+	  add initrd or initramfs image to the kernel image.</div><div class='add'>+	  Otherwise, say N.</div><div class='add'>+</div><div class='ctx'> menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"</div><div class='ctx'> </div><div class='ctx'> config HW_HAS_EISA</div><div class='head'>diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug<br/>index f18cf92650e3..765c8e287d2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/Kconfig.debug?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/Kconfig.debug</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/Kconfig.debug?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/Kconfig.debug</a></div><div class='hunk'>@@ -34,28 +34,6 @@ config SMTC_IDLE_HOOK_DEBUG</div><div class='ctx'> 	  arch/mips/kernel/smtc.c.  This debugging option result in significant</div><div class='ctx'> 	  overhead so should be disabled in production kernels.</div><div class='ctx'> </div><div class='del'>-config KGDB</div><div class='del'>-	bool "Remote GDB kernel debugging"</div><div class='del'>-	depends on DEBUG_KERNEL &amp;&amp; SYS_SUPPORTS_KGDB</div><div class='del'>-	select DEBUG_INFO</div><div class='del'>-	help</div><div class='del'>-	  If you say Y here, it will be possible to remotely debug the MIPS</div><div class='del'>-	  kernel using gdb. This enlarges your kernel image disk size by</div><div class='del'>-	  several megabytes and requires a machine with more than 16 MB,</div><div class='del'>-	  better 32 MB RAM to avoid excessive linking time. This is only</div><div class='del'>-	  useful for kernel hackers. If unsure, say N.</div><div class='del'>-</div><div class='del'>-config SYS_SUPPORTS_KGDB</div><div class='del'>-	bool</div><div class='del'>-</div><div class='del'>-config GDB_CONSOLE</div><div class='del'>-	bool "Console output to GDB"</div><div class='del'>-	depends on KGDB</div><div class='del'>-	help</div><div class='del'>-	  If you are using GDB for remote debugging over a serial port and</div><div class='del'>-	  would like kernel messages to be formatted into GDB $O packets so</div><div class='del'>-	  that GDB prints them as program output, say 'Y'.</div><div class='del'>-</div><div class='ctx'> config SB1XXX_CORELIS</div><div class='ctx'> 	bool "Corelis Debugger"</div><div class='ctx'> 	depends on SIBYTE_SB1xxx_SOC</div><div class='head'>diff --git a/arch/mips/au1000/Kconfig b/arch/mips/au1000/Kconfig<br/>index 1fe97cccead1..e4a057d80ab6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/au1000/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/Kconfig</a></div><div class='hunk'>@@ -134,4 +134,3 @@ config SOC_AU1X00</div><div class='ctx'> 	select SYS_HAS_CPU_MIPS32_R1</div><div class='ctx'> 	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_APM_EMULATION</div><div class='del'>-	select SYS_SUPPORTS_KGDB</div><div class='head'>diff --git a/arch/mips/au1000/common/Makefile b/arch/mips/au1000/common/Makefile<br/>index dd0e19dacfcf..df48fd65bbf3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/au1000/common/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/common/Makefile</a></div><div class='hunk'>@@ -9,7 +9,6 @@ obj-y += prom.o irq.o puts.o time.o reset.o \</div><div class='ctx'> 	au1xxx_irqmap.o clocks.o platform.o power.o setup.o \</div><div class='ctx'> 	sleeper.o cputable.o dma.o dbdma.o gpio.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_KGDB)		+= dbg_io.o</div><div class='ctx'> obj-$(CONFIG_PCI)		+= pci.o</div><div class='ctx'> </div><div class='ctx'> EXTRA_CFLAGS += -Werror</div><div class='head'>diff --git a/arch/mips/au1000/common/dbg_io.c b/arch/mips/au1000/common/dbg_io.c<br/>deleted file mode 100644<br/>index af5be7df2f2a..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/dbg_io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/au1000/common/dbg_io.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,109 +0,0 @@</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FIXME the user should be able to select the</div><div class='del'>- * uart to be used for debugging.</div><div class='del'>- */</div><div class='del'>-#define DEBUG_BASE  UART_DEBUG_BASE</div><div class='del'>-</div><div class='del'>-#define         UART16550_BAUD_2400             2400</div><div class='del'>-#define         UART16550_BAUD_4800             4800</div><div class='del'>-#define         UART16550_BAUD_9600             9600</div><div class='del'>-#define         UART16550_BAUD_19200            19200</div><div class='del'>-#define         UART16550_BAUD_38400            38400</div><div class='del'>-#define         UART16550_BAUD_57600            57600</div><div class='del'>-#define         UART16550_BAUD_115200           115200</div><div class='del'>-</div><div class='del'>-#define         UART16550_PARITY_NONE           0</div><div class='del'>-#define         UART16550_PARITY_ODD            0x08</div><div class='del'>-#define         UART16550_PARITY_EVEN           0x18</div><div class='del'>-#define         UART16550_PARITY_MARK           0x28</div><div class='del'>-#define         UART16550_PARITY_SPACE          0x38</div><div class='del'>-</div><div class='del'>-#define         UART16550_DATA_5BIT             0x0</div><div class='del'>-#define         UART16550_DATA_6BIT             0x1</div><div class='del'>-#define         UART16550_DATA_7BIT             0x2</div><div class='del'>-#define         UART16550_DATA_8BIT             0x3</div><div class='del'>-</div><div class='del'>-#define         UART16550_STOP_1BIT             0x0</div><div class='del'>-#define         UART16550_STOP_2BIT             0x4</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define UART_RX		0	/* Receive buffer */</div><div class='del'>-#define UART_TX		4	/* Transmit buffer */</div><div class='del'>-#define UART_IER	8	/* Interrupt Enable Register */</div><div class='del'>-#define UART_IIR	0xC	/* Interrupt ID Register */</div><div class='del'>-#define UART_FCR	0x10	/* FIFO Control Register */</div><div class='del'>-#define UART_LCR	0x14	/* Line Control Register */</div><div class='del'>-#define UART_MCR	0x18	/* Modem Control Register */</div><div class='del'>-#define UART_LSR	0x1C	/* Line Status Register */</div><div class='del'>-#define UART_MSR	0x20	/* Modem Status Register */</div><div class='del'>-#define UART_CLK	0x28	/* Baud Rat4e Clock Divider */</div><div class='del'>-#define UART_MOD_CNTRL	0x100	/* Module Control */</div><div class='del'>-</div><div class='del'>-/* memory-mapped read/write of the port */</div><div class='del'>-#define UART16550_READ(y)     (au_readl(DEBUG_BASE + y) &amp; 0xff)</div><div class='del'>-#define UART16550_WRITE(y, z) (au_writel(z &amp; 0xff, DEBUG_BASE + y))</div><div class='del'>-</div><div class='del'>-extern unsigned long calc_clock(void);</div><div class='del'>-</div><div class='del'>-void debugInit(u32 baud, u8 data, u8 parity, u8 stop)</div><div class='del'>-{</div><div class='del'>-	if (UART16550_READ(UART_MOD_CNTRL) != 0x3)</div><div class='del'>-		UART16550_WRITE(UART_MOD_CNTRL, 3);</div><div class='del'>-	calc_clock();</div><div class='del'>-</div><div class='del'>-	/* disable interrupts */</div><div class='del'>-	UART16550_WRITE(UART_IER, 0);</div><div class='del'>-</div><div class='del'>-	/* set up baud rate */</div><div class='del'>-	{</div><div class='del'>-		u32 divisor;</div><div class='del'>-</div><div class='del'>-		/* set divisor */</div><div class='del'>-		divisor = get_au1x00_uart_baud_base() / baud;</div><div class='del'>-		UART16550_WRITE(UART_CLK, divisor &amp; 0xffff);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set data format */</div><div class='del'>-	UART16550_WRITE(UART_LCR, (data | parity | stop));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int remoteDebugInitialized;</div><div class='del'>-</div><div class='del'>-u8 getDebugChar(void)</div><div class='del'>-{</div><div class='del'>-	if (!remoteDebugInitialized) {</div><div class='del'>-		remoteDebugInitialized = 1;</div><div class='del'>-		debugInit(UART16550_BAUD_115200,</div><div class='del'>-			  UART16550_DATA_8BIT,</div><div class='del'>-			  UART16550_PARITY_NONE,</div><div class='del'>-			  UART16550_STOP_1BIT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ((UART16550_READ(UART_LSR) &amp; 0x1) == 0);</div><div class='del'>-	return UART16550_READ(UART_RX);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int putDebugChar(u8 byte)</div><div class='del'>-{</div><div class='del'>-	if (!remoteDebugInitialized) {</div><div class='del'>-		remoteDebugInitialized = 1;</div><div class='del'>-		debugInit(UART16550_BAUD_115200,</div><div class='del'>-			  UART16550_DATA_8BIT,</div><div class='del'>-			  UART16550_PARITY_NONE,</div><div class='del'>-			  UART16550_STOP_1BIT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ((UART16550_READ(UART_LSR) &amp; 0x40) == 0);</div><div class='del'>-	UART16550_WRITE(UART_TX, byte);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c<br/>index 5ebe0de5e459..847413514964 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/db1x00/init.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/au1000/db1x00/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/db1x00/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/db1x00/init.c</a></div><div class='hunk'>@@ -57,6 +57,6 @@ void __init prom_init(void)</div><div class='ctx'> 	if (!memsize_str)</div><div class='ctx'> 		memsize = 0x04000000;</div><div class='ctx'> 	else</div><div class='del'>-		memsize = strict_strtol(memsize_str, 0, NULL);</div><div class='add'>+		strict_strtol(memsize_str, 0, &amp;memsize);</div><div class='ctx'> 	add_memory_region(0, memsize, BOOT_MEM_RAM);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/au1000/mtx-1/init.c b/arch/mips/au1000/mtx-1/init.c<br/>index 33a4aebe0cba..3bae13c28954 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/mtx-1/init.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/au1000/mtx-1/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/mtx-1/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/mtx-1/init.c</a></div><div class='hunk'>@@ -55,6 +55,6 @@ void __init prom_init(void)</div><div class='ctx'> 	if (!memsize_str)</div><div class='ctx'> 		memsize = 0x04000000;</div><div class='ctx'> 	else</div><div class='del'>-		memsize = strict_strtol(memsize_str, 0, NULL);</div><div class='add'>+		strict_strtol(memsize_str, 0, &amp;memsize);</div><div class='ctx'> 	add_memory_region(0, memsize, BOOT_MEM_RAM);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/au1000/pb1000/init.c b/arch/mips/au1000/pb1000/init.c<br/>index 3837365d613d..8a9c7d57208d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1000/init.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/au1000/pb1000/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1000/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/pb1000/init.c</a></div><div class='hunk'>@@ -52,6 +52,6 @@ void __init prom_init(void)</div><div class='ctx'> 	if (!memsize_str)</div><div class='ctx'> 		memsize = 0x04000000;</div><div class='ctx'> 	else</div><div class='del'>-		memsize = strict_strtol(memsize_str, 0, NULL);</div><div class='add'>+		strict_strtol(memsize_str, 0, &amp;memsize);</div><div class='ctx'> 	add_memory_region(0, memsize, BOOT_MEM_RAM);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/au1000/pb1100/init.c b/arch/mips/au1000/pb1100/init.c<br/>index 8355483f3de2..7c6792308bc5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1100/init.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/au1000/pb1100/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1100/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/pb1100/init.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@ void __init prom_init(void)</div><div class='ctx'> 	if (!memsize_str)</div><div class='ctx'> 		memsize = 0x04000000;</div><div class='ctx'> 	else</div><div class='del'>-		memsize = strict_strtol(memsize_str, 0, NULL);</div><div class='add'>+		strict_strtol(memsize_str, 0, &amp;memsize);</div><div class='ctx'> </div><div class='ctx'> 	add_memory_region(0, memsize, BOOT_MEM_RAM);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/au1000/pb1200/init.c b/arch/mips/au1000/pb1200/init.c<br/>index 09fd63b86062..e9b2a0fd48ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1200/init.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/au1000/pb1200/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1200/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/pb1200/init.c</a></div><div class='hunk'>@@ -53,6 +53,6 @@ void __init prom_init(void)</div><div class='ctx'> 	if (!memsize_str)</div><div class='ctx'> 		memsize = 0x08000000;</div><div class='ctx'> 	else</div><div class='del'>-		memsize = strict_strtol(memsize_str, 0, NULL);</div><div class='add'>+		strict_strtol(memsize_str, 0, &amp;memsize);</div><div class='ctx'> 	add_memory_region(0, memsize, BOOT_MEM_RAM);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/au1000/pb1500/init.c b/arch/mips/au1000/pb1500/init.c<br/>index 49f51e165863..3b6e395cf952 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1500/init.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/au1000/pb1500/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1500/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/pb1500/init.c</a></div><div class='hunk'>@@ -53,6 +53,6 @@ void __init prom_init(void)</div><div class='ctx'> 	if (!memsize_str)</div><div class='ctx'> 		memsize = 0x04000000;</div><div class='ctx'> 	else</div><div class='del'>-		memsize = strict_strtol(memsize_str, 0, NULL);</div><div class='add'>+		strict_strtol(memsize_str, 0, &amp;memsize);</div><div class='ctx'> 	add_memory_region(0, memsize, BOOT_MEM_RAM);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/au1000/pb1550/init.c b/arch/mips/au1000/pb1550/init.c<br/>index 1b5f58434bb7..e1055a13a1a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1550/init.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/au1000/pb1550/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1550/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/pb1550/init.c</a></div><div class='hunk'>@@ -53,6 +53,6 @@ void __init prom_init(void)</div><div class='ctx'> 	if (!memsize_str)</div><div class='ctx'> 		memsize = 0x08000000;</div><div class='ctx'> 	else</div><div class='del'>-		memsize = strict_strtol(memsize_str, 0, NULL);</div><div class='add'>+		strict_strtol(memsize_str, 0, &amp;memsize);</div><div class='ctx'> 	add_memory_region(0, memsize, BOOT_MEM_RAM);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/au1000/xxs1500/init.c b/arch/mips/au1000/xxs1500/init.c<br/>index b849bf501c04..7516434760a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/xxs1500/init.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/au1000/xxs1500/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/xxs1500/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/au1000/xxs1500/init.c</a></div><div class='hunk'>@@ -53,6 +53,6 @@ void __init prom_init(void)</div><div class='ctx'> 	if (!memsize_str)</div><div class='ctx'> 		memsize = 0x04000000;</div><div class='ctx'> 	else</div><div class='del'>-		memsize = strict_strtol(memsize_str, 0, NULL);</div><div class='add'>+		strict_strtol(memsize_str, 0, &amp;memsize);</div><div class='ctx'> 	add_memory_region(0, memsize, BOOT_MEM_RAM);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/basler/excite/Makefile b/arch/mips/basler/excite/Makefile<br/>index 519142c2e4ef..cff29cf46d03 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/basler/excite/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/basler/excite/Makefile</a></div><div class='hunk'>@@ -5,5 +5,4 @@</div><div class='ctx'> obj-$(CONFIG_BASLER_EXCITE)	+= excite_irq.o excite_prom.o excite_setup.o \</div><div class='ctx'> 				   excite_device.o excite_procfs.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_KGDB)		+= excite_dbg_io.o</div><div class='ctx'> obj-m				+= excite_iodev.o</div><div class='head'>diff --git a/arch/mips/basler/excite/excite_dbg_io.c b/arch/mips/basler/excite/excite_dbg_io.c<br/>deleted file mode 100644<br/>index d289e3a868cf..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/excite_dbg_io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/basler/excite/excite_dbg_io.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,121 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2004 by Basler Vision Technologies AG</div><div class='del'>- *  Author: Thomas Koeller &lt;thomas.koeller@baslerweb.com&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;asm/gdb-stub.h&gt;</div><div class='del'>-#include &lt;asm/rm9k-ocd.h&gt;</div><div class='del'>-#include &lt;excite.h&gt;</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_SERIAL_8250) &amp;&amp; CONFIG_SERIAL_8250_NR_UARTS &gt; 1</div><div class='del'>-#error Debug port used by serial driver</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define UART_CLK		25000000</div><div class='del'>-#define BASE_BAUD		(UART_CLK / 16)</div><div class='del'>-#define REGISTER_BASE_0		0x0208UL</div><div class='del'>-#define REGISTER_BASE_1		0x0238UL</div><div class='del'>-</div><div class='del'>-#define REGISTER_BASE_DBG	REGISTER_BASE_1</div><div class='del'>-</div><div class='del'>-#define CPRR	0x0004</div><div class='del'>-#define UACFG	0x0200</div><div class='del'>-#define UAINTS	0x0204</div><div class='del'>-#define UARBR	(REGISTER_BASE_DBG + 0x0000)</div><div class='del'>-#define UATHR	(REGISTER_BASE_DBG + 0x0004)</div><div class='del'>-#define UADLL	(REGISTER_BASE_DBG + 0x0008)</div><div class='del'>-#define UAIER	(REGISTER_BASE_DBG + 0x000c)</div><div class='del'>-#define UADLH	(REGISTER_BASE_DBG + 0x0010)</div><div class='del'>-#define UAIIR	(REGISTER_BASE_DBG + 0x0014)</div><div class='del'>-#define UAFCR	(REGISTER_BASE_DBG + 0x0018)</div><div class='del'>-#define UALCR	(REGISTER_BASE_DBG + 0x001c)</div><div class='del'>-#define UAMCR	(REGISTER_BASE_DBG + 0x0020)</div><div class='del'>-#define UALSR	(REGISTER_BASE_DBG + 0x0024)</div><div class='del'>-#define UAMSR	(REGISTER_BASE_DBG + 0x0028)</div><div class='del'>-#define UASCR	(REGISTER_BASE_DBG + 0x002c)</div><div class='del'>-</div><div class='del'>-#define	PARITY_NONE	0</div><div class='del'>-#define	PARITY_ODD	0x08</div><div class='del'>-#define	PARITY_EVEN	0x18</div><div class='del'>-#define	PARITY_MARK	0x28</div><div class='del'>-#define	PARITY_SPACE	0x38</div><div class='del'>-</div><div class='del'>-#define	DATA_5BIT	0x0</div><div class='del'>-#define	DATA_6BIT	0x1</div><div class='del'>-#define	DATA_7BIT	0x2</div><div class='del'>-#define	DATA_8BIT	0x3</div><div class='del'>-</div><div class='del'>-#define	STOP_1BIT	0x0</div><div class='del'>-#define	STOP_2BIT	0x4</div><div class='del'>-</div><div class='del'>-#define BAUD_DBG	57600</div><div class='del'>-#define	PARITY_DBG	PARITY_NONE</div><div class='del'>-#define	DATA_DBG	DATA_8BIT</div><div class='del'>-#define	STOP_DBG	STOP_1BIT</div><div class='del'>-</div><div class='del'>-/* Initialize the serial port for KGDB debugging */</div><div class='del'>-void __init excite_kgdb_init(void)</div><div class='del'>-{</div><div class='del'>-	const u32 divisor = BASE_BAUD / BAUD_DBG;</div><div class='del'>-</div><div class='del'>-	/* Take the UART out of reset */</div><div class='del'>-	titan_writel(0x00ff1cff, CPRR);</div><div class='del'>-	titan_writel(0x00000000, UACFG);</div><div class='del'>-	titan_writel(0x00000002, UACFG);</div><div class='del'>-</div><div class='del'>-	titan_writel(0x0, UALCR);</div><div class='del'>-	titan_writel(0x0, UAIER);</div><div class='del'>-</div><div class='del'>-	/* Disable FIFOs */</div><div class='del'>-	titan_writel(0x00, UAFCR);</div><div class='del'>-</div><div class='del'>-	titan_writel(0x80, UALCR);</div><div class='del'>-	titan_writel(divisor &amp; 0xff, UADLL);</div><div class='del'>-	titan_writel((divisor &amp; 0xff00) &gt;&gt; 8, UADLH);</div><div class='del'>-	titan_writel(0x0, UALCR);</div><div class='del'>-</div><div class='del'>-	titan_writel(DATA_DBG | PARITY_DBG | STOP_DBG, UALCR);</div><div class='del'>-</div><div class='del'>-	/* Enable receiver interrupt */</div><div class='del'>-	titan_readl(UARBR);</div><div class='del'>-	titan_writel(0x1, UAIER);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int getDebugChar(void)</div><div class='del'>-{</div><div class='del'>-	while (!(titan_readl(UALSR) &amp; 0x1));</div><div class='del'>-	return titan_readl(UARBR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int putDebugChar(int data)</div><div class='del'>-{</div><div class='del'>-	while (!(titan_readl(UALSR) &amp; 0x20));</div><div class='del'>-	titan_writel(data, UATHR);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* KGDB interrupt handler */</div><div class='del'>-asmlinkage void excite_kgdb_inthdl(void)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(</div><div class='del'>-		((titan_readl(UAIIR) &amp; 0x7) == 4)</div><div class='del'>-		&amp;&amp; ((titan_readl(UARBR) &amp; 0xff) == 0x3)))</div><div class='del'>-			set_async_breakpoint(&amp;regs-&gt;cp0_epc);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/basler/excite/excite_irq.c b/arch/mips/basler/excite/excite_irq.c<br/>index 4903e067916b..934e0a6b1011 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/excite_irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/basler/excite/excite_irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/excite_irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/basler/excite/excite_irq.c</a></div><div class='hunk'>@@ -50,10 +50,6 @@ void __init arch_init_irq(void)</div><div class='ctx'> 	mips_cpu_irq_init();</div><div class='ctx'> 	rm7k_cpu_irq_init();</div><div class='ctx'> 	rm9k_cpu_irq_init();</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-	excite_kgdb_init();</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> asmlinkage void plat_irq_dispatch(void)</div><div class='hunk'>@@ -90,9 +86,6 @@ asmlinkage void plat_irq_dispatch(void)</div><div class='ctx'> 	msgint	    = msgintflags &amp; msgintmask &amp; (0x1 &lt;&lt; (TITAN_MSGINT % 0x20));</div><div class='ctx'> 	if ((pending &amp; (1 &lt;&lt; TITAN_IRQ)) &amp;&amp; msgint) {</div><div class='ctx'> 		ocd_writel(msgint, INTP0Clear0 + (TITAN_MSGINT / 0x20 * 0x10));</div><div class='del'>-#if defined(CONFIG_KGDB)</div><div class='del'>-		excite_kgdb_inthdl();</div><div class='del'>-#endif</div><div class='ctx'> 		do_IRQ(TITAN_IRQ);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/mips/basler/excite/excite_setup.c b/arch/mips/basler/excite/excite_setup.c<br/>index 6dd8f0d46d09..d66b3b8edf2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/excite_setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/basler/excite/excite_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/excite_setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/basler/excite/excite_setup.c</a></div><div class='hunk'>@@ -95,13 +95,13 @@ static int __init excite_init_console(void)</div><div class='ctx'> 	/* Take the DUART out of reset */</div><div class='ctx'> 	titan_writel(0x00ff1cff, CPRR);</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_KGDB) || (CONFIG_SERIAL_8250_NR_UARTS &gt; 1)</div><div class='add'>+#if (CONFIG_SERIAL_8250_NR_UARTS &gt; 1)</div><div class='ctx'> 	/* Enable both ports */</div><div class='ctx'> 	titan_writel(MASK_SER0 | MASK_SER1, UACFG);</div><div class='ctx'> #else</div><div class='ctx'> 	/* Enable port #0 only */</div><div class='ctx'> 	titan_writel(MASK_SER0, UACFG);</div><div class='del'>-#endif	/* defined(CONFIG_KGDB) */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'>  	/*</div><div class='ctx'> 	 * Set up serial port #0. Do not use autodetection; the result is</div><div class='head'>diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig<br/>index 2678b7ec3351..eb44b72254af 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/cobalt_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/cobalt_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/cobalt_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/cobalt_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.23-rc5</div><div class='del'>-# Thu Sep  6 13:14:29 2007</div><div class='add'>+# Linux kernel version: 2.6.26</div><div class='add'>+# Fri Jul 25 10:25:34 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -10,9 +10,11 @@ CONFIG_MIPS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MACH_ALCHEMY is not set</div><div class='ctx'> # CONFIG_BASLER_EXCITE is not set</div><div class='add'>+# CONFIG_BCM47XX is not set</div><div class='ctx'> CONFIG_MIPS_COBALT=y</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MACH_JAZZ is not set</div><div class='add'>+# CONFIG_LASAT is not set</div><div class='ctx'> # CONFIG_LEMOTE_FULONG is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='hunk'>@@ -24,6 +26,7 @@ CONFIG_MIPS_COBALT=y</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='add'>+# CONFIG_SGI_IP28 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='ctx'> # CONFIG_SIBYTE_CRHINE is not set</div><div class='ctx'> # CONFIG_SIBYTE_CARMEL is not set</div><div class='hunk'>@@ -34,19 +37,25 @@ CONFIG_MIPS_COBALT=y</div><div class='ctx'> # CONFIG_SIBYTE_SENTOSA is not set</div><div class='ctx'> # CONFIG_SIBYTE_BIGSUR is not set</div><div class='ctx'> # CONFIG_SNI_RM is not set</div><div class='del'>-# CONFIG_TOSHIBA_JMR3927 is not set</div><div class='del'>-# CONFIG_TOSHIBA_RBTX4927 is not set</div><div class='del'>-# CONFIG_TOSHIBA_RBTX4938 is not set</div><div class='add'>+# CONFIG_MACH_TX39XX is not set</div><div class='add'>+# CONFIG_MACH_TX49XX is not set</div><div class='add'>+# CONFIG_MIKROTIK_RB532 is not set</div><div class='ctx'> # CONFIG_WR_PPMC is not set</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_ARCH_SUPPORTS_OPROFILE=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CMOS_UPDATE=y</div><div class='ctx'> CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y</div><div class='add'>+CONFIG_CEVT_GT641XX=y</div><div class='add'>+CONFIG_CEVT_R4K=y</div><div class='add'>+CONFIG_CSRC_R4K=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='hunk'>@@ -108,6 +117,7 @@ CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='hunk'>@@ -115,10 +125,16 @@ CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=0</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='ctx'> # CONFIG_HZ_48 is not set</div><div class='ctx'> # CONFIG_HZ_100 is not set</div><div class='ctx'> # CONFIG_HZ_128 is not set</div><div class='hunk'>@@ -151,23 +167,28 @@ CONFIG_SYSVIPC_SYSCTL=y</div><div class='ctx'> # CONFIG_POSIX_MQUEUE is not set</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT is not set</div><div class='ctx'> # CONFIG_TASKSTATS is not set</div><div class='del'>-# CONFIG_USER_NS is not set</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='del'>-CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='add'>+# CONFIG_SYSFS_DEPRECATED_V2 is not set</div><div class='ctx'> CONFIG_RELAY=y</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='ctx'> # CONFIG_BLK_DEV_INITRD is not set</div><div class='ctx'> # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_ANON_INODES=y</div><div class='hunk'>@@ -177,23 +198,37 @@ CONFIG_TIMERFD=y</div><div class='ctx'> CONFIG_EVENTFD=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_VM_EVENT_COUNTERS=y</div><div class='del'>-CONFIG_SLAB=y</div><div class='del'>-# CONFIG_SLUB is not set</div><div class='add'>+CONFIG_SLUB_DEBUG=y</div><div class='add'>+# CONFIG_SLAB is not set</div><div class='add'>+CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+# CONFIG_HAVE_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -207,18 +242,18 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_CFQ is not set</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Bus options (PCI, PCMCIA, EISA, ISA, TC)</div><div class='ctx'> #</div><div class='ctx'> CONFIG_HW_HAS_PCI=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_DOMAINS=y</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+CONFIG_PCI_LEGACY=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCCARD (PCMCIA/CardBus) support</div><div class='del'>-#</div><div class='add'>+CONFIG_I8253=y</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -232,8 +267,8 @@ CONFIG_TRAD_SIGNALS=y</div><div class='ctx'> #</div><div class='ctx'> # Power management options</div><div class='ctx'> #</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> # CONFIG_PM is not set</div><div class='del'>-CONFIG_SUSPEND_UP_POSSIBLE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Networking</div><div class='hunk'>@@ -250,6 +285,7 @@ CONFIG_XFRM=y</div><div class='ctx'> CONFIG_XFRM_USER=y</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_NET_KEY_MIGRATE=y</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -269,6 +305,7 @@ CONFIG_IP_FIB_HASH=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -276,8 +313,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -294,10 +329,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_LAPB is not set</div><div class='ctx'> # CONFIG_ECONET is not set</div><div class='ctx'> # CONFIG_WAN_ROUTER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# QoS and/or fair queueing</div><div class='del'>-#</div><div class='ctx'> # CONFIG_NET_SCHED is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -305,6 +336,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_PKTGEN is not set</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='ctx'> # CONFIG_IRDA is not set</div><div class='ctx'> # CONFIG_BT is not set</div><div class='ctx'> # CONFIG_AF_RXRPC is not set</div><div class='hunk'>@@ -326,9 +358,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> #</div><div class='ctx'> # Generic Driver Options</div><div class='ctx'> #</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='ctx'> CONFIG_MTD=y</div><div class='hunk'>@@ -337,6 +372,7 @@ CONFIG_MTD=y</div><div class='ctx'> CONFIG_MTD_PARTITIONS=y</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='ctx'> # CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # User Modules And Translation Layers</div><div class='hunk'>@@ -350,6 +386,7 @@ CONFIG_MTD_BLKDEVS=y</div><div class='ctx'> # CONFIG_INFTL is not set</div><div class='ctx'> # CONFIG_RFD_FTL is not set</div><div class='ctx'> # CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # RAM/ROM/Flash chip drivers</div><div class='hunk'>@@ -384,6 +421,7 @@ CONFIG_MTD_PHYSMAP=y</div><div class='ctx'> CONFIG_MTD_PHYSMAP_START=0x0</div><div class='ctx'> CONFIG_MTD_PHYSMAP_LEN=0x0</div><div class='ctx'> CONFIG_MTD_PHYSMAP_BANKWIDTH=0</div><div class='add'>+# CONFIG_MTD_INTEL_VR_NOR is not set</div><div class='ctx'> # CONFIG_MTD_PLATRAM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -423,7 +461,9 @@ CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> # CONFIG_BLK_DEV_RAM is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> # CONFIG_MISC_DEVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -462,10 +502,15 @@ CONFIG_SCSI_WAIT_SCAN=m</div><div class='ctx'> # CONFIG_SCSI_FC_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_LOWLEVEL is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='add'>+CONFIG_SATA_PMP=y</div><div class='ctx'> # CONFIG_SATA_AHCI is not set</div><div class='add'>+# CONFIG_SATA_SIL24 is not set</div><div class='add'>+CONFIG_ATA_SFF=y</div><div class='ctx'> # CONFIG_SATA_SVW is not set</div><div class='ctx'> # CONFIG_ATA_PIIX is not set</div><div class='ctx'> # CONFIG_SATA_MV is not set</div><div class='hunk'>@@ -475,7 +520,6 @@ CONFIG_ATA=y</div><div class='ctx'> # CONFIG_SATA_PROMISE is not set</div><div class='ctx'> # CONFIG_SATA_SX4 is not set</div><div class='ctx'> # CONFIG_SATA_SIL is not set</div><div class='del'>-# CONFIG_SATA_SIL24 is not set</div><div class='ctx'> # CONFIG_SATA_SIS is not set</div><div class='ctx'> # CONFIG_SATA_ULI is not set</div><div class='ctx'> # CONFIG_SATA_VIA is not set</div><div class='hunk'>@@ -504,7 +548,9 @@ CONFIG_ATA=y</div><div class='ctx'> # CONFIG_PATA_MPIIX is not set</div><div class='ctx'> # CONFIG_PATA_OLDPIIX is not set</div><div class='ctx'> # CONFIG_PATA_NETCELL is not set</div><div class='add'>+# CONFIG_PATA_NINJA32 is not set</div><div class='ctx'> # CONFIG_PATA_NS87410 is not set</div><div class='add'>+# CONFIG_PATA_NS87415 is not set</div><div class='ctx'> # CONFIG_PATA_OPTI is not set</div><div class='ctx'> # CONFIG_PATA_OPTIDMA is not set</div><div class='ctx'> # CONFIG_PATA_PDC_OLD is not set</div><div class='hunk'>@@ -518,29 +564,27 @@ CONFIG_ATA=y</div><div class='ctx'> CONFIG_PATA_VIA=y</div><div class='ctx'> # CONFIG_PATA_WINBOND is not set</div><div class='ctx'> # CONFIG_PATA_PLATFORM is not set</div><div class='add'>+# CONFIG_PATA_SCH is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Fusion MPT device support</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_FUSION is not set</div><div class='del'>-# CONFIG_FUSION_SPI is not set</div><div class='del'>-# CONFIG_FUSION_FC is not set</div><div class='del'>-# CONFIG_FUSION_SAS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# IEEE 1394 (FireWire) support</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='add'>+# CONFIG_VETH is not set</div><div class='ctx'> # CONFIG_ARCNET is not set</div><div class='ctx'> # CONFIG_PHYLIB is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='hunk'>@@ -562,7 +606,12 @@ CONFIG_TULIP=y</div><div class='ctx'> # CONFIG_DM9102 is not set</div><div class='ctx'> # CONFIG_ULI526X is not set</div><div class='ctx'> # CONFIG_HP100 is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='ctx'> # CONFIG_NET_PCI is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='ctx'> # CONFIG_NETDEV_1000 is not set</div><div class='ctx'> # CONFIG_NETDEV_10000 is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='hunk'>@@ -572,6 +621,7 @@ CONFIG_TULIP=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Network Adapters</div><div class='hunk'>@@ -580,7 +630,6 @@ CONFIG_TULIP=y</div><div class='ctx'> # CONFIG_USB_KAWETH is not set</div><div class='ctx'> # CONFIG_USB_PEGASUS is not set</div><div class='ctx'> # CONFIG_USB_RTL8150 is not set</div><div class='del'>-# CONFIG_USB_USBNET_MII is not set</div><div class='ctx'> # CONFIG_USB_USBNET is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='hunk'>@@ -588,7 +637,6 @@ CONFIG_TULIP=y</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='ctx'> # CONFIG_NET_FC is not set</div><div class='del'>-# CONFIG_SHAPER is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='ctx'> # CONFIG_NET_POLL_CONTROLLER is not set</div><div class='hunk'>@@ -607,7 +655,6 @@ CONFIG_INPUT_POLLDEV=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_INPUT_MOUSEDEV is not set</div><div class='ctx'> # CONFIG_INPUT_JOYDEV is not set</div><div class='del'>-# CONFIG_INPUT_TSDEV is not set</div><div class='ctx'> CONFIG_INPUT_EVDEV=y</div><div class='ctx'> # CONFIG_INPUT_EVBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -642,7 +689,9 @@ CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+# CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Serial drivers</div><div class='hunk'>@@ -664,65 +713,122 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-# CONFIG_WATCHDOG is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='del'>-# CONFIG_RTC is not set</div><div class='del'>-CONFIG_COBALT_LCD=y</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_APPLICOM is not set</div><div class='del'>-# CONFIG_DRM is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_DRM is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+# CONFIG_FB_CFB_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_CFB_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_FOREIGN_ENDIAN is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_CIRRUS is not set</div><div class='add'>+# CONFIG_FB_PM2 is not set</div><div class='add'>+# CONFIG_FB_CYBER2000 is not set</div><div class='add'>+# CONFIG_FB_ASILIANT is not set</div><div class='add'>+# CONFIG_FB_IMSTT is not set</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+# CONFIG_FB_NVIDIA is not set</div><div class='add'>+# CONFIG_FB_RIVA is not set</div><div class='add'>+# CONFIG_FB_MATROX is not set</div><div class='add'>+# CONFIG_FB_RADEON is not set</div><div class='add'>+# CONFIG_FB_ATY128 is not set</div><div class='add'>+# CONFIG_FB_ATY is not set</div><div class='add'>+# CONFIG_FB_S3 is not set</div><div class='add'>+# CONFIG_FB_SAVAGE is not set</div><div class='add'>+# CONFIG_FB_SIS is not set</div><div class='add'>+# CONFIG_FB_NEOMAGIC is not set</div><div class='add'>+# CONFIG_FB_KYRO is not set</div><div class='add'>+# CONFIG_FB_3DFX is not set</div><div class='add'>+# CONFIG_FB_VOODOO1 is not set</div><div class='add'>+# CONFIG_FB_VT8623 is not set</div><div class='add'>+# CONFIG_FB_TRIDENT is not set</div><div class='add'>+# CONFIG_FB_ARK is not set</div><div class='add'>+# CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='add'>+CONFIG_FB_COBALT=y</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-# CONFIG_VGASTATE is not set</div><div class='del'>-# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='del'>-# CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Console display driver support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VGA_CONSOLE is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE is not set</div><div class='add'>+# CONFIG_LOGO is not set</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=m</div><div class='ctx'> # CONFIG_HID_DEBUG is not set</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Input Devices</div><div class='hunk'>@@ -743,6 +849,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> CONFIG_USB=m</div><div class='ctx'> # CONFIG_USB_DEBUG is not set</div><div class='add'>+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous USB options</div><div class='hunk'>@@ -751,15 +858,18 @@ CONFIG_USB=m</div><div class='ctx'> # CONFIG_USB_DEVICE_CLASS is not set</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='ctx'> CONFIG_USB_EHCI_HCD=m</div><div class='del'>-# CONFIG_USB_EHCI_SPLIT_ISO is not set</div><div class='ctx'> # CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='ctx'> # CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=m</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='hunk'>@@ -773,6 +883,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> # CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -785,6 +896,7 @@ CONFIG_USB_STORAGE=m</div><div class='ctx'> # CONFIG_USB_STORAGE_DEBUG is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ISD200 is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_DPCM is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_USBAT is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='hunk'>@@ -793,6 +905,7 @@ CONFIG_USB_STORAGE=m</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -800,15 +913,11 @@ CONFIG_USB_STORAGE=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='add'>+# CONFIG_USB_MON is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='ctx'> #</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Serial Converter support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_USB_SERIAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -833,16 +942,10 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB DSL modem support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Gadget Support</div><div class='del'>-#</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='ctx'> CONFIG_NEW_LEDS=y</div><div class='ctx'> CONFIG_LEDS_CLASS=y</div><div class='ctx'> </div><div class='hunk'>@@ -858,6 +961,8 @@ CONFIG_LEDS_COBALT_RAQ=y</div><div class='ctx'> CONFIG_LEDS_TRIGGERS=y</div><div class='ctx'> # CONFIG_LEDS_TRIGGER_TIMER is not set</div><div class='ctx'> # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set</div><div class='add'>+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> CONFIG_RTC_LIB=y</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='hunk'>@@ -882,9 +987,10 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # Platform RTC drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_RTC_DRV_CMOS=y</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_DS1553 is not set</div><div class='del'>-# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M48T86 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M48T59 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_V3020 is not set</div><div class='hunk'>@@ -892,23 +998,7 @@ CONFIG_RTC_DRV_CMOS=y</div><div class='ctx'> #</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Engine support</div><div class='del'>-#</div><div class='del'>-# CONFIG_DMA_ENGINE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Clients</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -923,22 +1013,22 @@ CONFIG_EXT3_FS=y</div><div class='ctx'> CONFIG_EXT3_FS_XATTR=y</div><div class='ctx'> CONFIG_EXT3_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_EXT3_FS_SECURITY=y</div><div class='del'>-# CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_EXT4DEV_FS=y</div><div class='add'>+CONFIG_EXT4DEV_FS_XATTR=y</div><div class='add'>+CONFIG_EXT4DEV_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXT4DEV_FS_SECURITY=y</div><div class='ctx'> CONFIG_JBD=y</div><div class='del'>-# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_JBD2=y</div><div class='ctx'> CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_REISERFS_FS is not set</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='del'>-# CONFIG_MINIX_FS is not set</div><div class='del'>-# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='del'>-CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='ctx'> # CONFIG_FUSE_FS is not set</div><div class='hunk'>@@ -967,7 +1057,6 @@ CONFIG_SYSFS=y</div><div class='ctx'> CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_TMPFS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_HUGETLB_PAGE is not set</div><div class='del'>-CONFIG_RAMFS=y</div><div class='ctx'> CONFIG_CONFIGFS_FS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -983,32 +1072,28 @@ CONFIG_CONFIGFS_FS=y</div><div class='ctx'> # CONFIG_JFFS2_FS is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Network File Systems</div><div class='del'>-#</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> CONFIG_NFS_V3_ACL=y</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='ctx'> CONFIG_NFSD=y</div><div class='ctx'> CONFIG_NFSD_V2_ACL=y</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> CONFIG_NFSD_V3_ACL=y</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_NFSD_TCP=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=y</div><div class='ctx'> CONFIG_NFS_ACL_SUPPORT=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1022,34 +1107,26 @@ CONFIG_SUNRPC=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARTITION_ADVANCED is not set</div><div class='ctx'> CONFIG_MSDOS_PARTITION=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Native Language Support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_NLS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Distributed Lock Manager</div><div class='del'>-#</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Profiling support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PROFILING is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # Kernel hacking</div><div class='ctx'> #</div><div class='ctx'> CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='del'>-CONFIG_CROSSCOMPILE=y</div><div class='add'>+# CONFIG_SLUB_DEBUG_ON is not set</div><div class='add'>+# CONFIG_SLUB_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1057,14 +1134,95 @@ CONFIG_CMDLINE=""</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_KEYS is not set</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='del'>-# CONFIG_CRYPTO is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_MANAGER is not set</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CBC is not set</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+# CONFIG_CRYPTO_ECB is not set</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+# CONFIG_CRYPTO_MD5 is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_DES is not set</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='add'>+# CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='del'>-# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC16=y</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig<br/>index ebb8ad62b3a3..a279165e3a7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/db1000_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/db1000_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/db1000_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/db1000_defconfig</a></div><div class='hunk'>@@ -1092,7 +1092,6 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_CROSSCOMPILE=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='head'>diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig<br/>index ad4e5ef65592..8944d15caf13 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/db1100_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/db1100_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/db1100_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/db1100_defconfig</a></div><div class='hunk'>@@ -1092,7 +1092,6 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_CROSSCOMPILE=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='head'>diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig<br/>index d0dc2e83ad35..ab17973107fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/db1200_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/db1200_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/db1200_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/db1200_defconfig</a></div><div class='hunk'>@@ -1174,7 +1174,6 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_CROSSCOMPILE=y</div><div class='ctx'> CONFIG_CMDLINE="mem=48M"</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='head'>diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig<br/>index 9155082313c8..b65803f19352 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/db1500_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/db1500_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/db1500_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/db1500_defconfig</a></div><div class='hunk'>@@ -1392,7 +1392,6 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_CROSSCOMPILE=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='head'>diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig<br/>index e4e324422cd9..a190ac07740b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/db1550_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/db1550_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/db1550_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/db1550_defconfig</a></div><div class='hunk'>@@ -1209,7 +1209,6 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_CROSSCOMPILE=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='head'>diff --git a/arch/mips/configs/excite_defconfig b/arch/mips/configs/excite_defconfig<br/>index 3572e80356d2..4e465e945991 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/excite_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/excite_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/excite_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/excite_defconfig</a></div><div class='hunk'>@@ -1269,7 +1269,6 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_CROSSCOMPILE=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='head'>diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig<br/>index 138c575a0151..831d3e5a1ea6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/ip27_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/ip27_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/ip27_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/ip27_defconfig</a></div><div class='hunk'>@@ -943,7 +943,6 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_CROSSCOMPILE=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='head'>diff --git a/arch/mips/configs/msp71xx_defconfig b/arch/mips/configs/msp71xx_defconfig<br/>index 59d19472b161..dd13db4d0fb9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/msp71xx_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/msp71xx_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/msp71xx_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/msp71xx_defconfig</a></div><div class='hunk'>@@ -1415,8 +1415,6 @@ CONFIG_FORCED_INLINING=y</div><div class='ctx'> CONFIG_CROSSCOMPILE=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='del'>-# CONFIG_KGDB is not set</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> # CONFIG_RUNTIME_DEBUG is not set</div><div class='ctx'> # CONFIG_MIPS_UNCACHED is not set</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig<br/>index bacf0dd0e345..db9272677aa2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/mtx1_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/mtx1_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/mtx1_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/mtx1_defconfig</a></div><div class='hunk'>@@ -3020,7 +3020,6 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_CROSSCOMPILE=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='head'>diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig<br/>index 6dfe6f793cef..9e21e333a2fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/pb1100_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/pb1100_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/pb1100_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/pb1100_defconfig</a></div><div class='hunk'>@@ -1085,7 +1085,6 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_CROSSCOMPILE=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='head'>diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig<br/>index c965a87e6a96..af67ed4f71ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/pb1500_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/pb1500_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/pb1500_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/pb1500_defconfig</a></div><div class='hunk'>@@ -1202,7 +1202,6 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_CROSSCOMPILE=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='head'>diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig<br/>index 0778996c682f..7956f56cbf3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/pb1550_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/pb1550_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/pb1550_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/pb1550_defconfig</a></div><div class='hunk'>@@ -1195,7 +1195,6 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_CROSSCOMPILE=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='head'>diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig<br/>index 37c7b5ffd474..723bd5176a35 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/pnx8550-jbs_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/pnx8550-jbs_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/pnx8550-jbs_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/pnx8550-jbs_defconfig</a></div><div class='hunk'>@@ -1216,10 +1216,8 @@ CONFIG_DEBUG_MUTEXES=y</div><div class='ctx'> CONFIG_FORCED_INLINING=y</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> CONFIG_CROSSCOMPILE=y</div><div class='del'>-CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"</div><div class='add'>+CONFIG_CMDLINE="console=ttyS1,38400n8 root=/dev/nfs ip=bootp"</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='del'>-# CONFIG_KGDB is not set</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> # CONFIG_RUNTIME_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='head'>diff --git a/arch/mips/configs/pnx8550-stb810_defconfig b/arch/mips/configs/pnx8550-stb810_defconfig<br/>index 893e5c4ab66d..b5052fb42e9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/pnx8550-stb810_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/pnx8550-stb810_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/pnx8550-stb810_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/pnx8550-stb810_defconfig</a></div><div class='hunk'>@@ -1206,10 +1206,8 @@ CONFIG_DEBUG_SLAB=y</div><div class='ctx'> CONFIG_FORCED_INLINING=y</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> CONFIG_CROSSCOMPILE=y</div><div class='del'>-CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"</div><div class='add'>+CONFIG_CMDLINE="console=ttyS1,38400n8 root=/dev/nfs ip=bootp"</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='del'>-# CONFIG_KGDB is not set</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> # CONFIG_RUNTIME_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='head'>diff --git a/arch/mips/configs/rbtx49xx_defconfig b/arch/mips/configs/rbtx49xx_defconfig<br/>index e42aed5a38bb..c7c0864b8ce9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/rbtx49xx_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/rbtx49xx_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/rbtx49xx_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/rbtx49xx_defconfig</a></div><div class='hunk'>@@ -742,7 +742,6 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='head'>diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig<br/>index 1ea97865f2ce..a9acaa2f9da3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/sb1250-swarm_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/sb1250-swarm_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/sb1250-swarm_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/sb1250-swarm_defconfig</a></div><div class='hunk'>@@ -963,7 +963,6 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> # CONFIG_SB1XXX_CORELIS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='head'>diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig<br/>index 7f86c43d1bda..ea8249c75b3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/yosemite_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/configs/yosemite_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/yosemite_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/configs/yosemite_defconfig</a></div><div class='hunk'>@@ -827,8 +827,6 @@ CONFIG_FORCED_INLINING=y</div><div class='ctx'> CONFIG_CROSSCOMPILE=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='del'>-# CONFIG_KGDB is not set</div><div class='del'>-CONFIG_SYS_SUPPORTS_KGDB=y</div><div class='ctx'> # CONFIG_RUNTIME_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='head'>diff --git a/arch/mips/emma2rh/markeins/platform.c b/arch/mips/emma2rh/markeins/platform.c<br/>index 11567702b155..d70627de7cfe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/emma2rh/markeins/platform.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/emma2rh/markeins/platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/emma2rh/markeins/platform.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/emma2rh/markeins/platform.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'> #include &lt;asm/bcache.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='del'>-#include &lt;asm/gdb-stub.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/debug.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/emma2rh/markeins/setup.c b/arch/mips/emma2rh/markeins/setup.c<br/>index 62bfb455d1b1..b6a23ad539f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/emma2rh/markeins/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/emma2rh/markeins/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/emma2rh/markeins/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/emma2rh/markeins/setup.c</a></div><div class='hunk'>@@ -25,25 +25,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/initrd.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/ide.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/param.h&gt;	/* for HZ */</div><div class='del'>-#include &lt;linux/root_dev.h&gt;</div><div class='del'>-#include &lt;linux/serial.h&gt;</div><div class='del'>-#include &lt;linux/serial_core.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/cpu.h&gt;</div><div class='del'>-#include &lt;asm/bootinfo.h&gt;</div><div class='del'>-#include &lt;asm/addrspace.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='del'>-#include &lt;asm/bcache.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='del'>-#include &lt;asm/gdb-stub.h&gt;</div><div class='del'>-#include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/debug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/emma2rh/emma2rh.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c<br/>index f60524e8bc44..7043f6b9ff3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/jazz/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/jazz/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/jazz/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/jazz/setup.c</a></div><div class='hunk'>@@ -5,35 +5,22 @@</div><div class='ctx'>  * License.  See the file "COPYING" in the main directory of this archive</div><div class='ctx'>  * for more details.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1996, 1997, 1998, 2001, 07 by Ralf Baechle</div><div class='add'>+ * Copyright (C) 1996, 1997, 1998, 2001, 07, 08 by Ralf Baechle</div><div class='ctx'>  * Copyright (C) 2001 MIPS Technologies, Inc.</div><div class='ctx'>  * Copyright (C) 2007 by Thomas Bogendoerfer</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/eisa.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='del'>-#include &lt;linux/fb.h&gt;</div><div class='del'>-#include &lt;linux/ide.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/bootinfo.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/jazz.h&gt;</div><div class='ctx'> #include &lt;asm/jazzdma.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/time.h&gt;</div><div class='del'>-#include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/mc146818-time.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern asmlinkage void jazz_handle_int(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/.gitignore b/arch/mips/kernel/.gitignore<br/>new file mode 100644<br/>index 000000000000..c5f676c3c224<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/.gitignore</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+vmlinux.lds</div><div class='head'>diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile<br/>index 0fd31974ba28..706f93974797 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/Makefile</a></div><div class='hunk'>@@ -71,7 +71,7 @@ obj-$(CONFIG_MIPS32_COMPAT)	+= linux32.o ptrace32.o signal32.o</div><div class='ctx'> obj-$(CONFIG_MIPS32_N32)	+= binfmt_elfn32.o scall64-n32.o signal_n32.o</div><div class='ctx'> obj-$(CONFIG_MIPS32_O32)	+= binfmt_elfo32.o scall64-o32.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_KGDB)		+= gdb-low.o gdb-stub.o</div><div class='add'>+obj-$(CONFIG_KGDB)		+= kgdb.o</div><div class='ctx'> obj-$(CONFIG_PROC_FS)		+= proc.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_64BIT)		+= cpu-bugs64.o</div><div class='head'>diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c<br/>index 335a6ae3d594..11c92dc53791 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/cpu-probe.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/kernel/cpu-probe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/cpu-probe.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/cpu-probe.c</a></div><div class='hunk'>@@ -45,18 +45,7 @@ static void r39xx_wait(void)</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * There is a race when WAIT instruction executed with interrupt</div><div class='del'>- * enabled.</div><div class='del'>- * But it is implementation-dependent wheter the pipelie restarts when</div><div class='del'>- * a non-enabled interrupt is requested.</div><div class='del'>- */</div><div class='del'>-static void r4k_wait(void)</div><div class='del'>-{</div><div class='del'>-	__asm__("	.set	mips3			\n"</div><div class='del'>-		"	wait				\n"</div><div class='del'>-		"	.set	mips0			\n");</div><div class='del'>-}</div><div class='add'>+extern void r4k_wait(void);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This variant is preferable as it allows testing need_resched and going to</div><div class='hunk'>@@ -128,7 +117,7 @@ static int __init wait_disable(char *s)</div><div class='ctx'> </div><div class='ctx'> __setup("nowait", wait_disable);</div><div class='ctx'> </div><div class='del'>-static inline void check_wait(void)</div><div class='add'>+void __init check_wait(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpuinfo_mips *c = &amp;current_cpu_data;</div><div class='ctx'> </div><div class='hunk'>@@ -242,7 +231,6 @@ static inline void check_errata(void)</div><div class='ctx'> </div><div class='ctx'> void __init check_bugs32(void)</div><div class='ctx'> {</div><div class='del'>-	check_wait();</div><div class='ctx'> 	check_errata();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/gdb-low.S b/arch/mips/kernel/gdb-low.S<br/>deleted file mode 100644<br/>index 2c446063636a..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/gdb-low.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/kernel/gdb-low.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,394 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * gdb-low.S contains the low-level trap handler for the GDB stub.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1995 Andreas Busse</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/sys.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/asm.h&gt;</div><div class='del'>-#include &lt;asm/errno.h&gt;</div><div class='del'>-#include &lt;asm/irqflags.h&gt;</div><div class='del'>-#include &lt;asm/mipsregs.h&gt;</div><div class='del'>-#include &lt;asm/regdef.h&gt;</div><div class='del'>-#include &lt;asm/stackframe.h&gt;</div><div class='del'>-#include &lt;asm/gdb-stub.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_32BIT</div><div class='del'>-#define DMFC0	mfc0</div><div class='del'>-#define DMTC0	mtc0</div><div class='del'>-#define LDC1	lwc1</div><div class='del'>-#define SDC1	lwc1</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_64BIT</div><div class='del'>-#define DMFC0	dmfc0</div><div class='del'>-#define DMTC0	dmtc0</div><div class='del'>-#define LDC1	ldc1</div><div class='del'>-#define SDC1	ldc1</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * [jsun] We reserves about 2x GDB_FR_SIZE in stack.  The lower (addressed)</div><div class='del'>- * part is used to store registers and passed to exception handler.</div><div class='del'>- * The upper part is reserved for "call func" feature where gdb client</div><div class='del'>- * saves some of the regs, setups call frame and passes args.</div><div class='del'>- *</div><div class='del'>- * A trace shows about 200 bytes are used to store about half of all regs.</div><div class='del'>- * The rest should be big enough for frame setup and passing args.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The low level trap handler</div><div class='del'>- */</div><div class='del'>-		.align 	5</div><div class='del'>-		NESTED(trap_low, GDB_FR_SIZE, sp)</div><div class='del'>-		.set	noat</div><div class='del'>-		.set 	noreorder</div><div class='del'>-</div><div class='del'>-		mfc0	k0, CP0_STATUS</div><div class='del'>-		sll	k0, 3     		/* extract cu0 bit */</div><div class='del'>-		bltz	k0, 1f</div><div class='del'>-		move	k1, sp</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Called from user mode, go somewhere else.</div><div class='del'>-		 */</div><div class='del'>-		mfc0	k0, CP0_CAUSE</div><div class='del'>-		andi	k0, k0, 0x7c</div><div class='del'>-#ifdef CONFIG_64BIT</div><div class='del'>-		dsll	k0, k0, 1</div><div class='del'>-#endif</div><div class='del'>-		PTR_L	k1, saved_vectors(k0)</div><div class='del'>-		jr	k1</div><div class='del'>-		nop</div><div class='del'>-1:</div><div class='del'>-		move	k0, sp</div><div class='del'>-		PTR_SUBU sp, k1, GDB_FR_SIZE*2	# see comment above</div><div class='del'>-		LONG_S	k0, GDB_FR_REG29(sp)</div><div class='del'>-		LONG_S	$2, GDB_FR_REG2(sp)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * First save the CP0 and special registers</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-		mfc0	v0, CP0_STATUS</div><div class='del'>-		LONG_S	v0, GDB_FR_STATUS(sp)</div><div class='del'>-		mfc0	v0, CP0_CAUSE</div><div class='del'>-		LONG_S	v0, GDB_FR_CAUSE(sp)</div><div class='del'>-		DMFC0	v0, CP0_EPC</div><div class='del'>-		LONG_S	v0, GDB_FR_EPC(sp)</div><div class='del'>-		DMFC0	v0, CP0_BADVADDR</div><div class='del'>-		LONG_S	v0, GDB_FR_BADVADDR(sp)</div><div class='del'>-		mfhi	v0</div><div class='del'>-		LONG_S	v0, GDB_FR_HI(sp)</div><div class='del'>-		mflo	v0</div><div class='del'>-		LONG_S	v0, GDB_FR_LO(sp)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Now the integer registers</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-		LONG_S	zero, GDB_FR_REG0(sp)		/* I know... */</div><div class='del'>-		LONG_S	$1, GDB_FR_REG1(sp)</div><div class='del'>-		/* v0 already saved */</div><div class='del'>-		LONG_S	$3, GDB_FR_REG3(sp)</div><div class='del'>-		LONG_S	$4, GDB_FR_REG4(sp)</div><div class='del'>-		LONG_S	$5, GDB_FR_REG5(sp)</div><div class='del'>-		LONG_S	$6, GDB_FR_REG6(sp)</div><div class='del'>-		LONG_S	$7, GDB_FR_REG7(sp)</div><div class='del'>-		LONG_S	$8, GDB_FR_REG8(sp)</div><div class='del'>-		LONG_S	$9, GDB_FR_REG9(sp)</div><div class='del'>-		LONG_S	$10, GDB_FR_REG10(sp)</div><div class='del'>-		LONG_S	$11, GDB_FR_REG11(sp)</div><div class='del'>-		LONG_S	$12, GDB_FR_REG12(sp)</div><div class='del'>-		LONG_S	$13, GDB_FR_REG13(sp)</div><div class='del'>-		LONG_S	$14, GDB_FR_REG14(sp)</div><div class='del'>-		LONG_S	$15, GDB_FR_REG15(sp)</div><div class='del'>-		LONG_S	$16, GDB_FR_REG16(sp)</div><div class='del'>-		LONG_S	$17, GDB_FR_REG17(sp)</div><div class='del'>-		LONG_S	$18, GDB_FR_REG18(sp)</div><div class='del'>-		LONG_S	$19, GDB_FR_REG19(sp)</div><div class='del'>-		LONG_S	$20, GDB_FR_REG20(sp)</div><div class='del'>-		LONG_S	$21, GDB_FR_REG21(sp)</div><div class='del'>-		LONG_S	$22, GDB_FR_REG22(sp)</div><div class='del'>-		LONG_S	$23, GDB_FR_REG23(sp)</div><div class='del'>-		LONG_S	$24, GDB_FR_REG24(sp)</div><div class='del'>-		LONG_S	$25, GDB_FR_REG25(sp)</div><div class='del'>-		LONG_S	$26, GDB_FR_REG26(sp)</div><div class='del'>-		LONG_S	$27, GDB_FR_REG27(sp)</div><div class='del'>-		LONG_S	$28, GDB_FR_REG28(sp)</div><div class='del'>-		/* sp already saved */</div><div class='del'>-		LONG_S	$30, GDB_FR_REG30(sp)</div><div class='del'>-		LONG_S	$31, GDB_FR_REG31(sp)</div><div class='del'>-</div><div class='del'>-		CLI				/* disable interrupts */</div><div class='del'>-		TRACE_IRQS_OFF</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Followed by the floating point registers</div><div class='del'>- */</div><div class='del'>-		mfc0	v0, CP0_STATUS		/* FPU enabled? */</div><div class='del'>-		srl	v0, v0, 16</div><div class='del'>-		andi	v0, v0, (ST0_CU1 &gt;&gt; 16)</div><div class='del'>-</div><div class='del'>-		beqz	v0,2f			/* disabled, skip */</div><div class='del'>-		 nop</div><div class='del'>-</div><div class='del'>-		SDC1	$0, GDB_FR_FPR0(sp)</div><div class='del'>-		SDC1	$1, GDB_FR_FPR1(sp)</div><div class='del'>-		SDC1	$2, GDB_FR_FPR2(sp)</div><div class='del'>-		SDC1	$3, GDB_FR_FPR3(sp)</div><div class='del'>-		SDC1	$4, GDB_FR_FPR4(sp)</div><div class='del'>-		SDC1	$5, GDB_FR_FPR5(sp)</div><div class='del'>-		SDC1	$6, GDB_FR_FPR6(sp)</div><div class='del'>-		SDC1	$7, GDB_FR_FPR7(sp)</div><div class='del'>-		SDC1	$8, GDB_FR_FPR8(sp)</div><div class='del'>-		SDC1	$9, GDB_FR_FPR9(sp)</div><div class='del'>-		SDC1	$10, GDB_FR_FPR10(sp)</div><div class='del'>-		SDC1	$11, GDB_FR_FPR11(sp)</div><div class='del'>-		SDC1	$12, GDB_FR_FPR12(sp)</div><div class='del'>-		SDC1	$13, GDB_FR_FPR13(sp)</div><div class='del'>-		SDC1	$14, GDB_FR_FPR14(sp)</div><div class='del'>-		SDC1	$15, GDB_FR_FPR15(sp)</div><div class='del'>-		SDC1	$16, GDB_FR_FPR16(sp)</div><div class='del'>-		SDC1	$17, GDB_FR_FPR17(sp)</div><div class='del'>-		SDC1	$18, GDB_FR_FPR18(sp)</div><div class='del'>-		SDC1	$19, GDB_FR_FPR19(sp)</div><div class='del'>-		SDC1	$20, GDB_FR_FPR20(sp)</div><div class='del'>-		SDC1	$21, GDB_FR_FPR21(sp)</div><div class='del'>-		SDC1	$22, GDB_FR_FPR22(sp)</div><div class='del'>-		SDC1	$23, GDB_FR_FPR23(sp)</div><div class='del'>-		SDC1	$24, GDB_FR_FPR24(sp)</div><div class='del'>-		SDC1	$25, GDB_FR_FPR25(sp)</div><div class='del'>-		SDC1	$26, GDB_FR_FPR26(sp)</div><div class='del'>-		SDC1	$27, GDB_FR_FPR27(sp)</div><div class='del'>-		SDC1	$28, GDB_FR_FPR28(sp)</div><div class='del'>-		SDC1	$29, GDB_FR_FPR29(sp)</div><div class='del'>-		SDC1	$30, GDB_FR_FPR30(sp)</div><div class='del'>-		SDC1	$31, GDB_FR_FPR31(sp)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FPU control registers</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-		cfc1	v0, CP1_STATUS</div><div class='del'>-		LONG_S	v0, GDB_FR_FSR(sp)</div><div class='del'>-		cfc1	v0, CP1_REVISION</div><div class='del'>-		LONG_S	v0, GDB_FR_FIR(sp)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Current stack frame ptr</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-2:</div><div class='del'>-		LONG_S	sp, GDB_FR_FRP(sp)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CP0 registers (R4000/R4400 unused registers skipped)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-		mfc0	v0, CP0_INDEX</div><div class='del'>-		LONG_S	v0, GDB_FR_CP0_INDEX(sp)</div><div class='del'>-		mfc0	v0, CP0_RANDOM</div><div class='del'>-		LONG_S	v0, GDB_FR_CP0_RANDOM(sp)</div><div class='del'>-		DMFC0	v0, CP0_ENTRYLO0</div><div class='del'>-		LONG_S	v0, GDB_FR_CP0_ENTRYLO0(sp)</div><div class='del'>-		DMFC0	v0, CP0_ENTRYLO1</div><div class='del'>-		LONG_S	v0, GDB_FR_CP0_ENTRYLO1(sp)</div><div class='del'>-		DMFC0	v0, CP0_CONTEXT</div><div class='del'>-		LONG_S	v0, GDB_FR_CP0_CONTEXT(sp)</div><div class='del'>-		mfc0	v0, CP0_PAGEMASK</div><div class='del'>-		LONG_S	v0, GDB_FR_CP0_PAGEMASK(sp)</div><div class='del'>-		mfc0	v0, CP0_WIRED</div><div class='del'>-		LONG_S	v0, GDB_FR_CP0_WIRED(sp)</div><div class='del'>-		DMFC0	v0, CP0_ENTRYHI</div><div class='del'>-		LONG_S	v0, GDB_FR_CP0_ENTRYHI(sp)</div><div class='del'>-		mfc0	v0, CP0_PRID</div><div class='del'>-		LONG_S	v0, GDB_FR_CP0_PRID(sp)</div><div class='del'>-</div><div class='del'>-		.set	at</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Continue with the higher level handler</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-		move	a0,sp</div><div class='del'>-</div><div class='del'>-		jal	handle_exception</div><div class='del'>-		 nop</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Restore all writable registers, in reverse order</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-		.set	noat</div><div class='del'>-</div><div class='del'>-		LONG_L	v0, GDB_FR_CP0_ENTRYHI(sp)</div><div class='del'>-		LONG_L	v1, GDB_FR_CP0_WIRED(sp)</div><div class='del'>-		DMTC0	v0, CP0_ENTRYHI</div><div class='del'>-		mtc0	v1, CP0_WIRED</div><div class='del'>-		LONG_L	v0, GDB_FR_CP0_PAGEMASK(sp)</div><div class='del'>-		LONG_L	v1, GDB_FR_CP0_ENTRYLO1(sp)</div><div class='del'>-		mtc0	v0, CP0_PAGEMASK</div><div class='del'>-		DMTC0	v1, CP0_ENTRYLO1</div><div class='del'>-		LONG_L	v0, GDB_FR_CP0_ENTRYLO0(sp)</div><div class='del'>-		LONG_L	v1, GDB_FR_CP0_INDEX(sp)</div><div class='del'>-		DMTC0	v0, CP0_ENTRYLO0</div><div class='del'>-		LONG_L	v0, GDB_FR_CP0_CONTEXT(sp)</div><div class='del'>-		mtc0	v1, CP0_INDEX</div><div class='del'>-		DMTC0	v0, CP0_CONTEXT</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Next, the floating point registers</div><div class='del'>- */</div><div class='del'>-		mfc0	v0, CP0_STATUS		/* check if the FPU is enabled */</div><div class='del'>-		srl	v0, v0, 16</div><div class='del'>-		andi	v0, v0, (ST0_CU1 &gt;&gt; 16)</div><div class='del'>-</div><div class='del'>-		beqz	v0, 3f			/* disabled, skip */</div><div class='del'>-		 nop</div><div class='del'>-</div><div class='del'>-		LDC1	$31, GDB_FR_FPR31(sp)</div><div class='del'>-		LDC1	$30, GDB_FR_FPR30(sp)</div><div class='del'>-		LDC1	$29, GDB_FR_FPR29(sp)</div><div class='del'>-		LDC1	$28, GDB_FR_FPR28(sp)</div><div class='del'>-		LDC1	$27, GDB_FR_FPR27(sp)</div><div class='del'>-		LDC1	$26, GDB_FR_FPR26(sp)</div><div class='del'>-		LDC1	$25, GDB_FR_FPR25(sp)</div><div class='del'>-		LDC1	$24, GDB_FR_FPR24(sp)</div><div class='del'>-		LDC1	$23, GDB_FR_FPR23(sp)</div><div class='del'>-		LDC1	$22, GDB_FR_FPR22(sp)</div><div class='del'>-		LDC1	$21, GDB_FR_FPR21(sp)</div><div class='del'>-		LDC1	$20, GDB_FR_FPR20(sp)</div><div class='del'>-		LDC1	$19, GDB_FR_FPR19(sp)</div><div class='del'>-		LDC1	$18, GDB_FR_FPR18(sp)</div><div class='del'>-		LDC1	$17, GDB_FR_FPR17(sp)</div><div class='del'>-		LDC1	$16, GDB_FR_FPR16(sp)</div><div class='del'>-		LDC1	$15, GDB_FR_FPR15(sp)</div><div class='del'>-		LDC1	$14, GDB_FR_FPR14(sp)</div><div class='del'>-		LDC1	$13, GDB_FR_FPR13(sp)</div><div class='del'>-		LDC1	$12, GDB_FR_FPR12(sp)</div><div class='del'>-		LDC1	$11, GDB_FR_FPR11(sp)</div><div class='del'>-		LDC1	$10, GDB_FR_FPR10(sp)</div><div class='del'>-		LDC1	$9, GDB_FR_FPR9(sp)</div><div class='del'>-		LDC1	$8, GDB_FR_FPR8(sp)</div><div class='del'>-		LDC1	$7, GDB_FR_FPR7(sp)</div><div class='del'>-		LDC1	$6, GDB_FR_FPR6(sp)</div><div class='del'>-		LDC1	$5, GDB_FR_FPR5(sp)</div><div class='del'>-		LDC1	$4, GDB_FR_FPR4(sp)</div><div class='del'>-		LDC1	$3, GDB_FR_FPR3(sp)</div><div class='del'>-		LDC1	$2, GDB_FR_FPR2(sp)</div><div class='del'>-		LDC1	$1, GDB_FR_FPR1(sp)</div><div class='del'>-		LDC1	$0, GDB_FR_FPR0(sp)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Now the CP0 and integer registers</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-3:</div><div class='del'>-#ifdef CONFIG_MIPS_MT_SMTC</div><div class='del'>-		/* Read-modify write of Status must be atomic */</div><div class='del'>-		mfc0	t2, CP0_TCSTATUS</div><div class='del'>-		ori	t1, t2, TCSTATUS_IXMT</div><div class='del'>-		mtc0	t1, CP0_TCSTATUS</div><div class='del'>-		andi	t2, t2, TCSTATUS_IXMT</div><div class='del'>-		_ehb</div><div class='del'>-		DMT	9				# dmt	t1</div><div class='del'>-		jal	mips_ihb</div><div class='del'>-		nop</div><div class='del'>-#endif /* CONFIG_MIPS_MT_SMTC */</div><div class='del'>-		mfc0	t0, CP0_STATUS</div><div class='del'>-		ori	t0, 0x1f</div><div class='del'>-		xori	t0, 0x1f</div><div class='del'>-		mtc0	t0, CP0_STATUS</div><div class='del'>-#ifdef CONFIG_MIPS_MT_SMTC</div><div class='del'>-        	andi    t1, t1, VPECONTROL_TE</div><div class='del'>-        	beqz    t1, 9f</div><div class='del'>-		nop</div><div class='del'>-        	EMT					# emt</div><div class='del'>-9:</div><div class='del'>-		mfc0	t1, CP0_TCSTATUS</div><div class='del'>-		xori	t1, t1, TCSTATUS_IXMT</div><div class='del'>-		or	t1, t1, t2</div><div class='del'>-		mtc0	t1, CP0_TCSTATUS</div><div class='del'>-		_ehb</div><div class='del'>-#endif /* CONFIG_MIPS_MT_SMTC */</div><div class='del'>-		LONG_L	v0, GDB_FR_STATUS(sp)</div><div class='del'>-		LONG_L	v1, GDB_FR_EPC(sp)</div><div class='del'>-		mtc0	v0, CP0_STATUS</div><div class='del'>-		DMTC0	v1, CP0_EPC</div><div class='del'>-		LONG_L	v0, GDB_FR_HI(sp)</div><div class='del'>-		LONG_L	v1, GDB_FR_LO(sp)</div><div class='del'>-		mthi	v0</div><div class='del'>-		mtlo	v1</div><div class='del'>-		LONG_L	$31, GDB_FR_REG31(sp)</div><div class='del'>-		LONG_L	$30, GDB_FR_REG30(sp)</div><div class='del'>-		LONG_L	$28, GDB_FR_REG28(sp)</div><div class='del'>-		LONG_L	$27, GDB_FR_REG27(sp)</div><div class='del'>-		LONG_L	$26, GDB_FR_REG26(sp)</div><div class='del'>-		LONG_L	$25, GDB_FR_REG25(sp)</div><div class='del'>-		LONG_L	$24, GDB_FR_REG24(sp)</div><div class='del'>-		LONG_L	$23, GDB_FR_REG23(sp)</div><div class='del'>-		LONG_L	$22, GDB_FR_REG22(sp)</div><div class='del'>-		LONG_L	$21, GDB_FR_REG21(sp)</div><div class='del'>-		LONG_L	$20, GDB_FR_REG20(sp)</div><div class='del'>-		LONG_L	$19, GDB_FR_REG19(sp)</div><div class='del'>-		LONG_L	$18, GDB_FR_REG18(sp)</div><div class='del'>-		LONG_L	$17, GDB_FR_REG17(sp)</div><div class='del'>-		LONG_L	$16, GDB_FR_REG16(sp)</div><div class='del'>-		LONG_L	$15, GDB_FR_REG15(sp)</div><div class='del'>-		LONG_L	$14, GDB_FR_REG14(sp)</div><div class='del'>-		LONG_L	$13, GDB_FR_REG13(sp)</div><div class='del'>-		LONG_L	$12, GDB_FR_REG12(sp)</div><div class='del'>-		LONG_L	$11, GDB_FR_REG11(sp)</div><div class='del'>-		LONG_L	$10, GDB_FR_REG10(sp)</div><div class='del'>-		LONG_L	$9, GDB_FR_REG9(sp)</div><div class='del'>-		LONG_L	$8, GDB_FR_REG8(sp)</div><div class='del'>-		LONG_L	$7, GDB_FR_REG7(sp)</div><div class='del'>-		LONG_L	$6, GDB_FR_REG6(sp)</div><div class='del'>-		LONG_L	$5, GDB_FR_REG5(sp)</div><div class='del'>-		LONG_L	$4, GDB_FR_REG4(sp)</div><div class='del'>-		LONG_L	$3, GDB_FR_REG3(sp)</div><div class='del'>-		LONG_L	$2, GDB_FR_REG2(sp)</div><div class='del'>-		LONG_L	$1, GDB_FR_REG1(sp)</div><div class='del'>-#if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX)</div><div class='del'>-		LONG_L	k0, GDB_FR_EPC(sp)</div><div class='del'>-		LONG_L	$29, GDB_FR_REG29(sp)		/* Deallocate stack */</div><div class='del'>-		jr	k0</div><div class='del'>-		rfe</div><div class='del'>-#else</div><div class='del'>-		LONG_L	sp, GDB_FR_REG29(sp)		/* Deallocate stack */</div><div class='del'>-</div><div class='del'>-		.set	mips3</div><div class='del'>-		eret</div><div class='del'>-		.set	mips0</div><div class='del'>-#endif</div><div class='del'>-		.set	at</div><div class='del'>-		.set	reorder</div><div class='del'>-		END(trap_low)</div><div class='del'>-</div><div class='del'>-LEAF(kgdb_read_byte)</div><div class='del'>-4:		lb	t0, (a0)</div><div class='del'>-		sb	t0, (a1)</div><div class='del'>-		li	v0, 0</div><div class='del'>-		jr	ra</div><div class='del'>-		.section __ex_table,"a"</div><div class='del'>-		PTR	4b, kgdbfault</div><div class='del'>-		.previous</div><div class='del'>-		END(kgdb_read_byte)</div><div class='del'>-</div><div class='del'>-LEAF(kgdb_write_byte)</div><div class='del'>-5:		sb	a0, (a1)</div><div class='del'>-		li	v0, 0</div><div class='del'>-		jr	ra</div><div class='del'>-		.section __ex_table,"a"</div><div class='del'>-		PTR	5b, kgdbfault</div><div class='del'>-		.previous</div><div class='del'>-		END(kgdb_write_byte)</div><div class='del'>-</div><div class='del'>-		.type	kgdbfault@function</div><div class='del'>-		.ent	kgdbfault</div><div class='del'>-</div><div class='del'>-kgdbfault:	li	v0, -EFAULT</div><div class='del'>-		jr	ra</div><div class='del'>-		.end	kgdbfault</div><div class='head'>diff --git a/arch/mips/kernel/gdb-stub.c b/arch/mips/kernel/gdb-stub.c<br/>deleted file mode 100644<br/>index 25f4eab8ea9c..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/gdb-stub.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/kernel/gdb-stub.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1155 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/mips/kernel/gdb-stub.c</div><div class='del'>- *</div><div class='del'>- *  Originally written by Glenn Engel, Lake Stevens Instrument Division</div><div class='del'>- *</div><div class='del'>- *  Contributed by HP Systems</div><div class='del'>- *</div><div class='del'>- *  Modified for SPARC by Stu Grossman, Cygnus Support.</div><div class='del'>- *</div><div class='del'>- *  Modified for Linux/MIPS (and MIPS in general) by Andreas Busse</div><div class='del'>- *  Send complaints, suggestions etc. to &lt;andy@waldorf-gmbh.de&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 1995 Andreas Busse</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2003 MontaVista Software Inc.</div><div class='del'>- *  Author: Jun Sun, jsun@mvista.com or jsun@junsun.net</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  To enable debugger support, two things need to happen.  One, a</div><div class='del'>- *  call to set_debug_traps() is necessary in order to allow any breakpoints</div><div class='del'>- *  or error conditions to be properly intercepted and reported to gdb.</div><div class='del'>- *  Two, a breakpoint needs to be generated to begin communication.  This</div><div class='del'>- *  is most easily accomplished by a call to breakpoint().  Breakpoint()</div><div class='del'>- *  simulates a breakpoint by executing a BREAK instruction.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *    The following gdb commands are supported:</div><div class='del'>- *</div><div class='del'>- * command          function                               Return value</div><div class='del'>- *</div><div class='del'>- *    g             return the value of the CPU registers  hex data or ENN</div><div class='del'>- *    G             set the value of the CPU registers     OK or ENN</div><div class='del'>- *</div><div class='del'>- *    mAA..AA,LLLL  Read LLLL bytes at address AA..AA      hex data or ENN</div><div class='del'>- *    MAA..AA,LLLL: Write LLLL bytes at address AA.AA      OK or ENN</div><div class='del'>- *</div><div class='del'>- *    c             Resume at current address              SNN   ( signal NN)</div><div class='del'>- *    cAA..AA       Continue at address AA..AA             SNN</div><div class='del'>- *</div><div class='del'>- *    s             Step one instruction                   SNN</div><div class='del'>- *    sAA..AA       Step one instruction from AA..AA       SNN</div><div class='del'>- *</div><div class='del'>- *    k             kill</div><div class='del'>- *</div><div class='del'>- *    ?             What was the last sigval ?             SNN   (signal NN)</div><div class='del'>- *</div><div class='del'>- *    bBB..BB	    Set baud rate to BB..BB		   OK or BNN, then sets</div><div class='del'>- *							   baud rate</div><div class='del'>- *</div><div class='del'>- * All commands and responses are sent with a packet which includes a</div><div class='del'>- * checksum.  A packet consists of</div><div class='del'>- *</div><div class='del'>- * $&lt;packet info&gt;#&lt;checksum&gt;.</div><div class='del'>- *</div><div class='del'>- * where</div><div class='del'>- * &lt;packet info&gt; :: &lt;characters representing the command or response&gt;</div><div class='del'>- * &lt;checksum&gt;    :: &lt; two hex digits computed as modulo 256 sum of &lt;packetinfo&gt;&gt;</div><div class='del'>- *</div><div class='del'>- * When a packet is received, it is first acknowledged with either '+' or '-'.</div><div class='del'>- * '+' indicates a successful transfer.  '-' indicates a failed transfer.</div><div class='del'>- *</div><div class='del'>- * Example:</div><div class='del'>- *</div><div class='del'>- * Host:                  Reply:</div><div class='del'>- * $m0,10#2a               +$00010203040506070809101112131415#42</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *  ==============</div><div class='del'>- *  MORE EXAMPLES:</div><div class='del'>- *  ==============</div><div class='del'>- *</div><div class='del'>- *  For reference -- the following are the steps that one</div><div class='del'>- *  company took (RidgeRun Inc) to get remote gdb debugging</div><div class='del'>- *  going. In this scenario the host machine was a PC and the</div><div class='del'>- *  target platform was a Galileo EVB64120A MIPS evaluation</div><div class='del'>- *  board.</div><div class='del'>- *</div><div class='del'>- *  Step 1:</div><div class='del'>- *  First download gdb-5.0.tar.gz from the internet.</div><div class='del'>- *  and then build/install the package.</div><div class='del'>- *</div><div class='del'>- *  Example:</div><div class='del'>- *    $ tar zxf gdb-5.0.tar.gz</div><div class='del'>- *    $ cd gdb-5.0</div><div class='del'>- *    $ ./configure --target=mips-linux-elf</div><div class='del'>- *    $ make</div><div class='del'>- *    $ install</div><div class='del'>- *    $ which mips-linux-elf-gdb</div><div class='del'>- *    /usr/local/bin/mips-linux-elf-gdb</div><div class='del'>- *</div><div class='del'>- *  Step 2:</div><div class='del'>- *  Configure linux for remote debugging and build it.</div><div class='del'>- *</div><div class='del'>- *  Example:</div><div class='del'>- *    $ cd ~/linux</div><div class='del'>- *    $ make menuconfig &lt;go to "Kernel Hacking" and turn on remote debugging&gt;</div><div class='del'>- *    $ make</div><div class='del'>- *</div><div class='del'>- *  Step 3:</div><div class='del'>- *  Download the kernel to the remote target and start</div><div class='del'>- *  the kernel running. It will promptly halt and wait</div><div class='del'>- *  for the host gdb session to connect. It does this</div><div class='del'>- *  since the "Kernel Hacking" option has defined</div><div class='del'>- *  CONFIG_KGDB which in turn enables your calls</div><div class='del'>- *  to:</div><div class='del'>- *     set_debug_traps();</div><div class='del'>- *     breakpoint();</div><div class='del'>- *</div><div class='del'>- *  Step 4:</div><div class='del'>- *  Start the gdb session on the host.</div><div class='del'>- *</div><div class='del'>- *  Example:</div><div class='del'>- *    $ mips-linux-elf-gdb vmlinux</div><div class='del'>- *    (gdb) set remotebaud 115200</div><div class='del'>- *    (gdb) target remote /dev/ttyS1</div><div class='del'>- *    ...at this point you are connected to</div><div class='del'>- *       the remote target and can use gdb</div><div class='del'>- *       in the normal fasion. Setting</div><div class='del'>- *       breakpoints, single stepping,</div><div class='del'>- *       printing variables, etc.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/console.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/smp.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/reboot.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/asm.h&gt;</div><div class='del'>-#include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/mipsregs.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/gdb-stub.h&gt;</div><div class='del'>-#include &lt;asm/inst.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * external low-level support routines</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-extern int putDebugChar(char c);    /* write a single character      */</div><div class='del'>-extern char getDebugChar(void);     /* read and return a single char */</div><div class='del'>-extern void trap_low(void);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * breakpoint and test functions</div><div class='del'>- */</div><div class='del'>-extern void breakpoint(void);</div><div class='del'>-extern void breakinst(void);</div><div class='del'>-extern void async_breakpoint(void);</div><div class='del'>-extern void async_breakinst(void);</div><div class='del'>-extern void adel(void);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * local prototypes</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void getpacket(char *buffer);</div><div class='del'>-static void putpacket(char *buffer);</div><div class='del'>-static int computeSignal(int tt);</div><div class='del'>-static int hex(unsigned char ch);</div><div class='del'>-static int hexToInt(char **ptr, int *intValue);</div><div class='del'>-static int hexToLong(char **ptr, long *longValue);</div><div class='del'>-static unsigned char *mem2hex(char *mem, char *buf, int count, int may_fault);</div><div class='del'>-void handle_exception(struct gdb_regs *regs);</div><div class='del'>-</div><div class='del'>-int kgdb_enabled;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * spin locks for smp case</div><div class='del'>- */</div><div class='del'>-static DEFINE_SPINLOCK(kgdb_lock);</div><div class='del'>-static raw_spinlock_t kgdb_cpulock[NR_CPUS] = {</div><div class='del'>-	[0 ... NR_CPUS-1] = __RAW_SPIN_LOCK_UNLOCKED,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BUFMAX defines the maximum number of characters in inbound/outbound buffers</div><div class='del'>- * at least NUMREGBYTES*2 are needed for register packets</div><div class='del'>- */</div><div class='del'>-#define BUFMAX 2048</div><div class='del'>-</div><div class='del'>-static char input_buffer[BUFMAX];</div><div class='del'>-static char output_buffer[BUFMAX];</div><div class='del'>-static int initialized;	/* !0 means we've been initialized */</div><div class='del'>-static int kgdb_started;</div><div class='del'>-static const char hexchars[]="0123456789abcdef";</div><div class='del'>-</div><div class='del'>-/* Used to prevent crashes in memory access.  Note that they'll crash anyway if</div><div class='del'>-   we haven't set up fault handlers yet... */</div><div class='del'>-int kgdb_read_byte(unsigned char *address, unsigned char *dest);</div><div class='del'>-int kgdb_write_byte(unsigned char val, unsigned char *dest);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert ch from a hex digit to an int</div><div class='del'>- */</div><div class='del'>-static int hex(unsigned char ch)</div><div class='del'>-{</div><div class='del'>-	if (ch &gt;= 'a' &amp;&amp; ch &lt;= 'f')</div><div class='del'>-		return ch-'a'+10;</div><div class='del'>-	if (ch &gt;= '0' &amp;&amp; ch &lt;= '9')</div><div class='del'>-		return ch-'0';</div><div class='del'>-	if (ch &gt;= 'A' &amp;&amp; ch &lt;= 'F')</div><div class='del'>-		return ch-'A'+10;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * scan for the sequence $&lt;data&gt;#&lt;checksum&gt;</div><div class='del'>- */</div><div class='del'>-static void getpacket(char *buffer)</div><div class='del'>-{</div><div class='del'>-	unsigned char checksum;</div><div class='del'>-	unsigned char xmitcsum;</div><div class='del'>-	int i;</div><div class='del'>-	int count;</div><div class='del'>-	unsigned char ch;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		/*</div><div class='del'>-		 * wait around for the start character,</div><div class='del'>-		 * ignore all other characters</div><div class='del'>-		 */</div><div class='del'>-		while ((ch = (getDebugChar() &amp; 0x7f)) != '$') ;</div><div class='del'>-</div><div class='del'>-		checksum = 0;</div><div class='del'>-		xmitcsum = -1;</div><div class='del'>-		count = 0;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * now, read until a # or end of buffer is found</div><div class='del'>-		 */</div><div class='del'>-		while (count &lt; BUFMAX) {</div><div class='del'>-			ch = getDebugChar();</div><div class='del'>-			if (ch == '#')</div><div class='del'>-				break;</div><div class='del'>-			checksum = checksum + ch;</div><div class='del'>-			buffer[count] = ch;</div><div class='del'>-			count = count + 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (count &gt;= BUFMAX)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		buffer[count] = 0;</div><div class='del'>-</div><div class='del'>-		if (ch == '#') {</div><div class='del'>-			xmitcsum = hex(getDebugChar() &amp; 0x7f) &lt;&lt; 4;</div><div class='del'>-			xmitcsum |= hex(getDebugChar() &amp; 0x7f);</div><div class='del'>-</div><div class='del'>-			if (checksum != xmitcsum)</div><div class='del'>-				putDebugChar('-');	/* failed checksum */</div><div class='del'>-			else {</div><div class='del'>-				putDebugChar('+'); /* successful transfer */</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 * if a sequence char is present,</div><div class='del'>-				 * reply the sequence ID</div><div class='del'>-				 */</div><div class='del'>-				if (buffer[2] == ':') {</div><div class='del'>-					putDebugChar(buffer[0]);</div><div class='del'>-					putDebugChar(buffer[1]);</div><div class='del'>-</div><div class='del'>-					/*</div><div class='del'>-					 * remove sequence chars from buffer</div><div class='del'>-					 */</div><div class='del'>-					count = strlen(buffer);</div><div class='del'>-					for (i=3; i &lt;= count; i++)</div><div class='del'>-						buffer[i-3] = buffer[i];</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	while (checksum != xmitcsum);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * send the packet in buffer.</div><div class='del'>- */</div><div class='del'>-static void putpacket(char *buffer)</div><div class='del'>-{</div><div class='del'>-	unsigned char checksum;</div><div class='del'>-	int count;</div><div class='del'>-	unsigned char ch;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * $&lt;packet info&gt;#&lt;checksum&gt;.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		putDebugChar('$');</div><div class='del'>-		checksum = 0;</div><div class='del'>-		count = 0;</div><div class='del'>-</div><div class='del'>-		while ((ch = buffer[count]) != 0) {</div><div class='del'>-			if (!(putDebugChar(ch)))</div><div class='del'>-				return;</div><div class='del'>-			checksum += ch;</div><div class='del'>-			count += 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		putDebugChar('#');</div><div class='del'>-		putDebugChar(hexchars[checksum &gt;&gt; 4]);</div><div class='del'>-		putDebugChar(hexchars[checksum &amp; 0xf]);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	while ((getDebugChar() &amp; 0x7f) != '+');</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert the memory pointed to by mem into hex, placing result in buf.</div><div class='del'>- * Return a pointer to the last char put in buf (null), in case of mem fault,</div><div class='del'>- * return 0.</div><div class='del'>- * may_fault is non-zero if we are reading from arbitrary memory, but is currently</div><div class='del'>- * not used.</div><div class='del'>- */</div><div class='del'>-static unsigned char *mem2hex(char *mem, char *buf, int count, int may_fault)</div><div class='del'>-{</div><div class='del'>-	unsigned char ch;</div><div class='del'>-</div><div class='del'>-	while (count-- &gt; 0) {</div><div class='del'>-		if (kgdb_read_byte(mem++, &amp;ch) != 0)</div><div class='del'>-			return 0;</div><div class='del'>-		*buf++ = hexchars[ch &gt;&gt; 4];</div><div class='del'>-		*buf++ = hexchars[ch &amp; 0xf];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*buf = 0;</div><div class='del'>-</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * convert the hex array pointed to by buf into binary to be placed in mem</div><div class='del'>- * return a pointer to the character AFTER the last byte written</div><div class='del'>- * may_fault is non-zero if we are reading from arbitrary memory, but is currently</div><div class='del'>- * not used.</div><div class='del'>- */</div><div class='del'>-static char *hex2mem(char *buf, char *mem, int count, int binary, int may_fault)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned char ch;</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;count; i++)</div><div class='del'>-	{</div><div class='del'>-		if (binary) {</div><div class='del'>-			ch = *buf++;</div><div class='del'>-			if (ch == 0x7d)</div><div class='del'>-				ch = 0x20 ^ *buf++;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			ch = hex(*buf++) &lt;&lt; 4;</div><div class='del'>-			ch |= hex(*buf++);</div><div class='del'>-		}</div><div class='del'>-		if (kgdb_write_byte(ch, mem++) != 0)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mem;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This table contains the mapping between SPARC hardware trap types, and</div><div class='del'>- * signals, which are primarily what GDB understands.  It also indicates</div><div class='del'>- * which hardware traps we need to commandeer when initializing the stub.</div><div class='del'>- */</div><div class='del'>-static struct hard_trap_info {</div><div class='del'>-	unsigned char tt;		/* Trap type code for MIPS R3xxx and R4xxx */</div><div class='del'>-	unsigned char signo;		/* Signal that we map this trap into */</div><div class='del'>-} hard_trap_info[] = {</div><div class='del'>-	{ 6, SIGBUS },			/* instruction bus error */</div><div class='del'>-	{ 7, SIGBUS },			/* data bus error */</div><div class='del'>-	{ 9, SIGTRAP },			/* break */</div><div class='del'>-	{ 10, SIGILL },			/* reserved instruction */</div><div class='del'>-/*	{ 11, SIGILL },		*/	/* CPU unusable */</div><div class='del'>-	{ 12, SIGFPE },			/* overflow */</div><div class='del'>-	{ 13, SIGTRAP },		/* trap */</div><div class='del'>-	{ 14, SIGSEGV },		/* virtual instruction cache coherency */</div><div class='del'>-	{ 15, SIGFPE },			/* floating point exception */</div><div class='del'>-	{ 23, SIGSEGV },		/* watch */</div><div class='del'>-	{ 31, SIGSEGV },		/* virtual data cache coherency */</div><div class='del'>-	{ 0, 0}				/* Must be last */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Save the normal trap handlers for user-mode traps. */</div><div class='del'>-void *saved_vectors[32];</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set up exception handlers for tracing and breakpoints</div><div class='del'>- */</div><div class='del'>-void set_debug_traps(void)</div><div class='del'>-{</div><div class='del'>-	struct hard_trap_info *ht;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned char c;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	for (ht = hard_trap_info; ht-&gt;tt &amp;&amp; ht-&gt;signo; ht++)</div><div class='del'>-		saved_vectors[ht-&gt;tt] = set_except_vector(ht-&gt;tt, trap_low);</div><div class='del'>-</div><div class='del'>-	putDebugChar('+'); /* 'hello world' */</div><div class='del'>-	/*</div><div class='del'>-	 * In case GDB is started before us, ack any packets</div><div class='del'>-	 * (presumably "$?#xx") sitting there.</div><div class='del'>-	 */</div><div class='del'>-	while((c = getDebugChar()) != '$');</div><div class='del'>-	while((c = getDebugChar()) != '#');</div><div class='del'>-	c = getDebugChar(); /* eat first csum byte */</div><div class='del'>-	c = getDebugChar(); /* eat second csum byte */</div><div class='del'>-	putDebugChar('+'); /* ack it */</div><div class='del'>-</div><div class='del'>-	initialized = 1;</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void restore_debug_traps(void)</div><div class='del'>-{</div><div class='del'>-	struct hard_trap_info *ht;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	for (ht = hard_trap_info; ht-&gt;tt &amp;&amp; ht-&gt;signo; ht++)</div><div class='del'>-		set_except_vector(ht-&gt;tt, saved_vectors[ht-&gt;tt]);</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert the MIPS hardware trap type code to a Unix signal number.</div><div class='del'>- */</div><div class='del'>-static int computeSignal(int tt)</div><div class='del'>-{</div><div class='del'>-	struct hard_trap_info *ht;</div><div class='del'>-</div><div class='del'>-	for (ht = hard_trap_info; ht-&gt;tt &amp;&amp; ht-&gt;signo; ht++)</div><div class='del'>-		if (ht-&gt;tt == tt)</div><div class='del'>-			return ht-&gt;signo;</div><div class='del'>-</div><div class='del'>-	return SIGHUP;		/* default for things we don't know about */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * While we find nice hex chars, build an int.</div><div class='del'>- * Return number of chars processed.</div><div class='del'>- */</div><div class='del'>-static int hexToInt(char **ptr, int *intValue)</div><div class='del'>-{</div><div class='del'>-	int numChars = 0;</div><div class='del'>-	int hexValue;</div><div class='del'>-</div><div class='del'>-	*intValue = 0;</div><div class='del'>-</div><div class='del'>-	while (**ptr) {</div><div class='del'>-		hexValue = hex(**ptr);</div><div class='del'>-		if (hexValue &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		*intValue = (*intValue &lt;&lt; 4) | hexValue;</div><div class='del'>-		numChars ++;</div><div class='del'>-</div><div class='del'>-		(*ptr)++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (numChars);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hexToLong(char **ptr, long *longValue)</div><div class='del'>-{</div><div class='del'>-	int numChars = 0;</div><div class='del'>-	int hexValue;</div><div class='del'>-</div><div class='del'>-	*longValue = 0;</div><div class='del'>-</div><div class='del'>-	while (**ptr) {</div><div class='del'>-		hexValue = hex(**ptr);</div><div class='del'>-		if (hexValue &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		*longValue = (*longValue &lt;&lt; 4) | hexValue;</div><div class='del'>-		numChars ++;</div><div class='del'>-</div><div class='del'>-		(*ptr)++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return numChars;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/*</div><div class='del'>- * Print registers (on target console)</div><div class='del'>- * Used only to debug the stub...</div><div class='del'>- */</div><div class='del'>-void show_gdbregs(struct gdb_regs * regs)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Saved main processor registers</div><div class='del'>-	 */</div><div class='del'>-	printk("$0 : %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",</div><div class='del'>-	       regs-&gt;reg0, regs-&gt;reg1, regs-&gt;reg2, regs-&gt;reg3,</div><div class='del'>-	       regs-&gt;reg4, regs-&gt;reg5, regs-&gt;reg6, regs-&gt;reg7);</div><div class='del'>-	printk("$8 : %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",</div><div class='del'>-	       regs-&gt;reg8, regs-&gt;reg9, regs-&gt;reg10, regs-&gt;reg11,</div><div class='del'>-	       regs-&gt;reg12, regs-&gt;reg13, regs-&gt;reg14, regs-&gt;reg15);</div><div class='del'>-	printk("$16: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",</div><div class='del'>-	       regs-&gt;reg16, regs-&gt;reg17, regs-&gt;reg18, regs-&gt;reg19,</div><div class='del'>-	       regs-&gt;reg20, regs-&gt;reg21, regs-&gt;reg22, regs-&gt;reg23);</div><div class='del'>-	printk("$24: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",</div><div class='del'>-	       regs-&gt;reg24, regs-&gt;reg25, regs-&gt;reg26, regs-&gt;reg27,</div><div class='del'>-	       regs-&gt;reg28, regs-&gt;reg29, regs-&gt;reg30, regs-&gt;reg31);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Saved cp0 registers</div><div class='del'>-	 */</div><div class='del'>-	printk("epc  : %08lx\nStatus: %08lx\nCause : %08lx\n",</div><div class='del'>-	       regs-&gt;cp0_epc, regs-&gt;cp0_status, regs-&gt;cp0_cause);</div><div class='del'>-}</div><div class='del'>-#endif /* dead code */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We single-step by setting breakpoints. When an exception</div><div class='del'>- * is handled, we need to restore the instructions hoisted</div><div class='del'>- * when the breakpoints were set.</div><div class='del'>- *</div><div class='del'>- * This is where we save the original instructions.</div><div class='del'>- */</div><div class='del'>-static struct gdb_bp_save {</div><div class='del'>-	unsigned long addr;</div><div class='del'>-	unsigned int val;</div><div class='del'>-} step_bp[2];</div><div class='del'>-</div><div class='del'>-#define BP 0x0000000d  /* break opcode */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set breakpoint instructions for single stepping.</div><div class='del'>- */</div><div class='del'>-static void single_step(struct gdb_regs *regs)</div><div class='del'>-{</div><div class='del'>-	union mips_instruction insn;</div><div class='del'>-	unsigned long targ;</div><div class='del'>-	int is_branch, is_cond, i;</div><div class='del'>-</div><div class='del'>-	targ = regs-&gt;cp0_epc;</div><div class='del'>-	insn.word = *(unsigned int *)targ;</div><div class='del'>-	is_branch = is_cond = 0;</div><div class='del'>-</div><div class='del'>-	switch (insn.i_format.opcode) {</div><div class='del'>-	/*</div><div class='del'>-	 * jr and jalr are in r_format format.</div><div class='del'>-	 */</div><div class='del'>-	case spec_op:</div><div class='del'>-		switch (insn.r_format.func) {</div><div class='del'>-		case jalr_op:</div><div class='del'>-		case jr_op:</div><div class='del'>-			targ = *(&amp;regs-&gt;reg0 + insn.r_format.rs);</div><div class='del'>-			is_branch = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This group contains:</div><div class='del'>-	 * bltz_op, bgez_op, bltzl_op, bgezl_op,</div><div class='del'>-	 * bltzal_op, bgezal_op, bltzall_op, bgezall_op.</div><div class='del'>-	 */</div><div class='del'>-	case bcond_op:</div><div class='del'>-		is_branch = is_cond = 1;</div><div class='del'>-		targ += 4 + (insn.i_format.simmediate &lt;&lt; 2);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * These are unconditional and in j_format.</div><div class='del'>-	 */</div><div class='del'>-	case jal_op:</div><div class='del'>-	case j_op:</div><div class='del'>-		is_branch = 1;</div><div class='del'>-		targ += 4;</div><div class='del'>-		targ &gt;&gt;= 28;</div><div class='del'>-		targ &lt;&lt;= 28;</div><div class='del'>-		targ |= (insn.j_format.target &lt;&lt; 2);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * These are conditional.</div><div class='del'>-	 */</div><div class='del'>-	case beq_op:</div><div class='del'>-	case beql_op:</div><div class='del'>-	case bne_op:</div><div class='del'>-	case bnel_op:</div><div class='del'>-	case blez_op:</div><div class='del'>-	case blezl_op:</div><div class='del'>-	case bgtz_op:</div><div class='del'>-	case bgtzl_op:</div><div class='del'>-	case cop0_op:</div><div class='del'>-	case cop1_op:</div><div class='del'>-	case cop2_op:</div><div class='del'>-	case cop1x_op:</div><div class='del'>-		is_branch = is_cond = 1;</div><div class='del'>-		targ += 4 + (insn.i_format.simmediate &lt;&lt; 2);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (is_branch) {</div><div class='del'>-		i = 0;</div><div class='del'>-		if (is_cond &amp;&amp; targ != (regs-&gt;cp0_epc + 8)) {</div><div class='del'>-			step_bp[i].addr = regs-&gt;cp0_epc + 8;</div><div class='del'>-			step_bp[i++].val = *(unsigned *)(regs-&gt;cp0_epc + 8);</div><div class='del'>-			*(unsigned *)(regs-&gt;cp0_epc + 8) = BP;</div><div class='del'>-		}</div><div class='del'>-		step_bp[i].addr = targ;</div><div class='del'>-		step_bp[i].val  = *(unsigned *)targ;</div><div class='del'>-		*(unsigned *)targ = BP;</div><div class='del'>-	} else {</div><div class='del'>-		step_bp[0].addr = regs-&gt;cp0_epc + 4;</div><div class='del'>-		step_bp[0].val  = *(unsigned *)(regs-&gt;cp0_epc + 4);</div><div class='del'>-		*(unsigned *)(regs-&gt;cp0_epc + 4) = BP;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  If asynchronously interrupted by gdb, then we need to set a breakpoint</div><div class='del'>- *  at the interrupted instruction so that we wind up stopped with a</div><div class='del'>- *  reasonable stack frame.</div><div class='del'>- */</div><div class='del'>-static struct gdb_bp_save async_bp;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Swap the interrupted EPC with our asynchronous breakpoint routine.</div><div class='del'>- * This is safer than stuffing the breakpoint in-place, since no cache</div><div class='del'>- * flushes (or resulting smp_call_functions) are required.  The</div><div class='del'>- * assumption is that only one CPU will be handling asynchronous bp's,</div><div class='del'>- * and only one can be active at a time.</div><div class='del'>- */</div><div class='del'>-extern spinlock_t smp_call_lock;</div><div class='del'>-</div><div class='del'>-void set_async_breakpoint(unsigned long *epc)</div><div class='del'>-{</div><div class='del'>-	/* skip breaking into userland */</div><div class='del'>-	if ((*epc &amp; 0x80000000) == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	/* avoid deadlock if someone is make IPC */</div><div class='del'>-	if (spin_is_locked(&amp;smp_call_lock))</div><div class='del'>-		return;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	async_bp.addr = *epc;</div><div class='del'>-	*epc = (unsigned long)async_breakpoint;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-static void kgdb_wait(void *arg)</div><div class='del'>-{</div><div class='del'>-	unsigned flags;</div><div class='del'>-	int cpu = smp_processor_id();</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	__raw_spin_lock(&amp;kgdb_cpulock[cpu]);</div><div class='del'>-	__raw_spin_unlock(&amp;kgdb_cpulock[cpu]);</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * GDB stub needs to call kgdb_wait on all processor with interrupts</div><div class='del'>- * disabled, so it uses it's own special variant.</div><div class='del'>- */</div><div class='del'>-static int kgdb_smp_call_kgdb_wait(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	cpumask_t mask = cpu_online_map;</div><div class='del'>-	struct call_data_struct data;</div><div class='del'>-	int cpu = smp_processor_id();</div><div class='del'>-	int cpus;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Can die spectacularly if this CPU isn't yet marked online</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(!cpu_online(cpu));</div><div class='del'>-</div><div class='del'>-	cpu_clear(cpu, mask);</div><div class='del'>-	cpus = cpus_weight(mask);</div><div class='del'>-	if (!cpus)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (spin_is_locked(&amp;smp_call_lock)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Some other processor is trying to make us do something</div><div class='del'>-		 * but we're not going to respond... give up</div><div class='del'>-		 */</div><div class='del'>-		return -1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We will continue here, accepting the fact that</div><div class='del'>-	 * the kernel may deadlock if another CPU attempts</div><div class='del'>-	 * to call smp_call_function now...</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	data.func = kgdb_wait;</div><div class='del'>-	data.info = NULL;</div><div class='del'>-	atomic_set(&amp;data.started, 0);</div><div class='del'>-	data.wait = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;smp_call_lock);</div><div class='del'>-	call_data = &amp;data;</div><div class='del'>-	mb();</div><div class='del'>-</div><div class='del'>-	core_send_ipi_mask(mask, SMP_CALL_FUNCTION);</div><div class='del'>-</div><div class='del'>-	/* Wait for response */</div><div class='del'>-	/* FIXME: lock-up detection, backtrace on lock-up */</div><div class='del'>-	while (atomic_read(&amp;data.started) != cpus)</div><div class='del'>-		barrier();</div><div class='del'>-</div><div class='del'>-	call_data = NULL;</div><div class='del'>-	spin_unlock(&amp;smp_call_lock);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function does all command processing for interfacing to gdb.  It</div><div class='del'>- * returns 1 if you should skip the instruction at the trap address, 0</div><div class='del'>- * otherwise.</div><div class='del'>- */</div><div class='del'>-void handle_exception(struct gdb_regs *regs)</div><div class='del'>-{</div><div class='del'>-	int trap;			/* Trap type */</div><div class='del'>-	int sigval;</div><div class='del'>-	long addr;</div><div class='del'>-	int length;</div><div class='del'>-	char *ptr;</div><div class='del'>-	unsigned long *stack;</div><div class='del'>-	int i;</div><div class='del'>-	int bflag = 0;</div><div class='del'>-</div><div class='del'>-	kgdb_started = 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * acquire the big kgdb spinlock</div><div class='del'>-	 */</div><div class='del'>-	if (!spin_trylock(&amp;kgdb_lock)) {</div><div class='del'>-		/*</div><div class='del'>-		 * some other CPU has the lock, we should go back to</div><div class='del'>-		 * receive the gdb_wait IPC</div><div class='del'>-		 */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we're in async_breakpoint(), restore the real EPC from</div><div class='del'>-	 * the breakpoint.</div><div class='del'>-	 */</div><div class='del'>-	if (regs-&gt;cp0_epc == (unsigned long)async_breakinst) {</div><div class='del'>-		regs-&gt;cp0_epc = async_bp.addr;</div><div class='del'>-		async_bp.addr = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * acquire the CPU spinlocks</div><div class='del'>-	 */</div><div class='del'>-	for_each_online_cpu(i)</div><div class='del'>-		if (__raw_spin_trylock(&amp;kgdb_cpulock[i]) == 0)</div><div class='del'>-			panic("kgdb: couldn't get cpulock %d\n", i);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * force other cpus to enter kgdb</div><div class='del'>-	 */</div><div class='del'>-	kgdb_smp_call_kgdb_wait();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we're in breakpoint() increment the PC</div><div class='del'>-	 */</div><div class='del'>-	trap = (regs-&gt;cp0_cause &amp; 0x7c) &gt;&gt; 2;</div><div class='del'>-	if (trap == 9 &amp;&amp; regs-&gt;cp0_epc == (unsigned long)breakinst)</div><div class='del'>-		regs-&gt;cp0_epc += 4;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we were single_stepping, restore the opcodes hoisted</div><div class='del'>-	 * for the breakpoint[s].</div><div class='del'>-	 */</div><div class='del'>-	if (step_bp[0].addr) {</div><div class='del'>-		*(unsigned *)step_bp[0].addr = step_bp[0].val;</div><div class='del'>-		step_bp[0].addr = 0;</div><div class='del'>-</div><div class='del'>-		if (step_bp[1].addr) {</div><div class='del'>-			*(unsigned *)step_bp[1].addr = step_bp[1].val;</div><div class='del'>-			step_bp[1].addr = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stack = (long *)regs-&gt;reg29;			/* stack ptr */</div><div class='del'>-	sigval = computeSignal(trap);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * reply to host that an exception has occurred</div><div class='del'>-	 */</div><div class='del'>-	ptr = output_buffer;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Send trap type (converted to signal)</div><div class='del'>-	 */</div><div class='del'>-	*ptr++ = 'T';</div><div class='del'>-	*ptr++ = hexchars[sigval &gt;&gt; 4];</div><div class='del'>-	*ptr++ = hexchars[sigval &amp; 0xf];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Send Error PC</div><div class='del'>-	 */</div><div class='del'>-	*ptr++ = hexchars[REG_EPC &gt;&gt; 4];</div><div class='del'>-	*ptr++ = hexchars[REG_EPC &amp; 0xf];</div><div class='del'>-	*ptr++ = ':';</div><div class='del'>-	ptr = mem2hex((char *)&amp;regs-&gt;cp0_epc, ptr, sizeof(long), 0);</div><div class='del'>-	*ptr++ = ';';</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Send frame pointer</div><div class='del'>-	 */</div><div class='del'>-	*ptr++ = hexchars[REG_FP &gt;&gt; 4];</div><div class='del'>-	*ptr++ = hexchars[REG_FP &amp; 0xf];</div><div class='del'>-	*ptr++ = ':';</div><div class='del'>-	ptr = mem2hex((char *)&amp;regs-&gt;reg30, ptr, sizeof(long), 0);</div><div class='del'>-	*ptr++ = ';';</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Send stack pointer</div><div class='del'>-	 */</div><div class='del'>-	*ptr++ = hexchars[REG_SP &gt;&gt; 4];</div><div class='del'>-	*ptr++ = hexchars[REG_SP &amp; 0xf];</div><div class='del'>-	*ptr++ = ':';</div><div class='del'>-	ptr = mem2hex((char *)&amp;regs-&gt;reg29, ptr, sizeof(long), 0);</div><div class='del'>-	*ptr++ = ';';</div><div class='del'>-</div><div class='del'>-	*ptr++ = 0;</div><div class='del'>-	putpacket(output_buffer);	/* send it off... */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Wait for input from remote GDB</div><div class='del'>-	 */</div><div class='del'>-	while (1) {</div><div class='del'>-		output_buffer[0] = 0;</div><div class='del'>-		getpacket(input_buffer);</div><div class='del'>-</div><div class='del'>-		switch (input_buffer[0])</div><div class='del'>-		{</div><div class='del'>-		case '?':</div><div class='del'>-			output_buffer[0] = 'S';</div><div class='del'>-			output_buffer[1] = hexchars[sigval &gt;&gt; 4];</div><div class='del'>-			output_buffer[2] = hexchars[sigval &amp; 0xf];</div><div class='del'>-			output_buffer[3] = 0;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Detach debugger; let CPU run</div><div class='del'>-		 */</div><div class='del'>-		case 'D':</div><div class='del'>-			putpacket(output_buffer);</div><div class='del'>-			goto finish_kgdb;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case 'd':</div><div class='del'>-			/* toggle debug flag */</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Return the value of the CPU registers</div><div class='del'>-		 */</div><div class='del'>-		case 'g':</div><div class='del'>-			ptr = output_buffer;</div><div class='del'>-			ptr = mem2hex((char *)&amp;regs-&gt;reg0, ptr, 32*sizeof(long), 0); /* r0...r31 */</div><div class='del'>-			ptr = mem2hex((char *)&amp;regs-&gt;cp0_status, ptr, 6*sizeof(long), 0); /* cp0 */</div><div class='del'>-			ptr = mem2hex((char *)&amp;regs-&gt;fpr0, ptr, 32*sizeof(long), 0); /* f0...31 */</div><div class='del'>-			ptr = mem2hex((char *)&amp;regs-&gt;cp1_fsr, ptr, 2*sizeof(long), 0); /* cp1 */</div><div class='del'>-			ptr = mem2hex((char *)&amp;regs-&gt;frame_ptr, ptr, 2*sizeof(long), 0); /* frp */</div><div class='del'>-			ptr = mem2hex((char *)&amp;regs-&gt;cp0_index, ptr, 16*sizeof(long), 0); /* cp0 */</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * set the value of the CPU registers - return OK</div><div class='del'>-		 */</div><div class='del'>-		case 'G':</div><div class='del'>-		{</div><div class='del'>-			ptr = &amp;input_buffer[1];</div><div class='del'>-			hex2mem(ptr, (char *)&amp;regs-&gt;reg0, 32*sizeof(long), 0, 0);</div><div class='del'>-			ptr += 32*(2*sizeof(long));</div><div class='del'>-			hex2mem(ptr, (char *)&amp;regs-&gt;cp0_status, 6*sizeof(long), 0, 0);</div><div class='del'>-			ptr += 6*(2*sizeof(long));</div><div class='del'>-			hex2mem(ptr, (char *)&amp;regs-&gt;fpr0, 32*sizeof(long), 0, 0);</div><div class='del'>-			ptr += 32*(2*sizeof(long));</div><div class='del'>-			hex2mem(ptr, (char *)&amp;regs-&gt;cp1_fsr, 2*sizeof(long), 0, 0);</div><div class='del'>-			ptr += 2*(2*sizeof(long));</div><div class='del'>-			hex2mem(ptr, (char *)&amp;regs-&gt;frame_ptr, 2*sizeof(long), 0, 0);</div><div class='del'>-			ptr += 2*(2*sizeof(long));</div><div class='del'>-			hex2mem(ptr, (char *)&amp;regs-&gt;cp0_index, 16*sizeof(long), 0, 0);</div><div class='del'>-			strcpy(output_buffer, "OK");</div><div class='del'>-		 }</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * mAA..AA,LLLL  Read LLLL bytes at address AA..AA</div><div class='del'>-		 */</div><div class='del'>-		case 'm':</div><div class='del'>-			ptr = &amp;input_buffer[1];</div><div class='del'>-</div><div class='del'>-			if (hexToLong(&amp;ptr, &amp;addr)</div><div class='del'>-				&amp;&amp; *ptr++ == ','</div><div class='del'>-				&amp;&amp; hexToInt(&amp;ptr, &amp;length)) {</div><div class='del'>-				if (mem2hex((char *)addr, output_buffer, length, 1))</div><div class='del'>-					break;</div><div class='del'>-				strcpy(output_buffer, "E03");</div><div class='del'>-			} else</div><div class='del'>-				strcpy(output_buffer, "E01");</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * XAA..AA,LLLL: Write LLLL escaped binary bytes at address AA.AA</div><div class='del'>-		 */</div><div class='del'>-		case 'X':</div><div class='del'>-			bflag = 1;</div><div class='del'>-			/* fall through */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * MAA..AA,LLLL: Write LLLL bytes at address AA.AA return OK</div><div class='del'>-		 */</div><div class='del'>-		case 'M':</div><div class='del'>-			ptr = &amp;input_buffer[1];</div><div class='del'>-</div><div class='del'>-			if (hexToLong(&amp;ptr, &amp;addr)</div><div class='del'>-				&amp;&amp; *ptr++ == ','</div><div class='del'>-				&amp;&amp; hexToInt(&amp;ptr, &amp;length)</div><div class='del'>-				&amp;&amp; *ptr++ == ':') {</div><div class='del'>-				if (hex2mem(ptr, (char *)addr, length, bflag, 1))</div><div class='del'>-					strcpy(output_buffer, "OK");</div><div class='del'>-				else</div><div class='del'>-					strcpy(output_buffer, "E03");</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-				strcpy(output_buffer, "E02");</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * cAA..AA    Continue at address AA..AA(optional)</div><div class='del'>-		 */</div><div class='del'>-		case 'c':</div><div class='del'>-			/* try to read optional parameter, pc unchanged if no parm */</div><div class='del'>-</div><div class='del'>-			ptr = &amp;input_buffer[1];</div><div class='del'>-			if (hexToLong(&amp;ptr, &amp;addr))</div><div class='del'>-				regs-&gt;cp0_epc = addr;</div><div class='del'>-</div><div class='del'>-			goto exit_kgdb_exception;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * kill the program; let us try to restart the machine</div><div class='del'>-		 * Reset the whole machine.</div><div class='del'>-		 */</div><div class='del'>-		case 'k':</div><div class='del'>-		case 'r':</div><div class='del'>-			machine_restart("kgdb restarts machine");</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Step to next instruction</div><div class='del'>-		 */</div><div class='del'>-		case 's':</div><div class='del'>-			/*</div><div class='del'>-			 * There is no single step insn in the MIPS ISA, so we</div><div class='del'>-			 * use breakpoints and continue, instead.</div><div class='del'>-			 */</div><div class='del'>-			single_step(regs);</div><div class='del'>-			goto exit_kgdb_exception;</div><div class='del'>-			/* NOTREACHED */</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Set baud rate (bBB)</div><div class='del'>-		 * FIXME: Needs to be written</div><div class='del'>-		 */</div><div class='del'>-		case 'b':</div><div class='del'>-		{</div><div class='del'>-#if 0</div><div class='del'>-			int baudrate;</div><div class='del'>-			extern void set_timer_3();</div><div class='del'>-</div><div class='del'>-			ptr = &amp;input_buffer[1];</div><div class='del'>-			if (!hexToInt(&amp;ptr, &amp;baudrate))</div><div class='del'>-			{</div><div class='del'>-				strcpy(output_buffer, "B01");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Convert baud rate to uart clock divider */</div><div class='del'>-</div><div class='del'>-			switch (baudrate)</div><div class='del'>-			{</div><div class='del'>-				case 38400:</div><div class='del'>-					baudrate = 16;</div><div class='del'>-					break;</div><div class='del'>-				case 19200:</div><div class='del'>-					baudrate = 33;</div><div class='del'>-					break;</div><div class='del'>-				case 9600:</div><div class='del'>-					baudrate = 65;</div><div class='del'>-					break;</div><div class='del'>-				default:</div><div class='del'>-					baudrate = 0;</div><div class='del'>-					strcpy(output_buffer, "B02");</div><div class='del'>-					goto x1;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (baudrate) {</div><div class='del'>-				putpacket("OK");	/* Ack before changing speed */</div><div class='del'>-				set_timer_3(baudrate); /* Set it */</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-		}			/* switch */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * reply to the request</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		putpacket(output_buffer);</div><div class='del'>-</div><div class='del'>-	} /* while */</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-finish_kgdb:</div><div class='del'>-	restore_debug_traps();</div><div class='del'>-</div><div class='del'>-exit_kgdb_exception:</div><div class='del'>-	/* release locks so other CPUs can go */</div><div class='del'>-	for_each_online_cpu(i)</div><div class='del'>-		__raw_spin_unlock(&amp;kgdb_cpulock[i]);</div><div class='del'>-	spin_unlock(&amp;kgdb_lock);</div><div class='del'>-</div><div class='del'>-	__flush_cache_all();</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function will generate a breakpoint exception.  It is used at the</div><div class='del'>- * beginning of a program to sync up with a debugger and can be used</div><div class='del'>- * otherwise as a quick means to stop program execution and "break" into</div><div class='del'>- * the debugger.</div><div class='del'>- */</div><div class='del'>-void breakpoint(void)</div><div class='del'>-{</div><div class='del'>-	if (!initialized)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-			".globl	breakinst\n\t"</div><div class='del'>-			".set\tnoreorder\n\t"</div><div class='del'>-			"nop\n"</div><div class='del'>-			"breakinst:\tbreak\n\t"</div><div class='del'>-			"nop\n\t"</div><div class='del'>-			".set\treorder"</div><div class='del'>-			);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Nothing but the break; don't pollute any registers */</div><div class='del'>-void async_breakpoint(void)</div><div class='del'>-{</div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-			".globl	async_breakinst\n\t"</div><div class='del'>-			".set\tnoreorder\n\t"</div><div class='del'>-			"nop\n"</div><div class='del'>-			"async_breakinst:\tbreak\n\t"</div><div class='del'>-			"nop\n\t"</div><div class='del'>-			".set\treorder"</div><div class='del'>-			);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void adel(void)</div><div class='del'>-{</div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-			".globl\tadel\n\t"</div><div class='del'>-			"lui\t$8,0x8000\n\t"</div><div class='del'>-			"lw\t$9,1($8)\n\t"</div><div class='del'>-			);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * malloc is needed by gdb client in "call func()", even a private one</div><div class='del'>- * will make gdb happy</div><div class='del'>- */</div><div class='del'>-static void __used *malloc(size_t size)</div><div class='del'>-{</div><div class='del'>-	return kmalloc(size, GFP_ATOMIC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __used free(void *where)</div><div class='del'>-{</div><div class='del'>-	kfree(where);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_GDB_CONSOLE</div><div class='del'>-</div><div class='del'>-void gdb_putsn(const char *str, int l)</div><div class='del'>-{</div><div class='del'>-	char outbuf[18];</div><div class='del'>-</div><div class='del'>-	if (!kgdb_started)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	outbuf[0]='O';</div><div class='del'>-</div><div class='del'>-	while(l) {</div><div class='del'>-		int i = (l&gt;8)?8:l;</div><div class='del'>-		mem2hex((char *)str, &amp;outbuf[1], i, 0);</div><div class='del'>-		outbuf[(i*2)+1]=0;</div><div class='del'>-		putpacket(outbuf);</div><div class='del'>-		str += i;</div><div class='del'>-		l -= i;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gdb_console_write(struct console *con, const char *s, unsigned n)</div><div class='del'>-{</div><div class='del'>-	gdb_putsn(s, n);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct console gdb_console = {</div><div class='del'>-	.name	= "gdb",</div><div class='del'>-	.write	= gdb_console_write,</div><div class='del'>-	.flags	= CON_PRINTBUFFER,</div><div class='del'>-	.index	= -1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init register_gdb_console(void)</div><div class='del'>-{</div><div class='del'>-	register_console(&amp;gdb_console);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-console_initcall(register_gdb_console);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S<br/>index c6ada98ee042..f886dd7f708e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/genex.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/kernel/genex.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/genex.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/genex.S</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;asm/stackframe.h&gt;</div><div class='ctx'> #include &lt;asm/war.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/thread_info.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PANIC_PIC(msg)					\</div><div class='ctx'> 		.set push;				\</div><div class='hunk'>@@ -126,7 +127,42 @@ handle_vcei:</div><div class='ctx'> </div><div class='ctx'> 	__FINIT</div><div class='ctx'> </div><div class='add'>+	.align	5	/* 32 byte rollback region */</div><div class='add'>+LEAF(r4k_wait)</div><div class='add'>+	.set	push</div><div class='add'>+	.set	noreorder</div><div class='add'>+	/* start of rollback region */</div><div class='add'>+	LONG_L	t0, TI_FLAGS($28)</div><div class='add'>+	nop</div><div class='add'>+	andi	t0, _TIF_NEED_RESCHED</div><div class='add'>+	bnez	t0, 1f</div><div class='add'>+	 nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	.set	mips3</div><div class='add'>+	wait</div><div class='add'>+	/* end of rollback region (the region size must be power of two) */</div><div class='add'>+	.set	pop</div><div class='add'>+1:</div><div class='add'>+	jr	ra</div><div class='add'>+	END(r4k_wait)</div><div class='add'>+</div><div class='add'>+	.macro	BUILD_ROLLBACK_PROLOGUE handler</div><div class='add'>+	FEXPORT(rollback_\handler)</div><div class='add'>+	.set	push</div><div class='add'>+	.set	noat</div><div class='add'>+	MFC0	k0, CP0_EPC</div><div class='add'>+	PTR_LA	k1, r4k_wait</div><div class='add'>+	ori	k0, 0x1f	/* 32 byte rollback region */</div><div class='add'>+	xori	k0, 0x1f</div><div class='add'>+	bne	k0, k1, 9f</div><div class='add'>+	MTC0	k0, CP0_EPC</div><div class='add'>+9:</div><div class='add'>+	.set pop</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='ctx'> 	.align  5</div><div class='add'>+BUILD_ROLLBACK_PROLOGUE handle_int</div><div class='ctx'> NESTED(handle_int, PT_SIZE, sp)</div><div class='ctx'> #ifdef CONFIG_TRACE_IRQFLAGS</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -201,6 +237,7 @@ NESTED(except_vec_ejtag_debug, 0, sp)</div><div class='ctx'>  * This prototype is copied to ebase + n*IntCtl.VS and patched</div><div class='ctx'>  * to invoke the handler</div><div class='ctx'>  */</div><div class='add'>+BUILD_ROLLBACK_PROLOGUE except_vec_vi</div><div class='ctx'> NESTED(except_vec_vi, 0, sp)</div><div class='ctx'> 	SAVE_SOME</div><div class='ctx'> 	SAVE_AT</div><div class='head'>diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c<br/>index 6045b9a51a35..4b4007b3083a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/irq.c</a></div><div class='hunk'>@@ -21,11 +21,16 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='add'>+#include &lt;linux/kgdb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KGDB</div><div class='add'>+int kgdb_early_setup;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static unsigned long irq_map[NR_IRQS / BITS_PER_LONG];</div><div class='ctx'> </div><div class='ctx'> int allocate_irqno(void)</div><div class='hunk'>@@ -126,33 +131,22 @@ asmlinkage void spurious_interrupt(void)</div><div class='ctx'> 	atomic_inc(&amp;irq_err_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-extern void breakpoint(void);</div><div class='del'>-extern void set_debug_traps(void);</div><div class='del'>-</div><div class='del'>-static int kgdb_flag = 1;</div><div class='del'>-static int __init nokgdb(char *str)</div><div class='del'>-{</div><div class='del'>-	kgdb_flag = 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("nokgdb", nokgdb);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> void __init init_IRQ(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KGDB</div><div class='add'>+	if (kgdb_early_setup)</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; NR_IRQS; i++)</div><div class='ctx'> 		set_irq_noprobe(i);</div><div class='ctx'> </div><div class='ctx'> 	arch_init_irq();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KGDB</div><div class='del'>-	if (kgdb_flag) {</div><div class='del'>-		printk("Wait for gdb client connection ...\n");</div><div class='del'>-		set_debug_traps();</div><div class='del'>-		breakpoint();</div><div class='del'>-	}</div><div class='add'>+	if (!kgdb_early_setup)</div><div class='add'>+		kgdb_early_setup = 1;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c<br/>new file mode 100644<br/>index 000000000000..8f6d58ede33c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/kgdb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/kgdb.c</a></div><div class='hunk'>@@ -0,0 +1,278 @@</div><div class='add'>+/*</div><div class='add'>+ *  Originally written by Glenn Engel, Lake Stevens Instrument Division</div><div class='add'>+ *</div><div class='add'>+ *  Contributed by HP Systems</div><div class='add'>+ *</div><div class='add'>+ *  Modified for Linux/MIPS (and MIPS in general) by Andreas Busse</div><div class='add'>+ *  Send complaints, suggestions etc. to &lt;andy@waldorf-gmbh.de&gt;</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 1995 Andreas Busse</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2003 MontaVista Software Inc.</div><div class='add'>+ *  Author: Jun Sun, jsun@mvista.com or jsun@junsun.net</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004-2005 MontaVista Software Inc.</div><div class='add'>+ *  Author: Manish Lachwani, mlachwani@mvista.com or manish@koffee-break.com</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2007-2008 Wind River Systems, Inc.</div><div class='add'>+ *  Author/Maintainer: Jason Wessel, jason.wessel@windriver.com</div><div class='add'>+ *</div><div class='add'>+ *  This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ *  version 2. This program is licensed "as is" without any warranty of any</div><div class='add'>+ *  kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ptrace.h&gt;		/* for linux pt_regs struct */</div><div class='add'>+#include &lt;linux/kgdb.h&gt;</div><div class='add'>+#include &lt;linux/kdebug.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;asm/inst.h&gt;</div><div class='add'>+#include &lt;asm/fpu.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/sigcontext.h&gt;</div><div class='add'>+</div><div class='add'>+static struct hard_trap_info {</div><div class='add'>+	unsigned char tt;	/* Trap type code for MIPS R3xxx and R4xxx */</div><div class='add'>+	unsigned char signo;	/* Signal that we map this trap into */</div><div class='add'>+} hard_trap_info[] = {</div><div class='add'>+	{ 6, SIGBUS },		/* instruction bus error */</div><div class='add'>+	{ 7, SIGBUS },		/* data bus error */</div><div class='add'>+	{ 9, SIGTRAP },		/* break */</div><div class='add'>+/*	{ 11, SIGILL },	*/	/* CPU unusable */</div><div class='add'>+	{ 12, SIGFPE },		/* overflow */</div><div class='add'>+	{ 13, SIGTRAP },	/* trap */</div><div class='add'>+	{ 14, SIGSEGV },	/* virtual instruction cache coherency */</div><div class='add'>+	{ 15, SIGFPE },		/* floating point exception */</div><div class='add'>+	{ 23, SIGSEGV },	/* watch */</div><div class='add'>+	{ 31, SIGSEGV },	/* virtual data cache coherency */</div><div class='add'>+	{ 0, 0}			/* Must be last */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void arch_kgdb_breakpoint(void)</div><div class='add'>+{</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		".globl breakinst\n\t"</div><div class='add'>+		".set\tnoreorder\n\t"</div><div class='add'>+		"nop\n"</div><div class='add'>+		"breakinst:\tbreak\n\t"</div><div class='add'>+		"nop\n\t"</div><div class='add'>+		".set\treorder");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kgdb_call_nmi_hook(void *ignored)</div><div class='add'>+{</div><div class='add'>+	kgdb_nmicallback(raw_smp_processor_id(), NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kgdb_roundup_cpus(unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	local_irq_enable();</div><div class='add'>+	smp_call_function(kgdb_call_nmi_hook, NULL, 0);</div><div class='add'>+	local_irq_disable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int compute_signal(int tt)</div><div class='add'>+{</div><div class='add'>+	struct hard_trap_info *ht;</div><div class='add'>+</div><div class='add'>+	for (ht = hard_trap_info; ht-&gt;tt &amp;&amp; ht-&gt;signo; ht++)</div><div class='add'>+		if (ht-&gt;tt == tt)</div><div class='add'>+			return ht-&gt;signo;</div><div class='add'>+</div><div class='add'>+	return SIGHUP;		/* default for things we don't know about */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int reg;</div><div class='add'>+</div><div class='add'>+#if (KGDB_GDB_REG_SIZE == 32)</div><div class='add'>+	u32 *ptr = (u32 *)gdb_regs;</div><div class='add'>+#else</div><div class='add'>+	u64 *ptr = (u64 *)gdb_regs;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (reg = 0; reg &lt; 32; reg++)</div><div class='add'>+		*(ptr++) = regs-&gt;regs[reg];</div><div class='add'>+</div><div class='add'>+	*(ptr++) = regs-&gt;cp0_status;</div><div class='add'>+	*(ptr++) = regs-&gt;lo;</div><div class='add'>+	*(ptr++) = regs-&gt;hi;</div><div class='add'>+	*(ptr++) = regs-&gt;cp0_badvaddr;</div><div class='add'>+	*(ptr++) = regs-&gt;cp0_cause;</div><div class='add'>+	*(ptr++) = regs-&gt;cp0_epc;</div><div class='add'>+</div><div class='add'>+	/* FP REGS */</div><div class='add'>+	if (!(current &amp;&amp; (regs-&gt;cp0_status &amp; ST0_CU1)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	save_fp(current);</div><div class='add'>+	for (reg = 0; reg &lt; 32; reg++)</div><div class='add'>+		*(ptr++) = current-&gt;thread.fpu.fpr[reg];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int reg;</div><div class='add'>+</div><div class='add'>+#if (KGDB_GDB_REG_SIZE == 32)</div><div class='add'>+	const u32 *ptr = (u32 *)gdb_regs;</div><div class='add'>+#else</div><div class='add'>+	const u64 *ptr = (u64 *)gdb_regs;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (reg = 0; reg &lt; 32; reg++)</div><div class='add'>+		regs-&gt;regs[reg] = *(ptr++);</div><div class='add'>+</div><div class='add'>+	regs-&gt;cp0_status = *(ptr++);</div><div class='add'>+	regs-&gt;lo = *(ptr++);</div><div class='add'>+	regs-&gt;hi = *(ptr++);</div><div class='add'>+	regs-&gt;cp0_badvaddr = *(ptr++);</div><div class='add'>+	regs-&gt;cp0_cause = *(ptr++);</div><div class='add'>+	regs-&gt;cp0_epc = *(ptr++);</div><div class='add'>+</div><div class='add'>+	/* FP REGS from current */</div><div class='add'>+	if (!(current &amp;&amp; (regs-&gt;cp0_status &amp; ST0_CU1)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (reg = 0; reg &lt; 32; reg++)</div><div class='add'>+		current-&gt;thread.fpu.fpr[reg] = *(ptr++);</div><div class='add'>+	restore_fp(current);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Similar to regs_to_gdb_regs() except that process is sleeping and so</div><div class='add'>+ * we may not be able to get all the info.</div><div class='add'>+ */</div><div class='add'>+void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)</div><div class='add'>+{</div><div class='add'>+	int reg;</div><div class='add'>+	struct thread_info *ti = task_thread_info(p);</div><div class='add'>+	unsigned long ksp = (unsigned long)ti + THREAD_SIZE - 32;</div><div class='add'>+	struct pt_regs *regs = (struct pt_regs *)ksp - 1;</div><div class='add'>+#if (KGDB_GDB_REG_SIZE == 32)</div><div class='add'>+	u32 *ptr = (u32 *)gdb_regs;</div><div class='add'>+#else</div><div class='add'>+	u64 *ptr = (u64 *)gdb_regs;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (reg = 0; reg &lt; 16; reg++)</div><div class='add'>+		*(ptr++) = regs-&gt;regs[reg];</div><div class='add'>+</div><div class='add'>+	/* S0 - S7 */</div><div class='add'>+	for (reg = 16; reg &lt; 24; reg++)</div><div class='add'>+		*(ptr++) = regs-&gt;regs[reg];</div><div class='add'>+</div><div class='add'>+	for (reg = 24; reg &lt; 28; reg++)</div><div class='add'>+		*(ptr++) = 0;</div><div class='add'>+</div><div class='add'>+	/* GP, SP, FP, RA */</div><div class='add'>+	for (reg = 28; reg &lt; 32; reg++)</div><div class='add'>+		*(ptr++) = regs-&gt;regs[reg];</div><div class='add'>+</div><div class='add'>+	*(ptr++) = regs-&gt;cp0_status;</div><div class='add'>+	*(ptr++) = regs-&gt;lo;</div><div class='add'>+	*(ptr++) = regs-&gt;hi;</div><div class='add'>+	*(ptr++) = regs-&gt;cp0_badvaddr;</div><div class='add'>+	*(ptr++) = regs-&gt;cp0_cause;</div><div class='add'>+	*(ptr++) = regs-&gt;cp0_epc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Calls linux_debug_hook before the kernel dies. If KGDB is enabled,</div><div class='add'>+ * then try to fall into the debugger</div><div class='add'>+ */</div><div class='add'>+static int kgdb_mips_notify(struct notifier_block *self, unsigned long cmd,</div><div class='add'>+			    void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct die_args *args = (struct die_args *)ptr;</div><div class='add'>+	struct pt_regs *regs = args-&gt;regs;</div><div class='add'>+	int trap = (regs-&gt;cp0_cause &amp; 0x7c) &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	/* Userpace events, ignore. */</div><div class='add'>+	if (user_mode(regs))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;kgdb_active) != -1)</div><div class='add'>+		kgdb_nmicallback(smp_processor_id(), regs);</div><div class='add'>+</div><div class='add'>+	if (kgdb_handle_exception(trap, compute_signal(trap), 0, regs))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;kgdb_setting_breakpoint))</div><div class='add'>+		if ((trap == 9) &amp;&amp; (regs-&gt;cp0_epc == (unsigned long)breakinst))</div><div class='add'>+			regs-&gt;cp0_epc += 4;</div><div class='add'>+</div><div class='add'>+	/* In SMP mode, __flush_cache_all does IPI */</div><div class='add'>+	local_irq_enable();</div><div class='add'>+	__flush_cache_all();</div><div class='add'>+</div><div class='add'>+	return NOTIFY_STOP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block kgdb_notifier = {</div><div class='add'>+	.notifier_call = kgdb_mips_notify,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handle the 's' and 'c' commands</div><div class='add'>+ */</div><div class='add'>+int kgdb_arch_handle_exception(int vector, int signo, int err_code,</div><div class='add'>+			       char *remcom_in_buffer, char *remcom_out_buffer,</div><div class='add'>+			       struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	char *ptr;</div><div class='add'>+	unsigned long address;</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	switch (remcom_in_buffer[0]) {</div><div class='add'>+	case 's':</div><div class='add'>+	case 'c':</div><div class='add'>+		/* handle the optional parameter */</div><div class='add'>+		ptr = &amp;remcom_in_buffer[1];</div><div class='add'>+		if (kgdb_hex2long(&amp;ptr, &amp;address))</div><div class='add'>+			regs-&gt;cp0_epc = address;</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;kgdb_cpu_doing_single_step, -1);</div><div class='add'>+		if (remcom_in_buffer[0] == 's')</div><div class='add'>+			if (kgdb_contthread)</div><div class='add'>+				atomic_set(&amp;kgdb_cpu_doing_single_step, cpu);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct kgdb_arch arch_kgdb_ops;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We use kgdb_early_setup so that functions we need to call now don't</div><div class='add'>+ * cause trouble when called again later.</div><div class='add'>+ */</div><div class='add'>+int kgdb_arch_init(void)</div><div class='add'>+{</div><div class='add'>+	union mips_instruction insn = {</div><div class='add'>+		.r_format = {</div><div class='add'>+			.opcode = spec_op,</div><div class='add'>+			.func   = break_op,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+	memcpy(arch_kgdb_ops.gdb_bpt_instr, insn.byte, BREAK_INSTR_SIZE);</div><div class='add'>+</div><div class='add'>+	register_die_notifier(&amp;kgdb_notifier);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	kgdb_arch_exit - Perform any architecture specific uninitalization.</div><div class='add'>+ *</div><div class='add'>+ *	This function will handle the uninitalization of any architecture</div><div class='add'>+ *	specific callbacks, for dynamic registration and unregistration.</div><div class='add'>+ */</div><div class='add'>+void kgdb_arch_exit(void)</div><div class='add'>+{</div><div class='add'>+	unregister_die_notifier(&amp;kgdb_notifier);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c<br/>index b16facd9ea8e..ce7684335a41 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/process.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/process.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/process.c</a></div><div class='hunk'>@@ -148,6 +148,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,</div><div class='ctx'> 	clear_tsk_thread_flag(p, TIF_USEDFPU);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MIPS_MT_FPAFF</div><div class='add'>+	clear_tsk_thread_flag(p, TIF_FPUBOUND);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * FPU affinity support is cleaner if we track the</div><div class='ctx'> 	 * user-visible CPU affinity from the very beginning.</div><div class='head'>diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S<br/>index fc4fd4d705e2..5e75a316f6b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/scall32-o32.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/kernel/scall32-o32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/scall32-o32.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/scall32-o32.S</a></div><div class='hunk'>@@ -647,6 +647,12 @@ einval:	li	v0, -EINVAL</div><div class='ctx'> 	sys	sys_timerfd_create	2</div><div class='ctx'> 	sys	sys_timerfd_gettime	2</div><div class='ctx'> 	sys	sys_timerfd_settime	4</div><div class='add'>+	sys	sys_signalfd4		4</div><div class='add'>+	sys	sys_eventfd2		2	/* 4325 */</div><div class='add'>+	sys	sys_epoll_create1	1</div><div class='add'>+	sys	sys_dup3		3</div><div class='add'>+	sys	sys_pipe2		2</div><div class='add'>+	sys	sys_inotify_init1	1</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	/* We pre-compute the number of _instruction_ bytes needed to</div><div class='head'>diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S<br/>index 2b73fd1e4528..3d58204c9d44 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/scall64-64.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/kernel/scall64-64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/scall64-64.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/scall64-64.S</a></div><div class='hunk'>@@ -481,4 +481,10 @@ sys_call_table:</div><div class='ctx'> 	PTR	sys_timerfd_create		/* 5280 */</div><div class='ctx'> 	PTR	sys_timerfd_gettime</div><div class='ctx'> 	PTR	sys_timerfd_settime</div><div class='add'>+	PTR	sys_signalfd4</div><div class='add'>+	PTR	sys_eventfd2</div><div class='add'>+	PTR	sys_epoll_create1		/* 5285 */</div><div class='add'>+	PTR	sys_dup3</div><div class='add'>+	PTR	sys_pipe2</div><div class='add'>+	PTR	sys_inotify_init1</div><div class='ctx'> 	.size	sys_call_table,.-sys_call_table</div><div class='head'>diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S<br/>index 2654e75d2fef..da7f1b6ea0fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/scall64-n32.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/kernel/scall64-n32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/scall64-n32.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/scall64-n32.S</a></div><div class='hunk'>@@ -407,4 +407,10 @@ EXPORT(sysn32_call_table)</div><div class='ctx'> 	PTR	sys_timerfd_create</div><div class='ctx'> 	PTR	sys_timerfd_gettime		/* 5285 */</div><div class='ctx'> 	PTR	sys_timerfd_settime</div><div class='add'>+	PTR	sys_signalfd4</div><div class='add'>+	PTR	sys_eventfd2</div><div class='add'>+	PTR	sys_epoll_create1</div><div class='add'>+	PTR	sys_dup3			/* 5290 */</div><div class='add'>+	PTR	sys_pipe2</div><div class='add'>+	PTR	sys_inotify_init1</div><div class='ctx'> 	.size	sysn32_call_table,.-sysn32_call_table</div><div class='head'>diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S<br/>index 76167bea5a70..d7cd1aac9ada 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/scall64-o32.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/kernel/scall64-o32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/scall64-o32.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/scall64-o32.S</a></div><div class='hunk'>@@ -529,4 +529,10 @@ sys_call_table:</div><div class='ctx'> 	PTR	sys_timerfd_create</div><div class='ctx'> 	PTR	sys_timerfd_gettime</div><div class='ctx'> 	PTR	sys_timerfd_settime</div><div class='add'>+	PTR	compat_sys_signalfd4</div><div class='add'>+	PTR	sys_eventfd2			/* 4325 */</div><div class='add'>+	PTR	sys_epoll_create1</div><div class='add'>+	PTR	sys_dup3</div><div class='add'>+	PTR	sys_pipe2</div><div class='add'>+	PTR	sys_inotify_init1</div><div class='ctx'> 	.size	sys_call_table,.-sys_call_table</div><div class='head'>diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c<br/>index 8af84867e74d..16f8edfe5cdc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/setup.c</a></div><div class='hunk'>@@ -78,7 +78,7 @@ void __init add_memory_region(phys_t start, phys_t size, long type)</div><div class='ctx'> </div><div class='ctx'> 	/* Sanity check */</div><div class='ctx'> 	if (start + size &lt; start) {</div><div class='del'>-		printk("Trying to add an invalid memory region, skipped\n");</div><div class='add'>+		pr_warning("Trying to add an invalid memory region, skipped\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -92,7 +92,7 @@ void __init add_memory_region(phys_t start, phys_t size, long type)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (x == BOOT_MEM_MAP_MAX) {</div><div class='del'>-		printk("Ooops! Too many entries in the memory map!\n");</div><div class='add'>+		pr_err("Ooops! Too many entries in the memory map!\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -108,22 +108,22 @@ static void __init print_memory_map(void)</div><div class='ctx'> 	const int field = 2 * sizeof(unsigned long);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; boot_mem_map.nr_map; i++) {</div><div class='del'>-		printk(" memory: %0*Lx @ %0*Lx ",</div><div class='add'>+		printk(KERN_INFO " memory: %0*Lx @ %0*Lx ",</div><div class='ctx'> 		       field, (unsigned long long) boot_mem_map.map[i].size,</div><div class='ctx'> 		       field, (unsigned long long) boot_mem_map.map[i].addr);</div><div class='ctx'> </div><div class='ctx'> 		switch (boot_mem_map.map[i].type) {</div><div class='ctx'> 		case BOOT_MEM_RAM:</div><div class='del'>-			printk("(usable)\n");</div><div class='add'>+			printk(KERN_CONT "(usable)\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		case BOOT_MEM_ROM_DATA:</div><div class='del'>-			printk("(ROM data)\n");</div><div class='add'>+			printk(KERN_CONT "(ROM data)\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		case BOOT_MEM_RESERVED:</div><div class='del'>-			printk("(reserved)\n");</div><div class='add'>+			printk(KERN_CONT "(reserved)\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			printk("type %lu\n", boot_mem_map.map[i].type);</div><div class='add'>+			printk(KERN_CONT "type %lu\n", boot_mem_map.map[i].type);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -160,36 +160,39 @@ early_param("rd_size", rd_size_early);</div><div class='ctx'> static unsigned long __init init_initrd(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long end;</div><div class='del'>-	u32 *initrd_header;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Board specific code or command line parser should have</div><div class='ctx'> 	 * already set up initrd_start and initrd_end. In these cases</div><div class='ctx'> 	 * perfom sanity checks and use them if all looks good.</div><div class='ctx'> 	 */</div><div class='del'>-	if (initrd_start &amp;&amp; initrd_end &gt; initrd_start)</div><div class='del'>-		goto sanitize;</div><div class='add'>+	if (!initrd_start || initrd_end &lt;= initrd_start) {</div><div class='add'>+#ifdef CONFIG_PROBE_INITRD_HEADER</div><div class='add'>+		u32 *initrd_header;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * See if initrd has been added to the kernel image by</div><div class='del'>-	 * arch/mips/boot/addinitrd.c. In that case a header is</div><div class='del'>-	 * prepended to initrd and is made up by 8 bytes. The fisrt</div><div class='del'>-	 * word is a magic number and the second one is the size of</div><div class='del'>-	 * initrd.  Initrd start must be page aligned in any cases.</div><div class='del'>-	 */</div><div class='del'>-	initrd_header = __va(PAGE_ALIGN(__pa_symbol(&amp;_end) + 8)) - 8;</div><div class='del'>-	if (initrd_header[0] != 0x494E5244)</div><div class='add'>+		/*</div><div class='add'>+		 * See if initrd has been added to the kernel image by</div><div class='add'>+		 * arch/mips/boot/addinitrd.c. In that case a header is</div><div class='add'>+		 * prepended to initrd and is made up by 8 bytes. The first</div><div class='add'>+		 * word is a magic number and the second one is the size of</div><div class='add'>+		 * initrd.  Initrd start must be page aligned in any cases.</div><div class='add'>+		 */</div><div class='add'>+		initrd_header = __va(PAGE_ALIGN(__pa_symbol(&amp;_end) + 8)) - 8;</div><div class='add'>+		if (initrd_header[0] != 0x494E5244)</div><div class='add'>+			goto disable;</div><div class='add'>+		initrd_start = (unsigned long)(initrd_header + 2);</div><div class='add'>+		initrd_end = initrd_start + initrd_header[1];</div><div class='add'>+#else</div><div class='ctx'> 		goto disable;</div><div class='del'>-	initrd_start = (unsigned long)(initrd_header + 2);</div><div class='del'>-	initrd_end = initrd_start + initrd_header[1];</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-sanitize:</div><div class='ctx'> 	if (initrd_start &amp; ~PAGE_MASK) {</div><div class='del'>-		printk(KERN_ERR "initrd start must be page aligned\n");</div><div class='add'>+		pr_err("initrd start must be page aligned\n");</div><div class='ctx'> 		goto disable;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (initrd_start &lt; PAGE_OFFSET) {</div><div class='del'>-		printk(KERN_ERR "initrd start &lt; PAGE_OFFSET\n");</div><div class='add'>+		pr_err("initrd start &lt; PAGE_OFFSET\n");</div><div class='ctx'> 		goto disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -221,18 +224,18 @@ static void __init finalize_initrd(void)</div><div class='ctx'> 		goto disable;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (__pa(initrd_end) &gt; PFN_PHYS(max_low_pfn)) {</div><div class='del'>-		printk("Initrd extends beyond end of memory");</div><div class='add'>+		printk(KERN_ERR "Initrd extends beyond end of memory");</div><div class='ctx'> 		goto disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	reserve_bootmem(__pa(initrd_start), size, BOOTMEM_DEFAULT);</div><div class='ctx'> 	initrd_below_start_ok = 1;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Initial ramdisk at: 0x%lx (%lu bytes)\n",</div><div class='del'>-	       initrd_start, size);</div><div class='add'>+	pr_info("Initial ramdisk at: 0x%lx (%lu bytes)\n",</div><div class='add'>+		initrd_start, size);</div><div class='ctx'> 	return;</div><div class='ctx'> disable:</div><div class='del'>-	printk(" - disabling initrd\n");</div><div class='add'>+	printk(KERN_CONT " - disabling initrd\n");</div><div class='ctx'> 	initrd_start = 0;</div><div class='ctx'> 	initrd_end = 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -310,14 +313,12 @@ static void __init bootmem_init(void)</div><div class='ctx'> 	if (min_low_pfn &gt;= max_low_pfn)</div><div class='ctx'> 		panic("Incorrect memory mapping !!!");</div><div class='ctx'> 	if (min_low_pfn &gt; ARCH_PFN_OFFSET) {</div><div class='del'>-		printk(KERN_INFO</div><div class='del'>-		       "Wasting %lu bytes for tracking %lu unused pages\n",</div><div class='del'>-		       (min_low_pfn - ARCH_PFN_OFFSET) * sizeof(struct page),</div><div class='del'>-		       min_low_pfn - ARCH_PFN_OFFSET);</div><div class='add'>+		pr_info("Wasting %lu bytes for tracking %lu unused pages\n",</div><div class='add'>+			(min_low_pfn - ARCH_PFN_OFFSET) * sizeof(struct page),</div><div class='add'>+			min_low_pfn - ARCH_PFN_OFFSET);</div><div class='ctx'> 	} else if (min_low_pfn &lt; ARCH_PFN_OFFSET) {</div><div class='del'>-		printk(KERN_INFO</div><div class='del'>-		       "%lu free pages won't be used\n",</div><div class='del'>-		       ARCH_PFN_OFFSET - min_low_pfn);</div><div class='add'>+		pr_info("%lu free pages won't be used\n",</div><div class='add'>+			ARCH_PFN_OFFSET - min_low_pfn);</div><div class='ctx'> 	}</div><div class='ctx'> 	min_low_pfn = ARCH_PFN_OFFSET;</div><div class='ctx'> </div><div class='hunk'>@@ -471,7 +472,7 @@ static void __init arch_mem_init(char **cmdline_p)</div><div class='ctx'> 	/* call board setup routine */</div><div class='ctx'> 	plat_mem_setup();</div><div class='ctx'> </div><div class='del'>-	printk("Determined physical RAM map:\n");</div><div class='add'>+	pr_info("Determined physical RAM map:\n");</div><div class='ctx'> 	print_memory_map();</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(command_line, arcs_cmdline, sizeof(command_line));</div><div class='hunk'>@@ -482,7 +483,7 @@ static void __init arch_mem_init(char **cmdline_p)</div><div class='ctx'> 	parse_early_param();</div><div class='ctx'> </div><div class='ctx'> 	if (usermem) {</div><div class='del'>-		printk("User-defined physical RAM map:\n");</div><div class='add'>+		pr_info("User-defined physical RAM map:\n");</div><div class='ctx'> 		print_memory_map();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c<br/>index b8ea4e9d0d87..5fd0cd020af5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/traps.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/traps.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/traps.c</a></div><div class='hunk'>@@ -23,6 +23,8 @@</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/kgdb.h&gt;</div><div class='add'>+#include &lt;linux/kdebug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> #include &lt;asm/branch.h&gt;</div><div class='hunk'>@@ -44,6 +46,9 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> </div><div class='add'>+extern void check_wait(void);</div><div class='add'>+extern asmlinkage void r4k_wait(void);</div><div class='add'>+extern asmlinkage void rollback_handle_int(void);</div><div class='ctx'> extern asmlinkage void handle_int(void);</div><div class='ctx'> extern asmlinkage void handle_tlbm(void);</div><div class='ctx'> extern asmlinkage void handle_tlbl(void);</div><div class='hunk'>@@ -371,8 +376,8 @@ void __noreturn die(const char * str, const struct pt_regs * regs)</div><div class='ctx'> 	do_exit(SIGSEGV);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern const struct exception_table_entry __start___dbe_table[];</div><div class='del'>-extern const struct exception_table_entry __stop___dbe_table[];</div><div class='add'>+extern struct exception_table_entry __start___dbe_table[];</div><div class='add'>+extern struct exception_table_entry __stop___dbe_table[];</div><div class='ctx'> </div><div class='ctx'> __asm__(</div><div class='ctx'> "	.section	__dbe_table, \"a\"\n"</div><div class='hunk'>@@ -425,6 +430,10 @@ asmlinkage void do_be(struct pt_regs *regs)</div><div class='ctx'> 	printk(KERN_ALERT "%s bus error, epc == %0*lx, ra == %0*lx\n",</div><div class='ctx'> 	       data ? "Data" : "Instruction",</div><div class='ctx'> 	       field, regs-&gt;cp0_epc, field, regs-&gt;regs[31]);</div><div class='add'>+	if (notify_die(DIE_OOPS, "bus error", regs, SIGBUS, 0, 0)</div><div class='add'>+	    == NOTIFY_STOP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	die_if_kernel("Oops", regs);</div><div class='ctx'> 	force_sig(SIGBUS, current);</div><div class='ctx'> }</div><div class='hunk'>@@ -623,6 +632,9 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)</div><div class='ctx'> {</div><div class='ctx'> 	siginfo_t info;</div><div class='ctx'> </div><div class='add'>+	if (notify_die(DIE_FP, "FP exception", regs, SIGFPE, 0, 0)</div><div class='add'>+	    == NOTIFY_STOP)</div><div class='add'>+		return;</div><div class='ctx'> 	die_if_kernel("FP exception in kernel code", regs);</div><div class='ctx'> </div><div class='ctx'> 	if (fcr31 &amp; FPU_CSR_UNI_X) {</div><div class='hunk'>@@ -682,6 +694,9 @@ static void do_trap_or_bp(struct pt_regs *regs, unsigned int code,</div><div class='ctx'> 	siginfo_t info;</div><div class='ctx'> 	char b[40];</div><div class='ctx'> </div><div class='add'>+	if (notify_die(DIE_TRAP, str, regs, code, 0, 0) == NOTIFY_STOP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * A short test says that IRIX 5.3 sends SIGTRAP for all trap</div><div class='ctx'> 	 * insns, even for trap and break codes that indicate arithmetic</div><div class='hunk'>@@ -762,6 +777,10 @@ asmlinkage void do_ri(struct pt_regs *regs)</div><div class='ctx'> 	unsigned int opcode = 0;</div><div class='ctx'> 	int status = -1;</div><div class='ctx'> </div><div class='add'>+	if (notify_die(DIE_RI, "RI Fault", regs, SIGSEGV, 0, 0)</div><div class='add'>+	    == NOTIFY_STOP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	die_if_kernel("Reserved instruction in kernel code", regs);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(compute_return_epc(regs) &lt; 0))</div><div class='hunk'>@@ -1184,7 +1203,7 @@ void *set_except_vector(int n, void *addr)</div><div class='ctx'> 	if (n == 0 &amp;&amp; cpu_has_divec) {</div><div class='ctx'> 		*(u32 *)(ebase + 0x200) = 0x08000000 |</div><div class='ctx'> 					  (0x03ffffff &amp; (handler &gt;&gt; 2));</div><div class='del'>-		flush_icache_range(ebase + 0x200, ebase + 0x204);</div><div class='add'>+		local_flush_icache_range(ebase + 0x200, ebase + 0x204);</div><div class='ctx'> 	}</div><div class='ctx'> 	return (void *)old_handler;</div><div class='ctx'> }</div><div class='hunk'>@@ -1235,6 +1254,9 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)</div><div class='ctx'> </div><div class='ctx'> 		extern char except_vec_vi, except_vec_vi_lui;</div><div class='ctx'> 		extern char except_vec_vi_ori, except_vec_vi_end;</div><div class='add'>+		extern char rollback_except_vec_vi;</div><div class='add'>+		char *vec_start = (cpu_wait == r4k_wait) ?</div><div class='add'>+			&amp;rollback_except_vec_vi : &amp;except_vec_vi;</div><div class='ctx'> #ifdef CONFIG_MIPS_MT_SMTC</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We need to provide the SMTC vectored interrupt handler</div><div class='hunk'>@@ -1242,11 +1264,11 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)</div><div class='ctx'> 		 * Status.IM bit to be masked before going there.</div><div class='ctx'> 		 */</div><div class='ctx'> 		extern char except_vec_vi_mori;</div><div class='del'>-		const int mori_offset = &amp;except_vec_vi_mori - &amp;except_vec_vi;</div><div class='add'>+		const int mori_offset = &amp;except_vec_vi_mori - vec_start;</div><div class='ctx'> #endif /* CONFIG_MIPS_MT_SMTC */</div><div class='del'>-		const int handler_len = &amp;except_vec_vi_end - &amp;except_vec_vi;</div><div class='del'>-		const int lui_offset = &amp;except_vec_vi_lui - &amp;except_vec_vi;</div><div class='del'>-		const int ori_offset = &amp;except_vec_vi_ori - &amp;except_vec_vi;</div><div class='add'>+		const int handler_len = &amp;except_vec_vi_end - vec_start;</div><div class='add'>+		const int lui_offset = &amp;except_vec_vi_lui - vec_start;</div><div class='add'>+		const int ori_offset = &amp;except_vec_vi_ori - vec_start;</div><div class='ctx'> </div><div class='ctx'> 		if (handler_len &gt; VECTORSPACING) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -1256,7 +1278,7 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)</div><div class='ctx'> 			panic("VECTORSPACING too small");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		memcpy(b, &amp;except_vec_vi, handler_len);</div><div class='add'>+		memcpy(b, vec_start, handler_len);</div><div class='ctx'> #ifdef CONFIG_MIPS_MT_SMTC</div><div class='ctx'> 		BUG_ON(n &gt; 7);	/* Vector index %d exceeds SMTC maximum. */</div><div class='ctx'> </div><div class='hunk'>@@ -1267,7 +1289,8 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)</div><div class='ctx'> 		*w = (*w &amp; 0xffff0000) | (((u32)handler &gt;&gt; 16) &amp; 0xffff);</div><div class='ctx'> 		w = (u32 *)(b + ori_offset);</div><div class='ctx'> 		*w = (*w &amp; 0xffff0000) | ((u32)handler &amp; 0xffff);</div><div class='del'>-		flush_icache_range((unsigned long)b, (unsigned long)(b+handler_len));</div><div class='add'>+		local_flush_icache_range((unsigned long)b,</div><div class='add'>+					 (unsigned long)(b+handler_len));</div><div class='ctx'> 	}</div><div class='ctx'> 	else {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1279,7 +1302,8 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)</div><div class='ctx'> 		w = (u32 *)b;</div><div class='ctx'> 		*w++ = 0x08000000 | (((u32)handler &gt;&gt; 2) &amp; 0x03fffff); /* j handler */</div><div class='ctx'> 		*w = 0;</div><div class='del'>-		flush_icache_range((unsigned long)b, (unsigned long)(b+8));</div><div class='add'>+		local_flush_icache_range((unsigned long)b,</div><div class='add'>+					 (unsigned long)(b+8));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return (void *)old_handler;</div><div class='hunk'>@@ -1499,7 +1523,7 @@ void __cpuinit per_cpu_trap_init(void)</div><div class='ctx'> void __init set_handler(unsigned long offset, void *addr, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy((void *)(ebase + offset), addr, size);</div><div class='del'>-	flush_icache_range(ebase + offset, ebase + offset + size);</div><div class='add'>+	local_flush_icache_range(ebase + offset, ebase + offset + size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static char panic_null_cerr[] __cpuinitdata =</div><div class='hunk'>@@ -1536,6 +1560,15 @@ void __init trap_init(void)</div><div class='ctx'> 	extern char except_vec3_generic, except_vec3_r4000;</div><div class='ctx'> 	extern char except_vec4;</div><div class='ctx'> 	unsigned long i;</div><div class='add'>+	int rollback;</div><div class='add'>+</div><div class='add'>+	check_wait();</div><div class='add'>+	rollback = (cpu_wait == r4k_wait);</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_KGDB)</div><div class='add'>+	if (kgdb_early_setup)</div><div class='add'>+		return;	/* Already done */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_has_veic || cpu_has_vint)</div><div class='ctx'> 		ebase = (unsigned long) alloc_bootmem_low_pages(0x200 + VECTORSPACING*64);</div><div class='hunk'>@@ -1595,7 +1628,7 @@ void __init trap_init(void)</div><div class='ctx'> 	if (board_be_init)</div><div class='ctx'> 		board_be_init();</div><div class='ctx'> </div><div class='del'>-	set_except_vector(0, handle_int);</div><div class='add'>+	set_except_vector(0, rollback ? rollback_handle_int : handle_int);</div><div class='ctx'> 	set_except_vector(1, handle_tlbm);</div><div class='ctx'> 	set_except_vector(2, handle_tlbl);</div><div class='ctx'> 	set_except_vector(3, handle_tlbs);</div><div class='hunk'>@@ -1659,6 +1692,8 @@ void __init trap_init(void)</div><div class='ctx'> 	signal32_init();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	flush_icache_range(ebase, ebase + 0x400);</div><div class='add'>+	local_flush_icache_range(ebase, ebase + 0x400);</div><div class='ctx'> 	flush_tlb_handlers();</div><div class='add'>+</div><div class='add'>+	sort_extable(__start___dbe_table, __stop___dbe_table);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S<br/>index b5470ceb418b..afb119f35682 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/vmlinux.lds.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/vmlinux.lds.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -36,6 +36,7 @@ SECTIONS</div><div class='ctx'> 		SCHED_TEXT</div><div class='ctx'> 		LOCK_TEXT</div><div class='ctx'> 		KPROBES_TEXT</div><div class='add'>+		*(.text.*)</div><div class='ctx'> 		*(.fixup)</div><div class='ctx'> 		*(.gnu.warning)</div><div class='ctx'> 	} :text = 0</div><div class='head'>diff --git a/arch/mips/lib/csum_partial.S b/arch/mips/lib/csum_partial.S<br/>index 8d7784122c14..edac9892c51a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lib/csum_partial.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/lib/csum_partial.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lib/csum_partial.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/lib/csum_partial.S</a></div><div class='hunk'>@@ -39,12 +39,14 @@</div><div class='ctx'> #ifdef USE_DOUBLE</div><div class='ctx'> </div><div class='ctx'> #define LOAD   ld</div><div class='add'>+#define LOAD32 lwu</div><div class='ctx'> #define ADD    daddu</div><div class='ctx'> #define NBYTES 8</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> #define LOAD   lw</div><div class='add'>+#define LOAD32 lw</div><div class='ctx'> #define ADD    addu</div><div class='ctx'> #define NBYTES 4</div><div class='ctx'> </div><div class='hunk'>@@ -60,6 +62,14 @@</div><div class='ctx'> 	ADD	sum, v1;					\</div><div class='ctx'> 	.set	pop</div><div class='ctx'> </div><div class='add'>+#define ADDC32(sum,reg)						\</div><div class='add'>+	.set	push;						\</div><div class='add'>+	.set	noat;						\</div><div class='add'>+	addu	sum, reg;					\</div><div class='add'>+	sltu	v1, sum, reg;					\</div><div class='add'>+	addu	sum, v1;					\</div><div class='add'>+	.set	pop</div><div class='add'>+</div><div class='ctx'> #define CSUM_BIGCHUNK1(src, offset, sum, _t0, _t1, _t2, _t3)	\</div><div class='ctx'> 	LOAD	_t0, (offset + UNIT(0))(src);			\</div><div class='ctx'> 	LOAD	_t1, (offset + UNIT(1))(src);			\</div><div class='hunk'>@@ -132,7 +142,7 @@ LEAF(csum_partial)</div><div class='ctx'> 	beqz	t8, .Lqword_align</div><div class='ctx'> 	 andi	t8, src, 0x8</div><div class='ctx'> </div><div class='del'>-	lw	t0, 0x00(src)</div><div class='add'>+	LOAD32	t0, 0x00(src)</div><div class='ctx'> 	LONG_SUBU	a1, a1, 0x4</div><div class='ctx'> 	ADDC(sum, t0)</div><div class='ctx'> 	PTR_ADDU	src, src, 0x4</div><div class='hunk'>@@ -211,7 +221,7 @@ LEAF(csum_partial)</div><div class='ctx'> 	LONG_SRL	t8, t8, 0x2</div><div class='ctx'> </div><div class='ctx'> .Lend_words:</div><div class='del'>-	lw	t0, (src)</div><div class='add'>+	LOAD32	t0, (src)</div><div class='ctx'> 	LONG_SUBU	t8, t8, 0x1</div><div class='ctx'> 	ADDC(sum, t0)</div><div class='ctx'> 	.set	reorder				/* DADDI_WAR */</div><div class='hunk'>@@ -230,6 +240,9 @@ LEAF(csum_partial)</div><div class='ctx'> 	/* Still a full word to go  */</div><div class='ctx'> 	ulw	t1, (src)</div><div class='ctx'> 	PTR_ADDIU	src, 4</div><div class='add'>+#ifdef USE_DOUBLE</div><div class='add'>+	dsll	t1, t1, 32			/* clear lower 32bit */</div><div class='add'>+#endif</div><div class='ctx'> 	ADDC(sum, t1)</div><div class='ctx'> </div><div class='ctx'> 1:	move	t1, zero</div><div class='hunk'>@@ -280,7 +293,7 @@ LEAF(csum_partial)</div><div class='ctx'> 1:</div><div class='ctx'> 	.set	reorder</div><div class='ctx'> 	/* Add the passed partial csum.  */</div><div class='del'>-	ADDC(sum, a2)</div><div class='add'>+	ADDC32(sum, a2)</div><div class='ctx'> 	jr	ra</div><div class='ctx'> 	.set	noreorder</div><div class='ctx'> 	END(csum_partial)</div><div class='hunk'>@@ -681,7 +694,7 @@ EXC(	sb	t0, NBYTES-2(dst), .Ls_exc)</div><div class='ctx'> 	.set	pop</div><div class='ctx'> 1:</div><div class='ctx'> 	.set reorder</div><div class='del'>-	ADDC(sum, psum)</div><div class='add'>+	ADDC32(sum, psum)</div><div class='ctx'> 	jr	ra</div><div class='ctx'> 	.set noreorder</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/mm/c-r3k.c b/arch/mips/mm/c-r3k.c<br/>index 27a5b466c85c..5500c20c79ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/c-r3k.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/mm/c-r3k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/c-r3k.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mm/c-r3k.c</a></div><div class='hunk'>@@ -320,6 +320,7 @@ void __cpuinit r3k_cache_init(void)</div><div class='ctx'> 	flush_cache_range = r3k_flush_cache_range;</div><div class='ctx'> 	flush_cache_page = r3k_flush_cache_page;</div><div class='ctx'> 	flush_icache_range = r3k_flush_icache_range;</div><div class='add'>+	local_flush_icache_range = r3k_flush_icache_range;</div><div class='ctx'> </div><div class='ctx'> 	flush_cache_sigtramp = r3k_flush_cache_sigtramp;</div><div class='ctx'> 	local_flush_data_cache_page = local_r3k_flush_data_cache_page;</div><div class='head'>diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c<br/>index 71df3390c07b..6e99665ae860 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/c-r4k.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/mm/c-r4k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/c-r4k.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mm/c-r4k.c</a></div><div class='hunk'>@@ -543,12 +543,8 @@ struct flush_icache_range_args {</div><div class='ctx'> 	unsigned long end;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline void local_r4k_flush_icache_range(void *args)</div><div class='add'>+static inline void local_r4k_flush_icache_range(unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='del'>-	struct flush_icache_range_args *fir_args = args;</div><div class='del'>-	unsigned long start = fir_args-&gt;start;</div><div class='del'>-	unsigned long end = fir_args-&gt;end;</div><div class='del'>-</div><div class='ctx'> 	if (!cpu_has_ic_fills_f_dc) {</div><div class='ctx'> 		if (end - start &gt;= dcache_size) {</div><div class='ctx'> 			r4k_blast_dcache();</div><div class='hunk'>@@ -564,6 +560,15 @@ static inline void local_r4k_flush_icache_range(void *args)</div><div class='ctx'> 		protected_blast_icache_range(start, end);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void local_r4k_flush_icache_range_ipi(void *args)</div><div class='add'>+{</div><div class='add'>+	struct flush_icache_range_args *fir_args = args;</div><div class='add'>+	unsigned long start = fir_args-&gt;start;</div><div class='add'>+	unsigned long end = fir_args-&gt;end;</div><div class='add'>+</div><div class='add'>+	local_r4k_flush_icache_range(start, end);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void r4k_flush_icache_range(unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct flush_icache_range_args args;</div><div class='hunk'>@@ -571,7 +576,7 @@ static void r4k_flush_icache_range(unsigned long start, unsigned long end)</div><div class='ctx'> 	args.start = start;</div><div class='ctx'> 	args.end = end;</div><div class='ctx'> </div><div class='del'>-	r4k_on_each_cpu(local_r4k_flush_icache_range, &amp;args, 1);</div><div class='add'>+	r4k_on_each_cpu(local_r4k_flush_icache_range_ipi, &amp;args, 1);</div><div class='ctx'> 	instruction_hazard();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1375,6 +1380,7 @@ void __cpuinit r4k_cache_init(void)</div><div class='ctx'> 	local_flush_data_cache_page	= local_r4k_flush_data_cache_page;</div><div class='ctx'> 	flush_data_cache_page	= r4k_flush_data_cache_page;</div><div class='ctx'> 	flush_icache_range	= r4k_flush_icache_range;</div><div class='add'>+	local_flush_icache_range	= local_r4k_flush_icache_range;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_DMA_NONCOHERENT)</div><div class='ctx'> 	if (coherentio) {</div><div class='head'>diff --git a/arch/mips/mm/c-tx39.c b/arch/mips/mm/c-tx39.c<br/>index a9f7f1f5e9b4..f7c8f9ce39c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/c-tx39.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/mm/c-tx39.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/c-tx39.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mm/c-tx39.c</a></div><div class='hunk'>@@ -362,6 +362,7 @@ void __cpuinit tx39_cache_init(void)</div><div class='ctx'> 		flush_cache_range	= (void *) tx39h_flush_icache_all;</div><div class='ctx'> 		flush_cache_page	= (void *) tx39h_flush_icache_all;</div><div class='ctx'> 		flush_icache_range	= (void *) tx39h_flush_icache_all;</div><div class='add'>+		local_flush_icache_range = (void *) tx39h_flush_icache_all;</div><div class='ctx'> </div><div class='ctx'> 		flush_cache_sigtramp	= (void *) tx39h_flush_icache_all;</div><div class='ctx'> 		local_flush_data_cache_page	= (void *) tx39h_flush_icache_all;</div><div class='hunk'>@@ -390,6 +391,7 @@ void __cpuinit tx39_cache_init(void)</div><div class='ctx'> 		flush_cache_range = tx39_flush_cache_range;</div><div class='ctx'> 		flush_cache_page = tx39_flush_cache_page;</div><div class='ctx'> 		flush_icache_range = tx39_flush_icache_range;</div><div class='add'>+		local_flush_icache_range = tx39_flush_icache_range;</div><div class='ctx'> </div><div class='ctx'> 		flush_cache_sigtramp = tx39_flush_cache_sigtramp;</div><div class='ctx'> 		local_flush_data_cache_page = local_tx39_flush_data_cache_page;</div><div class='head'>diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c<br/>index 034e8506f6ea..1eb7c71e3d6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/cache.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/mm/cache.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/cache.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mm/cache.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@ void (*flush_cache_range)(struct vm_area_struct *vma, unsigned long start,</div><div class='ctx'> void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page,</div><div class='ctx'> 	unsigned long pfn);</div><div class='ctx'> void (*flush_icache_range)(unsigned long start, unsigned long end);</div><div class='add'>+void (*local_flush_icache_range)(unsigned long start, unsigned long end);</div><div class='ctx'> </div><div class='ctx'> void (*__flush_cache_vmap)(void);</div><div class='ctx'> void (*__flush_cache_vunmap)(void);</div><div class='head'>diff --git a/arch/mips/mm/tlb-r3k.c b/arch/mips/mm/tlb-r3k.c<br/>index a782549ac80e..f0cf46adb978 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/tlb-r3k.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/mm/tlb-r3k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/tlb-r3k.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mm/tlb-r3k.c</a></div><div class='hunk'>@@ -246,10 +246,6 @@ void __init add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,</div><div class='ctx'> 		old_pagemask = read_c0_pagemask();</div><div class='ctx'> 		w = read_c0_wired();</div><div class='ctx'> 		write_c0_wired(w + 1);</div><div class='del'>-		if (read_c0_wired() != w + 1) {</div><div class='del'>-			printk("[tlbwired] No WIRED reg?\n");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='ctx'> 		write_c0_index(w &lt;&lt; 8);</div><div class='ctx'> 		write_c0_pagemask(pagemask);</div><div class='ctx'> 		write_c0_entryhi(entryhi);</div><div class='head'>diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c<br/>index 76da73a5ab3c..979cf9197282 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/tlbex.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/mm/tlbex.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/tlbex.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mm/tlbex.c</a></div><div class='hunk'>@@ -1273,10 +1273,10 @@ void __cpuinit build_tlb_refill_handler(void)</div><div class='ctx'> </div><div class='ctx'> void __cpuinit flush_tlb_handlers(void)</div><div class='ctx'> {</div><div class='del'>-	flush_icache_range((unsigned long)handle_tlbl,</div><div class='add'>+	local_flush_icache_range((unsigned long)handle_tlbl,</div><div class='ctx'> 			   (unsigned long)handle_tlbl + sizeof(handle_tlbl));</div><div class='del'>-	flush_icache_range((unsigned long)handle_tlbs,</div><div class='add'>+	local_flush_icache_range((unsigned long)handle_tlbs,</div><div class='ctx'> 			   (unsigned long)handle_tlbs + sizeof(handle_tlbs));</div><div class='del'>-	flush_icache_range((unsigned long)handle_tlbm,</div><div class='add'>+	local_flush_icache_range((unsigned long)handle_tlbm,</div><div class='ctx'> 			   (unsigned long)handle_tlbm + sizeof(handle_tlbm));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/mti-malta/Makefile b/arch/mips/mti-malta/Makefile<br/>index f8064446e812..3b7dd722c32a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mti-malta/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/mti-malta/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mti-malta/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mti-malta/Makefile</a></div><div class='hunk'>@@ -13,7 +13,6 @@ obj-y				:= malta-amon.o malta-cmdline.o \</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_EARLY_PRINTK)	+= malta-console.o</div><div class='ctx'> obj-$(CONFIG_PCI)		+= malta-pci.o</div><div class='del'>-obj-$(CONFIG_KGDB)		+= malta-kgdb.o</div><div class='ctx'> </div><div class='ctx'> # FIXME FIXME FIXME</div><div class='ctx'> obj-$(CONFIG_MIPS_MT_SMTC)	+= malta_smtc.o</div><div class='head'>diff --git a/arch/mips/mti-malta/malta-init.c b/arch/mips/mti-malta/malta-init.c<br/>index c0653021a171..4832af251668 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mti-malta/malta-init.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/mti-malta/malta-init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mti-malta/malta-init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mti-malta/malta-init.c</a></div><div class='hunk'>@@ -37,15 +37,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mips-boards/malta.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-extern int rs_kgdb_hook(int, int);</div><div class='del'>-extern int rs_putDebugChar(char);</div><div class='del'>-extern char rs_getDebugChar(void);</div><div class='del'>-extern int saa9730_kgdb_hook(int);</div><div class='del'>-extern int saa9730_putDebugChar(char);</div><div class='del'>-extern char saa9730_getDebugChar(void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> int prom_argc;</div><div class='ctx'> int *_prom_argv, *_prom_envp;</div><div class='ctx'> </div><div class='hunk'>@@ -173,51 +164,6 @@ static void __init console_config(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-void __init kgdb_config(void)</div><div class='del'>-{</div><div class='del'>-	extern int (*generic_putDebugChar)(char);</div><div class='del'>-	extern char (*generic_getDebugChar)(void);</div><div class='del'>-	char *argptr;</div><div class='del'>-	int line, speed;</div><div class='del'>-</div><div class='del'>-	argptr = prom_getcmdline();</div><div class='del'>-	if ((argptr = strstr(argptr, "kgdb=ttyS")) != NULL) {</div><div class='del'>-		argptr += strlen("kgdb=ttyS");</div><div class='del'>-		if (*argptr != '0' &amp;&amp; *argptr != '1')</div><div class='del'>-			printk("KGDB: Unknown serial line /dev/ttyS%c, "</div><div class='del'>-			       "falling back to /dev/ttyS1\n", *argptr);</div><div class='del'>-		line = *argptr == '0' ? 0 : 1;</div><div class='del'>-		printk("KGDB: Using serial line /dev/ttyS%d for session\n", line);</div><div class='del'>-</div><div class='del'>-		speed = 0;</div><div class='del'>-		if (*++argptr == ',')</div><div class='del'>-		{</div><div class='del'>-			int c;</div><div class='del'>-			while ((c = *++argptr) &amp;&amp; ('0' &lt;= c &amp;&amp; c &lt;= '9'))</div><div class='del'>-				speed = speed * 10 + c - '0';</div><div class='del'>-		}</div><div class='del'>-		{</div><div class='del'>-			speed = rs_kgdb_hook(line, speed);</div><div class='del'>-			generic_putDebugChar = rs_putDebugChar;</div><div class='del'>-			generic_getDebugChar = rs_getDebugChar;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pr_info("KGDB: Using serial line /dev/ttyS%d at %d for "</div><div class='del'>-		        "session, please connect your debugger\n",</div><div class='del'>-		        line ? 1 : 0, speed);</div><div class='del'>-</div><div class='del'>-		{</div><div class='del'>-			char *s;</div><div class='del'>-			for (s = "Please connect GDB to this port\r\n"; *s; )</div><div class='del'>-				generic_putDebugChar(*s++);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Breakpoint is invoked after interrupts are initialised */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static void __init mips_nmi_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	void *base;</div><div class='head'>diff --git a/arch/mips/mti-malta/malta-kgdb.c b/arch/mips/mti-malta/malta-kgdb.c<br/>deleted file mode 100644<br/>index 6a1854de4579..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mti-malta/malta-kgdb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/mti-malta/malta-kgdb.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,133 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Carsten Langgaard, carstenl@mips.com</div><div class='del'>- * Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can distribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License (Version 2) as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope it will be useful, but WITHOUT</div><div class='del'>- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License</div><div class='del'>- *  for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along</div><div class='del'>- *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='del'>- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * This is the interface to the remote debugger stub.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/serial.h&gt;</div><div class='del'>-#include &lt;linux/serialP.h&gt;</div><div class='del'>-#include &lt;linux/serial_reg.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/serial.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-static struct serial_state rs_table[] = {</div><div class='del'>-	SERIAL_PORT_DFNS	/* Defined in serial.h */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct async_struct kdb_port_info = {0};</div><div class='del'>-</div><div class='del'>-int (*generic_putDebugChar)(char);</div><div class='del'>-char (*generic_getDebugChar)(void);</div><div class='del'>-</div><div class='del'>-static __inline__ unsigned int serial_in(struct async_struct *info, int offset)</div><div class='del'>-{</div><div class='del'>-	return inb(info-&gt;port + offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __inline__ void serial_out(struct async_struct *info, int offset,</div><div class='del'>-				int value)</div><div class='del'>-{</div><div class='del'>-	outb(value, info-&gt;port+offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int rs_kgdb_hook(int tty_no, int speed) {</div><div class='del'>-	int t;</div><div class='del'>-	struct serial_state *ser = &amp;rs_table[tty_no];</div><div class='del'>-</div><div class='del'>-	kdb_port_info.state = ser;</div><div class='del'>-	kdb_port_info.magic = SERIAL_MAGIC;</div><div class='del'>-	kdb_port_info.port = ser-&gt;port;</div><div class='del'>-	kdb_port_info.flags = ser-&gt;flags;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Clear all interrupts</div><div class='del'>-	 */</div><div class='del'>-	serial_in(&amp;kdb_port_info, UART_LSR);</div><div class='del'>-	serial_in(&amp;kdb_port_info, UART_RX);</div><div class='del'>-	serial_in(&amp;kdb_port_info, UART_IIR);</div><div class='del'>-	serial_in(&amp;kdb_port_info, UART_MSR);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now, initialize the UART</div><div class='del'>-	 */</div><div class='del'>-	serial_out(&amp;kdb_port_info, UART_LCR, UART_LCR_WLEN8);	/* reset DLAB */</div><div class='del'>-	if (kdb_port_info.flags &amp; ASYNC_FOURPORT) {</div><div class='del'>-		kdb_port_info.MCR = UART_MCR_DTR | UART_MCR_RTS;</div><div class='del'>-		t = UART_MCR_DTR | UART_MCR_OUT1;</div><div class='del'>-	} else {</div><div class='del'>-		kdb_port_info.MCR</div><div class='del'>-			= UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2;</div><div class='del'>-		t = UART_MCR_DTR | UART_MCR_RTS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kdb_port_info.MCR = t;		/* no interrupts, please */</div><div class='del'>-	serial_out(&amp;kdb_port_info, UART_MCR, kdb_port_info.MCR);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * and set the speed of the serial port</div><div class='del'>-	 */</div><div class='del'>-	if (speed == 0)</div><div class='del'>-		speed = 9600;</div><div class='del'>-</div><div class='del'>-	t = kdb_port_info.state-&gt;baud_base / speed;</div><div class='del'>-	/* set DLAB */</div><div class='del'>-	serial_out(&amp;kdb_port_info, UART_LCR, UART_LCR_WLEN8 | UART_LCR_DLAB);</div><div class='del'>-	serial_out(&amp;kdb_port_info, UART_DLL, t &amp; 0xff);/* LS of divisor */</div><div class='del'>-	serial_out(&amp;kdb_port_info, UART_DLM, t &gt;&gt; 8);  /* MS of divisor */</div><div class='del'>-	/* reset DLAB */</div><div class='del'>-	serial_out(&amp;kdb_port_info, UART_LCR, UART_LCR_WLEN8);</div><div class='del'>-</div><div class='del'>-	return speed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int putDebugChar(char c)</div><div class='del'>-{</div><div class='del'>-	return generic_putDebugChar(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char getDebugChar(void)</div><div class='del'>-{</div><div class='del'>-	return generic_getDebugChar();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int rs_putDebugChar(char c)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if (!kdb_port_info.state) { 	/* need to init device first */</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ((serial_in(&amp;kdb_port_info, UART_LSR) &amp; UART_LSR_THRE) == 0)</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	serial_out(&amp;kdb_port_info, UART_TX, c);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char rs_getDebugChar(void)</div><div class='del'>-{</div><div class='del'>-	if (!kdb_port_info.state) { 	/* need to init device first */</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (!(serial_in(&amp;kdb_port_info, UART_LSR) &amp; 1))</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	return serial_in(&amp;kdb_port_info, UART_RX);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/mti-malta/malta-setup.c b/arch/mips/mti-malta/malta-setup.c<br/>index e7cad54936ca..dc78b8983eeb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mti-malta/malta-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/mti-malta/malta-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mti-malta/malta-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/mti-malta/malta-setup.c</a></div><div class='hunk'>@@ -199,10 +199,6 @@ void __init plat_mem_setup(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	enable_dma(4);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-	kgdb_config();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_DMA_COHERENT</div><div class='ctx'> 	if (mips_revision_sconid != MIPS_REVISION_SCON_BONITO)</div><div class='ctx'> 		panic("Hardware DMA cache coherency not supported");</div><div class='head'>diff --git a/arch/mips/nxp/pnx8550/common/Makefile b/arch/mips/nxp/pnx8550/common/Makefile<br/>index 31cc1a5cec3b..dd9e7b1f7fd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/nxp/pnx8550/common/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/nxp/pnx8550/common/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/nxp/pnx8550/common/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/nxp/pnx8550/common/Makefile</a></div><div class='hunk'>@@ -24,6 +24,5 @@</div><div class='ctx'> </div><div class='ctx'> obj-y := setup.o prom.o int.o reset.o time.o proc.o platform.o</div><div class='ctx'> obj-$(CONFIG_PCI) += pci.o</div><div class='del'>-obj-$(CONFIG_KGDB) += gdb_hook.o</div><div class='ctx'> </div><div class='ctx'> EXTRA_CFLAGS += -Werror</div><div class='head'>diff --git a/arch/mips/nxp/pnx8550/common/gdb_hook.c b/arch/mips/nxp/pnx8550/common/gdb_hook.c<br/>deleted file mode 100644<br/>index ad4624f6d9bc..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/nxp/pnx8550/common/gdb_hook.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/nxp/pnx8550/common/gdb_hook.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,109 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Carsten Langgaard, carstenl@mips.com</div><div class='del'>- * Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can distribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License (Version 2) as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope it will be useful, but WITHOUT</div><div class='del'>- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License</div><div class='del'>- *  for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along</div><div class='del'>- *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='del'>- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- * This is the interface to the remote debugger stub.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/serial.h&gt;</div><div class='del'>-#include &lt;linux/serialP.h&gt;</div><div class='del'>-#include &lt;linux/serial_reg.h&gt;</div><div class='del'>-#include &lt;linux/serial_ip3106.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/serial.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;uart.h&gt;</div><div class='del'>-</div><div class='del'>-static struct serial_state rs_table[IP3106_NR_PORTS] = {</div><div class='del'>-};</div><div class='del'>-static struct async_struct kdb_port_info = {0};</div><div class='del'>-</div><div class='del'>-void rs_kgdb_hook(int tty_no)</div><div class='del'>-{</div><div class='del'>-	struct serial_state *ser = &amp;rs_table[tty_no];</div><div class='del'>-</div><div class='del'>-	kdb_port_info.state = ser;</div><div class='del'>-	kdb_port_info.magic = SERIAL_MAGIC;</div><div class='del'>-	kdb_port_info.port  = tty_no;</div><div class='del'>-	kdb_port_info.flags = ser-&gt;flags;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Clear all interrupts</div><div class='del'>-	 */</div><div class='del'>-	/* Clear all the transmitter FIFO counters (pointer and status) */</div><div class='del'>-	ip3106_lcr(UART_BASE, tty_no) |= IP3106_UART_LCR_TX_RST;</div><div class='del'>-	/* Clear all the receiver FIFO counters (pointer and status) */</div><div class='del'>-	ip3106_lcr(UART_BASE, tty_no) |= IP3106_UART_LCR_RX_RST;</div><div class='del'>-	/* Clear all interrupts */</div><div class='del'>-	ip3106_iclr(UART_BASE, tty_no) = IP3106_UART_INT_ALLRX |</div><div class='del'>-		IP3106_UART_INT_ALLTX;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now, initialize the UART</div><div class='del'>-	 */</div><div class='del'>-	ip3106_lcr(UART_BASE, tty_no) = IP3106_UART_LCR_8BIT;</div><div class='del'>-	ip3106_baud(UART_BASE, tty_no) = 5; // 38400 Baud</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int putDebugChar(char c)</div><div class='del'>-{</div><div class='del'>-	/* Wait until FIFO not full */</div><div class='del'>-	while (((ip3106_fifo(UART_BASE, kdb_port_info.port) &amp; IP3106_UART_FIFO_TXFIFO) &gt;&gt; 16) &gt;= 16)</div><div class='del'>-		;</div><div class='del'>-	/* Send one char */</div><div class='del'>-	ip3106_fifo(UART_BASE, kdb_port_info.port) = c;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char getDebugChar(void)</div><div class='del'>-{</div><div class='del'>-	char ch;</div><div class='del'>-</div><div class='del'>-	/* Wait until there is a char in the FIFO */</div><div class='del'>-	while (!((ip3106_fifo(UART_BASE, kdb_port_info.port) &amp;</div><div class='del'>-					IP3106_UART_FIFO_RXFIFO) &gt;&gt; 8))</div><div class='del'>-		;</div><div class='del'>-	/* Read one char */</div><div class='del'>-	ch = ip3106_fifo(UART_BASE, kdb_port_info.port) &amp;</div><div class='del'>-		IP3106_UART_FIFO_RBRTHR;</div><div class='del'>-	/* Advance the RX FIFO read pointer */</div><div class='del'>-	ip3106_lcr(UART_BASE, kdb_port_info.port) |= IP3106_UART_LCR_RX_NEXT;</div><div class='del'>-	return (ch);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rs_disable_debug_interrupts(void)</div><div class='del'>-{</div><div class='del'>-	ip3106_ien(UART_BASE, kdb_port_info.port) = 0; /* Disable all interrupts */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rs_enable_debug_interrupts(void)</div><div class='del'>-{</div><div class='del'>-	/* Clear all the transmitter FIFO counters (pointer and status) */</div><div class='del'>-	ip3106_lcr(UART_BASE, kdb_port_info.port) |= IP3106_UART_LCR_TX_RST;</div><div class='del'>-	/* Clear all the receiver FIFO counters (pointer and status) */</div><div class='del'>-	ip3106_lcr(UART_BASE, kdb_port_info.port) |= IP3106_UART_LCR_RX_RST;</div><div class='del'>-	/* Clear all interrupts */</div><div class='del'>-	ip3106_iclr(UART_BASE, kdb_port_info.port) = IP3106_UART_INT_ALLRX |</div><div class='del'>-		IP3106_UART_INT_ALLTX;</div><div class='del'>-	ip3106_ien(UART_BASE, kdb_port_info.port)  = IP3106_UART_INT_ALLRX; /* Enable RX interrupts */</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/nxp/pnx8550/common/int.c b/arch/mips/nxp/pnx8550/common/int.c<br/>index aad03429a5e3..f080f114a1bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/nxp/pnx8550/common/int.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/nxp/pnx8550/common/int.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/nxp/pnx8550/common/int.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/nxp/pnx8550/common/int.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/gdb-stub.h&gt;</div><div class='ctx'> #include &lt;int.h&gt;</div><div class='ctx'> #include &lt;uart.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/nxp/pnx8550/common/proc.c b/arch/mips/nxp/pnx8550/common/proc.c<br/>index 18b125e3b65d..acf1fa889444 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/nxp/pnx8550/common/proc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/nxp/pnx8550/common/proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/nxp/pnx8550/common/proc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/nxp/pnx8550/common/proc.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/gdb-stub.h&gt;</div><div class='ctx'> #include &lt;int.h&gt;</div><div class='ctx'> #include &lt;uart.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/nxp/pnx8550/common/setup.c b/arch/mips/nxp/pnx8550/common/setup.c<br/>index 92d764c97701..2aed50fef10f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/nxp/pnx8550/common/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/nxp/pnx8550/common/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/nxp/pnx8550/common/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/nxp/pnx8550/common/setup.c</a></div><div class='hunk'>@@ -47,7 +47,6 @@ extern void pnx8550_machine_halt(void);</div><div class='ctx'> extern void pnx8550_machine_power_off(void);</div><div class='ctx'> extern struct resource ioport_resource;</div><div class='ctx'> extern struct resource iomem_resource;</div><div class='del'>-extern void rs_kgdb_hook(int tty_no);</div><div class='ctx'> extern char *prom_getcmdline(void);</div><div class='ctx'> </div><div class='ctx'> struct resource standard_io_resources[] = {</div><div class='hunk'>@@ -142,16 +141,5 @@ void __init plat_mem_setup(void)</div><div class='ctx'> 		ip3106_baud(UART_BASE, pnx8550_console_port) = 5;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-	argptr = prom_getcmdline();</div><div class='del'>-	if ((argptr = strstr(argptr, "kgdb=ttyS")) != NULL) {</div><div class='del'>-		int line;</div><div class='del'>-		argptr += strlen("kgdb=ttyS");</div><div class='del'>-		line = *argptr == '0' ? 0 : 1;</div><div class='del'>-		rs_kgdb_hook(line);</div><div class='del'>-		pr_info("KGDB: Using ttyS%i for session, "</div><div class='del'>-		        "please connect your debugger\n", line ? 1 : 0);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/pci/ops-tx3927.c b/arch/mips/pci/ops-tx3927.c<br/>index 8a17a39e5bf2..31c150196595 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-tx3927.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/pci/ops-tx3927.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-tx3927.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pci/ops-tx3927.c</a></div><div class='hunk'>@@ -37,45 +37,48 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/txx9irq.h&gt;</div><div class='add'>+#include &lt;asm/txx9/pci.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/tx3927.h&gt;</div><div class='ctx'> </div><div class='del'>-static inline int mkaddr(unsigned char bus, unsigned char dev_fn,</div><div class='del'>-	unsigned char where)</div><div class='add'>+static int mkaddr(struct pci_bus *bus, unsigned char devfn, unsigned char where)</div><div class='ctx'> {</div><div class='del'>-	if (bus == 0 &amp;&amp; dev_fn &gt;= PCI_DEVFN(TX3927_PCIC_MAX_DEVNU, 0))</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	tx3927_pcicptr-&gt;ica = ((bus &amp; 0xff) &lt;&lt; 0x10) |</div><div class='del'>-	                      ((dev_fn &amp; 0xff) &lt;&lt; 0x08) |</div><div class='del'>-	                      (where &amp; 0xfc);</div><div class='add'>+	if (bus-&gt;parent == NULL &amp;&amp;</div><div class='add'>+	    devfn &gt;= PCI_DEVFN(TX3927_PCIC_MAX_DEVNU, 0))</div><div class='add'>+		return -1;</div><div class='add'>+	tx3927_pcicptr-&gt;ica =</div><div class='add'>+		((bus-&gt;number &amp; 0xff) &lt;&lt; 0x10) |</div><div class='add'>+		((devfn &amp; 0xff) &lt;&lt; 0x08) |</div><div class='add'>+		(where &amp; 0xfc) | (bus-&gt;parent ? 1 : 0);</div><div class='ctx'> </div><div class='ctx'> 	/* clear M_ABORT and Disable M_ABORT Int. */</div><div class='ctx'> 	tx3927_pcicptr-&gt;pcistat |= PCI_STATUS_REC_MASTER_ABORT;</div><div class='ctx'> 	tx3927_pcicptr-&gt;pcistatim &amp;= ~PCI_STATUS_REC_MASTER_ABORT;</div><div class='del'>-</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int check_abort(void)</div><div class='ctx'> {</div><div class='del'>-	if (tx3927_pcicptr-&gt;pcistat &amp; PCI_STATUS_REC_MASTER_ABORT)</div><div class='add'>+	if (tx3927_pcicptr-&gt;pcistat &amp; PCI_STATUS_REC_MASTER_ABORT) {</div><div class='ctx'> 		tx3927_pcicptr-&gt;pcistat |= PCI_STATUS_REC_MASTER_ABORT;</div><div class='ctx'> 		tx3927_pcicptr-&gt;pcistatim |= PCI_STATUS_REC_MASTER_ABORT;</div><div class='add'>+		/* flush write buffer */</div><div class='add'>+		iob();</div><div class='ctx'> 		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	return PCIBIOS_SUCCESSFUL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tx3927_pci_read_config(struct pci_bus *bus, unsigned int devfn,</div><div class='ctx'> 	int where, int size, u32 * val)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = mkaddr(bus-&gt;number, devfn, where);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	if (mkaddr(bus, devfn, where)) {</div><div class='add'>+		*val = 0xffffffff;</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	switch (size) {</div><div class='ctx'> 	case 1:</div><div class='hunk'>@@ -97,11 +100,8 @@ static int tx3927_pci_read_config(struct pci_bus *bus, unsigned int devfn,</div><div class='ctx'> static int tx3927_pci_write_config(struct pci_bus *bus, unsigned int devfn,</div><div class='ctx'> 	int where, int size, u32 val)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = mkaddr(bus-&gt;number, devfn, where);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	if (mkaddr(bus, devfn, where))</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='ctx'> </div><div class='ctx'> 	switch (size) {</div><div class='ctx'> 	case 1:</div><div class='hunk'>@@ -117,11 +117,6 @@ static int tx3927_pci_write_config(struct pci_bus *bus, unsigned int devfn,</div><div class='ctx'> 		tx3927_pcicptr-&gt;icd = cpu_to_le32(val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tx3927_pcicptr-&gt;pcistat &amp; PCI_STATUS_REC_MASTER_ABORT)</div><div class='del'>-		tx3927_pcicptr-&gt;pcistat |= PCI_STATUS_REC_MASTER_ABORT;</div><div class='del'>-		tx3927_pcicptr-&gt;pcistatim |= PCI_STATUS_REC_MASTER_ABORT;</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='ctx'> 	return check_abort();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -202,3 +197,34 @@ void __init tx3927_pcic_setup(struct pci_controller *channel,</div><div class='ctx'> 		PCI_COMMAND_PARITY | PCI_COMMAND_SERR;</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static irqreturn_t tx3927_pcierr_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs *regs = get_irq_regs();</div><div class='add'>+</div><div class='add'>+	if (txx9_pci_err_action != TXX9_PCI_ERR_IGNORE) {</div><div class='add'>+		printk(KERN_WARNING "PCI error interrupt at 0x%08lx.\n",</div><div class='add'>+		       regs-&gt;cp0_epc);</div><div class='add'>+		printk(KERN_WARNING "pcistat:%02x, lbstat:%04lx\n",</div><div class='add'>+		       tx3927_pcicptr-&gt;pcistat, tx3927_pcicptr-&gt;lbstat);</div><div class='add'>+	}</div><div class='add'>+	if (txx9_pci_err_action != TXX9_PCI_ERR_PANIC) {</div><div class='add'>+		/* clear all pci errors */</div><div class='add'>+		tx3927_pcicptr-&gt;pcistat |= TX3927_PCIC_PCISTATIM_ALL;</div><div class='add'>+		tx3927_pcicptr-&gt;istat = TX3927_PCIC_IIM_ALL;</div><div class='add'>+		tx3927_pcicptr-&gt;tstat = TX3927_PCIC_TIM_ALL;</div><div class='add'>+		tx3927_pcicptr-&gt;lbstat = TX3927_PCIC_LBIM_ALL;</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+	console_verbose();</div><div class='add'>+	panic("PCI error.");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init tx3927_setup_pcierr_irq(void)</div><div class='add'>+{</div><div class='add'>+	if (request_irq(TXX9_IRQ_BASE + TX3927_IR_PCI,</div><div class='add'>+			tx3927_pcierr_interrupt,</div><div class='add'>+			IRQF_DISABLED, "PCI error",</div><div class='add'>+			(void *)TX3927_PCIC_REG))</div><div class='add'>+		printk(KERN_WARNING "Failed to request irq for PCIERR\n");</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/pci/ops-tx4927.c b/arch/mips/pci/ops-tx4927.c<br/>index c6b49bccd274..5989e747527f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-tx4927.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/pci/ops-tx4927.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-tx4927.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pci/ops-tx4927.c</a></div><div class='hunk'>@@ -16,6 +16,8 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;asm/txx9/pci.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/tx4927pcic.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct {</div><div class='hunk'>@@ -85,6 +87,8 @@ static int check_abort(struct tx4927_pcic_reg __iomem *pcicptr)</div><div class='ctx'> 		__raw_writel((__raw_readl(&amp;pcicptr-&gt;pcistatus) &amp; 0x0000ffff)</div><div class='ctx'> 			     | (PCI_STATUS_REC_MASTER_ABORT &lt;&lt; 16),</div><div class='ctx'> 			     &amp;pcicptr-&gt;pcistatus);</div><div class='add'>+		/* flush write buffer */</div><div class='add'>+		iob();</div><div class='ctx'> 		code = PCIBIOS_DEVICE_NOT_FOUND;</div><div class='ctx'> 	}</div><div class='ctx'> 	return code;</div><div class='hunk'>@@ -192,6 +196,28 @@ static struct {</div><div class='ctx'> 	.gbwc = 0xfe0,	/* 4064 GBUSCLK for CCFG.GTOT=0b11 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+char *__devinit tx4927_pcibios_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	if (!strncmp(str, "trdyto=", 7)) {</div><div class='add'>+		if (strict_strtoul(str + 7, 0, &amp;val) == 0)</div><div class='add'>+			tx4927_pci_opts.trdyto = val;</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	if (!strncmp(str, "retryto=", 8)) {</div><div class='add'>+		if (strict_strtoul(str + 8, 0, &amp;val) == 0)</div><div class='add'>+			tx4927_pci_opts.retryto = val;</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	if (!strncmp(str, "gbwc=", 5)) {</div><div class='add'>+		if (strict_strtoul(str + 5, 0, &amp;val) == 0)</div><div class='add'>+			tx4927_pci_opts.gbwc = val;</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return str;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init tx4927_pcic_setup(struct tx4927_pcic_reg __iomem *pcicptr,</div><div class='ctx'> 			      struct pci_controller *channel, int extarb)</div><div class='ctx'> {</div><div class='hunk'>@@ -406,3 +432,95 @@ void tx4927_report_pcic_status(void)</div><div class='ctx'> 			tx4927_report_pcic_status1(pcicptrs[i].pcicptr);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static void tx4927_dump_pcic_settings1(struct tx4927_pcic_reg __iomem *pcicptr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	__u32 __iomem *preg = (__u32 __iomem *)pcicptr;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "tx4927 pcic (0x%p) settings:", pcicptr);</div><div class='add'>+	for (i = 0; i &lt; sizeof(struct tx4927_pcic_reg); i += 4, preg++) {</div><div class='add'>+		if (i % 32 == 0) {</div><div class='add'>+			printk(KERN_CONT "\n");</div><div class='add'>+			printk(KERN_INFO "%04x:", i);</div><div class='add'>+		}</div><div class='add'>+		/* skip registers with side-effects */</div><div class='add'>+		if (i == offsetof(struct tx4927_pcic_reg, g2pintack)</div><div class='add'>+		    || i == offsetof(struct tx4927_pcic_reg, g2pspc)</div><div class='add'>+		    || i == offsetof(struct tx4927_pcic_reg, g2pcfgadrs)</div><div class='add'>+		    || i == offsetof(struct tx4927_pcic_reg, g2pcfgdata)) {</div><div class='add'>+			printk(KERN_CONT " XXXXXXXX");</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		printk(KERN_CONT " %08x", __raw_readl(preg));</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_CONT "\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tx4927_dump_pcic_settings(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(pcicptrs); i++) {</div><div class='add'>+		if (pcicptrs[i].pcicptr)</div><div class='add'>+			tx4927_dump_pcic_settings1(pcicptrs[i].pcicptr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+irqreturn_t tx4927_pcierr_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs *regs = get_irq_regs();</div><div class='add'>+	struct tx4927_pcic_reg __iomem *pcicptr =</div><div class='add'>+		(struct tx4927_pcic_reg __iomem *)(unsigned long)dev_id;</div><div class='add'>+</div><div class='add'>+	if (txx9_pci_err_action != TXX9_PCI_ERR_IGNORE) {</div><div class='add'>+		printk(KERN_WARNING "PCIERR interrupt at 0x%0*lx\n",</div><div class='add'>+		       (int)(2 * sizeof(unsigned long)), regs-&gt;cp0_epc);</div><div class='add'>+		tx4927_report_pcic_status1(pcicptr);</div><div class='add'>+	}</div><div class='add'>+	if (txx9_pci_err_action != TXX9_PCI_ERR_PANIC) {</div><div class='add'>+		/* clear all pci errors */</div><div class='add'>+		__raw_writel((__raw_readl(&amp;pcicptr-&gt;pcistatus) &amp; 0x0000ffff)</div><div class='add'>+			     | (TX4927_PCIC_PCISTATUS_ALL &lt;&lt; 16),</div><div class='add'>+			     &amp;pcicptr-&gt;pcistatus);</div><div class='add'>+		__raw_writel(TX4927_PCIC_G2PSTATUS_ALL, &amp;pcicptr-&gt;g2pstatus);</div><div class='add'>+		__raw_writel(TX4927_PCIC_PBASTATUS_ALL, &amp;pcicptr-&gt;pbastatus);</div><div class='add'>+		__raw_writel(TX4927_PCIC_PCICSTATUS_ALL, &amp;pcicptr-&gt;pcicstatus);</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+	console_verbose();</div><div class='add'>+	tx4927_dump_pcic_settings1(pcicptr);</div><div class='add'>+	panic("PCI error.");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_TOSHIBA_FPCIB0</div><div class='add'>+static void __init tx4927_quirk_slc90e66_bridge(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct tx4927_pcic_reg __iomem *pcicptr = pci_bus_to_pcicptr(dev-&gt;bus);</div><div class='add'>+</div><div class='add'>+	if (!pcicptr)</div><div class='add'>+		return;</div><div class='add'>+	if (__raw_readl(&amp;pcicptr-&gt;pbacfg) &amp; TX4927_PCIC_PBACFG_PBAEN) {</div><div class='add'>+		/* Reset Bus Arbiter */</div><div class='add'>+		__raw_writel(TX4927_PCIC_PBACFG_RPBA, &amp;pcicptr-&gt;pbacfg);</div><div class='add'>+		/*</div><div class='add'>+		 * swap reqBP and reqXP (raise priority of SLC90E66).</div><div class='add'>+		 * SLC90E66(PCI-ISA bridge) is connected to REQ2 on</div><div class='add'>+		 * PCI Backplane board.</div><div class='add'>+		 */</div><div class='add'>+		__raw_writel(0x72543610, &amp;pcicptr-&gt;pbareqport);</div><div class='add'>+		__raw_writel(0, &amp;pcicptr-&gt;pbabm);</div><div class='add'>+		/* Use Fixed ParkMaster (required by SLC90E66) */</div><div class='add'>+		__raw_writel(TX4927_PCIC_PBACFG_FIXPA, &amp;pcicptr-&gt;pbacfg);</div><div class='add'>+		/* Enable Bus Arbiter */</div><div class='add'>+		__raw_writel(TX4927_PCIC_PBACFG_FIXPA |</div><div class='add'>+			     TX4927_PCIC_PBACFG_PBAEN,</div><div class='add'>+			     &amp;pcicptr-&gt;pbacfg);</div><div class='add'>+		printk(KERN_INFO "PCI: Use Fixed Park Master (REQPORT %08x)\n",</div><div class='add'>+		       __raw_readl(&amp;pcicptr-&gt;pbareqport));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#define PCI_DEVICE_ID_EFAR_SLC90E66_0 0x9460</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_0,</div><div class='add'>+	tx4927_quirk_slc90e66_bridge);</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c<br/>index ce92f82b16d2..bd78368c82bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-ip27.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/pci/pci-ip27.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-ip27.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pci/pci-ip27.c</a></div><div class='hunk'>@@ -205,6 +205,7 @@ int pcibus_to_node(struct pci_bus *bus)</div><div class='ctx'> </div><div class='ctx'> 	return bc-&gt;nasid;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(pcibus_to_node);</div><div class='ctx'> </div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3,</div><div class='ctx'> 	pci_fixup_ioc3);</div><div class='head'>diff --git a/arch/mips/pci/pci-tx4927.c b/arch/mips/pci/pci-tx4927.c<br/>index 27e86a09dd41..aaa900596792 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-tx4927.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/pci/pci-tx4927.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-tx4927.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pci/pci-tx4927.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/generic.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/tx4927.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -81,3 +82,12 @@ int __init tx4927_pciclk66_setup(void)</div><div class='ctx'> 		pciclk = -1;</div><div class='ctx'> 	return pciclk;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void __init tx4927_setup_pcierr_irq(void)</div><div class='add'>+{</div><div class='add'>+	if (request_irq(TXX9_IRQ_BASE + TX4927_IR_PCIERR,</div><div class='add'>+			tx4927_pcierr_interrupt,</div><div class='add'>+			IRQF_DISABLED, "PCI error",</div><div class='add'>+			(void *)TX4927_PCIC_REG))</div><div class='add'>+		printk(KERN_WARNING "Failed to request irq for PCIERR\n");</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/pci/pci-tx4938.c b/arch/mips/pci/pci-tx4938.c<br/>index e5375511c2b7..60e2c52c2c5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-tx4938.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/pci/pci-tx4938.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-tx4938.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pci/pci-tx4938.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/generic.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/tx4938.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -132,3 +133,12 @@ int tx4938_pcic1_map_irq(const struct pci_dev *dev, u8 slot)</div><div class='ctx'> 	}</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void __init tx4938_setup_pcierr_irq(void)</div><div class='add'>+{</div><div class='add'>+	if (request_irq(TXX9_IRQ_BASE + TX4938_IR_PCIERR,</div><div class='add'>+			tx4927_pcierr_interrupt,</div><div class='add'>+			IRQF_DISABLED, "PCI error",</div><div class='add'>+			(void *)TX4927_PCIC_REG))</div><div class='add'>+		printk(KERN_WARNING "Failed to request irq for PCIERR\n");</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c<br/>index 77bd5b68dc43..c7fe6ec621e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/pci/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pci/pci.c</a></div><div class='hunk'>@@ -328,7 +328,11 @@ EXPORT_SYMBOL(PCIBIOS_MIN_IO);</div><div class='ctx'> EXPORT_SYMBOL(PCIBIOS_MIN_MEM);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-char *pcibios_setup(char *str)</div><div class='add'>+char * (*pcibios_plat_setup)(char *str) __devinitdata;</div><div class='add'>+</div><div class='add'>+char *__devinit pcibios_setup(char *str)</div><div class='ctx'> {</div><div class='add'>+	if (pcibios_plat_setup)</div><div class='add'>+		return pcibios_plat_setup(str);</div><div class='ctx'> 	return str;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/pmc-sierra/msp71xx/msp_serial.c b/arch/mips/pmc-sierra/msp71xx/msp_serial.c<br/>index 9de34302e5f4..f7261628d8a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/msp71xx/msp_serial.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/pmc-sierra/msp71xx/msp_serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/msp71xx/msp_serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pmc-sierra/msp71xx/msp_serial.c</a></div><div class='hunk'>@@ -38,68 +38,6 @@</div><div class='ctx'> #include &lt;msp_int.h&gt;</div><div class='ctx'> #include &lt;msp_regs.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-/*</div><div class='del'>- * kgdb uses serial port 1 so the console can remain on port 0.</div><div class='del'>- * To use port 0 change the definition to read as follows:</div><div class='del'>- * #define DEBUG_PORT_BASE KSEG1ADDR(MSP_UART0_BASE)</div><div class='del'>- */</div><div class='del'>-#define DEBUG_PORT_BASE KSEG1ADDR(MSP_UART1_BASE)</div><div class='del'>-</div><div class='del'>-int putDebugChar(char c)</div><div class='del'>-{</div><div class='del'>-	volatile uint32_t *uart = (volatile uint32_t *)DEBUG_PORT_BASE;</div><div class='del'>-	uint32_t val = (uint32_t)c;</div><div class='del'>-</div><div class='del'>-	local_irq_disable();</div><div class='del'>-	while( !(uart[5] &amp; 0x20) ); /* Wait for TXRDY */</div><div class='del'>-	uart[0] = val;</div><div class='del'>-	while( !(uart[5] &amp; 0x20) ); /* Wait for TXRDY */</div><div class='del'>-	local_irq_enable();</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char getDebugChar(void)</div><div class='del'>-{</div><div class='del'>-	volatile uint32_t *uart = (volatile uint32_t *)DEBUG_PORT_BASE;</div><div class='del'>-	uint32_t val;</div><div class='del'>-</div><div class='del'>-	while( !(uart[5] &amp; 0x01) ); /* Wait for RXRDY */</div><div class='del'>-	val = uart[0];</div><div class='del'>-</div><div class='del'>-	return (char)val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void initDebugPort(unsigned int uartclk, unsigned int baudrate)</div><div class='del'>-{</div><div class='del'>-	unsigned int baud_divisor = (uartclk + 8 * baudrate)/(16 * baudrate);</div><div class='del'>-</div><div class='del'>-	/* Enable FIFOs */</div><div class='del'>-	writeb(UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR |</div><div class='del'>-			UART_FCR_CLEAR_XMIT | UART_FCR_TRIGGER_4,</div><div class='del'>-		(char *)DEBUG_PORT_BASE + (UART_FCR * 4));</div><div class='del'>-</div><div class='del'>-	/* Select brtc divisor */</div><div class='del'>-	writeb(UART_LCR_DLAB, (char *)DEBUG_PORT_BASE + (UART_LCR * 4));</div><div class='del'>-</div><div class='del'>-	/* Store divisor lsb */</div><div class='del'>-	writeb(baud_divisor, (char *)DEBUG_PORT_BASE + (UART_TX * 4));</div><div class='del'>-</div><div class='del'>-	/* Store divisor msb */</div><div class='del'>-	writeb(baud_divisor &gt;&gt; 8, (char *)DEBUG_PORT_BASE + (UART_IER * 4));</div><div class='del'>-</div><div class='del'>-	/* Set 8N1 mode */</div><div class='del'>-	writeb(UART_LCR_WLEN8, (char *)DEBUG_PORT_BASE + (UART_LCR * 4));</div><div class='del'>-</div><div class='del'>-	/* Disable flow control */</div><div class='del'>-	writeb(0, (char *)DEBUG_PORT_BASE + (UART_MCR * 4));</div><div class='del'>-</div><div class='del'>-	/* Disable receive interrupt(!) */</div><div class='del'>-	writeb(0, (char *)DEBUG_PORT_BASE + (UART_IER * 4));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> void __init msp_serial_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	char    *s;</div><div class='hunk'>@@ -139,17 +77,6 @@ void __init msp_serial_setup(void)</div><div class='ctx'> 		case MACH_MSP7120_FPGA:</div><div class='ctx'> 			/* Enable UART1 on MSP4200 and MSP7120 */</div><div class='ctx'> 			*GPIO_CFG2_REG = 0x00002299;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-			/* Initialize UART1 for kgdb since PMON doesn't */</div><div class='del'>-			if( DEBUG_PORT_BASE == KSEG1ADDR(MSP_UART1_BASE) ) {</div><div class='del'>-				if( mips_machtype == MACH_MSP4200_FPGA</div><div class='del'>-				 || mips_machtype == MACH_MSP7120_FPGA )</div><div class='del'>-					initDebugPort(uartclk, 19200);</div><div class='del'>-				else</div><div class='del'>-					initDebugPort(uartclk, 57600);</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='head'>diff --git a/arch/mips/pmc-sierra/yosemite/Makefile b/arch/mips/pmc-sierra/yosemite/Makefile<br/>index 8fd9a04e3534..b16f95c3df65 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/yosemite/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/pmc-sierra/yosemite/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/yosemite/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pmc-sierra/yosemite/Makefile</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'> </div><div class='ctx'> obj-y    += irq.o prom.o py-console.o setup.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_KGDB)		+= dbg_io.o</div><div class='ctx'> obj-$(CONFIG_SMP)		+= smp.o</div><div class='ctx'> </div><div class='ctx'> EXTRA_CFLAGS += -Werror</div><div class='head'>diff --git a/arch/mips/pmc-sierra/yosemite/dbg_io.c b/arch/mips/pmc-sierra/yosemite/dbg_io.c<br/>deleted file mode 100644<br/>index 6362c702e389..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/yosemite/dbg_io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/pmc-sierra/yosemite/dbg_io.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,180 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2003 PMC-Sierra</div><div class='del'>- * Author: Manish Lachwani (lachwani@pmc-sierra.com)</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- *  under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Support for KGDB for the Yosemite board. We make use of single serial</div><div class='del'>- * port to be used for KGDB as well as console. The second serial port</div><div class='del'>- * seems to be having a problem. Single IRQ is allocated for both the</div><div class='del'>- * ports. Hence, the interrupt routing code needs to figure out whether</div><div class='del'>- * the interrupt came from channel A or B.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm/serial.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Baud rate, Parity, Data and Stop bit settings for the</div><div class='del'>- * serial port on the Yosemite. Note that the Early printk</div><div class='del'>- * patch has been added. So, we should be all set to go</div><div class='del'>- */</div><div class='del'>-#define	YOSEMITE_BAUD_2400	2400</div><div class='del'>-#define	YOSEMITE_BAUD_4800	4800</div><div class='del'>-#define	YOSEMITE_BAUD_9600	9600</div><div class='del'>-#define	YOSEMITE_BAUD_19200	19200</div><div class='del'>-#define	YOSEMITE_BAUD_38400	38400</div><div class='del'>-#define	YOSEMITE_BAUD_57600	57600</div><div class='del'>-#define	YOSEMITE_BAUD_115200	115200</div><div class='del'>-</div><div class='del'>-#define	YOSEMITE_PARITY_NONE	0</div><div class='del'>-#define	YOSEMITE_PARITY_ODD	0x08</div><div class='del'>-#define	YOSEMITE_PARITY_EVEN	0x18</div><div class='del'>-#define	YOSEMITE_PARITY_MARK	0x28</div><div class='del'>-#define	YOSEMITE_PARITY_SPACE	0x38</div><div class='del'>-</div><div class='del'>-#define	YOSEMITE_DATA_5BIT	0x0</div><div class='del'>-#define	YOSEMITE_DATA_6BIT	0x1</div><div class='del'>-#define	YOSEMITE_DATA_7BIT	0x2</div><div class='del'>-#define	YOSEMITE_DATA_8BIT	0x3</div><div class='del'>-</div><div class='del'>-#define	YOSEMITE_STOP_1BIT	0x0</div><div class='del'>-#define	YOSEMITE_STOP_2BIT	0x4</div><div class='del'>-</div><div class='del'>-/* This is crucial */</div><div class='del'>-#define	SERIAL_REG_OFS		0x1</div><div class='del'>-</div><div class='del'>-#define	SERIAL_RCV_BUFFER	0x0</div><div class='del'>-#define	SERIAL_TRANS_HOLD	0x0</div><div class='del'>-#define	SERIAL_SEND_BUFFER	0x0</div><div class='del'>-#define	SERIAL_INTR_ENABLE	(1 * SERIAL_REG_OFS)</div><div class='del'>-#define	SERIAL_INTR_ID		(2 * SERIAL_REG_OFS)</div><div class='del'>-#define	SERIAL_DATA_FORMAT	(3 * SERIAL_REG_OFS)</div><div class='del'>-#define	SERIAL_LINE_CONTROL	(3 * SERIAL_REG_OFS)</div><div class='del'>-#define	SERIAL_MODEM_CONTROL	(4 * SERIAL_REG_OFS)</div><div class='del'>-#define	SERIAL_RS232_OUTPUT	(4 * SERIAL_REG_OFS)</div><div class='del'>-#define	SERIAL_LINE_STATUS	(5 * SERIAL_REG_OFS)</div><div class='del'>-#define	SERIAL_MODEM_STATUS	(6 * SERIAL_REG_OFS)</div><div class='del'>-#define	SERIAL_RS232_INPUT	(6 * SERIAL_REG_OFS)</div><div class='del'>-#define	SERIAL_SCRATCH_PAD	(7 * SERIAL_REG_OFS)</div><div class='del'>-</div><div class='del'>-#define	SERIAL_DIVISOR_LSB	(0 * SERIAL_REG_OFS)</div><div class='del'>-#define	SERIAL_DIVISOR_MSB	(1 * SERIAL_REG_OFS)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Functions to READ and WRITE to serial port 0</div><div class='del'>- */</div><div class='del'>-#define	SERIAL_READ(ofs)		(*((volatile unsigned char*)	\</div><div class='del'>-					(TITAN_SERIAL_BASE + ofs)))</div><div class='del'>-</div><div class='del'>-#define	SERIAL_WRITE(ofs, val)		((*((volatile unsigned char*)	\</div><div class='del'>-					(TITAN_SERIAL_BASE + ofs))) = val)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Functions to READ and WRITE to serial port 1</div><div class='del'>- */</div><div class='del'>-#define	SERIAL_READ_1(ofs)		(*((volatile unsigned char*)	\</div><div class='del'>-					(TITAN_SERIAL_BASE_1 + ofs)))</div><div class='del'>-</div><div class='del'>-#define	SERIAL_WRITE_1(ofs, val)	((*((volatile unsigned char*)	\</div><div class='del'>-					(TITAN_SERIAL_BASE_1 + ofs))) = val)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Second serial port initialization</div><div class='del'>- */</div><div class='del'>-void init_second_port(void)</div><div class='del'>-{</div><div class='del'>-	/* Disable Interrupts */</div><div class='del'>-	SERIAL_WRITE_1(SERIAL_LINE_CONTROL, 0x0);</div><div class='del'>-	SERIAL_WRITE_1(SERIAL_INTR_ENABLE, 0x0);</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		unsigned int divisor;</div><div class='del'>-</div><div class='del'>-		SERIAL_WRITE_1(SERIAL_LINE_CONTROL, 0x80);</div><div class='del'>-		divisor = TITAN_SERIAL_BASE_BAUD / YOSEMITE_BAUD_115200;</div><div class='del'>-		SERIAL_WRITE_1(SERIAL_DIVISOR_LSB, divisor &amp; 0xff);</div><div class='del'>-</div><div class='del'>-		SERIAL_WRITE_1(SERIAL_DIVISOR_MSB,</div><div class='del'>-			       (divisor &amp; 0xff00) &gt;&gt; 8);</div><div class='del'>-		SERIAL_WRITE_1(SERIAL_LINE_CONTROL, 0x0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	SERIAL_WRITE_1(SERIAL_DATA_FORMAT, YOSEMITE_DATA_8BIT |</div><div class='del'>-		       YOSEMITE_PARITY_NONE | YOSEMITE_STOP_1BIT);</div><div class='del'>-</div><div class='del'>-	/* Enable Interrupts */</div><div class='del'>-	SERIAL_WRITE_1(SERIAL_INTR_ENABLE, 0xf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Initialize the serial port for KGDB debugging */</div><div class='del'>-void debugInit(unsigned int baud, unsigned char data, unsigned char parity,</div><div class='del'>-	       unsigned char stop)</div><div class='del'>-{</div><div class='del'>-	/* Disable Interrupts */</div><div class='del'>-	SERIAL_WRITE(SERIAL_LINE_CONTROL, 0x0);</div><div class='del'>-	SERIAL_WRITE(SERIAL_INTR_ENABLE, 0x0);</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		unsigned int divisor;</div><div class='del'>-</div><div class='del'>-		SERIAL_WRITE(SERIAL_LINE_CONTROL, 0x80);</div><div class='del'>-</div><div class='del'>-		divisor = TITAN_SERIAL_BASE_BAUD / baud;</div><div class='del'>-		SERIAL_WRITE(SERIAL_DIVISOR_LSB, divisor &amp; 0xff);</div><div class='del'>-</div><div class='del'>-		SERIAL_WRITE(SERIAL_DIVISOR_MSB, (divisor &amp; 0xff00) &gt;&gt; 8);</div><div class='del'>-		SERIAL_WRITE(SERIAL_LINE_CONTROL, 0x0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	SERIAL_WRITE(SERIAL_DATA_FORMAT, data | parity | stop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int remoteDebugInitialized = 0;</div><div class='del'>-</div><div class='del'>-unsigned char getDebugChar(void)</div><div class='del'>-{</div><div class='del'>-	if (!remoteDebugInitialized) {</div><div class='del'>-		remoteDebugInitialized = 1;</div><div class='del'>-		debugInit(YOSEMITE_BAUD_115200,</div><div class='del'>-			  YOSEMITE_DATA_8BIT,</div><div class='del'>-			  YOSEMITE_PARITY_NONE, YOSEMITE_STOP_1BIT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ((SERIAL_READ(SERIAL_LINE_STATUS) &amp; 0x1) == 0);</div><div class='del'>-	return SERIAL_READ(SERIAL_RCV_BUFFER);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int putDebugChar(unsigned char byte)</div><div class='del'>-{</div><div class='del'>-	if (!remoteDebugInitialized) {</div><div class='del'>-		remoteDebugInitialized = 1;</div><div class='del'>-		debugInit(YOSEMITE_BAUD_115200,</div><div class='del'>-			  YOSEMITE_DATA_8BIT,</div><div class='del'>-			  YOSEMITE_PARITY_NONE, YOSEMITE_STOP_1BIT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ((SERIAL_READ(SERIAL_LINE_STATUS) &amp; 0x20) == 0);</div><div class='del'>-	SERIAL_WRITE(SERIAL_SEND_BUFFER, byte);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/pmc-sierra/yosemite/irq.c b/arch/mips/pmc-sierra/yosemite/irq.c<br/>index 4decc2807867..5f673eba142c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/yosemite/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/pmc-sierra/yosemite/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/yosemite/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/pmc-sierra/yosemite/irq.c</a></div><div class='hunk'>@@ -141,10 +141,6 @@ asmlinkage void plat_irq_dispatch(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-extern void init_second_port(void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Initialize the next level interrupt handler</div><div class='ctx'>  */</div><div class='hunk'>@@ -156,11 +152,6 @@ void __init arch_init_irq(void)</div><div class='ctx'> 	rm7k_cpu_irq_init();</div><div class='ctx'> 	rm9k_cpu_irq_init();</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-	/* At this point, initialize the second serial port */</div><div class='del'>-	init_second_port();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_GDB_CONSOLE</div><div class='ctx'> 	register_gdb_console();</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c<br/>index 44fb0a62877f..82ab395efa33 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/rb532/devices.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/rb532/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/rb532/devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/rb532/devices.c</a></div><div class='hunk'>@@ -49,8 +49,6 @@</div><div class='ctx'> #define GPIO_ALE (1 &lt;&lt; 0x0a)</div><div class='ctx'> #define GPIO_CLE (1 &lt;&lt; 0x0b)</div><div class='ctx'> </div><div class='del'>-extern char *board_type;</div><div class='del'>-</div><div class='ctx'> static struct resource korina_dev0_res[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "korina_regs",</div><div class='hunk'>@@ -265,14 +263,6 @@ static void __init parse_mac_addr(char *macstr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* DEVICE CONTROLLER 1 */</div><div class='del'>-#define CFG_DC_DEV1 	((void *)0xb8010010)</div><div class='del'>-#define CFG_DC_DEV2 	((void *)0xb8010020)</div><div class='del'>-#define CFG_DC_DEVBASE    0x0</div><div class='del'>-#define CFG_DC_DEVMASK    0x4</div><div class='del'>-#define CFG_DC_DEVC       0x8</div><div class='del'>-#define CFG_DC_DEVTC      0xC</div><div class='del'>-</div><div class='ctx'> /* NAND definitions */</div><div class='ctx'> #define NAND_CHIP_DELAY	25</div><div class='ctx'> </div><div class='hunk'>@@ -301,16 +291,16 @@ static void __init rb532_nand_setup(void)</div><div class='ctx'> static int __init plat_setup_devices(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Look for the CF card reader */</div><div class='del'>-	if (!readl(CFG_DC_DEV1 + CFG_DC_DEVMASK))</div><div class='add'>+	if (!readl(IDT434_REG_BASE + DEV1MASK))</div><div class='ctx'> 		rb532_devs[1] = NULL;</div><div class='ctx'> 	else {</div><div class='ctx'> 		cf_slot0_res[0].start =</div><div class='del'>-		    readl(CFG_DC_DEV1 + CFG_DC_DEVBASE);</div><div class='add'>+		    readl(IDT434_REG_BASE + DEV1BASE);</div><div class='ctx'> 		cf_slot0_res[0].end = cf_slot0_res[0].start + 0x1000;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Read the NAND resources from the device controller */</div><div class='del'>-	nand_slot0_res[0].start = readl(CFG_DC_DEV2 + CFG_DC_DEVBASE);</div><div class='add'>+	nand_slot0_res[0].start = readl(IDT434_REG_BASE + DEV2BASE);</div><div class='ctx'> 	nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialise the NAND device */</div><div class='head'>diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c<br/>index b2fe82dba0a5..00a1c7877bf4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/rb532/gpio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/rb532/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/rb532/gpio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/rb532/gpio.c</a></div><div class='hunk'>@@ -64,7 +64,8 @@ static struct resource rb532_dev3_ctl_res[] = {</div><div class='ctx'> </div><div class='ctx'> void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned val)</div><div class='ctx'> {</div><div class='del'>-	unsigned flags, data;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned data;</div><div class='ctx'> 	unsigned i = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;dev3.lock, flags);</div><div class='hunk'>@@ -90,7 +91,7 @@ EXPORT_SYMBOL(get_434_reg);</div><div class='ctx'> </div><div class='ctx'> void set_latch_u5(unsigned char or_mask, unsigned char nand_mask)</div><div class='ctx'> {</div><div class='del'>-	unsigned flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;dev3.lock, flags);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/rb532/time.c b/arch/mips/rb532/time.c<br/>index db74edf8cefb..8e7a46855b50 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/rb532/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/rb532/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/rb532/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/rb532/time.c</a></div><div class='hunk'>@@ -49,8 +49,8 @@ static unsigned long __init cal_r4koff(void)</div><div class='ctx'> </div><div class='ctx'> void __init plat_time_init(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int est_freq, flags;</div><div class='del'>-	unsigned long r4k_offset;</div><div class='add'>+	unsigned int est_freq;</div><div class='add'>+	unsigned long flags, r4k_offset;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-platform.c b/arch/mips/sgi-ip22/ip22-platform.c<br/>index 60141235ec40..52486c4d2b01 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-platform.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/sgi-ip22/ip22-platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-platform.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/sgi-ip22/ip22-platform.c</a></div><div class='hunk'>@@ -150,7 +150,7 @@ static int __init sgiseeq_devinit(void)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='ctx'> 	/* Second HPC is missing? */</div><div class='del'>-	if (!ip22_is_fullhouse() ||</div><div class='add'>+	if (ip22_is_fullhouse() ||</div><div class='ctx'> 	    get_dbe(tmp, (unsigned int *)&amp;hpc3c1-&gt;pbdma[1]))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c<br/>index 5f389ee26fca..896a1ef84829 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/sgi-ip22/ip22-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/sgi-ip22/ip22-setup.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='del'>-#include &lt;asm/gdb-stub.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/sgialib.h&gt;</div><div class='hunk'>@@ -81,30 +80,6 @@ void __init plat_mem_setup(void)</div><div class='ctx'> 		add_preferred_console("arc", 0, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-	{</div><div class='del'>-	char *kgdb_ttyd = prom_getcmdline();</div><div class='del'>-</div><div class='del'>-	if ((kgdb_ttyd = strstr(kgdb_ttyd, "kgdb=ttyd")) != NULL) {</div><div class='del'>-		int line;</div><div class='del'>-		kgdb_ttyd += strlen("kgdb=ttyd");</div><div class='del'>-		if (*kgdb_ttyd != '1' &amp;&amp; *kgdb_ttyd != '2')</div><div class='del'>-			printk(KERN_INFO "KGDB: Uknown serial line /dev/ttyd%c"</div><div class='del'>-			       ", falling back to /dev/ttyd1\n", *kgdb_ttyd);</div><div class='del'>-		line = *kgdb_ttyd == '2' ? 0 : 1;</div><div class='del'>-		printk(KERN_INFO "KGDB: Using serial line /dev/ttyd%d for "</div><div class='del'>-		       "session\n", line ? 1 : 2);</div><div class='del'>-		rs_kgdb_hook(line);</div><div class='del'>-</div><div class='del'>-		printk(KERN_INFO "KGDB: Using serial line /dev/ttyd%d for "</div><div class='del'>-		       "session, please connect your debugger\n", line ? 1:2);</div><div class='del'>-</div><div class='del'>-		kgdb_enabled = 1;</div><div class='del'>-		/* Breakpoints and stuff are in sgi_irq_setup() */</div><div class='del'>-	}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_VT) &amp;&amp; defined(CONFIG_SGI_NEWPORT_CONSOLE)</div><div class='ctx'> 	{</div><div class='ctx'> 		ULONG *gfxinfo;</div><div class='head'>diff --git a/arch/mips/sgi-ip27/Makefile b/arch/mips/sgi-ip27/Makefile<br/>index e0a6871d56e4..31f4931b8484 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/sgi-ip27/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/sgi-ip27/Makefile</a></div><div class='hunk'>@@ -7,7 +7,6 @@ obj-y	:= ip27-berr.o ip27-irq.o ip27-init.o ip27-klconfig.o ip27-klnuma.o \</div><div class='ctx'> 	   ip27-xtalk.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_EARLY_PRINTK)	+= ip27-console.o</div><div class='del'>-obj-$(CONFIG_KGDB)		+= ip27-dbgio.o</div><div class='ctx'> obj-$(CONFIG_SMP)		+= ip27-smp.o</div><div class='ctx'> </div><div class='ctx'> EXTRA_CFLAGS += -Werror</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-dbgio.c b/arch/mips/sgi-ip27/ip27-dbgio.c<br/>deleted file mode 100644<br/>index 08fd88b36f80..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-dbgio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/sgi-ip27/ip27-dbgio.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,60 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- *  under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='del'>- * Copyright 2004 Ralf Baechle &lt;ralf@linux-mips.org&gt;</div><div class='del'>- */</div><div class='del'>-#include &lt;asm/sn/addrs.h&gt;</div><div class='del'>-#include &lt;asm/sn/sn0/hub.h&gt;</div><div class='del'>-#include &lt;asm/sn/klconfig.h&gt;</div><div class='del'>-#include &lt;asm/sn/ioc3.h&gt;</div><div class='del'>-#include &lt;asm/sn/sn_private.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/serial.h&gt;</div><div class='del'>-#include &lt;linux/serial_core.h&gt;</div><div class='del'>-#include &lt;linux/serial_reg.h&gt;</div><div class='del'>-</div><div class='del'>-#define IOC3_CLK        (22000000 / 3)</div><div class='del'>-#define IOC3_FLAGS      (0)</div><div class='del'>-</div><div class='del'>-static inline struct ioc3_uartregs *console_uart(void)</div><div class='del'>-{</div><div class='del'>-	struct ioc3 *ioc3;</div><div class='del'>-</div><div class='del'>-	ioc3 = (struct ioc3 *)KL_CONFIG_CH_CONS_INFO(get_nasid())-&gt;memory_base;</div><div class='del'>-</div><div class='del'>-	return &amp;ioc3-&gt;sregs.uarta;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned char getDebugChar(void)</div><div class='del'>-{</div><div class='del'>-	struct ioc3_uartregs *uart = console_uart();</div><div class='del'>-</div><div class='del'>-	while ((uart-&gt;iu_lsr &amp; UART_LSR_DR) == 0);</div><div class='del'>-	return uart-&gt;iu_rbr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void putDebugChar(unsigned char c)</div><div class='del'>-{</div><div class='del'>-	struct ioc3_uartregs *uart = console_uart();</div><div class='del'>-</div><div class='del'>-	while ((uart-&gt;iu_lsr &amp; UART_LSR_THRE) == 0);</div><div class='del'>-	uart-&gt;iu_thr = c;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c<br/>index db372a0f106d..a35818ed4263 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/bcm1480/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/sibyte/bcm1480/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/bcm1480/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/sibyte/bcm1480/irq.c</a></div><div class='hunk'>@@ -57,30 +57,6 @@ static void bcm1480_set_affinity(unsigned int irq, cpumask_t mask);</div><div class='ctx'> extern unsigned long ht_eoi_space;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-#include &lt;asm/gdb-stub.h&gt;</div><div class='del'>-extern void breakpoint(void);</div><div class='del'>-static int kgdb_irq;</div><div class='del'>-#ifdef CONFIG_GDB_CONSOLE</div><div class='del'>-extern void register_gdb_console(void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* kgdb is on when configured.  Pass "nokgdb" kernel arg to turn it off */</div><div class='del'>-static int kgdb_flag = 1;</div><div class='del'>-static int __init nokgdb(char *str)</div><div class='del'>-{</div><div class='del'>-	kgdb_flag = 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("nokgdb", nokgdb);</div><div class='del'>-</div><div class='del'>-/* Default to UART1 */</div><div class='del'>-int kgdb_port = 1;</div><div class='del'>-#ifdef CONFIG_SERIAL_SB1250_DUART</div><div class='del'>-extern char sb1250_duart_present[];</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static struct irq_chip bcm1480_irq_type = {</div><div class='ctx'> 	.name = "BCM1480-IMR",</div><div class='ctx'> 	.ack = ack_bcm1480_irq,</div><div class='hunk'>@@ -355,61 +331,10 @@ void __init arch_init_irq(void)</div><div class='ctx'> 	 * does its own management of IP7.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-	imask |= STATUSF_IP6;</div><div class='del'>-#endif</div><div class='ctx'> 	/* Enable necessary IPs, disable the rest */</div><div class='ctx'> 	change_c0_status(ST0_IM, imask);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-	if (kgdb_flag) {</div><div class='del'>-		kgdb_irq = K_BCM1480_INT_UART_0 + kgdb_port;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SERIAL_SB1250_DUART</div><div class='del'>-		sb1250_duart_present[kgdb_port] = 0;</div><div class='del'>-#endif</div><div class='del'>-		/* Setup uart 1 settings, mapper */</div><div class='del'>-		/* QQQ FIXME */</div><div class='del'>-		__raw_writeq(M_DUART_IMR_BRK, IOADDR(A_DUART_IMRREG(kgdb_port)));</div><div class='del'>-</div><div class='del'>-		__raw_writeq(IMR_IP6_VAL,</div><div class='del'>-			     IOADDR(A_BCM1480_IMR_REGISTER(0, R_BCM1480_IMR_INTERRUPT_MAP_BASE_H) +</div><div class='del'>-			     (kgdb_irq &lt;&lt; 3)));</div><div class='del'>-		bcm1480_unmask_irq(0, kgdb_irq);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_GDB_CONSOLE</div><div class='del'>-		register_gdb_console();</div><div class='del'>-#endif</div><div class='del'>-		printk("Waiting for GDB on UART port %d\n", kgdb_port);</div><div class='del'>-		set_debug_traps();</div><div class='del'>-		breakpoint();</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-#define duart_out(reg, val)     csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port, reg)))</div><div class='del'>-#define duart_in(reg)           csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port, reg)))</div><div class='del'>-</div><div class='del'>-static void bcm1480_kgdb_interrupt(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Clear break-change status (allow some time for the remote</div><div class='del'>-	 * host to stop the break, since we would see another</div><div class='del'>-	 * interrupt on the end-of-break too)</div><div class='del'>-	 */</div><div class='del'>-	kstat.irqs[smp_processor_id()][kgdb_irq]++;</div><div class='del'>-	mdelay(500);</div><div class='del'>-	duart_out(R_DUART_CMD, V_DUART_MISC_CMD_RESET_BREAK_INT |</div><div class='del'>-				M_DUART_RX_EN | M_DUART_TX_EN);</div><div class='del'>-	set_async_breakpoint(&amp;get_irq_regs()-&gt;cp0_epc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif 	/* CONFIG_KGDB */</div><div class='del'>-</div><div class='ctx'> extern void bcm1480_mailbox_interrupt(void);</div><div class='ctx'> </div><div class='ctx'> static inline void dispatch_ip2(void)</div><div class='hunk'>@@ -462,11 +387,6 @@ asmlinkage void plat_irq_dispatch(void)</div><div class='ctx'> 		bcm1480_mailbox_interrupt();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-	else if (pending &amp; CAUSEF_IP6)</div><div class='del'>-		bcm1480_kgdb_interrupt();		/* KGDB (uart 1) */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	else if (pending &amp; CAUSEF_IP2)</div><div class='ctx'> 		dispatch_ip2();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c<br/>index fd9604d5555a..3de30f79db3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/cfe/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/sibyte/cfe/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/cfe/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/sibyte/cfe/setup.c</a></div><div class='hunk'>@@ -59,10 +59,6 @@ int cfe_cons_handle;</div><div class='ctx'> extern unsigned long initrd_start, initrd_end;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-extern int kgdb_port;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static void __noreturn cfe_linux_exit(void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	int warm = *(int *)arg;</div><div class='hunk'>@@ -246,9 +242,6 @@ void __init prom_init(void)</div><div class='ctx'> 	int argc = fw_arg0;</div><div class='ctx'> 	char **envp = (char **) fw_arg2;</div><div class='ctx'> 	int *prom_vec = (int *) fw_arg3;</div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-	char *arg;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	_machine_restart   = cfe_linux_restart;</div><div class='ctx'> 	_machine_halt      = cfe_linux_halt;</div><div class='hunk'>@@ -309,13 +302,6 @@ void __init prom_init(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-	if ((arg = strstr(arcs_cmdline, "kgdb=duart")) != NULL)</div><div class='del'>-		kgdb_port = (arg[10] == '0') ? 0 : 1;</div><div class='del'>-	else</div><div class='del'>-		kgdb_port = 1;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_INITRD</div><div class='ctx'> 	{</div><div class='ctx'> 		char *ptr;</div><div class='head'>diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c<br/>index eac9065ffe0c..a5158483986e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/sb1250/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/sibyte/sb1250/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/sb1250/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/sibyte/sb1250/irq.c</a></div><div class='hunk'>@@ -57,16 +57,6 @@ static void sb1250_set_affinity(unsigned int irq, cpumask_t mask);</div><div class='ctx'> extern unsigned long ldt_eoi_space;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-static int kgdb_irq;</div><div class='del'>-</div><div class='del'>-/* Default to UART1 */</div><div class='del'>-int kgdb_port = 1;</div><div class='del'>-#ifdef CONFIG_SERIAL_SB1250_DUART</div><div class='del'>-extern char sb1250_duart_present[];</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static struct irq_chip sb1250_irq_type = {</div><div class='ctx'> 	.name = "SB1250-IMR",</div><div class='ctx'> 	.ack = ack_sb1250_irq,</div><div class='hunk'>@@ -313,55 +303,10 @@ void __init arch_init_irq(void)</div><div class='ctx'> 	 * does its own management of IP7.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-	imask |= STATUSF_IP6;</div><div class='del'>-#endif</div><div class='ctx'> 	/* Enable necessary IPs, disable the rest */</div><div class='ctx'> 	change_c0_status(ST0_IM, imask);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-	if (kgdb_flag) {</div><div class='del'>-		kgdb_irq = K_INT_UART_0 + kgdb_port;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SERIAL_SB1250_DUART</div><div class='del'>-		sb1250_duart_present[kgdb_port] = 0;</div><div class='del'>-#endif</div><div class='del'>-		/* Setup uart 1 settings, mapper */</div><div class='del'>-		__raw_writeq(M_DUART_IMR_BRK,</div><div class='del'>-			     IOADDR(A_DUART_IMRREG(kgdb_port)));</div><div class='del'>-</div><div class='del'>-		__raw_writeq(IMR_IP6_VAL,</div><div class='del'>-			     IOADDR(A_IMR_REGISTER(0,</div><div class='del'>-						   R_IMR_INTERRUPT_MAP_BASE) +</div><div class='del'>-				    (kgdb_irq &lt;&lt; 3)));</div><div class='del'>-		sb1250_unmask_irq(0, kgdb_irq);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-#define duart_out(reg, val)     csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port, reg)))</div><div class='del'>-#define duart_in(reg)           csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port, reg)))</div><div class='del'>-</div><div class='del'>-static void sb1250_kgdb_interrupt(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Clear break-change status (allow some time for the remote</div><div class='del'>-	 * host to stop the break, since we would see another</div><div class='del'>-	 * interrupt on the end-of-break too)</div><div class='del'>-	 */</div><div class='del'>-	kstat_this_cpu.irqs[kgdb_irq]++;</div><div class='del'>-	mdelay(500);</div><div class='del'>-	duart_out(R_DUART_CMD, V_DUART_MISC_CMD_RESET_BREAK_INT |</div><div class='del'>-				M_DUART_RX_EN | M_DUART_TX_EN);</div><div class='del'>-	set_async_breakpoint(&amp;get_irq_regs()-&gt;cp0_epc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif 	/* CONFIG_KGDB */</div><div class='del'>-</div><div class='ctx'> extern void sb1250_mailbox_interrupt(void);</div><div class='ctx'> </div><div class='ctx'> static inline void dispatch_ip2(void)</div><div class='hunk'>@@ -407,11 +352,6 @@ asmlinkage void plat_irq_dispatch(void)</div><div class='ctx'> 		sb1250_mailbox_interrupt();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KGDB</div><div class='del'>-	else if (pending &amp; CAUSEF_IP6)			/* KGDB (uart 1) */</div><div class='del'>-		sb1250_kgdb_interrupt();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	else if (pending &amp; CAUSEF_IP2)</div><div class='ctx'> 		dispatch_ip2();</div><div class='ctx'> 	else</div><div class='head'>diff --git a/arch/mips/sibyte/swarm/Makefile b/arch/mips/sibyte/swarm/Makefile<br/>index 255d692bfa18..f18ba9201bbc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/swarm/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/sibyte/swarm/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/swarm/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/sibyte/swarm/Makefile</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='ctx'> obj-y				:= setup.o rtc_xicor1241.o rtc_m41t81.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_I2C_BOARDINFO)	+= swarm-i2c.o</div><div class='del'>-obj-$(CONFIG_KGDB)		+= dbg_io.o</div><div class='head'>diff --git a/arch/mips/sibyte/swarm/dbg_io.c b/arch/mips/sibyte/swarm/dbg_io.c<br/>deleted file mode 100644<br/>index b97ae3048482..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/swarm/dbg_io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/sibyte/swarm/dbg_io.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,76 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * kgdb debug routines for SiByte boards.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 MontaVista Software Inc.</div><div class='del'>- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- * under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- * option) any later version.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* -------------------- BEGINNING OF CONFIG --------------------- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sibyte/sb1250.h&gt;</div><div class='del'>-#include &lt;asm/sibyte/sb1250_regs.h&gt;</div><div class='del'>-#include &lt;asm/sibyte/sb1250_uart.h&gt;</div><div class='del'>-#include &lt;asm/sibyte/sb1250_int.h&gt;</div><div class='del'>-#include &lt;asm/addrspace.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We use the second serial port for kgdb traffic.</div><div class='del'>- * 	115200, 8, N, 1.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define	BAUD_RATE		115200</div><div class='del'>-#define	CLK_DIVISOR		V_DUART_BAUD_RATE(BAUD_RATE)</div><div class='del'>-#define	DATA_BITS		V_DUART_BITS_PER_CHAR_8		/* or 7    */</div><div class='del'>-#define	PARITY			V_DUART_PARITY_MODE_NONE	/* or even */</div><div class='del'>-#define	STOP_BITS		M_DUART_STOP_BIT_LEN_1		/* or 2    */</div><div class='del'>-</div><div class='del'>-static int duart_initialized = 0;	/* 0: need to be init'ed by kgdb */</div><div class='del'>-</div><div class='del'>-/* -------------------- END OF CONFIG --------------------- */</div><div class='del'>-extern int kgdb_port;</div><div class='del'>-</div><div class='del'>-#define	duart_out(reg, val)	csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port, reg)))</div><div class='del'>-#define duart_in(reg)		csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port, reg)))</div><div class='del'>-</div><div class='del'>-void putDebugChar(unsigned char c);</div><div class='del'>-unsigned char getDebugChar(void);</div><div class='del'>-static void</div><div class='del'>-duart_init(int clk_divisor, int data, int parity, int stop)</div><div class='del'>-{</div><div class='del'>-	duart_out(R_DUART_MODE_REG_1, data | parity);</div><div class='del'>-	duart_out(R_DUART_MODE_REG_2, stop);</div><div class='del'>-	duart_out(R_DUART_CLK_SEL, clk_divisor);</div><div class='del'>-</div><div class='del'>-	duart_out(R_DUART_CMD, M_DUART_RX_EN | M_DUART_TX_EN);	/* enable rx and tx */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-putDebugChar(unsigned char c)</div><div class='del'>-{</div><div class='del'>-	if (!duart_initialized) {</div><div class='del'>-		duart_initialized = 1;</div><div class='del'>-		duart_init(CLK_DIVISOR, DATA_BITS, PARITY, STOP_BITS);</div><div class='del'>-	}</div><div class='del'>-	while ((duart_in(R_DUART_STATUS) &amp; M_DUART_TX_RDY) == 0);</div><div class='del'>-	duart_out(R_DUART_TX_HOLD, c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned char</div><div class='del'>-getDebugChar(void)</div><div class='del'>-{</div><div class='del'>-	if (!duart_initialized) {</div><div class='del'>-		duart_initialized = 1;</div><div class='del'>-		duart_init(CLK_DIVISOR, DATA_BITS, PARITY, STOP_BITS);</div><div class='del'>-	}</div><div class='del'>-	while ((duart_in(R_DUART_STATUS) &amp; M_DUART_RX_RDY) == 0) ;</div><div class='del'>-	return duart_in(R_DUART_RX_HOLD);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/arch/mips/txx9/Kconfig b/arch/mips/txx9/Kconfig<br/>index 6de4c5aa92be..840fe757c48d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,27 @@</div><div class='add'>+config MACH_TX39XX</div><div class='add'>+	bool</div><div class='add'>+	select MACH_TXX9</div><div class='add'>+	select SYS_HAS_CPU_TX39XX</div><div class='add'>+</div><div class='add'>+config MACH_TX49XX</div><div class='add'>+	bool</div><div class='add'>+	select MACH_TXX9</div><div class='add'>+	select CEVT_R4K</div><div class='add'>+	select CSRC_R4K</div><div class='add'>+	select IRQ_CPU</div><div class='add'>+	select SYS_HAS_CPU_TX49XX</div><div class='add'>+	select SYS_SUPPORTS_64BIT_KERNEL</div><div class='add'>+</div><div class='add'>+config MACH_TXX9</div><div class='add'>+	bool</div><div class='add'>+	select DMA_NONCOHERENT</div><div class='add'>+	select SWAP_IO_SPACE</div><div class='add'>+	select SYS_HAS_EARLY_PRINTK</div><div class='add'>+	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='add'>+	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='add'>+	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='add'>+	select GENERIC_HARDIRQS_NO__DO_IRQ</div><div class='add'>+</div><div class='ctx'> config TOSHIBA_JMR3927</div><div class='ctx'> 	bool "Toshiba JMR-TX3927 board"</div><div class='ctx'> 	depends on MACH_TX39XX</div><div class='hunk'>@@ -24,68 +48,37 @@ config TOSHIBA_RBTX4938</div><div class='ctx'> config SOC_TX3927</div><div class='ctx'> 	bool</div><div class='ctx'> 	select CEVT_TXX9</div><div class='del'>-	select DMA_NONCOHERENT</div><div class='ctx'> 	select HAS_TXX9_SERIAL</div><div class='ctx'> 	select HW_HAS_PCI</div><div class='ctx'> 	select IRQ_TXX9</div><div class='del'>-	select SWAP_IO_SPACE</div><div class='del'>-	select SYS_HAS_CPU_TX39XX</div><div class='del'>-	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='del'>-	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='del'>-	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='del'>-	select GENERIC_HARDIRQS_NO__DO_IRQ</div><div class='ctx'> 	select GPIO_TXX9</div><div class='ctx'> </div><div class='ctx'> config SOC_TX4927</div><div class='ctx'> 	bool</div><div class='del'>-	select CEVT_R4K</div><div class='del'>-	select CSRC_R4K</div><div class='ctx'> 	select CEVT_TXX9</div><div class='del'>-	select DMA_NONCOHERENT</div><div class='ctx'> 	select HAS_TXX9_SERIAL</div><div class='ctx'> 	select HW_HAS_PCI</div><div class='del'>-	select IRQ_CPU</div><div class='ctx'> 	select IRQ_TXX9</div><div class='ctx'> 	select PCI_TX4927</div><div class='del'>-	select SWAP_IO_SPACE</div><div class='del'>-	select SYS_HAS_CPU_TX49XX</div><div class='del'>-	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='del'>-	select SYS_SUPPORTS_64BIT_KERNEL</div><div class='del'>-	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='del'>-	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='del'>-	select SYS_SUPPORTS_KGDB</div><div class='del'>-	select GENERIC_HARDIRQS_NO__DO_IRQ</div><div class='ctx'> 	select GPIO_TXX9</div><div class='ctx'> </div><div class='ctx'> config SOC_TX4938</div><div class='ctx'> 	bool</div><div class='del'>-	select CEVT_R4K</div><div class='del'>-	select CSRC_R4K</div><div class='ctx'> 	select CEVT_TXX9</div><div class='del'>-	select DMA_NONCOHERENT</div><div class='ctx'> 	select HAS_TXX9_SERIAL</div><div class='ctx'> 	select HW_HAS_PCI</div><div class='del'>-	select IRQ_CPU</div><div class='ctx'> 	select IRQ_TXX9</div><div class='ctx'> 	select PCI_TX4927</div><div class='del'>-	select SWAP_IO_SPACE</div><div class='del'>-	select SYS_HAS_CPU_TX49XX</div><div class='del'>-	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='del'>-	select SYS_SUPPORTS_64BIT_KERNEL</div><div class='del'>-	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='del'>-	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='del'>-	select SYS_SUPPORTS_KGDB</div><div class='del'>-	select GENERIC_HARDIRQS_NO__DO_IRQ</div><div class='ctx'> 	select GPIO_TXX9</div><div class='ctx'> </div><div class='ctx'> config TOSHIBA_FPCIB0</div><div class='ctx'> 	bool "FPCIB0 Backplane Support"</div><div class='del'>-	depends on PCI &amp;&amp; (MACH_TX39XX || MACH_TX49XX)</div><div class='add'>+	depends on PCI &amp;&amp; MACH_TXX9</div><div class='ctx'> 	select I8259</div><div class='ctx'> </div><div class='ctx'> config PICMG_PCI_BACKPLANE_DEFAULT</div><div class='ctx'> 	bool "Support for PICMG PCI Backplane"</div><div class='del'>-	depends on PCI &amp;&amp; (MACH_TX39XX || MACH_TX49XX)</div><div class='add'>+	depends on PCI &amp;&amp; MACH_TXX9</div><div class='ctx'> 	default y if !TOSHIBA_FPCIB0</div><div class='ctx'> </div><div class='ctx'> if TOSHIBA_RBTX4938</div><div class='head'>diff --git a/arch/mips/txx9/generic/Makefile b/arch/mips/txx9/generic/Makefile<br/>index 9c120771e65f..9bb34af26b73 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/generic/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/Makefile</a></div><div class='hunk'>@@ -4,9 +4,9 @@</div><div class='ctx'> </div><div class='ctx'> obj-y	+= setup.o</div><div class='ctx'> obj-$(CONFIG_PCI)	+= pci.o</div><div class='add'>+obj-$(CONFIG_SOC_TX3927)	+= setup_tx3927.o irq_tx3927.o</div><div class='ctx'> obj-$(CONFIG_SOC_TX4927)	+= mem_tx4927.o setup_tx4927.o irq_tx4927.o</div><div class='ctx'> obj-$(CONFIG_SOC_TX4938)	+= mem_tx4927.o setup_tx4938.o irq_tx4938.o</div><div class='ctx'> obj-$(CONFIG_TOSHIBA_FPCIB0)	+= smsc_fdc37m81x.o</div><div class='del'>-obj-$(CONFIG_KGDB)	+= dbgio.o</div><div class='ctx'> </div><div class='ctx'> EXTRA_CFLAGS += -Werror</div><div class='head'>diff --git a/arch/mips/txx9/generic/dbgio.c b/arch/mips/txx9/generic/dbgio.c<br/>deleted file mode 100644<br/>index 33b9c672a322..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/dbgio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/generic/dbgio.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/arch/mips/tx4938/common/dbgio.c</div><div class='del'>- *</div><div class='del'>- * kgdb interface for gdb</div><div class='del'>- *</div><div class='del'>- * Author: MontaVista Software, Inc.</div><div class='del'>- *         source@mvista.com</div><div class='del'>- *</div><div class='del'>- * Copyright 2005 MontaVista Software Inc.</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License as published by the</div><div class='del'>- *  Free Software Foundation; either version 2 of the License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.</div><div class='del'>- *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,</div><div class='del'>- *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS</div><div class='del'>- *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR</div><div class='del'>- *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE</div><div class='del'>- *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along</div><div class='del'>- *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='del'>- * Support for TX4938 in 2.6 - Hiroshi DOYU &lt;Hiroshi_DOYU@montavista.co.jp&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types&gt;</div><div class='del'>-</div><div class='del'>-extern u8 txx9_sio_kdbg_rd(void);</div><div class='del'>-extern int txx9_sio_kdbg_wr( u8 ch );</div><div class='del'>-</div><div class='del'>-u8 getDebugChar(void)</div><div class='del'>-{</div><div class='del'>-	return (txx9_sio_kdbg_rd());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int putDebugChar(u8 byte)</div><div class='del'>-{</div><div class='del'>-	return (txx9_sio_kdbg_wr(byte));</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/arch/mips/txx9/generic/irq_tx3927.c b/arch/mips/txx9/generic/irq_tx3927.c<br/>new file mode 100644<br/>index 000000000000..c683f593eda2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/irq_tx3927.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/irq_tx3927.c</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+/*</div><div class='add'>+ * Common tx3927 irq handler</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2001 MontaVista Software Inc.</div><div class='add'>+ * Copyright (C) 2000-2001 Toshiba Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;asm/txx9irq.h&gt;</div><div class='add'>+#include &lt;asm/txx9/tx3927.h&gt;</div><div class='add'>+</div><div class='add'>+void __init tx3927_irq_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	txx9_irq_init(TX3927_IRC_REG);</div><div class='add'>+	/* raise priority for timers, sio */</div><div class='add'>+	for (i = 0; i &lt; TX3927_NR_TMR; i++)</div><div class='add'>+		txx9_irq_set_pri(TX3927_IR_TMR(i), 6);</div><div class='add'>+	for (i = 0; i &lt; TX3927_NR_SIO; i++)</div><div class='add'>+		txx9_irq_set_pri(TX3927_IR_SIO(i), 7);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c<br/>index 0b92d8c13208..7b637a7c0e66 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/generic/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/pci.c</a></div><div class='hunk'>@@ -386,3 +386,39 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)</div><div class='ctx'> {</div><div class='ctx'> 	return txx9_board_vec-&gt;pci_map_irq(dev, slot, pin);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+char * (*txx9_board_pcibios_setup)(char *str) __devinitdata;</div><div class='add'>+</div><div class='add'>+char *__devinit txx9_pcibios_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	if (txx9_board_pcibios_setup &amp;&amp; !txx9_board_pcibios_setup(str))</div><div class='add'>+		return NULL;</div><div class='add'>+	if (!strcmp(str, "picmg")) {</div><div class='add'>+		/* PICMG compliant backplane (TOSHIBA JMB-PICMG-ATX</div><div class='add'>+		   (5V or 3.3V), JMB-PICMG-L2 (5V only), etc.) */</div><div class='add'>+		txx9_pci_option |= TXX9_PCI_OPT_PICMG;</div><div class='add'>+		return NULL;</div><div class='add'>+	} else if (!strcmp(str, "nopicmg")) {</div><div class='add'>+		/* non-PICMG compliant backplane (TOSHIBA</div><div class='add'>+		   RBHBK4100,RBHBK4200, Interface PCM-PCM05, etc.) */</div><div class='add'>+		txx9_pci_option &amp;= ~TXX9_PCI_OPT_PICMG;</div><div class='add'>+		return NULL;</div><div class='add'>+	} else if (!strncmp(str, "clk=", 4)) {</div><div class='add'>+		char *val = str + 4;</div><div class='add'>+		txx9_pci_option &amp;= ~TXX9_PCI_OPT_CLK_MASK;</div><div class='add'>+		if (strcmp(val, "33") == 0)</div><div class='add'>+			txx9_pci_option |= TXX9_PCI_OPT_CLK_33;</div><div class='add'>+		else if (strcmp(val, "66") == 0)</div><div class='add'>+			txx9_pci_option |= TXX9_PCI_OPT_CLK_66;</div><div class='add'>+		else /* "auto" */</div><div class='add'>+			txx9_pci_option |= TXX9_PCI_OPT_CLK_AUTO;</div><div class='add'>+		return NULL;</div><div class='add'>+	} else if (!strncmp(str, "err=", 4)) {</div><div class='add'>+		if (!strcmp(str + 4, "panic"))</div><div class='add'>+			txx9_pci_err_action = TXX9_PCI_ERR_PANIC;</div><div class='add'>+		else if (!strcmp(str + 4, "ignore"))</div><div class='add'>+			txx9_pci_err_action = TXX9_PCI_ERR_IGNORE;</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return str;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c<br/>index 8c60c78b9a9e..fe6bee09cece 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/generic/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/setup.c</a></div><div class='hunk'>@@ -20,9 +20,13 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/generic.h&gt;</div><div class='add'>+#include &lt;asm/txx9/pci.h&gt;</div><div class='ctx'> #ifdef CONFIG_CPU_TX49XX</div><div class='ctx'> #include &lt;asm/txx9/tx4938.h&gt;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -49,6 +53,7 @@ txx9_reg_res_init(unsigned int pcode, unsigned long base, unsigned long size)</div><div class='ctx'> 		txx9_ce_res[i].name = txx9_ce_res_name[i];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	txx9_pcode = pcode;</div><div class='ctx'> 	sprintf(txx9_pcode_str, "TX%x", pcode);</div><div class='ctx'> 	if (base) {</div><div class='ctx'> 		txx9_reg_res.start = base &amp; 0xfffffffffULL;</div><div class='hunk'>@@ -187,6 +192,117 @@ char * __init prom_getcmdline(void)</div><div class='ctx'> 	return &amp;(arcs_cmdline[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __noreturn txx9_machine_halt(void)</div><div class='add'>+{</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	clear_c0_status(ST0_IM);</div><div class='add'>+	while (1) {</div><div class='add'>+		if (cpu_wait) {</div><div class='add'>+			(*cpu_wait)();</div><div class='add'>+			if (cpu_has_counter) {</div><div class='add'>+				/*</div><div class='add'>+				 * Clear counter interrupt while it</div><div class='add'>+				 * breaks WAIT instruction even if</div><div class='add'>+				 * masked.</div><div class='add'>+				 */</div><div class='add'>+				write_c0_compare(0);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Watchdog support */</div><div class='add'>+void __init txx9_wdt_init(unsigned long base)</div><div class='add'>+{</div><div class='add'>+	struct resource res = {</div><div class='add'>+		.start	= base,</div><div class='add'>+		.end	= base + 0x100 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	};</div><div class='add'>+	platform_device_register_simple("txx9wdt", -1, &amp;res, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* SPI support */</div><div class='add'>+void __init txx9_spi_init(int busid, unsigned long base, int irq)</div><div class='add'>+{</div><div class='add'>+	struct resource res[] = {</div><div class='add'>+		{</div><div class='add'>+			.start	= base,</div><div class='add'>+			.end	= base + 0x20 - 1,</div><div class='add'>+			.flags	= IORESOURCE_MEM,</div><div class='add'>+		}, {</div><div class='add'>+			.start	= irq,</div><div class='add'>+			.flags	= IORESOURCE_IRQ,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	platform_device_register_simple("spi_txx9", busid,</div><div class='add'>+					res, ARRAY_SIZE(res));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init txx9_ethaddr_init(unsigned int id, unsigned char *ethaddr)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev =</div><div class='add'>+		platform_device_alloc("tc35815-mac", id);</div><div class='add'>+	if (!pdev ||</div><div class='add'>+	    platform_device_add_data(pdev, ethaddr, 6) ||</div><div class='add'>+	    platform_device_add(pdev))</div><div class='add'>+		platform_device_put(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init txx9_sio_init(unsigned long baseaddr, int irq,</div><div class='add'>+			  unsigned int line, unsigned int sclk, int nocts)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SERIAL_TXX9</div><div class='add'>+	struct uart_port req;</div><div class='add'>+</div><div class='add'>+	memset(&amp;req, 0, sizeof(req));</div><div class='add'>+	req.line = line;</div><div class='add'>+	req.iotype = UPIO_MEM;</div><div class='add'>+	req.membase = ioremap(baseaddr, 0x24);</div><div class='add'>+	req.mapbase = baseaddr;</div><div class='add'>+	req.irq = irq;</div><div class='add'>+	if (!nocts)</div><div class='add'>+		req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;</div><div class='add'>+	if (sclk) {</div><div class='add'>+		req.flags |= UPF_MAGIC_MULTIPLIER /*USE_SCLK*/;</div><div class='add'>+		req.uartclk = sclk;</div><div class='add'>+	} else</div><div class='add'>+		req.uartclk = TXX9_IMCLK;</div><div class='add'>+	early_serial_txx9_setup(&amp;req);</div><div class='add'>+#endif /* CONFIG_SERIAL_TXX9 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_EARLY_PRINTK</div><div class='add'>+static void __init null_prom_putchar(char c)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+void (*txx9_prom_putchar)(char c) __initdata = null_prom_putchar;</div><div class='add'>+</div><div class='add'>+void __init prom_putchar(char c)</div><div class='add'>+{</div><div class='add'>+	txx9_prom_putchar(c);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __iomem *early_txx9_sio_port;</div><div class='add'>+</div><div class='add'>+static void __init early_txx9_sio_putchar(char c)</div><div class='add'>+{</div><div class='add'>+#define TXX9_SICISR	0x0c</div><div class='add'>+#define TXX9_SITFIFO	0x1c</div><div class='add'>+#define TXX9_SICISR_TXALS	0x00000002</div><div class='add'>+	while (!(__raw_readl(early_txx9_sio_port + TXX9_SICISR) &amp;</div><div class='add'>+		 TXX9_SICISR_TXALS))</div><div class='add'>+		;</div><div class='add'>+	__raw_writel(c, early_txx9_sio_port + TXX9_SITFIFO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init txx9_sio_putchar_init(unsigned long baseaddr)</div><div class='add'>+{</div><div class='add'>+	early_txx9_sio_port = ioremap(baseaddr, 0x24);</div><div class='add'>+	txx9_prom_putchar = early_txx9_sio_putchar;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_EARLY_PRINTK */</div><div class='add'>+</div><div class='ctx'> /* wrappers */</div><div class='ctx'> void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -194,6 +310,15 @@ void __init plat_mem_setup(void)</div><div class='ctx'> 	ioport_resource.end = ~0UL;	/* no limit */</div><div class='ctx'> 	iomem_resource.start = 0;</div><div class='ctx'> 	iomem_resource.end = ~0UL;	/* no limit */</div><div class='add'>+</div><div class='add'>+	/* fallback restart/halt routines */</div><div class='add'>+	_machine_restart = (void (*)(char *))txx9_machine_halt;</div><div class='add'>+	_machine_halt = txx9_machine_halt;</div><div class='add'>+	pm_power_off = txx9_machine_halt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	pcibios_plat_setup = txx9_pcibios_setup;</div><div class='add'>+#endif</div><div class='ctx'> 	txx9_board_vec-&gt;mem_setup();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -204,6 +329,9 @@ void __init arch_init_irq(void)</div><div class='ctx'> </div><div class='ctx'> void __init plat_time_init(void)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_CPU_TX49XX</div><div class='add'>+	mips_hpt_frequency = txx9_cpu_clock / 2;</div><div class='add'>+#endif</div><div class='ctx'> 	txx9_board_vec-&gt;time_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/txx9/generic/setup_tx3927.c b/arch/mips/txx9/generic/setup_tx3927.c<br/>new file mode 100644<br/>index 000000000000..7bd963d37fc3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/setup_tx3927.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/setup_tx3927.c</a></div><div class='hunk'>@@ -0,0 +1,130 @@</div><div class='add'>+/*</div><div class='add'>+ * TX3927 setup routines</div><div class='add'>+ * Based on linux/arch/mips/txx9/jmr3927/setup.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2001 MontaVista Software Inc.</div><div class='add'>+ * Copyright (C) 2000-2001 Toshiba Corporation</div><div class='add'>+ * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org)</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/param.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/txx9irq.h&gt;</div><div class='add'>+#include &lt;asm/txx9tmr.h&gt;</div><div class='add'>+#include &lt;asm/txx9pio.h&gt;</div><div class='add'>+#include &lt;asm/txx9/generic.h&gt;</div><div class='add'>+#include &lt;asm/txx9/tx3927.h&gt;</div><div class='add'>+</div><div class='add'>+void __init tx3927_wdt_init(void)</div><div class='add'>+{</div><div class='add'>+	txx9_wdt_init(TX3927_TMR_REG(2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init tx3927_setup(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned int conf;</div><div class='add'>+</div><div class='add'>+	/* don't enable - see errata */</div><div class='add'>+	txx9_ccfg_toeon = 0;</div><div class='add'>+	if (strstr(prom_getcmdline(), "toeon") != NULL)</div><div class='add'>+		txx9_ccfg_toeon = 1;</div><div class='add'>+</div><div class='add'>+	txx9_reg_res_init(TX3927_REV_PCODE(), TX3927_REG_BASE,</div><div class='add'>+			  TX3927_REG_SIZE);</div><div class='add'>+</div><div class='add'>+	/* SDRAMC,ROMC are configured by PROM */</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		if (!(tx3927_romcptr-&gt;cr[i] &amp; 0x8))</div><div class='add'>+			continue;	/* disabled */</div><div class='add'>+		txx9_ce_res[i].start = (unsigned long)TX3927_ROMC_BA(i);</div><div class='add'>+		txx9_ce_res[i].end =</div><div class='add'>+			txx9_ce_res[i].start + TX3927_ROMC_SIZE(i) - 1;</div><div class='add'>+		request_resource(&amp;iomem_resource, &amp;txx9_ce_res[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* clocks */</div><div class='add'>+	txx9_gbus_clock = txx9_cpu_clock / 2;</div><div class='add'>+	/* change default value to udelay/mdelay take reasonable time */</div><div class='add'>+	loops_per_jiffy = txx9_cpu_clock / HZ / 2;</div><div class='add'>+</div><div class='add'>+	/* CCFG */</div><div class='add'>+	/* enable Timeout BusError */</div><div class='add'>+	if (txx9_ccfg_toeon)</div><div class='add'>+		tx3927_ccfgptr-&gt;ccfg |= TX3927_CCFG_TOE;</div><div class='add'>+</div><div class='add'>+	/* clear BusErrorOnWrite flag */</div><div class='add'>+	tx3927_ccfgptr-&gt;ccfg &amp;= ~TX3927_CCFG_BEOW;</div><div class='add'>+	if (read_c0_conf() &amp; TX39_CONF_WBON)</div><div class='add'>+		/* Disable PCI snoop */</div><div class='add'>+		tx3927_ccfgptr-&gt;ccfg &amp;= ~TX3927_CCFG_PSNP;</div><div class='add'>+	else</div><div class='add'>+		/* Enable PCI SNOOP - with write through only */</div><div class='add'>+		tx3927_ccfgptr-&gt;ccfg |= TX3927_CCFG_PSNP;</div><div class='add'>+	/* do reset on watchdog */</div><div class='add'>+	tx3927_ccfgptr-&gt;ccfg |= TX3927_CCFG_WR;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "TX3927 -- CRIR:%08lx CCFG:%08lx PCFG:%08lx\n",</div><div class='add'>+	       tx3927_ccfgptr-&gt;crir,</div><div class='add'>+	       tx3927_ccfgptr-&gt;ccfg, tx3927_ccfgptr-&gt;pcfg);</div><div class='add'>+</div><div class='add'>+	/* TMR */</div><div class='add'>+	for (i = 0; i &lt; TX3927_NR_TMR; i++)</div><div class='add'>+		txx9_tmr_init(TX3927_TMR_REG(i));</div><div class='add'>+</div><div class='add'>+	/* DMA */</div><div class='add'>+	tx3927_dmaptr-&gt;mcr = 0;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(tx3927_dmaptr-&gt;ch); i++) {</div><div class='add'>+		/* reset channel */</div><div class='add'>+		tx3927_dmaptr-&gt;ch[i].ccr = TX3927_DMA_CCR_CHRST;</div><div class='add'>+		tx3927_dmaptr-&gt;ch[i].ccr = 0;</div><div class='add'>+	}</div><div class='add'>+	/* enable DMA */</div><div class='add'>+#ifdef __BIG_ENDIAN</div><div class='add'>+	tx3927_dmaptr-&gt;mcr = TX3927_DMA_MCR_MSTEN;</div><div class='add'>+#else</div><div class='add'>+	tx3927_dmaptr-&gt;mcr = TX3927_DMA_MCR_MSTEN | TX3927_DMA_MCR_LE;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* PIO */</div><div class='add'>+	__raw_writel(0, &amp;tx3927_pioptr-&gt;maskcpu);</div><div class='add'>+	__raw_writel(0, &amp;tx3927_pioptr-&gt;maskext);</div><div class='add'>+	txx9_gpio_init(TX3927_PIO_REG, 0, 16);</div><div class='add'>+</div><div class='add'>+	conf = read_c0_conf();</div><div class='add'>+	if (!(conf &amp; TX39_CONF_ICE))</div><div class='add'>+		printk(KERN_INFO "TX3927 I-Cache disabled.\n");</div><div class='add'>+	if (!(conf &amp; TX39_CONF_DCE))</div><div class='add'>+		printk(KERN_INFO "TX3927 D-Cache disabled.\n");</div><div class='add'>+	else if (!(conf &amp; TX39_CONF_WBON))</div><div class='add'>+		printk(KERN_INFO "TX3927 D-Cache WriteThrough.\n");</div><div class='add'>+	else if (!(conf &amp; TX39_CONF_CWFON))</div><div class='add'>+		printk(KERN_INFO "TX3927 D-Cache WriteBack.\n");</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_INFO "TX3927 D-Cache WriteBack (CWF) .\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init tx3927_time_init(unsigned int evt_tmrnr, unsigned int src_tmrnr)</div><div class='add'>+{</div><div class='add'>+	txx9_clockevent_init(TX3927_TMR_REG(evt_tmrnr),</div><div class='add'>+			     TXX9_IRQ_BASE + TX3927_IR_TMR(evt_tmrnr),</div><div class='add'>+			     TXX9_IMCLK);</div><div class='add'>+	txx9_clocksource_init(TX3927_TMR_REG(src_tmrnr), TXX9_IMCLK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init tx3927_sio_init(unsigned int sclk, unsigned int cts_mask)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++)</div><div class='add'>+		txx9_sio_init(TX3927_SIO_REG(i),</div><div class='add'>+			      TXX9_IRQ_BASE + TX3927_IR_SIO(i),</div><div class='add'>+			      i, sclk, (1 &lt;&lt; i) &amp; cts_mask);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/txx9/generic/setup_tx4927.c b/arch/mips/txx9/generic/setup_tx4927.c<br/>index 89d6e28add93..f80d4b7a694d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/setup_tx4927.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/generic/setup_tx4927.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/setup_tx4927.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/setup_tx4927.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='ctx'> #include &lt;asm/txx9irq.h&gt;</div><div class='ctx'> #include &lt;asm/txx9tmr.h&gt;</div><div class='hunk'>@@ -21,7 +20,7 @@</div><div class='ctx'> #include &lt;asm/txx9/generic.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/tx4927.h&gt;</div><div class='ctx'> </div><div class='del'>-void __init tx4927_wdr_init(void)</div><div class='add'>+static void __init tx4927_wdr_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* clear WatchDogReset (W1C) */</div><div class='ctx'> 	tx4927_ccfg_set(TX4927_CCFG_WDRST);</div><div class='hunk'>@@ -29,6 +28,11 @@ void __init tx4927_wdr_init(void)</div><div class='ctx'> 	tx4927_ccfg_set(TX4927_CCFG_WR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __init tx4927_wdt_init(void)</div><div class='add'>+{</div><div class='add'>+	txx9_wdt_init(TX4927_TMR_REG(2) &amp; 0xfffffffffULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct resource tx4927_sdram_resource[4];</div><div class='ctx'> </div><div class='ctx'> void __init tx4927_setup(void)</div><div class='hunk'>@@ -173,22 +177,12 @@ void __init tx4927_time_init(unsigned int tmrnr)</div><div class='ctx'> 				     TXX9_IMCLK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init tx4927_setup_serial(void)</div><div class='add'>+void __init tx4927_sio_init(unsigned int sclk, unsigned int cts_mask)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_SERIAL_TXX9</div><div class='ctx'> 	int i;</div><div class='del'>-	struct uart_port req;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		memset(&amp;req, 0, sizeof(req));</div><div class='del'>-		req.line = i;</div><div class='del'>-		req.iotype = UPIO_MEM;</div><div class='del'>-		req.membase = (unsigned char __iomem *)TX4927_SIO_REG(i);</div><div class='del'>-		req.mapbase = TX4927_SIO_REG(i) &amp; 0xfffffffffULL;</div><div class='del'>-		req.irq = TXX9_IRQ_BASE + TX4927_IR_SIO(i);</div><div class='del'>-		req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;</div><div class='del'>-		req.uartclk = TXX9_IMCLK;</div><div class='del'>-		early_serial_txx9_setup(&amp;req);</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_SERIAL_TXX9 */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++)</div><div class='add'>+		txx9_sio_init(TX4927_SIO_REG(i) &amp; 0xfffffffffULL,</div><div class='add'>+			      TXX9_IRQ_BASE + TX4927_IR_SIO(i),</div><div class='add'>+			      i, sclk, (1 &lt;&lt; i) &amp; cts_mask);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/txx9/generic/setup_tx4938.c b/arch/mips/txx9/generic/setup_tx4938.c<br/>index 317378d8579d..f3040b9ba059 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/setup_tx4938.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/generic/setup_tx4938.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/setup_tx4938.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/setup_tx4938.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='ctx'> #include &lt;asm/txx9irq.h&gt;</div><div class='ctx'> #include &lt;asm/txx9tmr.h&gt;</div><div class='hunk'>@@ -21,7 +20,7 @@</div><div class='ctx'> #include &lt;asm/txx9/generic.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/tx4938.h&gt;</div><div class='ctx'> </div><div class='del'>-void __init tx4938_wdr_init(void)</div><div class='add'>+static void __init tx4938_wdr_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* clear WatchDogReset (W1C) */</div><div class='ctx'> 	tx4938_ccfg_set(TX4938_CCFG_WDRST);</div><div class='hunk'>@@ -29,6 +28,11 @@ void __init tx4938_wdr_init(void)</div><div class='ctx'> 	tx4938_ccfg_set(TX4938_CCFG_WR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __init tx4938_wdt_init(void)</div><div class='add'>+{</div><div class='add'>+	txx9_wdt_init(TX4938_TMR_REG(2) &amp; 0xfffffffffULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct resource tx4938_sdram_resource[4];</div><div class='ctx'> static struct resource tx4938_sram_resource;</div><div class='ctx'> </div><div class='hunk'>@@ -233,11 +237,9 @@ void __init tx4938_time_init(unsigned int tmrnr)</div><div class='ctx'> 				     TXX9_IMCLK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init tx4938_setup_serial(void)</div><div class='add'>+void __init tx4938_sio_init(unsigned int sclk, unsigned int cts_mask)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_SERIAL_TXX9</div><div class='ctx'> 	int i;</div><div class='del'>-	struct uart_port req;</div><div class='ctx'> 	unsigned int ch_mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (__raw_readq(&amp;tx4938_ccfgptr-&gt;pcfg) &amp; TX4938_PCFG_ETH0_SEL)</div><div class='hunk'>@@ -245,15 +247,24 @@ void __init tx4938_setup_serial(void)</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		if ((1 &lt;&lt; i) &amp; ch_mask)</div><div class='ctx'> 			continue;</div><div class='del'>-		memset(&amp;req, 0, sizeof(req));</div><div class='del'>-		req.line = i;</div><div class='del'>-		req.iotype = UPIO_MEM;</div><div class='del'>-		req.membase = (unsigned char __iomem *)TX4938_SIO_REG(i);</div><div class='del'>-		req.mapbase = TX4938_SIO_REG(i) &amp; 0xfffffffffULL;</div><div class='del'>-		req.irq = TXX9_IRQ_BASE + TX4938_IR_SIO(i);</div><div class='del'>-		req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;</div><div class='del'>-		req.uartclk = TXX9_IMCLK;</div><div class='del'>-		early_serial_txx9_setup(&amp;req);</div><div class='add'>+		txx9_sio_init(TX4938_SIO_REG(i) &amp; 0xfffffffffULL,</div><div class='add'>+			      TXX9_IRQ_BASE + TX4938_IR_SIO(i),</div><div class='add'>+			      i, sclk, (1 &lt;&lt; i) &amp; cts_mask);</div><div class='ctx'> 	}</div><div class='del'>-#endif /* CONFIG_SERIAL_TXX9 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init tx4938_spi_init(int busid)</div><div class='add'>+{</div><div class='add'>+	txx9_spi_init(busid, TX4938_SPI_REG &amp; 0xfffffffffULL,</div><div class='add'>+		      TXX9_IRQ_BASE + TX4938_IR_SPI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init tx4938_ethaddr_init(unsigned char *addr0, unsigned char *addr1)</div><div class='add'>+{</div><div class='add'>+	u64 pcfg = __raw_readq(&amp;tx4938_ccfgptr-&gt;pcfg);</div><div class='add'>+</div><div class='add'>+	if (addr0 &amp;&amp; (pcfg &amp; TX4938_PCFG_ETH0_SEL))</div><div class='add'>+		txx9_ethaddr_init(TXX9_IRQ_BASE + TX4938_IR_ETH0, addr0);</div><div class='add'>+	if (addr1 &amp;&amp; (pcfg &amp; TX4938_PCFG_ETH1_SEL))</div><div class='add'>+		txx9_ethaddr_init(TXX9_IRQ_BASE + TX4938_IR_ETH1, addr1);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/txx9/generic/smsc_fdc37m81x.c b/arch/mips/txx9/generic/smsc_fdc37m81x.c<br/>index 69e487467fa5..a2b2d62d88e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/smsc_fdc37m81x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/generic/smsc_fdc37m81x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/smsc_fdc37m81x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/generic/smsc_fdc37m81x.c</a></div><div class='hunk'>@@ -15,8 +15,6 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/smsc_fdc37m81x.h&gt;</div><div class='ctx'> </div><div class='del'>-#define DEBUG</div><div class='del'>-</div><div class='ctx'> /* Common Registers */</div><div class='ctx'> #define SMSC_FDC37M81X_CONFIG_INDEX  0x00</div><div class='ctx'> #define SMSC_FDC37M81X_CONFIG_DATA   0x01</div><div class='hunk'>@@ -55,7 +53,7 @@</div><div class='ctx'> #define SMSC_FDC37M81X_CONFIG_EXIT   0xaa</div><div class='ctx'> #define SMSC_FDC37M81X_CHIP_ID       0x4d</div><div class='ctx'> </div><div class='del'>-static unsigned long g_smsc_fdc37m81x_base = 0;</div><div class='add'>+static unsigned long g_smsc_fdc37m81x_base;</div><div class='ctx'> </div><div class='ctx'> static inline unsigned char smsc_fdc37m81x_rd(unsigned char index)</div><div class='ctx'> {</div><div class='hunk'>@@ -107,7 +105,8 @@ unsigned long __init smsc_fdc37m81x_init(unsigned long port)</div><div class='ctx'> 	u8 chip_id;</div><div class='ctx'> </div><div class='ctx'> 	if (g_smsc_fdc37m81x_base)</div><div class='del'>-		printk("smsc_fdc37m81x_init() stepping on old base=0x%0*lx\n",</div><div class='add'>+		printk(KERN_WARNING "%s: stepping on old base=0x%0*lx\n",</div><div class='add'>+		       __func__,</div><div class='ctx'> 		       field, g_smsc_fdc37m81x_base);</div><div class='ctx'> </div><div class='ctx'> 	g_smsc_fdc37m81x_base = port;</div><div class='hunk'>@@ -118,7 +117,7 @@ unsigned long __init smsc_fdc37m81x_init(unsigned long port)</div><div class='ctx'> 	if (chip_id == SMSC_FDC37M81X_CHIP_ID)</div><div class='ctx'> 		smsc_fdc37m81x_config_end();</div><div class='ctx'> 	else {</div><div class='del'>-		printk("smsc_fdc37m81x_init() unknow chip id 0x%02x\n",</div><div class='add'>+		printk(KERN_WARNING "%s: unknow chip id 0x%02x\n", __func__,</div><div class='ctx'> 		       chip_id);</div><div class='ctx'> 		g_smsc_fdc37m81x_base = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -127,22 +126,23 @@ unsigned long __init smsc_fdc37m81x_init(unsigned long port)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-void smsc_fdc37m81x_config_dump_one(char *key, u8 dev, u8 reg)</div><div class='add'>+static void smsc_fdc37m81x_config_dump_one(const char *key, u8 dev, u8 reg)</div><div class='ctx'> {</div><div class='del'>-	printk("%s: dev=0x%02x reg=0x%02x val=0x%02x\n", key, dev, reg,</div><div class='add'>+	printk(KERN_INFO "%s: dev=0x%02x reg=0x%02x val=0x%02x\n",</div><div class='add'>+	       key, dev, reg,</div><div class='ctx'> 	       smsc_fdc37m81x_rd(reg));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void smsc_fdc37m81x_config_dump(void)</div><div class='ctx'> {</div><div class='ctx'> 	u8 orig;</div><div class='del'>-	char *fname = "smsc_fdc37m81x_config_dump()";</div><div class='add'>+	const char *fname = __func__;</div><div class='ctx'> </div><div class='ctx'> 	smsc_fdc37m81x_config_beg();</div><div class='ctx'> </div><div class='ctx'> 	orig = smsc_fdc37m81x_rd(SMSC_FDC37M81X_DNUM);</div><div class='ctx'> </div><div class='del'>-	printk("%s: common\n", fname);</div><div class='add'>+	printk(KERN_INFO "%s: common\n", fname);</div><div class='ctx'> 	smsc_fdc37m81x_config_dump_one(fname, SMSC_FDC37M81X_NONE,</div><div class='ctx'> 				       SMSC_FDC37M81X_DNUM);</div><div class='ctx'> 	smsc_fdc37m81x_config_dump_one(fname, SMSC_FDC37M81X_NONE,</div><div class='hunk'>@@ -154,7 +154,7 @@ void smsc_fdc37m81x_config_dump(void)</div><div class='ctx'> 	smsc_fdc37m81x_config_dump_one(fname, SMSC_FDC37M81X_NONE,</div><div class='ctx'> 				       SMSC_FDC37M81X_PMGT);</div><div class='ctx'> </div><div class='del'>-	printk("%s: keyboard\n", fname);</div><div class='add'>+	printk(KERN_INFO "%s: keyboard\n", fname);</div><div class='ctx'> 	smsc_dc37m81x_wr(SMSC_FDC37M81X_DNUM, SMSC_FDC37M81X_KBD);</div><div class='ctx'> 	smsc_fdc37m81x_config_dump_one(fname, SMSC_FDC37M81X_KBD,</div><div class='ctx'> 				       SMSC_FDC37M81X_ACTIVE);</div><div class='head'>diff --git a/arch/mips/txx9/jmr3927/Makefile b/arch/mips/txx9/jmr3927/Makefile<br/>index ba292c945669..20d61ac543e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/jmr3927/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/jmr3927/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/jmr3927/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/jmr3927/Makefile</a></div><div class='hunk'>@@ -3,6 +3,5 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-y	+= prom.o irq.o setup.o</div><div class='del'>-obj-$(CONFIG_KGDB)	+= kgdb_io.o</div><div class='ctx'> </div><div class='ctx'> EXTRA_CFLAGS += -Werror</div><div class='head'>diff --git a/arch/mips/txx9/jmr3927/irq.c b/arch/mips/txx9/jmr3927/irq.c<br/>index 070c9a115e57..6ec626c9473f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/jmr3927/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/jmr3927/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/jmr3927/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/jmr3927/irq.c</a></div><div class='hunk'>@@ -30,15 +30,11 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/generic.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/jmr3927.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -46,13 +42,6 @@</div><div class='ctx'> #error JMR3927_IRQ_END &gt; NR_IRQS</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static unsigned char irc_level[TX3927_NUM_IR] = {</div><div class='del'>-	5, 5, 5, 5, 5, 5,	/* INT[5:0] */</div><div class='del'>-	7, 7,			/* SIO */</div><div class='del'>-	5, 5, 5, 0, 0,		/* DMA, PIO, PCI */</div><div class='del'>-	6, 6, 6			/* TMR */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * CP0_STATUS is a thread's resource (saved/restored on context switch).</div><div class='ctx'>  * So disable_irq/enable_irq MUST handle IOC/IRC registers.</div><div class='hunk'>@@ -103,26 +92,18 @@ static int jmr3927_irq_dispatch(int pending)</div><div class='ctx'> 	return irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-static irqreturn_t jmr3927_pcierr_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_WARNING "PCI error interrupt (irq 0x%x).\n", irq);</div><div class='del'>-	printk(KERN_WARNING "pcistat:%02x, lbstat:%04lx\n",</div><div class='del'>-	       tx3927_pcicptr-&gt;pcistat, tx3927_pcicptr-&gt;lbstat);</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-static struct irqaction pcierr_action = {</div><div class='del'>-	.handler = jmr3927_pcierr_interrupt,</div><div class='del'>-	.mask = CPU_MASK_NONE,</div><div class='del'>-	.name = "PCI error",</div><div class='add'>+static struct irq_chip jmr3927_irq_ioc = {</div><div class='add'>+	.name = "jmr3927_ioc",</div><div class='add'>+	.ack = mask_irq_ioc,</div><div class='add'>+	.mask = mask_irq_ioc,</div><div class='add'>+	.mask_ack = mask_irq_ioc,</div><div class='add'>+	.unmask = unmask_irq_ioc,</div><div class='ctx'> };</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void __init jmr3927_irq_init(void);</div><div class='ctx'> </div><div class='ctx'> void __init jmr3927_irq_setup(void)</div><div class='ctx'> {</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='ctx'> 	txx9_irq_dispatch = jmr3927_irq_dispatch;</div><div class='ctx'> 	/* Now, interrupt control disabled, */</div><div class='ctx'> 	/* all IRC interrupts are masked, */</div><div class='hunk'>@@ -138,34 +119,10 @@ void __init jmr3927_irq_setup(void)</div><div class='ctx'> 	/* clear PCI Reset interrupts */</div><div class='ctx'> 	jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR);</div><div class='ctx'> </div><div class='del'>-	jmr3927_irq_init();</div><div class='add'>+	tx3927_irq_init();</div><div class='add'>+	for (i = JMR3927_IRQ_IOC; i &lt; JMR3927_IRQ_IOC + JMR3927_NR_IRQ_IOC; i++)</div><div class='add'>+		set_irq_chip_and_handler(i, &amp;jmr3927_irq_ioc, handle_level_irq);</div><div class='ctx'> </div><div class='ctx'> 	/* setup IOC interrupt 1 (PCI, MODEM) */</div><div class='ctx'> 	set_irq_chained_handler(JMR3927_IRQ_IOCINT, handle_simple_irq);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	setup_irq(JMR3927_IRQ_IRC_PCI, &amp;pcierr_action);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* enable all CPU interrupt bits. */</div><div class='del'>-	set_c0_status(ST0_IM);	/* IE bit is still 0. */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct irq_chip jmr3927_irq_ioc = {</div><div class='del'>-	.name = "jmr3927_ioc",</div><div class='del'>-	.ack = mask_irq_ioc,</div><div class='del'>-	.mask = mask_irq_ioc,</div><div class='del'>-	.mask_ack = mask_irq_ioc,</div><div class='del'>-	.unmask = unmask_irq_ioc,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init jmr3927_irq_init(void)</div><div class='del'>-{</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	txx9_irq_init(TX3927_IRC_REG);</div><div class='del'>-	for (i = 0; i &lt; TXx9_MAX_IR; i++)</div><div class='del'>-		txx9_irq_set_pri(i, irc_level[i]);</div><div class='del'>-	for (i = JMR3927_IRQ_IOC; i &lt; JMR3927_IRQ_IOC + JMR3927_NR_IRQ_IOC; i++)</div><div class='del'>-		set_irq_chip_and_handler(i, &amp;jmr3927_irq_ioc, handle_level_irq);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/txx9/jmr3927/kgdb_io.c b/arch/mips/txx9/jmr3927/kgdb_io.c<br/>deleted file mode 100644<br/>index 5bd757e56f79..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/jmr3927/kgdb_io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/jmr3927/kgdb_io.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,105 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * BRIEF MODULE DESCRIPTION</div><div class='del'>- *	Low level uart routines to directly access a TX[34]927 SIO.</div><div class='del'>- *</div><div class='del'>- * Copyright 2001 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc.</div><div class='del'>- *         	ahennessy@mvista.com or source@mvista.com</div><div class='del'>- *</div><div class='del'>- * Based on arch/mips/ddb5xxx/ddb5477/kgdb_io.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000-2001 Toshiba Corporation</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- *  under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm/txx9/jmr3927.h&gt;</div><div class='del'>-</div><div class='del'>-#define TIMEOUT       0xffffff</div><div class='del'>-</div><div class='del'>-static int remoteDebugInitialized = 0;</div><div class='del'>-static void debugInit(int baud);</div><div class='del'>-</div><div class='del'>-int putDebugChar(unsigned char c)</div><div class='del'>-{</div><div class='del'>-        int i = 0;</div><div class='del'>-</div><div class='del'>-	if (!remoteDebugInitialized) {</div><div class='del'>-		remoteDebugInitialized = 1;</div><div class='del'>-		debugInit(38400);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-        do {</div><div class='del'>-            slow_down();</div><div class='del'>-            i++;</div><div class='del'>-            if (i&gt;TIMEOUT) {</div><div class='del'>-                break;</div><div class='del'>-            }</div><div class='del'>-        } while (!(tx3927_sioptr(0)-&gt;cisr &amp; TXx927_SICISR_TXALS));</div><div class='del'>-	tx3927_sioptr(0)-&gt;tfifo = c;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned char getDebugChar(void)</div><div class='del'>-{</div><div class='del'>-        int i = 0;</div><div class='del'>-	int dicr;</div><div class='del'>-	char c;</div><div class='del'>-</div><div class='del'>-	if (!remoteDebugInitialized) {</div><div class='del'>-		remoteDebugInitialized = 1;</div><div class='del'>-		debugInit(38400);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* diable RX int. */</div><div class='del'>-	dicr = tx3927_sioptr(0)-&gt;dicr;</div><div class='del'>-	tx3927_sioptr(0)-&gt;dicr = 0;</div><div class='del'>-</div><div class='del'>-        do {</div><div class='del'>-            slow_down();</div><div class='del'>-            i++;</div><div class='del'>-            if (i&gt;TIMEOUT) {</div><div class='del'>-                break;</div><div class='del'>-            }</div><div class='del'>-        } while (tx3927_sioptr(0)-&gt;disr &amp; TXx927_SIDISR_UVALID)</div><div class='del'>-		;</div><div class='del'>-	c = tx3927_sioptr(0)-&gt;rfifo;</div><div class='del'>-</div><div class='del'>-	/* clear RX int. status */</div><div class='del'>-	tx3927_sioptr(0)-&gt;disr &amp;= ~TXx927_SIDISR_RDIS;</div><div class='del'>-	/* enable RX int. */</div><div class='del'>-	tx3927_sioptr(0)-&gt;dicr = dicr;</div><div class='del'>-</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void debugInit(int baud)</div><div class='del'>-{</div><div class='del'>-	tx3927_sioptr(0)-&gt;lcr = 0x020;</div><div class='del'>-	tx3927_sioptr(0)-&gt;dicr = 0;</div><div class='del'>-	tx3927_sioptr(0)-&gt;disr = 0x4100;</div><div class='del'>-	tx3927_sioptr(0)-&gt;cisr = 0x014;</div><div class='del'>-	tx3927_sioptr(0)-&gt;fcr = 0;</div><div class='del'>-	tx3927_sioptr(0)-&gt;flcr = 0x02;</div><div class='del'>-	tx3927_sioptr(0)-&gt;bgr = ((JMR3927_BASE_BAUD + baud / 2) / baud) |</div><div class='del'>-		TXx927_SIBGR_BCLK_T0;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/txx9/jmr3927/prom.c b/arch/mips/txx9/jmr3927/prom.c<br/>index 2cadb423face..70c4c8ec3e84 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/jmr3927/prom.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/jmr3927/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/jmr3927/prom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/jmr3927/prom.c</a></div><div class='hunk'>@@ -36,41 +36,18 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/generic.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/jmr3927.h&gt;</div><div class='ctx'> </div><div class='del'>-#define TIMEOUT       0xffffff</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-prom_putchar(char c)</div><div class='del'>-{</div><div class='del'>-        int i = 0;</div><div class='del'>-</div><div class='del'>-        do {</div><div class='del'>-            i++;</div><div class='del'>-            if (i&gt;TIMEOUT)</div><div class='del'>-                break;</div><div class='del'>-        } while (!(tx3927_sioptr(1)-&gt;cisr &amp; TXx927_SICISR_TXALS));</div><div class='del'>-	tx3927_sioptr(1)-&gt;tfifo = c;</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-puts(const char *cp)</div><div class='del'>-{</div><div class='del'>-    while (*cp)</div><div class='del'>-	prom_putchar(*cp++);</div><div class='del'>-    prom_putchar('\r');</div><div class='del'>-    prom_putchar('\n');</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __init jmr3927_prom_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* CCFG */</div><div class='ctx'> 	if ((tx3927_ccfgptr-&gt;ccfg &amp; TX3927_CCFG_TLBOFF) == 0)</div><div class='del'>-		puts("Warning: TX3927 TLB off\n");</div><div class='add'>+		printk(KERN_ERR "TX3927 TLB off\n");</div><div class='ctx'> </div><div class='ctx'> 	prom_init_cmdline();</div><div class='ctx'> 	add_memory_region(0, JMR3927_SDRAM_SIZE, BOOT_MEM_RAM);</div><div class='add'>+	txx9_sio_putchar_init(TX3927_SIO_REG(1));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/txx9/jmr3927/setup.c b/arch/mips/txx9/jmr3927/setup.c<br/>index 03647ebe4130..87db41be8a56 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/jmr3927/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/jmr3927/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/jmr3927/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/jmr3927/setup.c</a></div><div class='hunk'>@@ -32,27 +32,18 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='del'>-#ifdef CONFIG_SERIAL_TXX9</div><div class='del'>-#include &lt;linux/serial_core.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#include &lt;asm/txx9tmr.h&gt;</div><div class='del'>-#include &lt;asm/txx9pio.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/txx9pio.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/generic.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/pci.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/jmr3927.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> </div><div class='del'>-extern void puts(const char *cp);</div><div class='del'>-</div><div class='del'>-/* don't enable - see errata */</div><div class='del'>-static int jmr3927_ccfg_toeon;</div><div class='del'>-</div><div class='del'>-static inline void do_reset(void)</div><div class='add'>+static void jmr3927_machine_restart(char *command)</div><div class='ctx'> {</div><div class='add'>+	local_irq_disable();</div><div class='ctx'> #if 1	/* Resetting PCI bus */</div><div class='ctx'> 	jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR);</div><div class='ctx'> 	jmr3927_ioc_reg_out(JMR3927_IOC_RESET_PCI, JMR3927_IOC_RESET_ADDR);</div><div class='hunk'>@@ -61,33 +52,13 @@ static inline void do_reset(void)</div><div class='ctx'> 	jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR);</div><div class='ctx'> #endif</div><div class='ctx'> 	jmr3927_ioc_reg_out(JMR3927_IOC_RESET_CPU, JMR3927_IOC_RESET_ADDR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void jmr3927_machine_restart(char *command)</div><div class='del'>-{</div><div class='del'>-	local_irq_disable();</div><div class='del'>-	puts("Rebooting...");</div><div class='del'>-	do_reset();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void jmr3927_machine_halt(void)</div><div class='del'>-{</div><div class='del'>-	puts("JMR-TX3927 halted.\n");</div><div class='del'>-	while (1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void jmr3927_machine_power_off(void)</div><div class='del'>-{</div><div class='del'>-	puts("JMR-TX3927 halted. Please turn off the power.\n");</div><div class='del'>-	while (1);</div><div class='add'>+	/* fallback */</div><div class='add'>+	(*_machine_halt)();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init jmr3927_time_init(void)</div><div class='ctx'> {</div><div class='del'>-	txx9_clockevent_init(TX3927_TMR_REG(0),</div><div class='del'>-			     TXX9_IRQ_BASE + JMR3927_IRQ_IRC_TMR(0),</div><div class='del'>-			     JMR3927_IMCLK);</div><div class='del'>-	txx9_clocksource_init(TX3927_TMR_REG(1), JMR3927_IMCLK);</div><div class='add'>+	tx3927_time_init(0, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define DO_WRITE_THROUGH</div><div class='hunk'>@@ -102,11 +73,6 @@ static void __init jmr3927_mem_setup(void)</div><div class='ctx'> 	set_io_port_base(JMR3927_PORT_BASE + JMR3927_PCIIO);</div><div class='ctx'> </div><div class='ctx'> 	_machine_restart = jmr3927_machine_restart;</div><div class='del'>-	_machine_halt = jmr3927_machine_halt;</div><div class='del'>-	pm_power_off = jmr3927_machine_power_off;</div><div class='del'>-</div><div class='del'>-	/* Reboot on panic */</div><div class='del'>-	panic_timeout = 180;</div><div class='ctx'> </div><div class='ctx'> 	/* cache setup */</div><div class='ctx'> 	{</div><div class='hunk'>@@ -125,7 +91,8 @@ static void __init jmr3927_mem_setup(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 		conf = read_c0_conf();</div><div class='del'>-		conf &amp;= ~(TX39_CONF_ICE | TX39_CONF_DCE | TX39_CONF_WBON | TX39_CONF_CWFON);</div><div class='add'>+		conf &amp;= ~(TX39_CONF_ICE | TX39_CONF_DCE |</div><div class='add'>+			  TX39_CONF_WBON | TX39_CONF_CWFON);</div><div class='ctx'> 		conf |= mips_ic_disable ? 0 : TX39_CONF_ICE;</div><div class='ctx'> 		conf |= mips_dc_disable ? 0 : TX39_CONF_DCE;</div><div class='ctx'> 		conf |= mips_config_wbon ? TX39_CONF_WBON : 0;</div><div class='hunk'>@@ -138,47 +105,14 @@ static void __init jmr3927_mem_setup(void)</div><div class='ctx'> 	/* initialize board */</div><div class='ctx'> 	jmr3927_board_init();</div><div class='ctx'> </div><div class='del'>-	argptr = prom_getcmdline();</div><div class='del'>-</div><div class='del'>-	if ((argptr = strstr(argptr, "toeon")) != NULL)</div><div class='del'>-		jmr3927_ccfg_toeon = 1;</div><div class='del'>-	argptr = prom_getcmdline();</div><div class='del'>-	if ((argptr = strstr(argptr, "ip=")) == NULL) {</div><div class='del'>-		argptr = prom_getcmdline();</div><div class='del'>-		strcat(argptr, " ip=bootp");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SERIAL_TXX9</div><div class='del'>-	{</div><div class='del'>-		extern int early_serial_txx9_setup(struct uart_port *port);</div><div class='del'>-		int i;</div><div class='del'>-		struct uart_port req;</div><div class='del'>-		for(i = 0; i &lt; 2; i++) {</div><div class='del'>-			memset(&amp;req, 0, sizeof(req));</div><div class='del'>-			req.line = i;</div><div class='del'>-			req.iotype = UPIO_MEM;</div><div class='del'>-			req.membase = (unsigned char __iomem *)TX3927_SIO_REG(i);</div><div class='del'>-			req.mapbase = TX3927_SIO_REG(i);</div><div class='del'>-			req.irq = i == 0 ?</div><div class='del'>-				JMR3927_IRQ_IRC_SIO0 : JMR3927_IRQ_IRC_SIO1;</div><div class='del'>-			if (i == 0)</div><div class='del'>-				req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;</div><div class='del'>-			req.uartclk = JMR3927_IMCLK;</div><div class='del'>-			early_serial_txx9_setup(&amp;req);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	tx3927_sio_init(0, 1 &lt;&lt; 1); /* ch1: noCTS */</div><div class='ctx'> #ifdef CONFIG_SERIAL_TXX9_CONSOLE</div><div class='ctx'> 	argptr = prom_getcmdline();</div><div class='del'>-	if ((argptr = strstr(argptr, "console=")) == NULL) {</div><div class='del'>-		argptr = prom_getcmdline();</div><div class='add'>+	if (!strstr(argptr, "console="))</div><div class='ctx'> 		strcat(argptr, " console=ttyS1,115200");</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tx3927_setup(void);</div><div class='del'>-</div><div class='ctx'> static void __init jmr3927_pci_setup(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='hunk'>@@ -199,32 +133,13 @@ static void __init jmr3927_pci_setup(void)</div><div class='ctx'> 		jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR);</div><div class='ctx'> 	}</div><div class='ctx'> 	tx3927_pcic_setup(c, JMR3927_SDRAM_SIZE, extarb);</div><div class='add'>+	tx3927_setup_pcierr_irq();</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init jmr3927_board_init(void)</div><div class='ctx'> {</div><div class='del'>-	tx3927_setup();</div><div class='del'>-	jmr3927_pci_setup();</div><div class='del'>-</div><div class='del'>-	/* SIO0 DTR on */</div><div class='del'>-	jmr3927_ioc_reg_out(0, JMR3927_IOC_DTR_ADDR);</div><div class='del'>-</div><div class='del'>-	jmr3927_led_set(0);</div><div class='del'>-</div><div class='del'>-	printk("JMR-TX3927 (Rev %d) --- IOC(Rev %d) DIPSW:%d,%d,%d,%d\n",</div><div class='del'>-	       jmr3927_ioc_reg_in(JMR3927_IOC_BREV_ADDR) &amp; JMR3927_REV_MASK,</div><div class='del'>-	       jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR) &amp; JMR3927_REV_MASK,</div><div class='del'>-	       jmr3927_dipsw1(), jmr3927_dipsw2(),</div><div class='del'>-	       jmr3927_dipsw3(), jmr3927_dipsw4());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init tx3927_setup(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='ctx'> 	txx9_cpu_clock = JMR3927_CORECLK;</div><div class='del'>-	txx9_gbus_clock = JMR3927_GBUSCLK;</div><div class='ctx'> 	/* SDRAMC are configured by PROM */</div><div class='ctx'> </div><div class='ctx'> 	/* ROMC */</div><div class='hunk'>@@ -233,74 +148,32 @@ static void __init tx3927_setup(void)</div><div class='ctx'> 	tx3927_romcptr-&gt;cr[3] = JMR3927_ROMCE3 | 0x0003f698;</div><div class='ctx'> 	tx3927_romcptr-&gt;cr[5] = JMR3927_ROMCE5 | 0x0000f218;</div><div class='ctx'> </div><div class='del'>-	/* CCFG */</div><div class='del'>-	/* enable Timeout BusError */</div><div class='del'>-	if (jmr3927_ccfg_toeon)</div><div class='del'>-		tx3927_ccfgptr-&gt;ccfg |= TX3927_CCFG_TOE;</div><div class='del'>-</div><div class='del'>-	/* clear BusErrorOnWrite flag */</div><div class='del'>-	tx3927_ccfgptr-&gt;ccfg &amp;= ~TX3927_CCFG_BEOW;</div><div class='del'>-	/* Disable PCI snoop */</div><div class='del'>-	tx3927_ccfgptr-&gt;ccfg &amp;= ~TX3927_CCFG_PSNP;</div><div class='del'>-	/* do reset on watchdog */</div><div class='del'>-	tx3927_ccfgptr-&gt;ccfg |= TX3927_CCFG_WR;</div><div class='del'>-</div><div class='del'>-#ifdef DO_WRITE_THROUGH</div><div class='del'>-	/* Enable PCI SNOOP - with write through only */</div><div class='del'>-	tx3927_ccfgptr-&gt;ccfg |= TX3927_CCFG_PSNP;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/* Pin selection */</div><div class='ctx'> 	tx3927_ccfgptr-&gt;pcfg &amp;= ~TX3927_PCFG_SELALL;</div><div class='ctx'> 	tx3927_ccfgptr-&gt;pcfg |=</div><div class='ctx'> 		TX3927_PCFG_SELSIOC(0) | TX3927_PCFG_SELSIO_ALL |</div><div class='ctx'> 		(TX3927_PCFG_SELDMA_ALL &amp; ~TX3927_PCFG_SELDMA(1));</div><div class='ctx'> </div><div class='del'>-	printk("TX3927 -- CRIR:%08lx CCFG:%08lx PCFG:%08lx\n",</div><div class='del'>-	       tx3927_ccfgptr-&gt;crir,</div><div class='del'>-	       tx3927_ccfgptr-&gt;ccfg, tx3927_ccfgptr-&gt;pcfg);</div><div class='del'>-</div><div class='del'>-	/* TMR */</div><div class='del'>-	for (i = 0; i &lt; TX3927_NR_TMR; i++)</div><div class='del'>-		txx9_tmr_init(TX3927_TMR_REG(i));</div><div class='del'>-</div><div class='del'>-	/* DMA */</div><div class='del'>-	tx3927_dmaptr-&gt;mcr = 0;</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(tx3927_dmaptr-&gt;ch); i++) {</div><div class='del'>-		/* reset channel */</div><div class='del'>-		tx3927_dmaptr-&gt;ch[i].ccr = TX3927_DMA_CCR_CHRST;</div><div class='del'>-		tx3927_dmaptr-&gt;ch[i].ccr = 0;</div><div class='del'>-	}</div><div class='del'>-	/* enable DMA */</div><div class='del'>-#ifdef __BIG_ENDIAN</div><div class='del'>-	tx3927_dmaptr-&gt;mcr = TX3927_DMA_MCR_MSTEN;</div><div class='del'>-#else</div><div class='del'>-	tx3927_dmaptr-&gt;mcr = TX3927_DMA_MCR_MSTEN | TX3927_DMA_MCR_LE;</div><div class='del'>-#endif</div><div class='add'>+	tx3927_setup();</div><div class='ctx'> </div><div class='del'>-	/* PIO */</div><div class='ctx'> 	/* PIO[15:12] connected to LEDs */</div><div class='ctx'> 	__raw_writel(0x0000f000, &amp;tx3927_pioptr-&gt;dir);</div><div class='del'>-	__raw_writel(0, &amp;tx3927_pioptr-&gt;maskcpu);</div><div class='del'>-	__raw_writel(0, &amp;tx3927_pioptr-&gt;maskext);</div><div class='del'>-	txx9_gpio_init(TX3927_PIO_REG, 0, 16);</div><div class='ctx'> 	gpio_request(11, "dipsw1");</div><div class='ctx'> 	gpio_request(10, "dipsw2");</div><div class='del'>-	{</div><div class='del'>-		unsigned int conf;</div><div class='ctx'> </div><div class='del'>-	conf = read_c0_conf();</div><div class='del'>-               if (!(conf &amp; TX39_CONF_ICE))</div><div class='del'>-                       printk("TX3927 I-Cache disabled.\n");</div><div class='del'>-               if (!(conf &amp; TX39_CONF_DCE))</div><div class='del'>-                       printk("TX3927 D-Cache disabled.\n");</div><div class='del'>-               else if (!(conf &amp; TX39_CONF_WBON))</div><div class='del'>-                       printk("TX3927 D-Cache WriteThrough.\n");</div><div class='del'>-               else if (!(conf &amp; TX39_CONF_CWFON))</div><div class='del'>-                       printk("TX3927 D-Cache WriteBack.\n");</div><div class='del'>-               else</div><div class='del'>-                       printk("TX3927 D-Cache WriteBack (CWF) .\n");</div><div class='del'>-	}</div><div class='add'>+	jmr3927_pci_setup();</div><div class='add'>+</div><div class='add'>+	/* SIO0 DTR on */</div><div class='add'>+	jmr3927_ioc_reg_out(0, JMR3927_IOC_DTR_ADDR);</div><div class='add'>+</div><div class='add'>+	jmr3927_led_set(0);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO</div><div class='add'>+	       "JMR-TX3927 (Rev %d) --- IOC(Rev %d) DIPSW:%d,%d,%d,%d\n",</div><div class='add'>+	       jmr3927_ioc_reg_in(JMR3927_IOC_BREV_ADDR) &amp; JMR3927_REV_MASK,</div><div class='add'>+	       jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR) &amp; JMR3927_REV_MASK,</div><div class='add'>+	       jmr3927_dipsw1(), jmr3927_dipsw2(),</div><div class='add'>+	       jmr3927_dipsw3(), jmr3927_dipsw4());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This trick makes rtc-ds1742 driver usable as is. */</div><div class='hunk'>@@ -316,42 +189,21 @@ static unsigned long jmr3927_swizzle_addr_b(unsigned long port)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init jmr3927_rtc_init(void)</div><div class='add'>+static void __init jmr3927_rtc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	static struct resource __initdata res = {</div><div class='ctx'> 		.start	= JMR3927_IOC_NVRAMB_ADDR - IO_BASE,</div><div class='ctx'> 		.end	= JMR3927_IOC_NVRAMB_ADDR - IO_BASE + 0x800 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	};</div><div class='del'>-	struct platform_device *dev;</div><div class='del'>-	dev = platform_device_register_simple("rtc-ds1742", -1, &amp;res, 1);</div><div class='del'>-	return IS_ERR(dev) ? PTR_ERR(dev) : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Watchdog support */</div><div class='del'>-</div><div class='del'>-static int __init txx9_wdt_init(unsigned long base)</div><div class='del'>-{</div><div class='del'>-	struct resource res = {</div><div class='del'>-		.start	= base,</div><div class='del'>-		.end	= base + 0x100 - 1,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	};</div><div class='del'>-	struct platform_device *dev =</div><div class='del'>-		platform_device_register_simple("txx9wdt", -1, &amp;res, 1);</div><div class='del'>-	return IS_ERR(dev) ? PTR_ERR(dev) : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init jmr3927_wdt_init(void)</div><div class='del'>-{</div><div class='del'>-	return txx9_wdt_init(TX3927_TMR_REG(2));</div><div class='add'>+	platform_device_register_simple("rtc-ds1742", -1, &amp;res, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init jmr3927_device_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	__swizzle_addr_b = jmr3927_swizzle_addr_b;</div><div class='ctx'> 	jmr3927_rtc_init();</div><div class='del'>-	jmr3927_wdt_init();</div><div class='add'>+	tx3927_wdt_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct txx9_board_vec jmr3927_vec __initdata = {</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4927/irq.c b/arch/mips/txx9/rbtx4927/irq.c<br/>index cd748a930328..00cd5231da30 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/rbtx4927/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/rbtx4927/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/rbtx4927/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/rbtx4927/irq.c</a></div><div class='hunk'>@@ -27,85 +27,86 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> /*</div><div class='del'>-IRQ  Device</div><div class='del'>-00   RBTX4927-ISA/00</div><div class='del'>-01   RBTX4927-ISA/01 PS2/Keyboard</div><div class='del'>-02   RBTX4927-ISA/02 Cascade RBTX4927-ISA (irqs 8-15)</div><div class='del'>-03   RBTX4927-ISA/03</div><div class='del'>-04   RBTX4927-ISA/04</div><div class='del'>-05   RBTX4927-ISA/05</div><div class='del'>-06   RBTX4927-ISA/06</div><div class='del'>-07   RBTX4927-ISA/07</div><div class='del'>-08   RBTX4927-ISA/08</div><div class='del'>-09   RBTX4927-ISA/09</div><div class='del'>-10   RBTX4927-ISA/10</div><div class='del'>-11   RBTX4927-ISA/11</div><div class='del'>-12   RBTX4927-ISA/12 PS2/Mouse (not supported at this time)</div><div class='del'>-13   RBTX4927-ISA/13</div><div class='del'>-14   RBTX4927-ISA/14 IDE</div><div class='del'>-15   RBTX4927-ISA/15</div><div class='del'>-</div><div class='del'>-16   TX4927-CP0/00 Software 0</div><div class='del'>-17   TX4927-CP0/01 Software 1</div><div class='del'>-18   TX4927-CP0/02 Cascade TX4927-CP0</div><div class='del'>-19   TX4927-CP0/03 Multiplexed -- do not use</div><div class='del'>-20   TX4927-CP0/04 Multiplexed -- do not use</div><div class='del'>-21   TX4927-CP0/05 Multiplexed -- do not use</div><div class='del'>-22   TX4927-CP0/06 Multiplexed -- do not use</div><div class='del'>-23   TX4927-CP0/07 CPU TIMER</div><div class='del'>-</div><div class='del'>-24   TX4927-PIC/00</div><div class='del'>-25   TX4927-PIC/01</div><div class='del'>-26   TX4927-PIC/02</div><div class='del'>-27   TX4927-PIC/03 Cascade RBTX4927-IOC</div><div class='del'>-28   TX4927-PIC/04</div><div class='del'>-29   TX4927-PIC/05 RBTX4927 RTL-8019AS ethernet</div><div class='del'>-30   TX4927-PIC/06</div><div class='del'>-31   TX4927-PIC/07</div><div class='del'>-32   TX4927-PIC/08 TX4927 SerialIO Channel 0</div><div class='del'>-33   TX4927-PIC/09 TX4927 SerialIO Channel 1</div><div class='del'>-34   TX4927-PIC/10</div><div class='del'>-35   TX4927-PIC/11</div><div class='del'>-36   TX4927-PIC/12</div><div class='del'>-37   TX4927-PIC/13</div><div class='del'>-38   TX4927-PIC/14</div><div class='del'>-39   TX4927-PIC/15</div><div class='del'>-40   TX4927-PIC/16 TX4927 PCI PCI-C</div><div class='del'>-41   TX4927-PIC/17</div><div class='del'>-42   TX4927-PIC/18</div><div class='del'>-43   TX4927-PIC/19</div><div class='del'>-44   TX4927-PIC/20</div><div class='del'>-45   TX4927-PIC/21</div><div class='del'>-46   TX4927-PIC/22 TX4927 PCI PCI-ERR</div><div class='del'>-47   TX4927-PIC/23 TX4927 PCI PCI-PMA (not used)</div><div class='del'>-48   TX4927-PIC/24</div><div class='del'>-49   TX4927-PIC/25</div><div class='del'>-50   TX4927-PIC/26</div><div class='del'>-51   TX4927-PIC/27</div><div class='del'>-52   TX4927-PIC/28</div><div class='del'>-53   TX4927-PIC/29</div><div class='del'>-54   TX4927-PIC/30</div><div class='del'>-55   TX4927-PIC/31</div><div class='del'>-</div><div class='del'>-56 RBTX4927-IOC/00 FPCIB0 PCI-D PJ4/A PJ5/B SB/C PJ6/D PJ7/A (SouthBridge/NotUsed)        [RTL-8139=PJ4]</div><div class='del'>-57 RBTX4927-IOC/01 FPCIB0 PCI-C PJ4/D PJ5/A SB/B PJ6/C PJ7/D (SouthBridge/NotUsed)        [RTL-8139=PJ5]</div><div class='del'>-58 RBTX4927-IOC/02 FPCIB0 PCI-B PJ4/C PJ5/D SB/A PJ6/B PJ7/C (SouthBridge/IDE/pin=1,INTR) [RTL-8139=NotSupported]</div><div class='del'>-59 RBTX4927-IOC/03 FPCIB0 PCI-A PJ4/B PJ5/C SB/D PJ6/A PJ7/B (SouthBridge/USB/pin=4)      [RTL-8139=PJ6]</div><div class='del'>-60 RBTX4927-IOC/04</div><div class='del'>-61 RBTX4927-IOC/05</div><div class='del'>-62 RBTX4927-IOC/06</div><div class='del'>-63 RBTX4927-IOC/07</div><div class='del'>-</div><div class='del'>-NOTES:</div><div class='del'>-SouthBridge/INTR is mapped to SouthBridge/A=PCI-B/#58</div><div class='del'>-SouthBridge/ISA/pin=0 no pci irq used by this device</div><div class='del'>-SouthBridge/IDE/pin=1 no pci irq used by this device, using INTR via ISA IRQ14</div><div class='del'>-SouthBridge/USB/pin=4 using pci irq SouthBridge/D=PCI-A=#59</div><div class='del'>-SouthBridge/PMC/pin=0 no pci irq used by this device</div><div class='del'>-SuperIO/PS2/Keyboard, using INTR via ISA IRQ1</div><div class='del'>-SuperIO/PS2/Mouse, using INTR via ISA IRQ12 (mouse not currently supported)</div><div class='del'>-JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthBridge, JP4, JP5, JP6</div><div class='del'>-*/</div><div class='add'>+ * I8259A_IRQ_BASE+00</div><div class='add'>+ * I8259A_IRQ_BASE+01 PS2/Keyboard</div><div class='add'>+ * I8259A_IRQ_BASE+02 Cascade RBTX4927-ISA (irqs 8-15)</div><div class='add'>+ * I8259A_IRQ_BASE+03</div><div class='add'>+ * I8259A_IRQ_BASE+04</div><div class='add'>+ * I8259A_IRQ_BASE+05</div><div class='add'>+ * I8259A_IRQ_BASE+06</div><div class='add'>+ * I8259A_IRQ_BASE+07</div><div class='add'>+ * I8259A_IRQ_BASE+08</div><div class='add'>+ * I8259A_IRQ_BASE+09</div><div class='add'>+ * I8259A_IRQ_BASE+10</div><div class='add'>+ * I8259A_IRQ_BASE+11</div><div class='add'>+ * I8259A_IRQ_BASE+12 PS2/Mouse (not supported at this time)</div><div class='add'>+ * I8259A_IRQ_BASE+13</div><div class='add'>+ * I8259A_IRQ_BASE+14 IDE</div><div class='add'>+ * I8259A_IRQ_BASE+15</div><div class='add'>+ *</div><div class='add'>+ * MIPS_CPU_IRQ_BASE+00 Software 0</div><div class='add'>+ * MIPS_CPU_IRQ_BASE+01 Software 1</div><div class='add'>+ * MIPS_CPU_IRQ_BASE+02 Cascade TX4927-CP0</div><div class='add'>+ * MIPS_CPU_IRQ_BASE+03 Multiplexed -- do not use</div><div class='add'>+ * MIPS_CPU_IRQ_BASE+04 Multiplexed -- do not use</div><div class='add'>+ * MIPS_CPU_IRQ_BASE+05 Multiplexed -- do not use</div><div class='add'>+ * MIPS_CPU_IRQ_BASE+06 Multiplexed -- do not use</div><div class='add'>+ * MIPS_CPU_IRQ_BASE+07 CPU TIMER</div><div class='add'>+ *</div><div class='add'>+ * TXX9_IRQ_BASE+00</div><div class='add'>+ * TXX9_IRQ_BASE+01</div><div class='add'>+ * TXX9_IRQ_BASE+02</div><div class='add'>+ * TXX9_IRQ_BASE+03 Cascade RBTX4927-IOC</div><div class='add'>+ * TXX9_IRQ_BASE+04</div><div class='add'>+ * TXX9_IRQ_BASE+05 RBTX4927 RTL-8019AS ethernet</div><div class='add'>+ * TXX9_IRQ_BASE+06</div><div class='add'>+ * TXX9_IRQ_BASE+07</div><div class='add'>+ * TXX9_IRQ_BASE+08 TX4927 SerialIO Channel 0</div><div class='add'>+ * TXX9_IRQ_BASE+09 TX4927 SerialIO Channel 1</div><div class='add'>+ * TXX9_IRQ_BASE+10</div><div class='add'>+ * TXX9_IRQ_BASE+11</div><div class='add'>+ * TXX9_IRQ_BASE+12</div><div class='add'>+ * TXX9_IRQ_BASE+13</div><div class='add'>+ * TXX9_IRQ_BASE+14</div><div class='add'>+ * TXX9_IRQ_BASE+15</div><div class='add'>+ * TXX9_IRQ_BASE+16 TX4927 PCI PCI-C</div><div class='add'>+ * TXX9_IRQ_BASE+17</div><div class='add'>+ * TXX9_IRQ_BASE+18</div><div class='add'>+ * TXX9_IRQ_BASE+19</div><div class='add'>+ * TXX9_IRQ_BASE+20</div><div class='add'>+ * TXX9_IRQ_BASE+21</div><div class='add'>+ * TXX9_IRQ_BASE+22 TX4927 PCI PCI-ERR</div><div class='add'>+ * TXX9_IRQ_BASE+23 TX4927 PCI PCI-PMA (not used)</div><div class='add'>+ * TXX9_IRQ_BASE+24</div><div class='add'>+ * TXX9_IRQ_BASE+25</div><div class='add'>+ * TXX9_IRQ_BASE+26</div><div class='add'>+ * TXX9_IRQ_BASE+27</div><div class='add'>+ * TXX9_IRQ_BASE+28</div><div class='add'>+ * TXX9_IRQ_BASE+29</div><div class='add'>+ * TXX9_IRQ_BASE+30</div><div class='add'>+ * TXX9_IRQ_BASE+31</div><div class='add'>+ *</div><div class='add'>+ * RBTX4927_IRQ_IOC+00 FPCIB0 PCI-D (SouthBridge)</div><div class='add'>+ * RBTX4927_IRQ_IOC+01 FPCIB0 PCI-C (SouthBridge)</div><div class='add'>+ * RBTX4927_IRQ_IOC+02 FPCIB0 PCI-B (SouthBridge/IDE/pin=1,INTR)</div><div class='add'>+ * RBTX4927_IRQ_IOC+03 FPCIB0 PCI-A (SouthBridge/USB/pin=4)</div><div class='add'>+ * RBTX4927_IRQ_IOC+04</div><div class='add'>+ * RBTX4927_IRQ_IOC+05</div><div class='add'>+ * RBTX4927_IRQ_IOC+06</div><div class='add'>+ * RBTX4927_IRQ_IOC+07</div><div class='add'>+ *</div><div class='add'>+ * NOTES:</div><div class='add'>+ * SouthBridge/INTR is mapped to SouthBridge/A=PCI-B/#58</div><div class='add'>+ * SouthBridge/ISA/pin=0 no pci irq used by this device</div><div class='add'>+ * SouthBridge/IDE/pin=1 no pci irq used by this device, using INTR</div><div class='add'>+ * via ISA IRQ14</div><div class='add'>+ * SouthBridge/USB/pin=4 using pci irq SouthBridge/D=PCI-A=#59</div><div class='add'>+ * SouthBridge/PMC/pin=0 no pci irq used by this device</div><div class='add'>+ * SuperIO/PS2/Keyboard, using INTR via ISA IRQ1</div><div class='add'>+ * SuperIO/PS2/Mouse, using INTR via ISA IRQ12 (mouse not currently supported)</div><div class='add'>+ * JP7 is not bus master -- do NOT use -- only 4 pci bus master's</div><div class='add'>+ * allowed -- SouthBridge, JP4, JP5, JP6</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -134,7 +135,7 @@ static int toshiba_rbtx4927_irq_nested(int sw_irq)</div><div class='ctx'> 	level3 = readb(rbtx4927_imstat_addr) &amp; 0x1f;</div><div class='ctx'> 	if (level3)</div><div class='ctx'> 		sw_irq = RBTX4927_IRQ_IOC + fls(level3) - 1;</div><div class='del'>-	return (sw_irq);</div><div class='add'>+	return sw_irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init toshiba_rbtx4927_irq_ioc_init(void)</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4927/prom.c b/arch/mips/txx9/rbtx4927/prom.c<br/>index 5c0de54ebdd2..1dc0a5b1956b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/rbtx4927/prom.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/rbtx4927/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/rbtx4927/prom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/rbtx4927/prom.c</a></div><div class='hunk'>@@ -38,4 +38,5 @@ void __init rbtx4927_prom_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	prom_init_cmdline();</div><div class='ctx'> 	add_memory_region(0, tx4927_get_mem_size(), BOOT_MEM_RAM);</div><div class='add'>+	txx9_sio_putchar_init(TX4927_SIO_REG(0) &amp; 0xfffffffffULL);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4927/setup.c b/arch/mips/txx9/rbtx4927/setup.c<br/>index 3da20ea3e55c..0d39bafea794 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/rbtx4927/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/rbtx4927/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/rbtx4927/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/rbtx4927/setup.c</a></div><div class='hunk'>@@ -46,12 +46,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/generic.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/pci.h&gt;</div><div class='hunk'>@@ -103,6 +100,7 @@ static void __init tx4927_pci_setup(void)</div><div class='ctx'> 		tx4927_report_pciclk();</div><div class='ctx'> 		tx4927_pcic_setup(tx4927_pcicptr, c, extarb);</div><div class='ctx'> 	}</div><div class='add'>+	tx4927_setup_pcierr_irq();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init tx4937_pci_setup(void)</div><div class='hunk'>@@ -149,6 +147,7 @@ static void __init tx4937_pci_setup(void)</div><div class='ctx'> 		tx4938_report_pciclk();</div><div class='ctx'> 		tx4927_pcic_setup(tx4938_pcicptr, c, extarb);</div><div class='ctx'> 	}</div><div class='add'>+	tx4938_setup_pcierr_irq();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init rbtx4927_arch_init(void)</div><div class='hunk'>@@ -165,17 +164,8 @@ static void __init rbtx4937_arch_init(void)</div><div class='ctx'> #define rbtx4937_arch_init NULL</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='ctx'> </div><div class='del'>-static void __noreturn wait_forever(void)</div><div class='del'>-{</div><div class='del'>-	while (1)</div><div class='del'>-		if (cpu_wait)</div><div class='del'>-			(*cpu_wait)();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void toshiba_rbtx4927_restart(char *command)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_NOTICE "System Rebooting...\n");</div><div class='del'>-</div><div class='ctx'> 	/* enable the s/w reset register */</div><div class='ctx'> 	writeb(1, rbtx4927_softresetlock_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -186,24 +176,8 @@ static void toshiba_rbtx4927_restart(char *command)</div><div class='ctx'> 	/* do a s/w reset */</div><div class='ctx'> 	writeb(1, rbtx4927_softreset_addr);</div><div class='ctx'> </div><div class='del'>-	/* do something passive while waiting for reset */</div><div class='del'>-	local_irq_disable();</div><div class='del'>-	wait_forever();</div><div class='del'>-	/* no return */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void toshiba_rbtx4927_halt(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_NOTICE "System Halted\n");</div><div class='del'>-	local_irq_disable();</div><div class='del'>-	wait_forever();</div><div class='del'>-	/* no return */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void toshiba_rbtx4927_power_off(void)</div><div class='del'>-{</div><div class='del'>-	toshiba_rbtx4927_halt();</div><div class='del'>-	/* no return */</div><div class='add'>+	/* fallback */</div><div class='add'>+	(*_machine_halt)();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init rbtx4927_clock_init(void);</div><div class='hunk'>@@ -214,9 +188,6 @@ static void __init rbtx4927_mem_setup(void)</div><div class='ctx'> 	u32 cp0_config;</div><div class='ctx'> 	char *argptr;</div><div class='ctx'> </div><div class='del'>-	/* f/w leaves this on at startup */</div><div class='del'>-	clear_c0_status(ST0_ERL);</div><div class='del'>-</div><div class='ctx'> 	/* enable caches -- HCP5 does this, pmon does not */</div><div class='ctx'> 	cp0_config = read_c0_config();</div><div class='ctx'> 	cp0_config = cp0_config &amp; ~(TX49_CONF_IC | TX49_CONF_DC);</div><div class='hunk'>@@ -231,37 +202,21 @@ static void __init rbtx4927_mem_setup(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	_machine_restart = toshiba_rbtx4927_restart;</div><div class='del'>-	_machine_halt = toshiba_rbtx4927_halt;</div><div class='del'>-	pm_power_off = toshiba_rbtx4927_power_off;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> 	txx9_alloc_pci_controller(&amp;txx9_primary_pcic,</div><div class='ctx'> 				  RBTX4927_PCIMEM, RBTX4927_PCIMEM_SIZE,</div><div class='ctx'> 				  RBTX4927_PCIIO, RBTX4927_PCIIO_SIZE);</div><div class='add'>+	txx9_board_pcibios_setup = tx4927_pcibios_setup;</div><div class='ctx'> #else</div><div class='ctx'> 	set_io_port_base(KSEG1 + RBTX4927_ISA_IO_OFFSET);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	tx4927_setup_serial();</div><div class='add'>+	tx4927_sio_init(0, 0);</div><div class='ctx'> #ifdef CONFIG_SERIAL_TXX9_CONSOLE</div><div class='del'>-        argptr = prom_getcmdline();</div><div class='del'>-        if (strstr(argptr, "console=") == NULL) {</div><div class='del'>-                strcat(argptr, " console=ttyS0,38400");</div><div class='del'>-        }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ROOT_NFS</div><div class='del'>-        argptr = prom_getcmdline();</div><div class='del'>-        if (strstr(argptr, "root=") == NULL) {</div><div class='del'>-                strcat(argptr, " root=/dev/nfs rw");</div><div class='del'>-        }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IP_PNP</div><div class='del'>-        argptr = prom_getcmdline();</div><div class='del'>-        if (strstr(argptr, "ip=") == NULL) {</div><div class='del'>-                strcat(argptr, " ip=any");</div><div class='del'>-        }</div><div class='add'>+	argptr = prom_getcmdline();</div><div class='add'>+	if (!strstr(argptr, "console="))</div><div class='add'>+		strcat(argptr, " console=ttyS0,38400");</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -324,19 +279,17 @@ static void __init rbtx4927_time_init(void)</div><div class='ctx'> 	tx4927_time_init(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init toshiba_rbtx4927_rtc_init(void)</div><div class='add'>+static void __init toshiba_rbtx4927_rtc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource res = {</div><div class='ctx'> 		.start	= RBTX4927_BRAMRTC_BASE - IO_BASE,</div><div class='ctx'> 		.end	= RBTX4927_BRAMRTC_BASE - IO_BASE + 0x800 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	};</div><div class='del'>-	struct platform_device *dev =</div><div class='del'>-		platform_device_register_simple("rtc-ds1742", -1, &amp;res, 1);</div><div class='del'>-	return IS_ERR(dev) ? PTR_ERR(dev) : 0;</div><div class='add'>+	platform_device_register_simple("rtc-ds1742", -1, &amp;res, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init rbtx4927_ne_init(void)</div><div class='add'>+static void __init rbtx4927_ne_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource res[] = {</div><div class='ctx'> 		{</div><div class='hunk'>@@ -348,36 +301,14 @@ static int __init rbtx4927_ne_init(void)</div><div class='ctx'> 			.flags	= IORESOURCE_IRQ,</div><div class='ctx'> 		}</div><div class='ctx'> 	};</div><div class='del'>-	struct platform_device *dev =</div><div class='del'>-		platform_device_register_simple("ne", -1,</div><div class='del'>-						res, ARRAY_SIZE(res));</div><div class='del'>-	return IS_ERR(dev) ? PTR_ERR(dev) : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Watchdog support */</div><div class='del'>-</div><div class='del'>-static int __init txx9_wdt_init(unsigned long base)</div><div class='del'>-{</div><div class='del'>-	struct resource res = {</div><div class='del'>-		.start	= base,</div><div class='del'>-		.end	= base + 0x100 - 1,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	};</div><div class='del'>-	struct platform_device *dev =</div><div class='del'>-		platform_device_register_simple("txx9wdt", -1, &amp;res, 1);</div><div class='del'>-	return IS_ERR(dev) ? PTR_ERR(dev) : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init rbtx4927_wdt_init(void)</div><div class='del'>-{</div><div class='del'>-	return txx9_wdt_init(TX4927_TMR_REG(2) &amp; 0xfffffffffULL);</div><div class='add'>+	platform_device_register_simple("ne", -1, res, ARRAY_SIZE(res));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init rbtx4927_device_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	toshiba_rbtx4927_rtc_init();</div><div class='ctx'> 	rbtx4927_ne_init();</div><div class='del'>-	rbtx4927_wdt_init();</div><div class='add'>+	tx4927_wdt_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct txx9_board_vec rbtx4927_vec __initdata = {</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4938/irq.c b/arch/mips/txx9/rbtx4938/irq.c<br/>index 3971a061657a..ca2f8306ce93 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/rbtx4938/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/rbtx4938/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/rbtx4938/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/rbtx4938/irq.c</a></div><div class='hunk'>@@ -11,59 +11,57 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>-IRQ  Device</div><div class='del'>-</div><div class='del'>-16   TX4938-CP0/00 Software 0</div><div class='del'>-17   TX4938-CP0/01 Software 1</div><div class='del'>-18   TX4938-CP0/02 Cascade TX4938-CP0</div><div class='del'>-19   TX4938-CP0/03 Multiplexed -- do not use</div><div class='del'>-20   TX4938-CP0/04 Multiplexed -- do not use</div><div class='del'>-21   TX4938-CP0/05 Multiplexed -- do not use</div><div class='del'>-22   TX4938-CP0/06 Multiplexed -- do not use</div><div class='del'>-23   TX4938-CP0/07 CPU TIMER</div><div class='del'>-</div><div class='del'>-24   TX4938-PIC/00</div><div class='del'>-25   TX4938-PIC/01</div><div class='del'>-26   TX4938-PIC/02 Cascade RBTX4938-IOC</div><div class='del'>-27   TX4938-PIC/03 RBTX4938 RTL-8019AS Ethernet</div><div class='del'>-28   TX4938-PIC/04</div><div class='del'>-29   TX4938-PIC/05 TX4938 ETH1</div><div class='del'>-30   TX4938-PIC/06 TX4938 ETH0</div><div class='del'>-31   TX4938-PIC/07</div><div class='del'>-32   TX4938-PIC/08 TX4938 SIO 0</div><div class='del'>-33   TX4938-PIC/09 TX4938 SIO 1</div><div class='del'>-34   TX4938-PIC/10 TX4938 DMA0</div><div class='del'>-35   TX4938-PIC/11 TX4938 DMA1</div><div class='del'>-36   TX4938-PIC/12 TX4938 DMA2</div><div class='del'>-37   TX4938-PIC/13 TX4938 DMA3</div><div class='del'>-38   TX4938-PIC/14</div><div class='del'>-39   TX4938-PIC/15</div><div class='del'>-40   TX4938-PIC/16 TX4938 PCIC</div><div class='del'>-41   TX4938-PIC/17 TX4938 TMR0</div><div class='del'>-42   TX4938-PIC/18 TX4938 TMR1</div><div class='del'>-43   TX4938-PIC/19 TX4938 TMR2</div><div class='del'>-44   TX4938-PIC/20</div><div class='del'>-45   TX4938-PIC/21</div><div class='del'>-46   TX4938-PIC/22 TX4938 PCIERR</div><div class='del'>-47   TX4938-PIC/23</div><div class='del'>-48   TX4938-PIC/24</div><div class='del'>-49   TX4938-PIC/25</div><div class='del'>-50   TX4938-PIC/26</div><div class='del'>-51   TX4938-PIC/27</div><div class='del'>-52   TX4938-PIC/28</div><div class='del'>-53   TX4938-PIC/29</div><div class='del'>-54   TX4938-PIC/30</div><div class='del'>-55   TX4938-PIC/31 TX4938 SPI</div><div class='del'>-</div><div class='del'>-56 RBTX4938-IOC/00 PCI-D</div><div class='del'>-57 RBTX4938-IOC/01 PCI-C</div><div class='del'>-58 RBTX4938-IOC/02 PCI-B</div><div class='del'>-59 RBTX4938-IOC/03 PCI-A</div><div class='del'>-60 RBTX4938-IOC/04 RTC</div><div class='del'>-61 RBTX4938-IOC/05 ATA</div><div class='del'>-62 RBTX4938-IOC/06 MODEM</div><div class='del'>-63 RBTX4938-IOC/07 SWINT</div><div class='del'>-*/</div><div class='add'>+ * MIPS_CPU_IRQ_BASE+00 Software 0</div><div class='add'>+ * MIPS_CPU_IRQ_BASE+01 Software 1</div><div class='add'>+ * MIPS_CPU_IRQ_BASE+02 Cascade TX4938-CP0</div><div class='add'>+ * MIPS_CPU_IRQ_BASE+03 Multiplexed -- do not use</div><div class='add'>+ * MIPS_CPU_IRQ_BASE+04 Multiplexed -- do not use</div><div class='add'>+ * MIPS_CPU_IRQ_BASE+05 Multiplexed -- do not use</div><div class='add'>+ * MIPS_CPU_IRQ_BASE+06 Multiplexed -- do not use</div><div class='add'>+ * MIPS_CPU_IRQ_BASE+07 CPU TIMER</div><div class='add'>+ *</div><div class='add'>+ * TXX9_IRQ_BASE+00</div><div class='add'>+ * TXX9_IRQ_BASE+01</div><div class='add'>+ * TXX9_IRQ_BASE+02 Cascade RBTX4938-IOC</div><div class='add'>+ * TXX9_IRQ_BASE+03 RBTX4938 RTL-8019AS Ethernet</div><div class='add'>+ * TXX9_IRQ_BASE+04</div><div class='add'>+ * TXX9_IRQ_BASE+05 TX4938 ETH1</div><div class='add'>+ * TXX9_IRQ_BASE+06 TX4938 ETH0</div><div class='add'>+ * TXX9_IRQ_BASE+07</div><div class='add'>+ * TXX9_IRQ_BASE+08 TX4938 SIO 0</div><div class='add'>+ * TXX9_IRQ_BASE+09 TX4938 SIO 1</div><div class='add'>+ * TXX9_IRQ_BASE+10 TX4938 DMA0</div><div class='add'>+ * TXX9_IRQ_BASE+11 TX4938 DMA1</div><div class='add'>+ * TXX9_IRQ_BASE+12 TX4938 DMA2</div><div class='add'>+ * TXX9_IRQ_BASE+13 TX4938 DMA3</div><div class='add'>+ * TXX9_IRQ_BASE+14</div><div class='add'>+ * TXX9_IRQ_BASE+15</div><div class='add'>+ * TXX9_IRQ_BASE+16 TX4938 PCIC</div><div class='add'>+ * TXX9_IRQ_BASE+17 TX4938 TMR0</div><div class='add'>+ * TXX9_IRQ_BASE+18 TX4938 TMR1</div><div class='add'>+ * TXX9_IRQ_BASE+19 TX4938 TMR2</div><div class='add'>+ * TXX9_IRQ_BASE+20</div><div class='add'>+ * TXX9_IRQ_BASE+21</div><div class='add'>+ * TXX9_IRQ_BASE+22 TX4938 PCIERR</div><div class='add'>+ * TXX9_IRQ_BASE+23</div><div class='add'>+ * TXX9_IRQ_BASE+24</div><div class='add'>+ * TXX9_IRQ_BASE+25</div><div class='add'>+ * TXX9_IRQ_BASE+26</div><div class='add'>+ * TXX9_IRQ_BASE+27</div><div class='add'>+ * TXX9_IRQ_BASE+28</div><div class='add'>+ * TXX9_IRQ_BASE+29</div><div class='add'>+ * TXX9_IRQ_BASE+30</div><div class='add'>+ * TXX9_IRQ_BASE+31 TX4938 SPI</div><div class='add'>+ *</div><div class='add'>+ * RBTX4938_IRQ_IOC+00 PCI-D</div><div class='add'>+ * RBTX4938_IRQ_IOC+01 PCI-C</div><div class='add'>+ * RBTX4938_IRQ_IOC+02 PCI-B</div><div class='add'>+ * RBTX4938_IRQ_IOC+03 PCI-A</div><div class='add'>+ * RBTX4938_IRQ_IOC+04 RTC</div><div class='add'>+ * RBTX4938_IRQ_IOC+05 ATA</div><div class='add'>+ * RBTX4938_IRQ_IOC+06 MODEM</div><div class='add'>+ * RBTX4938_IRQ_IOC+07 SWINT</div><div class='add'>+ */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='hunk'>@@ -93,9 +91,6 @@ static int toshiba_rbtx4938_irq_nested(int sw_irq)</div><div class='ctx'> 	return sw_irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**********************************************************************************/</div><div class='del'>-/* Functions for ioc                                                              */</div><div class='del'>-/**********************************************************************************/</div><div class='ctx'> static void __init</div><div class='ctx'> toshiba_rbtx4938_irq_ioc_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4938/prom.c b/arch/mips/txx9/rbtx4938/prom.c<br/>index ee189519ce5a..d73123cd2ab9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/rbtx4938/prom.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/rbtx4938/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/rbtx4938/prom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/rbtx4938/prom.c</a></div><div class='hunk'>@@ -22,4 +22,5 @@ void __init rbtx4938_prom_init(void)</div><div class='ctx'> 	prom_init_cmdline();</div><div class='ctx'> #endif</div><div class='ctx'> 	add_memory_region(0, tx4938_get_mem_size(), BOOT_MEM_RAM);</div><div class='add'>+	txx9_sio_putchar_init(TX4938_SIO_REG(0) &amp; 0xfffffffffULL);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c<br/>index 6c2b99bb8af6..9ab48dec0fe8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/rbtx4938/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/txx9/rbtx4938/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/rbtx4938/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/txx9/rbtx4938/setup.c</a></div><div class='hunk'>@@ -13,9 +13,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/console.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -28,33 +25,14 @@</div><div class='ctx'> #include &lt;asm/txx9/spi.h&gt;</div><div class='ctx'> #include &lt;asm/txx9pio.h&gt;</div><div class='ctx'> </div><div class='del'>-static void rbtx4938_machine_halt(void)</div><div class='del'>-{</div><div class='del'>-        printk(KERN_NOTICE "System Halted\n");</div><div class='del'>-	local_irq_disable();</div><div class='del'>-</div><div class='del'>-	while (1)</div><div class='del'>-		__asm__(".set\tmips3\n\t"</div><div class='del'>-			"wait\n\t"</div><div class='del'>-			".set\tmips0");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rbtx4938_machine_power_off(void)</div><div class='del'>-{</div><div class='del'>-        rbtx4938_machine_halt();</div><div class='del'>-        /* no return */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void rbtx4938_machine_restart(char *command)</div><div class='ctx'> {</div><div class='ctx'> 	local_irq_disable();</div><div class='del'>-</div><div class='del'>-	printk("Rebooting...");</div><div class='ctx'> 	writeb(1, rbtx4938_softresetlock_addr);</div><div class='ctx'> 	writeb(1, rbtx4938_sfvol_addr);</div><div class='ctx'> 	writeb(1, rbtx4938_softreset_addr);</div><div class='del'>-	while(1)</div><div class='del'>-		;</div><div class='add'>+	/* fallback */</div><div class='add'>+	(*_machine_halt)();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init rbtx4938_pci_setup(void)</div><div class='hunk'>@@ -121,6 +99,7 @@ static void __init rbtx4938_pci_setup(void)</div><div class='ctx'> 		register_pci_controller(c);</div><div class='ctx'> 		tx4927_pcic_setup(tx4938_pcic1ptr, c, 0);</div><div class='ctx'> 	}</div><div class='add'>+	tx4938_setup_pcierr_irq();</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -151,19 +130,7 @@ static int __init rbtx4938_ethaddr_init(void)</div><div class='ctx'> 		if (sum)</div><div class='ctx'> 			printk(KERN_WARNING "seeprom: bad checksum.\n");</div><div class='ctx'> 	}</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		unsigned int id =</div><div class='del'>-			TXX9_IRQ_BASE + (i ? TX4938_IR_ETH1 : TX4938_IR_ETH0);</div><div class='del'>-		struct platform_device *pdev;</div><div class='del'>-		if (!(__raw_readq(&amp;tx4938_ccfgptr-&gt;pcfg) &amp;</div><div class='del'>-		      (i ? TX4938_PCFG_ETH1_SEL : TX4938_PCFG_ETH0_SEL)))</div><div class='del'>-			continue;</div><div class='del'>-		pdev = platform_device_alloc("tc35815-mac", id);</div><div class='del'>-		if (!pdev ||</div><div class='del'>-		    platform_device_add_data(pdev, &amp;dat[4 + 6 * i], 6) ||</div><div class='del'>-		    platform_device_add(pdev))</div><div class='del'>-			platform_device_put(pdev);</div><div class='del'>-	}</div><div class='add'>+	tx4938_ethaddr_init(&amp;dat[4], &amp;dat[4 + 6]);</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -193,51 +160,36 @@ static void __init rbtx4938_mem_setup(void)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> 	txx9_alloc_pci_controller(&amp;txx9_primary_pcic, 0, 0, 0, 0);</div><div class='add'>+	txx9_board_pcibios_setup = tx4927_pcibios_setup;</div><div class='ctx'> #else</div><div class='ctx'> 	set_io_port_base(RBTX4938_ETHER_BASE);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	tx4938_setup_serial();</div><div class='add'>+	tx4938_sio_init(7372800, 0);</div><div class='ctx'> #ifdef CONFIG_SERIAL_TXX9_CONSOLE</div><div class='del'>-        argptr = prom_getcmdline();</div><div class='del'>-        if (strstr(argptr, "console=") == NULL) {</div><div class='del'>-                strcat(argptr, " console=ttyS0,38400");</div><div class='del'>-        }</div><div class='add'>+	argptr = prom_getcmdline();</div><div class='add'>+	if (!strstr(argptr, "console="))</div><div class='add'>+		strcat(argptr, " console=ttyS0,38400");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61</div><div class='del'>-	printk("PIOSEL: disabling both ata and nand selection\n");</div><div class='del'>-	local_irq_disable();</div><div class='add'>+	printk(KERN_INFO "PIOSEL: disabling both ata and nand selection\n");</div><div class='ctx'> 	txx9_clear64(&amp;tx4938_ccfgptr-&gt;pcfg,</div><div class='ctx'> 		     TX4938_PCFG_NDF_SEL | TX4938_PCFG_ATA_SEL);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_NAND</div><div class='del'>-	printk("PIOSEL: enabling nand selection\n");</div><div class='add'>+	printk(KERN_INFO "PIOSEL: enabling nand selection\n");</div><div class='ctx'> 	txx9_set64(&amp;tx4938_ccfgptr-&gt;pcfg, TX4938_PCFG_NDF_SEL);</div><div class='ctx'> 	txx9_clear64(&amp;tx4938_ccfgptr-&gt;pcfg, TX4938_PCFG_ATA_SEL);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_ATA</div><div class='del'>-	printk("PIOSEL: enabling ata selection\n");</div><div class='add'>+	printk(KERN_INFO "PIOSEL: enabling ata selection\n");</div><div class='ctx'> 	txx9_set64(&amp;tx4938_ccfgptr-&gt;pcfg, TX4938_PCFG_ATA_SEL);</div><div class='ctx'> 	txx9_clear64(&amp;tx4938_ccfgptr-&gt;pcfg, TX4938_PCFG_NDF_SEL);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IP_PNP</div><div class='del'>-	argptr = prom_getcmdline();</div><div class='del'>-	if (strstr(argptr, "ip=") == NULL) {</div><div class='del'>-		strcat(argptr, " ip=any");</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_FB</div><div class='del'>-	{</div><div class='del'>-		conswitchp = &amp;dummy_con;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	rbtx4938_spi_setup();</div><div class='ctx'> 	pcfg = ____raw_readq(&amp;tx4938_ccfgptr-&gt;pcfg);	/* updated */</div><div class='ctx'> 	/* fixup piosel */</div><div class='hunk'>@@ -258,11 +210,9 @@ static void __init rbtx4938_mem_setup(void)</div><div class='ctx'> 	rbtx4938_fpga_resource.end = CPHYSADDR(RBTX4938_FPGA_REG_ADDR) + 0xffff;</div><div class='ctx'> 	rbtx4938_fpga_resource.flags = IORESOURCE_MEM | IORESOURCE_BUSY;</div><div class='ctx'> 	if (request_resource(&amp;txx9_ce_res[2], &amp;rbtx4938_fpga_resource))</div><div class='del'>-		printk("request resource for fpga failed\n");</div><div class='add'>+		printk(KERN_ERR "request resource for fpga failed\n");</div><div class='ctx'> </div><div class='ctx'> 	_machine_restart = rbtx4938_machine_restart;</div><div class='del'>-	_machine_halt = rbtx4938_machine_halt;</div><div class='del'>-	pm_power_off = rbtx4938_machine_power_off;</div><div class='ctx'> </div><div class='ctx'> 	writeb(0xff, rbtx4938_led_addr);</div><div class='ctx'> 	printk(KERN_INFO "RBTX4938 --- FPGA(Rev %02x) DIPSW:%02x,%02x\n",</div><div class='hunk'>@@ -270,7 +220,7 @@ static void __init rbtx4938_mem_setup(void)</div><div class='ctx'> 	       readb(rbtx4938_dipsw_addr), readb(rbtx4938_bdipsw_addr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init rbtx4938_ne_init(void)</div><div class='add'>+static void __init rbtx4938_ne_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource res[] = {</div><div class='ctx'> 		{</div><div class='hunk'>@@ -282,10 +232,7 @@ static int __init rbtx4938_ne_init(void)</div><div class='ctx'> 			.flags	= IORESOURCE_IRQ,</div><div class='ctx'> 		}</div><div class='ctx'> 	};</div><div class='del'>-	struct platform_device *dev =</div><div class='del'>-		platform_device_register_simple("ne", -1,</div><div class='del'>-						res, ARRAY_SIZE(res));</div><div class='del'>-	return IS_ERR(dev) ? PTR_ERR(dev) : 0;</div><div class='add'>+	platform_device_register_simple("ne", -1, res, ARRAY_SIZE(res));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(rbtx4938_spi_gpio_lock);</div><div class='hunk'>@@ -321,24 +268,6 @@ static struct gpio_chip rbtx4938_spi_gpio_chip = {</div><div class='ctx'> 	.ngpio = 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* SPI support */</div><div class='del'>-</div><div class='del'>-static void __init txx9_spi_init(unsigned long base, int irq)</div><div class='del'>-{</div><div class='del'>-	struct resource res[] = {</div><div class='del'>-		{</div><div class='del'>-			.start	= base,</div><div class='del'>-			.end	= base + 0x20 - 1,</div><div class='del'>-			.flags	= IORESOURCE_MEM,</div><div class='del'>-		}, {</div><div class='del'>-			.start	= irq,</div><div class='del'>-			.flags	= IORESOURCE_IRQ,</div><div class='del'>-		},</div><div class='del'>-	};</div><div class='del'>-	platform_device_register_simple("spi_txx9", 0,</div><div class='del'>-					res, ARRAY_SIZE(res));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __init rbtx4938_spi_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct spi_board_info srtc_info = {</div><div class='hunk'>@@ -361,7 +290,7 @@ static int __init rbtx4938_spi_init(void)</div><div class='ctx'> 	gpio_direction_output(16 + SEEPROM2_CS, 1);</div><div class='ctx'> 	gpio_request(16 + SEEPROM3_CS, "seeprom3");</div><div class='ctx'> 	gpio_direction_output(16 + SEEPROM3_CS, 1);</div><div class='del'>-	txx9_spi_init(TX4938_SPI_REG &amp; 0xfffffffffULL, RBTX4938_IRQ_IRC_SPI);</div><div class='add'>+	tx4938_spi_init(0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -372,30 +301,11 @@ static void __init rbtx4938_arch_init(void)</div><div class='ctx'> 	rbtx4938_spi_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Watchdog support */</div><div class='del'>-</div><div class='del'>-static int __init txx9_wdt_init(unsigned long base)</div><div class='del'>-{</div><div class='del'>-	struct resource res = {</div><div class='del'>-		.start	= base,</div><div class='del'>-		.end	= base + 0x100 - 1,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	};</div><div class='del'>-	struct platform_device *dev =</div><div class='del'>-		platform_device_register_simple("txx9wdt", -1, &amp;res, 1);</div><div class='del'>-	return IS_ERR(dev) ? PTR_ERR(dev) : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init rbtx4938_wdt_init(void)</div><div class='del'>-{</div><div class='del'>-	return txx9_wdt_init(TX4938_TMR_REG(2) &amp; 0xfffffffffULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init rbtx4938_device_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	rbtx4938_ethaddr_init();</div><div class='ctx'> 	rbtx4938_ne_init();</div><div class='del'>-	rbtx4938_wdt_init();</div><div class='add'>+	tx4938_wdt_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct txx9_board_vec rbtx4938_vec __initdata = {</div><div class='head'>diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c<br/>index cba36a247e32..92dd1a0ca352 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/common/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mips/vr41xx/common/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/common/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mips/vr41xx/common/irq.c</a></div><div class='hunk'>@@ -72,6 +72,7 @@ static void irq_dispatch(unsigned int irq)</div><div class='ctx'> 	cascade = irq_cascade + irq;</div><div class='ctx'> 	if (cascade-&gt;get_irq != NULL) {</div><div class='ctx'> 		unsigned int source_irq = irq;</div><div class='add'>+		int ret;</div><div class='ctx'> 		desc = irq_desc + source_irq;</div><div class='ctx'> 		if (desc-&gt;chip-&gt;mask_ack)</div><div class='ctx'> 			desc-&gt;chip-&gt;mask_ack(source_irq);</div><div class='hunk'>@@ -79,8 +80,9 @@ static void irq_dispatch(unsigned int irq)</div><div class='ctx'> 			desc-&gt;chip-&gt;mask(source_irq);</div><div class='ctx'> 			desc-&gt;chip-&gt;ack(source_irq);</div><div class='ctx'> 		}</div><div class='del'>-		irq = cascade-&gt;get_irq(irq);</div><div class='del'>-		if (irq &lt; 0)</div><div class='add'>+		ret = cascade-&gt;get_irq(irq);</div><div class='add'>+		irq = ret;</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			atomic_inc(&amp;irq_err_count);</div><div class='ctx'> 		else</div><div class='ctx'> 			irq_dispatch(irq);</div><div class='head'>diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S<br/>index 11de3606eee6..b7cbb1487af4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/kernel/entry.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mn10300/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mn10300/kernel/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mn10300/kernel/entry.S</a></div><div class='hunk'>@@ -716,6 +716,12 @@ ENTRY(sys_call_table)</div><div class='ctx'> 	.long sys_fallocate		/* 325 */</div><div class='ctx'> 	.long sys_timerfd_settime</div><div class='ctx'> 	.long sys_timerfd_gettime</div><div class='add'>+	.long sys_signalfd4</div><div class='add'>+	.long sys_eventfd2</div><div class='add'>+	.long sys_epoll_create1		/* 330 */</div><div class='add'>+	.long sys_dup3</div><div class='add'>+	.long sys_pipe2</div><div class='add'>+	.long sys_inotify_init1</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> nr_syscalls=(.-sys_call_table)/4</div><div class='head'>diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c<br/>index 8b054e7a8ae8..aa07d0cd1905 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/kernel/mn10300-serial.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mn10300/kernel/mn10300-serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mn10300/kernel/mn10300-serial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mn10300/kernel/mn10300-serial.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@ static const char serial_revdate[] = "2007-11-06";</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> #include &lt;linux/circ_buf.h&gt;</div><div class='head'>diff --git a/arch/mn10300/kernel/module.c b/arch/mn10300/kernel/module.c<br/>index 0e4d2f6fa6e8..8fa36893df7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/kernel/module.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mn10300/kernel/module.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mn10300/kernel/module.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mn10300/kernel/module.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> #define DEBUGP printk</div><div class='hunk'>@@ -195,7 +196,7 @@ int module_finalize(const Elf_Ehdr *hdr,</div><div class='ctx'> 		    const Elf_Shdr *sechdrs,</div><div class='ctx'> 		    struct module *me)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return module_bug_finalize(hdr, sechdrs, me);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -203,4 +204,5 @@ int module_finalize(const Elf_Ehdr *hdr,</div><div class='ctx'>  */</div><div class='ctx'> void module_arch_cleanup(struct module *mod)</div><div class='ctx'> {</div><div class='add'>+	module_bug_cleanup(mod);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mn10300/mm/fault.c b/arch/mn10300/mm/fault.c<br/>index 78f092ca0316..33cf25025dac 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/mm/fault.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/mn10300/mm/fault.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mn10300/mm/fault.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/mn10300/mm/fault.c</a></div><div class='hunk'>@@ -174,7 +174,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long fault_code,</div><div class='ctx'> 	 * If we're in an interrupt or have no user</div><div class='ctx'> 	 * context, we must not take the fault..</div><div class='ctx'> 	 */</div><div class='del'>-	if (in_interrupt() || !mm)</div><div class='add'>+	if (in_atomic() || !mm)</div><div class='ctx'> 		goto no_context;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;mm-&gt;mmap_sem);</div><div class='head'>diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c<br/>index 1263f00dc35d..12c04c5e558b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/hpux/fs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/parisc/hpux/fs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/hpux/fs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/parisc/hpux/fs.c</a></div><div class='hunk'>@@ -84,22 +84,28 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,</div><div class='ctx'> 	if (reclen &gt; buf-&gt;count)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	d_ino = ino;</div><div class='del'>-	if (sizeof(d_ino) &lt; sizeof(ino) &amp;&amp; d_ino != ino)</div><div class='add'>+	if (sizeof(d_ino) &lt; sizeof(ino) &amp;&amp; d_ino != ino) {</div><div class='add'>+		buf-&gt;error = -EOVERFLOW;</div><div class='ctx'> 		return -EOVERFLOW;</div><div class='add'>+	}</div><div class='ctx'> 	dirent = buf-&gt;previous;</div><div class='ctx'> 	if (dirent)</div><div class='del'>-		put_user(offset, &amp;dirent-&gt;d_off);</div><div class='add'>+		if (put_user(offset, &amp;dirent-&gt;d_off))</div><div class='add'>+			goto Efault;</div><div class='ctx'> 	dirent = buf-&gt;current_dir;</div><div class='add'>+	if (put_user(d_ino, &amp;dirent-&gt;d_ino) ||</div><div class='add'>+	    put_user(reclen, &amp;dirent-&gt;d_reclen) ||</div><div class='add'>+	    put_user(namlen, &amp;dirent-&gt;d_namlen) ||</div><div class='add'>+	    copy_to_user(dirent-&gt;d_name, name, namlen) ||</div><div class='add'>+	    put_user(0, dirent-&gt;d_name + namlen))</div><div class='add'>+		goto Efault;</div><div class='ctx'> 	buf-&gt;previous = dirent;</div><div class='del'>-	put_user(d_ino, &amp;dirent-&gt;d_ino);</div><div class='del'>-	put_user(reclen, &amp;dirent-&gt;d_reclen);</div><div class='del'>-	put_user(namlen, &amp;dirent-&gt;d_namlen);</div><div class='del'>-	copy_to_user(dirent-&gt;d_name, name, namlen);</div><div class='del'>-	put_user(0, dirent-&gt;d_name + namlen);</div><div class='del'>-	dirent = (void __user *)dirent + reclen;</div><div class='del'>-	buf-&gt;current_dir = dirent;</div><div class='add'>+	buf-&gt;current_dir = (void __user *)dirent + reclen;</div><div class='ctx'> 	buf-&gt;count -= reclen;</div><div class='ctx'> 	return 0;</div><div class='add'>+Efault:</div><div class='add'>+	buf-&gt;error = -EFAULT;</div><div class='add'>+	return -EFAULT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #undef NAME_OFFSET</div><div class='hunk'>@@ -126,8 +132,10 @@ int hpux_getdents(unsigned int fd, struct hpux_dirent __user *dirent, unsigned i</div><div class='ctx'> 	error = buf.error;</div><div class='ctx'> 	lastdirent = buf.previous;</div><div class='ctx'> 	if (lastdirent) {</div><div class='del'>-		put_user(file-&gt;f_pos, &amp;lastdirent-&gt;d_off);</div><div class='del'>-		error = count - buf.count;</div><div class='add'>+		if (put_user(file-&gt;f_pos, &amp;lastdirent-&gt;d_off))</div><div class='add'>+			error = -EFAULT;</div><div class='add'>+		else</div><div class='add'>+			error = count - buf.count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_putf:</div><div class='head'>diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c<br/>index fdacdd4341c9..44138c3e6ea7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/module.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/parisc/kernel/module.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/module.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/parisc/kernel/module.c</a></div><div class='hunk'>@@ -47,7 +47,9 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/unwind.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='hunk'>@@ -860,3 +862,15 @@ void module_arch_cleanup(struct module *mod)</div><div class='ctx'> 	deregister_unwind_table(mod);</div><div class='ctx'> 	module_bug_cleanup(mod);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+void *dereference_function_descriptor(void *ptr)</div><div class='add'>+{</div><div class='add'>+	Elf64_Fdesc *desc = ptr;</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	if (!probe_kernel_address(&amp;desc-&gt;addr, p))</div><div class='add'>+		ptr = p;</div><div class='add'>+	return ptr;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/powerpc/.gitignore b/arch/powerpc/.gitignore<br/>deleted file mode 100644<br/>index a1a869c8c840..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/.gitignore?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/.gitignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-include</div><div class='head'>diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug<br/>index 8c8aadbe9563..4ebc52a19f0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/Kconfig.debug?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/Kconfig.debug</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/Kconfig.debug?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/Kconfig.debug</a></div><div class='hunk'>@@ -97,7 +97,7 @@ config IRQSTACKS</div><div class='ctx'> </div><div class='ctx'> config VIRQ_DEBUG</div><div class='ctx'> 	bool "Expose hardware/virtual IRQ mapping via debugfs"</div><div class='del'>-	depends on DEBUG_FS &amp;&amp; PPC_MERGE</div><div class='add'>+	depends on DEBUG_FS</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option will show the mapping relationship between hardware irq</div><div class='ctx'> 	  numbers and virtual irq numbers. The mapping is exposed via debugfs</div><div class='head'>diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile<br/>index 9155c9312c1e..c6be19e9ceae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/Makefile</a></div><div class='hunk'>@@ -116,6 +116,11 @@ ifeq ($(CONFIG_6xx),y)</div><div class='ctx'> KBUILD_CFLAGS		+= -mcpu=powerpc</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='add'>+# Work around a gcc code-gen bug with -fno-omit-frame-pointer.</div><div class='add'>+ifeq ($(CONFIG_FTRACE),y)</div><div class='add'>+KBUILD_CFLAGS		+= -mno-sched-epilog</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> cpu-as-$(CONFIG_4xx)		+= -Wa,-m405</div><div class='ctx'> cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec</div><div class='ctx'> cpu-as-$(CONFIG_POWER4)		+= -Wa,-maltivec</div><div class='head'>diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile<br/>index 14174aa24074..65d1a8454d2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/Makefile</a></div><div class='hunk'>@@ -49,7 +49,7 @@ zlib       := inffast.c inflate.c inftrees.c</div><div class='ctx'> zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h</div><div class='ctx'> zliblinuxheader := zlib.h zconf.h zutil.h</div><div class='ctx'> </div><div class='del'>-$(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \</div><div class='add'>+$(addprefix $(obj)/,$(zlib) cuboot-c2k.o gunzip_util.o main.o prpmc2800.o): \</div><div class='ctx'> 	$(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))</div><div class='ctx'> </div><div class='ctx'> src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c</div><div class='hunk'>@@ -195,7 +195,7 @@ image-$(CONFIG_PPC_CELLEB)		+= zImage.pseries</div><div class='ctx'> image-$(CONFIG_PPC_CHRP)		+= zImage.chrp</div><div class='ctx'> image-$(CONFIG_PPC_EFIKA)		+= zImage.chrp</div><div class='ctx'> image-$(CONFIG_PPC_PMAC)		+= zImage.pmac</div><div class='del'>-image-$(CONFIG_PPC_HOLLY)		+= zImage.holly</div><div class='add'>+image-$(CONFIG_PPC_HOLLY)		+= dtbImage.holly</div><div class='ctx'> image-$(CONFIG_PPC_PRPMC2800)		+= dtbImage.prpmc2800</div><div class='ctx'> image-$(CONFIG_PPC_ISERIES)		+= zImage.iseries</div><div class='ctx'> image-$(CONFIG_DEFAULT_UIMAGE)		+= uImage</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts<br/>index 7345743d3d96..fbc930410ff6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc832x_mds.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc832x_mds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc832x_mds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc832x_mds.dts</a></div><div class='hunk'>@@ -68,6 +68,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x00100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x00000200&gt;;</div><div class='ctx'> 		bus-frequency = &lt;132000000&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts<br/>index e74c045a0f8c..b157d1885a28 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc832x_rdb.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc832x_rdb.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc832x_rdb.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc832x_rdb.dts</a></div><div class='hunk'>@@ -51,6 +51,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x00100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x00000200&gt;;</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts<br/>index 8dfab5662585..700e076ef3f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8349emitx.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc8349emitx.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8349emitx.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8349emitx.dts</a></div><div class='hunk'>@@ -52,6 +52,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x00100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x00000200&gt;;</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;                    // from bootloader</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts<br/>index 49ca3497eefb..cdd3063258ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8349emitxgp.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc8349emitxgp.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8349emitxgp.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8349emitxgp.dts</a></div><div class='hunk'>@@ -50,6 +50,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x00100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x00000200&gt;;</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;                    // from bootloader</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts<br/>index ba586cb7afbb..783241c00240 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc834x_mds.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc834x_mds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc834x_mds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc834x_mds.dts</a></div><div class='hunk'>@@ -57,6 +57,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x00100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x00000200&gt;;</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts<br/>index 3701dae1ee02..a3b76a709951 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc836x_mds.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc836x_mds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc836x_mds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc836x_mds.dts</a></div><div class='hunk'>@@ -61,6 +61,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x00100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x00000200&gt;;</div><div class='ctx'> 		bus-frequency = &lt;264000000&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc836x_rdk.dts b/arch/powerpc/boot/dts/mpc836x_rdk.dts<br/>index 8acd1d6577f2..89c9202f8bd7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc836x_rdk.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc836x_rdk.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc836x_rdk.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc836x_rdk.dts</a></div><div class='hunk'>@@ -149,18 +149,14 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		crypto@30000 {</div><div class='del'>-			compatible = "fsl,sec2-crypto";</div><div class='add'>+			compatible = "fsl,sec2.0";</div><div class='ctx'> 			reg = &lt;0x30000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;11 8&gt;;</div><div class='add'>+			interrupts = &lt;11 0x8&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='del'>-			num-channels = &lt;4&gt;;</div><div class='del'>-			channel-fifo-len = &lt;24&gt;;</div><div class='del'>-			exec-units-mask = &lt;0x7e&gt;;</div><div class='del'>-			/*</div><div class='del'>-			 * desc mask is for rev1.x, we need runtime fixup</div><div class='del'>-			 * for &gt;=2.x</div><div class='del'>-			 */</div><div class='del'>-			descriptor-types-mask = &lt;0x1010ebf&gt;;</div><div class='add'>+			fsl,num-channels = &lt;4&gt;;</div><div class='add'>+			fsl,channel-fifo-len = &lt;24&gt;;</div><div class='add'>+			fsl,exec-units-mask = &lt;0x7e&gt;;</div><div class='add'>+			fsl,descriptor-types-mask = &lt;0x01010ebf&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		ipic: interrupt-controller@700 {</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts<br/>index 0a700cb5f611..432782b6d20a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8377_mds.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc8377_mds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8377_mds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8377_mds.dts</a></div><div class='hunk'>@@ -117,6 +117,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x00100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x00000200&gt;;</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts<br/>index 29c8c76a58f7..ed32c8ddafe3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8378_mds.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc8378_mds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8378_mds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8378_mds.dts</a></div><div class='hunk'>@@ -117,6 +117,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x00100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x00000200&gt;;</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts<br/>index d641a8985ea3..f4db9ed4a301 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8379_mds.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc8379_mds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8379_mds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8379_mds.dts</a></div><div class='hunk'>@@ -117,6 +117,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x00100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x00000200&gt;;</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts b/arch/powerpc/boot/dts/mpc8536ds.dts<br/>index 02cfa24a1695..1505d6855eff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8536ds.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc8536ds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8536ds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8536ds.dts</a></div><div class='hunk'>@@ -49,6 +49,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xffe00000 0x100000&gt;;</div><div class='ctx'> 		reg = &lt;0xffe00000 0x1000&gt;;</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts<br/>index f2273a872b11..9568bfaff8f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8540ads.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc8540ads.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8540ads.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8540ads.dts</a></div><div class='hunk'>@@ -53,6 +53,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x100000&gt;;	// CCSRBAR 1M</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts<br/>index c4469f19ff82..6480f4fd96e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8541cds.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc8541cds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8541cds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8541cds.dts</a></div><div class='hunk'>@@ -53,6 +53,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x1000&gt;;	// CCSRBAR 1M</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts<br/>index 7d3829d3495e..f1fb20737e3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8544ds.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc8544ds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8544ds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8544ds.dts</a></div><div class='hunk'>@@ -54,6 +54,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> </div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x1000&gt;;	// CCSRBAR 1M</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts<br/>index d84466bb7eca..431b496270dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8548cds.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc8548cds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8548cds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8548cds.dts</a></div><div class='hunk'>@@ -58,6 +58,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x1000&gt;;	// CCSRBAR</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts<br/>index e03a78006283..d833a5c4f476 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8555cds.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc8555cds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8555cds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8555cds.dts</a></div><div class='hunk'>@@ -53,6 +53,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x1000&gt;;	// CCSRBAR 1M</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts<br/>index ba8159de040b..4d1f2f284094 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8560ads.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc8560ads.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8560ads.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8560ads.dts</a></div><div class='hunk'>@@ -53,6 +53,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x200&gt;;</div><div class='ctx'> 		bus-frequency = &lt;330000000&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts<br/>index 9c30a34821dc..a15f10343f53 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8568mds.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc8568mds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8568mds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8568mds.dts</a></div><div class='hunk'>@@ -60,6 +60,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x1000&gt;;</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts<br/>index 08c61e3daecc..e124dd18fb5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8572ds.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc8572ds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8572ds.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8572ds.dts</a></div><div class='hunk'>@@ -68,6 +68,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0xffe00000 0x100000&gt;;</div><div class='ctx'> 		reg = &lt;0xffe00000 0x1000&gt;;	// CCSRBAR &amp; soc regs, remove once parse code for immrbase fixed</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts<br/>index 666185f59459..584a4f184eb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8610_hpcd.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc8610_hpcd.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8610_hpcd.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8610_hpcd.dts</a></div><div class='hunk'>@@ -202,6 +202,11 @@</div><div class='ctx'> 			fsl,has-rstcr;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		wdt@e4000 {</div><div class='add'>+			compatible = "fsl,mpc8610-wdt";</div><div class='add'>+			reg = &lt;0xe4000 0x100&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		i2s@16000 {</div><div class='ctx'> 			compatible = "fsl,mpc8610-ssi";</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='hunk'>@@ -276,7 +281,7 @@</div><div class='ctx'> 				cell-index = &lt;0&gt;;</div><div class='ctx'> 				reg = &lt;0x0 0x80&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;60 2&gt;;</div><div class='add'>+				interrupts = &lt;76 2&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@1 {</div><div class='ctx'> 				compatible = "fsl,mpc8610-dma-channel",</div><div class='hunk'>@@ -284,7 +289,7 @@</div><div class='ctx'> 				cell-index = &lt;1&gt;;</div><div class='ctx'> 				reg = &lt;0x80 0x80&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;61 2&gt;;</div><div class='add'>+				interrupts = &lt;77 2&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@2 {</div><div class='ctx'> 				compatible = "fsl,mpc8610-dma-channel",</div><div class='hunk'>@@ -292,7 +297,7 @@</div><div class='ctx'> 				cell-index = &lt;2&gt;;</div><div class='ctx'> 				reg = &lt;0x100 0x80&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;62 2&gt;;</div><div class='add'>+				interrupts = &lt;78 2&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			dma-channel@3 {</div><div class='ctx'> 				compatible = "fsl,mpc8610-dma-channel",</div><div class='hunk'>@@ -300,7 +305,7 @@</div><div class='ctx'> 				cell-index = &lt;3&gt;;</div><div class='ctx'> 				reg = &lt;0x180 0x80&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;63 2&gt;;</div><div class='add'>+				interrupts = &lt;79 2&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts<br/>index ae08761ffff1..d665e767822a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8641_hpcn.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/mpc8641_hpcn.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8641_hpcn.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/mpc8641_hpcn.dts</a></div><div class='hunk'>@@ -411,7 +411,7 @@</div><div class='ctx'> 			0xe000 0 0 1 &amp;i8259 12 2</div><div class='ctx'> 			0xe100 0 0 2 &amp;i8259 9 2</div><div class='ctx'> 			0xe200 0 0 3 &amp;i8259 10 2</div><div class='del'>-			0xe300 0 0 4 &amp;i8259 112</div><div class='add'>+			0xe300 0 0 4 &amp;i8259 11 2</div><div class='ctx'> </div><div class='ctx'> 			// IDSEL 0x1d  Audio</div><div class='ctx'> 			0xe800 0 0 1 &amp;i8259 6 2</div><div class='head'>diff --git a/arch/powerpc/boot/dts/tqm8548-bigflash.dts b/arch/powerpc/boot/dts/tqm8548-bigflash.dts<br/>index 64d2d5bbcdf1..4199e89b4e50 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/tqm8548-bigflash.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/tqm8548-bigflash.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/tqm8548-bigflash.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/tqm8548-bigflash.dts</a></div><div class='hunk'>@@ -50,13 +50,14 @@</div><div class='ctx'> 		reg = &lt;0x00000000 0x00000000&gt;;	// Filled in by U-Boot</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc8548@a0000000 {</div><div class='add'>+	soc@a0000000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='ctx'> 		ranges = &lt;0x0 0xa0000000 0x100000&gt;;</div><div class='ctx'> 		reg = &lt;0xa0000000 0x1000&gt;;	// CCSRBAR</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;</div><div class='add'>+		compatible = "fsl,mpc8548-immr", "simple-bus";</div><div class='ctx'> </div><div class='ctx'> 		memory-controller@2000 {</div><div class='ctx'> 			compatible = "fsl,mpc8548-memory-controller";</div><div class='hunk'>@@ -83,6 +84,11 @@</div><div class='ctx'> 			interrupts = &lt;43 2&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> 			dfsrr;</div><div class='add'>+</div><div class='add'>+			rtc@68 {</div><div class='add'>+				compatible = "dallas,ds1337";</div><div class='add'>+				reg = &lt;0x68&gt;;</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c@3100 {</div><div class='head'>diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts<br/>index 2563112cabd3..58ee4185454b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/tqm8548.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/tqm8548.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/tqm8548.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/tqm8548.dts</a></div><div class='hunk'>@@ -50,13 +50,14 @@</div><div class='ctx'> 		reg = &lt;0x00000000 0x00000000&gt;;	// Filled in by U-Boot</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc8548@e0000000 {</div><div class='add'>+	soc@e0000000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		device_type = "soc";</div><div class='ctx'> 		ranges = &lt;0x0 0xe0000000 0x100000&gt;;</div><div class='ctx'> 		reg = &lt;0xe0000000 0x1000&gt;;	// CCSRBAR</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;</div><div class='add'>+		compatible = "fsl,mpc8548-immr", "simple-bus";</div><div class='ctx'> </div><div class='ctx'> 		memory-controller@2000 {</div><div class='ctx'> 			compatible = "fsl,mpc8548-memory-controller";</div><div class='head'>diff --git a/arch/powerpc/boot/dts/warp.dts b/arch/powerpc/boot/dts/warp.dts<br/>index 340018cf16b7..f4e4ba69eef7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/warp.dts?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/dts/warp.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/warp.dts?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/dts/warp.dts</a></div><div class='hunk'>@@ -139,6 +139,11 @@</div><div class='ctx'> 					interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='add'>+				fpga@2,2000 {</div><div class='add'>+					compatible = "pika,fpga-sgl";</div><div class='add'>+			   		reg = &lt;0x00000002 0x00002000 0x00000200&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='ctx'> 				fpga@2,4000 {</div><div class='ctx'> 					compatible = "pika,fpga-sd";</div><div class='ctx'> 					reg = &lt;0x00000002 0x00004000 0x00000A00&gt;;</div><div class='hunk'>@@ -152,7 +157,7 @@</div><div class='ctx'> 					#size-cells = &lt;1&gt;;</div><div class='ctx'> 					partition@300000 {</div><div class='ctx'> 						label = "fpga";</div><div class='del'>-						reg = &lt;0x0030000 0x00040000&gt;;</div><div class='add'>+						reg = &lt;0x0300000 0x00040000&gt;;</div><div class='ctx'> 					};</div><div class='ctx'> 					partition@340000 {</div><div class='ctx'> 						label = "env";</div><div class='hunk'>@@ -181,7 +186,6 @@</div><div class='ctx'> 				reg = &lt;0xef600700 0x00000014&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='ctx'> 				interrupts = &lt;0x2 0x4&gt;;</div><div class='del'>-				index = &lt;0x0&gt;;</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -191,6 +195,12 @@</div><div class='ctx'> 					interrupts = &lt;0x19 0x8&gt;;</div><div class='ctx'> 					interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='ctx'> 				};</div><div class='add'>+</div><div class='add'>+				/* This will create 52 and 53 */</div><div class='add'>+				at24@52 {</div><div class='add'>+					compatible = "at,24c04";</div><div class='add'>+					reg = &lt;0x52&gt;;</div><div class='add'>+				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			GPIO0: gpio@ef600b00 {</div><div class='hunk'>@@ -209,7 +219,13 @@</div><div class='ctx'> 				led@31 {</div><div class='ctx'> 					compatible = "linux,gpio-led";</div><div class='ctx'> 					linux,name = ":green:";</div><div class='del'>-					gpios = &lt;&amp;GPIO1 0x30 0&gt;;</div><div class='add'>+					gpios = &lt;&amp;GPIO1 31 0&gt;;</div><div class='add'>+				};		</div><div class='add'>+	</div><div class='add'>+				led@30 {	</div><div class='add'>+					compatible = "linux,gpio-led";</div><div class='add'>+					linux,name = ":red:";</div><div class='add'>+					gpios = &lt;&amp;GPIO1 30 0&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/boot/io.h b/arch/powerpc/boot/io.h<br/>index ccaedaec50d5..7c09f4861fe1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/io.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Low-level I/O routines.</div><div class='ctx'>  *</div><div class='del'>- * Copied from &lt;file:include/asm-powerpc/io.h&gt; (which has no copyright)</div><div class='add'>+ * Copied from &lt;file:arch/powerpc/include/asm/io.h&gt; (which has no copyright)</div><div class='ctx'>  */</div><div class='ctx'> static inline int in_8(const volatile unsigned char *addr)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper<br/>index 644bf9d4ea00..965c237c122d 100755<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/wrapper?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/boot/wrapper</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/wrapper?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/boot/wrapper</a></div><div class='hunk'>@@ -165,7 +165,7 @@ cuboot*)</div><div class='ctx'>     binary=y</div><div class='ctx'>     gzip=</div><div class='ctx'>     case "$platform" in</div><div class='del'>-    *-mpc885ads|*-adder875*|*-ep88xc)</div><div class='add'>+    *-mpc866ads|*-mpc885ads|*-adder875*|*-ep88xc)</div><div class='ctx'>         platformo=$object/cuboot-8xx.o</div><div class='ctx'>         ;;</div><div class='ctx'>     *5200*|*-motionpro)</div><div class='head'>diff --git a/arch/powerpc/configs/40x/ep405_defconfig b/arch/powerpc/configs/40x/ep405_defconfig<br/>index e24240a9a047..2113ae2ab401 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/40x/ep405_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/40x/ep405_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/40x/ep405_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/40x/ep405_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25-rc2</div><div class='del'>-# Fri Feb 15 21:50:09 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 19:34:03 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -26,8 +26,12 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_GET_USER_PAGES_FAST is not set</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='hunk'>@@ -75,6 +79,7 @@ CONFIG_FAIR_GROUP_SCHED=y</div><div class='ctx'> CONFIG_USER_SCHED=y</div><div class='ctx'> # CONFIG_CGROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='ctx'> # CONFIG_NAMESPACES is not set</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='hunk'>@@ -83,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -108,13 +114,22 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -125,6 +140,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -139,14 +155,11 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> CONFIG_CLASSIC_RCU=y</div><div class='del'>-# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> # CONFIG_PPC4xx_PCI_EXPRESS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -188,7 +201,6 @@ CONFIG_HZ=250</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='del'>-CONFIG_RCU_TRACE=y</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> # CONFIG_MATH_EMULATION is not set</div><div class='hunk'>@@ -206,13 +218,17 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -222,6 +238,8 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -232,6 +250,7 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCI_DEBUG is not set</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Advanced setup</div><div class='hunk'>@@ -241,17 +260,13 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> #</div><div class='ctx'> # Default settings for advanced configuration options are used</div><div class='ctx'> #</div><div class='del'>-CONFIG_HIGHMEM_START=0xfe000000</div><div class='ctx'> CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-CONFIG_BOOT_LOAD=0x00400000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -289,8 +304,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -340,6 +353,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -352,6 +367,7 @@ CONFIG_MTD_PARTITIONS=y</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='ctx'> CONFIG_MTD_CMDLINE_PARTS=y</div><div class='ctx'> CONFIG_MTD_OF_PARTS=y</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # User Modules And Translation Layers</div><div class='hunk'>@@ -443,12 +459,14 @@ CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> # CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -466,12 +484,15 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -506,7 +527,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -516,12 +536,12 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -534,6 +554,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_MLX4_CORE is not set</div><div class='ctx'> # CONFIG_TEHUTI is not set</div><div class='ctx'> # CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -541,6 +562,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Network Adapters</div><div class='hunk'>@@ -576,6 +598,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -614,12 +637,9 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='hunk'>@@ -635,13 +655,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -658,10 +689,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='hunk'>@@ -678,12 +705,16 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='ctx'> # CONFIG_USB_EHCI_HCD is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='ctx'> CONFIG_USB_OHCI_HCD_PPC_OF=y</div><div class='ctx'> CONFIG_USB_OHCI_HCD_PPC_OF_BE=y</div><div class='hunk'>@@ -701,6 +732,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> # CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -744,17 +776,16 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -769,7 +800,6 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='hunk'>@@ -818,6 +848,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -828,14 +859,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -856,8 +885,10 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -867,6 +898,7 @@ CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='ctx'> CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -874,6 +906,7 @@ CONFIG_HAS_DMA=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='hunk'>@@ -881,9 +914,12 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='hunk'>@@ -896,17 +932,30 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -918,51 +967,85 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='del'>-# CONFIG_CRYPTO_SEQIV is not set</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=y</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=y</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=y</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CTR is not set</div><div class='del'>-# CONFIG_CRYPTO_GCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='ctx'> # CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/40x/kilauea_defconfig b/arch/powerpc/configs/40x/kilauea_defconfig<br/>index 2f475391f1d1..565ed9666c54 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/40x/kilauea_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/40x/kilauea_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/40x/kilauea_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/40x/kilauea_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25-rc2</div><div class='del'>-# Fri Feb 15 21:51:43 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 19:36:14 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -26,8 +26,12 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_GET_USER_PAGES_FAST is not set</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='hunk'>@@ -75,6 +79,7 @@ CONFIG_GROUP_SCHED=y</div><div class='ctx'> CONFIG_USER_SCHED=y</div><div class='ctx'> # CONFIG_CGROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='ctx'> # CONFIG_NAMESPACES is not set</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='hunk'>@@ -83,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -108,13 +114,22 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -125,6 +140,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -139,14 +155,11 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> CONFIG_CLASSIC_RCU=y</div><div class='del'>-# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> CONFIG_PPC4xx_PCI_EXPRESS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -186,7 +199,6 @@ CONFIG_HZ=250</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='del'>-CONFIG_RCU_TRACE=y</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> # CONFIG_MATH_EMULATION is not set</div><div class='hunk'>@@ -204,13 +216,17 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -220,6 +236,8 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -230,6 +248,7 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCI_DEBUG is not set</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Advanced setup</div><div class='hunk'>@@ -239,17 +258,13 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> #</div><div class='ctx'> # Default settings for advanced configuration options are used</div><div class='ctx'> #</div><div class='del'>-CONFIG_HIGHMEM_START=0xfe000000</div><div class='ctx'> CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-CONFIG_BOOT_LOAD=0x00400000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -287,8 +302,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -338,6 +351,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -350,6 +365,7 @@ CONFIG_MTD_PARTITIONS=y</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='ctx'> CONFIG_MTD_CMDLINE_PARTS=y</div><div class='ctx'> CONFIG_MTD_OF_PARTS=y</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # User Modules And Translation Layers</div><div class='hunk'>@@ -440,6 +456,7 @@ CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> # CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> # CONFIG_MISC_DEVICES is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='hunk'>@@ -458,12 +475,15 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -502,6 +522,7 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='hunk'>@@ -528,6 +549,7 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -566,12 +588,9 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='hunk'>@@ -587,13 +606,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -610,22 +640,16 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -640,7 +664,6 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='hunk'>@@ -689,6 +712,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -699,14 +723,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -727,8 +749,10 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -738,6 +762,7 @@ CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='ctx'> CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -745,6 +770,7 @@ CONFIG_HAS_DMA=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='hunk'>@@ -752,9 +778,12 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='hunk'>@@ -767,17 +796,30 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -789,51 +831,85 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='del'>-# CONFIG_CRYPTO_SEQIV is not set</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=y</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=y</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=y</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CTR is not set</div><div class='del'>-# CONFIG_CRYPTO_GCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='ctx'> # CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/40x/makalu_defconfig b/arch/powerpc/configs/40x/makalu_defconfig<br/>index 9ef4d8a312c8..987a4481800f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/40x/makalu_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/40x/makalu_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/40x/makalu_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/40x/makalu_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25-rc2</div><div class='del'>-# Fri Feb 15 21:52:30 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 19:38:39 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -26,8 +26,12 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_GET_USER_PAGES_FAST is not set</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='hunk'>@@ -75,6 +79,7 @@ CONFIG_GROUP_SCHED=y</div><div class='ctx'> CONFIG_USER_SCHED=y</div><div class='ctx'> # CONFIG_CGROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='ctx'> # CONFIG_NAMESPACES is not set</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='hunk'>@@ -83,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -108,13 +114,22 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -125,6 +140,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -139,14 +155,11 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> CONFIG_CLASSIC_RCU=y</div><div class='del'>-# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> CONFIG_PPC4xx_PCI_EXPRESS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -186,7 +199,6 @@ CONFIG_HZ=250</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='del'>-CONFIG_RCU_TRACE=y</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> # CONFIG_MATH_EMULATION is not set</div><div class='hunk'>@@ -204,13 +216,17 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -220,6 +236,8 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -230,6 +248,7 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCI_DEBUG is not set</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Advanced setup</div><div class='hunk'>@@ -239,17 +258,13 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> #</div><div class='ctx'> # Default settings for advanced configuration options are used</div><div class='ctx'> #</div><div class='del'>-CONFIG_HIGHMEM_START=0xfe000000</div><div class='ctx'> CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-CONFIG_BOOT_LOAD=0x00400000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -287,8 +302,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -338,6 +351,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -350,6 +365,7 @@ CONFIG_MTD_PARTITIONS=y</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='ctx'> CONFIG_MTD_CMDLINE_PARTS=y</div><div class='ctx'> CONFIG_MTD_OF_PARTS=y</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # User Modules And Translation Layers</div><div class='hunk'>@@ -440,6 +456,7 @@ CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> # CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> # CONFIG_MISC_DEVICES is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='hunk'>@@ -458,12 +475,15 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -502,6 +522,7 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='hunk'>@@ -528,6 +549,7 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -566,12 +588,9 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='hunk'>@@ -587,13 +606,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -610,22 +640,16 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -640,7 +664,6 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='hunk'>@@ -689,6 +712,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -699,14 +723,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -727,8 +749,10 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -738,6 +762,7 @@ CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='ctx'> CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -745,6 +770,7 @@ CONFIG_HAS_DMA=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='hunk'>@@ -752,9 +778,12 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='hunk'>@@ -767,17 +796,30 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -789,51 +831,85 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='del'>-# CONFIG_CRYPTO_SEQIV is not set</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=y</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=y</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=y</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CTR is not set</div><div class='del'>-# CONFIG_CRYPTO_GCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='ctx'> # CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/40x/walnut_defconfig b/arch/powerpc/configs/40x/walnut_defconfig<br/>index 3b2689e5002a..aee79338f41f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/40x/walnut_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/40x/walnut_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/40x/walnut_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/40x/walnut_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25-rc2</div><div class='del'>-# Fri Feb 15 21:54:12 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 19:40:56 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -26,8 +26,12 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_GET_USER_PAGES_FAST is not set</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='hunk'>@@ -75,6 +79,7 @@ CONFIG_FAIR_GROUP_SCHED=y</div><div class='ctx'> CONFIG_USER_SCHED=y</div><div class='ctx'> # CONFIG_CGROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='ctx'> # CONFIG_NAMESPACES is not set</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='hunk'>@@ -83,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -108,13 +114,22 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -125,6 +140,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -139,14 +155,11 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> CONFIG_CLASSIC_RCU=y</div><div class='del'>-# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> # CONFIG_PPC4xx_PCI_EXPRESS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -189,7 +202,6 @@ CONFIG_HZ=250</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='del'>-CONFIG_RCU_TRACE=y</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> # CONFIG_MATH_EMULATION is not set</div><div class='hunk'>@@ -207,13 +219,17 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -223,6 +239,8 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -233,6 +251,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y</div><div class='ctx'> # CONFIG_PCI_DEBUG is not set</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Advanced setup</div><div class='hunk'>@@ -242,17 +261,13 @@ CONFIG_ARCH_SUPPORTS_MSI=y</div><div class='ctx'> #</div><div class='ctx'> # Default settings for advanced configuration options are used</div><div class='ctx'> #</div><div class='del'>-CONFIG_HIGHMEM_START=0xfe000000</div><div class='ctx'> CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-CONFIG_BOOT_LOAD=0x00400000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -290,8 +305,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -341,6 +354,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -353,6 +368,7 @@ CONFIG_MTD_PARTITIONS=y</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='ctx'> CONFIG_MTD_CMDLINE_PARTS=y</div><div class='ctx'> CONFIG_MTD_OF_PARTS=y</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # User Modules And Translation Layers</div><div class='hunk'>@@ -443,12 +459,14 @@ CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> # CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -466,12 +484,15 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -506,7 +527,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -516,12 +536,12 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -534,6 +554,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_MLX4_CORE is not set</div><div class='ctx'> # CONFIG_TEHUTI is not set</div><div class='ctx'> # CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -541,6 +562,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='hunk'>@@ -567,6 +589,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -605,12 +628,9 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='hunk'>@@ -626,13 +646,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -649,16 +680,14 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -667,13 +696,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -688,7 +715,6 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='hunk'>@@ -737,6 +763,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -747,14 +774,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -775,8 +800,10 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -786,6 +813,7 @@ CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='ctx'> CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -793,6 +821,7 @@ CONFIG_HAS_DMA=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='hunk'>@@ -800,9 +829,12 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='hunk'>@@ -815,17 +847,30 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -837,51 +882,85 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='del'>-# CONFIG_CRYPTO_SEQIV is not set</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=y</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=y</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=y</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CTR is not set</div><div class='del'>-# CONFIG_CRYPTO_GCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='ctx'> # CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/44x/bamboo_defconfig b/arch/powerpc/configs/44x/bamboo_defconfig<br/>index c44db554cdc6..e920693535af 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/bamboo_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/44x/bamboo_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/bamboo_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/bamboo_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25-rc2</div><div class='del'>-# Fri Feb 15 21:36:39 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 08:43:44 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -30,8 +30,12 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_GET_USER_PAGES_FAST is not set</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='hunk'>@@ -79,6 +83,7 @@ CONFIG_FAIR_GROUP_SCHED=y</div><div class='ctx'> CONFIG_USER_SCHED=y</div><div class='ctx'> # CONFIG_CGROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='ctx'> # CONFIG_NAMESPACES is not set</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='hunk'>@@ -87,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -112,13 +118,22 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -129,6 +144,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -143,24 +159,25 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> CONFIG_CLASSIC_RCU=y</div><div class='del'>-# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> # CONFIG_PPC4xx_PCI_EXPRESS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='ctx'> CONFIG_BAMBOO=y</div><div class='ctx'> # CONFIG_EBONY is not set</div><div class='add'>+# CONFIG_SAM440EP is not set</div><div class='ctx'> # CONFIG_SEQUOIA is not set</div><div class='ctx'> # CONFIG_TAISHAN is not set</div><div class='ctx'> # CONFIG_KATMAI is not set</div><div class='ctx'> # CONFIG_RAINIER is not set</div><div class='ctx'> # CONFIG_WARP is not set</div><div class='add'>+# CONFIG_CANYONLANDS is not set</div><div class='add'>+# CONFIG_YOSEMITE is not set</div><div class='add'>+# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set</div><div class='ctx'> CONFIG_440EP=y</div><div class='ctx'> CONFIG_IBM440EP_ERR42=y</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='hunk'>@@ -193,7 +210,6 @@ CONFIG_HZ=250</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='del'>-CONFIG_RCU_TRACE=y</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> # CONFIG_MATH_EMULATION is not set</div><div class='hunk'>@@ -211,14 +227,18 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> CONFIG_CMDLINE_BOOL=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='ctx'> </div><div class='hunk'>@@ -227,6 +247,8 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -237,6 +259,7 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCI_DEBUG is not set</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Advanced setup</div><div class='hunk'>@@ -246,17 +269,13 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> #</div><div class='ctx'> # Default settings for advanced configuration options are used</div><div class='ctx'> #</div><div class='del'>-CONFIG_HIGHMEM_START=0xfe000000</div><div class='ctx'> CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-CONFIG_BOOT_LOAD=0x01000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -294,8 +313,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -345,6 +362,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -370,12 +389,14 @@ CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> # CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -393,12 +414,15 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -433,7 +457,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -443,12 +466,12 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -461,6 +484,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_MLX4_CORE is not set</div><div class='ctx'> # CONFIG_TEHUTI is not set</div><div class='ctx'> # CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -468,6 +492,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='hunk'>@@ -494,6 +519,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -532,12 +558,9 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='hunk'>@@ -553,13 +576,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> CONFIG_DAB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -576,16 +610,14 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -594,13 +626,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -615,7 +645,6 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='hunk'>@@ -663,6 +692,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -673,14 +703,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -701,8 +729,10 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -712,6 +742,7 @@ CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='ctx'> CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -719,6 +750,7 @@ CONFIG_HAS_DMA=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='hunk'>@@ -726,9 +758,12 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='hunk'>@@ -741,19 +776,30 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-CONFIG_DEBUGGER=y</div><div class='del'>-# CONFIG_KGDB is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='ctx'> # CONFIG_XMON is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -765,51 +811,85 @@ CONFIG_DEBUGGER=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='del'>-# CONFIG_CRYPTO_SEQIV is not set</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=y</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=y</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=y</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CTR is not set</div><div class='del'>-# CONFIG_CRYPTO_GCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='ctx'> # CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/44x/canyonlands_defconfig b/arch/powerpc/configs/44x/canyonlands_defconfig<br/>index a3b763c45ec6..74da5c7754a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/canyonlands_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/44x/canyonlands_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/canyonlands_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/canyonlands_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25-rc1</div><div class='del'>-# Thu Feb 21 14:29:28 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 08:46:14 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -30,8 +30,12 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_GET_USER_PAGES_FAST is not set</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='hunk'>@@ -73,8 +77,9 @@ CONFIG_POSIX_MQUEUE=y</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_CGROUPS is not set</div><div class='del'>-# CONFIG_FAIR_GROUP_SCHED is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='ctx'> # CONFIG_NAMESPACES is not set</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='hunk'>@@ -83,12 +88,12 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='del'>-# CONFIG_LOGBUFFER is not set</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='hunk'>@@ -109,13 +114,22 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -126,6 +140,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -140,25 +155,25 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> CONFIG_CLASSIC_RCU=y</div><div class='del'>-# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> CONFIG_PPC4xx_PCI_EXPRESS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='ctx'> # CONFIG_BAMBOO is not set</div><div class='ctx'> # CONFIG_EBONY is not set</div><div class='add'>+# CONFIG_SAM440EP is not set</div><div class='ctx'> # CONFIG_SEQUOIA is not set</div><div class='ctx'> # CONFIG_TAISHAN is not set</div><div class='ctx'> # CONFIG_KATMAI is not set</div><div class='ctx'> # CONFIG_RAINIER is not set</div><div class='ctx'> # CONFIG_WARP is not set</div><div class='ctx'> CONFIG_CANYONLANDS=y</div><div class='add'>+# CONFIG_YOSEMITE is not set</div><div class='add'>+# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set</div><div class='ctx'> CONFIG_460EX=y</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='ctx'> # CONFIG_MPIC is not set</div><div class='hunk'>@@ -190,7 +205,6 @@ CONFIG_HZ=250</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='del'>-CONFIG_RCU_TRACE=y</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> # CONFIG_MATH_EMULATION is not set</div><div class='hunk'>@@ -208,16 +222,19 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> CONFIG_CMDLINE_BOOL=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='del'>-CONFIG_WANT_DEVICE_TREE=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -225,6 +242,8 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -235,6 +254,7 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCI_DEBUG is not set</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Advanced setup</div><div class='hunk'>@@ -244,17 +264,13 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> #</div><div class='ctx'> # Default settings for advanced configuration options are used</div><div class='ctx'> #</div><div class='del'>-CONFIG_HIGHMEM_START=0xfe000000</div><div class='ctx'> CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-CONFIG_BOOT_LOAD=0x01000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -292,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -343,6 +357,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -368,6 +384,7 @@ CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> # CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> # CONFIG_MISC_DEVICES is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='hunk'>@@ -386,12 +403,15 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -430,6 +450,7 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='hunk'>@@ -456,6 +477,7 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -494,16 +516,14 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -515,13 +535,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> CONFIG_DAB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -538,22 +569,16 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -568,7 +593,6 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='hunk'>@@ -616,6 +640,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -626,14 +651,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -654,8 +677,10 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -665,6 +690,7 @@ CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='ctx'> CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -672,6 +698,7 @@ CONFIG_HAS_DMA=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='hunk'>@@ -679,9 +706,12 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='hunk'>@@ -694,19 +724,30 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-CONFIG_DEBUGGER=y</div><div class='del'>-# CONFIG_KGDB is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='ctx'> # CONFIG_XMON is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -719,3 +760,4 @@ CONFIG_DEBUGGER=y</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> # CONFIG_CRYPTO is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/44x/ebony_defconfig b/arch/powerpc/configs/44x/ebony_defconfig<br/>index 07c8d4ce175a..17615750b494 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/ebony_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/44x/ebony_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/ebony_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/ebony_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25-rc2</div><div class='del'>-# Fri Feb 15 21:50:44 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 09:04:12 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -29,8 +29,12 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_GET_USER_PAGES_FAST is not set</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='hunk'>@@ -78,6 +82,7 @@ CONFIG_FAIR_GROUP_SCHED=y</div><div class='ctx'> CONFIG_USER_SCHED=y</div><div class='ctx'> # CONFIG_CGROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='ctx'> # CONFIG_NAMESPACES is not set</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='hunk'>@@ -86,6 +91,7 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -111,13 +117,22 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -128,6 +143,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -142,24 +158,25 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> CONFIG_CLASSIC_RCU=y</div><div class='del'>-# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> # CONFIG_PPC4xx_PCI_EXPRESS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='ctx'> # CONFIG_BAMBOO is not set</div><div class='ctx'> CONFIG_EBONY=y</div><div class='add'>+# CONFIG_SAM440EP is not set</div><div class='ctx'> # CONFIG_SEQUOIA is not set</div><div class='ctx'> # CONFIG_TAISHAN is not set</div><div class='ctx'> # CONFIG_KATMAI is not set</div><div class='ctx'> # CONFIG_RAINIER is not set</div><div class='ctx'> # CONFIG_WARP is not set</div><div class='add'>+# CONFIG_CANYONLANDS is not set</div><div class='add'>+# CONFIG_YOSEMITE is not set</div><div class='add'>+# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set</div><div class='ctx'> CONFIG_440GP=y</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='ctx'> # CONFIG_MPIC is not set</div><div class='hunk'>@@ -192,7 +209,6 @@ CONFIG_HZ=250</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='del'>-CONFIG_RCU_TRACE=y</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> CONFIG_MATH_EMULATION=y</div><div class='hunk'>@@ -210,13 +226,17 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='ctx'> </div><div class='hunk'>@@ -225,6 +245,8 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -235,6 +257,7 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCI_DEBUG is not set</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Advanced setup</div><div class='hunk'>@@ -244,17 +267,13 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> #</div><div class='ctx'> # Default settings for advanced configuration options are used</div><div class='ctx'> #</div><div class='del'>-CONFIG_HIGHMEM_START=0xfe000000</div><div class='ctx'> CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-CONFIG_BOOT_LOAD=0x01000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -292,8 +311,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -343,6 +360,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -355,6 +374,7 @@ CONFIG_MTD_PARTITIONS=y</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='ctx'> # CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='ctx'> CONFIG_MTD_OF_PARTS=y</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # User Modules And Translation Layers</div><div class='hunk'>@@ -444,12 +464,14 @@ CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> # CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -467,12 +489,15 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -507,7 +532,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -517,12 +541,12 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -535,6 +559,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_MLX4_CORE is not set</div><div class='ctx'> # CONFIG_TEHUTI is not set</div><div class='ctx'> # CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -542,6 +567,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='hunk'>@@ -568,6 +594,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -606,12 +633,9 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='hunk'>@@ -627,13 +651,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -650,16 +685,14 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -668,13 +701,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -689,7 +720,6 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='hunk'>@@ -748,6 +778,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -758,14 +789,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -786,8 +815,10 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -798,6 +829,7 @@ CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='ctx'> CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -805,6 +837,7 @@ CONFIG_HAS_DMA=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='hunk'>@@ -812,9 +845,12 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='hunk'>@@ -827,17 +863,30 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -849,50 +898,84 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='del'>-# CONFIG_CRYPTO_SEQIV is not set</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=y</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=y</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=y</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CTR is not set</div><div class='del'>-# CONFIG_CRYPTO_GCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='ctx'> # CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> # CONFIG_CRYPTO_HW is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/44x/katmai_defconfig b/arch/powerpc/configs/44x/katmai_defconfig<br/>index c8804ec01ea4..7bc4082a1c93 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/katmai_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/44x/katmai_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/katmai_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/katmai_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.24-rc6</div><div class='del'>-# Mon Dec 24 11:17:43 2007</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 09:06:51 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -29,7 +29,12 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_GET_USER_PAGES_FAST is not set</div><div class='add'>+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='hunk'>@@ -67,23 +72,22 @@ CONFIG_SYSVIPC_SYSCTL=y</div><div class='ctx'> CONFIG_POSIX_MQUEUE=y</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT is not set</div><div class='ctx'> # CONFIG_TASKSTATS is not set</div><div class='del'>-# CONFIG_USER_NS is not set</div><div class='del'>-# CONFIG_PID_NS is not set</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_CGROUPS is not set</div><div class='del'>-CONFIG_FAIR_GROUP_SCHED=y</div><div class='del'>-CONFIG_FAIR_USER_SCHED=y</div><div class='del'>-# CONFIG_FAIR_CGROUP_SCHED is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='ctx'> CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -91,11 +95,13 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_ANON_INODES=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='ctx'> CONFIG_EVENTFD=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_VM_EVENT_COUNTERS=y</div><div class='hunk'>@@ -103,10 +109,26 @@ CONFIG_SLUB_DEBUG=y</div><div class='ctx'> # CONFIG_SLAB is not set</div><div class='ctx'> CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -117,6 +139,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -130,23 +153,28 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_CFQ is not set</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='ctx'> CONFIG_PPC4xx_PCI_EXPRESS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC52xx is not set</div><div class='del'>-# CONFIG_PPC_MPC5200 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='ctx'> # CONFIG_BAMBOO is not set</div><div class='ctx'> # CONFIG_EBONY is not set</div><div class='add'>+# CONFIG_SAM440EP is not set</div><div class='ctx'> # CONFIG_SEQUOIA is not set</div><div class='ctx'> # CONFIG_TAISHAN is not set</div><div class='ctx'> CONFIG_KATMAI=y</div><div class='ctx'> # CONFIG_RAINIER is not set</div><div class='add'>+# CONFIG_WARP is not set</div><div class='add'>+# CONFIG_CANYONLANDS is not set</div><div class='add'>+# CONFIG_YOSEMITE is not set</div><div class='add'>+# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set</div><div class='ctx'> CONFIG_440SPe=y</div><div class='add'>+# CONFIG_IPIC is not set</div><div class='ctx'> # CONFIG_MPIC is not set</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='ctx'> # CONFIG_PPC_I8259 is not set</div><div class='hunk'>@@ -157,7 +185,6 @@ CONFIG_440SPe=y</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='del'>-# CONFIG_CPM2 is not set</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -173,13 +200,17 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> # CONFIG_MATH_EMULATION is not set</div><div class='add'>+# CONFIG_IOMMU_HELPER is not set</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='add'>+CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='hunk'>@@ -190,17 +221,19 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> CONFIG_CMDLINE_BOOL=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='del'>-CONFIG_WANT_DEVICE_TREE=y</div><div class='del'>-CONFIG_DEVICE_TREE="katmai.dts"</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -208,6 +241,8 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -218,6 +253,7 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCI_DEBUG is not set</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Advanced setup</div><div class='hunk'>@@ -227,17 +263,13 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> #</div><div class='ctx'> # Default settings for advanced configuration options are used</div><div class='ctx'> #</div><div class='del'>-CONFIG_HIGHMEM_START=0xfe000000</div><div class='ctx'> CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-CONFIG_BOOT_LOAD=0x01000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -275,8 +307,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -300,6 +330,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_PKTGEN is not set</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='ctx'> # CONFIG_IRDA is not set</div><div class='ctx'> # CONFIG_BT is not set</div><div class='ctx'> # CONFIG_AF_RXRPC is not set</div><div class='hunk'>@@ -325,6 +356,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -346,15 +379,19 @@ CONFIG_BLK_DEV=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='del'>-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> # CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -371,6 +408,10 @@ CONFIG_MISC_DEVICES=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='hunk'>@@ -378,14 +419,12 @@ CONFIG_MACINTOSH_DRIVERS=y</div><div class='ctx'> # CONFIG_MAC_EMUMOUSEBTN is not set</div><div class='ctx'> # CONFIG_WINDFARM is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='ctx'> # CONFIG_VETH is not set</div><div class='del'>-# CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_ARCNET is not set</div><div class='ctx'> # CONFIG_PHYLIB is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='hunk'>@@ -414,6 +453,8 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='add'>+# CONFIG_IP1000 is not set</div><div class='add'>+# CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='ctx'> # CONFIG_HAMACHI is not set</div><div class='ctx'> # CONFIG_YELLOWFIN is not set</div><div class='hunk'>@@ -421,12 +462,12 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -438,6 +479,8 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_NIU is not set</div><div class='ctx'> # CONFIG_MLX4_CORE is not set</div><div class='ctx'> # CONFIG_TEHUTI is not set</div><div class='add'>+# CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -445,12 +488,12 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='del'>-# CONFIG_SHAPER is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='ctx'> # CONFIG_NET_POLL_CONTROLLER is not set</div><div class='hunk'>@@ -472,7 +515,9 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+# CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Serial drivers</div><div class='hunk'>@@ -509,15 +554,14 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -529,13 +573,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> CONFIG_DAB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -552,34 +607,27 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Gadget Support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -594,14 +642,11 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='del'>-# CONFIG_MINIX_FS is not set</div><div class='del'>-# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='del'>-CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='ctx'> # CONFIG_FUSE_FS is not set</div><div class='hunk'>@@ -643,8 +688,11 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='ctx'> CONFIG_NETWORK_FILESYSTEMS=y</div><div class='hunk'>@@ -652,14 +700,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -675,14 +721,15 @@ CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # CONFIG_NLS is not set</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='del'>-# CONFIG_UCC_SLOW is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -692,10 +739,7 @@ CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='ctx'> CONFIG_HAS_DMA=y</div><div class='del'>-CONFIG_INSTRUMENTATION=y</div><div class='del'>-# CONFIG_PROFILING is not set</div><div class='del'>-# CONFIG_KPROBES is not set</div><div class='del'>-# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -703,6 +747,7 @@ CONFIG_INSTRUMENTATION=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -710,10 +755,14 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='add'>+# CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='ctx'> # CONFIG_RT_MUTEX_TESTER is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='hunk'>@@ -724,19 +773,30 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='del'>-CONFIG_FORCED_INLINING=y</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-CONFIG_DEBUGGER=y</div><div class='del'>-# CONFIG_KGDB is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='ctx'> # CONFIG_XMON is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -747,44 +807,85 @@ CONFIG_DEBUGGER=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=y</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=y</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=y</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='add'>+# CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/44x/rainier_defconfig b/arch/powerpc/configs/44x/rainier_defconfig<br/>index dec18ca73519..0479648a9141 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/rainier_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/44x/rainier_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/rainier_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/rainier_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25-rc2</div><div class='del'>-# Fri Feb 15 21:53:10 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 09:09:35 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -29,8 +29,12 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_GET_USER_PAGES_FAST is not set</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='hunk'>@@ -78,6 +82,7 @@ CONFIG_FAIR_GROUP_SCHED=y</div><div class='ctx'> CONFIG_USER_SCHED=y</div><div class='ctx'> # CONFIG_CGROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='ctx'> # CONFIG_NAMESPACES is not set</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='hunk'>@@ -86,6 +91,7 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -111,13 +117,22 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -128,6 +143,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -142,24 +158,25 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> CONFIG_CLASSIC_RCU=y</div><div class='del'>-# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> # CONFIG_PPC4xx_PCI_EXPRESS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='ctx'> # CONFIG_BAMBOO is not set</div><div class='ctx'> # CONFIG_EBONY is not set</div><div class='add'>+# CONFIG_SAM440EP is not set</div><div class='ctx'> # CONFIG_SEQUOIA is not set</div><div class='ctx'> # CONFIG_TAISHAN is not set</div><div class='ctx'> # CONFIG_KATMAI is not set</div><div class='ctx'> CONFIG_RAINIER=y</div><div class='ctx'> # CONFIG_WARP is not set</div><div class='add'>+# CONFIG_CANYONLANDS is not set</div><div class='add'>+# CONFIG_YOSEMITE is not set</div><div class='add'>+# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set</div><div class='ctx'> CONFIG_440GRX=y</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='ctx'> # CONFIG_MPIC is not set</div><div class='hunk'>@@ -191,7 +208,6 @@ CONFIG_HZ=250</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='del'>-CONFIG_RCU_TRACE=y</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> CONFIG_MATH_EMULATION=y</div><div class='hunk'>@@ -209,14 +225,18 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> CONFIG_CMDLINE_BOOL=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='ctx'> </div><div class='hunk'>@@ -225,6 +245,8 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -235,6 +257,7 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCI_DEBUG is not set</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Advanced setup</div><div class='hunk'>@@ -244,17 +267,13 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> #</div><div class='ctx'> # Default settings for advanced configuration options are used</div><div class='ctx'> #</div><div class='del'>-CONFIG_HIGHMEM_START=0xfe000000</div><div class='ctx'> CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-CONFIG_BOOT_LOAD=0x01000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -292,8 +311,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -343,6 +360,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -355,6 +374,7 @@ CONFIG_MTD_PARTITIONS=y</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='ctx'> CONFIG_MTD_CMDLINE_PARTS=y</div><div class='ctx'> CONFIG_MTD_OF_PARTS=y</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # User Modules And Translation Layers</div><div class='hunk'>@@ -445,12 +465,14 @@ CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> # CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -468,6 +490,10 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='hunk'>@@ -475,7 +501,6 @@ CONFIG_MACINTOSH_DRIVERS=y</div><div class='ctx'> # CONFIG_MAC_EMUMOUSEBTN is not set</div><div class='ctx'> # CONFIG_WINDFARM is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -492,7 +517,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -502,12 +526,12 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -520,6 +544,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_MLX4_CORE is not set</div><div class='ctx'> # CONFIG_TEHUTI is not set</div><div class='ctx'> # CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -527,6 +552,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='hunk'>@@ -553,6 +579,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -591,12 +618,9 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='hunk'>@@ -612,13 +636,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> CONFIG_DAB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -635,16 +670,14 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -653,13 +686,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -674,7 +705,6 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='hunk'>@@ -733,6 +763,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -743,14 +774,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -771,8 +800,10 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -783,6 +814,7 @@ CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='ctx'> CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -790,6 +822,7 @@ CONFIG_HAS_DMA=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='hunk'>@@ -797,9 +830,12 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='hunk'>@@ -812,19 +848,30 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-CONFIG_DEBUGGER=y</div><div class='del'>-# CONFIG_KGDB is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='ctx'> # CONFIG_XMON is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> CONFIG_PPC_EARLY_DEBUG=y</div><div class='hunk'>@@ -849,51 +896,85 @@ CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='del'>-# CONFIG_CRYPTO_SEQIV is not set</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=y</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=y</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=y</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CTR is not set</div><div class='del'>-# CONFIG_CRYPTO_GCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='ctx'> # CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/44x/sam440ep_defconfig b/arch/powerpc/configs/44x/sam440ep_defconfig<br/>index 9ce5cbc2a4e7..0ed2de05f4e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/sam440ep_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/44x/sam440ep_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/sam440ep_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/sam440ep_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25</div><div class='del'>-# Mon May  5 13:43:02 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 09:12:48 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -30,9 +30,11 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_GET_USER_PAGES_FAST is not set</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -116,15 +118,22 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -135,6 +144,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -154,8 +164,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -169,6 +177,7 @@ CONFIG_SAM440EP=y</div><div class='ctx'> # CONFIG_WARP is not set</div><div class='ctx'> # CONFIG_CANYONLANDS is not set</div><div class='ctx'> # CONFIG_YOSEMITE is not set</div><div class='add'>+# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set</div><div class='ctx'> CONFIG_440EP=y</div><div class='ctx'> CONFIG_IBM440EP_ERR42=y</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='hunk'>@@ -220,6 +229,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -228,6 +238,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> CONFIG_CMDLINE_BOOL=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='ctx'> </div><div class='hunk'>@@ -237,6 +248,7 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -263,10 +275,6 @@ CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -353,6 +361,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> CONFIG_CONNECTOR=y</div><div class='ctx'> CONFIG_PROC_EVENTS=y</div><div class='hunk'>@@ -379,6 +389,7 @@ CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> # CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> # CONFIG_MISC_DEVICES is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='hunk'>@@ -422,6 +433,7 @@ CONFIG_SCSI_WAIT_SCAN=m</div><div class='ctx'> # CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='ctx'> # CONFIG_SCSI_SRP_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_LOWLEVEL is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_SATA_PMP is not set</div><div class='hunk'>@@ -481,18 +493,22 @@ CONFIG_SATA_SIL=y</div><div class='ctx'> # CONFIG_PATA_VIA is not set</div><div class='ctx'> # CONFIG_PATA_WINBOND is not set</div><div class='ctx'> # CONFIG_PATA_PLATFORM is not set</div><div class='add'>+# CONFIG_PATA_SCH is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -531,7 +547,6 @@ CONFIG_IBM_NEW_EMAC_ZMII=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='del'>-# CONFIG_IWLWIFI is not set</div><div class='ctx'> # CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -607,12 +622,14 @@ CONFIG_SERIO_SERPORT=y</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -661,40 +678,60 @@ CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_IBM_IIC=y</div><div class='del'>-# CONFIG_I2C_MPC is not set</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_IBM_IIC=y</div><div class='add'>+# CONFIG_I2C_MPC is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -703,10 +740,13 @@ CONFIG_I2C_IBM_IIC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -718,6 +758,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -730,6 +771,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia drivers</div><div class='hunk'>@@ -755,7 +797,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='ctx'> # CONFIG_FB_FOREIGN_ENDIAN is not set</div><div class='ctx'> # CONFIG_FB_SYS_FOPS is not set</div><div class='del'>-CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> # CONFIG_FB_SVGALIB is not set</div><div class='ctx'> CONFIG_FB_MACMODES=y</div><div class='ctx'> CONFIG_FB_BACKLIGHT=y</div><div class='hunk'>@@ -795,10 +836,13 @@ CONFIG_FB_RADEON_BACKLIGHT=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='ctx'> # CONFIG_FB_IBM_GXT4500 is not set</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='ctx'> CONFIG_LCD_CLASS_DEVICE=y</div><div class='add'>+# CONFIG_LCD_ILI9320 is not set</div><div class='add'>+# CONFIG_LCD_PLATFORM is not set</div><div class='ctx'> CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='ctx'> # CONFIG_BACKLIGHT_CORGI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -821,10 +865,6 @@ CONFIG_LOGO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_MONO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_VGA16=y</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -859,11 +899,13 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='ctx'> CONFIG_USB_EHCI_HCD=m</div><div class='ctx'> # CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='ctx'> # CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='ctx'> CONFIG_USB_EHCI_HCD_PPC_OF=y</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='ctx'> CONFIG_USB_OHCI_HCD_PPC_OF=y</div><div class='ctx'> CONFIG_USB_OHCI_HCD_PPC_OF_BE=y</div><div class='hunk'>@@ -881,6 +923,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> # CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -900,6 +943,7 @@ CONFIG_USB_STORAGE=m</div><div class='ctx'> # CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='hunk'>@@ -939,6 +983,7 @@ CONFIG_USB_STORAGE=m</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='hunk'>@@ -976,6 +1021,7 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> CONFIG_RTC_DRV_M41T80=y</div><div class='ctx'> CONFIG_RTC_DRV_M41T80_WDT=y</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -996,6 +1042,7 @@ CONFIG_RTC_DRV_M41T80_WDT=y</div><div class='ctx'> #</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_PPC is not set</div><div class='ctx'> # CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1074,6 +1121,7 @@ CONFIG_AFFS_FS=m</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1151,6 +1199,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=y</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1177,7 +1226,15 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/configs/44x/sequoia_defconfig b/arch/powerpc/configs/44x/sequoia_defconfig<br/>index dd5d6303c396..e40b1023265c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/sequoia_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/44x/sequoia_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/sequoia_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/sequoia_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25-rc2</div><div class='del'>-# Fri Feb 15 21:53:46 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 09:15:13 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -30,8 +30,12 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_GET_USER_PAGES_FAST is not set</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='hunk'>@@ -79,6 +83,7 @@ CONFIG_GROUP_SCHED=y</div><div class='ctx'> CONFIG_USER_SCHED=y</div><div class='ctx'> # CONFIG_CGROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='ctx'> # CONFIG_NAMESPACES is not set</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='hunk'>@@ -87,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -112,13 +118,22 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -129,6 +144,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -143,24 +159,25 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> CONFIG_CLASSIC_RCU=y</div><div class='del'>-# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> # CONFIG_PPC4xx_PCI_EXPRESS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='ctx'> # CONFIG_BAMBOO is not set</div><div class='ctx'> # CONFIG_EBONY is not set</div><div class='add'>+# CONFIG_SAM440EP is not set</div><div class='ctx'> CONFIG_SEQUOIA=y</div><div class='ctx'> # CONFIG_TAISHAN is not set</div><div class='ctx'> # CONFIG_KATMAI is not set</div><div class='ctx'> # CONFIG_RAINIER is not set</div><div class='ctx'> # CONFIG_WARP is not set</div><div class='add'>+# CONFIG_CANYONLANDS is not set</div><div class='add'>+# CONFIG_YOSEMITE is not set</div><div class='add'>+# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set</div><div class='ctx'> CONFIG_440EPX=y</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='ctx'> # CONFIG_MPIC is not set</div><div class='hunk'>@@ -192,7 +209,6 @@ CONFIG_HZ=250</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='del'>-CONFIG_RCU_TRACE=y</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> # CONFIG_MATH_EMULATION is not set</div><div class='hunk'>@@ -210,14 +226,18 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> CONFIG_CMDLINE_BOOL=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='ctx'> </div><div class='hunk'>@@ -226,6 +246,8 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -236,6 +258,7 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCI_DEBUG is not set</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Advanced setup</div><div class='hunk'>@@ -245,17 +268,13 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> #</div><div class='ctx'> # Default settings for advanced configuration options are used</div><div class='ctx'> #</div><div class='del'>-CONFIG_HIGHMEM_START=0xfe000000</div><div class='ctx'> CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-CONFIG_BOOT_LOAD=0x01000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -293,8 +312,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -344,6 +361,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -356,6 +375,7 @@ CONFIG_MTD_PARTITIONS=y</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='ctx'> CONFIG_MTD_CMDLINE_PARTS=y</div><div class='ctx'> CONFIG_MTD_OF_PARTS=y</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # User Modules And Translation Layers</div><div class='hunk'>@@ -446,12 +466,14 @@ CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> # CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -469,12 +491,15 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -509,7 +534,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -519,12 +543,12 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -537,6 +561,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_MLX4_CORE is not set</div><div class='ctx'> # CONFIG_TEHUTI is not set</div><div class='ctx'> # CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -544,6 +569,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='hunk'>@@ -570,6 +596,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -608,12 +635,9 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='hunk'>@@ -629,13 +653,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> CONFIG_DAB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -652,16 +687,14 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -670,13 +703,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -691,7 +722,6 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='hunk'>@@ -750,6 +780,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -760,14 +791,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -788,8 +817,10 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -800,6 +831,7 @@ CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='ctx'> CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -807,6 +839,7 @@ CONFIG_HAS_DMA=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='hunk'>@@ -814,9 +847,12 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='hunk'>@@ -829,19 +865,30 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-CONFIG_DEBUGGER=y</div><div class='del'>-# CONFIG_KGDB is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='ctx'> # CONFIG_XMON is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> CONFIG_PPC_EARLY_DEBUG=y</div><div class='hunk'>@@ -866,51 +913,85 @@ CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='del'>-# CONFIG_CRYPTO_SEQIV is not set</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=y</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=y</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=y</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CTR is not set</div><div class='del'>-# CONFIG_CRYPTO_GCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='ctx'> # CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/44x/taishan_defconfig b/arch/powerpc/configs/44x/taishan_defconfig<br/>index e53c92655bd6..5075873bdb1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/taishan_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/44x/taishan_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/taishan_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/taishan_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25-rc2</div><div class='del'>-# Fri Feb 15 21:40:44 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 09:17:48 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -29,8 +29,12 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_GET_USER_PAGES_FAST is not set</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='hunk'>@@ -78,6 +82,7 @@ CONFIG_FAIR_GROUP_SCHED=y</div><div class='ctx'> CONFIG_USER_SCHED=y</div><div class='ctx'> # CONFIG_CGROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='ctx'> # CONFIG_NAMESPACES is not set</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='hunk'>@@ -86,6 +91,7 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -111,13 +117,22 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -128,6 +143,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -142,24 +158,25 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> CONFIG_CLASSIC_RCU=y</div><div class='del'>-# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> # CONFIG_PPC4xx_PCI_EXPRESS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='ctx'> # CONFIG_BAMBOO is not set</div><div class='ctx'> # CONFIG_EBONY is not set</div><div class='add'>+# CONFIG_SAM440EP is not set</div><div class='ctx'> # CONFIG_SEQUOIA is not set</div><div class='ctx'> CONFIG_TAISHAN=y</div><div class='ctx'> # CONFIG_KATMAI is not set</div><div class='ctx'> # CONFIG_RAINIER is not set</div><div class='ctx'> # CONFIG_WARP is not set</div><div class='add'>+# CONFIG_CANYONLANDS is not set</div><div class='add'>+# CONFIG_YOSEMITE is not set</div><div class='add'>+# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set</div><div class='ctx'> CONFIG_440GX=y</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='ctx'> # CONFIG_MPIC is not set</div><div class='hunk'>@@ -191,7 +208,6 @@ CONFIG_HZ=250</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='del'>-CONFIG_RCU_TRACE=y</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> # CONFIG_MATH_EMULATION is not set</div><div class='hunk'>@@ -209,14 +225,18 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> CONFIG_CMDLINE_BOOL=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='ctx'> </div><div class='hunk'>@@ -225,6 +245,8 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -235,6 +257,7 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCI_DEBUG is not set</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Advanced setup</div><div class='hunk'>@@ -244,17 +267,13 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> #</div><div class='ctx'> # Default settings for advanced configuration options are used</div><div class='ctx'> #</div><div class='del'>-CONFIG_HIGHMEM_START=0xfe000000</div><div class='ctx'> CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-CONFIG_BOOT_LOAD=0x01000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -292,8 +311,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -343,6 +360,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -354,6 +373,8 @@ CONFIG_MTD=y</div><div class='ctx'> CONFIG_MTD_PARTITIONS=y</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='ctx'> CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+# CONFIG_MTD_OF_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # User Modules And Translation Layers</div><div class='hunk'>@@ -444,12 +465,14 @@ CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> # CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -467,6 +490,10 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='hunk'>@@ -474,7 +501,6 @@ CONFIG_MACINTOSH_DRIVERS=y</div><div class='ctx'> # CONFIG_MAC_EMUMOUSEBTN is not set</div><div class='ctx'> # CONFIG_WINDFARM is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -509,7 +535,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -519,12 +544,12 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -537,6 +562,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_MLX4_CORE is not set</div><div class='ctx'> # CONFIG_TEHUTI is not set</div><div class='ctx'> # CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -544,6 +570,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='hunk'>@@ -570,6 +597,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -608,12 +636,9 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='hunk'>@@ -629,13 +654,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> CONFIG_DAB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -652,16 +688,14 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -670,13 +704,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -691,7 +723,6 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='hunk'>@@ -740,6 +771,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -750,14 +782,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -778,8 +808,10 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -789,6 +821,7 @@ CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='ctx'> CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -796,6 +829,7 @@ CONFIG_HAS_DMA=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='hunk'>@@ -803,9 +837,12 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='hunk'>@@ -818,19 +855,30 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-CONFIG_DEBUGGER=y</div><div class='del'>-# CONFIG_KGDB is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='ctx'> # CONFIG_XMON is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -842,51 +890,85 @@ CONFIG_DEBUGGER=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='del'>-# CONFIG_CRYPTO_SEQIV is not set</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=y</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=y</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=y</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CTR is not set</div><div class='del'>-# CONFIG_CRYPTO_GCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='ctx'> # CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/44x/virtex5_defconfig b/arch/powerpc/configs/44x/virtex5_defconfig<br/>index 9c41f66b5a7d..663ec512b33b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/virtex5_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/44x/virtex5_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/virtex5_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/virtex5_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc8</div><div class='del'>-# Wed Jul  2 15:36:41 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 09:20:16 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -29,9 +29,11 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_GET_USER_PAGES_FAST is not set</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -115,10 +117,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -135,6 +143,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -154,13 +163,12 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='ctx'> # CONFIG_BAMBOO is not set</div><div class='ctx'> # CONFIG_EBONY is not set</div><div class='add'>+# CONFIG_SAM440EP is not set</div><div class='ctx'> # CONFIG_SEQUOIA is not set</div><div class='ctx'> # CONFIG_TAISHAN is not set</div><div class='ctx'> # CONFIG_KATMAI is not set</div><div class='hunk'>@@ -221,6 +229,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -239,6 +248,7 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -265,10 +275,6 @@ CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -446,7 +452,9 @@ CONFIG_IP_NF_MANGLE=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-# CONFIG_FW_LOADER is not set</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='hunk'>@@ -471,12 +479,14 @@ CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> # CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -503,7 +513,6 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -532,7 +541,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -547,6 +555,7 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> # CONFIG_NETDEV_10000 is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='hunk'>@@ -619,12 +628,14 @@ CONFIG_SERIO_SERPORT=y</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -670,39 +681,59 @@ CONFIG_I2C_CHARDEV=y</div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-# CONFIG_I2C_IBM_IIC is not set</div><div class='del'>-# CONFIG_I2C_MPC is not set</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_IBM_IIC is not set</div><div class='add'>+# CONFIG_I2C_MPC is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -711,10 +742,13 @@ CONFIG_I2C_DEBUG_ALGO=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -726,6 +760,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -799,6 +834,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='ctx'> # CONFIG_FB_IBM_GXT4500 is not set</div><div class='ctx'> CONFIG_FB_XILINX=y</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='hunk'>@@ -831,10 +867,6 @@ CONFIG_LOGO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_MONO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_VGA16=y</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_HID_SUPPORT is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='hunk'>@@ -910,6 +942,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> CONFIG_ROMFS_FS=y</div><div class='hunk'>@@ -920,17 +953,16 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=y</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=y</div><div class='hunk'>@@ -994,6 +1026,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=y</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1018,7 +1051,16 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_PREEMPT_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1071,6 +1113,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='head'>diff --git a/arch/powerpc/configs/44x/warp_defconfig b/arch/powerpc/configs/44x/warp_defconfig<br/>index 2313c3e8ef61..d9375a969c67 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/warp_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/44x/warp_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/warp_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/44x/warp_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25-rc2</div><div class='del'>-# Fri Feb 15 21:54:43 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 09:23:39 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -30,8 +30,12 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_GET_USER_PAGES_FAST is not set</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='hunk'>@@ -79,6 +83,7 @@ CONFIG_FAIR_GROUP_SCHED=y</div><div class='ctx'> CONFIG_USER_SCHED=y</div><div class='ctx'> # CONFIG_CGROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='ctx'> # CONFIG_NAMESPACES is not set</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='hunk'>@@ -87,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -111,13 +117,22 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -128,6 +143,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -142,23 +158,24 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> CONFIG_CLASSIC_RCU=y</div><div class='del'>-# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='ctx'> # CONFIG_BAMBOO is not set</div><div class='ctx'> # CONFIG_EBONY is not set</div><div class='add'>+# CONFIG_SAM440EP is not set</div><div class='ctx'> # CONFIG_SEQUOIA is not set</div><div class='ctx'> # CONFIG_TAISHAN is not set</div><div class='ctx'> # CONFIG_KATMAI is not set</div><div class='ctx'> # CONFIG_RAINIER is not set</div><div class='ctx'> CONFIG_WARP=y</div><div class='add'>+# CONFIG_CANYONLANDS is not set</div><div class='add'>+# CONFIG_YOSEMITE is not set</div><div class='add'>+# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set</div><div class='ctx'> CONFIG_440EP=y</div><div class='ctx'> CONFIG_IBM440EP_ERR42=y</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='hunk'>@@ -191,7 +208,6 @@ CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='del'>-CONFIG_RCU_TRACE=y</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> # CONFIG_MATH_EMULATION is not set</div><div class='hunk'>@@ -209,14 +225,18 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> CONFIG_CMDLINE_BOOL=y</div><div class='ctx'> CONFIG_CMDLINE="ip=on"</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='ctx'> </div><div class='hunk'>@@ -224,10 +244,13 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> # CONFIG_PCI is not set</div><div class='ctx'> # CONFIG_PCI_DOMAINS is not set</div><div class='ctx'> # CONFIG_PCI_SYSCALL is not set</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Advanced setup</div><div class='hunk'>@@ -237,17 +260,13 @@ CONFIG_ZONE_DMA=y</div><div class='ctx'> #</div><div class='ctx'> # Default settings for advanced configuration options are used</div><div class='ctx'> #</div><div class='del'>-CONFIG_HIGHMEM_START=0xfe000000</div><div class='ctx'> CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-CONFIG_BOOT_LOAD=0x01000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -291,8 +310,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IP_VS is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='hunk'>@@ -318,6 +335,7 @@ CONFIG_NETFILTER_ADVANCED=y</div><div class='ctx'> # CONFIG_ATM is not set</div><div class='ctx'> # CONFIG_BRIDGE is not set</div><div class='ctx'> CONFIG_VLAN_8021Q=y</div><div class='add'>+# CONFIG_VLAN_8021Q_GVRP is not set</div><div class='ctx'> # CONFIG_DECNET is not set</div><div class='ctx'> # CONFIG_LLC2 is not set</div><div class='ctx'> # CONFIG_IPX is not set</div><div class='hunk'>@@ -368,6 +386,7 @@ CONFIG_MTD_PARTITIONS=y</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='ctx'> # CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='ctx'> CONFIG_MTD_OF_PARTS=y</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # User Modules And Translation Layers</div><div class='hunk'>@@ -446,6 +465,7 @@ CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_UBI is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='hunk'>@@ -460,6 +480,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> # CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -504,11 +525,11 @@ CONFIG_SCSI_SPI_ATTRS=y</div><div class='ctx'> # CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='ctx'> # CONFIG_SCSI_SRP_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_LOWLEVEL is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -538,6 +559,7 @@ CONFIG_IBM_NEW_EMAC_ZMII=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Network Adapters</div><div class='hunk'>@@ -571,6 +593,7 @@ CONFIG_IBM_NEW_EMAC_ZMII=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -608,44 +631,49 @@ CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> # CONFIG_I2C_CHARDEV is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# I2C Algorithms</div><div class='add'>+# I2C Hardware Bus support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_I2C_ALGOBIT is not set</div><div class='del'>-# CONFIG_I2C_ALGOPCF is not set</div><div class='del'>-# CONFIG_I2C_ALGOPCA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# I2C Hardware Bus support</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='ctx'> #</div><div class='add'>+# CONFIG_I2C_IBM_IIC is not set</div><div class='ctx'> # CONFIG_I2C_MPC is not set</div><div class='ctx'> # CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='ctx'> # CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> CONFIG_SENSORS_EEPROM=y</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='del'>-# CONFIG_TPS65010 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CORE is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_ALGO is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='hunk'>@@ -658,6 +686,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_ADM1031 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM9240 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7470 is not set</div><div class='add'>+# CONFIG_SENSORS_ADT7473 is not set</div><div class='ctx'> # CONFIG_SENSORS_ATXP1 is not set</div><div class='ctx'> # CONFIG_SENSORS_DS1621 is not set</div><div class='ctx'> # CONFIG_SENSORS_F71805F is not set</div><div class='hunk'>@@ -698,6 +727,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> CONFIG_THERMAL=y</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -709,13 +739,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -730,10 +771,6 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='hunk'>@@ -750,11 +787,15 @@ CONFIG_USB=y</div><div class='ctx'> CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='ctx'> CONFIG_USB_OHCI_HCD_PPC_OF=y</div><div class='ctx'> CONFIG_USB_OHCI_HCD_PPC_OF_BE=y</div><div class='hunk'>@@ -770,6 +811,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> # CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -790,6 +832,7 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -825,6 +868,7 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> CONFIG_MMC=m</div><div class='ctx'> # CONFIG_MMC_DEBUG is not set</div><div class='hunk'>@@ -836,19 +880,19 @@ CONFIG_MMC=m</div><div class='ctx'> CONFIG_MMC_BLOCK=m</div><div class='ctx'> CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='ctx'> # CONFIG_SDIO_UART is not set</div><div class='add'>+# CONFIG_MMC_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MMC/SD Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MMC_SDHCI is not set</div><div class='ctx'> # CONFIG_MMC_WBSD is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -863,7 +907,6 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='hunk'>@@ -924,6 +967,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -934,14 +978,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1001,8 +1043,10 @@ CONFIG_NLS_UTF8=y</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=y</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1013,6 +1057,7 @@ CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='ctx'> CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -1020,6 +1065,7 @@ CONFIG_HAS_DMA=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='hunk'>@@ -1027,9 +1073,12 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> # CONFIG_SCHED_DEBUG is not set</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_DEBUG_SLAB is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='ctx'> # CONFIG_RT_MUTEX_TESTER is not set</div><div class='hunk'>@@ -1041,17 +1090,30 @@ CONFIG_DETECT_SOFTLOCKUP=y</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> CONFIG_BDI_SWITCH=y</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -1063,48 +1125,82 @@ CONFIG_BDI_SWITCH=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='del'>-# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_MANAGER is not set</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CBC is not set</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+# CONFIG_CRYPTO_ECB is not set</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-# CONFIG_CRYPTO_ECB is not set</div><div class='del'>-# CONFIG_CRYPTO_CBC is not set</div><div class='del'>-# CONFIG_CRYPTO_PCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CTR is not set</div><div class='del'>-# CONFIG_CRYPTO_GCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-# CONFIG_CRYPTO_DES is not set</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_DES is not set</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='ctx'> # CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig<br/>index 60bb4d106c87..5e6780a088ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/asp8347_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/asp8347_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/asp8347_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/asp8347_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25-rc6</div><div class='del'>-# Tue May  6 02:21:00 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:01 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -16,6 +16,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> CONFIG_FSL_EMB_PERFMON=y</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -31,6 +32,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='hunk'>@@ -50,6 +54,9 @@ CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> # CONFIG_DEFAULT_UIMAGE is not set</div><div class='ctx'> CONFIG_REDBOOT=y</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -92,6 +99,7 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -109,24 +117,33 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -145,38 +162,49 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-CONFIG_PPC_83xx=y</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='del'>-CONFIG_MPC83xx=y</div><div class='add'>+CONFIG_PPC_83xx=y</div><div class='ctx'> # CONFIG_MPC831x_RDB is not set</div><div class='ctx'> # CONFIG_MPC832x_MDS is not set</div><div class='ctx'> # CONFIG_MPC832x_RDB is not set</div><div class='ctx'> # CONFIG_MPC834x_MDS is not set</div><div class='ctx'> # CONFIG_MPC834x_ITX is not set</div><div class='ctx'> # CONFIG_MPC836x_MDS is not set</div><div class='add'>+# CONFIG_MPC836x_RDK is not set</div><div class='ctx'> # CONFIG_MPC837x_MDS is not set</div><div class='ctx'> # CONFIG_MPC837x_RDB is not set</div><div class='ctx'> # CONFIG_SBC834x is not set</div><div class='ctx'> CONFIG_ASP834x=y</div><div class='ctx'> CONFIG_PPC_MPC834x=y</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> CONFIG_IPIC=y</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -192,7 +220,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -202,6 +230,7 @@ CONFIG_BINFMT_ELF=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='hunk'>@@ -212,13 +241,17 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -226,10 +259,13 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -239,6 +275,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y</div><div class='ctx'> CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Advanced setup</div><div class='hunk'>@@ -248,15 +285,11 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> #</div><div class='ctx'> # Default settings for advanced configuration options are used</div><div class='ctx'> #</div><div class='del'>-CONFIG_HIGHMEM_START=0xfe000000</div><div class='ctx'> CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-CONFIG_BOOT_LOAD=0x00800000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -300,8 +333,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -363,6 +394,7 @@ CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set</div><div class='ctx'> # CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='ctx'> CONFIG_MTD_OF_PARTS=y</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # User Modules And Translation Layers</div><div class='hunk'>@@ -434,9 +466,11 @@ CONFIG_MTD_PHYSMAP_OF=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_UBI is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_DA is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='hunk'>@@ -453,12 +487,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -476,12 +512,15 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -508,6 +547,8 @@ CONFIG_PHYLIB=y</div><div class='ctx'> # CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_MACE is not set</div><div class='add'>+# CONFIG_BMAC is not set</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='ctx'> # CONFIG_SUNGEM is not set</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='hunk'>@@ -525,7 +566,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -535,14 +575,14 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-# CONFIG_GFAR_NAPI is not set</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> # CONFIG_NETDEV_10000 is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='hunk'>@@ -551,6 +591,7 @@ CONFIG_GIANFAR=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Network Adapters</div><div class='hunk'>@@ -606,6 +647,7 @@ CONFIG_INPUT=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -625,16 +667,17 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='ctx'> # CONFIG_SERIAL_JSM is not set</div><div class='ctx'> # CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='del'>-CONFIG_GEN_RTC=y</div><div class='del'>-# CONFIG_GEN_RTC_X is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_APPLICOM is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='hunk'>@@ -643,16 +686,14 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# I2C Algorithms</div><div class='add'>+# I2C Hardware Bus support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_I2C_ALGOBIT is not set</div><div class='del'>-# CONFIG_I2C_ALGOPCF is not set</div><div class='del'>-# CONFIG_I2C_ALGOPCA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# I2C Hardware Bus support</div><div class='add'>+# PC SMBus host controller drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='hunk'>@@ -660,50 +701,70 @@ CONFIG_I2C_CHARDEV=y</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='del'>-# CONFIG_TPS65010 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CORE is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_ALGO is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -713,6 +774,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_ADM9240 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7470 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_AMS is not set</div><div class='ctx'> # CONFIG_SENSORS_ATXP1 is not set</div><div class='ctx'> # CONFIG_SENSORS_DS1621 is not set</div><div class='ctx'> # CONFIG_SENSORS_I5K_AMB is not set</div><div class='hunk'>@@ -757,6 +819,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> CONFIG_THERMAL=y</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -764,7 +827,9 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='del'>-CONFIG_83xx_WDT=y</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='add'>+# CONFIG_8xxx_WDT is not set</div><div class='add'>+# CONFIG_WATCHDOG_RTAS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCI-based Watchdog Cards</div><div class='hunk'>@@ -786,13 +851,25 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> CONFIG_DAB=y</div><div class='ctx'> # CONFIG_USB_DABUSB is not set</div><div class='ctx'> </div><div class='hunk'>@@ -810,10 +887,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_HID_SUPPORT is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='hunk'>@@ -831,16 +904,21 @@ CONFIG_USB=y</div><div class='ctx'> CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='ctx'> CONFIG_USB_EHCI_HCD=y</div><div class='ctx'> CONFIG_USB_EHCI_ROOT_HUB_TT=y</div><div class='ctx'> # CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='ctx'> CONFIG_USB_EHCI_FSL=y</div><div class='ctx'> CONFIG_USB_EHCI_HCD_PPC_OF=y</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='ctx'> # CONFIG_USB_OHCI_HCD is not set</div><div class='ctx'> # CONFIG_USB_UHCI_HCD is not set</div><div class='ctx'> # CONFIG_USB_SL811_HCD is not set</div><div class='hunk'>@@ -851,6 +929,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> # CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -865,7 +944,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y</div><div class='ctx'> # USB Imaging devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -878,7 +956,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -894,18 +971,16 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> CONFIG_RTC_LIB=y</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Conflicting RTC option has been selected, check GEN_RTC and RTC</div><div class='del'>-#</div><div class='ctx'> CONFIG_RTC_HCTOSYS=y</div><div class='ctx'> CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='ctx'> # CONFIG_RTC_DEBUG is not set</div><div class='hunk'>@@ -933,6 +1008,7 @@ CONFIG_RTC_DRV_DS1374=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -953,11 +1029,8 @@ CONFIG_RTC_DRV_DS1374=y</div><div class='ctx'> #</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_PPC is not set</div><div class='ctx'> # CONFIG_DMADEVICES is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -977,7 +1050,6 @@ CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='hunk'>@@ -1036,6 +1108,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1046,15 +1119,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1126,8 +1197,10 @@ CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1146,6 +1219,7 @@ CONFIG_HAVE_LMB=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1154,7 +1228,18 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+# CONFIG_SYSCTL_SYSCALL_CHECK is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1164,51 +1249,86 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='del'>-# CONFIG_CRYPTO_SEQIV is not set</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=m</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=m</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=m</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=m</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CTR is not set</div><div class='del'>-# CONFIG_CRYPTO_GCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='ctx'> # CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig<br/>index 5428f9f5ed85..2028337868b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/83xx/mpc8313_rdb_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc8313_rdb_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:21 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:17 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -16,6 +16,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> # CONFIG_FSL_EMB_PERFMON is not set</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -111,10 +116,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-CONFIG_PPC_83xx=y</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='del'>-CONFIG_MPC83xx=y</div><div class='add'>+CONFIG_PPC_83xx=y</div><div class='ctx'> CONFIG_MPC831x_RDB=y</div><div class='ctx'> # CONFIG_MPC832x_MDS is not set</div><div class='ctx'> # CONFIG_MPC832x_RDB is not set</div><div class='ctx'> # CONFIG_MPC834x_MDS is not set</div><div class='ctx'> # CONFIG_MPC834x_ITX is not set</div><div class='ctx'> # CONFIG_MPC836x_MDS is not set</div><div class='add'>+# CONFIG_MPC836x_RDK is not set</div><div class='ctx'> # CONFIG_MPC837x_MDS is not set</div><div class='ctx'> # CONFIG_MPC837x_RDB is not set</div><div class='ctx'> # CONFIG_SBC834x is not set</div><div class='add'>+# CONFIG_ASP834x is not set</div><div class='ctx'> CONFIG_PPC_MPC831x=y</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> CONFIG_IPIC=y</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -195,7 +219,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='hunk'>@@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -260,10 +290,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -452,9 +478,11 @@ CONFIG_MTD_NAND_FSL_ELBC=y</div><div class='ctx'> # CONFIG_MTD_UBI is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='ctx'> CONFIG_OF_I2C=y</div><div class='add'>+CONFIG_OF_SPI=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_DA is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='hunk'>@@ -471,12 +499,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -553,7 +583,10 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_DC390T is not set</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_MESH is not set</div><div class='add'>+# CONFIG_SCSI_MAC53C94 is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=y</div><div class='hunk'>@@ -570,12 +603,15 @@ CONFIG_MD_RAID1=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -602,6 +638,8 @@ CONFIG_CICADA_PHY=y</div><div class='ctx'> # CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_MACE is not set</div><div class='add'>+# CONFIG_BMAC is not set</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='ctx'> # CONFIG_SUNGEM is not set</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='hunk'>@@ -638,7 +676,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -652,9 +689,10 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -752,11 +790,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='ctx'> # CONFIG_SERIAL_JSM is not set</div><div class='ctx'> # CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='hunk'>@@ -768,43 +809,70 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -828,11 +896,15 @@ CONFIG_SPI_MPC83xx=y</div><div class='ctx'> # CONFIG_SPI_AT25 is not set</div><div class='ctx'> # CONFIG_SPI_SPIDEV is not set</div><div class='ctx'> # CONFIG_SPI_TLE62X0 is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='add'>+# CONFIG_SENSORS_ADCXX is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1026 is not set</div><div class='hunk'>@@ -841,6 +913,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_ADM9240 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7470 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_AMS is not set</div><div class='ctx'> # CONFIG_SENSORS_ATXP1 is not set</div><div class='ctx'> # CONFIG_SENSORS_DS1621 is not set</div><div class='ctx'> # CONFIG_SENSORS_I5K_AMB is not set</div><div class='hunk'>@@ -886,6 +959,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -893,7 +967,9 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='del'>-CONFIG_83xx_WDT=y</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='add'>+# CONFIG_8xxx_WDT is not set</div><div class='add'>+# CONFIG_WATCHDOG_RTAS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCI-based Watchdog Cards</div><div class='hunk'>@@ -915,8 +991,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -949,10 +1027,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -986,6 +1060,7 @@ CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1009,6 +1084,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> CONFIG_USB_UHCI_HCD=y</div><div class='ctx'> # CONFIG_USB_SL811_HCD is not set</div><div class='ctx'> # CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+# CONFIG_USB_GADGET_MUSB_HDRC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Device Class drivers</div><div class='hunk'>@@ -1037,6 +1113,7 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1045,7 +1122,6 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1058,7 +1134,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1085,7 +1160,7 @@ CONFIG_USB_GADGET_SELECTED=y</div><div class='ctx'> # CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='ctx'> CONFIG_USB_GADGET_NET2280=y</div><div class='ctx'> CONFIG_USB_NET2280=y</div><div class='del'>-# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA25X is not set</div><div class='ctx'> # CONFIG_USB_GADGET_M66592 is not set</div><div class='ctx'> # CONFIG_USB_GADGET_PXA27X is not set</div><div class='ctx'> # CONFIG_USB_GADGET_GOKU is not set</div><div class='hunk'>@@ -1103,6 +1178,7 @@ CONFIG_USB_ETH_RNDIS=y</div><div class='ctx'> # CONFIG_USB_G_SERIAL is not set</div><div class='ctx'> # CONFIG_USB_MIDI_GADGET is not set</div><div class='ctx'> # CONFIG_USB_G_PRINTER is not set</div><div class='add'>+# CONFIG_USB_CDC_COMPOSITE is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='hunk'>@@ -1138,10 +1214,13 @@ CONFIG_RTC_DRV_DS1307=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_M41T94 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1305 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_MAX6902 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_R9701 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_RS5C348 is not set</div><div class='hunk'>@@ -1240,6 +1319,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1250,14 +1330,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1297,6 +1376,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1323,6 +1403,8 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1340,19 +1422,32 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1406,6 +1501,10 @@ CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1438,5 +1537,6 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig<br/>index 9bc3a03ae264..dd80eb0a87a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/83xx/mpc8315_rdb_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc8315_rdb_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:21 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:18 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -16,6 +16,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> # CONFIG_FSL_EMB_PERFMON is not set</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -111,10 +116,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-CONFIG_PPC_83xx=y</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='del'>-CONFIG_MPC83xx=y</div><div class='add'>+CONFIG_PPC_83xx=y</div><div class='ctx'> CONFIG_MPC831x_RDB=y</div><div class='ctx'> # CONFIG_MPC832x_MDS is not set</div><div class='ctx'> # CONFIG_MPC832x_RDB is not set</div><div class='ctx'> # CONFIG_MPC834x_MDS is not set</div><div class='ctx'> # CONFIG_MPC834x_ITX is not set</div><div class='ctx'> # CONFIG_MPC836x_MDS is not set</div><div class='add'>+# CONFIG_MPC836x_RDK is not set</div><div class='ctx'> # CONFIG_MPC837x_MDS is not set</div><div class='ctx'> # CONFIG_MPC837x_RDB is not set</div><div class='ctx'> # CONFIG_SBC834x is not set</div><div class='add'>+# CONFIG_ASP834x is not set</div><div class='ctx'> CONFIG_PPC_MPC831x=y</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> CONFIG_IPIC=y</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -195,7 +219,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='hunk'>@@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -260,10 +290,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -452,9 +478,11 @@ CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> # CONFIG_MTD_UBI is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='ctx'> CONFIG_OF_I2C=y</div><div class='add'>+CONFIG_OF_SPI=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_DA is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='hunk'>@@ -471,12 +499,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -554,7 +584,10 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_DC390T is not set</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_MESH is not set</div><div class='add'>+# CONFIG_SCSI_MAC53C94 is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='hunk'>@@ -631,12 +664,15 @@ CONFIG_MD_RAID1=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -663,6 +699,8 @@ CONFIG_PHYLIB=y</div><div class='ctx'> # CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_MACE is not set</div><div class='add'>+# CONFIG_BMAC is not set</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='ctx'> # CONFIG_SUNGEM is not set</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='hunk'>@@ -699,7 +737,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -713,9 +750,10 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -813,11 +851,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='ctx'> # CONFIG_SERIAL_JSM is not set</div><div class='ctx'> # CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='hunk'>@@ -829,43 +870,70 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -889,11 +957,15 @@ CONFIG_SPI_MPC83xx=y</div><div class='ctx'> # CONFIG_SPI_AT25 is not set</div><div class='ctx'> # CONFIG_SPI_SPIDEV is not set</div><div class='ctx'> # CONFIG_SPI_TLE62X0 is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='add'>+# CONFIG_SENSORS_ADCXX is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1026 is not set</div><div class='hunk'>@@ -902,6 +974,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_ADM9240 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7470 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_AMS is not set</div><div class='ctx'> # CONFIG_SENSORS_ATXP1 is not set</div><div class='ctx'> # CONFIG_SENSORS_DS1621 is not set</div><div class='ctx'> # CONFIG_SENSORS_I5K_AMB is not set</div><div class='hunk'>@@ -947,6 +1020,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -954,7 +1028,9 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='del'>-CONFIG_83xx_WDT=y</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='add'>+# CONFIG_8xxx_WDT is not set</div><div class='add'>+# CONFIG_WATCHDOG_RTAS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCI-based Watchdog Cards</div><div class='hunk'>@@ -976,8 +1052,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -1010,10 +1088,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -1047,6 +1121,7 @@ CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1070,6 +1145,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> CONFIG_USB_UHCI_HCD=y</div><div class='ctx'> # CONFIG_USB_SL811_HCD is not set</div><div class='ctx'> # CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+# CONFIG_USB_GADGET_MUSB_HDRC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Device Class drivers</div><div class='hunk'>@@ -1098,6 +1174,7 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1106,7 +1183,6 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1119,7 +1195,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1146,7 +1221,7 @@ CONFIG_USB_GADGET_SELECTED=y</div><div class='ctx'> # CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='ctx'> CONFIG_USB_GADGET_NET2280=y</div><div class='ctx'> CONFIG_USB_NET2280=y</div><div class='del'>-# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA25X is not set</div><div class='ctx'> # CONFIG_USB_GADGET_M66592 is not set</div><div class='ctx'> # CONFIG_USB_GADGET_PXA27X is not set</div><div class='ctx'> # CONFIG_USB_GADGET_GOKU is not set</div><div class='hunk'>@@ -1164,6 +1239,7 @@ CONFIG_USB_ETH_RNDIS=y</div><div class='ctx'> # CONFIG_USB_G_SERIAL is not set</div><div class='ctx'> # CONFIG_USB_MIDI_GADGET is not set</div><div class='ctx'> # CONFIG_USB_G_PRINTER is not set</div><div class='add'>+# CONFIG_USB_CDC_COMPOSITE is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='hunk'>@@ -1199,10 +1275,13 @@ CONFIG_RTC_DRV_DS1307=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_M41T94 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1305 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_MAX6902 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_R9701 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_RS5C348 is not set</div><div class='hunk'>@@ -1301,6 +1380,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1311,14 +1391,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1358,6 +1437,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1384,6 +1464,8 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1401,19 +1483,32 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1467,6 +1562,10 @@ CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1499,5 +1598,6 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig<br/>index 1eca26f3659a..bdf50c8a17e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc832x_mds_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/83xx/mpc832x_mds_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc832x_mds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc832x_mds_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:22 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:18 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -16,6 +16,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> # CONFIG_FSL_EMB_PERFMON is not set</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -111,10 +116,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-CONFIG_PPC_83xx=y</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='del'>-CONFIG_MPC83xx=y</div><div class='add'>+CONFIG_PPC_83xx=y</div><div class='ctx'> # CONFIG_MPC831x_RDB is not set</div><div class='ctx'> CONFIG_MPC832x_MDS=y</div><div class='ctx'> # CONFIG_MPC832x_RDB is not set</div><div class='ctx'> # CONFIG_MPC834x_MDS is not set</div><div class='ctx'> # CONFIG_MPC834x_ITX is not set</div><div class='ctx'> # CONFIG_MPC836x_MDS is not set</div><div class='add'>+# CONFIG_MPC836x_RDK is not set</div><div class='ctx'> # CONFIG_MPC837x_MDS is not set</div><div class='ctx'> # CONFIG_MPC837x_RDB is not set</div><div class='ctx'> # CONFIG_SBC834x is not set</div><div class='add'>+# CONFIG_ASP834x is not set</div><div class='ctx'> CONFIG_PPC_MPC832x=y</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> CONFIG_IPIC=y</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> CONFIG_QUICC_ENGINE=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -196,7 +220,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -207,6 +231,7 @@ CONFIG_MATH_EMULATION=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='hunk'>@@ -219,6 +244,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -226,6 +252,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -233,10 +260,13 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -261,10 +291,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -365,6 +391,7 @@ CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_DA is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='hunk'>@@ -380,12 +407,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -462,7 +491,10 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_DC390T is not set</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_MESH is not set</div><div class='add'>+# CONFIG_SCSI_MAC53C94 is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='hunk'>@@ -470,12 +502,15 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -502,6 +537,8 @@ CONFIG_DAVICOM_PHY=y</div><div class='ctx'> # CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_MACE is not set</div><div class='add'>+# CONFIG_BMAC is not set</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='ctx'> # CONFIG_SUNGEM is not set</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='hunk'>@@ -519,7 +556,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -534,12 +570,13 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_GIANFAR is not set</div><div class='ctx'> CONFIG_UCC_GETH=y</div><div class='del'>-# CONFIG_UGETH_NAPI is not set</div><div class='ctx'> # CONFIG_UGETH_MAGIC_PACKET is not set</div><div class='ctx'> # CONFIG_UGETH_FILTERING is not set</div><div class='ctx'> # CONFIG_UGETH_TX_ON_DEMAND is not set</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -628,12 +665,15 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='ctx'> # CONFIG_SERIAL_JSM is not set</div><div class='ctx'> # CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='ctx'> # CONFIG_SERIAL_QE is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='hunk'>@@ -645,42 +685,69 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -689,10 +756,13 @@ CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -702,6 +772,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_ADM9240 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7470 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_AMS is not set</div><div class='ctx'> # CONFIG_SENSORS_ATXP1 is not set</div><div class='ctx'> # CONFIG_SENSORS_DS1621 is not set</div><div class='ctx'> # CONFIG_SENSORS_I5K_AMB is not set</div><div class='hunk'>@@ -746,6 +817,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -753,7 +825,9 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='del'>-CONFIG_83xx_WDT=y</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='add'>+# CONFIG_8xxx_WDT is not set</div><div class='add'>+# CONFIG_WATCHDOG_RTAS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCI-based Watchdog Cards</div><div class='hunk'>@@ -770,8 +844,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -803,10 +879,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -821,6 +893,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -859,6 +935,7 @@ CONFIG_RTC_DRV_DS1374=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -947,6 +1024,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -957,14 +1035,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -994,6 +1071,7 @@ CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='ctx'> CONFIG_UCC_FAST=y</div><div class='ctx'> CONFIG_UCC=y</div><div class='add'>+# CONFIG_QE_GPIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='hunk'>@@ -1002,6 +1080,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1027,8 +1106,18 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1082,6 +1171,10 @@ CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1114,6 +1207,7 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig<br/>index de95d327463c..4eef8c95480e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/83xx/mpc832x_rdb_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc832x_rdb_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:24 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:19 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -16,6 +16,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> # CONFIG_FSL_EMB_PERFMON is not set</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -111,10 +116,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-CONFIG_PPC_83xx=y</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='del'>-CONFIG_MPC83xx=y</div><div class='add'>+CONFIG_PPC_83xx=y</div><div class='ctx'> # CONFIG_MPC831x_RDB is not set</div><div class='ctx'> # CONFIG_MPC832x_MDS is not set</div><div class='ctx'> CONFIG_MPC832x_RDB=y</div><div class='ctx'> # CONFIG_MPC834x_MDS is not set</div><div class='ctx'> # CONFIG_MPC834x_ITX is not set</div><div class='ctx'> # CONFIG_MPC836x_MDS is not set</div><div class='add'>+# CONFIG_MPC836x_RDK is not set</div><div class='ctx'> # CONFIG_MPC837x_MDS is not set</div><div class='ctx'> # CONFIG_MPC837x_RDB is not set</div><div class='ctx'> # CONFIG_SBC834x is not set</div><div class='add'>+# CONFIG_ASP834x is not set</div><div class='ctx'> CONFIG_PPC_MPC832x=y</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> CONFIG_IPIC=y</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> CONFIG_QUICC_ENGINE=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -196,7 +220,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -207,6 +231,7 @@ CONFIG_MATH_EMULATION=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='hunk'>@@ -219,6 +244,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -226,6 +252,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -233,10 +260,13 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -261,10 +291,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -362,9 +388,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='ctx'> CONFIG_OF_I2C=y</div><div class='add'>+CONFIG_OF_SPI=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_DA is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='hunk'>@@ -381,12 +409,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -463,7 +493,10 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_DC390T is not set</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_MESH is not set</div><div class='add'>+# CONFIG_SCSI_MAC53C94 is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='hunk'>@@ -471,12 +504,15 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -503,6 +539,8 @@ CONFIG_ICPLUS_PHY=y</div><div class='ctx'> # CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_MACE is not set</div><div class='add'>+# CONFIG_BMAC is not set</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='ctx'> # CONFIG_SUNGEM is not set</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='hunk'>@@ -520,10 +558,8 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_ACENIC is not set</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> CONFIG_E1000=y</div><div class='del'>-# CONFIG_E1000_NAPI is not set</div><div class='ctx'> # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -538,12 +574,13 @@ CONFIG_E1000=y</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_GIANFAR is not set</div><div class='ctx'> CONFIG_UCC_GETH=y</div><div class='del'>-CONFIG_UGETH_NAPI=y</div><div class='ctx'> # CONFIG_UGETH_MAGIC_PACKET is not set</div><div class='ctx'> # CONFIG_UGETH_FILTERING is not set</div><div class='ctx'> # CONFIG_UGETH_TX_ON_DEMAND is not set</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -641,12 +678,15 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='ctx'> # CONFIG_SERIAL_JSM is not set</div><div class='ctx'> # CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='ctx'> # CONFIG_SERIAL_QE is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='hunk'>@@ -660,43 +700,70 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -719,11 +786,15 @@ CONFIG_SPI_MPC83xx=y</div><div class='ctx'> # CONFIG_SPI_AT25 is not set</div><div class='ctx'> # CONFIG_SPI_SPIDEV is not set</div><div class='ctx'> # CONFIG_SPI_TLE62X0 is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='add'>+# CONFIG_SENSORS_ADCXX is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1026 is not set</div><div class='hunk'>@@ -732,6 +803,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_ADM9240 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7470 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_AMS is not set</div><div class='ctx'> # CONFIG_SENSORS_ATXP1 is not set</div><div class='ctx'> # CONFIG_SENSORS_DS1621 is not set</div><div class='ctx'> # CONFIG_SENSORS_I5K_AMB is not set</div><div class='hunk'>@@ -777,6 +849,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -784,7 +857,9 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='del'>-CONFIG_83xx_WDT=y</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='add'>+# CONFIG_8xxx_WDT is not set</div><div class='add'>+# CONFIG_WATCHDOG_RTAS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCI-based Watchdog Cards</div><div class='hunk'>@@ -806,8 +881,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -840,10 +917,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -877,6 +950,7 @@ CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -928,6 +1002,7 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -936,7 +1011,6 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -949,7 +1023,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1063,6 +1136,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1073,14 +1147,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1154,6 +1227,7 @@ CONFIG_NLS_ISO8859_1=y</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='ctx'> CONFIG_UCC_FAST=y</div><div class='ctx'> CONFIG_UCC=y</div><div class='add'>+# CONFIG_QE_GPIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='hunk'>@@ -1162,6 +1236,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=y</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> CONFIG_CRC7=y</div><div class='hunk'>@@ -1187,8 +1262,18 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1242,6 +1327,10 @@ CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1274,6 +1363,7 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig<br/>index b47fc9185708..8d6513931850 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc834x_itx_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/83xx/mpc834x_itx_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc834x_itx_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc834x_itx_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:25 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:20 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -16,6 +16,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> # CONFIG_FSL_EMB_PERFMON is not set</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -111,10 +116,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-CONFIG_PPC_83xx=y</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='del'>-CONFIG_MPC83xx=y</div><div class='add'>+CONFIG_PPC_83xx=y</div><div class='ctx'> # CONFIG_MPC831x_RDB is not set</div><div class='ctx'> # CONFIG_MPC832x_MDS is not set</div><div class='ctx'> # CONFIG_MPC832x_RDB is not set</div><div class='ctx'> # CONFIG_MPC834x_MDS is not set</div><div class='ctx'> CONFIG_MPC834x_ITX=y</div><div class='ctx'> # CONFIG_MPC836x_MDS is not set</div><div class='add'>+# CONFIG_MPC836x_RDK is not set</div><div class='ctx'> # CONFIG_MPC837x_MDS is not set</div><div class='ctx'> # CONFIG_MPC837x_RDB is not set</div><div class='ctx'> # CONFIG_SBC834x is not set</div><div class='add'>+# CONFIG_ASP834x is not set</div><div class='ctx'> CONFIG_PPC_MPC834x=y</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> CONFIG_IPIC=y</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -195,7 +219,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='hunk'>@@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -259,10 +289,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -439,9 +465,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2</div><div class='ctx'> # CONFIG_MTD_UBI is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='ctx'> CONFIG_OF_I2C=y</div><div class='add'>+CONFIG_OF_SPI=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_DA is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='hunk'>@@ -458,18 +486,17 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='del'>-CONFIG_IDE_MAX_HWIFS=4</div><div class='ctx'> # CONFIG_BLK_DEV_IDE is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -545,7 +572,10 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_DC390T is not set</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_MESH is not set</div><div class='add'>+# CONFIG_SCSI_MAC53C94 is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='hunk'>@@ -623,12 +653,15 @@ CONFIG_MD_RAID1=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -659,7 +692,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -673,9 +705,10 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -753,11 +786,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='ctx'> # CONFIG_SERIAL_JSM is not set</div><div class='ctx'> # CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='hunk'>@@ -769,43 +805,70 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> CONFIG_SENSORS_PCF8574=y</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -828,10 +891,13 @@ CONFIG_SPI_MPC83xx=y</div><div class='ctx'> # CONFIG_SPI_AT25 is not set</div><div class='ctx'> # CONFIG_SPI_SPIDEV is not set</div><div class='ctx'> # CONFIG_SPI_TLE62X0 is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -839,7 +905,9 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='del'>-CONFIG_83xx_WDT=y</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='add'>+# CONFIG_8xxx_WDT is not set</div><div class='add'>+# CONFIG_WATCHDOG_RTAS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCI-based Watchdog Cards</div><div class='hunk'>@@ -861,8 +929,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -895,10 +965,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='hunk'>@@ -917,6 +983,7 @@ CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -960,6 +1027,7 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -968,7 +1036,6 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -981,7 +1048,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1035,10 +1101,13 @@ CONFIG_RTC_DRV_DS1307=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_M41T94 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1305 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_MAX6902 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_R9701 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_RS5C348 is not set</div><div class='hunk'>@@ -1130,6 +1199,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1140,14 +1210,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1226,6 +1295,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1251,8 +1321,18 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1306,6 +1386,10 @@ CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1338,5 +1422,6 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig<br/>index fdac4845bad9..a8afa39d6f76 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:26 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:21 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -16,6 +16,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> # CONFIG_FSL_EMB_PERFMON is not set</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -111,10 +116,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-CONFIG_PPC_83xx=y</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='del'>-CONFIG_MPC83xx=y</div><div class='add'>+CONFIG_PPC_83xx=y</div><div class='ctx'> # CONFIG_MPC831x_RDB is not set</div><div class='ctx'> # CONFIG_MPC832x_MDS is not set</div><div class='ctx'> # CONFIG_MPC832x_RDB is not set</div><div class='ctx'> # CONFIG_MPC834x_MDS is not set</div><div class='ctx'> CONFIG_MPC834x_ITX=y</div><div class='ctx'> # CONFIG_MPC836x_MDS is not set</div><div class='add'>+# CONFIG_MPC836x_RDK is not set</div><div class='ctx'> # CONFIG_MPC837x_MDS is not set</div><div class='ctx'> # CONFIG_MPC837x_RDB is not set</div><div class='ctx'> # CONFIG_SBC834x is not set</div><div class='add'>+# CONFIG_ASP834x is not set</div><div class='ctx'> CONFIG_PPC_MPC834x=y</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> CONFIG_IPIC=y</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -195,7 +219,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='hunk'>@@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -259,10 +289,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -439,9 +465,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2</div><div class='ctx'> # CONFIG_MTD_UBI is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='ctx'> CONFIG_OF_I2C=y</div><div class='add'>+CONFIG_OF_SPI=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_DA is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='hunk'>@@ -458,12 +486,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -540,7 +570,10 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_DC390T is not set</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_MESH is not set</div><div class='add'>+# CONFIG_SCSI_MAC53C94 is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='hunk'>@@ -548,12 +581,15 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -584,7 +620,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -598,9 +633,10 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -678,11 +714,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='ctx'> # CONFIG_SERIAL_JSM is not set</div><div class='ctx'> # CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='hunk'>@@ -694,43 +733,70 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> CONFIG_SENSORS_PCF8574=y</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -753,10 +819,13 @@ CONFIG_SPI_MPC83xx=y</div><div class='ctx'> # CONFIG_SPI_AT25 is not set</div><div class='ctx'> # CONFIG_SPI_SPIDEV is not set</div><div class='ctx'> # CONFIG_SPI_TLE62X0 is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -764,7 +833,9 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='del'>-CONFIG_83xx_WDT=y</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='add'>+# CONFIG_8xxx_WDT is not set</div><div class='add'>+# CONFIG_WATCHDOG_RTAS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCI-based Watchdog Cards</div><div class='hunk'>@@ -786,8 +857,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -820,10 +893,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='hunk'>@@ -842,6 +911,7 @@ CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -885,6 +955,7 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -893,7 +964,6 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -906,7 +976,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -959,10 +1028,13 @@ CONFIG_RTC_DRV_DS1307=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_M41T94 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1305 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_MAX6902 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_R9701 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_RS5C348 is not set</div><div class='hunk'>@@ -1054,6 +1126,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1064,14 +1137,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1150,6 +1222,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1175,8 +1248,18 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1230,6 +1313,10 @@ CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1262,5 +1349,6 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig<br/>index c82e96e984fc..24c320a36670 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc834x_mds_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/83xx/mpc834x_mds_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc834x_mds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc834x_mds_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:26 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:21 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -16,6 +16,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> # CONFIG_FSL_EMB_PERFMON is not set</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -111,10 +116,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-CONFIG_PPC_83xx=y</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='del'>-CONFIG_MPC83xx=y</div><div class='add'>+CONFIG_PPC_83xx=y</div><div class='ctx'> # CONFIG_MPC831x_RDB is not set</div><div class='ctx'> # CONFIG_MPC832x_MDS is not set</div><div class='ctx'> # CONFIG_MPC832x_RDB is not set</div><div class='ctx'> CONFIG_MPC834x_MDS=y</div><div class='ctx'> # CONFIG_MPC834x_ITX is not set</div><div class='ctx'> # CONFIG_MPC836x_MDS is not set</div><div class='add'>+# CONFIG_MPC836x_RDK is not set</div><div class='ctx'> # CONFIG_MPC837x_MDS is not set</div><div class='ctx'> # CONFIG_MPC837x_RDB is not set</div><div class='ctx'> # CONFIG_SBC834x is not set</div><div class='add'>+# CONFIG_ASP834x is not set</div><div class='ctx'> CONFIG_PPC_MPC834x=y</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> CONFIG_IPIC=y</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -195,7 +219,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='hunk'>@@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -259,10 +289,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -363,6 +389,7 @@ CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_DA is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='hunk'>@@ -378,12 +405,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -401,12 +430,15 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -433,6 +465,8 @@ CONFIG_MARVELL_PHY=y</div><div class='ctx'> # CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_MACE is not set</div><div class='add'>+# CONFIG_BMAC is not set</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='ctx'> # CONFIG_SUNGEM is not set</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='hunk'>@@ -468,7 +502,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -482,9 +515,10 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-# CONFIG_GFAR_NAPI is not set</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -572,11 +606,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='ctx'> # CONFIG_SERIAL_JSM is not set</div><div class='ctx'> # CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='hunk'>@@ -588,42 +625,69 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -632,10 +696,13 @@ CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -645,6 +712,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_ADM9240 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7470 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_AMS is not set</div><div class='ctx'> # CONFIG_SENSORS_ATXP1 is not set</div><div class='ctx'> # CONFIG_SENSORS_DS1621 is not set</div><div class='ctx'> # CONFIG_SENSORS_I5K_AMB is not set</div><div class='hunk'>@@ -689,6 +757,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -696,7 +765,9 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='del'>-CONFIG_83xx_WDT=y</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='add'>+# CONFIG_8xxx_WDT is not set</div><div class='add'>+# CONFIG_WATCHDOG_RTAS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCI-based Watchdog Cards</div><div class='hunk'>@@ -713,8 +784,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -746,10 +819,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -764,6 +833,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -802,6 +875,7 @@ CONFIG_RTC_DRV_DS1374=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -890,6 +964,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -900,14 +975,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -943,6 +1017,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -968,8 +1043,18 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1023,6 +1108,10 @@ CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1055,5 +1144,6 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig<br/>index 20fd9f58cf42..e029e9e14622 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc836x_mds_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/83xx/mpc836x_mds_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc836x_mds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc836x_mds_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:27 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:22 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -16,6 +16,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> # CONFIG_FSL_EMB_PERFMON is not set</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -111,10 +116,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -149,36 +161,48 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-CONFIG_PPC_83xx=y</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='del'>-CONFIG_MPC83xx=y</div><div class='add'>+CONFIG_PPC_83xx=y</div><div class='ctx'> # CONFIG_MPC831x_RDB is not set</div><div class='ctx'> # CONFIG_MPC832x_MDS is not set</div><div class='ctx'> # CONFIG_MPC832x_RDB is not set</div><div class='ctx'> # CONFIG_MPC834x_MDS is not set</div><div class='ctx'> # CONFIG_MPC834x_ITX is not set</div><div class='ctx'> CONFIG_MPC836x_MDS=y</div><div class='add'>+# CONFIG_MPC836x_RDK is not set</div><div class='ctx'> # CONFIG_MPC837x_MDS is not set</div><div class='ctx'> # CONFIG_MPC837x_RDB is not set</div><div class='ctx'> # CONFIG_SBC834x is not set</div><div class='add'>+# CONFIG_ASP834x is not set</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> CONFIG_IPIC=y</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> CONFIG_QUICC_ENGINE=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -195,7 +219,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='hunk'>@@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -259,10 +289,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -363,6 +389,7 @@ CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_DA is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='hunk'>@@ -378,12 +405,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -460,7 +489,10 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_DC390T is not set</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_MESH is not set</div><div class='add'>+# CONFIG_SCSI_MAC53C94 is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='hunk'>@@ -468,12 +500,15 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -500,6 +535,8 @@ CONFIG_MARVELL_PHY=y</div><div class='ctx'> # CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_MACE is not set</div><div class='add'>+# CONFIG_BMAC is not set</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='ctx'> # CONFIG_SUNGEM is not set</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='hunk'>@@ -517,7 +554,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -532,12 +568,13 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_GIANFAR is not set</div><div class='ctx'> CONFIG_UCC_GETH=y</div><div class='del'>-# CONFIG_UGETH_NAPI is not set</div><div class='ctx'> # CONFIG_UGETH_MAGIC_PACKET is not set</div><div class='ctx'> # CONFIG_UGETH_FILTERING is not set</div><div class='ctx'> # CONFIG_UGETH_TX_ON_DEMAND is not set</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -626,12 +663,15 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='ctx'> # CONFIG_SERIAL_JSM is not set</div><div class='ctx'> # CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='ctx'> # CONFIG_SERIAL_QE is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='hunk'>@@ -643,42 +683,69 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -687,10 +754,13 @@ CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -700,6 +770,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_ADM9240 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7470 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_AMS is not set</div><div class='ctx'> # CONFIG_SENSORS_ATXP1 is not set</div><div class='ctx'> # CONFIG_SENSORS_DS1621 is not set</div><div class='ctx'> # CONFIG_SENSORS_I5K_AMB is not set</div><div class='hunk'>@@ -744,6 +815,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -751,7 +823,9 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='del'>-CONFIG_83xx_WDT=y</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='add'>+# CONFIG_8xxx_WDT is not set</div><div class='add'>+# CONFIG_WATCHDOG_RTAS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCI-based Watchdog Cards</div><div class='hunk'>@@ -768,8 +842,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -801,10 +877,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -819,6 +891,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -857,6 +933,7 @@ CONFIG_RTC_DRV_DS1374=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -945,6 +1022,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -955,14 +1033,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -992,6 +1069,7 @@ CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='ctx'> CONFIG_UCC_FAST=y</div><div class='ctx'> CONFIG_UCC=y</div><div class='add'>+# CONFIG_QE_GPIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='hunk'>@@ -1000,6 +1078,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1025,8 +1104,18 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1080,6 +1169,10 @@ CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1112,6 +1205,7 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig<br/>index d2c435f0da42..7d674be702fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/83xx/mpc836x_rdk_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc836x_rdk_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc2</div><div class='del'>-# Mon May 19 21:12:32 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:24 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -16,6 +16,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> # CONFIG_FSL_EMB_PERFMON is not set</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -52,6 +54,9 @@ CONFIG_PPC_UDBG_16550=y</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -89,12 +94,12 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -112,10 +117,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -126,12 +137,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -150,16 +162,18 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-CONFIG_PPC_83xx=y</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='del'>-CONFIG_MPC83xx=y</div><div class='add'>+CONFIG_PPC_83xx=y</div><div class='ctx'> # CONFIG_MPC831x_RDB is not set</div><div class='ctx'> # CONFIG_MPC832x_MDS is not set</div><div class='ctx'> # CONFIG_MPC832x_RDB is not set</div><div class='hunk'>@@ -170,17 +184,26 @@ CONFIG_MPC836x_RDK=y</div><div class='ctx'> # CONFIG_MPC837x_MDS is not set</div><div class='ctx'> # CONFIG_MPC837x_RDB is not set</div><div class='ctx'> # CONFIG_SBC834x is not set</div><div class='add'>+# CONFIG_ASP834x is not set</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> CONFIG_IPIC=y</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> CONFIG_QUICC_ENGINE=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -207,6 +230,7 @@ CONFIG_BINFMT_ELF=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='hunk'>@@ -219,6 +243,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -226,6 +251,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -233,12 +259,15 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_FSL_PCI=y</div><div class='ctx'> CONFIG_FSL_LBC=y</div><div class='ctx'> CONFIG_FSL_GTM=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -263,10 +292,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -359,6 +384,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='ctx'> CONFIG_MTD=y</div><div class='hunk'>@@ -449,9 +476,11 @@ CONFIG_MTD_PHYSMAP_OF=y</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='ctx'> CONFIG_OF_GPIO=y</div><div class='ctx'> CONFIG_OF_I2C=y</div><div class='add'>+CONFIG_OF_SPI=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_DA is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='hunk'>@@ -467,12 +496,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -490,12 +521,15 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -526,7 +560,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -541,12 +574,13 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_GIANFAR is not set</div><div class='ctx'> CONFIG_UCC_GETH=y</div><div class='del'>-CONFIG_UGETH_NAPI=y</div><div class='ctx'> # CONFIG_UGETH_MAGIC_PACKET is not set</div><div class='ctx'> # CONFIG_UGETH_FILTERING is not set</div><div class='ctx'> # CONFIG_UGETH_TX_ON_DEMAND is not set</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> # CONFIG_NETDEV_10000 is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='hunk'>@@ -602,6 +636,7 @@ CONFIG_INPUT=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -625,12 +660,15 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='ctx'> # CONFIG_SERIAL_JSM is not set</div><div class='ctx'> # CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='ctx'> CONFIG_SERIAL_QE=y</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='hunk'>@@ -643,43 +681,70 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='del'>-# CONFIG_I2C_GPIO is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_TPS65010 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='hunk'>@@ -703,26 +768,33 @@ CONFIG_SPI_MPC83xx=y</div><div class='ctx'> # CONFIG_SPI_AT25 is not set</div><div class='ctx'> CONFIG_SPI_SPIDEV=y</div><div class='ctx'> # CONFIG_SPI_TLE62X0 is not set</div><div class='del'>-CONFIG_HAVE_GPIO_LIB=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# GPIO Support</div><div class='del'>-#</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIO_SYSFS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C GPIO expanders:</div><div class='ctx'> #</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='ctx'> # CONFIG_GPIO_PCA953X is not set</div><div class='ctx'> # CONFIG_GPIO_PCF857X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_BT8XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # SPI GPIO expanders:</div><div class='ctx'> #</div><div class='add'>+# CONFIG_GPIO_MAX7301 is not set</div><div class='ctx'> # CONFIG_GPIO_MCP23S08 is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -730,7 +802,9 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='del'>-CONFIG_83xx_WDT=y</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='add'>+# CONFIG_8xxx_WDT is not set</div><div class='add'>+# CONFIG_WATCHDOG_RTAS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCI-based Watchdog Cards</div><div class='hunk'>@@ -747,9 +821,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='del'>-# CONFIG_HTC_EGPIO is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -799,6 +874,9 @@ CONFIG_FB_MACMODES=y</div><div class='ctx'> # CONFIG_FB_PM2 is not set</div><div class='ctx'> # CONFIG_FB_CYBER2000 is not set</div><div class='ctx'> CONFIG_FB_OF=y</div><div class='add'>+# CONFIG_FB_CONTROL is not set</div><div class='add'>+# CONFIG_FB_PLATINUM is not set</div><div class='add'>+# CONFIG_FB_VALKYRIE is not set</div><div class='ctx'> # CONFIG_FB_CT65550 is not set</div><div class='ctx'> # CONFIG_FB_ASILIANT is not set</div><div class='ctx'> # CONFIG_FB_IMSTT is not set</div><div class='hunk'>@@ -821,6 +899,7 @@ CONFIG_FB_OF=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='ctx'> # CONFIG_FB_FSL_DIU is not set</div><div class='ctx'> # CONFIG_FB_IBM_GXT4500 is not set</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='hunk'>@@ -846,10 +925,6 @@ CONFIG_LOGO=y</div><div class='ctx'> # CONFIG_LOGO_LINUX_MONO is not set</div><div class='ctx'> CONFIG_LOGO_LINUX_VGA16=y</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -941,6 +1016,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -951,14 +1027,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -998,6 +1073,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1025,12 +1101,22 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> CONFIG_PPC_EARLY_DEBUG=y</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG_LPAR is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG_G5 is not set</div><div class='del'>-# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set</div><div class='add'>+CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL=y</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG_MAPLE is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG_ISERIES is not set</div><div class='hunk'>@@ -1091,6 +1177,10 @@ CONFIG_CRYPTO_CBC=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1123,6 +1213,7 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig<br/>index 0f94d9f56beb..de472022aa81 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc837x_mds_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/83xx/mpc837x_mds_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc837x_mds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc837x_mds_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:28 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:23 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -16,6 +16,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> # CONFIG_FSL_EMB_PERFMON is not set</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -88,13 +93,13 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -112,10 +117,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -126,12 +137,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -150,37 +162,49 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-CONFIG_PPC_83xx=y</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='del'>-CONFIG_MPC83xx=y</div><div class='add'>+CONFIG_PPC_83xx=y</div><div class='ctx'> # CONFIG_MPC831x_RDB is not set</div><div class='ctx'> # CONFIG_MPC832x_MDS is not set</div><div class='ctx'> # CONFIG_MPC832x_RDB is not set</div><div class='ctx'> # CONFIG_MPC834x_MDS is not set</div><div class='ctx'> # CONFIG_MPC834x_ITX is not set</div><div class='ctx'> # CONFIG_MPC836x_MDS is not set</div><div class='add'>+# CONFIG_MPC836x_RDK is not set</div><div class='ctx'> CONFIG_MPC837x_MDS=y</div><div class='ctx'> # CONFIG_MPC837x_RDB is not set</div><div class='ctx'> # CONFIG_SBC834x is not set</div><div class='add'>+# CONFIG_ASP834x is not set</div><div class='ctx'> CONFIG_PPC_MPC837x=y</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> CONFIG_IPIC=y</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -206,6 +230,7 @@ CONFIG_BINFMT_ELF=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='hunk'>@@ -218,6 +243,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -225,6 +251,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -232,15 +259,22 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='del'>-# CONFIG_PCI is not set</div><div class='del'>-# CONFIG_PCI_DOMAINS is not set</div><div class='del'>-# CONFIG_PCI_SYSCALL is not set</div><div class='del'>-# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_DOMAINS=y</div><div class='add'>+CONFIG_PCI_SYSCALL=y</div><div class='add'>+# CONFIG_PCIEPORTBUS is not set</div><div class='add'>+CONFIG_ARCH_SUPPORTS_MSI=y</div><div class='add'>+# CONFIG_PCI_MSI is not set</div><div class='add'>+CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='add'>+# CONFIG_HOTPLUG_PCI is not set</div><div class='ctx'> # CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -256,10 +290,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -360,19 +390,30 @@ CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='add'>+# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='add'>+# CONFIG_BLK_DEV_DAC960 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UMEM is not set</div><div class='ctx'> # CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> # CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_SX8 is not set</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+# CONFIG_SGI_IOC4 is not set</div><div class='add'>+# CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -415,24 +456,128 @@ CONFIG_SCSI_WAIT_SCAN=m</div><div class='ctx'> # CONFIG_SCSI_SRP_ATTRS is not set</div><div class='ctx'> CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set</div><div class='add'>+# CONFIG_SCSI_3W_9XXX is not set</div><div class='add'>+# CONFIG_SCSI_ACARD is not set</div><div class='add'>+# CONFIG_SCSI_AACRAID is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='add'>+# CONFIG_SCSI_AIC79XX is not set</div><div class='add'>+# CONFIG_SCSI_AIC94XX is not set</div><div class='add'>+# CONFIG_SCSI_DPT_I2O is not set</div><div class='add'>+# CONFIG_SCSI_ADVANSYS is not set</div><div class='add'>+# CONFIG_SCSI_ARCMSR is not set</div><div class='add'>+# CONFIG_MEGARAID_NEWGEN is not set</div><div class='add'>+# CONFIG_MEGARAID_LEGACY is not set</div><div class='add'>+# CONFIG_MEGARAID_SAS is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='add'>+# CONFIG_SCSI_BUSLOGIC is not set</div><div class='add'>+# CONFIG_SCSI_DMX3191D is not set</div><div class='add'>+# CONFIG_SCSI_EATA is not set</div><div class='add'>+# CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='add'>+# CONFIG_SCSI_GDTH is not set</div><div class='add'>+# CONFIG_SCSI_IPS is not set</div><div class='add'>+# CONFIG_SCSI_INITIO is not set</div><div class='add'>+# CONFIG_SCSI_INIA100 is not set</div><div class='add'>+# CONFIG_SCSI_MVSAS is not set</div><div class='add'>+# CONFIG_SCSI_STEX is not set</div><div class='add'>+# CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='add'>+# CONFIG_SCSI_IPR is not set</div><div class='add'>+# CONFIG_SCSI_QLOGIC_1280 is not set</div><div class='add'>+# CONFIG_SCSI_QLA_FC is not set</div><div class='add'>+# CONFIG_SCSI_QLA_ISCSI is not set</div><div class='add'>+# CONFIG_SCSI_LPFC is not set</div><div class='add'>+# CONFIG_SCSI_DC395x is not set</div><div class='add'>+# CONFIG_SCSI_DC390T is not set</div><div class='add'>+# CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_MESH is not set</div><div class='add'>+# CONFIG_SCSI_MAC53C94 is not set</div><div class='add'>+# CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='add'>+# CONFIG_SATA_AHCI is not set</div><div class='add'>+# CONFIG_SATA_SIL24 is not set</div><div class='ctx'> CONFIG_SATA_FSL=y</div><div class='ctx'> CONFIG_ATA_SFF=y</div><div class='add'>+# CONFIG_SATA_SVW is not set</div><div class='add'>+# CONFIG_ATA_PIIX is not set</div><div class='ctx'> # CONFIG_SATA_MV is not set</div><div class='add'>+# CONFIG_SATA_NV is not set</div><div class='add'>+# CONFIG_PDC_ADMA is not set</div><div class='add'>+# CONFIG_SATA_QSTOR is not set</div><div class='add'>+# CONFIG_SATA_PROMISE is not set</div><div class='add'>+# CONFIG_SATA_SX4 is not set</div><div class='add'>+# CONFIG_SATA_SIL is not set</div><div class='add'>+# CONFIG_SATA_SIS is not set</div><div class='add'>+# CONFIG_SATA_ULI is not set</div><div class='add'>+# CONFIG_SATA_VIA is not set</div><div class='add'>+# CONFIG_SATA_VITESSE is not set</div><div class='add'>+# CONFIG_SATA_INIC162X is not set</div><div class='add'>+# CONFIG_PATA_ALI is not set</div><div class='add'>+# CONFIG_PATA_AMD is not set</div><div class='add'>+# CONFIG_PATA_ARTOP is not set</div><div class='add'>+# CONFIG_PATA_ATIIXP is not set</div><div class='add'>+# CONFIG_PATA_CMD640_PCI is not set</div><div class='add'>+# CONFIG_PATA_CMD64X is not set</div><div class='add'>+# CONFIG_PATA_CS5520 is not set</div><div class='add'>+# CONFIG_PATA_CS5530 is not set</div><div class='add'>+# CONFIG_PATA_CYPRESS is not set</div><div class='add'>+# CONFIG_PATA_EFAR is not set</div><div class='add'>+# CONFIG_ATA_GENERIC is not set</div><div class='add'>+# CONFIG_PATA_HPT366 is not set</div><div class='add'>+# CONFIG_PATA_HPT37X is not set</div><div class='add'>+# CONFIG_PATA_HPT3X2N is not set</div><div class='add'>+# CONFIG_PATA_HPT3X3 is not set</div><div class='add'>+# CONFIG_PATA_IT821X is not set</div><div class='add'>+# CONFIG_PATA_IT8213 is not set</div><div class='add'>+# CONFIG_PATA_JMICRON is not set</div><div class='add'>+# CONFIG_PATA_TRIFLEX is not set</div><div class='add'>+# CONFIG_PATA_MARVELL is not set</div><div class='add'>+# CONFIG_PATA_MPIIX is not set</div><div class='add'>+# CONFIG_PATA_OLDPIIX is not set</div><div class='add'>+# CONFIG_PATA_NETCELL is not set</div><div class='add'>+# CONFIG_PATA_NINJA32 is not set</div><div class='add'>+# CONFIG_PATA_NS87410 is not set</div><div class='add'>+# CONFIG_PATA_NS87415 is not set</div><div class='add'>+# CONFIG_PATA_OPTI is not set</div><div class='add'>+# CONFIG_PATA_OPTIDMA is not set</div><div class='add'>+# CONFIG_PATA_PDC_OLD is not set</div><div class='add'>+# CONFIG_PATA_RADISYS is not set</div><div class='add'>+# CONFIG_PATA_RZ1000 is not set</div><div class='add'>+# CONFIG_PATA_SC1200 is not set</div><div class='add'>+# CONFIG_PATA_SERVERWORKS is not set</div><div class='add'>+# CONFIG_PATA_PDC2027X is not set</div><div class='add'>+# CONFIG_PATA_SIL680 is not set</div><div class='add'>+# CONFIG_PATA_SIS is not set</div><div class='add'>+# CONFIG_PATA_VIA is not set</div><div class='add'>+# CONFIG_PATA_WINBOND is not set</div><div class='ctx'> # CONFIG_PATA_PLATFORM is not set</div><div class='add'>+# CONFIG_PATA_SCH is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='add'>+# CONFIG_FIREWIRE is not set</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='add'>+# CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='ctx'> # CONFIG_VETH is not set</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='ctx'> CONFIG_PHYLIB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -452,16 +597,56 @@ CONFIG_MARVELL_PHY=y</div><div class='ctx'> # CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_MACE is not set</div><div class='add'>+# CONFIG_BMAC is not set</div><div class='add'>+# CONFIG_HAPPYMEAL is not set</div><div class='add'>+# CONFIG_SUNGEM is not set</div><div class='add'>+# CONFIG_CASSINI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+# CONFIG_NET_TULIP is not set</div><div class='add'>+# CONFIG_HP100 is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_NET_PCI is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='add'>+# CONFIG_ACENIC is not set</div><div class='add'>+# CONFIG_DL2K is not set</div><div class='add'>+# CONFIG_E1000 is not set</div><div class='add'>+# CONFIG_E1000E is not set</div><div class='add'>+# CONFIG_IP1000 is not set</div><div class='add'>+# CONFIG_IGB is not set</div><div class='add'>+# CONFIG_NS83820 is not set</div><div class='add'>+# CONFIG_HAMACHI is not set</div><div class='add'>+# CONFIG_YELLOWFIN is not set</div><div class='add'>+# CONFIG_R8169 is not set</div><div class='add'>+# CONFIG_SIS190 is not set</div><div class='add'>+# CONFIG_SKGE is not set</div><div class='add'>+# CONFIG_SKY2 is not set</div><div class='add'>+# CONFIG_VIA_VELOCITY is not set</div><div class='add'>+# CONFIG_TIGON3 is not set</div><div class='add'>+# CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-# CONFIG_GFAR_NAPI is not set</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='add'>+# CONFIG_QLA3XXX is not set</div><div class='add'>+# CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='add'>+# CONFIG_CHELSIO_T1 is not set</div><div class='add'>+# CONFIG_CHELSIO_T3 is not set</div><div class='add'>+# CONFIG_IXGBE is not set</div><div class='add'>+# CONFIG_IXGB is not set</div><div class='add'>+# CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='add'>+# CONFIG_NETXEN_NIC is not set</div><div class='add'>+# CONFIG_NIU is not set</div><div class='add'>+# CONFIG_MLX4_CORE is not set</div><div class='add'>+# CONFIG_TEHUTI is not set</div><div class='add'>+# CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='add'>+# CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Wireless LAN</div><div class='hunk'>@@ -470,8 +655,11 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='ctx'> # CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='add'>+# CONFIG_FDDI is not set</div><div class='add'>+# CONFIG_HIPPI is not set</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NET_FC is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='ctx'> # CONFIG_NET_POLL_CONTROLLER is not set</div><div class='hunk'>@@ -515,12 +703,14 @@ CONFIG_INPUT=y</div><div class='ctx'> # CONFIG_VT is not set</div><div class='ctx'> CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+# CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Serial drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_PCI=y</div><div class='ctx'> CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='ctx'> CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='hunk'>@@ -531,40 +721,90 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='add'>+# CONFIG_SERIAL_JSM is not set</div><div class='ctx'> # CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='ctx'> CONFIG_GEN_RTC=y</div><div class='ctx'> # CONFIG_GEN_RTC_X is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_APPLICOM is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALI1535 is not set</div><div class='add'>+# CONFIG_I2C_ALI1563 is not set</div><div class='add'>+# CONFIG_I2C_ALI15X3 is not set</div><div class='add'>+# CONFIG_I2C_AMD756 is not set</div><div class='add'>+# CONFIG_I2C_AMD8111 is not set</div><div class='add'>+# CONFIG_I2C_I801 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='add'>+# CONFIG_I2C_PIIX4 is not set</div><div class='add'>+# CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_SIS5595 is not set</div><div class='add'>+# CONFIG_I2C_SIS630 is not set</div><div class='add'>+# CONFIG_I2C_SIS96X is not set</div><div class='add'>+# CONFIG_I2C_VIA is not set</div><div class='add'>+# CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='ctx'> CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -573,10 +813,13 @@ CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -586,8 +829,10 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_ADM9240 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7470 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_AMS is not set</div><div class='ctx'> # CONFIG_SENSORS_ATXP1 is not set</div><div class='ctx'> # CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_I5K_AMB is not set</div><div class='ctx'> # CONFIG_SENSORS_F71805F is not set</div><div class='ctx'> # CONFIG_SENSORS_F71882FG is not set</div><div class='ctx'> # CONFIG_SENSORS_F75375S is not set</div><div class='hunk'>@@ -609,13 +854,16 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_MAX6650 is not set</div><div class='ctx'> # CONFIG_SENSORS_PC87360 is not set</div><div class='ctx'> # CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_SIS5595 is not set</div><div class='ctx'> # CONFIG_SENSORS_DME1737 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M1 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M192 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47B397 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADS7828 is not set</div><div class='ctx'> # CONFIG_SENSORS_THMC50 is not set</div><div class='add'>+# CONFIG_SENSORS_VIA686A is not set</div><div class='ctx'> # CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_VT8231 is not set</div><div class='ctx'> # CONFIG_SENSORS_W83781D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83791D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83792D is not set</div><div class='hunk'>@@ -626,6 +874,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -633,7 +882,15 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='del'>-CONFIG_83xx_WDT=y</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='add'>+# CONFIG_8xxx_WDT is not set</div><div class='add'>+# CONFIG_WATCHDOG_RTAS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCIPCWATCHDOG is not set</div><div class='add'>+# CONFIG_WDTPCI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Sonics Silicon Backplane</div><div class='hunk'>@@ -644,8 +901,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -666,6 +925,8 @@ CONFIG_DAB=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_AGP is not set</div><div class='add'>+# CONFIG_DRM is not set</div><div class='ctx'> # CONFIG_VGASTATE is not set</div><div class='ctx'> CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # CONFIG_FB is not set</div><div class='hunk'>@@ -675,10 +936,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -686,13 +943,17 @@ CONFIG_HID=y</div><div class='ctx'> # CONFIG_HIDRAW is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='del'>-# CONFIG_USB_ARCH_HAS_OHCI is not set</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -700,6 +961,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='add'>+# CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> # CONFIG_DMADEVICES is not set</div><div class='hunk'>@@ -769,6 +1031,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -779,14 +1042,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -826,6 +1088,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -849,8 +1112,18 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -904,6 +1177,10 @@ CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -935,5 +1212,7 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='add'>+# CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig<br/>index 0d448556f53a..e8d2d691d26c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/83xx/mpc837x_rdb_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/mpc837x_rdb_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Tue Jun 10 09:17:12 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:25 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -16,6 +16,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> # CONFIG_FSL_EMB_PERFMON is not set</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -88,13 +93,13 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -112,10 +117,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -126,12 +137,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -150,37 +162,49 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-CONFIG_PPC_83xx=y</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='del'>-CONFIG_MPC83xx=y</div><div class='add'>+CONFIG_PPC_83xx=y</div><div class='ctx'> # CONFIG_MPC831x_RDB is not set</div><div class='ctx'> # CONFIG_MPC832x_MDS is not set</div><div class='ctx'> # CONFIG_MPC832x_RDB is not set</div><div class='ctx'> # CONFIG_MPC834x_MDS is not set</div><div class='ctx'> # CONFIG_MPC834x_ITX is not set</div><div class='ctx'> # CONFIG_MPC836x_MDS is not set</div><div class='add'>+# CONFIG_MPC836x_RDK is not set</div><div class='ctx'> # CONFIG_MPC837x_MDS is not set</div><div class='ctx'> CONFIG_MPC837x_RDB=y</div><div class='ctx'> # CONFIG_SBC834x is not set</div><div class='add'>+# CONFIG_ASP834x is not set</div><div class='ctx'> CONFIG_PPC_MPC837x=y</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> CONFIG_IPIC=y</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -206,6 +230,7 @@ CONFIG_BINFMT_ELF=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='hunk'>@@ -218,6 +243,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -225,6 +251,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -232,15 +259,22 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='del'>-# CONFIG_PCI is not set</div><div class='del'>-# CONFIG_PCI_DOMAINS is not set</div><div class='del'>-# CONFIG_PCI_SYSCALL is not set</div><div class='del'>-# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_DOMAINS=y</div><div class='add'>+CONFIG_PCI_SYSCALL=y</div><div class='add'>+# CONFIG_PCIEPORTBUS is not set</div><div class='add'>+CONFIG_ARCH_SUPPORTS_MSI=y</div><div class='add'>+# CONFIG_PCI_MSI is not set</div><div class='add'>+CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='add'>+# CONFIG_HOTPLUG_PCI is not set</div><div class='ctx'> # CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -256,10 +290,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -355,10 +385,16 @@ CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='add'>+# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='add'>+# CONFIG_BLK_DEV_DAC960 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UMEM is not set</div><div class='ctx'> # CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> # CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_SX8 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_UB is not set</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='hunk'>@@ -366,9 +402,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+# CONFIG_SGI_IOC4 is not set</div><div class='add'>+# CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -411,14 +452,106 @@ CONFIG_SCSI_WAIT_SCAN=m</div><div class='ctx'> # CONFIG_SCSI_SRP_ATTRS is not set</div><div class='ctx'> CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set</div><div class='add'>+# CONFIG_SCSI_3W_9XXX is not set</div><div class='add'>+# CONFIG_SCSI_ACARD is not set</div><div class='add'>+# CONFIG_SCSI_AACRAID is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='add'>+# CONFIG_SCSI_AIC79XX is not set</div><div class='add'>+# CONFIG_SCSI_AIC94XX is not set</div><div class='add'>+# CONFIG_SCSI_DPT_I2O is not set</div><div class='add'>+# CONFIG_SCSI_ADVANSYS is not set</div><div class='add'>+# CONFIG_SCSI_ARCMSR is not set</div><div class='add'>+# CONFIG_MEGARAID_NEWGEN is not set</div><div class='add'>+# CONFIG_MEGARAID_LEGACY is not set</div><div class='add'>+# CONFIG_MEGARAID_SAS is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='add'>+# CONFIG_SCSI_BUSLOGIC is not set</div><div class='add'>+# CONFIG_SCSI_DMX3191D is not set</div><div class='add'>+# CONFIG_SCSI_EATA is not set</div><div class='add'>+# CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='add'>+# CONFIG_SCSI_GDTH is not set</div><div class='add'>+# CONFIG_SCSI_IPS is not set</div><div class='add'>+# CONFIG_SCSI_INITIO is not set</div><div class='add'>+# CONFIG_SCSI_INIA100 is not set</div><div class='add'>+# CONFIG_SCSI_MVSAS is not set</div><div class='add'>+# CONFIG_SCSI_STEX is not set</div><div class='add'>+# CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='add'>+# CONFIG_SCSI_IPR is not set</div><div class='add'>+# CONFIG_SCSI_QLOGIC_1280 is not set</div><div class='add'>+# CONFIG_SCSI_QLA_FC is not set</div><div class='add'>+# CONFIG_SCSI_QLA_ISCSI is not set</div><div class='add'>+# CONFIG_SCSI_LPFC is not set</div><div class='add'>+# CONFIG_SCSI_DC395x is not set</div><div class='add'>+# CONFIG_SCSI_DC390T is not set</div><div class='add'>+# CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_MESH is not set</div><div class='add'>+# CONFIG_SCSI_MAC53C94 is not set</div><div class='add'>+# CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='add'>+# CONFIG_SATA_AHCI is not set</div><div class='add'>+# CONFIG_SATA_SIL24 is not set</div><div class='ctx'> CONFIG_SATA_FSL=y</div><div class='ctx'> CONFIG_ATA_SFF=y</div><div class='add'>+# CONFIG_SATA_SVW is not set</div><div class='add'>+# CONFIG_ATA_PIIX is not set</div><div class='ctx'> # CONFIG_SATA_MV is not set</div><div class='add'>+# CONFIG_SATA_NV is not set</div><div class='add'>+# CONFIG_PDC_ADMA is not set</div><div class='add'>+# CONFIG_SATA_QSTOR is not set</div><div class='add'>+# CONFIG_SATA_PROMISE is not set</div><div class='add'>+# CONFIG_SATA_SX4 is not set</div><div class='add'>+# CONFIG_SATA_SIL is not set</div><div class='add'>+# CONFIG_SATA_SIS is not set</div><div class='add'>+# CONFIG_SATA_ULI is not set</div><div class='add'>+# CONFIG_SATA_VIA is not set</div><div class='add'>+# CONFIG_SATA_VITESSE is not set</div><div class='add'>+# CONFIG_SATA_INIC162X is not set</div><div class='add'>+# CONFIG_PATA_ALI is not set</div><div class='add'>+# CONFIG_PATA_AMD is not set</div><div class='add'>+# CONFIG_PATA_ARTOP is not set</div><div class='add'>+# CONFIG_PATA_ATIIXP is not set</div><div class='add'>+# CONFIG_PATA_CMD640_PCI is not set</div><div class='add'>+# CONFIG_PATA_CMD64X is not set</div><div class='add'>+# CONFIG_PATA_CS5520 is not set</div><div class='add'>+# CONFIG_PATA_CS5530 is not set</div><div class='add'>+# CONFIG_PATA_CYPRESS is not set</div><div class='add'>+# CONFIG_PATA_EFAR is not set</div><div class='add'>+# CONFIG_ATA_GENERIC is not set</div><div class='add'>+# CONFIG_PATA_HPT366 is not set</div><div class='add'>+# CONFIG_PATA_HPT37X is not set</div><div class='add'>+# CONFIG_PATA_HPT3X2N is not set</div><div class='add'>+# CONFIG_PATA_HPT3X3 is not set</div><div class='add'>+# CONFIG_PATA_IT821X is not set</div><div class='add'>+# CONFIG_PATA_IT8213 is not set</div><div class='add'>+# CONFIG_PATA_JMICRON is not set</div><div class='add'>+# CONFIG_PATA_TRIFLEX is not set</div><div class='add'>+# CONFIG_PATA_MARVELL is not set</div><div class='add'>+# CONFIG_PATA_MPIIX is not set</div><div class='add'>+# CONFIG_PATA_OLDPIIX is not set</div><div class='add'>+# CONFIG_PATA_NETCELL is not set</div><div class='add'>+# CONFIG_PATA_NINJA32 is not set</div><div class='add'>+# CONFIG_PATA_NS87410 is not set</div><div class='add'>+# CONFIG_PATA_NS87415 is not set</div><div class='add'>+# CONFIG_PATA_OPTI is not set</div><div class='add'>+# CONFIG_PATA_OPTIDMA is not set</div><div class='add'>+# CONFIG_PATA_PDC_OLD is not set</div><div class='add'>+# CONFIG_PATA_RADISYS is not set</div><div class='add'>+# CONFIG_PATA_RZ1000 is not set</div><div class='add'>+# CONFIG_PATA_SC1200 is not set</div><div class='add'>+# CONFIG_PATA_SERVERWORKS is not set</div><div class='add'>+# CONFIG_PATA_PDC2027X is not set</div><div class='add'>+# CONFIG_PATA_SIL680 is not set</div><div class='add'>+# CONFIG_PATA_SIS is not set</div><div class='add'>+# CONFIG_PATA_VIA is not set</div><div class='add'>+# CONFIG_PATA_WINBOND is not set</div><div class='ctx'> # CONFIG_PATA_PLATFORM is not set</div><div class='add'>+# CONFIG_PATA_SCH is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=y</div><div class='ctx'> # CONFIG_MD_LINEAR is not set</div><div class='hunk'>@@ -430,15 +563,27 @@ CONFIG_MD_RAID5_RESHAPE=y</div><div class='ctx'> # CONFIG_MD_MULTIPATH is not set</div><div class='ctx'> # CONFIG_MD_FAULTY is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DM is not set</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='add'>+# CONFIG_FIREWIRE is not set</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='add'>+# CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='ctx'> # CONFIG_VETH is not set</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='ctx'> CONFIG_PHYLIB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -458,16 +603,44 @@ CONFIG_FIXED_PHY=y</div><div class='ctx'> # CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_MACE is not set</div><div class='add'>+# CONFIG_BMAC is not set</div><div class='add'>+# CONFIG_HAPPYMEAL is not set</div><div class='add'>+# CONFIG_SUNGEM is not set</div><div class='add'>+# CONFIG_CASSINI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+# CONFIG_NET_TULIP is not set</div><div class='add'>+# CONFIG_HP100 is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_NET_PCI is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='add'>+# CONFIG_ACENIC is not set</div><div class='add'>+# CONFIG_DL2K is not set</div><div class='add'>+# CONFIG_E1000 is not set</div><div class='add'>+# CONFIG_E1000E is not set</div><div class='add'>+# CONFIG_IP1000 is not set</div><div class='add'>+# CONFIG_IGB is not set</div><div class='add'>+# CONFIG_NS83820 is not set</div><div class='add'>+# CONFIG_HAMACHI is not set</div><div class='add'>+# CONFIG_YELLOWFIN is not set</div><div class='add'>+# CONFIG_R8169 is not set</div><div class='add'>+# CONFIG_SIS190 is not set</div><div class='add'>+# CONFIG_SKGE is not set</div><div class='add'>+# CONFIG_SKY2 is not set</div><div class='add'>+# CONFIG_VIA_VELOCITY is not set</div><div class='add'>+# CONFIG_TIGON3 is not set</div><div class='add'>+# CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='add'>+# CONFIG_QLA3XXX is not set</div><div class='add'>+# CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> # CONFIG_NETDEV_10000 is not set</div><div class='add'>+# CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Wireless LAN</div><div class='hunk'>@@ -485,8 +658,11 @@ CONFIG_GFAR_NAPI=y</div><div class='ctx'> # CONFIG_USB_RTL8150 is not set</div><div class='ctx'> # CONFIG_USB_USBNET is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='add'>+# CONFIG_FDDI is not set</div><div class='add'>+# CONFIG_HIPPI is not set</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NET_FC is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='ctx'> # CONFIG_NET_POLL_CONTROLLER is not set</div><div class='hunk'>@@ -530,12 +706,14 @@ CONFIG_INPUT=y</div><div class='ctx'> # CONFIG_VT is not set</div><div class='ctx'> CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+# CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Serial drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_PCI=y</div><div class='ctx'> CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='ctx'> CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='hunk'>@@ -546,41 +724,91 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='add'>+# CONFIG_SERIAL_JSM is not set</div><div class='ctx'> # CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='ctx'> CONFIG_GEN_RTC=y</div><div class='ctx'> # CONFIG_GEN_RTC_X is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_APPLICOM is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALI1535 is not set</div><div class='add'>+# CONFIG_I2C_ALI1563 is not set</div><div class='add'>+# CONFIG_I2C_ALI15X3 is not set</div><div class='add'>+# CONFIG_I2C_AMD756 is not set</div><div class='add'>+# CONFIG_I2C_AMD8111 is not set</div><div class='add'>+# CONFIG_I2C_I801 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='add'>+# CONFIG_I2C_PIIX4 is not set</div><div class='add'>+# CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_SIS5595 is not set</div><div class='add'>+# CONFIG_I2C_SIS630 is not set</div><div class='add'>+# CONFIG_I2C_SIS96X is not set</div><div class='add'>+# CONFIG_I2C_VIA is not set</div><div class='add'>+# CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='ctx'> CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='ctx'> # CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -589,10 +817,13 @@ CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -602,8 +833,10 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_ADM9240 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7470 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_AMS is not set</div><div class='ctx'> # CONFIG_SENSORS_ATXP1 is not set</div><div class='ctx'> # CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_I5K_AMB is not set</div><div class='ctx'> # CONFIG_SENSORS_F71805F is not set</div><div class='ctx'> # CONFIG_SENSORS_F71882FG is not set</div><div class='ctx'> # CONFIG_SENSORS_F75375S is not set</div><div class='hunk'>@@ -625,13 +858,16 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_MAX6650 is not set</div><div class='ctx'> # CONFIG_SENSORS_PC87360 is not set</div><div class='ctx'> # CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_SIS5595 is not set</div><div class='ctx'> # CONFIG_SENSORS_DME1737 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M1 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M192 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47B397 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADS7828 is not set</div><div class='ctx'> # CONFIG_SENSORS_THMC50 is not set</div><div class='add'>+# CONFIG_SENSORS_VIA686A is not set</div><div class='ctx'> # CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_VT8231 is not set</div><div class='ctx'> # CONFIG_SENSORS_W83781D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83791D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83792D is not set</div><div class='hunk'>@@ -642,6 +878,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -649,7 +886,15 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='del'>-CONFIG_83xx_WDT=y</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='add'>+# CONFIG_8xxx_WDT is not set</div><div class='add'>+# CONFIG_WATCHDOG_RTAS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCIPCWATCHDOG is not set</div><div class='add'>+# CONFIG_WDTPCI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB-based Watchdog Cards</div><div class='hunk'>@@ -665,8 +910,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -688,6 +935,8 @@ CONFIG_DAB=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_AGP is not set</div><div class='add'>+# CONFIG_DRM is not set</div><div class='ctx'> # CONFIG_VGASTATE is not set</div><div class='ctx'> CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # CONFIG_FB is not set</div><div class='hunk'>@@ -697,10 +946,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -716,7 +961,7 @@ CONFIG_USB_HID=y</div><div class='ctx'> # CONFIG_USB_HIDDEV is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='del'>-# CONFIG_USB_ARCH_HAS_OHCI is not set</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> CONFIG_USB=y</div><div class='ctx'> # CONFIG_USB_DEBUG is not set</div><div class='hunk'>@@ -731,6 +976,7 @@ CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -743,6 +989,8 @@ CONFIG_USB_EHCI_FSL=y</div><div class='ctx'> CONFIG_USB_EHCI_HCD_PPC_OF=y</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='ctx'> # CONFIG_USB_ISP1760_HCD is not set</div><div class='add'>+# CONFIG_USB_OHCI_HCD is not set</div><div class='add'>+# CONFIG_USB_UHCI_HCD is not set</div><div class='ctx'> # CONFIG_USB_SL811_HCD is not set</div><div class='ctx'> # CONFIG_USB_R8A66597_HCD is not set</div><div class='ctx'> </div><div class='hunk'>@@ -768,7 +1016,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -781,7 +1028,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -803,6 +1049,7 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='add'>+# CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> # CONFIG_DMADEVICES is not set</div><div class='hunk'>@@ -872,6 +1119,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -882,14 +1130,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -929,6 +1176,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -952,8 +1200,18 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1011,6 +1269,10 @@ CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1042,5 +1304,7 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='add'>+# CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig<br/>index 1752918be2c1..9245a67da200 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/sbc834x_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/83xx/sbc834x_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/83xx/sbc834x_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/83xx/sbc834x_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:30 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:27 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -16,6 +16,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> # CONFIG_FSL_EMB_PERFMON is not set</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -110,10 +115,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -124,12 +135,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -148,37 +160,49 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-CONFIG_PPC_83xx=y</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='del'>-CONFIG_MPC83xx=y</div><div class='add'>+CONFIG_PPC_83xx=y</div><div class='ctx'> # CONFIG_MPC831x_RDB is not set</div><div class='ctx'> # CONFIG_MPC832x_MDS is not set</div><div class='ctx'> # CONFIG_MPC832x_RDB is not set</div><div class='ctx'> # CONFIG_MPC834x_MDS is not set</div><div class='ctx'> # CONFIG_MPC834x_ITX is not set</div><div class='ctx'> # CONFIG_MPC836x_MDS is not set</div><div class='add'>+# CONFIG_MPC836x_RDK is not set</div><div class='ctx'> # CONFIG_MPC837x_MDS is not set</div><div class='ctx'> # CONFIG_MPC837x_RDB is not set</div><div class='ctx'> CONFIG_SBC834x=y</div><div class='add'>+# CONFIG_ASP834x is not set</div><div class='ctx'> CONFIG_PPC_MPC834x=y</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> CONFIG_IPIC=y</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -204,6 +228,7 @@ CONFIG_BINFMT_ELF=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='hunk'>@@ -216,6 +241,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -223,6 +249,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -230,15 +257,22 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='del'>-# CONFIG_PCI is not set</div><div class='del'>-# CONFIG_PCI_DOMAINS is not set</div><div class='del'>-# CONFIG_PCI_SYSCALL is not set</div><div class='del'>-# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_DOMAINS=y</div><div class='add'>+CONFIG_PCI_SYSCALL=y</div><div class='add'>+# CONFIG_PCIEPORTBUS is not set</div><div class='add'>+CONFIG_ARCH_SUPPORTS_MSI=y</div><div class='add'>+# CONFIG_PCI_MSI is not set</div><div class='add'>+CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='add'>+# CONFIG_HOTPLUG_PCI is not set</div><div class='ctx'> # CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -254,10 +288,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -358,19 +388,30 @@ CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='add'>+# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='add'>+# CONFIG_BLK_DEV_DAC960 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UMEM is not set</div><div class='ctx'> # CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> # CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_SX8 is not set</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+# CONFIG_SGI_IOC4 is not set</div><div class='add'>+# CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -383,15 +424,27 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_SCSI_NETLINK is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='add'>+# CONFIG_FIREWIRE is not set</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='add'>+# CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='ctx'> # CONFIG_VETH is not set</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='ctx'> CONFIG_PHYLIB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -411,16 +464,44 @@ CONFIG_BROADCOM_PHY=y</div><div class='ctx'> # CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_MACE is not set</div><div class='add'>+# CONFIG_BMAC is not set</div><div class='add'>+# CONFIG_HAPPYMEAL is not set</div><div class='add'>+# CONFIG_SUNGEM is not set</div><div class='add'>+# CONFIG_CASSINI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+# CONFIG_NET_TULIP is not set</div><div class='add'>+# CONFIG_HP100 is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_NET_PCI is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='add'>+# CONFIG_ACENIC is not set</div><div class='add'>+# CONFIG_DL2K is not set</div><div class='add'>+# CONFIG_E1000 is not set</div><div class='add'>+# CONFIG_E1000E is not set</div><div class='add'>+# CONFIG_IP1000 is not set</div><div class='add'>+# CONFIG_IGB is not set</div><div class='add'>+# CONFIG_NS83820 is not set</div><div class='add'>+# CONFIG_HAMACHI is not set</div><div class='add'>+# CONFIG_YELLOWFIN is not set</div><div class='add'>+# CONFIG_R8169 is not set</div><div class='add'>+# CONFIG_SIS190 is not set</div><div class='add'>+# CONFIG_SKGE is not set</div><div class='add'>+# CONFIG_SKY2 is not set</div><div class='add'>+# CONFIG_VIA_VELOCITY is not set</div><div class='add'>+# CONFIG_TIGON3 is not set</div><div class='add'>+# CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-# CONFIG_GFAR_NAPI is not set</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='add'>+# CONFIG_QLA3XXX is not set</div><div class='add'>+# CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> # CONFIG_NETDEV_10000 is not set</div><div class='add'>+# CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Wireless LAN</div><div class='hunk'>@@ -429,6 +510,8 @@ CONFIG_GIANFAR=y</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='ctx'> # CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='add'>+# CONFIG_FDDI is not set</div><div class='add'>+# CONFIG_HIPPI is not set</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='hunk'>@@ -474,12 +557,14 @@ CONFIG_INPUT=y</div><div class='ctx'> # CONFIG_VT is not set</div><div class='ctx'> CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+# CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Serial drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_PCI=y</div><div class='ctx'> CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='ctx'> CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='hunk'>@@ -490,40 +575,90 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='add'>+# CONFIG_SERIAL_JSM is not set</div><div class='ctx'> # CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='ctx'> CONFIG_GEN_RTC=y</div><div class='ctx'> # CONFIG_GEN_RTC_X is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_APPLICOM is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALI1535 is not set</div><div class='add'>+# CONFIG_I2C_ALI1563 is not set</div><div class='add'>+# CONFIG_I2C_ALI15X3 is not set</div><div class='add'>+# CONFIG_I2C_AMD756 is not set</div><div class='add'>+# CONFIG_I2C_AMD8111 is not set</div><div class='add'>+# CONFIG_I2C_I801 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='add'>+# CONFIG_I2C_PIIX4 is not set</div><div class='add'>+# CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_SIS5595 is not set</div><div class='add'>+# CONFIG_I2C_SIS630 is not set</div><div class='add'>+# CONFIG_I2C_SIS96X is not set</div><div class='add'>+# CONFIG_I2C_VIA is not set</div><div class='add'>+# CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='ctx'> CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -532,10 +667,13 @@ CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -545,8 +683,10 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_ADM9240 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7470 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_AMS is not set</div><div class='ctx'> # CONFIG_SENSORS_ATXP1 is not set</div><div class='ctx'> # CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_I5K_AMB is not set</div><div class='ctx'> # CONFIG_SENSORS_F71805F is not set</div><div class='ctx'> # CONFIG_SENSORS_F71882FG is not set</div><div class='ctx'> # CONFIG_SENSORS_F75375S is not set</div><div class='hunk'>@@ -568,13 +708,16 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_MAX6650 is not set</div><div class='ctx'> # CONFIG_SENSORS_PC87360 is not set</div><div class='ctx'> # CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_SIS5595 is not set</div><div class='ctx'> # CONFIG_SENSORS_DME1737 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M1 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M192 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47B397 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADS7828 is not set</div><div class='ctx'> # CONFIG_SENSORS_THMC50 is not set</div><div class='add'>+# CONFIG_SENSORS_VIA686A is not set</div><div class='ctx'> # CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_VT8231 is not set</div><div class='ctx'> # CONFIG_SENSORS_W83781D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83791D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83792D is not set</div><div class='hunk'>@@ -585,6 +728,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -592,7 +736,15 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='del'>-CONFIG_83xx_WDT=y</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='add'>+# CONFIG_8xxx_WDT is not set</div><div class='add'>+# CONFIG_WATCHDOG_RTAS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCIPCWATCHDOG is not set</div><div class='add'>+# CONFIG_WDTPCI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Sonics Silicon Backplane</div><div class='hunk'>@@ -603,8 +755,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -625,6 +779,8 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_AGP is not set</div><div class='add'>+# CONFIG_DRM is not set</div><div class='ctx'> # CONFIG_VGASTATE is not set</div><div class='ctx'> # CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='hunk'>@@ -634,10 +790,6 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -648,6 +800,7 @@ CONFIG_HID=y</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='add'>+# CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> # CONFIG_DMADEVICES is not set</div><div class='hunk'>@@ -710,6 +863,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -720,14 +874,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -740,6 +893,7 @@ CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # Partition Types</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MAC_PARTITION=y</div><div class='ctx'> CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # CONFIG_NLS is not set</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='hunk'>@@ -751,6 +905,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -774,8 +929,18 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -829,6 +994,10 @@ CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='head'>diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig<br/>index b82bb042308a..8bb89f26a20d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/ksi8560_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/85xx/ksi8560_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/ksi8560_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/ksi8560_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:30 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:28 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_E500=y</div><div class='add'>+# CONFIG_PPC_E500MC is not set</div><div class='ctx'> CONFIG_BOOKE=y</div><div class='ctx'> CONFIG_FSL_BOOKE=y</div><div class='ctx'> CONFIG_FSL_EMB_PERFMON=y</div><div class='hunk'>@@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='ctx'> # CONFIG_ARCH_NO_VIRT_TO_BUS is not set</div><div class='ctx'> CONFIG_PPC=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='hunk'>@@ -85,7 +88,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -110,10 +112,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -124,6 +132,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -142,8 +151,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -152,11 +159,13 @@ CONFIG_MPC85xx=y</div><div class='ctx'> # CONFIG_MPC8560_ADS is not set</div><div class='ctx'> # CONFIG_MPC85xx_CDS is not set</div><div class='ctx'> # CONFIG_MPC85xx_MDS is not set</div><div class='add'>+# CONFIG_MPC8536_DS is not set</div><div class='ctx'> # CONFIG_MPC85xx_DS is not set</div><div class='ctx'> CONFIG_KSI8560=y</div><div class='ctx'> # CONFIG_STX_GP3 is not set</div><div class='ctx'> # CONFIG_TQM8540 is not set</div><div class='ctx'> # CONFIG_TQM8541 is not set</div><div class='add'>+# CONFIG_TQM8548 is not set</div><div class='ctx'> # CONFIG_TQM8555 is not set</div><div class='ctx'> # CONFIG_TQM8560 is not set</div><div class='ctx'> # CONFIG_SBC8548 is not set</div><div class='hunk'>@@ -173,7 +182,6 @@ CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='ctx'> CONFIG_CPM2=y</div><div class='del'>-CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> CONFIG_CPM=y</div><div class='ctx'> </div><div class='hunk'>@@ -213,6 +221,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -220,6 +229,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> # CONFIG_PROC_DEVICETREE is not set</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -229,6 +239,7 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> # CONFIG_PCI is not set</div><div class='ctx'> # CONFIG_PCI_DOMAINS is not set</div><div class='ctx'> # CONFIG_PCI_SYSCALL is not set</div><div class='hunk'>@@ -250,10 +261,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -427,6 +434,7 @@ CONFIG_MTD_PHYSMAP_OF=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_UBI is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_GPIO=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='hunk'>@@ -440,12 +448,12 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='del'>-CONFIG_IDE_MAX_HWIFS=4</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -463,11 +471,8 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDEDMA is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -480,7 +485,6 @@ CONFIG_IDE_GENERIC=y</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -504,6 +508,7 @@ CONFIG_MARVELL_PHY=y</div><div class='ctx'> # CONFIG_REALTEK_PHY is not set</div><div class='ctx'> # CONFIG_FIXED_PHY is not set</div><div class='ctx'> CONFIG_MDIO_BITBANG=y</div><div class='add'>+# CONFIG_MDIO_OF_GPIO is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='hunk'>@@ -516,9 +521,7 @@ CONFIG_FS_ENET=y</div><div class='ctx'> CONFIG_FS_ENET_HAS_FCC=y</div><div class='ctx'> CONFIG_FS_ENET_MDIO_FCC=y</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -606,6 +609,23 @@ CONFIG_GEN_RTC=y</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_DEBUG_GPIO is not set</div><div class='add'>+# CONFIG_GPIO_SYSFS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='hunk'>@@ -622,6 +642,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -633,8 +654,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -664,10 +687,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -681,6 +700,10 @@ CONFIG_USB_SUPPORT=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -759,6 +782,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -768,12 +792,11 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> # CONFIG_NFS_V3 is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -809,6 +832,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -833,6 +857,8 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -851,17 +877,29 @@ CONFIG_DEBUG_MUTEXES=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='del'>-# CONFIG_KGDB_CONSOLE is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='hunk'>@@ -915,6 +953,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -946,6 +988,7 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='del'>-# CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='add'>+CONFIG_PPC_CLOCK=y</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/mpc8536_ds_defconfig b/arch/powerpc/configs/85xx/mpc8536_ds_defconfig<br/>index f1e2931de5da..6b516bea6e75 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc8536_ds_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/mpc8536_ds_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/mpc8536_ds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/mpc8536_ds_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc8</div><div class='del'>-# Wed Jul  2 01:34:26 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 07:18:18 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -34,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -93,7 +94,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -119,10 +119,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -139,6 +145,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -157,8 +164,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -205,7 +210,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -228,6 +233,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -235,6 +241,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -246,6 +253,7 @@ CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -272,10 +280,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -401,6 +405,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -427,12 +433,14 @@ CONFIG_BLK_DEV_RAM_SIZE=524288</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -512,6 +520,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='hunk'>@@ -588,7 +597,6 @@ CONFIG_SATA_SIL=y</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=y</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -632,7 +640,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -648,9 +655,9 @@ CONFIG_SKY2=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -727,12 +734,14 @@ CONFIG_SERIO_SERPORT=y</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -766,7 +775,7 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-# CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_APPLICOM is not set</div><div class='hunk'>@@ -776,43 +785,64 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> # CONFIG_I2C_CHARDEV is not set</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> CONFIG_SENSORS_EEPROM=y</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -821,6 +851,8 @@ CONFIG_SENSORS_EEPROM=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='hunk'>@@ -836,8 +868,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -879,6 +913,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y</div><div class='ctx'> # CONFIG_DVB_TTUSB_BUDGET is not set</div><div class='ctx'> # CONFIG_DVB_TTUSB_DEC is not set</div><div class='ctx'> # CONFIG_DVB_CINERGYT2 is not set</div><div class='add'>+# CONFIG_DVB_SIANO_SMS1XXX is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Supported FlexCopII (B2C2) Adapters</div><div class='hunk'>@@ -925,6 +960,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y</div><div class='ctx'> # CONFIG_DVB_SP887X is not set</div><div class='ctx'> # CONFIG_DVB_CX22700 is not set</div><div class='ctx'> # CONFIG_DVB_CX22702 is not set</div><div class='add'>+# CONFIG_DVB_DRX397XD is not set</div><div class='ctx'> # CONFIG_DVB_L64781 is not set</div><div class='ctx'> # CONFIG_DVB_TDA1004X is not set</div><div class='ctx'> # CONFIG_DVB_NXT6000 is not set</div><div class='hunk'>@@ -992,15 +1028,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> CONFIG_VGA_CONSOLE=y</div><div class='ctx'> # CONFIG_VGACON_SOFT_SCROLLBACK is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=y</div><div class='ctx'> CONFIG_SND_TIMER=y</div><div class='ctx'> CONFIG_SND_PCM=y</div><div class='hunk'>@@ -1012,19 +1040,15 @@ CONFIG_SND_SUPPORT_OLD_API=y</div><div class='ctx'> CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_VMASTER=y</div><div class='ctx'> CONFIG_SND_AC97_CODEC=y</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='ctx'> # CONFIG_SND_DUMMY is not set</div><div class='ctx'> # CONFIG_SND_MTPAV is not set</div><div class='ctx'> # CONFIG_SND_SERIAL_U16550 is not set</div><div class='ctx'> # CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='add'>+CONFIG_SND_PCI=y</div><div class='ctx'> # CONFIG_SND_AD1889 is not set</div><div class='ctx'> # CONFIG_SND_ALS300 is not set</div><div class='ctx'> # CONFIG_SND_ALS4000 is not set</div><div class='hunk'>@@ -1086,39 +1110,12 @@ CONFIG_SND_INTEL8X0=y</div><div class='ctx'> # CONFIG_SND_VIRTUOSO is not set</div><div class='ctx'> # CONFIG_SND_VX222 is not set</div><div class='ctx'> # CONFIG_SND_YMFPCI is not set</div><div class='del'>-# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerMac devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerPC devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PPC=y</div><div class='add'>+CONFIG_SND_USB=y</div><div class='ctx'> # CONFIG_SND_USB_AUDIO is not set</div><div class='ctx'> # CONFIG_SND_USB_USX2Y is not set</div><div class='ctx'> # CONFIG_SND_USB_CAIAQ is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio for the Texas Instruments OMAP</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> CONFIG_AC97_BUS=y</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='hunk'>@@ -1150,6 +1147,7 @@ CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1201,6 +1199,7 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1209,7 +1208,6 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1222,7 +1220,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1310,6 +1307,7 @@ CONFIG_DMA_ENGINE=y</div><div class='ctx'> # DMA Clients</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_DMA is not set</div><div class='add'>+# CONFIG_DMATEST is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1387,6 +1385,7 @@ CONFIG_EFS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> CONFIG_VXFS_FS=m</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> CONFIG_QNX4FS_FS=m</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1399,17 +1398,16 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=y</div><div class='ctx'> # CONFIG_NFSD_V3 is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1488,6 +1486,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1513,6 +1512,8 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1531,19 +1532,29 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='ctx'> # CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='ctx'> # CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='hunk'>@@ -1561,13 +1572,14 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # Crypto core or helper</div><div class='ctx'> #</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_AEAD=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='ctx'> CONFIG_CRYPTO_HASH=y</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='ctx'> # CONFIG_CRYPTO_GF128MUL is not set</div><div class='ctx'> # CONFIG_CRYPTO_NULL is not set</div><div class='ctx'> # CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+CONFIG_CRYPTO_AUTHENC=y</div><div class='ctx'> # CONFIG_CRYPTO_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1601,6 +1613,10 @@ CONFIG_CRYPTO_HMAC=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1633,5 +1649,6 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+CONFIG_CRYPTO_DEV_TALITOS=y</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig<br/>index f33fd516fd54..1ea181f826f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/mpc8540_ads_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/85xx/mpc8540_ads_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/mpc8540_ads_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/mpc8540_ads_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:31 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:30 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_E500=y</div><div class='add'>+# CONFIG_PPC_E500MC is not set</div><div class='ctx'> CONFIG_BOOKE=y</div><div class='ctx'> CONFIG_FSL_BOOKE=y</div><div class='ctx'> CONFIG_FSL_EMB_PERFMON=y</div><div class='hunk'>@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -114,10 +115,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -128,6 +135,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -146,8 +154,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -156,11 +162,13 @@ CONFIG_MPC8540_ADS=y</div><div class='ctx'> # CONFIG_MPC8560_ADS is not set</div><div class='ctx'> # CONFIG_MPC85xx_CDS is not set</div><div class='ctx'> # CONFIG_MPC85xx_MDS is not set</div><div class='add'>+# CONFIG_MPC8536_DS is not set</div><div class='ctx'> # CONFIG_MPC85xx_DS is not set</div><div class='ctx'> # CONFIG_KSI8560 is not set</div><div class='ctx'> # CONFIG_STX_GP3 is not set</div><div class='ctx'> # CONFIG_TQM8540 is not set</div><div class='ctx'> # CONFIG_TQM8541 is not set</div><div class='add'>+# CONFIG_TQM8548 is not set</div><div class='ctx'> # CONFIG_TQM8555 is not set</div><div class='ctx'> # CONFIG_TQM8560 is not set</div><div class='ctx'> # CONFIG_SBC8548 is not set</div><div class='hunk'>@@ -192,7 +200,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -215,6 +223,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -222,6 +231,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -231,6 +241,7 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> # CONFIG_PCI is not set</div><div class='ctx'> # CONFIG_PCI_DOMAINS is not set</div><div class='ctx'> # CONFIG_PCI_SYSCALL is not set</div><div class='hunk'>@@ -252,10 +263,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -367,6 +374,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -384,7 +392,6 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -416,9 +423,7 @@ CONFIG_MII=y</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -504,6 +509,8 @@ CONFIG_GEN_RTC=y</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='hunk'>@@ -520,6 +527,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -531,8 +539,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -562,10 +572,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -579,6 +585,10 @@ CONFIG_USB_SUPPORT=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -655,6 +665,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -664,12 +675,11 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> # CONFIG_NFS_V3 is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -705,6 +715,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -729,6 +740,8 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -746,16 +759,29 @@ CONFIG_DEBUG_MUTEXES=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -808,6 +834,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -839,5 +869,6 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig<br/>index a0583e5119f5..1aecdeab9841 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/mpc8544_ds_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/85xx/mpc8544_ds_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/mpc8544_ds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/mpc8544_ds_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:32 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 07:20:43 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_E500=y</div><div class='add'>+# CONFIG_PPC_E500MC is not set</div><div class='ctx'> CONFIG_BOOKE=y</div><div class='ctx'> CONFIG_FSL_BOOKE=y</div><div class='ctx'> CONFIG_FSL_EMB_PERFMON=y</div><div class='hunk'>@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -92,7 +94,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -118,10 +119,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -138,6 +145,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -156,8 +164,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -166,11 +172,13 @@ CONFIG_MPC85xx=y</div><div class='ctx'> # CONFIG_MPC8560_ADS is not set</div><div class='ctx'> # CONFIG_MPC85xx_CDS is not set</div><div class='ctx'> # CONFIG_MPC85xx_MDS is not set</div><div class='add'>+# CONFIG_MPC8536_DS is not set</div><div class='ctx'> CONFIG_MPC85xx_DS=y</div><div class='ctx'> # CONFIG_KSI8560 is not set</div><div class='ctx'> # CONFIG_STX_GP3 is not set</div><div class='ctx'> # CONFIG_TQM8540 is not set</div><div class='ctx'> # CONFIG_TQM8541 is not set</div><div class='add'>+# CONFIG_TQM8548 is not set</div><div class='ctx'> # CONFIG_TQM8555 is not set</div><div class='ctx'> # CONFIG_TQM8560 is not set</div><div class='ctx'> # CONFIG_SBC8548 is not set</div><div class='hunk'>@@ -202,7 +210,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -225,6 +233,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -232,6 +241,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -244,6 +254,7 @@ CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -270,10 +281,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -399,6 +406,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -425,12 +434,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -510,6 +521,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='hunk'>@@ -577,12 +589,15 @@ CONFIG_PATA_ALI=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=y</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -626,7 +641,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -640,9 +654,9 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -719,12 +733,14 @@ CONFIG_SERIO_SERPORT=y</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -758,7 +774,7 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-# CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='ctx'> CONFIG_NVRAM=y</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_APPLICOM is not set</div><div class='hunk'>@@ -768,43 +784,64 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> # CONFIG_I2C_CHARDEV is not set</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> CONFIG_SENSORS_EEPROM=y</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -813,10 +850,13 @@ CONFIG_SENSORS_EEPROM=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -828,8 +868,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -871,6 +913,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y</div><div class='ctx'> # CONFIG_DVB_TTUSB_BUDGET is not set</div><div class='ctx'> # CONFIG_DVB_TTUSB_DEC is not set</div><div class='ctx'> # CONFIG_DVB_CINERGYT2 is not set</div><div class='add'>+# CONFIG_DVB_SIANO_SMS1XXX is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Supported FlexCopII (B2C2) Adapters</div><div class='hunk'>@@ -917,6 +960,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y</div><div class='ctx'> # CONFIG_DVB_SP887X is not set</div><div class='ctx'> # CONFIG_DVB_CX22700 is not set</div><div class='ctx'> # CONFIG_DVB_CX22702 is not set</div><div class='add'>+# CONFIG_DVB_DRX397XD is not set</div><div class='ctx'> # CONFIG_DVB_L64781 is not set</div><div class='ctx'> # CONFIG_DVB_TDA1004X is not set</div><div class='ctx'> # CONFIG_DVB_NXT6000 is not set</div><div class='hunk'>@@ -984,15 +1028,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> CONFIG_VGA_CONSOLE=y</div><div class='ctx'> # CONFIG_VGACON_SOFT_SCROLLBACK is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=y</div><div class='ctx'> CONFIG_SND_TIMER=y</div><div class='ctx'> CONFIG_SND_PCM=y</div><div class='hunk'>@@ -1006,19 +1042,15 @@ CONFIG_SND_PCM_OSS_PLUGINS=y</div><div class='ctx'> CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_VMASTER=y</div><div class='ctx'> CONFIG_SND_AC97_CODEC=y</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='ctx'> # CONFIG_SND_DUMMY is not set</div><div class='ctx'> # CONFIG_SND_MTPAV is not set</div><div class='ctx'> # CONFIG_SND_SERIAL_U16550 is not set</div><div class='ctx'> # CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='add'>+CONFIG_SND_PCI=y</div><div class='ctx'> # CONFIG_SND_AD1889 is not set</div><div class='ctx'> # CONFIG_SND_ALS300 is not set</div><div class='ctx'> # CONFIG_SND_ALS4000 is not set</div><div class='hunk'>@@ -1080,39 +1112,12 @@ CONFIG_SND_INTEL8X0=y</div><div class='ctx'> # CONFIG_SND_VIRTUOSO is not set</div><div class='ctx'> # CONFIG_SND_VX222 is not set</div><div class='ctx'> # CONFIG_SND_YMFPCI is not set</div><div class='del'>-# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerMac devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerPC devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PPC=y</div><div class='add'>+CONFIG_SND_USB=y</div><div class='ctx'> # CONFIG_SND_USB_AUDIO is not set</div><div class='ctx'> # CONFIG_SND_USB_USX2Y is not set</div><div class='ctx'> # CONFIG_SND_USB_CAIAQ is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio for the Texas Instruments OMAP</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> CONFIG_AC97_BUS=y</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='hunk'>@@ -1144,6 +1149,7 @@ CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1195,6 +1201,7 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1203,7 +1210,6 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1216,7 +1222,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1270,6 +1275,7 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -1303,6 +1309,7 @@ CONFIG_DMA_ENGINE=y</div><div class='ctx'> # DMA Clients</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_DMA is not set</div><div class='add'>+# CONFIG_DMATEST is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1379,6 +1386,7 @@ CONFIG_EFS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> CONFIG_VXFS_FS=m</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> CONFIG_QNX4FS_FS=m</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1391,17 +1399,16 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=y</div><div class='ctx'> # CONFIG_NFSD_V3 is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1480,6 +1487,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1505,6 +1513,8 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1523,17 +1533,29 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -1550,13 +1572,14 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # Crypto core or helper</div><div class='ctx'> #</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_AEAD=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='ctx'> CONFIG_CRYPTO_HASH=y</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='ctx'> # CONFIG_CRYPTO_GF128MUL is not set</div><div class='ctx'> # CONFIG_CRYPTO_NULL is not set</div><div class='ctx'> # CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+CONFIG_CRYPTO_AUTHENC=y</div><div class='ctx'> # CONFIG_CRYPTO_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1590,6 +1613,10 @@ CONFIG_CRYPTO_HMAC=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1622,5 +1649,6 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+CONFIG_CRYPTO_DEV_TALITOS=y</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig<br/>index e19592b42043..06e26d906f65 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/mpc8560_ads_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/85xx/mpc8560_ads_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/mpc8560_ads_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/mpc8560_ads_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:33 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:32 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_E500=y</div><div class='add'>+# CONFIG_PPC_E500MC is not set</div><div class='ctx'> CONFIG_BOOKE=y</div><div class='ctx'> CONFIG_FSL_BOOKE=y</div><div class='ctx'> CONFIG_FSL_EMB_PERFMON=y</div><div class='hunk'>@@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='ctx'> # CONFIG_ARCH_NO_VIRT_TO_BUS is not set</div><div class='ctx'> CONFIG_PPC=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='hunk'>@@ -89,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -114,10 +116,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -128,6 +136,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -146,8 +155,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -156,11 +163,13 @@ CONFIG_MPC85xx=y</div><div class='ctx'> CONFIG_MPC8560_ADS=y</div><div class='ctx'> # CONFIG_MPC85xx_CDS is not set</div><div class='ctx'> # CONFIG_MPC85xx_MDS is not set</div><div class='add'>+# CONFIG_MPC8536_DS is not set</div><div class='ctx'> # CONFIG_MPC85xx_DS is not set</div><div class='ctx'> # CONFIG_KSI8560 is not set</div><div class='ctx'> # CONFIG_STX_GP3 is not set</div><div class='ctx'> # CONFIG_TQM8540 is not set</div><div class='ctx'> # CONFIG_TQM8541 is not set</div><div class='add'>+# CONFIG_TQM8548 is not set</div><div class='ctx'> # CONFIG_TQM8555 is not set</div><div class='ctx'> # CONFIG_TQM8560 is not set</div><div class='ctx'> # CONFIG_SBC8548 is not set</div><div class='hunk'>@@ -177,7 +186,6 @@ CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='ctx'> CONFIG_CPM2=y</div><div class='del'>-CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> CONFIG_CPM=y</div><div class='ctx'> </div><div class='hunk'>@@ -217,6 +225,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -224,6 +233,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> # CONFIG_PROC_DEVICETREE is not set</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -235,6 +245,7 @@ CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -261,10 +272,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -363,6 +370,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_GPIO=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='hunk'>@@ -381,12 +389,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -404,12 +414,15 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -456,10 +469,8 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_ACENIC is not set</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> CONFIG_E1000=y</div><div class='del'>-CONFIG_E1000_NAPI=y</div><div class='ctx'> # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -473,9 +484,9 @@ CONFIG_E1000_NAPI=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -582,6 +593,24 @@ CONFIG_GEN_RTC=y</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_DEBUG_GPIO is not set</div><div class='add'>+# CONFIG_GPIO_SYSFS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_BT8XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='hunk'>@@ -602,6 +631,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -613,8 +643,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -646,10 +678,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -664,6 +692,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -741,6 +773,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -750,12 +783,11 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> # CONFIG_NFS_V3 is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -791,6 +823,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -815,6 +848,8 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -832,17 +867,29 @@ CONFIG_DEBUG_MUTEXES=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='del'>-# CONFIG_KGDB_CONSOLE is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -895,6 +942,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -927,6 +978,7 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='del'>-# CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='add'>+CONFIG_PPC_CLOCK=y</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/85xx/mpc8568mds_defconfig b/arch/powerpc/configs/85xx/mpc8568mds_defconfig<br/>index 28004e93aeee..dc27c74955fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/mpc8568mds_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/85xx/mpc8568mds_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/mpc8568mds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/mpc8568mds_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:34 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:33 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_E500=y</div><div class='add'>+# CONFIG_PPC_E500MC is not set</div><div class='ctx'> CONFIG_BOOKE=y</div><div class='ctx'> CONFIG_FSL_BOOKE=y</div><div class='ctx'> CONFIG_FSL_EMB_PERFMON=y</div><div class='hunk'>@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='hunk'>@@ -112,10 +113,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -126,12 +133,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -150,8 +158,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -160,11 +166,13 @@ CONFIG_MPC85xx=y</div><div class='ctx'> # CONFIG_MPC8560_ADS is not set</div><div class='ctx'> # CONFIG_MPC85xx_CDS is not set</div><div class='ctx'> CONFIG_MPC85xx_MDS=y</div><div class='add'>+# CONFIG_MPC8536_DS is not set</div><div class='ctx'> # CONFIG_MPC85xx_DS is not set</div><div class='ctx'> # CONFIG_KSI8560 is not set</div><div class='ctx'> # CONFIG_STX_GP3 is not set</div><div class='ctx'> # CONFIG_TQM8540 is not set</div><div class='ctx'> # CONFIG_TQM8541 is not set</div><div class='add'>+# CONFIG_TQM8548 is not set</div><div class='ctx'> # CONFIG_TQM8555 is not set</div><div class='ctx'> # CONFIG_TQM8560 is not set</div><div class='ctx'> # CONFIG_SBC8548 is not set</div><div class='hunk'>@@ -197,7 +205,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -220,6 +228,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -227,6 +236,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -238,6 +248,7 @@ CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -264,10 +275,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -385,12 +392,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -468,6 +477,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='hunk'>@@ -475,12 +485,15 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -524,7 +537,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -538,10 +550,10 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> # CONFIG_UCC_GETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -648,42 +660,63 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -692,10 +725,13 @@ CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -749,6 +785,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -756,6 +793,7 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='ctx'> # CONFIG_BOOKE_WDT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -773,8 +811,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -806,10 +846,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -824,6 +860,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -862,6 +902,7 @@ CONFIG_RTC_DRV_DS1374=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -950,6 +991,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -960,14 +1002,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -995,6 +1036,7 @@ CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> # CONFIG_SYSV68_PARTITION is not set</div><div class='ctx'> # CONFIG_NLS is not set</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='add'>+# CONFIG_QE_GPIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='hunk'>@@ -1003,6 +1045,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1027,6 +1070,8 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1044,17 +1089,28 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-CONFIG_DEBUGGER=y</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='ctx'> # CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='hunk'>@@ -1122,6 +1178,10 @@ CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1154,6 +1214,7 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig<br/>index 164fd9606ee6..eda45bb8a13f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/mpc8572_ds_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/85xx/mpc8572_ds_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/mpc8572_ds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/mpc8572_ds_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:35 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 07:21:42 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_E500=y</div><div class='add'>+# CONFIG_PPC_E500MC is not set</div><div class='ctx'> CONFIG_BOOKE=y</div><div class='ctx'> CONFIG_FSL_BOOKE=y</div><div class='ctx'> CONFIG_FSL_EMB_PERFMON=y</div><div class='hunk'>@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -92,7 +94,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -118,10 +119,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -138,6 +145,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -156,8 +164,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -166,11 +172,13 @@ CONFIG_MPC85xx=y</div><div class='ctx'> # CONFIG_MPC8560_ADS is not set</div><div class='ctx'> # CONFIG_MPC85xx_CDS is not set</div><div class='ctx'> # CONFIG_MPC85xx_MDS is not set</div><div class='add'>+# CONFIG_MPC8536_DS is not set</div><div class='ctx'> CONFIG_MPC85xx_DS=y</div><div class='ctx'> # CONFIG_KSI8560 is not set</div><div class='ctx'> # CONFIG_STX_GP3 is not set</div><div class='ctx'> # CONFIG_TQM8540 is not set</div><div class='ctx'> # CONFIG_TQM8541 is not set</div><div class='add'>+# CONFIG_TQM8548 is not set</div><div class='ctx'> # CONFIG_TQM8555 is not set</div><div class='ctx'> # CONFIG_TQM8560 is not set</div><div class='ctx'> # CONFIG_SBC8548 is not set</div><div class='hunk'>@@ -202,7 +210,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -225,6 +233,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -232,6 +241,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -244,6 +254,7 @@ CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -270,10 +281,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -399,6 +406,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -425,12 +434,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -510,6 +521,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='hunk'>@@ -577,12 +589,15 @@ CONFIG_PATA_ALI=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=y</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -626,7 +641,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -640,9 +654,9 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -719,12 +733,14 @@ CONFIG_SERIO_SERPORT=y</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -758,7 +774,7 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-# CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='ctx'> CONFIG_NVRAM=y</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_APPLICOM is not set</div><div class='hunk'>@@ -768,43 +784,64 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> # CONFIG_I2C_CHARDEV is not set</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> CONFIG_SENSORS_EEPROM=y</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -813,10 +850,13 @@ CONFIG_SENSORS_EEPROM=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -828,8 +868,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -871,6 +913,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y</div><div class='ctx'> # CONFIG_DVB_TTUSB_BUDGET is not set</div><div class='ctx'> # CONFIG_DVB_TTUSB_DEC is not set</div><div class='ctx'> # CONFIG_DVB_CINERGYT2 is not set</div><div class='add'>+# CONFIG_DVB_SIANO_SMS1XXX is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Supported FlexCopII (B2C2) Adapters</div><div class='hunk'>@@ -917,6 +960,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y</div><div class='ctx'> # CONFIG_DVB_SP887X is not set</div><div class='ctx'> # CONFIG_DVB_CX22700 is not set</div><div class='ctx'> # CONFIG_DVB_CX22702 is not set</div><div class='add'>+# CONFIG_DVB_DRX397XD is not set</div><div class='ctx'> # CONFIG_DVB_L64781 is not set</div><div class='ctx'> # CONFIG_DVB_TDA1004X is not set</div><div class='ctx'> # CONFIG_DVB_NXT6000 is not set</div><div class='hunk'>@@ -984,15 +1028,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> CONFIG_VGA_CONSOLE=y</div><div class='ctx'> # CONFIG_VGACON_SOFT_SCROLLBACK is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=y</div><div class='ctx'> CONFIG_SND_TIMER=y</div><div class='ctx'> CONFIG_SND_PCM=y</div><div class='hunk'>@@ -1006,19 +1042,15 @@ CONFIG_SND_PCM_OSS_PLUGINS=y</div><div class='ctx'> CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_VMASTER=y</div><div class='ctx'> CONFIG_SND_AC97_CODEC=y</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='ctx'> # CONFIG_SND_DUMMY is not set</div><div class='ctx'> # CONFIG_SND_MTPAV is not set</div><div class='ctx'> # CONFIG_SND_SERIAL_U16550 is not set</div><div class='ctx'> # CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='add'>+CONFIG_SND_PCI=y</div><div class='ctx'> # CONFIG_SND_AD1889 is not set</div><div class='ctx'> # CONFIG_SND_ALS300 is not set</div><div class='ctx'> # CONFIG_SND_ALS4000 is not set</div><div class='hunk'>@@ -1080,39 +1112,12 @@ CONFIG_SND_INTEL8X0=y</div><div class='ctx'> # CONFIG_SND_VIRTUOSO is not set</div><div class='ctx'> # CONFIG_SND_VX222 is not set</div><div class='ctx'> # CONFIG_SND_YMFPCI is not set</div><div class='del'>-# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerMac devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerPC devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PPC=y</div><div class='add'>+CONFIG_SND_USB=y</div><div class='ctx'> # CONFIG_SND_USB_AUDIO is not set</div><div class='ctx'> # CONFIG_SND_USB_USX2Y is not set</div><div class='ctx'> # CONFIG_SND_USB_CAIAQ is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio for the Texas Instruments OMAP</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> CONFIG_AC97_BUS=y</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='hunk'>@@ -1144,6 +1149,7 @@ CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1195,6 +1201,7 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1203,7 +1210,6 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1216,7 +1222,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1270,6 +1275,7 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -1368,6 +1374,7 @@ CONFIG_EFS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> CONFIG_VXFS_FS=m</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> CONFIG_QNX4FS_FS=m</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1380,17 +1387,16 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=y</div><div class='ctx'> # CONFIG_NFSD_V3 is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1469,6 +1475,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1494,6 +1501,8 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1512,17 +1521,29 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -1539,13 +1560,14 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # Crypto core or helper</div><div class='ctx'> #</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_AEAD=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='ctx'> CONFIG_CRYPTO_HASH=y</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='ctx'> # CONFIG_CRYPTO_GF128MUL is not set</div><div class='ctx'> # CONFIG_CRYPTO_NULL is not set</div><div class='ctx'> # CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+CONFIG_CRYPTO_AUTHENC=y</div><div class='ctx'> # CONFIG_CRYPTO_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1579,6 +1601,10 @@ CONFIG_CRYPTO_HMAC=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1611,5 +1637,6 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+CONFIG_CRYPTO_DEV_TALITOS=y</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig<br/>index b09f0032a10b..97f3c4fe440b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/85xx/mpc85xx_cds_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/mpc85xx_cds_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:36 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:34 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_E500=y</div><div class='add'>+# CONFIG_PPC_E500MC is not set</div><div class='ctx'> CONFIG_BOOKE=y</div><div class='ctx'> CONFIG_FSL_BOOKE=y</div><div class='ctx'> CONFIG_FSL_EMB_PERFMON=y</div><div class='hunk'>@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -114,10 +115,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -128,6 +135,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -146,8 +154,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -156,11 +162,13 @@ CONFIG_MPC85xx=y</div><div class='ctx'> # CONFIG_MPC8560_ADS is not set</div><div class='ctx'> CONFIG_MPC85xx_CDS=y</div><div class='ctx'> # CONFIG_MPC85xx_MDS is not set</div><div class='add'>+# CONFIG_MPC8536_DS is not set</div><div class='ctx'> # CONFIG_MPC85xx_DS is not set</div><div class='ctx'> # CONFIG_KSI8560 is not set</div><div class='ctx'> # CONFIG_STX_GP3 is not set</div><div class='ctx'> # CONFIG_TQM8540 is not set</div><div class='ctx'> # CONFIG_TQM8541 is not set</div><div class='add'>+# CONFIG_TQM8548 is not set</div><div class='ctx'> # CONFIG_TQM8555 is not set</div><div class='ctx'> # CONFIG_TQM8560 is not set</div><div class='ctx'> # CONFIG_SBC8548 is not set</div><div class='hunk'>@@ -192,7 +200,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -215,6 +223,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -222,6 +231,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -233,6 +243,7 @@ CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -259,10 +270,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -379,20 +386,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='del'>-CONFIG_IDE_MAX_HWIFS=4</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_TIMINGS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDEDISK is not set</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='hunk'>@@ -405,7 +414,6 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_SFF=y</div><div class='ctx'> </div><div class='hunk'>@@ -423,10 +431,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -444,8 +450,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> CONFIG_BLK_DEV_VIA82CXXX=y</div><div class='ctx'> # CONFIG_BLK_DEV_TC86C001 is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -461,12 +465,15 @@ CONFIG_BLK_DEV_IDEDMA=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -509,10 +516,8 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_ACENIC is not set</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> CONFIG_E1000=y</div><div class='del'>-CONFIG_E1000_NAPI=y</div><div class='ctx'> # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -526,9 +531,9 @@ CONFIG_E1000_NAPI=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -634,6 +639,8 @@ CONFIG_GEN_RTC=y</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='hunk'>@@ -654,6 +661,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -665,8 +673,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -698,10 +708,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -716,6 +722,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -793,6 +803,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -802,12 +813,11 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> # CONFIG_NFS_V3 is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -843,6 +853,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -867,6 +878,8 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -884,16 +897,29 @@ CONFIG_DEBUG_MUTEXES=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -946,6 +972,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -978,5 +1008,6 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig<br/>index 24f7f44b4821..41cedc4b63f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/sbc8548_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/85xx/sbc8548_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/sbc8548_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/sbc8548_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:37 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:35 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_E500=y</div><div class='add'>+# CONFIG_PPC_E500MC is not set</div><div class='ctx'> CONFIG_BOOKE=y</div><div class='ctx'> CONFIG_FSL_BOOKE=y</div><div class='ctx'> CONFIG_FSL_EMB_PERFMON=y</div><div class='hunk'>@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='hunk'>@@ -112,10 +113,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -126,6 +133,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -144,8 +152,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -154,11 +160,13 @@ CONFIG_MPC85xx=y</div><div class='ctx'> # CONFIG_MPC8560_ADS is not set</div><div class='ctx'> # CONFIG_MPC85xx_CDS is not set</div><div class='ctx'> # CONFIG_MPC85xx_MDS is not set</div><div class='add'>+# CONFIG_MPC8536_DS is not set</div><div class='ctx'> # CONFIG_MPC85xx_DS is not set</div><div class='ctx'> # CONFIG_KSI8560 is not set</div><div class='ctx'> # CONFIG_STX_GP3 is not set</div><div class='ctx'> # CONFIG_TQM8540 is not set</div><div class='ctx'> # CONFIG_TQM8541 is not set</div><div class='add'>+# CONFIG_TQM8548 is not set</div><div class='ctx'> # CONFIG_TQM8555 is not set</div><div class='ctx'> # CONFIG_TQM8560 is not set</div><div class='ctx'> CONFIG_SBC8548=y</div><div class='hunk'>@@ -213,6 +221,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -220,6 +229,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -231,6 +241,7 @@ CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -256,10 +267,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -374,12 +381,14 @@ CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -397,12 +406,15 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -446,7 +458,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -460,9 +471,9 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -568,6 +579,8 @@ CONFIG_GEN_RTC=y</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='hunk'>@@ -588,6 +601,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -599,8 +613,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -632,10 +648,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_HID_SUPPORT is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='hunk'>@@ -706,6 +718,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -715,12 +728,11 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> # CONFIG_NFS_V3 is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -744,6 +756,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -767,7 +780,16 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -819,6 +841,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -851,5 +877,6 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/85xx/sbc8560_defconfig b/arch/powerpc/configs/85xx/sbc8560_defconfig<br/>index 655518dcd73f..daef36f41b42 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/sbc8560_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/85xx/sbc8560_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/sbc8560_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/sbc8560_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:38 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:36 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_E500=y</div><div class='add'>+# CONFIG_PPC_E500MC is not set</div><div class='ctx'> CONFIG_BOOKE=y</div><div class='ctx'> CONFIG_FSL_BOOKE=y</div><div class='ctx'> CONFIG_FSL_EMB_PERFMON=y</div><div class='hunk'>@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -113,10 +114,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -127,6 +134,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -145,8 +153,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -155,11 +161,13 @@ CONFIG_MPC85xx=y</div><div class='ctx'> # CONFIG_MPC8560_ADS is not set</div><div class='ctx'> # CONFIG_MPC85xx_CDS is not set</div><div class='ctx'> # CONFIG_MPC85xx_MDS is not set</div><div class='add'>+# CONFIG_MPC8536_DS is not set</div><div class='ctx'> # CONFIG_MPC85xx_DS is not set</div><div class='ctx'> # CONFIG_KSI8560 is not set</div><div class='ctx'> # CONFIG_STX_GP3 is not set</div><div class='ctx'> # CONFIG_TQM8540 is not set</div><div class='ctx'> # CONFIG_TQM8541 is not set</div><div class='add'>+# CONFIG_TQM8548 is not set</div><div class='ctx'> # CONFIG_TQM8555 is not set</div><div class='ctx'> # CONFIG_TQM8560 is not set</div><div class='ctx'> # CONFIG_SBC8548 is not set</div><div class='hunk'>@@ -214,6 +222,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -221,6 +230,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -230,6 +240,7 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> # CONFIG_PCI is not set</div><div class='ctx'> # CONFIG_PCI_DOMAINS is not set</div><div class='ctx'> # CONFIG_PCI_SYSCALL is not set</div><div class='hunk'>@@ -251,10 +262,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -366,6 +373,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -383,7 +391,6 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -415,9 +422,7 @@ CONFIG_MII=y</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -501,6 +506,8 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='hunk'>@@ -517,6 +524,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -528,8 +536,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -559,10 +569,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -576,6 +582,10 @@ CONFIG_USB_SUPPORT=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -679,6 +689,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -688,12 +699,11 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> # CONFIG_NFS_V3 is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -729,6 +739,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -753,6 +764,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -769,16 +782,29 @@ CONFIG_DEBUG_MUTEXES=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> CONFIG_PPC_EARLY_DEBUG=y</div><div class='hunk'>@@ -842,6 +868,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -873,5 +903,6 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig<br/>index 7804ca1ecc94..2b05d43f8f7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/stx_gp3_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/85xx/stx_gp3_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/stx_gp3_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/stx_gp3_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:38 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:37 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_E500=y</div><div class='add'>+# CONFIG_PPC_E500MC is not set</div><div class='ctx'> CONFIG_BOOKE=y</div><div class='ctx'> CONFIG_FSL_BOOKE=y</div><div class='ctx'> CONFIG_FSL_EMB_PERFMON=y</div><div class='hunk'>@@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='ctx'> # CONFIG_ARCH_NO_VIRT_TO_BUS is not set</div><div class='ctx'> CONFIG_PPC=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='hunk'>@@ -89,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -115,10 +117,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -134,6 +142,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -152,8 +161,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -162,11 +169,13 @@ CONFIG_MPC85xx=y</div><div class='ctx'> # CONFIG_MPC8560_ADS is not set</div><div class='ctx'> # CONFIG_MPC85xx_CDS is not set</div><div class='ctx'> # CONFIG_MPC85xx_MDS is not set</div><div class='add'>+# CONFIG_MPC8536_DS is not set</div><div class='ctx'> # CONFIG_MPC85xx_DS is not set</div><div class='ctx'> # CONFIG_KSI8560 is not set</div><div class='ctx'> CONFIG_STX_GP3=y</div><div class='ctx'> # CONFIG_TQM8540 is not set</div><div class='ctx'> # CONFIG_TQM8541 is not set</div><div class='add'>+# CONFIG_TQM8548 is not set</div><div class='ctx'> # CONFIG_TQM8555 is not set</div><div class='ctx'> # CONFIG_TQM8560 is not set</div><div class='ctx'> # CONFIG_SBC8548 is not set</div><div class='hunk'>@@ -183,7 +192,6 @@ CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='ctx'> CONFIG_CPM2=y</div><div class='del'>-CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> CONFIG_CPM=y</div><div class='ctx'> </div><div class='hunk'>@@ -223,6 +231,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -230,6 +239,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -241,6 +251,7 @@ CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -267,10 +278,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -426,6 +433,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_GPIO=y</div><div class='ctx'> CONFIG_OF_I2C=m</div><div class='ctx'> CONFIG_PARPORT=m</div><div class='ctx'> CONFIG_PARPORT_PC=m</div><div class='hunk'>@@ -452,15 +460,16 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='del'>-CONFIG_IDE_MAX_HWIFS=4</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -480,7 +489,6 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -493,10 +501,8 @@ CONFIG_IDE_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -514,8 +520,6 @@ CONFIG_IDE_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_VIA82CXXX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TC86C001 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDEDMA is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -594,6 +598,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='hunk'>@@ -601,12 +606,15 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -652,7 +660,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -666,9 +673,9 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -731,6 +738,7 @@ CONFIG_KEYBOARD_ATKBD=y</div><div class='ctx'> # CONFIG_KEYBOARD_XTKBD is not set</div><div class='ctx'> # CONFIG_KEYBOARD_NEWTON is not set</div><div class='ctx'> # CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='ctx'> CONFIG_INPUT_MOUSE=y</div><div class='ctx'> CONFIG_MOUSE_PS2=y</div><div class='ctx'> CONFIG_MOUSE_PS2_ALPS=y</div><div class='hunk'>@@ -741,7 +749,9 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y</div><div class='ctx'> # CONFIG_MOUSE_PS2_TOUCHKIT is not set</div><div class='ctx'> # CONFIG_MOUSE_SERIAL is not set</div><div class='ctx'> # CONFIG_MOUSE_APPLETOUCH is not set</div><div class='add'>+# CONFIG_MOUSE_BCM5974 is not set</div><div class='ctx'> # CONFIG_MOUSE_VSXXXAA is not set</div><div class='add'>+# CONFIG_MOUSE_GPIO is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='ctx'> # CONFIG_INPUT_TABLET is not set</div><div class='ctx'> # CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='hunk'>@@ -757,6 +767,7 @@ CONFIG_SERIO_SERPORT=y</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -805,44 +816,68 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=m</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=m</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-# CONFIG_I2C_MPC is not set</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_CPM is not set</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+# CONFIG_I2C_MPC is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT is not set</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CORE is not set</div><div class='hunk'>@@ -850,10 +885,32 @@ CONFIG_I2C_CHARDEV=m</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_DEBUG_GPIO is not set</div><div class='add'>+# CONFIG_GPIO_SYSFS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='add'>+# CONFIG_GPIO_PCA953X is not set</div><div class='add'>+# CONFIG_GPIO_PCF857X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_BT8XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -907,6 +964,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -918,8 +976,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -958,20 +1018,8 @@ CONFIG_DRM=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -986,6 +1034,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -1070,6 +1122,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1080,13 +1133,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='hunk'>@@ -1150,6 +1202,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=y</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=m</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1175,6 +1228,8 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1193,18 +1248,29 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='del'>-# CONFIG_KGDB_CONSOLE is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> CONFIG_BDI_SWITCH=y</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -1258,6 +1324,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1290,6 +1360,7 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='del'>-# CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='add'>+CONFIG_PPC_CLOCK=y</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig<br/>index e0b5559e84aa..1b2d5d577915 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/tqm8540_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/85xx/tqm8540_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/tqm8540_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/tqm8540_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:39 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:37 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_E500=y</div><div class='add'>+# CONFIG_PPC_E500MC is not set</div><div class='ctx'> CONFIG_BOOKE=y</div><div class='ctx'> CONFIG_FSL_BOOKE=y</div><div class='ctx'> CONFIG_FSL_EMB_PERFMON=y</div><div class='hunk'>@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> # CONFIG_HOTPLUG is not set</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='hunk'>@@ -112,10 +113,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -126,6 +133,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -144,8 +152,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -154,11 +160,13 @@ CONFIG_MPC85xx=y</div><div class='ctx'> # CONFIG_MPC8560_ADS is not set</div><div class='ctx'> # CONFIG_MPC85xx_CDS is not set</div><div class='ctx'> # CONFIG_MPC85xx_MDS is not set</div><div class='add'>+# CONFIG_MPC8536_DS is not set</div><div class='ctx'> # CONFIG_MPC85xx_DS is not set</div><div class='ctx'> # CONFIG_KSI8560 is not set</div><div class='ctx'> # CONFIG_STX_GP3 is not set</div><div class='ctx'> CONFIG_TQM8540=y</div><div class='ctx'> # CONFIG_TQM8541 is not set</div><div class='add'>+# CONFIG_TQM8548 is not set</div><div class='ctx'> # CONFIG_TQM8555 is not set</div><div class='ctx'> # CONFIG_TQM8560 is not set</div><div class='ctx'> # CONFIG_SBC8548 is not set</div><div class='hunk'>@@ -214,6 +222,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -221,6 +230,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> # CONFIG_PROC_DEVICETREE is not set</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -232,6 +242,7 @@ CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -255,10 +266,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -449,20 +456,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='del'>-CONFIG_IDE_MAX_HWIFS=4</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_TIMINGS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='hunk'>@@ -475,7 +484,6 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_SFF=y</div><div class='ctx'> </div><div class='hunk'>@@ -493,10 +501,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -514,8 +520,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> CONFIG_BLK_DEV_VIA82CXXX=y</div><div class='ctx'> # CONFIG_BLK_DEV_TC86C001 is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -531,12 +535,15 @@ CONFIG_BLK_DEV_IDEDMA=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -598,7 +605,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -612,9 +618,9 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -721,41 +727,62 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -764,10 +791,13 @@ CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -821,6 +851,7 @@ CONFIG_SENSORS_LM75=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> CONFIG_HWMON_DEBUG_CHIP=y</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -832,8 +863,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -865,10 +898,6 @@ CONFIG_DAB=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -883,6 +912,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -971,6 +1004,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -980,12 +1014,11 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> # CONFIG_NFS_V3 is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1021,6 +1054,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1048,7 +1082,16 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1100,6 +1143,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1132,5 +1179,6 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig<br/>index 6f9067b49e07..da841a09755c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/tqm8541_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/85xx/tqm8541_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/tqm8541_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/tqm8541_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:40 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:39 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_E500=y</div><div class='add'>+# CONFIG_PPC_E500MC is not set</div><div class='ctx'> CONFIG_BOOKE=y</div><div class='ctx'> CONFIG_FSL_BOOKE=y</div><div class='ctx'> CONFIG_FSL_EMB_PERFMON=y</div><div class='hunk'>@@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='ctx'> # CONFIG_ARCH_NO_VIRT_TO_BUS is not set</div><div class='ctx'> CONFIG_PPC=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='hunk'>@@ -89,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> # CONFIG_HOTPLUG is not set</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='hunk'>@@ -112,10 +114,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -126,6 +134,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -144,8 +153,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -154,11 +161,13 @@ CONFIG_MPC85xx=y</div><div class='ctx'> # CONFIG_MPC8560_ADS is not set</div><div class='ctx'> # CONFIG_MPC85xx_CDS is not set</div><div class='ctx'> # CONFIG_MPC85xx_MDS is not set</div><div class='add'>+# CONFIG_MPC8536_DS is not set</div><div class='ctx'> # CONFIG_MPC85xx_DS is not set</div><div class='ctx'> # CONFIG_KSI8560 is not set</div><div class='ctx'> # CONFIG_STX_GP3 is not set</div><div class='ctx'> # CONFIG_TQM8540 is not set</div><div class='ctx'> CONFIG_TQM8541=y</div><div class='add'>+# CONFIG_TQM8548 is not set</div><div class='ctx'> # CONFIG_TQM8555 is not set</div><div class='ctx'> # CONFIG_TQM8560 is not set</div><div class='ctx'> # CONFIG_SBC8548 is not set</div><div class='hunk'>@@ -176,7 +185,6 @@ CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='ctx'> CONFIG_CPM2=y</div><div class='del'>-CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> CONFIG_CPM=y</div><div class='ctx'> </div><div class='hunk'>@@ -216,6 +224,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -223,6 +232,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> # CONFIG_PROC_DEVICETREE is not set</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -234,6 +244,7 @@ CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -257,10 +268,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -432,6 +439,7 @@ CONFIG_MTD_CFI_UTIL=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_UBI is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_GPIO=y</div><div class='ctx'> CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='hunk'>@@ -451,20 +459,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='del'>-CONFIG_IDE_MAX_HWIFS=4</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_TIMINGS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='hunk'>@@ -477,7 +487,6 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_SFF=y</div><div class='ctx'> </div><div class='hunk'>@@ -495,10 +504,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -516,8 +523,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> CONFIG_BLK_DEV_VIA82CXXX=y</div><div class='ctx'> # CONFIG_BLK_DEV_TC86C001 is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -533,12 +538,15 @@ CONFIG_BLK_DEV_IDEDMA=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -601,7 +609,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -615,9 +622,9 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -732,42 +739,66 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_CPM is not set</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CORE is not set</div><div class='hunk'>@@ -775,10 +806,31 @@ CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIO_SYSFS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='add'>+# CONFIG_GPIO_PCA953X is not set</div><div class='add'>+# CONFIG_GPIO_PCF857X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_BT8XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -832,6 +884,7 @@ CONFIG_SENSORS_LM75=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> CONFIG_HWMON_DEBUG_CHIP=y</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -843,8 +896,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -876,10 +931,6 @@ CONFIG_DAB=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -894,6 +945,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -982,6 +1037,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -991,12 +1047,11 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> # CONFIG_NFS_V3 is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1032,6 +1087,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1059,8 +1115,16 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='del'>-# CONFIG_KGDB_CONSOLE is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1112,6 +1176,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1144,6 +1212,7 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='del'>-# CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='add'>+CONFIG_PPC_CLOCK=y</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/85xx/tqm8548_defconfig b/arch/powerpc/configs/85xx/tqm8548_defconfig<br/>index b3b770be3cc9..ca1234d26855 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/tqm8548_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/85xx/tqm8548_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/tqm8548_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/tqm8548_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Thu Jun 26 14:40:02 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:40 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -34,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -90,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -116,10 +116,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -130,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -154,8 +161,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -164,6 +169,7 @@ CONFIG_MPC85xx=y</div><div class='ctx'> # CONFIG_MPC8560_ADS is not set</div><div class='ctx'> # CONFIG_MPC85xx_CDS is not set</div><div class='ctx'> # CONFIG_MPC85xx_MDS is not set</div><div class='add'>+# CONFIG_MPC8536_DS is not set</div><div class='ctx'> # CONFIG_MPC85xx_DS is not set</div><div class='ctx'> # CONFIG_KSI8560 is not set</div><div class='ctx'> # CONFIG_STX_GP3 is not set</div><div class='hunk'>@@ -187,7 +193,6 @@ CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='ctx'> # CONFIG_CPM2 is not set</div><div class='del'>-CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -203,7 +208,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -226,6 +231,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -233,6 +239,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -244,7 +251,7 @@ CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='del'>-CONFIG_FSL_LBC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -273,10 +280,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -455,7 +458,6 @@ CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> # CONFIG_MTD_NAND_NANDSIM is not set</div><div class='ctx'> # CONFIG_MTD_NAND_PLATFORM is not set</div><div class='ctx'> # CONFIG_MTD_NAND_FSL_ELBC is not set</div><div class='del'>-CONFIG_MTD_NAND_FSL_UPM=y</div><div class='ctx'> # CONFIG_MTD_ONENAND is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -490,20 +492,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='del'>-CONFIG_IDE_MAX_HWIFS=4</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_TIMINGS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDEDISK is not set</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='hunk'>@@ -516,7 +520,6 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_SFF=y</div><div class='ctx'> </div><div class='hunk'>@@ -534,10 +537,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -555,8 +556,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> CONFIG_BLK_DEV_VIA82CXXX=y</div><div class='ctx'> # CONFIG_BLK_DEV_TC86C001 is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -572,12 +571,15 @@ CONFIG_BLK_DEV_IDEDMA=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -620,10 +622,8 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_ACENIC is not set</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> CONFIG_E1000=y</div><div class='del'>-CONFIG_E1000_NAPI=y</div><div class='ctx'> # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -637,9 +637,9 @@ CONFIG_E1000_NAPI=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -744,42 +744,63 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -788,10 +809,13 @@ CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -845,6 +869,7 @@ CONFIG_SENSORS_LM75=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -856,8 +881,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -889,10 +916,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -907,6 +930,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -945,6 +972,7 @@ CONFIG_RTC_DRV_DS1307=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -1031,9 +1059,11 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_BFS_FS is not set</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='ctx'> # CONFIG_JFFS2_FS is not set</div><div class='add'>+# CONFIG_UBIFS_FS is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1043,12 +1073,11 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> # CONFIG_NFS_V3 is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1084,6 +1113,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1108,6 +1138,8 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1125,17 +1157,29 @@ CONFIG_DEBUG_MUTEXES=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -1189,6 +1233,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1221,5 +1269,6 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig<br/>index 03120b5b52fa..dcf9cfe28b55 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/tqm8555_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/85xx/tqm8555_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/tqm8555_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/tqm8555_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:41 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:42 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_E500=y</div><div class='add'>+# CONFIG_PPC_E500MC is not set</div><div class='ctx'> CONFIG_BOOKE=y</div><div class='ctx'> CONFIG_FSL_BOOKE=y</div><div class='ctx'> CONFIG_FSL_EMB_PERFMON=y</div><div class='hunk'>@@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='ctx'> # CONFIG_ARCH_NO_VIRT_TO_BUS is not set</div><div class='ctx'> CONFIG_PPC=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='hunk'>@@ -89,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> # CONFIG_HOTPLUG is not set</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='hunk'>@@ -112,10 +114,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -126,6 +134,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -144,8 +153,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -154,11 +161,13 @@ CONFIG_MPC85xx=y</div><div class='ctx'> # CONFIG_MPC8560_ADS is not set</div><div class='ctx'> # CONFIG_MPC85xx_CDS is not set</div><div class='ctx'> # CONFIG_MPC85xx_MDS is not set</div><div class='add'>+# CONFIG_MPC8536_DS is not set</div><div class='ctx'> # CONFIG_MPC85xx_DS is not set</div><div class='ctx'> # CONFIG_KSI8560 is not set</div><div class='ctx'> # CONFIG_STX_GP3 is not set</div><div class='ctx'> # CONFIG_TQM8540 is not set</div><div class='ctx'> # CONFIG_TQM8541 is not set</div><div class='add'>+# CONFIG_TQM8548 is not set</div><div class='ctx'> CONFIG_TQM8555=y</div><div class='ctx'> # CONFIG_TQM8560 is not set</div><div class='ctx'> # CONFIG_SBC8548 is not set</div><div class='hunk'>@@ -176,7 +185,6 @@ CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='ctx'> CONFIG_CPM2=y</div><div class='del'>-CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> CONFIG_CPM=y</div><div class='ctx'> </div><div class='hunk'>@@ -216,6 +224,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -223,6 +232,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> # CONFIG_PROC_DEVICETREE is not set</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -234,6 +244,7 @@ CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -257,10 +268,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -432,6 +439,7 @@ CONFIG_MTD_CFI_UTIL=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_UBI is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_GPIO=y</div><div class='ctx'> CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='hunk'>@@ -451,20 +459,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='del'>-CONFIG_IDE_MAX_HWIFS=4</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_TIMINGS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='hunk'>@@ -477,7 +487,6 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_SFF=y</div><div class='ctx'> </div><div class='hunk'>@@ -495,10 +504,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -516,8 +523,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> CONFIG_BLK_DEV_VIA82CXXX=y</div><div class='ctx'> # CONFIG_BLK_DEV_TC86C001 is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -533,12 +538,15 @@ CONFIG_BLK_DEV_IDEDMA=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -601,7 +609,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -615,9 +622,9 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -732,42 +739,66 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_CPM is not set</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CORE is not set</div><div class='hunk'>@@ -775,10 +806,31 @@ CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIO_SYSFS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='add'>+# CONFIG_GPIO_PCA953X is not set</div><div class='add'>+# CONFIG_GPIO_PCF857X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_BT8XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -832,6 +884,7 @@ CONFIG_SENSORS_LM75=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> CONFIG_HWMON_DEBUG_CHIP=y</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -843,8 +896,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -876,10 +931,6 @@ CONFIG_DAB=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -894,6 +945,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -982,6 +1037,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -991,12 +1047,11 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> # CONFIG_NFS_V3 is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1032,6 +1087,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1059,8 +1115,16 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='del'>-# CONFIG_KGDB_CONSOLE is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1112,6 +1176,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1144,6 +1212,7 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='del'>-# CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='add'>+CONFIG_PPC_CLOCK=y</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig<br/>index 3113257edf5a..8d676629cdb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/tqm8560_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/85xx/tqm8560_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/85xx/tqm8560_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/85xx/tqm8560_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:42 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:43 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_E500=y</div><div class='add'>+# CONFIG_PPC_E500MC is not set</div><div class='ctx'> CONFIG_BOOKE=y</div><div class='ctx'> CONFIG_FSL_BOOKE=y</div><div class='ctx'> CONFIG_FSL_EMB_PERFMON=y</div><div class='hunk'>@@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='ctx'> # CONFIG_ARCH_NO_VIRT_TO_BUS is not set</div><div class='ctx'> CONFIG_PPC=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='hunk'>@@ -89,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> # CONFIG_HOTPLUG is not set</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='hunk'>@@ -112,10 +114,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -126,6 +134,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -144,8 +153,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -154,11 +161,13 @@ CONFIG_MPC85xx=y</div><div class='ctx'> # CONFIG_MPC8560_ADS is not set</div><div class='ctx'> # CONFIG_MPC85xx_CDS is not set</div><div class='ctx'> # CONFIG_MPC85xx_MDS is not set</div><div class='add'>+# CONFIG_MPC8536_DS is not set</div><div class='ctx'> # CONFIG_MPC85xx_DS is not set</div><div class='ctx'> # CONFIG_KSI8560 is not set</div><div class='ctx'> # CONFIG_STX_GP3 is not set</div><div class='ctx'> # CONFIG_TQM8540 is not set</div><div class='ctx'> # CONFIG_TQM8541 is not set</div><div class='add'>+# CONFIG_TQM8548 is not set</div><div class='ctx'> # CONFIG_TQM8555 is not set</div><div class='ctx'> CONFIG_TQM8560=y</div><div class='ctx'> # CONFIG_SBC8548 is not set</div><div class='hunk'>@@ -176,7 +185,6 @@ CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='ctx'> CONFIG_CPM2=y</div><div class='del'>-CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> CONFIG_CPM=y</div><div class='ctx'> </div><div class='hunk'>@@ -216,6 +224,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -223,6 +232,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> # CONFIG_PROC_DEVICETREE is not set</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -234,6 +244,7 @@ CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -257,10 +268,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -432,6 +439,7 @@ CONFIG_MTD_CFI_UTIL=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_UBI is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_GPIO=y</div><div class='ctx'> CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='hunk'>@@ -451,20 +459,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='del'>-CONFIG_IDE_MAX_HWIFS=4</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_TIMINGS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='hunk'>@@ -477,7 +487,6 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_SFF=y</div><div class='ctx'> </div><div class='hunk'>@@ -495,10 +504,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -516,8 +523,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> CONFIG_BLK_DEV_VIA82CXXX=y</div><div class='ctx'> # CONFIG_BLK_DEV_TC86C001 is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -533,12 +538,15 @@ CONFIG_BLK_DEV_IDEDMA=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -601,7 +609,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -615,9 +622,9 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -732,42 +739,66 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_CPM is not set</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CORE is not set</div><div class='hunk'>@@ -775,10 +806,31 @@ CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIO_SYSFS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='add'>+# CONFIG_GPIO_PCA953X is not set</div><div class='add'>+# CONFIG_GPIO_PCF857X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_BT8XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -832,6 +884,7 @@ CONFIG_SENSORS_LM75=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> CONFIG_HWMON_DEBUG_CHIP=y</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -843,8 +896,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -876,10 +931,6 @@ CONFIG_DAB=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -894,6 +945,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -982,6 +1037,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -991,12 +1047,11 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> # CONFIG_NFS_V3 is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1032,6 +1087,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1059,8 +1115,16 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='del'>-# CONFIG_KGDB_CONSOLE is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1112,6 +1176,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1144,6 +1212,7 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='del'>-# CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='add'>+CONFIG_PPC_CLOCK=y</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig<br/>index 6740f2a3aa3d..63cd51fbb4b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/adder875_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/adder875_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/adder875_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/adder875_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:08 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:00 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -29,6 +29,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -109,10 +110,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=1</div><div class='hunk'>@@ -122,6 +129,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -140,8 +148,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> CONFIG_CPM1=y</div><div class='hunk'>@@ -159,6 +165,7 @@ CONFIG_PPC_ADDER875=y</div><div class='ctx'> # Generic MPC8xx Options</div><div class='ctx'> #</div><div class='ctx'> CONFIG_8xx_COPYBACK=y</div><div class='add'>+# CONFIG_8xx_GPIO is not set</div><div class='ctx'> # CONFIG_8xx_CPU6 is not set</div><div class='ctx'> CONFIG_8xx_CPU15=y</div><div class='ctx'> CONFIG_NO_UCODE_PATCH=y</div><div class='hunk'>@@ -177,7 +184,6 @@ CONFIG_NO_UCODE_PATCH=y</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='del'>-CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> CONFIG_CPM=y</div><div class='ctx'> </div><div class='hunk'>@@ -218,6 +224,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -225,6 +232,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> # CONFIG_PROC_DEVICETREE is not set</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -257,10 +265,6 @@ CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0x80000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xfd000000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -443,7 +447,6 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -547,6 +550,7 @@ CONFIG_SERIO_I8042=y</div><div class='ctx'> CONFIG_SERIO_SERPORT=y</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -587,6 +591,8 @@ CONFIG_GEN_RTC=y</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='hunk'>@@ -602,8 +608,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -633,10 +641,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_HID_SUPPORT is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='hunk'>@@ -706,6 +710,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -716,13 +721,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -761,6 +765,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> # CONFIG_CRC32 is not set</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -785,6 +790,8 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -800,16 +807,28 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='hunk'>@@ -822,6 +841,6 @@ CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> # CONFIG_CRYPTO is not set</div><div class='del'>-# CONFIG_PPC_CLOCK is not set</div><div class='add'>+CONFIG_PPC_CLOCK=y</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig<br/>index dc599c7e97d5..c16521ffb477 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/c2k_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/c2k_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/c2k_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/c2k_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc2</div><div class='del'>-# Thu May 15 11:00:14 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:02 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -34,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -97,7 +98,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -124,11 +124,17 @@ CONFIG_PROFILING=y</div><div class='ctx'> CONFIG_OPROFILE=m</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> CONFIG_KPROBES=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='ctx'> CONFIG_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -145,6 +151,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -164,19 +171,18 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='ctx'> # CONFIG_PPC_CHRP is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='ctx'> # CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='ctx'> CONFIG_EMBEDDED6xx=y</div><div class='ctx'> # CONFIG_LINKSTATION is not set</div><div class='ctx'> # CONFIG_STORCENTER is not set</div><div class='hunk'>@@ -253,6 +259,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -260,6 +267,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> # CONFIG_PROC_DEVICETREE is not set</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> CONFIG_PM=y</div><div class='ctx'> # CONFIG_PM_DEBUG is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='hunk'>@@ -301,10 +309,6 @@ CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -318,6 +322,7 @@ CONFIG_XFRM_USER=y</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> # CONFIG_XFRM_MIGRATE is not set</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=m</div><div class='ctx'> # CONFIG_NET_KEY_MIGRATE is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -349,7 +354,7 @@ CONFIG_INET_TUNNEL=m</div><div class='ctx'> CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=y</div><div class='del'>-# CONFIG_INET_LRO is not set</div><div class='add'>+CONFIG_INET_LRO=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -472,6 +477,7 @@ CONFIG_IP_NF_MANGLE=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_ECN=m</div><div class='ctx'> # CONFIG_IP_NF_TARGET_TTL is not set</div><div class='ctx'> CONFIG_IP_NF_RAW=m</div><div class='add'>+# CONFIG_IP_NF_SECURITY is not set</div><div class='ctx'> CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='hunk'>@@ -495,6 +501,7 @@ CONFIG_IP6_NF_TARGET_LOG=m</div><div class='ctx'> CONFIG_IP6_NF_MANGLE=m</div><div class='ctx'> # CONFIG_IP6_NF_TARGET_HL is not set</div><div class='ctx'> CONFIG_IP6_NF_RAW=m</div><div class='add'>+# CONFIG_IP6_NF_SECURITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Bridge: Netfilter Configuration</div><div class='hunk'>@@ -507,6 +514,7 @@ CONFIG_BRIDGE_EBT_802_3=m</div><div class='ctx'> CONFIG_BRIDGE_EBT_AMONG=m</div><div class='ctx'> CONFIG_BRIDGE_EBT_ARP=m</div><div class='ctx'> CONFIG_BRIDGE_EBT_IP=m</div><div class='add'>+# CONFIG_BRIDGE_EBT_IP6 is not set</div><div class='ctx'> CONFIG_BRIDGE_EBT_LIMIT=m</div><div class='ctx'> CONFIG_BRIDGE_EBT_MARK=m</div><div class='ctx'> CONFIG_BRIDGE_EBT_PKTTYPE=m</div><div class='hunk'>@@ -535,8 +543,10 @@ CONFIG_ATM_LANE=m</div><div class='ctx'> # CONFIG_ATM_MPOA is not set</div><div class='ctx'> CONFIG_ATM_BR2684=m</div><div class='ctx'> # CONFIG_ATM_BR2684_IPFILTER is not set</div><div class='add'>+CONFIG_STP=m</div><div class='ctx'> CONFIG_BRIDGE=m</div><div class='ctx'> CONFIG_VLAN_8021Q=m</div><div class='add'>+# CONFIG_VLAN_8021Q_GVRP is not set</div><div class='ctx'> # CONFIG_DECNET is not set</div><div class='ctx'> CONFIG_LLC=m</div><div class='ctx'> # CONFIG_LLC2 is not set</div><div class='hunk'>@@ -556,7 +566,6 @@ CONFIG_NET_SCH_HTB=m</div><div class='ctx'> CONFIG_NET_SCH_HFSC=m</div><div class='ctx'> CONFIG_NET_SCH_ATM=m</div><div class='ctx'> CONFIG_NET_SCH_PRIO=m</div><div class='del'>-# CONFIG_NET_SCH_RR is not set</div><div class='ctx'> CONFIG_NET_SCH_RED=m</div><div class='ctx'> CONFIG_NET_SCH_SFQ=m</div><div class='ctx'> CONFIG_NET_SCH_TEQL=m</div><div class='hunk'>@@ -601,7 +610,6 @@ CONFIG_BT_RFCOMM_TTY=y</div><div class='ctx'> CONFIG_BT_BNEP=m</div><div class='ctx'> CONFIG_BT_BNEP_MC_FILTER=y</div><div class='ctx'> CONFIG_BT_BNEP_PROTO_FILTER=y</div><div class='del'>-CONFIG_BT_CMTP=m</div><div class='ctx'> CONFIG_BT_HIDP=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -609,6 +617,7 @@ CONFIG_BT_HIDP=m</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BT_HCIUSB=m</div><div class='ctx'> CONFIG_BT_HCIUSB_SCO=y</div><div class='add'>+# CONFIG_BT_HCIBTUSB is not set</div><div class='ctx'> CONFIG_BT_HCIUART=m</div><div class='ctx'> CONFIG_BT_HCIUART_H4=y</div><div class='ctx'> CONFIG_BT_HCIUART_BCSP=y</div><div class='hunk'>@@ -625,6 +634,7 @@ CONFIG_FIB_RULES=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> CONFIG_IEEE80211=m</div><div class='ctx'> # CONFIG_IEEE80211_DEBUG is not set</div><div class='hunk'>@@ -645,6 +655,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -749,6 +761,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> # CONFIG_MISC_DEVICES is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='hunk'>@@ -844,6 +857,7 @@ CONFIG_SCSI_LPFC=m</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='hunk'>@@ -851,12 +865,15 @@ CONFIG_SCSI_LPFC=m</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> CONFIG_BONDING=m</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -900,7 +917,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -916,6 +932,7 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> CONFIG_MV643XX_ETH=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> # CONFIG_NETDEV_10000 is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='hunk'>@@ -940,112 +957,13 @@ CONFIG_MV643XX_ETH=y</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='del'>-CONFIG_SLHC=m</div><div class='ctx'> # CONFIG_NET_FC is not set</div><div class='ctx'> CONFIG_NETCONSOLE=m</div><div class='ctx'> # CONFIG_NETCONSOLE_DYNAMIC is not set</div><div class='ctx'> CONFIG_NETPOLL=y</div><div class='ctx'> CONFIG_NETPOLL_TRAP=y</div><div class='ctx'> CONFIG_NET_POLL_CONTROLLER=y</div><div class='del'>-CONFIG_ISDN=m</div><div class='del'>-CONFIG_ISDN_I4L=m</div><div class='del'>-CONFIG_ISDN_PPP=y</div><div class='del'>-CONFIG_ISDN_PPP_VJ=y</div><div class='del'>-CONFIG_ISDN_MPP=y</div><div class='del'>-CONFIG_IPPP_FILTER=y</div><div class='del'>-# CONFIG_ISDN_PPP_BSDCOMP is not set</div><div class='del'>-CONFIG_ISDN_AUDIO=y</div><div class='del'>-CONFIG_ISDN_TTY_FAX=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ISDN feature submodules</div><div class='del'>-#</div><div class='del'>-CONFIG_ISDN_DRV_LOOP=m</div><div class='del'>-# CONFIG_ISDN_DIVERSION is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ISDN4Linux hardware drivers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Passive cards</div><div class='del'>-#</div><div class='del'>-CONFIG_ISDN_DRV_HISAX=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# D-channel protocol features</div><div class='del'>-#</div><div class='del'>-CONFIG_HISAX_EURO=y</div><div class='del'>-CONFIG_DE_AOC=y</div><div class='del'>-CONFIG_HISAX_NO_SENDCOMPLETE=y</div><div class='del'>-CONFIG_HISAX_NO_LLC=y</div><div class='del'>-CONFIG_HISAX_NO_KEYPAD=y</div><div class='del'>-CONFIG_HISAX_1TR6=y</div><div class='del'>-CONFIG_HISAX_NI1=y</div><div class='del'>-CONFIG_HISAX_MAX_CARDS=8</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# HiSax supported cards</div><div class='del'>-#</div><div class='del'>-CONFIG_HISAX_16_3=y</div><div class='del'>-CONFIG_HISAX_S0BOX=y</div><div class='del'>-CONFIG_HISAX_FRITZPCI=y</div><div class='del'>-CONFIG_HISAX_AVM_A1_PCMCIA=y</div><div class='del'>-CONFIG_HISAX_ELSA=y</div><div class='del'>-CONFIG_HISAX_DIEHLDIVA=y</div><div class='del'>-CONFIG_HISAX_SEDLBAUER=y</div><div class='del'>-CONFIG_HISAX_NICCY=y</div><div class='del'>-CONFIG_HISAX_BKM_A4T=y</div><div class='del'>-CONFIG_HISAX_SCT_QUADRO=y</div><div class='del'>-CONFIG_HISAX_GAZEL=y</div><div class='del'>-CONFIG_HISAX_W6692=y</div><div class='del'>-CONFIG_HISAX_HFC_SX=y</div><div class='del'>-# CONFIG_HISAX_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# HiSax PCMCIA card service modules</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# HiSax sub driver modules</div><div class='del'>-#</div><div class='del'>-CONFIG_HISAX_ST5481=m</div><div class='del'>-CONFIG_HISAX_HFCUSB=m</div><div class='del'>-# CONFIG_HISAX_HFC4S8S is not set</div><div class='del'>-CONFIG_HISAX_FRITZ_PCIPNP=m</div><div class='del'>-CONFIG_HISAX_HDLC=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Active cards</div><div class='del'>-#</div><div class='del'>-CONFIG_HYSDN=m</div><div class='del'>-CONFIG_HYSDN_CAPI=y</div><div class='del'>-# CONFIG_ISDN_DRV_GIGASET is not set</div><div class='del'>-CONFIG_ISDN_CAPI=m</div><div class='del'>-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y</div><div class='del'>-CONFIG_CAPI_TRACE=y</div><div class='del'>-CONFIG_ISDN_CAPI_MIDDLEWARE=y</div><div class='del'>-CONFIG_ISDN_CAPI_CAPI20=m</div><div class='del'>-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y</div><div class='del'>-CONFIG_ISDN_CAPI_CAPIFS=m</div><div class='del'>-CONFIG_ISDN_CAPI_CAPIDRV=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# CAPI hardware drivers</div><div class='del'>-#</div><div class='del'>-CONFIG_CAPI_AVM=y</div><div class='del'>-CONFIG_ISDN_DRV_AVMB1_B1PCI=m</div><div class='del'>-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y</div><div class='del'>-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m</div><div class='del'>-CONFIG_ISDN_DRV_AVMB1_T1PCI=m</div><div class='del'>-CONFIG_ISDN_DRV_AVMB1_C4=m</div><div class='del'>-CONFIG_CAPI_EICON=y</div><div class='del'>-CONFIG_ISDN_DIVAS=m</div><div class='del'>-CONFIG_ISDN_DIVAS_BRIPCI=y</div><div class='del'>-CONFIG_ISDN_DIVAS_PRIPCI=y</div><div class='del'>-CONFIG_ISDN_DIVAS_DIVACAPI=m</div><div class='del'>-CONFIG_ISDN_DIVAS_USERIDI=m</div><div class='del'>-CONFIG_ISDN_DIVAS_MAINT=m</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='ctx'> # CONFIG_PHONE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1092,6 +1010,7 @@ CONFIG_INPUT_UINPUT=m</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -1145,44 +1064,65 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=m</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=m</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-# CONFIG_I2C_MPC is not set</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_MPC is not set</div><div class='add'>+CONFIG_I2C_MV64XXX=m</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='del'>-CONFIG_I2C_MV64XXX=m</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> CONFIG_SENSORS_EEPROM=m</div><div class='ctx'> CONFIG_SENSORS_PCF8574=m</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> CONFIG_SENSORS_PCF8591=m</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -1191,10 +1131,13 @@ CONFIG_SENSORS_PCF8591=m</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=m</div><div class='ctx'> CONFIG_HWMON_VID=m</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> CONFIG_SENSORS_ADM1021=m</div><div class='ctx'> CONFIG_SENSORS_ADM1025=m</div><div class='hunk'>@@ -1255,6 +1198,7 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SOFT_WATCHDOG=m</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='ctx'> # CONFIG_MV64X60_WDT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1278,8 +1222,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -1290,6 +1236,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia drivers</div><div class='hunk'>@@ -1316,10 +1263,6 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VGA_CONSOLE is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_HID_SUPPORT is not set</div><div class='ctx'> CONFIG_HID=m</div><div class='hunk'>@@ -1339,6 +1282,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> CONFIG_USB_SUSPEND=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1363,10 +1307,15 @@ CONFIG_USB_UHCI_HCD=m</div><div class='ctx'> # CONFIG_USB_R8A66597_HCD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # USB Device Class drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_USB_ACM=m</div><div class='ctx'> CONFIG_USB_PRINTER=m</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -1388,6 +1337,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1396,7 +1346,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_USB_MDC800=m</div><div class='ctx'> CONFIG_USB_MICROTEK=m</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1405,7 +1354,6 @@ CONFIG_USB_SERIAL=m</div><div class='ctx'> CONFIG_USB_EZUSB=y</div><div class='ctx'> CONFIG_USB_SERIAL_GENERIC=y</div><div class='ctx'> # CONFIG_USB_SERIAL_AIRCABLE is not set</div><div class='del'>-# CONFIG_USB_SERIAL_AIRPRIME is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_ARK3116 is not set</div><div class='ctx'> CONFIG_USB_SERIAL_BELKIN=m</div><div class='ctx'> # CONFIG_USB_SERIAL_CH341 is not set</div><div class='hunk'>@@ -1443,6 +1391,7 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m</div><div class='ctx'> CONFIG_USB_SERIAL_MCT_U232=m</div><div class='ctx'> # CONFIG_USB_SERIAL_MOS7720 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_MOS7840 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_MOTOROLA is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_NAVMAN is not set</div><div class='ctx'> CONFIG_USB_SERIAL_PL2303=m</div><div class='ctx'> # CONFIG_USB_SERIAL_OTI6858 is not set</div><div class='hunk'>@@ -1464,7 +1413,6 @@ CONFIG_USB_SERIAL_OMNINET=m</div><div class='ctx'> CONFIG_USB_EMI62=m</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-CONFIG_USB_AUERSWALD=m</div><div class='ctx'> CONFIG_USB_RIO500=m</div><div class='ctx'> CONFIG_USB_LEGOTOWER=m</div><div class='ctx'> CONFIG_USB_LCD=m</div><div class='hunk'>@@ -1481,6 +1429,7 @@ CONFIG_USB_LED=m</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='ctx'> CONFIG_USB_TEST=m</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> CONFIG_USB_ATM=m</div><div class='ctx'> CONFIG_USB_SPEEDTOUCH=m</div><div class='ctx'> # CONFIG_USB_CXACRU is not set</div><div class='hunk'>@@ -1601,6 +1550,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='ctx'> CONFIG_VXFS_FS=m</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1611,8 +1561,8 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> CONFIG_NFS_V3_ACL=y</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_ACL_SUPPORT=y</div><div class='hunk'>@@ -1620,7 +1570,6 @@ CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='ctx'> CONFIG_SUNRPC_XPRT_RDMA=m</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> CONFIG_RPCSEC_GSS_SPKM3=m</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1705,6 +1654,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=m</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1732,6 +1682,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1750,6 +1702,7 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='hunk'>@@ -1758,11 +1711,22 @@ CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_LKDTM is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> CONFIG_DEBUG_STACKOVERFLOW=y</div><div class='ctx'> CONFIG_DEBUG_STACK_USAGE=y</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> CONFIG_BOOTX_TEXT=y</div><div class='hunk'>@@ -1776,7 +1740,6 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y</div><div class='ctx'> CONFIG_SECURITY=y</div><div class='ctx'> CONFIG_SECURITY_NETWORK=y</div><div class='ctx'> # CONFIG_SECURITY_NETWORK_XFRM is not set</div><div class='del'>-CONFIG_SECURITY_CAPABILITIES=y</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0</div><div class='ctx'> CONFIG_SECURITY_SELINUX=y</div><div class='hunk'>@@ -1835,6 +1798,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=y</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='head'>diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig<br/>index 05360d4ef1b1..2e0ef8c18227 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/chrp32_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/chrp32_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/chrp32_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/chrp32_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc3</div><div class='del'>-# Tue May 20 20:00:44 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Tue Aug 26 13:12:40 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -33,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -90,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -117,10 +117,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+CONFIG_USE_GENERIC_SMP_HELPERS=y</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -138,6 +144,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -157,19 +164,18 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='ctx'> CONFIG_PPC_CHRP=y</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='ctx'> # CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='ctx'> CONFIG_PPC_NATIVE=y</div><div class='ctx'> # CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='hunk'>@@ -201,7 +207,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -225,6 +231,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_MIGRATION is not set</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -232,6 +239,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -268,10 +276,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -398,7 +402,9 @@ CONFIG_NF_NAT_SIP=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> # CONFIG_STANDALONE is not set</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-# CONFIG_FW_LOADER is not set</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -427,12 +433,14 @@ CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='hunk'>@@ -440,6 +448,7 @@ CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_TIMINGS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> CONFIG_IDEDISK_MULTI_MODE=y</div><div class='hunk'>@@ -454,7 +463,6 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_SFF=y</div><div class='ctx'> </div><div class='hunk'>@@ -472,10 +480,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -493,8 +499,6 @@ CONFIG_BLK_DEV_SL82C105=y</div><div class='ctx'> CONFIG_BLK_DEV_VIA82CXXX=y</div><div class='ctx'> # CONFIG_BLK_DEV_TC86C001 is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -588,6 +592,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='hunk'>@@ -595,12 +600,15 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -660,14 +668,12 @@ CONFIG_8139TOO=y</div><div class='ctx'> # CONFIG_TLAN is not set</div><div class='ctx'> CONFIG_VIA_RHINE=y</div><div class='ctx'> # CONFIG_VIA_RHINE_MMIO is not set</div><div class='del'>-# CONFIG_VIA_RHINE_NAPI is not set</div><div class='ctx'> # CONFIG_SC92031 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_ACENIC is not set</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -683,6 +689,7 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> CONFIG_MV643XX_ETH=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -773,6 +780,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y</div><div class='ctx'> # CONFIG_MOUSE_PS2_TOUCHKIT is not set</div><div class='ctx'> # CONFIG_MOUSE_SERIAL is not set</div><div class='ctx'> # CONFIG_MOUSE_APPLETOUCH is not set</div><div class='add'>+# CONFIG_MOUSE_BCM5974 is not set</div><div class='ctx'> # CONFIG_MOUSE_INPORT is not set</div><div class='ctx'> # CONFIG_MOUSE_LOGIBM is not set</div><div class='ctx'> # CONFIG_MOUSE_PC110PAD is not set</div><div class='hunk'>@@ -798,12 +806,14 @@ CONFIG_SERIO_SERPORT=y</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -848,46 +858,71 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> # CONFIG_I2C_CHARDEV is not set</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='del'>-# CONFIG_I2C_HYDRA is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-# CONFIG_I2C_MPC is not set</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_MPC is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_ISA is not set</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -896,10 +931,13 @@ CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -911,8 +949,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -997,10 +1037,13 @@ CONFIG_FB_3DFX=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='ctx'> # CONFIG_FB_IBM_GXT4500 is not set</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='ctx'> CONFIG_LCD_CLASS_DEVICE=m</div><div class='add'>+# CONFIG_LCD_ILI9320 is not set</div><div class='add'>+# CONFIG_LCD_PLATFORM is not set</div><div class='ctx'> CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='ctx'> # CONFIG_BACKLIGHT_CORGI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1030,10 +1073,6 @@ CONFIG_LOGO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_MONO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_VGA16=y</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -1062,6 +1101,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1087,6 +1127,7 @@ CONFIG_USB_UHCI_HCD=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> # CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -1108,6 +1149,7 @@ CONFIG_USB_STORAGE=m</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1116,7 +1158,6 @@ CONFIG_USB_STORAGE=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1129,7 +1170,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1146,6 +1186,7 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='hunk'>@@ -1226,6 +1267,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1310,6 +1352,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1336,6 +1379,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1354,20 +1399,32 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-CONFIG_DEBUGGER=y</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='ctx'> CONFIG_XMON=y</div><div class='ctx'> CONFIG_XMON_DEFAULT=y</div><div class='ctx'> CONFIG_XMON_DISASSEMBLY=y</div><div class='add'>+CONFIG_DEBUGGER=y</div><div class='ctx'> CONFIG_IRQSTACKS=y</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_BOOTX_TEXT is not set</div><div class='hunk'>@@ -1424,6 +1481,10 @@ CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='head'>diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig<br/>index ba2a463b9305..ef0c6e800508 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ep8248e_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/ep8248e_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ep8248e_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/ep8248e_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:09 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:03 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -31,12 +32,14 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='ctx'> # CONFIG_ARCH_NO_VIRT_TO_BUS is not set</div><div class='ctx'> CONFIG_PPC=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='hunk'>@@ -45,11 +48,13 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_ARCH_MAY_HAVE_PC_FDC=y</div><div class='ctx'> CONFIG_PPC_OF=y</div><div class='ctx'> CONFIG_OF=y</div><div class='del'>-# CONFIG_PPC_UDBG_16550 is not set</div><div class='add'>+CONFIG_PPC_UDBG_16550=y</div><div class='ctx'> # CONFIG_GENERIC_TBSYNC is not set</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> # CONFIG_DEFAULT_UIMAGE is not set</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -81,7 +86,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -89,6 +93,7 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -105,10 +110,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -118,6 +129,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -136,33 +148,43 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-CONFIG_PPC_82xx=y</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+CONFIG_PPC_82xx=y</div><div class='ctx'> # CONFIG_MPC8272_ADS is not set</div><div class='ctx'> # CONFIG_PQ2FADS is not set</div><div class='ctx'> CONFIG_EP8248E=y</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='ctx'> CONFIG_8260=y</div><div class='ctx'> CONFIG_8272=y</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> CONFIG_CPM2=y</div><div class='del'>-CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> CONFIG_CPM=y</div><div class='ctx'> </div><div class='hunk'>@@ -197,6 +219,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -204,6 +227,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -211,13 +235,22 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='add'>+CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='del'>-# CONFIG_PCI is not set</div><div class='del'>-# CONFIG_PCI_DOMAINS is not set</div><div class='del'>-# CONFIG_PCI_SYSCALL is not set</div><div class='del'>-# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_DOMAINS=y</div><div class='add'>+CONFIG_PCI_SYSCALL=y</div><div class='add'>+CONFIG_PCI_8260=y</div><div class='add'>+# CONFIG_PCIEPORTBUS is not set</div><div class='add'>+CONFIG_ARCH_SUPPORTS_MSI=y</div><div class='add'>+# CONFIG_PCI_MSI is not set</div><div class='add'>+CONFIG_PCI_LEGACY=y</div><div class='add'>+# CONFIG_PCI_DEBUG is not set</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='add'>+# CONFIG_HOTPLUG_PCI is not set</div><div class='ctx'> # CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -233,10 +266,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -410,11 +439,13 @@ CONFIG_MTD_CFI_UTIL=y</div><div class='ctx'> # CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='ctx'> # CONFIG_MTD_PHYSMAP is not set</div><div class='ctx'> CONFIG_MTD_PHYSMAP_OF=y</div><div class='add'>+# CONFIG_MTD_INTEL_VR_NOR is not set</div><div class='ctx'> # CONFIG_MTD_PLATRAM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Self-contained MTD device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MTD_PMC551 is not set</div><div class='ctx'> # CONFIG_MTD_SLRAM is not set</div><div class='ctx'> # CONFIG_MTD_PHRAM is not set</div><div class='ctx'> # CONFIG_MTD_MTDRAM is not set</div><div class='hunk'>@@ -434,16 +465,23 @@ CONFIG_MTD_PHYSMAP_OF=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_UBI is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_GPIO=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='add'>+# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='add'>+# CONFIG_BLK_DEV_DAC960 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> # CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_SX8 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_RAM is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> # CONFIG_MISC_DEVICES is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='hunk'>@@ -457,14 +495,25 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_SCSI_NETLINK is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# A new alternative FireWire stack is available with EXPERIMENTAL=y</div><div class='add'>+#</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='add'>+# CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='ctx'> # CONFIG_VETH is not set</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='ctx'> CONFIG_PHYLIB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -482,21 +531,59 @@ CONFIG_DAVICOM_PHY=y</div><div class='ctx'> # CONFIG_REALTEK_PHY is not set</div><div class='ctx'> # CONFIG_FIXED_PHY is not set</div><div class='ctx'> CONFIG_MDIO_BITBANG=y</div><div class='add'>+# CONFIG_MDIO_OF_GPIO is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_MACE is not set</div><div class='add'>+# CONFIG_BMAC is not set</div><div class='add'>+# CONFIG_HAPPYMEAL is not set</div><div class='add'>+# CONFIG_SUNGEM is not set</div><div class='add'>+# CONFIG_CASSINI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+# CONFIG_NET_TULIP is not set</div><div class='add'>+# CONFIG_HP100 is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_NET_PCI is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='ctx'> CONFIG_FS_ENET=y</div><div class='ctx'> # CONFIG_FS_ENET_HAS_SCC is not set</div><div class='ctx'> CONFIG_FS_ENET_HAS_FCC=y</div><div class='ctx'> # CONFIG_FS_ENET_MDIO_FCC is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='add'>+# CONFIG_ACENIC is not set</div><div class='add'>+# CONFIG_DL2K is not set</div><div class='add'>+# CONFIG_E1000 is not set</div><div class='add'>+# CONFIG_E1000E is not set</div><div class='add'>+# CONFIG_IGB is not set</div><div class='add'>+# CONFIG_NS83820 is not set</div><div class='add'>+# CONFIG_HAMACHI is not set</div><div class='add'>+# CONFIG_R8169 is not set</div><div class='add'>+# CONFIG_SIS190 is not set</div><div class='add'>+# CONFIG_SKGE is not set</div><div class='add'>+# CONFIG_SKY2 is not set</div><div class='add'>+# CONFIG_VIA_VELOCITY is not set</div><div class='add'>+# CONFIG_TIGON3 is not set</div><div class='add'>+# CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_GIANFAR is not set</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='add'>+# CONFIG_QLA3XXX is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='add'>+# CONFIG_CHELSIO_T1 is not set</div><div class='add'>+# CONFIG_CHELSIO_T3 is not set</div><div class='add'>+# CONFIG_IXGBE is not set</div><div class='add'>+# CONFIG_IXGB is not set</div><div class='add'>+# CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='add'>+# CONFIG_NETXEN_NIC is not set</div><div class='add'>+# CONFIG_NIU is not set</div><div class='add'>+# CONFIG_MLX4_CORE is not set</div><div class='add'>+# CONFIG_TEHUTI is not set</div><div class='add'>+# CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='add'>+# CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Wireless LAN</div><div class='hunk'>@@ -505,6 +592,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='ctx'> # CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='add'>+# CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='hunk'>@@ -541,6 +629,7 @@ CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='ctx'> CONFIG_SERIAL_CPM=y</div><div class='ctx'> CONFIG_SERIAL_CPM_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_CPM_SCC1=y</div><div class='hunk'>@@ -549,21 +638,44 @@ CONFIG_SERIAL_CPM_SCC1=y</div><div class='ctx'> CONFIG_SERIAL_CPM_SCC4=y</div><div class='ctx'> # CONFIG_SERIAL_CPM_SMC1 is not set</div><div class='ctx'> # CONFIG_SERIAL_CPM_SMC2 is not set</div><div class='add'>+# CONFIG_SERIAL_JSM is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_APPLICOM is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='add'>+CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_DEBUG_GPIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_BT8XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -575,8 +687,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -597,6 +711,8 @@ CONFIG_DAB=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_AGP is not set</div><div class='add'>+# CONFIG_DRM is not set</div><div class='ctx'> # CONFIG_VGASTATE is not set</div><div class='ctx'> # CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='hunk'>@@ -606,16 +722,13 @@ CONFIG_DAB=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='add'>+# CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> # CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='hunk'>@@ -675,6 +788,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -684,8 +798,8 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='hunk'>@@ -763,6 +877,7 @@ CONFIG_NLS_UTF8=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> # CONFIG_CRC32 is not set</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -804,19 +919,31 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='del'>-# CONFIG_KGDB_CONSOLE is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> CONFIG_BDI_SWITCH=y</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -824,6 +951,7 @@ CONFIG_BDI_SWITCH=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_KEYS is not set</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -864,6 +992,10 @@ CONFIG_CRYPTO_PCBC=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -894,6 +1026,6 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> # CONFIG_CRYPTO_HW is not set</div><div class='del'>-# CONFIG_PPC_CLOCK is not set</div><div class='add'>+CONFIG_PPC_CLOCK=y</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig<br/>index ac72b48542dc..480225be2f39 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ep88xc_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/ep88xc_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ep88xc_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/ep88xc_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:09 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:04 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -29,6 +29,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -108,10 +109,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=1</div><div class='hunk'>@@ -121,6 +128,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -139,8 +147,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> CONFIG_CPM1=y</div><div class='hunk'>@@ -158,6 +164,7 @@ CONFIG_PPC_EP88XC=y</div><div class='ctx'> # Generic MPC8xx Options</div><div class='ctx'> #</div><div class='ctx'> CONFIG_8xx_COPYBACK=y</div><div class='add'>+# CONFIG_8xx_GPIO is not set</div><div class='ctx'> # CONFIG_8xx_CPU6 is not set</div><div class='ctx'> CONFIG_8xx_CPU15=y</div><div class='ctx'> CONFIG_NO_UCODE_PATCH=y</div><div class='hunk'>@@ -176,7 +183,6 @@ CONFIG_NO_UCODE_PATCH=y</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='del'>-CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> CONFIG_CPM=y</div><div class='ctx'> </div><div class='hunk'>@@ -193,7 +199,7 @@ CONFIG_HZ_100=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=100</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -217,6 +223,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -224,6 +231,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -256,10 +264,6 @@ CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0x80000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xfd000000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -442,7 +446,6 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -544,10 +547,13 @@ CONFIG_GEN_RTC=y</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -559,8 +565,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -590,10 +598,6 @@ CONFIG_DAB=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='hunk'>@@ -662,6 +666,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -672,13 +677,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -717,6 +721,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> # CONFIG_CRC32 is not set</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -741,6 +746,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -756,16 +763,28 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -777,6 +796,6 @@ CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> # CONFIG_CRYPTO is not set</div><div class='del'>-# CONFIG_PPC_CLOCK is not set</div><div class='add'>+CONFIG_PPC_CLOCK=y</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig<br/>index 0ccc6e493dcb..cfa5d053ee5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/g5_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/g5_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/g5_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/g5_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc6</div><div class='del'>-# Mon Jun 16 21:08:31 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Tue Aug 26 13:15:06 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC64=y</div><div class='ctx'> </div><div class='hunk'>@@ -13,6 +13,7 @@ CONFIG_POWER4=y</div><div class='ctx'> # CONFIG_TUNE_CELL is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> CONFIG_ALTIVEC=y</div><div class='add'>+# CONFIG_VSX is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_MM_SLICES=y</div><div class='ctx'> CONFIG_VIRT_CPU_ACCOUNTING=y</div><div class='hunk'>@@ -30,6 +31,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_HAVE_SETUP_PER_CPU_AREA=y</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='hunk'>@@ -94,9 +96,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='del'>-# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='hunk'>@@ -121,10 +122,16 @@ CONFIG_PROFILING=y</div><div class='ctx'> CONFIG_OPROFILE=y</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='del'>-# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+CONFIG_HAVE_DMA_ATTRS=y</div><div class='add'>+CONFIG_USE_GENERIC_SMP_HELPERS=y</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -140,6 +147,7 @@ CONFIG_STOP_MACHINE=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> CONFIG_BLOCK_COMPAT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -160,13 +168,8 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='ctx'> # CONFIG_PPC_PSERIES is not set</div><div class='ctx'> # CONFIG_PPC_ISERIES is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> CONFIG_PPC_PMAC=y</div><div class='ctx'> CONFIG_PPC_PMAC64=y</div><div class='ctx'> # CONFIG_PPC_MAPLE is not set</div><div class='hunk'>@@ -224,7 +227,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -256,6 +259,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_MIGRATION is not set</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -265,6 +269,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13</div><div class='ctx'> # CONFIG_SCHED_SMT is not set</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> CONFIG_ARCH_WANTS_FREEZER_CONTROL=y</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='hunk'>@@ -290,10 +295,6 @@ CONFIG_PCI_MSI=y</div><div class='ctx'> CONFIG_PAGE_OFFSET=0xc000000000000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc000000000000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -307,6 +308,7 @@ CONFIG_XFRM_USER=m</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> # CONFIG_XFRM_MIGRATE is not set</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=m</div><div class='ctx'> # CONFIG_NET_KEY_MIGRATE is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -422,6 +424,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -449,12 +453,14 @@ CONFIG_CDROM_PKTCDVD=m</div><div class='ctx'> CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='hunk'>@@ -462,6 +468,7 @@ CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_TIMINGS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='hunk'>@@ -492,10 +499,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -516,8 +521,6 @@ CONFIG_BLK_DEV_IDE_PMAC=y</div><div class='ctx'> CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_PMAC=y</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -592,6 +595,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_DC390T is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='hunk'>@@ -675,29 +679,21 @@ CONFIG_DM_ZERO=m</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_FIREWIRE is not set</div><div class='del'>-CONFIG_IEEE1394=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Subsystem Options</div><div class='del'>-#</div><div class='del'>-# CONFIG_IEEE1394_VERBOSEDEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Controllers</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='ctx'> #</div><div class='del'>-# CONFIG_IEEE1394_PCILYNX is not set</div><div class='add'>+# CONFIG_FIREWIRE is not set</div><div class='add'>+CONFIG_IEEE1394=y</div><div class='ctx'> CONFIG_IEEE1394_OHCI1394=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Protocols</div><div class='del'>-#</div><div class='del'>-CONFIG_IEEE1394_VIDEO1394=m</div><div class='add'>+# CONFIG_IEEE1394_PCILYNX is not set</div><div class='ctx'> CONFIG_IEEE1394_SBP2=m</div><div class='ctx'> CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y</div><div class='ctx'> CONFIG_IEEE1394_ETH1394=m</div><div class='del'>-CONFIG_IEEE1394_DV1394=m</div><div class='ctx'> CONFIG_IEEE1394_RAWIO=y</div><div class='add'>+CONFIG_IEEE1394_VIDEO1394=m</div><div class='add'>+CONFIG_IEEE1394_DV1394=m</div><div class='add'>+# CONFIG_IEEE1394_VERBOSEDEBUG is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> CONFIG_MACINTOSH_DRIVERS=y</div><div class='ctx'> CONFIG_ADB_PMU=y</div><div class='hunk'>@@ -712,7 +708,6 @@ CONFIG_WINDFARM_PM112=y</div><div class='ctx'> CONFIG_WINDFARM_PM121=y</div><div class='ctx'> # CONFIG_PMAC_RACKMETER is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> CONFIG_BONDING=m</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -720,7 +715,23 @@ CONFIG_BONDING=m</div><div class='ctx'> CONFIG_TUN=m</div><div class='ctx'> # CONFIG_VETH is not set</div><div class='ctx'> # CONFIG_ARCNET is not set</div><div class='del'>-# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+# CONFIG_VITESSE_PHY is not set</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='add'>+# CONFIG_BROADCOM_PHY is not set</div><div class='add'>+# CONFIG_ICPLUS_PHY is not set</div><div class='add'>+# CONFIG_REALTEK_PHY is not set</div><div class='add'>+# CONFIG_FIXED_PHY is not set</div><div class='add'>+# CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='hunk'>@@ -740,10 +751,8 @@ CONFIG_ACENIC=y</div><div class='ctx'> CONFIG_ACENIC_OMIT_TIGON_I=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> CONFIG_E1000=y</div><div class='del'>-# CONFIG_E1000_NAPI is not set</div><div class='ctx'> # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -758,6 +767,7 @@ CONFIG_TIGON3=y</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -855,6 +865,7 @@ CONFIG_INPUT_MOUSE=y</div><div class='ctx'> # CONFIG_MOUSE_PS2 is not set</div><div class='ctx'> # CONFIG_MOUSE_SERIAL is not set</div><div class='ctx'> # CONFIG_MOUSE_APPLETOUCH is not set</div><div class='add'>+# CONFIG_MOUSE_BCM5974 is not set</div><div class='ctx'> # CONFIG_MOUSE_VSXXXAA is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='ctx'> # CONFIG_INPUT_TABLET is not set</div><div class='hunk'>@@ -869,12 +880,14 @@ CONFIG_SERIO=y</div><div class='ctx'> # CONFIG_SERIO_SERPORT is not set</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -909,44 +922,69 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_POWERMAC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -955,10 +993,13 @@ CONFIG_I2C_POWERMAC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -970,8 +1011,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -1050,10 +1093,13 @@ CONFIG_FB_RADEON_BACKLIGHT=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='ctx'> # CONFIG_FB_IBM_GXT4500 is not set</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='ctx'> CONFIG_LCD_CLASS_DEVICE=m</div><div class='add'>+# CONFIG_LCD_ILI9320 is not set</div><div class='add'>+# CONFIG_LCD_PLATFORM is not set</div><div class='ctx'> CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='ctx'> # CONFIG_BACKLIGHT_CORGI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1077,15 +1123,7 @@ CONFIG_LOGO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_MONO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_VGA16=y</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=m</div><div class='ctx'> CONFIG_SND_TIMER=m</div><div class='ctx'> CONFIG_SND_PCM=m</div><div class='hunk'>@@ -1103,19 +1141,13 @@ CONFIG_SND_SUPPORT_OLD_API=y</div><div class='ctx'> CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='ctx'> # CONFIG_SND_DUMMY is not set</div><div class='ctx'> # CONFIG_SND_VIRMIDI is not set</div><div class='ctx'> # CONFIG_SND_MTPAV is not set</div><div class='ctx'> # CONFIG_SND_SERIAL_U16550 is not set</div><div class='ctx'> # CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PCI=y</div><div class='ctx'> # CONFIG_SND_AD1889 is not set</div><div class='ctx'> # CONFIG_SND_ALS300 is not set</div><div class='ctx'> # CONFIG_SND_ALS4000 is not set</div><div class='hunk'>@@ -1177,20 +1209,9 @@ CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VIRTUOSO is not set</div><div class='ctx'> # CONFIG_SND_VX222 is not set</div><div class='ctx'> # CONFIG_SND_YMFPCI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerMac devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PPC=y</div><div class='ctx'> CONFIG_SND_POWERMAC=m</div><div class='ctx'> CONFIG_SND_POWERMAC_AUTO_DRC=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerPC devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Apple Onboard Audio driver</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND_AOA=m</div><div class='ctx'> CONFIG_SND_AOA_FABRIC_LAYOUT=m</div><div class='ctx'> CONFIG_SND_AOA_ONYX=m</div><div class='hunk'>@@ -1198,30 +1219,11 @@ CONFIG_SND_AOA_TAS=m</div><div class='ctx'> CONFIG_SND_AOA_TOONIE=m</div><div class='ctx'> CONFIG_SND_AOA_SOUNDBUS=m</div><div class='ctx'> CONFIG_SND_AOA_SOUNDBUS_I2S=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_USB=y</div><div class='ctx'> CONFIG_SND_USB_AUDIO=m</div><div class='ctx'> # CONFIG_SND_USB_USX2Y is not set</div><div class='ctx'> # CONFIG_SND_USB_CAIAQ is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio for the Texas Instruments OMAP</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -1256,6 +1258,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1306,6 +1309,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1314,7 +1318,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1323,7 +1326,6 @@ CONFIG_USB_SERIAL=m</div><div class='ctx'> CONFIG_USB_EZUSB=y</div><div class='ctx'> CONFIG_USB_SERIAL_GENERIC=y</div><div class='ctx'> # CONFIG_USB_SERIAL_AIRCABLE is not set</div><div class='del'>-# CONFIG_USB_SERIAL_AIRPRIME is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_ARK3116 is not set</div><div class='ctx'> CONFIG_USB_SERIAL_BELKIN=m</div><div class='ctx'> # CONFIG_USB_SERIAL_CH341 is not set</div><div class='hunk'>@@ -1383,7 +1385,6 @@ CONFIG_USB_SERIAL_OMNINET=m</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1497,6 +1498,7 @@ CONFIG_HFSPLUS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1519,7 +1521,6 @@ CONFIG_NFS_ACL_SUPPORT=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1603,6 +1604,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1629,8 +1631,10 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='del'>-# CONFIG_SCHEDSTATS is not set</div><div class='add'>+CONFIG_SCHEDSTATS=y</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='hunk'>@@ -1644,22 +1648,37 @@ CONFIG_DEBUG_MUTEXES=y</div><div class='ctx'> # CONFIG_LOCK_STAT is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='ctx'> # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+CONFIG_STACKTRACE=y</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+CONFIG_LATENCYTOP=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_IRQSOFF_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> CONFIG_IRQSTACKS=y</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> CONFIG_BOOTX_TEXT=y</div><div class='hunk'>@@ -1718,6 +1737,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='head'>diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig<br/>index 63f0bdb6340d..2c3f13577f4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/iseries_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/iseries_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/iseries_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/iseries_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc3</div><div class='del'>-# Tue May 20 20:01:36 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Tue Aug 26 13:15:49 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC64=y</div><div class='ctx'> </div><div class='hunk'>@@ -31,6 +31,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_HAVE_SETUP_PER_CPU_AREA=y</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='hunk'>@@ -94,9 +95,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='del'>-# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='hunk'>@@ -120,10 +120,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='del'>-# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+CONFIG_HAVE_DMA_ATTRS=y</div><div class='add'>+CONFIG_USE_GENERIC_SMP_HELPERS=y</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -139,6 +145,7 @@ CONFIG_STOP_MACHINE=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> CONFIG_BLOCK_COMPAT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -159,9 +166,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='ctx'> # CONFIG_PPC_PSERIES is not set</div><div class='ctx'> CONFIG_LPARCFG=y</div><div class='ctx'> CONFIG_PPC_ISERIES=y</div><div class='hunk'>@@ -173,8 +177,6 @@ CONFIG_VIODASD=y</div><div class='ctx'> CONFIG_VIOCD=m</div><div class='ctx'> CONFIG_VIOTAPE=m</div><div class='ctx'> CONFIG_VIOPATH=y</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_PPC_MAPLE is not set</div><div class='ctx'> # CONFIG_PPC_PASEMI is not set</div><div class='hunk'>@@ -211,7 +213,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -241,6 +243,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_MIGRATION is not set</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -250,6 +253,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13</div><div class='ctx'> # CONFIG_SCHED_SMT is not set</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -274,10 +278,6 @@ CONFIG_ARCH_SUPPORTS_MSI=y</div><div class='ctx'> CONFIG_PAGE_OFFSET=0xc000000000000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc000000000000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -291,6 +291,7 @@ CONFIG_XFRM_USER=m</div><div class='ctx'> CONFIG_XFRM_SUB_POLICY=y</div><div class='ctx'> # CONFIG_XFRM_MIGRATE is not set</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=m</div><div class='ctx'> # CONFIG_NET_KEY_MIGRATE is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -480,7 +481,9 @@ CONFIG_NET_CLS_ROUTE=y</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -504,12 +507,14 @@ CONFIG_BLK_DEV_RAM_SIZE=65536</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -588,6 +593,7 @@ CONFIG_SCSI_IBMVSCSI=m</div><div class='ctx'> # CONFIG_SCSI_DC390T is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=y</div><div class='hunk'>@@ -612,12 +618,15 @@ CONFIG_DM_ZERO=m</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> CONFIG_BONDING=m</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -655,6 +664,7 @@ CONFIG_E100=y</div><div class='ctx'> # CONFIG_SIS900 is not set</div><div class='ctx'> # CONFIG_EPIC100 is not set</div><div class='ctx'> # CONFIG_SUNDANCE is not set</div><div class='add'>+# CONFIG_TLAN is not set</div><div class='ctx'> # CONFIG_VIA_RHINE is not set</div><div class='ctx'> # CONFIG_SC92031 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='hunk'>@@ -662,10 +672,8 @@ CONFIG_ACENIC=m</div><div class='ctx'> # CONFIG_ACENIC_OMIT_TIGON_I is not set</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> CONFIG_E1000=m</div><div class='del'>-# CONFIG_E1000_NAPI is not set</div><div class='ctx'> # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -680,6 +688,7 @@ CONFIG_E1000=m</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -767,6 +776,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -789,6 +799,7 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> CONFIG_HVC_DRIVER=y</div><div class='add'>+CONFIG_HVC_IRQ=y</div><div class='ctx'> CONFIG_HVC_ISERIES=y</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='hunk'>@@ -803,10 +814,13 @@ CONFIG_MAX_RAW_DEVS=256</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -818,8 +832,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -858,10 +874,6 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> CONFIG_VGA_CONSOLE=y</div><div class='ctx'> # CONFIG_VGACON_SOFT_SCROLLBACK is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_HID_SUPPORT is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='hunk'>@@ -910,7 +922,6 @@ CONFIG_XFS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_XFS_RT is not set</div><div class='ctx'> # CONFIG_XFS_DEBUG is not set</div><div class='ctx'> CONFIG_GFS2_FS=m</div><div class='del'>-CONFIG_GFS2_FS_LOCKING_NOLOCK=m</div><div class='ctx'> CONFIG_GFS2_FS_LOCKING_DLM=m</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -967,6 +978,7 @@ CONFIG_CONFIGFS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -989,7 +1001,6 @@ CONFIG_NFS_ACL_SUPPORT=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> CONFIG_RPCSEC_GSS_SPKM3=m</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1059,6 +1070,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1089,8 +1101,10 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='del'>-# CONFIG_SCHEDSTATS is not set</div><div class='add'>+CONFIG_SCHEDSTATS=y</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='hunk'>@@ -1104,22 +1118,37 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_LOCK_STAT is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='ctx'> # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+CONFIG_STACKTRACE=y</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+CONFIG_LATENCYTOP=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_IRQSOFF_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> CONFIG_DEBUG_STACKOVERFLOW=y</div><div class='ctx'> CONFIG_DEBUG_STACK_USAGE=y</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> CONFIG_IRQSTACKS=y</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BOOTX_TEXT is not set</div><div class='hunk'>@@ -1178,6 +1207,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='head'>diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig<br/>index 48434c2c7628..6fc4c2127757 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/linkstation_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/linkstation_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/linkstation_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/linkstation_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:10 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:05 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -93,7 +94,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -119,10 +119,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -139,6 +145,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -158,25 +165,25 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='ctx'> # CONFIG_PPC_CHRP is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='ctx'> # CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='ctx'> CONFIG_EMBEDDED6xx=y</div><div class='ctx'> CONFIG_LINKSTATION=y</div><div class='ctx'> # CONFIG_STORCENTER is not set</div><div class='ctx'> # CONFIG_MPC7448HPC2 is not set</div><div class='ctx'> # CONFIG_PPC_HOLLY is not set</div><div class='ctx'> # CONFIG_PPC_PRPMC2800 is not set</div><div class='add'>+# CONFIG_PPC_C2K is not set</div><div class='ctx'> CONFIG_MPC10X_BRIDGE=y</div><div class='ctx'> CONFIG_MPC10X_OPENPIC=y</div><div class='ctx'> # CONFIG_MPC10X_STORE_GATHERING is not set</div><div class='hunk'>@@ -207,7 +214,7 @@ CONFIG_HZ_100=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=100</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -230,6 +237,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -237,6 +245,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -273,10 +282,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -461,6 +466,7 @@ CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> CONFIG_IEEE80211=m</div><div class='ctx'> CONFIG_IEEE80211_DEBUG=y</div><div class='hunk'>@@ -480,7 +486,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -592,12 +600,14 @@ CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -676,6 +686,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='hunk'>@@ -743,12 +754,15 @@ CONFIG_PATA_SIL680=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -785,14 +799,12 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='ctx'> # CONFIG_HAMACHI is not set</div><div class='ctx'> # CONFIG_YELLOWFIN is not set</div><div class='ctx'> CONFIG_R8169=y</div><div class='del'>-# CONFIG_R8169_NAPI is not set</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='hunk'>@@ -803,6 +815,7 @@ CONFIG_R8169=y</div><div class='ctx'> # CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -889,12 +902,14 @@ CONFIG_SERIO=y</div><div class='ctx'> CONFIG_SERIO_SERPORT=y</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -934,43 +949,64 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> CONFIG_SENSORS_EEPROM=m</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -979,10 +1015,13 @@ CONFIG_SENSORS_EEPROM=m</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -1036,6 +1075,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1047,8 +1087,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -1086,10 +1128,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VGA_CONSOLE is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=m</div><div class='hunk'>@@ -1121,6 +1159,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1172,6 +1211,7 @@ CONFIG_USB_STORAGE=m</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1180,7 +1220,6 @@ CONFIG_USB_STORAGE=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1190,7 +1229,6 @@ CONFIG_USB_SERIAL_CONSOLE=y</div><div class='ctx'> # CONFIG_USB_EZUSB is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_GENERIC is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_AIRCABLE is not set</div><div class='del'>-# CONFIG_USB_SERIAL_AIRPRIME is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_ARK3116 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_BELKIN is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_CH341 is not set</div><div class='hunk'>@@ -1237,7 +1275,6 @@ CONFIG_USB_SERIAL_FTDI_SIO=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1291,6 +1328,7 @@ CONFIG_RTC_DRV_RS5C372=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -1392,6 +1430,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1402,11 +1441,11 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> CONFIG_NFS_V3_ACL=y</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=m</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=m</div><div class='hunk'>@@ -1414,7 +1453,6 @@ CONFIG_NFS_ACL_SUPPORT=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1482,6 +1520,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1510,6 +1549,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1527,17 +1568,29 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_BOOTX_TEXT is not set</div><div class='hunk'>@@ -1556,6 +1609,7 @@ CONFIG_CRYPTO=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='add'>+CONFIG_CRYPTO_HASH=m</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='ctx'> # CONFIG_CRYPTO_GF128MUL is not set</div><div class='ctx'> # CONFIG_CRYPTO_NULL is not set</div><div class='hunk'>@@ -1594,6 +1648,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1627,5 +1685,6 @@ CONFIG_CRYPTO_DEFLATE=m</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig<br/>index 7a166a39d92d..1a3b6423222b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/maple_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/maple_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/maple_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/maple_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.24-rc4</div><div class='del'>-# Thu Dec  6 16:48:26 2007</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Tue Aug 26 13:18:58 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC64=y</div><div class='ctx'> </div><div class='hunk'>@@ -27,7 +27,12 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_HAVE_SETUP_PER_CPU_AREA=y</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U64=y</div><div class='hunk'>@@ -67,16 +72,20 @@ CONFIG_SYSVIPC_SYSCTL=y</div><div class='ctx'> CONFIG_POSIX_MQUEUE=y</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT is not set</div><div class='ctx'> # CONFIG_TASKSTATS is not set</div><div class='del'>-# CONFIG_USER_NS is not set</div><div class='del'>-# CONFIG_PID_NS is not set</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> CONFIG_IKCONFIG=y</div><div class='ctx'> CONFIG_IKCONFIG_PROC=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=17</div><div class='ctx'> # CONFIG_CGROUPS is not set</div><div class='del'>-# CONFIG_FAIR_GROUP_SCHED is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_IPC_NS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='ctx'> # CONFIG_BLK_DEV_INITRD is not set</div><div class='ctx'> CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='hunk'>@@ -89,11 +98,13 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+# CONFIG_COMPAT_BRK is not set</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_ANON_INODES=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='ctx'> CONFIG_EVENTFD=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_VM_EVENT_COUNTERS=y</div><div class='hunk'>@@ -101,10 +112,28 @@ CONFIG_SLUB_DEBUG=y</div><div class='ctx'> # CONFIG_SLAB is not set</div><div class='ctx'> CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='add'>+CONFIG_PROFILING=y</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_OPROFILE=m</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_KPROBES=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+CONFIG_HAVE_DMA_ATTRS=y</div><div class='add'>+CONFIG_USE_GENERIC_SMP_HELPERS=y</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> CONFIG_MODVERSIONS=y</div><div class='hunk'>@@ -114,6 +143,7 @@ CONFIG_STOP_MACHINE=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> CONFIG_BLOCK_COMPAT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -128,29 +158,26 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_CFQ is not set</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='ctx'> # CONFIG_PPC_PSERIES is not set</div><div class='ctx'> # CONFIG_PPC_ISERIES is not set</div><div class='del'>-# CONFIG_PPC_MPC52xx is not set</div><div class='del'>-# CONFIG_PPC_MPC5200 is not set</div><div class='ctx'> # CONFIG_PPC_PMAC is not set</div><div class='ctx'> CONFIG_PPC_MAPLE=y</div><div class='ctx'> # CONFIG_PPC_PASEMI is not set</div><div class='del'>-# CONFIG_PPC_CELLEB is not set</div><div class='ctx'> # CONFIG_PPC_PS3 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_IBM_CELL_BLADE is not set</div><div class='add'>+# CONFIG_PPC_CELLEB is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='ctx'> CONFIG_PPC_NATIVE=y</div><div class='ctx'> CONFIG_UDBG_RTAS_CONSOLE=y</div><div class='add'>+# CONFIG_IPIC is not set</div><div class='ctx'> CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='ctx'> # CONFIG_PPC_I8259 is not set</div><div class='hunk'>@@ -166,7 +193,6 @@ CONFIG_PPC_970_NAP=y</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='del'>-# CONFIG_CPM2 is not set</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -181,16 +207,19 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='del'>-# CONFIG_PREEMPT_BKL is not set</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='add'>+CONFIG_COMPAT_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='del'>-CONFIG_FORCE_MAX_ZONEORDER=13</div><div class='ctx'> CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y</div><div class='ctx'> CONFIG_IOMMU_VMERGE=y</div><div class='add'>+CONFIG_IOMMU_HELPER=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='add'>+CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='ctx'> # CONFIG_CRASH_DUMP is not set</div><div class='ctx'> CONFIG_IRQ_ALL_CPUS=y</div><div class='hunk'>@@ -207,18 +236,21 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_MIGRATION is not set</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> # CONFIG_PPC_HAS_HASH_64K is not set</div><div class='ctx'> # CONFIG_PPC_64K_PAGES is not set</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=13</div><div class='ctx'> # CONFIG_SCHED_SMT is not set</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='del'>-# CONFIG_WANT_DEVICE_TREE is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -237,11 +269,10 @@ CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCI_DEBUG is not set</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc000000000000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc000000000000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -254,6 +285,7 @@ CONFIG_XFRM=y</div><div class='ctx'> CONFIG_XFRM_USER=m</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> # CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_MULTICAST=y</div><div class='hunk'>@@ -284,8 +316,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -308,7 +338,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # Network testing</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_NET_TCPPROBE is not set</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='ctx'> # CONFIG_IRDA is not set</div><div class='ctx'> # CONFIG_BT is not set</div><div class='ctx'> # CONFIG_AF_RXRPC is not set</div><div class='hunk'>@@ -334,12 +366,15 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='hunk'>@@ -354,24 +389,30 @@ CONFIG_BLK_DEV=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='del'>-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Please see Documentation/ide.txt for help/info on IDE drives</div><div class='add'>+# Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_TIMINGS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDECD=y</div><div class='add'>+CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDETAPE is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDEFLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDESCSI is not set</div><div class='hunk'>@@ -381,14 +422,13 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='add'>+CONFIG_BLK_DEV_IDEDMA_SFF=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCI IDE chipsets support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BLK_DEV_IDEPCI=y</div><div class='del'>-CONFIG_IDEPCI_SHARE_IRQ=y</div><div class='ctx'> CONFIG_IDEPCI_PCIBUS_ORDER=y</div><div class='ctx'> # CONFIG_BLK_DEV_OFFBOARD is not set</div><div class='ctx'> CONFIG_BLK_DEV_GENERIC=y</div><div class='hunk'>@@ -399,10 +439,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> CONFIG_BLK_DEV_AMD74XX=y</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -419,10 +457,7 @@ CONFIG_BLK_DEV_AMD74XX=y</div><div class='ctx'> # CONFIG_BLK_DEV_TRM290 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_VIA82CXXX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TC86C001 is not set</div><div class='del'>-# CONFIG_IDE_ARM is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-CONFIG_IDE_ARCH_OBSOLETE_INIT=y</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -483,6 +518,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='ctx'> # CONFIG_SCSI_INITIO is not set</div><div class='ctx'> # CONFIG_SCSI_INIA100 is not set</div><div class='add'>+# CONFIG_SCSI_MVSAS is not set</div><div class='ctx'> # CONFIG_SCSI_STEX is not set</div><div class='ctx'> # CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='ctx'> CONFIG_SCSI_IPR=y</div><div class='hunk'>@@ -496,9 +532,13 @@ CONFIG_SCSI_IPR_DUMP=y</div><div class='ctx'> # CONFIG_SCSI_DC390T is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> CONFIG_ATA_NONSTANDARD=y</div><div class='add'>+CONFIG_SATA_PMP=y</div><div class='ctx'> # CONFIG_SATA_AHCI is not set</div><div class='add'>+# CONFIG_SATA_SIL24 is not set</div><div class='add'>+CONFIG_ATA_SFF=y</div><div class='ctx'> # CONFIG_SATA_SVW is not set</div><div class='ctx'> # CONFIG_ATA_PIIX is not set</div><div class='ctx'> # CONFIG_SATA_MV is not set</div><div class='hunk'>@@ -508,7 +548,6 @@ CONFIG_ATA_NONSTANDARD=y</div><div class='ctx'> # CONFIG_SATA_PROMISE is not set</div><div class='ctx'> # CONFIG_SATA_SX4 is not set</div><div class='ctx'> # CONFIG_SATA_SIL is not set</div><div class='del'>-# CONFIG_SATA_SIL24 is not set</div><div class='ctx'> # CONFIG_SATA_SIS is not set</div><div class='ctx'> # CONFIG_SATA_ULI is not set</div><div class='ctx'> # CONFIG_SATA_VIA is not set</div><div class='hunk'>@@ -537,6 +576,7 @@ CONFIG_ATA_NONSTANDARD=y</div><div class='ctx'> # CONFIG_PATA_MPIIX is not set</div><div class='ctx'> # CONFIG_PATA_OLDPIIX is not set</div><div class='ctx'> # CONFIG_PATA_NETCELL is not set</div><div class='add'>+# CONFIG_PATA_NINJA32 is not set</div><div class='ctx'> # CONFIG_PATA_NS87410 is not set</div><div class='ctx'> # CONFIG_PATA_NS87415 is not set</div><div class='ctx'> # CONFIG_PATA_OPTI is not set</div><div class='hunk'>@@ -551,27 +591,47 @@ CONFIG_ATA_NONSTANDARD=y</div><div class='ctx'> # CONFIG_PATA_SIS is not set</div><div class='ctx'> # CONFIG_PATA_VIA is not set</div><div class='ctx'> # CONFIG_PATA_WINBOND is not set</div><div class='add'>+# CONFIG_PATA_PLATFORM is not set</div><div class='add'>+# CONFIG_PATA_SCH is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='ctx'> # CONFIG_VETH is not set</div><div class='del'>-# CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_ARCNET is not set</div><div class='del'>-# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+# CONFIG_VITESSE_PHY is not set</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='add'>+# CONFIG_BROADCOM_PHY is not set</div><div class='add'>+# CONFIG_ICPLUS_PHY is not set</div><div class='add'>+# CONFIG_REALTEK_PHY is not set</div><div class='add'>+# CONFIG_FIXED_PHY is not set</div><div class='add'>+# CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='hunk'>@@ -587,7 +647,6 @@ CONFIG_MII=y</div><div class='ctx'> CONFIG_NET_PCI=y</div><div class='ctx'> # CONFIG_PCNET32 is not set</div><div class='ctx'> CONFIG_AMD8111_ETH=y</div><div class='del'>-# CONFIG_AMD8111E_NAPI is not set</div><div class='ctx'> # CONFIG_ADAPTEC_STARFIRE is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='ctx'> # CONFIG_FORCEDETH is not set</div><div class='hunk'>@@ -598,18 +657,21 @@ CONFIG_AMD8111_ETH=y</div><div class='ctx'> # CONFIG_NE2K_PCI is not set</div><div class='ctx'> # CONFIG_8139CP is not set</div><div class='ctx'> # CONFIG_8139TOO is not set</div><div class='add'>+# CONFIG_R6040 is not set</div><div class='ctx'> # CONFIG_SIS900 is not set</div><div class='ctx'> # CONFIG_EPIC100 is not set</div><div class='ctx'> # CONFIG_SUNDANCE is not set</div><div class='add'>+# CONFIG_TLAN is not set</div><div class='ctx'> # CONFIG_VIA_RHINE is not set</div><div class='ctx'> # CONFIG_SC92031 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_ACENIC is not set</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> CONFIG_E1000=y</div><div class='del'>-# CONFIG_E1000_NAPI is not set</div><div class='ctx'> # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='add'>+# CONFIG_IP1000 is not set</div><div class='add'>+# CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='ctx'> # CONFIG_HAMACHI is not set</div><div class='ctx'> # CONFIG_YELLOWFIN is not set</div><div class='hunk'>@@ -617,12 +679,12 @@ CONFIG_E1000=y</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> CONFIG_TIGON3=y</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -632,9 +694,10 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_MYRI10GE is not set</div><div class='ctx'> # CONFIG_NETXEN_NIC is not set</div><div class='ctx'> # CONFIG_NIU is not set</div><div class='del'>-# CONFIG_PASEMI_MAC is not set</div><div class='ctx'> # CONFIG_MLX4_CORE is not set</div><div class='ctx'> # CONFIG_TEHUTI is not set</div><div class='add'>+# CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -642,6 +705,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Network Adapters</div><div class='hunk'>@@ -657,7 +721,6 @@ CONFIG_USB_PEGASUS=y</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='ctx'> # CONFIG_NET_FC is not set</div><div class='del'>-# CONFIG_SHAPER is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='ctx'> # CONFIG_NET_POLL_CONTROLLER is not set</div><div class='hunk'>@@ -702,10 +765,13 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1200</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+# CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Serial drivers</div><div class='hunk'>@@ -742,16 +808,14 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# I2C Algorithms</div><div class='add'>+# I2C Hardware Bus support</div><div class='ctx'> #</div><div class='del'>-CONFIG_I2C_ALGOBIT=y</div><div class='del'>-# CONFIG_I2C_ALGOPCF is not set</div><div class='del'>-# CONFIG_I2C_ALGOPCA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# I2C Hardware Bus support</div><div class='add'>+# PC SMBus host controller drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='hunk'>@@ -759,32 +823,47 @@ CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> CONFIG_I2C_AMD8111=y</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SENSORS_DS1337 is not set</div><div class='del'>-# CONFIG_SENSORS_DS1374 is not set</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_PCF8575 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='hunk'>@@ -793,15 +872,14 @@ CONFIG_I2C_AMD8111=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_ALGO is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -813,13 +891,25 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -842,10 +932,6 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VGA_CONSOLE is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -865,6 +951,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> CONFIG_USB=y</div><div class='ctx'> # CONFIG_USB_DEBUG is not set</div><div class='add'>+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous USB options</div><div class='hunk'>@@ -873,15 +960,18 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='ctx'> CONFIG_USB_EHCI_HCD=y</div><div class='del'>-CONFIG_USB_EHCI_SPLIT_ISO=y</div><div class='ctx'> CONFIG_USB_EHCI_ROOT_HUB_TT=y</div><div class='ctx'> # CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='add'>+# CONFIG_USB_EHCI_HCD_PPC_OF is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='ctx'> # CONFIG_USB_OHCI_HCD_PPC_OF is not set</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='hunk'>@@ -896,6 +986,7 @@ CONFIG_USB_UHCI_HCD=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> # CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -912,20 +1003,15 @@ CONFIG_USB_UHCI_HCD=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='ctx'> #</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Serial Converter support</div><div class='del'>-#</div><div class='ctx'> CONFIG_USB_SERIAL=y</div><div class='ctx'> # CONFIG_USB_SERIAL_CONSOLE is not set</div><div class='add'>+CONFIG_USB_EZUSB=y</div><div class='ctx'> CONFIG_USB_SERIAL_GENERIC=y</div><div class='ctx'> # CONFIG_USB_SERIAL_AIRCABLE is not set</div><div class='del'>-# CONFIG_USB_SERIAL_AIRPRIME is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_ARK3116 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_BELKIN is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_CH341 is not set</div><div class='hunk'>@@ -943,6 +1029,7 @@ CONFIG_USB_SERIAL_CYPRESS_M8=m</div><div class='ctx'> # CONFIG_USB_SERIAL_EDGEPORT_TI is not set</div><div class='ctx'> CONFIG_USB_SERIAL_GARMIN=m</div><div class='ctx'> CONFIG_USB_SERIAL_IPW=m</div><div class='add'>+# CONFIG_USB_SERIAL_IUU is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set</div><div class='ctx'> CONFIG_USB_SERIAL_KEYSPAN=y</div><div class='ctx'> CONFIG_USB_SERIAL_KEYSPAN_MPR=y</div><div class='hunk'>@@ -962,9 +1049,11 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y</div><div class='ctx'> # CONFIG_USB_SERIAL_MCT_U232 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_MOS7720 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_MOS7840 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_MOTOROLA is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_NAVMAN is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_PL2303 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_OTI6858 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_SPCP8X5 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_HP4X is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_SAFE is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set</div><div class='hunk'>@@ -974,7 +1063,6 @@ CONFIG_USB_SERIAL_TI=m</div><div class='ctx'> # CONFIG_USB_SERIAL_OPTION is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_OMNINET is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_DEBUG is not set</div><div class='del'>-CONFIG_USB_EZUSB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Miscellaneous drivers</div><div class='hunk'>@@ -982,7 +1070,6 @@ CONFIG_USB_EZUSB=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -999,24 +1086,16 @@ CONFIG_USB_EZUSB=y</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB DSL modem support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Gadget Support</div><div class='del'>-#</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1037,12 +1116,10 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='ctx'> # CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='del'>-# CONFIG_MINIX_FS is not set</div><div class='del'>-# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='del'>-CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='ctx'> # CONFIG_FUSE_FS is not set</div><div class='hunk'>@@ -1088,8 +1165,11 @@ CONFIG_HUGETLB_PAGE=y</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='ctx'> CONFIG_NETWORK_FILESYSTEMS=y</div><div class='hunk'>@@ -1097,16 +1177,14 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> CONFIG_NFS_V3_ACL=y</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_ACL_SUPPORT=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1177,14 +1255,15 @@ CONFIG_NLS_DEFAULT="utf-8"</div><div class='ctx'> # CONFIG_NLS_KOI8_U is not set</div><div class='ctx'> CONFIG_NLS_UTF8=y</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='del'>-# CONFIG_UCC_SLOW is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=y</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1194,7 +1273,7 @@ CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='ctx'> CONFIG_HAS_DMA=y</div><div class='del'>-# CONFIG_INSTRUMENTATION is not set</div><div class='add'>+CONFIG_HAVE_LMB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -1202,6 +1281,7 @@ CONFIG_HAS_DMA=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=2048</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='hunk'>@@ -1209,34 +1289,59 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='del'>-# CONFIG_SCHEDSTATS is not set</div><div class='add'>+CONFIG_SCHEDSTATS=y</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='add'>+# CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='ctx'> # CONFIG_RT_MUTEX_TESTER is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='ctx'> # CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='add'>+# CONFIG_LOCK_STAT is not set</div><div class='ctx'> CONFIG_DEBUG_SPINLOCK_SLEEP=y</div><div class='ctx'> # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+CONFIG_STACKTRACE=y</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='del'>-# CONFIG_FORCED_INLINING is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_KPROBES_SANITY_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='add'>+# CONFIG_LKDTM is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+CONFIG_LATENCYTOP=y</div><div class='add'>+# CONFIG_SYSCTL_SYSCALL_CHECK is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_IRQSOFF_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> CONFIG_DEBUG_STACKOVERFLOW=y</div><div class='ctx'> CONFIG_DEBUG_STACK_USAGE=y</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-CONFIG_DEBUGGER=y</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='ctx'> CONFIG_XMON=y</div><div class='ctx'> CONFIG_XMON_DEFAULT=y</div><div class='ctx'> CONFIG_XMON_DISASSEMBLY=y</div><div class='add'>+CONFIG_DEBUGGER=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> CONFIG_BOOTX_TEXT=y</div><div class='hunk'>@@ -1249,44 +1354,84 @@ CONFIG_BOOTX_TEXT=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=m</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=m</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=m</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=m</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> # CONFIG_CRYPTO_HW is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig<br/>index 066c583c1f8a..ab5199f26a24 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc7448_hpc2_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/mpc7448_hpc2_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc7448_hpc2_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/mpc7448_hpc2_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:11 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:06 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -88,7 +89,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='hunk'>@@ -112,10 +112,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -126,6 +132,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -145,25 +152,25 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='ctx'> # CONFIG_PPC_CHRP is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='ctx'> # CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='ctx'> CONFIG_EMBEDDED6xx=y</div><div class='ctx'> # CONFIG_LINKSTATION is not set</div><div class='ctx'> # CONFIG_STORCENTER is not set</div><div class='ctx'> CONFIG_MPC7448HPC2=y</div><div class='ctx'> # CONFIG_PPC_HOLLY is not set</div><div class='ctx'> # CONFIG_PPC_PRPMC2800 is not set</div><div class='add'>+# CONFIG_PPC_C2K is not set</div><div class='ctx'> CONFIG_TSI108_BRIDGE=y</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='ctx'> CONFIG_MPIC=y</div><div class='hunk'>@@ -192,7 +199,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -215,6 +222,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -222,6 +230,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -256,10 +265,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -374,12 +379,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -457,6 +464,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='hunk'>@@ -523,12 +531,15 @@ CONFIG_SATA_MV=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -594,7 +605,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -611,6 +621,7 @@ CONFIG_TSI108_ETH=y</div><div class='ctx'> # CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -716,6 +727,8 @@ CONFIG_GEN_RTC=y</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='hunk'>@@ -736,6 +749,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -747,8 +761,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -780,10 +796,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -798,6 +810,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -875,6 +891,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -884,12 +901,11 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> # CONFIG_NFS_V3 is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -929,6 +945,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -954,7 +971,16 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -1007,6 +1033,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='head'>diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig<br/>index 30d7834b7db1..7c435c84c875 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc8272_ads_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/mpc8272_ads_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc8272_ads_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/mpc8272_ads_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:12 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:07 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -31,12 +32,14 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='ctx'> # CONFIG_ARCH_NO_VIRT_TO_BUS is not set</div><div class='ctx'> CONFIG_PPC=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='hunk'>@@ -45,11 +48,13 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_ARCH_MAY_HAVE_PC_FDC=y</div><div class='ctx'> CONFIG_PPC_OF=y</div><div class='ctx'> CONFIG_OF=y</div><div class='del'>-# CONFIG_PPC_UDBG_16550 is not set</div><div class='add'>+CONFIG_PPC_UDBG_16550=y</div><div class='ctx'> # CONFIG_GENERIC_TBSYNC is not set</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -81,7 +86,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -89,6 +93,7 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -106,10 +111,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -119,6 +130,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -137,14 +149,16 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-CONFIG_PPC_82xx=y</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+CONFIG_PPC_82xx=y</div><div class='ctx'> CONFIG_MPC8272_ADS=y</div><div class='ctx'> # CONFIG_PQ2FADS is not set</div><div class='ctx'> # CONFIG_EP8248E is not set</div><div class='hunk'>@@ -152,19 +166,27 @@ CONFIG_PQ2ADS=y</div><div class='ctx'> CONFIG_8260=y</div><div class='ctx'> CONFIG_8272=y</div><div class='ctx'> CONFIG_PQ2_ADS_PCI_PIC=y</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> CONFIG_CPM2=y</div><div class='del'>-CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> CONFIG_CPM=y</div><div class='ctx'> </div><div class='hunk'>@@ -181,7 +203,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -199,6 +221,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -206,6 +229,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -213,9 +237,11 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -242,10 +268,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -446,9 +468,11 @@ CONFIG_MTD_PHYSMAP_OF=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_UBI is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_GPIO=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_DA is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='hunk'>@@ -460,6 +484,7 @@ CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> # CONFIG_BLK_DEV_RAM is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> # CONFIG_MISC_DEVICES is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='hunk'>@@ -480,13 +505,12 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# An alternative FireWire stack is available with EXPERIMENTAL=y</div><div class='add'>+# A new alternative FireWire stack is available with EXPERIMENTAL=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='hunk'>@@ -510,8 +534,11 @@ CONFIG_DAVICOM_PHY=y</div><div class='ctx'> # CONFIG_REALTEK_PHY is not set</div><div class='ctx'> # CONFIG_FIXED_PHY is not set</div><div class='ctx'> CONFIG_MDIO_BITBANG=y</div><div class='add'>+# CONFIG_MDIO_OF_GPIO is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_MACE is not set</div><div class='add'>+# CONFIG_BMAC is not set</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='ctx'> # CONFIG_SUNGEM is not set</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='hunk'>@@ -533,7 +560,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='ctx'> # CONFIG_HAMACHI is not set</div><div class='hunk'>@@ -545,6 +571,7 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_GIANFAR is not set</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='hunk'>@@ -610,6 +637,7 @@ CONFIG_KEYBOARD_ATKBD=y</div><div class='ctx'> # CONFIG_KEYBOARD_XTKBD is not set</div><div class='ctx'> # CONFIG_KEYBOARD_NEWTON is not set</div><div class='ctx'> # CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='ctx'> CONFIG_INPUT_MOUSE=y</div><div class='ctx'> CONFIG_MOUSE_PS2=y</div><div class='ctx'> CONFIG_MOUSE_PS2_ALPS=y</div><div class='hunk'>@@ -620,6 +648,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y</div><div class='ctx'> # CONFIG_MOUSE_PS2_TOUCHKIT is not set</div><div class='ctx'> # CONFIG_MOUSE_SERIAL is not set</div><div class='ctx'> # CONFIG_MOUSE_VSXXXAA is not set</div><div class='add'>+# CONFIG_MOUSE_GPIO is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='ctx'> # CONFIG_INPUT_TABLET is not set</div><div class='ctx'> # CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='hunk'>@@ -634,6 +663,7 @@ CONFIG_SERIO_SERPORT=y</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -654,6 +684,7 @@ CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='ctx'> CONFIG_SERIAL_CPM=y</div><div class='ctx'> CONFIG_SERIAL_CPM_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_CPM_SCC1=y</div><div class='hunk'>@@ -666,6 +697,8 @@ CONFIG_SERIAL_CPM_SCC4=y</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='hunk'>@@ -676,10 +709,28 @@ CONFIG_HW_RANDOM=y</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_DEBUG_GPIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_BT8XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -691,8 +742,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -724,10 +777,6 @@ CONFIG_DAB=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_HID_SUPPORT is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='hunk'>@@ -798,6 +847,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -807,8 +857,8 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> CONFIG_NFS_V3_ACL=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_ACL_SUPPORT=y</div><div class='hunk'>@@ -888,6 +938,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=y</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -914,6 +965,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -931,19 +984,31 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='del'>-# CONFIG_KGDB_CONSOLE is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> CONFIG_BDI_SWITCH=y</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -951,6 +1016,7 @@ CONFIG_BDI_SWITCH=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_KEYS is not set</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -991,6 +1057,10 @@ CONFIG_CRYPTO_PCBC=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1021,6 +1091,6 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> # CONFIG_CRYPTO_HW is not set</div><div class='del'>-# CONFIG_PPC_CLOCK is not set</div><div class='add'>+CONFIG_PPC_CLOCK=y</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig<br/>index 4293c8be06e1..916e3df7cc45 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc83xx_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/mpc83xx_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc83xx_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/mpc83xx_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:14 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 07:16:25 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -16,6 +16,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> # CONFIG_FSL_EMB_PERFMON is not set</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -32,12 +33,14 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='ctx'> # CONFIG_ARCH_NO_VIRT_TO_BUS is not set</div><div class='ctx'> CONFIG_PPC=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='hunk'>@@ -51,6 +54,10 @@ CONFIG_PPC_UDBG_16550=y</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+CONFIG_REDBOOT=y</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -88,13 +95,13 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -112,10 +119,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -126,12 +139,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -150,40 +164,52 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-CONFIG_PPC_83xx=y</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='del'>-CONFIG_MPC83xx=y</div><div class='add'>+CONFIG_PPC_83xx=y</div><div class='ctx'> CONFIG_MPC831x_RDB=y</div><div class='ctx'> CONFIG_MPC832x_MDS=y</div><div class='ctx'> CONFIG_MPC832x_RDB=y</div><div class='ctx'> CONFIG_MPC834x_MDS=y</div><div class='ctx'> CONFIG_MPC834x_ITX=y</div><div class='ctx'> CONFIG_MPC836x_MDS=y</div><div class='add'>+CONFIG_MPC836x_RDK=y</div><div class='ctx'> CONFIG_MPC837x_MDS=y</div><div class='ctx'> CONFIG_MPC837x_RDB=y</div><div class='ctx'> CONFIG_SBC834x=y</div><div class='add'>+CONFIG_ASP834x=y</div><div class='ctx'> CONFIG_PPC_MPC831x=y</div><div class='ctx'> CONFIG_PPC_MPC832x=y</div><div class='ctx'> CONFIG_PPC_MPC834x=y</div><div class='ctx'> CONFIG_PPC_MPC837x=y</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> CONFIG_IPIC=y</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> CONFIG_QUICC_ENGINE=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -211,6 +237,7 @@ CONFIG_MATH_EMULATION=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='hunk'>@@ -223,6 +250,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -230,6 +258,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -237,15 +266,24 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='del'>-# CONFIG_PCI is not set</div><div class='del'>-# CONFIG_PCI_DOMAINS is not set</div><div class='del'>-# CONFIG_PCI_SYSCALL is not set</div><div class='del'>-# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_FSL_LBC=y</div><div class='add'>+CONFIG_FSL_GTM=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_DOMAINS=y</div><div class='add'>+CONFIG_PCI_SYSCALL=y</div><div class='add'>+# CONFIG_PCIEPORTBUS is not set</div><div class='add'>+CONFIG_ARCH_SUPPORTS_MSI=y</div><div class='add'>+# CONFIG_PCI_MSI is not set</div><div class='add'>+CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='add'>+# CONFIG_HOTPLUG_PCI is not set</div><div class='ctx'> # CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -261,10 +299,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -412,11 +446,13 @@ CONFIG_MTD_CFI_UTIL=y</div><div class='ctx'> # CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='ctx'> # CONFIG_MTD_PHYSMAP is not set</div><div class='ctx'> CONFIG_MTD_PHYSMAP_OF=y</div><div class='add'>+# CONFIG_MTD_INTEL_VR_NOR is not set</div><div class='ctx'> # CONFIG_MTD_PLATRAM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Self-contained MTD device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MTD_PMC551 is not set</div><div class='ctx'> # CONFIG_MTD_SLRAM is not set</div><div class='ctx'> # CONFIG_MTD_PHRAM is not set</div><div class='ctx'> # CONFIG_MTD_MTDRAM is not set</div><div class='hunk'>@@ -434,10 +470,12 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y</div><div class='ctx'> # CONFIG_MTD_NAND_MUSEUM_IDS is not set</div><div class='ctx'> CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> # CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='add'>+# CONFIG_MTD_NAND_CAFE is not set</div><div class='ctx'> # CONFIG_MTD_NAND_NANDSIM is not set</div><div class='ctx'> # CONFIG_MTD_NAND_PLATFORM is not set</div><div class='ctx'> # CONFIG_MTD_ALAUDA is not set</div><div class='ctx'> CONFIG_MTD_NAND_FSL_ELBC=y</div><div class='add'>+# CONFIG_MTD_NAND_FSL_UPM is not set</div><div class='ctx'> # CONFIG_MTD_ONENAND is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -445,14 +483,21 @@ CONFIG_MTD_NAND_FSL_ELBC=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_UBI is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_GPIO=y</div><div class='ctx'> CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='add'>+# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='add'>+# CONFIG_BLK_DEV_DAC960 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UMEM is not set</div><div class='ctx'> # CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> # CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_SX8 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_UB is not set</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='hunk'>@@ -460,9 +505,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+# CONFIG_SGI_IOC4 is not set</div><div class='add'>+# CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -505,24 +555,128 @@ CONFIG_SCSI_WAIT_SCAN=m</div><div class='ctx'> # CONFIG_SCSI_SRP_ATTRS is not set</div><div class='ctx'> CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set</div><div class='add'>+# CONFIG_SCSI_3W_9XXX is not set</div><div class='add'>+# CONFIG_SCSI_ACARD is not set</div><div class='add'>+# CONFIG_SCSI_AACRAID is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='add'>+# CONFIG_SCSI_AIC79XX is not set</div><div class='add'>+# CONFIG_SCSI_AIC94XX is not set</div><div class='add'>+# CONFIG_SCSI_DPT_I2O is not set</div><div class='add'>+# CONFIG_SCSI_ADVANSYS is not set</div><div class='add'>+# CONFIG_SCSI_ARCMSR is not set</div><div class='add'>+# CONFIG_MEGARAID_NEWGEN is not set</div><div class='add'>+# CONFIG_MEGARAID_LEGACY is not set</div><div class='add'>+# CONFIG_MEGARAID_SAS is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='add'>+# CONFIG_SCSI_BUSLOGIC is not set</div><div class='add'>+# CONFIG_SCSI_DMX3191D is not set</div><div class='add'>+# CONFIG_SCSI_EATA is not set</div><div class='add'>+# CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='add'>+# CONFIG_SCSI_GDTH is not set</div><div class='add'>+# CONFIG_SCSI_IPS is not set</div><div class='add'>+# CONFIG_SCSI_INITIO is not set</div><div class='add'>+# CONFIG_SCSI_INIA100 is not set</div><div class='add'>+# CONFIG_SCSI_MVSAS is not set</div><div class='add'>+# CONFIG_SCSI_STEX is not set</div><div class='add'>+# CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='add'>+# CONFIG_SCSI_IPR is not set</div><div class='add'>+# CONFIG_SCSI_QLOGIC_1280 is not set</div><div class='add'>+# CONFIG_SCSI_QLA_FC is not set</div><div class='add'>+# CONFIG_SCSI_QLA_ISCSI is not set</div><div class='add'>+# CONFIG_SCSI_LPFC is not set</div><div class='add'>+# CONFIG_SCSI_DC395x is not set</div><div class='add'>+# CONFIG_SCSI_DC390T is not set</div><div class='add'>+# CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_MESH is not set</div><div class='add'>+# CONFIG_SCSI_MAC53C94 is not set</div><div class='add'>+# CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='add'>+# CONFIG_SATA_AHCI is not set</div><div class='add'>+# CONFIG_SATA_SIL24 is not set</div><div class='ctx'> CONFIG_SATA_FSL=y</div><div class='ctx'> CONFIG_ATA_SFF=y</div><div class='add'>+# CONFIG_SATA_SVW is not set</div><div class='add'>+# CONFIG_ATA_PIIX is not set</div><div class='ctx'> # CONFIG_SATA_MV is not set</div><div class='add'>+# CONFIG_SATA_NV is not set</div><div class='add'>+# CONFIG_PDC_ADMA is not set</div><div class='add'>+# CONFIG_SATA_QSTOR is not set</div><div class='add'>+# CONFIG_SATA_PROMISE is not set</div><div class='add'>+# CONFIG_SATA_SX4 is not set</div><div class='add'>+# CONFIG_SATA_SIL is not set</div><div class='add'>+# CONFIG_SATA_SIS is not set</div><div class='add'>+# CONFIG_SATA_ULI is not set</div><div class='add'>+# CONFIG_SATA_VIA is not set</div><div class='add'>+# CONFIG_SATA_VITESSE is not set</div><div class='add'>+# CONFIG_SATA_INIC162X is not set</div><div class='add'>+# CONFIG_PATA_ALI is not set</div><div class='add'>+# CONFIG_PATA_AMD is not set</div><div class='add'>+# CONFIG_PATA_ARTOP is not set</div><div class='add'>+# CONFIG_PATA_ATIIXP is not set</div><div class='add'>+# CONFIG_PATA_CMD640_PCI is not set</div><div class='add'>+# CONFIG_PATA_CMD64X is not set</div><div class='add'>+# CONFIG_PATA_CS5520 is not set</div><div class='add'>+# CONFIG_PATA_CS5530 is not set</div><div class='add'>+# CONFIG_PATA_CYPRESS is not set</div><div class='add'>+# CONFIG_PATA_EFAR is not set</div><div class='add'>+# CONFIG_ATA_GENERIC is not set</div><div class='add'>+# CONFIG_PATA_HPT366 is not set</div><div class='add'>+# CONFIG_PATA_HPT37X is not set</div><div class='add'>+# CONFIG_PATA_HPT3X2N is not set</div><div class='add'>+# CONFIG_PATA_HPT3X3 is not set</div><div class='add'>+# CONFIG_PATA_IT821X is not set</div><div class='add'>+# CONFIG_PATA_IT8213 is not set</div><div class='add'>+# CONFIG_PATA_JMICRON is not set</div><div class='add'>+# CONFIG_PATA_TRIFLEX is not set</div><div class='add'>+# CONFIG_PATA_MARVELL is not set</div><div class='add'>+# CONFIG_PATA_MPIIX is not set</div><div class='add'>+# CONFIG_PATA_OLDPIIX is not set</div><div class='add'>+# CONFIG_PATA_NETCELL is not set</div><div class='add'>+# CONFIG_PATA_NINJA32 is not set</div><div class='add'>+# CONFIG_PATA_NS87410 is not set</div><div class='add'>+# CONFIG_PATA_NS87415 is not set</div><div class='add'>+# CONFIG_PATA_OPTI is not set</div><div class='add'>+# CONFIG_PATA_OPTIDMA is not set</div><div class='add'>+# CONFIG_PATA_PDC_OLD is not set</div><div class='add'>+# CONFIG_PATA_RADISYS is not set</div><div class='add'>+# CONFIG_PATA_RZ1000 is not set</div><div class='add'>+# CONFIG_PATA_SC1200 is not set</div><div class='add'>+# CONFIG_PATA_SERVERWORKS is not set</div><div class='add'>+# CONFIG_PATA_PDC2027X is not set</div><div class='add'>+# CONFIG_PATA_SIL680 is not set</div><div class='add'>+# CONFIG_PATA_SIS is not set</div><div class='add'>+# CONFIG_PATA_VIA is not set</div><div class='add'>+# CONFIG_PATA_WINBOND is not set</div><div class='ctx'> # CONFIG_PATA_PLATFORM is not set</div><div class='add'>+# CONFIG_PATA_SCH is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='add'>+# CONFIG_FIREWIRE is not set</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='add'>+# CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='ctx'> # CONFIG_VETH is not set</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='ctx'> CONFIG_PHYLIB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -542,21 +696,60 @@ CONFIG_ICPLUS_PHY=y</div><div class='ctx'> # CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_MACE is not set</div><div class='add'>+# CONFIG_BMAC is not set</div><div class='add'>+# CONFIG_HAPPYMEAL is not set</div><div class='add'>+# CONFIG_SUNGEM is not set</div><div class='add'>+# CONFIG_CASSINI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+# CONFIG_NET_TULIP is not set</div><div class='add'>+# CONFIG_HP100 is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_NET_PCI is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='add'>+# CONFIG_ACENIC is not set</div><div class='add'>+# CONFIG_DL2K is not set</div><div class='add'>+# CONFIG_E1000 is not set</div><div class='add'>+# CONFIG_E1000E is not set</div><div class='add'>+# CONFIG_IP1000 is not set</div><div class='add'>+# CONFIG_IGB is not set</div><div class='add'>+# CONFIG_NS83820 is not set</div><div class='add'>+# CONFIG_HAMACHI is not set</div><div class='add'>+# CONFIG_YELLOWFIN is not set</div><div class='add'>+# CONFIG_R8169 is not set</div><div class='add'>+# CONFIG_SIS190 is not set</div><div class='add'>+# CONFIG_SKGE is not set</div><div class='add'>+# CONFIG_SKY2 is not set</div><div class='add'>+# CONFIG_VIA_VELOCITY is not set</div><div class='add'>+# CONFIG_TIGON3 is not set</div><div class='add'>+# CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-# CONFIG_GFAR_NAPI is not set</div><div class='ctx'> CONFIG_UCC_GETH=y</div><div class='del'>-# CONFIG_UGETH_NAPI is not set</div><div class='ctx'> # CONFIG_UGETH_MAGIC_PACKET is not set</div><div class='ctx'> # CONFIG_UGETH_FILTERING is not set</div><div class='ctx'> # CONFIG_UGETH_TX_ON_DEMAND is not set</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='add'>+# CONFIG_QLA3XXX is not set</div><div class='add'>+# CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='add'>+# CONFIG_CHELSIO_T1 is not set</div><div class='add'>+# CONFIG_CHELSIO_T3 is not set</div><div class='add'>+# CONFIG_IXGBE is not set</div><div class='add'>+# CONFIG_IXGB is not set</div><div class='add'>+# CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='add'>+# CONFIG_NETXEN_NIC is not set</div><div class='add'>+# CONFIG_NIU is not set</div><div class='add'>+# CONFIG_MLX4_CORE is not set</div><div class='add'>+# CONFIG_TEHUTI is not set</div><div class='add'>+# CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='add'>+# CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Wireless LAN</div><div class='hunk'>@@ -574,8 +767,11 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_USB_RTL8150 is not set</div><div class='ctx'> # CONFIG_USB_USBNET is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='add'>+# CONFIG_FDDI is not set</div><div class='add'>+# CONFIG_HIPPI is not set</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NET_FC is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='ctx'> # CONFIG_NET_POLL_CONTROLLER is not set</div><div class='hunk'>@@ -619,12 +815,14 @@ CONFIG_INPUT=y</div><div class='ctx'> # CONFIG_VT is not set</div><div class='ctx'> CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+# CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Serial drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_PCI=y</div><div class='ctx'> CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='ctx'> CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='hunk'>@@ -635,43 +833,95 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='add'>+# CONFIG_SERIAL_JSM is not set</div><div class='ctx'> # CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='ctx'> # CONFIG_SERIAL_QE is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-# CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='ctx'> CONFIG_GEN_RTC=y</div><div class='ctx'> # CONFIG_GEN_RTC_X is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_APPLICOM is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALI1535 is not set</div><div class='add'>+# CONFIG_I2C_ALI1563 is not set</div><div class='add'>+# CONFIG_I2C_ALI15X3 is not set</div><div class='add'>+# CONFIG_I2C_AMD756 is not set</div><div class='add'>+# CONFIG_I2C_AMD8111 is not set</div><div class='add'>+# CONFIG_I2C_I801 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='add'>+# CONFIG_I2C_PIIX4 is not set</div><div class='add'>+# CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_SIS5595 is not set</div><div class='add'>+# CONFIG_I2C_SIS630 is not set</div><div class='add'>+# CONFIG_I2C_SIS96X is not set</div><div class='add'>+# CONFIG_I2C_VIA is not set</div><div class='add'>+# CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='ctx'> CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='ctx'> # CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CORE is not set</div><div class='hunk'>@@ -679,10 +929,31 @@ CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIO_SYSFS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='add'>+# CONFIG_GPIO_PCA953X is not set</div><div class='add'>+# CONFIG_GPIO_PCF857X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_BT8XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -692,8 +963,10 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_ADM9240 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7470 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_AMS is not set</div><div class='ctx'> # CONFIG_SENSORS_ATXP1 is not set</div><div class='ctx'> # CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_I5K_AMB is not set</div><div class='ctx'> # CONFIG_SENSORS_F71805F is not set</div><div class='ctx'> # CONFIG_SENSORS_F71882FG is not set</div><div class='ctx'> # CONFIG_SENSORS_F75375S is not set</div><div class='hunk'>@@ -715,13 +988,16 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_MAX6650 is not set</div><div class='ctx'> # CONFIG_SENSORS_PC87360 is not set</div><div class='ctx'> # CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_SIS5595 is not set</div><div class='ctx'> # CONFIG_SENSORS_DME1737 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M1 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M192 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47B397 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADS7828 is not set</div><div class='ctx'> # CONFIG_SENSORS_THMC50 is not set</div><div class='add'>+# CONFIG_SENSORS_VIA686A is not set</div><div class='ctx'> # CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_VT8231 is not set</div><div class='ctx'> # CONFIG_SENSORS_W83781D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83791D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83792D is not set</div><div class='hunk'>@@ -732,6 +1008,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -739,7 +1016,15 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='del'>-CONFIG_83xx_WDT=y</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='add'>+# CONFIG_8xxx_WDT is not set</div><div class='add'>+# CONFIG_WATCHDOG_RTAS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCIPCWATCHDOG is not set</div><div class='add'>+# CONFIG_WDTPCI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB-based Watchdog Cards</div><div class='hunk'>@@ -755,8 +1040,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -778,6 +1065,8 @@ CONFIG_DAB=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_AGP is not set</div><div class='add'>+# CONFIG_DRM is not set</div><div class='ctx'> # CONFIG_VGASTATE is not set</div><div class='ctx'> CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # CONFIG_FB is not set</div><div class='hunk'>@@ -787,10 +1076,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -806,7 +1091,7 @@ CONFIG_USB_HID=y</div><div class='ctx'> # CONFIG_USB_HIDDEV is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='del'>-# CONFIG_USB_ARCH_HAS_OHCI is not set</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> CONFIG_USB=y</div><div class='ctx'> # CONFIG_USB_DEBUG is not set</div><div class='hunk'>@@ -821,6 +1106,7 @@ CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -833,6 +1119,8 @@ CONFIG_USB_EHCI_FSL=y</div><div class='ctx'> CONFIG_USB_EHCI_HCD_PPC_OF=y</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='ctx'> # CONFIG_USB_ISP1760_HCD is not set</div><div class='add'>+# CONFIG_USB_OHCI_HCD is not set</div><div class='add'>+# CONFIG_USB_UHCI_HCD is not set</div><div class='ctx'> # CONFIG_USB_SL811_HCD is not set</div><div class='ctx'> # CONFIG_USB_R8A66597_HCD is not set</div><div class='ctx'> </div><div class='hunk'>@@ -858,7 +1146,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -871,7 +1158,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -893,6 +1179,7 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='add'>+# CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> # CONFIG_DMADEVICES is not set</div><div class='hunk'>@@ -963,6 +1250,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -973,14 +1261,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1014,6 +1301,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='ctx'> CONFIG_UCC_FAST=y</div><div class='ctx'> CONFIG_UCC=y</div><div class='add'>+CONFIG_QE_GPIO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='hunk'>@@ -1022,6 +1310,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1045,8 +1334,18 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1061,12 +1360,14 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # Crypto core or helper</div><div class='ctx'> #</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_AEAD=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='add'>+CONFIG_CRYPTO_HASH=y</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='ctx'> # CONFIG_CRYPTO_GF128MUL is not set</div><div class='ctx'> # CONFIG_CRYPTO_NULL is not set</div><div class='ctx'> # CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+CONFIG_CRYPTO_AUTHENC=y</div><div class='ctx'> # CONFIG_CRYPTO_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1100,6 +1401,10 @@ CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1131,6 +1436,8 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='add'>+# CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+CONFIG_CRYPTO_DEV_TALITOS=y</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig<br/>index fa0170504b88..f0a13bebf50c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc85xx_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/mpc85xx_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc85xx_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/mpc85xx_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 09:03:46 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 07:15:20 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_E500=y</div><div class='add'>+# CONFIG_PPC_E500MC is not set</div><div class='ctx'> CONFIG_BOOKE=y</div><div class='ctx'> CONFIG_FSL_BOOKE=y</div><div class='ctx'> CONFIG_FSL_EMB_PERFMON=y</div><div class='hunk'>@@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='ctx'> # CONFIG_ARCH_NO_VIRT_TO_BUS is not set</div><div class='ctx'> CONFIG_PPC=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='hunk'>@@ -92,7 +95,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -118,10 +120,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -138,6 +146,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -156,8 +165,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -166,11 +173,13 @@ CONFIG_MPC8540_ADS=y</div><div class='ctx'> CONFIG_MPC8560_ADS=y</div><div class='ctx'> CONFIG_MPC85xx_CDS=y</div><div class='ctx'> CONFIG_MPC85xx_MDS=y</div><div class='add'>+CONFIG_MPC8536_DS=y</div><div class='ctx'> CONFIG_MPC85xx_DS=y</div><div class='ctx'> CONFIG_KSI8560=y</div><div class='ctx'> # CONFIG_STX_GP3 is not set</div><div class='ctx'> CONFIG_TQM8540=y</div><div class='ctx'> CONFIG_TQM8541=y</div><div class='add'>+CONFIG_TQM8548=y</div><div class='ctx'> CONFIG_TQM8555=y</div><div class='ctx'> CONFIG_TQM8560=y</div><div class='ctx'> CONFIG_SBC8548=y</div><div class='hunk'>@@ -189,7 +198,6 @@ CONFIG_PPC_I8259=y</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='ctx'> CONFIG_QUICC_ENGINE=y</div><div class='ctx'> CONFIG_CPM2=y</div><div class='del'>-CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='ctx'> CONFIG_FSL_ULI1575=y</div><div class='ctx'> CONFIG_CPM=y</div><div class='ctx'> </div><div class='hunk'>@@ -206,7 +214,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -229,6 +237,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -236,6 +245,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -248,6 +258,7 @@ CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -274,10 +285,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x10000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -403,12 +410,15 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_GPIO=y</div><div class='ctx'> CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='hunk'>@@ -429,12 +439,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -514,6 +526,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='hunk'>@@ -581,12 +594,15 @@ CONFIG_PATA_ALI=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=y</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -631,7 +647,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -645,10 +660,10 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> # CONFIG_UCC_GETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -725,12 +740,14 @@ CONFIG_SERIO_SERPORT=y</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -776,44 +793,68 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> # CONFIG_I2C_CHARDEV is not set</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_CPM is not set</div><div class='add'>+# CONFIG_I2C_GPIO is not set</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> CONFIG_SENSORS_EEPROM=y</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_TPS65010 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CORE is not set</div><div class='hunk'>@@ -821,10 +862,32 @@ CONFIG_SENSORS_EEPROM=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_DEBUG_GPIO is not set</div><div class='add'>+# CONFIG_GPIO_SYSFS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='add'>+# CONFIG_GPIO_PCA953X is not set</div><div class='add'>+# CONFIG_GPIO_PCF857X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_BT8XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -836,8 +899,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -879,6 +944,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y</div><div class='ctx'> # CONFIG_DVB_TTUSB_BUDGET is not set</div><div class='ctx'> # CONFIG_DVB_TTUSB_DEC is not set</div><div class='ctx'> # CONFIG_DVB_CINERGYT2 is not set</div><div class='add'>+# CONFIG_DVB_SIANO_SMS1XXX is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Supported FlexCopII (B2C2) Adapters</div><div class='hunk'>@@ -925,6 +991,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y</div><div class='ctx'> # CONFIG_DVB_SP887X is not set</div><div class='ctx'> # CONFIG_DVB_CX22700 is not set</div><div class='ctx'> # CONFIG_DVB_CX22702 is not set</div><div class='add'>+# CONFIG_DVB_DRX397XD is not set</div><div class='ctx'> # CONFIG_DVB_L64781 is not set</div><div class='ctx'> # CONFIG_DVB_TDA1004X is not set</div><div class='ctx'> # CONFIG_DVB_NXT6000 is not set</div><div class='hunk'>@@ -992,15 +1059,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> CONFIG_VGA_CONSOLE=y</div><div class='ctx'> # CONFIG_VGACON_SOFT_SCROLLBACK is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=y</div><div class='ctx'> CONFIG_SND_TIMER=y</div><div class='ctx'> CONFIG_SND_PCM=y</div><div class='hunk'>@@ -1014,19 +1073,15 @@ CONFIG_SND_PCM_OSS_PLUGINS=y</div><div class='ctx'> CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_VMASTER=y</div><div class='ctx'> CONFIG_SND_AC97_CODEC=y</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='ctx'> # CONFIG_SND_DUMMY is not set</div><div class='ctx'> # CONFIG_SND_MTPAV is not set</div><div class='ctx'> # CONFIG_SND_SERIAL_U16550 is not set</div><div class='ctx'> # CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='add'>+CONFIG_SND_PCI=y</div><div class='ctx'> # CONFIG_SND_AD1889 is not set</div><div class='ctx'> # CONFIG_SND_ALS300 is not set</div><div class='ctx'> # CONFIG_SND_ALS4000 is not set</div><div class='hunk'>@@ -1088,39 +1143,12 @@ CONFIG_SND_INTEL8X0=y</div><div class='ctx'> # CONFIG_SND_VIRTUOSO is not set</div><div class='ctx'> # CONFIG_SND_VX222 is not set</div><div class='ctx'> # CONFIG_SND_YMFPCI is not set</div><div class='del'>-# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerMac devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerPC devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PPC=y</div><div class='add'>+CONFIG_SND_USB=y</div><div class='ctx'> # CONFIG_SND_USB_AUDIO is not set</div><div class='ctx'> # CONFIG_SND_USB_USX2Y is not set</div><div class='ctx'> # CONFIG_SND_USB_CAIAQ is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio for the Texas Instruments OMAP</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> CONFIG_AC97_BUS=y</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='hunk'>@@ -1152,6 +1180,7 @@ CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1175,6 +1204,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> # CONFIG_USB_UHCI_HCD is not set</div><div class='ctx'> # CONFIG_USB_SL811_HCD is not set</div><div class='ctx'> # CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Device Class drivers</div><div class='hunk'>@@ -1203,6 +1233,7 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1211,7 +1242,6 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1224,7 +1254,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1285,6 +1314,7 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -1318,6 +1348,7 @@ CONFIG_DMA_ENGINE=y</div><div class='ctx'> # DMA Clients</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_DMA is not set</div><div class='add'>+# CONFIG_DMATEST is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1332,6 +1363,7 @@ CONFIG_EXT3_FS_XATTR=y</div><div class='ctx'> # CONFIG_EXT3_FS_SECURITY is not set</div><div class='ctx'> # CONFIG_EXT4DEV_FS is not set</div><div class='ctx'> CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='ctx'> CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_REISERFS_FS is not set</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='hunk'>@@ -1394,6 +1426,7 @@ CONFIG_EFS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> CONFIG_VXFS_FS=m</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> CONFIG_QNX4FS_FS=m</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1406,17 +1439,16 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=y</div><div class='ctx'> # CONFIG_NFSD_V3 is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1487,6 +1519,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> # CONFIG_NLS_KOI8_U is not set</div><div class='ctx'> CONFIG_NLS_UTF8=m</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='add'>+# CONFIG_QE_GPIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='hunk'>@@ -1495,6 +1528,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1515,11 +1549,13 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='del'>-# CONFIG_DEBUG_FS is not set</div><div class='add'>+CONFIG_DEBUG_FS=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1538,19 +1574,31 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='del'>-# CONFIG_KGDB_CONSOLE is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='add'>+CONFIG_VIRQ_DEBUG=y</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1606,6 +1654,10 @@ CONFIG_CRYPTO_HMAC=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1638,6 +1690,7 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='del'>-# CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='add'>+CONFIG_PPC_CLOCK=y</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/mpc8610_hpcd_defconfig b/arch/powerpc/configs/mpc8610_hpcd_defconfig<br/>index cdf98ae3682b..1a9990731eb0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc8610_hpcd_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/mpc8610_hpcd_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc8610_hpcd_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/mpc8610_hpcd_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26</div><div class='del'>-# Tue Jul 15 08:31:01 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:10 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -91,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -118,10 +118,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='del'>-CONFIG_HAVE_DMA_ATTRS=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -138,6 +144,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -159,9 +166,8 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='ctx'> CONFIG_PPC_CHRP=y</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='ctx'> CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='hunk'>@@ -207,7 +213,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> CONFIG_HZ_1000=y</div><div class='ctx'> CONFIG_HZ=1000</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -230,6 +236,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -237,6 +244,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=12</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -278,10 +286,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -391,6 +395,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -503,18 +509,17 @@ CONFIG_BLK_DEV_RAM_SIZE=131072</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='del'>-CONFIG_IDE_MAX_HWIFS=4</div><div class='ctx'> # CONFIG_BLK_DEV_IDE is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -593,6 +598,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_MESH is not set</div><div class='ctx'> # CONFIG_SCSI_MAC53C94 is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='hunk'>@@ -669,7 +675,6 @@ CONFIG_PATA_ALI=y</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=y</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -756,12 +761,14 @@ CONFIG_SERIO_SERPORT=y</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -807,44 +814,69 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> # CONFIG_I2C_CHARDEV is not set</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='del'>-# CONFIG_I2C_HYDRA is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_POWERMAC=y</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -853,6 +885,8 @@ CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='hunk'>@@ -869,8 +903,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -945,6 +981,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='ctx'> CONFIG_FB_FSL_DIU=y</div><div class='ctx'> # CONFIG_FB_IBM_GXT4500 is not set</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='hunk'>@@ -963,15 +1000,7 @@ CONFIG_VGA_CONSOLE=y</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> # CONFIG_FRAMEBUFFER_CONSOLE is not set</div><div class='ctx'> # CONFIG_LOGO is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=y</div><div class='ctx'> CONFIG_SND_TIMER=y</div><div class='ctx'> CONFIG_SND_PCM=y</div><div class='hunk'>@@ -985,18 +1014,12 @@ CONFIG_SND_PCM_OSS_PLUGINS=y</div><div class='ctx'> CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='ctx'> # CONFIG_SND_DUMMY is not set</div><div class='ctx'> # CONFIG_SND_MTPAV is not set</div><div class='ctx'> # CONFIG_SND_SERIAL_U16550 is not set</div><div class='ctx'> # CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PCI=y</div><div class='ctx'> # CONFIG_SND_AD1889 is not set</div><div class='ctx'> # CONFIG_SND_ALS300 is not set</div><div class='ctx'> # CONFIG_SND_ALS4000 is not set</div><div class='hunk'>@@ -1058,42 +1081,14 @@ CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VIRTUOSO is not set</div><div class='ctx'> # CONFIG_SND_VX222 is not set</div><div class='ctx'> # CONFIG_SND_YMFPCI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerMac devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PPC=y</div><div class='ctx'> # CONFIG_SND_POWERMAC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerPC devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Apple Onboard Audio driver</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_AOA is not set</div><div class='del'>-# CONFIG_SND_AOA_SOUNDBUS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND_SOC=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND_SOC_MPC8610=y</div><div class='ctx'> CONFIG_SND_SOC_MPC8610_HPCD=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio for the Texas Instruments OMAP</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND_SOC_CS4270=y</div><div class='ctx'> CONFIG_SND_SOC_CS4270_VD33_ERRATA=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -1108,6 +1103,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -1235,6 +1234,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1245,16 +1245,15 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=y</div><div class='ctx'> # CONFIG_NFSD_V3 is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1334,6 +1333,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1358,6 +1358,8 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_DEBUG_SHIRQ=y</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1376,19 +1378,29 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='ctx'> # CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='ctx'> # CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_BOOTX_TEXT is not set</div><div class='hunk'>@@ -1443,6 +1455,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1475,6 +1491,7 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig<br/>index 867b8c0215f3..ea09be31b6ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc8641_hpcn_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/mpc8641_hpcn_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc8641_hpcn_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/mpc8641_hpcn_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:15 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:11 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -33,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -92,7 +93,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -100,6 +100,7 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -118,10 +119,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+CONFIG_USE_GENERIC_SMP_HELPERS=y</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -139,6 +146,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -157,30 +165,40 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-CONFIG_PPC_86xx=y</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+CONFIG_PPC_86xx=y</div><div class='ctx'> CONFIG_MPC8641_HPCN=y</div><div class='ctx'> # CONFIG_SBC8641D is not set</div><div class='ctx'> # CONFIG_MPC8610_HPCD is not set</div><div class='ctx'> CONFIG_MPC8641=y</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='ctx'> CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='ctx'> CONFIG_PPC_I8259=y</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> CONFIG_FSL_ULI1575=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -196,16 +214,18 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> CONFIG_HZ_1000=y</div><div class='ctx'> CONFIG_HZ=1000</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> CONFIG_BINFMT_MISC=m</div><div class='ctx'> # CONFIG_IOMMU_HELPER is not set</div><div class='add'>+# CONFIG_HOTPLUG_CPU is not set</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> # CONFIG_IRQ_ALL_CPUS is not set</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='hunk'>@@ -219,6 +239,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -226,6 +247,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -233,11 +255,13 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -264,10 +288,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -393,6 +413,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -403,6 +425,7 @@ CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_DA is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='hunk'>@@ -419,12 +442,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -503,7 +528,10 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_DC390T is not set</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_MESH is not set</div><div class='add'>+# CONFIG_SCSI_MAC53C94 is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='hunk'>@@ -571,12 +599,15 @@ CONFIG_PATA_ALI=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=y</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -603,6 +634,8 @@ CONFIG_VITESSE_PHY=y</div><div class='ctx'> # CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_MACE is not set</div><div class='add'>+# CONFIG_BMAC is not set</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='ctx'> # CONFIG_SUNGEM is not set</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='hunk'>@@ -620,7 +653,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -634,9 +666,10 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -713,12 +746,14 @@ CONFIG_SERIO_SERPORT=y</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -746,11 +781,14 @@ CONFIG_SERIAL_8250_RSA=y</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='ctx'> # CONFIG_SERIAL_JSM is not set</div><div class='ctx'> # CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_NVRAM=y</div><div class='hunk'>@@ -762,43 +800,70 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> # CONFIG_I2C_CHARDEV is not set</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> CONFIG_SENSORS_EEPROM=y</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -807,10 +872,13 @@ CONFIG_SENSORS_EEPROM=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -822,8 +890,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -865,6 +935,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y</div><div class='ctx'> # CONFIG_DVB_TTUSB_BUDGET is not set</div><div class='ctx'> # CONFIG_DVB_TTUSB_DEC is not set</div><div class='ctx'> # CONFIG_DVB_CINERGYT2 is not set</div><div class='add'>+# CONFIG_DVB_SIANO_SMS1XXX is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Supported FlexCopII (B2C2) Adapters</div><div class='hunk'>@@ -911,6 +982,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y</div><div class='ctx'> # CONFIG_DVB_SP887X is not set</div><div class='ctx'> # CONFIG_DVB_CX22700 is not set</div><div class='ctx'> # CONFIG_DVB_CX22702 is not set</div><div class='add'>+# CONFIG_DVB_DRX397XD is not set</div><div class='ctx'> # CONFIG_DVB_L64781 is not set</div><div class='ctx'> # CONFIG_DVB_TDA1004X is not set</div><div class='ctx'> # CONFIG_DVB_NXT6000 is not set</div><div class='hunk'>@@ -978,15 +1050,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> CONFIG_VGA_CONSOLE=y</div><div class='ctx'> # CONFIG_VGACON_SOFT_SCROLLBACK is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=y</div><div class='ctx'> CONFIG_SND_TIMER=y</div><div class='ctx'> CONFIG_SND_PCM=y</div><div class='hunk'>@@ -1000,19 +1064,15 @@ CONFIG_SND_PCM_OSS_PLUGINS=y</div><div class='ctx'> CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_VMASTER=y</div><div class='ctx'> CONFIG_SND_AC97_CODEC=y</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='ctx'> # CONFIG_SND_DUMMY is not set</div><div class='ctx'> # CONFIG_SND_MTPAV is not set</div><div class='ctx'> # CONFIG_SND_SERIAL_U16550 is not set</div><div class='ctx'> # CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='add'>+CONFIG_SND_PCI=y</div><div class='ctx'> # CONFIG_SND_AD1889 is not set</div><div class='ctx'> # CONFIG_SND_ALS300 is not set</div><div class='ctx'> # CONFIG_SND_ALS4000 is not set</div><div class='hunk'>@@ -1074,39 +1134,14 @@ CONFIG_SND_INTEL8X0=y</div><div class='ctx'> # CONFIG_SND_VIRTUOSO is not set</div><div class='ctx'> # CONFIG_SND_VX222 is not set</div><div class='ctx'> # CONFIG_SND_YMFPCI is not set</div><div class='del'>-# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerMac devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerPC devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PPC=y</div><div class='add'>+# CONFIG_SND_POWERMAC is not set</div><div class='add'>+# CONFIG_SND_AOA is not set</div><div class='add'>+CONFIG_SND_USB=y</div><div class='ctx'> # CONFIG_SND_USB_AUDIO is not set</div><div class='ctx'> # CONFIG_SND_USB_USX2Y is not set</div><div class='ctx'> # CONFIG_SND_USB_CAIAQ is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio for the Texas Instruments OMAP</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> CONFIG_AC97_BUS=y</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='hunk'>@@ -1138,6 +1173,7 @@ CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1189,6 +1225,7 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1197,7 +1234,6 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1210,7 +1246,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1264,6 +1299,7 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -1362,6 +1398,7 @@ CONFIG_EFS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> CONFIG_VXFS_FS=m</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> CONFIG_HPFS_FS=m</div><div class='ctx'> CONFIG_QNX4FS_FS=m</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1374,17 +1411,16 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=y</div><div class='ctx'> # CONFIG_NFSD_V3 is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1463,6 +1499,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1488,6 +1525,8 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1506,19 +1545,32 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1573,6 +1625,10 @@ CONFIG_CRYPTO_HMAC=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1605,5 +1661,6 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig<br/>index 46fffbcd3f99..1501c4336b3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc866_ads_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/mpc866_ads_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc866_ads_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/mpc866_ads_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:16 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:11 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -29,6 +29,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -106,10 +107,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -120,6 +127,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -138,8 +146,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> CONFIG_CPM1=y</div><div class='hunk'>@@ -157,6 +163,7 @@ CONFIG_MPC86XADS=y</div><div class='ctx'> # Generic MPC8xx Options</div><div class='ctx'> #</div><div class='ctx'> CONFIG_8xx_COPYBACK=y</div><div class='add'>+# CONFIG_8xx_GPIO is not set</div><div class='ctx'> CONFIG_8xx_CPU6=y</div><div class='ctx'> CONFIG_8xx_CPU15=y</div><div class='ctx'> CONFIG_NO_UCODE_PATCH=y</div><div class='hunk'>@@ -175,7 +182,6 @@ CONFIG_NO_UCODE_PATCH=y</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='del'>-CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> CONFIG_CPM=y</div><div class='ctx'> </div><div class='hunk'>@@ -192,7 +198,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> CONFIG_HZ_1000=y</div><div class='ctx'> CONFIG_HZ=1000</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -215,6 +221,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -222,6 +229,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> # CONFIG_PROC_DEVICETREE is not set</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -253,10 +261,6 @@ CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0x80000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xfd000000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -361,6 +365,7 @@ CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> # CONFIG_BLK_DEV_RAM is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -378,7 +383,6 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -414,7 +418,6 @@ CONFIG_FS_ENET_HAS_SCC=y</div><div class='ctx'> CONFIG_FS_ENET_HAS_FEC=y</div><div class='ctx'> CONFIG_FS_ENET_MDIO_FEC=y</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_GIANFAR is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> </div><div class='hunk'>@@ -484,6 +487,7 @@ CONFIG_SERIO_I8042=y</div><div class='ctx'> CONFIG_SERIO_SERPORT=y</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -524,6 +528,8 @@ CONFIG_GEN_RTC=y</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='hunk'>@@ -540,6 +546,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -551,8 +558,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -582,10 +591,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -599,6 +604,10 @@ CONFIG_USB_SUPPORT=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -677,6 +686,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -687,13 +697,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -733,6 +742,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=y</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -758,7 +768,15 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -810,6 +828,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -841,6 +863,7 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='del'>-# CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='add'>+CONFIG_PPC_CLOCK=y</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig<br/>index 9df78973005e..fc3f6dc58126 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc885_ads_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/mpc885_ads_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc885_ads_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/mpc885_ads_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:17 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:12 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -29,6 +29,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -108,10 +109,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=1</div><div class='hunk'>@@ -121,6 +128,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -139,8 +147,6 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> CONFIG_CPM1=y</div><div class='hunk'>@@ -165,6 +171,7 @@ CONFIG_MPC8xx_SECOND_ETH_FEC2=y</div><div class='ctx'> # Generic MPC8xx Options</div><div class='ctx'> #</div><div class='ctx'> CONFIG_8xx_COPYBACK=y</div><div class='add'>+# CONFIG_8xx_GPIO is not set</div><div class='ctx'> # CONFIG_8xx_CPU6 is not set</div><div class='ctx'> CONFIG_8xx_CPU15=y</div><div class='ctx'> CONFIG_NO_UCODE_PATCH=y</div><div class='hunk'>@@ -183,7 +190,6 @@ CONFIG_NO_UCODE_PATCH=y</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='del'>-CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> CONFIG_CPM=y</div><div class='ctx'> </div><div class='hunk'>@@ -200,7 +206,7 @@ CONFIG_HZ_100=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=100</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -224,6 +230,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -231,6 +238,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -263,10 +271,6 @@ CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0x80000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xfd000000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -453,7 +457,6 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -555,10 +558,13 @@ CONFIG_GEN_RTC=y</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -570,8 +576,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -601,10 +609,6 @@ CONFIG_DAB=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='hunk'>@@ -673,6 +677,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -683,13 +688,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -728,6 +732,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> # CONFIG_CRC32 is not set</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -752,6 +757,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -767,16 +774,28 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -788,6 +807,6 @@ CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> # CONFIG_CRYPTO is not set</div><div class='del'>-# CONFIG_PPC_CLOCK is not set</div><div class='add'>+CONFIG_PPC_CLOCK=y</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig<br/>index 3688e4bb6fc2..80481f270133 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/pmac32_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/pmac32_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/pmac32_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/pmac32_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc3</div><div class='del'>-# Tue May 20 20:02:24 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Tue Aug 26 13:20:26 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -93,9 +94,8 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='del'>-# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='hunk'>@@ -120,10 +120,16 @@ CONFIG_PROFILING=y</div><div class='ctx'> CONFIG_OPROFILE=y</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -140,6 +146,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> CONFIG_LSF=y</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -159,19 +166,18 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='ctx'> # CONFIG_PPC_CHRP is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='ctx'> CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='ctx'> # CONFIG_EMBEDDED6xx is not set</div><div class='ctx'> CONFIG_PPC_NATIVE=y</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='hunk'>@@ -221,7 +227,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -244,6 +250,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_MIGRATION is not set</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -251,6 +258,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> CONFIG_ARCH_WANTS_FREEZER_CONTROL=y</div><div class='ctx'> CONFIG_PM=y</div><div class='ctx'> CONFIG_PM_DEBUG=y</div><div class='hunk'>@@ -314,10 +322,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -501,7 +505,6 @@ CONFIG_IP_DCCP_TFRC_LIB=m</div><div class='ctx'> # CONFIG_WAN_ROUTER is not set</div><div class='ctx'> # CONFIG_NET_SCHED is not set</div><div class='ctx'> CONFIG_NET_CLS_ROUTE=y</div><div class='del'>-CONFIG_NET_SCH_FIFO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Network testing</div><div class='hunk'>@@ -571,6 +574,7 @@ CONFIG_BT_HIDP=m</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BT_HCIUSB=m</div><div class='ctx'> # CONFIG_BT_HCIUSB_SCO is not set</div><div class='add'>+# CONFIG_BT_HCIBTUSB is not set</div><div class='ctx'> # CONFIG_BT_HCIUART is not set</div><div class='ctx'> CONFIG_BT_HCIBCM203X=m</div><div class='ctx'> # CONFIG_BT_HCIBPA10X is not set</div><div class='hunk'>@@ -588,27 +592,18 @@ CONFIG_BT_HCIBFUSB=m</div><div class='ctx'> CONFIG_CFG80211=m</div><div class='ctx'> CONFIG_NL80211=y</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='ctx'> CONFIG_MAC80211=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Rate control algorithm selection</div><div class='ctx'> #</div><div class='add'>+CONFIG_MAC80211_RC_PID=y</div><div class='ctx'> CONFIG_MAC80211_RC_DEFAULT_PID=y</div><div class='del'>-# CONFIG_MAC80211_RC_DEFAULT_NONE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Selecting 'y' for an algorithm will</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# build the algorithm into mac80211.</div><div class='del'>-#</div><div class='ctx'> CONFIG_MAC80211_RC_DEFAULT="pid"</div><div class='del'>-CONFIG_MAC80211_RC_PID=y</div><div class='ctx'> # CONFIG_MAC80211_MESH is not set</div><div class='ctx'> CONFIG_MAC80211_LEDS=y</div><div class='del'>-# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set</div><div class='del'>-# CONFIG_MAC80211_DEBUG is not set</div><div class='add'>+# CONFIG_MAC80211_DEBUG_MENU is not set</div><div class='ctx'> CONFIG_IEEE80211=m</div><div class='ctx'> # CONFIG_IEEE80211_DEBUG is not set</div><div class='ctx'> CONFIG_IEEE80211_CRYPT_WEP=m</div><div class='hunk'>@@ -628,6 +623,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> # CONFIG_STANDALONE is not set</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -656,12 +653,14 @@ CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='hunk'>@@ -669,6 +668,8 @@ CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_TIMINGS=y</div><div class='add'>+CONFIG_IDE_ATAPI=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='hunk'>@@ -685,7 +686,6 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-# CONFIG_IDE_GENERIC is not set</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_SFF=y</div><div class='ctx'> </div><div class='hunk'>@@ -703,10 +703,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -727,8 +725,6 @@ CONFIG_BLK_DEV_IDE_PMAC=y</div><div class='ctx'> CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_PMAC=y</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -820,6 +816,7 @@ CONFIG_SCSI_MESH_RESET_DELAY_MS=4000</div><div class='ctx'> CONFIG_SCSI_MAC53C94=y</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='ctx'> # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='hunk'>@@ -844,30 +841,22 @@ CONFIG_DM_ZERO=m</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_FIREWIRE is not set</div><div class='del'>-CONFIG_IEEE1394=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Subsystem Options</div><div class='del'>-#</div><div class='del'>-# CONFIG_IEEE1394_VERBOSEDEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Controllers</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='ctx'> #</div><div class='del'>-# CONFIG_IEEE1394_PCILYNX is not set</div><div class='add'>+# CONFIG_FIREWIRE is not set</div><div class='add'>+CONFIG_IEEE1394=m</div><div class='ctx'> CONFIG_IEEE1394_OHCI1394=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Protocols</div><div class='del'>-#</div><div class='del'>-CONFIG_IEEE1394_VIDEO1394=m</div><div class='add'>+# CONFIG_IEEE1394_PCILYNX is not set</div><div class='ctx'> CONFIG_IEEE1394_SBP2=m</div><div class='ctx'> # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set</div><div class='ctx'> # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set</div><div class='ctx'> # CONFIG_IEEE1394_ETH1394 is not set</div><div class='del'>-CONFIG_IEEE1394_DV1394=m</div><div class='ctx'> CONFIG_IEEE1394_RAWIO=m</div><div class='add'>+CONFIG_IEEE1394_VIDEO1394=m</div><div class='add'>+CONFIG_IEEE1394_DV1394=m</div><div class='add'>+# CONFIG_IEEE1394_VERBOSEDEBUG is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> CONFIG_MACINTOSH_DRIVERS=y</div><div class='ctx'> CONFIG_ADB=y</div><div class='hunk'>@@ -887,7 +876,6 @@ CONFIG_THERM_ADT746X=m</div><div class='ctx'> # CONFIG_ANSLCD is not set</div><div class='ctx'> CONFIG_PMAC_RACKMETER=m</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -936,7 +924,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -952,6 +939,7 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -994,13 +982,15 @@ CONFIG_PRISM54=m</div><div class='ctx'> # CONFIG_RTL8180 is not set</div><div class='ctx'> # CONFIG_RTL8187 is not set</div><div class='ctx'> # CONFIG_ADM8211 is not set</div><div class='add'>+# CONFIG_MAC80211_HWSIM is not set</div><div class='ctx'> CONFIG_P54_COMMON=m</div><div class='ctx'> # CONFIG_P54_USB is not set</div><div class='ctx'> # CONFIG_P54_PCI is not set</div><div class='ctx'> # CONFIG_ATH5K is not set</div><div class='add'>+# CONFIG_ATH9K is not set</div><div class='ctx'> # CONFIG_IWLCORE is not set</div><div class='ctx'> # CONFIG_IWLWIFI_LEDS is not set</div><div class='del'>-# CONFIG_IWL4965 is not set</div><div class='add'>+# CONFIG_IWLAGN is not set</div><div class='ctx'> # CONFIG_IWL3945 is not set</div><div class='ctx'> # CONFIG_HOSTAP is not set</div><div class='ctx'> CONFIG_B43=m</div><div class='hunk'>@@ -1095,6 +1085,7 @@ CONFIG_INPUT_MOUSE=y</div><div class='ctx'> # CONFIG_MOUSE_PS2 is not set</div><div class='ctx'> # CONFIG_MOUSE_SERIAL is not set</div><div class='ctx'> # CONFIG_MOUSE_APPLETOUCH is not set</div><div class='add'>+# CONFIG_MOUSE_BCM5974 is not set</div><div class='ctx'> # CONFIG_MOUSE_VSXXXAA is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='ctx'> # CONFIG_INPUT_TABLET is not set</div><div class='hunk'>@@ -1109,12 +1100,14 @@ CONFIG_SERIO=y</div><div class='ctx'> # CONFIG_SERIO_SERPORT is not set</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -1165,45 +1158,70 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=m</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_POWERMAC=y</div><div class='del'>-# CONFIG_I2C_MPC is not set</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_MPC is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -1212,6 +1230,8 @@ CONFIG_I2C_POWERMAC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> CONFIG_POWER_SUPPLY=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY_DEBUG is not set</div><div class='hunk'>@@ -1221,6 +1241,7 @@ CONFIG_APM_POWER=y</div><div class='ctx'> CONFIG_BATTERY_PMU=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1241,8 +1262,10 @@ CONFIG_SSB_DRIVER_PCICORE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -1343,10 +1366,13 @@ CONFIG_FB_3DFX=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='ctx'> # CONFIG_FB_IBM_GXT4500 is not set</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='ctx'> CONFIG_LCD_CLASS_DEVICE=m</div><div class='add'>+# CONFIG_LCD_ILI9320 is not set</div><div class='add'>+# CONFIG_LCD_PLATFORM is not set</div><div class='ctx'> CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='ctx'> # CONFIG_BACKLIGHT_CORGI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1374,15 +1400,7 @@ CONFIG_LOGO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_MONO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_VGA16=y</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=m</div><div class='ctx'> CONFIG_SND_TIMER=m</div><div class='ctx'> CONFIG_SND_PCM=m</div><div class='hunk'>@@ -1400,19 +1418,13 @@ CONFIG_SND_SUPPORT_OLD_API=y</div><div class='ctx'> CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='ctx'> CONFIG_SND_DUMMY=m</div><div class='ctx'> # CONFIG_SND_VIRMIDI is not set</div><div class='ctx'> # CONFIG_SND_MTPAV is not set</div><div class='ctx'> # CONFIG_SND_SERIAL_U16550 is not set</div><div class='ctx'> # CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PCI=y</div><div class='ctx'> # CONFIG_SND_AD1889 is not set</div><div class='ctx'> # CONFIG_SND_ALS300 is not set</div><div class='ctx'> # CONFIG_SND_ALS4000 is not set</div><div class='hunk'>@@ -1474,20 +1486,9 @@ CONFIG_SND_DUMMY=m</div><div class='ctx'> # CONFIG_SND_VIRTUOSO is not set</div><div class='ctx'> # CONFIG_SND_VX222 is not set</div><div class='ctx'> # CONFIG_SND_YMFPCI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerMac devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PPC=y</div><div class='ctx'> CONFIG_SND_POWERMAC=m</div><div class='ctx'> CONFIG_SND_POWERMAC_AUTO_DRC=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerPC devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Apple Onboard Audio driver</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND_AOA=m</div><div class='ctx'> CONFIG_SND_AOA_FABRIC_LAYOUT=m</div><div class='ctx'> CONFIG_SND_AOA_ONYX=m</div><div class='hunk'>@@ -1495,36 +1496,14 @@ CONFIG_SND_AOA_TAS=m</div><div class='ctx'> CONFIG_SND_AOA_TOONIE=m</div><div class='ctx'> CONFIG_SND_AOA_SOUNDBUS=m</div><div class='ctx'> CONFIG_SND_AOA_SOUNDBUS_I2S=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_USB=y</div><div class='ctx'> CONFIG_SND_USB_AUDIO=m</div><div class='ctx'> # CONFIG_SND_USB_USX2Y is not set</div><div class='ctx'> # CONFIG_SND_USB_CAIAQ is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCMCIA devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PCMCIA=y</div><div class='ctx'> # CONFIG_SND_VXPOCKET is not set</div><div class='ctx'> # CONFIG_SND_PDAUDIOCF is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio for the Texas Instruments OMAP</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -1554,6 +1533,7 @@ CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> CONFIG_USB_DYNAMIC_MINORS=y</div><div class='ctx'> # CONFIG_USB_SUSPEND is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1579,6 +1559,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_USB_ACM=m</div><div class='ctx'> CONFIG_USB_PRINTER=m</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -1600,6 +1581,7 @@ CONFIG_USB_STORAGE=m</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> CONFIG_USB_STORAGE_ONETOUCH=y</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1608,7 +1590,6 @@ CONFIG_USB_STORAGE_ONETOUCH=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1617,7 +1598,6 @@ CONFIG_USB_SERIAL=m</div><div class='ctx'> CONFIG_USB_EZUSB=y</div><div class='ctx'> # CONFIG_USB_SERIAL_GENERIC is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_AIRCABLE is not set</div><div class='del'>-# CONFIG_USB_SERIAL_AIRPRIME is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_ARK3116 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_BELKIN is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_CH341 is not set</div><div class='hunk'>@@ -1676,7 +1656,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1693,6 +1672,7 @@ CONFIG_USB_APPLEDISPLAY=m</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='hunk'>@@ -1702,6 +1682,8 @@ CONFIG_LEDS_CLASS=y</div><div class='ctx'> #</div><div class='ctx'> # LED drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_LEDS_PCA9532 is not set</div><div class='add'>+# CONFIG_LEDS_PCA955X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # LED Triggers</div><div class='hunk'>@@ -1789,6 +1771,7 @@ CONFIG_HFSPLUS_FS=m</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1811,7 +1794,6 @@ CONFIG_NFS_ACL_SUPPORT=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='hunk'>@@ -1891,6 +1873,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=y</div><div class='ctx'> CONFIG_CRC16=y</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1921,8 +1904,10 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='del'>-# CONFIG_SCHEDSTATS is not set</div><div class='add'>+CONFIG_SCHEDSTATS=y</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='hunk'>@@ -1933,24 +1918,38 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_DEBUG_MUTEXES is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='ctx'> # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+CONFIG_STACKTRACE=y</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+CONFIG_LATENCYTOP=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='del'>-CONFIG_DEBUGGER=y</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='ctx'> CONFIG_XMON=y</div><div class='ctx'> CONFIG_XMON_DEFAULT=y</div><div class='ctx'> CONFIG_XMON_DISASSEMBLY=y</div><div class='add'>+CONFIG_DEBUGGER=y</div><div class='ctx'> CONFIG_IRQSTACKS=y</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> CONFIG_BOOTX_TEXT=y</div><div class='hunk'>@@ -2009,6 +2008,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=y</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='head'>diff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig<br/>index 9d0140e3838e..6a5b713a07e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ppc40x_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/ppc40x_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ppc40x_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/ppc40x_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25-rc9</div><div class='del'>-# Tue Apr 15 08:46:44 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 12:34:33 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -26,8 +26,12 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_GET_USER_PAGES_FAST is not set</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='hunk'>@@ -84,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -109,14 +114,22 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -127,6 +140,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -146,11 +160,10 @@ CONFIG_PPC4xx_PCI_EXPRESS=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='add'>+CONFIG_XILINX_VIRTEX=y</div><div class='ctx'> CONFIG_EP405=y</div><div class='ctx'> CONFIG_KILAUEA=y</div><div class='ctx'> CONFIG_MAKALU=y</div><div class='hunk'>@@ -158,7 +171,6 @@ CONFIG_WALNUT=y</div><div class='ctx'> CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y</div><div class='ctx'> CONFIG_405GP=y</div><div class='ctx'> CONFIG_405EX=y</div><div class='del'>-CONFIG_XILINX_VIRTEX=y</div><div class='ctx'> CONFIG_XILINX_VIRTEX_II_PRO=y</div><div class='ctx'> CONFIG_XILINX_VIRTEX_4_FX=y</div><div class='ctx'> CONFIG_IBM405_ERR77=y</div><div class='hunk'>@@ -211,7 +223,9 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -219,6 +233,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -229,6 +244,7 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -239,6 +255,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y</div><div class='ctx'> # CONFIG_PCI_DEBUG is not set</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+# CONFIG_HAS_RAPIDIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Advanced setup</div><div class='hunk'>@@ -248,17 +265,13 @@ CONFIG_ARCH_SUPPORTS_MSI=y</div><div class='ctx'> #</div><div class='ctx'> # Default settings for advanced configuration options are used</div><div class='ctx'> #</div><div class='del'>-CONFIG_HIGHMEM_START=0xfe000000</div><div class='ctx'> CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-CONFIG_BOOT_LOAD=0x00400000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -267,6 +280,11 @@ CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> # CONFIG_PACKET_MMAP is not set</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> # CONFIG_IP_MULTICAST is not set</div><div class='hunk'>@@ -284,7 +302,7 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_ESP is not set</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_TUNNEL=m</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='hunk'>@@ -295,9 +313,25 @@ CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='del'>-# CONFIG_IPV6 is not set</div><div class='add'>+CONFIG_IPV6=m</div><div class='add'>+# CONFIG_IPV6_PRIVACY is not set</div><div class='add'>+# CONFIG_IPV6_ROUTER_PREF is not set</div><div class='add'>+# CONFIG_IPV6_OPTIMISTIC_DAD is not set</div><div class='add'>+# CONFIG_INET6_AH is not set</div><div class='add'>+# CONFIG_INET6_ESP is not set</div><div class='add'>+# CONFIG_INET6_IPCOMP is not set</div><div class='add'>+# CONFIG_IPV6_MIP6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_BEET=m</div><div class='add'>+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set</div><div class='add'>+CONFIG_IPV6_SIT=m</div><div class='add'>+CONFIG_IPV6_NDISC_NODETYPE=y</div><div class='add'>+# CONFIG_IPV6_TUNNEL is not set</div><div class='add'>+# CONFIG_IPV6_MULTIPLE_TABLES is not set</div><div class='add'>+# CONFIG_IPV6_MROUTE is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -347,6 +381,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -359,6 +395,7 @@ CONFIG_MTD_PARTITIONS=y</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='ctx'> CONFIG_MTD_CMDLINE_PARTS=y</div><div class='ctx'> CONFIG_MTD_OF_PARTS=y</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # User Modules And Translation Layers</div><div class='hunk'>@@ -429,8 +466,17 @@ CONFIG_MTD_PHYSMAP_OF=y</div><div class='ctx'> #</div><div class='ctx'> # UBI - Unsorted block images</div><div class='ctx'> #</div><div class='del'>-# CONFIG_MTD_UBI is not set</div><div class='add'>+CONFIG_MTD_UBI=m</div><div class='add'>+CONFIG_MTD_UBI_WL_THRESHOLD=4096</div><div class='add'>+CONFIG_MTD_UBI_BEB_RESERVE=1</div><div class='add'>+CONFIG_MTD_UBI_GLUEBI=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI debugging options</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI_DEBUG is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_I2C=m</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='hunk'>@@ -449,12 +495,14 @@ CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> # CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -472,12 +520,15 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -512,7 +563,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -522,12 +572,12 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -540,6 +590,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_MLX4_CORE is not set</div><div class='ctx'> # CONFIG_TEHUTI is not set</div><div class='ctx'> # CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -547,6 +598,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='hunk'>@@ -573,6 +625,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -611,13 +664,76 @@ CONFIG_XILINX_HWICAP=m</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='del'>-# CONFIG_I2C is not set</div><div class='add'>+CONFIG_I2C=m</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# SPI support</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALI1535 is not set</div><div class='add'>+# CONFIG_I2C_ALI1563 is not set</div><div class='add'>+# CONFIG_I2C_ALI15X3 is not set</div><div class='add'>+# CONFIG_I2C_AMD756 is not set</div><div class='add'>+# CONFIG_I2C_AMD8111 is not set</div><div class='add'>+# CONFIG_I2C_I801 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='add'>+# CONFIG_I2C_PIIX4 is not set</div><div class='add'>+# CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_SIS5595 is not set</div><div class='add'>+# CONFIG_I2C_SIS630 is not set</div><div class='add'>+# CONFIG_I2C_SIS96X is not set</div><div class='add'>+# CONFIG_I2C_VIA is not set</div><div class='add'>+# CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='ctx'> #</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_IBM_IIC=m</div><div class='add'>+# CONFIG_I2C_MPC is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='hunk'>@@ -633,13 +749,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -656,16 +783,14 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -674,14 +799,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_EDAC is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> # CONFIG_DMADEVICES is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -690,13 +812,18 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_EXT2_FS_XATTR is not set</div><div class='ctx'> # CONFIG_EXT2_FS_XIP is not set</div><div class='del'>-# CONFIG_EXT3_FS is not set</div><div class='add'>+CONFIG_EXT3_FS=m</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='ctx'> # CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=m</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_REISERFS_FS is not set</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='hunk'>@@ -715,8 +842,11 @@ CONFIG_INOTIFY_USER=y</div><div class='ctx'> #</div><div class='ctx'> # DOS/FAT/NT Filesystems</div><div class='ctx'> #</div><div class='add'>+CONFIG_FAT_FS=m</div><div class='ctx'> # CONFIG_MSDOS_FS is not set</div><div class='del'>-# CONFIG_VFAT_FS is not set</div><div class='add'>+CONFIG_VFAT_FS=m</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='ctx'> # CONFIG_NTFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -741,10 +871,27 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_BEFS_FS is not set</div><div class='ctx'> # CONFIG_BFS_FS is not set</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='del'>-# CONFIG_JFFS2_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=m</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+# CONFIG_JFFS2_LZO is not set</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+CONFIG_UBIFS_FS=m</div><div class='add'>+# CONFIG_UBIFS_FS_XATTR is not set</div><div class='add'>+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set</div><div class='add'>+CONFIG_UBIFS_FS_LZO=y</div><div class='add'>+CONFIG_UBIFS_FS_ZLIB=y</div><div class='add'>+# CONFIG_UBIFS_FS_DEBUG is not set</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -755,14 +902,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -776,20 +921,64 @@ CONFIG_SUNRPC=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARTITION_ADVANCED is not set</div><div class='ctx'> CONFIG_MSDOS_PARTITION=y</div><div class='del'>-# CONFIG_NLS is not set</div><div class='add'>+CONFIG_NLS=m</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=m</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+CONFIG_NLS_ISO8859_1=m</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='del'>-# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC16=m</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=m</div><div class='add'>+CONFIG_LZO_COMPRESS=m</div><div class='add'>+CONFIG_LZO_DECOMPRESS=m</div><div class='ctx'> CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='hunk'>@@ -802,6 +991,7 @@ CONFIG_HAVE_LMB=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='hunk'>@@ -809,9 +999,12 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='hunk'>@@ -824,17 +1017,30 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -846,51 +1052,85 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='del'>-# CONFIG_CRYPTO_SEQIV is not set</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=y</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=y</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=y</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CTR is not set</div><div class='del'>-# CONFIG_CRYPTO_GCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='ctx'> # CONFIG_CRYPTO_SALSA20 is not set</div><div class='del'>-# CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='del'>-# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_DEFLATE=m</div><div class='add'>+CONFIG_CRYPTO_LZO=m</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig<br/>index f9d279bb700b..c7825dcbf415 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ppc44x_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/ppc44x_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ppc44x_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/ppc44x_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc8</div><div class='del'>-# Wed Jul  9 13:50:48 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Tue Aug  5 10:01:31 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -30,9 +30,11 @@ CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_TIME_VSYSCALL=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+# CONFIG_HAVE_GET_USER_PAGES_FAST is not set</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -116,10 +118,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -136,6 +144,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -155,8 +164,6 @@ CONFIG_PPC4xx_PCI_EXPRESS=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='hunk'>@@ -231,6 +238,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -248,6 +256,7 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_4xx_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -275,10 +284,6 @@ CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -287,6 +292,11 @@ CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> # CONFIG_PACKET_MMAP is not set</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> # CONFIG_IP_MULTICAST is not set</div><div class='hunk'>@@ -304,7 +314,7 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_ESP is not set</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_TUNNEL=m</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='hunk'>@@ -315,7 +325,25 @@ CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='del'>-# CONFIG_IPV6 is not set</div><div class='add'>+CONFIG_IPV6=m</div><div class='add'>+# CONFIG_IPV6_PRIVACY is not set</div><div class='add'>+# CONFIG_IPV6_ROUTER_PREF is not set</div><div class='add'>+# CONFIG_IPV6_OPTIMISTIC_DAD is not set</div><div class='add'>+# CONFIG_INET6_AH is not set</div><div class='add'>+# CONFIG_INET6_ESP is not set</div><div class='add'>+# CONFIG_INET6_IPCOMP is not set</div><div class='add'>+# CONFIG_IPV6_MIP6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_BEET=m</div><div class='add'>+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set</div><div class='add'>+CONFIG_IPV6_SIT=m</div><div class='add'>+CONFIG_IPV6_NDISC_NODETYPE=y</div><div class='add'>+# CONFIG_IPV6_TUNNEL is not set</div><div class='add'>+# CONFIG_IPV6_MULTIPLE_TABLES is not set</div><div class='add'>+# CONFIG_IPV6_MROUTE is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -365,6 +393,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -447,8 +477,17 @@ CONFIG_MTD_PHYSMAP_OF=y</div><div class='ctx'> #</div><div class='ctx'> # UBI - Unsorted block images</div><div class='ctx'> #</div><div class='del'>-# CONFIG_MTD_UBI is not set</div><div class='add'>+CONFIG_MTD_UBI=m</div><div class='add'>+CONFIG_MTD_UBI_WL_THRESHOLD=4096</div><div class='add'>+CONFIG_MTD_UBI_BEB_RESERVE=1</div><div class='add'>+CONFIG_MTD_UBI_GLUEBI=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI debugging options</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI_DEBUG is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_I2C=m</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='hunk'>@@ -460,6 +499,7 @@ CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_LOOP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_NBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SX8 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='hunk'>@@ -467,12 +507,14 @@ CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> # CONFIG_XILINX_SYSACE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -480,9 +522,41 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> # SCSI device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_RAID_ATTRS is not set</div><div class='del'>-# CONFIG_SCSI is not set</div><div class='del'>-# CONFIG_SCSI_DMA is not set</div><div class='add'>+CONFIG_SCSI=m</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+# CONFIG_SCSI_TGT is not set</div><div class='ctx'> # CONFIG_SCSI_NETLINK is not set</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=m</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+# CONFIG_CHR_DEV_SG is not set</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+# CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_LOWLEVEL is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='hunk'>@@ -499,7 +573,6 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -534,7 +607,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -549,6 +621,7 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -570,11 +643,21 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='ctx'> # CONFIG_IWLWIFI_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NET_FC is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='ctx'> # CONFIG_NET_POLL_CONTROLLER is not set</div><div class='hunk'>@@ -635,8 +718,77 @@ CONFIG_XILINX_HWICAP=m</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='del'>-# CONFIG_I2C is not set</div><div class='add'>+CONFIG_I2C=m</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALI1535 is not set</div><div class='add'>+# CONFIG_I2C_ALI1563 is not set</div><div class='add'>+# CONFIG_I2C_ALI15X3 is not set</div><div class='add'>+# CONFIG_I2C_AMD756 is not set</div><div class='add'>+# CONFIG_I2C_AMD8111 is not set</div><div class='add'>+# CONFIG_I2C_I801 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='add'>+# CONFIG_I2C_PIIX4 is not set</div><div class='add'>+# CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_SIS5595 is not set</div><div class='add'>+# CONFIG_I2C_SIS630 is not set</div><div class='add'>+# CONFIG_I2C_SIS96X is not set</div><div class='add'>+# CONFIG_I2C_VIA is not set</div><div class='add'>+# CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_IBM_IIC=m</div><div class='add'>+# CONFIG_I2C_MPC is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_SENSORS_TSL2550 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='hunk'>@@ -653,6 +805,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -686,22 +839,113 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='del'>-# CONFIG_USB is not set</div><div class='add'>+CONFIG_USB=m</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_DEVICEFS is not set</div><div class='add'>+CONFIG_USB_DEVICE_CLASS=y</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='add'>+CONFIG_USB_EHCI_HCD=m</div><div class='add'>+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='add'>+# CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='add'>+CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y</div><div class='add'>+CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y</div><div class='add'>+CONFIG_USB_EHCI_HCD_PPC_OF=y</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=m</div><div class='add'>+CONFIG_USB_OHCI_HCD_PPC_OF=y</div><div class='add'>+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y</div><div class='add'>+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set</div><div class='add'>+# CONFIG_USB_OHCI_HCD_PCI is not set</div><div class='add'>+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y</div><div class='add'>+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_UHCI_HCD is not set</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=m</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ISD200 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+# CONFIG_USB_MON is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_SISUSBVGA is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='hunk'>@@ -719,8 +963,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_EXT2_FS_XATTR is not set</div><div class='ctx'> # CONFIG_EXT2_FS_XIP is not set</div><div class='del'>-# CONFIG_EXT3_FS is not set</div><div class='add'>+CONFIG_EXT3_FS=m</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='ctx'> # CONFIG_EXT4DEV_FS is not set</div><div class='add'>+CONFIG_JBD=m</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_REISERFS_FS is not set</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='hunk'>@@ -743,8 +992,11 @@ CONFIG_INOTIFY_USER=y</div><div class='ctx'> #</div><div class='ctx'> # DOS/FAT/NT Filesystems</div><div class='ctx'> #</div><div class='add'>+CONFIG_FAT_FS=m</div><div class='ctx'> # CONFIG_MSDOS_FS is not set</div><div class='del'>-# CONFIG_VFAT_FS is not set</div><div class='add'>+CONFIG_VFAT_FS=m</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='ctx'> # CONFIG_NTFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -780,9 +1032,16 @@ CONFIG_JFFS2_ZLIB=y</div><div class='ctx'> # CONFIG_JFFS2_LZO is not set</div><div class='ctx'> CONFIG_JFFS2_RTIME=y</div><div class='ctx'> # CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+CONFIG_UBIFS_FS=m</div><div class='add'>+CONFIG_UBIFS_FS_XATTR=y</div><div class='add'>+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set</div><div class='add'>+CONFIG_UBIFS_FS_LZO=y</div><div class='add'>+CONFIG_UBIFS_FS_ZLIB=y</div><div class='add'>+# CONFIG_UBIFS_FS_DEBUG is not set</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -793,13 +1052,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -813,7 +1071,46 @@ CONFIG_SUNRPC=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARTITION_ADVANCED is not set</div><div class='ctx'> CONFIG_MSDOS_PARTITION=y</div><div class='del'>-# CONFIG_NLS is not set</div><div class='add'>+CONFIG_NLS=m</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=m</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+CONFIG_NLS_ISO8859_1=m</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -822,13 +1119,16 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='del'>-# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC16=m</div><div class='add'>+CONFIG_CRC_T10DIF=m</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_LZO_COMPRESS=m</div><div class='add'>+CONFIG_LZO_DECOMPRESS=m</div><div class='ctx'> CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='hunk'>@@ -849,6 +1149,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -866,19 +1168,28 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='ctx'> # CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='ctx'> # CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -934,6 +1245,10 @@ CONFIG_CRYPTO_PCBC=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -962,8 +1277,8 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> #</div><div class='ctx'> # Compression</div><div class='ctx'> #</div><div class='del'>-# CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+CONFIG_CRYPTO_DEFLATE=m</div><div class='add'>+CONFIG_CRYPTO_LZO=m</div><div class='ctx'> # CONFIG_CRYPTO_HW is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig<br/>index ce250bc98584..fc5930caeb5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ppc64_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/ppc64_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ppc64_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/ppc64_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc6</div><div class='del'>-# Mon Jun 16 21:11:19 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Tue Aug 26 13:22:03 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC64=y</div><div class='ctx'> </div><div class='hunk'>@@ -14,6 +14,7 @@ CONFIG_POWER4=y</div><div class='ctx'> # CONFIG_TUNE_CELL is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> CONFIG_ALTIVEC=y</div><div class='add'>+CONFIG_VSX=y</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_MM_SLICES=y</div><div class='ctx'> CONFIG_VIRT_CPU_ACCOUNTING=y</div><div class='hunk'>@@ -31,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_HAVE_SETUP_PER_CPU_AREA=y</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='hunk'>@@ -105,7 +107,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -129,14 +130,20 @@ CONFIG_SLUB_DEBUG=y</div><div class='ctx'> CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='ctx'> CONFIG_PROFILING=y</div><div class='del'>-# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_MARKERS=y</div><div class='ctx'> CONFIG_OPROFILE=y</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='del'>-# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+CONFIG_HAVE_DMA_ATTRS=y</div><div class='add'>+CONFIG_USE_GENERIC_SMP_HELPERS=y</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -152,6 +159,7 @@ CONFIG_STOP_MACHINE=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> CONFIG_BLK_DEV_IO_TRACE=y</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> CONFIG_BLOCK_COMPAT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -172,14 +180,13 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='ctx'> CONFIG_PPC_PSERIES=y</div><div class='ctx'> CONFIG_PPC_SPLPAR=y</div><div class='ctx'> CONFIG_EEH=y</div><div class='ctx'> CONFIG_SCANLOG=m</div><div class='ctx'> CONFIG_LPARCFG=y</div><div class='add'>+CONFIG_PPC_SMLPAR=y</div><div class='add'>+CONFIG_CMM=y</div><div class='ctx'> CONFIG_PPC_ISERIES=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -189,8 +196,6 @@ CONFIG_VIODASD=y</div><div class='ctx'> CONFIG_VIOCD=m</div><div class='ctx'> CONFIG_VIOTAPE=m</div><div class='ctx'> CONFIG_VIOPATH=y</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> CONFIG_PPC_PMAC=y</div><div class='ctx'> CONFIG_PPC_PMAC64=y</div><div class='ctx'> CONFIG_PPC_MAPLE=y</div><div class='hunk'>@@ -213,11 +218,15 @@ CONFIG_PPC_CELLEB=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SPU_FS=m</div><div class='ctx'> CONFIG_SPU_FS_64K_LS=y</div><div class='add'>+# CONFIG_SPU_TRACE is not set</div><div class='ctx'> CONFIG_SPU_BASE=y</div><div class='ctx'> CONFIG_CBE_RAS=y</div><div class='add'>+CONFIG_PPC_IBM_CELL_RESETBUTTON=y</div><div class='add'>+CONFIG_PPC_IBM_CELL_POWERBUTTON=m</div><div class='ctx'> CONFIG_CBE_THERM=m</div><div class='ctx'> CONFIG_CBE_CPUFREQ=m</div><div class='ctx'> CONFIG_CBE_CPUFREQ_PMI=m</div><div class='add'>+CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m</div><div class='ctx'> CONFIG_OPROFILE_CELL=y</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='ctx'> CONFIG_PPC_NATIVE=y</div><div class='hunk'>@@ -279,7 +288,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -315,8 +324,10 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y</div><div class='ctx'> CONFIG_SPARSEMEM_VMEMMAP=y</div><div class='ctx'> CONFIG_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_MEMORY_HOTPLUG_SPARSE=y</div><div class='add'>+CONFIG_MEMORY_HOTREMOVE=y</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -327,6 +338,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13</div><div class='ctx'> # CONFIG_SCHED_SMT is not set</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> CONFIG_ARCH_WANTS_FREEZER_CONTROL=y</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='hunk'>@@ -370,10 +382,6 @@ CONFIG_HOTPLUG_PCI_RPA_DLPAR=m</div><div class='ctx'> CONFIG_PAGE_OFFSET=0xc000000000000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc000000000000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -387,6 +395,7 @@ CONFIG_XFRM_USER=m</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> # CONFIG_XFRM_MIGRATE is not set</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=m</div><div class='ctx'> # CONFIG_NET_KEY_MIGRATE is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -578,6 +587,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -603,12 +614,14 @@ CONFIG_BLK_DEV_RAM_SIZE=65536</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='hunk'>@@ -616,6 +629,7 @@ CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_TIMINGS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='hunk'>@@ -649,10 +663,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> CONFIG_BLK_DEV_AMD74XX=y</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -674,8 +686,6 @@ CONFIG_BLK_DEV_IDE_PMAC=y</div><div class='ctx'> CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_PMAC=y</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -737,6 +747,8 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_GDTH is not set</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='ctx'> CONFIG_SCSI_IBMVSCSI=y</div><div class='add'>+CONFIG_SCSI_IBMVFC=m</div><div class='add'>+CONFIG_SCSI_IBMVFC_TRACE=y</div><div class='ctx'> # CONFIG_SCSI_INITIO is not set</div><div class='ctx'> # CONFIG_SCSI_INIA100 is not set</div><div class='ctx'> # CONFIG_SCSI_MVSAS is not set</div><div class='hunk'>@@ -758,6 +770,7 @@ CONFIG_SCSI_LPFC=m</div><div class='ctx'> CONFIG_SCSI_DEBUG=m</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='ctx'> # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> CONFIG_ATA_NONSTANDARD=y</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='hunk'>@@ -837,9 +850,6 @@ CONFIG_DM_SNAPSHOT=m</div><div class='ctx'> CONFIG_DM_MIRROR=m</div><div class='ctx'> CONFIG_DM_ZERO=m</div><div class='ctx'> CONFIG_DM_MULTIPATH=m</div><div class='del'>-CONFIG_DM_MULTIPATH_EMC=m</div><div class='del'>-# CONFIG_DM_MULTIPATH_RDAC is not set</div><div class='del'>-# CONFIG_DM_MULTIPATH_HP is not set</div><div class='ctx'> # CONFIG_DM_DELAY is not set</div><div class='ctx'> # CONFIG_DM_UEVENT is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='hunk'>@@ -847,29 +857,21 @@ CONFIG_DM_MULTIPATH_EMC=m</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_FIREWIRE is not set</div><div class='del'>-CONFIG_IEEE1394=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Subsystem Options</div><div class='del'>-#</div><div class='del'>-# CONFIG_IEEE1394_VERBOSEDEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Controllers</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='ctx'> #</div><div class='del'>-# CONFIG_IEEE1394_PCILYNX is not set</div><div class='add'>+# CONFIG_FIREWIRE is not set</div><div class='add'>+CONFIG_IEEE1394=y</div><div class='ctx'> CONFIG_IEEE1394_OHCI1394=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Protocols</div><div class='del'>-#</div><div class='del'>-CONFIG_IEEE1394_VIDEO1394=m</div><div class='add'>+# CONFIG_IEEE1394_PCILYNX is not set</div><div class='ctx'> CONFIG_IEEE1394_SBP2=m</div><div class='ctx'> CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y</div><div class='ctx'> CONFIG_IEEE1394_ETH1394=m</div><div class='del'>-CONFIG_IEEE1394_DV1394=m</div><div class='ctx'> CONFIG_IEEE1394_RAWIO=y</div><div class='add'>+CONFIG_IEEE1394_VIDEO1394=m</div><div class='add'>+CONFIG_IEEE1394_DV1394=m</div><div class='add'>+# CONFIG_IEEE1394_VERBOSEDEBUG is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> CONFIG_MACINTOSH_DRIVERS=y</div><div class='ctx'> CONFIG_ADB_PMU=y</div><div class='hunk'>@@ -884,7 +886,6 @@ CONFIG_WINDFARM_PM112=y</div><div class='ctx'> CONFIG_WINDFARM_PM121=y</div><div class='ctx'> # CONFIG_PMAC_RACKMETER is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> CONFIG_BONDING=m</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -942,6 +943,7 @@ CONFIG_E100=y</div><div class='ctx'> # CONFIG_SIS900 is not set</div><div class='ctx'> # CONFIG_EPIC100 is not set</div><div class='ctx'> # CONFIG_SUNDANCE is not set</div><div class='add'>+# CONFIG_TLAN is not set</div><div class='ctx'> # CONFIG_VIA_RHINE is not set</div><div class='ctx'> # CONFIG_SC92031 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='hunk'>@@ -949,10 +951,8 @@ CONFIG_ACENIC=y</div><div class='ctx'> CONFIG_ACENIC_OMIT_TIGON_I=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> CONFIG_E1000=y</div><div class='del'>-# CONFIG_E1000_NAPI is not set</div><div class='ctx'> # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -968,13 +968,13 @@ CONFIG_TIGON3=y</div><div class='ctx'> CONFIG_SPIDER_NET=m</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='ctx'> CONFIG_EHEA=m</div><div class='ctx'> # CONFIG_IXGBE is not set</div><div class='ctx'> CONFIG_IXGB=m</div><div class='del'>-# CONFIG_IXGB_NAPI is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='ctx'> # CONFIG_MYRI10GE is not set</div><div class='ctx'> # CONFIG_NETXEN_NIC is not set</div><div class='hunk'>@@ -1068,6 +1068,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y</div><div class='ctx'> # CONFIG_MOUSE_PS2_TOUCHKIT is not set</div><div class='ctx'> # CONFIG_MOUSE_SERIAL is not set</div><div class='ctx'> # CONFIG_MOUSE_APPLETOUCH is not set</div><div class='add'>+# CONFIG_MOUSE_BCM5974 is not set</div><div class='ctx'> # CONFIG_MOUSE_VSXXXAA is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='ctx'> # CONFIG_INPUT_TABLET is not set</div><div class='hunk'>@@ -1090,12 +1091,14 @@ CONFIG_SERIO_I8042=y</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -1131,11 +1134,13 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> CONFIG_HVC_DRIVER=y</div><div class='add'>+CONFIG_HVC_IRQ=y</div><div class='ctx'> CONFIG_HVC_CONSOLE=y</div><div class='ctx'> CONFIG_HVC_ISERIES=y</div><div class='ctx'> CONFIG_HVC_RTAS=y</div><div class='ctx'> CONFIG_HVC_BEAT=y</div><div class='ctx'> CONFIG_HVCS=m</div><div class='add'>+CONFIG_IBM_BSR=m</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='hunk'>@@ -1156,45 +1161,70 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> CONFIG_I2C_AMD8111=y</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_POWERMAC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-CONFIG_I2C_PASEMI=y</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+CONFIG_I2C_PASEMI=y</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -1203,10 +1233,13 @@ CONFIG_I2C_PASEMI=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1218,8 +1251,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -1299,10 +1334,13 @@ CONFIG_FB_RADEON_BACKLIGHT=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='ctx'> CONFIG_FB_IBM_GXT4500=y</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='ctx'> CONFIG_LCD_CLASS_DEVICE=y</div><div class='add'>+# CONFIG_LCD_ILI9320 is not set</div><div class='add'>+# CONFIG_LCD_PLATFORM is not set</div><div class='ctx'> CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='ctx'> # CONFIG_BACKLIGHT_CORGI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1331,15 +1369,7 @@ CONFIG_FB_LOGO_EXTRA=y</div><div class='ctx'> CONFIG_LOGO_LINUX_MONO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_VGA16=y</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=m</div><div class='ctx'> CONFIG_SND_TIMER=m</div><div class='ctx'> CONFIG_SND_PCM=m</div><div class='hunk'>@@ -1355,19 +1385,13 @@ CONFIG_SND_SUPPORT_OLD_API=y</div><div class='ctx'> CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='ctx'> # CONFIG_SND_DUMMY is not set</div><div class='ctx'> # CONFIG_SND_VIRMIDI is not set</div><div class='ctx'> # CONFIG_SND_MTPAV is not set</div><div class='ctx'> # CONFIG_SND_SERIAL_U16550 is not set</div><div class='ctx'> # CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PCI=y</div><div class='ctx'> # CONFIG_SND_AD1889 is not set</div><div class='ctx'> # CONFIG_SND_ALS300 is not set</div><div class='ctx'> # CONFIG_SND_ALS4000 is not set</div><div class='hunk'>@@ -1429,20 +1453,9 @@ CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VIRTUOSO is not set</div><div class='ctx'> # CONFIG_SND_VX222 is not set</div><div class='ctx'> # CONFIG_SND_YMFPCI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerMac devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PPC=y</div><div class='ctx'> CONFIG_SND_POWERMAC=m</div><div class='ctx'> CONFIG_SND_POWERMAC_AUTO_DRC=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA PowerPC devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Apple Onboard Audio driver</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND_AOA=m</div><div class='ctx'> CONFIG_SND_AOA_FABRIC_LAYOUT=m</div><div class='ctx'> CONFIG_SND_AOA_ONYX=m</div><div class='hunk'>@@ -1450,36 +1463,14 @@ CONFIG_SND_AOA_TAS=m</div><div class='ctx'> CONFIG_SND_AOA_TOONIE=m</div><div class='ctx'> CONFIG_SND_AOA_SOUNDBUS=m</div><div class='ctx'> CONFIG_SND_AOA_SOUNDBUS_I2S=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_USB=y</div><div class='ctx'> # CONFIG_SND_USB_AUDIO is not set</div><div class='ctx'> # CONFIG_SND_USB_USX2Y is not set</div><div class='ctx'> # CONFIG_SND_USB_CAIAQ is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCMCIA devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PCMCIA=y</div><div class='ctx'> # CONFIG_SND_VXPOCKET is not set</div><div class='ctx'> # CONFIG_SND_PDAUDIOCF is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio for the Texas Instruments OMAP</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -1508,6 +1499,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+# CONFIG_USB_MON is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1556,6 +1548,7 @@ CONFIG_USB_STORAGE=m</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1564,7 +1557,6 @@ CONFIG_USB_STORAGE=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-# CONFIG_USB_MON is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1577,7 +1569,6 @@ CONFIG_USB_STORAGE=m</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1769,6 +1760,7 @@ CONFIG_HFSPLUS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1779,12 +1771,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> CONFIG_NFS_V3_ACL=y</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=m</div><div class='ctx'> CONFIG_NFSD_V2_ACL=y</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> CONFIG_NFSD_V3_ACL=y</div><div class='ctx'> CONFIG_NFSD_V4=y</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=m</div><div class='hunk'>@@ -1793,7 +1785,6 @@ CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='ctx'> CONFIG_SUNRPC_XPRT_RDMA=m</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> CONFIG_RPCSEC_GSS_SPKM3=m</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1878,6 +1869,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1910,8 +1902,10 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='del'>-# CONFIG_SCHEDSTATS is not set</div><div class='add'>+CONFIG_SCHEDSTATS=y</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='hunk'>@@ -1923,28 +1917,47 @@ CONFIG_DEBUG_MUTEXES=y</div><div class='ctx'> # CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='ctx'> # CONFIG_PROVE_LOCKING is not set</div><div class='ctx'> # CONFIG_LOCK_STAT is not set</div><div class='add'>+CONFIG_TRACE_IRQFLAGS=y</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='ctx'> # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+CONFIG_STACKTRACE=y</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+CONFIG_LATENCYTOP=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+CONFIG_TRACER_MAX_TRACE=y</div><div class='add'>+CONFIG_TRACING=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+CONFIG_IRQSOFF_TRACER=y</div><div class='add'>+CONFIG_SCHED_TRACER=y</div><div class='add'>+CONFIG_CONTEXT_SWITCH_TRACER=y</div><div class='add'>+# CONFIG_FTRACE_STARTUP_TEST is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> CONFIG_DEBUG_STACKOVERFLOW=y</div><div class='ctx'> CONFIG_DEBUG_STACK_USAGE=y</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='ctx'> # CONFIG_HCALL_STATS is not set</div><div class='del'>-CONFIG_DEBUGGER=y</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='ctx'> CONFIG_XMON=y</div><div class='ctx'> # CONFIG_XMON_DEFAULT is not set</div><div class='ctx'> CONFIG_XMON_DISASSEMBLY=y</div><div class='add'>+CONFIG_DEBUGGER=y</div><div class='ctx'> CONFIG_IRQSTACKS=y</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> CONFIG_BOOTX_TEXT=y</div><div class='hunk'>@@ -2007,6 +2020,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='head'>diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig<br/>index e6e91c85da31..3c6dbdef56eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ppc6xx_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/ppc6xx_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ppc6xx_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/ppc6xx_defconfig</a></div><div class='hunk'>@@ -1,8 +1,7 @@</div><div class='del'>-# powerpc</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-git2</div><div class='del'>-# Tue Jul 15 23:54:18 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Tue Aug 26 13:29:50 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -112,7 +111,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -140,12 +138,17 @@ CONFIG_MARKERS=y</div><div class='ctx'> CONFIG_OPROFILE=m</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> CONFIG_KPROBES=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='ctx'> CONFIG_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='ctx'> # CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -266,7 +269,6 @@ CONFIG_TAU=y</div><div class='ctx'> CONFIG_TAU_AVERAGE=y</div><div class='ctx'> CONFIG_QUICC_ENGINE=y</div><div class='ctx'> CONFIG_CPM2=y</div><div class='del'>-CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='ctx'> CONFIG_FSL_ULI1575=y</div><div class='ctx'> CONFIG_CPM=y</div><div class='ctx'> CONFIG_PPC_BESTCOMM=y</div><div class='hunk'>@@ -287,7 +289,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> CONFIG_HZ_1000=y</div><div class='ctx'> CONFIG_HZ=1000</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> # CONFIG_PREEMPT_NONE is not set</div><div class='ctx'> CONFIG_PREEMPT_VOLUNTARY=y</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -311,6 +313,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_MIGRATION is not set</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -326,6 +329,7 @@ CONFIG_PM_DEBUG=y</div><div class='ctx'> CONFIG_CAN_PM_TRACE=y</div><div class='ctx'> CONFIG_PM_SLEEP=y</div><div class='ctx'> CONFIG_SUSPEND=y</div><div class='add'>+# CONFIG_PM_TEST_SUSPEND is not set</div><div class='ctx'> CONFIG_SUSPEND_FREEZER=y</div><div class='ctx'> CONFIG_HIBERNATION=y</div><div class='ctx'> CONFIG_PM_STD_PARTITION=""</div><div class='hunk'>@@ -344,6 +348,7 @@ CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='ctx'> CONFIG_FSL_LBC=y</div><div class='ctx'> CONFIG_FSL_GTM=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -395,10 +400,6 @@ CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> # CONFIG_TASK_SIZE_BOOL is not set</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -412,6 +413,7 @@ CONFIG_XFRM_USER=y</div><div class='ctx'> CONFIG_XFRM_SUB_POLICY=y</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> CONFIG_XFRM_STATISTICS=y</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=m</div><div class='ctx'> CONFIG_NET_KEY_MIGRATE=y</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -602,6 +604,7 @@ CONFIG_IP_NF_TARGET_ECN=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_TTL=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_CLUSTERIP=m</div><div class='ctx'> CONFIG_IP_NF_RAW=m</div><div class='add'>+CONFIG_IP_NF_SECURITY=m</div><div class='ctx'> CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='hunk'>@@ -626,6 +629,7 @@ CONFIG_IP6_NF_TARGET_REJECT=m</div><div class='ctx'> CONFIG_IP6_NF_MANGLE=m</div><div class='ctx'> CONFIG_IP6_NF_TARGET_HL=m</div><div class='ctx'> CONFIG_IP6_NF_RAW=m</div><div class='add'>+CONFIG_IP6_NF_SECURITY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # DECnet: Netfilter Configuration</div><div class='hunk'>@@ -643,6 +647,7 @@ CONFIG_BRIDGE_EBT_802_3=m</div><div class='ctx'> CONFIG_BRIDGE_EBT_AMONG=m</div><div class='ctx'> CONFIG_BRIDGE_EBT_ARP=m</div><div class='ctx'> CONFIG_BRIDGE_EBT_IP=m</div><div class='add'>+CONFIG_BRIDGE_EBT_IP6=m</div><div class='ctx'> CONFIG_BRIDGE_EBT_LIMIT=m</div><div class='ctx'> CONFIG_BRIDGE_EBT_MARK=m</div><div class='ctx'> CONFIG_BRIDGE_EBT_PKTTYPE=m</div><div class='hunk'>@@ -691,8 +696,10 @@ CONFIG_ATM_LANE=m</div><div class='ctx'> # CONFIG_ATM_MPOA is not set</div><div class='ctx'> CONFIG_ATM_BR2684=m</div><div class='ctx'> # CONFIG_ATM_BR2684_IPFILTER is not set</div><div class='add'>+CONFIG_STP=m</div><div class='ctx'> CONFIG_BRIDGE=m</div><div class='ctx'> CONFIG_VLAN_8021Q=m</div><div class='add'>+# CONFIG_VLAN_8021Q_GVRP is not set</div><div class='ctx'> CONFIG_DECNET=m</div><div class='ctx'> CONFIG_DECNET_ROUTER=y</div><div class='ctx'> CONFIG_LLC=m</div><div class='hunk'>@@ -832,6 +839,7 @@ CONFIG_BT_HIDP=m</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BT_HCIUSB=m</div><div class='ctx'> CONFIG_BT_HCIUSB_SCO=y</div><div class='add'>+# CONFIG_BT_HCIBTUSB is not set</div><div class='ctx'> CONFIG_BT_HCIUART=m</div><div class='ctx'> CONFIG_BT_HCIUART_H4=y</div><div class='ctx'> CONFIG_BT_HCIUART_BCSP=y</div><div class='hunk'>@@ -855,7 +863,6 @@ CONFIG_NL80211=y</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='ctx'> CONFIG_MAC80211=m</div><div class='del'>-CONFIG_MAC80211_QOS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Rate control algorithm selection</div><div class='hunk'>@@ -941,12 +948,14 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> CONFIG_VIRTIO_BLK=m</div><div class='add'>+CONFIG_BLK_DEV_HD=y</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> CONFIG_EEPROM_93CX6=m</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> CONFIG_ENCLOSURE_SERVICES=m</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='hunk'>@@ -954,6 +963,7 @@ CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_TIMINGS=y</div><div class='ctx'> CONFIG_IDE_ATAPI=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='hunk'>@@ -971,7 +981,6 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-# CONFIG_IDE_GENERIC is not set</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDEPNP is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_SFF=y</div><div class='hunk'>@@ -990,10 +999,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -1014,8 +1021,6 @@ CONFIG_BLK_DEV_IDE_PMAC=y</div><div class='ctx'> CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_PMAC=y</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-CONFIG_BLK_DEV_HD_ONLY=y</div><div class='del'>-CONFIG_BLK_DEV_HD=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -1125,6 +1130,7 @@ CONFIG_SCSI_DH=y</div><div class='ctx'> CONFIG_SCSI_DH_RDAC=m</div><div class='ctx'> CONFIG_SCSI_DH_HP_SW=m</div><div class='ctx'> CONFIG_SCSI_DH_EMC=m</div><div class='add'>+# CONFIG_SCSI_DH_ALUA is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_SATA_PMP is not set</div><div class='hunk'>@@ -1246,7 +1252,6 @@ CONFIG_WINDFARM=y</div><div class='ctx'> # CONFIG_ANSLCD is not set</div><div class='ctx'> CONFIG_PMAC_RACKMETER=m</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-CONFIG_NETDEVICES_MULTIQUEUE=y</div><div class='ctx'> CONFIG_IFB=m</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> CONFIG_BONDING=m</div><div class='hunk'>@@ -1256,7 +1261,7 @@ CONFIG_TUN=m</div><div class='ctx'> CONFIG_VETH=m</div><div class='ctx'> CONFIG_NET_SB1000=m</div><div class='ctx'> # CONFIG_ARCNET is not set</div><div class='del'>-CONFIG_PHYLIB=m</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MII PHY device drivers</div><div class='hunk'>@@ -1271,7 +1276,9 @@ CONFIG_SMSC_PHY=m</div><div class='ctx'> CONFIG_BROADCOM_PHY=m</div><div class='ctx'> CONFIG_ICPLUS_PHY=m</div><div class='ctx'> CONFIG_REALTEK_PHY=m</div><div class='add'>+# CONFIG_FIXED_PHY is not set</div><div class='ctx'> CONFIG_MDIO_BITBANG=y</div><div class='add'>+# CONFIG_MDIO_OF_GPIO is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=m</div><div class='ctx'> CONFIG_MACE=m</div><div class='hunk'>@@ -1328,9 +1335,7 @@ CONFIG_NE2000=m</div><div class='ctx'> CONFIG_NET_PCI=y</div><div class='ctx'> CONFIG_PCNET32=m</div><div class='ctx'> CONFIG_AMD8111_ETH=m</div><div class='del'>-CONFIG_AMD8111E_NAPI=y</div><div class='ctx'> CONFIG_ADAPTEC_STARFIRE=m</div><div class='del'>-CONFIG_ADAPTEC_STARFIRE_NAPI=y</div><div class='ctx'> # CONFIG_AC3200 is not set</div><div class='ctx'> # CONFIG_APRICOT is not set</div><div class='ctx'> CONFIG_B44=m</div><div class='hunk'>@@ -1359,7 +1364,6 @@ CONFIG_SUNDANCE=m</div><div class='ctx'> CONFIG_TLAN=m</div><div class='ctx'> CONFIG_VIA_RHINE=m</div><div class='ctx'> CONFIG_VIA_RHINE_MMIO=y</div><div class='del'>-CONFIG_VIA_RHINE_NAPI=y</div><div class='ctx'> CONFIG_SC92031=m</div><div class='ctx'> CONFIG_NET_POCKET=y</div><div class='ctx'> CONFIG_DE600=m</div><div class='hunk'>@@ -1372,17 +1376,15 @@ CONFIG_ACENIC=m</div><div class='ctx'> # CONFIG_ACENIC_OMIT_TIGON_I is not set</div><div class='ctx'> CONFIG_DL2K=m</div><div class='ctx'> CONFIG_E1000=m</div><div class='del'>-CONFIG_E1000_NAPI=y</div><div class='ctx'> # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set</div><div class='ctx'> CONFIG_E1000E=m</div><div class='del'>-CONFIG_E1000E_ENABLED=y</div><div class='ctx'> CONFIG_IP1000=m</div><div class='ctx'> CONFIG_IGB=m</div><div class='add'>+CONFIG_IGB_LRO=y</div><div class='ctx'> CONFIG_NS83820=m</div><div class='ctx'> CONFIG_HAMACHI=m</div><div class='ctx'> CONFIG_YELLOWFIN=m</div><div class='ctx'> CONFIG_R8169=m</div><div class='del'>-CONFIG_R8169_NAPI=y</div><div class='ctx'> CONFIG_R8169_VLAN=y</div><div class='ctx'> CONFIG_SIS190=m</div><div class='ctx'> CONFIG_SKGE=m</div><div class='hunk'>@@ -1393,21 +1395,18 @@ CONFIG_VIA_VELOCITY=m</div><div class='ctx'> CONFIG_TIGON3=m</div><div class='ctx'> CONFIG_BNX2=m</div><div class='ctx'> CONFIG_GIANFAR=m</div><div class='del'>-CONFIG_GFAR_NAPI=y</div><div class='ctx'> # CONFIG_UCC_GETH is not set</div><div class='ctx'> CONFIG_MV643XX_ETH=m</div><div class='ctx'> CONFIG_QLA3XXX=m</div><div class='ctx'> CONFIG_ATL1=m</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> CONFIG_CHELSIO_T1=m</div><div class='ctx'> CONFIG_CHELSIO_T1_1G=y</div><div class='del'>-CONFIG_CHELSIO_T1_NAPI=y</div><div class='ctx'> CONFIG_CHELSIO_T3=m</div><div class='ctx'> CONFIG_IXGBE=m</div><div class='ctx'> CONFIG_IXGB=m</div><div class='del'>-CONFIG_IXGB_NAPI=y</div><div class='ctx'> CONFIG_S2IO=m</div><div class='del'>-CONFIG_S2IO_NAPI=y</div><div class='ctx'> CONFIG_MYRI10GE=m</div><div class='ctx'> CONFIG_NETXEN_NIC=m</div><div class='ctx'> CONFIG_NIU=m</div><div class='hunk'>@@ -1477,8 +1476,7 @@ CONFIG_ATM_IDT77252_USE_SUNI=y</div><div class='ctx'> # CONFIG_ATM_AMBASSADOR is not set</div><div class='ctx'> # CONFIG_ATM_HORIZON is not set</div><div class='ctx'> # CONFIG_ATM_IA is not set</div><div class='del'>-CONFIG_ATM_FORE200E_MAYBE=m</div><div class='del'>-# CONFIG_ATM_FORE200E_PCA is not set</div><div class='add'>+# CONFIG_ATM_FORE200E is not set</div><div class='ctx'> CONFIG_ATM_HE=m</div><div class='ctx'> # CONFIG_ATM_HE_USE_SUNI is not set</div><div class='ctx'> CONFIG_FDDI=y</div><div class='hunk'>@@ -1551,6 +1549,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y</div><div class='ctx'> # CONFIG_MOUSE_PS2_TOUCHKIT is not set</div><div class='ctx'> CONFIG_MOUSE_SERIAL=m</div><div class='ctx'> CONFIG_MOUSE_APPLETOUCH=m</div><div class='add'>+# CONFIG_MOUSE_BCM5974 is not set</div><div class='ctx'> # CONFIG_MOUSE_INPORT is not set</div><div class='ctx'> # CONFIG_MOUSE_LOGIBM is not set</div><div class='ctx'> # CONFIG_MOUSE_PC110PAD is not set</div><div class='hunk'>@@ -1611,33 +1610,18 @@ CONFIG_SERIO_SERPORT=y</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> CONFIG_SERIO_RAW=m</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> CONFIG_GAMEPORT=m</div><div class='ctx'> CONFIG_GAMEPORT_NS558=m</div><div class='ctx'> CONFIG_GAMEPORT_L4=m</div><div class='ctx'> CONFIG_GAMEPORT_EMU10K1=m</div><div class='ctx'> CONFIG_GAMEPORT_FM801=m</div><div class='del'>-CONFIG_INPUT_LIRC=y</div><div class='del'>-CONFIG_LIRC_DEV=m</div><div class='del'>-CONFIG_LIRC_ATIUSB=m</div><div class='del'>-CONFIG_LIRC_BT829=m</div><div class='del'>-CONFIG_LIRC_CMDIR=m</div><div class='del'>-CONFIG_LIRC_I2C=m</div><div class='del'>-CONFIG_LIRC_IGORPLUGUSB=m</div><div class='del'>-CONFIG_LIRC_IMON=m</div><div class='del'>-CONFIG_LIRC_IT87=m</div><div class='del'>-CONFIG_LIRC_MCEUSB=m</div><div class='del'>-CONFIG_LIRC_MCEUSB2=m</div><div class='del'>-CONFIG_LIRC_PVR150=m</div><div class='del'>-CONFIG_LIRC_PARALLEL=m</div><div class='del'>-CONFIG_LIRC_SERIAL=m</div><div class='del'>-CONFIG_LIRC_SIR=m</div><div class='del'>-CONFIG_LIRC_STREAMZAP=m</div><div class='del'>-CONFIG_LIRC_TTUSBIR=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -1701,12 +1685,12 @@ CONFIG_SERIAL_OF_PLATFORM=y</div><div class='ctx'> # CONFIG_SERIAL_QE is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_CRASH is not set</div><div class='ctx'> CONFIG_BRIQ_PANEL=m</div><div class='ctx'> CONFIG_PRINTER=m</div><div class='ctx'> CONFIG_LP_CONSOLE=y</div><div class='ctx'> CONFIG_PPDEV=m</div><div class='ctx'> # CONFIG_HVC_RTAS is not set</div><div class='add'>+# CONFIG_VIRTIO_CONSOLE is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='ctx'> CONFIG_HW_RANDOM_VIRTIO=m</div><div class='hunk'>@@ -1728,6 +1712,7 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=m</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> CONFIG_I2C_ALGOPCA=m</div><div class='ctx'> </div><div class='hunk'>@@ -1807,20 +1792,24 @@ CONFIG_SENSORS_TSL2550=m</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-CONFIG_HAVE_GPIO_LIB=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# GPIO Support</div><div class='del'>-#</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='ctx'> # CONFIG_DEBUG_GPIO is not set</div><div class='add'>+CONFIG_GPIO_SYSFS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C GPIO expanders:</div><div class='ctx'> #</div><div class='add'>+# CONFIG_GPIO_MAX732X is not set</div><div class='ctx'> # CONFIG_GPIO_PCA953X is not set</div><div class='ctx'> # CONFIG_GPIO_PCF857X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # SPI GPIO expanders:</div><div class='ctx'> #</div><div class='ctx'> CONFIG_W1=m</div><div class='hunk'>@@ -1850,6 +1839,7 @@ CONFIG_APM_POWER=m</div><div class='ctx'> CONFIG_BATTERY_PMU=m</div><div class='ctx'> CONFIG_HWMON=m</div><div class='ctx'> CONFIG_HWMON_VID=m</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> CONFIG_SENSORS_AD7418=m</div><div class='ctx'> CONFIG_SENSORS_ADM1021=m</div><div class='ctx'> CONFIG_SENSORS_ADM1025=m</div><div class='hunk'>@@ -1913,8 +1903,9 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SOFT_WATCHDOG=m</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='ctx'> # CONFIG_MPC5200_WDT is not set</div><div class='del'>-CONFIG_83xx_WDT=m</div><div class='add'>+# CONFIG_8xxx_WDT is not set</div><div class='ctx'> CONFIG_WATCHDOG_RTAS=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1953,8 +1944,10 @@ CONFIG_SSB_DRIVER_PCICORE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> CONFIG_MFD_SM501=m</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -1993,6 +1986,7 @@ CONFIG_MEDIA_TUNER_QT1010=m</div><div class='ctx'> CONFIG_MEDIA_TUNER_XC2028=m</div><div class='ctx'> CONFIG_MEDIA_TUNER_XC5000=m</div><div class='ctx'> CONFIG_MEDIA_TUNER_MXL5005S=m</div><div class='add'>+CONFIG_MEDIA_TUNER_MXL5007T=m</div><div class='ctx'> CONFIG_VIDEO_V4L2=m</div><div class='ctx'> CONFIG_VIDEO_V4L1=m</div><div class='ctx'> CONFIG_VIDEOBUF_GEN=m</div><div class='hunk'>@@ -2000,13 +1994,13 @@ CONFIG_VIDEOBUF_DMA_SG=m</div><div class='ctx'> CONFIG_VIDEOBUF_VMALLOC=m</div><div class='ctx'> CONFIG_VIDEOBUF_DVB=m</div><div class='ctx'> CONFIG_VIDEO_BTCX=m</div><div class='del'>-CONFIG_VIDEO_IR_I2C=m</div><div class='ctx'> CONFIG_VIDEO_IR=m</div><div class='ctx'> CONFIG_VIDEO_TVEEPROM=m</div><div class='ctx'> CONFIG_VIDEO_TUNER=m</div><div class='ctx'> CONFIG_VIDEO_CAPTURE_DRIVERS=y</div><div class='ctx'> # CONFIG_VIDEO_ADV_DEBUG is not set</div><div class='ctx'> # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set</div><div class='add'>+CONFIG_VIDEO_IR_I2C=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Encoders/decoders and other helper chips</div><div class='hunk'>@@ -2108,6 +2102,8 @@ CONFIG_VIDEO_CX18=m</div><div class='ctx'> # CONFIG_VIDEO_CAFE_CCIC is not set</div><div class='ctx'> CONFIG_V4L_USB_DRIVERS=y</div><div class='ctx'> CONFIG_USB_VIDEO_CLASS=m</div><div class='add'>+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y</div><div class='add'>+CONFIG_USB_GSPCA=m</div><div class='ctx'> CONFIG_VIDEO_PVRUSB2=m</div><div class='ctx'> CONFIG_VIDEO_PVRUSB2_SYSFS=y</div><div class='ctx'> CONFIG_VIDEO_PVRUSB2_DVB=y</div><div class='hunk'>@@ -2133,11 +2129,14 @@ CONFIG_USB_PWC=m</div><div class='ctx'> # CONFIG_USB_PWC_DEBUG is not set</div><div class='ctx'> CONFIG_USB_ZR364XX=m</div><div class='ctx'> CONFIG_USB_STKWEBCAM=m</div><div class='add'>+# CONFIG_USB_S2255 is not set</div><div class='ctx'> CONFIG_SOC_CAMERA=m</div><div class='ctx'> CONFIG_SOC_CAMERA_MT9M001=m</div><div class='ctx'> # CONFIG_MT9M001_PCA9536_SWITCH is not set</div><div class='ctx'> CONFIG_SOC_CAMERA_MT9V022=m</div><div class='ctx'> # CONFIG_MT9V022_PCA9536_SWITCH is not set</div><div class='add'>+# CONFIG_SOC_CAMERA_PLATFORM is not set</div><div class='add'>+# CONFIG_VIDEO_SH_MOBILE_CEU is not set</div><div class='ctx'> CONFIG_RADIO_ADAPTERS=y</div><div class='ctx'> # CONFIG_RADIO_CADET is not set</div><div class='ctx'> # CONFIG_RADIO_RTRACK is not set</div><div class='hunk'>@@ -2194,6 +2193,8 @@ CONFIG_DVB_USB_DTT200U=m</div><div class='ctx'> CONFIG_DVB_USB_OPERA1=m</div><div class='ctx'> CONFIG_DVB_USB_AF9005=m</div><div class='ctx'> CONFIG_DVB_USB_AF9005_REMOTE=m</div><div class='add'>+# CONFIG_DVB_USB_DW2102 is not set</div><div class='add'>+# CONFIG_DVB_USB_ANYSEE is not set</div><div class='ctx'> CONFIG_DVB_TTUSB_BUDGET=m</div><div class='ctx'> CONFIG_DVB_TTUSB_DEC=m</div><div class='ctx'> CONFIG_DVB_CINERGYT2=m</div><div class='hunk'>@@ -2203,6 +2204,7 @@ CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512</div><div class='ctx'> CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250</div><div class='ctx'> CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y</div><div class='ctx'> CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100</div><div class='add'>+# CONFIG_DVB_SIANO_SMS1XXX is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Supported FlexCopII (B2C2) Adapters</div><div class='hunk'>@@ -2253,6 +2255,7 @@ CONFIG_DVB_SP8870=m</div><div class='ctx'> CONFIG_DVB_SP887X=m</div><div class='ctx'> CONFIG_DVB_CX22700=m</div><div class='ctx'> CONFIG_DVB_CX22702=m</div><div class='add'>+# CONFIG_DVB_DRX397XD is not set</div><div class='ctx'> CONFIG_DVB_L64781=m</div><div class='ctx'> CONFIG_DVB_TDA1004X=m</div><div class='ctx'> CONFIG_DVB_NXT6000=m</div><div class='hunk'>@@ -2389,12 +2392,15 @@ CONFIG_FB_TRIDENT=m</div><div class='ctx'> CONFIG_FB_TRIDENT_ACCEL=y</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='ctx'> # CONFIG_FB_FSL_DIU is not set</div><div class='ctx'> CONFIG_FB_SM501=m</div><div class='ctx'> CONFIG_FB_IBM_GXT4500=y</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='ctx'> CONFIG_LCD_CLASS_DEVICE=m</div><div class='add'>+# CONFIG_LCD_ILI9320 is not set</div><div class='add'>+CONFIG_LCD_PLATFORM=m</div><div class='ctx'> CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='ctx'> # CONFIG_BACKLIGHT_CORGI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -2613,6 +2619,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> CONFIG_USB_SUSPEND=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -2640,6 +2647,7 @@ CONFIG_USB_U132_HCD=m</div><div class='ctx'> CONFIG_USB_SL811_HCD=m</div><div class='ctx'> # CONFIG_USB_SL811_CS is not set</div><div class='ctx'> # CONFIG_USB_R8A66597_HCD is not set</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Device Class drivers</div><div class='hunk'>@@ -2668,6 +2676,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y</div><div class='ctx'> CONFIG_USB_STORAGE_ALAUDA=y</div><div class='ctx'> CONFIG_USB_STORAGE_ONETOUCH=y</div><div class='ctx'> CONFIG_USB_STORAGE_KARMA=y</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> CONFIG_USB_STORAGE_CYPRESS_ATACB=y</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -2676,7 +2685,6 @@ CONFIG_USB_STORAGE_CYPRESS_ATACB=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_USB_MDC800=m</div><div class='ctx'> CONFIG_USB_MICROTEK=m</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -2686,7 +2694,6 @@ CONFIG_USB_SERIAL=m</div><div class='ctx'> CONFIG_USB_EZUSB=y</div><div class='ctx'> CONFIG_USB_SERIAL_GENERIC=y</div><div class='ctx'> CONFIG_USB_SERIAL_AIRCABLE=m</div><div class='del'>-CONFIG_USB_SERIAL_AIRPRIME=m</div><div class='ctx'> CONFIG_USB_SERIAL_ARK3116=m</div><div class='ctx'> CONFIG_USB_SERIAL_BELKIN=m</div><div class='ctx'> CONFIG_USB_SERIAL_CH341=m</div><div class='hunk'>@@ -2734,7 +2741,6 @@ CONFIG_USB_SERIAL_DEBUG=m</div><div class='ctx'> CONFIG_USB_EMI62=m</div><div class='ctx'> CONFIG_USB_EMI26=m</div><div class='ctx'> CONFIG_USB_ADUTUX=m</div><div class='del'>-CONFIG_USB_AUERSWALD=m</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> CONFIG_USB_LEGOTOWER=m</div><div class='ctx'> CONFIG_USB_LCD=m</div><div class='hunk'>@@ -2770,7 +2776,9 @@ CONFIG_LEDS_CLASS=y</div><div class='ctx'> #</div><div class='ctx'> # LED drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_LEDS_PCA9532 is not set</div><div class='ctx'> # CONFIG_LEDS_GPIO is not set</div><div class='add'>+# CONFIG_LEDS_PCA955X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # LED Triggers</div><div class='hunk'>@@ -2853,6 +2861,7 @@ CONFIG_KS0108_PORT=0x378</div><div class='ctx'> CONFIG_KS0108_DELAY=2</div><div class='ctx'> CONFIG_UIO=m</div><div class='ctx'> CONFIG_UIO_CIF=m</div><div class='add'>+CONFIG_UIO_PDRV=m</div><div class='ctx'> CONFIG_UIO_SMX=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -2899,6 +2908,7 @@ CONFIG_GFS2_FS_LOCKING_DLM=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS_O2CB=m</div><div class='ctx'> CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m</div><div class='add'>+CONFIG_OCFS2_FS_STATS=y</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -2959,11 +2969,9 @@ CONFIG_BEFS_FS=m</div><div class='ctx'> CONFIG_BFS_FS=m</div><div class='ctx'> CONFIG_EFS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='del'>-CONFIG_SQUASHFS=m</div><div class='del'>-# CONFIG_SQUASHFS_EMBEDDED is not set</div><div class='del'>-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3</div><div class='ctx'> CONFIG_VXFS_FS=m</div><div class='ctx'> CONFIG_MINIX_FS=m</div><div class='add'>+CONFIG_OMFS_FS=m</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> CONFIG_QNX4FS_FS=m</div><div class='ctx'> CONFIG_ROMFS_FS=m</div><div class='hunk'>@@ -2988,7 +2996,6 @@ CONFIG_NFS_ACL_SUPPORT=m</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=m</div><div class='ctx'> CONFIG_SUNRPC_GSS=m</div><div class='del'>-CONFIG_SUNRPC_BIND34=y</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=m</div><div class='ctx'> CONFIG_RPCSEC_GSS_SPKM3=m</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -3011,7 +3018,6 @@ CONFIG_NCPFS_SMALLDOS=y</div><div class='ctx'> CONFIG_NCPFS_NLS=y</div><div class='ctx'> CONFIG_NCPFS_EXTRAS=y</div><div class='ctx'> CONFIG_CODA_FS=m</div><div class='del'>-# CONFIG_CODA_FS_OLD_API is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='ctx'> CONFIG_9P_FS=m</div><div class='ctx'> </div><div class='hunk'>@@ -3087,7 +3093,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> CONFIG_CRC16=m</div><div class='del'>-CONFIG_CRC_T10DIF=m</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -3120,6 +3126,8 @@ CONFIG_HEADERS_CHECK=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_DEBUG_SHIRQ=y</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> CONFIG_SCHEDSTATS=y</div><div class='ctx'> CONFIG_TIMER_STATS=y</div><div class='hunk'>@@ -3143,6 +3151,7 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> CONFIG_DEBUG_VM=y</div><div class='ctx'> CONFIG_DEBUG_WRITECOUNT=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> CONFIG_DEBUG_LIST=y</div><div class='ctx'> CONFIG_DEBUG_SG=y</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='hunk'>@@ -3158,6 +3167,7 @@ CONFIG_FAIL_MAKE_REQUEST=y</div><div class='ctx'> CONFIG_FAULT_INJECTION_DEBUG_FS=y</div><div class='ctx'> CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y</div><div class='ctx'> CONFIG_LATENCYTOP=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_HAVE_FTRACE=y</div><div class='ctx'> CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='ctx'> CONFIG_TRACER_MAX_TRACE=y</div><div class='hunk'>@@ -3168,16 +3178,18 @@ CONFIG_CONTEXT_SWITCH_TRACER=y</div><div class='ctx'> CONFIG_DYNAMIC_FTRACE=y</div><div class='ctx'> # CONFIG_FTRACE_STARTUP_TEST is not set</div><div class='ctx'> # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set</div><div class='add'>+# CONFIG_BUILD_DOCSRC is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> CONFIG_DEBUG_STACKOVERFLOW=y</div><div class='ctx'> CONFIG_DEBUG_STACK_USAGE=y</div><div class='del'>-CONFIG_DEBUGGER=y</div><div class='ctx'> # CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='ctx'> # CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='del'>-# CONFIG_KGDB_CONSOLE is not set</div><div class='ctx'> CONFIG_XMON=y</div><div class='ctx'> # CONFIG_XMON_DEFAULT is not set</div><div class='ctx'> CONFIG_XMON_DISASSEMBLY=y</div><div class='add'>+CONFIG_DEBUGGER=y</div><div class='ctx'> CONFIG_IRQSTACKS=y</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='head'>diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig<br/>index bc3bf62ddc2f..b390b7476649 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/pq2fads_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/pq2fads_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/pq2fads_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/pq2fads_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:18 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:13 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +15,7 @@ CONFIG_6xx=y</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_STD_MMU_32=y</div><div class='ctx'> # CONFIG_PPC_MM_SLICES is not set</div><div class='hunk'>@@ -31,12 +32,14 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='ctx'> # CONFIG_ARCH_NO_VIRT_TO_BUS is not set</div><div class='ctx'> CONFIG_PPC=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='hunk'>@@ -45,11 +48,13 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_ARCH_MAY_HAVE_PC_FDC=y</div><div class='ctx'> CONFIG_PPC_OF=y</div><div class='ctx'> CONFIG_OF=y</div><div class='del'>-# CONFIG_PPC_UDBG_16550 is not set</div><div class='add'>+CONFIG_PPC_UDBG_16550=y</div><div class='ctx'> # CONFIG_GENERIC_TBSYNC is not set</div><div class='ctx'> CONFIG_AUDIT_ARCH=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+CONFIG_HIBERNATE_32=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='ctx'> # CONFIG_PPC_DCR_NATIVE is not set</div><div class='ctx'> # CONFIG_PPC_DCR_MMIO is not set</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='hunk'>@@ -82,7 +87,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -90,6 +94,7 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -107,10 +112,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -120,6 +131,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -138,33 +150,43 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-CONFIG_PPC_82xx=y</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+CONFIG_PPC_82xx=y</div><div class='ctx'> # CONFIG_MPC8272_ADS is not set</div><div class='ctx'> CONFIG_PQ2FADS=y</div><div class='ctx'> # CONFIG_EP8248E is not set</div><div class='ctx'> CONFIG_PQ2ADS=y</div><div class='ctx'> CONFIG_8260=y</div><div class='ctx'> CONFIG_PQ2_ADS_PCI_PIC=y</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='del'>-# CONFIG_MPIC is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> CONFIG_CPM2=y</div><div class='del'>-CONFIG_PPC_CPM_NEW_BINDING=y</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> CONFIG_CPM=y</div><div class='ctx'> </div><div class='hunk'>@@ -181,7 +203,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -199,6 +221,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -206,6 +229,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -213,9 +237,11 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -243,10 +269,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -447,9 +469,11 @@ CONFIG_MTD_PHYSMAP_OF=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_UBI is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='add'>+CONFIG_OF_GPIO=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_DA is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='hunk'>@@ -461,14 +485,15 @@ CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> # CONFIG_BLK_DEV_RAM is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='del'>-CONFIG_IDE_MAX_HWIFS=4</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -486,7 +511,6 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-# CONFIG_IDE_GENERIC is not set</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -498,9 +522,7 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -517,9 +539,8 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> # CONFIG_BLK_DEV_TRM290 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_VIA82CXXX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TC86C001 is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDE_PMAC is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDEDMA is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -537,13 +558,12 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# An alternative FireWire stack is available with EXPERIMENTAL=y</div><div class='add'>+# A new alternative FireWire stack is available with EXPERIMENTAL=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='hunk'>@@ -567,8 +587,11 @@ CONFIG_DAVICOM_PHY=y</div><div class='ctx'> # CONFIG_REALTEK_PHY is not set</div><div class='ctx'> # CONFIG_FIXED_PHY is not set</div><div class='ctx'> CONFIG_MDIO_BITBANG=y</div><div class='add'>+# CONFIG_MDIO_OF_GPIO is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_MACE is not set</div><div class='add'>+# CONFIG_BMAC is not set</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='ctx'> # CONFIG_SUNGEM is not set</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='hunk'>@@ -590,7 +613,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='ctx'> # CONFIG_HAMACHI is not set</div><div class='hunk'>@@ -602,6 +624,7 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_GIANFAR is not set</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='hunk'>@@ -667,6 +690,7 @@ CONFIG_KEYBOARD_ATKBD=y</div><div class='ctx'> # CONFIG_KEYBOARD_XTKBD is not set</div><div class='ctx'> # CONFIG_KEYBOARD_NEWTON is not set</div><div class='ctx'> # CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+# CONFIG_KEYBOARD_GPIO is not set</div><div class='ctx'> CONFIG_INPUT_MOUSE=y</div><div class='ctx'> CONFIG_MOUSE_PS2=y</div><div class='ctx'> CONFIG_MOUSE_PS2_ALPS=y</div><div class='hunk'>@@ -677,7 +701,9 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y</div><div class='ctx'> # CONFIG_MOUSE_PS2_TOUCHKIT is not set</div><div class='ctx'> # CONFIG_MOUSE_SERIAL is not set</div><div class='ctx'> # CONFIG_MOUSE_APPLETOUCH is not set</div><div class='add'>+# CONFIG_MOUSE_BCM5974 is not set</div><div class='ctx'> # CONFIG_MOUSE_VSXXXAA is not set</div><div class='add'>+# CONFIG_MOUSE_GPIO is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='ctx'> # CONFIG_INPUT_TABLET is not set</div><div class='ctx'> # CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='hunk'>@@ -692,6 +718,7 @@ CONFIG_SERIO_SERPORT=y</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -712,6 +739,7 @@ CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='ctx'> CONFIG_SERIAL_CPM=y</div><div class='ctx'> CONFIG_SERIAL_CPM_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_CPM_SCC1=y</div><div class='hunk'>@@ -724,6 +752,8 @@ CONFIG_SERIAL_CPM_SCC4=y</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='hunk'>@@ -734,10 +764,28 @@ CONFIG_HW_RANDOM=y</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+CONFIG_ARCH_REQUIRE_GPIOLIB=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+# CONFIG_DEBUG_GPIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C GPIO expanders:</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI GPIO expanders:</div><div class='add'>+#</div><div class='add'>+# CONFIG_GPIO_BT8XX is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI GPIO expanders:</div><div class='add'>+#</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -749,8 +797,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -782,10 +832,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_HID_SUPPORT is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='hunk'>@@ -795,6 +841,8 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='add'>+# CONFIG_USB_GADGET_MUSB_HDRC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -807,7 +855,7 @@ CONFIG_USB_GADGET_SELECTED=y</div><div class='ctx'> # CONFIG_USB_GADGET_ATMEL_USBA is not set</div><div class='ctx'> # CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='ctx'> # CONFIG_USB_GADGET_NET2280 is not set</div><div class='del'>-# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA25X is not set</div><div class='ctx'> CONFIG_USB_GADGET_M66592=y</div><div class='ctx'> CONFIG_USB_M66592=y</div><div class='ctx'> # CONFIG_USB_GADGET_PXA27X is not set</div><div class='hunk'>@@ -826,6 +874,7 @@ CONFIG_USB_ETH_RNDIS=y</div><div class='ctx'> # CONFIG_USB_G_SERIAL is not set</div><div class='ctx'> # CONFIG_USB_MIDI_GADGET is not set</div><div class='ctx'> # CONFIG_USB_G_PRINTER is not set</div><div class='add'>+# CONFIG_USB_CDC_COMPOSITE is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='hunk'>@@ -893,6 +942,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -902,8 +952,8 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> CONFIG_NFS_V3_ACL=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_ACL_SUPPORT=y</div><div class='hunk'>@@ -983,6 +1033,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=y</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1009,6 +1060,8 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> # CONFIG_SCHED_DEBUG is not set</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1026,19 +1079,31 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='del'>-# CONFIG_KGDB_CONSOLE is not set</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> CONFIG_BDI_SWITCH=y</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1046,6 +1111,7 @@ CONFIG_BDI_SWITCH=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_KEYS is not set</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1086,6 +1152,10 @@ CONFIG_CRYPTO_PCBC=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1117,6 +1187,7 @@ CONFIG_CRYPTO_DES=y</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='del'>-# CONFIG_PPC_CLOCK is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='add'>+CONFIG_PPC_CLOCK=y</div><div class='ctx'> CONFIG_PPC_LIB_RHEAP=y</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig<br/>index c6b83577c055..01b54eac1ff6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/prpmc2800_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/prpmc2800_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/prpmc2800_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/prpmc2800_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:18 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:14 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -34,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -94,7 +95,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='hunk'>@@ -118,10 +118,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -132,6 +138,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -151,25 +158,25 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='ctx'> # CONFIG_PPC_CHRP is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='ctx'> # CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='ctx'> CONFIG_EMBEDDED6xx=y</div><div class='ctx'> # CONFIG_LINKSTATION is not set</div><div class='ctx'> # CONFIG_STORCENTER is not set</div><div class='ctx'> # CONFIG_MPC7448HPC2 is not set</div><div class='ctx'> # CONFIG_PPC_HOLLY is not set</div><div class='ctx'> CONFIG_PPC_PRPMC2800=y</div><div class='add'>+# CONFIG_PPC_C2K is not set</div><div class='ctx'> CONFIG_MV64X60=y</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='ctx'> # CONFIG_MPIC is not set</div><div class='hunk'>@@ -198,7 +205,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -221,6 +228,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -228,6 +236,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -264,10 +273,6 @@ CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='ctx'> CONFIG_CONSISTENT_START=0xff100000</div><div class='ctx'> CONFIG_CONSISTENT_SIZE=0x00200000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -359,7 +364,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-# CONFIG_FW_LOADER is not set</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='ctx'> CONFIG_MTD=y</div><div class='hunk'>@@ -461,12 +468,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='hunk'>@@ -487,7 +496,6 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_SFF=y</div><div class='ctx'> </div><div class='hunk'>@@ -505,10 +513,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -526,8 +532,6 @@ CONFIG_BLK_DEV_PDC202XX_NEW=y</div><div class='ctx'> # CONFIG_BLK_DEV_VIA82CXXX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TC86C001 is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -603,6 +607,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='hunk'>@@ -669,6 +674,10 @@ CONFIG_SATA_MV=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='hunk'>@@ -676,7 +685,6 @@ CONFIG_MACINTOSH_DRIVERS=y</div><div class='ctx'> # CONFIG_MAC_EMUMOUSEBTN is not set</div><div class='ctx'> # CONFIG_WINDFARM is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -741,10 +749,8 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_ACENIC is not set</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> CONFIG_E1000=y</div><div class='del'>-# CONFIG_E1000_NAPI is not set</div><div class='ctx'> # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -760,6 +766,7 @@ CONFIG_E1000=y</div><div class='ctx'> CONFIG_MV643XX_ETH=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -840,6 +847,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -875,43 +883,64 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-# CONFIG_I2C_MPC is not set</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_MPC is not set</div><div class='add'>+CONFIG_I2C_MV64XXX=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='del'>-CONFIG_I2C_MV64XXX=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -920,10 +949,13 @@ CONFIG_I2C_MV64XXX=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -977,6 +1009,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -988,8 +1021,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -1028,10 +1063,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> CONFIG_VGA_CONSOLE=y</div><div class='ctx'> # CONFIG_VGACON_SOFT_SCROLLBACK is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -1060,6 +1091,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> # CONFIG_USB_DEVICE_CLASS is not set</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1102,7 +1134,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1115,7 +1146,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1169,6 +1199,7 @@ CONFIG_RTC_DRV_MAX6900=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -1258,6 +1289,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1267,12 +1299,11 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> # CONFIG_NFS_V3 is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1312,6 +1343,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1337,7 +1369,16 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='hunk'>@@ -1390,6 +1431,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='head'>diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig<br/>index f9a3d3b394cf..b6eee7c93cdd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ps3_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/ps3_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ps3_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/ps3_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26</div><div class='del'>-# Wed Jul 16 13:59:24 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc3</div><div class='add'>+# Wed Aug 20 08:16:53 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC64=y</div><div class='ctx'> </div><div class='hunk'>@@ -92,7 +92,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -118,11 +117,16 @@ CONFIG_PROFILING=y</div><div class='ctx'> CONFIG_OPROFILE=m</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> CONFIG_HAVE_DMA_ATTRS=y</div><div class='ctx'> CONFIG_USE_GENERIC_SMP_HELPERS=y</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -179,6 +183,7 @@ CONFIG_PS3_STORAGE=y</div><div class='ctx'> CONFIG_PS3_DISK=y</div><div class='ctx'> CONFIG_PS3_ROM=y</div><div class='ctx'> CONFIG_PS3_FLASH=y</div><div class='add'>+CONFIG_OPROFILE_PS3=y</div><div class='ctx'> CONFIG_PS3_LPM=m</div><div class='ctx'> CONFIG_PPC_CELL=y</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='hunk'>@@ -218,7 +223,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -252,8 +257,10 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP is not set</div><div class='ctx'> CONFIG_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_MEMORY_HOTPLUG_SPARSE=y</div><div class='add'>+# CONFIG_MEMORY_HOTREMOVE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -276,19 +283,17 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> # CONFIG_PCI is not set</div><div class='ctx'> # CONFIG_PCI_DOMAINS is not set</div><div class='ctx'> # CONFIG_PCI_SYSCALL is not set</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HAS_RAPIDIO is not set</div><div class='add'>+# CONFIG_RELOCATABLE is not set</div><div class='ctx'> CONFIG_PAGE_OFFSET=0xc000000000000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc000000000000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -399,9 +404,22 @@ CONFIG_BT_HCIUSB_SCO=y</div><div class='ctx'> #</div><div class='ctx'> # Wireless</div><div class='ctx'> #</div><div class='del'>-# CONFIG_CFG80211 is not set</div><div class='add'>+CONFIG_CFG80211=m</div><div class='add'>+CONFIG_NL80211=y</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='del'>-# CONFIG_MAC80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT_SYSFS is not set</div><div class='add'>+CONFIG_MAC80211=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Rate control algorithm selection</div><div class='add'>+#</div><div class='add'>+CONFIG_MAC80211_RC_PID=y</div><div class='add'>+CONFIG_MAC80211_RC_DEFAULT_PID=y</div><div class='add'>+CONFIG_MAC80211_RC_DEFAULT="pid"</div><div class='add'>+# CONFIG_MAC80211_MESH is not set</div><div class='add'>+# CONFIG_MAC80211_LEDS is not set</div><div class='add'>+# CONFIG_MAC80211_DEBUGFS is not set</div><div class='add'>+# CONFIG_MAC80211_DEBUG_MENU is not set</div><div class='ctx'> CONFIG_IEEE80211=m</div><div class='ctx'> # CONFIG_IEEE80211_DEBUG is not set</div><div class='ctx'> CONFIG_IEEE80211_CRYPT_WEP=m</div><div class='hunk'>@@ -420,14 +438,79 @@ CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='ctx'> # CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='ctx'> CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='del'>-# CONFIG_MTD is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+CONFIG_MTD_DEBUG=y</div><div class='add'>+CONFIG_MTD_DEBUG_VERBOSE=0</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+# CONFIG_MTD_PARTITIONS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_CHAR is not set</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+# CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_CFI is not set</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+CONFIG_MTD_PS3VRAM=y</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# UBI - Unsorted block images</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_UBI is not set</div><div class='ctx'> CONFIG_OF_DEVICE=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='hunk'>@@ -443,6 +526,7 @@ CONFIG_BLK_DEV_RAM_SIZE=65535</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -494,7 +578,6 @@ CONFIG_SCSI_WAIT_SCAN=m</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -510,9 +593,9 @@ CONFIG_MII=m</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> CONFIG_GELIC_NET=y</div><div class='ctx'> CONFIG_GELIC_WIRELESS=y</div><div class='add'>+CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE=y</div><div class='ctx'> # CONFIG_NETDEV_10000 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -523,8 +606,22 @@ CONFIG_WLAN_80211=y</div><div class='ctx'> # CONFIG_LIBERTAS is not set</div><div class='ctx'> # CONFIG_USB_ZD1201 is not set</div><div class='ctx'> # CONFIG_USB_NET_RNDIS_WLAN is not set</div><div class='add'>+# CONFIG_RTL8187 is not set</div><div class='add'>+# CONFIG_MAC80211_HWSIM is not set</div><div class='add'>+# CONFIG_P54_COMMON is not set</div><div class='ctx'> # CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_HOSTAP is not set</div><div class='add'>+# CONFIG_B43 is not set</div><div class='add'>+# CONFIG_B43LEGACY is not set</div><div class='add'>+CONFIG_ZD1211RW=m</div><div class='add'>+# CONFIG_ZD1211RW_DEBUG is not set</div><div class='add'>+CONFIG_RT2X00=m</div><div class='add'>+CONFIG_RT2X00_LIB=m</div><div class='add'>+CONFIG_RT2X00_LIB_USB=m</div><div class='add'>+CONFIG_RT2X00_LIB_FIRMWARE=y</div><div class='add'>+# CONFIG_RT2500USB is not set</div><div class='add'>+CONFIG_RT73USB=m</div><div class='add'>+# CONFIG_RT2X00_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Network Adapters</div><div class='hunk'>@@ -622,6 +719,7 @@ CONFIG_INPUT_JOYSTICK=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -647,6 +745,8 @@ CONFIG_LEGACY_PTY_COUNT=16</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='hunk'>@@ -663,8 +763,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -796,6 +898,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> CONFIG_USB_SUSPEND=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -817,6 +920,10 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> # CONFIG_USB_R8A66597_HCD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # USB Device Class drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='hunk'>@@ -843,6 +950,7 @@ CONFIG_USB_STORAGE=m</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -851,7 +959,6 @@ CONFIG_USB_STORAGE=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -864,7 +971,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -998,9 +1104,11 @@ CONFIG_HUGETLB_PAGE=y</div><div class='ctx'> # CONFIG_BEFS_FS is not set</div><div class='ctx'> # CONFIG_BFS_FS is not set</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_JFFS2_FS is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1011,14 +1119,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1086,7 +1193,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='del'>-# CONFIG_CRC_T10DIF is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1115,6 +1222,8 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1138,6 +1247,7 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> CONFIG_DEBUG_WRITECOUNT=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> CONFIG_DEBUG_LIST=y</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='hunk'>@@ -1146,6 +1256,7 @@ CONFIG_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='ctx'> # CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_HAVE_FTRACE=y</div><div class='ctx'> CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='ctx'> # CONFIG_FTRACE is not set</div><div class='hunk'>@@ -1153,12 +1264,14 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='ctx'> # CONFIG_SCHED_TRACER is not set</div><div class='ctx'> # CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> CONFIG_DEBUG_STACKOVERFLOW=y</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-# CONFIG_DEBUGGER is not set</div><div class='ctx'> # CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='ctx'> # CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='add'>+# CONFIG_XMON is not set</div><div class='ctx'> CONFIG_IRQSTACKS=y</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BOOTX_TEXT is not set</div><div class='head'>diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig<br/>index fe6ffa683d78..e77c5e7a0be2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/pseries_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/pseries_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/pseries_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/pseries_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc3</div><div class='del'>-# Tue May 20 20:03:28 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Tue Aug 26 13:31:07 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC64=y</div><div class='ctx'> </div><div class='hunk'>@@ -14,6 +14,7 @@ CONFIG_POWER4=y</div><div class='ctx'> # CONFIG_TUNE_CELL is not set</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> CONFIG_ALTIVEC=y</div><div class='add'>+CONFIG_VSX=y</div><div class='ctx'> CONFIG_PPC_STD_MMU=y</div><div class='ctx'> CONFIG_PPC_MM_SLICES=y</div><div class='ctx'> CONFIG_VIRT_CPU_ACCOUNTING=y</div><div class='hunk'>@@ -31,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_HAVE_SETUP_PER_CPU_AREA=y</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='hunk'>@@ -104,7 +106,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -132,11 +133,17 @@ CONFIG_MARKERS=y</div><div class='ctx'> CONFIG_OPROFILE=y</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> CONFIG_KPROBES=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='ctx'> CONFIG_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='del'>-# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='add'>+CONFIG_HAVE_DMA_ATTRS=y</div><div class='add'>+CONFIG_USE_GENERIC_SMP_HELPERS=y</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -152,6 +159,7 @@ CONFIG_STOP_MACHINE=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> CONFIG_BLOCK_COMPAT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -172,17 +180,14 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='ctx'> CONFIG_PPC_PSERIES=y</div><div class='ctx'> CONFIG_PPC_SPLPAR=y</div><div class='ctx'> CONFIG_EEH=y</div><div class='ctx'> CONFIG_SCANLOG=m</div><div class='ctx'> CONFIG_LPARCFG=y</div><div class='add'>+CONFIG_PPC_SMLPAR=y</div><div class='add'>+CONFIG_CMM=y</div><div class='ctx'> # CONFIG_PPC_ISERIES is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_PPC_MAPLE is not set</div><div class='ctx'> # CONFIG_PPC_PASEMI is not set</div><div class='hunk'>@@ -226,7 +231,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -275,6 +280,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13</div><div class='ctx'> CONFIG_SCHED_SMT=y</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -304,10 +310,6 @@ CONFIG_HOTPLUG_PCI_RPA_DLPAR=m</div><div class='ctx'> CONFIG_PAGE_OFFSET=0xc000000000000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc000000000000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -321,6 +323,7 @@ CONFIG_XFRM_USER=m</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> # CONFIG_XFRM_MIGRATE is not set</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=m</div><div class='ctx'> # CONFIG_NET_KEY_MIGRATE is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -498,6 +501,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -531,12 +536,14 @@ CONFIG_BLK_DEV_RAM_SIZE=65536</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='hunk'>@@ -544,6 +551,7 @@ CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_TIMINGS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='hunk'>@@ -575,10 +583,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> CONFIG_BLK_DEV_AMD74XX=y</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -596,8 +602,6 @@ CONFIG_BLK_DEV_AMD74XX=y</div><div class='ctx'> # CONFIG_BLK_DEV_VIA82CXXX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TC86C001 is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -659,6 +663,8 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_GDTH is not set</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='ctx'> CONFIG_SCSI_IBMVSCSI=y</div><div class='add'>+CONFIG_SCSI_IBMVFC=m</div><div class='add'>+CONFIG_SCSI_IBMVFC_TRACE=y</div><div class='ctx'> # CONFIG_SCSI_INITIO is not set</div><div class='ctx'> # CONFIG_SCSI_INIA100 is not set</div><div class='ctx'> # CONFIG_SCSI_PPA is not set</div><div class='hunk'>@@ -681,6 +687,7 @@ CONFIG_SCSI_LPFC=m</div><div class='ctx'> # CONFIG_SCSI_DC390T is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_SATA_PMP=y</div><div class='hunk'>@@ -703,9 +710,6 @@ CONFIG_DM_SNAPSHOT=m</div><div class='ctx'> CONFIG_DM_MIRROR=m</div><div class='ctx'> CONFIG_DM_ZERO=m</div><div class='ctx'> CONFIG_DM_MULTIPATH=m</div><div class='del'>-CONFIG_DM_MULTIPATH_EMC=m</div><div class='del'>-# CONFIG_DM_MULTIPATH_RDAC is not set</div><div class='del'>-# CONFIG_DM_MULTIPATH_HP is not set</div><div class='ctx'> # CONFIG_DM_DELAY is not set</div><div class='ctx'> # CONFIG_DM_UEVENT is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='hunk'>@@ -713,12 +717,15 @@ CONFIG_DM_MULTIPATH_EMC=m</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> CONFIG_BONDING=m</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -726,7 +733,23 @@ CONFIG_BONDING=m</div><div class='ctx'> CONFIG_TUN=m</div><div class='ctx'> # CONFIG_VETH is not set</div><div class='ctx'> # CONFIG_ARCNET is not set</div><div class='del'>-# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+# CONFIG_VITESSE_PHY is not set</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='add'>+# CONFIG_BROADCOM_PHY is not set</div><div class='add'>+# CONFIG_ICPLUS_PHY is not set</div><div class='add'>+# CONFIG_REALTEK_PHY is not set</div><div class='add'>+# CONFIG_FIXED_PHY is not set</div><div class='add'>+# CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='hunk'>@@ -759,6 +782,7 @@ CONFIG_E100=y</div><div class='ctx'> # CONFIG_SIS900 is not set</div><div class='ctx'> # CONFIG_EPIC100 is not set</div><div class='ctx'> # CONFIG_SUNDANCE is not set</div><div class='add'>+# CONFIG_TLAN is not set</div><div class='ctx'> # CONFIG_VIA_RHINE is not set</div><div class='ctx'> # CONFIG_SC92031 is not set</div><div class='ctx'> # CONFIG_NET_POCKET is not set</div><div class='hunk'>@@ -767,10 +791,8 @@ CONFIG_ACENIC=y</div><div class='ctx'> CONFIG_ACENIC_OMIT_TIGON_I=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> CONFIG_E1000=y</div><div class='del'>-# CONFIG_E1000_NAPI is not set</div><div class='ctx'> # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -785,14 +807,14 @@ CONFIG_TIGON3=y</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='add'>+CONFIG_EHEA=y</div><div class='ctx'> # CONFIG_IXGBE is not set</div><div class='ctx'> CONFIG_IXGB=m</div><div class='del'>-# CONFIG_IXGB_NAPI is not set</div><div class='ctx'> CONFIG_S2IO=m</div><div class='del'>-# CONFIG_S2IO_NAPI is not set</div><div class='ctx'> # CONFIG_MYRI10GE is not set</div><div class='ctx'> # CONFIG_NETXEN_NIC is not set</div><div class='ctx'> # CONFIG_NIU is not set</div><div class='hunk'>@@ -883,6 +905,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y</div><div class='ctx'> # CONFIG_MOUSE_PS2_TOUCHKIT is not set</div><div class='ctx'> # CONFIG_MOUSE_SERIAL is not set</div><div class='ctx'> # CONFIG_MOUSE_APPLETOUCH is not set</div><div class='add'>+# CONFIG_MOUSE_BCM5974 is not set</div><div class='ctx'> # CONFIG_MOUSE_VSXXXAA is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='ctx'> # CONFIG_INPUT_TABLET is not set</div><div class='hunk'>@@ -906,12 +929,14 @@ CONFIG_SERIO_I8042=y</div><div class='ctx'> # CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_SERIO_XILINX_XPS_PS2 is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -943,6 +968,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_PRINTER is not set</div><div class='ctx'> # CONFIG_PPDEV is not set</div><div class='ctx'> CONFIG_HVC_DRIVER=y</div><div class='add'>+CONFIG_HVC_IRQ=y</div><div class='ctx'> CONFIG_HVC_CONSOLE=y</div><div class='ctx'> CONFIG_HVC_RTAS=y</div><div class='ctx'> CONFIG_HVCS=m</div><div class='hunk'>@@ -961,44 +987,65 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> # CONFIG_I2C_CHARDEV is not set</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT is not set</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -1007,10 +1054,13 @@ CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1022,8 +1072,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -1102,10 +1154,13 @@ CONFIG_FB_RADEON_BACKLIGHT=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='ctx'> CONFIG_FB_IBM_GXT4500=y</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='ctx'> CONFIG_LCD_CLASS_DEVICE=m</div><div class='add'>+# CONFIG_LCD_ILI9320 is not set</div><div class='add'>+CONFIG_LCD_PLATFORM=m</div><div class='ctx'> CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='ctx'> # CONFIG_BACKLIGHT_CORGI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1133,10 +1188,6 @@ CONFIG_LOGO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_MONO=y</div><div class='ctx'> CONFIG_LOGO_LINUX_VGA16=y</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -1165,6 +1216,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1190,6 +1242,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> # CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -1211,6 +1264,7 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> CONFIG_USB_STORAGE_ONETOUCH=y</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1219,7 +1273,6 @@ CONFIG_USB_STORAGE_ONETOUCH=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1233,7 +1286,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1250,6 +1302,7 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='hunk'>@@ -1316,6 +1369,7 @@ CONFIG_XFS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_GFS2_FS is not set</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS_O2CB=m</div><div class='add'>+CONFIG_OCFS2_FS_STATS=y</div><div class='ctx'> CONFIG_OCFS2_DEBUG_MASKLOG=y</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -1371,6 +1425,7 @@ CONFIG_CONFIGFS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1394,7 +1449,6 @@ CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='ctx'> CONFIG_SUNRPC_XPRT_RDMA=m</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> CONFIG_RPCSEC_GSS_SPKM3=m</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1463,6 +1517,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1495,8 +1550,10 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='del'>-# CONFIG_SCHEDSTATS is not set</div><div class='add'>+CONFIG_SCHEDSTATS=y</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='hunk'>@@ -1508,30 +1565,49 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='ctx'> # CONFIG_PROVE_LOCKING is not set</div><div class='ctx'> # CONFIG_LOCK_STAT is not set</div><div class='add'>+CONFIG_TRACE_IRQFLAGS=y</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='ctx'> # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+CONFIG_STACKTRACE=y</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_KPROBES_SANITY_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_LKDTM is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+CONFIG_LATENCYTOP=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+CONFIG_TRACER_MAX_TRACE=y</div><div class='add'>+CONFIG_TRACING=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+CONFIG_IRQSOFF_TRACER=y</div><div class='add'>+CONFIG_SCHED_TRACER=y</div><div class='add'>+CONFIG_CONTEXT_SWITCH_TRACER=y</div><div class='add'>+# CONFIG_FTRACE_STARTUP_TEST is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> CONFIG_DEBUG_STACKOVERFLOW=y</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='ctx'> CONFIG_HCALL_STATS=y</div><div class='del'>-CONFIG_DEBUGGER=y</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='ctx'> CONFIG_XMON=y</div><div class='ctx'> CONFIG_XMON_DEFAULT=y</div><div class='ctx'> CONFIG_XMON_DISASSEMBLY=y</div><div class='add'>+CONFIG_DEBUGGER=y</div><div class='ctx'> CONFIG_IRQSTACKS=y</div><div class='ctx'> CONFIG_VIRQ_DEBUG=y</div><div class='ctx'> # CONFIG_BOOTX_TEXT is not set</div><div class='hunk'>@@ -1590,6 +1666,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='head'>diff --git a/arch/powerpc/configs/sbc8641d_defconfig b/arch/powerpc/configs/sbc8641d_defconfig<br/>index 8227510b41a9..f545421f9857 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/sbc8641d_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/sbc8641d_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/sbc8641d_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/sbc8641d_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:19 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:15 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -33,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_GENERIC_LOCKBREAK=y</div><div class='hunk'>@@ -92,7 +93,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -100,6 +100,7 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -117,10 +118,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> # CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+CONFIG_USE_GENERIC_SMP_HELPERS=y</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -138,6 +145,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -156,30 +164,40 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> #</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-CONFIG_PPC_86xx=y</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='add'>+# CONFIG_PPC_MPC52xx is not set</div><div class='add'>+CONFIG_PPC_PMAC=y</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+CONFIG_PPC_86xx=y</div><div class='ctx'> # CONFIG_MPC8641_HPCN is not set</div><div class='ctx'> CONFIG_SBC8641D=y</div><div class='ctx'> # CONFIG_MPC8610_HPCD is not set</div><div class='ctx'> CONFIG_MPC8641=y</div><div class='add'>+CONFIG_PPC_NATIVE=y</div><div class='add'>+# CONFIG_UDBG_RTAS_CONSOLE is not set</div><div class='ctx'> # CONFIG_IPIC is not set</div><div class='ctx'> CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_MPIC_WEIRD is not set</div><div class='del'>-# CONFIG_PPC_I8259 is not set</div><div class='del'>-# CONFIG_PPC_RTAS is not set</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='del'>-# CONFIG_PPC_MPC106 is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_PPC_INDIRECT_IO is not set</div><div class='ctx'> # CONFIG_GENERIC_IOMAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_PPC601_SYNC_FIX is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='ctx'> # CONFIG_FSL_ULI1575 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -195,7 +213,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> # CONFIG_PREEMPT_NONE is not set</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='hunk'>@@ -203,9 +221,11 @@ CONFIG_PREEMPT=y</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> CONFIG_BINFMT_MISC=m</div><div class='ctx'> # CONFIG_IOMMU_HELPER is not set</div><div class='add'>+# CONFIG_HOTPLUG_CPU is not set</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_ARCH_HAS_WALK_MEMORY=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='ctx'> CONFIG_IRQ_ALL_CPUS=y</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='hunk'>@@ -219,6 +239,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -226,6 +247,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> # CONFIG_PROC_DEVICETREE is not set</div><div class='ctx'> # CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -233,11 +255,13 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISA is not set</div><div class='ctx'> CONFIG_ZONE_DMA=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_FSL_SOC=y</div><div class='ctx'> CONFIG_FSL_PCI=y</div><div class='add'>+CONFIG_PPC_PCI_CHOICE=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCI_SYSCALL=y</div><div class='hunk'>@@ -265,10 +289,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -282,6 +302,7 @@ CONFIG_XFRM_USER=m</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> # CONFIG_XFRM_MIGRATE is not set</div><div class='ctx'> # CONFIG_XFRM_STATISTICS is not set</div><div class='add'>+CONFIG_XFRM_IPCOMP=m</div><div class='ctx'> CONFIG_NET_KEY=m</div><div class='ctx'> # CONFIG_NET_KEY_MIGRATE is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -406,6 +427,7 @@ CONFIG_IP_NF_MANGLE=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_ECN=m</div><div class='ctx'> # CONFIG_IP_NF_TARGET_TTL is not set</div><div class='ctx'> CONFIG_IP_NF_RAW=m</div><div class='add'>+# CONFIG_IP_NF_SECURITY is not set</div><div class='ctx'> CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='hunk'>@@ -429,6 +451,7 @@ CONFIG_IP6_NF_TARGET_LOG=m</div><div class='ctx'> CONFIG_IP6_NF_MANGLE=m</div><div class='ctx'> # CONFIG_IP6_NF_TARGET_HL is not set</div><div class='ctx'> CONFIG_IP6_NF_RAW=m</div><div class='add'>+# CONFIG_IP6_NF_SECURITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Bridge: Netfilter Configuration</div><div class='hunk'>@@ -451,8 +474,10 @@ CONFIG_ATM_LANE=m</div><div class='ctx'> CONFIG_ATM_MPOA=m</div><div class='ctx'> CONFIG_ATM_BR2684=m</div><div class='ctx'> # CONFIG_ATM_BR2684_IPFILTER is not set</div><div class='add'>+CONFIG_STP=m</div><div class='ctx'> CONFIG_BRIDGE=m</div><div class='ctx'> CONFIG_VLAN_8021Q=m</div><div class='add'>+# CONFIG_VLAN_8021Q_GVRP is not set</div><div class='ctx'> # CONFIG_DECNET is not set</div><div class='ctx'> CONFIG_LLC=m</div><div class='ctx'> # CONFIG_LLC2 is not set</div><div class='hunk'>@@ -472,7 +497,6 @@ CONFIG_NET_SCH_HTB=m</div><div class='ctx'> CONFIG_NET_SCH_HFSC=m</div><div class='ctx'> CONFIG_NET_SCH_ATM=m</div><div class='ctx'> CONFIG_NET_SCH_PRIO=m</div><div class='del'>-# CONFIG_NET_SCH_RR is not set</div><div class='ctx'> CONFIG_NET_SCH_RED=m</div><div class='ctx'> CONFIG_NET_SCH_SFQ=m</div><div class='ctx'> CONFIG_NET_SCH_TEQL=m</div><div class='hunk'>@@ -625,6 +649,7 @@ CONFIG_OF_I2C=y</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_MAC_FLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_DA is not set</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='hunk'>@@ -640,12 +665,14 @@ CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -680,12 +707,15 @@ CONFIG_DM_ZERO=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> CONFIG_BONDING=m</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -712,6 +742,8 @@ CONFIG_BROADCOM_PHY=y</div><div class='ctx'> # CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_MACE is not set</div><div class='add'>+# CONFIG_BMAC is not set</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='ctx'> # CONFIG_SUNGEM is not set</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='hunk'>@@ -729,7 +761,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -743,9 +774,10 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='del'>-# CONFIG_GFAR_NAPI is not set</div><div class='add'>+# CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> # CONFIG_NETDEV_10000 is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='hunk'>@@ -768,7 +800,7 @@ CONFIG_ATM_DRIVERS=y</div><div class='ctx'> # CONFIG_ATM_AMBASSADOR is not set</div><div class='ctx'> # CONFIG_ATM_HORIZON is not set</div><div class='ctx'> # CONFIG_ATM_IA is not set</div><div class='del'>-# CONFIG_ATM_FORE200E_MAYBE is not set</div><div class='add'>+# CONFIG_ATM_FORE200E is not set</div><div class='ctx'> # CONFIG_ATM_HE is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='hunk'>@@ -834,6 +866,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -857,11 +890,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2</div><div class='ctx'> # CONFIG_SERIAL_UARTLITE is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_PMACZILOG is not set</div><div class='ctx'> # CONFIG_SERIAL_JSM is not set</div><div class='ctx'> # CONFIG_SERIAL_OF_PLATFORM is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_BRIQ_PANEL is not set</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> CONFIG_HW_RANDOM=m</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='hunk'>@@ -874,42 +910,69 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mac SMBus host controller drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+CONFIG_I2C_POWERMAC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -918,10 +981,13 @@ CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_AD7414 is not set</div><div class='ctx'> # CONFIG_SENSORS_AD7418 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='hunk'>@@ -931,6 +997,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_ADM9240 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7470 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADT7473 is not set</div><div class='add'>+# CONFIG_SENSORS_AMS is not set</div><div class='ctx'> # CONFIG_SENSORS_ATXP1 is not set</div><div class='ctx'> # CONFIG_SENSORS_DS1621 is not set</div><div class='ctx'> # CONFIG_SENSORS_I5K_AMB is not set</div><div class='hunk'>@@ -975,6 +1042,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -982,6 +1050,9 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SOFT_WATCHDOG=m</div><div class='add'>+# CONFIG_ALIM7101_WDT is not set</div><div class='add'>+# CONFIG_8xxx_WDT is not set</div><div class='add'>+# CONFIG_WATCHDOG_RTAS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCI-based Watchdog Cards</div><div class='hunk'>@@ -998,8 +1069,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -1038,10 +1111,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> CONFIG_VGA_CONSOLE=y</div><div class='ctx'> # CONFIG_VGACON_SOFT_SCROLLBACK is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -1056,6 +1125,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Enable Host or Gadget support to see Inventra options</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -1096,6 +1169,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS_O2CB=m</div><div class='add'>+CONFIG_OCFS2_FS_STATS=y</div><div class='ctx'> CONFIG_OCFS2_DEBUG_MASKLOG=y</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -1145,6 +1219,7 @@ CONFIG_CONFIGFS_FS=m</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> CONFIG_MINIX_FS=m</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> CONFIG_ROMFS_FS=m</div><div class='hunk'>@@ -1155,14 +1230,13 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='hunk'>@@ -1183,6 +1257,7 @@ CONFIG_CIFS_POSIX=y</div><div class='ctx'> # Partition Types</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MAC_PARTITION=y</div><div class='ctx'> CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> CONFIG_NLS=m</div><div class='ctx'> CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='hunk'>@@ -1233,6 +1308,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1259,6 +1335,8 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -1275,21 +1353,34 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_PREEMPT_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='del'>-CONFIG_DEBUGGER=y</div><div class='add'>+# CONFIG_CODE_PATCHING_SELFTEST is not set</div><div class='add'>+# CONFIG_FTR_FIXUP_SELFTEST is not set</div><div class='ctx'> # CONFIG_XMON is not set</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_VIRQ_DEBUG is not set</div><div class='ctx'> # CONFIG_BDI_SWITCH is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1299,7 +1390,6 @@ CONFIG_DEBUGGER=y</div><div class='ctx'> CONFIG_SECURITY=y</div><div class='ctx'> CONFIG_SECURITY_NETWORK=y</div><div class='ctx'> # CONFIG_SECURITY_NETWORK_XFRM is not set</div><div class='del'>-CONFIG_SECURITY_CAPABILITIES=y</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='hunk'>@@ -1349,6 +1439,10 @@ CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> CONFIG_CRYPTO_MD4=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='hunk'>@@ -1382,5 +1476,6 @@ CONFIG_CRYPTO_DEFLATE=m</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='add'>+# CONFIG_CRYPTO_DEV_TALITOS is not set</div><div class='ctx'> # CONFIG_PPC_CLOCK is not set</div><div class='ctx'> # CONFIG_VIRTUALIZATION is not set</div><div class='head'>diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig<br/>index 88f6aa8273be..4340cc1c5b6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/storcenter_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/configs/storcenter_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/storcenter_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/configs/storcenter_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc5</div><div class='del'>-# Mon Jun  9 08:52:20 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 00:52:16 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set</div><div class='ctx'> CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_LATENCYTOP_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_ARCH_HAS_ILOG2_U32=y</div><div class='hunk'>@@ -87,7 +88,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='hunk'>@@ -110,10 +110,16 @@ CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_ARCH_TRACEHOOK=y</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -130,6 +136,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -149,25 +156,25 @@ CONFIG_CLASSIC_RCU=y</div><div class='ctx'> # Platform support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC_MULTIPLATFORM=y</div><div class='del'>-# CONFIG_PPC_82xx is not set</div><div class='del'>-# CONFIG_PPC_83xx is not set</div><div class='del'>-# CONFIG_PPC_86xx is not set</div><div class='ctx'> CONFIG_CLASSIC32=y</div><div class='ctx'> # CONFIG_PPC_CHRP is not set</div><div class='del'>-# CONFIG_PPC_MPC512x is not set</div><div class='del'>-# CONFIG_PPC_MPC5121 is not set</div><div class='ctx'> # CONFIG_MPC5121_ADS is not set</div><div class='add'>+# CONFIG_MPC5121_GENERIC is not set</div><div class='ctx'> # CONFIG_PPC_MPC52xx is not set</div><div class='ctx'> # CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_PPC_CELL is not set</div><div class='ctx'> # CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PQ2ADS is not set</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='ctx'> CONFIG_EMBEDDED6xx=y</div><div class='ctx'> # CONFIG_LINKSTATION is not set</div><div class='ctx'> CONFIG_STORCENTER=y</div><div class='ctx'> # CONFIG_MPC7448HPC2 is not set</div><div class='ctx'> # CONFIG_PPC_HOLLY is not set</div><div class='ctx'> # CONFIG_PPC_PRPMC2800 is not set</div><div class='add'>+# CONFIG_PPC_C2K is not set</div><div class='ctx'> CONFIG_MPC10X_BRIDGE=y</div><div class='ctx'> CONFIG_MPC10X_OPENPIC=y</div><div class='ctx'> # CONFIG_MPC10X_STORE_GATHERING is not set</div><div class='hunk'>@@ -221,6 +228,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -229,6 +237,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='ctx'> CONFIG_CMDLINE_BOOL=y</div><div class='ctx'> CONFIG_CMDLINE="console=ttyS0,115200"</div><div class='add'>+CONFIG_EXTRA_TARGETS=""</div><div class='ctx'> # CONFIG_PM is not set</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -264,10 +273,6 @@ CONFIG_PAGE_OFFSET=0xc0000000</div><div class='ctx'> CONFIG_KERNEL_START=0xc0000000</div><div class='ctx'> CONFIG_PHYSICAL_START=0x00000000</div><div class='ctx'> CONFIG_TASK_SIZE=0xc0000000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -456,20 +461,22 @@ CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_RAM is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='del'>-CONFIG_IDE_MAX_HWIFS=4</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_TIMINGS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> CONFIG_IDEDISK_MULTI_MODE=y</div><div class='hunk'>@@ -483,7 +490,6 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_SFF=y</div><div class='ctx'> </div><div class='hunk'>@@ -500,10 +506,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -521,8 +525,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='ctx'> CONFIG_BLK_DEV_VIA82CXXX=y</div><div class='ctx'> # CONFIG_BLK_DEV_TC86C001 is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -599,6 +601,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=y</div><div class='hunk'>@@ -616,12 +619,15 @@ CONFIG_MD_RAID5_RESHAPE=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> # CONFIG_MACINTOSH_DRIVERS is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -635,14 +641,12 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='ctx'> # CONFIG_HAMACHI is not set</div><div class='ctx'> # CONFIG_YELLOWFIN is not set</div><div class='ctx'> CONFIG_R8169=y</div><div class='del'>-# CONFIG_R8169_NAPI is not set</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='hunk'>@@ -653,6 +657,7 @@ CONFIG_R8169=y</div><div class='ctx'> # CONFIG_MV643XX_ETH is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> # CONFIG_NETDEV_10000 is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='hunk'>@@ -734,43 +739,64 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> # CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -779,10 +805,13 @@ CONFIG_I2C_MPC=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -794,8 +823,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -827,10 +858,6 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='hunk'>@@ -849,6 +876,7 @@ CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+# CONFIG_USB_MON is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -896,6 +924,7 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -904,7 +933,6 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-# CONFIG_USB_MON is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -917,7 +945,6 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -971,6 +998,7 @@ CONFIG_RTC_DRV_DS1307=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -1074,6 +1102,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -1151,6 +1180,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='hunk'>@@ -1178,7 +1208,16 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='ctx'> # CONFIG_SLUB_STATS is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='ctx'> # CONFIG_IRQSTACKS is not set</div><div class='ctx'> # CONFIG_BOOTX_TEXT is not set</div><div class='ctx'> # CONFIG_PPC_EARLY_DEBUG is not set</div><div class='head'>diff --git a/include/asm-powerpc/8253pit.h b/arch/powerpc/include/asm/8253pit.h<br/>index b70d6e53b303..b70d6e53b303 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/8253pit.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/8253pit.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/8253pit.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/8253pit.h</a></div><div class='head'>diff --git a/include/asm-powerpc/8xx_immap.h b/arch/powerpc/include/asm/8xx_immap.h<br/>index 4b0e15206006..4b0e15206006 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/8xx_immap.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/8xx_immap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/8xx_immap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/8xx_immap.h</a></div><div class='head'>diff --git a/include/asm-powerpc/Kbuild b/arch/powerpc/include/asm/Kbuild<br/>index 5ab7d7fe198c..5ab7d7fe198c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/Kbuild?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/Kbuild</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/Kbuild</a></div><div class='head'>diff --git a/include/asm-powerpc/a.out.h b/arch/powerpc/include/asm/a.out.h<br/>index 89cead6b176e..89cead6b176e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/a.out.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/a.out.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/a.out.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/a.out.h</a></div><div class='head'>diff --git a/include/asm-powerpc/abs_addr.h b/arch/powerpc/include/asm/abs_addr.h<br/>index 98324c5a8286..98324c5a8286 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/abs_addr.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/abs_addr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/abs_addr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/abs_addr.h</a></div><div class='head'>diff --git a/include/asm-powerpc/agp.h b/arch/powerpc/include/asm/agp.h<br/>index 86455c4c31ee..86455c4c31ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/agp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/agp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/agp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/agp.h</a></div><div class='head'>diff --git a/include/asm-powerpc/asm-compat.h b/arch/powerpc/include/asm/asm-compat.h<br/>index 8f0fe7971949..8f0fe7971949 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/asm-compat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/asm-compat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/asm-compat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/asm-compat.h</a></div><div class='head'>diff --git a/include/asm-powerpc/atomic.h b/arch/powerpc/include/asm/atomic.h<br/>index f3fc733758f5..f3fc733758f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/atomic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/atomic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/atomic.h</a></div><div class='head'>diff --git a/include/asm-powerpc/auxvec.h b/arch/powerpc/include/asm/auxvec.h<br/>index 19a099b62cd6..19a099b62cd6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/auxvec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/auxvec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/auxvec.h</a></div><div class='head'>diff --git a/include/asm-powerpc/backlight.h b/arch/powerpc/include/asm/backlight.h<br/>index 8cf5c37c3817..8cf5c37c3817 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/backlight.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/backlight.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/backlight.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/backlight.h</a></div><div class='head'>diff --git a/include/asm-powerpc/bitops.h b/arch/powerpc/include/asm/bitops.h<br/>index 897eade3afbe..897eade3afbe 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/bitops.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/bitops.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/bitops.h</a></div><div class='head'>diff --git a/include/asm-powerpc/bootx.h b/arch/powerpc/include/asm/bootx.h<br/>index 57b82e3f89ce..57b82e3f89ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/bootx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/bootx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/bootx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/bootx.h</a></div><div class='head'>diff --git a/include/asm-powerpc/btext.h b/arch/powerpc/include/asm/btext.h<br/>index 906f46e31006..906f46e31006 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/btext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/btext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/btext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/btext.h</a></div><div class='head'>diff --git a/include/asm-powerpc/bug.h b/arch/powerpc/include/asm/bug.h<br/>index e55d1f66b86f..e55d1f66b86f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/bug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/bug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/bug.h</a></div><div class='head'>diff --git a/include/asm-powerpc/bugs.h b/arch/powerpc/include/asm/bugs.h<br/>index 42fdb73e3068..42fdb73e3068 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/bugs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/bugs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/bugs.h</a></div><div class='head'>diff --git a/include/asm-powerpc/byteorder.h b/arch/powerpc/include/asm/byteorder.h<br/>index b37752214a16..b37752214a16 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/byteorder.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/byteorder.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/byteorder.h</a></div><div class='head'>diff --git a/include/asm-powerpc/cache.h b/arch/powerpc/include/asm/cache.h<br/>index 81de6eb3455d..81de6eb3455d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/cache.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/cache.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cache.h</a></div><div class='head'>diff --git a/include/asm-powerpc/cacheflush.h b/arch/powerpc/include/asm/cacheflush.h<br/>index ba667a383b8c..ba667a383b8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/cacheflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/cacheflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cacheflush.h</a></div><div class='head'>diff --git a/include/asm-powerpc/cell-pmu.h b/arch/powerpc/include/asm/cell-pmu.h<br/>index 8066eede3a0c..8066eede3a0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/cell-pmu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/cell-pmu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/cell-pmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cell-pmu.h</a></div><div class='head'>diff --git a/include/asm-powerpc/cell-regs.h b/arch/powerpc/include/asm/cell-regs.h<br/>index fd6fd00434ef..fd6fd00434ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/cell-regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/cell-regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/cell-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cell-regs.h</a></div><div class='head'>diff --git a/include/asm-powerpc/checksum.h b/arch/powerpc/include/asm/checksum.h<br/>index 7cdf358337cf..7cdf358337cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/checksum.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/checksum.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/checksum.h</a></div><div class='head'>diff --git a/include/asm-powerpc/clk_interface.h b/arch/powerpc/include/asm/clk_interface.h<br/>index ab1882c1e176..ab1882c1e176 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/clk_interface.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/clk_interface.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/clk_interface.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/clk_interface.h</a></div><div class='head'>diff --git a/include/asm-powerpc/code-patching.h b/arch/powerpc/include/asm/code-patching.h<br/>index 107d9b915e33..107d9b915e33 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/code-patching.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/code-patching.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/code-patching.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/code-patching.h</a></div><div class='head'>diff --git a/include/asm-powerpc/compat.h b/arch/powerpc/include/asm/compat.h<br/>index d811a8cd7b58..d811a8cd7b58 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/compat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/compat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/compat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/compat.h</a></div><div class='head'>diff --git a/include/asm-powerpc/cpm.h b/arch/powerpc/include/asm/cpm.h<br/>index 63a55337c2de..24d79e3abd8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/cpm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/cpm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/cpm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cpm.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Opcodes common to CPM1 and CPM2</div><div class='ctx'> */</div><div class='hunk'>@@ -100,4 +101,6 @@ unsigned long cpm_muram_offset(void __iomem *addr);</div><div class='ctx'> dma_addr_t cpm_muram_dma(void __iomem *addr);</div><div class='ctx'> int cpm_command(u32 command, u8 opcode);</div><div class='ctx'> </div><div class='add'>+int cpm2_gpiochip_add32(struct device_node *np);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/asm-powerpc/cpm1.h b/arch/powerpc/include/asm/cpm1.h<br/>index 2ff798744c1d..2ff798744c1d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/cpm1.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/cpm1.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/cpm1.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cpm1.h</a></div><div class='head'>diff --git a/include/asm-powerpc/cpm2.h b/arch/powerpc/include/asm/cpm2.h<br/>index 2c7fd9cee291..0f5e8ff59a85 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/cpm2.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/cpm2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/cpm2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cpm2.h</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/immap_cpm2.h&gt;</div><div class='ctx'> #include &lt;asm/cpm.h&gt;</div><div class='add'>+#include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_85xx</div><div class='ctx'> #define CPM_MAP_ADDR (get_immrbase() + 0x80000)</div><div class='hunk'>@@ -93,10 +94,40 @@ extern cpm_cpm2_t __iomem *cpmp; /* Pointer to comm processor */</div><div class='ctx'> #define cpm_dpfree cpm_muram_free</div><div class='ctx'> #define cpm_dpram_addr cpm_muram_addr</div><div class='ctx'> </div><div class='del'>-extern void cpm_setbrg(uint brg, uint rate);</div><div class='del'>-extern void cpm2_fastbrg(uint brg, uint rate, int div16);</div><div class='ctx'> extern void cpm2_reset(void);</div><div class='ctx'> </div><div class='add'>+/* Baud rate generators.</div><div class='add'>+*/</div><div class='add'>+#define CPM_BRG_RST		((uint)0x00020000)</div><div class='add'>+#define CPM_BRG_EN		((uint)0x00010000)</div><div class='add'>+#define CPM_BRG_EXTC_INT	((uint)0x00000000)</div><div class='add'>+#define CPM_BRG_EXTC_CLK3_9	((uint)0x00004000)</div><div class='add'>+#define CPM_BRG_EXTC_CLK5_15	((uint)0x00008000)</div><div class='add'>+#define CPM_BRG_ATB		((uint)0x00002000)</div><div class='add'>+#define CPM_BRG_CD_MASK		((uint)0x00001ffe)</div><div class='add'>+#define CPM_BRG_DIV16		((uint)0x00000001)</div><div class='add'>+</div><div class='add'>+#define CPM2_BRG_INT_CLK	(get_brgfreq())</div><div class='add'>+#define CPM2_BRG_UART_CLK	(CPM2_BRG_INT_CLK/16)</div><div class='add'>+</div><div class='add'>+extern void __cpm2_setbrg(uint brg, uint rate, uint clk, int div16, int src);</div><div class='add'>+</div><div class='add'>+/* This function is used by UARTS, or anything else that uses a 16x</div><div class='add'>+ * oversampled clock.</div><div class='add'>+ */</div><div class='add'>+static inline void cpm_setbrg(uint brg, uint rate)</div><div class='add'>+{</div><div class='add'>+	__cpm2_setbrg(brg, rate, CPM2_BRG_UART_CLK, 0, CPM_BRG_EXTC_INT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function is used to set high speed synchronous baud rate</div><div class='add'>+ * clocks.</div><div class='add'>+ */</div><div class='add'>+static inline void cpm2_fastbrg(uint brg, uint rate, int div16)</div><div class='add'>+{</div><div class='add'>+	__cpm2_setbrg(brg, rate, CPM2_BRG_INT_CLK, div16, CPM_BRG_EXTC_INT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Function code bits, usually generic to devices.</div><div class='ctx'> */</div><div class='ctx'> #define CPMFCR_GBL	((u_char)0x20)	/* Set memory snooping */</div><div class='hunk'>@@ -195,17 +226,6 @@ typedef struct smc_uart {</div><div class='ctx'> #define SMCM_TX		((unsigned char)0x02)</div><div class='ctx'> #define SMCM_RX		((unsigned char)0x01)</div><div class='ctx'> </div><div class='del'>-/* Baud rate generators.</div><div class='del'>-*/</div><div class='del'>-#define CPM_BRG_RST		((uint)0x00020000)</div><div class='del'>-#define CPM_BRG_EN		((uint)0x00010000)</div><div class='del'>-#define CPM_BRG_EXTC_INT	((uint)0x00000000)</div><div class='del'>-#define CPM_BRG_EXTC_CLK3_9	((uint)0x00004000)</div><div class='del'>-#define CPM_BRG_EXTC_CLK5_15	((uint)0x00008000)</div><div class='del'>-#define CPM_BRG_ATB		((uint)0x00002000)</div><div class='del'>-#define CPM_BRG_CD_MASK		((uint)0x00001ffe)</div><div class='del'>-#define CPM_BRG_DIV16		((uint)0x00000001)</div><div class='del'>-</div><div class='ctx'> /* SCCs.</div><div class='ctx'> */</div><div class='ctx'> #define SCC_GSMRH_IRP		((uint)0x00040000)</div><div class='hunk'>@@ -317,6 +337,11 @@ typedef struct scc_param {</div><div class='ctx'> 	uint	scc_tcrc;	/* Internal */</div><div class='ctx'> } sccp_t;</div><div class='ctx'> </div><div class='add'>+/* Function code bits.</div><div class='add'>+*/</div><div class='add'>+#define SCC_EB	((u_char) 0x10)	/* Set big endian byte order */</div><div class='add'>+#define SCC_GBL	((u_char) 0x20) /* Snooping enabled */</div><div class='add'>+</div><div class='ctx'> /* CPM Ethernet through SCC1.</div><div class='ctx'>  */</div><div class='ctx'> typedef struct scc_enet {</div><div class='head'>diff --git a/include/asm-powerpc/cputable.h b/arch/powerpc/include/asm/cputable.h<br/>index ef8a248dfd55..ef8a248dfd55 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/cputable.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/cputable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/cputable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cputable.h</a></div><div class='head'>diff --git a/include/asm-powerpc/cputhreads.h b/arch/powerpc/include/asm/cputhreads.h<br/>index fb11b0c459b8..fb11b0c459b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/cputhreads.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/cputhreads.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/cputhreads.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cputhreads.h</a></div><div class='head'>diff --git a/include/asm-powerpc/cputime.h b/arch/powerpc/include/asm/cputime.h<br/>index f42e623030ee..f42e623030ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/cputime.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/cputime.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/cputime.h</a></div><div class='head'>diff --git a/include/asm-powerpc/current.h b/arch/powerpc/include/asm/current.h<br/>index e2c7f06931e7..e2c7f06931e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/current.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/current.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/current.h</a></div><div class='head'>diff --git a/include/asm-powerpc/dbdma.h b/arch/powerpc/include/asm/dbdma.h<br/>index e23f07e73cb3..e23f07e73cb3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/dbdma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/dbdma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/dbdma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/dbdma.h</a></div><div class='head'>diff --git a/include/asm-powerpc/dcr-generic.h b/arch/powerpc/include/asm/dcr-generic.h<br/>index 35b71599ec46..35b71599ec46 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/dcr-generic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/dcr-generic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/dcr-generic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/dcr-generic.h</a></div><div class='head'>diff --git a/include/asm-powerpc/dcr-mmio.h b/arch/powerpc/include/asm/dcr-mmio.h<br/>index acd491dbd45a..acd491dbd45a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/dcr-mmio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/dcr-mmio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/dcr-mmio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/dcr-mmio.h</a></div><div class='head'>diff --git a/include/asm-powerpc/dcr-native.h b/arch/powerpc/include/asm/dcr-native.h<br/>index 72d2b72c7390..72d2b72c7390 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/dcr-native.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/dcr-native.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/dcr-native.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/dcr-native.h</a></div><div class='head'>diff --git a/include/asm-powerpc/dcr-regs.h b/arch/powerpc/include/asm/dcr-regs.h<br/>index 29b0ecef980a..29b0ecef980a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/dcr-regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/dcr-regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/dcr-regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/dcr-regs.h</a></div><div class='head'>diff --git a/include/asm-powerpc/dcr.h b/arch/powerpc/include/asm/dcr.h<br/>index 53b283050ab3..d13fb68bb5c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/dcr.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/dcr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/dcr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/dcr.h</a></div><div class='hunk'>@@ -65,17 +65,13 @@ typedef dcr_host_mmio_t dcr_host_t;</div><div class='ctx'> #endif /* defined(CONFIG_PPC_DCR_NATIVE) &amp;&amp; defined(CONFIG_PPC_DCR_MMIO) */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * On CONFIG_PPC_MERGE, we have additional helpers to read the DCR</div><div class='del'>- * base from the device-tree</div><div class='add'>+ * additional helpers to read the DCR * base from the device-tree</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_PPC_MERGE</div><div class='ctx'> struct device_node;</div><div class='ctx'> extern unsigned int dcr_resource_start(struct device_node *np,</div><div class='ctx'> 				       unsigned int index);</div><div class='ctx'> extern unsigned int dcr_resource_len(struct device_node *np,</div><div class='ctx'> 				     unsigned int index);</div><div class='del'>-#endif /* CONFIG_PPC_MERGE */</div><div class='del'>-</div><div class='ctx'> #endif /* CONFIG_PPC_DCR */</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='head'>diff --git a/include/asm-powerpc/delay.h b/arch/powerpc/include/asm/delay.h<br/>index f9200a65c632..f9200a65c632 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/delay.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/delay.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/delay.h</a></div><div class='head'>diff --git a/include/asm-powerpc/device.h b/arch/powerpc/include/asm/device.h<br/>index 228ab2a315b9..228ab2a315b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/device.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/device.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/device.h</a></div><div class='head'>diff --git a/include/asm-powerpc/div64.h b/arch/powerpc/include/asm/div64.h<br/>index 6cd978cefb28..6cd978cefb28 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/div64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/div64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/div64.h</a></div><div class='head'>diff --git a/include/asm-powerpc/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h<br/>index c7ca45f97dd2..c7ca45f97dd2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/dma-mapping.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/dma-mapping.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/dma-mapping.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/dma-mapping.h</a></div><div class='head'>diff --git a/include/asm-powerpc/dma.h b/arch/powerpc/include/asm/dma.h<br/>index a7e06e25c708..a7e06e25c708 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/dma.h</a></div><div class='head'>diff --git a/include/asm-powerpc/edac.h b/arch/powerpc/include/asm/edac.h<br/>index 6ead88bbfbb8..6ead88bbfbb8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/edac.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/edac.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/edac.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/edac.h</a></div><div class='head'>diff --git a/include/asm-powerpc/eeh.h b/arch/powerpc/include/asm/eeh.h<br/>index b886bec67016..b886bec67016 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/eeh.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/eeh.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/eeh.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/eeh.h</a></div><div class='head'>diff --git a/include/asm-powerpc/eeh_event.h b/arch/powerpc/include/asm/eeh_event.h<br/>index cc3cb04539ac..cc3cb04539ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/eeh_event.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/eeh_event.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/eeh_event.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/eeh_event.h</a></div><div class='head'>diff --git a/include/asm-powerpc/elf.h b/arch/powerpc/include/asm/elf.h<br/>index 80d1f399ee51..64c6ee22eefd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/elf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/elf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/elf.h</a></div><div class='hunk'>@@ -409,6 +409,13 @@ do {									\</div><div class='ctx'> /* Keep this the last entry.  */</div><div class='ctx'> #define R_PPC64_NUM		107</div><div class='ctx'> </div><div class='add'>+/* There's actually a third entry here, but it's unused */</div><div class='add'>+struct ppc64_opd_entry</div><div class='add'>+{</div><div class='add'>+	unsigned long funcaddr;</div><div class='add'>+	unsigned long r2;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #ifdef  __KERNEL__</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SPU_BASE</div><div class='head'>diff --git a/include/asm-powerpc/emergency-restart.h b/arch/powerpc/include/asm/emergency-restart.h<br/>index 3711bd9d50bd..3711bd9d50bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/emergency-restart.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/emergency-restart.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/emergency-restart.h</a></div><div class='head'>diff --git a/include/asm-powerpc/errno.h b/arch/powerpc/include/asm/errno.h<br/>index 8c145fd17d86..8c145fd17d86 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/errno.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/errno.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/errno.h</a></div><div class='head'>diff --git a/include/asm-powerpc/exception.h b/arch/powerpc/include/asm/exception.h<br/>index 329148b5acc6..329148b5acc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/exception.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/exception.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/exception.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/exception.h</a></div><div class='head'>diff --git a/include/asm-powerpc/fb.h b/arch/powerpc/include/asm/fb.h<br/>index 411af8d17a69..411af8d17a69 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/fb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/fb.h</a></div><div class='head'>diff --git a/include/asm-powerpc/fcntl.h b/arch/powerpc/include/asm/fcntl.h<br/>index ce5c4516d404..ce5c4516d404 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/fcntl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/fcntl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/fcntl.h</a></div><div class='head'>diff --git a/include/asm-powerpc/feature-fixups.h b/arch/powerpc/include/asm/feature-fixups.h<br/>index a1029967620b..a1029967620b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/feature-fixups.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/feature-fixups.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/feature-fixups.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/feature-fixups.h</a></div><div class='head'>diff --git a/include/asm-powerpc/firmware.h b/arch/powerpc/include/asm/firmware.h<br/>index 3a179827528d..3a179827528d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/firmware.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/firmware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/firmware.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/firmware.h</a></div><div class='head'>diff --git a/include/asm-powerpc/fixmap.h b/arch/powerpc/include/asm/fixmap.h<br/>index 8428b38a3d30..8428b38a3d30 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/fixmap.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/fixmap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/fixmap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/fixmap.h</a></div><div class='head'>diff --git a/include/asm-powerpc/floppy.h b/arch/powerpc/include/asm/floppy.h<br/>index 24bd34c57e9d..24bd34c57e9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/floppy.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/floppy.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/floppy.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/floppy.h</a></div><div class='head'>diff --git a/include/asm-powerpc/fs_pd.h b/arch/powerpc/include/asm/fs_pd.h<br/>index 9361cd5342cc..9361cd5342cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/fs_pd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/fs_pd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/fs_pd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/fs_pd.h</a></div><div class='head'>diff --git a/include/asm-powerpc/fsl_gtm.h b/arch/powerpc/include/asm/fsl_gtm.h<br/>index 8e8c9b5032d3..8e8c9b5032d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/fsl_gtm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/fsl_gtm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/fsl_gtm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/fsl_gtm.h</a></div><div class='head'>diff --git a/include/asm-powerpc/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h<br/>index 303f5484c050..303f5484c050 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/fsl_lbc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/fsl_lbc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/fsl_lbc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/fsl_lbc.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ftrace.h b/arch/powerpc/include/asm/ftrace.h<br/>index de921326cca8..de921326cca8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ftrace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ftrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ftrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ftrace.h</a></div><div class='head'>diff --git a/include/asm-powerpc/futex.h b/arch/powerpc/include/asm/futex.h<br/>index 6d406c5c5de4..6d406c5c5de4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/futex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/futex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/futex.h</a></div><div class='head'>diff --git a/include/asm-powerpc/gpio.h b/arch/powerpc/include/asm/gpio.h<br/>index ea04632399d8..ea04632399d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/gpio.h</a></div><div class='head'>diff --git a/include/asm-powerpc/grackle.h b/arch/powerpc/include/asm/grackle.h<br/>index bd7812a519d4..bd7812a519d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/grackle.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/grackle.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/grackle.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/grackle.h</a></div><div class='head'>diff --git a/include/asm-powerpc/hardirq.h b/arch/powerpc/include/asm/hardirq.h<br/>index 288e14d53b7f..288e14d53b7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/hardirq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/hardirq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/hardirq.h</a></div><div class='head'>diff --git a/include/asm-powerpc/heathrow.h b/arch/powerpc/include/asm/heathrow.h<br/>index 93f54958a9d1..93f54958a9d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/heathrow.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/heathrow.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/heathrow.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/heathrow.h</a></div><div class='head'>diff --git a/include/asm-powerpc/highmem.h b/arch/powerpc/include/asm/highmem.h<br/>index 5d99b6489d56..5d99b6489d56 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/highmem.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/highmem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/highmem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/highmem.h</a></div><div class='head'>diff --git a/include/asm-powerpc/hugetlb.h b/arch/powerpc/include/asm/hugetlb.h<br/>index 26f0d0ab27a5..26f0d0ab27a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/hugetlb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/hugetlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/hugetlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/hugetlb.h</a></div><div class='head'>diff --git a/include/asm-powerpc/hvcall.h b/arch/powerpc/include/asm/hvcall.h<br/>index fbe2932fa9e9..6251a4b10be7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/hvcall.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/hvcall.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/hvcall.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/hvcall.h</a></div><div class='hunk'>@@ -291,6 +291,28 @@ struct hvcall_mpp_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int h_get_mpp(struct hvcall_mpp_data *);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC_PSERIES</div><div class='add'>+extern int CMO_PrPSP;</div><div class='add'>+extern int CMO_SecPSP;</div><div class='add'>+extern unsigned long CMO_PageSize;</div><div class='add'>+</div><div class='add'>+static inline int cmo_get_primary_psp(void)</div><div class='add'>+{</div><div class='add'>+	return CMO_PrPSP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cmo_get_secondary_psp(void)</div><div class='add'>+{</div><div class='add'>+	return CMO_SecPSP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long cmo_get_page_size(void)</div><div class='add'>+{</div><div class='add'>+	return CMO_PageSize;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PPC_PSERIES */</div><div class='add'>+</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif /* _ASM_POWERPC_HVCALL_H */</div><div class='head'>diff --git a/include/asm-powerpc/hvconsole.h b/arch/powerpc/include/asm/hvconsole.h<br/>index 35ea69e8121f..35ea69e8121f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/hvconsole.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/hvconsole.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/hvconsole.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/hvconsole.h</a></div><div class='head'>diff --git a/include/asm-powerpc/hvcserver.h b/arch/powerpc/include/asm/hvcserver.h<br/>index 67d7da3a4da4..67d7da3a4da4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/hvcserver.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/hvcserver.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/hvcserver.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/hvcserver.h</a></div><div class='head'>diff --git a/include/asm-powerpc/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h<br/>index f75a5fc64d2e..f75a5fc64d2e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/hw_irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/hw_irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/hw_irq.h</a></div><div class='head'>diff --git a/include/asm-powerpc/hydra.h b/arch/powerpc/include/asm/hydra.h<br/>index 1ad4eed07fbe..1ad4eed07fbe 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/hydra.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/hydra.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/hydra.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/hydra.h</a></div><div class='head'>diff --git a/include/asm-powerpc/i8259.h b/arch/powerpc/include/asm/i8259.h<br/>index db1362f8c603..105ade297aad 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/i8259.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/i8259.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/i8259.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/i8259.h</a></div><div class='hunk'>@@ -4,14 +4,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_MERGE</div><div class='ctx'> extern void i8259_init(struct device_node *node, unsigned long intack_addr);</div><div class='ctx'> extern unsigned int i8259_irq(void);</div><div class='ctx'> extern struct irq_host *i8259_get_host(void);</div><div class='del'>-#else</div><div class='del'>-extern void i8259_init(unsigned long intack_addr, int offset);</div><div class='del'>-extern int i8259_irq(void);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif /* _ASM_POWERPC_I8259_H */</div><div class='head'>diff --git a/include/asm-powerpc/ibmebus.h b/arch/powerpc/include/asm/ibmebus.h<br/>index 1a9d9aea21fa..1a9d9aea21fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ibmebus.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ibmebus.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ibmebus.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ibmebus.h</a></div><div class='head'>diff --git a/arch/powerpc/include/asm/ide.h b/arch/powerpc/include/asm/ide.h<br/>new file mode 100644<br/>index 000000000000..da01b20aea59<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ide.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ide.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 1994-1996 Linus Torvalds &amp; authors</div><div class='add'>+ *</div><div class='add'>+ *  This file contains the powerpc architecture specific IDE code.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_POWERPC_IDE_H</div><div class='add'>+#define _ASM_POWERPC_IDE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#define __ide_mm_insw(p, a, c)	readsw((void __iomem *)(p), (a), (c))</div><div class='add'>+#define __ide_mm_insl(p, a, c)	readsl((void __iomem *)(p), (a), (c))</div><div class='add'>+#define __ide_mm_outsw(p, a, c)	writesw((void __iomem *)(p), (a), (c))</div><div class='add'>+#define __ide_mm_outsl(p, a, c)	writesl((void __iomem *)(p), (a), (c))</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_POWERPC_IDE_H */</div><div class='head'>diff --git a/include/asm-powerpc/immap_86xx.h b/arch/powerpc/include/asm/immap_86xx.h<br/>index 0f165e59c326..0f165e59c326 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/immap_86xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/immap_86xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/immap_86xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/immap_86xx.h</a></div><div class='head'>diff --git a/include/asm-powerpc/immap_cpm2.h b/arch/powerpc/include/asm/immap_cpm2.h<br/>index 4080bab0468c..4080bab0468c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/immap_cpm2.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/immap_cpm2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/immap_cpm2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/immap_cpm2.h</a></div><div class='head'>diff --git a/include/asm-powerpc/immap_qe.h b/arch/powerpc/include/asm/immap_qe.h<br/>index 7b6f411db3e6..3c2fced3ac22 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/immap_qe.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/immap_qe.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/immap_qe.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/immap_qe.h</a></div><div class='hunk'>@@ -1,6 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-powerpc/immap_qe.h</div><div class='del'>- *</div><div class='ctx'>  * QUICC Engine (QE) Internal Memory Map.</div><div class='ctx'>  * The Internal Memory Map for devices with QE on them. This</div><div class='ctx'>  * is the superset of all QE devices (8360, etc.).</div><div class='head'>diff --git a/include/asm-powerpc/io-defs.h b/arch/powerpc/include/asm/io-defs.h<br/>index 44d7927aec69..44d7927aec69 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/io-defs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/io-defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/io-defs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/io-defs.h</a></div><div class='head'>diff --git a/include/asm-powerpc/io.h b/arch/powerpc/include/asm/io.h<br/>index 77c7fa025e65..77c7fa025e65 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/io.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ioctl.h b/arch/powerpc/include/asm/ioctl.h<br/>index 57d68304218b..57d68304218b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ioctl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ioctl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ioctl.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ioctls.h b/arch/powerpc/include/asm/ioctls.h<br/>index 279a6229584b..279a6229584b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ioctls.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ioctls.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ioctls.h</a></div><div class='head'>diff --git a/include/asm-powerpc/iommu.h b/arch/powerpc/include/asm/iommu.h<br/>index 51ecfef8d843..51ecfef8d843 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/iommu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/iommu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/iommu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iommu.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ipcbuf.h b/arch/powerpc/include/asm/ipcbuf.h<br/>index 2c3e1d94db1d..2c3e1d94db1d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ipcbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ipcbuf.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ipic.h b/arch/powerpc/include/asm/ipic.h<br/>index 8ff08be00146..fb59829983b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ipic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ipic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ipic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ipic.h</a></div><div class='hunk'>@@ -1,6 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-powerpc/ipic.h</div><div class='del'>- *</div><div class='ctx'>  * IPIC external definitions and structure.</div><div class='ctx'>  *</div><div class='ctx'>  * Maintainer: Kumar Gala &lt;galak@kernel.crashing.org&gt;</div><div class='hunk'>@@ -79,15 +77,8 @@ extern void ipic_disable_mcp(enum ipic_mcp_irq mcp_irq);</div><div class='ctx'> extern u32 ipic_get_mcp_status(void);</div><div class='ctx'> extern void ipic_clear_mcp_status(u32 mask);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_MERGE</div><div class='ctx'> extern struct ipic * ipic_init(struct device_node *node, unsigned int flags);</div><div class='ctx'> extern unsigned int ipic_get_irq(void);</div><div class='del'>-#else</div><div class='del'>-extern void ipic_init(phys_addr_t phys_addr, unsigned int flags,</div><div class='del'>-		unsigned int irq_offset,</div><div class='del'>-		unsigned char *senses, unsigned int senses_count);</div><div class='del'>-extern int ipic_get_irq(void);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_IPIC_H__ */</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='head'>diff --git a/include/asm-powerpc/irq.h b/arch/powerpc/include/asm/irq.h<br/>index 1ef8e304e0ea..a372f76836c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/irq.h</a></div><div class='hunk'>@@ -25,8 +25,6 @@</div><div class='ctx'> </div><div class='ctx'> extern atomic_t ppc_n_lost_interrupts;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_MERGE</div><div class='del'>-</div><div class='ctx'> /* This number is used when no interrupt has been assigned */</div><div class='ctx'> #define NO_IRQ			(0)</div><div class='ctx'> </div><div class='hunk'>@@ -326,292 +324,6 @@ static __inline__ int irq_canonicalize(int irq)</div><div class='ctx'> 	return irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#else /* CONFIG_PPC_MERGE */</div><div class='del'>-</div><div class='del'>-/* This number is used when no interrupt has been assigned */</div><div class='del'>-#define NO_IRQ			(-1)</div><div class='del'>-#define NO_IRQ_IGNORE		(-2)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These constants are used for passing information about interrupt</div><div class='del'>- * signal polarity and level/edge sensing to the low-level PIC chip</div><div class='del'>- * drivers.</div><div class='del'>- */</div><div class='del'>-#define IRQ_SENSE_MASK		0x1</div><div class='del'>-#define IRQ_SENSE_LEVEL		0x1	/* interrupt on active level */</div><div class='del'>-#define IRQ_SENSE_EDGE		0x0	/* interrupt triggered by edge */</div><div class='del'>-</div><div class='del'>-#define IRQ_POLARITY_MASK	0x2</div><div class='del'>-#define IRQ_POLARITY_POSITIVE	0x2	/* high level or low-&gt;high edge */</div><div class='del'>-#define IRQ_POLARITY_NEGATIVE	0x0	/* low level or high-&gt;low edge */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_40x)</div><div class='del'>-#include &lt;asm/ibm4xx.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef NR_BOARD_IRQS</div><div class='del'>-#define NR_BOARD_IRQS 0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef UIC_WIDTH /* Number of interrupts per device */</div><div class='del'>-#define UIC_WIDTH 32</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef NR_UICS /* number  of UIC devices */</div><div class='del'>-#define NR_UICS 1</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined (CONFIG_403)</div><div class='del'>-/*</div><div class='del'>- * The PowerPC 403 cores' Asynchronous Interrupt Controller (AIC) has</div><div class='del'>- * 32 possible interrupts, a majority of which are not implemented on</div><div class='del'>- * all cores. There are six configurable, external interrupt pins and</div><div class='del'>- * there are eight internal interrupts for the on-chip serial port</div><div class='del'>- * (SPU), DMA controller, and JTAG controller.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define	NR_AIC_IRQS 32</div><div class='del'>-#define	NR_IRQS	 (NR_AIC_IRQS + NR_BOARD_IRQS)</div><div class='del'>-</div><div class='del'>-#elif !defined (CONFIG_403)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  The PowerPC 405 cores' Universal Interrupt Controller (UIC) has 32</div><div class='del'>- * possible interrupts as well. There are seven, configurable external</div><div class='del'>- * interrupt pins and there are 17 internal interrupts for the on-chip</div><div class='del'>- * serial port, DMA controller, on-chip Ethernet controller, PCI, etc.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define NR_UIC_IRQS UIC_WIDTH</div><div class='del'>-#define NR_IRQS		((NR_UIC_IRQS * NR_UICS) + NR_BOARD_IRQS)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#elif defined(CONFIG_44x)</div><div class='del'>-#include &lt;asm/ibm44x.h&gt;</div><div class='del'>-</div><div class='del'>-#define	NR_UIC_IRQS	32</div><div class='del'>-#define	NR_IRQS		((NR_UIC_IRQS * NR_UICS) + NR_BOARD_IRQS)</div><div class='del'>-</div><div class='del'>-#elif defined(CONFIG_8xx)</div><div class='del'>-</div><div class='del'>-/* Now include the board configuration specific associations.</div><div class='del'>-*/</div><div class='del'>-#include &lt;asm/mpc8xx.h&gt;</div><div class='del'>-</div><div class='del'>-/* The MPC8xx cores have 16 possible interrupts.  There are eight</div><div class='del'>- * possible level sensitive interrupts assigned and generated internally</div><div class='del'>- * from such devices as CPM, PCMCIA, RTC, PIT, TimeBase and Decrementer.</div><div class='del'>- * There are eight external interrupts (IRQs) that can be configured</div><div class='del'>- * as either level or edge sensitive.</div><div class='del'>- *</div><div class='del'>- * On some implementations, there is also the possibility of an 8259</div><div class='del'>- * through the PCI and PCI-ISA bridges.</div><div class='del'>- *</div><div class='del'>- * We are "flattening" the interrupt vectors of the cascaded CPM</div><div class='del'>- * and 8259 interrupt controllers so that we can uniquely identify</div><div class='del'>- * any interrupt source with a single integer.</div><div class='del'>- */</div><div class='del'>-#define NR_SIU_INTS	16</div><div class='del'>-#define NR_CPM_INTS	32</div><div class='del'>-#ifndef NR_8259_INTS</div><div class='del'>-#define NR_8259_INTS 0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define SIU_IRQ_OFFSET		0</div><div class='del'>-#define CPM_IRQ_OFFSET		(SIU_IRQ_OFFSET + NR_SIU_INTS)</div><div class='del'>-#define I8259_IRQ_OFFSET	(CPM_IRQ_OFFSET + NR_CPM_INTS)</div><div class='del'>-</div><div class='del'>-#define NR_IRQS	(NR_SIU_INTS + NR_CPM_INTS + NR_8259_INTS)</div><div class='del'>-</div><div class='del'>-/* These values must be zero-based and map 1:1 with the SIU configuration.</div><div class='del'>- * They are used throughout the 8xx I/O subsystem to generate</div><div class='del'>- * interrupt masks, flags, and other control patterns.  This is why the</div><div class='del'>- * current kernel assumption of the 8259 as the base controller is such</div><div class='del'>- * a pain in the butt.</div><div class='del'>- */</div><div class='del'>-#define	SIU_IRQ0	(0)	/* Highest priority */</div><div class='del'>-#define	SIU_LEVEL0	(1)</div><div class='del'>-#define	SIU_IRQ1	(2)</div><div class='del'>-#define	SIU_LEVEL1	(3)</div><div class='del'>-#define	SIU_IRQ2	(4)</div><div class='del'>-#define	SIU_LEVEL2	(5)</div><div class='del'>-#define	SIU_IRQ3	(6)</div><div class='del'>-#define	SIU_LEVEL3	(7)</div><div class='del'>-#define	SIU_IRQ4	(8)</div><div class='del'>-#define	SIU_LEVEL4	(9)</div><div class='del'>-#define	SIU_IRQ5	(10)</div><div class='del'>-#define	SIU_LEVEL5	(11)</div><div class='del'>-#define	SIU_IRQ6	(12)</div><div class='del'>-#define	SIU_LEVEL6	(13)</div><div class='del'>-#define	SIU_IRQ7	(14)</div><div class='del'>-#define	SIU_LEVEL7	(15)</div><div class='del'>-</div><div class='del'>-#define MPC8xx_INT_FEC1		SIU_LEVEL1</div><div class='del'>-#define MPC8xx_INT_FEC2		SIU_LEVEL3</div><div class='del'>-</div><div class='del'>-#define MPC8xx_INT_SCC1		(CPM_IRQ_OFFSET + CPMVEC_SCC1)</div><div class='del'>-#define MPC8xx_INT_SCC2		(CPM_IRQ_OFFSET + CPMVEC_SCC2)</div><div class='del'>-#define MPC8xx_INT_SCC3		(CPM_IRQ_OFFSET + CPMVEC_SCC3)</div><div class='del'>-#define MPC8xx_INT_SCC4		(CPM_IRQ_OFFSET + CPMVEC_SCC4)</div><div class='del'>-#define MPC8xx_INT_SMC1		(CPM_IRQ_OFFSET + CPMVEC_SMC1)</div><div class='del'>-#define MPC8xx_INT_SMC2		(CPM_IRQ_OFFSET + CPMVEC_SMC2)</div><div class='del'>-</div><div class='del'>-/* The internal interrupts we can configure as we see fit.</div><div class='del'>- * My personal preference is CPM at level 2, which puts it above the</div><div class='del'>- * MBX PCI/ISA/IDE interrupts.</div><div class='del'>- */</div><div class='del'>-#ifndef PIT_INTERRUPT</div><div class='del'>-#define PIT_INTERRUPT		SIU_LEVEL0</div><div class='del'>-#endif</div><div class='del'>-#ifndef	CPM_INTERRUPT</div><div class='del'>-#define CPM_INTERRUPT		SIU_LEVEL2</div><div class='del'>-#endif</div><div class='del'>-#ifndef	PCMCIA_INTERRUPT</div><div class='del'>-#define PCMCIA_INTERRUPT	SIU_LEVEL6</div><div class='del'>-#endif</div><div class='del'>-#ifndef	DEC_INTERRUPT</div><div class='del'>-#define DEC_INTERRUPT		SIU_LEVEL7</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Some internal interrupt registers use an 8-bit mask for the interrupt</div><div class='del'>- * level instead of a number.</div><div class='del'>- */</div><div class='del'>-#define	mk_int_int_mask(IL) (1 &lt;&lt; (7 - (IL/2)))</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_40x + CONFIG_8xx */</div><div class='del'>-/*</div><div class='del'>- * this is the # irq's for all ppc arch's (pmac/chrp/prep)</div><div class='del'>- * so it is the max of them all</div><div class='del'>- */</div><div class='del'>-#define NR_IRQS			256</div><div class='del'>-#define __DO_IRQ_CANON	1</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_8260</div><div class='del'>-</div><div class='del'>-#define NUM_8259_INTERRUPTS	16</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_8260 */</div><div class='del'>-</div><div class='del'>-/* The 8260 has an internal interrupt controller with a maximum of</div><div class='del'>- * 64 IRQs.  We will use NR_IRQs from above since it is large enough.</div><div class='del'>- * Don't be confused by the 8260 documentation where they list an</div><div class='del'>- * "interrupt number" and "interrupt vector".  We are only interested</div><div class='del'>- * in the interrupt vector.  There are "reserved" holes where the</div><div class='del'>- * vector number increases, but the interrupt number in the table does not.</div><div class='del'>- * (Document errata updates have fixed this...make sure you have up to</div><div class='del'>- * date processor documentation -- Dan).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CPM_IRQ_OFFSET</div><div class='del'>-#define CPM_IRQ_OFFSET	0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define NR_CPM_INTS	64</div><div class='del'>-</div><div class='del'>-#define	SIU_INT_ERROR		((uint)0x00 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_I2C		((uint)0x01 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_SPI		((uint)0x02 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_RISC		((uint)0x03 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_SMC1		((uint)0x04 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_SMC2		((uint)0x05 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_IDMA1		((uint)0x06 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_IDMA2		((uint)0x07 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_IDMA3		((uint)0x08 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_IDMA4		((uint)0x09 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_SDMA		((uint)0x0a + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_USB		((uint)0x0b + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_TIMER1		((uint)0x0c + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_TIMER2		((uint)0x0d + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_TIMER3		((uint)0x0e + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_TIMER4		((uint)0x0f + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_TMCNT		((uint)0x10 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PIT		((uint)0x11 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PCI		((uint)0x12 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_IRQ1		((uint)0x13 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_IRQ2		((uint)0x14 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_IRQ3		((uint)0x15 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_IRQ4		((uint)0x16 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_IRQ5		((uint)0x17 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_IRQ6		((uint)0x18 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_IRQ7		((uint)0x19 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_FCC1		((uint)0x20 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_FCC2		((uint)0x21 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_FCC3		((uint)0x22 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_MCC1		((uint)0x24 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_MCC2		((uint)0x25 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_SCC1		((uint)0x28 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_SCC2		((uint)0x29 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_SCC3		((uint)0x2a + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_SCC4		((uint)0x2b + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PC15		((uint)0x30 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PC14		((uint)0x31 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PC13		((uint)0x32 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PC12		((uint)0x33 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PC11		((uint)0x34 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PC10		((uint)0x35 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PC9		((uint)0x36 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PC8		((uint)0x37 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PC7		((uint)0x38 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PC6		((uint)0x39 + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PC5		((uint)0x3a + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PC4		((uint)0x3b + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PC3		((uint)0x3c + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PC2		((uint)0x3d + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PC1		((uint)0x3e + CPM_IRQ_OFFSET)</div><div class='del'>-#define	SIU_INT_PC0		((uint)0x3f + CPM_IRQ_OFFSET)</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_8260 */</div><div class='del'>-</div><div class='del'>-#endif /* Whatever way too big #ifdef */</div><div class='del'>-</div><div class='del'>-#define NR_MASK_WORDS	((NR_IRQS + 31) / 32)</div><div class='del'>-/* pedantic: these are long because they are used with set_bit --RR */</div><div class='del'>-extern unsigned long ppc_cached_irq_mask[NR_MASK_WORDS];</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Because many systems have two overlapping names spaces for</div><div class='del'>- * interrupts (ISA and XICS for example), and the ISA interrupts</div><div class='del'>- * have historically not been easy to renumber, we allow ISA</div><div class='del'>- * interrupts to take values 0 - 15, and shift up the remaining</div><div class='del'>- * interrupts by 0x10.</div><div class='del'>- */</div><div class='del'>-#define NUM_ISA_INTERRUPTS	0x10</div><div class='del'>-extern int __irq_offset_value;</div><div class='del'>-</div><div class='del'>-static inline int irq_offset_up(int irq)</div><div class='del'>-{</div><div class='del'>-	return(irq + __irq_offset_value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int irq_offset_down(int irq)</div><div class='del'>-{</div><div class='del'>-	return(irq - __irq_offset_value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int irq_offset_value(void)</div><div class='del'>-{</div><div class='del'>-	return __irq_offset_value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef __DO_IRQ_CANON</div><div class='del'>-extern int ppc_do_canonicalize_irqs;</div><div class='del'>-#else</div><div class='del'>-#define ppc_do_canonicalize_irqs	0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static __inline__ int irq_canonicalize(int irq)</div><div class='del'>-{</div><div class='del'>-	if (ppc_do_canonicalize_irqs &amp;&amp; irq == 2)</div><div class='del'>-		irq = 9;</div><div class='del'>-	return irq;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_PPC_MERGE */</div><div class='del'>-</div><div class='ctx'> extern int distribute_irqs;</div><div class='ctx'> </div><div class='ctx'> struct irqaction;</div><div class='head'>diff --git a/include/asm-powerpc/irq_regs.h b/arch/powerpc/include/asm/irq_regs.h<br/>index ba94b51a0a70..ba94b51a0a70 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/irq_regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/irq_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/irq_regs.h</a></div><div class='head'>diff --git a/include/asm-powerpc/irqflags.h b/arch/powerpc/include/asm/irqflags.h<br/>index cc6fdba33660..5f68ecfdf516 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/irqflags.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/irqflags.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/irqflags.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/irqflags.h</a></div><div class='hunk'>@@ -1,6 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-powerpc/irqflags.h</div><div class='del'>- *</div><div class='ctx'>  * IRQ flags handling</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _ASM_IRQFLAGS_H</div><div class='hunk'>@@ -10,7 +8,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Get definitions for raw_local_save_flags(x), etc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm-powerpc/hw_irq.h&gt;</div><div class='add'>+#include &lt;asm/hw_irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> #ifdef CONFIG_TRACE_IRQFLAGS</div><div class='hunk'>@@ -22,7 +20,7 @@</div><div class='ctx'> #define TRACE_ENABLE_INTS	bl .trace_hardirqs_on</div><div class='ctx'> #define TRACE_DISABLE_INTS	bl .trace_hardirqs_off</div><div class='ctx'> #define TRACE_AND_RESTORE_IRQ_PARTIAL(en,skip)	\</div><div class='del'>-	cmpdi	en, 0;				\</div><div class='add'>+	cmpdi	en,0;				\</div><div class='ctx'> 	bne	95f;				\</div><div class='ctx'> 	stb	en,PACASOFTIRQEN(r13);		\</div><div class='ctx'> 	bl	.trace_hardirqs_off;		\</div><div class='hunk'>@@ -31,7 +29,8 @@</div><div class='ctx'> 	li	en,1;</div><div class='ctx'> #define TRACE_AND_RESTORE_IRQ(en)		\</div><div class='ctx'> 	TRACE_AND_RESTORE_IRQ_PARTIAL(en,96f);	\</div><div class='del'>-96:	stb	en,PACASOFTIRQEN(r13)</div><div class='add'>+	stb	en,PACASOFTIRQEN(r13);	        \</div><div class='add'>+96:</div><div class='ctx'> #else</div><div class='ctx'> #define TRACE_ENABLE_INTS</div><div class='ctx'> #define TRACE_DISABLE_INTS</div><div class='head'>diff --git a/include/asm-powerpc/iseries/alpaca.h b/arch/powerpc/include/asm/iseries/alpaca.h<br/>index c0cce6727a69..c0cce6727a69 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/iseries/alpaca.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/iseries/alpaca.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/iseries/alpaca.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/alpaca.h</a></div><div class='head'>diff --git a/include/asm-powerpc/iseries/hv_call.h b/arch/powerpc/include/asm/iseries/hv_call.h<br/>index 162d653ad51f..162d653ad51f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/iseries/hv_call.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/iseries/hv_call.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/iseries/hv_call.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/hv_call.h</a></div><div class='head'>diff --git a/include/asm-powerpc/iseries/hv_call_event.h b/arch/powerpc/include/asm/iseries/hv_call_event.h<br/>index cc029d388e11..cc029d388e11 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/iseries/hv_call_event.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/iseries/hv_call_event.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/iseries/hv_call_event.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/hv_call_event.h</a></div><div class='head'>diff --git a/include/asm-powerpc/iseries/hv_call_sc.h b/arch/powerpc/include/asm/iseries/hv_call_sc.h<br/>index f5d210959250..f5d210959250 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/iseries/hv_call_sc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/iseries/hv_call_sc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/iseries/hv_call_sc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/hv_call_sc.h</a></div><div class='head'>diff --git a/include/asm-powerpc/iseries/hv_call_xm.h b/arch/powerpc/include/asm/iseries/hv_call_xm.h<br/>index 392ac3f54df0..392ac3f54df0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/iseries/hv_call_xm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/iseries/hv_call_xm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/iseries/hv_call_xm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/hv_call_xm.h</a></div><div class='head'>diff --git a/include/asm-powerpc/iseries/hv_lp_config.h b/arch/powerpc/include/asm/iseries/hv_lp_config.h<br/>index a006fd1e4a2c..a006fd1e4a2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/iseries/hv_lp_config.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/iseries/hv_lp_config.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/iseries/hv_lp_config.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/hv_lp_config.h</a></div><div class='head'>diff --git a/include/asm-powerpc/iseries/hv_lp_event.h b/arch/powerpc/include/asm/iseries/hv_lp_event.h<br/>index 8f5da7d77202..8f5da7d77202 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/iseries/hv_lp_event.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/iseries/hv_lp_event.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/iseries/hv_lp_event.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/hv_lp_event.h</a></div><div class='head'>diff --git a/include/asm-powerpc/iseries/hv_types.h b/arch/powerpc/include/asm/iseries/hv_types.h<br/>index c3e6d2a1d1c3..c3e6d2a1d1c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/iseries/hv_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/iseries/hv_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/iseries/hv_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/hv_types.h</a></div><div class='head'>diff --git a/include/asm-powerpc/iseries/iommu.h b/arch/powerpc/include/asm/iseries/iommu.h<br/>index c59ee7e4bed1..c59ee7e4bed1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/iseries/iommu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/iseries/iommu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/iseries/iommu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/iommu.h</a></div><div class='head'>diff --git a/include/asm-powerpc/iseries/it_lp_queue.h b/arch/powerpc/include/asm/iseries/it_lp_queue.h<br/>index 428278838821..428278838821 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/iseries/it_lp_queue.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/iseries/it_lp_queue.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/iseries/it_lp_queue.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/it_lp_queue.h</a></div><div class='head'>diff --git a/include/asm-powerpc/iseries/lpar_map.h b/arch/powerpc/include/asm/iseries/lpar_map.h<br/>index 5e9f3e128ee2..5e9f3e128ee2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/iseries/lpar_map.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/iseries/lpar_map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/iseries/lpar_map.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/lpar_map.h</a></div><div class='head'>diff --git a/include/asm-powerpc/iseries/mf.h b/arch/powerpc/include/asm/iseries/mf.h<br/>index eb851a9c9e5c..eb851a9c9e5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/iseries/mf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/iseries/mf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/iseries/mf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/mf.h</a></div><div class='head'>diff --git a/include/asm-powerpc/iseries/vio.h b/arch/powerpc/include/asm/iseries/vio.h<br/>index f9ac0d00b951..f9ac0d00b951 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/iseries/vio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/iseries/vio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/iseries/vio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/iseries/vio.h</a></div><div class='head'>diff --git a/include/asm-powerpc/kdebug.h b/arch/powerpc/include/asm/kdebug.h<br/>index ae6d206728af..ae6d206728af 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/kdebug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/kdebug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kdebug.h</a></div><div class='head'>diff --git a/include/asm-powerpc/kdump.h b/arch/powerpc/include/asm/kdump.h<br/>index f6c93c716898..f6c93c716898 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/kdump.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/kdump.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kdump.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kdump.h</a></div><div class='head'>diff --git a/include/asm-powerpc/kexec.h b/arch/powerpc/include/asm/kexec.h<br/>index acdcdc66f1b6..3736d9b33289 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/kexec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/kexec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kexec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kexec.h</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define KEXEC_CONTROL_CODE_SIZE 4096</div><div class='add'>+#define KEXEC_CONTROL_PAGE_SIZE 4096</div><div class='ctx'> </div><div class='ctx'> /* The native architecture */</div><div class='ctx'> #ifdef __powerpc64__</div><div class='head'>diff --git a/include/asm-powerpc/keylargo.h b/arch/powerpc/include/asm/keylargo.h<br/>index d8520ef121f9..d8520ef121f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/keylargo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/keylargo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/keylargo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/keylargo.h</a></div><div class='head'>diff --git a/include/asm-powerpc/kgdb.h b/arch/powerpc/include/asm/kgdb.h<br/>index 1399caf719ae..edd217006d27 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/kgdb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/kgdb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kgdb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kgdb.h</a></div><div class='hunk'>@@ -1,6 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-powerpc/kgdb.h</div><div class='del'>- *</div><div class='ctx'>  * The PowerPC (32/64) specific defines / externs for KGDB.  Based on</div><div class='ctx'>  * the previous 32bit and 64bit specific files, which had the following</div><div class='ctx'>  * copyrights:</div><div class='head'>diff --git a/include/asm-powerpc/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h<br/>index b6bac6f61c16..b6bac6f61c16 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/kmap_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/kmap_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kmap_types.h</a></div><div class='head'>diff --git a/include/asm-powerpc/kprobes.h b/arch/powerpc/include/asm/kprobes.h<br/>index d0e7701fa1f6..d0e7701fa1f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/kprobes.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/kprobes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kprobes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kprobes.h</a></div><div class='head'>diff --git a/include/asm-powerpc/kvm.h b/arch/powerpc/include/asm/kvm.h<br/>index f993e4198d5c..f993e4198d5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/kvm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/kvm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kvm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kvm.h</a></div><div class='head'>diff --git a/include/asm-powerpc/kvm_asm.h b/arch/powerpc/include/asm/kvm_asm.h<br/>index 2197764796d9..2197764796d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/kvm_asm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/kvm_asm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kvm_asm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kvm_asm.h</a></div><div class='head'>diff --git a/include/asm-powerpc/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h<br/>index 2655e2a4831e..2655e2a4831e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/kvm_host.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/kvm_host.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kvm_host.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kvm_host.h</a></div><div class='head'>diff --git a/include/asm-powerpc/kvm_para.h b/arch/powerpc/include/asm/kvm_para.h<br/>index 2d48f6a63d0b..2d48f6a63d0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/kvm_para.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/kvm_para.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kvm_para.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kvm_para.h</a></div><div class='head'>diff --git a/include/asm-powerpc/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h<br/>index a8b068792260..a8b068792260 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/kvm_ppc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/kvm_ppc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kvm_ppc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/kvm_ppc.h</a></div><div class='head'>diff --git a/include/asm-powerpc/libata-portmap.h b/arch/powerpc/include/asm/libata-portmap.h<br/>index 4d8518049f4d..4d8518049f4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/libata-portmap.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/libata-portmap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/libata-portmap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/libata-portmap.h</a></div><div class='head'>diff --git a/include/asm-powerpc/linkage.h b/arch/powerpc/include/asm/linkage.h<br/>index e1c4ac1cc4ba..e1c4ac1cc4ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/linkage.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/linkage.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/linkage.h</a></div><div class='head'>diff --git a/include/asm-powerpc/lmb.h b/arch/powerpc/include/asm/lmb.h<br/>index 6f5fdf0a19ae..6f5fdf0a19ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/lmb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/lmb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/lmb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/lmb.h</a></div><div class='head'>diff --git a/include/asm-powerpc/local.h b/arch/powerpc/include/asm/local.h<br/>index 612d83276653..612d83276653 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/local.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/local.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/local.h</a></div><div class='head'>diff --git a/include/asm-powerpc/lppaca.h b/arch/powerpc/include/asm/lppaca.h<br/>index 2fe268b10333..2fe268b10333 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/lppaca.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/lppaca.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/lppaca.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/lppaca.h</a></div><div class='head'>diff --git a/include/asm-powerpc/lv1call.h b/arch/powerpc/include/asm/lv1call.h<br/>index 81713acf7529..81713acf7529 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/lv1call.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/lv1call.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/lv1call.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/lv1call.h</a></div><div class='head'>diff --git a/include/asm-powerpc/machdep.h b/arch/powerpc/include/asm/machdep.h<br/>index 893aafd87fde..893aafd87fde 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/machdep.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/machdep.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/machdep.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/machdep.h</a></div><div class='head'>diff --git a/include/asm-powerpc/macio.h b/arch/powerpc/include/asm/macio.h<br/>index 079c06eae446..079c06eae446 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/macio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/macio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/macio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/macio.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mc146818rtc.h b/arch/powerpc/include/asm/mc146818rtc.h<br/>index f2741c8b59a1..f2741c8b59a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mc146818rtc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mc146818rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mc146818rtc.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mediabay.h b/arch/powerpc/include/asm/mediabay.h<br/>index b2efb3325808..b2efb3325808 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mediabay.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mediabay.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mediabay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mediabay.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mman.h b/arch/powerpc/include/asm/mman.h<br/>index 9209f755763e..9209f755763e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mman.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mman.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mman.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mmu-40x.h b/arch/powerpc/include/asm/mmu-40x.h<br/>index 3d108676584c..3d108676584c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mmu-40x.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mmu-40x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mmu-40x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmu-40x.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mmu-44x.h b/arch/powerpc/include/asm/mmu-44x.h<br/>index a825524c981a..a825524c981a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mmu-44x.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mmu-44x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mmu-44x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmu-44x.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mmu-8xx.h b/arch/powerpc/include/asm/mmu-8xx.h<br/>index 9db877eb88db..9db877eb88db 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mmu-8xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mmu-8xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mmu-8xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmu-8xx.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mmu-fsl-booke.h b/arch/powerpc/include/asm/mmu-fsl-booke.h<br/>index 925d93cf64d8..925d93cf64d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mmu-fsl-booke.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mmu-fsl-booke.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mmu-fsl-booke.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmu-fsl-booke.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mmu-hash32.h b/arch/powerpc/include/asm/mmu-hash32.h<br/>index 16b1a1e77e64..16b1a1e77e64 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mmu-hash32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mmu-hash32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mmu-hash32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmu-hash32.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mmu-hash64.h b/arch/powerpc/include/asm/mmu-hash64.h<br/>index 19c7a9403490..c2df53c5ceb9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mmu-hash64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mmu-hash64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mmu-hash64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmu-hash64.h</a></div><div class='hunk'>@@ -278,7 +278,7 @@ extern int hash_huge_page(struct mm_struct *mm, unsigned long access,</div><div class='ctx'> 			  unsigned long trap);</div><div class='ctx'> </div><div class='ctx'> extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend,</div><div class='del'>-			     unsigned long pstart, unsigned long mode,</div><div class='add'>+			     unsigned long pstart, unsigned long prot,</div><div class='ctx'> 			     int psize, int ssize);</div><div class='ctx'> extern void set_huge_psize(int psize);</div><div class='ctx'> extern void add_gpage(unsigned long addr, unsigned long page_size,</div><div class='head'>diff --git a/include/asm-powerpc/mmu.h b/arch/powerpc/include/asm/mmu.h<br/>index 4c0e1b4f975c..4c0e1b4f975c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mmu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mmu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmu.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h<br/>index 9102b8bf0ead..6b993ef452ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mmu_context.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mmu_context.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -147,7 +147,6 @@ static inline void get_mmu_context(struct mm_struct *mm)</div><div class='ctx'> static inline int init_new_context(struct task_struct *t, struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	mm-&gt;context.id = NO_CONTEXT;</div><div class='del'>-	mm-&gt;context.vdso_base = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-powerpc/mmzone.h b/arch/powerpc/include/asm/mmzone.h<br/>index 19f299b7e256..19f299b7e256 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mmzone.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mmzone.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mmzone.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mmzone.h</a></div><div class='head'>diff --git a/include/asm-powerpc/module.h b/arch/powerpc/include/asm/module.h<br/>index e5f14b13ccf0..e5f14b13ccf0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/module.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/module.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/module.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mpc512x.h b/arch/powerpc/include/asm/mpc512x.h<br/>index c48a1658eeac..c48a1658eeac 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mpc512x.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mpc512x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mpc512x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mpc512x.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mpc52xx.h b/arch/powerpc/include/asm/mpc52xx.h<br/>index 81ef10b6b672..81ef10b6b672 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mpc52xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mpc52xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mpc52xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mpc52xx.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mpc52xx_psc.h b/arch/powerpc/include/asm/mpc52xx_psc.h<br/>index 8917ed630565..8917ed630565 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mpc52xx_psc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mpc52xx_psc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mpc52xx_psc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mpc52xx_psc.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mpc6xx.h b/arch/powerpc/include/asm/mpc6xx.h<br/>index effc2291beb2..effc2291beb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mpc6xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mpc6xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mpc6xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mpc6xx.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mpc8260.h b/arch/powerpc/include/asm/mpc8260.h<br/>index 03317e1e6185..03317e1e6185 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mpc8260.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mpc8260.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mpc8260.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mpc8260.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mpc86xx.h b/arch/powerpc/include/asm/mpc86xx.h<br/>index 15f650f987e7..15f650f987e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mpc86xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mpc86xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mpc86xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mpc86xx.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mpc8xx.h b/arch/powerpc/include/asm/mpc8xx.h<br/>index 98f3c4f17328..98f3c4f17328 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mpc8xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mpc8xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mpc8xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mpc8xx.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mpic.h b/arch/powerpc/include/asm/mpic.h<br/>index fe566a348a86..fe566a348a86 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mpic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mpic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mpic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mpic.h</a></div><div class='head'>diff --git a/include/asm-powerpc/msgbuf.h b/arch/powerpc/include/asm/msgbuf.h<br/>index dd76743c7537..dd76743c7537 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/msgbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/msgbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/msgbuf.h</a></div><div class='head'>diff --git a/include/asm-powerpc/mutex.h b/arch/powerpc/include/asm/mutex.h<br/>index 458c1f7fbc18..458c1f7fbc18 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/mutex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/mutex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/mutex.h</a></div><div class='head'>diff --git a/include/asm-powerpc/nvram.h b/arch/powerpc/include/asm/nvram.h<br/>index efde5ac82f7b..efde5ac82f7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/nvram.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/nvram.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/nvram.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/nvram.h</a></div><div class='head'>diff --git a/include/asm-powerpc/of_device.h b/arch/powerpc/include/asm/of_device.h<br/>index 3c123990ca2e..3c123990ca2e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/of_device.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/of_device.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/of_device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/of_device.h</a></div><div class='head'>diff --git a/include/asm-powerpc/of_platform.h b/arch/powerpc/include/asm/of_platform.h<br/>index 18659ef72139..18659ef72139 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/of_platform.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/of_platform.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/of_platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/of_platform.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ohare.h b/arch/powerpc/include/asm/ohare.h<br/>index 0d030f9dea24..0d030f9dea24 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ohare.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ohare.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ohare.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ohare.h</a></div><div class='head'>diff --git a/include/asm-powerpc/oprofile_impl.h b/arch/powerpc/include/asm/oprofile_impl.h<br/>index 95035c602ba6..95035c602ba6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/oprofile_impl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/oprofile_impl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/oprofile_impl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/oprofile_impl.h</a></div><div class='head'>diff --git a/include/asm-powerpc/pSeries_reconfig.h b/arch/powerpc/include/asm/pSeries_reconfig.h<br/>index e482e5352e69..e482e5352e69 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pSeries_reconfig.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pSeries_reconfig.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pSeries_reconfig.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pSeries_reconfig.h</a></div><div class='head'>diff --git a/include/asm-powerpc/paca.h b/arch/powerpc/include/asm/paca.h<br/>index 7b564444ff61..6493a395508b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/paca.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/paca.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/paca.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/paca.h</a></div><div class='hunk'>@@ -1,6 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-powerpc/paca.h</div><div class='del'>- *</div><div class='ctx'>  * This control block defines the PACA which defines the processor</div><div class='ctx'>  * specific data for each logical processor on the system.</div><div class='ctx'>  * There are some pointers defined that are utilized by PLIC.</div><div class='head'>diff --git a/include/asm-powerpc/page.h b/arch/powerpc/include/asm/page.h<br/>index e088545cb3f5..e088545cb3f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/page.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/page.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/page.h</a></div><div class='head'>diff --git a/include/asm-powerpc/page_32.h b/arch/powerpc/include/asm/page_32.h<br/>index ebfae530a379..ebfae530a379 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/page_32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/page_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/page_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/page_32.h</a></div><div class='head'>diff --git a/include/asm-powerpc/page_64.h b/arch/powerpc/include/asm/page_64.h<br/>index 043bfdfe4f73..043bfdfe4f73 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/page_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/page_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/page_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/page_64.h</a></div><div class='head'>diff --git a/include/asm-powerpc/param.h b/arch/powerpc/include/asm/param.h<br/>index 094f63d4d5ca..094f63d4d5ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/param.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/param.h</a></div><div class='head'>diff --git a/include/asm-powerpc/parport.h b/arch/powerpc/include/asm/parport.h<br/>index 414c50e2e881..414c50e2e881 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/parport.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/parport.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/parport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/parport.h</a></div><div class='head'>diff --git a/include/asm-powerpc/pasemi_dma.h b/arch/powerpc/include/asm/pasemi_dma.h<br/>index 19fd7933e2d9..19fd7933e2d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pasemi_dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pasemi_dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pasemi_dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pasemi_dma.h</a></div><div class='head'>diff --git a/include/asm-powerpc/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h<br/>index ae2ea803a0f2..ae2ea803a0f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pci-bridge.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pci-bridge.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pci-bridge.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pci-bridge.h</a></div><div class='head'>diff --git a/include/asm-powerpc/pci.h b/arch/powerpc/include/asm/pci.h<br/>index a05a942b1c25..a05a942b1c25 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pci.h</a></div><div class='head'>diff --git a/include/asm-powerpc/percpu.h b/arch/powerpc/include/asm/percpu.h<br/>index f879252b7ea6..f879252b7ea6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/percpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/percpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/percpu.h</a></div><div class='head'>diff --git a/include/asm-powerpc/pgalloc-32.h b/arch/powerpc/include/asm/pgalloc-32.h<br/>index 58c07147b3ea..58c07147b3ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pgalloc-32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pgalloc-32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pgalloc-32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pgalloc-32.h</a></div><div class='head'>diff --git a/include/asm-powerpc/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h<br/>index 812a1d8f35cb..812a1d8f35cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pgalloc-64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pgalloc-64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pgalloc-64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pgalloc-64.h</a></div><div class='head'>diff --git a/include/asm-powerpc/pgalloc.h b/arch/powerpc/include/asm/pgalloc.h<br/>index b4505ed0f0f2..b4505ed0f0f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pgalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pgalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pgalloc.h</a></div><div class='head'>diff --git a/include/asm-powerpc/pgtable-4k.h b/arch/powerpc/include/asm/pgtable-4k.h<br/>index 6b18ba9d2d85..6b18ba9d2d85 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pgtable-4k.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pgtable-4k.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pgtable-4k.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pgtable-4k.h</a></div><div class='head'>diff --git a/include/asm-powerpc/pgtable-64k.h b/arch/powerpc/include/asm/pgtable-64k.h<br/>index 07b0d8f09cb6..07b0d8f09cb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pgtable-64k.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pgtable-64k.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pgtable-64k.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pgtable-64k.h</a></div><div class='head'>diff --git a/include/asm-powerpc/pgtable-ppc32.h b/arch/powerpc/include/asm/pgtable-ppc32.h<br/>index 6fe39e327047..6fe39e327047 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pgtable-ppc32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pgtable-ppc32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pgtable-ppc32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pgtable-ppc32.h</a></div><div class='head'>diff --git a/include/asm-powerpc/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h<br/>index 5fc78c0be302..4597c491e9b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pgtable-ppc64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pgtable-ppc64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pgtable-ppc64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pgtable-ppc64.h</a></div><div class='hunk'>@@ -100,7 +100,7 @@</div><div class='ctx'> </div><div class='ctx'> #define _PAGE_WRENABLE	(_PAGE_RW | _PAGE_DIRTY)</div><div class='ctx'> </div><div class='del'>-/* __pgprot defined in asm-powerpc/page.h */</div><div class='add'>+/* __pgprot defined in arch/powerpc/incliude/asm/page.h */</div><div class='ctx'> #define PAGE_NONE	__pgprot(_PAGE_PRESENT | _PAGE_ACCESSED)</div><div class='ctx'> </div><div class='ctx'> #define PAGE_SHARED	__pgprot(_PAGE_BASE | _PAGE_RW | _PAGE_USER)</div><div class='hunk'>@@ -153,12 +153,10 @@</div><div class='ctx'> #define __S110	PAGE_SHARED_X</div><div class='ctx'> #define __S111	PAGE_SHARED_X</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HUGETLB_PAGE</div><div class='del'>-</div><div class='add'>+#ifdef CONFIG_PPC_MM_SLICES</div><div class='ctx'> #define HAVE_ARCH_UNMAPPED_AREA</div><div class='ctx'> #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN</div><div class='del'>-</div><div class='del'>-#endif</div><div class='add'>+#endif /* CONFIG_PPC_MM_SLICES */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='hunk'>@@ -461,6 +459,8 @@ void pgtable_cache_init(void);</div><div class='ctx'> 	return pt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long address);</div><div class='add'>+</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_POWERPC_PGTABLE_PPC64_H_ */</div><div class='head'>diff --git a/include/asm-powerpc/pgtable.h b/arch/powerpc/include/asm/pgtable.h<br/>index dbb8ca172e44..dbb8ca172e44 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pgtable.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pgtable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pgtable.h</a></div><div class='head'>diff --git a/include/asm-powerpc/phyp_dump.h b/arch/powerpc/include/asm/phyp_dump.h<br/>index fa74c6c3e106..fa74c6c3e106 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/phyp_dump.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/phyp_dump.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/phyp_dump.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/phyp_dump.h</a></div><div class='head'>diff --git a/include/asm-powerpc/pmac_feature.h b/arch/powerpc/include/asm/pmac_feature.h<br/>index 877c35a4356e..877c35a4356e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pmac_feature.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pmac_feature.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pmac_feature.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pmac_feature.h</a></div><div class='head'>diff --git a/include/asm-powerpc/pmac_low_i2c.h b/arch/powerpc/include/asm/pmac_low_i2c.h<br/>index 131011bd7e76..131011bd7e76 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pmac_low_i2c.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pmac_low_i2c.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pmac_low_i2c.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pmac_low_i2c.h</a></div><div class='head'>diff --git a/include/asm-powerpc/pmac_pfunc.h b/arch/powerpc/include/asm/pmac_pfunc.h<br/>index 1330d6a58c57..1330d6a58c57 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pmac_pfunc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pmac_pfunc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pmac_pfunc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pmac_pfunc.h</a></div><div class='head'>diff --git a/include/asm-powerpc/pmc.h b/arch/powerpc/include/asm/pmc.h<br/>index d6a616a1b3ea..d6a616a1b3ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pmc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pmc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pmc.h</a></div><div class='head'>diff --git a/include/asm-powerpc/pmi.h b/arch/powerpc/include/asm/pmi.h<br/>index b4e91fbf5081..b4e91fbf5081 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/pmi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/pmi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pmi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/pmi.h</a></div><div class='head'>diff --git a/include/asm-powerpc/poll.h b/arch/powerpc/include/asm/poll.h<br/>index c98509d3149e..c98509d3149e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/poll.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/poll.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/poll.h</a></div><div class='head'>diff --git a/include/asm-powerpc/posix_types.h b/arch/powerpc/include/asm/posix_types.h<br/>index c4e396b540df..c4e396b540df 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/posix_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/posix_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/posix_types.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ppc-pci.h b/arch/powerpc/include/asm/ppc-pci.h<br/>index 854ab713f56c..854ab713f56c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ppc-pci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ppc-pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ppc-pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ppc-pci.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ppc4xx.h b/arch/powerpc/include/asm/ppc4xx.h<br/>index 033039a80c42..033039a80c42 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ppc4xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ppc4xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ppc4xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ppc4xx.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h<br/>index 0966899d974b..0966899d974b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ppc_asm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ppc_asm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ppc_asm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ppc_asm.h</a></div><div class='head'>diff --git a/include/asm-powerpc/processor.h b/arch/powerpc/include/asm/processor.h<br/>index 101ed87f7d84..101ed87f7d84 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/processor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/processor.h</a></div><div class='head'>diff --git a/include/asm-powerpc/prom.h b/arch/powerpc/include/asm/prom.h<br/>index eb3bd2e1c7f6..eb3bd2e1c7f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/prom.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/prom.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/prom.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/prom.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ps3.h b/arch/powerpc/include/asm/ps3.h<br/>index f9e34c493cbb..f9e34c493cbb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ps3.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ps3.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ps3.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ps3.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ps3av.h b/arch/powerpc/include/asm/ps3av.h<br/>index fda98715cd35..fda98715cd35 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ps3av.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ps3av.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ps3av.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ps3av.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ps3fb.h b/arch/powerpc/include/asm/ps3fb.h<br/>index 3f121fe4010d..3f121fe4010d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ps3fb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ps3fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ps3fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ps3fb.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ps3stor.h b/arch/powerpc/include/asm/ps3stor.h<br/>index 6fcaf714fa50..6fcaf714fa50 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ps3stor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ps3stor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ps3stor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ps3stor.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ptrace.h b/arch/powerpc/include/asm/ptrace.h<br/>index 734e0754fb9b..734e0754fb9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ptrace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ptrace.h</a></div><div class='head'>diff --git a/include/asm-powerpc/qe.h b/arch/powerpc/include/asm/qe.h<br/>index edee15d269ea..edee15d269ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/qe.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/qe.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/qe.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/qe.h</a></div><div class='head'>diff --git a/include/asm-powerpc/qe_ic.h b/arch/powerpc/include/asm/qe_ic.h<br/>index a779b2c9eaf1..56a7745ca343 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/qe_ic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/qe_ic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/qe_ic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/qe_ic.h</a></div><div class='hunk'>@@ -1,6 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-powerpc/qe_ic.h</div><div class='del'>- *</div><div class='ctx'>  * Copyright (C) 2006 Freescale Semicondutor, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Authors: 	Shlomi Gridish &lt;gridish@freescale.com&gt;</div><div class='head'>diff --git a/include/asm-powerpc/reg.h b/arch/powerpc/include/asm/reg.h<br/>index c6d1ab650778..c6d1ab650778 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/reg.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/reg.h</a></div><div class='head'>diff --git a/include/asm-powerpc/reg_8xx.h b/arch/powerpc/include/asm/reg_8xx.h<br/>index e8ea346b21d3..e8ea346b21d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/reg_8xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/reg_8xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/reg_8xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/reg_8xx.h</a></div><div class='head'>diff --git a/include/asm-powerpc/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h<br/>index be980f4ee495..be980f4ee495 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/reg_booke.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/reg_booke.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/reg_booke.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/reg_booke.h</a></div><div class='head'>diff --git a/include/asm-powerpc/reg_fsl_emb.h b/arch/powerpc/include/asm/reg_fsl_emb.h<br/>index 1e180a594589..1e180a594589 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/reg_fsl_emb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/reg_fsl_emb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/reg_fsl_emb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/reg_fsl_emb.h</a></div><div class='head'>diff --git a/include/asm-powerpc/resource.h b/arch/powerpc/include/asm/resource.h<br/>index 04bc4db8921b..04bc4db8921b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/resource.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/resource.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/resource.h</a></div><div class='head'>diff --git a/include/asm-powerpc/rheap.h b/arch/powerpc/include/asm/rheap.h<br/>index 172381769cfc..172381769cfc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/rheap.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/rheap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/rheap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/rheap.h</a></div><div class='head'>diff --git a/include/asm-powerpc/rio.h b/arch/powerpc/include/asm/rio.h<br/>index 0018bf80cb25..0018bf80cb25 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/rio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/rio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/rio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/rio.h</a></div><div class='head'>diff --git a/include/asm-powerpc/rtas.h b/arch/powerpc/include/asm/rtas.h<br/>index 8eaa7b28d9d0..8eaa7b28d9d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/rtas.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/rtas.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/rtas.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/rtas.h</a></div><div class='head'>diff --git a/include/asm-powerpc/rtc.h b/arch/powerpc/include/asm/rtc.h<br/>index f5802926b6c0..f5802926b6c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/rtc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/rtc.h</a></div><div class='head'>diff --git a/include/asm-powerpc/rwsem.h b/arch/powerpc/include/asm/rwsem.h<br/>index a6cc93b78b98..24cd9281ec37 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/rwsem.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/rwsem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/rwsem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/rwsem.h</a></div><div class='hunk'>@@ -8,8 +8,8 @@</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * include/asm-powerpc/rwsem.h: R/W semaphores for PPC using the stuff</div><div class='del'>- * in lib/rwsem.c.  Adapted largely from include/asm-i386/rwsem.h</div><div class='add'>+ * R/W semaphores for PPC using the stuff in lib/rwsem.c.</div><div class='add'>+ * Adapted largely from include/asm-i386/rwsem.h</div><div class='ctx'>  * by Paul Mackerras &lt;paulus@samba.org&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-powerpc/scatterlist.h b/arch/powerpc/include/asm/scatterlist.h<br/>index fcf7d55afe45..fcf7d55afe45 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/scatterlist.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/scatterlist.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/scatterlist.h</a></div><div class='head'>diff --git a/include/asm-powerpc/seccomp.h b/arch/powerpc/include/asm/seccomp.h<br/>index 853765eb1f65..853765eb1f65 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/seccomp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/seccomp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/seccomp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/seccomp.h</a></div><div class='head'>diff --git a/include/asm-powerpc/sections.h b/arch/powerpc/include/asm/sections.h<br/>index 916018e425c4..07956f3e7844 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/sections.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/sections.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/sections.h</a></div><div class='hunk'>@@ -2,6 +2,8 @@</div><div class='ctx'> #define _ASM_POWERPC_SECTIONS_H</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/elf.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm-generic/sections.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef __powerpc64__</div><div class='hunk'>@@ -16,6 +18,17 @@ static inline int in_kernel_text(unsigned long addr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#undef dereference_function_descriptor</div><div class='add'>+static inline void *dereference_function_descriptor(void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct ppc64_opd_entry *desc = ptr;</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	if (!probe_kernel_address(&amp;desc-&gt;funcaddr, p))</div><div class='add'>+		ptr = p;</div><div class='add'>+	return ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='head'>diff --git a/include/asm-powerpc/sembuf.h b/arch/powerpc/include/asm/sembuf.h<br/>index 99a41938ae3d..99a41938ae3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/sembuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/sembuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/sembuf.h</a></div><div class='head'>diff --git a/include/asm-powerpc/serial.h b/arch/powerpc/include/asm/serial.h<br/>index 3e8589b43cb2..3e8589b43cb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/serial.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/serial.h</a></div><div class='head'>diff --git a/include/asm-powerpc/setjmp.h b/arch/powerpc/include/asm/setjmp.h<br/>index 279d03a1eec6..279d03a1eec6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/setjmp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/setjmp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/setjmp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/setjmp.h</a></div><div class='head'>diff --git a/include/asm-powerpc/setup.h b/arch/powerpc/include/asm/setup.h<br/>index 817fac0a0714..817fac0a0714 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/setup.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/setup.h</a></div><div class='head'>diff --git a/include/asm-powerpc/shmbuf.h b/arch/powerpc/include/asm/shmbuf.h<br/>index 8efa39698b6c..8efa39698b6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/shmbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/shmbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/shmbuf.h</a></div><div class='head'>diff --git a/include/asm-powerpc/shmparam.h b/arch/powerpc/include/asm/shmparam.h<br/>index 5cda42a6d39e..5cda42a6d39e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/shmparam.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/shmparam.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/shmparam.h</a></div><div class='head'>diff --git a/include/asm-powerpc/sigcontext.h b/arch/powerpc/include/asm/sigcontext.h<br/>index 9c1f24fd5d11..9c1f24fd5d11 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/sigcontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/sigcontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/sigcontext.h</a></div><div class='head'>diff --git a/include/asm-powerpc/siginfo.h b/arch/powerpc/include/asm/siginfo.h<br/>index 12f1bce037be..12f1bce037be 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/siginfo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/siginfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/siginfo.h</a></div><div class='head'>diff --git a/include/asm-powerpc/signal.h b/arch/powerpc/include/asm/signal.h<br/>index a7360cdd99eb..a7360cdd99eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/signal.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/signal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/signal.h</a></div><div class='head'>diff --git a/include/asm-powerpc/smp.h b/arch/powerpc/include/asm/smp.h<br/>index 4d28e1e4521b..4d28e1e4521b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/smp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/smp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/smp.h</a></div><div class='head'>diff --git a/include/asm-powerpc/smu.h b/arch/powerpc/include/asm/smu.h<br/>index 7ae2753da565..7ae2753da565 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/smu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/smu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/smu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/smu.h</a></div><div class='head'>diff --git a/include/asm-powerpc/socket.h b/arch/powerpc/include/asm/socket.h<br/>index f5a4e168e498..f5a4e168e498 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/socket.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/socket.h</a></div><div class='head'>diff --git a/include/asm-powerpc/sockios.h b/arch/powerpc/include/asm/sockios.h<br/>index 55cef7675a31..55cef7675a31 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/sockios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/sockios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/sockios.h</a></div><div class='head'>diff --git a/include/asm-powerpc/sparsemem.h b/arch/powerpc/include/asm/sparsemem.h<br/>index 54a47ea2c3aa..54a47ea2c3aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/sparsemem.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/sparsemem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/sparsemem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/sparsemem.h</a></div><div class='head'>diff --git a/include/asm-powerpc/spinlock.h b/arch/powerpc/include/asm/spinlock.h<br/>index f56a843f4705..f56a843f4705 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/spinlock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/spinlock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/spinlock.h</a></div><div class='head'>diff --git a/include/asm-powerpc/spinlock_types.h b/arch/powerpc/include/asm/spinlock_types.h<br/>index 74236c9f05b1..74236c9f05b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/spinlock_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/spinlock_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/spinlock_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/spinlock_types.h</a></div><div class='head'>diff --git a/include/asm-powerpc/spu.h b/arch/powerpc/include/asm/spu.h<br/>index 8b2eb044270a..8b2eb044270a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/spu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/spu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/spu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/spu.h</a></div><div class='head'>diff --git a/include/asm-powerpc/spu_csa.h b/arch/powerpc/include/asm/spu_csa.h<br/>index a40fd491250c..a40fd491250c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/spu_csa.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/spu_csa.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/spu_csa.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/spu_csa.h</a></div><div class='head'>diff --git a/include/asm-powerpc/spu_info.h b/arch/powerpc/include/asm/spu_info.h<br/>index 3545efbf9891..3545efbf9891 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/spu_info.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/spu_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/spu_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/spu_info.h</a></div><div class='head'>diff --git a/include/asm-powerpc/spu_priv1.h b/arch/powerpc/include/asm/spu_priv1.h<br/>index 25020a34ce7f..25020a34ce7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/spu_priv1.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/spu_priv1.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/spu_priv1.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/spu_priv1.h</a></div><div class='head'>diff --git a/include/asm-powerpc/sstep.h b/arch/powerpc/include/asm/sstep.h<br/>index f593b0f9b627..f593b0f9b627 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/sstep.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/sstep.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/sstep.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/sstep.h</a></div><div class='head'>diff --git a/include/asm-powerpc/stat.h b/arch/powerpc/include/asm/stat.h<br/>index e4edc510b530..e4edc510b530 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/stat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/stat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/stat.h</a></div><div class='head'>diff --git a/include/asm-powerpc/statfs.h b/arch/powerpc/include/asm/statfs.h<br/>index 67024026c10d..67024026c10d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/statfs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/statfs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/statfs.h</a></div><div class='head'>diff --git a/include/asm-powerpc/string.h b/arch/powerpc/include/asm/string.h<br/>index e40010abcaf1..e40010abcaf1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/string.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/string.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/string.h</a></div><div class='head'>diff --git a/include/asm-powerpc/suspend.h b/arch/powerpc/include/asm/suspend.h<br/>index cbf2c9404c37..cbf2c9404c37 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/suspend.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/suspend.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/suspend.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/suspend.h</a></div><div class='head'>diff --git a/include/asm-powerpc/synch.h b/arch/powerpc/include/asm/synch.h<br/>index 45963e80f557..45963e80f557 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/synch.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/synch.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/synch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/synch.h</a></div><div class='head'>diff --git a/include/asm-powerpc/syscall.h b/arch/powerpc/include/asm/syscall.h<br/>index efa7f0b879f3..efa7f0b879f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/syscall.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/syscall.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/syscall.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/syscall.h</a></div><div class='head'>diff --git a/include/asm-powerpc/syscalls.h b/arch/powerpc/include/asm/syscalls.h<br/>index eb8eb400c664..eb8eb400c664 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/syscalls.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/syscalls.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/syscalls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/syscalls.h</a></div><div class='head'>diff --git a/include/asm-powerpc/systbl.h b/arch/powerpc/include/asm/systbl.h<br/>index e084272ed1c2..f6cc7a43b4fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/systbl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/systbl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/systbl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/systbl.h</a></div><div class='hunk'>@@ -92,7 +92,7 @@ COMPAT_SYS_SPU(readlink)</div><div class='ctx'> SYSCALL(uselib)</div><div class='ctx'> SYSCALL(swapon)</div><div class='ctx'> SYSCALL(reboot)</div><div class='del'>-SYSX(sys_ni_syscall,old32_readdir,old_readdir)</div><div class='add'>+SYSX(sys_ni_syscall,compat_sys_old_readdir,old_readdir)</div><div class='ctx'> SYSCALL_SPU(mmap)</div><div class='ctx'> SYSCALL_SPU(munmap)</div><div class='ctx'> SYSCALL_SPU(truncate)</div><div class='head'>diff --git a/include/asm-powerpc/system.h b/arch/powerpc/include/asm/system.h<br/>index d6648c143322..d6648c143322 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/system.h</a></div><div class='head'>diff --git a/include/asm-powerpc/tce.h b/arch/powerpc/include/asm/tce.h<br/>index f663634cccc9..f663634cccc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/tce.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/tce.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/tce.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/tce.h</a></div><div class='head'>diff --git a/include/asm-powerpc/termbits.h b/arch/powerpc/include/asm/termbits.h<br/>index 6698188ca550..6698188ca550 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/termbits.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/termbits.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/termbits.h</a></div><div class='head'>diff --git a/include/asm-powerpc/termios.h b/arch/powerpc/include/asm/termios.h<br/>index 2c14fea07c8a..2c14fea07c8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/termios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/termios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/termios.h</a></div><div class='head'>diff --git a/include/asm-powerpc/thread_info.h b/arch/powerpc/include/asm/thread_info.h<br/>index 9665a26a253a..9665a26a253a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/thread_info.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/thread_info.h</a></div><div class='head'>diff --git a/include/asm-powerpc/time.h b/arch/powerpc/include/asm/time.h<br/>index febd581ec9b0..febd581ec9b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/time.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/time.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/time.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/time.h</a></div><div class='head'>diff --git a/include/asm-powerpc/timex.h b/arch/powerpc/include/asm/timex.h<br/>index c55e14f7ef44..c55e14f7ef44 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/timex.h</a></div><div class='head'>diff --git a/include/asm-powerpc/tlb.h b/arch/powerpc/include/asm/tlb.h<br/>index e20ff7541f36..e20ff7541f36 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/tlb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/tlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/tlb.h</a></div><div class='head'>diff --git a/include/asm-powerpc/tlbflush.h b/arch/powerpc/include/asm/tlbflush.h<br/>index 361cd5c7a32b..361cd5c7a32b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/tlbflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/tlbflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/tlbflush.h</a></div><div class='head'>diff --git a/include/asm-powerpc/topology.h b/arch/powerpc/include/asm/topology.h<br/>index c32da6f97999..c32da6f97999 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/topology.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/topology.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/topology.h</a></div><div class='head'>diff --git a/include/asm-powerpc/tsi108.h b/arch/powerpc/include/asm/tsi108.h<br/>index f8b60793b7a9..f8b60793b7a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/tsi108.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/tsi108.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/tsi108.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/tsi108.h</a></div><div class='head'>diff --git a/include/asm-powerpc/tsi108_irq.h b/arch/powerpc/include/asm/tsi108_irq.h<br/>index 6ed93979fbe4..6ed93979fbe4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/tsi108_irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/tsi108_irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/tsi108_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/tsi108_irq.h</a></div><div class='head'>diff --git a/include/asm-powerpc/tsi108_pci.h b/arch/powerpc/include/asm/tsi108_pci.h<br/>index 5653d7cc3e24..5653d7cc3e24 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/tsi108_pci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/tsi108_pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/tsi108_pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/tsi108_pci.h</a></div><div class='head'>diff --git a/include/asm-powerpc/types.h b/arch/powerpc/include/asm/types.h<br/>index d3374bc865ba..d3374bc865ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/types.h</a></div><div class='head'>diff --git a/include/asm-powerpc/uaccess.h b/arch/powerpc/include/asm/uaccess.h<br/>index bd0fb8495154..bd0fb8495154 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/uaccess.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/uaccess.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/uaccess.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ucc.h b/arch/powerpc/include/asm/ucc.h<br/>index 46b09ba6bead..46b09ba6bead 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ucc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ucc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ucc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ucc.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ucc_fast.h b/arch/powerpc/include/asm/ucc_fast.h<br/>index fce16abe7ee1..839aab8bf37d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ucc_fast.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ucc_fast.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ucc_fast.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ucc_fast.h</a></div><div class='hunk'>@@ -1,6 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-powerpc/ucc_fast.h</div><div class='del'>- *</div><div class='ctx'>  * Internal header file for UCC FAST unit routines.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Freescale Semicondutor, Inc. All rights reserved.</div><div class='head'>diff --git a/include/asm-powerpc/ucc_slow.h b/arch/powerpc/include/asm/ucc_slow.h<br/>index 0980e6ad335b..0980e6ad335b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ucc_slow.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ucc_slow.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ucc_slow.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ucc_slow.h</a></div><div class='head'>diff --git a/include/asm-powerpc/ucontext.h b/arch/powerpc/include/asm/ucontext.h<br/>index d9a4ddf0cc86..d9a4ddf0cc86 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/ucontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/ucontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/ucontext.h</a></div><div class='head'>diff --git a/include/asm-powerpc/udbg.h b/arch/powerpc/include/asm/udbg.h<br/>index 6418ceea44b7..6418ceea44b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/udbg.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/udbg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/udbg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/udbg.h</a></div><div class='head'>diff --git a/include/asm-powerpc/uic.h b/arch/powerpc/include/asm/uic.h<br/>index 970eb7e2186a..597edfcae3d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/uic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/uic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/uic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/uic.h</a></div><div class='hunk'>@@ -1,6 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- * include/asm-powerpc/uic.h</div><div class='del'>- *</div><div class='ctx'>  * IBM PPC4xx UIC external definitions and structure.</div><div class='ctx'>  *</div><div class='ctx'>  * Maintainer: David Gibson &lt;dwg@au1.ibm.com&gt;</div><div class='head'>diff --git a/include/asm-powerpc/unaligned.h b/arch/powerpc/include/asm/unaligned.h<br/>index 5f1b1e3c2137..5f1b1e3c2137 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/unaligned.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/unaligned.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/unaligned.h</a></div><div class='head'>diff --git a/include/asm-powerpc/uninorth.h b/arch/powerpc/include/asm/uninorth.h<br/>index f737732c3861..f737732c3861 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/uninorth.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/uninorth.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/uninorth.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/uninorth.h</a></div><div class='head'>diff --git a/include/asm-powerpc/unistd.h b/arch/powerpc/include/asm/unistd.h<br/>index e07d0c76ed77..e07d0c76ed77 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/unistd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/unistd.h</a></div><div class='head'>diff --git a/include/asm-powerpc/user.h b/arch/powerpc/include/asm/user.h<br/>index 3fd4545dd74e..3fd4545dd74e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/user.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/user.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/user.h</a></div><div class='head'>diff --git a/include/asm-powerpc/vdso.h b/arch/powerpc/include/asm/vdso.h<br/>index 26fc449bd989..26fc449bd989 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/vdso.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/vdso.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/vdso.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/vdso.h</a></div><div class='head'>diff --git a/include/asm-powerpc/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h<br/>index f01393224b52..f01393224b52 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/vdso_datapage.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/vdso_datapage.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/vdso_datapage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/vdso_datapage.h</a></div><div class='head'>diff --git a/include/asm-powerpc/vga.h b/arch/powerpc/include/asm/vga.h<br/>index a2eac409c1ec..a2eac409c1ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/vga.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/vga.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/vga.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/vga.h</a></div><div class='head'>diff --git a/include/asm-powerpc/vio.h b/arch/powerpc/include/asm/vio.h<br/>index 0a290a195946..0a290a195946 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/vio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/vio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/vio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/vio.h</a></div><div class='head'>diff --git a/include/asm-powerpc/xilinx_intc.h b/arch/powerpc/include/asm/xilinx_intc.h<br/>index 343612f8fece..343612f8fece 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/xilinx_intc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/xilinx_intc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/xilinx_intc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/xilinx_intc.h</a></div><div class='head'>diff --git a/include/asm-powerpc/xmon.h b/arch/powerpc/include/asm/xmon.h<br/>index 5eb8e599e5cc..5eb8e599e5cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/xmon.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/xmon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/xmon.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/xmon.h</a></div><div class='head'>diff --git a/include/asm-powerpc/xor.h b/arch/powerpc/include/asm/xor.h<br/>index c82eb12a5b18..c82eb12a5b18 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-powerpc/xor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-powerpc/xor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/xor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/include/asm/xor.h</a></div><div class='head'>diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile<br/>index 1a4094704b1f..946daea780f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/Makefile</a></div><div class='hunk'>@@ -14,12 +14,13 @@ endif</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_FTRACE</div><div class='ctx'> # Do not trace early boot code</div><div class='del'>-CFLAGS_REMOVE_cputable.o = -pg</div><div class='del'>-CFLAGS_REMOVE_prom_init.o = -pg</div><div class='add'>+CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog</div><div class='add'>+CFLAGS_REMOVE_prom_init.o = -pg -mno-sched-epilog</div><div class='add'>+CFLAGS_REMOVE_btext.o = -pg -mno-sched-epilog</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_DYNAMIC_FTRACE</div><div class='ctx'> # dynamic ftrace setup.</div><div class='del'>-CFLAGS_REMOVE_ftrace.o = -pg</div><div class='add'>+CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='hunk'>@@ -59,8 +60,6 @@ obj64-$(CONFIG_HIBERNATION)	+= swsusp_asm64.o</div><div class='ctx'> obj-$(CONFIG_MODULES)		+= module.o module_$(CONFIG_WORD_SIZE).o</div><div class='ctx'> obj-$(CONFIG_44x)		+= cpu_setup_44x.o</div><div class='ctx'> </div><div class='del'>-ifeq ($(CONFIG_PPC_MERGE),y)</div><div class='del'>-</div><div class='ctx'> extra-$(CONFIG_PPC_STD_MMU)	:= head_32.o</div><div class='ctx'> extra-$(CONFIG_PPC64)		:= head_64.o</div><div class='ctx'> extra-$(CONFIG_40x)		:= head_40x.o</div><div class='hunk'>@@ -100,12 +99,6 @@ ifneq ($(CONFIG_PPC_INDIRECT_IO),y)</div><div class='ctx'> obj-y				+= iomap.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-else</div><div class='del'>-# stuff used from here for ARCH=ppc</div><div class='del'>-smpobj-$(CONFIG_SMP)		+= smp.o</div><div class='del'>-</div><div class='del'>-endif</div><div class='del'>-</div><div class='ctx'> obj-$(CONFIG_PPC64)		+= $(obj64-y)</div><div class='ctx'> </div><div class='ctx'> extra-$(CONFIG_PPC_FPU)		+= fpu.o</div><div class='hunk'>@@ -121,9 +114,6 @@ PHONY += systbl_chk</div><div class='ctx'> systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i</div><div class='ctx'> 	$(call cmd,systbl_chk)</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-ifeq ($(CONFIG_PPC_MERGE),y)</div><div class='del'>-</div><div class='ctx'> $(obj)/built-in.o:		prom_init_check</div><div class='ctx'> </div><div class='ctx'> quiet_cmd_prom_init_check = CALL    $&lt;</div><div class='hunk'>@@ -133,7 +123,4 @@ PHONY += prom_init_check</div><div class='ctx'> prom_init_check: $(src)/prom_init_check.sh $(obj)/prom_init.o</div><div class='ctx'> 	$(call cmd,prom_init_check)</div><div class='ctx'> </div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> clean-files := vmlinux.lds</div><div class='head'>diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c<br/>index 367129789cc0..5af4e9b2dbe2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/align.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/align.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/align.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/align.c</a></div><div class='hunk'>@@ -647,7 +647,7 @@ static int emulate_vsx(unsigned char __user *addr, unsigned int reg,</div><div class='ctx'> 		       unsigned int flags, unsigned int length)</div><div class='ctx'> {</div><div class='ctx'> 	char *ptr = (char *) &amp;current-&gt;thread.TS_FPR(reg);</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	flush_vsx_to_thread(current);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S<br/>index 5465e8de0e61..80cac984d85d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/cpu_setup_44x.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/cpu_setup_44x.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/cpu_setup_44x.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/cpu_setup_44x.S</a></div><div class='hunk'>@@ -39,12 +39,6 @@ _GLOBAL(__setup_cpu_440gx)</div><div class='ctx'> _GLOBAL(__setup_cpu_440spe)</div><div class='ctx'> 	b	__fixup_440A_mcheck</div><div class='ctx'> </div><div class='del'>- /* Temporary fixup for arch/ppc until we kill the whole thing */</div><div class='del'>-#ifndef CONFIG_PPC_MERGE</div><div class='del'>-_GLOBAL(__fixup_440A_mcheck)</div><div class='del'>-	blr</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* enable APU between CPU and FPU */</div><div class='ctx'> _GLOBAL(__init_fpu_44x)</div><div class='ctx'> 	mfspr	r3,SPRN_CCR0</div><div class='head'>diff --git a/arch/powerpc/kernel/crash_dump.c b/arch/powerpc/kernel/crash_dump.c<br/>index e0debcca0bfa..a323c9b32ee1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/crash_dump.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/crash_dump.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/crash_dump.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/crash_dump.c</a></div><div class='hunk'>@@ -86,6 +86,19 @@ static int __init parse_savemaxmem(char *p)</div><div class='ctx'> }</div><div class='ctx'> __setup("savemaxmem=", parse_savemaxmem);</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static size_t copy_oldmem_vaddr(void *vaddr, char *buf, size_t csize,</div><div class='add'>+                               unsigned long offset, int userbuf)</div><div class='add'>+{</div><div class='add'>+	if (userbuf) {</div><div class='add'>+		if (copy_to_user((char __user *)buf, (vaddr + offset), csize))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	} else</div><div class='add'>+		memcpy(buf, (vaddr + offset), csize);</div><div class='add'>+</div><div class='add'>+	return csize;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * copy_oldmem_page - copy one page from "oldmem"</div><div class='ctx'>  * @pfn: page frame number to be copied</div><div class='hunk'>@@ -107,16 +120,16 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,</div><div class='ctx'> 	if (!csize)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	vaddr = __ioremap(pfn &lt;&lt; PAGE_SHIFT, PAGE_SIZE, 0);</div><div class='add'>+	csize = min(csize, PAGE_SIZE);</div><div class='ctx'> </div><div class='del'>-	if (userbuf) {</div><div class='del'>-		if (copy_to_user((char __user *)buf, (vaddr + offset), csize)) {</div><div class='del'>-			iounmap(vaddr);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		memcpy(buf, (vaddr + offset), csize);</div><div class='add'>+	if (pfn &lt; max_pfn) {</div><div class='add'>+		vaddr = __va(pfn &lt;&lt; PAGE_SHIFT);</div><div class='add'>+		csize = copy_oldmem_vaddr(vaddr, buf, csize, offset, userbuf);</div><div class='add'>+	} else {</div><div class='add'>+		vaddr = __ioremap(pfn &lt;&lt; PAGE_SHIFT, PAGE_SIZE, 0);</div><div class='add'>+		csize = copy_oldmem_vaddr(vaddr, buf, csize, offset, userbuf);</div><div class='add'>+		iounmap(vaddr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	iounmap(vaddr);</div><div class='ctx'> 	return csize;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S<br/>index 99ee2f0f0f2b..8bb657519299 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_32.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/head_32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_32.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/head_32.S</a></div><div class='hunk'>@@ -1155,7 +1155,7 @@ flush_tlbs:</div><div class='ctx'> 	lis	r10, 0x40</div><div class='ctx'> 1:	addic.	r10, r10, -0x1000</div><div class='ctx'> 	tlbie	r10</div><div class='del'>-	blt	1b</div><div class='add'>+	bgt	1b</div><div class='ctx'> 	sync</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c<br/>index 9d42eb57aea3..a06362223f8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ibmebus.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/ibmebus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ibmebus.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/ibmebus.c</a></div><div class='hunk'>@@ -233,17 +233,6 @@ void ibmebus_free_irq(u32 ist, void *dev_id)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ibmebus_free_irq);</div><div class='ctx'> </div><div class='del'>-static ssize_t name_show(struct device *dev,</div><div class='del'>-			 struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	return sprintf(buf, "%s\n", to_of_device(dev)-&gt;node-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct device_attribute ibmebus_dev_attrs[] = {</div><div class='del'>-	__ATTR_RO(name),</div><div class='del'>-	__ATTR_NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static char *ibmebus_chomp(const char *in, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	char *out = kmalloc(count + 1, GFP_KERNEL);</div><div class='hunk'>@@ -327,7 +316,6 @@ static struct bus_attribute ibmebus_bus_attrs[] = {</div><div class='ctx'> </div><div class='ctx'> struct bus_type ibmebus_bus_type = {</div><div class='ctx'> 	.uevent    = of_device_uevent,</div><div class='del'>-	.dev_attrs = ibmebus_dev_attrs,</div><div class='ctx'> 	.bus_attrs = ibmebus_bus_attrs</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(ibmebus_bus_type);</div><div class='head'>diff --git a/arch/powerpc/kernel/idle_6xx.S b/arch/powerpc/kernel/idle_6xx.S<br/>index 019b02d8844f..15c611de1ee2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/idle_6xx.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/idle_6xx.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/idle_6xx.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/idle_6xx.S</a></div><div class='hunk'>@@ -158,7 +158,7 @@ _GLOBAL(power_save_ppc32_restore)</div><div class='ctx'> 	stw	r9,_NIP(r11)		/* make it do a blr */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	mfspr	r12,SPRN_SPRG3</div><div class='add'>+	rlwinm	r12,r11,0,0,31-THREAD_SHIFT</div><div class='ctx'> 	lwz	r11,TI_CPU(r12)		/* get cpu number * 4 */</div><div class='ctx'> 	slwi	r11,r11,2</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/powerpc/kernel/idle_e500.S b/arch/powerpc/kernel/idle_e500.S<br/>index 06304034b393..47a1a983ff88 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/idle_e500.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/idle_e500.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/idle_e500.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/idle_e500.S</a></div><div class='hunk'>@@ -84,10 +84,11 @@ _GLOBAL(power_save_ppc32_restore)</div><div class='ctx'> 	stw	r9,_NIP(r11)		/* make it do a blr */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	mfspr	r12,SPRN_SPRG3</div><div class='add'>+	rlwinm	r12,r1,0,0,31-THREAD_SHIFT</div><div class='ctx'> 	lwz	r11,TI_CPU(r12)		/* get cpu number * 4 */</div><div class='ctx'> 	slwi	r11,r11,2</div><div class='ctx'> #else</div><div class='ctx'> 	li	r11,0</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> 	b	transfer_to_handler_cont</div><div class='head'>diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c<br/>index 6ac8612da3c3..d972decf0324 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/irq.c</a></div><div class='hunk'>@@ -77,22 +77,12 @@ static int ppc_spurious_interrupts;</div><div class='ctx'> EXPORT_SYMBOL(__irq_offset_value);</div><div class='ctx'> atomic_t ppc_n_lost_interrupts;</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_PPC_MERGE</div><div class='del'>-#define NR_MASK_WORDS	((NR_IRQS + 31) / 32)</div><div class='del'>-unsigned long ppc_cached_irq_mask[NR_MASK_WORDS];</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_TAU_INT</div><div class='ctx'> extern int tau_initialized;</div><div class='ctx'> extern int tau_interrupts(int);</div><div class='ctx'> #endif</div><div class='ctx'> #endif /* CONFIG_PPC32 */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SMP) &amp;&amp; !defined(CONFIG_PPC_MERGE)</div><div class='del'>-extern atomic_t ipi_recv;</div><div class='del'>-extern atomic_t ipi_sent;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> EXPORT_SYMBOL(irq_desc);</div><div class='ctx'> </div><div class='hunk'>@@ -216,21 +206,14 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> skip:</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;desc-&gt;lock, flags);</div><div class='ctx'> 	} else if (i == NR_IRQS) {</div><div class='del'>-#ifdef CONFIG_PPC32</div><div class='del'>-#ifdef CONFIG_TAU_INT</div><div class='add'>+#if defined(CONFIG_PPC32) &amp;&amp; defined(CONFIG_TAU_INT)</div><div class='ctx'> 		if (tau_initialized){</div><div class='ctx'> 			seq_puts(p, "TAU: ");</div><div class='ctx'> 			for_each_online_cpu(j)</div><div class='ctx'> 				seq_printf(p, "%10u ", tau_interrupts(j));</div><div class='ctx'> 			seq_puts(p, "  PowerPC             Thermal Assist (cpu temp)\n");</div><div class='ctx'> 		}</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_SMP) &amp;&amp; !defined(CONFIG_PPC_MERGE)</div><div class='del'>-		/* should this be per processor send/receive? */</div><div class='del'>-		seq_printf(p, "IPI (recv/sent): %10u/%u\n",</div><div class='del'>-				atomic_read(&amp;ipi_recv), atomic_read(&amp;ipi_sent));</div><div class='del'>-#endif</div><div class='del'>-#endif /* CONFIG_PPC32 */</div><div class='add'>+#endif /* CONFIG_PPC32 &amp;&amp; CONFIG_TAU_INT*/</div><div class='ctx'> 		seq_printf(p, "BAD: %10u\n", ppc_spurious_interrupts);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -454,8 +437,6 @@ void do_softirq(void)</div><div class='ctx'>  * IRQ controller and virtual interrupts</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_MERGE</div><div class='del'>-</div><div class='ctx'> static LIST_HEAD(irq_hosts);</div><div class='ctx'> static DEFINE_SPINLOCK(irq_big_lock);</div><div class='ctx'> static DEFINE_PER_CPU(unsigned int, irq_radix_reader);</div><div class='hunk'>@@ -1114,8 +1095,6 @@ static int __init irq_debugfs_init(void)</div><div class='ctx'> __initcall(irq_debugfs_init);</div><div class='ctx'> #endif /* CONFIG_VIRQ_DEBUG */</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_PPC_MERGE */</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> static int __init setup_noirqdistrib(char *str)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c<br/>index 9f856a0c3e38..b3eef30b5131 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/lparcfg.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/lparcfg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/lparcfg.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/lparcfg.c</a></div><div class='hunk'>@@ -416,6 +416,8 @@ static void pseries_cmo_data(struct seq_file *m)</div><div class='ctx'> 	unsigned long cmo_faults = 0;</div><div class='ctx'> 	unsigned long cmo_fault_time = 0;</div><div class='ctx'> </div><div class='add'>+	seq_printf(m, "cmo_enabled=%d\n", firmware_has_feature(FW_FEATURE_CMO));</div><div class='add'>+</div><div class='ctx'> 	if (!firmware_has_feature(FW_FEATURE_CMO))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -427,6 +429,9 @@ static void pseries_cmo_data(struct seq_file *m)</div><div class='ctx'> 	seq_printf(m, "cmo_faults=%lu\n", cmo_faults);</div><div class='ctx'> 	seq_printf(m, "cmo_fault_time_usec=%lu\n",</div><div class='ctx'> 		   cmo_fault_time / tb_ticks_per_usec);</div><div class='add'>+	seq_printf(m, "cmo_primary_psp=%d\n", cmo_get_primary_psp());</div><div class='add'>+	seq_printf(m, "cmo_secondary_psp=%d\n", cmo_get_secondary_psp());</div><div class='add'>+	seq_printf(m, "cmo_page_size=%lu\n", cmo_get_page_size());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pseries_lparcfg_data(struct seq_file *m, void *v)</div><div class='hunk'>@@ -636,10 +641,6 @@ static ssize_t lparcfg_write(struct file *file, const char __user * buf,</div><div class='ctx'> 		retval = -EIO;</div><div class='ctx'> 	} else if (retval == H_PARAMETER) {</div><div class='ctx'> 		retval = -EINVAL;</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_WARNING "%s: received unknown hv return code %ld",</div><div class='del'>-		       __func__, retval);</div><div class='del'>-		retval = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='head'>diff --git a/arch/powerpc/kernel/machine_kexec_32.c b/arch/powerpc/kernel/machine_kexec_32.c<br/>index cbaa34196797..ae63a964b858 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/machine_kexec_32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/machine_kexec_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/machine_kexec_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/machine_kexec_32.c</a></div><div class='hunk'>@@ -51,7 +51,7 @@ void default_machine_kexec(struct kimage *image)</div><div class='ctx'> 						relocate_new_kernel_size);</div><div class='ctx'> </div><div class='ctx'> 	flush_icache_range(reboot_code_buffer,</div><div class='del'>-				reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE);</div><div class='add'>+				reboot_code_buffer + KEXEC_CONTROL_PAGE_SIZE);</div><div class='ctx'> 	printk(KERN_INFO "Bye!\n");</div><div class='ctx'> </div><div class='ctx'> 	/* now call it */</div><div class='head'>diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S<br/>index 6321ae36f729..7a6dfbca7682 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/misc_32.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/misc_32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/misc_32.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/misc_32.S</a></div><div class='hunk'>@@ -899,7 +899,7 @@ relocate_new_kernel:</div><div class='ctx'> </div><div class='ctx'> 	/* set a new stack at the bottom of our page... */</div><div class='ctx'> 	/* (not really needed now) */</div><div class='del'>-	addi	r1, r4, KEXEC_CONTROL_CODE_SIZE - 8 /* for LR Save+Back Chain */</div><div class='add'>+	addi	r1, r4, KEXEC_CONTROL_PAGE_SIZE - 8 /* for LR Save+Back Chain */</div><div class='ctx'> 	stw	r0, 0(r1)</div><div class='ctx'> </div><div class='ctx'> 	/* Do the copies */</div><div class='head'>diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c<br/>index af07003573c4..7ff292475269 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/module.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/module.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/module.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/module.c</a></div><div class='hunk'>@@ -99,18 +99,3 @@ void module_arch_cleanup(struct module *mod)</div><div class='ctx'> {</div><div class='ctx'> 	module_bug_cleanup(mod);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-struct bug_entry *module_find_bug(unsigned long bugaddr)</div><div class='del'>-{</div><div class='del'>-	struct mod_arch_specific *mod;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	struct bug_entry *bug;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(mod, &amp;module_bug_list, bug_list) {</div><div class='del'>-		bug = mod-&gt;bug_table;</div><div class='del'>-		for (i = 0; i &lt; mod-&gt;num_bugs; ++i, ++bug)</div><div class='del'>-			if (bugaddr == bug-&gt;bug_addr)</div><div class='del'>-				return bug;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c<br/>index ee6a2982d567..1af2377e4992 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/module_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/module_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/module_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/module_64.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;asm/module.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='ctx'> #include &lt;asm/code-patching.h&gt;</div><div class='ctx'> #include &lt;linux/sort.h&gt;</div><div class='hunk'>@@ -42,13 +41,6 @@</div><div class='ctx'> #define DEBUGP(fmt , ...)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* There's actually a third entry here, but it's unused */</div><div class='del'>-struct ppc64_opd_entry</div><div class='del'>-{</div><div class='del'>-	unsigned long funcaddr;</div><div class='del'>-	unsigned long r2;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Like PPC32, we need little trampolines to do &gt; 24-bit jumps (into</div><div class='ctx'>    the kernel itself).  But on PPC64, these need to be used for every</div><div class='ctx'>    jump, actually, to reset r2 (TOC+0x8000). */</div><div class='head'>diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c<br/>index 224e9a11765c..ea0c61e09b76 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci-common.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/pci-common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci-common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/pci-common.c</a></div><div class='hunk'>@@ -650,11 +650,18 @@ void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Out of paranoia, let's put the ISA hole last if any */</div><div class='del'>-	if (isa_hole &gt;= 0 &amp;&amp; memno &gt; 0 &amp;&amp; isa_hole != (memno-1)) {</div><div class='del'>-		struct resource tmp = hose-&gt;mem_resources[isa_hole];</div><div class='del'>-		hose-&gt;mem_resources[isa_hole] = hose-&gt;mem_resources[memno-1];</div><div class='del'>-		hose-&gt;mem_resources[memno-1] = tmp;</div><div class='add'>+	/* If there's an ISA hole and the pci_mem_offset is -not- matching</div><div class='add'>+	 * the ISA hole offset, then we need to remove the ISA hole from</div><div class='add'>+	 * the resource list for that brige</div><div class='add'>+	 */</div><div class='add'>+	if (isa_hole &gt;= 0 &amp;&amp; hose-&gt;pci_mem_offset != isa_mb) {</div><div class='add'>+		unsigned int next = isa_hole + 1;</div><div class='add'>+		printk(KERN_INFO " Removing ISA hole at 0x%016llx\n", isa_mb);</div><div class='add'>+		if (next &lt; memno)</div><div class='add'>+			memmove(&amp;hose-&gt;mem_resources[isa_hole],</div><div class='add'>+				&amp;hose-&gt;mem_resources[next],</div><div class='add'>+				sizeof(struct resource) * (memno - next));</div><div class='add'>+		hose-&gt;mem_resources[--memno].flags = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c<br/>index e030f3bd5024..957bded0020d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/process.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/process.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/process.c</a></div><div class='hunk'>@@ -276,10 +276,8 @@ int set_dabr(unsigned long dabr)</div><div class='ctx'> {</div><div class='ctx'> 	__get_cpu_var(current_dabr) = dabr;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_MERGE		/* XXX for now */</div><div class='ctx'> 	if (ppc_md.set_dabr)</div><div class='ctx'> 		return ppc_md.set_dabr(dabr);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/* XXX should we have a CPU_FTR_HAS_DABR ? */</div><div class='ctx'> #if defined(CONFIG_PPC64) || defined(CONFIG_6xx)</div><div class='head'>diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c<br/>index 6b66cd85b433..3635be61f899 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ptrace.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ptrace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/ptrace.c</a></div><div class='hunk'>@@ -375,7 +375,7 @@ static int vsr_get(struct task_struct *target, const struct user_regset *regset,</div><div class='ctx'> 	flush_vsx_to_thread(target);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 32 ; i++)</div><div class='del'>-		buf[i] = current-&gt;thread.fpr[i][TS_VSRLOWOFFSET];</div><div class='add'>+		buf[i] = target-&gt;thread.fpr[i][TS_VSRLOWOFFSET];</div><div class='ctx'> 	ret = user_regset_copyout(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf,</div><div class='ctx'> 				  buf, 0, 32 * sizeof(double));</div><div class='ctx'> </div><div class='hunk'>@@ -394,7 +394,7 @@ static int vsr_set(struct task_struct *target, const struct user_regset *regset,</div><div class='ctx'> 	ret = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf,</div><div class='ctx'> 				 buf, 0, 32 * sizeof(double));</div><div class='ctx'> 	for (i = 0; i &lt; 32 ; i++)</div><div class='del'>-		current-&gt;thread.fpr[i][TS_VSRLOWOFFSET] = buf[i];</div><div class='add'>+		target-&gt;thread.fpr[i][TS_VSRLOWOFFSET] = buf[i];</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -975,15 +975,13 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 	case PTRACE_GETVSRREGS:</div><div class='ctx'> 		return copy_regset_to_user(child, &amp;user_ppc_native_view,</div><div class='ctx'> 					   REGSET_VSX,</div><div class='del'>-					   0, (32 * sizeof(vector128) +</div><div class='del'>-					       sizeof(u32)),</div><div class='add'>+					   0, 32 * sizeof(double),</div><div class='ctx'> 					   (void __user *) data);</div><div class='ctx'> </div><div class='ctx'> 	case PTRACE_SETVSRREGS:</div><div class='ctx'> 		return copy_regset_from_user(child, &amp;user_ppc_native_view,</div><div class='ctx'> 					     REGSET_VSX,</div><div class='del'>-					     0, (32 * sizeof(vector128) +</div><div class='del'>-						 sizeof(u32)),</div><div class='add'>+					     0, 32 * sizeof(double),</div><div class='ctx'> 					     (const void __user *) data);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_SPE</div><div class='head'>diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace32.c<br/>index 67bf1a1e7e14..197d49c790ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ptrace32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/ptrace32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ptrace32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/ptrace32.c</a></div><div class='hunk'>@@ -294,6 +294,8 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,</div><div class='ctx'> 	case PTRACE_SETFPREGS:</div><div class='ctx'> 	case PTRACE_GETVRREGS:</div><div class='ctx'> 	case PTRACE_SETVRREGS:</div><div class='add'>+	case PTRACE_GETVSRREGS:</div><div class='add'>+	case PTRACE_SETVSRREGS:</div><div class='ctx'> 	case PTRACE_GETREGS64:</div><div class='ctx'> 	case PTRACE_SETREGS64:</div><div class='ctx'> 	case PPC_PTRACE_GETFPREGS:</div><div class='head'>diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c<br/>index c680f1bbd387..1f8505c23548 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/rtas.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/rtas.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/rtas.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/rtas.c</a></div><div class='hunk'>@@ -792,6 +792,9 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)</div><div class='ctx'> 	if (args.token == RTAS_UNKNOWN_SERVICE)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	args.rets = &amp;args.args[nargs];</div><div class='add'>+	memset(args.rets, 0, args.nret * sizeof(rtas_arg_t));</div><div class='add'>+</div><div class='ctx'> 	/* Need to handle ibm,suspend_me call specially */</div><div class='ctx'> 	if (args.token == ibm_suspend_me_token) {</div><div class='ctx'> 		rc = rtas_ibm_suspend_me(&amp;args);</div><div class='hunk'>@@ -808,8 +811,6 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)</div><div class='ctx'> 	enter_rtas(__pa(&amp;rtas.args));</div><div class='ctx'> 	args = rtas.args;</div><div class='ctx'> </div><div class='del'>-	args.rets = &amp;args.args[nargs];</div><div class='del'>-</div><div class='ctx'> 	/* A -1 return code indicates that the last command couldn't</div><div class='ctx'> 	   be completed due to a hardware error. */</div><div class='ctx'> 	if (args.rets[0] == -1)</div><div class='head'>diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c<br/>index 709f8cb8bfca..d98634c76060 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/sys_ppc32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/sys_ppc32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/sys_ppc32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/sys_ppc32.c</a></div><div class='hunk'>@@ -52,63 +52,6 @@</div><div class='ctx'> #include &lt;asm/ppc-pci.h&gt;</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='ctx'> </div><div class='del'>-struct old_linux_dirent32 {</div><div class='del'>-	u32		d_ino;</div><div class='del'>-	u32		d_offset;</div><div class='del'>-	unsigned short	d_namlen;</div><div class='del'>-	char		d_name[1];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct readdir_callback32 {</div><div class='del'>-	struct old_linux_dirent32 __user * dirent;</div><div class='del'>-	int count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int fillonedir(void * __buf, const char * name, int namlen,</div><div class='del'>-		                  off_t offset, u64 ino, unsigned int d_type)</div><div class='del'>-{</div><div class='del'>-	struct readdir_callback32 * buf = (struct readdir_callback32 *) __buf;</div><div class='del'>-	struct old_linux_dirent32 __user * dirent;</div><div class='del'>-	ino_t d_ino;</div><div class='del'>-</div><div class='del'>-	if (buf-&gt;count)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	d_ino = ino;</div><div class='del'>-	if (sizeof(d_ino) &lt; sizeof(ino) &amp;&amp; d_ino != ino)</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-	buf-&gt;count++;</div><div class='del'>-	dirent = buf-&gt;dirent;</div><div class='del'>-	put_user(d_ino, &amp;dirent-&gt;d_ino);</div><div class='del'>-	put_user(offset, &amp;dirent-&gt;d_offset);</div><div class='del'>-	put_user(namlen, &amp;dirent-&gt;d_namlen);</div><div class='del'>-	copy_to_user(dirent-&gt;d_name, name, namlen);</div><div class='del'>-	put_user(0, dirent-&gt;d_name + namlen);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage int old32_readdir(unsigned int fd, struct old_linux_dirent32 __user *dirent, unsigned int count)</div><div class='del'>-{</div><div class='del'>-	int error = -EBADF;</div><div class='del'>-	struct file * file;</div><div class='del'>-	struct readdir_callback32 buf;</div><div class='del'>-</div><div class='del'>-	file = fget(fd);</div><div class='del'>-	if (!file)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	buf.count = 0;</div><div class='del'>-	buf.dirent = dirent;</div><div class='del'>-</div><div class='del'>-	error = vfs_readdir(file, (filldir_t)fillonedir, &amp;buf);</div><div class='del'>-	if (error &lt; 0)</div><div class='del'>-		goto out_putf;</div><div class='del'>-	error = buf.count;</div><div class='del'>-</div><div class='del'>-out_putf:</div><div class='del'>-	fput(file);</div><div class='del'>-out:</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> asmlinkage long ppc32_select(u32 n, compat_ulong_t __user *inp,</div><div class='ctx'> 		compat_ulong_t __user *outp, compat_ulong_t __user *exp,</div><div class='head'>diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c<br/>index f177c60ea766..65639a43e644 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/vdso.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/vdso.c</a></div><div class='hunk'>@@ -788,9 +788,7 @@ static int __init vdso_init(void)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#ifdef CONFIG_PPC_MERGE</div><div class='ctx'> arch_initcall(vdso_init);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> int in_gate_area_no_task(unsigned long addr)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c<br/>index 22a3c33fd751..2750fbab1975 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/vio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/vio.c</a></div><div class='hunk'>@@ -1113,7 +1113,7 @@ static int vio_bus_probe(struct device *dev)</div><div class='ctx'> 				return error;</div><div class='ctx'> 		}</div><div class='ctx'> 		error = viodrv-&gt;probe(viodev, id);</div><div class='del'>-		if (error)</div><div class='add'>+		if (error &amp;&amp; firmware_has_feature(FW_FEATURE_CMO))</div><div class='ctx'> 			vio_cmo_bus_remove(viodev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S<br/>index 4a8ce62fe112..9f6c1ca1739e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vmlinux.lds.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vmlinux.lds.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -66,11 +66,12 @@ SECTIONS</div><div class='ctx'> 		__got2_end = .;</div><div class='ctx'> #endif /* CONFIG_PPC32 */</div><div class='ctx'> </div><div class='del'>-		. = ALIGN(PAGE_SIZE);</div><div class='del'>-		_etext = .;</div><div class='del'>-		PROVIDE32 (etext = .);</div><div class='ctx'> 	} :kernel</div><div class='ctx'> </div><div class='add'>+	. = ALIGN(PAGE_SIZE);</div><div class='add'>+	_etext = .;</div><div class='add'>+	PROVIDE32 (etext = .);</div><div class='add'>+</div><div class='ctx'> 	/* Read-only data */</div><div class='ctx'> 	RODATA</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile<br/>index 2a88e8b9a3c6..d69912c07ce7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/lib/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/lib/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/lib/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/lib/Makefile</a></div><div class='hunk'>@@ -6,12 +6,10 @@ ifeq ($(CONFIG_PPC64),y)</div><div class='ctx'> EXTRA_CFLAGS		+= -mno-minimal-toc</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-ifeq ($(CONFIG_PPC_MERGE),y)</div><div class='ctx'> obj-y			:= string.o alloc.o \</div><div class='ctx'> 			   checksum_$(CONFIG_WORD_SIZE).o</div><div class='ctx'> obj-$(CONFIG_PPC32)	+= div64.o copy_32.o crtsavres.o</div><div class='ctx'> obj-$(CONFIG_HAS_IOMEM)	+= devres.o</div><div class='del'>-endif</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \</div><div class='ctx'> 			   memcpy_64.o usercopy_64.o mem_64.o string.o</div><div class='head'>diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile<br/>index 1c00e0196f6c..e7392b45a5ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/mm/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/mm/Makefile</a></div><div class='hunk'>@@ -12,7 +12,8 @@ obj-y				:= fault.o mem.o \</div><div class='ctx'> 				   mmu_context_$(CONFIG_WORD_SIZE).o</div><div class='ctx'> hash-$(CONFIG_PPC_NATIVE)	:= hash_native_64.o</div><div class='ctx'> obj-$(CONFIG_PPC64)		+= hash_utils_64.o \</div><div class='del'>-				   slb_low.o slb.o stab.o mmap.o $(hash-y)</div><div class='add'>+				   slb_low.o slb.o stab.o \</div><div class='add'>+				   gup.o mmap.o $(hash-y)</div><div class='ctx'> obj-$(CONFIG_PPC_STD_MMU_32)	+= ppc_mmu_32.o</div><div class='ctx'> obj-$(CONFIG_PPC_STD_MMU)	+= hash_low_$(CONFIG_WORD_SIZE).o \</div><div class='ctx'> 				   tlb_$(CONFIG_WORD_SIZE).o</div><div class='head'>diff --git a/arch/powerpc/mm/gup.c b/arch/powerpc/mm/gup.c<br/>new file mode 100644<br/>index 000000000000..9fdf4d6335e4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/gup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/mm/gup.c</a></div><div class='hunk'>@@ -0,0 +1,280 @@</div><div class='add'>+/*</div><div class='add'>+ * Lockless get_user_pages_fast for powerpc</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Nick Piggin</div><div class='add'>+ * Copyright (C) 2008 Novell Inc.</div><div class='add'>+ */</div><div class='add'>+#undef DEBUG</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/hugetlb.h&gt;</div><div class='add'>+#include &lt;linux/vmstat.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/rwsem.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The performance critical leaf functions are made noinline otherwise gcc</div><div class='add'>+ * inlines everything into a single function which results in too much</div><div class='add'>+ * register pressure.</div><div class='add'>+ */</div><div class='add'>+static noinline int gup_pte_range(pmd_t pmd, unsigned long addr,</div><div class='add'>+		unsigned long end, int write, struct page **pages, int *nr)</div><div class='add'>+{</div><div class='add'>+	unsigned long mask, result;</div><div class='add'>+	pte_t *ptep;</div><div class='add'>+</div><div class='add'>+	result = _PAGE_PRESENT|_PAGE_USER;</div><div class='add'>+	if (write)</div><div class='add'>+		result |= _PAGE_RW;</div><div class='add'>+	mask = result | _PAGE_SPECIAL;</div><div class='add'>+</div><div class='add'>+	ptep = pte_offset_kernel(&amp;pmd, addr);</div><div class='add'>+	do {</div><div class='add'>+		pte_t pte = *ptep;</div><div class='add'>+		struct page *page;</div><div class='add'>+</div><div class='add'>+		if ((pte_val(pte) &amp; mask) != result)</div><div class='add'>+			return 0;</div><div class='add'>+		VM_BUG_ON(!pfn_valid(pte_pfn(pte)));</div><div class='add'>+		page = pte_page(pte);</div><div class='add'>+		if (!page_cache_get_speculative(page))</div><div class='add'>+			return 0;</div><div class='add'>+		if (unlikely(pte != *ptep)) {</div><div class='add'>+			put_page(page);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		pages[*nr] = page;</div><div class='add'>+		(*nr)++;</div><div class='add'>+</div><div class='add'>+	} while (ptep++, addr += PAGE_SIZE, addr != end);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HUGETLB_PAGE</div><div class='add'>+static noinline int gup_huge_pte(pte_t *ptep, struct hstate *hstate,</div><div class='add'>+				 unsigned long *addr, unsigned long end,</div><div class='add'>+				 int write, struct page **pages, int *nr)</div><div class='add'>+{</div><div class='add'>+	unsigned long mask;</div><div class='add'>+	unsigned long pte_end;</div><div class='add'>+	struct page *head, *page;</div><div class='add'>+	pte_t pte;</div><div class='add'>+	int refs;</div><div class='add'>+</div><div class='add'>+	pte_end = (*addr + huge_page_size(hstate)) &amp; huge_page_mask(hstate);</div><div class='add'>+	if (pte_end &lt; end)</div><div class='add'>+		end = pte_end;</div><div class='add'>+</div><div class='add'>+	pte = *ptep;</div><div class='add'>+	mask = _PAGE_PRESENT|_PAGE_USER;</div><div class='add'>+	if (write)</div><div class='add'>+		mask |= _PAGE_RW;</div><div class='add'>+	if ((pte_val(pte) &amp; mask) != mask)</div><div class='add'>+		return 0;</div><div class='add'>+	/* hugepages are never "special" */</div><div class='add'>+	VM_BUG_ON(!pfn_valid(pte_pfn(pte)));</div><div class='add'>+</div><div class='add'>+	refs = 0;</div><div class='add'>+	head = pte_page(pte);</div><div class='add'>+	page = head + ((*addr &amp; ~huge_page_mask(hstate)) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	do {</div><div class='add'>+		VM_BUG_ON(compound_head(page) != head);</div><div class='add'>+		pages[*nr] = page;</div><div class='add'>+		(*nr)++;</div><div class='add'>+		page++;</div><div class='add'>+		refs++;</div><div class='add'>+	} while (*addr += PAGE_SIZE, *addr != end);</div><div class='add'>+</div><div class='add'>+	if (!page_cache_add_speculative(head, refs)) {</div><div class='add'>+		*nr -= refs;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(pte != *ptep)) {</div><div class='add'>+		/* Could be optimized better */</div><div class='add'>+		while (*nr) {</div><div class='add'>+			put_page(page);</div><div class='add'>+			(*nr)--;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_HUGETLB_PAGE */</div><div class='add'>+</div><div class='add'>+static int gup_pmd_range(pud_t pud, unsigned long addr, unsigned long end,</div><div class='add'>+		int write, struct page **pages, int *nr)</div><div class='add'>+{</div><div class='add'>+	unsigned long next;</div><div class='add'>+	pmd_t *pmdp;</div><div class='add'>+</div><div class='add'>+	pmdp = pmd_offset(&amp;pud, addr);</div><div class='add'>+	do {</div><div class='add'>+		pmd_t pmd = *pmdp;</div><div class='add'>+</div><div class='add'>+		next = pmd_addr_end(addr, end);</div><div class='add'>+		if (pmd_none(pmd))</div><div class='add'>+			return 0;</div><div class='add'>+		if (!gup_pte_range(pmd, addr, next, write, pages, nr))</div><div class='add'>+			return 0;</div><div class='add'>+	} while (pmdp++, addr = next, addr != end);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gup_pud_range(pgd_t pgd, unsigned long addr, unsigned long end,</div><div class='add'>+		int write, struct page **pages, int *nr)</div><div class='add'>+{</div><div class='add'>+	unsigned long next;</div><div class='add'>+	pud_t *pudp;</div><div class='add'>+</div><div class='add'>+	pudp = pud_offset(&amp;pgd, addr);</div><div class='add'>+	do {</div><div class='add'>+		pud_t pud = *pudp;</div><div class='add'>+</div><div class='add'>+		next = pud_addr_end(addr, end);</div><div class='add'>+		if (pud_none(pud))</div><div class='add'>+			return 0;</div><div class='add'>+		if (!gup_pmd_range(pud, addr, next, write, pages, nr))</div><div class='add'>+			return 0;</div><div class='add'>+	} while (pudp++, addr = next, addr != end);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int get_user_pages_fast(unsigned long start, int nr_pages, int write,</div><div class='add'>+			struct page **pages)</div><div class='add'>+{</div><div class='add'>+	struct mm_struct *mm = current-&gt;mm;</div><div class='add'>+	unsigned long addr, len, end;</div><div class='add'>+	unsigned long next;</div><div class='add'>+	pgd_t *pgdp;</div><div class='add'>+	int psize, nr = 0;</div><div class='add'>+	unsigned int shift;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s(%lx,%x,%s)\n", __func__, start, nr_pages, write ? "write" : "read");</div><div class='add'>+</div><div class='add'>+	start &amp;= PAGE_MASK;</div><div class='add'>+	addr = start;</div><div class='add'>+	len = (unsigned long) nr_pages &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	end = start + len;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,</div><div class='add'>+					start, len)))</div><div class='add'>+		goto slow_irqon;</div><div class='add'>+</div><div class='add'>+	pr_debug("  aligned: %lx .. %lx\n", start, end);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HUGETLB_PAGE</div><div class='add'>+	/* We bail out on slice boundary crossing when hugetlb is</div><div class='add'>+	 * enabled in order to not have to deal with two different</div><div class='add'>+	 * page table formats</div><div class='add'>+	 */</div><div class='add'>+	if (addr &lt; SLICE_LOW_TOP) {</div><div class='add'>+		if (end &gt; SLICE_LOW_TOP)</div><div class='add'>+			goto slow_irqon;</div><div class='add'>+</div><div class='add'>+		if (unlikely(GET_LOW_SLICE_INDEX(addr) !=</div><div class='add'>+			     GET_LOW_SLICE_INDEX(end - 1)))</div><div class='add'>+			goto slow_irqon;</div><div class='add'>+	} else {</div><div class='add'>+		if (unlikely(GET_HIGH_SLICE_INDEX(addr) !=</div><div class='add'>+			     GET_HIGH_SLICE_INDEX(end - 1)))</div><div class='add'>+			goto slow_irqon;</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_HUGETLB_PAGE */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * XXX: batch / limit 'nr', to avoid large irq off latency</div><div class='add'>+	 * needs some instrumenting to determine the common sizes used by</div><div class='add'>+	 * important workloads (eg. DB2), and whether limiting the batch size</div><div class='add'>+	 * will decrease performance.</div><div class='add'>+	 *</div><div class='add'>+	 * It seems like we're in the clear for the moment. Direct-IO is</div><div class='add'>+	 * the main guy that batches up lots of get_user_pages, and even</div><div class='add'>+	 * they are limited to 64-at-a-time which is not so many.</div><div class='add'>+	 */</div><div class='add'>+	/*</div><div class='add'>+	 * This doesn't prevent pagetable teardown, but does prevent</div><div class='add'>+	 * the pagetables from being freed on powerpc.</div><div class='add'>+	 *</div><div class='add'>+	 * So long as we atomically load page table pointers versus teardown,</div><div class='add'>+	 * we can follow the address down to the the page and take a ref on it.</div><div class='add'>+	 */</div><div class='add'>+	local_irq_disable();</div><div class='add'>+</div><div class='add'>+	psize = get_slice_psize(mm, addr);</div><div class='add'>+	shift = mmu_psize_defs[psize].shift;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HUGETLB_PAGE</div><div class='add'>+	if (unlikely(mmu_huge_psizes[psize])) {</div><div class='add'>+		pte_t *ptep;</div><div class='add'>+		unsigned long a = addr;</div><div class='add'>+		unsigned long sz = ((1UL) &lt;&lt; shift);</div><div class='add'>+		struct hstate *hstate = size_to_hstate(sz);</div><div class='add'>+</div><div class='add'>+		BUG_ON(!hstate);</div><div class='add'>+		/*</div><div class='add'>+		 * XXX: could be optimized to avoid hstate</div><div class='add'>+		 * lookup entirely (just use shift)</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			VM_BUG_ON(shift != mmu_psize_defs[get_slice_psize(mm, a)].shift);</div><div class='add'>+			ptep = huge_pte_offset(mm, a);</div><div class='add'>+			pr_debug(" %016lx: huge ptep %p\n", a, ptep);</div><div class='add'>+			if (!ptep || !gup_huge_pte(ptep, hstate, &amp;a, end, write, pages,</div><div class='add'>+						   &amp;nr))</div><div class='add'>+				goto slow;</div><div class='add'>+		} while (a != end);</div><div class='add'>+	} else</div><div class='add'>+#endif /* CONFIG_HUGETLB_PAGE */</div><div class='add'>+	{</div><div class='add'>+		pgdp = pgd_offset(mm, addr);</div><div class='add'>+		do {</div><div class='add'>+			pgd_t pgd = *pgdp;</div><div class='add'>+</div><div class='add'>+			VM_BUG_ON(shift != mmu_psize_defs[get_slice_psize(mm, addr)].shift);</div><div class='add'>+			pr_debug("  %016lx: normal pgd %p\n", addr, (void *)pgd);</div><div class='add'>+			next = pgd_addr_end(addr, end);</div><div class='add'>+			if (pgd_none(pgd))</div><div class='add'>+				goto slow;</div><div class='add'>+			if (!gup_pud_range(pgd, addr, next, write, pages, &amp;nr))</div><div class='add'>+				goto slow;</div><div class='add'>+		} while (pgdp++, addr = next, addr != end);</div><div class='add'>+	}</div><div class='add'>+	local_irq_enable();</div><div class='add'>+</div><div class='add'>+	VM_BUG_ON(nr != (end - start) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	return nr;</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+slow:</div><div class='add'>+		local_irq_enable();</div><div class='add'>+slow_irqon:</div><div class='add'>+		pr_debug("  slow path ! nr = %d\n", nr);</div><div class='add'>+</div><div class='add'>+		/* Try to get the remaining pages with get_user_pages */</div><div class='add'>+		start += nr &lt;&lt; PAGE_SHIFT;</div><div class='add'>+		pages += nr;</div><div class='add'>+</div><div class='add'>+		down_read(&amp;mm-&gt;mmap_sem);</div><div class='add'>+		ret = get_user_pages(current, mm, start,</div><div class='add'>+			(end - start) &gt;&gt; PAGE_SHIFT, write, 0, pages, NULL);</div><div class='add'>+		up_read(&amp;mm-&gt;mmap_sem);</div><div class='add'>+</div><div class='add'>+		/* Have to be a bit careful with return values */</div><div class='add'>+		if (nr &gt; 0) {</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				ret = nr;</div><div class='add'>+			else</div><div class='add'>+				ret += nr;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c<br/>index 5ce5a4dcd008..8920eea34528 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/hash_utils_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/mm/hash_utils_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/hash_utils_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/mm/hash_utils_64.c</a></div><div class='hunk'>@@ -151,39 +151,58 @@ static struct mmu_psize_def mmu_psize_defaults_gp[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static unsigned long htab_convert_pte_flags(unsigned long pteflags)</div><div class='add'>+{</div><div class='add'>+	unsigned long rflags = pteflags &amp; 0x1fa;</div><div class='add'>+</div><div class='add'>+	/* _PAGE_EXEC -&gt; NOEXEC */</div><div class='add'>+	if ((pteflags &amp; _PAGE_EXEC) == 0)</div><div class='add'>+		rflags |= HPTE_R_N;</div><div class='add'>+</div><div class='add'>+	/* PP bits. PAGE_USER is already PP bit 0x2, so we only</div><div class='add'>+	 * need to add in 0x1 if it's a read-only user page</div><div class='add'>+	 */</div><div class='add'>+	if ((pteflags &amp; _PAGE_USER) &amp;&amp; !((pteflags &amp; _PAGE_RW) &amp;&amp;</div><div class='add'>+					 (pteflags &amp; _PAGE_DIRTY)))</div><div class='add'>+		rflags |= 1;</div><div class='add'>+</div><div class='add'>+	/* Always add C */</div><div class='add'>+	return rflags | HPTE_R_C;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int htab_bolt_mapping(unsigned long vstart, unsigned long vend,</div><div class='del'>-		      unsigned long pstart, unsigned long mode,</div><div class='add'>+		      unsigned long pstart, unsigned long prot,</div><div class='ctx'> 		      int psize, int ssize)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long vaddr, paddr;</div><div class='ctx'> 	unsigned int step, shift;</div><div class='del'>-	unsigned long tmp_mode;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	shift = mmu_psize_defs[psize].shift;</div><div class='ctx'> 	step = 1 &lt;&lt; shift;</div><div class='ctx'> </div><div class='add'>+	prot = htab_convert_pte_flags(prot);</div><div class='add'>+</div><div class='add'>+	DBG("htab_bolt_mapping(%lx..%lx -&gt; %lx (%lx,%d,%d)\n",</div><div class='add'>+	    vstart, vend, pstart, prot, psize, ssize);</div><div class='add'>+</div><div class='ctx'> 	for (vaddr = vstart, paddr = pstart; vaddr &lt; vend;</div><div class='ctx'> 	     vaddr += step, paddr += step) {</div><div class='ctx'> 		unsigned long hash, hpteg;</div><div class='ctx'> 		unsigned long vsid = get_kernel_vsid(vaddr, ssize);</div><div class='ctx'> 		unsigned long va = hpt_va(vaddr, vsid, ssize);</div><div class='add'>+		unsigned long tprot = prot;</div><div class='ctx'> </div><div class='del'>-		tmp_mode = mode;</div><div class='del'>-		</div><div class='del'>-		/* Make non-kernel text non-executable */</div><div class='del'>-		if (!in_kernel_text(vaddr))</div><div class='del'>-			tmp_mode = mode | HPTE_R_N;</div><div class='add'>+		/* Make kernel text executable */</div><div class='add'>+		if (in_kernel_text(vaddr))</div><div class='add'>+			tprot &amp;= ~HPTE_R_N;</div><div class='ctx'> </div><div class='ctx'> 		hash = hpt_hash(va, shift, ssize);</div><div class='ctx'> 		hpteg = ((hash &amp; htab_hash_mask) * HPTES_PER_GROUP);</div><div class='ctx'> </div><div class='del'>-		DBG("htab_bolt_mapping: calling %p\n", ppc_md.hpte_insert);</div><div class='del'>-</div><div class='ctx'> 		BUG_ON(!ppc_md.hpte_insert);</div><div class='del'>-		ret = ppc_md.hpte_insert(hpteg, va, paddr,</div><div class='del'>-				tmp_mode, HPTE_V_BOLTED, psize, ssize);</div><div class='add'>+		ret = ppc_md.hpte_insert(hpteg, va, paddr, tprot,</div><div class='add'>+					 HPTE_V_BOLTED, psize, ssize);</div><div class='ctx'> </div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -519,9 +538,9 @@ static unsigned long __init htab_get_table_size(void)</div><div class='ctx'> #ifdef CONFIG_MEMORY_HOTPLUG</div><div class='ctx'> void create_section_mapping(unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='del'>-		BUG_ON(htab_bolt_mapping(start, end, __pa(start),</div><div class='del'>-			_PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_COHERENT | PP_RWXX,</div><div class='del'>-			mmu_linear_psize, mmu_kernel_ssize));</div><div class='add'>+	BUG_ON(htab_bolt_mapping(start, end, __pa(start),</div><div class='add'>+				 PAGE_KERNEL, mmu_linear_psize,</div><div class='add'>+				 mmu_kernel_ssize));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int remove_section_mapping(unsigned long start, unsigned long end)</div><div class='hunk'>@@ -570,7 +589,7 @@ void __init htab_initialize(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long table;</div><div class='ctx'> 	unsigned long pteg_count;</div><div class='del'>-	unsigned long mode_rw;</div><div class='add'>+	unsigned long prot;</div><div class='ctx'> 	unsigned long base = 0, size = 0, limit;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -628,7 +647,7 @@ void __init htab_initialize(void)</div><div class='ctx'> 		mtspr(SPRN_SDR1, _SDR1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mode_rw = _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_COHERENT | PP_RWXX;</div><div class='add'>+	prot = PAGE_KERNEL;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='ctx'> 	linear_map_hash_count = lmb_end_of_DRAM() &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -647,7 +666,8 @@ void __init htab_initialize(void)</div><div class='ctx'> 		base = (unsigned long)__va(lmb.memory.region[i].base);</div><div class='ctx'> 		size = lmb.memory.region[i].size;</div><div class='ctx'> </div><div class='del'>-		DBG("creating mapping for region: %lx : %lx\n", base, size);</div><div class='add'>+		DBG("creating mapping for region: %lx..%lx (prot: %x)\n",</div><div class='add'>+		    base, size, prot);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_U3_DART</div><div class='ctx'> 		/* Do not map the DART space. Fortunately, it will be aligned</div><div class='hunk'>@@ -664,21 +684,21 @@ void __init htab_initialize(void)</div><div class='ctx'> 			unsigned long dart_table_end = dart_tablebase + 16 * MB;</div><div class='ctx'> 			if (base != dart_tablebase)</div><div class='ctx'> 				BUG_ON(htab_bolt_mapping(base, dart_tablebase,</div><div class='del'>-							__pa(base), mode_rw,</div><div class='add'>+							__pa(base), prot,</div><div class='ctx'> 							mmu_linear_psize,</div><div class='ctx'> 							mmu_kernel_ssize));</div><div class='ctx'> 			if ((base + size) &gt; dart_table_end)</div><div class='ctx'> 				BUG_ON(htab_bolt_mapping(dart_tablebase+16*MB,</div><div class='ctx'> 							base + size,</div><div class='ctx'> 							__pa(dart_table_end),</div><div class='del'>-							 mode_rw,</div><div class='add'>+							 prot,</div><div class='ctx'> 							 mmu_linear_psize,</div><div class='ctx'> 							 mmu_kernel_ssize));</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> #endif /* CONFIG_U3_DART */</div><div class='ctx'> 		BUG_ON(htab_bolt_mapping(base, base + size, __pa(base),</div><div class='del'>-				mode_rw, mmu_linear_psize, mmu_kernel_ssize));</div><div class='add'>+				prot, mmu_linear_psize, mmu_kernel_ssize));</div><div class='ctx'>        }</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -696,7 +716,7 @@ void __init htab_initialize(void)</div><div class='ctx'> 			tce_alloc_start = base + size + 1;</div><div class='ctx'> </div><div class='ctx'> 		BUG_ON(htab_bolt_mapping(tce_alloc_start, tce_alloc_end,</div><div class='del'>-					 __pa(tce_alloc_start), mode_rw,</div><div class='add'>+					 __pa(tce_alloc_start), prot,</div><div class='ctx'> 					 mmu_linear_psize, mmu_kernel_ssize));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1117,8 +1137,7 @@ static void kernel_map_linear_page(unsigned long vaddr, unsigned long lmi)</div><div class='ctx'> 	unsigned long hash, hpteg;</div><div class='ctx'> 	unsigned long vsid = get_kernel_vsid(vaddr, mmu_kernel_ssize);</div><div class='ctx'> 	unsigned long va = hpt_va(vaddr, vsid, mmu_kernel_ssize);</div><div class='del'>-	unsigned long mode = _PAGE_ACCESSED | _PAGE_DIRTY |</div><div class='del'>-		_PAGE_COHERENT | PP_RWXX | HPTE_R_N;</div><div class='add'>+	unsigned long mode = htab_convert_pte_flags(PAGE_KERNEL);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	hash = hpt_hash(va, PAGE_SHIFT, mmu_kernel_ssize);</div><div class='head'>diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c<br/>index 4f7df85129d8..036fe2f10c77 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/init_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/mm/init_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/init_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/mm/init_64.c</a></div><div class='hunk'>@@ -206,13 +206,10 @@ static int __meminit vmemmap_populated(unsigned long start, int page_size)</div><div class='ctx'> int __meminit vmemmap_populate(struct page *start_page,</div><div class='ctx'> 			       unsigned long nr_pages, int node)</div><div class='ctx'> {</div><div class='del'>-	unsigned long mode_rw;</div><div class='ctx'> 	unsigned long start = (unsigned long)start_page;</div><div class='ctx'> 	unsigned long end = (unsigned long)(start_page + nr_pages);</div><div class='ctx'> 	unsigned long page_size = 1 &lt;&lt; mmu_psize_defs[mmu_vmemmap_psize].shift;</div><div class='ctx'> </div><div class='del'>-	mode_rw = _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_COHERENT | PP_RWXX;</div><div class='del'>-</div><div class='ctx'> 	/* Align to the page size of the linear mapping. */</div><div class='ctx'> 	start = _ALIGN_DOWN(start, page_size);</div><div class='ctx'> </div><div class='hunk'>@@ -230,9 +227,9 @@ int __meminit vmemmap_populate(struct page *start_page,</div><div class='ctx'> 		pr_debug("vmemmap %08lx allocated at %p, physical %08lx.\n",</div><div class='ctx'> 			start, p, __pa(p));</div><div class='ctx'> </div><div class='del'>-		mapped = htab_bolt_mapping(start, start + page_size,</div><div class='del'>-					__pa(p), mode_rw, mmu_vmemmap_psize,</div><div class='del'>-					mmu_kernel_ssize);</div><div class='add'>+		mapped = htab_bolt_mapping(start, start + page_size, __pa(p),</div><div class='add'>+					   PAGE_KERNEL, mmu_vmemmap_psize,</div><div class='add'>+					   mmu_kernel_ssize);</div><div class='ctx'> 		BUG_ON(mapped &lt; 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c<br/>index 702691cb9e82..1c93c255873b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/mem.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/mm/mem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/mem.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/mm/mem.c</a></div><div class='hunk'>@@ -311,7 +311,7 @@ void __init paging_init(void)</div><div class='ctx'> #endif /* CONFIG_HIGHMEM */</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEBUG "Top of RAM: 0x%llx, Total RAM: 0x%lx\n",</div><div class='del'>-	       (u64)top_of_ram, total_ram);</div><div class='add'>+	       (unsigned long long)top_of_ram, total_ram);</div><div class='ctx'> 	printk(KERN_DEBUG "Memory hole size: %ldMB\n",</div><div class='ctx'> 	       (long int)((top_of_ram - total_ram) &gt;&gt; 20));</div><div class='ctx'> 	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));</div><div class='head'>diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c<br/>index c53145f61942..6aa120813775 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/ppc_mmu_32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/mm/ppc_mmu_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/ppc_mmu_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/mm/ppc_mmu_32.c</a></div><div class='hunk'>@@ -236,8 +236,8 @@ void __init MMU_init_hw(void)</div><div class='ctx'> </div><div class='ctx'> 	Hash_end = (struct hash_pte *) ((unsigned long)Hash + Hash_size);</div><div class='ctx'> </div><div class='del'>-	printk("Total memory = %ldMB; using %ldkB for hash table (at %p)\n",</div><div class='del'>-	       total_memory &gt;&gt; 20, Hash_size &gt;&gt; 10, Hash);</div><div class='add'>+	printk("Total memory = %lldMB; using %ldkB for hash table (at %p)\n",</div><div class='add'>+	       (unsigned long long)(total_memory &gt;&gt; 20), Hash_size &gt;&gt; 10, Hash);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/powerpc/mm/tlb_64.c b/arch/powerpc/mm/tlb_64.c<br/>index 409fcc7b63ce..be7dd422c0fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/tlb_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/mm/tlb_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/tlb_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/mm/tlb_64.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> DEFINE_PER_CPU(struct ppc64_tlb_batch, ppc64_tlb_batch);</div><div class='ctx'> </div><div class='ctx'> /* This is declared as we are using the more or less generic</div><div class='del'>- * include/asm-powerpc/tlb.h file -- tgall</div><div class='add'>+ * arch/powerpc/include/asm/tlb.h file -- tgall</div><div class='ctx'>  */</div><div class='ctx'> DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);</div><div class='ctx'> static DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur);</div><div class='head'>diff --git a/arch/powerpc/platforms/44x/warp-nand.c b/arch/powerpc/platforms/44x/warp-nand.c<br/>index e55746b824b4..89ecd76127d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/44x/warp-nand.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/44x/warp-nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/44x/warp-nand.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/44x/warp-nand.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> </div><div class='ctx'> static struct resource warp_ndfc = {</div><div class='ctx'> 	.start = WARP_NAND_FLASH_REG_ADDR,</div><div class='del'>-	.end   = WARP_NAND_FLASH_REG_ADDR + WARP_NAND_FLASH_REG_SIZE,</div><div class='add'>+	.end   = WARP_NAND_FLASH_REG_ADDR + WARP_NAND_FLASH_REG_SIZE - 1,</div><div class='ctx'> 	.flags = IORESOURCE_MEM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c<br/>index 9565995cba7f..960edf89be51 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/44x/warp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/44x/warp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/44x/warp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/44x/warp.c</a></div><div class='hunk'>@@ -30,18 +30,6 @@ static __initdata struct of_device_id warp_of_bus[] = {</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static __initdata struct i2c_board_info warp_i2c_info[] = {</div><div class='del'>-	{ I2C_BOARD_INFO("ad7414", 0x4a) }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init warp_arch_init(void)</div><div class='del'>-{</div><div class='del'>-	/* This should go away once support is moved to the dts. */</div><div class='del'>-	i2c_register_board_info(0, warp_i2c_info, ARRAY_SIZE(warp_i2c_info));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_arch_initcall(warp, warp_arch_init);</div><div class='del'>-</div><div class='ctx'> static int __init warp_device_probe(void)</div><div class='ctx'> {</div><div class='ctx'> 	of_platform_bus_probe(NULL, warp_of_bus, NULL);</div><div class='hunk'>@@ -223,7 +211,7 @@ static void pika_setup_critical_temp(struct i2c_client *client)</div><div class='ctx'> </div><div class='ctx'> 	/* These registers are in 1 degree increments. */</div><div class='ctx'> 	i2c_smbus_write_byte_data(client, 2, 65); /* Thigh */</div><div class='del'>-	i2c_smbus_write_byte_data(client, 3, 55); /* Tlow */</div><div class='add'>+	i2c_smbus_write_byte_data(client, 3,  0); /* Tlow */</div><div class='ctx'> </div><div class='ctx'> 	np = of_find_compatible_node(NULL, NULL, "adi,ad7414");</div><div class='ctx'> 	if (np == NULL) {</div><div class='hunk'>@@ -289,8 +277,15 @@ found_it:</div><div class='ctx'> 	printk(KERN_INFO "PIKA DTM thread running.\n");</div><div class='ctx'> </div><div class='ctx'> 	while (!kthread_should_stop()) {</div><div class='del'>-		u16 temp = swab16(i2c_smbus_read_word_data(client, 0));</div><div class='del'>-		out_be32(fpga + 0x20, temp);</div><div class='add'>+		int val;</div><div class='add'>+</div><div class='add'>+		val = i2c_smbus_read_word_data(client, 0);</div><div class='add'>+		if (val &lt; 0)</div><div class='add'>+			dev_dbg(&amp;client-&gt;dev, "DTM read temp failed.\n");</div><div class='add'>+		else {</div><div class='add'>+			s16 temp = swab16(val);</div><div class='add'>+			out_be32(fpga + 0x20, temp);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		pika_dtm_check_fan(fpga);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/52xx/Makefile b/arch/powerpc/platforms/52xx/Makefile<br/>index daf0e1568d6d..b8a52062738a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/52xx/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/52xx/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/52xx/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/52xx/Makefile</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='ctx'> #</div><div class='ctx'> # Makefile for 52xx based boards</div><div class='ctx'> #</div><div class='del'>-ifeq ($(CONFIG_PPC_MERGE),y)</div><div class='ctx'> obj-y				+= mpc52xx_pic.o mpc52xx_common.o</div><div class='ctx'> obj-$(CONFIG_PCI)		+= mpc52xx_pci.o</div><div class='del'>-endif</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PPC_MPC5200_SIMPLE) += mpc5200_simple.o</div><div class='ctx'> obj-$(CONFIG_PPC_EFIKA)		+= efika.o</div><div class='hunk'>@@ -15,4 +13,4 @@ ifeq ($(CONFIG_PPC_LITE5200),y)</div><div class='ctx'> 	obj-$(CONFIG_PM)	+= lite5200_sleep.o lite5200_pm.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_PPC_MPC5200_GPIO)	+= mpc52xx_gpio.o
\ No newline at end of file</div><div class='add'>+obj-$(CONFIG_PPC_MPC5200_GPIO)	+= mpc52xx_gpio.o</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c<br/>index dd4be4aee314..ec43477caa63 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc832x_mds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/83xx/mpc832x_mds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc832x_mds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/83xx/mpc832x_mds.c</a></div><div class='hunk'>@@ -105,6 +105,7 @@ static void __init mpc832x_sys_setup_arch(void)</div><div class='ctx'> static struct of_device_id mpc832x_ids[] = {</div><div class='ctx'> 	{ .type = "soc", },</div><div class='ctx'> 	{ .compatible = "soc", },</div><div class='add'>+	{ .compatible = "simple-bus", },</div><div class='ctx'> 	{ .type = "qe", },</div><div class='ctx'> 	{ .compatible = "fsl,qe", },</div><div class='ctx'> 	{},</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c<br/>index f049d692d4c8..0300268ce5b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc832x_rdb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/83xx/mpc832x_rdb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc832x_rdb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/83xx/mpc832x_rdb.c</a></div><div class='hunk'>@@ -115,6 +115,7 @@ static void __init mpc832x_rdb_setup_arch(void)</div><div class='ctx'> static struct of_device_id mpc832x_ids[] = {</div><div class='ctx'> 	{ .type = "soc", },</div><div class='ctx'> 	{ .compatible = "soc", },</div><div class='add'>+	{ .compatible = "simple-bus", },</div><div class='ctx'> 	{ .type = "qe", },</div><div class='ctx'> 	{ .compatible = "fsl,qe", },</div><div class='ctx'> 	{},</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c<br/>index 7301d77a08ee..76092d37c7d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc834x_itx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/83xx/mpc834x_itx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc834x_itx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/83xx/mpc834x_itx.c</a></div><div class='hunk'>@@ -41,6 +41,7 @@</div><div class='ctx'> </div><div class='ctx'> static struct of_device_id __initdata mpc834x_itx_ids[] = {</div><div class='ctx'> 	{ .compatible = "fsl,pq2pro-localbus", },</div><div class='add'>+	{ .compatible = "simple-bus", },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c<br/>index 30d509aa9f08..fc3f2ed1f3e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc834x_mds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/83xx/mpc834x_mds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc834x_mds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/83xx/mpc834x_mds.c</a></div><div class='hunk'>@@ -111,6 +111,7 @@ static void __init mpc834x_mds_init_IRQ(void)</div><div class='ctx'> static struct of_device_id mpc834x_ids[] = {</div><div class='ctx'> 	{ .type = "soc", },</div><div class='ctx'> 	{ .compatible = "soc", },</div><div class='add'>+	{ .compatible = "simple-bus", },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c<br/>index 75b80e836576..9d46e5bdd101 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc836x_mds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/83xx/mpc836x_mds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc836x_mds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/83xx/mpc836x_mds.c</a></div><div class='hunk'>@@ -136,6 +136,7 @@ static void __init mpc836x_mds_setup_arch(void)</div><div class='ctx'> static struct of_device_id mpc836x_ids[] = {</div><div class='ctx'> 	{ .type = "soc", },</div><div class='ctx'> 	{ .compatible = "soc", },</div><div class='add'>+	{ .compatible = "simple-bus", },</div><div class='ctx'> 	{ .type = "qe", },</div><div class='ctx'> 	{ .compatible = "fsl,qe", },</div><div class='ctx'> 	{},</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/sbc834x.c b/arch/powerpc/platforms/83xx/sbc834x.c<br/>index fc21f5c15bab..156c4e218009 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/sbc834x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/83xx/sbc834x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/sbc834x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/83xx/sbc834x.c</a></div><div class='hunk'>@@ -83,6 +83,7 @@ static void __init sbc834x_init_IRQ(void)</div><div class='ctx'> static struct __initdata of_device_id sbc834x_ids[] = {</div><div class='ctx'> 	{ .type = "soc", },</div><div class='ctx'> 	{ .compatible = "soc", },</div><div class='add'>+	{ .compatible = "simple-bus", },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/ksi8560.c b/arch/powerpc/platforms/85xx/ksi8560.c<br/>index 2145adeb220c..8a3b117b6ce2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/ksi8560.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/85xx/ksi8560.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/ksi8560.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/85xx/ksi8560.c</a></div><div class='hunk'>@@ -222,6 +222,7 @@ static void ksi8560_show_cpuinfo(struct seq_file *m)</div><div class='ctx'> </div><div class='ctx'> static struct of_device_id __initdata of_bus_ids[] = {</div><div class='ctx'> 	{ .type = "soc", },</div><div class='add'>+	{ .type = "simple-bus", },</div><div class='ctx'> 	{ .name = "cpm", },</div><div class='ctx'> 	{ .name = "localbus", },</div><div class='ctx'> 	{},</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/mpc8536_ds.c b/arch/powerpc/platforms/85xx/mpc8536_ds.c<br/>index 6b846aa1ced9..1bf5aefdfeb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc8536_ds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/85xx/mpc8536_ds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc8536_ds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/85xx/mpc8536_ds.c</a></div><div class='hunk'>@@ -91,6 +91,7 @@ static void __init mpc8536_ds_setup_arch(void)</div><div class='ctx'> static struct of_device_id __initdata mpc8536_ds_ids[] = {</div><div class='ctx'> 	{ .type = "soc", },</div><div class='ctx'> 	{ .compatible = "soc", },</div><div class='add'>+	{ .compatible = "simple-bus", },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c<br/>index ba498d6f2d02..d17807a6b89a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_ads.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/85xx/mpc85xx_ads.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_ads.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/85xx/mpc85xx_ads.c</a></div><div class='hunk'>@@ -230,6 +230,7 @@ static struct of_device_id __initdata of_bus_ids[] = {</div><div class='ctx'> 	{ .type = "soc", },</div><div class='ctx'> 	{ .name = "cpm", },</div><div class='ctx'> 	{ .name = "localbus", },</div><div class='add'>+	{ .compatible = "simple-bus", },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c<br/>index 00c535806647..483b65cbabae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_ds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/85xx/mpc85xx_ds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_ds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/85xx/mpc85xx_ds.c</a></div><div class='hunk'>@@ -186,6 +186,7 @@ static int __init mpc8544_ds_probe(void)</div><div class='ctx'> static struct of_device_id __initdata mpc85xxds_ids[] = {</div><div class='ctx'> 	{ .type = "soc", },</div><div class='ctx'> 	{ .compatible = "soc", },</div><div class='add'>+	{ .compatible = "simple-bus", },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c<br/>index 43a459f63e31..2494c5155919 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_mds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/85xx/mpc85xx_mds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_mds.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/85xx/mpc85xx_mds.c</a></div><div class='hunk'>@@ -260,6 +260,7 @@ machine_arch_initcall(mpc85xx_mds, board_fixups);</div><div class='ctx'> static struct of_device_id mpc85xx_ids[] = {</div><div class='ctx'> 	{ .type = "soc", },</div><div class='ctx'> 	{ .compatible = "soc", },</div><div class='add'>+	{ .compatible = "simple-bus", },</div><div class='ctx'> 	{ .type = "qe", },</div><div class='ctx'> 	{ .compatible = "fsl,qe", },</div><div class='ctx'> 	{},</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/sbc8560.c b/arch/powerpc/platforms/85xx/sbc8560.c<br/>index 2c580cd24e4f..6509ade71668 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/sbc8560.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/85xx/sbc8560.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/sbc8560.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/85xx/sbc8560.c</a></div><div class='hunk'>@@ -217,6 +217,7 @@ static struct of_device_id __initdata of_bus_ids[] = {</div><div class='ctx'> 	{ .type = "soc", },</div><div class='ctx'> 	{ .name = "cpm", },</div><div class='ctx'> 	{ .name = "localbus", },</div><div class='add'>+	{ .compatible = "simple-bus", },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/mpc86xx_smp.c b/arch/powerpc/platforms/86xx/mpc86xx_smp.c<br/>index 835f2dc24dc9..014e26cda08d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/86xx/mpc86xx_smp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/86xx/mpc86xx_smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/86xx/mpc86xx_smp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/86xx/mpc86xx_smp.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='del'>-#include &lt;asm-powerpc/mpic.h&gt;</div><div class='add'>+#include &lt;asm/mpic.h&gt;</div><div class='ctx'> #include &lt;asm/mpc86xx.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig<br/>index 6fc849e51e48..71d7562e190b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/8xx/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/8xx/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/8xx/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/8xx/Kconfig</a></div><div class='hunk'>@@ -105,6 +105,16 @@ config 8xx_COPYBACK</div><div class='ctx'> </div><div class='ctx'> 	  If in doubt, say Y here.</div><div class='ctx'> </div><div class='add'>+config 8xx_GPIO</div><div class='add'>+	bool "GPIO API Support"</div><div class='add'>+	select GENERIC_GPIO</div><div class='add'>+	select ARCH_REQUIRE_GPIOLIB</div><div class='add'>+	help</div><div class='add'>+	  Saying Y here will cause the ports on an MPC8xx processor to be used</div><div class='add'>+	  with the GPIO API.  If you say N here, the kernel needs less memory.</div><div class='add'>+</div><div class='add'>+	  If in doubt, say Y here.</div><div class='add'>+</div><div class='ctx'> config 8xx_CPU6</div><div class='ctx'> 	bool "CPU6 Silicon Errata (860 Pre Rev. C)"</div><div class='ctx'> 	help</div><div class='head'>diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig<br/>index 1d0968775c0a..4c900efa164e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/Kconfig</a></div><div class='hunk'>@@ -254,6 +254,8 @@ config CPM2</div><div class='ctx'> 	select CPM</div><div class='ctx'> 	select PPC_LIB_RHEAP</div><div class='ctx'> 	select PPC_PCI_CHOICE</div><div class='add'>+	select ARCH_REQUIRE_GPIOLIB</div><div class='add'>+	select GENERIC_GPIO</div><div class='ctx'> 	help</div><div class='ctx'> 	  The CPM2 (Communications Processor Module) is a coprocessor on</div><div class='ctx'> 	  embedded CPUs made by Freescale.  Selecting this option means that</div><div class='hunk'>@@ -281,6 +283,7 @@ config FSL_ULI1575</div><div class='ctx'> </div><div class='ctx'> config CPM</div><div class='ctx'> 	bool</div><div class='add'>+	select PPC_CLOCK</div><div class='ctx'> </div><div class='ctx'> config OF_RTC</div><div class='ctx'> 	bool</div><div class='head'>diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile<br/>index 423a0234dc31..8079e0b4fd69 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/Makefile</a></div><div class='hunk'>@@ -1,13 +1,7 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_FSL_ULI1575)	+= fsl_uli1575.o</div><div class='ctx'> </div><div class='del'>-ifeq ($(CONFIG_PPC_MERGE),y)</div><div class='ctx'> obj-$(CONFIG_PPC_PMAC)		+= powermac/</div><div class='del'>-else</div><div class='del'>-ifeq ($(CONFIG_PPC64),y)</div><div class='del'>-obj-$(CONFIG_PPC_PMAC)		+= powermac/</div><div class='del'>-endif</div><div class='del'>-endif</div><div class='ctx'> obj-$(CONFIG_PPC_CHRP)		+= chrp/</div><div class='ctx'> obj-$(CONFIG_40x)		+= 40x/</div><div class='ctx'> obj-$(CONFIG_44x)		+= 44x/</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c b/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c<br/>index 69288f653144..3233fe84d158 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c</a></div><div class='hunk'>@@ -96,6 +96,12 @@ static int pmi_notifier(struct notifier_block *nb,</div><div class='ctx'> 	struct cpufreq_frequency_table *cbe_freqs;</div><div class='ctx'> 	u8 node;</div><div class='ctx'> </div><div class='add'>+	/* Should this really be called for CPUFREQ_ADJUST, CPUFREQ_INCOMPATIBLE</div><div class='add'>+	 * and CPUFREQ_NOTIFY policy events?)</div><div class='add'>+	 */</div><div class='add'>+	if (event == CPUFREQ_START)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	cbe_freqs = cpufreq_frequency_get_table(policy-&gt;cpu);</div><div class='ctx'> 	node = cbe_cpu_to_node(policy-&gt;cpu);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c<br/>index f7edba6cb795..c9bb7cfd3dca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/run.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/cell/spufs/run.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/run.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/cell/spufs/run.c</a></div><div class='hunk'>@@ -206,11 +206,6 @@ static int spu_run_init(struct spu_context *ctx, u32 *npc)</div><div class='ctx'> 			(SPU_RUNCNTL_RUNNABLE | SPU_RUNCNTL_ISOLATE);</div><div class='ctx'> 		if (runcntl == 0)</div><div class='ctx'> 			runcntl = SPU_RUNCNTL_RUNNABLE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;flags &amp; SPU_CREATE_NOSCHED) {</div><div class='del'>-		spuctx_switch_state(ctx, SPU_UTIL_USER);</div><div class='del'>-		ctx-&gt;ops-&gt;runcntl_write(ctx, runcntl);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		unsigned long privcntl;</div><div class='ctx'> </div><div class='hunk'>@@ -219,9 +214,15 @@ static int spu_run_init(struct spu_context *ctx, u32 *npc)</div><div class='ctx'> 		else</div><div class='ctx'> 			privcntl = SPU_PRIVCNTL_MODE_NORMAL;</div><div class='ctx'> </div><div class='del'>-		ctx-&gt;ops-&gt;npc_write(ctx, *npc);</div><div class='ctx'> 		ctx-&gt;ops-&gt;privcntl_write(ctx, privcntl);</div><div class='del'>-		ctx-&gt;ops-&gt;runcntl_write(ctx, runcntl);</div><div class='add'>+		ctx-&gt;ops-&gt;npc_write(ctx, *npc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;ops-&gt;runcntl_write(ctx, runcntl);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;flags &amp; SPU_CREATE_NOSCHED) {</div><div class='add'>+		spuctx_switch_state(ctx, SPU_UTIL_USER);</div><div class='add'>+	} else {</div><div class='ctx'> </div><div class='ctx'> 		if (ctx-&gt;state == SPU_STATE_SAVED) {</div><div class='ctx'> 			ret = spu_activate(ctx, 0);</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c<br/>index 2deeeba7eccf..67595bc380dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/sched.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/cell/spufs/sched.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/sched.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/cell/spufs/sched.c</a></div><div class='hunk'>@@ -641,9 +641,12 @@ static struct spu *find_victim(struct spu_context *ctx)</div><div class='ctx'> </div><div class='ctx'> 			if (tmp &amp;&amp; tmp-&gt;prio &gt; ctx-&gt;prio &amp;&amp;</div><div class='ctx'> 			    !(tmp-&gt;flags &amp; SPU_CREATE_NOSCHED) &amp;&amp;</div><div class='del'>-			    (!victim || tmp-&gt;prio &gt; victim-&gt;prio))</div><div class='add'>+			    (!victim || tmp-&gt;prio &gt; victim-&gt;prio)) {</div><div class='ctx'> 				victim = spu-&gt;ctx;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+		if (victim)</div><div class='add'>+			get_spu_context(victim);</div><div class='ctx'> 		mutex_unlock(&amp;cbe_spu_info[node].list_mutex);</div><div class='ctx'> </div><div class='ctx'> 		if (victim) {</div><div class='hunk'>@@ -658,6 +661,7 @@ static struct spu *find_victim(struct spu_context *ctx)</div><div class='ctx'> 			 * look at another context or give up after X retries.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (!mutex_trylock(&amp;victim-&gt;state_mutex)) {</div><div class='add'>+				put_spu_context(victim);</div><div class='ctx'> 				victim = NULL;</div><div class='ctx'> 				goto restart;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -670,6 +674,7 @@ static struct spu *find_victim(struct spu_context *ctx)</div><div class='ctx'> 				 * restart the search.</div><div class='ctx'> 				 */</div><div class='ctx'> 				mutex_unlock(&amp;victim-&gt;state_mutex);</div><div class='add'>+				put_spu_context(victim);</div><div class='ctx'> 				victim = NULL;</div><div class='ctx'> 				goto restart;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -687,6 +692,7 @@ static struct spu *find_victim(struct spu_context *ctx)</div><div class='ctx'> 				spu_add_to_rq(victim);</div><div class='ctx'> </div><div class='ctx'> 			mutex_unlock(&amp;victim-&gt;state_mutex);</div><div class='add'>+			put_spu_context(victim);</div><div class='ctx'> </div><div class='ctx'> 			return spu;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -722,17 +728,33 @@ static void spu_schedule(struct spu *spu, struct spu_context *ctx)</div><div class='ctx'> 	/* not a candidate for interruptible because it's called either</div><div class='ctx'> 	   from the scheduler thread or from spu_deactivate */</div><div class='ctx'> 	mutex_lock(&amp;ctx-&gt;state_mutex);</div><div class='del'>-	__spu_schedule(spu, ctx);</div><div class='add'>+	if (ctx-&gt;state == SPU_STATE_SAVED)</div><div class='add'>+		__spu_schedule(spu, ctx);</div><div class='ctx'> 	spu_release(ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void spu_unschedule(struct spu *spu, struct spu_context *ctx)</div><div class='add'>+/**</div><div class='add'>+ * spu_unschedule - remove a context from a spu, and possibly release it.</div><div class='add'>+ * @spu:	The SPU to unschedule from</div><div class='add'>+ * @ctx:	The context currently scheduled on the SPU</div><div class='add'>+ * @free_spu	Whether to free the SPU for other contexts</div><div class='add'>+ *</div><div class='add'>+ * Unbinds the context @ctx from the SPU @spu. If @free_spu is non-zero, the</div><div class='add'>+ * SPU is made available for other contexts (ie, may be returned by</div><div class='add'>+ * spu_get_idle). If this is zero, the caller is expected to schedule another</div><div class='add'>+ * context to this spu.</div><div class='add'>+ *</div><div class='add'>+ * Should be called with ctx-&gt;state_mutex held.</div><div class='add'>+ */</div><div class='add'>+static void spu_unschedule(struct spu *spu, struct spu_context *ctx,</div><div class='add'>+		int free_spu)</div><div class='ctx'> {</div><div class='ctx'> 	int node = spu-&gt;node;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;cbe_spu_info[node].list_mutex);</div><div class='ctx'> 	cbe_spu_info[node].nr_active--;</div><div class='del'>-	spu-&gt;alloc_state = SPU_FREE;</div><div class='add'>+	if (free_spu)</div><div class='add'>+		spu-&gt;alloc_state = SPU_FREE;</div><div class='ctx'> 	spu_unbind_context(spu, ctx);</div><div class='ctx'> 	ctx-&gt;stats.invol_ctx_switch++;</div><div class='ctx'> 	spu-&gt;stats.invol_ctx_switch++;</div><div class='hunk'>@@ -832,7 +854,7 @@ static int __spu_deactivate(struct spu_context *ctx, int force, int max_prio)</div><div class='ctx'> 	if (spu) {</div><div class='ctx'> 		new = grab_runnable_context(max_prio, spu-&gt;node);</div><div class='ctx'> 		if (new || force) {</div><div class='del'>-			spu_unschedule(spu, ctx);</div><div class='add'>+			spu_unschedule(spu, ctx, new == NULL);</div><div class='ctx'> 			if (new) {</div><div class='ctx'> 				if (new-&gt;flags &amp; SPU_CREATE_NOSCHED)</div><div class='ctx'> 					wake_up(&amp;new-&gt;stop_wq);</div><div class='hunk'>@@ -905,7 +927,7 @@ static noinline void spusched_tick(struct spu_context *ctx)</div><div class='ctx'> </div><div class='ctx'> 	new = grab_runnable_context(ctx-&gt;prio + 1, spu-&gt;node);</div><div class='ctx'> 	if (new) {</div><div class='del'>-		spu_unschedule(spu, ctx);</div><div class='add'>+		spu_unschedule(spu, ctx, 0);</div><div class='ctx'> 		if (test_bit(SPU_SCHED_SPU_RUN, &amp;ctx-&gt;sched_flags))</div><div class='ctx'> 			spu_add_to_rq(ctx);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -985,9 +1007,11 @@ static int spusched_thread(void *unused)</div><div class='ctx'> 				struct spu_context *ctx = spu-&gt;ctx;</div><div class='ctx'> </div><div class='ctx'> 				if (ctx) {</div><div class='add'>+					get_spu_context(ctx);</div><div class='ctx'> 					mutex_unlock(mtx);</div><div class='ctx'> 					spusched_tick(ctx);</div><div class='ctx'> 					mutex_lock(mtx);</div><div class='add'>+					put_spu_context(ctx);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 			mutex_unlock(mtx);</div><div class='hunk'>@@ -1030,7 +1054,7 @@ void spuctx_switch_state(struct spu_context *ctx,</div><div class='ctx'> 		node = spu-&gt;node;</div><div class='ctx'> 		if (old_state == SPU_UTIL_USER)</div><div class='ctx'> 			atomic_dec(&amp;cbe_spu_info[node].busy_spus);</div><div class='del'>-		if (new_state == SPU_UTIL_USER);</div><div class='add'>+		if (new_state == SPU_UTIL_USER)</div><div class='ctx'> 			atomic_inc(&amp;cbe_spu_info[node].busy_spus);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig<br/>index ea3e541ac74f..45ffd8e542f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/iseries/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/iseries/Kconfig</a></div><div class='hunk'>@@ -7,15 +7,6 @@ config PPC_ISERIES</div><div class='ctx'> menu "iSeries device drivers"</div><div class='ctx'> 	depends on PPC_ISERIES</div><div class='ctx'> </div><div class='del'>-config VIOCONS</div><div class='del'>-	bool "iSeries Virtual Console Support (Obsolete)"</div><div class='del'>-	depends on !HVC_ISERIES</div><div class='del'>-	default n</div><div class='del'>-	help</div><div class='del'>-	  This is the old virtual console driver for legacy iSeries.</div><div class='del'>-	  You should use the iSeries Hypervisor Virtual Console</div><div class='del'>-	  support instead.</div><div class='del'>-</div><div class='ctx'> config VIODASD</div><div class='ctx'> 	tristate "iSeries Virtual I/O disk support"</div><div class='ctx'> 	help</div><div class='hunk'>@@ -38,5 +29,5 @@ endmenu</div><div class='ctx'> </div><div class='ctx'> config VIOPATH</div><div class='ctx'> 	bool</div><div class='del'>-	depends on VIOCONS || VIODASD || VIOCD || VIOTAPE || ISERIES_VETH</div><div class='add'>+	depends on VIODASD || VIOCD || VIOTAPE || ISERIES_VETH</div><div class='ctx'> 	default y</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/Makefile b/arch/powerpc/platforms/powermac/Makefile<br/>index 89774177b209..be60d64be7ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/powermac/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/powermac/Makefile</a></div><div class='hunk'>@@ -2,12 +2,12 @@ CFLAGS_bootx_init.o  		+= -fPIC</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_FTRACE</div><div class='ctx'> # Do not trace early boot code</div><div class='del'>-CFLAGS_REMOVE_bootx_init.o = -pg</div><div class='add'>+CFLAGS_REMOVE_bootx_init.o = -pg -mno-sched-epilog</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> obj-y				+= pic.o setup.o time.o feature.o pci.o \</div><div class='ctx'> 				   sleep.o low_i2c.o cache.o pfunc_core.o \</div><div class='del'>-				   pfunc_base.o</div><div class='add'>+				   pfunc_base.o udbg_scc.o udbg_adb.o</div><div class='ctx'> obj-$(CONFIG_PMAC_BACKLIGHT)	+= backlight.o</div><div class='ctx'> obj-$(CONFIG_CPU_FREQ_PMAC)	+= cpufreq_32.o</div><div class='ctx'> obj-$(CONFIG_CPU_FREQ_PMAC64)	+= cpufreq_64.o</div><div class='hunk'>@@ -19,4 +19,3 @@ obj-$(CONFIG_NVRAM:m=y)		+= nvram.o</div><div class='ctx'> obj-$(CONFIG_PPC64)		+= nvram.o</div><div class='ctx'> obj-$(CONFIG_PPC32)		+= bootx_init.o</div><div class='ctx'> obj-$(CONFIG_SMP)		+= smp.o</div><div class='del'>-obj-$(CONFIG_PPC_MERGE)		+= udbg_scc.o udbg_adb.o</div><div class='head'>diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c<br/>index 1cf901fa9031..6eb1d4d182c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/ps3/htab.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/ps3/htab.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/ps3/htab.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/ps3/htab.c</a></div><div class='hunk'>@@ -29,138 +29,75 @@</div><div class='ctx'> </div><div class='ctx'> #include "platform.h"</div><div class='ctx'> </div><div class='del'>-#if defined(DEBUG)</div><div class='del'>-#define DBG udbg_printf</div><div class='del'>-#else</div><div class='del'>-#define DBG pr_debug</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static struct hash_pte *htab;</div><div class='del'>-static unsigned long htab_addr;</div><div class='del'>-static unsigned char *bolttab;</div><div class='del'>-static unsigned char *inusetab;</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(ps3_bolttab_lock);</div><div class='del'>-</div><div class='del'>-#define debug_dump_hpte(_a, _b, _c, _d, _e, _f, _g) \</div><div class='del'>-	_debug_dump_hpte(_a, _b, _c, _d, _e, _f, _g, __func__, __LINE__)</div><div class='del'>-static void _debug_dump_hpte(unsigned long pa, unsigned long va,</div><div class='del'>-	unsigned long group, unsigned long bitmap, struct hash_pte lhpte,</div><div class='del'>-	int psize, unsigned long slot, const char* func, int line)</div><div class='del'>-{</div><div class='del'>-	DBG("%s:%d: pa     = %lxh\n", func, line, pa);</div><div class='del'>-	DBG("%s:%d: lpar   = %lxh\n", func, line,</div><div class='del'>-		ps3_mm_phys_to_lpar(pa));</div><div class='del'>-	DBG("%s:%d: va     = %lxh\n", func, line, va);</div><div class='del'>-	DBG("%s:%d: group  = %lxh\n", func, line, group);</div><div class='del'>-	DBG("%s:%d: bitmap = %lxh\n", func, line, bitmap);</div><div class='del'>-	DBG("%s:%d: hpte.v = %lxh\n", func, line, lhpte.v);</div><div class='del'>-	DBG("%s:%d: hpte.r = %lxh\n", func, line, lhpte.r);</div><div class='del'>-	DBG("%s:%d: psize  = %xh\n", func, line, psize);</div><div class='del'>-	DBG("%s:%d: slot   = %lxh\n", func, line, slot);</div><div class='del'>-}</div><div class='add'>+/**</div><div class='add'>+ * enum lpar_vas_id - id of LPAR virtual address space.</div><div class='add'>+ * @lpar_vas_id_current: Current selected virtual address space</div><div class='add'>+ *</div><div class='add'>+ * Identify the target LPAR address space.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum ps3_lpar_vas_id {</div><div class='add'>+	PS3_LPAR_VAS_ID_CURRENT = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(ps3_htab_lock);</div><div class='ctx'> </div><div class='ctx'> static long ps3_hpte_insert(unsigned long hpte_group, unsigned long va,</div><div class='ctx'> 	unsigned long pa, unsigned long rflags, unsigned long vflags,</div><div class='ctx'> 	int psize, int ssize)</div><div class='ctx'> {</div><div class='del'>-	unsigned long slot;</div><div class='del'>-	struct hash_pte lhpte;</div><div class='del'>-	int secondary = 0;</div><div class='del'>-	unsigned long result;</div><div class='del'>-	unsigned long bitmap;</div><div class='add'>+	int result;</div><div class='add'>+	u64 hpte_v, hpte_r;</div><div class='add'>+	u64 inserted_index;</div><div class='add'>+	u64 evicted_v, evicted_r;</div><div class='add'>+	u64 hpte_v_array[4], hpte_rs;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	unsigned long p_pteg, s_pteg, b_index, b_mask, cb, ci;</div><div class='del'>-</div><div class='del'>-	vflags &amp;= ~HPTE_V_SECONDARY; /* this bit is ignored */</div><div class='del'>-</div><div class='del'>-	lhpte.v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M) |</div><div class='del'>-		vflags | HPTE_V_VALID;</div><div class='del'>-	lhpte.r = hpte_encode_r(ps3_mm_phys_to_lpar(pa), psize) | rflags;</div><div class='del'>-</div><div class='del'>-	p_pteg = hpte_group / HPTES_PER_GROUP;</div><div class='del'>-	s_pteg = ~p_pteg &amp; htab_hash_mask;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;ps3_bolttab_lock, flags);</div><div class='del'>-</div><div class='del'>-	BUG_ON(bolttab[p_pteg] == 0xff &amp;&amp; bolttab[s_pteg] == 0xff);</div><div class='add'>+	long ret = -1;</div><div class='ctx'> </div><div class='del'>-	bitmap = (inusetab[p_pteg] &lt;&lt; 8) | inusetab[s_pteg];</div><div class='add'>+	/*</div><div class='add'>+	 * lv1_insert_htab_entry() will search for victim</div><div class='add'>+	 * entry in both primary and secondary pte group</div><div class='add'>+	 */</div><div class='add'>+	vflags &amp;= ~HPTE_V_SECONDARY;</div><div class='ctx'> </div><div class='del'>-	if (bitmap == 0xffff) {</div><div class='del'>-		/*</div><div class='del'>-		 * PTEG is full. Search for victim.</div><div class='del'>-		 */</div><div class='del'>-		bitmap &amp;= ~((bolttab[p_pteg] &lt;&lt; 8) | bolttab[s_pteg]);</div><div class='del'>-		do {</div><div class='del'>-			ci = mftb() &amp; 15;</div><div class='del'>-			cb = 0x8000UL &gt;&gt; ci;</div><div class='del'>-		} while ((cb &amp; bitmap) == 0);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * search free slot in hardware order</div><div class='del'>-		 *	[primary]	0, 2, 4, 6, 1, 3, 5, 7</div><div class='del'>-		 *	[secondary]	0, 2, 4, 6, 1, 3, 5, 7</div><div class='del'>-		 */</div><div class='del'>-		for (ci = 0; ci &lt; HPTES_PER_GROUP; ci += 2) {</div><div class='del'>-			cb = 0x8000UL &gt;&gt; ci;</div><div class='del'>-			if ((cb &amp; bitmap) == 0)</div><div class='del'>-				goto found;</div><div class='del'>-		}</div><div class='del'>-		for (ci = 1; ci &lt; HPTES_PER_GROUP; ci += 2) {</div><div class='del'>-			cb = 0x8000UL &gt;&gt; ci;</div><div class='del'>-			if ((cb &amp; bitmap) == 0)</div><div class='del'>-				goto found;</div><div class='del'>-		}</div><div class='del'>-		for (ci = HPTES_PER_GROUP; ci &lt; HPTES_PER_GROUP*2; ci += 2) {</div><div class='del'>-			cb = 0x8000UL &gt;&gt; ci;</div><div class='del'>-			if ((cb &amp; bitmap) == 0)</div><div class='del'>-				goto found;</div><div class='del'>-		}</div><div class='del'>-		for (ci = HPTES_PER_GROUP+1; ci &lt; HPTES_PER_GROUP*2; ci += 2) {</div><div class='del'>-			cb = 0x8000UL &gt;&gt; ci;</div><div class='del'>-			if ((cb &amp; bitmap) == 0)</div><div class='del'>-				goto found;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	hpte_v = hpte_encode_v(va, psize, ssize) | vflags | HPTE_V_VALID;</div><div class='add'>+	hpte_r = hpte_encode_r(ps3_mm_phys_to_lpar(pa), psize) | rflags;</div><div class='ctx'> </div><div class='del'>-found:</div><div class='del'>-	if (ci &lt; HPTES_PER_GROUP) {</div><div class='del'>-		slot = p_pteg * HPTES_PER_GROUP + ci;</div><div class='del'>-	} else {</div><div class='del'>-		slot = s_pteg * HPTES_PER_GROUP + (ci &amp; 7);</div><div class='del'>-		/* lhpte.dw0.dw0.h = 1; */</div><div class='del'>-		vflags |= HPTE_V_SECONDARY;</div><div class='del'>-		lhpte.v |= HPTE_V_SECONDARY;</div><div class='del'>-	}</div><div class='add'>+	spin_lock_irqsave(&amp;ps3_htab_lock, flags);</div><div class='ctx'> </div><div class='del'>-	result = lv1_write_htab_entry(0, slot, lhpte.v, lhpte.r);</div><div class='add'>+	/* talk hvc to replace entries BOLTED == 0 */</div><div class='add'>+	result = lv1_insert_htab_entry(PS3_LPAR_VAS_ID_CURRENT, hpte_group,</div><div class='add'>+				       hpte_v, hpte_r,</div><div class='add'>+				       HPTE_V_BOLTED, 0,</div><div class='add'>+				       &amp;inserted_index,</div><div class='add'>+				       &amp;evicted_v, &amp;evicted_r);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		debug_dump_hpte(pa, va, hpte_group, bitmap, lhpte, psize, slot);</div><div class='add'>+		/* all entries bolted !*/</div><div class='add'>+		pr_info("%s:result=%d va=%lx pa=%lx ix=%lx v=%lx r=%lx\n",</div><div class='add'>+			__func__, result, va, pa, hpte_group, hpte_v, hpte_r);</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If used slot is not in primary HPTE group,</div><div class='del'>-	 * the slot should be in secondary HPTE group.</div><div class='add'>+	 * see if the entry is inserted into secondary pteg</div><div class='ctx'> 	 */</div><div class='add'>+	result = lv1_read_htab_entries(PS3_LPAR_VAS_ID_CURRENT,</div><div class='add'>+				       inserted_index &amp; ~0x3UL,</div><div class='add'>+				       &amp;hpte_v_array[0], &amp;hpte_v_array[1],</div><div class='add'>+				       &amp;hpte_v_array[2], &amp;hpte_v_array[3],</div><div class='add'>+				       &amp;hpte_rs);</div><div class='add'>+	BUG_ON(result);</div><div class='ctx'> </div><div class='del'>-	if ((hpte_group ^ slot) &amp; ~(HPTES_PER_GROUP - 1)) {</div><div class='del'>-		secondary = 1;</div><div class='del'>-		b_index = s_pteg;</div><div class='del'>-	} else {</div><div class='del'>-		secondary = 0;</div><div class='del'>-		b_index = p_pteg;</div><div class='del'>-	}</div><div class='add'>+	if (hpte_v_array[inserted_index % 4] &amp; HPTE_V_SECONDARY)</div><div class='add'>+		ret = (inserted_index &amp; 7) | (1 &lt;&lt; 3);</div><div class='add'>+	else</div><div class='add'>+		ret = inserted_index &amp; 7;</div><div class='ctx'> </div><div class='del'>-	b_mask = (lhpte.v &amp; HPTE_V_BOLTED) ? 1 &lt;&lt; 7 : 0 &lt;&lt; 7;</div><div class='del'>-	bolttab[b_index] |= b_mask &gt;&gt; (slot &amp; 7);</div><div class='del'>-	b_mask = 1 &lt;&lt; 7;</div><div class='del'>-	inusetab[b_index] |= b_mask &gt;&gt; (slot &amp; 7);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ps3_bolttab_lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ps3_htab_lock, flags);</div><div class='ctx'> </div><div class='del'>-	return (slot &amp; 7) | (secondary &lt;&lt; 3);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long ps3_hpte_remove(unsigned long hpte_group)</div><div class='hunk'>@@ -172,39 +109,48 @@ static long ps3_hpte_remove(unsigned long hpte_group)</div><div class='ctx'> static long ps3_hpte_updatepp(unsigned long slot, unsigned long newpp,</div><div class='ctx'> 	unsigned long va, int psize, int ssize, int local)</div><div class='ctx'> {</div><div class='add'>+	int result;</div><div class='add'>+	u64 hpte_v, want_v, hpte_rs;</div><div class='add'>+	u64 hpte_v_array[4];</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	unsigned long result;</div><div class='del'>-	unsigned long pteg, bit;</div><div class='del'>-	unsigned long hpte_v, want_v;</div><div class='add'>+	long ret;</div><div class='ctx'> </div><div class='del'>-	want_v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M);</div><div class='add'>+	want_v = hpte_encode_v(va, psize, ssize);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ps3_bolttab_lock, flags);</div><div class='add'>+	spin_lock_irqsave(&amp;ps3_htab_lock, flags);</div><div class='ctx'> </div><div class='del'>-	hpte_v = htab[slot].v;</div><div class='del'>-	if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v &amp; HPTE_V_VALID)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;ps3_bolttab_lock, flags);</div><div class='del'>-</div><div class='del'>-		/* ps3_hpte_insert() will be used to update PTE */</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = lv1_write_htab_entry(0, slot, 0, 0);</div><div class='add'>+	result = lv1_read_htab_entries(PS3_LPAR_VAS_ID_CURRENT, slot &amp; ~0x3UL,</div><div class='add'>+				       &amp;hpte_v_array[0], &amp;hpte_v_array[1],</div><div class='add'>+				       &amp;hpte_v_array[2], &amp;hpte_v_array[3],</div><div class='add'>+				       &amp;hpte_rs);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		DBG("%s: va=%lx slot=%lx psize=%d result = %ld (0x%lx)\n",</div><div class='del'>-		       __func__, va, slot, psize, result, result);</div><div class='add'>+		pr_info("%s: res=%d read va=%lx slot=%lx psize=%d\n",</div><div class='add'>+			__func__, result, va, slot, psize);</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pteg = slot / HPTES_PER_GROUP;</div><div class='del'>-	bit = slot % HPTES_PER_GROUP;</div><div class='del'>-	inusetab[pteg] &amp;= ~(0x80 &gt;&gt; bit);</div><div class='add'>+	hpte_v = hpte_v_array[slot % 4];</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;ps3_bolttab_lock, flags);</div><div class='add'>+	/*</div><div class='add'>+	 * As lv1_read_htab_entries() does not give us the RPN, we can</div><div class='add'>+	 * not synthesize the new hpte_r value here, and therefore can</div><div class='add'>+	 * not update the hpte with lv1_insert_htab_entry(), so we</div><div class='add'>+	 * insted invalidate it and ask the caller to update it via</div><div class='add'>+	 * ps3_hpte_insert() by returning a -1 value.</div><div class='add'>+	 */</div><div class='add'>+	if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v &amp; HPTE_V_VALID)) {</div><div class='add'>+		/* not found */</div><div class='add'>+		ret = -1;</div><div class='add'>+	} else {</div><div class='add'>+		/* entry found, just invalidate it */</div><div class='add'>+		result = lv1_write_htab_entry(PS3_LPAR_VAS_ID_CURRENT,</div><div class='add'>+					      slot, 0, 0);</div><div class='add'>+		ret = -1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* ps3_hpte_insert() will be used to update PTE */</div><div class='del'>-	return -1;</div><div class='add'>+	spin_unlock_irqrestore(&amp;ps3_htab_lock, flags);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ps3_hpte_updateboltedpp(unsigned long newpp, unsigned long ea,</div><div class='hunk'>@@ -217,45 +163,35 @@ static void ps3_hpte_invalidate(unsigned long slot, unsigned long va,</div><div class='ctx'> 	int psize, int ssize, int local)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	unsigned long result;</div><div class='del'>-	unsigned long pteg, bit;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ps3_htab_lock, flags);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ps3_bolttab_lock, flags);</div><div class='del'>-	result = lv1_write_htab_entry(0, slot, 0, 0);</div><div class='add'>+	result = lv1_write_htab_entry(PS3_LPAR_VAS_ID_CURRENT, slot, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		DBG("%s: va=%lx slot=%lx psize=%d result = %ld (0x%lx)\n",</div><div class='del'>-		       __func__, va, slot, psize, result, result);</div><div class='add'>+		pr_info("%s: res=%d va=%lx slot=%lx psize=%d\n",</div><div class='add'>+			__func__, result, va, slot, psize);</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pteg = slot / HPTES_PER_GROUP;</div><div class='del'>-	bit = slot % HPTES_PER_GROUP;</div><div class='del'>-	inusetab[pteg] &amp;= ~(0x80 &gt;&gt; bit);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ps3_bolttab_lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ps3_htab_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ps3_hpte_clear(void)</div><div class='ctx'> {</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	DBG(" -&gt; %s:%d\n", __func__, __LINE__);</div><div class='add'>+	unsigned long hpte_count = (1UL &lt;&lt; ppc64_pft_size) &gt;&gt; 4;</div><div class='add'>+	u64 i;</div><div class='ctx'> </div><div class='del'>-	result = lv1_unmap_htab(htab_addr);</div><div class='del'>-	BUG_ON(result);</div><div class='add'>+	for (i = 0; i &lt; hpte_count; i++)</div><div class='add'>+		lv1_write_htab_entry(PS3_LPAR_VAS_ID_CURRENT, i, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	ps3_mm_shutdown();</div><div class='ctx'> 	ps3_mm_vas_destroy();</div><div class='del'>-</div><div class='del'>-	DBG(" &lt;- %s:%d\n", __func__, __LINE__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init ps3_hpte_init(unsigned long htab_size)</div><div class='ctx'> {</div><div class='del'>-	long bitmap_size;</div><div class='del'>-</div><div class='del'>-	DBG(" -&gt; %s:%d\n", __func__, __LINE__);</div><div class='del'>-</div><div class='ctx'> 	ppc_md.hpte_invalidate = ps3_hpte_invalidate;</div><div class='ctx'> 	ppc_md.hpte_updatepp = ps3_hpte_updatepp;</div><div class='ctx'> 	ppc_md.hpte_updateboltedpp = ps3_hpte_updateboltedpp;</div><div class='hunk'>@@ -264,28 +200,5 @@ void __init ps3_hpte_init(unsigned long htab_size)</div><div class='ctx'> 	ppc_md.hpte_clear_all = ps3_hpte_clear;</div><div class='ctx'> </div><div class='ctx'> 	ppc64_pft_size = __ilog2(htab_size);</div><div class='del'>-</div><div class='del'>-	bitmap_size = htab_size / sizeof(struct hash_pte) / 8;</div><div class='del'>-</div><div class='del'>-	bolttab = __va(lmb_alloc(bitmap_size, 1));</div><div class='del'>-	inusetab = __va(lmb_alloc(bitmap_size, 1));</div><div class='del'>-</div><div class='del'>-	memset(bolttab, 0, bitmap_size);</div><div class='del'>-	memset(inusetab, 0, bitmap_size);</div><div class='del'>-</div><div class='del'>-	DBG(" &lt;- %s:%d\n", __func__, __LINE__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init ps3_map_htab(void)</div><div class='del'>-{</div><div class='del'>-	long result;</div><div class='del'>-	unsigned long htab_size = (1UL &lt;&lt; ppc64_pft_size);</div><div class='del'>-</div><div class='del'>-	result = lv1_map_htab(0, &amp;htab_addr);</div><div class='del'>-</div><div class='del'>-	htab = (__force struct hash_pte *)ioremap_flags(htab_addr, htab_size,</div><div class='del'>-					    pgprot_val(PAGE_READONLY_X));</div><div class='del'>-</div><div class='del'>-	DBG("%s:%d: lpar %016lxh, virt %016lxh\n", __func__, __LINE__,</div><div class='del'>-		htab_addr, (unsigned long)htab);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c<br/>index a413abbd4123..77bc330263c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/ps3/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/ps3/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/ps3/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/ps3/setup.c</a></div><div class='hunk'>@@ -201,7 +201,6 @@ static void __init ps3_setup_arch(void)</div><div class='ctx'> 	       ps3_firmware_version.rev);</div><div class='ctx'> </div><div class='ctx'> 	ps3_spu_set_platform();</div><div class='del'>-	ps3_map_htab();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	smp_init_ps3();</div><div class='head'>diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c<br/>index d135cef9ed6a..ccae3d446b98 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/ps3/spu.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/ps3/spu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/ps3/spu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/ps3/spu.c</a></div><div class='hunk'>@@ -186,14 +186,24 @@ static void spu_unmap(struct spu *spu)</div><div class='ctx'> 	iounmap(spu_pdata(spu)-&gt;shadow);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * setup_areas - Map the spu regions into the address space.</div><div class='add'>+ *</div><div class='add'>+ * The current HV requires the spu shadow regs to be mapped with the</div><div class='add'>+ * PTE page protection bits set as read-only (PP=3).  This implementation</div><div class='add'>+ * uses the low level __ioremap() to bypass the page protection settings</div><div class='add'>+ * inforced by ioremap_flags() to get the needed PTE bits set for the</div><div class='add'>+ * shadow regs.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> static int __init setup_areas(struct spu *spu)</div><div class='ctx'> {</div><div class='ctx'> 	struct table {char* name; unsigned long addr; unsigned long size;};</div><div class='add'>+	static const unsigned long shadow_flags = _PAGE_NO_CACHE | 3;</div><div class='ctx'> </div><div class='del'>-	spu_pdata(spu)-&gt;shadow = ioremap_flags(spu_pdata(spu)-&gt;shadow_addr,</div><div class='del'>-					       sizeof(struct spe_shadow),</div><div class='del'>-					       pgprot_val(PAGE_READONLY) |</div><div class='del'>-					       _PAGE_NO_CACHE);</div><div class='add'>+	spu_pdata(spu)-&gt;shadow = __ioremap(spu_pdata(spu)-&gt;shadow_addr,</div><div class='add'>+					   sizeof(struct spe_shadow),</div><div class='add'>+					   shadow_flags);</div><div class='ctx'> 	if (!spu_pdata(spu)-&gt;shadow) {</div><div class='ctx'> 		pr_debug("%s:%d: ioremap shadow failed\n", __func__, __LINE__);</div><div class='ctx'> 		goto fail_ioremap;</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/platforms/pseries/plpar_wrappers.h<br/>index a437267c6bf8..d967c1893ab5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/plpar_wrappers.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/pseries/plpar_wrappers.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/plpar_wrappers.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/pseries/plpar_wrappers.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #define _PSERIES_PLPAR_WRAPPERS_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hvcall.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline long poll_pending(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -44,12 +45,34 @@ static inline long register_slb_shadow(unsigned long cpu, unsigned long vpa)</div><div class='ctx'> </div><div class='ctx'> static inline long plpar_page_set_loaned(unsigned long vpa)</div><div class='ctx'> {</div><div class='del'>-	return plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_LOANED, vpa, 0);</div><div class='add'>+	unsigned long cmo_page_sz = cmo_get_page_size();</div><div class='add'>+	long rc = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; !rc &amp;&amp; i &lt; PAGE_SIZE; i += cmo_page_sz)</div><div class='add'>+		rc = plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_LOANED, vpa + i, 0);</div><div class='add'>+</div><div class='add'>+	for (i -= cmo_page_sz; rc &amp;&amp; i != 0; i -= cmo_page_sz)</div><div class='add'>+		plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_ACTIVE,</div><div class='add'>+				   vpa + i - cmo_page_sz, 0);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline long plpar_page_set_active(unsigned long vpa)</div><div class='ctx'> {</div><div class='del'>-	return plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_ACTIVE, vpa, 0);</div><div class='add'>+	unsigned long cmo_page_sz = cmo_get_page_size();</div><div class='add'>+	long rc = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; !rc &amp;&amp; i &lt; PAGE_SIZE; i += cmo_page_sz)</div><div class='add'>+		rc = plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_ACTIVE, vpa + i, 0);</div><div class='add'>+</div><div class='add'>+	for (i -= cmo_page_sz; rc &amp;&amp; i != 0; i -= cmo_page_sz)</div><div class='add'>+		plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_LOANED,</div><div class='add'>+				   vpa + i - cmo_page_sz, 0);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void vpa_init(int cpu);</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c<br/>index 063a0d2fba30..7b01d67b4e48 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/platforms/pseries/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/platforms/pseries/setup.c</a></div><div class='hunk'>@@ -68,6 +68,10 @@</div><div class='ctx'> #include "plpar_wrappers.h"</div><div class='ctx'> #include "pseries.h"</div><div class='ctx'> </div><div class='add'>+int CMO_PrPSP = -1;</div><div class='add'>+int CMO_SecPSP = -1;</div><div class='add'>+unsigned long CMO_PageSize = (ASM_CONST(1) &lt;&lt; IOMMU_PAGE_SHIFT);</div><div class='add'>+EXPORT_SYMBOL(CMO_PageSize);</div><div class='ctx'> </div><div class='ctx'> int fwnmi_active;  /* TRUE if an FWNMI handler is present */</div><div class='ctx'> </div><div class='hunk'>@@ -325,8 +329,7 @@ void pSeries_cmo_feature_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	char *ptr, *key, *value, *end;</div><div class='ctx'> 	int call_status;</div><div class='del'>-	int PrPSP = -1;</div><div class='del'>-	int SecPSP = -1;</div><div class='add'>+	int page_order = IOMMU_PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug(" -&gt; fw_cmo_feature_init()\n");</div><div class='ctx'> 	spin_lock(&amp;rtas_data_buf_lock);</div><div class='hunk'>@@ -365,21 +368,31 @@ void pSeries_cmo_feature_init(void)</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (0 == strcmp(key, "PrPSP"))</div><div class='del'>-				PrPSP = simple_strtol(value, NULL, 10);</div><div class='add'>+			if (0 == strcmp(key, "CMOPageSize"))</div><div class='add'>+				page_order = simple_strtol(value, NULL, 10);</div><div class='add'>+			else if (0 == strcmp(key, "PrPSP"))</div><div class='add'>+				CMO_PrPSP = simple_strtol(value, NULL, 10);</div><div class='ctx'> 			else if (0 == strcmp(key, "SecPSP"))</div><div class='del'>-				SecPSP = simple_strtol(value, NULL, 10);</div><div class='add'>+				CMO_SecPSP = simple_strtol(value, NULL, 10);</div><div class='ctx'> 			value = key = ptr + 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		ptr++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (PrPSP != -1 || SecPSP != -1) {</div><div class='add'>+	/* Page size is returned as the power of 2 of the page size,</div><div class='add'>+	 * convert to the page size in bytes before returning</div><div class='add'>+	 */</div><div class='add'>+	CMO_PageSize = 1 &lt;&lt; page_order;</div><div class='add'>+	pr_debug("CMO_PageSize = %lu\n", CMO_PageSize);</div><div class='add'>+</div><div class='add'>+	if (CMO_PrPSP != -1 || CMO_SecPSP != -1) {</div><div class='ctx'> 		pr_info("CMO enabled\n");</div><div class='del'>-		pr_debug("CMO enabled, PrPSP=%d, SecPSP=%d\n", PrPSP, SecPSP);</div><div class='add'>+		pr_debug("CMO enabled, PrPSP=%d, SecPSP=%d\n", CMO_PrPSP,</div><div class='add'>+		         CMO_SecPSP);</div><div class='ctx'> 		powerpc_firmware_features |= FW_FEATURE_CMO;</div><div class='ctx'> 	} else</div><div class='del'>-		pr_debug("CMO not enabled, PrPSP=%d, SecPSP=%d\n", PrPSP, SecPSP);</div><div class='add'>+		pr_debug("CMO not enabled, PrPSP=%d, SecPSP=%d\n", CMO_PrPSP,</div><div class='add'>+		         CMO_SecPSP);</div><div class='ctx'> 	spin_unlock(&amp;rtas_data_buf_lock);</div><div class='ctx'> 	pr_debug(" &lt;- fw_cmo_feature_init()\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile<br/>index 16a0ed28eb00..a90054b56d5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/sysdev/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/sysdev/Makefile</a></div><div class='hunk'>@@ -25,7 +25,6 @@ obj-$(CONFIG_MV64X60)		+= $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o \</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_CMOS)	+= rtc_cmos_setup.o</div><div class='ctx'> obj-$(CONFIG_AXON_RAM)		+= axonram.o</div><div class='ctx'> </div><div class='del'>-ifeq ($(CONFIG_PPC_MERGE),y)</div><div class='ctx'> obj-$(CONFIG_PPC_INDIRECT_PCI)	+= indirect_pci.o</div><div class='ctx'> obj-$(CONFIG_PPC_I8259)		+= i8259.o</div><div class='ctx'> obj-$(CONFIG_IPIC)		+= ipic.o</div><div class='hunk'>@@ -36,7 +35,6 @@ obj-$(CONFIG_OF_RTC)		+= of_rtc.o</div><div class='ctx'> ifeq ($(CONFIG_PCI),y)</div><div class='ctx'> obj-$(CONFIG_4xx)		+= ppc4xx_pci.o</div><div class='ctx'> endif</div><div class='del'>-endif</div><div class='ctx'> </div><div class='ctx'> # Temporary hack until we have migrated to asm-powerpc</div><div class='ctx'> ifeq ($(ARCH),powerpc)</div><div class='head'>diff --git a/arch/powerpc/sysdev/bestcomm/gen_bd.c b/arch/powerpc/sysdev/bestcomm/gen_bd.c<br/>index a3a134c35b0a..e0a53e3147b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/bestcomm/gen_bd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/sysdev/bestcomm/gen_bd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/bestcomm/gen_bd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/sysdev/bestcomm/gen_bd.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c<br/>index 661df42830b9..4a04823e8423 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/cpm1.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/sysdev/cpm1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/cpm1.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/sysdev/cpm1.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/8xx_immap.h&gt;</div><div class='hunk'>@@ -42,6 +43,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/fs_pd.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_8xx_GPIO</div><div class='add'>+#include &lt;linux/of_gpio.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define CPM_MAP_SIZE    (0x4000)</div><div class='ctx'> </div><div class='ctx'> cpm8xx_t __iomem *cpmp;  /* Pointer to comm processor space */</div><div class='hunk'>@@ -290,20 +295,24 @@ struct cpm_ioport16 {</div><div class='ctx'> 	__be16 res[3];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct cpm_ioport32 {</div><div class='del'>-	__be32 dir, par, sor;</div><div class='add'>+struct cpm_ioport32b {</div><div class='add'>+	__be32 dir, par, odr, dat;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpm_ioport32e {</div><div class='add'>+	__be32 dir, par, sor, odr, dat;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void cpm1_set_pin32(int port, int pin, int flags)</div><div class='ctx'> {</div><div class='del'>-	struct cpm_ioport32 __iomem *iop;</div><div class='add'>+	struct cpm_ioport32e __iomem *iop;</div><div class='ctx'> 	pin = 1 &lt;&lt; (31 - pin);</div><div class='ctx'> </div><div class='ctx'> 	if (port == CPM_PORTB)</div><div class='del'>-		iop = (struct cpm_ioport32 __iomem *)</div><div class='add'>+		iop = (struct cpm_ioport32e __iomem *)</div><div class='ctx'> 		      &amp;mpc8xx_immr-&gt;im_cpm.cp_pbdir;</div><div class='ctx'> 	else</div><div class='del'>-		iop = (struct cpm_ioport32 __iomem *)</div><div class='add'>+		iop = (struct cpm_ioport32e __iomem *)</div><div class='ctx'> 		      &amp;mpc8xx_immr-&gt;im_cpm.cp_pedir;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; CPM_PIN_OUTPUT)</div><div class='hunk'>@@ -498,3 +507,251 @@ int cpm1_clk_setup(enum cpm_clk_target target, int clock, int mode)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GPIO LIB API implementation</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_8xx_GPIO</div><div class='add'>+</div><div class='add'>+struct cpm1_gpio16_chip {</div><div class='add'>+	struct of_mm_gpio_chip mm_gc;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	/* shadowed data register to clear/set bits safely */</div><div class='add'>+	u16 cpdata;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct cpm1_gpio16_chip *</div><div class='add'>+to_cpm1_gpio16_chip(struct of_mm_gpio_chip *mm_gc)</div><div class='add'>+{</div><div class='add'>+	return container_of(mm_gc, struct cpm1_gpio16_chip, mm_gc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpm1_gpio16_save_regs(struct of_mm_gpio_chip *mm_gc)</div><div class='add'>+{</div><div class='add'>+	struct cpm1_gpio16_chip *cpm1_gc = to_cpm1_gpio16_chip(mm_gc);</div><div class='add'>+	struct cpm_ioport16 __iomem *iop = mm_gc-&gt;regs;</div><div class='add'>+</div><div class='add'>+	cpm1_gc-&gt;cpdata = in_be16(&amp;iop-&gt;dat);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpm1_gpio16_get(struct gpio_chip *gc, unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm_ioport16 __iomem *iop = mm_gc-&gt;regs;</div><div class='add'>+	u16 pin_mask;</div><div class='add'>+</div><div class='add'>+	pin_mask = 1 &lt;&lt; (15 - gpio);</div><div class='add'>+</div><div class='add'>+	return !!(in_be16(&amp;iop-&gt;dat) &amp; pin_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm1_gpio16_chip *cpm1_gc = to_cpm1_gpio16_chip(mm_gc);</div><div class='add'>+	struct cpm_ioport16 __iomem *iop = mm_gc-&gt;regs;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 pin_mask = 1 &lt;&lt; (15 - gpio);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;cpm1_gc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (value)</div><div class='add'>+		cpm1_gc-&gt;cpdata |= pin_mask;</div><div class='add'>+	else</div><div class='add'>+		cpm1_gc-&gt;cpdata &amp;= ~pin_mask;</div><div class='add'>+</div><div class='add'>+	out_be16(&amp;iop-&gt;dat, cpm1_gc-&gt;cpdata);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;cpm1_gc-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpm1_gpio16_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm_ioport16 __iomem *iop = mm_gc-&gt;regs;</div><div class='add'>+	u16 pin_mask;</div><div class='add'>+</div><div class='add'>+	pin_mask = 1 &lt;&lt; (15 - gpio);</div><div class='add'>+</div><div class='add'>+	setbits16(&amp;iop-&gt;dir, pin_mask);</div><div class='add'>+</div><div class='add'>+	cpm1_gpio16_set(gc, gpio, val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpm1_gpio16_dir_in(struct gpio_chip *gc, unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm_ioport16 __iomem *iop = mm_gc-&gt;regs;</div><div class='add'>+	u16 pin_mask;</div><div class='add'>+</div><div class='add'>+	pin_mask = 1 &lt;&lt; (15 - gpio);</div><div class='add'>+</div><div class='add'>+	clrbits16(&amp;iop-&gt;dir, pin_mask);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cpm1_gpiochip_add16(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct cpm1_gpio16_chip *cpm1_gc;</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc;</div><div class='add'>+	struct of_gpio_chip *of_gc;</div><div class='add'>+	struct gpio_chip *gc;</div><div class='add'>+</div><div class='add'>+	cpm1_gc = kzalloc(sizeof(*cpm1_gc), GFP_KERNEL);</div><div class='add'>+	if (!cpm1_gc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;cpm1_gc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	mm_gc = &amp;cpm1_gc-&gt;mm_gc;</div><div class='add'>+	of_gc = &amp;mm_gc-&gt;of_gc;</div><div class='add'>+	gc = &amp;of_gc-&gt;gc;</div><div class='add'>+</div><div class='add'>+	mm_gc-&gt;save_regs = cpm1_gpio16_save_regs;</div><div class='add'>+	of_gc-&gt;gpio_cells = 2;</div><div class='add'>+	gc-&gt;ngpio = 16;</div><div class='add'>+	gc-&gt;direction_input = cpm1_gpio16_dir_in;</div><div class='add'>+	gc-&gt;direction_output = cpm1_gpio16_dir_out;</div><div class='add'>+	gc-&gt;get = cpm1_gpio16_get;</div><div class='add'>+	gc-&gt;set = cpm1_gpio16_set;</div><div class='add'>+</div><div class='add'>+	return of_mm_gpiochip_add(np, mm_gc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct cpm1_gpio32_chip {</div><div class='add'>+	struct of_mm_gpio_chip mm_gc;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	/* shadowed data register to clear/set bits safely */</div><div class='add'>+	u32 cpdata;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct cpm1_gpio32_chip *</div><div class='add'>+to_cpm1_gpio32_chip(struct of_mm_gpio_chip *mm_gc)</div><div class='add'>+{</div><div class='add'>+	return container_of(mm_gc, struct cpm1_gpio32_chip, mm_gc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpm1_gpio32_save_regs(struct of_mm_gpio_chip *mm_gc)</div><div class='add'>+{</div><div class='add'>+	struct cpm1_gpio32_chip *cpm1_gc = to_cpm1_gpio32_chip(mm_gc);</div><div class='add'>+	struct cpm_ioport32b __iomem *iop = mm_gc-&gt;regs;</div><div class='add'>+</div><div class='add'>+	cpm1_gc-&gt;cpdata = in_be32(&amp;iop-&gt;dat);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpm1_gpio32_get(struct gpio_chip *gc, unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm_ioport32b __iomem *iop = mm_gc-&gt;regs;</div><div class='add'>+	u32 pin_mask;</div><div class='add'>+</div><div class='add'>+	pin_mask = 1 &lt;&lt; (31 - gpio);</div><div class='add'>+</div><div class='add'>+	return !!(in_be32(&amp;iop-&gt;dat) &amp; pin_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm1_gpio32_chip *cpm1_gc = to_cpm1_gpio32_chip(mm_gc);</div><div class='add'>+	struct cpm_ioport32b __iomem *iop = mm_gc-&gt;regs;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 pin_mask = 1 &lt;&lt; (31 - gpio);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;cpm1_gc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (value)</div><div class='add'>+		cpm1_gc-&gt;cpdata |= pin_mask;</div><div class='add'>+	else</div><div class='add'>+		cpm1_gc-&gt;cpdata &amp;= ~pin_mask;</div><div class='add'>+</div><div class='add'>+	out_be32(&amp;iop-&gt;dat, cpm1_gc-&gt;cpdata);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;cpm1_gc-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpm1_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm_ioport32b __iomem *iop = mm_gc-&gt;regs;</div><div class='add'>+	u32 pin_mask;</div><div class='add'>+</div><div class='add'>+	pin_mask = 1 &lt;&lt; (31 - gpio);</div><div class='add'>+</div><div class='add'>+	setbits32(&amp;iop-&gt;dir, pin_mask);</div><div class='add'>+</div><div class='add'>+	cpm1_gpio32_set(gc, gpio, val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpm1_gpio32_dir_in(struct gpio_chip *gc, unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm_ioport32b __iomem *iop = mm_gc-&gt;regs;</div><div class='add'>+	u32 pin_mask;</div><div class='add'>+</div><div class='add'>+	pin_mask = 1 &lt;&lt; (31 - gpio);</div><div class='add'>+</div><div class='add'>+	clrbits32(&amp;iop-&gt;dir, pin_mask);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cpm1_gpiochip_add32(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct cpm1_gpio32_chip *cpm1_gc;</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc;</div><div class='add'>+	struct of_gpio_chip *of_gc;</div><div class='add'>+	struct gpio_chip *gc;</div><div class='add'>+</div><div class='add'>+	cpm1_gc = kzalloc(sizeof(*cpm1_gc), GFP_KERNEL);</div><div class='add'>+	if (!cpm1_gc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;cpm1_gc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	mm_gc = &amp;cpm1_gc-&gt;mm_gc;</div><div class='add'>+	of_gc = &amp;mm_gc-&gt;of_gc;</div><div class='add'>+	gc = &amp;of_gc-&gt;gc;</div><div class='add'>+</div><div class='add'>+	mm_gc-&gt;save_regs = cpm1_gpio32_save_regs;</div><div class='add'>+	of_gc-&gt;gpio_cells = 2;</div><div class='add'>+	gc-&gt;ngpio = 32;</div><div class='add'>+	gc-&gt;direction_input = cpm1_gpio32_dir_in;</div><div class='add'>+	gc-&gt;direction_output = cpm1_gpio32_dir_out;</div><div class='add'>+	gc-&gt;get = cpm1_gpio32_get;</div><div class='add'>+	gc-&gt;set = cpm1_gpio32_set;</div><div class='add'>+</div><div class='add'>+	return of_mm_gpiochip_add(np, mm_gc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpm_init_par_io(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	for_each_compatible_node(np, NULL, "fsl,cpm1-pario-bank-a")</div><div class='add'>+		cpm1_gpiochip_add16(np);</div><div class='add'>+</div><div class='add'>+	for_each_compatible_node(np, NULL, "fsl,cpm1-pario-bank-b")</div><div class='add'>+		cpm1_gpiochip_add32(np);</div><div class='add'>+</div><div class='add'>+	for_each_compatible_node(np, NULL, "fsl,cpm1-pario-bank-c")</div><div class='add'>+		cpm1_gpiochip_add16(np);</div><div class='add'>+</div><div class='add'>+	for_each_compatible_node(np, NULL, "fsl,cpm1-pario-bank-d")</div><div class='add'>+		cpm1_gpiochip_add16(np);</div><div class='add'>+</div><div class='add'>+	/* Port E uses CPM2 layout */</div><div class='add'>+	for_each_compatible_node(np, NULL, "fsl,cpm1-pario-bank-e")</div><div class='add'>+		cpm2_gpiochip_add32(np);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+arch_initcall(cpm_init_par_io);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_8xx_GPIO */</div><div class='head'>diff --git a/arch/powerpc/sysdev/cpm2.c b/arch/powerpc/sysdev/cpm2.c<br/>index 5a6c5dfc53ef..f1c3395633b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/cpm2.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/sysdev/cpm2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/cpm2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/sysdev/cpm2.c</a></div><div class='hunk'>@@ -115,16 +115,10 @@ EXPORT_SYMBOL(cpm_command);</div><div class='ctx'>  * Baud rate clocks are zero-based in the driver code (as that maps</div><div class='ctx'>  * to port numbers).  Documentation uses 1-based numbering.</div><div class='ctx'>  */</div><div class='del'>-#define BRG_INT_CLK	(get_brgfreq())</div><div class='del'>-#define BRG_UART_CLK	(BRG_INT_CLK/16)</div><div class='del'>-</div><div class='del'>-/* This function is used by UARTS, or anything else that uses a 16x</div><div class='del'>- * oversampled clock.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-cpm_setbrg(uint brg, uint rate)</div><div class='add'>+void __cpm2_setbrg(uint brg, uint rate, uint clk, int div16, int src)</div><div class='ctx'> {</div><div class='ctx'> 	u32 __iomem *bp;</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	/* This is good enough to get SMCs running.....</div><div class='ctx'> 	*/</div><div class='hunk'>@@ -135,34 +129,14 @@ cpm_setbrg(uint brg, uint rate)</div><div class='ctx'> 		brg -= 4;</div><div class='ctx'> 	}</div><div class='ctx'> 	bp += brg;</div><div class='del'>-	out_be32(bp, (((BRG_UART_CLK / rate) - 1) &lt;&lt; 1) | CPM_BRG_EN);</div><div class='del'>-</div><div class='del'>-	cpm2_unmap(bp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function is used to set high speed synchronous baud rate</div><div class='del'>- * clocks.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-cpm2_fastbrg(uint brg, uint rate, int div16)</div><div class='del'>-{</div><div class='del'>-	u32 __iomem *bp;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	if (brg &lt; 4) {</div><div class='del'>-		bp = cpm2_map_size(im_brgc1, 16);</div><div class='del'>-	} else {</div><div class='del'>-		bp = cpm2_map_size(im_brgc5, 16);</div><div class='del'>-		brg -= 4;</div><div class='del'>-	}</div><div class='del'>-	bp += brg;</div><div class='del'>-	val = ((BRG_INT_CLK / rate) &lt;&lt; 1) | CPM_BRG_EN;</div><div class='add'>+	val = (((clk / rate) - 1) &lt;&lt; 1) | CPM_BRG_EN | src;</div><div class='ctx'> 	if (div16)</div><div class='ctx'> 		val |= CPM_BRG_DIV16;</div><div class='ctx'> </div><div class='ctx'> 	out_be32(bp, val);</div><div class='ctx'> 	cpm2_unmap(bp);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__cpm2_setbrg);</div><div class='ctx'> </div><div class='ctx'> int cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -377,3 +351,14 @@ void cpm2_set_pin(int port, int pin, int flags)</div><div class='ctx'> 	else</div><div class='ctx'> 		clrbits32(&amp;iop[port].odr, pin);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int cpm_init_par_io(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	for_each_compatible_node(np, NULL, "fsl,cpm2-pario-bank")</div><div class='add'>+		cpm2_gpiochip_add32(np);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+arch_initcall(cpm_init_par_io);</div><div class='add'>+</div><div class='head'>diff --git a/arch/powerpc/sysdev/cpm_common.c b/arch/powerpc/sysdev/cpm_common.c<br/>index e4b7296acb2c..00d3d17c84a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/cpm_common.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/sysdev/cpm_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/cpm_common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/sysdev/cpm_common.c</a></div><div class='hunk'>@@ -19,6 +19,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/udbg.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -28,6 +30,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mm/mmu_decl.h&gt;</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_CPM2) || defined(CONFIG_8xx_GPIO)</div><div class='add'>+#include &lt;linux/of_gpio.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PPC_EARLY_DEBUG_CPM</div><div class='ctx'> static u32 __iomem *cpm_udbg_txdesc =</div><div class='ctx'> 	(u32 __iomem __force *)CONFIG_PPC_EARLY_DEBUG_CPM_ADDR;</div><div class='hunk'>@@ -207,3 +213,135 @@ dma_addr_t cpm_muram_dma(void __iomem *addr)</div><div class='ctx'> 	return muram_pbase + ((u8 __iomem *)addr - muram_vbase);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cpm_muram_dma);</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPM2) || defined(CONFIG_8xx_GPIO)</div><div class='add'>+</div><div class='add'>+struct cpm2_ioports {</div><div class='add'>+	u32 dir, par, sor, odr, dat;</div><div class='add'>+	u32 res[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpm2_gpio32_chip {</div><div class='add'>+	struct of_mm_gpio_chip mm_gc;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	/* shadowed data register to clear/set bits safely */</div><div class='add'>+	u32 cpdata;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct cpm2_gpio32_chip *</div><div class='add'>+to_cpm2_gpio32_chip(struct of_mm_gpio_chip *mm_gc)</div><div class='add'>+{</div><div class='add'>+	return container_of(mm_gc, struct cpm2_gpio32_chip, mm_gc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpm2_gpio32_save_regs(struct of_mm_gpio_chip *mm_gc)</div><div class='add'>+{</div><div class='add'>+	struct cpm2_gpio32_chip *cpm2_gc = to_cpm2_gpio32_chip(mm_gc);</div><div class='add'>+	struct cpm2_ioports __iomem *iop = mm_gc-&gt;regs;</div><div class='add'>+</div><div class='add'>+	cpm2_gc-&gt;cpdata = in_be32(&amp;iop-&gt;dat);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpm2_gpio32_get(struct gpio_chip *gc, unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm2_ioports __iomem *iop = mm_gc-&gt;regs;</div><div class='add'>+	u32 pin_mask;</div><div class='add'>+</div><div class='add'>+	pin_mask = 1 &lt;&lt; (31 - gpio);</div><div class='add'>+</div><div class='add'>+	return !!(in_be32(&amp;iop-&gt;dat) &amp; pin_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __cpm2_gpio32_set(struct of_mm_gpio_chip *mm_gc, u32 pin_mask,</div><div class='add'>+	int value)</div><div class='add'>+{</div><div class='add'>+	struct cpm2_gpio32_chip *cpm2_gc = to_cpm2_gpio32_chip(mm_gc);</div><div class='add'>+	struct cpm2_ioports __iomem *iop = mm_gc-&gt;regs;</div><div class='add'>+</div><div class='add'>+	if (value)</div><div class='add'>+		cpm2_gc-&gt;cpdata |= pin_mask;</div><div class='add'>+	else</div><div class='add'>+		cpm2_gc-&gt;cpdata &amp;= ~pin_mask;</div><div class='add'>+</div><div class='add'>+	out_be32(&amp;iop-&gt;dat, cpm2_gc-&gt;cpdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpm2_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm2_gpio32_chip *cpm2_gc = to_cpm2_gpio32_chip(mm_gc);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 pin_mask = 1 &lt;&lt; (31 - gpio);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;cpm2_gc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	__cpm2_gpio32_set(mm_gc, pin_mask, value);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;cpm2_gc-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpm2_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm2_gpio32_chip *cpm2_gc = to_cpm2_gpio32_chip(mm_gc);</div><div class='add'>+	struct cpm2_ioports __iomem *iop = mm_gc-&gt;regs;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 pin_mask = 1 &lt;&lt; (31 - gpio);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;cpm2_gc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	setbits32(&amp;iop-&gt;dir, pin_mask);</div><div class='add'>+	__cpm2_gpio32_set(mm_gc, pin_mask, val);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;cpm2_gc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpm2_gpio32_dir_in(struct gpio_chip *gc, unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);</div><div class='add'>+	struct cpm2_gpio32_chip *cpm2_gc = to_cpm2_gpio32_chip(mm_gc);</div><div class='add'>+	struct cpm2_ioports __iomem *iop = mm_gc-&gt;regs;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 pin_mask = 1 &lt;&lt; (31 - gpio);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;cpm2_gc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	clrbits32(&amp;iop-&gt;dir, pin_mask);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;cpm2_gc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cpm2_gpiochip_add32(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct cpm2_gpio32_chip *cpm2_gc;</div><div class='add'>+	struct of_mm_gpio_chip *mm_gc;</div><div class='add'>+	struct of_gpio_chip *of_gc;</div><div class='add'>+	struct gpio_chip *gc;</div><div class='add'>+</div><div class='add'>+	cpm2_gc = kzalloc(sizeof(*cpm2_gc), GFP_KERNEL);</div><div class='add'>+	if (!cpm2_gc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;cpm2_gc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	mm_gc = &amp;cpm2_gc-&gt;mm_gc;</div><div class='add'>+	of_gc = &amp;mm_gc-&gt;of_gc;</div><div class='add'>+	gc = &amp;of_gc-&gt;gc;</div><div class='add'>+</div><div class='add'>+	mm_gc-&gt;save_regs = cpm2_gpio32_save_regs;</div><div class='add'>+	of_gc-&gt;gpio_cells = 2;</div><div class='add'>+	gc-&gt;ngpio = 32;</div><div class='add'>+	gc-&gt;direction_input = cpm2_gpio32_dir_in;</div><div class='add'>+	gc-&gt;direction_output = cpm2_gpio32_dir_out;</div><div class='add'>+	gc-&gt;get = cpm2_gpio32_get;</div><div class='add'>+	gc-&gt;set = cpm2_gpio32_set;</div><div class='add'>+</div><div class='add'>+	return of_mm_gpiochip_add(np, mm_gc);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_CPM2 || CONFIG_8xx_GPIO */</div><div class='head'>diff --git a/arch/powerpc/sysdev/qe_lib/ucc_fast.c b/arch/powerpc/sysdev/qe_lib/ucc_fast.c<br/>index 1aecb075a72e..25fbbfaa837d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/qe_lib/ucc_fast.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/sysdev/qe_lib/ucc_fast.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/qe_lib/ucc_fast.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/sysdev/qe_lib/ucc_fast.c</a></div><div class='hunk'>@@ -208,6 +208,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc</div><div class='ctx'> 	uccf-&gt;uf_regs = ioremap(uf_info-&gt;regs, sizeof(struct ucc_fast));</div><div class='ctx'> 	if (uccf-&gt;uf_regs == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__);</div><div class='add'>+		kfree(uccf);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -355,6 +356,9 @@ void ucc_fast_free(struct ucc_fast_private * uccf)</div><div class='ctx'> 	if (uccf-&gt;ucc_fast_rx_virtual_fifo_base_offset)</div><div class='ctx'> 		qe_muram_free(uccf-&gt;ucc_fast_rx_virtual_fifo_base_offset);</div><div class='ctx'> </div><div class='add'>+	if (uccf-&gt;uf_regs)</div><div class='add'>+		iounmap(uccf-&gt;uf_regs);</div><div class='add'>+</div><div class='ctx'> 	kfree(uccf);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ucc_fast_free);</div><div class='head'>diff --git a/arch/powerpc/sysdev/qe_lib/ucc_slow.c b/arch/powerpc/sysdev/qe_lib/ucc_slow.c<br/>index a578bc77b9d5..e1d6a1340157 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/qe_lib/ucc_slow.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/sysdev/qe_lib/ucc_slow.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/qe_lib/ucc_slow.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/sysdev/qe_lib/ucc_slow.c</a></div><div class='hunk'>@@ -171,6 +171,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc</div><div class='ctx'> 	uccs-&gt;us_regs = ioremap(us_info-&gt;regs, sizeof(struct ucc_slow));</div><div class='ctx'> 	if (uccs-&gt;us_regs == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__);</div><div class='add'>+		kfree(uccs);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -367,10 +368,11 @@ void ucc_slow_free(struct ucc_slow_private * uccs)</div><div class='ctx'> 	if (uccs-&gt;tx_base_offset)</div><div class='ctx'> 		qe_muram_free(uccs-&gt;tx_base_offset);</div><div class='ctx'> </div><div class='del'>-	if (uccs-&gt;us_pram) {</div><div class='add'>+	if (uccs-&gt;us_pram)</div><div class='ctx'> 		qe_muram_free(uccs-&gt;us_pram_offset);</div><div class='del'>-		uccs-&gt;us_pram = NULL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	if (uccs-&gt;us_regs)</div><div class='add'>+		iounmap(uccs-&gt;us_regs);</div><div class='ctx'> </div><div class='ctx'> 	kfree(uccs);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/sysdev/rtc_cmos_setup.c b/arch/powerpc/sysdev/rtc_cmos_setup.c<br/>index c09ddc0dbeb3..c1879ebfd4f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/rtc_cmos_setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/powerpc/sysdev/rtc_cmos_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/rtc_cmos_setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/powerpc/sysdev/rtc_cmos_setup.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@ static int  __init add_rtc(void)</div><div class='ctx'> 	struct device_node *np;</div><div class='ctx'> 	struct platform_device *pd;</div><div class='ctx'> 	struct resource res[2];</div><div class='add'>+	unsigned int num_res = 1;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;res, 0, sizeof(res));</div><div class='hunk'>@@ -41,14 +42,24 @@ static int  __init add_rtc(void)</div><div class='ctx'> 	if (res[0].start != RTC_PORT(0))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* Use a fixed interrupt value of 8 since on PPC if we are using this</div><div class='del'>-	 * its off an i8259 which we ensure has interrupt numbers 0..15. */</div><div class='del'>-	res[1].start = 8;</div><div class='del'>-	res[1].end = 8;</div><div class='del'>-	res[1].flags = IORESOURCE_IRQ;</div><div class='add'>+	np = of_find_compatible_node(NULL, NULL, "chrp,iic");</div><div class='add'>+	if (!np)</div><div class='add'>+		np = of_find_compatible_node(NULL, NULL, "pnpPNP,000");</div><div class='add'>+	if (np) {</div><div class='add'>+		of_node_put(np);</div><div class='add'>+		/*</div><div class='add'>+		 * Use a fixed interrupt value of 8 since on PPC if we are</div><div class='add'>+		 * using this its off an i8259 which we ensure has interrupt</div><div class='add'>+		 * numbers 0..15.</div><div class='add'>+		 */</div><div class='add'>+		res[1].start = 8;</div><div class='add'>+		res[1].end = 8;</div><div class='add'>+		res[1].flags = IORESOURCE_IRQ;</div><div class='add'>+		num_res++;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	pd = platform_device_register_simple("rtc_cmos", -1,</div><div class='del'>-					     &amp;res[0], 2);</div><div class='add'>+					     &amp;res[0], num_res);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(pd))</div><div class='ctx'> 		return PTR_ERR(pd);</div><div class='head'>diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig<br/>index 2ed88122be93..8d41908e2513 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/s390/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/Kconfig</a></div><div class='hunk'>@@ -317,6 +317,9 @@ config ARCH_ENABLE_MEMORY_HOTPLUG</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on SPARSEMEM</div><div class='ctx'> </div><div class='add'>+config ARCH_ENABLE_MEMORY_HOTREMOVE</div><div class='add'>+	def_bool y</div><div class='add'>+</div><div class='ctx'> source "mm/Kconfig"</div><div class='ctx'> </div><div class='ctx'> comment "I/O subsystem configuration"</div><div class='head'>diff --git a/arch/s390/defconfig b/arch/s390/defconfig<br/>index c5cdb975d590..9b0bc2c9fba0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/s390/defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Fri May 30 09:49:33 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Thu Aug 21 19:43:29 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SCHED_MC=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='hunk'>@@ -68,7 +68,6 @@ CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -93,11 +92,17 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> CONFIG_KPROBES=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='ctx'> CONFIG_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -113,6 +118,7 @@ CONFIG_STOP_MACHINE=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> CONFIG_BLOCK_COMPAT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -175,6 +181,8 @@ CONFIG_PREEMPT=y</div><div class='ctx'> CONFIG_ARCH_SPARSEMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_SPARSEMEM_DEFAULT=y</div><div class='ctx'> CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> # CONFIG_FLATMEM_MANUAL is not set</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='hunk'>@@ -185,8 +193,12 @@ CONFIG_HAVE_MEMORY_PRESENT=y</div><div class='ctx'> CONFIG_SPARSEMEM_EXTREME=y</div><div class='ctx'> CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y</div><div class='ctx'> CONFIG_SPARSEMEM_VMEMMAP=y</div><div class='add'>+CONFIG_MEMORY_HOTPLUG=y</div><div class='add'>+CONFIG_MEMORY_HOTPLUG_SPARSE=y</div><div class='add'>+CONFIG_MEMORY_HOTREMOVE=y</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='hunk'>@@ -198,6 +210,7 @@ CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_MACHCHK_WARNING=y</div><div class='ctx'> CONFIG_QDIO=y</div><div class='ctx'> # CONFIG_QDIO_DEBUG is not set</div><div class='add'>+CONFIG_CHSC_SCH=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Misc</div><div class='hunk'>@@ -206,6 +219,7 @@ CONFIG_IPL=y</div><div class='ctx'> # CONFIG_IPL_TAPE is not set</div><div class='ctx'> CONFIG_IPL_VM=y</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='add'>+CONFIG_COMPAT_BINFMT_ELF=y</div><div class='ctx'> CONFIG_BINFMT_MISC=m</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=9</div><div class='ctx'> # CONFIG_PROCESS_DEBUG is not set</div><div class='hunk'>@@ -226,10 +240,6 @@ CONFIG_S390_HYPFS_FS=y</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='ctx'> # CONFIG_ZFCPDUMP is not set</div><div class='ctx'> CONFIG_S390_GUEST=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -364,7 +374,6 @@ CONFIG_NET_SCH_CBQ=m</div><div class='ctx'> # CONFIG_NET_SCH_HTB is not set</div><div class='ctx'> # CONFIG_NET_SCH_HFSC is not set</div><div class='ctx'> CONFIG_NET_SCH_PRIO=m</div><div class='del'>-CONFIG_NET_SCH_RR=m</div><div class='ctx'> CONFIG_NET_SCH_RED=m</div><div class='ctx'> CONFIG_NET_SCH_SFQ=m</div><div class='ctx'> CONFIG_NET_SCH_TEQL=m</div><div class='hunk'>@@ -430,7 +439,9 @@ CONFIG_CCW=y</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-# CONFIG_FW_LOADER is not set</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> CONFIG_SYS_HYPERVISOR=y</div><div class='hunk'>@@ -507,6 +518,11 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_ISCSI_TCP is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> CONFIG_ZFCP=y</div><div class='add'>+CONFIG_SCSI_DH=m</div><div class='add'>+CONFIG_SCSI_DH_RDAC=m</div><div class='add'>+CONFIG_SCSI_DH_HP_SW=m</div><div class='add'>+CONFIG_SCSI_DH_EMC=m</div><div class='add'>+CONFIG_SCSI_DH_ALUA=m</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=y</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='hunk'>@@ -522,14 +538,10 @@ CONFIG_DM_CRYPT=y</div><div class='ctx'> CONFIG_DM_SNAPSHOT=y</div><div class='ctx'> CONFIG_DM_MIRROR=y</div><div class='ctx'> CONFIG_DM_ZERO=y</div><div class='del'>-CONFIG_DM_MULTIPATH=y</div><div class='del'>-# CONFIG_DM_MULTIPATH_EMC is not set</div><div class='del'>-# CONFIG_DM_MULTIPATH_RDAC is not set</div><div class='del'>-# CONFIG_DM_MULTIPATH_HP is not set</div><div class='add'>+CONFIG_DM_MULTIPATH=m</div><div class='ctx'> # CONFIG_DM_DELAY is not set</div><div class='ctx'> # CONFIG_DM_UEVENT is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_IFB is not set</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> CONFIG_BONDING=m</div><div class='hunk'>@@ -544,7 +556,6 @@ CONFIG_NET_ETHERNET=y</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='hunk'>@@ -576,7 +587,10 @@ CONFIG_DEVKMEM=y</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+CONFIG_HVC_DRIVER=y</div><div class='add'>+CONFIG_VIRTIO_CONSOLE=y</div><div class='ctx'> CONFIG_HW_RANDOM=m</div><div class='add'>+CONFIG_HW_RANDOM_VIRTIO=m</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> CONFIG_RAW_DRIVER=m</div><div class='ctx'> CONFIG_MAX_RAW_DEVS=256</div><div class='hunk'>@@ -616,6 +630,7 @@ CONFIG_MONWRITER=m</div><div class='ctx'> CONFIG_S390_VMUR=m</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -693,6 +708,7 @@ CONFIG_CONFIGFS_FS=m</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -712,7 +728,6 @@ CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -780,6 +795,7 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_FRAME_POINTER is not set</div><div class='hunk'>@@ -789,6 +805,7 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_LKDTM is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='ctx'> # CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_SAMPLES=y</div><div class='ctx'> # CONFIG_SAMPLE_KOBJECT is not set</div><div class='ctx'> # CONFIG_SAMPLE_KPROBES is not set</div><div class='hunk'>@@ -847,6 +864,10 @@ CONFIG_CRYPTO_HMAC=m</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=m</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+CONFIG_CRYPTO_RMD128=m</div><div class='add'>+CONFIG_CRYPTO_RMD160=m</div><div class='add'>+CONFIG_CRYPTO_RMD256=m</div><div class='add'>+CONFIG_CRYPTO_RMD320=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1=m</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -895,6 +916,7 @@ CONFIG_BITREVERSE=m</div><div class='ctx'> # CONFIG_GENERIC_FIND_NEXT_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=m</div><div class='ctx'> CONFIG_CRC7=m</div><div class='head'>diff --git a/include/asm-s390/Kbuild b/arch/s390/include/asm/Kbuild<br/>index 63a23415fba6..63a23415fba6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/Kbuild?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/Kbuild</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/Kbuild</a></div><div class='head'>diff --git a/include/asm-s390/airq.h b/arch/s390/include/asm/airq.h<br/>index 1ac80d6b0588..1ac80d6b0588 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/airq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/airq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/airq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/airq.h</a></div><div class='head'>diff --git a/include/asm-s390/appldata.h b/arch/s390/include/asm/appldata.h<br/>index 79283dac8281..79283dac8281 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/appldata.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/appldata.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/appldata.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/appldata.h</a></div><div class='head'>diff --git a/include/asm-s390/atomic.h b/arch/s390/include/asm/atomic.h<br/>index 2d184655bc5d..2d184655bc5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/atomic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/atomic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/atomic.h</a></div><div class='head'>diff --git a/include/asm-s390/auxvec.h b/arch/s390/include/asm/auxvec.h<br/>index 0d340720fd99..0d340720fd99 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/auxvec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/auxvec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/auxvec.h</a></div><div class='head'>diff --git a/include/asm-s390/bitops.h b/arch/s390/include/asm/bitops.h<br/>index b4eb24ab5af9..8e9243ae0c19 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/bitops.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/bitops.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/bitops.h</a></div><div class='hunk'>@@ -709,7 +709,7 @@ static inline int find_next_zero_bit (const unsigned long * addr,</div><div class='ctx'> 		 * __ffz_word returns __BITOPS_WORDSIZE</div><div class='ctx'> 		 * if no zero bit is present in the word.</div><div class='ctx'> 		 */</div><div class='del'>-		set = __ffz_word(0, *p &gt;&gt; bit) + bit;</div><div class='add'>+		set = __ffz_word(bit, *p &gt;&gt; bit);</div><div class='ctx'> 		if (set &gt;= size)</div><div class='ctx'> 			return size + offset;</div><div class='ctx'> 		if (set &lt; __BITOPS_WORDSIZE)</div><div class='hunk'>@@ -824,7 +824,7 @@ static inline int ext2_find_next_zero_bit(void *vaddr, unsigned long size,</div><div class='ctx'> 		 * s390 version of ffz returns __BITOPS_WORDSIZE</div><div class='ctx'> 		 * if no zero bit is present in the word.</div><div class='ctx'> 		 */</div><div class='del'>-		set = ffz(__load_ulong_le(p, 0) &gt;&gt; bit) + bit;</div><div class='add'>+		set = __ffz_word(bit, __load_ulong_le(p, 0) &gt;&gt; bit);</div><div class='ctx'> 		if (set &gt;= size)</div><div class='ctx'> 			return size + offset;</div><div class='ctx'> 		if (set &lt; __BITOPS_WORDSIZE)</div><div class='hunk'>@@ -865,7 +865,7 @@ static inline int ext2_find_next_bit(void *vaddr, unsigned long size,</div><div class='ctx'> 		 * s390 version of ffz returns __BITOPS_WORDSIZE</div><div class='ctx'> 		 * if no zero bit is present in the word.</div><div class='ctx'> 		 */</div><div class='del'>-		set = ffs(__load_ulong_le(p, 0) &gt;&gt; bit) + bit;</div><div class='add'>+		set = __ffs_word(0, __load_ulong_le(p, 0) &amp; (~0UL &lt;&lt; bit));</div><div class='ctx'> 		if (set &gt;= size)</div><div class='ctx'> 			return size + offset;</div><div class='ctx'> 		if (set &lt; __BITOPS_WORDSIZE)</div><div class='head'>diff --git a/include/asm-s390/bug.h b/arch/s390/include/asm/bug.h<br/>index 384e3621e341..384e3621e341 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/bug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/bug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/bug.h</a></div><div class='head'>diff --git a/include/asm-s390/bugs.h b/arch/s390/include/asm/bugs.h<br/>index 011f1e6a2a6c..011f1e6a2a6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/bugs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/bugs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/bugs.h</a></div><div class='head'>diff --git a/include/asm-s390/byteorder.h b/arch/s390/include/asm/byteorder.h<br/>index 1fe2492baa8d..1fe2492baa8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/byteorder.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/byteorder.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/byteorder.h</a></div><div class='head'>diff --git a/include/asm-s390/cache.h b/arch/s390/include/asm/cache.h<br/>index 9b866816863c..9b866816863c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/cache.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/cache.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/cache.h</a></div><div class='head'>diff --git a/include/asm-s390/cacheflush.h b/arch/s390/include/asm/cacheflush.h<br/>index 49d5af916d01..49d5af916d01 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/cacheflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/cacheflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/cacheflush.h</a></div><div class='head'>diff --git a/include/asm-s390/ccwdev.h b/arch/s390/include/asm/ccwdev.h<br/>index ba007d8df941..ba007d8df941 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/ccwdev.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/ccwdev.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/ccwdev.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ccwdev.h</a></div><div class='head'>diff --git a/include/asm-s390/ccwgroup.h b/arch/s390/include/asm/ccwgroup.h<br/>index a27f68985a79..a27f68985a79 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/ccwgroup.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/ccwgroup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/ccwgroup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ccwgroup.h</a></div><div class='head'>diff --git a/include/asm-s390/checksum.h b/arch/s390/include/asm/checksum.h<br/>index d5a8e7c1477c..d5a8e7c1477c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/checksum.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/checksum.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/checksum.h</a></div><div class='head'>diff --git a/include/asm-s390/chpid.h b/arch/s390/include/asm/chpid.h<br/>index dfe3c7f3439a..dfe3c7f3439a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/chpid.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/chpid.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/chpid.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/chpid.h</a></div><div class='head'>diff --git a/include/asm-s390/chsc.h b/arch/s390/include/asm/chsc.h<br/>index d38d0cf62d4b..d38d0cf62d4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/chsc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/chsc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/chsc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/chsc.h</a></div><div class='head'>diff --git a/include/asm-s390/cio.h b/arch/s390/include/asm/cio.h<br/>index 6dccb071aec3..6dccb071aec3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/cio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/cio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/cio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/cio.h</a></div><div class='head'>diff --git a/include/asm-s390/cmb.h b/arch/s390/include/asm/cmb.h<br/>index 50196857d27a..50196857d27a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/cmb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/cmb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/cmb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/cmb.h</a></div><div class='head'>diff --git a/include/asm-s390/compat.h b/arch/s390/include/asm/compat.h<br/>index de065b32381a..de065b32381a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/compat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/compat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/compat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/compat.h</a></div><div class='head'>diff --git a/include/asm-s390/cpcmd.h b/arch/s390/include/asm/cpcmd.h<br/>index 48a9eab16429..48a9eab16429 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/cpcmd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/cpcmd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/cpcmd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/cpcmd.h</a></div><div class='head'>diff --git a/include/asm-s390/cpu.h b/arch/s390/include/asm/cpu.h<br/>index e5a6a9ba3adf..e5a6a9ba3adf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/cpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/cpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/cpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/cpu.h</a></div><div class='head'>diff --git a/include/asm-s390/cputime.h b/arch/s390/include/asm/cputime.h<br/>index 133ce054fc89..133ce054fc89 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/cputime.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/cputime.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/cputime.h</a></div><div class='head'>diff --git a/include/asm-s390/current.h b/arch/s390/include/asm/current.h<br/>index 83cf36cde2da..83cf36cde2da 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/current.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/current.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/current.h</a></div><div class='head'>diff --git a/include/asm-s390/dasd.h b/arch/s390/include/asm/dasd.h<br/>index 3f002e13d024..3f002e13d024 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/dasd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/dasd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/dasd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/dasd.h</a></div><div class='head'>diff --git a/include/asm-s390/debug.h b/arch/s390/include/asm/debug.h<br/>index 9450ce6e32de..9450ce6e32de 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/debug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/debug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/debug.h</a></div><div class='head'>diff --git a/include/asm-s390/delay.h b/arch/s390/include/asm/delay.h<br/>index 78357314c450..78357314c450 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/delay.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/delay.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/delay.h</a></div><div class='head'>diff --git a/include/asm-s390/device.h b/arch/s390/include/asm/device.h<br/>index d8f9872b0e2d..d8f9872b0e2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/device.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/device.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/device.h</a></div><div class='head'>diff --git a/include/asm-s390/diag.h b/arch/s390/include/asm/diag.h<br/>index 72b2e2f2d32d..72b2e2f2d32d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/diag.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/diag.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/diag.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/diag.h</a></div><div class='head'>diff --git a/include/asm-s390/div64.h b/arch/s390/include/asm/div64.h<br/>index 6cd978cefb28..6cd978cefb28 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/div64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/div64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/div64.h</a></div><div class='head'>diff --git a/include/asm-s390/dma.h b/arch/s390/include/asm/dma.h<br/>index 7425c6af6cd4..7425c6af6cd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/dma.h</a></div><div class='head'>diff --git a/include/asm-s390/ebcdic.h b/arch/s390/include/asm/ebcdic.h<br/>index 7f6f641d32f4..7f6f641d32f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/ebcdic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/ebcdic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/ebcdic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ebcdic.h</a></div><div class='head'>diff --git a/include/asm-s390/elf.h b/arch/s390/include/asm/elf.h<br/>index 3cad56923815..3cad56923815 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/elf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/elf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/elf.h</a></div><div class='head'>diff --git a/include/asm-s390/emergency-restart.h b/arch/s390/include/asm/emergency-restart.h<br/>index 108d8c48e42e..108d8c48e42e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/emergency-restart.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/emergency-restart.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/emergency-restart.h</a></div><div class='head'>diff --git a/include/asm-s390/errno.h b/arch/s390/include/asm/errno.h<br/>index e41d5b37c4d6..e41d5b37c4d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/errno.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/errno.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/errno.h</a></div><div class='head'>diff --git a/include/asm-s390/etr.h b/arch/s390/include/asm/etr.h<br/>index 80ef58c61970..80ef58c61970 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/etr.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/etr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/etr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/etr.h</a></div><div class='head'>diff --git a/include/asm-s390/extmem.h b/arch/s390/include/asm/extmem.h<br/>index 33837d756184..33837d756184 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/extmem.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/extmem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/extmem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/extmem.h</a></div><div class='head'>diff --git a/include/asm-s390/fb.h b/arch/s390/include/asm/fb.h<br/>index c7df38030992..c7df38030992 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/fb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/fb.h</a></div><div class='head'>diff --git a/include/asm-s390/fcntl.h b/arch/s390/include/asm/fcntl.h<br/>index 46ab12db5739..46ab12db5739 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/fcntl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/fcntl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/fcntl.h</a></div><div class='head'>diff --git a/include/asm-s390/fcx.h b/arch/s390/include/asm/fcx.h<br/>index 8be1f3a58042..8be1f3a58042 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/fcx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/fcx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/fcx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/fcx.h</a></div><div class='head'>diff --git a/include/asm-s390/futex.h b/arch/s390/include/asm/futex.h<br/>index 5c5d02de49e9..5c5d02de49e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/futex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/futex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/futex.h</a></div><div class='head'>diff --git a/include/asm-s390/hardirq.h b/arch/s390/include/asm/hardirq.h<br/>index 4b7cb964ff35..89ec7056da28 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/hardirq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/hardirq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/hardirq.h</a></div><div class='hunk'>@@ -34,4 +34,18 @@ typedef struct {</div><div class='ctx'> </div><div class='ctx'> void clock_comparator_work(void);</div><div class='ctx'> </div><div class='add'>+static inline unsigned long long local_tick_disable(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long long old;</div><div class='add'>+</div><div class='add'>+	old = S390_lowcore.clock_comparator;</div><div class='add'>+	S390_lowcore.clock_comparator = -1ULL;</div><div class='add'>+	return old;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void local_tick_enable(unsigned long long comp)</div><div class='add'>+{</div><div class='add'>+	S390_lowcore.clock_comparator = comp;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_HARDIRQ_H */</div><div class='head'>diff --git a/include/asm-s390/hugetlb.h b/arch/s390/include/asm/hugetlb.h<br/>index 670a1d1745d2..670a1d1745d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/hugetlb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/hugetlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/hugetlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/hugetlb.h</a></div><div class='head'>diff --git a/include/asm-s390/idals.h b/arch/s390/include/asm/idals.h<br/>index e82c10efe65a..e82c10efe65a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/idals.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/idals.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/idals.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/idals.h</a></div><div class='head'>diff --git a/include/asm-s390/io.h b/arch/s390/include/asm/io.h<br/>index b7ff6afc3caa..b7ff6afc3caa 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/io.h</a></div><div class='head'>diff --git a/include/asm-s390/ioctl.h b/arch/s390/include/asm/ioctl.h<br/>index b279fe06dfe5..b279fe06dfe5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/ioctl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/ioctl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ioctl.h</a></div><div class='head'>diff --git a/include/asm-s390/ioctls.h b/arch/s390/include/asm/ioctls.h<br/>index 40e481b1b461..40e481b1b461 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/ioctls.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/ioctls.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ioctls.h</a></div><div class='head'>diff --git a/include/asm-s390/ipcbuf.h b/arch/s390/include/asm/ipcbuf.h<br/>index 37f293d12c8f..37f293d12c8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/ipcbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ipcbuf.h</a></div><div class='head'>diff --git a/include/asm-s390/ipl.h b/arch/s390/include/asm/ipl.h<br/>index eaca6dff5405..1171e6d144a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/ipl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/ipl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/ipl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ipl.h</a></div><div class='hunk'>@@ -159,7 +159,8 @@ enum diag308_vm_flags {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum diag308_rc {</div><div class='del'>-	DIAG308_RC_OK	= 1,</div><div class='add'>+	DIAG308_RC_OK		= 0x0001,</div><div class='add'>+	DIAG308_RC_NOCONFIG	= 0x0102,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern int diag308(unsigned long subcode, void *addr);</div><div class='head'>diff --git a/include/asm-s390/irq.h b/arch/s390/include/asm/irq.h<br/>index 7da991a858f8..7da991a858f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/irq.h</a></div><div class='head'>diff --git a/include/asm-s390/irq_regs.h b/arch/s390/include/asm/irq_regs.h<br/>index 3dd9c0b70270..3dd9c0b70270 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/irq_regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/irq_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/irq_regs.h</a></div><div class='head'>diff --git a/include/asm-s390/irqflags.h b/arch/s390/include/asm/irqflags.h<br/>index 3f26131120b7..3f26131120b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/irqflags.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/irqflags.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/irqflags.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/irqflags.h</a></div><div class='head'>diff --git a/include/asm-s390/isc.h b/arch/s390/include/asm/isc.h<br/>index 34bb8916db4f..34bb8916db4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/isc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/isc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/isc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/isc.h</a></div><div class='head'>diff --git a/include/asm-s390/itcw.h b/arch/s390/include/asm/itcw.h<br/>index a9bc5c36b32a..a9bc5c36b32a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/itcw.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/itcw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/itcw.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/itcw.h</a></div><div class='head'>diff --git a/include/asm-s390/kdebug.h b/arch/s390/include/asm/kdebug.h<br/>index 40db27cd6e60..40db27cd6e60 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/kdebug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/kdebug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/kdebug.h</a></div><div class='head'>diff --git a/include/asm-s390/kexec.h b/arch/s390/include/asm/kexec.h<br/>index f219c6411e0b..bb729b84a21e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/kexec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/kexec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/kexec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/kexec.h</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #define KEXEC_CONTROL_MEMORY_LIMIT (1UL&lt;&lt;31)</div><div class='ctx'> </div><div class='ctx'> /* Allocate one page for the pdp and the second for the code */</div><div class='del'>-#define KEXEC_CONTROL_CODE_SIZE 4096</div><div class='add'>+#define KEXEC_CONTROL_PAGE_SIZE 4096</div><div class='ctx'> </div><div class='ctx'> /* The native architecture */</div><div class='ctx'> #define KEXEC_ARCH KEXEC_ARCH_S390</div><div class='head'>diff --git a/include/asm-s390/kmap_types.h b/arch/s390/include/asm/kmap_types.h<br/>index fd1574648223..fd1574648223 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/kmap_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/kmap_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/kmap_types.h</a></div><div class='head'>diff --git a/include/asm-s390/kprobes.h b/arch/s390/include/asm/kprobes.h<br/>index 330f68caffe4..330f68caffe4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/kprobes.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/kprobes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/kprobes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/kprobes.h</a></div><div class='head'>diff --git a/include/asm-s390/kvm.h b/arch/s390/include/asm/kvm.h<br/>index d74002f95794..d74002f95794 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/kvm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/kvm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/kvm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/kvm.h</a></div><div class='head'>diff --git a/include/asm-s390/kvm_host.h b/arch/s390/include/asm/kvm_host.h<br/>index 3c55e4107dcc..3c55e4107dcc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/kvm_host.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/kvm_host.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/kvm_host.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/kvm_host.h</a></div><div class='head'>diff --git a/include/asm-s390/kvm_para.h b/arch/s390/include/asm/kvm_para.h<br/>index 2c503796b619..2c503796b619 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/kvm_para.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/kvm_para.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/kvm_para.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/kvm_para.h</a></div><div class='head'>diff --git a/include/asm-s390/kvm_virtio.h b/arch/s390/include/asm/kvm_virtio.h<br/>index 146100224def..146100224def 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/kvm_virtio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/kvm_virtio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/kvm_virtio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/kvm_virtio.h</a></div><div class='head'>diff --git a/include/asm-s390/linkage.h b/arch/s390/include/asm/linkage.h<br/>index 291c2d01c44f..291c2d01c44f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/linkage.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/linkage.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/linkage.h</a></div><div class='head'>diff --git a/include/asm-s390/local.h b/arch/s390/include/asm/local.h<br/>index c11c530f74d0..c11c530f74d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/local.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/local.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/local.h</a></div><div class='head'>diff --git a/include/asm-s390/lowcore.h b/arch/s390/include/asm/lowcore.h<br/>index 0bc51d52a899..0bc51d52a899 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/lowcore.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/lowcore.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/lowcore.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/lowcore.h</a></div><div class='head'>diff --git a/include/asm-s390/mathemu.h b/arch/s390/include/asm/mathemu.h<br/>index e8dd1ba8edb0..e8dd1ba8edb0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/mathemu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/mathemu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/mathemu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/mathemu.h</a></div><div class='head'>diff --git a/include/asm-s390/mman.h b/arch/s390/include/asm/mman.h<br/>index 7839767d837e..7839767d837e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/mman.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/mman.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/mman.h</a></div><div class='head'>diff --git a/include/asm-s390/mmu.h b/arch/s390/include/asm/mmu.h<br/>index 5dd5e7b3476f..5dd5e7b3476f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/mmu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/mmu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/mmu.h</a></div><div class='head'>diff --git a/include/asm-s390/mmu_context.h b/arch/s390/include/asm/mmu_context.h<br/>index 4c2fbf48c9c4..4c2fbf48c9c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/mmu_context.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/mmu_context.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/mmu_context.h</a></div><div class='head'>diff --git a/include/asm-s390/module.h b/arch/s390/include/asm/module.h<br/>index 1cc1c5af705a..1cc1c5af705a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/module.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/module.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/module.h</a></div><div class='head'>diff --git a/include/asm-s390/monwriter.h b/arch/s390/include/asm/monwriter.h<br/>index f0cbf96c52e6..f0cbf96c52e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/monwriter.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/monwriter.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/monwriter.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/monwriter.h</a></div><div class='head'>diff --git a/include/asm-s390/msgbuf.h b/arch/s390/include/asm/msgbuf.h<br/>index 1bbdee927924..1bbdee927924 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/msgbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/msgbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/msgbuf.h</a></div><div class='head'>diff --git a/include/asm-s390/mutex.h b/arch/s390/include/asm/mutex.h<br/>index 458c1f7fbc18..458c1f7fbc18 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/mutex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/mutex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/mutex.h</a></div><div class='head'>diff --git a/include/asm-s390/page.h b/arch/s390/include/asm/page.h<br/>index 991ba939408c..991ba939408c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/page.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/page.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/page.h</a></div><div class='head'>diff --git a/include/asm-s390/param.h b/arch/s390/include/asm/param.h<br/>index 34aaa4603347..34aaa4603347 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/param.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/param.h</a></div><div class='head'>diff --git a/include/asm-s390/pci.h b/arch/s390/include/asm/pci.h<br/>index 42a145c9ddd6..42a145c9ddd6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/pci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/pci.h</a></div><div class='head'>diff --git a/include/asm-s390/percpu.h b/arch/s390/include/asm/percpu.h<br/>index 408d60b4f75b..408d60b4f75b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/percpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/percpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/percpu.h</a></div><div class='head'>diff --git a/include/asm-s390/pgalloc.h b/arch/s390/include/asm/pgalloc.h<br/>index f5b2bf3d7c1d..f5b2bf3d7c1d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/pgalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/pgalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/pgalloc.h</a></div><div class='head'>diff --git a/include/asm-s390/pgtable.h b/arch/s390/include/asm/pgtable.h<br/>index 0bdb704ae051..0bdb704ae051 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/pgtable.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/pgtable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/pgtable.h</a></div><div class='head'>diff --git a/include/asm-s390/poll.h b/arch/s390/include/asm/poll.h<br/>index c98509d3149e..c98509d3149e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/poll.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/poll.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/poll.h</a></div><div class='head'>diff --git a/include/asm-s390/posix_types.h b/arch/s390/include/asm/posix_types.h<br/>index 397d93fba3a7..397d93fba3a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/posix_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/posix_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/posix_types.h</a></div><div class='head'>diff --git a/include/asm-s390/processor.h b/arch/s390/include/asm/processor.h<br/>index 4af80af2a88f..4af80af2a88f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/processor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/processor.h</a></div><div class='head'>diff --git a/include/asm-s390/ptrace.h b/arch/s390/include/asm/ptrace.h<br/>index af2c9ac28a07..af2c9ac28a07 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/ptrace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ptrace.h</a></div><div class='head'>diff --git a/include/asm-s390/qdio.h b/arch/s390/include/asm/qdio.h<br/>index 6813772171f2..6813772171f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/qdio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/qdio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/qdio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/qdio.h</a></div><div class='head'>diff --git a/include/asm-s390/qeth.h b/arch/s390/include/asm/qeth.h<br/>index 930d378ef75a..930d378ef75a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/qeth.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/qeth.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/qeth.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/qeth.h</a></div><div class='head'>diff --git a/include/asm-s390/reset.h b/arch/s390/include/asm/reset.h<br/>index f584f4a52581..f584f4a52581 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/reset.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/reset.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/reset.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/reset.h</a></div><div class='head'>diff --git a/include/asm-s390/resource.h b/arch/s390/include/asm/resource.h<br/>index 366c01de04f2..366c01de04f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/resource.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/resource.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/resource.h</a></div><div class='head'>diff --git a/include/asm-s390/rwsem.h b/arch/s390/include/asm/rwsem.h<br/>index 9d2a17971805..9d2a17971805 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/rwsem.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/rwsem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/rwsem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/rwsem.h</a></div><div class='head'>diff --git a/include/asm-s390/s390_ext.h b/arch/s390/include/asm/s390_ext.h<br/>index 2afc060266a2..2afc060266a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/s390_ext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/s390_ext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/s390_ext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/s390_ext.h</a></div><div class='head'>diff --git a/include/asm-s390/s390_rdev.h b/arch/s390/include/asm/s390_rdev.h<br/>index 6fa20442a48c..6fa20442a48c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/s390_rdev.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/s390_rdev.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/s390_rdev.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/s390_rdev.h</a></div><div class='head'>diff --git a/include/asm-s390/scatterlist.h b/arch/s390/include/asm/scatterlist.h<br/>index 29ec8e28c8df..29ec8e28c8df 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/scatterlist.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/scatterlist.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/scatterlist.h</a></div><div class='head'>diff --git a/include/asm-s390/schid.h b/arch/s390/include/asm/schid.h<br/>index 7bdc0fe15691..825503cf3dc2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/schid.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/schid.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/schid.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/schid.h</a></div><div class='hunk'>@@ -11,6 +11,7 @@ struct subchannel_id {</div><div class='ctx'> } __attribute__ ((packed, aligned(4)));</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Helper function for sane state of pre-allocated subchannel_id. */</div><div class='ctx'> static inline void</div><div class='head'>diff --git a/include/asm-s390/sclp.h b/arch/s390/include/asm/sclp.h<br/>index fed7bee650a0..fed7bee650a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/sclp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/sclp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/sclp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sclp.h</a></div><div class='head'>diff --git a/include/asm-s390/sections.h b/arch/s390/include/asm/sections.h<br/>index fbd9116eb17b..fbd9116eb17b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/sections.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/sections.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sections.h</a></div><div class='head'>diff --git a/include/asm-s390/segment.h b/arch/s390/include/asm/segment.h<br/>index 8bfce3475b1c..8bfce3475b1c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/segment.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/segment.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/segment.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/segment.h</a></div><div class='head'>diff --git a/include/asm-s390/sembuf.h b/arch/s390/include/asm/sembuf.h<br/>index 32626b0cac4b..32626b0cac4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/sembuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/sembuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sembuf.h</a></div><div class='head'>diff --git a/include/asm-s390/setup.h b/arch/s390/include/asm/setup.h<br/>index 4ba14e463e83..2bd9faeb3919 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/setup.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/setup.h</a></div><div class='hunk'>@@ -65,7 +65,6 @@ extern unsigned long machine_flags;</div><div class='ctx'> </div><div class='ctx'> #define MACHINE_FLAG_VM		(1UL &lt;&lt; 0)</div><div class='ctx'> #define MACHINE_FLAG_IEEE	(1UL &lt;&lt; 1)</div><div class='del'>-#define MACHINE_FLAG_P390	(1UL &lt;&lt; 2)</div><div class='ctx'> #define MACHINE_FLAG_CSP	(1UL &lt;&lt; 3)</div><div class='ctx'> #define MACHINE_FLAG_MVPG	(1UL &lt;&lt; 4)</div><div class='ctx'> #define MACHINE_FLAG_DIAG44	(1UL &lt;&lt; 5)</div><div class='head'>diff --git a/include/asm-s390/sfp-machine.h b/arch/s390/include/asm/sfp-machine.h<br/>index 4e16aede4b06..4e16aede4b06 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/sfp-machine.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/sfp-machine.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/sfp-machine.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sfp-machine.h</a></div><div class='head'>diff --git a/include/asm-s390/sfp-util.h b/arch/s390/include/asm/sfp-util.h<br/>index 0addc6466d95..0addc6466d95 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/sfp-util.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/sfp-util.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/sfp-util.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sfp-util.h</a></div><div class='head'>diff --git a/include/asm-s390/shmbuf.h b/arch/s390/include/asm/shmbuf.h<br/>index eed2e280ce37..eed2e280ce37 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/shmbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/shmbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/shmbuf.h</a></div><div class='head'>diff --git a/include/asm-s390/shmparam.h b/arch/s390/include/asm/shmparam.h<br/>index c2e0c0508e73..c2e0c0508e73 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/shmparam.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/shmparam.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/shmparam.h</a></div><div class='head'>diff --git a/include/asm-s390/sigcontext.h b/arch/s390/include/asm/sigcontext.h<br/>index aeb6e0b13329..aeb6e0b13329 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/sigcontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/sigcontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sigcontext.h</a></div><div class='head'>diff --git a/include/asm-s390/siginfo.h b/arch/s390/include/asm/siginfo.h<br/>index e0ff1ab054be..e0ff1ab054be 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/siginfo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/siginfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/siginfo.h</a></div><div class='head'>diff --git a/include/asm-s390/signal.h b/arch/s390/include/asm/signal.h<br/>index f6cfddb278cb..f6cfddb278cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/signal.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/signal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/signal.h</a></div><div class='head'>diff --git a/include/asm-s390/sigp.h b/arch/s390/include/asm/sigp.h<br/>index e16d56f8dfe1..e16d56f8dfe1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/sigp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/sigp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/sigp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sigp.h</a></div><div class='head'>diff --git a/include/asm-s390/smp.h b/arch/s390/include/asm/smp.h<br/>index ae89cf2478fc..ae89cf2478fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/smp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/smp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/smp.h</a></div><div class='head'>diff --git a/include/asm-s390/socket.h b/arch/s390/include/asm/socket.h<br/>index c786ab623b2d..c786ab623b2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/socket.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/socket.h</a></div><div class='head'>diff --git a/include/asm-s390/sockios.h b/arch/s390/include/asm/sockios.h<br/>index f4fc16c7da59..f4fc16c7da59 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/sockios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/sockios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sockios.h</a></div><div class='head'>diff --git a/include/asm-s390/sparsemem.h b/arch/s390/include/asm/sparsemem.h<br/>index 545d219e6a2d..545d219e6a2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/sparsemem.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/sparsemem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/sparsemem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sparsemem.h</a></div><div class='head'>diff --git a/include/asm-s390/spinlock.h b/arch/s390/include/asm/spinlock.h<br/>index df84ae96915f..df84ae96915f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/spinlock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/spinlock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/spinlock.h</a></div><div class='head'>diff --git a/include/asm-s390/spinlock_types.h b/arch/s390/include/asm/spinlock_types.h<br/>index 654abc40de04..654abc40de04 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/spinlock_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/spinlock_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/spinlock_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/spinlock_types.h</a></div><div class='head'>diff --git a/include/asm-s390/stat.h b/arch/s390/include/asm/stat.h<br/>index d92959eebb65..d92959eebb65 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/stat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/stat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/stat.h</a></div><div class='head'>diff --git a/include/asm-s390/statfs.h b/arch/s390/include/asm/statfs.h<br/>index 099a45579190..099a45579190 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/statfs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/statfs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/statfs.h</a></div><div class='head'>diff --git a/include/asm-s390/string.h b/arch/s390/include/asm/string.h<br/>index d074673a6d9b..d074673a6d9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/string.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/string.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/string.h</a></div><div class='head'>diff --git a/include/asm-s390/suspend.h b/arch/s390/include/asm/suspend.h<br/>index 1f34580e67a7..1f34580e67a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/suspend.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/suspend.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/suspend.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/suspend.h</a></div><div class='head'>diff --git a/include/asm-s390/sysinfo.h b/arch/s390/include/asm/sysinfo.h<br/>index 79d01343f8b0..79d01343f8b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/sysinfo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/sysinfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/sysinfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/sysinfo.h</a></div><div class='head'>diff --git a/include/asm-s390/system.h b/arch/s390/include/asm/system.h<br/>index 819e7d99ca0c..819e7d99ca0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/system.h</a></div><div class='head'>diff --git a/include/asm-s390/tape390.h b/arch/s390/include/asm/tape390.h<br/>index 884fba48f1ff..884fba48f1ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/tape390.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/tape390.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/tape390.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/tape390.h</a></div><div class='head'>diff --git a/include/asm-s390/termbits.h b/arch/s390/include/asm/termbits.h<br/>index 58731853d529..58731853d529 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/termbits.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/termbits.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/termbits.h</a></div><div class='head'>diff --git a/include/asm-s390/termios.h b/arch/s390/include/asm/termios.h<br/>index 67f66278f533..67f66278f533 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/termios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/termios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/termios.h</a></div><div class='head'>diff --git a/include/asm-s390/thread_info.h b/arch/s390/include/asm/thread_info.h<br/>index 91a8f93ad355..91a8f93ad355 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/thread_info.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/thread_info.h</a></div><div class='head'>diff --git a/include/asm-s390/timer.h b/arch/s390/include/asm/timer.h<br/>index d98d79e35cd6..d98d79e35cd6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/timer.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/timer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/timer.h</a></div><div class='head'>diff --git a/include/asm-s390/timex.h b/arch/s390/include/asm/timex.h<br/>index d744c3d62de5..d744c3d62de5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/timex.h</a></div><div class='head'>diff --git a/include/asm-s390/tlb.h b/arch/s390/include/asm/tlb.h<br/>index 3d8a96d39d9d..3d8a96d39d9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/tlb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/tlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/tlb.h</a></div><div class='head'>diff --git a/include/asm-s390/tlbflush.h b/arch/s390/include/asm/tlbflush.h<br/>index d60394b9745e..d60394b9745e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/tlbflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/tlbflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/tlbflush.h</a></div><div class='head'>diff --git a/include/asm-s390/todclk.h b/arch/s390/include/asm/todclk.h<br/>index c7f62055488a..c7f62055488a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/todclk.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/todclk.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/todclk.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/todclk.h</a></div><div class='head'>diff --git a/include/asm-s390/topology.h b/arch/s390/include/asm/topology.h<br/>index d96c91643458..d96c91643458 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/topology.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/topology.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/topology.h</a></div><div class='head'>diff --git a/include/asm-s390/types.h b/arch/s390/include/asm/types.h<br/>index 41c547656130..41c547656130 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/types.h</a></div><div class='head'>diff --git a/include/asm-s390/uaccess.h b/arch/s390/include/asm/uaccess.h<br/>index 0235970278f0..0235970278f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/uaccess.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/uaccess.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/uaccess.h</a></div><div class='head'>diff --git a/include/asm-s390/ucontext.h b/arch/s390/include/asm/ucontext.h<br/>index d69bec0b03f5..d69bec0b03f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/ucontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/ucontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/ucontext.h</a></div><div class='head'>diff --git a/include/asm-s390/unaligned.h b/arch/s390/include/asm/unaligned.h<br/>index da9627afe5d8..da9627afe5d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/unaligned.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/unaligned.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/unaligned.h</a></div><div class='head'>diff --git a/include/asm-s390/unistd.h b/arch/s390/include/asm/unistd.h<br/>index 583da807ea97..c8ad350d1444 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/unistd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/unistd.h</a></div><div class='hunk'>@@ -259,7 +259,13 @@</div><div class='ctx'> #define __NR_timerfd_create	319</div><div class='ctx'> #define __NR_timerfd_settime	320</div><div class='ctx'> #define __NR_timerfd_gettime	321</div><div class='del'>-#define NR_syscalls 322</div><div class='add'>+#define __NR_signalfd4		322</div><div class='add'>+#define __NR_eventfd2		323</div><div class='add'>+#define __NR_inotify_init1	324</div><div class='add'>+#define __NR_pipe2		325</div><div class='add'>+#define __NR_dup3		326</div><div class='add'>+#define __NR_epoll_create1	327</div><div class='add'>+#define NR_syscalls 328</div><div class='ctx'> </div><div class='ctx'> /* </div><div class='ctx'>  * There are some system calls that are not present on 64 bit, some</div><div class='head'>diff --git a/include/asm-s390/user.h b/arch/s390/include/asm/user.h<br/>index 1b050e35fdc6..1b050e35fdc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/user.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/user.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/user.h</a></div><div class='head'>diff --git a/include/asm-s390/vtoc.h b/arch/s390/include/asm/vtoc.h<br/>index 3a5267d90d29..3a5267d90d29 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/vtoc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/vtoc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/vtoc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/vtoc.h</a></div><div class='head'>diff --git a/include/asm-s390/xor.h b/arch/s390/include/asm/xor.h<br/>index c82eb12a5b18..c82eb12a5b18 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/xor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/xor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/xor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/xor.h</a></div><div class='head'>diff --git a/include/asm-s390/zcrypt.h b/arch/s390/include/asm/zcrypt.h<br/>index 00d3bbd44117..00d3bbd44117 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-s390/zcrypt.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-s390/zcrypt.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/zcrypt.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/include/asm/zcrypt.h</a></div><div class='head'>diff --git a/arch/s390/kernel/compat_ptrace.h b/arch/s390/kernel/compat_ptrace.h<br/>index cde81fa64f89..a2be3a978d5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/compat_ptrace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/s390/kernel/compat_ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/compat_ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/compat_ptrace.h</a></div><div class='hunk'>@@ -42,6 +42,7 @@ struct user_regs_struct32</div><div class='ctx'> 	u32 gprs[NUM_GPRS];</div><div class='ctx'> 	u32 acrs[NUM_ACRS];</div><div class='ctx'> 	u32 orig_gpr2;</div><div class='add'>+	/* nb: there's a 4-byte hole here */</div><div class='ctx'> 	s390_fp_regs fp_regs;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * These per registers are in here so that gdb can modify them</div><div class='head'>diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S<br/>index d003a6e16afb..328a20e880b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/compat_wrapper.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/s390/kernel/compat_wrapper.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/compat_wrapper.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/compat_wrapper.S</a></div><div class='hunk'>@@ -1732,3 +1732,40 @@ compat_sys_timerfd_gettime_wrapper:</div><div class='ctx'> 	lgfr	%r2,%r2			# int</div><div class='ctx'> 	llgtr	%r3,%r3			# struct compat_itimerspec *</div><div class='ctx'> 	jg	compat_sys_timerfd_gettime</div><div class='add'>+</div><div class='add'>+	.globl compat_sys_signalfd4_wrapper</div><div class='add'>+compat_sys_signalfd4_wrapper:</div><div class='add'>+	lgfr	%r2,%r2			# int</div><div class='add'>+	llgtr	%r3,%r3			# compat_sigset_t *</div><div class='add'>+	llgfr	%r4,%r4			# compat_size_t</div><div class='add'>+	lgfr	%r5,%r5			# int</div><div class='add'>+	jg	compat_sys_signalfd4</div><div class='add'>+</div><div class='add'>+	.globl sys_eventfd2_wrapper</div><div class='add'>+sys_eventfd2_wrapper:</div><div class='add'>+	llgfr	%r2,%r2			# unsigned int</div><div class='add'>+	lgfr	%r3,%r3			# int</div><div class='add'>+	jg	sys_eventfd2</div><div class='add'>+</div><div class='add'>+	.globl	sys_inotify_init1_wrapper</div><div class='add'>+sys_inotify_init1_wrapper:</div><div class='add'>+	lgfr	%r2,%r2			# int</div><div class='add'>+	jg	sys_inotify_init1</div><div class='add'>+</div><div class='add'>+	.globl	sys_pipe2_wrapper</div><div class='add'>+sys_pipe2_wrapper:</div><div class='add'>+	llgtr	%r2,%r2			# u32 *</div><div class='add'>+	lgfr	%r3,%r3			# int</div><div class='add'>+	jg	sys_pipe2		# branch to system call</div><div class='add'>+</div><div class='add'>+	.globl	sys_dup3_wrapper</div><div class='add'>+sys_dup3_wrapper:</div><div class='add'>+	llgfr	%r2,%r2			# unsigned int</div><div class='add'>+	llgfr	%r3,%r3			# unsigned int</div><div class='add'>+	lgfr	%r4,%r4			# int</div><div class='add'>+	jg	sys_dup3		# branch to system call</div><div class='add'>+</div><div class='add'>+	.globl	sys_epoll_create1_wrapper</div><div class='add'>+sys_epoll_create1_wrapper:</div><div class='add'>+	lgfr	%r2,%r2			# int</div><div class='add'>+	jg	sys_epoll_create1	# branch to system call</div><div class='head'>diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c<br/>index 54b2779b5e2f..2dcf590faba6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/ipl.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/s390/kernel/ipl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/ipl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/ipl.c</a></div><div class='hunk'>@@ -1705,7 +1705,10 @@ void __init setup_ipl(void)</div><div class='ctx'> </div><div class='ctx'> void __init ipl_update_parameters(void)</div><div class='ctx'> {</div><div class='del'>-	if (diag308(DIAG308_STORE, &amp;ipl_block) == DIAG308_RC_OK)</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = diag308(DIAG308_STORE, &amp;ipl_block);</div><div class='add'>+	if ((rc == DIAG308_RC_OK) || (rc == DIAG308_RC_NOCONFIG))</div><div class='ctx'> 		diag308_set_works = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/kernel/mem_detect.c b/arch/s390/kernel/mem_detect.c<br/>index 18ed7abe16c5..9872999c66d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/mem_detect.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/s390/kernel/mem_detect.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/mem_detect.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/mem_detect.c</a></div><div class='hunk'>@@ -9,27 +9,6 @@</div><div class='ctx'> #include &lt;asm/sclp.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='del'>-static int memory_fast_detect(struct mem_chunk *chunk)</div><div class='del'>-{</div><div class='del'>-	unsigned long val0 = 0;</div><div class='del'>-	unsigned long val1 = 0xc;</div><div class='del'>-	int rc = -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (ipl_flags &amp; IPL_NSS_VALID)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	asm volatile(</div><div class='del'>-		"	diag	%1,%2,0x260\n"</div><div class='del'>-		"0:	lhi	%0,0\n"</div><div class='del'>-		"1:\n"</div><div class='del'>-		EX_TABLE(0b,1b)</div><div class='del'>-		: "+d" (rc), "+d" (val0), "+d" (val1) : : "cc");</div><div class='del'>-</div><div class='del'>-	if (rc || val0 != val1)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	chunk-&gt;size = val0 + 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int tprot(unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = -EFAULT;</div><div class='hunk'>@@ -84,8 +63,6 @@ void detect_memory_layout(struct mem_chunk chunk[])</div><div class='ctx'> 	unsigned long flags, cr0;</div><div class='ctx'> </div><div class='ctx'> 	memset(chunk, 0, MEMORY_CHUNKS * sizeof(struct mem_chunk));</div><div class='del'>-	if (memory_fast_detect(&amp;chunk[0]) == 0)</div><div class='del'>-		return;</div><div class='ctx'> 	/* Disable IRQs, DAT and low address protection so tprot does the</div><div class='ctx'> 	 * right thing and we don't get scheduled away with low address</div><div class='ctx'> 	 * protection disabled.</div><div class='head'>diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c<br/>index 9839767d0842..3e2c05cb6a87 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/process.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/s390/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/process.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/process.c</a></div><div class='hunk'>@@ -75,7 +75,9 @@ unsigned long thread_saved_pc(struct task_struct *tsk)</div><div class='ctx'> 	return sf-&gt;gprs[8];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_PER_CPU(struct s390_idle_data, s390_idle);</div><div class='add'>+DEFINE_PER_CPU(struct s390_idle_data, s390_idle) = {</div><div class='add'>+	.lock = __SPIN_LOCK_UNLOCKED(s390_idle.lock)</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int s390_idle_enter(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c<br/>index 2815bfe348a6..c8b08289eb87 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/ptrace.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/s390/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/ptrace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/ptrace.c</a></div><div class='hunk'>@@ -170,6 +170,13 @@ static unsigned long __peek_user(struct task_struct *child, addr_t addr)</div><div class='ctx'> 		 */</div><div class='ctx'> 		tmp = (addr_t) task_pt_regs(child)-&gt;orig_gpr2;</div><div class='ctx'> </div><div class='add'>+	} else if (addr &lt; (addr_t) &amp;dummy-&gt;regs.fp_regs) {</div><div class='add'>+		/*</div><div class='add'>+		 * prevent reads of padding hole between</div><div class='add'>+		 * orig_gpr2 and fp_regs on s390.</div><div class='add'>+		 */</div><div class='add'>+		tmp = 0;</div><div class='add'>+</div><div class='ctx'> 	} else if (addr &lt; (addr_t) (&amp;dummy-&gt;regs.fp_regs + 1)) {</div><div class='ctx'> 		/* </div><div class='ctx'> 		 * floating point regs. are stored in the thread structure</div><div class='hunk'>@@ -270,6 +277,13 @@ static int __poke_user(struct task_struct *child, addr_t addr, addr_t data)</div><div class='ctx'> 		 */</div><div class='ctx'> 		task_pt_regs(child)-&gt;orig_gpr2 = data;</div><div class='ctx'> </div><div class='add'>+	} else if (addr &lt; (addr_t) &amp;dummy-&gt;regs.fp_regs) {</div><div class='add'>+		/*</div><div class='add'>+		 * prevent writes of padding hole between</div><div class='add'>+		 * orig_gpr2 and fp_regs on s390.</div><div class='add'>+		 */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	} else if (addr &lt; (addr_t) (&amp;dummy-&gt;regs.fp_regs + 1)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * floating point regs. are stored in the thread structure</div><div class='hunk'>@@ -428,6 +442,13 @@ static u32 __peek_user_compat(struct task_struct *child, addr_t addr)</div><div class='ctx'> 		 */</div><div class='ctx'> 		tmp = *(__u32*)((addr_t) &amp;task_pt_regs(child)-&gt;orig_gpr2 + 4);</div><div class='ctx'> </div><div class='add'>+	} else if (addr &lt; (addr_t) &amp;dummy32-&gt;regs.fp_regs) {</div><div class='add'>+		/*</div><div class='add'>+		 * prevent reads of padding hole between</div><div class='add'>+		 * orig_gpr2 and fp_regs on s390.</div><div class='add'>+		 */</div><div class='add'>+		tmp = 0;</div><div class='add'>+</div><div class='ctx'> 	} else if (addr &lt; (addr_t) (&amp;dummy32-&gt;regs.fp_regs + 1)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * floating point regs. are stored in the thread structure </div><div class='hunk'>@@ -514,6 +535,13 @@ static int __poke_user_compat(struct task_struct *child,</div><div class='ctx'> 		 */</div><div class='ctx'> 		*(__u32*)((addr_t) &amp;task_pt_regs(child)-&gt;orig_gpr2 + 4) = tmp;</div><div class='ctx'> </div><div class='add'>+	} else if (addr &lt; (addr_t) &amp;dummy32-&gt;regs.fp_regs) {</div><div class='add'>+		/*</div><div class='add'>+		 * prevent writess of padding hole between</div><div class='add'>+		 * orig_gpr2 and fp_regs on s390.</div><div class='add'>+		 */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	} else if (addr &lt; (addr_t) (&amp;dummy32-&gt;regs.fp_regs + 1)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * floating point regs. are stored in the thread structure </div><div class='head'>diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c<br/>index b795b3e24afd..00b9b4dec5eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/smp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/s390/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/smp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/smp.c</a></div><div class='hunk'>@@ -610,7 +610,6 @@ static void __init smp_create_idle(unsigned int cpu)</div><div class='ctx'> 	if (IS_ERR(p))</div><div class='ctx'> 		panic("failed fork for CPU %u: %li", cpu, PTR_ERR(p));</div><div class='ctx'> 	current_set[cpu] = p;</div><div class='del'>-	spin_lock_init(&amp;(&amp;per_cpu(s390_idle, cpu))-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __cpuinit smp_alloc_lowcore(int cpu)</div><div class='hunk'>@@ -845,7 +844,6 @@ void __init smp_prepare_boot_cpu(void)</div><div class='ctx'> 	current_set[0] = current;</div><div class='ctx'> 	smp_cpu_state[0] = CPU_STATE_CONFIGURED;</div><div class='ctx'> 	smp_cpu_polarization[0] = POLARIZATION_UNKNWN;</div><div class='del'>-	spin_lock_init(&amp;(&amp;__get_cpu_var(s390_idle))-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init smp_cpus_done(unsigned int max_cpus)</div><div class='head'>diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S<br/>index c87ec687d4c6..c66d35e55142 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/syscalls.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/s390/kernel/syscalls.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/syscalls.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/syscalls.S</a></div><div class='hunk'>@@ -330,3 +330,9 @@ SYSCALL(sys_eventfd,sys_eventfd,sys_eventfd_wrapper)</div><div class='ctx'> SYSCALL(sys_timerfd_create,sys_timerfd_create,sys_timerfd_create_wrapper)</div><div class='ctx'> SYSCALL(sys_timerfd_settime,sys_timerfd_settime,compat_sys_timerfd_settime_wrapper) /* 320 */</div><div class='ctx'> SYSCALL(sys_timerfd_gettime,sys_timerfd_gettime,compat_sys_timerfd_gettime_wrapper)</div><div class='add'>+SYSCALL(sys_signalfd4,sys_signalfd4,compat_sys_signalfd4_wrapper)</div><div class='add'>+SYSCALL(sys_eventfd2,sys_eventfd2,sys_eventfd2_wrapper)</div><div class='add'>+SYSCALL(sys_inotify_init1,sys_inotify_init1,sys_inotify_init1_wrapper)</div><div class='add'>+SYSCALL(sys_pipe2,sys_pipe2,sys_pipe2_wrapper) /* 325 */</div><div class='add'>+SYSCALL(sys_dup3,sys_dup3,sys_dup3_wrapper)</div><div class='add'>+SYSCALL(sys_epoll_create1,sys_epoll_create1,sys_epoll_create1_wrapper)</div><div class='head'>diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c<br/>index ab70d9bd9261..ca114fe46ffb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/s390/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/time.c</a></div><div class='hunk'>@@ -1348,7 +1348,7 @@ early_param("stp", early_parse_stp);</div><div class='ctx'> /*</div><div class='ctx'>  * Reset STP attachment.</div><div class='ctx'>  */</div><div class='del'>-static void stp_reset(void)</div><div class='add'>+static void __init stp_reset(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S<br/>index 76c1e60c92f3..607bd67a18ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/vmlinux.lds.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/s390/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/vmlinux.lds.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -55,7 +55,7 @@ SECTIONS</div><div class='ctx'> 		__start___ex_table = .;</div><div class='ctx'> 		*(__ex_table)</div><div class='ctx'> 		__stop___ex_table = .;</div><div class='del'>-	}</div><div class='add'>+	} :data</div><div class='ctx'> </div><div class='ctx'> 	.data : {		/* Data */</div><div class='ctx'> 		DATA_DATA</div><div class='head'>diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c<br/>index 2e2d2ffb6a07..d1faf5c54405 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kvm/priv.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/s390/kvm/priv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kvm/priv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/kvm/priv.c</a></div><div class='hunk'>@@ -158,6 +158,7 @@ static int handle_stfl(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;stat.instruction_stfl++;</div><div class='ctx'> 	facility_list &amp;= ~(1UL&lt;&lt;24); /* no stfle */</div><div class='add'>+	facility_list &amp;= ~(1UL&lt;&lt;23); /* no large pages */</div><div class='ctx'> </div><div class='ctx'> 	rc = copy_to_guest(vcpu, offsetof(struct _lowcore, stfl_fac_list),</div><div class='ctx'> 			   &amp;facility_list, sizeof(facility_list));</div><div class='head'>diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c<br/>index eae21a8ac72d..fc6ab6094df8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/lib/delay.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/s390/lib/delay.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/lib/delay.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/lib/delay.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@ void __udelay(unsigned long usecs)</div><div class='ctx'> 		local_bh_disable();</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	if (raw_irqs_disabled_flags(flags)) {</div><div class='del'>-		old_cc = S390_lowcore.clock_comparator;</div><div class='add'>+		old_cc = local_tick_disable();</div><div class='ctx'> 		S390_lowcore.clock_comparator = -1ULL;</div><div class='ctx'> 		__ctl_store(cr0, 0, 0);</div><div class='ctx'> 		dummy = (cr0 &amp; 0xffff00e0) | 0x00000800;</div><div class='hunk'>@@ -65,7 +65,7 @@ void __udelay(unsigned long usecs)</div><div class='ctx'> </div><div class='ctx'> 	if (raw_irqs_disabled_flags(flags)) {</div><div class='ctx'> 		__ctl_load(cr0, 0, 0);</div><div class='del'>-		S390_lowcore.clock_comparator = old_cc;</div><div class='add'>+		local_tick_enable(old_cc);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!irq_context)</div><div class='ctx'> 		_local_bh_enable();</div><div class='head'>diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c<br/>index 4993b0f594eb..1169130a97ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/mm/init.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/s390/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/mm/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/s390/mm/init.c</a></div><div class='hunk'>@@ -179,7 +179,7 @@ int arch_add_memory(int nid, u64 start, u64 size)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	pgdat = NODE_DATA(nid);</div><div class='del'>-	zone = pgdat-&gt;node_zones + ZONE_NORMAL;</div><div class='add'>+	zone = pgdat-&gt;node_zones + ZONE_MOVABLE;</div><div class='ctx'> 	rc = vmem_add_mapping(start, size);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -189,3 +189,14 @@ int arch_add_memory(int nid, u64 start, u64 size)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_MEMORY_HOTPLUG */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MEMORY_HOTREMOVE</div><div class='add'>+int remove_memory(u64 start, u64 size)</div><div class='add'>+{</div><div class='add'>+	unsigned long start_pfn, end_pfn;</div><div class='add'>+</div><div class='add'>+	start_pfn = PFN_DOWN(start);</div><div class='add'>+	end_pfn = start_pfn + PFN_DOWN(size);</div><div class='add'>+	return offline_pages(start_pfn, end_pfn, 120 * HZ);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_MEMORY_HOTREMOVE */</div><div class='head'>diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig<br/>index 0b88dc462d73..5131d50f851a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/Kconfig</a></div><div class='hunk'>@@ -24,6 +24,11 @@ config SUPERH32</div><div class='ctx'> config SUPERH64</div><div class='ctx'> 	def_bool y if CPU_SH5</div><div class='ctx'> </div><div class='add'>+config ARCH_DEFCONFIG</div><div class='add'>+	string</div><div class='add'>+	default "arch/sh/configs/shx3_defconfig" if SUPERH32</div><div class='add'>+	default "arch/sh/configs/cayman_defconfig" if SUPERH64</div><div class='add'>+</div><div class='ctx'> config RWSEM_GENERIC_SPINLOCK</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='hunk'>@@ -43,6 +48,9 @@ config GENERIC_HWEIGHT</div><div class='ctx'> config GENERIC_HARDIRQS</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='add'>+config GENERIC_HARDIRQS_NO__DO_IRQ</div><div class='add'>+	def_bool y</div><div class='add'>+</div><div class='ctx'> config GENERIC_IRQ_PROBE</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='hunk'>@@ -58,6 +66,10 @@ config GENERIC_TIME</div><div class='ctx'> config GENERIC_CLOCKEVENTS</div><div class='ctx'> 	def_bool n</div><div class='ctx'> </div><div class='add'>+config GENERIC_LOCKBREAK</div><div class='add'>+	def_bool y</div><div class='add'>+	depends on SMP &amp;&amp; PREEMPT</div><div class='add'>+</div><div class='ctx'> config SYS_SUPPORTS_PM</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='hunk'>@@ -89,9 +101,6 @@ config ARCH_HAS_ILOG2_U64</div><div class='ctx'> config ARCH_NO_VIRT_TO_BUS</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config ARCH_SUPPORTS_AOUT</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config IO_TRAPPED</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='hunk'>@@ -348,253 +357,10 @@ config CPU_SUBTYPE_SH5_103</div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='ctx'> source "arch/sh/mm/Kconfig"</div><div class='add'>+ </div><div class='ctx'> source "arch/sh/Kconfig.cpu"</div><div class='ctx'> </div><div class='del'>-menu "Board support"</div><div class='del'>-</div><div class='del'>-config SOLUTION_ENGINE</div><div class='del'>-	bool</div><div class='del'>-</div><div class='del'>-config SH_SOLUTION_ENGINE</div><div class='del'>-	bool "SolutionEngine"</div><div class='del'>-	select SOLUTION_ENGINE</div><div class='del'>-	select CPU_HAS_IPR_IRQ</div><div class='del'>-	depends on CPU_SUBTYPE_SH7705 || CPU_SUBTYPE_SH7709 || CPU_SUBTYPE_SH7710 || \</div><div class='del'>-	  CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7750S || \</div><div class='del'>-	  CPU_SUBTYPE_SH7750R </div><div class='del'>-	help</div><div class='del'>-	  Select SolutionEngine if configuring for a Hitachi SH7705, SH7709,</div><div class='del'>-	  SH7710, SH7712, SH7750, SH7750S or SH7750R evaluation board.</div><div class='del'>-</div><div class='del'>-config SH_7206_SOLUTION_ENGINE</div><div class='del'>-	bool "SolutionEngine7206"</div><div class='del'>-	select SOLUTION_ENGINE</div><div class='del'>-	depends on CPU_SUBTYPE_SH7206</div><div class='del'>-	help</div><div class='del'>-	  Select 7206 SolutionEngine if configuring for a Hitachi SH7206</div><div class='del'>-	  evaluation board.</div><div class='del'>-</div><div class='del'>-config SH_7619_SOLUTION_ENGINE</div><div class='del'>-	bool "SolutionEngine7619"</div><div class='del'>-	select SOLUTION_ENGINE</div><div class='del'>-	depends on CPU_SUBTYPE_SH7619</div><div class='del'>-	help</div><div class='del'>-	  Select 7619 SolutionEngine if configuring for a Hitachi SH7619</div><div class='del'>-	  evaluation board.</div><div class='del'>-	</div><div class='del'>-config SH_7721_SOLUTION_ENGINE</div><div class='del'>-	bool "SolutionEngine7721"</div><div class='del'>-	select SOLUTION_ENGINE</div><div class='del'>-	depends on CPU_SUBTYPE_SH7721</div><div class='del'>-	help</div><div class='del'>-	  Select 7721 SolutionEngine if configuring for a Hitachi SH7721</div><div class='del'>-	  evaluation board.</div><div class='del'>-</div><div class='del'>-config SH_7722_SOLUTION_ENGINE</div><div class='del'>-	bool "SolutionEngine7722"</div><div class='del'>-	select SOLUTION_ENGINE</div><div class='del'>-	depends on CPU_SUBTYPE_SH7722</div><div class='del'>-	help</div><div class='del'>-	  Select 7722 SolutionEngine if configuring for a Hitachi SH772</div><div class='del'>-	  evaluation board.</div><div class='del'>-</div><div class='del'>-config SH_7751_SOLUTION_ENGINE</div><div class='del'>-	bool "SolutionEngine7751"</div><div class='del'>-	select SOLUTION_ENGINE</div><div class='del'>-	select CPU_HAS_IPR_IRQ</div><div class='del'>-	depends on CPU_SUBTYPE_SH7751</div><div class='del'>-	help</div><div class='del'>-	  Select 7751 SolutionEngine if configuring for a Hitachi SH7751</div><div class='del'>-	  evaluation board.</div><div class='del'>-	  </div><div class='del'>-config SH_7780_SOLUTION_ENGINE</div><div class='del'>-	bool "SolutionEngine7780"</div><div class='del'>-	select SOLUTION_ENGINE</div><div class='del'>-	select SYS_SUPPORTS_PCI</div><div class='del'>-	depends on CPU_SUBTYPE_SH7780</div><div class='del'>-	help</div><div class='del'>-	  Select 7780 SolutionEngine if configuring for a Renesas SH7780</div><div class='del'>-	  evaluation board.</div><div class='del'>-</div><div class='del'>-config SH_7343_SOLUTION_ENGINE</div><div class='del'>-	bool "SolutionEngine7343"</div><div class='del'>-	select SOLUTION_ENGINE</div><div class='del'>-	depends on CPU_SUBTYPE_SH7343</div><div class='del'>-	help</div><div class='del'>-	  Select 7343 SolutionEngine if configuring for a Hitachi</div><div class='del'>-	  SH7343 (SH-Mobile 3AS) evaluation board.</div><div class='del'>-</div><div class='del'>-config SH_7751_SYSTEMH</div><div class='del'>-	bool "SystemH7751R"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7751R</div><div class='del'>-	help</div><div class='del'>-	  Select SystemH if you are configuring for a Renesas SystemH</div><div class='del'>-	  7751R evaluation board.</div><div class='del'>-</div><div class='del'>-config SH_HP6XX</div><div class='del'>-	bool "HP6XX"</div><div class='del'>-	select SYS_SUPPORTS_APM_EMULATION</div><div class='del'>-	select HD6446X_SERIES</div><div class='del'>-	depends on CPU_SUBTYPE_SH7709</div><div class='del'>-	help</div><div class='del'>-	  Select HP6XX if configuring for a HP jornada HP6xx.</div><div class='del'>-	  More information (hardware only) at</div><div class='del'>-	  &lt;http://www.hp.com/jornada/&gt;.</div><div class='del'>-</div><div class='del'>-config SH_DREAMCAST</div><div class='del'>-	bool "Dreamcast"</div><div class='del'>-	select SYS_SUPPORTS_PCI</div><div class='del'>-	depends on CPU_SUBTYPE_SH7091</div><div class='del'>-	help</div><div class='del'>-	  Select Dreamcast if configuring for a SEGA Dreamcast.</div><div class='del'>-	  More information at &lt;http://www.linux-sh.org&gt;</div><div class='del'>-</div><div class='del'>-config SH_SH03</div><div class='del'>-	bool "Interface CTP/PCI-SH03"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7751</div><div class='del'>-	select CPU_HAS_IPR_IRQ</div><div class='del'>-	select SYS_SUPPORTS_PCI</div><div class='del'>-	help</div><div class='del'>-	  CTP/PCI-SH03 is a CPU module computer that is produced</div><div class='del'>-	  by Interface Corporation.</div><div class='del'>-	  More information at &lt;http://www.interface.co.jp&gt;</div><div class='del'>-</div><div class='del'>-config SH_SECUREEDGE5410</div><div class='del'>-	bool "SecureEdge5410"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7751R</div><div class='del'>-	select CPU_HAS_IPR_IRQ</div><div class='del'>-	select SYS_SUPPORTS_PCI</div><div class='del'>-	help</div><div class='del'>-	  Select SecureEdge5410 if configuring for a SnapGear SH board.</div><div class='del'>-	  This includes both the OEM SecureEdge products as well as the</div><div class='del'>-	  SME product line.</div><div class='del'>-</div><div class='del'>-config SH_RTS7751R2D</div><div class='del'>-	bool "RTS7751R2D"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7751R</div><div class='del'>-	select SYS_SUPPORTS_PCI</div><div class='del'>-	select IO_TRAPPED</div><div class='del'>-	help</div><div class='del'>-	  Select RTS7751R2D if configuring for a Renesas Technology</div><div class='del'>-	  Sales SH-Graphics board.</div><div class='del'>-</div><div class='del'>-config SH_RSK7203</div><div class='del'>-	bool "RSK7203"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7203</div><div class='del'>-</div><div class='del'>-config SH_SDK7780</div><div class='del'>-	bool "SDK7780R3"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7780</div><div class='del'>-	select SYS_SUPPORTS_PCI</div><div class='del'>-	help</div><div class='del'>-	  Select SDK7780 if configuring for a Renesas SH7780 SDK7780R3</div><div class='del'>-	  evaluation board.</div><div class='del'>-</div><div class='del'>-config SH_HIGHLANDER</div><div class='del'>-	bool "Highlander"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785</div><div class='del'>-	select SYS_SUPPORTS_PCI</div><div class='del'>-	select IO_TRAPPED</div><div class='del'>-</div><div class='del'>-config SH_SH7785LCR</div><div class='del'>-	bool "SH7785LCR"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7785</div><div class='del'>-	select SYS_SUPPORTS_PCI</div><div class='del'>-	select IO_TRAPPED</div><div class='del'>-</div><div class='del'>-config SH_SH7785LCR_29BIT_PHYSMAPS</div><div class='del'>-	bool "SH7785LCR 29bit physmaps"</div><div class='del'>-	depends on SH_SH7785LCR</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  This board has 2 physical memory maps. It can be changed with</div><div class='del'>-	  DIP switch(S2-5). If you set the DIP switch for S2-5 = ON,</div><div class='del'>-	  you can access all on-board device in 29bit address mode.</div><div class='del'>-</div><div class='del'>-config SH_MIGOR</div><div class='del'>-	bool "Migo-R"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7722</div><div class='del'>-	help</div><div class='del'>-	  Select Migo-R if configuring for the SH7722 Migo-R platform</div><div class='del'>-          by Renesas System Solutions Asia Pte. Ltd.</div><div class='del'>-</div><div class='del'>-config SH_AP325RXA</div><div class='del'>-	bool "AP-325RXA"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7723</div><div class='del'>-	help</div><div class='del'>-	  Renesas "AP-325RXA" support.</div><div class='del'>-	  Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"</div><div class='del'>-</div><div class='del'>-config SH_SH7763RDP</div><div class='del'>-	bool "SH7763RDP"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7763</div><div class='del'>-	help</div><div class='del'>-	  Select SH7763RDP if configuring for a Renesas SH7763</div><div class='del'>-	  evaluation board.</div><div class='del'>-</div><div class='del'>-config SH_EDOSK7705</div><div class='del'>-	bool "EDOSK7705"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7705</div><div class='del'>-</div><div class='del'>-config SH_SH4202_MICRODEV</div><div class='del'>-	bool "SH4-202 MicroDev"</div><div class='del'>-	depends on CPU_SUBTYPE_SH4_202</div><div class='del'>-	help</div><div class='del'>-	  Select SH4-202 MicroDev if configuring for a SuperH MicroDev board</div><div class='del'>-	  with an SH4-202 CPU.</div><div class='del'>-</div><div class='del'>-config SH_LANDISK</div><div class='del'>-	bool "LANDISK"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7751R</div><div class='del'>-	select SYS_SUPPORTS_PCI</div><div class='del'>-	help</div><div class='del'>-	  I-O DATA DEVICE, INC. "LANDISK Series" support.</div><div class='del'>-</div><div class='del'>-config SH_TITAN</div><div class='del'>-	bool "TITAN"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7751R</div><div class='del'>-	select CPU_HAS_IPR_IRQ</div><div class='del'>-	select SYS_SUPPORTS_PCI</div><div class='del'>-	help</div><div class='del'>-	  Select Titan if you are configuring for a Nimble Microsystems</div><div class='del'>-	  NetEngine NP51R.</div><div class='del'>-</div><div class='del'>-config SH_SHMIN</div><div class='del'>-	bool "SHMIN"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7706</div><div class='del'>-	select CPU_HAS_IPR_IRQ</div><div class='del'>-	help</div><div class='del'>-	  Select SHMIN if configuring for the SHMIN board.</div><div class='del'>-</div><div class='del'>-config SH_LBOX_RE2</div><div class='del'>-	bool "L-BOX RE2"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7751R</div><div class='del'>-	select SYS_SUPPORTS_PCI</div><div class='del'>-	help</div><div class='del'>-	  Select L-BOX RE2 if configuring for the NTT COMWARE L-BOX RE2.</div><div class='del'>-</div><div class='del'>-config SH_X3PROTO</div><div class='del'>-	bool "SH-X3 Prototype board"</div><div class='del'>-	depends on CPU_SUBTYPE_SHX3</div><div class='del'>-</div><div class='del'>-config SH_MAGIC_PANEL_R2</div><div class='del'>-	bool "Magic Panel R2"</div><div class='del'>-	depends on CPU_SUBTYPE_SH7720</div><div class='del'>-	help</div><div class='del'>-	  Select Magic Panel R2 if configuring for Magic Panel R2.</div><div class='del'>-</div><div class='del'>-config SH_CAYMAN</div><div class='del'>-	bool "Hitachi Cayman"</div><div class='del'>-	depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103</div><div class='del'>-	select SYS_SUPPORTS_PCI</div><div class='del'>-</div><div class='del'>-endmenu</div><div class='del'>-</div><div class='del'>-source "arch/sh/boards/renesas/rts7751r2d/Kconfig"</div><div class='del'>-source "arch/sh/boards/renesas/r7780rp/Kconfig"</div><div class='del'>-source "arch/sh/boards/renesas/sdk7780/Kconfig"</div><div class='del'>-source "arch/sh/boards/renesas/migor/Kconfig"</div><div class='del'>-source "arch/sh/boards/magicpanelr2/Kconfig"</div><div class='add'>+source "arch/sh/boards/Kconfig"</div><div class='ctx'> </div><div class='ctx'> menu "Timer and clock configuration"</div><div class='ctx'> </div><div class='hunk'>@@ -721,6 +487,23 @@ config CRASH_DUMP</div><div class='ctx'> </div><div class='ctx'> 	  For more details see Documentation/kdump/kdump.txt</div><div class='ctx'> </div><div class='add'>+config SECCOMP</div><div class='add'>+	bool "Enable seccomp to safely compute untrusted bytecode"</div><div class='add'>+	depends on PROC_FS</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  This kernel feature is useful for number crunching applications</div><div class='add'>+	  that may need to compute untrusted bytecode during their</div><div class='add'>+	  execution. By using pipes or other transports made available to</div><div class='add'>+	  the process as file descriptors supporting the read/write</div><div class='add'>+	  syscalls, it's possible to isolate those applications in</div><div class='add'>+	  their own address space using seccomp. Once seccomp is</div><div class='add'>+	  enabled via prctl, it cannot be disabled and the task is only</div><div class='add'>+	  allowed to execute a few safe syscalls defined by each seccomp</div><div class='add'>+	  mode.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config SMP</div><div class='ctx'> 	bool "Symmetric multi-processing support"</div><div class='ctx'> 	depends on SYS_SUPPORTS_SMP</div><div class='head'>diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug<br/>index 36f4b1f7066d..4d2d102e00d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/Kconfig.debug?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/Kconfig.debug</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/Kconfig.debug?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/Kconfig.debug</a></div><div class='hunk'>@@ -182,7 +182,7 @@ if SUPERH64</div><div class='ctx'> </div><div class='ctx'> config SH64_PROC_ASIDS</div><div class='ctx'> 	bool "Debug: report ASIDs through /proc/asids"</div><div class='del'>-	depends on PROC_FS</div><div class='add'>+	depends on PROC_FS &amp;&amp; MMU</div><div class='ctx'> </div><div class='ctx'> config SH64_SR_WATCH</div><div class='ctx'> 	bool "Debug: set SR.WATCH to enable hardware watchpoints and trace"</div><div class='head'>diff --git a/arch/sh/Makefile b/arch/sh/Makefile<br/>index c627e45c4df7..01d85c74481d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/Makefile</a></div><div class='hunk'>@@ -68,7 +68,7 @@ OBJCOPYFLAGS	:= -O binary -R .note -R .note.gnu.build-id -R .comment \</div><div class='ctx'> defaultimage-$(CONFIG_SUPERH32)	:= zImage</div><div class='ctx'> </div><div class='ctx'> # Set some sensible Kbuild defaults</div><div class='del'>-KBUILD_DEFCONFIG	:= r7780mp_defconfig</div><div class='add'>+KBUILD_DEFCONFIG	:= shx3_defconfig</div><div class='ctx'> KBUILD_IMAGE		:= $(defaultimage-y)</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -91,51 +91,32 @@ LDFLAGS_vmlinux		+= --defsym 'jiffies=jiffies_64+4'</div><div class='ctx'> LDFLAGS			+= -EB</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-KBUILD_CFLAGS		+= -pipe $(cflags-y)</div><div class='del'>-KBUILD_AFLAGS		+= $(cflags-y)</div><div class='del'>-</div><div class='ctx'> head-y			:= arch/sh/kernel/init_task.o</div><div class='ctx'> head-$(CONFIG_SUPERH32)	+= arch/sh/kernel/head_32.o</div><div class='ctx'> head-$(CONFIG_SUPERH64)	+= arch/sh/kernel/head_64.o</div><div class='ctx'> </div><div class='del'>-LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)</div><div class='del'>-</div><div class='del'>-core-y				+= arch/sh/kernel/ arch/sh/mm/</div><div class='add'>+core-y				+= arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/</div><div class='ctx'> core-$(CONFIG_SH_FPU_EMU)	+= arch/sh/math-emu/</div><div class='ctx'> </div><div class='del'>-# Boards</div><div class='del'>-machdir-$(CONFIG_SH_SOLUTION_ENGINE)		+= se/770x</div><div class='del'>-machdir-$(CONFIG_SH_7722_SOLUTION_ENGINE)	+= se/7722</div><div class='del'>-machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)	+= se/7751</div><div class='del'>-machdir-$(CONFIG_SH_7780_SOLUTION_ENGINE)	+= se/7780</div><div class='del'>-machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE)	+= se/7343</div><div class='del'>-machdir-$(CONFIG_SH_7721_SOLUTION_ENGINE)	+= se/7721</div><div class='del'>-machdir-$(CONFIG_SH_HP6XX)			+= hp6xx</div><div class='del'>-machdir-$(CONFIG_SH_DREAMCAST)			+= dreamcast</div><div class='del'>-machdir-$(CONFIG_SH_SH03)			+= sh03</div><div class='del'>-machdir-$(CONFIG_SH_SECUREEDGE5410)		+= snapgear</div><div class='del'>-machdir-$(CONFIG_SH_RTS7751R2D)			+= renesas/rts7751r2d</div><div class='del'>-machdir-$(CONFIG_SH_7751_SYSTEMH)		+= renesas/systemh</div><div class='del'>-machdir-$(CONFIG_SH_EDOSK7705)			+= renesas/edosk7705</div><div class='del'>-machdir-$(CONFIG_SH_HIGHLANDER)			+= renesas/r7780rp</div><div class='del'>-machdir-$(CONFIG_SH_MIGOR)			+= renesas/migor</div><div class='del'>-machdir-$(CONFIG_SH_SDK7780)			+= renesas/sdk7780</div><div class='del'>-machdir-$(CONFIG_SH_X3PROTO)			+= renesas/x3proto</div><div class='del'>-machdir-$(CONFIG_SH_RSK7203)			+= renesas/rsk7203</div><div class='del'>-machdir-$(CONFIG_SH_AP325RXA)			+= renesas/ap325rxa</div><div class='del'>-machdir-$(CONFIG_SH_SH7763RDP)			+= renesas/sh7763rdp</div><div class='del'>-machdir-$(CONFIG_SH_SH7785LCR)			+= renesas/sh7785lcr</div><div class='del'>-machdir-$(CONFIG_SH_SH4202_MICRODEV)		+= superh/microdev</div><div class='del'>-machdir-$(CONFIG_SH_LANDISK)			+= landisk</div><div class='del'>-machdir-$(CONFIG_SH_TITAN)			+= titan</div><div class='del'>-machdir-$(CONFIG_SH_SHMIN)			+= shmin</div><div class='del'>-machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE)	+= se/7206</div><div class='del'>-machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE)	+= se/7619</div><div class='del'>-machdir-$(CONFIG_SH_LBOX_RE2)			+= lboxre2</div><div class='del'>-machdir-$(CONFIG_SH_MAGIC_PANEL_R2)		+= magicpanelr2</div><div class='del'>-machdir-$(CONFIG_SH_CAYMAN)			+= cayman</div><div class='del'>-</div><div class='del'>-incdir-y	:= $(notdir $(machdir-y))</div><div class='add'>+# Mach groups</div><div class='add'>+machdir-$(CONFIG_SOLUTION_ENGINE)		+= mach-se</div><div class='add'>+machdir-$(CONFIG_SH_HP6XX)			+= mach-hp6xx</div><div class='add'>+machdir-$(CONFIG_SH_DREAMCAST)			+= mach-dreamcast</div><div class='add'>+machdir-$(CONFIG_SH_SH03)			+= mach-sh03</div><div class='add'>+machdir-$(CONFIG_SH_SECUREEDGE5410)		+= mach-snapgear</div><div class='add'>+machdir-$(CONFIG_SH_RTS7751R2D)			+= mach-r2d</div><div class='add'>+machdir-$(CONFIG_SH_7751_SYSTEMH)		+= mach-systemh</div><div class='add'>+machdir-$(CONFIG_SH_EDOSK7705)			+= mach-edosk7705</div><div class='add'>+machdir-$(CONFIG_SH_HIGHLANDER)			+= mach-highlander</div><div class='add'>+machdir-$(CONFIG_SH_MIGOR)			+= mach-migor</div><div class='add'>+machdir-$(CONFIG_SH_SDK7780)			+= mach-sdk7780</div><div class='add'>+machdir-$(CONFIG_SH_X3PROTO)			+= mach-x3proto</div><div class='add'>+machdir-$(CONFIG_SH_SH7763RDP)			+= mach-sh7763rdp</div><div class='add'>+machdir-$(CONFIG_SH_SH4202_MICRODEV)		+= mach-microdev</div><div class='add'>+machdir-$(CONFIG_SH_LANDISK)			+= mach-landisk</div><div class='add'>+machdir-$(CONFIG_SH_TITAN)			+= mach-titan</div><div class='add'>+machdir-$(CONFIG_SH_LBOX_RE2)			+= mach-lboxre2</div><div class='add'>+machdir-$(CONFIG_SH_CAYMAN)			+= mach-cayman</div><div class='ctx'> </div><div class='ctx'> ifneq ($(machdir-y),)</div><div class='ctx'> core-y	+= $(addprefix arch/sh/boards/, \</div><div class='hunk'>@@ -145,67 +126,40 @@ endif</div><div class='ctx'> # Companion chips</div><div class='ctx'> core-$(CONFIG_HD6446X_SERIES)	+= arch/sh/cchips/hd6446x/</div><div class='ctx'> </div><div class='del'>-cpuincdir-$(CONFIG_CPU_SH2)	:= cpu-sh2</div><div class='del'>-cpuincdir-$(CONFIG_CPU_SH2A)	:= cpu-sh2a</div><div class='del'>-cpuincdir-$(CONFIG_CPU_SH3)	:= cpu-sh3</div><div class='del'>-cpuincdir-$(CONFIG_CPU_SH4)	:= cpu-sh4</div><div class='del'>-cpuincdir-$(CONFIG_CPU_SH5)	:= cpu-sh5</div><div class='del'>-</div><div class='del'>-libs-$(CONFIG_SUPERH32)		:= arch/sh/lib/	$(libs-y)</div><div class='del'>-libs-$(CONFIG_SUPERH64)		:= arch/sh/lib64/ $(libs-y)</div><div class='del'>-libs-y				+= $(LIBGCC)</div><div class='add'>+#</div><div class='add'>+# CPU header paths</div><div class='add'>+#</div><div class='add'>+# These are ordered by optimization level. A CPU family that is a subset</div><div class='add'>+# of another (ie, SH-2A / SH-2), is picked up first, with increasing</div><div class='add'>+# levels of genericness if nothing more suitable is situated in the</div><div class='add'>+# hierarchy.</div><div class='add'>+#</div><div class='add'>+# As an example, in order of preference, SH-2A &gt; SH-2 &gt; common definitions.</div><div class='add'>+#</div><div class='add'>+cpuincdir-$(CONFIG_CPU_SH2A)	+= cpu-sh2a</div><div class='add'>+cpuincdir-$(CONFIG_CPU_SH2)	+= cpu-sh2</div><div class='add'>+cpuincdir-$(CONFIG_CPU_SH3)	+= cpu-sh3</div><div class='add'>+cpuincdir-$(CONFIG_CPU_SH4)	+= cpu-sh4</div><div class='add'>+cpuincdir-$(CONFIG_CPU_SH5)	+= cpu-sh5</div><div class='add'>+cpuincdir-y			+= cpu-common	# Must be last</div><div class='ctx'> </div><div class='ctx'> drivers-y			+= arch/sh/drivers/</div><div class='ctx'> drivers-$(CONFIG_OPROFILE)	+= arch/sh/oprofile/</div><div class='ctx'> </div><div class='ctx'> boot := arch/sh/boot</div><div class='ctx'> </div><div class='del'>-ifneq ($(KBUILD_SRC),)</div><div class='del'>-incdir-prefix	:= $(srctree)/include/asm-sh/</div><div class='del'>-else</div><div class='del'>-incdir-prefix	:=</div><div class='del'>-endif</div><div class='add'>+cflags-y	+= $(foreach d, $(cpuincdir-y), -Iarch/sh/include/$(d)) \</div><div class='add'>+		   $(foreach d, $(machdir-y), -Iarch/sh/include/$(d))</div><div class='ctx'> </div><div class='del'>-#	Update machine arch and proc symlinks if something which affects</div><div class='del'>-#	them changed.  We use .arch and .mach to indicate when they were</div><div class='del'>-#	updated last, otherwise make uses the target directory mtime.</div><div class='add'>+KBUILD_CFLAGS		+= -pipe $(cflags-y)</div><div class='add'>+KBUILD_CPPFLAGS		+= $(cflags-y)</div><div class='add'>+KBUILD_AFLAGS		+= $(cflags-y)</div><div class='ctx'> </div><div class='del'>-include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) \</div><div class='del'>-		     include/config/auto.conf FORCE</div><div class='del'>-	@echo '  SYMLINK include/asm-sh/cpu -&gt; include/asm-sh/$(cpuincdir-y)'</div><div class='del'>-	$(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi</div><div class='del'>-	$(Q)ln -fsn $(incdir-prefix)$(cpuincdir-y) include/asm-sh/cpu</div><div class='del'>-	@touch $@</div><div class='add'>+LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)</div><div class='ctx'> </div><div class='del'>-#	Most boards have their own mach directories.  For the ones that</div><div class='del'>-#	don't, just reference the parent directory so the semantics are</div><div class='del'>-#	kept roughly the same.</div><div class='del'>-#</div><div class='del'>-#	When multiple boards are compiled in at the same time, preference</div><div class='del'>-#	for the mach link is given to whichever has a directory for its</div><div class='del'>-#	headers. However, this is only a workaround until platforms that</div><div class='del'>-#	can live in the same kernel image back away from relying on the</div><div class='del'>-#	mach link.</div><div class='del'>-</div><div class='del'>-include/asm-sh/.mach: $(wildcard include/config/sh/*.h) \</div><div class='del'>-		      include/config/auto.conf FORCE</div><div class='del'>-	$(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi</div><div class='del'>-	$(Q)rm -f include/asm-sh/mach</div><div class='del'>-	$(Q)for i in $(incdir-y); do \</div><div class='del'>-	if [ -d $(srctree)/include/asm-sh/$$i ]; then \</div><div class='del'>-		echo -n '  SYMLINK include/asm-sh/mach -&gt; '; \</div><div class='del'>-		echo -e "include/asm-sh/$$i"; \</div><div class='del'>-		ln -fsn $(incdir-prefix)$$i \</div><div class='del'>-			include/asm-sh/mach; \</div><div class='del'>-	else \</div><div class='del'>-		if [ ! -d include/asm-sh/mach ]; then \</div><div class='del'>-			echo -n '  SYMLINK include/asm-sh/mach -&gt; '; \</div><div class='del'>-			echo -e 'include/asm-sh'; \</div><div class='del'>-			ln -fsn $(incdir-prefix)../asm-sh include/asm-sh/mach; \</div><div class='del'>-		fi; \</div><div class='del'>-	fi; \</div><div class='del'>-	done</div><div class='del'>-	@touch $@</div><div class='add'>+libs-$(CONFIG_SUPERH32)		:= arch/sh/lib/	$(libs-y)</div><div class='add'>+libs-$(CONFIG_SUPERH64)		:= arch/sh/lib64/ $(libs-y)</div><div class='add'>+libs-y				+= $(LIBGCC)</div><div class='ctx'> </div><div class='ctx'> PHONY += maketools FORCE</div><div class='ctx'> </div><div class='hunk'>@@ -219,8 +173,7 @@ zImage uImage uImage.srec vmlinux.srec: vmlinux</div><div class='ctx'> </div><div class='ctx'> compressed: zImage</div><div class='ctx'> </div><div class='del'>-archprepare: include/asm-sh/.cpu include/asm-sh/.mach maketools \</div><div class='del'>-	     arch/sh/lib64/syscalltab.h</div><div class='add'>+archprepare: maketools arch/sh/lib64/syscalltab.h</div><div class='ctx'> </div><div class='ctx'> archclean:</div><div class='ctx'> 	$(Q)$(MAKE) $(clean)=$(boot)</div><div class='hunk'>@@ -262,6 +215,4 @@ arch/sh/lib64/syscalltab.h: arch/sh/kernel/syscalls_64.S</div><div class='ctx'> 	$(call filechk,gen-syscalltab)</div><div class='ctx'> </div><div class='ctx'> CLEAN_FILES += arch/sh/lib64/syscalltab.h \</div><div class='del'>-	       include/asm-sh/machtypes.h \</div><div class='del'>-	       include/asm-sh/cpu include/asm-sh/.cpu \</div><div class='del'>-	       include/asm-sh/mach include/asm-sh/.mach</div><div class='add'>+	       include/asm-sh/machtypes.h</div><div class='head'>diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig<br/>new file mode 100644<br/>index 000000000000..ae194869fd60<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,258 @@</div><div class='add'>+menu "Board support"</div><div class='add'>+</div><div class='add'>+config SOLUTION_ENGINE</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SH_SOLUTION_ENGINE</div><div class='add'>+	bool "SolutionEngine"</div><div class='add'>+	select SOLUTION_ENGINE</div><div class='add'>+	select CPU_HAS_IPR_IRQ</div><div class='add'>+	depends on CPU_SUBTYPE_SH7705 || CPU_SUBTYPE_SH7709 || CPU_SUBTYPE_SH7710 || \</div><div class='add'>+	  CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7750S || \</div><div class='add'>+	  CPU_SUBTYPE_SH7750R </div><div class='add'>+	help</div><div class='add'>+	  Select SolutionEngine if configuring for a Hitachi SH7705, SH7709,</div><div class='add'>+	  SH7710, SH7712, SH7750, SH7750S or SH7750R evaluation board.</div><div class='add'>+</div><div class='add'>+config SH_7206_SOLUTION_ENGINE</div><div class='add'>+	bool "SolutionEngine7206"</div><div class='add'>+	select SOLUTION_ENGINE</div><div class='add'>+	depends on CPU_SUBTYPE_SH7206</div><div class='add'>+	help</div><div class='add'>+	  Select 7206 SolutionEngine if configuring for a Hitachi SH7206</div><div class='add'>+	  evaluation board.</div><div class='add'>+</div><div class='add'>+config SH_7619_SOLUTION_ENGINE</div><div class='add'>+	bool "SolutionEngine7619"</div><div class='add'>+	select SOLUTION_ENGINE</div><div class='add'>+	depends on CPU_SUBTYPE_SH7619</div><div class='add'>+	help</div><div class='add'>+	  Select 7619 SolutionEngine if configuring for a Hitachi SH7619</div><div class='add'>+	  evaluation board.</div><div class='add'>+	</div><div class='add'>+config SH_7721_SOLUTION_ENGINE</div><div class='add'>+	bool "SolutionEngine7721"</div><div class='add'>+	select SOLUTION_ENGINE</div><div class='add'>+	depends on CPU_SUBTYPE_SH7721</div><div class='add'>+	help</div><div class='add'>+	  Select 7721 SolutionEngine if configuring for a Hitachi SH7721</div><div class='add'>+	  evaluation board.</div><div class='add'>+</div><div class='add'>+config SH_7722_SOLUTION_ENGINE</div><div class='add'>+	bool "SolutionEngine7722"</div><div class='add'>+	select SOLUTION_ENGINE</div><div class='add'>+	depends on CPU_SUBTYPE_SH7722</div><div class='add'>+	help</div><div class='add'>+	  Select 7722 SolutionEngine if configuring for a Hitachi SH772</div><div class='add'>+	  evaluation board.</div><div class='add'>+</div><div class='add'>+config SH_7751_SOLUTION_ENGINE</div><div class='add'>+	bool "SolutionEngine7751"</div><div class='add'>+	select SOLUTION_ENGINE</div><div class='add'>+	select CPU_HAS_IPR_IRQ</div><div class='add'>+	depends on CPU_SUBTYPE_SH7751</div><div class='add'>+	help</div><div class='add'>+	  Select 7751 SolutionEngine if configuring for a Hitachi SH7751</div><div class='add'>+	  evaluation board.</div><div class='add'>+	  </div><div class='add'>+config SH_7780_SOLUTION_ENGINE</div><div class='add'>+	bool "SolutionEngine7780"</div><div class='add'>+	select SOLUTION_ENGINE</div><div class='add'>+	select SYS_SUPPORTS_PCI</div><div class='add'>+	depends on CPU_SUBTYPE_SH7780</div><div class='add'>+	help</div><div class='add'>+	  Select 7780 SolutionEngine if configuring for a Renesas SH7780</div><div class='add'>+	  evaluation board.</div><div class='add'>+</div><div class='add'>+config SH_7343_SOLUTION_ENGINE</div><div class='add'>+	bool "SolutionEngine7343"</div><div class='add'>+	select SOLUTION_ENGINE</div><div class='add'>+	depends on CPU_SUBTYPE_SH7343</div><div class='add'>+	help</div><div class='add'>+	  Select 7343 SolutionEngine if configuring for a Hitachi</div><div class='add'>+	  SH7343 (SH-Mobile 3AS) evaluation board.</div><div class='add'>+</div><div class='add'>+config SH_7751_SYSTEMH</div><div class='add'>+	bool "SystemH7751R"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7751R</div><div class='add'>+	help</div><div class='add'>+	  Select SystemH if you are configuring for a Renesas SystemH</div><div class='add'>+	  7751R evaluation board.</div><div class='add'>+</div><div class='add'>+config SH_HP6XX</div><div class='add'>+	bool "HP6XX"</div><div class='add'>+	select SYS_SUPPORTS_APM_EMULATION</div><div class='add'>+	select HD6446X_SERIES</div><div class='add'>+	depends on CPU_SUBTYPE_SH7709</div><div class='add'>+	help</div><div class='add'>+	  Select HP6XX if configuring for a HP jornada HP6xx.</div><div class='add'>+	  More information (hardware only) at</div><div class='add'>+	  &lt;http://www.hp.com/jornada/&gt;.</div><div class='add'>+</div><div class='add'>+config SH_DREAMCAST</div><div class='add'>+	bool "Dreamcast"</div><div class='add'>+	select SYS_SUPPORTS_PCI</div><div class='add'>+	depends on CPU_SUBTYPE_SH7091</div><div class='add'>+	help</div><div class='add'>+	  Select Dreamcast if configuring for a SEGA Dreamcast.</div><div class='add'>+	  More information at &lt;http://www.linux-sh.org&gt;</div><div class='add'>+</div><div class='add'>+config SH_SH03</div><div class='add'>+	bool "Interface CTP/PCI-SH03"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7751</div><div class='add'>+	select CPU_HAS_IPR_IRQ</div><div class='add'>+	select SYS_SUPPORTS_PCI</div><div class='add'>+	help</div><div class='add'>+	  CTP/PCI-SH03 is a CPU module computer that is produced</div><div class='add'>+	  by Interface Corporation.</div><div class='add'>+	  More information at &lt;http://www.interface.co.jp&gt;</div><div class='add'>+</div><div class='add'>+config SH_SECUREEDGE5410</div><div class='add'>+	bool "SecureEdge5410"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7751R</div><div class='add'>+	select CPU_HAS_IPR_IRQ</div><div class='add'>+	select SYS_SUPPORTS_PCI</div><div class='add'>+	help</div><div class='add'>+	  Select SecureEdge5410 if configuring for a SnapGear SH board.</div><div class='add'>+	  This includes both the OEM SecureEdge products as well as the</div><div class='add'>+	  SME product line.</div><div class='add'>+</div><div class='add'>+config SH_RTS7751R2D</div><div class='add'>+	bool "RTS7751R2D"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7751R</div><div class='add'>+	select SYS_SUPPORTS_PCI</div><div class='add'>+	select IO_TRAPPED</div><div class='add'>+	help</div><div class='add'>+	  Select RTS7751R2D if configuring for a Renesas Technology</div><div class='add'>+	  Sales SH-Graphics board.</div><div class='add'>+</div><div class='add'>+config SH_RSK7203</div><div class='add'>+	bool "RSK7203"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7203</div><div class='add'>+</div><div class='add'>+config SH_SDK7780</div><div class='add'>+	bool "SDK7780R3"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7780</div><div class='add'>+	select SYS_SUPPORTS_PCI</div><div class='add'>+	help</div><div class='add'>+	  Select SDK7780 if configuring for a Renesas SH7780 SDK7780R3</div><div class='add'>+	  evaluation board.</div><div class='add'>+</div><div class='add'>+config SH_HIGHLANDER</div><div class='add'>+	bool "Highlander"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785</div><div class='add'>+	select SYS_SUPPORTS_PCI</div><div class='add'>+	select IO_TRAPPED</div><div class='add'>+</div><div class='add'>+config SH_SH7785LCR</div><div class='add'>+	bool "SH7785LCR"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7785</div><div class='add'>+	select SYS_SUPPORTS_PCI</div><div class='add'>+	select IO_TRAPPED</div><div class='add'>+</div><div class='add'>+config SH_SH7785LCR_29BIT_PHYSMAPS</div><div class='add'>+	bool "SH7785LCR 29bit physmaps"</div><div class='add'>+	depends on SH_SH7785LCR</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  This board has 2 physical memory maps. It can be changed with</div><div class='add'>+	  DIP switch(S2-5). If you set the DIP switch for S2-5 = ON,</div><div class='add'>+	  you can access all on-board device in 29bit address mode.</div><div class='add'>+</div><div class='add'>+config SH_MIGOR</div><div class='add'>+	bool "Migo-R"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7722</div><div class='add'>+	help</div><div class='add'>+	  Select Migo-R if configuring for the SH7722 Migo-R platform</div><div class='add'>+          by Renesas System Solutions Asia Pte. Ltd.</div><div class='add'>+</div><div class='add'>+config SH_AP325RXA</div><div class='add'>+	bool "AP-325RXA"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7723</div><div class='add'>+	help</div><div class='add'>+	  Renesas "AP-325RXA" support.</div><div class='add'>+	  Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"</div><div class='add'>+</div><div class='add'>+config SH_SH7763RDP</div><div class='add'>+	bool "SH7763RDP"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7763</div><div class='add'>+	help</div><div class='add'>+	  Select SH7763RDP if configuring for a Renesas SH7763</div><div class='add'>+	  evaluation board.</div><div class='add'>+</div><div class='add'>+config SH_EDOSK7705</div><div class='add'>+	bool "EDOSK7705"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7705</div><div class='add'>+</div><div class='add'>+config SH_SH4202_MICRODEV</div><div class='add'>+	bool "SH4-202 MicroDev"</div><div class='add'>+	depends on CPU_SUBTYPE_SH4_202</div><div class='add'>+	help</div><div class='add'>+	  Select SH4-202 MicroDev if configuring for a SuperH MicroDev board</div><div class='add'>+	  with an SH4-202 CPU.</div><div class='add'>+</div><div class='add'>+config SH_LANDISK</div><div class='add'>+	bool "LANDISK"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7751R</div><div class='add'>+	select SYS_SUPPORTS_PCI</div><div class='add'>+	help</div><div class='add'>+	  I-O DATA DEVICE, INC. "LANDISK Series" support.</div><div class='add'>+</div><div class='add'>+config SH_TITAN</div><div class='add'>+	bool "TITAN"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7751R</div><div class='add'>+	select CPU_HAS_IPR_IRQ</div><div class='add'>+	select SYS_SUPPORTS_PCI</div><div class='add'>+	help</div><div class='add'>+	  Select Titan if you are configuring for a Nimble Microsystems</div><div class='add'>+	  NetEngine NP51R.</div><div class='add'>+</div><div class='add'>+config SH_SHMIN</div><div class='add'>+	bool "SHMIN"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7706</div><div class='add'>+	select CPU_HAS_IPR_IRQ</div><div class='add'>+	help</div><div class='add'>+	  Select SHMIN if configuring for the SHMIN board.</div><div class='add'>+</div><div class='add'>+config SH_LBOX_RE2</div><div class='add'>+	bool "L-BOX RE2"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7751R</div><div class='add'>+	select SYS_SUPPORTS_PCI</div><div class='add'>+	help</div><div class='add'>+	  Select L-BOX RE2 if configuring for the NTT COMWARE L-BOX RE2.</div><div class='add'>+</div><div class='add'>+config SH_X3PROTO</div><div class='add'>+	bool "SH-X3 Prototype board"</div><div class='add'>+	depends on CPU_SUBTYPE_SHX3</div><div class='add'>+</div><div class='add'>+config SH_MAGIC_PANEL_R2</div><div class='add'>+	bool "Magic Panel R2"</div><div class='add'>+	depends on CPU_SUBTYPE_SH7720</div><div class='add'>+	help</div><div class='add'>+	  Select Magic Panel R2 if configuring for Magic Panel R2.</div><div class='add'>+</div><div class='add'>+config SH_CAYMAN</div><div class='add'>+	bool "Hitachi Cayman"</div><div class='add'>+	depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103</div><div class='add'>+	select SYS_SUPPORTS_PCI</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='add'>+</div><div class='add'>+source "arch/sh/boards/mach-r2d/Kconfig"</div><div class='add'>+source "arch/sh/boards/mach-highlander/Kconfig"</div><div class='add'>+source "arch/sh/boards/mach-sdk7780/Kconfig"</div><div class='add'>+source "arch/sh/boards/mach-migor/Kconfig"</div><div class='add'>+</div><div class='add'>+if SH_MAGIC_PANEL_R2</div><div class='add'>+</div><div class='add'>+menu "Magic Panel R2 options"</div><div class='add'>+</div><div class='add'>+config SH_MAGIC_PANEL_R2_VERSION</div><div class='add'>+	int SH_MAGIC_PANEL_R2_VERSION</div><div class='add'>+	default "3"</div><div class='add'>+	help</div><div class='add'>+	  Set the version of the Magic Panel R2</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='add'>+</div><div class='add'>+endif</div><div class='head'>diff --git a/arch/sh/boards/Makefile b/arch/sh/boards/Makefile<br/>new file mode 100644<br/>index 000000000000..463022c7df3c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/Makefile</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+#</div><div class='add'>+# Specific board support, not covered by a mach group.</div><div class='add'>+#</div><div class='add'>+obj-$(CONFIG_SH_AP325RXA)	+= board-ap325rxa.o</div><div class='add'>+obj-$(CONFIG_SH_MAGIC_PANEL_R2)	+= board-magicpanelr2.o</div><div class='add'>+obj-$(CONFIG_SH_RSK7203)	+= board-rsk7203.o</div><div class='add'>+obj-$(CONFIG_SH_SH7785LCR)	+= board-sh7785lcr.o</div><div class='add'>+obj-$(CONFIG_SH_SHMIN)		+= board-shmin.o</div><div class='head'>diff --git a/arch/sh/boards/renesas/ap325rxa/setup.c b/arch/sh/boards/board-ap325rxa.c<br/>index 7fa74462bd9f..fd1612590bf4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/ap325rxa/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/ap325rxa/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/board-ap325rxa.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/board-ap325rxa.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/smc911x.h&gt;</div><div class='ctx'> #include &lt;media/soc_camera_platform.h&gt;</div><div class='ctx'> #include &lt;media/sh_mobile_ceu.h&gt;</div><div class='hunk'>@@ -141,6 +140,10 @@ static struct sh_mobile_lcdc_info lcdc_info = {</div><div class='ctx'> 			.vsync_len = 1,</div><div class='ctx'> 			.sync = 0, /* hsync and vsync are active low */</div><div class='ctx'> 		},</div><div class='add'>+		.lcd_size_cfg = { /* 7.0 inch */</div><div class='add'>+			.width = 152,</div><div class='add'>+			.height = 91,</div><div class='add'>+		},</div><div class='ctx'> 		.board_cfg = {</div><div class='ctx'> 			.display_on = ap320_wvga_power_on,</div><div class='ctx'> 		},</div><div class='hunk'>@@ -165,6 +168,7 @@ static struct platform_device lcdc_device = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_I2C</div><div class='ctx'> static unsigned char camera_ncm03j_magic[] =</div><div class='ctx'> {</div><div class='ctx'> 	0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8,</div><div class='hunk'>@@ -234,6 +238,7 @@ static struct platform_device camera_device = {</div><div class='ctx'> 		.platform_data	= &amp;camera_info,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='add'>+#endif /* CONFIG_I2C */</div><div class='ctx'> </div><div class='ctx'> static struct sh_mobile_ceu_info sh_mobile_ceu_info = {</div><div class='ctx'> 	.flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |</div><div class='hunk'>@@ -270,7 +275,9 @@ static struct platform_device *ap325rxa_devices[] __initdata = {</div><div class='ctx'> 	&amp;ap325rxa_nor_flash_device,</div><div class='ctx'> 	&amp;lcdc_device,</div><div class='ctx'> 	&amp;ceu_device,</div><div class='add'>+#ifdef CONFIG_I2C</div><div class='ctx'> 	&amp;camera_device,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {</div><div class='head'>diff --git a/arch/sh/boards/magicpanelr2/setup.c b/arch/sh/boards/board-magicpanelr2.c<br/>index f3b8b07ea5d6..f3b8b07ea5d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/magicpanelr2/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/magicpanelr2/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/board-magicpanelr2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/board-magicpanelr2.c</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/rsk7203/setup.c b/arch/sh/boards/board-rsk7203.c<br/>index 0bbda04b03b9..ffbedc59a973 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/rsk7203/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/rsk7203/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/board-rsk7203.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/board-rsk7203.c</a></div><div class='hunk'>@@ -10,13 +10,20 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='add'>+#include &lt;linux/smc911x.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='add'>+static struct smc911x_platdata smc911x_info = {</div><div class='add'>+	.flags		= SMC911X_USE_16BIT,</div><div class='add'>+	.irq_flags	= IRQF_TRIGGER_LOW,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct resource smc911x_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start		= 0x24000000,</div><div class='hunk'>@@ -35,6 +42,9 @@ static struct platform_device smc911x_device = {</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(smc911x_resources),</div><div class='ctx'> 	.resource	= smc911x_resources,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;smc911x_info,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const char *probes[] = { "cmdlinepart", NULL };</div><div class='head'>diff --git a/arch/sh/boards/renesas/sh7785lcr/setup.c b/arch/sh/boards/board-sh7785lcr.c<br/>index b95d674ee704..b95d674ee704 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/sh7785lcr/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/sh7785lcr/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/board-sh7785lcr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/board-sh7785lcr.c</a></div><div class='head'>diff --git a/arch/sh/boards/shmin/setup.c b/arch/sh/boards/board-shmin.c<br/>index 16e5dae8ecfb..16e5dae8ecfb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/shmin/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/shmin/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/board-shmin.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/board-shmin.c</a></div><div class='head'>diff --git a/arch/sh/boards/cayman/Makefile b/arch/sh/boards/mach-cayman/Makefile<br/>index 489a8f867368..489a8f867368 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/cayman/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/cayman/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-cayman/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-cayman/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/cayman/irq.c b/arch/sh/boards/mach-cayman/irq.c<br/>index 30ec7bebfaf1..ceb37ae92c70 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/cayman/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/cayman/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-cayman/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-cayman/irq.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;asm/cpu/irq.h&gt;</div><div class='add'>+#include &lt;cpu/irq.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Setup for the SMSC FDC37C935 / LAN91C100FD */</div><div class='head'>diff --git a/arch/sh/boards/cayman/led.c b/arch/sh/boards/mach-cayman/led.c<br/>index a808eac4ecd6..a808eac4ecd6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/cayman/led.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/cayman/led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-cayman/led.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-cayman/led.c</a></div><div class='head'>diff --git a/arch/sh/boards/cayman/setup.c b/arch/sh/boards/mach-cayman/setup.c<br/>index 8c9fa472d8f5..e7f9cc5f2ff1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/cayman/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/cayman/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-cayman/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-cayman/setup.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;asm/cpu/irq.h&gt;</div><div class='add'>+#include &lt;cpu/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Platform Dependent Interrupt Priorities.</div><div class='head'>diff --git a/arch/sh/boards/dreamcast/Makefile b/arch/sh/boards/mach-dreamcast/Makefile<br/>index 7b97546c7e5f..7b97546c7e5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/dreamcast/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/dreamcast/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-dreamcast/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-dreamcast/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/dreamcast/irq.c b/arch/sh/boards/mach-dreamcast/irq.c<br/>index 9d0673a9092a..67bdc33dd411 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/dreamcast/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/dreamcast/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-dreamcast/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-dreamcast/irq.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/dreamcast/sysasic.h&gt;</div><div class='add'>+#include &lt;mach/sysasic.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Dreamcast System ASIC Hardware Events -</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/dreamcast/rtc.c b/arch/sh/boards/mach-dreamcast/rtc.c<br/>index a7433685798d..a7433685798d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/dreamcast/rtc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/dreamcast/rtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-dreamcast/rtc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-dreamcast/rtc.c</a></div><div class='head'>diff --git a/arch/sh/boards/dreamcast/setup.c b/arch/sh/boards/mach-dreamcast/setup.c<br/>index 2581c8cd5df7..7d944fc75e93 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/dreamcast/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/dreamcast/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-dreamcast/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-dreamcast/setup.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/rtc.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='del'>-#include &lt;asm/mach/sysasic.h&gt;</div><div class='add'>+#include &lt;mach/sysasic.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern struct hw_interrupt_type systemasic_int;</div><div class='ctx'> extern void aica_time_init(void);</div><div class='head'>diff --git a/arch/sh/boards/renesas/edosk7705/Makefile b/arch/sh/boards/mach-edosk7705/Makefile<br/>index 14bdd531f116..14bdd531f116 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/edosk7705/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/edosk7705/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-edosk7705/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-edosk7705/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/edosk7705/io.c b/arch/sh/boards/mach-edosk7705/io.c<br/>index 541cea2a652f..541cea2a652f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/edosk7705/io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/edosk7705/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-edosk7705/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-edosk7705/io.c</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/edosk7705/setup.c b/arch/sh/boards/mach-edosk7705/setup.c<br/>index f076c45308dd..f076c45308dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/edosk7705/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/edosk7705/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-edosk7705/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-edosk7705/setup.c</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/r7780rp/Kconfig b/arch/sh/boards/mach-highlander/Kconfig<br/>index fc8f28e04ba3..fc8f28e04ba3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/r7780rp/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/r7780rp/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-highlander/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-highlander/Kconfig</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/r7780rp/Makefile b/arch/sh/boards/mach-highlander/Makefile<br/>index 20a10080b11f..20a10080b11f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/r7780rp/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/r7780rp/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-highlander/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-highlander/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/r7780rp/irq-r7780mp.c b/arch/sh/boards/mach-highlander/irq-r7780mp.c<br/>index ae1cfcb29700..ae1cfcb29700 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/r7780rp/irq-r7780mp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/r7780rp/irq-r7780mp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-highlander/irq-r7780mp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-highlander/irq-r7780mp.c</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/r7780rp/irq-r7780rp.c b/arch/sh/boards/mach-highlander/irq-r7780rp.c<br/>index 9d3921fe27c0..9d3921fe27c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/r7780rp/irq-r7780rp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/r7780rp/irq-r7780rp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-highlander/irq-r7780rp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-highlander/irq-r7780rp.c</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/r7780rp/irq-r7785rp.c b/arch/sh/boards/mach-highlander/irq-r7785rp.c<br/>index 896c045aa39d..896c045aa39d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/r7780rp/irq-r7785rp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/r7780rp/irq-r7785rp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-highlander/irq-r7785rp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-highlander/irq-r7785rp.c</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/r7780rp/psw.c b/arch/sh/boards/mach-highlander/psw.c<br/>index c844dfa5d58d..be8d5477fc65 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/r7780rp/psw.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/r7780rp/psw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-highlander/psw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-highlander/psw.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/mach/r7780rp.h&gt;</div><div class='add'>+#include &lt;asm/r7780rp.h&gt;</div><div class='ctx'> #include &lt;asm/push-switch.h&gt;</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t psw_irq_handler(int irq, void *arg)</div><div class='head'>diff --git a/arch/sh/boards/renesas/r7780rp/setup.c b/arch/sh/boards/mach-highlander/setup.c<br/>index bc79afb6fc4c..bc79afb6fc4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/r7780rp/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/r7780rp/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-highlander/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-highlander/setup.c</a></div><div class='head'>diff --git a/arch/sh/boards/hp6xx/Makefile b/arch/sh/boards/mach-hp6xx/Makefile<br/>index b3124278247c..b3124278247c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/hp6xx/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/hp6xx/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-hp6xx/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-hp6xx/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/hp6xx/hp6xx_apm.c b/arch/sh/boards/mach-hp6xx/hp6xx_apm.c<br/>index 177f4f028e0d..177f4f028e0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/hp6xx/hp6xx_apm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/hp6xx/hp6xx_apm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-hp6xx/hp6xx_apm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-hp6xx/hp6xx_apm.c</a></div><div class='head'>diff --git a/arch/sh/boards/hp6xx/pm.c b/arch/sh/boards/mach-hp6xx/pm.c<br/>index d22f6eac9cca..e96684def788 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/hp6xx/pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/hp6xx/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-hp6xx/pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-hp6xx/pm.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hd64461.h&gt;</div><div class='ctx'> #include &lt;asm/hp6xx.h&gt;</div><div class='del'>-#include &lt;asm/cpu/dac.h&gt;</div><div class='add'>+#include &lt;cpu/dac.h&gt;</div><div class='ctx'> #include &lt;asm/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define STBCR		0xffffff82</div><div class='head'>diff --git a/arch/sh/boards/hp6xx/pm_wakeup.S b/arch/sh/boards/mach-hp6xx/pm_wakeup.S<br/>index 45e9bf0b9115..44b648cf6f23 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/hp6xx/pm_wakeup.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/hp6xx/pm_wakeup.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-hp6xx/pm_wakeup.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-hp6xx/pm_wakeup.S</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;asm/cpu/mmu_context.h&gt;</div><div class='add'>+#include &lt;cpu/mmu_context.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define k0	r0</div><div class='ctx'> #define k1	r1</div><div class='head'>diff --git a/arch/sh/boards/hp6xx/setup.c b/arch/sh/boards/mach-hp6xx/setup.c<br/>index 2f414ac3c690..475b46caec1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/hp6xx/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/hp6xx/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-hp6xx/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-hp6xx/setup.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/hp6xx.h&gt;</div><div class='del'>-#include &lt;asm/cpu/dac.h&gt;</div><div class='add'>+#include &lt;cpu/dac.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define	SCPCR	0xa4000116</div><div class='ctx'> #define	SCPDR	0xa4000136</div><div class='head'>diff --git a/arch/sh/boards/landisk/Makefile b/arch/sh/boards/mach-landisk/Makefile<br/>index a696b4277fa9..a696b4277fa9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/landisk/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/landisk/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-landisk/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-landisk/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/landisk/gio.c b/arch/sh/boards/mach-landisk/gio.c<br/>index 0c15b0a50b99..25cdf7358000 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/landisk/gio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/landisk/gio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-landisk/gio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-landisk/gio.c</a></div><div class='hunk'>@@ -20,8 +20,8 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/landisk/gio.h&gt;</div><div class='del'>-#include &lt;asm/landisk/iodata_landisk.h&gt;</div><div class='add'>+#include &lt;mach-landisk/mach/gio.h&gt;</div><div class='add'>+#include &lt;mach-landisk/mach/iodata_landisk.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DEVCOUNT                4</div><div class='ctx'> #define GIO_MINOR	        2	/* GIO minor no. */</div><div class='head'>diff --git a/arch/sh/boards/landisk/irq.c b/arch/sh/boards/mach-landisk/irq.c<br/>index 258649491d44..7b284cde1f58 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/landisk/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/landisk/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-landisk/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-landisk/irq.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/landisk/iodata_landisk.h&gt;</div><div class='add'>+#include &lt;mach-landisk/mach/iodata_landisk.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void disable_landisk_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/sh/boards/landisk/psw.c b/arch/sh/boards/mach-landisk/psw.c<br/>index 5a9b70b5decb..e6b0efa098d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/landisk/psw.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/landisk/psw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-landisk/psw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-landisk/psw.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/landisk/iodata_landisk.h&gt;</div><div class='add'>+#include &lt;mach-landisk/mach/iodata_landisk.h&gt;</div><div class='ctx'> #include &lt;asm/push-switch.h&gt;</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t psw_irq_handler(int irq, void *arg)</div><div class='head'>diff --git a/arch/sh/boards/landisk/setup.c b/arch/sh/boards/mach-landisk/setup.c<br/>index 2b708ec72558..db22ea2e6d49 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/landisk/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/landisk/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-landisk/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-landisk/setup.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='del'>-#include &lt;asm/landisk/iodata_landisk.h&gt;</div><div class='add'>+#include &lt;mach-landisk/mach/iodata_landisk.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> void init_landisk_IRQ(void);</div><div class='head'>diff --git a/arch/sh/boards/lboxre2/Makefile b/arch/sh/boards/mach-lboxre2/Makefile<br/>index e9ed140c06f6..e9ed140c06f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/lboxre2/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/lboxre2/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-lboxre2/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-lboxre2/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/lboxre2/irq.c b/arch/sh/boards/mach-lboxre2/irq.c<br/>index 5a1c3bbe7b50..5a1c3bbe7b50 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/lboxre2/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/lboxre2/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-lboxre2/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-lboxre2/irq.c</a></div><div class='head'>diff --git a/arch/sh/boards/lboxre2/setup.c b/arch/sh/boards/mach-lboxre2/setup.c<br/>index c74440d38ee9..c74440d38ee9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/lboxre2/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/lboxre2/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-lboxre2/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-lboxre2/setup.c</a></div><div class='head'>diff --git a/arch/sh/boards/superh/microdev/Makefile b/arch/sh/boards/mach-microdev/Makefile<br/>index 1387dd6c85eb..1387dd6c85eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/superh/microdev/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/superh/microdev/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-microdev/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-microdev/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/superh/microdev/io.c b/arch/sh/boards/mach-microdev/io.c<br/>index 9f8a540f7e14..9f8a540f7e14 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/superh/microdev/io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/superh/microdev/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-microdev/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-microdev/io.c</a></div><div class='head'>diff --git a/arch/sh/boards/superh/microdev/irq.c b/arch/sh/boards/mach-microdev/irq.c<br/>index 4d335077a3ff..4d335077a3ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/superh/microdev/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/superh/microdev/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-microdev/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-microdev/irq.c</a></div><div class='head'>diff --git a/arch/sh/boards/superh/microdev/led.c b/arch/sh/boards/mach-microdev/led.c<br/>index 36e54b47a752..36e54b47a752 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/superh/microdev/led.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/superh/microdev/led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-microdev/led.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-microdev/led.c</a></div><div class='head'>diff --git a/arch/sh/boards/superh/microdev/setup.c b/arch/sh/boards/mach-microdev/setup.c<br/>index fc8cd06d66cf..fc8cd06d66cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/superh/microdev/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/superh/microdev/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-microdev/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-microdev/setup.c</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/migor/Kconfig b/arch/sh/boards/mach-migor/Kconfig<br/>index a7b3b728ec3c..a7b3b728ec3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/migor/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/migor/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-migor/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-migor/Kconfig</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/migor/Makefile b/arch/sh/boards/mach-migor/Makefile<br/>index 5f231dd25c0e..5f231dd25c0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/migor/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/migor/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-migor/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-migor/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/migor/lcd_qvga.c b/arch/sh/boards/mach-migor/lcd_qvga.c<br/>index 6e9609596448..6e9609596448 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/migor/lcd_qvga.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/migor/lcd_qvga.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-migor/lcd_qvga.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-migor/lcd_qvga.c</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/migor/setup.c b/arch/sh/boards/mach-migor/setup.c<br/>index 7bd365ad2d06..714dce91cc9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/migor/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/migor/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-migor/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-migor/setup.c</a></div><div class='hunk'>@@ -224,6 +224,10 @@ static struct sh_mobile_lcdc_info sh_mobile_lcdc_info = {</div><div class='ctx'> 			.vsync_len = 2,</div><div class='ctx'> 			.sync = 0,</div><div class='ctx'> 		},</div><div class='add'>+		.lcd_size_cfg = { /* 7.0 inch */</div><div class='add'>+			.width = 152,</div><div class='add'>+			.height = 91,</div><div class='add'>+		},</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_SH_MIGOR_QVGA</div><div class='hunk'>@@ -245,6 +249,10 @@ static struct sh_mobile_lcdc_info sh_mobile_lcdc_info = {</div><div class='ctx'> 			.vsync_len = 2,</div><div class='ctx'> 			.sync = FB_SYNC_HOR_HIGH_ACT,</div><div class='ctx'> 		},</div><div class='add'>+		.lcd_size_cfg = { /* 2.4 inch */</div><div class='add'>+			.width = 49,</div><div class='add'>+			.height = 37,</div><div class='add'>+		},</div><div class='ctx'> 		.board_cfg = {</div><div class='ctx'> 			.setup_sys = migor_lcd_qvga_setup,</div><div class='ctx'> 		},</div><div class='hunk'>@@ -304,6 +312,7 @@ static void camera_power_off(void)</div><div class='ctx'> 	ctrl_outb(ctrl_inb(PORT_PTDR) &amp; ~0x08, PORT_PTDR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_I2C</div><div class='ctx'> static unsigned char camera_ov772x_magic[] =</div><div class='ctx'> {</div><div class='ctx'> 	0x09, 0x01, 0x0c, 0x10, 0x0d, 0x41, 0x0e, 0x01,</div><div class='hunk'>@@ -391,6 +400,7 @@ static struct platform_device migor_camera_device = {</div><div class='ctx'> 		.platform_data	= &amp;ov772x_info,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='add'>+#endif /* CONFIG_I2C */</div><div class='ctx'> </div><div class='ctx'> static struct sh_mobile_ceu_info sh_mobile_ceu_info = {</div><div class='ctx'> 	.flags = SOCAM_MASTER | SOCAM_DATAWIDTH_8 | SOCAM_PCLK_SAMPLE_RISING \</div><div class='hunk'>@@ -429,7 +439,9 @@ static struct platform_device *migor_devices[] __initdata = {</div><div class='ctx'> 	&amp;sh_keysc_device,</div><div class='ctx'> 	&amp;migor_lcdc_device,</div><div class='ctx'> 	&amp;migor_ceu_device,</div><div class='add'>+#ifdef CONFIG_I2C</div><div class='ctx'> 	&amp;migor_camera_device,</div><div class='add'>+#endif</div><div class='ctx'> 	&amp;migor_nor_flash_device,</div><div class='ctx'> 	&amp;migor_nand_flash_device,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/sh/boards/renesas/rts7751r2d/Kconfig b/arch/sh/boards/mach-r2d/Kconfig<br/>index 8122a9667fc9..8122a9667fc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/rts7751r2d/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/rts7751r2d/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-r2d/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-r2d/Kconfig</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/rts7751r2d/Makefile b/arch/sh/boards/mach-r2d/Makefile<br/>index 0d4c75a72be0..0d4c75a72be0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/rts7751r2d/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/rts7751r2d/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-r2d/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-r2d/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c b/arch/sh/boards/mach-r2d/irq.c<br/>index 8e49f6e51247..8e49f6e51247 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/rts7751r2d/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/rts7751r2d/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-r2d/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-r2d/irq.c</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/mach-r2d/setup.c<br/>index 2308e8753bcd..2308e8753bcd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/rts7751r2d/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/rts7751r2d/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-r2d/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-r2d/setup.c</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/sdk7780/Kconfig b/arch/sh/boards/mach-sdk7780/Kconfig<br/>index 065f1df09bf1..065f1df09bf1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/sdk7780/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/sdk7780/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-sdk7780/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sdk7780/Kconfig</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/sdk7780/Makefile b/arch/sh/boards/mach-sdk7780/Makefile<br/>index 3d8f0befc35d..3d8f0befc35d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/sdk7780/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/sdk7780/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-sdk7780/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sdk7780/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/sdk7780/irq.c b/arch/sh/boards/mach-sdk7780/irq.c<br/>index 87cdc578f6ff..87cdc578f6ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/sdk7780/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/sdk7780/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-sdk7780/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sdk7780/irq.c</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/sdk7780/setup.c b/arch/sh/boards/mach-sdk7780/setup.c<br/>index acc5932587f1..acc5932587f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/sdk7780/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/sdk7780/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-sdk7780/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sdk7780/setup.c</a></div><div class='head'>diff --git a/arch/sh/boards/se/7206/Makefile b/arch/sh/boards/mach-se/7206/Makefile<br/>index 63e7ed699f39..63e7ed699f39 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7206/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7206/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7206/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7206/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/se/7206/io.c b/arch/sh/boards/mach-se/7206/io.c<br/>index 1308e618e044..9c3a33210d61 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7206/io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7206/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7206/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7206/io.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/se7206.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7206.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static inline void delay(void)</div><div class='head'>diff --git a/arch/sh/boards/se/7206/irq.c b/arch/sh/boards/mach-se/7206/irq.c<br/>index 9d5bfc77d0de..aef7f052851a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7206/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7206/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7206/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7206/irq.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;asm/se7206.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7206.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define INTSTS0 0x31800000</div><div class='ctx'> #define INTSTS1 0x31800002</div><div class='head'>diff --git a/arch/sh/boards/se/7206/setup.c b/arch/sh/boards/mach-se/7206/setup.c<br/>index 4fe84cc08406..f5466384972e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7206/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7206/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7206/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7206/setup.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/smc91x.h&gt;</div><div class='del'>-#include &lt;asm/se7206.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7206.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> #include &lt;asm/heartbeat.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/se/7343/Makefile b/arch/sh/boards/mach-se/7343/Makefile<br/>index 3024796c6203..3024796c6203 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7343/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7343/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7343/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7343/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/se/7343/io.c b/arch/sh/boards/mach-se/7343/io.c<br/>index 3a6d11424938..8741abc1da7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7343/io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7343/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7343/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7343/io.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/mach/se7343.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7343.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define badio(fn, a) panic("bad i/o operation %s for %08lx.", #fn, a)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/se/7343/irq.c b/arch/sh/boards/mach-se/7343/irq.c<br/>index 1112e86aa93a..051c29d4eae0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7343/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7343/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7343/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7343/irq.c</a></div><div class='hunk'>@@ -13,9 +13,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/se7343.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7343.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void disable_se7343_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/sh/boards/se/7343/setup.c b/arch/sh/boards/mach-se/7343/setup.c<br/>index 8ae718d6c710..486f40bf9274 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7343/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7343/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7343/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7343/setup.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='del'>-#include &lt;asm/mach/se7343.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7343.h&gt;</div><div class='ctx'> #include &lt;asm/heartbeat.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/se/770x/Makefile b/arch/sh/boards/mach-se/770x/Makefile<br/>index 8e624b06d5ea..8e624b06d5ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/770x/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/770x/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/770x/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/770x/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/se/770x/io.c b/arch/sh/boards/mach-se/770x/io.c<br/>index b1ec085b8673..28833c8786ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/770x/io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/770x/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/770x/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/770x/io.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/se.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* MS7750 requires special versions of in*, out* routines, since</div><div class='ctx'>    PC-like io ports are located at upper half byte of 16-bit word which</div><div class='head'>diff --git a/arch/sh/boards/se/770x/irq.c b/arch/sh/boards/mach-se/770x/irq.c<br/>index cdb0807928a5..ec1fea571b52 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/770x/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/770x/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/770x/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/770x/irq.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/se.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct ipr_data ipr_irq_table[] = {</div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/sh/boards/se/770x/setup.c b/arch/sh/boards/mach-se/770x/setup.c<br/>index cf4a5ba12df4..9123d9687bf7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/770x/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/770x/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/770x/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/770x/setup.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='del'>-#include &lt;asm/se.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/smc37c93x.h&gt;</div><div class='ctx'> #include &lt;asm/heartbeat.h&gt;</div><div class='hunk'>@@ -113,6 +113,8 @@ static struct platform_device heartbeat_device = {</div><div class='ctx'> 	.resource	= heartbeat_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7710) ||\</div><div class='add'>+	defined(CONFIG_CPU_SUBTYPE_SH7712)</div><div class='ctx'> /* SH771X Ethernet driver */</div><div class='ctx'> static struct resource sh_eth0_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -159,12 +161,16 @@ static struct platform_device sh_eth1_device = {</div><div class='ctx'> 	.num_resources = ARRAY_SIZE(sh_eth1_resources),</div><div class='ctx'> 	.resource = sh_eth1_resources,</div><div class='ctx'> };</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *se_devices[] __initdata = {</div><div class='ctx'> 	&amp;heartbeat_device,</div><div class='ctx'> 	&amp;cf_ide_device,</div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7710) ||\</div><div class='add'>+	defined(CONFIG_CPU_SUBTYPE_SH7712)</div><div class='ctx'> 	&amp;sh_eth0_device,</div><div class='ctx'> 	&amp;sh_eth1_device,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init se_devices_setup(void)</div><div class='head'>diff --git a/arch/sh/boards/se/7721/Makefile b/arch/sh/boards/mach-se/7721/Makefile<br/>index 7f09030980b3..7f09030980b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7721/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7721/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7721/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7721/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/se/7721/irq.c b/arch/sh/boards/mach-se/7721/irq.c<br/>index c4fdd622bf8b..b417acc4dad0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7721/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7721/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7721/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7721/irq.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/se7721.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7721.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	UNUSED = 0,</div><div class='head'>diff --git a/arch/sh/boards/se/7721/setup.c b/arch/sh/boards/mach-se/7721/setup.c<br/>index 1be3e92752f7..d3fc80ff4d83 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7721/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7721/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7721/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7721/setup.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='del'>-#include &lt;asm/se7721.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7721.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/heartbeat.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/se/7722/Makefile b/arch/sh/boards/mach-se/7722/Makefile<br/>index 8694373389e5..8694373389e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7722/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7722/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7722/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7722/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/se/7722/irq.c b/arch/sh/boards/mach-se/7722/irq.c<br/>index 0b03f3f610b8..02d21a3e2a8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7722/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7722/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7722/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7722/irq.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/se7722.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7722.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void disable_se7722_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/sh/boards/se/7722/setup.c b/arch/sh/boards/mach-se/7722/setup.c<br/>index 6e228ea59788..fe6f96517e12 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7722/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7722/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7722/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7722/setup.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/smc91x.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> #include &lt;asm/clock.h&gt;</div><div class='del'>-#include &lt;asm/se7722.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7722.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/heartbeat.h&gt;</div><div class='ctx'> #include &lt;asm/sh_keysc.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/se/7751/Makefile b/arch/sh/boards/mach-se/7751/Makefile<br/>index dbc29f3a9de5..dbc29f3a9de5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7751/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7751/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7751/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7751/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/se/7751/io.c b/arch/sh/boards/mach-se/7751/io.c<br/>index e8d846cec89d..6287ae570319 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7751/io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7751/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7751/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7751/io.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/se7751.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7751.h&gt;</div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline volatile u16 *port2adr(unsigned int port)</div><div class='head'>diff --git a/arch/sh/boards/se/7751/irq.c b/arch/sh/boards/mach-se/7751/irq.c<br/>index c3d12590e5db..5c9847ea1e7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7751/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7751/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7751/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7751/irq.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/se7751.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7751.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct ipr_data ipr_irq_table[] = {</div><div class='ctx'> 	{ 13, 3, 3, 2 },</div><div class='head'>diff --git a/arch/sh/boards/se/7751/pci.c b/arch/sh/boards/mach-se/7751/pci.c<br/>index 203b2923fe7f..203b2923fe7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7751/pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7751/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7751/pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7751/pci.c</a></div><div class='head'>diff --git a/arch/sh/boards/se/7751/setup.c b/arch/sh/boards/mach-se/7751/setup.c<br/>index deefbfd92591..50572512e3e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7751/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7751/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7751/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7751/setup.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='del'>-#include &lt;asm/se7751.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7751.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/heartbeat.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/se/7780/Makefile b/arch/sh/boards/mach-se/7780/Makefile<br/>index 6b88adae3ecc..6b88adae3ecc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7780/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7780/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7780/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7780/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/se/7780/irq.c b/arch/sh/boards/mach-se/7780/irq.c<br/>index 6bd70da6bb47..66ad292c9fc3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7780/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7780/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7780/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7780/irq.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/se7780.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7780.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Initialize IRQ setting</div><div class='head'>diff --git a/arch/sh/boards/se/7780/setup.c b/arch/sh/boards/mach-se/7780/setup.c<br/>index 0f08ab3b2bec..1d3a867e94e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7780/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7780/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7780/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/7780/setup.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='del'>-#include &lt;asm/se7780.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7780.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/heartbeat.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/mach-se/Makefile b/arch/sh/boards/mach-se/Makefile<br/>new file mode 100644<br/>index 000000000000..2de42bae4b4f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/Makefile</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+obj-$(CONFIG_SH_7619_SOLUTION_ENGINE)	+= board-se7619.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_SH_SOLUTION_ENGINE)	+= 770x/</div><div class='add'>+obj-$(CONFIG_SH_7206_SOLUTION_ENGINE)	+= 7206/</div><div class='add'>+obj-$(CONFIG_SH_7722_SOLUTION_ENGINE)	+= 7722/</div><div class='add'>+obj-$(CONFIG_SH_7751_SOLUTION_ENGINE)	+= 7751/</div><div class='add'>+obj-$(CONFIG_SH_7780_SOLUTION_ENGINE)	+= 7780/</div><div class='add'>+obj-$(CONFIG_SH_7343_SOLUTION_ENGINE)	+= 7343/</div><div class='add'>+obj-$(CONFIG_SH_7721_SOLUTION_ENGINE)	+= 7721/</div><div class='head'>diff --git a/arch/sh/boards/se/7619/setup.c b/arch/sh/boards/mach-se/board-se7619.c<br/>index 1d0ef7faa10d..1d0ef7faa10d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7619/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7619/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/board-se7619.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-se/board-se7619.c</a></div><div class='head'>diff --git a/arch/sh/boards/sh03/Makefile b/arch/sh/boards/mach-sh03/Makefile<br/>index 400306a796ec..400306a796ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/sh03/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/sh03/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-sh03/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sh03/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/sh03/rtc.c b/arch/sh/boards/mach-sh03/rtc.c<br/>index 0a9266bb51c5..0a9266bb51c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/sh03/rtc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/sh03/rtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-sh03/rtc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sh03/rtc.c</a></div><div class='head'>diff --git a/arch/sh/boards/sh03/setup.c b/arch/sh/boards/mach-sh03/setup.c<br/>index 934ac4f1c48f..5771219be3fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/sh03/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/sh03/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-sh03/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sh03/setup.c</a></div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/rtc.h&gt;</div><div class='del'>-#include &lt;asm/sh03/io.h&gt;</div><div class='del'>-#include &lt;asm/sh03/sh03.h&gt;</div><div class='add'>+#include &lt;mach-sh03/mach/io.h&gt;</div><div class='add'>+#include &lt;mach-sh03/mach/sh03.h&gt;</div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void __init init_sh03_IRQ(void)</div><div class='head'>diff --git a/arch/sh/boards/renesas/sh7763rdp/Makefile b/arch/sh/boards/mach-sh7763rdp/Makefile<br/>index f6c0b55516d2..f6c0b55516d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/sh7763rdp/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/sh7763rdp/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-sh7763rdp/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sh7763rdp/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/sh7763rdp/irq.c b/arch/sh/boards/mach-sh7763rdp/irq.c<br/>index fd850bad2dec..fd850bad2dec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/sh7763rdp/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/sh7763rdp/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-sh7763rdp/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sh7763rdp/irq.c</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/sh7763rdp/setup.c b/arch/sh/boards/mach-sh7763rdp/setup.c<br/>index 925f16af7121..23850da05e3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/sh7763rdp/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/sh7763rdp/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-sh7763rdp/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-sh7763rdp/setup.c</a></div><div class='hunk'>@@ -15,8 +15,11 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/sh7763rdp.h&gt;</div><div class='add'>+#include &lt;asm/sh_eth.h&gt;</div><div class='add'>+#include &lt;asm/sh7760fb.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* NOR Flash */</div><div class='ctx'> static struct mtd_partition sh7763rdp_nor_flash_partitions[] = {</div><div class='hunk'>@@ -60,8 +63,85 @@ static struct platform_device sh7763rdp_nor_flash_device = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* SH-Ether */</div><div class='add'>+static struct resource sh_eth_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start  = 0xFEE00800,   /* use eth1 */</div><div class='add'>+		.end    = 0xFEE00F7C - 1,</div><div class='add'>+		.flags  = IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start  = 58,   /* irq number */</div><div class='add'>+		.end    = 58,</div><div class='add'>+		.flags  = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sh_eth_plat_data sh7763_eth_pdata = {</div><div class='add'>+	.phy = 1,</div><div class='add'>+	.edmac_endian = EDMAC_LITTLE_ENDIAN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device sh7763rdp_eth_device = {</div><div class='add'>+	.name       = "sh-eth",</div><div class='add'>+	.resource   = sh_eth_resources,</div><div class='add'>+	.num_resources  = ARRAY_SIZE(sh_eth_resources),</div><div class='add'>+	.dev        = {</div><div class='add'>+		.platform_data = &amp;sh7763_eth_pdata,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SH7763 LCDC */</div><div class='add'>+static struct resource sh7763rdp_fb_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start  = 0xFFE80000,</div><div class='add'>+		.end    = 0xFFE80442 - 1,</div><div class='add'>+		.flags  = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct fb_videomode sh7763fb_videomode = {</div><div class='add'>+	.refresh = 60,</div><div class='add'>+	.name = "VGA Monitor",</div><div class='add'>+	.xres = 640,</div><div class='add'>+	.yres = 480,</div><div class='add'>+	.pixclock = 10000,</div><div class='add'>+	.left_margin = 80,</div><div class='add'>+	.right_margin = 24,</div><div class='add'>+	.upper_margin = 30,</div><div class='add'>+	.lower_margin = 1,</div><div class='add'>+	.hsync_len = 96,</div><div class='add'>+	.vsync_len = 1,</div><div class='add'>+	.sync = 0,</div><div class='add'>+	.vmode = FB_VMODE_NONINTERLACED,</div><div class='add'>+	.flag = FBINFO_FLAG_DEFAULT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sh7760fb_platdata sh7763fb_def_pdata = {</div><div class='add'>+	.def_mode = &amp;sh7763fb_videomode,</div><div class='add'>+	.ldmtr = (LDMTR_TFT_COLOR_16|LDMTR_MCNT),</div><div class='add'>+	.lddfr = LDDFR_16BPP_RGB565,</div><div class='add'>+	.ldpmmr = 0x0000,</div><div class='add'>+	.ldpspr = 0xFFFF,</div><div class='add'>+	.ldaclnr = 0x0001,</div><div class='add'>+	.ldickr = 0x1102,</div><div class='add'>+	.rotate = 0,</div><div class='add'>+	.novsync = 0,</div><div class='add'>+	.blank = NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device sh7763rdp_fb_device = {</div><div class='add'>+	.name		= "sh7760-lcdc",</div><div class='add'>+	.resource	= sh7763rdp_fb_resources,</div><div class='add'>+	.num_resources = ARRAY_SIZE(sh7763rdp_fb_resources),</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;sh7763fb_def_pdata,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device *sh7763rdp_devices[] __initdata = {</div><div class='ctx'> 	&amp;sh7763rdp_nor_flash_device,</div><div class='add'>+	&amp;sh7763rdp_eth_device,</div><div class='add'>+	&amp;sh7763rdp_fb_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init sh7763rdp_devices_setup(void)</div><div class='hunk'>@@ -69,7 +149,7 @@ static int __init sh7763rdp_devices_setup(void)</div><div class='ctx'> 	return platform_add_devices(sh7763rdp_devices,</div><div class='ctx'> 				    ARRAY_SIZE(sh7763rdp_devices));</div><div class='ctx'> }</div><div class='del'>-__initcall(sh7763rdp_devices_setup);</div><div class='add'>+device_initcall(sh7763rdp_devices_setup);</div><div class='ctx'> </div><div class='ctx'> static void __init sh7763rdp_setup(char **cmdline_p)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/sh/boards/snapgear/Makefile b/arch/sh/boards/mach-snapgear/Makefile<br/>index d2d2f4b6a502..d2d2f4b6a502 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/snapgear/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/snapgear/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-snapgear/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-snapgear/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/snapgear/io.c b/arch/sh/boards/mach-snapgear/io.c<br/>index 0f4824264557..0f4824264557 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/snapgear/io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/snapgear/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-snapgear/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-snapgear/io.c</a></div><div class='head'>diff --git a/arch/sh/boards/snapgear/setup.c b/arch/sh/boards/mach-snapgear/setup.c<br/>index 7022483f98e8..a5e349d3dda2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/snapgear/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/snapgear/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-snapgear/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-snapgear/setup.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;asm/snapgear.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/cpu/timer.h&gt;</div><div class='add'>+#include &lt;cpu/timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * EraseConfig handling functions</div><div class='head'>diff --git a/arch/sh/boards/renesas/systemh/Makefile b/arch/sh/boards/mach-systemh/Makefile<br/>index 2cc6a23d9d39..2cc6a23d9d39 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/systemh/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/systemh/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-systemh/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-systemh/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/systemh/io.c b/arch/sh/boards/mach-systemh/io.c<br/>index 1b767e1a1428..1b767e1a1428 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/systemh/io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/systemh/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-systemh/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-systemh/io.c</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/systemh/irq.c b/arch/sh/boards/mach-systemh/irq.c<br/>index 0ba2fe674c47..601c9c8cdbec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/systemh/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/systemh/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-systemh/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-systemh/irq.c</a></div><div class='hunk'>@@ -11,9 +11,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='del'>-#include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/systemh7751.h&gt;</div><div class='ctx'> #include &lt;asm/smc37c93x.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/renesas/systemh/setup.c b/arch/sh/boards/mach-systemh/setup.c<br/>index ee78af842778..ee78af842778 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/systemh/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/systemh/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-systemh/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-systemh/setup.c</a></div><div class='head'>diff --git a/arch/sh/boards/titan/Makefile b/arch/sh/boards/mach-titan/Makefile<br/>index 08d753700062..08d753700062 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/titan/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/titan/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-titan/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-titan/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/titan/io.c b/arch/sh/boards/mach-titan/io.c<br/>index 4730c1dd697d..4730c1dd697d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/titan/io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/titan/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-titan/io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-titan/io.c</a></div><div class='head'>diff --git a/arch/sh/boards/titan/setup.c b/arch/sh/boards/mach-titan/setup.c<br/>index 5de3b2ad71af..5de3b2ad71af 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/titan/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/titan/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-titan/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-titan/setup.c</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/x3proto/Makefile b/arch/sh/boards/mach-x3proto/Makefile<br/>index 983e4551fecf..983e4551fecf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/x3proto/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/x3proto/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-x3proto/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-x3proto/Makefile</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/x3proto/ilsel.c b/arch/sh/boards/mach-x3proto/ilsel.c<br/>index b5c673c39337..b5c673c39337 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/x3proto/ilsel.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/x3proto/ilsel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-x3proto/ilsel.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-x3proto/ilsel.c</a></div><div class='head'>diff --git a/arch/sh/boards/renesas/x3proto/setup.c b/arch/sh/boards/mach-x3proto/setup.c<br/>index abc5b6d418fe..a70d23b21788 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/x3proto/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/x3proto/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-x3proto/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boards/mach-x3proto/setup.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Renesas SH-X3 Prototype Board Support.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2007 Paul Mundt</div><div class='add'>+ * Copyright (C) 2007 - 2008 Paul Mundt</div><div class='ctx'>  *</div><div class='ctx'>  * This file is subject to the terms and conditions of the GNU General Public</div><div class='ctx'>  * License.  See the file "COPYING" in the main directory of this archive</div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/smc91x.h&gt;</div><div class='ctx'> #include &lt;asm/ilsel.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct resource heartbeat_resources[] = {</div><div class='hunk'>@@ -30,6 +31,10 @@ static struct platform_device heartbeat_device = {</div><div class='ctx'> 	.resource	= heartbeat_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct smc91x_platdata smc91x_info = {</div><div class='add'>+	.flags	= SMC91X_USE_16BIT | SMC91X_NOWAIT,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct resource smc91x_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start		= 0x18000300,</div><div class='hunk'>@@ -47,6 +52,9 @@ static struct platform_device smc91x_device = {</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> 	.resource	= smc91x_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(smc91x_resources),</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data = &amp;smc91x_info,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource r8a66597_usb_host_resources[] = {</div><div class='head'>diff --git a/arch/sh/boards/magicpanelr2/Kconfig b/arch/sh/boards/magicpanelr2/Kconfig<br/>deleted file mode 100644<br/>index b0abddc3e84f..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/magicpanelr2/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/magicpanelr2/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,13 +0,0 @@</div><div class='del'>-if SH_MAGIC_PANEL_R2</div><div class='del'>-</div><div class='del'>-menu "Magic Panel R2 options"</div><div class='del'>-</div><div class='del'>-config SH_MAGIC_PANEL_R2_VERSION</div><div class='del'>-	int SH_MAGIC_PANEL_R2_VERSION</div><div class='del'>-	default "3"</div><div class='del'>-	help</div><div class='del'>-	  Set the version of the Magic Panel R2</div><div class='del'>-</div><div class='del'>-endmenu</div><div class='del'>-</div><div class='del'>-endif</div><div class='head'>diff --git a/arch/sh/boards/magicpanelr2/Makefile b/arch/sh/boards/magicpanelr2/Makefile<br/>deleted file mode 100644<br/>index 7a6d586b9072..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/magicpanelr2/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/magicpanelr2/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# Makefile for the Magic Panel specific parts</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y	 := setup.o
\ No newline at end of file</div><div class='head'>diff --git a/arch/sh/boards/renesas/ap325rxa/Makefile b/arch/sh/boards/renesas/ap325rxa/Makefile<br/>deleted file mode 100644<br/>index f663768429f0..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/ap325rxa/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/ap325rxa/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-obj-y	:= setup.o</div><div class='head'>diff --git a/arch/sh/boards/renesas/rsk7203/Makefile b/arch/sh/boards/renesas/rsk7203/Makefile<br/>deleted file mode 100644<br/>index f663768429f0..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/rsk7203/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/rsk7203/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-obj-y	:= setup.o</div><div class='head'>diff --git a/arch/sh/boards/renesas/sh7785lcr/Makefile b/arch/sh/boards/renesas/sh7785lcr/Makefile<br/>deleted file mode 100644<br/>index 77037567633b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/sh7785lcr/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/renesas/sh7785lcr/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-obj-y	 := setup.o</div><div class='head'>diff --git a/arch/sh/boards/se/7619/Makefile b/arch/sh/boards/se/7619/Makefile<br/>deleted file mode 100644<br/>index d21775c28cda..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7619/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/se/7619/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# Makefile for the 7619 SolutionEngine specific parts of the kernel</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y	 := setup.o</div><div class='head'>diff --git a/arch/sh/boards/shmin/Makefile b/arch/sh/boards/shmin/Makefile<br/>deleted file mode 100644<br/>index 3190cc72430e..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/shmin/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boards/shmin/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# Makefile for the SHMIN board.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y	 := setup.o</div><div class='head'>diff --git a/arch/sh/boot/Makefile b/arch/sh/boot/Makefile<br/>index 8b37869a8227..5b54965eef98 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boot/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boot/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boot/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boot/Makefile</a></div><div class='hunk'>@@ -18,9 +18,10 @@ CONFIG_PAGE_OFFSET	?= 0x80000000</div><div class='ctx'> CONFIG_MEMORY_START	?= 0x0c000000</div><div class='ctx'> CONFIG_BOOT_LINK_OFFSET	?= 0x00800000</div><div class='ctx'> CONFIG_ZERO_PAGE_OFFSET	?= 0x00001000</div><div class='add'>+CONFIG_ENTRY_OFFSET	?= 0x00001000</div><div class='ctx'> </div><div class='ctx'> export CONFIG_PAGE_OFFSET CONFIG_MEMORY_START CONFIG_BOOT_LINK_OFFSET \</div><div class='del'>-       CONFIG_ZERO_PAGE_OFFSET</div><div class='add'>+       CONFIG_ZERO_PAGE_OFFSET CONFIG_ENTRY_OFFSET</div><div class='ctx'> </div><div class='ctx'> targets := zImage vmlinux.srec uImage uImage.srec</div><div class='ctx'> subdir- := compressed</div><div class='head'>diff --git a/arch/sh/boot/compressed/head_64.S b/arch/sh/boot/compressed/head_64.S<br/>index f72c1989f5f2..622eac3cf556 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boot/compressed/head_64.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/boot/compressed/head_64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boot/compressed/head_64.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/boot/compressed/head_64.S</a></div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'>  *   Copyright (C) 2002 Stuart Menefy (stuart.menefy@st.com)</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='del'>-#include &lt;asm/cpu/mmu_context.h&gt;</div><div class='del'>-#include &lt;asm/cpu/registers.h&gt;</div><div class='add'>+#include &lt;cpu/mmu_context.h&gt;</div><div class='add'>+#include &lt;cpu/registers.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Fixed TLB entries to identity map the beginning of RAM</div><div class='head'>diff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig<br/>index 5471df53753c..851c870adf3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/ap325rxa_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/ap325rxa_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/ap325rxa_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/ap325rxa_defconfig</a></div><div class='hunk'>@@ -1,15 +1,17 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Wed Jun  4 17:30:00 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Tue Aug 26 14:21:17 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='ctx'> CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_GENERIC_TIME=y</div><div class='hunk'>@@ -19,7 +21,6 @@ CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='ctx'> CONFIG_ARCH_NO_VIRT_TO_BUS=y</div><div class='del'>-CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -57,7 +58,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='hunk'>@@ -79,10 +79,16 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_HAVE_GENERIC_DMA_COHERENT=y</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -99,6 +105,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -175,6 +182,7 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='hunk'>@@ -253,9 +261,10 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='del'>-# CONFIG_SCHED_HRTICK is not set</div><div class='add'>+CONFIG_SCHED_HRTICK=y</div><div class='ctx'> # CONFIG_KEXEC is not set</div><div class='ctx'> # CONFIG_CRASH_DUMP is not set</div><div class='add'>+CONFIG_SECCOMP=y</div><div class='ctx'> # CONFIG_PREEMPT_NONE is not set</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='hunk'>@@ -281,10 +290,6 @@ CONFIG_CMDLINE="console=tty1 console=ttySC5,38400 root=/dev/nfs ip=dhcp"</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -376,6 +381,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='ctx'> CONFIG_MTD=y</div><div class='hunk'>@@ -466,6 +473,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -512,10 +520,10 @@ CONFIG_SCSI_WAIT_SCAN=m</div><div class='ctx'> CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_ISCSI_TCP is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -587,6 +595,7 @@ CONFIG_INPUT=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -620,6 +629,7 @@ CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -631,8 +641,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -667,10 +679,6 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Console display driver support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_HID_SUPPORT is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='hunk'>@@ -679,7 +687,11 @@ CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-# CONFIG_UIO is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+CONFIG_UIO=y</div><div class='add'>+# CONFIG_UIO_PDRV is not set</div><div class='add'>+CONFIG_UIO_PDRV_GENIRQ=y</div><div class='add'>+# CONFIG_UIO_SMX is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='hunk'>@@ -752,6 +764,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -762,17 +775,16 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=y</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -842,6 +854,8 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> # CONFIG_SH_STANDARD_BIOS is not set</div><div class='ctx'> # CONFIG_EARLY_SCIF_CONSOLE is not set</div><div class='hunk'>@@ -898,6 +912,10 @@ CONFIG_CRYPTO_CBC=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -937,6 +955,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/sh/configs/dreamcast_defconfig b/arch/sh/configs/dreamcast_defconfig<br/>index 57728788b753..3dc1cbd8a981 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/dreamcast_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/dreamcast_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/dreamcast_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/dreamcast_defconfig</a></div><div class='hunk'>@@ -1,14 +1,17 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.23-rc7</div><div class='del'>-# Fri Sep 21 15:46:27 2007</div><div class='add'>+# Linux kernel version: 2.6.27-rc1</div><div class='add'>+# Mon Aug  4 16:49:13 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='add'>+CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_GENERIC_TIME=y</div><div class='hunk'>@@ -37,12 +40,15 @@ CONFIG_SYSVIPC_SYSCTL=y</div><div class='ctx'> CONFIG_BSD_PROCESS_ACCT=y</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='ctx'> # CONFIG_TASKSTATS is not set</div><div class='del'>-# CONFIG_USER_NS is not set</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='ctx'> # CONFIG_BLK_DEV_INITRD is not set</div><div class='ctx'> CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='hunk'>@@ -55,21 +61,39 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_ANON_INODES=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='ctx'> CONFIG_EVENTFD=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_SLUB is not set</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='add'>+CONFIG_PROFILING=y</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+# CONFIG_OPROFILE is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+# CONFIG_HAVE_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_HAVE_GENERIC_DMA_COHERENT=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -80,6 +104,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -93,13 +118,17 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_CFQ is not set</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # System type</div><div class='ctx'> #</div><div class='ctx'> CONFIG_CPU_SH4=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7619 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7203 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7206 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7263 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_MXG is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7705 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7706 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7707 is not set</div><div class='hunk'>@@ -108,6 +137,7 @@ CONFIG_CPU_SH4=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7710 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7712 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7720 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7721 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7750 is not set</div><div class='ctx'> CONFIG_CPU_SUBTYPE_SH7091=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7750R is not set</div><div class='hunk'>@@ -116,14 +146,17 @@ CONFIG_CPU_SUBTYPE_SH7091=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7751R is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7760 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH4_202 is not set</div><div class='del'>-# CONFIG_CPU_SUBTYPE_ST40STB1 is not set</div><div class='del'>-# CONFIG_CPU_SUBTYPE_ST40GX1 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7723 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7763 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7770 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7780 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7785 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SHX3 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7343 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7722 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7366 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH5_101 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH5_103 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Memory management options</div><div class='hunk'>@@ -133,6 +166,7 @@ CONFIG_MMU=y</div><div class='ctx'> CONFIG_PAGE_OFFSET=0x80000000</div><div class='ctx'> CONFIG_MEMORY_START=0x0c000000</div><div class='ctx'> CONFIG_MEMORY_SIZE=0x01000000</div><div class='add'>+CONFIG_29BIT=y</div><div class='ctx'> CONFIG_VSYSCALL=y</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_SPARSEMEM_ENABLE=y</div><div class='hunk'>@@ -142,12 +176,15 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_HUGETLB_PAGE_SIZE_64K=y</div><div class='ctx'> # CONFIG_HUGETLB_PAGE_SIZE_256K is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE_SIZE_1MB is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE_SIZE_4MB is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE_SIZE_64MB is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE_SIZE_512MB is not set</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='hunk'>@@ -155,6 +192,8 @@ CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> CONFIG_SPARSEMEM_STATIC=y</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=0</div><div class='hunk'>@@ -194,6 +233,7 @@ CONFIG_SH_PCLK_FREQ=49876504</div><div class='ctx'> # CONFIG_TICK_ONESHOT is not set</div><div class='ctx'> # CONFIG_NO_HZ is not set</div><div class='ctx'> # CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CPU Frequency scaling</div><div class='hunk'>@@ -204,7 +244,10 @@ CONFIG_CPU_FREQ_TABLE=y</div><div class='ctx'> CONFIG_CPU_FREQ_STAT=y</div><div class='ctx'> # CONFIG_CPU_FREQ_STAT_DETAILS is not set</div><div class='ctx'> CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set</div><div class='ctx'> # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set</div><div class='add'>+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_PERFORMANCE=y</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_POWERSAVE=y</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_USERSPACE=y</div><div class='hunk'>@@ -239,12 +282,16 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='ctx'> # CONFIG_KEXEC is not set</div><div class='ctx'> # CONFIG_CRASH_DUMP is not set</div><div class='add'>+CONFIG_SECCOMP=y</div><div class='ctx'> # CONFIG_PREEMPT_NONE is not set</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='del'>-CONFIG_PREEMPT_BKL=y</div><div class='add'>+# CONFIG_PREEMPT_RCU is not set</div><div class='add'>+CONFIG_GUSA=y</div><div class='add'>+# CONFIG_GUSA_RB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Boot options</div><div class='hunk'>@@ -263,10 +310,7 @@ CONFIG_PCI=y</div><div class='ctx'> CONFIG_SH_PCIDMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_PCI_AUTO=y</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCCARD (PCMCIA/CardBus) support</div><div class='del'>-#</div><div class='add'>+CONFIG_PCI_LEGACY=y</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -275,10 +319,6 @@ CONFIG_PCI_AUTO=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -291,6 +331,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> # CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> # CONFIG_IP_MULTICAST is not set</div><div class='hunk'>@@ -309,6 +350,7 @@ CONFIG_IP_FIB_HASH=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -316,8 +358,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -334,10 +374,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_LAPB is not set</div><div class='ctx'> # CONFIG_ECONET is not set</div><div class='ctx'> # CONFIG_WAN_ROUTER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# QoS and/or fair queueing</div><div class='del'>-#</div><div class='ctx'> # CONFIG_NET_SCHED is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -345,6 +381,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_PKTGEN is not set</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='ctx'> # CONFIG_IRDA is not set</div><div class='ctx'> # CONFIG_BT is not set</div><div class='ctx'> # CONFIG_AF_RXRPC is not set</div><div class='hunk'>@@ -366,6 +403,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> #</div><div class='ctx'> # Generic Driver Options</div><div class='ctx'> #</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> # CONFIG_STANDALONE is not set</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='hunk'>@@ -374,6 +412,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='ctx'> CONFIG_BLK_DEV=y</div><div class='add'>+CONFIG_GDROM=y</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_UMEM is not set</div><div class='hunk'>@@ -384,11 +423,15 @@ CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_RAM is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -400,44 +443,49 @@ CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_SCSI_NETLINK is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Fusion MPT device support</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_FUSION is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# IEEE 1394 (FireWire) support</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='add'>+# CONFIG_VETH is not set</div><div class='ctx'> # CONFIG_ARCNET is not set</div><div class='ctx'> # CONFIG_PHYLIB is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='ctx'> # CONFIG_STNIC is not set</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='ctx'> # CONFIG_SUNGEM is not set</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_3COM is not set</div><div class='ctx'> # CONFIG_SMC91X is not set</div><div class='add'>+# CONFIG_SMC911X is not set</div><div class='ctx'> # CONFIG_NET_TULIP is not set</div><div class='ctx'> # CONFIG_HP100 is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='ctx'> CONFIG_NET_PCI=y</div><div class='ctx'> # CONFIG_PCNET32 is not set</div><div class='ctx'> # CONFIG_AMD8111_ETH is not set</div><div class='ctx'> # CONFIG_ADAPTEC_STARFIRE is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='ctx'> # CONFIG_FORCEDETH is not set</div><div class='del'>-# CONFIG_DGRS is not set</div><div class='ctx'> # CONFIG_EEPRO100 is not set</div><div class='ctx'> # CONFIG_E100 is not set</div><div class='ctx'> # CONFIG_FEALNX is not set</div><div class='hunk'>@@ -449,6 +497,7 @@ CONFIG_8139TOO=y</div><div class='ctx'> # CONFIG_8139TOO_TUNE_TWISTER is not set</div><div class='ctx'> # CONFIG_8139TOO_8129 is not set</div><div class='ctx'> # CONFIG_8139_OLD_RX_RESET is not set</div><div class='add'>+# CONFIG_R6040 is not set</div><div class='ctx'> # CONFIG_SIS900 is not set</div><div class='ctx'> # CONFIG_EPIC100 is not set</div><div class='ctx'> # CONFIG_SUNDANCE is not set</div><div class='hunk'>@@ -464,12 +513,12 @@ CONFIG_8139TOO=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='del'>-# CONFIG_SHAPER is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='ctx'> # CONFIG_NET_POLL_CONTROLLER is not set</div><div class='hunk'>@@ -491,7 +540,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='ctx'> CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='ctx'> CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='ctx'> # CONFIG_INPUT_JOYDEV is not set</div><div class='del'>-# CONFIG_INPUT_TSDEV is not set</div><div class='ctx'> # CONFIG_INPUT_EVDEV is not set</div><div class='ctx'> # CONFIG_INPUT_EVBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -505,6 +553,8 @@ CONFIG_INPUT_KEYBOARD=y</div><div class='ctx'> # CONFIG_KEYBOARD_XTKBD is not set</div><div class='ctx'> # CONFIG_KEYBOARD_NEWTON is not set</div><div class='ctx'> # CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+CONFIG_KEYBOARD_MAPLE=y</div><div class='add'>+# CONFIG_KEYBOARD_SH_KEYSC is not set</div><div class='ctx'> CONFIG_INPUT_MOUSE=y</div><div class='ctx'> # CONFIG_MOUSE_PS2 is not set</div><div class='ctx'> # CONFIG_MOUSE_SERIAL is not set</div><div class='hunk'>@@ -530,10 +580,13 @@ CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+# CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Serial drivers</div><div class='hunk'>@@ -553,6 +606,19 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_APPLICOM is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+CONFIG_DEVPORT=y</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -568,45 +634,40 @@ CONFIG_SH_WDT=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PCIPCWATCHDOG is not set</div><div class='ctx'> # CONFIG_WDTPCI is not set</div><div class='del'>-CONFIG_HW_RANDOM=y</div><div class='del'>-# CONFIG_R3964 is not set</div><div class='del'>-# CONFIG_APPLICOM is not set</div><div class='del'>-# CONFIG_DRM is not set</div><div class='del'>-# CONFIG_RAW_DRIVER is not set</div><div class='del'>-# CONFIG_TCG_TPM is not set</div><div class='del'>-CONFIG_DEVPORT=y</div><div class='del'>-# CONFIG_I2C is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# SPI support</div><div class='add'>+# Sonics Silicon Backplane</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='del'>-# CONFIG_W1 is not set</div><div class='del'>-# CONFIG_POWER_SUPPLY is not set</div><div class='del'>-# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='del'>-# CONFIG_DAB is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Graphics support</div><div class='add'>+# Multimedia drivers</div><div class='ctx'> #</div><div class='del'>-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+# CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Display device support</div><div class='add'>+# Graphics support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_DISPLAY_SUPPORT is not set</div><div class='add'>+# CONFIG_DRM is not set</div><div class='ctx'> # CONFIG_VGASTATE is not set</div><div class='ctx'> CONFIG_VIDEO_OUTPUT_CONTROL=m</div><div class='ctx'> CONFIG_FB=y</div><div class='hunk'>@@ -615,11 +676,12 @@ CONFIG_FIRMWARE_EDID=y</div><div class='ctx'> CONFIG_FB_CFB_FILLRECT=y</div><div class='ctx'> CONFIG_FB_CFB_COPYAREA=y</div><div class='ctx'> CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='add'>+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set</div><div class='ctx'> # CONFIG_FB_SYS_FILLRECT is not set</div><div class='ctx'> # CONFIG_FB_SYS_COPYAREA is not set</div><div class='ctx'> # CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_FOREIGN_ENDIAN is not set</div><div class='ctx'> # CONFIG_FB_SYS_FOPS is not set</div><div class='del'>-CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> # CONFIG_FB_SVGALIB is not set</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='ctx'> # CONFIG_FB_BACKLIGHT is not set</div><div class='hunk'>@@ -653,7 +715,15 @@ CONFIG_FB_PVR2=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='add'>+# CONFIG_FB_SH_MOBILE_LCDC is not set</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Console display driver support</div><div class='hunk'>@@ -680,49 +750,30 @@ CONFIG_LOGO=y</div><div class='ctx'> # CONFIG_LOGO_SUPERH_MONO is not set</div><div class='ctx'> # CONFIG_LOGO_SUPERH_VGA16 is not set</div><div class='ctx'> CONFIG_LOGO_SUPERH_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='ctx'> # CONFIG_HID_DEBUG is not set</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Gadget Support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Engine support</div><div class='del'>-#</div><div class='del'>-# CONFIG_DMA_ENGINE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Clients</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -735,14 +786,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='del'>-# CONFIG_MINIX_FS is not set</div><div class='del'>-# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='del'>-# CONFIG_DNOTIFY is not set</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='ctx'> # CONFIG_FUSE_FS is not set</div><div class='hunk'>@@ -771,7 +819,6 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_TMPFS_POSIX_ACL is not set</div><div class='ctx'> CONFIG_HUGETLBFS=y</div><div class='ctx'> CONFIG_HUGETLB_PAGE=y</div><div class='del'>-CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_CONFIGFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -786,14 +833,14 @@ CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Network File Systems</div><div class='del'>-#</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> # CONFIG_NFS_FS is not set</div><div class='ctx'> # CONFIG_NFSD is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -807,35 +854,25 @@ CONFIG_RAMFS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARTITION_ADVANCED is not set</div><div class='ctx'> CONFIG_MSDOS_PARTITION=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Native Language Support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_NLS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Distributed Lock Manager</div><div class='del'>-#</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Profiling support</div><div class='del'>-#</div><div class='del'>-CONFIG_PROFILING=y</div><div class='del'>-# CONFIG_OPROFILE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # Kernel hacking</div><div class='ctx'> #</div><div class='ctx'> CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='ctx'> # CONFIG_SH_STANDARD_BIOS is not set</div><div class='ctx'> # CONFIG_EARLY_SCIF_CONSOLE is not set</div><div class='ctx'> # CONFIG_SH_KGDB is not set</div><div class='hunk'>@@ -845,14 +882,95 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_KEYS is not set</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='del'>-# CONFIG_CRYPTO is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_MANAGER is not set</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CBC is not set</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+# CONFIG_CRYPTO_ECB is not set</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+# CONFIG_CRYPTO_MD5 is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_DES is not set</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='add'>+# CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/sh/configs/hp6xx_defconfig b/arch/sh/configs/hp6xx_defconfig<br/>index 756d38dc2f71..41e25b3a5b01 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/hp6xx_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/hp6xx_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/hp6xx_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/hp6xx_defconfig</a></div><div class='hunk'>@@ -1,9 +1,11 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.23-rc4</div><div class='del'>-# Tue Sep 11 19:42:44 2007</div><div class='add'>+# Linux kernel version: 2.6.26</div><div class='add'>+# Wed Jul 30 01:24:57 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='add'>+CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='hunk'>@@ -20,6 +22,7 @@ CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='ctx'> CONFIG_ARCH_NO_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -34,12 +37,15 @@ CONFIG_SWAP=y</div><div class='ctx'> # CONFIG_SYSVIPC is not set</div><div class='ctx'> CONFIG_BSD_PROCESS_ACCT=y</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='del'>-# CONFIG_USER_NS is not set</div><div class='ctx'> CONFIG_IKCONFIG=y</div><div class='ctx'> CONFIG_IKCONFIG_PROC=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='ctx'> # CONFIG_BLK_DEV_INITRD is not set</div><div class='ctx'> # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='hunk'>@@ -52,6 +58,7 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_ANON_INODES=y</div><div class='hunk'>@@ -64,6 +71,19 @@ CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_SLUB is not set</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+# CONFIG_HAVE_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='hunk'>@@ -73,6 +93,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -86,13 +107,17 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_CFQ is not set</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # System type</div><div class='ctx'> #</div><div class='ctx'> CONFIG_CPU_SH3=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7619 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7203 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7206 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7263 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_MXG is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7705 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7706 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7707 is not set</div><div class='hunk'>@@ -101,6 +126,7 @@ CONFIG_CPU_SUBTYPE_SH7709=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7710 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7712 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7720 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7721 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7750 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7091 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7750R is not set</div><div class='hunk'>@@ -109,14 +135,17 @@ CONFIG_CPU_SUBTYPE_SH7709=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7751R is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7760 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH4_202 is not set</div><div class='del'>-# CONFIG_CPU_SUBTYPE_ST40STB1 is not set</div><div class='del'>-# CONFIG_CPU_SUBTYPE_ST40GX1 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7723 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7763 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7770 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7780 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7785 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SHX3 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7343 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7722 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7366 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH5_101 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH5_103 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Memory management options</div><div class='hunk'>@@ -126,6 +155,7 @@ CONFIG_MMU=y</div><div class='ctx'> CONFIG_PAGE_OFFSET=0x80000000</div><div class='ctx'> CONFIG_MEMORY_START=0x0d000000</div><div class='ctx'> CONFIG_MEMORY_SIZE=0x00400000</div><div class='add'>+CONFIG_29BIT=y</div><div class='ctx'> CONFIG_VSYSCALL=y</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_SPARSEMEM_ENABLE=y</div><div class='hunk'>@@ -135,7 +165,9 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='hunk'>@@ -143,6 +175,8 @@ CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> CONFIG_SPARSEMEM_STATIC=y</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=0</div><div class='hunk'>@@ -181,6 +215,7 @@ CONFIG_SH_PCLK_FREQ=22110000</div><div class='ctx'> # CONFIG_TICK_ONESHOT is not set</div><div class='ctx'> # CONFIG_NO_HZ is not set</div><div class='ctx'> # CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CPU Frequency scaling</div><div class='hunk'>@@ -219,11 +254,14 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='ctx'> # CONFIG_KEXEC is not set</div><div class='ctx'> # CONFIG_CRASH_DUMP is not set</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_GUSA=y</div><div class='add'>+# CONFIG_GUSA_RB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Boot options</div><div class='hunk'>@@ -237,10 +275,6 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ISA=y</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCCARD (PCMCIA/CardBus) support</div><div class='del'>-#</div><div class='ctx'> CONFIG_PCCARD=y</div><div class='ctx'> # CONFIG_PCMCIA_DEBUG is not set</div><div class='ctx'> CONFIG_PCMCIA=y</div><div class='hunk'>@@ -263,11 +297,12 @@ CONFIG_BINFMT_ELF=y</div><div class='ctx'> #</div><div class='ctx'> # Power management options (EXPERIMENTAL)</div><div class='ctx'> #</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=y</div><div class='ctx'> CONFIG_PM=y</div><div class='del'>-CONFIG_PM_LEGACY=y</div><div class='ctx'> # CONFIG_PM_DEBUG is not set</div><div class='ctx'> CONFIG_PM_SLEEP=y</div><div class='ctx'> CONFIG_SUSPEND=y</div><div class='add'>+CONFIG_SUSPEND_FREEZER=y</div><div class='ctx'> CONFIG_APM_EMULATION=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -282,9 +317,12 @@ CONFIG_APM_EMULATION=y</div><div class='ctx'> #</div><div class='ctx'> # Generic Driver Options</div><div class='ctx'> #</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> # CONFIG_STANDALONE is not set</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='hunk'>@@ -294,8 +332,11 @@ CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_LOOP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_RAM is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -332,6 +373,7 @@ CONFIG_BLK_DEV_SD=y</div><div class='ctx'> # CONFIG_SCSI_SPI_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_FC_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='add'>+# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='ctx'> CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_AHA152X is not set</div><div class='ctx'> # CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='hunk'>@@ -342,14 +384,17 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set</div><div class='ctx'> # CONFIG_SCSI_NCR53C406A is not set</div><div class='ctx'> # CONFIG_SCSI_PAS16 is not set</div><div class='del'>-# CONFIG_SCSI_PSI240I is not set</div><div class='ctx'> # CONFIG_SCSI_QLOGIC_FAS is not set</div><div class='ctx'> # CONFIG_SCSI_SYM53C416 is not set</div><div class='ctx'> # CONFIG_SCSI_T128 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='add'>+CONFIG_SATA_PMP=y</div><div class='add'>+CONFIG_ATA_SFF=y</div><div class='add'>+# CONFIG_SATA_MV is not set</div><div class='ctx'> # CONFIG_PATA_LEGACY is not set</div><div class='ctx'> # CONFIG_PATA_PCMCIA is not set</div><div class='ctx'> # CONFIG_PATA_QDI is not set</div><div class='hunk'>@@ -370,11 +415,9 @@ CONFIG_INPUT_POLLDEV=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_INPUT_MOUSEDEV is not set</div><div class='ctx'> # CONFIG_INPUT_JOYDEV is not set</div><div class='del'>-CONFIG_INPUT_TSDEV=y</div><div class='del'>-CONFIG_INPUT_TSDEV_SCREEN_X=240</div><div class='del'>-CONFIG_INPUT_TSDEV_SCREEN_Y=320</div><div class='ctx'> CONFIG_INPUT_EVDEV=y</div><div class='ctx'> # CONFIG_INPUT_EVBUG is not set</div><div class='add'>+# CONFIG_INPUT_APMPOWER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Input Device Drivers</div><div class='hunk'>@@ -387,6 +430,7 @@ CONFIG_INPUT_KEYBOARD=y</div><div class='ctx'> # CONFIG_KEYBOARD_NEWTON is not set</div><div class='ctx'> # CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='ctx'> CONFIG_KEYBOARD_HP6XX=y</div><div class='add'>+# CONFIG_KEYBOARD_SH_KEYSC is not set</div><div class='ctx'> # CONFIG_INPUT_MOUSE is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='ctx'> # CONFIG_INPUT_TABLET is not set</div><div class='hunk'>@@ -395,12 +439,15 @@ CONFIG_INPUT_TOUCHSCREEN=y</div><div class='ctx'> # CONFIG_TOUCHSCREEN_GUNZE is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_ELO is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_MTOUCH is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_INEXIO is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_MK712 is not set</div><div class='ctx'> CONFIG_TOUCHSCREEN_HP600=y</div><div class='add'>+# CONFIG_TOUCHSCREEN_HTCPEN is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_PENMOUNT is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_TOUCHWIN is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_UCB1400 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set</div><div class='ctx'> # CONFIG_INPUT_MISC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -417,9 +464,11 @@ CONFIG_SERIO=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -439,7 +488,6 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=64</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-# CONFIG_WATCHDOG is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='hunk'>@@ -454,39 +502,45 @@ CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='del'>-# CONFIG_DAB is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Graphics support</div><div class='add'>+# Multimedia drivers</div><div class='ctx'> #</div><div class='del'>-CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='del'>-CONFIG_LCD_CLASS_DEVICE=y</div><div class='del'>-CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='del'>-CONFIG_BACKLIGHT_HP680=y</div><div class='add'>+# CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Display device support</div><div class='add'>+# Graphics support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_DISPLAY_SUPPORT is not set</div><div class='ctx'> # CONFIG_VGASTATE is not set</div><div class='ctx'> CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> CONFIG_FB=y</div><div class='hunk'>@@ -495,11 +549,12 @@ CONFIG_FIRMWARE_EDID=y</div><div class='ctx'> CONFIG_FB_CFB_FILLRECT=y</div><div class='ctx'> CONFIG_FB_CFB_COPYAREA=y</div><div class='ctx'> CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='add'>+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set</div><div class='ctx'> # CONFIG_FB_SYS_FILLRECT is not set</div><div class='ctx'> # CONFIG_FB_SYS_COPYAREA is not set</div><div class='ctx'> # CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_FOREIGN_ENDIAN is not set</div><div class='ctx'> # CONFIG_FB_SYS_FOPS is not set</div><div class='del'>-CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> # CONFIG_FB_SVGALIB is not set</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='ctx'> # CONFIG_FB_BACKLIGHT is not set</div><div class='hunk'>@@ -511,7 +566,20 @@ CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_FB_S1D13XXX is not set</div><div class='ctx'> CONFIG_FB_HIT=y</div><div class='add'>+CONFIG_FB_SH_MOBILE_LCDC=y</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='add'>+CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='add'>+CONFIG_LCD_CLASS_DEVICE=y</div><div class='add'>+# CONFIG_LCD_ILI9320 is not set</div><div class='add'>+# CONFIG_LCD_PLATFORM is not set</div><div class='add'>+CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='add'>+# CONFIG_BACKLIGHT_CORGI is not set</div><div class='add'>+CONFIG_BACKLIGHT_HP680=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Display device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Console display driver support</div><div class='hunk'>@@ -533,15 +601,13 @@ CONFIG_FONT_PEARL_8x8=y</div><div class='ctx'> # CONFIG_FONT_SUN12x22 is not set</div><div class='ctx'> # CONFIG_FONT_10x18 is not set</div><div class='ctx'> # CONFIG_LOGO is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_HID_SUPPORT is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> CONFIG_RTC_LIB=y</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='ctx'> CONFIG_RTC_HCTOSYS=y</div><div class='hunk'>@@ -564,9 +630,10 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> #</div><div class='ctx'> # Platform RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_DS1553 is not set</div><div class='del'>-# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M48T86 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M48T59 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_V3020 is not set</div><div class='hunk'>@@ -575,23 +642,7 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_RTC_DRV_SH=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Engine support</div><div class='del'>-#</div><div class='del'>-# CONFIG_DMA_ENGINE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Clients</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -606,13 +657,10 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='del'>-# CONFIG_MINIX_FS is not set</div><div class='del'>-# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='del'>-CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='ctx'> # CONFIG_FUSE_FS is not set</div><div class='hunk'>@@ -643,7 +691,6 @@ CONFIG_SYSFS=y</div><div class='ctx'> # CONFIG_TMPFS is not set</div><div class='ctx'> # CONFIG_HUGETLBFS is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE is not set</div><div class='del'>-CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_CONFIGFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -658,8 +705,11 @@ CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='ctx'> </div><div class='hunk'>@@ -668,10 +718,6 @@ CONFIG_RAMFS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARTITION_ADVANCED is not set</div><div class='ctx'> CONFIG_MSDOS_PARTITION=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Native Language Support</div><div class='del'>-#</div><div class='ctx'> CONFIG_NLS=y</div><div class='ctx'> CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> # CONFIG_NLS_CODEPAGE_437 is not set</div><div class='hunk'>@@ -714,22 +760,21 @@ CONFIG_NLS_CODEPAGE_850=y</div><div class='ctx'> # CONFIG_NLS_UTF8 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Profiling support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PROFILING is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # Kernel hacking</div><div class='ctx'> #</div><div class='ctx'> CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='ctx'> # CONFIG_SH_STANDARD_BIOS is not set</div><div class='ctx'> # CONFIG_EARLY_SCIF_CONSOLE is not set</div><div class='ctx'> # CONFIG_SH_KGDB is not set</div><div class='hunk'>@@ -739,50 +784,95 @@ CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_KEYS is not set</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=y</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=y</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=y</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-# CONFIG_CRYPTO_DES is not set</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_DES is not set</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> # CONFIG_CRYPTO_HW is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> CONFIG_CRC16=y</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/sh/configs/landisk_defconfig b/arch/sh/configs/landisk_defconfig<br/>index 38f934ab50c7..99cc39c5c6ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/landisk_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/landisk_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/landisk_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/landisk_defconfig</a></div><div class='hunk'>@@ -1,44 +1,53 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.19</div><div class='del'>-# Thu Dec  7 17:13:04 2006</div><div class='add'>+# Linux kernel version: 2.6.26</div><div class='add'>+# Wed Jul 30 01:35:07 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='add'>+CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='del'>-# CONFIG_GENERIC_TIME is not set</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_PCI=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_ARCH_NO_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Code maturity level options</div><div class='add'>+# General setup</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXPERIMENTAL=y</div><div class='ctx'> CONFIG_BROKEN_ON_SMP=y</div><div class='ctx'> CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# General setup</div><div class='del'>-#</div><div class='ctx'> CONFIG_LOCALVERSION=""</div><div class='ctx'> CONFIG_LOCALVERSION_AUTO=y</div><div class='ctx'> CONFIG_SWAP=y</div><div class='ctx'> CONFIG_SYSVIPC=y</div><div class='del'>-# CONFIG_IPC_NS is not set</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='ctx'> # CONFIG_POSIX_MQUEUE is not set</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT is not set</div><div class='ctx'> # CONFIG_TASKSTATS is not set</div><div class='del'>-# CONFIG_UTS_NS is not set</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='del'>-CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='add'>+# CONFIG_BLK_DEV_INITRD is not set</div><div class='ctx'> CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='hunk'>@@ -50,34 +59,48 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='del'>-CONFIG_SLAB=y</div><div class='ctx'> CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+# CONFIG_HAVE_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='del'>-# CONFIG_SLOB is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Loadable module support</div><div class='del'>-#</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='ctx'> CONFIG_KMOD=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Block layer</div><div class='del'>-#</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -91,67 +114,26 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_CFQ is not set</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # System type</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SH_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_7751_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_7300_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_7343_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_73180_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_7751_SYSTEMH is not set</div><div class='del'>-# CONFIG_SH_HP6XX is not set</div><div class='del'>-# CONFIG_SH_EC3104 is not set</div><div class='del'>-# CONFIG_SH_SATURN is not set</div><div class='del'>-# CONFIG_SH_DREAMCAST is not set</div><div class='del'>-# CONFIG_SH_BIGSUR is not set</div><div class='del'>-# CONFIG_SH_MPC1211 is not set</div><div class='del'>-# CONFIG_SH_SH03 is not set</div><div class='del'>-# CONFIG_SH_SECUREEDGE5410 is not set</div><div class='del'>-# CONFIG_SH_HS7751RVOIP is not set</div><div class='del'>-# CONFIG_SH_7710VOIPGW is not set</div><div class='del'>-# CONFIG_SH_RTS7751R2D is not set</div><div class='del'>-# CONFIG_SH_R7780RP is not set</div><div class='del'>-# CONFIG_SH_EDOSK7705 is not set</div><div class='del'>-# CONFIG_SH_SH4202_MICRODEV is not set</div><div class='del'>-CONFIG_SH_LANDISK=y</div><div class='del'>-# CONFIG_SH_TITAN is not set</div><div class='del'>-# CONFIG_SH_SHMIN is not set</div><div class='del'>-# CONFIG_SH_7206_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_7619_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_UNKNOWN is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Processor selection</div><div class='del'>-#</div><div class='ctx'> CONFIG_CPU_SH4=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH-2 Processor Support</div><div class='del'>-#</div><div class='del'>-# CONFIG_CPU_SUBTYPE_SH7604 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7619 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH-2A Processor Support</div><div class='del'>-#</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7203 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7206 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH-3 Processor Support</div><div class='del'>-#</div><div class='del'>-# CONFIG_CPU_SUBTYPE_SH7300 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7263 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_MXG is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7705 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7706 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7707 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7708 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7709 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7710 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH-4 Processor Support</div><div class='del'>-#</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7712 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7720 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7721 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7750 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7091 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7750R is not set</div><div class='hunk'>@@ -160,53 +142,60 @@ CONFIG_CPU_SH4=y</div><div class='ctx'> CONFIG_CPU_SUBTYPE_SH7751R=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7760 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH4_202 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ST40 Processor Support</div><div class='del'>-#</div><div class='del'>-# CONFIG_CPU_SUBTYPE_ST40STB1 is not set</div><div class='del'>-# CONFIG_CPU_SUBTYPE_ST40GX1 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH-4A Processor Support</div><div class='del'>-#</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7723 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7763 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7770 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7780 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7785 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH4AL-DSP Processor Support</div><div class='del'>-#</div><div class='del'>-# CONFIG_CPU_SUBTYPE_SH73180 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SHX3 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7343 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7722 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7366 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH5_101 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH5_103 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Memory management options</div><div class='ctx'> #</div><div class='add'>+CONFIG_QUICKLIST=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='ctx'> CONFIG_PAGE_OFFSET=0x80000000</div><div class='ctx'> CONFIG_MEMORY_START=0x0c000000</div><div class='ctx'> CONFIG_MEMORY_SIZE=0x04000000</div><div class='add'>+CONFIG_29BIT=y</div><div class='ctx'> CONFIG_VSYSCALL=y</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_ARCH_SPARSEMEM_ENABLE=y</div><div class='add'>+CONFIG_ARCH_SPARSEMEM_DEFAULT=y</div><div class='add'>+CONFIG_MAX_ACTIVE_REGIONS=1</div><div class='add'>+CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='add'>+CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_MANUAL is not set</div><div class='ctx'> CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='del'>-# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPARSEMEM_STATIC=y</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=0</div><div class='add'>+CONFIG_NR_QUICK=2</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Cache configuration</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SH_DIRECT_MAPPED is not set</div><div class='del'>-# CONFIG_SH_WRITETHROUGH is not set</div><div class='del'>-# CONFIG_SH_OCRAM is not set</div><div class='add'>+CONFIG_CACHE_WRITEBACK=y</div><div class='add'>+# CONFIG_CACHE_WRITETHROUGH is not set</div><div class='add'>+# CONFIG_CACHE_OFF is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Processor features</div><div class='hunk'>@@ -214,19 +203,32 @@ CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> CONFIG_CPU_LITTLE_ENDIAN=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='ctx'> CONFIG_SH_FPU=y</div><div class='del'>-# CONFIG_SH_DSP is not set</div><div class='ctx'> # CONFIG_SH_STORE_QUEUES is not set</div><div class='ctx'> CONFIG_CPU_HAS_INTEVT=y</div><div class='del'>-CONFIG_CPU_HAS_INTC_IRQ=y</div><div class='ctx'> CONFIG_CPU_HAS_SR_RB=y</div><div class='ctx'> CONFIG_CPU_HAS_PTEA=y</div><div class='add'>+CONFIG_CPU_HAS_FPU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Timer support</div><div class='add'>+# Board support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SH_7751_SYSTEMH is not set</div><div class='add'>+# CONFIG_SH_SECUREEDGE5410 is not set</div><div class='add'>+# CONFIG_SH_RTS7751R2D is not set</div><div class='add'>+CONFIG_SH_LANDISK=y</div><div class='add'>+# CONFIG_SH_TITAN is not set</div><div class='add'>+# CONFIG_SH_LBOX_RE2 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Timer and clock configuration</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SH_TMU=y</div><div class='ctx'> CONFIG_SH_TIMER_IRQ=16</div><div class='ctx'> CONFIG_SH_PCLK_FREQ=33333333</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CPU Frequency scaling</div><div class='hunk'>@@ -241,12 +243,11 @@ CONFIG_SH_PCLK_FREQ=33333333</div><div class='ctx'> #</div><div class='ctx'> # Companion Chips</div><div class='ctx'> #</div><div class='del'>-# CONFIG_HD6446X_SERIES is not set</div><div class='del'>-CONFIG_HEARTBEAT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Additional SuperH Device Drivers</div><div class='ctx'> #</div><div class='add'>+CONFIG_HEARTBEAT=y</div><div class='ctx'> # CONFIG_PUSH_SWITCH is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -254,13 +255,17 @@ CONFIG_HEARTBEAT=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_HZ_100 is not set</div><div class='ctx'> CONFIG_HZ_250=y</div><div class='add'>+# CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='del'>-# CONFIG_SMP is not set</div><div class='add'>+# CONFIG_CRASH_DUMP is not set</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_GUSA=y</div><div class='add'>+# CONFIG_GUSA_RB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Boot options</div><div class='hunk'>@@ -273,16 +278,12 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='del'>-CONFIG_ISA=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_SH_PCIDMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_PCI_AUTO=y</div><div class='ctx'> CONFIG_PCI_AUTO_UPDATE_RESOURCES=y</div><div class='del'>-# CONFIG_PCI_MULTITHREAD_PROBE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCCARD (PCMCIA/CardBus) support</div><div class='del'>-#</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+CONFIG_PCI_LEGACY=y</div><div class='ctx'> CONFIG_PCCARD=y</div><div class='ctx'> # CONFIG_PCMCIA_DEBUG is not set</div><div class='ctx'> CONFIG_PCMCIA=y</div><div class='hunk'>@@ -301,29 +302,16 @@ CONFIG_YENTA_ENE_TUNE=y</div><div class='ctx'> CONFIG_YENTA_TOSHIBA=y</div><div class='ctx'> # CONFIG_PD6729 is not set</div><div class='ctx'> # CONFIG_I82092 is not set</div><div class='del'>-# CONFIG_I82365 is not set</div><div class='del'>-# CONFIG_TCIC is not set</div><div class='del'>-CONFIG_PCMCIA_PROBE=y</div><div class='ctx'> CONFIG_PCCARD_NONSTATIC=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI Hotplug Support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Executable file formats</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='del'>-# CONFIG_BINFMT_FLAT is not set</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Power management options (EXPERIMENTAL)</div><div class='del'>-#</div><div class='del'>-# CONFIG_PM is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # Networking</div><div class='ctx'> #</div><div class='ctx'> CONFIG_NET=y</div><div class='hunk'>@@ -331,13 +319,14 @@ CONFIG_NET=y</div><div class='ctx'> #</div><div class='ctx'> # Networking options</div><div class='ctx'> #</div><div class='del'>-# CONFIG_NETDEBUG is not set</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> # CONFIG_PACKET_MMAP is not set</div><div class='ctx'> CONFIG_UNIX=y</div><div class='ctx'> CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> # CONFIG_IP_MULTICAST is not set</div><div class='hunk'>@@ -364,49 +353,36 @@ CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='ctx'> CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IP: Virtual Server Configuration</div><div class='del'>-#</div><div class='ctx'> # CONFIG_IP_VS is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='add'>+CONFIG_NETFILTER_ADVANCED=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Core Netfilter Configuration</div><div class='ctx'> #</div><div class='del'>-# CONFIG_NETFILTER_NETLINK is not set</div><div class='del'>-# CONFIG_NF_CONNTRACK_ENABLED is not set</div><div class='add'>+# CONFIG_NETFILTER_NETLINK_QUEUE is not set</div><div class='add'>+# CONFIG_NETFILTER_NETLINK_LOG is not set</div><div class='add'>+# CONFIG_NF_CONNTRACK is not set</div><div class='ctx'> # CONFIG_NETFILTER_XTABLES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IP: Netfilter Configuration</div><div class='ctx'> #</div><div class='ctx'> CONFIG_IP_NF_QUEUE=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DCCP Configuration (EXPERIMENTAL)</div><div class='del'>-#</div><div class='add'>+# CONFIG_IP_NF_IPTABLES is not set</div><div class='add'>+# CONFIG_IP_NF_ARPTABLES is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SCTP Configuration (EXPERIMENTAL)</div><div class='del'>-#</div><div class='ctx'> # CONFIG_IP_SCTP is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# TIPC Configuration (EXPERIMENTAL)</div><div class='del'>-#</div><div class='ctx'> # CONFIG_TIPC is not set</div><div class='ctx'> # CONFIG_ATM is not set</div><div class='ctx'> # CONFIG_BRIDGE is not set</div><div class='hunk'>@@ -421,10 +397,6 @@ CONFIG_ATALK=m</div><div class='ctx'> # CONFIG_LAPB is not set</div><div class='ctx'> # CONFIG_ECONET is not set</div><div class='ctx'> # CONFIG_WAN_ROUTER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# QoS and/or fair queueing</div><div class='del'>-#</div><div class='ctx'> # CONFIG_NET_SCHED is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -432,9 +404,20 @@ CONFIG_ATALK=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_PKTGEN is not set</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='ctx'> # CONFIG_IRDA is not set</div><div class='ctx'> # CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='ctx'> # CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Device Drivers</div><div class='hunk'>@@ -443,35 +426,17 @@ CONFIG_ATALK=m</div><div class='ctx'> #</div><div class='ctx'> # Generic Driver Options</div><div class='ctx'> #</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='del'>-#</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Memory Technology Devices (MTD)</div><div class='del'>-#</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Parallel port support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Plug and Play support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PNP is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Block devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_UMEM is not set</div><div class='hunk'>@@ -484,63 +449,66 @@ CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='del'>-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='del'>-# CONFIG_BLK_DEV_INITRD is not set</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Misc devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_PHANTOM is not set</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ATA/ATAPI/MFM/RLL support</div><div class='del'>-#</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='ctx'> CONFIG_IDE_MAX_HWIFS=4</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Please see Documentation/ide.txt for help/info on IDE drives</div><div class='add'>+# Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='add'>+CONFIG_IDE_ATAPI=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDECS is not set</div><div class='add'>+# CONFIG_BLK_DEV_DELKIN is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDECD=y</div><div class='add'>+CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDETAPE is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDEFLOPPY is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDESCSI=y</div><div class='ctx'> # CONFIG_IDE_TASK_IOCTL is not set</div><div class='add'>+CONFIG_IDE_PROC_FS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='add'>+# CONFIG_BLK_DEV_PLATFORM is not set</div><div class='add'>+CONFIG_BLK_DEV_IDEDMA_SFF=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI IDE chipsets support</div><div class='add'>+#</div><div class='ctx'> CONFIG_BLK_DEV_IDEPCI=y</div><div class='del'>-CONFIG_IDEPCI_SHARE_IRQ=y</div><div class='add'>+CONFIG_IDEPCI_PCIBUS_ORDER=y</div><div class='ctx'> CONFIG_BLK_DEV_OFFBOARD=y</div><div class='ctx'> CONFIG_BLK_DEV_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_OPTI621 is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='del'>-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set</div><div class='del'>-CONFIG_IDEDMA_PCI_AUTO=y</div><div class='del'>-CONFIG_IDEDMA_ONLYDISK=y</div><div class='ctx'> CONFIG_BLK_DEV_AEC62XX=y</div><div class='ctx'> # CONFIG_BLK_DEV_ALI15X3 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_PIIX is not set</div><div class='add'>+# CONFIG_BLK_DEV_IT8213 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IT821X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_NS87415 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_PDC202XX_OLD is not set</div><div class='hunk'>@@ -550,18 +518,15 @@ CONFIG_BLK_DEV_AEC62XX=y</div><div class='ctx'> # CONFIG_BLK_DEV_SLC90E66 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRM290 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_VIA82CXXX is not set</div><div class='del'>-# CONFIG_IDE_ARM is not set</div><div class='del'>-# CONFIG_IDE_CHIPSETS is not set</div><div class='add'>+# CONFIG_BLK_DEV_TC86C001 is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_IDEDMA_IVB is not set</div><div class='del'>-CONFIG_IDEDMA_AUTO=y</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_RAID_ATTRS is not set</div><div class='ctx'> CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='ctx'> # CONFIG_SCSI_TGT is not set</div><div class='ctx'> # CONFIG_SCSI_NETLINK is not set</div><div class='ctx'> CONFIG_SCSI_PROC_FS=y</div><div class='hunk'>@@ -583,6 +548,7 @@ CONFIG_SCSI_MULTI_LUN=y</div><div class='ctx'> # CONFIG_SCSI_CONSTANTS is not set</div><div class='ctx'> # CONFIG_SCSI_LOGGING is not set</div><div class='ctx'> # CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI Transports</div><div class='hunk'>@@ -590,77 +556,43 @@ CONFIG_SCSI_MULTI_LUN=y</div><div class='ctx'> # CONFIG_SCSI_SPI_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_FC_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='del'>-# CONFIG_SCSI_SAS_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SCSI low-level drivers</div><div class='del'>-#</div><div class='add'>+# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_ISCSI_TCP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_3W_XXXX_RAID is not set</div><div class='ctx'> # CONFIG_SCSI_3W_9XXX is not set</div><div class='ctx'> # CONFIG_SCSI_ACARD is not set</div><div class='del'>-# CONFIG_SCSI_AHA152X is not set</div><div class='ctx'> # CONFIG_SCSI_AACRAID is not set</div><div class='ctx'> # CONFIG_SCSI_AIC7XXX is not set</div><div class='ctx'> # CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='ctx'> # CONFIG_SCSI_AIC79XX is not set</div><div class='ctx'> # CONFIG_SCSI_AIC94XX is not set</div><div class='del'>-# CONFIG_SCSI_DPT_I2O is not set</div><div class='del'>-# CONFIG_SCSI_IN2000 is not set</div><div class='ctx'> # CONFIG_SCSI_ARCMSR is not set</div><div class='ctx'> # CONFIG_MEGARAID_NEWGEN is not set</div><div class='ctx'> # CONFIG_MEGARAID_LEGACY is not set</div><div class='ctx'> # CONFIG_MEGARAID_SAS is not set</div><div class='ctx'> # CONFIG_SCSI_HPTIOP is not set</div><div class='ctx'> # CONFIG_SCSI_DMX3191D is not set</div><div class='del'>-# CONFIG_SCSI_DTC3280 is not set</div><div class='ctx'> # CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='del'>-# CONFIG_SCSI_GENERIC_NCR5380 is not set</div><div class='del'>-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='ctx'> # CONFIG_SCSI_INITIO is not set</div><div class='ctx'> # CONFIG_SCSI_INIA100 is not set</div><div class='del'>-# CONFIG_SCSI_NCR53C406A is not set</div><div class='add'>+# CONFIG_SCSI_MVSAS is not set</div><div class='ctx'> # CONFIG_SCSI_STEX is not set</div><div class='ctx'> # CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='del'>-# CONFIG_SCSI_PAS16 is not set</div><div class='del'>-# CONFIG_SCSI_PSI240I is not set</div><div class='del'>-# CONFIG_SCSI_QLOGIC_FAS is not set</div><div class='ctx'> # CONFIG_SCSI_QLOGIC_1280 is not set</div><div class='ctx'> # CONFIG_SCSI_QLA_FC is not set</div><div class='ctx'> # CONFIG_SCSI_QLA_ISCSI is not set</div><div class='ctx'> # CONFIG_SCSI_LPFC is not set</div><div class='del'>-# CONFIG_SCSI_SYM53C416 is not set</div><div class='ctx'> # CONFIG_SCSI_DC395x is not set</div><div class='ctx'> # CONFIG_SCSI_DC390T is not set</div><div class='del'>-# CONFIG_SCSI_T128 is not set</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCMCIA SCSI adapter support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PCMCIA_AHA152X is not set</div><div class='del'>-# CONFIG_PCMCIA_FDOMAIN is not set</div><div class='del'>-# CONFIG_PCMCIA_NINJA_SCSI is not set</div><div class='del'>-# CONFIG_PCMCIA_QLOGIC is not set</div><div class='del'>-# CONFIG_PCMCIA_SYM53C500 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Serial ATA (prod) and Parallel ATA (experimental) drivers</div><div class='del'>-#</div><div class='add'>+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Old CD-ROM drivers (not SCSI, not IDE)</div><div class='del'>-#</div><div class='del'>-# CONFIG_CD_NO_IDESCSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Multi-device support (RAID and LVM)</div><div class='del'>-#</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='hunk'>@@ -671,76 +603,49 @@ CONFIG_MD_RAID1=m</div><div class='ctx'> # CONFIG_MD_MULTIPATH is not set</div><div class='ctx'> # CONFIG_MD_FAULTY is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DM is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Fusion MPT device support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='del'>-# CONFIG_FUSION_SPI is not set</div><div class='del'>-# CONFIG_FUSION_FC is not set</div><div class='del'>-# CONFIG_FUSION_SAS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_IEEE1394 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# I2O device support</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIREWIRE is not set</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Network device support</div><div class='del'>-#</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='ctx'> CONFIG_TUN=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ARCnet devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_VETH is not set</div><div class='ctx'> # CONFIG_ARCNET is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PHY device support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_PHYLIB is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Ethernet (10 or 100Mbit)</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='ctx'> # CONFIG_STNIC is not set</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='ctx'> # CONFIG_SUNGEM is not set</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_3COM is not set</div><div class='del'>-# CONFIG_NET_VENDOR_SMC is not set</div><div class='ctx'> # CONFIG_SMC91X is not set</div><div class='del'>-# CONFIG_NET_VENDOR_RACAL is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Tulip family network device support</div><div class='del'>-#</div><div class='add'>+# CONFIG_SMC911X is not set</div><div class='ctx'> # CONFIG_NET_TULIP is not set</div><div class='del'>-# CONFIG_AT1700 is not set</div><div class='del'>-# CONFIG_DEPCA is not set</div><div class='ctx'> # CONFIG_HP100 is not set</div><div class='del'>-# CONFIG_NET_ISA is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='ctx'> CONFIG_NET_PCI=y</div><div class='ctx'> # CONFIG_PCNET32 is not set</div><div class='ctx'> # CONFIG_AMD8111_ETH is not set</div><div class='ctx'> # CONFIG_ADAPTEC_STARFIRE is not set</div><div class='del'>-# CONFIG_AC3200 is not set</div><div class='del'>-# CONFIG_APRICOT is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='ctx'> # CONFIG_FORCEDETH is not set</div><div class='del'>-# CONFIG_CS89x0 is not set</div><div class='del'>-# CONFIG_DGRS is not set</div><div class='ctx'> # CONFIG_EEPRO100 is not set</div><div class='ctx'> # CONFIG_E100 is not set</div><div class='ctx'> # CONFIG_FEALNX is not set</div><div class='hunk'>@@ -748,18 +653,20 @@ CONFIG_NET_PCI=y</div><div class='ctx'> # CONFIG_NE2K_PCI is not set</div><div class='ctx'> CONFIG_8139CP=y</div><div class='ctx'> # CONFIG_8139TOO is not set</div><div class='add'>+# CONFIG_R6040 is not set</div><div class='ctx'> # CONFIG_SIS900 is not set</div><div class='ctx'> # CONFIG_EPIC100 is not set</div><div class='ctx'> # CONFIG_SUNDANCE is not set</div><div class='ctx'> # CONFIG_TLAN is not set</div><div class='ctx'> # CONFIG_VIA_RHINE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Ethernet (1000 Mbit)</div><div class='del'>-#</div><div class='add'>+# CONFIG_SC92031 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_ACENIC is not set</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='add'>+# CONFIG_E1000E is not set</div><div class='add'>+# CONFIG_IP1000 is not set</div><div class='add'>+# CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='ctx'> # CONFIG_HAMACHI is not set</div><div class='ctx'> # CONFIG_YELLOWFIN is not set</div><div class='hunk'>@@ -767,58 +674,53 @@ CONFIG_8139CP=y</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Ethernet (10000 Mbit)</div><div class='del'>-#</div><div class='add'>+# CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='add'>+# CONFIG_CHELSIO_T3 is not set</div><div class='add'>+# CONFIG_IXGBE is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='ctx'> # CONFIG_MYRI10GE is not set</div><div class='ctx'> # CONFIG_NETXEN_NIC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Token Ring devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_NIU is not set</div><div class='add'>+# CONFIG_MLX4_CORE is not set</div><div class='add'>+# CONFIG_TEHUTI is not set</div><div class='add'>+# CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Wireless LAN (non-hamradio)</div><div class='add'>+# Wireless LAN</div><div class='ctx'> #</div><div class='del'>-# CONFIG_NET_RADIO is not set</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# PCMCIA network device support</div><div class='add'>+# USB Network Adapters</div><div class='ctx'> #</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+CONFIG_USB_PEGASUS=m</div><div class='add'>+CONFIG_USB_RTL8150=m</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='ctx'> # CONFIG_NET_PCMCIA is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Wan interfaces</div><div class='del'>-#</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='ctx'> # CONFIG_NET_FC is not set</div><div class='del'>-# CONFIG_SHAPER is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='ctx'> # CONFIG_NET_POLL_CONTROLLER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ISDN subsystem</div><div class='del'>-#</div><div class='ctx'> # CONFIG_ISDN is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Telephony Support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_PHONE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -826,6 +728,7 @@ CONFIG_8139CP=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_INPUT=y</div><div class='ctx'> # CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Userland interfaces</div><div class='hunk'>@@ -835,7 +738,6 @@ CONFIG_INPUT_MOUSEDEV=y</div><div class='ctx'> CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='ctx'> CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='ctx'> # CONFIG_INPUT_JOYDEV is not set</div><div class='del'>-# CONFIG_INPUT_TSDEV is not set</div><div class='ctx'> # CONFIG_INPUT_EVDEV is not set</div><div class='ctx'> # CONFIG_INPUT_EVBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -845,6 +747,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='ctx'> # CONFIG_INPUT_KEYBOARD is not set</div><div class='ctx'> # CONFIG_INPUT_MOUSE is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='ctx'> # CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='ctx'> # CONFIG_INPUT_MISC is not set</div><div class='ctx'> </div><div class='hunk'>@@ -858,10 +761,13 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+# CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Serial drivers</div><div class='hunk'>@@ -880,22 +786,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IPMI</div><div class='del'>-#</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Watchdog Cards</div><div class='del'>-#</div><div class='del'>-# CONFIG_WATCHDOG is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='del'>-# CONFIG_GEN_RTC is not set</div><div class='del'>-# CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_APPLICOM is not set</div><div class='del'>-# CONFIG_DRM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCMCIA character devices</div><div class='hunk'>@@ -903,65 +797,77 @@ CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_SYNCLINK_CS is not set</div><div class='ctx'> # CONFIG_CARDMAN_4000 is not set</div><div class='ctx'> # CONFIG_CARDMAN_4040 is not set</div><div class='add'>+# CONFIG_IPWIRELESS is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# TPM devices</div><div class='del'>-#</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# I2C support</div><div class='del'>-#</div><div class='add'>+CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Dallas's 1-wire bus</div><div class='del'>-#</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Hardware Monitoring support</div><div class='del'>-#</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='del'>-# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_I5K_AMB is not set</div><div class='ctx'> # CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_F71882FG is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_SIS5595 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_VIA686A is not set</div><div class='ctx'> # CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_VT8231 is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='del'>-CONFIG_VIDEO_DEV=m</div><div class='del'>-CONFIG_VIDEO_V4L1=y</div><div class='del'>-CONFIG_VIDEO_V4L1_COMPAT=y</div><div class='del'>-CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Video Capture Adapters</div><div class='add'>+# Multimedia core support</div><div class='ctx'> #</div><div class='add'>+CONFIG_VIDEO_DEV=m</div><div class='add'>+CONFIG_VIDEO_V4L2_COMMON=m</div><div class='add'>+CONFIG_VIDEO_ALLOW_V4L1=y</div><div class='add'>+CONFIG_VIDEO_V4L1_COMPAT=y</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+CONFIG_VIDEO_MEDIA=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Video Capture Adapters</div><div class='add'>+# Multimedia drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MEDIA_ATTACH is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=m</div><div class='add'>+CONFIG_VIDEO_V4L1=m</div><div class='add'>+CONFIG_VIDEO_CAPTURE_DRIVERS=y</div><div class='ctx'> # CONFIG_VIDEO_ADV_DEBUG is not set</div><div class='ctx'> CONFIG_VIDEO_HELPER_CHIPS_AUTO=y</div><div class='ctx'> # CONFIG_VIDEO_VIVI is not set</div><div class='del'>-# CONFIG_VIDEO_PMS is not set</div><div class='ctx'> # CONFIG_VIDEO_CPIA is not set</div><div class='ctx'> # CONFIG_VIDEO_CPIA2 is not set</div><div class='del'>-# CONFIG_VIDEO_STRADIS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# V4L USB devices</div><div class='del'>-#</div><div class='add'>+CONFIG_V4L_USB_DRIVERS=y</div><div class='add'>+# CONFIG_USB_VIDEO_CLASS is not set</div><div class='add'>+# CONFIG_USB_GSPCA is not set</div><div class='ctx'> CONFIG_VIDEO_USBVIDEO=m</div><div class='ctx'> CONFIG_USB_VICAM=m</div><div class='ctx'> CONFIG_USB_IBMCAM=m</div><div class='hunk'>@@ -975,106 +881,100 @@ CONFIG_USB_STV680=m</div><div class='ctx'> # CONFIG_USB_ZC0301 is not set</div><div class='ctx'> CONFIG_USB_PWC=m</div><div class='ctx'> # CONFIG_USB_PWC_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Radio Adapters</div><div class='del'>-#</div><div class='del'>-# CONFIG_RADIO_CADET is not set</div><div class='del'>-# CONFIG_RADIO_RTRACK is not set</div><div class='del'>-# CONFIG_RADIO_RTRACK2 is not set</div><div class='del'>-# CONFIG_RADIO_AZTECH is not set</div><div class='del'>-# CONFIG_RADIO_GEMTEK is not set</div><div class='add'>+# CONFIG_USB_ZR364XX is not set</div><div class='add'>+# CONFIG_USB_STKWEBCAM is not set</div><div class='add'>+# CONFIG_USB_S2255 is not set</div><div class='add'>+# CONFIG_SOC_CAMERA is not set</div><div class='add'>+# CONFIG_VIDEO_SH_MOBILE_CEU is not set</div><div class='add'>+CONFIG_RADIO_ADAPTERS=y</div><div class='ctx'> # CONFIG_RADIO_GEMTEK_PCI is not set</div><div class='ctx'> # CONFIG_RADIO_MAXIRADIO is not set</div><div class='ctx'> # CONFIG_RADIO_MAESTRO is not set</div><div class='del'>-# CONFIG_RADIO_SF16FMI is not set</div><div class='del'>-# CONFIG_RADIO_SF16FMR2 is not set</div><div class='del'>-# CONFIG_RADIO_TERRATEC is not set</div><div class='del'>-# CONFIG_RADIO_TRUST is not set</div><div class='del'>-# CONFIG_RADIO_TYPHOON is not set</div><div class='del'>-# CONFIG_RADIO_ZOLTRIX is not set</div><div class='ctx'> CONFIG_USB_DSBR=m</div><div class='add'>+# CONFIG_USB_SI470X is not set</div><div class='add'>+# CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Digital Video Broadcasting Devices</div><div class='add'>+# Graphics support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_DVB is not set</div><div class='del'>-CONFIG_USB_DABUSB=m</div><div class='add'>+# CONFIG_DRM is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Graphics support</div><div class='add'>+# Display device support</div><div class='ctx'> #</div><div class='del'>-CONFIG_FIRMWARE_EDID=y</div><div class='del'>-# CONFIG_FB is not set</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Console display driver support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_MDA_CONSOLE is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> CONFIG_FONT_8x16=y</div><div class='del'>-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND is not set</div><div class='add'>+CONFIG_SOUND_PRIME=m</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+# CONFIG_HID_DEBUG is not set</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Open Sound System</div><div class='add'>+# USB Input Devices</div><div class='ctx'> #</div><div class='del'>-CONFIG_SOUND_PRIME=m</div><div class='del'>-# CONFIG_OSS_OBSOLETE_DRIVER is not set</div><div class='del'>-# CONFIG_SOUND_BT878 is not set</div><div class='del'>-# CONFIG_SOUND_ES1371 is not set</div><div class='del'>-# CONFIG_SOUND_ICH is not set</div><div class='del'>-# CONFIG_SOUND_TRIDENT is not set</div><div class='del'>-# CONFIG_SOUND_MSNDCLAS is not set</div><div class='del'>-# CONFIG_SOUND_MSNDPIN is not set</div><div class='del'>-# CONFIG_SOUND_VIA82CXXX is not set</div><div class='add'>+CONFIG_USB_HID=m</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# USB support</div><div class='add'>+# USB HID Boot Protocol drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_USB_KBD is not set</div><div class='add'>+# CONFIG_USB_MOUSE is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> CONFIG_USB=y</div><div class='ctx'> # CONFIG_USB_DEBUG is not set</div><div class='add'>+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous USB options</div><div class='ctx'> #</div><div class='ctx'> CONFIG_USB_DEVICEFS=y</div><div class='del'>-# CONFIG_USB_BANDWIDTH is not set</div><div class='add'>+CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='del'>-# CONFIG_USB_MULTITHREAD_PROBE is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='ctx'> CONFIG_USB_EHCI_HCD=y</div><div class='del'>-# CONFIG_USB_EHCI_SPLIT_ISO is not set</div><div class='ctx'> # CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='ctx'> # CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='del'>-# CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='ctx'> CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> # CONFIG_USB_UHCI_HCD is not set</div><div class='ctx'> # CONFIG_USB_SL811_HCD is not set</div><div class='add'>+# CONFIG_USB_R8A66597_HCD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Device Class drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> CONFIG_USB_PRINTER=m</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -1094,66 +994,28 @@ CONFIG_USB_STORAGE_SDDR09=y</div><div class='ctx'> CONFIG_USB_STORAGE_SDDR55=y</div><div class='ctx'> CONFIG_USB_STORAGE_JUMPSHOT=y</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# USB Input Devices</div><div class='del'>-#</div><div class='del'>-CONFIG_USB_HID=m</div><div class='del'>-CONFIG_USB_HIDINPUT=y</div><div class='del'>-# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='del'>-# CONFIG_HID_FF is not set</div><div class='del'>-# CONFIG_USB_HIDDEV is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB HID Boot Protocol drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_KBD is not set</div><div class='del'>-# CONFIG_USB_MOUSE is not set</div><div class='del'>-# CONFIG_USB_AIPTEK is not set</div><div class='del'>-# CONFIG_USB_WACOM is not set</div><div class='del'>-# CONFIG_USB_ACECAD is not set</div><div class='del'>-# CONFIG_USB_KBTAB is not set</div><div class='del'>-# CONFIG_USB_POWERMATE is not set</div><div class='del'>-# CONFIG_USB_TOUCHSCREEN is not set</div><div class='del'>-# CONFIG_USB_YEALINK is not set</div><div class='del'>-# CONFIG_USB_XPAD is not set</div><div class='del'>-# CONFIG_USB_ATI_REMOTE is not set</div><div class='del'>-# CONFIG_USB_ATI_REMOTE2 is not set</div><div class='del'>-# CONFIG_USB_KEYSPAN_REMOTE is not set</div><div class='del'>-# CONFIG_USB_APPLETOUCH is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # USB Imaging devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Network Adapters</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_CATC is not set</div><div class='del'>-# CONFIG_USB_KAWETH is not set</div><div class='del'>-CONFIG_USB_PEGASUS=m</div><div class='del'>-CONFIG_USB_RTL8150=m</div><div class='del'>-# CONFIG_USB_USBNET_MII is not set</div><div class='del'>-# CONFIG_USB_USBNET is not set</div><div class='ctx'> CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='ctx'> #</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Serial Converter support</div><div class='del'>-#</div><div class='ctx'> CONFIG_USB_SERIAL=m</div><div class='add'>+# CONFIG_USB_EZUSB is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_GENERIC is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_AIRCABLE is not set</div><div class='del'>-# CONFIG_USB_SERIAL_AIRPRIME is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_ARK3116 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_BELKIN is not set</div><div class='add'>+# CONFIG_USB_SERIAL_CH341 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_WHITEHEAT is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_CP2101 is not set</div><div class='hunk'>@@ -1168,6 +1030,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m</div><div class='ctx'> # CONFIG_USB_SERIAL_EDGEPORT_TI is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_GARMIN is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_IPW is not set</div><div class='add'>+# CONFIG_USB_SERIAL_IUU is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_KEYSPAN is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_KLSI is not set</div><div class='hunk'>@@ -1175,8 +1038,11 @@ CONFIG_USB_SERIAL_FTDI_SIO=m</div><div class='ctx'> # CONFIG_USB_SERIAL_MCT_U232 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_MOS7720 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_MOS7840 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_MOTOROLA is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_NAVMAN is not set</div><div class='ctx'> CONFIG_USB_SERIAL_PL2303=m</div><div class='add'>+# CONFIG_USB_SERIAL_OTI6858 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_SPCP8X5 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_HP4X is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_SAFE is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set</div><div class='hunk'>@@ -1197,6 +1063,7 @@ CONFIG_USB_EMI26=m</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='ctx'> # CONFIG_USB_LED is not set</div><div class='ctx'> # CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='ctx'> # CONFIG_USB_CYTHERM is not set</div><div class='hunk'>@@ -1208,61 +1075,18 @@ CONFIG_USB_SISUSBVGA=m</div><div class='ctx'> CONFIG_USB_SISUSBVGA_CON=y</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB DSL modem support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Gadget Support</div><div class='del'>-#</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# MMC/SD Card support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# LED devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# LED drivers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# LED Triggers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# InfiniBand support</div><div class='del'>-#</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Real Time Clock</div><div class='del'>-#</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Engine support</div><div class='del'>-#</div><div class='del'>-# CONFIG_DMA_ENGINE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Clients</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='hunk'>@@ -1276,7 +1100,6 @@ CONFIG_EXT3_FS_XATTR=y</div><div class='ctx'> # CONFIG_EXT3_FS_SECURITY is not set</div><div class='ctx'> # CONFIG_EXT4DEV_FS is not set</div><div class='ctx'> CONFIG_JBD=y</div><div class='del'>-# CONFIG_JBD_DEBUG is not set</div><div class='ctx'> CONFIG_FS_MBCACHE=y</div><div class='ctx'> CONFIG_REISERFS_FS=y</div><div class='ctx'> # CONFIG_REISERFS_CHECK is not set</div><div class='hunk'>@@ -1285,14 +1108,11 @@ CONFIG_REISERFS_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='del'>-# CONFIG_MINIX_FS is not set</div><div class='del'>-CONFIG_ROMFS_FS=y</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='del'>-CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='ctx'> # CONFIG_FUSE_FS is not set</div><div class='hunk'>@@ -1328,7 +1148,6 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_TMPFS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_HUGETLBFS is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE is not set</div><div class='del'>-CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_CONFIGFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1343,26 +1162,24 @@ CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='add'>+CONFIG_ROMFS_FS=y</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> CONFIG_UFS_FS=m</div><div class='ctx'> # CONFIG_UFS_FS_WRITE is not set</div><div class='ctx'> # CONFIG_UFS_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Network File Systems</div><div class='del'>-#</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=m</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='ctx'> CONFIG_NFSD=m</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_NFSD_TCP=y</div><div class='ctx'> CONFIG_LOCKD=m</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=m</div><div class='hunk'>@@ -1376,17 +1193,12 @@ CONFIG_SMB_FS=m</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='del'>-# CONFIG_9P_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Partition Types</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARTITION_ADVANCED is not set</div><div class='ctx'> CONFIG_MSDOS_PARTITION=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Native Language Support</div><div class='del'>-#</div><div class='ctx'> CONFIG_NLS=y</div><div class='ctx'> CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> CONFIG_NLS_CODEPAGE_437=y</div><div class='hunk'>@@ -1427,46 +1239,128 @@ CONFIG_NLS_CODEPAGE_932=y</div><div class='ctx'> # CONFIG_NLS_KOI8_R is not set</div><div class='ctx'> # CONFIG_NLS_KOI8_U is not set</div><div class='ctx'> # CONFIG_NLS_UTF8 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Profiling support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_DLM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='ctx'> #</div><div class='ctx'> CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='del'>-# CONFIG_DEBUG_KERNEL is not set</div><div class='del'>-CONFIG_LOG_BUF_SHIFT=14</div><div class='del'>-# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='ctx'> CONFIG_SH_STANDARD_BIOS=y</div><div class='ctx'> # CONFIG_EARLY_SCIF_CONSOLE is not set</div><div class='ctx'> # CONFIG_EARLY_PRINTK is not set</div><div class='del'>-# CONFIG_KGDB is not set</div><div class='add'>+# CONFIG_SH_KGDB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_KEYS is not set</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_MANAGER is not set</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CBC is not set</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+# CONFIG_CRYPTO_ECB is not set</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+# CONFIG_CRYPTO_MD5 is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_DES is not set</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Cryptographic options</div><div class='add'>+# Compression</div><div class='ctx'> #</div><div class='del'>-# CONFIG_CRYPTO is not set</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='add'>+# CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/sh/configs/lboxre2_defconfig b/arch/sh/configs/lboxre2_defconfig<br/>index b68b6cdbb78f..aecdfd33c695 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/lboxre2_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/lboxre2_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/lboxre2_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/lboxre2_defconfig</a></div><div class='hunk'>@@ -1,9 +1,11 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.21-rc4</div><div class='del'>-# Sat Mar 24 22:04:27 2007</div><div class='add'>+# Linux kernel version: 2.6.26</div><div class='add'>+# Wed Jul 30 01:39:41 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='add'>+CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='hunk'>@@ -11,37 +13,40 @@ CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='del'>-# CONFIG_GENERIC_TIME is not set</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_PCI=y</div><div class='ctx'> CONFIG_STACKTRACE_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_ARCH_NO_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Code maturity level options</div><div class='add'>+# General setup</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXPERIMENTAL=y</div><div class='ctx'> CONFIG_BROKEN_ON_SMP=y</div><div class='ctx'> CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# General setup</div><div class='del'>-#</div><div class='ctx'> CONFIG_LOCALVERSION=""</div><div class='ctx'> CONFIG_LOCALVERSION_AUTO=y</div><div class='ctx'> CONFIG_SWAP=y</div><div class='ctx'> CONFIG_SYSVIPC=y</div><div class='del'>-# CONFIG_IPC_NS is not set</div><div class='ctx'> CONFIG_SYSVIPC_SYSCTL=y</div><div class='ctx'> # CONFIG_POSIX_MQUEUE is not set</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT is not set</div><div class='ctx'> # CONFIG_TASKSTATS is not set</div><div class='del'>-# CONFIG_UTS_NS is not set</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='ctx'> # CONFIG_BLK_DEV_INITRD is not set</div><div class='ctx'> CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='hunk'>@@ -54,34 +59,48 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='del'>-CONFIG_SLAB=y</div><div class='ctx'> CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+# CONFIG_HAVE_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='del'>-# CONFIG_SLOB is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Loadable module support</div><div class='del'>-#</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='ctx'> CONFIG_KMOD=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Block layer</div><div class='del'>-#</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -95,66 +114,26 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_CFQ is not set</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # System type</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SH_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_7751_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_7300_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_7343_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_73180_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_7751_SYSTEMH is not set</div><div class='del'>-# CONFIG_SH_HP6XX is not set</div><div class='del'>-# CONFIG_SH_SATURN is not set</div><div class='del'>-# CONFIG_SH_DREAMCAST is not set</div><div class='del'>-# CONFIG_SH_MPC1211 is not set</div><div class='del'>-# CONFIG_SH_SH03 is not set</div><div class='del'>-# CONFIG_SH_SECUREEDGE5410 is not set</div><div class='del'>-# CONFIG_SH_HS7751RVOIP is not set</div><div class='del'>-# CONFIG_SH_7710VOIPGW is not set</div><div class='del'>-# CONFIG_SH_RTS7751R2D is not set</div><div class='del'>-# CONFIG_SH_HIGHLANDER is not set</div><div class='del'>-# CONFIG_SH_EDOSK7705 is not set</div><div class='del'>-# CONFIG_SH_SH4202_MICRODEV is not set</div><div class='del'>-# CONFIG_SH_LANDISK is not set</div><div class='del'>-# CONFIG_SH_TITAN is not set</div><div class='del'>-# CONFIG_SH_SHMIN is not set</div><div class='del'>-# CONFIG_SH_7206_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_7619_SOLUTION_ENGINE is not set</div><div class='del'>-CONFIG_SH_LBOX_RE2=y</div><div class='del'>-# CONFIG_SH_UNKNOWN is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Processor selection</div><div class='del'>-#</div><div class='ctx'> CONFIG_CPU_SH4=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH-2 Processor Support</div><div class='del'>-#</div><div class='del'>-# CONFIG_CPU_SUBTYPE_SH7604 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7619 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH-2A Processor Support</div><div class='del'>-#</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7203 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7206 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH-3 Processor Support</div><div class='del'>-#</div><div class='del'>-# CONFIG_CPU_SUBTYPE_SH7300 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7263 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_MXG is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7705 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7706 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7707 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7708 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7709 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7710 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH-4 Processor Support</div><div class='del'>-#</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7712 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7720 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7721 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7750 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7091 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7750R is not set</div><div class='hunk'>@@ -163,55 +142,60 @@ CONFIG_CPU_SH4=y</div><div class='ctx'> CONFIG_CPU_SUBTYPE_SH7751R=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7760 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH4_202 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ST40 Processor Support</div><div class='del'>-#</div><div class='del'>-# CONFIG_CPU_SUBTYPE_ST40STB1 is not set</div><div class='del'>-# CONFIG_CPU_SUBTYPE_ST40GX1 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH-4A Processor Support</div><div class='del'>-#</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7723 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7763 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7770 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7780 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7785 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH4AL-DSP Processor Support</div><div class='del'>-#</div><div class='del'>-# CONFIG_CPU_SUBTYPE_SH73180 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SHX3 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7343 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7722 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7366 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH5_101 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH5_103 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Memory management options</div><div class='ctx'> #</div><div class='add'>+CONFIG_QUICKLIST=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='ctx'> CONFIG_PAGE_OFFSET=0x80000000</div><div class='ctx'> CONFIG_MEMORY_START=0x0c000000</div><div class='ctx'> CONFIG_MEMORY_SIZE=0x04000000</div><div class='add'>+CONFIG_29BIT=y</div><div class='ctx'> CONFIG_VSYSCALL=y</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_ARCH_SPARSEMEM_ENABLE=y</div><div class='add'>+CONFIG_ARCH_SPARSEMEM_DEFAULT=y</div><div class='add'>+CONFIG_MAX_ACTIVE_REGIONS=1</div><div class='add'>+CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='add'>+CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_MANUAL is not set</div><div class='ctx'> CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='del'>-# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPARSEMEM_STATIC=y</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=0</div><div class='add'>+CONFIG_NR_QUICK=2</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Cache configuration</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SH_DIRECT_MAPPED is not set</div><div class='del'>-# CONFIG_SH_WRITETHROUGH is not set</div><div class='del'>-# CONFIG_SH_OCRAM is not set</div><div class='add'>+CONFIG_CACHE_WRITEBACK=y</div><div class='add'>+# CONFIG_CACHE_WRITETHROUGH is not set</div><div class='add'>+# CONFIG_CACHE_OFF is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Processor features</div><div class='hunk'>@@ -219,12 +203,21 @@ CONFIG_ZONE_DMA_FLAG=0</div><div class='ctx'> CONFIG_CPU_LITTLE_ENDIAN=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='ctx'> CONFIG_SH_FPU=y</div><div class='del'>-# CONFIG_SH_DSP is not set</div><div class='ctx'> # CONFIG_SH_STORE_QUEUES is not set</div><div class='ctx'> CONFIG_CPU_HAS_INTEVT=y</div><div class='del'>-CONFIG_CPU_HAS_INTC_IRQ=y</div><div class='ctx'> CONFIG_CPU_HAS_SR_RB=y</div><div class='ctx'> CONFIG_CPU_HAS_PTEA=y</div><div class='add'>+CONFIG_CPU_HAS_FPU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Board support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SH_7751_SYSTEMH is not set</div><div class='add'>+# CONFIG_SH_SECUREEDGE5410 is not set</div><div class='add'>+# CONFIG_SH_RTS7751R2D is not set</div><div class='add'>+# CONFIG_SH_LANDISK is not set</div><div class='add'>+# CONFIG_SH_TITAN is not set</div><div class='add'>+CONFIG_SH_LBOX_RE2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Timer and clock configuration</div><div class='hunk'>@@ -232,6 +225,10 @@ CONFIG_CPU_HAS_PTEA=y</div><div class='ctx'> CONFIG_SH_TMU=y</div><div class='ctx'> CONFIG_SH_TIMER_IRQ=16</div><div class='ctx'> CONFIG_SH_PCLK_FREQ=40000000</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CPU Frequency scaling</div><div class='hunk'>@@ -246,7 +243,6 @@ CONFIG_SH_PCLK_FREQ=40000000</div><div class='ctx'> #</div><div class='ctx'> # Companion Chips</div><div class='ctx'> #</div><div class='del'>-# CONFIG_HD6446X_SERIES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Additional SuperH Device Drivers</div><div class='hunk'>@@ -262,11 +258,14 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='del'>-# CONFIG_SMP is not set</div><div class='add'>+# CONFIG_CRASH_DUMP is not set</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_GUSA=y</div><div class='add'>+# CONFIG_GUSA_RB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Boot options</div><div class='hunk'>@@ -280,15 +279,12 @@ CONFIG_CMDLINE="console=ttySC1,115200 root=/dev/sda1"</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='del'>-CONFIG_ISA=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_SH_PCIDMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_PCI_AUTO=y</div><div class='ctx'> CONFIG_PCI_AUTO_UPDATE_RESOURCES=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCCARD (PCMCIA/CardBus) support</div><div class='del'>-#</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='add'>+CONFIG_PCI_LEGACY=y</div><div class='ctx'> CONFIG_PCCARD=y</div><div class='ctx'> CONFIG_PCMCIA_DEBUG=y</div><div class='ctx'> CONFIG_PCMCIA=y</div><div class='hunk'>@@ -306,29 +302,16 @@ CONFIG_YENTA_O2=y</div><div class='ctx'> # CONFIG_YENTA_TOSHIBA is not set</div><div class='ctx'> # CONFIG_PD6729 is not set</div><div class='ctx'> # CONFIG_I82092 is not set</div><div class='del'>-# CONFIG_I82365 is not set</div><div class='del'>-# CONFIG_TCIC is not set</div><div class='del'>-CONFIG_PCMCIA_PROBE=y</div><div class='ctx'> CONFIG_PCCARD_NONSTATIC=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI Hotplug Support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_HOTPLUG_PCI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Executable file formats</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='del'>-# CONFIG_BINFMT_FLAT is not set</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Power management options (EXPERIMENTAL)</div><div class='del'>-#</div><div class='del'>-# CONFIG_PM is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # Networking</div><div class='ctx'> #</div><div class='ctx'> CONFIG_NET=y</div><div class='hunk'>@@ -336,7 +319,6 @@ CONFIG_NET=y</div><div class='ctx'> #</div><div class='ctx'> # Networking options</div><div class='ctx'> #</div><div class='del'>-# CONFIG_NETDEBUG is not set</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> # CONFIG_PACKET_MMAP is not set</div><div class='ctx'> CONFIG_UNIX=y</div><div class='hunk'>@@ -344,6 +326,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> # CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> # CONFIG_IP_MULTICAST is not set</div><div class='hunk'>@@ -370,29 +353,26 @@ CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='ctx'> CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IP: Virtual Server Configuration</div><div class='del'>-#</div><div class='ctx'> # CONFIG_IP_VS is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='add'>+CONFIG_NETFILTER_ADVANCED=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Core Netfilter Configuration</div><div class='ctx'> #</div><div class='del'>-# CONFIG_NETFILTER_NETLINK is not set</div><div class='del'>-# CONFIG_NF_CONNTRACK_ENABLED is not set</div><div class='add'>+# CONFIG_NETFILTER_NETLINK_QUEUE is not set</div><div class='add'>+# CONFIG_NETFILTER_NETLINK_LOG is not set</div><div class='add'>+# CONFIG_NF_CONNTRACK is not set</div><div class='ctx'> # CONFIG_NETFILTER_XTABLES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -401,20 +381,8 @@ CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_IP_NF_QUEUE is not set</div><div class='ctx'> # CONFIG_IP_NF_IPTABLES is not set</div><div class='ctx'> # CONFIG_IP_NF_ARPTABLES is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DCCP Configuration (EXPERIMENTAL)</div><div class='del'>-#</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SCTP Configuration (EXPERIMENTAL)</div><div class='del'>-#</div><div class='ctx'> # CONFIG_IP_SCTP is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# TIPC Configuration (EXPERIMENTAL)</div><div class='del'>-#</div><div class='ctx'> # CONFIG_TIPC is not set</div><div class='ctx'> # CONFIG_ATM is not set</div><div class='ctx'> # CONFIG_BRIDGE is not set</div><div class='hunk'>@@ -427,10 +395,6 @@ CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_LAPB is not set</div><div class='ctx'> # CONFIG_ECONET is not set</div><div class='ctx'> # CONFIG_WAN_ROUTER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# QoS and/or fair queueing</div><div class='del'>-#</div><div class='ctx'> # CONFIG_NET_SCHED is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -438,9 +402,20 @@ CONFIG_NETFILTER=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_PKTGEN is not set</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='ctx'> # CONFIG_IRDA is not set</div><div class='ctx'> # CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='ctx'> # CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Device Drivers</div><div class='hunk'>@@ -449,36 +424,17 @@ CONFIG_NETFILTER=y</div><div class='ctx'> #</div><div class='ctx'> # Generic Driver Options</div><div class='ctx'> #</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='del'>-#</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Memory Technology Devices (MTD)</div><div class='del'>-#</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Parallel port support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Plug and Play support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PNP is not set</div><div class='del'>-# CONFIG_PNPACPI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Block devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DAC960 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_UMEM is not set</div><div class='hunk'>@@ -490,19 +446,18 @@ CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='del'>-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Misc devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_PHANTOM is not set</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ATA/ATAPI/MFM/RLL support</div><div class='del'>-#</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -510,6 +465,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_RAID_ATTRS is not set</div><div class='ctx'> CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='ctx'> # CONFIG_SCSI_TGT is not set</div><div class='ctx'> # CONFIG_SCSI_NETLINK is not set</div><div class='ctx'> CONFIG_SCSI_PROC_FS=y</div><div class='hunk'>@@ -531,6 +487,7 @@ CONFIG_BLK_DEV_SD=y</div><div class='ctx'> # CONFIG_SCSI_CONSTANTS is not set</div><div class='ctx'> # CONFIG_SCSI_LOGGING is not set</div><div class='ctx'> # CONFIG_SCSI_SCAN_ASYNC is not set</div><div class='add'>+CONFIG_SCSI_WAIT_SCAN=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI Transports</div><div class='hunk'>@@ -538,71 +495,49 @@ CONFIG_BLK_DEV_SD=y</div><div class='ctx'> # CONFIG_SCSI_SPI_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_FC_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='del'>-# CONFIG_SCSI_SAS_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SCSI low-level drivers</div><div class='del'>-#</div><div class='add'>+# CONFIG_SCSI_SRP_ATTRS is not set</div><div class='add'>+CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_ISCSI_TCP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_3W_XXXX_RAID is not set</div><div class='ctx'> # CONFIG_SCSI_3W_9XXX is not set</div><div class='ctx'> # CONFIG_SCSI_ACARD is not set</div><div class='del'>-# CONFIG_SCSI_AHA152X is not set</div><div class='ctx'> # CONFIG_SCSI_AACRAID is not set</div><div class='ctx'> # CONFIG_SCSI_AIC7XXX is not set</div><div class='ctx'> # CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='ctx'> # CONFIG_SCSI_AIC79XX is not set</div><div class='ctx'> # CONFIG_SCSI_AIC94XX is not set</div><div class='del'>-# CONFIG_SCSI_DPT_I2O is not set</div><div class='del'>-# CONFIG_SCSI_IN2000 is not set</div><div class='ctx'> # CONFIG_SCSI_ARCMSR is not set</div><div class='ctx'> # CONFIG_MEGARAID_NEWGEN is not set</div><div class='ctx'> # CONFIG_MEGARAID_LEGACY is not set</div><div class='ctx'> # CONFIG_MEGARAID_SAS is not set</div><div class='ctx'> # CONFIG_SCSI_HPTIOP is not set</div><div class='ctx'> # CONFIG_SCSI_DMX3191D is not set</div><div class='del'>-# CONFIG_SCSI_DTC3280 is not set</div><div class='ctx'> # CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='del'>-# CONFIG_SCSI_GENERIC_NCR5380 is not set</div><div class='del'>-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='ctx'> # CONFIG_SCSI_INITIO is not set</div><div class='ctx'> # CONFIG_SCSI_INIA100 is not set</div><div class='del'>-# CONFIG_SCSI_NCR53C406A is not set</div><div class='add'>+# CONFIG_SCSI_MVSAS is not set</div><div class='ctx'> # CONFIG_SCSI_STEX is not set</div><div class='ctx'> # CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='ctx'> # CONFIG_SCSI_IPR is not set</div><div class='del'>-# CONFIG_SCSI_PAS16 is not set</div><div class='del'>-# CONFIG_SCSI_PSI240I is not set</div><div class='del'>-# CONFIG_SCSI_QLOGIC_FAS is not set</div><div class='ctx'> # CONFIG_SCSI_QLOGIC_1280 is not set</div><div class='ctx'> # CONFIG_SCSI_QLA_FC is not set</div><div class='ctx'> # CONFIG_SCSI_QLA_ISCSI is not set</div><div class='ctx'> # CONFIG_SCSI_LPFC is not set</div><div class='del'>-# CONFIG_SCSI_SYM53C416 is not set</div><div class='ctx'> # CONFIG_SCSI_DC395x is not set</div><div class='ctx'> # CONFIG_SCSI_DC390T is not set</div><div class='del'>-# CONFIG_SCSI_T128 is not set</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCMCIA SCSI adapter support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PCMCIA_AHA152X is not set</div><div class='del'>-# CONFIG_PCMCIA_FDOMAIN is not set</div><div class='del'>-# CONFIG_PCMCIA_NINJA_SCSI is not set</div><div class='del'>-# CONFIG_PCMCIA_QLOGIC is not set</div><div class='del'>-# CONFIG_PCMCIA_SYM53C500 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Serial ATA (prod) and Parallel ATA (experimental) drivers</div><div class='del'>-#</div><div class='add'>+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='add'>+CONFIG_SATA_PMP=y</div><div class='ctx'> # CONFIG_SATA_AHCI is not set</div><div class='add'>+# CONFIG_SATA_SIL24 is not set</div><div class='add'>+CONFIG_ATA_SFF=y</div><div class='ctx'> # CONFIG_SATA_SVW is not set</div><div class='ctx'> # CONFIG_ATA_PIIX is not set</div><div class='ctx'> # CONFIG_SATA_MV is not set</div><div class='hunk'>@@ -612,7 +547,6 @@ CONFIG_ATA=y</div><div class='ctx'> # CONFIG_SATA_PROMISE is not set</div><div class='ctx'> # CONFIG_SATA_SX4 is not set</div><div class='ctx'> # CONFIG_SATA_SIL is not set</div><div class='del'>-# CONFIG_SATA_SIL24 is not set</div><div class='ctx'> # CONFIG_SATA_SIS is not set</div><div class='ctx'> # CONFIG_SATA_ULI is not set</div><div class='ctx'> # CONFIG_SATA_VIA is not set</div><div class='hunk'>@@ -622,6 +556,7 @@ CONFIG_ATA=y</div><div class='ctx'> # CONFIG_PATA_AMD is not set</div><div class='ctx'> # CONFIG_PATA_ARTOP is not set</div><div class='ctx'> # CONFIG_PATA_ATIIXP is not set</div><div class='add'>+# CONFIG_PATA_CMD640_PCI is not set</div><div class='ctx'> # CONFIG_PATA_CMD64X is not set</div><div class='ctx'> # CONFIG_PATA_CS5520 is not set</div><div class='ctx'> # CONFIG_PATA_CS5530 is not set</div><div class='hunk'>@@ -635,18 +570,18 @@ CONFIG_ATA=y</div><div class='ctx'> # CONFIG_PATA_IT821X is not set</div><div class='ctx'> # CONFIG_PATA_IT8213 is not set</div><div class='ctx'> # CONFIG_PATA_JMICRON is not set</div><div class='del'>-# CONFIG_PATA_LEGACY is not set</div><div class='ctx'> # CONFIG_PATA_TRIFLEX is not set</div><div class='ctx'> # CONFIG_PATA_MARVELL is not set</div><div class='ctx'> # CONFIG_PATA_MPIIX is not set</div><div class='ctx'> # CONFIG_PATA_OLDPIIX is not set</div><div class='ctx'> # CONFIG_PATA_NETCELL is not set</div><div class='add'>+# CONFIG_PATA_NINJA32 is not set</div><div class='ctx'> # CONFIG_PATA_NS87410 is not set</div><div class='add'>+# CONFIG_PATA_NS87415 is not set</div><div class='ctx'> # CONFIG_PATA_OPTI is not set</div><div class='ctx'> # CONFIG_PATA_OPTIDMA is not set</div><div class='ctx'> # CONFIG_PATA_PCMCIA is not set</div><div class='ctx'> # CONFIG_PATA_PDC_OLD is not set</div><div class='del'>-# CONFIG_PATA_QDI is not set</div><div class='ctx'> # CONFIG_PATA_RADISYS is not set</div><div class='ctx'> # CONFIG_PATA_RZ1000 is not set</div><div class='ctx'> # CONFIG_PATA_SC1200 is not set</div><div class='hunk'>@@ -656,88 +591,52 @@ CONFIG_ATA=y</div><div class='ctx'> # CONFIG_PATA_SIS is not set</div><div class='ctx'> # CONFIG_PATA_VIA is not set</div><div class='ctx'> # CONFIG_PATA_WINBOND is not set</div><div class='del'>-# CONFIG_PATA_WINBOND_VLB is not set</div><div class='ctx'> CONFIG_PATA_PLATFORM=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Old CD-ROM drivers (not SCSI, not IDE)</div><div class='del'>-#</div><div class='del'>-# CONFIG_CD_NO_IDESCSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Multi-device support (RAID and LVM)</div><div class='del'>-#</div><div class='add'>+# CONFIG_PATA_SCH is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Fusion MPT device support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='del'>-# CONFIG_FUSION_SPI is not set</div><div class='del'>-# CONFIG_FUSION_FC is not set</div><div class='del'>-# CONFIG_FUSION_SAS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_IEEE1394 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# I2O device support</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIREWIRE is not set</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Network device support</div><div class='del'>-#</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ARCnet devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_VETH is not set</div><div class='ctx'> # CONFIG_ARCNET is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PHY device support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_PHYLIB is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Ethernet (10 or 100Mbit)</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='ctx'> # CONFIG_STNIC is not set</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='ctx'> # CONFIG_SUNGEM is not set</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_3COM is not set</div><div class='del'>-# CONFIG_NET_VENDOR_SMC is not set</div><div class='ctx'> # CONFIG_SMC91X is not set</div><div class='del'>-# CONFIG_NET_VENDOR_RACAL is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Tulip family network device support</div><div class='del'>-#</div><div class='add'>+# CONFIG_SMC911X is not set</div><div class='ctx'> # CONFIG_NET_TULIP is not set</div><div class='del'>-# CONFIG_AT1700 is not set</div><div class='del'>-# CONFIG_DEPCA is not set</div><div class='ctx'> # CONFIG_HP100 is not set</div><div class='del'>-# CONFIG_NET_ISA is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='ctx'> CONFIG_NET_PCI=y</div><div class='ctx'> # CONFIG_PCNET32 is not set</div><div class='ctx'> # CONFIG_AMD8111_ETH is not set</div><div class='ctx'> # CONFIG_ADAPTEC_STARFIRE is not set</div><div class='del'>-# CONFIG_AC3200 is not set</div><div class='del'>-# CONFIG_APRICOT is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='ctx'> # CONFIG_FORCEDETH is not set</div><div class='del'>-# CONFIG_CS89x0 is not set</div><div class='del'>-# CONFIG_DGRS is not set</div><div class='ctx'> # CONFIG_EEPRO100 is not set</div><div class='ctx'> # CONFIG_E100 is not set</div><div class='ctx'> # CONFIG_FEALNX is not set</div><div class='hunk'>@@ -749,19 +648,20 @@ CONFIG_8139TOO_PIO=y</div><div class='ctx'> CONFIG_8139TOO_TUNE_TWISTER=y</div><div class='ctx'> # CONFIG_8139TOO_8129 is not set</div><div class='ctx'> # CONFIG_8139_OLD_RX_RESET is not set</div><div class='add'>+# CONFIG_R6040 is not set</div><div class='ctx'> # CONFIG_SIS900 is not set</div><div class='ctx'> # CONFIG_EPIC100 is not set</div><div class='ctx'> # CONFIG_SUNDANCE is not set</div><div class='ctx'> # CONFIG_TLAN is not set</div><div class='ctx'> # CONFIG_VIA_RHINE is not set</div><div class='ctx'> # CONFIG_SC92031 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Ethernet (1000 Mbit)</div><div class='del'>-#</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_ACENIC is not set</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='add'>+# CONFIG_E1000E is not set</div><div class='add'>+# CONFIG_IP1000 is not set</div><div class='add'>+# CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='ctx'> # CONFIG_HAMACHI is not set</div><div class='ctx'> # CONFIG_YELLOWFIN is not set</div><div class='hunk'>@@ -769,36 +669,33 @@ CONFIG_8139TOO_TUNE_TWISTER=y</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Ethernet (10000 Mbit)</div><div class='del'>-#</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='add'>+# CONFIG_IXGBE is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='ctx'> # CONFIG_MYRI10GE is not set</div><div class='ctx'> # CONFIG_NETXEN_NIC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Token Ring devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_NIU is not set</div><div class='add'>+# CONFIG_MLX4_CORE is not set</div><div class='add'>+# CONFIG_TEHUTI is not set</div><div class='add'>+# CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Wireless LAN (non-hamradio)</div><div class='del'>-#</div><div class='del'>-# CONFIG_NET_RADIO is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCMCIA network device support</div><div class='add'>+# Wireless LAN</div><div class='ctx'> #</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> CONFIG_NET_PCMCIA=y</div><div class='ctx'> # CONFIG_PCMCIA_3C589 is not set</div><div class='ctx'> # CONFIG_PCMCIA_3C574 is not set</div><div class='hunk'>@@ -808,29 +705,16 @@ CONFIG_PCMCIA_PCNET=y</div><div class='ctx'> # CONFIG_PCMCIA_SMC91C92 is not set</div><div class='ctx'> # CONFIG_PCMCIA_XIRC2PS is not set</div><div class='ctx'> # CONFIG_PCMCIA_AXNET is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Wan interfaces</div><div class='del'>-#</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='ctx'> # CONFIG_NET_FC is not set</div><div class='del'>-# CONFIG_SHAPER is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='ctx'> # CONFIG_NET_POLL_CONTROLLER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ISDN subsystem</div><div class='del'>-#</div><div class='ctx'> # CONFIG_ISDN is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Telephony Support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_PHONE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -838,6 +722,7 @@ CONFIG_PCMCIA_PCNET=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_INPUT=y</div><div class='ctx'> # CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Userland interfaces</div><div class='hunk'>@@ -847,7 +732,6 @@ CONFIG_INPUT_MOUSEDEV=y</div><div class='ctx'> CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='ctx'> CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='ctx'> # CONFIG_INPUT_JOYDEV is not set</div><div class='del'>-# CONFIG_INPUT_TSDEV is not set</div><div class='ctx'> # CONFIG_INPUT_EVDEV is not set</div><div class='ctx'> # CONFIG_INPUT_EVBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -857,6 +741,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='ctx'> # CONFIG_INPUT_KEYBOARD is not set</div><div class='ctx'> # CONFIG_INPUT_MOUSE is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TABLET is not set</div><div class='ctx'> # CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='ctx'> # CONFIG_INPUT_MISC is not set</div><div class='ctx'> </div><div class='hunk'>@@ -870,10 +755,13 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+# CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Serial drivers</div><div class='hunk'>@@ -892,22 +780,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IPMI</div><div class='del'>-#</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Watchdog Cards</div><div class='del'>-#</div><div class='del'>-# CONFIG_WATCHDOG is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='del'>-# CONFIG_GEN_RTC is not set</div><div class='del'>-# CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_APPLICOM is not set</div><div class='del'>-# CONFIG_DRM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCMCIA character devices</div><div class='hunk'>@@ -915,125 +791,104 @@ CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_SYNCLINK_CS is not set</div><div class='ctx'> # CONFIG_CARDMAN_4000 is not set</div><div class='ctx'> # CONFIG_CARDMAN_4040 is not set</div><div class='add'>+# CONFIG_IPWIRELESS is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# TPM devices</div><div class='del'>-#</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# I2C support</div><div class='del'>-#</div><div class='add'>+CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Dallas's 1-wire bus</div><div class='del'>-#</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Hardware Monitoring support</div><div class='del'>-#</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='del'>-# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_I5K_AMB is not set</div><div class='ctx'> # CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_F71882FG is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='ctx'> # CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_SIS5595 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_VIA686A is not set</div><div class='ctx'> # CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_VT8231 is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Digital Video Broadcasting Devices</div><div class='add'>+# Multimedia drivers</div><div class='ctx'> #</div><div class='del'>-# CONFIG_DVB is not set</div><div class='add'>+# CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+# CONFIG_DRM is not set</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Console display driver support</div><div class='add'>+# Display device support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_MDA_CONSOLE is not set</div><div class='del'>-CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Sound</div><div class='add'>+# Console display driver support</div><div class='ctx'> #</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# HID Devices</div><div class='del'>-#</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='ctx'> # CONFIG_HID_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB support</div><div class='del'>-#</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Gadget Support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# MMC/SD Card support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# LED devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# LED drivers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# LED Triggers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# InfiniBand support</div><div class='del'>-#</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Real Time Clock</div><div class='del'>-#</div><div class='ctx'> CONFIG_RTC_LIB=y</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='ctx'> CONFIG_RTC_HCTOSYS=y</div><div class='hunk'>@@ -1047,37 +902,29 @@ CONFIG_RTC_INTF_SYSFS=y</div><div class='ctx'> CONFIG_RTC_INTF_PROC=y</div><div class='ctx'> CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# RTC drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_RTC_DRV_DS1553 is not set</div><div class='del'>-# CONFIG_RTC_DRV_DS1742 is not set</div><div class='del'>-# CONFIG_RTC_DRV_M48T86 is not set</div><div class='del'>-# CONFIG_RTC_DRV_SH is not set</div><div class='ctx'> # CONFIG_RTC_DRV_TEST is not set</div><div class='del'>-# CONFIG_RTC_DRV_V3020 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Engine support</div><div class='del'>-#</div><div class='del'>-# CONFIG_DMA_ENGINE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Clients</div><div class='del'>-#</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# DMA Devices</div><div class='add'>+# SPI RTC drivers</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Auxiliary Display support</div><div class='add'>+# Platform RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T59 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Virtualization</div><div class='add'>+# on-CPU RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_SH is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='hunk'>@@ -1091,20 +938,16 @@ CONFIG_EXT3_FS_XATTR=y</div><div class='ctx'> # CONFIG_EXT3_FS_SECURITY is not set</div><div class='ctx'> # CONFIG_EXT4DEV_FS is not set</div><div class='ctx'> CONFIG_JBD=y</div><div class='del'>-# CONFIG_JBD_DEBUG is not set</div><div class='ctx'> CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_REISERFS_FS is not set</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='del'>-# CONFIG_MINIX_FS is not set</div><div class='del'>-CONFIG_ROMFS_FS=y</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='del'>-CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='ctx'> # CONFIG_FUSE_FS is not set</div><div class='hunk'>@@ -1136,7 +979,6 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_TMPFS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_HUGETLBFS is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE is not set</div><div class='del'>-CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_CONFIGFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1151,14 +993,14 @@ CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='add'>+CONFIG_ROMFS_FS=y</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Network File Systems</div><div class='del'>-#</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> # CONFIG_NFS_FS is not set</div><div class='ctx'> # CONFIG_NFSD is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1166,17 +1008,12 @@ CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='del'>-# CONFIG_9P_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Partition Types</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARTITION_ADVANCED is not set</div><div class='ctx'> CONFIG_MSDOS_PARTITION=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Native Language Support</div><div class='del'>-#</div><div class='ctx'> CONFIG_NLS=y</div><div class='ctx'> CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> CONFIG_NLS_CODEPAGE_437=y</div><div class='hunk'>@@ -1217,30 +1054,24 @@ CONFIG_NLS_CODEPAGE_437=y</div><div class='ctx'> # CONFIG_NLS_KOI8_R is not set</div><div class='ctx'> # CONFIG_NLS_KOI8_U is not set</div><div class='ctx'> # CONFIG_NLS_UTF8 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Distributed Lock Manager</div><div class='del'>-#</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Profiling support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PROFILING is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # Kernel hacking</div><div class='ctx'> #</div><div class='ctx'> CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='del'>-CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='ctx'> CONFIG_SH_STANDARD_BIOS=y</div><div class='ctx'> # CONFIG_EARLY_SCIF_CONSOLE is not set</div><div class='ctx'> # CONFIG_EARLY_PRINTK is not set</div><div class='hunk'>@@ -1251,20 +1082,100 @@ CONFIG_SH_STANDARD_BIOS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_KEYS is not set</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_MANAGER is not set</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CBC is not set</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+# CONFIG_CRYPTO_ECB is not set</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+# CONFIG_CRYPTO_MD5 is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_DES is not set</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Cryptographic options</div><div class='add'>+# Compression</div><div class='ctx'> #</div><div class='del'>-# CONFIG_CRYPTO is not set</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='add'>+# CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_PLIST=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='ctx'> CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/sh/configs/magicpanelr2_defconfig b/arch/sh/configs/magicpanelr2_defconfig<br/>index f8398a5f10ee..a3a80f3d27c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/magicpanelr2_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/magicpanelr2_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/magicpanelr2_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/magicpanelr2_defconfig</a></div><div class='hunk'>@@ -1,9 +1,11 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.23-rc2</div><div class='del'>-# Fri Aug 17 12:15:16 2007</div><div class='add'>+# Linux kernel version: 2.6.26</div><div class='add'>+# Wed Jul 30 01:41:08 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='add'>+CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='hunk'>@@ -18,6 +20,7 @@ CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='ctx'> CONFIG_ARCH_NO_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -35,12 +38,16 @@ CONFIG_POSIX_MQUEUE=y</div><div class='ctx'> CONFIG_BSD_PROCESS_ACCT=y</div><div class='ctx'> CONFIG_BSD_PROCESS_ACCT_V3=y</div><div class='ctx'> # CONFIG_TASKSTATS is not set</div><div class='del'>-# CONFIG_USER_NS is not set</div><div class='ctx'> CONFIG_AUDIT=y</div><div class='add'>+# CONFIG_AUDITSYSCALL is not set</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=17</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> CONFIG_RELAY=y</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='ctx'> CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='hunk'>@@ -48,6 +55,7 @@ CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -55,6 +63,7 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_ANON_INODES=y</div><div class='hunk'>@@ -67,10 +76,24 @@ CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_SLUB is not set</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+# CONFIG_HAVE_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> CONFIG_MODVERSIONS=y</div><div class='hunk'>@@ -81,6 +104,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -94,13 +118,17 @@ CONFIG_IOSCHED_NOOP=y</div><div class='ctx'> # CONFIG_DEFAULT_CFQ is not set</div><div class='ctx'> CONFIG_DEFAULT_NOOP=y</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="noop"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # System type</div><div class='ctx'> #</div><div class='ctx'> CONFIG_CPU_SH3=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7619 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7203 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7206 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7263 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_MXG is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7705 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7706 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7707 is not set</div><div class='hunk'>@@ -109,6 +137,7 @@ CONFIG_CPU_SH3=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7710 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7712 is not set</div><div class='ctx'> CONFIG_CPU_SUBTYPE_SH7720=y</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7721 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7750 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7091 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7750R is not set</div><div class='hunk'>@@ -117,14 +146,17 @@ CONFIG_CPU_SUBTYPE_SH7720=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7751R is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7760 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH4_202 is not set</div><div class='del'>-# CONFIG_CPU_SUBTYPE_ST40STB1 is not set</div><div class='del'>-# CONFIG_CPU_SUBTYPE_ST40GX1 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7723 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7763 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7770 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7780 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7785 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SHX3 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7343 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7722 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7366 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH5_101 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH5_103 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Memory management options</div><div class='hunk'>@@ -134,6 +166,7 @@ CONFIG_MMU=y</div><div class='ctx'> CONFIG_PAGE_OFFSET=0x80000000</div><div class='ctx'> CONFIG_MEMORY_START=0x0C000000</div><div class='ctx'> CONFIG_MEMORY_SIZE=0x03F00000</div><div class='add'>+CONFIG_29BIT=y</div><div class='ctx'> CONFIG_VSYSCALL=y</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_SPARSEMEM_ENABLE=y</div><div class='hunk'>@@ -143,7 +176,9 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='hunk'>@@ -151,6 +186,8 @@ CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> CONFIG_SPARSEMEM_STATIC=y</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=0</div><div class='hunk'>@@ -173,7 +210,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y</div><div class='ctx'> CONFIG_SH_DSP=y</div><div class='ctx'> CONFIG_SH_ADC=y</div><div class='ctx'> CONFIG_CPU_HAS_INTEVT=y</div><div class='del'>-CONFIG_CPU_HAS_INTC_IRQ=y</div><div class='ctx'> CONFIG_CPU_HAS_SR_RB=y</div><div class='ctx'> CONFIG_CPU_HAS_DSP=y</div><div class='ctx'> </div><div class='hunk'>@@ -196,6 +232,7 @@ CONFIG_SH_PCLK_FREQ=24000000</div><div class='ctx'> # CONFIG_TICK_ONESHOT is not set</div><div class='ctx'> # CONFIG_NO_HZ is not set</div><div class='ctx'> # CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CPU Frequency scaling</div><div class='hunk'>@@ -228,11 +265,14 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='ctx'> # CONFIG_KEXEC is not set</div><div class='ctx'> # CONFIG_CRASH_DUMP is not set</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_GUSA=y</div><div class='add'>+# CONFIG_GUSA_RB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Boot options</div><div class='hunk'>@@ -245,10 +285,6 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCCARD (PCMCIA/CardBus) support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -289,6 +325,7 @@ CONFIG_IP_PNP_DHCP=y</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -296,8 +333,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -314,10 +349,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_LAPB is not set</div><div class='ctx'> # CONFIG_ECONET is not set</div><div class='ctx'> # CONFIG_WAN_ROUTER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# QoS and/or fair queueing</div><div class='del'>-#</div><div class='ctx'> # CONFIG_NET_SCHED is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -325,6 +356,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_PKTGEN is not set</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='ctx'> # CONFIG_IRDA is not set</div><div class='ctx'> # CONFIG_BT is not set</div><div class='ctx'> # CONFIG_AF_RXRPC is not set</div><div class='hunk'>@@ -346,9 +378,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> #</div><div class='ctx'> # Generic Driver Options</div><div class='ctx'> #</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> # CONFIG_STANDALONE is not set</div><div class='ctx'> # CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -362,6 +397,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set</div><div class='ctx'> CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # User Modules And Translation Layers</div><div class='hunk'>@@ -374,6 +410,7 @@ CONFIG_MTD_BLOCK=y</div><div class='ctx'> # CONFIG_INFTL is not set</div><div class='ctx'> # CONFIG_RFD_FTL is not set</div><div class='ctx'> # CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # RAM/ROM/Flash chip drivers</div><div class='hunk'>@@ -408,7 +445,6 @@ CONFIG_MTD_PHYSMAP=y</div><div class='ctx'> CONFIG_MTD_PHYSMAP_START=0x0000000</div><div class='ctx'> CONFIG_MTD_PHYSMAP_LEN=0</div><div class='ctx'> CONFIG_MTD_PHYSMAP_BANKWIDTH=0</div><div class='del'>-# CONFIG_MTD_SOLUTIONENGINE is not set</div><div class='ctx'> # CONFIG_MTD_PLATRAM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -440,11 +476,14 @@ CONFIG_BLK_DEV=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=65536</div><div class='del'>-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -457,18 +496,24 @@ CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='add'>+# CONFIG_VETH is not set</div><div class='ctx'> # CONFIG_PHYLIB is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='ctx'> # CONFIG_STNIC is not set</div><div class='ctx'> # CONFIG_SMC91X is not set</div><div class='ctx'> CONFIG_SMC911X=y</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='ctx'> # CONFIG_NETDEV_1000 is not set</div><div class='ctx'> # CONFIG_NETDEV_10000 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -477,10 +522,10 @@ CONFIG_SMC911X=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='del'>-# CONFIG_SHAPER is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='ctx'> # CONFIG_NET_POLL_CONTROLLER is not set</div><div class='hunk'>@@ -502,7 +547,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='ctx'> CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='ctx'> CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='ctx'> # CONFIG_INPUT_JOYDEV is not set</div><div class='del'>-# CONFIG_INPUT_TSDEV is not set</div><div class='ctx'> CONFIG_INPUT_EVDEV=y</div><div class='ctx'> # CONFIG_INPUT_EVBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -516,6 +560,7 @@ CONFIG_KEYBOARD_ATKBD=y</div><div class='ctx'> # CONFIG_KEYBOARD_XTKBD is not set</div><div class='ctx'> # CONFIG_KEYBOARD_NEWTON is not set</div><div class='ctx'> # CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+# CONFIG_KEYBOARD_SH_KEYSC is not set</div><div class='ctx'> CONFIG_INPUT_MOUSE=y</div><div class='ctx'> # CONFIG_MOUSE_PS2 is not set</div><div class='ctx'> # CONFIG_MOUSE_SERIAL is not set</div><div class='hunk'>@@ -539,9 +584,11 @@ CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -569,60 +616,72 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-# CONFIG_WATCHDOG is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sonics Silicon Backplane</div><div class='add'>+#</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> CONFIG_DAB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='add'>+# CONFIG_FB is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-# CONFIG_VGASTATE is not set</div><div class='del'>-# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='del'>-# CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Console display driver support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_HID_SUPPORT is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> CONFIG_RTC_LIB=y</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='ctx'> # CONFIG_RTC_HCTOSYS is not set</div><div class='hunk'>@@ -644,9 +703,10 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> #</div><div class='ctx'> # Platform RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_DS1553 is not set</div><div class='del'>-# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M48T86 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M48T59 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_V3020 is not set</div><div class='hunk'>@@ -655,23 +715,7 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_RTC_DRV_SH=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Engine support</div><div class='del'>-#</div><div class='del'>-# CONFIG_DMA_ENGINE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Clients</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -684,18 +728,14 @@ CONFIG_EXT3_FS=y</div><div class='ctx'> # CONFIG_EXT3_FS_XATTR is not set</div><div class='ctx'> # CONFIG_EXT4DEV_FS is not set</div><div class='ctx'> CONFIG_JBD=y</div><div class='del'>-# CONFIG_JBD_DEBUG is not set</div><div class='ctx'> # CONFIG_REISERFS_FS is not set</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='del'>-# CONFIG_MINIX_FS is not set</div><div class='del'>-# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='ctx'> # CONFIG_INOTIFY is not set</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='del'>-# CONFIG_DNOTIFY is not set</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='ctx'> # CONFIG_FUSE_FS is not set</div><div class='hunk'>@@ -724,7 +764,6 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_TMPFS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_HUGETLBFS is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE is not set</div><div class='del'>-CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_CONFIGFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -744,30 +783,29 @@ CONFIG_JFFS2_FS_DEBUG=0</div><div class='ctx'> # CONFIG_JFFS2_FS_XATTR is not set</div><div class='ctx'> # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='ctx'> CONFIG_JFFS2_ZLIB=y</div><div class='add'>+# CONFIG_JFFS2_LZO is not set</div><div class='ctx'> CONFIG_JFFS2_RTIME=y</div><div class='ctx'> # CONFIG_JFFS2_RUBIN is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Network File Systems</div><div class='del'>-#</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-CONFIG_SUNRPC_BIND34=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -781,10 +819,6 @@ CONFIG_SUNRPC_BIND34=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARTITION_ADVANCED is not set</div><div class='ctx'> CONFIG_MSDOS_PARTITION=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Native Language Support</div><div class='del'>-#</div><div class='ctx'> CONFIG_NLS=y</div><div class='ctx'> CONFIG_NLS_DEFAULT="cp437"</div><div class='ctx'> CONFIG_NLS_CODEPAGE_437=y</div><div class='hunk'>@@ -825,23 +859,16 @@ CONFIG_NLS_ISO8859_1=y</div><div class='ctx'> # CONFIG_NLS_KOI8_R is not set</div><div class='ctx'> # CONFIG_NLS_KOI8_U is not set</div><div class='ctx'> # CONFIG_NLS_UTF8 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Distributed Lock Manager</div><div class='del'>-#</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Profiling support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PROFILING is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # Kernel hacking</div><div class='ctx'> #</div><div class='ctx'> CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -852,6 +879,7 @@ CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_SCHED_DEBUG is not set</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_DEBUG_SLAB is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='ctx'> # CONFIG_RT_MUTEX_TESTER is not set</div><div class='hunk'>@@ -866,11 +894,16 @@ CONFIG_DEBUG_KOBJECT=y</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='add'>+# CONFIG_DEBUG_SG is not set</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='del'>-# CONFIG_FORCED_INLINING is not set</div><div class='add'>+# CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='ctx'> # CONFIG_SH_STANDARD_BIOS is not set</div><div class='ctx'> CONFIG_EARLY_SCIF_CONSOLE=y</div><div class='ctx'> CONFIG_EARLY_SCIF_CONSOLE_PORT=0xa4430000</div><div class='hunk'>@@ -879,6 +912,7 @@ CONFIG_EARLY_PRINTK=y</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> # CONFIG_4KSTACKS is not set</div><div class='add'>+# CONFIG_IRQSTACKS is not set</div><div class='ctx'> CONFIG_SH_KGDB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -904,14 +938,17 @@ CONFIG_KGDB_DEFBITS_8=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_KEYS is not set</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> # CONFIG_CRYPTO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=m</div><div class='ctx'> CONFIG_CRC16=m</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/sh/configs/microdev_defconfig b/arch/sh/configs/microdev_defconfig<br/>index e89d951c3c16..e4b900e72dcd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/microdev_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/microdev_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/microdev_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/microdev_defconfig</a></div><div class='hunk'>@@ -1,28 +1,35 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.18</div><div class='del'>-# Tue Oct  3 11:27:01 2006</div><div class='add'>+# Linux kernel version: 2.6.26</div><div class='add'>+# Wed Jul 30 01:47:16 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='add'>+CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_GENERIC_TIME=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='add'>+# CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_ARCH_NO_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Code maturity level options</div><div class='add'>+# General setup</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXPERIMENTAL=y</div><div class='ctx'> CONFIG_BROKEN_ON_SMP=y</div><div class='ctx'> CONFIG_LOCK_KERNEL=y</div><div class='ctx'> CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# General setup</div><div class='del'>-#</div><div class='ctx'> CONFIG_LOCALVERSION=""</div><div class='ctx'> CONFIG_LOCALVERSION_AUTO=y</div><div class='ctx'> CONFIG_SWAP=y</div><div class='hunk'>@@ -31,10 +38,16 @@ CONFIG_SWAP=y</div><div class='ctx'> CONFIG_BSD_PROCESS_ACCT=y</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='ctx'> # CONFIG_TASKSTATS is not set</div><div class='del'>-# CONFIG_UTS_NS is not set</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='ctx'> CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='hunk'>@@ -47,29 +60,42 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='del'>-CONFIG_SLAB=y</div><div class='ctx'> CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLUB is not set</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+# CONFIG_HAVE_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='del'>-# CONFIG_SLOB is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Loadable module support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_MODULES is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Block layer</div><div class='del'>-#</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -83,59 +109,26 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_CFQ is not set</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # System type</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SH_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_7751_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_7300_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_7343_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_73180_SOLUTION_ENGINE is not set</div><div class='del'>-# CONFIG_SH_7751_SYSTEMH is not set</div><div class='del'>-# CONFIG_SH_HP6XX is not set</div><div class='del'>-# CONFIG_SH_EC3104 is not set</div><div class='del'>-# CONFIG_SH_SATURN is not set</div><div class='del'>-# CONFIG_SH_DREAMCAST is not set</div><div class='del'>-# CONFIG_SH_BIGSUR is not set</div><div class='del'>-# CONFIG_SH_MPC1211 is not set</div><div class='del'>-# CONFIG_SH_SH03 is not set</div><div class='del'>-# CONFIG_SH_SECUREEDGE5410 is not set</div><div class='del'>-# CONFIG_SH_HS7751RVOIP is not set</div><div class='del'>-# CONFIG_SH_7710VOIPGW is not set</div><div class='del'>-# CONFIG_SH_RTS7751R2D is not set</div><div class='del'>-# CONFIG_SH_R7780RP is not set</div><div class='del'>-# CONFIG_SH_EDOSK7705 is not set</div><div class='del'>-CONFIG_SH_SH4202_MICRODEV=y</div><div class='del'>-# CONFIG_SH_LANDISK is not set</div><div class='del'>-# CONFIG_SH_TITAN is not set</div><div class='del'>-# CONFIG_SH_SHMIN is not set</div><div class='del'>-# CONFIG_SH_UNKNOWN is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Processor selection</div><div class='del'>-#</div><div class='ctx'> CONFIG_CPU_SH4=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH-2 Processor Support</div><div class='del'>-#</div><div class='del'>-# CONFIG_CPU_SUBTYPE_SH7604 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH-3 Processor Support</div><div class='del'>-#</div><div class='del'>-# CONFIG_CPU_SUBTYPE_SH7300 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7619 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7203 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7206 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7263 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_MXG is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7705 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7706 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7707 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7708 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7709 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7710 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH-4 Processor Support</div><div class='del'>-#</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7712 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7720 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7721 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7750 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7091 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7750R is not set</div><div class='hunk'>@@ -144,67 +137,94 @@ CONFIG_CPU_SH4=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7751R is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7760 is not set</div><div class='ctx'> CONFIG_CPU_SUBTYPE_SH4_202=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ST40 Processor Support</div><div class='del'>-#</div><div class='del'>-# CONFIG_CPU_SUBTYPE_ST40STB1 is not set</div><div class='del'>-# CONFIG_CPU_SUBTYPE_ST40GX1 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH-4A Processor Support</div><div class='del'>-#</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7723 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7763 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7770 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7780 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SH4AL-DSP Processor Support</div><div class='del'>-#</div><div class='del'>-# CONFIG_CPU_SUBTYPE_SH73180 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7785 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SHX3 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7343 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7722 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7366 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH5_101 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH5_103 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Memory management options</div><div class='ctx'> #</div><div class='add'>+CONFIG_QUICKLIST=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='ctx'> CONFIG_PAGE_OFFSET=0x80000000</div><div class='ctx'> CONFIG_MEMORY_START=0x08000000</div><div class='ctx'> CONFIG_MEMORY_SIZE=0x04000000</div><div class='add'>+CONFIG_29BIT=y</div><div class='ctx'> CONFIG_VSYSCALL=y</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_ARCH_SPARSEMEM_ENABLE=y</div><div class='add'>+CONFIG_ARCH_SPARSEMEM_DEFAULT=y</div><div class='add'>+CONFIG_MAX_ACTIVE_REGIONS=1</div><div class='add'>+CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='add'>+CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_PAGE_SIZE_4KB=y</div><div class='add'>+# CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_HUGETLB_PAGE_SIZE_64K=y</div><div class='add'>+# CONFIG_HUGETLB_PAGE_SIZE_256K is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE_SIZE_1MB is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE_SIZE_4MB is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE_SIZE_64MB is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE_SIZE_512MB is not set</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='ctx'> # CONFIG_SPARSEMEM_MANUAL is not set</div><div class='ctx'> CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='del'>-# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPARSEMEM_STATIC=y</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=0</div><div class='add'>+CONFIG_NR_QUICK=2</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Cache configuration</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SH_DIRECT_MAPPED is not set</div><div class='del'>-CONFIG_SH_WRITETHROUGH=y</div><div class='del'>-# CONFIG_SH_OCRAM is not set</div><div class='add'>+CONFIG_CACHE_WRITEBACK=y</div><div class='add'>+# CONFIG_CACHE_WRITETHROUGH is not set</div><div class='add'>+# CONFIG_CACHE_OFF is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Processor features</div><div class='ctx'> #</div><div class='ctx'> CONFIG_CPU_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_CPU_BIG_ENDIAN is not set</div><div class='ctx'> CONFIG_SH_FPU=y</div><div class='del'>-# CONFIG_SH_DSP is not set</div><div class='ctx'> # CONFIG_SH_STORE_QUEUES is not set</div><div class='ctx'> CONFIG_CPU_HAS_INTEVT=y</div><div class='ctx'> CONFIG_CPU_HAS_SR_RB=y</div><div class='add'>+CONFIG_CPU_HAS_PTEA=y</div><div class='add'>+CONFIG_CPU_HAS_FPU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Timer support</div><div class='add'>+# Board support</div><div class='add'>+#</div><div class='add'>+CONFIG_SH_SH4202_MICRODEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Timer and clock configuration</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SH_TMU=y</div><div class='add'>+CONFIG_SH_TIMER_IRQ=16</div><div class='ctx'> CONFIG_SH_PCLK_FREQ=66000000</div><div class='add'>+# CONFIG_TICK_ONESHOT is not set</div><div class='add'>+# CONFIG_NO_HZ is not set</div><div class='add'>+# CONFIG_HIGH_RES_TIMERS is not set</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CPU Frequency scaling</div><div class='hunk'>@@ -214,6 +234,7 @@ CONFIG_SH_PCLK_FREQ=66000000</div><div class='ctx'> #</div><div class='ctx'> # DMA support</div><div class='ctx'> #</div><div class='add'>+CONFIG_SH_DMA_API=y</div><div class='ctx'> CONFIG_SH_DMA=y</div><div class='ctx'> CONFIG_NR_ONCHIP_DMA_CHANNELS=4</div><div class='ctx'> # CONFIG_NR_DMA_CHANNELS_BOOL is not set</div><div class='hunk'>@@ -221,22 +242,30 @@ CONFIG_NR_ONCHIP_DMA_CHANNELS=4</div><div class='ctx'> #</div><div class='ctx'> # Companion Chips</div><div class='ctx'> #</div><div class='del'>-# CONFIG_HD6446X_SERIES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Additional SuperH Device Drivers</div><div class='add'>+#</div><div class='ctx'> CONFIG_HEARTBEAT=y</div><div class='add'>+# CONFIG_PUSH_SWITCH is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel features</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_HZ_100 is not set</div><div class='ctx'> CONFIG_HZ_250=y</div><div class='add'>+# CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='ctx'> # CONFIG_KEXEC is not set</div><div class='del'>-# CONFIG_SMP is not set</div><div class='add'>+# CONFIG_CRASH_DUMP is not set</div><div class='ctx'> # CONFIG_PREEMPT_NONE is not set</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='del'>-CONFIG_PREEMPT_BKL=y</div><div class='add'>+# CONFIG_PREEMPT_RCU is not set</div><div class='add'>+CONFIG_GUSA=y</div><div class='add'>+# CONFIG_GUSA_RB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Boot options</div><div class='hunk'>@@ -251,30 +280,16 @@ CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/hda1"</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERHYWAY=y</div><div class='del'>-# CONFIG_PCI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCCARD (PCMCIA/CardBus) support</div><div class='del'>-#</div><div class='add'>+# CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='ctx'> # CONFIG_PCCARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# PCI Hotplug Support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # Executable file formats</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='del'>-# CONFIG_BINFMT_FLAT is not set</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Power management options (EXPERIMENTAL)</div><div class='del'>-#</div><div class='del'>-# CONFIG_PM is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # Networking</div><div class='ctx'> #</div><div class='ctx'> CONFIG_NET=y</div><div class='hunk'>@@ -282,12 +297,13 @@ CONFIG_NET=y</div><div class='ctx'> #</div><div class='ctx'> # Networking options</div><div class='ctx'> #</div><div class='del'>-# CONFIG_NETDEBUG is not set</div><div class='ctx'> # CONFIG_PACKET is not set</div><div class='ctx'> # CONFIG_UNIX is not set</div><div class='ctx'> CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='add'>+# CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> # CONFIG_IP_MULTICAST is not set</div><div class='hunk'>@@ -308,30 +324,19 @@ CONFIG_IP_PNP=y</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='ctx'> CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='ctx'> CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=y</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='ctx'> CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+# CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DCCP Configuration (EXPERIMENTAL)</div><div class='del'>-#</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SCTP Configuration (EXPERIMENTAL)</div><div class='del'>-#</div><div class='ctx'> # CONFIG_IP_SCTP is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# TIPC Configuration (EXPERIMENTAL)</div><div class='del'>-#</div><div class='ctx'> # CONFIG_TIPC is not set</div><div class='ctx'> # CONFIG_ATM is not set</div><div class='ctx'> # CONFIG_BRIDGE is not set</div><div class='hunk'>@@ -344,10 +349,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_LAPB is not set</div><div class='ctx'> # CONFIG_ECONET is not set</div><div class='ctx'> # CONFIG_WAN_ROUTER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# QoS and/or fair queueing</div><div class='del'>-#</div><div class='ctx'> # CONFIG_NET_SCHED is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -355,9 +356,20 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_PKTGEN is not set</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='ctx'> # CONFIG_IRDA is not set</div><div class='ctx'> # CONFIG_BT is not set</div><div class='add'>+# CONFIG_AF_RXRPC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless</div><div class='add'>+#</div><div class='add'>+# CONFIG_CFG80211 is not set</div><div class='add'>+# CONFIG_WIRELESS_EXT is not set</div><div class='add'>+# CONFIG_MAC80211 is not set</div><div class='ctx'> # CONFIG_IEEE80211 is not set</div><div class='add'>+# CONFIG_RFKILL is not set</div><div class='add'>+# CONFIG_NET_9P is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Device Drivers</div><div class='hunk'>@@ -366,159 +378,96 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> #</div><div class='ctx'> # Generic Driver Options</div><div class='ctx'> #</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='del'>-#</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Memory Technology Devices (MTD)</div><div class='del'>-#</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Parallel port support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Plug and Play support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Block devices</div><div class='del'>-#</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_LOOP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_NBD is not set</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='del'>-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='del'>-CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ATA/ATAPI/MFM/RLL support</div><div class='del'>-#</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='ctx'> CONFIG_IDE_MAX_HWIFS=1</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Please see Documentation/ide.txt for help/info on IDE drives</div><div class='add'>+# Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDECD=y</div><div class='add'>+CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDETAPE is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDEFLOPPY is not set</div><div class='ctx'> # CONFIG_IDE_TASK_IOCTL is not set</div><div class='add'>+CONFIG_IDE_PROC_FS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='del'>-# CONFIG_IDE_ARM is not set</div><div class='add'>+# CONFIG_BLK_DEV_PLATFORM is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDEDMA is not set</div><div class='del'>-# CONFIG_IDEDMA_AUTO is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_RAID_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_DMA is not set</div><div class='ctx'> # CONFIG_SCSI_NETLINK is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Serial ATA (prod) and Parallel ATA (experimental) drivers</div><div class='del'>-#</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Multi-device support (RAID and LVM)</div><div class='del'>-#</div><div class='ctx'> # CONFIG_MD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Fusion MPT device support</div><div class='del'>-#</div><div class='del'>-# CONFIG_FUSION is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IEEE 1394 (FireWire) support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# I2O device support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Network device support</div><div class='del'>-#</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_MACVLAN is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PHY device support</div><div class='del'>-#</div><div class='add'>+# CONFIG_VETH is not set</div><div class='ctx'> # CONFIG_PHYLIB is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Ethernet (10 or 100Mbit)</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+# CONFIG_AX88796 is not set</div><div class='ctx'> # CONFIG_STNIC is not set</div><div class='ctx'> CONFIG_SMC91X=y</div><div class='add'>+# CONFIG_SMC911X is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='add'>+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+CONFIG_NETDEV_1000=y</div><div class='add'>+CONFIG_NETDEV_10000=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Ethernet (1000 Mbit)</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Ethernet (10000 Mbit)</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Token Ring devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Wireless LAN (non-hamradio)</div><div class='del'>-#</div><div class='del'>-# CONFIG_NET_RADIO is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Wan interfaces</div><div class='add'>+# Wireless LAN</div><div class='ctx'> #</div><div class='add'>+# CONFIG_WLAN_PRE80211 is not set</div><div class='add'>+# CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='del'>-# CONFIG_SHAPER is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='ctx'> # CONFIG_NET_POLL_CONTROLLER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ISDN subsystem</div><div class='del'>-#</div><div class='ctx'> # CONFIG_ISDN is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Telephony Support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_PHONE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -536,6 +485,7 @@ CONFIG_SMC91X=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -554,143 +504,93 @@ CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IPMI</div><div class='del'>-#</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Watchdog Cards</div><div class='del'>-#</div><div class='del'>-# CONFIG_WATCHDOG is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='del'>-# CONFIG_GEN_RTC is not set</div><div class='del'>-# CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Ftape, the floppy tape device driver</div><div class='del'>-#</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# TPM devices</div><div class='del'>-#</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='del'>-# CONFIG_TELCLOCK is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# I2C support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Dallas's 1-wire bus</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Hardware Monitoring support</div><div class='del'>-#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='del'>-# CONFIG_SENSORS_ABITUGURU is not set</div><div class='ctx'> # CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_F71882FG is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87427 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='ctx'> # CONFIG_SENSORS_VT1211 is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Misc devices</div><div class='add'>+# Sonics Silicon Backplane</div><div class='ctx'> #</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multifunction device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='add'>+# CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='del'>-CONFIG_VIDEO_V4L2=y</div><div class='add'>+# CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Digital Video Broadcasting Devices</div><div class='add'>+# Multimedia drivers</div><div class='ctx'> #</div><div class='del'>-# CONFIG_DVB is not set</div><div class='add'>+# CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='del'>-CONFIG_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Sound</div><div class='add'>+# Display device support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB support</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_ARCH_HAS_HCD is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> # CONFIG_USB_ARCH_HAS_OHCI is not set</div><div class='ctx'> # CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Gadget Support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# MMC/SD Card support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# LED devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# LED drivers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# LED Triggers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# InfiniBand support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Real Time Clock</div><div class='del'>-#</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Engine support</div><div class='del'>-#</div><div class='del'>-# CONFIG_DMA_ENGINE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Clients</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='hunk'>@@ -702,20 +602,18 @@ CONFIG_EXT3_FS=y</div><div class='ctx'> CONFIG_EXT3_FS_XATTR=y</div><div class='ctx'> # CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT4DEV_FS is not set</div><div class='ctx'> CONFIG_JBD=y</div><div class='del'>-# CONFIG_JBD_DEBUG is not set</div><div class='ctx'> CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_REISERFS_FS is not set</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='del'>-# CONFIG_MINIX_FS is not set</div><div class='del'>-# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='del'>-CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='ctx'> # CONFIG_FUSE_FS is not set</div><div class='hunk'>@@ -747,7 +645,6 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_TMPFS_POSIX_ACL is not set</div><div class='ctx'> CONFIG_HUGETLBFS=y</div><div class='ctx'> CONFIG_HUGETLB_PAGE=y</div><div class='del'>-CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_CONFIGFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -762,21 +659,20 @@ CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Network File Systems</div><div class='del'>-#</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='hunk'>@@ -789,17 +685,12 @@ CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='del'>-# CONFIG_9P_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Partition Types</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARTITION_ADVANCED is not set</div><div class='ctx'> CONFIG_MSDOS_PARTITION=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Native Language Support</div><div class='del'>-#</div><div class='ctx'> CONFIG_NLS=y</div><div class='ctx'> CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> # CONFIG_NLS_CODEPAGE_437 is not set</div><div class='hunk'>@@ -840,76 +731,127 @@ CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> # CONFIG_NLS_KOI8_R is not set</div><div class='ctx'> # CONFIG_NLS_KOI8_U is not set</div><div class='ctx'> # CONFIG_NLS_UTF8 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Profiling support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_DLM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='ctx'> #</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='del'>-CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='del'>-# CONFIG_DEBUG_FS is not set</div><div class='del'>-# CONFIG_UNWIND_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='ctx'> # CONFIG_SH_STANDARD_BIOS is not set</div><div class='ctx'> # CONFIG_EARLY_SCIF_CONSOLE is not set</div><div class='del'>-# CONFIG_KGDB is not set</div><div class='add'>+# CONFIG_SH_KGDB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_KEYS is not set</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Cryptographic options</div><div class='add'>+# Crypto core or helper</div><div class='ctx'> #</div><div class='del'>-CONFIG_CRYPTO=y</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='del'>-# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='ctx'> # CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_XCBC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=y</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Hardware crypto devices</div><div class='add'>+# Compression</div><div class='ctx'> #</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='add'>+CONFIG_CRYPTO_HW=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='add'>+# CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_PLIST=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='head'>diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig<br/>index 287408b2ace6..4f8b1974f2c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/migor_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/migor_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/migor_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/migor_defconfig</a></div><div class='hunk'>@@ -1,15 +1,17 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc3</div><div class='del'>-# Thu May 22 14:30:07 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Tue Aug 26 14:18:17 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='ctx'> CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_GENERIC_TIME=y</div><div class='hunk'>@@ -20,7 +22,6 @@ CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='ctx'> CONFIG_ARCH_NO_VIRT_TO_BUS=y</div><div class='del'>-CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -77,10 +78,16 @@ CONFIG_PROFILING=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_OPROFILE=y</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_HAVE_GENERIC_DMA_COHERENT=y</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -90,12 +97,13 @@ CONFIG_MODULES=y</div><div class='ctx'> # CONFIG_MODULE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -173,7 +181,9 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> # CONFIG_FLATMEM_MANUAL is not set</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='hunk'>@@ -216,6 +226,8 @@ CONFIG_CPU_HAS_DSP=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SH_7722_SOLUTION_ENGINE is not set</div><div class='ctx'> CONFIG_SH_MIGOR=y</div><div class='add'>+CONFIG_SH_MIGOR_QVGA=y</div><div class='add'>+# CONFIG_SH_MIGOR_RTA_WVGA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Timer and clock configuration</div><div class='hunk'>@@ -259,6 +271,7 @@ CONFIG_HZ=250</div><div class='ctx'> # CONFIG_SCHED_HRTICK is not set</div><div class='ctx'> # CONFIG_KEXEC is not set</div><div class='ctx'> # CONFIG_CRASH_DUMP is not set</div><div class='add'>+CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -283,10 +296,6 @@ CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ip=on"</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -362,6 +371,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> # CONFIG_IEEE80211 is not set</div><div class='ctx'> # CONFIG_RFKILL is not set</div><div class='hunk'>@@ -378,6 +388,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='ctx'> CONFIG_MTD=y</div><div class='hunk'>@@ -475,6 +487,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -521,10 +534,10 @@ CONFIG_SCSI_WAIT_SCAN=m</div><div class='ctx'> CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_ISCSI_TCP is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -537,6 +550,7 @@ CONFIG_MII=y</div><div class='ctx'> # CONFIG_AX88796 is not set</div><div class='ctx'> # CONFIG_STNIC is not set</div><div class='ctx'> CONFIG_SMC91X=y</div><div class='add'>+# CONFIG_SMC911X is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='hunk'>@@ -602,6 +616,7 @@ CONFIG_KEYBOARD_SH_KEYSC=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -632,25 +647,40 @@ CONFIG_HW_RANDOM=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> # CONFIG_I2C_CHARDEV is not set</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+CONFIG_I2C_SH_MOBILE=y</div><div class='ctx'> # CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='del'>-CONFIG_I2C_SH_MOBILE=y</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -663,6 +693,7 @@ CONFIG_I2C_SH_MOBILE=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -674,8 +705,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -710,10 +743,6 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Console display driver support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -726,6 +755,8 @@ CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> # CONFIG_USB is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='add'>+# CONFIG_USB_MUSB_HDRC is not set</div><div class='add'>+# CONFIG_USB_GADGET_MUSB_HDRC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -738,7 +769,7 @@ CONFIG_USB_GADGET_SELECTED=y</div><div class='ctx'> # CONFIG_USB_GADGET_ATMEL_USBA is not set</div><div class='ctx'> # CONFIG_USB_GADGET_FSL_USB2 is not set</div><div class='ctx'> # CONFIG_USB_GADGET_NET2280 is not set</div><div class='del'>-# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA25X is not set</div><div class='ctx'> CONFIG_USB_GADGET_M66592=y</div><div class='ctx'> CONFIG_USB_M66592=y</div><div class='ctx'> CONFIG_SUPERH_BUILT_IN_M66592=y</div><div class='hunk'>@@ -757,6 +788,7 @@ CONFIG_USB_GADGET_DUALSPEED=y</div><div class='ctx'> CONFIG_USB_G_SERIAL=y</div><div class='ctx'> # CONFIG_USB_MIDI_GADGET is not set</div><div class='ctx'> # CONFIG_USB_G_PRINTER is not set</div><div class='add'>+# CONFIG_USB_CDC_COMPOSITE is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='hunk'>@@ -790,6 +822,7 @@ CONFIG_RTC_DRV_RS5C372=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -810,7 +843,11 @@ CONFIG_RTC_DRV_RS5C372=y</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_RTC_DRV_SH=y</div><div class='del'>-# CONFIG_UIO is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+CONFIG_UIO=y</div><div class='add'>+# CONFIG_UIO_PDRV is not set</div><div class='add'>+CONFIG_UIO_PDRV_GENIRQ=y</div><div class='add'>+# CONFIG_UIO_SMX is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='hunk'>@@ -870,6 +907,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -899,6 +937,7 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> # CONFIG_SH_STANDARD_BIOS is not set</div><div class='ctx'> CONFIG_EARLY_SCIF_CONSOLE=y</div><div class='hunk'>@@ -955,6 +994,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -994,6 +1037,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/sh/configs/r7780mp_defconfig b/arch/sh/configs/r7780mp_defconfig<br/>index 1a072615ffd4..57a300797584 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/r7780mp_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/r7780mp_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/r7780mp_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/r7780mp_defconfig</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.25-rc4</div><div class='del'>-# Thu Mar  6 15:39:59 2008</div><div class='add'>+# Linux kernel version: 2.6.26</div><div class='add'>+# Wed Jul 30 01:51:13 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='ctx'> CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='hunk'>@@ -84,13 +85,20 @@ CONFIG_PROFILING=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_OPROFILE=m</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -101,6 +109,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -115,7 +124,6 @@ CONFIG_IOSCHED_NOOP=y</div><div class='ctx'> CONFIG_DEFAULT_NOOP=y</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="noop"</div><div class='ctx'> CONFIG_CLASSIC_RCU=y</div><div class='del'>-# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # System type</div><div class='hunk'>@@ -126,6 +134,7 @@ CONFIG_CPU_SH4A=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7203 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7206 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7263 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_MXG is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7705 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7706 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7707 is not set</div><div class='hunk'>@@ -143,6 +152,7 @@ CONFIG_CPU_SH4A=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7751R is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7760 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH4_202 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7723 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7763 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7770 is not set</div><div class='ctx'> CONFIG_CPU_SUBTYPE_SH7780=y</div><div class='hunk'>@@ -173,7 +183,9 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_HUGETLB_PAGE_SIZE_64K=y</div><div class='ctx'> # CONFIG_HUGETLB_PAGE_SIZE_256K is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE_SIZE_1MB is not set</div><div class='hunk'>@@ -188,6 +200,7 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> CONFIG_SPARSEMEM_STATIC=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=0</div><div class='hunk'>@@ -268,7 +281,7 @@ CONFIG_KEXEC=y</div><div class='ctx'> # CONFIG_PREEMPT_NONE is not set</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='del'>-CONFIG_RCU_TRACE=y</div><div class='add'>+# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> CONFIG_GUSA=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -348,14 +361,13 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='ctx'> # CONFIG_IP_SCTP is not set</div><div class='ctx'> # CONFIG_TIPC is not set</div><div class='ctx'> # CONFIG_ATM is not set</div><div class='add'>+CONFIG_STP=m</div><div class='ctx'> CONFIG_BRIDGE=m</div><div class='ctx'> # CONFIG_VLAN_8021Q is not set</div><div class='ctx'> # CONFIG_DECNET is not set</div><div class='hunk'>@@ -384,6 +396,7 @@ CONFIG_LLC=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> # CONFIG_IEEE80211 is not set</div><div class='ctx'> # CONFIG_RFKILL is not set</div><div class='hunk'>@@ -400,6 +413,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -420,12 +435,14 @@ CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> CONFIG_EEPROM_93CX6=y</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -499,9 +516,13 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='add'>+CONFIG_SATA_PMP=y</div><div class='ctx'> # CONFIG_SATA_AHCI is not set</div><div class='add'>+# CONFIG_SATA_SIL24 is not set</div><div class='add'>+CONFIG_ATA_SFF=y</div><div class='ctx'> # CONFIG_SATA_SVW is not set</div><div class='ctx'> # CONFIG_ATA_PIIX is not set</div><div class='ctx'> # CONFIG_SATA_MV is not set</div><div class='hunk'>@@ -511,7 +532,6 @@ CONFIG_ATA=y</div><div class='ctx'> # CONFIG_SATA_PROMISE is not set</div><div class='ctx'> # CONFIG_SATA_SX4 is not set</div><div class='ctx'> CONFIG_SATA_SIL=y</div><div class='del'>-# CONFIG_SATA_SIL24 is not set</div><div class='ctx'> # CONFIG_SATA_SIS is not set</div><div class='ctx'> # CONFIG_SATA_ULI is not set</div><div class='ctx'> # CONFIG_SATA_VIA is not set</div><div class='hunk'>@@ -556,17 +576,21 @@ CONFIG_SATA_SIL=y</div><div class='ctx'> # CONFIG_PATA_VIA is not set</div><div class='ctx'> # CONFIG_PATA_WINBOND is not set</div><div class='ctx'> CONFIG_PATA_PLATFORM=y</div><div class='add'>+# CONFIG_PATA_SCH is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -585,6 +609,7 @@ CONFIG_AX88796_93CX6=y</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_3COM is not set</div><div class='ctx'> # CONFIG_SMC91X is not set</div><div class='add'>+# CONFIG_SMC911X is not set</div><div class='ctx'> # CONFIG_NET_TULIP is not set</div><div class='ctx'> # CONFIG_HP100 is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='hunk'>@@ -593,7 +618,6 @@ CONFIG_AX88796_93CX6=y</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='ctx'> CONFIG_NET_PCI=y</div><div class='ctx'> CONFIG_PCNET32=m</div><div class='del'>-# CONFIG_PCNET32_NAPI is not set</div><div class='ctx'> # CONFIG_AMD8111_ETH is not set</div><div class='ctx'> # CONFIG_ADAPTEC_STARFIRE is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='hunk'>@@ -616,32 +640,28 @@ CONFIG_8139TOO_8129=y</div><div class='ctx'> # CONFIG_TLAN is not set</div><div class='ctx'> CONFIG_VIA_RHINE=m</div><div class='ctx'> CONFIG_VIA_RHINE_MMIO=y</div><div class='del'>-# CONFIG_VIA_RHINE_NAPI is not set</div><div class='ctx'> # CONFIG_SC92031 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_ACENIC is not set</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> CONFIG_E1000=m</div><div class='del'>-# CONFIG_E1000_NAPI is not set</div><div class='ctx'> # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='ctx'> # CONFIG_HAMACHI is not set</div><div class='ctx'> # CONFIG_YELLOWFIN is not set</div><div class='ctx'> CONFIG_R8169=y</div><div class='del'>-# CONFIG_R8169_NAPI is not set</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -654,6 +674,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_MLX4_CORE is not set</div><div class='ctx'> # CONFIG_TEHUTI is not set</div><div class='ctx'> # CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -661,6 +682,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='hunk'>@@ -701,6 +723,7 @@ CONFIG_KEYBOARD_ATKBD=y</div><div class='ctx'> # CONFIG_KEYBOARD_XTKBD is not set</div><div class='ctx'> # CONFIG_KEYBOARD_NEWTON is not set</div><div class='ctx'> # CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+# CONFIG_KEYBOARD_SH_KEYSC is not set</div><div class='ctx'> # CONFIG_INPUT_MOUSE is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='ctx'> # CONFIG_INPUT_TABLET is not set</div><div class='hunk'>@@ -722,6 +745,7 @@ CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -750,12 +774,7 @@ CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='hunk'>@@ -776,6 +795,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> CONFIG_THERMAL=y</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -787,13 +807,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> CONFIG_DAB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -809,24 +840,9 @@ CONFIG_DAB=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND_PRIME=m</div><div class='del'>-# CONFIG_SOUND_TRIDENT is not set</div><div class='del'>-# CONFIG_SOUND_MSNDCLAS is not set</div><div class='del'>-# CONFIG_SOUND_MSNDPIN is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='ctx'> # CONFIG_HID_DEBUG is not set</div><div class='hunk'>@@ -836,6 +852,8 @@ CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -844,6 +862,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> CONFIG_RTC_LIB=y</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='hunk'>@@ -879,10 +898,7 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_RTC_DRV_SH=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -903,7 +919,6 @@ CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='hunk'>@@ -957,6 +972,7 @@ CONFIG_CONFIGFS_FS=m</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -967,20 +983,17 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=y</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> CONFIG_NFSD_V4=y</div><div class='del'>-CONFIG_NFSD_TCP=y</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1043,6 +1056,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='hunk'>@@ -1050,9 +1064,12 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_DEBUG_SLAB is not set</div><div class='ctx'> # CONFIG_DEBUG_PREEMPT is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='hunk'>@@ -1066,6 +1083,8 @@ CONFIG_SCHED_DEBUG=y</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_FRAME_POINTER is not set</div><div class='hunk'>@@ -1091,51 +1110,84 @@ CONFIG_DEBUG_STACKOVERFLOW=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='del'>-# CONFIG_CRYPTO_SEQIV is not set</div><div class='ctx'> CONFIG_CRYPTO_HASH=y</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=m</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=m</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_HMAC=y</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=m</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=m</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CTR is not set</div><div class='del'>-# CONFIG_CRYPTO_GCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='ctx'> # CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='hunk'>@@ -1144,8 +1196,10 @@ CONFIG_CRYPTO_HW=y</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/sh/configs/r7785rp_defconfig b/arch/sh/configs/r7785rp_defconfig<br/>index 0dc1ce7b9349..1d09d24d4298 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/r7785rp_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/r7785rp_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/r7785rp_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/r7785rp_defconfig</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.24-rc3</div><div class='del'>-# Fri Nov 23 14:03:57 2007</div><div class='add'>+# Linux kernel version: 2.6.26</div><div class='add'>+# Wed Jul 30 00:59:19 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='ctx'> CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='hunk'>@@ -21,6 +22,8 @@ CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='ctx'> CONFIG_ARCH_NO_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='add'>+CONFIG_IO_TRAPPED=y</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -39,18 +42,16 @@ CONFIG_SYSVIPC_SYSCTL=y</div><div class='ctx'> CONFIG_BSD_PROCESS_ACCT=y</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='ctx'> # CONFIG_TASKSTATS is not set</div><div class='del'>-# CONFIG_USER_NS is not set</div><div class='del'>-# CONFIG_PID_NS is not set</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> CONFIG_IKCONFIG=y</div><div class='ctx'> CONFIG_IKCONFIG_PROC=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_CGROUPS is not set</div><div class='del'>-CONFIG_FAIR_GROUP_SCHED=y</div><div class='del'>-CONFIG_FAIR_USER_SCHED=y</div><div class='del'>-# CONFIG_FAIR_CGROUP_SCHED is not set</div><div class='del'>-# CONFIG_SYSFS_DEPRECATED is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='ctx'> # CONFIG_BLK_DEV_INITRD is not set</div><div class='ctx'> CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='hunk'>@@ -64,20 +65,37 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> # CONFIG_FUTEX is not set</div><div class='ctx'> CONFIG_ANON_INODES=y</div><div class='ctx'> # CONFIG_EPOLL is not set</div><div class='ctx'> CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='ctx'> CONFIG_EVENTFD=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_SLUB is not set</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='add'>+CONFIG_PROFILING=y</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_OPROFILE=m</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+# CONFIG_HAVE_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -88,6 +106,7 @@ CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -101,6 +120,7 @@ CONFIG_IOSCHED_NOOP=y</div><div class='ctx'> # CONFIG_DEFAULT_CFQ is not set</div><div class='ctx'> CONFIG_DEFAULT_NOOP=y</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="noop"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # System type</div><div class='hunk'>@@ -109,7 +129,10 @@ CONFIG_CPU_SH4=y</div><div class='ctx'> CONFIG_CPU_SH4A=y</div><div class='ctx'> CONFIG_CPU_SHX2=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7619 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7203 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7206 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7263 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_MXG is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7705 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7706 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7707 is not set</div><div class='hunk'>@@ -118,6 +141,7 @@ CONFIG_CPU_SHX2=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7710 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7712 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7720 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7721 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7750 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7091 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7750R is not set</div><div class='hunk'>@@ -126,12 +150,15 @@ CONFIG_CPU_SHX2=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7751R is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7760 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH4_202 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7723 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7763 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7770 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7780 is not set</div><div class='ctx'> CONFIG_CPU_SUBTYPE_SH7785=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SHX3 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7343 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7722 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7366 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH5_101 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH5_103 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -157,7 +184,9 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> # CONFIG_HUGETLB_PAGE_SIZE_64K is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE_SIZE_256K is not set</div><div class='ctx'> CONFIG_HUGETLB_PAGE_SIZE_1MB=y</div><div class='hunk'>@@ -173,6 +202,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y</div><div class='ctx'> CONFIG_SPARSEMEM_STATIC=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='ctx'> # CONFIG_MEMORY_HOTPLUG is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=0</div><div class='hunk'>@@ -202,6 +232,7 @@ CONFIG_CPU_HAS_FPU=y</div><div class='ctx'> # Board support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SH_HIGHLANDER=y</div><div class='add'>+# CONFIG_SH_SH7785LCR is not set</div><div class='ctx'> # CONFIG_SH_R7780RP is not set</div><div class='ctx'> # CONFIG_SH_R7780MP is not set</div><div class='ctx'> CONFIG_SH_R7785RP=y</div><div class='hunk'>@@ -245,12 +276,13 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='ctx'> # CONFIG_CRASH_DUMP is not set</div><div class='ctx'> # CONFIG_PREEMPT_NONE is not set</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='del'>-CONFIG_PREEMPT_BKL=y</div><div class='add'>+# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> CONFIG_GUSA=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -295,6 +327,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> # CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> # CONFIG_IP_MULTICAST is not set</div><div class='hunk'>@@ -329,14 +362,13 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='ctx'> # CONFIG_IP_SCTP is not set</div><div class='ctx'> # CONFIG_TIPC is not set</div><div class='ctx'> # CONFIG_ATM is not set</div><div class='add'>+CONFIG_STP=m</div><div class='ctx'> CONFIG_BRIDGE=m</div><div class='ctx'> # CONFIG_VLAN_8021Q is not set</div><div class='ctx'> # CONFIG_DECNET is not set</div><div class='hunk'>@@ -355,6 +387,7 @@ CONFIG_LLC=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_PKTGEN is not set</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='ctx'> # CONFIG_IRDA is not set</div><div class='ctx'> # CONFIG_BT is not set</div><div class='ctx'> # CONFIG_AF_RXRPC is not set</div><div class='hunk'>@@ -364,6 +397,7 @@ CONFIG_LLC=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> # CONFIG_IEEE80211 is not set</div><div class='ctx'> # CONFIG_RFKILL is not set</div><div class='hunk'>@@ -380,6 +414,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -397,14 +433,18 @@ CONFIG_BLK_DEV=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='del'>-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> CONFIG_EEPROM_93CX6=y</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -464,6 +504,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='ctx'> # CONFIG_SCSI_INITIO is not set</div><div class='ctx'> # CONFIG_SCSI_INIA100 is not set</div><div class='add'>+# CONFIG_SCSI_MVSAS is not set</div><div class='ctx'> # CONFIG_SCSI_STEX is not set</div><div class='ctx'> # CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='ctx'> # CONFIG_SCSI_IPR is not set</div><div class='hunk'>@@ -476,9 +517,13 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='add'>+CONFIG_SATA_PMP=y</div><div class='ctx'> # CONFIG_SATA_AHCI is not set</div><div class='add'>+# CONFIG_SATA_SIL24 is not set</div><div class='add'>+CONFIG_ATA_SFF=y</div><div class='ctx'> # CONFIG_SATA_SVW is not set</div><div class='ctx'> # CONFIG_ATA_PIIX is not set</div><div class='ctx'> # CONFIG_SATA_MV is not set</div><div class='hunk'>@@ -488,7 +533,6 @@ CONFIG_ATA=y</div><div class='ctx'> # CONFIG_SATA_PROMISE is not set</div><div class='ctx'> # CONFIG_SATA_SX4 is not set</div><div class='ctx'> CONFIG_SATA_SIL=y</div><div class='del'>-# CONFIG_SATA_SIL24 is not set</div><div class='ctx'> # CONFIG_SATA_SIS is not set</div><div class='ctx'> # CONFIG_SATA_ULI is not set</div><div class='ctx'> # CONFIG_SATA_VIA is not set</div><div class='hunk'>@@ -517,6 +561,7 @@ CONFIG_SATA_SIL=y</div><div class='ctx'> # CONFIG_PATA_MPIIX is not set</div><div class='ctx'> # CONFIG_PATA_OLDPIIX is not set</div><div class='ctx'> # CONFIG_PATA_NETCELL is not set</div><div class='add'>+# CONFIG_PATA_NINJA32 is not set</div><div class='ctx'> # CONFIG_PATA_NS87410 is not set</div><div class='ctx'> # CONFIG_PATA_NS87415 is not set</div><div class='ctx'> # CONFIG_PATA_OPTI is not set</div><div class='hunk'>@@ -532,24 +577,27 @@ CONFIG_SATA_SIL=y</div><div class='ctx'> # CONFIG_PATA_VIA is not set</div><div class='ctx'> # CONFIG_PATA_WINBOND is not set</div><div class='ctx'> CONFIG_PATA_PLATFORM=y</div><div class='add'>+# CONFIG_PATA_SCH is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='ctx'> # CONFIG_VETH is not set</div><div class='del'>-# CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_ARCNET is not set</div><div class='ctx'> # CONFIG_PHYLIB is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='hunk'>@@ -576,20 +624,21 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='add'>+# CONFIG_IP1000 is not set</div><div class='add'>+# CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='ctx'> # CONFIG_HAMACHI is not set</div><div class='ctx'> # CONFIG_YELLOWFIN is not set</div><div class='ctx'> CONFIG_R8169=y</div><div class='del'>-# CONFIG_R8169_NAPI is not set</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -601,6 +650,8 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_NIU is not set</div><div class='ctx'> # CONFIG_MLX4_CORE is not set</div><div class='ctx'> # CONFIG_TEHUTI is not set</div><div class='add'>+# CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -608,13 +659,13 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_FDDI is not set</div><div class='ctx'> # CONFIG_HIPPI is not set</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='ctx'> # CONFIG_NET_FC is not set</div><div class='del'>-# CONFIG_SHAPER is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='ctx'> # CONFIG_NET_POLL_CONTROLLER is not set</div><div class='hunk'>@@ -649,6 +700,7 @@ CONFIG_KEYBOARD_ATKBD=y</div><div class='ctx'> # CONFIG_KEYBOARD_XTKBD is not set</div><div class='ctx'> # CONFIG_KEYBOARD_NEWTON is not set</div><div class='ctx'> # CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+# CONFIG_KEYBOARD_SH_KEYSC is not set</div><div class='ctx'> # CONFIG_INPUT_MOUSE is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='ctx'> # CONFIG_INPUT_TABLET is not set</div><div class='hunk'>@@ -670,7 +722,9 @@ CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+# CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Serial drivers</div><div class='hunk'>@@ -697,12 +751,7 @@ CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> CONFIG_HWMON=y</div><div class='hunk'>@@ -722,6 +771,8 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627HF is not set</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -733,13 +784,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -751,15 +813,15 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> # CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB_DDC is not set</div><div class='del'>-# CONFIG_FB_CFB_FILLRECT is not set</div><div class='del'>-# CONFIG_FB_CFB_COPYAREA is not set</div><div class='del'>-# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=m</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=m</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=m</div><div class='ctx'> # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set</div><div class='ctx'> # CONFIG_FB_SYS_FILLRECT is not set</div><div class='ctx'> # CONFIG_FB_SYS_COPYAREA is not set</div><div class='ctx'> # CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_FOREIGN_ENDIAN is not set</div><div class='ctx'> # CONFIG_FB_SYS_FOPS is not set</div><div class='del'>-CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> # CONFIG_FB_SVGALIB is not set</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='ctx'> # CONFIG_FB_BACKLIGHT is not set</div><div class='hunk'>@@ -792,6 +854,8 @@ CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='add'>+CONFIG_FB_SH_MOBILE_LCDC=m</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -800,24 +864,9 @@ CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='ctx'> # CONFIG_LOGO is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=m</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND_PRIME=m</div><div class='del'>-# CONFIG_SOUND_TRIDENT is not set</div><div class='del'>-# CONFIG_SOUND_MSNDCLAS is not set</div><div class='del'>-# CONFIG_SOUND_MSNDPIN is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='ctx'> # CONFIG_HID_DEBUG is not set</div><div class='hunk'>@@ -827,17 +876,17 @@ CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Gadget Support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> CONFIG_RTC_LIB=y</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='hunk'>@@ -861,9 +910,10 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> #</div><div class='ctx'> # Platform RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_DS1511 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_DS1553 is not set</div><div class='del'>-# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_STK17TA8 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M48T86 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M48T59 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_V3020 is not set</div><div class='hunk'>@@ -872,10 +922,7 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_RTC_DRV_SH=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -896,14 +943,11 @@ CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='del'>-CONFIG_MINIX_FS=y</div><div class='del'>-# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='del'>-CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='ctx'> CONFIG_FUSE_FS=m</div><div class='hunk'>@@ -951,8 +995,11 @@ CONFIG_CONFIGFS_FS=m</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='add'>+CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='ctx'> CONFIG_NETWORK_FILESYSTEMS=y</div><div class='hunk'>@@ -960,20 +1007,17 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=y</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> CONFIG_NFSD_V4=y</div><div class='del'>-CONFIG_NFSD_TCP=y</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SUNRPC_GSS=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1028,10 +1072,6 @@ CONFIG_NLS_ISO8859_1=y</div><div class='ctx'> # CONFIG_NLS_KOI8_U is not set</div><div class='ctx'> # CONFIG_NLS_UTF8 is not set</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='del'>-CONFIG_INSTRUMENTATION=y</div><div class='del'>-CONFIG_PROFILING=y</div><div class='del'>-CONFIG_OPROFILE=m</div><div class='del'>-# CONFIG_MARKERS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -1040,6 +1080,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='hunk'>@@ -1050,6 +1091,7 @@ CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_DEBUG_SLAB is not set</div><div class='ctx'> # CONFIG_DEBUG_PREEMPT is not set</div><div class='ctx'> CONFIG_DEBUG_SPINLOCK=y</div><div class='hunk'>@@ -1066,12 +1108,14 @@ CONFIG_STACKTRACE=y</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='del'>-CONFIG_FORCED_INLINING=y</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> CONFIG_SH_STANDARD_BIOS=y</div><div class='hunk'>@@ -1091,54 +1135,96 @@ CONFIG_4KSTACKS=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> CONFIG_CRYPTO_BLKCIPHER=y</div><div class='ctx'> CONFIG_CRYPTO_HASH=y</div><div class='ctx'> CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+CONFIG_CRYPTO_ECB=m</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+CONFIG_CRYPTO_PCBC=m</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_HMAC=y</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-CONFIG_CRYPTO_ECB=m</div><div class='del'>-CONFIG_CRYPTO_CBC=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=m</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='add'>+# CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/sh/configs/rsk7203_defconfig b/arch/sh/configs/rsk7203_defconfig<br/>index a0ebd439cbd2..840fe3843ffa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/rsk7203_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/rsk7203_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/rsk7203_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/rsk7203_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Tue Jun  3 13:02:42 2008</div><div class='add'>+# Linux kernel version: 2.6.26</div><div class='add'>+# Mon Jul 28 22:23:03 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='ctx'> CONFIG_SUPERH32=y</div><div class='hunk'>@@ -33,21 +33,22 @@ CONFIG_LOCALVERSION=""</div><div class='ctx'> CONFIG_SYSVIPC=y</div><div class='ctx'> CONFIG_SYSVIPC_SYSCTL=y</div><div class='ctx'> CONFIG_POSIX_MQUEUE=y</div><div class='del'>-# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='ctx'> # CONFIG_TASKSTATS is not set</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='del'>-# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+# CONFIG_IKCONFIG_PROC is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_CGROUPS is not set</div><div class='del'>-CONFIG_GROUP_SCHED=y</div><div class='del'>-CONFIG_FAIR_GROUP_SCHED=y</div><div class='del'>-# CONFIG_RT_GROUP_SCHED is not set</div><div class='del'>-CONFIG_USER_SCHED=y</div><div class='del'>-# CONFIG_CGROUP_SCHED is not set</div><div class='del'>-CONFIG_SYSFS_DEPRECATED=y</div><div class='del'>-CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='add'>+# CONFIG_SYSFS_DEPRECATED_V2 is not set</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='del'>-# CONFIG_NAMESPACES is not set</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+CONFIG_UTS_NS=y</div><div class='add'>+CONFIG_IPC_NS=y</div><div class='add'>+CONFIG_USER_NS=y</div><div class='add'>+CONFIG_PID_NS=y</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='ctx'> CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='hunk'>@@ -72,26 +73,36 @@ CONFIG_SIGNALFD=y</div><div class='ctx'> CONFIG_TIMERFD=y</div><div class='ctx'> CONFIG_EVENTFD=y</div><div class='ctx'> CONFIG_VM_EVENT_COUNTERS=y</div><div class='del'>-CONFIG_SLAB=y</div><div class='add'>+# CONFIG_SLAB is not set</div><div class='ctx'> # CONFIG_SLUB is not set</div><div class='del'>-# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_SLOB=y</div><div class='ctx'> CONFIG_PROFILING=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_OPROFILE=y</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='del'>-CONFIG_SLABINFO=y</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_TINY_SHMEM=y</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='del'>-# CONFIG_MODULES is not set</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='add'>+# CONFIG_MODULE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -162,7 +173,9 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='hunk'>@@ -196,6 +209,7 @@ CONFIG_CPU_HAS_FPU=y</div><div class='ctx'> #</div><div class='ctx'> # Board support</div><div class='ctx'> #</div><div class='add'>+CONFIG_SH_RSK7203=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Timer and clock configuration</div><div class='hunk'>@@ -274,6 +288,7 @@ CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ignore_loglevel"</div><div class='ctx'> #</div><div class='ctx'> # Executable file formats</div><div class='ctx'> #</div><div class='add'>+CONFIG_BINFMT_ELF_FDPIC=y</div><div class='ctx'> CONFIG_BINFMT_FLAT=y</div><div class='ctx'> CONFIG_BINFMT_ZFLAT=y</div><div class='ctx'> CONFIG_BINFMT_SHARED_FLAT=y</div><div class='hunk'>@@ -424,8 +439,8 @@ CONFIG_MTD_CFI_UTIL=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='ctx'> CONFIG_MTD_PHYSMAP=y</div><div class='del'>-CONFIG_MTD_PHYSMAP_START=0x20000000</div><div class='del'>-CONFIG_MTD_PHYSMAP_LEN=0x01000000</div><div class='add'>+CONFIG_MTD_PHYSMAP_START=0x0</div><div class='add'>+CONFIG_MTD_PHYSMAP_LEN=0x0</div><div class='ctx'> CONFIG_MTD_PHYSMAP_BANKWIDTH=4</div><div class='ctx'> # CONFIG_MTD_UCLINUX is not set</div><div class='ctx'> # CONFIG_MTD_PLATRAM is not set</div><div class='hunk'>@@ -456,9 +471,11 @@ CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_LOOP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='ctx'> # CONFIG_BLK_DEV_RAM is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -475,7 +492,6 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -487,15 +503,15 @@ CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='ctx'> # CONFIG_AX88796 is not set</div><div class='ctx'> # CONFIG_STNIC is not set</div><div class='del'>-CONFIG_SMC91X=y</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+CONFIG_SMC911X=y</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='del'>-CONFIG_NETDEV_1000=y</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='del'>-CONFIG_NETDEV_10000=y</div><div class='add'>+# CONFIG_NETDEV_1000 is not set</div><div class='add'>+# CONFIG_NETDEV_10000 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Wireless LAN</div><div class='hunk'>@@ -503,6 +519,15 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='ctx'> # CONFIG_IWLWIFI_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='hunk'>@@ -587,6 +612,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -605,6 +631,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Multimedia drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_DAB=y</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='hunk'>@@ -618,26 +645,96 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='ctx'> # CONFIG_HID_DEBUG is not set</div><div class='ctx'> # CONFIG_HIDRAW is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> # CONFIG_USB_ARCH_HAS_OHCI is not set</div><div class='ctx'> # CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='del'>-# CONFIG_USB is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+CONFIG_USB_DEVICE_CLASS=y</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='ctx'> # CONFIG_USB_OTG_WHITELIST is not set</div><div class='ctx'> # CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+CONFIG_USB_R8A66597_HCD=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_ADUTUX is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_BERRY_CHARGE is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYPRESS_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGET is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_FTDI_ELAN is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='add'>+# CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='hunk'>@@ -677,6 +774,7 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_RTC_DRV_SH=y</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -734,6 +832,7 @@ CONFIG_SYSFS=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> CONFIG_ROMFS_FS=y</div><div class='hunk'>@@ -743,12 +842,11 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> # CONFIG_NFS_V3 is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -775,16 +873,20 @@ CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='del'>-# CONFIG_DEBUG_FS is not set</div><div class='add'>+CONFIG_DEBUG_FS=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_DEBUG_SHIRQ=y</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='del'>-# CONFIG_DEBUG_OBJECTS is not set</div><div class='del'>-# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+CONFIG_DEBUG_OBJECTS=y</div><div class='add'>+# CONFIG_DEBUG_OBJECTS_SELFTEST is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS_FREE is not set</div><div class='add'>+# CONFIG_DEBUG_OBJECTS_TIMERS is not set</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='ctx'> # CONFIG_RT_MUTEX_TESTER is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='hunk'>@@ -797,12 +899,14 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='del'>-# CONFIG_DEBUG_VM is not set</div><div class='del'>-# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='del'>-# CONFIG_DEBUG_LIST is not set</div><div class='del'>-# CONFIG_DEBUG_SG is not set</div><div class='add'>+CONFIG_DEBUG_VM=y</div><div class='add'>+CONFIG_DEBUG_WRITECOUNT=y</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+CONFIG_DEBUG_LIST=y</div><div class='add'>+CONFIG_DEBUG_SG=y</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='hunk'>@@ -830,6 +934,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/sh/configs/rts7751r2d1_defconfig b/arch/sh/configs/rts7751r2d1_defconfig<br/>index 3a915fd436d9..8413236c1b37 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/rts7751r2d1_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/rts7751r2d1_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/rts7751r2d1_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/rts7751r2d1_defconfig</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.24</div><div class='del'>-# Thu Feb  7 16:25:55 2008</div><div class='add'>+# Linux kernel version: 2.6.26</div><div class='add'>+# Wed Jul 30 01:55:52 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='ctx'> CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='hunk'>@@ -20,6 +21,8 @@ CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='ctx'> CONFIG_ARCH_NO_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='add'>+CONFIG_IO_TRAPPED=y</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -36,17 +39,15 @@ CONFIG_SYSVIPC_SYSCTL=y</div><div class='ctx'> # CONFIG_POSIX_MQUEUE is not set</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT is not set</div><div class='ctx'> # CONFIG_TASKSTATS is not set</div><div class='del'>-# CONFIG_USER_NS is not set</div><div class='del'>-# CONFIG_PID_NS is not set</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_CGROUPS is not set</div><div class='del'>-CONFIG_FAIR_GROUP_SCHED=y</div><div class='del'>-CONFIG_FAIR_USER_SCHED=y</div><div class='del'>-# CONFIG_FAIR_CGROUP_SCHED is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='ctx'> # CONFIG_BLK_DEV_INITRD is not set</div><div class='ctx'> # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='hunk'>@@ -76,22 +77,31 @@ CONFIG_PROFILING=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_OPROFILE=y</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> # CONFIG_MODULE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -106,7 +116,6 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> CONFIG_CLASSIC_RCU=y</div><div class='del'>-# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # System type</div><div class='hunk'>@@ -116,6 +125,7 @@ CONFIG_CPU_SH4=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7203 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7206 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7263 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_MXG is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7705 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7706 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7707 is not set</div><div class='hunk'>@@ -133,6 +143,7 @@ CONFIG_CPU_SH4=y</div><div class='ctx'> CONFIG_CPU_SUBTYPE_SH7751R=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7760 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH4_202 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7723 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7763 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7770 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7780 is not set</div><div class='hunk'>@@ -140,6 +151,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SHX3 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7343 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7722 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7366 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH5_101 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH5_103 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -161,7 +173,9 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='hunk'>@@ -170,6 +184,7 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> CONFIG_SPARSEMEM_STATIC=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=0</div><div class='hunk'>@@ -256,7 +271,6 @@ CONFIG_HZ=250</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='del'>-CONFIG_RCU_TRACE=y</div><div class='ctx'> CONFIG_GUSA=y</div><div class='ctx'> # CONFIG_GUSA_RB is not set</div><div class='ctx'> </div><div class='hunk'>@@ -332,8 +346,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -367,6 +379,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> # CONFIG_IEEE80211 is not set</div><div class='ctx'> # CONFIG_RFKILL is not set</div><div class='hunk'>@@ -383,6 +396,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='hunk'>@@ -399,14 +414,18 @@ CONFIG_BLK_DEV=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='del'>-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -466,6 +485,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='ctx'> # CONFIG_SCSI_INITIO is not set</div><div class='ctx'> # CONFIG_SCSI_INIA100 is not set</div><div class='add'>+# CONFIG_SCSI_MVSAS is not set</div><div class='ctx'> # CONFIG_SCSI_STEX is not set</div><div class='ctx'> # CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='ctx'> # CONFIG_SCSI_IPR is not set</div><div class='hunk'>@@ -478,9 +498,13 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='add'>+CONFIG_SATA_PMP=y</div><div class='ctx'> # CONFIG_SATA_AHCI is not set</div><div class='add'>+# CONFIG_SATA_SIL24 is not set</div><div class='add'>+CONFIG_ATA_SFF=y</div><div class='ctx'> # CONFIG_SATA_SVW is not set</div><div class='ctx'> # CONFIG_ATA_PIIX is not set</div><div class='ctx'> # CONFIG_SATA_MV is not set</div><div class='hunk'>@@ -490,7 +514,6 @@ CONFIG_ATA=y</div><div class='ctx'> # CONFIG_SATA_PROMISE is not set</div><div class='ctx'> # CONFIG_SATA_SX4 is not set</div><div class='ctx'> # CONFIG_SATA_SIL is not set</div><div class='del'>-# CONFIG_SATA_SIL24 is not set</div><div class='ctx'> # CONFIG_SATA_SIS is not set</div><div class='ctx'> # CONFIG_SATA_ULI is not set</div><div class='ctx'> # CONFIG_SATA_VIA is not set</div><div class='hunk'>@@ -535,17 +558,21 @@ CONFIG_ATA=y</div><div class='ctx'> # CONFIG_PATA_VIA is not set</div><div class='ctx'> # CONFIG_PATA_WINBOND is not set</div><div class='ctx'> CONFIG_PATA_PLATFORM=y</div><div class='add'>+# CONFIG_PATA_SCH is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -564,6 +591,7 @@ CONFIG_MII=y</div><div class='ctx'> # CONFIG_NET_VENDOR_3COM is not set</div><div class='ctx'> # CONFIG_SMC91X is not set</div><div class='ctx'> # CONFIG_ENC28J60 is not set</div><div class='add'>+# CONFIG_SMC911X is not set</div><div class='ctx'> # CONFIG_NET_TULIP is not set</div><div class='ctx'> # CONFIG_HP100 is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='hunk'>@@ -599,7 +627,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -609,12 +636,12 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -627,6 +654,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_MLX4_CORE is not set</div><div class='ctx'> # CONFIG_TEHUTI is not set</div><div class='ctx'> # CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -634,6 +662,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Network Adapters</div><div class='hunk'>@@ -690,9 +719,11 @@ CONFIG_INPUT=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -726,10 +757,6 @@ CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> CONFIG_SPI=y</div><div class='ctx'> CONFIG_SPI_MASTER=y</div><div class='ctx'> </div><div class='hunk'>@@ -765,6 +792,8 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627HF is not set</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -776,13 +805,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> CONFIG_MFD_SM501=y</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> CONFIG_DAB=y</div><div class='ctx'> # CONFIG_USB_DABUSB is not set</div><div class='ctx'> </div><div class='hunk'>@@ -802,8 +842,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_SYS_FILLRECT is not set</div><div class='ctx'> # CONFIG_FB_SYS_COPYAREA is not set</div><div class='ctx'> # CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_FOREIGN_ENDIAN is not set</div><div class='ctx'> # CONFIG_FB_SYS_FOPS is not set</div><div class='del'>-CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> # CONFIG_FB_SVGALIB is not set</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='ctx'> # CONFIG_FB_BACKLIGHT is not set</div><div class='hunk'>@@ -836,6 +876,8 @@ CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='add'>+CONFIG_FB_SH_MOBILE_LCDC=m</div><div class='ctx'> CONFIG_FB_SM501=y</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='hunk'>@@ -862,15 +904,7 @@ CONFIG_LOGO=y</div><div class='ctx'> # CONFIG_LOGO_SUPERH_MONO is not set</div><div class='ctx'> # CONFIG_LOGO_SUPERH_VGA16 is not set</div><div class='ctx'> CONFIG_LOGO_SUPERH_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=m</div><div class='ctx'> CONFIG_SND_TIMER=m</div><div class='ctx'> CONFIG_SND_PCM=m</div><div class='hunk'>@@ -884,21 +918,17 @@ CONFIG_SND_SUPPORT_OLD_API=y</div><div class='ctx'> CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_VMASTER=y</div><div class='ctx'> CONFIG_SND_MPU401_UART=m</div><div class='ctx'> CONFIG_SND_OPL3_LIB=m</div><div class='ctx'> CONFIG_SND_AC97_CODEC=m</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='ctx'> # CONFIG_SND_DUMMY is not set</div><div class='ctx'> # CONFIG_SND_MTPAV is not set</div><div class='ctx'> # CONFIG_SND_SERIAL_U16550 is not set</div><div class='ctx'> # CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='add'>+CONFIG_SND_PCI=y</div><div class='ctx'> # CONFIG_SND_AD1889 is not set</div><div class='ctx'> # CONFIG_SND_ALS300 is not set</div><div class='ctx'> # CONFIG_SND_ALI5451 is not set</div><div class='hunk'>@@ -907,6 +937,7 @@ CONFIG_SND_AC97_CODEC=m</div><div class='ctx'> # CONFIG_SND_AU8810 is not set</div><div class='ctx'> # CONFIG_SND_AU8820 is not set</div><div class='ctx'> # CONFIG_SND_AU8830 is not set</div><div class='add'>+# CONFIG_SND_AW2 is not set</div><div class='ctx'> # CONFIG_SND_AZT3328 is not set</div><div class='ctx'> # CONFIG_SND_BT87X is not set</div><div class='ctx'> # CONFIG_SND_CA0106 is not set</div><div class='hunk'>@@ -957,43 +988,13 @@ CONFIG_SND_AC97_CODEC=m</div><div class='ctx'> # CONFIG_SND_VIRTUOSO is not set</div><div class='ctx'> # CONFIG_SND_VX222 is not set</div><div class='ctx'> CONFIG_SND_YMFPCI=m</div><div class='del'>-CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y</div><div class='del'>-# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SUPERH devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_SPI=y</div><div class='add'>+CONFIG_SND_SUPERH=y</div><div class='add'>+CONFIG_SND_USB=y</div><div class='ctx'> # CONFIG_SND_USB_AUDIO is not set</div><div class='ctx'> # CONFIG_SND_USB_CAIAQ is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio support for SuperH</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND_PRIME=m</div><div class='del'>-# CONFIG_SOUND_TRIDENT is not set</div><div class='del'>-# CONFIG_SOUND_MSNDCLAS is not set</div><div class='del'>-# CONFIG_SOUND_MSNDPIN is not set</div><div class='ctx'> CONFIG_AC97_BUS=m</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -1022,12 +1023,16 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y</div><div class='ctx'> CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='ctx'> # CONFIG_USB_EHCI_HCD is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='hunk'>@@ -1041,6 +1046,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> # CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -1060,7 +1066,9 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> CONFIG_USB_LIBUSUAL=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1096,9 +1104,12 @@ CONFIG_USB_LIBUSUAL=y</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> CONFIG_RTC_LIB=y</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='hunk'>@@ -1118,6 +1129,8 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_M41T94 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1305 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_MAX6902 is not set</div><div class='ctx'> CONFIG_RTC_DRV_R9701=y</div><div class='ctx'> # CONFIG_RTC_DRV_RS5C348 is not set</div><div class='hunk'>@@ -1137,10 +1150,7 @@ CONFIG_RTC_DRV_R9701=y</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_RTC_DRV_SH is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1155,14 +1165,11 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='del'>-CONFIG_MINIX_FS=y</div><div class='del'>-# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='del'>-CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='ctx'> # CONFIG_FUSE_FS is not set</div><div class='hunk'>@@ -1208,8 +1215,11 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='add'>+CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='ctx'> CONFIG_NETWORK_FILESYSTEMS=y</div><div class='hunk'>@@ -1275,12 +1285,14 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> # CONFIG_SH_STANDARD_BIOS is not set</div><div class='ctx'> CONFIG_EARLY_SCIF_CONSOLE=y</div><div class='hunk'>@@ -1295,48 +1307,81 @@ CONFIG_EARLY_PRINTK=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='del'>-# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_MANAGER is not set</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CBC is not set</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+# CONFIG_CRYPTO_ECB is not set</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-# CONFIG_CRYPTO_ECB is not set</div><div class='del'>-# CONFIG_CRYPTO_CBC is not set</div><div class='del'>-# CONFIG_CRYPTO_PCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CTR is not set</div><div class='del'>-# CONFIG_CRYPTO_GCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-# CONFIG_CRYPTO_DES is not set</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_DES is not set</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='ctx'> # CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='hunk'>@@ -1345,8 +1390,10 @@ CONFIG_CRYPTO_HW=y</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/sh/configs/rts7751r2dplus_defconfig b/arch/sh/configs/rts7751r2dplus_defconfig<br/>index 0a6d3b9e648b..7d9fa6e9ded5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/rts7751r2dplus_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/rts7751r2dplus_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/rts7751r2dplus_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/rts7751r2dplus_defconfig</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.24</div><div class='del'>-# Thu Feb  7 16:17:47 2008</div><div class='add'>+# Linux kernel version: 2.6.26</div><div class='add'>+# Wed Jul 30 01:59:18 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='ctx'> CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='hunk'>@@ -20,6 +21,8 @@ CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='ctx'> CONFIG_ARCH_NO_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='add'>+CONFIG_IO_TRAPPED=y</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -36,17 +39,15 @@ CONFIG_SYSVIPC_SYSCTL=y</div><div class='ctx'> # CONFIG_POSIX_MQUEUE is not set</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT is not set</div><div class='ctx'> # CONFIG_TASKSTATS is not set</div><div class='del'>-# CONFIG_USER_NS is not set</div><div class='del'>-# CONFIG_PID_NS is not set</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_CGROUPS is not set</div><div class='del'>-CONFIG_FAIR_GROUP_SCHED=y</div><div class='del'>-CONFIG_FAIR_USER_SCHED=y</div><div class='del'>-# CONFIG_FAIR_CGROUP_SCHED is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='ctx'> # CONFIG_BLK_DEV_INITRD is not set</div><div class='ctx'> # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='hunk'>@@ -76,22 +77,31 @@ CONFIG_PROFILING=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_OPROFILE=y</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> # CONFIG_MODULE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -106,7 +116,6 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> CONFIG_CLASSIC_RCU=y</div><div class='del'>-# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # System type</div><div class='hunk'>@@ -116,6 +125,7 @@ CONFIG_CPU_SH4=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7203 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7206 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7263 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_MXG is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7705 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7706 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7707 is not set</div><div class='hunk'>@@ -133,6 +143,7 @@ CONFIG_CPU_SH4=y</div><div class='ctx'> CONFIG_CPU_SUBTYPE_SH7751R=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7760 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH4_202 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7723 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7763 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7770 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7780 is not set</div><div class='hunk'>@@ -140,6 +151,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SHX3 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7343 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7722 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7366 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH5_101 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH5_103 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -161,7 +173,9 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='hunk'>@@ -170,6 +184,7 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> CONFIG_SPARSEMEM_STATIC=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=0</div><div class='hunk'>@@ -256,7 +271,6 @@ CONFIG_HZ=250</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='del'>-CONFIG_RCU_TRACE=y</div><div class='ctx'> CONFIG_GUSA=y</div><div class='ctx'> # CONFIG_GUSA_RB is not set</div><div class='ctx'> </div><div class='hunk'>@@ -332,8 +346,6 @@ CONFIG_TCP_CONG_CUBIC=y</div><div class='ctx'> CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> # CONFIG_TCP_MD5SIG is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='del'>-# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -367,6 +379,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> # CONFIG_IEEE80211 is not set</div><div class='ctx'> # CONFIG_RFKILL is not set</div><div class='hunk'>@@ -383,6 +396,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='ctx'> # CONFIG_MTD is not set</div><div class='hunk'>@@ -399,14 +414,18 @@ CONFIG_BLK_DEV=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='del'>-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='ctx'> # CONFIG_EEPROM_93CX6 is not set</div><div class='ctx'> # CONFIG_SGI_IOC4 is not set</div><div class='ctx'> # CONFIG_TIFM_CORE is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -466,6 +485,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='ctx'> # CONFIG_SCSI_INITIO is not set</div><div class='ctx'> # CONFIG_SCSI_INIA100 is not set</div><div class='add'>+# CONFIG_SCSI_MVSAS is not set</div><div class='ctx'> # CONFIG_SCSI_STEX is not set</div><div class='ctx'> # CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='ctx'> # CONFIG_SCSI_IPR is not set</div><div class='hunk'>@@ -478,9 +498,13 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='add'>+CONFIG_SATA_PMP=y</div><div class='ctx'> # CONFIG_SATA_AHCI is not set</div><div class='add'>+# CONFIG_SATA_SIL24 is not set</div><div class='add'>+CONFIG_ATA_SFF=y</div><div class='ctx'> # CONFIG_SATA_SVW is not set</div><div class='ctx'> # CONFIG_ATA_PIIX is not set</div><div class='ctx'> # CONFIG_SATA_MV is not set</div><div class='hunk'>@@ -490,7 +514,6 @@ CONFIG_ATA=y</div><div class='ctx'> # CONFIG_SATA_PROMISE is not set</div><div class='ctx'> # CONFIG_SATA_SX4 is not set</div><div class='ctx'> # CONFIG_SATA_SIL is not set</div><div class='del'>-# CONFIG_SATA_SIL24 is not set</div><div class='ctx'> # CONFIG_SATA_SIS is not set</div><div class='ctx'> # CONFIG_SATA_ULI is not set</div><div class='ctx'> # CONFIG_SATA_VIA is not set</div><div class='hunk'>@@ -535,17 +558,21 @@ CONFIG_ATA=y</div><div class='ctx'> # CONFIG_PATA_VIA is not set</div><div class='ctx'> # CONFIG_PATA_WINBOND is not set</div><div class='ctx'> CONFIG_PATA_PLATFORM=y</div><div class='add'>+# CONFIG_PATA_SCH is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -564,6 +591,7 @@ CONFIG_MII=y</div><div class='ctx'> # CONFIG_NET_VENDOR_3COM is not set</div><div class='ctx'> # CONFIG_SMC91X is not set</div><div class='ctx'> # CONFIG_ENC28J60 is not set</div><div class='add'>+# CONFIG_SMC911X is not set</div><div class='ctx'> # CONFIG_NET_TULIP is not set</div><div class='ctx'> # CONFIG_HP100 is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='hunk'>@@ -599,7 +627,6 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> # CONFIG_E1000 is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -609,12 +636,12 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -627,6 +654,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_MLX4_CORE is not set</div><div class='ctx'> # CONFIG_TEHUTI is not set</div><div class='ctx'> # CONFIG_BNX2X is not set</div><div class='add'>+# CONFIG_SFC is not set</div><div class='ctx'> # CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -634,6 +662,7 @@ CONFIG_NETDEV_10000=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Network Adapters</div><div class='hunk'>@@ -690,9 +719,11 @@ CONFIG_INPUT=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='hunk'>@@ -726,10 +757,6 @@ CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> CONFIG_SPI=y</div><div class='ctx'> CONFIG_SPI_MASTER=y</div><div class='ctx'> </div><div class='hunk'>@@ -765,6 +792,8 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_W83627HF is not set</div><div class='ctx'> # CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -776,13 +805,24 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> CONFIG_MFD_SM501=y</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> CONFIG_DAB=y</div><div class='ctx'> # CONFIG_USB_DABUSB is not set</div><div class='ctx'> </div><div class='hunk'>@@ -802,8 +842,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_SYS_FILLRECT is not set</div><div class='ctx'> # CONFIG_FB_SYS_COPYAREA is not set</div><div class='ctx'> # CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_FOREIGN_ENDIAN is not set</div><div class='ctx'> # CONFIG_FB_SYS_FOPS is not set</div><div class='del'>-CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> # CONFIG_FB_SVGALIB is not set</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='ctx'> # CONFIG_FB_BACKLIGHT is not set</div><div class='hunk'>@@ -836,6 +876,8 @@ CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='add'>+CONFIG_FB_SH_MOBILE_LCDC=m</div><div class='ctx'> CONFIG_FB_SM501=y</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='hunk'>@@ -862,15 +904,7 @@ CONFIG_LOGO=y</div><div class='ctx'> # CONFIG_LOGO_SUPERH_MONO is not set</div><div class='ctx'> # CONFIG_LOGO_SUPERH_VGA16 is not set</div><div class='ctx'> CONFIG_LOGO_SUPERH_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=m</div><div class='ctx'> CONFIG_SND_TIMER=m</div><div class='ctx'> CONFIG_SND_PCM=m</div><div class='hunk'>@@ -884,21 +918,17 @@ CONFIG_SND_SUPPORT_OLD_API=y</div><div class='ctx'> CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_VMASTER=y</div><div class='ctx'> CONFIG_SND_MPU401_UART=m</div><div class='ctx'> CONFIG_SND_OPL3_LIB=m</div><div class='ctx'> CONFIG_SND_AC97_CODEC=m</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='ctx'> # CONFIG_SND_DUMMY is not set</div><div class='ctx'> # CONFIG_SND_MTPAV is not set</div><div class='ctx'> # CONFIG_SND_SERIAL_U16550 is not set</div><div class='ctx'> # CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='add'>+CONFIG_SND_PCI=y</div><div class='ctx'> # CONFIG_SND_AD1889 is not set</div><div class='ctx'> # CONFIG_SND_ALS300 is not set</div><div class='ctx'> # CONFIG_SND_ALI5451 is not set</div><div class='hunk'>@@ -907,6 +937,7 @@ CONFIG_SND_AC97_CODEC=m</div><div class='ctx'> # CONFIG_SND_AU8810 is not set</div><div class='ctx'> # CONFIG_SND_AU8820 is not set</div><div class='ctx'> # CONFIG_SND_AU8830 is not set</div><div class='add'>+# CONFIG_SND_AW2 is not set</div><div class='ctx'> # CONFIG_SND_AZT3328 is not set</div><div class='ctx'> # CONFIG_SND_BT87X is not set</div><div class='ctx'> # CONFIG_SND_CA0106 is not set</div><div class='hunk'>@@ -957,43 +988,13 @@ CONFIG_SND_AC97_CODEC=m</div><div class='ctx'> # CONFIG_SND_VIRTUOSO is not set</div><div class='ctx'> # CONFIG_SND_VX222 is not set</div><div class='ctx'> CONFIG_SND_YMFPCI=m</div><div class='del'>-CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y</div><div class='del'>-# CONFIG_SND_AC97_POWER_SAVE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SUPERH devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_SPI=y</div><div class='add'>+CONFIG_SND_SUPERH=y</div><div class='add'>+CONFIG_SND_USB=y</div><div class='ctx'> # CONFIG_SND_USB_AUDIO is not set</div><div class='ctx'> # CONFIG_SND_USB_CAIAQ is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio support for SuperH</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND_PRIME=m</div><div class='del'>-# CONFIG_SOUND_TRIDENT is not set</div><div class='del'>-# CONFIG_SOUND_MSNDCLAS is not set</div><div class='del'>-# CONFIG_SOUND_MSNDPIN is not set</div><div class='ctx'> CONFIG_AC97_BUS=m</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -1022,12 +1023,16 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y</div><div class='ctx'> CONFIG_USB_DEVICE_CLASS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='ctx'> # CONFIG_USB_EHCI_HCD is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set</div><div class='hunk'>@@ -1041,6 +1046,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> # CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -1060,7 +1066,9 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> CONFIG_USB_LIBUSUAL=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1096,9 +1104,12 @@ CONFIG_USB_LIBUSUAL=y</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> CONFIG_RTC_LIB=y</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='hunk'>@@ -1118,6 +1129,8 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_M41T94 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1305 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_MAX6902 is not set</div><div class='ctx'> CONFIG_RTC_DRV_R9701=y</div><div class='ctx'> # CONFIG_RTC_DRV_RS5C348 is not set</div><div class='hunk'>@@ -1137,10 +1150,7 @@ CONFIG_RTC_DRV_R9701=y</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_RTC_DRV_SH is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1155,14 +1165,11 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='del'>-CONFIG_MINIX_FS=y</div><div class='del'>-# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='del'>-CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='ctx'> # CONFIG_FUSE_FS is not set</div><div class='hunk'>@@ -1208,8 +1215,11 @@ CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='add'>+CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='ctx'> CONFIG_NETWORK_FILESYSTEMS=y</div><div class='hunk'>@@ -1275,12 +1285,14 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> # CONFIG_SH_STANDARD_BIOS is not set</div><div class='ctx'> CONFIG_EARLY_SCIF_CONSOLE=y</div><div class='hunk'>@@ -1295,48 +1307,81 @@ CONFIG_EARLY_PRINTK=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='del'>-# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_MANAGER is not set</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CBC is not set</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+# CONFIG_CRYPTO_ECB is not set</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-# CONFIG_CRYPTO_ECB is not set</div><div class='del'>-# CONFIG_CRYPTO_CBC is not set</div><div class='del'>-# CONFIG_CRYPTO_PCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CTR is not set</div><div class='del'>-# CONFIG_CRYPTO_GCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CCM is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-# CONFIG_CRYPTO_DES is not set</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_DES is not set</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_SEED is not set</div><div class='ctx'> # CONFIG_CRYPTO_SALSA20 is not set</div><div class='add'>+# CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='ctx'> # CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='ctx'> # CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='hunk'>@@ -1345,8 +1390,10 @@ CONFIG_CRYPTO_HW=y</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/sh/configs/sdk7780_defconfig b/arch/sh/configs/sdk7780_defconfig<br/>index bb9bcd6591ab..6d834f242905 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/sdk7780_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/sdk7780_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/sdk7780_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/sdk7780_defconfig</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.24-rc7</div><div class='del'>-# Tue Jan 22 11:34:03 2008</div><div class='add'>+# Linux kernel version: 2.6.26</div><div class='add'>+# Wed Jul 30 02:00:12 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='ctx'> CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='hunk'>@@ -20,6 +21,7 @@ CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='ctx'> CONFIG_ARCH_NO_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -38,24 +40,23 @@ CONFIG_POSIX_MQUEUE=y</div><div class='ctx'> CONFIG_BSD_PROCESS_ACCT=y</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='ctx'> # CONFIG_TASKSTATS is not set</div><div class='del'>-# CONFIG_USER_NS is not set</div><div class='del'>-# CONFIG_PID_NS is not set</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> CONFIG_IKCONFIG=y</div><div class='ctx'> CONFIG_IKCONFIG_PROC=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=18</div><div class='ctx'> # CONFIG_CGROUPS is not set</div><div class='del'>-CONFIG_FAIR_GROUP_SCHED=y</div><div class='del'>-CONFIG_FAIR_USER_SCHED=y</div><div class='del'>-# CONFIG_FAIR_CGROUP_SCHED is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='ctx'> CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='ctx'> CONFIG_RELAY=y</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='ctx'> # CONFIG_BLK_DEV_INITRD is not set</div><div class='ctx'> CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='hunk'>@@ -63,11 +64,13 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_ANON_INODES=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='ctx'> CONFIG_EVENTFD=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_VM_EVENT_COUNTERS=y</div><div class='hunk'>@@ -75,11 +78,24 @@ CONFIG_SLUB_DEBUG=y</div><div class='ctx'> # CONFIG_SLAB is not set</div><div class='ctx'> CONFIG_SLUB=y</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+# CONFIG_HAVE_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='hunk'>@@ -90,6 +106,7 @@ CONFIG_LBD=y</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -103,6 +120,7 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_CFQ is not set</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # System type</div><div class='hunk'>@@ -113,6 +131,7 @@ CONFIG_CPU_SH4A=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7203 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7206 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7263 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_MXG is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7705 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7706 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7707 is not set</div><div class='hunk'>@@ -130,6 +149,7 @@ CONFIG_CPU_SH4A=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7751R is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7760 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH4_202 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7723 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7763 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7770 is not set</div><div class='ctx'> CONFIG_CPU_SUBTYPE_SH7780=y</div><div class='hunk'>@@ -137,6 +157,7 @@ CONFIG_CPU_SUBTYPE_SH7780=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SHX3 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7343 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7722 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7366 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH5_101 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH5_103 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -159,7 +180,9 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_HUGETLB_PAGE_SIZE_64K=y</div><div class='ctx'> # CONFIG_HUGETLB_PAGE_SIZE_256K is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE_SIZE_1MB is not set</div><div class='hunk'>@@ -174,6 +197,7 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> CONFIG_SPARSEMEM_STATIC=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=0</div><div class='hunk'>@@ -205,7 +229,6 @@ CONFIG_CPU_HAS_FPU=y</div><div class='ctx'> # CONFIG_SH_7780_SOLUTION_ENGINE is not set</div><div class='ctx'> CONFIG_SH_SDK7780=y</div><div class='ctx'> # CONFIG_SH_HIGHLANDER is not set</div><div class='del'>-# CONFIG_SH_SDK7780_STANDALONE is not set</div><div class='ctx'> CONFIG_SH_SDK7780_BASE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -250,12 +273,13 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='ctx'> # CONFIG_KEXEC is not set</div><div class='ctx'> # CONFIG_CRASH_DUMP is not set</div><div class='ctx'> # CONFIG_PREEMPT_NONE is not set</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='del'>-CONFIG_PREEMPT_BKL=y</div><div class='add'>+# CONFIG_PREEMPT_RCU is not set</div><div class='ctx'> CONFIG_GUSA=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -321,6 +345,7 @@ CONFIG_XFRM=y</div><div class='ctx'> # CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_XFRM_SUB_POLICY is not set</div><div class='ctx'> # CONFIG_XFRM_MIGRATE is not set</div><div class='add'>+# CONFIG_XFRM_STATISTICS is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_MULTICAST=y</div><div class='hunk'>@@ -370,8 +395,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y</div><div class='ctx'> # CONFIG_INET6_XFRM_MODE_BEET is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set</div><div class='ctx'> CONFIG_IPV6_SIT=y</div><div class='add'>+CONFIG_IPV6_NDISC_NODETYPE=y</div><div class='ctx'> # CONFIG_IPV6_TUNNEL is not set</div><div class='ctx'> # CONFIG_IPV6_MULTIPLE_TABLES is not set</div><div class='add'>+# CONFIG_IPV6_MROUTE is not set</div><div class='ctx'> # CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_IP_DCCP is not set</div><div class='hunk'>@@ -397,7 +424,6 @@ CONFIG_NET_SCHED=y</div><div class='ctx'> # CONFIG_NET_SCH_HTB is not set</div><div class='ctx'> # CONFIG_NET_SCH_HFSC is not set</div><div class='ctx'> # CONFIG_NET_SCH_PRIO is not set</div><div class='del'>-# CONFIG_NET_SCH_RR is not set</div><div class='ctx'> # CONFIG_NET_SCH_RED is not set</div><div class='ctx'> # CONFIG_NET_SCH_SFQ is not set</div><div class='ctx'> # CONFIG_NET_SCH_TEQL is not set</div><div class='hunk'>@@ -405,7 +431,6 @@ CONFIG_NET_SCHED=y</div><div class='ctx'> # CONFIG_NET_SCH_GRED is not set</div><div class='ctx'> # CONFIG_NET_SCH_DSMARK is not set</div><div class='ctx'> # CONFIG_NET_SCH_NETEM is not set</div><div class='del'>-# CONFIG_NET_SCH_INGRESS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Classification</div><div class='hunk'>@@ -417,9 +442,9 @@ CONFIG_NET_SCHED=y</div><div class='ctx'> # CONFIG_NET_CLS_U32 is not set</div><div class='ctx'> # CONFIG_NET_CLS_RSVP is not set</div><div class='ctx'> # CONFIG_NET_CLS_RSVP6 is not set</div><div class='add'>+# CONFIG_NET_CLS_FLOW is not set</div><div class='ctx'> # CONFIG_NET_EMATCH is not set</div><div class='ctx'> # CONFIG_NET_CLS_ACT is not set</div><div class='del'>-# CONFIG_NET_CLS_POLICE is not set</div><div class='ctx'> CONFIG_NET_SCH_FIFO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -427,6 +452,7 @@ CONFIG_NET_SCH_FIFO=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_PKTGEN is not set</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_CAN is not set</div><div class='ctx'> # CONFIG_IRDA is not set</div><div class='ctx'> # CONFIG_BT is not set</div><div class='ctx'> # CONFIG_AF_RXRPC is not set</div><div class='hunk'>@@ -452,6 +478,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> # CONFIG_DEBUG_DEVRES is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -475,16 +503,18 @@ CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='del'>-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024</div><div class='add'>+# CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> # CONFIG_MISC_DEVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='ctx'> CONFIG_IDE=y</div><div class='ctx'> CONFIG_IDE_MAX_HWIFS=4</div><div class='ctx'> CONFIG_BLK_DEV_IDE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Please see Documentation/ide.txt for help/info on IDE drives</div><div class='add'>+# Please see Documentation/ide/ide.txt for help/info on IDE drives</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDEDISK=y</div><div class='hunk'>@@ -492,6 +522,7 @@ CONFIG_IDEDISK_MULTI_MODE=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDECS is not set</div><div class='ctx'> # CONFIG_BLK_DEV_DELKIN is not set</div><div class='ctx'> CONFIG_BLK_DEV_IDECD=y</div><div class='add'>+CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDETAPE is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDEFLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDESCSI is not set</div><div class='hunk'>@@ -501,14 +532,12 @@ CONFIG_IDE_PROC_FS=y</div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='ctx'> CONFIG_BLK_DEV_PLATFORM=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCI IDE chipsets support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BLK_DEV_IDEPCI=y</div><div class='del'>-# CONFIG_IDEPCI_SHARE_IRQ is not set</div><div class='ctx'> CONFIG_IDEPCI_PCIBUS_ORDER=y</div><div class='ctx'> # CONFIG_BLK_DEV_OFFBOARD is not set</div><div class='ctx'> CONFIG_BLK_DEV_GENERIC=y</div><div class='hunk'>@@ -518,10 +547,8 @@ CONFIG_BLK_DEV_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_AMD74XX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CMD64X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5520 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HPT366 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_JMICRON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SC1200 is not set</div><div class='hunk'>@@ -537,10 +564,7 @@ CONFIG_BLK_DEV_GENERIC=y</div><div class='ctx'> # CONFIG_BLK_DEV_TRM290 is not set</div><div class='ctx'> # CONFIG_BLK_DEV_VIA82CXXX is not set</div><div class='ctx'> # CONFIG_BLK_DEV_TC86C001 is not set</div><div class='del'>-# CONFIG_IDE_ARM is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDEDMA is not set</div><div class='del'>-# CONFIG_IDE_ARCH_OBSOLETE_INIT is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='hunk'>@@ -600,6 +624,7 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='ctx'> # CONFIG_SCSI_INITIO is not set</div><div class='ctx'> # CONFIG_SCSI_INIA100 is not set</div><div class='add'>+# CONFIG_SCSI_MVSAS is not set</div><div class='ctx'> # CONFIG_SCSI_STEX is not set</div><div class='ctx'> # CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='ctx'> # CONFIG_SCSI_IPR is not set</div><div class='hunk'>@@ -613,9 +638,13 @@ CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> # CONFIG_SCSI_SRP is not set</div><div class='ctx'> # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='add'>+CONFIG_SATA_PMP=y</div><div class='ctx'> # CONFIG_SATA_AHCI is not set</div><div class='add'>+# CONFIG_SATA_SIL24 is not set</div><div class='add'>+CONFIG_ATA_SFF=y</div><div class='ctx'> # CONFIG_SATA_SVW is not set</div><div class='ctx'> # CONFIG_ATA_PIIX is not set</div><div class='ctx'> # CONFIG_SATA_MV is not set</div><div class='hunk'>@@ -625,7 +654,6 @@ CONFIG_ATA=y</div><div class='ctx'> # CONFIG_SATA_PROMISE is not set</div><div class='ctx'> # CONFIG_SATA_SX4 is not set</div><div class='ctx'> # CONFIG_SATA_SIL is not set</div><div class='del'>-# CONFIG_SATA_SIL24 is not set</div><div class='ctx'> # CONFIG_SATA_SIS is not set</div><div class='ctx'> # CONFIG_SATA_ULI is not set</div><div class='ctx'> # CONFIG_SATA_VIA is not set</div><div class='hunk'>@@ -654,6 +682,7 @@ CONFIG_ATA=y</div><div class='ctx'> # CONFIG_PATA_MPIIX is not set</div><div class='ctx'> # CONFIG_PATA_OLDPIIX is not set</div><div class='ctx'> # CONFIG_PATA_NETCELL is not set</div><div class='add'>+# CONFIG_PATA_NINJA32 is not set</div><div class='ctx'> # CONFIG_PATA_NS87410 is not set</div><div class='ctx'> # CONFIG_PATA_NS87415 is not set</div><div class='ctx'> # CONFIG_PATA_OPTI is not set</div><div class='hunk'>@@ -670,6 +699,7 @@ CONFIG_ATA=y</div><div class='ctx'> # CONFIG_PATA_VIA is not set</div><div class='ctx'> # CONFIG_PATA_WINBOND is not set</div><div class='ctx'> # CONFIG_PATA_PLATFORM is not set</div><div class='add'>+# CONFIG_PATA_SCH is not set</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> # CONFIG_BLK_DEV_MD is not set</div><div class='ctx'> CONFIG_BLK_DEV_DM=y</div><div class='hunk'>@@ -686,11 +716,14 @@ CONFIG_BLK_DEV_DM=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -708,6 +741,7 @@ CONFIG_MII=y</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_3COM is not set</div><div class='ctx'> CONFIG_SMC91X=y</div><div class='add'>+# CONFIG_SMC911X is not set</div><div class='ctx'> # CONFIG_NET_TULIP is not set</div><div class='ctx'> # CONFIG_HP100 is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='hunk'>@@ -726,6 +760,7 @@ CONFIG_SMC91X=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WLAN_PRE80211 is not set</div><div class='ctx'> # CONFIG_WLAN_80211 is not set</div><div class='add'>+# CONFIG_IWLWIFI_LEDS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Network Adapters</div><div class='hunk'>@@ -743,7 +778,6 @@ CONFIG_SMC91X=y</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='ctx'> # CONFIG_NET_FC is not set</div><div class='del'>-# CONFIG_SHAPER is not set</div><div class='ctx'> CONFIG_NETCONSOLE=y</div><div class='ctx'> # CONFIG_NETCONSOLE_DYNAMIC is not set</div><div class='ctx'> CONFIG_NETPOLL=y</div><div class='hunk'>@@ -780,6 +814,7 @@ CONFIG_KEYBOARD_ATKBD=y</div><div class='ctx'> # CONFIG_KEYBOARD_XTKBD is not set</div><div class='ctx'> # CONFIG_KEYBOARD_NEWTON is not set</div><div class='ctx'> # CONFIG_KEYBOARD_STOWAWAY is not set</div><div class='add'>+# CONFIG_KEYBOARD_SH_KEYSC is not set</div><div class='ctx'> CONFIG_INPUT_MOUSE=y</div><div class='ctx'> CONFIG_MOUSE_PS2=y</div><div class='ctx'> CONFIG_MOUSE_PS2_ALPS=y</div><div class='hunk'>@@ -812,10 +847,13 @@ CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+# CONFIG_NOZOMI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Serial drivers</div><div class='hunk'>@@ -847,22 +885,20 @@ CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_SYNCLINK_CS is not set</div><div class='ctx'> # CONFIG_CARDMAN_4000 is not set</div><div class='ctx'> # CONFIG_CARDMAN_4040 is not set</div><div class='add'>+# CONFIG_IPWIRELESS is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> CONFIG_DEVPORT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> CONFIG_POWER_SUPPLY=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY_DEBUG is not set</div><div class='ctx'> # CONFIG_PDA_POWER is not set</div><div class='ctx'> # CONFIG_BATTERY_DS2760 is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -870,8 +906,10 @@ CONFIG_POWER_SUPPLY=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> CONFIG_SSB=y</div><div class='add'>+CONFIG_SSB_SPROM=y</div><div class='ctx'> CONFIG_SSB_PCIHOST_POSSIBLE=y</div><div class='ctx'> CONFIG_SSB_PCIHOST=y</div><div class='add'>+# CONFIG_SSB_B43_PCI_BRIDGE is not set</div><div class='ctx'> CONFIG_SSB_PCMCIAHOST_POSSIBLE=y</div><div class='ctx'> # CONFIG_SSB_PCMCIAHOST is not set</div><div class='ctx'> # CONFIG_SSB_SILENT is not set</div><div class='hunk'>@@ -882,13 +920,24 @@ CONFIG_SSB_DRIVER_PCICORE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_DAB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -900,15 +949,15 @@ CONFIG_SSB_DRIVER_PCICORE=y</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> # CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB_DDC is not set</div><div class='del'>-# CONFIG_FB_CFB_FILLRECT is not set</div><div class='del'>-# CONFIG_FB_CFB_COPYAREA is not set</div><div class='del'>-# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=m</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=m</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=m</div><div class='ctx'> # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set</div><div class='ctx'> # CONFIG_FB_SYS_FILLRECT is not set</div><div class='ctx'> # CONFIG_FB_SYS_COPYAREA is not set</div><div class='ctx'> # CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_FOREIGN_ENDIAN is not set</div><div class='ctx'> # CONFIG_FB_SYS_FOPS is not set</div><div class='del'>-CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> # CONFIG_FB_SVGALIB is not set</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='ctx'> # CONFIG_FB_BACKLIGHT is not set</div><div class='hunk'>@@ -941,6 +990,8 @@ CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='add'>+CONFIG_FB_SH_MOBILE_LCDC=m</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -970,24 +1021,9 @@ CONFIG_LOGO_LINUX_CLUT224=y</div><div class='ctx'> CONFIG_LOGO_SUPERH_MONO=y</div><div class='ctx'> CONFIG_LOGO_SUPERH_VGA16=y</div><div class='ctx'> CONFIG_LOGO_SUPERH_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND_PRIME=y</div><div class='del'>-# CONFIG_SOUND_TRIDENT is not set</div><div class='del'>-# CONFIG_SOUND_MSNDCLAS is not set</div><div class='del'>-# CONFIG_SOUND_MSNDPIN is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='ctx'> # CONFIG_HID_DEBUG is not set</div><div class='hunk'>@@ -1006,6 +1042,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> CONFIG_USB=y</div><div class='ctx'> CONFIG_USB_DEBUG=y</div><div class='add'>+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous USB options</div><div class='hunk'>@@ -1014,15 +1051,18 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> # CONFIG_USB_DEVICE_CLASS is not set</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_USB_C67X00_HCD is not set</div><div class='ctx'> CONFIG_USB_EHCI_HCD=y</div><div class='del'>-# CONFIG_USB_EHCI_SPLIT_ISO is not set</div><div class='ctx'> # CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='ctx'> # CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+# CONFIG_USB_ISP1760_HCD is not set</div><div class='ctx'> # CONFIG_USB_OHCI_HCD is not set</div><div class='ctx'> # CONFIG_USB_UHCI_HCD is not set</div><div class='ctx'> # CONFIG_USB_SL811_HCD is not set</div><div class='hunk'>@@ -1033,6 +1073,7 @@ CONFIG_USB_EHCI_HCD=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> CONFIG_USB_PRINTER=y</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -1054,6 +1095,7 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1067,10 +1109,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # USB port drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_USS720 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Serial Converter support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_USB_SERIAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1096,16 +1134,10 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB DSL modem support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Gadget Support</div><div class='del'>-#</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='ctx'> CONFIG_NEW_LEDS=y</div><div class='ctx'> CONFIG_LEDS_CLASS=y</div><div class='ctx'> </div><div class='hunk'>@@ -1117,13 +1149,11 @@ CONFIG_LEDS_CLASS=y</div><div class='ctx'> # LED Triggers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_LEDS_TRIGGERS is not set</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_AUXDISPLAY is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userspace I/O</div><div class='del'>-#</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1145,14 +1175,11 @@ CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='del'>-CONFIG_MINIX_FS=y</div><div class='del'>-# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='ctx'> CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='del'>-CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> CONFIG_AUTOFS4_FS=y</div><div class='ctx'> # CONFIG_FUSE_FS is not set</div><div class='hunk'>@@ -1203,8 +1230,11 @@ CONFIG_HUGETLB_PAGE=y</div><div class='ctx'> # CONFIG_EFS_FS is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='add'>+CONFIG_MINIX_FS=y</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='ctx'> CONFIG_NETWORK_FILESYSTEMS=y</div><div class='hunk'>@@ -1212,19 +1242,16 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_NFSD=y</div><div class='ctx'> CONFIG_NFSD_V3=y</div><div class='ctx'> # CONFIG_NFSD_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFSD_V4 is not set</div><div class='del'>-CONFIG_NFSD_TCP=y</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -1279,7 +1306,6 @@ CONFIG_NLS_ISO8859_15=y</div><div class='ctx'> # CONFIG_NLS_KOI8_U is not set</div><div class='ctx'> CONFIG_NLS_UTF8=y</div><div class='ctx'> # CONFIG_DLM is not set</div><div class='del'>-# CONFIG_INSTRUMENTATION is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -1288,6 +1314,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> # CONFIG_ENABLE_MUST_CHECK is not set</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_UNUSED_SYMBOLS=y</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1295,10 +1322,14 @@ CONFIG_UNUSED_SYMBOLS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> # CONFIG_SCHED_DEBUG is not set</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> CONFIG_TIMER_STATS=y</div><div class='add'>+# CONFIG_DEBUG_OBJECTS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG_ON is not set</div><div class='add'>+# CONFIG_SLUB_STATS is not set</div><div class='ctx'> CONFIG_DEBUG_PREEMPT=y</div><div class='ctx'> # CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='ctx'> # CONFIG_RT_MUTEX_TESTER is not set</div><div class='hunk'>@@ -1313,12 +1344,14 @@ CONFIG_DEBUG_PREEMPT=y</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> # CONFIG_FRAME_POINTER is not set</div><div class='del'>-# CONFIG_FORCED_INLINING is not set</div><div class='ctx'> # CONFIG_BOOT_PRINTK_DELAY is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_BACKTRACE_SELF_TEST is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> CONFIG_SH_STANDARD_BIOS=y</div><div class='hunk'>@@ -1338,52 +1371,94 @@ CONFIG_DEBUG_STACKOVERFLOW=y</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> # CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Crypto core or helper</div><div class='add'>+#</div><div class='ctx'> CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> # CONFIG_CRYPTO_MANAGER is not set</div><div class='add'>+# CONFIG_CRYPTO_GF128MUL is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_CRYPTD is not set</div><div class='add'>+# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Authenticated Encryption with Associated Data</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CCM is not set</div><div class='add'>+# CONFIG_CRYPTO_GCM is not set</div><div class='add'>+# CONFIG_CRYPTO_SEQIV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block modes</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CBC is not set</div><div class='add'>+# CONFIG_CRYPTO_CTR is not set</div><div class='add'>+# CONFIG_CRYPTO_CTS is not set</div><div class='add'>+# CONFIG_CRYPTO_ECB is not set</div><div class='add'>+# CONFIG_CRYPTO_LRW is not set</div><div class='add'>+# CONFIG_CRYPTO_PCBC is not set</div><div class='add'>+# CONFIG_CRYPTO_XTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hash modes</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_HMAC is not set</div><div class='ctx'> # CONFIG_CRYPTO_XCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digest</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='ctx'> # CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_GF128MUL is not set</div><div class='del'>-# CONFIG_CRYPTO_ECB is not set</div><div class='del'>-# CONFIG_CRYPTO_CBC is not set</div><div class='del'>-# CONFIG_CRYPTO_PCBC is not set</div><div class='del'>-# CONFIG_CRYPTO_LRW is not set</div><div class='del'>-# CONFIG_CRYPTO_XTS is not set</div><div class='del'>-# CONFIG_CRYPTO_CRYPTD is not set</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-# CONFIG_CRYPTO_FCRYPT is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ciphers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='del'>-# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_FCRYPT is not set</div><div class='ctx'> # CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_SALSA20 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SEED is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Compression</div><div class='add'>+#</div><div class='ctx'> # CONFIG_CRYPTO_DEFLATE is not set</div><div class='del'>-# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='del'>-# CONFIG_CRYPTO_CAMELLIA is not set</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='del'>-# CONFIG_CRYPTO_AUTHENC is not set</div><div class='add'>+# CONFIG_CRYPTO_LZO is not set</div><div class='ctx'> CONFIG_CRYPTO_HW=y</div><div class='add'>+# CONFIG_CRYPTO_DEV_HIFN_795X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig<br/>index 6b34baa26eae..af15cbef12ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/se7206_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/se7206_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/se7206_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/se7206_defconfig</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Tue Jun  3 20:27:08 2008</div><div class='add'>+# Linux kernel version: 2.6.26</div><div class='add'>+# Wed Jul 30 02:06:07 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='ctx'> CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='hunk'>@@ -87,9 +88,14 @@ CONFIG_PROFILING=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_OPROFILE=y</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_TINY_SHMEM=y</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='hunk'>@@ -99,12 +105,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -175,7 +182,9 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='hunk'>@@ -294,6 +303,7 @@ CONFIG_CF_BASE_ADDR=0xb8000000</div><div class='ctx'> #</div><div class='ctx'> # Executable file formats</div><div class='ctx'> #</div><div class='add'>+CONFIG_BINFMT_ELF_FDPIC=y</div><div class='ctx'> CONFIG_BINFMT_FLAT=y</div><div class='ctx'> CONFIG_BINFMT_ZFLAT=y</div><div class='ctx'> CONFIG_BINFMT_SHARED_FLAT=y</div><div class='hunk'>@@ -487,6 +497,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> CONFIG_EEPROM_93CX6=y</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='hunk'>@@ -503,7 +514,6 @@ CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -516,6 +526,7 @@ CONFIG_MII=y</div><div class='ctx'> # CONFIG_AX88796 is not set</div><div class='ctx'> # CONFIG_STNIC is not set</div><div class='ctx'> CONFIG_SMC91X=y</div><div class='add'>+# CONFIG_SMC911X is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='hunk'>@@ -583,6 +594,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -594,6 +606,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -625,10 +638,6 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # Display device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='hunk'>@@ -669,6 +678,7 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # on-CPU RTC drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_RTC_DRV_SH=y</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -728,6 +738,7 @@ CONFIG_CONFIGFS_FS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> CONFIG_ROMFS_FS=y</div><div class='hunk'>@@ -738,13 +749,12 @@ CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> # CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -776,6 +786,8 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> # CONFIG_DEBUG_SHIRQ is not set</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set</div><div class='add'>+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0</div><div class='ctx'> CONFIG_SCHED_DEBUG=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_TIMER_STATS is not set</div><div class='hunk'>@@ -795,6 +807,7 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> CONFIG_DEBUG_VM=y</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> CONFIG_DEBUG_LIST=y</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='hunk'>@@ -860,6 +873,10 @@ CONFIG_CRYPTO_ALGAPI=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -899,6 +916,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> CONFIG_CRC_CCITT=y</div><div class='ctx'> CONFIG_CRC16=y</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> CONFIG_CRC_ITU_T=y</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> CONFIG_CRC7=y</div><div class='head'>diff --git a/arch/sh/configs/se7343_defconfig b/arch/sh/configs/se7343_defconfig<br/>index 7b7273638447..4e30b70377e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/se7343_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/se7343_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/se7343_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/se7343_defconfig</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc8</div><div class='del'>-# Mon Jul  7 13:12:45 2008</div><div class='add'>+# Linux kernel version: 2.6.26</div><div class='add'>+# Wed Jul 30 02:08:38 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='ctx'> CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='hunk'>@@ -77,9 +78,14 @@ CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_PROFILING is not set</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_TINY_SHMEM=y</div><div class='hunk'>@@ -90,12 +96,13 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -171,6 +178,7 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='hunk'>@@ -368,6 +376,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='ctx'> CONFIG_MTD=y</div><div class='hunk'>@@ -455,6 +465,7 @@ CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_RAM is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> # CONFIG_MISC_DEVICES is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='hunk'>@@ -497,10 +508,10 @@ CONFIG_SCSI_WAIT_SCAN=m</div><div class='ctx'> # CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='ctx'> # CONFIG_SCSI_SRP_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_LOWLEVEL is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -513,13 +524,13 @@ CONFIG_MII=y</div><div class='ctx'> # CONFIG_AX88796 is not set</div><div class='ctx'> # CONFIG_STNIC is not set</div><div class='ctx'> CONFIG_SMC91X=y</div><div class='add'>+# CONFIG_SMC911X is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_EMAC4 is not set</div><div class='ctx'> # CONFIG_B44 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -572,6 +583,7 @@ CONFIG_INPUT=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> # CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='hunk'>@@ -617,6 +629,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -646,6 +659,7 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y</div><div class='ctx'> # CONFIG_VIDEO_VIVI is not set</div><div class='ctx'> # CONFIG_VIDEO_CPIA is not set</div><div class='ctx'> # CONFIG_SOC_CAMERA is not set</div><div class='add'>+# CONFIG_VIDEO_SH_MOBILE_CEU is not set</div><div class='ctx'> CONFIG_RADIO_ADAPTERS=y</div><div class='ctx'> # CONFIG_DAB is not set</div><div class='ctx'> </div><div class='hunk'>@@ -657,9 +671,9 @@ CONFIG_RADIO_ADAPTERS=y</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> CONFIG_FIRMWARE_EDID=y</div><div class='ctx'> # CONFIG_FB_DDC is not set</div><div class='del'>-# CONFIG_FB_CFB_FILLRECT is not set</div><div class='del'>-# CONFIG_FB_CFB_COPYAREA is not set</div><div class='del'>-# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=m</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=m</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=m</div><div class='ctx'> # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set</div><div class='ctx'> # CONFIG_FB_SYS_FILLRECT is not set</div><div class='ctx'> # CONFIG_FB_SYS_COPYAREA is not set</div><div class='hunk'>@@ -676,6 +690,7 @@ CONFIG_FIRMWARE_EDID=y</div><div class='ctx'> # Frame buffer hardware drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_FB_S1D13XXX is not set</div><div class='add'>+CONFIG_FB_SH_MOBILE_LCDC=m</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='ctx'> </div><div class='hunk'>@@ -690,15 +705,7 @@ CONFIG_FIRMWARE_EDID=y</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> # CONFIG_FRAMEBUFFER_CONSOLE is not set</div><div class='ctx'> # CONFIG_LOGO is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=y</div><div class='ctx'> CONFIG_SND_TIMER=y</div><div class='ctx'> CONFIG_SND_PCM=y</div><div class='hunk'>@@ -714,40 +721,14 @@ CONFIG_SND_SUPPORT_OLD_API=y</div><div class='ctx'> CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='ctx'> # CONFIG_SND_DUMMY is not set</div><div class='ctx'> # CONFIG_SND_VIRMIDI is not set</div><div class='ctx'> # CONFIG_SND_MTPAV is not set</div><div class='ctx'> # CONFIG_SND_SERIAL_U16550 is not set</div><div class='ctx'> # CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SUPERH devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_SUPERH=y</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio support for SuperH</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio for the Texas Instruments OMAP</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -759,6 +740,7 @@ CONFIG_HID=y</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -836,6 +818,7 @@ CONFIG_JFFS2_RTIME=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -854,7 +837,6 @@ CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_EXPORTFS=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -885,6 +867,7 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> # CONFIG_SH_STANDARD_BIOS is not set</div><div class='ctx'> CONFIG_EARLY_SCIF_CONSOLE=y</div><div class='hunk'>@@ -941,6 +924,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -980,6 +967,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/sh/configs/se7619_defconfig b/arch/sh/configs/se7619_defconfig<br/>index 3a3c3c1f507d..80c1c72edb56 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/se7619_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/se7619_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/se7619_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/se7619_defconfig</a></div><div class='hunk'>@@ -1,9 +1,11 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.22-rc4</div><div class='del'>-# Fri Jun 15 19:43:06 2007</div><div class='add'>+# Linux kernel version: 2.6.26</div><div class='add'>+# Wed Jul 30 02:12:32 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='add'>+CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='hunk'>@@ -17,27 +19,26 @@ CONFIG_STACKTRACE_SUPPORT=y</div><div class='ctx'> CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='add'>+CONFIG_ARCH_NO_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Code maturity level options</div><div class='add'>+# General setup</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXPERIMENTAL=y</div><div class='ctx'> CONFIG_BROKEN_ON_SMP=y</div><div class='ctx'> CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# General setup</div><div class='del'>-#</div><div class='ctx'> CONFIG_LOCALVERSION=""</div><div class='ctx'> # CONFIG_LOCALVERSION_AUTO is not set</div><div class='ctx'> # CONFIG_SYSVIPC is not set</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT is not set</div><div class='del'>-# CONFIG_UTS_NS is not set</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='del'>-CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+# CONFIG_CGROUPS is not set</div><div class='add'>+# CONFIG_GROUP_SCHED is not set</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='add'>+# CONFIG_NAMESPACES is not set</div><div class='ctx'> # CONFIG_BLK_DEV_INITRD is not set</div><div class='ctx'> CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='hunk'>@@ -49,6 +50,7 @@ CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> # CONFIG_ELF_CORE is not set</div><div class='add'>+CONFIG_COMPAT_BRK=y</div><div class='ctx'> # CONFIG_BASE_FULL is not set</div><div class='ctx'> # CONFIG_FUTEX is not set</div><div class='ctx'> CONFIG_ANON_INODES=y</div><div class='hunk'>@@ -60,20 +62,26 @@ CONFIG_EVENTFD=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_SLUB is not set</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+# CONFIG_MARKERS is not set</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='add'>+# CONFIG_HAVE_KPROBES is not set</div><div class='add'>+# CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='add'>+# CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_TINY_SHMEM=y</div><div class='ctx'> CONFIG_BASE_SMALL=1</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Loadable module support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_MODULES is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Block layer</div><div class='del'>-#</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -87,14 +95,17 @@ CONFIG_IOSCHED_NOOP=y</div><div class='ctx'> # CONFIG_DEFAULT_CFQ is not set</div><div class='ctx'> CONFIG_DEFAULT_NOOP=y</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="noop"</div><div class='add'>+CONFIG_CLASSIC_RCU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # System type</div><div class='ctx'> #</div><div class='ctx'> CONFIG_CPU_SH2=y</div><div class='ctx'> CONFIG_CPU_SUBTYPE_SH7619=y</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7203 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7206 is not set</div><div class='del'>-# CONFIG_CPU_SUBTYPE_SH7300 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7263 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_MXG is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7705 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7706 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7707 is not set</div><div class='hunk'>@@ -102,6 +113,8 @@ CONFIG_CPU_SUBTYPE_SH7619=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7709 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7710 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7712 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7720 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7721 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7750 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7091 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7750R is not set</div><div class='hunk'>@@ -110,14 +123,17 @@ CONFIG_CPU_SUBTYPE_SH7619=y</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7751R is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7760 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH4_202 is not set</div><div class='del'>-# CONFIG_CPU_SUBTYPE_ST40STB1 is not set</div><div class='del'>-# CONFIG_CPU_SUBTYPE_ST40GX1 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7723 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7763 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7770 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7780 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7785 is not set</div><div class='del'>-# CONFIG_CPU_SUBTYPE_SH73180 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SHX3 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7343 is not set</div><div class='ctx'> # CONFIG_CPU_SUBTYPE_SH7722 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH7366 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH5_101 is not set</div><div class='add'>+# CONFIG_CPU_SUBTYPE_SH5_103 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Memory management options</div><div class='hunk'>@@ -126,6 +142,7 @@ CONFIG_QUICKLIST=y</div><div class='ctx'> CONFIG_PAGE_OFFSET=0x00000000</div><div class='ctx'> CONFIG_MEMORY_START=0x0c000000</div><div class='ctx'> CONFIG_MEMORY_SIZE=0x04000000</div><div class='add'>+CONFIG_29BIT=y</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_SPARSEMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_SPARSEMEM_DEFAULT=y</div><div class='hunk'>@@ -134,7 +151,9 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='ctx'> CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='hunk'>@@ -142,6 +161,8 @@ CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> CONFIG_SPARSEMEM_STATIC=y</div><div class='add'>+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> # CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=0</div><div class='hunk'>@@ -151,7 +172,9 @@ CONFIG_NR_QUICK=2</div><div class='ctx'> # Cache configuration</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SH_DIRECT_MAPPED is not set</div><div class='del'>-CONFIG_SH_WRITETHROUGH=y</div><div class='add'>+# CONFIG_CACHE_WRITEBACK is not set</div><div class='add'>+CONFIG_CACHE_WRITETHROUGH=y</div><div class='add'>+# CONFIG_CACHE_OFF is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Processor features</div><div class='hunk'>@@ -159,8 +182,6 @@ CONFIG_SH_WRITETHROUGH=y</div><div class='ctx'> # CONFIG_CPU_LITTLE_ENDIAN is not set</div><div class='ctx'> CONFIG_CPU_BIG_ENDIAN=y</div><div class='ctx'> # CONFIG_SH_FPU_EMU is not set</div><div class='del'>-# CONFIG_SH_DSP is not set</div><div class='del'>-CONFIG_CPU_HAS_IPR_IRQ=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Board support</div><div class='hunk'>@@ -185,7 +206,6 @@ CONFIG_SH_CLK_MD=5</div><div class='ctx'> #</div><div class='ctx'> # DMA support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SH_DMA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Companion Chips</div><div class='hunk'>@@ -205,11 +225,13 @@ CONFIG_HZ_100=y</div><div class='ctx'> # CONFIG_HZ_300 is not set</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=100</div><div class='add'>+# CONFIG_SCHED_HRTICK is not set</div><div class='ctx'> # CONFIG_KEXEC is not set</div><div class='ctx'> # CONFIG_CRASH_DUMP is not set</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_GUSA=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Boot options</div><div class='hunk'>@@ -221,15 +243,13 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000</div><div class='ctx'> #</div><div class='ctx'> # Bus options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_CF_ENABLER is not set</div><div class='ctx'> # CONFIG_ARCH_SUPPORTS_MSI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# PCCARD (PCMCIA/CardBus) support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # Executable file formats</div><div class='ctx'> #</div><div class='add'>+CONFIG_BINFMT_ELF_FDPIC=y</div><div class='ctx'> CONFIG_BINFMT_FLAT=y</div><div class='ctx'> CONFIG_BINFMT_ZFLAT=y</div><div class='ctx'> # CONFIG_BINFMT_SHARED_FLAT is not set</div><div class='hunk'>@@ -250,10 +270,6 @@ CONFIG_BINFMT_ZFLAT=y</div><div class='ctx'> # CONFIG_STANDALONE is not set</div><div class='ctx'> # CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='del'>-#</div><div class='ctx'> CONFIG_MTD=y</div><div class='ctx'> # CONFIG_MTD_DEBUG is not set</div><div class='ctx'> CONFIG_MTD_CONCAT=y</div><div class='hunk'>@@ -263,6 +279,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set</div><div class='ctx'> # CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AR7_PARTS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # User Modules And Translation Layers</div><div class='hunk'>@@ -275,6 +292,7 @@ CONFIG_MTD_BLOCK=y</div><div class='ctx'> # CONFIG_INFTL is not set</div><div class='ctx'> # CONFIG_RFD_FTL is not set</div><div class='ctx'> # CONFIG_SSFDC is not set</div><div class='add'>+# CONFIG_MTD_OOPS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # RAM/ROM/Flash chip drivers</div><div class='hunk'>@@ -334,29 +352,17 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2</div><div class='ctx'> # UBI - Unsorted block images</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_UBI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Parallel port support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Plug and Play support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PNPACPI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Block devices</div><div class='del'>-#</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_LOOP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_RAM is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Misc devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_BLINK is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_EEPROM_93CX6 is not set</div><div class='add'>+# CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -364,21 +370,10 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_RAID_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI is not set</div><div class='add'>+# CONFIG_SCSI_DMA is not set</div><div class='ctx'> # CONFIG_SCSI_NETLINK is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Multi-device support (RAID and LVM)</div><div class='del'>-#</div><div class='ctx'> # CONFIG_MD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ISDN subsystem</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Telephony Support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_PHONE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -386,13 +381,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2</div><div class='ctx'> #</div><div class='ctx'> CONFIG_INPUT=y</div><div class='ctx'> # CONFIG_INPUT_FF_MEMLESS is not set</div><div class='add'>+# CONFIG_INPUT_POLLDEV is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Userland interfaces</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_INPUT_MOUSEDEV is not set</div><div class='ctx'> # CONFIG_INPUT_JOYDEV is not set</div><div class='del'>-# CONFIG_INPUT_TSDEV is not set</div><div class='ctx'> # CONFIG_INPUT_EVDEV is not set</div><div class='ctx'> # CONFIG_INPUT_EVBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -416,6 +411,7 @@ CONFIG_INPUT=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -433,123 +429,84 @@ CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='ctx'> # CONFIG_UNIX98_PTYS is not set</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IPMI</div><div class='del'>-#</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='del'>-# CONFIG_WATCHDOG is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# TPM devices</div><div class='del'>-#</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='del'>-# CONFIG_SPI_MASTER is not set</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+# CONFIG_POWER_SUPPLY is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Dallas's 1-wire bus</div><div class='add'>+# Sonics Silicon Backplane</div><div class='ctx'> #</div><div class='del'>-# CONFIG_W1 is not set</div><div class='del'>-# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_SSB_POSSIBLE=y</div><div class='add'>+# CONFIG_SSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='add'>+# CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia core support</div><div class='add'>+#</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='del'>-CONFIG_DAB=y</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Graphics support</div><div class='add'>+# Multimedia drivers</div><div class='ctx'> #</div><div class='del'>-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+CONFIG_DAB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Display device support</div><div class='add'>+# Graphics support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_DISPLAY_SUPPORT is not set</div><div class='ctx'> # CONFIG_VGASTATE is not set</div><div class='add'>+# CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Sound</div><div class='add'>+# Display device support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_DISPLAY_SUPPORT is not set</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# HID Devices</div><div class='del'>-#</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='ctx'> # CONFIG_HID_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB support</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_ARCH_HAS_HCD is not set</div><div class='add'>+# CONFIG_HIDRAW is not set</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> # CONFIG_USB_ARCH_HAS_OHCI is not set</div><div class='ctx'> # CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+# CONFIG_USB_OTG_WHITELIST is not set</div><div class='add'>+# CONFIG_USB_OTG_BLACKLIST_HUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Gadget Support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# LED devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# LED drivers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# LED Triggers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# InfiniBand support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Real Time Clock</div><div class='del'>-#</div><div class='add'>+# CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Engine support</div><div class='del'>-#</div><div class='del'>-# CONFIG_DMA_ENGINE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Clients</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# DMA Devices</div><div class='del'>-#</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='add'>+# CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='hunk'>@@ -561,12 +518,9 @@ CONFIG_HID=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_GFS2_FS is not set</div><div class='del'>-# CONFIG_MINIX_FS is not set</div><div class='del'>-CONFIG_ROMFS_FS=y</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='ctx'> # CONFIG_INOTIFY is not set</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='del'>-# CONFIG_DNOTIFY is not set</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='ctx'> # CONFIG_FUSE_FS is not set</div><div class='hunk'>@@ -592,7 +546,6 @@ CONFIG_PROC_SYSCTL=y</div><div class='ctx'> # CONFIG_SYSFS is not set</div><div class='ctx'> # CONFIG_TMPFS is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE is not set</div><div class='del'>-CONFIG_RAMFS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous filesystems</div><div class='hunk'>@@ -607,8 +560,11 @@ CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_JFFS2_FS is not set</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='add'>+CONFIG_ROMFS_FS=y</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='ctx'> </div><div class='hunk'>@@ -617,28 +573,23 @@ CONFIG_RAMFS=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARTITION_ADVANCED is not set</div><div class='ctx'> CONFIG_MSDOS_PARTITION=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Native Language Support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_NLS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Profiling support</div><div class='del'>-#</div><div class='del'>-# CONFIG_PROFILING is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # Kernel hacking</div><div class='ctx'> #</div><div class='ctx'> CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='ctx'> # CONFIG_ENABLE_MUST_CHECK is not set</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='add'>+# CONFIG_SAMPLES is not set</div><div class='ctx'> # CONFIG_SH_STANDARD_BIOS is not set</div><div class='ctx'> # CONFIG_EARLY_SCIF_CONSOLE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -646,20 +597,20 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> # Security options</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_KEYS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Cryptographic options</div><div class='del'>-#</div><div class='add'>+# CONFIG_SECURITY_FILE_CAPABILITIES is not set</div><div class='ctx'> # CONFIG_CRYPTO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BITREVERSE=y</div><div class='add'>+# CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+# CONFIG_CRC_T10DIF is not set</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='add'>+# CONFIG_CRC7 is not set</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_HAS_IOMEM=y</div><div class='head'>diff --git a/arch/sh/configs/sh7763rdp_defconfig b/arch/sh/configs/sh7763rdp_defconfig<br/>index 83f3fe5db3e5..baf830c4a7e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/configs/sh7763rdp_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/configs/sh7763rdp_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/configs/sh7763rdp_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/configs/sh7763rdp_defconfig</a></div><div class='hunk'>@@ -1,15 +1,17 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc4</div><div class='del'>-# Fri Jun  6 12:20:17 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc2</div><div class='add'>+# Fri Aug  8 13:44:20 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUPERH=y</div><div class='ctx'> CONFIG_SUPERH32=y</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_BUG=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_GENERIC_TIME=y</div><div class='hunk'>@@ -19,7 +21,6 @@ CONFIG_LOCKDEP_SUPPORT=y</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U32 is not set</div><div class='ctx'> # CONFIG_ARCH_HAS_ILOG2_U64 is not set</div><div class='ctx'> CONFIG_ARCH_NO_VIRT_TO_BUS=y</div><div class='del'>-CONFIG_ARCH_SUPPORTS_AOUT=y</div><div class='ctx'> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -83,10 +84,16 @@ CONFIG_PROFILING=y</div><div class='ctx'> # CONFIG_MARKERS is not set</div><div class='ctx'> CONFIG_OPROFILE=y</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='add'>+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set</div><div class='add'>+# CONFIG_HAVE_IOREMAP_PROT is not set</div><div class='ctx'> # CONFIG_HAVE_KPROBES is not set</div><div class='ctx'> # CONFIG_HAVE_KRETPROBES is not set</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+# CONFIG_USE_GENERIC_SMP_HELPERS is not set</div><div class='add'>+CONFIG_HAVE_CLK=y</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_HAVE_GENERIC_DMA_COHERENT=y</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='hunk'>@@ -96,12 +103,13 @@ CONFIG_MODULES=y</div><div class='ctx'> # CONFIG_MODULE_UNLOAD is not set</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -177,6 +185,7 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_ENTRY_OFFSET=0x00001000</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> # CONFIG_FLATMEM_MANUAL is not set</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='hunk'>@@ -258,6 +267,7 @@ CONFIG_HZ=250</div><div class='ctx'> # CONFIG_SCHED_HRTICK is not set</div><div class='ctx'> # CONFIG_KEXEC is not set</div><div class='ctx'> # CONFIG_CRASH_DUMP is not set</div><div class='add'>+CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='hunk'>@@ -282,10 +292,6 @@ CONFIG_CMDLINE="console=ttySC2,115200 root=/dev/sda1 rootdelay=10"</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -361,6 +367,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CFG80211 is not set</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='ctx'> # CONFIG_MAC80211 is not set</div><div class='ctx'> # CONFIG_IEEE80211 is not set</div><div class='ctx'> # CONFIG_RFKILL is not set</div><div class='hunk'>@@ -377,6 +384,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> # CONFIG_CONNECTOR is not set</div><div class='ctx'> CONFIG_MTD=y</div><div class='hunk'>@@ -471,6 +480,7 @@ CONFIG_BLK_DEV=y</div><div class='ctx'> # CONFIG_BLK_DEV_RAM is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> # CONFIG_MISC_DEVICES is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='hunk'>@@ -515,10 +525,10 @@ CONFIG_SCSI_WAIT_SCAN=m</div><div class='ctx'> CONFIG_SCSI_LOWLEVEL=y</div><div class='ctx'> # CONFIG_ISCSI_TCP is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> # CONFIG_ATA is not set</div><div class='ctx'> # CONFIG_MD is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_MACVLAN is not set</div><div class='hunk'>@@ -546,7 +556,9 @@ CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='ctx'> # CONFIG_AX88796 is not set</div><div class='ctx'> # CONFIG_STNIC is not set</div><div class='add'>+CONFIG_SH_ETH=y</div><div class='ctx'> # CONFIG_SMC91X is not set</div><div class='add'>+# CONFIG_SMC911X is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_ZMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_RGMII is not set</div><div class='ctx'> # CONFIG_IBM_NEW_EMAC_TAH is not set</div><div class='hunk'>@@ -613,7 +625,11 @@ CONFIG_INPUT=y</div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='del'>-# CONFIG_VT is not set</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='ctx'> CONFIG_DEVKMEM=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='hunk'>@@ -644,6 +660,7 @@ CONFIG_HW_RANDOM=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_THERMAL is not set</div><div class='add'>+# CONFIG_THERMAL_HWMON is not set</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -655,6 +672,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -679,7 +697,34 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VGASTATE is not set</div><div class='ctx'> # CONFIG_VIDEO_OUTPUT_CONTROL is not set</div><div class='del'>-# CONFIG_FB is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB_DDC is not set</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=y</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=y</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='add'>+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set</div><div class='add'>+# CONFIG_FB_SYS_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_SYS_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='add'>+CONFIG_FB_FOREIGN_ENDIAN=y</div><div class='add'>+CONFIG_FB_BOTH_ENDIAN=y</div><div class='add'>+# CONFIG_FB_BIG_ENDIAN is not set</div><div class='add'>+# CONFIG_FB_LITTLE_ENDIAN is not set</div><div class='add'>+# CONFIG_FB_SYS_FOPS is not set</div><div class='add'>+# CONFIG_FB_SVGALIB is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Frame buffer hardware drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+# CONFIG_FB_SH_MOBILE_LCDC is not set</div><div class='add'>+CONFIG_FB_SH7760=y</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -688,8 +733,22 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> # CONFIG_DISPLAY_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+# CONFIG_FONTS is not set</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+CONFIG_LOGO_LINUX_MONO=y</div><div class='add'>+CONFIG_LOGO_LINUX_VGA16=y</div><div class='add'>+CONFIG_LOGO_LINUX_CLUT224=y</div><div class='add'>+CONFIG_LOGO_SUPERH_MONO=y</div><div class='add'>+CONFIG_LOGO_SUPERH_VGA16=y</div><div class='add'>+CONFIG_LOGO_SUPERH_CLUT224=y</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='ctx'> # CONFIG_HID_SUPPORT is not set</div><div class='ctx'> CONFIG_USB_SUPPORT=y</div><div class='hunk'>@@ -788,11 +847,27 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='ctx'> # CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='del'>-# CONFIG_MMC is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+# CONFIG_MMC_UNSAFE_RESUME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_BLOCK_BOUNCE=y</div><div class='add'>+# CONFIG_SDIO_UART is not set</div><div class='add'>+# CONFIG_MMC_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC_SDHCI is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> # CONFIG_ACCESSIBILITY is not set</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='add'>+# CONFIG_DMADEVICES is not set</div><div class='ctx'> # CONFIG_UIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -865,6 +940,7 @@ CONFIG_TMPFS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='hunk'>@@ -874,12 +950,11 @@ CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> # CONFIG_NFS_V3 is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='del'>-# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_SUNRPC_BIND34 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='hunk'>@@ -949,6 +1024,7 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> # CONFIG_HEADERS_CHECK is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_MEMORY_INIT is not set</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='ctx'> # CONFIG_SH_STANDARD_BIOS is not set</div><div class='ctx'> # CONFIG_EARLY_SCIF_CONSOLE is not set</div><div class='hunk'>@@ -1003,6 +1079,10 @@ CONFIG_CRYPTO=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MD5 is not set</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA1 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -1042,6 +1122,7 @@ CONFIG_BITREVERSE=y</div><div class='ctx'> # CONFIG_GENERIC_FIND_FIRST_BIT is not set</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/sh/drivers/dma/dma-g2.c b/arch/sh/drivers/dma/dma-g2.c<br/>index 0caf11bb7e27..af7bb589c2c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/dma/dma-g2.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/drivers/dma/dma-g2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/dma/dma-g2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/dma/dma-g2.c</a></div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/mach/sysasic.h&gt;</div><div class='del'>-#include &lt;asm/mach/dma.h&gt;</div><div class='add'>+#include &lt;mach/sysasic.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct g2_channel {</div><div class='head'>diff --git a/arch/sh/drivers/dma/dma-pvr2.c b/arch/sh/drivers/dma/dma-pvr2.c<br/>index 838fad566eaf..391cbe1c2956 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/dma/dma-pvr2.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/drivers/dma/dma-pvr2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/dma/dma-pvr2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/dma/dma-pvr2.c</a></div><div class='hunk'>@@ -13,8 +13,8 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;asm/mach/sysasic.h&gt;</div><div class='del'>-#include &lt;asm/mach/dma.h&gt;</div><div class='add'>+#include &lt;mach/sysasic.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c<br/>index 71ff3d6f26e2..b2ffe649c7c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/dma/dma-sh.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/drivers/dma/dma-sh.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/dma/dma-sh.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/dma/dma-sh.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/dreamcast/dma.h&gt;</div><div class='add'>+#include &lt;mach-dreamcast/mach/dma.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include "dma-sh.h"</div><div class='head'>diff --git a/arch/sh/drivers/dma/dma-sh.h b/arch/sh/drivers/dma/dma-sh.h<br/>index 0f591fbc922d..b05af34fc15d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/dma/dma-sh.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/drivers/dma/dma-sh.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/dma/dma-sh.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/dma/dma-sh.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef __DMA_SH_H</div><div class='ctx'> #define __DMA_SH_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/cpu/dma.h&gt;</div><div class='add'>+#include &lt;cpu/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Definitions for the SuperH DMAC */</div><div class='ctx'> #define REQ_L	0x00000000</div><div class='head'>diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c<br/>index c44699301eeb..2bf85cf091e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/fixups-dreamcast.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/drivers/pci/fixups-dreamcast.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/fixups-dreamcast.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/pci/fixups-dreamcast.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/mach/pci.h&gt;</div><div class='add'>+#include &lt;mach/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void __init gapspci_fixup_resources(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/sh/drivers/pci/ops-cayman.c b/arch/sh/drivers/pci/ops-cayman.c<br/>index 980275ffa30b..5ccf9ea3a9de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/ops-cayman.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/drivers/pci/ops-cayman.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/ops-cayman.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/pci/ops-cayman.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;asm/cpu/irq.h&gt;</div><div class='add'>+#include &lt;cpu/irq.h&gt;</div><div class='ctx'> #include "pci-sh5.h"</div><div class='ctx'> </div><div class='ctx'> static inline u8 bridge_swizzle(u8 pin, u8 slot)</div><div class='head'>diff --git a/arch/sh/drivers/pci/ops-dreamcast.c b/arch/sh/drivers/pci/ops-dreamcast.c<br/>index f54c291db37b..f5d2a2aa6f3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/ops-dreamcast.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/drivers/pci/ops-dreamcast.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/ops-dreamcast.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/pci/ops-dreamcast.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/mach/pci.h&gt;</div><div class='add'>+#include &lt;mach/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct resource gapspci_io_resource = {</div><div class='ctx'> 	.name	= "GAPSPCI IO",</div><div class='head'>diff --git a/arch/sh/drivers/pci/ops-se7780.c b/arch/sh/drivers/pci/ops-se7780.c<br/>index bbdb48c124a2..3145c62484d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/ops-se7780.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/drivers/pci/ops-se7780.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/ops-se7780.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/pci/ops-se7780.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;asm/se7780.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7780.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include "pci-sh4.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/drivers/pci/pci-sh5.c b/arch/sh/drivers/pci/pci-sh5.c<br/>index a00a4df8c02d..7a97438762c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/pci-sh5.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/drivers/pci/pci-sh5.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/pci-sh5.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/drivers/pci/pci-sh5.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;asm/cpu/irq.h&gt;</div><div class='add'>+#include &lt;cpu/irq.h&gt;</div><div class='ctx'> #include &lt;asm/pci.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include "pci-sh5.h"</div><div class='head'>diff --git a/include/asm-sh/.gitignore b/arch/sh/include/asm/.gitignore<br/>index 9218ef82b698..378db779fb6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/.gitignore?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/.gitignore</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/.gitignore</a></div><div class='hunk'>@@ -1,3 +1 @@</div><div class='del'>-cpu</div><div class='del'>-mach</div><div class='ctx'> machtypes.h</div><div class='head'>diff --git a/include/asm-sh/Kbuild b/arch/sh/include/asm/Kbuild<br/>index 43910cdf78a5..43910cdf78a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/Kbuild?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/Kbuild</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/Kbuild?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/Kbuild</a></div><div class='head'>diff --git a/include/asm-sh/adc.h b/arch/sh/include/asm/adc.h<br/>index 5f85cf74d59d..48824c1fab80 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/adc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/adc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/adc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/adc.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  * Copyright (C) 2004  Andriy Skulysh</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/cpu/adc.h&gt;</div><div class='add'>+#include &lt;cpu/adc.h&gt;</div><div class='ctx'> </div><div class='ctx'> int adc_single(unsigned int channel);</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-sh/addrspace.h b/arch/sh/include/asm/addrspace.h<br/>index fa544fc38c23..2702d81bfc0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/addrspace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/addrspace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/addrspace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/addrspace.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/cpu/addrspace.h&gt;</div><div class='add'>+#include &lt;cpu/addrspace.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* If this CPU supports segmentation, hook up the helpers */</div><div class='ctx'> #ifdef P1SEG</div><div class='head'>diff --git a/include/asm-sh/atomic-grb.h b/arch/sh/include/asm/atomic-grb.h<br/>index 4c5b7dbfcedb..4c5b7dbfcedb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/atomic-grb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/atomic-grb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/atomic-grb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/atomic-grb.h</a></div><div class='head'>diff --git a/include/asm-sh/atomic-irq.h b/arch/sh/include/asm/atomic-irq.h<br/>index 74f7943cff6f..74f7943cff6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/atomic-irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/atomic-irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/atomic-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/atomic-irq.h</a></div><div class='head'>diff --git a/include/asm-sh/atomic-llsc.h b/arch/sh/include/asm/atomic-llsc.h<br/>index 4b00b78e3f4f..4b00b78e3f4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/atomic-llsc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/atomic-llsc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/atomic-llsc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/atomic-llsc.h</a></div><div class='head'>diff --git a/include/asm-sh/atomic.h b/arch/sh/include/asm/atomic.h<br/>index c043ef003028..c043ef003028 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/atomic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/atomic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/atomic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/atomic.h</a></div><div class='head'>diff --git a/include/asm-sh/auxvec.h b/arch/sh/include/asm/auxvec.h<br/>index a6b9d4f4859e..483effd65e00 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/auxvec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/auxvec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/auxvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/auxvec.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #define AT_FPUCW		18	/* Used FPU control word.  */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_VSYSCALL</div><div class='add'>+#if defined(CONFIG_VSYSCALL) || !defined(__KERNEL__)</div><div class='ctx'> /*</div><div class='ctx'>  * Only define this in the vsyscall case, the entry point to</div><div class='ctx'>  * the vsyscall page gets placed here. The kernel will attempt</div><div class='head'>diff --git a/include/asm-sh/bitops-grb.h b/arch/sh/include/asm/bitops-grb.h<br/>index a5907b94395b..a5907b94395b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/bitops-grb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/bitops-grb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/bitops-grb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/bitops-grb.h</a></div><div class='head'>diff --git a/include/asm-sh/bitops-irq.h b/arch/sh/include/asm/bitops-irq.h<br/>index 653a12750584..653a12750584 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/bitops-irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/bitops-irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/bitops-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/bitops-irq.h</a></div><div class='head'>diff --git a/include/asm-sh/bitops.h b/arch/sh/include/asm/bitops.h<br/>index d7d382f63ee5..d7d382f63ee5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/bitops.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/bitops.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/bitops.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/bitops.h</a></div><div class='head'>diff --git a/include/asm-sh/bug.h b/arch/sh/include/asm/bug.h<br/>index c01718040166..c01718040166 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/bug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/bug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/bug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/bug.h</a></div><div class='head'>diff --git a/include/asm-sh/bugs.h b/arch/sh/include/asm/bugs.h<br/>index 121b2ecddfc3..121b2ecddfc3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/bugs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/bugs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/bugs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/bugs.h</a></div><div class='head'>diff --git a/include/asm-sh/byteorder.h b/arch/sh/include/asm/byteorder.h<br/>index 4c13e6117563..4c13e6117563 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/byteorder.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/byteorder.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/byteorder.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/byteorder.h</a></div><div class='head'>diff --git a/include/asm-sh/cache.h b/arch/sh/include/asm/cache.h<br/>index 083419f47c65..02df18ea9608 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cache.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cache.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/cache.h</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/cpu/cache.h&gt;</div><div class='add'>+#include &lt;cpu/cache.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define L1_CACHE_BYTES		(1 &lt;&lt; L1_CACHE_SHIFT)</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-sh/cacheflush.h b/arch/sh/include/asm/cacheflush.h<br/>index e034c3604111..09acbc32d6c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cacheflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cacheflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/cacheflush.h</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #define __flush_purge_region(start, size)	do { (void)(start); } while (0)</div><div class='ctx'> #define __flush_invalidate_region(start, size)	do { (void)(start); } while (0)</div><div class='ctx'> #else</div><div class='del'>-#include &lt;asm/cpu/cacheflush.h&gt;</div><div class='add'>+#include &lt;cpu/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Consistent DMA requires that the __flush_xxx() primitives must be set</div><div class='head'>diff --git a/include/asm-sh/checksum.h b/arch/sh/include/asm/checksum.h<br/>index 67496ab0ef04..67496ab0ef04 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/checksum.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/checksum.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/checksum.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/checksum.h</a></div><div class='head'>diff --git a/include/asm-sh/checksum_32.h b/arch/sh/include/asm/checksum_32.h<br/>index 14b7ac2f0a07..14b7ac2f0a07 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/checksum_32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/checksum_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/checksum_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/checksum_32.h</a></div><div class='head'>diff --git a/include/asm-sh/checksum_64.h b/arch/sh/include/asm/checksum_64.h<br/>index 9c62a031a8f5..9c62a031a8f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/checksum_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/checksum_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/checksum_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/checksum_64.h</a></div><div class='head'>diff --git a/include/asm-sh/clock.h b/arch/sh/include/asm/clock.h<br/>index 720dfab7b15e..720dfab7b15e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/clock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/clock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/clock.h</a></div><div class='head'>diff --git a/include/asm-sh/cmpxchg-grb.h b/arch/sh/include/asm/cmpxchg-grb.h<br/>index e2681abe764f..e2681abe764f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cmpxchg-grb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cmpxchg-grb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/cmpxchg-grb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/cmpxchg-grb.h</a></div><div class='head'>diff --git a/include/asm-sh/cmpxchg-irq.h b/arch/sh/include/asm/cmpxchg-irq.h<br/>index 43049ec0554b..43049ec0554b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cmpxchg-irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cmpxchg-irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/cmpxchg-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/cmpxchg-irq.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-features.h b/arch/sh/include/asm/cpu-features.h<br/>index 86308aa39731..86308aa39731 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-features.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-features.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/cpu-features.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/cpu-features.h</a></div><div class='head'>diff --git a/include/asm-sh/cputime.h b/arch/sh/include/asm/cputime.h<br/>index 6ca395d1393e..6ca395d1393e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cputime.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cputime.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/cputime.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/cputime.h</a></div><div class='head'>diff --git a/include/asm-sh/current.h b/arch/sh/include/asm/current.h<br/>index 62b63880b333..62b63880b333 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/current.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/current.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/current.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/current.h</a></div><div class='head'>diff --git a/include/asm-sh/delay.h b/arch/sh/include/asm/delay.h<br/>index 4b16bf9b56bd..4b16bf9b56bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/delay.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/delay.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/delay.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/delay.h</a></div><div class='head'>diff --git a/include/asm-sh/device.h b/arch/sh/include/asm/device.h<br/>index efd511d0803a..efd511d0803a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/device.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/device.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/device.h</a></div><div class='head'>diff --git a/include/asm-sh/div64.h b/arch/sh/include/asm/div64.h<br/>index 6cd978cefb28..6cd978cefb28 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/div64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/div64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/div64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/div64.h</a></div><div class='head'>diff --git a/include/asm-sh/dma-mapping.h b/arch/sh/include/asm/dma-mapping.h<br/>index 627315ecdb52..627315ecdb52 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/dma-mapping.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/dma-mapping.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/dma-mapping.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/dma-mapping.h</a></div><div class='head'>diff --git a/include/asm-sh/dma.h b/arch/sh/include/asm/dma.h<br/>index a65b02fd186e..beca7128e2ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/dma.h</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='del'>-#include &lt;asm/cpu/dma.h&gt;</div><div class='add'>+#include &lt;cpu/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* The maximum address that we can perform a DMA transfer to on this platform */</div><div class='ctx'> /* Don't define MAX_DMA_ADDRESS; it's useless on the SuperH and any</div><div class='head'>diff --git a/include/asm-sh/dmabrg.h b/arch/sh/include/asm/dmabrg.h<br/>index c5edba216cf1..c5edba216cf1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/dmabrg.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/dmabrg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/dmabrg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/dmabrg.h</a></div><div class='head'>diff --git a/include/asm-sh/edosk7705.h b/arch/sh/include/asm/edosk7705.h<br/>index 5bdc9d9be3de..5bdc9d9be3de 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/edosk7705.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/edosk7705.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/edosk7705.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/edosk7705.h</a></div><div class='head'>diff --git a/include/asm-sh/elf.h b/arch/sh/include/asm/elf.h<br/>index f01449a8d378..f01449a8d378 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/elf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/elf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/elf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/elf.h</a></div><div class='head'>diff --git a/include/asm-sh/emergency-restart.h b/arch/sh/include/asm/emergency-restart.h<br/>index 108d8c48e42e..108d8c48e42e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/emergency-restart.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/emergency-restart.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/emergency-restart.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/emergency-restart.h</a></div><div class='head'>diff --git a/include/asm-sh/entry-macros.S b/arch/sh/include/asm/entry-macros.S<br/>index 2dab0b8d9454..2dab0b8d9454 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/entry-macros.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/entry-macros.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/entry-macros.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/entry-macros.S</a></div><div class='head'>diff --git a/include/asm-sh/errno.h b/arch/sh/include/asm/errno.h<br/>index 51cf6f9cebb8..51cf6f9cebb8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/errno.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/errno.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/errno.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/errno.h</a></div><div class='head'>diff --git a/include/asm-sh/fb.h b/arch/sh/include/asm/fb.h<br/>index d92e99cd8c8a..d92e99cd8c8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/fb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/fb.h</a></div><div class='head'>diff --git a/include/asm-sh/fcntl.h b/arch/sh/include/asm/fcntl.h<br/>index 46ab12db5739..46ab12db5739 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/fcntl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/fcntl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/fcntl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/fcntl.h</a></div><div class='head'>diff --git a/include/asm-sh/fixmap.h b/arch/sh/include/asm/fixmap.h<br/>index 721fcc4d5e98..721fcc4d5e98 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/fixmap.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/fixmap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/fixmap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/fixmap.h</a></div><div class='head'>diff --git a/include/asm-sh/flat.h b/arch/sh/include/asm/flat.h<br/>index 0cc800299e06..d3b2b4f109e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/flat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/flat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/flat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/flat.h</a></div><div class='hunk'>@@ -21,4 +21,11 @@</div><div class='ctx'> #define	flat_get_relocate_addr(rel)		(rel)</div><div class='ctx'> #define	flat_set_persistent(relval, p)		({ (void)p; 0; })</div><div class='ctx'> </div><div class='add'>+#define FLAT_PLAT_INIT(_r) \</div><div class='add'>+  do { _r-&gt;regs[0]=0; _r-&gt;regs[1]=0; _r-&gt;regs[2]=0; _r-&gt;regs[3]=0; \</div><div class='add'>+       _r-&gt;regs[4]=0; _r-&gt;regs[5]=0; _r-&gt;regs[6]=0; _r-&gt;regs[7]=0; \</div><div class='add'>+       _r-&gt;regs[8]=0; _r-&gt;regs[9]=0; _r-&gt;regs[10]=0; _r-&gt;regs[11]=0; \</div><div class='add'>+       _r-&gt;regs[12]=0; _r-&gt;regs[13]=0; _r-&gt;regs[14]=0; \</div><div class='add'>+       _r-&gt;sr = SR_FD; } while (0)</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_SH_FLAT_H */</div><div class='head'>diff --git a/include/asm-sh/fpu.h b/arch/sh/include/asm/fpu.h<br/>index 91462fea1507..91462fea1507 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/fpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/fpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/fpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/fpu.h</a></div><div class='head'>diff --git a/include/asm-sh/freq.h b/arch/sh/include/asm/freq.h<br/>index 39c0e091cf58..4ece90b09b9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/freq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/freq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/freq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/freq.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #define __ASM_SH_FREQ_H</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/cpu/freq.h&gt;</div><div class='add'>+#include &lt;cpu/freq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif /* __ASM_SH_FREQ_H */</div><div class='head'>diff --git a/include/asm-sh/futex-irq.h b/arch/sh/include/asm/futex-irq.h<br/>index a9f16a7f9aea..a9f16a7f9aea 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/futex-irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/futex-irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/futex-irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/futex-irq.h</a></div><div class='head'>diff --git a/include/asm-sh/futex.h b/arch/sh/include/asm/futex.h<br/>index 68256ec5fa35..68256ec5fa35 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/futex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/futex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/futex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/futex.h</a></div><div class='head'>diff --git a/include/asm-sh/gpio.h b/arch/sh/include/asm/gpio.h<br/>index 9bb27e0f11a4..cf32bd2df881 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/gpio.h</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #define __ASM_SH_GPIO_H</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_CPU_SH3)</div><div class='del'>-#include &lt;asm/cpu/gpio.h&gt;</div><div class='add'>+#include &lt;cpu/gpio.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_SH_GPIO_H */</div><div class='head'>diff --git a/include/asm-sh/hardirq.h b/arch/sh/include/asm/hardirq.h<br/>index 715ee237fc77..715ee237fc77 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/hardirq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/hardirq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/hardirq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/hardirq.h</a></div><div class='head'>diff --git a/include/asm-sh/hd64461.h b/arch/sh/include/asm/hd64461.h<br/>index 8c1353baf00f..8c1353baf00f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/hd64461.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/hd64461.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/hd64461.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/hd64461.h</a></div><div class='head'>diff --git a/include/asm-sh/hd64465/gpio.h b/arch/sh/include/asm/hd64465/gpio.h<br/>index a3cdca2713dd..a3cdca2713dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/hd64465/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/hd64465/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/hd64465/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/hd64465/gpio.h</a></div><div class='head'>diff --git a/include/asm-sh/hd64465/hd64465.h b/arch/sh/include/asm/hd64465/hd64465.h<br/>index cfd0e803d2a2..cfd0e803d2a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/hd64465/hd64465.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/hd64465/hd64465.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/hd64465/hd64465.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/hd64465/hd64465.h</a></div><div class='head'>diff --git a/include/asm-sh/hd64465/io.h b/arch/sh/include/asm/hd64465/io.h<br/>index 139f1472e5bb..139f1472e5bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/hd64465/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/hd64465/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/hd64465/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/hd64465/io.h</a></div><div class='head'>diff --git a/include/asm-sh/heartbeat.h b/arch/sh/include/asm/heartbeat.h<br/>index 724a43ed245e..724a43ed245e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/heartbeat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/heartbeat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/heartbeat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/heartbeat.h</a></div><div class='head'>diff --git a/include/asm-sh/hp6xx.h b/arch/sh/include/asm/hp6xx.h<br/>index 0d4165a32dcd..0d4165a32dcd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/hp6xx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/hp6xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/hp6xx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/hp6xx.h</a></div><div class='head'>diff --git a/include/asm-sh/hugetlb.h b/arch/sh/include/asm/hugetlb.h<br/>index 967068fb79ac..967068fb79ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/hugetlb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/hugetlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/hugetlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/hugetlb.h</a></div><div class='head'>diff --git a/include/asm-sh/hw_irq.h b/arch/sh/include/asm/hw_irq.h<br/>index d557b00111bf..d557b00111bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/hw_irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/hw_irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/hw_irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/hw_irq.h</a></div><div class='head'>diff --git a/include/asm-sh/i2c-sh7760.h b/arch/sh/include/asm/i2c-sh7760.h<br/>index 24182116711f..24182116711f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/i2c-sh7760.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/i2c-sh7760.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/i2c-sh7760.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/i2c-sh7760.h</a></div><div class='head'>diff --git a/include/asm-sh/ilsel.h b/arch/sh/include/asm/ilsel.h<br/>index e3d304b280f6..e3d304b280f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/ilsel.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/ilsel.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/ilsel.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/ilsel.h</a></div><div class='head'>diff --git a/include/asm-sh/io.h b/arch/sh/include/asm/io.h<br/>index a4fbf0c84fb1..a4fbf0c84fb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/io.h</a></div><div class='head'>diff --git a/include/asm-sh/io_generic.h b/arch/sh/include/asm/io_generic.h<br/>index 92fc6070d7b3..92fc6070d7b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/io_generic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/io_generic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/io_generic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/io_generic.h</a></div><div class='head'>diff --git a/include/asm-sh/io_trapped.h b/arch/sh/include/asm/io_trapped.h<br/>index f1251d4f0ba9..f1251d4f0ba9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/io_trapped.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/io_trapped.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/io_trapped.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/io_trapped.h</a></div><div class='head'>diff --git a/include/asm-sh/ioctl.h b/arch/sh/include/asm/ioctl.h<br/>index b279fe06dfe5..b279fe06dfe5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/ioctl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/ioctl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/ioctl.h</a></div><div class='head'>diff --git a/include/asm-sh/ioctls.h b/arch/sh/include/asm/ioctls.h<br/>index c212c371a4a5..c212c371a4a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/ioctls.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/ioctls.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/ioctls.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/ioctls.h</a></div><div class='head'>diff --git a/include/asm-sh/ipcbuf.h b/arch/sh/include/asm/ipcbuf.h<br/>index 5ffc9972a7ea..5ffc9972a7ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/ipcbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/ipcbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/ipcbuf.h</a></div><div class='head'>diff --git a/include/asm-sh/irq.h b/arch/sh/include/asm/irq.h<br/>index ca66e5df69dc..6195a531c1b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/irq.h</a></div><div class='hunk'>@@ -51,7 +51,7 @@ extern void irq_ctx_exit(int cpu);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_SH5</div><div class='del'>-#include &lt;asm/cpu/irq.h&gt;</div><div class='add'>+#include &lt;cpu/irq.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_SH_IRQ_H */</div><div class='head'>diff --git a/include/asm-sh/irq_regs.h b/arch/sh/include/asm/irq_regs.h<br/>index 3dd9c0b70270..3dd9c0b70270 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/irq_regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/irq_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/irq_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/irq_regs.h</a></div><div class='head'>diff --git a/include/asm-sh/irqflags.h b/arch/sh/include/asm/irqflags.h<br/>index 46e71da5be6b..46e71da5be6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/irqflags.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/irqflags.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/irqflags.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/irqflags.h</a></div><div class='head'>diff --git a/include/asm-sh/irqflags_32.h b/arch/sh/include/asm/irqflags_32.h<br/>index 60218f541340..60218f541340 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/irqflags_32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/irqflags_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/irqflags_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/irqflags_32.h</a></div><div class='head'>diff --git a/include/asm-sh/irqflags_64.h b/arch/sh/include/asm/irqflags_64.h<br/>index 4f6b8a56e7bd..88f65222c1d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/irqflags_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/irqflags_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/irqflags_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/irqflags_64.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #ifndef __ASM_SH_IRQFLAGS_64_H</div><div class='ctx'> #define __ASM_SH_IRQFLAGS_64_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/cpu/registers.h&gt;</div><div class='add'>+#include &lt;cpu/registers.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SR_MASK_LL	0x00000000000000f0LL</div><div class='ctx'> #define SR_BL_LL	0x0000000010000000LL</div><div class='head'>diff --git a/include/asm-sh/kdebug.h b/arch/sh/include/asm/kdebug.h<br/>index 49cd69051a88..49cd69051a88 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/kdebug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/kdebug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/kdebug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/kdebug.h</a></div><div class='head'>diff --git a/include/asm-sh/kexec.h b/arch/sh/include/asm/kexec.h<br/>index 00f4260ef09b..765a5e1660fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/kexec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/kexec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/kexec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/kexec.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> /* Maximum address we can use for the control code buffer */</div><div class='ctx'> #define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE</div><div class='ctx'> </div><div class='del'>-#define KEXEC_CONTROL_CODE_SIZE	4096</div><div class='add'>+#define KEXEC_CONTROL_PAGE_SIZE	4096</div><div class='ctx'> </div><div class='ctx'> /* The native architecture */</div><div class='ctx'> #define KEXEC_ARCH KEXEC_ARCH_SH</div><div class='head'>diff --git a/include/asm-sh/kgdb.h b/arch/sh/include/asm/kgdb.h<br/>index 24e42078f36f..24e42078f36f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/kgdb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/kgdb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/kgdb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/kgdb.h</a></div><div class='head'>diff --git a/include/asm-sh/kmap_types.h b/arch/sh/include/asm/kmap_types.h<br/>index 84d565c696be..84d565c696be 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/kmap_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/kmap_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/kmap_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/kmap_types.h</a></div><div class='head'>diff --git a/include/asm-sh/lboxre2.h b/arch/sh/include/asm/lboxre2.h<br/>index e6d160504923..e6d160504923 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/lboxre2.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/lboxre2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/lboxre2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/lboxre2.h</a></div><div class='head'>diff --git a/include/asm-sh/linkage.h b/arch/sh/include/asm/linkage.h<br/>index 3565a4f4009f..3565a4f4009f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/linkage.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/linkage.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/linkage.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/linkage.h</a></div><div class='head'>diff --git a/include/asm-sh/local.h b/arch/sh/include/asm/local.h<br/>index 9ed9b9cb459a..9ed9b9cb459a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/local.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/local.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/local.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/local.h</a></div><div class='head'>diff --git a/include/asm-sh/machvec.h b/arch/sh/include/asm/machvec.h<br/>index b2e4124070ae..b2e4124070ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/machvec.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/machvec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/machvec.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/machvec.h</a></div><div class='head'>diff --git a/include/asm-sh/magicpanelr2.h b/arch/sh/include/asm/magicpanelr2.h<br/>index c644a77ee357..c644a77ee357 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/magicpanelr2.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/magicpanelr2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/magicpanelr2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/magicpanelr2.h</a></div><div class='head'>diff --git a/include/asm-sh/mc146818rtc.h b/arch/sh/include/asm/mc146818rtc.h<br/>index 0aee96a97330..0aee96a97330 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/mc146818rtc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/mc146818rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/mc146818rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/mc146818rtc.h</a></div><div class='head'>diff --git a/include/asm-sh/microdev.h b/arch/sh/include/asm/microdev.h<br/>index 1aed15856e11..1aed15856e11 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/microdev.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/microdev.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/microdev.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/microdev.h</a></div><div class='head'>diff --git a/include/asm-sh/migor.h b/arch/sh/include/asm/migor.h<br/>index 10016e0f4a4e..c12b632c540b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/migor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/migor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/migor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/migor.h</a></div><div class='hunk'>@@ -42,9 +42,6 @@</div><div class='ctx'> </div><div class='ctx'> #define PORT_MSELCRB 0xa4050182</div><div class='ctx'> </div><div class='del'>-#define MSTPCR1 0xa4150034</div><div class='del'>-#define MSTPCR2 0xa4150038</div><div class='del'>-</div><div class='ctx'> #define PORT_PSELA 0xa405014e</div><div class='ctx'> #define PORT_PSELB 0xa4050150</div><div class='ctx'> #define PORT_PSELC 0xa4050152</div><div class='head'>diff --git a/include/asm-sh/mman.h b/arch/sh/include/asm/mman.h<br/>index 156eb0225cf6..156eb0225cf6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/mman.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/mman.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/mman.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/mman.h</a></div><div class='head'>diff --git a/include/asm-sh/mmu.h b/arch/sh/include/asm/mmu.h<br/>index fdcb93bc6d11..fdcb93bc6d11 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/mmu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/mmu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/mmu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/mmu.h</a></div><div class='head'>diff --git a/include/asm-sh/mmu_context.h b/arch/sh/include/asm/mmu_context.h<br/>index 8589a50febd0..04c0c9733ad6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/mmu_context.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/mmu_context.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> #define __ASM_SH_MMU_CONTEXT_H</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='del'>-#include &lt;asm/cpu/mmu_context.h&gt;</div><div class='add'>+#include &lt;cpu/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/include/asm-sh/mmu_context_32.h b/arch/sh/include/asm/mmu_context_32.h<br/>index f4f9aebd68b7..f4f9aebd68b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/mmu_context_32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/mmu_context_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/mmu_context_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/mmu_context_32.h</a></div><div class='head'>diff --git a/include/asm-sh/mmu_context_64.h b/arch/sh/include/asm/mmu_context_64.h<br/>index 9649f1c07caf..de121025d87f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/mmu_context_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/mmu_context_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/mmu_context_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/mmu_context_64.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'>  * License.  See the file "COPYING" in the main directory of this archive</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/cpu/registers.h&gt;</div><div class='add'>+#include &lt;cpu/registers.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SR_ASID_MASK		0xffffffffff00ffffULL</div><div class='head'>diff --git a/include/asm-sh/mmzone.h b/arch/sh/include/asm/mmzone.h<br/>index 2969253c4042..2969253c4042 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/mmzone.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/mmzone.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/mmzone.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/mmzone.h</a></div><div class='head'>diff --git a/include/asm-sh/module.h b/arch/sh/include/asm/module.h<br/>index 46eccd331660..46eccd331660 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/module.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/module.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/module.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/module.h</a></div><div class='head'>diff --git a/include/asm-sh/msgbuf.h b/arch/sh/include/asm/msgbuf.h<br/>index 517432343fb5..517432343fb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/msgbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/msgbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/msgbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/msgbuf.h</a></div><div class='head'>diff --git a/include/asm-sh/mutex.h b/arch/sh/include/asm/mutex.h<br/>index 458c1f7fbc18..458c1f7fbc18 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/mutex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/mutex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/mutex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/mutex.h</a></div><div class='head'>diff --git a/include/asm-sh/page.h b/arch/sh/include/asm/page.h<br/>index 77fb8bf02e4e..77fb8bf02e4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/page.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/page.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/page.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/page.h</a></div><div class='head'>diff --git a/include/asm-sh/param.h b/arch/sh/include/asm/param.h<br/>index ae245afdfd6a..ae245afdfd6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/param.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/param.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/param.h</a></div><div class='head'>diff --git a/include/asm-sh/parport.h b/arch/sh/include/asm/parport.h<br/>index f67ba60a2acd..f67ba60a2acd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/parport.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/parport.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/parport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/parport.h</a></div><div class='head'>diff --git a/include/asm-sh/pci.h b/arch/sh/include/asm/pci.h<br/>index df1d383e18a5..df1d383e18a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/pci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/pci.h</a></div><div class='head'>diff --git a/include/asm-sh/percpu.h b/arch/sh/include/asm/percpu.h<br/>index 4db4b39a4399..4db4b39a4399 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/percpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/percpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/percpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/percpu.h</a></div><div class='head'>diff --git a/include/asm-sh/pgalloc.h b/arch/sh/include/asm/pgalloc.h<br/>index 84dd2db7104c..84dd2db7104c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/pgalloc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/pgalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/pgalloc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/pgalloc.h</a></div><div class='head'>diff --git a/include/asm-sh/pgtable.h b/arch/sh/include/asm/pgtable.h<br/>index a4a8f8b93463..a4a8f8b93463 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/pgtable.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/pgtable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/pgtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/pgtable.h</a></div><div class='head'>diff --git a/include/asm-sh/pgtable_32.h b/arch/sh/include/asm/pgtable_32.h<br/>index 72ea209195bd..72ea209195bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/pgtable_32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/pgtable_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/pgtable_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/pgtable_32.h</a></div><div class='head'>diff --git a/include/asm-sh/pgtable_64.h b/arch/sh/include/asm/pgtable_64.h<br/>index c78990cda557..c78990cda557 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/pgtable_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/pgtable_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/pgtable_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/pgtable_64.h</a></div><div class='head'>diff --git a/include/asm-sh/pm.h b/arch/sh/include/asm/pm.h<br/>index 56fdbd6b1c94..56fdbd6b1c94 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/pm.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/pm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/pm.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/pm.h</a></div><div class='head'>diff --git a/include/asm-sh/poll.h b/arch/sh/include/asm/poll.h<br/>index c98509d3149e..c98509d3149e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/poll.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/poll.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/poll.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/poll.h</a></div><div class='head'>diff --git a/include/asm-sh/posix_types.h b/arch/sh/include/asm/posix_types.h<br/>index 4eeb723aee7e..4eeb723aee7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/posix_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/posix_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/posix_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/posix_types.h</a></div><div class='head'>diff --git a/include/asm-sh/posix_types_32.h b/arch/sh/include/asm/posix_types_32.h<br/>index 0a3d2f54ab27..0a3d2f54ab27 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/posix_types_32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/posix_types_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/posix_types_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/posix_types_32.h</a></div><div class='head'>diff --git a/include/asm-sh/posix_types_64.h b/arch/sh/include/asm/posix_types_64.h<br/>index 0620317a6f0f..0620317a6f0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/posix_types_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/posix_types_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/posix_types_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/posix_types_64.h</a></div><div class='head'>diff --git a/include/asm-sh/processor.h b/arch/sh/include/asm/processor.h<br/>index 15d9f92ca383..15d9f92ca383 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/processor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/processor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/processor.h</a></div><div class='head'>diff --git a/include/asm-sh/processor_32.h b/arch/sh/include/asm/processor_32.h<br/>index c6583f267071..0dadd75bd93c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/processor_32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/processor_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/processor_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/processor_32.h</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'>  * Default implementation of macro that returns current</div><div class='ctx'>  * instruction pointer ("program counter").</div><div class='ctx'>  */</div><div class='del'>-#define current_text_addr() ({ void *pc; __asm__("mova	1f, %0\n1:":"=z" (pc)); pc; })</div><div class='add'>+#define current_text_addr() ({ void *pc; __asm__("mova	1f, %0\n.align 2\n1:":"=z" (pc)); pc; })</div><div class='ctx'> </div><div class='ctx'> /* Core Processor Version Register */</div><div class='ctx'> #define CCN_PVR		0xff000030</div><div class='head'>diff --git a/include/asm-sh/processor_64.h b/arch/sh/include/asm/processor_64.h<br/>index fc7fc685ba27..770d5169983b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/processor_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/processor_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/processor_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/processor_64.h</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/cpu/registers.h&gt;</div><div class='add'>+#include &lt;cpu/registers.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Default implementation of macro that returns current</div><div class='head'>diff --git a/include/asm-sh/ptrace.h b/arch/sh/include/asm/ptrace.h<br/>index 643ab5a7cf3b..b86aeabba61a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/ptrace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/ptrace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/ptrace.h</a></div><div class='hunk'>@@ -104,6 +104,15 @@ struct pt_dspregs {</div><div class='ctx'> </div><div class='ctx'> extern void show_regs(struct pt_regs *);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * These are defined as per linux/ptrace.h.</div><div class='add'>+ */</div><div class='add'>+struct task_struct;</div><div class='add'>+</div><div class='add'>+#define arch_has_single_step()	(1)</div><div class='add'>+extern void user_enable_single_step(struct task_struct *);</div><div class='add'>+extern void user_disable_single_step(struct task_struct *);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SH_DSP</div><div class='ctx'> #define task_pt_regs(task) \</div><div class='ctx'> 	((struct pt_regs *) (task_stack_page(task) + THREAD_SIZE \</div><div class='head'>diff --git a/include/asm-sh/push-switch.h b/arch/sh/include/asm/push-switch.h<br/>index 4903f9e52dd8..4903f9e52dd8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/push-switch.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/push-switch.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/push-switch.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/push-switch.h</a></div><div class='head'>diff --git a/include/asm-sh/r7780rp.h b/arch/sh/include/asm/r7780rp.h<br/>index 306f7359f7d4..306f7359f7d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/r7780rp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/r7780rp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/r7780rp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/r7780rp.h</a></div><div class='head'>diff --git a/include/asm-sh/resource.h b/arch/sh/include/asm/resource.h<br/>index 9c2499a86ec0..9c2499a86ec0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/resource.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/resource.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/resource.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/resource.h</a></div><div class='head'>diff --git a/include/asm-sh/rtc.h b/arch/sh/include/asm/rtc.h<br/>index ec45ba8e11d9..1813f4202a24 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/rtc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/rtc.h</a></div><div class='hunk'>@@ -11,6 +11,6 @@ struct sh_rtc_platform_info {</div><div class='ctx'> 	unsigned long capabilities;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/cpu/rtc.h&gt;</div><div class='add'>+#include &lt;cpu/rtc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_RTC_H */</div><div class='head'>diff --git a/include/asm-sh/rts7751r2d.h b/arch/sh/include/asm/rts7751r2d.h<br/>index 0a800157b826..0a800157b826 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/rts7751r2d.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/rts7751r2d.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/rts7751r2d.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/rts7751r2d.h</a></div><div class='head'>diff --git a/include/asm-sh/rwsem.h b/arch/sh/include/asm/rwsem.h<br/>index 1987f3ea7f1b..1987f3ea7f1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/rwsem.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/rwsem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/rwsem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/rwsem.h</a></div><div class='head'>diff --git a/include/asm-sh/scatterlist.h b/arch/sh/include/asm/scatterlist.h<br/>index 2084d0373693..2084d0373693 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/scatterlist.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/scatterlist.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/scatterlist.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/scatterlist.h</a></div><div class='head'>diff --git a/include/asm-sh/sdk7780.h b/arch/sh/include/asm/sdk7780.h<br/>index 697dc865f21b..697dc865f21b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/sdk7780.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/sdk7780.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/sdk7780.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sdk7780.h</a></div><div class='head'>diff --git a/arch/sh/include/asm/seccomp.h b/arch/sh/include/asm/seccomp.h<br/>new file mode 100644<br/>index 000000000000..3280ed3802ef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/seccomp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/seccomp.h</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+#ifndef __ASM_SECCOMP_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unistd.h&gt;</div><div class='add'>+</div><div class='add'>+#define __NR_seccomp_read __NR_read</div><div class='add'>+#define __NR_seccomp_write __NR_write</div><div class='add'>+#define __NR_seccomp_exit __NR_exit</div><div class='add'>+#define __NR_seccomp_sigreturn __NR_rt_sigreturn</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_SECCOMP_H */</div><div class='head'>diff --git a/include/asm-sh/sections.h b/arch/sh/include/asm/sections.h<br/>index 8f8f4ad400df..8f8f4ad400df 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/sections.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/sections.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/sections.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sections.h</a></div><div class='head'>diff --git a/include/asm-sh/segment.h b/arch/sh/include/asm/segment.h<br/>index 5e2725f4ac49..5e2725f4ac49 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/segment.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/segment.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/segment.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/segment.h</a></div><div class='head'>diff --git a/include/asm-sh/sembuf.h b/arch/sh/include/asm/sembuf.h<br/>index d79f3bd570b2..d79f3bd570b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/sembuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/sembuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/sembuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sembuf.h</a></div><div class='head'>diff --git a/include/asm-sh/serial.h b/arch/sh/include/asm/serial.h<br/>index 21f6d330f189..e13cc948ee60 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/serial.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/serial.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/serial.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HD64465</div><div class='del'>-#include &lt;asm/hd64465.h&gt;</div><div class='add'>+#include &lt;asm/hd64465/hd64465.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SERIAL_PORT_DFNS                   \</div><div class='ctx'>         /* UART CLK   PORT IRQ     FLAGS        */                      \</div><div class='head'>diff --git a/include/asm-sh/setup.h b/arch/sh/include/asm/setup.h<br/>index 55a2bd328d99..55a2bd328d99 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/setup.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/setup.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/setup.h</a></div><div class='head'>diff --git a/include/asm-sh/sfp-machine.h b/arch/sh/include/asm/sfp-machine.h<br/>index d3c548443f2a..d3c548443f2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/sfp-machine.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/sfp-machine.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/sfp-machine.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sfp-machine.h</a></div><div class='head'>diff --git a/include/asm-sh/sh7760fb.h b/arch/sh/include/asm/sh7760fb.h<br/>index 8767f61aceca..8767f61aceca 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/sh7760fb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/sh7760fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/sh7760fb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sh7760fb.h</a></div><div class='head'>diff --git a/include/asm-sh/sh7763rdp.h b/arch/sh/include/asm/sh7763rdp.h<br/>index 8750cc852977..8750cc852977 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/sh7763rdp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/sh7763rdp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/sh7763rdp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sh7763rdp.h</a></div><div class='head'>diff --git a/include/asm-sh/sh7785lcr.h b/arch/sh/include/asm/sh7785lcr.h<br/>index 1ce27d5c7491..1ce27d5c7491 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/sh7785lcr.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/sh7785lcr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/sh7785lcr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sh7785lcr.h</a></div><div class='head'>diff --git a/include/asm-sh/sh_bios.h b/arch/sh/include/asm/sh_bios.h<br/>index 0ca261956e3d..0ca261956e3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/sh_bios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/sh_bios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/sh_bios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sh_bios.h</a></div><div class='head'>diff --git a/arch/sh/include/asm/sh_eth.h b/arch/sh/include/asm/sh_eth.h<br/>new file mode 100644<br/>index 000000000000..bb832584f3c1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/sh_eth.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sh_eth.h</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+#ifndef __ASM_SH_ETH_H__</div><div class='add'>+#define __ASM_SH_ETH_H__</div><div class='add'>+</div><div class='add'>+enum {EDMAC_LITTLE_ENDIAN, EDMAC_BIG_ENDIAN};</div><div class='add'>+</div><div class='add'>+struct sh_eth_plat_data {</div><div class='add'>+	int phy;</div><div class='add'>+	int edmac_endian;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/asm-sh/sh_keysc.h b/arch/sh/include/asm/sh_keysc.h<br/>index b5a4dd5a9729..b5a4dd5a9729 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/sh_keysc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/sh_keysc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/sh_keysc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sh_keysc.h</a></div><div class='head'>diff --git a/include/asm-sh/sh_mobile_lcdc.h b/arch/sh/include/asm/sh_mobile_lcdc.h<br/>index 27677727df4d..130102f663f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/sh_mobile_lcdc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/sh_mobile_lcdc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/sh_mobile_lcdc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sh_mobile_lcdc.h</a></div><div class='hunk'>@@ -47,12 +47,18 @@ struct sh_mobile_lcdc_board_cfg {</div><div class='ctx'> 	void (*display_off)(void *board_data);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct sh_mobile_lcdc_lcd_size_cfg { /* width and height of panel in mm */</div><div class='add'>+	unsigned long width;</div><div class='add'>+	unsigned long height;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct sh_mobile_lcdc_chan_cfg {</div><div class='ctx'> 	int chan;</div><div class='ctx'> 	int bpp;</div><div class='ctx'> 	int interface_type; /* selects RGBn or SYSn I/F, see above */</div><div class='ctx'> 	int clock_divider;</div><div class='ctx'> 	struct fb_videomode lcd_cfg;</div><div class='add'>+	struct sh_mobile_lcdc_lcd_size_cfg lcd_size_cfg;</div><div class='ctx'> 	struct sh_mobile_lcdc_board_cfg board_cfg;</div><div class='ctx'> 	struct sh_mobile_lcdc_sys_bus_cfg sys_bus_cfg; /* only for SYSn I/F */</div><div class='ctx'> };</div><div class='head'>diff --git a/include/asm-sh/shmbuf.h b/arch/sh/include/asm/shmbuf.h<br/>index b2101f490521..b2101f490521 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/shmbuf.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/shmbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/shmbuf.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/shmbuf.h</a></div><div class='head'>diff --git a/include/asm-sh/shmin.h b/arch/sh/include/asm/shmin.h<br/>index 36ba138a81fb..36ba138a81fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/shmin.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/shmin.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/shmin.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/shmin.h</a></div><div class='head'>diff --git a/include/asm-sh/shmparam.h b/arch/sh/include/asm/shmparam.h<br/>index ba1758d90106..ba1758d90106 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/shmparam.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/shmparam.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/shmparam.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/shmparam.h</a></div><div class='head'>diff --git a/include/asm-sh/sigcontext.h b/arch/sh/include/asm/sigcontext.h<br/>index 8ce1435bc0bf..8ce1435bc0bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/sigcontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/sigcontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sigcontext.h</a></div><div class='head'>diff --git a/include/asm-sh/siginfo.h b/arch/sh/include/asm/siginfo.h<br/>index 813040ed68a9..813040ed68a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/siginfo.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/siginfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/siginfo.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/siginfo.h</a></div><div class='head'>diff --git a/include/asm-sh/signal.h b/arch/sh/include/asm/signal.h<br/>index 5c5c1e852089..5c5c1e852089 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/signal.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/signal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/signal.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/signal.h</a></div><div class='head'>diff --git a/include/asm-sh/smc37c93x.h b/arch/sh/include/asm/smc37c93x.h<br/>index 585da2a8fc45..585da2a8fc45 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/smc37c93x.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/smc37c93x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/smc37c93x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/smc37c93x.h</a></div><div class='head'>diff --git a/include/asm-sh/smp.h b/arch/sh/include/asm/smp.h<br/>index 593343cd26ee..593343cd26ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/smp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/smp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/smp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/smp.h</a></div><div class='head'>diff --git a/include/asm-sh/snapgear.h b/arch/sh/include/asm/snapgear.h<br/>index 042d95f51c4d..042d95f51c4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/snapgear.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/snapgear.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/snapgear.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/snapgear.h</a></div><div class='head'>diff --git a/include/asm-sh/socket.h b/arch/sh/include/asm/socket.h<br/>index 6d4bf6512959..6d4bf6512959 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/socket.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/socket.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/socket.h</a></div><div class='head'>diff --git a/include/asm-sh/sockios.h b/arch/sh/include/asm/sockios.h<br/>index cf8b96b1f9ab..cf8b96b1f9ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/sockios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/sockios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/sockios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sockios.h</a></div><div class='head'>diff --git a/include/asm-sh/sparsemem.h b/arch/sh/include/asm/sparsemem.h<br/>index 547a540b6667..547a540b6667 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/sparsemem.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/sparsemem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/sparsemem.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/sparsemem.h</a></div><div class='head'>diff --git a/include/asm-sh/spi.h b/arch/sh/include/asm/spi.h<br/>index e96f5b0953c8..e96f5b0953c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/spi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/spi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/spi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/spi.h</a></div><div class='head'>diff --git a/include/asm-sh/spinlock.h b/arch/sh/include/asm/spinlock.h<br/>index e793181d64da..e793181d64da 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/spinlock.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/spinlock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/spinlock.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/spinlock.h</a></div><div class='head'>diff --git a/include/asm-sh/spinlock_types.h b/arch/sh/include/asm/spinlock_types.h<br/>index b4d244e7b60c..b4d244e7b60c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/spinlock_types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/spinlock_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/spinlock_types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/spinlock_types.h</a></div><div class='head'>diff --git a/include/asm-sh/stat.h b/arch/sh/include/asm/stat.h<br/>index e1810cc6e3da..e1810cc6e3da 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/stat.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/stat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/stat.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/stat.h</a></div><div class='head'>diff --git a/include/asm-sh/statfs.h b/arch/sh/include/asm/statfs.h<br/>index 9202a023328f..9202a023328f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/statfs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/statfs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/statfs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/statfs.h</a></div><div class='head'>diff --git a/include/asm-sh/string.h b/arch/sh/include/asm/string.h<br/>index 8c1ea21dc0ae..8c1ea21dc0ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/string.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/string.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/string.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/string.h</a></div><div class='head'>diff --git a/include/asm-sh/string_32.h b/arch/sh/include/asm/string_32.h<br/>index 55f8db6bc1d7..55f8db6bc1d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/string_32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/string_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/string_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/string_32.h</a></div><div class='head'>diff --git a/include/asm-sh/string_64.h b/arch/sh/include/asm/string_64.h<br/>index aa1fef229c78..aa1fef229c78 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/string_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/string_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/string_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/string_64.h</a></div><div class='head'>diff --git a/include/asm-sh/system.h b/arch/sh/include/asm/system.h<br/>index 056d68cd2108..056d68cd2108 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/system.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/system.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/system.h</a></div><div class='head'>diff --git a/include/asm-sh/system_32.h b/arch/sh/include/asm/system_32.h<br/>index f11bcf0855ed..f11bcf0855ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/system_32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/system_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/system_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/system_32.h</a></div><div class='head'>diff --git a/include/asm-sh/system_64.h b/arch/sh/include/asm/system_64.h<br/>index 943acf5ea07c..943acf5ea07c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/system_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/system_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/system_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/system_64.h</a></div><div class='head'>diff --git a/include/asm-sh/systemh7751.h b/arch/sh/include/asm/systemh7751.h<br/>index 4161122c84ef..4161122c84ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/systemh7751.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/systemh7751.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/systemh7751.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/systemh7751.h</a></div><div class='head'>diff --git a/include/asm-sh/termbits.h b/arch/sh/include/asm/termbits.h<br/>index 77db116948cf..77db116948cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/termbits.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/termbits.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/termbits.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/termbits.h</a></div><div class='head'>diff --git a/include/asm-sh/termios.h b/arch/sh/include/asm/termios.h<br/>index 0a8c793c76f2..0a8c793c76f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/termios.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/termios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/termios.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/termios.h</a></div><div class='head'>diff --git a/include/asm-sh/thread_info.h b/arch/sh/include/asm/thread_info.h<br/>index eeb4c747119e..0a894cafb1dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/thread_info.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/thread_info.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/thread_info.h</a></div><div class='hunk'>@@ -117,24 +117,45 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define TIF_NEED_RESCHED	2	/* rescheduling necessary */</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	3	/* restore signal mask in do_signal() */</div><div class='ctx'> #define TIF_SINGLESTEP		4	/* singlestepping active */</div><div class='del'>-#define TIF_SYSCALL_AUDIT	5</div><div class='add'>+#define TIF_SYSCALL_AUDIT	5	/* syscall auditing active */</div><div class='add'>+#define TIF_SECCOMP		6	/* secure computing */</div><div class='add'>+#define TIF_NOTIFY_RESUME	7	/* callback before returning to user */</div><div class='ctx'> #define TIF_USEDFPU		16	/* FPU was used by this task this quantum (SMP) */</div><div class='ctx'> #define TIF_POLLING_NRFLAG	17	/* true if poll_idle() is polling TIF_NEED_RESCHED */</div><div class='ctx'> #define TIF_MEMDIE		18</div><div class='del'>-#define TIF_FREEZE		19</div><div class='del'>-</div><div class='del'>-#define _TIF_SYSCALL_TRACE	(1&lt;&lt;TIF_SYSCALL_TRACE)</div><div class='del'>-#define _TIF_SIGPENDING		(1&lt;&lt;TIF_SIGPENDING)</div><div class='del'>-#define _TIF_NEED_RESCHED	(1&lt;&lt;TIF_NEED_RESCHED)</div><div class='del'>-#define _TIF_RESTORE_SIGMASK	(1&lt;&lt;TIF_RESTORE_SIGMASK)</div><div class='del'>-#define _TIF_SINGLESTEP		(1&lt;&lt;TIF_SINGLESTEP)</div><div class='del'>-#define _TIF_SYSCALL_AUDIT		(1&lt;&lt;TIF_SYSCALL_AUDIT)</div><div class='del'>-#define _TIF_USEDFPU		(1&lt;&lt;TIF_USEDFPU)</div><div class='del'>-#define _TIF_POLLING_NRFLAG	(1&lt;&lt;TIF_POLLING_NRFLAG)</div><div class='del'>-#define _TIF_FREEZE		(1&lt;&lt;TIF_FREEZE)</div><div class='del'>-</div><div class='del'>-#define _TIF_WORK_MASK		0x000000FE	/* work to do on interrupt/exception return */</div><div class='del'>-#define _TIF_ALLWORK_MASK	0x000000FF	/* work to do on any return to u-space */</div><div class='add'>+#define TIF_FREEZE		19	/* Freezing for suspend */</div><div class='add'>+</div><div class='add'>+#define _TIF_SYSCALL_TRACE	(1 &lt;&lt; TIF_SYSCALL_TRACE)</div><div class='add'>+#define _TIF_SIGPENDING		(1 &lt;&lt; TIF_SIGPENDING)</div><div class='add'>+#define _TIF_NEED_RESCHED	(1 &lt;&lt; TIF_NEED_RESCHED)</div><div class='add'>+#define _TIF_RESTORE_SIGMASK	(1 &lt;&lt; TIF_RESTORE_SIGMASK)</div><div class='add'>+#define _TIF_SINGLESTEP		(1 &lt;&lt; TIF_SINGLESTEP)</div><div class='add'>+#define _TIF_SYSCALL_AUDIT	(1 &lt;&lt; TIF_SYSCALL_AUDIT)</div><div class='add'>+#define _TIF_SECCOMP		(1 &lt;&lt; TIF_SECCOMP)</div><div class='add'>+#define _TIF_NOTIFY_RESUME	(1 &lt;&lt; TIF_NOTIFY_RESUME)</div><div class='add'>+#define _TIF_USEDFPU		(1 &lt;&lt; TIF_USEDFPU)</div><div class='add'>+#define _TIF_POLLING_NRFLAG	(1 &lt;&lt; TIF_POLLING_NRFLAG)</div><div class='add'>+#define _TIF_FREEZE		(1 &lt;&lt; TIF_FREEZE)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * _TIF_ALLWORK_MASK and _TIF_WORK_MASK need to fit within a byte, or we</div><div class='add'>+ * blow the tst immediate size constraints and need to fix up</div><div class='add'>+ * arch/sh/kernel/entry-common.S.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* work to do in syscall trace */</div><div class='add'>+#define _TIF_WORK_SYSCALL_MASK	(_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP | \</div><div class='add'>+				 _TIF_SYSCALL_AUDIT | _TIF_SECCOMP)</div><div class='add'>+</div><div class='add'>+/* work to do on any return to u-space */</div><div class='add'>+#define _TIF_ALLWORK_MASK	(_TIF_SYSCALL_TRACE | _TIF_SIGPENDING      | \</div><div class='add'>+				 _TIF_NEED_RESCHED  | _TIF_SYSCALL_AUDIT   | \</div><div class='add'>+				 _TIF_SINGLESTEP    | _TIF_RESTORE_SIGMASK | \</div><div class='add'>+				 _TIF_NOTIFY_RESUME)</div><div class='add'>+</div><div class='add'>+/* work to do on interrupt/exception return */</div><div class='add'>+#define _TIF_WORK_MASK		(_TIF_ALLWORK_MASK &amp; ~(_TIF_SYSCALL_TRACE | \</div><div class='add'>+				 _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP))</div><div class='ctx'> </div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-sh/timer.h b/arch/sh/include/asm/timer.h<br/>index 327f7eb8976a..a7ca3a195bb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/timer.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/timer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/timer.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='del'>-#include &lt;asm/cpu/timer.h&gt;</div><div class='add'>+#include &lt;cpu/timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct sys_timer_ops {</div><div class='ctx'> 	int (*init)(void);</div><div class='head'>diff --git a/include/asm-sh/timex.h b/arch/sh/include/asm/timex.h<br/>index a873e24113cf..a873e24113cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/timex.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/timex.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/timex.h</a></div><div class='head'>diff --git a/include/asm-sh/titan.h b/arch/sh/include/asm/titan.h<br/>index 03f3583c8918..03f3583c8918 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/titan.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/titan.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/titan.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/titan.h</a></div><div class='head'>diff --git a/include/asm-sh/tlb.h b/arch/sh/include/asm/tlb.h<br/>index 88ff1ae8a6b8..88ff1ae8a6b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/tlb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/tlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/tlb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/tlb.h</a></div><div class='head'>diff --git a/include/asm-sh/tlb_64.h b/arch/sh/include/asm/tlb_64.h<br/>index 0a96f3af69e3..ef0ae2a28f23 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/tlb_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/tlb_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/tlb_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/tlb_64.h</a></div><div class='hunk'>@@ -21,11 +21,9 @@</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * for_each_dtlb_entry</div><div class='add'>+ * for_each_dtlb_entry - Iterate over free (non-wired) DTLB entries</div><div class='ctx'>  *</div><div class='ctx'>  * @tlb:	TLB entry</div><div class='del'>- *</div><div class='del'>- * Iterate over free (non-wired) DTLB entries</div><div class='ctx'>  */</div><div class='ctx'> #define for_each_dtlb_entry(tlb)		\</div><div class='ctx'> 	for (tlb  = cpu_data-&gt;dtlb.first;	\</div><div class='hunk'>@@ -33,11 +31,9 @@</div><div class='ctx'> 	     tlb += cpu_data-&gt;dtlb.step)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * for_each_itlb_entry</div><div class='add'>+ * for_each_itlb_entry - Iterate over free (non-wired) ITLB entries</div><div class='ctx'>  *</div><div class='ctx'>  * @tlb:	TLB entry</div><div class='del'>- *</div><div class='del'>- * Iterate over free (non-wired) ITLB entries</div><div class='ctx'>  */</div><div class='ctx'> #define for_each_itlb_entry(tlb)		\</div><div class='ctx'> 	for (tlb  = cpu_data-&gt;itlb.first;	\</div><div class='hunk'>@@ -45,11 +41,9 @@</div><div class='ctx'> 	     tlb += cpu_data-&gt;itlb.step)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * __flush_tlb_slot</div><div class='add'>+ * __flush_tlb_slot - Flushes TLB slot @slot.</div><div class='ctx'>  *</div><div class='ctx'>  * @slot:	Address of TLB slot.</div><div class='del'>- *</div><div class='del'>- * Flushes TLB slot @slot.</div><div class='ctx'>  */</div><div class='ctx'> static inline void __flush_tlb_slot(unsigned long long slot)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-sh/tlbflush.h b/arch/sh/include/asm/tlbflush.h<br/>index e0ac97221ae6..e0ac97221ae6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/tlbflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/tlbflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/tlbflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/tlbflush.h</a></div><div class='head'>diff --git a/include/asm-sh/topology.h b/arch/sh/include/asm/topology.h<br/>index 95f0085e098a..95f0085e098a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/topology.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/topology.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/topology.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/topology.h</a></div><div class='head'>diff --git a/include/asm-sh/types.h b/arch/sh/include/asm/types.h<br/>index beea4e6f8dfd..beea4e6f8dfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/types.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/types.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/types.h</a></div><div class='head'>diff --git a/include/asm-sh/uaccess.h b/arch/sh/include/asm/uaccess.h<br/>index 45c2c9b2993d..075848f43b6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/uaccess.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/uaccess.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/uaccess.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/uaccess.h</a></div><div class='hunk'>@@ -77,8 +77,9 @@ struct __large_struct { unsigned long buf[100]; };</div><div class='ctx'> ({								\</div><div class='ctx'> 	long __pu_err;						\</div><div class='ctx'> 	__typeof__(*(ptr)) __user *__pu_addr = (ptr);		\</div><div class='add'>+	__typeof__(*(ptr)) __pu_val = x;			\</div><div class='ctx'> 	__chk_user_ptr(ptr);					\</div><div class='del'>-	__put_user_size((x), __pu_addr, (size), __pu_err);	\</div><div class='add'>+	__put_user_size(__pu_val, __pu_addr, (size), __pu_err);	\</div><div class='ctx'> 	__pu_err;						\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='hunk'>@@ -86,8 +87,9 @@ struct __large_struct { unsigned long buf[100]; };</div><div class='ctx'> ({								\</div><div class='ctx'> 	long __pu_err = -EFAULT;				\</div><div class='ctx'> 	__typeof__(*(ptr)) __user *__pu_addr = (ptr);		\</div><div class='add'>+	__typeof__(*(ptr)) __pu_val = x;			\</div><div class='ctx'> 	if (likely(access_ok(VERIFY_WRITE, __pu_addr, size)))	\</div><div class='del'>-		__put_user_size((x), __pu_addr, (size),		\</div><div class='add'>+		__put_user_size(__pu_val, __pu_addr, (size),	\</div><div class='ctx'> 				__pu_err);			\</div><div class='ctx'> 	__pu_err;						\</div><div class='ctx'> })</div><div class='head'>diff --git a/include/asm-sh/uaccess_32.h b/arch/sh/include/asm/uaccess_32.h<br/>index 892fd6dea9db..ae0d24f6653f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/uaccess_32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/uaccess_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/uaccess_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/uaccess_32.h</a></div><div class='hunk'>@@ -76,8 +76,7 @@ do {							\</div><div class='ctx'> 		__put_user_asm(x, ptr, retval, "w");	\</div><div class='ctx'> 		break;					\</div><div class='ctx'> 	case 4:						\</div><div class='del'>-		__put_user_asm((u32)x, ptr,		\</div><div class='del'>-			       retval, "l");		\</div><div class='add'>+		__put_user_asm(x, ptr, retval, "l");	\</div><div class='ctx'> 		break;					\</div><div class='ctx'> 	case 8:						\</div><div class='ctx'> 		__put_user_u64(x, ptr, retval);		\</div><div class='head'>diff --git a/include/asm-sh/uaccess_64.h b/arch/sh/include/asm/uaccess_64.h<br/>index 81b3d515fcb3..5580fd471003 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/uaccess_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/uaccess_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/uaccess_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/uaccess_64.h</a></div><div class='hunk'>@@ -76,4 +76,6 @@ extern long __put_user_asm_l(void *, long);</div><div class='ctx'> extern long __put_user_asm_q(void *, long);</div><div class='ctx'> extern void __put_user_unknown(void);</div><div class='ctx'> </div><div class='add'>+extern long __strnlen_user(const char *__s, long __n);</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_SH_UACCESS_64_H */</div><div class='head'>diff --git a/include/asm-sh/ubc.h b/arch/sh/include/asm/ubc.h<br/>index 56f4e30dc49c..a7b9028bbfbb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/ubc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/ubc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/ubc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/ubc.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #define __ASM_SH_UBC_H</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/cpu/ubc.h&gt;</div><div class='add'>+#include &lt;cpu/ubc.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* User Break Controller */</div><div class='ctx'> #if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709)</div><div class='head'>diff --git a/include/asm-sh/ucontext.h b/arch/sh/include/asm/ucontext.h<br/>index 202ef1d5a3c4..202ef1d5a3c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/ucontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/ucontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/ucontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/ucontext.h</a></div><div class='head'>diff --git a/include/asm-sh/unaligned.h b/arch/sh/include/asm/unaligned.h<br/>index c1641a01d50f..c1641a01d50f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/unaligned.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/unaligned.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/unaligned.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/unaligned.h</a></div><div class='head'>diff --git a/include/asm-sh/unistd.h b/arch/sh/include/asm/unistd.h<br/>index 65be656ead7d..65be656ead7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/unistd.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/unistd.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/unistd.h</a></div><div class='head'>diff --git a/include/asm-sh/unistd_32.h b/arch/sh/include/asm/unistd_32.h<br/>index d52c000cf924..d52c000cf924 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/unistd_32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/unistd_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/unistd_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/unistd_32.h</a></div><div class='head'>diff --git a/include/asm-sh/unistd_64.h b/arch/sh/include/asm/unistd_64.h<br/>index 7c54e91753c1..7c54e91753c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/unistd_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/unistd_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/unistd_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/unistd_64.h</a></div><div class='head'>diff --git a/include/asm-sh/user.h b/arch/sh/include/asm/user.h<br/>index 8fd3cf6c58d4..8fd3cf6c58d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/user.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/user.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/user.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/user.h</a></div><div class='head'>diff --git a/include/asm-sh/vga.h b/arch/sh/include/asm/vga.h<br/>index 06a5de8ace1a..06a5de8ace1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/vga.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/vga.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/vga.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/vga.h</a></div><div class='head'>diff --git a/include/asm-sh/watchdog.h b/arch/sh/include/asm/watchdog.h<br/>index d19ea62ef8c6..f024fed00a72 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/watchdog.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/watchdog.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/watchdog.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/watchdog.h</a></div><div class='hunk'>@@ -13,11 +13,11 @@</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;asm/cpu/watchdog.h&gt;</div><div class='add'>+#include &lt;cpu/watchdog.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* </div><div class='del'>- * See asm/cpu-sh2/watchdog.h for explanation of this stupidity..</div><div class='add'>+ * See cpu-sh2/watchdog.h for explanation of this stupidity..</div><div class='ctx'>  */</div><div class='ctx'> #ifndef WTCNT_R</div><div class='ctx'> #  define WTCNT_R	WTCNT</div><div class='head'>diff --git a/include/asm-sh/xor.h b/arch/sh/include/asm/xor.h<br/>index c82eb12a5b18..c82eb12a5b18 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/xor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/xor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/xor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/asm/xor.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh2/addrspace.h b/arch/sh/include/cpu-common/cpu/addrspace.h<br/>index 2b9ab93efa4e..2b9ab93efa4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh2/addrspace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh2/addrspace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-common/cpu/addrspace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-common/cpu/addrspace.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh2/cacheflush.h b/arch/sh/include/cpu-common/cpu/cacheflush.h<br/>index 2979efb26de3..c3db00b73605 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh2/cacheflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh2/cacheflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-common/cpu/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-common/cpu/cacheflush.h</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #ifndef __ASM_CPU_SH2_CACHEFLUSH_H</div><div class='ctx'> #define __ASM_CPU_SH2_CACHEFLUSH_H</div><div class='ctx'> </div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * Cache flushing:</div><div class='ctx'>  *</div><div class='ctx'>  *  - flush_cache_all() flushes entire cache</div><div class='hunk'>@@ -40,5 +40,5 @@</div><div class='ctx'> #define flush_cache_sigtramp(vaddr)		do { } while (0)</div><div class='ctx'> </div><div class='ctx'> #define p3_cache_init()				do { } while (0)</div><div class='del'>-#endif /* __ASM_CPU_SH2_CACHEFLUSH_H */</div><div class='ctx'> </div><div class='add'>+#endif /* __ASM_CPU_SH2_CACHEFLUSH_H */</div><div class='head'>diff --git a/include/asm-sh/cpu-sh2/mmu_context.h b/arch/sh/include/cpu-common/cpu/mmu_context.h<br/>index beeb299e01ec..beeb299e01ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh2/mmu_context.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh2/mmu_context.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-common/cpu/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-common/cpu/mmu_context.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh2/rtc.h b/arch/sh/include/cpu-common/cpu/rtc.h<br/>index 39e2d6e94782..39e2d6e94782 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh2/rtc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh2/rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-common/cpu/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-common/cpu/rtc.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh2/sigcontext.h b/arch/sh/include/cpu-common/cpu/sigcontext.h<br/>index fe5c15dd6e87..fe5c15dd6e87 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh2/sigcontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh2/sigcontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-common/cpu/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-common/cpu/sigcontext.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh2/timer.h b/arch/sh/include/cpu-common/cpu/timer.h<br/>index a39c241e8195..a39c241e8195 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh2/timer.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh2/timer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-common/cpu/timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-common/cpu/timer.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh2/cache.h b/arch/sh/include/cpu-sh2/cpu/cache.h<br/>index 4e0b16500686..673515bc4135 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh2/cache.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh2/cache.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh2/cpu/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2/cpu/cache.h</a></div><div class='hunk'>@@ -21,11 +21,11 @@</div><div class='ctx'> #define CCR		0xffffffec</div><div class='ctx'> </div><div class='ctx'> #define CCR_CACHE_CE	0x01	/* Cache enable */</div><div class='del'>-#define CCR_CACHE_WT	0x06    /* CCR[bit1=1,bit2=1] */</div><div class='add'>+#define CCR_CACHE_WT	0x02    /* CCR[bit1=1,bit2=1] */</div><div class='ctx'> 				/* 0x00000000-0x7fffffff: Write-through  */</div><div class='ctx'> 				/* 0x80000000-0x9fffffff: Write-back     */</div><div class='ctx'>                                 /* 0xc0000000-0xdfffffff: Write-through  */</div><div class='del'>-#define CCR_CACHE_CB	0x00    /* CCR[bit1=0,bit2=0] */</div><div class='add'>+#define CCR_CACHE_CB	0x04    /* CCR[bit1=0,bit2=0] */</div><div class='ctx'> 				/* 0x00000000-0x7fffffff: Write-back     */</div><div class='ctx'> 				/* 0x80000000-0x9fffffff: Write-through  */</div><div class='ctx'>                                 /* 0xc0000000-0xdfffffff: Write-back     */</div><div class='hunk'>@@ -36,6 +36,8 @@</div><div class='ctx'> </div><div class='ctx'> #define CCR_CACHE_ENABLE	CCR_CACHE_CE</div><div class='ctx'> #define CCR_CACHE_INVALIDATE	CCR_CACHE_CF</div><div class='add'>+#define CACHE_PHYSADDR_MASK	0x1ffffc00</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_CPU_SH2_CACHE_H */</div><div class='head'>diff --git a/include/asm-sh/cpu-sh2/dma.h b/arch/sh/include/cpu-sh2/cpu/dma.h<br/>index d66b43cdc637..d66b43cdc637 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh2/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh2/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh2/cpu/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2/cpu/dma.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh2/freq.h b/arch/sh/include/cpu-sh2/cpu/freq.h<br/>index 31de475da70b..31de475da70b 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh2/freq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh2/freq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh2/cpu/freq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2/cpu/freq.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh2/ubc.h b/arch/sh/include/cpu-sh2/cpu/ubc.h<br/>index ba0e87f19c7a..ba0e87f19c7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh2/ubc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh2/ubc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh2/cpu/ubc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2/cpu/ubc.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh2/watchdog.h b/arch/sh/include/cpu-sh2/cpu/watchdog.h<br/>index 393161c9c6d0..393161c9c6d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh2/watchdog.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh2/watchdog.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh2/cpu/watchdog.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2/cpu/watchdog.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh2a/addrspace.h b/arch/sh/include/cpu-sh2a/cpu/addrspace.h<br/>index 795ddd6856a3..31eb4b58aa6d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh2a/addrspace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh2a/addrspace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh2a/cpu/addrspace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2a/cpu/addrspace.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> #define P0SEG		0x00000000</div><div class='ctx'> #define P1SEG		0x00000000</div><div class='ctx'> #define P2SEG		0x20000000</div><div class='del'>-#define P3SEG		0x00000000</div><div class='del'>-#define P4SEG		0x80000000</div><div class='add'>+#define P3SEG		0x40000000</div><div class='add'>+#define P4SEG		0x60000000</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_SH_CPU_SH2A_ADDRSPACE_H */</div><div class='head'>diff --git a/include/asm-sh/cpu-sh2a/cache.h b/arch/sh/include/cpu-sh2a/cpu/cache.h<br/>index afe228b3f493..defb0baa5a06 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh2a/cache.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh2a/cache.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh2a/cpu/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2a/cpu/cache.h</a></div><div class='hunk'>@@ -36,5 +36,8 @@</div><div class='ctx'> </div><div class='ctx'> #define CCR_CACHE_ENABLE	(CCR_CACHE_OCE | CCR_CACHE_ICE)</div><div class='ctx'> #define CCR_CACHE_INVALIDATE	(CCR_CACHE_OCI | CCR_CACHE_ICI)</div><div class='add'>+#define CCR_ICACHE_INVALIDATE	CCR_CACHE_ICI</div><div class='add'>+#define CCR_OCACHE_INVALIDATE	CCR_CACHE_OCI</div><div class='add'>+#define CACHE_PHYSADDR_MASK	0x1ffffc00</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_CPU_SH2A_CACHE_H */</div><div class='head'>diff --git a/arch/sh/include/cpu-sh2a/cpu/cacheflush.h b/arch/sh/include/cpu-sh2a/cpu/cacheflush.h<br/>new file mode 100644<br/>index 000000000000..3d3b9205d2ac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh2a/cpu/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2a/cpu/cacheflush.h</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+#ifndef __ASM_CPU_SH2A_CACHEFLUSH_H</div><div class='add'>+#define __ASM_CPU_SH2A_CACHEFLUSH_H</div><div class='add'>+</div><div class='add'>+/* </div><div class='add'>+ * Cache flushing:</div><div class='add'>+ *</div><div class='add'>+ *  - flush_cache_all() flushes entire cache</div><div class='add'>+ *  - flush_cache_mm(mm) flushes the specified mm context's cache lines</div><div class='add'>+ *  - flush_cache_dup mm(mm) handles cache flushing when forking</div><div class='add'>+ *  - flush_cache_page(mm, vmaddr, pfn) flushes a single page</div><div class='add'>+ *  - flush_cache_range(vma, start, end) flushes a range of pages</div><div class='add'>+ *</div><div class='add'>+ *  - flush_dcache_page(pg) flushes(wback&amp;invalidates) a page for dcache</div><div class='add'>+ *  - flush_icache_range(start, end) flushes(invalidates) a range for icache</div><div class='add'>+ *  - flush_icache_page(vma, pg) flushes(invalidates) a page for icache</div><div class='add'>+ *</div><div class='add'>+ *  Caches are indexed (effectively) by physical address on SH-2, so</div><div class='add'>+ *  we don't need them.</div><div class='add'>+ */</div><div class='add'>+#define flush_cache_all()			do { } while (0)</div><div class='add'>+#define flush_cache_mm(mm)			do { } while (0)</div><div class='add'>+#define flush_cache_dup_mm(mm)			do { } while (0)</div><div class='add'>+#define flush_cache_range(vma, start, end)	do { } while (0)</div><div class='add'>+#define flush_cache_page(vma, vmaddr, pfn)	do { } while (0)</div><div class='add'>+#define flush_dcache_page(page)			do { } while (0)</div><div class='add'>+#define flush_dcache_mmap_lock(mapping)		do { } while (0)</div><div class='add'>+#define flush_dcache_mmap_unlock(mapping)	do { } while (0)</div><div class='add'>+void flush_icache_range(unsigned long start, unsigned long end);</div><div class='add'>+#define flush_icache_page(vma,pg)		do { } while (0)</div><div class='add'>+#define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)</div><div class='add'>+#define flush_cache_sigtramp(vaddr)		do { } while (0)</div><div class='add'>+</div><div class='add'>+#define p3_cache_init()				do { } while (0)</div><div class='add'>+#endif /* __ASM_CPU_SH2A_CACHEFLUSH_H */</div><div class='head'>diff --git a/arch/sh/include/cpu-sh2a/cpu/dma.h b/arch/sh/include/cpu-sh2a/cpu/dma.h<br/>new file mode 100644<br/>index 000000000000..27a13ef4fdfc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh2a/cpu/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2a/cpu/dma.h</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+#include &lt;cpu-sh2/cpu/dma.h&gt;</div><div class='head'>diff --git a/include/asm-sh/cpu-sh2a/freq.h b/arch/sh/include/cpu-sh2a/cpu/freq.h<br/>index 830fd43b6cdc..830fd43b6cdc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh2a/freq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh2a/freq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh2a/cpu/freq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2a/cpu/freq.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh2a/rtc.h b/arch/sh/include/cpu-sh2a/cpu/rtc.h<br/>index afb511e2bed7..afb511e2bed7 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh2a/rtc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh2a/rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh2a/cpu/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2a/cpu/rtc.h</a></div><div class='head'>diff --git a/arch/sh/include/cpu-sh2a/cpu/ubc.h b/arch/sh/include/cpu-sh2a/cpu/ubc.h<br/>new file mode 100644<br/>index 000000000000..8ce2fc1cf625<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh2a/cpu/ubc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2a/cpu/ubc.h</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+#include &lt;cpu-sh2/cpu/ubc.h&gt;</div><div class='head'>diff --git a/arch/sh/include/cpu-sh2a/cpu/watchdog.h b/arch/sh/include/cpu-sh2a/cpu/watchdog.h<br/>new file mode 100644<br/>index 000000000000..e7e8259e468c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh2a/cpu/watchdog.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh2a/cpu/watchdog.h</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+#include &lt;cpu-sh2/cpu/watchdog.h&gt;</div><div class='head'>diff --git a/include/asm-sh/cpu-sh3/adc.h b/arch/sh/include/cpu-sh3/cpu/adc.h<br/>index b289e3ca19a6..b289e3ca19a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh3/adc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh3/adc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh3/cpu/adc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/adc.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh3/cache.h b/arch/sh/include/cpu-sh3/cpu/cache.h<br/>index bee2d81c56bf..bee2d81c56bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh3/cache.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh3/cache.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh3/cpu/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/cache.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh3/cacheflush.h b/arch/sh/include/cpu-sh3/cpu/cacheflush.h<br/>index f70d8ef76a15..1ac27aae6700 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh3/cacheflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh3/cacheflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh3/cpu/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/cacheflush.h</a></div><div class='hunk'>@@ -10,25 +10,7 @@</div><div class='ctx'> #ifndef __ASM_CPU_SH3_CACHEFLUSH_H</div><div class='ctx'> #define __ASM_CPU_SH3_CACHEFLUSH_H</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Cache flushing:</div><div class='del'>- *</div><div class='del'>- *  - flush_cache_all() flushes entire cache</div><div class='del'>- *  - flush_cache_mm(mm) flushes the specified mm context's cache lines</div><div class='del'>- *  - flush_cache_dup mm(mm) handles cache flushing when forking</div><div class='del'>- *  - flush_cache_page(mm, vmaddr, pfn) flushes a single page</div><div class='del'>- *  - flush_cache_range(vma, start, end) flushes a range of pages</div><div class='del'>- *</div><div class='del'>- *  - flush_dcache_page(pg) flushes(wback&amp;invalidates) a page for dcache</div><div class='del'>- *  - flush_icache_range(start, end) flushes(invalidates) a range for icache</div><div class='del'>- *  - flush_icache_page(vma, pg) flushes(invalidates) a page for icache</div><div class='del'>- *</div><div class='del'>- *  Caches are indexed (effectively) by physical address on SH-3, so</div><div class='del'>- *  we don't need them.</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_SH7705_CACHE_32KB)</div><div class='del'>-</div><div class='ctx'> /* SH7705 is an SH3 processor with 32KB cache. This has alias issues like the</div><div class='ctx'>  * SH4. Unlike the SH4 this is a unified cache so we need to do some work</div><div class='ctx'>  * in mmap when 'exec'ing a new binary</div><div class='hunk'>@@ -47,16 +29,6 @@ void flush_cache_page(struct vm_area_struct *vma, unsigned long addr, unsigned l</div><div class='ctx'> void flush_dcache_page(struct page *pg);</div><div class='ctx'> void flush_icache_range(unsigned long start, unsigned long end);</div><div class='ctx'> void flush_icache_page(struct vm_area_struct *vma, struct page *page);</div><div class='del'>-#else</div><div class='del'>-#define flush_cache_all()			do { } while (0)</div><div class='del'>-#define flush_cache_mm(mm)			do { } while (0)</div><div class='del'>-#define flush_cache_dup_mm(mm)			do { } while (0)</div><div class='del'>-#define flush_cache_range(vma, start, end)	do { } while (0)</div><div class='del'>-#define flush_cache_page(vma, vmaddr, pfn)	do { } while (0)</div><div class='del'>-#define flush_dcache_page(page)			do { } while (0)</div><div class='del'>-#define flush_icache_range(start, end)		do { } while (0)</div><div class='del'>-#define flush_icache_page(vma,pg)		do { } while (0)</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #define flush_dcache_mmap_lock(mapping)		do { } while (0)</div><div class='ctx'> #define flush_dcache_mmap_unlock(mapping)	do { } while (0)</div><div class='hunk'>@@ -67,4 +39,8 @@ void flush_icache_page(struct vm_area_struct *vma, struct page *page);</div><div class='ctx'> </div><div class='ctx'> #define p3_cache_init()				do { } while (0)</div><div class='ctx'> </div><div class='add'>+#else</div><div class='add'>+#include &lt;cpu-common/cpu/cacheflush.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_CPU_SH3_CACHEFLUSH_H */</div><div class='head'>diff --git a/include/asm-sh/cpu-sh3/dac.h b/arch/sh/include/cpu-sh3/cpu/dac.h<br/>index 05fda8316ebc..05fda8316ebc 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh3/dac.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh3/dac.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh3/cpu/dac.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/dac.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh3/dma.h b/arch/sh/include/cpu-sh3/cpu/dma.h<br/>index 6813c3220a1d..6813c3220a1d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh3/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh3/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh3/cpu/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/dma.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh3/freq.h b/arch/sh/include/cpu-sh3/cpu/freq.h<br/>index 53c62302b2e3..53c62302b2e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh3/freq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh3/freq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh3/cpu/freq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/freq.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh3/gpio.h b/arch/sh/include/cpu-sh3/cpu/gpio.h<br/>index 4e53eb314b8f..4e53eb314b8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh3/gpio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh3/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh3/cpu/gpio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/gpio.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh3/mmu_context.h b/arch/sh/include/cpu-sh3/cpu/mmu_context.h<br/>index ab09da73ce77..ab09da73ce77 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh3/mmu_context.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh3/mmu_context.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh3/cpu/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/mmu_context.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh3/timer.h b/arch/sh/include/cpu-sh3/cpu/timer.h<br/>index 793acf12aa08..793acf12aa08 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh3/timer.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh3/timer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh3/cpu/timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/timer.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh3/ubc.h b/arch/sh/include/cpu-sh3/cpu/ubc.h<br/>index 4e6381d5ff7a..4e6381d5ff7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh3/ubc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh3/ubc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh3/cpu/ubc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/ubc.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh3/watchdog.h b/arch/sh/include/cpu-sh3/cpu/watchdog.h<br/>index 4ee0347298d8..4ee0347298d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh3/watchdog.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh3/watchdog.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh3/cpu/watchdog.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh3/cpu/watchdog.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh4/addrspace.h b/arch/sh/include/cpu-sh4/cpu/addrspace.h<br/>index a3fa733c1c7d..a3fa733c1c7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh4/addrspace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh4/addrspace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/addrspace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/addrspace.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh4/cache.h b/arch/sh/include/cpu-sh4/cpu/cache.h<br/>index 1c61ebf5c8e3..1c61ebf5c8e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh4/cache.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh4/cache.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/cache.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh4/cacheflush.h b/arch/sh/include/cpu-sh4/cpu/cacheflush.h<br/>index 065306d376eb..065306d376eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh4/cacheflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh4/cacheflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/cacheflush.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh4/dma-sh7780.h b/arch/sh/include/cpu-sh4/cpu/dma-sh7780.h<br/>index 71b426a6e482..71b426a6e482 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh4/dma-sh7780.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh4/dma-sh7780.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/dma-sh7780.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/dma-sh7780.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh4/dma.h b/arch/sh/include/cpu-sh4/cpu/dma.h<br/>index aaf71b018c28..235b7cd1fc9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh4/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh4/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/dma.h</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #define CHCR_TS_MASK	0x18</div><div class='ctx'> #define CHCR_TS_SHIFT	3</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/cpu/dma-sh7780.h&gt;</div><div class='add'>+#include &lt;cpu/dma-sh7780.h&gt;</div><div class='ctx'> #else</div><div class='ctx'> #define SH_DMAC_BASE	0xffa00000</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-sh/cpu-sh4/fpu.h b/arch/sh/include/cpu-sh4/cpu/fpu.h<br/>index febef7342528..febef7342528 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh4/fpu.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh4/fpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/fpu.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/fpu.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh4/freq.h b/arch/sh/include/cpu-sh4/cpu/freq.h<br/>index c23af81c2e70..c23af81c2e70 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh4/freq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh4/freq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/freq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/freq.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh4/mmu_context.h b/arch/sh/include/cpu-sh4/cpu/mmu_context.h<br/>index 9ea8eb27b18e..9ea8eb27b18e 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh4/mmu_context.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh4/mmu_context.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/mmu_context.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh4/rtc.h b/arch/sh/include/cpu-sh4/cpu/rtc.h<br/>index 25b1e6adfe8c..25b1e6adfe8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh4/rtc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh4/rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/rtc.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh4/sigcontext.h b/arch/sh/include/cpu-sh4/cpu/sigcontext.h<br/>index ab392f120e06..ab392f120e06 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh4/sigcontext.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh4/sigcontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/sigcontext.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/sigcontext.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh4/sq.h b/arch/sh/include/cpu-sh4/cpu/sq.h<br/>index 586d6491816a..586d6491816a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh4/sq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh4/sq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/sq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/sq.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh4/timer.h b/arch/sh/include/cpu-sh4/cpu/timer.h<br/>index d1e796b96888..d1e796b96888 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh4/timer.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh4/timer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/timer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/timer.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh4/ubc.h b/arch/sh/include/cpu-sh4/cpu/ubc.h<br/>index c86e17050935..c86e17050935 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh4/ubc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh4/ubc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/ubc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/ubc.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh4/watchdog.h b/arch/sh/include/cpu-sh4/cpu/watchdog.h<br/>index 259f6a0ce23d..259f6a0ce23d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh4/watchdog.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh4/watchdog.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/watchdog.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh4/cpu/watchdog.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh5/addrspace.h b/arch/sh/include/cpu-sh5/cpu/addrspace.h<br/>index dc36b9a03af6..dc36b9a03af6 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh5/addrspace.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh5/addrspace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh5/cpu/addrspace.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh5/cpu/addrspace.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh5/cache.h b/arch/sh/include/cpu-sh5/cpu/cache.h<br/>index ed050ab526f2..ed050ab526f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh5/cache.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh5/cache.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh5/cpu/cache.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh5/cpu/cache.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh5/cacheflush.h b/arch/sh/include/cpu-sh5/cpu/cacheflush.h<br/>index 5a11f0b7e66a..5a11f0b7e66a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh5/cacheflush.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh5/cacheflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh5/cpu/cacheflush.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh5/cpu/cacheflush.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh5/dma.h b/arch/sh/include/cpu-sh5/cpu/dma.h<br/>index 7bf6bb3d35ed..7bf6bb3d35ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh5/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh5/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh5/cpu/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh5/cpu/dma.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh5/irq.h b/arch/sh/include/cpu-sh5/cpu/irq.h<br/>index f0f0756e6e84..f0f0756e6e84 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh5/irq.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh5/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh5/cpu/irq.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh5/cpu/irq.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh5/mmu_context.h b/arch/sh/include/cpu-sh5/cpu/mmu_context.h<br/>index 68a1d2cff457..68a1d2cff457 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh5/mmu_context.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh5/mmu_context.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh5/cpu/mmu_context.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh5/cpu/mmu_context.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh5/registers.h b/arch/sh/include/cpu-sh5/cpu/registers.h<br/>index 6664ea6f1566..6664ea6f1566 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh5/registers.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh5/registers.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh5/cpu/registers.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh5/cpu/registers.h</a></div><div class='head'>diff --git a/include/asm-sh/cpu-sh5/rtc.h b/arch/sh/include/cpu-sh5/cpu/rtc.h<br/>index 12ea0ed144e1..12ea0ed144e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/cpu-sh5/rtc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/cpu-sh5/rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh5/cpu/rtc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/cpu-sh5/cpu/rtc.h</a></div><div class='head'>diff --git a/include/asm-sh/dreamcast/dma.h b/arch/sh/include/mach-dreamcast/mach/dma.h<br/>index ddd68e788705..ddd68e788705 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/dreamcast/dma.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/dreamcast/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/mach-dreamcast/mach/dma.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-dreamcast/mach/dma.h</a></div><div class='head'>diff --git a/include/asm-sh/dreamcast/maple.h b/arch/sh/include/mach-dreamcast/mach/maple.h<br/>index 51f6a87f1f11..51f6a87f1f11 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/dreamcast/maple.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/dreamcast/maple.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/mach-dreamcast/mach/maple.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-dreamcast/mach/maple.h</a></div><div class='head'>diff --git a/include/asm-sh/dreamcast/pci.h b/arch/sh/include/mach-dreamcast/mach/pci.h<br/>index e401b24b0d8e..75fc9009e092 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/dreamcast/pci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/dreamcast/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/mach-dreamcast/mach/pci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-dreamcast/mach/pci.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef __ASM_SH_DREAMCAST_PCI_H</div><div class='ctx'> #define __ASM_SH_DREAMCAST_PCI_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach/sysasic.h&gt;</div><div class='add'>+#include &lt;mach-dreamcast/mach/sysasic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define	GAPSPCI_REGS		0x01001400</div><div class='ctx'> #define GAPSPCI_DMA_BASE	0x01840000</div><div class='head'>diff --git a/include/asm-sh/dreamcast/sysasic.h b/arch/sh/include/mach-dreamcast/mach/sysasic.h<br/>index f33426608a87..f33426608a87 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/dreamcast/sysasic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/dreamcast/sysasic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/mach-dreamcast/mach/sysasic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-dreamcast/mach/sysasic.h</a></div><div class='head'>diff --git a/include/asm-sh/landisk/gio.h b/arch/sh/include/mach-landisk/mach/gio.h<br/>index 35d7368b718a..35d7368b718a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/landisk/gio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/landisk/gio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/mach-landisk/mach/gio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-landisk/mach/gio.h</a></div><div class='head'>diff --git a/include/asm-sh/landisk/iodata_landisk.h b/arch/sh/include/mach-landisk/mach/iodata_landisk.h<br/>index 6fb04ab38b9f..6fb04ab38b9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/landisk/iodata_landisk.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/landisk/iodata_landisk.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/mach-landisk/mach/iodata_landisk.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-landisk/mach/iodata_landisk.h</a></div><div class='head'>diff --git a/include/asm-sh/se.h b/arch/sh/include/mach-se/mach/se.h<br/>index eb23000e1bbe..eb23000e1bbe 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/se.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/se.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/mach-se/mach/se.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-se/mach/se.h</a></div><div class='head'>diff --git a/include/asm-sh/se7206.h b/arch/sh/include/mach-se/mach/se7206.h<br/>index 698eb80389ab..698eb80389ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/se7206.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/se7206.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/mach-se/mach/se7206.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-se/mach/se7206.h</a></div><div class='head'>diff --git a/include/asm-sh/se7343.h b/arch/sh/include/mach-se/mach/se7343.h<br/>index 98458460e632..98458460e632 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/se7343.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/se7343.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/mach-se/mach/se7343.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-se/mach/se7343.h</a></div><div class='head'>diff --git a/include/asm-sh/se7721.h b/arch/sh/include/mach-se/mach/se7721.h<br/>index b957f6041193..b957f6041193 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/se7721.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/se7721.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/mach-se/mach/se7721.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-se/mach/se7721.h</a></div><div class='head'>diff --git a/include/asm-sh/se7722.h b/arch/sh/include/mach-se/mach/se7722.h<br/>index e971d9a82f4a..e971d9a82f4a 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/se7722.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/se7722.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/mach-se/mach/se7722.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-se/mach/se7722.h</a></div><div class='head'>diff --git a/include/asm-sh/se7751.h b/arch/sh/include/mach-se/mach/se7751.h<br/>index b36792ac5d66..b36792ac5d66 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/se7751.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/se7751.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/mach-se/mach/se7751.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-se/mach/se7751.h</a></div><div class='head'>diff --git a/include/asm-sh/se7780.h b/arch/sh/include/mach-se/mach/se7780.h<br/>index 40e9b41458cd..40e9b41458cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/se7780.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/se7780.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/mach-se/mach/se7780.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-se/mach/se7780.h</a></div><div class='head'>diff --git a/include/asm-sh/sh03/io.h b/arch/sh/include/mach-sh03/mach/io.h<br/>index c39c785bba94..c39c785bba94 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/sh03/io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/sh03/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/mach-sh03/mach/io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-sh03/mach/io.h</a></div><div class='head'>diff --git a/include/asm-sh/sh03/sh03.h b/arch/sh/include/mach-sh03/mach/sh03.h<br/>index 19c40b80428d..19c40b80428d 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/asm-sh/sh03/sh03.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>include/asm-sh/sh03/sh03.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/mach-sh03/mach/sh03.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/include/mach-sh03/mach/sh03.h</a></div><div class='head'>diff --git a/arch/sh/kernel/.gitignore b/arch/sh/kernel/.gitignore<br/>new file mode 100644<br/>index 000000000000..c5f676c3c224<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/.gitignore?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/.gitignore</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+vmlinux.lds</div><div class='head'>diff --git a/arch/sh/kernel/cf-enabler.c b/arch/sh/kernel/cf-enabler.c<br/>index d3d9f3204230..bea40339919b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cf-enabler.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/cf-enabler.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cf-enabler.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cf-enabler.c</a></div><div class='hunk'>@@ -80,11 +80,11 @@ static int __init cf_init_default(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SH_SOLUTION_ENGINE)</div><div class='del'>-#include &lt;asm/se.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se.h&gt;</div><div class='ctx'> #elif defined(CONFIG_SH_7722_SOLUTION_ENGINE)</div><div class='del'>-#include &lt;asm/se7722.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7722.h&gt;</div><div class='ctx'> #elif defined(CONFIG_SH_7721_SOLUTION_ENGINE)</div><div class='del'>-#include &lt;asm/se7721.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se7721.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/sh/kernel/cpu/irq/intc-sh5.c b/arch/sh/kernel/cpu/irq/intc-sh5.c<br/>index 79baa47af977..726f0335da76 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/irq/intc-sh5.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/cpu/irq/intc-sh5.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/irq/intc-sh5.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/irq/intc-sh5.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;asm/cpu/irq.h&gt;</div><div class='add'>+#include &lt;cpu/irq.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh2/entry.S b/arch/sh/kernel/cpu/sh2/entry.S<br/>index ee894e5a45e7..becc54c45692 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh2/entry.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/cpu/sh2/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh2/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/sh2/entry.S</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='del'>-#include &lt;asm/cpu/mmu_context.h&gt;</div><div class='add'>+#include &lt;cpu/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh2a/entry.S b/arch/sh/kernel/cpu/sh2a/entry.S<br/>index 47096dc3d206..ab3903eeda5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh2a/entry.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/cpu/sh2a/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh2a/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/sh2a/entry.S</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='del'>-#include &lt;asm/cpu/mmu_context.h&gt;</div><div class='add'>+#include &lt;cpu/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S<br/>index 4004073f98cd..3fe482dd05c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh3/entry.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/cpu/sh3/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh3/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/sh3/entry.S</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='del'>-#include &lt;asm/cpu/mmu_context.h&gt;</div><div class='add'>+#include &lt;cpu/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='ctx'> ! NOTE:</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4/fpu.c b/arch/sh/kernel/cpu/sh4/fpu.c<br/>index 8020796139f1..2d452f67fb87 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4/fpu.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/cpu/sh4/fpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4/fpu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/sh4/fpu.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/cpu/fpu.h&gt;</div><div class='add'>+#include &lt;cpu/fpu.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4/softfloat.c b/arch/sh/kernel/cpu/sh4/softfloat.c<br/>index 7b2d337ee412..828cb57cb959 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4/softfloat.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/cpu/sh4/softfloat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4/softfloat.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/sh4/softfloat.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'>  * and Kamel Khelifi &lt;kamel.khelifi@st.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;asm/cpu/fpu.h&gt;</div><div class='add'>+#include &lt;cpu/fpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define LIT64( a ) a##LL</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c<br/>index 9561b02ade0e..8a8a993f55ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4/sq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/cpu/sh4/sq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4/sq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/sh4/sq.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/cpu/sq.h&gt;</div><div class='add'>+#include &lt;cpu/sq.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct sq_mapping;</div><div class='ctx'> </div><div class='hunk'>@@ -199,7 +199,7 @@ EXPORT_SYMBOL(sq_remap);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * sq_unmap - Unmap a Store Queue allocation</div><div class='del'>- * @map: Pre-allocated Store Queue mapping.</div><div class='add'>+ * @vaddr: Pre-allocated Store Queue mapping.</div><div class='ctx'>  *</div><div class='ctx'>  * Unmaps the store queue allocation @map that was previously created by</div><div class='ctx'>  * sq_remap(). Also frees up the pte that was previously inserted into</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c<br/>index cd6baffdc896..a7412cede534 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/setup-sh7723.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/cpu/sh4a/setup-sh7723.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/setup-sh7723.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/sh4a/setup-sh7723.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@ static struct platform_device vpu_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct uio_info veu0_platform_data = {</div><div class='del'>-	.name = "VEU",</div><div class='add'>+	.name = "VEU2H",</div><div class='ctx'> 	.version = "0",</div><div class='ctx'> 	.irq = 54,</div><div class='ctx'> };</div><div class='hunk'>@@ -73,7 +73,7 @@ static struct platform_device veu0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct uio_info veu1_platform_data = {</div><div class='del'>-	.name = "VEU",</div><div class='add'>+	.name = "VEU2H",</div><div class='ctx'> 	.version = "0",</div><div class='ctx'> 	.irq = 27,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh5/entry.S b/arch/sh/kernel/cpu/sh5/entry.S<br/>index 05372ed6c568..e640c63d5811 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh5/entry.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/cpu/sh5/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh5/entry.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/cpu/sh5/entry.S</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  * arch/sh/kernel/cpu/sh5/entry.S</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000, 2001  Paolo Alberelli</div><div class='del'>- * Copyright (C) 2004 - 2007  Paul Mundt</div><div class='add'>+ * Copyright (C) 2004 - 2008  Paul Mundt</div><div class='ctx'>  * Copyright (C) 2003, 2004  Richard Curnow</div><div class='ctx'>  *</div><div class='ctx'>  * This file is subject to the terms and conditions of the GNU General Public</div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='del'>-#include &lt;asm/cpu/registers.h&gt;</div><div class='add'>+#include &lt;cpu/registers.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='hunk'>@@ -923,6 +923,8 @@ ret_from_exception:</div><div class='ctx'> 	blink   tr0, ZERO</div><div class='ctx'> </div><div class='ctx'> resume_kernel:</div><div class='add'>+	CLI()</div><div class='add'>+</div><div class='ctx'> 	pta	restore_all, tr0</div><div class='ctx'> </div><div class='ctx'> 	getcon	KCR0, r6</div><div class='hunk'>@@ -939,19 +941,11 @@ need_resched:</div><div class='ctx'> 	andi	r7, 0xf0, r7</div><div class='ctx'> 	bne	r7, ZERO, tr0</div><div class='ctx'> </div><div class='del'>-	movi	((PREEMPT_ACTIVE &gt;&gt; 16) &amp; 65535), r8</div><div class='del'>-	shori	(PREEMPT_ACTIVE &amp; 65535), r8</div><div class='del'>-	st.l	r6, TI_PRE_COUNT, r8</div><div class='del'>-</div><div class='del'>-	STI()</div><div class='del'>-	movi	schedule, r7</div><div class='add'>+	movi	preempt_schedule_irq, r7</div><div class='ctx'> 	ori	r7, 1, r7</div><div class='ctx'> 	ptabs	r7, tr1</div><div class='ctx'> 	blink	tr1, LINK</div><div class='ctx'> </div><div class='del'>-	st.l	r6, TI_PRE_COUNT, ZERO</div><div class='del'>-	CLI()</div><div class='del'>-</div><div class='ctx'> 	pta	need_resched, tr1</div><div class='ctx'> 	blink	tr1, ZERO</div><div class='ctx'> #endif</div><div class='hunk'>@@ -987,11 +981,11 @@ work_resched:</div><div class='ctx'> work_notifysig:</div><div class='ctx'> 	gettr	tr1, LINK</div><div class='ctx'> </div><div class='del'>-	movi	do_signal, r6</div><div class='add'>+	movi	do_notify_resume, r6</div><div class='ctx'> 	ptabs	r6, tr0</div><div class='ctx'> 	or	SP, ZERO, r2</div><div class='del'>-	or	ZERO, ZERO, r3</div><div class='del'>-	blink	tr0, LINK	    /* Call do_signal(regs, 0), return here */</div><div class='add'>+	or	r7, ZERO, r3</div><div class='add'>+	blink	tr0, LINK	    /* Call do_notify_resume(regs, current_thread_info-&gt;flags), return here */</div><div class='ctx'> </div><div class='ctx'> restore_all:</div><div class='ctx'> 	/* Do prefetches */</div><div class='hunk'>@@ -1300,18 +1294,20 @@ syscall_allowed:</div><div class='ctx'> </div><div class='ctx'> 	getcon	KCR0, r2</div><div class='ctx'> 	ld.l	r2, TI_FLAGS, r4</div><div class='del'>-	movi	(_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP | _TIF_SYSCALL_AUDIT), r6</div><div class='add'>+	movi	_TIF_WORK_SYSCALL_MASK, r6</div><div class='ctx'> 	and	r6, r4, r6</div><div class='ctx'> 	beq/l	r6, ZERO, tr0</div><div class='ctx'> </div><div class='ctx'> 	/* Trace it by calling syscall_trace before and after */</div><div class='del'>-	movi	syscall_trace, r4</div><div class='add'>+	movi	do_syscall_trace_enter, r4</div><div class='ctx'> 	or	SP, ZERO, r2</div><div class='del'>-	or	ZERO, ZERO, r3</div><div class='ctx'> 	ptabs	r4, tr0</div><div class='ctx'> 	blink	tr0, LINK</div><div class='ctx'> </div><div class='del'>-	/* Reload syscall number as r5 is trashed by syscall_trace */</div><div class='add'>+	/* Save the retval */</div><div class='add'>+	st.q	SP, FRAME_R(2), r2</div><div class='add'>+</div><div class='add'>+	/* Reload syscall number as r5 is trashed by do_syscall_trace_enter */</div><div class='ctx'> 	ld.q	SP, FRAME_S(FSYSCALL_ID), r5</div><div class='ctx'> 	andi	r5, 0x1ff, r5</div><div class='ctx'> </div><div class='hunk'>@@ -1343,9 +1339,8 @@ syscall_ret_trace:</div><div class='ctx'> 	/* We get back here only if under trace */</div><div class='ctx'> 	st.q	SP, FRAME_R(9), r2	/* Save return value */</div><div class='ctx'> </div><div class='del'>-	movi	syscall_trace, LINK</div><div class='add'>+	movi	do_syscall_trace_leave, LINK</div><div class='ctx'> 	or	SP, ZERO, r2</div><div class='del'>-	movi	1, r3</div><div class='ctx'> 	ptabs	LINK, tr0</div><div class='ctx'> 	blink	tr0, LINK</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S<br/>index 5e0dd1933847..efbb4268875e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/entry-common.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/entry-common.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/entry-common.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/entry-common.S</a></div><div class='hunk'>@@ -92,6 +92,7 @@ ENTRY(ret_from_irq)</div><div class='ctx'> 	bra	resume_userspace</div><div class='ctx'> 	 nop</div><div class='ctx'> ENTRY(resume_kernel)</div><div class='add'>+	cli</div><div class='ctx'> 	mov.l	@(TI_PRE_COUNT,r8), r0	! current_thread_info-&gt;preempt_count</div><div class='ctx'> 	tst	r0, r0</div><div class='ctx'> 	bf	noresched</div><div class='hunk'>@@ -105,28 +106,9 @@ need_resched:</div><div class='ctx'> 	and	#0xf0, r0		! interrupts off (exception path)?</div><div class='ctx'> 	cmp/eq	#0xf0, r0</div><div class='ctx'> 	bt	noresched</div><div class='del'>-</div><div class='del'>-	mov.l	1f, r0</div><div class='del'>-	mov.l	r0, @(TI_PRE_COUNT,r8)</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='ctx'> 	mov.l	3f, r0</div><div class='del'>-	jsr	@r0</div><div class='del'>-	 nop</div><div class='del'>-#endif</div><div class='del'>-	sti</div><div class='del'>-	mov.l	2f, r0</div><div class='del'>-	jsr	@r0</div><div class='del'>-	 nop</div><div class='del'>-	mov	#0, r0</div><div class='del'>-	mov.l	r0, @(TI_PRE_COUNT,r8)</div><div class='del'>-	cli</div><div class='del'>-#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='del'>-	mov.l	4f, r0</div><div class='del'>-	jsr	@r0</div><div class='add'>+	jsr	@r0			! call preempt_schedule_irq</div><div class='ctx'> 	 nop</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	bra	need_resched</div><div class='ctx'> 	 nop</div><div class='ctx'> </div><div class='hunk'>@@ -137,10 +119,7 @@ noresched:</div><div class='ctx'> 	.align 2</div><div class='ctx'> 1:	.long	PREEMPT_ACTIVE</div><div class='ctx'> 2:	.long	schedule</div><div class='del'>-#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='del'>-3:	.long	trace_hardirqs_on</div><div class='del'>-4:	.long	trace_hardirqs_off</div><div class='del'>-#endif</div><div class='add'>+3:	.long	preempt_schedule_irq</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> ENTRY(resume_userspace)</div><div class='hunk'>@@ -202,7 +181,7 @@ work_resched:</div><div class='ctx'> syscall_exit_work:</div><div class='ctx'> 	! r0: current_thread_info-&gt;flags</div><div class='ctx'> 	! r8: current_thread_info</div><div class='del'>-	tst	#_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP | _TIF_SYSCALL_AUDIT, r0</div><div class='add'>+	tst	#_TIF_WORK_SYSCALL_MASK, r0</div><div class='ctx'> 	bt/s	work_pending</div><div class='ctx'> 	 tst	#_TIF_NEED_RESCHED, r0</div><div class='ctx'> #ifdef CONFIG_TRACE_IRQFLAGS</div><div class='hunk'>@@ -211,10 +190,8 @@ syscall_exit_work:</div><div class='ctx'> 	 nop</div><div class='ctx'> #endif</div><div class='ctx'> 	sti</div><div class='del'>-	! XXX setup arguments...</div><div class='ctx'> 	mov	r15, r4</div><div class='del'>-	mov	#1, r5</div><div class='del'>-	mov.l	4f, r0			! do_syscall_trace</div><div class='add'>+	mov.l	8f, r0			! do_syscall_trace_leave</div><div class='ctx'> 	jsr	@r0</div><div class='ctx'> 	 nop</div><div class='ctx'> 	bra	resume_userspace</div><div class='hunk'>@@ -223,12 +200,11 @@ syscall_exit_work:</div><div class='ctx'> 	.align	2</div><div class='ctx'> syscall_trace_entry:</div><div class='ctx'> 	!                     	Yes it is traced.</div><div class='del'>-	! XXX setup arguments...</div><div class='ctx'> 	mov     r15, r4</div><div class='del'>-	mov     #0, r5</div><div class='del'>-	mov.l	4f, r11		! Call do_syscall_trace which notifies</div><div class='add'>+	mov.l	7f, r11		! Call do_syscall_trace_enter which notifies</div><div class='ctx'> 	jsr	@r11	    	! superior (will chomp R[0-7])</div><div class='ctx'> 	 nop</div><div class='add'>+	mov.l	r0, @(OFF_R0,r15)	! Save return value</div><div class='ctx'> 	!			Reload R0-R4 from kernel stack, where the</div><div class='ctx'> 	!   	    	    	parent may have modified them using</div><div class='ctx'> 	!   	    	    	ptrace(POKEUSR).  (Note that R0-R2 are</div><div class='hunk'>@@ -351,7 +327,7 @@ ENTRY(system_call)</div><div class='ctx'> 	!</div><div class='ctx'> 	get_current_thread_info r8, r10</div><div class='ctx'> 	mov.l	@(TI_FLAGS,r8), r8</div><div class='del'>-	mov	#(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT), r10</div><div class='add'>+	mov	#_TIF_WORK_SYSCALL_MASK, r10</div><div class='ctx'> 	tst	r10, r8</div><div class='ctx'> 	bf	syscall_trace_entry</div><div class='ctx'> 	!</div><div class='hunk'>@@ -389,8 +365,9 @@ syscall_exit:</div><div class='ctx'> #endif</div><div class='ctx'> 2:	.long	NR_syscalls</div><div class='ctx'> 3:	.long	sys_call_table</div><div class='del'>-4:	.long	do_syscall_trace</div><div class='ctx'> #ifdef CONFIG_TRACE_IRQFLAGS</div><div class='ctx'> 5:	.long	trace_hardirqs_on</div><div class='ctx'> 6:	.long	trace_hardirqs_off</div><div class='ctx'> #endif</div><div class='add'>+7:	.long	do_syscall_trace_enter</div><div class='add'>+8:	.long	do_syscall_trace_leave</div><div class='head'>diff --git a/arch/sh/kernel/head_64.S b/arch/sh/kernel/head_64.S<br/>index f42d4c0feb76..7ccfb995a398 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/head_64.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/head_64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/head_64.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/head_64.S</a></div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='del'>-#include &lt;asm/cpu/registers.h&gt;</div><div class='del'>-#include &lt;asm/cpu/mmu_context.h&gt;</div><div class='add'>+#include &lt;cpu/registers.h&gt;</div><div class='add'>+#include &lt;cpu/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c<br/>index a2a99e487e33..64b7690c664c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/irq.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='del'>-#include &lt;asm/cpu/mmu_context.h&gt;</div><div class='add'>+#include &lt;cpu/mmu_context.h&gt;</div><div class='ctx'> </div><div class='ctx'> atomic_t irq_err_count;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/machine_kexec.c b/arch/sh/kernel/machine_kexec.c<br/>index ec1eadce4aaa..94df56b0d1f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/machine_kexec.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/machine_kexec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/machine_kexec.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/machine_kexec.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='add'>+#include &lt;linux/numa.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='hunk'>@@ -101,6 +102,13 @@ void machine_kexec(struct kimage *image)</div><div class='ctx'> </div><div class='ctx'> 	/* now call it */</div><div class='ctx'> 	rnk = (relocate_new_kernel_t) reboot_code_buffer;</div><div class='del'>-	(*rnk)(page_list, reboot_code_buffer, image-&gt;start, vbr_reg);</div><div class='add'>+	(*rnk)(page_list, reboot_code_buffer, P2SEGADDR(image-&gt;start), vbr_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void arch_crash_save_vmcoreinfo(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_NUMA</div><div class='add'>+	VMCOREINFO_SYMBOL(node_data);</div><div class='add'>+	VMCOREINFO_LENGTH(node_data, MAX_NUMNODES);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='head'>diff --git a/arch/sh/kernel/module.c b/arch/sh/kernel/module.c<br/>index 5482e65375a9..c43081039dd5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/module.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/module.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/module.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/module.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/moduleloader.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -36,7 +37,8 @@ void *module_alloc(unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	if (size == 0)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	return vmalloc(size);</div><div class='add'>+</div><div class='add'>+	return vmalloc_exec(size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -145,9 +147,10 @@ int module_finalize(const Elf_Ehdr *hdr,</div><div class='ctx'> 		    const Elf_Shdr *sechdrs,</div><div class='ctx'> 		    struct module *me)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return module_bug_finalize(hdr, sechdrs, me);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void module_arch_cleanup(struct module *mod)</div><div class='ctx'> {</div><div class='add'>+	module_bug_cleanup(mod);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c<br/>index 2bc72def5cf8..035cb300d3dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/ptrace_32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/ptrace_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/ptrace_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/ptrace_32.c</a></div><div class='hunk'>@@ -20,6 +20,8 @@</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/audit.h&gt;</div><div class='add'>+#include &lt;linux/seccomp.h&gt;</div><div class='add'>+#include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -57,7 +59,23 @@ static inline int put_stack_long(struct task_struct *task, int offset,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ptrace_disable_singlestep(struct task_struct *child)</div><div class='add'>+void user_enable_single_step(struct task_struct *child)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs *regs = task_pt_regs(child);</div><div class='add'>+	long pc;</div><div class='add'>+</div><div class='add'>+	pc = get_stack_long(child, (long)&amp;regs-&gt;pc);</div><div class='add'>+</div><div class='add'>+	/* Next scheduling will set up UBC */</div><div class='add'>+	if (child-&gt;thread.ubc_pc == 0)</div><div class='add'>+		ubc_usercnt += 1;</div><div class='add'>+</div><div class='add'>+	child-&gt;thread.ubc_pc = pc;</div><div class='add'>+</div><div class='add'>+	set_tsk_thread_flag(child, TIF_SINGLESTEP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void user_disable_single_step(struct task_struct *child)</div><div class='ctx'> {</div><div class='ctx'> 	clear_tsk_thread_flag(child, TIF_SINGLESTEP);</div><div class='ctx'> </div><div class='hunk'>@@ -81,7 +99,7 @@ static void ptrace_disable_singlestep(struct task_struct *child)</div><div class='ctx'>  */</div><div class='ctx'> void ptrace_disable(struct task_struct *child)</div><div class='ctx'> {</div><div class='del'>-	ptrace_disable_singlestep(child);</div><div class='add'>+	user_disable_single_step(child);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='hunk'>@@ -90,12 +108,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	switch (request) {</div><div class='del'>-	/* when I and D space are separate, these will need to be fixed. */</div><div class='del'>-	case PTRACE_PEEKTEXT: /* read word at location addr. */</div><div class='del'>-	case PTRACE_PEEKDATA:</div><div class='del'>-		ret = generic_ptrace_peekdata(child, addr, data);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	/* read the word at location addr in the USER area. */</div><div class='ctx'> 	case PTRACE_PEEKUSR: {</div><div class='ctx'> 		unsigned long tmp;</div><div class='hunk'>@@ -125,12 +137,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* when I and D space are separate, this will have to be fixed. */</div><div class='del'>-	case PTRACE_POKETEXT: /* write the word at location addr. */</div><div class='del'>-	case PTRACE_POKEDATA:</div><div class='del'>-		ret = generic_ptrace_pokedata(child, addr, data);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case PTRACE_POKEUSR: /* write the word at location addr in the USER area */</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		if ((addr &amp; 3) || addr &lt; 0 ||</div><div class='hunk'>@@ -151,67 +157,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */</div><div class='del'>-	case PTRACE_CONT: { /* restart after signal. */</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		if (!valid_signal(data))</div><div class='del'>-			break;</div><div class='del'>-		if (request == PTRACE_SYSCALL)</div><div class='del'>-			set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);</div><div class='del'>-		else</div><div class='del'>-			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);</div><div class='del'>-</div><div class='del'>-		ptrace_disable_singlestep(child);</div><div class='del'>-</div><div class='del'>-		child-&gt;exit_code = data;</div><div class='del'>-		wake_up_process(child);</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * make the child exit.  Best I can do is send it a sigkill.</div><div class='del'>- * perhaps it should be put in the status that it wants to</div><div class='del'>- * exit.</div><div class='del'>- */</div><div class='del'>-	case PTRACE_KILL: {</div><div class='del'>-		ret = 0;</div><div class='del'>-		if (child-&gt;exit_state == EXIT_ZOMBIE)	/* already dead */</div><div class='del'>-			break;</div><div class='del'>-		ptrace_disable_singlestep(child);</div><div class='del'>-		child-&gt;exit_code = SIGKILL;</div><div class='del'>-		wake_up_process(child);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case PTRACE_SINGLESTEP: {  /* set the trap flag. */</div><div class='del'>-		long pc;</div><div class='del'>-		struct pt_regs *regs = NULL;</div><div class='del'>-</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		if (!valid_signal(data))</div><div class='del'>-			break;</div><div class='del'>-		clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);</div><div class='del'>-		if ((child-&gt;ptrace &amp; PT_DTRACE) == 0) {</div><div class='del'>-			/* Spurious delayed TF traps may occur */</div><div class='del'>-			child-&gt;ptrace |= PT_DTRACE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pc = get_stack_long(child, (long)&amp;regs-&gt;pc);</div><div class='del'>-</div><div class='del'>-		/* Next scheduling will set up UBC */</div><div class='del'>-		if (child-&gt;thread.ubc_pc == 0)</div><div class='del'>-			ubc_usercnt += 1;</div><div class='del'>-		child-&gt;thread.ubc_pc = pc;</div><div class='del'>-</div><div class='del'>-		set_tsk_thread_flag(child, TIF_SINGLESTEP);</div><div class='del'>-		child-&gt;exit_code = data;</div><div class='del'>-		/* give it a chance to run. */</div><div class='del'>-		wake_up_process(child);</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SH_DSP</div><div class='ctx'> 	case PTRACE_GETDSPREGS: {</div><div class='ctx'> 		unsigned long dp;</div><div class='hunk'>@@ -272,39 +217,49 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit)</div><div class='add'>+static inline int audit_arch(void)</div><div class='ctx'> {</div><div class='del'>-	struct task_struct *tsk = current;</div><div class='add'>+	int arch = EM_SH;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context) &amp;&amp; entryexit)</div><div class='del'>-		audit_syscall_exit(AUDITSC_RESULT(regs-&gt;regs[0]),</div><div class='del'>-				   regs-&gt;regs[0]);</div><div class='add'>+#ifdef CONFIG_CPU_LITTLE_ENDIAN</div><div class='add'>+	arch |= __AUDIT_ARCH_LE;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	if (!test_thread_flag(TIF_SYSCALL_TRACE) &amp;&amp;</div><div class='del'>-	    !test_thread_flag(TIF_SINGLESTEP))</div><div class='del'>-		goto out;</div><div class='del'>-	if (!(tsk-&gt;ptrace &amp; PT_PTRACED))</div><div class='del'>-		goto out;</div><div class='add'>+	return arch;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* the 0x80 provides a way for the tracing parent to distinguish</div><div class='del'>-	   between a syscall stop and SIGTRAP delivery */</div><div class='del'>-	ptrace_notify(SIGTRAP | ((current-&gt;ptrace &amp; PT_TRACESYSGOOD) &amp;&amp;</div><div class='del'>-				 !test_thread_flag(TIF_SINGLESTEP) ? 0x80 : 0));</div><div class='add'>+asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	long ret = 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * this isn't the same as continuing with a signal, but it will do</div><div class='del'>-	 * for normal use.  strace only continues with a signal if the</div><div class='del'>-	 * stopping signal is not SIGTRAP.  -brl</div><div class='del'>-	 */</div><div class='del'>-	if (tsk-&gt;exit_code) {</div><div class='del'>-		send_sig(tsk-&gt;exit_code, tsk, 1);</div><div class='del'>-		tsk-&gt;exit_code = 0;</div><div class='del'>-	}</div><div class='add'>+	secure_computing(regs-&gt;regs[0]);</div><div class='add'>+</div><div class='add'>+	if (test_thread_flag(TIF_SYSCALL_TRACE) &amp;&amp;</div><div class='add'>+	    tracehook_report_syscall_entry(regs))</div><div class='add'>+		/*</div><div class='add'>+		 * Tracing decided this syscall should not happen.</div><div class='add'>+		 * We'll return a bogus call number to get an ENOSYS</div><div class='add'>+		 * error, but leave the original number in regs-&gt;regs[0].</div><div class='add'>+		 */</div><div class='add'>+		ret = -1L;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	if (unlikely(current-&gt;audit_context) &amp;&amp; !entryexit)</div><div class='del'>-		audit_syscall_entry(AUDIT_ARCH_SH, regs-&gt;regs[3],</div><div class='add'>+	if (unlikely(current-&gt;audit_context))</div><div class='add'>+		audit_syscall_entry(audit_arch(), regs-&gt;regs[3],</div><div class='ctx'> 				    regs-&gt;regs[4], regs-&gt;regs[5],</div><div class='ctx'> 				    regs-&gt;regs[6], regs-&gt;regs[7]);</div><div class='ctx'> </div><div class='add'>+	return ret ?: regs-&gt;regs[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+asmlinkage void do_syscall_trace_leave(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int step;</div><div class='add'>+</div><div class='add'>+	if (unlikely(current-&gt;audit_context))</div><div class='add'>+		audit_syscall_exit(AUDITSC_RESULT(regs-&gt;regs[0]),</div><div class='add'>+				   regs-&gt;regs[0]);</div><div class='add'>+</div><div class='add'>+	step = test_thread_flag(TIF_SINGLESTEP);</div><div class='add'>+	if (step || test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='add'>+		tracehook_report_syscall_exit(regs, step);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c<br/>index d453c47dc522..9c6424892bd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/ptrace_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/ptrace_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/ptrace_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/ptrace_64.c</a></div><div class='hunk'>@@ -27,6 +27,8 @@</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/audit.h&gt;</div><div class='add'>+#include &lt;linux/seccomp.h&gt;</div><div class='add'>+#include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='hunk'>@@ -120,18 +122,25 @@ put_fpu_long(struct task_struct *task, unsigned long addr, unsigned long data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void user_enable_single_step(struct task_struct *child)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs *regs = child-&gt;thread.uregs;</div><div class='add'>+</div><div class='add'>+	regs-&gt;sr |= SR_SSTEP;	/* auto-resetting upon exception */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void user_disable_single_step(struct task_struct *child)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs *regs = child-&gt;thread.uregs;</div><div class='add'>+</div><div class='add'>+	regs-&gt;sr &amp;= ~SR_SSTEP;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	switch (request) {</div><div class='del'>-	/* when I and D space are separate, these will need to be fixed. */</div><div class='del'>-	case PTRACE_PEEKTEXT: /* read word at location addr. */</div><div class='del'>-	case PTRACE_PEEKDATA:</div><div class='del'>-		ret = generic_ptrace_peekdata(child, addr, data);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	/* read the word at location addr in the USER area. */</div><div class='ctx'> 	case PTRACE_PEEKUSR: {</div><div class='ctx'> 		unsigned long tmp;</div><div class='hunk'>@@ -154,12 +163,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* when I and D space are separate, this will have to be fixed. */</div><div class='del'>-	case PTRACE_POKETEXT: /* write the word at location addr. */</div><div class='del'>-	case PTRACE_POKEDATA:</div><div class='del'>-		ret = generic_ptrace_pokedata(child, addr, data);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case PTRACE_POKEUSR:</div><div class='ctx'>                 /* write the word at location addr in the USER area. We must</div><div class='ctx'>                    disallow any changes to certain SR bits or u_fpvalid, since</div><div class='hunk'>@@ -191,58 +194,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */</div><div class='del'>-	case PTRACE_CONT: { /* restart after signal. */</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		if (!valid_signal(data))</div><div class='del'>-			break;</div><div class='del'>-		if (request == PTRACE_SYSCALL)</div><div class='del'>-			set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);</div><div class='del'>-		else</div><div class='del'>-			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);</div><div class='del'>-		child-&gt;exit_code = data;</div><div class='del'>-		wake_up_process(child);</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * make the child exit.  Best I can do is send it a sigkill.</div><div class='del'>- * perhaps it should be put in the status that it wants to</div><div class='del'>- * exit.</div><div class='del'>- */</div><div class='del'>-	case PTRACE_KILL: {</div><div class='del'>-		ret = 0;</div><div class='del'>-		if (child-&gt;exit_state == EXIT_ZOMBIE)	/* already dead */</div><div class='del'>-			break;</div><div class='del'>-		child-&gt;exit_code = SIGKILL;</div><div class='del'>-		wake_up_process(child);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case PTRACE_SINGLESTEP: {  /* set the trap flag. */</div><div class='del'>-		struct pt_regs *regs;</div><div class='del'>-</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		if (!valid_signal(data))</div><div class='del'>-			break;</div><div class='del'>-		clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);</div><div class='del'>-		if ((child-&gt;ptrace &amp; PT_DTRACE) == 0) {</div><div class='del'>-			/* Spurious delayed TF traps may occur */</div><div class='del'>-			child-&gt;ptrace |= PT_DTRACE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		regs = child-&gt;thread.uregs;</div><div class='del'>-</div><div class='del'>-		regs-&gt;sr |= SR_SSTEP;	/* auto-resetting upon exception */</div><div class='del'>-</div><div class='del'>-		child-&gt;exit_code = data;</div><div class='del'>-		/* give it a chance to run. */</div><div class='del'>-		wake_up_process(child);</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = ptrace_request(child, request, addr, data);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -273,38 +224,51 @@ asmlinkage int sh64_ptrace(long request, long pid, long addr, long data)</div><div class='ctx'> 	return sys_ptrace(request, pid, addr, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage void syscall_trace(struct pt_regs *regs, int entryexit)</div><div class='add'>+static inline int audit_arch(void)</div><div class='ctx'> {</div><div class='del'>-	struct task_struct *tsk = current;</div><div class='add'>+	int arch = EM_SH;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context) &amp;&amp; entryexit)</div><div class='del'>-		audit_syscall_exit(AUDITSC_RESULT(regs-&gt;regs[9]),</div><div class='del'>-				   regs-&gt;regs[9]);</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+	arch |= __AUDIT_ARCH_64BIT;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_CPU_LITTLE_ENDIAN</div><div class='add'>+	arch |= __AUDIT_ARCH_LE;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	if (!test_thread_flag(TIF_SYSCALL_TRACE) &amp;&amp;</div><div class='del'>-	    !test_thread_flag(TIF_SINGLESTEP))</div><div class='del'>-		goto out;</div><div class='del'>-	if (!(tsk-&gt;ptrace &amp; PT_PTRACED))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ptrace_notify(SIGTRAP | ((current-&gt;ptrace &amp; PT_TRACESYSGOOD) &amp;&amp;</div><div class='del'>-				!test_thread_flag(TIF_SINGLESTEP) ? 0x80 : 0));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * this isn't the same as continuing with a signal, but it will do</div><div class='del'>-	 * for normal use.  strace only continues with a signal if the</div><div class='del'>-	 * stopping signal is not SIGTRAP.  -brl</div><div class='del'>-	 */</div><div class='del'>-	if (tsk-&gt;exit_code) {</div><div class='del'>-		send_sig(tsk-&gt;exit_code, tsk, 1);</div><div class='del'>-		tsk-&gt;exit_code = 0;</div><div class='del'>-	}</div><div class='add'>+	return arch;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+asmlinkage long long do_syscall_trace_enter(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	long long ret = 0;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	if (unlikely(current-&gt;audit_context) &amp;&amp; !entryexit)</div><div class='del'>-		audit_syscall_entry(AUDIT_ARCH_SH, regs-&gt;regs[1],</div><div class='add'>+	secure_computing(regs-&gt;regs[9]);</div><div class='add'>+</div><div class='add'>+	if (test_thread_flag(TIF_SYSCALL_TRACE) &amp;&amp;</div><div class='add'>+	    tracehook_report_syscall_entry(regs))</div><div class='add'>+		/*</div><div class='add'>+		 * Tracing decided this syscall should not happen.</div><div class='add'>+		 * We'll return a bogus call number to get an ENOSYS</div><div class='add'>+		 * error, but leave the original number in regs-&gt;regs[0].</div><div class='add'>+		 */</div><div class='add'>+		ret = -1LL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(current-&gt;audit_context))</div><div class='add'>+		audit_syscall_entry(audit_arch(), regs-&gt;regs[1],</div><div class='ctx'> 				    regs-&gt;regs[2], regs-&gt;regs[3],</div><div class='ctx'> 				    regs-&gt;regs[4], regs-&gt;regs[5]);</div><div class='add'>+</div><div class='add'>+	return ret ?: regs-&gt;regs[9];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+asmlinkage void do_syscall_trace_leave(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(current-&gt;audit_context))</div><div class='add'>+		audit_syscall_exit(AUDITSC_RESULT(regs-&gt;regs[9]),</div><div class='add'>+				   regs-&gt;regs[9]);</div><div class='add'>+</div><div class='add'>+	if (test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='add'>+		tracehook_report_syscall_exit(regs, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called with interrupts disabled */</div><div class='hunk'>@@ -338,5 +302,5 @@ asmlinkage void do_software_break_point(unsigned long long vec,</div><div class='ctx'>  */</div><div class='ctx'> void ptrace_disable(struct task_struct *child)</div><div class='ctx'> {</div><div class='del'>-        /* nothing to do.. */</div><div class='add'>+	user_disable_single_step(child);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c<br/>index 6339d0c95715..de832056bf1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/setup.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/crash_dump.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -170,6 +171,7 @@ static void __init reserve_crashkernel(void)</div><div class='ctx'> 				(unsigned long)(free_mem &gt;&gt; 20));</div><div class='ctx'> 		crashk_res.start = crash_base;</div><div class='ctx'> 		crashk_res.end   = crash_base + crash_size - 1;</div><div class='add'>+		insert_resource(&amp;iomem_resource, &amp;crashk_res);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -203,11 +205,6 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn,</div><div class='ctx'> 	request_resource(res, &amp;data_resource);</div><div class='ctx'> 	request_resource(res, &amp;bss_resource);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='del'>-	if (crashk_res.start != crashk_res.end)</div><div class='del'>-		request_resource(res, &amp;crashk_res);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	add_active_range(nid, start_pfn, end_pfn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -286,6 +283,25 @@ static void __init setup_memory(void)</div><div class='ctx'> extern void __init setup_memory(void);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Note: elfcorehdr_addr is not just limited to vmcore. It is also used by</div><div class='add'>+ * is_kdump_kernel() to determine if we are booting after a panic. Hence</div><div class='add'>+ * ifdef it under CONFIG_CRASH_DUMP and not CONFIG_PROC_VMCORE.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_CRASH_DUMP</div><div class='add'>+/* elfcorehdr= specifies the location of elf core header</div><div class='add'>+ * stored by the crashed kernel.</div><div class='add'>+ */</div><div class='add'>+static int __init parse_elfcorehdr(char *arg)</div><div class='add'>+{</div><div class='add'>+	if (!arg)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	elfcorehdr_addr = memparse(arg, &amp;arg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("elfcorehdr", parse_elfcorehdr);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void __init setup_arch(char **cmdline_p)</div><div class='ctx'> {</div><div class='ctx'> 	enable_mmu();</div><div class='head'>diff --git a/arch/sh/kernel/sh_ksyms_32.c b/arch/sh/kernel/sh_ksyms_32.c<br/>index 8f916536719c..6e1b1c271658 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/sh_ksyms_32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/sh_ksyms_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/sh_ksyms_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/sh_ksyms_32.c</a></div><div class='hunk'>@@ -107,10 +107,12 @@ DECLARE_EXPORT(__movmemSI12_i4);</div><div class='ctx'>  * GCC &gt;= 4.2 emits these for division, as do GCC 4.1.x versions of the ST</div><div class='ctx'>  * compiler which include backported patches.</div><div class='ctx'>  */</div><div class='del'>-DECLARE_EXPORT(__sdivsi3_i4i);</div><div class='ctx'> DECLARE_EXPORT(__udiv_qrnnd_16);</div><div class='add'>+#if !defined(CONFIG_CPU_SH2)</div><div class='add'>+DECLARE_EXPORT(__sdivsi3_i4i);</div><div class='ctx'> DECLARE_EXPORT(__udivsi3_i4i);</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> #else /* GCC 3.x */</div><div class='ctx'> DECLARE_EXPORT(__movstr_i4_even);</div><div class='ctx'> DECLARE_EXPORT(__movstr_i4_odd);</div><div class='head'>diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c<br/>index 4bbbde895a53..51689d29ad45 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/signal_32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/signal_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/signal_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/signal_32.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/binfmts.h&gt;</div><div class='ctx'> #include &lt;linux/freezer.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -507,14 +508,13 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 		switch (regs-&gt;regs[0]) {</div><div class='ctx'> 			case -ERESTART_RESTARTBLOCK:</div><div class='ctx'> 			case -ERESTARTNOHAND:</div><div class='add'>+			no_system_call_restart:</div><div class='ctx'> 				regs-&gt;regs[0] = -EINTR;</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			case -ERESTARTSYS:</div><div class='del'>-				if (!(ka-&gt;sa.sa_flags &amp; SA_RESTART)) {</div><div class='del'>-					regs-&gt;regs[0] = -EINTR;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='add'>+				if (!(ka-&gt;sa.sa_flags &amp; SA_RESTART))</div><div class='add'>+					goto no_system_call_restart;</div><div class='ctx'> 			/* fallthrough */</div><div class='ctx'> 			case -ERESTARTNOINTR:</div><div class='ctx'> 				regs-&gt;regs[0] = save_r0;</div><div class='hunk'>@@ -589,12 +589,15 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0)</div><div class='ctx'> 			 * clear the TIF_RESTORE_SIGMASK flag */</div><div class='ctx'> 			if (test_thread_flag(TIF_RESTORE_SIGMASK))</div><div class='ctx'> 				clear_thread_flag(TIF_RESTORE_SIGMASK);</div><div class='add'>+</div><div class='add'>+			tracehook_signal_handler(signr, &amp;info, &amp;ka, regs,</div><div class='add'>+					test_thread_flag(TIF_SINGLESTEP));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>- no_signal:</div><div class='add'>+no_signal:</div><div class='ctx'> 	/* Did we come from a system call? */</div><div class='ctx'> 	if (regs-&gt;tra &gt;= 0) {</div><div class='ctx'> 		/* Restart the system call - no handlers present */</div><div class='hunk'>@@ -618,9 +621,14 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned int save_r0,</div><div class='del'>-				 __u32 thread_info_flags)</div><div class='add'>+				 unsigned long thread_info_flags)</div><div class='ctx'> {</div><div class='ctx'> 	/* deal with pending signal delivery */</div><div class='del'>-	if (thread_info_flags &amp; (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))</div><div class='add'>+	if (thread_info_flags &amp; _TIF_SIGPENDING)</div><div class='ctx'> 		do_signal(regs, save_r0);</div><div class='add'>+</div><div class='add'>+	if (thread_info_flags &amp; _TIF_NOTIFY_RESUME) {</div><div class='add'>+		clear_thread_flag(TIF_NOTIFY_RESUME);</div><div class='add'>+		tracehook_notify_resume(regs);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c<br/>index 552eb810cd85..1d62dfef77f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/signal_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/signal_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/signal_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/signal_64.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='add'>+#include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='hunk'>@@ -42,7 +43,84 @@</div><div class='ctx'> </div><div class='ctx'> #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))</div><div class='ctx'> </div><div class='del'>-asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset);</div><div class='add'>+/*</div><div class='add'>+ * Note that 'init' is a special process: it doesn't get signals it doesn't</div><div class='add'>+ * want to handle. Thus you cannot kill init even with a SIGKILL even by</div><div class='add'>+ * mistake.</div><div class='add'>+ *</div><div class='add'>+ * Note that we go through the signals twice: once to check the signals that</div><div class='add'>+ * the kernel can handle, and then we build all the user-level signal handling</div><div class='add'>+ * stack-frames in one go after that.</div><div class='add'>+ */</div><div class='add'>+static int do_signal(struct pt_regs *regs, sigset_t *oldset)</div><div class='add'>+{</div><div class='add'>+	siginfo_t info;</div><div class='add'>+	int signr;</div><div class='add'>+	struct k_sigaction ka;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We want the common case to go fast, which</div><div class='add'>+	 * is why we may in certain cases get here from</div><div class='add'>+	 * kernel mode. Just return without doing anything</div><div class='add'>+	 * if so.</div><div class='add'>+	 */</div><div class='add'>+	if (!user_mode(regs))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (try_to_freeze())</div><div class='add'>+		goto no_signal;</div><div class='add'>+</div><div class='add'>+	if (test_thread_flag(TIF_RESTORE_SIGMASK))</div><div class='add'>+		oldset = &amp;current-&gt;saved_sigmask;</div><div class='add'>+	else if (!oldset)</div><div class='add'>+		oldset = &amp;current-&gt;blocked;</div><div class='add'>+</div><div class='add'>+	signr = get_signal_to_deliver(&amp;info, &amp;ka, regs, 0);</div><div class='add'>+</div><div class='add'>+	if (signr &gt; 0) {</div><div class='add'>+		/* Whee!  Actually deliver the signal.  */</div><div class='add'>+		handle_signal(signr, &amp;info, &amp;ka, oldset, regs);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If a signal was successfully delivered, the saved sigmask</div><div class='add'>+		 * is in its frame, and we can clear the TIF_RESTORE_SIGMASK</div><div class='add'>+		 * flag.</div><div class='add'>+		 */</div><div class='add'>+		if (test_thread_flag(TIF_RESTORE_SIGMASK))</div><div class='add'>+			clear_thread_flag(TIF_RESTORE_SIGMASK);</div><div class='add'>+</div><div class='add'>+		tracehook_signal_handler(signr, &amp;info, &amp;ka, regs, 0);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+no_signal:</div><div class='add'>+	/* Did we come from a system call? */</div><div class='add'>+	if (regs-&gt;syscall_nr &gt;= 0) {</div><div class='add'>+		/* Restart the system call - no handlers present */</div><div class='add'>+		switch (regs-&gt;regs[REG_RET]) {</div><div class='add'>+		case -ERESTARTNOHAND:</div><div class='add'>+		case -ERESTARTSYS:</div><div class='add'>+		case -ERESTARTNOINTR:</div><div class='add'>+			/* Decode Syscall # */</div><div class='add'>+			regs-&gt;regs[REG_RET] = regs-&gt;syscall_nr;</div><div class='add'>+			regs-&gt;pc -= 4;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case -ERESTART_RESTARTBLOCK:</div><div class='add'>+			regs-&gt;regs[REG_RET] = __NR_restart_syscall;</div><div class='add'>+			regs-&gt;pc -= 4;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No signal to deliver -- put the saved sigmask back */</div><div class='add'>+	if (test_thread_flag(TIF_RESTORE_SIGMASK)) {</div><div class='add'>+		clear_thread_flag(TIF_RESTORE_SIGMASK);</div><div class='add'>+		sigprocmask(SIG_SETMASK, &amp;current-&gt;saved_sigmask, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Atomically swap in the new signal mask, and wait for a signal.</div><div class='hunk'>@@ -643,14 +721,13 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,</div><div class='ctx'> 		switch (regs-&gt;regs[REG_RET]) {</div><div class='ctx'> 			case -ERESTART_RESTARTBLOCK:</div><div class='ctx'> 			case -ERESTARTNOHAND:</div><div class='add'>+			no_system_call_restart:</div><div class='ctx'> 				regs-&gt;regs[REG_RET] = -EINTR;</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			case -ERESTARTSYS:</div><div class='del'>-				if (!(ka-&gt;sa.sa_flags &amp; SA_RESTART)) {</div><div class='del'>-					regs-&gt;regs[REG_RET] = -EINTR;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='add'>+				if (!(ka-&gt;sa.sa_flags &amp; SA_RESTART))</div><div class='add'>+					goto no_system_call_restart;</div><div class='ctx'> 			/* fallthrough */</div><div class='ctx'> 			case -ERESTARTNOINTR:</div><div class='ctx'> 				/* Decode syscall # */</div><div class='hunk'>@@ -673,80 +750,13 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,</div><div class='ctx'> 	spin_unlock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Note that 'init' is a special process: it doesn't get signals it doesn't</div><div class='del'>- * want to handle. Thus you cannot kill init even with a SIGKILL even by</div><div class='del'>- * mistake.</div><div class='del'>- *</div><div class='del'>- * Note that we go through the signals twice: once to check the signals that</div><div class='del'>- * the kernel can handle, and then we build all the user-level signal handling</div><div class='del'>- * stack-frames in one go after that.</div><div class='del'>- */</div><div class='del'>-int do_signal(struct pt_regs *regs, sigset_t *oldset)</div><div class='add'>+asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)</div><div class='ctx'> {</div><div class='del'>-	siginfo_t info;</div><div class='del'>-	int signr;</div><div class='del'>-	struct k_sigaction ka;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We want the common case to go fast, which</div><div class='del'>-	 * is why we may in certain cases get here from</div><div class='del'>-	 * kernel mode. Just return without doing anything</div><div class='del'>-	 * if so.</div><div class='del'>-	 */</div><div class='del'>-	if (!user_mode(regs))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (try_to_freeze())</div><div class='del'>-		goto no_signal;</div><div class='del'>-</div><div class='del'>-	if (test_thread_flag(TIF_RESTORE_SIGMASK))</div><div class='del'>-		oldset = &amp;current-&gt;saved_sigmask;</div><div class='del'>-	else if (!oldset)</div><div class='del'>-		oldset = &amp;current-&gt;blocked;</div><div class='del'>-</div><div class='del'>-	signr = get_signal_to_deliver(&amp;info, &amp;ka, regs, 0);</div><div class='del'>-</div><div class='del'>-	if (signr &gt; 0) {</div><div class='del'>-		/* Whee!  Actually deliver the signal.  */</div><div class='del'>-		handle_signal(signr, &amp;info, &amp;ka, oldset, regs);</div><div class='add'>+	if (thread_info_flags &amp; _TIF_SIGPENDING)</div><div class='add'>+		do_signal(regs, 0);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * If a signal was successfully delivered, the saved sigmask</div><div class='del'>-		 * is in its frame, and we can clear the TIF_RESTORE_SIGMASK</div><div class='del'>-		 * flag.</div><div class='del'>-		 */</div><div class='del'>-		if (test_thread_flag(TIF_RESTORE_SIGMASK))</div><div class='del'>-			clear_thread_flag(TIF_RESTORE_SIGMASK);</div><div class='del'>-</div><div class='del'>-		return 1;</div><div class='add'>+	if (thread_info_flags &amp; _TIF_NOTIFY_RESUME) {</div><div class='add'>+		clear_thread_flag(TIF_NOTIFY_RESUME);</div><div class='add'>+		tracehook_notify_resume(regs);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-no_signal:</div><div class='del'>-	/* Did we come from a system call? */</div><div class='del'>-	if (regs-&gt;syscall_nr &gt;= 0) {</div><div class='del'>-		/* Restart the system call - no handlers present */</div><div class='del'>-		switch (regs-&gt;regs[REG_RET]) {</div><div class='del'>-		case -ERESTARTNOHAND:</div><div class='del'>-		case -ERESTARTSYS:</div><div class='del'>-		case -ERESTARTNOINTR:</div><div class='del'>-			/* Decode Syscall # */</div><div class='del'>-			regs-&gt;regs[REG_RET] = regs-&gt;syscall_nr;</div><div class='del'>-			regs-&gt;pc -= 4;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case -ERESTART_RESTARTBLOCK:</div><div class='del'>-			regs-&gt;regs[REG_RET] = __NR_restart_syscall;</div><div class='del'>-			regs-&gt;pc -= 4;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* No signal to deliver -- put the saved sigmask back */</div><div class='del'>-	if (test_thread_flag(TIF_RESTORE_SIGMASK)) {</div><div class='del'>-		clear_thread_flag(TIF_RESTORE_SIGMASK);</div><div class='del'>-		sigprocmask(SIG_SETMASK, &amp;current-&gt;saved_sigmask, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c<br/>index 59cd2859ce9b..9061b86d73fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/sys_sh.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/sys_sh.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/sys_sh.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/sys_sh.c</a></div><div class='hunk'>@@ -170,7 +170,7 @@ asmlinkage int sys_ipc(uint call, int first, int second,</div><div class='ctx'> 	version = call &gt;&gt; 16; /* hack for backward compatibility */</div><div class='ctx'> 	call &amp;= 0xffff;</div><div class='ctx'> </div><div class='del'>-	if (call &lt;= SEMCTL)</div><div class='add'>+	if (call &lt;= SEMTIMEDOP)</div><div class='ctx'> 		switch (call) {</div><div class='ctx'> 		case SEMOP:</div><div class='ctx'> 			return sys_semtimedop(first,</div><div class='head'>diff --git a/arch/sh/kernel/time_64.c b/arch/sh/kernel/time_64.c<br/>index 022a55f1c1d4..791edabf7d83 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/time_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/kernel/time_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/time_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/kernel/time_64.c</a></div><div class='hunk'>@@ -33,8 +33,8 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/cpu/registers.h&gt;	 /* required by inline __asm__ stmt. */</div><div class='del'>-#include &lt;asm/cpu/irq.h&gt;</div><div class='add'>+#include &lt;cpu/registers.h&gt;	 /* required by inline __asm__ stmt. */</div><div class='add'>+#include &lt;cpu/irq.h&gt;</div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/arch/sh/lib64/panic.c b/arch/sh/lib64/panic.c<br/>index ff559e2a96f7..da32ba7b5fcc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/lib64/panic.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/lib64/panic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/lib64/panic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/lib64/panic.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/cpu/registers.h&gt;</div><div class='add'>+#include &lt;cpu/registers.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* THIS IS A PHYSICAL ADDRESS */</div><div class='ctx'> #define HDSP2534_ADDR (0x04002100)</div><div class='head'>diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig<br/>index 56d0a7daa34b..8a03926ea84f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/mm/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/mm/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/mm/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/mm/Kconfig</a></div><div class='hunk'>@@ -181,10 +181,12 @@ config ENTRY_OFFSET</div><div class='ctx'> choice</div><div class='ctx'> 	prompt "HugeTLB page size"</div><div class='ctx'> 	depends on HUGETLB_PAGE &amp;&amp; (CPU_SH4 || CPU_SH5) &amp;&amp; MMU</div><div class='add'>+	default HUGETLB_PAGE_SIZE_1MB if PAGE_SIZE_64KB</div><div class='ctx'> 	default HUGETLB_PAGE_SIZE_64K</div><div class='ctx'> </div><div class='ctx'> config HUGETLB_PAGE_SIZE_64K</div><div class='ctx'> 	bool "64kB"</div><div class='add'>+	depends on !PAGE_SIZE_64KB</div><div class='ctx'> </div><div class='ctx'> config HUGETLB_PAGE_SIZE_256K</div><div class='ctx'> 	bool "256kB"</div><div class='hunk'>@@ -237,7 +239,6 @@ choice</div><div class='ctx'> </div><div class='ctx'> config CACHE_WRITEBACK</div><div class='ctx'> 	bool "Write-back"</div><div class='del'>-	depends on CPU_SH2A || CPU_SH3 || CPU_SH4 || CPU_SH5</div><div class='ctx'> </div><div class='ctx'> config CACHE_WRITETHROUGH</div><div class='ctx'> 	bool "Write-through"</div><div class='head'>diff --git a/arch/sh/mm/Makefile_32 b/arch/sh/mm/Makefile_32<br/>index e295db60b91b..70e0906023cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/mm/Makefile_32?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/mm/Makefile_32</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/mm/Makefile_32?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/mm/Makefile_32</a></div><div class='hunk'>@@ -5,12 +5,15 @@</div><div class='ctx'> obj-y			:= init.o extable_32.o consistent.o</div><div class='ctx'> </div><div class='ctx'> ifndef CONFIG_CACHE_OFF</div><div class='del'>-obj-$(CONFIG_CPU_SH2)		+= cache-sh2.o</div><div class='del'>-obj-$(CONFIG_CPU_SH3)		+= cache-sh3.o</div><div class='del'>-obj-$(CONFIG_CPU_SH4)		+= cache-sh4.o</div><div class='del'>-obj-$(CONFIG_SH7705_CACHE_32KB)	+= cache-sh7705.o</div><div class='add'>+cache-$(CONFIG_CPU_SH2)		:= cache-sh2.o</div><div class='add'>+cache-$(CONFIG_CPU_SH2A)	:= cache-sh2a.o</div><div class='add'>+cache-$(CONFIG_CPU_SH3)		:= cache-sh3.o</div><div class='add'>+cache-$(CONFIG_CPU_SH4)		:= cache-sh4.o</div><div class='add'>+cache-$(CONFIG_SH7705_CACHE_32KB)	+= cache-sh7705.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='add'>+obj-y			+= $(cache-y)</div><div class='add'>+</div><div class='ctx'> mmu-y			:= tlb-nommu.o pg-nommu.o</div><div class='ctx'> mmu-$(CONFIG_MMU)	:= fault_32.o tlbflush_32.o ioremap_32.o</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/mm/cache-sh2.c b/arch/sh/mm/cache-sh2.c<br/>index 6614033f6be9..c4e80d2b764b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/mm/cache-sh2.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/mm/cache-sh2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/mm/cache-sh2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/mm/cache-sh2.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  * arch/sh/mm/cache-sh2.c</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2002 Paul Mundt</div><div class='add'>+ * Copyright (C) 2008 Yoshinori Sato</div><div class='ctx'>  *</div><div class='ctx'>  * Released under the terms of the GNU GPL v2.0.</div><div class='ctx'>  */</div><div class='hunk'>@@ -24,8 +25,15 @@ void __flush_wback_region(void *start, int size)</div><div class='ctx'> 	end = ((unsigned long)start + size + L1_CACHE_BYTES-1)</div><div class='ctx'> 		&amp; ~(L1_CACHE_BYTES-1);</div><div class='ctx'> 	for (v = begin; v &lt; end; v+=L1_CACHE_BYTES) {</div><div class='del'>-		/* FIXME cache purge */</div><div class='del'>-		ctrl_outl((v &amp; 0x1ffffc00), (v &amp; 0x00000ff0) | 0x00000008);</div><div class='add'>+		unsigned long addr = CACHE_OC_ADDRESS_ARRAY | (v &amp; 0x00000ff0);</div><div class='add'>+		int way;</div><div class='add'>+		for (way = 0; way &lt; 4; way++) {</div><div class='add'>+			unsigned long data =  ctrl_inl(addr | (way &lt;&lt; 12));</div><div class='add'>+			if ((data &amp; CACHE_PHYSADDR_MASK) == (v &amp; CACHE_PHYSADDR_MASK)) {</div><div class='add'>+				data &amp;= ~SH_CACHE_UPDATED;</div><div class='add'>+				ctrl_outl(data, addr | (way &lt;&lt; 12));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -37,21 +45,40 @@ void __flush_purge_region(void *start, int size)</div><div class='ctx'> 	begin = (unsigned long)start &amp; ~(L1_CACHE_BYTES-1);</div><div class='ctx'> 	end = ((unsigned long)start + size + L1_CACHE_BYTES-1)</div><div class='ctx'> 		&amp; ~(L1_CACHE_BYTES-1);</div><div class='del'>-	for (v = begin; v &lt; end; v+=L1_CACHE_BYTES) {</div><div class='del'>-		ctrl_outl((v &amp; 0x1ffffc00), (v &amp; 0x00000ff0) | 0x00000008);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	for (v = begin; v &lt; end; v+=L1_CACHE_BYTES)</div><div class='add'>+		ctrl_outl((v &amp; CACHE_PHYSADDR_MASK),</div><div class='add'>+			  CACHE_OC_ADDRESS_ARRAY | (v &amp; 0x00000ff0) | 0x00000008);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __flush_invalidate_region(void *start, int size)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_CACHE_WRITEBACK</div><div class='add'>+	/*</div><div class='add'>+	 * SH-2 does not support individual line invalidation, only a</div><div class='add'>+	 * global invalidate.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long ccr;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	jump_to_uncached();</div><div class='add'>+</div><div class='add'>+	ccr = ctrl_inl(CCR);</div><div class='add'>+	ccr |= CCR_CACHE_INVALIDATE;</div><div class='add'>+	ctrl_outl(ccr, CCR);</div><div class='add'>+</div><div class='add'>+	back_to_cached();</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+#else</div><div class='ctx'> 	unsigned long v;</div><div class='ctx'> 	unsigned long begin, end;</div><div class='ctx'> </div><div class='ctx'> 	begin = (unsigned long)start &amp; ~(L1_CACHE_BYTES-1);</div><div class='ctx'> 	end = ((unsigned long)start + size + L1_CACHE_BYTES-1)</div><div class='ctx'> 		&amp; ~(L1_CACHE_BYTES-1);</div><div class='del'>-	for (v = begin; v &lt; end; v+=L1_CACHE_BYTES) {</div><div class='del'>-		ctrl_outl((v &amp; 0x1ffffc00), (v &amp; 0x00000ff0) | 0x00000008);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='add'>+	for (v = begin; v &lt; end; v+=L1_CACHE_BYTES)</div><div class='add'>+		ctrl_outl((v &amp; CACHE_PHYSADDR_MASK),</div><div class='add'>+			  CACHE_OC_ADDRESS_ARRAY | (v &amp; 0x00000ff0) | 0x00000008);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='head'>diff --git a/arch/sh/mm/cache-sh2a.c b/arch/sh/mm/cache-sh2a.c<br/>new file mode 100644<br/>index 000000000000..62c0c5f35120<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/mm/cache-sh2a.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/mm/cache-sh2a.c</a></div><div class='hunk'>@@ -0,0 +1,129 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/sh/mm/cache-sh2a.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Yoshinori Sato</div><div class='add'>+ *</div><div class='add'>+ * Released under the terms of the GNU GPL v2.0.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cache.h&gt;</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+void __flush_wback_region(void *start, int size)</div><div class='add'>+{</div><div class='add'>+	unsigned long v;</div><div class='add'>+	unsigned long begin, end;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	begin = (unsigned long)start &amp; ~(L1_CACHE_BYTES-1);</div><div class='add'>+	end = ((unsigned long)start + size + L1_CACHE_BYTES-1)</div><div class='add'>+		&amp; ~(L1_CACHE_BYTES-1);</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	jump_to_uncached();</div><div class='add'>+</div><div class='add'>+	for (v = begin; v &lt; end; v+=L1_CACHE_BYTES) {</div><div class='add'>+		unsigned long addr = CACHE_OC_ADDRESS_ARRAY | (v &amp; 0x000007f0);</div><div class='add'>+		int way;</div><div class='add'>+		for (way = 0; way &lt; 4; way++) {</div><div class='add'>+			unsigned long data =  ctrl_inl(addr | (way &lt;&lt; 11));</div><div class='add'>+			if ((data &amp; CACHE_PHYSADDR_MASK) == (v &amp; CACHE_PHYSADDR_MASK)) {</div><div class='add'>+				data &amp;= ~SH_CACHE_UPDATED;</div><div class='add'>+				ctrl_outl(data, addr | (way &lt;&lt; 11));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	back_to_cached();</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __flush_purge_region(void *start, int size)</div><div class='add'>+{</div><div class='add'>+	unsigned long v;</div><div class='add'>+	unsigned long begin, end;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	begin = (unsigned long)start &amp; ~(L1_CACHE_BYTES-1);</div><div class='add'>+	end = ((unsigned long)start + size + L1_CACHE_BYTES-1)</div><div class='add'>+		&amp; ~(L1_CACHE_BYTES-1);</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	jump_to_uncached();</div><div class='add'>+</div><div class='add'>+	for (v = begin; v &lt; end; v+=L1_CACHE_BYTES) {</div><div class='add'>+		ctrl_outl((v &amp; CACHE_PHYSADDR_MASK),</div><div class='add'>+			  CACHE_OC_ADDRESS_ARRAY | (v &amp; 0x000003f0) | 0x00000008);</div><div class='add'>+	}</div><div class='add'>+	back_to_cached();</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __flush_invalidate_region(void *start, int size)</div><div class='add'>+{</div><div class='add'>+	unsigned long v;</div><div class='add'>+	unsigned long begin, end;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	begin = (unsigned long)start &amp; ~(L1_CACHE_BYTES-1);</div><div class='add'>+	end = ((unsigned long)start + size + L1_CACHE_BYTES-1)</div><div class='add'>+		&amp; ~(L1_CACHE_BYTES-1);</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	jump_to_uncached();</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CACHE_WRITEBACK</div><div class='add'>+	ctrl_outl(ctrl_inl(CCR) | CCR_OCACHE_INVALIDATE, CCR);</div><div class='add'>+	/* I-cache invalidate */</div><div class='add'>+	for (v = begin; v &lt; end; v+=L1_CACHE_BYTES) {</div><div class='add'>+		ctrl_outl((v &amp; CACHE_PHYSADDR_MASK),</div><div class='add'>+			  CACHE_IC_ADDRESS_ARRAY | (v &amp; 0x000003f0) | 0x00000008);</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+	for (v = begin; v &lt; end; v+=L1_CACHE_BYTES) {</div><div class='add'>+		ctrl_outl((v &amp; CACHE_PHYSADDR_MASK),</div><div class='add'>+			  CACHE_IC_ADDRESS_ARRAY | (v &amp; 0x000003f0) | 0x00000008);</div><div class='add'>+		ctrl_outl((v &amp; CACHE_PHYSADDR_MASK),</div><div class='add'>+			  CACHE_OC_ADDRESS_ARRAY | (v &amp; 0x000003f0) | 0x00000008);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	back_to_cached();</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* WBack O-Cache and flush I-Cache */</div><div class='add'>+void flush_icache_range(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	unsigned long v;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	start = start &amp; ~(L1_CACHE_BYTES-1);</div><div class='add'>+	end = (end + L1_CACHE_BYTES-1) &amp; ~(L1_CACHE_BYTES-1);</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	jump_to_uncached();</div><div class='add'>+</div><div class='add'>+	for (v = start; v &lt; end; v+=L1_CACHE_BYTES) {</div><div class='add'>+		unsigned long addr = (v &amp; 0x000007f0);</div><div class='add'>+		int way;</div><div class='add'>+		/* O-Cache writeback */</div><div class='add'>+		for (way = 0; way &lt; 4; way++) {</div><div class='add'>+			unsigned long data =  ctrl_inl(CACHE_OC_ADDRESS_ARRAY | addr | (way &lt;&lt; 11));</div><div class='add'>+			if ((data &amp; CACHE_PHYSADDR_MASK) == (v &amp; CACHE_PHYSADDR_MASK)) {</div><div class='add'>+				data &amp;= ~SH_CACHE_UPDATED;</div><div class='add'>+				ctrl_outl(data, CACHE_OC_ADDRESS_ARRAY | addr | (way &lt;&lt; 11));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/* I-Cache invalidate */</div><div class='add'>+		ctrl_outl(addr,</div><div class='add'>+			  CACHE_IC_ADDRESS_ARRAY | addr | 0x00000008);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	back_to_cached();</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c<br/>index b2ce014401b5..64b8f7f96f9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/mm/consistent.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/mm/consistent.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/mm/consistent.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/mm/consistent.c</a></div><div class='hunk'>@@ -95,8 +95,31 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dma_cache_sync);</div><div class='ctx'> </div><div class='del'>-int platform_resource_setup_memory(struct platform_device *pdev,</div><div class='del'>-				   char *name, unsigned long memsize)</div><div class='add'>+static int __init memchunk_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	return 1; /* accept anything that begins with "memchunk." */</div><div class='add'>+}</div><div class='add'>+__setup("memchunk.", memchunk_setup);</div><div class='add'>+</div><div class='add'>+static void __init memchunk_cmdline_override(char *name, unsigned long *sizep)</div><div class='add'>+{</div><div class='add'>+	char *p = boot_command_line;</div><div class='add'>+	int k = strlen(name);</div><div class='add'>+</div><div class='add'>+	while ((p = strstr(p, "memchunk."))) {</div><div class='add'>+		p += 9; /* strlen("memchunk.") */</div><div class='add'>+		if (!strncmp(name, p, k) &amp;&amp; p[k] == '=') {</div><div class='add'>+			p += k + 1;</div><div class='add'>+			*sizep = memparse(p, NULL);</div><div class='add'>+			pr_info("%s: forcing memory chunk size to 0x%08lx\n",</div><div class='add'>+				name, *sizep);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init platform_resource_setup_memory(struct platform_device *pdev,</div><div class='add'>+					  char *name, unsigned long memsize)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource *r;</div><div class='ctx'> 	dma_addr_t dma_handle;</div><div class='hunk'>@@ -109,6 +132,10 @@ int platform_resource_setup_memory(struct platform_device *pdev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	memchunk_cmdline_override(name, &amp;memsize);</div><div class='add'>+	if (!memsize)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	buf = dma_alloc_coherent(NULL, memsize, &amp;dma_handle, GFP_KERNEL);</div><div class='ctx'> 	if (!buf) {</div><div class='ctx'> 		pr_warning("%s: unable to allocate memory\n", name);</div><div class='head'>diff --git a/arch/sh/mm/fault_64.c b/arch/sh/mm/fault_64.c<br/>index 399d53710d2f..bd63b961b2a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/mm/fault_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/mm/fault_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/mm/fault_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/mm/fault_64.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='del'>-#include &lt;asm/cpu/registers.h&gt;</div><div class='add'>+#include &lt;cpu/registers.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Callable from fault.c, so not static */</div><div class='ctx'> inline void __do_tlb_refill(unsigned long address,</div><div class='head'>diff --git a/arch/sh/mm/tlb-sh5.c b/arch/sh/mm/tlb-sh5.c<br/>index f34274a1ded3..dae131243bcc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/mm/tlb-sh5.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sh/mm/tlb-sh5.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/mm/tlb-sh5.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sh/mm/tlb-sh5.c</a></div><div class='hunk'>@@ -15,9 +15,7 @@</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * sh64_tlb_init</div><div class='del'>- *</div><div class='del'>- * Perform initial setup for the DTLB and ITLB.</div><div class='add'>+ * sh64_tlb_init - Perform initial setup for the DTLB and ITLB.</div><div class='ctx'>  */</div><div class='ctx'> int __init sh64_tlb_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -46,9 +44,7 @@ int __init sh64_tlb_init(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * sh64_next_free_dtlb_entry</div><div class='del'>- *</div><div class='del'>- * Find the next available DTLB entry</div><div class='add'>+ * sh64_next_free_dtlb_entry - Find the next available DTLB entry</div><div class='ctx'>  */</div><div class='ctx'> unsigned long long sh64_next_free_dtlb_entry(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -56,9 +52,7 @@ unsigned long long sh64_next_free_dtlb_entry(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * sh64_get_wired_dtlb_entry</div><div class='del'>- *</div><div class='del'>- * Allocate a wired (locked-in) entry in the DTLB</div><div class='add'>+ * sh64_get_wired_dtlb_entry - Allocate a wired (locked-in) entry in the DTLB</div><div class='ctx'>  */</div><div class='ctx'> unsigned long long sh64_get_wired_dtlb_entry(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -71,12 +65,10 @@ unsigned long long sh64_get_wired_dtlb_entry(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * sh64_put_wired_dtlb_entry</div><div class='add'>+ * sh64_put_wired_dtlb_entry - Free a wired (locked-in) entry in the DTLB.</div><div class='ctx'>  *</div><div class='ctx'>  * @entry:	Address of TLB slot.</div><div class='ctx'>  *</div><div class='del'>- * Free a wired (locked-in) entry in the DTLB.</div><div class='del'>- *</div><div class='ctx'>  * Works like a stack, last one to allocate must be first one to free.</div><div class='ctx'>  */</div><div class='ctx'> int sh64_put_wired_dtlb_entry(unsigned long long entry)</div><div class='hunk'>@@ -115,7 +107,7 @@ int sh64_put_wired_dtlb_entry(unsigned long long entry)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * sh64_setup_tlb_slot</div><div class='add'>+ * sh64_setup_tlb_slot - Load up a translation in a wired slot.</div><div class='ctx'>  *</div><div class='ctx'>  * @config_addr:	Address of TLB slot.</div><div class='ctx'>  * @eaddr:		Virtual address.</div><div class='hunk'>@@ -154,7 +146,7 @@ inline void sh64_setup_tlb_slot(unsigned long long config_addr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * sh64_teardown_tlb_slot</div><div class='add'>+ * sh64_teardown_tlb_slot - Teardown a translation.</div><div class='ctx'>  *</div><div class='ctx'>  * @config_addr:	Address of TLB slot.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile<br/>index 6668e6037af6..9592889a6fd0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/Makefile</a></div><div class='hunk'>@@ -52,20 +52,24 @@ endif</div><div class='ctx'> export INIT_Y CORE_Y DRIVERS_Y NET_Y LIBS_Y HEAD_Y kallsyms.o</div><div class='ctx'> </div><div class='ctx'> # Default target</div><div class='del'>-all: image</div><div class='add'>+all: zImage</div><div class='ctx'> </div><div class='ctx'> boot := arch/sparc/boot</div><div class='ctx'> </div><div class='del'>-image tftpboot.img: vmlinux</div><div class='add'>+image zImage tftpboot.img: vmlinux</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@</div><div class='ctx'> </div><div class='ctx'> archclean:</div><div class='ctx'> 	$(Q)$(MAKE) $(clean)=$(boot)</div><div class='ctx'> </div><div class='add'>+# This is the image used for packaging</div><div class='add'>+KBUILD_IMAGE := $(boot)/zImage</div><div class='add'>+</div><div class='ctx'> CLEAN_FILES += arch/$(ARCH)/boot/System.map</div><div class='ctx'> </div><div class='ctx'> # Don't use tabs in echo arguments.</div><div class='ctx'> define archhelp</div><div class='ctx'>   echo  '* image        - kernel image ($(boot)/image)'</div><div class='add'>+  echo  '* zImage       - stripped kernel image ($(boot)/zImage)'</div><div class='ctx'>   echo  '  tftpboot.img - image prepared for tftp'</div><div class='ctx'> endef</div><div class='head'>diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile<br/>index 22d331e1e941..3e77a9f52248 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/boot/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/boot/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/boot/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/boot/Makefile</a></div><div class='hunk'>@@ -19,6 +19,9 @@ quiet_cmd_sysmap        = SYSMAP  $(obj)/System.map</div><div class='ctx'>       cmd_sysmap        = $(CONFIG_SHELL) $(srctree)/scripts/mksysmap</div><div class='ctx'> quiet_cmd_image = LD      $@</div><div class='ctx'>       cmd_image = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) -o $@</div><div class='add'>+quiet_cmd_strip = STRIP   $@</div><div class='add'>+      cmd_strip = $(STRIP) -R .comment -R .note -K sun4u_init -K _end -K _start $(obj)/image -o $@</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> define rule_image</div><div class='ctx'> 	$(if $($(quiet)cmd_image),               \</div><div class='hunk'>@@ -49,6 +52,9 @@ LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds $(BTOBJS) \</div><div class='ctx'> $(obj)/image: $(obj)/btfix.o FORCE</div><div class='ctx'> 	$(call if_changed_rule,image)</div><div class='ctx'> </div><div class='add'>+$(obj)/zImage: $(obj)/image</div><div class='add'>+	$(call if_changed,strip)</div><div class='add'>+</div><div class='ctx'> $(obj)/tftpboot.img: $(obj)/piggyback $(obj)/System.map $(obj)/image FORCE</div><div class='ctx'> 	$(call if_changed,elftoaout)</div><div class='ctx'> 	$(call if_changed,piggy)</div><div class='head'>diff --git a/arch/sparc/include/asm/ebus_32.h b/arch/sparc/include/asm/ebus_32.h<br/>index 29cb7dfc6b79..f91f0b267ce1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/ebus_32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/include/asm/ebus_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/ebus_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/ebus_32.h</a></div><div class='hunk'>@@ -12,9 +12,9 @@</div><div class='ctx'> #ifndef _LINUX_IOPORT_H</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #endif</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct linux_ebus_child {</div><div class='ctx'> 	struct linux_ebus_child		*next;</div><div class='head'>diff --git a/arch/sparc/include/asm/ebus_64.h b/arch/sparc/include/asm/ebus_64.h<br/>index fcc62b97ced5..14c6a111f60c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/ebus_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/include/asm/ebus_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/ebus_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/ebus_64.h</a></div><div class='hunk'>@@ -8,9 +8,10 @@</div><div class='ctx'> #ifndef __SPARC64_EBUS_H</div><div class='ctx'> #define __SPARC64_EBUS_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct linux_ebus_child {</div><div class='ctx'> 	struct linux_ebus_child		*next;</div><div class='head'>diff --git a/arch/sparc/include/asm/futex_64.h b/arch/sparc/include/asm/futex_64.h<br/>index d8378935ae90..47f95839dc69 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/futex_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/include/asm/futex_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/futex_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/futex_64.h</a></div><div class='hunk'>@@ -59,7 +59,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)</div><div class='ctx'> 		__futex_cas_op("or\t%2, %4, %1", ret, oldval, uaddr, oparg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FUTEX_OP_ANDN:</div><div class='del'>-		__futex_cas_op("and\t%2, %4, %1", ret, oldval, uaddr, oparg);</div><div class='add'>+		__futex_cas_op("andn\t%2, %4, %1", ret, oldval, uaddr, oparg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FUTEX_OP_XOR:</div><div class='ctx'> 		__futex_cas_op("xor\t%2, %4, %1", ret, oldval, uaddr, oparg);</div><div class='head'>diff --git a/arch/sparc/include/asm/irq_64.h b/arch/sparc/include/asm/irq_64.h<br/>index 0bb9bf531745..e3dd9303643d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/irq_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/include/asm/irq_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/irq_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/irq_64.h</a></div><div class='hunk'>@@ -90,4 +90,11 @@ static inline unsigned long get_softint(void)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __trigger_all_cpu_backtrace(void);</div><div class='add'>+#define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace()</div><div class='add'>+</div><div class='add'>+extern void *hardirq_stack[NR_CPUS];</div><div class='add'>+extern void *softirq_stack[NR_CPUS];</div><div class='add'>+#define __ARCH_HAS_DO_SOFTIRQ</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/sparc/include/asm/of_device.h b/arch/sparc/include/asm/of_device.h<br/>index e5f5aedc2293..bba777a416d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/of_device.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/include/asm/of_device.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/of_device.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/of_device.h</a></div><div class='hunk'>@@ -30,8 +30,7 @@ struct of_device</div><div class='ctx'> extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name);</div><div class='ctx'> extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size);</div><div class='ctx'> </div><div class='del'>-/* These are just here during the transition */</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='add'>+/* This is just here during the transition */</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='head'>diff --git a/arch/sparc/include/asm/of_platform.h b/arch/sparc/include/asm/of_platform.h<br/>index aa699775ffba..2348ab90a57c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/of_platform.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/include/asm/of_platform.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/of_platform.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/of_platform.h</a></div><div class='hunk'>@@ -1,8 +1,21 @@</div><div class='ctx'> #ifndef ___ASM_SPARC_OF_PLATFORM_H</div><div class='ctx'> #define ___ASM_SPARC_OF_PLATFORM_H</div><div class='del'>-#if defined(__sparc__) &amp;&amp; defined(__arch64__)</div><div class='del'>-#include &lt;asm/of_platform_64.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;asm/of_platform_32.h&gt;</div><div class='del'>-#endif</div><div class='add'>+/*</div><div class='add'>+ *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.</div><div class='add'>+ *			 &lt;benh@kernel.crashing.org&gt;</div><div class='add'>+ *    Modified for Sparc by merging parts of asm/of_device.h</div><div class='add'>+ *		by Stephen Rothwell</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or</div><div class='add'>+ *  modify it under the terms of the GNU General Public License</div><div class='add'>+ *  as published by the Free Software Foundation; either version</div><div class='add'>+ *  2 of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+extern struct bus_type ebus_bus_type;</div><div class='add'>+extern struct bus_type sbus_bus_type;</div><div class='add'>+</div><div class='add'>+#define of_bus_type	of_platform_bus_type	/* for compatibility */</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/sparc/include/asm/of_platform_32.h b/arch/sparc/include/asm/of_platform_32.h<br/>deleted file mode 100644<br/>index 723f7c9b7411..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/of_platform_32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/include/asm/of_platform_32.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-#ifndef _ASM_SPARC_OF_PLATFORM_H</div><div class='del'>-#define _ASM_SPARC_OF_PLATFORM_H</div><div class='del'>-/*</div><div class='del'>- *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.</div><div class='del'>- *			 &lt;benh@kernel.crashing.org&gt;</div><div class='del'>- *    Modified for Sparc by merging parts of asm/of_device.h</div><div class='del'>- *		by Stephen Rothwell</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or</div><div class='del'>- *  modify it under the terms of the GNU General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version</div><div class='del'>- *  2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* This is just here during the transition */</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='del'>-</div><div class='del'>-extern struct bus_type ebus_bus_type;</div><div class='del'>-extern struct bus_type sbus_bus_type;</div><div class='del'>-</div><div class='del'>-#define of_bus_type	of_platform_bus_type	/* for compatibility */</div><div class='del'>-</div><div class='del'>-#endif	/* _ASM_SPARC_OF_PLATFORM_H */</div><div class='head'>diff --git a/arch/sparc/include/asm/of_platform_64.h b/arch/sparc/include/asm/of_platform_64.h<br/>deleted file mode 100644<br/>index 4f66a5f6342d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/of_platform_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/include/asm/of_platform_64.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,25 +0,0 @@</div><div class='del'>-#ifndef _ASM_SPARC64_OF_PLATFORM_H</div><div class='del'>-#define _ASM_SPARC64_OF_PLATFORM_H</div><div class='del'>-/*</div><div class='del'>- *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.</div><div class='del'>- *			 &lt;benh@kernel.crashing.org&gt;</div><div class='del'>- *    Modified for Sparc by merging parts of asm/of_device.h</div><div class='del'>- *		by Stephen Rothwell</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or</div><div class='del'>- *  modify it under the terms of the GNU General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version</div><div class='del'>- *  2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* This is just here during the transition */</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='del'>-</div><div class='del'>-extern struct bus_type isa_bus_type;</div><div class='del'>-extern struct bus_type ebus_bus_type;</div><div class='del'>-extern struct bus_type sbus_bus_type;</div><div class='del'>-</div><div class='del'>-#define of_bus_type	of_platform_bus_type	/* for compatibility */</div><div class='del'>-</div><div class='del'>-#endif	/* _ASM_SPARC64_OF_PLATFORM_H */</div><div class='head'>diff --git a/arch/sparc/include/asm/parport.h b/arch/sparc/include/asm/parport.h<br/>index 7818b2523b8d..d9830621c906 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/parport.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/include/asm/parport.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/parport.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/parport.h</a></div><div class='hunk'>@@ -6,9 +6,10 @@</div><div class='ctx'> #ifndef _ASM_SPARC64_PARPORT_H</div><div class='ctx'> #define _ASM_SPARC64_PARPORT_H 1</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/ebus.h&gt;</div><div class='ctx'> #include &lt;asm/ns87303.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PARPORT_PC_MAX_PORTS	PARPORT_MAX</div><div class='head'>diff --git a/arch/sparc/include/asm/ptrace_32.h b/arch/sparc/include/asm/ptrace_32.h<br/>index d43c88b86834..d409c4f21a5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/ptrace_32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/include/asm/ptrace_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/ptrace_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/ptrace_32.h</a></div><div class='hunk'>@@ -40,16 +40,6 @@ struct pt_regs {</div><div class='ctx'> #define UREG_FP        UREG_I6</div><div class='ctx'> #define UREG_RETPC     UREG_I7</div><div class='ctx'> </div><div class='del'>-static inline bool pt_regs_is_syscall(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	return (regs-&gt;psr &amp; PSR_SYSCALL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool pt_regs_clear_syscall(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	return (regs-&gt;psr &amp;= ~PSR_SYSCALL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* A register window */</div><div class='ctx'> struct reg_window {</div><div class='ctx'> 	unsigned long locals[8];</div><div class='hunk'>@@ -72,6 +62,16 @@ struct sparc_stackf {</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='add'>+static inline bool pt_regs_is_syscall(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return (regs-&gt;psr &amp; PSR_SYSCALL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool pt_regs_clear_syscall(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return (regs-&gt;psr &amp;= ~PSR_SYSCALL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define user_mode(regs) (!((regs)-&gt;psr &amp; PSR_PS))</div><div class='ctx'> #define instruction_pointer(regs) ((regs)-&gt;pc)</div><div class='ctx'> #define user_stack_pointer(regs) ((regs)-&gt;u_regs[UREG_FP])</div><div class='head'>diff --git a/arch/sparc/include/asm/ptrace_64.h b/arch/sparc/include/asm/ptrace_64.h<br/>index ec6d45c84cd0..06e4914c13f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/ptrace_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/include/asm/ptrace_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/ptrace_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/ptrace_64.h</a></div><div class='hunk'>@@ -37,21 +37,6 @@ struct pt_regs {</div><div class='ctx'> 	unsigned int magic;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline int pt_regs_trap_type(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	return regs-&gt;magic &amp; 0x1ff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool pt_regs_is_syscall(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	return (regs-&gt;tstate &amp; TSTATE_SYSCALL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool pt_regs_clear_syscall(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	return (regs-&gt;tstate &amp;= ~TSTATE_SYSCALL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct pt_regs32 {</div><div class='ctx'> 	unsigned int psr;</div><div class='ctx'> 	unsigned int pc;</div><div class='hunk'>@@ -128,15 +113,30 @@ struct sparc_trapf {</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='add'>+static inline int pt_regs_trap_type(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return regs-&gt;magic &amp; 0x1ff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool pt_regs_is_syscall(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return (regs-&gt;tstate &amp; TSTATE_SYSCALL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool pt_regs_clear_syscall(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return (regs-&gt;tstate &amp;= ~TSTATE_SYSCALL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct global_reg_snapshot {</div><div class='ctx'> 	unsigned long		tstate;</div><div class='ctx'> 	unsigned long		tpc;</div><div class='ctx'> 	unsigned long		tnpc;</div><div class='ctx'> 	unsigned long		o7;</div><div class='ctx'> 	unsigned long		i7;</div><div class='add'>+	unsigned long		rpc;</div><div class='ctx'> 	struct thread_info	*thread;</div><div class='ctx'> 	unsigned long		pad1;</div><div class='del'>-	unsigned long		pad2;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define __ARCH_WANT_COMPAT_SYS_PTRACE</div><div class='hunk'>@@ -154,7 +154,6 @@ extern unsigned long profile_pc(struct pt_regs *);</div><div class='ctx'> #define profile_pc(regs) instruction_pointer(regs)</div><div class='ctx'> #endif</div><div class='ctx'> extern void show_regs(struct pt_regs *);</div><div class='del'>-extern void __show_regs(struct pt_regs *);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #else /* __ASSEMBLY__ */</div><div class='hunk'>@@ -315,9 +314,9 @@ extern void __show_regs(struct pt_regs *);</div><div class='ctx'> #define GR_SNAP_TNPC	0x10</div><div class='ctx'> #define GR_SNAP_O7	0x18</div><div class='ctx'> #define GR_SNAP_I7	0x20</div><div class='del'>-#define GR_SNAP_THREAD	0x28</div><div class='del'>-#define GR_SNAP_PAD1	0x30</div><div class='del'>-#define GR_SNAP_PAD2	0x38</div><div class='add'>+#define GR_SNAP_RPC	0x28</div><div class='add'>+#define GR_SNAP_THREAD	0x30</div><div class='add'>+#define GR_SNAP_PAD1	0x38</div><div class='ctx'> </div><div class='ctx'> #endif  /*  __KERNEL__  */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/include/asm/sbus_32.h b/arch/sparc/include/asm/sbus_32.h<br/>index 77b5d3aadc99..a7b4fa21931d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/sbus_32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/include/asm/sbus_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/sbus_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/sbus_32.h</a></div><div class='hunk'>@@ -9,10 +9,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/scatterlist.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* We scan which devices are on the SBus using the PROM node device</div><div class='head'>diff --git a/arch/sparc/include/asm/sbus_64.h b/arch/sparc/include/asm/sbus_64.h<br/>index 0e16b6dd7e96..b606c14343fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/sbus_64.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/include/asm/sbus_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/sbus_64.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/sbus_64.h</a></div><div class='hunk'>@@ -8,10 +8,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='ctx'> #include &lt;asm/scatterlist.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/include/asm/smp_32.h b/arch/sparc/include/asm/smp_32.h<br/>index 7201752cf934..a8180e546a48 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/smp_32.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/include/asm/smp_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/smp_32.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/include/asm/smp_32.h</a></div><div class='hunk'>@@ -50,27 +50,24 @@ struct seq_file;</div><div class='ctx'> void smp_bogo(struct seq_file *);</div><div class='ctx'> void smp_info(struct seq_file *);</div><div class='ctx'> </div><div class='del'>-BTFIXUPDEF_CALL(void, smp_cross_call, smpfunc_t, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long)</div><div class='add'>+BTFIXUPDEF_CALL(void, smp_cross_call, smpfunc_t, cpumask_t, unsigned long, unsigned long, unsigned long, unsigned long)</div><div class='ctx'> BTFIXUPDEF_CALL(int, __hard_smp_processor_id, void)</div><div class='ctx'> BTFIXUPDEF_BLACKBOX(hard_smp_processor_id)</div><div class='ctx'> BTFIXUPDEF_BLACKBOX(load_current)</div><div class='ctx'> </div><div class='del'>-#define smp_cross_call(func,arg1,arg2,arg3,arg4,arg5) BTFIXUP_CALL(smp_cross_call)(func,arg1,arg2,arg3,arg4,arg5)</div><div class='add'>+#define smp_cross_call(func,mask,arg1,arg2,arg3,arg4) BTFIXUP_CALL(smp_cross_call)(func,mask,arg1,arg2,arg3,arg4)</div><div class='ctx'> </div><div class='del'>-static inline void xc0(smpfunc_t func) { smp_cross_call(func, 0, 0, 0, 0, 0); }</div><div class='add'>+static inline void xc0(smpfunc_t func) { smp_cross_call(func, cpu_online_map, 0, 0, 0, 0); }</div><div class='ctx'> static inline void xc1(smpfunc_t func, unsigned long arg1)</div><div class='del'>-{ smp_cross_call(func, arg1, 0, 0, 0, 0); }</div><div class='add'>+{ smp_cross_call(func, cpu_online_map, arg1, 0, 0, 0); }</div><div class='ctx'> static inline void xc2(smpfunc_t func, unsigned long arg1, unsigned long arg2)</div><div class='del'>-{ smp_cross_call(func, arg1, arg2, 0, 0, 0); }</div><div class='add'>+{ smp_cross_call(func, cpu_online_map, arg1, arg2, 0, 0); }</div><div class='ctx'> static inline void xc3(smpfunc_t func, unsigned long arg1, unsigned long arg2,</div><div class='ctx'> 			   unsigned long arg3)</div><div class='del'>-{ smp_cross_call(func, arg1, arg2, arg3, 0, 0); }</div><div class='add'>+{ smp_cross_call(func, cpu_online_map, arg1, arg2, arg3, 0); }</div><div class='ctx'> static inline void xc4(smpfunc_t func, unsigned long arg1, unsigned long arg2,</div><div class='ctx'> 			   unsigned long arg3, unsigned long arg4)</div><div class='del'>-{ smp_cross_call(func, arg1, arg2, arg3, arg4, 0); }</div><div class='del'>-static inline void xc5(smpfunc_t func, unsigned long arg1, unsigned long arg2,</div><div class='del'>-			   unsigned long arg3, unsigned long arg4, unsigned long arg5)</div><div class='del'>-{ smp_cross_call(func, arg1, arg2, arg3, arg4, arg5); }</div><div class='add'>+{ smp_cross_call(func, cpu_online_map, arg1, arg2, arg3, arg4); }</div><div class='ctx'> </div><div class='ctx'> static inline int smp_call_function(void (*func)(void *info), void *info, int wait)</div><div class='ctx'> {</div><div class='hunk'>@@ -78,6 +75,14 @@ static inline int smp_call_function(void (*func)(void *info), void *info, int wa</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int smp_call_function_single(int cpuid, void (*func) (void *info),</div><div class='add'>+					   void *info, int wait)</div><div class='add'>+{</div><div class='add'>+	smp_cross_call((smpfunc_t)func, cpumask_of_cpu(cpuid),</div><div class='add'>+		       (unsigned long) info, 0, 0, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int cpu_logical_map(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	return cpu;</div><div class='head'>diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c<br/>index 487960919f1f..2a8a847764d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/ioport.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/kernel/ioport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/ioport.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/kernel/ioport.c</a></div><div class='hunk'>@@ -36,12 +36,12 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;		/* struct pci_dev */</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/vaddrs.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c<br/>index cc4c235c4f59..f58c537446a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/of_device.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/kernel/of_device.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/of_device.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/kernel/of_device.c</a></div><div class='hunk'>@@ -70,7 +70,7 @@ struct of_bus {</div><div class='ctx'> 				       int *addrc, int *sizec);</div><div class='ctx'> 	int		(*map)(u32 *addr, const u32 *range,</div><div class='ctx'> 			       int na, int ns, int pna);</div><div class='del'>-	unsigned int	(*get_flags)(const u32 *addr);</div><div class='add'>+	unsigned long	(*get_flags)(const u32 *addr, unsigned long);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -130,8 +130,10 @@ static int of_bus_default_map(u32 *addr, const u32 *range,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int of_bus_default_get_flags(const u32 *addr)</div><div class='add'>+static unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags)</div><div class='ctx'> {</div><div class='add'>+	if (flags)</div><div class='add'>+		return flags;</div><div class='ctx'> 	return IORESOURCE_MEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -194,17 +196,21 @@ static int of_bus_pci_map(u32 *addr, const u32 *range,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int of_bus_pci_get_flags(const u32 *addr)</div><div class='add'>+static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)</div><div class='ctx'> {</div><div class='del'>-	unsigned int flags = 0;</div><div class='ctx'> 	u32 w = addr[0];</div><div class='ctx'> </div><div class='add'>+	/* For PCI, we override whatever child busses may have used.  */</div><div class='add'>+	flags = 0;</div><div class='ctx'> 	switch((w &gt;&gt; 24) &amp; 0x03) {</div><div class='ctx'> 	case 0x01:</div><div class='ctx'> 		flags |= IORESOURCE_IO;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case 0x02: /* 32 bits */</div><div class='ctx'> 	case 0x03: /* 64 bits */</div><div class='ctx'> 		flags |= IORESOURCE_MEM;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (w &amp; 0x40000000)</div><div class='ctx'> 		flags |= IORESOURCE_PREFETCH;</div><div class='hunk'>@@ -235,7 +241,7 @@ static int of_bus_sbus_map(u32 *addr, const u32 *range, int na, int ns, int pna)</div><div class='ctx'> 	return of_bus_default_map(addr, range, na, ns, pna);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int of_bus_sbus_get_flags(const u32 *addr)</div><div class='add'>+static unsigned long of_bus_sbus_get_flags(const u32 *addr, unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	return IORESOURCE_MEM;</div><div class='ctx'> }</div><div class='hunk'>@@ -362,10 +368,11 @@ static void __init build_device_resources(struct of_device *op,</div><div class='ctx'> 		int pna, pns;</div><div class='ctx'> </div><div class='ctx'> 		size = of_read_addr(reg + na, ns);</div><div class='del'>-		flags = bus-&gt;get_flags(reg);</div><div class='ctx'> </div><div class='ctx'> 		memcpy(addr, reg, na * 4);</div><div class='ctx'> </div><div class='add'>+		flags = bus-&gt;get_flags(reg, 0);</div><div class='add'>+</div><div class='ctx'> 		/* If the immediate parent has no ranges property to apply,</div><div class='ctx'> 		 * just use a 1&lt;-&gt;1 mapping.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -393,6 +400,8 @@ static void __init build_device_resources(struct of_device *op,</div><div class='ctx'> 					       dna, dns, pna))</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='add'>+			flags = pbus-&gt;get_flags(addr, flags);</div><div class='add'>+</div><div class='ctx'> 			dna = pna;</div><div class='ctx'> 			dns = pns;</div><div class='ctx'> 			dbus = pbus;</div><div class='head'>diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c<br/>index 20699c701412..8ce6285a06d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/ptrace.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/ptrace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/kernel/ptrace.c</a></div><div class='hunk'>@@ -288,7 +288,7 @@ static const struct user_regset sparc32_regsets[] = {</div><div class='ctx'> 	 */</div><div class='ctx'> 	[REGSET_GENERAL] = {</div><div class='ctx'> 		.core_note_type = NT_PRSTATUS,</div><div class='del'>-		.n = 38 * sizeof(u32),</div><div class='add'>+		.n = 38,</div><div class='ctx'> 		.size = sizeof(u32), .align = sizeof(u32),</div><div class='ctx'> 		.get = genregs32_get, .set = genregs32_set</div><div class='ctx'> 	},</div><div class='hunk'>@@ -304,7 +304,7 @@ static const struct user_regset sparc32_regsets[] = {</div><div class='ctx'> 	 */</div><div class='ctx'> 	[REGSET_FP] = {</div><div class='ctx'> 		.core_note_type = NT_PRFPREG,</div><div class='del'>-		.n = 99 * sizeof(u32),</div><div class='add'>+		.n = 99,</div><div class='ctx'> 		.size = sizeof(u32), .align = sizeof(u32),</div><div class='ctx'> 		.get = fpregs32_get, .set = fpregs32_set</div><div class='ctx'> 	},</div><div class='head'>diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c<br/>index dfde77ff0848..69596402a500 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sun4d_smp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/kernel/sun4d_smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sun4d_smp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/kernel/sun4d_smp.c</a></div><div class='hunk'>@@ -262,8 +262,9 @@ static struct smp_funcall {</div><div class='ctx'> static DEFINE_SPINLOCK(cross_call_lock);</div><div class='ctx'> </div><div class='ctx'> /* Cross calls must be serialized, at least currently. */</div><div class='del'>-void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2,</div><div class='del'>-		    unsigned long arg3, unsigned long arg4, unsigned long arg5)</div><div class='add'>+static void smp4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,</div><div class='add'>+			     unsigned long arg2, unsigned long arg3,</div><div class='add'>+			     unsigned long arg4)</div><div class='ctx'> {</div><div class='ctx'> 	if(smp_processors_ready) {</div><div class='ctx'> 		register int high = smp_highest_cpu;</div><div class='hunk'>@@ -278,7 +279,7 @@ void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2,</div><div class='ctx'> 			register unsigned long a2 asm("i2") = arg2;</div><div class='ctx'> 			register unsigned long a3 asm("i3") = arg3;</div><div class='ctx'> 			register unsigned long a4 asm("i4") = arg4;</div><div class='del'>-			register unsigned long a5 asm("i5") = arg5;</div><div class='add'>+			register unsigned long a5 asm("i5") = 0;</div><div class='ctx'> </div><div class='ctx'> 			__asm__ __volatile__(</div><div class='ctx'> 				"std %0, [%6]\n\t"</div><div class='hunk'>@@ -290,11 +291,10 @@ void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2,</div><div class='ctx'> </div><div class='ctx'> 		/* Init receive/complete mapping, plus fire the IPI's off. */</div><div class='ctx'> 		{</div><div class='del'>-			cpumask_t mask;</div><div class='ctx'> 			register int i;</div><div class='ctx'> </div><div class='del'>-			mask = cpumask_of_cpu(hard_smp4d_processor_id());</div><div class='del'>-			cpus_andnot(mask, cpu_online_map, mask);</div><div class='add'>+			cpu_clear(smp_processor_id(), mask);</div><div class='add'>+			cpus_and(mask, cpu_online_map, mask);</div><div class='ctx'> 			for(i = 0; i &lt;= high; i++) {</div><div class='ctx'> 				if (cpu_isset(i, mask)) {</div><div class='ctx'> 					ccall_info.processors_in[i] = 0;</div><div class='hunk'>@@ -309,12 +309,16 @@ void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2,</div><div class='ctx'> </div><div class='ctx'> 			i = 0;</div><div class='ctx'> 			do {</div><div class='add'>+				if (!cpu_isset(i, mask))</div><div class='add'>+					continue;</div><div class='ctx'> 				while(!ccall_info.processors_in[i])</div><div class='ctx'> 					barrier();</div><div class='ctx'> 			} while(++i &lt;= high);</div><div class='ctx'> </div><div class='ctx'> 			i = 0;</div><div class='ctx'> 			do {</div><div class='add'>+				if (!cpu_isset(i, mask))</div><div class='add'>+					continue;</div><div class='ctx'> 				while(!ccall_info.processors_out[i])</div><div class='ctx'> 					barrier();</div><div class='ctx'> 			} while(++i &lt;= high);</div><div class='head'>diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c<br/>index 406ac1abc83a..a14a76ac7f36 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sun4m_smp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/kernel/sun4m_smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sun4m_smp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/kernel/sun4m_smp.c</a></div><div class='hunk'>@@ -244,9 +244,9 @@ static struct smp_funcall {</div><div class='ctx'> static DEFINE_SPINLOCK(cross_call_lock);</div><div class='ctx'> </div><div class='ctx'> /* Cross calls must be serialized, at least currently. */</div><div class='del'>-static void smp4m_cross_call(smpfunc_t func, unsigned long arg1,</div><div class='add'>+static void smp4m_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,</div><div class='ctx'> 			     unsigned long arg2, unsigned long arg3,</div><div class='del'>-			     unsigned long arg4, unsigned long arg5)</div><div class='add'>+			     unsigned long arg4)</div><div class='ctx'> {</div><div class='ctx'> 		register int ncpus = SUN4M_NCPUS;</div><div class='ctx'> 		unsigned long flags;</div><div class='hunk'>@@ -259,14 +259,14 @@ static void smp4m_cross_call(smpfunc_t func, unsigned long arg1,</div><div class='ctx'> 		ccall_info.arg2 = arg2;</div><div class='ctx'> 		ccall_info.arg3 = arg3;</div><div class='ctx'> 		ccall_info.arg4 = arg4;</div><div class='del'>-		ccall_info.arg5 = arg5;</div><div class='add'>+		ccall_info.arg5 = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* Init receive/complete mapping, plus fire the IPI's off. */</div><div class='ctx'> 		{</div><div class='del'>-			cpumask_t mask = cpu_online_map;</div><div class='ctx'> 			register int i;</div><div class='ctx'> </div><div class='ctx'> 			cpu_clear(smp_processor_id(), mask);</div><div class='add'>+			cpus_and(mask, cpu_online_map, mask);</div><div class='ctx'> 			for(i = 0; i &lt; ncpus; i++) {</div><div class='ctx'> 				if (cpu_isset(i, mask)) {</div><div class='ctx'> 					ccall_info.processors_in[i] = 0;</div><div class='hunk'>@@ -284,12 +284,16 @@ static void smp4m_cross_call(smpfunc_t func, unsigned long arg1,</div><div class='ctx'> </div><div class='ctx'> 			i = 0;</div><div class='ctx'> 			do {</div><div class='add'>+				if (!cpu_isset(i, mask))</div><div class='add'>+					continue;</div><div class='ctx'> 				while(!ccall_info.processors_in[i])</div><div class='ctx'> 					barrier();</div><div class='ctx'> 			} while(++i &lt; ncpus);</div><div class='ctx'> </div><div class='ctx'> 			i = 0;</div><div class='ctx'> 			do {</div><div class='add'>+				if (!cpu_isset(i, mask))</div><div class='add'>+					continue;</div><div class='ctx'> 				while(!ccall_info.processors_out[i])</div><div class='ctx'> 					barrier();</div><div class='ctx'> 			} while(++i &lt; ncpus);</div><div class='head'>diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c<br/>index ab3dd0b257d3..0762f5db1924 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc/kernel/time.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='hunk'>@@ -40,7 +41,6 @@</div><div class='ctx'> #include &lt;asm/sun4paddr.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pcic.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/irq_regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "irq.h"</div><div class='head'>diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig<br/>index 923a98959fa7..36b4b7ab9cfb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/Kconfig</a></div><div class='hunk'>@@ -231,6 +231,7 @@ endmenu</div><div class='ctx'> </div><div class='ctx'> config NUMA</div><div class='ctx'> 	bool "NUMA support"</div><div class='add'>+	depends on SMP</div><div class='ctx'> </div><div class='ctx'> config NODES_SHIFT</div><div class='ctx'> 	int</div><div class='head'>diff --git a/arch/sparc64/kernel/auxio.c b/arch/sparc64/kernel/auxio.c<br/>index c55f0293eacd..dd5c7bf87619 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/auxio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/auxio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/auxio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/auxio.c</a></div><div class='hunk'>@@ -9,9 +9,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c<br/>index 4d58d7ce708d..60d36d142559 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/ebus.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/ebus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/ebus.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/ebus.c</a></div><div class='hunk'>@@ -14,13 +14,13 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/ebus.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/bpp.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c<br/>index c481673d249c..7495bc774685 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/irq.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='hunk'>@@ -682,10 +683,32 @@ void ack_bad_irq(unsigned int virt_irq)</div><div class='ctx'> 	       ino, virt_irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void *hardirq_stack[NR_CPUS];</div><div class='add'>+void *softirq_stack[NR_CPUS];</div><div class='add'>+</div><div class='add'>+static __attribute__((always_inline)) void *set_hardirq_stack(void)</div><div class='add'>+{</div><div class='add'>+	void *orig_sp, *sp = hardirq_stack[smp_processor_id()];</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__("mov %%sp, %0" : "=r" (orig_sp));</div><div class='add'>+	if (orig_sp &lt; sp ||</div><div class='add'>+	    orig_sp &gt; (sp + THREAD_SIZE)) {</div><div class='add'>+		sp += THREAD_SIZE - 192 - STACK_BIAS;</div><div class='add'>+		__asm__ __volatile__("mov %0, %%sp" : : "r" (sp));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return orig_sp;</div><div class='add'>+}</div><div class='add'>+static __attribute__((always_inline)) void restore_hardirq_stack(void *orig_sp)</div><div class='add'>+{</div><div class='add'>+	__asm__ __volatile__("mov %0, %%sp" : : "r" (orig_sp));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void handler_irq(int irq, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pstate, bucket_pa;</div><div class='ctx'> 	struct pt_regs *old_regs;</div><div class='add'>+	void *orig_sp;</div><div class='ctx'> </div><div class='ctx'> 	clear_softint(1 &lt;&lt; irq);</div><div class='ctx'> </div><div class='hunk'>@@ -703,6 +726,8 @@ void handler_irq(int irq, struct pt_regs *regs)</div><div class='ctx'> 			       "i" (PSTATE_IE)</div><div class='ctx'> 			     : "memory");</div><div class='ctx'> </div><div class='add'>+	orig_sp = set_hardirq_stack();</div><div class='add'>+</div><div class='ctx'> 	while (bucket_pa) {</div><div class='ctx'> 		struct irq_desc *desc;</div><div class='ctx'> 		unsigned long next_pa;</div><div class='hunk'>@@ -719,10 +744,38 @@ void handler_irq(int irq, struct pt_regs *regs)</div><div class='ctx'> 		bucket_pa = next_pa;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	restore_hardirq_stack(orig_sp);</div><div class='add'>+</div><div class='ctx'> 	irq_exit();</div><div class='ctx'> 	set_irq_regs(old_regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void do_softirq(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (in_interrupt())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+</div><div class='add'>+	if (local_softirq_pending()) {</div><div class='add'>+		void *orig_sp, *sp = softirq_stack[smp_processor_id()];</div><div class='add'>+</div><div class='add'>+		sp += THREAD_SIZE - 192 - STACK_BIAS;</div><div class='add'>+</div><div class='add'>+		__asm__ __volatile__("mov %%sp, %0\n\t"</div><div class='add'>+				     "mov %1, %%sp"</div><div class='add'>+				     : "=&amp;r" (orig_sp)</div><div class='add'>+				     : "r" (sp));</div><div class='add'>+		__do_softirq();</div><div class='add'>+		__asm__ __volatile__("mov %0, %%sp"</div><div class='add'>+				     : : "r" (orig_sp));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> void fixup_irqs(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -740,6 +793,8 @@ void fixup_irqs(void)</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;irq_desc[irq].lock, flags);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	tick_ops-&gt;disable_irq();</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -812,7 +867,7 @@ static void kill_prom_timer(void)</div><div class='ctx'> 	: "g1", "g2");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void init_irqwork_curcpu(void)</div><div class='add'>+void notrace init_irqwork_curcpu(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = hard_smp_processor_id();</div><div class='ctx'> </div><div class='hunk'>@@ -843,7 +898,7 @@ static void __cpuinit register_one_mondo(unsigned long paddr, unsigned long type</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __cpuinit sun4v_register_mondo_queues(int this_cpu)</div><div class='add'>+void __cpuinit notrace sun4v_register_mondo_queues(int this_cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct trap_per_cpu *tb = &amp;trap_block[this_cpu];</div><div class='ctx'> </div><div class='hunk'>@@ -915,12 +970,18 @@ static void __init sun4v_init_mondo_queues(void)</div><div class='ctx'> 		alloc_one_mondo(&amp;tb-&gt;nonresum_mondo_pa, tb-&gt;nonresum_qmask);</div><div class='ctx'> 		alloc_one_kbuf(&amp;tb-&gt;nonresum_kernel_buf_pa,</div><div class='ctx'> 			       tb-&gt;nonresum_qmask);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init init_send_mondo_info(void)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		struct trap_per_cpu *tb = &amp;trap_block[cpu];</div><div class='ctx'> </div><div class='ctx'> 		init_cpu_send_mondo_info(tb);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* Load up the boot cpu's entries.  */</div><div class='del'>-	sun4v_register_mondo_queues(hard_smp_processor_id());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct irqaction timer_irq_action = {</div><div class='hunk'>@@ -949,6 +1010,13 @@ void __init init_IRQ(void)</div><div class='ctx'> 	if (tlb_type == hypervisor)</div><div class='ctx'> 		sun4v_init_mondo_queues();</div><div class='ctx'> </div><div class='add'>+	init_send_mondo_info();</div><div class='add'>+</div><div class='add'>+	if (tlb_type == hypervisor) {</div><div class='add'>+		/* Load up the boot cpu's entries.  */</div><div class='add'>+		sun4v_register_mondo_queues(hard_smp_processor_id());</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* We need to clear any IRQ's pending in the soft interrupt</div><div class='ctx'> 	 * registers, a spurious one could be left around from the</div><div class='ctx'> 	 * PROM timer which we just disabled.</div><div class='head'>diff --git a/arch/sparc64/kernel/kstack.h b/arch/sparc64/kernel/kstack.h<br/>new file mode 100644<br/>index 000000000000..4248d969272f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/kstack.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/kstack.h</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+#ifndef _KSTACK_H</div><div class='add'>+#define _KSTACK_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/thread_info.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+/* SP must be STACK_BIAS adjusted already.  */</div><div class='add'>+static inline bool kstack_valid(struct thread_info *tp, unsigned long sp)</div><div class='add'>+{</div><div class='add'>+	unsigned long base = (unsigned long) tp;</div><div class='add'>+</div><div class='add'>+	if (sp &gt;= (base + sizeof(struct thread_info)) &amp;&amp;</div><div class='add'>+	    sp &lt;= (base + THREAD_SIZE - sizeof(struct sparc_stackf)))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (hardirq_stack[tp-&gt;cpu]) {</div><div class='add'>+		base = (unsigned long) hardirq_stack[tp-&gt;cpu];</div><div class='add'>+		if (sp &gt;= base &amp;&amp;</div><div class='add'>+		    sp &lt;= (base + THREAD_SIZE - sizeof(struct sparc_stackf)))</div><div class='add'>+			return true;</div><div class='add'>+		base = (unsigned long) softirq_stack[tp-&gt;cpu];</div><div class='add'>+		if (sp &gt;= base &amp;&amp;</div><div class='add'>+		    sp &lt;= (base + THREAD_SIZE - sizeof(struct sparc_stackf)))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Does "regs" point to a valid pt_regs trap frame?  */</div><div class='add'>+static inline bool kstack_is_trap_frame(struct thread_info *tp, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned long base = (unsigned long) tp;</div><div class='add'>+	unsigned long addr = (unsigned long) regs;</div><div class='add'>+</div><div class='add'>+	if (addr &gt;= base &amp;&amp;</div><div class='add'>+	    addr &lt;= (base + THREAD_SIZE - sizeof(*regs)))</div><div class='add'>+		goto check_magic;</div><div class='add'>+</div><div class='add'>+	if (hardirq_stack[tp-&gt;cpu]) {</div><div class='add'>+		base = (unsigned long) hardirq_stack[tp-&gt;cpu];</div><div class='add'>+		if (addr &gt;= base &amp;&amp;</div><div class='add'>+		    addr &lt;= (base + THREAD_SIZE - sizeof(*regs)))</div><div class='add'>+			goto check_magic;</div><div class='add'>+		base = (unsigned long) softirq_stack[tp-&gt;cpu];</div><div class='add'>+		if (addr &gt;= base &amp;&amp;</div><div class='add'>+		    addr &lt;= (base + THREAD_SIZE - sizeof(*regs)))</div><div class='add'>+			goto check_magic;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+</div><div class='add'>+check_magic:</div><div class='add'>+	if ((regs-&gt;magic &amp; ~0x1ff) == PT_REGS_MAGIC)</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _KSTACK_H */</div><div class='head'>diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c<br/>index 4fd48ab7dda4..f845f150f565 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/of_device.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/of_device.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/of_device.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/of_device.c</a></div><div class='hunk'>@@ -56,9 +56,6 @@ struct of_device *of_find_device_by_node(struct device_node *dp)</div><div class='ctx'> EXPORT_SYMBOL(of_find_device_by_node);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-struct bus_type isa_bus_type;</div><div class='del'>-EXPORT_SYMBOL(isa_bus_type);</div><div class='del'>-</div><div class='ctx'> struct bus_type ebus_bus_type;</div><div class='ctx'> EXPORT_SYMBOL(ebus_bus_type);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -99,7 +96,7 @@ struct of_bus {</div><div class='ctx'> 				       int *addrc, int *sizec);</div><div class='ctx'> 	int		(*map)(u32 *addr, const u32 *range,</div><div class='ctx'> 			       int na, int ns, int pna);</div><div class='del'>-	unsigned int	(*get_flags)(const u32 *addr);</div><div class='add'>+	unsigned long	(*get_flags)(const u32 *addr, unsigned long);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -159,8 +156,10 @@ static int of_bus_default_map(u32 *addr, const u32 *range,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int of_bus_default_get_flags(const u32 *addr)</div><div class='add'>+static unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags)</div><div class='ctx'> {</div><div class='add'>+	if (flags)</div><div class='add'>+		return flags;</div><div class='ctx'> 	return IORESOURCE_MEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -252,17 +251,21 @@ static int of_bus_pci_map(u32 *addr, const u32 *range,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int of_bus_pci_get_flags(const u32 *addr)</div><div class='add'>+static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)</div><div class='ctx'> {</div><div class='del'>-	unsigned int flags = 0;</div><div class='ctx'> 	u32 w = addr[0];</div><div class='ctx'> </div><div class='add'>+	/* For PCI, we override whatever child busses may have used.  */</div><div class='add'>+	flags = 0;</div><div class='ctx'> 	switch((w &gt;&gt; 24) &amp; 0x03) {</div><div class='ctx'> 	case 0x01:</div><div class='ctx'> 		flags |= IORESOURCE_IO;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case 0x02: /* 32 bits */</div><div class='ctx'> 	case 0x03: /* 64 bits */</div><div class='ctx'> 		flags |= IORESOURCE_MEM;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (w &amp; 0x40000000)</div><div class='ctx'> 		flags |= IORESOURCE_PREFETCH;</div><div class='hunk'>@@ -481,10 +484,10 @@ static void __init build_device_resources(struct of_device *op,</div><div class='ctx'> 		int pna, pns;</div><div class='ctx'> </div><div class='ctx'> 		size = of_read_addr(reg + na, ns);</div><div class='del'>-		flags = bus-&gt;get_flags(reg);</div><div class='del'>-</div><div class='ctx'> 		memcpy(addr, reg, na * 4);</div><div class='ctx'> </div><div class='add'>+		flags = bus-&gt;get_flags(addr, 0);</div><div class='add'>+</div><div class='ctx'> 		if (use_1to1_mapping(pp)) {</div><div class='ctx'> 			result = of_read_addr(addr, na);</div><div class='ctx'> 			goto build_res;</div><div class='hunk'>@@ -509,6 +512,8 @@ static void __init build_device_resources(struct of_device *op,</div><div class='ctx'> 					       dna, dns, pna))</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='add'>+			flags = pbus-&gt;get_flags(addr, flags);</div><div class='add'>+</div><div class='ctx'> 			dna = pna;</div><div class='ctx'> 			dns = pns;</div><div class='ctx'> 			dbus = pbus;</div><div class='hunk'>@@ -842,8 +847,6 @@ static int __init of_bus_driver_init(void)</div><div class='ctx'> 	err = of_bus_type_init(&amp;of_platform_bus_type, "of");</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> 	if (!err)</div><div class='del'>-		err = of_bus_type_init(&amp;isa_bus_type, "isa");</div><div class='del'>-	if (!err)</div><div class='ctx'> 		err = of_bus_type_init(&amp;ebus_bus_type, "ebus");</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c<br/>index 19fa621d6a60..09a5ec200c61 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_common.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/pci_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/pci_common.c</a></div><div class='hunk'>@@ -8,9 +8,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pci_impl.h"</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c<br/>index 994dbe0603da..f85b6bebb0be 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_psycho.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/pci_psycho.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_psycho.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/pci_psycho.c</a></div><div class='hunk'>@@ -11,12 +11,12 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/starfire.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pci_impl.h"</div><div class='hunk'>@@ -575,7 +575,7 @@ static irqreturn_t psycho_pcierr_intr_other(struct pci_pbm_info *pbm, int is_pbm</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long csr_reg, csr, csr_error_bits;</div><div class='ctx'> 	irqreturn_t ret = IRQ_NONE;</div><div class='del'>-	u16 stat;</div><div class='add'>+	u16 stat, *addr;</div><div class='ctx'> </div><div class='ctx'> 	if (is_pbm_a) {</div><div class='ctx'> 		csr_reg = pbm-&gt;controller_regs + PSYCHO_PCIA_CTRL;</div><div class='hunk'>@@ -597,7 +597,9 @@ static irqreturn_t psycho_pcierr_intr_other(struct pci_pbm_info *pbm, int is_pbm</div><div class='ctx'> 			printk("%s: PCI SERR signal asserted.\n", pbm-&gt;name);</div><div class='ctx'> 		ret = IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='del'>-	pci_read_config_word(pbm-&gt;pci_bus-&gt;self, PCI_STATUS, &amp;stat);</div><div class='add'>+	addr = psycho_pci_config_mkaddr(pbm, pbm-&gt;pci_first_busno,</div><div class='add'>+					0, PCI_STATUS);</div><div class='add'>+	pci_config_read16(addr, &amp;stat);</div><div class='ctx'> 	if (stat &amp; (PCI_STATUS_PARITY |</div><div class='ctx'> 		    PCI_STATUS_SIG_TARGET_ABORT |</div><div class='ctx'> 		    PCI_STATUS_REC_TARGET_ABORT |</div><div class='hunk'>@@ -605,7 +607,7 @@ static irqreturn_t psycho_pcierr_intr_other(struct pci_pbm_info *pbm, int is_pbm</div><div class='ctx'> 		    PCI_STATUS_SIG_SYSTEM_ERROR)) {</div><div class='ctx'> 		printk("%s: PCI bus error, PCI_STATUS[%04x]\n",</div><div class='ctx'> 		       pbm-&gt;name, stat);</div><div class='del'>-		pci_write_config_word(pbm-&gt;pci_bus-&gt;self, PCI_STATUS, 0xffff);</div><div class='add'>+		pci_config_write16(addr, 0xffff);</div><div class='ctx'> 		ret = IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -744,16 +746,16 @@ static void psycho_register_error_handlers(struct pci_pbm_info *pbm)</div><div class='ctx'> 	 * the second will just error out since we do not pass in</div><div class='ctx'> 	 * IRQF_SHARED.</div><div class='ctx'> 	 */</div><div class='del'>-	err = request_irq(op-&gt;irqs[1], psycho_ue_intr, 0,</div><div class='add'>+	err = request_irq(op-&gt;irqs[1], psycho_ue_intr, IRQF_SHARED,</div><div class='ctx'> 			  "PSYCHO_UE", pbm);</div><div class='del'>-	err = request_irq(op-&gt;irqs[2], psycho_ce_intr, 0,</div><div class='add'>+	err = request_irq(op-&gt;irqs[2], psycho_ce_intr, IRQF_SHARED,</div><div class='ctx'> 			  "PSYCHO_CE", pbm);</div><div class='ctx'> </div><div class='ctx'> 	/* This one, however, ought not to fail.  We can just warn</div><div class='ctx'> 	 * about it since the system can still operate properly even</div><div class='ctx'> 	 * if this fails.</div><div class='ctx'> 	 */</div><div class='del'>-	err = request_irq(op-&gt;irqs[0], psycho_pcierr_intr, 0,</div><div class='add'>+	err = request_irq(op-&gt;irqs[0], psycho_pcierr_intr, IRQF_SHARED,</div><div class='ctx'> 			  "PSYCHO_PCIERR", pbm);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		printk(KERN_WARNING "%s: Could not register PCIERR, "</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c<br/>index 4c34195baf37..ade5184e75d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_sabre.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/pci_sabre.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_sabre.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/pci_sabre.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/apb.h&gt;</div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='hunk'>@@ -18,7 +19,6 @@</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pci_impl.h"</div><div class='ctx'> #include "iommu_common.h"</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c<br/>index 615edd9c8e2a..9248c6737f0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_schizo.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/pci_schizo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_schizo.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/pci_schizo.c</a></div><div class='hunk'>@@ -9,13 +9,13 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/upa.h&gt;</div><div class='ctx'> #include &lt;asm/pstate.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pci_impl.h"</div><div class='head'>diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c<br/>index eae8ca2a6ba5..3bb987a6d03c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/power.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/power.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/power.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/power.c</a></div><div class='hunk'>@@ -13,11 +13,11 @@</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/sstate.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='head'>diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c<br/>index 8a9cd3e165b9..15f4178592e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/process.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/process.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/process.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> #include &lt;asm/irq_regs.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> </div><div class='del'>-/* #define VERBOSE_SHOWREGS */</div><div class='add'>+#include "kstack.h"</div><div class='ctx'> </div><div class='ctx'> static void sparc64_yield(int cpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -213,22 +213,8 @@ static void show_regwindow(struct pt_regs *regs)</div><div class='ctx'> 		printk("I7: &lt;%pS&gt;\n", (void *) rwk-&gt;ins[7]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-static DEFINE_SPINLOCK(regdump_lock);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void __show_regs(struct pt_regs * regs)</div><div class='add'>+void show_regs(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* Protect against xcall ipis which might lead to livelock on the lock */</div><div class='del'>-	__asm__ __volatile__("rdpr      %%pstate, %0\n\t"</div><div class='del'>-			     "wrpr      %0, %1, %%pstate"</div><div class='del'>-			     : "=r" (flags)</div><div class='del'>-			     : "i" (PSTATE_IE));</div><div class='del'>-	spin_lock(&amp;regdump_lock);</div><div class='del'>-#endif</div><div class='ctx'> 	printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x    %s\n", regs-&gt;tstate,</div><div class='ctx'> 	       regs-&gt;tpc, regs-&gt;tnpc, regs-&gt;y, print_tainted());</div><div class='ctx'> 	printk("TPC: &lt;%pS&gt;\n", (void *) regs-&gt;tpc);</div><div class='hunk'>@@ -246,61 +232,8 @@ void __show_regs(struct pt_regs * regs)</div><div class='ctx'> 	       regs-&gt;u_regs[15]);</div><div class='ctx'> 	printk("RPC: &lt;%pS&gt;\n", (void *) regs-&gt;u_regs[15]);</div><div class='ctx'> 	show_regwindow(regs);</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	spin_unlock(&amp;regdump_lock);</div><div class='del'>-	__asm__ __volatile__("wrpr	%0, 0, %%pstate"</div><div class='del'>-			     : : "r" (flags));</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef VERBOSE_SHOWREGS</div><div class='del'>-static void idump_from_user (unsigned int *pc)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int code;</div><div class='del'>-	</div><div class='del'>-	if((((unsigned long) pc) &amp; 3))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	pc -= 3;</div><div class='del'>-	for(i = -3; i &lt; 6; i++) {</div><div class='del'>-		get_user(code, pc);</div><div class='del'>-		printk("%c%08x%c",i?' ':'&lt;',code,i?' ':'&gt;');</div><div class='del'>-		pc++;</div><div class='del'>-	}</div><div class='del'>-	printk("\n");</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void show_regs(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-#ifdef VERBOSE_SHOWREGS</div><div class='del'>-	extern long etrap, etraptl1;</div><div class='del'>-#endif</div><div class='del'>-	__show_regs(regs);</div><div class='del'>-#if 0</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	{</div><div class='del'>-		extern void smp_report_regs(void);</div><div class='del'>-</div><div class='del'>-		smp_report_regs();</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef VERBOSE_SHOWREGS	</div><div class='del'>-	if (regs-&gt;tpc &gt;= &amp;etrap &amp;&amp; regs-&gt;tpc &lt; &amp;etraptl1 &amp;&amp;</div><div class='del'>-	    regs-&gt;u_regs[14] &gt;= (long)current - PAGE_SIZE &amp;&amp;</div><div class='del'>-	    regs-&gt;u_regs[14] &lt; (long)current + 6 * PAGE_SIZE) {</div><div class='del'>-		printk ("*********parent**********\n");</div><div class='del'>-		__show_regs((struct pt_regs *)(regs-&gt;u_regs[14] + PTREGS_OFF));</div><div class='del'>-		idump_from_user(((struct pt_regs *)(regs-&gt;u_regs[14] + PTREGS_OFF))-&gt;tpc);</div><div class='del'>-		printk ("*********endpar**********\n");</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MAGIC_SYSRQ</div><div class='ctx'> struct global_reg_snapshot global_reg_snapshot[NR_CPUS];</div><div class='ctx'> static DEFINE_SPINLOCK(global_reg_snapshot_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -315,14 +248,22 @@ static void __global_reg_self(struct thread_info *tp, struct pt_regs *regs,</div><div class='ctx'> 	global_reg_snapshot[this_cpu].o7 = regs-&gt;u_regs[UREG_I7];</div><div class='ctx'> </div><div class='ctx'> 	if (regs-&gt;tstate &amp; TSTATE_PRIV) {</div><div class='add'>+		struct thread_info *tp = current_thread_info();</div><div class='ctx'> 		struct reg_window *rw;</div><div class='ctx'> </div><div class='ctx'> 		rw = (struct reg_window *)</div><div class='ctx'> 			(regs-&gt;u_regs[UREG_FP] + STACK_BIAS);</div><div class='del'>-		global_reg_snapshot[this_cpu].i7 = rw-&gt;ins[6];</div><div class='del'>-	} else</div><div class='add'>+		if (kstack_valid(tp, (unsigned long) rw)) {</div><div class='add'>+			global_reg_snapshot[this_cpu].i7 = rw-&gt;ins[7];</div><div class='add'>+			rw = (struct reg_window *)</div><div class='add'>+				(rw-&gt;ins[6] + STACK_BIAS);</div><div class='add'>+			if (kstack_valid(tp, (unsigned long) rw))</div><div class='add'>+				global_reg_snapshot[this_cpu].rpc = rw-&gt;ins[7];</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='ctx'> 		global_reg_snapshot[this_cpu].i7 = 0;</div><div class='del'>-</div><div class='add'>+		global_reg_snapshot[this_cpu].rpc = 0;</div><div class='add'>+	}</div><div class='ctx'> 	global_reg_snapshot[this_cpu].thread = tp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -341,7 +282,7 @@ static void __global_reg_poll(struct global_reg_snapshot *gp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sysrq_handle_globreg(int key, struct tty_struct *tty)</div><div class='add'>+void __trigger_all_cpu_backtrace(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct thread_info *tp = current_thread_info();</div><div class='ctx'> 	struct pt_regs *regs = get_irq_regs();</div><div class='hunk'>@@ -375,13 +316,14 @@ static void sysrq_handle_globreg(int key, struct tty_struct *tty)</div><div class='ctx'> 		       ((tp &amp;&amp; tp-&gt;task) ? tp-&gt;task-&gt;pid : -1));</div><div class='ctx'> </div><div class='ctx'> 		if (gp-&gt;tstate &amp; TSTATE_PRIV) {</div><div class='del'>-			printk("             TPC[%pS] O7[%pS] I7[%pS]\n",</div><div class='add'>+			printk("             TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",</div><div class='ctx'> 			       (void *) gp-&gt;tpc,</div><div class='ctx'> 			       (void *) gp-&gt;o7,</div><div class='del'>-			       (void *) gp-&gt;i7);</div><div class='add'>+			       (void *) gp-&gt;i7,</div><div class='add'>+			       (void *) gp-&gt;rpc);</div><div class='ctx'> 		} else {</div><div class='del'>-			printk("             TPC[%lx] O7[%lx] I7[%lx]\n",</div><div class='del'>-			       gp-&gt;tpc, gp-&gt;o7, gp-&gt;i7);</div><div class='add'>+			printk("             TPC[%lx] O7[%lx] I7[%lx] RPC[%lx]\n",</div><div class='add'>+			       gp-&gt;tpc, gp-&gt;o7, gp-&gt;i7, gp-&gt;rpc);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -390,6 +332,13 @@ static void sysrq_handle_globreg(int key, struct tty_struct *tty)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;global_reg_snapshot_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MAGIC_SYSRQ</div><div class='add'>+</div><div class='add'>+static void sysrq_handle_globreg(int key, struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	__trigger_all_cpu_backtrace();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sysrq_key_op sparc_globalreg_op = {</div><div class='ctx'> 	.handler	= sysrq_handle_globreg,</div><div class='ctx'> 	.help_msg	= "Globalregs",</div><div class='hunk'>@@ -868,7 +817,7 @@ out:</div><div class='ctx'> unsigned long get_wchan(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pc, fp, bias = 0;</div><div class='del'>-	unsigned long thread_info_base;</div><div class='add'>+	struct thread_info *tp;</div><div class='ctx'> 	struct reg_window *rw;</div><div class='ctx'>         unsigned long ret = 0;</div><div class='ctx'> 	int count = 0; </div><div class='hunk'>@@ -877,14 +826,12 @@ unsigned long get_wchan(struct task_struct *task)</div><div class='ctx'>             task-&gt;state == TASK_RUNNING)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	thread_info_base = (unsigned long) task_stack_page(task);</div><div class='add'>+	tp = task_thread_info(task);</div><div class='ctx'> 	bias = STACK_BIAS;</div><div class='ctx'> 	fp = task_thread_info(task)-&gt;ksp + bias;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		/* Bogus frame pointer? */</div><div class='del'>-		if (fp &lt; (thread_info_base + sizeof(struct thread_info)) ||</div><div class='del'>-		    fp &gt;= (thread_info_base + THREAD_SIZE))</div><div class='add'>+		if (!kstack_valid(tp, fp))</div><div class='ctx'> 			break;</div><div class='ctx'> 		rw = (struct reg_window *) fp;</div><div class='ctx'> 		pc = rw-&gt;ins[7];</div><div class='head'>diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c<br/>index ed03a18d3b36..7151513f156e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/prom.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/prom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/prom.c</a></div><div class='hunk'>@@ -21,9 +21,9 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/lmb.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/asi.h&gt;</div><div class='hunk'>@@ -156,55 +156,11 @@ static unsigned long psycho_pcislot_imap_offset(unsigned long ino)</div><div class='ctx'> 		return PSYCHO_IMAP_B_SLOT0 + (slot * 8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define PSYCHO_IMAP_SCSI	0x1000UL</div><div class='del'>-#define PSYCHO_IMAP_ETH		0x1008UL</div><div class='del'>-#define PSYCHO_IMAP_BPP		0x1010UL</div><div class='del'>-#define PSYCHO_IMAP_AU_REC	0x1018UL</div><div class='del'>-#define PSYCHO_IMAP_AU_PLAY	0x1020UL</div><div class='del'>-#define PSYCHO_IMAP_PFAIL	0x1028UL</div><div class='del'>-#define PSYCHO_IMAP_KMS		0x1030UL</div><div class='del'>-#define PSYCHO_IMAP_FLPY	0x1038UL</div><div class='del'>-#define PSYCHO_IMAP_SHW		0x1040UL</div><div class='del'>-#define PSYCHO_IMAP_KBD		0x1048UL</div><div class='del'>-#define PSYCHO_IMAP_MS		0x1050UL</div><div class='del'>-#define PSYCHO_IMAP_SER		0x1058UL</div><div class='del'>-#define PSYCHO_IMAP_TIM0	0x1060UL</div><div class='del'>-#define PSYCHO_IMAP_TIM1	0x1068UL</div><div class='del'>-#define PSYCHO_IMAP_UE		0x1070UL</div><div class='del'>-#define PSYCHO_IMAP_CE		0x1078UL</div><div class='del'>-#define PSYCHO_IMAP_A_ERR	0x1080UL</div><div class='del'>-#define PSYCHO_IMAP_B_ERR	0x1088UL</div><div class='del'>-#define PSYCHO_IMAP_PMGMT	0x1090UL</div><div class='del'>-#define PSYCHO_IMAP_GFX		0x1098UL</div><div class='del'>-#define PSYCHO_IMAP_EUPA	0x10a0UL</div><div class='del'>-</div><div class='del'>-static unsigned long __psycho_onboard_imap_off[] = {</div><div class='del'>-/*0x20*/	PSYCHO_IMAP_SCSI,</div><div class='del'>-/*0x21*/	PSYCHO_IMAP_ETH,</div><div class='del'>-/*0x22*/	PSYCHO_IMAP_BPP,</div><div class='del'>-/*0x23*/	PSYCHO_IMAP_AU_REC,</div><div class='del'>-/*0x24*/	PSYCHO_IMAP_AU_PLAY,</div><div class='del'>-/*0x25*/	PSYCHO_IMAP_PFAIL,</div><div class='del'>-/*0x26*/	PSYCHO_IMAP_KMS,</div><div class='del'>-/*0x27*/	PSYCHO_IMAP_FLPY,</div><div class='del'>-/*0x28*/	PSYCHO_IMAP_SHW,</div><div class='del'>-/*0x29*/	PSYCHO_IMAP_KBD,</div><div class='del'>-/*0x2a*/	PSYCHO_IMAP_MS,</div><div class='del'>-/*0x2b*/	PSYCHO_IMAP_SER,</div><div class='del'>-/*0x2c*/	PSYCHO_IMAP_TIM0,</div><div class='del'>-/*0x2d*/	PSYCHO_IMAP_TIM1,</div><div class='del'>-/*0x2e*/	PSYCHO_IMAP_UE,</div><div class='del'>-/*0x2f*/	PSYCHO_IMAP_CE,</div><div class='del'>-/*0x30*/	PSYCHO_IMAP_A_ERR,</div><div class='del'>-/*0x31*/	PSYCHO_IMAP_B_ERR,</div><div class='del'>-/*0x32*/	PSYCHO_IMAP_PMGMT,</div><div class='del'>-/*0x33*/	PSYCHO_IMAP_GFX,</div><div class='del'>-/*0x34*/	PSYCHO_IMAP_EUPA,</div><div class='del'>-};</div><div class='add'>+#define PSYCHO_OBIO_IMAP_BASE	0x1000UL</div><div class='add'>+</div><div class='ctx'> #define PSYCHO_ONBOARD_IRQ_BASE		0x20</div><div class='del'>-#define PSYCHO_ONBOARD_IRQ_LAST		0x34</div><div class='ctx'> #define psycho_onboard_imap_offset(__ino) \</div><div class='del'>-	__psycho_onboard_imap_off[(__ino) - PSYCHO_ONBOARD_IRQ_BASE]</div><div class='add'>+	(PSYCHO_OBIO_IMAP_BASE + (((__ino) &amp; 0x1f) &lt;&lt; 3))</div><div class='ctx'> </div><div class='ctx'> #define PSYCHO_ICLR_A_SLOT0	0x1400UL</div><div class='ctx'> #define PSYCHO_ICLR_SCSI	0x1800UL</div><div class='hunk'>@@ -228,10 +184,6 @@ static unsigned int psycho_irq_build(struct device_node *dp,</div><div class='ctx'> 		imap_off = psycho_pcislot_imap_offset(ino);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Onboard device */</div><div class='del'>-		if (ino &gt; PSYCHO_ONBOARD_IRQ_LAST) {</div><div class='del'>-			prom_printf("psycho_irq_build: Wacky INO [%x]\n", ino);</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='ctx'> 		imap_off = psycho_onboard_imap_offset(ino);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -318,23 +270,6 @@ static void sabre_wsync_handler(unsigned int ino, void *_arg1, void *_arg2)</div><div class='ctx'> </div><div class='ctx'> #define SABRE_IMAP_A_SLOT0	0x0c00UL</div><div class='ctx'> #define SABRE_IMAP_B_SLOT0	0x0c20UL</div><div class='del'>-#define SABRE_IMAP_SCSI		0x1000UL</div><div class='del'>-#define SABRE_IMAP_ETH		0x1008UL</div><div class='del'>-#define SABRE_IMAP_BPP		0x1010UL</div><div class='del'>-#define SABRE_IMAP_AU_REC	0x1018UL</div><div class='del'>-#define SABRE_IMAP_AU_PLAY	0x1020UL</div><div class='del'>-#define SABRE_IMAP_PFAIL	0x1028UL</div><div class='del'>-#define SABRE_IMAP_KMS		0x1030UL</div><div class='del'>-#define SABRE_IMAP_FLPY		0x1038UL</div><div class='del'>-#define SABRE_IMAP_SHW		0x1040UL</div><div class='del'>-#define SABRE_IMAP_KBD		0x1048UL</div><div class='del'>-#define SABRE_IMAP_MS		0x1050UL</div><div class='del'>-#define SABRE_IMAP_SER		0x1058UL</div><div class='del'>-#define SABRE_IMAP_UE		0x1070UL</div><div class='del'>-#define SABRE_IMAP_CE		0x1078UL</div><div class='del'>-#define SABRE_IMAP_PCIERR	0x1080UL</div><div class='del'>-#define SABRE_IMAP_GFX		0x1098UL</div><div class='del'>-#define SABRE_IMAP_EUPA		0x10a0UL</div><div class='ctx'> #define SABRE_ICLR_A_SLOT0	0x1400UL</div><div class='ctx'> #define SABRE_ICLR_B_SLOT0	0x1480UL</div><div class='ctx'> #define SABRE_ICLR_SCSI		0x1800UL</div><div class='hunk'>@@ -364,33 +299,10 @@ static unsigned long sabre_pcislot_imap_offset(unsigned long ino)</div><div class='ctx'> 		return SABRE_IMAP_B_SLOT0 + (slot * 8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned long __sabre_onboard_imap_off[] = {</div><div class='del'>-/*0x20*/	SABRE_IMAP_SCSI,</div><div class='del'>-/*0x21*/	SABRE_IMAP_ETH,</div><div class='del'>-/*0x22*/	SABRE_IMAP_BPP,</div><div class='del'>-/*0x23*/	SABRE_IMAP_AU_REC,</div><div class='del'>-/*0x24*/	SABRE_IMAP_AU_PLAY,</div><div class='del'>-/*0x25*/	SABRE_IMAP_PFAIL,</div><div class='del'>-/*0x26*/	SABRE_IMAP_KMS,</div><div class='del'>-/*0x27*/	SABRE_IMAP_FLPY,</div><div class='del'>-/*0x28*/	SABRE_IMAP_SHW,</div><div class='del'>-/*0x29*/	SABRE_IMAP_KBD,</div><div class='del'>-/*0x2a*/	SABRE_IMAP_MS,</div><div class='del'>-/*0x2b*/	SABRE_IMAP_SER,</div><div class='del'>-/*0x2c*/	0 /* reserved */,</div><div class='del'>-/*0x2d*/	0 /* reserved */,</div><div class='del'>-/*0x2e*/	SABRE_IMAP_UE,</div><div class='del'>-/*0x2f*/	SABRE_IMAP_CE,</div><div class='del'>-/*0x30*/	SABRE_IMAP_PCIERR,</div><div class='del'>-/*0x31*/	0 /* reserved */,</div><div class='del'>-/*0x32*/	0 /* reserved */,</div><div class='del'>-/*0x33*/	SABRE_IMAP_GFX,</div><div class='del'>-/*0x34*/	SABRE_IMAP_EUPA,</div><div class='del'>-};</div><div class='del'>-#define SABRE_ONBOARD_IRQ_BASE		0x20</div><div class='del'>-#define SABRE_ONBOARD_IRQ_LAST		0x30</div><div class='add'>+#define SABRE_OBIO_IMAP_BASE	0x1000UL</div><div class='add'>+#define SABRE_ONBOARD_IRQ_BASE	0x20</div><div class='ctx'> #define sabre_onboard_imap_offset(__ino) \</div><div class='del'>-	__sabre_onboard_imap_off[(__ino) - SABRE_ONBOARD_IRQ_BASE]</div><div class='add'>+	(SABRE_OBIO_IMAP_BASE + (((__ino) &amp; 0x1f) &lt;&lt; 3))</div><div class='ctx'> </div><div class='ctx'> #define sabre_iclr_offset(ino)					      \</div><div class='ctx'> 	((ino &amp; 0x20) ? (SABRE_ICLR_SCSI + (((ino) &amp; 0x1f) &lt;&lt; 3)) :  \</div><div class='hunk'>@@ -453,10 +365,6 @@ static unsigned int sabre_irq_build(struct device_node *dp,</div><div class='ctx'> 		imap_off = sabre_pcislot_imap_offset(ino);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* onboard device */</div><div class='del'>-		if (ino &gt; SABRE_ONBOARD_IRQ_LAST) {</div><div class='del'>-			prom_printf("sabre_irq_build: Wacky INO [%x]\n", ino);</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='ctx'> 		imap_off = sabre_onboard_imap_offset(ino);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c<br/>index bd578cc4856d..10306e476e38 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/ptrace.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/ptrace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/ptrace.c</a></div><div class='hunk'>@@ -443,7 +443,7 @@ static const struct user_regset sparc64_regsets[] = {</div><div class='ctx'> 	 */</div><div class='ctx'> 	[REGSET_GENERAL] = {</div><div class='ctx'> 		.core_note_type = NT_PRSTATUS,</div><div class='del'>-		.n = 36 * sizeof(u64),</div><div class='add'>+		.n = 36,</div><div class='ctx'> 		.size = sizeof(u64), .align = sizeof(u64),</div><div class='ctx'> 		.get = genregs64_get, .set = genregs64_set</div><div class='ctx'> 	},</div><div class='hunk'>@@ -455,7 +455,7 @@ static const struct user_regset sparc64_regsets[] = {</div><div class='ctx'> 	 */</div><div class='ctx'> 	[REGSET_FP] = {</div><div class='ctx'> 		.core_note_type = NT_PRFPREG,</div><div class='del'>-		.n = 35 * sizeof(u64),</div><div class='add'>+		.n = 35,</div><div class='ctx'> 		.size = sizeof(u64), .align = sizeof(u64),</div><div class='ctx'> 		.get = fpregs64_get, .set = fpregs64_set</div><div class='ctx'> 	},</div><div class='hunk'>@@ -801,7 +801,7 @@ static const struct user_regset sparc32_regsets[] = {</div><div class='ctx'> 	 */</div><div class='ctx'> 	[REGSET_GENERAL] = {</div><div class='ctx'> 		.core_note_type = NT_PRSTATUS,</div><div class='del'>-		.n = 38 * sizeof(u32),</div><div class='add'>+		.n = 38,</div><div class='ctx'> 		.size = sizeof(u32), .align = sizeof(u32),</div><div class='ctx'> 		.get = genregs32_get, .set = genregs32_set</div><div class='ctx'> 	},</div><div class='hunk'>@@ -817,7 +817,7 @@ static const struct user_regset sparc32_regsets[] = {</div><div class='ctx'> 	 */</div><div class='ctx'> 	[REGSET_FP] = {</div><div class='ctx'> 		.core_note_type = NT_PRFPREG,</div><div class='del'>-		.n = 99 * sizeof(u32),</div><div class='add'>+		.n = 99,</div><div class='ctx'> 		.size = sizeof(u32), .align = sizeof(u32),</div><div class='ctx'> 		.get = fpregs32_get, .set = fpregs32_set</div><div class='ctx'> 	},</div><div class='head'>diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c<br/>index d1b84456a9ee..ec82d76dc6f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/signal.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/signal.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/signal.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  *  arch/sparc64/kernel/signal.c</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1991, 1992  Linus Torvalds</div><div class='del'>- *  Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)</div><div class='add'>+ *  Copyright (C) 1995, 2008 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  *  Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)</div><div class='ctx'>  *  Copyright (C) 1997 Eddie C. Dost   (ecd@skynet.be)</div><div class='ctx'>  *  Copyright (C) 1997,1998 Jakub Jelinek   (jj@sunsite.mff.cuni.cz)</div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/binfmts.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/tracehook.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='hunk'>@@ -91,7 +90,9 @@ asmlinkage void sparc64_set_context(struct pt_regs *regs)</div><div class='ctx'> 	err |= __get_user(regs-&gt;u_regs[UREG_G4], (&amp;(*grp)[MC_G4]));</div><div class='ctx'> 	err |= __get_user(regs-&gt;u_regs[UREG_G5], (&amp;(*grp)[MC_G5]));</div><div class='ctx'> 	err |= __get_user(regs-&gt;u_regs[UREG_G6], (&amp;(*grp)[MC_G6]));</div><div class='del'>-	err |= __get_user(regs-&gt;u_regs[UREG_G7], (&amp;(*grp)[MC_G7]));</div><div class='add'>+</div><div class='add'>+	/* Skip %g7 as that's the thread register in userspace.  */</div><div class='add'>+</div><div class='ctx'> 	err |= __get_user(regs-&gt;u_regs[UREG_I0], (&amp;(*grp)[MC_O0]));</div><div class='ctx'> 	err |= __get_user(regs-&gt;u_regs[UREG_I1], (&amp;(*grp)[MC_O1]));</div><div class='ctx'> 	err |= __get_user(regs-&gt;u_regs[UREG_I2], (&amp;(*grp)[MC_O2]));</div><div class='head'>diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c<br/>index 7cf72b4bb108..2be166c544ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/smp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/smp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/smp.c</a></div><div class='hunk'>@@ -80,8 +80,6 @@ void smp_bogo(struct seq_file *m)</div><div class='ctx'> 			   i, cpu_data(i).clock_tick);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __cacheline_aligned_in_smp DEFINE_SPINLOCK(call_lock);</div><div class='del'>-</div><div class='ctx'> extern void setup_sparc64_timer(void);</div><div class='ctx'> </div><div class='ctx'> static volatile unsigned long callin_flag = 0;</div><div class='hunk'>@@ -120,9 +118,9 @@ void __cpuinit smp_callin(void)</div><div class='ctx'> 	while (!cpu_isset(cpuid, smp_commenced_mask))</div><div class='ctx'> 		rmb();</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;call_lock);</div><div class='add'>+	ipi_call_lock();</div><div class='ctx'> 	cpu_set(cpuid, cpu_online_map);</div><div class='del'>-	spin_unlock(&amp;call_lock);</div><div class='add'>+	ipi_call_unlock();</div><div class='ctx'> </div><div class='ctx'> 	/* idle thread is expected to have preempt disabled */</div><div class='ctx'> 	preempt_disable();</div><div class='hunk'>@@ -459,27 +457,35 @@ again:</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void spitfire_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t mask)</div><div class='add'>+static void spitfire_xcall_deliver(struct trap_per_cpu *tb, int cnt)</div><div class='ctx'> {</div><div class='add'>+	u64 *mondo, data0, data1, data2;</div><div class='add'>+	u16 *cpu_list;</div><div class='ctx'> 	u64 pstate;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	__asm__ __volatile__("rdpr %%pstate, %0" : "=r" (pstate));</div><div class='del'>-	for_each_cpu_mask(i, mask)</div><div class='del'>-		spitfire_xcall_helper(data0, data1, data2, pstate, i);</div><div class='add'>+	cpu_list = __va(tb-&gt;cpu_list_pa);</div><div class='add'>+	mondo = __va(tb-&gt;cpu_mondo_block_pa);</div><div class='add'>+	data0 = mondo[0];</div><div class='add'>+	data1 = mondo[1];</div><div class='add'>+	data2 = mondo[2];</div><div class='add'>+	for (i = 0; i &lt; cnt; i++)</div><div class='add'>+		spitfire_xcall_helper(data0, data1, data2, pstate, cpu_list[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Cheetah now allows to send the whole 64-bytes of data in the interrupt</div><div class='ctx'>  * packet, but we have no use for that.  However we do take advantage of</div><div class='ctx'>  * the new pipelining feature (ie. dispatch to multiple cpus simultaneously).</div><div class='ctx'>  */</div><div class='del'>-static void cheetah_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t mask)</div><div class='add'>+static void cheetah_xcall_deliver(struct trap_per_cpu *tb, int cnt)</div><div class='ctx'> {</div><div class='del'>-	u64 pstate, ver, busy_mask;</div><div class='ctx'> 	int nack_busy_id, is_jbus, need_more;</div><div class='add'>+	u64 *mondo, pstate, ver, busy_mask;</div><div class='add'>+	u16 *cpu_list;</div><div class='ctx'> </div><div class='del'>-	if (cpus_empty(mask))</div><div class='del'>-		return;</div><div class='add'>+	cpu_list = __va(tb-&gt;cpu_list_pa);</div><div class='add'>+	mondo = __va(tb-&gt;cpu_mondo_block_pa);</div><div class='ctx'> </div><div class='ctx'> 	/* Unfortunately, someone at Sun had the brilliant idea to make the</div><div class='ctx'> 	 * busy/nack fields hard-coded by ITID number for this Ultra-III</div><div class='hunk'>@@ -502,7 +508,7 @@ retry:</div><div class='ctx'> 			     "stxa	%2, [%5] %6\n\t"</div><div class='ctx'> 			     "membar	#Sync\n\t"</div><div class='ctx'> 			     : /* no outputs */</div><div class='del'>-			     : "r" (data0), "r" (data1), "r" (data2),</div><div class='add'>+			     : "r" (mondo[0]), "r" (mondo[1]), "r" (mondo[2]),</div><div class='ctx'> 			       "r" (0x40), "r" (0x50), "r" (0x60),</div><div class='ctx'> 			       "i" (ASI_INTR_W));</div><div class='ctx'> </div><div class='hunk'>@@ -511,11 +517,16 @@ retry:</div><div class='ctx'> 	{</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='del'>-		for_each_cpu_mask(i, mask) {</div><div class='del'>-			u64 target = (i &lt;&lt; 14) | 0x70;</div><div class='add'>+		for (i = 0; i &lt; cnt; i++) {</div><div class='add'>+			u64 target, nr;</div><div class='add'>+</div><div class='add'>+			nr = cpu_list[i];</div><div class='add'>+			if (nr == 0xffff)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='add'>+			target = (nr &lt;&lt; 14) | 0x70;</div><div class='ctx'> 			if (is_jbus) {</div><div class='del'>-				busy_mask |= (0x1UL &lt;&lt; (i * 2));</div><div class='add'>+				busy_mask |= (0x1UL &lt;&lt; (nr * 2));</div><div class='ctx'> 			} else {</div><div class='ctx'> 				target |= (nack_busy_id &lt;&lt; 24);</div><div class='ctx'> 				busy_mask |= (0x1UL &lt;&lt;</div><div class='hunk'>@@ -549,11 +560,13 @@ retry:</div><div class='ctx'> 				__asm__ __volatile__("wrpr %0, 0x0, %%pstate"</div><div class='ctx'> 						     : : "r" (pstate));</div><div class='ctx'> 				if (unlikely(need_more)) {</div><div class='del'>-					int i, cnt = 0;</div><div class='del'>-					for_each_cpu_mask(i, mask) {</div><div class='del'>-						cpu_clear(i, mask);</div><div class='del'>-						cnt++;</div><div class='del'>-						if (cnt == 32)</div><div class='add'>+					int i, this_cnt = 0;</div><div class='add'>+					for (i = 0; i &lt; cnt; i++) {</div><div class='add'>+						if (cpu_list[i] == 0xffff)</div><div class='add'>+							continue;</div><div class='add'>+						cpu_list[i] = 0xffff;</div><div class='add'>+						this_cnt++;</div><div class='add'>+						if (this_cnt == 32)</div><div class='ctx'> 							break;</div><div class='ctx'> 					}</div><div class='ctx'> 					goto retry;</div><div class='hunk'>@@ -584,16 +597,20 @@ retry:</div><div class='ctx'> 			/* Clear out the mask bits for cpus which did not</div><div class='ctx'> 			 * NACK us.</div><div class='ctx'> 			 */</div><div class='del'>-			for_each_cpu_mask(i, mask) {</div><div class='del'>-				u64 check_mask;</div><div class='add'>+			for (i = 0; i &lt; cnt; i++) {</div><div class='add'>+				u64 check_mask, nr;</div><div class='add'>+</div><div class='add'>+				nr = cpu_list[i];</div><div class='add'>+				if (nr == 0xffff)</div><div class='add'>+					continue;</div><div class='ctx'> </div><div class='ctx'> 				if (is_jbus)</div><div class='del'>-					check_mask = (0x2UL &lt;&lt; (2*i));</div><div class='add'>+					check_mask = (0x2UL &lt;&lt; (2*nr));</div><div class='ctx'> 				else</div><div class='ctx'> 					check_mask = (0x2UL &lt;&lt;</div><div class='ctx'> 						      this_busy_nack);</div><div class='ctx'> 				if ((dispatch_stat &amp; check_mask) == 0)</div><div class='del'>-					cpu_clear(i, mask);</div><div class='add'>+					cpu_list[i] = 0xffff;</div><div class='ctx'> 				this_busy_nack += 2;</div><div class='ctx'> 				if (this_busy_nack == 64)</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -605,47 +622,17 @@ retry:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Multi-cpu list version.  */</div><div class='del'>-static void hypervisor_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t mask)</div><div class='add'>+static void hypervisor_xcall_deliver(struct trap_per_cpu *tb, int cnt)</div><div class='ctx'> {</div><div class='del'>-	struct trap_per_cpu *tb;</div><div class='add'>+	int retries, this_cpu, prev_sent, i, saw_cpu_error;</div><div class='add'>+	unsigned long status;</div><div class='ctx'> 	u16 *cpu_list;</div><div class='del'>-	u64 *mondo;</div><div class='del'>-	cpumask_t error_mask;</div><div class='del'>-	unsigned long flags, status;</div><div class='del'>-	int cnt, retries, this_cpu, prev_sent, i;</div><div class='del'>-</div><div class='del'>-	if (cpus_empty(mask))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* We have to do this whole thing with interrupts fully disabled.</div><div class='del'>-	 * Otherwise if we send an xcall from interrupt context it will</div><div class='del'>-	 * corrupt both our mondo block and cpu list state.</div><div class='del'>-	 *</div><div class='del'>-	 * One consequence of this is that we cannot use timeout mechanisms</div><div class='del'>-	 * that depend upon interrupts being delivered locally.  So, for</div><div class='del'>-	 * example, we cannot sample jiffies and expect it to advance.</div><div class='del'>-	 *</div><div class='del'>-	 * Fortunately, udelay() uses %stick/%tick so we can use that.</div><div class='del'>-	 */</div><div class='del'>-	local_irq_save(flags);</div><div class='ctx'> </div><div class='ctx'> 	this_cpu = smp_processor_id();</div><div class='del'>-	tb = &amp;trap_block[this_cpu];</div><div class='del'>-</div><div class='del'>-	mondo = __va(tb-&gt;cpu_mondo_block_pa);</div><div class='del'>-	mondo[0] = data0;</div><div class='del'>-	mondo[1] = data1;</div><div class='del'>-	mondo[2] = data2;</div><div class='del'>-	wmb();</div><div class='ctx'> </div><div class='ctx'> 	cpu_list = __va(tb-&gt;cpu_list_pa);</div><div class='ctx'> </div><div class='del'>-	/* Setup the initial cpu list.  */</div><div class='del'>-	cnt = 0;</div><div class='del'>-	for_each_cpu_mask(i, mask)</div><div class='del'>-		cpu_list[cnt++] = i;</div><div class='del'>-</div><div class='del'>-	cpus_clear(error_mask);</div><div class='add'>+	saw_cpu_error = 0;</div><div class='ctx'> 	retries = 0;</div><div class='ctx'> 	prev_sent = 0;</div><div class='ctx'> 	do {</div><div class='hunk'>@@ -690,10 +677,9 @@ static void hypervisor_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t</div><div class='ctx'> 					continue;</div><div class='ctx'> </div><div class='ctx'> 				err = sun4v_cpu_state(cpu);</div><div class='del'>-				if (err &gt;= 0 &amp;&amp;</div><div class='del'>-				    err == HV_CPU_STATE_ERROR) {</div><div class='add'>+				if (err == HV_CPU_STATE_ERROR) {</div><div class='add'>+					saw_cpu_error = (cpu + 1);</div><div class='ctx'> 					cpu_list[i] = 0xffff;</div><div class='del'>-					cpu_set(cpu, error_mask);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (unlikely(status != HV_EWOULDBLOCK))</div><div class='hunk'>@@ -717,32 +703,24 @@ static void hypervisor_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (1);</div><div class='ctx'> </div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-</div><div class='del'>-	if (unlikely(!cpus_empty(error_mask)))</div><div class='add'>+	if (unlikely(saw_cpu_error))</div><div class='ctx'> 		goto fatal_mondo_cpu_error;</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> fatal_mondo_cpu_error:</div><div class='ctx'> 	printk(KERN_CRIT "CPU[%d]: SUN4V mondo cpu error, some target cpus "</div><div class='del'>-	       "were in error state\n",</div><div class='del'>-	       this_cpu);</div><div class='del'>-	printk(KERN_CRIT "CPU[%d]: Error mask [ ", this_cpu);</div><div class='del'>-	for_each_cpu_mask(i, error_mask)</div><div class='del'>-		printk("%d ", i);</div><div class='del'>-	printk("]\n");</div><div class='add'>+	       "(including %d) were in error state\n",</div><div class='add'>+	       this_cpu, saw_cpu_error - 1);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> fatal_mondo_timeout:</div><div class='del'>-	local_irq_restore(flags);</div><div class='ctx'> 	printk(KERN_CRIT "CPU[%d]: SUN4V mondo timeout, no forward "</div><div class='ctx'> 	       " progress after %d retries.\n",</div><div class='ctx'> 	       this_cpu, retries);</div><div class='ctx'> 	goto dump_cpu_list_and_out;</div><div class='ctx'> </div><div class='ctx'> fatal_mondo_error:</div><div class='del'>-	local_irq_restore(flags);</div><div class='ctx'> 	printk(KERN_CRIT "CPU[%d]: Unexpected SUN4V mondo error %lu\n",</div><div class='ctx'> 	       this_cpu, status);</div><div class='ctx'> 	printk(KERN_CRIT "CPU[%d]: Args were cnt(%d) cpulist_pa(%lx) "</div><div class='hunk'>@@ -756,58 +734,93 @@ dump_cpu_list_and_out:</div><div class='ctx'> 	printk("]\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Send cross call to all processors mentioned in MASK</div><div class='del'>- * except self.</div><div class='add'>+static void (*xcall_deliver_impl)(struct trap_per_cpu *, int);</div><div class='add'>+</div><div class='add'>+static void xcall_deliver(u64 data0, u64 data1, u64 data2, const cpumask_t *mask)</div><div class='add'>+{</div><div class='add'>+	struct trap_per_cpu *tb;</div><div class='add'>+	int this_cpu, i, cnt;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 *cpu_list;</div><div class='add'>+	u64 *mondo;</div><div class='add'>+</div><div class='add'>+	/* We have to do this whole thing with interrupts fully disabled.</div><div class='add'>+	 * Otherwise if we send an xcall from interrupt context it will</div><div class='add'>+	 * corrupt both our mondo block and cpu list state.</div><div class='add'>+	 *</div><div class='add'>+	 * One consequence of this is that we cannot use timeout mechanisms</div><div class='add'>+	 * that depend upon interrupts being delivered locally.  So, for</div><div class='add'>+	 * example, we cannot sample jiffies and expect it to advance.</div><div class='add'>+	 *</div><div class='add'>+	 * Fortunately, udelay() uses %stick/%tick so we can use that.</div><div class='add'>+	 */</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+</div><div class='add'>+	this_cpu = smp_processor_id();</div><div class='add'>+	tb = &amp;trap_block[this_cpu];</div><div class='add'>+</div><div class='add'>+	mondo = __va(tb-&gt;cpu_mondo_block_pa);</div><div class='add'>+	mondo[0] = data0;</div><div class='add'>+	mondo[1] = data1;</div><div class='add'>+	mondo[2] = data2;</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	cpu_list = __va(tb-&gt;cpu_list_pa);</div><div class='add'>+</div><div class='add'>+	/* Setup the initial cpu list.  */</div><div class='add'>+	cnt = 0;</div><div class='add'>+	for_each_cpu_mask_nr(i, *mask) {</div><div class='add'>+		if (i == this_cpu || !cpu_online(i))</div><div class='add'>+			continue;</div><div class='add'>+		cpu_list[cnt++] = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cnt)</div><div class='add'>+		xcall_deliver_impl(tb, cnt);</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Send cross call to all processors mentioned in MASK_P</div><div class='add'>+ * except self.  Really, there are only two cases currently,</div><div class='add'>+ * "&amp;cpu_online_map" and "&amp;mm-&gt;cpu_vm_mask".</div><div class='ctx'>  */</div><div class='del'>-static void smp_cross_call_masked(unsigned long *func, u32 ctx, u64 data1, u64 data2, cpumask_t mask)</div><div class='add'>+static void smp_cross_call_masked(unsigned long *func, u32 ctx, u64 data1, u64 data2, const cpumask_t *mask)</div><div class='ctx'> {</div><div class='ctx'> 	u64 data0 = (((u64)ctx)&lt;&lt;32 | (((u64)func) &amp; 0xffffffff));</div><div class='del'>-	int this_cpu = get_cpu();</div><div class='ctx'> </div><div class='del'>-	cpus_and(mask, mask, cpu_online_map);</div><div class='del'>-	cpu_clear(this_cpu, mask);</div><div class='del'>-</div><div class='del'>-	if (tlb_type == spitfire)</div><div class='del'>-		spitfire_xcall_deliver(data0, data1, data2, mask);</div><div class='del'>-	else if (tlb_type == cheetah || tlb_type == cheetah_plus)</div><div class='del'>-		cheetah_xcall_deliver(data0, data1, data2, mask);</div><div class='del'>-	else</div><div class='del'>-		hypervisor_xcall_deliver(data0, data1, data2, mask);</div><div class='del'>-	/* NOTE: Caller runs local copy on master. */</div><div class='add'>+	xcall_deliver(data0, data1, data2, mask);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	put_cpu();</div><div class='add'>+/* Send cross call to all processors except self. */</div><div class='add'>+static void smp_cross_call(unsigned long *func, u32 ctx, u64 data1, u64 data2)</div><div class='add'>+{</div><div class='add'>+	smp_cross_call_masked(func, ctx, data1, data2, &amp;cpu_online_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern unsigned long xcall_sync_tick;</div><div class='ctx'> </div><div class='ctx'> static void smp_start_sync_tick_client(int cpu)</div><div class='ctx'> {</div><div class='del'>-	cpumask_t mask = cpumask_of_cpu(cpu);</div><div class='del'>-</div><div class='del'>-	smp_cross_call_masked(&amp;xcall_sync_tick,</div><div class='del'>-			      0, 0, 0, mask);</div><div class='add'>+	xcall_deliver((u64) &amp;xcall_sync_tick, 0, 0,</div><div class='add'>+		      &amp;cpumask_of_cpu(cpu));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern unsigned long xcall_call_function;</div><div class='ctx'> </div><div class='ctx'> void arch_send_call_function_ipi(cpumask_t mask)</div><div class='ctx'> {</div><div class='del'>-	smp_cross_call_masked(&amp;xcall_call_function, 0, 0, 0, mask);</div><div class='add'>+	xcall_deliver((u64) &amp;xcall_call_function, 0, 0, &amp;mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern unsigned long xcall_call_function_single;</div><div class='ctx'> </div><div class='ctx'> void arch_send_call_function_single_ipi(int cpu)</div><div class='ctx'> {</div><div class='del'>-	cpumask_t mask = cpumask_of_cpu(cpu);</div><div class='del'>-</div><div class='del'>-	smp_cross_call_masked(&amp;xcall_call_function_single, 0, 0, 0, mask);</div><div class='add'>+	xcall_deliver((u64) &amp;xcall_call_function_single, 0, 0,</div><div class='add'>+		      &amp;cpumask_of_cpu(cpu));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Send cross call to all processors except self. */</div><div class='del'>-#define smp_cross_call(func, ctx, data1, data2) \</div><div class='del'>-	smp_cross_call_masked(func, ctx, data1, data2, cpu_online_map)</div><div class='del'>-</div><div class='ctx'> void smp_call_function_client(int irq, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	clear_softint(1 &lt;&lt; irq);</div><div class='hunk'>@@ -843,10 +856,7 @@ void smp_tsb_sync(struct mm_struct *mm)</div><div class='ctx'> extern unsigned long xcall_flush_tlb_mm;</div><div class='ctx'> extern unsigned long xcall_flush_tlb_pending;</div><div class='ctx'> extern unsigned long xcall_flush_tlb_kernel_range;</div><div class='del'>-extern unsigned long xcall_report_regs;</div><div class='del'>-#ifdef CONFIG_MAGIC_SYSRQ</div><div class='ctx'> extern unsigned long xcall_fetch_glob_regs;</div><div class='del'>-#endif</div><div class='ctx'> extern unsigned long xcall_receive_signal;</div><div class='ctx'> extern unsigned long xcall_new_mmu_context_version;</div><div class='ctx'> #ifdef CONFIG_KGDB</div><div class='hunk'>@@ -878,7 +888,6 @@ static inline void __local_flush_dcache_page(struct page *page)</div><div class='ctx'> </div><div class='ctx'> void smp_flush_dcache_page_impl(struct page *page, int cpu)</div><div class='ctx'> {</div><div class='del'>-	cpumask_t mask = cpumask_of_cpu(cpu);</div><div class='ctx'> 	int this_cpu;</div><div class='ctx'> </div><div class='ctx'> 	if (tlb_type == hypervisor)</div><div class='hunk'>@@ -894,29 +903,24 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)</div><div class='ctx'> 		__local_flush_dcache_page(page);</div><div class='ctx'> 	} else if (cpu_online(cpu)) {</div><div class='ctx'> 		void *pg_addr = page_address(page);</div><div class='del'>-		u64 data0;</div><div class='add'>+		u64 data0 = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (tlb_type == spitfire) {</div><div class='del'>-			data0 =</div><div class='del'>-				((u64)&amp;xcall_flush_dcache_page_spitfire);</div><div class='add'>+			data0 = ((u64)&amp;xcall_flush_dcache_page_spitfire);</div><div class='ctx'> 			if (page_mapping(page) != NULL)</div><div class='ctx'> 				data0 |= ((u64)1 &lt;&lt; 32);</div><div class='del'>-			spitfire_xcall_deliver(data0,</div><div class='del'>-					       __pa(pg_addr),</div><div class='del'>-					       (u64) pg_addr,</div><div class='del'>-					       mask);</div><div class='ctx'> 		} else if (tlb_type == cheetah || tlb_type == cheetah_plus) {</div><div class='ctx'> #ifdef DCACHE_ALIASING_POSSIBLE</div><div class='del'>-			data0 =</div><div class='del'>-				((u64)&amp;xcall_flush_dcache_page_cheetah);</div><div class='del'>-			cheetah_xcall_deliver(data0,</div><div class='del'>-					      __pa(pg_addr),</div><div class='del'>-					      0, mask);</div><div class='add'>+			data0 =	((u64)&amp;xcall_flush_dcache_page_cheetah);</div><div class='ctx'> #endif</div><div class='ctx'> 		}</div><div class='add'>+		if (data0) {</div><div class='add'>+			xcall_deliver(data0, __pa(pg_addr),</div><div class='add'>+				      (u64) pg_addr, &amp;cpumask_of_cpu(cpu));</div><div class='ctx'> #ifdef CONFIG_DEBUG_DCFLUSH</div><div class='del'>-		atomic_inc(&amp;dcpage_flushes_xcall);</div><div class='add'>+			atomic_inc(&amp;dcpage_flushes_xcall);</div><div class='ctx'> #endif</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	put_cpu();</div><div class='hunk'>@@ -924,66 +928,41 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)</div><div class='ctx'> </div><div class='ctx'> void flush_dcache_page_all(struct mm_struct *mm, struct page *page)</div><div class='ctx'> {</div><div class='del'>-	void *pg_addr = page_address(page);</div><div class='del'>-	cpumask_t mask = cpu_online_map;</div><div class='del'>-	u64 data0;</div><div class='add'>+	void *pg_addr;</div><div class='ctx'> 	int this_cpu;</div><div class='add'>+	u64 data0;</div><div class='ctx'> </div><div class='ctx'> 	if (tlb_type == hypervisor)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	this_cpu = get_cpu();</div><div class='ctx'> </div><div class='del'>-	cpu_clear(this_cpu, mask);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_DEBUG_DCFLUSH</div><div class='ctx'> 	atomic_inc(&amp;dcpage_flushes);</div><div class='ctx'> #endif</div><div class='del'>-	if (cpus_empty(mask))</div><div class='del'>-		goto flush_self;</div><div class='add'>+	data0 = 0;</div><div class='add'>+	pg_addr = page_address(page);</div><div class='ctx'> 	if (tlb_type == spitfire) {</div><div class='ctx'> 		data0 = ((u64)&amp;xcall_flush_dcache_page_spitfire);</div><div class='ctx'> 		if (page_mapping(page) != NULL)</div><div class='ctx'> 			data0 |= ((u64)1 &lt;&lt; 32);</div><div class='del'>-		spitfire_xcall_deliver(data0,</div><div class='del'>-				       __pa(pg_addr),</div><div class='del'>-				       (u64) pg_addr,</div><div class='del'>-				       mask);</div><div class='ctx'> 	} else if (tlb_type == cheetah || tlb_type == cheetah_plus) {</div><div class='ctx'> #ifdef DCACHE_ALIASING_POSSIBLE</div><div class='ctx'> 		data0 = ((u64)&amp;xcall_flush_dcache_page_cheetah);</div><div class='del'>-		cheetah_xcall_deliver(data0,</div><div class='del'>-				      __pa(pg_addr),</div><div class='del'>-				      0, mask);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='add'>+	if (data0) {</div><div class='add'>+		xcall_deliver(data0, __pa(pg_addr),</div><div class='add'>+			      (u64) pg_addr, &amp;cpu_online_map);</div><div class='ctx'> #ifdef CONFIG_DEBUG_DCFLUSH</div><div class='del'>-	atomic_inc(&amp;dcpage_flushes_xcall);</div><div class='add'>+		atomic_inc(&amp;dcpage_flushes_xcall);</div><div class='ctx'> #endif</div><div class='del'>- flush_self:</div><div class='add'>+	}</div><div class='ctx'> 	__local_flush_dcache_page(page);</div><div class='ctx'> </div><div class='ctx'> 	put_cpu();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __smp_receive_signal_mask(cpumask_t mask)</div><div class='del'>-{</div><div class='del'>-	smp_cross_call_masked(&amp;xcall_receive_signal, 0, 0, 0, mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void smp_receive_signal(int cpu)</div><div class='del'>-{</div><div class='del'>-	cpumask_t mask = cpumask_of_cpu(cpu);</div><div class='del'>-</div><div class='del'>-	if (cpu_online(cpu))</div><div class='del'>-		__smp_receive_signal_mask(mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void smp_receive_signal_client(int irq, struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	clear_softint(1 &lt;&lt; irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void smp_new_mmu_context_version_client(int irq, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct mm_struct *mm;</div><div class='hunk'>@@ -1022,17 +1001,10 @@ void kgdb_roundup_cpus(unsigned long flags)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void smp_report_regs(void)</div><div class='del'>-{</div><div class='del'>-	smp_cross_call(&amp;xcall_report_regs, 0, 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MAGIC_SYSRQ</div><div class='ctx'> void smp_fetch_global_regs(void)</div><div class='ctx'> {</div><div class='ctx'> 	smp_cross_call(&amp;xcall_fetch_glob_regs, 0, 0, 0);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /* We know that the window frames of the user have been flushed</div><div class='ctx'>  * to the stack before we get here because all callers of us</div><div class='hunk'>@@ -1089,7 +1061,7 @@ void smp_flush_tlb_mm(struct mm_struct *mm)</div><div class='ctx'> </div><div class='ctx'> 	smp_cross_call_masked(&amp;xcall_flush_tlb_mm,</div><div class='ctx'> 			      ctx, 0, 0,</div><div class='del'>-			      mm-&gt;cpu_vm_mask);</div><div class='add'>+			      &amp;mm-&gt;cpu_vm_mask);</div><div class='ctx'> </div><div class='ctx'> local_flush_and_out:</div><div class='ctx'> 	__flush_tlb_mm(ctx, SECONDARY_CONTEXT);</div><div class='hunk'>@@ -1107,7 +1079,7 @@ void smp_flush_tlb_pending(struct mm_struct *mm, unsigned long nr, unsigned long</div><div class='ctx'> 	else</div><div class='ctx'> 		smp_cross_call_masked(&amp;xcall_flush_tlb_pending,</div><div class='ctx'> 				      ctx, nr, (unsigned long) vaddrs,</div><div class='del'>-				      mm-&gt;cpu_vm_mask);</div><div class='add'>+				      &amp;mm-&gt;cpu_vm_mask);</div><div class='ctx'> </div><div class='ctx'> 	__flush_tlb_pending(ctx, nr, vaddrs);</div><div class='ctx'> </div><div class='hunk'>@@ -1208,6 +1180,16 @@ void __devinit smp_prepare_boot_cpu(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __init smp_setup_processor_id(void)</div><div class='add'>+{</div><div class='add'>+	if (tlb_type == spitfire)</div><div class='add'>+		xcall_deliver_impl = spitfire_xcall_deliver;</div><div class='add'>+	else if (tlb_type == cheetah || tlb_type == cheetah_plus)</div><div class='add'>+		xcall_deliver_impl = cheetah_xcall_deliver;</div><div class='add'>+	else</div><div class='add'>+		xcall_deliver_impl = hypervisor_xcall_deliver;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __devinit smp_fill_in_sib_core_maps(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -1321,10 +1303,6 @@ int __cpu_disable(void)</div><div class='ctx'> 	c-&gt;core_id = 0;</div><div class='ctx'> 	c-&gt;proc_id = -1;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;call_lock);</div><div class='del'>-	cpu_clear(cpu, cpu_online_map);</div><div class='del'>-	spin_unlock(&amp;call_lock);</div><div class='del'>-</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure no interrupts point to this cpu.  */</div><div class='hunk'>@@ -1334,6 +1312,10 @@ int __cpu_disable(void)</div><div class='ctx'> 	mdelay(1);</div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> </div><div class='add'>+	ipi_call_lock();</div><div class='add'>+	cpu_clear(cpu, cpu_online_map);</div><div class='add'>+	ipi_call_unlock();</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1376,7 +1358,13 @@ void __init smp_cpus_done(unsigned int max_cpus)</div><div class='ctx'> </div><div class='ctx'> void smp_send_reschedule(int cpu)</div><div class='ctx'> {</div><div class='del'>-	smp_receive_signal(cpu);</div><div class='add'>+	xcall_deliver((u64) &amp;xcall_receive_signal, 0, 0,</div><div class='add'>+		      &amp;cpumask_of_cpu(cpu));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void smp_receive_signal_client(int irq, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	clear_softint(1 &lt;&lt; irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This is a nop because we capture all other cpus</div><div class='head'>diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c<br/>index 504e678ee128..0804f71df6cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sparc64_ksyms.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/sparc64_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sparc64_ksyms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/sparc64_ksyms.c</a></div><div class='hunk'>@@ -68,7 +68,6 @@ extern void *__memscan_zero(void *, size_t);</div><div class='ctx'> extern void *__memscan_generic(void *, int, size_t);</div><div class='ctx'> extern int __memcmp(const void *, const void *, __kernel_size_t);</div><div class='ctx'> extern __kernel_size_t strlen(const char *);</div><div class='del'>-extern void show_regs(struct pt_regs *);</div><div class='ctx'> extern void syscall_trace(struct pt_regs *, int);</div><div class='ctx'> extern void sys_sigsuspend(void);</div><div class='ctx'> extern int compat_sys_ioctl(unsigned int fd, unsigned int cmd, u32 arg);</div><div class='head'>diff --git a/arch/sparc64/kernel/stacktrace.c b/arch/sparc64/kernel/stacktrace.c<br/>index b3e3737750d8..4e21d4a57d3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/stacktrace.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/stacktrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/stacktrace.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/stacktrace.c</a></div><div class='hunk'>@@ -5,10 +5,12 @@</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "kstack.h"</div><div class='add'>+</div><div class='ctx'> void save_stack_trace(struct stack_trace *trace)</div><div class='ctx'> {</div><div class='del'>-	unsigned long ksp, fp, thread_base;</div><div class='ctx'> 	struct thread_info *tp = task_thread_info(current);</div><div class='add'>+	unsigned long ksp, fp;</div><div class='ctx'> </div><div class='ctx'> 	stack_trace_flush();</div><div class='ctx'> </div><div class='hunk'>@@ -18,21 +20,18 @@ void save_stack_trace(struct stack_trace *trace)</div><div class='ctx'> 	);</div><div class='ctx'> </div><div class='ctx'> 	fp = ksp + STACK_BIAS;</div><div class='del'>-	thread_base = (unsigned long) tp;</div><div class='ctx'> 	do {</div><div class='ctx'> 		struct sparc_stackf *sf;</div><div class='ctx'> 		struct pt_regs *regs;</div><div class='ctx'> 		unsigned long pc;</div><div class='ctx'> </div><div class='del'>-		/* Bogus frame pointer? */</div><div class='del'>-		if (fp &lt; (thread_base + sizeof(struct thread_info)) ||</div><div class='del'>-		    fp &gt;= (thread_base + THREAD_SIZE))</div><div class='add'>+		if (!kstack_valid(tp, fp))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		sf = (struct sparc_stackf *) fp;</div><div class='ctx'> 		regs = (struct pt_regs *) (sf + 1);</div><div class='ctx'> </div><div class='del'>-		if ((regs-&gt;magic &amp; ~0x1ff) == PT_REGS_MAGIC) {</div><div class='add'>+		if (kstack_is_trap_frame(tp, regs)) {</div><div class='ctx'> 			if (!(regs-&gt;tstate &amp; TSTATE_PRIV))</div><div class='ctx'> 				break;</div><div class='ctx'> 			pc = regs-&gt;tpc;</div><div class='head'>diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c<br/>index 97b77fb5c50e..3d118531baff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sys_sparc32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/sys_sparc32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sys_sparc32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/sys_sparc32.c</a></div><div class='hunk'>@@ -58,182 +58,6 @@</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/compat_signal.h&gt;</div><div class='ctx'> </div><div class='del'>-asmlinkage long sys32_chown16(const char __user * filename, u16 user, u16 group)</div><div class='del'>-{</div><div class='del'>-	return sys_chown(filename, low2highuid(user), low2highgid(group));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_lchown16(const char __user * filename, u16 user, u16 group)</div><div class='del'>-{</div><div class='del'>-	return sys_lchown(filename, low2highuid(user), low2highgid(group));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_fchown16(unsigned int fd, u16 user, u16 group)</div><div class='del'>-{</div><div class='del'>-	return sys_fchown(fd, low2highuid(user), low2highgid(group));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_setregid16(u16 rgid, u16 egid)</div><div class='del'>-{</div><div class='del'>-	return sys_setregid(low2highgid(rgid), low2highgid(egid));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_setgid16(u16 gid)</div><div class='del'>-{</div><div class='del'>-	return sys_setgid((gid_t)gid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_setreuid16(u16 ruid, u16 euid)</div><div class='del'>-{</div><div class='del'>-	return sys_setreuid(low2highuid(ruid), low2highuid(euid));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_setuid16(u16 uid)</div><div class='del'>-{</div><div class='del'>-	return sys_setuid((uid_t)uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_setresuid16(u16 ruid, u16 euid, u16 suid)</div><div class='del'>-{</div><div class='del'>-	return sys_setresuid(low2highuid(ruid), low2highuid(euid),</div><div class='del'>-		low2highuid(suid));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_getresuid16(u16 __user *ruid, u16 __user *euid, u16 __user *suid)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	if (!(retval = put_user(high2lowuid(current-&gt;uid), ruid)) &amp;&amp;</div><div class='del'>-	    !(retval = put_user(high2lowuid(current-&gt;euid), euid)))</div><div class='del'>-		retval = put_user(high2lowuid(current-&gt;suid), suid);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_setresgid16(u16 rgid, u16 egid, u16 sgid)</div><div class='del'>-{</div><div class='del'>-	return sys_setresgid(low2highgid(rgid), low2highgid(egid),</div><div class='del'>-		low2highgid(sgid));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_getresgid16(u16 __user *rgid, u16 __user *egid, u16 __user *sgid)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	if (!(retval = put_user(high2lowgid(current-&gt;gid), rgid)) &amp;&amp;</div><div class='del'>-	    !(retval = put_user(high2lowgid(current-&gt;egid), egid)))</div><div class='del'>-		retval = put_user(high2lowgid(current-&gt;sgid), sgid);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_setfsuid16(u16 uid)</div><div class='del'>-{</div><div class='del'>-	return sys_setfsuid((uid_t)uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_setfsgid16(u16 gid)</div><div class='del'>-{</div><div class='del'>-	return sys_setfsgid((gid_t)gid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int groups16_to_user(u16 __user *grouplist, struct group_info *group_info)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	u16 group;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; group_info-&gt;ngroups; i++) {</div><div class='del'>-		group = (u16)GROUP_AT(group_info, i);</div><div class='del'>-		if (put_user(group, grouplist+i))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int groups16_from_user(struct group_info *group_info, u16 __user *grouplist)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	u16 group;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; group_info-&gt;ngroups; i++) {</div><div class='del'>-		if (get_user(group, grouplist+i))</div><div class='del'>-			return  -EFAULT;</div><div class='del'>-		GROUP_AT(group_info, i) = (gid_t)group;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_getgroups16(int gidsetsize, u16 __user *grouplist)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (gidsetsize &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	get_group_info(current-&gt;group_info);</div><div class='del'>-	i = current-&gt;group_info-&gt;ngroups;</div><div class='del'>-	if (gidsetsize) {</div><div class='del'>-		if (i &gt; gidsetsize) {</div><div class='del'>-			i = -EINVAL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		if (groups16_to_user(grouplist, current-&gt;group_info)) {</div><div class='del'>-			i = -EFAULT;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	put_group_info(current-&gt;group_info);</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_setgroups16(int gidsetsize, u16 __user *grouplist)</div><div class='del'>-{</div><div class='del'>-	struct group_info *group_info;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_SETGID))</div><div class='del'>-		return -EPERM;</div><div class='del'>-	if ((unsigned)gidsetsize &gt; NGROUPS_MAX)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	group_info = groups_alloc(gidsetsize);</div><div class='del'>-	if (!group_info)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	retval = groups16_from_user(group_info, grouplist);</div><div class='del'>-	if (retval) {</div><div class='del'>-		put_group_info(group_info);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = set_current_groups(group_info);</div><div class='del'>-	put_group_info(group_info);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_getuid16(void)</div><div class='del'>-{</div><div class='del'>-	return high2lowuid(current-&gt;uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_geteuid16(void)</div><div class='del'>-{</div><div class='del'>-	return high2lowuid(current-&gt;euid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_getgid16(void)</div><div class='del'>-{</div><div class='del'>-	return high2lowgid(current-&gt;gid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage long sys32_getegid16(void)</div><div class='del'>-{</div><div class='del'>-	return high2lowgid(current-&gt;egid);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* 32-bit timeval and related flotsam.  */</div><div class='ctx'> </div><div class='ctx'> static inline long put_tv32(struct compat_timeval __user *o, struct timeval *i)</div><div class='head'>diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S<br/>index 1095bf4c5100..0fdbf3ba956e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/systbls.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/systbls.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/systbls.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/systbls.S</a></div><div class='hunk'>@@ -20,21 +20,21 @@</div><div class='ctx'> sys_call_table32:</div><div class='ctx'> /*0*/	.word sys_restart_syscall, sys32_exit, sys_fork, sys_read, sys_write</div><div class='ctx'> /*5*/	.word sys32_open, sys_close, sys32_wait4, sys32_creat, sys_link</div><div class='del'>-/*10*/  .word sys_unlink, sunos_execv, sys_chdir, sys32_chown16, sys32_mknod</div><div class='del'>-/*15*/	.word sys_chmod, sys32_lchown16, sparc_brk, sys32_perfctr, sys32_lseek</div><div class='del'>-/*20*/	.word sys_getpid, sys_capget, sys_capset, sys32_setuid16, sys32_getuid16</div><div class='add'>+/*10*/  .word sys_unlink, sunos_execv, sys_chdir, sys_chown16, sys32_mknod</div><div class='add'>+/*15*/	.word sys_chmod, sys_lchown16, sparc_brk, sys32_perfctr, sys32_lseek</div><div class='add'>+/*20*/	.word sys_getpid, sys_capget, sys_capset, sys_setuid16, sys_getuid16</div><div class='ctx'> /*25*/	.word sys32_vmsplice, compat_sys_ptrace, sys_alarm, sys32_sigaltstack, sys32_pause</div><div class='ctx'> /*30*/	.word compat_sys_utime, sys_lchown, sys_fchown, sys32_access, sys32_nice</div><div class='ctx'> 	.word sys_chown, sys_sync, sys32_kill, compat_sys_newstat, sys32_sendfile</div><div class='ctx'> /*40*/	.word compat_sys_newlstat, sys_dup, sys_pipe, compat_sys_times, sys_getuid</div><div class='del'>-	.word sys32_umount, sys32_setgid16, sys32_getgid16, sys32_signal, sys32_geteuid16</div><div class='del'>-/*50*/	.word sys32_getegid16, sys_acct, sys_nis_syscall, sys_getgid, compat_sys_ioctl</div><div class='add'>+	.word sys32_umount, sys_setgid16, sys_getgid16, sys32_signal, sys_geteuid16</div><div class='add'>+/*50*/	.word sys_getegid16, sys_acct, sys_nis_syscall, sys_getgid, compat_sys_ioctl</div><div class='ctx'> 	.word sys32_reboot, sys32_mmap2, sys_symlink, sys32_readlink, sys32_execve</div><div class='ctx'> /*60*/	.word sys32_umask, sys_chroot, compat_sys_newfstat, compat_sys_fstat64, sys_getpagesize</div><div class='ctx'> 	.word sys32_msync, sys_vfork, sys32_pread64, sys32_pwrite64, sys_geteuid</div><div class='ctx'> /*70*/	.word sys_getegid, sys_mmap, sys_setreuid, sys_munmap, sys_mprotect</div><div class='del'>-	.word sys_madvise, sys_vhangup, sys32_truncate64, sys_mincore, sys32_getgroups16</div><div class='del'>-/*80*/	.word sys32_setgroups16, sys_getpgrp, sys32_setgroups, sys32_setitimer, sys32_ftruncate64</div><div class='add'>+	.word sys_madvise, sys_vhangup, sys32_truncate64, sys_mincore, sys_getgroups16</div><div class='add'>+/*80*/	.word sys_setgroups16, sys_getpgrp, sys32_setgroups, sys32_setitimer, sys32_ftruncate64</div><div class='ctx'> 	.word sys32_swapon, sys32_getitimer, sys_setuid, sys32_sethostname, sys_setgid</div><div class='ctx'> /*90*/	.word sys_dup2, sys_setfsuid, compat_sys_fcntl, sys32_select, sys_setfsgid</div><div class='ctx'> 	.word sys_fsync, sys32_setpriority, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall</div><div class='hunk'>@@ -42,8 +42,8 @@ sys_call_table32:</div><div class='ctx'> 	.word compat_sys_rt_sigtimedwait, sys32_rt_sigqueueinfo, compat_sys_rt_sigsuspend, sys_setresuid, sys_getresuid</div><div class='ctx'> /*110*/	.word sys_setresgid, sys_getresgid, sys_setregid, sys_nis_syscall, sys_nis_syscall</div><div class='ctx'> 	.word sys32_getgroups, sys32_gettimeofday, sys32_getrusage, sys_nis_syscall, sys_getcwd</div><div class='del'>-/*120*/	.word compat_sys_readv, compat_sys_writev, sys32_settimeofday, sys32_fchown16, sys_fchmod</div><div class='del'>-	.word sys_nis_syscall, sys32_setreuid16, sys32_setregid16, sys_rename, sys_truncate</div><div class='add'>+/*120*/	.word compat_sys_readv, compat_sys_writev, sys32_settimeofday, sys_fchown16, sys_fchmod</div><div class='add'>+	.word sys_nis_syscall, sys_setreuid16, sys_setregid16, sys_rename, sys_truncate</div><div class='ctx'> /*130*/	.word sys_ftruncate, sys_flock, compat_sys_lstat64, sys_nis_syscall, sys_nis_syscall</div><div class='ctx'> 	.word sys_nis_syscall, sys32_mkdir, sys_rmdir, compat_sys_utimes, compat_sys_stat64</div><div class='ctx'> /*140*/	.word sys32_sendfile64, sys_nis_syscall, sys32_futex, sys_gettid, compat_sys_getrlimit</div><div class='hunk'>@@ -63,7 +63,7 @@ sys_call_table32:</div><div class='ctx'> /*210*/	.word sys32_fadvise64_64, sys32_tgkill, sys32_waitpid, sys_swapoff, compat_sys_sysinfo</div><div class='ctx'> 	.word compat_sys_ipc, sys32_sigreturn, sys_clone, sys32_ioprio_get, compat_sys_adjtimex</div><div class='ctx'> /*220*/	.word sys32_sigprocmask, sys_ni_syscall, sys32_delete_module, sys_ni_syscall, sys32_getpgid</div><div class='del'>-	.word sys32_bdflush, sys32_sysfs, sys_nis_syscall, sys32_setfsuid16, sys32_setfsgid16</div><div class='add'>+	.word sys32_bdflush, sys32_sysfs, sys_nis_syscall, sys_setfsuid16, sys_setfsgid16</div><div class='ctx'> /*230*/	.word sys32_select, compat_sys_time, sys32_splice, compat_sys_stime, compat_sys_statfs64</div><div class='ctx'> 	.word compat_sys_fstatfs64, sys_llseek, sys_mlock, sys_munlock, sys32_mlockall</div><div class='ctx'> /*240*/	.word sys_munlockall, sys32_sched_setparam, sys32_sched_getparam, sys32_sched_setscheduler, sys32_sched_getscheduler</div><div class='head'>diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c<br/>index a0c6a97eec6e..cc16fdcf98af 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/time.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/time.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/time.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/mostek.h&gt;</div><div class='hunk'>@@ -40,7 +41,6 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/starfire.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='head'>diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c<br/>index bd30ecba5630..c824df13f589 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/traps.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/traps.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/kernel/traps.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -39,6 +40,7 @@</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "entry.h"</div><div class='add'>+#include "kstack.h"</div><div class='ctx'> </div><div class='ctx'> /* When an irrecoverable trap occurs at tl &gt; 0, the trap entry</div><div class='ctx'>  * code logs the trap state registers at every level in the trap</div><div class='hunk'>@@ -1777,7 +1779,7 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,</div><div class='ctx'> 	       pfx,</div><div class='ctx'> 	       ent-&gt;err_raddr, ent-&gt;err_size, ent-&gt;err_cpu);</div><div class='ctx'> </div><div class='del'>-	__show_regs(regs);</div><div class='add'>+	show_regs(regs);</div><div class='ctx'> </div><div class='ctx'> 	if ((cnt = atomic_read(ocnt)) != 0) {</div><div class='ctx'> 		atomic_set(ocnt, 0);</div><div class='hunk'>@@ -2115,14 +2117,12 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)</div><div class='ctx'> 		struct pt_regs *regs;</div><div class='ctx'> 		unsigned long pc;</div><div class='ctx'> </div><div class='del'>-		/* Bogus frame pointer? */</div><div class='del'>-		if (fp &lt; (thread_base + sizeof(struct thread_info)) ||</div><div class='del'>-		    fp &gt;= (thread_base + THREAD_SIZE))</div><div class='add'>+		if (!kstack_valid(tp, fp))</div><div class='ctx'> 			break;</div><div class='ctx'> 		sf = (struct sparc_stackf *) fp;</div><div class='ctx'> 		regs = (struct pt_regs *) (sf + 1);</div><div class='ctx'> </div><div class='del'>-		if ((regs-&gt;magic &amp; ~0x1ff) == PT_REGS_MAGIC) {</div><div class='add'>+		if (kstack_is_trap_frame(tp, regs)) {</div><div class='ctx'> 			if (!(regs-&gt;tstate &amp; TSTATE_PRIV))</div><div class='ctx'> 				break;</div><div class='ctx'> 			pc = regs-&gt;tpc;</div><div class='hunk'>@@ -2177,7 +2177,6 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)</div><div class='ctx'> void die_if_kernel(char *str, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	static int die_counter;</div><div class='del'>-	extern void smp_report_regs(void);</div><div class='ctx'> 	int count = 0;</div><div class='ctx'> 	</div><div class='ctx'> 	/* Amuse the user. */</div><div class='hunk'>@@ -2190,7 +2189,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)</div><div class='ctx'> 	printk("%s(%d): %s [#%d]\n", current-&gt;comm, task_pid_nr(current), str, ++die_counter);</div><div class='ctx'> 	notify_die(DIE_OOPS, str, regs, 0, 255, SIGSEGV);</div><div class='ctx'> 	__asm__ __volatile__("flushw");</div><div class='del'>-	__show_regs(regs);</div><div class='add'>+	show_regs(regs);</div><div class='ctx'> 	add_taint(TAINT_DIE);</div><div class='ctx'> 	if (regs-&gt;tstate &amp; TSTATE_PRIV) {</div><div class='ctx'> 		struct reg_window *rw = (struct reg_window *)</div><div class='hunk'>@@ -2215,11 +2214,6 @@ void die_if_kernel(char *str, struct pt_regs *regs)</div><div class='ctx'> 		}</div><div class='ctx'> 		user_instruction_dump ((unsigned int __user *) regs-&gt;tpc);</div><div class='ctx'> 	}</div><div class='del'>-#if 0</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	smp_report_regs();</div><div class='del'>-#endif</div><div class='del'>-#endif                                                	</div><div class='ctx'> 	if (regs-&gt;tstate &amp; TSTATE_PRIV)</div><div class='ctx'> 		do_exit(SIGKILL);</div><div class='ctx'> 	do_exit(SIGSEGV);</div><div class='hunk'>@@ -2460,7 +2454,7 @@ struct trap_per_cpu trap_block[NR_CPUS];</div><div class='ctx'> /* This can get invoked before sched_init() so play it super safe</div><div class='ctx'>  * and use hard_smp_processor_id().</div><div class='ctx'>  */</div><div class='del'>-void init_cur_cpu_trap(struct thread_info *t)</div><div class='add'>+void notrace init_cur_cpu_trap(struct thread_info *t)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = hard_smp_processor_id();</div><div class='ctx'> 	struct trap_per_cpu *p = &amp;trap_block[cpu];</div><div class='head'>diff --git a/arch/sparc64/lib/mcount.S b/arch/sparc64/lib/mcount.S<br/>index 7735a7a60533..fad90ddb3a28 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/lib/mcount.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/lib/mcount.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/lib/mcount.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/lib/mcount.S</a></div><div class='hunk'>@@ -48,12 +48,45 @@ mcount:</div><div class='ctx'> 	sub		%g3, STACK_BIAS, %g3</div><div class='ctx'> 	cmp		%sp, %g3</div><div class='ctx'> 	bg,pt		%xcc, 1f</div><div class='del'>-	 sethi		%hi(panicstring), %g3</div><div class='add'>+	 nop</div><div class='add'>+	lduh		[%g6 + TI_CPU], %g1</div><div class='add'>+	sethi		%hi(hardirq_stack), %g3</div><div class='add'>+	or		%g3, %lo(hardirq_stack), %g3</div><div class='add'>+	sllx		%g1, 3, %g1</div><div class='add'>+	ldx		[%g3 + %g1], %g7</div><div class='add'>+	sub		%g7, STACK_BIAS, %g7</div><div class='add'>+	cmp		%sp, %g7</div><div class='add'>+	bleu,pt		%xcc, 2f</div><div class='add'>+	 sethi		%hi(THREAD_SIZE), %g3</div><div class='add'>+	add		%g7, %g3, %g7</div><div class='add'>+	cmp		%sp, %g7</div><div class='add'>+	blu,pn		%xcc, 1f</div><div class='add'>+2:	 sethi		%hi(softirq_stack), %g3</div><div class='add'>+	or		%g3, %lo(softirq_stack), %g3</div><div class='add'>+	ldx		[%g3 + %g1], %g7</div><div class='add'>+	cmp		%sp, %g7</div><div class='add'>+	bleu,pt		%xcc, 2f</div><div class='add'>+	 sethi		%hi(THREAD_SIZE), %g3</div><div class='add'>+	add		%g7, %g3, %g7</div><div class='add'>+	cmp		%sp, %g7</div><div class='add'>+	blu,pn		%xcc, 1f</div><div class='add'>+	 nop</div><div class='add'>+	/* If we are already on ovstack, don't hop onto it</div><div class='add'>+	 * again, we are already trying to output the stack overflow</div><div class='add'>+	 * message.</div><div class='add'>+	 */</div><div class='ctx'> 	sethi		%hi(ovstack), %g7		! cant move to panic stack fast enough</div><div class='ctx'> 	 or		%g7, %lo(ovstack), %g7</div><div class='del'>-	add		%g7, OVSTACKSIZE, %g7</div><div class='add'>+	add		%g7, OVSTACKSIZE, %g3</div><div class='add'>+	sub		%g3, STACK_BIAS + 192, %g3</div><div class='ctx'> 	sub		%g7, STACK_BIAS, %g7</div><div class='del'>-	mov		%g7, %sp</div><div class='add'>+	cmp		%sp, %g7</div><div class='add'>+	blu,pn		%xcc, 2f</div><div class='add'>+	 cmp		%sp, %g3</div><div class='add'>+	bleu,pn		%xcc, 1f</div><div class='add'>+	 nop</div><div class='add'>+2:	mov		%g3, %sp</div><div class='add'>+	sethi		%hi(panicstring), %g3</div><div class='ctx'> 	call		prom_printf</div><div class='ctx'> 	 or		%g3, %lo(panicstring), %o0</div><div class='ctx'> 	call		prom_halt</div><div class='head'>diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c<br/>index 4e821b3ecb03..a41df7bef035 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/mm/init.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/mm/init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/mm/init.c</a></div><div class='hunk'>@@ -49,6 +49,7 @@</div><div class='ctx'> #include &lt;asm/sstate.h&gt;</div><div class='ctx'> #include &lt;asm/mdesc.h&gt;</div><div class='ctx'> #include &lt;asm/cpudata.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MAX_PHYS_ADDRESS	(1UL &lt;&lt; 42UL)</div><div class='ctx'> #define KPTE_BITMAP_CHUNK_SZ	(256UL * 1024UL * 1024UL)</div><div class='hunk'>@@ -795,6 +796,9 @@ static unsigned long nid_range(unsigned long start, unsigned long end,</div><div class='ctx'> 		start += PAGE_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (start &gt; end)</div><div class='add'>+		start = end;</div><div class='add'>+</div><div class='ctx'> 	return start;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -1722,8 +1726,7 @@ void __init paging_init(void)</div><div class='ctx'> </div><div class='ctx'> 	find_ramdisk(phys_base);</div><div class='ctx'> </div><div class='del'>-	if (cmdline_memory_size)</div><div class='del'>-		lmb_enforce_memory_limit(phys_base + cmdline_memory_size);</div><div class='add'>+	lmb_enforce_memory_limit(cmdline_memory_size);</div><div class='ctx'> </div><div class='ctx'> 	lmb_analyze();</div><div class='ctx'> 	lmb_dump_all();</div><div class='hunk'>@@ -1771,6 +1774,16 @@ void __init paging_init(void)</div><div class='ctx'> 	if (tlb_type == hypervisor)</div><div class='ctx'> 		sun4v_mdesc_init();</div><div class='ctx'> </div><div class='add'>+	/* Once the OF device tree and MDESC have been setup, we know</div><div class='add'>+	 * the list of possible cpus.  Therefore we can allocate the</div><div class='add'>+	 * IRQ stacks.</div><div class='add'>+	 */</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		/* XXX Use node local allocations... XXX */</div><div class='add'>+		softirq_stack[i] = __va(lmb_alloc(THREAD_SIZE, THREAD_SIZE));</div><div class='add'>+		hardirq_stack[i] = __va(lmb_alloc(THREAD_SIZE, THREAD_SIZE));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Setup bootmem... */</div><div class='ctx'> 	last_valid_pfn = end_pfn = bootmem_init(phys_base);</div><div class='ctx'> </div><div class='hunk'>@@ -1830,7 +1843,7 @@ static int pavail_rescan_ents __initdata;</div><div class='ctx'>  * memory list again, and make sure it provides at least as much</div><div class='ctx'>  * memory as 'pavail' does.</div><div class='ctx'>  */</div><div class='del'>-static void setup_valid_addr_bitmap_from_pavail(void)</div><div class='add'>+static void __init setup_valid_addr_bitmap_from_pavail(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1950,6 +1963,15 @@ void __init mem_init(void)</div><div class='ctx'> void free_initmem(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr, initend;</div><div class='add'>+	int do_free = 1;</div><div class='add'>+</div><div class='add'>+	/* If the physical memory maps were trimmed by kernel command</div><div class='add'>+	 * line options, don't even try freeing this initmem stuff up.</div><div class='add'>+	 * The kernel image could have been in the trimmed out region</div><div class='add'>+	 * and if so the freeing below will free invalid page structs.</div><div class='add'>+	 */</div><div class='add'>+	if (cmdline_memory_size)</div><div class='add'>+		do_free = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The init section is aligned to 8k in vmlinux.lds. Page align for &gt;8k pagesizes.</div><div class='hunk'>@@ -1964,13 +1986,16 @@ void free_initmem(void)</div><div class='ctx'> 			((unsigned long) __va(kern_base)) -</div><div class='ctx'> 			((unsigned long) KERNBASE));</div><div class='ctx'> 		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);</div><div class='del'>-		p = virt_to_page(page);</div><div class='ctx'> </div><div class='del'>-		ClearPageReserved(p);</div><div class='del'>-		init_page_count(p);</div><div class='del'>-		__free_page(p);</div><div class='del'>-		num_physpages++;</div><div class='del'>-		totalram_pages++;</div><div class='add'>+		if (do_free) {</div><div class='add'>+			p = virt_to_page(page);</div><div class='add'>+</div><div class='add'>+			ClearPageReserved(p);</div><div class='add'>+			init_page_count(p);</div><div class='add'>+			__free_page(p);</div><div class='add'>+			num_physpages++;</div><div class='add'>+			totalram_pages++;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc64/mm/tsb.c b/arch/sparc64/mm/tsb.c<br/>index 3547937b17a2..587f8efb2e05 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/mm/tsb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/mm/tsb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/mm/tsb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/mm/tsb.c</a></div><div class='hunk'>@@ -1,9 +1,10 @@</div><div class='ctx'> /* arch/sparc64/mm/tsb.c</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2006 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='add'>+ * Copyright (C) 2006, 2008 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/preempt.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='hunk'>@@ -415,7 +416,9 @@ retry_tsb_alloc:</div><div class='ctx'> 		tsb_context_switch(mm);</div><div class='ctx'> </div><div class='ctx'> 		/* Now force other processors to do the same.  */</div><div class='add'>+		preempt_disable();</div><div class='ctx'> 		smp_tsb_sync(mm);</div><div class='add'>+		preempt_enable();</div><div class='ctx'> </div><div class='ctx'> 		/* Now it is safe to free the old tsb.  */</div><div class='ctx'> 		kmem_cache_free(tsb_caches[old_cache_index], old_tsb);</div><div class='head'>diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S<br/>index 4c8ca131ffaf..86773e89dc1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/mm/ultra.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/sparc64/mm/ultra.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/mm/ultra.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/sparc64/mm/ultra.S</a></div><div class='hunk'>@@ -480,42 +480,6 @@ xcall_sync_tick:</div><div class='ctx'> 	b		rtrap_xcall</div><div class='ctx'> 	 ldx		[%sp + PTREGS_OFF + PT_V9_TSTATE], %l1</div><div class='ctx'> </div><div class='del'>-	/* NOTE: This is SPECIAL!!  We do etrap/rtrap however</div><div class='del'>-	 *       we choose to deal with the "BH's run with</div><div class='del'>-	 *       %pil==15" problem (described in asm/pil.h)</div><div class='del'>-	 *       by just invoking rtrap directly past where</div><div class='del'>-	 *       BH's are checked for.</div><div class='del'>-	 *</div><div class='del'>-	 *       We do it like this because we do not want %pil==15</div><div class='del'>-	 *       lockups to prevent regs being reported.</div><div class='del'>-	 */</div><div class='del'>-	.globl		xcall_report_regs</div><div class='del'>-xcall_report_regs:</div><div class='del'>-</div><div class='del'>-661:	rdpr		%pstate, %g2</div><div class='del'>-	wrpr		%g2, PSTATE_IG | PSTATE_AG, %pstate</div><div class='del'>-	.section	.sun4v_2insn_patch, "ax"</div><div class='del'>-	.word		661b</div><div class='del'>-	nop</div><div class='del'>-	nop</div><div class='del'>-	.previous</div><div class='del'>-</div><div class='del'>-	rdpr		%pil, %g2</div><div class='del'>-	wrpr		%g0, 15, %pil</div><div class='del'>-	sethi		%hi(109f), %g7</div><div class='del'>-	b,pt		%xcc, etrap_irq</div><div class='del'>-109:	 or		%g7, %lo(109b), %g7</div><div class='del'>-#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='del'>-	call		trace_hardirqs_off</div><div class='del'>-	 nop</div><div class='del'>-#endif</div><div class='del'>-	call		__show_regs</div><div class='del'>-	 add		%sp, PTREGS_OFF, %o0</div><div class='del'>-	/* Has to be a non-v9 branch due to the large distance. */</div><div class='del'>-	b		rtrap_xcall</div><div class='del'>-	 ldx		[%sp + PTREGS_OFF + PT_V9_TSTATE], %l1</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MAGIC_SYSRQ</div><div class='ctx'> 	.globl		xcall_fetch_glob_regs</div><div class='ctx'> xcall_fetch_glob_regs:</div><div class='ctx'> 	sethi		%hi(global_reg_snapshot), %g1</div><div class='hunk'>@@ -531,6 +495,13 @@ xcall_fetch_glob_regs:</div><div class='ctx'> 	stx		%g7, [%g1 + GR_SNAP_TNPC]</div><div class='ctx'> 	stx		%o7, [%g1 + GR_SNAP_O7]</div><div class='ctx'> 	stx		%i7, [%g1 + GR_SNAP_I7]</div><div class='add'>+	/* Don't try this at home kids... */</div><div class='add'>+	rdpr		%cwp, %g2</div><div class='add'>+	sub		%g2, 1, %g7</div><div class='add'>+	wrpr		%g7, %cwp</div><div class='add'>+	mov		%i7, %g7</div><div class='add'>+	wrpr		%g2, %cwp</div><div class='add'>+	stx		%g7, [%g1 + GR_SNAP_RPC]</div><div class='ctx'> 	sethi		%hi(trap_block), %g7</div><div class='ctx'> 	or		%g7, %lo(trap_block), %g7</div><div class='ctx'> 	sllx		%g2, TRAP_BLOCK_SZ_SHIFT, %g2</div><div class='hunk'>@@ -539,7 +510,6 @@ xcall_fetch_glob_regs:</div><div class='ctx'> 	membar		#StoreStore</div><div class='ctx'> 	stx		%g3, [%g1 + GR_SNAP_THREAD]</div><div class='ctx'> 	retry</div><div class='del'>-#endif /* CONFIG_MAGIC_SYSRQ */</div><div class='ctx'> </div><div class='ctx'> #ifdef DCACHE_ALIASING_POSSIBLE</div><div class='ctx'> 	.align		32</div><div class='head'>diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c<br/>index 5047490fc299..d741f35d7b3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/drivers/line.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/um/drivers/line.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/drivers/line.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/um/drivers/line.c</a></div><div class='hunk'>@@ -362,19 +362,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data)</div><div class='ctx'> 	if (tty == NULL)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(TTY_DO_WRITE_WAKEUP, &amp;tty-&gt;flags) &amp;&amp;</div><div class='del'>-	   (tty-&gt;ldisc.write_wakeup != NULL))</div><div class='del'>-		(tty-&gt;ldisc.write_wakeup)(tty);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * BLOCKING mode</div><div class='del'>-	 * In blocking mode, everything sleeps on tty-&gt;write_wait.</div><div class='del'>-	 * Sleeping in the console driver would break non-blocking</div><div class='del'>-	 * writes.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (waitqueue_active(&amp;tty-&gt;write_wait))</div><div class='del'>-		wake_up_interruptible(&amp;tty-&gt;write_wait);</div><div class='add'>+	tty_wakeup(tty);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig<br/>index 2e6080951350..995165509355 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/Kconfig</a></div><div class='hunk'>@@ -22,7 +22,6 @@ config X86</div><div class='ctx'> 	select HAVE_IDE</div><div class='ctx'> 	select HAVE_OPROFILE</div><div class='ctx'> 	select HAVE_IOREMAP_PROT</div><div class='del'>-	select HAVE_GET_USER_PAGES_FAST</div><div class='ctx'> 	select HAVE_KPROBES</div><div class='ctx'> 	select ARCH_WANT_OPTIONAL_GPIOLIB</div><div class='ctx'> 	select HAVE_KRETPROBES</div><div class='hunk'>@@ -578,35 +577,29 @@ config SWIOTLB</div><div class='ctx'> </div><div class='ctx'> config IOMMU_HELPER</div><div class='ctx'> 	def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)</div><div class='add'>+</div><div class='ctx'> config MAXSMP</div><div class='ctx'> 	bool "Configure Maximum number of SMP Processors and NUMA Nodes"</div><div class='del'>-	depends on X86_64 &amp;&amp; SMP</div><div class='add'>+	depends on X86_64 &amp;&amp; SMP &amp;&amp; BROKEN</div><div class='ctx'> 	default n</div><div class='ctx'> 	help</div><div class='ctx'> 	  Configure maximum number of CPUS and NUMA Nodes for this architecture.</div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='del'>-if MAXSMP</div><div class='del'>-config NR_CPUS</div><div class='del'>-	int</div><div class='del'>-	default "4096"</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-if !MAXSMP</div><div class='ctx'> config NR_CPUS</div><div class='del'>-	int "Maximum number of CPUs (2-4096)"</div><div class='del'>-	range 2 4096</div><div class='add'>+	int "Maximum number of CPUs (2-512)" if !MAXSMP</div><div class='add'>+	range 2 512</div><div class='ctx'> 	depends on SMP</div><div class='add'>+	default "4096" if MAXSMP</div><div class='ctx'> 	default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000</div><div class='ctx'> 	default "8"</div><div class='ctx'> 	help</div><div class='ctx'> 	  This allows you to specify the maximum number of CPUs which this</div><div class='del'>-	  kernel will support.  The maximum supported value is 4096 and the</div><div class='add'>+	  kernel will support.  The maximum supported value is 512 and the</div><div class='ctx'> 	  minimum value which makes sense is 2.</div><div class='ctx'> </div><div class='ctx'> 	  This is purely to save memory - each supported CPU adds</div><div class='ctx'> 	  approximately eight kilobytes to the kernel image.</div><div class='del'>-endif</div><div class='ctx'> </div><div class='ctx'> config SCHED_SMT</div><div class='ctx'> 	bool "SMT (Hyperthreading) scheduler support"</div><div class='hunk'>@@ -974,9 +967,9 @@ config NUMA</div><div class='ctx'> 	  local memory controller of the CPU and add some more</div><div class='ctx'> 	  NUMA awareness to the kernel.</div><div class='ctx'> </div><div class='del'>-	  For i386 this is currently highly experimental and should be only</div><div class='add'>+	  For 32-bit this is currently highly experimental and should be only</div><div class='ctx'> 	  used for kernel development. It might also cause boot failures.</div><div class='del'>-	  For x86_64 this is recommended on all multiprocessor Opteron systems.</div><div class='add'>+	  For 64-bit this is recommended on all multiprocessor Opteron systems.</div><div class='ctx'> 	  If the system is EM64T, you should say N unless your system is</div><div class='ctx'> 	  EM64T NUMA.</div><div class='ctx'> </div><div class='hunk'>@@ -1019,17 +1012,10 @@ config NUMA_EMU</div><div class='ctx'> 	  into virtual nodes when booted with "numa=fake=N", where N is the</div><div class='ctx'> 	  number of nodes. This is only useful for debugging.</div><div class='ctx'> </div><div class='del'>-if MAXSMP</div><div class='del'>-</div><div class='ctx'> config NODES_SHIFT</div><div class='del'>-	int</div><div class='del'>-	default "9"</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-if !MAXSMP</div><div class='del'>-config NODES_SHIFT</div><div class='del'>-	int "Maximum NUMA Nodes (as a power of 2)"</div><div class='add'>+	int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP</div><div class='ctx'> 	range 1 9   if X86_64</div><div class='add'>+	default "9" if MAXSMP</div><div class='ctx'> 	default "6" if X86_64</div><div class='ctx'> 	default "4" if X86_NUMAQ</div><div class='ctx'> 	default "3"</div><div class='hunk'>@@ -1037,7 +1023,6 @@ config NODES_SHIFT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Specify the maximum number of NUMA Nodes available on the target</div><div class='ctx'> 	  system.  Increases memory reserved to accomodate various tables.</div><div class='del'>-endif</div><div class='ctx'> </div><div class='ctx'> config HAVE_ARCH_BOOTMEM_NODE</div><div class='ctx'> 	def_bool y</div><div class='hunk'>@@ -1286,7 +1271,7 @@ config KEXEC</div><div class='ctx'> 	  strongly in flux, so no good recommendation can be made.</div><div class='ctx'> </div><div class='ctx'> config CRASH_DUMP</div><div class='del'>-	bool "kernel crash dumps (EXPERIMENTAL)"</div><div class='add'>+	bool "kernel crash dumps"</div><div class='ctx'> 	depends on X86_64 || (X86_32 &amp;&amp; HIGHMEM)</div><div class='ctx'> 	help</div><div class='ctx'> 	  Generate crash dump after being started by kexec.</div><div class='head'>diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu<br/>index 2c518fbc52ec..b225219c448c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/Kconfig.cpu?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/Kconfig.cpu</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/Kconfig.cpu?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/Kconfig.cpu</a></div><div class='hunk'>@@ -382,14 +382,17 @@ config X86_OOSTORE</div><div class='ctx'> # P6_NOPs are a relatively minor optimization that require a family &gt;=</div><div class='ctx'> # 6 processor, except that it is broken on certain VIA chips.</div><div class='ctx'> # Furthermore, AMD chips prefer a totally different sequence of NOPs</div><div class='del'>-# (which work on all CPUs).  As a result, disallow these if we're</div><div class='del'>-# compiling X86_GENERIC but not X86_64 (these NOPs do work on all</div><div class='del'>-# x86-64 capable chips); the list of processors in the right-hand clause</div><div class='del'>-# are the cores that benefit from this optimization.</div><div class='add'>+# (which work on all CPUs).  In addition, it looks like Virtual PC</div><div class='add'>+# does not understand them.</div><div class='add'>+#</div><div class='add'>+# As a result, disallow these if we're not compiling for X86_64 (these</div><div class='add'>+# NOPs do work on all x86-64 capable chips); the list of processors in</div><div class='add'>+# the right-hand clause are the cores that benefit from this optimization.</div><div class='ctx'> #</div><div class='ctx'> config X86_P6_NOP</div><div class='ctx'> 	def_bool y</div><div class='del'>-	depends on (X86_64 || !X86_GENERIC) &amp;&amp; (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC)</div><div class='add'>+	depends on X86_64</div><div class='add'>+	depends on (MCORE2 || MPENTIUM4 || MPSC)</div><div class='ctx'> </div><div class='ctx'> config X86_TSC</div><div class='ctx'> 	def_bool y</div><div class='head'>diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h<br/>index a34b9982c7cb..cc0ef13fba7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/boot/boot.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/boot/boot.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/boot/boot.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/boot/boot.h</a></div><div class='hunk'>@@ -24,10 +24,14 @@</div><div class='ctx'> #include &lt;linux/edd.h&gt;</div><div class='ctx'> #include &lt;asm/boot.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='add'>+#include "bitops.h"</div><div class='add'>+#include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Useful macros */</div><div class='ctx'> #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))</div><div class='ctx'> </div><div class='add'>+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))</div><div class='add'>+</div><div class='ctx'> extern struct setup_header hdr;</div><div class='ctx'> extern struct boot_params boot_params;</div><div class='ctx'> </div><div class='hunk'>@@ -242,6 +246,12 @@ int cmdline_find_option(const char *option, char *buffer, int bufsize);</div><div class='ctx'> int cmdline_find_option_bool(const char *option);</div><div class='ctx'> </div><div class='ctx'> /* cpu.c, cpucheck.c */</div><div class='add'>+struct cpu_features {</div><div class='add'>+	int level;		/* Family, or 64 for x86-64 */</div><div class='add'>+	int model;</div><div class='add'>+	u32 flags[NCAPINTS];</div><div class='add'>+};</div><div class='add'>+extern struct cpu_features cpu;</div><div class='ctx'> int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr);</div><div class='ctx'> int validate_cpu(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/boot/cpu.c b/arch/x86/boot/cpu.c<br/>index 92d6fd73dc7d..75298fe2edca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/boot/cpu.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/boot/cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/boot/cpu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/boot/cpu.c</a></div><div class='hunk'>@@ -16,9 +16,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "boot.h"</div><div class='del'>-#include "bitops.h"</div><div class='del'>-#include &lt;asm/cpufeature.h&gt;</div><div class='del'>-</div><div class='ctx'> #include "cpustr.h"</div><div class='ctx'> </div><div class='ctx'> static char *cpu_name(int level)</div><div class='head'>diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c<br/>index 7804389ee005..4d3ff037201f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/boot/cpucheck.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/boot/cpucheck.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/boot/cpucheck.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/boot/cpucheck.c</a></div><div class='hunk'>@@ -22,21 +22,13 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef _SETUP</div><div class='ctx'> # include "boot.h"</div><div class='del'>-# include "bitops.h"</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> #include &lt;asm/processor-flags.h&gt;</div><div class='ctx'> #include &lt;asm/required-features.h&gt;</div><div class='ctx'> #include &lt;asm/msr-index.h&gt;</div><div class='ctx'> </div><div class='del'>-struct cpu_features {</div><div class='del'>-	int level;		/* Family, or 64 for x86-64 */</div><div class='del'>-	int model;</div><div class='del'>-	u32 flags[NCAPINTS];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cpu_features cpu;</div><div class='add'>+struct cpu_features cpu;</div><div class='ctx'> static u32 cpu_vendor[3];</div><div class='ctx'> static u32 err_flags[NCAPINTS];</div><div class='ctx'> </div><div class='hunk'>@@ -46,12 +38,12 @@ static const u32 req_flags[NCAPINTS] =</div><div class='ctx'> {</div><div class='ctx'> 	REQUIRED_MASK0,</div><div class='ctx'> 	REQUIRED_MASK1,</div><div class='del'>-	REQUIRED_MASK2,</div><div class='del'>-	REQUIRED_MASK3,</div><div class='add'>+	0, /* REQUIRED_MASK2 not implemented in this file */</div><div class='add'>+	0, /* REQUIRED_MASK3 not implemented in this file */</div><div class='ctx'> 	REQUIRED_MASK4,</div><div class='del'>-	REQUIRED_MASK5,</div><div class='add'>+	0, /* REQUIRED_MASK5 not implemented in this file */</div><div class='ctx'> 	REQUIRED_MASK6,</div><div class='del'>-	REQUIRED_MASK7,</div><div class='add'>+	0, /* REQUIRED_MASK7 not implemented in this file */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define A32(a, b, c, d) (((d) &lt;&lt; 24)+((c) &lt;&lt; 16)+((b) &lt;&lt; 8)+(a))</div><div class='head'>diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c<br/>index 2296164b54d2..197421db1af1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/boot/main.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/boot/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/boot/main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/boot/main.c</a></div><div class='hunk'>@@ -73,6 +73,11 @@ static void keyboard_set_repeat(void)</div><div class='ctx'>  */</div><div class='ctx'> static void query_ist(void)</div><div class='ctx'> {</div><div class='add'>+	/* Some older BIOSes apparently crash on this call, so filter</div><div class='add'>+	   it from machines too old to have SpeedStep at all. */</div><div class='add'>+	if (cpu.level &lt; 6)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	asm("int $0x15"</div><div class='ctx'> 	    : "=a" (boot_params.ist_info.signature),</div><div class='ctx'> 	      "=b" (boot_params.ist_info.command),</div><div class='head'>diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c<br/>index 53165c97336b..8c3c25f35578 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/boot/memory.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/boot/memory.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/boot/memory.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/boot/memory.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "boot.h"</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SMAP	0x534d4150	/* ASCII "SMAP" */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig<br/>index 4d73f53287b6..104275e191a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/configs/i386_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/configs/i386_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/configs/i386_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/configs/i386_defconfig</a></div><div class='hunk'>@@ -1,13 +1,13 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc1</div><div class='del'>-# Sun May  4 19:59:02 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Mon Aug 25 15:04:00 2008</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_64BIT is not set</div><div class='ctx'> CONFIG_X86_32=y</div><div class='ctx'> # CONFIG_X86_64 is not set</div><div class='ctx'> CONFIG_X86=y</div><div class='del'>-CONFIG_DEFCONFIG_LIST="arch/x86/configs/i386_defconfig"</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"</div><div class='ctx'> # CONFIG_GENERIC_LOCKBREAK is not set</div><div class='ctx'> CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_CMOS_UPDATE=y</div><div class='hunk'>@@ -53,6 +53,7 @@ CONFIG_X86_HT=y</div><div class='ctx'> CONFIG_X86_BIOS_REBOOT=y</div><div class='ctx'> CONFIG_X86_TRAMPOLINE=y</div><div class='ctx'> CONFIG_KTIME_SCALAR=y</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # General setup</div><div class='hunk'>@@ -82,6 +83,7 @@ CONFIG_CGROUPS=y</div><div class='ctx'> CONFIG_CGROUP_NS=y</div><div class='ctx'> # CONFIG_CGROUP_DEVICE is not set</div><div class='ctx'> CONFIG_CPUSETS=y</div><div class='add'>+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y</div><div class='ctx'> CONFIG_GROUP_SCHED=y</div><div class='ctx'> CONFIG_FAIR_GROUP_SCHED=y</div><div class='ctx'> # CONFIG_RT_GROUP_SCHED is not set</div><div class='hunk'>@@ -105,7 +107,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -113,6 +114,7 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> # CONFIG_COMPAT_BRK is not set</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -132,27 +134,35 @@ CONFIG_MARKERS=y</div><div class='ctx'> # CONFIG_OPROFILE is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> CONFIG_KPROBES=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='ctx'> CONFIG_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+CONFIG_USE_GENERIC_SMP_HELPERS=y</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_HAVE_GENERIC_DMA_COHERENT=y</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_STOP_MACHINE=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> # CONFIG_LBD is not set</div><div class='ctx'> CONFIG_BLK_DEV_IO_TRACE=y</div><div class='ctx'> # CONFIG_LSF is not set</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -176,19 +186,17 @@ CONFIG_NO_HZ=y</div><div class='ctx'> CONFIG_HIGH_RES_TIMERS=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='ctx'> CONFIG_SMP=y</div><div class='add'>+CONFIG_X86_FIND_SMP_CONFIG=y</div><div class='add'>+CONFIG_X86_MPPARSE=y</div><div class='ctx'> CONFIG_X86_PC=y</div><div class='ctx'> # CONFIG_X86_ELAN is not set</div><div class='ctx'> # CONFIG_X86_VOYAGER is not set</div><div class='del'>-# CONFIG_X86_NUMAQ is not set</div><div class='del'>-# CONFIG_X86_SUMMIT is not set</div><div class='del'>-# CONFIG_X86_BIGSMP is not set</div><div class='del'>-# CONFIG_X86_VISWS is not set</div><div class='ctx'> # CONFIG_X86_GENERICARCH is not set</div><div class='del'>-# CONFIG_X86_ES7000 is not set</div><div class='del'>-# CONFIG_X86_RDC321X is not set</div><div class='ctx'> # CONFIG_X86_VSMP is not set</div><div class='add'>+# CONFIG_X86_RDC321X is not set</div><div class='ctx'> CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_PARAVIRT_GUEST is not set</div><div class='add'>+# CONFIG_MEMTEST is not set</div><div class='ctx'> # CONFIG_M386 is not set</div><div class='ctx'> # CONFIG_M486 is not set</div><div class='ctx'> # CONFIG_M586 is not set</div><div class='hunk'>@@ -215,21 +223,19 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_MPSC is not set</div><div class='ctx'> CONFIG_MCORE2=y</div><div class='ctx'> # CONFIG_GENERIC_CPU is not set</div><div class='del'>-# CONFIG_X86_GENERIC is not set</div><div class='add'>+CONFIG_X86_GENERIC=y</div><div class='ctx'> CONFIG_X86_CPU=y</div><div class='ctx'> CONFIG_X86_CMPXCHG=y</div><div class='del'>-CONFIG_X86_L1_CACHE_SHIFT=6</div><div class='add'>+CONFIG_X86_L1_CACHE_SHIFT=7</div><div class='ctx'> CONFIG_X86_XADD=y</div><div class='ctx'> CONFIG_X86_WP_WORKS_OK=y</div><div class='ctx'> CONFIG_X86_INVLPG=y</div><div class='ctx'> CONFIG_X86_BSWAP=y</div><div class='ctx'> CONFIG_X86_POPAD_OK=y</div><div class='del'>-CONFIG_X86_GOOD_APIC=y</div><div class='ctx'> CONFIG_X86_INTEL_USERCOPY=y</div><div class='ctx'> CONFIG_X86_USE_PPRO_CHECKSUM=y</div><div class='del'>-CONFIG_X86_P6_NOP=y</div><div class='ctx'> CONFIG_X86_TSC=y</div><div class='del'>-CONFIG_X86_MINIMUM_CPU_FAMILY=6</div><div class='add'>+CONFIG_X86_MINIMUM_CPU_FAMILY=4</div><div class='ctx'> CONFIG_X86_DEBUGCTLMSR=y</div><div class='ctx'> CONFIG_HPET_TIMER=y</div><div class='ctx'> CONFIG_HPET_EMULATE_RTC=y</div><div class='hunk'>@@ -247,7 +253,7 @@ CONFIG_X86_IO_APIC=y</div><div class='ctx'> CONFIG_VM86=y</div><div class='ctx'> # CONFIG_TOSHIBA is not set</div><div class='ctx'> # CONFIG_I8K is not set</div><div class='del'>-# CONFIG_X86_REBOOTFIXUPS is not set</div><div class='add'>+CONFIG_X86_REBOOTFIXUPS=y</div><div class='ctx'> # CONFIG_MICROCODE is not set</div><div class='ctx'> CONFIG_X86_MSR=y</div><div class='ctx'> CONFIG_X86_CPUID=y</div><div class='hunk'>@@ -256,32 +262,28 @@ CONFIG_HIGHMEM4G=y</div><div class='ctx'> # CONFIG_HIGHMEM64G is not set</div><div class='ctx'> CONFIG_PAGE_OFFSET=0xC0000000</div><div class='ctx'> CONFIG_HIGHMEM=y</div><div class='del'>-CONFIG_NEED_NODE_MEMMAP_SIZE=y</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_SPARSEMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='del'>-# CONFIG_FLATMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='del'>-CONFIG_SPARSEMEM_MANUAL=y</div><div class='del'>-CONFIG_SPARSEMEM=y</div><div class='del'>-CONFIG_HAVE_MEMORY_PRESENT=y</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> CONFIG_SPARSEMEM_STATIC=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Memory hotplug is currently incompatible with Software Suspend</div><div class='del'>-#</div><div class='ctx'> CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='del'>-# CONFIG_HIGHPTE is not set</div><div class='add'>+CONFIG_HIGHPTE=y</div><div class='ctx'> # CONFIG_MATH_EMULATION is not set</div><div class='ctx'> CONFIG_MTRR=y</div><div class='del'>-# CONFIG_X86_PAT is not set</div><div class='add'>+# CONFIG_MTRR_SANITIZER is not set</div><div class='add'>+CONFIG_X86_PAT=y</div><div class='ctx'> CONFIG_EFI=y</div><div class='ctx'> # CONFIG_IRQBALANCE is not set</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='hunk'>@@ -293,6 +295,7 @@ CONFIG_HZ=1000</div><div class='ctx'> CONFIG_SCHED_HRTICK=y</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='ctx'> CONFIG_CRASH_DUMP=y</div><div class='add'>+# CONFIG_KEXEC_JUMP is not set</div><div class='ctx'> CONFIG_PHYSICAL_START=0x1000000</div><div class='ctx'> CONFIG_RELOCATABLE=y</div><div class='ctx'> CONFIG_PHYSICAL_ALIGN=0x200000</div><div class='hunk'>@@ -312,6 +315,7 @@ CONFIG_PM_TRACE_RTC=y</div><div class='ctx'> CONFIG_PM_SLEEP_SMP=y</div><div class='ctx'> CONFIG_PM_SLEEP=y</div><div class='ctx'> CONFIG_SUSPEND=y</div><div class='add'>+# CONFIG_PM_TEST_SUSPEND is not set</div><div class='ctx'> CONFIG_SUSPEND_FREEZER=y</div><div class='ctx'> CONFIG_HIBERNATION=y</div><div class='ctx'> CONFIG_PM_STD_PARTITION=""</div><div class='hunk'>@@ -337,6 +341,7 @@ CONFIG_ACPI_THERMAL=y</div><div class='ctx'> CONFIG_ACPI_BLACKLIST_YEAR=0</div><div class='ctx'> # CONFIG_ACPI_DEBUG is not set</div><div class='ctx'> CONFIG_ACPI_EC=y</div><div class='add'>+# CONFIG_ACPI_PCI_SLOT is not set</div><div class='ctx'> CONFIG_ACPI_POWER=y</div><div class='ctx'> CONFIG_ACPI_SYSTEM=y</div><div class='ctx'> CONFIG_X86_PM_TIMER=y</div><div class='hunk'>@@ -395,8 +400,8 @@ CONFIG_PCI=y</div><div class='ctx'> # CONFIG_PCI_GOBIOS is not set</div><div class='ctx'> # CONFIG_PCI_GOMMCONFIG is not set</div><div class='ctx'> # CONFIG_PCI_GODIRECT is not set</div><div class='del'>-CONFIG_PCI_GOANY=y</div><div class='ctx'> # CONFIG_PCI_GOOLPC is not set</div><div class='add'>+CONFIG_PCI_GOANY=y</div><div class='ctx'> CONFIG_PCI_BIOS=y</div><div class='ctx'> CONFIG_PCI_DIRECT=y</div><div class='ctx'> CONFIG_PCI_MMCONFIG=y</div><div class='hunk'>@@ -448,10 +453,6 @@ CONFIG_HOTPLUG_PCI=y</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_AOUT is not set</div><div class='ctx'> CONFIG_BINFMT_MISC=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -475,7 +476,10 @@ CONFIG_IP_FIB_HASH=y</div><div class='ctx'> CONFIG_IP_MULTIPLE_TABLES=y</div><div class='ctx'> CONFIG_IP_ROUTE_MULTIPATH=y</div><div class='ctx'> CONFIG_IP_ROUTE_VERBOSE=y</div><div class='del'>-# CONFIG_IP_PNP is not set</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+CONFIG_IP_PNP_RARP=y</div><div class='ctx'> # CONFIG_NET_IPIP is not set</div><div class='ctx'> # CONFIG_NET_IPGRE is not set</div><div class='ctx'> CONFIG_IP_MROUTE=y</div><div class='hunk'>@@ -618,7 +622,6 @@ CONFIG_NET_SCHED=y</div><div class='ctx'> # CONFIG_NET_SCH_HTB is not set</div><div class='ctx'> # CONFIG_NET_SCH_HFSC is not set</div><div class='ctx'> # CONFIG_NET_SCH_PRIO is not set</div><div class='del'>-# CONFIG_NET_SCH_RR is not set</div><div class='ctx'> # CONFIG_NET_SCH_RED is not set</div><div class='ctx'> # CONFIG_NET_SCH_SFQ is not set</div><div class='ctx'> # CONFIG_NET_SCH_TEQL is not set</div><div class='hunk'>@@ -680,28 +683,19 @@ CONFIG_FIB_RULES=y</div><div class='ctx'> CONFIG_CFG80211=y</div><div class='ctx'> CONFIG_NL80211=y</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='ctx'> CONFIG_MAC80211=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Rate control algorithm selection</div><div class='ctx'> #</div><div class='add'>+CONFIG_MAC80211_RC_PID=y</div><div class='ctx'> CONFIG_MAC80211_RC_DEFAULT_PID=y</div><div class='del'>-# CONFIG_MAC80211_RC_DEFAULT_NONE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Selecting 'y' for an algorithm will</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# build the algorithm into mac80211.</div><div class='del'>-#</div><div class='ctx'> CONFIG_MAC80211_RC_DEFAULT="pid"</div><div class='del'>-CONFIG_MAC80211_RC_PID=y</div><div class='ctx'> # CONFIG_MAC80211_MESH is not set</div><div class='ctx'> CONFIG_MAC80211_LEDS=y</div><div class='ctx'> # CONFIG_MAC80211_DEBUGFS is not set</div><div class='del'>-# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set</div><div class='del'>-# CONFIG_MAC80211_DEBUG is not set</div><div class='add'>+# CONFIG_MAC80211_DEBUG_MENU is not set</div><div class='ctx'> # CONFIG_IEEE80211 is not set</div><div class='ctx'> # CONFIG_RFKILL is not set</div><div class='ctx'> # CONFIG_NET_9P is not set</div><div class='hunk'>@@ -717,6 +711,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> CONFIG_DEBUG_DEVRES=y</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -749,6 +745,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_IBM_ASM is not set</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='hunk'>@@ -760,10 +757,12 @@ CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_FUJITSU_LAPTOP is not set</div><div class='ctx'> # CONFIG_TC1100_WMI is not set</div><div class='ctx'> # CONFIG_MSI_LAPTOP is not set</div><div class='add'>+# CONFIG_COMPAL_LAPTOP is not set</div><div class='ctx'> # CONFIG_SONY_LAPTOP is not set</div><div class='ctx'> # CONFIG_THINKPAD_ACPI is not set</div><div class='ctx'> # CONFIG_INTEL_MENLOW is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -802,12 +801,13 @@ CONFIG_SCSI_WAIT_SCAN=m</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SCSI_SPI_ATTRS=y</div><div class='ctx'> # CONFIG_SCSI_FC_ATTRS is not set</div><div class='del'>-# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+CONFIG_SCSI_ISCSI_ATTRS=y</div><div class='ctx'> # CONFIG_SCSI_SAS_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='ctx'> # CONFIG_SCSI_SRP_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_LOWLEVEL is not set</div><div class='ctx'> # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_ATA_ACPI=y</div><div class='hunk'>@@ -842,7 +842,7 @@ CONFIG_PATA_AMD=y</div><div class='ctx'> # CONFIG_PATA_CS5536 is not set</div><div class='ctx'> # CONFIG_PATA_CYPRESS is not set</div><div class='ctx'> # CONFIG_PATA_EFAR is not set</div><div class='del'>-# CONFIG_ATA_GENERIC is not set</div><div class='add'>+CONFIG_ATA_GENERIC=y</div><div class='ctx'> # CONFIG_PATA_HPT366 is not set</div><div class='ctx'> # CONFIG_PATA_HPT37X is not set</div><div class='ctx'> # CONFIG_PATA_HPT3X2N is not set</div><div class='hunk'>@@ -852,7 +852,7 @@ CONFIG_PATA_AMD=y</div><div class='ctx'> # CONFIG_PATA_JMICRON is not set</div><div class='ctx'> # CONFIG_PATA_TRIFLEX is not set</div><div class='ctx'> # CONFIG_PATA_MARVELL is not set</div><div class='del'>-# CONFIG_PATA_MPIIX is not set</div><div class='add'>+CONFIG_PATA_MPIIX=y</div><div class='ctx'> CONFIG_PATA_OLDPIIX=y</div><div class='ctx'> # CONFIG_PATA_NETCELL is not set</div><div class='ctx'> # CONFIG_PATA_NINJA32 is not set</div><div class='hunk'>@@ -871,6 +871,7 @@ CONFIG_PATA_OLDPIIX=y</div><div class='ctx'> # CONFIG_PATA_SIS is not set</div><div class='ctx'> # CONFIG_PATA_VIA is not set</div><div class='ctx'> # CONFIG_PATA_WINBOND is not set</div><div class='add'>+CONFIG_PATA_SCH=y</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=y</div><div class='ctx'> # CONFIG_MD_LINEAR is not set</div><div class='hunk'>@@ -894,13 +895,16 @@ CONFIG_DM_ZERO=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> CONFIG_MACINTOSH_DRIVERS=y</div><div class='ctx'> CONFIG_MAC_EMUMOUSEBTN=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_IFB is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='hunk'>@@ -910,7 +914,23 @@ CONFIG_NETDEVICES=y</div><div class='ctx'> # CONFIG_VETH is not set</div><div class='ctx'> # CONFIG_NET_SB1000 is not set</div><div class='ctx'> # CONFIG_ARCNET is not set</div><div class='del'>-# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+# CONFIG_VITESSE_PHY is not set</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='add'>+# CONFIG_BROADCOM_PHY is not set</div><div class='add'>+# CONFIG_ICPLUS_PHY is not set</div><div class='add'>+# CONFIG_REALTEK_PHY is not set</div><div class='add'>+# CONFIG_FIXED_PHY is not set</div><div class='add'>+# CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='hunk'>@@ -943,10 +963,10 @@ CONFIG_FORCEDETH=y</div><div class='ctx'> CONFIG_E100=y</div><div class='ctx'> # CONFIG_FEALNX is not set</div><div class='ctx'> # CONFIG_NATSEMI is not set</div><div class='del'>-# CONFIG_NE2K_PCI is not set</div><div class='add'>+CONFIG_NE2K_PCI=y</div><div class='ctx'> # CONFIG_8139CP is not set</div><div class='ctx'> CONFIG_8139TOO=y</div><div class='del'>-CONFIG_8139TOO_PIO=y</div><div class='add'>+# CONFIG_8139TOO_PIO is not set</div><div class='ctx'> # CONFIG_8139TOO_TUNE_TWISTER is not set</div><div class='ctx'> # CONFIG_8139TOO_8129 is not set</div><div class='ctx'> # CONFIG_8139_OLD_RX_RESET is not set</div><div class='hunk'>@@ -961,25 +981,24 @@ CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_ACENIC is not set</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> CONFIG_E1000=y</div><div class='del'>-# CONFIG_E1000_NAPI is not set</div><div class='ctx'> # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set</div><div class='del'>-# CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='add'>+CONFIG_E1000E=y</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='ctx'> # CONFIG_HAMACHI is not set</div><div class='ctx'> # CONFIG_YELLOWFIN is not set</div><div class='del'>-# CONFIG_R8169 is not set</div><div class='add'>+CONFIG_R8169=y</div><div class='ctx'> # CONFIG_SIS190 is not set</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> CONFIG_SKY2=y</div><div class='ctx'> # CONFIG_SKY2_DEBUG is not set</div><div class='ctx'> # CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> CONFIG_TIGON3=y</div><div class='del'>-# CONFIG_BNX2 is not set</div><div class='add'>+CONFIG_BNX2=y</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -1019,13 +1038,14 @@ CONFIG_WLAN_80211=y</div><div class='ctx'> # CONFIG_RTL8180 is not set</div><div class='ctx'> # CONFIG_RTL8187 is not set</div><div class='ctx'> # CONFIG_ADM8211 is not set</div><div class='add'>+# CONFIG_MAC80211_HWSIM is not set</div><div class='ctx'> # CONFIG_P54_COMMON is not set</div><div class='ctx'> CONFIG_ATH5K=y</div><div class='ctx'> # CONFIG_ATH5K_DEBUG is not set</div><div class='del'>-# CONFIG_IWLWIFI is not set</div><div class='add'>+# CONFIG_ATH9K is not set</div><div class='ctx'> # CONFIG_IWLCORE is not set</div><div class='ctx'> # CONFIG_IWLWIFI_LEDS is not set</div><div class='del'>-# CONFIG_IWL4965 is not set</div><div class='add'>+# CONFIG_IWLAGN is not set</div><div class='ctx'> # CONFIG_IWL3945 is not set</div><div class='ctx'> # CONFIG_HOSTAP is not set</div><div class='ctx'> # CONFIG_B43 is not set</div><div class='hunk'>@@ -1105,6 +1125,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y</div><div class='ctx'> # CONFIG_MOUSE_PS2_TOUCHKIT is not set</div><div class='ctx'> # CONFIG_MOUSE_SERIAL is not set</div><div class='ctx'> # CONFIG_MOUSE_APPLETOUCH is not set</div><div class='add'>+# CONFIG_MOUSE_BCM5974 is not set</div><div class='ctx'> # CONFIG_MOUSE_VSXXXAA is not set</div><div class='ctx'> CONFIG_INPUT_JOYSTICK=y</div><div class='ctx'> # CONFIG_JOYSTICK_ANALOG is not set</div><div class='hunk'>@@ -1139,12 +1160,14 @@ CONFIG_INPUT_TOUCHSCREEN=y</div><div class='ctx'> # CONFIG_TOUCHSCREEN_GUNZE is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_ELO is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_MTOUCH is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_INEXIO is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_MK712 is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_PENMOUNT is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_TOUCHWIN is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_UCB1400 is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set</div><div class='ctx'> CONFIG_INPUT_MISC=y</div><div class='ctx'> # CONFIG_INPUT_PCSPKR is not set</div><div class='ctx'> # CONFIG_INPUT_APANEL is not set</div><div class='hunk'>@@ -1173,6 +1196,7 @@ CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -1223,8 +1247,8 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='ctx'> # CONFIG_IPMI_HANDLER is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='del'>-# CONFIG_HW_RANDOM_INTEL is not set</div><div class='del'>-# CONFIG_HW_RANDOM_AMD is not set</div><div class='add'>+CONFIG_HW_RANDOM_INTEL=y</div><div class='add'>+CONFIG_HW_RANDOM_AMD=y</div><div class='ctx'> CONFIG_HW_RANDOM_GEODE=y</div><div class='ctx'> CONFIG_HW_RANDOM_VIA=y</div><div class='ctx'> CONFIG_NVRAM=y</div><div class='hunk'>@@ -1245,7 +1269,6 @@ CONFIG_NVRAM=y</div><div class='ctx'> # CONFIG_CS5535_GPIO is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='ctx'> CONFIG_HPET=y</div><div class='del'>-# CONFIG_HPET_RTC_IRQ is not set</div><div class='ctx'> # CONFIG_HPET_MMAP is not set</div><div class='ctx'> # CONFIG_HANGCHECK_TIMER is not set</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='hunk'>@@ -1254,43 +1277,64 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> # CONFIG_I2C_CHARDEV is not set</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> CONFIG_I2C_I801=y</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='del'>-# CONFIG_SCx200_ACB is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_SCx200_ACB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -1299,6 +1343,8 @@ CONFIG_I2C_I801=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> CONFIG_POWER_SUPPLY=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY_DEBUG is not set</div><div class='hunk'>@@ -1360,8 +1406,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -1372,6 +1420,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia drivers</div><div class='hunk'>@@ -1418,7 +1467,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='ctx'> # CONFIG_FB_FOREIGN_ENDIAN is not set</div><div class='ctx'> # CONFIG_FB_SYS_FOPS is not set</div><div class='del'>-CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> # CONFIG_FB_SVGALIB is not set</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='ctx'> # CONFIG_FB_BACKLIGHT is not set</div><div class='hunk'>@@ -1463,6 +1511,7 @@ CONFIG_FB_EFI=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='ctx'> # CONFIG_FB_GEODE is not set</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='hunk'>@@ -1470,6 +1519,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='ctx'> CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='ctx'> # CONFIG_BACKLIGHT_CORGI is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_PROGEAR is not set</div><div class='add'>+# CONFIG_BACKLIGHT_MBP_NVIDIA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Display device support</div><div class='hunk'>@@ -1489,15 +1539,7 @@ CONFIG_LOGO=y</div><div class='ctx'> # CONFIG_LOGO_LINUX_MONO is not set</div><div class='ctx'> # CONFIG_LOGO_LINUX_VGA16 is not set</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=y</div><div class='ctx'> CONFIG_SND_TIMER=y</div><div class='ctx'> CONFIG_SND_PCM=y</div><div class='hunk'>@@ -1515,20 +1557,14 @@ CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='ctx'> CONFIG_SND_VMASTER=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='ctx'> # CONFIG_SND_PCSP is not set</div><div class='ctx'> # CONFIG_SND_DUMMY is not set</div><div class='ctx'> # CONFIG_SND_VIRMIDI is not set</div><div class='ctx'> # CONFIG_SND_MTPAV is not set</div><div class='ctx'> # CONFIG_SND_SERIAL_U16550 is not set</div><div class='ctx'> # CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PCI=y</div><div class='ctx'> # CONFIG_SND_AD1889 is not set</div><div class='ctx'> # CONFIG_SND_ALS300 is not set</div><div class='ctx'> # CONFIG_SND_ALS4000 is not set</div><div class='hunk'>@@ -1603,36 +1639,14 @@ CONFIG_SND_HDA_GENERIC=y</div><div class='ctx'> # CONFIG_SND_VIRTUOSO is not set</div><div class='ctx'> # CONFIG_SND_VX222 is not set</div><div class='ctx'> # CONFIG_SND_YMFPCI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_USB=y</div><div class='ctx'> # CONFIG_SND_USB_AUDIO is not set</div><div class='ctx'> # CONFIG_SND_USB_USX2Y is not set</div><div class='ctx'> # CONFIG_SND_USB_CAIAQ is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCMCIA devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PCMCIA=y</div><div class='ctx'> # CONFIG_SND_VXPOCKET is not set</div><div class='ctx'> # CONFIG_SND_PDAUDIOCF is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio for the Texas Instruments OMAP</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -1668,6 +1682,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> CONFIG_USB_SUSPEND=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1691,6 +1706,7 @@ CONFIG_USB_UHCI_HCD=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> CONFIG_USB_PRINTER=y</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -1712,6 +1728,7 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> CONFIG_USB_LIBUSUAL=y</div><div class='ctx'> </div><div class='hunk'>@@ -1720,7 +1737,6 @@ CONFIG_USB_LIBUSUAL=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1733,7 +1749,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1750,6 +1765,7 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='hunk'>@@ -1759,7 +1775,9 @@ CONFIG_LEDS_CLASS=y</div><div class='ctx'> #</div><div class='ctx'> # LED drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_LEDS_PCA9532 is not set</div><div class='ctx'> # CONFIG_LEDS_CLEVO_MAIL is not set</div><div class='add'>+# CONFIG_LEDS_PCA955X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # LED Triggers</div><div class='hunk'>@@ -1805,6 +1823,7 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -1837,11 +1856,13 @@ CONFIG_DMADEVICES=y</div><div class='ctx'> # Firmware Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_EDD is not set</div><div class='add'>+CONFIG_FIRMWARE_MEMMAP=y</div><div class='ctx'> CONFIG_EFI_VARS=y</div><div class='ctx'> # CONFIG_DELL_RBU is not set</div><div class='ctx'> # CONFIG_DCDBAS is not set</div><div class='ctx'> CONFIG_DMIID=y</div><div class='del'>-# CONFIG_ISCSI_IBFT_FIND is not set</div><div class='add'>+CONFIG_ISCSI_IBFT_FIND=y</div><div class='add'>+CONFIG_ISCSI_IBFT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='hunk'>@@ -1920,14 +1941,27 @@ CONFIG_HUGETLB_PAGE=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='ctx'> CONFIG_NETWORK_FILESYSTEMS=y</div><div class='del'>-# CONFIG_NFS_FS is not set</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+CONFIG_NFS_V3_ACL=y</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> # CONFIG_NFSD is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_ACL_SUPPORT=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='hunk'>@@ -2001,9 +2035,9 @@ CONFIG_NLS_UTF8=y</div><div class='ctx'> # Kernel hacking</div><div class='ctx'> #</div><div class='ctx'> CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='del'>-# CONFIG_PRINTK_TIME is not set</div><div class='del'>-# CONFIG_ENABLE_WARN_DEPRECATED is not set</div><div class='del'>-# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='add'>+CONFIG_PRINTK_TIME=y</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> CONFIG_FRAME_WARN=2048</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='hunk'>@@ -2033,6 +2067,7 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='hunk'>@@ -2043,23 +2078,32 @@ CONFIG_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_LKDTM is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='ctx'> # CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_IRQSOFF_TRACER is not set</div><div class='add'>+# CONFIG_SYSPROF_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> CONFIG_PROVIDE_OHCI1394_DMA_INIT=y</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='del'>-# CONFIG_KGDB is not set</div><div class='ctx'> CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_STRICT_DEVMEM is not set</div><div class='add'>+CONFIG_X86_VERBOSE_BOOTUP=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='ctx'> CONFIG_DEBUG_STACKOVERFLOW=y</div><div class='ctx'> CONFIG_DEBUG_STACK_USAGE=y</div><div class='ctx'> # CONFIG_DEBUG_PAGEALLOC is not set</div><div class='add'>+# CONFIG_DEBUG_PER_CPU_MAPS is not set</div><div class='ctx'> # CONFIG_X86_PTDUMP is not set</div><div class='ctx'> CONFIG_DEBUG_RODATA=y</div><div class='ctx'> # CONFIG_DEBUG_RODATA_TEST is not set</div><div class='ctx'> CONFIG_DEBUG_NX_TEST=m</div><div class='ctx'> # CONFIG_4KSTACKS is not set</div><div class='del'>-CONFIG_X86_FIND_SMP_CONFIG=y</div><div class='del'>-CONFIG_X86_MPPARSE=y</div><div class='ctx'> CONFIG_DOUBLEFAULT=y</div><div class='add'>+# CONFIG_MMIOTRACE is not set</div><div class='ctx'> CONFIG_IO_DELAY_TYPE_0X80=0</div><div class='ctx'> CONFIG_IO_DELAY_TYPE_0XED=1</div><div class='ctx'> CONFIG_IO_DELAY_TYPE_UDELAY=2</div><div class='hunk'>@@ -2071,6 +2115,7 @@ CONFIG_IO_DELAY_0X80=y</div><div class='ctx'> CONFIG_DEFAULT_IO_DELAY_TYPE=0</div><div class='ctx'> CONFIG_DEBUG_BOOT_PARAMS=y</div><div class='ctx'> # CONFIG_CPA_DEBUG is not set</div><div class='add'>+# CONFIG_OPTIMIZE_INLINING is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='hunk'>@@ -2080,7 +2125,6 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y</div><div class='ctx'> CONFIG_SECURITY=y</div><div class='ctx'> CONFIG_SECURITY_NETWORK=y</div><div class='ctx'> # CONFIG_SECURITY_NETWORK_XFRM is not set</div><div class='del'>-CONFIG_SECURITY_CAPABILITIES=y</div><div class='ctx'> CONFIG_SECURITY_FILE_CAPABILITIES=y</div><div class='ctx'> # CONFIG_SECURITY_ROOTPLUG is not set</div><div class='ctx'> CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536</div><div class='hunk'>@@ -2141,6 +2185,10 @@ CONFIG_CRYPTO_HMAC=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=y</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -2151,7 +2199,7 @@ CONFIG_CRYPTO_SHA1=y</div><div class='ctx'> # Ciphers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_CRYPTO_AES=y</div><div class='del'>-# CONFIG_CRYPTO_AES_586 is not set</div><div class='add'>+CONFIG_CRYPTO_AES_586=y</div><div class='ctx'> # CONFIG_CRYPTO_ANUBIS is not set</div><div class='ctx'> CONFIG_CRYPTO_ARC4=y</div><div class='ctx'> # CONFIG_CRYPTO_BLOWFISH is not set</div><div class='hunk'>@@ -2193,6 +2241,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig<br/>index a40452429625..678c8acefe04 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/configs/x86_64_defconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/configs/x86_64_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/configs/x86_64_defconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/configs/x86_64_defconfig</a></div><div class='hunk'>@@ -1,13 +1,13 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.26-rc1</div><div class='del'>-# Sun May  4 19:59:57 2008</div><div class='add'>+# Linux kernel version: 2.6.27-rc4</div><div class='add'>+# Mon Aug 25 14:40:46 2008</div><div class='ctx'> #</div><div class='ctx'> CONFIG_64BIT=y</div><div class='ctx'> # CONFIG_X86_32 is not set</div><div class='ctx'> CONFIG_X86_64=y</div><div class='ctx'> CONFIG_X86=y</div><div class='del'>-CONFIG_DEFCONFIG_LIST="arch/x86/configs/x86_64_defconfig"</div><div class='add'>+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"</div><div class='ctx'> # CONFIG_GENERIC_LOCKBREAK is not set</div><div class='ctx'> CONFIG_GENERIC_TIME=y</div><div class='ctx'> CONFIG_GENERIC_CMOS_UPDATE=y</div><div class='hunk'>@@ -53,6 +53,7 @@ CONFIG_X86_HT=y</div><div class='ctx'> CONFIG_X86_BIOS_REBOOT=y</div><div class='ctx'> CONFIG_X86_TRAMPOLINE=y</div><div class='ctx'> # CONFIG_KTIME_SCALAR is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # General setup</div><div class='hunk'>@@ -82,6 +83,7 @@ CONFIG_CGROUPS=y</div><div class='ctx'> CONFIG_CGROUP_NS=y</div><div class='ctx'> # CONFIG_CGROUP_DEVICE is not set</div><div class='ctx'> CONFIG_CPUSETS=y</div><div class='add'>+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y</div><div class='ctx'> CONFIG_GROUP_SCHED=y</div><div class='ctx'> CONFIG_FAIR_GROUP_SCHED=y</div><div class='ctx'> # CONFIG_RT_GROUP_SCHED is not set</div><div class='hunk'>@@ -105,7 +107,6 @@ CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='del'>-CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='hunk'>@@ -113,6 +114,7 @@ CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_PCSPKR_PLATFORM=y</div><div class='ctx'> # CONFIG_COMPAT_BRK is not set</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='hunk'>@@ -132,25 +134,33 @@ CONFIG_MARKERS=y</div><div class='ctx'> # CONFIG_OPROFILE is not set</div><div class='ctx'> CONFIG_HAVE_OPROFILE=y</div><div class='ctx'> CONFIG_KPROBES=y</div><div class='add'>+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y</div><div class='ctx'> CONFIG_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_IOREMAP_PROT=y</div><div class='ctx'> CONFIG_HAVE_KPROBES=y</div><div class='ctx'> CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+# CONFIG_HAVE_ARCH_TRACEHOOK is not set</div><div class='ctx'> # CONFIG_HAVE_DMA_ATTRS is not set</div><div class='add'>+CONFIG_USE_GENERIC_SMP_HELPERS=y</div><div class='add'>+# CONFIG_HAVE_CLK is not set</div><div class='ctx'> CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set</div><div class='ctx'> CONFIG_SLABINFO=y</div><div class='ctx'> CONFIG_RT_MUTEXES=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_FORCE_LOAD is not set</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='del'>-# CONFIG_KMOD is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='ctx'> CONFIG_STOP_MACHINE=y</div><div class='ctx'> CONFIG_BLOCK=y</div><div class='ctx'> CONFIG_BLK_DEV_IO_TRACE=y</div><div class='ctx'> CONFIG_BLK_DEV_BSG=y</div><div class='add'>+# CONFIG_BLK_DEV_INTEGRITY is not set</div><div class='ctx'> CONFIG_BLOCK_COMPAT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -175,20 +185,15 @@ CONFIG_NO_HZ=y</div><div class='ctx'> CONFIG_HIGH_RES_TIMERS=y</div><div class='ctx'> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='ctx'> CONFIG_SMP=y</div><div class='add'>+CONFIG_X86_FIND_SMP_CONFIG=y</div><div class='add'>+CONFIG_X86_MPPARSE=y</div><div class='ctx'> CONFIG_X86_PC=y</div><div class='ctx'> # CONFIG_X86_ELAN is not set</div><div class='ctx'> # CONFIG_X86_VOYAGER is not set</div><div class='del'>-# CONFIG_X86_NUMAQ is not set</div><div class='del'>-# CONFIG_X86_SUMMIT is not set</div><div class='del'>-# CONFIG_X86_BIGSMP is not set</div><div class='del'>-# CONFIG_X86_VISWS is not set</div><div class='ctx'> # CONFIG_X86_GENERICARCH is not set</div><div class='del'>-# CONFIG_X86_ES7000 is not set</div><div class='del'>-# CONFIG_X86_RDC321X is not set</div><div class='ctx'> # CONFIG_X86_VSMP is not set</div><div class='ctx'> # CONFIG_PARAVIRT_GUEST is not set</div><div class='del'>-CONFIG_MEMTEST_BOOTPARAM=y</div><div class='del'>-CONFIG_MEMTEST_BOOTPARAM_VALUE=0</div><div class='add'>+# CONFIG_MEMTEST is not set</div><div class='ctx'> # CONFIG_M386 is not set</div><div class='ctx'> # CONFIG_M486 is not set</div><div class='ctx'> # CONFIG_M586 is not set</div><div class='hunk'>@@ -220,11 +225,12 @@ CONFIG_X86_L1_CACHE_BYTES=64</div><div class='ctx'> CONFIG_X86_INTERNODE_CACHE_BYTES=64</div><div class='ctx'> CONFIG_X86_CMPXCHG=y</div><div class='ctx'> CONFIG_X86_L1_CACHE_SHIFT=6</div><div class='del'>-CONFIG_X86_GOOD_APIC=y</div><div class='add'>+CONFIG_X86_WP_WORKS_OK=y</div><div class='ctx'> CONFIG_X86_INTEL_USERCOPY=y</div><div class='ctx'> CONFIG_X86_USE_PPRO_CHECKSUM=y</div><div class='ctx'> CONFIG_X86_P6_NOP=y</div><div class='ctx'> CONFIG_X86_TSC=y</div><div class='add'>+CONFIG_X86_CMPXCHG64=y</div><div class='ctx'> CONFIG_X86_CMOV=y</div><div class='ctx'> CONFIG_X86_MINIMUM_CPU_FAMILY=64</div><div class='ctx'> CONFIG_X86_DEBUGCTLMSR=y</div><div class='hunk'>@@ -234,8 +240,10 @@ CONFIG_DMI=y</div><div class='ctx'> CONFIG_GART_IOMMU=y</div><div class='ctx'> CONFIG_CALGARY_IOMMU=y</div><div class='ctx'> CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y</div><div class='add'>+CONFIG_AMD_IOMMU=y</div><div class='ctx'> CONFIG_SWIOTLB=y</div><div class='ctx'> CONFIG_IOMMU_HELPER=y</div><div class='add'>+# CONFIG_MAXSMP is not set</div><div class='ctx'> CONFIG_NR_CPUS=4</div><div class='ctx'> # CONFIG_SCHED_SMT is not set</div><div class='ctx'> CONFIG_SCHED_MC=y</div><div class='hunk'>@@ -281,6 +289,7 @@ CONFIG_ZONE_DMA_FLAG=1</div><div class='ctx'> CONFIG_BOUNCE=y</div><div class='ctx'> CONFIG_VIRT_TO_BUS=y</div><div class='ctx'> CONFIG_MTRR=y</div><div class='add'>+# CONFIG_MTRR_SANITIZER is not set</div><div class='ctx'> # CONFIG_X86_PAT is not set</div><div class='ctx'> CONFIG_EFI=y</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='hunk'>@@ -313,6 +322,7 @@ CONFIG_PM_TRACE_RTC=y</div><div class='ctx'> CONFIG_PM_SLEEP_SMP=y</div><div class='ctx'> CONFIG_PM_SLEEP=y</div><div class='ctx'> CONFIG_SUSPEND=y</div><div class='add'>+# CONFIG_PM_TEST_SUSPEND is not set</div><div class='ctx'> CONFIG_SUSPEND_FREEZER=y</div><div class='ctx'> CONFIG_HIBERNATION=y</div><div class='ctx'> CONFIG_PM_STD_PARTITION=""</div><div class='hunk'>@@ -339,6 +349,7 @@ CONFIG_ACPI_NUMA=y</div><div class='ctx'> CONFIG_ACPI_BLACKLIST_YEAR=0</div><div class='ctx'> # CONFIG_ACPI_DEBUG is not set</div><div class='ctx'> CONFIG_ACPI_EC=y</div><div class='add'>+# CONFIG_ACPI_PCI_SLOT is not set</div><div class='ctx'> CONFIG_ACPI_POWER=y</div><div class='ctx'> CONFIG_ACPI_SYSTEM=y</div><div class='ctx'> CONFIG_X86_PM_TIMER=y</div><div class='hunk'>@@ -437,10 +448,6 @@ CONFIG_IA32_EMULATION=y</div><div class='ctx'> CONFIG_COMPAT=y</div><div class='ctx'> CONFIG_COMPAT_FOR_U64_ALIGNMENT=y</div><div class='ctx'> CONFIG_SYSVIPC_COMPAT=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking</div><div class='del'>-#</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -464,7 +471,10 @@ CONFIG_IP_FIB_HASH=y</div><div class='ctx'> CONFIG_IP_MULTIPLE_TABLES=y</div><div class='ctx'> CONFIG_IP_ROUTE_MULTIPATH=y</div><div class='ctx'> CONFIG_IP_ROUTE_VERBOSE=y</div><div class='del'>-# CONFIG_IP_PNP is not set</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+CONFIG_IP_PNP_RARP=y</div><div class='ctx'> # CONFIG_NET_IPIP is not set</div><div class='ctx'> # CONFIG_NET_IPGRE is not set</div><div class='ctx'> CONFIG_IP_MROUTE=y</div><div class='hunk'>@@ -607,7 +617,6 @@ CONFIG_NET_SCHED=y</div><div class='ctx'> # CONFIG_NET_SCH_HTB is not set</div><div class='ctx'> # CONFIG_NET_SCH_HFSC is not set</div><div class='ctx'> # CONFIG_NET_SCH_PRIO is not set</div><div class='del'>-# CONFIG_NET_SCH_RR is not set</div><div class='ctx'> # CONFIG_NET_SCH_RED is not set</div><div class='ctx'> # CONFIG_NET_SCH_SFQ is not set</div><div class='ctx'> # CONFIG_NET_SCH_TEQL is not set</div><div class='hunk'>@@ -669,28 +678,19 @@ CONFIG_FIB_RULES=y</div><div class='ctx'> CONFIG_CFG80211=y</div><div class='ctx'> CONFIG_NL80211=y</div><div class='ctx'> CONFIG_WIRELESS_EXT=y</div><div class='add'>+CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='ctx'> CONFIG_MAC80211=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Rate control algorithm selection</div><div class='ctx'> #</div><div class='add'>+CONFIG_MAC80211_RC_PID=y</div><div class='ctx'> CONFIG_MAC80211_RC_DEFAULT_PID=y</div><div class='del'>-# CONFIG_MAC80211_RC_DEFAULT_NONE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Selecting 'y' for an algorithm will</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# build the algorithm into mac80211.</div><div class='del'>-#</div><div class='ctx'> CONFIG_MAC80211_RC_DEFAULT="pid"</div><div class='del'>-CONFIG_MAC80211_RC_PID=y</div><div class='ctx'> # CONFIG_MAC80211_MESH is not set</div><div class='ctx'> CONFIG_MAC80211_LEDS=y</div><div class='ctx'> # CONFIG_MAC80211_DEBUGFS is not set</div><div class='del'>-# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set</div><div class='del'>-# CONFIG_MAC80211_DEBUG is not set</div><div class='add'>+# CONFIG_MAC80211_DEBUG_MENU is not set</div><div class='ctx'> # CONFIG_IEEE80211 is not set</div><div class='ctx'> # CONFIG_RFKILL is not set</div><div class='ctx'> # CONFIG_NET_9P is not set</div><div class='hunk'>@@ -706,6 +706,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> CONFIG_DEBUG_DEVRES=y</div><div class='ctx'> # CONFIG_SYS_HYPERVISOR is not set</div><div class='hunk'>@@ -738,6 +740,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384</div><div class='ctx'> # CONFIG_BLK_DEV_XIP is not set</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_IBM_ASM is not set</div><div class='ctx'> # CONFIG_PHANTOM is not set</div><div class='hunk'>@@ -748,10 +751,14 @@ CONFIG_MISC_DEVICES=y</div><div class='ctx'> # CONFIG_ASUS_LAPTOP is not set</div><div class='ctx'> # CONFIG_FUJITSU_LAPTOP is not set</div><div class='ctx'> # CONFIG_MSI_LAPTOP is not set</div><div class='add'>+# CONFIG_COMPAL_LAPTOP is not set</div><div class='ctx'> # CONFIG_SONY_LAPTOP is not set</div><div class='ctx'> # CONFIG_THINKPAD_ACPI is not set</div><div class='ctx'> # CONFIG_INTEL_MENLOW is not set</div><div class='ctx'> # CONFIG_ENCLOSURE_SERVICES is not set</div><div class='add'>+# CONFIG_SGI_XP is not set</div><div class='add'>+# CONFIG_HP_ILO is not set</div><div class='add'>+# CONFIG_SGI_GRU is not set</div><div class='ctx'> CONFIG_HAVE_IDE=y</div><div class='ctx'> # CONFIG_IDE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -790,12 +797,13 @@ CONFIG_SCSI_WAIT_SCAN=m</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SCSI_SPI_ATTRS=y</div><div class='ctx'> # CONFIG_SCSI_FC_ATTRS is not set</div><div class='del'>-# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+CONFIG_SCSI_ISCSI_ATTRS=y</div><div class='ctx'> # CONFIG_SCSI_SAS_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_SAS_LIBSAS is not set</div><div class='ctx'> # CONFIG_SCSI_SRP_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_LOWLEVEL is not set</div><div class='ctx'> # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set</div><div class='add'>+# CONFIG_SCSI_DH is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> # CONFIG_ATA_NONSTANDARD is not set</div><div class='ctx'> CONFIG_ATA_ACPI=y</div><div class='hunk'>@@ -857,6 +865,7 @@ CONFIG_PATA_OLDPIIX=y</div><div class='ctx'> # CONFIG_PATA_SIS is not set</div><div class='ctx'> # CONFIG_PATA_VIA is not set</div><div class='ctx'> # CONFIG_PATA_WINBOND is not set</div><div class='add'>+CONFIG_PATA_SCH=y</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=y</div><div class='ctx'> # CONFIG_MD_LINEAR is not set</div><div class='hunk'>@@ -880,13 +889,16 @@ CONFIG_DM_ZERO=y</div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Enable only one of the two stacks, unless you know what you are doing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_FIREWIRE is not set</div><div class='ctx'> # CONFIG_IEEE1394 is not set</div><div class='ctx'> # CONFIG_I2O is not set</div><div class='ctx'> CONFIG_MACINTOSH_DRIVERS=y</div><div class='ctx'> CONFIG_MAC_EMUMOUSEBTN=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NETDEVICES_MULTIQUEUE is not set</div><div class='ctx'> # CONFIG_IFB is not set</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='hunk'>@@ -896,7 +908,23 @@ CONFIG_NETDEVICES=y</div><div class='ctx'> # CONFIG_VETH is not set</div><div class='ctx'> # CONFIG_NET_SB1000 is not set</div><div class='ctx'> # CONFIG_ARCNET is not set</div><div class='del'>-# CONFIG_PHYLIB is not set</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+# CONFIG_VITESSE_PHY is not set</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='add'>+# CONFIG_BROADCOM_PHY is not set</div><div class='add'>+# CONFIG_ICPLUS_PHY is not set</div><div class='add'>+# CONFIG_REALTEK_PHY is not set</div><div class='add'>+# CONFIG_FIXED_PHY is not set</div><div class='add'>+# CONFIG_MDIO_BITBANG is not set</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='hunk'>@@ -940,16 +968,15 @@ CONFIG_8139TOO_PIO=y</div><div class='ctx'> # CONFIG_SIS900 is not set</div><div class='ctx'> # CONFIG_EPIC100 is not set</div><div class='ctx'> # CONFIG_SUNDANCE is not set</div><div class='add'>+# CONFIG_TLAN is not set</div><div class='ctx'> # CONFIG_VIA_RHINE is not set</div><div class='ctx'> # CONFIG_SC92031 is not set</div><div class='ctx'> CONFIG_NETDEV_1000=y</div><div class='ctx'> # CONFIG_ACENIC is not set</div><div class='ctx'> # CONFIG_DL2K is not set</div><div class='ctx'> CONFIG_E1000=y</div><div class='del'>-# CONFIG_E1000_NAPI is not set</div><div class='ctx'> # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set</div><div class='ctx'> # CONFIG_E1000E is not set</div><div class='del'>-# CONFIG_E1000E_ENABLED is not set</div><div class='ctx'> # CONFIG_IP1000 is not set</div><div class='ctx'> # CONFIG_IGB is not set</div><div class='ctx'> # CONFIG_NS83820 is not set</div><div class='hunk'>@@ -965,6 +992,7 @@ CONFIG_TIGON3=y</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> # CONFIG_QLA3XXX is not set</div><div class='ctx'> # CONFIG_ATL1 is not set</div><div class='add'>+# CONFIG_ATL1E is not set</div><div class='ctx'> CONFIG_NETDEV_10000=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_CHELSIO_T3 is not set</div><div class='hunk'>@@ -1003,13 +1031,14 @@ CONFIG_WLAN_80211=y</div><div class='ctx'> # CONFIG_RTL8180 is not set</div><div class='ctx'> # CONFIG_RTL8187 is not set</div><div class='ctx'> # CONFIG_ADM8211 is not set</div><div class='add'>+# CONFIG_MAC80211_HWSIM is not set</div><div class='ctx'> # CONFIG_P54_COMMON is not set</div><div class='ctx'> CONFIG_ATH5K=y</div><div class='ctx'> # CONFIG_ATH5K_DEBUG is not set</div><div class='del'>-# CONFIG_IWLWIFI is not set</div><div class='add'>+# CONFIG_ATH9K is not set</div><div class='ctx'> # CONFIG_IWLCORE is not set</div><div class='ctx'> # CONFIG_IWLWIFI_LEDS is not set</div><div class='del'>-# CONFIG_IWL4965 is not set</div><div class='add'>+# CONFIG_IWLAGN is not set</div><div class='ctx'> # CONFIG_IWL3945 is not set</div><div class='ctx'> # CONFIG_HOSTAP is not set</div><div class='ctx'> # CONFIG_B43 is not set</div><div class='hunk'>@@ -1088,6 +1117,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y</div><div class='ctx'> # CONFIG_MOUSE_PS2_TOUCHKIT is not set</div><div class='ctx'> # CONFIG_MOUSE_SERIAL is not set</div><div class='ctx'> # CONFIG_MOUSE_APPLETOUCH is not set</div><div class='add'>+# CONFIG_MOUSE_BCM5974 is not set</div><div class='ctx'> # CONFIG_MOUSE_VSXXXAA is not set</div><div class='ctx'> CONFIG_INPUT_JOYSTICK=y</div><div class='ctx'> # CONFIG_JOYSTICK_ANALOG is not set</div><div class='hunk'>@@ -1122,12 +1152,14 @@ CONFIG_INPUT_TOUCHSCREEN=y</div><div class='ctx'> # CONFIG_TOUCHSCREEN_GUNZE is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_ELO is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_MTOUCH is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_INEXIO is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_MK712 is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_PENMOUNT is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_TOUCHWIN is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_UCB1400 is not set</div><div class='ctx'> # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set</div><div class='ctx'> CONFIG_INPUT_MISC=y</div><div class='ctx'> # CONFIG_INPUT_PCSPKR is not set</div><div class='ctx'> # CONFIG_INPUT_APANEL is not set</div><div class='hunk'>@@ -1155,6 +1187,7 @@ CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='hunk'>@@ -1222,7 +1255,6 @@ CONFIG_NVRAM=y</div><div class='ctx'> # CONFIG_PC8736x_GPIO is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='ctx'> CONFIG_HPET=y</div><div class='del'>-# CONFIG_HPET_RTC_IRQ is not set</div><div class='ctx'> # CONFIG_HPET_MMAP is not set</div><div class='ctx'> # CONFIG_HANGCHECK_TIMER is not set</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='hunk'>@@ -1231,42 +1263,63 @@ CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> # CONFIG_I2C_CHARDEV is not set</div><div class='add'>+CONFIG_I2C_HELPER_AUTO=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC SMBus host controller drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_ALI1535 is not set</div><div class='ctx'> # CONFIG_I2C_ALI1563 is not set</div><div class='ctx'> # CONFIG_I2C_ALI15X3 is not set</div><div class='ctx'> # CONFIG_I2C_AMD756 is not set</div><div class='ctx'> # CONFIG_I2C_AMD8111 is not set</div><div class='ctx'> CONFIG_I2C_I801=y</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_ISCH is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='del'>-# CONFIG_I2C_OCORES is not set</div><div class='del'>-# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIMTEC is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='del'>-# CONFIG_I2C_TAOS_EVM is not set</div><div class='del'>-# CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_TINY_USB is not set</div><div class='ctx'> # CONFIG_I2C_VIA is not set</div><div class='ctx'> # CONFIG_I2C_VIAPRO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C system bus drivers (mostly embedded / system-on-chip)</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_SIMTEC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# External I2C/SMBus adapter drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_TAOS_EVM is not set</div><div class='add'>+# CONFIG_I2C_TINY_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics adapter I2C/DDC channel drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Other I2C/SMBus bus drivers</div><div class='add'>+#</div><div class='ctx'> # CONFIG_I2C_PCA_PLATFORM is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous I2C Chip support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DS1682 is not set</div><div class='add'>+# CONFIG_AT24 is not set</div><div class='ctx'> # CONFIG_SENSORS_EEPROM is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_PCF8575 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='ctx'> # CONFIG_SENSORS_TSL2550 is not set</div><div class='hunk'>@@ -1275,6 +1328,8 @@ CONFIG_I2C_I801=y</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> # CONFIG_SPI is not set</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+# CONFIG_GPIOLIB is not set</div><div class='ctx'> # CONFIG_W1 is not set</div><div class='ctx'> CONFIG_POWER_SUPPLY=y</div><div class='ctx'> # CONFIG_POWER_SUPPLY_DEBUG is not set</div><div class='hunk'>@@ -1335,8 +1390,10 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # Multifunction device drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_MFD_CORE is not set</div><div class='ctx'> # CONFIG_MFD_SM501 is not set</div><div class='ctx'> # CONFIG_HTC_PASIC3 is not set</div><div class='add'>+# CONFIG_MFD_TMIO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='hunk'>@@ -1347,6 +1404,7 @@ CONFIG_SSB_POSSIBLE=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='ctx'> # CONFIG_DVB_CORE is not set</div><div class='add'>+# CONFIG_VIDEO_MEDIA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia drivers</div><div class='hunk'>@@ -1387,7 +1445,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_SYS_IMAGEBLIT is not set</div><div class='ctx'> # CONFIG_FB_FOREIGN_ENDIAN is not set</div><div class='ctx'> # CONFIG_FB_SYS_FOPS is not set</div><div class='del'>-CONFIG_FB_DEFERRED_IO=y</div><div class='ctx'> # CONFIG_FB_SVGALIB is not set</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='ctx'> # CONFIG_FB_BACKLIGHT is not set</div><div class='hunk'>@@ -1430,6 +1487,7 @@ CONFIG_FB_EFI=y</div><div class='ctx'> # CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_ARK is not set</div><div class='ctx'> # CONFIG_FB_PM3 is not set</div><div class='add'>+# CONFIG_FB_CARMINE is not set</div><div class='ctx'> # CONFIG_FB_GEODE is not set</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='hunk'>@@ -1437,6 +1495,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='ctx'> CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='ctx'> # CONFIG_BACKLIGHT_CORGI is not set</div><div class='ctx'> # CONFIG_BACKLIGHT_PROGEAR is not set</div><div class='add'>+# CONFIG_BACKLIGHT_MBP_NVIDIA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Display device support</div><div class='hunk'>@@ -1456,15 +1515,7 @@ CONFIG_LOGO=y</div><div class='ctx'> # CONFIG_LOGO_LINUX_MONO is not set</div><div class='ctx'> # CONFIG_LOGO_LINUX_VGA16 is not set</div><div class='ctx'> CONFIG_LOGO_LINUX_CLUT224=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Sound</div><div class='del'>-#</div><div class='ctx'> CONFIG_SOUND=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Advanced Linux Sound Architecture</div><div class='del'>-#</div><div class='ctx'> CONFIG_SND=y</div><div class='ctx'> CONFIG_SND_TIMER=y</div><div class='ctx'> CONFIG_SND_PCM=y</div><div class='hunk'>@@ -1482,20 +1533,14 @@ CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='ctx'> CONFIG_SND_VMASTER=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Generic devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_DRIVERS=y</div><div class='ctx'> # CONFIG_SND_PCSP is not set</div><div class='ctx'> # CONFIG_SND_DUMMY is not set</div><div class='ctx'> # CONFIG_SND_VIRMIDI is not set</div><div class='ctx'> # CONFIG_SND_MTPAV is not set</div><div class='ctx'> # CONFIG_SND_SERIAL_U16550 is not set</div><div class='ctx'> # CONFIG_SND_MPU401 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCI devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PCI=y</div><div class='ctx'> # CONFIG_SND_AD1889 is not set</div><div class='ctx'> # CONFIG_SND_ALS300 is not set</div><div class='ctx'> # CONFIG_SND_ALS4000 is not set</div><div class='hunk'>@@ -1568,36 +1613,14 @@ CONFIG_SND_HDA_GENERIC=y</div><div class='ctx'> # CONFIG_SND_VIRTUOSO is not set</div><div class='ctx'> # CONFIG_SND_VX222 is not set</div><div class='ctx'> # CONFIG_SND_YMFPCI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_USB=y</div><div class='ctx'> # CONFIG_SND_USB_AUDIO is not set</div><div class='ctx'> # CONFIG_SND_USB_USX2Y is not set</div><div class='ctx'> # CONFIG_SND_USB_CAIAQ is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# PCMCIA devices</div><div class='del'>-#</div><div class='add'>+CONFIG_SND_PCMCIA=y</div><div class='ctx'> # CONFIG_SND_VXPOCKET is not set</div><div class='ctx'> # CONFIG_SND_PDAUDIOCF is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# System on Chip audio support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SND_SOC is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# ALSA SoC audio for Freescale SOCs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SoC Audio for the Texas Instruments OMAP</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Open Sound System</div><div class='del'>-#</div><div class='ctx'> # CONFIG_SOUND_PRIME is not set</div><div class='ctx'> CONFIG_HID_SUPPORT=y</div><div class='ctx'> CONFIG_HID=y</div><div class='hunk'>@@ -1633,6 +1656,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> # CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='ctx'> CONFIG_USB_SUSPEND=y</div><div class='ctx'> # CONFIG_USB_OTG is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='hunk'>@@ -1656,6 +1680,7 @@ CONFIG_USB_UHCI_HCD=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> CONFIG_USB_PRINTER=y</div><div class='add'>+# CONFIG_USB_WDM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='hunk'>@@ -1677,6 +1702,7 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_KARMA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SIERRA is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set</div><div class='ctx'> CONFIG_USB_LIBUSUAL=y</div><div class='ctx'> </div><div class='hunk'>@@ -1685,7 +1711,6 @@ CONFIG_USB_LIBUSUAL=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB port drivers</div><div class='hunk'>@@ -1698,7 +1723,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_EMI62 is not set</div><div class='ctx'> # CONFIG_USB_EMI26 is not set</div><div class='ctx'> # CONFIG_USB_ADUTUX is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='ctx'> # CONFIG_USB_RIO500 is not set</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='hunk'>@@ -1715,6 +1739,7 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_TRANCEVIBRATOR is not set</div><div class='ctx'> # CONFIG_USB_IOWARRIOR is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='add'>+# CONFIG_USB_ISIGHTFW is not set</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> # CONFIG_MEMSTICK is not set</div><div class='hunk'>@@ -1724,7 +1749,9 @@ CONFIG_LEDS_CLASS=y</div><div class='ctx'> #</div><div class='ctx'> # LED drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_LEDS_PCA9532 is not set</div><div class='ctx'> # CONFIG_LEDS_CLEVO_MAIL is not set</div><div class='add'>+# CONFIG_LEDS_PCA955X is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # LED Triggers</div><div class='hunk'>@@ -1770,6 +1797,7 @@ CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M41T80 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_S35390A is not set</div><div class='add'>+# CONFIG_RTC_DRV_FM3130 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI RTC drivers</div><div class='hunk'>@@ -1802,11 +1830,13 @@ CONFIG_DMADEVICES=y</div><div class='ctx'> # Firmware Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_EDD is not set</div><div class='add'>+CONFIG_FIRMWARE_MEMMAP=y</div><div class='ctx'> CONFIG_EFI_VARS=y</div><div class='ctx'> # CONFIG_DELL_RBU is not set</div><div class='ctx'> # CONFIG_DCDBAS is not set</div><div class='ctx'> CONFIG_DMIID=y</div><div class='del'>-# CONFIG_ISCSI_IBFT_FIND is not set</div><div class='add'>+CONFIG_ISCSI_IBFT_FIND=y</div><div class='add'>+CONFIG_ISCSI_IBFT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='hunk'>@@ -1886,14 +1916,27 @@ CONFIG_HUGETLB_PAGE=y</div><div class='ctx'> # CONFIG_CRAMFS is not set</div><div class='ctx'> # CONFIG_VXFS_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_OMFS_FS is not set</div><div class='ctx'> # CONFIG_HPFS_FS is not set</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> # CONFIG_UFS_FS is not set</div><div class='ctx'> CONFIG_NETWORK_FILESYSTEMS=y</div><div class='del'>-# CONFIG_NFS_FS is not set</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+CONFIG_NFS_V3_ACL=y</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='ctx'> # CONFIG_NFSD is not set</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_ACL_SUPPORT=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='hunk'>@@ -1967,9 +2010,9 @@ CONFIG_NLS_UTF8=y</div><div class='ctx'> # Kernel hacking</div><div class='ctx'> #</div><div class='ctx'> CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='del'>-# CONFIG_PRINTK_TIME is not set</div><div class='del'>-# CONFIG_ENABLE_WARN_DEPRECATED is not set</div><div class='del'>-# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='add'>+CONFIG_PRINTK_TIME=y</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='ctx'> CONFIG_FRAME_WARN=2048</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_UNUSED_SYMBOLS is not set</div><div class='hunk'>@@ -1998,6 +2041,7 @@ CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_DEBUG_WRITECOUNT is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> # CONFIG_DEBUG_LIST is not set</div><div class='ctx'> # CONFIG_DEBUG_SG is not set</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='hunk'>@@ -2008,11 +2052,20 @@ CONFIG_FRAME_POINTER=y</div><div class='ctx'> # CONFIG_LKDTM is not set</div><div class='ctx'> # CONFIG_FAULT_INJECTION is not set</div><div class='ctx'> # CONFIG_LATENCYTOP is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_HAVE_FTRACE=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+# CONFIG_IRQSOFF_TRACER is not set</div><div class='add'>+# CONFIG_SYSPROF_TRACER is not set</div><div class='add'>+# CONFIG_SCHED_TRACER is not set</div><div class='add'>+# CONFIG_CONTEXT_SWITCH_TRACER is not set</div><div class='ctx'> CONFIG_PROVIDE_OHCI1394_DMA_INIT=y</div><div class='ctx'> # CONFIG_SAMPLES is not set</div><div class='del'>-# CONFIG_KGDB is not set</div><div class='ctx'> CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+# CONFIG_KGDB is not set</div><div class='ctx'> # CONFIG_STRICT_DEVMEM is not set</div><div class='add'>+CONFIG_X86_VERBOSE_BOOTUP=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='ctx'> CONFIG_DEBUG_STACKOVERFLOW=y</div><div class='ctx'> CONFIG_DEBUG_STACK_USAGE=y</div><div class='hunk'>@@ -2023,8 +2076,8 @@ CONFIG_DEBUG_RODATA=y</div><div class='ctx'> # CONFIG_DIRECT_GBPAGES is not set</div><div class='ctx'> # CONFIG_DEBUG_RODATA_TEST is not set</div><div class='ctx'> CONFIG_DEBUG_NX_TEST=m</div><div class='del'>-CONFIG_X86_MPPARSE=y</div><div class='ctx'> # CONFIG_IOMMU_DEBUG is not set</div><div class='add'>+# CONFIG_MMIOTRACE is not set</div><div class='ctx'> CONFIG_IO_DELAY_TYPE_0X80=0</div><div class='ctx'> CONFIG_IO_DELAY_TYPE_0XED=1</div><div class='ctx'> CONFIG_IO_DELAY_TYPE_UDELAY=2</div><div class='hunk'>@@ -2036,6 +2089,7 @@ CONFIG_IO_DELAY_0X80=y</div><div class='ctx'> CONFIG_DEFAULT_IO_DELAY_TYPE=0</div><div class='ctx'> CONFIG_DEBUG_BOOT_PARAMS=y</div><div class='ctx'> # CONFIG_CPA_DEBUG is not set</div><div class='add'>+# CONFIG_OPTIMIZE_INLINING is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='hunk'>@@ -2045,7 +2099,6 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y</div><div class='ctx'> CONFIG_SECURITY=y</div><div class='ctx'> CONFIG_SECURITY_NETWORK=y</div><div class='ctx'> # CONFIG_SECURITY_NETWORK_XFRM is not set</div><div class='del'>-CONFIG_SECURITY_CAPABILITIES=y</div><div class='ctx'> CONFIG_SECURITY_FILE_CAPABILITIES=y</div><div class='ctx'> # CONFIG_SECURITY_ROOTPLUG is not set</div><div class='ctx'> CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536</div><div class='hunk'>@@ -2106,6 +2159,10 @@ CONFIG_CRYPTO_HMAC=y</div><div class='ctx'> # CONFIG_CRYPTO_MD4 is not set</div><div class='ctx'> CONFIG_CRYPTO_MD5=y</div><div class='ctx'> # CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD128 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD160 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD256 is not set</div><div class='add'>+# CONFIG_CRYPTO_RMD320 is not set</div><div class='ctx'> CONFIG_CRYPTO_SHA1=y</div><div class='ctx'> # CONFIG_CRYPTO_SHA256 is not set</div><div class='ctx'> # CONFIG_CRYPTO_SHA512 is not set</div><div class='hunk'>@@ -2155,6 +2212,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='ctx'> # CONFIG_CRC_ITU_T is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_CRC7 is not set</div><div class='head'>diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c<br/>index fa88a1d71290..bfd10fd211cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/acpi/boot.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/acpi/boot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/acpi/boot.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/acpi/boot.c</a></div><div class='hunk'>@@ -97,6 +97,8 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;</div><div class='ctx'> #warning ACPI uses CMPXCHG, i486 and later hardware</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static int acpi_mcfg_64bit_base_addr __initdata = FALSE;</div><div class='add'>+</div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='ctx'>                               Boot-time Configuration</div><div class='ctx'>    -------------------------------------------------------------------------- */</div><div class='hunk'>@@ -158,6 +160,14 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size)</div><div class='ctx'> struct acpi_mcfg_allocation *pci_mmcfg_config;</div><div class='ctx'> int pci_mmcfg_config_num;</div><div class='ctx'> </div><div class='add'>+static int __init acpi_mcfg_oem_check(struct acpi_table_mcfg *mcfg)</div><div class='add'>+{</div><div class='add'>+	if (!strcmp(mcfg-&gt;header.oem_id, "SGI"))</div><div class='add'>+		acpi_mcfg_64bit_base_addr = TRUE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int __init acpi_parse_mcfg(struct acpi_table_header *header)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_table_mcfg *mcfg;</div><div class='hunk'>@@ -190,8 +200,12 @@ int __init acpi_parse_mcfg(struct acpi_table_header *header)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(pci_mmcfg_config, &amp;mcfg[1], config_size);</div><div class='add'>+</div><div class='add'>+	acpi_mcfg_oem_check(mcfg);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; pci_mmcfg_config_num; ++i) {</div><div class='del'>-		if (pci_mmcfg_config[i].address &gt; 0xFFFFFFFF) {</div><div class='add'>+		if ((pci_mmcfg_config[i].address &gt; 0xFFFFFFFF) &amp;&amp;</div><div class='add'>+		    !acpi_mcfg_64bit_base_addr) {</div><div class='ctx'> 			printk(KERN_ERR PREFIX</div><div class='ctx'> 			       "MMCONFIG not in low 4GB of memory\n");</div><div class='ctx'> 			kfree(pci_mmcfg_config);</div><div class='head'>diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c<br/>index fa2161d5003b..426e5d91b63a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/acpi/sleep.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/acpi/sleep.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/acpi/sleep.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/acpi/sleep.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@ unsigned long acpi_realmode_flags;</div><div class='ctx'> /* address in low memory of the wakeup routine. */</div><div class='ctx'> static unsigned long acpi_realmode;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_64BIT</div><div class='add'>+#if defined(CONFIG_SMP) &amp;&amp; defined(CONFIG_64BIT)</div><div class='ctx'> static char temp_stack[10240];</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -86,7 +86,7 @@ int acpi_save_state_mem(void)</div><div class='ctx'> #endif /* !CONFIG_64BIT */</div><div class='ctx'> </div><div class='ctx'> 	header-&gt;pmode_cr0 = read_cr0();</div><div class='del'>-	header-&gt;pmode_cr4 = read_cr4();</div><div class='add'>+	header-&gt;pmode_cr4 = read_cr4_safe();</div><div class='ctx'> 	header-&gt;realmode_flags = acpi_realmode_flags;</div><div class='ctx'> 	header-&gt;real_magic = 0x12345678;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c<br/>index 2763cb37b553..65a0c1b48696 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/alternative.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/alternative.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/alternative.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/alternative.c</a></div><div class='hunk'>@@ -145,35 +145,25 @@ static const unsigned char *const p6_nops[ASM_NOP_MAX+1] = {</div><div class='ctx'> extern char __vsyscall_0;</div><div class='ctx'> const unsigned char *const *find_nop_table(void)</div><div class='ctx'> {</div><div class='del'>-	return boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ||</div><div class='del'>-	       boot_cpu_data.x86 &lt; 6 ? k8_nops : p6_nops;</div><div class='add'>+	if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL &amp;&amp;</div><div class='add'>+	    boot_cpu_has(X86_FEATURE_NOPL))</div><div class='add'>+		return p6_nops;</div><div class='add'>+	else</div><div class='add'>+		return k8_nops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_X86_64 */</div><div class='ctx'> </div><div class='del'>-static const struct nop {</div><div class='del'>-	int cpuid;</div><div class='del'>-	const unsigned char *const *noptable;</div><div class='del'>-} noptypes[] = {</div><div class='del'>-	{ X86_FEATURE_K8, k8_nops },</div><div class='del'>-	{ X86_FEATURE_K7, k7_nops },</div><div class='del'>-	{ X86_FEATURE_P4, p6_nops },</div><div class='del'>-	{ X86_FEATURE_P3, p6_nops },</div><div class='del'>-	{ -1, NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> const unsigned char *const *find_nop_table(void)</div><div class='ctx'> {</div><div class='del'>-	const unsigned char *const *noptable = intel_nops;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; noptypes[i].cpuid &gt;= 0; i++) {</div><div class='del'>-		if (boot_cpu_has(noptypes[i].cpuid)) {</div><div class='del'>-			noptable = noptypes[i].noptable;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return noptable;</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_K8))</div><div class='add'>+		return k8_nops;</div><div class='add'>+	else if (boot_cpu_has(X86_FEATURE_K7))</div><div class='add'>+		return k7_nops;</div><div class='add'>+	else if (boot_cpu_has(X86_FEATURE_NOPL))</div><div class='add'>+		return p6_nops;</div><div class='add'>+	else</div><div class='add'>+		return intel_nops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_X86_64 */</div><div class='head'>diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c<br/>index 22d7d050905d..69b4d060b21c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/amd_iommu.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/amd_iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/amd_iommu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/amd_iommu.c</a></div><div class='hunk'>@@ -65,7 +65,7 @@ static int __iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd)</div><div class='ctx'> 	u8 *target;</div><div class='ctx'> </div><div class='ctx'> 	tail = readl(iommu-&gt;mmio_base + MMIO_CMD_TAIL_OFFSET);</div><div class='del'>-	target = (iommu-&gt;cmd_buf + tail);</div><div class='add'>+	target = iommu-&gt;cmd_buf + tail;</div><div class='ctx'> 	memcpy_toio(target, cmd, sizeof(*cmd));</div><div class='ctx'> 	tail = (tail + sizeof(*cmd)) % iommu-&gt;cmd_buf_size;</div><div class='ctx'> 	head = readl(iommu-&gt;mmio_base + MMIO_CMD_HEAD_OFFSET);</div><div class='hunk'>@@ -101,16 +101,13 @@ static int iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd)</div><div class='ctx'>  */</div><div class='ctx'> static int iommu_completion_wait(struct amd_iommu *iommu)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, ready = 0;</div><div class='add'>+	unsigned status = 0;</div><div class='ctx'> 	struct iommu_cmd cmd;</div><div class='del'>-	volatile u64 ready = 0;</div><div class='del'>-	unsigned long ready_phys = virt_to_phys(&amp;ready);</div><div class='ctx'> 	unsigned long i = 0;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-	cmd.data[0] = LOW_U32(ready_phys) | CMD_COMPL_WAIT_STORE_MASK;</div><div class='del'>-	cmd.data[1] = upper_32_bits(ready_phys);</div><div class='del'>-	cmd.data[2] = 1; /* value written to 'ready' */</div><div class='add'>+	cmd.data[0] = CMD_COMPL_WAIT_INT_MASK;</div><div class='ctx'> 	CMD_SET_TYPE(&amp;cmd, CMD_COMPL_WAIT);</div><div class='ctx'> </div><div class='ctx'> 	iommu-&gt;need_sync = 0;</div><div class='hunk'>@@ -122,9 +119,15 @@ static int iommu_completion_wait(struct amd_iommu *iommu)</div><div class='ctx'> </div><div class='ctx'> 	while (!ready &amp;&amp; (i &lt; EXIT_LOOP_COUNT)) {</div><div class='ctx'> 		++i;</div><div class='del'>-		cpu_relax();</div><div class='add'>+		/* wait for the bit to become one */</div><div class='add'>+		status = readl(iommu-&gt;mmio_base + MMIO_STATUS_OFFSET);</div><div class='add'>+		ready = status &amp; MMIO_STATUS_COM_WAIT_INT_MASK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* set bit back to zero */</div><div class='add'>+	status &amp;= ~MMIO_STATUS_COM_WAIT_INT_MASK;</div><div class='add'>+	writel(status, iommu-&gt;mmio_base + MMIO_STATUS_OFFSET);</div><div class='add'>+</div><div class='ctx'> 	if (unlikely((i == EXIT_LOOP_COUNT) &amp;&amp; printk_ratelimit()))</div><div class='ctx'> 		printk(KERN_WARNING "AMD IOMMU: Completion wait loop failed\n");</div><div class='ctx'> </div><div class='hunk'>@@ -161,7 +164,7 @@ static int iommu_queue_inv_iommu_pages(struct amd_iommu *iommu,</div><div class='ctx'> 	address &amp;= PAGE_MASK;</div><div class='ctx'> 	CMD_SET_TYPE(&amp;cmd, CMD_INV_IOMMU_PAGES);</div><div class='ctx'> 	cmd.data[1] |= domid;</div><div class='del'>-	cmd.data[2] = LOW_U32(address);</div><div class='add'>+	cmd.data[2] = lower_32_bits(address);</div><div class='ctx'> 	cmd.data[3] = upper_32_bits(address);</div><div class='ctx'> 	if (s) /* size bit - we flush more than one 4kb page */</div><div class='ctx'> 		cmd.data[2] |= CMD_INV_IOMMU_PAGES_SIZE_MASK;</div><div class='head'>diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c<br/>index d9a9da597e79..a69cc0f52042 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/amd_iommu_init.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/amd_iommu_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/amd_iommu_init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/amd_iommu_init.c</a></div><div class='hunk'>@@ -801,6 +801,21 @@ static int __init init_memory_definitions(struct acpi_table_header *table)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Init the device table to not allow DMA access for devices and</div><div class='add'>+ * suppress all page faults</div><div class='add'>+ */</div><div class='add'>+static void init_device_table(void)</div><div class='add'>+{</div><div class='add'>+	u16 devid;</div><div class='add'>+</div><div class='add'>+	for (devid = 0; devid &lt;= amd_iommu_last_bdf; ++devid) {</div><div class='add'>+		set_dev_entry_bit(devid, DEV_ENTRY_VALID);</div><div class='add'>+		set_dev_entry_bit(devid, DEV_ENTRY_TRANSLATION);</div><div class='add'>+		set_dev_entry_bit(devid, DEV_ENTRY_NO_PAGE_FAULT);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * This function finally enables all IOMMUs found in the system after</div><div class='ctx'>  * they have been initialized</div><div class='ctx'>  */</div><div class='hunk'>@@ -931,6 +946,9 @@ int __init amd_iommu_init(void)</div><div class='ctx'> 	if (amd_iommu_pd_alloc_bitmap == NULL)</div><div class='ctx'> 		goto free;</div><div class='ctx'> </div><div class='add'>+	/* init the device table */</div><div class='add'>+	init_device_table();</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * let all alias entries point to itself</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -954,15 +972,15 @@ int __init amd_iommu_init(void)</div><div class='ctx'> 	if (acpi_table_parse("IVRS", init_memory_definitions) != 0)</div><div class='ctx'> 		goto free;</div><div class='ctx'> </div><div class='del'>-	ret = amd_iommu_init_dma_ops();</div><div class='add'>+	ret = sysdev_class_register(&amp;amd_iommu_sysdev_class);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto free;</div><div class='ctx'> </div><div class='del'>-	ret = sysdev_class_register(&amp;amd_iommu_sysdev_class);</div><div class='add'>+	ret = sysdev_register(&amp;device_amd_iommu);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto free;</div><div class='ctx'> </div><div class='del'>-	ret = sysdev_register(&amp;device_amd_iommu);</div><div class='add'>+	ret = amd_iommu_init_dma_ops();</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto free;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c<br/>index d6c898358371..f88bd0d982b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/apic_32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/apic_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/apic_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/apic_32.c</a></div><div class='hunk'>@@ -1454,8 +1454,6 @@ void disconnect_bsp_APIC(int virt_wire_setup)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned int __cpuinitdata maxcpus = NR_CPUS;</div><div class='del'>-</div><div class='ctx'> void __cpuinit generic_processor_info(int apicid, int version)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='hunk'>@@ -1482,12 +1480,6 @@ void __cpuinit generic_processor_info(int apicid, int version)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (num_processors &gt;= maxcpus) {</div><div class='del'>-		printk(KERN_WARNING "WARNING: maxcpus limit of %i reached."</div><div class='del'>-			" Processor ignored.\n", maxcpus);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	num_processors++;</div><div class='ctx'> 	cpus_complement(tmp_map, cpu_present_map);</div><div class='ctx'> 	cpu = first_cpu(tmp_map);</div><div class='hunk'>@@ -1720,15 +1712,19 @@ static int __init parse_lapic_timer_c2_ok(char *arg)</div><div class='ctx'> }</div><div class='ctx'> early_param("lapic_timer_c2_ok", parse_lapic_timer_c2_ok);</div><div class='ctx'> </div><div class='del'>-static int __init apic_set_verbosity(char *str)</div><div class='add'>+static int __init apic_set_verbosity(char *arg)</div><div class='ctx'> {</div><div class='del'>-	if (strcmp("debug", str) == 0)</div><div class='add'>+	if (!arg)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (strcmp(arg, "debug") == 0)</div><div class='ctx'> 		apic_verbosity = APIC_DEBUG;</div><div class='del'>-	else if (strcmp("verbose", str) == 0)</div><div class='add'>+	else if (strcmp(arg, "verbose") == 0)</div><div class='ctx'> 		apic_verbosity = APIC_VERBOSE;</div><div class='del'>-	return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-__setup("apic=", apic_set_verbosity);</div><div class='add'>+early_param("apic", apic_set_verbosity);</div><div class='ctx'> </div><div class='ctx'> static int __init lapic_insert_resource(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c<br/>index 7f1f030da7ee..446c062e831c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/apic_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/apic_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/apic_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/apic_64.c</a></div><div class='hunk'>@@ -90,7 +90,6 @@ static unsigned long apic_phys;</div><div class='ctx'> </div><div class='ctx'> unsigned long mp_lapic_addr;</div><div class='ctx'> </div><div class='del'>-unsigned int __cpuinitdata maxcpus = NR_CPUS;</div><div class='ctx'> /*</div><div class='ctx'>  * Get the LAPIC version</div><div class='ctx'>  */</div><div class='hunk'>@@ -1062,12 +1061,6 @@ void __cpuinit generic_processor_info(int apicid, int version)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (num_processors &gt;= maxcpus) {</div><div class='del'>-		printk(KERN_WARNING "WARNING: maxcpus limit of %i reached."</div><div class='del'>-		       " Processor ignored.\n", maxcpus);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	num_processors++;</div><div class='ctx'> 	cpus_complement(tmp_map, cpu_present_map);</div><div class='ctx'> 	cpu = first_cpu(tmp_map);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c<br/>index 84a8220a6072..a6ef672adbba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/addon_cpuid_features.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpu/addon_cpuid_features.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/addon_cpuid_features.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/addon_cpuid_features.c</a></div><div class='hunk'>@@ -56,9 +56,22 @@ void __cpuinit validate_pat_support(struct cpuinfo_x86 *c)</div><div class='ctx'> </div><div class='ctx'> 	switch (c-&gt;x86_vendor) {</div><div class='ctx'> 	case X86_VENDOR_INTEL:</div><div class='del'>-		if (c-&gt;x86 == 0xF || (c-&gt;x86 == 6 &amp;&amp; c-&gt;x86_model &gt;= 15))</div><div class='add'>+		/*</div><div class='add'>+		 * There is a known erratum on Pentium III and Core Solo</div><div class='add'>+		 * and Core Duo CPUs.</div><div class='add'>+		 * " Page with PAT set to WC while associated MTRR is UC</div><div class='add'>+		 *   may consolidate to UC "</div><div class='add'>+		 * Because of this erratum, it is better to stick with</div><div class='add'>+		 * setting WC in MTRR rather than using PAT on these CPUs.</div><div class='add'>+		 *</div><div class='add'>+		 * Enable PAT WC only on P4, Core 2 or later CPUs.</div><div class='add'>+		 */</div><div class='add'>+		if (c-&gt;x86 &gt; 0x6 || (c-&gt;x86 == 6 &amp;&amp; c-&gt;x86_model &gt;= 15))</div><div class='ctx'> 			return;</div><div class='del'>-		break;</div><div class='add'>+</div><div class='add'>+		pat_disable("PAT WC disabled due to known CPU erratum.");</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	case X86_VENDOR_AMD:</div><div class='ctx'> 	case X86_VENDOR_CENTAUR:</div><div class='ctx'> 	case X86_VENDOR_TRANSMETA:</div><div class='head'>diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c<br/>index cae9cabc3031..18514ed26104 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/amd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpu/amd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/amd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/amd.c</a></div><div class='hunk'>@@ -31,6 +31,11 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)</div><div class='ctx'> 		if (c-&gt;x86_power &amp; (1&lt;&lt;8))</div><div class='ctx'> 			set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*  Set MTRR capability flag if appropriate */</div><div class='add'>+	if (c-&gt;x86_model == 13 || c-&gt;x86_model == 9 ||</div><div class='add'>+	   (c-&gt;x86_model == 8 &amp;&amp; c-&gt;x86_mask &gt;= 8))</div><div class='add'>+		set_cpu_cap(c, X86_FEATURE_K6_MTRR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __cpuinit init_amd(struct cpuinfo_x86 *c)</div><div class='hunk'>@@ -166,10 +171,6 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)</div><div class='ctx'> 						mbytes);</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='del'>-				/*  Set MTRR capability flag if appropriate */</div><div class='del'>-				if (c-&gt;x86_model == 13 || c-&gt;x86_model == 9 ||</div><div class='del'>-				   (c-&gt;x86_model == 8 &amp;&amp; c-&gt;x86_mask &gt;= 8))</div><div class='del'>-					set_cpu_cap(c, X86_FEATURE_K6_MTRR);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c<br/>index c9b58a806e85..c8e315f1aa83 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/bugs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpu/bugs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/bugs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/bugs.c</a></div><div class='hunk'>@@ -50,6 +50,8 @@ static double __initdata y = 3145727.0;</div><div class='ctx'>  */</div><div class='ctx'> static void __init check_fpu(void)</div><div class='ctx'> {</div><div class='add'>+	s32 fdiv_bug;</div><div class='add'>+</div><div class='ctx'> 	if (!boot_cpu_data.hard_math) {</div><div class='ctx'> #ifndef CONFIG_MATH_EMULATION</div><div class='ctx'> 		printk(KERN_EMERG "No coprocessor found and no math emulation present.\n");</div><div class='hunk'>@@ -74,8 +76,10 @@ static void __init check_fpu(void)</div><div class='ctx'> 		"fistpl %0\n\t"</div><div class='ctx'> 		"fwait\n\t"</div><div class='ctx'> 		"fninit"</div><div class='del'>-		: "=m" (*&amp;boot_cpu_data.fdiv_bug)</div><div class='add'>+		: "=m" (*&amp;fdiv_bug)</div><div class='ctx'> 		: "m" (*&amp;x), "m" (*&amp;y));</div><div class='add'>+</div><div class='add'>+	boot_cpu_data.fdiv_bug = fdiv_bug;</div><div class='ctx'> 	if (boot_cpu_data.fdiv_bug)</div><div class='ctx'> 		printk("Hmm, FPU with FDIV bug.\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c<br/>index e0f45edd6a55..a0534c04d38a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/centaur.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpu/centaur.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/centaur.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/centaur.c</a></div><div class='hunk'>@@ -314,6 +314,16 @@ enum {</div><div class='ctx'> 		EAMD3D		= 1&lt;&lt;20,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void __cpuinit early_init_centaur(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+	switch (c-&gt;x86) {</div><div class='add'>+	case 5:</div><div class='add'>+		/* Emulate MTRRs using Centaur's MCR. */</div><div class='add'>+		set_cpu_cap(c, X86_FEATURE_CENTAUR_MCR);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __cpuinit init_centaur(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='hunk'>@@ -462,6 +472,7 @@ centaur_size_cache(struct cpuinfo_x86 *c, unsigned int size)</div><div class='ctx'> static struct cpu_dev centaur_cpu_dev __cpuinitdata = {</div><div class='ctx'> 	.c_vendor	= "Centaur",</div><div class='ctx'> 	.c_ident	= { "CentaurHauls" },</div><div class='add'>+	.c_early_init	= early_init_centaur,</div><div class='ctx'> 	.c_init		= init_centaur,</div><div class='ctx'> 	.c_size_cache	= centaur_size_cache,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c<br/>index 80ab20d4fa39..4e456bd955bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/common.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpu/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/common.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/common.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;asm/mtrr.h&gt;</div><div class='ctx'> #include &lt;asm/mce.h&gt;</div><div class='ctx'> #include &lt;asm/pat.h&gt;</div><div class='add'>+#include &lt;asm/asm.h&gt;</div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC</div><div class='ctx'> #include &lt;asm/mpspec.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='hunk'>@@ -334,11 +335,24 @@ static void __init early_cpu_detect(void)</div><div class='ctx'> </div><div class='ctx'> 	get_cpu_vendor(c, 1);</div><div class='ctx'> </div><div class='add'>+	early_get_cap(c);</div><div class='add'>+</div><div class='ctx'> 	if (c-&gt;x86_vendor != X86_VENDOR_UNKNOWN &amp;&amp;</div><div class='ctx'> 	    cpu_devs[c-&gt;x86_vendor]-&gt;c_early_init)</div><div class='ctx'> 		cpu_devs[c-&gt;x86_vendor]-&gt;c_early_init(c);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	early_get_cap(c);</div><div class='add'>+/*</div><div class='add'>+ * The NOPL instruction is supposed to exist on all CPUs with</div><div class='add'>+ * family &gt;= 6; unfortunately, that's not true in practice because</div><div class='add'>+ * of early VIA chips and (more importantly) broken virtualizers that</div><div class='add'>+ * are not easy to detect.  In the latter case it doesn't even *fail*</div><div class='add'>+ * reliably, so probing for it doesn't even work.  Disable it completely</div><div class='add'>+ * unless we can find a reliable way to detect all the broken cases.</div><div class='add'>+ */</div><div class='add'>+static void __cpuinit detect_nopl(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+	clear_cpu_cap(c, X86_FEATURE_NOPL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __cpuinit generic_identify(struct cpuinfo_x86 *c)</div><div class='hunk'>@@ -395,8 +409,8 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		init_scattered_cpuid_features(c);</div><div class='add'>+		detect_nopl(c);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __cpuinit squash_the_stupid_serial_number(struct cpuinfo_x86 *c)</div><div class='head'>diff --git a/arch/x86/kernel/cpu/common_64.c b/arch/x86/kernel/cpu/common_64.c<br/>index dd6e3f15017e..a11f5d4477cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/common_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpu/common_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/common_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/common_64.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;asm/mtrr.h&gt;</div><div class='ctx'> #include &lt;asm/mce.h&gt;</div><div class='ctx'> #include &lt;asm/pat.h&gt;</div><div class='add'>+#include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/numa.h&gt;</div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC</div><div class='ctx'> #include &lt;asm/mpspec.h&gt;</div><div class='hunk'>@@ -215,6 +216,39 @@ static void __init early_cpu_support_print(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The NOPL instruction is supposed to exist on all CPUs with</div><div class='add'>+ * family &gt;= 6, unfortunately, that's not true in practice because</div><div class='add'>+ * of early VIA chips and (more importantly) broken virtualizers that</div><div class='add'>+ * are not easy to detect.  Hence, probe for it based on first</div><div class='add'>+ * principles.</div><div class='add'>+ *</div><div class='add'>+ * Note: no 64-bit chip is known to lack these, but put the code here</div><div class='add'>+ * for consistency with 32 bits, and to make it utterly trivial to</div><div class='add'>+ * diagnose the problem should it ever surface.</div><div class='add'>+ */</div><div class='add'>+static void __cpuinit detect_nopl(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+	const u32 nopl_signature = 0x888c53b1; /* Random number */</div><div class='add'>+	u32 has_nopl = nopl_signature;</div><div class='add'>+</div><div class='add'>+	clear_cpu_cap(c, X86_FEATURE_NOPL);</div><div class='add'>+	if (c-&gt;x86 &gt;= 6) {</div><div class='add'>+		asm volatile("\n"</div><div class='add'>+			     "1:      .byte 0x0f,0x1f,0xc0\n" /* nopl %eax */</div><div class='add'>+			     "2:\n"</div><div class='add'>+			     "        .section .fixup,\"ax\"\n"</div><div class='add'>+			     "3:      xor %0,%0\n"</div><div class='add'>+			     "        jmp 2b\n"</div><div class='add'>+			     "        .previous\n"</div><div class='add'>+			     _ASM_EXTABLE(1b,3b)</div><div class='add'>+			     : "+a" (has_nopl));</div><div class='add'>+</div><div class='add'>+		if (has_nopl == nopl_signature)</div><div class='add'>+			set_cpu_cap(c, X86_FEATURE_NOPL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c);</div><div class='ctx'> </div><div class='ctx'> void __init early_cpu_init(void)</div><div class='hunk'>@@ -313,6 +347,8 @@ static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c)</div><div class='ctx'> 		c-&gt;x86_phys_bits = eax &amp; 0xff;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	detect_nopl(c);</div><div class='add'>+</div><div class='ctx'> 	if (c-&gt;x86_vendor != X86_VENDOR_UNKNOWN &amp;&amp;</div><div class='ctx'> 	    cpu_devs[c-&gt;x86_vendor]-&gt;c_early_init)</div><div class='ctx'> 		cpu_devs[c-&gt;x86_vendor]-&gt;c_early_init(c);</div><div class='hunk'>@@ -493,17 +529,20 @@ void pda_init(int cpu)</div><div class='ctx'> 		/* others are initialized in smpboot.c */</div><div class='ctx'> 		pda-&gt;pcurrent = &amp;init_task;</div><div class='ctx'> 		pda-&gt;irqstackptr = boot_cpu_stack;</div><div class='add'>+		pda-&gt;irqstackptr += IRQSTACKSIZE - 64;</div><div class='ctx'> 	} else {</div><div class='del'>-		pda-&gt;irqstackptr = (char *)</div><div class='del'>-			__get_free_pages(GFP_ATOMIC, IRQSTACK_ORDER);</div><div class='del'>-		if (!pda-&gt;irqstackptr)</div><div class='del'>-			panic("cannot allocate irqstack for cpu %d", cpu);</div><div class='add'>+		if (!pda-&gt;irqstackptr) {</div><div class='add'>+			pda-&gt;irqstackptr = (char *)</div><div class='add'>+				__get_free_pages(GFP_ATOMIC, IRQSTACK_ORDER);</div><div class='add'>+			if (!pda-&gt;irqstackptr)</div><div class='add'>+				panic("cannot allocate irqstack for cpu %d",</div><div class='add'>+				      cpu);</div><div class='add'>+			pda-&gt;irqstackptr += IRQSTACKSIZE - 64;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (pda-&gt;nodenumber == 0 &amp;&amp; cpu_to_node(cpu) != NUMA_NO_NODE)</div><div class='ctx'> 			pda-&gt;nodenumber = cpu_to_node(cpu);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	pda-&gt;irqstackptr += IRQSTACKSIZE-64;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> char boot_exception_stacks[(N_EXCEPTION_STACKS - 1) * EXCEPTION_STKSZ +</div><div class='hunk'>@@ -601,19 +640,22 @@ void __cpuinit cpu_init(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * set up and load the per-CPU TSS</div><div class='ctx'> 	 */</div><div class='del'>-	for (v = 0; v &lt; N_EXCEPTION_STACKS; v++) {</div><div class='add'>+	if (!orig_ist-&gt;ist[0]) {</div><div class='ctx'> 		static const unsigned int order[N_EXCEPTION_STACKS] = {</div><div class='del'>-			[0 ... N_EXCEPTION_STACKS - 1] = EXCEPTION_STACK_ORDER,</div><div class='del'>-			[DEBUG_STACK - 1] = DEBUG_STACK_ORDER</div><div class='add'>+		  [0 ... N_EXCEPTION_STACKS - 1] = EXCEPTION_STACK_ORDER,</div><div class='add'>+		  [DEBUG_STACK - 1] = DEBUG_STACK_ORDER</div><div class='ctx'> 		};</div><div class='del'>-		if (cpu) {</div><div class='del'>-			estacks = (char *)__get_free_pages(GFP_ATOMIC, order[v]);</div><div class='del'>-			if (!estacks)</div><div class='del'>-				panic("Cannot allocate exception stack %ld %d\n",</div><div class='del'>-				      v, cpu);</div><div class='add'>+		for (v = 0; v &lt; N_EXCEPTION_STACKS; v++) {</div><div class='add'>+			if (cpu) {</div><div class='add'>+				estacks = (char *)__get_free_pages(GFP_ATOMIC, order[v]);</div><div class='add'>+				if (!estacks)</div><div class='add'>+					panic("Cannot allocate exception "</div><div class='add'>+					      "stack %ld %d\n", v, cpu);</div><div class='add'>+			}</div><div class='add'>+			estacks += PAGE_SIZE &lt;&lt; order[v];</div><div class='add'>+			orig_ist-&gt;ist[v] = t-&gt;x86_tss.ist[v] =</div><div class='add'>+					(unsigned long)estacks;</div><div class='ctx'> 		}</div><div class='del'>-		estacks += PAGE_SIZE &lt;&lt; order[v];</div><div class='del'>-		orig_ist-&gt;ist[v] = t-&gt;x86_tss.ist[v] = (unsigned long)estacks;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	t-&gt;x86_tss.io_bitmap_base = offsetof(struct tss_struct, io_bitmap);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/cpufreq/Kconfig b/arch/x86/kernel/cpu/cpufreq/Kconfig<br/>index cb7a5715596d..efae3b22a0ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/cpufreq/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpu/cpufreq/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/cpufreq/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/cpufreq/Kconfig</a></div><div class='hunk'>@@ -235,9 +235,9 @@ config X86_LONGHAUL</div><div class='ctx'> 	  If in doubt, say N.</div><div class='ctx'> </div><div class='ctx'> config X86_E_POWERSAVER</div><div class='del'>-	tristate "VIA C7 Enhanced PowerSaver (EXPERIMENTAL)"</div><div class='add'>+	tristate "VIA C7 Enhanced PowerSaver"</div><div class='ctx'> 	select CPU_FREQ_TABLE</div><div class='del'>-	depends on X86_32 &amp;&amp; EXPERIMENTAL</div><div class='add'>+	depends on X86_32</div><div class='ctx'> 	help</div><div class='ctx'> 	  This adds the CPUFreq driver for VIA C7 processors.</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/cpufreq/elanfreq.c b/arch/x86/kernel/cpu/cpufreq/elanfreq.c<br/>index 94619c22f563..e4a4bf870e94 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/cpufreq/elanfreq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpu/cpufreq/elanfreq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/cpufreq/elanfreq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/cpufreq/elanfreq.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@ struct s_elan_multiplier {</div><div class='ctx'>  * It is important that the frequencies</div><div class='ctx'>  * are listed in ascending order here!</div><div class='ctx'>  */</div><div class='del'>-struct s_elan_multiplier elan_multiplier[] = {</div><div class='add'>+static struct s_elan_multiplier elan_multiplier[] = {</div><div class='ctx'> 	{1000,	0x02,	0x18},</div><div class='ctx'> 	{2000,	0x02,	0x10},</div><div class='ctx'> 	{4000,	0x02,	0x08},</div><div class='head'>diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c<br/>index c45ca6d4dce1..84bb395038d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/cpufreq/powernow-k8.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpu/cpufreq/powernow-k8.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/cpufreq/powernow-k8.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/cpufreq/powernow-k8.c</a></div><div class='hunk'>@@ -66,7 +66,6 @@ static u32 find_freq_from_fid(u32 fid)</div><div class='ctx'> 	return 800 + (fid * 100);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* Return a frequency in KHz, given an input fid */</div><div class='ctx'> static u32 find_khz_freq_from_fid(u32 fid)</div><div class='ctx'> {</div><div class='hunk'>@@ -78,7 +77,6 @@ static u32 find_khz_freq_from_pstate(struct cpufreq_frequency_table *data, u32 p</div><div class='ctx'> 	return data[pstate].frequency;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* Return the vco fid for an input fid</div><div class='ctx'>  *</div><div class='ctx'>  * Each "low" fid has corresponding "high" fid, and you can get to "low" fids</div><div class='hunk'>@@ -166,7 +164,6 @@ static void fidvid_msr_init(void)</div><div class='ctx'> 	wrmsr(MSR_FIDVID_CTL, lo, hi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* write the new fid value along with the other control fields to the msr */</div><div class='ctx'> static int write_new_fid(struct powernow_k8_data *data, u32 fid)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c<br/>index 3fd7a67bb06a..898a5a2002ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/cyrix.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpu/cyrix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/cyrix.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/cyrix.c</a></div><div class='hunk'>@@ -15,13 +15,11 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Read NSC/Cyrix DEVID registers (DIR) to get more detailed info. about the CPU</div><div class='ctx'>  */</div><div class='del'>-static void __cpuinit do_cyrix_devid(unsigned char *dir0, unsigned char *dir1)</div><div class='add'>+static void __cpuinit __do_cyrix_devid(unsigned char *dir0, unsigned char *dir1)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char ccr2, ccr3;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* we test for DEVID by checking whether CCR3 is writable */</div><div class='del'>-	local_irq_save(flags);</div><div class='ctx'> 	ccr3 = getCx86(CX86_CCR3);</div><div class='ctx'> 	setCx86(CX86_CCR3, ccr3 ^ 0x80);</div><div class='ctx'> 	getCx86(0xc0);   /* dummy to change bus */</div><div class='hunk'>@@ -44,9 +42,16 @@ static void __cpuinit do_cyrix_devid(unsigned char *dir0, unsigned char *dir1)</div><div class='ctx'> 		*dir0 = getCx86(CX86_DIR0);</div><div class='ctx'> 		*dir1 = getCx86(CX86_DIR1);</div><div class='ctx'> 	}</div><div class='del'>-	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __cpuinit do_cyrix_devid(unsigned char *dir0, unsigned char *dir1)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	__do_cyrix_devid(dir0, dir1);</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='ctx'> /*</div><div class='ctx'>  * Cx86_dir0_msb is a HACK needed by check_cx686_cpuid/slop in bugs.h in</div><div class='ctx'>  * order to identify the Cyrix CPU model after we're out of setup.c</div><div class='hunk'>@@ -134,23 +139,6 @@ static void __cpuinit set_cx86_memwb(void)</div><div class='ctx'> 	setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x14);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __cpuinit set_cx86_inc(void)</div><div class='del'>-{</div><div class='del'>-	unsigned char ccr3;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "Enable Incrementor on Cyrix/NSC processor.\n");</div><div class='del'>-</div><div class='del'>-	ccr3 = getCx86(CX86_CCR3);</div><div class='del'>-	setCx86(CX86_CCR3, (ccr3 &amp; 0x0f) | 0x10); /* enable MAPEN */</div><div class='del'>-	/* PCR1 -- Performance Control */</div><div class='del'>-	/* Incrementor on, whatever that is */</div><div class='del'>-	setCx86(CX86_PCR1, getCx86(CX86_PCR1) | 0x02);</div><div class='del'>-	/* PCR0 -- Performance Control */</div><div class='del'>-	/* Incrementor Margin 10 */</div><div class='del'>-	setCx86(CX86_PCR0, getCx86(CX86_PCR0) | 0x04);</div><div class='del'>-	setCx86(CX86_CCR3, ccr3);	/* disable MAPEN */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	Configure later MediaGX and/or Geode processor.</div><div class='ctx'>  */</div><div class='hunk'>@@ -174,11 +162,28 @@ static void __cpuinit geode_configure(void)</div><div class='ctx'> </div><div class='ctx'> 	set_cx86_memwb();</div><div class='ctx'> 	set_cx86_reorder();</div><div class='del'>-	set_cx86_inc();</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __cpuinit early_init_cyrix(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+	unsigned char dir0, dir0_msn, dir1 = 0;</div><div class='add'>+</div><div class='add'>+	__do_cyrix_devid(&amp;dir0, &amp;dir1);</div><div class='add'>+	dir0_msn = dir0 &gt;&gt; 4; /* identifies CPU "family"   */</div><div class='add'>+</div><div class='add'>+	switch (dir0_msn) {</div><div class='add'>+	case 3: /* 6x86/6x86L */</div><div class='add'>+		/* Emulate MTRRs using Cyrix's ARRs. */</div><div class='add'>+		set_cpu_cap(c, X86_FEATURE_CYRIX_ARR);</div><div class='add'>+		break;</div><div class='add'>+	case 5: /* 6x86MX/M II */</div><div class='add'>+		/* Emulate MTRRs using Cyrix's ARRs. */</div><div class='add'>+		set_cpu_cap(c, X86_FEATURE_CYRIX_ARR);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void __cpuinit init_cyrix(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='hunk'>@@ -434,6 +439,7 @@ static void __cpuinit cyrix_identify(struct cpuinfo_x86 *c)</div><div class='ctx'> static struct cpu_dev cyrix_cpu_dev __cpuinitdata = {</div><div class='ctx'> 	.c_vendor	= "Cyrix",</div><div class='ctx'> 	.c_ident	= { "CyrixInstead" },</div><div class='add'>+	.c_early_init	= early_init_cyrix,</div><div class='ctx'> 	.c_init		= init_cyrix,</div><div class='ctx'> 	.c_identify	= cyrix_identify,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/x86/kernel/cpu/feature_names.c b/arch/x86/kernel/cpu/feature_names.c<br/>index e43ad4ad4cba..c9017799497c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/feature_names.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpu/feature_names.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/feature_names.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/feature_names.c</a></div><div class='hunk'>@@ -39,7 +39,8 @@ const char * const x86_cap_flags[NCAPINTS*32] = {</div><div class='ctx'> 	NULL, NULL, NULL, NULL,</div><div class='ctx'> 	"constant_tsc", "up", NULL, "arch_perfmon",</div><div class='ctx'> 	"pebs", "bts", NULL, NULL,</div><div class='del'>-	"rep_good", NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='add'>+	"rep_good", NULL, NULL, NULL,</div><div class='add'>+	"nopl", NULL, NULL, NULL,</div><div class='ctx'> 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='ctx'> </div><div class='ctx'> 	/* Intel-defined (#2) */</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c<br/>index 65a339678ece..726a5fcdf341 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/mcheck/mce_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpu/mcheck/mce_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/mcheck/mce_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/mcheck/mce_64.c</a></div><div class='hunk'>@@ -759,6 +759,7 @@ static struct sysdev_class mce_sysclass = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(struct sys_device, device_mce);</div><div class='add'>+void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu) __cpuinitdata;</div><div class='ctx'> </div><div class='ctx'> /* Why are there no generic functions for this? */</div><div class='ctx'> #define ACCESSOR(name, var, start) \</div><div class='hunk'>@@ -883,9 +884,13 @@ static int __cpuinit mce_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 	case CPU_ONLINE:</div><div class='ctx'> 	case CPU_ONLINE_FROZEN:</div><div class='ctx'> 		mce_create_device(cpu);</div><div class='add'>+		if (threshold_cpu_callback)</div><div class='add'>+			threshold_cpu_callback(action, cpu);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPU_DEAD:</div><div class='ctx'> 	case CPU_DEAD_FROZEN:</div><div class='add'>+		if (threshold_cpu_callback)</div><div class='add'>+			threshold_cpu_callback(action, cpu);</div><div class='ctx'> 		mce_remove_device(cpu);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c<br/>index 88736cadbaa6..5eb390a4b2e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/mcheck/mce_amd_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpu/mcheck/mce_amd_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/mcheck/mce_amd_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/mcheck/mce_amd_64.c</a></div><div class='hunk'>@@ -628,6 +628,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank)</div><div class='ctx'> 	deallocate_threshold_block(cpu, bank);</div><div class='ctx'> </div><div class='ctx'> free_out:</div><div class='add'>+	kobject_del(b-&gt;kobj);</div><div class='ctx'> 	kobject_put(b-&gt;kobj);</div><div class='ctx'> 	kfree(b);</div><div class='ctx'> 	per_cpu(threshold_banks, cpu)[bank] = NULL;</div><div class='hunk'>@@ -645,14 +646,11 @@ static void threshold_remove_device(unsigned int cpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* get notified when a cpu comes on/off */</div><div class='del'>-static int __cpuinit threshold_cpu_callback(struct notifier_block *nfb,</div><div class='del'>-					    unsigned long action, void *hcpu)</div><div class='add'>+static void __cpuinit amd_64_threshold_cpu_callback(unsigned long action,</div><div class='add'>+						     unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	/* cpu was unsigned int to begin with */</div><div class='del'>-	unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-</div><div class='ctx'> 	if (cpu &gt;= NR_CPUS)</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case CPU_ONLINE:</div><div class='hunk'>@@ -666,14 +664,8 @@ static int __cpuinit threshold_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-      out:</div><div class='del'>-	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block threshold_cpu_notifier __cpuinitdata = {</div><div class='del'>-	.notifier_call = threshold_cpu_callback,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static __init int threshold_init_device(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned lcpu = 0;</div><div class='hunk'>@@ -684,7 +676,7 @@ static __init int threshold_init_device(void)</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='del'>-	register_hotcpu_notifier(&amp;threshold_cpu_notifier);</div><div class='add'>+	threshold_cpu_callback = amd_64_threshold_cpu_callback;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c<br/>index 509bd3d9eacd..cb7d3b6a80eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/mtrr/generic.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpu/mtrr/generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/mtrr/generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/mtrr/generic.c</a></div><div class='hunk'>@@ -379,6 +379,7 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,</div><div class='ctx'> 			     unsigned long *size, mtrr_type *type)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int mask_lo, mask_hi, base_lo, base_hi;</div><div class='add'>+	unsigned int tmp, hi;</div><div class='ctx'> </div><div class='ctx'> 	rdmsr(MTRRphysMask_MSR(reg), mask_lo, mask_hi);</div><div class='ctx'> 	if ((mask_lo &amp; 0x800) == 0) {</div><div class='hunk'>@@ -392,8 +393,23 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,</div><div class='ctx'> 	rdmsr(MTRRphysBase_MSR(reg), base_lo, base_hi);</div><div class='ctx'> </div><div class='ctx'> 	/* Work out the shifted address mask. */</div><div class='del'>-	mask_lo = size_or_mask | mask_hi &lt;&lt; (32 - PAGE_SHIFT)</div><div class='del'>-	    | mask_lo &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	tmp = mask_hi &lt;&lt; (32 - PAGE_SHIFT) | mask_lo &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	mask_lo = size_or_mask | tmp;</div><div class='add'>+	/* Expand tmp with high bits to all 1s*/</div><div class='add'>+	hi = fls(tmp);</div><div class='add'>+	if (hi &gt; 0) {</div><div class='add'>+		tmp |= ~((1&lt;&lt;(hi - 1)) - 1);</div><div class='add'>+</div><div class='add'>+		if (tmp != mask_lo) {</div><div class='add'>+			static int once = 1;</div><div class='add'>+</div><div class='add'>+			if (once) {</div><div class='add'>+				printk(KERN_INFO "mtrr: your BIOS has set up an incorrect mask, fixing it up.\n");</div><div class='add'>+				once = 0;</div><div class='add'>+			}</div><div class='add'>+			mask_lo = tmp;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* This works correctly if size is a power of two, i.e. a</div><div class='ctx'> 	   contiguous range. */</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c<br/>index 6f23969c8faf..b117d7f8a564 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/mtrr/main.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpu/mtrr/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/mtrr/main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/mtrr/main.c</a></div><div class='hunk'>@@ -1496,11 +1496,8 @@ int __init mtrr_trim_uncached_memory(unsigned long end_pfn)</div><div class='ctx'> </div><div class='ctx'> 	/* kvm/qemu doesn't have mtrr set right, don't trim them all */</div><div class='ctx'> 	if (!highest_pfn) {</div><div class='del'>-		if (!kvm_para_available()) {</div><div class='del'>-			printk(KERN_WARNING</div><div class='add'>+		WARN(!kvm_para_available(), KERN_WARNING</div><div class='ctx'> 				"WARNING: strange, CPU MTRRs all blank?\n");</div><div class='del'>-			WARN_ON(1);</div><div class='del'>-		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c<br/>index de7439f82b92..05cc22dbd4ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/perfctr-watchdog.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpu/perfctr-watchdog.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/perfctr-watchdog.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpu/perfctr-watchdog.c</a></div><div class='hunk'>@@ -478,7 +478,13 @@ static int setup_p4_watchdog(unsigned nmi_hz)</div><div class='ctx'> 		perfctr_msr = MSR_P4_IQ_PERFCTR1;</div><div class='ctx'> 		evntsel_msr = MSR_P4_CRU_ESCR0;</div><div class='ctx'> 		cccr_msr = MSR_P4_IQ_CCCR1;</div><div class='del'>-		cccr_val = P4_CCCR_OVF_PMI1 | P4_CCCR_ESCR_SELECT(4);</div><div class='add'>+</div><div class='add'>+		/* Pentium 4 D processors don't support P4_CCCR_OVF_PMI1 */</div><div class='add'>+		if (boot_cpu_data.x86_model == 4 &amp;&amp; boot_cpu_data.x86_mask == 4)</div><div class='add'>+			cccr_val = P4_CCCR_OVF_PMI0;</div><div class='add'>+		else</div><div class='add'>+			cccr_val = P4_CCCR_OVF_PMI1;</div><div class='add'>+		cccr_val |= P4_CCCR_ESCR_SELECT(4);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	evntsel = P4_ESCR_EVENT_SELECT(0x3F)</div><div class='head'>diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c<br/>index 14b11b3be31c..8e9cd6a8ec12 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpuid.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/cpuid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpuid.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/cpuid.c</a></div><div class='hunk'>@@ -89,6 +89,8 @@ static ssize_t cpuid_read(struct file *file, char __user *buf,</div><div class='ctx'> 	struct cpuid_regs cmd;</div><div class='ctx'> 	int cpu = iminor(file-&gt;f_path.dentry-&gt;d_inode);</div><div class='ctx'> 	u64 pos = *ppos;</div><div class='add'>+	ssize_t bytes = 0;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (count % 16)</div><div class='ctx'> 		return -EINVAL;	/* Invalid chunk size */</div><div class='hunk'>@@ -96,14 +98,19 @@ static ssize_t cpuid_read(struct file *file, char __user *buf,</div><div class='ctx'> 	for (; count; count -= 16) {</div><div class='ctx'> 		cmd.eax = pos;</div><div class='ctx'> 		cmd.ecx = pos &gt;&gt; 32;</div><div class='del'>-		smp_call_function_single(cpu, cpuid_smp_cpuid, &amp;cmd, 1);</div><div class='del'>-		if (copy_to_user(tmp, &amp;cmd, 16))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		err = smp_call_function_single(cpu, cpuid_smp_cpuid, &amp;cmd, 1);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+		if (copy_to_user(tmp, &amp;cmd, 16)) {</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		tmp += 16;</div><div class='add'>+		bytes += 16;</div><div class='ctx'> 		*ppos = ++pos;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return tmp - buf;</div><div class='add'>+	return bytes ? bytes : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cpuid_open(struct inode *inode, struct file *file)</div><div class='head'>diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c<br/>index 9af89078f7bb..66e48aa2dd1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/e820.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/e820.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/e820.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/e820.c</a></div><div class='hunk'>@@ -1203,7 +1203,7 @@ static int __init parse_memmap_opt(char *p)</div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!strcmp(p, "exactmap")) {</div><div class='add'>+	if (!strncmp(p, "exactmap", 8)) {</div><div class='ctx'> #ifdef CONFIG_CRASH_DUMP</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we are doing a crash dump, we still need to know</div><div class='head'>diff --git a/arch/x86/kernel/efi_32.c b/arch/x86/kernel/efi_32.c<br/>index 4b63c8e1f13b..5cab48ee61a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/efi_32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/efi_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/efi_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/efi_32.c</a></div><div class='hunk'>@@ -53,7 +53,7 @@ void efi_call_phys_prelog(void)</div><div class='ctx'> 	 * directory. If I have PAE, I just need to duplicate one entry in</div><div class='ctx'> 	 * page directory.</div><div class='ctx'> 	 */</div><div class='del'>-	cr4 = read_cr4();</div><div class='add'>+	cr4 = read_cr4_safe();</div><div class='ctx'> </div><div class='ctx'> 	if (cr4 &amp; X86_CR4_PAE) {</div><div class='ctx'> 		efi_bak_pg_dir_pointer[0].pgd =</div><div class='hunk'>@@ -91,7 +91,7 @@ void efi_call_phys_epilog(void)</div><div class='ctx'> 	gdt_descr.size = GDT_SIZE - 1;</div><div class='ctx'> 	load_gdt(&amp;gdt_descr);</div><div class='ctx'> </div><div class='del'>-	cr4 = read_cr4();</div><div class='add'>+	cr4 = read_cr4_safe();</div><div class='ctx'> </div><div class='ctx'> 	if (cr4 &amp; X86_CR4_PAE) {</div><div class='ctx'> 		swapper_pg_dir[pgd_index(0)].pgd =</div><div class='head'>diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c<br/>index 1fa8be5bd217..eaff0bbb1444 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/genapic_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/genapic_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/genapic_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/genapic_64.c</a></div><div class='hunk'>@@ -99,3 +99,4 @@ int is_uv_system(void)</div><div class='ctx'> {</div><div class='ctx'> 	return uv_system_type != UV_NONE;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(is_uv_system);</div><div class='head'>diff --git a/arch/x86/kernel/genx2apic_uv_x.c b/arch/x86/kernel/genx2apic_uv_x.c<br/>index 2cfcbded888a..bfa837cb16be 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/genx2apic_uv_x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/genx2apic_uv_x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/genx2apic_uv_x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/genx2apic_uv_x.c</a></div><div class='hunk'>@@ -222,7 +222,7 @@ static __init void map_low_mmrs(void)</div><div class='ctx'> </div><div class='ctx'> enum map_type {map_wb, map_uc};</div><div class='ctx'> </div><div class='del'>-static void map_high(char *id, unsigned long base, int shift, enum map_type map_type)</div><div class='add'>+static __init void map_high(char *id, unsigned long base, int shift, enum map_type map_type)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long bytes, paddr;</div><div class='ctx'> </div><div class='hunk'>@@ -293,7 +293,9 @@ static __init void uv_rtc_init(void)</div><div class='ctx'> 		sn_rtc_cycles_per_second = ticks_per_sec;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __init void uv_system_init(void)</div><div class='add'>+static bool uv_system_inited;</div><div class='add'>+</div><div class='add'>+void __init uv_system_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	union uvh_si_addr_map_config_u m_n_config;</div><div class='ctx'> 	union uvh_node_id_u node_id;</div><div class='hunk'>@@ -383,6 +385,7 @@ static __init void uv_system_init(void)</div><div class='ctx'> 	map_mmr_high(max_pnode);</div><div class='ctx'> 	map_config_high(max_pnode);</div><div class='ctx'> 	map_mmioh_high(max_pnode);</div><div class='add'>+	uv_system_inited = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -391,8 +394,7 @@ static __init void uv_system_init(void)</div><div class='ctx'>  */</div><div class='ctx'> void __cpuinit uv_cpu_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (!uv_node_to_blade)</div><div class='del'>-		uv_system_init();</div><div class='add'>+	BUG_ON(!uv_system_inited);</div><div class='ctx'> </div><div class='ctx'> 	uv_blade_info[uv_numa_blade_id()].nr_online_cpus++;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c<br/>index 1b318e903bf6..9bfc4d72fb2e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/head64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/head64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/head64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/head64.c</a></div><div class='hunk'>@@ -88,6 +88,7 @@ void __init x86_64_start_kernel(char * real_mode_data)</div><div class='ctx'> 	BUILD_BUG_ON(!(MODULES_VADDR &gt; __START_KERNEL));</div><div class='ctx'> 	BUILD_BUG_ON(!(((MODULES_END - 1) &amp; PGDIR_MASK) ==</div><div class='ctx'> 				(__START_KERNEL &amp; PGDIR_MASK)));</div><div class='add'>+	BUILD_BUG_ON(__fix_to_virt(__end_of_fixed_addresses) &lt;= MODULES_END);</div><div class='ctx'> </div><div class='ctx'> 	/* clear bss before set_intr_gate with early_idt_handler */</div><div class='ctx'> 	clear_bss();</div><div class='head'>diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c<br/>index ad2b15a1334d..73deaffadd03 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/hpet.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/hpet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/hpet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/hpet.c</a></div><div class='hunk'>@@ -210,8 +210,8 @@ static void hpet_legacy_clockevent_register(void)</div><div class='ctx'> 	/* Calculate the min / max delta */</div><div class='ctx'> 	hpet_clockevent.max_delta_ns = clockevent_delta2ns(0x7FFFFFFF,</div><div class='ctx'> 							   &amp;hpet_clockevent);</div><div class='del'>-	hpet_clockevent.min_delta_ns = clockevent_delta2ns(0x30,</div><div class='del'>-							   &amp;hpet_clockevent);</div><div class='add'>+	/* 5 usec minimum reprogramming delta. */</div><div class='add'>+	hpet_clockevent.min_delta_ns = 5000;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Start hpet with the boot cpu mask and make it</div><div class='hunk'>@@ -270,15 +270,22 @@ static void hpet_legacy_set_mode(enum clock_event_mode mode,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hpet_legacy_next_event(unsigned long delta,</div><div class='del'>-			   struct clock_event_device *evt)</div><div class='add'>+				  struct clock_event_device *evt)</div><div class='ctx'> {</div><div class='del'>-	unsigned long cnt;</div><div class='add'>+	u32 cnt;</div><div class='ctx'> </div><div class='ctx'> 	cnt = hpet_readl(HPET_COUNTER);</div><div class='del'>-	cnt += delta;</div><div class='add'>+	cnt += (u32) delta;</div><div class='ctx'> 	hpet_writel(cnt, HPET_T0_CMP);</div><div class='ctx'> </div><div class='del'>-	return ((long)(hpet_readl(HPET_COUNTER) - cnt ) &gt; 0) ? -ETIME : 0;</div><div class='add'>+	/*</div><div class='add'>+	 * We need to read back the CMP register to make sure that</div><div class='add'>+	 * what we wrote hit the chip before we compare it to the</div><div class='add'>+	 * counter.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON((u32)hpet_readl(HPET_T0_CMP) != cnt);</div><div class='add'>+</div><div class='add'>+	return (s32)((u32)hpet_readl(HPET_COUNTER) - cnt) &gt;= 0 ? -ETIME : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -359,6 +366,7 @@ static int hpet_clocksource_register(void)</div><div class='ctx'> int __init hpet_enable(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long id;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!is_hpet_capable())</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -369,6 +377,29 @@ int __init hpet_enable(void)</div><div class='ctx'> 	 * Read the period and check for a sane value:</div><div class='ctx'> 	 */</div><div class='ctx'> 	hpet_period = hpet_readl(HPET_PERIOD);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * AMD SB700 based systems with spread spectrum enabled use a</div><div class='add'>+	 * SMM based HPET emulation to provide proper frequency</div><div class='add'>+	 * setting. The SMM code is initialized with the first HPET</div><div class='add'>+	 * register access and takes some time to complete. During</div><div class='add'>+	 * this time the config register reads 0xffffffff. We check</div><div class='add'>+	 * for max. 1000 loops whether the config register reads a non</div><div class='add'>+	 * 0xffffffff value to make sure that HPET is up and running</div><div class='add'>+	 * before we go further. A counting loop is safe, as the HPET</div><div class='add'>+	 * access takes thousands of CPU cycles. On non SB700 based</div><div class='add'>+	 * machines this check is only done once and has no side</div><div class='add'>+	 * effects.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; hpet_readl(HPET_CFG) == 0xFFFFFFFF; i++) {</div><div class='add'>+		if (i == 1000) {</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+			       "HPET config register value = 0xFFFFFFFF. "</div><div class='add'>+			       "Disabling HPET\n");</div><div class='add'>+			goto out_nohpet;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (hpet_period &lt; HPET_MIN_PERIOD || hpet_period &gt; HPET_MAX_PERIOD)</div><div class='ctx'> 		goto out_nohpet;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c<br/>index de9aa0e3a9c5..09cddb57bec4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/io_apic_32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/io_apic_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/io_apic_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/io_apic_32.c</a></div><div class='hunk'>@@ -57,7 +57,7 @@ atomic_t irq_mis_count;</div><div class='ctx'> static struct { int pin, apic; } ioapic_i8259 = { -1, -1 };</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(ioapic_lock);</div><div class='del'>-static DEFINE_SPINLOCK(vector_lock);</div><div class='add'>+DEFINE_SPINLOCK(vector_lock);</div><div class='ctx'> </div><div class='ctx'> int timer_through_8259 __initdata;</div><div class='ctx'> </div><div class='hunk'>@@ -1209,10 +1209,6 @@ static int assign_irq_vector(int irq)</div><div class='ctx'> 	return vector;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void setup_vector_irq(int cpu)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct irq_chip ioapic_chip;</div><div class='ctx'> </div><div class='ctx'> #define IOAPIC_AUTO	-1</div><div class='head'>diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c<br/>index 8269434d1707..61a83b70c18f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/io_apic_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/io_apic_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/io_apic_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/io_apic_64.c</a></div><div class='hunk'>@@ -101,7 +101,7 @@ int timer_through_8259 __initdata;</div><div class='ctx'> static struct { int pin, apic; } ioapic_i8259 = { -1, -1 };</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(ioapic_lock);</div><div class='del'>-DEFINE_SPINLOCK(vector_lock);</div><div class='add'>+static DEFINE_SPINLOCK(vector_lock);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * # of IRQ routing registers</div><div class='hunk'>@@ -697,6 +697,19 @@ static int pin_2_irq(int idx, int apic, int pin)</div><div class='ctx'> 	return irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void lock_vector_lock(void)</div><div class='add'>+{</div><div class='add'>+	/* Used to the online set of cpus does not change</div><div class='add'>+	 * during assign_irq_vector.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(&amp;vector_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void unlock_vector_lock(void)</div><div class='add'>+{</div><div class='add'>+	spin_unlock(&amp;vector_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __assign_irq_vector(int irq, cpumask_t mask)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -802,7 +815,7 @@ static void __clear_irq_vector(int irq)</div><div class='ctx'> 	cpus_clear(cfg-&gt;domain);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __setup_vector_irq(int cpu)</div><div class='add'>+void __setup_vector_irq(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	/* Initialize vector_irq on a new cpu */</div><div class='ctx'> 	/* This function must be called with vector_lock held */</div><div class='hunk'>@@ -825,14 +838,6 @@ static void __setup_vector_irq(int cpu)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void setup_vector_irq(int cpu)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;vector_lock);</div><div class='del'>-	__setup_vector_irq(smp_processor_id());</div><div class='del'>-	spin_unlock(&amp;vector_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static struct irq_chip ioapic_chip;</div><div class='ctx'> </div><div class='ctx'> static void ioapic_register_intr(int irq, unsigned long trigger)</div><div class='head'>diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c<br/>index 1c3a66a67f83..720d2607aacb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/io_delay.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/io_delay.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/io_delay.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/io_delay.c</a></div><div class='hunk'>@@ -92,6 +92,14 @@ static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {</div><div class='ctx'> 			DMI_MATCH(DMI_BOARD_NAME, "30BF")</div><div class='ctx'> 		}</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.callback	= dmi_io_delay_0xed_port,</div><div class='add'>+		.ident		= "Presario F700",</div><div class='add'>+		.matches	= {</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"),</div><div class='add'>+			DMI_MATCH(DMI_BOARD_NAME, "30D3")</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/kdebugfs.c b/arch/x86/kernel/kdebugfs.c<br/>index f2d43bc75514..ff7d3b0124f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/kdebugfs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/kdebugfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/kdebugfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/kdebugfs.c</a></div><div class='hunk'>@@ -139,6 +139,7 @@ static int __init create_setup_data_nodes(struct dentry *parent)</div><div class='ctx'> 		if (PageHighMem(pg)) {</div><div class='ctx'> 			data = ioremap_cache(pa_data, sizeof(*data));</div><div class='ctx'> 			if (!data) {</div><div class='add'>+				kfree(node);</div><div class='ctx'> 				error = -ENXIO;</div><div class='ctx'> 				goto err_dir;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c<br/>index 9fe478d98406..0732adba05ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/machine_kexec_32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/machine_kexec_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/machine_kexec_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/machine_kexec_32.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/numa.h&gt;</div><div class='ctx'> #include &lt;linux/ftrace.h&gt;</div><div class='add'>+#include &lt;linux/suspend.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='hunk'>@@ -78,7 +79,7 @@ static void load_segments(void)</div><div class='ctx'> /*</div><div class='ctx'>  * A architecture hook called to validate the</div><div class='ctx'>  * proposed image and prepare the control pages</div><div class='del'>- * as needed.  The pages for KEXEC_CONTROL_CODE_SIZE</div><div class='add'>+ * as needed.  The pages for KEXEC_CONTROL_PAGE_SIZE</div><div class='ctx'>  * have been allocated, but the segments have yet</div><div class='ctx'>  * been copied into the kernel.</div><div class='ctx'>  *</div><div class='hunk'>@@ -113,6 +114,7 @@ void machine_kexec(struct kimage *image)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long page_list[PAGES_NR];</div><div class='ctx'> 	void *control_page;</div><div class='add'>+	int save_ftrace_enabled;</div><div class='ctx'> 	asmlinkage unsigned long</div><div class='ctx'> 		(*relocate_kernel_ptr)(unsigned long indirection_page,</div><div class='ctx'> 				       unsigned long control_page,</div><div class='hunk'>@@ -120,7 +122,12 @@ void machine_kexec(struct kimage *image)</div><div class='ctx'> 				       unsigned int has_pae,</div><div class='ctx'> 				       unsigned int preserve_context);</div><div class='ctx'> </div><div class='del'>-	tracer_disable();</div><div class='add'>+#ifdef CONFIG_KEXEC_JUMP</div><div class='add'>+	if (kexec_image-&gt;preserve_context)</div><div class='add'>+		save_processor_state();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	save_ftrace_enabled = __ftrace_enabled_save();</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupts aren't acceptable while we reboot */</div><div class='ctx'> 	local_irq_disable();</div><div class='hunk'>@@ -138,7 +145,7 @@ void machine_kexec(struct kimage *image)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	control_page = page_address(image-&gt;control_code_page);</div><div class='del'>-	memcpy(control_page, relocate_kernel, PAGE_SIZE/2);</div><div class='add'>+	memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	relocate_kernel_ptr = control_page;</div><div class='ctx'> 	page_list[PA_CONTROL_PAGE] = __pa(control_page);</div><div class='hunk'>@@ -178,6 +185,13 @@ void machine_kexec(struct kimage *image)</div><div class='ctx'> 					   (unsigned long)page_list,</div><div class='ctx'> 					   image-&gt;start, cpu_has_pae,</div><div class='ctx'> 					   image-&gt;preserve_context);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KEXEC_JUMP</div><div class='add'>+	if (kexec_image-&gt;preserve_context)</div><div class='add'>+		restore_processor_state();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	__ftrace_enabled_restore(save_ftrace_enabled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void arch_crash_save_vmcoreinfo(void)</div><div class='head'>diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c<br/>index 07c0f828f488..3b599518c322 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/mfgpt_32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/mfgpt_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/mfgpt_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/mfgpt_32.c</a></div><div class='hunk'>@@ -33,6 +33,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/geode.h&gt;</div><div class='ctx'> </div><div class='add'>+#define MFGPT_DEFAULT_IRQ	7</div><div class='add'>+</div><div class='ctx'> static struct mfgpt_timer_t {</div><div class='ctx'> 	unsigned int avail:1;</div><div class='ctx'> } mfgpt_timers[MFGPT_MAX_TIMERS];</div><div class='hunk'>@@ -157,29 +159,48 @@ int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(geode_mfgpt_toggle_event);</div><div class='ctx'> </div><div class='del'>-int geode_mfgpt_set_irq(int timer, int cmp, int irq, int enable)</div><div class='add'>+int geode_mfgpt_set_irq(int timer, int cmp, int *irq, int enable)</div><div class='ctx'> {</div><div class='del'>-	u32 val, dummy;</div><div class='del'>-	int offset;</div><div class='add'>+	u32 zsel, lpc, dummy;</div><div class='add'>+	int shift;</div><div class='ctx'> </div><div class='ctx'> 	if (timer &lt; 0 || timer &gt;= MFGPT_MAX_TIMERS)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (geode_mfgpt_toggle_event(timer, cmp, MFGPT_EVENT_IRQ, enable))</div><div class='add'>+	/*</div><div class='add'>+	 * Unfortunately, MFGPTs come in pairs sharing their IRQ lines. If VSA</div><div class='add'>+	 * is using the same CMP of the timer's Siamese twin, the IRQ is set to</div><div class='add'>+	 * 2, and we mustn't use nor change it.</div><div class='add'>+	 * XXX: Likewise, 2 Linux drivers might clash if the 2nd overwrites the</div><div class='add'>+	 * IRQ of the 1st. This can only happen if forcing an IRQ, calling this</div><div class='add'>+	 * with *irq==0 is safe. Currently there _are_ no 2 drivers.</div><div class='add'>+	 */</div><div class='add'>+	rdmsr(MSR_PIC_ZSEL_LOW, zsel, dummy);</div><div class='add'>+	shift = ((cmp == MFGPT_CMP1 ? 0 : 4) + timer % 4) * 4;</div><div class='add'>+	if (((zsel &gt;&gt; shift) &amp; 0xF) == 2)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	rdmsr(MSR_PIC_ZSEL_LOW, val, dummy);</div><div class='add'>+	/* Choose IRQ: if none supplied, keep IRQ already set or use default */</div><div class='add'>+	if (!*irq)</div><div class='add'>+		*irq = (zsel &gt;&gt; shift) &amp; 0xF;</div><div class='add'>+	if (!*irq)</div><div class='add'>+		*irq = MFGPT_DEFAULT_IRQ;</div><div class='ctx'> </div><div class='del'>-	offset = (timer % 4) * 4;</div><div class='del'>-</div><div class='del'>-	val &amp;= ~((0xF &lt;&lt; offset) | (0xF &lt;&lt; (offset + 16)));</div><div class='add'>+	/* Can't use IRQ if it's 0 (=disabled), 2, or routed to LPC */</div><div class='add'>+	if (*irq &lt; 1 || *irq == 2 || *irq &gt; 15)</div><div class='add'>+		return -EIO;</div><div class='add'>+	rdmsr(MSR_PIC_IRQM_LPC, lpc, dummy);</div><div class='add'>+	if (lpc &amp; (1 &lt;&lt; *irq))</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='add'>+	/* All chosen and checked - go for it */</div><div class='add'>+	if (geode_mfgpt_toggle_event(timer, cmp, MFGPT_EVENT_IRQ, enable))</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	if (enable) {</div><div class='del'>-		val |= (irq &amp; 0x0F) &lt;&lt; (offset);</div><div class='del'>-		val |= (irq &amp; 0x0F) &lt;&lt; (offset + 16);</div><div class='add'>+		zsel = (zsel &amp; ~(0xF &lt;&lt; shift)) | (*irq &lt;&lt; shift);</div><div class='add'>+		wrmsr(MSR_PIC_ZSEL_LOW, zsel, dummy);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wrmsr(MSR_PIC_ZSEL_LOW, val, dummy);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -242,7 +263,7 @@ EXPORT_SYMBOL_GPL(geode_mfgpt_alloc_timer);</div><div class='ctx'> static unsigned int mfgpt_tick_mode = CLOCK_EVT_MODE_SHUTDOWN;</div><div class='ctx'> static u16 mfgpt_event_clock;</div><div class='ctx'> </div><div class='del'>-static int irq = 7;</div><div class='add'>+static int irq;</div><div class='ctx'> static int __init mfgpt_setup(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	get_option(&amp;str, &amp;irq);</div><div class='hunk'>@@ -346,7 +367,7 @@ int __init mfgpt_timer_setup(void)</div><div class='ctx'> 	mfgpt_event_clock = timer;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up the IRQ on the MFGPT side */</div><div class='del'>-	if (geode_mfgpt_setup_irq(mfgpt_event_clock, MFGPT_CMP2, irq)) {</div><div class='add'>+	if (geode_mfgpt_setup_irq(mfgpt_event_clock, MFGPT_CMP2, &amp;irq)) {</div><div class='ctx'> 		printk(KERN_ERR "mfgpt-timer:  Could not set up IRQ %d\n", irq);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -374,13 +395,14 @@ int __init mfgpt_timer_setup(void)</div><div class='ctx'> 			&amp;mfgpt_clockevent);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO</div><div class='del'>-	       "mfgpt-timer:  registering the MFGPT timer as a clock event.\n");</div><div class='add'>+	       "mfgpt-timer:  Registering MFGPT timer %d as a clock event, using IRQ %d\n",</div><div class='add'>+	       timer, irq);</div><div class='ctx'> 	clockevents_register_device(&amp;mfgpt_clockevent);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	geode_mfgpt_release_irq(mfgpt_event_clock, MFGPT_CMP2, irq);</div><div class='add'>+	geode_mfgpt_release_irq(mfgpt_event_clock, MFGPT_CMP2, &amp;irq);</div><div class='ctx'> 	printk(KERN_ERR</div><div class='ctx'> 	       "mfgpt-timer:  Unable to set up the MFGPT clock source\n");</div><div class='ctx'> 	return -EIO;</div><div class='head'>diff --git a/arch/x86/kernel/mmconf-fam10h_64.c b/arch/x86/kernel/mmconf-fam10h_64.c<br/>index fdfdc550b366..efc2f361fe85 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/mmconf-fam10h_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/mmconf-fam10h_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/mmconf-fam10h_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/mmconf-fam10h_64.c</a></div><div class='hunk'>@@ -238,7 +238,7 @@ static struct dmi_system_id __devinitdata mmconf_dmi_table[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init check_enable_amd_mmconf_dmi(void)</div><div class='add'>+void __cpuinit check_enable_amd_mmconf_dmi(void)</div><div class='ctx'> {</div><div class='ctx'> 	dmi_check_system(mmconf_dmi_table);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c<br/>index 6ae005ccaed8..b3fb430725cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/mpparse.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/mpparse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/mpparse.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/mpparse.c</a></div><div class='hunk'>@@ -49,7 +49,7 @@ static int __init mpf_checksum(unsigned char *mp, int len)</div><div class='ctx'> 	return sum &amp; 0xFF;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __cpuinit MP_processor_info(struct mpc_config_processor *m)</div><div class='add'>+static void __init MP_processor_info(struct mpc_config_processor *m)</div><div class='ctx'> {</div><div class='ctx'> 	int apicid;</div><div class='ctx'> 	char *bootup_cpu = "";</div><div class='hunk'>@@ -83,7 +83,7 @@ static void __init MP_bus_info(struct mpc_config_bus *m)</div><div class='ctx'> 	if (x86_quirks-&gt;mpc_oem_bus_info)</div><div class='ctx'> 		x86_quirks-&gt;mpc_oem_bus_info(m, str);</div><div class='ctx'> 	else</div><div class='del'>-		printk(KERN_INFO "Bus #%d is %s\n", m-&gt;mpc_busid, str);</div><div class='add'>+		apic_printk(APIC_VERBOSE, "Bus #%d is %s\n", m-&gt;mpc_busid, str);</div><div class='ctx'> </div><div class='ctx'> #if MAX_MP_BUSSES &lt; 256</div><div class='ctx'> 	if (m-&gt;mpc_busid &gt;= MAX_MP_BUSSES) {</div><div class='hunk'>@@ -154,7 +154,7 @@ static void __init MP_ioapic_info(struct mpc_config_ioapic *m)</div><div class='ctx'> </div><div class='ctx'> static void print_MP_intsrc_info(struct mpc_config_intsrc *m)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_CONT "Int: type %d, pol %d, trig %d, bus %02x,"</div><div class='add'>+	apic_printk(APIC_VERBOSE, "Int: type %d, pol %d, trig %d, bus %02x,"</div><div class='ctx'> 		" IRQ %02x, APIC ID %x, APIC INT %02x\n",</div><div class='ctx'> 		m-&gt;mpc_irqtype, m-&gt;mpc_irqflag &amp; 3,</div><div class='ctx'> 		(m-&gt;mpc_irqflag &gt;&gt; 2) &amp; 3, m-&gt;mpc_srcbus,</div><div class='hunk'>@@ -163,7 +163,7 @@ static void print_MP_intsrc_info(struct mpc_config_intsrc *m)</div><div class='ctx'> </div><div class='ctx'> static void __init print_mp_irq_info(struct mp_config_intsrc *mp_irq)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_CONT "Int: type %d, pol %d, trig %d, bus %02x,"</div><div class='add'>+	apic_printk(APIC_VERBOSE, "Int: type %d, pol %d, trig %d, bus %02x,"</div><div class='ctx'> 		" IRQ %02x, APIC ID %x, APIC INT %02x\n",</div><div class='ctx'> 		mp_irq-&gt;mp_irqtype, mp_irq-&gt;mp_irqflag &amp; 3,</div><div class='ctx'> 		(mp_irq-&gt;mp_irqflag &gt;&gt; 2) &amp; 3, mp_irq-&gt;mp_srcbus,</div><div class='hunk'>@@ -235,7 +235,7 @@ static void __init MP_intsrc_info(struct mpc_config_intsrc *m)</div><div class='ctx'> </div><div class='ctx'> static void __init MP_lintsrc_info(struct mpc_config_lintsrc *m)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_INFO "Lint: type %d, pol %d, trig %d, bus %02x,"</div><div class='add'>+	apic_printk(APIC_VERBOSE, "Lint: type %d, pol %d, trig %d, bus %02x,"</div><div class='ctx'> 		" IRQ %02x, APIC ID %x, APIC LINT %02x\n",</div><div class='ctx'> 		m-&gt;mpc_irqtype, m-&gt;mpc_irqflag &amp; 3,</div><div class='ctx'> 		(m-&gt;mpc_irqflag &gt;&gt; 2) &amp; 3, m-&gt;mpc_srcbusid,</div><div class='hunk'>@@ -484,7 +484,7 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void construct_ioapic_table(int mpc_default_type)</div><div class='add'>+static void __init construct_ioapic_table(int mpc_default_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpc_config_ioapic ioapic;</div><div class='ctx'> 	struct mpc_config_bus bus;</div><div class='hunk'>@@ -529,7 +529,7 @@ static void construct_ioapic_table(int mpc_default_type)</div><div class='ctx'> 	construct_default_ioirq_mptable(mpc_default_type);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static inline void construct_ioapic_table(int mpc_default_type) { }</div><div class='add'>+static inline void __init construct_ioapic_table(int mpc_default_type) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static inline void __init construct_default_ISA_mptable(int mpc_default_type)</div><div class='hunk'>@@ -695,7 +695,8 @@ static int __init smp_scan_config(unsigned long base, unsigned long length,</div><div class='ctx'> 	unsigned int *bp = phys_to_virt(base);</div><div class='ctx'> 	struct intel_mp_floating *mpf;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEBUG "Scan SMP from %p for %ld bytes.\n", bp, length);</div><div class='add'>+	apic_printk(APIC_VERBOSE, "Scan SMP from %p for %ld bytes.\n",</div><div class='add'>+			bp, length);</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(*mpf) != 16);</div><div class='ctx'> </div><div class='ctx'> 	while (length &gt; 0) {</div><div class='head'>diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c<br/>index 9fd809552447..2e2af5d18191 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/msr.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/msr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/msr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/msr.c</a></div><div class='hunk'>@@ -72,21 +72,28 @@ static ssize_t msr_read(struct file *file, char __user *buf,</div><div class='ctx'> 	u32 data[2];</div><div class='ctx'> 	u32 reg = *ppos;</div><div class='ctx'> 	int cpu = iminor(file-&gt;f_path.dentry-&gt;d_inode);</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='add'>+	ssize_t bytes = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (count % 8)</div><div class='ctx'> 		return -EINVAL;	/* Invalid chunk size */</div><div class='ctx'> </div><div class='ctx'> 	for (; count; count -= 8) {</div><div class='ctx'> 		err = rdmsr_safe_on_cpu(cpu, reg, &amp;data[0], &amp;data[1]);</div><div class='del'>-		if (err)</div><div class='del'>-			return -EIO;</div><div class='del'>-		if (copy_to_user(tmp, &amp;data, 8))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		if (err) {</div><div class='add'>+			if (err == -EFAULT) /* Fix idiotic error code */</div><div class='add'>+				err = -EIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (copy_to_user(tmp, &amp;data, 8)) {</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		tmp += 2;</div><div class='add'>+		bytes += 8;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ((char __user *)tmp) - buf;</div><div class='add'>+	return bytes ? bytes : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t msr_write(struct file *file, const char __user *buf,</div><div class='hunk'>@@ -96,21 +103,28 @@ static ssize_t msr_write(struct file *file, const char __user *buf,</div><div class='ctx'> 	u32 data[2];</div><div class='ctx'> 	u32 reg = *ppos;</div><div class='ctx'> 	int cpu = iminor(file-&gt;f_path.dentry-&gt;d_inode);</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='add'>+	ssize_t bytes = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (count % 8)</div><div class='ctx'> 		return -EINVAL;	/* Invalid chunk size */</div><div class='ctx'> </div><div class='ctx'> 	for (; count; count -= 8) {</div><div class='del'>-		if (copy_from_user(&amp;data, tmp, 8))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		if (copy_from_user(&amp;data, tmp, 8)) {</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		err = wrmsr_safe_on_cpu(cpu, reg, data[0], data[1]);</div><div class='del'>-		if (err)</div><div class='del'>-			return -EIO;</div><div class='add'>+		if (err) {</div><div class='add'>+			if (err == -EFAULT) /* Fix idiotic error code */</div><div class='add'>+				err = -EIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		tmp += 2;</div><div class='add'>+		bytes += 8;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ((char __user *)tmp) - buf;</div><div class='add'>+	return bytes ? bytes : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int msr_open(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -131,7 +145,7 @@ static int msr_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		ret = -EIO;	/* MSR not supported */</div><div class='ctx'> out:</div><div class='ctx'> 	unlock_kernel();</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c<br/>index ac6d51222e7d..abb78a2cc4ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/nmi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/nmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/nmi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/nmi.c</a></div><div class='hunk'>@@ -114,6 +114,23 @@ static __init void nmi_cpu_busy(void *data)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void report_broken_nmi(int cpu, int *prev_nmi_count)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_CONT "\n");</div><div class='add'>+</div><div class='add'>+	printk(KERN_WARNING</div><div class='add'>+		"WARNING: CPU#%d: NMI appears to be stuck (%d-&gt;%d)!\n",</div><div class='add'>+			cpu, prev_nmi_count[cpu], get_nmi_count(cpu));</div><div class='add'>+</div><div class='add'>+	printk(KERN_WARNING</div><div class='add'>+		"Please report this to bugzilla.kernel.org,\n");</div><div class='add'>+	printk(KERN_WARNING</div><div class='add'>+		"and attach the output of the 'dmesg' command.\n");</div><div class='add'>+</div><div class='add'>+	per_cpu(wd_enabled, cpu) = 0;</div><div class='add'>+	atomic_dec(&amp;nmi_active);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int __init check_nmi_watchdog(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int *prev_nmi_count;</div><div class='hunk'>@@ -141,15 +158,8 @@ int __init check_nmi_watchdog(void)</div><div class='ctx'> 	for_each_online_cpu(cpu) {</div><div class='ctx'> 		if (!per_cpu(wd_enabled, cpu))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (get_nmi_count(cpu) - prev_nmi_count[cpu] &lt;= 5) {</div><div class='del'>-			printk(KERN_WARNING "WARNING: CPU#%d: NMI "</div><div class='del'>-				"appears to be stuck (%d-&gt;%d)!\n",</div><div class='del'>-				cpu,</div><div class='del'>-				prev_nmi_count[cpu],</div><div class='del'>-				get_nmi_count(cpu));</div><div class='del'>-			per_cpu(wd_enabled, cpu) = 0;</div><div class='del'>-			atomic_dec(&amp;nmi_active);</div><div class='del'>-		}</div><div class='add'>+		if (get_nmi_count(cpu) - prev_nmi_count[cpu] &lt;= 5)</div><div class='add'>+			report_broken_nmi(cpu, prev_nmi_count);</div><div class='ctx'> 	}</div><div class='ctx'> 	endflag = 1;</div><div class='ctx'> 	if (!atomic_read(&amp;nmi_active)) {</div><div class='head'>diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c<br/>index b8c45610b20a..eecc8c18f010 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/numaq_32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/numaq_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/numaq_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/numaq_32.c</a></div><div class='hunk'>@@ -73,7 +73,7 @@ static void __init smp_dump_qct(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-void __init numaq_tsc_disable(void)</div><div class='add'>+void __cpuinit numaq_tsc_disable(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!found_numaq)</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c<br/>index 94da4d52d798..300da17e61cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/paravirt.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/paravirt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/paravirt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/paravirt.c</a></div><div class='hunk'>@@ -471,7 +471,7 @@ struct pv_lock_ops pv_lock_ops = {</div><div class='ctx'> 	.spin_unlock = __ticket_spin_unlock,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='del'>-EXPORT_SYMBOL_GPL(pv_lock_ops);</div><div class='add'>+EXPORT_SYMBOL(pv_lock_ops);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(pv_time_ops);</div><div class='ctx'> EXPORT_SYMBOL    (pv_cpu_ops);</div><div class='head'>diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c<br/>index b67a4b1d4eae..dcdac6c826e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/pci-calgary_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/pci-calgary_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/pci-calgary_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/pci-calgary_64.c</a></div><div class='hunk'>@@ -343,9 +343,8 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr,</div><div class='ctx'> 	/* were we called with bad_dma_address? */</div><div class='ctx'> 	badend = bad_dma_address + (EMERGENCY_PAGES * PAGE_SIZE);</div><div class='ctx'> 	if (unlikely((dma_addr &gt;= bad_dma_address) &amp;&amp; (dma_addr &lt; badend))) {</div><div class='del'>-		printk(KERN_ERR "Calgary: driver tried unmapping bad DMA "</div><div class='add'>+		WARN(1, KERN_ERR "Calgary: driver tried unmapping bad DMA "</div><div class='ctx'> 		       "address 0x%Lx\n", dma_addr);</div><div class='del'>-		WARN_ON(1);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1269,13 +1268,15 @@ static inline int __init determine_tce_table_size(u64 ram)</div><div class='ctx'> static int __init build_detail_arrays(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ptr;</div><div class='del'>-	int i, scal_detail_size, rio_detail_size;</div><div class='add'>+	unsigned numnodes, i;</div><div class='add'>+	int scal_detail_size, rio_detail_size;</div><div class='ctx'> </div><div class='del'>-	if (rio_table_hdr-&gt;num_scal_dev &gt; MAX_NUMNODES){</div><div class='add'>+	numnodes = rio_table_hdr-&gt;num_scal_dev;</div><div class='add'>+	if (numnodes &gt; MAX_NUMNODES){</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 			"Calgary: MAX_NUMNODES too low! Defined as %d, "</div><div class='ctx'> 			"but system has %d nodes.\n",</div><div class='del'>-			MAX_NUMNODES, rio_table_hdr-&gt;num_scal_dev);</div><div class='add'>+			MAX_NUMNODES, numnodes);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1296,8 +1297,7 @@ static int __init build_detail_arrays(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ptr = ((unsigned long)rio_table_hdr) + 3;</div><div class='del'>-	for (i = 0; i &lt; rio_table_hdr-&gt;num_scal_dev;</div><div class='del'>-		    i++, ptr += scal_detail_size)</div><div class='add'>+	for (i = 0; i &lt; numnodes; i++, ptr += scal_detail_size)</div><div class='ctx'> 		scal_devs[i] = (struct scal_detail *)ptr;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; rio_table_hdr-&gt;num_rio_dev;</div><div class='hunk'>@@ -1350,7 +1350,7 @@ static void calgary_init_bitmap_from_tce_table(struct iommu_table *tbl)</div><div class='ctx'>  * Function for kdump case. Get the tce tables from first kernel</div><div class='ctx'>  * by reading the contents of the base adress register of calgary iommu</div><div class='ctx'>  */</div><div class='del'>-static void get_tce_space_from_tar()</div><div class='add'>+static void __init get_tce_space_from_tar(void)</div><div class='ctx'> {</div><div class='ctx'> 	int bus;</div><div class='ctx'> 	void __iomem *target;</div><div class='head'>diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c<br/>index 8dbffb846de9..87d4d6964ec2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/pci-dma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/pci-dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/pci-dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/pci-dma.c</a></div><div class='hunk'>@@ -123,6 +123,14 @@ void __init pci_iommu_alloc(void)</div><div class='ctx'> </div><div class='ctx'> 	pci_swiotlb_init();</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+unsigned long iommu_num_pages(unsigned long addr, unsigned long len)</div><div class='add'>+{</div><div class='add'>+	unsigned long size = roundup((addr &amp; ~PAGE_MASK) + len, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	return size &gt;&gt; PAGE_SHIFT;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(iommu_num_pages);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c<br/>index 53bc653ed5ca..3b7a1ddcc0bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/process_32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/process_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/process_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/process_32.c</a></div><div class='hunk'>@@ -95,7 +95,6 @@ static inline void play_dead(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* This must be done before dead CPU ack */</div><div class='ctx'> 	cpu_exit_clear();</div><div class='del'>-	wbinvd();</div><div class='ctx'> 	mb();</div><div class='ctx'> 	/* Ack it */</div><div class='ctx'> 	__get_cpu_var(cpu_state) = CPU_DEAD;</div><div class='hunk'>@@ -104,8 +103,8 @@ static inline void play_dead(void)</div><div class='ctx'> 	 * With physical CPU hotplug, we should halt the cpu</div><div class='ctx'> 	 */</div><div class='ctx'> 	local_irq_disable();</div><div class='del'>-	while (1)</div><div class='del'>-		halt();</div><div class='add'>+	/* mask all interrupts, flush any and all caches, and halt */</div><div class='add'>+	wbinvd_halt();</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline void play_dead(void)</div><div class='head'>diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c<br/>index 3fb62a7d9a16..71553b664e2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/process_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/process_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/process_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/process_64.c</a></div><div class='hunk'>@@ -93,14 +93,13 @@ DECLARE_PER_CPU(int, cpu_state);</div><div class='ctx'> static inline void play_dead(void)</div><div class='ctx'> {</div><div class='ctx'> 	idle_task_exit();</div><div class='del'>-	wbinvd();</div><div class='ctx'> 	mb();</div><div class='ctx'> 	/* Ack it */</div><div class='ctx'> 	__get_cpu_var(cpu_state) = CPU_DEAD;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_disable();</div><div class='del'>-	while (1)</div><div class='del'>-		halt();</div><div class='add'>+	/* mask all interrupts, flush any and all caches, and halt */</div><div class='add'>+	wbinvd_halt();</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline void play_dead(void)</div><div class='head'>diff --git a/arch/x86/kernel/relocate_kernel_32.S b/arch/x86/kernel/relocate_kernel_32.S<br/>index 703310a99023..6f50664b2ba5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/relocate_kernel_32.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/relocate_kernel_32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/relocate_kernel_32.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/relocate_kernel_32.S</a></div><div class='hunk'>@@ -20,10 +20,11 @@</div><div class='ctx'> #define PAGE_ATTR (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)</div><div class='ctx'> #define PAE_PGD_ATTR (_PAGE_PRESENT)</div><div class='ctx'> </div><div class='del'>-/* control_page + PAGE_SIZE/2 ~ control_page + PAGE_SIZE * 3/4 are</div><div class='del'>- * used to save some data for jumping back</div><div class='add'>+/* control_page + KEXEC_CONTROL_CODE_MAX_SIZE</div><div class='add'>+ * ~ control_page + PAGE_SIZE are used as data storage and stack for</div><div class='add'>+ * jumping back</div><div class='ctx'>  */</div><div class='del'>-#define DATA(offset)		(PAGE_SIZE/2+(offset))</div><div class='add'>+#define DATA(offset)		(KEXEC_CONTROL_CODE_MAX_SIZE+(offset))</div><div class='ctx'> </div><div class='ctx'> /* Minimal CPU state */</div><div class='ctx'> #define ESP			DATA(0x0)</div><div class='hunk'>@@ -376,3 +377,6 @@ swap_pages:</div><div class='ctx'> 	popl	%ebx</div><div class='ctx'> 	popl	%ebp</div><div class='ctx'> 	ret</div><div class='add'>+</div><div class='add'>+	.globl kexec_control_code_size</div><div class='add'>+.set kexec_control_code_size, . - relocate_kernel</div><div class='head'>diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c<br/>index b520dae02bf4..9838f2539dfc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/setup.c</a></div><div class='hunk'>@@ -445,7 +445,7 @@ static void __init reserve_early_setup_data(void)</div><div class='ctx'>  * @size: Size of the crashkernel memory to reserve.</div><div class='ctx'>  * Returns the base address on success, and -1ULL on failure.</div><div class='ctx'>  */</div><div class='del'>-unsigned long long find_and_reserve_crashkernel(unsigned long long size)</div><div class='add'>+unsigned long long __init find_and_reserve_crashkernel(unsigned long long size)</div><div class='ctx'> {</div><div class='ctx'> 	const unsigned long long alignment = 16&lt;&lt;20; 	/* 16M */</div><div class='ctx'> 	unsigned long long start = 0LL;</div><div class='hunk'>@@ -670,6 +670,18 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> </div><div class='ctx'> 	parse_early_param();</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	check_efer();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_VMI) &amp;&amp; defined(CONFIG_X86_32)</div><div class='add'>+	/*</div><div class='add'>+	 * Must be before kernel pagetables are setup</div><div class='add'>+	 * or fixmap area is touched.</div><div class='add'>+	 */</div><div class='add'>+	vmi_init();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/* after early param, so could get panic from serial */</div><div class='ctx'> 	reserve_early_setup_data();</div><div class='ctx'> </div><div class='hunk'>@@ -730,7 +742,6 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> #else</div><div class='ctx'> 	num_physpages = max_pfn;</div><div class='ctx'> </div><div class='del'>-	check_efer();</div><div class='ctx'> </div><div class='ctx'> 	/* How many end-of-memory variables you have, grandma! */</div><div class='ctx'> 	/* need this before calling reserve_initrd */</div><div class='hunk'>@@ -788,10 +799,6 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> </div><div class='ctx'> 	initmem_init(0, max_pfn);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-	dma32_reserve_bootmem();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_ACPI_SLEEP</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Reserve low memory region for sleep support.</div><div class='hunk'>@@ -806,20 +813,21 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> #endif</div><div class='ctx'> 	reserve_crashkernel();</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	/*</div><div class='add'>+	 * dma32_reserve_bootmem() allocates bootmem which may conflict</div><div class='add'>+	 * with the crashkernel command line, so do that after</div><div class='add'>+	 * reserve_crashkernel()</div><div class='add'>+	 */</div><div class='add'>+	dma32_reserve_bootmem();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	reserve_ibft_region();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KVM_CLOCK</div><div class='ctx'> 	kvmclock_init();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_VMI) &amp;&amp; defined(CONFIG_X86_32)</div><div class='del'>-	/*</div><div class='del'>-	 * Must be after max_low_pfn is determined, and before kernel</div><div class='del'>-	 * pagetables are setup.</div><div class='del'>-	 */</div><div class='del'>-	vmi_init();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	paravirt_pagetable_setup_start(swapper_pg_dir);</div><div class='ctx'> 	paging_init();</div><div class='ctx'> 	paravirt_pagetable_setup_done(swapper_pg_dir);</div><div class='hunk'>@@ -856,12 +864,6 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	init_apic_mappings();</div><div class='ctx'> 	ioapic_init_mappings();</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SMP) &amp;&amp; defined(CONFIG_X86_PC) &amp;&amp; defined(CONFIG_X86_32)</div><div class='del'>-	if (def_to_bigsmp)</div><div class='del'>-		printk(KERN_WARNING "More than 8 CPUs detected and "</div><div class='del'>-			"CONFIG_X86_PC cannot handle it.\nUse "</div><div class='del'>-			"CONFIG_X86_GENERICARCH or CONFIG_X86_BIGSMP.\n");</div><div class='del'>-#endif</div><div class='ctx'> 	kvm_guest_init();</div><div class='ctx'> </div><div class='ctx'> 	e820_reserve_resources();</div><div class='head'>diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c<br/>index b45ef8ddd651..ca316b5b742c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/signal_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/signal_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/signal_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/signal_64.c</a></div><div class='hunk'>@@ -104,7 +104,16 @@ static inline int restore_i387(struct _fpstate __user *buf)</div><div class='ctx'> 		clts();</div><div class='ctx'> 		task_thread_info(current)-&gt;status |= TS_USEDFPU;</div><div class='ctx'> 	}</div><div class='del'>-	return restore_fpu_checking((__force struct i387_fxsave_struct *)buf);</div><div class='add'>+	err = restore_fpu_checking((__force struct i387_fxsave_struct *)buf);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Encountered an error while doing the restore from the</div><div class='add'>+		 * user buffer, clear the fpu state.</div><div class='add'>+		 */</div><div class='add'>+		clear_fpu(tsk);</div><div class='add'>+		clear_used_math();</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c<br/>index 332512767f4f..7985c5b3f916 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/smpboot.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/smpboot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/smpboot.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/smpboot.c</a></div><div class='hunk'>@@ -326,12 +326,16 @@ static void __cpuinit start_secondary(void *unused)</div><div class='ctx'> 	 * for which cpus receive the IPI. Holding this</div><div class='ctx'> 	 * lock helps us to not include this cpu in a currently in progress</div><div class='ctx'> 	 * smp_call_function().</div><div class='add'>+	 *</div><div class='add'>+	 * We need to hold vector_lock so there the set of online cpus</div><div class='add'>+	 * does not change while we are assigning vectors to cpus.  Holding</div><div class='add'>+	 * this lock ensures we don't half assign or remove an irq from a cpu.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ipi_call_lock_irq();</div><div class='del'>-#ifdef CONFIG_X86_IO_APIC</div><div class='del'>-	setup_vector_irq(smp_processor_id());</div><div class='del'>-#endif</div><div class='add'>+	lock_vector_lock();</div><div class='add'>+	__setup_vector_irq(smp_processor_id());</div><div class='ctx'> 	cpu_set(smp_processor_id(), cpu_online_map);</div><div class='add'>+	unlock_vector_lock();</div><div class='ctx'> 	ipi_call_unlock_irq();</div><div class='ctx'> 	per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;</div><div class='ctx'> </div><div class='hunk'>@@ -752,6 +756,14 @@ static void __cpuinit do_fork_idle(struct work_struct *work)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='add'>+</div><div class='add'>+/* __ref because it's safe to call free_bootmem when after_bootmem == 0. */</div><div class='add'>+static void __ref free_bootmem_pda(struct x8664_pda *oldpda)</div><div class='add'>+{</div><div class='add'>+	if (!after_bootmem)</div><div class='add'>+		free_bootmem((unsigned long)oldpda, sizeof(*oldpda));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate node local memory for the AP pda.</div><div class='ctx'>  *</div><div class='hunk'>@@ -780,8 +792,7 @@ int __cpuinit get_local_pda(int cpu)</div><div class='ctx'> </div><div class='ctx'> 	if (oldpda) {</div><div class='ctx'> 		memcpy(newpda, oldpda, size);</div><div class='del'>-		if (!after_bootmem)</div><div class='del'>-			free_bootmem((unsigned long)oldpda, size);</div><div class='add'>+		free_bootmem_pda(oldpda);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	newpda-&gt;in_bootmem = 0;</div><div class='hunk'>@@ -1044,6 +1055,34 @@ static __init void disable_smp(void)</div><div class='ctx'> static int __init smp_sanity_check(unsigned max_cpus)</div><div class='ctx'> {</div><div class='ctx'> 	preempt_disable();</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_X86_PC) &amp;&amp; defined(CONFIG_X86_32)</div><div class='add'>+	if (def_to_bigsmp &amp;&amp; nr_cpu_ids &gt; 8) {</div><div class='add'>+		unsigned int cpu;</div><div class='add'>+		unsigned nr;</div><div class='add'>+</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "More than 8 CPUs detected - skipping them.\n"</div><div class='add'>+		       "Use CONFIG_X86_GENERICARCH and CONFIG_X86_BIGSMP.\n");</div><div class='add'>+</div><div class='add'>+		nr = 0;</div><div class='add'>+		for_each_present_cpu(cpu) {</div><div class='add'>+			if (nr &gt;= 8)</div><div class='add'>+				cpu_clear(cpu, cpu_present_map);</div><div class='add'>+			nr++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nr = 0;</div><div class='add'>+		for_each_possible_cpu(cpu) {</div><div class='add'>+			if (nr &gt;= 8)</div><div class='add'>+				cpu_clear(cpu, cpu_possible_map);</div><div class='add'>+			nr++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nr_cpu_ids = 8;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (!physid_isset(hard_smp_processor_id(), phys_cpu_present_map)) {</div><div class='ctx'> 		printk(KERN_WARNING "weird, boot CPU (#%d) not listed"</div><div class='ctx'> 				    "by the BIOS.\n", hard_smp_processor_id());</div><div class='hunk'>@@ -1182,6 +1221,9 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	printk(KERN_INFO "CPU%d: ", 0);</div><div class='ctx'> 	print_cpu_info(&amp;cpu_data(0));</div><div class='ctx'> 	setup_boot_clock();</div><div class='add'>+</div><div class='add'>+	if (is_uv_system())</div><div class='add'>+		uv_system_init();</div><div class='ctx'> out:</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> }</div><div class='hunk'>@@ -1336,7 +1378,9 @@ int __cpu_disable(void)</div><div class='ctx'> 	remove_siblinginfo(cpu);</div><div class='ctx'> </div><div class='ctx'> 	/* It's now safe to remove this processor from the online map */</div><div class='add'>+	lock_vector_lock();</div><div class='ctx'> 	remove_cpu_from_maps(cpu);</div><div class='add'>+	unlock_vector_lock();</div><div class='ctx'> 	fixup_irqs(cpu_online_map);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1370,17 +1414,3 @@ void __cpu_die(unsigned int cpu)</div><div class='ctx'> 	BUG();</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If the BIOS enumerates physical processors before logical,</div><div class='del'>- * maxcpus=N at enumeration-time can be used to disable HT.</div><div class='del'>- */</div><div class='del'>-static int __init parse_maxcpus(char *arg)</div><div class='del'>-{</div><div class='del'>-	extern unsigned int maxcpus;</div><div class='del'>-</div><div class='del'>-	if (arg)</div><div class='del'>-		maxcpus = simple_strtoul(arg, NULL, 0);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-early_param("maxcpus", parse_maxcpus);</div><div class='head'>diff --git a/arch/x86/kernel/smpcommon.c b/arch/x86/kernel/smpcommon.c<br/>index 99941b37eca0..397e309839dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/smpcommon.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/smpcommon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/smpcommon.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/smpcommon.c</a></div><div class='hunk'>@@ -8,18 +8,21 @@</div><div class='ctx'> DEFINE_PER_CPU(unsigned long, this_cpu_off);</div><div class='ctx'> EXPORT_PER_CPU_SYMBOL(this_cpu_off);</div><div class='ctx'> </div><div class='del'>-/* Initialize the CPU's GDT.  This is either the boot CPU doing itself</div><div class='del'>-   (still using the master per-cpu area), or a CPU doing it for a</div><div class='del'>-   secondary which will soon come up. */</div><div class='add'>+/*</div><div class='add'>+ * Initialize the CPU's GDT.  This is either the boot CPU doing itself</div><div class='add'>+ * (still using the master per-cpu area), or a CPU doing it for a</div><div class='add'>+ * secondary which will soon come up.</div><div class='add'>+ */</div><div class='ctx'> __cpuinit void init_gdt(int cpu)</div><div class='ctx'> {</div><div class='del'>-	struct desc_struct *gdt = get_cpu_gdt_table(cpu);</div><div class='add'>+	struct desc_struct gdt;</div><div class='ctx'> </div><div class='del'>-	pack_descriptor(&amp;gdt[GDT_ENTRY_PERCPU],</div><div class='del'>-			__per_cpu_offset[cpu], 0xFFFFF,</div><div class='add'>+	pack_descriptor(&amp;gdt, __per_cpu_offset[cpu], 0xFFFFF,</div><div class='ctx'> 			0x2 | DESCTYPE_S, 0x8);</div><div class='add'>+	gdt.s = 1;</div><div class='ctx'> </div><div class='del'>-	gdt[GDT_ENTRY_PERCPU].s = 1;</div><div class='add'>+	write_gdt_entry(get_cpu_gdt_table(cpu),</div><div class='add'>+			GDT_ENTRY_PERCPU, &amp;gdt, DESCTYPE_S);</div><div class='ctx'> </div><div class='ctx'> 	per_cpu(this_cpu_off, cpu) = __per_cpu_offset[cpu];</div><div class='ctx'> 	per_cpu(cpu_number, cpu) = cpu;</div><div class='head'>diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/kernel/tlb_uv.c<br/>index d0fbb7712ab0..8b8c0d6640fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/tlb_uv.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/tlb_uv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/tlb_uv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/tlb_uv.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;asm/genapic.h&gt;</div><div class='ctx'> #include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/tsc.h&gt;</div><div class='add'>+#include &lt;asm/irq_vectors.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach_apic.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -783,7 +784,7 @@ static int __init uv_bau_init(void)</div><div class='ctx'> 		uv_init_blade(blade, node, cur_cpu);</div><div class='ctx'> 		cur_cpu += uv_blade_nr_possible_cpus(blade);</div><div class='ctx'> 	}</div><div class='del'>-	set_intr_gate(UV_BAU_MESSAGE, uv_bau_message_intr1);</div><div class='add'>+	alloc_intr_gate(UV_BAU_MESSAGE, uv_bau_message_intr1);</div><div class='ctx'> 	uv_enable_timeouts();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c<br/>index 3f18d73f420c..513caaca7115 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/traps_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/traps_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/traps_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/traps_64.c</a></div><div class='hunk'>@@ -1131,7 +1131,14 @@ asmlinkage void math_state_restore(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	clts();				/* Allow maths ops (or we recurse) */</div><div class='del'>-	restore_fpu_checking(&amp;me-&gt;thread.xstate-&gt;fxsave);</div><div class='add'>+	/*</div><div class='add'>+	 * Paranoid restore. send a SIGSEGV if we fail to restore the state.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(restore_fpu_checking(&amp;me-&gt;thread.xstate-&gt;fxsave))) {</div><div class='add'>+		stts();</div><div class='add'>+		force_sig(SIGSEGV, me);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	task_thread_info(me)-&gt;status |= TS_USEDFPU;</div><div class='ctx'> 	me-&gt;fpu_counter++;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c<br/>index 7603c0553909..8f98e9de1b82 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/tsc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/tsc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/tsc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/tsc.c</a></div><div class='hunk'>@@ -104,7 +104,7 @@ __setup("notsc", notsc_setup);</div><div class='ctx'> /*</div><div class='ctx'>  * Read TSC and the reference counters. Take care of SMI disturbance</div><div class='ctx'>  */</div><div class='del'>-static u64 __init tsc_read_refs(u64 *pm, u64 *hpet)</div><div class='add'>+static u64 tsc_read_refs(u64 *pm, u64 *hpet)</div><div class='ctx'> {</div><div class='ctx'> 	u64 t1, t2;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -122,80 +122,216 @@ static u64 __init tsc_read_refs(u64 *pm, u64 *hpet)</div><div class='ctx'> 	return ULLONG_MAX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * native_calibrate_tsc - calibrate the tsc on boot</div><div class='add'>+/*</div><div class='add'>+ * Try to calibrate the TSC against the Programmable</div><div class='add'>+ * Interrupt Timer and return the frequency of the TSC</div><div class='add'>+ * in kHz.</div><div class='add'>+ *</div><div class='add'>+ * Return ULONG_MAX on failure to calibrate.</div><div class='ctx'>  */</div><div class='del'>-unsigned long native_calibrate_tsc(void)</div><div class='add'>+static unsigned long pit_calibrate_tsc(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u64 tsc1, tsc2, tr1, tr2, delta, pm1, pm2, hpet1, hpet2;</div><div class='del'>-	int hpet = is_hpet_enabled();</div><div class='del'>-	unsigned int tsc_khz_val = 0;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	tsc1 = tsc_read_refs(&amp;pm1, hpet ? &amp;hpet1 : NULL);</div><div class='add'>+	u64 tsc, t1, t2, delta;</div><div class='add'>+	unsigned long tscmin, tscmax;</div><div class='add'>+	int pitcnt;</div><div class='ctx'> </div><div class='add'>+	/* Set the Gate high, disable speaker */</div><div class='ctx'> 	outb((inb(0x61) &amp; ~0x02) | 0x01, 0x61);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Setup CTC channel 2* for mode 0, (interrupt on terminal</div><div class='add'>+	 * count mode), binary count. Set the latch register to 50ms</div><div class='add'>+	 * (LSB then MSB) to begin countdown.</div><div class='add'>+	 */</div><div class='ctx'> 	outb(0xb0, 0x43);</div><div class='ctx'> 	outb((CLOCK_TICK_RATE / (1000 / 50)) &amp; 0xff, 0x42);</div><div class='ctx'> 	outb((CLOCK_TICK_RATE / (1000 / 50)) &gt;&gt; 8, 0x42);</div><div class='del'>-	tr1 = get_cycles();</div><div class='del'>-	while ((inb(0x61) &amp; 0x20) == 0);</div><div class='del'>-	tr2 = get_cycles();</div><div class='ctx'> </div><div class='del'>-	tsc2 = tsc_read_refs(&amp;pm2, hpet ? &amp;hpet2 : NULL);</div><div class='add'>+	tsc = t1 = t2 = get_cycles();</div><div class='ctx'> </div><div class='del'>-	local_irq_restore(flags);</div><div class='add'>+	pitcnt = 0;</div><div class='add'>+	tscmax = 0;</div><div class='add'>+	tscmin = ULONG_MAX;</div><div class='add'>+	while ((inb(0x61) &amp; 0x20) == 0) {</div><div class='add'>+		t2 = get_cycles();</div><div class='add'>+		delta = t2 - tsc;</div><div class='add'>+		tsc = t2;</div><div class='add'>+		if ((unsigned long) delta &lt; tscmin)</div><div class='add'>+			tscmin = (unsigned int) delta;</div><div class='add'>+		if ((unsigned long) delta &gt; tscmax)</div><div class='add'>+			tscmax = (unsigned int) delta;</div><div class='add'>+		pitcnt++;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Preset the result with the raw and inaccurate PIT</div><div class='del'>-	 * calibration value</div><div class='add'>+	 * Sanity checks:</div><div class='add'>+	 *</div><div class='add'>+	 * If we were not able to read the PIT more than 5000</div><div class='add'>+	 * times, then we have been hit by a massive SMI</div><div class='add'>+	 *</div><div class='add'>+	 * If the maximum is 10 times larger than the minimum,</div><div class='add'>+	 * then we got hit by an SMI as well.</div><div class='ctx'> 	 */</div><div class='del'>-	delta = (tr2 - tr1);</div><div class='add'>+	if (pitcnt &lt; 5000 || tscmax &gt; 10 * tscmin)</div><div class='add'>+		return ULONG_MAX;</div><div class='add'>+</div><div class='add'>+	/* Calculate the PIT value */</div><div class='add'>+	delta = t2 - t1;</div><div class='ctx'> 	do_div(delta, 50);</div><div class='del'>-	tsc_khz_val = delta;</div><div class='add'>+	return delta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * native_calibrate_tsc - calibrate the tsc on boot</div><div class='add'>+ */</div><div class='add'>+unsigned long native_calibrate_tsc(void)</div><div class='add'>+{</div><div class='add'>+	u64 tsc1, tsc2, delta, pm1, pm2, hpet1, hpet2;</div><div class='add'>+	unsigned long tsc_pit_min = ULONG_MAX, tsc_ref_min = ULONG_MAX;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int hpet = is_hpet_enabled(), i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Run 5 calibration loops to get the lowest frequency value</div><div class='add'>+	 * (the best estimate). We use two different calibration modes</div><div class='add'>+	 * here:</div><div class='add'>+	 *</div><div class='add'>+	 * 1) PIT loop. We set the PIT Channel 2 to oneshot mode and</div><div class='add'>+	 * load a timeout of 50ms. We read the time right after we</div><div class='add'>+	 * started the timer and wait until the PIT count down reaches</div><div class='add'>+	 * zero. In each wait loop iteration we read the TSC and check</div><div class='add'>+	 * the delta to the previous read. We keep track of the min</div><div class='add'>+	 * and max values of that delta. The delta is mostly defined</div><div class='add'>+	 * by the IO time of the PIT access, so we can detect when a</div><div class='add'>+	 * SMI/SMM disturbance happend between the two reads. If the</div><div class='add'>+	 * maximum time is significantly larger than the minimum time,</div><div class='add'>+	 * then we discard the result and have another try.</div><div class='add'>+	 *</div><div class='add'>+	 * 2) Reference counter. If available we use the HPET or the</div><div class='add'>+	 * PMTIMER as a reference to check the sanity of that value.</div><div class='add'>+	 * We use separate TSC readouts and check inside of the</div><div class='add'>+	 * reference read for a SMI/SMM disturbance. We dicard</div><div class='add'>+	 * disturbed values here as well. We do that around the PIT</div><div class='add'>+	 * calibration delay loop as we have to wait for a certain</div><div class='add'>+	 * amount of time anyway.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 5; i++) {</div><div class='add'>+		unsigned long tsc_pit_khz;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Read the start value and the reference count of</div><div class='add'>+		 * hpet/pmtimer when available. Then do the PIT</div><div class='add'>+		 * calibration, which will take at least 50ms, and</div><div class='add'>+		 * read the end value.</div><div class='add'>+		 */</div><div class='add'>+		local_irq_save(flags);</div><div class='add'>+		tsc1 = tsc_read_refs(&amp;pm1, hpet ? &amp;hpet1 : NULL);</div><div class='add'>+		tsc_pit_khz = pit_calibrate_tsc();</div><div class='add'>+		tsc2 = tsc_read_refs(&amp;pm2, hpet ? &amp;hpet2 : NULL);</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+		/* Pick the lowest PIT TSC calibration so far */</div><div class='add'>+		tsc_pit_min = min(tsc_pit_min, tsc_pit_khz);</div><div class='add'>+</div><div class='add'>+		/* hpet or pmtimer available ? */</div><div class='add'>+		if (!hpet &amp;&amp; !pm1 &amp;&amp; !pm2)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Check, whether the sampling was disturbed by an SMI */</div><div class='add'>+		if (tsc1 == ULLONG_MAX || tsc2 == ULLONG_MAX)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		tsc2 = (tsc2 - tsc1) * 1000000LL;</div><div class='add'>+</div><div class='add'>+		if (hpet) {</div><div class='add'>+			if (hpet2 &lt; hpet1)</div><div class='add'>+				hpet2 += 0x100000000ULL;</div><div class='add'>+			hpet2 -= hpet1;</div><div class='add'>+			tsc1 = ((u64)hpet2 * hpet_readl(HPET_PERIOD));</div><div class='add'>+			do_div(tsc1, 1000000);</div><div class='add'>+		} else {</div><div class='add'>+			if (pm2 &lt; pm1)</div><div class='add'>+				pm2 += (u64)ACPI_PM_OVRRUN;</div><div class='add'>+			pm2 -= pm1;</div><div class='add'>+			tsc1 = pm2 * 1000000000LL;</div><div class='add'>+			do_div(tsc1, PMTMR_TICKS_PER_SEC);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		do_div(tsc2, tsc1);</div><div class='add'>+		tsc_ref_min = min(tsc_ref_min, (unsigned long) tsc2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now check the results.</div><div class='add'>+	 */</div><div class='add'>+	if (tsc_pit_min == ULONG_MAX) {</div><div class='add'>+		/* PIT gave no useful value */</div><div class='add'>+		printk(KERN_WARNING "TSC: Unable to calibrate against PIT\n");</div><div class='add'>+</div><div class='add'>+		/* We don't have an alternative source, disable TSC */</div><div class='add'>+		if (!hpet &amp;&amp; !pm1 &amp;&amp; !pm2) {</div><div class='add'>+			printk("TSC: No reference (HPET/PMTIMER) available\n");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* The alternative source failed as well, disable TSC */</div><div class='add'>+		if (tsc_ref_min == ULONG_MAX) {</div><div class='add'>+			printk(KERN_WARNING "TSC: HPET/PMTIMER calibration "</div><div class='add'>+			       "failed due to SMI disturbance.\n");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Use the alternative source */</div><div class='add'>+		printk(KERN_INFO "TSC: using %s reference calibration\n",</div><div class='add'>+		       hpet ? "HPET" : "PMTIMER");</div><div class='add'>+</div><div class='add'>+		return tsc_ref_min;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* hpet or pmtimer available ? */</div><div class='add'>+	/* We don't have an alternative source, use the PIT calibration value */</div><div class='ctx'> 	if (!hpet &amp;&amp; !pm1 &amp;&amp; !pm2) {</div><div class='del'>-		printk(KERN_INFO "TSC calibrated against PIT\n");</div><div class='del'>-		goto out;</div><div class='add'>+		printk(KERN_INFO "TSC: Using PIT calibration value\n");</div><div class='add'>+		return tsc_pit_min;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Check, whether the sampling was disturbed by an SMI */</div><div class='del'>-	if (tsc1 == ULLONG_MAX || tsc2 == ULLONG_MAX) {</div><div class='del'>-		printk(KERN_WARNING "TSC calibration disturbed by SMI, "</div><div class='del'>-				"using PIT calibration result\n");</div><div class='del'>-		goto out;</div><div class='add'>+	/* The alternative source failed, use the PIT calibration value */</div><div class='add'>+	if (tsc_ref_min == ULONG_MAX) {</div><div class='add'>+		printk(KERN_WARNING "TSC: HPET/PMTIMER calibration failed due "</div><div class='add'>+		       "to SMI disturbance. Using PIT calibration\n");</div><div class='add'>+		return tsc_pit_min;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tsc2 = (tsc2 - tsc1) * 1000000LL;</div><div class='del'>-</div><div class='del'>-	if (hpet) {</div><div class='del'>-		printk(KERN_INFO "TSC calibrated against HPET\n");</div><div class='del'>-		if (hpet2 &lt; hpet1)</div><div class='del'>-			hpet2 += 0x100000000ULL;</div><div class='del'>-		hpet2 -= hpet1;</div><div class='del'>-		tsc1 = ((u64)hpet2 * hpet_readl(HPET_PERIOD));</div><div class='del'>-		do_div(tsc1, 1000000);</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_INFO "TSC calibrated against PM_TIMER\n");</div><div class='del'>-		if (pm2 &lt; pm1)</div><div class='del'>-			pm2 += (u64)ACPI_PM_OVRRUN;</div><div class='del'>-		pm2 -= pm1;</div><div class='del'>-		tsc1 = pm2 * 1000000000LL;</div><div class='del'>-		do_div(tsc1, PMTMR_TICKS_PER_SEC);</div><div class='add'>+	/* Check the reference deviation */</div><div class='add'>+	delta = ((u64) tsc_pit_min) * 100;</div><div class='add'>+	do_div(delta, tsc_ref_min);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If both calibration results are inside a 5% window, the we</div><div class='add'>+	 * use the lower frequency of those as it is probably the</div><div class='add'>+	 * closest estimate.</div><div class='add'>+	 */</div><div class='add'>+	if (delta &gt;= 95 &amp;&amp; delta &lt;= 105) {</div><div class='add'>+		printk(KERN_INFO "TSC: PIT calibration confirmed by %s.\n",</div><div class='add'>+		       hpet ? "HPET" : "PMTIMER");</div><div class='add'>+		printk(KERN_INFO "TSC: using %s calibration value\n",</div><div class='add'>+		       tsc_pit_min &lt;= tsc_ref_min ? "PIT" :</div><div class='add'>+		       hpet ? "HPET" : "PMTIMER");</div><div class='add'>+		return tsc_pit_min &lt;= tsc_ref_min ? tsc_pit_min : tsc_ref_min;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	do_div(tsc2, tsc1);</div><div class='del'>-	tsc_khz_val = tsc2;</div><div class='add'>+	printk(KERN_WARNING "TSC: PIT calibration deviates from %s: %lu %lu.\n",</div><div class='add'>+	       hpet ? "HPET" : "PMTIMER", tsc_pit_min, tsc_ref_min);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return tsc_khz_val;</div><div class='add'>+	/*</div><div class='add'>+	 * The calibration values differ too much. In doubt, we use</div><div class='add'>+	 * the PIT value as we know that there are PMTIMERs around</div><div class='add'>+	 * running at double speed.</div><div class='add'>+	 */</div><div class='add'>+	printk(KERN_INFO "TSC: Using PIT calibration value\n");</div><div class='add'>+	return tsc_pit_min;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='ctx'> /* Only called from the Powernow K7 cpu freq driver */</div><div class='ctx'> int recalibrate_cpu_khz(void)</div><div class='hunk'>@@ -314,7 +450,7 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,</div><div class='ctx'> 			mark_tsc_unstable("cpufreq changes");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_cyc2ns_scale(tsc_khz_ref, freq-&gt;cpu);</div><div class='add'>+	set_cyc2ns_scale(tsc_khz, freq-&gt;cpu);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -325,6 +461,10 @@ static struct notifier_block time_cpufreq_notifier_block = {</div><div class='ctx'> </div><div class='ctx'> static int __init cpufreq_tsc(void)</div><div class='ctx'> {</div><div class='add'>+	if (!cpu_has_tsc)</div><div class='add'>+		return 0;</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_CONSTANT_TSC))</div><div class='add'>+		return 0;</div><div class='ctx'> 	cpufreq_register_notifier(&amp;time_cpufreq_notifier_block,</div><div class='ctx'> 				CPUFREQ_TRANSITION_NOTIFIER);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c<br/>index 0577825cf89b..9ffb01c31c40 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/tsc_sync.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/tsc_sync.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/tsc_sync.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/tsc_sync.c</a></div><div class='hunk'>@@ -88,11 +88,9 @@ static __cpuinit void check_tsc_warp(void)</div><div class='ctx'> 			__raw_spin_unlock(&amp;sync_lock);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (!(now-start)) {</div><div class='del'>-		printk("Warning: zero tsc calibration delta: %Ld [max: %Ld]\n",</div><div class='add'>+	WARN(!(now-start),</div><div class='add'>+		"Warning: zero tsc calibration delta: %Ld [max: %Ld]\n",</div><div class='ctx'> 			now-start, end-start);</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/kernel/visws_quirks.c b/arch/x86/kernel/visws_quirks.c<br/>index 41e01b145c48..594ef47f0a63 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/visws_quirks.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/visws_quirks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/visws_quirks.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/visws_quirks.c</a></div><div class='hunk'>@@ -184,8 +184,6 @@ static int __init visws_get_smp_config(unsigned int early)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern unsigned int __cpuinitdata maxcpus;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The Visual Workstation is Intel MP compliant in the hardware</div><div class='ctx'>  * sense, but it doesn't have a BIOS(-configuration table).</div><div class='hunk'>@@ -244,8 +242,8 @@ static int __init visws_find_smp_config(unsigned int reserve)</div><div class='ctx'> 		ncpus = CO_CPU_MAX;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ncpus &gt; maxcpus)</div><div class='del'>-		ncpus = maxcpus;</div><div class='add'>+	if (ncpus &gt; setup_max_cpus)</div><div class='add'>+		ncpus = setup_max_cpus;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC</div><div class='ctx'> 	smp_found_config = 1;</div><div class='head'>diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c<br/>index 0a1b1a9d922d..6ca515d6db54 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/vmi_32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/vmi_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/vmi_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/vmi_32.c</a></div><div class='hunk'>@@ -37,6 +37,7 @@</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='ctx'> #include &lt;asm/vmi_time.h&gt;</div><div class='ctx'> #include &lt;asm/kmap_types.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Convenient for calling VMI functions indirectly in the ROM */</div><div class='ctx'> typedef u32 __attribute__((regparm(1))) (VROMFUNC)(void);</div><div class='hunk'>@@ -683,7 +684,7 @@ void vmi_bringup(void)</div><div class='ctx'> {</div><div class='ctx'>  	/* We must establish the lowmem mapping for MMU ops to work */</div><div class='ctx'> 	if (vmi_ops.set_linear_mapping)</div><div class='del'>-		vmi_ops.set_linear_mapping(0, (void *)__PAGE_OFFSET, max_low_pfn, 0);</div><div class='add'>+		vmi_ops.set_linear_mapping(0, (void *)__PAGE_OFFSET, MAXMEM_PFN, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S<br/>index cdb2363697d2..af5bdad84604 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/vmlinux_32.lds.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kernel/vmlinux_32.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/vmlinux_32.lds.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kernel/vmlinux_32.lds.S</a></div><div class='hunk'>@@ -209,3 +209,11 @@ SECTIONS</div><div class='ctx'> </div><div class='ctx'>   DWARF_DEBUG</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KEXEC</div><div class='add'>+/* Link time checks */</div><div class='add'>+#include &lt;asm/kexec.h&gt;</div><div class='add'>+</div><div class='add'>+ASSERT(kexec_control_code_size &lt;= KEXEC_CONTROL_CODE_MAX_SIZE,</div><div class='add'>+       "kexec control code size is too big")</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c<br/>index 2fa231923cf7..3da2508eb22a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/mmu.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kvm/mmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/mmu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kvm/mmu.c</a></div><div class='hunk'>@@ -653,6 +653,88 @@ static void rmap_write_protect(struct kvm *kvm, u64 gfn)</div><div class='ctx'> 	account_shadowed(kvm, gfn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp)</div><div class='add'>+{</div><div class='add'>+	u64 *spte;</div><div class='add'>+	int need_tlb_flush = 0;</div><div class='add'>+</div><div class='add'>+	while ((spte = rmap_next(kvm, rmapp, NULL))) {</div><div class='add'>+		BUG_ON(!(*spte &amp; PT_PRESENT_MASK));</div><div class='add'>+		rmap_printk("kvm_rmap_unmap_hva: spte %p %llx\n", spte, *spte);</div><div class='add'>+		rmap_remove(kvm, spte);</div><div class='add'>+		set_shadow_pte(spte, shadow_trap_nonpresent_pte);</div><div class='add'>+		need_tlb_flush = 1;</div><div class='add'>+	}</div><div class='add'>+	return need_tlb_flush;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvm_handle_hva(struct kvm *kvm, unsigned long hva,</div><div class='add'>+			  int (*handler)(struct kvm *kvm, unsigned long *rmapp))</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int retval = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If mmap_sem isn't taken, we can look the memslots with only</div><div class='add'>+	 * the mmu_lock by skipping over the slots with userspace_addr == 0.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; kvm-&gt;nmemslots; i++) {</div><div class='add'>+		struct kvm_memory_slot *memslot = &amp;kvm-&gt;memslots[i];</div><div class='add'>+		unsigned long start = memslot-&gt;userspace_addr;</div><div class='add'>+		unsigned long end;</div><div class='add'>+</div><div class='add'>+		/* mmu_lock protects userspace_addr */</div><div class='add'>+		if (!start)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		end = start + (memslot-&gt;npages &lt;&lt; PAGE_SHIFT);</div><div class='add'>+		if (hva &gt;= start &amp;&amp; hva &lt; end) {</div><div class='add'>+			gfn_t gfn_offset = (hva - start) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+			retval |= handler(kvm, &amp;memslot-&gt;rmap[gfn_offset]);</div><div class='add'>+			retval |= handler(kvm,</div><div class='add'>+					  &amp;memslot-&gt;lpage_info[</div><div class='add'>+						  gfn_offset /</div><div class='add'>+						  KVM_PAGES_PER_HPAGE].rmap_pde);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvm_unmap_hva(struct kvm *kvm, unsigned long hva)</div><div class='add'>+{</div><div class='add'>+	return kvm_handle_hva(kvm, hva, kvm_unmap_rmapp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp)</div><div class='add'>+{</div><div class='add'>+	u64 *spte;</div><div class='add'>+	int young = 0;</div><div class='add'>+</div><div class='add'>+	/* always return old for EPT */</div><div class='add'>+	if (!shadow_accessed_mask)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	spte = rmap_next(kvm, rmapp, NULL);</div><div class='add'>+	while (spte) {</div><div class='add'>+		int _young;</div><div class='add'>+		u64 _spte = *spte;</div><div class='add'>+		BUG_ON(!(_spte &amp; PT_PRESENT_MASK));</div><div class='add'>+		_young = _spte &amp; PT_ACCESSED_MASK;</div><div class='add'>+		if (_young) {</div><div class='add'>+			young = 1;</div><div class='add'>+			clear_bit(PT_ACCESSED_SHIFT, (unsigned long *)spte);</div><div class='add'>+		}</div><div class='add'>+		spte = rmap_next(kvm, rmapp, spte);</div><div class='add'>+	}</div><div class='add'>+	return young;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvm_age_hva(struct kvm *kvm, unsigned long hva)</div><div class='add'>+{</div><div class='add'>+	return kvm_handle_hva(kvm, hva, kvm_age_rmapp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef MMU_DEBUG</div><div class='ctx'> static int is_empty_shadow_page(u64 *spt)</div><div class='ctx'> {</div><div class='hunk'>@@ -1203,6 +1285,7 @@ static int nonpaging_map(struct kvm_vcpu *vcpu, gva_t v, int write, gfn_t gfn)</div><div class='ctx'> 	int r;</div><div class='ctx'> 	int largepage = 0;</div><div class='ctx'> 	pfn_t pfn;</div><div class='add'>+	unsigned long mmu_seq;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	if (is_largepage_backed(vcpu, gfn &amp; ~(KVM_PAGES_PER_HPAGE-1))) {</div><div class='hunk'>@@ -1210,6 +1293,8 @@ static int nonpaging_map(struct kvm_vcpu *vcpu, gva_t v, int write, gfn_t gfn)</div><div class='ctx'> 		largepage = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mmu_seq = vcpu-&gt;kvm-&gt;mmu_notifier_seq;</div><div class='add'>+	/* implicit mb(), we'll read before PT lock is unlocked */</div><div class='ctx'> 	pfn = gfn_to_pfn(vcpu-&gt;kvm, gfn);</div><div class='ctx'> 	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='hunk'>@@ -1220,6 +1305,8 @@ static int nonpaging_map(struct kvm_vcpu *vcpu, gva_t v, int write, gfn_t gfn)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='add'>+	if (mmu_notifier_retry(vcpu, mmu_seq))</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	kvm_mmu_free_some_pages(vcpu);</div><div class='ctx'> 	r = __direct_map(vcpu, v, write, largepage, gfn, pfn,</div><div class='ctx'> 			 PT32E_ROOT_LEVEL);</div><div class='hunk'>@@ -1227,6 +1314,11 @@ static int nonpaging_map(struct kvm_vcpu *vcpu, gva_t v, int write, gfn_t gfn)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	return r;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='add'>+	kvm_release_pfn_clean(pfn);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1345,6 +1437,7 @@ static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa,</div><div class='ctx'> 	int r;</div><div class='ctx'> 	int largepage = 0;</div><div class='ctx'> 	gfn_t gfn = gpa &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	unsigned long mmu_seq;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(vcpu);</div><div class='ctx'> 	ASSERT(VALID_PAGE(vcpu-&gt;arch.mmu.root_hpa));</div><div class='hunk'>@@ -1358,6 +1451,8 @@ static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa,</div><div class='ctx'> 		gfn &amp;= ~(KVM_PAGES_PER_HPAGE-1);</div><div class='ctx'> 		largepage = 1;</div><div class='ctx'> 	}</div><div class='add'>+	mmu_seq = vcpu-&gt;kvm-&gt;mmu_notifier_seq;</div><div class='add'>+	/* implicit mb(), we'll read before PT lock is unlocked */</div><div class='ctx'> 	pfn = gfn_to_pfn(vcpu-&gt;kvm, gfn);</div><div class='ctx'> 	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	if (is_error_pfn(pfn)) {</div><div class='hunk'>@@ -1365,12 +1460,19 @@ static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa,</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_lock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='add'>+	if (mmu_notifier_retry(vcpu, mmu_seq))</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	kvm_mmu_free_some_pages(vcpu);</div><div class='ctx'> 	r = __direct_map(vcpu, gpa, error_code &amp; PFERR_WRITE_MASK,</div><div class='ctx'> 			 largepage, gfn, pfn, kvm_x86_ops-&gt;get_tdp_level());</div><div class='ctx'> 	spin_unlock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='ctx'> </div><div class='ctx'> 	return r;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='add'>+	kvm_release_pfn_clean(pfn);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nonpaging_free(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -1670,6 +1772,8 @@ static void mmu_guess_page_from_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,</div><div class='ctx'> 		gfn &amp;= ~(KVM_PAGES_PER_HPAGE-1);</div><div class='ctx'> 		vcpu-&gt;arch.update_pte.largepage = 1;</div><div class='ctx'> 	}</div><div class='add'>+	vcpu-&gt;arch.update_pte.mmu_seq = vcpu-&gt;kvm-&gt;mmu_notifier_seq;</div><div class='add'>+	/* implicit mb(), we'll read before PT lock is unlocked */</div><div class='ctx'> 	pfn = gfn_to_pfn(vcpu-&gt;kvm, gfn);</div><div class='ctx'> 	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h<br/>index 4d918220baeb..4a814bff21f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/paging_tmpl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kvm/paging_tmpl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/paging_tmpl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kvm/paging_tmpl.h</a></div><div class='hunk'>@@ -263,6 +263,8 @@ static void FNAME(update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *page,</div><div class='ctx'> 	pfn = vcpu-&gt;arch.update_pte.pfn;</div><div class='ctx'> 	if (is_error_pfn(pfn))</div><div class='ctx'> 		return;</div><div class='add'>+	if (mmu_notifier_retry(vcpu, vcpu-&gt;arch.update_pte.mmu_seq))</div><div class='add'>+		return;</div><div class='ctx'> 	kvm_get_pfn(pfn);</div><div class='ctx'> 	mmu_set_spte(vcpu, spte, page-&gt;role.access, pte_access, 0, 0,</div><div class='ctx'> 		     gpte &amp; PT_DIRTY_MASK, NULL, largepage, gpte_to_gfn(gpte),</div><div class='hunk'>@@ -343,7 +345,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,</div><div class='ctx'> 		shadow_addr = __pa(shadow_page-&gt;spt);</div><div class='ctx'> 		shadow_pte = shadow_addr | PT_PRESENT_MASK | PT_ACCESSED_MASK</div><div class='ctx'> 			| PT_WRITABLE_MASK | PT_USER_MASK;</div><div class='del'>-		*shadow_ent = shadow_pte;</div><div class='add'>+		set_shadow_pte(shadow_ent, shadow_pte);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mmu_set_spte(vcpu, shadow_ent, access, walker-&gt;pte_access &amp; access,</div><div class='hunk'>@@ -380,6 +382,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr,</div><div class='ctx'> 	int r;</div><div class='ctx'> 	pfn_t pfn;</div><div class='ctx'> 	int largepage = 0;</div><div class='add'>+	unsigned long mmu_seq;</div><div class='ctx'> </div><div class='ctx'> 	pgprintk("%s: addr %lx err %x\n", __func__, addr, error_code);</div><div class='ctx'> 	kvm_mmu_audit(vcpu, "pre page fault");</div><div class='hunk'>@@ -413,6 +416,8 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr,</div><div class='ctx'> 			largepage = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	mmu_seq = vcpu-&gt;kvm-&gt;mmu_notifier_seq;</div><div class='add'>+	/* implicit mb(), we'll read before PT lock is unlocked */</div><div class='ctx'> 	pfn = gfn_to_pfn(vcpu-&gt;kvm, walker.gfn);</div><div class='ctx'> 	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='hunk'>@@ -424,6 +429,8 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='add'>+	if (mmu_notifier_retry(vcpu, mmu_seq))</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	kvm_mmu_free_some_pages(vcpu);</div><div class='ctx'> 	shadow_pte = FNAME(fetch)(vcpu, addr, &amp;walker, user_fault, write_fault,</div><div class='ctx'> 				  largepage, &amp;write_pt, pfn);</div><div class='hunk'>@@ -439,6 +446,11 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr,</div><div class='ctx'> 	spin_unlock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='ctx'> </div><div class='ctx'> 	return write_pt;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='add'>+	kvm_release_pfn_clean(pfn);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static gpa_t FNAME(gva_to_gpa)(struct kvm_vcpu *vcpu, gva_t vaddr)</div><div class='head'>diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c<br/>index e2ee264740c7..8233b86c778c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/svm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kvm/svm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/svm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kvm/svm.c</a></div><div class='hunk'>@@ -62,6 +62,7 @@ static int npt = 1;</div><div class='ctx'> module_param(npt, int, S_IRUGO);</div><div class='ctx'> </div><div class='ctx'> static void kvm_reput_irq(struct vcpu_svm *svm);</div><div class='add'>+static void svm_flush_tlb(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> static inline struct vcpu_svm *to_svm(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -878,6 +879,10 @@ set:</div><div class='ctx'> static void svm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long host_cr4_mce = read_cr4() &amp; X86_CR4_MCE;</div><div class='add'>+	unsigned long old_cr4 = to_svm(vcpu)-&gt;vmcb-&gt;save.cr4;</div><div class='add'>+</div><div class='add'>+	if (npt_enabled &amp;&amp; ((old_cr4 ^ cr4) &amp; X86_CR4_PGE))</div><div class='add'>+		force_new_asid(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;arch.cr4 = cr4;</div><div class='ctx'> 	if (!npt_enabled)</div><div class='hunk'>@@ -1027,6 +1032,13 @@ static int pf_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)</div><div class='ctx'> 		KVMTRACE_3D(TDP_FAULT, &amp;svm-&gt;vcpu, error_code,</div><div class='ctx'> 			    (u32)fault_address, (u32)(fault_address &gt;&gt; 32),</div><div class='ctx'> 			    handler);</div><div class='add'>+	/*</div><div class='add'>+	 * FIXME: Tis shouldn't be necessary here, but there is a flush</div><div class='add'>+	 * missing in the MMU code. Until we find this bug, flush the</div><div class='add'>+	 * complete TLB here on an NPF</div><div class='add'>+	 */</div><div class='add'>+	if (npt_enabled)</div><div class='add'>+		svm_flush_tlb(&amp;svm-&gt;vcpu);</div><div class='ctx'> </div><div class='ctx'> 	if (event_injection)</div><div class='ctx'> 		kvm_mmu_unprotect_page_virt(&amp;svm-&gt;vcpu, fault_address);</div><div class='head'>diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c<br/>index 2a69773e3b26..7041cc52b562 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/vmx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kvm/vmx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/vmx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kvm/vmx.c</a></div><div class='hunk'>@@ -3301,8 +3301,7 @@ static int __init vmx_init(void)</div><div class='ctx'> 		kvm_mmu_set_base_ptes(VMX_EPT_READABLE_MASK |</div><div class='ctx'> 			VMX_EPT_WRITABLE_MASK |</div><div class='ctx'> 			VMX_EPT_DEFAULT_MT &lt;&lt; VMX_EPT_MT_EPTE_SHIFT);</div><div class='del'>-		kvm_mmu_set_mask_ptes(0ull, VMX_EPT_FAKE_ACCESSED_MASK,</div><div class='del'>-				VMX_EPT_FAKE_DIRTY_MASK, 0ull,</div><div class='add'>+		kvm_mmu_set_mask_ptes(0ull, 0ull, 0ull, 0ull,</div><div class='ctx'> 				VMX_EPT_EXECUTABLE_MASK);</div><div class='ctx'> 		kvm_enable_tdp();</div><div class='ctx'> 	} else</div><div class='head'>diff --git a/arch/x86/kvm/vmx.h b/arch/x86/kvm/vmx.h<br/>index 425a13436b3f..23e8373507ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/vmx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kvm/vmx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/vmx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kvm/vmx.h</a></div><div class='hunk'>@@ -370,8 +370,6 @@ enum vmcs_field {</div><div class='ctx'> #define VMX_EPT_READABLE_MASK			0x1ull</div><div class='ctx'> #define VMX_EPT_WRITABLE_MASK			0x2ull</div><div class='ctx'> #define VMX_EPT_EXECUTABLE_MASK			0x4ull</div><div class='del'>-#define VMX_EPT_FAKE_ACCESSED_MASK		(1ull &lt;&lt; 62)</div><div class='del'>-#define VMX_EPT_FAKE_DIRTY_MASK			(1ull &lt;&lt; 63)</div><div class='ctx'> </div><div class='ctx'> #define VMX_EPT_IDENTITY_PAGETABLE_ADDR		0xfffbc000ul</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c<br/>index 5916191420c7..0d682fc6aeb3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/x86.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/kvm/x86.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/x86.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/kvm/x86.c</a></div><div class='hunk'>@@ -883,6 +883,7 @@ int kvm_dev_ioctl_check_extension(long ext)</div><div class='ctx'> 	case KVM_CAP_PIT:</div><div class='ctx'> 	case KVM_CAP_NOP_IO_DELAY:</div><div class='ctx'> 	case KVM_CAP_MP_STATE:</div><div class='add'>+	case KVM_CAP_SYNC_MMU:</div><div class='ctx'> 		r = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case KVM_CAP_COALESCED_MMIO:</div><div class='hunk'>@@ -1495,6 +1496,7 @@ static int kvm_vm_ioctl_set_memory_alias(struct kvm *kvm,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;kvm-&gt;slots_lock);</div><div class='add'>+	spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='ctx'> </div><div class='ctx'> 	p = &amp;kvm-&gt;arch.aliases[alias-&gt;slot];</div><div class='ctx'> 	p-&gt;base_gfn = alias-&gt;guest_phys_addr &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -1506,6 +1508,7 @@ static int kvm_vm_ioctl_set_memory_alias(struct kvm *kvm,</div><div class='ctx'> 			break;</div><div class='ctx'> 	kvm-&gt;arch.naliases = n;</div><div class='ctx'> </div><div class='add'>+	spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='ctx'> 	kvm_mmu_zap_all(kvm);</div><div class='ctx'> </div><div class='ctx'> 	up_write(&amp;kvm-&gt;slots_lock);</div><div class='hunk'>@@ -3972,16 +3975,23 @@ int kvm_arch_set_memory_region(struct kvm *kvm,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!user_alloc) {</div><div class='ctx'> 		if (npages &amp;&amp; !old.rmap) {</div><div class='add'>+			unsigned long userspace_addr;</div><div class='add'>+</div><div class='ctx'> 			down_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='del'>-			memslot-&gt;userspace_addr = do_mmap(NULL, 0,</div><div class='del'>-						     npages * PAGE_SIZE,</div><div class='del'>-						     PROT_READ | PROT_WRITE,</div><div class='del'>-						     MAP_SHARED | MAP_ANONYMOUS,</div><div class='del'>-						     0);</div><div class='add'>+			userspace_addr = do_mmap(NULL, 0,</div><div class='add'>+						 npages * PAGE_SIZE,</div><div class='add'>+						 PROT_READ | PROT_WRITE,</div><div class='add'>+						 MAP_SHARED | MAP_ANONYMOUS,</div><div class='add'>+						 0);</div><div class='ctx'> 			up_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='del'>-			if (IS_ERR((void *)memslot-&gt;userspace_addr))</div><div class='del'>-				return PTR_ERR((void *)memslot-&gt;userspace_addr);</div><div class='add'>+			if (IS_ERR((void *)userspace_addr))</div><div class='add'>+				return PTR_ERR((void *)userspace_addr);</div><div class='add'>+</div><div class='add'>+			/* set userspace_addr atomically for kvm_hva_to_rmapp */</div><div class='add'>+			spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+			memslot-&gt;userspace_addr = userspace_addr;</div><div class='add'>+			spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (!old.user_alloc &amp;&amp; old.rmap) {</div><div class='ctx'> 				int ret;</div><div class='head'>diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S<br/>index dfdf428975c0..f118c110af32 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/lib/copy_user_64.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/lib/copy_user_64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/lib/copy_user_64.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/lib/copy_user_64.S</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> 	jnz 100b</div><div class='ctx'> 102:</div><div class='ctx'> 	.section .fixup,"ax"</div><div class='del'>-103:	addl %r8d,%edx			/* ecx is zerorest also */</div><div class='add'>+103:	addl %ecx,%edx			/* ecx is zerorest also */</div><div class='ctx'> 	jmp copy_user_handle_tail</div><div class='ctx'> 	.previous</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S<br/>index 40e0e309d27e..cb0c112386fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/lib/copy_user_nocache_64.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/lib/copy_user_nocache_64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/lib/copy_user_nocache_64.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/lib/copy_user_nocache_64.S</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> 	jnz 100b</div><div class='ctx'> 102:</div><div class='ctx'> 	.section .fixup,"ax"</div><div class='del'>-103:	addl %r8d,%edx			/* ecx is zerorest also */</div><div class='add'>+103:	addl %ecx,%edx			/* ecx is zerorest also */</div><div class='ctx'> 	jmp copy_user_handle_tail</div><div class='ctx'> 	.previous</div><div class='ctx'> </div><div class='hunk'>@@ -108,7 +108,6 @@ ENTRY(__copy_user_nocache)</div><div class='ctx'> 	jmp 60f</div><div class='ctx'> 50:	movl %ecx,%edx</div><div class='ctx'> 60:	sfence</div><div class='del'>-	movl %r8d,%ecx</div><div class='ctx'> 	jmp copy_user_handle_tail</div><div class='ctx'> 	.previous</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/lib/msr-on-cpu.c b/arch/x86/lib/msr-on-cpu.c<br/>index d5a2b39f882b..01b868ba82f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/lib/msr-on-cpu.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/lib/msr-on-cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/lib/msr-on-cpu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/lib/msr-on-cpu.c</a></div><div class='hunk'>@@ -30,10 +30,11 @@ static int _rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h, int safe)</div><div class='ctx'> </div><div class='ctx'> 	rv.msr_no = msr_no;</div><div class='ctx'> 	if (safe) {</div><div class='del'>-		smp_call_function_single(cpu, __rdmsr_safe_on_cpu, &amp;rv, 1);</div><div class='del'>-		err = rv.err;</div><div class='add'>+		err = smp_call_function_single(cpu, __rdmsr_safe_on_cpu,</div><div class='add'>+					       &amp;rv, 1);</div><div class='add'>+		err = err ? err : rv.err;</div><div class='ctx'> 	} else {</div><div class='del'>-		smp_call_function_single(cpu, __rdmsr_on_cpu, &amp;rv, 1);</div><div class='add'>+		err = smp_call_function_single(cpu, __rdmsr_on_cpu, &amp;rv, 1);</div><div class='ctx'> 	}</div><div class='ctx'> 	*l = rv.l;</div><div class='ctx'> 	*h = rv.h;</div><div class='hunk'>@@ -64,23 +65,24 @@ static int _wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h, int safe)</div><div class='ctx'> 	rv.l = l;</div><div class='ctx'> 	rv.h = h;</div><div class='ctx'> 	if (safe) {</div><div class='del'>-		smp_call_function_single(cpu, __wrmsr_safe_on_cpu, &amp;rv, 1);</div><div class='del'>-		err = rv.err;</div><div class='add'>+		err = smp_call_function_single(cpu, __wrmsr_safe_on_cpu,</div><div class='add'>+					       &amp;rv, 1);</div><div class='add'>+		err = err ? err : rv.err;</div><div class='ctx'> 	} else {</div><div class='del'>-		smp_call_function_single(cpu, __wrmsr_on_cpu, &amp;rv, 1);</div><div class='add'>+		err = smp_call_function_single(cpu, __wrmsr_on_cpu, &amp;rv, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)</div><div class='add'>+int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)</div><div class='ctx'> {</div><div class='del'>-	_wrmsr_on_cpu(cpu, msr_no, l, h, 0);</div><div class='add'>+	return _wrmsr_on_cpu(cpu, msr_no, l, h, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h)</div><div class='add'>+int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h)</div><div class='ctx'> {</div><div class='del'>-	_rdmsr_on_cpu(cpu, msr_no, l, h, 0);</div><div class='add'>+	return _rdmsr_on_cpu(cpu, msr_no, l, h, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* These "safe" variants are slower and should be used when the target MSR</div><div class='head'>diff --git a/arch/x86/mach-rdc321x/platform.c b/arch/x86/mach-rdc321x/platform.c<br/>index a037041817c7..4f4e50c3ad3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mach-rdc321x/platform.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/mach-rdc321x/platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mach-rdc321x/platform.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mach-rdc321x/platform.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='head'>diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile<br/>index 2977ea37791f..dfb932dcf136 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/mm/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/Makefile</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> obj-y	:=  init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \</div><div class='del'>-	    pat.o pgtable.o</div><div class='add'>+	    pat.o pgtable.o gup.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_HAVE_GET_USER_PAGES_FAST) += gup.o</div><div class='ctx'> obj-$(CONFIG_X86_32)		+= pgtable_32.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_HUGETLB_PAGE)	+= hugetlbpage.o</div><div class='head'>diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c<br/>index d37f29376b0c..60ec1d08ff24 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/init_32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/mm/init_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/init_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/init_32.c</a></div><div class='hunk'>@@ -458,11 +458,7 @@ static void __init pagetable_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	pgd_t *pgd_base = swapper_pg_dir;</div><div class='ctx'> </div><div class='del'>-	paravirt_pagetable_setup_start(pgd_base);</div><div class='del'>-</div><div class='ctx'> 	permanent_kmaps_init(pgd_base);</div><div class='del'>-</div><div class='del'>-	paravirt_pagetable_setup_done(pgd_base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI_SLEEP</div><div class='head'>diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c<br/>index 129618ca0ea2..d3746efb060d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/init_64.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/mm/init_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/init_64.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/init_64.c</a></div><div class='hunk'>@@ -60,7 +60,7 @@ static unsigned long dma_reserve __initdata;</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);</div><div class='ctx'> </div><div class='del'>-int direct_gbpages __meminitdata</div><div class='add'>+int direct_gbpages</div><div class='ctx'> #ifdef CONFIG_DIRECT_GBPAGES</div><div class='ctx'> 				= 1</div><div class='ctx'> #endif</div><div class='hunk'>@@ -88,7 +88,11 @@ early_param("gbpages", parse_direct_gbpages_on);</div><div class='ctx'> </div><div class='ctx'> int after_bootmem;</div><div class='ctx'> </div><div class='del'>-static __init void *spp_getpage(void)</div><div class='add'>+/*</div><div class='add'>+ * NOTE: This function is marked __ref because it calls __init function</div><div class='add'>+ * (alloc_bootmem_pages). It's safe to do it ONLY when after_bootmem == 0.</div><div class='add'>+ */</div><div class='add'>+static __ref void *spp_getpage(void)</div><div class='ctx'> {</div><div class='ctx'> 	void *ptr;</div><div class='ctx'> </div><div class='hunk'>@@ -237,7 +241,7 @@ static unsigned long __initdata table_start;</div><div class='ctx'> static unsigned long __meminitdata table_end;</div><div class='ctx'> static unsigned long __meminitdata table_top;</div><div class='ctx'> </div><div class='del'>-static __meminit void *alloc_low_page(unsigned long *phys)</div><div class='add'>+static __ref void *alloc_low_page(unsigned long *phys)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pfn = table_end++;</div><div class='ctx'> 	void *adr;</div><div class='hunk'>@@ -258,7 +262,7 @@ static __meminit void *alloc_low_page(unsigned long *phys)</div><div class='ctx'> 	return adr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __meminit void unmap_low_page(void *adr)</div><div class='add'>+static __ref void unmap_low_page(void *adr)</div><div class='ctx'> {</div><div class='ctx'> 	if (after_bootmem)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -314,6 +318,7 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pages = 0;</div><div class='ctx'> 	unsigned long last_map_addr = end;</div><div class='add'>+	unsigned long start = address;</div><div class='ctx'> </div><div class='ctx'> 	int i = pmd_index(address);</div><div class='ctx'> </div><div class='hunk'>@@ -331,16 +336,24 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (pmd_val(*pmd)) {</div><div class='del'>-			if (!pmd_large(*pmd))</div><div class='add'>+			if (!pmd_large(*pmd)) {</div><div class='add'>+				spin_lock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 				last_map_addr = phys_pte_update(pmd, address,</div><div class='del'>-								 end);</div><div class='add'>+								end);</div><div class='add'>+				spin_unlock(&amp;init_mm.page_table_lock);</div><div class='add'>+			}</div><div class='add'>+			/* Count entries we're using from level2_ident_pgt */</div><div class='add'>+			if (start == 0)</div><div class='add'>+				pages++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (page_size_mask &amp; (1&lt;&lt;PG_LEVEL_2M)) {</div><div class='ctx'> 			pages++;</div><div class='add'>+			spin_lock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 			set_pte((pte_t *)pmd,</div><div class='ctx'> 				pfn_pte(address &gt;&gt; PAGE_SHIFT, PAGE_KERNEL_LARGE));</div><div class='add'>+			spin_unlock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 			last_map_addr = (address &amp; PMD_MASK) + PMD_SIZE;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -349,7 +362,9 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end,</div><div class='ctx'> 		last_map_addr = phys_pte_init(pte, address, end);</div><div class='ctx'> 		unmap_low_page(pte);</div><div class='ctx'> </div><div class='add'>+		spin_lock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 		pmd_populate_kernel(&amp;init_mm, pmd, __va(pte_phys));</div><div class='add'>+		spin_unlock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	update_page_count(PG_LEVEL_2M, pages);</div><div class='ctx'> 	return last_map_addr;</div><div class='hunk'>@@ -362,9 +377,7 @@ phys_pmd_update(pud_t *pud, unsigned long address, unsigned long end,</div><div class='ctx'> 	pmd_t *pmd = pmd_offset(pud, 0);</div><div class='ctx'> 	unsigned long last_map_addr;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 	last_map_addr = phys_pmd_init(pmd, address, end, page_size_mask);</div><div class='del'>-	spin_unlock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 	__flush_tlb_all();</div><div class='ctx'> 	return last_map_addr;</div><div class='ctx'> }</div><div class='hunk'>@@ -400,20 +413,21 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,</div><div class='ctx'> </div><div class='ctx'> 		if (page_size_mask &amp; (1&lt;&lt;PG_LEVEL_1G)) {</div><div class='ctx'> 			pages++;</div><div class='add'>+			spin_lock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 			set_pte((pte_t *)pud,</div><div class='ctx'> 				pfn_pte(addr &gt;&gt; PAGE_SHIFT, PAGE_KERNEL_LARGE));</div><div class='add'>+			spin_unlock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 			last_map_addr = (addr &amp; PUD_MASK) + PUD_SIZE;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pmd = alloc_low_page(&amp;pmd_phys);</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 		last_map_addr = phys_pmd_init(pmd, addr, end, page_size_mask);</div><div class='ctx'> 		unmap_low_page(pmd);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 		pud_populate(&amp;init_mm, pud, __va(pmd_phys));</div><div class='ctx'> 		spin_unlock(&amp;init_mm.page_table_lock);</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='ctx'> 	__flush_tlb_all();</div><div class='ctx'> 	update_page_count(PG_LEVEL_1G, pages);</div><div class='hunk'>@@ -505,16 +519,14 @@ static unsigned long __init kernel_physical_mapping_init(unsigned long start,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (after_bootmem)</div><div class='del'>-			pud = pud_offset(pgd, start &amp; PGDIR_MASK);</div><div class='del'>-		else</div><div class='del'>-			pud = alloc_low_page(&amp;pud_phys);</div><div class='del'>-</div><div class='add'>+		pud = alloc_low_page(&amp;pud_phys);</div><div class='ctx'> 		last_map_addr = phys_pud_init(pud, __pa(start), __pa(next),</div><div class='ctx'> 						 page_size_mask);</div><div class='ctx'> 		unmap_low_page(pud);</div><div class='del'>-		pgd_populate(&amp;init_mm, pgd_offset_k(start),</div><div class='del'>-			     __va(pud_phys));</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;init_mm.page_table_lock);</div><div class='add'>+		pgd_populate(&amp;init_mm, pgd, __va(pud_phys));</div><div class='add'>+		spin_unlock(&amp;init_mm.page_table_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return last_map_addr;</div><div class='head'>diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c<br/>index 016f335bbeea..d4b6e6a29ae3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/ioremap.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/mm/ioremap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/ioremap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/ioremap.c</a></div><div class='hunk'>@@ -170,7 +170,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,</div><div class='ctx'> 	phys_addr &amp;= PAGE_MASK;</div><div class='ctx'> 	size = PAGE_ALIGN(last_addr+1) - phys_addr;</div><div class='ctx'> </div><div class='del'>-	retval = reserve_memtype(phys_addr, phys_addr + size,</div><div class='add'>+	retval = reserve_memtype(phys_addr, (u64)phys_addr + size,</div><div class='ctx'> 						prot_val, &amp;new_prot_val);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		pr_debug("Warning: reserve_memtype returned %d\n", retval);</div><div class='hunk'>@@ -553,13 +553,11 @@ static int __init check_early_ioremap_leak(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!early_ioremap_nested)</div><div class='ctx'> 		return 0;</div><div class='del'>-</div><div class='del'>-	printk(KERN_WARNING</div><div class='add'>+	WARN(1, KERN_WARNING</div><div class='ctx'> 	       "Debug warning: early ioremap leak of %d areas detected.\n",</div><div class='del'>-	       early_ioremap_nested);</div><div class='add'>+		early_ioremap_nested);</div><div class='ctx'> 	printk(KERN_WARNING</div><div class='del'>-	       "please boot with early_ioremap_debug and report the dmesg.\n");</div><div class='del'>-	WARN_ON(1);</div><div class='add'>+		"please boot with early_ioremap_debug and report the dmesg.\n");</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c<br/>index e7397e108beb..635b50e85581 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/mmio-mod.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/mm/mmio-mod.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/mmio-mod.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/mmio-mod.c</a></div><div class='hunk'>@@ -430,7 +430,9 @@ static void enter_uniprocessor(void)</div><div class='ctx'> 						"may miss events.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void leave_uniprocessor(void)</div><div class='add'>+/* __ref because leave_uniprocessor calls cpu_up which is __cpuinit,</div><div class='add'>+   but this whole function is ifdefed CONFIG_HOTPLUG_CPU */</div><div class='add'>+static void __ref leave_uniprocessor(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='ctx'> 	int err;</div><div class='head'>diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c<br/>index 0dcd42eb94e6..d4aa503caaa2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/pageattr-test.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/mm/pageattr-test.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/pageattr-test.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/pageattr-test.c</a></div><div class='hunk'>@@ -221,8 +221,7 @@ static int pageattr_test(void)</div><div class='ctx'> 	failed += print_split(&amp;sc);</div><div class='ctx'> </div><div class='ctx'> 	if (failed) {</div><div class='del'>-		printk(KERN_ERR "NOT PASSED. Please report.\n");</div><div class='del'>-		WARN_ON(1);</div><div class='add'>+		WARN(1, KERN_ERR "NOT PASSED. Please report.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (print)</div><div class='head'>diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c<br/>index 65c6e46bf059..43e2f8483e4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/pageattr.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/mm/pageattr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/pageattr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/pageattr.c</a></div><div class='hunk'>@@ -55,13 +55,19 @@ static void split_page_count(int level)</div><div class='ctx'> </div><div class='ctx'> int arch_report_meminfo(char *page)</div><div class='ctx'> {</div><div class='del'>-	int n = sprintf(page, "DirectMap4k:  %8lu\n"</div><div class='del'>-			"DirectMap2M:  %8lu\n",</div><div class='del'>-			direct_pages_count[PG_LEVEL_4K],</div><div class='del'>-			direct_pages_count[PG_LEVEL_2M]);</div><div class='add'>+	int n = sprintf(page, "DirectMap4k:  %8lu kB\n",</div><div class='add'>+			direct_pages_count[PG_LEVEL_4K] &lt;&lt; 2);</div><div class='add'>+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)</div><div class='add'>+	n += sprintf(page + n, "DirectMap2M:  %8lu kB\n",</div><div class='add'>+			direct_pages_count[PG_LEVEL_2M] &lt;&lt; 11);</div><div class='add'>+#else</div><div class='add'>+	n += sprintf(page + n, "DirectMap4M:  %8lu kB\n",</div><div class='add'>+			direct_pages_count[PG_LEVEL_2M] &lt;&lt; 12);</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-	n += sprintf(page + n, "DirectMap1G:  %8lu\n",</div><div class='del'>-		     direct_pages_count[PG_LEVEL_1G]);</div><div class='add'>+	if (direct_gbpages)</div><div class='add'>+		n += sprintf(page + n, "DirectMap1G:  %8lu kB\n",</div><div class='add'>+			direct_pages_count[PG_LEVEL_1G] &lt;&lt; 20);</div><div class='ctx'> #endif</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='hunk'>@@ -592,10 +598,9 @@ repeat:</div><div class='ctx'> 	if (!pte_val(old_pte)) {</div><div class='ctx'> 		if (!primary)</div><div class='ctx'> 			return 0;</div><div class='del'>-		printk(KERN_WARNING "CPA: called for zero pte. "</div><div class='add'>+		WARN(1, KERN_WARNING "CPA: called for zero pte. "</div><div class='ctx'> 		       "vaddr = %lx cpa-&gt;vaddr = %lx\n", address,</div><div class='ctx'> 		       cpa-&gt;vaddr);</div><div class='del'>-		WARN_ON(1);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -844,7 +849,7 @@ int set_memory_uc(unsigned long addr, int numpages)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * for now UC MINUS. see comments in ioremap_nocache()</div><div class='ctx'> 	 */</div><div class='del'>-	if (reserve_memtype(addr, addr + numpages * PAGE_SIZE,</div><div class='add'>+	if (reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE,</div><div class='ctx'> 			    _PAGE_CACHE_UC_MINUS, NULL))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -863,7 +868,7 @@ int set_memory_wc(unsigned long addr, int numpages)</div><div class='ctx'> 	if (!pat_enabled)</div><div class='ctx'> 		return set_memory_uc(addr, numpages);</div><div class='ctx'> </div><div class='del'>-	if (reserve_memtype(addr, addr + numpages * PAGE_SIZE,</div><div class='add'>+	if (reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE,</div><div class='ctx'> 		_PAGE_CACHE_WC, NULL))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -879,7 +884,7 @@ int _set_memory_wb(unsigned long addr, int numpages)</div><div class='ctx'> </div><div class='ctx'> int set_memory_wb(unsigned long addr, int numpages)</div><div class='ctx'> {</div><div class='del'>-	free_memtype(addr, addr + numpages * PAGE_SIZE);</div><div class='add'>+	free_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	return _set_memory_wb(addr, numpages);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c<br/>index 2fe30916d4b6..2a50e0fa64a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/pat.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/mm/pat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/pat.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/pat.c</a></div><div class='hunk'>@@ -207,6 +207,9 @@ static int chk_conflict(struct memtype *new, struct memtype *entry,</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct memtype *cached_entry;</div><div class='add'>+static u64 cached_start;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * req_type typically has one of the:</div><div class='ctx'>  * - _PAGE_CACHE_WB</div><div class='hunk'>@@ -280,11 +283,17 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;memtype_lock);</div><div class='ctx'> </div><div class='add'>+	if (cached_entry &amp;&amp; start &gt;= cached_start)</div><div class='add'>+		entry = cached_entry;</div><div class='add'>+	else</div><div class='add'>+		entry = list_entry(&amp;memtype_list, struct memtype, nd);</div><div class='add'>+</div><div class='ctx'> 	/* Search for existing mapping that overlaps the current range */</div><div class='ctx'> 	where = NULL;</div><div class='del'>-	list_for_each_entry(entry, &amp;memtype_list, nd) {</div><div class='add'>+	list_for_each_entry_continue(entry, &amp;memtype_list, nd) {</div><div class='ctx'> 		if (end &lt;= entry-&gt;start) {</div><div class='ctx'> 			where = entry-&gt;nd.prev;</div><div class='add'>+			cached_entry = list_entry(where, struct memtype, nd);</div><div class='ctx'> 			break;</div><div class='ctx'> 		} else if (start &lt;= entry-&gt;start) { /* end &gt; entry-&gt;start */</div><div class='ctx'> 			err = chk_conflict(new, entry, new_type);</div><div class='hunk'>@@ -292,6 +301,8 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,</div><div class='ctx'> 				dprintk("Overlap at 0x%Lx-0x%Lx\n",</div><div class='ctx'> 					entry-&gt;start, entry-&gt;end);</div><div class='ctx'> 				where = entry-&gt;nd.prev;</div><div class='add'>+				cached_entry = list_entry(where,</div><div class='add'>+							struct memtype, nd);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		} else if (start &lt; entry-&gt;end) { /* start &gt; entry-&gt;start */</div><div class='hunk'>@@ -299,7 +310,20 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,</div><div class='ctx'> 			if (!err) {</div><div class='ctx'> 				dprintk("Overlap at 0x%Lx-0x%Lx\n",</div><div class='ctx'> 					entry-&gt;start, entry-&gt;end);</div><div class='del'>-				where = &amp;entry-&gt;nd;</div><div class='add'>+				cached_entry = list_entry(entry-&gt;nd.prev,</div><div class='add'>+							struct memtype, nd);</div><div class='add'>+</div><div class='add'>+				/*</div><div class='add'>+				 * Move to right position in the linked</div><div class='add'>+				 * list to add this new entry</div><div class='add'>+				 */</div><div class='add'>+				list_for_each_entry_continue(entry,</div><div class='add'>+							&amp;memtype_list, nd) {</div><div class='add'>+					if (start &lt;= entry-&gt;start) {</div><div class='add'>+						where = entry-&gt;nd.prev;</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -314,6 +338,8 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	cached_start = start;</div><div class='add'>+</div><div class='ctx'> 	if (where)</div><div class='ctx'> 		list_add(&amp;new-&gt;nd, where);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -343,6 +369,9 @@ int free_memtype(u64 start, u64 end)</div><div class='ctx'> 	spin_lock(&amp;memtype_lock);</div><div class='ctx'> 	list_for_each_entry(entry, &amp;memtype_list, nd) {</div><div class='ctx'> 		if (entry-&gt;start == start &amp;&amp; entry-&gt;end == end) {</div><div class='add'>+			if (cached_entry == entry || cached_start == start)</div><div class='add'>+				cached_entry = NULL;</div><div class='add'>+</div><div class='ctx'> 			list_del(&amp;entry-&gt;nd);</div><div class='ctx'> 			kfree(entry);</div><div class='ctx'> 			err = 0;</div><div class='hunk'>@@ -361,14 +390,6 @@ int free_memtype(u64 start, u64 end)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * /dev/mem mmap interface. The memtype used for mapping varies:</div><div class='del'>- * - Use UC for mappings with O_SYNC flag</div><div class='del'>- * - Without O_SYNC flag, if there is any conflict in reserve_memtype,</div><div class='del'>- *   inherit the memtype from existing mapping.</div><div class='del'>- * - Else use UC_MINUS memtype (for backward compatibility with existing</div><div class='del'>- *   X drivers.</div><div class='del'>- */</div><div class='ctx'> pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,</div><div class='ctx'> 				unsigned long size, pgprot_t vma_prot)</div><div class='ctx'> {</div><div class='hunk'>@@ -406,14 +427,14 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,</div><div class='ctx'> 				unsigned long size, pgprot_t *vma_prot)</div><div class='ctx'> {</div><div class='ctx'> 	u64 offset = ((u64) pfn) &lt;&lt; PAGE_SHIFT;</div><div class='del'>-	unsigned long flags = _PAGE_CACHE_UC_MINUS;</div><div class='add'>+	unsigned long flags = -1;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	if (!range_is_allowed(pfn, size))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (file-&gt;f_flags &amp; O_SYNC) {</div><div class='del'>-		flags = _PAGE_CACHE_UC;</div><div class='add'>+		flags = _PAGE_CACHE_UC_MINUS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='hunk'>@@ -436,13 +457,14 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * With O_SYNC, we can only take UC mapping. Fail if we cannot.</div><div class='add'>+	 * With O_SYNC, we can only take UC_MINUS mapping. Fail if we cannot.</div><div class='add'>+	 *</div><div class='ctx'> 	 * Without O_SYNC, we want to get</div><div class='ctx'> 	 * - WB for WB-able memory and no other conflicting mappings</div><div class='ctx'> 	 * - UC_MINUS for non-WB-able memory with no other conflicting mappings</div><div class='ctx'> 	 * - Inherit from confliting mappings otherwise</div><div class='ctx'> 	 */</div><div class='del'>-	if (flags != _PAGE_CACHE_UC_MINUS) {</div><div class='add'>+	if (flags != -1) {</div><div class='ctx'> 		retval = reserve_memtype(offset, offset + size, flags, NULL);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		retval = reserve_memtype(offset, offset + size, -1, &amp;flags);</div><div class='head'>diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c<br/>index 557b2abceef8..d50302774fe2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/pgtable.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/mm/pgtable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/pgtable.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/pgtable.c</a></div><div class='hunk'>@@ -207,6 +207,9 @@ static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])</div><div class='ctx'> 	unsigned long addr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	pud = pud_offset(pgd, 0);</div><div class='ctx'> </div><div class='ctx'>  	for (addr = i = 0; i &lt; PREALLOCATED_PMDS;</div><div class='head'>diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c<br/>index 1eb2973a301c..16ae70fc57e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/srat_32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/mm/srat_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/srat_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/mm/srat_32.c</a></div><div class='hunk'>@@ -178,7 +178,7 @@ void acpi_numa_arch_fixup(void)</div><div class='ctx'>  * start of the node, and that the current "end" address is after</div><div class='ctx'>  * the previous one.</div><div class='ctx'>  */</div><div class='del'>-static __init void node_read_chunk(int nid, struct node_memory_chunk_s *memory_chunk)</div><div class='add'>+static __init int node_read_chunk(int nid, struct node_memory_chunk_s *memory_chunk)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Only add present memory as told by the e820.</div><div class='hunk'>@@ -189,10 +189,10 @@ static __init void node_read_chunk(int nid, struct node_memory_chunk_s *memory_c</div><div class='ctx'> 	if (memory_chunk-&gt;start_pfn &gt;= max_pfn) {</div><div class='ctx'> 		printk(KERN_INFO "Ignoring SRAT pfns: %08lx - %08lx\n",</div><div class='ctx'> 			memory_chunk-&gt;start_pfn, memory_chunk-&gt;end_pfn);</div><div class='del'>-		return;</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (memory_chunk-&gt;nid != nid)</div><div class='del'>-		return;</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> 	if (!node_has_online_mem(nid))</div><div class='ctx'> 		node_start_pfn[nid] = memory_chunk-&gt;start_pfn;</div><div class='hunk'>@@ -202,6 +202,8 @@ static __init void node_read_chunk(int nid, struct node_memory_chunk_s *memory_c</div><div class='ctx'> </div><div class='ctx'> 	if (node_end_pfn[nid] &lt; memory_chunk-&gt;end_pfn)</div><div class='ctx'> 		node_end_pfn[nid] = memory_chunk-&gt;end_pfn;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __init get_memcfg_from_srat(void)</div><div class='hunk'>@@ -259,7 +261,9 @@ int __init get_memcfg_from_srat(void)</div><div class='ctx'> 		printk(KERN_DEBUG</div><div class='ctx'> 			"chunk %d nid %d start_pfn %08lx end_pfn %08lx\n",</div><div class='ctx'> 		       j, chunk-&gt;nid, chunk-&gt;start_pfn, chunk-&gt;end_pfn);</div><div class='del'>-		node_read_chunk(chunk-&gt;nid, chunk);</div><div class='add'>+		if (node_read_chunk(chunk-&gt;nid, chunk))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		e820_register_active_regions(chunk-&gt;nid, chunk-&gt;start_pfn,</div><div class='ctx'> 					     min(chunk-&gt;end_pfn, max_pfn));</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c<br/>index 3f90289410e6..0227694f7dab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/oprofile/nmi_int.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/oprofile/nmi_int.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/oprofile/nmi_int.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/oprofile/nmi_int.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='hunk'>@@ -28,23 +29,48 @@ static DEFINE_PER_CPU(unsigned long, saved_lvtpc);</div><div class='ctx'> </div><div class='ctx'> static int nmi_start(void);</div><div class='ctx'> static void nmi_stop(void);</div><div class='add'>+static void nmi_cpu_start(void *dummy);</div><div class='add'>+static void nmi_cpu_stop(void *dummy);</div><div class='ctx'> </div><div class='ctx'> /* 0 == registered but off, 1 == registered and on */</div><div class='ctx'> static int nmi_enabled = 0;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+static int oprofile_cpu_notifier(struct notifier_block *b, unsigned long action,</div><div class='add'>+				 void *data)</div><div class='add'>+{</div><div class='add'>+	int cpu = (unsigned long)data;</div><div class='add'>+	switch (action) {</div><div class='add'>+	case CPU_DOWN_FAILED:</div><div class='add'>+	case CPU_ONLINE:</div><div class='add'>+		smp_call_function_single(cpu, nmi_cpu_start, NULL, 0);</div><div class='add'>+		break;</div><div class='add'>+	case CPU_DOWN_PREPARE:</div><div class='add'>+		smp_call_function_single(cpu, nmi_cpu_stop, NULL, 1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block oprofile_cpu_nb = {</div><div class='add'>+	.notifier_call = oprofile_cpu_notifier</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> </div><div class='ctx'> static int nmi_suspend(struct sys_device *dev, pm_message_t state)</div><div class='ctx'> {</div><div class='add'>+	/* Only one CPU left, just stop that one */</div><div class='ctx'> 	if (nmi_enabled == 1)</div><div class='del'>-		nmi_stop();</div><div class='add'>+		nmi_cpu_stop(NULL);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nmi_resume(struct sys_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (nmi_enabled == 1)</div><div class='del'>-		nmi_start();</div><div class='add'>+		nmi_cpu_start(NULL);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -463,6 +489,9 @@ int __init op_nmi_init(struct oprofile_operations *ops)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	init_sysfs();</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	register_cpu_notifier(&amp;oprofile_cpu_nb);</div><div class='add'>+#endif</div><div class='ctx'> 	using_nmi = 1;</div><div class='ctx'> 	ops-&gt;create_files = nmi_create_files;</div><div class='ctx'> 	ops-&gt;setup = nmi_setup;</div><div class='hunk'>@@ -476,6 +505,10 @@ int __init op_nmi_init(struct oprofile_operations *ops)</div><div class='ctx'> </div><div class='ctx'> void op_nmi_exit(void)</div><div class='ctx'> {</div><div class='del'>-	if (using_nmi)</div><div class='add'>+	if (using_nmi) {</div><div class='ctx'> 		exit_sysfs();</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+		unregister_cpu_notifier(&amp;oprofile_cpu_nb);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c<br/>index dbf532369711..6a0fca78c362 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/pci/amd_bus.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/pci/amd_bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/pci/amd_bus.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/pci/amd_bus.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/topology.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include "pci.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='hunk'>@@ -555,15 +556,17 @@ static int __init early_fill_mp_bus_info(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-postcore_initcall(early_fill_mp_bus_info);</div><div class='add'>+#else  /* !CONFIG_X86_64 */</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+static int __init early_fill_mp_bus_info(void) { return 0; }</div><div class='add'>+</div><div class='add'>+#endif /* !CONFIG_X86_64 */</div><div class='ctx'> </div><div class='ctx'> /* common 32/64 bit code */</div><div class='ctx'> </div><div class='ctx'> #define ENABLE_CF8_EXT_CFG      (1ULL &lt;&lt; 46)</div><div class='ctx'> </div><div class='del'>-static void enable_pci_io_ecs_per_cpu(void *unused)</div><div class='add'>+static void enable_pci_io_ecs(void *unused)</div><div class='ctx'> {</div><div class='ctx'> 	u64 reg;</div><div class='ctx'> 	rdmsrl(MSR_AMD64_NB_CFG, reg);</div><div class='hunk'>@@ -573,14 +576,51 @@ static void enable_pci_io_ecs_per_cpu(void *unused)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init enable_pci_io_ecs(void)</div><div class='add'>+static int __cpuinit amd_cpu_notify(struct notifier_block *self,</div><div class='add'>+				    unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='add'>+	int cpu = (long)hcpu;</div><div class='add'>+	switch(action) {</div><div class='add'>+	case CPU_ONLINE:</div><div class='add'>+	case CPU_ONLINE_FROZEN:</div><div class='add'>+		smp_call_function_single(cpu, enable_pci_io_ecs, NULL, 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block __cpuinitdata amd_cpu_notifier = {</div><div class='add'>+	.notifier_call	= amd_cpu_notify,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init pci_io_ecs_init(void)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='ctx'> 	/* assume all cpus from fam10h have IO ECS */</div><div class='ctx'>         if (boot_cpu_data.x86 &lt; 0x10)</div><div class='ctx'> 		return 0;</div><div class='del'>-	on_each_cpu(enable_pci_io_ecs_per_cpu, NULL, 1);</div><div class='add'>+</div><div class='add'>+	register_cpu_notifier(&amp;amd_cpu_notifier);</div><div class='add'>+	for_each_online_cpu(cpu)</div><div class='add'>+		amd_cpu_notify(&amp;amd_cpu_notifier, (unsigned long)CPU_ONLINE,</div><div class='add'>+			       (void *)(long)cpu);</div><div class='ctx'> 	pci_probe |= PCI_HAS_IO_ECS;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init amd_postcore_init(void)</div><div class='add'>+{</div><div class='add'>+	if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	early_fill_mp_bus_info();</div><div class='add'>+	pci_io_ecs_init();</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-postcore_initcall(enable_pci_io_ecs);</div><div class='add'>+postcore_initcall(amd_postcore_init);</div><div class='head'>diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c<br/>index 5807d1bc73f7..8791fc55e715 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/pci/i386.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/pci/i386.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/pci/i386.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/pci/i386.c</a></div><div class='hunk'>@@ -128,8 +128,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)</div><div class='ctx'> 				pr = pci_find_parent_resource(dev, r);</div><div class='ctx'> 				if (!r-&gt;start || !pr ||</div><div class='ctx'> 				    request_resource(pr, r) &lt; 0) {</div><div class='del'>-					dev_err(&amp;dev-&gt;dev, "BAR %d: can't "</div><div class='del'>-						"allocate resource\n", idx);</div><div class='add'>+					dev_err(&amp;dev-&gt;dev, "BAR %d: can't allocate resource\n", idx);</div><div class='ctx'> 					/*</div><div class='ctx'> 					 * Something is wrong with the region.</div><div class='ctx'> 					 * Invalidate the resource to prevent</div><div class='hunk'>@@ -164,15 +163,13 @@ static void __init pcibios_allocate_resources(int pass)</div><div class='ctx'> 			else</div><div class='ctx'> 				disabled = !(command &amp; PCI_COMMAND_MEMORY);</div><div class='ctx'> 			if (pass == disabled) {</div><div class='del'>-				dev_dbg(&amp;dev-&gt;dev, "resource %#08llx-%#08llx "</div><div class='del'>-					"(f=%lx, d=%d, p=%d)\n",</div><div class='add'>+				dev_dbg(&amp;dev-&gt;dev, "resource %#08llx-%#08llx (f=%lx, d=%d, p=%d)\n",</div><div class='ctx'> 					(unsigned long long) r-&gt;start,</div><div class='ctx'> 					(unsigned long long) r-&gt;end,</div><div class='ctx'> 					r-&gt;flags, disabled, pass);</div><div class='ctx'> 				pr = pci_find_parent_resource(dev, r);</div><div class='ctx'> 				if (!pr || request_resource(pr, r) &lt; 0) {</div><div class='del'>-					dev_err(&amp;dev-&gt;dev, "BAR %d: can't "</div><div class='del'>-						"allocate resource\n", idx);</div><div class='add'>+					dev_err(&amp;dev-&gt;dev, "BAR %d: can't allocate resource\n", idx);</div><div class='ctx'> 					/* We'll assign a new address later */</div><div class='ctx'> 					r-&gt;end -= r-&gt;start;</div><div class='ctx'> 					r-&gt;start = 0;</div><div class='head'>diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c<br/>index fec0123b33a9..8e077185e185 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/pci/irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/pci/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/pci/irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/pci/irq.c</a></div><div class='hunk'>@@ -590,6 +590,8 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_ICH10_1:</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_ICH10_2:</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_ICH10_3:</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_PCH_0:</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_PCH_1:</div><div class='ctx'> 		r-&gt;name = "PIIX/ICH";</div><div class='ctx'> 		r-&gt;get = pirq_piix_get;</div><div class='ctx'> 		r-&gt;set = pirq_piix_set;</div><div class='head'>diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c<br/>index ec9ce35e44d6..b722dd481b39 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/pci/legacy.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/pci/legacy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/pci/legacy.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/pci/legacy.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@ static void __devinit pcibios_fixup_peer_bridges(void)</div><div class='ctx'> 	int n, devfn;</div><div class='ctx'> 	long node;</div><div class='ctx'> </div><div class='del'>-	if (pcibios_last_bus &lt;= 0 || pcibios_last_bus &gt;= 0xff)</div><div class='add'>+	if (pcibios_last_bus &lt;= 0 || pcibios_last_bus &gt; 0xff)</div><div class='ctx'> 		return;</div><div class='ctx'> 	DBG("PCI: Peer bridge fixup\n");</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c<br/>index 23faaa890ffc..d9635764ce3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/pci/mmconfig-shared.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/pci/mmconfig-shared.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/pci/mmconfig-shared.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/pci/mmconfig-shared.c</a></div><div class='hunk'>@@ -293,7 +293,7 @@ static acpi_status __init find_mboard_resource(acpi_handle handle, u32 lvl,</div><div class='ctx'> 	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init is_acpi_reserved(unsigned long start, unsigned long end)</div><div class='add'>+static int __init is_acpi_reserved(u64 start, u64 end, unsigned not_used)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource mcfg_res;</div><div class='ctx'> </div><div class='hunk'>@@ -310,6 +310,41 @@ static int __init is_acpi_reserved(unsigned long start, unsigned long end)</div><div class='ctx'> 	return mcfg_res.flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+typedef int (*check_reserved_t)(u64 start, u64 end, unsigned type);</div><div class='add'>+</div><div class='add'>+static int __init is_mmconf_reserved(check_reserved_t is_reserved,</div><div class='add'>+		u64 addr, u64 size, int i,</div><div class='add'>+		typeof(pci_mmcfg_config[0]) *cfg, int with_e820)</div><div class='add'>+{</div><div class='add'>+	u64 old_size = size;</div><div class='add'>+	int valid = 0;</div><div class='add'>+</div><div class='add'>+	while (!is_reserved(addr, addr + size - 1, E820_RESERVED)) {</div><div class='add'>+		size &gt;&gt;= 1;</div><div class='add'>+		if (size &lt; (16UL&lt;&lt;20))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (size &gt;= (16UL&lt;&lt;20) || size == old_size) {</div><div class='add'>+		printk(KERN_NOTICE</div><div class='add'>+		       "PCI: MCFG area at %Lx reserved in %s\n",</div><div class='add'>+			addr, with_e820?"E820":"ACPI motherboard resources");</div><div class='add'>+		valid = 1;</div><div class='add'>+</div><div class='add'>+		if (old_size != size) {</div><div class='add'>+			/* update end_bus_number */</div><div class='add'>+			cfg-&gt;end_bus_number = cfg-&gt;start_bus_number + ((size&gt;&gt;20) - 1);</div><div class='add'>+			printk(KERN_NOTICE "PCI: updated MCFG configuration %d: base %lx "</div><div class='add'>+			       "segment %hu buses %u - %u\n",</div><div class='add'>+			       i, (unsigned long)cfg-&gt;address, cfg-&gt;pci_segment,</div><div class='add'>+			       (unsigned int)cfg-&gt;start_bus_number,</div><div class='add'>+			       (unsigned int)cfg-&gt;end_bus_number);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return valid;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init pci_mmcfg_reject_broken(int early)</div><div class='ctx'> {</div><div class='ctx'> 	typeof(pci_mmcfg_config[0]) *cfg;</div><div class='hunk'>@@ -324,21 +359,22 @@ static void __init pci_mmcfg_reject_broken(int early)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pci_mmcfg_config_num; i++) {</div><div class='ctx'> 		int valid = 0;</div><div class='del'>-		u32 size = (cfg-&gt;end_bus_number + 1) &lt;&lt; 20;</div><div class='add'>+		u64 addr, size;</div><div class='add'>+</div><div class='ctx'> 		cfg = &amp;pci_mmcfg_config[i];</div><div class='add'>+		addr = cfg-&gt;start_bus_number;</div><div class='add'>+		addr &lt;&lt;= 20;</div><div class='add'>+		addr += cfg-&gt;address;</div><div class='add'>+		size = cfg-&gt;end_bus_number + 1 - cfg-&gt;start_bus_number;</div><div class='add'>+		size &lt;&lt;= 20;</div><div class='ctx'> 		printk(KERN_NOTICE "PCI: MCFG configuration %d: base %lx "</div><div class='ctx'> 		       "segment %hu buses %u - %u\n",</div><div class='ctx'> 		       i, (unsigned long)cfg-&gt;address, cfg-&gt;pci_segment,</div><div class='ctx'> 		       (unsigned int)cfg-&gt;start_bus_number,</div><div class='ctx'> 		       (unsigned int)cfg-&gt;end_bus_number);</div><div class='ctx'> </div><div class='del'>-		if (!early &amp;&amp;</div><div class='del'>-		    is_acpi_reserved(cfg-&gt;address, cfg-&gt;address + size - 1)) {</div><div class='del'>-			printk(KERN_NOTICE "PCI: MCFG area at %Lx reserved "</div><div class='del'>-			       "in ACPI motherboard resources\n",</div><div class='del'>-			       cfg-&gt;address);</div><div class='del'>-			valid = 1;</div><div class='del'>-		}</div><div class='add'>+		if (!early)</div><div class='add'>+			valid = is_mmconf_reserved(is_acpi_reserved, addr, size, i, cfg, 0);</div><div class='ctx'> </div><div class='ctx'> 		if (valid)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -347,16 +383,11 @@ static void __init pci_mmcfg_reject_broken(int early)</div><div class='ctx'> 			printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %Lx is not"</div><div class='ctx'> 			       " reserved in ACPI motherboard resources\n",</div><div class='ctx'> 			       cfg-&gt;address);</div><div class='add'>+</div><div class='ctx'> 		/* Don't try to do this check unless configuration</div><div class='ctx'> 		   type 1 is available. how about type 2 ?*/</div><div class='del'>-		if (raw_pci_ops &amp;&amp; e820_all_mapped(cfg-&gt;address,</div><div class='del'>-						  cfg-&gt;address + size - 1,</div><div class='del'>-						  E820_RESERVED)) {</div><div class='del'>-			printk(KERN_NOTICE</div><div class='del'>-			       "PCI: MCFG area at %Lx reserved in E820\n",</div><div class='del'>-			       cfg-&gt;address);</div><div class='del'>-			valid = 1;</div><div class='del'>-		}</div><div class='add'>+		if (raw_pci_ops)</div><div class='add'>+			valid = is_mmconf_reserved(e820_all_mapped, addr, size, i, cfg, 1);</div><div class='ctx'> </div><div class='ctx'> 		if (!valid)</div><div class='ctx'> 			goto reject;</div><div class='hunk'>@@ -365,7 +396,7 @@ static void __init pci_mmcfg_reject_broken(int early)</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> reject:</div><div class='del'>-	printk(KERN_ERR "PCI: Not using MMCONFIG.\n");</div><div class='add'>+	printk(KERN_INFO "PCI: Not using MMCONFIG.\n");</div><div class='ctx'> 	pci_mmcfg_arch_free();</div><div class='ctx'> 	kfree(pci_mmcfg_config);</div><div class='ctx'> 	pci_mmcfg_config = NULL;</div><div class='head'>diff --git a/arch/x86/power/cpu_32.c b/arch/x86/power/cpu_32.c<br/>index 7dc5d5cf50a2..d3e083dea720 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/power/cpu_32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/power/cpu_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/power/cpu_32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/power/cpu_32.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@ static void __save_processor_state(struct saved_context *ctxt)</div><div class='ctx'> 	ctxt-&gt;cr0 = read_cr0();</div><div class='ctx'> 	ctxt-&gt;cr2 = read_cr2();</div><div class='ctx'> 	ctxt-&gt;cr3 = read_cr3();</div><div class='del'>-	ctxt-&gt;cr4 = read_cr4();</div><div class='add'>+	ctxt-&gt;cr4 = read_cr4_safe();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Needed by apm.c */</div><div class='hunk'>@@ -98,7 +98,9 @@ static void __restore_processor_state(struct saved_context *ctxt)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * control registers</div><div class='ctx'> 	 */</div><div class='del'>-	write_cr4(ctxt-&gt;cr4);</div><div class='add'>+	/* cr4 was introduced in the Pentium CPU */</div><div class='add'>+	if (ctxt-&gt;cr4)</div><div class='add'>+		write_cr4(ctxt-&gt;cr4);</div><div class='ctx'> 	write_cr3(ctxt-&gt;cr3);</div><div class='ctx'> 	write_cr2(ctxt-&gt;cr2);</div><div class='ctx'> 	write_cr0(ctxt-&gt;cr0);</div><div class='head'>diff --git a/arch/x86/power/hibernate_asm_32.S b/arch/x86/power/hibernate_asm_32.S<br/>index b95aa6cfe3cb..4fc7e872c85e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/power/hibernate_asm_32.S?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/power/hibernate_asm_32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/power/hibernate_asm_32.S?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/power/hibernate_asm_32.S</a></div><div class='hunk'>@@ -28,9 +28,9 @@ ENTRY(swsusp_arch_suspend)</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> ENTRY(restore_image)</div><div class='del'>-	movl	resume_pg_dir, %ecx</div><div class='del'>-	subl	$__PAGE_OFFSET, %ecx</div><div class='del'>-	movl	%ecx, %cr3</div><div class='add'>+	movl	resume_pg_dir, %eax</div><div class='add'>+	subl	$__PAGE_OFFSET, %eax</div><div class='add'>+	movl	%eax, %cr3</div><div class='ctx'> </div><div class='ctx'> 	movl	restore_pblist, %edx</div><div class='ctx'> 	.p2align 4,,7</div><div class='hunk'>@@ -52,17 +52,21 @@ copy_loop:</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	/* go back to the original page tables */</div><div class='del'>-	movl	$swapper_pg_dir, %ecx</div><div class='del'>-	subl	$__PAGE_OFFSET, %ecx</div><div class='del'>-	movl	%ecx, %cr3</div><div class='add'>+	movl	$swapper_pg_dir, %eax</div><div class='add'>+	subl	$__PAGE_OFFSET, %eax</div><div class='add'>+	movl	%eax, %cr3</div><div class='ctx'> 	/* Flush TLB, including "global" things (vmalloc) */</div><div class='del'>-	movl	mmu_cr4_features, %eax</div><div class='del'>-	movl	%eax, %edx</div><div class='add'>+	movl	mmu_cr4_features, %ecx</div><div class='add'>+	jecxz	1f	# cr4 Pentium and higher, skip if zero</div><div class='add'>+	movl	%ecx, %edx</div><div class='ctx'> 	andl	$~(1&lt;&lt;7), %edx;  # PGE</div><div class='ctx'> 	movl	%edx, %cr4;  # turn off PGE</div><div class='del'>-	movl	%cr3, %ecx;  # flush TLB</div><div class='del'>-	movl	%ecx, %cr3</div><div class='del'>-	movl	%eax, %cr4;  # turn PGE back on</div><div class='add'>+1:</div><div class='add'>+	movl	%cr3, %eax;  # flush TLB</div><div class='add'>+	movl	%eax, %cr3</div><div class='add'>+	jecxz	1f	# cr4 Pentium and higher, skip if zero</div><div class='add'>+	movl	%ecx, %cr4;  # turn PGE back on</div><div class='add'>+1:</div><div class='ctx'> </div><div class='ctx'> 	movl saved_context_esp, %esp</div><div class='ctx'> 	movl saved_context_ebp, %ebp</div><div class='head'>diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c<br/>index 9ff6e3cbf08f..a4e201b47f64 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/xen/enlighten.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/xen/enlighten.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/xen/enlighten.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/xen/enlighten.c</a></div><div class='hunk'>@@ -1324,7 +1324,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = {</div><div class='ctx'> 	.ptep_modify_prot_commit = __ptep_modify_prot_commit,</div><div class='ctx'> </div><div class='ctx'> 	.pte_val = xen_pte_val,</div><div class='del'>-	.pte_flags = native_pte_val,</div><div class='add'>+	.pte_flags = native_pte_flags,</div><div class='ctx'> 	.pgd_val = xen_pgd_val,</div><div class='ctx'> </div><div class='ctx'> 	.make_pte = xen_make_pte,</div><div class='head'>diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c<br/>index b6acc3a0af46..d67901083888 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/xen/setup.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/x86/xen/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/xen/setup.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/x86/xen/setup.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@ char * __init xen_memory_setup(void)</div><div class='ctx'> </div><div class='ctx'> 	e820.nr_map = 0;</div><div class='ctx'> </div><div class='del'>-	e820_add_region(0, PFN_PHYS(max_pfn), E820_RAM);</div><div class='add'>+	e820_add_region(0, PFN_PHYS((u64)max_pfn), E820_RAM);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Even though this is normal, usable memory under Xen, reserve</div><div class='head'>diff --git a/arch/xtensa/kernel/xtensa_ksyms.c b/arch/xtensa/kernel/xtensa_ksyms.c<br/>index 6e52cdd6166f..c9a7c5b74a0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/xtensa_ksyms.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>arch/xtensa/kernel/xtensa_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/xtensa_ksyms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>arch/xtensa/kernel/xtensa_ksyms.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='del'>-#include &lt;linux/ide.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/checksum.h&gt;</div><div class='head'>diff --git a/block/blk-core.c b/block/blk-core.c<br/>index fef79ccb2a11..2cba5ef97b2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/blk-core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>block/blk-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/blk-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>block/blk-core.c</a></div><div class='hunk'>@@ -212,6 +212,24 @@ void blk_plug_device(struct request_queue *q)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_plug_device);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * blk_plug_device_unlocked - plug a device without queue lock held</div><div class='add'>+ * @q:    The &amp;struct request_queue to plug</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ *   Like @blk_plug_device(), but grabs the queue lock and disables</div><div class='add'>+ *   interrupts.</div><div class='add'>+ **/</div><div class='add'>+void blk_plug_device_unlocked(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(q-&gt;queue_lock, flags);</div><div class='add'>+	blk_plug_device(q);</div><div class='add'>+	spin_unlock_irqrestore(q-&gt;queue_lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(blk_plug_device_unlocked);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * remove the queue from the plugged list, if present. called with</div><div class='ctx'>  * queue lock held and interrupts disabled.</div><div class='hunk'>@@ -564,6 +582,8 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)</div><div class='ctx'> </div><div class='ctx'> 	q-&gt;sg_reserved_size = INT_MAX;</div><div class='ctx'> </div><div class='add'>+	blk_set_cmd_filter_defaults(&amp;q-&gt;cmd_filter);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * all done</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/block/blk-tag.c b/block/blk-tag.c<br/>index 32667beb03ee..ed5166fbc599 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/blk-tag.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>block/blk-tag.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/blk-tag.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>block/blk-tag.c</a></div><div class='hunk'>@@ -38,7 +38,8 @@ static int __blk_free_tags(struct blk_queue_tag *bqt)</div><div class='ctx'> </div><div class='ctx'> 	retval = atomic_dec_and_test(&amp;bqt-&gt;refcnt);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		BUG_ON(bqt-&gt;busy);</div><div class='add'>+		BUG_ON(find_first_bit(bqt-&gt;tag_map, bqt-&gt;max_depth) &lt;</div><div class='add'>+							bqt-&gt;max_depth);</div><div class='ctx'> </div><div class='ctx'> 		kfree(bqt-&gt;tag_index);</div><div class='ctx'> 		bqt-&gt;tag_index = NULL;</div><div class='hunk'>@@ -147,7 +148,6 @@ static struct blk_queue_tag *__blk_queue_init_tags(struct request_queue *q,</div><div class='ctx'> 	if (init_tag_map(q, tags, depth))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	tags-&gt;busy = 0;</div><div class='ctx'> 	atomic_set(&amp;tags-&gt;refcnt, 1);</div><div class='ctx'> 	return tags;</div><div class='ctx'> fail:</div><div class='hunk'>@@ -313,7 +313,6 @@ void blk_queue_end_tag(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	 * unlock memory barrier semantics.</div><div class='ctx'> 	 */</div><div class='ctx'> 	clear_bit_unlock(tag, bqt-&gt;tag_map);</div><div class='del'>-	bqt-&gt;busy--;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_queue_end_tag);</div><div class='ctx'> </div><div class='hunk'>@@ -368,7 +367,6 @@ int blk_queue_start_tag(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	bqt-&gt;tag_index[tag] = rq;</div><div class='ctx'> 	blkdev_dequeue_request(rq);</div><div class='ctx'> 	list_add(&amp;rq-&gt;queuelist, &amp;q-&gt;tag_busy_list);</div><div class='del'>-	bqt-&gt;busy++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_queue_start_tag);</div><div class='head'>diff --git a/block/bsg.c b/block/bsg.c<br/>index 5a68b09a69ba..0aae8d7ba99c 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/bsg.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>block/bsg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/bsg.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>block/bsg.c</a></div><div class='hunk'>@@ -45,8 +45,6 @@ struct bsg_device {</div><div class='ctx'> 	char name[BUS_ID_SIZE];</div><div class='ctx'> 	int max_queue;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct blk_scsi_cmd_filter *cmd_filter;</div><div class='del'>-	mode_t *f_mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -174,7 +172,8 @@ unlock:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,</div><div class='del'>-				struct sg_io_v4 *hdr, struct bsg_device *bd)</div><div class='add'>+				struct sg_io_v4 *hdr, struct bsg_device *bd,</div><div class='add'>+				int has_write_perm)</div><div class='ctx'> {</div><div class='ctx'> 	if (hdr-&gt;request_len &gt; BLK_MAX_CDB) {</div><div class='ctx'> 		rq-&gt;cmd = kzalloc(hdr-&gt;request_len, GFP_KERNEL);</div><div class='hunk'>@@ -187,8 +186,7 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (hdr-&gt;subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {</div><div class='del'>-		if (blk_cmd_filter_verify_command(bd-&gt;cmd_filter, rq-&gt;cmd,</div><div class='del'>-						 bd-&gt;f_mode))</div><div class='add'>+		if (blk_verify_command(&amp;q-&gt;cmd_filter, rq-&gt;cmd, has_write_perm))</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 	} else if (!capable(CAP_SYS_RAWIO))</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -244,7 +242,7 @@ bsg_validate_sgv4_hdr(struct request_queue *q, struct sg_io_v4 *hdr, int *rw)</div><div class='ctx'>  * map sg_io_v4 to a request.</div><div class='ctx'>  */</div><div class='ctx'> static struct request *</div><div class='del'>-bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr)</div><div class='add'>+bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, int has_write_perm)</div><div class='ctx'> {</div><div class='ctx'> 	struct request_queue *q = bd-&gt;queue;</div><div class='ctx'> 	struct request *rq, *next_rq = NULL;</div><div class='hunk'>@@ -266,7 +264,7 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr)</div><div class='ctx'> 	rq = blk_get_request(q, rw, GFP_KERNEL);</div><div class='ctx'> 	if (!rq)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	ret = blk_fill_sgv4_hdr_rq(q, rq, hdr, bd);</div><div class='add'>+	ret = blk_fill_sgv4_hdr_rq(q, rq, hdr, bd, has_write_perm);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -568,25 +566,6 @@ static inline void bsg_set_block(struct bsg_device *bd, struct file *file)</div><div class='ctx'> 		set_bit(BSG_F_BLOCK, &amp;bd-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bsg_set_cmd_filter(struct bsg_device *bd,</div><div class='del'>-			   struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	struct gendisk *disk;</div><div class='del'>-</div><div class='del'>-	if (!file)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	inode = file-&gt;f_dentry-&gt;d_inode;</div><div class='del'>-	if (!inode)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	disk = inode-&gt;i_bdev-&gt;bd_disk;</div><div class='del'>-</div><div class='del'>-	bd-&gt;cmd_filter = &amp;disk-&gt;cmd_filter;</div><div class='del'>-	bd-&gt;f_mode = &amp;file-&gt;f_mode;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Check if the error is a "real" error that we should return.</div><div class='ctx'>  */</div><div class='hunk'>@@ -608,7 +587,6 @@ bsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)</div><div class='ctx'> 	dprintk("%s: read %Zd bytes\n", bd-&gt;name, count);</div><div class='ctx'> </div><div class='ctx'> 	bsg_set_block(bd, file);</div><div class='del'>-	bsg_set_cmd_filter(bd, file);</div><div class='ctx'> </div><div class='ctx'> 	bytes_read = 0;</div><div class='ctx'> 	ret = __bsg_read(buf, count, bd, NULL, &amp;bytes_read);</div><div class='hunk'>@@ -621,7 +599,7 @@ bsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __bsg_write(struct bsg_device *bd, const char __user *buf,</div><div class='del'>-		       size_t count, ssize_t *bytes_written)</div><div class='add'>+		       size_t count, ssize_t *bytes_written, int has_write_perm)</div><div class='ctx'> {</div><div class='ctx'> 	struct bsg_command *bc;</div><div class='ctx'> 	struct request *rq;</div><div class='hunk'>@@ -652,7 +630,7 @@ static int __bsg_write(struct bsg_device *bd, const char __user *buf,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * get a request, fill in the blanks, and add to request queue</div><div class='ctx'> 		 */</div><div class='del'>-		rq = bsg_map_hdr(bd, &amp;bc-&gt;hdr);</div><div class='add'>+		rq = bsg_map_hdr(bd, &amp;bc-&gt;hdr, has_write_perm);</div><div class='ctx'> 		if (IS_ERR(rq)) {</div><div class='ctx'> 			ret = PTR_ERR(rq);</div><div class='ctx'> 			rq = NULL;</div><div class='hunk'>@@ -683,10 +661,11 @@ bsg_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)</div><div class='ctx'> 	dprintk("%s: write %Zd bytes\n", bd-&gt;name, count);</div><div class='ctx'> </div><div class='ctx'> 	bsg_set_block(bd, file);</div><div class='del'>-	bsg_set_cmd_filter(bd, file);</div><div class='ctx'> </div><div class='ctx'> 	bytes_written = 0;</div><div class='del'>-	ret = __bsg_write(bd, buf, count, &amp;bytes_written);</div><div class='add'>+	ret = __bsg_write(bd, buf, count, &amp;bytes_written,</div><div class='add'>+			  file-&gt;f_mode &amp; FMODE_WRITE);</div><div class='add'>+</div><div class='ctx'> 	*ppos = bytes_written;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -792,7 +771,6 @@ static struct bsg_device *bsg_add_device(struct inode *inode,</div><div class='ctx'> 	bd-&gt;queue = rq;</div><div class='ctx'> </div><div class='ctx'> 	bsg_set_block(bd, file);</div><div class='del'>-	bsg_set_cmd_filter(bd, file);</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;bd-&gt;ref_count, 1);</div><div class='ctx'> 	mutex_lock(&amp;bsg_mutex);</div><div class='hunk'>@@ -943,7 +921,7 @@ static long bsg_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		if (copy_from_user(&amp;hdr, uarg, sizeof(hdr)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		rq = bsg_map_hdr(bd, &amp;hdr);</div><div class='add'>+		rq = bsg_map_hdr(bd, &amp;hdr, file-&gt;f_mode &amp; FMODE_WRITE);</div><div class='ctx'> 		if (IS_ERR(rq))</div><div class='ctx'> 			return PTR_ERR(rq);</div><div class='ctx'> </div><div class='head'>diff --git a/block/cmd-filter.c b/block/cmd-filter.c<br/>index eec4404fd357..79c14996ac11 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/cmd-filter.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>block/cmd-filter.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/cmd-filter.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>block/cmd-filter.c</a></div><div class='hunk'>@@ -20,15 +20,14 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/genhd.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='ctx'> #include &lt;linux/cdrom.h&gt;</div><div class='ctx'> </div><div class='del'>-int blk_cmd_filter_verify_command(struct blk_scsi_cmd_filter *filter,</div><div class='del'>-				  unsigned char *cmd, mode_t *f_mode)</div><div class='add'>+int blk_verify_command(struct blk_cmd_filter *filter,</div><div class='add'>+		       unsigned char *cmd, int has_write_perm)</div><div class='ctx'> {</div><div class='ctx'> 	/* root can do any command. */</div><div class='ctx'> 	if (capable(CAP_SYS_RAWIO))</div><div class='hunk'>@@ -43,34 +42,16 @@ int blk_cmd_filter_verify_command(struct blk_scsi_cmd_filter *filter,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Write-safe commands require a writable open */</div><div class='del'>-	if (test_bit(cmd[0], filter-&gt;write_ok) &amp;&amp; (*f_mode &amp; FMODE_WRITE))</div><div class='add'>+	if (test_bit(cmd[0], filter-&gt;write_ok) &amp;&amp; has_write_perm)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return -EPERM;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(blk_cmd_filter_verify_command);</div><div class='del'>-</div><div class='del'>-int blk_verify_command(struct file *file, unsigned char *cmd)</div><div class='del'>-{</div><div class='del'>-	struct gendisk *disk;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	if (!file)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	inode = file-&gt;f_dentry-&gt;d_inode;</div><div class='del'>-	if (!inode)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	disk = inode-&gt;i_bdev-&gt;bd_disk;</div><div class='del'>-</div><div class='del'>-	return blk_cmd_filter_verify_command(&amp;disk-&gt;cmd_filter,</div><div class='del'>-						 cmd, &amp;file-&gt;f_mode);</div><div class='del'>-}</div><div class='ctx'> EXPORT_SYMBOL(blk_verify_command);</div><div class='ctx'> </div><div class='add'>+#if 0</div><div class='ctx'> /* and now, the sysfs stuff */</div><div class='del'>-static ssize_t rcf_cmds_show(struct blk_scsi_cmd_filter *filter, char *page,</div><div class='add'>+static ssize_t rcf_cmds_show(struct blk_cmd_filter *filter, char *page,</div><div class='ctx'> 			     int rw)</div><div class='ctx'> {</div><div class='ctx'> 	char *npage = page;</div><div class='hunk'>@@ -84,8 +65,7 @@ static ssize_t rcf_cmds_show(struct blk_scsi_cmd_filter *filter, char *page,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; BLK_SCSI_MAX_CMDS; i++) {</div><div class='ctx'> 		if (test_bit(i, okbits)) {</div><div class='del'>-			sprintf(npage, "%02x", i);</div><div class='del'>-			npage += 2;</div><div class='add'>+			npage += sprintf(npage, "0x%02x", i);</div><div class='ctx'> 			if (i &lt; BLK_SCSI_MAX_CMDS - 1)</div><div class='ctx'> 				sprintf(npage++, " ");</div><div class='ctx'> 		}</div><div class='hunk'>@@ -97,57 +77,65 @@ static ssize_t rcf_cmds_show(struct blk_scsi_cmd_filter *filter, char *page,</div><div class='ctx'> 	return npage - page;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t rcf_readcmds_show(struct blk_scsi_cmd_filter *filter, char *page)</div><div class='add'>+static ssize_t rcf_readcmds_show(struct blk_cmd_filter *filter, char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return rcf_cmds_show(filter, page, READ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t rcf_writecmds_show(struct blk_scsi_cmd_filter *filter,</div><div class='add'>+static ssize_t rcf_writecmds_show(struct blk_cmd_filter *filter,</div><div class='ctx'> 				 char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return rcf_cmds_show(filter, page, WRITE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t rcf_cmds_store(struct blk_scsi_cmd_filter *filter,</div><div class='add'>+static ssize_t rcf_cmds_store(struct blk_cmd_filter *filter,</div><div class='ctx'> 			      const char *page, size_t count, int rw)</div><div class='ctx'> {</div><div class='del'>-	ssize_t ret = 0;</div><div class='ctx'> 	unsigned long okbits[BLK_SCSI_CMD_PER_LONG], *target_okbits;</div><div class='del'>-	int cmd, status, len;</div><div class='del'>-	substring_t ss;</div><div class='del'>-</div><div class='del'>-	memset(&amp;okbits, 0, sizeof(okbits));</div><div class='del'>-</div><div class='del'>-	for (len = strlen(page); len &gt; 0; len -= 3) {</div><div class='del'>-		if (len &lt; 2)</div><div class='del'>-			break;</div><div class='del'>-		ss.from = (char *) page + ret;</div><div class='del'>-		ss.to = (char *) page + ret + 2;</div><div class='del'>-		ret += 3;</div><div class='del'>-		status = match_hex(&amp;ss, &amp;cmd);</div><div class='add'>+	int cmd, set;</div><div class='add'>+	char *p, *status;</div><div class='add'>+</div><div class='add'>+	if (rw == READ) {</div><div class='add'>+		memcpy(&amp;okbits, filter-&gt;read_ok, sizeof(okbits));</div><div class='add'>+		target_okbits = filter-&gt;read_ok;</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(&amp;okbits, filter-&gt;write_ok, sizeof(okbits));</div><div class='add'>+		target_okbits = filter-&gt;write_ok;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while ((p = strsep((char **)&amp;page, " ")) != NULL) {</div><div class='add'>+		set = 1;</div><div class='add'>+</div><div class='add'>+		if (p[0] == '+') {</div><div class='add'>+			p++;</div><div class='add'>+		} else if (p[0] == '-') {</div><div class='add'>+			set = 0;</div><div class='add'>+			p++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cmd = simple_strtol(p, &amp;status, 16);</div><div class='add'>+</div><div class='ctx'> 		/* either of these cases means invalid input, so do nothing. */</div><div class='del'>-		if (status || cmd &gt;= BLK_SCSI_MAX_CMDS)</div><div class='add'>+		if ((status == p) || cmd &gt;= BLK_SCSI_MAX_CMDS)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		__set_bit(cmd, okbits);</div><div class='add'>+		if (set)</div><div class='add'>+			__set_bit(cmd, okbits);</div><div class='add'>+		else</div><div class='add'>+			__clear_bit(cmd, okbits);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rw == READ)</div><div class='del'>-		target_okbits = filter-&gt;read_ok;</div><div class='del'>-	else</div><div class='del'>-		target_okbits = filter-&gt;write_ok;</div><div class='del'>-</div><div class='del'>-	memmove(target_okbits, okbits, sizeof(okbits));</div><div class='add'>+	memcpy(target_okbits, okbits, sizeof(okbits));</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t rcf_readcmds_store(struct blk_scsi_cmd_filter *filter,</div><div class='add'>+static ssize_t rcf_readcmds_store(struct blk_cmd_filter *filter,</div><div class='ctx'> 				  const char *page, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	return rcf_cmds_store(filter, page, count, READ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t rcf_writecmds_store(struct blk_scsi_cmd_filter *filter,</div><div class='add'>+static ssize_t rcf_writecmds_store(struct blk_cmd_filter *filter,</div><div class='ctx'> 				   const char *page, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	return rcf_cmds_store(filter, page, count, WRITE);</div><div class='hunk'>@@ -155,8 +143,8 @@ static ssize_t rcf_writecmds_store(struct blk_scsi_cmd_filter *filter,</div><div class='ctx'> </div><div class='ctx'> struct rcf_sysfs_entry {</div><div class='ctx'> 	struct attribute attr;</div><div class='del'>-	ssize_t (*show)(struct blk_scsi_cmd_filter *, char *);</div><div class='del'>-	ssize_t (*store)(struct blk_scsi_cmd_filter *, const char *, size_t);</div><div class='add'>+	ssize_t (*show)(struct blk_cmd_filter *, char *);</div><div class='add'>+	ssize_t (*store)(struct blk_cmd_filter *, const char *, size_t);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct rcf_sysfs_entry rcf_readcmds_entry = {</div><div class='hunk'>@@ -183,9 +171,9 @@ static ssize_t</div><div class='ctx'> rcf_attr_show(struct kobject *kobj, struct attribute *attr, char *page)</div><div class='ctx'> {</div><div class='ctx'> 	struct rcf_sysfs_entry *entry = to_rcf(attr);</div><div class='del'>-	struct blk_scsi_cmd_filter *filter;</div><div class='add'>+	struct blk_cmd_filter *filter;</div><div class='ctx'> </div><div class='del'>-	filter = container_of(kobj, struct blk_scsi_cmd_filter, kobj);</div><div class='add'>+	filter = container_of(kobj, struct blk_cmd_filter, kobj);</div><div class='ctx'> 	if (entry-&gt;show)</div><div class='ctx'> 		return entry-&gt;show(filter, page);</div><div class='ctx'> </div><div class='hunk'>@@ -197,7 +185,7 @@ rcf_attr_store(struct kobject *kobj, struct attribute *attr,</div><div class='ctx'> 			const char *page, size_t length)</div><div class='ctx'> {</div><div class='ctx'> 	struct rcf_sysfs_entry *entry = to_rcf(attr);</div><div class='del'>-	struct blk_scsi_cmd_filter *filter;</div><div class='add'>+	struct blk_cmd_filter *filter;</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_SYS_RAWIO))</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -205,7 +193,7 @@ rcf_attr_store(struct kobject *kobj, struct attribute *attr,</div><div class='ctx'> 	if (!entry-&gt;store)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	filter = container_of(kobj, struct blk_scsi_cmd_filter, kobj);</div><div class='add'>+	filter = container_of(kobj, struct blk_cmd_filter, kobj);</div><div class='ctx'> 	return entry-&gt;store(filter, page, length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -219,116 +207,31 @@ static struct kobj_type rcf_ktype = {</div><div class='ctx'> 	.default_attrs = default_attrs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifndef MAINTENANCE_IN_CMD</div><div class='del'>-#define MAINTENANCE_IN_CMD 0xa3</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void rcf_set_defaults(struct blk_scsi_cmd_filter *filter)</div><div class='del'>-{</div><div class='del'>-	/* Basic read-only commands */</div><div class='del'>-	__set_bit(TEST_UNIT_READY, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(REQUEST_SENSE, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(READ_6, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(READ_10, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(READ_12, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(READ_16, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(READ_BUFFER, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(READ_DEFECT_DATA, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(READ_CAPACITY, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(READ_LONG, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(INQUIRY, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(MODE_SENSE, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(MODE_SENSE_10, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(LOG_SENSE, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(START_STOP, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_VERIFY_10, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(VERIFY_16, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(REPORT_LUNS, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(SERVICE_ACTION_IN, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(RECEIVE_DIAGNOSTIC, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(MAINTENANCE_IN_CMD, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_READ_BUFFER_CAPACITY, filter-&gt;read_ok);</div><div class='del'>-</div><div class='del'>-	/* Audio CD commands */</div><div class='del'>-	__set_bit(GPCMD_PLAY_CD, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_PLAY_AUDIO_10, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_PLAY_AUDIO_MSF, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_PLAY_AUDIO_TI, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_PAUSE_RESUME, filter-&gt;read_ok);</div><div class='del'>-</div><div class='del'>-	/* CD/DVD data reading */</div><div class='del'>-	__set_bit(GPCMD_READ_CD, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_READ_CD_MSF, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_READ_DISC_INFO, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_READ_CDVD_CAPACITY, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_READ_DVD_STRUCTURE, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_READ_HEADER, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_READ_TRACK_RZONE_INFO, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_READ_SUBCHANNEL, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_READ_TOC_PMA_ATIP, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_REPORT_KEY, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_SCAN, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_GET_CONFIGURATION, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_READ_FORMAT_CAPACITIES, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_GET_EVENT_STATUS_NOTIFICATION, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_GET_PERFORMANCE, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_SEEK, filter-&gt;read_ok);</div><div class='del'>-	__set_bit(GPCMD_STOP_PLAY_SCAN, filter-&gt;read_ok);</div><div class='del'>-</div><div class='del'>-	/* Basic writing commands */</div><div class='del'>-	__set_bit(WRITE_6, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(WRITE_10, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(WRITE_VERIFY, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(WRITE_12, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(WRITE_VERIFY_12, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(WRITE_16, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(WRITE_LONG, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(WRITE_LONG_2, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(ERASE, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(GPCMD_MODE_SELECT_10, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(MODE_SELECT, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(LOG_SELECT, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(GPCMD_BLANK, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(GPCMD_CLOSE_TRACK, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(GPCMD_FLUSH_CACHE, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(GPCMD_FORMAT_UNIT, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(GPCMD_REPAIR_RZONE_TRACK, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(GPCMD_RESERVE_RZONE_TRACK, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(GPCMD_SEND_DVD_STRUCTURE, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(GPCMD_SEND_EVENT, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(GPCMD_SEND_KEY, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(GPCMD_SEND_OPC, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(GPCMD_SEND_CUE_SHEET, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(GPCMD_SET_SPEED, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(GPCMD_LOAD_UNLOAD, filter-&gt;write_ok);</div><div class='del'>-	__set_bit(GPCMD_SET_STREAMING, filter-&gt;write_ok);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int blk_register_filter(struct gendisk *disk)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct blk_scsi_cmd_filter *filter = &amp;disk-&gt;cmd_filter;</div><div class='add'>+	struct blk_cmd_filter *filter = &amp;disk-&gt;queue-&gt;cmd_filter;</div><div class='ctx'> 	struct kobject *parent = kobject_get(disk-&gt;holder_dir-&gt;parent);</div><div class='ctx'> </div><div class='ctx'> 	if (!parent)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	ret = kobject_init_and_add(&amp;filter-&gt;kobj, &amp;rcf_ktype, parent,</div><div class='del'>-				 "%s", "cmd_filter");</div><div class='add'>+				   "%s", "cmd_filter");</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	rcf_set_defaults(filter);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(blk_register_filter);</div><div class='ctx'> </div><div class='ctx'> void blk_unregister_filter(struct gendisk *disk)</div><div class='ctx'> {</div><div class='del'>-	struct blk_scsi_cmd_filter *filter = &amp;disk-&gt;cmd_filter;</div><div class='add'>+	struct blk_cmd_filter *filter = &amp;disk-&gt;queue-&gt;cmd_filter;</div><div class='ctx'> </div><div class='ctx'> 	kobject_put(&amp;filter-&gt;kobj);</div><div class='ctx'> 	kobject_put(disk-&gt;holder_dir-&gt;parent);</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+EXPORT_SYMBOL(blk_unregister_filter);</div><div class='add'>+#endif</div><div class='head'>diff --git a/block/genhd.c b/block/genhd.c<br/>index c13cc77291af..e0ce23ac2ece 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/genhd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>block/genhd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/genhd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>block/genhd.c</a></div><div class='hunk'>@@ -190,7 +190,6 @@ void add_disk(struct gendisk *disk)</div><div class='ctx'> 			    disk-&gt;minors, NULL, exact_match, exact_lock, disk);</div><div class='ctx'> 	register_disk(disk);</div><div class='ctx'> 	blk_register_queue(disk);</div><div class='del'>-	blk_register_filter(disk);</div><div class='ctx'> </div><div class='ctx'> 	bdi = &amp;disk-&gt;queue-&gt;backing_dev_info;</div><div class='ctx'> 	bdi_register_dev(bdi, MKDEV(disk-&gt;major, disk-&gt;first_minor));</div><div class='hunk'>@@ -203,7 +202,6 @@ EXPORT_SYMBOL(del_gendisk);	/* in partitions/check.c */</div><div class='ctx'> </div><div class='ctx'> void unlink_gendisk(struct gendisk *disk)</div><div class='ctx'> {</div><div class='del'>-	blk_unregister_filter(disk);</div><div class='ctx'> 	sysfs_remove_link(&amp;disk-&gt;dev.kobj, "bdi");</div><div class='ctx'> 	bdi_unregister(&amp;disk-&gt;queue-&gt;backing_dev_info);</div><div class='ctx'> 	blk_unregister_queue(disk);</div><div class='hunk'>@@ -293,27 +291,30 @@ void __init printk_all_partitions(void)</div><div class='ctx'> /* iterator */</div><div class='ctx'> static int find_start(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='del'>-	loff_t k = *(loff_t *)data;</div><div class='add'>+	loff_t *k = data;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;type != &amp;disk_type)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (!k--)</div><div class='add'>+	if (!*k)</div><div class='ctx'> 		return 1;</div><div class='add'>+	(*k)--;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *part_start(struct seq_file *part, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev;</div><div class='del'>-	loff_t n = *pos;</div><div class='add'>+	loff_t k = *pos;</div><div class='ctx'> </div><div class='del'>-	if (!n)</div><div class='del'>-		seq_puts(part, "major minor  #blocks  name\n\n");</div><div class='add'>+	if (!k)</div><div class='add'>+		part-&gt;private = (void *)1LU;	/* tell show to print header */</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;block_class_lock);</div><div class='del'>-	dev = class_find_device(&amp;block_class, NULL, (void *)pos, find_start);</div><div class='del'>-	if (dev)</div><div class='add'>+	dev = class_find_device(&amp;block_class, NULL, &amp;k, find_start);</div><div class='add'>+	if (dev) {</div><div class='add'>+		put_device(dev);</div><div class='ctx'> 		return dev_to_disk(dev);</div><div class='add'>+	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -330,8 +331,10 @@ static void *part_next(struct seq_file *part, void *v, loff_t *pos)</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	++*pos;</div><div class='ctx'> 	dev = class_find_device(&amp;block_class, &amp;gp-&gt;dev, NULL, find_next);</div><div class='del'>-	if (dev)</div><div class='add'>+	if (dev) {</div><div class='add'>+		put_device(dev);</div><div class='ctx'> 		return dev_to_disk(dev);</div><div class='add'>+	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -346,6 +349,17 @@ static int show_partition(struct seq_file *part, void *v)</div><div class='ctx'> 	int n;</div><div class='ctx'> 	char buf[BDEVNAME_SIZE];</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Print header if start told us to do.  This is to preserve</div><div class='add'>+	 * the original behavior of not printing header if no</div><div class='add'>+	 * partition exists.  This hackery will be removed later with</div><div class='add'>+	 * class iteration clean up.</div><div class='add'>+	 */</div><div class='add'>+	if (part-&gt;private) {</div><div class='add'>+		seq_puts(part, "major minor  #blocks  name\n\n");</div><div class='add'>+		part-&gt;private = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Don't show non-partitionable removeable devices or empty devices */</div><div class='ctx'> 	if (!get_capacity(sgp) ||</div><div class='ctx'> 			(sgp-&gt;minors == 1 &amp;&amp; (sgp-&gt;flags &amp; GENHD_FL_REMOVABLE)))</div><div class='hunk'>@@ -568,11 +582,14 @@ static struct device_type disk_type = {</div><div class='ctx'> static void *diskstats_start(struct seq_file *part, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev;</div><div class='add'>+	loff_t k = *pos;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;block_class_lock);</div><div class='del'>-	dev = class_find_device(&amp;block_class, NULL, (void *)pos, find_start);</div><div class='del'>-	if (dev)</div><div class='add'>+	dev = class_find_device(&amp;block_class, NULL, &amp;k, find_start);</div><div class='add'>+	if (dev) {</div><div class='add'>+		put_device(dev);</div><div class='ctx'> 		return dev_to_disk(dev);</div><div class='add'>+	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -583,8 +600,10 @@ static void *diskstats_next(struct seq_file *part, void *v, loff_t *pos)</div><div class='ctx'> </div><div class='ctx'> 	++*pos;</div><div class='ctx'> 	dev = class_find_device(&amp;block_class, &amp;gp-&gt;dev, NULL, find_next);</div><div class='del'>-	if (dev)</div><div class='add'>+	if (dev) {</div><div class='add'>+		put_device(dev);</div><div class='ctx'> 		return dev_to_disk(dev);</div><div class='add'>+	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -712,10 +731,12 @@ dev_t blk_lookup_devt(const char *name, int part)</div><div class='ctx'> 	mutex_lock(&amp;block_class_lock);</div><div class='ctx'> 	find.name = name;</div><div class='ctx'> 	find.part = part;</div><div class='del'>-	dev = class_find_device(&amp;block_class, NULL, (void *)&amp;find, match_id);</div><div class='del'>-	if (dev)</div><div class='add'>+	dev = class_find_device(&amp;block_class, NULL, &amp;find, match_id);</div><div class='add'>+	if (dev) {</div><div class='add'>+		put_device(dev);</div><div class='ctx'> 		devt = MKDEV(MAJOR(dev-&gt;devt),</div><div class='ctx'> 			     MINOR(dev-&gt;devt) + part);</div><div class='add'>+	}</div><div class='ctx'> 	mutex_unlock(&amp;block_class_lock);</div><div class='ctx'> </div><div class='ctx'> 	return devt;</div><div class='head'>diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c<br/>index c5b9bcfc0a6d..ec4b7f234626 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/scsi_ioctl.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>block/scsi_ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/scsi_ioctl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>block/scsi_ioctl.c</a></div><div class='hunk'>@@ -105,12 +105,96 @@ static int sg_emulated_host(struct request_queue *q, int __user *p)</div><div class='ctx'> 	return put_user(1, p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter)</div><div class='add'>+{</div><div class='add'>+	/* Basic read-only commands */</div><div class='add'>+	__set_bit(TEST_UNIT_READY, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(REQUEST_SENSE, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(READ_6, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(READ_10, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(READ_12, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(READ_16, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(READ_BUFFER, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(READ_DEFECT_DATA, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(READ_CAPACITY, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(READ_LONG, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(INQUIRY, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(MODE_SENSE, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(MODE_SENSE_10, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(LOG_SENSE, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(START_STOP, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_VERIFY_10, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(VERIFY_16, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(REPORT_LUNS, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(SERVICE_ACTION_IN, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(RECEIVE_DIAGNOSTIC, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(MAINTENANCE_IN, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_READ_BUFFER_CAPACITY, filter-&gt;read_ok);</div><div class='add'>+</div><div class='add'>+	/* Audio CD commands */</div><div class='add'>+	__set_bit(GPCMD_PLAY_CD, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_PLAY_AUDIO_10, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_PLAY_AUDIO_MSF, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_PLAY_AUDIO_TI, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_PAUSE_RESUME, filter-&gt;read_ok);</div><div class='add'>+</div><div class='add'>+	/* CD/DVD data reading */</div><div class='add'>+	__set_bit(GPCMD_READ_CD, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_READ_CD_MSF, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_READ_DISC_INFO, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_READ_CDVD_CAPACITY, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_READ_DVD_STRUCTURE, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_READ_HEADER, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_READ_TRACK_RZONE_INFO, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_READ_SUBCHANNEL, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_READ_TOC_PMA_ATIP, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_REPORT_KEY, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_SCAN, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_GET_CONFIGURATION, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_READ_FORMAT_CAPACITIES, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_GET_EVENT_STATUS_NOTIFICATION, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_GET_PERFORMANCE, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_SEEK, filter-&gt;read_ok);</div><div class='add'>+	__set_bit(GPCMD_STOP_PLAY_SCAN, filter-&gt;read_ok);</div><div class='add'>+</div><div class='add'>+	/* Basic writing commands */</div><div class='add'>+	__set_bit(WRITE_6, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(WRITE_10, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(WRITE_VERIFY, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(WRITE_12, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(WRITE_VERIFY_12, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(WRITE_16, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(WRITE_LONG, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(WRITE_LONG_2, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(ERASE, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_MODE_SELECT_10, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(MODE_SELECT, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(LOG_SELECT, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_BLANK, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_CLOSE_TRACK, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_FLUSH_CACHE, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_FORMAT_UNIT, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_REPAIR_RZONE_TRACK, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_RESERVE_RZONE_TRACK, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_SEND_DVD_STRUCTURE, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_SEND_EVENT, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_SEND_KEY, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_SEND_OPC, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_SEND_CUE_SHEET, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_SET_SPEED, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_LOAD_UNLOAD, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(GPCMD_SET_STREAMING, filter-&gt;write_ok);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_set_cmd_filter_defaults);</div><div class='add'>+</div><div class='ctx'> static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,</div><div class='ctx'> 			     struct sg_io_hdr *hdr, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	if (copy_from_user(rq-&gt;cmd, hdr-&gt;cmdp, hdr-&gt;cmd_len))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	if (blk_verify_command(file, rq-&gt;cmd))</div><div class='add'>+	if (blk_verify_command(&amp;q-&gt;cmd_filter, rq-&gt;cmd,</div><div class='add'>+			       file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -298,7 +382,7 @@ int sg_scsi_ioctl(struct file *file, struct request_queue *q,</div><div class='ctx'> 		  struct gendisk *disk, struct scsi_ioctl_command __user *sic)</div><div class='ctx'> {</div><div class='ctx'> 	struct request *rq;</div><div class='del'>-	int err;</div><div class='add'>+	int err, write_perm = 0;</div><div class='ctx'> 	unsigned int in_len, out_len, bytes, opcode, cmdlen;</div><div class='ctx'> 	char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];</div><div class='ctx'> </div><div class='hunk'>@@ -340,7 +424,11 @@ int sg_scsi_ioctl(struct file *file, struct request_queue *q,</div><div class='ctx'> 	if (in_len &amp;&amp; copy_from_user(buffer, sic-&gt;data + cmdlen, in_len))</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	err = blk_verify_command(file, rq-&gt;cmd);</div><div class='add'>+	/* scsi_ioctl passes NULL */</div><div class='add'>+	if (file &amp;&amp; (file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='add'>+		write_perm = 1;</div><div class='add'>+</div><div class='add'>+	err = blk_verify_command(&amp;q-&gt;cmd_filter, rq-&gt;cmd, write_perm);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -518,7 +606,7 @@ int scsi_cmd_ioctl(struct file *file, struct request_queue *q,</div><div class='ctx'> 			hdr.sbp = cgc.sense;</div><div class='ctx'> 			if (hdr.sbp)</div><div class='ctx'> 				hdr.mx_sb_len = sizeof(struct request_sense);</div><div class='del'>-			hdr.timeout = cgc.timeout;</div><div class='add'>+			hdr.timeout = jiffies_to_msecs(cgc.timeout);</div><div class='ctx'> 			hdr.cmdp = ((struct cdrom_generic_command __user*) arg)-&gt;cmd;</div><div class='ctx'> 			hdr.cmd_len = sizeof(cgc.cmd);</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/async_tx/async_tx.c b/crypto/async_tx/async_tx.c<br/>index 85eaf7b1c531..e8362c1efa30 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/async_tx/async_tx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>crypto/async_tx/async_tx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/async_tx/async_tx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>crypto/async_tx/async_tx.c</a></div><div class='hunk'>@@ -137,7 +137,8 @@ async_tx_run_dependencies(struct dma_async_tx_descriptor *tx)</div><div class='ctx'> 		spin_lock_bh(&amp;next-&gt;lock);</div><div class='ctx'> 		next-&gt;parent = NULL;</div><div class='ctx'> 		_next = next-&gt;next;</div><div class='del'>-		next-&gt;next = NULL;</div><div class='add'>+		if (_next &amp;&amp; _next-&gt;chan == chan)</div><div class='add'>+			next-&gt;next = NULL;</div><div class='ctx'> 		spin_unlock_bh(&amp;next-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		next-&gt;tx_submit(next);</div><div class='head'>diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c<br/>index 65974c6d3d7a..c029d3eb9ef0 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/async_tx/async_xor.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>crypto/async_tx/async_xor.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/async_tx/async_xor.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>crypto/async_tx/async_xor.c</a></div><div class='hunk'>@@ -263,11 +263,12 @@ async_xor_zero_sum(struct page *dest, struct page **src_list,</div><div class='ctx'> 		if (unlikely(!tx)) {</div><div class='ctx'> 			async_tx_quiesce(&amp;depend_tx);</div><div class='ctx'> </div><div class='del'>-			while (!tx)</div><div class='add'>+			while (!tx) {</div><div class='ctx'> 				dma_async_issue_pending(chan);</div><div class='ctx'> 				tx = device-&gt;device_prep_dma_zero_sum(chan,</div><div class='ctx'> 					dma_src, src_cnt, len, result,</div><div class='ctx'> 					dma_prep_flags);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		async_tx_submit(chan, tx, flags, depend_tx, cb_fn, cb_param);</div><div class='head'>diff --git a/crypto/authenc.c b/crypto/authenc.c<br/>index 4b226768752a..fd9f06c63d76 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/authenc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>crypto/authenc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/authenc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>crypto/authenc.c</a></div><div class='hunk'>@@ -174,8 +174,9 @@ static int crypto_authenc_genicv(struct aead_request *req, u8 *iv,</div><div class='ctx'> static void crypto_authenc_encrypt_done(struct crypto_async_request *req,</div><div class='ctx'> 					int err)</div><div class='ctx'> {</div><div class='add'>+	struct aead_request *areq = req-&gt;data;</div><div class='add'>+</div><div class='ctx'> 	if (!err) {</div><div class='del'>-		struct aead_request *areq = req-&gt;data;</div><div class='ctx'> 		struct crypto_aead *authenc = crypto_aead_reqtfm(areq);</div><div class='ctx'> 		struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);</div><div class='ctx'> 		struct ablkcipher_request *abreq = aead_request_ctx(areq);</div><div class='hunk'>@@ -185,7 +186,7 @@ static void crypto_authenc_encrypt_done(struct crypto_async_request *req,</div><div class='ctx'> 		err = crypto_authenc_genicv(areq, iv, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	aead_request_complete(req-&gt;data, err);</div><div class='add'>+	aead_request_complete(areq, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int crypto_authenc_encrypt(struct aead_request *req)</div><div class='hunk'>@@ -216,14 +217,15 @@ static int crypto_authenc_encrypt(struct aead_request *req)</div><div class='ctx'> static void crypto_authenc_givencrypt_done(struct crypto_async_request *req,</div><div class='ctx'> 					   int err)</div><div class='ctx'> {</div><div class='add'>+	struct aead_request *areq = req-&gt;data;</div><div class='add'>+</div><div class='ctx'> 	if (!err) {</div><div class='del'>-		struct aead_request *areq = req-&gt;data;</div><div class='ctx'> 		struct skcipher_givcrypt_request *greq = aead_request_ctx(areq);</div><div class='ctx'> </div><div class='ctx'> 		err = crypto_authenc_genicv(areq, greq-&gt;giv, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	aead_request_complete(req-&gt;data, err);</div><div class='add'>+	aead_request_complete(areq, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int crypto_authenc_givencrypt(struct aead_givcrypt_request *req)</div><div class='head'>diff --git a/crypto/camellia.c b/crypto/camellia.c<br/>index b1cc4de6493c..493fee7e0a8b 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/camellia.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>crypto/camellia.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/camellia.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>crypto/camellia.c</a></div><div class='hunk'>@@ -35,8 +35,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> static const u32 camellia_sp1110[256] = {</div><div class='ctx'> 	0x70707000,0x82828200,0x2c2c2c00,0xececec00,</div><div class='hunk'>@@ -337,6 +335,20 @@ static const u32 camellia_sp4404[256] = {</div><div class='ctx'> /*</div><div class='ctx'>  *  macros</div><div class='ctx'>  */</div><div class='add'>+#define GETU32(v, pt) \</div><div class='add'>+    do { \</div><div class='add'>+	/* latest breed of gcc is clever enough to use move */ \</div><div class='add'>+	memcpy(&amp;(v), (pt), 4); \</div><div class='add'>+	(v) = be32_to_cpu(v); \</div><div class='add'>+    } while(0)</div><div class='add'>+</div><div class='add'>+/* rotation right shift 1byte */</div><div class='add'>+#define ROR8(x) (((x) &gt;&gt; 8) + ((x) &lt;&lt; 24))</div><div class='add'>+/* rotation left shift 1bit */</div><div class='add'>+#define ROL1(x) (((x) &lt;&lt; 1) + ((x) &gt;&gt; 31))</div><div class='add'>+/* rotation left shift 1byte */</div><div class='add'>+#define ROL8(x) (((x) &lt;&lt; 8) + ((x) &gt;&gt; 24))</div><div class='add'>+</div><div class='ctx'> #define ROLDQ(ll, lr, rl, rr, w0, w1, bits)		\</div><div class='ctx'>     do {						\</div><div class='ctx'> 	w0 = ll;					\</div><div class='hunk'>@@ -371,7 +383,7 @@ static const u32 camellia_sp4404[256] = {</div><div class='ctx'> 	   ^ camellia_sp3033[(u8)(il &gt;&gt; 8)]			\</div><div class='ctx'> 	   ^ camellia_sp4404[(u8)(il     )];			\</div><div class='ctx'> 	yl ^= yr;						\</div><div class='del'>-	yr = ror32(yr, 8);					\</div><div class='add'>+	yr = ROR8(yr);						\</div><div class='ctx'> 	yr ^= yl;						\</div><div class='ctx'>     } while(0)</div><div class='ctx'> </div><div class='hunk'>@@ -393,7 +405,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max)</div><div class='ctx'> 	subL[7] ^= subL[1]; subR[7] ^= subR[1];</div><div class='ctx'> 	subL[1] ^= subR[1] &amp; ~subR[9];</div><div class='ctx'> 	dw = subL[1] &amp; subL[9],</div><div class='del'>-		subR[1] ^= rol32(dw, 1); /* modified for FLinv(kl2) */</div><div class='add'>+		subR[1] ^= ROL1(dw); /* modified for FLinv(kl2) */</div><div class='ctx'> 	/* round 8 */</div><div class='ctx'> 	subL[11] ^= subL[1]; subR[11] ^= subR[1];</div><div class='ctx'> 	/* round 10 */</div><div class='hunk'>@@ -402,7 +414,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max)</div><div class='ctx'> 	subL[15] ^= subL[1]; subR[15] ^= subR[1];</div><div class='ctx'> 	subL[1] ^= subR[1] &amp; ~subR[17];</div><div class='ctx'> 	dw = subL[1] &amp; subL[17],</div><div class='del'>-		subR[1] ^= rol32(dw, 1); /* modified for FLinv(kl4) */</div><div class='add'>+		subR[1] ^= ROL1(dw); /* modified for FLinv(kl4) */</div><div class='ctx'> 	/* round 14 */</div><div class='ctx'> 	subL[19] ^= subL[1]; subR[19] ^= subR[1];</div><div class='ctx'> 	/* round 16 */</div><div class='hunk'>@@ -418,7 +430,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		subL[1] ^= subR[1] &amp; ~subR[25];</div><div class='ctx'> 		dw = subL[1] &amp; subL[25],</div><div class='del'>-			subR[1] ^= rol32(dw, 1); /* modified for FLinv(kl6) */</div><div class='add'>+			subR[1] ^= ROL1(dw); /* modified for FLinv(kl6) */</div><div class='ctx'> 		/* round 20 */</div><div class='ctx'> 		subL[27] ^= subL[1]; subR[27] ^= subR[1];</div><div class='ctx'> 		/* round 22 */</div><div class='hunk'>@@ -438,7 +450,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max)</div><div class='ctx'> 		subL[26] ^= kw4l; subR[26] ^= kw4r;</div><div class='ctx'> 		kw4l ^= kw4r &amp; ~subR[24];</div><div class='ctx'> 		dw = kw4l &amp; subL[24],</div><div class='del'>-			kw4r ^= rol32(dw, 1); /* modified for FL(kl5) */</div><div class='add'>+			kw4r ^= ROL1(dw); /* modified for FL(kl5) */</div><div class='ctx'> 	}</div><div class='ctx'> 	/* round 17 */</div><div class='ctx'> 	subL[22] ^= kw4l; subR[22] ^= kw4r;</div><div class='hunk'>@@ -448,7 +460,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max)</div><div class='ctx'> 	subL[18] ^= kw4l; subR[18] ^= kw4r;</div><div class='ctx'> 	kw4l ^= kw4r &amp; ~subR[16];</div><div class='ctx'> 	dw = kw4l &amp; subL[16],</div><div class='del'>-		kw4r ^= rol32(dw, 1); /* modified for FL(kl3) */</div><div class='add'>+		kw4r ^= ROL1(dw); /* modified for FL(kl3) */</div><div class='ctx'> 	/* round 11 */</div><div class='ctx'> 	subL[14] ^= kw4l; subR[14] ^= kw4r;</div><div class='ctx'> 	/* round 9 */</div><div class='hunk'>@@ -457,7 +469,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max)</div><div class='ctx'> 	subL[10] ^= kw4l; subR[10] ^= kw4r;</div><div class='ctx'> 	kw4l ^= kw4r &amp; ~subR[8];</div><div class='ctx'> 	dw = kw4l &amp; subL[8],</div><div class='del'>-		kw4r ^= rol32(dw, 1); /* modified for FL(kl1) */</div><div class='add'>+		kw4r ^= ROL1(dw); /* modified for FL(kl1) */</div><div class='ctx'> 	/* round 5 */</div><div class='ctx'> 	subL[6] ^= kw4l; subR[6] ^= kw4r;</div><div class='ctx'> 	/* round 3 */</div><div class='hunk'>@@ -482,7 +494,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max)</div><div class='ctx'> 	SUBKEY_R(6) = subR[5] ^ subR[7];</div><div class='ctx'> 	tl = subL[10] ^ (subR[10] &amp; ~subR[8]);</div><div class='ctx'> 	dw = tl &amp; subL[8],  /* FL(kl1) */</div><div class='del'>-		tr = subR[10] ^ rol32(dw, 1);</div><div class='add'>+		tr = subR[10] ^ ROL1(dw);</div><div class='ctx'> 	SUBKEY_L(7) = subL[6] ^ tl; /* round 6 */</div><div class='ctx'> 	SUBKEY_R(7) = subR[6] ^ tr;</div><div class='ctx'> 	SUBKEY_L(8) = subL[8];       /* FL(kl1) */</div><div class='hunk'>@@ -491,7 +503,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max)</div><div class='ctx'> 	SUBKEY_R(9) = subR[9];</div><div class='ctx'> 	tl = subL[7] ^ (subR[7] &amp; ~subR[9]);</div><div class='ctx'> 	dw = tl &amp; subL[9],  /* FLinv(kl2) */</div><div class='del'>-		tr = subR[7] ^ rol32(dw, 1);</div><div class='add'>+		tr = subR[7] ^ ROL1(dw);</div><div class='ctx'> 	SUBKEY_L(10) = tl ^ subL[11]; /* round 7 */</div><div class='ctx'> 	SUBKEY_R(10) = tr ^ subR[11];</div><div class='ctx'> 	SUBKEY_L(11) = subL[10] ^ subL[12]; /* round 8 */</div><div class='hunk'>@@ -504,7 +516,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max)</div><div class='ctx'> 	SUBKEY_R(14) = subR[13] ^ subR[15];</div><div class='ctx'> 	tl = subL[18] ^ (subR[18] &amp; ~subR[16]);</div><div class='ctx'> 	dw = tl &amp; subL[16], /* FL(kl3) */</div><div class='del'>-		tr = subR[18] ^ rol32(dw, 1);</div><div class='add'>+		tr = subR[18] ^ ROL1(dw);</div><div class='ctx'> 	SUBKEY_L(15) = subL[14] ^ tl; /* round 12 */</div><div class='ctx'> 	SUBKEY_R(15) = subR[14] ^ tr;</div><div class='ctx'> 	SUBKEY_L(16) = subL[16];     /* FL(kl3) */</div><div class='hunk'>@@ -513,7 +525,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max)</div><div class='ctx'> 	SUBKEY_R(17) = subR[17];</div><div class='ctx'> 	tl = subL[15] ^ (subR[15] &amp; ~subR[17]);</div><div class='ctx'> 	dw = tl &amp; subL[17], /* FLinv(kl4) */</div><div class='del'>-		tr = subR[15] ^ rol32(dw, 1);</div><div class='add'>+		tr = subR[15] ^ ROL1(dw);</div><div class='ctx'> 	SUBKEY_L(18) = tl ^ subL[19]; /* round 13 */</div><div class='ctx'> 	SUBKEY_R(18) = tr ^ subR[19];</div><div class='ctx'> 	SUBKEY_L(19) = subL[18] ^ subL[20]; /* round 14 */</div><div class='hunk'>@@ -532,7 +544,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		tl = subL[26] ^ (subR[26] &amp; ~subR[24]);</div><div class='ctx'> 		dw = tl &amp; subL[24], /* FL(kl5) */</div><div class='del'>-			tr = subR[26] ^ rol32(dw, 1);</div><div class='add'>+			tr = subR[26] ^ ROL1(dw);</div><div class='ctx'> 		SUBKEY_L(23) = subL[22] ^ tl; /* round 18 */</div><div class='ctx'> 		SUBKEY_R(23) = subR[22] ^ tr;</div><div class='ctx'> 		SUBKEY_L(24) = subL[24];     /* FL(kl5) */</div><div class='hunk'>@@ -541,7 +553,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max)</div><div class='ctx'> 		SUBKEY_R(25) = subR[25];</div><div class='ctx'> 		tl = subL[23] ^ (subR[23] &amp; ~subR[25]);</div><div class='ctx'> 		dw = tl &amp; subL[25], /* FLinv(kl6) */</div><div class='del'>-			tr = subR[23] ^ rol32(dw, 1);</div><div class='add'>+			tr = subR[23] ^ ROL1(dw);</div><div class='ctx'> 		SUBKEY_L(26) = tl ^ subL[27]; /* round 19 */</div><div class='ctx'> 		SUBKEY_R(26) = tr ^ subR[27];</div><div class='ctx'> 		SUBKEY_L(27) = subL[26] ^ subL[28]; /* round 20 */</div><div class='hunk'>@@ -561,17 +573,17 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max)</div><div class='ctx'> 	/* apply the inverse of the last half of P-function */</div><div class='ctx'> 	i = 2;</div><div class='ctx'> 	do {</div><div class='del'>-		dw = SUBKEY_L(i + 0) ^ SUBKEY_R(i + 0); dw = rol32(dw, 8);/* round 1 */</div><div class='add'>+		dw = SUBKEY_L(i + 0) ^ SUBKEY_R(i + 0); dw = ROL8(dw);/* round 1 */</div><div class='ctx'> 		SUBKEY_R(i + 0) = SUBKEY_L(i + 0) ^ dw; SUBKEY_L(i + 0) = dw;</div><div class='del'>-		dw = SUBKEY_L(i + 1) ^ SUBKEY_R(i + 1); dw = rol32(dw, 8);/* round 2 */</div><div class='add'>+		dw = SUBKEY_L(i + 1) ^ SUBKEY_R(i + 1); dw = ROL8(dw);/* round 2 */</div><div class='ctx'> 		SUBKEY_R(i + 1) = SUBKEY_L(i + 1) ^ dw; SUBKEY_L(i + 1) = dw;</div><div class='del'>-		dw = SUBKEY_L(i + 2) ^ SUBKEY_R(i + 2); dw = rol32(dw, 8);/* round 3 */</div><div class='add'>+		dw = SUBKEY_L(i + 2) ^ SUBKEY_R(i + 2); dw = ROL8(dw);/* round 3 */</div><div class='ctx'> 		SUBKEY_R(i + 2) = SUBKEY_L(i + 2) ^ dw; SUBKEY_L(i + 2) = dw;</div><div class='del'>-		dw = SUBKEY_L(i + 3) ^ SUBKEY_R(i + 3); dw = rol32(dw, 8);/* round 4 */</div><div class='add'>+		dw = SUBKEY_L(i + 3) ^ SUBKEY_R(i + 3); dw = ROL8(dw);/* round 4 */</div><div class='ctx'> 		SUBKEY_R(i + 3) = SUBKEY_L(i + 3) ^ dw; SUBKEY_L(i + 3) = dw;</div><div class='del'>-		dw = SUBKEY_L(i + 4) ^ SUBKEY_R(i + 4); dw = rol32(dw, 9);/* round 5 */</div><div class='add'>+		dw = SUBKEY_L(i + 4) ^ SUBKEY_R(i + 4); dw = ROL8(dw);/* round 5 */</div><div class='ctx'> 		SUBKEY_R(i + 4) = SUBKEY_L(i + 4) ^ dw; SUBKEY_L(i + 4) = dw;</div><div class='del'>-		dw = SUBKEY_L(i + 5) ^ SUBKEY_R(i + 5); dw = rol32(dw, 8);/* round 6 */</div><div class='add'>+		dw = SUBKEY_L(i + 5) ^ SUBKEY_R(i + 5); dw = ROL8(dw);/* round 6 */</div><div class='ctx'> 		SUBKEY_R(i + 5) = SUBKEY_L(i + 5) ^ dw; SUBKEY_L(i + 5) = dw;</div><div class='ctx'> 		i += 8;</div><div class='ctx'> 	} while (i &lt; max);</div><div class='hunk'>@@ -587,10 +599,10 @@ static void camellia_setup128(const unsigned char *key, u32 *subkey)</div><div class='ctx'> 	/**</div><div class='ctx'> 	 *  k == kll || klr || krl || krr (|| is concatenation)</div><div class='ctx'> 	 */</div><div class='del'>-	kll = get_unaligned_be32(key);</div><div class='del'>-	klr = get_unaligned_be32(key + 4);</div><div class='del'>-	krl = get_unaligned_be32(key + 8);</div><div class='del'>-	krr = get_unaligned_be32(key + 12);</div><div class='add'>+	GETU32(kll, key     );</div><div class='add'>+	GETU32(klr, key +  4);</div><div class='add'>+	GETU32(krl, key +  8);</div><div class='add'>+	GETU32(krr, key + 12);</div><div class='ctx'> </div><div class='ctx'> 	/* generate KL dependent subkeys */</div><div class='ctx'> 	/* kw1 */</div><div class='hunk'>@@ -695,14 +707,14 @@ static void camellia_setup256(const unsigned char *key, u32 *subkey)</div><div class='ctx'> 	 *  key = (kll || klr || krl || krr || krll || krlr || krrl || krrr)</div><div class='ctx'> 	 *  (|| is concatenation)</div><div class='ctx'> 	 */</div><div class='del'>-	kll = get_unaligned_be32(key);</div><div class='del'>-	klr = get_unaligned_be32(key + 4);</div><div class='del'>-	krl = get_unaligned_be32(key + 8);</div><div class='del'>-	krr = get_unaligned_be32(key + 12);</div><div class='del'>-	krll = get_unaligned_be32(key + 16);</div><div class='del'>-	krlr = get_unaligned_be32(key + 20);</div><div class='del'>-	krrl = get_unaligned_be32(key + 24);</div><div class='del'>-	krrr = get_unaligned_be32(key + 28);</div><div class='add'>+	GETU32(kll,  key     );</div><div class='add'>+	GETU32(klr,  key +  4);</div><div class='add'>+	GETU32(krl,  key +  8);</div><div class='add'>+	GETU32(krr,  key + 12);</div><div class='add'>+	GETU32(krll, key + 16);</div><div class='add'>+	GETU32(krlr, key + 20);</div><div class='add'>+	GETU32(krrl, key + 24);</div><div class='add'>+	GETU32(krrr, key + 28);</div><div class='ctx'> </div><div class='ctx'> 	/* generate KL dependent subkeys */</div><div class='ctx'> 	/* kw1 */</div><div class='hunk'>@@ -858,13 +870,13 @@ static void camellia_setup192(const unsigned char *key, u32 *subkey)</div><div class='ctx'> 	t0 &amp;= ll;							\</div><div class='ctx'> 	t2 |= rr;							\</div><div class='ctx'> 	rl ^= t2;							\</div><div class='del'>-	lr ^= rol32(t0, 1);						\</div><div class='add'>+	lr ^= ROL1(t0);							\</div><div class='ctx'> 	t3 = krl;							\</div><div class='ctx'> 	t1 = klr;							\</div><div class='ctx'> 	t3 &amp;= rl;							\</div><div class='ctx'> 	t1 |= lr;							\</div><div class='ctx'> 	ll ^= t1;							\</div><div class='del'>-	rr ^= rol32(t3, 1);						\</div><div class='add'>+	rr ^= ROL1(t3);							\</div><div class='ctx'>     } while(0)</div><div class='ctx'> </div><div class='ctx'> #define CAMELLIA_ROUNDSM(xl, xr, kl, kr, yl, yr, il, ir)		\</div><div class='hunk'>@@ -880,7 +892,7 @@ static void camellia_setup192(const unsigned char *key, u32 *subkey)</div><div class='ctx'> 	il ^= kl;							\</div><div class='ctx'> 	ir ^= il ^ kr;							\</div><div class='ctx'> 	yl ^= ir;							\</div><div class='del'>-	yr ^= ror32(il, 8) ^ ir;						\</div><div class='add'>+	yr ^= ROR8(il) ^ ir;						\</div><div class='ctx'>     } while(0)</div><div class='ctx'> </div><div class='ctx'> /* max = 24: 128bit encrypt, max = 32: 256bit encrypt */</div><div class='head'>diff --git a/crypto/digest.c b/crypto/digest.c<br/>index ac0919460d14..5d3f1303da98 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/digest.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>crypto/digest.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/digest.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>crypto/digest.c</a></div><div class='hunk'>@@ -225,7 +225,7 @@ int crypto_init_digest_ops_async(struct crypto_tfm *tfm)</div><div class='ctx'> 	struct ahash_tfm  *crt  = &amp;tfm-&gt;crt_ahash;</div><div class='ctx'> 	struct digest_alg *dalg = &amp;tfm-&gt;__crt_alg-&gt;cra_digest;</div><div class='ctx'> </div><div class='del'>-	if (dalg-&gt;dia_digestsize &gt; crypto_tfm_alg_blocksize(tfm))</div><div class='add'>+	if (dalg-&gt;dia_digestsize &gt; PAGE_SIZE / 8)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	crt-&gt;init       = digest_async_init;</div><div class='head'>diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c<br/>index 59821a22d752..66368022e0bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/tcrypt.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>crypto/tcrypt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/tcrypt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>crypto/tcrypt.c</a></div><div class='hunk'>@@ -481,21 +481,31 @@ next_one:</div><div class='ctx'> </div><div class='ctx'> 			for (k = 0, temp = 0; k &lt; template[i].np; k++) {</div><div class='ctx'> 				printk(KERN_INFO "page %u\n", k);</div><div class='del'>-				q = &amp;axbuf[IDX[k]];</div><div class='del'>-				hexdump(q, template[i].tap[k]);</div><div class='add'>+				q = &amp;xbuf[IDX[k]];</div><div class='add'>+</div><div class='add'>+				n = template[i].tap[k];</div><div class='add'>+				if (k == template[i].np - 1)</div><div class='add'>+					n += enc ? authsize : -authsize;</div><div class='add'>+				hexdump(q, n);</div><div class='ctx'> 				printk(KERN_INFO "%s\n",</div><div class='del'>-				       memcmp(q, template[i].result + temp,</div><div class='del'>-					      template[i].tap[k] -</div><div class='del'>-					      (k &lt; template[i].np - 1 || enc ?</div><div class='del'>-					       0 : authsize)) ?</div><div class='add'>+				       memcmp(q, template[i].result + temp, n) ?</div><div class='ctx'> 				       "fail" : "pass");</div><div class='ctx'> </div><div class='del'>-				for (n = 0; q[template[i].tap[k] + n]; n++)</div><div class='del'>-					;</div><div class='add'>+				q += n;</div><div class='add'>+				if (k == template[i].np - 1 &amp;&amp; !enc) {</div><div class='add'>+					if (memcmp(q, template[i].input +</div><div class='add'>+						      temp + n, authsize))</div><div class='add'>+						n = authsize;</div><div class='add'>+					else</div><div class='add'>+						n = 0;</div><div class='add'>+				} else {</div><div class='add'>+					for (n = 0; q[n]; n++)</div><div class='add'>+						;</div><div class='add'>+				}</div><div class='ctx'> 				if (n) {</div><div class='ctx'> 					printk("Result buffer corruption %u "</div><div class='ctx'> 					       "bytes:\n", n);</div><div class='del'>-					hexdump(&amp;q[template[i].tap[k]], n);</div><div class='add'>+					hexdump(q, n);</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				temp += template[i].tap[k];</div><div class='head'>diff --git a/drivers/Makefile b/drivers/Makefile<br/>index 54ec5e718c0e..2735bde73475 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/Makefile</a></div><div class='hunk'>@@ -57,6 +57,7 @@ obj-$(CONFIG_ATA_OVER_ETH)	+= block/aoe/</div><div class='ctx'> obj-$(CONFIG_PARIDE) 		+= block/paride/</div><div class='ctx'> obj-$(CONFIG_TC)		+= tc/</div><div class='ctx'> obj-$(CONFIG_USB)		+= usb/</div><div class='add'>+obj-$(CONFIG_USB_MUSB_HDRC)	+= usb/musb/</div><div class='ctx'> obj-$(CONFIG_PCI)		+= usb/</div><div class='ctx'> obj-$(CONFIG_USB_GADGET)	+= usb/gadget/</div><div class='ctx'> obj-$(CONFIG_SERIO)		+= input/serio/</div><div class='hunk'>@@ -97,3 +98,4 @@ obj-$(CONFIG_PPC_PS3)		+= ps3/</div><div class='ctx'> obj-$(CONFIG_OF)		+= of/</div><div class='ctx'> obj-$(CONFIG_SSB)		+= ssb/</div><div class='ctx'> obj-$(CONFIG_VIRTIO)		+= virtio/</div><div class='add'>+obj-$(CONFIG_REGULATOR)		+= regulator/</div><div class='head'>diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c<br/>index 44ad90c03c2e..d3d0886d637f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/asus_acpi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/asus_acpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/asus_acpi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/asus_acpi.c</a></div><div class='hunk'>@@ -78,9 +78,9 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> static uid_t asus_uid;</div><div class='ctx'> static gid_t asus_gid;</div><div class='ctx'> module_param(asus_uid, uint, 0);</div><div class='del'>-MODULE_PARM_DESC(asus_uid, "UID for entries in /proc/acpi/asus.\n");</div><div class='add'>+MODULE_PARM_DESC(asus_uid, "UID for entries in /proc/acpi/asus");</div><div class='ctx'> module_param(asus_gid, uint, 0);</div><div class='del'>-MODULE_PARM_DESC(asus_gid, "GID for entries in /proc/acpi/asus.\n");</div><div class='add'>+MODULE_PARM_DESC(asus_gid, "GID for entries in /proc/acpi/asus");</div><div class='ctx'> </div><div class='ctx'> /* For each model, all features implemented, </div><div class='ctx'>  * those marked with R are relative to HOTK, A for absolute */</div><div class='head'>diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c<br/>index 1022e38994c2..0f2805899210 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dsobject.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/dispatcher/dsobject.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dsobject.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/dispatcher/dsobject.c</a></div><div class='hunk'>@@ -496,7 +496,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,</div><div class='ctx'> 			arg = arg-&gt;common.next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ACPI_ERROR((AE_INFO,</div><div class='add'>+		ACPI_WARNING((AE_INFO,</div><div class='ctx'> 			    "Package List length (%X) larger than NumElements count (%X), truncated\n",</div><div class='ctx'> 			    i, element_count));</div><div class='ctx'> 	} else if (i &lt; element_count) {</div><div class='head'>diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c<br/>index bb7c51f712bd..7d2edf143f16 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/dock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/dock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/dock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/dock.c</a></div><div class='hunk'>@@ -563,9 +563,6 @@ EXPORT_SYMBOL_GPL(unregister_hotplug_dock_device);</div><div class='ctx'>  */</div><div class='ctx'> static int handle_eject_request(struct dock_station *ds, u32 event)</div><div class='ctx'> {</div><div class='del'>-	if (!dock_present(ds))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='ctx'> 	if (dock_in_progress(ds))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='hunk'>@@ -573,8 +570,16 @@ static int handle_eject_request(struct dock_station *ds, u32 event)</div><div class='ctx'> 	 * here we need to generate the undock</div><div class='ctx'> 	 * event prior to actually doing the undock</div><div class='ctx'> 	 * so that the device struct still exists.</div><div class='add'>+	 * Also, even send the dock event if the</div><div class='add'>+	 * device is not present anymore</div><div class='ctx'> 	 */</div><div class='ctx'> 	dock_event(ds, event, UNDOCK_EVENT);</div><div class='add'>+</div><div class='add'>+	if (!dock_present(ds)) {</div><div class='add'>+		complete_undock(ds);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST);</div><div class='ctx'> 	undock(ds);</div><div class='ctx'> 	eject_dock(ds);</div><div class='head'>diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c<br/>index 5622aee996b2..13593f9f2197 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/ec.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/ec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/ec.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/ec.c</a></div><div class='hunk'>@@ -110,6 +110,31 @@ static struct acpi_ec {</div><div class='ctx'> 	u8 handlers_installed;</div><div class='ctx'> } *boot_ec, *first_ec;</div><div class='ctx'> </div><div class='add'>+/* </div><div class='add'>+ * Some Asus system have exchanged ECDT data/command IO addresses.</div><div class='add'>+ */</div><div class='add'>+static int print_ecdt_error(const struct dmi_system_id *id)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_NOTICE PREFIX "%s detected - "</div><div class='add'>+		"ECDT has exchanged control/data I/O address\n",</div><div class='add'>+		id-&gt;ident);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dmi_system_id __cpuinitdata ec_dmi_table[] = {</div><div class='add'>+	{</div><div class='add'>+	print_ecdt_error, "Asus L4R", {</div><div class='add'>+	DMI_MATCH(DMI_BIOS_VERSION, "1008.006"),</div><div class='add'>+	DMI_MATCH(DMI_PRODUCT_NAME, "L4R"),</div><div class='add'>+	DMI_MATCH(DMI_BOARD_NAME, "L4R") }, NULL},</div><div class='add'>+	{</div><div class='add'>+	print_ecdt_error, "Asus M6R", {</div><div class='add'>+	DMI_MATCH(DMI_BIOS_VERSION, "0207"),</div><div class='add'>+	DMI_MATCH(DMI_PRODUCT_NAME, "M6R"),</div><div class='add'>+	DMI_MATCH(DMI_BOARD_NAME, "M6R") }, NULL},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='ctx'>                              Transaction Management</div><div class='ctx'>    -------------------------------------------------------------------------- */</div><div class='hunk'>@@ -196,6 +221,8 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)</div><div class='ctx'> 				return 0;</div><div class='ctx'> 			msleep(1);</div><div class='ctx'> 		}</div><div class='add'>+		if (acpi_ec_check_status(ec,event))</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	pr_err(PREFIX "acpi_ec_wait timeout, status = 0x%2.2x, event = %s\n",</div><div class='ctx'> 		acpi_ec_read_status(ec),</div><div class='hunk'>@@ -911,6 +938,15 @@ int __init acpi_ec_ecdt_probe(void)</div><div class='ctx'> 		pr_info(PREFIX "EC description table is found, configuring boot EC\n");</div><div class='ctx'> 		boot_ec-&gt;command_addr = ecdt_ptr-&gt;control.address;</div><div class='ctx'> 		boot_ec-&gt;data_addr = ecdt_ptr-&gt;data.address;</div><div class='add'>+		if (dmi_check_system(ec_dmi_table)) {</div><div class='add'>+			/*</div><div class='add'>+			 * If the board falls into ec_dmi_table, it means</div><div class='add'>+			 * that ECDT table gives the incorrect command/status</div><div class='add'>+			 * &amp; data I/O address. Just fix it.</div><div class='add'>+			 */</div><div class='add'>+			boot_ec-&gt;data_addr = ecdt_ptr-&gt;control.address;</div><div class='add'>+			boot_ec-&gt;command_addr = ecdt_ptr-&gt;data.address;</div><div class='add'>+		}</div><div class='ctx'> 		boot_ec-&gt;gpe = ecdt_ptr-&gt;gpe;</div><div class='ctx'> 		boot_ec-&gt;handle = ACPI_ROOT_OBJECT;</div><div class='ctx'> 		acpi_get_handle(ACPI_ROOT_OBJECT, ecdt_ptr-&gt;id, &amp;boot_ec-&gt;handle);</div><div class='head'>diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c<br/>index 2a32c843cb4a..8892b9824fae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exconfig.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/executer/exconfig.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exconfig.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/executer/exconfig.c</a></div><div class='hunk'>@@ -479,5 +479,8 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)</div><div class='ctx'> </div><div class='ctx'> 	acpi_tb_set_table_loaded_flag(table_index, FALSE);</div><div class='ctx'> </div><div class='add'>+	/* Table unloaded, remove a reference to the ddb_handle object */</div><div class='add'>+</div><div class='add'>+	acpi_ut_remove_reference(ddb_handle);</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c<br/>index 549db42f16cf..bd5773878009 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsnames.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/namespace/nsnames.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsnames.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/namespace/nsnames.c</a></div><div class='hunk'>@@ -56,13 +56,14 @@ ACPI_MODULE_NAME("nsnames")</div><div class='ctx'>  *              Size            - Size of the pathname</div><div class='ctx'>  *              *name_buffer    - Where to return the pathname</div><div class='ctx'>  *</div><div class='del'>- * RETURN:      Places the pathname into the name_buffer, in external format</div><div class='add'>+ * RETURN:      Status</div><div class='add'>+ *              Places the pathname into the name_buffer, in external format</div><div class='ctx'>  *              (name segments separated by path separators)</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION: Generate a full pathaname</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-void</div><div class='add'>+acpi_status</div><div class='ctx'> acpi_ns_build_external_path(struct acpi_namespace_node *node,</div><div class='ctx'> 			    acpi_size size, char *name_buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -77,7 +78,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,</div><div class='ctx'> 	if (index &lt; ACPI_NAME_SIZE) {</div><div class='ctx'> 		name_buffer[0] = AML_ROOT_PREFIX;</div><div class='ctx'> 		name_buffer[1] = 0;</div><div class='del'>-		return;</div><div class='add'>+		return (AE_OK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Store terminator byte, then build name backwards */</div><div class='hunk'>@@ -105,11 +106,13 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,</div><div class='ctx'> </div><div class='ctx'> 	if (index != 0) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "Could not construct pathname; index=%X, size=%X, Path=%s",</div><div class='add'>+			    "Could not construct external pathname; index=%X, size=%X, Path=%s",</div><div class='ctx'> 			    (u32) index, (u32) size, &amp;name_buffer[size]));</div><div class='add'>+</div><div class='add'>+		return (AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return;</div><div class='add'>+	return (AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef ACPI_DEBUG_OUTPUT</div><div class='hunk'>@@ -129,6 +132,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,</div><div class='ctx'> </div><div class='ctx'> char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)</div><div class='ctx'> {</div><div class='add'>+	acpi_status status;</div><div class='ctx'> 	char *name_buffer;</div><div class='ctx'> 	acpi_size size;</div><div class='ctx'> </div><div class='hunk'>@@ -138,8 +142,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)</div><div class='ctx'> </div><div class='ctx'> 	size = acpi_ns_get_pathname_length(node);</div><div class='ctx'> 	if (!size) {</div><div class='del'>-		ACPI_ERROR((AE_INFO, "Invalid node failure"));</div><div class='del'>-		return_PTR(NULL);</div><div class='add'>+		return (NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a buffer to be returned to caller */</div><div class='hunk'>@@ -152,7 +155,11 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)</div><div class='ctx'> </div><div class='ctx'> 	/* Build the path in the allocated buffer */</div><div class='ctx'> </div><div class='del'>-	acpi_ns_build_external_path(node, size, name_buffer);</div><div class='add'>+	status = acpi_ns_build_external_path(node, size, name_buffer);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return (NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return_PTR(name_buffer);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -186,7 +193,7 @@ acpi_size acpi_ns_get_pathname_length(struct acpi_namespace_node *node)</div><div class='ctx'> 	while (next_node &amp;&amp; (next_node != acpi_gbl_root_node)) {</div><div class='ctx'> 		if (ACPI_GET_DESCRIPTOR_TYPE(next_node) != ACPI_DESC_TYPE_NAMED) {</div><div class='ctx'> 			ACPI_ERROR((AE_INFO,</div><div class='del'>-				    "Invalid NS Node (%p) while traversing path",</div><div class='add'>+				    "Invalid Namespace Node (%p) while traversing namespace",</div><div class='ctx'> 				    next_node));</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -234,8 +241,7 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle,</div><div class='ctx'> </div><div class='ctx'> 	required_size = acpi_ns_get_pathname_length(node);</div><div class='ctx'> 	if (!required_size) {</div><div class='del'>-		ACPI_ERROR((AE_INFO, "Invalid node failure"));</div><div class='del'>-		return_ACPI_STATUS(AE_ERROR);</div><div class='add'>+		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Validate/Allocate/Clear caller buffer */</div><div class='hunk'>@@ -247,7 +253,11 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle,</div><div class='ctx'> </div><div class='ctx'> 	/* Build the path in the caller buffer */</div><div class='ctx'> </div><div class='del'>-	acpi_ns_build_external_path(node, required_size, buffer-&gt;pointer);</div><div class='add'>+	status =</div><div class='add'>+	    acpi_ns_build_external_path(node, required_size, buffer-&gt;pointer);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%s [%X]\n",</div><div class='ctx'> 			  (char *)buffer-&gt;pointer, (u32) required_size));</div><div class='head'>diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c<br/>index 89f3b2abfdc7..cf47805a7448 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/pci_link.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/pci_link.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/pci_link.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/pci_link.c</a></div><div class='hunk'>@@ -849,7 +849,7 @@ static int __init acpi_irq_penalty_update(char *str, int used)</div><div class='ctx'> 		if (irq &lt; 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (irq &gt;= ACPI_MAX_IRQS)</div><div class='add'>+		if (irq &gt;= ARRAY_SIZE(acpi_irq_penalty))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (used)</div><div class='hunk'>@@ -872,10 +872,12 @@ static int __init acpi_irq_penalty_update(char *str, int used)</div><div class='ctx'>  */</div><div class='ctx'> void acpi_penalize_isa_irq(int irq, int active)</div><div class='ctx'> {</div><div class='del'>-	if (active)</div><div class='del'>-		acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED;</div><div class='del'>-	else</div><div class='del'>-		acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING;</div><div class='add'>+	if (irq &gt;= 0 &amp;&amp; irq &lt; ARRAY_SIZE(acpi_irq_penalty)) {</div><div class='add'>+		if (active)</div><div class='add'>+			acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED;</div><div class='add'>+		else</div><div class='add'>+			acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c<br/>index e36422a7122c..ee68ac54c0d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/processor_core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/processor_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/processor_core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/processor_core.c</a></div><div class='hunk'>@@ -123,7 +123,7 @@ struct acpi_processor_errata errata __read_mostly;</div><div class='ctx'> static int set_no_mwait(const struct dmi_system_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_NOTICE PREFIX "%s detected - "</div><div class='del'>-		"disable mwait for CPU C-stetes\n", id-&gt;ident);</div><div class='add'>+		"disabling mwait for CPU C-states\n", id-&gt;ident);</div><div class='ctx'> 	idle_nomwait = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -138,7 +138,7 @@ static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 	set_no_mwait, "Extensa 5220", {</div><div class='ctx'> 	DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),</div><div class='del'>-	DMI_MATCH(DMI_SYS_VENDOR, "ACER"),</div><div class='add'>+	DMI_MATCH(DMI_SYS_VENDOR, "Acer"),</div><div class='ctx'> 	DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),</div><div class='ctx'> 	DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL},</div><div class='ctx'> 	{},</div><div class='head'>diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c<br/>index 283c08f5f4d4..cf5b1b7b684f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/processor_idle.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/processor_idle.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/processor_idle.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/processor_idle.c</a></div><div class='hunk'>@@ -41,7 +41,6 @@</div><div class='ctx'> #include &lt;linux/pm_qos_params.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/cpuidle.h&gt;</div><div class='del'>-#include &lt;linux/cpuidle.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Include the apic definitions for x86 to have the APIC timer related defines</div><div class='head'>diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c<br/>index b4749969c6b4..80c251ec6d2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/processor_perflib.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/processor_perflib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/processor_perflib.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/processor_perflib.c</a></div><div class='hunk'>@@ -64,15 +64,21 @@ static DEFINE_MUTEX(performance_mutex);</div><div class='ctx'>  * policy is adjusted accordingly.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int ignore_ppc = 0;</div><div class='del'>-module_param(ignore_ppc, uint, 0644);</div><div class='add'>+/* ignore_ppc:</div><div class='add'>+ * -1 -&gt; cpufreq low level drivers not initialized -&gt; _PSS, etc. not called yet</div><div class='add'>+ *       ignore _PPC</div><div class='add'>+ *  0 -&gt; cpufreq low level drivers initialized -&gt; consider _PPC values</div><div class='add'>+ *  1 -&gt; ignore _PPC totally -&gt; forced by user through boot param</div><div class='add'>+ */</div><div class='add'>+static int ignore_ppc = -1;</div><div class='add'>+module_param(ignore_ppc, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(ignore_ppc, "If the frequency of your machine gets wrongly" \</div><div class='ctx'> 		 "limited by BIOS, this should help");</div><div class='ctx'> </div><div class='ctx'> #define PPC_REGISTERED   1</div><div class='ctx'> #define PPC_IN_USE       2</div><div class='ctx'> </div><div class='del'>-static int acpi_processor_ppc_status = 0;</div><div class='add'>+static int acpi_processor_ppc_status;</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_ppc_notifier(struct notifier_block *nb,</div><div class='ctx'> 				       unsigned long event, void *data)</div><div class='hunk'>@@ -81,13 +87,18 @@ static int acpi_processor_ppc_notifier(struct notifier_block *nb,</div><div class='ctx'> 	struct acpi_processor *pr;</div><div class='ctx'> 	unsigned int ppc = 0;</div><div class='ctx'> </div><div class='del'>-	if (ignore_ppc)</div><div class='add'>+	if (event == CPUFREQ_START &amp;&amp; ignore_ppc &lt;= 0) {</div><div class='add'>+		ignore_ppc = 0;</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;performance_mutex);</div><div class='add'>+	if (ignore_ppc)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (event != CPUFREQ_INCOMPATIBLE)</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;performance_mutex);</div><div class='ctx'> </div><div class='ctx'> 	pr = per_cpu(processors, policy-&gt;cpu);</div><div class='ctx'> 	if (!pr || !pr-&gt;performance)</div><div class='head'>diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c<br/>index f61ebc679e66..d9063ea414e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rscalc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/resources/rscalc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rscalc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/resources/rscalc.c</a></div><div class='hunk'>@@ -587,6 +587,9 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,</div><div class='ctx'> 			} else {</div><div class='ctx'> 				temp_size_needed +=</div><div class='ctx'> 				    acpi_ns_get_pathname_length((*sub_object_list)-&gt;reference.node);</div><div class='add'>+				if (!temp_size_needed) {</div><div class='add'>+					return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/*</div><div class='head'>diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c<br/>index bcf2c70fca87..a4e3767b8c64 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/sbshc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/sbshc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/sbshc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/sbshc.c</a></div><div class='hunk'>@@ -107,6 +107,13 @@ static int wait_transaction_complete(struct acpi_smb_hc *hc, int timeout)</div><div class='ctx'> 	if (wait_event_timeout(hc-&gt;wait, smb_check_done(hc),</div><div class='ctx'> 			       msecs_to_jiffies(timeout)))</div><div class='ctx'> 		return 0;</div><div class='add'>+	/*</div><div class='add'>+	 * After the timeout happens, OS will try to check the status of SMbus.</div><div class='add'>+	 * If the status is what OS expected, it will be regarded as the bogus</div><div class='add'>+	 * timeout.</div><div class='add'>+	 */</div><div class='add'>+	if (smb_check_done(hc))</div><div class='add'>+		return 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		return -ETIME;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c<br/>index c3419182c9a7..775c97a282bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/tables.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/tables.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/tables.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/tables.c</a></div><div class='hunk'>@@ -300,6 +300,8 @@ int __init acpi_table_init(void)</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_parse_apic_instance(char *str)</div><div class='ctx'> {</div><div class='add'>+	if (!str)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	acpi_apic_instance = simple_strtoul(str, NULL, 0);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c<br/>index e7bf34a7b1d2..7dcb67e0b215 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utalloc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/utilities/utalloc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utalloc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/utilities/utalloc.c</a></div><div class='hunk'>@@ -242,10 +242,12 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	if (!required_length) {</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return AE_ERROR;</div><div class='add'>+	/* Parameter validation */</div><div class='add'>+</div><div class='add'>+	if (!buffer || !required_length) {</div><div class='add'>+		return (AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	switch (buffer-&gt;length) {</div><div class='ctx'> 	case ACPI_NO_BUFFER:</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c<br/>index c5c791a575c9..42609d3a8aa9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utdelete.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/utilities/utdelete.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utdelete.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/utilities/utdelete.c</a></div><div class='hunk'>@@ -135,6 +135,10 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)</div><div class='ctx'> 		obj_pointer = object-&gt;package.elements;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * These objects have a possible list of notify handlers.</div><div class='add'>+		 * Device object also may have a GPE block.</div><div class='add'>+		 */</div><div class='ctx'> 	case ACPI_TYPE_DEVICE:</div><div class='ctx'> </div><div class='ctx'> 		if (object-&gt;device.gpe_block) {</div><div class='hunk'>@@ -142,9 +146,14 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)</div><div class='ctx'> 						       gpe_block);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Walk the handler list for this device */</div><div class='add'>+		/*lint -fallthrough */</div><div class='add'>+</div><div class='add'>+	case ACPI_TYPE_PROCESSOR:</div><div class='add'>+	case ACPI_TYPE_THERMAL:</div><div class='add'>+</div><div class='add'>+		/* Walk the notify handler list for this object */</div><div class='ctx'> </div><div class='del'>-		handler_desc = object-&gt;device.handler;</div><div class='add'>+		handler_desc = object-&gt;common_notify.handler;</div><div class='ctx'> 		while (handler_desc) {</div><div class='ctx'> 			next_desc = handler_desc-&gt;address_space.next;</div><div class='ctx'> 			acpi_ut_remove_reference(handler_desc);</div><div class='head'>diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c<br/>index e25484495e65..916eff399eb3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utobject.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/utilities/utobject.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utobject.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/utilities/utobject.c</a></div><div class='hunk'>@@ -425,6 +425,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,</div><div class='ctx'> 			       acpi_size * obj_length)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_size length;</div><div class='add'>+	acpi_size size;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE_PTR(ut_get_simple_object_size, internal_object);</div><div class='hunk'>@@ -484,10 +485,14 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,</div><div class='ctx'> 			 * Get the actual length of the full pathname to this object.</div><div class='ctx'> 			 * The reference will be converted to the pathname to the object</div><div class='ctx'> 			 */</div><div class='del'>-			length +=</div><div class='del'>-			    ACPI_ROUND_UP_TO_NATIVE_WORD</div><div class='del'>-			    (acpi_ns_get_pathname_length</div><div class='del'>-			     (internal_object-&gt;reference.node));</div><div class='add'>+			size =</div><div class='add'>+			    acpi_ns_get_pathname_length(internal_object-&gt;</div><div class='add'>+							reference.node);</div><div class='add'>+			if (!size) {</div><div class='add'>+				return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			length += ACPI_ROUND_UP_TO_NATIVE_WORD(size);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='head'>diff --git a/drivers/acpi/wmi.c b/drivers/acpi/wmi.c<br/>index c33b1c6e93b1..cfe2c833474d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/wmi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/acpi/wmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/wmi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/acpi/wmi.c</a></div><div class='hunk'>@@ -347,7 +347,7 @@ struct acpi_buffer *out)</div><div class='ctx'> 	strcpy(method, "WQ");</div><div class='ctx'> 	strncat(method, block-&gt;object_id, 2);</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_object(handle, method, NULL, out);</div><div class='add'>+	status = acpi_evaluate_object(handle, method, &amp;input, out);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If ACPI_WMI_EXPENSIVE, call the relevant WCxx method, even if</div><div class='head'>diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig<br/>index ae8494944c45..11c8c19f0fb7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/Kconfig</a></div><div class='hunk'>@@ -448,8 +448,10 @@ config PATA_MARVELL</div><div class='ctx'> 	tristate "Marvell PATA support via legacy mode"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	help</div><div class='del'>-	  This option enables limited support for the Marvell 88SE6145 ATA</div><div class='del'>-	  controller.</div><div class='add'>+	  This option enables limited support for the Marvell 88SE61xx ATA</div><div class='add'>+	  controllers. If you wish to use only the SATA ports then select</div><div class='add'>+	  the AHCI driver alone. If you wish to the use the PATA port or</div><div class='add'>+	  both SATA and PATA include this driver.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c<br/>index ef3e5522e1a4..2e1a7cb2ed5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/ahci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/ahci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/ahci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/ahci.c</a></div><div class='hunk'>@@ -420,7 +420,7 @@ static const struct ata_port_info ahci_port_info[] = {</div><div class='ctx'> 	/* board_ahci_mv */</div><div class='ctx'> 	{</div><div class='ctx'> 		AHCI_HFLAGS	(AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_MSI |</div><div class='del'>-				 AHCI_HFLAG_MV_PATA),</div><div class='add'>+				 AHCI_HFLAG_MV_PATA | AHCI_HFLAG_NO_PMP),</div><div class='ctx'> 		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |</div><div class='ctx'> 				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA,</div><div class='ctx'> 		.pio_mask	= 0x1f, /* pio0-4 */</div><div class='hunk'>@@ -486,6 +486,10 @@ static const struct pci_device_id ahci_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, 0x502b), board_ahci }, /* Tolapai */</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, 0x3a05), board_ahci }, /* ICH10 */</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, 0x3a25), board_ahci }, /* ICH10 */</div><div class='add'>+	{ PCI_VDEVICE(INTEL, 0x3b24), board_ahci }, /* PCH RAID */</div><div class='add'>+	{ PCI_VDEVICE(INTEL, 0x3b25), board_ahci }, /* PCH RAID */</div><div class='add'>+	{ PCI_VDEVICE(INTEL, 0x3b2b), board_ahci }, /* PCH RAID */</div><div class='add'>+	{ PCI_VDEVICE(INTEL, 0x3b2c), board_ahci }, /* PCH RAID */</div><div class='ctx'> </div><div class='ctx'> 	/* JMicron 360/1/3/5/6, match class to avoid IDE function */</div><div class='ctx'> 	{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,</div><div class='hunk'>@@ -575,9 +579,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(NVIDIA, 0x0bc7), board_ahci },		/* MCP7B */</div><div class='ctx'> </div><div class='ctx'> 	/* SiS */</div><div class='del'>-	{ PCI_VDEVICE(SI, 0x1184), board_ahci_nopmp },		/* SiS 966 */</div><div class='del'>-	{ PCI_VDEVICE(SI, 0x1185), board_ahci_nopmp },		/* SiS 968 */</div><div class='del'>-	{ PCI_VDEVICE(SI, 0x0186), board_ahci_nopmp },		/* SiS 968 */</div><div class='add'>+	{ PCI_VDEVICE(SI, 0x1184), board_ahci },		/* SiS 966 */</div><div class='add'>+	{ PCI_VDEVICE(SI, 0x1185), board_ahci },		/* SiS 968 */</div><div class='add'>+	{ PCI_VDEVICE(SI, 0x0186), board_ahci },		/* SiS 968 */</div><div class='ctx'> </div><div class='ctx'> 	/* Marvell */</div><div class='ctx'> 	{ PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv },	/* 6145 */</div><div class='hunk'>@@ -608,6 +612,15 @@ module_param(ahci_em_messages, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(ahci_em_messages,</div><div class='ctx'> 	"Set AHCI Enclosure Management Message type (0 = disabled, 1 = LED");</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_PATA_MARVELL) || defined(CONFIG_PATA_MARVELL_MODULE)</div><div class='add'>+static int marvell_enable;</div><div class='add'>+#else</div><div class='add'>+static int marvell_enable = 1;</div><div class='add'>+#endif</div><div class='add'>+module_param(marvell_enable, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 = enabled)");</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static inline int ahci_nr_ports(u32 cap)</div><div class='ctx'> {</div><div class='ctx'> 	return (cap &amp; 0x1f) + 1;</div><div class='hunk'>@@ -730,6 +743,8 @@ static void ahci_save_initial_config(struct pci_dev *pdev,</div><div class='ctx'> 			   "MV_AHCI HACK: port_map %x -&gt; %x\n",</div><div class='ctx'> 			   port_map,</div><div class='ctx'> 			   port_map &amp; mv);</div><div class='add'>+		dev_printk(KERN_ERR, &amp;pdev-&gt;dev,</div><div class='add'>+			  "Disabling your PATA port. Use the boot option 'ahci.marvell_enable=0' to avoid this.\n");</div><div class='ctx'> </div><div class='ctx'> 		port_map &amp;= mv;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2531,6 +2546,12 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	if (!printed_version++)</div><div class='ctx'> 		dev_printk(KERN_DEBUG, &amp;pdev-&gt;dev, "version " DRV_VERSION "\n");</div><div class='ctx'> </div><div class='add'>+	/* The AHCI driver can only drive the SATA ports, the PATA driver</div><div class='add'>+	   can drive them all so if both drivers are selected make sure</div><div class='add'>+	   AHCI stays out of the way */</div><div class='add'>+	if (pdev-&gt;vendor == PCI_VENDOR_ID_MARVELL &amp;&amp; !marvell_enable)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	/* acquire resources */</div><div class='ctx'> 	rc = pcim_enable_device(pdev);</div><div class='ctx'> 	if (rc)</div><div class='head'>diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c<br/>index a90ae03f56b2..e6b4606e36b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/ata_piix.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/ata_piix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/ata_piix.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/ata_piix.c</a></div><div class='hunk'>@@ -250,6 +250,7 @@ static const struct pci_device_id piix_pci_tbl[] = {</div><div class='ctx'> 	/* Mobile SATA Controller IDE (ICH8M), Apple */</div><div class='ctx'> 	{ 0x8086, 0x2828, 0x106b, 0x00a0, 0, 0, ich8m_apple_sata },</div><div class='ctx'> 	{ 0x8086, 0x2828, 0x106b, 0x00a1, 0, 0, ich8m_apple_sata },</div><div class='add'>+	{ 0x8086, 0x2828, 0x106b, 0x00a3, 0, 0, ich8m_apple_sata },</div><div class='ctx'> 	/* Mobile SATA Controller IDE (ICH8M) */</div><div class='ctx'> 	{ 0x8086, 0x2828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },</div><div class='ctx'> 	/* SATA Controller IDE (ICH9) */</div><div class='hunk'>@@ -274,6 +275,14 @@ static const struct pci_device_id piix_pci_tbl[] = {</div><div class='ctx'> 	{ 0x8086, 0x3a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },</div><div class='ctx'> 	/* SATA Controller IDE (ICH10) */</div><div class='ctx'> 	{ 0x8086, 0x3a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },</div><div class='add'>+	/* SATA Controller IDE (PCH) */</div><div class='add'>+	{ 0x8086, 0x3b20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },</div><div class='add'>+	/* SATA Controller IDE (PCH) */</div><div class='add'>+	{ 0x8086, 0x3b26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },</div><div class='add'>+	/* SATA Controller IDE (PCH) */</div><div class='add'>+	{ 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },</div><div class='add'>+	/* SATA Controller IDE (PCH) */</div><div class='add'>+	{ 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },</div><div class='ctx'> </div><div class='ctx'> 	{ }	/* terminate list */</div><div class='ctx'> };</div><div class='hunk'>@@ -1490,7 +1499,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	 * off.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pdev-&gt;vendor == PCI_VENDOR_ID_INTEL &amp;&amp; pdev-&gt;device == 0x2652) {</div><div class='del'>-		int rc = piix_disable_ahci(pdev);</div><div class='add'>+		rc = piix_disable_ahci(pdev);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c<br/>index 9bef1a84fe3f..79e3a8e7a84a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/libata-core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/libata-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/libata-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/libata-core.c</a></div><div class='hunk'>@@ -104,6 +104,7 @@ struct ata_force_param {</div><div class='ctx'> 	unsigned long	xfer_mask;</div><div class='ctx'> 	unsigned int	horkage_on;</div><div class='ctx'> 	unsigned int	horkage_off;</div><div class='add'>+	unsigned int	lflags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ata_force_ent {</div><div class='hunk'>@@ -120,7 +121,7 @@ static char ata_force_param_buf[PAGE_SIZE] __initdata;</div><div class='ctx'> module_param_string(force, ata_force_param_buf, sizeof(ata_force_param_buf), 0);</div><div class='ctx'> MODULE_PARM_DESC(force, "Force ATA configurations including cable type, link speed and transfer mode (see Documentation/kernel-parameters.txt for details)");</div><div class='ctx'> </div><div class='del'>-int atapi_enabled = 1;</div><div class='add'>+static int atapi_enabled = 1;</div><div class='ctx'> module_param(atapi_enabled, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)");</div><div class='ctx'> </div><div class='hunk'>@@ -196,22 +197,23 @@ void ata_force_cbl(struct ata_port *ap)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	ata_force_spd_limit - force SATA spd limit according to libata.force</div><div class='add'>+ *	ata_force_link_limits - force link limits according to libata.force</div><div class='ctx'>  *	@link: ATA link of interest</div><div class='ctx'>  *</div><div class='del'>- *	Force SATA spd limit according to libata.force and whine about</div><div class='del'>- *	it.  When only the port part is specified (e.g. 1:), the limit</div><div class='del'>- *	applies to all links connected to both the host link and all</div><div class='del'>- *	fan-out ports connected via PMP.  If the device part is</div><div class='del'>- *	specified as 0 (e.g. 1.00:), it specifies the first fan-out</div><div class='del'>- *	link not the host link.  Device number 15 always points to the</div><div class='del'>- *	host link whether PMP is attached or not.</div><div class='add'>+ *	Force link flags and SATA spd limit according to libata.force</div><div class='add'>+ *	and whine about it.  When only the port part is specified</div><div class='add'>+ *	(e.g. 1:), the limit applies to all links connected to both</div><div class='add'>+ *	the host link and all fan-out ports connected via PMP.  If the</div><div class='add'>+ *	device part is specified as 0 (e.g. 1.00:), it specifies the</div><div class='add'>+ *	first fan-out link not the host link.  Device number 15 always</div><div class='add'>+ *	points to the host link whether PMP is attached or not.</div><div class='ctx'>  *</div><div class='ctx'>  *	LOCKING:</div><div class='ctx'>  *	EH context.</div><div class='ctx'>  */</div><div class='del'>-static void ata_force_spd_limit(struct ata_link *link)</div><div class='add'>+static void ata_force_link_limits(struct ata_link *link)</div><div class='ctx'> {</div><div class='add'>+	bool did_spd = false;</div><div class='ctx'> 	int linkno, i;</div><div class='ctx'> </div><div class='ctx'> 	if (ata_is_host_link(link))</div><div class='hunk'>@@ -228,13 +230,22 @@ static void ata_force_spd_limit(struct ata_link *link)</div><div class='ctx'> 		if (fe-&gt;device != -1 &amp;&amp; fe-&gt;device != linkno)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (!fe-&gt;param.spd_limit)</div><div class='del'>-			continue;</div><div class='add'>+		/* only honor the first spd limit */</div><div class='add'>+		if (!did_spd &amp;&amp; fe-&gt;param.spd_limit) {</div><div class='add'>+			link-&gt;hw_sata_spd_limit = (1 &lt;&lt; fe-&gt;param.spd_limit) - 1;</div><div class='add'>+			ata_link_printk(link, KERN_NOTICE,</div><div class='add'>+					"FORCE: PHY spd limit set to %s\n",</div><div class='add'>+					fe-&gt;param.name);</div><div class='add'>+			did_spd = true;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		link-&gt;hw_sata_spd_limit = (1 &lt;&lt; fe-&gt;param.spd_limit) - 1;</div><div class='del'>-		ata_link_printk(link, KERN_NOTICE,</div><div class='del'>-			"FORCE: PHY spd limit set to %s\n", fe-&gt;param.name);</div><div class='del'>-		return;</div><div class='add'>+		/* let lflags stack */</div><div class='add'>+		if (fe-&gt;param.lflags) {</div><div class='add'>+			link-&gt;flags |= fe-&gt;param.lflags;</div><div class='add'>+			ata_link_printk(link, KERN_NOTICE,</div><div class='add'>+					"FORCE: link flag 0x%x forced -&gt; 0x%x\n",</div><div class='add'>+					fe-&gt;param.lflags, link-&gt;flags);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1132,6 +1143,8 @@ void ata_id_string(const u16 *id, unsigned char *s,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int c;</div><div class='ctx'> </div><div class='add'>+	BUG_ON(len &amp; 1);</div><div class='add'>+</div><div class='ctx'> 	while (len &gt; 0) {</div><div class='ctx'> 		c = id[ofs] &gt;&gt; 8;</div><div class='ctx'> 		*s = c;</div><div class='hunk'>@@ -1165,8 +1178,6 @@ void ata_id_c_string(const u16 *id, unsigned char *s,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char *p;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(!(len &amp; 1));</div><div class='del'>-</div><div class='ctx'> 	ata_id_string(id, s, ofs, len - 1);</div><div class='ctx'> </div><div class='ctx'> 	p = s + strnlen(s, len - 1);</div><div class='hunk'>@@ -1886,6 +1897,23 @@ static u32 ata_pio_mask_no_iordy(const struct ata_device *adev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	ata_do_dev_read_id		-	default ID read method</div><div class='add'>+ *	@dev: device</div><div class='add'>+ *	@tf: proposed taskfile</div><div class='add'>+ *	@id: data buffer</div><div class='add'>+ *</div><div class='add'>+ *	Issue the identify taskfile and hand back the buffer containing</div><div class='add'>+ *	identify data. For some RAID controllers and for pre ATA devices</div><div class='add'>+ *	this function is wrapped or replaced by the driver</div><div class='add'>+ */</div><div class='add'>+unsigned int ata_do_dev_read_id(struct ata_device *dev,</div><div class='add'>+					struct ata_taskfile *tf, u16 *id)</div><div class='add'>+{</div><div class='add'>+	return ata_exec_internal(dev, tf, NULL, DMA_FROM_DEVICE,</div><div class='add'>+				     id, sizeof(id[0]) * ATA_ID_WORDS, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	ata_dev_read_id - Read ID data from the specified device</div><div class='ctx'>  *	@dev: target device</div><div class='ctx'>  *	@p_class: pointer to class of the target device (may be changed)</div><div class='hunk'>@@ -1920,7 +1948,7 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,</div><div class='ctx'> 	if (ata_msg_ctl(ap))</div><div class='ctx'> 		ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER\n", __func__);</div><div class='ctx'> </div><div class='del'>- retry:</div><div class='add'>+retry:</div><div class='ctx'> 	ata_tf_init(dev, &amp;tf);</div><div class='ctx'> </div><div class='ctx'> 	switch (class) {</div><div class='hunk'>@@ -1948,8 +1976,11 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,</div><div class='ctx'> 	 */</div><div class='ctx'> 	tf.flags |= ATA_TFLAG_POLLING;</div><div class='ctx'> </div><div class='del'>-	err_mask = ata_exec_internal(dev, &amp;tf, NULL, DMA_FROM_DEVICE,</div><div class='del'>-				     id, sizeof(id[0]) * ATA_ID_WORDS, 0);</div><div class='add'>+	if (ap-&gt;ops-&gt;read_id)</div><div class='add'>+		err_mask = ap-&gt;ops-&gt;read_id(dev, &amp;tf, id);</div><div class='add'>+	else</div><div class='add'>+		err_mask = ata_do_dev_read_id(dev, &amp;tf, id);</div><div class='add'>+</div><div class='ctx'> 	if (err_mask) {</div><div class='ctx'> 		if (err_mask &amp; AC_ERR_NODEV_HINT) {</div><div class='ctx'> 			ata_dev_printk(dev, KERN_DEBUG,</div><div class='hunk'>@@ -2142,6 +2173,16 @@ int ata_dev_configure(struct ata_device *dev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if ((!atapi_enabled || (ap-&gt;flags &amp; ATA_FLAG_NO_ATAPI)) &amp;&amp;</div><div class='add'>+	    dev-&gt;class == ATA_DEV_ATAPI) {</div><div class='add'>+		ata_dev_printk(dev, KERN_WARNING,</div><div class='add'>+			"WARNING: ATAPI is %s, device ignored.\n",</div><div class='add'>+			atapi_enabled ? "not supported with this driver"</div><div class='add'>+				      : "disabled");</div><div class='add'>+		ata_dev_disable(dev);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* let ACPI work its magic */</div><div class='ctx'> 	rc = ata_acpi_on_devcfg(dev);</div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -3247,7 +3288,7 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)</div><div class='ctx'> 		dev-&gt;dma_mode = ata_xfer_mask2mode(dma_mask);</div><div class='ctx'> </div><div class='ctx'> 		found = 1;</div><div class='del'>-		if (dev-&gt;dma_mode != 0xff)</div><div class='add'>+		if (ata_dma_enabled(dev))</div><div class='ctx'> 			used_dma = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!found)</div><div class='hunk'>@@ -3272,7 +3313,7 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)</div><div class='ctx'> </div><div class='ctx'> 	/* step 3: set host DMA timings */</div><div class='ctx'> 	ata_link_for_each_dev(dev, link) {</div><div class='del'>-		if (!ata_dev_enabled(dev) || dev-&gt;dma_mode == 0xff)</div><div class='add'>+		if (!ata_dev_enabled(dev) || !ata_dma_enabled(dev))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		dev-&gt;xfer_mode = dev-&gt;dma_mode;</div><div class='hunk'>@@ -5158,19 +5199,18 @@ void ata_link_init(struct ata_port *ap, struct ata_link *link, int pmp)</div><div class='ctx'>  */</div><div class='ctx'> int sata_link_init_spd(struct ata_link *link)</div><div class='ctx'> {</div><div class='del'>-	u32 scontrol;</div><div class='ctx'> 	u8 spd;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = sata_scr_read(link, SCR_CONTROL, &amp;scontrol);</div><div class='add'>+	rc = sata_scr_read(link, SCR_CONTROL, &amp;link-&gt;saved_scontrol);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	spd = (scontrol &gt;&gt; 4) &amp; 0xf;</div><div class='add'>+	spd = (link-&gt;saved_scontrol &gt;&gt; 4) &amp; 0xf;</div><div class='ctx'> 	if (spd)</div><div class='ctx'> 		link-&gt;hw_sata_spd_limit &amp;= (1 &lt;&lt; spd) - 1;</div><div class='ctx'> </div><div class='del'>-	ata_force_spd_limit(link);</div><div class='add'>+	ata_force_link_limits(link);</div><div class='ctx'> </div><div class='ctx'> 	link-&gt;sata_spd_limit = link-&gt;hw_sata_spd_limit;</div><div class='ctx'> </div><div class='hunk'>@@ -5753,9 +5793,10 @@ static void ata_port_detach(struct ata_port *ap)</div><div class='ctx'> 	ata_port_wait_eh(ap);</div><div class='ctx'> </div><div class='ctx'> 	/* EH is now guaranteed to see UNLOADING - EH context belongs</div><div class='del'>-	 * to us.  Disable all existing devices.</div><div class='add'>+	 * to us.  Restore SControl and disable all existing devices.</div><div class='ctx'> 	 */</div><div class='del'>-	ata_port_for_each_link(link, ap) {</div><div class='add'>+	__ata_port_for_each_link(link, ap) {</div><div class='add'>+		sata_scr_write(link, SCR_CONTROL, link-&gt;saved_scontrol);</div><div class='ctx'> 		ata_link_for_each_dev(dev, link)</div><div class='ctx'> 			ata_dev_disable(dev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5961,6 +6002,9 @@ static int __init ata_parse_force_one(char **cur,</div><div class='ctx'> 		{ "udma133",	.xfer_mask	= 1 &lt;&lt; (ATA_SHIFT_UDMA + 6) },</div><div class='ctx'> 		{ "udma/133",	.xfer_mask	= 1 &lt;&lt; (ATA_SHIFT_UDMA + 6) },</div><div class='ctx'> 		{ "udma7",	.xfer_mask	= 1 &lt;&lt; (ATA_SHIFT_UDMA + 7) },</div><div class='add'>+		{ "nohrst",	.lflags		= ATA_LFLAG_NO_HRST },</div><div class='add'>+		{ "nosrst",	.lflags		= ATA_LFLAG_NO_SRST },</div><div class='add'>+		{ "norst",	.lflags		= ATA_LFLAG_NO_HRST | ATA_LFLAG_NO_SRST },</div><div class='ctx'> 	};</div><div class='ctx'> 	char *start = *cur, *p = *cur;</div><div class='ctx'> 	char *id, *val, *endp;</div><div class='hunk'>@@ -6088,16 +6132,20 @@ static int __init ata_init(void)</div><div class='ctx'> </div><div class='ctx'> 	ata_wq = create_workqueue("ata");</div><div class='ctx'> 	if (!ata_wq)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		goto free_force_tbl;</div><div class='ctx'> </div><div class='ctx'> 	ata_aux_wq = create_singlethread_workqueue("ata_aux");</div><div class='del'>-	if (!ata_aux_wq) {</div><div class='del'>-		destroy_workqueue(ata_wq);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	if (!ata_aux_wq)</div><div class='add'>+		goto free_wq;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEBUG "libata version " DRV_VERSION " loaded.\n");</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+free_wq:</div><div class='add'>+	destroy_workqueue(ata_wq);</div><div class='add'>+free_force_tbl:</div><div class='add'>+	kfree(ata_force_tbl);</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit ata_exit(void)</div><div class='hunk'>@@ -6269,6 +6317,7 @@ EXPORT_SYMBOL_GPL(ata_host_resume);</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_id_string);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_id_c_string);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_do_dev_read_id);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_scsi_simulate);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_pio_need_iordy);</div><div class='head'>diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c<br/>index 58bdc538d229..c1db2f234d2e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/libata-eh.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/libata-eh.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/libata-eh.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/libata-eh.c</a></div><div class='hunk'>@@ -2040,7 +2040,7 @@ static void ata_eh_link_report(struct ata_link *link)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ehc-&gt;i.serror)</div><div class='del'>-		ata_port_printk(ap, KERN_ERR,</div><div class='add'>+		ata_link_printk(link, KERN_ERR,</div><div class='ctx'> 		  "SError: { %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s}\n",</div><div class='ctx'> 		  ehc-&gt;i.serror &amp; SERR_DATA_RECOVERED ? "RecovData " : "",</div><div class='ctx'> 		  ehc-&gt;i.serror &amp; SERR_COMM_RECOVERED ? "RecovComm " : "",</div><div class='hunk'>@@ -2171,18 +2171,12 @@ static int ata_do_reset(struct ata_link *link, ata_reset_fn_t reset,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ata_eh_followup_srst_needed(struct ata_link *link,</div><div class='del'>-				       int rc, int classify,</div><div class='del'>-				       const unsigned int *classes)</div><div class='add'>+				       int rc, const unsigned int *classes)</div><div class='ctx'> {</div><div class='ctx'> 	if ((link-&gt;flags &amp; ATA_LFLAG_NO_SRST) || ata_link_offline(link))</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (rc == -EAGAIN) {</div><div class='del'>-		if (classify)</div><div class='del'>-			return 1;</div><div class='del'>-		rc = 0;</div><div class='del'>-	}</div><div class='del'>-	if (rc != 0)</div><div class='del'>-		return 0;</div><div class='add'>+	if (rc == -EAGAIN)</div><div class='add'>+		return 1;</div><div class='ctx'> 	if (sata_pmp_supported(link-&gt;ap) &amp;&amp; ata_is_host_link(link))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2210,6 +2204,10 @@ int ata_eh_reset(struct ata_link *link, int classify,</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (ata_eh_reset_timeouts[max_tries] != ULONG_MAX)</div><div class='ctx'> 		max_tries++;</div><div class='add'>+	if (link-&gt;flags &amp; ATA_LFLAG_NO_HRST)</div><div class='add'>+		hardreset = NULL;</div><div class='add'>+	if (link-&gt;flags &amp; ATA_LFLAG_NO_SRST)</div><div class='add'>+		softreset = NULL;</div><div class='ctx'> </div><div class='ctx'> 	now = jiffies;</div><div class='ctx'> 	deadline = ata_deadline(ehc-&gt;last_reset, ATA_EH_RESET_COOL_DOWN);</div><div class='hunk'>@@ -2247,10 +2245,10 @@ int ata_eh_reset(struct ata_link *link, int classify,</div><div class='ctx'> 	ehc-&gt;i.action &amp;= ~ATA_EH_RESET;</div><div class='ctx'> 	if (hardreset) {</div><div class='ctx'> 		reset = hardreset;</div><div class='del'>-		ehc-&gt;i.action = ATA_EH_HARDRESET;</div><div class='add'>+		ehc-&gt;i.action |= ATA_EH_HARDRESET;</div><div class='ctx'> 	} else if (softreset) {</div><div class='ctx'> 		reset = softreset;</div><div class='del'>-		ehc-&gt;i.action = ATA_EH_SOFTRESET;</div><div class='add'>+		ehc-&gt;i.action |= ATA_EH_SOFTRESET;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (prereset) {</div><div class='hunk'>@@ -2305,9 +2303,11 @@ int ata_eh_reset(struct ata_link *link, int classify,</div><div class='ctx'> 			ehc-&gt;i.flags |= ATA_EHI_DID_SOFTRESET;</div><div class='ctx'> </div><div class='ctx'> 		rc = ata_do_reset(link, reset, classes, deadline);</div><div class='add'>+		if (rc &amp;&amp; rc != -EAGAIN)</div><div class='add'>+			goto fail;</div><div class='ctx'> </div><div class='ctx'> 		if (reset == hardreset &amp;&amp;</div><div class='del'>-		    ata_eh_followup_srst_needed(link, rc, classify, classes)) {</div><div class='add'>+		    ata_eh_followup_srst_needed(link, rc, classes)) {</div><div class='ctx'> 			/* okay, let's do follow-up softreset */</div><div class='ctx'> 			reset = softreset;</div><div class='ctx'> </div><div class='hunk'>@@ -2322,10 +2322,6 @@ int ata_eh_reset(struct ata_link *link, int classify,</div><div class='ctx'> 			ata_eh_about_to_do(link, NULL, ATA_EH_RESET);</div><div class='ctx'> 			rc = ata_do_reset(link, reset, classes, deadline);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/* -EAGAIN can happen if we skipped followup SRST */</div><div class='del'>-		if (rc &amp;&amp; rc != -EAGAIN)</div><div class='del'>-			goto fail;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (verbose)</div><div class='ctx'> 			ata_link_printk(link, KERN_INFO, "no reset method "</div><div class='head'>diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c<br/>index f3b4b15a8dc4..b9d3ba423cb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/libata-scsi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/libata-scsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/libata-scsi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/libata-scsi.c</a></div><div class='hunk'>@@ -2551,36 +2551,6 @@ static struct ata_device *__ata_scsi_find_dev(struct ata_port *ap,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	ata_scsi_dev_enabled - determine if device is enabled</div><div class='del'>- *	@dev: ATA device</div><div class='del'>- *</div><div class='del'>- *	Determine if commands should be sent to the specified device.</div><div class='del'>- *</div><div class='del'>- *	LOCKING:</div><div class='del'>- *	spin_lock_irqsave(host lock)</div><div class='del'>- *</div><div class='del'>- *	RETURNS:</div><div class='del'>- *	0 if commands are not allowed / 1 if commands are allowed</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int ata_scsi_dev_enabled(struct ata_device *dev)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(!ata_dev_enabled(dev)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!atapi_enabled || (dev-&gt;link-&gt;ap-&gt;flags &amp; ATA_FLAG_NO_ATAPI)) {</div><div class='del'>-		if (unlikely(dev-&gt;class == ATA_DEV_ATAPI)) {</div><div class='del'>-			ata_dev_printk(dev, KERN_WARNING,</div><div class='del'>-				       "WARNING: ATAPI is %s, device ignored.\n",</div><div class='del'>-				       atapi_enabled ? "not supported with this driver" : "disabled");</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  *	ata_scsi_find_dev - lookup ata_device from scsi_cmnd</div><div class='ctx'>  *	@ap: ATA port to which the device is attached</div><div class='ctx'>  *	@scsidev: SCSI device from which we derive the ATA device</div><div class='hunk'>@@ -2601,7 +2571,7 @@ ata_scsi_find_dev(struct ata_port *ap, const struct scsi_device *scsidev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_device *dev = __ata_scsi_find_dev(ap, scsidev);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!dev || !ata_scsi_dev_enabled(dev)))</div><div class='add'>+	if (unlikely(!dev || !ata_dev_enabled(dev)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	return dev;</div><div class='hunk'>@@ -3622,7 +3592,7 @@ int ata_sas_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *),</div><div class='ctx'> </div><div class='ctx'> 	ata_scsi_dump_cdb(ap, cmd);</div><div class='ctx'> </div><div class='del'>-	if (likely(ata_scsi_dev_enabled(ap-&gt;link.device)))</div><div class='add'>+	if (likely(ata_dev_enabled(ap-&gt;link.device)))</div><div class='ctx'> 		rc = __ata_scsi_queuecmd(cmd, done, ap-&gt;link.device);</div><div class='ctx'> 	else {</div><div class='ctx'> 		cmd-&gt;result = (DID_BAD_TARGET &lt;&lt; 16);</div><div class='head'>diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c<br/>index 304fdc6f1dc2..2a4c516894f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/libata-sff.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/libata-sff.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/libata-sff.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/libata-sff.c</a></div><div class='hunk'>@@ -1315,11 +1315,6 @@ fsm_start:</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case HSM_ST_ERR:</div><div class='del'>-		/* make sure qc-&gt;err_mask is available to</div><div class='del'>-		 * know what's wrong and recover</div><div class='del'>-		 */</div><div class='del'>-		WARN_ON(!(qc-&gt;err_mask &amp; (AC_ERR_DEV | AC_ERR_HSM)));</div><div class='del'>-</div><div class='ctx'> 		ap-&gt;hsm_task_state = HSM_ST_IDLE;</div><div class='ctx'> </div><div class='ctx'> 		/* complete taskfile transaction */</div><div class='head'>diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h<br/>index f6f9c28ec7f8..ade5c75b6144 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/libata.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/libata.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/libata.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/libata.h</a></div><div class='hunk'>@@ -66,7 +66,6 @@ enum {</div><div class='ctx'> </div><div class='ctx'> extern unsigned int ata_print_id;</div><div class='ctx'> extern struct workqueue_struct *ata_aux_wq;</div><div class='del'>-extern int atapi_enabled;</div><div class='ctx'> extern int atapi_passthru16;</div><div class='ctx'> extern int libata_fua;</div><div class='ctx'> extern int libata_noacpi;</div><div class='head'>diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c<br/>index fbe605711554..eb919c16a03e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_acpi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/pata_acpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_acpi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_acpi.c</a></div><div class='hunk'>@@ -181,7 +181,7 @@ static unsigned int pacpi_qc_issue(struct ata_queued_cmd *qc)</div><div class='ctx'> </div><div class='ctx'> 	if (adev != acpi-&gt;last) {</div><div class='ctx'> 		pacpi_set_piomode(ap, adev);</div><div class='del'>-		if (adev-&gt;dma_mode)</div><div class='add'>+		if (ata_dma_enabled(adev))</div><div class='ctx'> 			pacpi_set_dmamode(ap, adev);</div><div class='ctx'> 		acpi-&gt;last = adev;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c<br/>index 0f3e659db99a..5ca70fa1f587 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_ali.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/pata_ali.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_ali.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_ali.c</a></div><div class='hunk'>@@ -550,8 +550,9 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		pci_read_config_byte(isa_bridge, 0x5E, &amp;tmp);</div><div class='ctx'> 		if ((tmp &amp; 0x1E) == 0x12)</div><div class='ctx'> 	        	ppi[0] = &amp;info_20_udma;</div><div class='del'>-		pci_dev_put(isa_bridge);</div><div class='ctx'> 	}</div><div class='add'>+	pci_dev_put(isa_bridge);</div><div class='add'>+</div><div class='ctx'> 	return ata_pci_sff_init_one(pdev, ppi, &amp;ali_sht, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c<br/>index 82fb6e273169..ab61095093b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_at32.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/pata_at32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_at32.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_at32.c</a></div><div class='hunk'>@@ -24,8 +24,8 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/smc.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/smc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME "pata_at32"</div><div class='ctx'> #define DRV_VERSION "0.0.3"</div><div class='head'>diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c<br/>index d7de7baf58a8..e8a0d99d7356 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_atiixp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/pata_atiixp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_atiixp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_atiixp.c</a></div><div class='hunk'>@@ -183,7 +183,7 @@ static void atiixp_bmdma_start(struct ata_queued_cmd *qc)</div><div class='ctx'> 	u16 tmp16;</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_word(pdev, ATIIXP_IDE_UDMA_CONTROL, &amp;tmp16);</div><div class='del'>-	if (adev-&gt;dma_mode &gt;= XFER_UDMA_0)</div><div class='add'>+	if (ata_using_udma(adev))</div><div class='ctx'> 		tmp16 |= (1 &lt;&lt; dn);</div><div class='ctx'> 	else</div><div class='ctx'> 		tmp16 &amp;= ~(1 &lt;&lt; dn);</div><div class='head'>diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c<br/>index 744beebaaf49..0c4b271a9d5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_cs5530.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/pata_cs5530.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_cs5530.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_cs5530.c</a></div><div class='hunk'>@@ -149,10 +149,10 @@ static unsigned int cs5530_qc_issue(struct ata_queued_cmd *qc)</div><div class='ctx'> 	struct ata_device *prev = ap-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	/* See if the DMA settings could be wrong */</div><div class='del'>-	if (adev-&gt;dma_mode != 0 &amp;&amp; adev != prev &amp;&amp; prev != NULL) {</div><div class='add'>+	if (ata_dma_enabled(adev) &amp;&amp; adev != prev &amp;&amp; prev != NULL) {</div><div class='ctx'> 		/* Maybe, but do the channels match MWDMA/UDMA ? */</div><div class='del'>-		if ((adev-&gt;dma_mode &gt;= XFER_UDMA_0 &amp;&amp; prev-&gt;dma_mode &lt; XFER_UDMA_0) ||</div><div class='del'>-		    (adev-&gt;dma_mode &lt; XFER_UDMA_0 &amp;&amp; prev-&gt;dma_mode &gt;= XFER_UDMA_0))</div><div class='add'>+		if ((ata_using_udma(adev) &amp;&amp; !ata_using_udma(prev)) ||</div><div class='add'>+		    (ata_using_udma(prev) &amp;&amp; !ata_using_udma(adev)))</div><div class='ctx'> 		    	/* Switch the mode bits */</div><div class='ctx'> 		    	cs5530_set_dmamode(ap, adev);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c<br/>index e10816931b2f..0221c9a46769 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_it821x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/pata_it821x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_it821x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_it821x.c</a></div><div class='hunk'>@@ -80,7 +80,7 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME "pata_it821x"</div><div class='del'>-#define DRV_VERSION "0.3.8"</div><div class='add'>+#define DRV_VERSION "0.4.0"</div><div class='ctx'> </div><div class='ctx'> struct it821x_dev</div><div class='ctx'> {</div><div class='hunk'>@@ -425,6 +425,8 @@ static unsigned int it821x_smart_qc_issue(struct ata_queued_cmd *qc)</div><div class='ctx'> 		case ATA_CMD_WRITE_MULTI:</div><div class='ctx'> 		case ATA_CMD_WRITE_MULTI_EXT:</div><div class='ctx'> 		case ATA_CMD_ID_ATA:</div><div class='add'>+		case ATA_CMD_INIT_DEV_PARAMS:</div><div class='add'>+		case 0xFC:	/* Internal 'report rebuild state' */</div><div class='ctx'> 		/* Arguably should just no-op this one */</div><div class='ctx'> 		case ATA_CMD_SET_FEATURES:</div><div class='ctx'> 			return ata_sff_qc_issue(qc);</div><div class='hunk'>@@ -509,7 +511,7 @@ static void it821x_dev_config(struct ata_device *adev)</div><div class='ctx'> </div><div class='ctx'> 	if (strstr(model_num, "Integrated Technology Express")) {</div><div class='ctx'> 		/* RAID mode */</div><div class='del'>-		printk(KERN_INFO "IT821x %sRAID%d volume",</div><div class='add'>+		ata_dev_printk(adev, KERN_INFO, "%sRAID%d volume",</div><div class='ctx'> 			adev-&gt;id[147]?"Bootable ":"",</div><div class='ctx'> 			adev-&gt;id[129]);</div><div class='ctx'> 		if (adev-&gt;id[129] != 1)</div><div class='hunk'>@@ -519,37 +521,51 @@ static void it821x_dev_config(struct ata_device *adev)</div><div class='ctx'> 	/* This is a controller firmware triggered funny, don't</div><div class='ctx'> 	   report the drive faulty! */</div><div class='ctx'> 	adev-&gt;horkage &amp;= ~ATA_HORKAGE_DIAGNOSTIC;</div><div class='add'>+	/* No HPA in 'smart' mode */</div><div class='add'>+	adev-&gt;horkage |= ATA_HORKAGE_BROKEN_HPA;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	it821x_ident_hack	-	Hack identify data up</div><div class='del'>- *	@ap: Port</div><div class='add'>+ *	it821x_read_id	-	Hack identify data up</div><div class='add'>+ *	@adev: device to read</div><div class='add'>+ *	@tf: proposed taskfile</div><div class='add'>+ *	@id: buffer for returned ident data</div><div class='ctx'>  *</div><div class='del'>- *	Walk the devices on this firmware driven port and slightly</div><div class='add'>+ *	Query the devices on this firmware driven port and slightly</div><div class='ctx'>  *	mash the identify data to stop us and common tools trying to</div><div class='ctx'>  *	use features not firmware supported. The firmware itself does</div><div class='ctx'>  *	some masking (eg SMART) but not enough.</div><div class='del'>- *</div><div class='del'>- *	This is a bit of an abuse of the cable method, but it is the</div><div class='del'>- *	only method called at the right time. We could modify the libata</div><div class='del'>- *	core specifically for ident hacking but while we have one offender</div><div class='del'>- *	it seems better to keep the fallout localised.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int it821x_ident_hack(struct ata_port *ap)</div><div class='add'>+static unsigned int it821x_read_id(struct ata_device *adev,</div><div class='add'>+					struct ata_taskfile *tf, u16 *id)</div><div class='ctx'> {</div><div class='del'>-	struct ata_device *adev;</div><div class='del'>-	ata_link_for_each_dev(adev, &amp;ap-&gt;link) {</div><div class='del'>-		if (ata_dev_enabled(adev)) {</div><div class='del'>-			adev-&gt;id[84] &amp;= ~(1 &lt;&lt; 6);	/* No FUA */</div><div class='del'>-			adev-&gt;id[85] &amp;= ~(1 &lt;&lt; 10);	/* No HPA */</div><div class='del'>-			adev-&gt;id[76] = 0;		/* No NCQ/AN etc */</div><div class='del'>-		}</div><div class='add'>+	unsigned int err_mask;</div><div class='add'>+	unsigned char model_num[ATA_ID_PROD_LEN + 1];</div><div class='add'>+</div><div class='add'>+	err_mask = ata_do_dev_read_id(adev, tf, id);</div><div class='add'>+	if (err_mask)</div><div class='add'>+		return err_mask;</div><div class='add'>+	ata_id_c_string(id, model_num, ATA_ID_PROD, sizeof(model_num));</div><div class='add'>+</div><div class='add'>+	id[83] &amp;= ~(1 &lt;&lt; 12);	/* Cache flush is firmware handled */</div><div class='add'>+	id[83] &amp;= ~(1 &lt;&lt; 13);	/* Ditto for LBA48 flushes */</div><div class='add'>+	id[84] &amp;= ~(1 &lt;&lt; 6);	/* No FUA */</div><div class='add'>+	id[85] &amp;= ~(1 &lt;&lt; 10);	/* No HPA */</div><div class='add'>+	id[76] = 0;		/* No NCQ/AN etc */</div><div class='add'>+</div><div class='add'>+	if (strstr(model_num, "Integrated Technology Express")) {</div><div class='add'>+		/* Set feature bits the firmware neglects */</div><div class='add'>+		id[49] |= 0x0300;	/* LBA, DMA */</div><div class='add'>+		id[82] |= 0x0400;	/* LBA48 */</div><div class='add'>+		id[83] &amp;= 0x7FFF;</div><div class='add'>+		id[83] |= 0x4000;	/* Word 83 is valid */</div><div class='add'>+		id[86] |= 0x0400;	/* LBA48 on */</div><div class='add'>+		id[ATA_ID_MAJOR_VER] |= 0x1F;</div><div class='ctx'> 	}</div><div class='del'>-	return ata_cable_unknown(ap);</div><div class='add'>+	return err_mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *	it821x_check_atapi_dma	-	ATAPI DMA handler</div><div class='ctx'>  *	@qc: Command we are about to issue</div><div class='hunk'>@@ -577,6 +593,136 @@ static int it821x_check_atapi_dma(struct ata_queued_cmd *qc)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	it821x_display_disk	-	display disk setup</div><div class='add'>+ *	@n: Device number</div><div class='add'>+ *	@buf: Buffer block from firmware</div><div class='add'>+ *</div><div class='add'>+ *	Produce a nice informative display of the device setup as provided</div><div class='add'>+ *	by the firmware.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void it821x_display_disk(int n, u8 *buf)</div><div class='add'>+{</div><div class='add'>+	unsigned char id[41];</div><div class='add'>+	int mode = 0;</div><div class='add'>+	char *mtype = "";</div><div class='add'>+	char mbuf[8];</div><div class='add'>+	char *cbl = "(40 wire cable)";</div><div class='add'>+</div><div class='add'>+	static const char *types[5] = {</div><div class='add'>+		"RAID0", "RAID1" "RAID 0+1", "JBOD", "DISK"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (buf[52] &gt; 4)	/* No Disk */</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ata_id_c_string((u16 *)buf, id, 0, 41); </div><div class='add'>+</div><div class='add'>+	if (buf[51]) {</div><div class='add'>+		mode = ffs(buf[51]);</div><div class='add'>+		mtype = "UDMA";</div><div class='add'>+	} else if (buf[49]) {</div><div class='add'>+		mode = ffs(buf[49]);</div><div class='add'>+		mtype = "MWDMA";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (buf[76])</div><div class='add'>+		cbl = "";</div><div class='add'>+</div><div class='add'>+	if (mode)</div><div class='add'>+		snprintf(mbuf, 8, "%5s%d", mtype, mode - 1);</div><div class='add'>+	else</div><div class='add'>+		strcpy(mbuf, "PIO");</div><div class='add'>+	if (buf[52] == 4)</div><div class='add'>+		printk(KERN_INFO "%d: %-6s %-8s          %s %s\n",</div><div class='add'>+				n, mbuf, types[buf[52]], id, cbl);</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_INFO "%d: %-6s %-8s Volume: %1d %s %s\n",</div><div class='add'>+				n, mbuf, types[buf[52]], buf[53], id, cbl);</div><div class='add'>+	if (buf[125] &lt; 100)</div><div class='add'>+		printk(KERN_INFO "%d: Rebuilding: %d%%\n", n, buf[125]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	it821x_firmware_command		-	issue firmware command</div><div class='add'>+ *	@ap: IT821x port to interrogate</div><div class='add'>+ *	@cmd: command</div><div class='add'>+ *	@len: length</div><div class='add'>+ *</div><div class='add'>+ *	Issue firmware commands expecting data back from the controller. We</div><div class='add'>+ *	use this to issue commands that do not go via the normal paths. Other</div><div class='add'>+ *	commands such as 0xFC can be issued normally.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static u8 *it821x_firmware_command(struct ata_port *ap, u8 cmd, int len)</div><div class='add'>+{</div><div class='add'>+	u8 status;</div><div class='add'>+	int n = 0;</div><div class='add'>+	u16 *buf = kmalloc(len, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL) {</div><div class='add'>+		printk(KERN_ERR "it821x_firmware_command: Out of memory\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	/* This isn't quite a normal ATA command as we are talking to the</div><div class='add'>+	   firmware not the drives */</div><div class='add'>+	ap-&gt;ctl |= ATA_NIEN;</div><div class='add'>+	iowrite8(ap-&gt;ctl, ap-&gt;ioaddr.ctl_addr);</div><div class='add'>+	ata_wait_idle(ap);</div><div class='add'>+	iowrite8(ATA_DEVICE_OBS, ap-&gt;ioaddr.device_addr);</div><div class='add'>+	iowrite8(cmd, ap-&gt;ioaddr.command_addr);</div><div class='add'>+	udelay(1);</div><div class='add'>+	/* This should be almost immediate but a little paranoia goes a long</div><div class='add'>+	   way. */</div><div class='add'>+	while(n++ &lt; 10) {</div><div class='add'>+		status = ioread8(ap-&gt;ioaddr.status_addr);</div><div class='add'>+		if (status &amp; ATA_ERR) {</div><div class='add'>+			kfree(buf);</div><div class='add'>+			printk(KERN_ERR "it821x_firmware_command: rejected\n");</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		if (status &amp; ATA_DRQ) {</div><div class='add'>+			ioread16_rep(ap-&gt;ioaddr.data_addr, buf, len/2);</div><div class='add'>+			return (u8 *)buf;</div><div class='add'>+		}</div><div class='add'>+		mdelay(1);</div><div class='add'>+	}</div><div class='add'>+	kfree(buf);</div><div class='add'>+	printk(KERN_ERR "it821x_firmware_command: timeout\n");</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	it821x_probe_firmware	-	firmware reporting/setup</div><div class='add'>+ *	@ap: IT821x port being probed</div><div class='add'>+ *</div><div class='add'>+ *	Probe the firmware of the controller by issuing firmware command</div><div class='add'>+ *	0xFA and analysing the returned data.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void it821x_probe_firmware(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	u8 *buf;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* This is a bit ugly as we can't just issue a task file to a device</div><div class='add'>+	   as this is controller magic */</div><div class='add'>+</div><div class='add'>+	buf = it821x_firmware_command(ap, 0xFA, 512);</div><div class='add'>+</div><div class='add'>+	if (buf != NULL) {</div><div class='add'>+		printk(KERN_INFO "pata_it821x: Firmware %02X/%02X/%02X%02X\n",</div><div class='add'>+				buf[505],</div><div class='add'>+				buf[506],</div><div class='add'>+				buf[507],</div><div class='add'>+				buf[508]);</div><div class='add'>+		for (i = 0; i &lt; 4; i++)</div><div class='add'>+ 			it821x_display_disk(i, buf + 128 * i);</div><div class='add'>+		kfree(buf);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	it821x_port_start	-	port setup</div><div class='hunk'>@@ -610,6 +756,8 @@ static int it821x_port_start(struct ata_port *ap)</div><div class='ctx'> 		/* Long I/O's although allowed in LBA48 space cause the</div><div class='ctx'> 		   onboard firmware to enter the twighlight zone */</div><div class='ctx'> 		/* No ATAPI DMA in this mode either */</div><div class='add'>+		if (ap-&gt;port_no == 0)</div><div class='add'>+			it821x_probe_firmware(ap);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Pull the current clocks from 0x50 */</div><div class='ctx'> 	if (conf &amp; (1 &lt;&lt; (1 + ap-&gt;port_no)))</div><div class='hunk'>@@ -631,6 +779,25 @@ static int it821x_port_start(struct ata_port *ap)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	it821x_rdc_cable	-	Cable detect for RDC1010</div><div class='add'>+ *	@ap: port we are checking</div><div class='add'>+ *</div><div class='add'>+ *	Return the RDC1010 cable type. Unlike the IT821x we know how to do</div><div class='add'>+ *	this and can do host side cable detect</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int it821x_rdc_cable(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	u16 r40;</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(ap-&gt;host-&gt;dev);</div><div class='add'>+</div><div class='add'>+	pci_read_config_word(pdev, 0x40, &amp;r40);</div><div class='add'>+	if (r40 &amp; (1 &lt;&lt; (2 + ap-&gt;port_no)))</div><div class='add'>+		return ATA_CBL_PATA40;</div><div class='add'>+	return ATA_CBL_PATA80;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct scsi_host_template it821x_sht = {</div><div class='ctx'> 	ATA_BMDMA_SHT(DRV_NAME),</div><div class='ctx'> };</div><div class='hunk'>@@ -641,9 +808,10 @@ static struct ata_port_operations it821x_smart_port_ops = {</div><div class='ctx'> 	.check_atapi_dma= it821x_check_atapi_dma,</div><div class='ctx'> 	.qc_issue	= it821x_smart_qc_issue,</div><div class='ctx'> </div><div class='del'>-	.cable_detect	= it821x_ident_hack,</div><div class='add'>+	.cable_detect	= ata_cable_80wire,</div><div class='ctx'> 	.set_mode	= it821x_smart_set_mode,</div><div class='ctx'> 	.dev_config	= it821x_dev_config,</div><div class='add'>+	.read_id	= it821x_read_id,</div><div class='ctx'> </div><div class='ctx'> 	.port_start	= it821x_port_start,</div><div class='ctx'> };</div><div class='hunk'>@@ -664,8 +832,29 @@ static struct ata_port_operations it821x_passthru_port_ops = {</div><div class='ctx'> 	.port_start	= it821x_port_start,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct ata_port_operations it821x_rdc_port_ops = {</div><div class='add'>+	.inherits	= &amp;ata_bmdma_port_ops,</div><div class='add'>+</div><div class='add'>+	.check_atapi_dma= it821x_check_atapi_dma,</div><div class='add'>+	.sff_dev_select	= it821x_passthru_dev_select,</div><div class='add'>+	.bmdma_start 	= it821x_passthru_bmdma_start,</div><div class='add'>+	.bmdma_stop	= it821x_passthru_bmdma_stop,</div><div class='add'>+	.qc_issue	= it821x_passthru_qc_issue,</div><div class='add'>+</div><div class='add'>+	.cable_detect	= it821x_rdc_cable,</div><div class='add'>+	.set_piomode	= it821x_passthru_set_piomode,</div><div class='add'>+	.set_dmamode	= it821x_passthru_set_dmamode,</div><div class='add'>+</div><div class='add'>+	.port_start	= it821x_port_start,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void it821x_disable_raid(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='add'>+	/* Neither the RDC nor the IT8211 */</div><div class='add'>+	if (pdev-&gt;vendor != PCI_VENDOR_ID_ITE ||</div><div class='add'>+			pdev-&gt;device != PCI_DEVICE_ID_ITE_8212)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='ctx'> 	/* Reset local CPU, and set BIOS not ready */</div><div class='ctx'> 	pci_write_config_byte(pdev, 0x5E, 0x01);</div><div class='ctx'> </div><div class='hunk'>@@ -690,6 +879,7 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		.flags = ATA_FLAG_SLAVE_POSS,</div><div class='ctx'> 		.pio_mask = 0x1f,</div><div class='ctx'> 		.mwdma_mask = 0x07,</div><div class='add'>+		.udma_mask = ATA_UDMA6,</div><div class='ctx'> 		.port_ops = &amp;it821x_smart_port_ops</div><div class='ctx'> 	};</div><div class='ctx'> 	static const struct ata_port_info info_passthru = {</div><div class='hunk'>@@ -699,6 +889,13 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		.udma_mask = ATA_UDMA6,</div><div class='ctx'> 		.port_ops = &amp;it821x_passthru_port_ops</div><div class='ctx'> 	};</div><div class='add'>+	static const struct ata_port_info info_rdc = {</div><div class='add'>+		.flags = ATA_FLAG_SLAVE_POSS,</div><div class='add'>+		.pio_mask = 0x1f,</div><div class='add'>+		.mwdma_mask = 0x07,</div><div class='add'>+		/* No UDMA */</div><div class='add'>+		.port_ops = &amp;it821x_rdc_port_ops</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	const struct ata_port_info *ppi[] = { NULL, NULL };</div><div class='ctx'> 	static char *mode[2] = { "pass through", "smart" };</div><div class='hunk'>@@ -707,21 +904,25 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	rc = pcim_enable_device(pdev);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='add'>+		</div><div class='add'>+	if (pdev-&gt;vendor == PCI_VENDOR_ID_RDC) {</div><div class='add'>+		ppi[0] = &amp;info_rdc;</div><div class='add'>+	} else {</div><div class='add'>+		/* Force the card into bypass mode if so requested */</div><div class='add'>+		if (it8212_noraid) {</div><div class='add'>+			printk(KERN_INFO DRV_NAME ": forcing bypass mode.\n");</div><div class='add'>+			it821x_disable_raid(pdev);</div><div class='add'>+		}</div><div class='add'>+		pci_read_config_byte(pdev, 0x50, &amp;conf);</div><div class='add'>+		conf &amp;= 1;</div><div class='ctx'> </div><div class='del'>-	/* Force the card into bypass mode if so requested */</div><div class='del'>-	if (it8212_noraid) {</div><div class='del'>-		printk(KERN_INFO DRV_NAME ": forcing bypass mode.\n");</div><div class='del'>-		it821x_disable_raid(pdev);</div><div class='add'>+		printk(KERN_INFO DRV_NAME": controller in %s mode.\n",</div><div class='add'>+								mode[conf]);</div><div class='add'>+		if (conf == 0)</div><div class='add'>+			ppi[0] = &amp;info_passthru;</div><div class='add'>+		else</div><div class='add'>+			ppi[0] = &amp;info_smart;</div><div class='ctx'> 	}</div><div class='del'>-	pci_read_config_byte(pdev, 0x50, &amp;conf);</div><div class='del'>-	conf &amp;= 1;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO DRV_NAME ": controller in %s mode.\n", mode[conf]);</div><div class='del'>-	if (conf == 0)</div><div class='del'>-		ppi[0] = &amp;info_passthru;</div><div class='del'>-	else</div><div class='del'>-		ppi[0] = &amp;info_smart;</div><div class='del'>-</div><div class='ctx'> 	return ata_pci_sff_init_one(pdev, ppi, &amp;it821x_sht, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -745,6 +946,7 @@ static int it821x_reinit_one(struct pci_dev *pdev)</div><div class='ctx'> static const struct pci_device_id it821x[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(ITE, PCI_DEVICE_ID_ITE_8211), },</div><div class='ctx'> 	{ PCI_VDEVICE(ITE, PCI_DEVICE_ID_ITE_8212), },</div><div class='add'>+	{ PCI_VDEVICE(RDC, 0x1010), },</div><div class='ctx'> </div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c<br/>index 24a011b25024..0d87eec84966 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_marvell.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/pata_marvell.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_marvell.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_marvell.c</a></div><div class='hunk'>@@ -20,29 +20,30 @@</div><div class='ctx'> #include &lt;linux/ata.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"pata_marvell"</div><div class='del'>-#define DRV_VERSION	"0.1.4"</div><div class='add'>+#define DRV_VERSION	"0.1.6"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	marvell_pre_reset	-	check for 40/80 pin</div><div class='del'>- *	@link: link</div><div class='del'>- *	@deadline: deadline jiffies for the operation</div><div class='add'>+ *	marvell_pata_active	-	check if PATA is active</div><div class='add'>+ *	@pdev: PCI device</div><div class='ctx'>  *</div><div class='del'>- *	Perform the PATA port setup we need.</div><div class='add'>+ *	Returns 1 if the PATA port may be active. We know how to check this</div><div class='add'>+ *	for the 6145 but not the other devices</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int marvell_pre_reset(struct ata_link *link, unsigned long deadline)</div><div class='add'>+static int marvell_pata_active(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct ata_port *ap = link-&gt;ap;</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(ap-&gt;host-&gt;dev);</div><div class='add'>+	int i;</div><div class='ctx'> 	u32 devices;</div><div class='ctx'> 	void __iomem *barp;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	/* Check if our port is enabled */</div><div class='add'>+	/* We don't yet know how to do this for other devices */</div><div class='add'>+	if (pdev-&gt;device != 0x6145)</div><div class='add'>+		return 1;	</div><div class='ctx'> </div><div class='ctx'> 	barp = pci_iomap(pdev, 5, 0x10);</div><div class='ctx'> 	if (barp == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	printk("BAR5:");</div><div class='ctx'> 	for(i = 0; i &lt;= 0x0F; i++)</div><div class='ctx'> 		printk("%02X:%02X ", i, ioread8(barp + i));</div><div class='hunk'>@@ -51,9 +52,27 @@ static int marvell_pre_reset(struct ata_link *link, unsigned long deadline)</div><div class='ctx'> 	devices = ioread32(barp + 0x0C);</div><div class='ctx'> 	pci_iounmap(pdev, barp);</div><div class='ctx'> </div><div class='del'>-	if ((pdev-&gt;device == 0x6145) &amp;&amp; (ap-&gt;port_no == 0) &amp;&amp;</div><div class='del'>-	    (!(devices &amp; 0x10)))	/* PATA enable ? */</div><div class='del'>-		return -ENOENT;</div><div class='add'>+	if (devices &amp; 0x10)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	marvell_pre_reset	-	check for 40/80 pin</div><div class='add'>+ *	@link: link</div><div class='add'>+ *	@deadline: deadline jiffies for the operation</div><div class='add'>+ *</div><div class='add'>+ *	Perform the PATA port setup we need.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int marvell_pre_reset(struct ata_link *link, unsigned long deadline)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = link-&gt;ap;</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(ap-&gt;host-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;device == 0x6145 &amp;&amp; ap-&gt;port_no == 0 &amp;&amp;</div><div class='add'>+		!marvell_pata_active(pdev))	/* PATA enable ? */</div><div class='add'>+			return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	return ata_sff_prereset(link, deadline);</div><div class='ctx'> }</div><div class='hunk'>@@ -128,6 +147,12 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i</div><div class='ctx'> 	if (pdev-&gt;device == 0x6101)</div><div class='ctx'> 		ppi[1] = &amp;ata_dummy_port_info;</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_AHCI) || defined(CONFIG_AHCI_MODULE)</div><div class='add'>+	if (!marvell_pata_active(pdev)) {</div><div class='add'>+		printk(KERN_INFO DRV_NAME ": PATA port not active, deferring to AHCI driver.\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	return ata_pci_sff_init_one(pdev, ppi, &amp;marvell_sht, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c<br/>index e678af383d13..df64f2443001 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_oldpiix.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/pata_oldpiix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_oldpiix.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_oldpiix.c</a></div><div class='hunk'>@@ -198,7 +198,7 @@ static unsigned int oldpiix_qc_issue(struct ata_queued_cmd *qc)</div><div class='ctx'> </div><div class='ctx'> 	if (adev != ap-&gt;private_data) {</div><div class='ctx'> 		oldpiix_set_piomode(ap, adev);</div><div class='del'>-		if (adev-&gt;dma_mode)</div><div class='add'>+		if (ata_dma_enabled(adev))</div><div class='ctx'> 			oldpiix_set_dmamode(ap, adev);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ata_sff_qc_issue(qc);</div><div class='head'>diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c<br/>index cbab397e3db7..0278fd2b8fb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_sc1200.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/pata_sc1200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_sc1200.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_sc1200.c</a></div><div class='hunk'>@@ -167,10 +167,10 @@ static unsigned int sc1200_qc_issue(struct ata_queued_cmd *qc)</div><div class='ctx'> 	struct ata_device *prev = ap-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	/* See if the DMA settings could be wrong */</div><div class='del'>-	if (adev-&gt;dma_mode != 0 &amp;&amp; adev != prev &amp;&amp; prev != NULL) {</div><div class='add'>+	if (ata_dma_enabled(adev) &amp;&amp; adev != prev &amp;&amp; prev != NULL) {</div><div class='ctx'> 		/* Maybe, but do the channels match MWDMA/UDMA ? */</div><div class='del'>-		if ((adev-&gt;dma_mode &gt;= XFER_UDMA_0 &amp;&amp; prev-&gt;dma_mode &lt; XFER_UDMA_0) ||</div><div class='del'>-		    (adev-&gt;dma_mode &lt; XFER_UDMA_0 &amp;&amp; prev-&gt;dma_mode &gt;= XFER_UDMA_0))</div><div class='add'>+		if ((ata_using_udma(adev) &amp;&amp; !ata_using_udma(prev)) ||</div><div class='add'>+		    (ata_using_udma(prev) &amp;&amp; !ata_using_udma(adev)))</div><div class='ctx'> 		    	/* Switch the mode bits */</div><div class='ctx'> 		    	sc1200_set_dmamode(ap, adev);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c<br/>index 720b8645f58a..e970b227fbce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_sil680.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/pata_sil680.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_sil680.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_sil680.c</a></div><div class='hunk'>@@ -322,9 +322,6 @@ static int __devinit sil680_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	/* Try to acquire MMIO resources and fallback to PIO if</div><div class='ctx'> 	 * that fails</div><div class='ctx'> 	 */</div><div class='del'>-	rc = pcim_enable_device(pdev);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='ctx'> 	rc = pcim_iomap_regions(pdev, 1 &lt;&lt; SIL680_MMIO_BAR, DRV_NAME);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto use_ioports;</div><div class='head'>diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c<br/>index 708ed144ede9..8fdb2ce73210 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_via.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/pata_via.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_via.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/pata_via.c</a></div><div class='hunk'>@@ -98,7 +98,8 @@ static const struct via_isa_bridge {</div><div class='ctx'> 	u8 rev_max;</div><div class='ctx'> 	u16 flags;</div><div class='ctx'> } via_isa_bridges[] = {</div><div class='del'>-	{ "vx800",	PCI_DEVICE_ID_VIA_VX800,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },</div><div class='add'>+	{ "vx800",	PCI_DEVICE_ID_VIA_VX800,    0x00, 0x2f, VIA_UDMA_133 |</div><div class='add'>+	VIA_BAD_AST | VIA_SATA_PATA },</div><div class='ctx'> 	{ "vt8237s",	PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },</div><div class='ctx'> 	{ "vt8251",	PCI_DEVICE_ID_VIA_8251,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },</div><div class='ctx'> 	{ "cx700",	PCI_DEVICE_ID_VIA_CX700,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST | VIA_SATA_PATA },</div><div class='hunk'>@@ -322,6 +323,29 @@ static void via_set_dmamode(struct ata_port *ap, struct ata_device *adev)</div><div class='ctx'> 	via_do_set_mode(ap, adev, adev-&gt;dma_mode, tclock[mode], set_ast, udma[mode]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	via_tf_load - send taskfile registers to host controller</div><div class='add'>+ *	@ap: Port to which output is sent</div><div class='add'>+ *	@tf: ATA taskfile register set</div><div class='add'>+ *</div><div class='add'>+ *	Outputs ATA taskfile to standard ATA host controller.</div><div class='add'>+ *</div><div class='add'>+ *	Note: This is to fix the internal bug of via chipsets, which</div><div class='add'>+ *	will reset the device register after changing the IEN bit on</div><div class='add'>+ *	ctl register</div><div class='add'>+ */</div><div class='add'>+static void via_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)</div><div class='add'>+{</div><div class='add'>+	struct ata_taskfile tmp_tf;</div><div class='add'>+</div><div class='add'>+	if (ap-&gt;ctl != ap-&gt;last_ctl &amp;&amp; !(tf-&gt;flags &amp; ATA_TFLAG_DEVICE)) {</div><div class='add'>+		tmp_tf = *tf;</div><div class='add'>+		tmp_tf.flags |= ATA_TFLAG_DEVICE;</div><div class='add'>+		tf = &amp;tmp_tf;</div><div class='add'>+	}</div><div class='add'>+	ata_sff_tf_load(ap, tf);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct scsi_host_template via_sht = {</div><div class='ctx'> 	ATA_BMDMA_SHT(DRV_NAME),</div><div class='ctx'> };</div><div class='hunk'>@@ -332,6 +356,7 @@ static struct ata_port_operations via_port_ops = {</div><div class='ctx'> 	.set_piomode	= via_set_piomode,</div><div class='ctx'> 	.set_dmamode	= via_set_dmamode,</div><div class='ctx'> 	.prereset	= via_pre_reset,</div><div class='add'>+	.sff_tf_load	= via_tf_load,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ata_port_operations via_port_ops_noirq = {</div><div class='head'>diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c<br/>index 3ead02fe379e..5032c32fa505 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/sata_inic162x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/sata_inic162x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/sata_inic162x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/sata_inic162x.c</a></div><div class='hunk'>@@ -96,6 +96,7 @@ enum {</div><div class='ctx'> 	PORT_SCR		= 0x20,</div><div class='ctx'> </div><div class='ctx'> 	/* HOST_CTL bits */</div><div class='add'>+	HCTL_LEDEN		= (1 &lt;&lt; 3),  /* enable LED operation */</div><div class='ctx'> 	HCTL_IRQOFF		= (1 &lt;&lt; 8),  /* global IRQ off */</div><div class='ctx'> 	HCTL_FTHD0		= (1 &lt;&lt; 10), /* fifo threshold 0 */</div><div class='ctx'> 	HCTL_FTHD1		= (1 &lt;&lt; 11), /* fifo threshold 1*/</div><div class='hunk'>@@ -540,7 +541,7 @@ static unsigned int inic_qc_issue(struct ata_queued_cmd *qc)</div><div class='ctx'> 	void __iomem *port_base = inic_port_base(ap);</div><div class='ctx'> </div><div class='ctx'> 	/* fire up the ADMA engine */</div><div class='del'>-	writew(HCTL_FTHD0, port_base + HOST_CTL);</div><div class='add'>+	writew(HCTL_FTHD0 | HCTL_LEDEN, port_base + HOST_CTL);</div><div class='ctx'> 	writew(IDMA_CTL_GO, port_base + PORT_IDMA_CTL);</div><div class='ctx'> 	writeb(0, port_base + PORT_CPB_PTQFIFO);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c<br/>index ad169ffbc4cb..c815f8ecf6e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/sata_mv.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/sata_mv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/sata_mv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/sata_mv.c</a></div><div class='hunk'>@@ -667,7 +667,8 @@ static const struct pci_device_id mv_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(MARVELL, 0x5041), chip_504x },</div><div class='ctx'> 	{ PCI_VDEVICE(MARVELL, 0x5080), chip_5080 },</div><div class='ctx'> 	{ PCI_VDEVICE(MARVELL, 0x5081), chip_508x },</div><div class='del'>-	/* RocketRAID 1740/174x have different identifiers */</div><div class='add'>+	/* RocketRAID 1720/174x have different identifiers */</div><div class='add'>+	{ PCI_VDEVICE(TTI, 0x1720), chip_6042 },</div><div class='ctx'> 	{ PCI_VDEVICE(TTI, 0x1740), chip_508x },</div><div class='ctx'> 	{ PCI_VDEVICE(TTI, 0x1742), chip_508x },</div><div class='ctx'> </div><div class='hunk'>@@ -1134,30 +1135,16 @@ static int mv_qc_defer(struct ata_queued_cmd *qc)</div><div class='ctx'> 	if (ap-&gt;nr_active_links == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (pp-&gt;pp_flags &amp; MV_PP_FLAG_EDMA_EN) {</div><div class='del'>-		/*</div><div class='del'>-		 * The port is operating in host queuing mode (EDMA).</div><div class='del'>-		 * It can accomodate a new qc if the qc protocol</div><div class='del'>-		 * is compatible with the current host queue mode.</div><div class='del'>-		 */</div><div class='del'>-		if (pp-&gt;pp_flags &amp; MV_PP_FLAG_NCQ_EN) {</div><div class='del'>-			/*</div><div class='del'>-			 * The host queue (EDMA) is in NCQ mode.</div><div class='del'>-			 * If the new qc is also an NCQ command,</div><div class='del'>-			 * then allow the new qc.</div><div class='del'>-			 */</div><div class='del'>-			if (qc-&gt;tf.protocol == ATA_PROT_NCQ)</div><div class='del'>-				return 0;</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * The host queue (EDMA) is in non-NCQ, DMA mode.</div><div class='del'>-			 * If the new qc is also a non-NCQ, DMA command,</div><div class='del'>-			 * then allow the new qc.</div><div class='del'>-			 */</div><div class='del'>-			if (qc-&gt;tf.protocol == ATA_PROT_DMA)</div><div class='del'>-				return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * The port is operating in host queuing mode (EDMA) with NCQ</div><div class='add'>+	 * enabled, allow multiple NCQ commands.  EDMA also allows</div><div class='add'>+	 * queueing multiple DMA commands but libata core currently</div><div class='add'>+	 * doesn't allow it.</div><div class='add'>+	 */</div><div class='add'>+	if ((pp-&gt;pp_flags &amp; MV_PP_FLAG_EDMA_EN) &amp;&amp;</div><div class='add'>+	    (pp-&gt;pp_flags &amp; MV_PP_FLAG_NCQ_EN) &amp;&amp; ata_is_ncq(qc-&gt;tf.protocol))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	return ATA_DEFER_PORT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3036,7 +3023,8 @@ static int mv_chip_id(struct ata_host *host, unsigned int board_idx)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case chip_soc:</div><div class='ctx'> 		hpriv-&gt;ops = &amp;mv_soc_ops;</div><div class='del'>-		hp_flags |= MV_HP_FLAG_SOC | MV_HP_ERRATA_60X1C0;</div><div class='add'>+		hp_flags |= MV_HP_FLAG_SOC | MV_HP_GEN_IIE |</div><div class='add'>+			MV_HP_ERRATA_60X1C0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='head'>diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c<br/>index 858f70610eda..1e1f3f3757ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/sata_nv.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ata/sata_nv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/sata_nv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ata/sata_nv.c</a></div><div class='hunk'>@@ -309,8 +309,6 @@ static void nv_nf2_freeze(struct ata_port *ap);</div><div class='ctx'> static void nv_nf2_thaw(struct ata_port *ap);</div><div class='ctx'> static void nv_ck804_freeze(struct ata_port *ap);</div><div class='ctx'> static void nv_ck804_thaw(struct ata_port *ap);</div><div class='del'>-static int nv_hardreset(struct ata_link *link, unsigned int *class,</div><div class='del'>-			unsigned long deadline);</div><div class='ctx'> static int nv_adma_slave_config(struct scsi_device *sdev);</div><div class='ctx'> static int nv_adma_check_atapi_dma(struct ata_queued_cmd *qc);</div><div class='ctx'> static void nv_adma_qc_prep(struct ata_queued_cmd *qc);</div><div class='hunk'>@@ -407,7 +405,7 @@ static struct scsi_host_template nv_swncq_sht = {</div><div class='ctx'> </div><div class='ctx'> static struct ata_port_operations nv_generic_ops = {</div><div class='ctx'> 	.inherits		= &amp;ata_bmdma_port_ops,</div><div class='del'>-	.hardreset		= nv_hardreset,</div><div class='add'>+	.hardreset		= ATA_OP_NULL,</div><div class='ctx'> 	.scr_read		= nv_scr_read,</div><div class='ctx'> 	.scr_write		= nv_scr_write,</div><div class='ctx'> };</div><div class='hunk'>@@ -1588,21 +1586,6 @@ static void nv_mcp55_thaw(struct ata_port *ap)</div><div class='ctx'> 	ata_sff_thaw(ap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nv_hardreset(struct ata_link *link, unsigned int *class,</div><div class='del'>-			unsigned long deadline)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	/* SATA hardreset fails to retrieve proper device signature on</div><div class='del'>-	 * some controllers.  Request follow up SRST.  For more info,</div><div class='del'>-	 * see http://bugzilla.kernel.org/show_bug.cgi?id=3352</div><div class='del'>-	 */</div><div class='del'>-	rc = sata_sff_hardreset(link, class, deadline);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-	return -EAGAIN;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void nv_adma_error_handler(struct ata_port *ap)</div><div class='ctx'> {</div><div class='ctx'> 	struct nv_adma_port_priv *pp = ap-&gt;private_data;</div><div class='head'>diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c<br/>index 2ebd07f2ef81..5effec6f5458 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/adummy.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/atm/adummy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/adummy.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/atm/adummy.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c<br/>index 24df73ad326d..088885ed51b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/iphase.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/atm/iphase.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/iphase.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/atm/iphase.c</a></div><div class='hunk'>@@ -156,8 +156,8 @@ static void ia_hack_tcq(IADEV *dev) {</div><div class='ctx'>         }</div><div class='ctx'>         iavcc_r-&gt;vc_desc_cnt--;</div><div class='ctx'>         dev-&gt;desc_tbl[desc1 -1].timestamp = 0;</div><div class='del'>-        IF_EVENT(printk("ia_hack: return_q skb = 0x%x desc = %d\n", </div><div class='del'>-                                   (u32)dev-&gt;desc_tbl[desc1 -1].txskb, desc1);)</div><div class='add'>+        IF_EVENT(printk("ia_hack: return_q skb = 0x%p desc = %d\n",</div><div class='add'>+                                   dev-&gt;desc_tbl[desc1 -1].txskb, desc1);)</div><div class='ctx'>         if (iavcc_r-&gt;pcr &lt; dev-&gt;rate_limit) {</div><div class='ctx'>            IA_SKB_STATE (dev-&gt;desc_tbl[desc1-1].txskb) |= IA_TX_DONE;</div><div class='ctx'>            if (ia_enque_rtn_q(&amp;dev-&gt;tx_return_q, dev-&gt;desc_tbl[desc1 -1]) &lt; 0)</div><div class='hunk'>@@ -527,8 +527,8 @@ static int ia_cbr_setup (IADEV *dev, struct atm_vcc *vcc) {</div><div class='ctx'>       inc = 0;</div><div class='ctx'>       testSlot = idealSlot;</div><div class='ctx'>       TstSchedTbl = (u16*)(SchedTbl+testSlot);  //set index and read in value</div><div class='del'>-      IF_CBR(printk("CBR Testslot 0x%x AT Location 0x%x, NumToAssign=%d\n",</div><div class='del'>-                                testSlot, (u32)TstSchedTbl,toBeAssigned);) </div><div class='add'>+      IF_CBR(printk("CBR Testslot 0x%x AT Location 0x%p, NumToAssign=%d\n",</div><div class='add'>+                                testSlot, TstSchedTbl,toBeAssigned);)</div><div class='ctx'>       memcpy((caddr_t)&amp;cbrVC,(caddr_t)TstSchedTbl,sizeof(cbrVC));</div><div class='ctx'>       while (cbrVC)  // If another VC at this location, we have to keep looking</div><div class='ctx'>       {</div><div class='hunk'>@@ -536,8 +536,8 @@ static int ia_cbr_setup (IADEV *dev, struct atm_vcc *vcc) {</div><div class='ctx'>           testSlot = idealSlot - inc;</div><div class='ctx'>           if (testSlot &lt; 0) { // Wrap if necessary</div><div class='ctx'>              testSlot += dev-&gt;CbrTotEntries;</div><div class='del'>-             IF_CBR(printk("Testslot Wrap. STable Start=0x%x,Testslot=%d\n",</div><div class='del'>-                                                       (u32)SchedTbl,testSlot);)</div><div class='add'>+             IF_CBR(printk("Testslot Wrap. STable Start=0x%p,Testslot=%d\n",</div><div class='add'>+                                                       SchedTbl,testSlot);)</div><div class='ctx'>           }</div><div class='ctx'>           TstSchedTbl = (u16 *)(SchedTbl + testSlot);  // set table index</div><div class='ctx'>           memcpy((caddr_t)&amp;cbrVC,(caddr_t)TstSchedTbl,sizeof(cbrVC)); </div><div class='hunk'>@@ -552,8 +552,8 @@ static int ia_cbr_setup (IADEV *dev, struct atm_vcc *vcc) {</div><div class='ctx'>           } </div><div class='ctx'>           // set table index and read in value</div><div class='ctx'>           TstSchedTbl = (u16*)(SchedTbl + testSlot);</div><div class='del'>-          IF_CBR(printk("Reading CBR Tbl from 0x%x, CbrVal=0x%x Iteration %d\n",</div><div class='del'>-                          (u32)TstSchedTbl,cbrVC,inc);) </div><div class='add'>+          IF_CBR(printk("Reading CBR Tbl from 0x%p, CbrVal=0x%x Iteration %d\n",</div><div class='add'>+                          TstSchedTbl,cbrVC,inc);)</div><div class='ctx'>           memcpy((caddr_t)&amp;cbrVC,(caddr_t)TstSchedTbl,sizeof(cbrVC));</div><div class='ctx'>        } /* while */</div><div class='ctx'>        // Move this VCI number into this location of the CBR Sched table.</div><div class='hunk'>@@ -1427,11 +1427,11 @@ static int rx_init(struct atm_dev *dev)</div><div class='ctx'> 	/* We know this is 32bit bus addressed so the following is safe */</div><div class='ctx'> 	writel(iadev-&gt;rx_dle_dma &amp; 0xfffff000,</div><div class='ctx'> 	       iadev-&gt;dma + IPHASE5575_RX_LIST_ADDR);  </div><div class='del'>-	IF_INIT(printk("Tx Dle list addr: 0x%08x value: 0x%0x\n", </div><div class='del'>-                      (u32)(iadev-&gt;dma+IPHASE5575_TX_LIST_ADDR), </div><div class='add'>+	IF_INIT(printk("Tx Dle list addr: 0x%p value: 0x%0x\n",</div><div class='add'>+                      iadev-&gt;dma+IPHASE5575_TX_LIST_ADDR,</div><div class='ctx'>                       *(u32*)(iadev-&gt;dma+IPHASE5575_TX_LIST_ADDR));  </div><div class='del'>-	printk("Rx Dle list addr: 0x%08x value: 0x%0x\n", </div><div class='del'>-                      (u32)(iadev-&gt;dma+IPHASE5575_RX_LIST_ADDR), </div><div class='add'>+	printk("Rx Dle list addr: 0x%p value: 0x%0x\n",</div><div class='add'>+                      iadev-&gt;dma+IPHASE5575_RX_LIST_ADDR,</div><div class='ctx'>                       *(u32*)(iadev-&gt;dma+IPHASE5575_RX_LIST_ADDR));)  </div><div class='ctx'>   </div><div class='ctx'> 	writew(0xffff, iadev-&gt;reass_reg+REASS_MASK_REG);  </div><div class='hunk'>@@ -1470,7 +1470,7 @@ static int rx_init(struct atm_dev *dev)</div><div class='ctx'> 		buf_desc_ptr++;		  </div><div class='ctx'> 		rx_pkt_start += iadev-&gt;rx_buf_sz;  </div><div class='ctx'> 	}  </div><div class='del'>-	IF_INIT(printk("Rx Buffer desc ptr: 0x%0x\n", (u32)(buf_desc_ptr));)  </div><div class='add'>+	IF_INIT(printk("Rx Buffer desc ptr: 0x%p\n", buf_desc_ptr);)</div><div class='ctx'>         i = FREE_BUF_DESC_Q*iadev-&gt;memSize; </div><div class='ctx'> 	writew(i &gt;&gt; 16,  iadev-&gt;reass_reg+REASS_QUEUE_BASE); </div><div class='ctx'>         writew(i, iadev-&gt;reass_reg+FREEQ_ST_ADR);</div><div class='hunk'>@@ -1487,7 +1487,7 @@ static int rx_init(struct atm_dev *dev)</div><div class='ctx'> 		*freeq_start = (u_short)i;  </div><div class='ctx'> 		freeq_start++;  </div><div class='ctx'> 	}  </div><div class='del'>-	IF_INIT(printk("freeq_start: 0x%0x\n", (u32)freeq_start);)  </div><div class='add'>+	IF_INIT(printk("freeq_start: 0x%p\n", freeq_start);)</div><div class='ctx'>         /* Packet Complete Queue */</div><div class='ctx'>         i = (PKT_COMP_Q * iadev-&gt;memSize) &amp; 0xffff;</div><div class='ctx'>         writew(i, iadev-&gt;reass_reg+PCQ_ST_ADR);</div><div class='hunk'>@@ -1713,7 +1713,7 @@ static void tx_dle_intr(struct atm_dev *dev)</div><div class='ctx'>                IA_SKB_STATE(skb) |= IA_DLED;</div><div class='ctx'>                skb_queue_tail(&amp;iavcc-&gt;txing_skb, skb);</div><div class='ctx'>             }</div><div class='del'>-            IF_EVENT(printk("tx_dle_intr: enque skb = 0x%x \n", (u32)skb);)</div><div class='add'>+            IF_EVENT(printk("tx_dle_intr: enque skb = 0x%p \n", skb);)</div><div class='ctx'>             if (++dle == iadev-&gt;tx_dle_q.end)</div><div class='ctx'>                  dle = iadev-&gt;tx_dle_q.start;</div><div class='ctx'>         }</div><div class='hunk'>@@ -2044,8 +2044,8 @@ static int tx_init(struct atm_dev *dev)</div><div class='ctx'>         writew(tmp16, iadev-&gt;seg_reg+CBR_TAB_END+1); // CBR_PTR;</div><div class='ctx'>         tmp16 = (CBR_SCHED_TABLE*iadev-&gt;memSize + iadev-&gt;num_vc*6 - 2) &gt;&gt; 1;</div><div class='ctx'>         writew(tmp16, iadev-&gt;seg_reg+CBR_TAB_END);</div><div class='del'>-        IF_INIT(printk("iadev-&gt;seg_reg = 0x%x CBR_PTR_BASE = 0x%x\n",</div><div class='del'>-               (u32)iadev-&gt;seg_reg, readw(iadev-&gt;seg_reg+CBR_PTR_BASE));)</div><div class='add'>+        IF_INIT(printk("iadev-&gt;seg_reg = 0x%p CBR_PTR_BASE = 0x%x\n",</div><div class='add'>+               iadev-&gt;seg_reg, readw(iadev-&gt;seg_reg+CBR_PTR_BASE));)</div><div class='ctx'>         IF_INIT(printk("CBR_TAB_BEG = 0x%x, CBR_TAB_END = 0x%x, CBR_PTR = 0x%x\n",</div><div class='ctx'>           readw(iadev-&gt;seg_reg+CBR_TAB_BEG), readw(iadev-&gt;seg_reg+CBR_TAB_END),</div><div class='ctx'>           readw(iadev-&gt;seg_reg+CBR_TAB_END+1));)</div><div class='hunk'>@@ -2963,8 +2963,8 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {</div><div class='ctx'>  </div><div class='ctx'> 	/* Put the packet in a tx buffer */   </div><div class='ctx'> 	trailer = iadev-&gt;tx_buf[desc-1].cpcs;</div><div class='del'>-        IF_TX(printk("Sent: skb = 0x%x skb-&gt;data: 0x%x len: %d, desc: %d\n",</div><div class='del'>-                  (u32)skb, (u32)skb-&gt;data, skb-&gt;len, desc);)</div><div class='add'>+        IF_TX(printk("Sent: skb = 0x%p skb-&gt;data: 0x%p len: %d, desc: %d\n",</div><div class='add'>+                  skb, skb-&gt;data, skb-&gt;len, desc);)</div><div class='ctx'> 	trailer-&gt;control = 0; </div><div class='ctx'>         /*big endian*/ </div><div class='ctx'> 	trailer-&gt;length = ((skb-&gt;len &amp; 0xff) &lt;&lt; 8) | ((skb-&gt;len &amp; 0xff00) &gt;&gt; 8);</div><div class='hunk'>@@ -3181,7 +3181,7 @@ static int __devinit ia_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;dev_data = iadev;</div><div class='ctx'> 	IF_INIT(printk(DEV_LABEL "registered at (itf :%d)\n", dev-&gt;number);)</div><div class='del'>-	IF_INIT(printk("dev_id = 0x%x iadev-&gt;LineRate = %d \n", (u32)dev,</div><div class='add'>+	IF_INIT(printk("dev_id = 0x%p iadev-&gt;LineRate = %d \n", dev,</div><div class='ctx'> 		iadev-&gt;LineRate);)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='head'>diff --git a/drivers/base/class.c b/drivers/base/class.c<br/>index 839d27cecb36..cc5e28c8885c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/class.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/base/class.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/class.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/base/class.c</a></div><div class='hunk'>@@ -198,6 +198,7 @@ static void class_create_release(struct class *cls)</div><div class='ctx'>  * class_create - create a struct class structure</div><div class='ctx'>  * @owner: pointer to the module that is to "own" this struct class</div><div class='ctx'>  * @name: pointer to a string for the name of this class.</div><div class='add'>+ * @key: the lock_class_key for this class; used by mutex lock debugging</div><div class='ctx'>  *</div><div class='ctx'>  * This is used to create a struct class pointer that can then be used</div><div class='ctx'>  * in calls to device_create().</div><div class='hunk'>@@ -294,6 +295,12 @@ int class_for_each_device(struct class *class, struct device *start,</div><div class='ctx'> </div><div class='ctx'> 	if (!class)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if (!class-&gt;p) {</div><div class='add'>+		WARN(1, "%s called for class '%s' before it was initialized",</div><div class='add'>+		     __func__, class-&gt;name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;class-&gt;p-&gt;class_mutex);</div><div class='ctx'> 	list_for_each_entry(dev, &amp;class-&gt;p-&gt;class_devices, node) {</div><div class='ctx'> 		if (start) {</div><div class='hunk'>@@ -343,6 +350,11 @@ struct device *class_find_device(struct class *class, struct device *start,</div><div class='ctx'> </div><div class='ctx'> 	if (!class)</div><div class='ctx'> 		return NULL;</div><div class='add'>+	if (!class-&gt;p) {</div><div class='add'>+		WARN(1, "%s called for class '%s' before it was initialized",</div><div class='add'>+		     __func__, class-&gt;name);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;class-&gt;p-&gt;class_mutex);</div><div class='ctx'> 	list_for_each_entry(dev, &amp;class-&gt;p-&gt;class_devices, node) {</div><div class='head'>diff --git a/drivers/base/core.c b/drivers/base/core.c<br/>index 068aa1c9538c..d021c98605b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/base/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/base/core.c</a></div><div class='hunk'>@@ -53,7 +53,7 @@ static inline int device_is_not_partition(struct device *dev)</div><div class='ctx'>  * it is attached to.  If it is not attached to a bus either, an empty</div><div class='ctx'>  * string will be returned.</div><div class='ctx'>  */</div><div class='del'>-const char *dev_driver_string(struct device *dev)</div><div class='add'>+const char *dev_driver_string(const struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return dev-&gt;driver ? dev-&gt;driver-&gt;name :</div><div class='ctx'> 			(dev-&gt;bus ? dev-&gt;bus-&gt;name :</div><div class='hunk'>@@ -541,6 +541,7 @@ void device_initialize(struct device *dev)</div><div class='ctx'> 	spin_lock_init(&amp;dev-&gt;devres_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;devres_head);</div><div class='ctx'> 	device_init_wakeup(dev, 0);</div><div class='add'>+	device_pm_init(dev);</div><div class='ctx'> 	set_dev_node(dev, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -843,13 +844,19 @@ int device_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *parent = NULL;</div><div class='ctx'> 	struct class_interface *class_intf;</div><div class='del'>-	int error;</div><div class='add'>+	int error = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	dev = get_device(dev);</div><div class='del'>-	if (!dev || !strlen(dev-&gt;bus_id)) {</div><div class='del'>-		error = -EINVAL;</div><div class='del'>-		goto Done;</div><div class='del'>-	}</div><div class='add'>+	if (!dev)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Temporarily support init_name if it is set.</div><div class='add'>+	 * It will override bus_id for now */</div><div class='add'>+	if (dev-&gt;init_name)</div><div class='add'>+		dev_set_name(dev, "%s", dev-&gt;init_name);</div><div class='add'>+</div><div class='add'>+	if (!strlen(dev-&gt;bus_id))</div><div class='add'>+		goto done;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("device: '%s': %s\n", dev-&gt;bus_id, __func__);</div><div class='ctx'> </div><div class='hunk'>@@ -897,9 +904,10 @@ int device_add(struct device *dev)</div><div class='ctx'> 	error = bus_add_device(dev);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto BusError;</div><div class='del'>-	error = device_pm_add(dev);</div><div class='add'>+	error = dpm_sysfs_add(dev);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto PMError;</div><div class='add'>+		goto DPMError;</div><div class='add'>+	device_pm_add(dev);</div><div class='ctx'> 	kobject_uevent(&amp;dev-&gt;kobj, KOBJ_ADD);</div><div class='ctx'> 	bus_attach_device(dev);</div><div class='ctx'> 	if (parent)</div><div class='hunk'>@@ -917,10 +925,10 @@ int device_add(struct device *dev)</div><div class='ctx'> 				class_intf-&gt;add_dev(dev, class_intf);</div><div class='ctx'> 		mutex_unlock(&amp;dev-&gt;class-&gt;p-&gt;class_mutex);</div><div class='ctx'> 	}</div><div class='del'>- Done:</div><div class='add'>+done:</div><div class='ctx'> 	put_device(dev);</div><div class='ctx'> 	return error;</div><div class='del'>- PMError:</div><div class='add'>+ DPMError:</div><div class='ctx'> 	bus_remove_device(dev);</div><div class='ctx'>  BusError:</div><div class='ctx'> 	if (dev-&gt;bus)</div><div class='hunk'>@@ -944,7 +952,7 @@ int device_add(struct device *dev)</div><div class='ctx'> 	cleanup_device_parent(dev);</div><div class='ctx'> 	if (parent)</div><div class='ctx'> 		put_device(parent);</div><div class='del'>-	goto Done;</div><div class='add'>+	goto done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1007,6 +1015,7 @@ void device_del(struct device *dev)</div><div class='ctx'> 	struct class_interface *class_intf;</div><div class='ctx'> </div><div class='ctx'> 	device_pm_remove(dev);</div><div class='add'>+	dpm_sysfs_remove(dev);</div><div class='ctx'> 	if (parent)</div><div class='ctx'> 		klist_del(&amp;dev-&gt;knode_parent);</div><div class='ctx'> 	if (MAJOR(dev-&gt;devt)) {</div><div class='head'>diff --git a/drivers/base/driver.c b/drivers/base/driver.c<br/>index 2ef5acf4368b..1e2bda780e48 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/driver.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/base/driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/driver.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/base/driver.c</a></div><div class='hunk'>@@ -16,9 +16,6 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include "base.h"</div><div class='ctx'> </div><div class='del'>-#define to_dev(node) container_of(node, struct device, driver_list)</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static struct device *next_device(struct klist_iter *i)</div><div class='ctx'> {</div><div class='ctx'> 	struct klist_node *n = klist_next(i);</div><div class='head'>diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c<br/>index 3250c5257b74..273a944d4040 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/power/main.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/base/power/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/power/main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/base/power/main.c</a></div><div class='hunk'>@@ -67,20 +67,16 @@ void device_pm_unlock(void)</div><div class='ctx'>  *	device_pm_add - add a device to the list of active devices</div><div class='ctx'>  *	@dev:	Device to be added to the list</div><div class='ctx'>  */</div><div class='del'>-int device_pm_add(struct device *dev)</div><div class='add'>+void device_pm_add(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='ctx'> 	pr_debug("PM: Adding info for %s:%s\n",</div><div class='ctx'> 		 dev-&gt;bus ? dev-&gt;bus-&gt;name : "No Bus",</div><div class='ctx'> 		 kobject_name(&amp;dev-&gt;kobj));</div><div class='ctx'> 	mutex_lock(&amp;dpm_list_mtx);</div><div class='ctx'> 	if (dev-&gt;parent) {</div><div class='del'>-		if (dev-&gt;parent-&gt;power.status &gt;= DPM_SUSPENDING) {</div><div class='del'>-			dev_warn(dev, "parent %s is sleeping, will not add\n",</div><div class='add'>+		if (dev-&gt;parent-&gt;power.status &gt;= DPM_SUSPENDING)</div><div class='add'>+			dev_warn(dev, "parent %s should not be sleeping\n",</div><div class='ctx'> 				dev-&gt;parent-&gt;bus_id);</div><div class='del'>-			WARN_ON(true);</div><div class='del'>-		}</div><div class='ctx'> 	} else if (transition_started) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We refuse to register parentless devices while a PM</div><div class='hunk'>@@ -89,13 +85,9 @@ int device_pm_add(struct device *dev)</div><div class='ctx'> 		 */</div><div class='ctx'> 		WARN_ON(true);</div><div class='ctx'> 	}</div><div class='del'>-	error = dpm_sysfs_add(dev);</div><div class='del'>-	if (!error) {</div><div class='del'>-		dev-&gt;power.status = DPM_ON;</div><div class='del'>-		list_add_tail(&amp;dev-&gt;power.entry, &amp;dpm_list);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;dev-&gt;power.entry, &amp;dpm_list);</div><div class='ctx'> 	mutex_unlock(&amp;dpm_list_mtx);</div><div class='del'>-	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -110,7 +102,6 @@ void device_pm_remove(struct device *dev)</div><div class='ctx'> 		 dev-&gt;bus ? dev-&gt;bus-&gt;name : "No Bus",</div><div class='ctx'> 		 kobject_name(&amp;dev-&gt;kobj));</div><div class='ctx'> 	mutex_lock(&amp;dpm_list_mtx);</div><div class='del'>-	dpm_sysfs_remove(dev);</div><div class='ctx'> 	list_del_init(&amp;dev-&gt;power.entry);</div><div class='ctx'> 	mutex_unlock(&amp;dpm_list_mtx);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h<br/>index a3252c0e2887..41f51fae042f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/power/power.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/base/power/power.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/power/power.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/base/power/power.h</a></div><div class='hunk'>@@ -1,3 +1,8 @@</div><div class='add'>+static inline void device_pm_init(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;power.status = DPM_ON;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -11,12 +16,12 @@ static inline struct device *to_device(struct list_head *entry)</div><div class='ctx'> 	return container_of(entry, struct device, power.entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern int device_pm_add(struct device *);</div><div class='add'>+extern void device_pm_add(struct device *);</div><div class='ctx'> extern void device_pm_remove(struct device *);</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='del'>-static inline int device_pm_add(struct device *dev) { return 0; }</div><div class='add'>+static inline void device_pm_add(struct device *dev) {}</div><div class='ctx'> static inline void device_pm_remove(struct device *dev) {}</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c<br/>index d625169c8e48..0c81ca731287 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/aoe/aoenet.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/block/aoe/aoenet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/aoe/aoenet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/block/aoe/aoenet.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@ enum {</div><div class='ctx'> </div><div class='ctx'> static char aoe_iflist[IFLISTSZ];</div><div class='ctx'> module_param_string(aoe_iflist, aoe_iflist, IFLISTSZ, 0600);</div><div class='del'>-MODULE_PARM_DESC(aoe_iflist, "aoe_iflist=\"dev1 [dev2 ...]\"\n");</div><div class='add'>+MODULE_PARM_DESC(aoe_iflist, "aoe_iflist=\"dev1 [dev2 ...]\"");</div><div class='ctx'> </div><div class='ctx'> #ifndef MODULE</div><div class='ctx'> static int __init aoe_iflist_setup(char *str)</div><div class='head'>diff --git a/drivers/block/brd.c b/drivers/block/brd.c<br/>index 24b97b0bef99..d070d492e385 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/brd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/block/brd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/brd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/block/brd.c</a></div><div class='hunk'>@@ -571,8 +571,8 @@ out_free:</div><div class='ctx'> 		list_del(&amp;brd-&gt;brd_list);</div><div class='ctx'> 		brd_free(brd);</div><div class='ctx'> 	}</div><div class='add'>+	unregister_blkdev(RAMDISK_MAJOR, "ramdisk");</div><div class='ctx'> </div><div class='del'>-	unregister_blkdev(RAMDISK_MAJOR, "brd");</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c<br/>index d81632cd7d06..b73116ef9236 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/cciss.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/block/cciss.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/cciss.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/block/cciss.c</a></div><div class='hunk'>@@ -159,7 +159,7 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,</div><div class='ctx'> static int cciss_getgeo(struct block_device *bdev, struct hd_geometry *geo);</div><div class='ctx'> </div><div class='ctx'> static int cciss_revalidate(struct gendisk *disk);</div><div class='del'>-static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk);</div><div class='add'>+static int rebuild_lun_table(ctlr_info_t *h, int first_time);</div><div class='ctx'> static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,</div><div class='ctx'> 			   int clear_all);</div><div class='ctx'> </div><div class='hunk'>@@ -171,7 +171,6 @@ static void cciss_geometry_inquiry(int ctlr, int logvol,</div><div class='ctx'> 			int withirq, sector_t total_size,</div><div class='ctx'> 			unsigned int block_size, InquiryData_struct *inq_buff,</div><div class='ctx'> 				   drive_info_struct *drv);</div><div class='del'>-static void cciss_getgeometry(int cntl_num);</div><div class='ctx'> static void __devinit cciss_interrupt_mode(ctlr_info_t *, struct pci_dev *,</div><div class='ctx'> 					   __u32);</div><div class='ctx'> static void start_io(ctlr_info_t *h);</div><div class='hunk'>@@ -929,8 +928,10 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+	case CCISS_DEREGDISK:</div><div class='add'>+	case CCISS_REGNEWD:</div><div class='ctx'> 	case CCISS_REVALIDVOLS:</div><div class='del'>-		return rebuild_lun_table(host, NULL);</div><div class='add'>+		return rebuild_lun_table(host, 0);</div><div class='ctx'> </div><div class='ctx'> 	case CCISS_GETLUNINFO:{</div><div class='ctx'> 			LogvolInfo_struct luninfo;</div><div class='hunk'>@@ -943,12 +944,6 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-	case CCISS_DEREGDISK:</div><div class='del'>-		return rebuild_lun_table(host, disk);</div><div class='del'>-</div><div class='del'>-	case CCISS_REGNEWD:</div><div class='del'>-		return rebuild_lun_table(host, NULL);</div><div class='del'>-</div><div class='ctx'> 	case CCISS_PASSTHRU:</div><div class='ctx'> 		{</div><div class='ctx'> 			IOCTL_Command_struct iocommand;</div><div class='hunk'>@@ -1134,7 +1129,7 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,</div><div class='ctx'> 				if (ioc-&gt;Request.Type.Direction == XFER_WRITE) {</div><div class='ctx'> 					if (copy_from_user</div><div class='ctx'> 					    (buff[sg_used], data_ptr, sz)) {</div><div class='del'>-						status = -ENOMEM;</div><div class='add'>+						status = -EFAULT;</div><div class='ctx'> 						goto cleanup1;</div><div class='ctx'> 					}</div><div class='ctx'> 				} else {</div><div class='hunk'>@@ -1292,8 +1287,6 @@ static void cciss_check_queues(ctlr_info_t *h)</div><div class='ctx'> 				h-&gt;next_to_run = curr_queue;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-		} else {</div><div class='del'>-			curr_queue = (curr_queue + 1) % (h-&gt;highest_lun + 1);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1332,15 +1325,84 @@ static void cciss_softirq_done(struct request *rq)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;h-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* This function gets the serial number of a logical drive via</div><div class='add'>+ * inquiry page 0x83.  Serial no. is 16 bytes.  If the serial</div><div class='add'>+ * number cannot be had, for whatever reason, 16 bytes of 0xff</div><div class='add'>+ * are returned instead.</div><div class='add'>+ */</div><div class='add'>+static void cciss_get_serial_no(int ctlr, int logvol, int withirq,</div><div class='add'>+				unsigned char *serial_no, int buflen)</div><div class='add'>+{</div><div class='add'>+#define PAGE_83_INQ_BYTES 64</div><div class='add'>+	int rc;</div><div class='add'>+	unsigned char *buf;</div><div class='add'>+</div><div class='add'>+	if (buflen &gt; 16)</div><div class='add'>+		buflen = 16;</div><div class='add'>+	memset(serial_no, 0xff, buflen);</div><div class='add'>+	buf = kzalloc(PAGE_83_INQ_BYTES, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return;</div><div class='add'>+	memset(serial_no, 0, buflen);</div><div class='add'>+	if (withirq)</div><div class='add'>+		rc = sendcmd_withirq(CISS_INQUIRY, ctlr, buf,</div><div class='add'>+			PAGE_83_INQ_BYTES, 1, logvol, 0x83, TYPE_CMD);</div><div class='add'>+	else</div><div class='add'>+		rc = sendcmd(CISS_INQUIRY, ctlr, buf,</div><div class='add'>+			PAGE_83_INQ_BYTES, 1, logvol, 0x83, NULL, TYPE_CMD);</div><div class='add'>+	if (rc == IO_OK)</div><div class='add'>+		memcpy(serial_no, &amp;buf[8], buflen);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cciss_add_disk(ctlr_info_t *h, struct gendisk *disk,</div><div class='add'>+				int drv_index)</div><div class='add'>+{</div><div class='add'>+	disk-&gt;queue = blk_init_queue(do_cciss_request, &amp;h-&gt;lock);</div><div class='add'>+	sprintf(disk-&gt;disk_name, "cciss/c%dd%d", h-&gt;ctlr, drv_index);</div><div class='add'>+	disk-&gt;major = h-&gt;major;</div><div class='add'>+	disk-&gt;first_minor = drv_index &lt;&lt; NWD_SHIFT;</div><div class='add'>+	disk-&gt;fops = &amp;cciss_fops;</div><div class='add'>+	disk-&gt;private_data = &amp;h-&gt;drv[drv_index];</div><div class='add'>+</div><div class='add'>+	/* Set up queue information */</div><div class='add'>+	blk_queue_bounce_limit(disk-&gt;queue, h-&gt;pdev-&gt;dma_mask);</div><div class='add'>+</div><div class='add'>+	/* This is a hardware imposed limit. */</div><div class='add'>+	blk_queue_max_hw_segments(disk-&gt;queue, MAXSGENTRIES);</div><div class='add'>+</div><div class='add'>+	/* This is a limit in the driver and could be eliminated. */</div><div class='add'>+	blk_queue_max_phys_segments(disk-&gt;queue, MAXSGENTRIES);</div><div class='add'>+</div><div class='add'>+	blk_queue_max_sectors(disk-&gt;queue, h-&gt;cciss_max_sectors);</div><div class='add'>+</div><div class='add'>+	blk_queue_softirq_done(disk-&gt;queue, cciss_softirq_done);</div><div class='add'>+</div><div class='add'>+	disk-&gt;queue-&gt;queuedata = h;</div><div class='add'>+</div><div class='add'>+	blk_queue_hardsect_size(disk-&gt;queue,</div><div class='add'>+				h-&gt;drv[drv_index].block_size);</div><div class='add'>+</div><div class='add'>+	/* Make sure all queue data is written out before */</div><div class='add'>+	/* setting h-&gt;drv[drv_index].queue, as setting this */</div><div class='add'>+	/* allows the interrupt handler to start the queue */</div><div class='add'>+	wmb();</div><div class='add'>+	h-&gt;drv[drv_index].queue = disk-&gt;queue;</div><div class='add'>+	add_disk(disk);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This function will check the usage_count of the drive to be updated/added.</div><div class='del'>- * If the usage_count is zero then the drive information will be updated and</div><div class='del'>- * the disk will be re-registered with the kernel.  If not then it will be</div><div class='del'>- * left alone for the next reboot.  The exception to this is disk 0 which</div><div class='del'>- * will always be left registered with the kernel since it is also the</div><div class='del'>- * controller node.  Any changes to disk 0 will show up on the next</div><div class='del'>- * reboot.</div><div class='add'>+ * If the usage_count is zero and it is a heretofore unknown drive, or,</div><div class='add'>+ * the drive's capacity, geometry, or serial number has changed,</div><div class='add'>+ * then the drive information will be updated and the disk will be</div><div class='add'>+ * re-registered with the kernel.  If these conditions don't hold,</div><div class='add'>+ * then it will be left alone for the next reboot.  The exception to this</div><div class='add'>+ * is disk 0 which will always be left registered with the kernel since it</div><div class='add'>+ * is also the controller node.  Any changes to disk 0 will show up on</div><div class='add'>+ * the next reboot.</div><div class='ctx'>  */</div><div class='del'>-static void cciss_update_drive_info(int ctlr, int drv_index)</div><div class='add'>+static void cciss_update_drive_info(int ctlr, int drv_index, int first_time)</div><div class='ctx'> {</div><div class='ctx'> 	ctlr_info_t *h = hba[ctlr];</div><div class='ctx'> 	struct gendisk *disk;</div><div class='hunk'>@@ -1349,16 +1411,81 @@ static void cciss_update_drive_info(int ctlr, int drv_index)</div><div class='ctx'> 	sector_t total_size;</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	drive_info_struct *drvinfo;</div><div class='add'>+	int was_only_controller_node;</div><div class='add'>+</div><div class='add'>+	/* Get information about the disk and modify the driver structure */</div><div class='add'>+	inq_buff = kmalloc(sizeof(InquiryData_struct), GFP_KERNEL);</div><div class='add'>+	drvinfo = kmalloc(sizeof(*drvinfo), GFP_KERNEL);</div><div class='add'>+	if (inq_buff == NULL || drvinfo == NULL)</div><div class='add'>+		goto mem_msg;</div><div class='add'>+</div><div class='add'>+	/* See if we're trying to update the "controller node"</div><div class='add'>+	 * this will happen the when the first logical drive gets</div><div class='add'>+	 * created by ACU.</div><div class='add'>+	 */</div><div class='add'>+	was_only_controller_node = (drv_index == 0 &amp;&amp;</div><div class='add'>+				h-&gt;drv[0].raid_level == -1);</div><div class='ctx'> </div><div class='del'>-	/* if the disk already exists then deregister it before proceeding */</div><div class='del'>-	if (h-&gt;drv[drv_index].raid_level != -1) {</div><div class='add'>+	/* testing to see if 16-byte CDBs are already being used */</div><div class='add'>+	if (h-&gt;cciss_read == CCISS_READ_16) {</div><div class='add'>+		cciss_read_capacity_16(h-&gt;ctlr, drv_index, 1,</div><div class='add'>+			&amp;total_size, &amp;block_size);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		cciss_read_capacity(ctlr, drv_index, 1,</div><div class='add'>+				    &amp;total_size, &amp;block_size);</div><div class='add'>+</div><div class='add'>+		/* if read_capacity returns all F's this volume is &gt;2TB */</div><div class='add'>+		/* in size so we switch to 16-byte CDB's for all */</div><div class='add'>+		/* read/write ops */</div><div class='add'>+		if (total_size == 0xFFFFFFFFULL) {</div><div class='add'>+			cciss_read_capacity_16(ctlr, drv_index, 1,</div><div class='add'>+			&amp;total_size, &amp;block_size);</div><div class='add'>+			h-&gt;cciss_read = CCISS_READ_16;</div><div class='add'>+			h-&gt;cciss_write = CCISS_WRITE_16;</div><div class='add'>+		} else {</div><div class='add'>+			h-&gt;cciss_read = CCISS_READ_10;</div><div class='add'>+			h-&gt;cciss_write = CCISS_WRITE_10;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cciss_geometry_inquiry(ctlr, drv_index, 1, total_size, block_size,</div><div class='add'>+			       inq_buff, drvinfo);</div><div class='add'>+	drvinfo-&gt;block_size = block_size;</div><div class='add'>+	drvinfo-&gt;nr_blocks = total_size + 1;</div><div class='add'>+</div><div class='add'>+	cciss_get_serial_no(ctlr, drv_index, 1, drvinfo-&gt;serial_no,</div><div class='add'>+			sizeof(drvinfo-&gt;serial_no));</div><div class='add'>+</div><div class='add'>+	/* Is it the same disk we already know, and nothing's changed? */</div><div class='add'>+	if (h-&gt;drv[drv_index].raid_level != -1 &amp;&amp;</div><div class='add'>+		((memcmp(drvinfo-&gt;serial_no,</div><div class='add'>+				h-&gt;drv[drv_index].serial_no, 16) == 0) &amp;&amp;</div><div class='add'>+		drvinfo-&gt;block_size == h-&gt;drv[drv_index].block_size &amp;&amp;</div><div class='add'>+		drvinfo-&gt;nr_blocks == h-&gt;drv[drv_index].nr_blocks &amp;&amp;</div><div class='add'>+		drvinfo-&gt;heads == h-&gt;drv[drv_index].heads &amp;&amp;</div><div class='add'>+		drvinfo-&gt;sectors == h-&gt;drv[drv_index].sectors &amp;&amp;</div><div class='add'>+		drvinfo-&gt;cylinders == h-&gt;drv[drv_index].cylinders))</div><div class='add'>+			/* The disk is unchanged, nothing to update */</div><div class='add'>+			goto freeret;</div><div class='add'>+</div><div class='add'>+	/* If we get here it's not the same disk, or something's changed,</div><div class='add'>+	 * so we need to * deregister it, and re-register it, if it's not</div><div class='add'>+	 * in use.</div><div class='add'>+	 * If the disk already exists then deregister it before proceeding</div><div class='add'>+	 * (unless it's the first disk (for the controller node).</div><div class='add'>+	 */</div><div class='add'>+	if (h-&gt;drv[drv_index].raid_level != -1 &amp;&amp; drv_index != 0) {</div><div class='add'>+		printk(KERN_WARNING "disk %d has changed.\n", drv_index);</div><div class='ctx'> 		spin_lock_irqsave(CCISS_LOCK(h-&gt;ctlr), flags);</div><div class='ctx'> 		h-&gt;drv[drv_index].busy_configuring = 1;</div><div class='ctx'> 		spin_unlock_irqrestore(CCISS_LOCK(h-&gt;ctlr), flags);</div><div class='ctx'> </div><div class='del'>-		/* deregister_disk sets h-&gt;drv[drv_index].queue = NULL */</div><div class='del'>-		/* which keeps the interrupt handler from starting */</div><div class='del'>-		/* the queue. */</div><div class='add'>+		/* deregister_disk sets h-&gt;drv[drv_index].queue = NULL</div><div class='add'>+		 * which keeps the interrupt handler from starting</div><div class='add'>+		 * the queue.</div><div class='add'>+		 */</div><div class='ctx'> 		ret = deregister_disk(h-&gt;gendisk[drv_index],</div><div class='ctx'> 				      &amp;h-&gt;drv[drv_index], 0);</div><div class='ctx'> 		h-&gt;drv[drv_index].busy_configuring = 0;</div><div class='hunk'>@@ -1366,81 +1493,37 @@ static void cciss_update_drive_info(int ctlr, int drv_index)</div><div class='ctx'> </div><div class='ctx'> 	/* If the disk is in use return */</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return;</div><div class='add'>+		goto freeret;</div><div class='ctx'> </div><div class='del'>-	/* Get information about the disk and modify the driver structure */</div><div class='del'>-	inq_buff = kmalloc(sizeof(InquiryData_struct), GFP_KERNEL);</div><div class='del'>-	if (inq_buff == NULL)</div><div class='del'>-		goto mem_msg;</div><div class='del'>-</div><div class='del'>- 	/* testing to see if 16-byte CDBs are already being used */</div><div class='del'>- 	if (h-&gt;cciss_read == CCISS_READ_16) {</div><div class='del'>- 		cciss_read_capacity_16(h-&gt;ctlr, drv_index, 1,</div><div class='del'>- 			&amp;total_size, &amp;block_size);</div><div class='del'>- 		goto geo_inq;</div><div class='del'>- 	}</div><div class='del'>-</div><div class='del'>-	cciss_read_capacity(ctlr, drv_index, 1,</div><div class='del'>-			    &amp;total_size, &amp;block_size);</div><div class='del'>-</div><div class='del'>-  	/* if read_capacity returns all F's this volume is &gt;2TB in size */</div><div class='del'>-  	/* so we switch to 16-byte CDB's for all read/write ops */</div><div class='del'>-  	if (total_size == 0xFFFFFFFFULL) {</div><div class='del'>-		cciss_read_capacity_16(ctlr, drv_index, 1,</div><div class='del'>-		&amp;total_size, &amp;block_size);</div><div class='del'>-		h-&gt;cciss_read = CCISS_READ_16;</div><div class='del'>-		h-&gt;cciss_write = CCISS_WRITE_16;</div><div class='del'>-	} else {</div><div class='del'>-		h-&gt;cciss_read = CCISS_READ_10;</div><div class='del'>-		h-&gt;cciss_write = CCISS_WRITE_10;</div><div class='del'>-	}</div><div class='del'>-geo_inq:</div><div class='del'>-	cciss_geometry_inquiry(ctlr, drv_index, 1, total_size, block_size,</div><div class='del'>-			       inq_buff, &amp;h-&gt;drv[drv_index]);</div><div class='add'>+	/* Save the new information from cciss_geometry_inquiry</div><div class='add'>+	 * and serial number inquiry.</div><div class='add'>+	 */</div><div class='add'>+	h-&gt;drv[drv_index].block_size = drvinfo-&gt;block_size;</div><div class='add'>+	h-&gt;drv[drv_index].nr_blocks = drvinfo-&gt;nr_blocks;</div><div class='add'>+	h-&gt;drv[drv_index].heads = drvinfo-&gt;heads;</div><div class='add'>+	h-&gt;drv[drv_index].sectors = drvinfo-&gt;sectors;</div><div class='add'>+	h-&gt;drv[drv_index].cylinders = drvinfo-&gt;cylinders;</div><div class='add'>+	h-&gt;drv[drv_index].raid_level = drvinfo-&gt;raid_level;</div><div class='add'>+	memcpy(h-&gt;drv[drv_index].serial_no, drvinfo-&gt;serial_no, 16);</div><div class='ctx'> </div><div class='ctx'> 	++h-&gt;num_luns;</div><div class='ctx'> 	disk = h-&gt;gendisk[drv_index];</div><div class='ctx'> 	set_capacity(disk, h-&gt;drv[drv_index].nr_blocks);</div><div class='ctx'> </div><div class='del'>-	/* if it's the controller it's already added */</div><div class='del'>-	if (drv_index) {</div><div class='del'>-		disk-&gt;queue = blk_init_queue(do_cciss_request, &amp;h-&gt;lock);</div><div class='del'>-		sprintf(disk-&gt;disk_name, "cciss/c%dd%d", ctlr, drv_index);</div><div class='del'>-		disk-&gt;major = h-&gt;major;</div><div class='del'>-		disk-&gt;first_minor = drv_index &lt;&lt; NWD_SHIFT;</div><div class='del'>-		disk-&gt;fops = &amp;cciss_fops;</div><div class='del'>-		disk-&gt;private_data = &amp;h-&gt;drv[drv_index];</div><div class='del'>-</div><div class='del'>-		/* Set up queue information */</div><div class='del'>-		blk_queue_bounce_limit(disk-&gt;queue, hba[ctlr]-&gt;pdev-&gt;dma_mask);</div><div class='del'>-</div><div class='del'>-		/* This is a hardware imposed limit. */</div><div class='del'>-		blk_queue_max_hw_segments(disk-&gt;queue, MAXSGENTRIES);</div><div class='del'>-</div><div class='del'>-		/* This is a limit in the driver and could be eliminated. */</div><div class='del'>-		blk_queue_max_phys_segments(disk-&gt;queue, MAXSGENTRIES);</div><div class='del'>-</div><div class='del'>-		blk_queue_max_sectors(disk-&gt;queue, h-&gt;cciss_max_sectors);</div><div class='del'>-</div><div class='del'>-		blk_queue_softirq_done(disk-&gt;queue, cciss_softirq_done);</div><div class='del'>-</div><div class='del'>-		disk-&gt;queue-&gt;queuedata = hba[ctlr];</div><div class='del'>-</div><div class='del'>-		blk_queue_hardsect_size(disk-&gt;queue,</div><div class='del'>-					hba[ctlr]-&gt;drv[drv_index].block_size);</div><div class='del'>-</div><div class='del'>-		/* Make sure all queue data is written out before */</div><div class='del'>-		/* setting h-&gt;drv[drv_index].queue, as setting this */</div><div class='del'>-		/* allows the interrupt handler to start the queue */</div><div class='del'>-		wmb();</div><div class='del'>-		h-&gt;drv[drv_index].queue = disk-&gt;queue;</div><div class='del'>-		add_disk(disk);</div><div class='del'>-	}</div><div class='add'>+	/* If it's not disk 0 (drv_index != 0)</div><div class='add'>+	 * or if it was disk 0, but there was previously</div><div class='add'>+	 * no actual corresponding configured logical drive</div><div class='add'>+	 * (raid_leve == -1) then we want to update the</div><div class='add'>+	 * logical drive's information.</div><div class='add'>+	 */</div><div class='add'>+	if (drv_index || first_time)</div><div class='add'>+		cciss_add_disk(h, disk, drv_index);</div><div class='ctx'> </div><div class='del'>-      freeret:</div><div class='add'>+freeret:</div><div class='ctx'> 	kfree(inq_buff);</div><div class='add'>+	kfree(drvinfo);</div><div class='ctx'> 	return;</div><div class='del'>-      mem_msg:</div><div class='add'>+mem_msg:</div><div class='ctx'> 	printk(KERN_ERR "cciss: out of memory\n");</div><div class='ctx'> 	goto freeret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1450,21 +1533,91 @@ geo_inq:</div><div class='ctx'>  * where new drives will be added.  If the index to be returned is greater</div><div class='ctx'>  * than the highest_lun index for the controller then highest_lun is set</div><div class='ctx'>  * to this new index.  If there are no available indexes then -1 is returned.</div><div class='add'>+ * "controller_node" is used to know if this is a real logical drive, or just</div><div class='add'>+ * the controller node, which determines if this counts towards highest_lun.</div><div class='ctx'>  */</div><div class='del'>-static int cciss_find_free_drive_index(int ctlr)</div><div class='add'>+static int cciss_find_free_drive_index(int ctlr, int controller_node)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; CISS_MAX_LUN; i++) {</div><div class='ctx'> 		if (hba[ctlr]-&gt;drv[i].raid_level == -1) {</div><div class='ctx'> 			if (i &gt; hba[ctlr]-&gt;highest_lun)</div><div class='del'>-				hba[ctlr]-&gt;highest_lun = i;</div><div class='add'>+				if (!controller_node)</div><div class='add'>+					hba[ctlr]-&gt;highest_lun = i;</div><div class='ctx'> 			return i;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* cciss_add_gendisk finds a free hba[]-&gt;drv structure</div><div class='add'>+ * and allocates a gendisk if needed, and sets the lunid</div><div class='add'>+ * in the drvinfo structure.   It returns the index into</div><div class='add'>+ * the -&gt;drv[] array, or -1 if none are free.</div><div class='add'>+ * is_controller_node indicates whether highest_lun should</div><div class='add'>+ * count this disk, or if it's only being added to provide</div><div class='add'>+ * a means to talk to the controller in case no logical</div><div class='add'>+ * drives have yet been configured.</div><div class='add'>+ */</div><div class='add'>+static int cciss_add_gendisk(ctlr_info_t *h, __u32 lunid, int controller_node)</div><div class='add'>+{</div><div class='add'>+	int drv_index;</div><div class='add'>+</div><div class='add'>+	drv_index = cciss_find_free_drive_index(h-&gt;ctlr, controller_node);</div><div class='add'>+	if (drv_index == -1)</div><div class='add'>+		return -1;</div><div class='add'>+	/*Check if the gendisk needs to be allocated */</div><div class='add'>+	if (!h-&gt;gendisk[drv_index]) {</div><div class='add'>+		h-&gt;gendisk[drv_index] =</div><div class='add'>+			alloc_disk(1 &lt;&lt; NWD_SHIFT);</div><div class='add'>+		if (!h-&gt;gendisk[drv_index]) {</div><div class='add'>+			printk(KERN_ERR "cciss%d: could not "</div><div class='add'>+				"allocate a new disk %d\n",</div><div class='add'>+				h-&gt;ctlr, drv_index);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	h-&gt;drv[drv_index].LunID = lunid;</div><div class='add'>+</div><div class='add'>+	/* Don't need to mark this busy because nobody */</div><div class='add'>+	/* else knows about this disk yet to contend */</div><div class='add'>+	/* for access to it. */</div><div class='add'>+	h-&gt;drv[drv_index].busy_configuring = 0;</div><div class='add'>+	wmb();</div><div class='add'>+	return drv_index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This is for the special case of a controller which</div><div class='add'>+ * has no logical drives.  In this case, we still need</div><div class='add'>+ * to register a disk so the controller can be accessed</div><div class='add'>+ * by the Array Config Utility.</div><div class='add'>+ */</div><div class='add'>+static void cciss_add_controller_node(ctlr_info_t *h)</div><div class='add'>+{</div><div class='add'>+	struct gendisk *disk;</div><div class='add'>+	int drv_index;</div><div class='add'>+</div><div class='add'>+	if (h-&gt;gendisk[0] != NULL) /* already did this? Then bail. */</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	drv_index = cciss_add_gendisk(h, 0, 1);</div><div class='add'>+	if (drv_index == -1) {</div><div class='add'>+		printk(KERN_WARNING "cciss%d: could not "</div><div class='add'>+			"add disk 0.\n", h-&gt;ctlr);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	h-&gt;drv[drv_index].block_size = 512;</div><div class='add'>+	h-&gt;drv[drv_index].nr_blocks = 0;</div><div class='add'>+	h-&gt;drv[drv_index].heads = 0;</div><div class='add'>+	h-&gt;drv[drv_index].sectors = 0;</div><div class='add'>+	h-&gt;drv[drv_index].cylinders = 0;</div><div class='add'>+	h-&gt;drv[drv_index].raid_level = -1;</div><div class='add'>+	memset(h-&gt;drv[drv_index].serial_no, 0, 16);</div><div class='add'>+	disk = h-&gt;gendisk[drv_index];</div><div class='add'>+	cciss_add_disk(h, disk, drv_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This function will add and remove logical drives from the Logical</div><div class='ctx'>  * drive array of the controller and maintain persistency of ordering</div><div class='ctx'>  * so that mount points are preserved until the next reboot.  This allows</div><div class='hunk'>@@ -1472,15 +1625,12 @@ static int cciss_find_free_drive_index(int ctlr)</div><div class='ctx'>  * without a re-ordering of those drives.</div><div class='ctx'>  * INPUT</div><div class='ctx'>  * h		= The controller to perform the operations on</div><div class='del'>- * del_disk	= The disk to remove if specified.  If the value given</div><div class='del'>- *		  is NULL then no disk is removed.</div><div class='ctx'>  */</div><div class='del'>-static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)</div><div class='add'>+static int rebuild_lun_table(ctlr_info_t *h, int first_time)</div><div class='ctx'> {</div><div class='ctx'> 	int ctlr = h-&gt;ctlr;</div><div class='ctx'> 	int num_luns;</div><div class='ctx'> 	ReportLunData_struct *ld_buff = NULL;</div><div class='del'>-	drive_info_struct *drv = NULL;</div><div class='ctx'> 	int return_code;</div><div class='ctx'> 	int listlength = 0;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1489,6 +1639,9 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)</div><div class='ctx'> 	__u32 lunid = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	if (!capable(CAP_SYS_RAWIO))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='ctx'> 	/* Set busy_configuring flag for this operation */</div><div class='ctx'> 	spin_lock_irqsave(CCISS_LOCK(h-&gt;ctlr), flags);</div><div class='ctx'> 	if (h-&gt;busy_configuring) {</div><div class='hunk'>@@ -1496,100 +1649,100 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	h-&gt;busy_configuring = 1;</div><div class='add'>+	spin_unlock_irqrestore(CCISS_LOCK(h-&gt;ctlr), flags);</div><div class='ctx'> </div><div class='del'>-	/* if del_disk is NULL then we are being called to add a new disk</div><div class='del'>-	 * and update the logical drive table.  If it is not NULL then</div><div class='del'>-	 * we will check if the disk is in use or not.</div><div class='del'>-	 */</div><div class='del'>-	if (del_disk != NULL) {</div><div class='del'>-		drv = get_drv(del_disk);</div><div class='del'>-		drv-&gt;busy_configuring = 1;</div><div class='del'>-		spin_unlock_irqrestore(CCISS_LOCK(h-&gt;ctlr), flags);</div><div class='del'>-		return_code = deregister_disk(del_disk, drv, 1);</div><div class='del'>-		drv-&gt;busy_configuring = 0;</div><div class='del'>-		h-&gt;busy_configuring = 0;</div><div class='del'>-		return return_code;</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(CCISS_LOCK(h-&gt;ctlr), flags);</div><div class='del'>-		if (!capable(CAP_SYS_RAWIO))</div><div class='del'>-			return -EPERM;</div><div class='add'>+	ld_buff = kzalloc(sizeof(ReportLunData_struct), GFP_KERNEL);</div><div class='add'>+	if (ld_buff == NULL)</div><div class='add'>+		goto mem_msg;</div><div class='ctx'> </div><div class='del'>-		ld_buff = kzalloc(sizeof(ReportLunData_struct), GFP_KERNEL);</div><div class='del'>-		if (ld_buff == NULL)</div><div class='del'>-			goto mem_msg;</div><div class='del'>-</div><div class='del'>-		return_code = sendcmd_withirq(CISS_REPORT_LOG, ctlr, ld_buff,</div><div class='del'>-					      sizeof(ReportLunData_struct), 0,</div><div class='del'>-					      0, 0, TYPE_CMD);</div><div class='del'>-</div><div class='del'>-		if (return_code == IO_OK) {</div><div class='del'>-			listlength =</div><div class='del'>-				be32_to_cpu(*(__be32 *) ld_buff-&gt;LUNListLength);</div><div class='del'>-		} else {	/* reading number of logical volumes failed */</div><div class='del'>-			printk(KERN_WARNING "cciss: report logical volume"</div><div class='del'>-			       " command failed\n");</div><div class='del'>-			listlength = 0;</div><div class='del'>-			goto freeret;</div><div class='del'>-		}</div><div class='add'>+	return_code = sendcmd_withirq(CISS_REPORT_LOG, ctlr, ld_buff,</div><div class='add'>+				      sizeof(ReportLunData_struct), 0,</div><div class='add'>+				      0, 0, TYPE_CMD);</div><div class='add'>+</div><div class='add'>+	if (return_code == IO_OK)</div><div class='add'>+		listlength = be32_to_cpu(*(__be32 *) ld_buff-&gt;LUNListLength);</div><div class='add'>+	else {	/* reading number of logical volumes failed */</div><div class='add'>+		printk(KERN_WARNING "cciss: report logical volume"</div><div class='add'>+		       " command failed\n");</div><div class='add'>+		listlength = 0;</div><div class='add'>+		goto freeret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	num_luns = listlength / 8;	/* 8 bytes per entry */</div><div class='add'>+	if (num_luns &gt; CISS_MAX_LUN) {</div><div class='add'>+		num_luns = CISS_MAX_LUN;</div><div class='add'>+		printk(KERN_WARNING "cciss: more luns configured"</div><div class='add'>+		       " on controller than can be handled by"</div><div class='add'>+		       " this driver.\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		num_luns = listlength / 8;	/* 8 bytes per entry */</div><div class='del'>-		if (num_luns &gt; CISS_MAX_LUN) {</div><div class='del'>-			num_luns = CISS_MAX_LUN;</div><div class='del'>-			printk(KERN_WARNING "cciss: more luns configured"</div><div class='del'>-			       " on controller than can be handled by"</div><div class='del'>-			       " this driver.\n");</div><div class='add'>+	if (num_luns == 0)</div><div class='add'>+		cciss_add_controller_node(h);</div><div class='add'>+</div><div class='add'>+	/* Compare controller drive array to driver's drive array</div><div class='add'>+	 * to see if any drives are missing on the controller due</div><div class='add'>+	 * to action of Array Config Utility (user deletes drive)</div><div class='add'>+	 * and deregister logical drives which have disappeared.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt;= h-&gt;highest_lun; i++) {</div><div class='add'>+		int j;</div><div class='add'>+		drv_found = 0;</div><div class='add'>+		for (j = 0; j &lt; num_luns; j++) {</div><div class='add'>+			memcpy(&amp;lunid, &amp;ld_buff-&gt;LUN[j][0], 4);</div><div class='add'>+			lunid = le32_to_cpu(lunid);</div><div class='add'>+			if (h-&gt;drv[i].LunID == lunid) {</div><div class='add'>+				drv_found = 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (!drv_found) {</div><div class='add'>+			/* Deregister it from the OS, it's gone. */</div><div class='add'>+			spin_lock_irqsave(CCISS_LOCK(h-&gt;ctlr), flags);</div><div class='add'>+			h-&gt;drv[i].busy_configuring = 1;</div><div class='add'>+			spin_unlock_irqrestore(CCISS_LOCK(h-&gt;ctlr), flags);</div><div class='add'>+			return_code = deregister_disk(h-&gt;gendisk[i],</div><div class='add'>+				&amp;h-&gt;drv[i], 1);</div><div class='add'>+			h-&gt;drv[i].busy_configuring = 0;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Compare controller drive array to driver's drive array.</div><div class='add'>+	 * Check for updates in the drive information and any new drives</div><div class='add'>+	 * on the controller due to ACU adding logical drives, or changing</div><div class='add'>+	 * a logical drive's size, etc.  Reregister any new/changed drives</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; num_luns; i++) {</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		drv_found = 0;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;lunid, &amp;ld_buff-&gt;LUN[i][0], 4);</div><div class='add'>+		lunid = le32_to_cpu(lunid);</div><div class='ctx'> </div><div class='del'>-		/* Compare controller drive array to drivers drive array.</div><div class='del'>-		 * Check for updates in the drive information and any new drives</div><div class='del'>-		 * on the controller.</div><div class='add'>+		/* Find if the LUN is already in the drive array</div><div class='add'>+		 * of the driver.  If so then update its info</div><div class='add'>+		 * if not in use.  If it does not exist then find</div><div class='add'>+		 * the first free index and add it.</div><div class='ctx'> 		 */</div><div class='del'>-		for (i = 0; i &lt; num_luns; i++) {</div><div class='del'>-			int j;</div><div class='del'>-</div><div class='del'>-			drv_found = 0;</div><div class='del'>-</div><div class='del'>-			lunid = (0xff &amp;</div><div class='del'>-				 (unsigned int)(ld_buff-&gt;LUN[i][3])) &lt;&lt; 24;</div><div class='del'>-			lunid |= (0xff &amp;</div><div class='del'>-				  (unsigned int)(ld_buff-&gt;LUN[i][2])) &lt;&lt; 16;</div><div class='del'>-			lunid |= (0xff &amp;</div><div class='del'>-				  (unsigned int)(ld_buff-&gt;LUN[i][1])) &lt;&lt; 8;</div><div class='del'>-			lunid |= 0xff &amp; (unsigned int)(ld_buff-&gt;LUN[i][0]);</div><div class='del'>-</div><div class='del'>-			/* Find if the LUN is already in the drive array</div><div class='del'>-			 * of the controller.  If so then update its info</div><div class='del'>-			 * if not is use.  If it does not exist then find</div><div class='del'>-			 * the first free index and add it.</div><div class='del'>-			 */</div><div class='del'>-			for (j = 0; j &lt;= h-&gt;highest_lun; j++) {</div><div class='del'>-				if (h-&gt;drv[j].LunID == lunid) {</div><div class='del'>-					drv_index = j;</div><div class='del'>-					drv_found = 1;</div><div class='del'>-				}</div><div class='add'>+		for (j = 0; j &lt;= h-&gt;highest_lun; j++) {</div><div class='add'>+			if (h-&gt;drv[j].raid_level != -1 &amp;&amp;</div><div class='add'>+				h-&gt;drv[j].LunID == lunid) {</div><div class='add'>+				drv_index = j;</div><div class='add'>+				drv_found = 1;</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			/* check if the drive was found already in the array */</div><div class='del'>-			if (!drv_found) {</div><div class='del'>-				drv_index = cciss_find_free_drive_index(ctlr);</div><div class='del'>-				if (drv_index == -1)</div><div class='del'>-					goto freeret;</div><div class='del'>-</div><div class='del'>-				/*Check if the gendisk needs to be allocated */</div><div class='del'>-				if (!h-&gt;gendisk[drv_index]){</div><div class='del'>-					h-&gt;gendisk[drv_index] = alloc_disk(1 &lt;&lt; NWD_SHIFT);</div><div class='del'>-					if (!h-&gt;gendisk[drv_index]){</div><div class='del'>-						printk(KERN_ERR "cciss: could not allocate new disk %d\n", drv_index);</div><div class='del'>-						goto mem_msg;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			h-&gt;drv[drv_index].LunID = lunid;</div><div class='del'>-			cciss_update_drive_info(ctlr, drv_index);</div><div class='del'>-		}		/* end for */</div><div class='del'>-	}			/* end else */</div><div class='add'>+		/* check if the drive was found already in the array */</div><div class='add'>+		if (!drv_found) {</div><div class='add'>+			drv_index = cciss_add_gendisk(h, lunid, 0);</div><div class='add'>+			if (drv_index == -1)</div><div class='add'>+				goto freeret;</div><div class='add'>+		}</div><div class='add'>+		cciss_update_drive_info(ctlr, drv_index, first_time);</div><div class='add'>+	}		/* end for */</div><div class='ctx'> </div><div class='del'>-      freeret:</div><div class='add'>+freeret:</div><div class='ctx'> 	kfree(ld_buff);</div><div class='ctx'> 	h-&gt;busy_configuring = 0;</div><div class='ctx'> 	/* We return -1 here to tell the ACU that we have registered/updated</div><div class='hunk'>@@ -1597,8 +1750,9 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)</div><div class='ctx'> 	 * additional times.</div><div class='ctx'> 	 */</div><div class='ctx'> 	return -1;</div><div class='del'>-      mem_msg:</div><div class='add'>+mem_msg:</div><div class='ctx'> 	printk(KERN_ERR "cciss: out of memory\n");</div><div class='add'>+	h-&gt;busy_configuring = 0;</div><div class='ctx'> 	goto freeret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1654,15 +1808,15 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,</div><div class='ctx'> 		 * other than disk 0 we will call put_disk.  We do not</div><div class='ctx'> 		 * do this for disk 0 as we need it to be able to</div><div class='ctx'> 		 * configure the controller.</div><div class='del'>-		*/</div><div class='add'>+		 */</div><div class='ctx'> 		if (clear_all){</div><div class='ctx'> 			/* This isn't pretty, but we need to find the</div><div class='ctx'> 			 * disk in our array and NULL our the pointer.</div><div class='ctx'> 			 * This is so that we will call alloc_disk if</div><div class='ctx'> 			 * this index is used again later.</div><div class='del'>-			*/</div><div class='add'>+			 */</div><div class='ctx'> 			for (i=0; i &lt; CISS_MAX_LUN; i++){</div><div class='del'>-				if(h-&gt;gendisk[i] == disk){</div><div class='add'>+				if (h-&gt;gendisk[i] == disk) {</div><div class='ctx'> 					h-&gt;gendisk[i] = NULL;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1690,7 +1844,7 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,</div><div class='ctx'> 		if (drv == h-&gt;drv + h-&gt;highest_lun) {</div><div class='ctx'> 			/* if so, find the new hightest lun */</div><div class='ctx'> 			int i, newhighest = -1;</div><div class='del'>-			for (i = 0; i &lt; h-&gt;highest_lun; i++) {</div><div class='add'>+			for (i = 0; i &lt;= h-&gt;highest_lun; i++) {</div><div class='ctx'> 				/* if the disk has size &gt; 0, it is available */</div><div class='ctx'> 				if (h-&gt;drv[i].heads)</div><div class='ctx'> 					newhighest = i;</div><div class='hunk'>@@ -3201,136 +3355,9 @@ err_out_free_res:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Gets information about the local volumes attached to the controller.</div><div class='add'>+/* Function to find the first free pointer into our hba[] array</div><div class='add'>+ * Returns -1 if no free entries are left.</div><div class='ctx'>  */</div><div class='del'>-static void cciss_getgeometry(int cntl_num)</div><div class='del'>-{</div><div class='del'>-	ReportLunData_struct *ld_buff;</div><div class='del'>-	InquiryData_struct *inq_buff;</div><div class='del'>-	int return_code;</div><div class='del'>-	int i;</div><div class='del'>-	int listlength = 0;</div><div class='del'>-	__u32 lunid = 0;</div><div class='del'>-	unsigned block_size;</div><div class='del'>-	sector_t total_size;</div><div class='del'>-</div><div class='del'>-	ld_buff = kzalloc(sizeof(ReportLunData_struct), GFP_KERNEL);</div><div class='del'>-	if (ld_buff == NULL) {</div><div class='del'>-		printk(KERN_ERR "cciss: out of memory\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	inq_buff = kmalloc(sizeof(InquiryData_struct), GFP_KERNEL);</div><div class='del'>-	if (inq_buff == NULL) {</div><div class='del'>-		printk(KERN_ERR "cciss: out of memory\n");</div><div class='del'>-		kfree(ld_buff);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	/* Get the firmware version */</div><div class='del'>-	return_code = sendcmd(CISS_INQUIRY, cntl_num, inq_buff,</div><div class='del'>-			      sizeof(InquiryData_struct), 0, 0, 0, NULL,</div><div class='del'>-			      TYPE_CMD);</div><div class='del'>-	if (return_code == IO_OK) {</div><div class='del'>-		hba[cntl_num]-&gt;firm_ver[0] = inq_buff-&gt;data_byte[32];</div><div class='del'>-		hba[cntl_num]-&gt;firm_ver[1] = inq_buff-&gt;data_byte[33];</div><div class='del'>-		hba[cntl_num]-&gt;firm_ver[2] = inq_buff-&gt;data_byte[34];</div><div class='del'>-		hba[cntl_num]-&gt;firm_ver[3] = inq_buff-&gt;data_byte[35];</div><div class='del'>-	} else {		/* send command failed */</div><div class='del'>-</div><div class='del'>-		printk(KERN_WARNING "cciss: unable to determine firmware"</div><div class='del'>-		       " version of controller\n");</div><div class='del'>-	}</div><div class='del'>-	/* Get the number of logical volumes */</div><div class='del'>-	return_code = sendcmd(CISS_REPORT_LOG, cntl_num, ld_buff,</div><div class='del'>-			      sizeof(ReportLunData_struct), 0, 0, 0, NULL,</div><div class='del'>-			      TYPE_CMD);</div><div class='del'>-</div><div class='del'>-	if (return_code == IO_OK) {</div><div class='del'>-#ifdef CCISS_DEBUG</div><div class='del'>-		printk("LUN Data\n--------------------------\n");</div><div class='del'>-#endif				/* CCISS_DEBUG */</div><div class='del'>-</div><div class='del'>-		listlength |=</div><div class='del'>-		    (0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[0])) &lt;&lt; 24;</div><div class='del'>-		listlength |=</div><div class='del'>-		    (0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[1])) &lt;&lt; 16;</div><div class='del'>-		listlength |=</div><div class='del'>-		    (0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[2])) &lt;&lt; 8;</div><div class='del'>-		listlength |= 0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[3]);</div><div class='del'>-	} else {		/* reading number of logical volumes failed */</div><div class='del'>-</div><div class='del'>-		printk(KERN_WARNING "cciss: report logical volume"</div><div class='del'>-		       " command failed\n");</div><div class='del'>-		listlength = 0;</div><div class='del'>-	}</div><div class='del'>-	hba[cntl_num]-&gt;num_luns = listlength / 8;	// 8 bytes pre entry</div><div class='del'>-	if (hba[cntl_num]-&gt;num_luns &gt; CISS_MAX_LUN) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "ciss:  only %d number of logical volumes supported\n",</div><div class='del'>-		       CISS_MAX_LUN);</div><div class='del'>-		hba[cntl_num]-&gt;num_luns = CISS_MAX_LUN;</div><div class='del'>-	}</div><div class='del'>-#ifdef CCISS_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "Length = %x %x %x %x = %d\n",</div><div class='del'>-	       ld_buff-&gt;LUNListLength[0], ld_buff-&gt;LUNListLength[1],</div><div class='del'>-	       ld_buff-&gt;LUNListLength[2], ld_buff-&gt;LUNListLength[3],</div><div class='del'>-	       hba[cntl_num]-&gt;num_luns);</div><div class='del'>-#endif				/* CCISS_DEBUG */</div><div class='del'>-</div><div class='del'>-	hba[cntl_num]-&gt;highest_lun = hba[cntl_num]-&gt;num_luns - 1;</div><div class='del'>-	for (i = 0; i &lt; CISS_MAX_LUN; i++) {</div><div class='del'>-		if (i &lt; hba[cntl_num]-&gt;num_luns) {</div><div class='del'>-			lunid = (0xff &amp; (unsigned int)(ld_buff-&gt;LUN[i][3]))</div><div class='del'>-			    &lt;&lt; 24;</div><div class='del'>-			lunid |= (0xff &amp; (unsigned int)(ld_buff-&gt;LUN[i][2]))</div><div class='del'>-			    &lt;&lt; 16;</div><div class='del'>-			lunid |= (0xff &amp; (unsigned int)(ld_buff-&gt;LUN[i][1]))</div><div class='del'>-			    &lt;&lt; 8;</div><div class='del'>-			lunid |= 0xff &amp; (unsigned int)(ld_buff-&gt;LUN[i][0]);</div><div class='del'>-</div><div class='del'>-			hba[cntl_num]-&gt;drv[i].LunID = lunid;</div><div class='del'>-</div><div class='del'>-#ifdef CCISS_DEBUG</div><div class='del'>-			printk(KERN_DEBUG "LUN[%d]:  %x %x %x %x = %x\n", i,</div><div class='del'>-			       ld_buff-&gt;LUN[i][0], ld_buff-&gt;LUN[i][1],</div><div class='del'>-			       ld_buff-&gt;LUN[i][2], ld_buff-&gt;LUN[i][3],</div><div class='del'>-			       hba[cntl_num]-&gt;drv[i].LunID);</div><div class='del'>-#endif				/* CCISS_DEBUG */</div><div class='del'>-</div><div class='del'>-		/* testing to see if 16-byte CDBs are already being used */</div><div class='del'>-		if(hba[cntl_num]-&gt;cciss_read == CCISS_READ_16) {</div><div class='del'>-			cciss_read_capacity_16(cntl_num, i, 0,</div><div class='del'>-					    &amp;total_size, &amp;block_size);</div><div class='del'>-			goto geo_inq;</div><div class='del'>-		}</div><div class='del'>-		cciss_read_capacity(cntl_num, i, 0, &amp;total_size, &amp;block_size);</div><div class='del'>-</div><div class='del'>-		/* If read_capacity returns all F's the logical is &gt;2TB */</div><div class='del'>-		/* so we switch to 16-byte CDBs for all read/write ops */</div><div class='del'>-		if(total_size == 0xFFFFFFFFULL) {</div><div class='del'>-			cciss_read_capacity_16(cntl_num, i, 0,</div><div class='del'>-			&amp;total_size, &amp;block_size);</div><div class='del'>-			hba[cntl_num]-&gt;cciss_read = CCISS_READ_16;</div><div class='del'>-			hba[cntl_num]-&gt;cciss_write = CCISS_WRITE_16;</div><div class='del'>-		} else {</div><div class='del'>-			hba[cntl_num]-&gt;cciss_read = CCISS_READ_10;</div><div class='del'>-			hba[cntl_num]-&gt;cciss_write = CCISS_WRITE_10;</div><div class='del'>-		}</div><div class='del'>-geo_inq:</div><div class='del'>-			cciss_geometry_inquiry(cntl_num, i, 0, total_size,</div><div class='del'>-					       block_size, inq_buff,</div><div class='del'>-					       &amp;hba[cntl_num]-&gt;drv[i]);</div><div class='del'>-		} else {</div><div class='del'>-			/* initialize raid_level to indicate a free space */</div><div class='del'>-			hba[cntl_num]-&gt;drv[i].raid_level = -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	kfree(ld_buff);</div><div class='del'>-	kfree(inq_buff);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Function to find the first free pointer into our hba[] array */</div><div class='del'>-/* Returns -1 if no free entries are left.  */</div><div class='ctx'> static int alloc_cciss_hba(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -3342,11 +3369,6 @@ static int alloc_cciss_hba(void)</div><div class='ctx'> 			p = kzalloc(sizeof(ctlr_info_t), GFP_KERNEL);</div><div class='ctx'> 			if (!p)</div><div class='ctx'> 				goto Enomem;</div><div class='del'>-			p-&gt;gendisk[0] = alloc_disk(1 &lt;&lt; NWD_SHIFT);</div><div class='del'>-			if (!p-&gt;gendisk[0]) {</div><div class='del'>-				kfree(p);</div><div class='del'>-				goto Enomem;</div><div class='del'>-			}</div><div class='ctx'> 			hba[i] = p;</div><div class='ctx'> 			return i;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3474,11 +3496,13 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	       ((hba[i]-&gt;nr_cmds + BITS_PER_LONG -</div><div class='ctx'> 		 1) / BITS_PER_LONG) * sizeof(unsigned long));</div><div class='ctx'> </div><div class='del'>-#ifdef CCISS_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "Scanning for drives on controller cciss%d\n", i);</div><div class='del'>-#endif				/* CCISS_DEBUG */</div><div class='del'>-</div><div class='del'>-	cciss_getgeometry(i);</div><div class='add'>+	hba[i]-&gt;num_luns = 0;</div><div class='add'>+	hba[i]-&gt;highest_lun = -1;</div><div class='add'>+	for (j = 0; j &lt; CISS_MAX_LUN; j++) {</div><div class='add'>+		hba[i]-&gt;drv[j].raid_level = -1;</div><div class='add'>+		hba[i]-&gt;drv[j].queue = NULL;</div><div class='add'>+		hba[i]-&gt;gendisk[j] = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cciss_scsi_setup(i);</div><div class='ctx'> </div><div class='hunk'>@@ -3491,76 +3515,10 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	hba[i]-&gt;busy_initializing = 0;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		drive_info_struct *drv = &amp;(hba[i]-&gt;drv[j]);</div><div class='del'>-		struct gendisk *disk = hba[i]-&gt;gendisk[j];</div><div class='del'>-		struct request_queue *q;</div><div class='del'>-</div><div class='del'>-		/* Check if the disk was allocated already */</div><div class='del'>-		if (!disk){</div><div class='del'>-			hba[i]-&gt;gendisk[j] = alloc_disk(1 &lt;&lt; NWD_SHIFT);</div><div class='del'>-			disk = hba[i]-&gt;gendisk[j];</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Check that the disk was able to be allocated */</div><div class='del'>-		if (!disk) {</div><div class='del'>-			printk(KERN_ERR "cciss: unable to allocate memory for disk %d\n", j);</div><div class='del'>-			goto clean4;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		q = blk_init_queue(do_cciss_request, &amp;hba[i]-&gt;lock);</div><div class='del'>-		if (!q) {</div><div class='del'>-			printk(KERN_ERR</div><div class='del'>-			       "cciss:  unable to allocate queue for disk %d\n",</div><div class='del'>-			       j);</div><div class='del'>-			goto clean4;</div><div class='del'>-		}</div><div class='del'>-		drv-&gt;queue = q;</div><div class='del'>-</div><div class='del'>-		blk_queue_bounce_limit(q, hba[i]-&gt;pdev-&gt;dma_mask);</div><div class='del'>-</div><div class='del'>-		/* This is a hardware imposed limit. */</div><div class='del'>-		blk_queue_max_hw_segments(q, MAXSGENTRIES);</div><div class='del'>-</div><div class='del'>-		/* This is a limit in the driver and could be eliminated. */</div><div class='del'>-		blk_queue_max_phys_segments(q, MAXSGENTRIES);</div><div class='del'>-</div><div class='del'>-		blk_queue_max_sectors(q, hba[i]-&gt;cciss_max_sectors);</div><div class='del'>-</div><div class='del'>-		blk_queue_softirq_done(q, cciss_softirq_done);</div><div class='del'>-</div><div class='del'>-		q-&gt;queuedata = hba[i];</div><div class='del'>-		sprintf(disk-&gt;disk_name, "cciss/c%dd%d", i, j);</div><div class='del'>-		disk-&gt;major = hba[i]-&gt;major;</div><div class='del'>-		disk-&gt;first_minor = j &lt;&lt; NWD_SHIFT;</div><div class='del'>-		disk-&gt;fops = &amp;cciss_fops;</div><div class='del'>-		disk-&gt;queue = q;</div><div class='del'>-		disk-&gt;private_data = drv;</div><div class='del'>-		disk-&gt;driverfs_dev = &amp;pdev-&gt;dev;</div><div class='del'>-		/* we must register the controller even if no disks exist */</div><div class='del'>-		/* this is for the online array utilities */</div><div class='del'>-		if (!drv-&gt;heads &amp;&amp; j)</div><div class='del'>-			continue;</div><div class='del'>-		blk_queue_hardsect_size(q, drv-&gt;block_size);</div><div class='del'>-		set_capacity(disk, drv-&gt;nr_blocks);</div><div class='del'>-		j++;</div><div class='del'>-	} while (j &lt;= hba[i]-&gt;highest_lun);</div><div class='del'>-</div><div class='del'>-	/* Make sure all queue data is written out before */</div><div class='del'>-	/* interrupt handler, triggered by add_disk,  */</div><div class='del'>-	/* is allowed to start them. */</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	for (j = 0; j &lt;= hba[i]-&gt;highest_lun; j++)</div><div class='del'>-		add_disk(hba[i]-&gt;gendisk[j]);</div><div class='del'>-</div><div class='del'>-	/* we must register the controller even if no disks exist */</div><div class='del'>-	if (hba[i]-&gt;highest_lun == -1)</div><div class='del'>-		add_disk(hba[i]-&gt;gendisk[0]);</div><div class='del'>-</div><div class='add'>+	rebuild_lun_table(hba[i], 1);</div><div class='ctx'> 	return 1;</div><div class='ctx'> </div><div class='del'>-      clean4:</div><div class='add'>+clean4:</div><div class='ctx'> #ifdef CONFIG_CISS_SCSI_TAPE</div><div class='ctx'> 	kfree(hba[i]-&gt;scsi_rejects.complete);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -3575,9 +3533,9 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,</div><div class='ctx'> 				    hba[i]-&gt;errinfo_pool,</div><div class='ctx'> 				    hba[i]-&gt;errinfo_pool_dhandle);</div><div class='ctx'> 	free_irq(hba[i]-&gt;intr[SIMPLE_MODE_INT], hba[i]);</div><div class='del'>-      clean2:</div><div class='add'>+clean2:</div><div class='ctx'> 	unregister_blkdev(hba[i]-&gt;major, hba[i]-&gt;devname);</div><div class='del'>-      clean1:</div><div class='add'>+clean1:</div><div class='ctx'> 	hba[i]-&gt;busy_initializing = 0;</div><div class='ctx'> 	/* cleanup any queues that may have been initialized */</div><div class='ctx'> 	for (j=0; j &lt;= hba[i]-&gt;highest_lun; j++){</div><div class='hunk'>@@ -3656,7 +3614,9 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CISS_SCSI_TAPE</div><div class='ctx'> 	cciss_unregister_scsi(i);	/* unhook from SCSI subsystem */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	cciss_shutdown(pdev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h<br/>index b70988dd33ec..24a7efa993ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/cciss.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/block/cciss.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/cciss.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/block/cciss.h</a></div><div class='hunk'>@@ -39,6 +39,8 @@ typedef struct _drive_info_struct</div><div class='ctx'> 				   *to prevent it from being opened or it's queue</div><div class='ctx'> 				   *from being started.</div><div class='ctx'> 				  */</div><div class='add'>+	__u8 serial_no[16]; /* from inquiry page 0x83, */</div><div class='add'>+			    /* not necc. null terminated. */</div><div class='ctx'> } drive_info_struct;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CISS_SCSI_TAPE</div><div class='head'>diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c<br/>index e4bf9a11ca0d..e1233aabda77 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/cciss_scsi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/block/cciss_scsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/cciss_scsi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/block/cciss_scsi.c</a></div><div class='hunk'>@@ -358,23 +358,68 @@ find_bus_target_lun(int ctlr, int *bus, int *target, int *lun)</div><div class='ctx'> 	}</div><div class='ctx'> 	return (!found);	</div><div class='ctx'> }</div><div class='add'>+struct scsi2map {</div><div class='add'>+	char scsi3addr[8];</div><div class='add'>+	int bus, target, lun;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int </div><div class='ctx'> cciss_scsi_add_entry(int ctlr, int hostno, </div><div class='del'>-		unsigned char *scsi3addr, int devtype)</div><div class='add'>+		unsigned char *scsi3addr, int devtype,</div><div class='add'>+		struct scsi2map *added, int *nadded)</div><div class='ctx'> {</div><div class='ctx'> 	/* assumes hba[ctlr]-&gt;scsi_ctlr-&gt;lock is held */ </div><div class='ctx'> 	int n = ccissscsi[ctlr].ndevices;</div><div class='ctx'> 	struct cciss_scsi_dev_t *sd;</div><div class='add'>+	int i, bus, target, lun;</div><div class='add'>+	unsigned char addr1[8], addr2[8];</div><div class='ctx'> </div><div class='ctx'> 	if (n &gt;= CCISS_MAX_SCSI_DEVS_PER_HBA) {</div><div class='ctx'> 		printk("cciss%d: Too many devices, "</div><div class='ctx'> 			"some will be inaccessible.\n", ctlr);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	bus = target = -1;</div><div class='add'>+	lun = 0;</div><div class='add'>+	/* Is this device a non-zero lun of a multi-lun device */</div><div class='add'>+	/* byte 4 of the 8-byte LUN addr will contain the logical unit no. */</div><div class='add'>+	if (scsi3addr[4] != 0) {</div><div class='add'>+		/* Search through our list and find the device which */</div><div class='add'>+		/* has the same 8 byte LUN address, excepting byte 4. */</div><div class='add'>+		/* Assign the same bus and target for this new LUN. */</div><div class='add'>+		/* Use the logical unit number from the firmware. */</div><div class='add'>+		memcpy(addr1, scsi3addr, 8);</div><div class='add'>+		addr1[4] = 0;</div><div class='add'>+		for (i = 0; i &lt; n; i++) {</div><div class='add'>+			sd = &amp;ccissscsi[ctlr].dev[i];</div><div class='add'>+			memcpy(addr2, sd-&gt;scsi3addr, 8);</div><div class='add'>+			addr2[4] = 0;</div><div class='add'>+			/* differ only in byte 4? */</div><div class='add'>+			if (memcmp(addr1, addr2, 8) == 0) {</div><div class='add'>+				bus = sd-&gt;bus;</div><div class='add'>+				target = sd-&gt;target;</div><div class='add'>+				lun = scsi3addr[4];</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	sd = &amp;ccissscsi[ctlr].dev[n];</div><div class='del'>-	if (find_bus_target_lun(ctlr, &amp;sd-&gt;bus, &amp;sd-&gt;target, &amp;sd-&gt;lun) != 0)</div><div class='del'>-		return -1;</div><div class='add'>+	if (lun == 0) {</div><div class='add'>+		if (find_bus_target_lun(ctlr,</div><div class='add'>+			&amp;sd-&gt;bus, &amp;sd-&gt;target, &amp;sd-&gt;lun) != 0)</div><div class='add'>+			return -1;</div><div class='add'>+	} else {</div><div class='add'>+		sd-&gt;bus = bus;</div><div class='add'>+		sd-&gt;target = target;</div><div class='add'>+		sd-&gt;lun = lun;</div><div class='add'>+	}</div><div class='add'>+	added[*nadded].bus = sd-&gt;bus;</div><div class='add'>+	added[*nadded].target = sd-&gt;target;</div><div class='add'>+	added[*nadded].lun = sd-&gt;lun;</div><div class='add'>+	(*nadded)++;</div><div class='add'>+</div><div class='ctx'> 	memcpy(&amp;sd-&gt;scsi3addr[0], scsi3addr, 8);</div><div class='ctx'> 	sd-&gt;devtype = devtype;</div><div class='ctx'> 	ccissscsi[ctlr].ndevices++;</div><div class='hunk'>@@ -390,7 +435,8 @@ cciss_scsi_add_entry(int ctlr, int hostno,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-cciss_scsi_remove_entry(int ctlr, int hostno, int entry)</div><div class='add'>+cciss_scsi_remove_entry(int ctlr, int hostno, int entry,</div><div class='add'>+	struct scsi2map *removed, int *nremoved)</div><div class='ctx'> {</div><div class='ctx'> 	/* assumes hba[ctlr]-&gt;scsi_ctlr-&gt;lock is held */ </div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -398,6 +444,10 @@ cciss_scsi_remove_entry(int ctlr, int hostno, int entry)</div><div class='ctx'> </div><div class='ctx'> 	if (entry &lt; 0 || entry &gt;= CCISS_MAX_SCSI_DEVS_PER_HBA) return;</div><div class='ctx'> 	sd = ccissscsi[ctlr].dev[entry];</div><div class='add'>+	removed[*nremoved].bus    = sd.bus;</div><div class='add'>+	removed[*nremoved].target = sd.target;</div><div class='add'>+	removed[*nremoved].lun    = sd.lun;</div><div class='add'>+	(*nremoved)++;</div><div class='ctx'> 	for (i=entry;i&lt;ccissscsi[ctlr].ndevices-1;i++)</div><div class='ctx'> 		ccissscsi[ctlr].dev[i] = ccissscsi[ctlr].dev[i+1];</div><div class='ctx'> 	ccissscsi[ctlr].ndevices--;</div><div class='hunk'>@@ -417,6 +467,26 @@ cciss_scsi_remove_entry(int ctlr, int hostno, int entry)</div><div class='ctx'> 	(a)[1] == (b)[1] &amp;&amp; \</div><div class='ctx'> 	(a)[0] == (b)[0])</div><div class='ctx'> </div><div class='add'>+static void fixup_botched_add(int ctlr, char *scsi3addr)</div><div class='add'>+{</div><div class='add'>+	/* called when scsi_add_device fails in order to re-adjust */</div><div class='add'>+	/* ccissscsi[] to match the mid layer's view. */</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i, j;</div><div class='add'>+	CPQ_TAPE_LOCK(ctlr, flags);</div><div class='add'>+	for (i = 0; i &lt; ccissscsi[ctlr].ndevices; i++) {</div><div class='add'>+		if (memcmp(scsi3addr,</div><div class='add'>+				ccissscsi[ctlr].dev[i].scsi3addr, 8) == 0) {</div><div class='add'>+			for (j = i; j &lt; ccissscsi[ctlr].ndevices-1; j++)</div><div class='add'>+				ccissscsi[ctlr].dev[j] =</div><div class='add'>+					ccissscsi[ctlr].dev[j+1];</div><div class='add'>+			ccissscsi[ctlr].ndevices--;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	CPQ_TAPE_UNLOCK(ctlr, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> adjust_cciss_scsi_table(int ctlr, int hostno,</div><div class='ctx'> 	struct cciss_scsi_dev_t sd[], int nsds)</div><div class='hunk'>@@ -429,13 +499,33 @@ adjust_cciss_scsi_table(int ctlr, int hostno,</div><div class='ctx'> 	int i,j, found, changes=0;</div><div class='ctx'> 	struct cciss_scsi_dev_t *csd;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	struct scsi2map *added, *removed;</div><div class='add'>+	int nadded, nremoved;</div><div class='add'>+	struct Scsi_Host *sh = NULL;</div><div class='add'>+</div><div class='add'>+	added = kzalloc(sizeof(*added) * CCISS_MAX_SCSI_DEVS_PER_HBA,</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+	removed = kzalloc(sizeof(*removed) * CCISS_MAX_SCSI_DEVS_PER_HBA,</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!added || !removed) {</div><div class='add'>+		printk(KERN_WARNING "cciss%d: Out of memory in "</div><div class='add'>+			"adjust_cciss_scsi_table\n", ctlr);</div><div class='add'>+		goto free_and_out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	CPQ_TAPE_LOCK(ctlr, flags);</div><div class='ctx'> </div><div class='add'>+	if (hostno != -1)  /* if it's not the first time... */</div><div class='add'>+		sh = ((struct cciss_scsi_adapter_data_t *)</div><div class='add'>+			hba[ctlr]-&gt;scsi_ctlr)-&gt;scsi_host;</div><div class='add'>+</div><div class='ctx'> 	/* find any devices in ccissscsi[] that are not in </div><div class='ctx'> 	   sd[] and remove them from ccissscsi[] */</div><div class='ctx'> </div><div class='ctx'> 	i = 0;</div><div class='add'>+	nremoved = 0;</div><div class='add'>+	nadded = 0;</div><div class='ctx'> 	while(i&lt;ccissscsi[ctlr].ndevices) {</div><div class='ctx'> 		csd = &amp;ccissscsi[ctlr].dev[i];</div><div class='ctx'> 		found=0;</div><div class='hunk'>@@ -455,8 +545,9 @@ adjust_cciss_scsi_table(int ctlr, int hostno,</div><div class='ctx'> 			/* printk("cciss%d: %s device c%db%dt%dl%d removed.\n",</div><div class='ctx'> 				ctlr, scsi_device_type(csd-&gt;devtype), hostno,</div><div class='ctx'> 					csd-&gt;bus, csd-&gt;target, csd-&gt;lun); */</div><div class='del'>-			cciss_scsi_remove_entry(ctlr, hostno, i);</div><div class='del'>-			/* note, i not incremented */</div><div class='add'>+			cciss_scsi_remove_entry(ctlr, hostno, i,</div><div class='add'>+				removed, &amp;nremoved);</div><div class='add'>+			/* remove ^^^, hence i not incremented */</div><div class='ctx'> 		} </div><div class='ctx'> 		else if (found == 1) { /* device is different kind */</div><div class='ctx'> 			changes++;</div><div class='hunk'>@@ -464,8 +555,15 @@ adjust_cciss_scsi_table(int ctlr, int hostno,</div><div class='ctx'> 				"(device type now %s).\n",</div><div class='ctx'> 				ctlr, hostno, csd-&gt;bus, csd-&gt;target, csd-&gt;lun,</div><div class='ctx'> 					scsi_device_type(csd-&gt;devtype));</div><div class='add'>+			cciss_scsi_remove_entry(ctlr, hostno, i,</div><div class='add'>+				removed, &amp;nremoved);</div><div class='add'>+			/* remove ^^^, hence i not incremented */</div><div class='add'>+			if (cciss_scsi_add_entry(ctlr, hostno,</div><div class='add'>+				&amp;sd[j].scsi3addr[0], sd[j].devtype,</div><div class='add'>+				added, &amp;nadded) != 0)</div><div class='add'>+				/* we just removed one, so add can't fail. */</div><div class='add'>+					BUG();</div><div class='ctx'> 			csd-&gt;devtype = sd[j].devtype;</div><div class='del'>-			i++;	/* so just move along. */</div><div class='ctx'> 		} else 		/* device is same as it ever was, */</div><div class='ctx'> 			i++;	/* so just move along. */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -489,7 +587,9 @@ adjust_cciss_scsi_table(int ctlr, int hostno,</div><div class='ctx'> 		if (!found) {</div><div class='ctx'> 			changes++;</div><div class='ctx'> 			if (cciss_scsi_add_entry(ctlr, hostno, </div><div class='del'>-				&amp;sd[i].scsi3addr[0], sd[i].devtype) != 0)</div><div class='add'>+</div><div class='add'>+				&amp;sd[i].scsi3addr[0], sd[i].devtype,</div><div class='add'>+				added, &amp;nadded) != 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		} else if (found == 1) {</div><div class='ctx'> 			/* should never happen... */</div><div class='hunk'>@@ -501,9 +601,50 @@ adjust_cciss_scsi_table(int ctlr, int hostno,</div><div class='ctx'> 	}</div><div class='ctx'> 	CPQ_TAPE_UNLOCK(ctlr, flags);</div><div class='ctx'> </div><div class='del'>-	if (!changes) </div><div class='del'>-		printk("cciss%d: No device changes detected.\n", ctlr);</div><div class='add'>+	/* Don't notify scsi mid layer of any changes the first time through */</div><div class='add'>+	/* (or if there are no changes) scsi_scan_host will do it later the */</div><div class='add'>+	/* first time through. */</div><div class='add'>+	if (hostno == -1 || !changes)</div><div class='add'>+		goto free_and_out;</div><div class='add'>+</div><div class='add'>+	/* Notify scsi mid layer of any removed devices */</div><div class='add'>+	for (i = 0; i &lt; nremoved; i++) {</div><div class='add'>+		struct scsi_device *sdev =</div><div class='add'>+			scsi_device_lookup(sh, removed[i].bus,</div><div class='add'>+				removed[i].target, removed[i].lun);</div><div class='add'>+		if (sdev != NULL) {</div><div class='add'>+			scsi_remove_device(sdev);</div><div class='add'>+			scsi_device_put(sdev);</div><div class='add'>+		} else {</div><div class='add'>+			/* We don't expect to get here. */</div><div class='add'>+			/* future cmds to this device will get selection */</div><div class='add'>+			/* timeout as if the device was gone. */</div><div class='add'>+			printk(KERN_WARNING "cciss%d: didn't find "</div><div class='add'>+				"c%db%dt%dl%d\n for removal.",</div><div class='add'>+				ctlr, hostno, removed[i].bus,</div><div class='add'>+				removed[i].target, removed[i].lun);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Notify scsi mid layer of any added devices */</div><div class='add'>+	for (i = 0; i &lt; nadded; i++) {</div><div class='add'>+		int rc;</div><div class='add'>+		rc = scsi_add_device(sh, added[i].bus,</div><div class='add'>+			added[i].target, added[i].lun);</div><div class='add'>+		if (rc == 0)</div><div class='add'>+			continue;</div><div class='add'>+		printk(KERN_WARNING "cciss%d: scsi_add_device "</div><div class='add'>+			"c%db%dt%dl%d failed, device not added.\n",</div><div class='add'>+			ctlr, hostno,</div><div class='add'>+			added[i].bus, added[i].target, added[i].lun);</div><div class='add'>+		/* now we have to remove it from ccissscsi, */</div><div class='add'>+		/* since it didn't get added to scsi mid layer */</div><div class='add'>+		fixup_botched_add(ctlr, added[i].scsi3addr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+free_and_out:</div><div class='add'>+	kfree(added);</div><div class='add'>+	kfree(removed);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1355,32 +1496,6 @@ cciss_unregister_scsi(int ctlr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int </div><div class='del'>-cciss_register_scsi(int ctlr)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	CPQ_TAPE_LOCK(ctlr, flags);</div><div class='del'>-</div><div class='del'>-	/* Since this is really a block driver, the SCSI core may not be </div><div class='del'>-	   initialized at init time, in which case, calling scsi_register_host</div><div class='del'>-	   would hang.  Instead, we do it later, via /proc filesystem</div><div class='del'>-	   and rc scripts, when we know SCSI core is good to go. */</div><div class='del'>-</div><div class='del'>-	/* Only register if SCSI devices are detected. */</div><div class='del'>-	if (ccissscsi[ctlr].ndevices != 0) {</div><div class='del'>-		((struct cciss_scsi_adapter_data_t *) </div><div class='del'>-			hba[ctlr]-&gt;scsi_ctlr)-&gt;registered = 1;</div><div class='del'>-		CPQ_TAPE_UNLOCK(ctlr, flags);</div><div class='del'>-		return cciss_scsi_detect(ctlr);</div><div class='del'>-	}</div><div class='del'>-	CPQ_TAPE_UNLOCK(ctlr, flags);</div><div class='del'>-	printk(KERN_INFO </div><div class='del'>-		"cciss%d: No appropriate SCSI device detected, "</div><div class='del'>-		"SCSI subsystem not engaged.\n", ctlr);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int </div><div class='ctx'> cciss_engage_scsi(int ctlr)</div><div class='ctx'> {</div><div class='ctx'> 	struct cciss_scsi_adapter_data_t *sa;</div><div class='hunk'>@@ -1391,15 +1506,15 @@ cciss_engage_scsi(int ctlr)</div><div class='ctx'> 	sa = (struct cciss_scsi_adapter_data_t *) hba[ctlr]-&gt;scsi_ctlr;</div><div class='ctx'> 	stk = &amp;sa-&gt;cmd_stack; </div><div class='ctx'> </div><div class='del'>-	if (((struct cciss_scsi_adapter_data_t *) </div><div class='del'>-		hba[ctlr]-&gt;scsi_ctlr)-&gt;registered) {</div><div class='add'>+	if (sa-&gt;registered) {</div><div class='ctx'> 		printk("cciss%d: SCSI subsystem already engaged.\n", ctlr);</div><div class='ctx'> 		spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='ctx'> 		return ENXIO;</div><div class='ctx'> 	}</div><div class='add'>+	sa-&gt;registered = 1;</div><div class='ctx'> 	spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='ctx'> 	cciss_update_non_disk_devices(ctlr, -1);</div><div class='del'>-	cciss_register_scsi(ctlr);</div><div class='add'>+	cciss_scsi_detect(ctlr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1493,7 +1608,5 @@ static int  cciss_eh_abort_handler(struct scsi_cmnd *scsicmd)</div><div class='ctx'> /* If no tape support, then these become defined out of existence */</div><div class='ctx'> </div><div class='ctx'> #define cciss_scsi_setup(cntl_num)</div><div class='del'>-#define cciss_unregister_scsi(ctlr)</div><div class='del'>-#define cciss_register_scsi(ctlr)</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_CISS_SCSI_TAPE */</div><div class='head'>diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c<br/>index ad98dda6037d..1778e4a2c672 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/nbd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/block/nbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/nbd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/block/nbd.c</a></div><div class='hunk'>@@ -707,15 +707,15 @@ static int __init nbd_init(void)</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct nbd_request) != 28);</div><div class='ctx'> </div><div class='del'>-	nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);</div><div class='del'>-	if (!nbd_dev)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	if (max_part &lt; 0) {</div><div class='ctx'> 		printk(KERN_CRIT "nbd: max_part must be &gt;= 0\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);</div><div class='add'>+	if (!nbd_dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	part_shift = 0;</div><div class='ctx'> 	if (max_part &gt; 0)</div><div class='ctx'> 		part_shift = fls(max_part);</div><div class='hunk'>@@ -779,6 +779,7 @@ out:</div><div class='ctx'> 		blk_cleanup_queue(nbd_dev[i].disk-&gt;queue);</div><div class='ctx'> 		put_disk(nbd_dev[i].disk);</div><div class='ctx'> 	}</div><div class='add'>+	kfree(nbd_dev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -795,6 +796,7 @@ static void __exit nbd_cleanup(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	unregister_blkdev(NBD_MAJOR, "nbd");</div><div class='add'>+	kfree(nbd_dev);</div><div class='ctx'> 	printk(KERN_INFO "nbd: unregistered device at major %d\n", NBD_MAJOR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c<br/>index 158eed4d5161..29b7a648cc6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/pktcdvd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/block/pktcdvd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/pktcdvd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/block/pktcdvd.c</a></div><div class='hunk'>@@ -49,7 +49,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='hunk'>@@ -2798,14 +2797,9 @@ out_mem:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='add'>+static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = file-&gt;f_path.dentry-&gt;d_inode;</div><div class='del'>-	struct pktcdvd_device *pd;</div><div class='del'>-	long ret;</div><div class='del'>-</div><div class='del'>-	lock_kernel();</div><div class='del'>-	pd = inode-&gt;i_bdev-&gt;bd_disk-&gt;private_data;</div><div class='add'>+	struct pktcdvd_device *pd = inode-&gt;i_bdev-&gt;bd_disk-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	VPRINTK("pkt_ioctl: cmd %x, dev %d:%d\n", cmd, imajor(inode), iminor(inode));</div><div class='ctx'> </div><div class='hunk'>@@ -2818,8 +2812,7 @@ static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	case CDROM_LAST_WRITTEN:</div><div class='ctx'> 	case CDROM_SEND_PACKET:</div><div class='ctx'> 	case SCSI_IOCTL_SEND_COMMAND:</div><div class='del'>-		ret = blkdev_ioctl(pd-&gt;bdev-&gt;bd_inode, file, cmd, arg);</div><div class='del'>-		break;</div><div class='add'>+		return blkdev_ioctl(pd-&gt;bdev-&gt;bd_inode, file, cmd, arg);</div><div class='ctx'> </div><div class='ctx'> 	case CDROMEJECT:</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2828,15 +2821,14 @@ static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (pd-&gt;refcnt == 1)</div><div class='ctx'> 			pkt_lock_door(pd, 0);</div><div class='del'>-		ret = blkdev_ioctl(pd-&gt;bdev-&gt;bd_inode, file, cmd, arg);</div><div class='del'>-		break;</div><div class='add'>+		return blkdev_ioctl(pd-&gt;bdev-&gt;bd_inode, file, cmd, arg);</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		VPRINTK(DRIVER_NAME": Unknown ioctl for %s (%x)\n", pd-&gt;name, cmd);</div><div class='del'>-		ret = -ENOTTY;</div><div class='add'>+		return -ENOTTY;</div><div class='ctx'> 	}</div><div class='del'>-	unlock_kernel();</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pkt_media_changed(struct gendisk *disk)</div><div class='hunk'>@@ -2858,7 +2850,7 @@ static struct block_device_operations pktcdvd_ops = {</div><div class='ctx'> 	.owner =		THIS_MODULE,</div><div class='ctx'> 	.open =			pkt_open,</div><div class='ctx'> 	.release =		pkt_close,</div><div class='del'>-	.unlocked_ioctl =	pkt_ioctl,</div><div class='add'>+	.ioctl =		pkt_ioctl,</div><div class='ctx'> 	.media_changed =	pkt_media_changed,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3023,8 +3015,7 @@ static void pkt_get_status(struct pkt_ctrl_command *ctrl_cmd)</div><div class='ctx'> 	mutex_unlock(&amp;ctl_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long pkt_ctl_ioctl(struct file *file, unsigned int cmd,</div><div class='del'>-						unsigned long arg)</div><div class='add'>+static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> 	struct pkt_ctrl_command ctrl_cmd;</div><div class='hunk'>@@ -3041,22 +3032,16 @@ static long pkt_ctl_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 	case PKT_CTRL_CMD_SETUP:</div><div class='ctx'> 		if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='del'>-		lock_kernel();</div><div class='ctx'> 		ret = pkt_setup_dev(new_decode_dev(ctrl_cmd.dev), &amp;pkt_dev);</div><div class='ctx'> 		ctrl_cmd.pkt_dev = new_encode_dev(pkt_dev);</div><div class='del'>-		unlock_kernel();</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PKT_CTRL_CMD_TEARDOWN:</div><div class='ctx'> 		if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='del'>-		lock_kernel();</div><div class='ctx'> 		ret = pkt_remove_dev(new_decode_dev(ctrl_cmd.pkt_dev));</div><div class='del'>-		unlock_kernel();</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PKT_CTRL_CMD_STATUS:</div><div class='del'>-		lock_kernel();</div><div class='ctx'> 		pkt_get_status(&amp;ctrl_cmd);</div><div class='del'>-		unlock_kernel();</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOTTY;</div><div class='hunk'>@@ -3069,7 +3054,7 @@ static long pkt_ctl_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static const struct file_operations pkt_ctl_fops = {</div><div class='del'>-	.unlocked_ioctl	 = pkt_ctl_ioctl,</div><div class='add'>+	.ioctl	 = pkt_ctl_ioctl,</div><div class='ctx'> 	.owner	 = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c<br/>index 9ae05c584234..3ca643cafccd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/xen-blkfront.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/block/xen-blkfront.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/xen-blkfront.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/block/xen-blkfront.c</a></div><div class='hunk'>@@ -154,8 +154,8 @@ static int blkif_getgeo(struct block_device *bd, struct hd_geometry *hg)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int blkif_ioctl(struct inode *inode, struct file *filep,</div><div class='del'>-		unsigned command, unsigned long argument)</div><div class='add'>+static int blkif_ioctl(struct inode *inode, struct file *filep,</div><div class='add'>+		       unsigned command, unsigned long argument)</div><div class='ctx'> {</div><div class='ctx'> 	struct blkfront_info *info =</div><div class='ctx'> 		inode-&gt;i_bdev-&gt;bd_disk-&gt;private_data;</div><div class='head'>diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig<br/>index a235ca787465..7cb4029a5375 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/bluetooth/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/Kconfig</a></div><div class='hunk'>@@ -3,8 +3,8 @@ menu "Bluetooth device drivers"</div><div class='ctx'> 	depends on BT</div><div class='ctx'> </div><div class='ctx'> config BT_HCIUSB</div><div class='del'>-	tristate "HCI USB driver"</div><div class='del'>-	depends on USB</div><div class='add'>+	tristate "HCI USB driver (old version)"</div><div class='add'>+	depends on USB &amp;&amp; BT_HCIBTUSB=n</div><div class='ctx'> 	help</div><div class='ctx'> 	  Bluetooth HCI USB driver.</div><div class='ctx'> 	  This driver is required if you want to use Bluetooth devices with</div><div class='hunk'>@@ -23,15 +23,13 @@ config BT_HCIUSB_SCO</div><div class='ctx'> 	  Say Y here to compile support for SCO over HCI USB.</div><div class='ctx'> </div><div class='ctx'> config BT_HCIBTUSB</div><div class='del'>-	tristate "HCI USB driver (alternate version)"</div><div class='del'>-	depends on USB &amp;&amp; EXPERIMENTAL &amp;&amp; BT_HCIUSB=n</div><div class='add'>+	tristate "HCI USB driver"</div><div class='add'>+	depends on USB</div><div class='ctx'> 	help</div><div class='ctx'> 	  Bluetooth HCI USB driver.</div><div class='ctx'> 	  This driver is required if you want to use Bluetooth devices with</div><div class='ctx'> 	  USB interface.</div><div class='ctx'> </div><div class='del'>-          This driver is still experimental and has no SCO support.</div><div class='del'>-</div><div class='ctx'> 	  Say Y here to compile support for Bluetooth USB devices into the</div><div class='ctx'> 	  kernel or say M to compile it as module (btusb).</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c<br/>index 8919ccf8274b..ee40201c7278 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/bcm203x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/bluetooth/bcm203x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/bcm203x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/bcm203x.c</a></div><div class='hunk'>@@ -42,9 +42,7 @@</div><div class='ctx'> #define BT_DBG(D...)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define VERSION "1.1"</div><div class='del'>-</div><div class='del'>-static int ignore = 0;</div><div class='add'>+#define VERSION "1.2"</div><div class='ctx'> </div><div class='ctx'> static struct usb_device_id bcm203x_table[] = {</div><div class='ctx'> 	/* Broadcom Blutonium (BCM2033) */</div><div class='hunk'>@@ -175,7 +173,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("intf %p id %p", intf, id);</div><div class='ctx'> </div><div class='del'>-	if (ignore || (intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber != 0))</div><div class='add'>+	if (intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber != 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	data = kzalloc(sizeof(*data), GFP_KERNEL);</div><div class='hunk'>@@ -300,9 +298,6 @@ static void __exit bcm203x_exit(void)</div><div class='ctx'> module_init(bcm203x_init);</div><div class='ctx'> module_exit(bcm203x_exit);</div><div class='ctx'> </div><div class='del'>-module_param(ignore, bool, 0644);</div><div class='del'>-MODULE_PARM_DESC(ignore, "Ignore devices from the matching table");</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Marcel Holtmann &lt;marcel@holtmann.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Broadcom Blutonium firmware driver ver " VERSION);</div><div class='ctx'> MODULE_VERSION(VERSION);</div><div class='head'>diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c<br/>index 0c211adbc063..90a094634630 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/bfusb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/bluetooth/bfusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/bfusb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/bfusb.c</a></div><div class='hunk'>@@ -43,9 +43,7 @@</div><div class='ctx'> #define BT_DBG(D...)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define VERSION "1.1"</div><div class='del'>-</div><div class='del'>-static int ignore = 0;</div><div class='add'>+#define VERSION "1.2"</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver bfusb_driver;</div><div class='ctx'> </div><div class='hunk'>@@ -656,9 +654,6 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("intf %p id %p", intf, id);</div><div class='ctx'> </div><div class='del'>-	if (ignore)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='ctx'> 	/* Check number of endpoints */</div><div class='ctx'> 	if (intf-&gt;cur_altsetting-&gt;desc.bNumEndpoints &lt; 2)</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -795,9 +790,6 @@ static void __exit bfusb_exit(void)</div><div class='ctx'> module_init(bfusb_init);</div><div class='ctx'> module_exit(bfusb_exit);</div><div class='ctx'> </div><div class='del'>-module_param(ignore, bool, 0644);</div><div class='del'>-MODULE_PARM_DESC(ignore, "Ignore devices from the matching table");</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Marcel Holtmann &lt;marcel@holtmann.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("BlueFRITZ! USB driver ver " VERSION);</div><div class='ctx'> MODULE_VERSION(VERSION);</div><div class='head'>diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c<br/>index 3b28658f5a1f..1e55a658e6ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/bpa10x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/bluetooth/bpa10x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/bpa10x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/bpa10x.c</a></div><div class='hunk'>@@ -40,9 +40,7 @@</div><div class='ctx'> #define BT_DBG(D...)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define VERSION "0.9"</div><div class='del'>-</div><div class='del'>-static int ignore = 0;</div><div class='add'>+#define VERSION "0.10"</div><div class='ctx'> </div><div class='ctx'> static struct usb_device_id bpa10x_table[] = {</div><div class='ctx'> 	/* Tektronix BPA 100/105 (Digianswer) */</div><div class='hunk'>@@ -460,9 +458,6 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id *</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("intf %p id %p", intf, id);</div><div class='ctx'> </div><div class='del'>-	if (ignore)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='ctx'> 	if (intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber != 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -546,9 +541,6 @@ static void __exit bpa10x_exit(void)</div><div class='ctx'> module_init(bpa10x_init);</div><div class='ctx'> module_exit(bpa10x_exit);</div><div class='ctx'> </div><div class='del'>-module_param(ignore, bool, 0644);</div><div class='del'>-MODULE_PARM_DESC(ignore, "Ignore devices from the matching table");</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Marcel Holtmann &lt;marcel@holtmann.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Digianswer Bluetooth USB driver ver " VERSION);</div><div class='ctx'> MODULE_VERSION(VERSION);</div><div class='head'>diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c<br/>index 593b7c595038..27058477cc8b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/bt3c_cs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/bluetooth/bt3c_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/bt3c_cs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/bt3c_cs.c</a></div><div class='hunk'>@@ -60,7 +60,7 @@</div><div class='ctx'> /* ======================== Module parameters ======================== */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Marcel Holtmann &lt;marcel@holtmann.org&gt;, Jose Orlando Pereira &lt;jop@di.uminho.pt&gt;");</div><div class='add'>+MODULE_AUTHOR("Marcel Holtmann &lt;marcel@holtmann.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Bluetooth driver for the 3Com Bluetooth PCMCIA card");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_FIRMWARE("BT3CPCC.bin");</div><div class='head'>diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c<br/>index 12e108914f19..6a010681ecf3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/btusb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/bluetooth/btusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/btusb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/btusb.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Generic Bluetooth USB driver</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2005-2007  Marcel Holtmann &lt;marcel@holtmann.org&gt;</div><div class='add'>+ *  Copyright (C) 2005-2008  Marcel Holtmann &lt;marcel@holtmann.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='hunk'>@@ -41,27 +41,135 @@</div><div class='ctx'> #define BT_DBG(D...)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define VERSION "0.1"</div><div class='add'>+#define VERSION "0.3"</div><div class='add'>+</div><div class='add'>+static int ignore_dga;</div><div class='add'>+static int ignore_csr;</div><div class='add'>+static int ignore_sniffer;</div><div class='add'>+static int disable_scofix;</div><div class='add'>+static int force_scofix;</div><div class='add'>+static int reset;</div><div class='add'>+</div><div class='add'>+static struct usb_driver btusb_driver;</div><div class='add'>+</div><div class='add'>+#define BTUSB_IGNORE		0x01</div><div class='add'>+#define BTUSB_RESET		0x02</div><div class='add'>+#define BTUSB_DIGIANSWER	0x04</div><div class='add'>+#define BTUSB_CSR		0x08</div><div class='add'>+#define BTUSB_SNIFFER		0x10</div><div class='add'>+#define BTUSB_BCM92035		0x20</div><div class='add'>+#define BTUSB_BROKEN_ISOC	0x40</div><div class='add'>+#define BTUSB_WRONG_SCO_MTU	0x80</div><div class='ctx'> </div><div class='ctx'> static struct usb_device_id btusb_table[] = {</div><div class='ctx'> 	/* Generic Bluetooth USB device */</div><div class='ctx'> 	{ USB_DEVICE_INFO(0xe0, 0x01, 0x01) },</div><div class='ctx'> </div><div class='add'>+	/* AVM BlueFRITZ! USB v2.0 */</div><div class='add'>+	{ USB_DEVICE(0x057c, 0x3800) },</div><div class='add'>+</div><div class='add'>+	/* Bluetooth Ultraport Module from IBM */</div><div class='add'>+	{ USB_DEVICE(0x04bf, 0x030a) },</div><div class='add'>+</div><div class='add'>+	/* ALPS Modules with non-standard id */</div><div class='add'>+	{ USB_DEVICE(0x044e, 0x3001) },</div><div class='add'>+	{ USB_DEVICE(0x044e, 0x3002) },</div><div class='add'>+</div><div class='add'>+	/* Ericsson with non-standard id */</div><div class='add'>+	{ USB_DEVICE(0x0bdb, 0x1002) },</div><div class='add'>+</div><div class='add'>+	/* Canyon CN-BTU1 with HID interfaces */</div><div class='add'>+	{ USB_DEVICE(0x0c10, 0x0000), .driver_info = BTUSB_RESET },</div><div class='add'>+</div><div class='ctx'> 	{ }	/* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(usb, btusb_table);</div><div class='ctx'> </div><div class='ctx'> static struct usb_device_id blacklist_table[] = {</div><div class='add'>+	/* CSR BlueCore devices */</div><div class='add'>+	{ USB_DEVICE(0x0a12, 0x0001), .driver_info = BTUSB_CSR },</div><div class='add'>+</div><div class='add'>+	/* Broadcom BCM2033 without firmware */</div><div class='add'>+	{ USB_DEVICE(0x0a5c, 0x2033), .driver_info = BTUSB_IGNORE },</div><div class='add'>+</div><div class='add'>+	/* Broadcom BCM2035 */</div><div class='add'>+	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },</div><div class='add'>+	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },</div><div class='add'>+</div><div class='add'>+	/* Broadcom BCM2045 */</div><div class='add'>+	{ USB_DEVICE(0x0a5c, 0x2039), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },</div><div class='add'>+	{ USB_DEVICE(0x0a5c, 0x2101), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },</div><div class='add'>+</div><div class='add'>+	/* Broadcom BCM2046 */</div><div class='add'>+	{ USB_DEVICE(0x0a5c, 0x2151), .driver_info = BTUSB_RESET },</div><div class='add'>+</div><div class='add'>+	/* IBM/Lenovo ThinkPad with Broadcom chip */</div><div class='add'>+	{ USB_DEVICE(0x0a5c, 0x201e), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },</div><div class='add'>+	{ USB_DEVICE(0x0a5c, 0x2110), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },</div><div class='add'>+</div><div class='add'>+	/* Targus ACB10US */</div><div class='add'>+	{ USB_DEVICE(0x0a5c, 0x2100), .driver_info = BTUSB_RESET },</div><div class='add'>+</div><div class='add'>+	/* ANYCOM Bluetooth USB-200 and USB-250 */</div><div class='add'>+	{ USB_DEVICE(0x0a5c, 0x2111), .driver_info = BTUSB_RESET },</div><div class='add'>+</div><div class='add'>+	/* HP laptop with Broadcom chip */</div><div class='add'>+	{ USB_DEVICE(0x03f0, 0x171d), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },</div><div class='add'>+</div><div class='add'>+	/* Dell laptop with Broadcom chip */</div><div class='add'>+	{ USB_DEVICE(0x413c, 0x8126), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },</div><div class='add'>+</div><div class='add'>+	/* Dell Wireless 370 */</div><div class='add'>+	{ USB_DEVICE(0x413c, 0x8156), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },</div><div class='add'>+</div><div class='add'>+	/* Dell Wireless 410 */</div><div class='add'>+	{ USB_DEVICE(0x413c, 0x8152), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },</div><div class='add'>+</div><div class='add'>+	/* Microsoft Wireless Transceiver for Bluetooth 2.0 */</div><div class='add'>+	{ USB_DEVICE(0x045e, 0x009c), .driver_info = BTUSB_RESET },</div><div class='add'>+</div><div class='add'>+	/* Kensington Bluetooth USB adapter */</div><div class='add'>+	{ USB_DEVICE(0x047d, 0x105d), .driver_info = BTUSB_RESET },</div><div class='add'>+	{ USB_DEVICE(0x047d, 0x105e), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },</div><div class='add'>+</div><div class='add'>+	/* ISSC Bluetooth Adapter v3.1 */</div><div class='add'>+	{ USB_DEVICE(0x1131, 0x1001), .driver_info = BTUSB_RESET },</div><div class='add'>+</div><div class='add'>+	/* RTX Telecom based adapters with buggy SCO support */</div><div class='add'>+	{ USB_DEVICE(0x0400, 0x0807), .driver_info = BTUSB_BROKEN_ISOC },</div><div class='add'>+	{ USB_DEVICE(0x0400, 0x080a), .driver_info = BTUSB_BROKEN_ISOC },</div><div class='add'>+</div><div class='add'>+	/* CONWISE Technology based adapters with buggy SCO support */</div><div class='add'>+	{ USB_DEVICE(0x0e5e, 0x6622), .driver_info = BTUSB_BROKEN_ISOC },</div><div class='add'>+</div><div class='add'>+	/* Belkin F8T012 and F8T013 devices */</div><div class='add'>+	{ USB_DEVICE(0x050d, 0x0012), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },</div><div class='add'>+	{ USB_DEVICE(0x050d, 0x0013), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },</div><div class='add'>+</div><div class='add'>+	/* Digianswer devices */</div><div class='add'>+	{ USB_DEVICE(0x08fd, 0x0001), .driver_info = BTUSB_DIGIANSWER },</div><div class='add'>+	{ USB_DEVICE(0x08fd, 0x0002), .driver_info = BTUSB_IGNORE },</div><div class='add'>+</div><div class='add'>+	/* CSR BlueCore Bluetooth Sniffer */</div><div class='add'>+	{ USB_DEVICE(0x0a12, 0x0002), .driver_info = BTUSB_SNIFFER },</div><div class='add'>+</div><div class='add'>+	/* Frontline ComProbe Bluetooth Sniffer */</div><div class='add'>+	{ USB_DEVICE(0x16d3, 0x0002), .driver_info = BTUSB_SNIFFER },</div><div class='add'>+</div><div class='ctx'> 	{ }	/* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define BTUSB_MAX_ISOC_FRAMES	10</div><div class='add'>+</div><div class='ctx'> #define BTUSB_INTR_RUNNING	0</div><div class='ctx'> #define BTUSB_BULK_RUNNING	1</div><div class='add'>+#define BTUSB_ISOC_RUNNING	2</div><div class='ctx'> </div><div class='ctx'> struct btusb_data {</div><div class='ctx'> 	struct hci_dev       *hdev;</div><div class='ctx'> 	struct usb_device    *udev;</div><div class='add'>+	struct usb_interface *isoc;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> </div><div class='hunk'>@@ -72,10 +180,15 @@ struct btusb_data {</div><div class='ctx'> 	struct usb_anchor tx_anchor;</div><div class='ctx'> 	struct usb_anchor intr_anchor;</div><div class='ctx'> 	struct usb_anchor bulk_anchor;</div><div class='add'>+	struct usb_anchor isoc_anchor;</div><div class='ctx'> </div><div class='ctx'> 	struct usb_endpoint_descriptor *intr_ep;</div><div class='ctx'> 	struct usb_endpoint_descriptor *bulk_tx_ep;</div><div class='ctx'> 	struct usb_endpoint_descriptor *bulk_rx_ep;</div><div class='add'>+	struct usb_endpoint_descriptor *isoc_tx_ep;</div><div class='add'>+	struct usb_endpoint_descriptor *isoc_rx_ep;</div><div class='add'>+</div><div class='add'>+	int isoc_altsetting;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void btusb_intr_complete(struct urb *urb)</div><div class='hunk'>@@ -91,6 +204,8 @@ static void btusb_intr_complete(struct urb *urb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;status == 0) {</div><div class='add'>+		hdev-&gt;stat.byte_rx += urb-&gt;actual_length;</div><div class='add'>+</div><div class='ctx'> 		if (hci_recv_fragment(hdev, HCI_EVENT_PKT,</div><div class='ctx'> 						urb-&gt;transfer_buffer,</div><div class='ctx'> 						urb-&gt;actual_length) &lt; 0) {</div><div class='hunk'>@@ -112,7 +227,7 @@ static void btusb_intr_complete(struct urb *urb)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int btusb_submit_intr_urb(struct hci_dev *hdev)</div><div class='add'>+static int btusb_submit_intr_urb(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct btusb_data *data = hdev-&gt;driver_data;</div><div class='ctx'> 	struct urb *urb;</div><div class='hunk'>@@ -122,6 +237,9 @@ static inline int btusb_submit_intr_urb(struct hci_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("%s", hdev-&gt;name);</div><div class='ctx'> </div><div class='add'>+	if (!data-&gt;intr_ep)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	urb = usb_alloc_urb(0, GFP_ATOMIC);</div><div class='ctx'> 	if (!urb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -170,6 +288,8 @@ static void btusb_bulk_complete(struct urb *urb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;status == 0) {</div><div class='add'>+		hdev-&gt;stat.byte_rx += urb-&gt;actual_length;</div><div class='add'>+</div><div class='ctx'> 		if (hci_recv_fragment(hdev, HCI_ACLDATA_PKT,</div><div class='ctx'> 						urb-&gt;transfer_buffer,</div><div class='ctx'> 						urb-&gt;actual_length) &lt; 0) {</div><div class='hunk'>@@ -191,7 +311,7 @@ static void btusb_bulk_complete(struct urb *urb)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int btusb_submit_bulk_urb(struct hci_dev *hdev)</div><div class='add'>+static int btusb_submit_bulk_urb(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct btusb_data *data = hdev-&gt;driver_data;</div><div class='ctx'> 	struct urb *urb;</div><div class='hunk'>@@ -201,6 +321,9 @@ static inline int btusb_submit_bulk_urb(struct hci_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("%s", hdev-&gt;name);</div><div class='ctx'> </div><div class='add'>+	if (!data-&gt;bulk_rx_ep)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='ctx'> 	if (!urb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -235,6 +358,127 @@ static inline int btusb_submit_bulk_urb(struct hci_dev *hdev)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void btusb_isoc_complete(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct hci_dev *hdev = urb-&gt;context;</div><div class='add'>+	struct btusb_data *data = hdev-&gt;driver_data;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	BT_DBG("%s urb %p status %d count %d", hdev-&gt;name,</div><div class='add'>+					urb, urb-&gt;status, urb-&gt;actual_length);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(HCI_RUNNING, &amp;hdev-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;status == 0) {</div><div class='add'>+		for (i = 0; i &lt; urb-&gt;number_of_packets; i++) {</div><div class='add'>+			unsigned int offset = urb-&gt;iso_frame_desc[i].offset;</div><div class='add'>+			unsigned int length = urb-&gt;iso_frame_desc[i].actual_length;</div><div class='add'>+</div><div class='add'>+			if (urb-&gt;iso_frame_desc[i].status)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			hdev-&gt;stat.byte_rx += length;</div><div class='add'>+</div><div class='add'>+			if (hci_recv_fragment(hdev, HCI_SCODATA_PKT,</div><div class='add'>+						urb-&gt;transfer_buffer + offset,</div><div class='add'>+								length) &lt; 0) {</div><div class='add'>+				BT_ERR("%s corrupted SCO packet", hdev-&gt;name);</div><div class='add'>+				hdev-&gt;stat.err_rx++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!test_bit(BTUSB_ISOC_RUNNING, &amp;data-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	usb_anchor_urb(urb, &amp;data-&gt;isoc_anchor);</div><div class='add'>+</div><div class='add'>+	err = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		BT_ERR("%s urb %p failed to resubmit (%d)",</div><div class='add'>+						hdev-&gt;name, urb, -err);</div><div class='add'>+		usb_unanchor_urb(urb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void inline __fill_isoc_descriptor(struct urb *urb, int len, int mtu)</div><div class='add'>+{</div><div class='add'>+	int i, offset = 0;</div><div class='add'>+</div><div class='add'>+	BT_DBG("len %d mtu %d", len, mtu);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BTUSB_MAX_ISOC_FRAMES &amp;&amp; len &gt;= mtu;</div><div class='add'>+					i++, offset += mtu, len -= mtu) {</div><div class='add'>+		urb-&gt;iso_frame_desc[i].offset = offset;</div><div class='add'>+		urb-&gt;iso_frame_desc[i].length = mtu;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len &amp;&amp; i &lt; BTUSB_MAX_ISOC_FRAMES) {</div><div class='add'>+		urb-&gt;iso_frame_desc[i].offset = offset;</div><div class='add'>+		urb-&gt;iso_frame_desc[i].length = len;</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	urb-&gt;number_of_packets = i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btusb_submit_isoc_urb(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct btusb_data *data = hdev-&gt;driver_data;</div><div class='add'>+	struct urb *urb;</div><div class='add'>+	unsigned char *buf;</div><div class='add'>+	unsigned int pipe;</div><div class='add'>+	int err, size;</div><div class='add'>+</div><div class='add'>+	BT_DBG("%s", hdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (!data-&gt;isoc_rx_ep)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	urb = usb_alloc_urb(BTUSB_MAX_ISOC_FRAMES, GFP_KERNEL);</div><div class='add'>+	if (!urb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	size = le16_to_cpu(data-&gt;isoc_rx_ep-&gt;wMaxPacketSize) *</div><div class='add'>+						BTUSB_MAX_ISOC_FRAMES;</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		usb_free_urb(urb);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pipe = usb_rcvisocpipe(data-&gt;udev, data-&gt;isoc_rx_ep-&gt;bEndpointAddress);</div><div class='add'>+</div><div class='add'>+	urb-&gt;dev      = data-&gt;udev;</div><div class='add'>+	urb-&gt;pipe     = pipe;</div><div class='add'>+	urb-&gt;context  = hdev;</div><div class='add'>+	urb-&gt;complete = btusb_isoc_complete;</div><div class='add'>+	urb-&gt;interval = data-&gt;isoc_rx_ep-&gt;bInterval;</div><div class='add'>+</div><div class='add'>+	urb-&gt;transfer_flags  = URB_FREE_BUFFER | URB_ISO_ASAP;</div><div class='add'>+	urb-&gt;transfer_buffer = buf;</div><div class='add'>+	urb-&gt;transfer_buffer_length = size;</div><div class='add'>+</div><div class='add'>+	__fill_isoc_descriptor(urb, size,</div><div class='add'>+			le16_to_cpu(data-&gt;isoc_rx_ep-&gt;wMaxPacketSize));</div><div class='add'>+</div><div class='add'>+	usb_anchor_urb(urb, &amp;data-&gt;isoc_anchor);</div><div class='add'>+</div><div class='add'>+	err = usb_submit_urb(urb, GFP_KERNEL);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		BT_ERR("%s urb %p submission failed (%d)",</div><div class='add'>+						hdev-&gt;name, urb, -err);</div><div class='add'>+		usb_unanchor_urb(urb);</div><div class='add'>+		kfree(buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb_free_urb(urb);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void btusb_tx_complete(struct urb *urb)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = urb-&gt;context;</div><div class='hunk'>@@ -288,6 +532,9 @@ static int btusb_close(struct hci_dev *hdev)</div><div class='ctx'> 	if (!test_and_clear_bit(HCI_RUNNING, &amp;hdev-&gt;flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	clear_bit(BTUSB_ISOC_RUNNING, &amp;data-&gt;flags);</div><div class='add'>+	usb_kill_anchored_urbs(&amp;data-&gt;intr_anchor);</div><div class='add'>+</div><div class='ctx'> 	clear_bit(BTUSB_BULK_RUNNING, &amp;data-&gt;flags);</div><div class='ctx'> 	usb_kill_anchored_urbs(&amp;data-&gt;bulk_anchor);</div><div class='ctx'> </div><div class='hunk'>@@ -349,6 +596,9 @@ static int btusb_send_frame(struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case HCI_ACLDATA_PKT:</div><div class='add'>+		if (!data-&gt;bulk_tx_ep || hdev-&gt;conn_hash.acl_num &lt; 1)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 		urb = usb_alloc_urb(0, GFP_ATOMIC);</div><div class='ctx'> 		if (!urb)</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -363,9 +613,31 @@ static int btusb_send_frame(struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case HCI_SCODATA_PKT:</div><div class='add'>+		if (!data-&gt;isoc_tx_ep || hdev-&gt;conn_hash.sco_num &lt; 1)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+</div><div class='add'>+		urb = usb_alloc_urb(BTUSB_MAX_ISOC_FRAMES, GFP_ATOMIC);</div><div class='add'>+		if (!urb)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		pipe = usb_sndisocpipe(data-&gt;udev,</div><div class='add'>+					data-&gt;isoc_tx_ep-&gt;bEndpointAddress);</div><div class='add'>+</div><div class='add'>+		urb-&gt;dev      = data-&gt;udev;</div><div class='add'>+		urb-&gt;pipe     = pipe;</div><div class='add'>+		urb-&gt;context  = skb;</div><div class='add'>+		urb-&gt;complete = btusb_tx_complete;</div><div class='add'>+		urb-&gt;interval = data-&gt;isoc_tx_ep-&gt;bInterval;</div><div class='add'>+</div><div class='add'>+		urb-&gt;transfer_flags  = URB_ISO_ASAP;</div><div class='add'>+		urb-&gt;transfer_buffer = skb-&gt;data;</div><div class='add'>+		urb-&gt;transfer_buffer_length = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+		__fill_isoc_descriptor(urb, skb-&gt;len,</div><div class='add'>+				le16_to_cpu(data-&gt;isoc_tx_ep-&gt;wMaxPacketSize));</div><div class='add'>+</div><div class='ctx'> 		hdev-&gt;stat.sco_tx++;</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return 0;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EILSEQ;</div><div class='hunk'>@@ -404,22 +676,86 @@ static void btusb_notify(struct hci_dev *hdev, unsigned int evt)</div><div class='ctx'> 		schedule_work(&amp;data-&gt;work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int inline __set_isoc_interface(struct hci_dev *hdev, int altsetting)</div><div class='add'>+{</div><div class='add'>+	struct btusb_data *data = hdev-&gt;driver_data;</div><div class='add'>+	struct usb_interface *intf = data-&gt;isoc;</div><div class='add'>+	struct usb_endpoint_descriptor *ep_desc;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (!data-&gt;isoc)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	err = usb_set_interface(data-&gt;udev, 1, altsetting);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		BT_ERR("%s setting interface failed (%d)", hdev-&gt;name, -err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;isoc_altsetting = altsetting;</div><div class='add'>+</div><div class='add'>+	data-&gt;isoc_tx_ep = NULL;</div><div class='add'>+	data-&gt;isoc_rx_ep = NULL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; intf-&gt;cur_altsetting-&gt;desc.bNumEndpoints; i++) {</div><div class='add'>+		ep_desc = &amp;intf-&gt;cur_altsetting-&gt;endpoint[i].desc;</div><div class='add'>+</div><div class='add'>+		if (!data-&gt;isoc_tx_ep &amp;&amp; usb_endpoint_is_isoc_out(ep_desc)) {</div><div class='add'>+			data-&gt;isoc_tx_ep = ep_desc;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!data-&gt;isoc_rx_ep &amp;&amp; usb_endpoint_is_isoc_in(ep_desc)) {</div><div class='add'>+			data-&gt;isoc_rx_ep = ep_desc;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!data-&gt;isoc_tx_ep || !data-&gt;isoc_rx_ep) {</div><div class='add'>+		BT_ERR("%s invalid SCO descriptors", hdev-&gt;name);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void btusb_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct btusb_data *data = container_of(work, struct btusb_data, work);</div><div class='ctx'> 	struct hci_dev *hdev = data-&gt;hdev;</div><div class='ctx'> </div><div class='del'>-	if (hdev-&gt;conn_hash.acl_num == 0) {</div><div class='add'>+	if (hdev-&gt;conn_hash.acl_num &gt; 0) {</div><div class='add'>+		if (!test_and_set_bit(BTUSB_BULK_RUNNING, &amp;data-&gt;flags)) {</div><div class='add'>+			if (btusb_submit_bulk_urb(hdev) &lt; 0)</div><div class='add'>+				clear_bit(BTUSB_BULK_RUNNING, &amp;data-&gt;flags);</div><div class='add'>+			else</div><div class='add'>+				btusb_submit_bulk_urb(hdev);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='ctx'> 		clear_bit(BTUSB_BULK_RUNNING, &amp;data-&gt;flags);</div><div class='ctx'> 		usb_kill_anchored_urbs(&amp;data-&gt;bulk_anchor);</div><div class='del'>-		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!test_and_set_bit(BTUSB_BULK_RUNNING, &amp;data-&gt;flags)) {</div><div class='del'>-		if (btusb_submit_bulk_urb(hdev) &lt; 0)</div><div class='del'>-			clear_bit(BTUSB_BULK_RUNNING, &amp;data-&gt;flags);</div><div class='del'>-		else</div><div class='del'>-			btusb_submit_bulk_urb(hdev);</div><div class='add'>+	if (hdev-&gt;conn_hash.sco_num &gt; 0) {</div><div class='add'>+		if (data-&gt;isoc_altsetting != 2) {</div><div class='add'>+			clear_bit(BTUSB_ISOC_RUNNING, &amp;data-&gt;flags);</div><div class='add'>+			usb_kill_anchored_urbs(&amp;data-&gt;isoc_anchor);</div><div class='add'>+</div><div class='add'>+			if (__set_isoc_interface(hdev, 2) &lt; 0)</div><div class='add'>+				return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!test_and_set_bit(BTUSB_ISOC_RUNNING, &amp;data-&gt;flags)) {</div><div class='add'>+			if (btusb_submit_isoc_urb(hdev) &lt; 0)</div><div class='add'>+				clear_bit(BTUSB_ISOC_RUNNING, &amp;data-&gt;flags);</div><div class='add'>+			else</div><div class='add'>+				btusb_submit_isoc_urb(hdev);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		clear_bit(BTUSB_ISOC_RUNNING, &amp;data-&gt;flags);</div><div class='add'>+		usb_kill_anchored_urbs(&amp;data-&gt;isoc_anchor);</div><div class='add'>+</div><div class='add'>+		__set_isoc_interface(hdev, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -433,6 +769,7 @@ static int btusb_probe(struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("intf %p id %p", intf, id);</div><div class='ctx'> </div><div class='add'>+	/* interface numbers are hardcoded in the spec */</div><div class='ctx'> 	if (intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber != 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -443,6 +780,18 @@ static int btusb_probe(struct usb_interface *intf,</div><div class='ctx'> 			id = match;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (id-&gt;driver_info == BTUSB_IGNORE)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (ignore_dga &amp;&amp; id-&gt;driver_info &amp; BTUSB_DIGIANSWER)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (ignore_csr &amp;&amp; id-&gt;driver_info &amp; BTUSB_CSR)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (ignore_sniffer &amp;&amp; id-&gt;driver_info &amp; BTUSB_SNIFFER)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	data = kzalloc(sizeof(*data), GFP_KERNEL);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -480,6 +829,7 @@ static int btusb_probe(struct usb_interface *intf,</div><div class='ctx'> 	init_usb_anchor(&amp;data-&gt;tx_anchor);</div><div class='ctx'> 	init_usb_anchor(&amp;data-&gt;intr_anchor);</div><div class='ctx'> 	init_usb_anchor(&amp;data-&gt;bulk_anchor);</div><div class='add'>+	init_usb_anchor(&amp;data-&gt;isoc_anchor);</div><div class='ctx'> </div><div class='ctx'> 	hdev = hci_alloc_dev();</div><div class='ctx'> 	if (!hdev) {</div><div class='hunk'>@@ -503,7 +853,49 @@ static int btusb_probe(struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='del'>-	set_bit(HCI_QUIRK_RESET_ON_INIT, &amp;hdev-&gt;quirks);</div><div class='add'>+	/* interface numbers are hardcoded in the spec */</div><div class='add'>+	data-&gt;isoc = usb_ifnum_to_if(data-&gt;udev, 1);</div><div class='add'>+</div><div class='add'>+	if (reset || id-&gt;driver_info &amp; BTUSB_RESET)</div><div class='add'>+		set_bit(HCI_QUIRK_RESET_ON_INIT, &amp;hdev-&gt;quirks);</div><div class='add'>+</div><div class='add'>+	if (force_scofix || id-&gt;driver_info &amp; BTUSB_WRONG_SCO_MTU) {</div><div class='add'>+		if (!disable_scofix)</div><div class='add'>+			set_bit(HCI_QUIRK_FIXUP_BUFFER_SIZE, &amp;hdev-&gt;quirks);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (id-&gt;driver_info &amp; BTUSB_BROKEN_ISOC)</div><div class='add'>+		data-&gt;isoc = NULL;</div><div class='add'>+</div><div class='add'>+	if (id-&gt;driver_info &amp; BTUSB_SNIFFER) {</div><div class='add'>+		struct usb_device *udev = data-&gt;udev;</div><div class='add'>+</div><div class='add'>+		if (le16_to_cpu(udev-&gt;descriptor.bcdDevice) &gt; 0x997)</div><div class='add'>+			set_bit(HCI_QUIRK_RAW_DEVICE, &amp;hdev-&gt;quirks);</div><div class='add'>+</div><div class='add'>+		data-&gt;isoc = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (id-&gt;driver_info &amp; BTUSB_BCM92035) {</div><div class='add'>+		unsigned char cmd[] = { 0x3b, 0xfc, 0x01, 0x00 };</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		skb = bt_skb_alloc(sizeof(cmd), GFP_KERNEL);</div><div class='add'>+		if (skb) {</div><div class='add'>+			memcpy(skb_put(skb, sizeof(cmd)), cmd, sizeof(cmd));</div><div class='add'>+			skb_queue_tail(&amp;hdev-&gt;driver_init, skb);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;isoc) {</div><div class='add'>+		err = usb_driver_claim_interface(&amp;btusb_driver,</div><div class='add'>+							data-&gt;isoc, NULL);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			hci_free_dev(hdev);</div><div class='add'>+			kfree(data);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = hci_register_dev(hdev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='hunk'>@@ -529,6 +921,9 @@ static void btusb_disconnect(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> 	hdev = data-&gt;hdev;</div><div class='ctx'> </div><div class='add'>+	if (data-&gt;isoc)</div><div class='add'>+		usb_driver_release_interface(&amp;btusb_driver, data-&gt;isoc);</div><div class='add'>+</div><div class='ctx'> 	usb_set_intfdata(intf, NULL);</div><div class='ctx'> </div><div class='ctx'> 	hci_unregister_dev(hdev);</div><div class='hunk'>@@ -558,6 +953,24 @@ static void __exit btusb_exit(void)</div><div class='ctx'> module_init(btusb_init);</div><div class='ctx'> module_exit(btusb_exit);</div><div class='ctx'> </div><div class='add'>+module_param(ignore_dga, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(ignore_dga, "Ignore devices with id 08fd:0001");</div><div class='add'>+</div><div class='add'>+module_param(ignore_csr, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(ignore_csr, "Ignore devices with id 0a12:0001");</div><div class='add'>+</div><div class='add'>+module_param(ignore_sniffer, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(ignore_sniffer, "Ignore devices with id 0a12:0002");</div><div class='add'>+</div><div class='add'>+module_param(disable_scofix, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(disable_scofix, "Disable fixup of wrong SCO buffer size");</div><div class='add'>+</div><div class='add'>+module_param(force_scofix, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(force_scofix, "Force fixup of wrong SCO buffers size");</div><div class='add'>+</div><div class='add'>+module_param(reset, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(reset, "Send HCI reset command on initialization");</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Marcel Holtmann &lt;marcel@holtmann.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Generic Bluetooth USB driver ver " VERSION);</div><div class='ctx'> MODULE_VERSION(VERSION);</div><div class='head'>diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c<br/>index 69df187d74ce..8dfcf77cb717 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_ldisc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/bluetooth/hci_ldisc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_ldisc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/hci_ldisc.c</a></div><div class='hunk'>@@ -577,7 +577,7 @@ module_exit(hci_uart_exit);</div><div class='ctx'> module_param(reset, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(reset, "Send HCI reset command on initialization");</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Maxim Krasnyansky &lt;maxk@qualcomm.com&gt;, Marcel Holtmann &lt;marcel@holtmann.org&gt;");</div><div class='add'>+MODULE_AUTHOR("Marcel Holtmann &lt;marcel@holtmann.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Bluetooth HCI UART driver ver " VERSION);</div><div class='ctx'> MODULE_VERSION(VERSION);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c<br/>index 192522ebb771..3c453924f838 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_usb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/bluetooth/hci_usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_usb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/hci_usb.c</a></div><div class='hunk'>@@ -62,7 +62,6 @@</div><div class='ctx'> #define URB_ZERO_PACKET 0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int ignore;</div><div class='ctx'> static int ignore_dga;</div><div class='ctx'> static int ignore_csr;</div><div class='ctx'> static int ignore_sniffer;</div><div class='hunk'>@@ -74,7 +73,7 @@ static int reset;</div><div class='ctx'> static int isoc = 2;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define VERSION "2.9"</div><div class='add'>+#define VERSION "2.10"</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver hci_usb_driver; </div><div class='ctx'> </div><div class='hunk'>@@ -134,6 +133,13 @@ static struct usb_device_id blacklist_ids[] = {</div><div class='ctx'> </div><div class='ctx'> 	/* Dell laptop with Broadcom chip */</div><div class='ctx'> 	{ USB_DEVICE(0x413c, 0x8126), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },</div><div class='add'>+	/* Dell Wireless 370 */</div><div class='add'>+	{ USB_DEVICE(0x413c, 0x8156), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },</div><div class='add'>+	/* Dell Wireless 410 */</div><div class='add'>+	{ USB_DEVICE(0x413c, 0x8152), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },</div><div class='add'>+</div><div class='add'>+	/* Broadcom 2046 */</div><div class='add'>+	{ USB_DEVICE(0x0a5c, 0x2151), .driver_info = HCI_RESET },</div><div class='ctx'> </div><div class='ctx'> 	/* Microsoft Wireless Transceiver for Bluetooth 2.0 */</div><div class='ctx'> 	{ USB_DEVICE(0x045e, 0x009c), .driver_info = HCI_RESET },</div><div class='hunk'>@@ -794,7 +800,7 @@ static int hci_usb_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 			id = match;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ignore || id-&gt;driver_info &amp; HCI_IGNORE)</div><div class='add'>+	if (id-&gt;driver_info &amp; HCI_IGNORE)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (ignore_dga &amp;&amp; id-&gt;driver_info &amp; HCI_DIGIANSWER)</div><div class='hunk'>@@ -1101,9 +1107,6 @@ static void __exit hci_usb_exit(void)</div><div class='ctx'> module_init(hci_usb_init);</div><div class='ctx'> module_exit(hci_usb_exit);</div><div class='ctx'> </div><div class='del'>-module_param(ignore, bool, 0644);</div><div class='del'>-MODULE_PARM_DESC(ignore, "Ignore devices from the matching table");</div><div class='del'>-</div><div class='ctx'> module_param(ignore_dga, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(ignore_dga, "Ignore devices with id 08fd:0001");</div><div class='ctx'> </div><div class='hunk'>@@ -1127,7 +1130,7 @@ module_param(isoc, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(isoc, "Set isochronous transfers for SCO over HCI support");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Maxim Krasnyansky &lt;maxk@qualcomm.com&gt;, Marcel Holtmann &lt;marcel@holtmann.org&gt;");</div><div class='add'>+MODULE_AUTHOR("Marcel Holtmann &lt;marcel@holtmann.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Bluetooth HCI USB driver ver " VERSION);</div><div class='ctx'> MODULE_VERSION(VERSION);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c<br/>index d97700aa54a9..7320a71b6368 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_vhci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/bluetooth/hci_vhci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_vhci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/bluetooth/hci_vhci.c</a></div><div class='hunk'>@@ -377,7 +377,7 @@ module_exit(vhci_exit);</div><div class='ctx'> module_param(minor, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(minor, "Miscellaneous minor device number");</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Maxim Krasnyansky &lt;maxk@qualcomm.com&gt;, Marcel Holtmann &lt;marcel@holtmann.org&gt;");</div><div class='add'>+MODULE_AUTHOR("Marcel Holtmann &lt;marcel@holtmann.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);</div><div class='ctx'> MODULE_VERSION(VERSION);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c<br/>index a5da35632651..74031de517e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cdrom/cdrom.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/cdrom/cdrom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cdrom/cdrom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/cdrom/cdrom.c</a></div><div class='hunk'>@@ -408,7 +408,6 @@ int register_cdrom(struct cdrom_device_info *cdi)</div><div class='ctx'> 	ENSURE(get_last_session, CDC_MULTI_SESSION);</div><div class='ctx'> 	ENSURE(get_mcn, CDC_MCN);</div><div class='ctx'> 	ENSURE(reset, CDC_RESET);</div><div class='del'>-	ENSURE(audio_ioctl, CDC_PLAY_AUDIO);</div><div class='ctx'> 	ENSURE(generic_packet, CDC_GENERIC_PACKET);</div><div class='ctx'> 	cdi-&gt;mc_flags = 0;</div><div class='ctx'> 	cdo-&gt;n_minors = 0;</div><div class='hunk'>@@ -1436,10 +1435,6 @@ static void cdrom_count_tracks(struct cdrom_device_info *cdi, tracktype* tracks)</div><div class='ctx'> 	tracks-&gt;xa=0;</div><div class='ctx'> 	tracks-&gt;error=0;</div><div class='ctx'> 	cdinfo(CD_COUNT_TRACKS, "entering cdrom_count_tracks\n"); </div><div class='del'>-        if (!CDROM_CAN(CDC_PLAY_AUDIO)) { </div><div class='del'>-                tracks-&gt;error=CDS_NO_INFO;</div><div class='del'>-                return;</div><div class='del'>-        }        </div><div class='ctx'> 	/* Grab the TOC header so we can see how many tracks there are */</div><div class='ctx'> 	if ((ret = cdi-&gt;ops-&gt;audio_ioctl(cdi, CDROMREADTOCHDR, &amp;header))) {</div><div class='ctx'> 		if (ret == -ENOMEDIUM)</div><div class='hunk'>@@ -2510,8 +2505,6 @@ static int cdrom_ioctl_get_subchnl(struct cdrom_device_info *cdi,</div><div class='ctx'> </div><div class='ctx'> 	/* cdinfo(CD_DO_IOCTL,"entering CDROMSUBCHNL\n");*/</div><div class='ctx'> </div><div class='del'>-	if (!CDROM_CAN(CDC_PLAY_AUDIO))</div><div class='del'>-		return -ENOSYS;</div><div class='ctx'> 	if (copy_from_user(&amp;q, argp, sizeof(q)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -2542,8 +2535,6 @@ static int cdrom_ioctl_read_tochdr(struct cdrom_device_info *cdi,</div><div class='ctx'> </div><div class='ctx'> 	/* cdinfo(CD_DO_IOCTL, "entering CDROMREADTOCHDR\n"); */</div><div class='ctx'> </div><div class='del'>-	if (!CDROM_CAN(CDC_PLAY_AUDIO))</div><div class='del'>-		return -ENOSYS;</div><div class='ctx'> 	if (copy_from_user(&amp;header, argp, sizeof(header)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -2566,8 +2557,6 @@ static int cdrom_ioctl_read_tocentry(struct cdrom_device_info *cdi,</div><div class='ctx'> </div><div class='ctx'> 	/* cdinfo(CD_DO_IOCTL, "entering CDROMREADTOCENTRY\n"); */</div><div class='ctx'> </div><div class='del'>-	if (!CDROM_CAN(CDC_PLAY_AUDIO))</div><div class='del'>-		return -ENOSYS;</div><div class='ctx'> 	if (copy_from_user(&amp;entry, argp, sizeof(entry)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c<br/>index 71ec426ecffc..1231d95aa695 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cdrom/gdrom.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/cdrom/gdrom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cdrom/gdrom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/cdrom/gdrom.c</a></div><div class='hunk'>@@ -39,8 +39,8 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='del'>-#include &lt;asm/mach/dma.h&gt;</div><div class='del'>-#include &lt;asm/mach/sysasic.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='add'>+#include &lt;mach/sysasic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define GDROM_DEV_NAME "gdrom"</div><div class='ctx'> #define GD_SESSION_OFFSET 150</div><div class='hunk'>@@ -471,6 +471,12 @@ cleanup_sense_final:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int gdrom_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,</div><div class='add'>+			     void *arg)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct cdrom_device_ops gdrom_ops = {</div><div class='ctx'> 	.open			= gdrom_open,</div><div class='ctx'> 	.release		= gdrom_release,</div><div class='hunk'>@@ -478,6 +484,7 @@ static struct cdrom_device_ops gdrom_ops = {</div><div class='ctx'> 	.media_changed		= gdrom_mediachanged,</div><div class='ctx'> 	.get_last_session	= gdrom_get_last_session,</div><div class='ctx'> 	.reset			= gdrom_hardreset,</div><div class='add'>+	.audio_ioctl		= gdrom_audio_ioctl,</div><div class='ctx'> 	.capability		= CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |</div><div class='ctx'> 				  CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,</div><div class='ctx'> 	.n_minors		= 1,</div><div class='head'>diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c<br/>index 9d0dfe6e0d63..031e0e1a1a3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cdrom/viocd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/cdrom/viocd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cdrom/viocd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/cdrom/viocd.c</a></div><div class='hunk'>@@ -550,12 +550,19 @@ return_complete:</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int viocd_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,</div><div class='add'>+			     void *arg)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct cdrom_device_ops viocd_dops = {</div><div class='ctx'> 	.open = viocd_open,</div><div class='ctx'> 	.release = viocd_release,</div><div class='ctx'> 	.media_changed = viocd_media_changed,</div><div class='ctx'> 	.lock_door = viocd_lock_door,</div><div class='ctx'> 	.generic_packet = viocd_packet,</div><div class='add'>+	.audio_ioctl = viocd_audio_ioctl,</div><div class='ctx'> 	.capability = CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | CDC_SELECT_SPEED | CDC_SELECT_DISC | CDC_MULTI_SESSION | CDC_MCN | CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO | CDC_RESET | CDC_DRIVE_STATUS | CDC_GENERIC_PACKET | CDC_CD_R | CDC_CD_RW | CDC_DVD | CDC_DVD_R | CDC_DVD_RAM | CDC_RAM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig<br/>index d0ac944e1696..caff85149b9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/Kconfig</a></div><div class='hunk'>@@ -8,7 +8,7 @@ config VT</div><div class='ctx'> 	bool "Virtual terminal" if EMBEDDED</div><div class='ctx'> 	depends on !S390</div><div class='ctx'> 	select INPUT</div><div class='del'>-	default y if !VIOCONS</div><div class='add'>+	default y</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  If you say Y here, you will get support for terminal devices with</div><div class='ctx'> 	  display and keyboard devices. These are called "virtual" because you</div><div class='head'>diff --git a/drivers/char/Makefile b/drivers/char/Makefile<br/>index 8a161c30e1dc..6850f6da7576 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/Makefile</a></div><div class='hunk'>@@ -55,7 +55,6 @@ obj-$(CONFIG_RAW_DRIVER)	+= raw.o</div><div class='ctx'> obj-$(CONFIG_SGI_SNSC)		+= snsc.o snsc_event.o</div><div class='ctx'> obj-$(CONFIG_MSPEC)		+= mspec.o</div><div class='ctx'> obj-$(CONFIG_MMTIMER)		+= mmtimer.o</div><div class='del'>-obj-$(CONFIG_VIOCONS)		+= viocons.o</div><div class='ctx'> obj-$(CONFIG_VIOTAPE)		+= viotape.o</div><div class='ctx'> obj-$(CONFIG_HVCS)		+= hvcs.o</div><div class='ctx'> obj-$(CONFIG_IBM_BSR)		+= bsr.o</div><div class='head'>diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h<br/>index 81e14bea54bd..4bada0e8b812 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/agp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/agp/agp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/agp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/agp.h</a></div><div class='hunk'>@@ -148,6 +148,9 @@ struct agp_bridge_data {</div><div class='ctx'> 	char minor_version;</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	u32 apbase_config;</div><div class='add'>+	/* list of agp_memory mapped to the aperture */</div><div class='add'>+	struct list_head mapped_list;</div><div class='add'>+	spinlock_t mapped_lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define KB(x)	((x) * 1024)</div><div class='head'>diff --git a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c<br/>index 1ffb381130c3..31dcd9142d54 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/ali-agp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/agp/ali-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/ali-agp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/ali-agp.c</a></div><div class='hunk'>@@ -110,7 +110,8 @@ static int ali_configure(void)</div><div class='ctx'> </div><div class='ctx'> 		nlvm_addr+= agp_bridge-&gt;gart_bus_addr;</div><div class='ctx'> 		nlvm_addr|=(agp_bridge-&gt;gart_bus_addr&gt;&gt;12);</div><div class='del'>-		printk(KERN_INFO PFX "nlvm top &amp;base = %8x\n",nlvm_addr);</div><div class='add'>+		dev_info(&amp;agp_bridge-&gt;dev-&gt;dev, "nlvm top &amp;base = %8x\n",</div><div class='add'>+			 nlvm_addr);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -315,8 +316,8 @@ static int __devinit agp_ali_probe(struct pci_dev *pdev,</div><div class='ctx'> 			goto found;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_ERR PFX "Unsupported ALi chipset (device id: %04x)\n",</div><div class='del'>-	     pdev-&gt;device);</div><div class='add'>+	dev_err(&amp;pdev-&gt;dev, "unsupported ALi chipset [%04x/%04x])\n",</div><div class='add'>+		pdev-&gt;vendor, pdev-&gt;device);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -361,8 +362,7 @@ found:</div><div class='ctx'> 		bridge-&gt;driver = &amp;ali_generic_bridge;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO PFX "Detected ALi %s chipset\n",</div><div class='del'>-			devs[j].chipset_name);</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "ALi %s chipset\n", devs[j].chipset_name);</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in the mode register */</div><div class='ctx'> 	pci_read_config_dword(pdev,</div><div class='head'>diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c<br/>index 39a0718bc616..e280531843be 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/amd-k7-agp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/agp/amd-k7-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/amd-k7-agp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/amd-k7-agp.c</a></div><div class='hunk'>@@ -419,8 +419,8 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	j = ent - agp_amdk7_pci_table;</div><div class='del'>-	printk(KERN_INFO PFX "Detected AMD %s chipset\n",</div><div class='del'>-	       amd_agp_device_ids[j].chipset_name);</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "AMD %s chipset\n",</div><div class='add'>+		 amd_agp_device_ids[j].chipset_name);</div><div class='ctx'> </div><div class='ctx'> 	bridge = agp_alloc_bridge();</div><div class='ctx'> 	if (!bridge)</div><div class='hunk'>@@ -442,7 +442,7 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev,</div><div class='ctx'> 		while (!cap_ptr) {</div><div class='ctx'> 			gfxcard = pci_get_class(PCI_CLASS_DISPLAY_VGA&lt;&lt;8, gfxcard);</div><div class='ctx'> 			if (!gfxcard) {</div><div class='del'>-				printk (KERN_INFO PFX "Couldn't find an AGP VGA controller.\n");</div><div class='add'>+				dev_info(&amp;pdev-&gt;dev, "no AGP VGA controller\n");</div><div class='ctx'> 				return -ENODEV;</div><div class='ctx'> 			}</div><div class='ctx'> 			cap_ptr = pci_find_capability(gfxcard, PCI_CAP_ID_AGP);</div><div class='hunk'>@@ -453,7 +453,7 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev,</div><div class='ctx'> 		   (if necessary at all). */</div><div class='ctx'> 		if (gfxcard-&gt;vendor == PCI_VENDOR_ID_NVIDIA) {</div><div class='ctx'> 			agp_bridge-&gt;flags |= AGP_ERRATA_1X;</div><div class='del'>-			printk (KERN_INFO PFX "AMD 751 chipset with NVidia GeForce detected. Forcing to 1X due to errata.\n");</div><div class='add'>+			dev_info(&amp;pdev-&gt;dev, "AMD 751 chipset with NVidia GeForce; forcing 1X due to errata\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		pci_dev_put(gfxcard);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -469,7 +469,7 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev,</div><div class='ctx'> 			agp_bridge-&gt;flags = AGP_ERRATA_FASTWRITES;</div><div class='ctx'> 			agp_bridge-&gt;flags |= AGP_ERRATA_SBA;</div><div class='ctx'> 			agp_bridge-&gt;flags |= AGP_ERRATA_1X;</div><div class='del'>-			printk (KERN_INFO PFX "AMD 761 chipset with errata detected - disabling AGP fast writes &amp; SBA and forcing to 1X.\n");</div><div class='add'>+			dev_info(&amp;pdev-&gt;dev, "AMD 761 chipset with errata; disabling AGP fast writes &amp; SBA and forcing to 1X\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c<br/>index 481ffe87c716..7495c522d8e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/amd64-agp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/agp/amd64-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/amd64-agp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/amd64-agp.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> </div><div class='ctx'> static struct resource *aperture_resource;</div><div class='ctx'> static int __initdata agp_try_unsupported = 1;</div><div class='add'>+static int agp_bridges_found;</div><div class='ctx'> </div><div class='ctx'> static void amd64_tlbflush(struct agp_memory *temp)</div><div class='ctx'> {</div><div class='hunk'>@@ -293,12 +294,13 @@ static __devinit int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp,</div><div class='ctx'> 	 * so let double check that order, and lets trust the AMD NB settings</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (order &gt;=0 &amp;&amp; aper + (32ULL&lt;&lt;(20 + order)) &gt; 0x100000000ULL) {</div><div class='del'>-		printk(KERN_INFO "Aperture size %u MB is not right, using settings from NB\n",</div><div class='del'>-				  32 &lt;&lt; order);</div><div class='add'>+		dev_info(&amp;agp-&gt;dev, "aperture size %u MB is not right, using settings from NB\n",</div><div class='add'>+			 32 &lt;&lt; order);</div><div class='ctx'> 		order = nb_order;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO PFX "Aperture from AGP @ %Lx size %u MB\n", aper, 32 &lt;&lt; order);</div><div class='add'>+	dev_info(&amp;agp-&gt;dev, "aperture from AGP @ %Lx size %u MB\n",</div><div class='add'>+		 aper, 32 &lt;&lt; order);</div><div class='ctx'> 	if (order &lt; 0 || !agp_aperture_valid(aper, (32*1024*1024)&lt;&lt;order))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='hunk'>@@ -319,10 +321,10 @@ static __devinit int cache_nbs (struct pci_dev *pdev, u32 cap_ptr)</div><div class='ctx'> 	for (i = 0; i &lt; num_k8_northbridges; i++) {</div><div class='ctx'> 		struct pci_dev *dev = k8_northbridges[i];</div><div class='ctx'> 		if (fix_northbridge(dev, pdev, cap_ptr) &lt; 0) {</div><div class='del'>-			printk(KERN_ERR PFX "No usable aperture found.\n");</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "no usable aperture found\n");</div><div class='ctx'> #ifdef __x86_64__</div><div class='ctx'> 			/* should port this to i386 */</div><div class='del'>-			printk(KERN_ERR PFX "Consider rebooting with iommu=memaper=2 to get a good aperture.\n");</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "consider rebooting with iommu=memaper=2 to get a good aperture\n");</div><div class='ctx'> #endif</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -345,14 +347,14 @@ static void __devinit amd8151_init(struct pci_dev *pdev, struct agp_bridge_data</div><div class='ctx'> 	default:   revstring="??"; break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk (KERN_INFO PFX "Detected AMD 8151 AGP Bridge rev %s\n", revstring);</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "AMD 8151 AGP Bridge rev %s\n", revstring);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Work around errata.</div><div class='ctx'> 	 * Chips before B2 stepping incorrectly reporting v3.5</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pdev-&gt;revision &lt; 0x13) {</div><div class='del'>-		printk (KERN_INFO PFX "Correcting AGP revision (reports 3.5, is really 3.0)\n");</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "correcting AGP revision (reports 3.5, is really 3.0)\n");</div><div class='ctx'> 		bridge-&gt;major_version = 3;</div><div class='ctx'> 		bridge-&gt;minor_version = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -375,11 +377,11 @@ static int __devinit uli_agp_init(struct pci_dev *pdev)</div><div class='ctx'> 	struct pci_dev *dev1;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned size = amd64_fetch_size();</div><div class='del'>-	printk(KERN_INFO "Setting up ULi AGP.\n");</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "setting up ULi AGP\n");</div><div class='ctx'> 	dev1 = pci_get_slot (pdev-&gt;bus,PCI_DEVFN(0,0));</div><div class='ctx'> 	if (dev1 == NULL) {</div><div class='del'>-		printk(KERN_INFO PFX "Detected a ULi chipset, "</div><div class='del'>-			"but could not fine the secondary device.\n");</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "can't find ULi secondary device\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -388,7 +390,7 @@ static int __devinit uli_agp_init(struct pci_dev *pdev)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 	if (i == ARRAY_SIZE(uli_sizes)) {</div><div class='del'>-		printk(KERN_INFO PFX "No ULi size found for %d\n", size);</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "no ULi size found for %d\n", size);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -433,13 +435,11 @@ static int nforce3_agp_init(struct pci_dev *pdev)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned size = amd64_fetch_size();</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO PFX "Setting up Nforce3 AGP.\n");</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "setting up Nforce3 AGP\n");</div><div class='ctx'> </div><div class='ctx'> 	dev1 = pci_get_slot(pdev-&gt;bus, PCI_DEVFN(11, 0));</div><div class='ctx'> 	if (dev1 == NULL) {</div><div class='del'>-		printk(KERN_INFO PFX "agpgart: Detected an NVIDIA "</div><div class='del'>-			"nForce3 chipset, but could not find "</div><div class='del'>-			"the secondary device.\n");</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "can't find Nforce3 secondary device\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -448,7 +448,7 @@ static int nforce3_agp_init(struct pci_dev *pdev)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 	if (i == ARRAY_SIZE(nforce3_sizes)) {</div><div class='del'>-		printk(KERN_INFO PFX "No NForce3 size found for %d\n", size);</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "no NForce3 size found for %d\n", size);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -462,7 +462,7 @@ static int nforce3_agp_init(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* if x86-64 aperture base is beyond 4G, exit here */</div><div class='ctx'> 	if ( (apbase &amp; 0x7fff) &gt;&gt; (32 - 25) ) {</div><div class='del'>-		printk(KERN_INFO PFX "aperture base &gt; 4G\n");</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "aperture base &gt; 4G\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -489,6 +489,7 @@ static int __devinit agp_amd64_probe(struct pci_dev *pdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct agp_bridge_data *bridge;</div><div class='ctx'> 	u8 cap_ptr;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	cap_ptr = pci_find_capability(pdev, PCI_CAP_ID_AGP);</div><div class='ctx'> 	if (!cap_ptr)</div><div class='hunk'>@@ -504,7 +505,8 @@ static int __devinit agp_amd64_probe(struct pci_dev *pdev,</div><div class='ctx'> 	    pdev-&gt;device == PCI_DEVICE_ID_AMD_8151_0) {</div><div class='ctx'> 		amd8151_init(pdev, bridge);</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_INFO PFX "Detected AGP bridge %x\n", pdev-&gt;devfn);</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "AGP bridge [%04x/%04x]\n",</div><div class='add'>+			 pdev-&gt;vendor, pdev-&gt;device);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bridge-&gt;driver = &amp;amd_8151_driver;</div><div class='hunk'>@@ -536,7 +538,12 @@ static int __devinit agp_amd64_probe(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, bridge);</div><div class='del'>-	return agp_add_bridge(bridge);</div><div class='add'>+	err = agp_add_bridge(bridge);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	agp_bridges_found++;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __devexit agp_amd64_remove(struct pci_dev *pdev)</div><div class='hunk'>@@ -713,7 +720,11 @@ int __init agp_amd64_init(void)</div><div class='ctx'> </div><div class='ctx'> 	if (agp_off)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (pci_register_driver(&amp;agp_amd64_pci_driver) &lt; 0) {</div><div class='add'>+	err = pci_register_driver(&amp;agp_amd64_pci_driver);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (agp_bridges_found == 0) {</div><div class='ctx'> 		struct pci_dev *dev;</div><div class='ctx'> 		if (!agp_try_unsupported &amp;&amp; !agp_try_unsupported_boot) {</div><div class='ctx'> 			printk(KERN_INFO PFX "No supported AGP bridge found.\n");</div><div class='head'>diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c<br/>index 3a4566c0d84f..6ecbcafb34b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/ati-agp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/agp/ati-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/ati-agp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/ati-agp.c</a></div><div class='hunk'>@@ -486,8 +486,8 @@ static int __devinit agp_ati_probe(struct pci_dev *pdev,</div><div class='ctx'> 			goto found;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_ERR PFX</div><div class='del'>-	     "Unsupported Ati chipset (device id: %04x)\n", pdev-&gt;device);</div><div class='add'>+	dev_err(&amp;pdev-&gt;dev, "unsupported Ati chipset [%04x/%04x])\n",</div><div class='add'>+		pdev-&gt;vendor, pdev-&gt;device);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='hunk'>@@ -500,8 +500,7 @@ found:</div><div class='ctx'> </div><div class='ctx'> 	bridge-&gt;driver = &amp;ati_generic_bridge;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO PFX "Detected Ati %s chipset\n",</div><div class='del'>-			devs[j].chipset_name);</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "Ati %s chipset\n", devs[j].chipset_name);</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in the mode register */</div><div class='ctx'> 	pci_read_config_dword(pdev,</div><div class='head'>diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c<br/>index 1ec87104e68c..3a3cc03d401c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/backend.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/agp/backend.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/backend.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/backend.c</a></div><div class='hunk'>@@ -144,7 +144,8 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)</div><div class='ctx'> 		void *addr = bridge-&gt;driver-&gt;agp_alloc_page(bridge);</div><div class='ctx'> </div><div class='ctx'> 		if (!addr) {</div><div class='del'>-			printk(KERN_ERR PFX "unable to get memory for scratch page.\n");</div><div class='add'>+			dev_err(&amp;bridge-&gt;dev-&gt;dev,</div><div class='add'>+				"can't get memory for scratch page\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -155,13 +156,13 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)</div><div class='ctx'> </div><div class='ctx'> 	size_value = bridge-&gt;driver-&gt;fetch_size();</div><div class='ctx'> 	if (size_value == 0) {</div><div class='del'>-		printk(KERN_ERR PFX "unable to determine aperture size.\n");</div><div class='add'>+		dev_err(&amp;bridge-&gt;dev-&gt;dev, "can't determine aperture size\n");</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (bridge-&gt;driver-&gt;create_gatt_table(bridge)) {</div><div class='del'>-		printk(KERN_ERR PFX</div><div class='del'>-		    "unable to get memory for graphics translation table.\n");</div><div class='add'>+		dev_err(&amp;bridge-&gt;dev-&gt;dev,</div><div class='add'>+			"can't get memory for graphics translation table\n");</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -169,7 +170,8 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)</div><div class='ctx'> </div><div class='ctx'> 	bridge-&gt;key_list = vmalloc(PAGE_SIZE * 4);</div><div class='ctx'> 	if (bridge-&gt;key_list == NULL) {</div><div class='del'>-		printk(KERN_ERR PFX "error allocating memory for key lists.\n");</div><div class='add'>+		dev_err(&amp;bridge-&gt;dev-&gt;dev,</div><div class='add'>+			"can't allocate memory for key lists\n");</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -179,10 +181,12 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)</div><div class='ctx'> 	memset(bridge-&gt;key_list, 0, PAGE_SIZE * 4);</div><div class='ctx'> </div><div class='ctx'> 	if (bridge-&gt;driver-&gt;configure()) {</div><div class='del'>-		printk(KERN_ERR PFX "error configuring host chipset.\n");</div><div class='add'>+		dev_err(&amp;bridge-&gt;dev-&gt;dev, "error configuring host chipset\n");</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='add'>+	INIT_LIST_HEAD(&amp;bridge-&gt;mapped_list);</div><div class='add'>+	spin_lock_init(&amp;bridge-&gt;mapped_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -269,25 +273,27 @@ int agp_add_bridge(struct agp_bridge_data *bridge)</div><div class='ctx'> </div><div class='ctx'> 	/* Grab reference on the chipset driver. */</div><div class='ctx'> 	if (!try_module_get(bridge-&gt;driver-&gt;owner)) {</div><div class='del'>-		printk (KERN_INFO PFX "Couldn't lock chipset driver.\n");</div><div class='add'>+		dev_info(&amp;bridge-&gt;dev-&gt;dev, "can't lock chipset driver\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error = agp_backend_initialize(bridge);</div><div class='ctx'> 	if (error) {</div><div class='del'>-		printk (KERN_INFO PFX "agp_backend_initialize() failed.\n");</div><div class='add'>+		dev_info(&amp;bridge-&gt;dev-&gt;dev,</div><div class='add'>+			 "agp_backend_initialize() failed\n");</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;agp_bridges)) {</div><div class='ctx'> 		error = agp_frontend_initialize();</div><div class='ctx'> 		if (error) {</div><div class='del'>-			printk (KERN_INFO PFX "agp_frontend_initialize() failed.\n");</div><div class='add'>+			dev_info(&amp;bridge-&gt;dev-&gt;dev,</div><div class='add'>+				 "agp_frontend_initialize() failed\n");</div><div class='ctx'> 			goto frontend_err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		printk(KERN_INFO PFX "AGP aperture is %dM @ 0x%lx\n",</div><div class='del'>-			bridge-&gt;driver-&gt;fetch_size(), bridge-&gt;gart_bus_addr);</div><div class='add'>+		dev_info(&amp;bridge-&gt;dev-&gt;dev, "AGP aperture is %dM @ 0x%lx\n",</div><div class='add'>+			 bridge-&gt;driver-&gt;fetch_size(), bridge-&gt;gart_bus_addr);</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c<br/>index eaa1a355bb32..118dbde25dc7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/generic.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/agp/generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/generic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/generic.c</a></div><div class='hunk'>@@ -429,6 +429,10 @@ int agp_bind_memory(struct agp_memory *curr, off_t pg_start)</div><div class='ctx'> </div><div class='ctx'> 	curr-&gt;is_bound = true;</div><div class='ctx'> 	curr-&gt;pg_start = pg_start;</div><div class='add'>+	spin_lock(&amp;agp_bridge-&gt;mapped_lock);</div><div class='add'>+	list_add(&amp;curr-&gt;mapped_list, &amp;agp_bridge-&gt;mapped_list);</div><div class='add'>+	spin_unlock(&amp;agp_bridge-&gt;mapped_lock);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(agp_bind_memory);</div><div class='hunk'>@@ -461,10 +465,34 @@ int agp_unbind_memory(struct agp_memory *curr)</div><div class='ctx'> </div><div class='ctx'> 	curr-&gt;is_bound = false;</div><div class='ctx'> 	curr-&gt;pg_start = 0;</div><div class='add'>+	spin_lock(&amp;curr-&gt;bridge-&gt;mapped_lock);</div><div class='add'>+	list_del(&amp;curr-&gt;mapped_list);</div><div class='add'>+	spin_unlock(&amp;curr-&gt;bridge-&gt;mapped_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(agp_unbind_memory);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	agp_rebind_emmory  -  Rewrite the entire GATT, useful on resume</div><div class='add'>+ */</div><div class='add'>+int agp_rebind_memory(void)</div><div class='add'>+{</div><div class='add'>+	struct agp_memory *curr;</div><div class='add'>+	int ret_val = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;agp_bridge-&gt;mapped_lock);</div><div class='add'>+	list_for_each_entry(curr, &amp;agp_bridge-&gt;mapped_list, mapped_list) {</div><div class='add'>+		ret_val = curr-&gt;bridge-&gt;driver-&gt;insert_memory(curr,</div><div class='add'>+							      curr-&gt;pg_start,</div><div class='add'>+							      curr-&gt;type);</div><div class='add'>+		if (ret_val != 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;agp_bridge-&gt;mapped_lock);</div><div class='add'>+	return ret_val;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(agp_rebind_memory);</div><div class='add'>+</div><div class='ctx'> /* End - Routines for handling swapping of agp_memory into the GATT */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -771,8 +799,8 @@ void agp_device_command(u32 bridge_agpstat, bool agp_v3)</div><div class='ctx'> 		if (!agp)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		printk(KERN_INFO PFX "Putting AGP V%d device at %s into %dx mode\n",</div><div class='del'>-				agp_v3 ? 3 : 2, pci_name(device), mode);</div><div class='add'>+		dev_info(&amp;device-&gt;dev, "putting AGP V%d device into %dx mode\n",</div><div class='add'>+			 agp_v3 ? 3 : 2, mode);</div><div class='ctx'> 		pci_write_config_dword(device, agp + PCI_AGP_COMMAND, bridge_agpstat);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -800,10 +828,8 @@ void agp_generic_enable(struct agp_bridge_data *bridge, u32 requested_mode)</div><div class='ctx'> </div><div class='ctx'> 	get_agp_version(agp_bridge);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO PFX "Found an AGP %d.%d compliant device at %s.\n",</div><div class='del'>-				agp_bridge-&gt;major_version,</div><div class='del'>-				agp_bridge-&gt;minor_version,</div><div class='del'>-				pci_name(agp_bridge-&gt;dev));</div><div class='add'>+	dev_info(&amp;agp_bridge-&gt;dev-&gt;dev, "AGP %d.%d bridge\n",</div><div class='add'>+		 agp_bridge-&gt;major_version, agp_bridge-&gt;minor_version);</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_dword(agp_bridge-&gt;dev,</div><div class='ctx'> 		      agp_bridge-&gt;capndx + PCI_AGP_STATUS, &amp;bridge_agpstat);</div><div class='hunk'>@@ -832,8 +858,7 @@ void agp_generic_enable(struct agp_bridge_data *bridge, u32 requested_mode)</div><div class='ctx'> 		    pci_write_config_dword(bridge-&gt;dev,</div><div class='ctx'> 					bridge-&gt;capndx+AGPCTRL, temp);</div><div class='ctx'> </div><div class='del'>-		    printk(KERN_INFO PFX "Device is in legacy mode,"</div><div class='del'>-				" falling back to 2.x\n");</div><div class='add'>+		    dev_info(&amp;bridge-&gt;dev-&gt;dev, "bridge is in legacy mode, falling back to 2.x\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c<br/>index df702642ab8f..016fdf0623a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/intel-agp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/agp/intel-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/intel-agp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/intel-agp.c</a></div><div class='hunk'>@@ -32,8 +32,8 @@</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_Q35_IG          0x29B2</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_Q33_HB          0x29D0</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_Q33_IG          0x29D2</div><div class='del'>-#define PCI_DEVICE_ID_INTEL_IGD_HB          0x2A40</div><div class='del'>-#define PCI_DEVICE_ID_INTEL_IGD_IG          0x2A42</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_GM45_HB         0x2A40</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_GM45_IG         0x2A42</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_IGD_E_HB        0x2E00</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_IGD_E_IG        0x2E02</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_Q45_HB          0x2E10</div><div class='hunk'>@@ -55,7 +55,7 @@</div><div class='ctx'> 		 agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_82965G_HB || \</div><div class='ctx'> 		 agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_82965GM_HB || \</div><div class='ctx'> 		 agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_82965GME_HB || \</div><div class='del'>-		 agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_IGD_HB)</div><div class='add'>+		 agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_GM45_HB)</div><div class='ctx'> </div><div class='ctx'> #define IS_G33 (agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_G33_HB || \</div><div class='ctx'> 		agp_bridge-&gt;dev-&gt;device == PCI_DEVICE_ID_INTEL_Q35_HB || \</div><div class='hunk'>@@ -161,7 +161,7 @@ static int intel_i810_fetch_size(void)</div><div class='ctx'> 	values = A_SIZE_FIX(agp_bridge-&gt;driver-&gt;aperture_sizes);</div><div class='ctx'> </div><div class='ctx'> 	if ((smram_miscc &amp; I810_GMS) == I810_GMS_DISABLE) {</div><div class='del'>-		printk(KERN_WARNING PFX "i810 is disabled\n");</div><div class='add'>+		dev_warn(&amp;agp_bridge-&gt;dev-&gt;dev, "i810 is disabled\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((smram_miscc &amp; I810_GFX_MEM_WIN_SIZE) == I810_GFX_MEM_WIN_32M) {</div><div class='hunk'>@@ -193,7 +193,8 @@ static int intel_i810_configure(void)</div><div class='ctx'> </div><div class='ctx'> 		intel_private.registers = ioremap(temp, 128 * 4096);</div><div class='ctx'> 		if (!intel_private.registers) {</div><div class='del'>-			printk(KERN_ERR PFX "Unable to remap memory.\n");</div><div class='add'>+			dev_err(&amp;intel_private.pcidev-&gt;dev,</div><div class='add'>+				"can't remap memory\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -201,7 +202,8 @@ static int intel_i810_configure(void)</div><div class='ctx'> 	if ((readl(intel_private.registers+I810_DRAM_CTL)</div><div class='ctx'> 		&amp; I810_DRAM_ROW_0) == I810_DRAM_ROW_0_SDRAM) {</div><div class='ctx'> 		/* This will need to be dynamically assigned */</div><div class='del'>-		printk(KERN_INFO PFX "detected 4MB dedicated video ram.\n");</div><div class='add'>+		dev_info(&amp;intel_private.pcidev-&gt;dev,</div><div class='add'>+			 "detected 4MB dedicated video ram\n");</div><div class='ctx'> 		intel_private.num_dcache_entries = 1024;</div><div class='ctx'> 	}</div><div class='ctx'> 	pci_read_config_dword(intel_private.pcidev, I810_GMADDR, &amp;temp);</div><div class='hunk'>@@ -500,8 +502,8 @@ static void intel_i830_init_gtt_entries(void)</div><div class='ctx'> 			size = 1024 + 512;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			printk(KERN_INFO PFX "Unknown page table size, "</div><div class='del'>-			       "assuming 512KB\n");</div><div class='add'>+			dev_info(&amp;intel_private.pcidev-&gt;dev,</div><div class='add'>+				 "unknown page table size, assuming 512KB\n");</div><div class='ctx'> 			size = 512;</div><div class='ctx'> 		}</div><div class='ctx'> 		size += 4; /* add in BIOS popup space */</div><div class='hunk'>@@ -515,8 +517,8 @@ static void intel_i830_init_gtt_entries(void)</div><div class='ctx'> 			size = 2048;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			printk(KERN_INFO PFX "Unknown page table size 0x%x, "</div><div class='del'>-				"assuming 512KB\n",</div><div class='add'>+			dev_info(&amp;agp_bridge-&gt;dev-&gt;dev,</div><div class='add'>+				 "unknown page table size 0x%x, assuming 512KB\n",</div><div class='ctx'> 				(gmch_ctrl &amp; G33_PGETBL_SIZE_MASK));</div><div class='ctx'> 			size = 512;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -627,11 +629,11 @@ static void intel_i830_init_gtt_entries(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (gtt_entries &gt; 0)</div><div class='del'>-		printk(KERN_INFO PFX "Detected %dK %s memory.\n",</div><div class='add'>+		dev_info(&amp;agp_bridge-&gt;dev-&gt;dev, "detected %dK %s memory\n",</div><div class='ctx'> 		       gtt_entries / KB(1), local ? "local" : "stolen");</div><div class='ctx'> 	else</div><div class='del'>-		printk(KERN_INFO PFX</div><div class='del'>-		       "No pre-allocated video memory detected.\n");</div><div class='add'>+		dev_info(&amp;agp_bridge-&gt;dev-&gt;dev,</div><div class='add'>+		       "no pre-allocated video memory detected\n");</div><div class='ctx'> 	gtt_entries /= KB(4);</div><div class='ctx'> </div><div class='ctx'> 	intel_private.gtt_entries = gtt_entries;</div><div class='hunk'>@@ -801,10 +803,12 @@ static int intel_i830_insert_entries(struct agp_memory *mem, off_t pg_start,</div><div class='ctx'> 	num_entries = A_SIZE_FIX(temp)-&gt;num_entries;</div><div class='ctx'> </div><div class='ctx'> 	if (pg_start &lt; intel_private.gtt_entries) {</div><div class='del'>-		printk(KERN_DEBUG PFX "pg_start == 0x%.8lx,intel_private.gtt_entries == 0x%.8x\n",</div><div class='del'>-				pg_start, intel_private.gtt_entries);</div><div class='add'>+		dev_printk(KERN_DEBUG, &amp;intel_private.pcidev-&gt;dev,</div><div class='add'>+			   "pg_start == 0x%.8lx, intel_private.gtt_entries == 0x%.8x\n",</div><div class='add'>+			   pg_start, intel_private.gtt_entries);</div><div class='ctx'> </div><div class='del'>-		printk(KERN_INFO PFX "Trying to insert into local/stolen memory\n");</div><div class='add'>+		dev_info(&amp;intel_private.pcidev-&gt;dev,</div><div class='add'>+			 "trying to insert into local/stolen memory\n");</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -851,7 +855,8 @@ static int intel_i830_remove_entries(struct agp_memory *mem, off_t pg_start,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (pg_start &lt; intel_private.gtt_entries) {</div><div class='del'>-		printk(KERN_INFO PFX "Trying to disable local/stolen memory\n");</div><div class='add'>+		dev_info(&amp;intel_private.pcidev-&gt;dev,</div><div class='add'>+			 "trying to disable local/stolen memory\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -957,7 +962,7 @@ static void intel_i9xx_setup_flush(void)</div><div class='ctx'> 	if (intel_private.ifp_resource.start) {</div><div class='ctx'> 		intel_private.i9xx_flush_page = ioremap_nocache(intel_private.ifp_resource.start, PAGE_SIZE);</div><div class='ctx'> 		if (!intel_private.i9xx_flush_page)</div><div class='del'>-			printk(KERN_INFO "unable to ioremap flush  page - no chipset flushing");</div><div class='add'>+			dev_info(&amp;intel_private.pcidev-&gt;dev, "can't ioremap flush page - no chipset flushing");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1028,10 +1033,12 @@ static int intel_i915_insert_entries(struct agp_memory *mem, off_t pg_start,</div><div class='ctx'> 	num_entries = A_SIZE_FIX(temp)-&gt;num_entries;</div><div class='ctx'> </div><div class='ctx'> 	if (pg_start &lt; intel_private.gtt_entries) {</div><div class='del'>-		printk(KERN_DEBUG PFX "pg_start == 0x%.8lx,intel_private.gtt_entries == 0x%.8x\n",</div><div class='del'>-				pg_start, intel_private.gtt_entries);</div><div class='add'>+		dev_printk(KERN_DEBUG, &amp;intel_private.pcidev-&gt;dev,</div><div class='add'>+			   "pg_start == 0x%.8lx, intel_private.gtt_entries == 0x%.8x\n",</div><div class='add'>+			   pg_start, intel_private.gtt_entries);</div><div class='ctx'> </div><div class='del'>-		printk(KERN_INFO PFX "Trying to insert into local/stolen memory\n");</div><div class='add'>+		dev_info(&amp;intel_private.pcidev-&gt;dev,</div><div class='add'>+			 "trying to insert into local/stolen memory\n");</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1078,7 +1085,8 @@ static int intel_i915_remove_entries(struct agp_memory *mem, off_t pg_start,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (pg_start &lt; intel_private.gtt_entries) {</div><div class='del'>-		printk(KERN_INFO PFX "Trying to disable local/stolen memory\n");</div><div class='add'>+		dev_info(&amp;intel_private.pcidev-&gt;dev,</div><div class='add'>+			 "trying to disable local/stolen memory\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1182,7 +1190,7 @@ static unsigned long intel_i965_mask_memory(struct agp_bridge_data *bridge,</div><div class='ctx'> static void intel_i965_get_gtt_range(int *gtt_offset, int *gtt_size)</div><div class='ctx'> {</div><div class='ctx'> 	switch (agp_bridge-&gt;dev-&gt;device) {</div><div class='del'>-	case PCI_DEVICE_ID_INTEL_IGD_HB:</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_GM45_HB:</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_IGD_E_HB:</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_Q45_HB:</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_G45_HB:</div><div class='hunk'>@@ -1379,7 +1387,7 @@ static int intel_815_configure(void)</div><div class='ctx'> 	/* the Intel 815 chipset spec. says that bits 29-31 in the</div><div class='ctx'> 	* ATTBASE register are reserved -&gt; try not to write them */</div><div class='ctx'> 	if (agp_bridge-&gt;gatt_bus_addr &amp; INTEL_815_ATTBASE_MASK) {</div><div class='del'>-		printk(KERN_EMERG PFX "gatt bus addr too high");</div><div class='add'>+		dev_emerg(&amp;agp_bridge-&gt;dev-&gt;dev, "gatt bus addr too high");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2117,8 +2125,8 @@ static const struct intel_driver_description {</div><div class='ctx'> 		NULL, &amp;intel_g33_driver },</div><div class='ctx'> 	{ PCI_DEVICE_ID_INTEL_Q33_HB, PCI_DEVICE_ID_INTEL_Q33_IG, 0, "Q33",</div><div class='ctx'> 		NULL, &amp;intel_g33_driver },</div><div class='del'>-	{ PCI_DEVICE_ID_INTEL_IGD_HB, PCI_DEVICE_ID_INTEL_IGD_IG, 0,</div><div class='del'>-	    "Intel Integrated Graphics Device", NULL, &amp;intel_i965_driver },</div><div class='add'>+	{ PCI_DEVICE_ID_INTEL_GM45_HB, PCI_DEVICE_ID_INTEL_GM45_IG, 0,</div><div class='add'>+	    "Mobile Intel? GM45 Express", NULL, &amp;intel_i965_driver },</div><div class='ctx'> 	{ PCI_DEVICE_ID_INTEL_IGD_E_HB, PCI_DEVICE_ID_INTEL_IGD_E_IG, 0,</div><div class='ctx'> 	    "Intel Integrated Graphics Device", NULL, &amp;intel_i965_driver },</div><div class='ctx'> 	{ PCI_DEVICE_ID_INTEL_Q45_HB, PCI_DEVICE_ID_INTEL_Q45_IG, 0,</div><div class='hunk'>@@ -2163,8 +2171,8 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	if (intel_agp_chipsets[i].name == NULL) {</div><div class='ctx'> 		if (cap_ptr)</div><div class='del'>-			printk(KERN_WARNING PFX "Unsupported Intel chipset"</div><div class='del'>-			       "(device id: %04x)\n", pdev-&gt;device);</div><div class='add'>+			dev_warn(&amp;pdev-&gt;dev, "unsupported Intel chipset [%04x/%04x]\n",</div><div class='add'>+				 pdev-&gt;vendor, pdev-&gt;device);</div><div class='ctx'> 		agp_put_bridge(bridge);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2172,9 +2180,8 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (bridge-&gt;driver == NULL) {</div><div class='ctx'> 		/* bridge has no AGP and no IGD detected */</div><div class='ctx'> 		if (cap_ptr)</div><div class='del'>-			printk(KERN_WARNING PFX "Failed to find bridge device "</div><div class='del'>-				"(chip_id: %04x)\n",</div><div class='del'>-				intel_agp_chipsets[i].gmch_chip_id);</div><div class='add'>+			dev_warn(&amp;pdev-&gt;dev, "can't find bridge device (chip_id: %04x)\n",</div><div class='add'>+				 intel_agp_chipsets[i].gmch_chip_id);</div><div class='ctx'> 		agp_put_bridge(bridge);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2183,8 +2190,7 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,</div><div class='ctx'> 	bridge-&gt;capndx = cap_ptr;</div><div class='ctx'> 	bridge-&gt;dev_private_data = &amp;intel_private;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO PFX "Detected an Intel %s Chipset.\n",</div><div class='del'>-		intel_agp_chipsets[i].name);</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "Intel %s Chipset\n", intel_agp_chipsets[i].name);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	* The following fixes the case where the BIOS has "forgotten" to</div><div class='hunk'>@@ -2194,7 +2200,7 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,</div><div class='ctx'> 	r = &amp;pdev-&gt;resource[0];</div><div class='ctx'> 	if (!r-&gt;start &amp;&amp; r-&gt;end) {</div><div class='ctx'> 		if (pci_assign_resource(pdev, 0)) {</div><div class='del'>-			printk(KERN_ERR PFX "could not assign resource 0\n");</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "can't assign resource 0\n");</div><div class='ctx'> 			agp_put_bridge(bridge);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2206,7 +2212,7 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,</div><div class='ctx'> 	* 20030610 - hamish@zot.org</div><div class='ctx'> 	*/</div><div class='ctx'> 	if (pci_enable_device(pdev)) {</div><div class='del'>-		printk(KERN_ERR PFX "Unable to Enable PCI device\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "can't enable PCI device\n");</div><div class='ctx'> 		agp_put_bridge(bridge);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2238,6 +2244,7 @@ static void __devexit agp_intel_remove(struct pci_dev *pdev)</div><div class='ctx'> static int agp_intel_resume(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct agp_bridge_data *bridge = pci_get_drvdata(pdev);</div><div class='add'>+	int ret_val;</div><div class='ctx'> </div><div class='ctx'> 	pci_restore_state(pdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2265,6 +2272,10 @@ static int agp_intel_resume(struct pci_dev *pdev)</div><div class='ctx'> 	else if (bridge-&gt;driver == &amp;intel_i965_driver)</div><div class='ctx'> 		intel_i915_configure();</div><div class='ctx'> </div><div class='add'>+	ret_val = agp_rebind_memory();</div><div class='add'>+	if (ret_val != 0)</div><div class='add'>+		return ret_val;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2315,7 +2326,7 @@ static struct pci_device_id agp_intel_pci_table[] = {</div><div class='ctx'> 	ID(PCI_DEVICE_ID_INTEL_G33_HB),</div><div class='ctx'> 	ID(PCI_DEVICE_ID_INTEL_Q35_HB),</div><div class='ctx'> 	ID(PCI_DEVICE_ID_INTEL_Q33_HB),</div><div class='del'>-	ID(PCI_DEVICE_ID_INTEL_IGD_HB),</div><div class='add'>+	ID(PCI_DEVICE_ID_INTEL_GM45_HB),</div><div class='ctx'> 	ID(PCI_DEVICE_ID_INTEL_IGD_E_HB),</div><div class='ctx'> 	ID(PCI_DEVICE_ID_INTEL_Q45_HB),</div><div class='ctx'> 	ID(PCI_DEVICE_ID_INTEL_G45_HB),</div><div class='head'>diff --git a/drivers/char/agp/isoch.c b/drivers/char/agp/isoch.c<br/>index 3f9ccde62377..c73385cc4b8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/isoch.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/agp/isoch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/isoch.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/isoch.c</a></div><div class='hunk'>@@ -153,7 +153,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge,</div><div class='ctx'> </div><div class='ctx'> 	/* Check if this configuration has any chance of working */</div><div class='ctx'> 	if (tot_bw &gt; target.maxbw) {</div><div class='del'>-		printk(KERN_ERR PFX "isochronous bandwidth required "</div><div class='add'>+		dev_err(&amp;td-&gt;dev, "isochronous bandwidth required "</div><div class='ctx'> 			"by AGP 3.0 devices exceeds that which is supported by "</div><div class='ctx'> 			"the AGP 3.0 bridge!\n");</div><div class='ctx'> 		ret = -ENODEV;</div><div class='hunk'>@@ -188,7 +188,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge,</div><div class='ctx'> 	/* Exit if the minimal ISOCH_N allocation among the masters is more</div><div class='ctx'> 	 * than the target can handle. */</div><div class='ctx'> 	if (tot_n &gt; target.n) {</div><div class='del'>-		printk(KERN_ERR PFX "number of isochronous "</div><div class='add'>+		dev_err(&amp;td-&gt;dev, "number of isochronous "</div><div class='ctx'> 			"transactions per period required by AGP 3.0 devices "</div><div class='ctx'> 			"exceeds that which is supported by the AGP 3.0 "</div><div class='ctx'> 			"bridge!\n");</div><div class='hunk'>@@ -229,7 +229,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge,</div><div class='ctx'> 	/* Exit if the minimal RQ needs of the masters exceeds what the target</div><div class='ctx'> 	 * can provide. */</div><div class='ctx'> 	if (tot_rq &gt; rq_isoch) {</div><div class='del'>-		printk(KERN_ERR PFX "number of request queue slots "</div><div class='add'>+		dev_err(&amp;td-&gt;dev, "number of request queue slots "</div><div class='ctx'> 			"required by the isochronous bandwidth requested by "</div><div class='ctx'> 			"AGP 3.0 devices exceeds the number provided by the "</div><div class='ctx'> 			"AGP 3.0 bridge!\n");</div><div class='hunk'>@@ -359,8 +359,9 @@ int agp_3_5_enable(struct agp_bridge_data *bridge)</div><div class='ctx'> 			case 0x0001:    /* Unclassified device */</div><div class='ctx'> 				/* Don't know what this is, but log it for investigation. */</div><div class='ctx'> 				if (mcapndx != 0) {</div><div class='del'>-					printk (KERN_INFO PFX "Wacky, found unclassified AGP device. %x:%x\n",</div><div class='del'>-						dev-&gt;vendor, dev-&gt;device);</div><div class='add'>+					dev_info(&amp;td-&gt;dev, "wacky, found unclassified AGP device %s [%04x/%04x]\n",</div><div class='add'>+						 pci_name(dev),</div><div class='add'>+						 dev-&gt;vendor, dev-&gt;device);</div><div class='ctx'> 				}</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='hunk'>@@ -407,17 +408,18 @@ int agp_3_5_enable(struct agp_bridge_data *bridge)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (mcapndx == 0) {</div><div class='del'>-			printk(KERN_ERR PFX "woah!  Non-AGP device "</div><div class='del'>-				"found on the secondary bus of an AGP 3.5 bridge!\n");</div><div class='add'>+			dev_err(&amp;td-&gt;dev, "woah!  Non-AGP device %s on "</div><div class='add'>+				"secondary bus of AGP 3.5 bridge!\n",</div><div class='add'>+				pci_name(dev));</div><div class='ctx'> 			ret = -ENODEV;</div><div class='ctx'> 			goto free_and_exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		mmajor = (ncapid &gt;&gt; AGP_MAJOR_VERSION_SHIFT) &amp; 0xf;</div><div class='ctx'> 		if (mmajor &lt; 3) {</div><div class='del'>-			printk(KERN_ERR PFX "woah!  AGP 2.0 device "</div><div class='del'>-				"found on the secondary bus of an AGP 3.5 "</div><div class='del'>-				"bridge operating with AGP 3.0 electricals!\n");</div><div class='add'>+			dev_err(&amp;td-&gt;dev, "woah!  AGP 2.0 device %s on "</div><div class='add'>+				"secondary bus of AGP 3.5 bridge operating "</div><div class='add'>+				"with AGP 3.0 electricals!\n", pci_name(dev));</div><div class='ctx'> 			ret = -ENODEV;</div><div class='ctx'> 			goto free_and_exit;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -427,10 +429,10 @@ int agp_3_5_enable(struct agp_bridge_data *bridge)</div><div class='ctx'> 		pci_read_config_dword(dev, cur-&gt;capndx+AGPSTAT, &amp;mstatus);</div><div class='ctx'> </div><div class='ctx'> 		if (((mstatus &gt;&gt; 3) &amp; 0x1) == 0) {</div><div class='del'>-			printk(KERN_ERR PFX "woah!  AGP 3.x device "</div><div class='del'>-				"not operating in AGP 3.x mode found on the "</div><div class='del'>-				"secondary bus of an AGP 3.5 bridge operating "</div><div class='del'>-				"with AGP 3.0 electricals!\n");</div><div class='add'>+			dev_err(&amp;td-&gt;dev, "woah!  AGP 3.x device %s not "</div><div class='add'>+				"operating in AGP 3.x mode on secondary bus "</div><div class='add'>+				"of AGP 3.5 bridge operating with AGP 3.0 "</div><div class='add'>+				"electricals!\n", pci_name(dev));</div><div class='ctx'> 			ret = -ENODEV;</div><div class='ctx'> 			goto free_and_exit;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -444,9 +446,9 @@ int agp_3_5_enable(struct agp_bridge_data *bridge)</div><div class='ctx'> 	if (isoch) {</div><div class='ctx'> 		ret = agp_3_5_isochronous_node_enable(bridge, dev_list, ndevs);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			printk(KERN_INFO PFX "Something bad happened setting "</div><div class='del'>-			       "up isochronous xfers.  Falling back to "</div><div class='del'>-			       "non-isochronous xfer mode.\n");</div><div class='add'>+			dev_info(&amp;td-&gt;dev, "something bad happened setting "</div><div class='add'>+				 "up isochronous xfers; falling back to "</div><div class='add'>+				 "non-isochronous xfer mode\n");</div><div class='ctx'> 		} else {</div><div class='ctx'> 			goto free_and_exit;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -466,4 +468,3 @@ free_and_exit:</div><div class='ctx'> get_out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c<br/>index b6791846809f..2587ef96a960 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/sis-agp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/agp/sis-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/sis-agp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/sis-agp.c</a></div><div class='hunk'>@@ -79,10 +79,8 @@ static void sis_delayed_enable(struct agp_bridge_data *bridge, u32 mode)</div><div class='ctx'> 	u32 command;</div><div class='ctx'> 	int rate;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO PFX "Found an AGP %d.%d compliant device at %s.\n",</div><div class='del'>-		agp_bridge-&gt;major_version,</div><div class='del'>-		agp_bridge-&gt;minor_version,</div><div class='del'>-		pci_name(agp_bridge-&gt;dev));</div><div class='add'>+	dev_info(&amp;agp_bridge-&gt;dev-&gt;dev, "AGP %d.%d bridge\n",</div><div class='add'>+		 agp_bridge-&gt;major_version, agp_bridge-&gt;minor_version);</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_dword(agp_bridge-&gt;dev, agp_bridge-&gt;capndx + PCI_AGP_STATUS, &amp;command);</div><div class='ctx'> 	command = agp_collect_device_status(bridge, mode, command);</div><div class='hunk'>@@ -94,8 +92,8 @@ static void sis_delayed_enable(struct agp_bridge_data *bridge, u32 mode)</div><div class='ctx'> 		if (!agp)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		printk(KERN_INFO PFX "Putting AGP V3 device at %s into %dx mode\n",</div><div class='del'>-			pci_name(device), rate);</div><div class='add'>+		dev_info(&amp;agp_bridge-&gt;dev-&gt;dev, "putting AGP V3 device at %s into %dx mode\n",</div><div class='add'>+			 pci_name(device), rate);</div><div class='ctx'> </div><div class='ctx'> 		pci_write_config_dword(device, agp + PCI_AGP_COMMAND, command);</div><div class='ctx'> </div><div class='hunk'>@@ -105,7 +103,7 @@ static void sis_delayed_enable(struct agp_bridge_data *bridge, u32 mode)</div><div class='ctx'> 		 * cannot be configured</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (device-&gt;device == bridge-&gt;dev-&gt;device) {</div><div class='del'>-			printk(KERN_INFO PFX "SiS delay workaround: giving bridge time to recover.\n");</div><div class='add'>+			dev_info(&amp;agp_bridge-&gt;dev-&gt;dev, "SiS delay workaround: giving bridge time to recover\n");</div><div class='ctx'> 			msleep(10);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -190,7 +188,8 @@ static int __devinit agp_sis_probe(struct pci_dev *pdev,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO PFX "Detected SiS chipset - id:%i\n", pdev-&gt;device);</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "SiS chipset [%04x/%04x]\n",</div><div class='add'>+		 pdev-&gt;vendor, pdev-&gt;device);</div><div class='ctx'> 	bridge = agp_alloc_bridge();</div><div class='ctx'> 	if (!bridge)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -242,7 +241,7 @@ static struct pci_device_id agp_sis_pci_table[] = {</div><div class='ctx'> 		.class		= (PCI_CLASS_BRIDGE_HOST &lt;&lt; 8),</div><div class='ctx'> 		.class_mask	= ~0,</div><div class='ctx'> 		.vendor		= PCI_VENDOR_ID_SI,</div><div class='del'>-		.device		= PCI_DEVICE_ID_SI_5591_AGP,</div><div class='add'>+		.device		= PCI_DEVICE_ID_SI_5591,</div><div class='ctx'> 		.subvendor	= PCI_ANY_ID,</div><div class='ctx'> 		.subdevice	= PCI_ANY_ID,</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c<br/>index 0e054c134490..2fb27fe4c10c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/sworks-agp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/agp/sworks-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/sworks-agp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/sworks-agp.c</a></div><div class='hunk'>@@ -241,7 +241,8 @@ static void serverworks_tlbflush(struct agp_memory *temp)</div><div class='ctx'> 	while (readb(serverworks_private.registers+SVWRKS_POSTFLUSH) == 1) {</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 		if (time_after(jiffies, timeout)) {</div><div class='del'>-			printk(KERN_ERR PFX "TLB post flush took more than 3 seconds\n");</div><div class='add'>+			dev_err(&amp;serverworks_private.svrwrks_dev-&gt;dev,</div><div class='add'>+				"TLB post flush took more than 3 seconds\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -251,7 +252,8 @@ static void serverworks_tlbflush(struct agp_memory *temp)</div><div class='ctx'> 	while (readl(serverworks_private.registers+SVWRKS_DIRFLUSH) == 1) {</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 		if (time_after(jiffies, timeout)) {</div><div class='del'>-			printk(KERN_ERR PFX "TLB Dir flush took more than 3 seconds\n");</div><div class='add'>+			dev_err(&amp;serverworks_private.svrwrks_dev-&gt;dev,</div><div class='add'>+				"TLB Dir flush took more than 3 seconds\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -271,7 +273,7 @@ static int serverworks_configure(void)</div><div class='ctx'> 	temp = (temp &amp; PCI_BASE_ADDRESS_MEM_MASK);</div><div class='ctx'> 	serverworks_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);</div><div class='ctx'> 	if (!serverworks_private.registers) {</div><div class='del'>-		printk (KERN_ERR PFX "Unable to ioremap() memory.\n");</div><div class='add'>+		dev_err(&amp;agp_bridge-&gt;dev-&gt;dev, "can't ioremap(%#x)\n", temp);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -451,7 +453,7 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	switch (pdev-&gt;device) {</div><div class='ctx'> 	case 0x0006:</div><div class='del'>-		printk (KERN_ERR PFX "ServerWorks CNB20HE is unsupported due to lack of documentation.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "ServerWorks CNB20HE is unsupported due to lack of documentation\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	case PCI_DEVICE_ID_SERVERWORKS_HE:</div><div class='hunk'>@@ -461,8 +463,8 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		if (cap_ptr)</div><div class='del'>-			printk(KERN_ERR PFX "Unsupported Serverworks chipset "</div><div class='del'>-					"(device id: %04x)\n", pdev-&gt;device);</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "unsupported Serverworks chipset "</div><div class='add'>+				"[%04x/%04x]\n", pdev-&gt;vendor, pdev-&gt;device);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -470,8 +472,7 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev,</div><div class='ctx'> 	bridge_dev = pci_get_bus_and_slot((unsigned int)pdev-&gt;bus-&gt;number,</div><div class='ctx'> 			PCI_DEVFN(0, 1));</div><div class='ctx'> 	if (!bridge_dev) {</div><div class='del'>-		printk(KERN_INFO PFX "Detected a Serverworks chipset "</div><div class='del'>-		       "but could not find the secondary device.\n");</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "can't find secondary device\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -482,8 +483,8 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (temp &amp; PCI_BASE_ADDRESS_MEM_TYPE_64) {</div><div class='ctx'> 		pci_read_config_dword(pdev, SVWRKS_APSIZE + 4, &amp;temp2);</div><div class='ctx'> 		if (temp2 != 0) {</div><div class='del'>-			printk(KERN_INFO PFX "Detected 64 bit aperture address, "</div><div class='del'>-			       "but top bits are not zero.  Disabling agp\n");</div><div class='add'>+			dev_info(&amp;pdev-&gt;dev, "64 bit aperture address, "</div><div class='add'>+				 "but top bits are not zero; disabling AGP\n");</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 		serverworks_private.mm_addr_ofs = 0x18;</div><div class='hunk'>@@ -495,8 +496,8 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev,</div><div class='ctx'> 		pci_read_config_dword(pdev,</div><div class='ctx'> 				serverworks_private.mm_addr_ofs + 4, &amp;temp2);</div><div class='ctx'> 		if (temp2 != 0) {</div><div class='del'>-			printk(KERN_INFO PFX "Detected 64 bit MMIO address, "</div><div class='del'>-			       "but top bits are not zero.  Disabling agp\n");</div><div class='add'>+			dev_info(&amp;pdev-&gt;dev, "64 bit MMIO address, but top "</div><div class='add'>+				 "bits are not zero; disabling AGP\n");</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c<br/>index d2fa3cfca02a..eef72709ec53 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/uninorth-agp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/agp/uninorth-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/uninorth-agp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/agp/uninorth-agp.c</a></div><div class='hunk'>@@ -46,8 +46,8 @@ static int uninorth_fetch_size(void)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 		if (i == agp_bridge-&gt;driver-&gt;num_aperture_sizes) {</div><div class='del'>-			printk(KERN_ERR PFX "Invalid aperture size, using"</div><div class='del'>-			       " default\n");</div><div class='add'>+			dev_err(&amp;agp_bridge-&gt;dev-&gt;dev, "invalid aperture size, "</div><div class='add'>+				"using default\n");</div><div class='ctx'> 			size = 0;</div><div class='ctx'> 			aperture = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -108,8 +108,8 @@ static int uninorth_configure(void)</div><div class='ctx'> </div><div class='ctx'> 	current_size = A_SIZE_32(agp_bridge-&gt;current_size);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO PFX "configuring for size idx: %d\n",</div><div class='del'>-	       current_size-&gt;size_value);</div><div class='add'>+	dev_info(&amp;agp_bridge-&gt;dev-&gt;dev, "configuring for size idx: %d\n",</div><div class='add'>+		 current_size-&gt;size_value);</div><div class='ctx'> </div><div class='ctx'> 	/* aperture size and gatt addr */</div><div class='ctx'> 	pci_write_config_dword(agp_bridge-&gt;dev,</div><div class='hunk'>@@ -197,8 +197,9 @@ static int u3_insert_memory(struct agp_memory *mem, off_t pg_start, int type)</div><div class='ctx'> 	gp = (u32 *) &amp;agp_bridge-&gt;gatt_table[pg_start];</div><div class='ctx'> 	for (i = 0; i &lt; mem-&gt;page_count; ++i) {</div><div class='ctx'> 		if (gp[i]) {</div><div class='del'>-			printk("u3_insert_memory: entry 0x%x occupied (%x)\n",</div><div class='del'>-			       i, gp[i]);</div><div class='add'>+			dev_info(&amp;agp_bridge-&gt;dev-&gt;dev,</div><div class='add'>+				 "u3_insert_memory: entry 0x%x occupied (%x)\n",</div><div class='add'>+				 i, gp[i]);</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -276,8 +277,8 @@ static void uninorth_agp_enable(struct agp_bridge_data *bridge, u32 mode)</div><div class='ctx'> 				       &amp;scratch);</div><div class='ctx'> 	} while ((scratch &amp; PCI_AGP_COMMAND_AGP) == 0 &amp;&amp; ++timeout &lt; 1000);</div><div class='ctx'> 	if ((scratch &amp; PCI_AGP_COMMAND_AGP) == 0)</div><div class='del'>-		printk(KERN_ERR PFX "failed to write UniNorth AGP"</div><div class='del'>-		       " command register\n");</div><div class='add'>+		dev_err(&amp;bridge-&gt;dev-&gt;dev, "can't write UniNorth AGP "</div><div class='add'>+			"command register\n");</div><div class='ctx'> </div><div class='ctx'> 	if (uninorth_rev &gt;= 0x30) {</div><div class='ctx'> 		/* This is an AGP V3 */</div><div class='hunk'>@@ -330,8 +331,8 @@ static int agp_uninorth_suspend(struct pci_dev *pdev)</div><div class='ctx'> 		pci_read_config_dword(device, agp + PCI_AGP_COMMAND, &amp;cmd);</div><div class='ctx'> 		if (!(cmd &amp; PCI_AGP_COMMAND_AGP))</div><div class='ctx'> 			continue;</div><div class='del'>-		printk("uninorth-agp: disabling AGP on device %s\n",</div><div class='del'>-				pci_name(device));</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "disabling AGP on device %s\n",</div><div class='add'>+			 pci_name(device));</div><div class='ctx'> 		cmd &amp;= ~PCI_AGP_COMMAND_AGP;</div><div class='ctx'> 		pci_write_config_dword(device, agp + PCI_AGP_COMMAND, cmd);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -341,8 +342,7 @@ static int agp_uninorth_suspend(struct pci_dev *pdev)</div><div class='ctx'> 	pci_read_config_dword(pdev, agp + PCI_AGP_COMMAND, &amp;cmd);</div><div class='ctx'> 	bridge-&gt;dev_private_data = (void *)(long)cmd;</div><div class='ctx'> 	if (cmd &amp; PCI_AGP_COMMAND_AGP) {</div><div class='del'>-		printk("uninorth-agp: disabling AGP on bridge %s\n",</div><div class='del'>-				pci_name(pdev));</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "disabling AGP on bridge\n");</div><div class='ctx'> 		cmd &amp;= ~PCI_AGP_COMMAND_AGP;</div><div class='ctx'> 		pci_write_config_dword(pdev, agp + PCI_AGP_COMMAND, cmd);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -591,14 +591,14 @@ static int __devinit agp_uninorth_probe(struct pci_dev *pdev,</div><div class='ctx'> 	/* probe for known chipsets */</div><div class='ctx'> 	for (j = 0; devs[j].chipset_name != NULL; ++j) {</div><div class='ctx'> 		if (pdev-&gt;device == devs[j].device_id) {</div><div class='del'>-			printk(KERN_INFO PFX "Detected Apple %s chipset\n",</div><div class='del'>-			       devs[j].chipset_name);</div><div class='add'>+			dev_info(&amp;pdev-&gt;dev, "Apple %s chipset\n",</div><div class='add'>+				 devs[j].chipset_name);</div><div class='ctx'> 			goto found;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_ERR PFX "Unsupported Apple chipset (device id: %04x).\n",</div><div class='del'>-		pdev-&gt;device);</div><div class='add'>+	dev_err(&amp;pdev-&gt;dev, "unsupported Apple chipset [%04x/%04x]\n",</div><div class='add'>+		pdev-&gt;vendor, pdev-&gt;device);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> </div><div class='ctx'>  found:</div><div class='head'>diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c<br/>index 3530ff417a51..6e763e3f5a81 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/amiserial.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/amiserial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/amiserial.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/amiserial.c</a></div><div class='hunk'>@@ -1254,7 +1254,7 @@ static int rs_break(struct tty_struct *tty, int break_state)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (serial_paranoia_check(info, tty-&gt;name, "rs_break"))</div><div class='del'>-		return;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	if (break_state == -1)</div><div class='head'>diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c<br/>index 34275c6f1da2..74e9cd81b5b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ds1620.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/ds1620.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ds1620.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/ds1620.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/therm.h&gt;</div><div class='head'>diff --git a/drivers/char/efirtc.c b/drivers/char/efirtc.c<br/>index 67fbd7aab5db..34d15d548236 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/efirtc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/efirtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/efirtc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/efirtc.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c<br/>index 02aac104842d..fd64137b1ab9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hvc_console.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/hvc_console.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hvc_console.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/hvc_console.c</a></div><div class='hunk'>@@ -322,11 +322,10 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)</div><div class='ctx'> </div><div class='ctx'> 	hp-&gt;tty = tty;</div><div class='ctx'> </div><div class='del'>-	if (hp-&gt;ops-&gt;notifier_add)</div><div class='del'>-		rc = hp-&gt;ops-&gt;notifier_add(hp, hp-&gt;data);</div><div class='del'>-</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;hp-&gt;lock, flags);</div><div class='ctx'> </div><div class='add'>+	if (hp-&gt;ops-&gt;notifier_add)</div><div class='add'>+		rc = hp-&gt;ops-&gt;notifier_add(hp, hp-&gt;data);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the notifier fails we return an error.  The tty layer</div><div class='head'>diff --git a/drivers/char/hvc_console.h b/drivers/char/hvc_console.h<br/>index d9ce10915625..9790201718ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hvc_console.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/hvc_console.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hvc_console.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/hvc_console.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  * 	Ryan S. Arnold &lt;rsa@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * hvc_console header information:</div><div class='del'>- *      moved here from include/asm-powerpc/hvconsole.h</div><div class='add'>+ *      moved here from arch/powerpc/include/asm/hvconsole.h</div><div class='ctx'>  *      and drivers/char/hvc_console.c</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='head'>diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c<br/>index 786d518e9477..473d9b14439a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hvcs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/hvcs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hvcs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/hvcs.c</a></div><div class='hunk'>@@ -114,7 +114,7 @@</div><div class='ctx'>  * the hvcs_final_close() function in order to get it out of the spinlock.</div><div class='ctx'>  * Rearranged hvcs_close().  Cleaned up some printks and did some housekeeping</div><div class='ctx'>  * on the changelog.  Removed local CLC_LENGTH and used HVCS_CLC_LENGTH from</div><div class='del'>- * include/asm-powerpc/hvcserver.h </div><div class='add'>+ * arch/powerepc/include/asm/hvcserver.h</div><div class='ctx'>  *</div><div class='ctx'>  * 1.3.2 -&gt; 1.3.3 Replaced yield() in hvcs_close() with tty_wait_until_sent() to</div><div class='ctx'>  * prevent possible lockup with realtime scheduling as similarily pointed out by</div><div class='head'>diff --git a/drivers/char/hw_random/ixp4xx-rng.c b/drivers/char/hw_random/ixp4xx-rng.c<br/>index bab43ca32ac1..263567f5f392 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hw_random/ixp4xx-rng.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/hw_random/ixp4xx-rng.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/ixp4xx-rng.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/hw_random/ixp4xx-rng.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/hw_random.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int ixp4xx_rng_data_read(struct hwrng *rng, u32 *buffer)</div><div class='head'>diff --git a/drivers/char/hw_random/via-rng.c b/drivers/char/hw_random/via-rng.c<br/>index f7feae4ebb5e..128202e18fc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hw_random/via-rng.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/hw_random/via-rng.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/via-rng.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/hw_random/via-rng.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='add'>+#include &lt;asm/i387.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define PFX	KBUILD_MODNAME ": "</div><div class='hunk'>@@ -67,16 +68,23 @@ enum {</div><div class='ctx'>  * Another possible performance boost may come from simply buffering</div><div class='ctx'>  * until we have 4 bytes, thus returning a u32 at a time,</div><div class='ctx'>  * instead of the current u8-at-a-time.</div><div class='add'>+ *</div><div class='add'>+ * Padlock instructions can generate a spurious DNA fault, so</div><div class='add'>+ * we have to call them in the context of irq_ts_save/restore()</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static inline u32 xstore(u32 *addr, u32 edx_in)</div><div class='ctx'> {</div><div class='ctx'> 	u32 eax_out;</div><div class='add'>+	int ts_state;</div><div class='add'>+</div><div class='add'>+	ts_state = irq_ts_save();</div><div class='ctx'> </div><div class='ctx'> 	asm(".byte 0x0F,0xA7,0xC0 /* xstore %%edi (addr=%0) */"</div><div class='ctx'> 		:"=m"(*addr), "=a"(eax_out)</div><div class='ctx'> 		:"D"(addr), "d"(edx_in));</div><div class='ctx'> </div><div class='add'>+	irq_ts_restore(ts_state);</div><div class='ctx'> 	return eax_out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c<br/>index 192688344ed2..8e8afb6141f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ipmi/ipmi_si_intf.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/ipmi/ipmi_si_intf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ipmi/ipmi_si_intf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/ipmi/ipmi_si_intf.c</a></div><div class='hunk'>@@ -66,8 +66,8 @@</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_OF</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='del'>-#include &lt;asm/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define PFX "ipmi_si: "</div><div class='hunk'>@@ -2695,15 +2695,13 @@ static __devinit void default_find_bmc(void)</div><div class='ctx'> 	for (i = 0; ; i++) {</div><div class='ctx'> 		if (!ipmi_defaults[i].port)</div><div class='ctx'> 			break;</div><div class='del'>-</div><div class='del'>-		info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='del'>-		if (!info)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PPC_MERGE</div><div class='ctx'> 		if (check_legacy_ioport(ipmi_defaults[i].port))</div><div class='ctx'> 			continue;</div><div class='ctx'> #endif</div><div class='add'>+		info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='add'>+		if (!info)</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='ctx'> 		info-&gt;addr_source = NULL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c<br/>index e30575e87648..b638403e8e9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/mxser.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/mxser.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/mxser.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/mxser.c</a></div><div class='hunk'>@@ -1612,8 +1612,10 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case MOXA_GET_MAJOR:</div><div class='del'>-		printk(KERN_WARNING "mxser: '%s' uses deprecated ioctl %x, fix "</div><div class='del'>-				"your userspace\n", current-&gt;comm, cmd);</div><div class='add'>+		if (printk_ratelimit())</div><div class='add'>+			printk(KERN_WARNING "mxser: '%s' uses deprecated ioctl "</div><div class='add'>+					"%x (GET_MAJOR), fix your userspace\n",</div><div class='add'>+					current-&gt;comm, cmd);</div><div class='ctx'> 		return put_user(ttymajor, (int __user *)argp);</div><div class='ctx'> </div><div class='ctx'> 	case MOXA_CHKPORTENABLE:</div><div class='head'>diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c<br/>index b1414507997c..3a23e7694d55 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/pcmcia/ipwireless/tty.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/pcmcia/ipwireless/tty.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/pcmcia/ipwireless/tty.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/pcmcia/ipwireless/tty.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;linux/tty_driver.h&gt;</div><div class='ctx'> #include &lt;linux/tty_flip.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "tty.h"</div><div class='ctx'> #include "network.h"</div><div class='head'>diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c<br/>index d1fceabe3aef..c240562c218b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/pcmcia/synclink_cs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/pcmcia/synclink_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/pcmcia/synclink_cs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/pcmcia/synclink_cs.c</a></div><div class='hunk'>@@ -232,7 +232,6 @@ typedef struct _mgslpc_info {</div><div class='ctx'> </div><div class='ctx'> 	/* SPPP/Cisco HDLC device parts */</div><div class='ctx'> 	int netcount;</div><div class='del'>-	int dosyncppp;</div><div class='ctx'> 	spinlock_t netlock;</div><div class='ctx'> </div><div class='ctx'> #if SYNCLINK_GENERIC_HDLC</div><div class='hunk'>@@ -459,13 +458,11 @@ static int ttymajor=0;</div><div class='ctx'> </div><div class='ctx'> static int debug_level = 0;</div><div class='ctx'> static int maxframe[MAX_DEVICE_COUNT] = {0,};</div><div class='del'>-static int dosyncppp[MAX_DEVICE_COUNT] = {1,1,1,1};</div><div class='ctx'> </div><div class='ctx'> module_param(break_on_load, bool, 0);</div><div class='ctx'> module_param(ttymajor, int, 0);</div><div class='ctx'> module_param(debug_level, int, 0);</div><div class='ctx'> module_param_array(maxframe, int, NULL, 0);</div><div class='del'>-module_param_array(dosyncppp, int, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='hunk'>@@ -2915,7 +2912,6 @@ static void mgslpc_add_device(MGSLPC_INFO *info)</div><div class='ctx'> 	if (info-&gt;line &lt; MAX_DEVICE_COUNT) {</div><div class='ctx'> 		if (maxframe[info-&gt;line])</div><div class='ctx'> 			info-&gt;max_frame_size = maxframe[info-&gt;line];</div><div class='del'>-		info-&gt;dosyncppp = dosyncppp[info-&gt;line];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mgslpc_device_count++;</div><div class='head'>diff --git a/drivers/char/random.c b/drivers/char/random.c<br/>index e0d0e371909c..7ce1ac4baa6d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/random.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/random.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/random.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/random.c</a></div><div class='hunk'>@@ -407,7 +407,7 @@ struct entropy_store {</div><div class='ctx'> 	/* read-write data: */</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	unsigned add_ptr;</div><div class='del'>-	int entropy_count;</div><div class='add'>+	int entropy_count;	/* Must at no time exceed -&gt;POOLBITS! */</div><div class='ctx'> 	int input_rotate;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -520,6 +520,7 @@ static void mix_pool_bytes(struct entropy_store *r, const void *in, int bytes)</div><div class='ctx'> static void credit_entropy_bits(struct entropy_store *r, int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	int entropy_count;</div><div class='ctx'> </div><div class='ctx'> 	if (!nbits)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -527,20 +528,20 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits)</div><div class='ctx'> 	spin_lock_irqsave(&amp;r-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	DEBUG_ENT("added %d entropy credits to %s\n", nbits, r-&gt;name);</div><div class='del'>-	r-&gt;entropy_count += nbits;</div><div class='del'>-	if (r-&gt;entropy_count &lt; 0) {</div><div class='add'>+	entropy_count = r-&gt;entropy_count;</div><div class='add'>+	entropy_count += nbits;</div><div class='add'>+	if (entropy_count &lt; 0) {</div><div class='ctx'> 		DEBUG_ENT("negative entropy/overflow\n");</div><div class='del'>-		r-&gt;entropy_count = 0;</div><div class='del'>-	} else if (r-&gt;entropy_count &gt; r-&gt;poolinfo-&gt;POOLBITS)</div><div class='del'>-		r-&gt;entropy_count = r-&gt;poolinfo-&gt;POOLBITS;</div><div class='add'>+		entropy_count = 0;</div><div class='add'>+	} else if (entropy_count &gt; r-&gt;poolinfo-&gt;POOLBITS)</div><div class='add'>+		entropy_count = r-&gt;poolinfo-&gt;POOLBITS;</div><div class='add'>+	r-&gt;entropy_count = entropy_count;</div><div class='ctx'> </div><div class='ctx'> 	/* should we wake readers? */</div><div class='del'>-	if (r == &amp;input_pool &amp;&amp;</div><div class='del'>-	    r-&gt;entropy_count &gt;= random_read_wakeup_thresh) {</div><div class='add'>+	if (r == &amp;input_pool &amp;&amp; entropy_count &gt;= random_read_wakeup_thresh) {</div><div class='ctx'> 		wake_up_interruptible(&amp;random_read_wait);</div><div class='ctx'> 		kill_fasync(&amp;fasync, SIGIO, POLL_IN);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;r-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1571,6 +1572,7 @@ u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport)</div><div class='ctx'> </div><div class='ctx'> 	return half_md4_transform(hash, keyptr-&gt;secret);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(secure_ipv4_port_ephemeral);</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)</div><div class='ctx'> u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,</div><div class='head'>diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c<br/>index d9799e2bcfbf..f53d4d00faf0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rtc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/rtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rtc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/rtc.c</a></div><div class='hunk'>@@ -78,7 +78,6 @@</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/bcd.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/current.h&gt;</div><div class='head'>diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c<br/>index ef6706f09061..500f5176b6ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/synclink.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/synclink.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/synclink.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/synclink.c</a></div><div class='hunk'>@@ -304,7 +304,6 @@ struct mgsl_struct {</div><div class='ctx'> </div><div class='ctx'> 	/* generic HDLC device parts */</div><div class='ctx'> 	int netcount;</div><div class='del'>-	int dosyncppp;</div><div class='ctx'> 	spinlock_t netlock;</div><div class='ctx'> </div><div class='ctx'> #if SYNCLINK_GENERIC_HDLC</div><div class='hunk'>@@ -868,7 +867,6 @@ static int irq[MAX_ISA_DEVICES];</div><div class='ctx'> static int dma[MAX_ISA_DEVICES];</div><div class='ctx'> static int debug_level;</div><div class='ctx'> static int maxframe[MAX_TOTAL_DEVICES];</div><div class='del'>-static int dosyncppp[MAX_TOTAL_DEVICES];</div><div class='ctx'> static int txdmabufs[MAX_TOTAL_DEVICES];</div><div class='ctx'> static int txholdbufs[MAX_TOTAL_DEVICES];</div><div class='ctx'> 	</div><div class='hunk'>@@ -879,7 +877,6 @@ module_param_array(irq, int, NULL, 0);</div><div class='ctx'> module_param_array(dma, int, NULL, 0);</div><div class='ctx'> module_param(debug_level, int, 0);</div><div class='ctx'> module_param_array(maxframe, int, NULL, 0);</div><div class='del'>-module_param_array(dosyncppp, int, NULL, 0);</div><div class='ctx'> module_param_array(txdmabufs, int, NULL, 0);</div><div class='ctx'> module_param_array(txholdbufs, int, NULL, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -4258,7 +4255,6 @@ static void mgsl_add_device( struct mgsl_struct *info )</div><div class='ctx'> 	if (info-&gt;line &lt; MAX_TOTAL_DEVICES) {</div><div class='ctx'> 		if (maxframe[info-&gt;line])</div><div class='ctx'> 			info-&gt;max_frame_size = maxframe[info-&gt;line];</div><div class='del'>-		info-&gt;dosyncppp = dosyncppp[info-&gt;line];</div><div class='ctx'> </div><div class='ctx'> 		if (txdmabufs[info-&gt;line]) {</div><div class='ctx'> 			info-&gt;num_tx_dma_buffers = txdmabufs[info-&gt;line];</div><div class='head'>diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c<br/>index 3e9058993e41..08911ed66494 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/synclink_gt.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/synclink_gt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/synclink_gt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/synclink_gt.c</a></div><div class='hunk'>@@ -47,7 +47,6 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -128,17 +127,14 @@ static int slgt_device_count;</div><div class='ctx'> static int ttymajor;</div><div class='ctx'> static int debug_level;</div><div class='ctx'> static int maxframe[MAX_DEVICES];</div><div class='del'>-static int dosyncppp[MAX_DEVICES];</div><div class='ctx'> </div><div class='ctx'> module_param(ttymajor, int, 0);</div><div class='ctx'> module_param(debug_level, int, 0);</div><div class='ctx'> module_param_array(maxframe, int, NULL, 0);</div><div class='del'>-module_param_array(dosyncppp, int, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> MODULE_PARM_DESC(ttymajor, "TTY major device number override: 0=auto assigned");</div><div class='ctx'> MODULE_PARM_DESC(debug_level, "Debug syslog output: 0=disabled, 1 to 5=increasing detail");</div><div class='ctx'> MODULE_PARM_DESC(maxframe, "Maximum frame size used by device (4096 to 65535)");</div><div class='del'>-MODULE_PARM_DESC(dosyncppp, "Enable synchronous net device, 0=disable 1=enable");</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * tty support and callbacks</div><div class='hunk'>@@ -349,7 +345,6 @@ struct slgt_info {</div><div class='ctx'> 	/* SPPP/Cisco HDLC device parts */</div><div class='ctx'> </div><div class='ctx'> 	int netcount;</div><div class='del'>-	int dosyncppp;</div><div class='ctx'> 	spinlock_t netlock;</div><div class='ctx'> #if SYNCLINK_GENERIC_HDLC</div><div class='ctx'> 	struct net_device *netdev;</div><div class='hunk'>@@ -3405,7 +3400,6 @@ static void add_device(struct slgt_info *info)</div><div class='ctx'> 	if (info-&gt;line &lt; MAX_DEVICES) {</div><div class='ctx'> 		if (maxframe[info-&gt;line])</div><div class='ctx'> 			info-&gt;max_frame_size = maxframe[info-&gt;line];</div><div class='del'>-		info-&gt;dosyncppp = dosyncppp[info-&gt;line];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	slgt_device_count++;</div><div class='head'>diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c<br/>index c0490cbd0db2..6bdb44f7bec2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/synclinkmp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/synclinkmp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/synclinkmp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/synclinkmp.c</a></div><div class='hunk'>@@ -270,7 +270,6 @@ typedef struct _synclinkmp_info {</div><div class='ctx'> </div><div class='ctx'> 	/* SPPP/Cisco HDLC device parts */</div><div class='ctx'> 	int netcount;</div><div class='del'>-	int dosyncppp;</div><div class='ctx'> 	spinlock_t netlock;</div><div class='ctx'> </div><div class='ctx'> #if SYNCLINK_GENERIC_HDLC</div><div class='hunk'>@@ -469,13 +468,11 @@ static int ttymajor = 0;</div><div class='ctx'>  */</div><div class='ctx'> static int debug_level = 0;</div><div class='ctx'> static int maxframe[MAX_DEVICES] = {0,};</div><div class='del'>-static int dosyncppp[MAX_DEVICES] = {0,};</div><div class='ctx'> </div><div class='ctx'> module_param(break_on_load, bool, 0);</div><div class='ctx'> module_param(ttymajor, int, 0);</div><div class='ctx'> module_param(debug_level, int, 0);</div><div class='ctx'> module_param_array(maxframe, int, NULL, 0);</div><div class='del'>-module_param_array(dosyncppp, int, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> static char *driver_name = "SyncLink MultiPort driver";</div><div class='ctx'> static char *driver_version = "$Revision: 4.38 $";</div><div class='hunk'>@@ -3752,7 +3749,6 @@ static void add_device(SLMP_INFO *info)</div><div class='ctx'> 	if (info-&gt;line &lt; MAX_DEVICES) {</div><div class='ctx'> 		if (maxframe[info-&gt;line])</div><div class='ctx'> 			info-&gt;max_frame_size = maxframe[info-&gt;line];</div><div class='del'>-		info-&gt;dosyncppp = dosyncppp[info-&gt;line];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	synclinkmp_device_count++;</div><div class='head'>diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c<br/>index e1b46bc7e43c..daeb8f766971 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tty_io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/tty_io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tty_io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/tty_io.c</a></div><div class='hunk'>@@ -1161,8 +1161,8 @@ void disassociate_ctty(int on_exit)</div><div class='ctx'> 	tty = get_current_tty();</div><div class='ctx'> 	if (tty) {</div><div class='ctx'> 		tty_pgrp = get_pid(tty-&gt;pgrp);</div><div class='del'>-		mutex_unlock(&amp;tty_mutex);</div><div class='ctx'> 		lock_kernel();</div><div class='add'>+		mutex_unlock(&amp;tty_mutex);</div><div class='ctx'> 		/* XXX: here we race, there is nothing protecting tty */</div><div class='ctx'> 		if (on_exit &amp;&amp; tty-&gt;driver-&gt;type != TTY_DRIVER_TYPE_PTY)</div><div class='ctx'> 			tty_vhangup(tty);</div><div class='hunk'>@@ -2496,45 +2496,26 @@ static int tiocgwinsz(struct tty_struct *tty, struct winsize __user *arg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	tiocswinsz		-	implement window size set ioctl</div><div class='del'>- *	@tty; tty</div><div class='del'>- *	@arg: user buffer for result</div><div class='del'>- *</div><div class='del'>- *	Copies the user idea of the window size to the kernel. Traditionally</div><div class='del'>- *	this is just advisory information but for the Linux console it</div><div class='del'>- *	actually has driver level meaning and triggers a VC resize.</div><div class='add'>+ *	tty_do_resize		-	resize event</div><div class='add'>+ *	@tty: tty being resized</div><div class='add'>+ *	@real_tty: real tty (not the same as tty if using a pty/tty pair)</div><div class='add'>+ *	@rows: rows (character)</div><div class='add'>+ *	@cols: cols (character)</div><div class='ctx'>  *</div><div class='del'>- *	Locking:</div><div class='del'>- *		Called function use the console_sem is used to ensure we do</div><div class='del'>- *	not try and resize the console twice at once.</div><div class='del'>- *		The tty-&gt;termios_mutex is used to ensure we don't double</div><div class='del'>- *	resize and get confused. Lock order - tty-&gt;termios_mutex before</div><div class='del'>- *	console sem</div><div class='add'>+ *	Update the termios variables and send the neccessary signals to</div><div class='add'>+ *	peform a terminal resize correctly</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int tiocswinsz(struct tty_struct *tty, struct tty_struct *real_tty,</div><div class='del'>-	struct winsize __user *arg)</div><div class='add'>+int tty_do_resize(struct tty_struct *tty, struct tty_struct *real_tty,</div><div class='add'>+					struct winsize *ws)</div><div class='ctx'> {</div><div class='del'>-	struct winsize tmp_ws;</div><div class='ctx'> 	struct pid *pgrp, *rpgrp;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;tmp_ws, arg, sizeof(*arg)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;tty-&gt;termios_mutex);</div><div class='del'>-	if (!memcmp(&amp;tmp_ws, &amp;tty-&gt;winsize, sizeof(*arg)))</div><div class='add'>+	/* For a PTY we need to lock the tty side */</div><div class='add'>+	mutex_lock(&amp;real_tty-&gt;termios_mutex);</div><div class='add'>+	if (!memcmp(ws, &amp;tty-&gt;winsize, sizeof(*ws)))</div><div class='ctx'> 		goto done;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_VT</div><div class='del'>-	if (tty-&gt;driver-&gt;type == TTY_DRIVER_TYPE_CONSOLE) {</div><div class='del'>-		if (vc_lock_resize(tty-&gt;driver_data, tmp_ws.ws_col,</div><div class='del'>-					tmp_ws.ws_row)) {</div><div class='del'>-			mutex_unlock(&amp;tty-&gt;termios_mutex);</div><div class='del'>-			return -ENXIO;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> 	/* Get the PID values and reference them so we can</div><div class='ctx'> 	   avoid holding the tty ctrl lock while sending signals */</div><div class='ctx'> 	spin_lock_irqsave(&amp;tty-&gt;ctrl_lock, flags);</div><div class='hunk'>@@ -2550,14 +2531,42 @@ static int tiocswinsz(struct tty_struct *tty, struct tty_struct *real_tty,</div><div class='ctx'> 	put_pid(pgrp);</div><div class='ctx'> 	put_pid(rpgrp);</div><div class='ctx'> </div><div class='del'>-	tty-&gt;winsize = tmp_ws;</div><div class='del'>-	real_tty-&gt;winsize = tmp_ws;</div><div class='add'>+	tty-&gt;winsize = *ws;</div><div class='add'>+	real_tty-&gt;winsize = *ws;</div><div class='ctx'> done:</div><div class='del'>-	mutex_unlock(&amp;tty-&gt;termios_mutex);</div><div class='add'>+	mutex_unlock(&amp;real_tty-&gt;termios_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	tiocswinsz		-	implement window size set ioctl</div><div class='add'>+ *	@tty; tty</div><div class='add'>+ *	@arg: user buffer for result</div><div class='add'>+ *</div><div class='add'>+ *	Copies the user idea of the window size to the kernel. Traditionally</div><div class='add'>+ *	this is just advisory information but for the Linux console it</div><div class='add'>+ *	actually has driver level meaning and triggers a VC resize.</div><div class='add'>+ *</div><div class='add'>+ *	Locking:</div><div class='add'>+ *		Driver dependant. The default do_resize method takes the</div><div class='add'>+ *	tty termios mutex and ctrl_lock. The console takes its own lock</div><div class='add'>+ *	then calls into the default method.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int tiocswinsz(struct tty_struct *tty, struct tty_struct *real_tty,</div><div class='add'>+	struct winsize __user *arg)</div><div class='add'>+{</div><div class='add'>+	struct winsize tmp_ws;</div><div class='add'>+	if (copy_from_user(&amp;tmp_ws, arg, sizeof(*arg)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (tty-&gt;ops-&gt;resize)</div><div class='add'>+		return tty-&gt;ops-&gt;resize(tty, real_tty, &amp;tmp_ws);</div><div class='add'>+	else</div><div class='add'>+		return tty_do_resize(tty, real_tty, &amp;tmp_ws);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	tioccons	-	allow admin to move logical console</div><div class='ctx'>  *	@file: the file to become console</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c<br/>index ea9fc5d03b99..bf34e4597421 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tty_ioctl.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/tty_ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tty_ioctl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/tty_ioctl.c</a></div><div class='hunk'>@@ -937,12 +937,14 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 			return 0;</div><div class='ctx'> #endif</div><div class='ctx'> 	case TIOCGSOFTCAR:</div><div class='del'>-		return put_user(C_CLOCAL(tty) ? 1 : 0,</div><div class='add'>+		/* FIXME: for correctness we may need to take the termios</div><div class='add'>+		   lock here - review */</div><div class='add'>+		return put_user(C_CLOCAL(real_tty) ? 1 : 0,</div><div class='ctx'> 						(int __user *)arg);</div><div class='ctx'> 	case TIOCSSOFTCAR:</div><div class='ctx'> 		if (get_user(arg, (unsigned int __user *) arg))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		return tty_change_softcar(tty, arg);</div><div class='add'>+		return tty_change_softcar(real_tty, arg);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOIOCTLCMD;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/char/tty_ldisc.c b/drivers/char/tty_ldisc.c<br/>index 241cbdea65ab..f307f135cbfb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tty_ldisc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/tty_ldisc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tty_ldisc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/tty_ldisc.c</a></div><div class='hunk'>@@ -169,7 +169,7 @@ static int tty_ldisc_get(int disc, struct tty_ldisc *ld)</div><div class='ctx'> 	if (disc &lt; N_TTY || disc &gt;= NR_LDISCS)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	err = tty_ldisc_try_get(disc, ld);</div><div class='del'>-	if (err == -EAGAIN) {</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		request_module("tty-ldisc-%d", disc);</div><div class='ctx'> 		err = tty_ldisc_try_get(disc, ld);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c<br/>deleted file mode 100644<br/>index 65fb848e1cce..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/viocons.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/viocons.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1171 +0,0 @@</div><div class='del'>-/* -*- linux-c -*-</div><div class='del'>- *</div><div class='del'>- *  drivers/char/viocons.c</div><div class='del'>- *</div><div class='del'>- *  iSeries Virtual Terminal</div><div class='del'>- *</div><div class='del'>- *  Authors: Dave Boutcher &lt;boutcher@us.ibm.com&gt;</div><div class='del'>- *           Ryan Arnold &lt;ryanarn@us.ibm.com&gt;</div><div class='del'>- *           Colin Devilbiss &lt;devilbis@us.ibm.com&gt;</div><div class='del'>- *           Stephen Rothwell</div><div class='del'>- *</div><div class='del'>- * (C) Copyright 2000, 2001, 2002, 2003, 2004 IBM Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software;  you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License as</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License, or (at your option) anyu later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software Foundation,</div><div class='del'>- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/console.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;asm/ioctls.h&gt;</div><div class='del'>-#include &lt;linux/kd.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='del'>-#include &lt;linux/tty_flip.h&gt;</div><div class='del'>-#include &lt;linux/sysrq.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/firmware.h&gt;</div><div class='del'>-#include &lt;asm/iseries/vio.h&gt;</div><div class='del'>-#include &lt;asm/iseries/hv_lp_event.h&gt;</div><div class='del'>-#include &lt;asm/iseries/hv_call_event.h&gt;</div><div class='del'>-#include &lt;asm/iseries/hv_lp_config.h&gt;</div><div class='del'>-#include &lt;asm/iseries/hv_call.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_VT</div><div class='del'>-#error You must turn off CONFIG_VT to use CONFIG_VIOCONS</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define VIOTTY_MAGIC (0x0DCB)</div><div class='del'>-#define VTTY_PORTS 10</div><div class='del'>-</div><div class='del'>-#define VIOCONS_KERN_WARN	KERN_WARNING "viocons: "</div><div class='del'>-#define VIOCONS_KERN_INFO	KERN_INFO "viocons: "</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(consolelock);</div><div class='del'>-static DEFINE_SPINLOCK(consoleloglock);</div><div class='del'>-</div><div class='del'>-static int vio_sysrq_pressed;</div><div class='del'>-</div><div class='del'>-#define VIOCHAR_NUM_BUF		16</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Our port information.  We store a pointer to one entry in the</div><div class='del'>- * tty_driver_data</div><div class='del'>- */</div><div class='del'>-static struct port_info {</div><div class='del'>-	int magic;</div><div class='del'>-	struct tty_struct *tty;</div><div class='del'>-	HvLpIndex lp;</div><div class='del'>-	u8 vcons;</div><div class='del'>-	u64 seq;	/* sequence number of last HV send */</div><div class='del'>-	u64 ack;	/* last ack from HV */</div><div class='del'>-/*</div><div class='del'>- * When we get writes faster than we can send it to the partition,</div><div class='del'>- * buffer the data here. Note that used is a bit map of used buffers.</div><div class='del'>- * It had better have enough bits to hold VIOCHAR_NUM_BUF the bitops assume</div><div class='del'>- * it is a multiple of unsigned long</div><div class='del'>- */</div><div class='del'>-	unsigned long used;</div><div class='del'>-	u8 *buffer[VIOCHAR_NUM_BUF];</div><div class='del'>-	int bufferBytes[VIOCHAR_NUM_BUF];</div><div class='del'>-	int curbuf;</div><div class='del'>-	int bufferOverflow;</div><div class='del'>-	int overflowMessage;</div><div class='del'>-} port_info[VTTY_PORTS];</div><div class='del'>-</div><div class='del'>-#define viochar_is_console(pi)	((pi) == &amp;port_info[0])</div><div class='del'>-#define viochar_port(pi)	((pi) - &amp;port_info[0])</div><div class='del'>-</div><div class='del'>-static void initDataEvent(struct viocharlpevent *viochar, HvLpIndex lp);</div><div class='del'>-</div><div class='del'>-static struct tty_driver *viotty_driver;</div><div class='del'>-</div><div class='del'>-static void hvlog(char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	va_list args;</div><div class='del'>-	static char buf[256];</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;consoleloglock, flags);</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	i = vscnprintf(buf, sizeof(buf) - 1, fmt, args);</div><div class='del'>-	va_end(args);</div><div class='del'>-	buf[i++] = '\r';</div><div class='del'>-	HvCall_writeLogBuffer(buf, i);</div><div class='del'>-	spin_unlock_irqrestore(&amp;consoleloglock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hvlogOutput(const char *buf, int count)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int begin;</div><div class='del'>-	int index;</div><div class='del'>-	static const char cr = '\r';</div><div class='del'>-</div><div class='del'>-	begin = 0;</div><div class='del'>-	spin_lock_irqsave(&amp;consoleloglock, flags);</div><div class='del'>-	for (index = 0; index &lt; count; index++) {</div><div class='del'>-		if (buf[index] == '\n') {</div><div class='del'>-			/*</div><div class='del'>-			 * Start right after the last '\n' or at the zeroth</div><div class='del'>-			 * array position and output the number of characters</div><div class='del'>-			 * including the newline.</div><div class='del'>-			 */</div><div class='del'>-			HvCall_writeLogBuffer(&amp;buf[begin], index - begin + 1);</div><div class='del'>-			begin = index + 1;</div><div class='del'>-			HvCall_writeLogBuffer(&amp;cr, 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if ((index - begin) &gt; 0)</div><div class='del'>-		HvCall_writeLogBuffer(&amp;buf[begin], index - begin);</div><div class='del'>-	spin_unlock_irqrestore(&amp;consoleloglock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Make sure we're pointing to a valid port_info structure.  Shamelessly</div><div class='del'>- * plagerized from serial.c</div><div class='del'>- */</div><div class='del'>-static inline int viotty_paranoia_check(struct port_info *pi,</div><div class='del'>-					char *name, const char *routine)</div><div class='del'>-{</div><div class='del'>-	static const char *bad_pi_addr = VIOCONS_KERN_WARN</div><div class='del'>-		"warning: bad address for port_info struct (%s) in %s\n";</div><div class='del'>-	static const char *badmagic = VIOCONS_KERN_WARN</div><div class='del'>-		"warning: bad magic number for port_info struct (%s) in %s\n";</div><div class='del'>-</div><div class='del'>-	if ((pi &lt; &amp;port_info[0]) || (viochar_port(pi) &gt; VTTY_PORTS)) {</div><div class='del'>-		printk(bad_pi_addr, name, routine);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	if (pi-&gt;magic != VIOTTY_MAGIC) {</div><div class='del'>-		printk(badmagic, name, routine);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Add data to our pending-send buffers.  </div><div class='del'>- *</div><div class='del'>- * NOTE: Don't use printk in here because it gets nastily recursive.</div><div class='del'>- * hvlog can be used to log to the hypervisor buffer</div><div class='del'>- */</div><div class='del'>-static int buffer_add(struct port_info *pi, const char *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	size_t bleft;</div><div class='del'>-	size_t curlen;</div><div class='del'>-	const char *curbuf;</div><div class='del'>-	int nextbuf;</div><div class='del'>-</div><div class='del'>-	curbuf = buf;</div><div class='del'>-	bleft = len;</div><div class='del'>-	while (bleft &gt; 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * If there is no space left in the current buffer, we have</div><div class='del'>-		 * filled everything up, so return.  If we filled the previous</div><div class='del'>-		 * buffer we would already have moved to the next one.</div><div class='del'>-		 */</div><div class='del'>-		if (pi-&gt;bufferBytes[pi-&gt;curbuf] == VIOCHAR_MAX_DATA) {</div><div class='del'>-			hvlog ("\n\rviocons: No overflow buffer available for memcpy().\n");</div><div class='del'>-			pi-&gt;bufferOverflow++;</div><div class='del'>-			pi-&gt;overflowMessage = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Turn on the "used" bit for this buffer.  If it's already on,</div><div class='del'>-		 * that's fine.</div><div class='del'>-		 */</div><div class='del'>-		set_bit(pi-&gt;curbuf, &amp;pi-&gt;used);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * See if this buffer has been allocated.  If not, allocate it.</div><div class='del'>-		 */</div><div class='del'>-		if (pi-&gt;buffer[pi-&gt;curbuf] == NULL) {</div><div class='del'>-			pi-&gt;buffer[pi-&gt;curbuf] =</div><div class='del'>-			    kmalloc(VIOCHAR_MAX_DATA, GFP_ATOMIC);</div><div class='del'>-			if (pi-&gt;buffer[pi-&gt;curbuf] == NULL) {</div><div class='del'>-				hvlog("\n\rviocons: kmalloc failed allocating spaces for buffer %d.",</div><div class='del'>-					pi-&gt;curbuf);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Figure out how much we can copy into this buffer. */</div><div class='del'>-		if (bleft &lt; (VIOCHAR_MAX_DATA - pi-&gt;bufferBytes[pi-&gt;curbuf]))</div><div class='del'>-			curlen = bleft;</div><div class='del'>-		else</div><div class='del'>-			curlen = VIOCHAR_MAX_DATA - pi-&gt;bufferBytes[pi-&gt;curbuf];</div><div class='del'>-</div><div class='del'>-		/* Copy the data into the buffer. */</div><div class='del'>-		memcpy(pi-&gt;buffer[pi-&gt;curbuf] + pi-&gt;bufferBytes[pi-&gt;curbuf],</div><div class='del'>-				curbuf, curlen);</div><div class='del'>-</div><div class='del'>-		pi-&gt;bufferBytes[pi-&gt;curbuf] += curlen;</div><div class='del'>-		curbuf += curlen;</div><div class='del'>-		bleft -= curlen;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Now see if we've filled this buffer.  If not then</div><div class='del'>-		 * we'll try to use it again later.  If we've filled it</div><div class='del'>-		 * up then we'll advance the curbuf to the next in the</div><div class='del'>-		 * circular queue.</div><div class='del'>-		 */</div><div class='del'>-		if (pi-&gt;bufferBytes[pi-&gt;curbuf] == VIOCHAR_MAX_DATA) {</div><div class='del'>-			nextbuf = (pi-&gt;curbuf + 1) % VIOCHAR_NUM_BUF;</div><div class='del'>-			/*</div><div class='del'>-			 * Move to the next buffer if it hasn't been used yet</div><div class='del'>-			 */</div><div class='del'>-			if (test_bit(nextbuf, &amp;pi-&gt;used) == 0)</div><div class='del'>-				pi-&gt;curbuf = nextbuf;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return len - bleft;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Send pending data</div><div class='del'>- *</div><div class='del'>- * NOTE: Don't use printk in here because it gets nastily recursive.</div><div class='del'>- * hvlog can be used to log to the hypervisor buffer</div><div class='del'>- */</div><div class='del'>-static void send_buffers(struct port_info *pi)</div><div class='del'>-{</div><div class='del'>-	HvLpEvent_Rc hvrc;</div><div class='del'>-	int nextbuf;</div><div class='del'>-	struct viocharlpevent *viochar;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;consolelock, flags);</div><div class='del'>-</div><div class='del'>-	viochar = (struct viocharlpevent *)</div><div class='del'>-	    vio_get_event_buffer(viomajorsubtype_chario);</div><div class='del'>-</div><div class='del'>-	/* Make sure we got a buffer */</div><div class='del'>-	if (viochar == NULL) {</div><div class='del'>-		hvlog("\n\rviocons: Can't get viochar buffer in sendBuffers().");</div><div class='del'>-		spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pi-&gt;used == 0) {</div><div class='del'>-		hvlog("\n\rviocons: in sendbuffers(), but no buffers used.\n");</div><div class='del'>-		vio_free_event_buffer(viomajorsubtype_chario, viochar);</div><div class='del'>-		spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * curbuf points to the buffer we're filling.  We want to</div><div class='del'>-	 * start sending AFTER this one.  </div><div class='del'>-	 */</div><div class='del'>-	nextbuf = (pi-&gt;curbuf + 1) % VIOCHAR_NUM_BUF;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Loop until we find a buffer with the used bit on</div><div class='del'>-	 */</div><div class='del'>-	while (test_bit(nextbuf, &amp;pi-&gt;used) == 0)</div><div class='del'>-		nextbuf = (nextbuf + 1) % VIOCHAR_NUM_BUF;</div><div class='del'>-</div><div class='del'>-	initDataEvent(viochar, pi-&gt;lp);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * While we have buffers with data, and our send window</div><div class='del'>-	 * is open, send them</div><div class='del'>-	 */</div><div class='del'>-	while ((test_bit(nextbuf, &amp;pi-&gt;used)) &amp;&amp;</div><div class='del'>-	       ((pi-&gt;seq - pi-&gt;ack) &lt; VIOCHAR_WINDOW)) {</div><div class='del'>-		viochar-&gt;len = pi-&gt;bufferBytes[nextbuf];</div><div class='del'>-		viochar-&gt;event.xCorrelationToken = pi-&gt;seq++;</div><div class='del'>-		viochar-&gt;event.xSizeMinus1 =</div><div class='del'>-			offsetof(struct viocharlpevent, data) + viochar-&gt;len;</div><div class='del'>-</div><div class='del'>-		memcpy(viochar-&gt;data, pi-&gt;buffer[nextbuf], viochar-&gt;len);</div><div class='del'>-</div><div class='del'>-		hvrc = HvCallEvent_signalLpEvent(&amp;viochar-&gt;event);</div><div class='del'>-		if (hvrc) {</div><div class='del'>-			/*</div><div class='del'>-			 * MUST unlock the spinlock before doing a printk</div><div class='del'>-			 */</div><div class='del'>-			vio_free_event_buffer(viomajorsubtype_chario, viochar);</div><div class='del'>-			spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-</div><div class='del'>-			printk(VIOCONS_KERN_WARN</div><div class='del'>-			       "error sending event! return code %d\n",</div><div class='del'>-			       (int)hvrc);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * clear the used bit, zero the number of bytes in</div><div class='del'>-		 * this buffer, and move to the next buffer</div><div class='del'>-		 */</div><div class='del'>-		clear_bit(nextbuf, &amp;pi-&gt;used);</div><div class='del'>-		pi-&gt;bufferBytes[nextbuf] = 0;</div><div class='del'>-		nextbuf = (nextbuf + 1) % VIOCHAR_NUM_BUF;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we have emptied all the buffers, start at 0 again.</div><div class='del'>-	 * this will re-use any allocated buffers</div><div class='del'>-	 */</div><div class='del'>-	if (pi-&gt;used == 0) {</div><div class='del'>-		pi-&gt;curbuf = 0;</div><div class='del'>-</div><div class='del'>-		if (pi-&gt;overflowMessage)</div><div class='del'>-			pi-&gt;overflowMessage = 0;</div><div class='del'>-</div><div class='del'>-		if (pi-&gt;tty) {</div><div class='del'>-			tty_wakeup(pi-&gt;tty);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vio_free_event_buffer(viomajorsubtype_chario, viochar);</div><div class='del'>-	spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Our internal writer.  Gets called both from the console device and</div><div class='del'>- * the tty device.  the tty pointer will be NULL if called from the console.</div><div class='del'>- * Return total number of bytes "written".</div><div class='del'>- *</div><div class='del'>- * NOTE: Don't use printk in here because it gets nastily recursive.  hvlog</div><div class='del'>- * can be used to log to the hypervisor buffer</div><div class='del'>- */</div><div class='del'>-static int internal_write(struct port_info *pi, const char *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	HvLpEvent_Rc hvrc;</div><div class='del'>-	size_t bleft;</div><div class='del'>-	size_t curlen;</div><div class='del'>-	const char *curbuf;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct viocharlpevent *viochar;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Write to the hvlog of inbound data are now done prior to</div><div class='del'>-	 * calling internal_write() since internal_write() is only called in</div><div class='del'>-	 * the event that an lp event path is active, which isn't the case for</div><div class='del'>-	 * logging attempts prior to console initialization.</div><div class='del'>-	 *</div><div class='del'>-	 * If there is already data queued for this port, send it prior to</div><div class='del'>-	 * attempting to send any new data.</div><div class='del'>-	 */</div><div class='del'>-	if (pi-&gt;used)</div><div class='del'>-		send_buffers(pi);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;consolelock, flags);</div><div class='del'>-</div><div class='del'>-	viochar = vio_get_event_buffer(viomajorsubtype_chario);</div><div class='del'>-	if (viochar == NULL) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-		hvlog("\n\rviocons: Can't get vio buffer in internal_write().");</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-	initDataEvent(viochar, pi-&gt;lp);</div><div class='del'>-</div><div class='del'>-	curbuf = buf;</div><div class='del'>-	bleft = len;</div><div class='del'>-</div><div class='del'>-	while ((bleft &gt; 0) &amp;&amp; (pi-&gt;used == 0) &amp;&amp;</div><div class='del'>-	       ((pi-&gt;seq - pi-&gt;ack) &lt; VIOCHAR_WINDOW)) {</div><div class='del'>-		if (bleft &gt; VIOCHAR_MAX_DATA)</div><div class='del'>-			curlen = VIOCHAR_MAX_DATA;</div><div class='del'>-		else</div><div class='del'>-			curlen = bleft;</div><div class='del'>-</div><div class='del'>-		viochar-&gt;event.xCorrelationToken = pi-&gt;seq++;</div><div class='del'>-		memcpy(viochar-&gt;data, curbuf, curlen);</div><div class='del'>-		viochar-&gt;len = curlen;</div><div class='del'>-		viochar-&gt;event.xSizeMinus1 =</div><div class='del'>-		    offsetof(struct viocharlpevent, data) + curlen;</div><div class='del'>-</div><div class='del'>-		hvrc = HvCallEvent_signalLpEvent(&amp;viochar-&gt;event);</div><div class='del'>-		if (hvrc) {</div><div class='del'>-			hvlog("viocons: error sending event! %d\n", (int)hvrc);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		curbuf += curlen;</div><div class='del'>-		bleft -= curlen;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we didn't send it all, buffer as much of it as we can. */</div><div class='del'>-	if (bleft &gt; 0)</div><div class='del'>-		bleft -= buffer_add(pi, curbuf, bleft);</div><div class='del'>-out:</div><div class='del'>-	vio_free_event_buffer(viomajorsubtype_chario, viochar);</div><div class='del'>-	spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-	return len - bleft;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct port_info *get_port_data(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct port_info *pi;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;consolelock, flags);</div><div class='del'>-	if (tty) {</div><div class='del'>-		pi = (struct port_info *)tty-&gt;driver_data;</div><div class='del'>-		if (!pi || viotty_paranoia_check(pi, tty-&gt;name,</div><div class='del'>-					     "get_port_data")) {</div><div class='del'>-			pi = NULL;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		/*</div><div class='del'>-		 * If this is the console device, use the lp from</div><div class='del'>-		 * the first port entry</div><div class='del'>-		 */</div><div class='del'>-		pi = &amp;port_info[0];</div><div class='del'>-	spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-	return pi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialize the common fields in a charLpEvent</div><div class='del'>- */</div><div class='del'>-static void initDataEvent(struct viocharlpevent *viochar, HvLpIndex lp)</div><div class='del'>-{</div><div class='del'>-	struct HvLpEvent *hev = &amp;viochar-&gt;event;</div><div class='del'>-</div><div class='del'>-	memset(viochar, 0, sizeof(struct viocharlpevent));</div><div class='del'>-</div><div class='del'>-	hev-&gt;flags = HV_LP_EVENT_VALID | HV_LP_EVENT_DEFERRED_ACK |</div><div class='del'>-		HV_LP_EVENT_INT;</div><div class='del'>-	hev-&gt;xType = HvLpEvent_Type_VirtualIo;</div><div class='del'>-	hev-&gt;xSubtype = viomajorsubtype_chario | viochardata;</div><div class='del'>-	hev-&gt;xSourceLp = HvLpConfig_getLpIndex();</div><div class='del'>-	hev-&gt;xTargetLp = lp;</div><div class='del'>-	hev-&gt;xSizeMinus1 = sizeof(struct viocharlpevent);</div><div class='del'>-	hev-&gt;xSourceInstanceId = viopath_sourceinst(lp);</div><div class='del'>-	hev-&gt;xTargetInstanceId = viopath_targetinst(lp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * early console device write</div><div class='del'>- */</div><div class='del'>-static void viocons_write_early(struct console *co, const char *s, unsigned count)</div><div class='del'>-{</div><div class='del'>-	hvlogOutput(s, count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * console device write</div><div class='del'>- */</div><div class='del'>-static void viocons_write(struct console *co, const char *s, unsigned count)</div><div class='del'>-{</div><div class='del'>-	int index;</div><div class='del'>-	int begin;</div><div class='del'>-	struct port_info *pi;</div><div class='del'>-</div><div class='del'>-	static const char cr = '\r';</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check port data first because the target LP might be valid but</div><div class='del'>-	 * simply not active, in which case we want to hvlog the output.</div><div class='del'>-	 */</div><div class='del'>-	pi = get_port_data(NULL);</div><div class='del'>-	if (pi == NULL) {</div><div class='del'>-		hvlog("\n\rviocons_write: unable to get port data.");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hvlogOutput(s, count);</div><div class='del'>-</div><div class='del'>-	if (!viopath_isactive(pi-&gt;lp))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* </div><div class='del'>-	 * Any newline character found will cause a</div><div class='del'>-	 * carriage return character to be emitted as well. </div><div class='del'>-	 */</div><div class='del'>-	begin = 0;</div><div class='del'>-	for (index = 0; index &lt; count; index++) {</div><div class='del'>-		if (s[index] == '\n') {</div><div class='del'>-			/* </div><div class='del'>-			 * Newline found. Print everything up to and </div><div class='del'>-			 * including the newline</div><div class='del'>-			 */</div><div class='del'>-			internal_write(pi, &amp;s[begin], index - begin + 1);</div><div class='del'>-			begin = index + 1;</div><div class='del'>-			/* Emit a carriage return as well */</div><div class='del'>-			internal_write(pi, &amp;cr, 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If any characters left to write, write them now */</div><div class='del'>-	if ((index - begin) &gt; 0)</div><div class='del'>-		internal_write(pi, &amp;s[begin], index - begin);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Work out the device associate with this console</div><div class='del'>- */</div><div class='del'>-static struct tty_driver *viocons_device(struct console *c, int *index)</div><div class='del'>-{</div><div class='del'>-	*index = c-&gt;index;</div><div class='del'>-	return viotty_driver;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * console device I/O methods</div><div class='del'>- */</div><div class='del'>-static struct console viocons_early = {</div><div class='del'>-	.name = "viocons",</div><div class='del'>-	.write = viocons_write_early,</div><div class='del'>-	.flags = CON_PRINTBUFFER,</div><div class='del'>-	.index = -1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct console viocons = {</div><div class='del'>-	.name = "viocons",</div><div class='del'>-	.write = viocons_write,</div><div class='del'>-	.device = viocons_device,</div><div class='del'>-	.flags = CON_PRINTBUFFER,</div><div class='del'>-	.index = -1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * TTY Open method</div><div class='del'>- */</div><div class='del'>-static int viotty_open(struct tty_struct *tty, struct file *filp)</div><div class='del'>-{</div><div class='del'>-	int port;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct port_info *pi;</div><div class='del'>-</div><div class='del'>-	port = tty-&gt;index;</div><div class='del'>-</div><div class='del'>-	if ((port &lt; 0) || (port &gt;= VTTY_PORTS))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;consolelock, flags);</div><div class='del'>-</div><div class='del'>-	pi = &amp;port_info[port];</div><div class='del'>-	/* If some other TTY is already connected here, reject the open */</div><div class='del'>-	if ((pi-&gt;tty) &amp;&amp; (pi-&gt;tty != tty)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-		printk(VIOCONS_KERN_WARN</div><div class='del'>-		       "attempt to open device twice from different ttys\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	tty-&gt;driver_data = pi;</div><div class='del'>-	pi-&gt;tty = tty;</div><div class='del'>-	spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * TTY Close method</div><div class='del'>- */</div><div class='del'>-static void viotty_close(struct tty_struct *tty, struct file *filp)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct port_info *pi;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;consolelock, flags);</div><div class='del'>-	pi = (struct port_info *)tty-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	if (!pi || viotty_paranoia_check(pi, tty-&gt;name, "viotty_close")) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (tty-&gt;count == 1)</div><div class='del'>-		pi-&gt;tty = NULL;</div><div class='del'>-	spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * TTY Write method</div><div class='del'>- */</div><div class='del'>-static int viotty_write(struct tty_struct *tty, const unsigned char *buf,</div><div class='del'>-		int count)</div><div class='del'>-{</div><div class='del'>-	struct port_info *pi;</div><div class='del'>-</div><div class='del'>-	pi = get_port_data(tty);</div><div class='del'>-	if (pi == NULL) {</div><div class='del'>-		hvlog("\n\rviotty_write: no port data.");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (viochar_is_console(pi))</div><div class='del'>-		hvlogOutput(buf, count);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the path to this LP is closed, don't bother doing anything more.</div><div class='del'>-	 * just dump the data on the floor and return count.  For some reason</div><div class='del'>-	 * some user level programs will attempt to probe available tty's and</div><div class='del'>-	 * they'll attempt a viotty_write on an invalid port which maps to an</div><div class='del'>-	 * invalid target lp.  If this is the case then ignore the</div><div class='del'>-	 * viotty_write call and, since the viopath isn't active to this</div><div class='del'>-	 * partition, return count.</div><div class='del'>-	 */</div><div class='del'>-	if (!viopath_isactive(pi-&gt;lp))</div><div class='del'>-		return count;</div><div class='del'>-</div><div class='del'>-	return internal_write(pi, buf, count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * TTY put_char method</div><div class='del'>- */</div><div class='del'>-static int viotty_put_char(struct tty_struct *tty, unsigned char ch)</div><div class='del'>-{</div><div class='del'>-	struct port_info *pi;</div><div class='del'>-</div><div class='del'>-	pi = get_port_data(tty);</div><div class='del'>-	if (pi == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* This will append '\r' as well if the char is '\n' */</div><div class='del'>-	if (viochar_is_console(pi))</div><div class='del'>-		hvlogOutput(&amp;ch, 1);</div><div class='del'>-</div><div class='del'>-	if (viopath_isactive(pi-&gt;lp))</div><div class='del'>-		internal_write(pi, &amp;ch, 1);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * TTY write_room method</div><div class='del'>- */</div><div class='del'>-static int viotty_write_room(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int room = 0;</div><div class='del'>-	struct port_info *pi;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;consolelock, flags);</div><div class='del'>-	pi = (struct port_info *)tty-&gt;driver_data;</div><div class='del'>-	if (!pi || viotty_paranoia_check(pi, tty-&gt;name, "viotty_write_room")) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If no buffers are used, return the max size. */</div><div class='del'>-	if (pi-&gt;used == 0) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-		return VIOCHAR_MAX_DATA * VIOCHAR_NUM_BUF;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We retain the spinlock because we want to get an accurate</div><div class='del'>-	 * count and it can change on us between each operation if we</div><div class='del'>-	 * don't hold the spinlock.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; ((i &lt; VIOCHAR_NUM_BUF) &amp;&amp; (room &lt; VIOCHAR_MAX_DATA)); i++)</div><div class='del'>-		room += (VIOCHAR_MAX_DATA - pi-&gt;bufferBytes[i]);</div><div class='del'>-	spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-</div><div class='del'>-	if (room &gt; VIOCHAR_MAX_DATA)</div><div class='del'>-		room = VIOCHAR_MAX_DATA;</div><div class='del'>-	return room;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * TTY chars_in_buffer method</div><div class='del'>- */</div><div class='del'>-static int viotty_chars_in_buffer(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int viotty_ioctl(struct tty_struct *tty, struct file *file,</div><div class='del'>-			unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	/*</div><div class='del'>-	 * the ioctls below read/set the flags usually shown in the leds</div><div class='del'>-	 * don't use them - they will go away without warning</div><div class='del'>-	 */</div><div class='del'>-	case KDGETLED:</div><div class='del'>-	case KDGKBLED:</div><div class='del'>-		return put_user(0, (char *)arg);</div><div class='del'>-</div><div class='del'>-	case KDSKBLED:</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/* FIXME: WTF is this being called for ??? */</div><div class='del'>-	lock_kernel();</div><div class='del'>-	ret =  n_tty_ioctl(tty, file, cmd, arg);</div><div class='del'>-	unlock_kernel();</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Handle an open charLpEvent.  Could be either interrupt or ack</div><div class='del'>- */</div><div class='del'>-static void vioHandleOpenEvent(struct HvLpEvent *event)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct viocharlpevent *cevent = (struct viocharlpevent *)event;</div><div class='del'>-	u8 port = cevent-&gt;virtual_device;</div><div class='del'>-	struct port_info *pi;</div><div class='del'>-	int reject = 0;</div><div class='del'>-</div><div class='del'>-	if (hvlpevent_is_ack(event)) {</div><div class='del'>-		if (port &gt;= VTTY_PORTS)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;consolelock, flags);</div><div class='del'>-		/* Got the lock, don't cause console output */</div><div class='del'>-</div><div class='del'>-		pi = &amp;port_info[port];</div><div class='del'>-		if (event-&gt;xRc == HvLpEvent_Rc_Good) {</div><div class='del'>-			pi-&gt;seq = pi-&gt;ack = 0;</div><div class='del'>-			/*</div><div class='del'>-			 * This line allows connections from the primary</div><div class='del'>-			 * partition but once one is connected from the</div><div class='del'>-			 * primary partition nothing short of a reboot</div><div class='del'>-			 * of linux will allow access from the hosting</div><div class='del'>-			 * partition again without a required iSeries fix.</div><div class='del'>-			 */</div><div class='del'>-			pi-&gt;lp = event-&gt;xTargetLp;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-		if (event-&gt;xRc != HvLpEvent_Rc_Good)</div><div class='del'>-			printk(VIOCONS_KERN_WARN</div><div class='del'>-			       "handle_open_event: event-&gt;xRc == (%d).\n",</div><div class='del'>-			       event-&gt;xRc);</div><div class='del'>-</div><div class='del'>-		if (event-&gt;xCorrelationToken != 0) {</div><div class='del'>-			atomic_t *aptr= (atomic_t *)event-&gt;xCorrelationToken;</div><div class='del'>-			atomic_set(aptr, 1);</div><div class='del'>-		} else</div><div class='del'>-			printk(VIOCONS_KERN_WARN</div><div class='del'>-			       "weird...got open ack without atomic\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* This had better require an ack, otherwise complain */</div><div class='del'>-	if (!hvlpevent_need_ack(event)) {</div><div class='del'>-		printk(VIOCONS_KERN_WARN "viocharopen without ack bit!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;consolelock, flags);</div><div class='del'>-	/* Got the lock, don't cause console output */</div><div class='del'>-</div><div class='del'>-	/* Make sure this is a good virtual tty */</div><div class='del'>-	if (port &gt;= VTTY_PORTS) {</div><div class='del'>-		event-&gt;xRc = HvLpEvent_Rc_SubtypeError;</div><div class='del'>-		cevent-&gt;subtype_result_code = viorc_openRejected;</div><div class='del'>-		/*</div><div class='del'>-		 * Flag state here since we can't printk while holding</div><div class='del'>-		 * a spinlock.</div><div class='del'>-		 */</div><div class='del'>-		reject = 1;</div><div class='del'>-	} else {</div><div class='del'>-		pi = &amp;port_info[port];</div><div class='del'>-		if ((pi-&gt;lp != HvLpIndexInvalid) &amp;&amp;</div><div class='del'>-				(pi-&gt;lp != event-&gt;xSourceLp)) {</div><div class='del'>-			/*</div><div class='del'>-			 * If this is tty is already connected to a different</div><div class='del'>-			 * partition, fail.</div><div class='del'>-			 */</div><div class='del'>-			event-&gt;xRc = HvLpEvent_Rc_SubtypeError;</div><div class='del'>-			cevent-&gt;subtype_result_code = viorc_openRejected;</div><div class='del'>-			reject = 2;</div><div class='del'>-		} else {</div><div class='del'>-			pi-&gt;lp = event-&gt;xSourceLp;</div><div class='del'>-			event-&gt;xRc = HvLpEvent_Rc_Good;</div><div class='del'>-			cevent-&gt;subtype_result_code = viorc_good;</div><div class='del'>-			pi-&gt;seq = pi-&gt;ack = 0;</div><div class='del'>-			reject = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-</div><div class='del'>-	if (reject == 1)</div><div class='del'>-		printk(VIOCONS_KERN_WARN "open rejected: bad virtual tty.\n");</div><div class='del'>-	else if (reject == 2)</div><div class='del'>-		printk(VIOCONS_KERN_WARN</div><div class='del'>-			"open rejected: console in exclusive use by another partition.\n");</div><div class='del'>-</div><div class='del'>-	/* Return the acknowledgement */</div><div class='del'>-	HvCallEvent_ackLpEvent(event);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Handle a close charLpEvent.  This should ONLY be an Interrupt because the</div><div class='del'>- * virtual console should never actually issue a close event to the hypervisor</div><div class='del'>- * because the virtual console never goes away.  A close event coming from the</div><div class='del'>- * hypervisor simply means that there are no client consoles connected to the</div><div class='del'>- * virtual console.</div><div class='del'>- *</div><div class='del'>- * Regardless of the number of connections masqueraded on the other side of</div><div class='del'>- * the hypervisor ONLY ONE close event should be called to accompany the ONE</div><div class='del'>- * open event that is called.  The close event should ONLY be called when NO</div><div class='del'>- * MORE connections (masqueraded or not) exist on the other side of the</div><div class='del'>- * hypervisor.</div><div class='del'>- */</div><div class='del'>-static void vioHandleCloseEvent(struct HvLpEvent *event)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct viocharlpevent *cevent = (struct viocharlpevent *)event;</div><div class='del'>-	u8 port = cevent-&gt;virtual_device;</div><div class='del'>-</div><div class='del'>-	if (hvlpevent_is_int(event)) {</div><div class='del'>-		if (port &gt;= VTTY_PORTS) {</div><div class='del'>-			printk(VIOCONS_KERN_WARN</div><div class='del'>-					"close message from invalid virtual device.\n");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* For closes, just mark the console partition invalid */</div><div class='del'>-		spin_lock_irqsave(&amp;consolelock, flags);</div><div class='del'>-		/* Got the lock, don't cause console output */</div><div class='del'>-</div><div class='del'>-		if (port_info[port].lp == event-&gt;xSourceLp)</div><div class='del'>-			port_info[port].lp = HvLpIndexInvalid;</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-		printk(VIOCONS_KERN_INFO "close from %d\n", event-&gt;xSourceLp);</div><div class='del'>-	} else</div><div class='del'>-		printk(VIOCONS_KERN_WARN</div><div class='del'>-				"got unexpected close acknowlegement\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Handle a config charLpEvent.  Could be either interrupt or ack</div><div class='del'>- */</div><div class='del'>-static void vioHandleConfig(struct HvLpEvent *event)</div><div class='del'>-{</div><div class='del'>-	struct viocharlpevent *cevent = (struct viocharlpevent *)event;</div><div class='del'>-</div><div class='del'>-	HvCall_writeLogBuffer(cevent-&gt;data, cevent-&gt;len);</div><div class='del'>-</div><div class='del'>-	if (cevent-&gt;data[0] == 0x01)</div><div class='del'>-		printk(VIOCONS_KERN_INFO "window resized to %d: %d: %d: %d\n",</div><div class='del'>-		       cevent-&gt;data[1], cevent-&gt;data[2],</div><div class='del'>-		       cevent-&gt;data[3], cevent-&gt;data[4]);</div><div class='del'>-	else</div><div class='del'>-		printk(VIOCONS_KERN_WARN "unknown config event\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Handle a data charLpEvent. </div><div class='del'>- */</div><div class='del'>-static void vioHandleData(struct HvLpEvent *event)</div><div class='del'>-{</div><div class='del'>-	struct tty_struct *tty;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct viocharlpevent *cevent = (struct viocharlpevent *)event;</div><div class='del'>-	struct port_info *pi;</div><div class='del'>-	int index;</div><div class='del'>-	int num_pushed;</div><div class='del'>-	u8 port = cevent-&gt;virtual_device;</div><div class='del'>-</div><div class='del'>-	if (port &gt;= VTTY_PORTS) {</div><div class='del'>-		printk(VIOCONS_KERN_WARN "data on invalid virtual device %d\n",</div><div class='del'>-				port);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Hold the spinlock so that we don't take an interrupt that</div><div class='del'>-	 * changes tty between the time we fetch the port_info</div><div class='del'>-	 * pointer and the time we paranoia check.</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irqsave(&amp;consolelock, flags);</div><div class='del'>-	pi = &amp;port_info[port];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Change 05/01/2003 - Ryan Arnold: If a partition other than</div><div class='del'>-	 * the current exclusive partition tries to send us data</div><div class='del'>-	 * events then just drop them on the floor because we don't</div><div class='del'>-	 * want his stinking data.  He isn't authorized to receive</div><div class='del'>-	 * data because he wasn't the first one to get the console,</div><div class='del'>-	 * therefore he shouldn't be allowed to send data either.</div><div class='del'>-	 * This will work without an iSeries fix.</div><div class='del'>-	 */</div><div class='del'>-	if (pi-&gt;lp != event-&gt;xSourceLp) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tty = pi-&gt;tty;</div><div class='del'>-	if (tty == NULL) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-		printk(VIOCONS_KERN_WARN "no tty for virtual device %d\n",</div><div class='del'>-				port);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tty-&gt;magic != TTY_MAGIC) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-		printk(VIOCONS_KERN_WARN "tty bad magic\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Just to be paranoid, make sure the tty points back to this port</div><div class='del'>-	 */</div><div class='del'>-	pi = (struct port_info *)tty-&gt;driver_data;</div><div class='del'>-	if (!pi || viotty_paranoia_check(pi, tty-&gt;name, "vioHandleData")) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Change 07/21/2003 - Ryan Arnold: functionality added to</div><div class='del'>-	 * support sysrq utilizing ^O as the sysrq key.  The sysrq</div><div class='del'>-	 * functionality will only work if built into the kernel and</div><div class='del'>-	 * then only if sysrq is enabled through the proc filesystem.</div><div class='del'>-	 */</div><div class='del'>-	num_pushed = 0;</div><div class='del'>-	for (index = 0; index &lt; cevent-&gt;len; index++) {</div><div class='del'>-		/*</div><div class='del'>-		 * Will be optimized away if !CONFIG_MAGIC_SYSRQ:</div><div class='del'>-		 */</div><div class='del'>-		if (sysrq_on()) {</div><div class='del'>-			/* 0x0f is the ascii character for ^O */</div><div class='del'>-			if (cevent-&gt;data[index] == '\x0f') {</div><div class='del'>-				vio_sysrq_pressed = 1;</div><div class='del'>-				/*</div><div class='del'>-				 * continue because we don't want to add</div><div class='del'>-				 * the sysrq key into the data string.</div><div class='del'>-				 */</div><div class='del'>-				continue;</div><div class='del'>-			} else if (vio_sysrq_pressed) {</div><div class='del'>-				handle_sysrq(cevent-&gt;data[index], tty);</div><div class='del'>-				vio_sysrq_pressed = 0;</div><div class='del'>-				/*</div><div class='del'>-				 * continue because we don't want to add</div><div class='del'>-				 * the sysrq sequence into the data string.</div><div class='del'>-				 */</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * The sysrq sequence isn't included in this check if</div><div class='del'>-		 * sysrq is enabled and compiled into the kernel because</div><div class='del'>-		 * the sequence will never get inserted into the buffer.</div><div class='del'>-		 * Don't attempt to copy more data into the buffer than we</div><div class='del'>-		 * have room for because it would fail without indication.</div><div class='del'>-		 */</div><div class='del'>-		if(tty_insert_flip_char(tty, cevent-&gt;data[index], TTY_NORMAL) == 0) {</div><div class='del'>-			printk(VIOCONS_KERN_WARN "input buffer overflow!\n");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		num_pushed++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (num_pushed)</div><div class='del'>-		tty_flip_buffer_push(tty);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Handle an ack charLpEvent. </div><div class='del'>- */</div><div class='del'>-static void vioHandleAck(struct HvLpEvent *event)</div><div class='del'>-{</div><div class='del'>-	struct viocharlpevent *cevent = (struct viocharlpevent *)event;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u8 port = cevent-&gt;virtual_device;</div><div class='del'>-</div><div class='del'>-	if (port &gt;= VTTY_PORTS) {</div><div class='del'>-		printk(VIOCONS_KERN_WARN "data on invalid virtual device\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;consolelock, flags);</div><div class='del'>-	port_info[port].ack = event-&gt;xCorrelationToken;</div><div class='del'>-	spin_unlock_irqrestore(&amp;consolelock, flags);</div><div class='del'>-</div><div class='del'>-	if (port_info[port].used)</div><div class='del'>-		send_buffers(&amp;port_info[port]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Handle charLpEvents and route to the appropriate routine</div><div class='del'>- */</div><div class='del'>-static void vioHandleCharEvent(struct HvLpEvent *event)</div><div class='del'>-{</div><div class='del'>-	int charminor;</div><div class='del'>-</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	charminor = event-&gt;xSubtype &amp; VIOMINOR_SUBTYPE_MASK;</div><div class='del'>-	switch (charminor) {</div><div class='del'>-	case viocharopen:</div><div class='del'>-		vioHandleOpenEvent(event);</div><div class='del'>-		break;</div><div class='del'>-	case viocharclose:</div><div class='del'>-		vioHandleCloseEvent(event);</div><div class='del'>-		break;</div><div class='del'>-	case viochardata:</div><div class='del'>-		vioHandleData(event);</div><div class='del'>-		break;</div><div class='del'>-	case viocharack:</div><div class='del'>-		vioHandleAck(event);</div><div class='del'>-		break;</div><div class='del'>-	case viocharconfig:</div><div class='del'>-		vioHandleConfig(event);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		if (hvlpevent_is_int(event) &amp;&amp; hvlpevent_need_ack(event)) {</div><div class='del'>-			event-&gt;xRc = HvLpEvent_Rc_InvalidSubtype;</div><div class='del'>-			HvCallEvent_ackLpEvent(event);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Send an open event</div><div class='del'>- */</div><div class='del'>-static int send_open(HvLpIndex remoteLp, void *sem)</div><div class='del'>-{</div><div class='del'>-	return HvCallEvent_signalLpEventFast(remoteLp,</div><div class='del'>-			HvLpEvent_Type_VirtualIo,</div><div class='del'>-			viomajorsubtype_chario | viocharopen,</div><div class='del'>-			HvLpEvent_AckInd_DoAck, HvLpEvent_AckType_ImmediateAck,</div><div class='del'>-			viopath_sourceinst(remoteLp),</div><div class='del'>-			viopath_targetinst(remoteLp),</div><div class='del'>-			(u64)(unsigned long)sem, VIOVERSION &lt;&lt; 16,</div><div class='del'>-			0, 0, 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct tty_operations serial_ops = {</div><div class='del'>-	.open = viotty_open,</div><div class='del'>-	.close = viotty_close,</div><div class='del'>-	.write = viotty_write,</div><div class='del'>-	.put_char = viotty_put_char,</div><div class='del'>-	.write_room = viotty_write_room,</div><div class='del'>-	.chars_in_buffer = viotty_chars_in_buffer,</div><div class='del'>-	.ioctl = viotty_ioctl,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init viocons_init2(void)</div><div class='del'>-{</div><div class='del'>-	atomic_t wait_flag;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	if (!firmware_has_feature(FW_FEATURE_ISERIES))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	/* +2 for fudge */</div><div class='del'>-	rc = viopath_open(HvLpConfig_getPrimaryLpIndex(),</div><div class='del'>-			viomajorsubtype_chario, VIOCHAR_WINDOW + 2);</div><div class='del'>-	if (rc)</div><div class='del'>-		printk(VIOCONS_KERN_WARN "error opening to primary %d\n", rc);</div><div class='del'>-</div><div class='del'>-	if (viopath_hostLp == HvLpIndexInvalid)</div><div class='del'>-		vio_set_hostlp();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * And if the primary is not the same as the hosting LP, open to the </div><div class='del'>-	 * hosting lp</div><div class='del'>-	 */</div><div class='del'>-	if ((viopath_hostLp != HvLpIndexInvalid) &amp;&amp;</div><div class='del'>-	    (viopath_hostLp != HvLpConfig_getPrimaryLpIndex())) {</div><div class='del'>-		printk(VIOCONS_KERN_INFO "open path to hosting (%d)\n",</div><div class='del'>-				viopath_hostLp);</div><div class='del'>-		rc = viopath_open(viopath_hostLp, viomajorsubtype_chario,</div><div class='del'>-				VIOCHAR_WINDOW + 2);	/* +2 for fudge */</div><div class='del'>-		if (rc)</div><div class='del'>-			printk(VIOCONS_KERN_WARN</div><div class='del'>-				"error opening to partition %d: %d\n",</div><div class='del'>-				viopath_hostLp, rc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (vio_setHandler(viomajorsubtype_chario, vioHandleCharEvent) &lt; 0)</div><div class='del'>-		printk(VIOCONS_KERN_WARN</div><div class='del'>-				"error seting handler for console events!\n");</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * First, try to open the console to the hosting lp.</div><div class='del'>-	 * Wait on a semaphore for the response.</div><div class='del'>-	 */</div><div class='del'>-	atomic_set(&amp;wait_flag, 0);</div><div class='del'>-	if ((viopath_isactive(viopath_hostLp)) &amp;&amp;</div><div class='del'>-	    (send_open(viopath_hostLp, (void *)&amp;wait_flag) == 0)) {</div><div class='del'>-		printk(VIOCONS_KERN_INFO "hosting partition %d\n",</div><div class='del'>-			viopath_hostLp);</div><div class='del'>-		while (atomic_read(&amp;wait_flag) == 0)</div><div class='del'>-			mb();</div><div class='del'>-		atomic_set(&amp;wait_flag, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we don't have an active console, try the primary</div><div class='del'>-	 */</div><div class='del'>-	if ((!viopath_isactive(port_info[0].lp)) &amp;&amp;</div><div class='del'>-	    (viopath_isactive(HvLpConfig_getPrimaryLpIndex())) &amp;&amp;</div><div class='del'>-	    (send_open(HvLpConfig_getPrimaryLpIndex(), (void *)&amp;wait_flag)</div><div class='del'>-	     == 0)) {</div><div class='del'>-		printk(VIOCONS_KERN_INFO "opening console to primary partition\n");</div><div class='del'>-		while (atomic_read(&amp;wait_flag) == 0)</div><div class='del'>-			mb();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initialize the tty_driver structure */</div><div class='del'>-	viotty_driver = alloc_tty_driver(VTTY_PORTS);</div><div class='del'>-	viotty_driver-&gt;owner = THIS_MODULE;</div><div class='del'>-	viotty_driver-&gt;driver_name = "vioconsole";</div><div class='del'>-	viotty_driver-&gt;name = "tty";</div><div class='del'>-	viotty_driver-&gt;name_base = 1;</div><div class='del'>-	viotty_driver-&gt;major = TTY_MAJOR;</div><div class='del'>-	viotty_driver-&gt;minor_start = 1;</div><div class='del'>-	viotty_driver-&gt;type = TTY_DRIVER_TYPE_CONSOLE;</div><div class='del'>-	viotty_driver-&gt;subtype = 1;</div><div class='del'>-	viotty_driver-&gt;init_termios = tty_std_termios;</div><div class='del'>-	viotty_driver-&gt;flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_RESET_TERMIOS;</div><div class='del'>-	tty_set_operations(viotty_driver, &amp;serial_ops);</div><div class='del'>-</div><div class='del'>-	if (tty_register_driver(viotty_driver)) {</div><div class='del'>-		printk(VIOCONS_KERN_WARN "couldn't register console driver\n");</div><div class='del'>-		put_tty_driver(viotty_driver);</div><div class='del'>-		viotty_driver = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	unregister_console(&amp;viocons_early);</div><div class='del'>-	register_console(&amp;viocons);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init viocons_init(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!firmware_has_feature(FW_FEATURE_ISERIES))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	printk(VIOCONS_KERN_INFO "registering console\n");</div><div class='del'>-	for (i = 0; i &lt; VTTY_PORTS; i++) {</div><div class='del'>-		port_info[i].lp = HvLpIndexInvalid;</div><div class='del'>-		port_info[i].magic = VIOTTY_MAGIC;</div><div class='del'>-	}</div><div class='del'>-	HvCall_setLogBufferFormatAndCodepage(HvCall_LogBuffer_ASCII, 437);</div><div class='del'>-	add_preferred_console("viocons", 0, NULL);</div><div class='del'>-	register_console(&amp;viocons_early);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-console_initcall(viocons_init);</div><div class='del'>-module_init(viocons_init2);</div><div class='head'>diff --git a/drivers/char/vt.c b/drivers/char/vt.c<br/>index 82a51f38a546..60359c360912 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/vt.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/vt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/vt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/vt.c</a></div><div class='hunk'>@@ -803,7 +803,25 @@ static inline int resize_screen(struct vc_data *vc, int width, int height,</div><div class='ctx'>  */</div><div class='ctx'> #define VC_RESIZE_MAXCOL (32767)</div><div class='ctx'> #define VC_RESIZE_MAXROW (32767)</div><div class='del'>-int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	vc_do_resize	-	resizing method for the tty</div><div class='add'>+ *	@tty: tty being resized</div><div class='add'>+ *	@real_tty: real tty (different to tty if a pty/tty pair)</div><div class='add'>+ *	@vc: virtual console private data</div><div class='add'>+ *	@cols: columns</div><div class='add'>+ *	@lines: lines</div><div class='add'>+ *</div><div class='add'>+ *	Resize a virtual console, clipping according to the actual constraints.</div><div class='add'>+ *	If the caller passes a tty structure then update the termios winsize</div><div class='add'>+ *	information and perform any neccessary signal handling.</div><div class='add'>+ *</div><div class='add'>+ *	Caller must hold the console semaphore. Takes the termios mutex and</div><div class='add'>+ *	ctrl_lock of the tty IFF a tty is passed.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int vc_do_resize(struct tty_struct *tty, struct tty_struct *real_tty,</div><div class='add'>+		struct vc_data *vc, unsigned int cols, unsigned int lines)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long old_origin, new_origin, new_scr_end, rlth, rrem, err = 0;</div><div class='ctx'> 	unsigned int old_cols, old_rows, old_row_size, old_screen_size;</div><div class='hunk'>@@ -907,26 +925,15 @@ int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines)</div><div class='ctx'> 	gotoxy(vc, vc-&gt;vc_x, vc-&gt;vc_y);</div><div class='ctx'> 	save_cur(vc);</div><div class='ctx'> </div><div class='del'>-	if (vc-&gt;vc_tty) {</div><div class='del'>-		struct winsize ws, *cws = &amp;vc-&gt;vc_tty-&gt;winsize;</div><div class='del'>-		struct pid *pgrp = NULL;</div><div class='del'>-</div><div class='add'>+	if (tty) {</div><div class='add'>+		/* Rewrite the requested winsize data with the actual</div><div class='add'>+		   resulting sizes */</div><div class='add'>+		struct winsize ws;</div><div class='ctx'> 		memset(&amp;ws, 0, sizeof(ws));</div><div class='ctx'> 		ws.ws_row = vc-&gt;vc_rows;</div><div class='ctx'> 		ws.ws_col = vc-&gt;vc_cols;</div><div class='ctx'> 		ws.ws_ypixel = vc-&gt;vc_scan_lines;</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;vc-&gt;vc_tty-&gt;termios_mutex);</div><div class='del'>-		spin_lock_irq(&amp;vc-&gt;vc_tty-&gt;ctrl_lock);</div><div class='del'>-		if ((ws.ws_row != cws-&gt;ws_row || ws.ws_col != cws-&gt;ws_col))</div><div class='del'>-			pgrp = get_pid(vc-&gt;vc_tty-&gt;pgrp);</div><div class='del'>-		spin_unlock_irq(&amp;vc-&gt;vc_tty-&gt;ctrl_lock);</div><div class='del'>-		if (pgrp) {</div><div class='del'>-			kill_pgrp(vc-&gt;vc_tty-&gt;pgrp, SIGWINCH, 1);</div><div class='del'>-			put_pid(pgrp);</div><div class='del'>-		}</div><div class='del'>-		*cws = ws;</div><div class='del'>-		mutex_unlock(&amp;vc-&gt;vc_tty-&gt;termios_mutex);</div><div class='add'>+		tty_do_resize(tty, real_tty, &amp;ws);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (CON_IS_VISIBLE(vc))</div><div class='hunk'>@@ -934,14 +941,47 @@ int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int vc_lock_resize(struct vc_data *vc, unsigned int cols, unsigned int lines)</div><div class='add'>+/**</div><div class='add'>+ *	vc_resize		-	resize a VT</div><div class='add'>+ *	@vc: virtual console</div><div class='add'>+ *	@cols: columns</div><div class='add'>+ *	@rows: rows</div><div class='add'>+ *</div><div class='add'>+ *	Resize a virtual console as seen from the console end of things. We</div><div class='add'>+ *	use the common vc_do_resize methods to update the structures. The</div><div class='add'>+ *	caller must hold the console sem to protect console internals and</div><div class='add'>+ *	vc-&gt;vc_tty</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int rows)</div><div class='add'>+{</div><div class='add'>+	return vc_do_resize(vc-&gt;vc_tty, vc-&gt;vc_tty, vc, cols, rows);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	vt_resize		-	resize a VT</div><div class='add'>+ *	@tty: tty to resize</div><div class='add'>+ *	@real_tty: tty if a pty/tty pair</div><div class='add'>+ *	@ws: winsize attributes</div><div class='add'>+ *</div><div class='add'>+ *	Resize a virtual terminal. This is called by the tty layer as we</div><div class='add'>+ *	register our own handler for resizing. The mutual helper does all</div><div class='add'>+ *	the actual work.</div><div class='add'>+ *</div><div class='add'>+ *	Takes the console sem and the called methods then take the tty</div><div class='add'>+ *	termios_mutex and the tty ctrl_lock in that order.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int vt_resize(struct tty_struct *tty, struct tty_struct *real_tty,</div><div class='add'>+	struct winsize *ws)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='add'>+	struct vc_data *vc = tty-&gt;driver_data;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	acquire_console_sem();</div><div class='del'>-	rc = vc_resize(vc, cols, lines);</div><div class='add'>+	ret = vc_do_resize(tty, real_tty, vc, ws-&gt;ws_col, ws-&gt;ws_row);</div><div class='ctx'> 	release_console_sem();</div><div class='del'>-	return rc;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void vc_deallocate(unsigned int currcons)</div><div class='hunk'>@@ -2909,6 +2949,7 @@ static const struct tty_operations con_ops = {</div><div class='ctx'> 	.start = con_start,</div><div class='ctx'> 	.throttle = con_throttle,</div><div class='ctx'> 	.unthrottle = con_unthrottle,</div><div class='add'>+	.resize = vt_resize,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __init vty_init(void)</div><div class='hunk'>@@ -4063,7 +4104,6 @@ EXPORT_SYMBOL(default_blu);</div><div class='ctx'> EXPORT_SYMBOL(update_region);</div><div class='ctx'> EXPORT_SYMBOL(redraw_screen);</div><div class='ctx'> EXPORT_SYMBOL(vc_resize);</div><div class='del'>-EXPORT_SYMBOL(vc_lock_resize);</div><div class='ctx'> EXPORT_SYMBOL(fg_console);</div><div class='ctx'> EXPORT_SYMBOL(console_blank_hook);</div><div class='ctx'> EXPORT_SYMBOL(console_blanked);</div><div class='head'>diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c<br/>index 3211afd9d57e..c904e9ad4a71 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/vt_ioctl.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/vt_ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/vt_ioctl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/vt_ioctl.c</a></div><div class='hunk'>@@ -947,14 +947,16 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,</div><div class='ctx'> 		    get_user(cc, &amp;vtsizes-&gt;v_cols))</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 		else {</div><div class='add'>+			acquire_console_sem();</div><div class='ctx'> 			for (i = 0; i &lt; MAX_NR_CONSOLES; i++) {</div><div class='ctx'> 				vc = vc_cons[i].d;</div><div class='ctx'> </div><div class='ctx'> 				if (vc) {</div><div class='ctx'> 					vc-&gt;vc_resize_user = 1;</div><div class='del'>-					vc_lock_resize(vc_cons[i].d, cc, ll);</div><div class='add'>+					vc_resize(vc_cons[i].d, cc, ll);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='add'>+			release_console_sem();</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/char/xilinx_hwicap/buffer_icap.h b/drivers/char/xilinx_hwicap/buffer_icap.h<br/>index c5b1840906b2..8b0252bf06e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/xilinx_hwicap/buffer_icap.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/xilinx_hwicap/buffer_icap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/xilinx_hwicap/buffer_icap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/xilinx_hwicap/buffer_icap.h</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/cdev.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/drivers/char/xilinx_hwicap/fifo_icap.h b/drivers/char/xilinx_hwicap/fifo_icap.h<br/>index ffabd3ba2bd8..62bda453c90b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/xilinx_hwicap/fifo_icap.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/xilinx_hwicap/fifo_icap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/xilinx_hwicap/fifo_icap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/xilinx_hwicap/fifo_icap.h</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/cdev.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c<br/>index 8bfee5fb7223..278c9857bcf5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/xilinx_hwicap/xilinx_hwicap.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/xilinx_hwicap/xilinx_hwicap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/xilinx_hwicap/xilinx_hwicap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/xilinx_hwicap/xilinx_hwicap.c</a></div><div class='hunk'>@@ -74,7 +74,6 @@</div><div class='ctx'>  * currently programmed in the FPGA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.h b/drivers/char/xilinx_hwicap/xilinx_hwicap.h<br/>index 1f9c8b082dbe..24d0d9b938fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/xilinx_hwicap/xilinx_hwicap.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/char/xilinx_hwicap/xilinx_hwicap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/xilinx_hwicap/xilinx_hwicap.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/char/xilinx_hwicap/xilinx_hwicap.h</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/cdev.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c<br/>index 5ca1d80de182..71d2ac4e3f46 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/clocksource/acpi_pm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/clocksource/acpi_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/clocksource/acpi_pm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/clocksource/acpi_pm.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -151,13 +152,13 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE,</div><div class='ctx'>  */</div><div class='ctx'> static int verify_pmtmr_rate(void)</div><div class='ctx'> {</div><div class='del'>-	u32 value1, value2;</div><div class='add'>+	cycle_t value1, value2;</div><div class='ctx'> 	unsigned long count, delta;</div><div class='ctx'> </div><div class='ctx'> 	mach_prepare_counter();</div><div class='del'>-	value1 = read_pmtmr();</div><div class='add'>+	value1 = clocksource_acpi_pm.read();</div><div class='ctx'> 	mach_countup(&amp;count);</div><div class='del'>-	value2 = read_pmtmr();</div><div class='add'>+	value2 = clocksource_acpi_pm.read();</div><div class='ctx'> 	delta = (value2 - value1) &amp; ACPI_PM_MASK;</div><div class='ctx'> </div><div class='ctx'> 	/* Check that the PMTMR delta is within 5% of what we expect */</div><div class='hunk'>@@ -175,10 +176,15 @@ static int verify_pmtmr_rate(void)</div><div class='ctx'> #define verify_pmtmr_rate() (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Number of monotonicity checks to perform during initialization */</div><div class='add'>+#define ACPI_PM_MONOTONICITY_CHECKS 10</div><div class='add'>+/* Number of reads we try to get two different values */</div><div class='add'>+#define ACPI_PM_READ_CHECKS 10000</div><div class='add'>+</div><div class='ctx'> static int __init init_acpi_pm_clocksource(void)</div><div class='ctx'> {</div><div class='del'>-	u32 value1, value2;</div><div class='del'>-	unsigned int i;</div><div class='add'>+	cycle_t value1, value2;</div><div class='add'>+	unsigned int i, j = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!pmtmr_ioport)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -187,24 +193,29 @@ static int __init init_acpi_pm_clocksource(void)</div><div class='ctx'> 						clocksource_acpi_pm.shift);</div><div class='ctx'> </div><div class='ctx'> 	/* "verify" this timing source: */</div><div class='del'>-	value1 = read_pmtmr();</div><div class='del'>-	for (i = 0; i &lt; 10000; i++) {</div><div class='del'>-		value2 = read_pmtmr();</div><div class='del'>-		if (value2 == value1)</div><div class='del'>-			continue;</div><div class='del'>-		if (value2 &gt; value1)</div><div class='del'>-			goto pm_good;</div><div class='del'>-		if ((value2 &lt; value1) &amp;&amp; ((value2) &lt; 0xFFF))</div><div class='del'>-			goto pm_good;</div><div class='del'>-		printk(KERN_INFO "PM-Timer had inconsistent results:"</div><div class='del'>-			" 0x%#x, 0x%#x - aborting.\n", value1, value2);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	for (j = 0; j &lt; ACPI_PM_MONOTONICITY_CHECKS; j++) {</div><div class='add'>+		udelay(100 * j);</div><div class='add'>+		value1 = clocksource_acpi_pm.read();</div><div class='add'>+		for (i = 0; i &lt; ACPI_PM_READ_CHECKS; i++) {</div><div class='add'>+			value2 = clocksource_acpi_pm.read();</div><div class='add'>+			if (value2 == value1)</div><div class='add'>+				continue;</div><div class='add'>+			if (value2 &gt; value1)</div><div class='add'>+				break;</div><div class='add'>+			if ((value2 &lt; value1) &amp;&amp; ((value2) &lt; 0xFFF))</div><div class='add'>+				break;</div><div class='add'>+			printk(KERN_INFO "PM-Timer had inconsistent results:"</div><div class='add'>+			       " 0x%#llx, 0x%#llx - aborting.\n",</div><div class='add'>+			       value1, value2);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (i == ACPI_PM_READ_CHECKS) {</div><div class='add'>+			printk(KERN_INFO "PM-Timer failed consistency check "</div><div class='add'>+			       " (0x%#llx) - aborting.\n", value1);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_INFO "PM-Timer had no reasonable result:"</div><div class='del'>-			" 0x%#x - aborting.\n", value1);</div><div class='del'>-	return -ENODEV;</div><div class='ctx'> </div><div class='del'>-pm_good:</div><div class='ctx'> 	if (verify_pmtmr_rate() != 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c<br/>index 8d6a3ff02672..8a67f16987db 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/cpufreq/cpufreq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/cpufreq/cpufreq.c</a></div><div class='hunk'>@@ -825,6 +825,9 @@ static int cpufreq_add_dev(struct sys_device *sys_dev)</div><div class='ctx'> 	policy-&gt;user_policy.min = policy-&gt;cpuinfo.min_freq;</div><div class='ctx'> 	policy-&gt;user_policy.max = policy-&gt;cpuinfo.max_freq;</div><div class='ctx'> </div><div class='add'>+	blocking_notifier_call_chain(&amp;cpufreq_policy_notifier_list,</div><div class='add'>+				     CPUFREQ_START, policy);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c<br/>index fe565ee43757..ac0bbf2d234f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq_conservative.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/cpufreq/cpufreq_conservative.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq_conservative.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/cpufreq/cpufreq_conservative.c</a></div><div class='hunk'>@@ -333,7 +333,7 @@ static void dbs_check_cpu(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int idle_ticks, up_idle_ticks, down_idle_ticks;</div><div class='ctx'> 	unsigned int tmp_idle_ticks, total_idle_ticks;</div><div class='del'>-	unsigned int freq_step;</div><div class='add'>+	unsigned int freq_target;</div><div class='ctx'> 	unsigned int freq_down_sampling_rate;</div><div class='ctx'> 	struct cpu_dbs_info_s *this_dbs_info = &amp;per_cpu(cpu_dbs_info, cpu);</div><div class='ctx'> 	struct cpufreq_policy *policy;</div><div class='hunk'>@@ -383,13 +383,13 @@ static void dbs_check_cpu(int cpu)</div><div class='ctx'> 		if (this_dbs_info-&gt;requested_freq == policy-&gt;max)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-		freq_step = (dbs_tuners_ins.freq_step * policy-&gt;max) / 100;</div><div class='add'>+		freq_target = (dbs_tuners_ins.freq_step * policy-&gt;max) / 100;</div><div class='ctx'> </div><div class='ctx'> 		/* max freq cannot be less than 100. But who knows.... */</div><div class='del'>-		if (unlikely(freq_step == 0))</div><div class='del'>-			freq_step = 5;</div><div class='add'>+		if (unlikely(freq_target == 0))</div><div class='add'>+			freq_target = 5;</div><div class='ctx'> </div><div class='del'>-		this_dbs_info-&gt;requested_freq += freq_step;</div><div class='add'>+		this_dbs_info-&gt;requested_freq += freq_target;</div><div class='ctx'> 		if (this_dbs_info-&gt;requested_freq &gt; policy-&gt;max)</div><div class='ctx'> 			this_dbs_info-&gt;requested_freq = policy-&gt;max;</div><div class='ctx'> </div><div class='hunk'>@@ -425,19 +425,19 @@ static void dbs_check_cpu(int cpu)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * if we are already at the lowest speed then break out early</div><div class='ctx'> 		 * or if we 'cannot' reduce the speed as the user might want</div><div class='del'>-		 * freq_step to be zero</div><div class='add'>+		 * freq_target to be zero</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (this_dbs_info-&gt;requested_freq == policy-&gt;min</div><div class='ctx'> 				|| dbs_tuners_ins.freq_step == 0)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-		freq_step = (dbs_tuners_ins.freq_step * policy-&gt;max) / 100;</div><div class='add'>+		freq_target = (dbs_tuners_ins.freq_step * policy-&gt;max) / 100;</div><div class='ctx'> </div><div class='ctx'> 		/* max freq cannot be less than 100. But who knows.... */</div><div class='del'>-		if (unlikely(freq_step == 0))</div><div class='del'>-			freq_step = 5;</div><div class='add'>+		if (unlikely(freq_target == 0))</div><div class='add'>+			freq_target = 5;</div><div class='ctx'> </div><div class='del'>-		this_dbs_info-&gt;requested_freq -= freq_step;</div><div class='add'>+		this_dbs_info-&gt;requested_freq -= freq_target;</div><div class='ctx'> 		if (this_dbs_info-&gt;requested_freq &lt; policy-&gt;min)</div><div class='ctx'> 			this_dbs_info-&gt;requested_freq = policy-&gt;min;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c<br/>index ba7b9a6b17a1..a4bec3f919aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpuidle/governors/ladder.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/cpuidle/governors/ladder.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpuidle/governors/ladder.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/cpuidle/governors/ladder.c</a></div><div class='hunk'>@@ -67,10 +67,17 @@ static int ladder_select_state(struct cpuidle_device *dev)</div><div class='ctx'> 	struct ladder_device *ldev = &amp;__get_cpu_var(ladder_devices);</div><div class='ctx'> 	struct ladder_device_state *last_state;</div><div class='ctx'> 	int last_residency, last_idx = ldev-&gt;last_state_idx;</div><div class='add'>+	int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!ldev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* Special case when user has set very strict latency requirement */</div><div class='add'>+	if (unlikely(latency_req == 0)) {</div><div class='add'>+		ladder_do_selection(ldev, last_idx, 0);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	last_state = &amp;ldev-&gt;states[last_idx];</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;states[last_idx].flags &amp; CPUIDLE_FLAG_TIME_VALID)</div><div class='hunk'>@@ -81,8 +88,7 @@ static int ladder_select_state(struct cpuidle_device *dev)</div><div class='ctx'> 	/* consider promotion */</div><div class='ctx'> 	if (last_idx &lt; dev-&gt;state_count - 1 &amp;&amp;</div><div class='ctx'> 	    last_residency &gt; last_state-&gt;threshold.promotion_time &amp;&amp;</div><div class='del'>-	    dev-&gt;states[last_idx + 1].exit_latency &lt;=</div><div class='del'>-			pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)) {</div><div class='add'>+	    dev-&gt;states[last_idx + 1].exit_latency &lt;= latency_req) {</div><div class='ctx'> 		last_state-&gt;stats.promotion_count++;</div><div class='ctx'> 		last_state-&gt;stats.demotion_count = 0;</div><div class='ctx'> 		if (last_state-&gt;stats.promotion_count &gt;= last_state-&gt;threshold.promotion_count) {</div><div class='hunk'>@@ -92,7 +98,19 @@ static int ladder_select_state(struct cpuidle_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* consider demotion */</div><div class='del'>-	if (last_idx &gt; 0 &amp;&amp;</div><div class='add'>+	if (last_idx &gt; CPUIDLE_DRIVER_STATE_START &amp;&amp;</div><div class='add'>+	    dev-&gt;states[last_idx].exit_latency &gt; latency_req) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = last_idx - 1; i &gt; CPUIDLE_DRIVER_STATE_START; i--) {</div><div class='add'>+			if (dev-&gt;states[i].exit_latency &lt;= latency_req)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		ladder_do_selection(ldev, last_idx, i);</div><div class='add'>+		return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (last_idx &gt; CPUIDLE_DRIVER_STATE_START &amp;&amp;</div><div class='ctx'> 	    last_residency &lt; last_state-&gt;threshold.demotion_time) {</div><div class='ctx'> 		last_state-&gt;stats.demotion_count++;</div><div class='ctx'> 		last_state-&gt;stats.promotion_count = 0;</div><div class='hunk'>@@ -117,7 +135,7 @@ static int ladder_enable_device(struct cpuidle_device *dev)</div><div class='ctx'> 	struct ladder_device_state *lstate;</div><div class='ctx'> 	struct cpuidle_state *state;</div><div class='ctx'> </div><div class='del'>-	ldev-&gt;last_state_idx = 0;</div><div class='add'>+	ldev-&gt;last_state_idx = CPUIDLE_DRIVER_STATE_START;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;state_count; i++) {</div><div class='ctx'> 		state = &amp;dev-&gt;states[i];</div><div class='head'>diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c<br/>index 78d77c5dc35c..8d7cf3f31450 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpuidle/governors/menu.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/cpuidle/governors/menu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpuidle/governors/menu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/cpuidle/governors/menu.c</a></div><div class='hunk'>@@ -34,21 +34,28 @@ static DEFINE_PER_CPU(struct menu_device, menu_devices);</div><div class='ctx'> static int menu_select(struct cpuidle_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct menu_device *data = &amp;__get_cpu_var(menu_devices);</div><div class='add'>+	int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	/* Special case when user has set very strict latency requirement */</div><div class='add'>+	if (unlikely(latency_req == 0)) {</div><div class='add'>+		data-&gt;last_state_idx = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* determine the expected residency time */</div><div class='ctx'> 	data-&gt;expected_us =</div><div class='ctx'> 		(u32) ktime_to_ns(tick_nohz_get_sleep_length()) / 1000;</div><div class='ctx'> </div><div class='ctx'> 	/* find the deepest idle state that satisfies our constraints */</div><div class='del'>-	for (i = 1; i &lt; dev-&gt;state_count; i++) {</div><div class='add'>+	for (i = CPUIDLE_DRIVER_STATE_START + 1; i &lt; dev-&gt;state_count; i++) {</div><div class='ctx'> 		struct cpuidle_state *s = &amp;dev-&gt;states[i];</div><div class='ctx'> </div><div class='ctx'> 		if (s-&gt;target_residency &gt; data-&gt;expected_us)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (s-&gt;target_residency &gt; data-&gt;predicted_us)</div><div class='ctx'> 			break;</div><div class='del'>-		if (s-&gt;exit_latency &gt; pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY))</div><div class='add'>+		if (s-&gt;exit_latency &gt; latency_req)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -67,9 +74,9 @@ static void menu_reflect(struct cpuidle_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct menu_device *data = &amp;__get_cpu_var(menu_devices);</div><div class='ctx'> 	int last_idx = data-&gt;last_state_idx;</div><div class='del'>-	unsigned int measured_us =</div><div class='del'>-		cpuidle_get_last_residency(dev) + data-&gt;elapsed_us;</div><div class='add'>+	unsigned int last_idle_us = cpuidle_get_last_residency(dev);</div><div class='ctx'> 	struct cpuidle_state *target = &amp;dev-&gt;states[last_idx];</div><div class='add'>+	unsigned int measured_us;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ugh, this idle state doesn't support residency measurements, so we</div><div class='hunk'>@@ -77,20 +84,27 @@ static void menu_reflect(struct cpuidle_device *dev)</div><div class='ctx'> 	 * for one full standard timer tick.  However, be aware that this</div><div class='ctx'> 	 * could potentially result in a suboptimal state transition.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(target-&gt;flags &amp; CPUIDLE_FLAG_TIME_VALID))</div><div class='del'>-		measured_us = USEC_PER_SEC / HZ;</div><div class='add'>+	if (unlikely(!(target-&gt;flags &amp; CPUIDLE_FLAG_TIME_VALID)))</div><div class='add'>+		last_idle_us = USEC_PER_SEC / HZ;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * measured_us and elapsed_us are the cumulative idle time, since the</div><div class='add'>+	 * last time we were woken out of idle by an interrupt.</div><div class='add'>+	 */</div><div class='add'>+	if (data-&gt;elapsed_us &lt;= data-&gt;elapsed_us + last_idle_us)</div><div class='add'>+		measured_us = data-&gt;elapsed_us + last_idle_us;</div><div class='add'>+	else</div><div class='add'>+		measured_us = -1;</div><div class='add'>+</div><div class='add'>+	/* Predict time until next break event */</div><div class='add'>+	data-&gt;predicted_us = max(measured_us, data-&gt;last_measured_us);</div><div class='ctx'> </div><div class='del'>-	/* Predict time remaining until next break event */</div><div class='del'>-	if (measured_us + BREAK_FUZZ &lt; data-&gt;expected_us - target-&gt;exit_latency) {</div><div class='del'>-		data-&gt;predicted_us = max(measured_us, data-&gt;last_measured_us);</div><div class='add'>+	if (last_idle_us + BREAK_FUZZ &lt;</div><div class='add'>+	    data-&gt;expected_us - target-&gt;exit_latency) {</div><div class='ctx'> 		data-&gt;last_measured_us = measured_us;</div><div class='ctx'> 		data-&gt;elapsed_us = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (data-&gt;elapsed_us &lt; data-&gt;elapsed_us + measured_us)</div><div class='del'>-			data-&gt;elapsed_us = measured_us;</div><div class='del'>-		else</div><div class='del'>-			data-&gt;elapsed_us = -1;</div><div class='del'>-		data-&gt;predicted_us = max(measured_us, data-&gt;last_measured_us);</div><div class='add'>+		data-&gt;elapsed_us = measured_us;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c<br/>index 31a0e0b455b6..97b003839fb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpuidle/sysfs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/cpuidle/sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpuidle/sysfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/cpuidle/sysfs.c</a></div><div class='hunk'>@@ -21,8 +21,8 @@ static int __init cpuidle_sysfs_setup(char *unused)</div><div class='ctx'> }</div><div class='ctx'> __setup("cpuidle_sysfs_switch", cpuidle_sysfs_setup);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_available_governors(struct sys_device *dev,</div><div class='del'>-		struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_available_governors(struct sysdev_class *class,</div><div class='add'>+					char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t i = 0;</div><div class='ctx'> 	struct cpuidle_governor *tmp;</div><div class='hunk'>@@ -40,8 +40,8 @@ out:</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_current_driver(struct sys_device *dev,</div><div class='del'>-		struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_current_driver(struct sysdev_class *class,</div><div class='add'>+				   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='hunk'>@@ -55,8 +55,8 @@ static ssize_t show_current_driver(struct sys_device *dev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_current_governor(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_current_governor(struct sysdev_class *class,</div><div class='add'>+				     char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='hunk'>@@ -70,9 +70,8 @@ static ssize_t show_current_governor(struct sys_device *dev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_current_governor(struct sys_device *dev,</div><div class='del'>-	struct sysdev_attribute *attr,</div><div class='del'>-	const char *buf, size_t count)</div><div class='add'>+static ssize_t store_current_governor(struct sysdev_class *class,</div><div class='add'>+				      const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	char gov_name[CPUIDLE_NAME_LEN];</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='hunk'>@@ -104,8 +103,9 @@ static ssize_t store_current_governor(struct sys_device *dev,</div><div class='ctx'> 		return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(current_driver, 0444, show_current_driver, NULL);</div><div class='del'>-static SYSDEV_ATTR(current_governor_ro, 0444, show_current_governor, NULL);</div><div class='add'>+static SYSDEV_CLASS_ATTR(current_driver, 0444, show_current_driver, NULL);</div><div class='add'>+static SYSDEV_CLASS_ATTR(current_governor_ro, 0444, show_current_governor,</div><div class='add'>+			 NULL);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *cpuclass_default_attrs[] = {</div><div class='ctx'> 	&amp;attr_current_driver.attr,</div><div class='hunk'>@@ -113,9 +113,10 @@ static struct attribute *cpuclass_default_attrs[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(available_governors, 0444, show_available_governors, NULL);</div><div class='del'>-static SYSDEV_ATTR(current_governor, 0644, show_current_governor,</div><div class='del'>-	store_current_governor);</div><div class='add'>+static SYSDEV_CLASS_ATTR(available_governors, 0444, show_available_governors,</div><div class='add'>+			 NULL);</div><div class='add'>+static SYSDEV_CLASS_ATTR(current_governor, 0644, show_current_governor,</div><div class='add'>+			 store_current_governor);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *cpuclass_switch_attrs[] = {</div><div class='ctx'> 	&amp;attr_available_governors.attr,</div><div class='head'>diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c<br/>index 42a107fe9233..2d637e0fbc03 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/ixp4xx_crypto.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/crypto/ixp4xx_crypto.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/ixp4xx_crypto.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/crypto/ixp4xx_crypto.c</a></div><div class='hunk'>@@ -27,8 +27,8 @@</div><div class='ctx'> #include &lt;crypto/authenc.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/npe.h&gt;</div><div class='del'>-#include &lt;asm/arch/qmgr.h&gt;</div><div class='add'>+#include &lt;mach/npe.h&gt;</div><div class='add'>+#include &lt;mach/qmgr.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MAX_KEYLEN 32</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c<br/>index 54a2a166e566..bf2917d197a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/padlock-aes.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/crypto/padlock-aes.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/padlock-aes.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/crypto/padlock-aes.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;asm/i387.h&gt;</div><div class='ctx'> #include "padlock.h"</div><div class='ctx'> </div><div class='ctx'> /* Control word. */</div><div class='hunk'>@@ -141,6 +142,12 @@ static inline void padlock_reset_key(void)</div><div class='ctx'> 	asm volatile ("pushfl; popfl");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * While the padlock instructions don't use FP/SSE registers, they</div><div class='add'>+ * generate a spurious DNA fault when cr0.ts is '1'. These instructions</div><div class='add'>+ * should be used only inside the irq_ts_save/restore() context</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> static inline void padlock_xcrypt(const u8 *input, u8 *output, void *key,</div><div class='ctx'> 				  void *control_word)</div><div class='ctx'> {</div><div class='hunk'>@@ -205,15 +212,23 @@ static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key,</div><div class='ctx'> static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='ctx'> 	struct aes_ctx *ctx = aes_ctx(tfm);</div><div class='add'>+	int ts_state;</div><div class='ctx'> 	padlock_reset_key();</div><div class='add'>+</div><div class='add'>+	ts_state = irq_ts_save();</div><div class='ctx'> 	aes_crypt(in, out, ctx-&gt;E, &amp;ctx-&gt;cword.encrypt);</div><div class='add'>+	irq_ts_restore(ts_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='ctx'> 	struct aes_ctx *ctx = aes_ctx(tfm);</div><div class='add'>+	int ts_state;</div><div class='ctx'> 	padlock_reset_key();</div><div class='add'>+</div><div class='add'>+	ts_state = irq_ts_save();</div><div class='ctx'> 	aes_crypt(in, out, ctx-&gt;D, &amp;ctx-&gt;cword.decrypt);</div><div class='add'>+	irq_ts_restore(ts_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct crypto_alg aes_alg = {</div><div class='hunk'>@@ -244,12 +259,14 @@ static int ecb_aes_encrypt(struct blkcipher_desc *desc,</div><div class='ctx'> 	struct aes_ctx *ctx = blk_aes_ctx(desc-&gt;tfm);</div><div class='ctx'> 	struct blkcipher_walk walk;</div><div class='ctx'> 	int err;</div><div class='add'>+	int ts_state;</div><div class='ctx'> </div><div class='ctx'> 	padlock_reset_key();</div><div class='ctx'> </div><div class='ctx'> 	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='ctx'> 	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='ctx'> </div><div class='add'>+	ts_state = irq_ts_save();</div><div class='ctx'> 	while ((nbytes = walk.nbytes)) {</div><div class='ctx'> 		padlock_xcrypt_ecb(walk.src.virt.addr, walk.dst.virt.addr,</div><div class='ctx'> 				   ctx-&gt;E, &amp;ctx-&gt;cword.encrypt,</div><div class='hunk'>@@ -257,6 +274,7 @@ static int ecb_aes_encrypt(struct blkcipher_desc *desc,</div><div class='ctx'> 		nbytes &amp;= AES_BLOCK_SIZE - 1;</div><div class='ctx'> 		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='ctx'> 	}</div><div class='add'>+	irq_ts_restore(ts_state);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -268,12 +286,14 @@ static int ecb_aes_decrypt(struct blkcipher_desc *desc,</div><div class='ctx'> 	struct aes_ctx *ctx = blk_aes_ctx(desc-&gt;tfm);</div><div class='ctx'> 	struct blkcipher_walk walk;</div><div class='ctx'> 	int err;</div><div class='add'>+	int ts_state;</div><div class='ctx'> </div><div class='ctx'> 	padlock_reset_key();</div><div class='ctx'> </div><div class='ctx'> 	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='ctx'> 	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='ctx'> </div><div class='add'>+	ts_state = irq_ts_save();</div><div class='ctx'> 	while ((nbytes = walk.nbytes)) {</div><div class='ctx'> 		padlock_xcrypt_ecb(walk.src.virt.addr, walk.dst.virt.addr,</div><div class='ctx'> 				   ctx-&gt;D, &amp;ctx-&gt;cword.decrypt,</div><div class='hunk'>@@ -281,7 +301,7 @@ static int ecb_aes_decrypt(struct blkcipher_desc *desc,</div><div class='ctx'> 		nbytes &amp;= AES_BLOCK_SIZE - 1;</div><div class='ctx'> 		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	irq_ts_restore(ts_state);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -314,12 +334,14 @@ static int cbc_aes_encrypt(struct blkcipher_desc *desc,</div><div class='ctx'> 	struct aes_ctx *ctx = blk_aes_ctx(desc-&gt;tfm);</div><div class='ctx'> 	struct blkcipher_walk walk;</div><div class='ctx'> 	int err;</div><div class='add'>+	int ts_state;</div><div class='ctx'> </div><div class='ctx'> 	padlock_reset_key();</div><div class='ctx'> </div><div class='ctx'> 	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='ctx'> 	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='ctx'> </div><div class='add'>+	ts_state = irq_ts_save();</div><div class='ctx'> 	while ((nbytes = walk.nbytes)) {</div><div class='ctx'> 		u8 *iv = padlock_xcrypt_cbc(walk.src.virt.addr,</div><div class='ctx'> 					    walk.dst.virt.addr, ctx-&gt;E,</div><div class='hunk'>@@ -329,6 +351,7 @@ static int cbc_aes_encrypt(struct blkcipher_desc *desc,</div><div class='ctx'> 		nbytes &amp;= AES_BLOCK_SIZE - 1;</div><div class='ctx'> 		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='ctx'> 	}</div><div class='add'>+	irq_ts_restore(ts_state);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -340,12 +363,14 @@ static int cbc_aes_decrypt(struct blkcipher_desc *desc,</div><div class='ctx'> 	struct aes_ctx *ctx = blk_aes_ctx(desc-&gt;tfm);</div><div class='ctx'> 	struct blkcipher_walk walk;</div><div class='ctx'> 	int err;</div><div class='add'>+	int ts_state;</div><div class='ctx'> </div><div class='ctx'> 	padlock_reset_key();</div><div class='ctx'> </div><div class='ctx'> 	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='ctx'> 	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='ctx'> </div><div class='add'>+	ts_state = irq_ts_save();</div><div class='ctx'> 	while ((nbytes = walk.nbytes)) {</div><div class='ctx'> 		padlock_xcrypt_cbc(walk.src.virt.addr, walk.dst.virt.addr,</div><div class='ctx'> 				   ctx-&gt;D, walk.iv, &amp;ctx-&gt;cword.decrypt,</div><div class='hunk'>@@ -354,6 +379,7 @@ static int cbc_aes_decrypt(struct blkcipher_desc *desc,</div><div class='ctx'> 		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	irq_ts_restore(ts_state);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c<br/>index 40d5680fa013..a7fbadebf623 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/padlock-sha.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/crypto/padlock-sha.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/padlock-sha.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/crypto/padlock-sha.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;asm/i387.h&gt;</div><div class='ctx'> #include "padlock.h"</div><div class='ctx'> </div><div class='ctx'> #define SHA1_DEFAULT_FALLBACK	"sha1-generic"</div><div class='hunk'>@@ -102,6 +103,7 @@ static void padlock_do_sha1(const char *in, char *out, int count)</div><div class='ctx'> 	 *     PadLock microcode needs it that big. */</div><div class='ctx'> 	char buf[128+16];</div><div class='ctx'> 	char *result = NEAREST_ALIGNED(buf);</div><div class='add'>+	int ts_state;</div><div class='ctx'> </div><div class='ctx'> 	((uint32_t *)result)[0] = SHA1_H0;</div><div class='ctx'> 	((uint32_t *)result)[1] = SHA1_H1;</div><div class='hunk'>@@ -109,9 +111,12 @@ static void padlock_do_sha1(const char *in, char *out, int count)</div><div class='ctx'> 	((uint32_t *)result)[3] = SHA1_H3;</div><div class='ctx'> 	((uint32_t *)result)[4] = SHA1_H4;</div><div class='ctx'>  </div><div class='add'>+	/* prevent taking the spurious DNA fault with padlock. */</div><div class='add'>+	ts_state = irq_ts_save();</div><div class='ctx'> 	asm volatile (".byte 0xf3,0x0f,0xa6,0xc8" /* rep xsha1 */</div><div class='ctx'> 		      : "+S"(in), "+D"(result)</div><div class='ctx'> 		      : "c"(count), "a"(0));</div><div class='add'>+	irq_ts_restore(ts_state);</div><div class='ctx'> </div><div class='ctx'> 	padlock_output_block((uint32_t *)result, (uint32_t *)out, 5);</div><div class='ctx'> }</div><div class='hunk'>@@ -123,6 +128,7 @@ static void padlock_do_sha256(const char *in, char *out, int count)</div><div class='ctx'> 	 *     PadLock microcode needs it that big. */</div><div class='ctx'> 	char buf[128+16];</div><div class='ctx'> 	char *result = NEAREST_ALIGNED(buf);</div><div class='add'>+	int ts_state;</div><div class='ctx'> </div><div class='ctx'> 	((uint32_t *)result)[0] = SHA256_H0;</div><div class='ctx'> 	((uint32_t *)result)[1] = SHA256_H1;</div><div class='hunk'>@@ -133,9 +139,12 @@ static void padlock_do_sha256(const char *in, char *out, int count)</div><div class='ctx'> 	((uint32_t *)result)[6] = SHA256_H6;</div><div class='ctx'> 	((uint32_t *)result)[7] = SHA256_H7;</div><div class='ctx'> </div><div class='add'>+	/* prevent taking the spurious DNA fault with padlock. */</div><div class='add'>+	ts_state = irq_ts_save();</div><div class='ctx'> 	asm volatile (".byte 0xf3,0x0f,0xa6,0xd0" /* rep xsha256 */</div><div class='ctx'> 		      : "+S"(in), "+D"(result)</div><div class='ctx'> 		      : "c"(count), "a"(0));</div><div class='add'>+	irq_ts_restore(ts_state);</div><div class='ctx'> </div><div class='ctx'> 	padlock_output_block((uint32_t *)result, (uint32_t *)out, 8);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c<br/>index 681c15f42083..b6ad3ac5916e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/talitos.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/crypto/talitos.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/talitos.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/crypto/talitos.c</a></div><div class='hunk'>@@ -96,6 +96,9 @@ struct talitos_private {</div><div class='ctx'> 	unsigned int exec_units;</div><div class='ctx'> 	unsigned int desc_types;</div><div class='ctx'> </div><div class='add'>+	/* SEC Compatibility info */</div><div class='add'>+	unsigned long features;</div><div class='add'>+</div><div class='ctx'> 	/* next channel to be assigned next incoming descriptor */</div><div class='ctx'> 	atomic_t last_chan;</div><div class='ctx'> </div><div class='hunk'>@@ -133,6 +136,9 @@ struct talitos_private {</div><div class='ctx'> 	struct hwrng rng;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* .features flag */</div><div class='add'>+#define TALITOS_FTR_SRC_LINK_TBL_LEN_INCLUDES_EXTENT 0x00000001</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * map virtual single (contiguous) pointer to h/w descriptor pointer</div><div class='ctx'>  */</div><div class='hunk'>@@ -785,7 +791,7 @@ static void ipsec_esp_encrypt_done(struct device *dev,</div><div class='ctx'> 	/* copy the generated ICV to dst */</div><div class='ctx'> 	if (edesc-&gt;dma_len) {</div><div class='ctx'> 		icvdata = &amp;edesc-&gt;link_tbl[edesc-&gt;src_nents +</div><div class='del'>-					   edesc-&gt;dst_nents + 1];</div><div class='add'>+					   edesc-&gt;dst_nents + 2];</div><div class='ctx'> 		sg = sg_last(areq-&gt;dst, edesc-&gt;dst_nents);</div><div class='ctx'> 		memcpy((char *)sg_virt(sg) + sg-&gt;length - ctx-&gt;authsize,</div><div class='ctx'> 		       icvdata, ctx-&gt;authsize);</div><div class='hunk'>@@ -814,7 +820,7 @@ static void ipsec_esp_decrypt_done(struct device *dev,</div><div class='ctx'> 		/* auth check */</div><div class='ctx'> 		if (edesc-&gt;dma_len)</div><div class='ctx'> 			icvdata = &amp;edesc-&gt;link_tbl[edesc-&gt;src_nents +</div><div class='del'>-						   edesc-&gt;dst_nents + 1];</div><div class='add'>+						   edesc-&gt;dst_nents + 2];</div><div class='ctx'> 		else</div><div class='ctx'> 			icvdata = &amp;edesc-&gt;link_tbl[0];</div><div class='ctx'> </div><div class='hunk'>@@ -921,10 +927,30 @@ static int ipsec_esp(struct ipsec_esp_edesc *edesc, struct aead_request *areq,</div><div class='ctx'> 		sg_count = sg_to_link_tbl(areq-&gt;src, sg_count, cryptlen,</div><div class='ctx'> 					  &amp;edesc-&gt;link_tbl[0]);</div><div class='ctx'> 		if (sg_count &gt; 1) {</div><div class='add'>+			struct talitos_ptr *link_tbl_ptr =</div><div class='add'>+				&amp;edesc-&gt;link_tbl[sg_count-1];</div><div class='add'>+			struct scatterlist *sg;</div><div class='add'>+			struct talitos_private *priv = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='ctx'> 			desc-&gt;ptr[4].j_extent |= DESC_PTR_LNKTBL_JUMP;</div><div class='ctx'> 			desc-&gt;ptr[4].ptr = cpu_to_be32(edesc-&gt;dma_link_tbl);</div><div class='ctx'> 			dma_sync_single_for_device(ctx-&gt;dev, edesc-&gt;dma_link_tbl,</div><div class='ctx'> 						   edesc-&gt;dma_len, DMA_BIDIRECTIONAL);</div><div class='add'>+			/* If necessary for this SEC revision,</div><div class='add'>+			 * add a link table entry for ICV.</div><div class='add'>+			 */</div><div class='add'>+			if ((priv-&gt;features &amp;</div><div class='add'>+			     TALITOS_FTR_SRC_LINK_TBL_LEN_INCLUDES_EXTENT) &amp;&amp;</div><div class='add'>+			    (edesc-&gt;desc.hdr &amp; DESC_HDR_MODE0_ENCRYPT) == 0) {</div><div class='add'>+				link_tbl_ptr-&gt;j_extent = 0;</div><div class='add'>+				link_tbl_ptr++;</div><div class='add'>+				link_tbl_ptr-&gt;j_extent = DESC_PTR_LNKTBL_RETURN;</div><div class='add'>+				link_tbl_ptr-&gt;len = cpu_to_be16(authsize);</div><div class='add'>+				sg = sg_last(areq-&gt;src, edesc-&gt;src_nents ? : 1);</div><div class='add'>+				link_tbl_ptr-&gt;ptr = cpu_to_be32(</div><div class='add'>+						(char *)sg_dma_address(sg)</div><div class='add'>+						+ sg-&gt;length - authsize);</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Only one segment now, so no link tbl needed */</div><div class='ctx'> 			desc-&gt;ptr[4].ptr = cpu_to_be32(sg_dma_address(areq-&gt;src));</div><div class='hunk'>@@ -944,12 +970,11 @@ static int ipsec_esp(struct ipsec_esp_edesc *edesc, struct aead_request *areq,</div><div class='ctx'> 		desc-&gt;ptr[5].ptr = cpu_to_be32(sg_dma_address(areq-&gt;dst));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct talitos_ptr *link_tbl_ptr =</div><div class='del'>-			&amp;edesc-&gt;link_tbl[edesc-&gt;src_nents];</div><div class='del'>-		struct scatterlist *sg;</div><div class='add'>+			&amp;edesc-&gt;link_tbl[edesc-&gt;src_nents + 1];</div><div class='ctx'> </div><div class='ctx'> 		desc-&gt;ptr[5].ptr = cpu_to_be32((struct talitos_ptr *)</div><div class='ctx'> 					       edesc-&gt;dma_link_tbl +</div><div class='del'>-					       edesc-&gt;src_nents);</div><div class='add'>+					       edesc-&gt;src_nents + 1);</div><div class='ctx'> 		if (areq-&gt;src == areq-&gt;dst) {</div><div class='ctx'> 			memcpy(link_tbl_ptr, &amp;edesc-&gt;link_tbl[0],</div><div class='ctx'> 			       edesc-&gt;src_nents * sizeof(struct talitos_ptr));</div><div class='hunk'>@@ -957,14 +982,10 @@ static int ipsec_esp(struct ipsec_esp_edesc *edesc, struct aead_request *areq,</div><div class='ctx'> 			sg_count = sg_to_link_tbl(areq-&gt;dst, sg_count, cryptlen,</div><div class='ctx'> 						  link_tbl_ptr);</div><div class='ctx'> 		}</div><div class='add'>+		/* Add an entry to the link table for ICV data */</div><div class='ctx'> 		link_tbl_ptr += sg_count - 1;</div><div class='del'>-</div><div class='del'>-		/* handle case where sg_last contains the ICV exclusively */</div><div class='del'>-		sg = sg_last(areq-&gt;dst, edesc-&gt;dst_nents);</div><div class='del'>-		if (sg-&gt;length == ctx-&gt;authsize)</div><div class='del'>-			link_tbl_ptr--;</div><div class='del'>-</div><div class='ctx'> 		link_tbl_ptr-&gt;j_extent = 0;</div><div class='add'>+		sg_count++;</div><div class='ctx'> 		link_tbl_ptr++;</div><div class='ctx'> 		link_tbl_ptr-&gt;j_extent = DESC_PTR_LNKTBL_RETURN;</div><div class='ctx'> 		link_tbl_ptr-&gt;len = cpu_to_be16(authsize);</div><div class='hunk'>@@ -973,7 +994,7 @@ static int ipsec_esp(struct ipsec_esp_edesc *edesc, struct aead_request *areq,</div><div class='ctx'> 		link_tbl_ptr-&gt;ptr = cpu_to_be32((struct talitos_ptr *)</div><div class='ctx'> 						edesc-&gt;dma_link_tbl +</div><div class='ctx'> 					        edesc-&gt;src_nents +</div><div class='del'>-						edesc-&gt;dst_nents + 1);</div><div class='add'>+						edesc-&gt;dst_nents + 2);</div><div class='ctx'> </div><div class='ctx'> 		desc-&gt;ptr[5].j_extent |= DESC_PTR_LNKTBL_JUMP;</div><div class='ctx'> 		dma_sync_single_for_device(ctx-&gt;dev, edesc-&gt;dma_link_tbl,</div><div class='hunk'>@@ -1040,12 +1061,12 @@ static struct ipsec_esp_edesc *ipsec_esp_edesc_alloc(struct aead_request *areq,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * allocate space for base edesc plus the link tables,</div><div class='del'>-	 * allowing for a separate entry for the generated ICV (+ 1),</div><div class='add'>+	 * allowing for two separate entries for ICV and generated ICV (+ 2),</div><div class='ctx'> 	 * and the ICV data itself</div><div class='ctx'> 	 */</div><div class='ctx'> 	alloc_len = sizeof(struct ipsec_esp_edesc);</div><div class='ctx'> 	if (src_nents || dst_nents) {</div><div class='del'>-		dma_len = (src_nents + dst_nents + 1) *</div><div class='add'>+		dma_len = (src_nents + dst_nents + 2) *</div><div class='ctx'> 				 sizeof(struct talitos_ptr) + ctx-&gt;authsize;</div><div class='ctx'> 		alloc_len += dma_len;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1104,7 +1125,7 @@ static int aead_authenc_decrypt(struct aead_request *req)</div><div class='ctx'> 	/* stash incoming ICV for later cmp with ICV generated by the h/w */</div><div class='ctx'> 	if (edesc-&gt;dma_len)</div><div class='ctx'> 		icvdata = &amp;edesc-&gt;link_tbl[edesc-&gt;src_nents +</div><div class='del'>-					   edesc-&gt;dst_nents + 1];</div><div class='add'>+					   edesc-&gt;dst_nents + 2];</div><div class='ctx'> 	else</div><div class='ctx'> 		icvdata = &amp;edesc-&gt;link_tbl[0];</div><div class='ctx'> </div><div class='hunk'>@@ -1136,6 +1157,8 @@ static int aead_authenc_givencrypt(</div><div class='ctx'> 	edesc-&gt;desc.hdr = ctx-&gt;desc_hdr_template | DESC_HDR_MODE0_ENCRYPT;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(req-&gt;giv, ctx-&gt;iv, crypto_aead_ivsize(authenc));</div><div class='add'>+	/* avoid consecutive packets going out with same IV */</div><div class='add'>+	*(__be64 *)req-&gt;giv ^= cpu_to_be64(req-&gt;seq);</div><div class='ctx'> </div><div class='ctx'> 	return ipsec_esp(edesc, areq, req-&gt;giv, req-&gt;seq,</div><div class='ctx'> 			 ipsec_esp_encrypt_done);</div><div class='hunk'>@@ -1428,6 +1451,8 @@ static int talitos_probe(struct of_device *ofdev,</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;ofdev = ofdev;</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;alg_list);</div><div class='add'>+</div><div class='ctx'> 	tasklet_init(&amp;priv-&gt;done_task, talitos_done, (unsigned long)dev);</div><div class='ctx'> 	tasklet_init(&amp;priv-&gt;error_task, talitos_error, (unsigned long)dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1480,6 +1505,9 @@ static int talitos_probe(struct of_device *ofdev,</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (of_device_is_compatible(np, "fsl,sec3.0"))</div><div class='add'>+		priv-&gt;features |= TALITOS_FTR_SRC_LINK_TBL_LEN_INCLUDES_EXTENT;</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;head_lock = kmalloc(sizeof(spinlock_t) * priv-&gt;num_channels,</div><div class='ctx'> 				  GFP_KERNEL);</div><div class='ctx'> 	priv-&gt;tail_lock = kmalloc(sizeof(spinlock_t) * priv-&gt;num_channels,</div><div class='hunk'>@@ -1551,8 +1579,6 @@ static int talitos_probe(struct of_device *ofdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* register crypto algorithms the device supports */</div><div class='del'>-	INIT_LIST_HEAD(&amp;priv-&gt;alg_list);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(driver_algs); i++) {</div><div class='ctx'> 		if (hw_supports(dev, driver_algs[i].desc_hdr_template)) {</div><div class='ctx'> 			struct talitos_crypto_alg *t_alg;</div><div class='head'>diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c<br/>index a52156e56886..bc8c6e3470ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/ioat_dma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/dma/ioat_dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/ioat_dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/dma/ioat_dma.c</a></div><div class='hunk'>@@ -551,7 +551,7 @@ static dma_cookie_t ioat1_tx_submit(struct dma_async_tx_descriptor *tx)</div><div class='ctx'> 	/* write address into NextDescriptor field of last desc in chain */</div><div class='ctx'> 	to_ioat_desc(ioat_chan-&gt;used_desc.prev)-&gt;hw-&gt;next =</div><div class='ctx'> 							first-&gt;async_tx.phys;</div><div class='del'>-	__list_splice(&amp;new_chain, ioat_chan-&gt;used_desc.prev);</div><div class='add'>+	list_splice_tail(&amp;new_chain, &amp;ioat_chan-&gt;used_desc);</div><div class='ctx'> </div><div class='ctx'> 	ioat_chan-&gt;dmacount += desc_count;</div><div class='ctx'> 	ioat_chan-&gt;pending += desc_count;</div><div class='head'>diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c<br/>index 85bfeba4d85e..71fba82462cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/iop-adma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/dma/iop-adma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/iop-adma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/dma/iop-adma.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;linux/memory.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/adma.h&gt;</div><div class='add'>+#include &lt;mach/adma.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define to_iop_adma_chan(chan) container_of(chan, struct iop_adma_chan, common)</div><div class='ctx'> #define to_iop_adma_device(dev) \</div><div class='head'>diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c<br/>index a4e4494663bf..0328da020a10 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/mv_xor.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/dma/mv_xor.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/mv_xor.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/dma/mv_xor.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/memory.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/mv_xor.h&gt;</div><div class='add'>+#include &lt;plat/mv_xor.h&gt;</div><div class='ctx'> #include "mv_xor.h"</div><div class='ctx'> </div><div class='ctx'> static void mv_xor_issue_pending(struct dma_chan *chan);</div><div class='head'>diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h<br/>index b27b13c5eb5a..4b55ec607a88 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/edac_core.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/edac/edac_core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/edac_core.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/edac/edac_core.h</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define EDAC_MC_LABEL_LEN	31</div><div class='ctx'> #define EDAC_DEVICE_NAME_LEN	31</div><div class='head'>diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig<br/>index fa6d6abefd4d..450902438208 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/firewire/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/firewire/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/firewire/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/firewire/Kconfig</a></div><div class='hunk'>@@ -12,8 +12,8 @@ config FIREWIRE</div><div class='ctx'> 	  This is the "Juju" FireWire stack, a new alternative implementation</div><div class='ctx'> 	  designed for robustness and simplicity.  You can build either this</div><div class='ctx'> 	  stack, or the old stack (the ieee1394 driver, ohci1394 etc.) or both.</div><div class='del'>-	  Please read http://wiki.linux1394.org/JujuMigration before you</div><div class='del'>-	  enable the new stack.</div><div class='add'>+	  Please read http://ieee1394.wiki.kernel.org/index.php/Juju_Migration</div><div class='add'>+	  before you enable the new stack.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, say M here: the module will be</div><div class='ctx'> 	  called firewire-core.</div><div class='head'>diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c<br/>index bc81d6fcd2fd..2e6d5848d217 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/firewire/fw-cdev.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/firewire/fw-cdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/firewire/fw-cdev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/firewire/fw-cdev.c</a></div><div class='hunk'>@@ -369,22 +369,33 @@ complete_transaction(struct fw_card *card, int rcode,</div><div class='ctx'> 	struct response *response = data;</div><div class='ctx'> 	struct client *client = response-&gt;client;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	struct fw_cdev_event_response *r = &amp;response-&gt;response;</div><div class='ctx'> </div><div class='del'>-	if (length &lt; response-&gt;response.length)</div><div class='del'>-		response-&gt;response.length = length;</div><div class='add'>+	if (length &lt; r-&gt;length)</div><div class='add'>+		r-&gt;length = length;</div><div class='ctx'> 	if (rcode == RCODE_COMPLETE)</div><div class='del'>-		memcpy(response-&gt;response.data, payload,</div><div class='del'>-		       response-&gt;response.length);</div><div class='add'>+		memcpy(r-&gt;data, payload, r-&gt;length);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;client-&gt;lock, flags);</div><div class='ctx'> 	list_del(&amp;response-&gt;resource.link);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;client-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	response-&gt;response.type   = FW_CDEV_EVENT_RESPONSE;</div><div class='del'>-	response-&gt;response.rcode  = rcode;</div><div class='del'>-	queue_event(client, &amp;response-&gt;event, &amp;response-&gt;response,</div><div class='del'>-		    sizeof(response-&gt;response) + response-&gt;response.length,</div><div class='del'>-		    NULL, 0);</div><div class='add'>+	r-&gt;type   = FW_CDEV_EVENT_RESPONSE;</div><div class='add'>+	r-&gt;rcode  = rcode;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In the case that sizeof(*r) doesn't align with the position of the</div><div class='add'>+	 * data, and the read is short, preserve an extra copy of the data</div><div class='add'>+	 * to stay compatible with a pre-2.6.27 bug.  Since the bug is harmless</div><div class='add'>+	 * for short reads and some apps depended on it, this is both safe</div><div class='add'>+	 * and prudent for compatibility.</div><div class='add'>+	 */</div><div class='add'>+	if (r-&gt;length &lt;= sizeof(*r) - offsetof(typeof(*r), data))</div><div class='add'>+		queue_event(client, &amp;response-&gt;event, r, sizeof(*r),</div><div class='add'>+			    r-&gt;data, r-&gt;length);</div><div class='add'>+	else</div><div class='add'>+		queue_event(client, &amp;response-&gt;event, r, sizeof(*r) + r-&gt;length,</div><div class='add'>+			    NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ioctl_send_request(struct client *client, void *buffer)</div><div class='head'>diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c<br/>index 8024e3bfd877..b91ef63126ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/firmware/iscsi_ibft.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/firmware/iscsi_ibft.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/firmware/iscsi_ibft.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/firmware/iscsi_ibft.c</a></div><div class='hunk'>@@ -669,8 +669,7 @@ static int __init ibft_register_kobjects(struct ibft_table_header *header,</div><div class='ctx'> </div><div class='ctx'> 	control = (void *)header + sizeof(*header);</div><div class='ctx'> 	end = (void *)control + control-&gt;hdr.length;</div><div class='del'>-	eot_offset = (void *)header + header-&gt;length -</div><div class='del'>-		     (void *)control - sizeof(*header);</div><div class='add'>+	eot_offset = (void *)header + header-&gt;length - (void *)control;</div><div class='ctx'> 	rc = ibft_verify_hdr("control", (struct ibft_hdr *)control, id_control,</div><div class='ctx'> 			     sizeof(*control));</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c<br/>index 11f17440fea6..d53fbbfefa3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/firmware/iscsi_ibft_find.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/firmware/iscsi_ibft_find.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/firmware/iscsi_ibft_find.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/firmware/iscsi_ibft_find.c</a></div><div class='hunk'>@@ -81,4 +81,3 @@ void __init reserve_ibft_region(void)</div><div class='ctx'> 	if (ibft_addr)</div><div class='ctx'> 		reserve_bootmem(pos, PAGE_ALIGN(len), BOOTMEM_DEFAULT);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(reserve_ibft_region);</div><div class='head'>diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c<br/>index 001622eb86f9..3bf8ee120d42 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/firmware/memmap.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/firmware/memmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/firmware/memmap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/firmware/memmap.c</a></div><div class='hunk'>@@ -84,20 +84,23 @@ static struct kobj_type memmap_ktype = {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Firmware memory map entries</div><div class='add'>+ * Firmware memory map entries. No locking is needed because the</div><div class='add'>+ * firmware_map_add() and firmware_map_add_early() functions are called</div><div class='add'>+ * in firmware initialisation code in one single thread of execution.</div><div class='ctx'>  */</div><div class='ctx'> static LIST_HEAD(map_entries);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Common implementation of firmware_map_add() and firmware_map_add_early()</div><div class='del'>- * which expects a pre-allocated struct firmware_map_entry.</div><div class='del'>- *</div><div class='add'>+ * firmware_map_add_entry() - Does the real work to add a firmware memmap entry.</div><div class='ctx'>  * @start: Start of the memory range.</div><div class='ctx'>  * @end:   End of the memory range (inclusive).</div><div class='ctx'>  * @type:  Type of the memory range.</div><div class='ctx'>  * @entry: Pre-allocated (either kmalloc() or bootmem allocator), uninitialised</div><div class='ctx'>  *         entry.</div><div class='del'>- */</div><div class='add'>+ *</div><div class='add'>+ * Common implementation of firmware_map_add() and firmware_map_add_early()</div><div class='add'>+ * which expects a pre-allocated struct firmware_map_entry.</div><div class='add'>+ **/</div><div class='ctx'> static int firmware_map_add_entry(resource_size_t start, resource_size_t end,</div><div class='ctx'> 				  const char *type,</div><div class='ctx'> 				  struct firmware_map_entry *entry)</div><div class='hunk'>@@ -115,33 +118,52 @@ static int firmware_map_add_entry(resource_size_t start, resource_size_t end,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * See &lt;linux/firmware-map.h&gt; for documentation.</div><div class='del'>- */</div><div class='add'>+/**</div><div class='add'>+ * firmware_map_add() - Adds a firmware mapping entry.</div><div class='add'>+ * @start: Start of the memory range.</div><div class='add'>+ * @end:   End of the memory range (inclusive).</div><div class='add'>+ * @type:  Type of the memory range.</div><div class='add'>+ *</div><div class='add'>+ * This function uses kmalloc() for memory</div><div class='add'>+ * allocation. Use firmware_map_add_early() if you want to use the bootmem</div><div class='add'>+ * allocator.</div><div class='add'>+ *</div><div class='add'>+ * That function must be called before late_initcall.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, or -ENOMEM if no memory could be allocated.</div><div class='add'>+ **/</div><div class='ctx'> int firmware_map_add(resource_size_t start, resource_size_t end,</div><div class='ctx'> 		     const char *type)</div><div class='ctx'> {</div><div class='ctx'> 	struct firmware_map_entry *entry;</div><div class='ctx'> </div><div class='ctx'> 	entry = kmalloc(sizeof(struct firmware_map_entry), GFP_ATOMIC);</div><div class='del'>-	WARN_ON(!entry);</div><div class='ctx'> 	if (!entry)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	return firmware_map_add_entry(start, end, type, entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * See &lt;linux/firmware-map.h&gt; for documentation.</div><div class='del'>- */</div><div class='add'>+/**</div><div class='add'>+ * firmware_map_add_early() - Adds a firmware mapping entry.</div><div class='add'>+ * @start: Start of the memory range.</div><div class='add'>+ * @end:   End of the memory range (inclusive).</div><div class='add'>+ * @type:  Type of the memory range.</div><div class='add'>+ *</div><div class='add'>+ * Adds a firmware mapping entry. This function uses the bootmem allocator</div><div class='add'>+ * for memory allocation. Use firmware_map_add() if you want to use kmalloc().</div><div class='add'>+ *</div><div class='add'>+ * That function must be called before late_initcall.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, or -ENOMEM if no memory could be allocated.</div><div class='add'>+ **/</div><div class='ctx'> int __init firmware_map_add_early(resource_size_t start, resource_size_t end,</div><div class='ctx'> 				  const char *type)</div><div class='ctx'> {</div><div class='ctx'> 	struct firmware_map_entry *entry;</div><div class='ctx'> </div><div class='ctx'> 	entry = alloc_bootmem_low(sizeof(struct firmware_map_entry));</div><div class='del'>-	WARN_ON(!entry);</div><div class='del'>-	if (!entry)</div><div class='add'>+	if (WARN_ON(!entry))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	return firmware_map_add_entry(start, end, type, entry);</div><div class='hunk'>@@ -183,7 +205,10 @@ static ssize_t memmap_attr_show(struct kobject *kobj,</div><div class='ctx'> /*</div><div class='ctx'>  * Initialises stuff and adds the entries in the map_entries list to</div><div class='ctx'>  * sysfs. Important is that firmware_map_add() and firmware_map_add_early()</div><div class='del'>- * must be called before late_initcall.</div><div class='add'>+ * must be called before late_initcall. That's just because that function</div><div class='add'>+ * is called as late_initcall() function, which means that if you call</div><div class='add'>+ * firmware_map_add() or firmware_map_add_early() afterwards, the entries</div><div class='add'>+ * are not added to sysfs.</div><div class='ctx'>  */</div><div class='ctx'> static int __init memmap_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -192,13 +217,13 @@ static int __init memmap_init(void)</div><div class='ctx'> 	struct kset *memmap_kset;</div><div class='ctx'> </div><div class='ctx'> 	memmap_kset = kset_create_and_add("memmap", NULL, firmware_kobj);</div><div class='del'>-	WARN_ON(!memmap_kset);</div><div class='del'>-	if (!memmap_kset)</div><div class='add'>+	if (WARN_ON(!memmap_kset))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(entry, &amp;map_entries, list) {</div><div class='ctx'> 		entry-&gt;kobj.kset = memmap_kset;</div><div class='del'>-		kobject_add(&amp;entry-&gt;kobj, NULL, "%d", i++);</div><div class='add'>+		if (kobject_add(&amp;entry-&gt;kobj, NULL, "%d", i++))</div><div class='add'>+			kobject_put(&amp;entry-&gt;kobj);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c<br/>index 089c015c01d1..53f0e5af1cc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/gpu/drm/drm_irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/gpu/drm/drm_irq.c</a></div><div class='hunk'>@@ -400,27 +400,31 @@ static void drm_locked_tasklet_func(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_device *dev = (struct drm_device *)data;</div><div class='ctx'> 	unsigned long irqflags;</div><div class='del'>-</div><div class='add'>+	void (*tasklet_func)(struct drm_device *);</div><div class='add'>+	</div><div class='ctx'> 	spin_lock_irqsave(&amp;dev-&gt;tasklet_lock, irqflags);</div><div class='add'>+	tasklet_func = dev-&gt;locked_tasklet_func;</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev-&gt;tasklet_lock, irqflags);</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;locked_tasklet_func ||</div><div class='add'>+	if (!tasklet_func ||</div><div class='ctx'> 	    !drm_lock_take(&amp;dev-&gt;lock,</div><div class='ctx'> 			   DRM_KERNEL_CONTEXT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;dev-&gt;tasklet_lock, irqflags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;lock.lock_time = jiffies;</div><div class='ctx'> 	atomic_inc(&amp;dev-&gt;counts[_DRM_STAT_LOCKS]);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;locked_tasklet_func(dev);</div><div class='add'>+	spin_lock_irqsave(&amp;dev-&gt;tasklet_lock, irqflags);</div><div class='add'>+	tasklet_func = dev-&gt;locked_tasklet_func;</div><div class='add'>+	dev-&gt;locked_tasklet_func = NULL;</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev-&gt;tasklet_lock, irqflags);</div><div class='add'>+	</div><div class='add'>+	if (tasklet_func != NULL)</div><div class='add'>+		tasklet_func(dev);</div><div class='ctx'> </div><div class='ctx'> 	drm_lock_free(&amp;dev-&gt;lock,</div><div class='ctx'> 		      DRM_KERNEL_CONTEXT);</div><div class='del'>-</div><div class='del'>-	dev-&gt;locked_tasklet_func = NULL;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;dev-&gt;tasklet_lock, irqflags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c<br/>index 0998723cde79..a4caf95485d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_lock.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/gpu/drm/drm_lock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_lock.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/gpu/drm/drm_lock.c</a></div><div class='hunk'>@@ -105,14 +105,19 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)</div><div class='ctx'> 		  ret ? "interrupted" : "has lock");</div><div class='ctx'> 	if (ret) return ret;</div><div class='ctx'> </div><div class='del'>-	sigemptyset(&amp;dev-&gt;sigmask);</div><div class='del'>-	sigaddset(&amp;dev-&gt;sigmask, SIGSTOP);</div><div class='del'>-	sigaddset(&amp;dev-&gt;sigmask, SIGTSTP);</div><div class='del'>-	sigaddset(&amp;dev-&gt;sigmask, SIGTTIN);</div><div class='del'>-	sigaddset(&amp;dev-&gt;sigmask, SIGTTOU);</div><div class='del'>-	dev-&gt;sigdata.context = lock-&gt;context;</div><div class='del'>-	dev-&gt;sigdata.lock = dev-&gt;lock.hw_lock;</div><div class='del'>-	block_all_signals(drm_notifier, &amp;dev-&gt;sigdata, &amp;dev-&gt;sigmask);</div><div class='add'>+	/* don't set the block all signals on the master process for now </div><div class='add'>+	 * really probably not the correct answer but lets us debug xkb</div><div class='add'>+ 	 * xserver for now */</div><div class='add'>+	if (!file_priv-&gt;master) {</div><div class='add'>+		sigemptyset(&amp;dev-&gt;sigmask);</div><div class='add'>+		sigaddset(&amp;dev-&gt;sigmask, SIGSTOP);</div><div class='add'>+		sigaddset(&amp;dev-&gt;sigmask, SIGTSTP);</div><div class='add'>+		sigaddset(&amp;dev-&gt;sigmask, SIGTTIN);</div><div class='add'>+		sigaddset(&amp;dev-&gt;sigmask, SIGTTOU);</div><div class='add'>+		dev-&gt;sigdata.context = lock-&gt;context;</div><div class='add'>+		dev-&gt;sigdata.lock = dev-&gt;lock.hw_lock;</div><div class='add'>+		block_all_signals(drm_notifier, &amp;dev-&gt;sigdata, &amp;dev-&gt;sigmask);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;driver-&gt;dma_ready &amp;&amp; (lock-&gt;flags &amp; _DRM_LOCK_READY))</div><div class='ctx'> 		dev-&gt;driver-&gt;dma_ready(dev);</div><div class='hunk'>@@ -150,6 +155,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_lock *lock = data;</div><div class='ctx'> 	unsigned long irqflags;</div><div class='add'>+	void (*tasklet_func)(struct drm_device *);</div><div class='ctx'> </div><div class='ctx'> 	if (lock-&gt;context == DRM_KERNEL_CONTEXT) {</div><div class='ctx'> 		DRM_ERROR("Process %d using kernel context %d\n",</div><div class='hunk'>@@ -158,14 +164,11 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;dev-&gt;tasklet_lock, irqflags);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;locked_tasklet_func) {</div><div class='del'>-		dev-&gt;locked_tasklet_func(dev);</div><div class='del'>-</div><div class='del'>-		dev-&gt;locked_tasklet_func = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	tasklet_func = dev-&gt;locked_tasklet_func;</div><div class='add'>+	dev-&gt;locked_tasklet_func = NULL;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;dev-&gt;tasklet_lock, irqflags);</div><div class='add'>+	if (tasklet_func != NULL)</div><div class='add'>+		tasklet_func(dev);</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;dev-&gt;counts[_DRM_STAT_UNLOCKS]);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c<br/>index 702df45320f7..4b27d9abb7bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r300_cmdbuf.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/gpu/drm/radeon/r300_cmdbuf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r300_cmdbuf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/gpu/drm/radeon/r300_cmdbuf.c</a></div><div class='hunk'>@@ -77,6 +77,9 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv,</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			box.x2--; /* Hardware expects inclusive bottom-right corner */</div><div class='add'>+			box.y2--;</div><div class='add'>+</div><div class='ctx'> 			if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &gt;= CHIP_RV515) {</div><div class='ctx'> 				box.x1 = (box.x1) &amp;</div><div class='ctx'> 					R300_CLIPRECT_MASK;</div><div class='hunk'>@@ -95,8 +98,8 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv,</div><div class='ctx'> 					R300_CLIPRECT_MASK;</div><div class='ctx'> 				box.y2 = (box.y2 + R300_CLIPRECT_OFFSET) &amp;</div><div class='ctx'> 					R300_CLIPRECT_MASK;</div><div class='del'>-</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='ctx'> 			OUT_RING((box.x1 &lt;&lt; R300_CLIPRECT_X_SHIFT) |</div><div class='ctx'> 				 (box.y1 &lt;&lt; R300_CLIPRECT_Y_SHIFT));</div><div class='ctx'> 			OUT_RING((box.x2 &lt;&lt; R300_CLIPRECT_X_SHIFT) |</div><div class='hunk'>@@ -136,6 +139,18 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv,</div><div class='ctx'> 		ADVANCE_RING();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* flus cache and wait idle clean after cliprect change */</div><div class='add'>+	BEGIN_RING(2);</div><div class='add'>+	OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='add'>+	OUT_RING(R300_RB3D_DC_FLUSH);</div><div class='add'>+	ADVANCE_RING();</div><div class='add'>+	BEGIN_RING(2);</div><div class='add'>+	OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='add'>+	OUT_RING(RADEON_WAIT_3D_IDLECLEAN);</div><div class='add'>+	ADVANCE_RING();</div><div class='add'>+	/* set flush flag */</div><div class='add'>+	dev_priv-&gt;track_flush |= RADEON_FLUSH_EMITED;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -166,13 +181,13 @@ void r300_init_reg_flags(struct drm_device *dev)</div><div class='ctx'> 	ADD_RANGE(0x21DC, 1);</div><div class='ctx'> 	ADD_RANGE(R300_VAP_UNKNOWN_221C, 1);</div><div class='ctx'> 	ADD_RANGE(R300_VAP_CLIP_X_0, 4);</div><div class='del'>-	ADD_RANGE(R300_VAP_PVS_WAITIDLE, 1);</div><div class='add'>+	ADD_RANGE(R300_VAP_PVS_STATE_FLUSH_REG, 1);</div><div class='ctx'> 	ADD_RANGE(R300_VAP_UNKNOWN_2288, 1);</div><div class='ctx'> 	ADD_RANGE(R300_VAP_OUTPUT_VTX_FMT_0, 2);</div><div class='ctx'> 	ADD_RANGE(R300_VAP_PVS_CNTL_1, 3);</div><div class='ctx'> 	ADD_RANGE(R300_GB_ENABLE, 1);</div><div class='ctx'> 	ADD_RANGE(R300_GB_MSPOS0, 5);</div><div class='del'>-	ADD_RANGE(R300_TX_CNTL, 1);</div><div class='add'>+	ADD_RANGE(R300_TX_INVALTAGS, 1);</div><div class='ctx'> 	ADD_RANGE(R300_TX_ENABLE, 1);</div><div class='ctx'> 	ADD_RANGE(0x4200, 4);</div><div class='ctx'> 	ADD_RANGE(0x4214, 1);</div><div class='hunk'>@@ -388,15 +403,28 @@ static __inline__ int r300_emit_vpu(drm_radeon_private_t *dev_priv,</div><div class='ctx'> 	if (sz * 16 &gt; cmdbuf-&gt;bufsz)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	BEGIN_RING(5 + sz * 4);</div><div class='del'>-	/* Wait for VAP to come to senses.. */</div><div class='del'>-	/* there is no need to emit it multiple times, (only once before VAP is programmed,</div><div class='del'>-	   but this optimization is for later */</div><div class='del'>-	OUT_RING_REG(R300_VAP_PVS_WAITIDLE, 0);</div><div class='add'>+	/* VAP is very sensitive so we purge cache before we program it</div><div class='add'>+	 * and we also flush its state before &amp; after */</div><div class='add'>+	BEGIN_RING(6);</div><div class='add'>+	OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='add'>+	OUT_RING(R300_RB3D_DC_FLUSH);</div><div class='add'>+	OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='add'>+	OUT_RING(RADEON_WAIT_3D_IDLECLEAN);</div><div class='add'>+	OUT_RING(CP_PACKET0(R300_VAP_PVS_STATE_FLUSH_REG, 0));</div><div class='add'>+	OUT_RING(0);</div><div class='add'>+	ADVANCE_RING();</div><div class='add'>+	/* set flush flag */</div><div class='add'>+	dev_priv-&gt;track_flush |= RADEON_FLUSH_EMITED;</div><div class='add'>+</div><div class='add'>+	BEGIN_RING(3 + sz * 4);</div><div class='ctx'> 	OUT_RING_REG(R300_VAP_PVS_UPLOAD_ADDRESS, addr);</div><div class='ctx'> 	OUT_RING(CP_PACKET0_TABLE(R300_VAP_PVS_UPLOAD_DATA, sz * 4 - 1));</div><div class='ctx'> 	OUT_RING_TABLE((int *)cmdbuf-&gt;buf, sz * 4);</div><div class='add'>+	ADVANCE_RING();</div><div class='ctx'> </div><div class='add'>+	BEGIN_RING(2);</div><div class='add'>+	OUT_RING(CP_PACKET0(R300_VAP_PVS_STATE_FLUSH_REG, 0));</div><div class='add'>+	OUT_RING(0);</div><div class='ctx'> 	ADVANCE_RING();</div><div class='ctx'> </div><div class='ctx'> 	cmdbuf-&gt;buf += sz * 16;</div><div class='hunk'>@@ -424,6 +452,15 @@ static __inline__ int r300_emit_clear(drm_radeon_private_t *dev_priv,</div><div class='ctx'> 	OUT_RING_TABLE((int *)cmdbuf-&gt;buf, 8);</div><div class='ctx'> 	ADVANCE_RING();</div><div class='ctx'> </div><div class='add'>+	BEGIN_RING(4);</div><div class='add'>+	OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='add'>+	OUT_RING(R300_RB3D_DC_FLUSH);</div><div class='add'>+	OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='add'>+	OUT_RING(RADEON_WAIT_3D_IDLECLEAN);</div><div class='add'>+	ADVANCE_RING();</div><div class='add'>+	/* set flush flag */</div><div class='add'>+	dev_priv-&gt;track_flush |= RADEON_FLUSH_EMITED;</div><div class='add'>+</div><div class='ctx'> 	cmdbuf-&gt;buf += 8 * 4;</div><div class='ctx'> 	cmdbuf-&gt;bufsz -= 8 * 4;</div><div class='ctx'> </div><div class='hunk'>@@ -543,22 +580,23 @@ static __inline__ int r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __inline__ int r300_emit_indx_buffer(drm_radeon_private_t *dev_priv,</div><div class='del'>-					     drm_radeon_kcmd_buffer_t *cmdbuf)</div><div class='add'>+static __inline__ int r300_emit_draw_indx_2(drm_radeon_private_t *dev_priv,</div><div class='add'>+					    drm_radeon_kcmd_buffer_t *cmdbuf)</div><div class='ctx'> {</div><div class='del'>-	u32 *cmd = (u32 *) cmdbuf-&gt;buf;</div><div class='del'>-	int count, ret;</div><div class='add'>+	u32 *cmd;</div><div class='add'>+	int count;</div><div class='add'>+	int expected_count;</div><div class='ctx'> 	RING_LOCALS;</div><div class='ctx'> </div><div class='del'>-	count=(cmd[0]&gt;&gt;16) &amp; 0x3fff;</div><div class='add'>+	cmd = (u32 *) cmdbuf-&gt;buf;</div><div class='add'>+	count = (cmd[0]&gt;&gt;16) &amp; 0x3fff;</div><div class='add'>+	expected_count = cmd[1] &gt;&gt; 16;</div><div class='add'>+	if (!(cmd[1] &amp; R300_VAP_VF_CNTL__INDEX_SIZE_32bit))</div><div class='add'>+		expected_count = (expected_count+1)/2;</div><div class='ctx'> </div><div class='del'>-	if ((cmd[1] &amp; 0x8000ffff) != 0x80000810) {</div><div class='del'>-		DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	ret = !radeon_check_offset(dev_priv, cmd[2]);</div><div class='del'>-	if (ret) {</div><div class='del'>-		DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]);</div><div class='add'>+	if (count &amp;&amp; count != expected_count) {</div><div class='add'>+		DRM_ERROR("3D_DRAW_INDX_2: packet size %i, expected %i\n",</div><div class='add'>+			count, expected_count);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -570,6 +608,50 @@ static __inline__ int r300_emit_indx_buffer(drm_radeon_private_t *dev_priv,</div><div class='ctx'> 	cmdbuf-&gt;buf += (count+2)*4;</div><div class='ctx'> 	cmdbuf-&gt;bufsz -= (count+2)*4;</div><div class='ctx'> </div><div class='add'>+	if (!count) {</div><div class='add'>+		drm_r300_cmd_header_t header;</div><div class='add'>+</div><div class='add'>+		if (cmdbuf-&gt;bufsz &lt; 4*4 + sizeof(header)) {</div><div class='add'>+			DRM_ERROR("3D_DRAW_INDX_2: expect subsequent INDX_BUFFER, but stream is too short.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		header.u = *(unsigned int *)cmdbuf-&gt;buf;</div><div class='add'>+</div><div class='add'>+		cmdbuf-&gt;buf += sizeof(header);</div><div class='add'>+		cmdbuf-&gt;bufsz -= sizeof(header);</div><div class='add'>+		cmd = (u32 *) cmdbuf-&gt;buf;</div><div class='add'>+</div><div class='add'>+		if (header.header.cmd_type != R300_CMD_PACKET3 ||</div><div class='add'>+		    header.packet3.packet != R300_CMD_PACKET3_RAW ||</div><div class='add'>+		    cmd[0] != CP_PACKET3(RADEON_CP_INDX_BUFFER, 2)) {</div><div class='add'>+			DRM_ERROR("3D_DRAW_INDX_2: expect subsequent INDX_BUFFER.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((cmd[1] &amp; 0x8000ffff) != 0x80000810) {</div><div class='add'>+			DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (!radeon_check_offset(dev_priv, cmd[2])) {</div><div class='add'>+			DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (cmd[3] != expected_count) {</div><div class='add'>+			DRM_ERROR("INDX_BUFFER: buffer size %i, expected %i\n",</div><div class='add'>+				cmd[3], expected_count);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		BEGIN_RING(4);</div><div class='add'>+		OUT_RING(cmd[0]);</div><div class='add'>+		OUT_RING_TABLE((int *)(cmdbuf-&gt;buf + 4), 3);</div><div class='add'>+		ADVANCE_RING();</div><div class='add'>+</div><div class='add'>+		cmdbuf-&gt;buf += 4*4;</div><div class='add'>+		cmdbuf-&gt;bufsz -= 4*4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -613,11 +695,22 @@ static __inline__ int r300_emit_raw_packet3(drm_radeon_private_t *dev_priv,</div><div class='ctx'> 	case RADEON_CNTL_BITBLT_MULTI:</div><div class='ctx'> 		return r300_emit_bitblt_multi(dev_priv, cmdbuf);</div><div class='ctx'> </div><div class='del'>-	case RADEON_CP_INDX_BUFFER:	/* DRAW_INDX_2 without INDX_BUFFER seems to lock up the gpu */</div><div class='del'>-		return r300_emit_indx_buffer(dev_priv, cmdbuf);</div><div class='del'>-	case RADEON_CP_3D_DRAW_IMMD_2:	/* triggers drawing using in-packet vertex data */</div><div class='del'>-	case RADEON_CP_3D_DRAW_VBUF_2:	/* triggers drawing of vertex buffers setup elsewhere */</div><div class='del'>-	case RADEON_CP_3D_DRAW_INDX_2:	/* triggers drawing using indices to vertex buffer */</div><div class='add'>+	case RADEON_CP_INDX_BUFFER:</div><div class='add'>+		DRM_ERROR("packet3 INDX_BUFFER without preceding 3D_DRAW_INDX_2 is illegal.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	case RADEON_CP_3D_DRAW_IMMD_2:</div><div class='add'>+		/* triggers drawing using in-packet vertex data */</div><div class='add'>+	case RADEON_CP_3D_DRAW_VBUF_2:</div><div class='add'>+		/* triggers drawing of vertex buffers setup elsewhere */</div><div class='add'>+		dev_priv-&gt;track_flush &amp;= ~(RADEON_FLUSH_EMITED |</div><div class='add'>+					   RADEON_PURGE_EMITED);</div><div class='add'>+		break;</div><div class='add'>+	case RADEON_CP_3D_DRAW_INDX_2:</div><div class='add'>+		/* triggers drawing using indices to vertex buffer */</div><div class='add'>+		/* whenever we send vertex we clear flush &amp; purge */</div><div class='add'>+		dev_priv-&gt;track_flush &amp;= ~(RADEON_FLUSH_EMITED |</div><div class='add'>+					   RADEON_PURGE_EMITED);</div><div class='add'>+		return r300_emit_draw_indx_2(dev_priv, cmdbuf);</div><div class='ctx'> 	case RADEON_WAIT_FOR_IDLE:</div><div class='ctx'> 	case RADEON_CP_NOP:</div><div class='ctx'> 		/* these packets are safe */</div><div class='hunk'>@@ -713,17 +806,53 @@ static __inline__ int r300_emit_packet3(drm_radeon_private_t *dev_priv,</div><div class='ctx'>  */</div><div class='ctx'> static __inline__ void r300_pacify(drm_radeon_private_t *dev_priv)</div><div class='ctx'> {</div><div class='add'>+	uint32_t cache_z, cache_3d, cache_2d;</div><div class='ctx'> 	RING_LOCALS;</div><div class='ctx'> </div><div class='del'>-	BEGIN_RING(6);</div><div class='del'>-	OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='del'>-	OUT_RING(R300_RB3D_DSTCACHE_UNKNOWN_0A);</div><div class='add'>+	cache_z = R300_ZC_FLUSH;</div><div class='add'>+	cache_2d = R300_RB2D_DC_FLUSH;</div><div class='add'>+	cache_3d = R300_RB3D_DC_FLUSH;</div><div class='add'>+	if (!(dev_priv-&gt;track_flush &amp; RADEON_PURGE_EMITED)) {</div><div class='add'>+		/* we can purge, primitive where draw since last purge */</div><div class='add'>+		cache_z |= R300_ZC_FREE;</div><div class='add'>+		cache_2d |= R300_RB2D_DC_FREE;</div><div class='add'>+		cache_3d |= R300_RB3D_DC_FREE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* flush &amp; purge zbuffer */</div><div class='add'>+	BEGIN_RING(2);</div><div class='ctx'> 	OUT_RING(CP_PACKET0(R300_ZB_ZCACHE_CTLSTAT, 0));</div><div class='del'>-	OUT_RING(R300_ZB_ZCACHE_CTLSTAT_ZC_FLUSH_FLUSH_AND_FREE|</div><div class='del'>-		 R300_ZB_ZCACHE_CTLSTAT_ZC_FREE_FREE);</div><div class='del'>-	OUT_RING(CP_PACKET3(RADEON_CP_NOP, 0));</div><div class='del'>-	OUT_RING(0x0);</div><div class='add'>+	OUT_RING(cache_z);</div><div class='add'>+	ADVANCE_RING();</div><div class='add'>+	/* flush &amp; purge 3d */</div><div class='add'>+	BEGIN_RING(2);</div><div class='add'>+	OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='add'>+	OUT_RING(cache_3d);</div><div class='add'>+	ADVANCE_RING();</div><div class='add'>+	/* flush &amp; purge texture */</div><div class='add'>+	BEGIN_RING(2);</div><div class='add'>+	OUT_RING(CP_PACKET0(R300_TX_INVALTAGS, 0));</div><div class='add'>+	OUT_RING(0);</div><div class='add'>+	ADVANCE_RING();</div><div class='add'>+	/* FIXME: is this one really needed ? */</div><div class='add'>+	BEGIN_RING(2);</div><div class='add'>+	OUT_RING(CP_PACKET0(R300_RB3D_AARESOLVE_CTL, 0));</div><div class='add'>+	OUT_RING(0);</div><div class='add'>+	ADVANCE_RING();</div><div class='add'>+	BEGIN_RING(2);</div><div class='add'>+	OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='add'>+	OUT_RING(RADEON_WAIT_3D_IDLECLEAN);</div><div class='add'>+	ADVANCE_RING();</div><div class='add'>+	/* flush &amp; purge 2d through E2 as RB2D will trigger lockup */</div><div class='add'>+	BEGIN_RING(4);</div><div class='add'>+	OUT_RING(CP_PACKET0(R300_DSTCACHE_CTLSTAT, 0));</div><div class='add'>+	OUT_RING(cache_2d);</div><div class='add'>+	OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='add'>+	OUT_RING(RADEON_WAIT_2D_IDLECLEAN |</div><div class='add'>+		 RADEON_WAIT_HOST_IDLECLEAN);</div><div class='ctx'> 	ADVANCE_RING();</div><div class='add'>+	/* set flush &amp; purge flags */</div><div class='add'>+	dev_priv-&gt;track_flush |= RADEON_FLUSH_EMITED | RADEON_PURGE_EMITED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -905,8 +1034,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG("\n");</div><div class='ctx'> </div><div class='del'>-	/* See the comment above r300_emit_begin3d for why this call must be here,</div><div class='del'>-	 * and what the cleanup gotos are for. */</div><div class='add'>+	/* pacify */</div><div class='ctx'> 	r300_pacify(dev_priv);</div><div class='ctx'> </div><div class='ctx'> 	if (cmdbuf-&gt;nbox &lt;= R300_SIMULTANEOUS_CLIPRECTS) {</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/r300_reg.h b/drivers/gpu/drm/radeon/r300_reg.h<br/>index a6802f26afc4..ee6f811599a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r300_reg.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/gpu/drm/radeon/r300_reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r300_reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/gpu/drm/radeon/r300_reg.h</a></div><div class='hunk'>@@ -317,7 +317,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  * Therefore, I suspect writing zero to 0x2284 synchronizes the engine and</div><div class='ctx'>  * avoids bugs caused by still running shaders reading bad data from memory.</div><div class='ctx'>  */</div><div class='del'>-#define R300_VAP_PVS_WAITIDLE               0x2284 /* GUESS */</div><div class='add'>+#define R300_VAP_PVS_STATE_FLUSH_REG        0x2284</div><div class='ctx'> </div><div class='ctx'> /* Absolutely no clue what this register is about. */</div><div class='ctx'> #define R300_VAP_UNKNOWN_2288               0x2288</div><div class='hunk'>@@ -513,7 +513,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'> /* gap */</div><div class='ctx'> </div><div class='ctx'> /* Zero to flush caches. */</div><div class='del'>-#define R300_TX_CNTL                        0x4100</div><div class='add'>+#define R300_TX_INVALTAGS                   0x4100</div><div class='ctx'> #define R300_TX_FLUSH                       0x0</div><div class='ctx'> </div><div class='ctx'> /* The upper enable bits are guessed, based on fglrx reported limits. */</div><div class='hunk'>@@ -1362,6 +1362,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'> #define R300_RB3D_COLORPITCH2               0x4E40 /* GUESS */</div><div class='ctx'> #define R300_RB3D_COLORPITCH3               0x4E44 /* GUESS */</div><div class='ctx'> </div><div class='add'>+#define R300_RB3D_AARESOLVE_CTL             0x4E88</div><div class='ctx'> /* gap */</div><div class='ctx'> </div><div class='ctx'> /* Guess by Vladimir.</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c<br/>index f0de81a5689d..248ab4a7d39f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_cp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/gpu/drm/radeon/radeon_cp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_cp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/gpu/drm/radeon/radeon_cp.c</a></div><div class='hunk'>@@ -40,6 +40,7 @@</div><div class='ctx'> #define RADEON_FIFO_DEBUG	0</div><div class='ctx'> </div><div class='ctx'> static int radeon_do_cleanup_cp(struct drm_device * dev);</div><div class='add'>+static void radeon_do_cp_start(drm_radeon_private_t * dev_priv);</div><div class='ctx'> </div><div class='ctx'> static u32 R500_READ_MCIND(drm_radeon_private_t *dev_priv, int addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -198,23 +199,8 @@ static int radeon_do_pixcache_flush(drm_radeon_private_t * dev_priv)</div><div class='ctx'> 			DRM_UDELAY(1);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		/* 3D */</div><div class='del'>-		tmp = RADEON_READ(R300_RB3D_DSTCACHE_CTLSTAT);</div><div class='del'>-		tmp |= RADEON_RB3D_DC_FLUSH_ALL;</div><div class='del'>-		RADEON_WRITE(R300_RB3D_DSTCACHE_CTLSTAT, tmp);</div><div class='del'>-</div><div class='del'>-		/* 2D */</div><div class='del'>-		tmp = RADEON_READ(R300_DSTCACHE_CTLSTAT);</div><div class='del'>-		tmp |= RADEON_RB3D_DC_FLUSH_ALL;</div><div class='del'>-		RADEON_WRITE(R300_DSTCACHE_CTLSTAT, tmp);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; dev_priv-&gt;usec_timeout; i++) {</div><div class='del'>-			if (!(RADEON_READ(R300_DSTCACHE_CTLSTAT)</div><div class='del'>-			  &amp; RADEON_RB3D_DC_BUSY)) {</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			DRM_UDELAY(1);</div><div class='del'>-		}</div><div class='add'>+		/* don't flush or purge cache here or lockup */</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #if RADEON_FIFO_DEBUG</div><div class='hunk'>@@ -237,6 +223,9 @@ static int radeon_do_wait_for_fifo(drm_radeon_private_t * dev_priv, int entries)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		DRM_UDELAY(1);</div><div class='ctx'> 	}</div><div class='add'>+	DRM_DEBUG("wait for fifo failed status : 0x%08X 0x%08X\n",</div><div class='add'>+		 RADEON_READ(RADEON_RBBM_STATUS),</div><div class='add'>+		 RADEON_READ(R300_VAP_CNTL_STATUS));</div><div class='ctx'> </div><div class='ctx'> #if RADEON_FIFO_DEBUG</div><div class='ctx'> 	DRM_ERROR("failed!\n");</div><div class='hunk'>@@ -263,6 +252,9 @@ static int radeon_do_wait_for_idle(drm_radeon_private_t * dev_priv)</div><div class='ctx'> 		}</div><div class='ctx'> 		DRM_UDELAY(1);</div><div class='ctx'> 	}</div><div class='add'>+	DRM_DEBUG("wait idle failed status : 0x%08X 0x%08X\n",</div><div class='add'>+		 RADEON_READ(RADEON_RBBM_STATUS),</div><div class='add'>+		 RADEON_READ(R300_VAP_CNTL_STATUS));</div><div class='ctx'> </div><div class='ctx'> #if RADEON_FIFO_DEBUG</div><div class='ctx'> 	DRM_ERROR("failed!\n");</div><div class='hunk'>@@ -443,14 +435,20 @@ static void radeon_do_cp_start(drm_radeon_private_t * dev_priv)</div><div class='ctx'> </div><div class='ctx'> 	dev_priv-&gt;cp_running = 1;</div><div class='ctx'> </div><div class='del'>-	BEGIN_RING(6);</div><div class='del'>-</div><div class='add'>+	BEGIN_RING(8);</div><div class='add'>+	/* isync can only be written through cp on r5xx write it here */</div><div class='add'>+	OUT_RING(CP_PACKET0(RADEON_ISYNC_CNTL, 0));</div><div class='add'>+	OUT_RING(RADEON_ISYNC_ANY2D_IDLE3D |</div><div class='add'>+		 RADEON_ISYNC_ANY3D_IDLE2D |</div><div class='add'>+		 RADEON_ISYNC_WAIT_IDLEGUI |</div><div class='add'>+		 RADEON_ISYNC_CPSCRATCH_IDLEGUI);</div><div class='ctx'> 	RADEON_PURGE_CACHE();</div><div class='ctx'> 	RADEON_PURGE_ZCACHE();</div><div class='ctx'> 	RADEON_WAIT_UNTIL_IDLE();</div><div class='del'>-</div><div class='ctx'> 	ADVANCE_RING();</div><div class='ctx'> 	COMMIT_RING();</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;track_flush |= RADEON_FLUSH_EMITED | RADEON_PURGE_EMITED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Reset the Command Processor.  This will not flush any pending</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c<br/>index 349ac3d3b848..637bd7faf132 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_drv.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/gpu/drm/radeon/radeon_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_drv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/gpu/drm/radeon/radeon_drv.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> </div><div class='ctx'> int radeon_no_wb;</div><div class='ctx'> </div><div class='del'>-MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers\n");</div><div class='add'>+MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");</div><div class='ctx'> module_param_named(no_wb, radeon_no_wb, int, 0444);</div><div class='ctx'> </div><div class='ctx'> static int dri_library_name(struct drm_device *dev, char *buf)</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h<br/>index 3f0eca957aa7..099381693175 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_drv.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/gpu/drm/radeon/radeon_drv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_drv.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/gpu/drm/radeon/radeon_drv.h</a></div><div class='hunk'>@@ -220,6 +220,9 @@ struct radeon_virt_surface {</div><div class='ctx'> 	struct drm_file *file_priv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define RADEON_FLUSH_EMITED	(1 &lt; 0)</div><div class='add'>+#define RADEON_PURGE_EMITED	(1 &lt; 1)</div><div class='add'>+</div><div class='ctx'> typedef struct drm_radeon_private {</div><div class='ctx'> 	drm_radeon_ring_buffer_t ring;</div><div class='ctx'> 	drm_radeon_sarea_t *sarea_priv;</div><div class='hunk'>@@ -311,6 +314,7 @@ typedef struct drm_radeon_private {</div><div class='ctx'> 	unsigned long fb_aper_offset;</div><div class='ctx'> </div><div class='ctx'> 	int num_gb_pipes;</div><div class='add'>+	int track_flush;</div><div class='ctx'> } drm_radeon_private_t;</div><div class='ctx'> </div><div class='ctx'> typedef struct drm_radeon_buf_priv {</div><div class='hunk'>@@ -693,7 +697,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,</div><div class='ctx'> #define R300_ZB_ZCACHE_CTLSTAT                  0x4f18</div><div class='ctx'> #	define R300_ZC_FLUSH		        (1 &lt;&lt; 0)</div><div class='ctx'> #	define R300_ZC_FREE		        (1 &lt;&lt; 1)</div><div class='del'>-#	define R300_ZC_FLUSH_ALL		0x3</div><div class='ctx'> #	define R300_ZC_BUSY		        (1 &lt;&lt; 31)</div><div class='ctx'> #define RADEON_RB3D_DSTCACHE_CTLSTAT	0x325c</div><div class='ctx'> #	define RADEON_RB3D_DC_FLUSH		(3 &lt;&lt; 0)</div><div class='hunk'>@@ -701,6 +704,8 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,</div><div class='ctx'> #	define RADEON_RB3D_DC_FLUSH_ALL		0xf</div><div class='ctx'> #	define RADEON_RB3D_DC_BUSY		(1 &lt;&lt; 31)</div><div class='ctx'> #define R300_RB3D_DSTCACHE_CTLSTAT              0x4e4c</div><div class='add'>+#	define R300_RB3D_DC_FLUSH		(2 &lt;&lt; 0)</div><div class='add'>+#	define R300_RB3D_DC_FREE		(2 &lt;&lt; 2)</div><div class='ctx'> #	define R300_RB3D_DC_FINISH		(1 &lt;&lt; 4)</div><div class='ctx'> #define RADEON_RB3D_ZSTENCILCNTL	0x1c2c</div><div class='ctx'> #	define RADEON_Z_TEST_MASK		(7 &lt;&lt; 4)</div><div class='hunk'>@@ -1246,17 +1251,17 @@ do {									\</div><div class='ctx'> 		OUT_RING(RADEON_RB3D_DC_FLUSH);				\</div><div class='ctx'> 	} else {                                                        \</div><div class='ctx'> 		OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));	\</div><div class='del'>-		OUT_RING(RADEON_RB3D_DC_FLUSH);				\</div><div class='add'>+		OUT_RING(R300_RB3D_DC_FLUSH);				\</div><div class='ctx'> 	}                                                               \</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> #define RADEON_PURGE_CACHE() do {					\</div><div class='ctx'> 	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &lt;= CHIP_RV280) {	\</div><div class='ctx'> 		OUT_RING(CP_PACKET0(RADEON_RB3D_DSTCACHE_CTLSTAT, 0));	\</div><div class='del'>-		OUT_RING(RADEON_RB3D_DC_FLUSH_ALL);			\</div><div class='add'>+		OUT_RING(RADEON_RB3D_DC_FLUSH | RADEON_RB3D_DC_FREE);	\</div><div class='ctx'> 	} else {                                                        \</div><div class='ctx'> 		OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));	\</div><div class='del'>-		OUT_RING(RADEON_RB3D_DC_FLUSH_ALL);			\</div><div class='add'>+		OUT_RING(R300_RB3D_DC_FLUSH | R300_RB3D_DC_FREE);	\</div><div class='ctx'> 	}                                                               \</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='hunk'>@@ -1273,10 +1278,10 @@ do {									\</div><div class='ctx'> #define RADEON_PURGE_ZCACHE() do {					\</div><div class='ctx'> 	if ((dev_priv-&gt;flags &amp; RADEON_FAMILY_MASK) &lt;= CHIP_RV280) {	\</div><div class='ctx'> 		OUT_RING(CP_PACKET0(RADEON_RB3D_ZCACHE_CTLSTAT, 0));	\</div><div class='del'>-		OUT_RING(RADEON_RB3D_ZC_FLUSH_ALL);			\</div><div class='add'>+		OUT_RING(RADEON_RB3D_ZC_FLUSH | RADEON_RB3D_ZC_FREE);			\</div><div class='ctx'> 	} else {                                                        \</div><div class='del'>-		OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));	\</div><div class='del'>-		OUT_RING(R300_ZC_FLUSH_ALL);				\</div><div class='add'>+		OUT_RING(CP_PACKET0(R300_ZB_ZCACHE_CTLSTAT, 0));	\</div><div class='add'>+		OUT_RING(R300_ZC_FLUSH | R300_ZC_FREE);				\</div><div class='ctx'> 	}                                                               \</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c<br/>index 61e78a4369b9..b15f88249639 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/usbhid/hid-quirks.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hid/usbhid/hid-quirks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/usbhid/hid-quirks.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hid/usbhid/hid-quirks.c</a></div><div class='hunk'>@@ -654,12 +654,12 @@ static const struct hid_blacklist {</div><div class='ctx'> 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },</div><div class='ctx'> 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },</div><div class='ctx'> 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, HID_QUIRK_APPLE_HAS_FN },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS, HID_QUIRK_APPLE_HAS_FN },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, HID_QUIRK_APPLE_HAS_FN },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },</div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, HID_QUIRK_APPLE_HAS_FN },</div><div class='add'>+	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='add'>+	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD | HID_QUIRK_IGNORE_MOUSE},</div><div class='add'>+	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE},</div><div class='add'>+	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE},</div><div class='add'>+	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD | HID_QUIRK_IGNORE_MOUSE },</div><div class='add'>+	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, HID_QUIRK_APPLE_HAS_FN  | HID_QUIRK_IGNORE_MOUSE },</div><div class='ctx'> 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='ctx'> 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig<br/>index 00ff53348491..d402e8d813ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/Kconfig</a></div><div class='hunk'>@@ -57,6 +57,16 @@ config SENSORS_ABITUGURU3</div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called abituguru3.</div><div class='ctx'> </div><div class='add'>+config SENSORS_AD7414</div><div class='add'>+	tristate "Analog Devices AD7414"</div><div class='add'>+	depends on I2C &amp;&amp; EXPERIMENTAL</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the Analog Devices</div><div class='add'>+	  AD7414 temperature monitoring chip.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module. If so, the module</div><div class='add'>+	  will be called ad7414.</div><div class='add'>+</div><div class='ctx'> config SENSORS_AD7418</div><div class='ctx'> 	tristate "Analog Devices AD7416, AD7417 and AD7418"</div><div class='ctx'> 	depends on I2C &amp;&amp; EXPERIMENTAL</div><div class='hunk'>@@ -67,6 +77,22 @@ config SENSORS_AD7418</div><div class='ctx'> 	  This driver can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called ad7418.</div><div class='ctx'> </div><div class='add'>+config SENSORS_ADCXX</div><div class='add'>+	tristate "National Semiconductor ADCxxxSxxx"</div><div class='add'>+	depends on SPI_MASTER &amp;&amp; EXPERIMENTAL</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the National Semiconductor</div><div class='add'>+	  ADC&lt;bb&gt;&lt;c&gt;S&lt;sss&gt; chip family, where</div><div class='add'>+	  * bb  is the resolution in number of bits (8, 10, 12)</div><div class='add'>+	  * c   is the number of channels (1, 2, 4, 8)</div><div class='add'>+	  * sss is the maximum conversion speed (021 for 200 kSPS, 051 for 500</div><div class='add'>+	    kSPS and 101 for 1 MSPS)</div><div class='add'>+</div><div class='add'>+	  Examples : ADC081S101, ADC124S501, ...</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module.  If so, the module</div><div class='add'>+	  will be called adcxx.</div><div class='add'>+</div><div class='ctx'> config SENSORS_ADM1021</div><div class='ctx'> 	tristate "Analog Devices ADM1021 and compatibles"</div><div class='ctx'> 	depends on I2C</div><div class='hunk'>@@ -124,7 +150,7 @@ config SENSORS_ADM1031</div><div class='ctx'> </div><div class='ctx'> config SENSORS_ADM9240</div><div class='ctx'> 	tristate "Analog Devices ADM9240 and compatibles"</div><div class='del'>-	depends on I2C &amp;&amp; EXPERIMENTAL</div><div class='add'>+	depends on I2C</div><div class='ctx'> 	select HWMON_VID</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get support for Analog Devices ADM9240,</div><div class='hunk'>@@ -394,13 +420,24 @@ config SENSORS_LM75</div><div class='ctx'> 	tristate "National Semiconductor LM75 and compatibles"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	  If you say yes here you get support for National Semiconductor LM75</div><div class='del'>-	  sensor chips and clones: Dallas Semiconductor DS75 and DS1775 (in</div><div class='del'>-	  9-bit precision mode), and TelCom (now Microchip) TCN75.</div><div class='add'>+	  If you say yes here you get support for one common type of</div><div class='add'>+	  temperature sensor chip, with models including:</div><div class='add'>+</div><div class='add'>+		- Dallas Semiconductor DS75 and DS1775</div><div class='add'>+		- Maxim MAX6625 and MAX6626</div><div class='add'>+		- Microchip MCP980x</div><div class='add'>+		- National Semiconductor LM75</div><div class='add'>+		- NXP's LM75A</div><div class='add'>+		- ST Microelectronics STDS75</div><div class='add'>+		- TelCom (now Microchip) TCN75</div><div class='add'>+		- Texas Instruments TMP100, TMP101, TMP75, TMP175, TMP275</div><div class='add'>+</div><div class='add'>+	  This driver supports driver model based binding through board</div><div class='add'>+	  specific I2C device tables.</div><div class='ctx'> </div><div class='del'>-	  The DS75 and DS1775 in 10- to 12-bit precision modes will require</div><div class='del'>-	  a force module parameter. The driver will not handle the extra</div><div class='del'>-	  precision anyhow.</div><div class='add'>+	  It also supports the "legacy" style of driver binding.  To use</div><div class='add'>+	  that with some chips which don't replicate LM75 quirks exactly,</div><div class='add'>+	  you may need the "force" module parameter.</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called lm75.</div><div class='hunk'>@@ -564,8 +601,8 @@ config SENSORS_DME1737</div><div class='ctx'> 	select HWMON_VID</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get support for the hardware monitoring</div><div class='del'>-	  and fan control features of the SMSC DME1737 (and compatibles</div><div class='del'>-	  like the Asus A8000) and SCH311x Super-I/O chips.</div><div class='add'>+	  and fan control features of the SMSC DME1737, SCH311x, SCH5027, and</div><div class='add'>+	  Asus A8000 Super-I/O chips.</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called dme1737.</div><div class='head'>diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile<br/>index d098677e08de..950134ab8426 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/Makefile</a></div><div class='hunk'>@@ -15,7 +15,9 @@ obj-$(CONFIG_SENSORS_W83791D)	+= w83791d.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SENSORS_ABITUGURU)	+= abituguru.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_ABITUGURU3)+= abituguru3.o</div><div class='add'>+obj-$(CONFIG_SENSORS_AD7414)	+= ad7414.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_AD7418)	+= ad7418.o</div><div class='add'>+obj-$(CONFIG_SENSORS_ADCXX)	+= adcxx.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_ADM1021)	+= adm1021.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_ADM1025)	+= adm1025.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_ADM1026)	+= adm1026.o</div><div class='head'>diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c<br/>index f00f497b9ca9..d568c65c1370 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/abituguru3.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/abituguru3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/abituguru3.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/abituguru3.c</a></div><div class='hunk'>@@ -1,5 +1,8 @@</div><div class='ctx'> /*</div><div class='del'>-    abituguru3.c Copyright (c) 2006 Hans de Goede &lt;j.w.r.degoede@hhs.nl&gt;</div><div class='add'>+    abituguru3.c</div><div class='add'>+</div><div class='add'>+    Copyright (c) 2006-2008 Hans de Goede &lt;j.w.r.degoede@hhs.nl&gt;</div><div class='add'>+    Copyright (c) 2008 Alistair John Strachan &lt;alistair@devzero.co.uk&gt;</div><div class='ctx'> </div><div class='ctx'>     This program is free software; you can redistribute it and/or modify</div><div class='ctx'>     it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -116,7 +119,7 @@ struct abituguru3_sensor_info {</div><div class='ctx'> </div><div class='ctx'> struct abituguru3_motherboard_info {</div><div class='ctx'> 	u16 id;</div><div class='del'>-	const char *name;</div><div class='add'>+	const char *dmi_name;</div><div class='ctx'> 	/* + 1 -&gt; end of sensors indicated by a sensor with name == NULL */</div><div class='ctx'> 	struct abituguru3_sensor_info sensors[ABIT_UGURU3_MAX_NO_SENSORS + 1];</div><div class='ctx'> };</div><div class='hunk'>@@ -161,7 +164,7 @@ struct abituguru3_data {</div><div class='ctx'> </div><div class='ctx'> /* Constants */</div><div class='ctx'> static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='del'>-	{ 0x000C, "unknown", {</div><div class='add'>+	{ 0x000C, NULL /* Unknown, need DMI string */, {</div><div class='ctx'> 		{ "CPU Core",		 0, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR",		 1, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR VTT",		 2, 0, 10, 1, 0 },</div><div class='hunk'>@@ -183,7 +186,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> 		{ "AUX1 Fan",		35, 2, 60, 1, 0 },</div><div class='ctx'> 		{ NULL, 0, 0, 0, 0, 0 } }</div><div class='ctx'> 	},</div><div class='del'>-	{ 0x000D, "Abit AW8", {</div><div class='add'>+	{ 0x000D, NULL /* Abit AW8, need DMI string */, {</div><div class='ctx'> 		{ "CPU Core",		 0, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR",		 1, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR VTT",		 2, 0, 10, 1, 0 },</div><div class='hunk'>@@ -212,7 +215,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> 		{ "AUX5 Fan",		39, 2, 60, 1, 0 },</div><div class='ctx'> 		{ NULL, 0, 0, 0, 0, 0 } }</div><div class='ctx'> 	},</div><div class='del'>-	{ 0x000E, "AL-8", {</div><div class='add'>+	{ 0x000E, NULL /* AL-8, need DMI string */, {</div><div class='ctx'> 		{ "CPU Core",		 0, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR",		 1, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR VTT",		 2, 0, 10, 1, 0 },</div><div class='hunk'>@@ -233,7 +236,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> 		{ "SYS Fan",		34, 2, 60, 1, 0 },</div><div class='ctx'> 		{ NULL, 0, 0, 0, 0, 0 } }</div><div class='ctx'> 	},</div><div class='del'>-	{ 0x000F, "unknown", {</div><div class='add'>+	{ 0x000F, NULL /* Unknown, need DMI string */, {</div><div class='ctx'> 		{ "CPU Core",		 0, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR",		 1, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR VTT",		 2, 0, 10, 1, 0 },</div><div class='hunk'>@@ -254,7 +257,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> 		{ "SYS Fan",		34, 2, 60, 1, 0 },</div><div class='ctx'> 		{ NULL, 0, 0, 0, 0, 0 } }</div><div class='ctx'> 	},</div><div class='del'>-	{ 0x0010, "Abit NI8 SLI GR", {</div><div class='add'>+	{ 0x0010, NULL /* Abit NI8 SLI GR, need DMI string */, {</div><div class='ctx'> 		{ "CPU Core",		 0, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR",		 1, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR VTT",		 2, 0, 10, 1, 0 },</div><div class='hunk'>@@ -276,7 +279,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> 		{ "OTES1 Fan",		36, 2, 60, 1, 0 },</div><div class='ctx'> 		{ NULL, 0, 0, 0, 0, 0 } }</div><div class='ctx'> 	},</div><div class='del'>-	{ 0x0011, "Abit AT8 32X", {</div><div class='add'>+	{ 0x0011, NULL /* Abit AT8 32X, need DMI string */, {</div><div class='ctx'> 		{ "CPU Core",		 0, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR",		 1, 0, 20, 1, 0 },</div><div class='ctx'> 		{ "DDR VTT",		 2, 0, 10, 1, 0 },</div><div class='hunk'>@@ -302,7 +305,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> 		{ "AUX2 Fan",		36, 2, 60, 1, 0 },</div><div class='ctx'> 		{ NULL, 0, 0, 0, 0, 0 } }</div><div class='ctx'> 	},</div><div class='del'>-	{ 0x0012, "Abit AN8 32X", {</div><div class='add'>+	{ 0x0012, NULL /* Abit AN8 32X, need DMI string */, {</div><div class='ctx'> 		{ "CPU Core",		 0, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR",		 1, 0, 20, 1, 0 },</div><div class='ctx'> 		{ "DDR VTT",		 2, 0, 10, 1, 0 },</div><div class='hunk'>@@ -324,7 +327,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> 		{ "AUX1 Fan",		36, 2, 60, 1, 0 },</div><div class='ctx'> 		{ NULL, 0, 0, 0, 0, 0 } }</div><div class='ctx'> 	},</div><div class='del'>-	{ 0x0013, "Abit AW8D", {</div><div class='add'>+	{ 0x0013, NULL /* Abit AW8D, need DMI string */, {</div><div class='ctx'> 		{ "CPU Core",		 0, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR",		 1, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR VTT",		 2, 0, 10, 1, 0 },</div><div class='hunk'>@@ -353,7 +356,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> 		{ "AUX5 Fan",		39, 2, 60, 1, 0 },</div><div class='ctx'> 		{ NULL, 0, 0, 0, 0, 0 } }</div><div class='ctx'> 	},</div><div class='del'>-	{ 0x0014, "Abit AB9 Pro", {</div><div class='add'>+	{ 0x0014, NULL /* Abit AB9 Pro, need DMI string */, {</div><div class='ctx'> 		{ "CPU Core",		 0, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR",		 1, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR VTT",		 2, 0, 10, 1, 0 },</div><div class='hunk'>@@ -374,7 +377,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> 		{ "SYS Fan",		34, 2, 60, 1, 0 },</div><div class='ctx'> 		{ NULL, 0, 0, 0, 0, 0 } }</div><div class='ctx'> 	},</div><div class='del'>-	{ 0x0015, "unknown", {</div><div class='add'>+	{ 0x0015, NULL /* Unknown, need DMI string */, {</div><div class='ctx'> 		{ "CPU Core",		 0, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR",		 1, 0, 20, 1, 0 },</div><div class='ctx'> 		{ "DDR VTT",		 2, 0, 10, 1, 0 },</div><div class='hunk'>@@ -398,7 +401,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> 		{ "AUX3 Fan",		36, 2, 60, 1, 0 },</div><div class='ctx'> 		{ NULL, 0, 0, 0, 0, 0 } }</div><div class='ctx'> 	},</div><div class='del'>-	{ 0x0016, "AW9D-MAX", {</div><div class='add'>+	{ 0x0016, NULL /* AW9D-MAX, need DMI string */, {</div><div class='ctx'> 		{ "CPU Core",		 0, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR2",		 1, 0, 20, 1, 0 },</div><div class='ctx'> 		{ "DDR2 VTT",		 2, 0, 10, 1, 0 },</div><div class='hunk'>@@ -426,7 +429,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> 		{ "OTES1 Fan",		38, 2, 60, 1, 0 },</div><div class='ctx'> 		{ NULL, 0, 0, 0, 0, 0 } }</div><div class='ctx'> 	},</div><div class='del'>-	{ 0x0017, "unknown", {</div><div class='add'>+	{ 0x0017, NULL /* Unknown, need DMI string */, {</div><div class='ctx'> 		{ "CPU Core",		 0, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR2",		 1, 0, 20, 1, 0 },</div><div class='ctx'> 		{ "DDR2 VTT",		 2, 0, 10, 1, 0 },</div><div class='hunk'>@@ -451,7 +454,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> 		{ "AUX3 FAN",		37, 2, 60, 1, 0 },</div><div class='ctx'> 		{ NULL, 0, 0, 0, 0, 0 } }</div><div class='ctx'> 	},</div><div class='del'>-	{ 0x0018, "unknown", {</div><div class='add'>+	{ 0x0018, NULL /* Unknown, need DMI string */, {</div><div class='ctx'> 		{ "CPU Core",		 0, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR2",		 1, 0, 20, 1, 0 },</div><div class='ctx'> 		{ "DDR2 VTT",		 2, 0, 10, 1, 0 },</div><div class='hunk'>@@ -478,7 +481,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> 		{ "AUX3 Fan",		36, 2, 60, 1, 0 },</div><div class='ctx'> 		{ NULL, 0, 0, 0, 0, 0 } }</div><div class='ctx'> 	},</div><div class='del'>-	{ 0x0019, "unknown", {</div><div class='add'>+	{ 0x0019, NULL /* Unknown, need DMI string */, {</div><div class='ctx'> 		{ "CPU Core",		 7, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR2",		13, 0, 20, 1, 0 },</div><div class='ctx'> 		{ "DDR2 VTT",		14, 0, 10, 1, 0 },</div><div class='hunk'>@@ -505,7 +508,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> 		{ "AUX3 FAN",		36, 2, 60, 1, 0 },</div><div class='ctx'> 		{ NULL, 0, 0, 0, 0, 0 } }</div><div class='ctx'> 	},</div><div class='del'>-	{ 0x001A, "Abit IP35 Pro", {</div><div class='add'>+	{ 0x001A, "IP35 Pro(Intel P35-ICH9R)", {</div><div class='ctx'> 		{ "CPU Core",		 0, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR2",		 1, 0, 20, 1, 0 },</div><div class='ctx'> 		{ "DDR2 VTT",		 2, 0, 10, 1, 0 },</div><div class='hunk'>@@ -533,7 +536,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> 		{ "AUX4 Fan",		37, 2, 60, 1, 0 },</div><div class='ctx'> 		{ NULL, 0, 0, 0, 0, 0 } }</div><div class='ctx'> 	},</div><div class='del'>-	{ 0x001B, "unknown", {</div><div class='add'>+	{ 0x001B, NULL /* Unknown, need DMI string */, {</div><div class='ctx'> 		{ "CPU Core",		 0, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR3",		 1, 0, 20, 1, 0 },</div><div class='ctx'> 		{ "DDR3 VTT",		 2, 0, 10, 1, 0 },</div><div class='hunk'>@@ -560,7 +563,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> 		{ "AUX3 Fan",		36, 2, 60, 1, 0 },</div><div class='ctx'> 		{ NULL, 0, 0, 0, 0, 0 } }</div><div class='ctx'> 	},</div><div class='del'>-	{ 0x001C, "unknown", {</div><div class='add'>+	{ 0x001C, NULL /* Unknown, need DMI string */, {</div><div class='ctx'> 		{ "CPU Core",		 0, 0, 10, 1, 0 },</div><div class='ctx'> 		{ "DDR2",		 1, 0, 20, 1, 0 },</div><div class='ctx'> 		{ "DDR2 VTT",		 2, 0, 10, 1, 0 },</div><div class='hunk'>@@ -935,9 +938,18 @@ static int __devinit abituguru3_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto abituguru3_probe_error;</div><div class='ctx'> 	}</div><div class='ctx'> 	data-&gt;sensors = abituguru3_motherboards[i].sensors;</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_INFO ABIT_UGURU3_NAME ": found Abit uGuru3, motherboard "</div><div class='del'>-		"ID: %04X (%s)\n", (unsigned int)id,</div><div class='del'>-		abituguru3_motherboards[i].name);</div><div class='add'>+		"ID: %04X\n", (unsigned int)id);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DMI</div><div class='add'>+	if (!abituguru3_motherboards[i].dmi_name) {</div><div class='add'>+		printk(KERN_WARNING ABIT_UGURU3_NAME ": this motherboard was "</div><div class='add'>+			"not detected using DMI. Please send the output of "</div><div class='add'>+			"\"dmidecode\" to the abituguru3 maintainer"</div><div class='add'>+			"(see MAINTAINERS)\n");</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Fill the sysfs attr array */</div><div class='ctx'> 	sysfs_attr_i = 0;</div><div class='hunk'>@@ -1109,6 +1121,46 @@ static struct platform_driver abituguru3_driver = {</div><div class='ctx'> 	.resume = abituguru3_resume</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DMI</div><div class='add'>+</div><div class='add'>+static int __init abituguru3_dmi_detect(void)</div><div class='add'>+{</div><div class='add'>+	const char *board_vendor, *board_name;</div><div class='add'>+	int i, err = (force) ? 1 : -ENODEV;</div><div class='add'>+</div><div class='add'>+	board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);</div><div class='add'>+	if (!board_vendor || strcmp(board_vendor, "http://www.abit.com.tw/"))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	board_name = dmi_get_system_info(DMI_BOARD_NAME);</div><div class='add'>+	if (!board_name)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; abituguru3_motherboards[i].id; i++) {</div><div class='add'>+		const char *dmi_name = abituguru3_motherboards[i].dmi_name;</div><div class='add'>+		if (dmi_name &amp;&amp; !strcmp(dmi_name, board_name))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!abituguru3_motherboards[i].id)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_DMI */</div><div class='add'>+</div><div class='add'>+static inline int abituguru3_dmi_detect(void)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_DMI */</div><div class='add'>+</div><div class='add'>+/* FIXME: Manual detection should die eventually; we need to collect stable</div><div class='add'>+ *        DMI model names first before we can rely entirely on CONFIG_DMI.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> static int __init abituguru3_detect(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* See if there is an uguru3 there. An idle uGuru3 will hold 0x00 or</div><div class='hunk'>@@ -1119,7 +1171,7 @@ static int __init abituguru3_detect(void)</div><div class='ctx'> 	if (((data_val == 0x00) || (data_val == 0x08)) &amp;&amp;</div><div class='ctx'> 			((cmd_val == 0xAC) || (cmd_val == 0x05) ||</div><div class='ctx'> 			 (cmd_val == 0x55)))</div><div class='del'>-		return ABIT_UGURU3_BASE;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ABIT_UGURU3_DEBUG("no Abit uGuru3 found, data = 0x%02X, cmd = "</div><div class='ctx'> 		"0x%02X\n", (unsigned int)data_val, (unsigned int)cmd_val);</div><div class='hunk'>@@ -1127,7 +1179,7 @@ static int __init abituguru3_detect(void)</div><div class='ctx'> 	if (force) {</div><div class='ctx'> 		printk(KERN_INFO ABIT_UGURU3_NAME ": Assuming Abit uGuru3 is "</div><div class='ctx'> 				"present because of \"force\" parameter\n");</div><div class='del'>-		return ABIT_UGURU3_BASE;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* No uGuru3 found */</div><div class='hunk'>@@ -1138,27 +1190,29 @@ static struct platform_device *abituguru3_pdev;</div><div class='ctx'> </div><div class='ctx'> static int __init abituguru3_init(void)</div><div class='ctx'> {</div><div class='del'>-	int address, err;</div><div class='ctx'> 	struct resource res = { .flags = IORESOURCE_IO };</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DMI</div><div class='del'>-	const char *board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);</div><div class='del'>-</div><div class='del'>-	/* safety check, refuse to load on non Abit motherboards */</div><div class='del'>-	if (!force &amp;&amp; (!board_vendor ||</div><div class='del'>-			strcmp(board_vendor, "http://www.abit.com.tw/")))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	address = abituguru3_detect();</div><div class='del'>-	if (address &lt; 0)</div><div class='del'>-		return address;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Attempt DMI detection first */</div><div class='add'>+	err = abituguru3_dmi_detect();</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Fall back to manual detection if there was no exact</div><div class='add'>+	 * board name match, or force was specified.</div><div class='add'>+	 */</div><div class='add'>+	if (err &gt; 0) {</div><div class='add'>+		err = abituguru3_detect();</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = platform_driver_register(&amp;abituguru3_driver);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='del'>-	abituguru3_pdev = platform_device_alloc(ABIT_UGURU3_NAME, address);</div><div class='add'>+	abituguru3_pdev = platform_device_alloc(ABIT_UGURU3_NAME,</div><div class='add'>+						ABIT_UGURU3_BASE);</div><div class='ctx'> 	if (!abituguru3_pdev) {</div><div class='ctx'> 		printk(KERN_ERR ABIT_UGURU3_NAME</div><div class='ctx'> 			": Device allocation failed\n");</div><div class='hunk'>@@ -1166,8 +1220,8 @@ static int __init abituguru3_init(void)</div><div class='ctx'> 		goto exit_driver_unregister;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	res.start = address;</div><div class='del'>-	res.end = address + ABIT_UGURU3_REGION_LENGTH - 1;</div><div class='add'>+	res.start = ABIT_UGURU3_BASE;</div><div class='add'>+	res.end = ABIT_UGURU3_BASE + ABIT_UGURU3_REGION_LENGTH - 1;</div><div class='ctx'> 	res.name = ABIT_UGURU3_NAME;</div><div class='ctx'> </div><div class='ctx'> 	err = platform_device_add_resources(abituguru3_pdev, &amp;res, 1);</div><div class='head'>diff --git a/drivers/hwmon/ad7414.c b/drivers/hwmon/ad7414.c<br/>new file mode 100644<br/>index 000000000000..bfda8c80ef24<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/ad7414.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/ad7414.c</a></div><div class='hunk'>@@ -0,0 +1,268 @@</div><div class='add'>+/*</div><div class='add'>+ * An hwmon driver for the Analog Devices AD7414</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2006 Stefan Roese &lt;sr at denx.de&gt;, DENX Software Engineering</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 PIKA Technologies</div><div class='add'>+ *   Sean MacLennan &lt;smaclennan@pikatech.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Spansion Inc.</div><div class='add'>+ *   Frank Edelhaeuser &lt;frank.edelhaeuser at spansion.com&gt;</div><div class='add'>+ *   (converted to "new style" I2C driver model, removed checkpatch.pl warnings)</div><div class='add'>+ *</div><div class='add'>+ * Based on ad7418.c</div><div class='add'>+ * Copyright 2006 Tower Technologies, Alessandro Zummo &lt;a.zummo at towertech.it&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/hwmon.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-sysfs.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* AD7414 registers */</div><div class='add'>+#define AD7414_REG_TEMP		0x00</div><div class='add'>+#define AD7414_REG_CONF		0x01</div><div class='add'>+#define AD7414_REG_T_HIGH	0x02</div><div class='add'>+#define AD7414_REG_T_LOW	0x03</div><div class='add'>+</div><div class='add'>+static u8 AD7414_REG_LIMIT[] = { AD7414_REG_T_HIGH, AD7414_REG_T_LOW };</div><div class='add'>+</div><div class='add'>+struct ad7414_data {</div><div class='add'>+	struct device		*hwmon_dev;</div><div class='add'>+	struct mutex		lock;	/* atomic read data updates */</div><div class='add'>+	char			valid;	/* !=0 if following fields are valid */</div><div class='add'>+	unsigned long		next_update;	/* In jiffies */</div><div class='add'>+	s16			temp_input;	/* Register values */</div><div class='add'>+	s8			temps[ARRAY_SIZE(AD7414_REG_LIMIT)];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* REG: (0.25C/bit, two's complement) &lt;&lt; 6 */</div><div class='add'>+static inline int ad7414_temp_from_reg(s16 reg)</div><div class='add'>+{</div><div class='add'>+	/* use integer division instead of equivalent right shift to</div><div class='add'>+	 * guarantee arithmetic shift and preserve the sign</div><div class='add'>+	 */</div><div class='add'>+	return ((int)reg / 64) * 250;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ad7414_read(struct i2c_client *client, u8 reg)</div><div class='add'>+{</div><div class='add'>+	if (reg == AD7414_REG_TEMP) {</div><div class='add'>+		int value = i2c_smbus_read_word_data(client, reg);</div><div class='add'>+		return (value &lt; 0) ? value : swab16(value);</div><div class='add'>+	} else</div><div class='add'>+		return i2c_smbus_read_byte_data(client, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ad7414_write(struct i2c_client *client, u8 reg, u8 value)</div><div class='add'>+{</div><div class='add'>+	return i2c_smbus_write_byte_data(client, reg, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ad7414_data *ad7414_update_device(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct ad7414_data *data = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (time_after(jiffies, data-&gt;next_update) || !data-&gt;valid) {</div><div class='add'>+		int value, i;</div><div class='add'>+</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "starting ad7414 update\n");</div><div class='add'>+</div><div class='add'>+		value = ad7414_read(client, AD7414_REG_TEMP);</div><div class='add'>+		if (value &lt; 0)</div><div class='add'>+			dev_dbg(&amp;client-&gt;dev, "AD7414_REG_TEMP err %d\n",</div><div class='add'>+				value);</div><div class='add'>+		else</div><div class='add'>+			data-&gt;temp_input = value;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(AD7414_REG_LIMIT); ++i) {</div><div class='add'>+			value = ad7414_read(client, AD7414_REG_LIMIT[i]);</div><div class='add'>+			if (value &lt; 0)</div><div class='add'>+				dev_dbg(&amp;client-&gt;dev, "AD7414 reg %d err %d\n",</div><div class='add'>+					AD7414_REG_LIMIT[i], value);</div><div class='add'>+			else</div><div class='add'>+				data-&gt;temps[i] = value;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		data-&gt;next_update = jiffies + HZ + HZ / 2;</div><div class='add'>+		data-&gt;valid = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_temp_input(struct device *dev,</div><div class='add'>+			       struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct ad7414_data *data = ad7414_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", ad7414_temp_from_reg(data-&gt;temp_input));</div><div class='add'>+}</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp_input, NULL, 0);</div><div class='add'>+</div><div class='add'>+static ssize_t show_max_min(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			  char *buf)</div><div class='add'>+{</div><div class='add'>+	int index = to_sensor_dev_attr(attr)-&gt;index;</div><div class='add'>+	struct ad7414_data *data = ad7414_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", data-&gt;temps[index] * 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t set_max_min(struct device *dev,</div><div class='add'>+			   struct device_attribute *attr,</div><div class='add'>+			   const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct ad7414_data *data = i2c_get_clientdata(client);</div><div class='add'>+	int index = to_sensor_dev_attr(attr)-&gt;index;</div><div class='add'>+	u8 reg = AD7414_REG_LIMIT[index];</div><div class='add'>+	long temp = simple_strtol(buf, NULL, 10);</div><div class='add'>+</div><div class='add'>+	temp = SENSORS_LIMIT(temp, -40000, 85000);</div><div class='add'>+	temp = (temp + (temp &lt; 0 ? -500 : 500)) / 1000;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+	data-&gt;temps[index] = temp;</div><div class='add'>+	ad7414_write(client, reg, temp);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;lock);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO,</div><div class='add'>+			  show_max_min, set_max_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO,</div><div class='add'>+			  show_max_min, set_max_min, 1);</div><div class='add'>+</div><div class='add'>+static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			  char *buf)</div><div class='add'>+{</div><div class='add'>+	int bitnr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='add'>+	struct ad7414_data *data = ad7414_update_device(dev);</div><div class='add'>+	int value = (data-&gt;temp_input &gt;&gt; bitnr) &amp; 1;</div><div class='add'>+	return sprintf(buf, "%d\n", value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, show_alarm, NULL, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 4);</div><div class='add'>+</div><div class='add'>+static struct attribute *ad7414_attributes[] = {</div><div class='add'>+	&amp;sensor_dev_attr_temp1_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp1_max.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp1_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp1_max_alarm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp1_min_alarm.dev_attr.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group ad7414_group = {</div><div class='add'>+	.attrs = ad7414_attributes,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ad7414_probe(struct i2c_client *client,</div><div class='add'>+			const struct i2c_device_id *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct ad7414_data *data;</div><div class='add'>+	int conf;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter, I2C_FUNC_SMBUS_BYTE_DATA |</div><div class='add'>+				     I2C_FUNC_SMBUS_READ_WORD_DATA))</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	data = kzalloc(sizeof(struct ad7414_data), GFP_KERNEL);</div><div class='add'>+	if (!data) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(client, data);</div><div class='add'>+	mutex_init(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;client-&gt;dev, "chip found\n");</div><div class='add'>+</div><div class='add'>+	/* Make sure the chip is powered up. */</div><div class='add'>+	conf = i2c_smbus_read_byte_data(client, AD7414_REG_CONF);</div><div class='add'>+	if (conf &lt; 0)</div><div class='add'>+		dev_warn(&amp;client-&gt;dev,</div><div class='add'>+			 "ad7414_probe unable to read config register.\n");</div><div class='add'>+	else {</div><div class='add'>+		conf &amp;= ~(1 &lt;&lt; 7);</div><div class='add'>+		i2c_smbus_write_byte_data(client, AD7414_REG_CONF, conf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register sysfs hooks */</div><div class='add'>+	err = sysfs_create_group(&amp;client-&gt;dev.kobj, &amp;ad7414_group);</div><div class='add'>+	if (err)</div><div class='add'>+		goto exit_free;</div><div class='add'>+</div><div class='add'>+	data-&gt;hwmon_dev = hwmon_device_register(&amp;client-&gt;dev);</div><div class='add'>+	if (IS_ERR(data-&gt;hwmon_dev)) {</div><div class='add'>+		err = PTR_ERR(data-&gt;hwmon_dev);</div><div class='add'>+		goto exit_remove;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+exit_remove:</div><div class='add'>+	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;ad7414_group);</div><div class='add'>+exit_free:</div><div class='add'>+	kfree(data);</div><div class='add'>+exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit ad7414_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct ad7414_data *data = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	hwmon_device_unregister(data-&gt;hwmon_dev);</div><div class='add'>+	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;ad7414_group);</div><div class='add'>+	kfree(data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id ad7414_id[] = {</div><div class='add'>+	{ "ad7414", 0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_driver ad7414_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "ad7414",</div><div class='add'>+	},</div><div class='add'>+	.probe	= ad7414_probe,</div><div class='add'>+	.remove	= __devexit_p(ad7414_remove),</div><div class='add'>+	.id_table = ad7414_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ad7414_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;ad7414_driver);</div><div class='add'>+}</div><div class='add'>+module_init(ad7414_init);</div><div class='add'>+</div><div class='add'>+static void __exit ad7414_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;ad7414_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(ad7414_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Stefan Roese &lt;sr at denx.de&gt;, "</div><div class='add'>+	      "Frank Edelhaeuser &lt;frank.edelhaeuser at spansion.com&gt;");</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("AD7414 driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/hwmon/adcxx.c b/drivers/hwmon/adcxx.c<br/>new file mode 100644<br/>index 000000000000..242294db3db6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/adcxx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/adcxx.c</a></div><div class='hunk'>@@ -0,0 +1,329 @@</div><div class='add'>+/*</div><div class='add'>+ * adcxx.c</div><div class='add'>+ *</div><div class='add'>+ * The adcxx4s is an AD converter family from National Semiconductor (NS).</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Marc Pignat &lt;marc.pignat@hevs.ch&gt;</div><div class='add'>+ *</div><div class='add'>+ * The adcxx4s communicates with a host processor via an SPI/Microwire Bus</div><div class='add'>+ * interface. This driver supports the whole family of devices with name</div><div class='add'>+ * ADC&lt;bb&gt;&lt;c&gt;S&lt;sss&gt;, where</div><div class='add'>+ * * bb is the resolution in number of bits (8, 10, 12)</div><div class='add'>+ * * c is the number of channels (1, 2, 4, 8)</div><div class='add'>+ * * sss is the maximum conversion speed (021 for 200 kSPS, 051 for 500 kSPS</div><div class='add'>+ *   and 101 for 1 MSPS)</div><div class='add'>+ *</div><div class='add'>+ * Complete datasheets are available at National's website here:</div><div class='add'>+ * http://www.national.com/ds/DC/ADC&lt;bb&gt;&lt;c&gt;S&lt;sss&gt;.pdf</div><div class='add'>+ *</div><div class='add'>+ * Handling of 8, 10 and 12 bits converters are the same, the</div><div class='add'>+ * unavailable bits are 0 :)</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='add'>+#include &lt;linux/hwmon.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-sysfs.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRVNAME		"adcxx"</div><div class='add'>+</div><div class='add'>+struct adcxx {</div><div class='add'>+	struct device *hwmon_dev;</div><div class='add'>+	struct mutex lock;</div><div class='add'>+	u32 channels;</div><div class='add'>+	u32 reference; /* in millivolts */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* sysfs hook function */</div><div class='add'>+static ssize_t adcxx_read(struct device *dev,</div><div class='add'>+		struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='add'>+	struct adcxx *adc = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+	u8 tx_buf[2] = { attr-&gt;index &lt;&lt; 3 }; /* other bits are don't care */</div><div class='add'>+	u8 rx_buf[2];</div><div class='add'>+	int status;</div><div class='add'>+	int value;</div><div class='add'>+</div><div class='add'>+	if (mutex_lock_interruptible(&amp;adc-&gt;lock))</div><div class='add'>+		return -ERESTARTSYS;</div><div class='add'>+</div><div class='add'>+	status = spi_write_then_read(spi, tx_buf, sizeof(tx_buf),</div><div class='add'>+					rx_buf, sizeof(rx_buf));</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		dev_warn(dev, "spi_write_then_read failed with status %d\n",</div><div class='add'>+				status);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	value = (rx_buf[0] &lt;&lt; 8) + rx_buf[1];</div><div class='add'>+	dev_dbg(dev, "raw value = 0x%x\n", value);</div><div class='add'>+</div><div class='add'>+	value = value * adc-&gt;reference &gt;&gt; 12;</div><div class='add'>+	status = sprintf(buf, "%d\n", value);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;adc-&gt;lock);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t adcxx_show_min(struct device *dev,</div><div class='add'>+		struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	/* The minimum reference is 0 for this chip family */</div><div class='add'>+	return sprintf(buf, "0\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t adcxx_show_max(struct device *dev,</div><div class='add'>+		struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+	struct adcxx *adc = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+	u32 reference;</div><div class='add'>+</div><div class='add'>+	if (mutex_lock_interruptible(&amp;adc-&gt;lock))</div><div class='add'>+		return -ERESTARTSYS;</div><div class='add'>+</div><div class='add'>+	reference = adc-&gt;reference;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;adc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", reference);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t adcxx_set_max(struct device *dev,</div><div class='add'>+	struct device_attribute *devattr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+	struct adcxx *adc = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+	unsigned long value;</div><div class='add'>+</div><div class='add'>+	if (strict_strtoul(buf, 10, &amp;value))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (mutex_lock_interruptible(&amp;adc-&gt;lock))</div><div class='add'>+		return -ERESTARTSYS;</div><div class='add'>+</div><div class='add'>+	adc-&gt;reference = value;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;adc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t adcxx_show_name(struct device *dev, struct device_attribute</div><div class='add'>+			      *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+	struct adcxx *adc = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "adcxx%ds\n", adc-&gt;channels);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute ad_input[] = {</div><div class='add'>+	SENSOR_ATTR(name, S_IRUGO, adcxx_show_name, NULL, 0),</div><div class='add'>+	SENSOR_ATTR(in_min, S_IRUGO, adcxx_show_min, NULL, 0),</div><div class='add'>+	SENSOR_ATTR(in_max, S_IWUSR | S_IRUGO, adcxx_show_max,</div><div class='add'>+					adcxx_set_max, 0),</div><div class='add'>+	SENSOR_ATTR(in0_input, S_IRUGO, adcxx_read, NULL, 0),</div><div class='add'>+	SENSOR_ATTR(in1_input, S_IRUGO, adcxx_read, NULL, 1),</div><div class='add'>+	SENSOR_ATTR(in2_input, S_IRUGO, adcxx_read, NULL, 2),</div><div class='add'>+	SENSOR_ATTR(in3_input, S_IRUGO, adcxx_read, NULL, 3),</div><div class='add'>+	SENSOR_ATTR(in4_input, S_IRUGO, adcxx_read, NULL, 4),</div><div class='add'>+	SENSOR_ATTR(in5_input, S_IRUGO, adcxx_read, NULL, 5),</div><div class='add'>+	SENSOR_ATTR(in6_input, S_IRUGO, adcxx_read, NULL, 6),</div><div class='add'>+	SENSOR_ATTR(in7_input, S_IRUGO, adcxx_read, NULL, 7),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int __devinit adcxx_probe(struct spi_device *spi, int channels)</div><div class='add'>+{</div><div class='add'>+	struct adcxx *adc;</div><div class='add'>+	int status;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	adc = kzalloc(sizeof *adc, GFP_KERNEL);</div><div class='add'>+	if (!adc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* set a default value for the reference */</div><div class='add'>+	adc-&gt;reference = 3300;</div><div class='add'>+	adc-&gt;channels = channels;</div><div class='add'>+	mutex_init(&amp;adc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;adc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;spi-&gt;dev, adc);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3 + adc-&gt;channels; i++) {</div><div class='add'>+		status = device_create_file(&amp;spi-&gt;dev, &amp;ad_input[i].dev_attr);</div><div class='add'>+		if (status) {</div><div class='add'>+			dev_err(&amp;spi-&gt;dev, "device_create_file failed.\n");</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adc-&gt;hwmon_dev = hwmon_device_register(&amp;spi-&gt;dev);</div><div class='add'>+	if (IS_ERR(adc-&gt;hwmon_dev)) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "hwmon_device_register failed.\n");</div><div class='add'>+		status = PTR_ERR(adc-&gt;hwmon_dev);</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;adc-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	for (i--; i &gt;= 0; i--)</div><div class='add'>+		device_remove_file(&amp;spi-&gt;dev, &amp;ad_input[i].dev_attr);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;spi-&gt;dev, NULL);</div><div class='add'>+	mutex_unlock(&amp;adc-&gt;lock);</div><div class='add'>+	kfree(adc);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit adcxx1s_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	return adcxx_probe(spi, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit adcxx2s_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	return adcxx_probe(spi, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit adcxx4s_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	return adcxx_probe(spi, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit adcxx8s_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	return adcxx_probe(spi, 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit adcxx_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct adcxx *adc = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;adc-&gt;lock);</div><div class='add'>+	hwmon_device_unregister(adc-&gt;hwmon_dev);</div><div class='add'>+	for (i = 0; i &lt; 3 + adc-&gt;channels; i++)</div><div class='add'>+		device_remove_file(&amp;spi-&gt;dev, &amp;ad_input[i].dev_attr);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;spi-&gt;dev, NULL);</div><div class='add'>+	mutex_unlock(&amp;adc-&gt;lock);</div><div class='add'>+	kfree(adc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct spi_driver adcxx1s_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "adcxx1s",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe	= adcxx1s_probe,</div><div class='add'>+	.remove	= __devexit_p(adcxx_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_driver adcxx2s_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "adcxx2s",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe	= adcxx2s_probe,</div><div class='add'>+	.remove	= __devexit_p(adcxx_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_driver adcxx4s_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "adcxx4s",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe	= adcxx4s_probe,</div><div class='add'>+	.remove	= __devexit_p(adcxx_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_driver adcxx8s_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "adcxx8s",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe	= adcxx8s_probe,</div><div class='add'>+	.remove	= __devexit_p(adcxx_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init init_adcxx(void)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	status = spi_register_driver(&amp;adcxx1s_driver);</div><div class='add'>+	if (status)</div><div class='add'>+		goto reg_1_failed;</div><div class='add'>+</div><div class='add'>+	status = spi_register_driver(&amp;adcxx2s_driver);</div><div class='add'>+	if (status)</div><div class='add'>+		goto reg_2_failed;</div><div class='add'>+</div><div class='add'>+	status = spi_register_driver(&amp;adcxx4s_driver);</div><div class='add'>+	if (status)</div><div class='add'>+		goto reg_4_failed;</div><div class='add'>+</div><div class='add'>+	status = spi_register_driver(&amp;adcxx8s_driver);</div><div class='add'>+	if (status)</div><div class='add'>+		goto reg_8_failed;</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+</div><div class='add'>+reg_8_failed:</div><div class='add'>+	spi_unregister_driver(&amp;adcxx4s_driver);</div><div class='add'>+reg_4_failed:</div><div class='add'>+	spi_unregister_driver(&amp;adcxx2s_driver);</div><div class='add'>+reg_2_failed:</div><div class='add'>+	spi_unregister_driver(&amp;adcxx1s_driver);</div><div class='add'>+reg_1_failed:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit exit_adcxx(void)</div><div class='add'>+{</div><div class='add'>+	spi_unregister_driver(&amp;adcxx1s_driver);</div><div class='add'>+	spi_unregister_driver(&amp;adcxx2s_driver);</div><div class='add'>+	spi_unregister_driver(&amp;adcxx4s_driver);</div><div class='add'>+	spi_unregister_driver(&amp;adcxx8s_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(init_adcxx);</div><div class='add'>+module_exit(exit_adcxx);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Marc Pignat");</div><div class='add'>+MODULE_DESCRIPTION("National Semiconductor adcxx8sxxx Linux driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS("adcxx1s");</div><div class='add'>+MODULE_ALIAS("adcxx2s");</div><div class='add'>+MODULE_ALIAS("adcxx4s");</div><div class='add'>+MODULE_ALIAS("adcxx8s");</div><div class='head'>diff --git a/drivers/hwmon/adt7473.c b/drivers/hwmon/adt7473.c<br/>index ce4a7cb5a116..3a0b63136479 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/adt7473.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/adt7473.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/adt7473.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/adt7473.c</a></div><div class='hunk'>@@ -39,32 +39,20 @@ I2C_CLIENT_INSMOD_1(adt7473);</div><div class='ctx'> #define ADT7473_REG_BASE_ADDR			0x20</div><div class='ctx'> </div><div class='ctx'> #define ADT7473_REG_VOLT_BASE_ADDR		0x21</div><div class='del'>-#define ADT7473_REG_VOLT_MAX_ADDR		0x22</div><div class='ctx'> #define ADT7473_REG_VOLT_MIN_BASE_ADDR		0x46</div><div class='del'>-#define ADT7473_REG_VOLT_MIN_MAX_ADDR		0x49</div><div class='ctx'> </div><div class='ctx'> #define ADT7473_REG_TEMP_BASE_ADDR		0x25</div><div class='del'>-#define ADT7473_REG_TEMP_MAX_ADDR		0x27</div><div class='ctx'> #define ADT7473_REG_TEMP_LIMITS_BASE_ADDR	0x4E</div><div class='del'>-#define ADT7473_REG_TEMP_LIMITS_MAX_ADDR	0x53</div><div class='ctx'> #define ADT7473_REG_TEMP_TMIN_BASE_ADDR		0x67</div><div class='del'>-#define ADT7473_REG_TEMP_TMIN_MAX_ADDR		0x69</div><div class='ctx'> #define ADT7473_REG_TEMP_TMAX_BASE_ADDR		0x6A</div><div class='del'>-#define ADT7473_REG_TEMP_TMAX_MAX_ADDR		0x6C</div><div class='ctx'> </div><div class='ctx'> #define ADT7473_REG_FAN_BASE_ADDR		0x28</div><div class='del'>-#define ADT7473_REG_FAN_MAX_ADDR		0x2F</div><div class='ctx'> #define ADT7473_REG_FAN_MIN_BASE_ADDR		0x54</div><div class='del'>-#define ADT7473_REG_FAN_MIN_MAX_ADDR		0x5B</div><div class='ctx'> </div><div class='ctx'> #define ADT7473_REG_PWM_BASE_ADDR		0x30</div><div class='del'>-#define ADT7473_REG_PWM_MAX_ADDR		0x32</div><div class='ctx'> #define	ADT7473_REG_PWM_MIN_BASE_ADDR		0x64</div><div class='del'>-#define ADT7473_REG_PWM_MIN_MAX_ADDR		0x66</div><div class='ctx'> #define ADT7473_REG_PWM_MAX_BASE_ADDR		0x38</div><div class='del'>-#define ADT7473_REG_PWM_MAX_MAX_ADDR		0x3A</div><div class='ctx'> #define ADT7473_REG_PWM_BHVR_BASE_ADDR		0x5C</div><div class='del'>-#define ADT7473_REG_PWM_BHVR_MAX_ADDR		0x5E</div><div class='ctx'> #define		ADT7473_PWM_BHVR_MASK		0xE0</div><div class='ctx'> #define		ADT7473_PWM_BHVR_SHIFT		5</div><div class='ctx'> </div><div class='hunk'>@@ -102,7 +90,6 @@ I2C_CLIENT_INSMOD_1(adt7473);</div><div class='ctx'> #define		ADT7473_FAN4_ALARM		0x20</div><div class='ctx'> #define		ADT7473_R1T_SHORT		0x40</div><div class='ctx'> #define		ADT7473_R2T_SHORT		0x80</div><div class='del'>-#define ADT7473_REG_MAX_ADDR			0x80</div><div class='ctx'> </div><div class='ctx'> #define ALARM2(x)	((x) &lt;&lt; 8)</div><div class='ctx'> </div><div class='hunk'>@@ -583,10 +570,9 @@ static ssize_t set_max_duty_at_crit(struct device *dev,</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct adt7473_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	int temp = simple_strtol(buf, NULL, 10);</div><div class='del'>-	temp = temp &amp;&amp; 0xFF;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;lock);</div><div class='del'>-	data-&gt;max_duty_at_overheat = temp;</div><div class='add'>+	data-&gt;max_duty_at_overheat = !!temp;</div><div class='ctx'> 	reg = i2c_smbus_read_byte_data(client, ADT7473_REG_CFG4);</div><div class='ctx'> 	if (temp)</div><div class='ctx'> 		reg |= ADT7473_CFG4_MAX_DUTY_AT_OVT;</div><div class='head'>diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c<br/>index aacc0c4b809c..b06b8e090a27 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/applesmc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/applesmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/applesmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/applesmc.c</a></div><div class='hunk'>@@ -98,6 +98,12 @@ static const char* temperature_sensors_sets[][36] = {</div><div class='ctx'> 	  "TH1P", "TH2P", "TH3P", "TMAP", "TMAS", "TMBS", "TM0P", "TM0S",</div><div class='ctx'> 	  "TM1P", "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", "TM8S", "TM9P",</div><div class='ctx'> 	  "TM9S", "TN0H", "TS0C", NULL },</div><div class='add'>+/* Set 5: iMac */</div><div class='add'>+	{ "TC0D", "TA0P", "TG0P", "TG0D", "TG0H", "TH0P", "Tm0P", "TO0P",</div><div class='add'>+	  "Tp0C", NULL },</div><div class='add'>+/* Set 6: Macbook3 set */</div><div class='add'>+	{ "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TTF0", "TW0P", "Th0H",</div><div class='add'>+	  "Th0S", "Th1H", NULL },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* List of keys used to read/write fan speeds */</div><div class='hunk'>@@ -1223,6 +1229,10 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {</div><div class='ctx'> 	{ .accelerometer = 0, .light = 0, .temperature_set = 3 },</div><div class='ctx'> /* MacPro: temperature set 4 */</div><div class='ctx'> 	{ .accelerometer = 0, .light = 0, .temperature_set = 4 },</div><div class='add'>+/* iMac: temperature set 5 */</div><div class='add'>+	{ .accelerometer = 0, .light = 0, .temperature_set = 5 },</div><div class='add'>+/* MacBook3: accelerometer and temperature set 6 */</div><div class='add'>+	{ .accelerometer = 1, .light = 0, .temperature_set = 6 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".</div><div class='hunk'>@@ -1232,10 +1242,14 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {</div><div class='ctx'> 	  DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),</div><div class='ctx'> 	  DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") },</div><div class='ctx'> 		(void*)&amp;applesmc_dmi_data[0]},</div><div class='del'>-	{ applesmc_dmi_match, "Apple MacBook", {</div><div class='add'>+	{ applesmc_dmi_match, "Apple MacBook (v2)", {</div><div class='ctx'> 	  DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),</div><div class='ctx'> 	  DMI_MATCH(DMI_PRODUCT_NAME,"MacBook2") },</div><div class='ctx'> 		(void*)&amp;applesmc_dmi_data[1]},</div><div class='add'>+	{ applesmc_dmi_match, "Apple MacBook (v3)", {</div><div class='add'>+	  DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),</div><div class='add'>+	  DMI_MATCH(DMI_PRODUCT_NAME,"MacBook3") },</div><div class='add'>+		(void*)&amp;applesmc_dmi_data[6]},</div><div class='ctx'> 	{ applesmc_dmi_match, "Apple MacBook", {</div><div class='ctx'> 	  DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),</div><div class='ctx'> 	  DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") },</div><div class='hunk'>@@ -1248,6 +1262,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {</div><div class='ctx'> 	  DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),</div><div class='ctx'> 	  DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") },</div><div class='ctx'> 		(void*)&amp;applesmc_dmi_data[4]},</div><div class='add'>+	{ applesmc_dmi_match, "Apple iMac", {</div><div class='add'>+	  DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),</div><div class='add'>+	  DMI_MATCH(DMI_PRODUCT_NAME,"iMac") },</div><div class='add'>+		(void*)&amp;applesmc_dmi_data[5]},</div><div class='ctx'> 	{ .ident = NULL }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c<br/>index d191118ba0cb..d6b490d3e36f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/atxp1.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/atxp1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/atxp1.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/atxp1.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("System voltages control via Attansic ATXP1");</div><div class='del'>-MODULE_VERSION("0.6.2");</div><div class='add'>+MODULE_VERSION("0.6.3");</div><div class='ctx'> MODULE_AUTHOR("Sebastian Witt &lt;se.witt@gmx.net&gt;");</div><div class='ctx'> </div><div class='ctx'> #define ATXP1_VID	0x00</div><div class='hunk'>@@ -289,16 +289,16 @@ static int atxp1_detect(struct i2c_client *new_client, int kind,</div><div class='ctx'> 	if (!((i2c_smbus_read_byte_data(new_client, 0x3e) == 0) &amp;&amp;</div><div class='ctx'> 	     (i2c_smbus_read_byte_data(new_client, 0x3f) == 0) &amp;&amp;</div><div class='ctx'> 	     (i2c_smbus_read_byte_data(new_client, 0xfe) == 0) &amp;&amp;</div><div class='del'>-	     (i2c_smbus_read_byte_data(new_client, 0xff) == 0) )) {</div><div class='add'>+	     (i2c_smbus_read_byte_data(new_client, 0xff) == 0)))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-		/* No vendor ID, now checking if registers 0x10,0x11 (non-existent)</div><div class='del'>-		 * showing the same as register 0x00 */</div><div class='del'>-		temp = i2c_smbus_read_byte_data(new_client, 0x00);</div><div class='add'>+	/* No vendor ID, now checking if registers 0x10,0x11 (non-existent)</div><div class='add'>+	 * showing the same as register 0x00 */</div><div class='add'>+	temp = i2c_smbus_read_byte_data(new_client, 0x00);</div><div class='ctx'> </div><div class='del'>-		if (!((i2c_smbus_read_byte_data(new_client, 0x10) == temp) &amp;&amp;</div><div class='del'>-			 (i2c_smbus_read_byte_data(new_client, 0x11) == temp) ))</div><div class='del'>-			return -ENODEV;</div><div class='del'>-	}</div><div class='add'>+	if (!((i2c_smbus_read_byte_data(new_client, 0x10) == temp) &amp;&amp;</div><div class='add'>+	      (i2c_smbus_read_byte_data(new_client, 0x11) == temp)))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* Get VRM */</div><div class='ctx'> 	temp = vid_which_vrm();</div><div class='head'>diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c<br/>index 70239acecc8e..93c17223b527 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/coretemp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/coretemp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/coretemp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/coretemp.c</a></div><div class='hunk'>@@ -413,10 +413,11 @@ static int __init coretemp_init(void)</div><div class='ctx'> 	for_each_online_cpu(i) {</div><div class='ctx'> 		struct cpuinfo_x86 *c = &amp;cpu_data(i);</div><div class='ctx'> </div><div class='del'>-		/* check if family 6, models 0xe, 0xf, 0x16, 0x17 */</div><div class='add'>+		/* check if family 6, models 0xe, 0xf, 0x16, 0x17, 0x1A */</div><div class='ctx'> 		if ((c-&gt;cpuid_level &lt; 0) || (c-&gt;x86 != 0x6) ||</div><div class='ctx'> 		    !((c-&gt;x86_model == 0xe) || (c-&gt;x86_model == 0xf) ||</div><div class='del'>-			(c-&gt;x86_model == 0x16) || (c-&gt;x86_model == 0x17))) {</div><div class='add'>+			(c-&gt;x86_model == 0x16) || (c-&gt;x86_model == 0x17) ||</div><div class='add'>+			(c-&gt;x86_model == 0x1A))) {</div><div class='ctx'> </div><div class='ctx'> 			/* supported CPU not found, but report the unknown</div><div class='ctx'> 			   family 6 CPU */</div><div class='head'>diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c<br/>index 7673f65877e1..cdb8311e4ef7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/dme1737.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/dme1737.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/dme1737.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/dme1737.c</a></div><div class='hunk'>@@ -1,11 +1,11 @@</div><div class='ctx'> /*</div><div class='del'>- * dme1737.c - Driver for the SMSC DME1737, Asus A8000, and SMSC SCH311x</div><div class='del'>- *             Super-I/O chips integrated hardware monitoring features.</div><div class='del'>- * Copyright (c) 2007 Juerg Haefliger &lt;juergh@gmail.com&gt;</div><div class='add'>+ * dme1737.c - Driver for the SMSC DME1737, Asus A8000, SMSC SCH311x and</div><div class='add'>+ *             SCH5027 Super-I/O chips integrated hardware monitoring features.</div><div class='add'>+ * Copyright (c) 2007, 2008 Juerg Haefliger &lt;juergh@gmail.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This driver is an I2C/ISA hybrid, meaning that it uses the I2C bus to access</div><div class='del'>- * the chip registers if a DME1737 (or A8000) is found and the ISA bus if a</div><div class='del'>- * SCH311x chip is found. Both types of chips have very similar hardware</div><div class='add'>+ * the chip registers if a DME1737, A8000, or SCH5027 is found and the ISA bus</div><div class='add'>+ * if a SCH311x chip is found. Both types of chips have very similar hardware</div><div class='ctx'>  * monitoring capabilities but differ in the way they can be accessed.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='hunk'>@@ -48,11 +48,19 @@ static unsigned short force_id;</div><div class='ctx'> module_param(force_id, ushort, 0);</div><div class='ctx'> MODULE_PARM_DESC(force_id, "Override the detected device ID");</div><div class='ctx'> </div><div class='add'>+static int probe_all_addr;</div><div class='add'>+module_param(probe_all_addr, bool, 0);</div><div class='add'>+MODULE_PARM_DESC(probe_all_addr, "Include probing of non-standard LPC "</div><div class='add'>+		 "addresses");</div><div class='add'>+</div><div class='ctx'> /* Addresses to scan */</div><div class='ctx'> static const unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END};</div><div class='ctx'> </div><div class='ctx'> /* Insmod parameters */</div><div class='del'>-I2C_CLIENT_INSMOD_1(dme1737);</div><div class='add'>+I2C_CLIENT_INSMOD_2(dme1737, sch5027);</div><div class='add'>+</div><div class='add'>+/* ISA chip types */</div><div class='add'>+enum isa_chips { sch311x = sch5027 + 1 };</div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------------------</div><div class='ctx'>  * Registers</div><div class='hunk'>@@ -158,6 +166,7 @@ static const u8 DME1737_BIT_ALARM_FAN[] = {10, 11, 12, 13, 22, 23};</div><div class='ctx'> #define DME1737_VERSTEP		0x88</div><div class='ctx'> #define DME1737_VERSTEP_MASK	0xf8</div><div class='ctx'> #define SCH311X_DEVICE		0x8c</div><div class='add'>+#define SCH5027_VERSTEP		0x69</div><div class='ctx'> </div><div class='ctx'> /* Length of ISA address segment */</div><div class='ctx'> #define DME1737_EXTENT	2</div><div class='hunk'>@@ -176,6 +185,8 @@ struct dme1737_data {</div><div class='ctx'> 	int valid;			/* !=0 if following fields are valid */</div><div class='ctx'> 	unsigned long last_update;	/* in jiffies */</div><div class='ctx'> 	unsigned long last_vbat;	/* in jiffies */</div><div class='add'>+	enum chips type;</div><div class='add'>+	const int *in_nominal;		/* pointer to IN_NOMINAL array */</div><div class='ctx'> </div><div class='ctx'> 	u8 vid;</div><div class='ctx'> 	u8 pwm_rr_en;</div><div class='hunk'>@@ -210,20 +221,27 @@ struct dme1737_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Nominal voltage values */</div><div class='del'>-static const int IN_NOMINAL[] = {5000, 2250, 3300, 5000, 12000, 3300, 3300};</div><div class='add'>+static const int IN_NOMINAL_DME1737[] = {5000, 2250, 3300, 5000, 12000, 3300,</div><div class='add'>+					 3300};</div><div class='add'>+static const int IN_NOMINAL_SCH311x[] = {2500, 1500, 3300, 5000, 12000, 3300,</div><div class='add'>+					 3300};</div><div class='add'>+static const int IN_NOMINAL_SCH5027[] = {5000, 2250, 3300, 1125, 1125, 3300,</div><div class='add'>+					 3300};</div><div class='add'>+#define IN_NOMINAL(type)	((type) == sch311x ? IN_NOMINAL_SCH311x : \</div><div class='add'>+				 (type) == sch5027 ? IN_NOMINAL_SCH5027 : \</div><div class='add'>+				 IN_NOMINAL_DME1737)</div><div class='ctx'> </div><div class='ctx'> /* Voltage input</div><div class='ctx'>  * Voltage inputs have 16 bits resolution, limit values have 8 bits</div><div class='ctx'>  * resolution. */</div><div class='del'>-static inline int IN_FROM_REG(int reg, int ix, int res)</div><div class='add'>+static inline int IN_FROM_REG(int reg, int nominal, int res)</div><div class='ctx'> {</div><div class='del'>-	return (reg * IN_NOMINAL[ix] + (3 &lt;&lt; (res - 3))) / (3 &lt;&lt; (res - 2));</div><div class='add'>+	return (reg * nominal + (3 &lt;&lt; (res - 3))) / (3 &lt;&lt; (res - 2));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int IN_TO_REG(int val, int ix)</div><div class='add'>+static inline int IN_TO_REG(int val, int nominal)</div><div class='ctx'> {</div><div class='del'>-	return SENSORS_LIMIT((val * 192 + IN_NOMINAL[ix] / 2) /</div><div class='del'>-			     IN_NOMINAL[ix], 0, 255);</div><div class='add'>+	return SENSORS_LIMIT((val * 192 + nominal / 2) / nominal, 0, 255);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Temperature input</div><div class='hunk'>@@ -552,7 +570,10 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Sample register contents every 1 sec */</div><div class='ctx'> 	if (time_after(jiffies, data-&gt;last_update + HZ) || !data-&gt;valid) {</div><div class='del'>-		data-&gt;vid = dme1737_read(client, DME1737_REG_VID) &amp; 0x3f;</div><div class='add'>+		if (data-&gt;type != sch5027) {</div><div class='add'>+			data-&gt;vid = dme1737_read(client, DME1737_REG_VID) &amp;</div><div class='add'>+				0x3f;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* In (voltage) registers */</div><div class='ctx'> 		for (ix = 0; ix &lt; ARRAY_SIZE(data-&gt;in); ix++) {</div><div class='hunk'>@@ -580,8 +601,10 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)</div><div class='ctx'> 					DME1737_REG_TEMP_MIN(ix));</div><div class='ctx'> 			data-&gt;temp_max[ix] = dme1737_read(client,</div><div class='ctx'> 					DME1737_REG_TEMP_MAX(ix));</div><div class='del'>-			data-&gt;temp_offset[ix] = dme1737_read(client,</div><div class='del'>-					DME1737_REG_TEMP_OFFSET(ix));</div><div class='add'>+			if (data-&gt;type != sch5027) {</div><div class='add'>+				data-&gt;temp_offset[ix] = dme1737_read(client,</div><div class='add'>+						DME1737_REG_TEMP_OFFSET(ix));</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* In and temp LSB registers</div><div class='hunk'>@@ -656,9 +679,11 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)</div><div class='ctx'> 			data-&gt;zone_abs[ix] = dme1737_read(client,</div><div class='ctx'> 					DME1737_REG_ZONE_ABS(ix));</div><div class='ctx'> 		}</div><div class='del'>-		for (ix = 0; ix &lt; ARRAY_SIZE(data-&gt;zone_hyst); ix++) {</div><div class='del'>-			data-&gt;zone_hyst[ix] = dme1737_read(client,</div><div class='add'>+		if (data-&gt;type != sch5027) {</div><div class='add'>+			for (ix = 0; ix &lt; ARRAY_SIZE(data-&gt;zone_hyst); ix++) {</div><div class='add'>+				data-&gt;zone_hyst[ix] = dme1737_read(client,</div><div class='ctx'> 						DME1737_REG_ZONE_HYST(ix));</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Alarm registers */</div><div class='hunk'>@@ -722,13 +747,13 @@ static ssize_t show_in(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> 	switch (fn) {</div><div class='ctx'> 	case SYS_IN_INPUT:</div><div class='del'>-		res = IN_FROM_REG(data-&gt;in[ix], ix, 16);</div><div class='add'>+		res = IN_FROM_REG(data-&gt;in[ix], data-&gt;in_nominal[ix], 16);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_IN_MIN:</div><div class='del'>-		res = IN_FROM_REG(data-&gt;in_min[ix], ix, 8);</div><div class='add'>+		res = IN_FROM_REG(data-&gt;in_min[ix], data-&gt;in_nominal[ix], 8);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_IN_MAX:</div><div class='del'>-		res = IN_FROM_REG(data-&gt;in_max[ix], ix, 8);</div><div class='add'>+		res = IN_FROM_REG(data-&gt;in_max[ix], data-&gt;in_nominal[ix], 8);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_IN_ALARM:</div><div class='ctx'> 		res = (data-&gt;alarms &gt;&gt; DME1737_BIT_ALARM_IN[ix]) &amp; 0x01;</div><div class='hunk'>@@ -755,12 +780,12 @@ static ssize_t set_in(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	switch (fn) {</div><div class='ctx'> 	case SYS_IN_MIN:</div><div class='del'>-		data-&gt;in_min[ix] = IN_TO_REG(val, ix);</div><div class='add'>+		data-&gt;in_min[ix] = IN_TO_REG(val, data-&gt;in_nominal[ix]);</div><div class='ctx'> 		dme1737_write(client, DME1737_REG_IN_MIN(ix),</div><div class='ctx'> 			      data-&gt;in_min[ix]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_IN_MAX:</div><div class='del'>-		data-&gt;in_max[ix] = IN_TO_REG(val, ix);</div><div class='add'>+		data-&gt;in_max[ix] = IN_TO_REG(val, data-&gt;in_nominal[ix]);</div><div class='ctx'> 		dme1737_write(client, DME1737_REG_IN_MAX(ix),</div><div class='ctx'> 			      data-&gt;in_max[ix]);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1153,7 +1178,7 @@ static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", res);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct attribute *dme1737_attr_pwm[];</div><div class='add'>+static struct attribute *dme1737_pwm_chmod_attr[];</div><div class='ctx'> static void dme1737_chmod_file(struct device*, struct attribute*, mode_t);</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -1217,7 +1242,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		switch (val) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			/* Change permissions of pwm[ix] to read-only */</div><div class='del'>-			dme1737_chmod_file(dev, dme1737_attr_pwm[ix],</div><div class='add'>+			dme1737_chmod_file(dev, dme1737_pwm_chmod_attr[ix],</div><div class='ctx'> 					   S_IRUGO);</div><div class='ctx'> 			/* Turn fan fully on */</div><div class='ctx'> 			data-&gt;pwm_config[ix] = PWM_EN_TO_REG(0,</div><div class='hunk'>@@ -1232,12 +1257,12 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			dme1737_write(client, DME1737_REG_PWM_CONFIG(ix),</div><div class='ctx'> 				      data-&gt;pwm_config[ix]);</div><div class='ctx'> 			/* Change permissions of pwm[ix] to read-writeable */</div><div class='del'>-			dme1737_chmod_file(dev, dme1737_attr_pwm[ix],</div><div class='add'>+			dme1737_chmod_file(dev, dme1737_pwm_chmod_attr[ix],</div><div class='ctx'> 					   S_IRUGO | S_IWUSR);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 2:</div><div class='ctx'> 			/* Change permissions of pwm[ix] to read-only */</div><div class='del'>-			dme1737_chmod_file(dev, dme1737_attr_pwm[ix],</div><div class='add'>+			dme1737_chmod_file(dev, dme1737_pwm_chmod_attr[ix],</div><div class='ctx'> 					   S_IRUGO);</div><div class='ctx'> 			/* Turn on auto mode using the saved zone channel</div><div class='ctx'> 			 * assignment */</div><div class='hunk'>@@ -1501,9 +1526,9 @@ SENSOR_DEVICE_ATTR_PWM_1TO3(3);</div><div class='ctx'> /* PWMs 5-6 */</div><div class='ctx'> </div><div class='ctx'> #define SENSOR_DEVICE_ATTR_PWM_5TO6(ix) \</div><div class='del'>-static SENSOR_DEVICE_ATTR_2(pwm##ix, S_IRUGO | S_IWUSR, \</div><div class='add'>+static SENSOR_DEVICE_ATTR_2(pwm##ix, S_IRUGO, \</div><div class='ctx'> 	show_pwm, set_pwm, SYS_PWM, ix-1); \</div><div class='del'>-static SENSOR_DEVICE_ATTR_2(pwm##ix##_freq, S_IRUGO | S_IWUSR, \</div><div class='add'>+static SENSOR_DEVICE_ATTR_2(pwm##ix##_freq, S_IRUGO, \</div><div class='ctx'> 	show_pwm, set_pwm, SYS_PWM_FREQ, ix-1); \</div><div class='ctx'> static SENSOR_DEVICE_ATTR_2(pwm##ix##_enable, S_IRUGO, \</div><div class='ctx'> 	show_pwm, NULL, SYS_PWM_ENABLE, ix-1)</div><div class='hunk'>@@ -1517,225 +1542,286 @@ static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);</div><div class='ctx'> static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);</div><div class='ctx'> static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);   /* for ISA devices */</div><div class='ctx'> </div><div class='del'>-#define SENSOR_DEV_ATTR_IN(ix) \</div><div class='del'>-&amp;sensor_dev_attr_in##ix##_input.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_in##ix##_min.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_in##ix##_max.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_in##ix##_alarm.dev_attr.attr</div><div class='del'>-</div><div class='del'>-/* These attributes are read-writeable only if the chip is *not* locked */</div><div class='del'>-#define SENSOR_DEV_ATTR_TEMP_LOCK(ix) \</div><div class='del'>-&amp;sensor_dev_attr_temp##ix##_offset.dev_attr.attr</div><div class='del'>-</div><div class='del'>-#define SENSOR_DEV_ATTR_TEMP(ix) \</div><div class='del'>-SENSOR_DEV_ATTR_TEMP_LOCK(ix), \</div><div class='del'>-&amp;sensor_dev_attr_temp##ix##_input.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_temp##ix##_min.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_temp##ix##_max.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_temp##ix##_alarm.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_temp##ix##_fault.dev_attr.attr</div><div class='del'>-</div><div class='del'>-/* These attributes are read-writeable only if the chip is *not* locked */</div><div class='del'>-#define SENSOR_DEV_ATTR_ZONE_LOCK(ix) \</div><div class='del'>-&amp;sensor_dev_attr_zone##ix##_auto_point1_temp_hyst.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_zone##ix##_auto_point1_temp.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_zone##ix##_auto_point2_temp.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_zone##ix##_auto_point3_temp.dev_attr.attr</div><div class='del'>-</div><div class='del'>-#define SENSOR_DEV_ATTR_ZONE(ix) \</div><div class='del'>-SENSOR_DEV_ATTR_ZONE_LOCK(ix), \</div><div class='del'>-&amp;sensor_dev_attr_zone##ix##_auto_channels_temp.dev_attr.attr</div><div class='del'>-</div><div class='del'>-#define SENSOR_DEV_ATTR_FAN_1TO4(ix) \</div><div class='del'>-&amp;sensor_dev_attr_fan##ix##_input.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_fan##ix##_min.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_fan##ix##_alarm.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_fan##ix##_type.dev_attr.attr</div><div class='del'>-</div><div class='del'>-#define SENSOR_DEV_ATTR_FAN_5TO6(ix) \</div><div class='del'>-&amp;sensor_dev_attr_fan##ix##_input.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_fan##ix##_min.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_fan##ix##_alarm.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_fan##ix##_max.dev_attr.attr</div><div class='del'>-</div><div class='del'>-/* These attributes are read-writeable only if the chip is *not* locked */</div><div class='del'>-#define SENSOR_DEV_ATTR_PWM_1TO3_LOCK(ix) \</div><div class='del'>-&amp;sensor_dev_attr_pwm##ix##_freq.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_pwm##ix##_enable.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_pwm##ix##_ramp_rate.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_pwm##ix##_auto_channels_zone.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_pwm##ix##_auto_pwm_min.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_pwm##ix##_auto_point1_pwm.dev_attr.attr</div><div class='del'>-</div><div class='del'>-#define SENSOR_DEV_ATTR_PWM_1TO3(ix) \</div><div class='del'>-SENSOR_DEV_ATTR_PWM_1TO3_LOCK(ix), \</div><div class='del'>-&amp;sensor_dev_attr_pwm##ix.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_pwm##ix##_auto_point2_pwm.dev_attr.attr</div><div class='del'>-</div><div class='del'>-/* These attributes are read-writeable only if the chip is *not* locked */</div><div class='del'>-#define SENSOR_DEV_ATTR_PWM_5TO6_LOCK(ix) \</div><div class='del'>-&amp;sensor_dev_attr_pwm##ix.dev_attr.attr, \</div><div class='del'>-&amp;sensor_dev_attr_pwm##ix##_freq.dev_attr.attr</div><div class='del'>-</div><div class='del'>-#define SENSOR_DEV_ATTR_PWM_5TO6(ix) \</div><div class='del'>-SENSOR_DEV_ATTR_PWM_5TO6_LOCK(ix), \</div><div class='del'>-&amp;sensor_dev_attr_pwm##ix##_enable.dev_attr.attr</div><div class='del'>-</div><div class='ctx'> /* This struct holds all the attributes that are always present and need to be</div><div class='ctx'>  * created unconditionally. The attributes that need modification of their</div><div class='ctx'>  * permissions are created read-only and write permissions are added or removed</div><div class='ctx'>  * on the fly when required */</div><div class='ctx'> static struct attribute *dme1737_attr[] ={</div><div class='ctx'> 	/* Voltages */</div><div class='del'>-	SENSOR_DEV_ATTR_IN(0),</div><div class='del'>-	SENSOR_DEV_ATTR_IN(1),</div><div class='del'>-	SENSOR_DEV_ATTR_IN(2),</div><div class='del'>-	SENSOR_DEV_ATTR_IN(3),</div><div class='del'>-	SENSOR_DEV_ATTR_IN(4),</div><div class='del'>-	SENSOR_DEV_ATTR_IN(5),</div><div class='del'>-	SENSOR_DEV_ATTR_IN(6),</div><div class='add'>+	&amp;sensor_dev_attr_in0_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in0_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in0_max.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in0_alarm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in1_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in1_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in1_max.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in1_alarm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in2_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in2_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in2_max.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in2_alarm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in3_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in3_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in3_max.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in3_alarm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in4_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in4_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in4_max.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in4_alarm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in5_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in5_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in5_max.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in5_alarm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in6_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in6_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in6_max.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in6_alarm.dev_attr.attr,</div><div class='add'>+	/* Temperatures */</div><div class='add'>+	&amp;sensor_dev_attr_temp1_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp1_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp1_max.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp1_alarm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp1_fault.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp2_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp2_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp2_max.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp2_alarm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp2_fault.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp3_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp3_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp3_max.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp3_alarm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp3_fault.dev_attr.attr,</div><div class='add'>+	/* Zones */</div><div class='add'>+	&amp;sensor_dev_attr_zone1_auto_point1_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone1_auto_point2_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone1_auto_point3_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone1_auto_channels_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone2_auto_point1_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone2_auto_point2_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone2_auto_point3_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone2_auto_channels_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone3_auto_point1_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone3_auto_point2_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone3_auto_point3_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone3_auto_channels_temp.dev_attr.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group dme1737_group = {</div><div class='add'>+	.attrs = dme1737_attr,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The following struct holds misc attributes, which are not available in all</div><div class='add'>+ * chips. Their creation depends on the chip type which is determined during</div><div class='add'>+ * module load. */</div><div class='add'>+static struct attribute *dme1737_misc_attr[] = {</div><div class='ctx'> 	/* Temperatures */</div><div class='del'>-	SENSOR_DEV_ATTR_TEMP(1),</div><div class='del'>-	SENSOR_DEV_ATTR_TEMP(2),</div><div class='del'>-	SENSOR_DEV_ATTR_TEMP(3),</div><div class='add'>+	&amp;sensor_dev_attr_temp1_offset.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp2_offset.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp3_offset.dev_attr.attr,</div><div class='ctx'> 	/* Zones */</div><div class='del'>-	SENSOR_DEV_ATTR_ZONE(1),</div><div class='del'>-	SENSOR_DEV_ATTR_ZONE(2),</div><div class='del'>-	SENSOR_DEV_ATTR_ZONE(3),</div><div class='add'>+	&amp;sensor_dev_attr_zone1_auto_point1_temp_hyst.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone2_auto_point1_temp_hyst.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone3_auto_point1_temp_hyst.dev_attr.attr,</div><div class='ctx'> 	/* Misc */</div><div class='ctx'> 	&amp;dev_attr_vrm.attr,</div><div class='ctx'> 	&amp;dev_attr_cpu0_vid.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct attribute_group dme1737_group = {</div><div class='del'>-	.attrs = dme1737_attr,</div><div class='add'>+static const struct attribute_group dme1737_misc_group = {</div><div class='add'>+	.attrs = dme1737_misc_attr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* The following structs hold the PWM attributes, some of which are optional.</div><div class='ctx'>  * Their creation depends on the chip configuration which is determined during</div><div class='ctx'>  * module load. */</div><div class='del'>-static struct attribute *dme1737_attr_pwm1[] = {</div><div class='del'>-	SENSOR_DEV_ATTR_PWM_1TO3(1),</div><div class='add'>+static struct attribute *dme1737_pwm1_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_pwm1.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_freq.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_enable.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_ramp_rate.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_channels_zone.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point1_pwm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point2_pwm.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='del'>-static struct attribute *dme1737_attr_pwm2[] = {</div><div class='del'>-	SENSOR_DEV_ATTR_PWM_1TO3(2),</div><div class='add'>+static struct attribute *dme1737_pwm2_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_pwm2.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm2_freq.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm2_enable.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm2_ramp_rate.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm2_auto_channels_zone.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm2_auto_point1_pwm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm2_auto_point2_pwm.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='del'>-static struct attribute *dme1737_attr_pwm3[] = {</div><div class='del'>-	SENSOR_DEV_ATTR_PWM_1TO3(3),</div><div class='add'>+static struct attribute *dme1737_pwm3_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_pwm3.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm3_freq.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm3_enable.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm3_ramp_rate.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm3_auto_channels_zone.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm3_auto_point1_pwm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm3_auto_point2_pwm.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='del'>-static struct attribute *dme1737_attr_pwm5[] = {</div><div class='del'>-	SENSOR_DEV_ATTR_PWM_5TO6(5),</div><div class='add'>+static struct attribute *dme1737_pwm5_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_pwm5.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm5_freq.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm5_enable.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='del'>-static struct attribute *dme1737_attr_pwm6[] = {</div><div class='del'>-	SENSOR_DEV_ATTR_PWM_5TO6(6),</div><div class='add'>+static struct attribute *dme1737_pwm6_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_pwm6.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm6_freq.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm6_enable.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct attribute_group dme1737_pwm_group[] = {</div><div class='del'>-	{ .attrs = dme1737_attr_pwm1 },</div><div class='del'>-	{ .attrs = dme1737_attr_pwm2 },</div><div class='del'>-	{ .attrs = dme1737_attr_pwm3 },</div><div class='add'>+	{ .attrs = dme1737_pwm1_attr },</div><div class='add'>+	{ .attrs = dme1737_pwm2_attr },</div><div class='add'>+	{ .attrs = dme1737_pwm3_attr },</div><div class='ctx'> 	{ .attrs = NULL },</div><div class='del'>-	{ .attrs = dme1737_attr_pwm5 },</div><div class='del'>-	{ .attrs = dme1737_attr_pwm6 },</div><div class='add'>+	{ .attrs = dme1737_pwm5_attr },</div><div class='add'>+	{ .attrs = dme1737_pwm6_attr },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The following struct holds misc PWM attributes, which are not available in</div><div class='add'>+ * all chips. Their creation depends on the chip type which is determined</div><div class='add'>+ * during module load. */</div><div class='add'>+static struct attribute *dme1737_pwm_misc_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_pwm_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm2_auto_pwm_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm3_auto_pwm_min.dev_attr.attr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* The following structs hold the fan attributes, some of which are optional.</div><div class='ctx'>  * Their creation depends on the chip configuration which is determined during</div><div class='ctx'>  * module load. */</div><div class='del'>-static struct attribute *dme1737_attr_fan1[] = {</div><div class='del'>-	SENSOR_DEV_ATTR_FAN_1TO4(1),</div><div class='add'>+static struct attribute *dme1737_fan1_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_fan1_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan1_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan1_alarm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan1_type.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='del'>-static struct attribute *dme1737_attr_fan2[] = {</div><div class='del'>-	SENSOR_DEV_ATTR_FAN_1TO4(2),</div><div class='add'>+static struct attribute *dme1737_fan2_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_fan2_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan2_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan2_alarm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan2_type.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='del'>-static struct attribute *dme1737_attr_fan3[] = {</div><div class='del'>-	SENSOR_DEV_ATTR_FAN_1TO4(3),</div><div class='add'>+static struct attribute *dme1737_fan3_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_fan3_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan3_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan3_alarm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan3_type.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='del'>-static struct attribute *dme1737_attr_fan4[] = {</div><div class='del'>-	SENSOR_DEV_ATTR_FAN_1TO4(4),</div><div class='add'>+static struct attribute *dme1737_fan4_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_fan4_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan4_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan4_alarm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan4_type.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='del'>-static struct attribute *dme1737_attr_fan5[] = {</div><div class='del'>-	SENSOR_DEV_ATTR_FAN_5TO6(5),</div><div class='add'>+static struct attribute *dme1737_fan5_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_fan5_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan5_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan5_alarm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan5_max.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='del'>-static struct attribute *dme1737_attr_fan6[] = {</div><div class='del'>-	SENSOR_DEV_ATTR_FAN_5TO6(6),</div><div class='add'>+static struct attribute *dme1737_fan6_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_fan6_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan6_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan6_alarm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan6_max.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct attribute_group dme1737_fan_group[] = {</div><div class='del'>-	{ .attrs = dme1737_attr_fan1 },</div><div class='del'>-	{ .attrs = dme1737_attr_fan2 },</div><div class='del'>-	{ .attrs = dme1737_attr_fan3 },</div><div class='del'>-	{ .attrs = dme1737_attr_fan4 },</div><div class='del'>-	{ .attrs = dme1737_attr_fan5 },</div><div class='del'>-	{ .attrs = dme1737_attr_fan6 },</div><div class='add'>+	{ .attrs = dme1737_fan1_attr },</div><div class='add'>+	{ .attrs = dme1737_fan2_attr },</div><div class='add'>+	{ .attrs = dme1737_fan3_attr },</div><div class='add'>+	{ .attrs = dme1737_fan4_attr },</div><div class='add'>+	{ .attrs = dme1737_fan5_attr },</div><div class='add'>+	{ .attrs = dme1737_fan6_attr },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* The permissions of all of the following attributes are changed to read-</div><div class='add'>+/* The permissions of the following zone attributes are changed to read-</div><div class='ctx'>  * writeable if the chip is *not* locked. Otherwise they stay read-only. */</div><div class='del'>-static struct attribute *dme1737_attr_lock[] = {</div><div class='del'>-	/* Temperatures */</div><div class='del'>-	SENSOR_DEV_ATTR_TEMP_LOCK(1),</div><div class='del'>-	SENSOR_DEV_ATTR_TEMP_LOCK(2),</div><div class='del'>-	SENSOR_DEV_ATTR_TEMP_LOCK(3),</div><div class='del'>-	/* Zones */</div><div class='del'>-	SENSOR_DEV_ATTR_ZONE_LOCK(1),</div><div class='del'>-	SENSOR_DEV_ATTR_ZONE_LOCK(2),</div><div class='del'>-	SENSOR_DEV_ATTR_ZONE_LOCK(3),</div><div class='add'>+static struct attribute *dme1737_zone_chmod_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_zone1_auto_point1_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone1_auto_point2_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone1_auto_point3_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone2_auto_point1_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone2_auto_point2_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone2_auto_point3_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone3_auto_point1_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone3_auto_point2_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_zone3_auto_point3_temp.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct attribute_group dme1737_lock_group = {</div><div class='del'>-	.attrs = dme1737_attr_lock,</div><div class='add'>+static const struct attribute_group dme1737_zone_chmod_group = {</div><div class='add'>+	.attrs = dme1737_zone_chmod_attr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* The permissions of the following PWM attributes are changed to read-</div><div class='ctx'>  * writeable if the chip is *not* locked and the respective PWM is available.</div><div class='ctx'>  * Otherwise they stay read-only. */</div><div class='del'>-static struct attribute *dme1737_attr_pwm1_lock[] = {</div><div class='del'>-	SENSOR_DEV_ATTR_PWM_1TO3_LOCK(1),</div><div class='add'>+static struct attribute *dme1737_pwm1_chmod_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_freq.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_enable.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_ramp_rate.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_channels_zone.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point1_pwm.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='del'>-static struct attribute *dme1737_attr_pwm2_lock[] = {</div><div class='del'>-	SENSOR_DEV_ATTR_PWM_1TO3_LOCK(2),</div><div class='add'>+static struct attribute *dme1737_pwm2_chmod_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_pwm2_freq.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm2_enable.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm2_ramp_rate.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm2_auto_channels_zone.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm2_auto_point1_pwm.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='del'>-static struct attribute *dme1737_attr_pwm3_lock[] = {</div><div class='del'>-	SENSOR_DEV_ATTR_PWM_1TO3_LOCK(3),</div><div class='add'>+static struct attribute *dme1737_pwm3_chmod_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_pwm3_freq.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm3_enable.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm3_ramp_rate.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm3_auto_channels_zone.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm3_auto_point1_pwm.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='del'>-static struct attribute *dme1737_attr_pwm5_lock[] = {</div><div class='del'>-	SENSOR_DEV_ATTR_PWM_5TO6_LOCK(5),</div><div class='add'>+static struct attribute *dme1737_pwm5_chmod_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_pwm5.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm5_freq.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='del'>-static struct attribute *dme1737_attr_pwm6_lock[] = {</div><div class='del'>-	SENSOR_DEV_ATTR_PWM_5TO6_LOCK(6),</div><div class='add'>+static struct attribute *dme1737_pwm6_chmod_attr[] = {</div><div class='add'>+	&amp;sensor_dev_attr_pwm6.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm6_freq.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct attribute_group dme1737_pwm_lock_group[] = {</div><div class='del'>-	{ .attrs = dme1737_attr_pwm1_lock },</div><div class='del'>-	{ .attrs = dme1737_attr_pwm2_lock },</div><div class='del'>-	{ .attrs = dme1737_attr_pwm3_lock },</div><div class='add'>+static const struct attribute_group dme1737_pwm_chmod_group[] = {</div><div class='add'>+	{ .attrs = dme1737_pwm1_chmod_attr },</div><div class='add'>+	{ .attrs = dme1737_pwm2_chmod_attr },</div><div class='add'>+	{ .attrs = dme1737_pwm3_chmod_attr },</div><div class='ctx'> 	{ .attrs = NULL },</div><div class='del'>-	{ .attrs = dme1737_attr_pwm5_lock },</div><div class='del'>-	{ .attrs = dme1737_attr_pwm6_lock },</div><div class='add'>+	{ .attrs = dme1737_pwm5_chmod_attr },</div><div class='add'>+	{ .attrs = dme1737_pwm6_chmod_attr },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Pwm[1-3] are read-writeable if the associated pwm is in manual mode and the</div><div class='ctx'>  * chip is not locked. Otherwise they are read-only. */</div><div class='del'>-static struct attribute *dme1737_attr_pwm[] = {</div><div class='add'>+static struct attribute *dme1737_pwm_chmod_attr[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm1.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm2.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm3.dev_attr.attr,</div><div class='hunk'>@@ -1809,9 +1895,17 @@ static void dme1737_remove_files(struct device *dev)</div><div class='ctx'> 		if (data-&gt;has_pwm &amp; (1 &lt;&lt; ix)) {</div><div class='ctx'> 			sysfs_remove_group(&amp;dev-&gt;kobj,</div><div class='ctx'> 					   &amp;dme1737_pwm_group[ix]);</div><div class='add'>+			if (data-&gt;type != sch5027 &amp;&amp; ix &lt; 3) {</div><div class='add'>+				sysfs_remove_file(&amp;dev-&gt;kobj,</div><div class='add'>+						  dme1737_pwm_misc_attr[ix]);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (data-&gt;type != sch5027) {</div><div class='add'>+		sysfs_remove_group(&amp;dev-&gt;kobj, &amp;dme1737_misc_group);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	sysfs_remove_group(&amp;dev-&gt;kobj, &amp;dme1737_group);</div><div class='ctx'> </div><div class='ctx'> 	if (!data-&gt;client.driver) {</div><div class='hunk'>@@ -1835,6 +1929,13 @@ static int dme1737_create_files(struct device *dev)</div><div class='ctx'> 		goto exit_remove;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Create misc sysfs attributes */</div><div class='add'>+	if ((data-&gt;type != sch5027) &amp;&amp;</div><div class='add'>+	    (err = sysfs_create_group(&amp;dev-&gt;kobj,</div><div class='add'>+				      &amp;dme1737_misc_group))) {</div><div class='add'>+		goto exit_remove;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Create fan sysfs attributes */</div><div class='ctx'> 	for (ix = 0; ix &lt; ARRAY_SIZE(dme1737_fan_group); ix++) {</div><div class='ctx'> 		if (data-&gt;has_fan &amp; (1 &lt;&lt; ix)) {</div><div class='hunk'>@@ -1852,6 +1953,11 @@ static int dme1737_create_files(struct device *dev)</div><div class='ctx'> 						&amp;dme1737_pwm_group[ix]))) {</div><div class='ctx'> 				goto exit_remove;</div><div class='ctx'> 			}</div><div class='add'>+			if (data-&gt;type != sch5027 &amp;&amp; ix &lt; 3 &amp;&amp;</div><div class='add'>+			    (err = sysfs_create_file(&amp;dev-&gt;kobj,</div><div class='add'>+						dme1737_pwm_misc_attr[ix]))) {</div><div class='add'>+				goto exit_remove;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1861,16 +1967,27 @@ static int dme1737_create_files(struct device *dev)</div><div class='ctx'> 		dev_info(dev, "Device is locked. Some attributes "</div><div class='ctx'> 			 "will be read-only.\n");</div><div class='ctx'> 	} else {</div><div class='del'>-		/* Change permissions of standard attributes */</div><div class='del'>-		dme1737_chmod_group(dev, &amp;dme1737_lock_group,</div><div class='add'>+		/* Change permissions of zone sysfs attributes */</div><div class='add'>+		dme1737_chmod_group(dev, &amp;dme1737_zone_chmod_group,</div><div class='ctx'> 				    S_IRUGO | S_IWUSR);</div><div class='ctx'> </div><div class='del'>-		/* Change permissions of PWM attributes */</div><div class='del'>-		for (ix = 0; ix &lt; ARRAY_SIZE(dme1737_pwm_lock_group); ix++) {</div><div class='add'>+		/* Change permissions of misc sysfs attributes */</div><div class='add'>+		if (data-&gt;type != sch5027) {</div><div class='add'>+			dme1737_chmod_group(dev, &amp;dme1737_misc_group,</div><div class='add'>+					    S_IRUGO | S_IWUSR);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Change permissions of PWM sysfs attributes */</div><div class='add'>+		for (ix = 0; ix &lt; ARRAY_SIZE(dme1737_pwm_chmod_group); ix++) {</div><div class='ctx'> 			if (data-&gt;has_pwm &amp; (1 &lt;&lt; ix)) {</div><div class='ctx'> 				dme1737_chmod_group(dev,</div><div class='del'>-						&amp;dme1737_pwm_lock_group[ix],</div><div class='add'>+						&amp;dme1737_pwm_chmod_group[ix],</div><div class='add'>+						S_IRUGO | S_IWUSR);</div><div class='add'>+				if (data-&gt;type != sch5027 &amp;&amp; ix &lt; 3) {</div><div class='add'>+					dme1737_chmod_file(dev,</div><div class='add'>+						dme1737_pwm_misc_attr[ix],</div><div class='ctx'> 						S_IRUGO | S_IWUSR);</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1879,7 +1996,7 @@ static int dme1737_create_files(struct device *dev)</div><div class='ctx'> 			if ((data-&gt;has_pwm &amp; (1 &lt;&lt; ix)) &amp;&amp;</div><div class='ctx'> 			    (PWM_EN_FROM_REG(data-&gt;pwm_config[ix]) == 1)) {</div><div class='ctx'> 				dme1737_chmod_file(dev,</div><div class='del'>-						dme1737_attr_pwm[ix],</div><div class='add'>+						dme1737_pwm_chmod_attr[ix],</div><div class='ctx'> 						S_IRUGO | S_IWUSR);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1900,6 +2017,9 @@ static int dme1737_init_device(struct device *dev)</div><div class='ctx'> 	int ix;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='add'>+	/* Point to the right nominal voltages array */</div><div class='add'>+	data-&gt;in_nominal = IN_NOMINAL(data-&gt;type);</div><div class='add'>+</div><div class='ctx'> 	data-&gt;config = dme1737_read(client, DME1737_REG_CONFIG);</div><div class='ctx'> 	/* Inform if part is not monitoring/started */</div><div class='ctx'> 	if (!(data-&gt;config &amp; 0x01)) {</div><div class='hunk'>@@ -2010,7 +2130,9 @@ static int dme1737_init_device(struct device *dev)</div><div class='ctx'> 	data-&gt;pwm_acz[2] = 4;	/* pwm3 -&gt; zone3 */</div><div class='ctx'> </div><div class='ctx'> 	/* Set VRM */</div><div class='del'>-	data-&gt;vrm = vid_which_vrm();</div><div class='add'>+	if (data-&gt;type != sch5027) {</div><div class='add'>+		data-&gt;vrm = vid_which_vrm();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2029,9 +2151,10 @@ static int dme1737_i2c_get_features(int sio_cip, struct dme1737_data *data)</div><div class='ctx'> 	dme1737_sio_enter(sio_cip);</div><div class='ctx'> </div><div class='ctx'> 	/* Check device ID</div><div class='del'>-	 * The DME1737 can return either 0x78 or 0x77 as its device ID. */</div><div class='add'>+	 * The DME1737 can return either 0x78 or 0x77 as its device ID.</div><div class='add'>+	 * The SCH5027 returns 0x89 as its device ID. */</div><div class='ctx'> 	reg = force_id ? force_id : dme1737_sio_inb(sio_cip, 0x20);</div><div class='del'>-	if (!(reg == 0x77 || reg == 0x78)) {</div><div class='add'>+	if (!(reg == 0x77 || reg == 0x78 || reg == 0x89)) {</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2100,15 +2223,25 @@ static int dme1737_i2c_detect(struct i2c_adapter *adapter, int address,</div><div class='ctx'> 		company = dme1737_read(client, DME1737_REG_COMPANY);</div><div class='ctx'> 		verstep = dme1737_read(client, DME1737_REG_VERSTEP);</div><div class='ctx'> </div><div class='del'>-		if (!((company == DME1737_COMPANY_SMSC) &amp;&amp;</div><div class='del'>-		      ((verstep &amp; DME1737_VERSTEP_MASK) == DME1737_VERSTEP))) {</div><div class='add'>+		if (company == DME1737_COMPANY_SMSC &amp;&amp;</div><div class='add'>+		    (verstep &amp; DME1737_VERSTEP_MASK) == DME1737_VERSTEP) {</div><div class='add'>+			kind = dme1737;</div><div class='add'>+		} else if (company == DME1737_COMPANY_SMSC &amp;&amp;</div><div class='add'>+			   verstep == SCH5027_VERSTEP) {</div><div class='add'>+			kind = sch5027;</div><div class='add'>+		} else {</div><div class='ctx'> 			err = -ENODEV;</div><div class='ctx'> 			goto exit_kfree;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kind = dme1737;</div><div class='del'>-	name = "dme1737";</div><div class='add'>+	if (kind == sch5027) {</div><div class='add'>+		name = "sch5027";</div><div class='add'>+	} else {</div><div class='add'>+		kind = dme1737;</div><div class='add'>+		name = "dme1737";</div><div class='add'>+	}</div><div class='add'>+	data-&gt;type = kind;</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in the remaining client fields and put it into the global</div><div class='ctx'> 	 * list */</div><div class='hunk'>@@ -2120,8 +2253,9 @@ static int dme1737_i2c_detect(struct i2c_adapter *adapter, int address,</div><div class='ctx'> 		goto exit_kfree;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_info(dev, "Found a DME1737 chip at 0x%02x (rev 0x%02x).\n",</div><div class='del'>-		 client-&gt;addr, verstep);</div><div class='add'>+	dev_info(dev, "Found a %s chip at 0x%02x (rev 0x%02x).\n",</div><div class='add'>+		 kind == sch5027 ? "SCH5027" : "DME1737", client-&gt;addr,</div><div class='add'>+		 verstep);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the DME1737 chip */</div><div class='ctx'> 	if ((err = dme1737_init_device(dev))) {</div><div class='hunk'>@@ -2293,14 +2427,18 @@ static int __devinit dme1737_isa_probe(struct platform_device *pdev)</div><div class='ctx'> 	client-&gt;addr = res-&gt;start;</div><div class='ctx'> 	platform_set_drvdata(pdev, data);</div><div class='ctx'> </div><div class='del'>-	company = dme1737_read(client, DME1737_REG_COMPANY);</div><div class='del'>-	device = dme1737_read(client, DME1737_REG_DEVICE);</div><div class='add'>+	/* Skip chip detection if module is loaded with force_id parameter */</div><div class='add'>+	if (!force_id) {</div><div class='add'>+		company = dme1737_read(client, DME1737_REG_COMPANY);</div><div class='add'>+		device = dme1737_read(client, DME1737_REG_DEVICE);</div><div class='ctx'> </div><div class='del'>-	if (!((company == DME1737_COMPANY_SMSC) &amp;&amp;</div><div class='del'>-	      (device == SCH311X_DEVICE))) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto exit_kfree;</div><div class='add'>+		if (!((company == DME1737_COMPANY_SMSC) &amp;&amp;</div><div class='add'>+		      (device == SCH311X_DEVICE))) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto exit_kfree;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	data-&gt;type = sch311x;</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in the remaining client fields and initialize the mutex */</div><div class='ctx'> 	strlcpy(client-&gt;name, "sch311x", I2C_NAME_SIZE);</div><div class='hunk'>@@ -2377,7 +2515,10 @@ static int __init dme1737_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dme1737_isa_detect(0x2e, &amp;addr) &amp;&amp;</div><div class='del'>-	    dme1737_isa_detect(0x4e, &amp;addr)) {</div><div class='add'>+	    dme1737_isa_detect(0x4e, &amp;addr) &amp;&amp;</div><div class='add'>+	    (!probe_all_addr ||</div><div class='add'>+	     (dme1737_isa_detect(0x162e, &amp;addr) &amp;&amp;</div><div class='add'>+	      dme1737_isa_detect(0x164e, &amp;addr)))) {</div><div class='ctx'> 		/* Return 0 if we didn't find an ISA device */</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/hwmon/f71882fg.c b/drivers/hwmon/f71882fg.c<br/>index cbeb4984b5c7..67067e9a323e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/f71882fg.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/f71882fg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/f71882fg.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/f71882fg.c</a></div><div class='hunk'>@@ -87,8 +87,6 @@ static inline void superio_enter(int base);</div><div class='ctx'> static inline void superio_select(int base, int ld);</div><div class='ctx'> static inline void superio_exit(int base);</div><div class='ctx'> </div><div class='del'>-static inline u16 fan_from_reg ( u16 reg );</div><div class='del'>-</div><div class='ctx'> struct f71882fg_data {</div><div class='ctx'> 	unsigned short addr;</div><div class='ctx'> 	struct device *hwmon_dev;</div><div class='hunk'>@@ -116,10 +114,6 @@ struct f71882fg_data {</div><div class='ctx'> 	u8	temp_diode_open;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u8 f71882fg_read8(struct f71882fg_data *data, u8 reg);</div><div class='del'>-static u16 f71882fg_read16(struct f71882fg_data *data, u8 reg);</div><div class='del'>-static void f71882fg_write8(struct f71882fg_data *data, u8 reg, u8 val);</div><div class='del'>-</div><div class='ctx'> /* Sysfs in*/</div><div class='ctx'> static ssize_t show_in(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	char *buf);</div><div class='head'>diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c<br/>index 3330667280b9..c54eff92be4a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/hwmon-vid.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/hwmon-vid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/hwmon-vid.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/hwmon-vid.c</a></div><div class='hunk'>@@ -1,76 +1,82 @@</div><div class='ctx'> /*</div><div class='del'>-    hwmon-vid.c - VID/VRM/VRD voltage conversions</div><div class='del'>-</div><div class='del'>-    Copyright (c) 2004 Rudolf Marek &lt;r.marek@assembler.cz&gt;</div><div class='del'>-</div><div class='del'>-    Partly imported from i2c-vid.h of the lm_sensors project</div><div class='del'>-    Copyright (c) 2002 Mark D. Studebaker &lt;mdsxyz123@yahoo.com&gt;</div><div class='del'>-    With assistance from Trent Piepho &lt;xyzzy@speakeasy.org&gt;</div><div class='del'>-</div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of the GNU General Public License as published by</div><div class='del'>-    the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-    (at your option) any later version.</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>-*/</div><div class='add'>+ * hwmon-vid.c - VID/VRM/VRD voltage conversions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2004 Rudolf Marek &lt;r.marek@assembler.cz&gt;</div><div class='add'>+ *</div><div class='add'>+ * Partly imported from i2c-vid.h of the lm_sensors project</div><div class='add'>+ * Copyright (c) 2002 Mark D. Studebaker &lt;mdsxyz123@yahoo.com&gt;</div><div class='add'>+ * With assistance from Trent Piepho &lt;xyzzy@speakeasy.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/hwmon-vid.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>-    Common code for decoding VID pins.</div><div class='del'>-</div><div class='del'>-    References:</div><div class='del'>-</div><div class='del'>-    For VRM 8.4 to 9.1, "VRM x.y DC-DC Converter Design Guidelines",</div><div class='del'>-    available at http://developer.intel.com/.</div><div class='del'>-</div><div class='del'>-    For VRD 10.0 and up, "VRD x.y Design Guide",</div><div class='del'>-    available at http://developer.intel.com/.</div><div class='del'>-</div><div class='del'>-    AMD Opteron processors don't follow the Intel specifications.</div><div class='del'>-    I'm going to "make up" 2.4 as the spec number for the Opterons.</div><div class='del'>-    No good reason just a mnemonic for the 24x Opteron processor</div><div class='del'>-    series.</div><div class='del'>-</div><div class='del'>-    Opteron VID encoding is:</div><div class='del'>-       00000  =  1.550 V</div><div class='del'>-       00001  =  1.525 V</div><div class='del'>-        . . . .</div><div class='del'>-       11110  =  0.800 V</div><div class='del'>-       11111  =  0.000 V (off)</div><div class='del'>-</div><div class='del'>-    The 17 specification is in fact Intel Mobile Voltage Positioning -</div><div class='del'>-    (IMVP-II). You can find more information in the datasheet of Max1718</div><div class='del'>-    http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2452</div><div class='del'>-</div><div class='del'>-    The 13 specification corresponds to the Intel Pentium M series. There</div><div class='del'>-    doesn't seem to be any named specification for these. The conversion</div><div class='del'>-    tables are detailed directly in the various Pentium M datasheets:</div><div class='del'>-    http://www.intel.com/design/intarch/pentiumm/docs_pentiumm.htm</div><div class='del'>-</div><div class='del'>-    The 14 specification corresponds to Intel Core series. There</div><div class='del'>-    doesn't seem to be any named specification for these. The conversion</div><div class='del'>-    tables are detailed directly in the various Pentium Core datasheets:</div><div class='del'>-    http://www.intel.com/design/mobile/datashts/309221.htm</div><div class='del'>-</div><div class='del'>-    The 110 (VRM 11) specification corresponds to Intel Conroe based series.</div><div class='del'>-    http://www.intel.com/design/processor/applnots/313214.htm</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/* vrm is the VRM/VRD document version multiplied by 10.</div><div class='del'>-   val is the 4-bit or more VID code.</div><div class='del'>-   Returned value is in mV to avoid floating point in the kernel.</div><div class='del'>-   Some VID have some bits in uV scale, this is rounded to mV */</div><div class='add'>+ * Common code for decoding VID pins.</div><div class='add'>+ *</div><div class='add'>+ * References:</div><div class='add'>+ *</div><div class='add'>+ * For VRM 8.4 to 9.1, "VRM x.y DC-DC Converter Design Guidelines",</div><div class='add'>+ * available at http://developer.intel.com/.</div><div class='add'>+ *</div><div class='add'>+ * For VRD 10.0 and up, "VRD x.y Design Guide",</div><div class='add'>+ * available at http://developer.intel.com/.</div><div class='add'>+ *</div><div class='add'>+ * AMD Athlon 64 and AMD Opteron Processors, AMD Publication 26094,</div><div class='add'>+ * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/26094.PDF</div><div class='add'>+ * Table 74. VID Code Voltages</div><div class='add'>+ * This corresponds to an arbitrary VRM code of 24 in the functions below.</div><div class='add'>+ * These CPU models (K8 revision &lt;= E) have 5 VID pins. See also:</div><div class='add'>+ * Revision Guide for AMD Athlon 64 and AMD Opteron Processors, AMD Publication 25759,</div><div class='add'>+ * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/25759.pdf</div><div class='add'>+ *</div><div class='add'>+ * AMD NPT Family 0Fh Processors, AMD Publication 32559,</div><div class='add'>+ * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf</div><div class='add'>+ * Table 71. VID Code Voltages</div><div class='add'>+ * This corresponds to an arbitrary VRM code of 25 in the functions below.</div><div class='add'>+ * These CPU models (K8 revision &gt;= F) have 6 VID pins. See also:</div><div class='add'>+ * Revision Guide for AMD NPT Family 0Fh Processors, AMD Publication 33610,</div><div class='add'>+ * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/33610.pdf</div><div class='add'>+ *</div><div class='add'>+ * The 17 specification is in fact Intel Mobile Voltage Positioning -</div><div class='add'>+ * (IMVP-II). You can find more information in the datasheet of Max1718</div><div class='add'>+ * http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2452</div><div class='add'>+ *</div><div class='add'>+ * The 13 specification corresponds to the Intel Pentium M series. There</div><div class='add'>+ * doesn't seem to be any named specification for these. The conversion</div><div class='add'>+ * tables are detailed directly in the various Pentium M datasheets:</div><div class='add'>+ * http://www.intel.com/design/intarch/pentiumm/docs_pentiumm.htm</div><div class='add'>+ *</div><div class='add'>+ * The 14 specification corresponds to Intel Core series. There</div><div class='add'>+ * doesn't seem to be any named specification for these. The conversion</div><div class='add'>+ * tables are detailed directly in the various Pentium Core datasheets:</div><div class='add'>+ * http://www.intel.com/design/mobile/datashts/309221.htm</div><div class='add'>+ *</div><div class='add'>+ * The 110 (VRM 11) specification corresponds to Intel Conroe based series.</div><div class='add'>+ * http://www.intel.com/design/processor/applnots/313214.htm</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * vrm is the VRM/VRD document version multiplied by 10.</div><div class='add'>+ * val is the 4-bit or more VID code.</div><div class='add'>+ * Returned value is in mV to avoid floating point in the kernel.</div><div class='add'>+ * Some VID have some bits in uV scale, this is rounded to mV.</div><div class='add'>+ */</div><div class='ctx'> int vid_from_reg(int val, u8 vrm)</div><div class='ctx'> {</div><div class='ctx'> 	int vid;</div><div class='hunk'>@@ -96,9 +102,16 @@ int vid_from_reg(int val, u8 vrm)</div><div class='ctx'> 		if (val &lt; 0x02 || val &gt; 0xb2)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		return((1600000 - (val - 2) * 6250 + 500) / 1000);</div><div class='del'>-	case 24:                /* Opteron processor */</div><div class='add'>+</div><div class='add'>+	case 24:		/* Athlon64 &amp; Opteron */</div><div class='ctx'> 		val &amp;= 0x1f;</div><div class='del'>-		return(val == 0x1f ? 0 : 1550 - val * 25);</div><div class='add'>+		if (val == 0x1f)</div><div class='add'>+			return 0;</div><div class='add'>+				/* fall through */</div><div class='add'>+	case 25:		/* AMD NPT 0Fh */</div><div class='add'>+		val &amp;= 0x3f;</div><div class='add'>+		return (val &lt; 32) ? 1550 - 25 * val</div><div class='add'>+			: 775 - (25 * (val - 31)) / 2;</div><div class='ctx'> </div><div class='ctx'> 	case 91:		/* VRM 9.1 */</div><div class='ctx'> 	case 90:		/* VRM 9.0 */</div><div class='hunk'>@@ -141,9 +154,9 @@ int vid_from_reg(int val, u8 vrm)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>-    After this point is the code to automatically determine which</div><div class='del'>-    VRM/VRD specification should be used depending on the CPU.</div><div class='del'>-*/</div><div class='add'>+ * After this point is the code to automatically determine which</div><div class='add'>+ * VRM/VRD specification should be used depending on the CPU.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> struct vrm_model {</div><div class='ctx'> 	u8 vendor;</div><div class='hunk'>@@ -157,11 +170,16 @@ struct vrm_model {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86</div><div class='ctx'> </div><div class='del'>-/* the stepping parameter is highest acceptable stepping for current line */</div><div class='add'>+/*</div><div class='add'>+ * The stepping parameter is highest acceptable stepping for current line.</div><div class='add'>+ * The model match must be exact for 4-bit values. For model values 0x10</div><div class='add'>+ * and above (extended model), all models below the parameter will match.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> static struct vrm_model vrm_models[] = {</div><div class='ctx'> 	{X86_VENDOR_AMD, 0x6, ANY, ANY, 90},		/* Athlon Duron etc */</div><div class='del'>-	{X86_VENDOR_AMD, 0xF, ANY, ANY, 24},		/* Athlon 64, Opteron and above VRM 24 */</div><div class='add'>+	{X86_VENDOR_AMD, 0xF, 0x3F, ANY, 24},		/* Athlon 64, Opteron */</div><div class='add'>+	{X86_VENDOR_AMD, 0xF, ANY, ANY, 25},		/* NPT family 0Fh */</div><div class='ctx'> 	{X86_VENDOR_INTEL, 0x6, 0x9, ANY, 13},		/* Pentium M (130 nm) */</div><div class='ctx'> 	{X86_VENDOR_INTEL, 0x6, 0xB, ANY, 85},		/* Tualatin */</div><div class='ctx'> 	{X86_VENDOR_INTEL, 0x6, 0xD, ANY, 13},		/* Pentium M (90 nm) */</div><div class='hunk'>@@ -189,6 +207,8 @@ static u8 find_vrm(u8 eff_family, u8 eff_model, u8 eff_stepping, u8 vendor)</div><div class='ctx'> 		if (vrm_models[i].vendor==vendor)</div><div class='ctx'> 			if ((vrm_models[i].eff_family==eff_family)</div><div class='ctx'> 			 &amp;&amp; ((vrm_models[i].eff_model==eff_model) ||</div><div class='add'>+			     (vrm_models[i].eff_model &gt;= 0x10 &amp;&amp;</div><div class='add'>+			      eff_model &lt;= vrm_models[i].eff_model) ||</div><div class='ctx'> 			     (vrm_models[i].eff_model==ANY)) &amp;&amp;</div><div class='ctx'> 			     (eff_stepping &lt;= vrm_models[i].eff_stepping))</div><div class='ctx'> 				return vrm_models[i].vrm_type;</div><div class='head'>diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c<br/>index f9e2ed621f7b..2ede9388096b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/i5k_amb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/i5k_amb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/i5k_amb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/i5k_amb.c</a></div><div class='hunk'>@@ -81,6 +81,8 @@ static unsigned long amb_reg_temp(unsigned int amb)</div><div class='ctx'> #define MAX_AMBS_PER_CHANNEL		16</div><div class='ctx'> #define MAX_AMBS			(MAX_MEM_CHANNELS * \</div><div class='ctx'> 					 MAX_AMBS_PER_CHANNEL)</div><div class='add'>+#define CHANNEL_SHIFT			4</div><div class='add'>+#define DIMM_MASK			0xF</div><div class='ctx'> /*</div><div class='ctx'>  * Ugly hack: For some reason the highest bit is set if there</div><div class='ctx'>  * are _any_ DIMMs in the channel.  Attempting to read from</div><div class='hunk'>@@ -89,7 +91,7 @@ static unsigned long amb_reg_temp(unsigned int amb)</div><div class='ctx'>  * might prevent us from seeing the 16th DIMM in the channel.</div><div class='ctx'>  */</div><div class='ctx'> #define REAL_MAX_AMBS_PER_CHANNEL	15</div><div class='del'>-#define KNOBS_PER_AMB			5</div><div class='add'>+#define KNOBS_PER_AMB			6</div><div class='ctx'> </div><div class='ctx'> static unsigned long amb_num_from_reg(unsigned int byte_num, unsigned int bit)</div><div class='ctx'> {</div><div class='hunk'>@@ -238,6 +240,16 @@ static ssize_t show_amb_temp(struct device *dev,</div><div class='ctx'> 		500 * amb_read_byte(data, amb_reg_temp(attr-&gt;index)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t show_label(struct device *dev,</div><div class='add'>+			  struct device_attribute *devattr,</div><div class='add'>+			  char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "Ch. %d DIMM %d\n", attr-&gt;index &gt;&gt; CHANNEL_SHIFT,</div><div class='add'>+		       attr-&gt;index &amp; DIMM_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __devinit i5k_amb_hwmon_init(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j, k, d = 0;</div><div class='hunk'>@@ -268,6 +280,20 @@ static int __devinit i5k_amb_hwmon_init(struct platform_device *pdev)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			d++;</div><div class='ctx'> </div><div class='add'>+			/* sysfs label */</div><div class='add'>+			iattr = data-&gt;attrs + data-&gt;num_attrs;</div><div class='add'>+			snprintf(iattr-&gt;name, AMB_SYSFS_NAME_LEN,</div><div class='add'>+				 "temp%d_label", d);</div><div class='add'>+			iattr-&gt;s_attr.dev_attr.attr.name = iattr-&gt;name;</div><div class='add'>+			iattr-&gt;s_attr.dev_attr.attr.mode = S_IRUGO;</div><div class='add'>+			iattr-&gt;s_attr.dev_attr.show = show_label;</div><div class='add'>+			iattr-&gt;s_attr.index = k;</div><div class='add'>+			res = device_create_file(&amp;pdev-&gt;dev,</div><div class='add'>+						 &amp;iattr-&gt;s_attr.dev_attr);</div><div class='add'>+			if (res)</div><div class='add'>+				goto exit_remove;</div><div class='add'>+			data-&gt;num_attrs++;</div><div class='add'>+</div><div class='ctx'> 			/* Temperature sysfs knob */</div><div class='ctx'> 			iattr = data-&gt;attrs + data-&gt;num_attrs;</div><div class='ctx'> 			snprintf(iattr-&gt;name, AMB_SYSFS_NAME_LEN,</div><div class='head'>diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c<br/>index c9416e657487..0f70dc204105 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/ibmaem.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/ibmaem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/ibmaem.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/ibmaem.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='del'>- * A hwmon driver for the IBM Active Energy Manager temperature/power sensors</div><div class='del'>- * and capping functionality.</div><div class='add'>+ * A hwmon driver for the IBM System Director Active Energy Manager (AEM)</div><div class='add'>+ * temperature/power/energy sensors and capping functionality.</div><div class='ctx'>  * Copyright (C) 2008 IBM</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Darrick J. Wong &lt;djwong@us.ibm.com&gt;</div><div class='hunk'>@@ -463,12 +463,18 @@ static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Update AEM energy registers */</div><div class='add'>+static void update_aem_energy_one(struct aem_data *data, int which)</div><div class='add'>+{</div><div class='add'>+	aem_read_sensor(data, AEM_ENERGY_ELEMENT, which,</div><div class='add'>+			&amp;data-&gt;energy[which], 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void update_aem_energy(struct aem_data *data)</div><div class='ctx'> {</div><div class='del'>-	aem_read_sensor(data, AEM_ENERGY_ELEMENT, 0, &amp;data-&gt;energy[0], 8);</div><div class='add'>+	update_aem_energy_one(data, 0);</div><div class='ctx'> 	if (data-&gt;ver_major &lt; 2)</div><div class='ctx'> 		return;</div><div class='del'>-	aem_read_sensor(data, AEM_ENERGY_ELEMENT, 1, &amp;data-&gt;energy[1], 8);</div><div class='add'>+	update_aem_energy_one(data, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Update all AEM1 sensors */</div><div class='hunk'>@@ -676,7 +682,8 @@ static int aem_find_aem2(struct aem_ipmi_data *data,</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;rx_result || data-&gt;rx_msg_len != sizeof(*fi_resp) ||</div><div class='del'>-	    memcmp(&amp;fi_resp-&gt;id, &amp;system_x_id, sizeof(system_x_id)))</div><div class='add'>+	    memcmp(&amp;fi_resp-&gt;id, &amp;system_x_id, sizeof(system_x_id)) ||</div><div class='add'>+	    fi_resp-&gt;num_instances &lt;= instance_num)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -849,7 +856,7 @@ static ssize_t aem_show_power(struct device *dev,</div><div class='ctx'> 	struct timespec b, a;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;lock);</div><div class='del'>-	update_aem_energy(data);</div><div class='add'>+	update_aem_energy_one(data, attr-&gt;index);</div><div class='ctx'> 	getnstimeofday(&amp;b);</div><div class='ctx'> 	before = data-&gt;energy[attr-&gt;index];</div><div class='ctx'> </div><div class='hunk'>@@ -861,7 +868,7 @@ static ssize_t aem_show_power(struct device *dev,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	update_aem_energy(data);</div><div class='add'>+	update_aem_energy_one(data, attr-&gt;index);</div><div class='ctx'> 	getnstimeofday(&amp;a);</div><div class='ctx'> 	after = data-&gt;energy[attr-&gt;index];</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;lock);</div><div class='hunk'>@@ -880,7 +887,9 @@ static ssize_t aem_show_energy(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct aem_data *a = dev_get_drvdata(dev);</div><div class='del'>-	a-&gt;update(a);</div><div class='add'>+	mutex_lock(&amp;a-&gt;lock);</div><div class='add'>+	update_aem_energy_one(a, attr-&gt;index);</div><div class='add'>+	mutex_unlock(&amp;a-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return sprintf(buf, "%llu\n",</div><div class='ctx'> 			(unsigned long long)a-&gt;energy[attr-&gt;index] * 1000);</div><div class='hunk'>@@ -1104,7 +1113,7 @@ static void __exit aem_exit(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Darrick J. Wong &lt;djwong@us.ibm.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("IBM Active Energy Manager power/temp sensor driver");</div><div class='add'>+MODULE_DESCRIPTION("IBM AEM power/temp/energy sensor driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> module_init(aem_init);</div><div class='head'>diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c<br/>index e12c132ff83a..f1133081cc42 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/it87.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/it87.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/it87.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/it87.c</a></div><div class='hunk'>@@ -151,9 +151,9 @@ static int fix_pwm_polarity;</div><div class='ctx'> /* The IT8718F has the VID value in a different register, in Super-I/O</div><div class='ctx'>    configuration space. */</div><div class='ctx'> #define IT87_REG_VID           0x0a</div><div class='del'>-/* Warning: register 0x0b is used for something completely different in</div><div class='del'>-   new chips/revisions. I suspect only 16-bit tachometer mode will work</div><div class='del'>-   for these. */</div><div class='add'>+/* The IT8705F and IT8712F earlier than revision 0x08 use register 0x0b</div><div class='add'>+   for fan divisors. Later IT8712F revisions must use 16-bit tachometer</div><div class='add'>+   mode. */</div><div class='ctx'> #define IT87_REG_FAN_DIV       0x0b</div><div class='ctx'> #define IT87_REG_FAN_16BIT     0x0c</div><div class='ctx'> </div><div class='hunk'>@@ -234,6 +234,7 @@ static const unsigned int pwm_freq[8] = {</div><div class='ctx'> struct it87_sio_data {</div><div class='ctx'> 	enum chips type;</div><div class='ctx'> 	/* Values read from Super-I/O config space */</div><div class='add'>+	u8 revision;</div><div class='ctx'> 	u8 vid_value;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -242,6 +243,7 @@ struct it87_sio_data {</div><div class='ctx'> struct it87_data {</div><div class='ctx'> 	struct device *hwmon_dev;</div><div class='ctx'> 	enum chips type;</div><div class='add'>+	u8 revision;</div><div class='ctx'> </div><div class='ctx'> 	unsigned short addr;</div><div class='ctx'> 	const char *name;</div><div class='hunk'>@@ -268,6 +270,16 @@ struct it87_data {</div><div class='ctx'> 	u8 manual_pwm_ctl[3];   /* manual PWM value set by user */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline int has_16bit_fans(const struct it87_data *data)</div><div class='add'>+{</div><div class='add'>+	/* IT8705F Datasheet 0.4.1, 3h == Version G.</div><div class='add'>+	   IT8712F Datasheet 0.9.1, section 8.3.5 indicates 8h == Version J.</div><div class='add'>+	   These are the first revisions with 16bit tachometer support. */</div><div class='add'>+	return (data-&gt;type == it87 &amp;&amp; data-&gt;revision &gt;= 0x03)</div><div class='add'>+	    || (data-&gt;type == it8712 &amp;&amp; data-&gt;revision &gt;= 0x08)</div><div class='add'>+	    || data-&gt;type == it8716</div><div class='add'>+	    || data-&gt;type == it8718;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int it87_probe(struct platform_device *pdev);</div><div class='ctx'> static int __devexit it87_remove(struct platform_device *pdev);</div><div class='hunk'>@@ -991,8 +1003,9 @@ static int __init it87_find(unsigned short *address,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='add'>+	sio_data-&gt;revision = superio_inb(DEVREV) &amp; 0x0f;</div><div class='ctx'> 	pr_info("it87: Found IT%04xF chip at 0x%x, revision %d\n",</div><div class='del'>-		chip_type, *address, superio_inb(DEVREV) &amp; 0x0f);</div><div class='add'>+		chip_type, *address, sio_data-&gt;revision);</div><div class='ctx'> </div><div class='ctx'> 	/* Read GPIO config and VID value from LDN 7 (GPIO) */</div><div class='ctx'> 	if (chip_type != IT8705F_DEVID) {</div><div class='hunk'>@@ -1045,6 +1058,7 @@ static int __devinit it87_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;addr = res-&gt;start;</div><div class='ctx'> 	data-&gt;type = sio_data-&gt;type;</div><div class='add'>+	data-&gt;revision = sio_data-&gt;revision;</div><div class='ctx'> 	data-&gt;name = names[sio_data-&gt;type];</div><div class='ctx'> </div><div class='ctx'> 	/* Now, we do the remaining detection. */</div><div class='hunk'>@@ -1069,7 +1083,7 @@ static int __devinit it87_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto ERROR2;</div><div class='ctx'> </div><div class='ctx'> 	/* Do not create fan files for disabled fans */</div><div class='del'>-	if (data-&gt;type == it8716 || data-&gt;type == it8718) {</div><div class='add'>+	if (has_16bit_fans(data)) {</div><div class='ctx'> 		/* 16-bit tachometers */</div><div class='ctx'> 		if (data-&gt;has_fan &amp; (1 &lt;&lt; 0)) {</div><div class='ctx'> 			if ((err = device_create_file(dev,</div><div class='hunk'>@@ -1350,7 +1364,7 @@ static void __devinit it87_init_device(struct platform_device *pdev)</div><div class='ctx'> 	data-&gt;has_fan = (data-&gt;fan_main_ctrl &gt;&gt; 4) &amp; 0x07;</div><div class='ctx'> </div><div class='ctx'> 	/* Set tachometers to 16-bit mode if needed */</div><div class='del'>-	if (data-&gt;type == it8716 || data-&gt;type == it8718) {</div><div class='add'>+	if (has_16bit_fans(data)) {</div><div class='ctx'> 		tmp = it87_read_value(data, IT87_REG_FAN_16BIT);</div><div class='ctx'> 		if (~tmp &amp; 0x07 &amp; data-&gt;has_fan) {</div><div class='ctx'> 			dev_dbg(&amp;pdev-&gt;dev,</div><div class='hunk'>@@ -1358,10 +1372,13 @@ static void __devinit it87_init_device(struct platform_device *pdev)</div><div class='ctx'> 			it87_write_value(data, IT87_REG_FAN_16BIT,</div><div class='ctx'> 					 tmp | 0x07);</div><div class='ctx'> 		}</div><div class='del'>-		if (tmp &amp; (1 &lt;&lt; 4))</div><div class='del'>-			data-&gt;has_fan |= (1 &lt;&lt; 3);	/* fan4 enabled */</div><div class='del'>-		if (tmp &amp; (1 &lt;&lt; 5))</div><div class='del'>-			data-&gt;has_fan |= (1 &lt;&lt; 4);	/* fan5 enabled */</div><div class='add'>+		/* IT8705F only supports three fans. */</div><div class='add'>+		if (data-&gt;type != it87) {</div><div class='add'>+			if (tmp &amp; (1 &lt;&lt; 4))</div><div class='add'>+				data-&gt;has_fan |= (1 &lt;&lt; 3); /* fan4 enabled */</div><div class='add'>+			if (tmp &amp; (1 &lt;&lt; 5))</div><div class='add'>+				data-&gt;has_fan |= (1 &lt;&lt; 4); /* fan5 enabled */</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set current fan mode registers and the default settings for the</div><div class='hunk'>@@ -1426,7 +1443,7 @@ static struct it87_data *it87_update_device(struct device *dev)</div><div class='ctx'> 			data-&gt;fan[i] = it87_read_value(data,</div><div class='ctx'> 				       IT87_REG_FAN[i]);</div><div class='ctx'> 			/* Add high byte if in 16-bit mode */</div><div class='del'>-			if (data-&gt;type == it8716 || data-&gt;type == it8718) {</div><div class='add'>+			if (has_16bit_fans(data)) {</div><div class='ctx'> 				data-&gt;fan[i] |= it87_read_value(data,</div><div class='ctx'> 						IT87_REG_FANX[i]) &lt;&lt; 8;</div><div class='ctx'> 				data-&gt;fan_min[i] |= it87_read_value(data,</div><div class='hunk'>@@ -1443,8 +1460,7 @@ static struct it87_data *it87_update_device(struct device *dev)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Newer chips don't have clock dividers */</div><div class='del'>-		if ((data-&gt;has_fan &amp; 0x07) &amp;&amp; data-&gt;type != it8716</div><div class='del'>-		 &amp;&amp; data-&gt;type != it8718) {</div><div class='add'>+		if ((data-&gt;has_fan &amp; 0x07) &amp;&amp; !has_16bit_fans(data)) {</div><div class='ctx'> 			i = it87_read_value(data, IT87_REG_FAN_DIV);</div><div class='ctx'> 			data-&gt;fan_div[0] = i &amp; 0x07;</div><div class='ctx'> 			data-&gt;fan_div[1] = (i &gt;&gt; 3) &amp; 0x07;</div><div class='hunk'>@@ -1460,7 +1476,8 @@ static struct it87_data *it87_update_device(struct device *dev)</div><div class='ctx'> 		data-&gt;fan_ctl = it87_read_value(data, IT87_REG_FAN_CTL);</div><div class='ctx'> </div><div class='ctx'> 		data-&gt;sensor = it87_read_value(data, IT87_REG_TEMP_ENABLE);</div><div class='del'>-		/* The 8705 does not have VID capability */</div><div class='add'>+		/* The 8705 does not have VID capability.</div><div class='add'>+		   The 8718 does not use IT87_REG_VID for the same purpose. */</div><div class='ctx'> 		if (data-&gt;type == it8712 || data-&gt;type == it8716) {</div><div class='ctx'> 			data-&gt;vid = it87_read_value(data, IT87_REG_VID);</div><div class='ctx'> 			/* The older IT8712F revisions had only 5 VID pins,</div><div class='head'>diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c<br/>index de698dc73020..8f9595f2fb53 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/lm75.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/lm75.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/lm75.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/lm75.c</a></div><div class='hunk'>@@ -30,14 +30,37 @@</div><div class='ctx'> #include "lm75.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* Addresses to scan */</div><div class='add'>+/*</div><div class='add'>+ * This driver handles the LM75 and compatible digital temperature sensors.</div><div class='add'>+ * Only types which are _not_ listed in I2C_CLIENT_INSMOD_*() need to be</div><div class='add'>+ * listed here.  We start at 9 since I2C_CLIENT_INSMOD_*() currently allow</div><div class='add'>+ * definition of up to 8 chip types (plus zero).</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum lm75_type {		/* keep sorted in alphabetical order */</div><div class='add'>+	ds1775 = 9,</div><div class='add'>+	ds75,</div><div class='add'>+	/* lm75 -- in I2C_CLIENT_INSMOD_1() */</div><div class='add'>+	lm75a,</div><div class='add'>+	max6625,</div><div class='add'>+	max6626,</div><div class='add'>+	mcp980x,</div><div class='add'>+	stds75,</div><div class='add'>+	tcn75,</div><div class='add'>+	tmp100,</div><div class='add'>+	tmp101,</div><div class='add'>+	tmp175,</div><div class='add'>+	tmp275,</div><div class='add'>+	tmp75,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Addresses scanned */</div><div class='ctx'> static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,</div><div class='ctx'> 					0x4d, 0x4e, 0x4f, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='ctx'> /* Insmod parameters */</div><div class='ctx'> I2C_CLIENT_INSMOD_1(lm75);</div><div class='ctx'> </div><div class='del'>-/* Many LM75 constants specified below */</div><div class='ctx'> </div><div class='ctx'> /* The LM75 registers */</div><div class='ctx'> #define LM75_REG_CONF		0x01</div><div class='hunk'>@@ -49,10 +72,10 @@ static const u8 LM75_REG_TEMP[3] = {</div><div class='ctx'> </div><div class='ctx'> /* Each client has this additional data */</div><div class='ctx'> struct lm75_data {</div><div class='del'>-	struct i2c_client	client;</div><div class='del'>-	struct device *hwmon_dev;</div><div class='add'>+	struct device		*hwmon_dev;</div><div class='ctx'> 	struct mutex		update_lock;</div><div class='del'>-	char			valid;		/* !=0 if following fields are valid */</div><div class='add'>+	u8			orig_conf;</div><div class='add'>+	char			valid;		/* !=0 if registers are valid */</div><div class='ctx'> 	unsigned long		last_updated;	/* In jiffies */</div><div class='ctx'> 	u16			temp[3];	/* Register values,</div><div class='ctx'> 						   0 = input</div><div class='hunk'>@@ -60,23 +83,14 @@ struct lm75_data {</div><div class='ctx'> 						   2 = hyst */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int lm75_attach_adapter(struct i2c_adapter *adapter);</div><div class='del'>-static int lm75_detect(struct i2c_adapter *adapter, int address, int kind);</div><div class='del'>-static void lm75_init_client(struct i2c_client *client);</div><div class='del'>-static int lm75_detach_client(struct i2c_client *client);</div><div class='ctx'> static int lm75_read_value(struct i2c_client *client, u8 reg);</div><div class='ctx'> static int lm75_write_value(struct i2c_client *client, u8 reg, u16 value);</div><div class='ctx'> static struct lm75_data *lm75_update_device(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* This is the driver that will be inserted */</div><div class='del'>-static struct i2c_driver lm75_driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name	= "lm75",</div><div class='del'>-	},</div><div class='del'>-	.attach_adapter	= lm75_attach_adapter,</div><div class='del'>-	.detach_client	= lm75_detach_client,</div><div class='del'>-};</div><div class='add'>+/*-----------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* sysfs attributes for hwmon */</div><div class='ctx'> </div><div class='ctx'> static ssize_t show_temp(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 			 char *buf)</div><div class='hunk'>@@ -109,13 +123,6 @@ static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IWUSR | S_IRUGO,</div><div class='ctx'> 			show_temp, set_temp, 2);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);</div><div class='ctx'> </div><div class='del'>-static int lm75_attach_adapter(struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	if (!(adapter-&gt;class &amp; I2C_CLASS_HWMON))</div><div class='del'>-		return 0;</div><div class='del'>-	return i2c_probe(adapter, &amp;addr_data, lm75_detect);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct attribute *lm75_attributes[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_temp1_input.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp1_max.dev_attr.attr,</div><div class='hunk'>@@ -128,33 +135,114 @@ static const struct attribute_group lm75_group = {</div><div class='ctx'> 	.attrs = lm75_attributes,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* This function is called by i2c_probe */</div><div class='del'>-static int lm75_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='add'>+/*-----------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* device probe and removal */</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+lm75_probe(struct i2c_client *client, const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	struct i2c_client *new_client;</div><div class='ctx'> 	struct lm75_data *data;</div><div class='del'>-	int err = 0;</div><div class='del'>-	const char *name = "";</div><div class='add'>+	int status;</div><div class='add'>+	u8 set_mask, clr_mask;</div><div class='add'>+	int new;</div><div class='ctx'> </div><div class='del'>-	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |</div><div class='del'>-				     I2C_FUNC_SMBUS_WORD_DATA))</div><div class='del'>-		goto exit;</div><div class='del'>-</div><div class='del'>-	/* OK. For now, we presume we have a valid client. We now create the</div><div class='del'>-	   client structure, even though we cannot fill it completely yet.</div><div class='del'>-	   But it allows us to access lm75_{read,write}_value. */</div><div class='del'>-	if (!(data = kzalloc(sizeof(struct lm75_data), GFP_KERNEL))) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto exit;</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter,</div><div class='add'>+			I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	data = kzalloc(sizeof(struct lm75_data), GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(client, data);</div><div class='add'>+	mutex_init(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	/* Set to LM75 resolution (9 bits, 1/2 degree C) and range.</div><div class='add'>+	 * Then tweak to be more precise when appropriate.</div><div class='add'>+	 */</div><div class='add'>+	set_mask = 0;</div><div class='add'>+	clr_mask = (1 &lt;&lt; 0)			/* continuous conversions */</div><div class='add'>+		| (1 &lt;&lt; 6) | (1 &lt;&lt; 5);		/* 9-bit mode */</div><div class='add'>+</div><div class='add'>+	/* configure as specified */</div><div class='add'>+	status = lm75_read_value(client, LM75_REG_CONF);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "Can't read config? %d\n", status);</div><div class='add'>+		goto exit_free;</div><div class='ctx'> 	}</div><div class='add'>+	data-&gt;orig_conf = status;</div><div class='add'>+	new = status &amp; ~clr_mask;</div><div class='add'>+	new |= set_mask;</div><div class='add'>+	if (status != new)</div><div class='add'>+		lm75_write_value(client, LM75_REG_CONF, new);</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "Config %02x\n", new);</div><div class='add'>+</div><div class='add'>+	/* Register sysfs hooks */</div><div class='add'>+	status = sysfs_create_group(&amp;client-&gt;dev.kobj, &amp;lm75_group);</div><div class='add'>+	if (status)</div><div class='add'>+		goto exit_free;</div><div class='add'>+</div><div class='add'>+	data-&gt;hwmon_dev = hwmon_device_register(&amp;client-&gt;dev);</div><div class='add'>+	if (IS_ERR(data-&gt;hwmon_dev)) {</div><div class='add'>+		status = PTR_ERR(data-&gt;hwmon_dev);</div><div class='add'>+		goto exit_remove;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;client-&gt;dev, "%s: sensor '%s'\n",</div><div class='add'>+		data-&gt;hwmon_dev-&gt;bus_id, client-&gt;name);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+exit_remove:</div><div class='add'>+	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm75_group);</div><div class='add'>+exit_free:</div><div class='add'>+	i2c_set_clientdata(client, NULL);</div><div class='add'>+	kfree(data);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lm75_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct lm75_data *data = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	hwmon_device_unregister(data-&gt;hwmon_dev);</div><div class='add'>+	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm75_group);</div><div class='add'>+	lm75_write_value(client, LM75_REG_CONF, data-&gt;orig_conf);</div><div class='add'>+	i2c_set_clientdata(client, NULL);</div><div class='add'>+	kfree(data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id lm75_ids[] = {</div><div class='add'>+	{ "ds1775", ds1775, },</div><div class='add'>+	{ "ds75", ds75, },</div><div class='add'>+	{ "lm75", lm75, },</div><div class='add'>+	{ "lm75a", lm75a, },</div><div class='add'>+	{ "max6625", max6625, },</div><div class='add'>+	{ "max6626", max6626, },</div><div class='add'>+	{ "mcp980x", mcp980x, },</div><div class='add'>+	{ "stds75", stds75, },</div><div class='add'>+	{ "tcn75", tcn75, },</div><div class='add'>+	{ "tmp100", tmp100, },</div><div class='add'>+	{ "tmp101", tmp101, },</div><div class='add'>+	{ "tmp175", tmp175, },</div><div class='add'>+	{ "tmp275", tmp275, },</div><div class='add'>+	{ "tmp75", tmp75, },</div><div class='add'>+	{ /* LIST END */ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, lm75_ids);</div><div class='add'>+</div><div class='add'>+/* Return 0 if detection is successful, -ENODEV otherwise */</div><div class='add'>+static int lm75_detect(struct i2c_client *new_client, int kind,</div><div class='add'>+		       struct i2c_board_info *info)</div><div class='add'>+{</div><div class='add'>+	struct i2c_adapter *adapter = new_client-&gt;adapter;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	new_client = &amp;data-&gt;client;</div><div class='del'>-	i2c_set_clientdata(new_client, data);</div><div class='del'>-	new_client-&gt;addr = address;</div><div class='del'>-	new_client-&gt;adapter = adapter;</div><div class='del'>-	new_client-&gt;driver = &amp;lm75_driver;</div><div class='del'>-	new_client-&gt;flags = 0;</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |</div><div class='add'>+				     I2C_FUNC_SMBUS_WORD_DATA))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* Now, we do the remaining detection. There is no identification-</div><div class='ctx'> 	   dedicated register so we have to rely on several tricks:</div><div class='hunk'>@@ -174,77 +262,49 @@ static int lm75_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='ctx'> 		 || i2c_smbus_read_word_data(new_client, 5) != hyst</div><div class='ctx'> 		 || i2c_smbus_read_word_data(new_client, 6) != hyst</div><div class='ctx'> 		 || i2c_smbus_read_word_data(new_client, 7) != hyst)</div><div class='del'>-		 	goto exit_free;</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		os = i2c_smbus_read_word_data(new_client, 3);</div><div class='ctx'> 		if (i2c_smbus_read_word_data(new_client, 4) != os</div><div class='ctx'> 		 || i2c_smbus_read_word_data(new_client, 5) != os</div><div class='ctx'> 		 || i2c_smbus_read_word_data(new_client, 6) != os</div><div class='ctx'> 		 || i2c_smbus_read_word_data(new_client, 7) != os)</div><div class='del'>-		 	goto exit_free;</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 		/* Unused bits */</div><div class='ctx'> 		if (conf &amp; 0xe0)</div><div class='del'>-		 	goto exit_free;</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 		/* Addresses cycling */</div><div class='ctx'> 		for (i = 8; i &lt; 0xff; i += 8)</div><div class='ctx'> 			if (i2c_smbus_read_byte_data(new_client, i + 1) != conf</div><div class='ctx'> 			 || i2c_smbus_read_word_data(new_client, i + 2) != hyst</div><div class='ctx'> 			 || i2c_smbus_read_word_data(new_client, i + 3) != os)</div><div class='del'>-				goto exit_free;</div><div class='add'>+				return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Determine the chip type - only one kind supported! */</div><div class='del'>-	if (kind &lt;= 0)</div><div class='del'>-		kind = lm75;</div><div class='del'>-</div><div class='del'>-	if (kind == lm75) {</div><div class='del'>-		name = "lm75";</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Fill in the remaining client fields and put it into the global list */</div><div class='del'>-	strlcpy(new_client-&gt;name, name, I2C_NAME_SIZE);</div><div class='del'>-	data-&gt;valid = 0;</div><div class='del'>-	mutex_init(&amp;data-&gt;update_lock);</div><div class='del'>-</div><div class='del'>-	/* Tell the I2C layer a new client has arrived */</div><div class='del'>-	if ((err = i2c_attach_client(new_client)))</div><div class='del'>-		goto exit_free;</div><div class='del'>-</div><div class='del'>-	/* Initialize the LM75 chip */</div><div class='del'>-	lm75_init_client(new_client);</div><div class='del'>-	</div><div class='del'>-	/* Register sysfs hooks */</div><div class='del'>-	if ((err = sysfs_create_group(&amp;new_client-&gt;dev.kobj, &amp;lm75_group)))</div><div class='del'>-		goto exit_detach;</div><div class='del'>-</div><div class='del'>-	data-&gt;hwmon_dev = hwmon_device_register(&amp;new_client-&gt;dev);</div><div class='del'>-	if (IS_ERR(data-&gt;hwmon_dev)) {</div><div class='del'>-		err = PTR_ERR(data-&gt;hwmon_dev);</div><div class='del'>-		goto exit_remove;</div><div class='del'>-	}</div><div class='add'>+	/* NOTE: we treat "force=..." and "force_lm75=..." the same.</div><div class='add'>+	 * Only new-style driver binding distinguishes chip types.</div><div class='add'>+	 */</div><div class='add'>+	strlcpy(info-&gt;type, "lm75", I2C_NAME_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-exit_remove:</div><div class='del'>-	sysfs_remove_group(&amp;new_client-&gt;dev.kobj, &amp;lm75_group);</div><div class='del'>-exit_detach:</div><div class='del'>-	i2c_detach_client(new_client);</div><div class='del'>-exit_free:</div><div class='del'>-	kfree(data);</div><div class='del'>-exit:</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lm75_detach_client(struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	struct lm75_data *data = i2c_get_clientdata(client);</div><div class='del'>-	hwmon_device_unregister(data-&gt;hwmon_dev);</div><div class='del'>-	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm75_group);</div><div class='del'>-	i2c_detach_client(client);</div><div class='del'>-	kfree(data);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+static struct i2c_driver lm75_driver = {</div><div class='add'>+	.class		= I2C_CLASS_HWMON,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "lm75",</div><div class='add'>+	},</div><div class='add'>+	.probe		= lm75_probe,</div><div class='add'>+	.remove		= lm75_remove,</div><div class='add'>+	.id_table	= lm75_ids,</div><div class='add'>+	.detect		= lm75_detect,</div><div class='add'>+	.address_data	= &amp;addr_data,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* register access */</div><div class='ctx'> </div><div class='ctx'> /* All registers are word-sized, except for the configuration register.</div><div class='ctx'>    LM75 uses a high-byte first convention, which is exactly opposite to</div><div class='hunk'>@@ -268,16 +328,6 @@ static int lm75_write_value(struct i2c_client *client, u8 reg, u16 value)</div><div class='ctx'> 		return i2c_smbus_write_word_data(client, reg, swab16(value));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void lm75_init_client(struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	int reg;</div><div class='del'>-</div><div class='del'>-	/* Enable if in shutdown mode */</div><div class='del'>-	reg = lm75_read_value(client, LM75_REG_CONF);</div><div class='del'>-	if (reg &gt;= 0 &amp;&amp; (reg &amp; 0x01))</div><div class='del'>-		lm75_write_value(client, LM75_REG_CONF, reg &amp; 0xfe);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct lm75_data *lm75_update_device(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='hunk'>@@ -309,6 +359,10 @@ static struct lm75_data *lm75_update_device(struct device *dev)</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*-----------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* module glue */</div><div class='add'>+</div><div class='ctx'> static int __init sensors_lm75_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return i2c_add_driver(&amp;lm75_driver);</div><div class='head'>diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c<br/>index ee5eca1c1921..12d446f54f97 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/lm85.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/lm85.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/lm85.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/lm85.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>     lm85.c - Part of lm_sensors, Linux kernel modules for hardware</div><div class='ctx'>              monitoring</div><div class='del'>-    Copyright (c) 1998, 1999  Frodo Looijaard &lt;frodol@dds.nl&gt; </div><div class='add'>+    Copyright (c) 1998, 1999  Frodo Looijaard &lt;frodol@dds.nl&gt;</div><div class='ctx'>     Copyright (c) 2002, 2003  Philip Pokorny &lt;ppokorny@penguincomputing.com&gt;</div><div class='ctx'>     Copyright (c) 2003        Margit Schubert-While &lt;margitsw@t-online.de&gt;</div><div class='ctx'>     Copyright (c) 2004        Justin Thiessen &lt;jthiessen@penguincomputing.com&gt;</div><div class='hunk'>@@ -51,24 +51,17 @@ I2C_CLIENT_INSMOD_6(lm85b, lm85c, adm1027, adt7463, emc6d100, emc6d102);</div><div class='ctx'> #define	LM85_REG_TEMP_MAX(nr)		(0x4f + (nr) * 2)</div><div class='ctx'> </div><div class='ctx'> /* Fan speeds are LSB, MSB (2 bytes) */</div><div class='del'>-#define	LM85_REG_FAN(nr)		(0x28 + (nr) *2)</div><div class='del'>-#define	LM85_REG_FAN_MIN(nr)		(0x54 + (nr) *2)</div><div class='add'>+#define	LM85_REG_FAN(nr)		(0x28 + (nr) * 2)</div><div class='add'>+#define	LM85_REG_FAN_MIN(nr)		(0x54 + (nr) * 2)</div><div class='ctx'> </div><div class='ctx'> #define	LM85_REG_PWM(nr)		(0x30 + (nr))</div><div class='ctx'> </div><div class='del'>-#define	ADT7463_REG_OPPOINT(nr)		(0x33 + (nr))</div><div class='del'>-</div><div class='del'>-#define	ADT7463_REG_TMIN_CTL1		0x36</div><div class='del'>-#define	ADT7463_REG_TMIN_CTL2		0x37</div><div class='del'>-</div><div class='del'>-#define	LM85_REG_DEVICE			0x3d</div><div class='ctx'> #define	LM85_REG_COMPANY		0x3e</div><div class='ctx'> #define	LM85_REG_VERSTEP		0x3f</div><div class='ctx'> /* These are the recognized values for the above regs */</div><div class='del'>-#define	LM85_DEVICE_ADX			0x27</div><div class='ctx'> #define	LM85_COMPANY_NATIONAL		0x01</div><div class='ctx'> #define	LM85_COMPANY_ANALOG_DEV		0x41</div><div class='del'>-#define	LM85_COMPANY_SMSC      		0x5c</div><div class='add'>+#define	LM85_COMPANY_SMSC		0x5c</div><div class='ctx'> #define	LM85_VERSTEP_VMASK              0xf0</div><div class='ctx'> #define	LM85_VERSTEP_GENERIC		0x60</div><div class='ctx'> #define	LM85_VERSTEP_LM85C		0x60</div><div class='hunk'>@@ -91,58 +84,45 @@ I2C_CLIENT_INSMOD_6(lm85b, lm85c, adm1027, adt7463, emc6d100, emc6d102);</div><div class='ctx'> #define	LM85_REG_AFAN_CONFIG(nr)	(0x5c + (nr))</div><div class='ctx'> #define	LM85_REG_AFAN_RANGE(nr)		(0x5f + (nr))</div><div class='ctx'> #define	LM85_REG_AFAN_SPIKE1		0x62</div><div class='del'>-#define	LM85_REG_AFAN_SPIKE2		0x63</div><div class='ctx'> #define	LM85_REG_AFAN_MINPWM(nr)	(0x64 + (nr))</div><div class='ctx'> #define	LM85_REG_AFAN_LIMIT(nr)		(0x67 + (nr))</div><div class='ctx'> #define	LM85_REG_AFAN_CRITICAL(nr)	(0x6a + (nr))</div><div class='ctx'> #define	LM85_REG_AFAN_HYST1		0x6d</div><div class='ctx'> #define	LM85_REG_AFAN_HYST2		0x6e</div><div class='ctx'> </div><div class='del'>-#define	LM85_REG_TACH_MODE		0x74</div><div class='del'>-#define	LM85_REG_SPINUP_CTL		0x75</div><div class='del'>-</div><div class='del'>-#define	ADM1027_REG_TEMP_OFFSET(nr)	(0x70 + (nr))</div><div class='del'>-#define	ADM1027_REG_CONFIG2		0x73</div><div class='del'>-#define	ADM1027_REG_INTMASK1		0x74</div><div class='del'>-#define	ADM1027_REG_INTMASK2		0x75</div><div class='ctx'> #define	ADM1027_REG_EXTEND_ADC1		0x76</div><div class='ctx'> #define	ADM1027_REG_EXTEND_ADC2		0x77</div><div class='del'>-#define	ADM1027_REG_CONFIG3		0x78</div><div class='del'>-#define	ADM1027_REG_FAN_PPR		0x7b</div><div class='del'>-</div><div class='del'>-#define	ADT7463_REG_THERM		0x79</div><div class='del'>-#define	ADT7463_REG_THERM_LIMIT		0x7A</div><div class='ctx'> </div><div class='ctx'> #define EMC6D100_REG_ALARM3             0x7d</div><div class='ctx'> /* IN5, IN6 and IN7 */</div><div class='del'>-#define	EMC6D100_REG_IN(nr)             (0x70 + ((nr)-5))</div><div class='del'>-#define	EMC6D100_REG_IN_MIN(nr)         (0x73 + ((nr)-5) * 2)</div><div class='del'>-#define	EMC6D100_REG_IN_MAX(nr)         (0x74 + ((nr)-5) * 2)</div><div class='add'>+#define	EMC6D100_REG_IN(nr)             (0x70 + ((nr) - 5))</div><div class='add'>+#define	EMC6D100_REG_IN_MIN(nr)         (0x73 + ((nr) - 5) * 2)</div><div class='add'>+#define	EMC6D100_REG_IN_MAX(nr)         (0x74 + ((nr) - 5) * 2)</div><div class='ctx'> #define	EMC6D102_REG_EXTEND_ADC1	0x85</div><div class='ctx'> #define	EMC6D102_REG_EXTEND_ADC2	0x86</div><div class='ctx'> #define	EMC6D102_REG_EXTEND_ADC3	0x87</div><div class='ctx'> #define	EMC6D102_REG_EXTEND_ADC4	0x88</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* Conversions. Rounding and limit checking is only done on the TO_REG </div><div class='add'>+/* Conversions. Rounding and limit checking is only done on the TO_REG</div><div class='ctx'>    variants. Note that you should be a bit careful with which arguments</div><div class='ctx'>    these macros are called: arguments may be evaluated more than once.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* IN are scaled acording to built-in resistors */</div><div class='del'>-static int lm85_scaling[] = {  /* .001 Volts */</div><div class='del'>-		2500, 2250, 3300, 5000, 12000,</div><div class='del'>-		3300, 1500, 1800 /*EMC6D100*/</div><div class='del'>-	};</div><div class='del'>-#define SCALE(val,from,to)		(((val)*(to) + ((from)/2))/(from))</div><div class='add'>+static const int lm85_scaling[] = {  /* .001 Volts */</div><div class='add'>+	2500, 2250, 3300, 5000, 12000,</div><div class='add'>+	3300, 1500, 1800 /*EMC6D100*/</div><div class='add'>+};</div><div class='add'>+#define SCALE(val, from, to)	(((val) * (to) + ((from) / 2)) / (from))</div><div class='ctx'> </div><div class='del'>-#define INS_TO_REG(n,val)	\</div><div class='del'>-		SENSORS_LIMIT(SCALE(val,lm85_scaling[n],192),0,255)</div><div class='add'>+#define INS_TO_REG(n, val)	\</div><div class='add'>+		SENSORS_LIMIT(SCALE(val, lm85_scaling[n], 192), 0, 255)</div><div class='ctx'> </div><div class='del'>-#define INSEXT_FROM_REG(n,val,ext)	\</div><div class='add'>+#define INSEXT_FROM_REG(n, val, ext)	\</div><div class='ctx'> 		SCALE(((val) &lt;&lt; 4) + (ext), 192 &lt;&lt; 4, lm85_scaling[n])</div><div class='ctx'> </div><div class='del'>-#define INS_FROM_REG(n,val)	SCALE((val), 192, lm85_scaling[n])</div><div class='add'>+#define INS_FROM_REG(n, val)	SCALE((val), 192, lm85_scaling[n])</div><div class='ctx'> </div><div class='ctx'> /* FAN speed is measured using 90kHz clock */</div><div class='ctx'> static inline u16 FAN_TO_REG(unsigned long val)</div><div class='hunk'>@@ -151,16 +131,17 @@ static inline u16 FAN_TO_REG(unsigned long val)</div><div class='ctx'> 		return 0xffff;</div><div class='ctx'> 	return SENSORS_LIMIT(5400000 / val, 1, 0xfffe);</div><div class='ctx'> }</div><div class='del'>-#define FAN_FROM_REG(val)	((val)==0?-1:(val)==0xffff?0:5400000/(val))</div><div class='add'>+#define FAN_FROM_REG(val)	((val) == 0 ? -1 : (val) == 0xffff ? 0 : \</div><div class='add'>+				 5400000 / (val))</div><div class='ctx'> </div><div class='ctx'> /* Temperature is reported in .001 degC increments */</div><div class='ctx'> #define TEMP_TO_REG(val)	\</div><div class='del'>-		SENSORS_LIMIT(SCALE(val,1000,1),-127,127)</div><div class='del'>-#define TEMPEXT_FROM_REG(val,ext)	\</div><div class='add'>+		SENSORS_LIMIT(SCALE(val, 1000, 1), -127, 127)</div><div class='add'>+#define TEMPEXT_FROM_REG(val, ext)	\</div><div class='ctx'> 		SCALE(((val) &lt;&lt; 4) + (ext), 16, 1000)</div><div class='ctx'> #define TEMP_FROM_REG(val)	((val) * 1000)</div><div class='ctx'> </div><div class='del'>-#define PWM_TO_REG(val)			(SENSORS_LIMIT(val,0,255))</div><div class='add'>+#define PWM_TO_REG(val)			SENSORS_LIMIT(val, 0, 255)</div><div class='ctx'> #define PWM_FROM_REG(val)		(val)</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -183,17 +164,17 @@ static inline u16 FAN_TO_REG(unsigned long val)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* These are the zone temperature range encodings in .001 degree C */</div><div class='del'>-static int lm85_range_map[] = {   </div><div class='del'>-		2000,  2500,  3300,  4000,  5000,  6600,</div><div class='del'>-		8000, 10000, 13300, 16000, 20000, 26600,</div><div class='del'>-		32000, 40000, 53300, 80000</div><div class='del'>-	};</div><div class='del'>-static int RANGE_TO_REG( int range )</div><div class='add'>+static const int lm85_range_map[] = {</div><div class='add'>+	2000, 2500, 3300, 4000, 5000, 6600, 8000, 10000,</div><div class='add'>+	13300, 16000, 20000, 26600, 32000, 40000, 53300, 80000</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int RANGE_TO_REG(int range)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (range &gt;= lm85_range_map[15])</div><div class='del'>-		return 15 ;</div><div class='add'>+		return 15;</div><div class='ctx'> </div><div class='ctx'> 	/* Find the closest match */</div><div class='ctx'> 	for (i = 14; i &gt;= 0; --i) {</div><div class='hunk'>@@ -207,28 +188,25 @@ static int RANGE_TO_REG( int range )</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#define RANGE_FROM_REG(val) (lm85_range_map[(val)&amp;0x0f])</div><div class='add'>+#define RANGE_FROM_REG(val)	lm85_range_map[(val) &amp; 0x0f]</div><div class='ctx'> </div><div class='del'>-/* These are the Acoustic Enhancement, or Temperature smoothing encodings</div><div class='del'>- * NOTE: The enable/disable bit is INCLUDED in these encodings as the</div><div class='del'>- *       MSB (bit 3, value 8).  If the enable bit is 0, the encoded value</div><div class='del'>- *       is ignored, or set to 0.</div><div class='del'>- */</div><div class='ctx'> /* These are the PWM frequency encodings */</div><div class='del'>-static int lm85_freq_map[] = { /* .1 Hz */</div><div class='del'>-		100, 150, 230, 300, 380, 470, 620, 940</div><div class='del'>-	};</div><div class='del'>-static int FREQ_TO_REG( int freq )</div><div class='add'>+static const int lm85_freq_map[] = { /* .1 Hz */</div><div class='add'>+	100, 150, 230, 300, 380, 470, 620, 940</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int FREQ_TO_REG(int freq)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if( freq &gt;= lm85_freq_map[7] ) { return 7 ; }</div><div class='del'>-	for( i = 0 ; i &lt; 7 ; ++i )</div><div class='del'>-		if( freq &lt;= lm85_freq_map[i] )</div><div class='del'>-			break ;</div><div class='del'>-	return( i &amp; 0x07 );</div><div class='add'>+	if (freq &gt;= lm85_freq_map[7])</div><div class='add'>+		return 7;</div><div class='add'>+	for (i = 0; i &lt; 7; ++i)</div><div class='add'>+		if (freq &lt;= lm85_freq_map[i])</div><div class='add'>+			break;</div><div class='add'>+	return i;</div><div class='ctx'> }</div><div class='del'>-#define FREQ_FROM_REG(val) (lm85_freq_map[(val)&amp;0x07])</div><div class='add'>+#define FREQ_FROM_REG(val)	lm85_freq_map[(val) &amp; 0x07]</div><div class='ctx'> </div><div class='ctx'> /* Since we can't use strings, I'm abusing these numbers</div><div class='ctx'>  *   to stand in for the following meanings:</div><div class='hunk'>@@ -242,30 +220,23 @@ static int FREQ_TO_REG( int freq )</div><div class='ctx'>  *     -2 -- PWM responds to manual control</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int lm85_zone_map[] = { 1, 2, 3, -1, 0, 23, 123, -2 };</div><div class='del'>-#define ZONE_FROM_REG(val) (lm85_zone_map[((val)&gt;&gt;5)&amp;0x07])</div><div class='add'>+static const int lm85_zone_map[] = { 1, 2, 3, -1, 0, 23, 123, -2 };</div><div class='add'>+#define ZONE_FROM_REG(val)	lm85_zone_map[(val) &gt;&gt; 5]</div><div class='ctx'> </div><div class='del'>-static int ZONE_TO_REG( int zone )</div><div class='add'>+static int ZONE_TO_REG(int zone)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for( i = 0 ; i &lt;= 7 ; ++i )</div><div class='del'>-		if( zone == lm85_zone_map[i] )</div><div class='del'>-			break ;</div><div class='del'>-	if( i &gt; 7 )   /* Not found. */</div><div class='add'>+	for (i = 0; i &lt;= 7; ++i)</div><div class='add'>+		if (zone == lm85_zone_map[i])</div><div class='add'>+			break;</div><div class='add'>+	if (i &gt; 7)   /* Not found. */</div><div class='ctx'> 		i = 3;  /* Always 100% */</div><div class='del'>-	return( (i &amp; 0x07)&lt;&lt;5 );</div><div class='add'>+	return i &lt;&lt; 5;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define HYST_TO_REG(val) (SENSORS_LIMIT(((val)+500)/1000,0,15))</div><div class='del'>-#define HYST_FROM_REG(val) ((val)*1000)</div><div class='del'>-</div><div class='del'>-#define OFFSET_TO_REG(val) (SENSORS_LIMIT((val)/25,-127,127))</div><div class='del'>-#define OFFSET_FROM_REG(val) ((val)*25)</div><div class='del'>-</div><div class='del'>-#define PPR_MASK(fan) (0x03&lt;&lt;(fan *2))</div><div class='del'>-#define PPR_TO_REG(val,fan) (SENSORS_LIMIT((val)-1,0,3)&lt;&lt;(fan *2))</div><div class='del'>-#define PPR_FROM_REG(val,fan) ((((val)&gt;&gt;(fan * 2))&amp;0x03)+1)</div><div class='add'>+#define HYST_TO_REG(val)	SENSORS_LIMIT(((val) + 500) / 1000, 0, 15)</div><div class='add'>+#define HYST_FROM_REG(val)	((val) * 1000)</div><div class='ctx'> </div><div class='ctx'> /* Chip sampling rates</div><div class='ctx'>  *</div><div class='hunk'>@@ -292,11 +263,11 @@ struct lm85_zone {</div><div class='ctx'> 	u8 hyst;	/* Low limit hysteresis. (0-15) */</div><div class='ctx'> 	u8 range;	/* Temp range, encoded */</div><div class='ctx'> 	s8 critical;	/* "All fans ON" temp limit */</div><div class='del'>-	u8 off_desired; /* Actual "off" temperature specified.  Preserved </div><div class='add'>+	u8 off_desired; /* Actual "off" temperature specified.  Preserved</div><div class='ctx'> 			 * to prevent "drift" as other autofan control</div><div class='ctx'> 			 * values change.</div><div class='ctx'> 			 */</div><div class='del'>-	u8 max_desired; /* Actual "max" temperature specified.  Preserved </div><div class='add'>+	u8 max_desired; /* Actual "max" temperature specified.  Preserved</div><div class='ctx'> 			 * to prevent "drift" as other autofan control</div><div class='ctx'> 			 * values change.</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -327,23 +298,13 @@ struct lm85_data {</div><div class='ctx'> 	s8 temp[3];		/* Register value */</div><div class='ctx'> 	s8 temp_min[3];		/* Register value */</div><div class='ctx'> 	s8 temp_max[3];		/* Register value */</div><div class='del'>-	s8 temp_offset[3];	/* Register value */</div><div class='ctx'> 	u16 fan[4];		/* Register value */</div><div class='ctx'> 	u16 fan_min[4];		/* Register value */</div><div class='ctx'> 	u8 pwm[3];		/* Register value */</div><div class='del'>-	u8 spinup_ctl;		/* Register encoding, combined */</div><div class='del'>-	u8 tach_mode;		/* Register encoding, combined */</div><div class='ctx'> 	u8 temp_ext[3];		/* Decoded values */</div><div class='ctx'> 	u8 in_ext[8];		/* Decoded values */</div><div class='del'>-	u8 fan_ppr;		/* Register value */</div><div class='del'>-	u8 smooth[3];		/* Register encoding */</div><div class='ctx'> 	u8 vid;			/* Register value */</div><div class='ctx'> 	u8 vrm;			/* VRM version */</div><div class='del'>-	u8 syncpwm3;		/* Saved PWM3 for TACH 2,3,4 config */</div><div class='del'>-	u8 oppoint[3];		/* Register value */</div><div class='del'>-	u16 tmin_ctl;		/* Register value */</div><div class='del'>-	unsigned long therm_total; /* Cummulative therm count */</div><div class='del'>-	u8 therm_limit;		/* Register value */</div><div class='ctx'> 	u32 alarms;		/* Register encoding, combined */</div><div class='ctx'> 	struct lm85_autofan autofan[3];</div><div class='ctx'> 	struct lm85_zone zone[3];</div><div class='hunk'>@@ -355,9 +316,8 @@ static int lm85_detect(struct i2c_adapter *adapter, int address,</div><div class='ctx'> static int lm85_detach_client(struct i2c_client *client);</div><div class='ctx'> </div><div class='ctx'> static int lm85_read_value(struct i2c_client *client, u8 reg);</div><div class='del'>-static int lm85_write_value(struct i2c_client *client, u8 reg, int value);</div><div class='add'>+static void lm85_write_value(struct i2c_client *client, u8 reg, int value);</div><div class='ctx'> static struct lm85_data *lm85_update_device(struct device *dev);</div><div class='del'>-static void lm85_init_client(struct i2c_client *client);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct i2c_driver lm85_driver = {</div><div class='hunk'>@@ -375,7 +335,7 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf,"%d\n", FAN_FROM_REG(data-&gt;fan[nr]) );</div><div class='add'>+	return sprintf(buf, "%d\n", FAN_FROM_REG(data-&gt;fan[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t show_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -383,7 +343,7 @@ static ssize_t show_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf,"%d\n", FAN_FROM_REG(data-&gt;fan_min[nr]) );</div><div class='add'>+	return sprintf(buf, "%d\n", FAN_FROM_REG(data-&gt;fan_min[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -414,7 +374,8 @@ show_fan_offset(4);</div><div class='ctx'> </div><div class='ctx'> /* vid, vrm, alarms */</div><div class='ctx'> </div><div class='del'>-static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='ctx'> 	int vid;</div><div class='hunk'>@@ -432,13 +393,15 @@ static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr, c</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	return sprintf(buf, "%ld\n", (long) data-&gt;vrm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	data-&gt;vrm = simple_strtoul(buf, NULL, 10);</div><div class='hunk'>@@ -447,7 +410,8 @@ static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_alarms_reg(struct device *dev, struct device_attribute</div><div class='add'>+		*attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%u\n", data-&gt;alarms);</div><div class='hunk'>@@ -488,7 +452,7 @@ static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf,"%d\n", PWM_FROM_REG(data-&gt;pwm[nr]) );</div><div class='add'>+	return sprintf(buf, "%d\n", PWM_FROM_REG(data-&gt;pwm[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -581,17 +545,16 @@ static ssize_t show_in(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(	buf, "%d\n", INSEXT_FROM_REG(nr,</div><div class='del'>-						     data-&gt;in[nr],</div><div class='del'>-						     data-&gt;in_ext[nr]));</div><div class='add'>+	return sprintf(buf, "%d\n", INSEXT_FROM_REG(nr, data-&gt;in[nr],</div><div class='add'>+						    data-&gt;in_ext[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_min(struct device *dev,  struct device_attribute *attr,</div><div class='add'>+static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf,"%d\n", INS_FROM_REG(nr, data-&gt;in_min[nr]) );</div><div class='add'>+	return sprintf(buf, "%d\n", INS_FROM_REG(nr, data-&gt;in_min[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -614,7 +577,7 @@ static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf,"%d\n", INS_FROM_REG(nr, data-&gt;in_max[nr]) );</div><div class='add'>+	return sprintf(buf, "%d\n", INS_FROM_REG(nr, data-&gt;in_max[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -656,8 +619,8 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf,"%d\n", TEMPEXT_FROM_REG(data-&gt;temp[nr],</div><div class='del'>-						    data-&gt;temp_ext[nr]));</div><div class='add'>+	return sprintf(buf, "%d\n", TEMPEXT_FROM_REG(data-&gt;temp[nr],</div><div class='add'>+						     data-&gt;temp_ext[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -665,7 +628,7 @@ static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf,"%d\n", TEMP_FROM_REG(data-&gt;temp_min[nr]) );</div><div class='add'>+	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_min[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -688,7 +651,7 @@ static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf,"%d\n", TEMP_FROM_REG(data-&gt;temp_max[nr]) );</div><div class='add'>+	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_max[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -697,7 +660,7 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct lm85_data *data = i2c_get_clientdata(client);</div><div class='del'>-	long val = simple_strtol(buf, NULL, 10);	</div><div class='add'>+	long val = simple_strtol(buf, NULL, 10);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;temp_max[nr] = TEMP_TO_REG(val);</div><div class='hunk'>@@ -726,7 +689,7 @@ static ssize_t show_pwm_auto_channels(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf,"%d\n", ZONE_FROM_REG(data-&gt;autofan[nr].config));</div><div class='add'>+	return sprintf(buf, "%d\n", ZONE_FROM_REG(data-&gt;autofan[nr].config));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_pwm_auto_channels(struct device *dev,</div><div class='hunk'>@@ -735,11 +698,11 @@ static ssize_t set_pwm_auto_channels(struct device *dev,</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct lm85_data *data = i2c_get_clientdata(client);</div><div class='del'>-	long val = simple_strtol(buf, NULL, 10);   </div><div class='add'>+	long val = simple_strtol(buf, NULL, 10);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;autofan[nr].config = (data-&gt;autofan[nr].config &amp; (~0xe0))</div><div class='del'>-		| ZONE_TO_REG(val) ;</div><div class='add'>+		| ZONE_TO_REG(val);</div><div class='ctx'> 	lm85_write_value(client, LM85_REG_AFAN_CONFIG(nr),</div><div class='ctx'> 		data-&gt;autofan[nr].config);</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -751,7 +714,7 @@ static ssize_t show_pwm_auto_pwm_min(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf,"%d\n", PWM_FROM_REG(data-&gt;autofan[nr].min_pwm));</div><div class='add'>+	return sprintf(buf, "%d\n", PWM_FROM_REG(data-&gt;autofan[nr].min_pwm));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_pwm_auto_pwm_min(struct device *dev,</div><div class='hunk'>@@ -775,7 +738,7 @@ static ssize_t show_pwm_auto_pwm_minctl(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf,"%d\n", data-&gt;autofan[nr].min_off);</div><div class='add'>+	return sprintf(buf, "%d\n", data-&gt;autofan[nr].min_off);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_pwm_auto_pwm_minctl(struct device *dev,</div><div class='hunk'>@@ -785,15 +748,15 @@ static ssize_t set_pwm_auto_pwm_minctl(struct device *dev,</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct lm85_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long val = simple_strtol(buf, NULL, 10);</div><div class='add'>+	u8 tmp;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;autofan[nr].min_off = val;</div><div class='del'>-	lm85_write_value(client, LM85_REG_AFAN_SPIKE1, data-&gt;smooth[0]</div><div class='del'>-		| data-&gt;syncpwm3</div><div class='del'>-		| (data-&gt;autofan[0].min_off ? 0x20 : 0)</div><div class='del'>-		| (data-&gt;autofan[1].min_off ? 0x40 : 0)</div><div class='del'>-		| (data-&gt;autofan[2].min_off ? 0x80 : 0)</div><div class='del'>-	);</div><div class='add'>+	tmp = lm85_read_value(client, LM85_REG_AFAN_SPIKE1);</div><div class='add'>+	tmp &amp;= ~(0x20 &lt;&lt; nr);</div><div class='add'>+	if (data-&gt;autofan[nr].min_off)</div><div class='add'>+		tmp |= 0x20 &lt;&lt; nr;</div><div class='add'>+	lm85_write_value(client, LM85_REG_AFAN_SPIKE1, tmp);</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -803,7 +766,7 @@ static ssize_t show_pwm_auto_pwm_freq(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf,"%d\n", FREQ_FROM_REG(data-&gt;autofan[nr].freq));</div><div class='add'>+	return sprintf(buf, "%d\n", FREQ_FROM_REG(data-&gt;autofan[nr].freq));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_pwm_auto_pwm_freq(struct device *dev,</div><div class='hunk'>@@ -818,8 +781,7 @@ static ssize_t set_pwm_auto_pwm_freq(struct device *dev,</div><div class='ctx'> 	data-&gt;autofan[nr].freq = FREQ_TO_REG(val);</div><div class='ctx'> 	lm85_write_value(client, LM85_REG_AFAN_RANGE(nr),</div><div class='ctx'> 		(data-&gt;zone[nr].range &lt;&lt; 4)</div><div class='del'>-		| data-&gt;autofan[nr].freq</div><div class='del'>-	); </div><div class='add'>+		| data-&gt;autofan[nr].freq);</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -849,7 +811,7 @@ static ssize_t show_temp_auto_temp_off(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf,"%d\n", TEMP_FROM_REG(data-&gt;zone[nr].limit) -</div><div class='add'>+	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;zone[nr].limit) -</div><div class='ctx'> 		HYST_FROM_REG(data-&gt;zone[nr].hyst));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -866,15 +828,13 @@ static ssize_t set_temp_auto_temp_off(struct device *dev,</div><div class='ctx'> 	min = TEMP_FROM_REG(data-&gt;zone[nr].limit);</div><div class='ctx'> 	data-&gt;zone[nr].off_desired = TEMP_TO_REG(val);</div><div class='ctx'> 	data-&gt;zone[nr].hyst = HYST_TO_REG(min - val);</div><div class='del'>-	if ( nr == 0 || nr == 1 ) {</div><div class='add'>+	if (nr == 0 || nr == 1) {</div><div class='ctx'> 		lm85_write_value(client, LM85_REG_AFAN_HYST1,</div><div class='ctx'> 			(data-&gt;zone[0].hyst &lt;&lt; 4)</div><div class='del'>-			| data-&gt;zone[1].hyst</div><div class='del'>-			);</div><div class='add'>+			| data-&gt;zone[1].hyst);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		lm85_write_value(client, LM85_REG_AFAN_HYST2,</div><div class='del'>-			(data-&gt;zone[2].hyst &lt;&lt; 4)</div><div class='del'>-		);</div><div class='add'>+			(data-&gt;zone[2].hyst &lt;&lt; 4));</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -885,7 +845,7 @@ static ssize_t show_temp_auto_temp_min(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf,"%d\n", TEMP_FROM_REG(data-&gt;zone[nr].limit) );</div><div class='add'>+	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;zone[nr].limit));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_temp_auto_temp_min(struct device *dev,</div><div class='hunk'>@@ -913,15 +873,13 @@ static ssize_t set_temp_auto_temp_min(struct device *dev,</div><div class='ctx'> 	data-&gt;zone[nr].hyst = HYST_TO_REG(TEMP_FROM_REG(</div><div class='ctx'> 		data-&gt;zone[nr].limit) - TEMP_FROM_REG(</div><div class='ctx'> 		data-&gt;zone[nr].off_desired));</div><div class='del'>-	if ( nr == 0 || nr == 1 ) {</div><div class='add'>+	if (nr == 0 || nr == 1) {</div><div class='ctx'> 		lm85_write_value(client, LM85_REG_AFAN_HYST1,</div><div class='ctx'> 			(data-&gt;zone[0].hyst &lt;&lt; 4)</div><div class='del'>-			| data-&gt;zone[1].hyst</div><div class='del'>-			);</div><div class='add'>+			| data-&gt;zone[1].hyst);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		lm85_write_value(client, LM85_REG_AFAN_HYST2,</div><div class='del'>-			(data-&gt;zone[2].hyst &lt;&lt; 4)</div><div class='del'>-		);</div><div class='add'>+			(data-&gt;zone[2].hyst &lt;&lt; 4));</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -932,7 +890,7 @@ static ssize_t show_temp_auto_temp_max(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf,"%d\n", TEMP_FROM_REG(data-&gt;zone[nr].limit) +</div><div class='add'>+	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;zone[nr].limit) +</div><div class='ctx'> 		RANGE_FROM_REG(data-&gt;zone[nr].range));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -962,11 +920,11 @@ static ssize_t show_temp_auto_temp_crit(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='del'>-	return sprintf(buf,"%d\n", TEMP_FROM_REG(data-&gt;zone[nr].critical));</div><div class='add'>+	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;zone[nr].critical));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_temp_auto_temp_crit(struct device *dev,</div><div class='del'>-		struct device_attribute *attr,const char *buf, size_t count)</div><div class='add'>+		struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='hunk'>@@ -1127,20 +1085,37 @@ static const struct attribute_group lm85_group_in567 = {</div><div class='ctx'> 	.attrs = lm85_attributes_in567,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void lm85_init_client(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	int value;</div><div class='add'>+</div><div class='add'>+	/* Start monitoring if needed */</div><div class='add'>+	value = lm85_read_value(client, LM85_REG_CONFIG);</div><div class='add'>+	if (!(value &amp; 0x01)) {</div><div class='add'>+		dev_info(&amp;client-&gt;dev, "Starting monitoring\n");</div><div class='add'>+		lm85_write_value(client, LM85_REG_CONFIG, value | 0x01);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Warn about unusual configuration bits */</div><div class='add'>+	if (value &amp; 0x02)</div><div class='add'>+		dev_warn(&amp;client-&gt;dev, "Device configuration is locked\n");</div><div class='add'>+	if (!(value &amp; 0x04))</div><div class='add'>+		dev_warn(&amp;client-&gt;dev, "Device is not ready\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int lm85_detect(struct i2c_adapter *adapter, int address,</div><div class='ctx'> 		int kind)</div><div class='ctx'> {</div><div class='del'>-	int company, verstep ;</div><div class='del'>-	struct i2c_client *new_client = NULL;</div><div class='add'>+	int company, verstep;</div><div class='add'>+	struct i2c_client *client;</div><div class='ctx'> 	struct lm85_data *data;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	const char *type_name = "";</div><div class='add'>+	const char *type_name;</div><div class='ctx'> </div><div class='del'>-	if (!i2c_check_functionality(adapter,</div><div class='del'>-					I2C_FUNC_SMBUS_BYTE_DATA)) {</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {</div><div class='ctx'> 		/* We need to be able to do byte I/O */</div><div class='del'>-		goto ERROR0 ;</div><div class='del'>-	};</div><div class='add'>+		goto ERROR0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* OK. For now, we presume we have a valid client. We now create the</div><div class='ctx'> 	   client structure, even though we cannot fill it completely yet.</div><div class='hunk'>@@ -1151,138 +1126,145 @@ static int lm85_detect(struct i2c_adapter *adapter, int address,</div><div class='ctx'> 		goto ERROR0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	new_client = &amp;data-&gt;client;</div><div class='del'>-	i2c_set_clientdata(new_client, data);</div><div class='del'>-	new_client-&gt;addr = address;</div><div class='del'>-	new_client-&gt;adapter = adapter;</div><div class='del'>-	new_client-&gt;driver = &amp;lm85_driver;</div><div class='del'>-	new_client-&gt;flags = 0;</div><div class='add'>+	client = &amp;data-&gt;client;</div><div class='add'>+	i2c_set_clientdata(client, data);</div><div class='add'>+	client-&gt;addr = address;</div><div class='add'>+	client-&gt;adapter = adapter;</div><div class='add'>+	client-&gt;driver = &amp;lm85_driver;</div><div class='ctx'> </div><div class='ctx'> 	/* Now, we do the remaining detection. */</div><div class='ctx'> </div><div class='del'>-	company = lm85_read_value(new_client, LM85_REG_COMPANY);</div><div class='del'>-	verstep = lm85_read_value(new_client, LM85_REG_VERSTEP);</div><div class='add'>+	company = lm85_read_value(client, LM85_REG_COMPANY);</div><div class='add'>+	verstep = lm85_read_value(client, LM85_REG_VERSTEP);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;adapter-&gt;dev, "Detecting device at %d,0x%02x with"</div><div class='ctx'> 		" COMPANY: 0x%02x and VERSTEP: 0x%02x\n",</div><div class='del'>-		i2c_adapter_id(new_client-&gt;adapter), new_client-&gt;addr,</div><div class='add'>+		i2c_adapter_id(client-&gt;adapter), client-&gt;addr,</div><div class='ctx'> 		company, verstep);</div><div class='ctx'> </div><div class='ctx'> 	/* If auto-detecting, Determine the chip type. */</div><div class='ctx'> 	if (kind &lt;= 0) {</div><div class='ctx'> 		dev_dbg(&amp;adapter-&gt;dev, "Autodetecting device at %d,0x%02x ...\n",</div><div class='del'>-			i2c_adapter_id(adapter), address );</div><div class='del'>-		if( company == LM85_COMPANY_NATIONAL</div><div class='del'>-		    &amp;&amp; verstep == LM85_VERSTEP_LM85C ) {</div><div class='del'>-			kind = lm85c ;</div><div class='del'>-		} else if( company == LM85_COMPANY_NATIONAL</div><div class='del'>-		    &amp;&amp; verstep == LM85_VERSTEP_LM85B ) {</div><div class='del'>-			kind = lm85b ;</div><div class='del'>-		} else if( company == LM85_COMPANY_NATIONAL</div><div class='del'>-		    &amp;&amp; (verstep &amp; LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC ) {</div><div class='add'>+			i2c_adapter_id(adapter), address);</div><div class='add'>+		if (company == LM85_COMPANY_NATIONAL</div><div class='add'>+		    &amp;&amp; verstep == LM85_VERSTEP_LM85C) {</div><div class='add'>+			kind = lm85c;</div><div class='add'>+		} else if (company == LM85_COMPANY_NATIONAL</div><div class='add'>+		    &amp;&amp; verstep == LM85_VERSTEP_LM85B) {</div><div class='add'>+			kind = lm85b;</div><div class='add'>+		} else if (company == LM85_COMPANY_NATIONAL</div><div class='add'>+		    &amp;&amp; (verstep &amp; LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC) {</div><div class='ctx'> 			dev_err(&amp;adapter-&gt;dev, "Unrecognized version/stepping 0x%02x"</div><div class='ctx'> 				" Defaulting to LM85.\n", verstep);</div><div class='del'>-			kind = any_chip ;</div><div class='del'>-		} else if( company == LM85_COMPANY_ANALOG_DEV</div><div class='del'>-		    &amp;&amp; verstep == LM85_VERSTEP_ADM1027 ) {</div><div class='del'>-			kind = adm1027 ;</div><div class='del'>-		} else if( company == LM85_COMPANY_ANALOG_DEV</div><div class='add'>+			kind = any_chip;</div><div class='add'>+		} else if (company == LM85_COMPANY_ANALOG_DEV</div><div class='add'>+		    &amp;&amp; verstep == LM85_VERSTEP_ADM1027) {</div><div class='add'>+			kind = adm1027;</div><div class='add'>+		} else if (company == LM85_COMPANY_ANALOG_DEV</div><div class='ctx'> 		    &amp;&amp; (verstep == LM85_VERSTEP_ADT7463</div><div class='del'>-			 || verstep == LM85_VERSTEP_ADT7463C) ) {</div><div class='del'>-			kind = adt7463 ;</div><div class='del'>-		} else if( company == LM85_COMPANY_ANALOG_DEV</div><div class='del'>-		    &amp;&amp; (verstep &amp; LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC ) {</div><div class='add'>+			 || verstep == LM85_VERSTEP_ADT7463C)) {</div><div class='add'>+			kind = adt7463;</div><div class='add'>+		} else if (company == LM85_COMPANY_ANALOG_DEV</div><div class='add'>+		    &amp;&amp; (verstep &amp; LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC) {</div><div class='ctx'> 			dev_err(&amp;adapter-&gt;dev, "Unrecognized version/stepping 0x%02x"</div><div class='del'>-				" Defaulting to Generic LM85.\n", verstep );</div><div class='del'>-			kind = any_chip ;</div><div class='del'>-		} else if( company == LM85_COMPANY_SMSC</div><div class='add'>+				" Defaulting to Generic LM85.\n", verstep);</div><div class='add'>+			kind = any_chip;</div><div class='add'>+		} else if (company == LM85_COMPANY_SMSC</div><div class='ctx'> 		    &amp;&amp; (verstep == LM85_VERSTEP_EMC6D100_A0</div><div class='del'>-			 || verstep == LM85_VERSTEP_EMC6D100_A1) ) {</div><div class='add'>+			 || verstep == LM85_VERSTEP_EMC6D100_A1)) {</div><div class='ctx'> 			/* Unfortunately, we can't tell a '100 from a '101</div><div class='ctx'> 			 * from the registers.  Since a '101 is a '100</div><div class='ctx'> 			 * in a package with fewer pins and therefore no</div><div class='ctx'> 			 * 3.3V, 1.5V or 1.8V inputs, perhaps if those</div><div class='ctx'> 			 * inputs read 0, then it's a '101.</div><div class='ctx'> 			 */</div><div class='del'>-			kind = emc6d100 ;</div><div class='del'>-		} else if( company == LM85_COMPANY_SMSC</div><div class='add'>+			kind = emc6d100;</div><div class='add'>+		} else if (company == LM85_COMPANY_SMSC</div><div class='ctx'> 		    &amp;&amp; verstep == LM85_VERSTEP_EMC6D102) {</div><div class='del'>-			kind = emc6d102 ;</div><div class='del'>-		} else if( company == LM85_COMPANY_SMSC</div><div class='add'>+			kind = emc6d102;</div><div class='add'>+		} else if (company == LM85_COMPANY_SMSC</div><div class='ctx'> 		    &amp;&amp; (verstep &amp; LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC) {</div><div class='ctx'> 			dev_err(&amp;adapter-&gt;dev, "lm85: Detected SMSC chip\n");</div><div class='ctx'> 			dev_err(&amp;adapter-&gt;dev, "lm85: Unrecognized version/stepping 0x%02x"</div><div class='del'>-			    " Defaulting to Generic LM85.\n", verstep );</div><div class='del'>-			kind = any_chip ;</div><div class='del'>-		} else if( kind == any_chip</div><div class='add'>+			    " Defaulting to Generic LM85.\n", verstep);</div><div class='add'>+			kind = any_chip;</div><div class='add'>+		} else if (kind == any_chip</div><div class='ctx'> 		    &amp;&amp; (verstep &amp; LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC) {</div><div class='ctx'> 			dev_err(&amp;adapter-&gt;dev, "Generic LM85 Version 6 detected\n");</div><div class='ctx'> 			/* Leave kind as "any_chip" */</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dev_dbg(&amp;adapter-&gt;dev, "Autodetection failed\n");</div><div class='del'>-			/* Not an LM85 ... */</div><div class='del'>-			if( kind == any_chip ) {  /* User used force=x,y */</div><div class='add'>+			/* Not an LM85... */</div><div class='add'>+			if (kind == any_chip) {  /* User used force=x,y */</div><div class='ctx'> 				dev_err(&amp;adapter-&gt;dev, "Generic LM85 Version 6 not"</div><div class='ctx'> 					" found at %d,0x%02x. Try force_lm85c.\n",</div><div class='del'>-					i2c_adapter_id(adapter), address );</div><div class='add'>+					i2c_adapter_id(adapter), address);</div><div class='ctx'> 			}</div><div class='del'>-			err = 0 ;</div><div class='add'>+			err = 0;</div><div class='ctx'> 			goto ERROR1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in the chip specific driver values */</div><div class='del'>-	if ( kind == any_chip ) {</div><div class='del'>-		type_name = "lm85";</div><div class='del'>-	} else if ( kind == lm85b ) {</div><div class='add'>+	switch (kind) {</div><div class='add'>+	case lm85b:</div><div class='ctx'> 		type_name = "lm85b";</div><div class='del'>-	} else if ( kind == lm85c ) {</div><div class='add'>+		break;</div><div class='add'>+	case lm85c:</div><div class='ctx'> 		type_name = "lm85c";</div><div class='del'>-	} else if ( kind == adm1027 ) {</div><div class='add'>+		break;</div><div class='add'>+	case adm1027:</div><div class='ctx'> 		type_name = "adm1027";</div><div class='del'>-	} else if ( kind == adt7463 ) {</div><div class='add'>+		break;</div><div class='add'>+	case adt7463:</div><div class='ctx'> 		type_name = "adt7463";</div><div class='del'>-	} else if ( kind == emc6d100){</div><div class='add'>+		break;</div><div class='add'>+	case emc6d100:</div><div class='ctx'> 		type_name = "emc6d100";</div><div class='del'>-	} else if ( kind == emc6d102 ) {</div><div class='add'>+		break;</div><div class='add'>+	case emc6d102:</div><div class='ctx'> 		type_name = "emc6d102";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		type_name = "lm85";</div><div class='ctx'> 	}</div><div class='del'>-	strlcpy(new_client-&gt;name, type_name, I2C_NAME_SIZE);</div><div class='add'>+	strlcpy(client-&gt;name, type_name, I2C_NAME_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in the remaining client fields */</div><div class='ctx'> 	data-&gt;type = kind;</div><div class='del'>-	data-&gt;valid = 0;</div><div class='ctx'> 	mutex_init(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Tell the I2C layer a new client has arrived */</div><div class='del'>-	if ((err = i2c_attach_client(new_client)))</div><div class='add'>+	err = i2c_attach_client(client);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto ERROR1;</div><div class='ctx'> </div><div class='ctx'> 	/* Set the VRM version */</div><div class='ctx'> 	data-&gt;vrm = vid_which_vrm();</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the LM85 chip */</div><div class='del'>-	lm85_init_client(new_client);</div><div class='add'>+	lm85_init_client(client);</div><div class='ctx'> </div><div class='ctx'> 	/* Register sysfs hooks */</div><div class='del'>-	if ((err = sysfs_create_group(&amp;new_client-&gt;dev.kobj, &amp;lm85_group)))</div><div class='add'>+	err = sysfs_create_group(&amp;client-&gt;dev.kobj, &amp;lm85_group);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto ERROR2;</div><div class='ctx'> </div><div class='ctx'> 	/* The ADT7463 has an optional VRM 10 mode where pin 21 is used</div><div class='ctx'> 	   as a sixth digital VID input rather than an analog input. */</div><div class='del'>-	data-&gt;vid = lm85_read_value(new_client, LM85_REG_VID);</div><div class='add'>+	data-&gt;vid = lm85_read_value(client, LM85_REG_VID);</div><div class='ctx'> 	if (!(kind == adt7463 &amp;&amp; (data-&gt;vid &amp; 0x80)))</div><div class='del'>-		if ((err = sysfs_create_group(&amp;new_client-&gt;dev.kobj,</div><div class='add'>+		if ((err = sysfs_create_group(&amp;client-&gt;dev.kobj,</div><div class='ctx'> 					&amp;lm85_group_in4)))</div><div class='ctx'> 			goto ERROR3;</div><div class='ctx'> </div><div class='ctx'> 	/* The EMC6D100 has 3 additional voltage inputs */</div><div class='ctx'> 	if (kind == emc6d100)</div><div class='del'>-		if ((err = sysfs_create_group(&amp;new_client-&gt;dev.kobj,</div><div class='add'>+		if ((err = sysfs_create_group(&amp;client-&gt;dev.kobj,</div><div class='ctx'> 					&amp;lm85_group_in567)))</div><div class='ctx'> 			goto ERROR3;</div><div class='ctx'> </div><div class='del'>-	data-&gt;hwmon_dev = hwmon_device_register(&amp;new_client-&gt;dev);</div><div class='add'>+	data-&gt;hwmon_dev = hwmon_device_register(&amp;client-&gt;dev);</div><div class='ctx'> 	if (IS_ERR(data-&gt;hwmon_dev)) {</div><div class='ctx'> 		err = PTR_ERR(data-&gt;hwmon_dev);</div><div class='ctx'> 		goto ERROR3;</div><div class='hunk'>@@ -1291,16 +1273,16 @@ static int lm85_detect(struct i2c_adapter *adapter, int address,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Error out and cleanup code */</div><div class='del'>-    ERROR3:</div><div class='del'>-	sysfs_remove_group(&amp;new_client-&gt;dev.kobj, &amp;lm85_group);</div><div class='del'>-	sysfs_remove_group(&amp;new_client-&gt;dev.kobj, &amp;lm85_group_in4);</div><div class='add'>+ ERROR3:</div><div class='add'>+	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm85_group);</div><div class='add'>+	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm85_group_in4);</div><div class='ctx'> 	if (kind == emc6d100)</div><div class='del'>-		sysfs_remove_group(&amp;new_client-&gt;dev.kobj, &amp;lm85_group_in567);</div><div class='del'>-    ERROR2:</div><div class='del'>-	i2c_detach_client(new_client);</div><div class='del'>-    ERROR1:</div><div class='add'>+		sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm85_group_in567);</div><div class='add'>+ ERROR2:</div><div class='add'>+	i2c_detach_client(client);</div><div class='add'>+ ERROR1:</div><div class='ctx'> 	kfree(data);</div><div class='del'>-    ERROR0:</div><div class='add'>+ ERROR0:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1323,100 +1305,46 @@ static int lm85_read_value(struct i2c_client *client, u8 reg)</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='ctx'> 	/* What size location is it? */</div><div class='del'>-	switch( reg ) {</div><div class='del'>-	case LM85_REG_FAN(0) :  /* Read WORD data */</div><div class='del'>-	case LM85_REG_FAN(1) :</div><div class='del'>-	case LM85_REG_FAN(2) :</div><div class='del'>-	case LM85_REG_FAN(3) :</div><div class='del'>-	case LM85_REG_FAN_MIN(0) :</div><div class='del'>-	case LM85_REG_FAN_MIN(1) :</div><div class='del'>-	case LM85_REG_FAN_MIN(2) :</div><div class='del'>-	case LM85_REG_FAN_MIN(3) :</div><div class='del'>-	case LM85_REG_ALARM1 :	/* Read both bytes at once */</div><div class='del'>-		res = i2c_smbus_read_byte_data(client, reg) &amp; 0xff ;</div><div class='del'>-		res |= i2c_smbus_read_byte_data(client, reg+1) &lt;&lt; 8 ;</div><div class='del'>-		break ;</div><div class='del'>-	case ADT7463_REG_TMIN_CTL1 :  /* Read WORD MSB, LSB */</div><div class='del'>-		res = i2c_smbus_read_byte_data(client, reg) &lt;&lt; 8 ;</div><div class='del'>-		res |= i2c_smbus_read_byte_data(client, reg+1) &amp; 0xff ;</div><div class='del'>-		break ;</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case LM85_REG_FAN(0):  /* Read WORD data */</div><div class='add'>+	case LM85_REG_FAN(1):</div><div class='add'>+	case LM85_REG_FAN(2):</div><div class='add'>+	case LM85_REG_FAN(3):</div><div class='add'>+	case LM85_REG_FAN_MIN(0):</div><div class='add'>+	case LM85_REG_FAN_MIN(1):</div><div class='add'>+	case LM85_REG_FAN_MIN(2):</div><div class='add'>+	case LM85_REG_FAN_MIN(3):</div><div class='add'>+	case LM85_REG_ALARM1:	/* Read both bytes at once */</div><div class='add'>+		res = i2c_smbus_read_byte_data(client, reg) &amp; 0xff;</div><div class='add'>+		res |= i2c_smbus_read_byte_data(client, reg + 1) &lt;&lt; 8;</div><div class='add'>+		break;</div><div class='ctx'> 	default:	/* Read BYTE data */</div><div class='ctx'> 		res = i2c_smbus_read_byte_data(client, reg);</div><div class='del'>-		break ;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return res ;</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lm85_write_value(struct i2c_client *client, u8 reg, int value)</div><div class='add'>+static void lm85_write_value(struct i2c_client *client, u8 reg, int value)</div><div class='ctx'> {</div><div class='del'>-	int res ;</div><div class='del'>-</div><div class='del'>-	switch( reg ) {</div><div class='del'>-	case LM85_REG_FAN(0) :  /* Write WORD data */</div><div class='del'>-	case LM85_REG_FAN(1) :</div><div class='del'>-	case LM85_REG_FAN(2) :</div><div class='del'>-	case LM85_REG_FAN(3) :</div><div class='del'>-	case LM85_REG_FAN_MIN(0) :</div><div class='del'>-	case LM85_REG_FAN_MIN(1) :</div><div class='del'>-	case LM85_REG_FAN_MIN(2) :</div><div class='del'>-	case LM85_REG_FAN_MIN(3) :</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case LM85_REG_FAN(0):  /* Write WORD data */</div><div class='add'>+	case LM85_REG_FAN(1):</div><div class='add'>+	case LM85_REG_FAN(2):</div><div class='add'>+	case LM85_REG_FAN(3):</div><div class='add'>+	case LM85_REG_FAN_MIN(0):</div><div class='add'>+	case LM85_REG_FAN_MIN(1):</div><div class='add'>+	case LM85_REG_FAN_MIN(2):</div><div class='add'>+	case LM85_REG_FAN_MIN(3):</div><div class='ctx'> 	/* NOTE: ALARM is read only, so not included here */</div><div class='del'>-		res = i2c_smbus_write_byte_data(client, reg, value &amp; 0xff) ;</div><div class='del'>-		res |= i2c_smbus_write_byte_data(client, reg+1, (value&gt;&gt;8) &amp; 0xff) ;</div><div class='del'>-		break ;</div><div class='del'>-	case ADT7463_REG_TMIN_CTL1 :  /* Write WORD MSB, LSB */</div><div class='del'>-		res = i2c_smbus_write_byte_data(client, reg, (value&gt;&gt;8) &amp; 0xff);</div><div class='del'>-		res |= i2c_smbus_write_byte_data(client, reg+1, value &amp; 0xff) ;</div><div class='del'>-		break ;</div><div class='add'>+		i2c_smbus_write_byte_data(client, reg, value &amp; 0xff);</div><div class='add'>+		i2c_smbus_write_byte_data(client, reg + 1, value &gt;&gt; 8);</div><div class='add'>+		break;</div><div class='ctx'> 	default:	/* Write BYTE data */</div><div class='del'>-		res = i2c_smbus_write_byte_data(client, reg, value);</div><div class='del'>-		break ;</div><div class='add'>+		i2c_smbus_write_byte_data(client, reg, value);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return res ;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lm85_init_client(struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	int value;</div><div class='del'>-	struct lm85_data *data = i2c_get_clientdata(client);</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;client-&gt;dev, "Initializing device\n");</div><div class='del'>-</div><div class='del'>-	/* Warn if part was not "READY" */</div><div class='del'>-	value = lm85_read_value(client, LM85_REG_CONFIG);</div><div class='del'>-	dev_dbg(&amp;client-&gt;dev, "LM85_REG_CONFIG is: 0x%02x\n", value);</div><div class='del'>-	if( value &amp; 0x02 ) {</div><div class='del'>-		dev_err(&amp;client-&gt;dev, "Client (%d,0x%02x) config is locked.\n",</div><div class='del'>-			    i2c_adapter_id(client-&gt;adapter), client-&gt;addr );</div><div class='del'>-	};</div><div class='del'>-	if( ! (value &amp; 0x04) ) {</div><div class='del'>-		dev_err(&amp;client-&gt;dev, "Client (%d,0x%02x) is not ready.\n",</div><div class='del'>-			    i2c_adapter_id(client-&gt;adapter), client-&gt;addr );</div><div class='del'>-	};</div><div class='del'>-	if( value &amp; 0x10</div><div class='del'>-	    &amp;&amp; ( data-&gt;type == adm1027</div><div class='del'>-		|| data-&gt;type == adt7463 ) ) {</div><div class='del'>-		dev_err(&amp;client-&gt;dev, "Client (%d,0x%02x) VxI mode is set.  "</div><div class='del'>-			"Please report this to the lm85 maintainer.\n",</div><div class='del'>-			    i2c_adapter_id(client-&gt;adapter), client-&gt;addr );</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* WE INTENTIONALLY make no changes to the limits,</div><div class='del'>-	 *   offsets, pwms, fans and zones.  If they were</div><div class='del'>-	 *   configured, we don't want to mess with them.</div><div class='del'>-	 *   If they weren't, the default is 100% PWM, no</div><div class='del'>-	 *   control and will suffice until 'sensors -s'</div><div class='del'>-	 *   can be run by the user.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Start monitoring */</div><div class='del'>-	value = lm85_read_value(client, LM85_REG_CONFIG);</div><div class='del'>-	/* Try to clear LOCK, Set START, save everything else */</div><div class='del'>-	value = (value &amp; ~ 0x02) | 0x01 ;</div><div class='del'>-	dev_dbg(&amp;client-&gt;dev, "Setting CONFIG to: 0x%02x\n", value);</div><div class='del'>-	lm85_write_value(client, LM85_REG_CONFIG, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct lm85_data *lm85_update_device(struct device *dev)</div><div class='hunk'>@@ -1427,28 +1355,30 @@ static struct lm85_data *lm85_update_device(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='del'>-	if ( !data-&gt;valid ||</div><div class='del'>-	     time_after(jiffies, data-&gt;last_reading + LM85_DATA_INTERVAL) ) {</div><div class='add'>+	if (!data-&gt;valid ||</div><div class='add'>+	     time_after(jiffies, data-&gt;last_reading + LM85_DATA_INTERVAL)) {</div><div class='ctx'> 		/* Things that change quickly */</div><div class='ctx'> 		dev_dbg(&amp;client-&gt;dev, "Reading sensor values\n");</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		/* Have to read extended bits first to "freeze" the</div><div class='ctx'> 		 * more significant bits that are read later.</div><div class='ctx'> 		 * There are 2 additional resolution bits per channel and we</div><div class='ctx'> 		 * have room for 4, so we shift them to the left.</div><div class='ctx'> 		 */</div><div class='del'>-		if ( (data-&gt;type == adm1027) || (data-&gt;type == adt7463) ) {</div><div class='add'>+		if (data-&gt;type == adm1027 || data-&gt;type == adt7463) {</div><div class='ctx'> 			int ext1 = lm85_read_value(client,</div><div class='ctx'> 						   ADM1027_REG_EXTEND_ADC1);</div><div class='ctx'> 			int ext2 =  lm85_read_value(client,</div><div class='ctx'> 						    ADM1027_REG_EXTEND_ADC2);</div><div class='ctx'> 			int val = (ext1 &lt;&lt; 8) + ext2;</div><div class='ctx'> </div><div class='del'>-			for(i = 0; i &lt;= 4; i++)</div><div class='del'>-				data-&gt;in_ext[i] = ((val&gt;&gt;(i * 2))&amp;0x03) &lt;&lt; 2;</div><div class='add'>+			for (i = 0; i &lt;= 4; i++)</div><div class='add'>+				data-&gt;in_ext[i] =</div><div class='add'>+					((val &gt;&gt; (i * 2)) &amp; 0x03) &lt;&lt; 2;</div><div class='ctx'> </div><div class='del'>-			for(i = 0; i &lt;= 2; i++)</div><div class='del'>-				data-&gt;temp_ext[i] = (val&gt;&gt;((i + 4) * 2))&amp;0x0c;</div><div class='add'>+			for (i = 0; i &lt;= 2; i++)</div><div class='add'>+				data-&gt;temp_ext[i] =</div><div class='add'>+					(val &gt;&gt; ((i + 4) * 2)) &amp; 0x0c;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		data-&gt;vid = lm85_read_value(client, LM85_REG_VID);</div><div class='hunk'>@@ -1456,6 +1386,8 @@ static struct lm85_data *lm85_update_device(struct device *dev)</div><div class='ctx'> 		for (i = 0; i &lt;= 3; ++i) {</div><div class='ctx'> 			data-&gt;in[i] =</div><div class='ctx'> 			    lm85_read_value(client, LM85_REG_IN(i));</div><div class='add'>+			data-&gt;fan[i] =</div><div class='add'>+			    lm85_read_value(client, LM85_REG_FAN(i));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!(data-&gt;type == adt7463 &amp;&amp; (data-&gt;vid &amp; 0x80))) {</div><div class='hunk'>@@ -1463,38 +1395,25 @@ static struct lm85_data *lm85_update_device(struct device *dev)</div><div class='ctx'> 				      LM85_REG_IN(4));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt;= 3; ++i) {</div><div class='del'>-			data-&gt;fan[i] =</div><div class='del'>-			    lm85_read_value(client, LM85_REG_FAN(i));</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		for (i = 0; i &lt;= 2; ++i) {</div><div class='ctx'> 			data-&gt;temp[i] =</div><div class='ctx'> 			    lm85_read_value(client, LM85_REG_TEMP(i));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt;= 2; ++i) {</div><div class='ctx'> 			data-&gt;pwm[i] =</div><div class='ctx'> 			    lm85_read_value(client, LM85_REG_PWM(i));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		data-&gt;alarms = lm85_read_value(client, LM85_REG_ALARM1);</div><div class='ctx'> </div><div class='del'>-		if ( data-&gt;type == adt7463 ) {</div><div class='del'>-			if( data-&gt;therm_total &lt; ULONG_MAX - 256 ) {</div><div class='del'>-			    data-&gt;therm_total +=</div><div class='del'>-				lm85_read_value(client, ADT7463_REG_THERM );</div><div class='del'>-			}</div><div class='del'>-		} else if ( data-&gt;type == emc6d100 ) {</div><div class='add'>+		if (data-&gt;type == emc6d100) {</div><div class='ctx'> 			/* Three more voltage sensors */</div><div class='ctx'> 			for (i = 5; i &lt;= 7; ++i) {</div><div class='del'>-				data-&gt;in[i] =</div><div class='del'>-					lm85_read_value(client, EMC6D100_REG_IN(i));</div><div class='add'>+				data-&gt;in[i] = lm85_read_value(client,</div><div class='add'>+							EMC6D100_REG_IN(i));</div><div class='ctx'> 			}</div><div class='ctx'> 			/* More alarm bits */</div><div class='del'>-			data-&gt;alarms |=</div><div class='del'>-				lm85_read_value(client, EMC6D100_REG_ALARM3) &lt;&lt; 16;</div><div class='del'>-		} else if (data-&gt;type == emc6d102 ) {</div><div class='add'>+			data-&gt;alarms |= lm85_read_value(client,</div><div class='add'>+						EMC6D100_REG_ALARM3) &lt;&lt; 16;</div><div class='add'>+		} else if (data-&gt;type == emc6d102) {</div><div class='ctx'> 			/* Have to read LSB bits after the MSB ones because</div><div class='ctx'> 			   the reading of the MSB bits has frozen the</div><div class='ctx'> 			   LSBs (backward from the ADM1027).</div><div class='hunk'>@@ -1509,20 +1428,20 @@ static struct lm85_data *lm85_update_device(struct device *dev)</div><div class='ctx'> 						   EMC6D102_REG_EXTEND_ADC4);</div><div class='ctx'> 			data-&gt;in_ext[0] = ext3 &amp; 0x0f;</div><div class='ctx'> 			data-&gt;in_ext[1] = ext4 &amp; 0x0f;</div><div class='del'>-			data-&gt;in_ext[2] = (ext4 &gt;&gt; 4) &amp; 0x0f;</div><div class='del'>-			data-&gt;in_ext[3] = (ext3 &gt;&gt; 4) &amp; 0x0f;</div><div class='del'>-			data-&gt;in_ext[4] = (ext2 &gt;&gt; 4) &amp; 0x0f;</div><div class='add'>+			data-&gt;in_ext[2] = ext4 &gt;&gt; 4;</div><div class='add'>+			data-&gt;in_ext[3] = ext3 &gt;&gt; 4;</div><div class='add'>+			data-&gt;in_ext[4] = ext2 &gt;&gt; 4;</div><div class='ctx'> </div><div class='ctx'> 			data-&gt;temp_ext[0] = ext1 &amp; 0x0f;</div><div class='ctx'> 			data-&gt;temp_ext[1] = ext2 &amp; 0x0f;</div><div class='del'>-			data-&gt;temp_ext[2] = (ext1 &gt;&gt; 4) &amp; 0x0f;</div><div class='add'>+			data-&gt;temp_ext[2] = ext1 &gt;&gt; 4;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		data-&gt;last_reading = jiffies ;</div><div class='del'>-	};  /* last_reading */</div><div class='add'>+		data-&gt;last_reading = jiffies;</div><div class='add'>+	}  /* last_reading */</div><div class='ctx'> </div><div class='del'>-	if ( !data-&gt;valid ||</div><div class='del'>-	     time_after(jiffies, data-&gt;last_config + LM85_CONFIG_INTERVAL) ) {</div><div class='add'>+	if (!data-&gt;valid ||</div><div class='add'>+	     time_after(jiffies, data-&gt;last_config + LM85_CONFIG_INTERVAL)) {</div><div class='ctx'> 		/* Things that don't change often */</div><div class='ctx'> 		dev_dbg(&amp;client-&gt;dev, "Reading config values\n");</div><div class='ctx'> </div><div class='hunk'>@@ -1531,6 +1450,8 @@ static struct lm85_data *lm85_update_device(struct device *dev)</div><div class='ctx'> 			    lm85_read_value(client, LM85_REG_IN_MIN(i));</div><div class='ctx'> 			data-&gt;in_max[i] =</div><div class='ctx'> 			    lm85_read_value(client, LM85_REG_IN_MAX(i));</div><div class='add'>+			data-&gt;fan_min[i] =</div><div class='add'>+			    lm85_read_value(client, LM85_REG_FAN_MIN(i));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!(data-&gt;type == adt7463 &amp;&amp; (data-&gt;vid &amp; 0x80))) {</div><div class='hunk'>@@ -1540,34 +1461,28 @@ static struct lm85_data *lm85_update_device(struct device *dev)</div><div class='ctx'> 					  LM85_REG_IN_MAX(4));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if ( data-&gt;type == emc6d100 ) {</div><div class='add'>+		if (data-&gt;type == emc6d100) {</div><div class='ctx'> 			for (i = 5; i &lt;= 7; ++i) {</div><div class='del'>-				data-&gt;in_min[i] =</div><div class='del'>-					lm85_read_value(client, EMC6D100_REG_IN_MIN(i));</div><div class='del'>-				data-&gt;in_max[i] =</div><div class='del'>-					lm85_read_value(client, EMC6D100_REG_IN_MAX(i));</div><div class='add'>+				data-&gt;in_min[i] = lm85_read_value(client,</div><div class='add'>+						EMC6D100_REG_IN_MIN(i));</div><div class='add'>+				data-&gt;in_max[i] = lm85_read_value(client,</div><div class='add'>+						EMC6D100_REG_IN_MAX(i));</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt;= 3; ++i) {</div><div class='del'>-			data-&gt;fan_min[i] =</div><div class='del'>-			    lm85_read_value(client, LM85_REG_FAN_MIN(i));</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		for (i = 0; i &lt;= 2; ++i) {</div><div class='add'>+			int val;</div><div class='add'>+</div><div class='ctx'> 			data-&gt;temp_min[i] =</div><div class='ctx'> 			    lm85_read_value(client, LM85_REG_TEMP_MIN(i));</div><div class='ctx'> 			data-&gt;temp_max[i] =</div><div class='ctx'> 			    lm85_read_value(client, LM85_REG_TEMP_MAX(i));</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt;= 2; ++i) {</div><div class='del'>-			int val ;</div><div class='ctx'> 			data-&gt;autofan[i].config =</div><div class='ctx'> 			    lm85_read_value(client, LM85_REG_AFAN_CONFIG(i));</div><div class='ctx'> 			val = lm85_read_value(client, LM85_REG_AFAN_RANGE(i));</div><div class='del'>-			data-&gt;autofan[i].freq = val &amp; 0x07 ;</div><div class='del'>-			data-&gt;zone[i].range = (val &gt;&gt; 4) &amp; 0x0f ;</div><div class='add'>+			data-&gt;autofan[i].freq = val &amp; 0x07;</div><div class='add'>+			data-&gt;zone[i].range = val &gt;&gt; 4;</div><div class='ctx'> 			data-&gt;autofan[i].min_pwm =</div><div class='ctx'> 			    lm85_read_value(client, LM85_REG_AFAN_MINPWM(i));</div><div class='ctx'> 			data-&gt;zone[i].limit =</div><div class='hunk'>@@ -1577,50 +1492,19 @@ static struct lm85_data *lm85_update_device(struct device *dev)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		i = lm85_read_value(client, LM85_REG_AFAN_SPIKE1);</div><div class='del'>-		data-&gt;smooth[0] = i &amp; 0x0f ;</div><div class='del'>-		data-&gt;syncpwm3 = i &amp; 0x10 ;  /* Save PWM3 config */</div><div class='del'>-		data-&gt;autofan[0].min_off = (i &amp; 0x20) != 0 ;</div><div class='del'>-		data-&gt;autofan[1].min_off = (i &amp; 0x40) != 0 ;</div><div class='del'>-		data-&gt;autofan[2].min_off = (i &amp; 0x80) != 0 ;</div><div class='del'>-		i = lm85_read_value(client, LM85_REG_AFAN_SPIKE2);</div><div class='del'>-		data-&gt;smooth[1] = (i&gt;&gt;4) &amp; 0x0f ;</div><div class='del'>-		data-&gt;smooth[2] = i &amp; 0x0f ;</div><div class='add'>+		data-&gt;autofan[0].min_off = (i &amp; 0x20) != 0;</div><div class='add'>+		data-&gt;autofan[1].min_off = (i &amp; 0x40) != 0;</div><div class='add'>+		data-&gt;autofan[2].min_off = (i &amp; 0x80) != 0;</div><div class='ctx'> </div><div class='ctx'> 		i = lm85_read_value(client, LM85_REG_AFAN_HYST1);</div><div class='del'>-		data-&gt;zone[0].hyst = (i&gt;&gt;4) &amp; 0x0f ;</div><div class='del'>-		data-&gt;zone[1].hyst = i &amp; 0x0f ;</div><div class='add'>+		data-&gt;zone[0].hyst = i &gt;&gt; 4;</div><div class='add'>+		data-&gt;zone[1].hyst = i &amp; 0x0f;</div><div class='ctx'> </div><div class='ctx'> 		i = lm85_read_value(client, LM85_REG_AFAN_HYST2);</div><div class='del'>-		data-&gt;zone[2].hyst = (i&gt;&gt;4) &amp; 0x0f ;</div><div class='del'>-</div><div class='del'>-		if ( (data-&gt;type == lm85b) || (data-&gt;type == lm85c) ) {</div><div class='del'>-			data-&gt;tach_mode = lm85_read_value(client,</div><div class='del'>-				LM85_REG_TACH_MODE );</div><div class='del'>-			data-&gt;spinup_ctl = lm85_read_value(client,</div><div class='del'>-				LM85_REG_SPINUP_CTL );</div><div class='del'>-		} else if ( (data-&gt;type == adt7463) || (data-&gt;type == adm1027) ) {</div><div class='del'>-			if ( data-&gt;type == adt7463 ) {</div><div class='del'>-				for (i = 0; i &lt;= 2; ++i) {</div><div class='del'>-				    data-&gt;oppoint[i] = lm85_read_value(client,</div><div class='del'>-					ADT7463_REG_OPPOINT(i) );</div><div class='del'>-				}</div><div class='del'>-				data-&gt;tmin_ctl = lm85_read_value(client,</div><div class='del'>-					ADT7463_REG_TMIN_CTL1 );</div><div class='del'>-				data-&gt;therm_limit = lm85_read_value(client,</div><div class='del'>-					ADT7463_REG_THERM_LIMIT );</div><div class='del'>-			}</div><div class='del'>-			for (i = 0; i &lt;= 2; ++i) {</div><div class='del'>-			    data-&gt;temp_offset[i] = lm85_read_value(client,</div><div class='del'>-				ADM1027_REG_TEMP_OFFSET(i) );</div><div class='del'>-			}</div><div class='del'>-			data-&gt;tach_mode = lm85_read_value(client,</div><div class='del'>-				ADM1027_REG_CONFIG3 );</div><div class='del'>-			data-&gt;fan_ppr = lm85_read_value(client,</div><div class='del'>-				ADM1027_REG_FAN_PPR );</div><div class='del'>-		}</div><div class='del'>-	</div><div class='add'>+		data-&gt;zone[2].hyst = i &gt;&gt; 4;</div><div class='add'>+</div><div class='ctx'> 		data-&gt;last_config = jiffies;</div><div class='del'>-	};  /* last_config */</div><div class='add'>+	}  /* last_config */</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;valid = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1635,17 +1519,15 @@ static int __init sm_lm85_init(void)</div><div class='ctx'> 	return i2c_add_driver(&amp;lm85_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void  __exit sm_lm85_exit(void)</div><div class='add'>+static void __exit sm_lm85_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	i2c_del_driver(&amp;lm85_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Thanks to Richard Barrington for adding the LM85 to sensors-detect.</div><div class='del'>- * Thanks to Margit Schubert-While &lt;margitsw@t-online.de&gt; for help with</div><div class='del'>- *     post 2.7.0 CVS changes.</div><div class='del'>- */</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Philip Pokorny &lt;ppokorny@penguincomputing.com&gt;, Margit Schubert-While &lt;margitsw@t-online.de&gt;, Justin Thiessen &lt;jthiessen@penguincomputing.com");</div><div class='add'>+MODULE_AUTHOR("Philip Pokorny &lt;ppokorny@penguincomputing.com&gt;, "</div><div class='add'>+	"Margit Schubert-While &lt;margitsw@t-online.de&gt;, "</div><div class='add'>+	"Justin Thiessen &lt;jthiessen@penguincomputing.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("LM85-B, LM85-C driver");</div><div class='ctx'> </div><div class='ctx'> module_init(sm_lm85_init);</div><div class='head'>diff --git a/drivers/hwmon/thmc50.c b/drivers/hwmon/thmc50.c<br/>index 3b01001108c1..7d97431e132f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/thmc50.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/thmc50.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/thmc50.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/thmc50.c</a></div><div class='hunk'>@@ -55,8 +55,11 @@ I2C_CLIENT_MODULE_PARM(adm1022_temp3, "List of adapter,address pairs "</div><div class='ctx'> static const u8 THMC50_REG_TEMP[] = { 0x27, 0x26, 0x20 };</div><div class='ctx'> static const u8 THMC50_REG_TEMP_MIN[] = { 0x3A, 0x38, 0x2C };</div><div class='ctx'> static const u8 THMC50_REG_TEMP_MAX[] = { 0x39, 0x37, 0x2B };</div><div class='add'>+static const u8 THMC50_REG_TEMP_CRITICAL[] = { 0x13, 0x14, 0x14 };</div><div class='add'>+static const u8 THMC50_REG_TEMP_DEFAULT[] = { 0x17, 0x18, 0x18 };</div><div class='ctx'> </div><div class='ctx'> #define THMC50_REG_CONF_nFANOFF			0x20</div><div class='add'>+#define THMC50_REG_CONF_PROGRAMMED		0x08</div><div class='ctx'> </div><div class='ctx'> /* Each client has this additional data */</div><div class='ctx'> struct thmc50_data {</div><div class='hunk'>@@ -72,6 +75,7 @@ struct thmc50_data {</div><div class='ctx'> 	s8 temp_input[3];</div><div class='ctx'> 	s8 temp_max[3];</div><div class='ctx'> 	s8 temp_min[3];</div><div class='add'>+	s8 temp_critical[3];</div><div class='ctx'> 	u8 analog_out;</div><div class='ctx'> 	u8 alarms;</div><div class='ctx'> };</div><div class='hunk'>@@ -199,6 +203,15 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t show_temp_critical(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr,</div><div class='add'>+				  char *buf)</div><div class='add'>+{</div><div class='add'>+	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='add'>+	struct thmc50_data *data = thmc50_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", data-&gt;temp_critical[nr] * 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			  char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -214,7 +227,9 @@ static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp,	\</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,	\</div><div class='ctx'> 			show_temp_min, set_temp_min, offset - 1);	\</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,	\</div><div class='del'>-			show_temp_max, set_temp_max, offset - 1);</div><div class='add'>+			show_temp_max, set_temp_max, offset - 1);	\</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp##offset##_crit, S_IRUGO,			\</div><div class='add'>+			show_temp_critical, NULL, offset - 1);</div><div class='ctx'> </div><div class='ctx'> temp_reg(1);</div><div class='ctx'> temp_reg(2);</div><div class='hunk'>@@ -234,10 +249,12 @@ static struct attribute *thmc50_attributes[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_temp1_max.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp1_min.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp1_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp1_crit.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp1_alarm.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp2_max.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp2_min.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp2_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp2_crit.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp2_alarm.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp2_fault.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm1.dev_attr.attr,</div><div class='hunk'>@@ -254,6 +271,7 @@ static struct attribute *temp3_attributes[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_temp3_max.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp3_min.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp3_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp3_crit.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp3_alarm.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp3_fault.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='hunk'>@@ -429,6 +447,10 @@ static struct thmc50_data *thmc50_update_device(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 		int temps = data-&gt;has_temp3 ? 3 : 2;</div><div class='ctx'> 		int i;</div><div class='add'>+		int prog = i2c_smbus_read_byte_data(client, THMC50_REG_CONF);</div><div class='add'>+</div><div class='add'>+		prog &amp;= THMC50_REG_CONF_PROGRAMMED;</div><div class='add'>+</div><div class='ctx'> 		for (i = 0; i &lt; temps; i++) {</div><div class='ctx'> 			data-&gt;temp_input[i] = i2c_smbus_read_byte_data(client,</div><div class='ctx'> 						THMC50_REG_TEMP[i]);</div><div class='hunk'>@@ -436,6 +458,10 @@ static struct thmc50_data *thmc50_update_device(struct device *dev)</div><div class='ctx'> 						THMC50_REG_TEMP_MAX[i]);</div><div class='ctx'> 			data-&gt;temp_min[i] = i2c_smbus_read_byte_data(client,</div><div class='ctx'> 						THMC50_REG_TEMP_MIN[i]);</div><div class='add'>+			data-&gt;temp_critical[i] =</div><div class='add'>+				i2c_smbus_read_byte_data(client,</div><div class='add'>+					prog ? THMC50_REG_TEMP_CRITICAL[i]</div><div class='add'>+					     : THMC50_REG_TEMP_DEFAULT[i]);</div><div class='ctx'> 		}</div><div class='ctx'> 		data-&gt;analog_out =</div><div class='ctx'> 		    i2c_smbus_read_byte_data(client, THMC50_REG_ANALOG_OUT);</div><div class='head'>diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c<br/>index 9564fb069957..b30e5796cb26 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/w83627hf.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/w83627hf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/w83627hf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/w83627hf.c</a></div><div class='hunk'>@@ -67,10 +67,6 @@ module_param(force_i2c, byte, 0);</div><div class='ctx'> MODULE_PARM_DESC(force_i2c,</div><div class='ctx'> 		 "Initialize the i2c address of the sensors");</div><div class='ctx'> </div><div class='del'>-static int reset;</div><div class='del'>-module_param(reset, bool, 0);</div><div class='del'>-MODULE_PARM_DESC(reset, "Set to one to reset chip on load");</div><div class='del'>-</div><div class='ctx'> static int init = 1;</div><div class='ctx'> module_param(init, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization");</div><div class='hunk'>@@ -209,6 +205,13 @@ static const u16 w83627hf_reg_temp_over[]	= { 0x39, 0x155, 0x255 };</div><div class='ctx'> #define W83627HF_REG_PWM1 0x5A</div><div class='ctx'> #define W83627HF_REG_PWM2 0x5B</div><div class='ctx'> </div><div class='add'>+static const u8 W83627THF_REG_PWM_ENABLE[] = {</div><div class='add'>+	0x04,		/* FAN 1 mode */</div><div class='add'>+	0x04,		/* FAN 2 mode */</div><div class='add'>+	0x12,		/* FAN AUX mode */</div><div class='add'>+};</div><div class='add'>+static const u8 W83627THF_PWM_ENABLE_SHIFT[] = { 2, 4, 1 };</div><div class='add'>+</div><div class='ctx'> #define W83627THF_REG_PWM1		0x01	/* 697HF/637HF/687THF too */</div><div class='ctx'> #define W83627THF_REG_PWM2		0x03	/* 697HF/637HF/687THF too */</div><div class='ctx'> #define W83627THF_REG_PWM3		0x11	/* 637HF/687THF too */</div><div class='hunk'>@@ -366,6 +369,9 @@ struct w83627hf_data {</div><div class='ctx'> 	u32 alarms;		/* Register encoding, combined */</div><div class='ctx'> 	u32 beep_mask;		/* Register encoding, combined */</div><div class='ctx'> 	u8 pwm[3];		/* Register value */</div><div class='add'>+	u8 pwm_enable[3];	/* 1 = manual</div><div class='add'>+				   2 = thermal cruise (also called SmartFan I)</div><div class='add'>+				   3 = fan speed cruise */</div><div class='ctx'> 	u8 pwm_freq[3];		/* Register value */</div><div class='ctx'> 	u16 sens[3];		/* 1 = pentium diode; 2 = 3904 diode;</div><div class='ctx'> 				   4 = thermistor */</div><div class='hunk'>@@ -957,6 +963,42 @@ static SENSOR_DEVICE_ATTR(pwm2, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 1);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(pwm3, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 2);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='add'>+show_pwm_enable(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='add'>+	struct w83627hf_data *data = w83627hf_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", data-&gt;pwm_enable[nr]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+store_pwm_enable(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+	  const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='add'>+	struct w83627hf_data *data = dev_get_drvdata(dev);</div><div class='add'>+	unsigned long val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	u8 reg;</div><div class='add'>+</div><div class='add'>+	if (!val || (val &gt; 3))	/* modes 1, 2 and 3 are supported */</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;pwm_enable[nr] = val;</div><div class='add'>+	reg = w83627hf_read_value(data, W83627THF_REG_PWM_ENABLE[nr]);</div><div class='add'>+	reg &amp;= ~(0x03 &lt;&lt; W83627THF_PWM_ENABLE_SHIFT[nr]);</div><div class='add'>+	reg |= (val - 1) &lt;&lt; W83627THF_PWM_ENABLE_SHIFT[nr];</div><div class='add'>+	w83627hf_write_value(data, W83627THF_REG_PWM_ENABLE[nr], reg);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_enable, S_IRUGO|S_IWUSR, show_pwm_enable,</div><div class='add'>+						  store_pwm_enable, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm2_enable, S_IRUGO|S_IWUSR, show_pwm_enable,</div><div class='add'>+						  store_pwm_enable, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm3_enable, S_IRUGO|S_IWUSR, show_pwm_enable,</div><div class='add'>+						  store_pwm_enable, 2);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='ctx'> show_pwm_freq(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='hunk'>@@ -1223,6 +1265,11 @@ static struct attribute *w83627hf_attributes_opt[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm1_freq.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm2_freq.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm3_freq.dev_attr.attr,</div><div class='add'>+</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_enable.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm2_enable.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm3_enable.dev_attr.attr,</div><div class='add'>+</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1366,6 +1413,19 @@ static int __devinit w83627hf_probe(struct platform_device *pdev)</div><div class='ctx'> 				&amp;sensor_dev_attr_pwm3_freq.dev_attr)))</div><div class='ctx'> 			goto ERROR4;</div><div class='ctx'> </div><div class='add'>+	if (data-&gt;type != w83627hf)</div><div class='add'>+		if ((err = device_create_file(dev,</div><div class='add'>+				&amp;sensor_dev_attr_pwm1_enable.dev_attr))</div><div class='add'>+		 || (err = device_create_file(dev,</div><div class='add'>+				&amp;sensor_dev_attr_pwm2_enable.dev_attr)))</div><div class='add'>+			goto ERROR4;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;type == w83627thf || data-&gt;type == w83637hf</div><div class='add'>+	 || data-&gt;type == w83687thf)</div><div class='add'>+		if ((err = device_create_file(dev,</div><div class='add'>+				&amp;sensor_dev_attr_pwm3_enable.dev_attr)))</div><div class='add'>+			goto ERROR4;</div><div class='add'>+</div><div class='ctx'> 	data-&gt;hwmon_dev = hwmon_device_register(dev);</div><div class='ctx'> 	if (IS_ERR(data-&gt;hwmon_dev)) {</div><div class='ctx'> 		err = PTR_ERR(data-&gt;hwmon_dev);</div><div class='hunk'>@@ -1536,29 +1596,6 @@ static void __devinit w83627hf_init_device(struct platform_device *pdev)</div><div class='ctx'> 	enum chips type = data-&gt;type;</div><div class='ctx'> 	u8 tmp;</div><div class='ctx'> </div><div class='del'>-	if (reset) {</div><div class='del'>-		/* Resetting the chip has been the default for a long time,</div><div class='del'>-		   but repeatedly caused problems (fans going to full</div><div class='del'>-		   speed...) so it is now optional. It might even go away if</div><div class='del'>-		   nobody reports it as being useful, as I see very little</div><div class='del'>-		   reason why this would be needed at all. */</div><div class='del'>-		dev_info(&amp;pdev-&gt;dev, "If reset=1 solved a problem you were "</div><div class='del'>-			 "having, please report!\n");</div><div class='del'>-</div><div class='del'>-		/* save this register */</div><div class='del'>-		i = w83627hf_read_value(data, W83781D_REG_BEEP_CONFIG);</div><div class='del'>-		/* Reset all except Watchdog values and last conversion values</div><div class='del'>-		   This sets fan-divs to 2, among others */</div><div class='del'>-		w83627hf_write_value(data, W83781D_REG_CONFIG, 0x80);</div><div class='del'>-		/* Restore the register and disable power-on abnormal beep.</div><div class='del'>-		   This saves FAN 1/2/3 input/output values set by BIOS. */</div><div class='del'>-		w83627hf_write_value(data, W83781D_REG_BEEP_CONFIG, i | 0x80);</div><div class='del'>-		/* Disable master beep-enable (reset turns it on).</div><div class='del'>-		   Individual beeps should be reset to off but for some reason</div><div class='del'>-		   disabling this bit helps some people not get beeped */</div><div class='del'>-		w83627hf_write_value(data, W83781D_REG_BEEP_INTS2, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Minimize conflicts with other winbond i2c-only clients...  */</div><div class='ctx'> 	/* disable i2c subclients... how to disable main i2c client?? */</div><div class='ctx'> 	/* force i2c address to relatively uncommon address */</div><div class='hunk'>@@ -1655,6 +1692,7 @@ static struct w83627hf_data *w83627hf_update_device(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct w83627hf_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	int i, num_temps = (data-&gt;type == w83697hf) ? 2 : 3;</div><div class='add'>+	int num_pwms = (data-&gt;type == w83697hf) ? 2 : 3;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1707,6 +1745,15 @@ static struct w83627hf_data *w83627hf_update_device(struct device *dev)</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		if (data-&gt;type != w83627hf) {</div><div class='add'>+			for (i = 0; i &lt; num_pwms; i++) {</div><div class='add'>+				u8 tmp = w83627hf_read_value(data,</div><div class='add'>+					W83627THF_REG_PWM_ENABLE[i]);</div><div class='add'>+				data-&gt;pwm_enable[i] =</div><div class='add'>+					((tmp &gt;&gt; W83627THF_PWM_ENABLE_SHIFT[i])</div><div class='add'>+					&amp; 0x03) + 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		for (i = 0; i &lt; num_temps; i++) {</div><div class='ctx'> 			data-&gt;temp[i] = w83627hf_read_value(</div><div class='ctx'> 						data, w83627hf_reg_temp[i]);</div><div class='head'>diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c<br/>index e4e91c9d480a..de21142d106c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/w83791d.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/hwmon/w83791d.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/w83791d.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/hwmon/w83791d.c</a></div><div class='hunk'>@@ -233,11 +233,9 @@ static u8 fan_to_reg(long rpm, int div)</div><div class='ctx'> static u8 div_to_reg(int nr, long val)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	int max;</div><div class='ctx'> </div><div class='del'>-	/* first three fan's divisor max out at 8, rest max out at 128 */</div><div class='del'>-	max = (nr &lt; 3) ? 8 : 128;</div><div class='del'>-	val = SENSORS_LIMIT(val, 1, max) &gt;&gt; 1;</div><div class='add'>+	/* fan divisors max out at 128 */</div><div class='add'>+	val = SENSORS_LIMIT(val, 1, 128) &gt;&gt; 1;</div><div class='ctx'> 	for (i = 0; i &lt; 7; i++) {</div><div class='ctx'> 		if (val == 0)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -530,6 +528,7 @@ static ssize_t store_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	unsigned long min;</div><div class='ctx'> 	u8 tmp_fan_div;</div><div class='ctx'> 	u8 fan_div_reg;</div><div class='add'>+	u8 vbat_reg;</div><div class='ctx'> 	int indx = 0;</div><div class='ctx'> 	u8 keep_mask = 0;</div><div class='ctx'> 	u8 new_shift = 0;</div><div class='hunk'>@@ -581,6 +580,16 @@ static ssize_t store_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	w83791d_write(client, W83791D_REG_FAN_DIV[indx],</div><div class='ctx'> 				fan_div_reg | tmp_fan_div);</div><div class='ctx'> </div><div class='add'>+	/* Bit 2 of fans 0-2 is stored in the vbat register (bits 5-7) */</div><div class='add'>+	if (nr &lt; 3) {</div><div class='add'>+		keep_mask = ~(1 &lt;&lt; (nr + 5));</div><div class='add'>+		vbat_reg = w83791d_read(client, W83791D_REG_VBAT)</div><div class='add'>+				&amp; keep_mask;</div><div class='add'>+		tmp_fan_div = (data-&gt;fan_div[nr] &lt;&lt; (3 + nr)) &amp; ~keep_mask;</div><div class='add'>+		w83791d_write(client, W83791D_REG_VBAT,</div><div class='add'>+				vbat_reg | tmp_fan_div);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Restore fan_min */</div><div class='ctx'> 	data-&gt;fan_min[nr] = fan_to_reg(min, DIV_FROM_REG(data-&gt;fan_div[nr]));</div><div class='ctx'> 	w83791d_write(client, W83791D_REG_FAN_MIN[nr], data-&gt;fan_min[nr]);</div><div class='hunk'>@@ -1046,9 +1055,10 @@ static int w83791d_probe(struct i2c_client *client,</div><div class='ctx'> {</div><div class='ctx'> 	struct w83791d_data *data;</div><div class='ctx'> 	struct device *dev = &amp;client-&gt;dev;</div><div class='del'>-	int i, val1, err;</div><div class='add'>+	int i, err;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='add'>+	int val1;</div><div class='ctx'> 	val1 = w83791d_read(client, W83791D_REG_DID_VID4);</div><div class='ctx'> 	dev_dbg(dev, "Device ID version: %d.%d (0x%02x)\n",</div><div class='ctx'> 			(val1 &gt;&gt; 5) &amp; 0x07, (val1 &gt;&gt; 1) &amp; 0x0f, val1);</div><div class='hunk'>@@ -1182,6 +1192,7 @@ static struct w83791d_data *w83791d_update_device(struct device *dev)</div><div class='ctx'> 	struct w83791d_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	int i, j;</div><div class='ctx'> 	u8 reg_array_tmp[3];</div><div class='add'>+	u8 vbat_reg;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1219,6 +1230,12 @@ static struct w83791d_data *w83791d_update_device(struct device *dev)</div><div class='ctx'> 		data-&gt;fan_div[3] = reg_array_tmp[2] &amp; 0x07;</div><div class='ctx'> 		data-&gt;fan_div[4] = (reg_array_tmp[2] &gt;&gt; 4) &amp; 0x07;</div><div class='ctx'> </div><div class='add'>+		/* The fan divisor for fans 0-2 get bit 2 from</div><div class='add'>+		   bits 5-7 respectively of vbat register */</div><div class='add'>+		vbat_reg = w83791d_read(client, W83791D_REG_VBAT);</div><div class='add'>+		for (i = 0; i &lt; 3; i++)</div><div class='add'>+			data-&gt;fan_div[i] |= (vbat_reg &gt;&gt; (3 + i)) &amp; 0x04;</div><div class='add'>+</div><div class='ctx'> 		/* Update the first temperature sensor */</div><div class='ctx'> 		for (i = 0; i &lt; 3; i++) {</div><div class='ctx'> 			data-&gt;temp1[i] = w83791d_read(client,</div><div class='head'>diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig<br/>index 96867347bcbf..711ca08ab776 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/Kconfig</a></div><div class='hunk'>@@ -38,6 +38,20 @@ config I2C_CHARDEV</div><div class='ctx'> 	  This support is also available as a module.  If so, the module </div><div class='ctx'> 	  will be called i2c-dev.</div><div class='ctx'> </div><div class='add'>+config I2C_HELPER_AUTO</div><div class='add'>+	bool "Autoselect pertinent helper modules"</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Some I2C bus drivers require so-called "I2C algorithm" modules</div><div class='add'>+	  to work. These are basically software-only abstractions of generic</div><div class='add'>+	  I2C interfaces. This option will autoselect them so that you don't</div><div class='add'>+	  have to care.</div><div class='add'>+</div><div class='add'>+	  Unselect this only if you need to enable additional helper</div><div class='add'>+	  modules, for example for use with external I2C bus drivers.</div><div class='add'>+</div><div class='add'>+	  In doubt, say Y.</div><div class='add'>+</div><div class='ctx'> source drivers/i2c/algos/Kconfig</div><div class='ctx'> source drivers/i2c/busses/Kconfig</div><div class='ctx'> source drivers/i2c/chips/Kconfig</div><div class='head'>diff --git a/drivers/i2c/algos/Kconfig b/drivers/i2c/algos/Kconfig<br/>index 7137a17402fe..b788579b8227 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/algos/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/algos/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/algos/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/algos/Kconfig</a></div><div class='hunk'>@@ -2,15 +2,20 @@</div><div class='ctx'> # I2C algorithm drivers configuration</div><div class='ctx'> #</div><div class='ctx'> </div><div class='add'>+menu "I2C Algorithms"</div><div class='add'>+	depends on !I2C_HELPER_AUTO</div><div class='add'>+</div><div class='ctx'> config I2C_ALGOBIT</div><div class='del'>-	tristate</div><div class='add'>+	tristate "I2C bit-banging interfaces"</div><div class='ctx'> </div><div class='ctx'> config I2C_ALGOPCF</div><div class='del'>-	tristate</div><div class='add'>+	tristate "I2C PCF 8584 interfaces"</div><div class='ctx'> </div><div class='ctx'> config I2C_ALGOPCA</div><div class='del'>-	tristate</div><div class='add'>+	tristate "I2C PCA 9564 interfaces"</div><div class='ctx'> </div><div class='ctx'> config I2C_ALGO_SGI</div><div class='ctx'> 	tristate</div><div class='ctx'> 	depends on SGI_IP22 || SGI_IP32 || X86_VISWS</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-acorn.c b/drivers/i2c/busses/i2c-acorn.c<br/>index 7c2be3558a24..75089febbc13 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-acorn.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/busses/i2c-acorn.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-acorn.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-acorn.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-algo-bit.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/ioc.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c<br/>index 72872d1e63ef..8ba2bcf727d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-amd756-s4882.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/busses/i2c-amd756-s4882.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-amd756-s4882.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-amd756-s4882.c</a></div><div class='hunk'>@@ -155,6 +155,9 @@ static int __init amd756_s4882_init(void)</div><div class='ctx'> 	int i, error;</div><div class='ctx'> 	union i2c_smbus_data ioconfig;</div><div class='ctx'> </div><div class='add'>+	if (!amd756_smbus.dev.parent)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	/* Configure the PCA9556 multiplexer */</div><div class='ctx'> 	ioconfig.byte = 0x00; /* All I/O to output mode */</div><div class='ctx'> 	error = i2c_smbus_xfer(&amp;amd756_smbus, 0x18, 0, I2C_SMBUS_WRITE, 0x03,</div><div class='hunk'>@@ -168,11 +171,7 @@ static int __init amd756_s4882_init(void)</div><div class='ctx'> 	/* Unregister physical bus */</div><div class='ctx'> 	error = i2c_del_adapter(&amp;amd756_smbus);</div><div class='ctx'> 	if (error) {</div><div class='del'>-		if (error == -EINVAL)</div><div class='del'>-			error = -ENODEV;</div><div class='del'>-		else</div><div class='del'>-			dev_err(&amp;amd756_smbus.dev, "Physical bus removal "</div><div class='del'>-				"failed\n");</div><div class='add'>+		dev_err(&amp;amd756_smbus.dev, "Physical bus removal failed\n");</div><div class='ctx'> 		goto ERROR0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c<br/>index 73d61946a534..9efb02137254 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-at91.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/busses/i2c-at91.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-at91.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-at91.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -27,9 +26,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/at91_twi.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='add'>+#include &lt;mach/at91_twi.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define TWI_CLOCK		100000		/* Hz. max 400 Kbits/sec */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c<br/>index af3846eda985..5d7789834b95 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-davinci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/busses/i2c-davinci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-davinci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-davinci.c</a></div><div class='hunk'>@@ -36,10 +36,9 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/i2c.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* ----- global defines ----------------------------------------------- */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/busses/i2c-ixp2000.c b/drivers/i2c/busses/i2c-ixp2000.c<br/>index 5af9e6521e6c..05d72e981353 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ixp2000.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/busses/i2c-ixp2000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ixp2000.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-ixp2000.c</a></div><div class='hunk'>@@ -33,8 +33,8 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-algo-bit.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;	/* Pick up IXP2000-specific bits */</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;	/* Pick up IXP2000-specific bits */</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline int ixp2000_scl_pin(void *data)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c<br/>index d1a4cbcf2aa4..29015eb9ca46 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-nforce2-s4985.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/busses/i2c-nforce2-s4985.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-nforce2-s4985.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-nforce2-s4985.c</a></div><div class='hunk'>@@ -150,6 +150,9 @@ static int __init nforce2_s4985_init(void)</div><div class='ctx'> 	int i, error;</div><div class='ctx'> 	union i2c_smbus_data ioconfig;</div><div class='ctx'> </div><div class='add'>+	if (!nforce2_smbus)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	/* Configure the PCA9556 multiplexer */</div><div class='ctx'> 	ioconfig.byte = 0x00; /* All I/O to output mode */</div><div class='ctx'> 	error = i2c_smbus_xfer(nforce2_smbus, 0x18, 0, I2C_SMBUS_WRITE, 0x03,</div><div class='hunk'>@@ -161,8 +164,6 @@ static int __init nforce2_s4985_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Unregister physical bus */</div><div class='del'>-	if (!nforce2_smbus)</div><div class='del'>-		return -ENODEV;</div><div class='ctx'> 	error = i2c_del_adapter(nforce2_smbus);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		dev_err(&amp;nforce2_smbus-&gt;dev, "Physical bus removal failed\n");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c<br/>index 1ca21084ffcf..ec15cff556b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-pnx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/busses/i2c-pnx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-pnx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-pnx.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-pnx.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c<br/>index af9e6034d7fb..44d838410f15 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-pxa.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/busses/i2c-pxa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-pxa.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-pxa.c</a></div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/i2c.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/i2c.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct pxa_i2c {</div><div class='ctx'> 	spinlock_t		lock;</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c<br/>index 4864723c7425..c772e02c2803 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-s3c2410.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/busses/i2c-s3c2410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-s3c2410.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-s3c2410.c</a></div><div class='hunk'>@@ -35,11 +35,11 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/regs-iic.h&gt;</div><div class='ctx'> #include &lt;asm/plat-s3c/iic.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c<br/>index 840e634fa31f..640cbb237328 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-sh_mobile.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/busses/i2c-sh_mobile.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-sh_mobile.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/busses/i2c-sh_mobile.c</a></div><div class='hunk'>@@ -31,13 +31,84 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='add'>+/* Transmit operation:                                                      */</div><div class='add'>+/*                                                                          */</div><div class='add'>+/* 0 byte transmit                                                          */</div><div class='add'>+/* BUS:     S     A8     ACK   P                                            */</div><div class='add'>+/* IRQ:       DTE   WAIT                                                    */</div><div class='add'>+/* ICIC:                                                                    */</div><div class='add'>+/* ICCR: 0x94 0x90                                                          */</div><div class='add'>+/* ICDR:      A8                                                            */</div><div class='add'>+/*                                                                          */</div><div class='add'>+/* 1 byte transmit                                                          */</div><div class='add'>+/* BUS:     S     A8     ACK   D8(1)   ACK   P                              */</div><div class='add'>+/* IRQ:       DTE   WAIT         WAIT                                       */</div><div class='add'>+/* ICIC:      -DTE                                                          */</div><div class='add'>+/* ICCR: 0x94       0x90                                                    */</div><div class='add'>+/* ICDR:      A8    D8(1)                                                   */</div><div class='add'>+/*                                                                          */</div><div class='add'>+/* 2 byte transmit                                                          */</div><div class='add'>+/* BUS:     S     A8     ACK   D8(1)   ACK   D8(2)   ACK   P                */</div><div class='add'>+/* IRQ:       DTE   WAIT         WAIT          WAIT                         */</div><div class='add'>+/* ICIC:      -DTE                                                          */</div><div class='add'>+/* ICCR: 0x94                    0x90                                       */</div><div class='add'>+/* ICDR:      A8    D8(1)        D8(2)                                      */</div><div class='add'>+/*                                                                          */</div><div class='add'>+/* 3 bytes or more, +---------+ gets repeated                               */</div><div class='add'>+/*                                                                          */</div><div class='add'>+/*                                                                          */</div><div class='add'>+/* Receive operation:                                                       */</div><div class='add'>+/*                                                                          */</div><div class='add'>+/* 0 byte receive - not supported since slave may hold SDA low              */</div><div class='add'>+/*                                                                          */</div><div class='add'>+/* 1 byte receive       [TX] | [RX]                                         */</div><div class='add'>+/* BUS:     S     A8     ACK | D8(1)   ACK   P                              */</div><div class='add'>+/* IRQ:       DTE   WAIT     |   WAIT     DTE                               */</div><div class='add'>+/* ICIC:      -DTE           |   +DTE                                       */</div><div class='add'>+/* ICCR: 0x94       0x81     |   0xc0                                       */</div><div class='add'>+/* ICDR:      A8             |            D8(1)                             */</div><div class='add'>+/*                                                                          */</div><div class='add'>+/* 2 byte receive        [TX]| [RX]                                         */</div><div class='add'>+/* BUS:     S     A8     ACK | D8(1)   ACK   D8(2)   ACK   P                */</div><div class='add'>+/* IRQ:       DTE   WAIT     |   WAIT          WAIT     DTE                 */</div><div class='add'>+/* ICIC:      -DTE           |                 +DTE                         */</div><div class='add'>+/* ICCR: 0x94       0x81     |                 0xc0                         */</div><div class='add'>+/* ICDR:      A8             |                 D8(1)    D8(2)               */</div><div class='add'>+/*                                                                          */</div><div class='add'>+/* 3 byte receive       [TX] | [RX]                                         */</div><div class='add'>+/* BUS:     S     A8     ACK | D8(1)   ACK   D8(2)   ACK   D8(3)   ACK    P */</div><div class='add'>+/* IRQ:       DTE   WAIT     |   WAIT          WAIT         WAIT      DTE   */</div><div class='add'>+/* ICIC:      -DTE           |                              +DTE            */</div><div class='add'>+/* ICCR: 0x94       0x81     |                              0xc0            */</div><div class='add'>+/* ICDR:      A8             |                 D8(1)        D8(2)     D8(3) */</div><div class='add'>+/*                                                                          */</div><div class='add'>+/* 4 bytes or more, this part is repeated    +---------+                    */</div><div class='add'>+/*                                                                          */</div><div class='add'>+/*                                                                          */</div><div class='add'>+/* Interrupt order and BUSY flag                                            */</div><div class='add'>+/*     ___                                                 _                */</div><div class='add'>+/* SDA ___\___XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXAAAAAAAAA___/                 */</div><div class='add'>+/* SCL      \_/1\_/2\_/3\_/4\_/5\_/6\_/7\_/8\___/9\_____/                   */</div><div class='add'>+/*                                                                          */</div><div class='add'>+/*        S   D7  D6  D5  D4  D3  D2  D1  D0              P                 */</div><div class='add'>+/*                                           ___                            */</div><div class='add'>+/* WAIT IRQ ________________________________/   \___________                */</div><div class='add'>+/* TACK IRQ ____________________________________/   \_______                */</div><div class='add'>+/* DTE  IRQ __________________________________________/   \_                */</div><div class='add'>+/* AL   IRQ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX                */</div><div class='add'>+/*         _______________________________________________                  */</div><div class='add'>+/* BUSY __/                                               \_                */</div><div class='add'>+/*                                                                          */</div><div class='add'>+</div><div class='ctx'> enum sh_mobile_i2c_op {</div><div class='ctx'> 	OP_START = 0,</div><div class='del'>-	OP_TX_ONLY,</div><div class='add'>+	OP_TX_FIRST,</div><div class='add'>+	OP_TX,</div><div class='ctx'> 	OP_TX_STOP,</div><div class='ctx'> 	OP_TX_TO_RX,</div><div class='del'>-	OP_RX_ONLY,</div><div class='add'>+	OP_RX,</div><div class='ctx'> 	OP_RX_STOP,</div><div class='add'>+	OP_RX_STOP_DATA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sh_mobile_i2c_data {</div><div class='hunk'>@@ -127,25 +198,34 @@ static unsigned char i2c_op(struct sh_mobile_i2c_data *pd,</div><div class='ctx'> 	spin_lock_irqsave(&amp;pd-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	switch (op) {</div><div class='del'>-	case OP_START:</div><div class='add'>+	case OP_START: /* issue start and trigger DTE interrupt */</div><div class='ctx'> 		iowrite8(0x94, ICCR(pd));</div><div class='ctx'> 		break;</div><div class='del'>-	case OP_TX_ONLY:</div><div class='add'>+	case OP_TX_FIRST: /* disable DTE interrupt and write data */</div><div class='add'>+		iowrite8(ICIC_WAITE | ICIC_ALE | ICIC_TACKE, ICIC(pd));</div><div class='ctx'> 		iowrite8(data, ICDR(pd));</div><div class='ctx'> 		break;</div><div class='del'>-	case OP_TX_STOP:</div><div class='add'>+	case OP_TX: /* write data */</div><div class='ctx'> 		iowrite8(data, ICDR(pd));</div><div class='del'>-		iowrite8(0x90, ICCR(pd));</div><div class='del'>-		iowrite8(ICIC_ALE | ICIC_TACKE, ICIC(pd));</div><div class='ctx'> 		break;</div><div class='del'>-	case OP_TX_TO_RX:</div><div class='add'>+	case OP_TX_STOP: /* write data and issue a stop afterwards */</div><div class='ctx'> 		iowrite8(data, ICDR(pd));</div><div class='add'>+		iowrite8(0x90, ICCR(pd));</div><div class='add'>+		break;</div><div class='add'>+	case OP_TX_TO_RX: /* select read mode */</div><div class='ctx'> 		iowrite8(0x81, ICCR(pd));</div><div class='ctx'> 		break;</div><div class='del'>-	case OP_RX_ONLY:</div><div class='add'>+	case OP_RX: /* just read data */</div><div class='ctx'> 		ret = ioread8(ICDR(pd));</div><div class='ctx'> 		break;</div><div class='del'>-	case OP_RX_STOP:</div><div class='add'>+	case OP_RX_STOP: /* enable DTE interrupt, issue stop */</div><div class='add'>+		iowrite8(ICIC_DTEE | ICIC_WAITE | ICIC_ALE | ICIC_TACKE,</div><div class='add'>+			 ICIC(pd));</div><div class='add'>+		iowrite8(0xc0, ICCR(pd));</div><div class='add'>+		break;</div><div class='add'>+	case OP_RX_STOP_DATA: /* enable DTE interrupt, read data, issue stop */</div><div class='add'>+		iowrite8(ICIC_DTEE | ICIC_WAITE | ICIC_ALE | ICIC_TACKE,</div><div class='add'>+			 ICIC(pd));</div><div class='ctx'> 		ret = ioread8(ICDR(pd));</div><div class='ctx'> 		iowrite8(0xc0, ICCR(pd));</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -157,58 +237,120 @@ static unsigned char i2c_op(struct sh_mobile_i2c_data *pd,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sh_mobile_i2c_is_first_byte(struct sh_mobile_i2c_data *pd)</div><div class='add'>+{</div><div class='add'>+	if (pd-&gt;pos == -1)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sh_mobile_i2c_is_last_byte(struct sh_mobile_i2c_data *pd)</div><div class='add'>+{</div><div class='add'>+	if (pd-&gt;pos == (pd-&gt;msg-&gt;len - 1))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sh_mobile_i2c_get_data(struct sh_mobile_i2c_data *pd,</div><div class='add'>+				   unsigned char *buf)</div><div class='add'>+{</div><div class='add'>+	switch (pd-&gt;pos) {</div><div class='add'>+	case -1:</div><div class='add'>+		*buf = (pd-&gt;msg-&gt;addr &amp; 0x7f) &lt;&lt; 1;</div><div class='add'>+		*buf |= (pd-&gt;msg-&gt;flags &amp; I2C_M_RD) ? 1 : 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		*buf = pd-&gt;msg-&gt;buf[pd-&gt;pos];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sh_mobile_i2c_isr_tx(struct sh_mobile_i2c_data *pd)</div><div class='add'>+{</div><div class='add'>+	unsigned char data;</div><div class='add'>+</div><div class='add'>+	if (pd-&gt;pos == pd-&gt;msg-&gt;len)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	sh_mobile_i2c_get_data(pd, &amp;data);</div><div class='add'>+</div><div class='add'>+	if (sh_mobile_i2c_is_last_byte(pd))</div><div class='add'>+		i2c_op(pd, OP_TX_STOP, data);</div><div class='add'>+	else if (sh_mobile_i2c_is_first_byte(pd))</div><div class='add'>+		i2c_op(pd, OP_TX_FIRST, data);</div><div class='add'>+	else</div><div class='add'>+		i2c_op(pd, OP_TX, data);</div><div class='add'>+</div><div class='add'>+	pd-&gt;pos++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sh_mobile_i2c_isr_rx(struct sh_mobile_i2c_data *pd)</div><div class='add'>+{</div><div class='add'>+	unsigned char data;</div><div class='add'>+	int real_pos;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (pd-&gt;pos &lt;= -1) {</div><div class='add'>+			sh_mobile_i2c_get_data(pd, &amp;data);</div><div class='add'>+</div><div class='add'>+			if (sh_mobile_i2c_is_first_byte(pd))</div><div class='add'>+				i2c_op(pd, OP_TX_FIRST, data);</div><div class='add'>+			else</div><div class='add'>+				i2c_op(pd, OP_TX, data);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pd-&gt;pos == 0) {</div><div class='add'>+			i2c_op(pd, OP_TX_TO_RX, 0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		real_pos = pd-&gt;pos - 2;</div><div class='add'>+</div><div class='add'>+		if (pd-&gt;pos == pd-&gt;msg-&gt;len) {</div><div class='add'>+			if (real_pos &lt; 0) {</div><div class='add'>+				i2c_op(pd, OP_RX_STOP, 0);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			data = i2c_op(pd, OP_RX_STOP_DATA, 0);</div><div class='add'>+		} else</div><div class='add'>+			data = i2c_op(pd, OP_RX, 0);</div><div class='add'>+</div><div class='add'>+		pd-&gt;msg-&gt;buf[real_pos] = data;</div><div class='add'>+	} while (0);</div><div class='add'>+</div><div class='add'>+	pd-&gt;pos++;</div><div class='add'>+	return pd-&gt;pos == (pd-&gt;msg-&gt;len + 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static irqreturn_t sh_mobile_i2c_isr(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *dev = dev_id;</div><div class='ctx'> 	struct sh_mobile_i2c_data *pd = platform_get_drvdata(dev);</div><div class='del'>-	struct i2c_msg *msg = pd-&gt;msg;</div><div class='del'>-	unsigned char data, sr;</div><div class='del'>-	int wakeup = 0;</div><div class='add'>+	unsigned char sr;</div><div class='add'>+	int wakeup;</div><div class='ctx'> </div><div class='ctx'> 	sr = ioread8(ICSR(pd));</div><div class='del'>-	pd-&gt;sr |= sr;</div><div class='add'>+	pd-&gt;sr |= sr; /* remember state */</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(pd-&gt;dev, "i2c_isr 0x%02x 0x%02x %s %d %d!\n", sr, pd-&gt;sr,</div><div class='del'>-	       (msg-&gt;flags &amp; I2C_M_RD) ? "read" : "write",</div><div class='del'>-	       pd-&gt;pos, msg-&gt;len);</div><div class='add'>+	       (pd-&gt;msg-&gt;flags &amp; I2C_M_RD) ? "read" : "write",</div><div class='add'>+	       pd-&gt;pos, pd-&gt;msg-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	if (sr &amp; (ICSR_AL | ICSR_TACK)) {</div><div class='del'>-		iowrite8(0, ICIC(pd)); /* disable interrupts */</div><div class='del'>-		wakeup = 1;</div><div class='del'>-		goto do_wakeup;</div><div class='del'>-	}</div><div class='add'>+		/* don't interrupt transaction - continue to issue stop */</div><div class='add'>+		iowrite8(sr &amp; ~(ICSR_AL | ICSR_TACK), ICSR(pd));</div><div class='add'>+		wakeup = 0;</div><div class='add'>+	} else if (pd-&gt;msg-&gt;flags &amp; I2C_M_RD)</div><div class='add'>+		wakeup = sh_mobile_i2c_isr_rx(pd);</div><div class='add'>+	else</div><div class='add'>+		wakeup = sh_mobile_i2c_isr_tx(pd);</div><div class='ctx'> </div><div class='del'>-	if (pd-&gt;pos == msg-&gt;len) {</div><div class='del'>-		i2c_op(pd, OP_RX_ONLY, 0);</div><div class='del'>-		wakeup = 1;</div><div class='del'>-		goto do_wakeup;</div><div class='del'>-	}</div><div class='add'>+	if (sr &amp; ICSR_WAIT) /* TODO: add delay here to support slow acks */</div><div class='add'>+		iowrite8(sr &amp; ~ICSR_WAIT, ICSR(pd));</div><div class='ctx'> </div><div class='del'>-	if (pd-&gt;pos == -1) {</div><div class='del'>-		data = (msg-&gt;addr &amp; 0x7f) &lt;&lt; 1;</div><div class='del'>-		data |= (msg-&gt;flags &amp; I2C_M_RD) ? 1 : 0;</div><div class='del'>-	} else</div><div class='del'>-		data = msg-&gt;buf[pd-&gt;pos];</div><div class='del'>-</div><div class='del'>-	if ((pd-&gt;pos == -1) || !(msg-&gt;flags &amp; I2C_M_RD)) {</div><div class='del'>-		if (msg-&gt;flags &amp; I2C_M_RD)</div><div class='del'>-			i2c_op(pd, OP_TX_TO_RX, data);</div><div class='del'>-		else if (pd-&gt;pos == (msg-&gt;len - 1)) {</div><div class='del'>-			i2c_op(pd, OP_TX_STOP, data);</div><div class='del'>-			wakeup = 1;</div><div class='del'>-		} else</div><div class='del'>-			i2c_op(pd, OP_TX_ONLY, data);</div><div class='del'>-	} else {</div><div class='del'>-		if (pd-&gt;pos == (msg-&gt;len - 1))</div><div class='del'>-			data = i2c_op(pd, OP_RX_STOP, 0);</div><div class='del'>-		else</div><div class='del'>-			data = i2c_op(pd, OP_RX_ONLY, 0);</div><div class='del'>-</div><div class='del'>-		msg-&gt;buf[pd-&gt;pos] = data;</div><div class='del'>-	}</div><div class='del'>-	pd-&gt;pos++;</div><div class='del'>-</div><div class='del'>- do_wakeup:</div><div class='ctx'> 	if (wakeup) {</div><div class='ctx'> 		pd-&gt;sr |= SW_DONE;</div><div class='ctx'> 		wake_up(&amp;pd-&gt;wait);</div><div class='hunk'>@@ -219,6 +361,11 @@ static irqreturn_t sh_mobile_i2c_isr(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static int start_ch(struct sh_mobile_i2c_data *pd, struct i2c_msg *usr_msg)</div><div class='ctx'> {</div><div class='add'>+	if (usr_msg-&gt;len == 0 &amp;&amp; (usr_msg-&gt;flags &amp; I2C_M_RD)) {</div><div class='add'>+		dev_err(pd-&gt;dev, "Unsupported zero length i2c read\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Initialize channel registers */</div><div class='ctx'> 	iowrite8(ioread8(ICCR(pd)) &amp; ~ICCR_ICE, ICCR(pd));</div><div class='ctx'> </div><div class='hunk'>@@ -233,9 +380,8 @@ static int start_ch(struct sh_mobile_i2c_data *pd, struct i2c_msg *usr_msg)</div><div class='ctx'> 	pd-&gt;pos = -1;</div><div class='ctx'> 	pd-&gt;sr = 0;</div><div class='ctx'> </div><div class='del'>-	/* Enable all interrupts except wait */</div><div class='del'>-	iowrite8(ioread8(ICIC(pd)) | ICIC_ALE | ICIC_TACKE | ICIC_DTEE,</div><div class='del'>-		 ICIC(pd));</div><div class='add'>+	/* Enable all interrupts to begin with */</div><div class='add'>+	iowrite8(ICIC_WAITE | ICIC_ALE | ICIC_TACKE | ICIC_DTEE, ICIC(pd));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -268,25 +414,18 @@ static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter,</div><div class='ctx'> 		if (!k)</div><div class='ctx'> 			dev_err(pd-&gt;dev, "Transfer request timed out\n");</div><div class='ctx'> </div><div class='del'>-		retry_count = 10;</div><div class='add'>+		retry_count = 1000;</div><div class='ctx'> again:</div><div class='ctx'> 		val = ioread8(ICSR(pd));</div><div class='ctx'> </div><div class='ctx'> 		dev_dbg(pd-&gt;dev, "val 0x%02x pd-&gt;sr 0x%02x\n", val, pd-&gt;sr);</div><div class='ctx'> </div><div class='del'>-		if ((val | pd-&gt;sr) &amp; (ICSR_TACK | ICSR_AL)) {</div><div class='del'>-			err = -EIO;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/* the interrupt handler may wake us up before the</div><div class='ctx'> 		 * transfer is finished, so poll the hardware</div><div class='ctx'> 		 * until we're done.</div><div class='ctx'> 		 */</div><div class='del'>-</div><div class='del'>-		if (!(!(val &amp; ICSR_BUSY) &amp;&amp; (val &amp; ICSR_SCLM) &amp;&amp;</div><div class='del'>-		      (val &amp; ICSR_SDAM))) {</div><div class='del'>-			msleep(1);</div><div class='add'>+		if (val &amp; ICSR_BUSY) {</div><div class='add'>+			udelay(10);</div><div class='ctx'> 			if (retry_count--)</div><div class='ctx'> 				goto again;</div><div class='ctx'> </div><div class='hunk'>@@ -294,6 +433,12 @@ again:</div><div class='ctx'> 			dev_err(pd-&gt;dev, "Polling timed out\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/* handle missing acknowledge and arbitration lost */</div><div class='add'>+		if ((val | pd-&gt;sr) &amp; (ICSR_TACK | ICSR_AL)) {</div><div class='add'>+			err = -EIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	deactivate_ch(pd);</div><div class='head'>diff --git a/drivers/i2c/chips/at24.c b/drivers/i2c/chips/at24.c<br/>index e764c94f3e3d..2a4acb269569 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/chips/at24.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/chips/at24.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/chips/at24.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/chips/at24.c</a></div><div class='hunk'>@@ -188,7 +188,7 @@ static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf,</div><div class='ctx'> 			count = I2C_SMBUS_BLOCK_MAX;</div><div class='ctx'> 		status = i2c_smbus_read_i2c_block_data(client, offset,</div><div class='ctx'> 				count, buf);</div><div class='del'>-		dev_dbg(&amp;client-&gt;dev, "smbus read %zd@%d --&gt; %d\n",</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "smbus read %zu@%d --&gt; %d\n",</div><div class='ctx'> 				count, offset, status);</div><div class='ctx'> 		return (status &lt; 0) ? -EIO : status;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -214,7 +214,7 @@ static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf,</div><div class='ctx'> 	msg[1].len = count;</div><div class='ctx'> </div><div class='ctx'> 	status = i2c_transfer(client-&gt;adapter, msg, 2);</div><div class='del'>-	dev_dbg(&amp;client-&gt;dev, "i2c read %zd@%d --&gt; %d\n",</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "i2c read %zu@%d --&gt; %d\n",</div><div class='ctx'> 			count, offset, status);</div><div class='ctx'> </div><div class='ctx'> 	if (status == 2)</div><div class='hunk'>@@ -334,7 +334,7 @@ static ssize_t at24_eeprom_write(struct at24_data *at24, char *buf,</div><div class='ctx'> 			if (status == 1)</div><div class='ctx'> 				status = count;</div><div class='ctx'> 		}</div><div class='del'>-		dev_dbg(&amp;client-&gt;dev, "write %zd@%d --&gt; %zd (%ld)\n",</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "write %zu@%d --&gt; %zd (%ld)\n",</div><div class='ctx'> 				count, offset, status, jiffies);</div><div class='ctx'> </div><div class='ctx'> 		if (status == count)</div><div class='hunk'>@@ -512,7 +512,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	i2c_set_clientdata(client, at24);</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;client-&gt;dev, "%Zd byte %s EEPROM %s\n",</div><div class='add'>+	dev_info(&amp;client-&gt;dev, "%zu byte %s EEPROM %s\n",</div><div class='ctx'> 		at24-&gt;bin.size, client-&gt;name,</div><div class='ctx'> 		writable ? "(writable)" : "(read-only)");</div><div class='ctx'> 	dev_dbg(&amp;client-&gt;dev,</div><div class='head'>diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c<br/>index 03a33f1b9cd3..4655b794ebe3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/chips/isp1301_omap.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/chips/isp1301_omap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/chips/isp1301_omap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/chips/isp1301_omap.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/usb.h&gt;</div><div class='add'>+#include &lt;mach/usb.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifndef	DEBUG</div><div class='hunk'>@@ -94,7 +94,7 @@ struct isp1301 {</div><div class='ctx'> /* board-specific PM hooks */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1593,7 +1593,7 @@ fail1:</div><div class='ctx'> 	if (machine_is_omap_h2()) {</div><div class='ctx'> 		/* full speed signaling by default */</div><div class='ctx'> 		isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1,</div><div class='del'>-			MC1_SPEED_REG);</div><div class='add'>+			MC1_SPEED);</div><div class='ctx'> 		isp1301_set_bits(isp, ISP1301_MODE_CONTROL_2,</div><div class='ctx'> 			MC2_SPD_SUSP_CTRL);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c<br/>index b36db1797c11..176126d3a01d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/chips/menelaus.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/chips/menelaus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/chips/menelaus.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/chips/menelaus.c</a></div><div class='hunk'>@@ -41,11 +41,10 @@</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='ctx'> #include &lt;linux/bcd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/menelaus.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/menelaus.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME			"menelaus"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c<br/>index 7bf38c418086..b346a687ab59 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/i2c-core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/i2c-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/i2c-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/i2c-core.c</a></div><div class='hunk'>@@ -108,6 +108,9 @@ static int i2c_device_probe(struct device *dev)</div><div class='ctx'> 	if (!driver-&gt;probe || !driver-&gt;id_table)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	client-&gt;driver = driver;</div><div class='add'>+	if (!device_can_wakeup(&amp;client-&gt;dev))</div><div class='add'>+		device_init_wakeup(&amp;client-&gt;dev,</div><div class='add'>+					client-&gt;flags &amp; I2C_CLIENT_WAKE);</div><div class='ctx'> 	dev_dbg(dev, "probe\n");</div><div class='ctx'> </div><div class='ctx'> 	status = driver-&gt;probe(client, i2c_match_id(driver-&gt;id_table, client));</div><div class='hunk'>@@ -262,9 +265,8 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)</div><div class='ctx'> 	client-&gt;adapter = adap;</div><div class='ctx'> </div><div class='ctx'> 	client-&gt;dev.platform_data = info-&gt;platform_data;</div><div class='del'>-	device_init_wakeup(&amp;client-&gt;dev, info-&gt;flags &amp; I2C_CLIENT_WAKE);</div><div class='ctx'> </div><div class='del'>-	client-&gt;flags = info-&gt;flags &amp; ~I2C_CLIENT_WAKE;</div><div class='add'>+	client-&gt;flags = info-&gt;flags;</div><div class='ctx'> 	client-&gt;addr = info-&gt;addr;</div><div class='ctx'> 	client-&gt;irq = info-&gt;irq;</div><div class='ctx'> </div><div class='hunk'>@@ -813,7 +815,12 @@ static int i2c_check_addr(struct i2c_adapter *adapter, int addr)</div><div class='ctx'> int i2c_attach_client(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_adapter *adapter = client-&gt;adapter;</div><div class='del'>-	int res = 0;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	/* Check for address business */</div><div class='add'>+	res = i2c_check_addr(adapter, client-&gt;addr);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='ctx'> </div><div class='ctx'> 	client-&gt;dev.parent = &amp;client-&gt;adapter-&gt;dev;</div><div class='ctx'> 	client-&gt;dev.bus = &amp;i2c_bus_type;</div><div class='hunk'>@@ -1183,8 +1190,8 @@ int i2c_probe(struct i2c_adapter *adapter,</div><div class='ctx'> 		 &amp;&amp; address_data-&gt;normal_i2c[0] == I2C_CLIENT_END)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		dev_warn(&amp;adapter-&gt;dev, "SMBus Quick command not supported, "</div><div class='del'>-			 "can't probe for chips\n");</div><div class='add'>+		dev_dbg(&amp;adapter-&gt;dev, "SMBus Quick command not supported, "</div><div class='add'>+			"can't probe for chips\n");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1345,6 +1352,10 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Stop here if the classes do not match */</div><div class='add'>+	if (!(adapter-&gt;class &amp; driver-&gt;class))</div><div class='add'>+		goto exit_free;</div><div class='add'>+</div><div class='ctx'> 	/* Stop here if we can't use SMBUS_QUICK */</div><div class='ctx'> 	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) {</div><div class='ctx'> 		if (address_data-&gt;probe[0] == I2C_CLIENT_END</div><div class='hunk'>@@ -1357,10 +1368,6 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)</div><div class='ctx'> 		goto exit_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Stop here if the classes do not match */</div><div class='del'>-	if (!(adapter-&gt;class &amp; driver-&gt;class))</div><div class='del'>-		goto exit_free;</div><div class='del'>-</div><div class='ctx'> 	/* Probe entries are done second, and are not affected by ignore</div><div class='ctx'> 	   entries either */</div><div class='ctx'> 	for (i = 0; address_data-&gt;probe[i] != I2C_CLIENT_END; i += 2) {</div><div class='hunk'>@@ -1451,9 +1458,11 @@ i2c_new_probed_device(struct i2c_adapter *adap,</div><div class='ctx'> 		if ((addr_list[i] &amp; ~0x07) == 0x30</div><div class='ctx'> 		 || (addr_list[i] &amp; ~0x0f) == 0x50</div><div class='ctx'> 		 || !i2c_check_functionality(adap, I2C_FUNC_SMBUS_QUICK)) {</div><div class='add'>+			union i2c_smbus_data data;</div><div class='add'>+</div><div class='ctx'> 			if (i2c_smbus_xfer(adap, addr_list[i], 0,</div><div class='ctx'> 					   I2C_SMBUS_READ, 0,</div><div class='del'>-					   I2C_SMBUS_BYTE, NULL) &gt;= 0)</div><div class='add'>+					   I2C_SMBUS_BYTE, &amp;data) &gt;= 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (i2c_smbus_xfer(adap, addr_list[i], 0,</div><div class='head'>diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c<br/>index 9d55c6383b23..af4491fa7e34 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/i2c-dev.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/i2c/i2c-dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/i2c-dev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/i2c/i2c-dev.c</a></div><div class='hunk'>@@ -147,7 +147,7 @@ static ssize_t i2cdev_read (struct file *file, char __user *buf, size_t count,</div><div class='ctx'> 	if (tmp==NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	pr_debug("i2c-dev: i2c-%d reading %zd bytes.\n",</div><div class='add'>+	pr_debug("i2c-dev: i2c-%d reading %zu bytes.\n",</div><div class='ctx'> 		iminor(file-&gt;f_path.dentry-&gt;d_inode), count);</div><div class='ctx'> </div><div class='ctx'> 	ret = i2c_master_recv(client,tmp,count);</div><div class='hunk'>@@ -175,7 +175,7 @@ static ssize_t i2cdev_write (struct file *file, const char __user *buf, size_t c</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_debug("i2c-dev: i2c-%d writing %zd bytes.\n",</div><div class='add'>+	pr_debug("i2c-dev: i2c-%d writing %zu bytes.\n",</div><div class='ctx'> 		iminor(file-&gt;f_path.dentry-&gt;d_inode), count);</div><div class='ctx'> </div><div class='ctx'> 	ret = i2c_master_send(client,tmp,count);</div><div class='head'>diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig<br/>index 130ef64b44f7..fc735ab08ff4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/Kconfig</a></div><div class='hunk'>@@ -54,16 +54,6 @@ menuconfig IDE</div><div class='ctx'> </div><div class='ctx'> if IDE</div><div class='ctx'> </div><div class='del'>-config IDE_MAX_HWIFS</div><div class='del'>-	int "Max IDE interfaces"</div><div class='del'>-	depends on ALPHA || SUPERH || IA64 || EMBEDDED</div><div class='del'>-	range 1 10</div><div class='del'>-	default 4</div><div class='del'>-	help</div><div class='del'>-	  This is the maximum number of IDE hardware interfaces that will</div><div class='del'>-	  be supported by the driver. Make sure it is at least as high as</div><div class='del'>-	  the number of IDE interfaces in your system.</div><div class='del'>-</div><div class='ctx'> config BLK_DEV_IDE</div><div class='ctx'> 	tristate "Enhanced IDE/MFM/RLL disk/cdrom/tape/floppy support"</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -252,7 +242,7 @@ config BLK_DEV_IDEFLOPPY</div><div class='ctx'> 	  module will be called ide-floppy.</div><div class='ctx'> </div><div class='ctx'> config BLK_DEV_IDESCSI</div><div class='del'>-	tristate "SCSI emulation support"</div><div class='add'>+	tristate "SCSI emulation support (DEPRECATED)"</div><div class='ctx'> 	depends on SCSI</div><div class='ctx'> 	select IDE_ATAPI</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -265,20 +255,6 @@ config BLK_DEV_IDESCSI</div><div class='ctx'> 	  and will allow you to use a SCSI device driver instead of a native</div><div class='ctx'> 	  ATAPI driver.</div><div class='ctx'> </div><div class='del'>-	  This is useful if you have an ATAPI device for which no native</div><div class='del'>-	  driver has been written (for example, an ATAPI PD-CD drive);</div><div class='del'>-	  you can then use this emulation together with an appropriate SCSI</div><div class='del'>-	  device driver. In order to do this, say Y here and to "SCSI support"</div><div class='del'>-	  and "SCSI generic support", below. You must then provide the kernel</div><div class='del'>-	  command line "hdx=ide-scsi" (try "man bootparam" or see the</div><div class='del'>-	  documentation of your boot loader (lilo or loadlin) about how to</div><div class='del'>-	  pass options to the kernel at boot time) for devices if you want the</div><div class='del'>-	  native EIDE sub-drivers to skip over the native support, so that</div><div class='del'>-	  this SCSI emulation can be used instead.</div><div class='del'>-</div><div class='del'>-	  Note that this option does NOT allow you to attach SCSI devices to a</div><div class='del'>-	  box that doesn't have a SCSI host adapter installed.</div><div class='del'>-</div><div class='ctx'> 	  If both this SCSI emulation and native ATAPI support are compiled</div><div class='ctx'> 	  into the kernel, the native support will be used.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c<br/>index 176532ffae0e..f728f2927b5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/arm/ide_arm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/arm/ide_arm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/arm/ide_arm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/arm/ide_arm.c</a></div><div class='hunk'>@@ -11,13 +11,12 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME "ide_arm"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_CLPS7500</div><div class='del'>-# include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+# include &lt;mach/hardware.h&gt;</div><div class='ctx'> #</div><div class='ctx'> # define IDE_ARM_IO	(ISASLOT_IO + 0x1f0)</div><div class='ctx'> # define IDE_ARM_IRQ	IRQ_ISA_14</div><div class='head'>diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c<br/>index 3e842d60eae9..4fd91dcf1dc2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/arm/palm_bk3710.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/arm/palm_bk3710.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/arm/palm_bk3710.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/arm/palm_bk3710.c</a></div><div class='hunk'>@@ -309,7 +309,7 @@ static void __devinit palm_bk3710_chipinit(void __iomem *base)</div><div class='ctx'> 	palm_bk3710_setpiomode(base, NULL, 1, 600, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __devinit palm_bk3710_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 palm_bk3710_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	return ATA_CBL_PATA80;</div><div class='ctx'> }</div><div class='hunk'>@@ -343,11 +343,10 @@ static struct ide_port_info __devinitdata palm_bk3710_port_info = {</div><div class='ctx'> 	.mwdma_mask		= ATA_MWDMA2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit palm_bk3710_probe(struct platform_device *pdev)</div><div class='add'>+static int __init palm_bk3710_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk *clk;</div><div class='ctx'> 	struct resource *mem, *irq;</div><div class='del'>-	struct ide_host *host;</div><div class='ctx'> 	unsigned long base, rate;</div><div class='ctx'> 	int i, rc;</div><div class='ctx'> 	hw_regs_t hw, *hws[] = { &amp;hw, NULL, NULL, NULL };</div><div class='hunk'>@@ -390,6 +389,7 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev)</div><div class='ctx'> 		hw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i;</div><div class='ctx'> 	hw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET;</div><div class='ctx'> 	hw.irq = irq-&gt;start;</div><div class='add'>+	hw.dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	hw.chipset = ide_palm3710;</div><div class='ctx'> </div><div class='ctx'> 	palm_bk3710_port_info.udma_mask = rate &lt; 100000000 ? ATA_UDMA4 :</div><div class='hunk'>@@ -413,13 +413,11 @@ static struct platform_driver platform_bk_driver = {</div><div class='ctx'> 		.name = "palm_bk3710",</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='ctx'> 	},</div><div class='del'>-	.probe = palm_bk3710_probe,</div><div class='del'>-	.remove = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init palm_bk3710_init(void)</div><div class='ctx'> {</div><div class='del'>-	return platform_driver_register(&amp;platform_bk_driver);</div><div class='add'>+	return platform_driver_probe(&amp;platform_bk_driver, palm_bk3710_probe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(palm_bk3710_init);</div><div class='head'>diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c<br/>index e617cf08aef6..49a8c589e346 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-cd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/ide-cd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-cd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/ide-cd.c</a></div><div class='hunk'>@@ -66,11 +66,11 @@ static struct cdrom_info *ide_cd_get(struct gendisk *disk)</div><div class='ctx'> 	mutex_lock(&amp;idecd_ref_mutex);</div><div class='ctx'> 	cd = ide_cd_g(disk);</div><div class='ctx'> 	if (cd) {</div><div class='del'>-		kref_get(&amp;cd-&gt;kref);</div><div class='del'>-		if (ide_device_get(cd-&gt;drive)) {</div><div class='del'>-			kref_put(&amp;cd-&gt;kref, ide_cd_release);</div><div class='add'>+		if (ide_device_get(cd-&gt;drive))</div><div class='ctx'> 			cd = NULL;</div><div class='del'>-		}</div><div class='add'>+		else</div><div class='add'>+			kref_get(&amp;cd-&gt;kref);</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;idecd_ref_mutex);</div><div class='ctx'> 	return cd;</div><div class='hunk'>@@ -78,9 +78,11 @@ static struct cdrom_info *ide_cd_get(struct gendisk *disk)</div><div class='ctx'> </div><div class='ctx'> static void ide_cd_put(struct cdrom_info *cd)</div><div class='ctx'> {</div><div class='add'>+	ide_drive_t *drive = cd-&gt;drive;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;idecd_ref_mutex);</div><div class='del'>-	ide_device_put(cd-&gt;drive);</div><div class='ctx'> 	kref_put(&amp;cd-&gt;kref, ide_cd_release);</div><div class='add'>+	ide_device_put(drive);</div><div class='ctx'> 	mutex_unlock(&amp;idecd_ref_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1270,9 +1272,9 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,</div><div class='ctx'>  */</div><div class='ctx'> static void msf_from_bcd(struct atapi_msf *msf)</div><div class='ctx'> {</div><div class='del'>-	msf-&gt;minute = BCD2BIN(msf-&gt;minute);</div><div class='del'>-	msf-&gt;second = BCD2BIN(msf-&gt;second);</div><div class='del'>-	msf-&gt;frame  = BCD2BIN(msf-&gt;frame);</div><div class='add'>+	msf-&gt;minute = bcd2bin(msf-&gt;minute);</div><div class='add'>+	msf-&gt;second = bcd2bin(msf-&gt;second);</div><div class='add'>+	msf-&gt;frame  = bcd2bin(msf-&gt;frame);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense)</div><div class='hunk'>@@ -1305,6 +1307,7 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,</div><div class='ctx'> 	int stat;</div><div class='ctx'> 	unsigned char cmd[BLK_MAX_CDB];</div><div class='ctx'> 	unsigned len = sizeof(capbuf);</div><div class='add'>+	u32 blocklen;</div><div class='ctx'> </div><div class='ctx'> 	memset(cmd, 0, BLK_MAX_CDB);</div><div class='ctx'> 	cmd[0] = GPCMD_READ_CDVD_CAPACITY;</div><div class='hunk'>@@ -1317,23 +1320,24 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Sanity check the given block size</div><div class='ctx'> 	 */</div><div class='del'>-	switch (capbuf.blocklen) {</div><div class='del'>-	case __constant_cpu_to_be32(512):</div><div class='del'>-	case __constant_cpu_to_be32(1024):</div><div class='del'>-	case __constant_cpu_to_be32(2048):</div><div class='del'>-	case __constant_cpu_to_be32(4096):</div><div class='add'>+	blocklen = be32_to_cpu(capbuf.blocklen);</div><div class='add'>+	switch (blocklen) {</div><div class='add'>+	case 512:</div><div class='add'>+	case 1024:</div><div class='add'>+	case 2048:</div><div class='add'>+	case 4096:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_ERR "%s: weird block size %u\n",</div><div class='del'>-			drive-&gt;name, capbuf.blocklen);</div><div class='add'>+			drive-&gt;name, blocklen);</div><div class='ctx'> 		printk(KERN_ERR "%s: default to 2kb block size\n",</div><div class='ctx'> 			drive-&gt;name);</div><div class='del'>-		capbuf.blocklen = __constant_cpu_to_be32(2048);</div><div class='add'>+		blocklen = 2048;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*capacity = 1 + be32_to_cpu(capbuf.lba);</div><div class='del'>-	*sectors_per_frame = be32_to_cpu(capbuf.blocklen) &gt;&gt; SECTOR_BITS;</div><div class='add'>+	*sectors_per_frame = blocklen &gt;&gt; SECTOR_BITS;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1411,8 +1415,8 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense)</div><div class='ctx'> 		return stat;</div><div class='ctx'> </div><div class='ctx'> 	if (drive-&gt;atapi_flags &amp; IDE_AFLAG_TOCTRACKS_AS_BCD) {</div><div class='del'>-		toc-&gt;hdr.first_track = BCD2BIN(toc-&gt;hdr.first_track);</div><div class='del'>-		toc-&gt;hdr.last_track  = BCD2BIN(toc-&gt;hdr.last_track);</div><div class='add'>+		toc-&gt;hdr.first_track = bcd2bin(toc-&gt;hdr.first_track);</div><div class='add'>+		toc-&gt;hdr.last_track  = bcd2bin(toc-&gt;hdr.last_track);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ntracks = toc-&gt;hdr.last_track - toc-&gt;hdr.first_track + 1;</div><div class='hunk'>@@ -1452,8 +1456,8 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense)</div><div class='ctx'> 			return stat;</div><div class='ctx'> </div><div class='ctx'> 		if (drive-&gt;atapi_flags &amp; IDE_AFLAG_TOCTRACKS_AS_BCD) {</div><div class='del'>-			toc-&gt;hdr.first_track = (u8)BIN2BCD(CDROM_LEADOUT);</div><div class='del'>-			toc-&gt;hdr.last_track = (u8)BIN2BCD(CDROM_LEADOUT);</div><div class='add'>+			toc-&gt;hdr.first_track = (u8)bin2bcd(CDROM_LEADOUT);</div><div class='add'>+			toc-&gt;hdr.last_track = (u8)bin2bcd(CDROM_LEADOUT);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			toc-&gt;hdr.first_track = CDROM_LEADOUT;</div><div class='ctx'> 			toc-&gt;hdr.last_track = CDROM_LEADOUT;</div><div class='hunk'>@@ -1466,14 +1470,14 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense)</div><div class='ctx'> 	toc-&gt;hdr.toc_length = be16_to_cpu(toc-&gt;hdr.toc_length);</div><div class='ctx'> </div><div class='ctx'> 	if (drive-&gt;atapi_flags &amp; IDE_AFLAG_TOCTRACKS_AS_BCD) {</div><div class='del'>-		toc-&gt;hdr.first_track = BCD2BIN(toc-&gt;hdr.first_track);</div><div class='del'>-		toc-&gt;hdr.last_track  = BCD2BIN(toc-&gt;hdr.last_track);</div><div class='add'>+		toc-&gt;hdr.first_track = bcd2bin(toc-&gt;hdr.first_track);</div><div class='add'>+		toc-&gt;hdr.last_track  = bcd2bin(toc-&gt;hdr.last_track);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt;= ntracks; i++) {</div><div class='ctx'> 		if (drive-&gt;atapi_flags &amp; IDE_AFLAG_TOCADDR_AS_BCD) {</div><div class='ctx'> 			if (drive-&gt;atapi_flags &amp; IDE_AFLAG_TOCTRACKS_AS_BCD)</div><div class='del'>-				toc-&gt;ent[i].track = BCD2BIN(toc-&gt;ent[i].track);</div><div class='add'>+				toc-&gt;ent[i].track = bcd2bin(toc-&gt;ent[i].track);</div><div class='ctx'> 			msf_from_bcd(&amp;toc-&gt;ent[i].addr.msf);</div><div class='ctx'> 		}</div><div class='ctx'> 		toc-&gt;ent[i].addr.lba = msf_to_lba(toc-&gt;ent[i].addr.msf.minute,</div><div class='head'>diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c<br/>index 28d85b410f7c..07ef88bd109b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-disk.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/ide-disk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-disk.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/ide-disk.c</a></div><div class='hunk'>@@ -65,11 +65,10 @@ static struct ide_disk_obj *ide_disk_get(struct gendisk *disk)</div><div class='ctx'> 	mutex_lock(&amp;idedisk_ref_mutex);</div><div class='ctx'> 	idkp = ide_disk_g(disk);</div><div class='ctx'> 	if (idkp) {</div><div class='del'>-		kref_get(&amp;idkp-&gt;kref);</div><div class='del'>-		if (ide_device_get(idkp-&gt;drive)) {</div><div class='del'>-			kref_put(&amp;idkp-&gt;kref, ide_disk_release);</div><div class='add'>+		if (ide_device_get(idkp-&gt;drive))</div><div class='ctx'> 			idkp = NULL;</div><div class='del'>-		}</div><div class='add'>+		else</div><div class='add'>+			kref_get(&amp;idkp-&gt;kref);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;idedisk_ref_mutex);</div><div class='ctx'> 	return idkp;</div><div class='hunk'>@@ -77,9 +76,11 @@ static struct ide_disk_obj *ide_disk_get(struct gendisk *disk)</div><div class='ctx'> </div><div class='ctx'> static void ide_disk_put(struct ide_disk_obj *idkp)</div><div class='ctx'> {</div><div class='add'>+	ide_drive_t *drive = idkp-&gt;drive;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;idedisk_ref_mutex);</div><div class='del'>-	ide_device_put(idkp-&gt;drive);</div><div class='ctx'> 	kref_put(&amp;idkp-&gt;kref, ide_disk_release);</div><div class='add'>+	ide_device_put(drive);</div><div class='ctx'> 	mutex_unlock(&amp;idedisk_ref_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -444,20 +445,6 @@ static void idedisk_check_hpa(ide_drive_t *drive)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Compute drive-&gt;capacity, the full capacity of the drive</div><div class='del'>- * Called with drive-&gt;id != NULL.</div><div class='del'>- *</div><div class='del'>- * To compute capacity, this uses either of</div><div class='del'>- *</div><div class='del'>- *    1. CHS value set by user       (whatever user sets will be trusted)</div><div class='del'>- *    2. LBA value from target drive (require new ATA feature)</div><div class='del'>- *    3. LBA value from system BIOS  (new one is OK, old one may break)</div><div class='del'>- *    4. CHS value from system BIOS  (traditional style)</div><div class='del'>- *</div><div class='del'>- * in above order (i.e., if value of higher priority is available,</div><div class='del'>- * reset will be ignored).</div><div class='del'>- */</div><div class='ctx'> static void init_idedisk_capacity(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	struct hd_driveid *id = drive-&gt;id;</div><div class='head'>diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c<br/>index 71c377a7bcf2..adc682755857 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-dma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/ide-dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-dma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/ide-dma.c</a></div><div class='hunk'>@@ -649,11 +649,7 @@ static unsigned int ide_get_mode_mask(ide_drive_t *drive, u8 base, u8 req_mode)</div><div class='ctx'> 		if (id-&gt;field_valid &amp; 2) {</div><div class='ctx'> 			mask = id-&gt;dma_1word &amp; hwif-&gt;swdma_mask;</div><div class='ctx'> 		} else if (id-&gt;tDMA) {</div><div class='del'>-			/*</div><div class='del'>-			 * ide_fix_driveid() doesn't convert -&gt;tDMA to the</div><div class='del'>-			 * CPU endianness so we need to do it here</div><div class='del'>-			 */</div><div class='del'>-			u8 mode = le16_to_cpu(id-&gt;tDMA);</div><div class='add'>+			u8 mode = id-&gt;tDMA;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * if the mode is valid convert it to the mask</div><div class='head'>diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c<br/>index ca11a26746f1..e9034c0125f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-floppy.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/ide-floppy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-floppy.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/ide-floppy.c</a></div><div class='hunk'>@@ -167,11 +167,10 @@ static struct ide_floppy_obj *ide_floppy_get(struct gendisk *disk)</div><div class='ctx'> 	mutex_lock(&amp;idefloppy_ref_mutex);</div><div class='ctx'> 	floppy = ide_floppy_g(disk);</div><div class='ctx'> 	if (floppy) {</div><div class='del'>-		kref_get(&amp;floppy-&gt;kref);</div><div class='del'>-		if (ide_device_get(floppy-&gt;drive)) {</div><div class='del'>-			kref_put(&amp;floppy-&gt;kref, idefloppy_cleanup_obj);</div><div class='add'>+		if (ide_device_get(floppy-&gt;drive))</div><div class='ctx'> 			floppy = NULL;</div><div class='del'>-		}</div><div class='add'>+		else</div><div class='add'>+			kref_get(&amp;floppy-&gt;kref);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;idefloppy_ref_mutex);</div><div class='ctx'> 	return floppy;</div><div class='hunk'>@@ -179,9 +178,11 @@ static struct ide_floppy_obj *ide_floppy_get(struct gendisk *disk)</div><div class='ctx'> </div><div class='ctx'> static void ide_floppy_put(struct ide_floppy_obj *floppy)</div><div class='ctx'> {</div><div class='add'>+	ide_drive_t *drive = floppy-&gt;drive;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;idefloppy_ref_mutex);</div><div class='del'>-	ide_device_put(floppy-&gt;drive);</div><div class='ctx'> 	kref_put(&amp;floppy-&gt;kref, idefloppy_cleanup_obj);</div><div class='add'>+	ide_device_put(drive);</div><div class='ctx'> 	mutex_unlock(&amp;idefloppy_ref_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c<br/>index 8aae91764513..2cbadffe922e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-iops.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/ide-iops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-iops.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/ide-iops.c</a></div><div class='hunk'>@@ -484,11 +484,11 @@ void ide_fix_driveid (struct hd_driveid *id)</div><div class='ctx'> 	for (i = 0; i &lt; 3; i++)</div><div class='ctx'> 		id-&gt;words157_159[i] = __le16_to_cpu(id-&gt;words157_159[i]);</div><div class='ctx'> 	id-&gt;cfa_power      = __le16_to_cpu(id-&gt;cfa_power);</div><div class='del'>-	for (i = 0; i &lt; 14; i++)</div><div class='add'>+	for (i = 0; i &lt; 15; i++)</div><div class='ctx'> 		id-&gt;words161_175[i] = __le16_to_cpu(id-&gt;words161_175[i]);</div><div class='del'>-	for (i = 0; i &lt; 31; i++)</div><div class='add'>+	for (i = 0; i &lt; 30; i++)</div><div class='ctx'> 		id-&gt;words176_205[i] = __le16_to_cpu(id-&gt;words176_205[i]);</div><div class='del'>-	for (i = 0; i &lt; 48; i++)</div><div class='add'>+	for (i = 0; i &lt; 49; i++)</div><div class='ctx'> 		id-&gt;words206_254[i] = __le16_to_cpu(id-&gt;words206_254[i]);</div><div class='ctx'> 	id-&gt;integrity_word  = __le16_to_cpu(id-&gt;integrity_word);</div><div class='ctx'> # else</div><div class='head'>diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c<br/>index 82c2afe4d28a..1bce84b56630 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-tape.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/ide-tape.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-tape.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/ide-tape.c</a></div><div class='hunk'>@@ -331,11 +331,10 @@ static struct ide_tape_obj *ide_tape_get(struct gendisk *disk)</div><div class='ctx'> 	mutex_lock(&amp;idetape_ref_mutex);</div><div class='ctx'> 	tape = ide_tape_g(disk);</div><div class='ctx'> 	if (tape) {</div><div class='del'>-		kref_get(&amp;tape-&gt;kref);</div><div class='del'>-		if (ide_device_get(tape-&gt;drive)) {</div><div class='del'>-			kref_put(&amp;tape-&gt;kref, ide_tape_release);</div><div class='add'>+		if (ide_device_get(tape-&gt;drive))</div><div class='ctx'> 			tape = NULL;</div><div class='del'>-		}</div><div class='add'>+		else</div><div class='add'>+			kref_get(&amp;tape-&gt;kref);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;idetape_ref_mutex);</div><div class='ctx'> 	return tape;</div><div class='hunk'>@@ -343,9 +342,11 @@ static struct ide_tape_obj *ide_tape_get(struct gendisk *disk)</div><div class='ctx'> </div><div class='ctx'> static void ide_tape_put(struct ide_tape_obj *tape)</div><div class='ctx'> {</div><div class='add'>+	ide_drive_t *drive = tape-&gt;drive;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;idetape_ref_mutex);</div><div class='del'>-	ide_device_put(tape-&gt;drive);</div><div class='ctx'> 	kref_put(&amp;tape-&gt;kref, ide_tape_release);</div><div class='add'>+	ide_device_put(drive);</div><div class='ctx'> 	mutex_unlock(&amp;idetape_ref_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c<br/>index e0c8fe7d9fea..3187215e8f89 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/aec62xx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/aec62xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/aec62xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/aec62xx.c</a></div><div class='hunk'>@@ -160,7 +160,7 @@ static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev)</div><div class='ctx'> 	return dev-&gt;irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __devinit atp86x_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 atp86x_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	u8 ata66 = 0, mask = hwif-&gt;channel ? 0x02 : 0x01;</div><div class='hunk'>@@ -307,7 +307,7 @@ static struct pci_driver driver = {</div><div class='ctx'> 	.name		= "AEC62xx_IDE",</div><div class='ctx'> 	.id_table	= aec62xx_pci_tbl,</div><div class='ctx'> 	.probe		= aec62xx_init_one,</div><div class='del'>-	.remove		= aec62xx_remove,</div><div class='add'>+	.remove		= __devexit_p(aec62xx_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init aec62xx_ide_init(void)</div><div class='head'>diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c<br/>index b582687e0cd4..d647526af557 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/alim15x3.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/alim15x3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/alim15x3.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/alim15x3.c</a></div><div class='hunk'>@@ -371,7 +371,7 @@ static int ali_cable_override(struct pci_dev *pdev)</div><div class='ctx'>  *	FIXME: frobs bits that are not defined on newer ALi devicea</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static u8 __devinit ali_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 ali_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	unsigned long flags;</div><div class='head'>diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c<br/>index 2cea7bf51a0f..1e66a960a96a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/amd74xx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/amd74xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/amd74xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/amd74xx.c</a></div><div class='hunk'>@@ -175,7 +175,7 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev)</div><div class='ctx'> 	return dev-&gt;irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __devinit amd_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 amd_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	if ((amd_80w &gt;&gt; hwif-&gt;channel) &amp; 1)</div><div class='ctx'> 		return ATA_CBL_PATA80;</div><div class='head'>diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c<br/>index 332f08f43b56..41f6cb6c163a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/atiixp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/atiixp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/atiixp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/atiixp.c</a></div><div class='hunk'>@@ -119,7 +119,7 @@ static void atiixp_set_dma_mode(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;atiixp_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __devinit atiixp_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 atiixp_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	u8 udma_mode = 0, ch = hwif-&gt;channel;</div><div class='head'>diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c<br/>index 1360b4fa9fd3..e064398e03b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/cmd64x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/cmd64x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/cmd64x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/cmd64x.c</a></div><div class='hunk'>@@ -354,7 +354,7 @@ static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __devinit cmd64x_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 cmd64x_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev  *dev	= to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	u8 bmidecsr = 0, mask	= hwif-&gt;channel ? 0x02 : 0x01;</div><div class='head'>diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c<br/>index c0364b287f17..151844fcbb07 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/cs5520.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/cs5520.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/cs5520.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/cs5520.c</a></div><div class='hunk'>@@ -96,6 +96,7 @@ static const struct ide_port_ops cs5520_port_ops = {</div><div class='ctx'> </div><div class='ctx'> static const struct ide_port_info cyrix_chipset __devinitdata = {</div><div class='ctx'> 	.name		= DRV_NAME,</div><div class='add'>+	.enablebits	= { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },</div><div class='ctx'> 	.port_ops	= &amp;cs5520_port_ops,</div><div class='ctx'> 	.host_flags	= IDE_HFLAG_ISA_PORTS | IDE_HFLAG_CS5520,</div><div class='ctx'> 	.pio_mask	= ATA_PIO4,</div><div class='head'>diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c<br/>index f7b50cdeefa6..dd3dc23af995 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/cs5535.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/cs5535.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/cs5535.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/cs5535.c</a></div><div class='hunk'>@@ -153,7 +153,7 @@ static void cs5535_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> 	cs5535_set_speed(drive, XFER_PIO_0 + pio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __devinit cs5535_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 cs5535_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	u8 bit;</div><div class='head'>diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c<br/>index bfae2f882f48..e6d8ee88d56d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/cy82c693.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/cy82c693.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/cy82c693.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/cy82c693.c</a></div><div class='hunk'>@@ -447,7 +447,7 @@ static struct pci_driver driver = {</div><div class='ctx'> 	.name		= "Cypress_IDE",</div><div class='ctx'> 	.id_table	= cy82c693_pci_tbl,</div><div class='ctx'> 	.probe		= cy82c693_init_one,</div><div class='del'>-	.remove		= cy82c693_remove,</div><div class='add'>+	.remove		= __devexit_p(cy82c693_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init cy82c693_ide_init(void)</div><div class='head'>diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c<br/>index 5271b246b88c..c37ab1743819 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/hpt366.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/hpt366.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/hpt366.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/hpt366.c</a></div><div class='hunk'>@@ -613,6 +613,14 @@ static int check_in_drive_list(ide_drive_t *drive, const char **list)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct hpt_info *hpt3xx_get_info(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ide_host *host	= dev_get_drvdata(dev);</div><div class='add'>+	struct hpt_info *info	= (struct hpt_info *)host-&gt;host_priv;</div><div class='add'>+</div><div class='add'>+	return dev == host-&gt;dev[1] ? info + 1 : info;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The Marvell bridge chips used on the HighPoint SATA cards do not seem</div><div class='ctx'>  * to support the UltraDMA modes 1, 2, and 3 as well as any MWDMA modes...</div><div class='hunk'>@@ -621,9 +629,7 @@ static int check_in_drive_list(ide_drive_t *drive, const char **list)</div><div class='ctx'> static u8 hpt3xx_udma_filter(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif	= HWIF(drive);</div><div class='del'>-	struct pci_dev *dev	= to_pci_dev(hwif-&gt;dev);</div><div class='del'>-	struct ide_host *host	= pci_get_drvdata(dev);</div><div class='del'>-	struct hpt_info *info	= host-&gt;host_priv + (hwif-&gt;dev == host-&gt;dev[1]);</div><div class='add'>+	struct hpt_info *info	= hpt3xx_get_info(hwif-&gt;dev);</div><div class='ctx'> 	u8 mask 		= hwif-&gt;ultra_mask;</div><div class='ctx'> </div><div class='ctx'> 	switch (info-&gt;chip_type) {</div><div class='hunk'>@@ -662,9 +668,7 @@ static u8 hpt3xx_udma_filter(ide_drive_t *drive)</div><div class='ctx'> static u8 hpt3xx_mdma_filter(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif	= HWIF(drive);</div><div class='del'>-	struct pci_dev *dev	= to_pci_dev(hwif-&gt;dev);</div><div class='del'>-	struct ide_host *host	= pci_get_drvdata(dev);</div><div class='del'>-	struct hpt_info *info	= host-&gt;host_priv + (hwif-&gt;dev == host-&gt;dev[1]);</div><div class='add'>+	struct hpt_info *info	= hpt3xx_get_info(hwif-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	switch (info-&gt;chip_type) {</div><div class='ctx'> 	case HPT372 :</div><div class='hunk'>@@ -700,8 +704,7 @@ static void hpt3xx_set_mode(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif	= drive-&gt;hwif;</div><div class='ctx'> 	struct pci_dev *dev	= to_pci_dev(hwif-&gt;dev);</div><div class='del'>-	struct ide_host *host	= pci_get_drvdata(dev);</div><div class='del'>-	struct hpt_info *info	= host-&gt;host_priv + (hwif-&gt;dev == host-&gt;dev[1]);</div><div class='add'>+	struct hpt_info *info	= hpt3xx_get_info(hwif-&gt;dev);</div><div class='ctx'> 	struct hpt_timings *t	= info-&gt;timings;</div><div class='ctx'> 	u8  itr_addr		= 0x40 + (drive-&gt;dn * 4);</div><div class='ctx'> 	u32 old_itr		= 0;</div><div class='hunk'>@@ -744,8 +747,7 @@ static void hpt3xx_maskproc(ide_drive_t *drive, int mask)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif	= HWIF(drive);</div><div class='ctx'> 	struct pci_dev	*dev	= to_pci_dev(hwif-&gt;dev);</div><div class='del'>-	struct ide_host *host	= pci_get_drvdata(dev);</div><div class='del'>-	struct hpt_info *info	= host-&gt;host_priv + (hwif-&gt;dev == host-&gt;dev[1]);</div><div class='add'>+	struct hpt_info *info	= hpt3xx_get_info(hwif-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (drive-&gt;quirk_list) {</div><div class='ctx'> 		if (info-&gt;chip_type &gt;= HPT370) {</div><div class='hunk'>@@ -973,8 +975,7 @@ static int __devinit hpt37x_calibrate_dpll(struct pci_dev *dev, u16 f_low, u16 f</div><div class='ctx'> static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long io_base	= pci_resource_start(dev, 4);</div><div class='del'>-	struct ide_host *host	= pci_get_drvdata(dev);</div><div class='del'>-	struct hpt_info *info	= host-&gt;host_priv + (&amp;dev-&gt;dev == host-&gt;dev[1]);</div><div class='add'>+	struct hpt_info *info	= hpt3xx_get_info(&amp;dev-&gt;dev);</div><div class='ctx'> 	const char *name	= DRV_NAME;</div><div class='ctx'> 	u8 pci_clk,  dpll_clk	= 0;	/* PCI and DPLL clock in MHz */</div><div class='ctx'> 	u8 chip_type;</div><div class='hunk'>@@ -1214,11 +1215,10 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev)</div><div class='ctx'> 	return dev-&gt;irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __devinit hpt3xx_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 hpt3xx_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev	*dev	= to_pci_dev(hwif-&gt;dev);</div><div class='del'>-	struct ide_host *host	= pci_get_drvdata(dev);</div><div class='del'>-	struct hpt_info *info	= host-&gt;host_priv + (hwif-&gt;dev == host-&gt;dev[1]);</div><div class='add'>+	struct hpt_info *info	= hpt3xx_get_info(hwif-&gt;dev);</div><div class='ctx'> 	u8 chip_type		= info-&gt;chip_type;</div><div class='ctx'> 	u8 scr1 = 0, ata66	= hwif-&gt;channel ? 0x01 : 0x02;</div><div class='ctx'> </div><div class='hunk'>@@ -1262,8 +1262,7 @@ static u8 __devinit hpt3xx_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev	= to_pci_dev(hwif-&gt;dev);</div><div class='del'>-	struct ide_host *host	= pci_get_drvdata(dev);</div><div class='del'>-	struct hpt_info *info	= host-&gt;host_priv + (hwif-&gt;dev == host-&gt;dev[1]);</div><div class='add'>+	struct hpt_info *info	= hpt3xx_get_info(hwif-&gt;dev);</div><div class='ctx'> 	int serialize		= HPT_SERIALIZE_IO;</div><div class='ctx'> 	u8  chip_type		= info-&gt;chip_type;</div><div class='ctx'> 	u8  new_mcr, old_mcr	= 0;</div><div class='hunk'>@@ -1620,7 +1619,7 @@ static struct pci_driver driver = {</div><div class='ctx'> 	.name		= "HPT366_IDE",</div><div class='ctx'> 	.id_table	= hpt366_pci_tbl,</div><div class='ctx'> 	.probe		= hpt366_init_one,</div><div class='del'>-	.remove		= hpt366_remove,</div><div class='add'>+	.remove		= __devexit_p(hpt366_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init hpt366_ide_init(void)</div><div class='head'>diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c<br/>index 6eba8f188264..652e47dd7e89 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/it8213.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/it8213.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/it8213.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/it8213.c</a></div><div class='hunk'>@@ -141,7 +141,7 @@ static void it8213_set_dma_mode(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __devinit it8213_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 it8213_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	u8 reg42h = 0;</div><div class='head'>diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c<br/>index e16a1d113a2a..4a1508a707cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/it821x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/it821x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/it821x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/it821x.c</a></div><div class='hunk'>@@ -428,7 +428,7 @@ static void it821x_set_dma_mode(ide_drive_t *drive, const u8 speed)</div><div class='ctx'>  *	the needed logic onboard.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static u8 __devinit it821x_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 it821x_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	/* The reference driver also only does disk side */</div><div class='ctx'> 	return ATA_CBL_PATA80;</div><div class='hunk'>@@ -443,7 +443,7 @@ static u8 __devinit it821x_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'>  *	final tuning that is needed, or fixups to work around bugs.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void __devinit it821x_quirkproc(ide_drive_t *drive)</div><div class='add'>+static void it821x_quirkproc(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	struct it821x_dev *itdev = ide_get_hwifdata(drive-&gt;hwif);</div><div class='ctx'> 	struct hd_driveid *id = drive-&gt;id;</div><div class='hunk'>@@ -686,7 +686,7 @@ static struct pci_driver driver = {</div><div class='ctx'> 	.name		= "ITE821x IDE",</div><div class='ctx'> 	.id_table	= it821x_pci_tbl,</div><div class='ctx'> 	.probe		= it821x_init_one,</div><div class='del'>-	.remove		= it821x_remove,</div><div class='add'>+	.remove		= __devexit_p(it821x_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init it821x_ide_init(void)</div><div class='head'>diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c<br/>index 545b6e172d9b..bb9d09d8f196 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/jmicron.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/jmicron.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/jmicron.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/jmicron.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@ typedef enum {</div><div class='ctx'>  *	Returns the cable type.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static u8 __devinit jmicron_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 jmicron_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c<br/>index 998615fa285f..d477da6b5858 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/pdc202xx_new.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/pdc202xx_new.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/pdc202xx_new.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/pdc202xx_new.c</a></div><div class='hunk'>@@ -193,7 +193,7 @@ static void pdcnew_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __devinit pdcnew_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 pdcnew_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	if (get_indexed_reg(hwif, 0x0b) &amp; 0x04)</div><div class='ctx'> 		return ATA_CBL_PATA40;</div><div class='hunk'>@@ -566,7 +566,7 @@ static struct pci_driver driver = {</div><div class='ctx'> 	.name		= "Promise_IDE",</div><div class='ctx'> 	.id_table	= pdc202new_pci_tbl,</div><div class='ctx'> 	.probe		= pdc202new_init_one,</div><div class='del'>-	.remove		= pdc202new_remove,</div><div class='add'>+	.remove		= __devexit_p(pdc202new_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init pdc202new_ide_init(void)</div><div class='head'>diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c<br/>index 6ff2def58da0..de9a27400462 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/pdc202xx_old.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/pdc202xx_old.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/pdc202xx_old.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/pdc202xx_old.c</a></div><div class='hunk'>@@ -117,7 +117,7 @@ static void pdc202xx_set_pio_mode(ide_drive_t *drive, const u8 pio)</div><div class='ctx'> 	pdc202xx_set_mode(drive, XFER_PIO_0 + pio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __devinit pdc2026x_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 pdc2026x_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	u16 CIS, mask = hwif-&gt;channel ? (1 &lt;&lt; 11) : (1 &lt;&lt; 10);</div><div class='head'>diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c<br/>index 7fc3022dcf68..30cfc815fe31 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/piix.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/piix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/piix.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/piix.c</a></div><div class='hunk'>@@ -256,7 +256,7 @@ static const struct ich_laptop ich_laptop[] = {</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u8 __devinit piix_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 piix_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	const struct ich_laptop *lap = &amp;ich_laptop[0];</div><div class='head'>diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c<br/>index 94a7ab864236..44cccd1e086a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/scc_pata.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/scc_pata.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/scc_pata.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/scc_pata.c</a></div><div class='hunk'>@@ -827,7 +827,7 @@ static void __devinit init_iops_scc(ide_hwif_t *hwif)</div><div class='ctx'> 	init_mmio_iops_scc(hwif);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __devinit scc_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 scc_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	return ATA_CBL_PATA80;</div><div class='ctx'> }</div><div class='hunk'>@@ -954,7 +954,7 @@ static struct pci_driver driver = {</div><div class='ctx'> 	.name = "SCC IDE",</div><div class='ctx'> 	.id_table = scc_pci_tbl,</div><div class='ctx'> 	.probe = scc_init_one,</div><div class='del'>-	.remove = scc_remove,</div><div class='add'>+	.remove = __devexit_p(scc_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int scc_ide_init(void)</div><div class='head'>diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c<br/>index d173f2937722..c3bdc6e51a48 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/serverworks.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/serverworks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/serverworks.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/serverworks.c</a></div><div class='hunk'>@@ -272,7 +272,7 @@ static unsigned int __devinit init_chipset_svwks(struct pci_dev *dev)</div><div class='ctx'> 	return dev-&gt;irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __devinit ata66_svwks_svwks(ide_hwif_t *hwif)</div><div class='add'>+static u8 ata66_svwks_svwks(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	return ATA_CBL_PATA80;</div><div class='ctx'> }</div><div class='hunk'>@@ -284,7 +284,7 @@ static u8 __devinit ata66_svwks_svwks(ide_hwif_t *hwif)</div><div class='ctx'>  * Bit 14 clear = primary IDE channel does not have 80-pin cable.</div><div class='ctx'>  * Bit 14 set   = primary IDE channel has 80-pin cable.</div><div class='ctx'>  */</div><div class='del'>-static u8 __devinit ata66_svwks_dell(ide_hwif_t *hwif)</div><div class='add'>+static u8 ata66_svwks_dell(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -303,7 +303,7 @@ static u8 __devinit ata66_svwks_dell(ide_hwif_t *hwif)</div><div class='ctx'>  *</div><div class='ctx'>  * WARNING: this only works on Alpine hardware!</div><div class='ctx'>  */</div><div class='del'>-static u8 __devinit ata66_svwks_cobalt(ide_hwif_t *hwif)</div><div class='add'>+static u8 ata66_svwks_cobalt(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -315,7 +315,7 @@ static u8 __devinit ata66_svwks_cobalt(ide_hwif_t *hwif)</div><div class='ctx'> 	return ATA_CBL_PATA40;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __devinit svwks_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 svwks_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c<br/>index 42eef19a18f1..681306c9d79b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/sgiioc4.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/sgiioc4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/sgiioc4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/sgiioc4.c</a></div><div class='hunk'>@@ -621,9 +621,9 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)</div><div class='ctx'> 	if (!request_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE,</div><div class='ctx'> 	    DRV_NAME)) {</div><div class='ctx'> 		printk(KERN_ERR</div><div class='del'>-			"%s : %s -- ERROR, Addresses "</div><div class='add'>+			"%s %s: -- ERROR, Addresses "</div><div class='ctx'> 			"0x%p to 0x%p ALREADY in use\n",</div><div class='del'>-		       __func__, DRV_NAME, (void *) cmd_phys_base,</div><div class='add'>+		       DRV_NAME, pci_name(dev), (void *)cmd_phys_base,</div><div class='ctx'> 		       (void *) cmd_phys_base + IOC4_CMD_CTL_BLK_SIZE);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c<br/>index b8ad9ad6cf0d..db2b88a369ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/siimage.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/siimage.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/siimage.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/siimage.c</a></div><div class='hunk'>@@ -639,7 +639,7 @@ static int is_dev_seagate_sata(ide_drive_t *drive)</div><div class='ctx'>  *	that can occur before we know what drives are present.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void __devinit sil_quirkproc(ide_drive_t *drive)</div><div class='add'>+static void sil_quirkproc(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif = drive-&gt;hwif;</div><div class='ctx'> </div><div class='hunk'>@@ -679,7 +679,7 @@ static void __devinit init_iops_siimage(ide_hwif_t *hwif)</div><div class='ctx'>  *	Check for the presence of an ATA66 capable cable on the interface.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static u8 __devinit sil_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 sil_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev	= to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	unsigned long addr	= siimage_selreg(hwif, 0);</div><div class='hunk'>@@ -832,7 +832,7 @@ static struct pci_driver driver = {</div><div class='ctx'> 	.name		= "SiI_IDE",</div><div class='ctx'> 	.id_table	= siimage_pci_tbl,</div><div class='ctx'> 	.probe		= siimage_init_one,</div><div class='del'>-	.remove		= siimage_remove,</div><div class='add'>+	.remove		= __devexit_p(siimage_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init siimage_ide_init(void)</div><div class='head'>diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c<br/>index cc95f90b53b7..5efe21d6ef97 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/sis5513.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/sis5513.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/sis5513.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/sis5513.c</a></div><div class='hunk'>@@ -518,7 +518,7 @@ static const struct sis_laptop sis_laptop[] = {</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u8 __devinit sis_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 sis_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	const struct sis_laptop *lap = &amp;sis_laptop[0];</div><div class='hunk'>@@ -610,7 +610,7 @@ static struct pci_driver driver = {</div><div class='ctx'> 	.name		= "SIS_IDE",</div><div class='ctx'> 	.id_table	= sis5513_pci_tbl,</div><div class='ctx'> 	.probe		= sis5513_init_one,</div><div class='del'>-	.remove		= sis5513_remove,</div><div class='add'>+	.remove		= __devexit_p(sis5513_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init sis5513_ide_init(void)</div><div class='head'>diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c<br/>index 13d1fa491f26..866d6c65e3a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/slc90e66.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/slc90e66.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/slc90e66.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/slc90e66.c</a></div><div class='hunk'>@@ -116,7 +116,7 @@ static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __devinit slc90e66_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 slc90e66_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	u8 reg47 = 0, mask = hwif-&gt;channel ? 0x01 : 0x02;</div><div class='head'>diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c<br/>index b1cb8a9ce5a9..927277c54ec9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/tc86c001.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/tc86c001.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/tc86c001.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/tc86c001.c</a></div><div class='hunk'>@@ -131,7 +131,7 @@ static void tc86c001_dma_start(ide_drive_t *drive)</div><div class='ctx'> 	ide_dma_start(drive);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __devinit tc86c001_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 tc86c001_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	unsigned long sc_base = pci_resource_start(dev, 5);</div><div class='hunk'>@@ -249,7 +249,7 @@ static struct pci_driver driver = {</div><div class='ctx'> 	.name		= "TC86C001",</div><div class='ctx'> 	.id_table	= tc86c001_pci_tbl,</div><div class='ctx'> 	.probe		= tc86c001_init_one,</div><div class='del'>-	.remove		= tc86c001_remove,</div><div class='add'>+	.remove		= __devexit_p(tc86c001_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init tc86c001_ide_init(void)</div><div class='head'>diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c<br/>index 454d2bf62dce..94fb9ab3223f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/via82cxxx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/pci/via82cxxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/via82cxxx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/pci/via82cxxx.c</a></div><div class='hunk'>@@ -352,7 +352,7 @@ static int via_cable_override(struct pci_dev *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __devinit via82cxxx_cable_detect(ide_hwif_t *hwif)</div><div class='add'>+static u8 via82cxxx_cable_detect(ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(hwif-&gt;dev);</div><div class='ctx'> 	struct ide_host *host = pci_get_drvdata(pdev);</div><div class='hunk'>@@ -491,7 +491,7 @@ static struct pci_driver driver = {</div><div class='ctx'> 	.name 		= "VIA_IDE",</div><div class='ctx'> 	.id_table 	= via_pci_tbl,</div><div class='ctx'> 	.probe 		= via_init_one,</div><div class='del'>-	.remove		= via_remove,</div><div class='add'>+	.remove		= __devexit_p(via_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init via_ide_init(void)</div><div class='head'>diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c<br/>index c521bf6e1bf2..fa2be26272d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ppc/pmac.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ide/ppc/pmac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ppc/pmac.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ide/ppc/pmac.c</a></div><div class='hunk'>@@ -1086,6 +1086,11 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif, hw_regs_t *hw)</div><div class='ctx'> 	/* Make sure we have sane timings */</div><div class='ctx'> 	sanitize_timings(pmif);</div><div class='ctx'> </div><div class='add'>+	host = ide_host_alloc(&amp;d, hws);</div><div class='add'>+	if (host == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	hwif = host-&gt;ports[0];</div><div class='add'>+</div><div class='ctx'> #ifndef CONFIG_PPC64</div><div class='ctx'> 	/* XXX FIXME: Media bay stuff need re-organizing */</div><div class='ctx'> 	if (np-&gt;parent &amp;&amp; np-&gt;parent-&gt;name</div><div class='hunk'>@@ -1119,11 +1124,11 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif, hw_regs_t *hw)</div><div class='ctx'> 			 pmif-&gt;mdev ? "macio" : "PCI", pmif-&gt;aapl_bus_id,</div><div class='ctx'> 			 pmif-&gt;mediabay ? " (mediabay)" : "", hw-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	rc = ide_host_add(&amp;d, hws, &amp;host);</div><div class='del'>-	if (rc)</div><div class='add'>+	rc = ide_host_register(host, &amp;d, hws);</div><div class='add'>+	if (rc) {</div><div class='add'>+		ide_host_free(host);</div><div class='ctx'> 		return rc;</div><div class='del'>-</div><div class='del'>-	hwif = host-&gt;ports[0];</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c<br/>index 994a21e5a0aa..16240a789650 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/nodemgr.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ieee1394/nodemgr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/nodemgr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ieee1394/nodemgr.c</a></div><div class='hunk'>@@ -844,7 +844,7 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, struct csr1212_csr</div><div class='ctx'> 	ne-&gt;host = host;</div><div class='ctx'> 	ne-&gt;nodeid = nodeid;</div><div class='ctx'> 	ne-&gt;generation = generation;</div><div class='del'>-	ne-&gt;needs_probe = 1;</div><div class='add'>+	ne-&gt;needs_probe = true;</div><div class='ctx'> </div><div class='ctx'> 	ne-&gt;guid = guid;</div><div class='ctx'> 	ne-&gt;guid_vendor_id = (guid &gt;&gt; 40) &amp; 0xffffff;</div><div class='hunk'>@@ -1144,7 +1144,7 @@ static void nodemgr_process_root_directory(struct host_info *hi, struct node_ent</div><div class='ctx'> 	struct csr1212_keyval *kv, *vendor_name_kv = NULL;</div><div class='ctx'> 	u8 last_key_id = 0;</div><div class='ctx'> </div><div class='del'>-	ne-&gt;needs_probe = 0;</div><div class='add'>+	ne-&gt;needs_probe = false;</div><div class='ctx'> </div><div class='ctx'> 	csr1212_for_each_dir_entry(ne-&gt;csr, kv, ne-&gt;csr-&gt;root_kv, dentry) {</div><div class='ctx'> 		switch (kv-&gt;key.id) {</div><div class='hunk'>@@ -1295,7 +1295,7 @@ static void nodemgr_update_node(struct node_entry *ne, struct csr1212_csr *csr,</div><div class='ctx'> 		nodemgr_update_bus_options(ne);</div><div class='ctx'> </div><div class='ctx'> 		/* Mark the node as new, so it gets re-probed */</div><div class='del'>-		ne-&gt;needs_probe = 1;</div><div class='add'>+		ne-&gt;needs_probe = true;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* old cache is valid, so update its generation */</div><div class='ctx'> 		struct nodemgr_csr_info *ci = ne-&gt;csr-&gt;private;</div><div class='hunk'>@@ -1566,57 +1566,60 @@ static void nodemgr_probe_ne(struct host_info *hi, struct node_entry *ne, int ge</div><div class='ctx'> struct probe_param {</div><div class='ctx'> 	struct host_info *hi;</div><div class='ctx'> 	int generation;</div><div class='add'>+	bool probe_now;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __nodemgr_node_probe(struct device *dev, void *data)</div><div class='add'>+static int node_probe(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct probe_param *param = (struct probe_param *)data;</div><div class='add'>+	struct probe_param *p = data;</div><div class='ctx'> 	struct node_entry *ne;</div><div class='ctx'> </div><div class='add'>+	if (p-&gt;generation != get_hpsb_generation(p-&gt;hi-&gt;host))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='ctx'> 	ne = container_of(dev, struct node_entry, node_dev);</div><div class='del'>-	if (!ne-&gt;needs_probe)</div><div class='del'>-		nodemgr_probe_ne(param-&gt;hi, ne, param-&gt;generation);</div><div class='del'>-	if (ne-&gt;needs_probe)</div><div class='del'>-		nodemgr_probe_ne(param-&gt;hi, ne, param-&gt;generation);</div><div class='add'>+	if (ne-&gt;needs_probe == p-&gt;probe_now)</div><div class='add'>+		nodemgr_probe_ne(p-&gt;hi, ne, p-&gt;generation);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nodemgr_node_probe(struct host_info *hi, int generation)</div><div class='ctx'> {</div><div class='del'>-	struct hpsb_host *host = hi-&gt;host;</div><div class='del'>-	struct probe_param param;</div><div class='add'>+	struct probe_param p;</div><div class='ctx'> </div><div class='del'>-	param.hi = hi;</div><div class='del'>-	param.generation = generation;</div><div class='del'>-	/* Do some processing of the nodes we've probed. This pulls them</div><div class='add'>+	p.hi = hi;</div><div class='add'>+	p.generation = generation;</div><div class='add'>+	/*</div><div class='add'>+	 * Do some processing of the nodes we've probed. This pulls them</div><div class='ctx'> 	 * into the sysfs layer if needed, and can result in processing of</div><div class='ctx'> 	 * unit-directories, or just updating the node and it's</div><div class='ctx'> 	 * unit-directories.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Run updates before probes. Usually, updates are time-critical</div><div class='del'>-	 * while probes are time-consuming. (Well, those probes need some</div><div class='del'>-	 * improvement...) */</div><div class='del'>-</div><div class='del'>-	class_for_each_device(&amp;nodemgr_ne_class, NULL, &amp;param,</div><div class='del'>-			      __nodemgr_node_probe);</div><div class='del'>-</div><div class='del'>-	/* If we had a bus reset while we were scanning the bus, it is</div><div class='del'>-	 * possible that we did not probe all nodes.  In that case, we</div><div class='del'>-	 * skip the clean up for now, since we could remove nodes that</div><div class='del'>-	 * were still on the bus.  Another bus scan is pending which will</div><div class='del'>-	 * do the clean up eventually.</div><div class='add'>+	 * while probes are time-consuming.</div><div class='ctx'> 	 *</div><div class='add'>+	 * Meanwhile, another bus reset may have happened. In this case we</div><div class='add'>+	 * skip everything here and let the next bus scan handle it.</div><div class='add'>+	 * Otherwise we may prematurely remove nodes which are still there.</div><div class='add'>+	 */</div><div class='add'>+	p.probe_now = false;</div><div class='add'>+	if (class_for_each_device(&amp;nodemgr_ne_class, NULL, &amp;p, node_probe) != 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	p.probe_now = true;</div><div class='add'>+	if (class_for_each_device(&amp;nodemgr_ne_class, NULL, &amp;p, node_probe) != 0)</div><div class='add'>+		return;</div><div class='add'>+	/*</div><div class='ctx'> 	 * Now let's tell the bus to rescan our devices. This may seem</div><div class='ctx'> 	 * like overhead, but the driver-model core will only scan a</div><div class='ctx'> 	 * device for a driver when either the device is added, or when a</div><div class='ctx'> 	 * new driver is added. A bus reset is a good reason to rescan</div><div class='ctx'> 	 * devices that were there before.  For example, an sbp2 device</div><div class='ctx'> 	 * may become available for login, if the host that held it was</div><div class='del'>-	 * just removed.  */</div><div class='del'>-</div><div class='del'>-	if (generation == get_hpsb_generation(host))</div><div class='del'>-		if (bus_rescan_devices(&amp;ieee1394_bus_type))</div><div class='del'>-			HPSB_DEBUG("bus_rescan_devices had an error");</div><div class='add'>+	 * just removed.</div><div class='add'>+	 */</div><div class='add'>+	if (bus_rescan_devices(&amp;ieee1394_bus_type) != 0)</div><div class='add'>+		HPSB_DEBUG("bus_rescan_devices had an error");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nodemgr_send_resume_packet(struct hpsb_host *host)</div><div class='head'>diff --git a/drivers/ieee1394/nodemgr.h b/drivers/ieee1394/nodemgr.h<br/>index 919e92e2a955..6eb26465a84c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/nodemgr.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ieee1394/nodemgr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/nodemgr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ieee1394/nodemgr.h</a></div><div class='hunk'>@@ -97,7 +97,7 @@ struct node_entry {</div><div class='ctx'> 	struct hpsb_host *host;		/* Host this node is attached to */</div><div class='ctx'> 	nodeid_t nodeid;		/* NodeID */</div><div class='ctx'> 	struct bus_options busopt;	/* Bus Options */</div><div class='del'>-	int needs_probe;</div><div class='add'>+	bool needs_probe;</div><div class='ctx'> 	unsigned int generation;	/* Synced with hpsb generation */</div><div class='ctx'> </div><div class='ctx'> 	/* The following is read from the config rom */</div><div class='head'>diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c<br/>index 9cbf3154d243..1d6ad3435537 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/sbp2.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/ieee1394/sbp2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/sbp2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/ieee1394/sbp2.c</a></div><div class='hunk'>@@ -731,15 +731,26 @@ static int sbp2_update(struct unit_directory *ud)</div><div class='ctx'> {</div><div class='ctx'> 	struct sbp2_lu *lu = ud-&gt;device.driver_data;</div><div class='ctx'> </div><div class='del'>-	if (sbp2_reconnect_device(lu)) {</div><div class='del'>-		/* Reconnect has failed. Perhaps we didn't reconnect fast</div><div class='del'>-		 * enough. Try a regular login, but first log out just in</div><div class='del'>-		 * case of any weirdness. */</div><div class='add'>+	if (sbp2_reconnect_device(lu) != 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * Reconnect failed.  If another bus reset happened,</div><div class='add'>+		 * let nodemgr proceed and call sbp2_update again later</div><div class='add'>+		 * (or sbp2_remove if this node went away).</div><div class='add'>+		 */</div><div class='add'>+		if (!hpsb_node_entry_valid(lu-&gt;ne))</div><div class='add'>+			return 0;</div><div class='add'>+		/*</div><div class='add'>+		 * Or the target rejected the reconnect because we weren't</div><div class='add'>+		 * fast enough.  Try a regular login, but first log out</div><div class='add'>+		 * just in case of any weirdness.</div><div class='add'>+		 */</div><div class='ctx'> 		sbp2_logout_device(lu);</div><div class='ctx'> </div><div class='del'>-		if (sbp2_login_device(lu)) {</div><div class='del'>-			/* Login failed too, just fail, and the backend</div><div class='del'>-			 * will call our sbp2_remove for us */</div><div class='add'>+		if (sbp2_login_device(lu) != 0) {</div><div class='add'>+			if (!hpsb_node_entry_valid(lu-&gt;ne))</div><div class='add'>+				return 0;</div><div class='add'>+</div><div class='add'>+			/* Maybe another initiator won the login. */</div><div class='ctx'> 			SBP2_ERR("Failed to reconnect to sbp2 device!");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c<br/>index e980ff3335db..d951896ff7fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/cma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/core/cma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/cma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/core/cma.c</a></div><div class='hunk'>@@ -155,9 +155,7 @@ struct cma_multicast {</div><div class='ctx'> 	} multicast;</div><div class='ctx'> 	struct list_head	list;</div><div class='ctx'> 	void			*context;</div><div class='del'>-	struct sockaddr		addr;</div><div class='del'>-	u8			pad[sizeof(struct sockaddr_in6) -</div><div class='del'>-				    sizeof(struct sockaddr)];</div><div class='add'>+	struct sockaddr_storage	addr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cma_work {</div><div class='hunk'>@@ -786,8 +784,8 @@ static void cma_cancel_operation(struct rdma_id_private *id_priv,</div><div class='ctx'> 		cma_cancel_route(id_priv);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CMA_LISTEN:</div><div class='del'>-		if (cma_any_addr(&amp;id_priv-&gt;id.route.addr.src_addr) &amp;&amp;</div><div class='del'>-		    !id_priv-&gt;cma_dev)</div><div class='add'>+		if (cma_any_addr((struct sockaddr *) &amp;id_priv-&gt;id.route.addr.src_addr)</div><div class='add'>+				&amp;&amp; !id_priv-&gt;cma_dev)</div><div class='ctx'> 			cma_cancel_listens(id_priv);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1026,7 +1024,7 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id,</div><div class='ctx'> 		rt-&gt;path_rec[1] = *ib_event-&gt;param.req_rcvd.alternate_path;</div><div class='ctx'> </div><div class='ctx'> 	ib_addr_set_dgid(&amp;rt-&gt;addr.dev_addr, &amp;rt-&gt;path_rec[0].dgid);</div><div class='del'>-	ret = rdma_translate_ip(&amp;id-&gt;route.addr.src_addr,</div><div class='add'>+	ret = rdma_translate_ip((struct sockaddr *) &amp;id-&gt;route.addr.src_addr,</div><div class='ctx'> 				&amp;id-&gt;route.addr.dev_addr);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto destroy_id;</div><div class='hunk'>@@ -1064,7 +1062,7 @@ static struct rdma_id_private *cma_new_udp_id(struct rdma_cm_id *listen_id,</div><div class='ctx'> 	cma_save_net_info(&amp;id-&gt;route.addr, &amp;listen_id-&gt;route.addr,</div><div class='ctx'> 			  ip_ver, port, src, dst);</div><div class='ctx'> </div><div class='del'>-	ret = rdma_translate_ip(&amp;id-&gt;route.addr.src_addr,</div><div class='add'>+	ret = rdma_translate_ip((struct sockaddr *) &amp;id-&gt;route.addr.src_addr,</div><div class='ctx'> 				&amp;id-&gt;route.addr.dev_addr);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -1377,7 +1375,7 @@ static int cma_ib_listen(struct rdma_id_private *id_priv)</div><div class='ctx'> 	if (IS_ERR(id_priv-&gt;cm_id.ib))</div><div class='ctx'> 		return PTR_ERR(id_priv-&gt;cm_id.ib);</div><div class='ctx'> </div><div class='del'>-	addr = &amp;id_priv-&gt;id.route.addr.src_addr;</div><div class='add'>+	addr = (struct sockaddr *) &amp;id_priv-&gt;id.route.addr.src_addr;</div><div class='ctx'> 	svc_id = cma_get_service_id(id_priv-&gt;id.ps, addr);</div><div class='ctx'> 	if (cma_any_addr(addr))</div><div class='ctx'> 		ret = ib_cm_listen(id_priv-&gt;cm_id.ib, svc_id, 0, NULL);</div><div class='hunk'>@@ -1443,7 +1441,7 @@ static void cma_listen_on_dev(struct rdma_id_private *id_priv,</div><div class='ctx'> </div><div class='ctx'> 	dev_id_priv-&gt;state = CMA_ADDR_BOUND;</div><div class='ctx'> 	memcpy(&amp;id-&gt;route.addr.src_addr, &amp;id_priv-&gt;id.route.addr.src_addr,</div><div class='del'>-	       ip_addr_size(&amp;id_priv-&gt;id.route.addr.src_addr));</div><div class='add'>+	       ip_addr_size((struct sockaddr *) &amp;id_priv-&gt;id.route.addr.src_addr));</div><div class='ctx'> </div><div class='ctx'> 	cma_attach_to_dev(dev_id_priv, cma_dev);</div><div class='ctx'> 	list_add_tail(&amp;dev_id_priv-&gt;listen_list, &amp;id_priv-&gt;listen_list);</div><div class='hunk'>@@ -1563,13 +1561,14 @@ static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms,</div><div class='ctx'> 	path_rec.pkey = cpu_to_be16(ib_addr_get_pkey(&amp;addr-&gt;dev_addr));</div><div class='ctx'> 	path_rec.numb_path = 1;</div><div class='ctx'> 	path_rec.reversible = 1;</div><div class='del'>-	path_rec.service_id = cma_get_service_id(id_priv-&gt;id.ps, &amp;addr-&gt;dst_addr);</div><div class='add'>+	path_rec.service_id = cma_get_service_id(id_priv-&gt;id.ps,</div><div class='add'>+							(struct sockaddr *) &amp;addr-&gt;dst_addr);</div><div class='ctx'> </div><div class='ctx'> 	comp_mask = IB_SA_PATH_REC_DGID | IB_SA_PATH_REC_SGID |</div><div class='ctx'> 		    IB_SA_PATH_REC_PKEY | IB_SA_PATH_REC_NUMB_PATH |</div><div class='ctx'> 		    IB_SA_PATH_REC_REVERSIBLE | IB_SA_PATH_REC_SERVICE_ID;</div><div class='ctx'> </div><div class='del'>-	if (addr-&gt;src_addr.sa_family == AF_INET) {</div><div class='add'>+	if (addr-&gt;src_addr.ss_family == AF_INET) {</div><div class='ctx'> 		path_rec.qos_class = cpu_to_be16((u16) id_priv-&gt;tos);</div><div class='ctx'> 		comp_mask |= IB_SA_PATH_REC_QOS_CLASS;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1848,7 +1847,7 @@ static int cma_resolve_loopback(struct rdma_id_private *id_priv)</div><div class='ctx'> 	ib_addr_get_sgid(&amp;id_priv-&gt;id.route.addr.dev_addr, &amp;gid);</div><div class='ctx'> 	ib_addr_set_dgid(&amp;id_priv-&gt;id.route.addr.dev_addr, &amp;gid);</div><div class='ctx'> </div><div class='del'>-	if (cma_zero_addr(&amp;id_priv-&gt;id.route.addr.src_addr)) {</div><div class='add'>+	if (cma_zero_addr((struct sockaddr *) &amp;id_priv-&gt;id.route.addr.src_addr)) {</div><div class='ctx'> 		src_in = (struct sockaddr_in *)&amp;id_priv-&gt;id.route.addr.src_addr;</div><div class='ctx'> 		dst_in = (struct sockaddr_in *)&amp;id_priv-&gt;id.route.addr.dst_addr;</div><div class='ctx'> 		src_in-&gt;sin_family = dst_in-&gt;sin_family;</div><div class='hunk'>@@ -1897,7 +1896,7 @@ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,</div><div class='ctx'> 	if (cma_any_addr(dst_addr))</div><div class='ctx'> 		ret = cma_resolve_loopback(id_priv);</div><div class='ctx'> 	else</div><div class='del'>-		ret = rdma_resolve_ip(&amp;addr_client, &amp;id-&gt;route.addr.src_addr,</div><div class='add'>+		ret = rdma_resolve_ip(&amp;addr_client, (struct sockaddr *) &amp;id-&gt;route.addr.src_addr,</div><div class='ctx'> 				      dst_addr, &amp;id-&gt;route.addr.dev_addr,</div><div class='ctx'> 				      timeout_ms, addr_handler, id_priv);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -2021,11 +2020,11 @@ static int cma_use_port(struct idr *ps, struct rdma_id_private *id_priv)</div><div class='ctx'> 	 * We don't support binding to any address if anyone is bound to</div><div class='ctx'> 	 * a specific address on the same port.</div><div class='ctx'> 	 */</div><div class='del'>-	if (cma_any_addr(&amp;id_priv-&gt;id.route.addr.src_addr))</div><div class='add'>+	if (cma_any_addr((struct sockaddr *) &amp;id_priv-&gt;id.route.addr.src_addr))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry(cur_id, node, &amp;bind_list-&gt;owners, node) {</div><div class='del'>-		if (cma_any_addr(&amp;cur_id-&gt;id.route.addr.src_addr))</div><div class='add'>+		if (cma_any_addr((struct sockaddr *) &amp;cur_id-&gt;id.route.addr.src_addr))</div><div class='ctx'> 			return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='ctx'> 		cur_sin = (struct sockaddr_in *) &amp;cur_id-&gt;id.route.addr.src_addr;</div><div class='hunk'>@@ -2060,7 +2059,7 @@ static int cma_get_port(struct rdma_id_private *id_priv)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;lock);</div><div class='del'>-	if (cma_any_port(&amp;id_priv-&gt;id.route.addr.src_addr))</div><div class='add'>+	if (cma_any_port((struct sockaddr *) &amp;id_priv-&gt;id.route.addr.src_addr))</div><div class='ctx'> 		ret = cma_alloc_any_port(ps, id_priv);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = cma_use_port(ps, id_priv);</div><div class='hunk'>@@ -2232,7 +2231,7 @@ static int cma_resolve_ib_udp(struct rdma_id_private *id_priv,</div><div class='ctx'> </div><div class='ctx'> 	req.path = route-&gt;path_rec;</div><div class='ctx'> 	req.service_id = cma_get_service_id(id_priv-&gt;id.ps,</div><div class='del'>-					    &amp;route-&gt;addr.dst_addr);</div><div class='add'>+					    (struct sockaddr *) &amp;route-&gt;addr.dst_addr);</div><div class='ctx'> 	req.timeout_ms = 1 &lt;&lt; (CMA_CM_RESPONSE_TIMEOUT - 8);</div><div class='ctx'> 	req.max_cm_retries = CMA_MAX_CM_RETRIES;</div><div class='ctx'> </div><div class='hunk'>@@ -2283,7 +2282,7 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,</div><div class='ctx'> 		req.alternate_path = &amp;route-&gt;path_rec[1];</div><div class='ctx'> </div><div class='ctx'> 	req.service_id = cma_get_service_id(id_priv-&gt;id.ps,</div><div class='del'>-					    &amp;route-&gt;addr.dst_addr);</div><div class='add'>+					    (struct sockaddr *) &amp;route-&gt;addr.dst_addr);</div><div class='ctx'> 	req.qp_num = id_priv-&gt;qp_num;</div><div class='ctx'> 	req.qp_type = IB_QPT_RC;</div><div class='ctx'> 	req.starting_psn = id_priv-&gt;seq_num;</div><div class='hunk'>@@ -2667,7 +2666,7 @@ static int cma_join_ib_multicast(struct rdma_id_private *id_priv,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	cma_set_mgid(id_priv, &amp;mc-&gt;addr, &amp;rec.mgid);</div><div class='add'>+	cma_set_mgid(id_priv, (struct sockaddr *) &amp;mc-&gt;addr, &amp;rec.mgid);</div><div class='ctx'> 	if (id_priv-&gt;id.ps == RDMA_PS_UDP)</div><div class='ctx'> 		rec.qkey = cpu_to_be32(RDMA_UDP_QKEY);</div><div class='ctx'> 	ib_addr_get_sgid(dev_addr, &amp;rec.port_gid);</div><div class='head'>diff --git a/drivers/infiniband/core/mad_rmpp.c b/drivers/infiniband/core/mad_rmpp.c<br/>index d0ef7d61c037..3af2b84cd838 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/mad_rmpp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/core/mad_rmpp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/mad_rmpp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/core/mad_rmpp.c</a></div><div class='hunk'>@@ -133,7 +133,7 @@ static void ack_recv(struct mad_rmpp_recv *rmpp_recv,</div><div class='ctx'> 	msg = ib_create_send_mad(&amp;rmpp_recv-&gt;agent-&gt;agent, recv_wc-&gt;wc-&gt;src_qp,</div><div class='ctx'> 				 recv_wc-&gt;wc-&gt;pkey_index, 1, hdr_len,</div><div class='ctx'> 				 0, GFP_KERNEL);</div><div class='del'>-	if (!msg)</div><div class='add'>+	if (IS_ERR(msg))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	format_ack(msg, (struct ib_rmpp_mad *) recv_wc-&gt;recv_buf.mad, rmpp_recv);</div><div class='head'>diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c<br/>index b41dd26bbfa1..3ddacf39b7ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/ucma.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/core/ucma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/ucma.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/core/ucma.c</a></div><div class='hunk'>@@ -81,9 +81,7 @@ struct ucma_multicast {</div><div class='ctx'> </div><div class='ctx'> 	u64			uid;</div><div class='ctx'> 	struct list_head	list;</div><div class='del'>-	struct sockaddr		addr;</div><div class='del'>-	u8			pad[sizeof(struct sockaddr_in6) -</div><div class='del'>-				    sizeof(struct sockaddr)];</div><div class='add'>+	struct sockaddr_storage	addr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ucma_event {</div><div class='hunk'>@@ -603,11 +601,11 @@ static ssize_t ucma_query_route(struct ucma_file *file,</div><div class='ctx'> 		return PTR_ERR(ctx);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;resp, 0, sizeof resp);</div><div class='del'>-	addr = &amp;ctx-&gt;cm_id-&gt;route.addr.src_addr;</div><div class='add'>+	addr = (struct sockaddr *) &amp;ctx-&gt;cm_id-&gt;route.addr.src_addr;</div><div class='ctx'> 	memcpy(&amp;resp.src_addr, addr, addr-&gt;sa_family == AF_INET ?</div><div class='ctx'> 				     sizeof(struct sockaddr_in) :</div><div class='ctx'> 				     sizeof(struct sockaddr_in6));</div><div class='del'>-	addr = &amp;ctx-&gt;cm_id-&gt;route.addr.dst_addr;</div><div class='add'>+	addr = (struct sockaddr *) &amp;ctx-&gt;cm_id-&gt;route.addr.dst_addr;</div><div class='ctx'> 	memcpy(&amp;resp.dst_addr, addr, addr-&gt;sa_family == AF_INET ?</div><div class='ctx'> 				     sizeof(struct sockaddr_in) :</div><div class='ctx'> 				     sizeof(struct sockaddr_in6));</div><div class='hunk'>@@ -913,7 +911,7 @@ static ssize_t ucma_join_multicast(struct ucma_file *file,</div><div class='ctx'> </div><div class='ctx'> 	mc-&gt;uid = cmd.uid;</div><div class='ctx'> 	memcpy(&amp;mc-&gt;addr, &amp;cmd.addr, sizeof cmd.addr);</div><div class='del'>-	ret = rdma_join_multicast(ctx-&gt;cm_id, &amp;mc-&gt;addr, mc);</div><div class='add'>+	ret = rdma_join_multicast(ctx-&gt;cm_id, (struct sockaddr *) &amp;mc-&gt;addr, mc);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err2;</div><div class='ctx'> </div><div class='hunk'>@@ -929,7 +927,7 @@ static ssize_t ucma_join_multicast(struct ucma_file *file,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err3:</div><div class='del'>-	rdma_leave_multicast(ctx-&gt;cm_id, &amp;mc-&gt;addr);</div><div class='add'>+	rdma_leave_multicast(ctx-&gt;cm_id, (struct sockaddr *) &amp;mc-&gt;addr);</div><div class='ctx'> 	ucma_cleanup_mc_events(mc);</div><div class='ctx'> err2:</div><div class='ctx'> 	mutex_lock(&amp;mut);</div><div class='hunk'>@@ -975,7 +973,7 @@ static ssize_t ucma_leave_multicast(struct ucma_file *file,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rdma_leave_multicast(mc-&gt;ctx-&gt;cm_id, &amp;mc-&gt;addr);</div><div class='add'>+	rdma_leave_multicast(mc-&gt;ctx-&gt;cm_id, (struct sockaddr *) &amp;mc-&gt;addr);</div><div class='ctx'> 	mutex_lock(&amp;mc-&gt;ctx-&gt;file-&gt;mut);</div><div class='ctx'> 	ucma_cleanup_mc_events(mc);</div><div class='ctx'> 	list_del(&amp;mc-&gt;list);</div><div class='head'>diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c<br/>index f6d5747153a5..4dcf08b3fd83 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/cxgb3/cxio_hal.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/cxgb3/cxio_hal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/cxgb3/cxio_hal.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/cxgb3/cxio_hal.c</a></div><div class='hunk'>@@ -725,9 +725,9 @@ static int __cxio_tpt_op(struct cxio_rdev *rdev_p, u32 reset_tpt_entry,</div><div class='ctx'> 				V_TPT_STAG_TYPE(type) | V_TPT_PDID(pdid));</div><div class='ctx'> 		BUG_ON(page_size &gt;= 28);</div><div class='ctx'> 		tpt.flags_pagesize_qpid = cpu_to_be32(V_TPT_PERM(perm) |</div><div class='del'>-				F_TPT_MW_BIND_ENABLE |</div><div class='del'>-				V_TPT_ADDR_TYPE((zbva ? TPT_ZBTO : TPT_VATO)) |</div><div class='del'>-				V_TPT_PAGE_SIZE(page_size));</div><div class='add'>+			((perm &amp; TPT_MW_BIND) ? F_TPT_MW_BIND_ENABLE : 0) |</div><div class='add'>+			V_TPT_ADDR_TYPE((zbva ? TPT_ZBTO : TPT_VATO)) |</div><div class='add'>+			V_TPT_PAGE_SIZE(page_size));</div><div class='ctx'> 		tpt.rsvd_pbl_addr = reset_tpt_entry ? 0 :</div><div class='ctx'> 				    cpu_to_be32(V_TPT_PBL_ADDR(PBL_OFF(rdev_p, pbl_addr)&gt;&gt;3));</div><div class='ctx'> 		tpt.len = cpu_to_be32(len);</div><div class='head'>diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c<br/>index b89640aa6e10..eb778bfd6f66 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/cxgb3/iwch_provider.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/cxgb3/iwch_provider.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/cxgb3/iwch_provider.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/cxgb3/iwch_provider.c</a></div><div class='hunk'>@@ -1187,28 +1187,6 @@ static ssize_t show_rev(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", iwch_dev-&gt;rdev.t3cdev_p-&gt;type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fw_supports_fastreg(struct iwch_dev *iwch_dev)</div><div class='del'>-{</div><div class='del'>-	struct ethtool_drvinfo info;</div><div class='del'>-	struct net_device *lldev = iwch_dev-&gt;rdev.t3cdev_p-&gt;lldev;</div><div class='del'>-	char *cp, *next;</div><div class='del'>-	unsigned fw_maj, fw_min;</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	lldev-&gt;ethtool_ops-&gt;get_drvinfo(lldev, &amp;info);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-</div><div class='del'>-	next = info.fw_version+1;</div><div class='del'>-	cp = strsep(&amp;next, ".");</div><div class='del'>-	sscanf(cp, "%i", &amp;fw_maj);</div><div class='del'>-	cp = strsep(&amp;next, ".");</div><div class='del'>-	sscanf(cp, "%i", &amp;fw_min);</div><div class='del'>-</div><div class='del'>-	PDBG("%s maj %u min %u\n", __func__, fw_maj, fw_min);</div><div class='del'>-</div><div class='del'>-	return fw_maj &gt; 6 || (fw_maj == 6 &amp;&amp; fw_min &gt; 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t show_fw_ver(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwch_dev *iwch_dev = container_of(dev, struct iwch_dev,</div><div class='hunk'>@@ -1325,12 +1303,12 @@ int iwch_register_device(struct iwch_dev *dev)</div><div class='ctx'> 	memset(&amp;dev-&gt;ibdev.node_guid, 0, sizeof(dev-&gt;ibdev.node_guid));</div><div class='ctx'> 	memcpy(&amp;dev-&gt;ibdev.node_guid, dev-&gt;rdev.t3cdev_p-&gt;lldev-&gt;dev_addr, 6);</div><div class='ctx'> 	dev-&gt;ibdev.owner = THIS_MODULE;</div><div class='del'>-	dev-&gt;device_cap_flags = IB_DEVICE_LOCAL_DMA_LKEY | IB_DEVICE_MEM_WINDOW;</div><div class='add'>+	dev-&gt;device_cap_flags = IB_DEVICE_LOCAL_DMA_LKEY |</div><div class='add'>+				IB_DEVICE_MEM_WINDOW |</div><div class='add'>+				IB_DEVICE_MEM_MGT_EXTENSIONS;</div><div class='ctx'> </div><div class='ctx'> 	/* cxgb3 supports STag 0. */</div><div class='ctx'> 	dev-&gt;ibdev.local_dma_lkey = 0;</div><div class='del'>-	if (fw_supports_fastreg(dev))</div><div class='del'>-		dev-&gt;device_cap_flags |= IB_DEVICE_MEM_MGT_EXTENSIONS;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;ibdev.uverbs_cmd_mask =</div><div class='ctx'> 	    (1ull &lt;&lt; IB_USER_VERBS_CMD_GET_CONTEXT) |</div><div class='head'>diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.h b/drivers/infiniband/hw/cxgb3/iwch_provider.h<br/>index f5ceca05c435..a237d49bdcc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/cxgb3/iwch_provider.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/cxgb3/iwch_provider.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/cxgb3/iwch_provider.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/cxgb3/iwch_provider.h</a></div><div class='hunk'>@@ -293,9 +293,16 @@ static inline u32 iwch_ib_to_tpt_access(int acc)</div><div class='ctx'> 	return (acc &amp; IB_ACCESS_REMOTE_WRITE ? TPT_REMOTE_WRITE : 0) |</div><div class='ctx'> 	       (acc &amp; IB_ACCESS_REMOTE_READ ? TPT_REMOTE_READ : 0) |</div><div class='ctx'> 	       (acc &amp; IB_ACCESS_LOCAL_WRITE ? TPT_LOCAL_WRITE : 0) |</div><div class='add'>+	       (acc &amp; IB_ACCESS_MW_BIND ? TPT_MW_BIND : 0) |</div><div class='ctx'> 	       TPT_LOCAL_READ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u32 iwch_ib_to_tpt_bind_access(int acc)</div><div class='add'>+{</div><div class='add'>+	return (acc &amp; IB_ACCESS_REMOTE_WRITE ? TPT_REMOTE_WRITE : 0) |</div><div class='add'>+	       (acc &amp; IB_ACCESS_REMOTE_READ ? TPT_REMOTE_READ : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> enum iwch_mmid_state {</div><div class='ctx'> 	IWCH_STAG_STATE_VALID,</div><div class='ctx'> 	IWCH_STAG_STATE_INVALID</div><div class='head'>diff --git a/drivers/infiniband/hw/cxgb3/iwch_qp.c b/drivers/infiniband/hw/cxgb3/iwch_qp.c<br/>index 9a3be3a9d5dc..3e4585c2318a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/cxgb3/iwch_qp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/cxgb3/iwch_qp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/cxgb3/iwch_qp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/cxgb3/iwch_qp.c</a></div><div class='hunk'>@@ -565,7 +565,7 @@ int iwch_bind_mw(struct ib_qp *qp,</div><div class='ctx'> 	wqe-&gt;bind.type = TPT_VATO;</div><div class='ctx'> </div><div class='ctx'> 	/* TBD: check perms */</div><div class='del'>-	wqe-&gt;bind.perms = iwch_ib_to_tpt_access(mw_bind-&gt;mw_access_flags);</div><div class='add'>+	wqe-&gt;bind.perms = iwch_ib_to_tpt_bind_access(mw_bind-&gt;mw_access_flags);</div><div class='ctx'> 	wqe-&gt;bind.mr_stag = cpu_to_be32(mw_bind-&gt;mr-&gt;lkey);</div><div class='ctx'> 	wqe-&gt;bind.mw_stag = cpu_to_be32(mw-&gt;rkey);</div><div class='ctx'> 	wqe-&gt;bind.mw_len = cpu_to_be32(mw_bind-&gt;length);</div><div class='hunk'>@@ -879,20 +879,13 @@ static int rdma_init(struct iwch_dev *rhp, struct iwch_qp *qhp,</div><div class='ctx'> 		(qhp-&gt;attr.mpa_attr.xmit_marker_enabled &lt;&lt; 1) |</div><div class='ctx'> 		(qhp-&gt;attr.mpa_attr.crc_enabled &lt;&lt; 2);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * XXX - The IWCM doesn't quite handle getting these</div><div class='del'>-	 * attrs set before going into RTS.  For now, just turn</div><div class='del'>-	 * them on always...</div><div class='del'>-	 */</div><div class='del'>-#if 0</div><div class='del'>-	init_attr.qpcaps = qhp-&gt;attr.enableRdmaRead |</div><div class='del'>-		(qhp-&gt;attr.enableRdmaWrite &lt;&lt; 1) |</div><div class='del'>-		(qhp-&gt;attr.enableBind &lt;&lt; 2) |</div><div class='del'>-		(qhp-&gt;attr.enable_stag0_fastreg &lt;&lt; 3) |</div><div class='del'>-		(qhp-&gt;attr.enable_stag0_fastreg &lt;&lt; 4);</div><div class='del'>-#else</div><div class='del'>-	init_attr.qpcaps = 0x1f;</div><div class='del'>-#endif</div><div class='add'>+	init_attr.qpcaps = uP_RI_QP_RDMA_READ_ENABLE |</div><div class='add'>+			   uP_RI_QP_RDMA_WRITE_ENABLE |</div><div class='add'>+			   uP_RI_QP_BIND_ENABLE;</div><div class='add'>+	if (!qhp-&gt;ibqp.uobject)</div><div class='add'>+		init_attr.qpcaps |= uP_RI_QP_STAG0_ENABLE |</div><div class='add'>+				    uP_RI_QP_FAST_REGISTER_ENABLE;</div><div class='add'>+</div><div class='ctx'> 	init_attr.tcp_emss = qhp-&gt;ep-&gt;emss;</div><div class='ctx'> 	init_attr.ord = qhp-&gt;attr.max_ord;</div><div class='ctx'> 	init_attr.ird = qhp-&gt;attr.max_ird;</div><div class='hunk'>@@ -900,8 +893,6 @@ static int rdma_init(struct iwch_dev *rhp, struct iwch_qp *qhp,</div><div class='ctx'> 	init_attr.qp_dma_size = (1UL &lt;&lt; qhp-&gt;wq.size_log2);</div><div class='ctx'> 	init_attr.rqe_count = iwch_rqes_posted(qhp);</div><div class='ctx'> 	init_attr.flags = qhp-&gt;attr.mpa_attr.initiator ? MPA_INITIATOR : 0;</div><div class='del'>-	if (!qhp-&gt;ibqp.uobject)</div><div class='del'>-		init_attr.flags |= PRIV_QP;</div><div class='ctx'> 	if (peer2peer) {</div><div class='ctx'> 		init_attr.rtr_type = RTR_READ;</div><div class='ctx'> 		if (init_attr.ord == 0 &amp;&amp; qhp-&gt;attr.mpa_attr.initiator)</div><div class='head'>diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h b/drivers/infiniband/hw/ehca/ehca_classes.h<br/>index 0b0618edd645..1ab919f836a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ehca/ehca_classes.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/ehca/ehca_classes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ehca/ehca_classes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ehca/ehca_classes.h</a></div><div class='hunk'>@@ -156,6 +156,14 @@ struct ehca_mod_qp_parm {</div><div class='ctx'> </div><div class='ctx'> #define EHCA_MOD_QP_PARM_MAX 4</div><div class='ctx'> </div><div class='add'>+#define QMAP_IDX_MASK 0xFFFFULL</div><div class='add'>+</div><div class='add'>+/* struct for tracking if cqes have been reported to the application */</div><div class='add'>+struct ehca_qmap_entry {</div><div class='add'>+	u16 app_wr_id;</div><div class='add'>+	u16 reported;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ehca_qp {</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct ib_qp ib_qp;</div><div class='hunk'>@@ -165,6 +173,7 @@ struct ehca_qp {</div><div class='ctx'> 	enum ehca_ext_qp_type ext_type;</div><div class='ctx'> 	enum ib_qp_state state;</div><div class='ctx'> 	struct ipz_queue ipz_squeue;</div><div class='add'>+	struct ehca_qmap_entry *sq_map;</div><div class='ctx'> 	struct ipz_queue ipz_rqueue;</div><div class='ctx'> 	struct h_galpas galpas;</div><div class='ctx'> 	u32 qkey;</div><div class='head'>diff --git a/drivers/infiniband/hw/ehca/ehca_qes.h b/drivers/infiniband/hw/ehca/ehca_qes.h<br/>index 818803057ebf..5d28e3e98a20 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ehca/ehca_qes.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/ehca/ehca_qes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ehca/ehca_qes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ehca/ehca_qes.h</a></div><div class='hunk'>@@ -213,6 +213,7 @@ struct ehca_wqe {</div><div class='ctx'> #define WC_STATUS_ERROR_BIT 0x80000000</div><div class='ctx'> #define WC_STATUS_REMOTE_ERROR_FLAGS 0x0000F800</div><div class='ctx'> #define WC_STATUS_PURGE_BIT 0x10</div><div class='add'>+#define WC_SEND_RECEIVE_BIT 0x80</div><div class='ctx'> </div><div class='ctx'> struct ehca_cqe {</div><div class='ctx'> 	u64 work_request_id;</div><div class='head'>diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c<br/>index ea13efddf175..b6bcee036734 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ehca/ehca_qp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/ehca/ehca_qp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ehca/ehca_qp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ehca/ehca_qp.c</a></div><div class='hunk'>@@ -412,6 +412,7 @@ static struct ehca_qp *internal_create_qp(</div><div class='ctx'> 	struct ehca_shca *shca = container_of(pd-&gt;device, struct ehca_shca,</div><div class='ctx'> 					      ib_device);</div><div class='ctx'> 	struct ib_ucontext *context = NULL;</div><div class='add'>+	u32 nr_qes;</div><div class='ctx'> 	u64 h_ret;</div><div class='ctx'> 	int is_llqp = 0, has_srq = 0;</div><div class='ctx'> 	int qp_type, max_send_sge, max_recv_sge, ret;</div><div class='hunk'>@@ -715,6 +716,15 @@ static struct ehca_qp *internal_create_qp(</div><div class='ctx'> 				 "and pages ret=%i", ret);</div><div class='ctx'> 			goto create_qp_exit2;</div><div class='ctx'> 		}</div><div class='add'>+		nr_qes = my_qp-&gt;ipz_squeue.queue_length /</div><div class='add'>+			 my_qp-&gt;ipz_squeue.qe_size;</div><div class='add'>+		my_qp-&gt;sq_map = vmalloc(nr_qes *</div><div class='add'>+					sizeof(struct ehca_qmap_entry));</div><div class='add'>+		if (!my_qp-&gt;sq_map) {</div><div class='add'>+			ehca_err(pd-&gt;device, "Couldn't allocate squeue "</div><div class='add'>+				 "map ret=%i", ret);</div><div class='add'>+			goto create_qp_exit3;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (HAS_RQ(my_qp)) {</div><div class='hunk'>@@ -724,7 +734,7 @@ static struct ehca_qp *internal_create_qp(</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ehca_err(pd-&gt;device, "Couldn't initialize rqueue "</div><div class='ctx'> 				 "and pages ret=%i", ret);</div><div class='del'>-			goto create_qp_exit3;</div><div class='add'>+			goto create_qp_exit4;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -770,7 +780,7 @@ static struct ehca_qp *internal_create_qp(</div><div class='ctx'> 			if (!my_qp-&gt;mod_qp_parm) {</div><div class='ctx'> 				ehca_err(pd-&gt;device,</div><div class='ctx'> 					 "Could not alloc mod_qp_parm");</div><div class='del'>-				goto create_qp_exit4;</div><div class='add'>+				goto create_qp_exit5;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -780,7 +790,7 @@ static struct ehca_qp *internal_create_qp(</div><div class='ctx'> 		h_ret = ehca_define_sqp(shca, my_qp, init_attr);</div><div class='ctx'> 		if (h_ret != H_SUCCESS) {</div><div class='ctx'> 			ret = ehca2ib_return_code(h_ret);</div><div class='del'>-			goto create_qp_exit5;</div><div class='add'>+			goto create_qp_exit6;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -789,7 +799,7 @@ static struct ehca_qp *internal_create_qp(</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ehca_err(pd-&gt;device,</div><div class='ctx'> 				 "Couldn't assign qp to send_cq ret=%i", ret);</div><div class='del'>-			goto create_qp_exit5;</div><div class='add'>+			goto create_qp_exit6;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -815,22 +825,26 @@ static struct ehca_qp *internal_create_qp(</div><div class='ctx'> 		if (ib_copy_to_udata(udata, &amp;resp, sizeof resp)) {</div><div class='ctx'> 			ehca_err(pd-&gt;device, "Copy to udata failed");</div><div class='ctx'> 			ret = -EINVAL;</div><div class='del'>-			goto create_qp_exit6;</div><div class='add'>+			goto create_qp_exit7;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return my_qp;</div><div class='ctx'> </div><div class='del'>-create_qp_exit6:</div><div class='add'>+create_qp_exit7:</div><div class='ctx'> 	ehca_cq_unassign_qp(my_qp-&gt;send_cq, my_qp-&gt;real_qp_num);</div><div class='ctx'> </div><div class='del'>-create_qp_exit5:</div><div class='add'>+create_qp_exit6:</div><div class='ctx'> 	kfree(my_qp-&gt;mod_qp_parm);</div><div class='ctx'> </div><div class='del'>-create_qp_exit4:</div><div class='add'>+create_qp_exit5:</div><div class='ctx'> 	if (HAS_RQ(my_qp))</div><div class='ctx'> 		ipz_queue_dtor(my_pd, &amp;my_qp-&gt;ipz_rqueue);</div><div class='ctx'> </div><div class='add'>+create_qp_exit4:</div><div class='add'>+	if (HAS_SQ(my_qp))</div><div class='add'>+		vfree(my_qp-&gt;sq_map);</div><div class='add'>+</div><div class='ctx'> create_qp_exit3:</div><div class='ctx'> 	if (HAS_SQ(my_qp))</div><div class='ctx'> 		ipz_queue_dtor(my_pd, &amp;my_qp-&gt;ipz_squeue);</div><div class='hunk'>@@ -1534,8 +1548,6 @@ static int internal_modify_qp(struct ib_qp *ibqp,</div><div class='ctx'> 	if (attr_mask &amp; IB_QP_QKEY)</div><div class='ctx'> 		my_qp-&gt;qkey = attr-&gt;qkey;</div><div class='ctx'> </div><div class='del'>-	my_qp-&gt;state = qp_new_state;</div><div class='del'>-</div><div class='ctx'> modify_qp_exit2:</div><div class='ctx'> 	if (squeue_locked) { /* this means: sqe -&gt; rts */</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;my_qp-&gt;spinlock_s, flags);</div><div class='hunk'>@@ -1551,6 +1563,8 @@ modify_qp_exit1:</div><div class='ctx'> int ehca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask,</div><div class='ctx'> 		   struct ib_udata *udata)</div><div class='ctx'> {</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='ctx'> 	struct ehca_shca *shca = container_of(ibqp-&gt;device, struct ehca_shca,</div><div class='ctx'> 					      ib_device);</div><div class='ctx'> 	struct ehca_qp *my_qp = container_of(ibqp, struct ehca_qp, ib_qp);</div><div class='hunk'>@@ -1597,12 +1611,18 @@ int ehca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask,</div><div class='ctx'> 				 attr-&gt;qp_state, my_qp-&gt;init_attr.port_num,</div><div class='ctx'> 				 ibqp-&gt;qp_type);</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;sport-&gt;mod_sqp_lock, flags);</div><div class='del'>-			return 0;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;sport-&gt;mod_sqp_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return internal_modify_qp(ibqp, attr, attr_mask, 0);</div><div class='add'>+	ret = internal_modify_qp(ibqp, attr, attr_mask, 0);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if ((ret == 0) &amp;&amp; (attr_mask &amp; IB_QP_STATE))</div><div class='add'>+		my_qp-&gt;state = attr-&gt;qp_state;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ehca_recover_sqp(struct ib_qp *sqp)</div><div class='hunk'>@@ -1973,8 +1993,10 @@ static int internal_destroy_qp(struct ib_device *dev, struct ehca_qp *my_qp,</div><div class='ctx'> </div><div class='ctx'> 	if (HAS_RQ(my_qp))</div><div class='ctx'> 		ipz_queue_dtor(my_pd, &amp;my_qp-&gt;ipz_rqueue);</div><div class='del'>-	if (HAS_SQ(my_qp))</div><div class='add'>+	if (HAS_SQ(my_qp)) {</div><div class='ctx'> 		ipz_queue_dtor(my_pd, &amp;my_qp-&gt;ipz_squeue);</div><div class='add'>+		vfree(my_qp-&gt;sq_map);</div><div class='add'>+	}</div><div class='ctx'> 	kmem_cache_free(qp_cache, my_qp);</div><div class='ctx'> 	atomic_dec(&amp;shca-&gt;num_qps);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/infiniband/hw/ehca/ehca_reqs.c b/drivers/infiniband/hw/ehca/ehca_reqs.c<br/>index dd9bc68f1c7b..4426d82fe798 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ehca/ehca_reqs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/ehca/ehca_reqs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ehca/ehca_reqs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ehca/ehca_reqs.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;asm-powerpc/system.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='ctx'> #include "ehca_classes.h"</div><div class='ctx'> #include "ehca_tools.h"</div><div class='ctx'> #include "ehca_qes.h"</div><div class='hunk'>@@ -139,6 +139,7 @@ static void trace_send_wr_ud(const struct ib_send_wr *send_wr)</div><div class='ctx'> static inline int ehca_write_swqe(struct ehca_qp *qp,</div><div class='ctx'> 				  struct ehca_wqe *wqe_p,</div><div class='ctx'> 				  const struct ib_send_wr *send_wr,</div><div class='add'>+				  u32 sq_map_idx,</div><div class='ctx'> 				  int hidden)</div><div class='ctx'> {</div><div class='ctx'> 	u32 idx;</div><div class='hunk'>@@ -157,7 +158,11 @@ static inline int ehca_write_swqe(struct ehca_qp *qp,</div><div class='ctx'> 	/* clear wqe header until sglist */</div><div class='ctx'> 	memset(wqe_p, 0, offsetof(struct ehca_wqe, u.ud_av.sg_list));</div><div class='ctx'> </div><div class='del'>-	wqe_p-&gt;work_request_id = send_wr-&gt;wr_id;</div><div class='add'>+	wqe_p-&gt;work_request_id = send_wr-&gt;wr_id &amp; ~QMAP_IDX_MASK;</div><div class='add'>+	wqe_p-&gt;work_request_id |= sq_map_idx &amp; QMAP_IDX_MASK;</div><div class='add'>+</div><div class='add'>+	qp-&gt;sq_map[sq_map_idx].app_wr_id = send_wr-&gt;wr_id &amp; QMAP_IDX_MASK;</div><div class='add'>+	qp-&gt;sq_map[sq_map_idx].reported = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (send_wr-&gt;opcode) {</div><div class='ctx'> 	case IB_WR_SEND:</div><div class='hunk'>@@ -381,6 +386,7 @@ static inline int post_one_send(struct ehca_qp *my_qp,</div><div class='ctx'> {</div><div class='ctx'> 	struct ehca_wqe *wqe_p;</div><div class='ctx'> 	int ret;</div><div class='add'>+	u32 sq_map_idx;</div><div class='ctx'> 	u64 start_offset = my_qp-&gt;ipz_squeue.current_q_offset;</div><div class='ctx'> </div><div class='ctx'> 	/* get pointer next to free WQE */</div><div class='hunk'>@@ -393,8 +399,15 @@ static inline int post_one_send(struct ehca_qp *my_qp,</div><div class='ctx'> 			 "qp_num=%x", my_qp-&gt;ib_qp.qp_num);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get the index of the WQE in the send queue. The same index is used</div><div class='add'>+	 * for writing into the sq_map.</div><div class='add'>+	 */</div><div class='add'>+	sq_map_idx = start_offset / my_qp-&gt;ipz_squeue.qe_size;</div><div class='add'>+</div><div class='ctx'> 	/* write a SEND WQE into the QUEUE */</div><div class='del'>-	ret = ehca_write_swqe(my_qp, wqe_p, cur_send_wr, hidden);</div><div class='add'>+	ret = ehca_write_swqe(my_qp, wqe_p, cur_send_wr, sq_map_idx, hidden);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if something failed,</div><div class='ctx'> 	 * reset the free entry pointer to the start value</div><div class='hunk'>@@ -589,7 +602,7 @@ static inline int ehca_poll_cq_one(struct ib_cq *cq, struct ib_wc *wc)</div><div class='ctx'> 	struct ehca_qp *my_qp;</div><div class='ctx'> 	int cqe_count = 0, is_error;</div><div class='ctx'> </div><div class='del'>-poll_cq_one_read_cqe:</div><div class='add'>+repoll:</div><div class='ctx'> 	cqe = (struct ehca_cqe *)</div><div class='ctx'> 		ipz_qeit_get_inc_valid(&amp;my_cq-&gt;ipz_queue);</div><div class='ctx'> 	if (!cqe) {</div><div class='hunk'>@@ -617,7 +630,7 @@ poll_cq_one_read_cqe:</div><div class='ctx'> 			ehca_dmp(cqe, 64, "cq_num=%x qp_num=%x",</div><div class='ctx'> 				 my_cq-&gt;cq_number, cqe-&gt;local_qp_number);</div><div class='ctx'> 			/* ignore this purged cqe */</div><div class='del'>-			goto poll_cq_one_read_cqe;</div><div class='add'>+			goto repoll;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_lock_irqsave(&amp;qp-&gt;spinlock_s, flags);</div><div class='ctx'> 		purgeflag = qp-&gt;sqerr_purgeflag;</div><div class='hunk'>@@ -636,7 +649,7 @@ poll_cq_one_read_cqe:</div><div class='ctx'> 			 * that caused sqe and turn off purge flag</div><div class='ctx'> 			 */</div><div class='ctx'> 			qp-&gt;sqerr_purgeflag = 0;</div><div class='del'>-			goto poll_cq_one_read_cqe;</div><div class='add'>+			goto repoll;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -654,8 +667,34 @@ poll_cq_one_read_cqe:</div><div class='ctx'> 			 my_cq, my_cq-&gt;cq_number);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* we got a completion! */</div><div class='del'>-	wc-&gt;wr_id = cqe-&gt;work_request_id;</div><div class='add'>+	read_lock(&amp;ehca_qp_idr_lock);</div><div class='add'>+	my_qp = idr_find(&amp;ehca_qp_idr, cqe-&gt;qp_token);</div><div class='add'>+	read_unlock(&amp;ehca_qp_idr_lock);</div><div class='add'>+	if (!my_qp)</div><div class='add'>+		goto repoll;</div><div class='add'>+	wc-&gt;qp = &amp;my_qp-&gt;ib_qp;</div><div class='add'>+</div><div class='add'>+	if (!(cqe-&gt;w_completion_flags &amp; WC_SEND_RECEIVE_BIT)) {</div><div class='add'>+		struct ehca_qmap_entry *qmap_entry;</div><div class='add'>+		/*</div><div class='add'>+		 * We got a send completion and need to restore the original</div><div class='add'>+		 * wr_id.</div><div class='add'>+		 */</div><div class='add'>+		qmap_entry = &amp;my_qp-&gt;sq_map[cqe-&gt;work_request_id &amp;</div><div class='add'>+					    QMAP_IDX_MASK];</div><div class='add'>+</div><div class='add'>+		if (qmap_entry-&gt;reported) {</div><div class='add'>+			ehca_warn(cq-&gt;device, "Double cqe on qp_num=%#x",</div><div class='add'>+				  my_qp-&gt;real_qp_num);</div><div class='add'>+			/* found a double cqe, discard it and read next one */</div><div class='add'>+			goto repoll;</div><div class='add'>+		}</div><div class='add'>+		wc-&gt;wr_id = cqe-&gt;work_request_id &amp; ~QMAP_IDX_MASK;</div><div class='add'>+		wc-&gt;wr_id |= qmap_entry-&gt;app_wr_id;</div><div class='add'>+		qmap_entry-&gt;reported = 1;</div><div class='add'>+	} else</div><div class='add'>+		/* We got a receive completion. */</div><div class='add'>+		wc-&gt;wr_id = cqe-&gt;work_request_id;</div><div class='ctx'> </div><div class='ctx'> 	/* eval ib_wc_opcode */</div><div class='ctx'> 	wc-&gt;opcode = ib_wc_opcode[cqe-&gt;optype]-1;</div><div class='hunk'>@@ -667,7 +706,7 @@ poll_cq_one_read_cqe:</div><div class='ctx'> 		ehca_dmp(cqe, 64, "ehca_cq=%p cq_num=%x",</div><div class='ctx'> 			 my_cq, my_cq-&gt;cq_number);</div><div class='ctx'> 		/* update also queue adder to throw away this entry!!! */</div><div class='del'>-		goto poll_cq_one_exit0;</div><div class='add'>+		goto repoll;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* eval ib_wc_status */</div><div class='hunk'>@@ -678,11 +717,6 @@ poll_cq_one_read_cqe:</div><div class='ctx'> 	} else</div><div class='ctx'> 		wc-&gt;status = IB_WC_SUCCESS;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;ehca_qp_idr_lock);</div><div class='del'>-	my_qp = idr_find(&amp;ehca_qp_idr, cqe-&gt;qp_token);</div><div class='del'>-	wc-&gt;qp = &amp;my_qp-&gt;ib_qp;</div><div class='del'>-	read_unlock(&amp;ehca_qp_idr_lock);</div><div class='del'>-</div><div class='ctx'> 	wc-&gt;byte_len = cqe-&gt;nr_bytes_transferred;</div><div class='ctx'> 	wc-&gt;pkey_index = cqe-&gt;pkey_index;</div><div class='ctx'> 	wc-&gt;slid = cqe-&gt;rlid;</div><div class='head'>diff --git a/drivers/infiniband/hw/ehca/ehca_tools.h b/drivers/infiniband/hw/ehca/ehca_tools.h<br/>index ec950bf8c479..21f7d06f14ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ehca/ehca_tools.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/ehca/ehca_tools.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ehca/ehca_tools.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ehca/ehca_tools.h</a></div><div class='hunk'>@@ -54,7 +54,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c<br/>index daad09a45910..ad0aab60b051 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_driver.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/ipath/ipath_driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_driver.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ipath/ipath_driver.c</a></div><div class='hunk'>@@ -1259,7 +1259,7 @@ reloop:</div><div class='ctx'> 			 */</div><div class='ctx'> 			ipath_cdbg(ERRPKT, "Error Pkt, but no eflags! egrbuf"</div><div class='ctx'> 				  " %x, len %x hdrq+%x rhf: %Lx\n",</div><div class='del'>-				  etail, tlen, l,</div><div class='add'>+				  etail, tlen, l, (unsigned long long)</div><div class='ctx'> 				  le64_to_cpu(*(__le64 *) rhf_addr));</div><div class='ctx'> 			if (ipath_debug &amp; __IPATH_ERRPKTDBG) {</div><div class='ctx'> 				u32 j, *d, dw = rsize-2;</div><div class='hunk'>@@ -1457,7 +1457,8 @@ static void ipath_reset_availshadow(struct ipath_devdata *dd)</div><div class='ctx'> 			0xaaaaaaaaaaaaaaaaULL); /* All BUSY bits in qword */</div><div class='ctx'> 		if (oldval != dd-&gt;ipath_pioavailshadow[i])</div><div class='ctx'> 			ipath_dbg("shadow[%d] was %Lx, now %lx\n",</div><div class='del'>-				i, oldval, dd-&gt;ipath_pioavailshadow[i]);</div><div class='add'>+				i, (unsigned long long) oldval,</div><div class='add'>+				dd-&gt;ipath_pioavailshadow[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ipath_pioavail_lock, flags);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c<br/>index 23faba9d21eb..8bb5170b4e41 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_fs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/ipath/ipath_fs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_fs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ipath/ipath_fs.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  * SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_iba7220.c b/drivers/infiniband/hw/ipath/ipath_iba7220.c<br/>index fb70712ac85c..9839e20119bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_iba7220.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/ipath/ipath_iba7220.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_iba7220.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ipath/ipath_iba7220.c</a></div><div class='hunk'>@@ -528,7 +528,7 @@ static const struct ipath_cregs ipath_7220_cregs = {</div><div class='ctx'> </div><div class='ctx'> static char int_type[16] = "auto";</div><div class='ctx'> module_param_string(interrupt_type, int_type, sizeof(int_type), 0444);</div><div class='del'>-MODULE_PARM_DESC(int_type, " interrupt_type=auto|force_msi|force_intx\n");</div><div class='add'>+MODULE_PARM_DESC(int_type, " interrupt_type=auto|force_msi|force_intx");</div><div class='ctx'> </div><div class='ctx'> /* packet rate matching delay; chip has support */</div><div class='ctx'> static u8 rate_to_delay[2][2] = {</div><div class='hunk'>@@ -1032,7 +1032,7 @@ static int ipath_7220_bringup_serdes(struct ipath_devdata *dd)</div><div class='ctx'> 	ipath_cdbg(VERBOSE, "done: xgxs=%llx from %llx\n",</div><div class='ctx'> 		   (unsigned long long)</div><div class='ctx'> 		   ipath_read_kreg64(dd, dd-&gt;ipath_kregs-&gt;kr_xgxsconfig),</div><div class='del'>-		   prev_val);</div><div class='add'>+		   (unsigned long long) prev_val);</div><div class='ctx'> </div><div class='ctx'> 	guid = be64_to_cpu(dd-&gt;ipath_guid);</div><div class='ctx'> </div><div class='hunk'>@@ -1042,7 +1042,8 @@ static int ipath_7220_bringup_serdes(struct ipath_devdata *dd)</div><div class='ctx'> 		ipath_dbg("No GUID for heartbeat, faking %llx\n",</div><div class='ctx'> 			(unsigned long long)guid);</div><div class='ctx'> 	} else</div><div class='del'>-		ipath_cdbg(VERBOSE, "Wrote %llX to HRTBT_GUID\n", guid);</div><div class='add'>+		ipath_cdbg(VERBOSE, "Wrote %llX to HRTBT_GUID\n",</div><div class='add'>+			(unsigned long long) guid);</div><div class='ctx'> 	ipath_write_kreg(dd, dd-&gt;ipath_kregs-&gt;kr_hrtbt_guid, guid);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1719,7 +1720,7 @@ static void ipath_7220_put_tid(struct ipath_devdata *dd, u64 __iomem *tidptr,</div><div class='ctx'> 				 "not 2KB aligned!\n", pa);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-		if (pa &gt;= (1UL &lt;&lt; IBA7220_TID_SZ_SHIFT)) {</div><div class='add'>+		if (chippa &gt;= (1UL &lt;&lt; IBA7220_TID_SZ_SHIFT)) {</div><div class='ctx'> 			ipath_dev_err(dd,</div><div class='ctx'> 				      "BUG: Physical page address 0x%lx "</div><div class='ctx'> 				      "larger than supported\n", pa);</div><div class='hunk'>@@ -2505,7 +2506,7 @@ done:</div><div class='ctx'> 	if (dd-&gt;ipath_flags &amp; IPATH_IB_AUTONEG_INPROG) {</div><div class='ctx'> 		ipath_dbg("Did not get to DDR INIT (%x) after %Lu msecs\n",</div><div class='ctx'> 			ipath_ib_state(dd, dd-&gt;ipath_lastibcstat),</div><div class='del'>-			jiffies_to_msecs(jiffies)-startms);</div><div class='add'>+			(unsigned long long) jiffies_to_msecs(jiffies)-startms);</div><div class='ctx'> 		dd-&gt;ipath_flags &amp;= ~IPATH_IB_AUTONEG_INPROG;</div><div class='ctx'> 		if (dd-&gt;ipath_autoneg_tries == IPATH_AUTONEG_TRIES) {</div><div class='ctx'> 			dd-&gt;ipath_flags |= IPATH_IB_AUTONEG_FAILED;</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/infiniband/hw/ipath/ipath_intr.c<br/>index 26900b3b7a4e..6c21b4b5ec71 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_intr.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/ipath/ipath_intr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_intr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ipath/ipath_intr.c</a></div><div class='hunk'>@@ -356,9 +356,10 @@ static void handle_e_ibstatuschanged(struct ipath_devdata *dd,</div><div class='ctx'> 			dd-&gt;ipath_cregs-&gt;cr_iblinkerrrecovcnt);</div><div class='ctx'> 		if (linkrecov != dd-&gt;ipath_lastlinkrecov) {</div><div class='ctx'> 			ipath_dbg("IB linkrecov up %Lx (%s %s) recov %Lu\n",</div><div class='del'>-				ibcs, ib_linkstate(dd, ibcs),</div><div class='add'>+				(unsigned long long) ibcs,</div><div class='add'>+				ib_linkstate(dd, ibcs),</div><div class='ctx'> 				ipath_ibcstatus_str[ltstate],</div><div class='del'>-				linkrecov);</div><div class='add'>+				(unsigned long long) linkrecov);</div><div class='ctx'> 			/* and no more until active again */</div><div class='ctx'> 			dd-&gt;ipath_lastlinkrecov = 0;</div><div class='ctx'> 			ipath_set_linkstate(dd, IPATH_IB_LINKDOWN);</div><div class='hunk'>@@ -1118,9 +1119,11 @@ irqreturn_t ipath_intr(int irq, void *data)</div><div class='ctx'> 	if (unlikely(istat &amp; ~dd-&gt;ipath_i_bitsextant))</div><div class='ctx'> 		ipath_dev_err(dd,</div><div class='ctx'> 			      "interrupt with unknown interrupts %Lx set\n",</div><div class='add'>+			      (unsigned long long)</div><div class='ctx'> 			      istat &amp; ~dd-&gt;ipath_i_bitsextant);</div><div class='ctx'> 	else if (istat &amp; ~INFINIPATH_I_ERROR) /* errors do own printing */</div><div class='del'>-		ipath_cdbg(VERBOSE, "intr stat=0x%Lx\n", istat);</div><div class='add'>+		ipath_cdbg(VERBOSE, "intr stat=0x%Lx\n",</div><div class='add'>+			(unsigned long long) istat);</div><div class='ctx'> </div><div class='ctx'> 	if (istat &amp; INFINIPATH_I_ERROR) {</div><div class='ctx'> 		ipath_stats.sps_errints++;</div><div class='hunk'>@@ -1128,7 +1131,8 @@ irqreturn_t ipath_intr(int irq, void *data)</div><div class='ctx'> 					  dd-&gt;ipath_kregs-&gt;kr_errorstatus);</div><div class='ctx'> 		if (!estat)</div><div class='ctx'> 			dev_info(&amp;dd-&gt;pcidev-&gt;dev, "error interrupt (%Lx), "</div><div class='del'>-				 "but no error bits set!\n", istat);</div><div class='add'>+				 "but no error bits set!\n",</div><div class='add'>+				 (unsigned long long) istat);</div><div class='ctx'> 		else if (estat == -1LL)</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * should we try clearing all, or hope next read</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_ud.c b/drivers/infiniband/hw/ipath/ipath_ud.c<br/>index 36aa242c487c..729446f56aab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_ud.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/ipath/ipath_ud.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_ud.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ipath/ipath_ud.c</a></div><div class='hunk'>@@ -267,6 +267,7 @@ int ipath_make_ud_req(struct ipath_qp *qp)</div><div class='ctx'> 	u16 lrh0;</div><div class='ctx'> 	u16 lid;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	int next_cur;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;qp-&gt;s_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -290,8 +291,9 @@ int ipath_make_ud_req(struct ipath_qp *qp)</div><div class='ctx'> 		goto bail;</div><div class='ctx'> </div><div class='ctx'> 	wqe = get_swqe_ptr(qp, qp-&gt;s_cur);</div><div class='del'>-	if (++qp-&gt;s_cur &gt;= qp-&gt;s_size)</div><div class='del'>-		qp-&gt;s_cur = 0;</div><div class='add'>+	next_cur = qp-&gt;s_cur + 1;</div><div class='add'>+	if (next_cur &gt;= qp-&gt;s_size)</div><div class='add'>+		next_cur = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Construct the header. */</div><div class='ctx'> 	ah_attr = &amp;to_iah(wqe-&gt;wr.wr.ud.ah)-&gt;attr;</div><div class='hunk'>@@ -315,6 +317,7 @@ int ipath_make_ud_req(struct ipath_qp *qp)</div><div class='ctx'> 				qp-&gt;s_flags |= IPATH_S_WAIT_DMA;</div><div class='ctx'> 				goto bail;</div><div class='ctx'> 			}</div><div class='add'>+			qp-&gt;s_cur = next_cur;</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;qp-&gt;s_lock, flags);</div><div class='ctx'> 			ipath_ud_loopback(qp, wqe);</div><div class='ctx'> 			spin_lock_irqsave(&amp;qp-&gt;s_lock, flags);</div><div class='hunk'>@@ -323,6 +326,7 @@ int ipath_make_ud_req(struct ipath_qp *qp)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	qp-&gt;s_cur = next_cur;</div><div class='ctx'> 	extra_bytes = -wqe-&gt;length &amp; 3;</div><div class='ctx'> 	nwords = (wqe-&gt;length + extra_bytes) &gt;&gt; 2;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c<br/>index 55c718828826..b766e40e9ebf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_verbs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/ipath/ipath_verbs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_verbs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/ipath/ipath_verbs.c</a></div><div class='hunk'>@@ -1021,7 +1021,7 @@ static void sdma_complete(void *cookie, int status)</div><div class='ctx'> 	struct ipath_verbs_txreq *tx = cookie;</div><div class='ctx'> 	struct ipath_qp *qp = tx-&gt;qp;</div><div class='ctx'> 	struct ipath_ibdev *dev = to_idev(qp-&gt;ibqp.device);</div><div class='del'>-	unsigned int flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	enum ib_wc_status ibs = status == IPATH_SDMA_TXREQ_S_OK ?</div><div class='ctx'> 		IB_WC_SUCCESS : IB_WC_WR_FLUSH_ERR;</div><div class='ctx'> </div><div class='hunk'>@@ -1051,7 +1051,7 @@ static void sdma_complete(void *cookie, int status)</div><div class='ctx'> </div><div class='ctx'> static void decrement_dma_busy(struct ipath_qp *qp)</div><div class='ctx'> {</div><div class='del'>-	unsigned int flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_dec_and_test(&amp;qp-&gt;s_dma_busy)) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;qp-&gt;s_lock, flags);</div><div class='hunk'>@@ -1221,7 +1221,7 @@ static int ipath_verbs_send_pio(struct ipath_qp *qp,</div><div class='ctx'> 	unsigned flush_wc;</div><div class='ctx'> 	u32 control;</div><div class='ctx'> 	int ret;</div><div class='del'>-	unsigned int flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	piobuf = ipath_getpiobuf(dd, plen, NULL);</div><div class='ctx'> 	if (unlikely(piobuf == NULL)) {</div><div class='head'>diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c<br/>index a1464574bfdd..d0866a3636e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mlx4/cq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/mlx4/cq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mlx4/cq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/mlx4/cq.c</a></div><div class='hunk'>@@ -515,17 +515,17 @@ static void mlx4_ib_handle_error_cqe(struct mlx4_err_cqe *cqe,</div><div class='ctx'> 	wc-&gt;vendor_err = cqe-&gt;vendor_err_syndrome;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx4_ib_ipoib_csum_ok(__be32 status, __be16 checksum)</div><div class='add'>+static int mlx4_ib_ipoib_csum_ok(__be16 status, __be16 checksum)</div><div class='ctx'> {</div><div class='del'>-	return ((status &amp; cpu_to_be32(MLX4_CQE_IPOIB_STATUS_IPV4	|</div><div class='del'>-				      MLX4_CQE_IPOIB_STATUS_IPV4F	|</div><div class='del'>-				      MLX4_CQE_IPOIB_STATUS_IPV4OPT	|</div><div class='del'>-				      MLX4_CQE_IPOIB_STATUS_IPV6	|</div><div class='del'>-				      MLX4_CQE_IPOIB_STATUS_IPOK)) ==</div><div class='del'>-		cpu_to_be32(MLX4_CQE_IPOIB_STATUS_IPV4	|</div><div class='del'>-			    MLX4_CQE_IPOIB_STATUS_IPOK))		&amp;&amp;</div><div class='del'>-		(status &amp; cpu_to_be32(MLX4_CQE_IPOIB_STATUS_UDP	|</div><div class='del'>-				      MLX4_CQE_IPOIB_STATUS_TCP))	&amp;&amp;</div><div class='add'>+	return ((status &amp; cpu_to_be16(MLX4_CQE_STATUS_IPV4      |</div><div class='add'>+				      MLX4_CQE_STATUS_IPV4F     |</div><div class='add'>+				      MLX4_CQE_STATUS_IPV4OPT   |</div><div class='add'>+				      MLX4_CQE_STATUS_IPV6      |</div><div class='add'>+				      MLX4_CQE_STATUS_IPOK)) ==</div><div class='add'>+		cpu_to_be16(MLX4_CQE_STATUS_IPV4        |</div><div class='add'>+			    MLX4_CQE_STATUS_IPOK))              &amp;&amp;</div><div class='add'>+		(status &amp; cpu_to_be16(MLX4_CQE_STATUS_UDP       |</div><div class='add'>+				      MLX4_CQE_STATUS_TCP))     &amp;&amp;</div><div class='ctx'> 		checksum == cpu_to_be16(0xffff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -582,17 +582,17 @@ repoll:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!*cur_qp ||</div><div class='del'>-	    (be32_to_cpu(cqe-&gt;my_qpn) &amp; 0xffffff) != (*cur_qp)-&gt;mqp.qpn) {</div><div class='add'>+	    (be32_to_cpu(cqe-&gt;vlan_my_qpn) &amp; MLX4_CQE_QPN_MASK) != (*cur_qp)-&gt;mqp.qpn) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We do not have to take the QP table lock here,</div><div class='ctx'> 		 * because CQs will be locked while QPs are removed</div><div class='ctx'> 		 * from the table.</div><div class='ctx'> 		 */</div><div class='ctx'> 		mqp = __mlx4_qp_lookup(to_mdev(cq-&gt;ibcq.device)-&gt;dev,</div><div class='del'>-				       be32_to_cpu(cqe-&gt;my_qpn));</div><div class='add'>+				       be32_to_cpu(cqe-&gt;vlan_my_qpn));</div><div class='ctx'> 		if (unlikely(!mqp)) {</div><div class='ctx'> 			printk(KERN_WARNING "CQ %06x with entry for unknown QPN %06x\n",</div><div class='del'>-			       cq-&gt;mcq.cqn, be32_to_cpu(cqe-&gt;my_qpn) &amp; 0xffffff);</div><div class='add'>+			       cq-&gt;mcq.cqn, be32_to_cpu(cqe-&gt;vlan_my_qpn) &amp; MLX4_CQE_QPN_MASK);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -692,14 +692,13 @@ repoll:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		wc-&gt;slid	   = be16_to_cpu(cqe-&gt;rlid);</div><div class='del'>-		wc-&gt;sl		   = cqe-&gt;sl &gt;&gt; 4;</div><div class='add'>+		wc-&gt;sl		   = be16_to_cpu(cqe-&gt;sl_vid &gt;&gt; 12);</div><div class='ctx'> 		g_mlpath_rqpn	   = be32_to_cpu(cqe-&gt;g_mlpath_rqpn);</div><div class='ctx'> 		wc-&gt;src_qp	   = g_mlpath_rqpn &amp; 0xffffff;</div><div class='ctx'> 		wc-&gt;dlid_path_bits = (g_mlpath_rqpn &gt;&gt; 24) &amp; 0x7f;</div><div class='ctx'> 		wc-&gt;wc_flags	  |= g_mlpath_rqpn &amp; 0x80000000 ? IB_WC_GRH : 0;</div><div class='ctx'> 		wc-&gt;pkey_index     = be32_to_cpu(cqe-&gt;immed_rss_invalid) &amp; 0x7f;</div><div class='del'>-		wc-&gt;csum_ok	   = mlx4_ib_ipoib_csum_ok(cqe-&gt;ipoib_status,</div><div class='del'>-							   cqe-&gt;checksum);</div><div class='add'>+		wc-&gt;csum_ok	   = mlx4_ib_ipoib_csum_ok(cqe-&gt;status, cqe-&gt;checksum);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -767,7 +766,7 @@ void __mlx4_ib_cq_clean(struct mlx4_ib_cq *cq, u32 qpn, struct mlx4_ib_srq *srq)</div><div class='ctx'> 	 */</div><div class='ctx'> 	while ((int) --prod_index - (int) cq-&gt;mcq.cons_index &gt;= 0) {</div><div class='ctx'> 		cqe = get_cqe(cq, prod_index &amp; cq-&gt;ibcq.cqe);</div><div class='del'>-		if ((be32_to_cpu(cqe-&gt;my_qpn) &amp; 0xffffff) == qpn) {</div><div class='add'>+		if ((be32_to_cpu(cqe-&gt;vlan_my_qpn) &amp; MLX4_CQE_QPN_MASK) == qpn) {</div><div class='ctx'> 			if (srq &amp;&amp; !(cqe-&gt;owner_sr_opcode &amp; MLX4_CQE_IS_SEND_MASK))</div><div class='ctx'> 				mlx4_ib_free_srq_wqe(srq, be16_to_cpu(cqe-&gt;wqe_index));</div><div class='ctx'> 			++nfreed;</div><div class='head'>diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c<br/>index a4cdb465cd1d..87f5c5a87b98 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mlx4/mr.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/mlx4/mr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mlx4/mr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/mlx4/mr.c</a></div><div class='hunk'>@@ -204,6 +204,8 @@ struct ib_mr *mlx4_ib_alloc_fast_reg_mr(struct ib_pd *pd,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_mr;</div><div class='ctx'> </div><div class='add'>+	mr-&gt;ibmr.rkey = mr-&gt;ibmr.lkey = mr-&gt;mmr.key;</div><div class='add'>+</div><div class='ctx'> 	return &amp;mr-&gt;ibmr;</div><div class='ctx'> </div><div class='ctx'> err_mr:</div><div class='head'>diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c<br/>index f7bc7dd8578a..9559248f265b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mlx4/qp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/mlx4/qp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mlx4/qp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/mlx4/qp.c</a></div><div class='hunk'>@@ -902,7 +902,7 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,</div><div class='ctx'> 			context-&gt;mtu_msgmax = (IB_MTU_4096 &lt;&lt; 5) |</div><div class='ctx'> 					      ilog2(dev-&gt;dev-&gt;caps.max_gso_sz);</div><div class='ctx'> 		else</div><div class='del'>-			context-&gt;mtu_msgmax = (IB_MTU_4096 &lt;&lt; 5) | 11;</div><div class='add'>+			context-&gt;mtu_msgmax = (IB_MTU_4096 &lt;&lt; 5) | 12;</div><div class='ctx'> 	} else if (attr_mask &amp; IB_QP_PATH_MTU) {</div><div class='ctx'> 		if (attr-&gt;path_mtu &lt; IB_MTU_256 || attr-&gt;path_mtu &gt; IB_MTU_4096) {</div><div class='ctx'> 			printk(KERN_ERR "path MTU (%u) is invalid\n",</div><div class='hunk'>@@ -1342,6 +1342,12 @@ static __be32 convert_access(int acc)</div><div class='ctx'> static void set_fmr_seg(struct mlx4_wqe_fmr_seg *fseg, struct ib_send_wr *wr)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_ib_fast_reg_page_list *mfrpl = to_mfrpl(wr-&gt;wr.fast_reg.page_list);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; wr-&gt;wr.fast_reg.page_list_len; ++i)</div><div class='add'>+		wr-&gt;wr.fast_reg.page_list-&gt;page_list[i] =</div><div class='add'>+			cpu_to_be64(wr-&gt;wr.fast_reg.page_list-&gt;page_list[i] |</div><div class='add'>+				    MLX4_MTT_FLAG_PRESENT);</div><div class='ctx'> </div><div class='ctx'> 	fseg-&gt;flags		= convert_access(wr-&gt;wr.fast_reg.access_flags);</div><div class='ctx'> 	fseg-&gt;mem_key		= cpu_to_be32(wr-&gt;wr.fast_reg.rkey);</div><div class='head'>diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h<br/>index 39bd897b40c6..8eb7ae96974d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/nes/nes.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/nes/nes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/nes/nes.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/nes/nes.h</a></div><div class='hunk'>@@ -43,7 +43,6 @@</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/crc32c.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c<br/>index 9f0b964b2c99..499d3cf83e1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/nes/nes_cm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/hw/nes/nes_cm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/nes/nes_cm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/hw/nes/nes_cm.c</a></div><div class='hunk'>@@ -1956,13 +1956,6 @@ static int mini_cm_reject(struct nes_cm_core *cm_core,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	cleanup_retrans_entry(cm_node);</div><div class='ctx'> 	cm_node-&gt;state = NES_CM_STATE_CLOSED;</div><div class='del'>-	ret = send_fin(cm_node, NULL);</div><div class='del'>-</div><div class='del'>-	if (cm_node-&gt;accept_pend) {</div><div class='del'>-		BUG_ON(!cm_node-&gt;listener);</div><div class='del'>-		atomic_dec(&amp;cm_node-&gt;listener-&gt;pend_accepts_cnt);</div><div class='del'>-		BUG_ON(atomic_read(&amp;cm_node-&gt;listener-&gt;pend_accepts_cnt) &lt; 0);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	ret = send_reset(cm_node, NULL);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2383,6 +2376,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)</div><div class='ctx'> 			atomic_inc(&amp;cm_disconnects);</div><div class='ctx'> 			cm_event.event = IW_CM_EVENT_DISCONNECT;</div><div class='ctx'> 			if (last_ae == NES_AEQE_AEID_LLP_CONNECTION_RESET) {</div><div class='add'>+				issued_disconnect_reset = 1;</div><div class='ctx'> 				cm_event.status = IW_CM_EVENT_STATUS_RESET;</div><div class='ctx'> 				nes_debug(NES_DBG_CM, "Generating a CM "</div><div class='ctx'> 					"Disconnect Event (status reset) for "</div><div class='hunk'>@@ -2508,7 +2502,6 @@ static int nes_disconnect(struct nes_qp *nesqp, int abrupt)</div><div class='ctx'> 		nes_debug(NES_DBG_CM, "Call close API\n");</div><div class='ctx'> </div><div class='ctx'> 		g_cm_core-&gt;api-&gt;close(g_cm_core, nesqp-&gt;cm_node);</div><div class='del'>-		nesqp-&gt;cm_node = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2837,6 +2830,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)</div><div class='ctx'> 	cm_node-&gt;apbvt_set = 1;</div><div class='ctx'> 	nesqp-&gt;cm_node = cm_node;</div><div class='ctx'> 	cm_node-&gt;nesqp = nesqp;</div><div class='add'>+	nes_add_ref(&amp;nesqp-&gt;ibqp);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3167,7 +3161,6 @@ static void cm_event_connect_error(struct nes_cm_event *event)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		printk(KERN_ERR "%s[%u] OFA CM event_handler returned, "</div><div class='ctx'> 			"ret=%d\n", __func__, __LINE__, ret);</div><div class='del'>-	nes_rem_ref(&amp;nesqp-&gt;ibqp);</div><div class='ctx'> 	cm_id-&gt;rem_ref(cm_id);</div><div class='ctx'> </div><div class='ctx'> 	rem_ref_cm_node(event-&gt;cm_node-&gt;cm_core, event-&gt;cm_node);</div><div class='head'>diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h<br/>index b0ffc9abe8c0..05eb41b8ab63 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/ulp/ipoib/ipoib.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/ulp/ipoib/ipoib.h</a></div><div class='hunk'>@@ -293,6 +293,7 @@ struct ipoib_dev_priv {</div><div class='ctx'> </div><div class='ctx'> 	struct delayed_work pkey_poll_task;</div><div class='ctx'> 	struct delayed_work mcast_task;</div><div class='add'>+	struct work_struct carrier_on_task;</div><div class='ctx'> 	struct work_struct flush_light;</div><div class='ctx'> 	struct work_struct flush_normal;</div><div class='ctx'> 	struct work_struct flush_heavy;</div><div class='hunk'>@@ -464,6 +465,7 @@ int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port);</div><div class='ctx'> void ipoib_dev_cleanup(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> void ipoib_mcast_join_task(struct work_struct *work);</div><div class='add'>+void ipoib_mcast_carrier_on_task(struct work_struct *work);</div><div class='ctx'> void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> void ipoib_mcast_restart_task(struct work_struct *work);</div><div class='head'>diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c<br/>index 0f2d3045061a..341ffedafed6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_cm.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/ulp/ipoib/ipoib_cm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_cm.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/ulp/ipoib/ipoib_cm.c</a></div><div class='hunk'>@@ -202,7 +202,7 @@ static void ipoib_cm_free_rx_ring(struct net_device *dev,</div><div class='ctx'> 			dev_kfree_skb_any(rx_ring[i].skb);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	kfree(rx_ring);</div><div class='add'>+	vfree(rx_ring);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ipoib_cm_start_rx_drain(struct ipoib_dev_priv *priv)</div><div class='hunk'>@@ -337,7 +337,7 @@ static void ipoib_cm_init_rx_wr(struct net_device *dev,</div><div class='ctx'> 		sge[i].length = PAGE_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	wr-&gt;next    = NULL;</div><div class='del'>-	wr-&gt;sg_list = priv-&gt;cm.rx_sge;</div><div class='add'>+	wr-&gt;sg_list = sge;</div><div class='ctx'> 	wr-&gt;num_sge = priv-&gt;cm.num_frags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -352,9 +352,14 @@ static int ipoib_cm_nonsrq_init_rx(struct net_device *dev, struct ib_cm_id *cm_i</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	rx-&gt;rx_ring = kcalloc(ipoib_recvq_size, sizeof *rx-&gt;rx_ring, GFP_KERNEL);</div><div class='del'>-	if (!rx-&gt;rx_ring)</div><div class='add'>+	rx-&gt;rx_ring = vmalloc(ipoib_recvq_size * sizeof *rx-&gt;rx_ring);</div><div class='add'>+	if (!rx-&gt;rx_ring) {</div><div class='add'>+		printk(KERN_WARNING "%s: failed to allocate CM non-SRQ ring (%d entries)\n",</div><div class='add'>+		       priv-&gt;ca-&gt;name, ipoib_recvq_size);</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(rx-&gt;rx_ring, 0, ipoib_recvq_size * sizeof *rx-&gt;rx_ring);</div><div class='ctx'> </div><div class='ctx'> 	t = kmalloc(sizeof *t, GFP_KERNEL);</div><div class='ctx'> 	if (!t) {</div><div class='hunk'>@@ -1494,14 +1499,16 @@ static void ipoib_cm_create_srq(struct net_device *dev, int max_sge)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;cm.srq_ring = kzalloc(ipoib_recvq_size * sizeof *priv-&gt;cm.srq_ring,</div><div class='del'>-				    GFP_KERNEL);</div><div class='add'>+	priv-&gt;cm.srq_ring = vmalloc(ipoib_recvq_size * sizeof *priv-&gt;cm.srq_ring);</div><div class='ctx'> 	if (!priv-&gt;cm.srq_ring) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: failed to allocate CM SRQ ring (%d entries)\n",</div><div class='ctx'> 		       priv-&gt;ca-&gt;name, ipoib_recvq_size);</div><div class='ctx'> 		ib_destroy_srq(priv-&gt;cm.srq);</div><div class='ctx'> 		priv-&gt;cm.srq = NULL;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	memset(priv-&gt;cm.srq_ring, 0, ipoib_recvq_size * sizeof *priv-&gt;cm.srq_ring);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ipoib_cm_dev_init(struct net_device *dev)</div><div class='head'>diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c<br/>index f51201b17bfd..1b1df5cc4113 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_main.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/ulp/ipoib/ipoib_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/ulp/ipoib/ipoib_main.c</a></div><div class='hunk'>@@ -156,14 +156,8 @@ static int ipoib_stop(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Now flush workqueue to make sure a scheduled task doesn't</div><div class='del'>-	 * bring our internal state back up.</div><div class='del'>-	 */</div><div class='del'>-	flush_workqueue(ipoib_workqueue);</div><div class='del'>-</div><div class='del'>-	ipoib_ib_dev_down(dev, 1);</div><div class='del'>-	ipoib_ib_dev_stop(dev, 1);</div><div class='add'>+	ipoib_ib_dev_down(dev, 0);</div><div class='add'>+	ipoib_ib_dev_stop(dev, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &amp;priv-&gt;flags)) {</div><div class='ctx'> 		struct ipoib_dev_priv *cpriv;</div><div class='hunk'>@@ -1081,6 +1075,7 @@ static void ipoib_setup(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;priv-&gt;pkey_poll_task, ipoib_pkey_poll);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;priv-&gt;mcast_task,   ipoib_mcast_join_task);</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;carrier_on_task, ipoib_mcast_carrier_on_task);</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;flush_light,   ipoib_ib_dev_flush_light);</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;flush_normal,   ipoib_ib_dev_flush_normal);</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;flush_heavy,   ipoib_ib_dev_flush_heavy);</div><div class='hunk'>@@ -1314,7 +1309,7 @@ sysfs_failed:</div><div class='ctx'> </div><div class='ctx'> register_failed:</div><div class='ctx'> 	ib_unregister_event_handler(&amp;priv-&gt;event_handler);</div><div class='del'>-	flush_scheduled_work();</div><div class='add'>+	flush_workqueue(ipoib_workqueue);</div><div class='ctx'> </div><div class='ctx'> event_failed:</div><div class='ctx'> 	ipoib_dev_cleanup(priv-&gt;dev);</div><div class='hunk'>@@ -1373,7 +1368,12 @@ static void ipoib_remove_one(struct ib_device *device)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(priv, tmp, dev_list, list) {</div><div class='ctx'> 		ib_unregister_event_handler(&amp;priv-&gt;event_handler);</div><div class='del'>-		flush_scheduled_work();</div><div class='add'>+</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		dev_change_flags(priv-&gt;dev, priv-&gt;dev-&gt;flags &amp; ~IFF_UP);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+</div><div class='add'>+		flush_workqueue(ipoib_workqueue);</div><div class='ctx'> </div><div class='ctx'> 		unregister_netdev(priv-&gt;dev);</div><div class='ctx'> 		ipoib_dev_cleanup(priv-&gt;dev);</div><div class='head'>diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c<br/>index 8950e9546f4e..aae28620a6e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_multicast.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/ulp/ipoib/ipoib_multicast.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_multicast.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/ulp/ipoib/ipoib_multicast.c</a></div><div class='hunk'>@@ -366,6 +366,21 @@ static int ipoib_mcast_sendonly_join(struct ipoib_mcast *mcast)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ipoib_mcast_carrier_on_task(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ipoib_dev_priv *priv = container_of(work, struct ipoib_dev_priv,</div><div class='add'>+						   carrier_on_task);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Take rtnl_lock to avoid racing with ipoib_stop() and</div><div class='add'>+	 * turning the carrier back on while a device is being</div><div class='add'>+	 * removed.</div><div class='add'>+	 */</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	netif_carrier_on(priv-&gt;dev);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ipoib_mcast_join_complete(int status,</div><div class='ctx'> 				     struct ib_sa_multicast *multicast)</div><div class='ctx'> {</div><div class='hunk'>@@ -392,8 +407,12 @@ static int ipoib_mcast_join_complete(int status,</div><div class='ctx'> 					   &amp;priv-&gt;mcast_task, 0);</div><div class='ctx'> 		mutex_unlock(&amp;mcast_mutex);</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Defer carrier on work to ipoib_workqueue to avoid a</div><div class='add'>+		 * deadlock on rtnl_lock here.</div><div class='add'>+		 */</div><div class='ctx'> 		if (mcast == priv-&gt;broadcast)</div><div class='del'>-			netif_carrier_on(dev);</div><div class='add'>+			queue_work(ipoib_workqueue, &amp;priv-&gt;carrier_on_task);</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c<br/>index 63462ecca147..26ff6214a81f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/iser/iser_verbs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/infiniband/ulp/iser/iser_verbs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/iser/iser_verbs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/infiniband/ulp/iser/iser_verbs.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "iscsi_iser.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c<br/>index 2d65411f6763..3524bef62be6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/evdev.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/evdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/evdev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/evdev.c</a></div><div class='hunk'>@@ -647,6 +647,47 @@ static int str_to_user(const char *str, unsigned int maxlen, void __user *p)</div><div class='ctx'> 	return copy_to_user(p, str, len) ? -EFAULT : len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define OLD_KEY_MAX	0x1ff</div><div class='add'>+static int handle_eviocgbit(struct input_dev *dev, unsigned int cmd, void __user *p, int compat_mode)</div><div class='add'>+{</div><div class='add'>+	static unsigned long keymax_warn_time;</div><div class='add'>+	unsigned long *bits;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	switch (_IOC_NR(cmd) &amp; EV_MAX) {</div><div class='add'>+</div><div class='add'>+	case      0: bits = dev-&gt;evbit;  len = EV_MAX;  break;</div><div class='add'>+	case EV_KEY: bits = dev-&gt;keybit; len = KEY_MAX; break;</div><div class='add'>+	case EV_REL: bits = dev-&gt;relbit; len = REL_MAX; break;</div><div class='add'>+	case EV_ABS: bits = dev-&gt;absbit; len = ABS_MAX; break;</div><div class='add'>+	case EV_MSC: bits = dev-&gt;mscbit; len = MSC_MAX; break;</div><div class='add'>+	case EV_LED: bits = dev-&gt;ledbit; len = LED_MAX; break;</div><div class='add'>+	case EV_SND: bits = dev-&gt;sndbit; len = SND_MAX; break;</div><div class='add'>+	case EV_FF:  bits = dev-&gt;ffbit;  len = FF_MAX;  break;</div><div class='add'>+	case EV_SW:  bits = dev-&gt;swbit;  len = SW_MAX;  break;</div><div class='add'>+	default: return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Work around bugs in userspace programs that like to do</div><div class='add'>+	 * EVIOCGBIT(EV_KEY, KEY_MAX) and not realize that 'len'</div><div class='add'>+	 * should be in bytes, not in bits.</div><div class='add'>+	 */</div><div class='add'>+	if ((_IOC_NR(cmd) &amp; EV_MAX) == EV_KEY &amp;&amp; _IOC_SIZE(cmd) == OLD_KEY_MAX) {</div><div class='add'>+		len = OLD_KEY_MAX;</div><div class='add'>+		if (printk_timed_ratelimit(&amp;keymax_warn_time, 10 * 1000))</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+				"evdev.c(EVIOCGBIT): Suspicious buffer size %u, "</div><div class='add'>+				"limiting output to %zu bytes. See "</div><div class='add'>+				"http://userweb.kernel.org/~dtor/eviocgbit-bug.html\n",</div><div class='add'>+				OLD_KEY_MAX,</div><div class='add'>+				BITS_TO_LONGS(OLD_KEY_MAX) * sizeof(long));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bits_to_user(bits, len, _IOC_SIZE(cmd), p, compat_mode);</div><div class='add'>+}</div><div class='add'>+#undef OLD_KEY_MAX</div><div class='add'>+</div><div class='ctx'> static long evdev_do_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 			   void __user *p, int compat_mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -733,26 +774,8 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> </div><div class='ctx'> 		if (_IOC_DIR(cmd) == _IOC_READ) {</div><div class='ctx'> </div><div class='del'>-			if ((_IOC_NR(cmd) &amp; ~EV_MAX) == _IOC_NR(EVIOCGBIT(0, 0))) {</div><div class='del'>-</div><div class='del'>-				unsigned long *bits;</div><div class='del'>-				int len;</div><div class='del'>-</div><div class='del'>-				switch (_IOC_NR(cmd) &amp; EV_MAX) {</div><div class='del'>-</div><div class='del'>-				case      0: bits = dev-&gt;evbit;  len = EV_MAX;  break;</div><div class='del'>-				case EV_KEY: bits = dev-&gt;keybit; len = KEY_MAX; break;</div><div class='del'>-				case EV_REL: bits = dev-&gt;relbit; len = REL_MAX; break;</div><div class='del'>-				case EV_ABS: bits = dev-&gt;absbit; len = ABS_MAX; break;</div><div class='del'>-				case EV_MSC: bits = dev-&gt;mscbit; len = MSC_MAX; break;</div><div class='del'>-				case EV_LED: bits = dev-&gt;ledbit; len = LED_MAX; break;</div><div class='del'>-				case EV_SND: bits = dev-&gt;sndbit; len = SND_MAX; break;</div><div class='del'>-				case EV_FF:  bits = dev-&gt;ffbit;  len = FF_MAX;  break;</div><div class='del'>-				case EV_SW:  bits = dev-&gt;swbit;  len = SW_MAX;  break;</div><div class='del'>-				default: return -EINVAL;</div><div class='del'>-				}</div><div class='del'>-				return bits_to_user(bits, len, _IOC_SIZE(cmd), p, compat_mode);</div><div class='del'>-			}</div><div class='add'>+			if ((_IOC_NR(cmd) &amp; ~EV_MAX) == _IOC_NR(EVIOCGBIT(0, 0)))</div><div class='add'>+				return handle_eviocgbit(dev, cmd, p, compat_mode);</div><div class='ctx'> </div><div class='ctx'> 			if (_IOC_NR(cmd) == _IOC_NR(EVIOCGKEY(0)))</div><div class='ctx'> 				return bits_to_user(dev-&gt;key, KEY_MAX, _IOC_SIZE(cmd),</div><div class='head'>diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c<br/>index 87d3e7eabffd..6791be81eb29 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/xpad.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/joystick/xpad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/xpad.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/joystick/xpad.c</a></div><div class='hunk'>@@ -127,6 +127,7 @@ static const struct xpad_device {</div><div class='ctx'> 	{ 0x0738, 0x4716, "Mad Catz Wired Xbox 360 Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },</div><div class='ctx'> 	{ 0x0738, 0x6040, "Mad Catz Beat Pad Pro", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },</div><div class='ctx'> 	{ 0x0c12, 0x8802, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },</div><div class='add'>+	{ 0x0c12, 0x880a, "Pelican Eclipse PL-2023", MAP_DPAD_TO_AXES, XTYPE_XBOX },</div><div class='ctx'> 	{ 0x0c12, 0x8810, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },</div><div class='ctx'> 	{ 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", MAP_DPAD_TO_AXES, XTYPE_XBOX },</div><div class='ctx'> 	{ 0x0e4c, 0x1097, "Radica Gamester Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },</div><div class='head'>diff --git a/drivers/input/keyboard/aaed2000_kbd.c b/drivers/input/keyboard/aaed2000_kbd.c<br/>index 8a77bfcd05bc..18222a689a03 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/aaed2000_kbd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/keyboard/aaed2000_kbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/aaed2000_kbd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/aaed2000_kbd.c</a></div><div class='hunk'>@@ -20,8 +20,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/aaed2000.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/aaed2000.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define KB_ROWS			12</div><div class='ctx'> #define KB_COLS			8</div><div class='head'>diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c<br/>index 54ed8e2e1c02..e348cfccc17a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/bf54x-keys.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/keyboard/bf54x-keys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/bf54x-keys.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/bf54x-keys.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -44,7 +43,7 @@</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/portmux.h&gt;</div><div class='del'>-#include &lt;asm/mach/bf54x_keys.h&gt;</div><div class='add'>+#include &lt;mach/bf54x_keys.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"bf54x-keys"</div><div class='ctx'> #define TIME_SCALE	100	/* 100 ns */</div><div class='head'>diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c<br/>index 1aa46ae12630..134e67bf6a90 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/corgikbd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/keyboard/corgikbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/corgikbd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/corgikbd.c</a></div><div class='hunk'>@@ -20,10 +20,10 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/corgi.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/corgi.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/scoop.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define KB_ROWS				8</div><div class='head'>diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c<br/>index be58730e636a..ec96b369dd7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/gpio_keys.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/keyboard/gpio_keys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/gpio_keys.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/gpio_keys.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -118,6 +117,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)</div><div class='ctx'> 		unsigned int type = button-&gt;type ?: EV_KEY;</div><div class='ctx'> </div><div class='ctx'> 		bdata-&gt;input = input;</div><div class='add'>+		bdata-&gt;button = button;</div><div class='ctx'> 		setup_timer(&amp;bdata-&gt;timer,</div><div class='ctx'> 			    gpio_check_button, (unsigned long)bdata);</div><div class='ctx'> </div><div class='hunk'>@@ -256,7 +256,7 @@ static int gpio_keys_resume(struct platform_device *pdev)</div><div class='ctx'> #define gpio_keys_resume	NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct platform_driver gpio_keys_device_driver = {</div><div class='add'>+static struct platform_driver gpio_keys_device_driver = {</div><div class='ctx'> 	.probe		= gpio_keys_probe,</div><div class='ctx'> 	.remove		= __devexit_p(gpio_keys_remove),</div><div class='ctx'> 	.suspend	= gpio_keys_suspend,</div><div class='head'>diff --git a/drivers/input/keyboard/jornada720_kbd.c b/drivers/input/keyboard/jornada720_kbd.c<br/>index ce650af6d649..4e016d823069 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/jornada720_kbd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/keyboard/jornada720_kbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/jornada720_kbd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/jornada720_kbd.c</a></div><div class='hunk'>@@ -24,8 +24,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/jornada720.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/jornada720.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Kristoffer Ericson &lt;Kristoffer.Ericson@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("HP Jornada 710/720/728 keyboard driver");</div><div class='head'>diff --git a/drivers/input/keyboard/maple_keyb.c b/drivers/input/keyboard/maple_keyb.c<br/>index 2b404284c28a..22f17a593be7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/maple_keyb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/keyboard/maple_keyb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/maple_keyb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/maple_keyb.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  * SEGA Dreamcast keyboard driver</div><div class='ctx'>  * Based on drivers/usb/usbkbd.c</div><div class='ctx'>  * Copyright YAEGASHI Takeshi, 2001</div><div class='del'>- * Porting to 2.6 Copyright Adrian McMenamin, 2007</div><div class='add'>+ * Porting to 2.6 Copyright Adrian McMenamin, 2007, 2008</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/maple.h&gt;</div><div class='del'>-#include &lt;asm/mach/maple.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Very simple mutex to ensure proper cleanup */</div><div class='ctx'> static DEFINE_MUTEX(maple_keyb_mutex);</div><div class='hunk'>@@ -46,39 +45,51 @@ struct dc_kbd {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned short dc_kbd_keycode[NR_SCANCODES] = {</div><div class='del'>-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_A, KEY_B, KEY_C, KEY_D,</div><div class='del'>-	KEY_E, KEY_F, KEY_G, KEY_H, KEY_I, KEY_J, KEY_K, KEY_L,</div><div class='del'>-	KEY_M, KEY_N, KEY_O, KEY_P, KEY_Q, KEY_R, KEY_S, KEY_T,</div><div class='del'>-	KEY_U, KEY_V, KEY_W, KEY_X, KEY_Y, KEY_Z, KEY_1, KEY_2,</div><div class='del'>-	KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0,</div><div class='del'>-	KEY_ENTER, KEY_ESC, KEY_BACKSPACE, KEY_TAB, KEY_SPACE, KEY_MINUS, KEY_EQUAL, KEY_LEFTBRACE,</div><div class='del'>-	KEY_RIGHTBRACE, KEY_BACKSLASH, KEY_BACKSLASH, KEY_SEMICOLON, KEY_APOSTROPHE, KEY_GRAVE, KEY_COMMA,</div><div class='del'>-	KEY_DOT, KEY_SLASH, KEY_CAPSLOCK, KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6,</div><div class='add'>+	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_A, KEY_B,</div><div class='add'>+	KEY_C, KEY_D, KEY_E, KEY_F, KEY_G, KEY_H, KEY_I, KEY_J, KEY_K, KEY_L,</div><div class='add'>+	KEY_M, KEY_N, KEY_O, KEY_P, KEY_Q, KEY_R, KEY_S, KEY_T, KEY_U, KEY_V,</div><div class='add'>+	KEY_W, KEY_X, KEY_Y, KEY_Z, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6,</div><div class='add'>+	KEY_7, KEY_8, KEY_9, KEY_0, KEY_ENTER, KEY_ESC, KEY_BACKSPACE,</div><div class='add'>+	KEY_TAB, KEY_SPACE, KEY_MINUS, KEY_EQUAL, KEY_LEFTBRACE,</div><div class='add'>+	KEY_RIGHTBRACE, KEY_BACKSLASH, KEY_BACKSLASH, KEY_SEMICOLON,</div><div class='add'>+	KEY_APOSTROPHE, KEY_GRAVE, KEY_COMMA, KEY_DOT, KEY_SLASH,</div><div class='add'>+	KEY_CAPSLOCK, KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6,</div><div class='ctx'> 	KEY_F7, KEY_F8, KEY_F9, KEY_F10, KEY_F11, KEY_F12, KEY_SYSRQ,</div><div class='del'>-	KEY_SCROLLLOCK, KEY_PAUSE, KEY_INSERT, KEY_HOME, KEY_PAGEUP, KEY_DELETE,</div><div class='del'>-	KEY_END, KEY_PAGEDOWN, KEY_RIGHT, KEY_LEFT, KEY_DOWN, KEY_UP,</div><div class='del'>-	KEY_NUMLOCK, KEY_KPSLASH, KEY_KPASTERISK, KEY_KPMINUS, KEY_KPPLUS, KEY_KPENTER, KEY_KP1, KEY_KP2,</div><div class='del'>-	KEY_KP3, KEY_KP4, KEY_KP5, KEY_KP6, KEY_KP7, KEY_KP8, KEY_KP9, KEY_KP0, KEY_KPDOT,</div><div class='del'>-	KEY_102ND, KEY_COMPOSE, KEY_POWER, KEY_KPEQUAL, KEY_F13, KEY_F14, KEY_F15,</div><div class='del'>-	KEY_F16, KEY_F17, KEY_F18, KEY_F19, KEY_F20,</div><div class='del'>-	KEY_F21, KEY_F22, KEY_F23, KEY_F24, KEY_OPEN, KEY_HELP, KEY_PROPS, KEY_FRONT,</div><div class='del'>-	KEY_STOP, KEY_AGAIN, KEY_UNDO, KEY_CUT, KEY_COPY, KEY_PASTE, KEY_FIND, KEY_MUTE,</div><div class='del'>-	KEY_VOLUMEUP, KEY_VOLUMEDOWN, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_KPCOMMA, KEY_RESERVED, KEY_RO, KEY_KATAKANAHIRAGANA , KEY_YEN,</div><div class='del'>-	KEY_HENKAN, KEY_MUHENKAN, KEY_KPJPCOMMA, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='del'>-	KEY_HANGEUL, KEY_HANJA, KEY_KATAKANA, KEY_HIRAGANA, KEY_ZENKAKUHANKAKU, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='del'>-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='del'>-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='del'>-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='del'>-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='del'>-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='del'>-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='del'>-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='del'>-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='del'>-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='del'>-	KEY_LEFTCTRL, KEY_LEFTSHIFT, KEY_LEFTALT, KEY_LEFTMETA, KEY_RIGHTCTRL, KEY_RIGHTSHIFT, KEY_RIGHTALT, KEY_RIGHTMETA,</div><div class='del'>-	KEY_PLAYPAUSE, KEY_STOPCD, KEY_PREVIOUSSONG, KEY_NEXTSONG, KEY_EJECTCD, KEY_VOLUMEUP, KEY_VOLUMEDOWN, KEY_MUTE,</div><div class='del'>-	KEY_WWW, KEY_BACK, KEY_FORWARD, KEY_STOP, KEY_FIND, KEY_SCROLLUP, KEY_SCROLLDOWN, KEY_EDIT, KEY_SLEEP,</div><div class='del'>-	KEY_SCREENLOCK, KEY_REFRESH, KEY_CALC, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED</div><div class='add'>+	KEY_SCROLLLOCK, KEY_PAUSE, KEY_INSERT, KEY_HOME, KEY_PAGEUP,</div><div class='add'>+	KEY_DELETE, KEY_END, KEY_PAGEDOWN, KEY_RIGHT, KEY_LEFT, KEY_DOWN,</div><div class='add'>+	KEY_UP, KEY_NUMLOCK, KEY_KPSLASH, KEY_KPASTERISK, KEY_KPMINUS,</div><div class='add'>+	KEY_KPPLUS, KEY_KPENTER, KEY_KP1, KEY_KP2, KEY_KP3, KEY_KP4, KEY_KP5,</div><div class='add'>+	KEY_KP6, KEY_KP7, KEY_KP8, KEY_KP9, KEY_KP0, KEY_KPDOT, KEY_102ND,</div><div class='add'>+	KEY_COMPOSE, KEY_POWER, KEY_KPEQUAL, KEY_F13, KEY_F14, KEY_F15,</div><div class='add'>+	KEY_F16, KEY_F17, KEY_F18, KEY_F19, KEY_F20, KEY_F21, KEY_F22,</div><div class='add'>+	KEY_F23, KEY_F24, KEY_OPEN, KEY_HELP, KEY_PROPS, KEY_FRONT, KEY_STOP,</div><div class='add'>+	KEY_AGAIN, KEY_UNDO, KEY_CUT, KEY_COPY, KEY_PASTE, KEY_FIND, KEY_MUTE,</div><div class='add'>+	KEY_VOLUMEUP, KEY_VOLUMEDOWN, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_KPCOMMA, KEY_RESERVED, KEY_RO, KEY_KATAKANAHIRAGANA , KEY_YEN,</div><div class='add'>+	KEY_HENKAN, KEY_MUHENKAN, KEY_KPJPCOMMA, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_RESERVED, KEY_HANGEUL, KEY_HANJA, KEY_KATAKANA, KEY_HIRAGANA,</div><div class='add'>+	KEY_ZENKAKUHANKAKU, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,</div><div class='add'>+	KEY_RESERVED, KEY_RESERVED, KEY_LEFTCTRL, KEY_LEFTSHIFT, KEY_LEFTALT,</div><div class='add'>+	KEY_LEFTMETA, KEY_RIGHTCTRL, KEY_RIGHTSHIFT, KEY_RIGHTALT,</div><div class='add'>+	KEY_RIGHTMETA, KEY_PLAYPAUSE, KEY_STOPCD, KEY_PREVIOUSSONG,</div><div class='add'>+	KEY_NEXTSONG, KEY_EJECTCD, KEY_VOLUMEUP, KEY_VOLUMEDOWN, KEY_MUTE,</div><div class='add'>+	KEY_WWW, KEY_BACK, KEY_FORWARD, KEY_STOP, KEY_FIND, KEY_SCROLLUP,</div><div class='add'>+	KEY_SCROLLDOWN, KEY_EDIT, KEY_SLEEP, KEY_SCREENLOCK, KEY_REFRESH,</div><div class='add'>+	KEY_CALC, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void dc_scan_kbd(struct dc_kbd *kbd)</div><div class='hunk'>@@ -128,12 +139,12 @@ static void dc_scan_kbd(struct dc_kbd *kbd)</div><div class='ctx'> static void dc_kbd_callback(struct mapleq *mq)</div><div class='ctx'> {</div><div class='ctx'> 	struct maple_device *mapledev = mq-&gt;dev;</div><div class='del'>-	struct dc_kbd *kbd = mapledev-&gt;private_data;</div><div class='add'>+	struct dc_kbd *kbd = maple_get_drvdata(mapledev);</div><div class='ctx'> 	unsigned long *buf = mq-&gt;recvbuf;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We should always be getting the lock because the only</div><div class='del'>-	 * time it may be locked if driver is in cleanup phase.</div><div class='add'>+	 * We should always get the lock because the only</div><div class='add'>+	 * time it may be locked is if the driver is in the cleanup phase.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (likely(mutex_trylock(&amp;maple_keyb_mutex))) {</div><div class='ctx'> </div><div class='hunk'>@@ -146,106 +157,96 @@ static void dc_kbd_callback(struct mapleq *mq)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dc_kbd_connect(struct maple_device *mdev)</div><div class='add'>+static int probe_maple_kbd(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct maple_device *mdev = to_maple_dev(dev);</div><div class='add'>+	struct maple_driver *mdrv = to_maple_driver(dev-&gt;driver);</div><div class='ctx'> 	int i, error;</div><div class='ctx'> 	struct dc_kbd *kbd;</div><div class='del'>-	struct input_dev *dev;</div><div class='add'>+	struct input_dev *idev;</div><div class='ctx'> </div><div class='ctx'> 	if (!(mdev-&gt;function &amp; MAPLE_FUNC_KEYBOARD))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	kbd = kzalloc(sizeof(struct dc_kbd), GFP_KERNEL);</div><div class='del'>-	dev = input_allocate_device();</div><div class='del'>-	if (!kbd || !dev) {</div><div class='add'>+	idev = input_allocate_device();</div><div class='add'>+	if (!kbd || !idev) {</div><div class='ctx'> 		error = -ENOMEM;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mdev-&gt;private_data = kbd;</div><div class='del'>-</div><div class='del'>-	kbd-&gt;dev = dev;</div><div class='add'>+	kbd-&gt;dev = idev;</div><div class='ctx'> 	memcpy(kbd-&gt;keycode, dc_kbd_keycode, sizeof(kbd-&gt;keycode));</div><div class='ctx'> </div><div class='del'>-	dev-&gt;name = mdev-&gt;product_name;</div><div class='del'>-	dev-&gt;evbit[0] = BIT(EV_KEY) | BIT(EV_REP);</div><div class='del'>-	dev-&gt;keycode = kbd-&gt;keycode;</div><div class='del'>-	dev-&gt;keycodesize = sizeof (unsigned short);</div><div class='del'>-	dev-&gt;keycodemax = ARRAY_SIZE(kbd-&gt;keycode);</div><div class='del'>-	dev-&gt;id.bustype = BUS_HOST;</div><div class='del'>-	dev-&gt;dev.parent = &amp;mdev-&gt;dev;</div><div class='add'>+	idev-&gt;name = mdev-&gt;product_name;</div><div class='add'>+	idev-&gt;evbit[0] = BIT(EV_KEY) | BIT(EV_REP);</div><div class='add'>+	idev-&gt;keycode = kbd-&gt;keycode;</div><div class='add'>+	idev-&gt;keycodesize = sizeof(unsigned short);</div><div class='add'>+	idev-&gt;keycodemax = ARRAY_SIZE(kbd-&gt;keycode);</div><div class='add'>+	idev-&gt;id.bustype = BUS_HOST;</div><div class='add'>+	idev-&gt;dev.parent = &amp;mdev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NR_SCANCODES; i++)</div><div class='del'>-		__set_bit(dc_kbd_keycode[i], dev-&gt;keybit);</div><div class='del'>-	__clear_bit(KEY_RESERVED, dev-&gt;keybit);</div><div class='add'>+		__set_bit(dc_kbd_keycode[i], idev-&gt;keybit);</div><div class='add'>+	__clear_bit(KEY_RESERVED, idev-&gt;keybit);</div><div class='ctx'> </div><div class='del'>-	input_set_capability(dev, EV_MSC, MSC_SCAN);</div><div class='del'>-	input_set_drvdata(dev, kbd);</div><div class='add'>+	input_set_capability(idev, EV_MSC, MSC_SCAN);</div><div class='add'>+	input_set_drvdata(idev, kbd);</div><div class='ctx'> </div><div class='del'>-	error = input_register_device(dev);</div><div class='add'>+	error = input_register_device(idev);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	/* Maple polling is locked to VBLANK - which may be just 50/s */</div><div class='del'>-	maple_getcond_callback(mdev, dc_kbd_callback, HZ/50, MAPLE_FUNC_KEYBOARD);</div><div class='del'>-	return 0;</div><div class='add'>+	maple_getcond_callback(mdev, dc_kbd_callback, HZ/50,</div><div class='add'>+		MAPLE_FUNC_KEYBOARD);</div><div class='ctx'> </div><div class='del'>- fail:</div><div class='del'>-	input_free_device(dev);</div><div class='add'>+	mdev-&gt;driver = mdrv;</div><div class='add'>+</div><div class='add'>+	maple_set_drvdata(mdev, kbd);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	input_free_device(idev);</div><div class='ctx'> 	kfree(kbd);</div><div class='del'>-	mdev-&gt;private_data = NULL;</div><div class='add'>+	maple_set_drvdata(mdev, NULL);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dc_kbd_disconnect(struct maple_device *mdev)</div><div class='add'>+static int remove_maple_kbd(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct dc_kbd *kbd;</div><div class='add'>+	struct maple_device *mdev = to_maple_dev(dev);</div><div class='add'>+	struct dc_kbd *kbd = maple_get_drvdata(mdev);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;maple_keyb_mutex);</div><div class='ctx'> </div><div class='del'>-	kbd = mdev-&gt;private_data;</div><div class='del'>-	mdev-&gt;private_data = NULL;</div><div class='ctx'> 	input_unregister_device(kbd-&gt;dev);</div><div class='ctx'> 	kfree(kbd);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;maple_keyb_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* allow the keyboard to be used */</div><div class='del'>-static int probe_maple_kbd(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct maple_device *mdev = to_maple_dev(dev);</div><div class='del'>-	struct maple_driver *mdrv = to_maple_driver(dev-&gt;driver);</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	error = dc_kbd_connect(mdev);</div><div class='del'>-	if (error)</div><div class='del'>-		return error;</div><div class='del'>-</div><div class='del'>-	mdev-&gt;driver = mdrv;</div><div class='del'>-	mdev-&gt;registered = 1;</div><div class='add'>+	maple_set_drvdata(mdev, NULL);</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;maple_keyb_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct maple_driver dc_kbd_driver = {</div><div class='ctx'> 	.function = MAPLE_FUNC_KEYBOARD,</div><div class='del'>-	.connect = dc_kbd_connect,</div><div class='del'>-	.disconnect = dc_kbd_disconnect,</div><div class='ctx'> 	.drv = {</div><div class='ctx'> 		.name = "Dreamcast_keyboard",</div><div class='ctx'> 		.probe = probe_maple_kbd,</div><div class='del'>-       },</div><div class='add'>+		.remove = remove_maple_kbd,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init dc_kbd_init(void)</div><div class='ctx'> {</div><div class='del'>-	return maple_driver_register(&amp;dc_kbd_driver.drv);</div><div class='add'>+	return maple_driver_register(&amp;dc_kbd_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit dc_kbd_exit(void)</div><div class='ctx'> {</div><div class='del'>-	driver_unregister(&amp;dc_kbd_driver.drv);</div><div class='add'>+	maple_driver_unregister(&amp;dc_kbd_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(dc_kbd_init);</div><div class='head'>diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c<br/>index 10afd2068068..dcea87a0bc56 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/omap-keypad.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/keyboard/omap-keypad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/omap-keypad.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/omap-keypad.c</a></div><div class='hunk'>@@ -34,14 +34,13 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/keypad.h&gt;</div><div class='del'>-#include &lt;asm/arch/menelaus.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/keypad.h&gt;</div><div class='add'>+#include &lt;mach/menelaus.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='ctx'> </div><div class='ctx'> #undef NEW_BOARD_LEARNING_MODE</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c<br/>index 6f1516f50750..6d30c6d334c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/pxa27x_keypad.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/keyboard/pxa27x_keypad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/pxa27x_keypad.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/pxa27x_keypad.c</a></div><div class='hunk'>@@ -26,12 +26,11 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa27x_keypad.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa27x_keypad.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Keypad Controller registers</div><div class='head'>diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c<br/>index 1aa37181c40f..de67b8e0a799 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/spitzkbd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/keyboard/spitzkbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/spitzkbd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/spitzkbd.c</a></div><div class='hunk'>@@ -20,10 +20,10 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/spitz.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/spitz.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define KB_ROWS			7</div><div class='ctx'> #define KB_COLS			11</div><div class='head'>diff --git a/drivers/input/keyboard/tosakbd.c b/drivers/input/keyboard/tosakbd.c<br/>index b12b7ee4b6aa..44cb50af3ce9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/tosakbd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/keyboard/tosakbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/tosakbd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/keyboard/tosakbd.c</a></div><div class='hunk'>@@ -19,8 +19,8 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/tosa.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/tosa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define KB_ROWMASK(r)		(1 &lt;&lt; (r))</div><div class='ctx'> #define SCANCODE(r, c)		(((r)&lt;&lt;4) + (c) + 1)</div><div class='head'>diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c<br/>index 6a1f48b76e32..2adf9cb265da 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/cobalt_btns.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/misc/cobalt_btns.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/cobalt_btns.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/misc/cobalt_btns.c</a></div><div class='hunk'>@@ -148,6 +148,9 @@ static int __devexit cobalt_buttons_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+MODULE_AUTHOR("Yoichi Yuasa &lt;yoichi_yuasa@tripeaks.co.jp&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Cobalt button interface driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='ctx'> /* work with hotplug and coldplug */</div><div class='ctx'> MODULE_ALIAS("platform:Cobalt buttons");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c<br/>index 798d84c44d03..9946d73624b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/ixp4xx-beeper.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/misc/ixp4xx-beeper.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/ixp4xx-beeper.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/misc/ixp4xx-beeper.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Alessandro Zummo &lt;a.zummo@towertech.it&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("ixp4xx beeper driver");</div><div class='head'>diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig<br/>index 7bbea097cda2..f996546fc443 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/mouse/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/mouse/Kconfig</a></div><div class='hunk'>@@ -130,6 +130,29 @@ config MOUSE_APPLETOUCH</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called appletouch.</div><div class='ctx'> </div><div class='add'>+config MOUSE_BCM5974</div><div class='add'>+	tristate "Apple USB BCM5974 Multitouch trackpad support"</div><div class='add'>+	depends on USB_ARCH_HAS_HCD</div><div class='add'>+	select USB</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you have an Apple USB BCM5974 Multitouch</div><div class='add'>+	  trackpad.</div><div class='add'>+</div><div class='add'>+	  The BCM5974 is the multitouch trackpad found in the Macbook</div><div class='add'>+	  Air (JAN2008) and Macbook Pro Penryn (FEB2008) laptops.</div><div class='add'>+</div><div class='add'>+	  It is also found in the IPhone (2007) and Ipod Touch (2008).</div><div class='add'>+</div><div class='add'>+	  This driver provides multitouch functionality together with</div><div class='add'>+	  the synaptics X11 driver.</div><div class='add'>+</div><div class='add'>+	  The interface is currently identical to the appletouch interface,</div><div class='add'>+	  for further information, see</div><div class='add'>+	  &lt;file:Documentation/input/appletouch.txt&gt;.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called bcm5974.</div><div class='add'>+</div><div class='ctx'> config MOUSE_INPORT</div><div class='ctx'> 	tristate "InPort/MS/ATIXL busmouse"</div><div class='ctx'> 	depends on ISA</div><div class='head'>diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile<br/>index 9e6e36330820..d4d202516090 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/mouse/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/mouse/Makefile</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MOUSE_AMIGA)	+= amimouse.o</div><div class='ctx'> obj-$(CONFIG_MOUSE_APPLETOUCH)	+= appletouch.o</div><div class='add'>+obj-$(CONFIG_MOUSE_BCM5974)	+= bcm5974.o</div><div class='ctx'> obj-$(CONFIG_MOUSE_ATARI)	+= atarimouse.o</div><div class='ctx'> obj-$(CONFIG_MOUSE_RISCPC)	+= rpcmouse.o</div><div class='ctx'> obj-$(CONFIG_MOUSE_INPORT)	+= inport.o</div><div class='head'>diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c<br/>new file mode 100644<br/>index 000000000000..18f4d7f6ce6d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/bcm5974.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/mouse/bcm5974.c</a></div><div class='hunk'>@@ -0,0 +1,721 @@</div><div class='add'>+/*</div><div class='add'>+ * Apple USB BCM5974 (Macbook Air and Penryn Macbook Pro) multitouch driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008	   Henrik Rydberg (rydberg@euromail.se)</div><div class='add'>+ *</div><div class='add'>+ * The USB initialization and package decoding was made by</div><div class='add'>+ * Scott Shawcroft as part of the touchd user-space driver project:</div><div class='add'>+ * Copyright (C) 2008	   Scott Shawcroft (scott.shawcroft@gmail.com)</div><div class='add'>+ *</div><div class='add'>+ * The BCM5974 driver is based on the appletouch driver:</div><div class='add'>+ * Copyright (C) 2001-2004 Greg Kroah-Hartman (greg@kroah.com)</div><div class='add'>+ * Copyright (C) 2005      Johannes Berg (johannes@sipsolutions.net)</div><div class='add'>+ * Copyright (C) 2005	   Stelian Pop (stelian@popies.net)</div><div class='add'>+ * Copyright (C) 2005	   Frank Arnold (frank@scirocco-5v-turbo.de)</div><div class='add'>+ * Copyright (C) 2005	   Peter Osterlund (petero2@telia.com)</div><div class='add'>+ * Copyright (C) 2005	   Michael Hanselmann (linux-kernel@hansmi.ch)</div><div class='add'>+ * Copyright (C) 2006	   Nicolas Boichat (nicolas@boichat.ch)</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+</div><div class='add'>+#define USB_VENDOR_ID_APPLE		0x05ac</div><div class='add'>+</div><div class='add'>+/* MacbookAir, aka wellspring */</div><div class='add'>+#define USB_DEVICE_ID_APPLE_WELLSPRING_ANSI	0x0223</div><div class='add'>+#define USB_DEVICE_ID_APPLE_WELLSPRING_ISO	0x0224</div><div class='add'>+#define USB_DEVICE_ID_APPLE_WELLSPRING_JIS	0x0225</div><div class='add'>+/* MacbookProPenryn, aka wellspring2 */</div><div class='add'>+#define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI	0x0230</div><div class='add'>+#define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO	0x0231</div><div class='add'>+#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS	0x0232</div><div class='add'>+</div><div class='add'>+#define BCM5974_DEVICE(prod) {					\</div><div class='add'>+	.match_flags = (USB_DEVICE_ID_MATCH_DEVICE |		\</div><div class='add'>+			USB_DEVICE_ID_MATCH_INT_CLASS |		\</div><div class='add'>+			USB_DEVICE_ID_MATCH_INT_PROTOCOL),	\</div><div class='add'>+	.idVendor = USB_VENDOR_ID_APPLE,			\</div><div class='add'>+	.idProduct = (prod),					\</div><div class='add'>+	.bInterfaceClass = USB_INTERFACE_CLASS_HID,		\</div><div class='add'>+	.bInterfaceProtocol = USB_INTERFACE_PROTOCOL_MOUSE	\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* table of devices that work with this driver */</div><div class='add'>+static const struct usb_device_id bcm5974_table[] = {</div><div class='add'>+	/* MacbookAir1.1 */</div><div class='add'>+	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),</div><div class='add'>+	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING_ISO),</div><div class='add'>+	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING_JIS),</div><div class='add'>+	/* MacbookProPenryn */</div><div class='add'>+	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI),</div><div class='add'>+	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_ISO),</div><div class='add'>+	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_JIS),</div><div class='add'>+	/* Terminating entry */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(usb, bcm5974_table);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Henrik Rydberg");</div><div class='add'>+MODULE_DESCRIPTION("Apple USB BCM5974 multitouch driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+#define dprintk(level, format, a...)\</div><div class='add'>+	{ if (debug &gt;= level) printk(KERN_DEBUG format, ##a); }</div><div class='add'>+</div><div class='add'>+static int debug = 1;</div><div class='add'>+module_param(debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "Activate debugging output");</div><div class='add'>+</div><div class='add'>+/* button data structure */</div><div class='add'>+struct bt_data {</div><div class='add'>+	u8 unknown1;		/* constant */</div><div class='add'>+	u8 button;		/* left button */</div><div class='add'>+	u8 rel_x;		/* relative x coordinate */</div><div class='add'>+	u8 rel_y;		/* relative y coordinate */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* trackpad header structure */</div><div class='add'>+struct tp_header {</div><div class='add'>+	u8 unknown1[16];	/* constants, timers, etc */</div><div class='add'>+	u8 fingers;		/* number of fingers on trackpad */</div><div class='add'>+	u8 unknown2[9];		/* constants, timers, etc */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* trackpad finger structure */</div><div class='add'>+struct tp_finger {</div><div class='add'>+	__le16 origin;		/* zero when switching track finger */</div><div class='add'>+	__le16 abs_x;		/* absolute x coodinate */</div><div class='add'>+	__le16 abs_y;		/* absolute y coodinate */</div><div class='add'>+	__le16 rel_x;		/* relative x coodinate */</div><div class='add'>+	__le16 rel_y;		/* relative y coodinate */</div><div class='add'>+	__le16 size_major;	/* finger size, major axis? */</div><div class='add'>+	__le16 size_minor;	/* finger size, minor axis? */</div><div class='add'>+	__le16 orientation;	/* 16384 when point, else 15 bit angle */</div><div class='add'>+	__le16 force_major;	/* trackpad force, major axis? */</div><div class='add'>+	__le16 force_minor;	/* trackpad force, minor axis? */</div><div class='add'>+	__le16 unused[3];	/* zeros */</div><div class='add'>+	__le16 multi;		/* one finger: varies, more fingers: constant */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* trackpad data structure, empirically at least ten fingers */</div><div class='add'>+struct tp_data {</div><div class='add'>+	struct tp_header header;</div><div class='add'>+	struct tp_finger finger[16];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* device-specific parameters */</div><div class='add'>+struct bcm5974_param {</div><div class='add'>+	int dim;		/* logical dimension */</div><div class='add'>+	int fuzz;		/* logical noise value */</div><div class='add'>+	int devmin;		/* device minimum reading */</div><div class='add'>+	int devmax;		/* device maximum reading */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* device-specific configuration */</div><div class='add'>+struct bcm5974_config {</div><div class='add'>+	int ansi, iso, jis;	/* the product id of this device */</div><div class='add'>+	int bt_ep;		/* the endpoint of the button interface */</div><div class='add'>+	int bt_datalen;		/* data length of the button interface */</div><div class='add'>+	int tp_ep;		/* the endpoint of the trackpad interface */</div><div class='add'>+	int tp_datalen;		/* data length of the trackpad interface */</div><div class='add'>+	struct bcm5974_param p;	/* finger pressure limits */</div><div class='add'>+	struct bcm5974_param w;	/* finger width limits */</div><div class='add'>+	struct bcm5974_param x;	/* horizontal limits */</div><div class='add'>+	struct bcm5974_param y;	/* vertical limits */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* logical device structure */</div><div class='add'>+struct bcm5974 {</div><div class='add'>+	char phys[64];</div><div class='add'>+	struct usb_device *udev;	/* usb device */</div><div class='add'>+	struct usb_interface *intf;	/* our interface */</div><div class='add'>+	struct input_dev *input;	/* input dev */</div><div class='add'>+	struct bcm5974_config cfg;	/* device configuration */</div><div class='add'>+	struct mutex pm_mutex;		/* serialize access to open/suspend */</div><div class='add'>+	int opened;			/* 1: opened, 0: closed */</div><div class='add'>+	struct urb *bt_urb;		/* button usb request block */</div><div class='add'>+	struct bt_data *bt_data;	/* button transferred data */</div><div class='add'>+	struct urb *tp_urb;		/* trackpad usb request block */</div><div class='add'>+	struct tp_data *tp_data;	/* trackpad transferred data */</div><div class='add'>+	int fingers;			/* number of fingers on trackpad */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* logical dimensions */</div><div class='add'>+#define DIM_PRESSURE	256		/* maximum finger pressure */</div><div class='add'>+#define DIM_WIDTH	16		/* maximum finger width */</div><div class='add'>+#define DIM_X		1280		/* maximum trackpad x value */</div><div class='add'>+#define DIM_Y		800		/* maximum trackpad y value */</div><div class='add'>+</div><div class='add'>+/* logical signal quality */</div><div class='add'>+#define SN_PRESSURE	45		/* pressure signal-to-noise ratio */</div><div class='add'>+#define SN_WIDTH	100		/* width signal-to-noise ratio */</div><div class='add'>+#define SN_COORD	250		/* coordinate signal-to-noise ratio */</div><div class='add'>+</div><div class='add'>+/* pressure thresholds */</div><div class='add'>+#define PRESSURE_LOW	(2 * DIM_PRESSURE / SN_PRESSURE)</div><div class='add'>+#define PRESSURE_HIGH	(3 * PRESSURE_LOW)</div><div class='add'>+</div><div class='add'>+/* device constants */</div><div class='add'>+static const struct bcm5974_config bcm5974_config_table[] = {</div><div class='add'>+	{</div><div class='add'>+		USB_DEVICE_ID_APPLE_WELLSPRING_ANSI,</div><div class='add'>+		USB_DEVICE_ID_APPLE_WELLSPRING_ISO,</div><div class='add'>+		USB_DEVICE_ID_APPLE_WELLSPRING_JIS,</div><div class='add'>+		0x84, sizeof(struct bt_data),</div><div class='add'>+		0x81, sizeof(struct tp_data),</div><div class='add'>+		{ DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 256 },</div><div class='add'>+		{ DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },</div><div class='add'>+		{ DIM_X, DIM_X / SN_COORD, -4824, 5342 },</div><div class='add'>+		{ DIM_Y, DIM_Y / SN_COORD, -172, 5820 }</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI,</div><div class='add'>+		USB_DEVICE_ID_APPLE_WELLSPRING2_ISO,</div><div class='add'>+		USB_DEVICE_ID_APPLE_WELLSPRING2_JIS,</div><div class='add'>+		0x84, sizeof(struct bt_data),</div><div class='add'>+		0x81, sizeof(struct tp_data),</div><div class='add'>+		{ DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 256 },</div><div class='add'>+		{ DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },</div><div class='add'>+		{ DIM_X, DIM_X / SN_COORD, -4824, 4824 },</div><div class='add'>+		{ DIM_Y, DIM_Y / SN_COORD, -172, 4290 }</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* return the device-specific configuration by device */</div><div class='add'>+static const struct bcm5974_config *bcm5974_get_config(struct usb_device *udev)</div><div class='add'>+{</div><div class='add'>+	u16 id = le16_to_cpu(udev-&gt;descriptor.idProduct);</div><div class='add'>+	const struct bcm5974_config *cfg;</div><div class='add'>+</div><div class='add'>+	for (cfg = bcm5974_config_table; cfg-&gt;ansi; ++cfg)</div><div class='add'>+		if (cfg-&gt;ansi == id || cfg-&gt;iso == id || cfg-&gt;jis == id)</div><div class='add'>+			return cfg;</div><div class='add'>+</div><div class='add'>+	return bcm5974_config_table;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert 16-bit little endian to signed integer */</div><div class='add'>+static inline int raw2int(__le16 x)</div><div class='add'>+{</div><div class='add'>+	return (signed short)le16_to_cpu(x);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* scale device data to logical dimensions (asserts devmin &lt; devmax) */</div><div class='add'>+static inline int int2scale(const struct bcm5974_param *p, int x)</div><div class='add'>+{</div><div class='add'>+	return x * p-&gt;dim / (p-&gt;devmax - p-&gt;devmin);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* all logical value ranges are [0,dim). */</div><div class='add'>+static inline int int2bound(const struct bcm5974_param *p, int x)</div><div class='add'>+{</div><div class='add'>+	int s = int2scale(p, x);</div><div class='add'>+</div><div class='add'>+	return clamp_val(s, 0, p-&gt;dim - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* setup which logical events to report */</div><div class='add'>+static void setup_events_to_report(struct input_dev *input_dev,</div><div class='add'>+				   const struct bcm5974_config *cfg)</div><div class='add'>+{</div><div class='add'>+	__set_bit(EV_ABS, input_dev-&gt;evbit);</div><div class='add'>+</div><div class='add'>+	input_set_abs_params(input_dev, ABS_PRESSURE,</div><div class='add'>+				0, cfg-&gt;p.dim, cfg-&gt;p.fuzz, 0);</div><div class='add'>+	input_set_abs_params(input_dev, ABS_TOOL_WIDTH,</div><div class='add'>+				0, cfg-&gt;w.dim, cfg-&gt;w.fuzz, 0);</div><div class='add'>+	input_set_abs_params(input_dev, ABS_X,</div><div class='add'>+				0, cfg-&gt;x.dim, cfg-&gt;x.fuzz, 0);</div><div class='add'>+	input_set_abs_params(input_dev, ABS_Y,</div><div class='add'>+				0, cfg-&gt;y.dim, cfg-&gt;y.fuzz, 0);</div><div class='add'>+</div><div class='add'>+	__set_bit(EV_KEY, input_dev-&gt;evbit);</div><div class='add'>+	__set_bit(BTN_TOUCH, input_dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_TOOL_FINGER, input_dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_TOOL_DOUBLETAP, input_dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_TOOL_TRIPLETAP, input_dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_LEFT, input_dev-&gt;keybit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* report button data as logical button state */</div><div class='add'>+static int report_bt_state(struct bcm5974 *dev, int size)</div><div class='add'>+{</div><div class='add'>+	if (size != sizeof(struct bt_data))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	input_report_key(dev-&gt;input, BTN_LEFT, dev-&gt;bt_data-&gt;button);</div><div class='add'>+	input_sync(dev-&gt;input);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* report trackpad data as logical trackpad state */</div><div class='add'>+static int report_tp_state(struct bcm5974 *dev, int size)</div><div class='add'>+{</div><div class='add'>+	const struct bcm5974_config *c = &amp;dev-&gt;cfg;</div><div class='add'>+	const struct tp_finger *f = dev-&gt;tp_data-&gt;finger;</div><div class='add'>+	struct input_dev *input = dev-&gt;input;</div><div class='add'>+	const int fingers = (size - 26) / 28;</div><div class='add'>+	int raw_p, raw_w, raw_x, raw_y;</div><div class='add'>+	int ptest = 0, origin = 0, nmin = 0, nmax = 0;</div><div class='add'>+	int abs_p = 0, abs_w = 0, abs_x = 0, abs_y = 0;</div><div class='add'>+</div><div class='add'>+	if (size &lt; 26 || (size - 26) % 28 != 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* always track the first finger; when detached, start over */</div><div class='add'>+	if (fingers) {</div><div class='add'>+		raw_p = raw2int(f-&gt;force_major);</div><div class='add'>+		raw_w = raw2int(f-&gt;size_major);</div><div class='add'>+		raw_x = raw2int(f-&gt;abs_x);</div><div class='add'>+		raw_y = raw2int(f-&gt;abs_y);</div><div class='add'>+</div><div class='add'>+		dprintk(9,</div><div class='add'>+			"bcm5974: raw: p: %+05d w: %+05d x: %+05d y: %+05d\n",</div><div class='add'>+			raw_p, raw_w, raw_x, raw_y);</div><div class='add'>+</div><div class='add'>+		ptest = int2bound(&amp;c-&gt;p, raw_p);</div><div class='add'>+		origin = raw2int(f-&gt;origin);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* while tracking finger still valid, count all fingers */</div><div class='add'>+	if (ptest &gt; PRESSURE_LOW &amp;&amp; origin) {</div><div class='add'>+		abs_p = ptest;</div><div class='add'>+		abs_w = int2bound(&amp;c-&gt;w, raw_w);</div><div class='add'>+		abs_x = int2bound(&amp;c-&gt;x, raw_x - c-&gt;x.devmin);</div><div class='add'>+		abs_y = int2bound(&amp;c-&gt;y, c-&gt;y.devmax - raw_y);</div><div class='add'>+		for (; f != dev-&gt;tp_data-&gt;finger + fingers; f++) {</div><div class='add'>+			ptest = int2bound(&amp;c-&gt;p, raw2int(f-&gt;force_major));</div><div class='add'>+			if (ptest &gt; PRESSURE_LOW)</div><div class='add'>+				nmax++;</div><div class='add'>+			if (ptest &gt; PRESSURE_HIGH)</div><div class='add'>+				nmin++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;fingers &lt; nmin)</div><div class='add'>+		dev-&gt;fingers = nmin;</div><div class='add'>+	if (dev-&gt;fingers &gt; nmax)</div><div class='add'>+		dev-&gt;fingers = nmax;</div><div class='add'>+</div><div class='add'>+	input_report_key(input, BTN_TOUCH, dev-&gt;fingers &gt; 0);</div><div class='add'>+	input_report_key(input, BTN_TOOL_FINGER, dev-&gt;fingers == 1);</div><div class='add'>+	input_report_key(input, BTN_TOOL_DOUBLETAP, dev-&gt;fingers == 2);</div><div class='add'>+	input_report_key(input, BTN_TOOL_TRIPLETAP, dev-&gt;fingers &gt; 2);</div><div class='add'>+</div><div class='add'>+	input_report_abs(input, ABS_PRESSURE, abs_p);</div><div class='add'>+	input_report_abs(input, ABS_TOOL_WIDTH, abs_w);</div><div class='add'>+</div><div class='add'>+	if (abs_p) {</div><div class='add'>+		input_report_abs(input, ABS_X, abs_x);</div><div class='add'>+		input_report_abs(input, ABS_Y, abs_y);</div><div class='add'>+</div><div class='add'>+		dprintk(8,</div><div class='add'>+			"bcm5974: abs: p: %+05d w: %+05d x: %+05d y: %+05d "</div><div class='add'>+			"nmin: %d nmax: %d n: %d\n",</div><div class='add'>+			abs_p, abs_w, abs_x, abs_y, nmin, nmax, dev-&gt;fingers);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_sync(input);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Wellspring initialization constants */</div><div class='add'>+#define BCM5974_WELLSPRING_MODE_READ_REQUEST_ID		1</div><div class='add'>+#define BCM5974_WELLSPRING_MODE_WRITE_REQUEST_ID	9</div><div class='add'>+#define BCM5974_WELLSPRING_MODE_REQUEST_VALUE		0x300</div><div class='add'>+#define BCM5974_WELLSPRING_MODE_REQUEST_INDEX		0</div><div class='add'>+#define BCM5974_WELLSPRING_MODE_VENDOR_VALUE		0x01</div><div class='add'>+</div><div class='add'>+static int bcm5974_wellspring_mode(struct bcm5974 *dev)</div><div class='add'>+{</div><div class='add'>+	char *data = kmalloc(8, GFP_KERNEL);</div><div class='add'>+	int retval = 0, size;</div><div class='add'>+</div><div class='add'>+	if (!data) {</div><div class='add'>+		err("bcm5974: out of memory");</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* read configuration */</div><div class='add'>+	size = usb_control_msg(dev-&gt;udev, usb_rcvctrlpipe(dev-&gt;udev, 0),</div><div class='add'>+			BCM5974_WELLSPRING_MODE_READ_REQUEST_ID,</div><div class='add'>+			USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,</div><div class='add'>+			BCM5974_WELLSPRING_MODE_REQUEST_VALUE,</div><div class='add'>+			BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);</div><div class='add'>+</div><div class='add'>+	if (size != 8) {</div><div class='add'>+		err("bcm5974: could not read from device");</div><div class='add'>+		retval = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* apply the mode switch */</div><div class='add'>+	data[0] = BCM5974_WELLSPRING_MODE_VENDOR_VALUE;</div><div class='add'>+</div><div class='add'>+	/* write configuration */</div><div class='add'>+	size = usb_control_msg(dev-&gt;udev, usb_sndctrlpipe(dev-&gt;udev, 0),</div><div class='add'>+			BCM5974_WELLSPRING_MODE_WRITE_REQUEST_ID,</div><div class='add'>+			USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,</div><div class='add'>+			BCM5974_WELLSPRING_MODE_REQUEST_VALUE,</div><div class='add'>+			BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);</div><div class='add'>+</div><div class='add'>+	if (size != 8) {</div><div class='add'>+		err("bcm5974: could not write to device");</div><div class='add'>+		retval = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dprintk(2, "bcm5974: switched to wellspring mode.\n");</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm5974_irq_button(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct bcm5974 *dev = urb-&gt;context;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case -EOVERFLOW:</div><div class='add'>+	case -ECONNRESET:</div><div class='add'>+	case -ENOENT:</div><div class='add'>+	case -ESHUTDOWN:</div><div class='add'>+		dbg("bcm5974: button urb shutting down: %d", urb-&gt;status);</div><div class='add'>+		return;</div><div class='add'>+	default:</div><div class='add'>+		dbg("bcm5974: button urb status: %d", urb-&gt;status);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (report_bt_state(dev, dev-&gt;bt_urb-&gt;actual_length))</div><div class='add'>+		dprintk(1, "bcm5974: bad button package, length: %d\n",</div><div class='add'>+			dev-&gt;bt_urb-&gt;actual_length);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	error = usb_submit_urb(dev-&gt;bt_urb, GFP_ATOMIC);</div><div class='add'>+	if (error)</div><div class='add'>+		err("bcm5974: button urb failed: %d", error);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm5974_irq_trackpad(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct bcm5974 *dev = urb-&gt;context;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case -EOVERFLOW:</div><div class='add'>+	case -ECONNRESET:</div><div class='add'>+	case -ENOENT:</div><div class='add'>+	case -ESHUTDOWN:</div><div class='add'>+		dbg("bcm5974: trackpad urb shutting down: %d", urb-&gt;status);</div><div class='add'>+		return;</div><div class='add'>+	default:</div><div class='add'>+		dbg("bcm5974: trackpad urb status: %d", urb-&gt;status);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* control response ignored */</div><div class='add'>+	if (dev-&gt;tp_urb-&gt;actual_length == 2)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	if (report_tp_state(dev, dev-&gt;tp_urb-&gt;actual_length))</div><div class='add'>+		dprintk(1, "bcm5974: bad trackpad package, length: %d\n",</div><div class='add'>+			dev-&gt;tp_urb-&gt;actual_length);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	error = usb_submit_urb(dev-&gt;tp_urb, GFP_ATOMIC);</div><div class='add'>+	if (error)</div><div class='add'>+		err("bcm5974: trackpad urb failed: %d", error);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Wellspring trackpad, like many recent Apple trackpads, share</div><div class='add'>+ * the usb device with the keyboard. Since keyboards are usually</div><div class='add'>+ * handled by the HID system, the device ends up being handled by two</div><div class='add'>+ * modules. Setting up the device therefore becomes slightly</div><div class='add'>+ * complicated. To enable multitouch features, a mode switch is</div><div class='add'>+ * required, which is usually applied via the control interface of the</div><div class='add'>+ * device.  It can be argued where this switch should take place. In</div><div class='add'>+ * some drivers, like appletouch, the switch is made during</div><div class='add'>+ * probe. However, the hid module may also alter the state of the</div><div class='add'>+ * device, resulting in trackpad malfunction under certain</div><div class='add'>+ * circumstances. To get around this problem, there is at least one</div><div class='add'>+ * example that utilizes the USB_QUIRK_RESET_RESUME quirk in order to</div><div class='add'>+ * recieve a reset_resume request rather than the normal resume.</div><div class='add'>+ * Since the implementation of reset_resume is equal to mode switch</div><div class='add'>+ * plus start_traffic, it seems easier to always do the switch when</div><div class='add'>+ * starting traffic on the device.</div><div class='add'>+ */</div><div class='add'>+static int bcm5974_start_traffic(struct bcm5974 *dev)</div><div class='add'>+{</div><div class='add'>+	if (bcm5974_wellspring_mode(dev)) {</div><div class='add'>+		dprintk(1, "bcm5974: mode switch failed\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (usb_submit_urb(dev-&gt;bt_urb, GFP_KERNEL))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (usb_submit_urb(dev-&gt;tp_urb, GFP_KERNEL))</div><div class='add'>+		goto err_kill_bt;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_kill_bt:</div><div class='add'>+	usb_kill_urb(dev-&gt;bt_urb);</div><div class='add'>+error:</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm5974_pause_traffic(struct bcm5974 *dev)</div><div class='add'>+{</div><div class='add'>+	usb_kill_urb(dev-&gt;tp_urb);</div><div class='add'>+	usb_kill_urb(dev-&gt;bt_urb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The code below implements open/close and manual suspend/resume.</div><div class='add'>+ * All functions may be called in random order.</div><div class='add'>+ *</div><div class='add'>+ * Opening a suspended device fails with EACCES - permission denied.</div><div class='add'>+ *</div><div class='add'>+ * Failing a resume leaves the device resumed but closed.</div><div class='add'>+ */</div><div class='add'>+static int bcm5974_open(struct input_dev *input)</div><div class='add'>+{</div><div class='add'>+	struct bcm5974 *dev = input_get_drvdata(input);</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = usb_autopm_get_interface(dev-&gt;intf);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	error = bcm5974_start_traffic(dev);</div><div class='add'>+	if (!error)</div><div class='add'>+		dev-&gt;opened = 1;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	if (error)</div><div class='add'>+		usb_autopm_put_interface(dev-&gt;intf);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm5974_close(struct input_dev *input)</div><div class='add'>+{</div><div class='add'>+	struct bcm5974 *dev = input_get_drvdata(input);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	bcm5974_pause_traffic(dev);</div><div class='add'>+	dev-&gt;opened = 0;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	usb_autopm_put_interface(dev-&gt;intf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm5974_suspend(struct usb_interface *iface, pm_message_t message)</div><div class='add'>+{</div><div class='add'>+	struct bcm5974 *dev = usb_get_intfdata(iface);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;opened)</div><div class='add'>+		bcm5974_pause_traffic(dev);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm5974_resume(struct usb_interface *iface)</div><div class='add'>+{</div><div class='add'>+	struct bcm5974 *dev = usb_get_intfdata(iface);</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;opened)</div><div class='add'>+		error = bcm5974_start_traffic(dev);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm5974_probe(struct usb_interface *iface,</div><div class='add'>+			 const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(iface);</div><div class='add'>+	const struct bcm5974_config *cfg;</div><div class='add'>+	struct bcm5974 *dev;</div><div class='add'>+	struct input_dev *input_dev;</div><div class='add'>+	int error = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* find the product index */</div><div class='add'>+	cfg = bcm5974_get_config(udev);</div><div class='add'>+</div><div class='add'>+	/* allocate memory for our device state and initialize it */</div><div class='add'>+	dev = kzalloc(sizeof(struct bcm5974), GFP_KERNEL);</div><div class='add'>+	input_dev = input_allocate_device();</div><div class='add'>+	if (!dev || !input_dev) {</div><div class='add'>+		err("bcm5974: out of memory");</div><div class='add'>+		goto err_free_devs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;udev = udev;</div><div class='add'>+	dev-&gt;intf = iface;</div><div class='add'>+	dev-&gt;input = input_dev;</div><div class='add'>+	dev-&gt;cfg = *cfg;</div><div class='add'>+	mutex_init(&amp;dev-&gt;pm_mutex);</div><div class='add'>+</div><div class='add'>+	/* setup urbs */</div><div class='add'>+	dev-&gt;bt_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (!dev-&gt;bt_urb)</div><div class='add'>+		goto err_free_devs;</div><div class='add'>+</div><div class='add'>+	dev-&gt;tp_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (!dev-&gt;tp_urb)</div><div class='add'>+		goto err_free_bt_urb;</div><div class='add'>+</div><div class='add'>+	dev-&gt;bt_data = usb_buffer_alloc(dev-&gt;udev,</div><div class='add'>+					dev-&gt;cfg.bt_datalen, GFP_KERNEL,</div><div class='add'>+					&amp;dev-&gt;bt_urb-&gt;transfer_dma);</div><div class='add'>+	if (!dev-&gt;bt_data)</div><div class='add'>+		goto err_free_urb;</div><div class='add'>+</div><div class='add'>+	dev-&gt;tp_data = usb_buffer_alloc(dev-&gt;udev,</div><div class='add'>+					dev-&gt;cfg.tp_datalen, GFP_KERNEL,</div><div class='add'>+					&amp;dev-&gt;tp_urb-&gt;transfer_dma);</div><div class='add'>+	if (!dev-&gt;tp_data)</div><div class='add'>+		goto err_free_bt_buffer;</div><div class='add'>+</div><div class='add'>+	usb_fill_int_urb(dev-&gt;bt_urb, udev,</div><div class='add'>+			 usb_rcvintpipe(udev, cfg-&gt;bt_ep),</div><div class='add'>+			 dev-&gt;bt_data, dev-&gt;cfg.bt_datalen,</div><div class='add'>+			 bcm5974_irq_button, dev, 1);</div><div class='add'>+</div><div class='add'>+	usb_fill_int_urb(dev-&gt;tp_urb, udev,</div><div class='add'>+			 usb_rcvintpipe(udev, cfg-&gt;tp_ep),</div><div class='add'>+			 dev-&gt;tp_data, dev-&gt;cfg.tp_datalen,</div><div class='add'>+			 bcm5974_irq_trackpad, dev, 1);</div><div class='add'>+</div><div class='add'>+	/* create bcm5974 device */</div><div class='add'>+	usb_make_path(udev, dev-&gt;phys, sizeof(dev-&gt;phys));</div><div class='add'>+	strlcat(dev-&gt;phys, "/input0", sizeof(dev-&gt;phys));</div><div class='add'>+</div><div class='add'>+	input_dev-&gt;name = "bcm5974";</div><div class='add'>+	input_dev-&gt;phys = dev-&gt;phys;</div><div class='add'>+	usb_to_input_id(dev-&gt;udev, &amp;input_dev-&gt;id);</div><div class='add'>+	input_dev-&gt;dev.parent = &amp;iface-&gt;dev;</div><div class='add'>+</div><div class='add'>+	input_set_drvdata(input_dev, dev);</div><div class='add'>+</div><div class='add'>+	input_dev-&gt;open = bcm5974_open;</div><div class='add'>+	input_dev-&gt;close = bcm5974_close;</div><div class='add'>+</div><div class='add'>+	setup_events_to_report(input_dev, cfg);</div><div class='add'>+</div><div class='add'>+	error = input_register_device(dev-&gt;input);</div><div class='add'>+	if (error)</div><div class='add'>+		goto err_free_buffer;</div><div class='add'>+</div><div class='add'>+	/* save our data pointer in this interface device */</div><div class='add'>+	usb_set_intfdata(iface, dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_buffer:</div><div class='add'>+	usb_buffer_free(dev-&gt;udev, dev-&gt;cfg.tp_datalen,</div><div class='add'>+		dev-&gt;tp_data, dev-&gt;tp_urb-&gt;transfer_dma);</div><div class='add'>+err_free_bt_buffer:</div><div class='add'>+	usb_buffer_free(dev-&gt;udev, dev-&gt;cfg.bt_datalen,</div><div class='add'>+		dev-&gt;bt_data, dev-&gt;bt_urb-&gt;transfer_dma);</div><div class='add'>+err_free_urb:</div><div class='add'>+	usb_free_urb(dev-&gt;tp_urb);</div><div class='add'>+err_free_bt_urb:</div><div class='add'>+	usb_free_urb(dev-&gt;bt_urb);</div><div class='add'>+err_free_devs:</div><div class='add'>+	usb_set_intfdata(iface, NULL);</div><div class='add'>+	input_free_device(input_dev);</div><div class='add'>+	kfree(dev);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm5974_disconnect(struct usb_interface *iface)</div><div class='add'>+{</div><div class='add'>+	struct bcm5974 *dev = usb_get_intfdata(iface);</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(iface, NULL);</div><div class='add'>+</div><div class='add'>+	input_unregister_device(dev-&gt;input);</div><div class='add'>+	usb_buffer_free(dev-&gt;udev, dev-&gt;cfg.tp_datalen,</div><div class='add'>+			dev-&gt;tp_data, dev-&gt;tp_urb-&gt;transfer_dma);</div><div class='add'>+	usb_buffer_free(dev-&gt;udev, dev-&gt;cfg.bt_datalen,</div><div class='add'>+			dev-&gt;bt_data, dev-&gt;bt_urb-&gt;transfer_dma);</div><div class='add'>+	usb_free_urb(dev-&gt;tp_urb);</div><div class='add'>+	usb_free_urb(dev-&gt;bt_urb);</div><div class='add'>+	kfree(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_driver bcm5974_driver = {</div><div class='add'>+	.name			= "bcm5974",</div><div class='add'>+	.probe			= bcm5974_probe,</div><div class='add'>+	.disconnect		= bcm5974_disconnect,</div><div class='add'>+	.suspend		= bcm5974_suspend,</div><div class='add'>+	.resume			= bcm5974_resume,</div><div class='add'>+	.reset_resume		= bcm5974_resume,</div><div class='add'>+	.id_table		= bcm5974_table,</div><div class='add'>+	.supports_autosuspend	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init bcm5974_init(void)</div><div class='add'>+{</div><div class='add'>+	return usb_register(&amp;bcm5974_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit bcm5974_exit(void)</div><div class='add'>+{</div><div class='add'>+	usb_deregister(&amp;bcm5974_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(bcm5974_init);</div><div class='add'>+module_exit(bcm5974_exit);</div><div class='add'>+</div><div class='head'>diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c<br/>index 339290184871..72cf5e33790e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/gpio_mouse.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/mouse/gpio_mouse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/gpio_mouse.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/mouse/gpio_mouse.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/input-polldev.h&gt;</div><div class='head'>diff --git a/drivers/input/mouse/rpcmouse.c b/drivers/input/mouse/rpcmouse.c<br/>index 18a48636ba4a..56c079ef5018 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/rpcmouse.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/mouse/rpcmouse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/rpcmouse.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/mouse/rpcmouse.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iomd.h&gt;</div><div class='head'>diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h<br/>index d9ca55891cd7..692a79ec2a22 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/i8042-sparcio.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/serio/i8042-sparcio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/i8042-sparcio.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/serio/i8042-sparcio.h</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='ctx'> #ifndef _I8042_SPARCIO_H</div><div class='ctx'> #define _I8042_SPARCIO_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int i8042_kbd_irq = -1;</div><div class='ctx'> static int i8042_aux_irq = -1;</div><div class='hunk'>@@ -41,6 +42,8 @@ static inline void i8042_write_command(int val)</div><div class='ctx'> 	writeb(val, kbd_iobase + 0x64UL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+</div><div class='ctx'> #define OBP_PS2KBD_NAME1	"kb_ps2"</div><div class='ctx'> #define OBP_PS2KBD_NAME2	"keyboard"</div><div class='ctx'> #define OBP_PS2MS_NAME1		"kdmouse"</div><div class='hunk'>@@ -101,9 +104,6 @@ static struct of_platform_driver sparc_i8042_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init i8042_platform_init(void)</div><div class='ctx'> {</div><div class='del'>-#ifndef CONFIG_PCI</div><div class='del'>-	return -ENODEV;</div><div class='del'>-#else</div><div class='ctx'> 	struct device_node *root = of_find_node_by_path("/");</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(root-&gt;name, "SUNW,JavaStation-1")) {</div><div class='hunk'>@@ -131,17 +131,25 @@ static int __init i8042_platform_init(void)</div><div class='ctx'> 	i8042_reset = 1;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-#endif /* CONFIG_PCI */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void i8042_platform_exit(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='ctx'> 	struct device_node *root = of_find_node_by_path("/");</div><div class='ctx'> </div><div class='ctx'> 	if (strcmp(root-&gt;name, "SUNW,JavaStation-1"))</div><div class='ctx'> 		of_unregister_driver(&amp;sparc_i8042_driver);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#else /* !CONFIG_PCI */</div><div class='add'>+static int __init i8042_platform_init(void)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void i8042_platform_exit(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* !CONFIG_PCI */</div><div class='add'>+</div><div class='ctx'> #endif /* _I8042_SPARCIO_H */</div><div class='head'>diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h<br/>index fe732a574ec2..5aafe24984c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/i8042-x86ia64io.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/serio/i8042-x86ia64io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/i8042-x86ia64io.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/serio/i8042-x86ia64io.h</a></div><div class='hunk'>@@ -305,7 +305,7 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {</div><div class='ctx'> 		.ident = "Lenovo 3000 n100",</div><div class='ctx'> 		.matches = {</div><div class='ctx'> 			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),</div><div class='del'>-			DMI_MATCH(DMI_PRODUCT_VERSION, "3000 N100"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "076804U"),</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -394,6 +394,13 @@ static struct dmi_system_id __initdata i8042_dmi_dritek_table[] = {</div><div class='ctx'> 			DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2490"),</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.ident = "Acer TravelMate 4280",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c<br/>index 1567b7782478..7f36edd34f8b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/rpckbd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/serio/rpckbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/rpckbd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/serio/rpckbd.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iomd.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c<br/>index 0ed044d5e685..765007899d9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/xilinx_ps2.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/serio/xilinx_ps2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/xilinx_ps2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/serio/xilinx_ps2.c</a></div><div class='hunk'>@@ -269,8 +269,8 @@ static int xps2_setup(struct device *dev, struct resource *regs_res,</div><div class='ctx'> 	 * we have the PS2 in a good state */</div><div class='ctx'> 	out_be32(drvdata-&gt;base_address + XPS2_SRST_OFFSET, XPS2_SRST_RESET);</div><div class='ctx'> </div><div class='del'>-	dev_info(dev, "Xilinx PS2 at 0x%08X mapped to 0x%08X, irq=%d\n",</div><div class='del'>-		drvdata-&gt;phys_addr, (u32)drvdata-&gt;base_address, drvdata-&gt;irq);</div><div class='add'>+	dev_info(dev, "Xilinx PS2 at 0x%08X mapped to 0x%p, irq=%d\n",</div><div class='add'>+		drvdata-&gt;phys_addr, drvdata-&gt;base_address, drvdata-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	serio = &amp;drvdata-&gt;serio;</div><div class='ctx'> 	serio-&gt;id.type = SERIO_8042;</div><div class='head'>diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c<br/>index b9b7a98bc5a5..7df0228e836e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/tablet/gtco.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/tablet/gtco.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/tablet/gtco.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/tablet/gtco.c</a></div><div class='hunk'>@@ -64,7 +64,6 @@ Scott Hill shill@gtcocalcomp.com</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Version with a Major number of 2 is for kernel inclusion only. */</div><div class='head'>diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig<br/>index 6e60a97a234c..25287e80e236 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/touchscreen/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/Kconfig</a></div><div class='hunk'>@@ -249,29 +249,26 @@ config TOUCHSCREEN_WM97XX</div><div class='ctx'> config TOUCHSCREEN_WM9705</div><div class='ctx'> 	bool "WM9705 Touchscreen interface support"</div><div class='ctx'> 	depends on TOUCHSCREEN_WM97XX</div><div class='add'>+	default y</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y here if you have a Wolfson Microelectronics WM9705</div><div class='del'>-	  touchscreen controller connected to your system.</div><div class='del'>-</div><div class='del'>-	  If unsure, say N.</div><div class='add'>+	  Say Y here to enable support for the Wolfson Microelectronics</div><div class='add'>+	  WM9705 touchscreen controller.</div><div class='ctx'> </div><div class='ctx'> config TOUCHSCREEN_WM9712</div><div class='ctx'> 	bool "WM9712 Touchscreen interface support"</div><div class='ctx'> 	depends on TOUCHSCREEN_WM97XX</div><div class='add'>+	default y</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y here if you have a Wolfson Microelectronics WM9712</div><div class='del'>-	  touchscreen controller connected to your system.</div><div class='del'>-</div><div class='del'>-	  If unsure, say N.</div><div class='add'>+	  Say Y here to enable support for the Wolfson Microelectronics</div><div class='add'>+	  WM9712 touchscreen controller.</div><div class='ctx'> </div><div class='ctx'> config TOUCHSCREEN_WM9713</div><div class='ctx'> 	bool "WM9713 Touchscreen interface support"</div><div class='ctx'> 	depends on TOUCHSCREEN_WM97XX</div><div class='add'>+	default y</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y here if you have a Wolfson Microelectronics WM9713 touchscreen</div><div class='del'>-	  controller connected to your system.</div><div class='del'>-</div><div class='del'>-	  If unsure, say N.</div><div class='add'>+	  Say Y here to enable support for the Wolfson Microelectronics</div><div class='add'>+	  WM9713 touchscreen controller.</div><div class='ctx'> </div><div class='ctx'> config TOUCHSCREEN_WM97XX_MAINSTONE</div><div class='ctx'> 	tristate "WM97xx Mainstone accelerated touch"</div><div class='head'>diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c<br/>index d0e13fc4a88c..65202c9f63ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/corgi_ts.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/touchscreen/corgi_ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/corgi_ts.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/corgi_ts.c</a></div><div class='hunk'>@@ -19,10 +19,10 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/sharpsl.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa2xx-gpio.h&gt;</div><div class='add'>+#include &lt;mach/sharpsl.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa2xx-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define PWR_MODE_ACTIVE		0</div><div class='head'>diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c<br/>index 4f86081dc7fc..4d3139e2099d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/h3600_ts_input.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/touchscreen/h3600_ts_input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/h3600_ts_input.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/h3600_ts_input.c</a></div><div class='hunk'>@@ -39,8 +39,8 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SA1100 serial defines */</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_DESC	"H3600 touchscreen driver"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/touchscreen/jornada720_ts.c b/drivers/input/touchscreen/jornada720_ts.c<br/>index 1aca108b1031..bf44f9d68342 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/jornada720_ts.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/touchscreen/jornada720_ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/jornada720_ts.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/jornada720_ts.c</a></div><div class='hunk'>@@ -19,8 +19,8 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/jornada720.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/jornada720.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Kristoffer Ericson &lt;kristoffer.ericson@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("HP Jornada 710/720/728 touchscreen driver");</div><div class='head'>diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c<br/>index 590a1379aa32..37a555f37306 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/mainstone-wm97xx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/touchscreen/mainstone-wm97xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/mainstone-wm97xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/mainstone-wm97xx.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -33,7 +32,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/wm97xx.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define VERSION		"0.13"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/touchscreen/migor_ts.c b/drivers/input/touchscreen/migor_ts.c<br/>index c1cd99d58981..504ca11749a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/migor_ts.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/touchscreen/migor_ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/migor_ts.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/migor_ts.c</a></div><div class='hunk'>@@ -173,7 +173,7 @@ static int migor_ts_probe(struct i2c_client *client,</div><div class='ctx'> 	input_set_abs_params(input, ABS_X, 95, 955, 0, 0);</div><div class='ctx'> 	input_set_abs_params(input, ABS_Y, 85, 935, 0, 0);</div><div class='ctx'> </div><div class='del'>-	input-&gt;name = client-&gt;driver_name;</div><div class='add'>+	input-&gt;name = client-&gt;name;</div><div class='ctx'> 	input-&gt;id.bustype = BUS_I2C;</div><div class='ctx'> 	input-&gt;dev.parent = &amp;client-&gt;dev;</div><div class='ctx'> </div><div class='hunk'>@@ -192,7 +192,7 @@ static int migor_ts_probe(struct i2c_client *client,</div><div class='ctx'> 		goto err1;</div><div class='ctx'> </div><div class='ctx'> 	error = request_irq(priv-&gt;irq, migor_ts_isr, IRQF_TRIGGER_LOW,</div><div class='del'>-			    client-&gt;driver_name, priv);</div><div class='add'>+			    client-&gt;name, priv);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		dev_err(&amp;client-&gt;dev, "Unable to request touchscreen IRQ.\n");</div><div class='ctx'> 		goto err2;</div><div class='hunk'>@@ -224,12 +224,19 @@ static int migor_ts_remove(struct i2c_client *client)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct i2c_device_id migor_ts_id[] = {</div><div class='add'>+	{ "migor_ts", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, migor_ts);</div><div class='add'>+</div><div class='ctx'> static struct i2c_driver migor_ts_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "migor_ts",</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = migor_ts_probe,</div><div class='ctx'> 	.remove = migor_ts_remove,</div><div class='add'>+	.id_table = migor_ts_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init migor_ts_init(void)</div><div class='head'>diff --git a/drivers/input/touchscreen/wm9705.c b/drivers/input/touchscreen/wm9705.c<br/>index 978e1a13ffc7..372efbc694ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/wm9705.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/touchscreen/wm9705.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/wm9705.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/wm9705.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/input/touchscreen/wm9712.c b/drivers/input/touchscreen/wm9712.c<br/>index 4c5d85a249ae..c8bb1e7335fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/wm9712.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/touchscreen/wm9712.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/wm9712.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/wm9712.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/input/touchscreen/wm9713.c b/drivers/input/touchscreen/wm9713.c<br/>index 838458792ea0..781ee83547e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/wm9713.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/touchscreen/wm9713.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/wm9713.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/wm9713.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c<br/>index cdc24ad314e0..d589ab0e3adc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/wm97xx-core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/input/touchscreen/wm97xx-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/wm97xx-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/input/touchscreen/wm97xx-core.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile<br/>index 8380a4568d11..f1f777570e8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/isdn/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/isdn/Makefile</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> obj-$(CONFIG_ISDN_I4L)			+= i4l/</div><div class='ctx'> obj-$(CONFIG_ISDN_CAPI)			+= capi/</div><div class='ctx'> obj-$(CONFIG_MISDN)			+= mISDN/</div><div class='del'>-obj-$(CONFIG_ISDN_CAPI)			+= hardware/</div><div class='add'>+obj-$(CONFIG_ISDN)			+= hardware/</div><div class='ctx'> obj-$(CONFIG_ISDN_DIVERSION)		+= divert/</div><div class='ctx'> obj-$(CONFIG_ISDN_DRV_HISAX)		+= hisax/</div><div class='ctx'> obj-$(CONFIG_ISDN_DRV_ICN)		+= icn/</div><div class='head'>diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c<br/>index e30a7773f93c..fbce5222d83c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/isocdata.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/isdn/gigaset/isocdata.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/isocdata.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/isdn/gigaset/isocdata.c</a></div><div class='hunk'>@@ -247,7 +247,6 @@ static inline void dump_bytes(enum debuglevel level, const char *tag,</div><div class='ctx'> #ifdef CONFIG_GIGASET_DEBUG</div><div class='ctx'> 	unsigned char c;</div><div class='ctx'> 	static char dbgline[3 * 32 + 1];</div><div class='del'>-	static const char hexdigit[] = "0123456789abcdef";</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	while (count-- &gt; 0) {</div><div class='ctx'> 		if (i &gt; sizeof(dbgline) - 4) {</div><div class='hunk'>@@ -258,8 +257,8 @@ static inline void dump_bytes(enum debuglevel level, const char *tag,</div><div class='ctx'> 		c = *bytes++;</div><div class='ctx'> 		dbgline[i] = (i &amp;&amp; !(i % 12)) ? '-' : ' ';</div><div class='ctx'> 		i++;</div><div class='del'>-		dbgline[i++] = hexdigit[(c &gt;&gt; 4) &amp; 0x0f];</div><div class='del'>-		dbgline[i++] = hexdigit[c &amp; 0x0f];</div><div class='add'>+		dbgline[i++] = hex_asc_hi(c);</div><div class='add'>+		dbgline[i++] = hex_asc_lo(c);</div><div class='ctx'> 	}</div><div class='ctx'> 	dbgline[i] = '\0';</div><div class='ctx'> 	gig_dbg(level, "%s:%s", tag, dbgline);</div><div class='head'>diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c<br/>index 2649ea55a9e8..1eac03f39d00 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/mISDN/hfcmulti.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/isdn/hardware/mISDN/hfcmulti.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/mISDN/hfcmulti.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/isdn/hardware/mISDN/hfcmulti.c</a></div><div class='hunk'>@@ -140,7 +140,7 @@</div><div class='ctx'>  * #define HFC_REGISTER_DEBUG</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static const char *hfcmulti_revision = "2.00";</div><div class='add'>+static const char *hfcmulti_revision = "2.02";</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -427,12 +427,12 @@ write_fifo_regio(struct hfc_multi *hc, u_char *data, int len)</div><div class='ctx'> {</div><div class='ctx'> 	outb(A_FIFO_DATA0, (hc-&gt;pci_iobase)+4);</div><div class='ctx'> 	while (len&gt;&gt;2) {</div><div class='del'>-		outl(*(u32 *)data, hc-&gt;pci_iobase);</div><div class='add'>+		outl(cpu_to_le32(*(u32 *)data), hc-&gt;pci_iobase);</div><div class='ctx'> 		data += 4;</div><div class='ctx'> 		len -= 4;</div><div class='ctx'> 	}</div><div class='ctx'> 	while (len&gt;&gt;1) {</div><div class='del'>-		outw(*(u16 *)data, hc-&gt;pci_iobase);</div><div class='add'>+		outw(cpu_to_le16(*(u16 *)data), hc-&gt;pci_iobase);</div><div class='ctx'> 		data += 2;</div><div class='ctx'> 		len -= 2;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -447,17 +447,19 @@ void</div><div class='ctx'> write_fifo_pcimem(struct hfc_multi *hc, u_char *data, int len)</div><div class='ctx'> {</div><div class='ctx'> 	while (len&gt;&gt;2) {</div><div class='del'>-		writel(*(u32 *)data, (hc-&gt;pci_membase)+A_FIFO_DATA0);</div><div class='add'>+		writel(cpu_to_le32(*(u32 *)data),</div><div class='add'>+			hc-&gt;pci_membase + A_FIFO_DATA0);</div><div class='ctx'> 		data += 4;</div><div class='ctx'> 		len -= 4;</div><div class='ctx'> 	}</div><div class='ctx'> 	while (len&gt;&gt;1) {</div><div class='del'>-		writew(*(u16 *)data, (hc-&gt;pci_membase)+A_FIFO_DATA0);</div><div class='add'>+		writew(cpu_to_le16(*(u16 *)data),</div><div class='add'>+			hc-&gt;pci_membase + A_FIFO_DATA0);</div><div class='ctx'> 		data += 2;</div><div class='ctx'> 		len -= 2;</div><div class='ctx'> 	}</div><div class='ctx'> 	while (len) {</div><div class='del'>-		writeb(*data, (hc-&gt;pci_membase)+A_FIFO_DATA0);</div><div class='add'>+		writeb(*data, hc-&gt;pci_membase + A_FIFO_DATA0);</div><div class='ctx'> 		data++;</div><div class='ctx'> 		len--;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -468,12 +470,12 @@ read_fifo_regio(struct hfc_multi *hc, u_char *data, int len)</div><div class='ctx'> {</div><div class='ctx'> 	outb(A_FIFO_DATA0, (hc-&gt;pci_iobase)+4);</div><div class='ctx'> 	while (len&gt;&gt;2) {</div><div class='del'>-		*(u32 *)data = inl(hc-&gt;pci_iobase);</div><div class='add'>+		*(u32 *)data = le32_to_cpu(inl(hc-&gt;pci_iobase));</div><div class='ctx'> 		data += 4;</div><div class='ctx'> 		len -= 4;</div><div class='ctx'> 	}</div><div class='ctx'> 	while (len&gt;&gt;1) {</div><div class='del'>-		*(u16 *)data = inw(hc-&gt;pci_iobase);</div><div class='add'>+		*(u16 *)data = le16_to_cpu(inw(hc-&gt;pci_iobase));</div><div class='ctx'> 		data += 2;</div><div class='ctx'> 		len -= 2;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -490,18 +492,18 @@ read_fifo_pcimem(struct hfc_multi *hc, u_char *data, int len)</div><div class='ctx'> {</div><div class='ctx'> 	while (len&gt;&gt;2) {</div><div class='ctx'> 		*(u32 *)data =</div><div class='del'>-			readl((hc-&gt;pci_membase)+A_FIFO_DATA0);</div><div class='add'>+			le32_to_cpu(readl(hc-&gt;pci_membase + A_FIFO_DATA0));</div><div class='ctx'> 		data += 4;</div><div class='ctx'> 		len -= 4;</div><div class='ctx'> 	}</div><div class='ctx'> 	while (len&gt;&gt;1) {</div><div class='ctx'> 		*(u16 *)data =</div><div class='del'>-			readw((hc-&gt;pci_membase)+A_FIFO_DATA0);</div><div class='add'>+			le16_to_cpu(readw(hc-&gt;pci_membase + A_FIFO_DATA0));</div><div class='ctx'> 		data += 2;</div><div class='ctx'> 		len -= 2;</div><div class='ctx'> 	}</div><div class='ctx'> 	while (len) {</div><div class='del'>-		*data = readb((hc-&gt;pci_membase)+A_FIFO_DATA0);</div><div class='add'>+		*data = readb(hc-&gt;pci_membase + A_FIFO_DATA0);</div><div class='ctx'> 		data++;</div><div class='ctx'> 		len--;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3971,7 +3973,7 @@ open_bchannel(struct hfc_multi *hc, struct dchannel *dch,</div><div class='ctx'> 	struct bchannel	*bch;</div><div class='ctx'> 	int		ch;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(rq-&gt;adr.channel, &amp;dch-&gt;dev.channelmap[0]))</div><div class='add'>+	if (!test_channelmap(rq-&gt;adr.channel, dch-&gt;dev.channelmap))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (rq-&gt;protocol == ISDN_P_NONE)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -4587,7 +4589,7 @@ init_e1_port(struct hfc_multi *hc, struct hm_map *m)</div><div class='ctx'> 		list_add(&amp;bch-&gt;ch.list, &amp;dch-&gt;dev.bchannels);</div><div class='ctx'> 		hc-&gt;chan[ch].bch = bch;</div><div class='ctx'> 		hc-&gt;chan[ch].port = 0;</div><div class='del'>-		test_and_set_bit(bch-&gt;nr, &amp;dch-&gt;dev.channelmap[0]);</div><div class='add'>+		set_channelmap(bch-&gt;nr, dch-&gt;dev.channelmap);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* set optical line type */</div><div class='ctx'> 	if (port[Port_cnt] &amp; 0x001) {</div><div class='hunk'>@@ -4755,7 +4757,7 @@ init_multi_port(struct hfc_multi *hc, int pt)</div><div class='ctx'> 		list_add(&amp;bch-&gt;ch.list, &amp;dch-&gt;dev.bchannels);</div><div class='ctx'> 		hc-&gt;chan[i + ch].bch = bch;</div><div class='ctx'> 		hc-&gt;chan[i + ch].port = pt;</div><div class='del'>-		test_and_set_bit(bch-&gt;nr, &amp;dch-&gt;dev.channelmap[0]);</div><div class='add'>+		set_channelmap(bch-&gt;nr, dch-&gt;dev.channelmap);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* set master clock */</div><div class='ctx'> 	if (port[Port_cnt] &amp; 0x001) {</div><div class='hunk'>@@ -5050,12 +5052,12 @@ static void __devexit hfc_remove_pci(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> static const struct hm_map hfcm_map[] = {</div><div class='ctx'> /*0*/	{VENDOR_BN, "HFC-1S Card (mini PCI)", 4, 1, 1, 3, 0, DIP_4S, 0},</div><div class='del'>-/*1*/	{VENDOR_BN, "HFC-2S Card", 4, 2, 1, 3, 0, DIP_4S},</div><div class='add'>+/*1*/	{VENDOR_BN, "HFC-2S Card", 4, 2, 1, 3, 0, DIP_4S, 0},</div><div class='ctx'> /*2*/	{VENDOR_BN, "HFC-2S Card (mini PCI)", 4, 2, 1, 3, 0, DIP_4S, 0},</div><div class='ctx'> /*3*/	{VENDOR_BN, "HFC-4S Card", 4, 4, 1, 2, 0, DIP_4S, 0},</div><div class='ctx'> /*4*/	{VENDOR_BN, "HFC-4S Card (mini PCI)", 4, 4, 1, 2, 0, 0, 0},</div><div class='ctx'> /*5*/	{VENDOR_CCD, "HFC-4S Eval (old)", 4, 4, 0, 0, 0, 0, 0},</div><div class='del'>-/*6*/	{VENDOR_CCD, "HFC-4S IOB4ST", 4, 4, 1, 2, 0, 0, 0},</div><div class='add'>+/*6*/	{VENDOR_CCD, "HFC-4S IOB4ST", 4, 4, 1, 2, 0, DIP_4S, 0},</div><div class='ctx'> /*7*/	{VENDOR_CCD, "HFC-4S", 4, 4, 1, 2, 0, 0, 0},</div><div class='ctx'> /*8*/	{VENDOR_DIG, "HFC-4S Card", 4, 4, 0, 2, 0, 0, HFC_IO_MODE_REGIO},</div><div class='ctx'> /*9*/	{VENDOR_CCD, "HFC-4S Swyx 4xS0 SX2 QuadBri", 4, 4, 1, 2, 0, 0, 0},</div><div class='hunk'>@@ -5251,9 +5253,6 @@ HFCmulti_init(void)</div><div class='ctx'> 	if (debug &amp; DEBUG_HFCMULTI_INIT)</div><div class='ctx'> 		printk(KERN_DEBUG "%s: init entered\n", __func__);</div><div class='ctx'> </div><div class='del'>-#ifdef __BIG_ENDIAN</div><div class='del'>-#error "not running on big endian machines now"</div><div class='del'>-#endif</div><div class='ctx'> 	hfc_interrupt = symbol_get(ztdummy_extern_interrupt);</div><div class='ctx'> 	register_interrupt = symbol_get(ztdummy_register_interrupt);</div><div class='ctx'> 	unregister_interrupt = symbol_get(ztdummy_unregister_interrupt);</div><div class='head'>diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c<br/>index 3231814e7efa..9cf5edbb1a9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/mISDN/hfcpci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/isdn/hardware/mISDN/hfcpci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/mISDN/hfcpci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/isdn/hardware/mISDN/hfcpci.c</a></div><div class='hunk'>@@ -2056,7 +2056,7 @@ setup_card(struct hfc_pci *card)</div><div class='ctx'> 	card-&gt;dch.dev.nrbchan = 2;</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		card-&gt;bch[i].nr = i + 1;</div><div class='del'>-		test_and_set_bit(i + 1, &amp;card-&gt;dch.dev.channelmap[0]);</div><div class='add'>+		set_channelmap(i + 1, card-&gt;dch.dev.channelmap);</div><div class='ctx'> 		card-&gt;bch[i].debug = debug;</div><div class='ctx'> 		mISDN_initbchannel(&amp;card-&gt;bch[i], MAX_DATA_MEM);</div><div class='ctx'> 		card-&gt;bch[i].hw = card;</div><div class='head'>diff --git a/drivers/isdn/hysdn/hysdn_pof.h b/drivers/isdn/hysdn/hysdn_pof.h<br/>index a368d6caca0e..3a72b908900f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hysdn/hysdn_pof.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/isdn/hysdn/hysdn_pof.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hysdn/hysdn_pof.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/isdn/hysdn/hysdn_pof.h</a></div><div class='hunk'>@@ -60,7 +60,7 @@ typedef struct PofRecHdr_tag {	/* Pof record header */</div><div class='ctx'> </div><div class='ctx'> typedef struct PofTimeStamp_tag {</div><div class='ctx'> /*00 */ unsigned long UnixTime __attribute__((packed));</div><div class='del'>-	/*04 */ unsigned char DateTimeText[0x28] __attribute__((packed));</div><div class='add'>+	/*04 */ unsigned char DateTimeText[0x28];</div><div class='ctx'> 	/* =40 */</div><div class='ctx'> /*2C */</div><div class='ctx'> } tPofTimeStamp;</div><div class='head'>diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c<br/>index 155b99780c4f..e42150a57780 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/mISDN/l1oip_core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/isdn/mISDN/l1oip_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/mISDN/l1oip_core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/isdn/mISDN/l1oip_core.c</a></div><div class='hunk'>@@ -1006,8 +1006,7 @@ open_bchannel(struct l1oip *hc, struct dchannel *dch, struct channel_req *rq)</div><div class='ctx'> 	struct bchannel	*bch;</div><div class='ctx'> 	int		ch;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(rq-&gt;adr.channel &amp; 0x1f,</div><div class='del'>-		&amp;dch-&gt;dev.channelmap[rq-&gt;adr.channel &gt;&gt; 5]))</div><div class='add'>+	if (!test_channelmap(rq-&gt;adr.channel, dch-&gt;dev.channelmap))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (rq-&gt;protocol == ISDN_P_NONE)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1412,8 +1411,7 @@ init_card(struct l1oip *hc, int pri, int bundle)</div><div class='ctx'> 		bch-&gt;ch.nr = i + ch;</div><div class='ctx'> 		list_add(&amp;bch-&gt;ch.list, &amp;dch-&gt;dev.bchannels);</div><div class='ctx'> 		hc-&gt;chan[i + ch].bch = bch;</div><div class='del'>-		test_and_set_bit(bch-&gt;nr &amp; 0x1f,</div><div class='del'>-			&amp;dch-&gt;dev.channelmap[bch-&gt;nr &gt;&gt; 5]);</div><div class='add'>+		set_channelmap(bch-&gt;nr, dch-&gt;dev.channelmap);</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = mISDN_register_device(&amp;dch-&gt;dev, hc-&gt;name);</div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c<br/>index 4ba4cc364c9e..e5a20f9542d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/mISDN/socket.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/isdn/mISDN/socket.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/mISDN/socket.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/isdn/mISDN/socket.c</a></div><div class='hunk'>@@ -379,7 +379,7 @@ data_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 			di.Bprotocols = dev-&gt;Bprotocols | get_all_Bprotocols();</div><div class='ctx'> 			di.protocol = dev-&gt;D.protocol;</div><div class='ctx'> 			memcpy(di.channelmap, dev-&gt;channelmap,</div><div class='del'>-				MISDN_CHMAP_SIZE * 4);</div><div class='add'>+				sizeof(di.channelmap));</div><div class='ctx'> 			di.nrbchan = dev-&gt;nrbchan;</div><div class='ctx'> 			strcpy(di.name, dev-&gt;name);</div><div class='ctx'> 			if (copy_to_user((void __user *)arg, &amp;di, sizeof(di)))</div><div class='hunk'>@@ -637,7 +637,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 			di.Bprotocols = dev-&gt;Bprotocols | get_all_Bprotocols();</div><div class='ctx'> 			di.protocol = dev-&gt;D.protocol;</div><div class='ctx'> 			memcpy(di.channelmap, dev-&gt;channelmap,</div><div class='del'>-				MISDN_CHMAP_SIZE * 4);</div><div class='add'>+				sizeof(di.channelmap));</div><div class='ctx'> 			di.nrbchan = dev-&gt;nrbchan;</div><div class='ctx'> 			strcpy(di.name, dev-&gt;name);</div><div class='ctx'> 			if (copy_to_user((void __user *)arg, &amp;di, sizeof(di)))</div><div class='head'>diff --git a/drivers/leds/leds-ams-delta.c b/drivers/leds/leds-ams-delta.c<br/>index c37bb0d5a0c5..32c98b2efa3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-ams-delta.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/leds/leds-ams-delta.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-ams-delta.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/leds/leds-ams-delta.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='del'>-#include &lt;asm/arch/board-ams-delta.h&gt;</div><div class='add'>+#include &lt;mach/board-ams-delta.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Our context</div><div class='head'>diff --git a/drivers/leds/leds-cm-x270.c b/drivers/leds/leds-cm-x270.c<br/>index accc7eddb788..836a43d776e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-cm-x270.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/leds/leds-cm-x270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-cm-x270.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/leds/leds-cm-x270.c</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define GPIO_RED_LED			(93)</div><div class='ctx'> #define GPIO_GREEN_LED			(94)</div><div class='head'>diff --git a/drivers/leds/leds-corgi.c b/drivers/leds/leds-corgi.c<br/>index a709704b9f93..bc2dcd89f635 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-corgi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/leds/leds-corgi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-corgi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/leds/leds-corgi.c</a></div><div class='hunk'>@@ -15,10 +15,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/arch/corgi.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/corgi.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/scoop.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void corgiled_amber_set(struct led_classdev *led_cdev,</div><div class='head'>diff --git a/drivers/leds/leds-fsg.c b/drivers/leds/leds-fsg.c<br/>index a7421b8c47d8..be0e12144b8b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-fsg.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/leds/leds-fsg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-fsg.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/leds/leds-fsg.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> static short __iomem *latch_address;</div><div class='head'>diff --git a/drivers/leds/leds-h1940.c b/drivers/leds/leds-h1940.c<br/>index 73c705021686..11b77a70bbcb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-h1940.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/leds/leds-h1940.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-h1940.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/leds/leds-h1940.c</a></div><div class='hunk'>@@ -16,9 +16,9 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/h1940-latch.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/h1940-latch.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Green led.</div><div class='head'>diff --git a/drivers/leds/leds-locomo.c b/drivers/leds/leds-locomo.c<br/>index 7295f7f52185..5d91362e3066 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-locomo.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/leds/leds-locomo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-locomo.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/leds/leds-locomo.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/locomo.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void locomoled_brightness_set(struct led_classdev *led_cdev,</div><div class='head'>diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c<br/>index d4f5021dccbf..25a07f2643ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-s3c24xx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/leds/leds-s3c24xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-s3c24xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/leds/leds-s3c24xx.c</a></div><div class='hunk'>@@ -16,9 +16,9 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/leds-gpio.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/leds-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* our context */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/leds/leds-spitz.c b/drivers/leds/leds-spitz.c<br/>index e75e8543bc5a..178831c64bfb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-spitz.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/leds/leds-spitz.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-spitz.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/leds/leds-spitz.c</a></div><div class='hunk'>@@ -17,9 +17,9 @@</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/scoop.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/spitz.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/spitz.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void spitzled_amber_set(struct led_classdev *led_cdev,</div><div class='ctx'> 			       enum led_brightness value)</div><div class='head'>diff --git a/drivers/lguest/lguest_device.c b/drivers/lguest/lguest_device.c<br/>index 37344aaee22f..a661bbdae3d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/lguest/lguest_device.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/lguest/lguest_device.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/lguest/lguest_device.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/lguest/lguest_device.c</a></div><div class='hunk'>@@ -98,6 +98,10 @@ static u32 lg_get_features(struct virtio_device *vdev)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* The virtio core takes the features the Host offers, and copies the</div><div class='add'>+ * ones supported by the driver into the vdev-&gt;features array.  Once</div><div class='add'>+ * that's all sorted out, this routine is called so we can tell the</div><div class='add'>+ * Host which features we understand and accept. */</div><div class='ctx'> static void lg_finalize_features(struct virtio_device *vdev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i, bits;</div><div class='hunk'>@@ -108,6 +112,10 @@ static void lg_finalize_features(struct virtio_device *vdev)</div><div class='ctx'> 	/* Give virtio_ring a chance to accept features. */</div><div class='ctx'> 	vring_transport_features(vdev);</div><div class='ctx'> </div><div class='add'>+	/* The vdev-&gt;feature array is a Linux bitmask: this isn't the</div><div class='add'>+	 * same as a the simple array of bits used by lguest devices</div><div class='add'>+	 * for features.  So we do this slow, manual conversion which is</div><div class='add'>+	 * completely general. */</div><div class='ctx'> 	memset(out_features, 0, desc-&gt;feature_len);</div><div class='ctx'> 	bits = min_t(unsigned, desc-&gt;feature_len, sizeof(vdev-&gt;features)) * 8;</div><div class='ctx'> 	for (i = 0; i &lt; bits; i++) {</div><div class='head'>diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c<br/>index d93500f24fbb..81d0c6053447 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/lguest/page_tables.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/lguest/page_tables.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/lguest/page_tables.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/lguest/page_tables.c</a></div><div class='hunk'>@@ -108,9 +108,8 @@ static unsigned long gpte_addr(pgd_t gpgd, unsigned long vaddr)</div><div class='ctx'> }</div><div class='ctx'> /*:*/</div><div class='ctx'> </div><div class='del'>-/*M:014 get_pfn is slow; it takes the mmap sem and calls get_user_pages.  We</div><div class='del'>- * could probably try to grab batches of pages here as an optimization</div><div class='del'>- * (ie. pre-faulting). :*/</div><div class='add'>+/*M:014 get_pfn is slow: we could probably try to grab batches of pages here as</div><div class='add'>+ * an optimization (ie. pre-faulting). :*/</div><div class='ctx'> </div><div class='ctx'> /*H:350 This routine takes a page number given by the Guest and converts it to</div><div class='ctx'>  * an actual, physical page number.  It can fail for several reasons: the</div><div class='hunk'>@@ -123,19 +122,13 @@ static unsigned long gpte_addr(pgd_t gpgd, unsigned long vaddr)</div><div class='ctx'> static unsigned long get_pfn(unsigned long virtpfn, int write)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page;</div><div class='del'>-	/* This value indicates failure. */</div><div class='del'>-	unsigned long ret = -1UL;</div><div class='ctx'> </div><div class='del'>-	/* get_user_pages() is a complex interface: it gets the "struct</div><div class='del'>-	 * vm_area_struct" and "struct page" assocated with a range of pages.</div><div class='del'>-	 * It also needs the task's mmap_sem held, and is not very quick.</div><div class='del'>-	 * It returns the number of pages it got. */</div><div class='del'>-	down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='del'>-	if (get_user_pages(current, current-&gt;mm, virtpfn &lt;&lt; PAGE_SHIFT,</div><div class='del'>-			   1, write, 1, &amp;page, NULL) == 1)</div><div class='del'>-		ret = page_to_pfn(page);</div><div class='del'>-	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='del'>-	return ret;</div><div class='add'>+	/* gup me one page at this address please! */</div><div class='add'>+	if (get_user_pages_fast(virtpfn &lt;&lt; PAGE_SHIFT, 1, write, &amp;page) == 1)</div><div class='add'>+		return page_to_pfn(page);</div><div class='add'>+</div><div class='add'>+	/* This value indicates failure. */</div><div class='add'>+	return -1UL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*H:340 Converting a Guest page table entry to a shadow (ie. real) page table</div><div class='hunk'>@@ -174,7 +167,7 @@ static pte_t gpte_to_spte(struct lg_cpu *cpu, pte_t gpte, int write)</div><div class='ctx'> /*H:460 And to complete the chain, release_pte() looks like this: */</div><div class='ctx'> static void release_pte(pte_t pte)</div><div class='ctx'> {</div><div class='del'>-	/* Remember that get_user_pages() took a reference to the page, in</div><div class='add'>+	/* Remember that get_user_pages_fast() took a reference to the page, in</div><div class='ctx'> 	 * get_pfn()?  We have to put it back now. */</div><div class='ctx'> 	if (pte_flags(pte) &amp; _PAGE_PRESENT)</div><div class='ctx'> 		put_page(pfn_to_page(pte_pfn(pte)));</div><div class='head'>diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c<br/>index b1e5b4705250..d7e46d345d9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/mediabay.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/macintosh/mediabay.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/mediabay.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/macintosh/mediabay.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='head'>diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c<br/>index 621a272a2c74..ac89a5deaca2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/bitmap.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/md/bitmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/bitmap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/md/bitmap.c</a></div><div class='hunk'>@@ -238,15 +238,47 @@ static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long inde</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static mdk_rdev_t *next_active_rdev(mdk_rdev_t *rdev, mddev_t *mddev)</div><div class='add'>+{</div><div class='add'>+	/* Iterate the disks of an mddev, using rcu to protect access to the</div><div class='add'>+	 * linked list, and raising the refcount of devices we return to ensure</div><div class='add'>+	 * they don't disappear while in use.</div><div class='add'>+	 * As devices are only added or removed when raid_disk is &lt; 0 and</div><div class='add'>+	 * nr_pending is 0 and In_sync is clear, the entries we return will</div><div class='add'>+	 * still be in the same position on the list when we re-enter</div><div class='add'>+	 * list_for_each_continue_rcu.</div><div class='add'>+	 */</div><div class='add'>+	struct list_head *pos;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (rdev == NULL)</div><div class='add'>+		/* start at the beginning */</div><div class='add'>+		pos = &amp;mddev-&gt;disks;</div><div class='add'>+	else {</div><div class='add'>+		/* release the previous rdev and start from there. */</div><div class='add'>+		rdev_dec_pending(rdev, mddev);</div><div class='add'>+		pos = &amp;rdev-&gt;same_set;</div><div class='add'>+	}</div><div class='add'>+	list_for_each_continue_rcu(pos, &amp;mddev-&gt;disks) {</div><div class='add'>+		rdev = list_entry(pos, mdk_rdev_t, same_set);</div><div class='add'>+		if (rdev-&gt;raid_disk &gt;= 0 &amp;&amp;</div><div class='add'>+		    test_bit(In_sync, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='add'>+		    !test_bit(Faulty, &amp;rdev-&gt;flags)) {</div><div class='add'>+			/* this is a usable devices */</div><div class='add'>+			atomic_inc(&amp;rdev-&gt;nr_pending);</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return rdev;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait)</div><div class='ctx'> {</div><div class='del'>-	mdk_rdev_t *rdev;</div><div class='add'>+	mdk_rdev_t *rdev = NULL;</div><div class='ctx'> 	mddev_t *mddev = bitmap-&gt;mddev;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	rdev_for_each_rcu(rdev, mddev)</div><div class='del'>-		if (test_bit(In_sync, &amp;rdev-&gt;flags)</div><div class='del'>-		    &amp;&amp; !test_bit(Faulty, &amp;rdev-&gt;flags)) {</div><div class='add'>+	while ((rdev = next_active_rdev(rdev, mddev)) != NULL) {</div><div class='ctx'> 			int size = PAGE_SIZE;</div><div class='ctx'> 			if (page-&gt;index == bitmap-&gt;file_pages-1)</div><div class='ctx'> 				size = roundup(bitmap-&gt;last_page_size,</div><div class='hunk'>@@ -281,8 +313,7 @@ static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait)</div><div class='ctx'> 				       + page-&gt;index * (PAGE_SIZE/512),</div><div class='ctx'> 				       size,</div><div class='ctx'> 				       page);</div><div class='del'>-		}</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (wait)</div><div class='ctx'> 		md_super_wait(mddev);</div><div class='hunk'>@@ -1234,7 +1265,7 @@ int bitmap_startwrite(struct bitmap *bitmap, sector_t offset, unsigned long sect</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			bitmap_file_set_bit(bitmap, offset);</div><div class='ctx'> 			bitmap_count_page(bitmap,offset, 1);</div><div class='del'>-			blk_plug_device(bitmap-&gt;mddev-&gt;queue);</div><div class='add'>+			blk_plug_device_unlocked(bitmap-&gt;mddev-&gt;queue);</div><div class='ctx'> 			/* fall through */</div><div class='ctx'> 		case 1:</div><div class='ctx'> 			*bmc = 2;</div><div class='head'>diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c<br/>index 798e468103b8..61f441409234 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-table.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/md/dm-table.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-table.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/md/dm-table.c</a></div><div class='hunk'>@@ -316,29 +316,12 @@ static inline int check_space(struct dm_table *t)</div><div class='ctx'>  */</div><div class='ctx'> static int lookup_device(const char *path, dev_t *dev)</div><div class='ctx'> {</div><div class='del'>-	int r;</div><div class='del'>-	struct nameidata nd;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	if ((r = path_lookup(path, LOOKUP_FOLLOW, &amp;nd)))</div><div class='del'>-		return r;</div><div class='del'>-</div><div class='del'>-	inode = nd.path.dentry-&gt;d_inode;</div><div class='del'>-	if (!inode) {</div><div class='del'>-		r = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!S_ISBLK(inode-&gt;i_mode)) {</div><div class='del'>-		r = -ENOTBLK;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*dev = inode-&gt;i_rdev;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	path_put(&amp;nd.path);</div><div class='del'>-	return r;</div><div class='add'>+	struct block_device *bdev = lookup_bdev(path);</div><div class='add'>+	if (IS_ERR(bdev))</div><div class='add'>+		return PTR_ERR(bdev);</div><div class='add'>+	*dev = bdev-&gt;bd_dev;</div><div class='add'>+	bdput(bdev);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/md/md.c b/drivers/md/md.c<br/>index c2ff77ccec50..deeac4b44173 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/md.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/md/md.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/md.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/md/md.c</a></div><div class='hunk'>@@ -2393,6 +2393,8 @@ static void analyze_sbs(mddev_t * mddev)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void md_safemode_timeout(unsigned long data);</div><div class='add'>+</div><div class='ctx'> static ssize_t</div><div class='ctx'> safe_delay_show(mddev_t *mddev, char *page)</div><div class='ctx'> {</div><div class='hunk'>@@ -2432,9 +2434,12 @@ safe_delay_store(mddev_t *mddev, const char *cbuf, size_t len)</div><div class='ctx'> 	if (msec == 0)</div><div class='ctx'> 		mddev-&gt;safemode_delay = 0;</div><div class='ctx'> 	else {</div><div class='add'>+		unsigned long old_delay = mddev-&gt;safemode_delay;</div><div class='ctx'> 		mddev-&gt;safemode_delay = (msec*HZ)/1000;</div><div class='ctx'> 		if (mddev-&gt;safemode_delay == 0)</div><div class='ctx'> 			mddev-&gt;safemode_delay = 1;</div><div class='add'>+		if (mddev-&gt;safemode_delay &lt; old_delay)</div><div class='add'>+			md_safemode_timeout((unsigned long)mddev);</div><div class='ctx'> 	}</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='hunk'>@@ -3483,7 +3488,7 @@ static void md_safemode_timeout(unsigned long data)</div><div class='ctx'> 	if (!atomic_read(&amp;mddev-&gt;writes_pending)) {</div><div class='ctx'> 		mddev-&gt;safemode = 1;</div><div class='ctx'> 		if (mddev-&gt;external)</div><div class='del'>-			sysfs_notify(&amp;mddev-&gt;kobj, NULL, "array_state");</div><div class='add'>+			set_bit(MD_NOTIFY_ARRAY_STATE, &amp;mddev-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> 	md_wakeup_thread(mddev-&gt;thread);</div><div class='ctx'> }</div><div class='hunk'>@@ -3836,8 +3841,6 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)</div><div class='ctx'> </div><div class='ctx'> 		del_timer_sync(&amp;mddev-&gt;safemode_timer);</div><div class='ctx'> </div><div class='del'>-		invalidate_partition(disk, 0);</div><div class='del'>-</div><div class='ctx'> 		switch(mode) {</div><div class='ctx'> 		case 1: /* readonly */</div><div class='ctx'> 			err  = -ENXIO;</div><div class='hunk'>@@ -4634,6 +4637,11 @@ static int update_size(mddev_t *mddev, sector_t num_sectors)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (mddev-&gt;sync_thread)</div><div class='ctx'> 		return -EBUSY;</div><div class='add'>+	if (mddev-&gt;bitmap)</div><div class='add'>+		/* Sorry, cannot grow a bitmap yet, just remove it,</div><div class='add'>+		 * grow, and re-add.</div><div class='add'>+		 */</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	rdev_for_each(rdev, tmp, mddev) {</div><div class='ctx'> 		sector_t avail;</div><div class='ctx'> 		avail = rdev-&gt;size * 2;</div><div class='hunk'>@@ -5753,7 +5761,11 @@ void md_do_sync(mddev_t *mddev)</div><div class='ctx'> 					 * time 'round when curr_resync == 2</div><div class='ctx'> 					 */</div><div class='ctx'> 					continue;</div><div class='del'>-				prepare_to_wait(&amp;resync_wait, &amp;wq, TASK_UNINTERRUPTIBLE);</div><div class='add'>+				/* We need to wait 'interruptible' so as not to</div><div class='add'>+				 * contribute to the load average, and not to</div><div class='add'>+				 * be caught by 'softlockup'</div><div class='add'>+				 */</div><div class='add'>+				prepare_to_wait(&amp;resync_wait, &amp;wq, TASK_INTERRUPTIBLE);</div><div class='ctx'> 				if (!kthread_should_stop() &amp;&amp;</div><div class='ctx'> 				    mddev2-&gt;curr_resync &gt;= mddev-&gt;curr_resync) {</div><div class='ctx'> 					printk(KERN_INFO "md: delaying %s of %s"</div><div class='hunk'>@@ -5761,6 +5773,8 @@ void md_do_sync(mddev_t *mddev)</div><div class='ctx'> 					       " share one or more physical units)\n",</div><div class='ctx'> 					       desc, mdname(mddev), mdname(mddev2));</div><div class='ctx'> 					mddev_put(mddev2);</div><div class='add'>+					if (signal_pending(current))</div><div class='add'>+						flush_signals(current);</div><div class='ctx'> 					schedule();</div><div class='ctx'> 					finish_wait(&amp;resync_wait, &amp;wq);</div><div class='ctx'> 					goto try_again;</div><div class='hunk'>@@ -5993,10 +6007,11 @@ static int remove_and_add_spares(mddev_t *mddev)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	if (mddev-&gt;degraded) {</div><div class='add'>+	if (mddev-&gt;degraded &amp;&amp; ! mddev-&gt;ro) {</div><div class='ctx'> 		rdev_for_each(rdev, rtmp, mddev) {</div><div class='ctx'> 			if (rdev-&gt;raid_disk &gt;= 0 &amp;&amp;</div><div class='del'>-			    !test_bit(In_sync, &amp;rdev-&gt;flags))</div><div class='add'>+			    !test_bit(In_sync, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='add'>+			    !test_bit(Blocked, &amp;rdev-&gt;flags))</div><div class='ctx'> 				spares++;</div><div class='ctx'> 			if (rdev-&gt;raid_disk &lt; 0</div><div class='ctx'> 			    &amp;&amp; !test_bit(Faulty, &amp;rdev-&gt;flags)) {</div><div class='hunk'>@@ -6051,6 +6066,9 @@ void md_check_recovery(mddev_t *mddev)</div><div class='ctx'> 	if (mddev-&gt;bitmap)</div><div class='ctx'> 		bitmap_daemon_work(mddev-&gt;bitmap);</div><div class='ctx'> </div><div class='add'>+	if (test_and_clear_bit(MD_NOTIFY_ARRAY_STATE, &amp;mddev-&gt;flags))</div><div class='add'>+		sysfs_notify(&amp;mddev-&gt;kobj, NULL, "array_state");</div><div class='add'>+</div><div class='ctx'> 	if (mddev-&gt;ro)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -6063,6 +6081,8 @@ void md_check_recovery(mddev_t *mddev)</div><div class='ctx'> 		flush_signals(current);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (mddev-&gt;ro &amp;&amp; !test_bit(MD_RECOVERY_NEEDED, &amp;mddev-&gt;recovery))</div><div class='add'>+		return;</div><div class='ctx'> 	if ( ! (</div><div class='ctx'> 		(mddev-&gt;flags &amp;&amp; !mddev-&gt;external) ||</div><div class='ctx'> 		test_bit(MD_RECOVERY_NEEDED, &amp;mddev-&gt;recovery) ||</div><div class='hunk'>@@ -6076,6 +6096,15 @@ void md_check_recovery(mddev_t *mddev)</div><div class='ctx'> 	if (mddev_trylock(mddev)) {</div><div class='ctx'> 		int spares = 0;</div><div class='ctx'> </div><div class='add'>+		if (mddev-&gt;ro) {</div><div class='add'>+			/* Only thing we do on a ro array is remove</div><div class='add'>+			 * failed devices.</div><div class='add'>+			 */</div><div class='add'>+			remove_and_add_spares(mddev);</div><div class='add'>+			clear_bit(MD_RECOVERY_NEEDED, &amp;mddev-&gt;recovery);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (!mddev-&gt;external) {</div><div class='ctx'> 			int did_change = 0;</div><div class='ctx'> 			spin_lock_irq(&amp;mddev-&gt;write_lock);</div><div class='hunk'>@@ -6113,7 +6142,8 @@ void md_check_recovery(mddev_t *mddev)</div><div class='ctx'> 			/* resync has finished, collect result */</div><div class='ctx'> 			md_unregister_thread(mddev-&gt;sync_thread);</div><div class='ctx'> 			mddev-&gt;sync_thread = NULL;</div><div class='del'>-			if (!test_bit(MD_RECOVERY_INTR, &amp;mddev-&gt;recovery)) {</div><div class='add'>+			if (!test_bit(MD_RECOVERY_INTR, &amp;mddev-&gt;recovery) &amp;&amp;</div><div class='add'>+			    !test_bit(MD_RECOVERY_REQUESTED, &amp;mddev-&gt;recovery)) {</div><div class='ctx'> 				/* success...*/</div><div class='ctx'> 				/* activate any spares */</div><div class='ctx'> 				if (mddev-&gt;pers-&gt;spare_active(mddev))</div><div class='hunk'>@@ -6165,6 +6195,7 @@ void md_check_recovery(mddev_t *mddev)</div><div class='ctx'> 		} else if ((spares = remove_and_add_spares(mddev))) {</div><div class='ctx'> 			clear_bit(MD_RECOVERY_SYNC, &amp;mddev-&gt;recovery);</div><div class='ctx'> 			clear_bit(MD_RECOVERY_CHECK, &amp;mddev-&gt;recovery);</div><div class='add'>+			clear_bit(MD_RECOVERY_REQUESTED, &amp;mddev-&gt;recovery);</div><div class='ctx'> 			set_bit(MD_RECOVERY_RECOVER, &amp;mddev-&gt;recovery);</div><div class='ctx'> 		} else if (mddev-&gt;recovery_cp &lt; MaxSector) {</div><div class='ctx'> 			set_bit(MD_RECOVERY_SYNC, &amp;mddev-&gt;recovery);</div><div class='hunk'>@@ -6228,7 +6259,11 @@ static int md_notify_reboot(struct notifier_block *this,</div><div class='ctx'> </div><div class='ctx'> 		for_each_mddev(mddev, tmp)</div><div class='ctx'> 			if (mddev_trylock(mddev)) {</div><div class='del'>-				do_md_stop (mddev, 1, 0);</div><div class='add'>+				/* Force a switch to readonly even array</div><div class='add'>+				 * appears to still be in use.  Hence</div><div class='add'>+				 * the '100'.</div><div class='add'>+				 */</div><div class='add'>+				do_md_stop (mddev, 1, 100);</div><div class='ctx'> 				mddev_unlock(mddev);</div><div class='ctx'> 			}</div><div class='ctx'> 		/*</div><div class='head'>diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c<br/>index 159535d73567..e34cd0e62473 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/raid10.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/md/raid10.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/raid10.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/md/raid10.c</a></div><div class='hunk'>@@ -76,11 +76,13 @@ static void r10bio_pool_free(void *r10_bio, void *data)</div><div class='ctx'> 	kfree(r10_bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Maximum size of each resync request */</div><div class='ctx'> #define RESYNC_BLOCK_SIZE (64*1024)</div><div class='del'>-//#define RESYNC_BLOCK_SIZE PAGE_SIZE</div><div class='del'>-#define RESYNC_SECTORS (RESYNC_BLOCK_SIZE &gt;&gt; 9)</div><div class='ctx'> #define RESYNC_PAGES ((RESYNC_BLOCK_SIZE + PAGE_SIZE-1) / PAGE_SIZE)</div><div class='del'>-#define RESYNC_WINDOW (2048*1024)</div><div class='add'>+/* amount of memory to reserve for resync requests */</div><div class='add'>+#define RESYNC_WINDOW (1024*1024)</div><div class='add'>+/* maximum number of concurrent requests, memory permitting */</div><div class='add'>+#define RESYNC_DEPTH (32*1024*1024/RESYNC_BLOCK_SIZE)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * When performing a resync, we need to read and compare, so</div><div class='hunk'>@@ -215,6 +217,9 @@ static void reschedule_retry(r10bio_t *r10_bio)</div><div class='ctx'> 	conf-&gt;nr_queued ++;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;conf-&gt;device_lock, flags);</div><div class='ctx'> </div><div class='add'>+	/* wake up frozen array... */</div><div class='add'>+	wake_up(&amp;conf-&gt;wait_barrier);</div><div class='add'>+</div><div class='ctx'> 	md_wakeup_thread(mddev-&gt;thread);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -687,7 +692,6 @@ static int flush_pending_writes(conf_t *conf)</div><div class='ctx'>  *    there is no normal IO happeing.  It must arrange to call</div><div class='ctx'>  *    lower_barrier when the particular background IO completes.</div><div class='ctx'>  */</div><div class='del'>-#define RESYNC_DEPTH 32</div><div class='ctx'> </div><div class='ctx'> static void raise_barrier(conf_t *conf, int force)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c<br/>index 55e7c56045a0..224de022e7c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/raid5.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/md/raid5.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/raid5.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/md/raid5.c</a></div><div class='hunk'>@@ -2507,7 +2507,7 @@ static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh,</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void handle_stripe5(struct stripe_head *sh)</div><div class='add'>+static bool handle_stripe5(struct stripe_head *sh)</div><div class='ctx'> {</div><div class='ctx'> 	raid5_conf_t *conf = sh-&gt;raid_conf;</div><div class='ctx'> 	int disks = sh-&gt;disks, i;</div><div class='hunk'>@@ -2568,10 +2568,10 @@ static void handle_stripe5(struct stripe_head *sh)</div><div class='ctx'> 		if (dev-&gt;written)</div><div class='ctx'> 			s.written++;</div><div class='ctx'> 		rdev = rcu_dereference(conf-&gt;disks[i].rdev);</div><div class='del'>-		if (rdev &amp;&amp; unlikely(test_bit(Blocked, &amp;rdev-&gt;flags))) {</div><div class='add'>+		if (blocked_rdev == NULL &amp;&amp;</div><div class='add'>+		    rdev &amp;&amp; unlikely(test_bit(Blocked, &amp;rdev-&gt;flags))) {</div><div class='ctx'> 			blocked_rdev = rdev;</div><div class='ctx'> 			atomic_inc(&amp;rdev-&gt;nr_pending);</div><div class='del'>-			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!rdev || !test_bit(In_sync, &amp;rdev-&gt;flags)) {</div><div class='ctx'> 			/* The ReadError flag will just be confusing now */</div><div class='hunk'>@@ -2588,8 +2588,14 @@ static void handle_stripe5(struct stripe_head *sh)</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(blocked_rdev)) {</div><div class='del'>-		set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='del'>-		goto unlock;</div><div class='add'>+		if (s.syncing || s.expanding || s.expanded ||</div><div class='add'>+		    s.to_write || s.written) {</div><div class='add'>+			set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+		/* There is nothing for the blocked_rdev to block */</div><div class='add'>+		rdev_dec_pending(blocked_rdev, conf-&gt;mddev);</div><div class='add'>+		blocked_rdev = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (s.to_fill &amp;&amp; !test_bit(STRIPE_BIOFILL_RUN, &amp;sh-&gt;state)) {</div><div class='hunk'>@@ -2717,10 +2723,11 @@ static void handle_stripe5(struct stripe_head *sh)</div><div class='ctx'> 	if (sh-&gt;reconstruct_state == reconstruct_state_result) {</div><div class='ctx'> 		sh-&gt;reconstruct_state = reconstruct_state_idle;</div><div class='ctx'> 		clear_bit(STRIPE_EXPANDING, &amp;sh-&gt;state);</div><div class='del'>-		for (i = conf-&gt;raid_disks; i--; )</div><div class='add'>+		for (i = conf-&gt;raid_disks; i--; ) {</div><div class='ctx'> 			set_bit(R5_Wantwrite, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-			set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='add'>+			set_bit(R5_LOCKED, &amp;sh-&gt;dev[i].flags);</div><div class='ctx'> 			s.locked++;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (s.expanded &amp;&amp; test_bit(STRIPE_EXPANDING, &amp;sh-&gt;state) &amp;&amp;</div><div class='hunk'>@@ -2754,9 +2761,11 @@ static void handle_stripe5(struct stripe_head *sh)</div><div class='ctx'> 	ops_run_io(sh, &amp;s);</div><div class='ctx'> </div><div class='ctx'> 	return_io(return_bi);</div><div class='add'>+</div><div class='add'>+	return blocked_rdev == NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void handle_stripe6(struct stripe_head *sh, struct page *tmp_page)</div><div class='add'>+static bool handle_stripe6(struct stripe_head *sh, struct page *tmp_page)</div><div class='ctx'> {</div><div class='ctx'> 	raid6_conf_t *conf = sh-&gt;raid_conf;</div><div class='ctx'> 	int disks = sh-&gt;disks;</div><div class='hunk'>@@ -2829,10 +2838,10 @@ static void handle_stripe6(struct stripe_head *sh, struct page *tmp_page)</div><div class='ctx'> 		if (dev-&gt;written)</div><div class='ctx'> 			s.written++;</div><div class='ctx'> 		rdev = rcu_dereference(conf-&gt;disks[i].rdev);</div><div class='del'>-		if (rdev &amp;&amp; unlikely(test_bit(Blocked, &amp;rdev-&gt;flags))) {</div><div class='add'>+		if (blocked_rdev == NULL &amp;&amp;</div><div class='add'>+		    rdev &amp;&amp; unlikely(test_bit(Blocked, &amp;rdev-&gt;flags))) {</div><div class='ctx'> 			blocked_rdev = rdev;</div><div class='ctx'> 			atomic_inc(&amp;rdev-&gt;nr_pending);</div><div class='del'>-			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!rdev || !test_bit(In_sync, &amp;rdev-&gt;flags)) {</div><div class='ctx'> 			/* The ReadError flag will just be confusing now */</div><div class='hunk'>@@ -2850,9 +2859,16 @@ static void handle_stripe6(struct stripe_head *sh, struct page *tmp_page)</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(blocked_rdev)) {</div><div class='del'>-		set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='del'>-		goto unlock;</div><div class='add'>+		if (s.syncing || s.expanding || s.expanded ||</div><div class='add'>+		    s.to_write || s.written) {</div><div class='add'>+			set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+		/* There is nothing for the blocked_rdev to block */</div><div class='add'>+		rdev_dec_pending(blocked_rdev, conf-&gt;mddev);</div><div class='add'>+		blocked_rdev = NULL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	pr_debug("locked=%d uptodate=%d to_read=%d"</div><div class='ctx'> 	       " to_write=%d failed=%d failed_num=%d,%d\n",</div><div class='ctx'> 	       s.locked, s.uptodate, s.to_read, s.to_write, s.failed,</div><div class='hunk'>@@ -2967,14 +2983,17 @@ static void handle_stripe6(struct stripe_head *sh, struct page *tmp_page)</div><div class='ctx'> 	ops_run_io(sh, &amp;s);</div><div class='ctx'> </div><div class='ctx'> 	return_io(return_bi);</div><div class='add'>+</div><div class='add'>+	return blocked_rdev == NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void handle_stripe(struct stripe_head *sh, struct page *tmp_page)</div><div class='add'>+/* returns true if the stripe was handled */</div><div class='add'>+static bool handle_stripe(struct stripe_head *sh, struct page *tmp_page)</div><div class='ctx'> {</div><div class='ctx'> 	if (sh-&gt;raid_conf-&gt;level == 6)</div><div class='del'>-		handle_stripe6(sh, tmp_page);</div><div class='add'>+		return handle_stripe6(sh, tmp_page);</div><div class='ctx'> 	else</div><div class='del'>-		handle_stripe5(sh);</div><div class='add'>+		return handle_stripe5(sh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -3692,7 +3711,9 @@ static inline sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *ski</div><div class='ctx'> 	clear_bit(STRIPE_INSYNC, &amp;sh-&gt;state);</div><div class='ctx'> 	spin_unlock(&amp;sh-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	handle_stripe(sh, NULL);</div><div class='add'>+	/* wait for any blocked device to be handled */</div><div class='add'>+	while(unlikely(!handle_stripe(sh, NULL)))</div><div class='add'>+		;</div><div class='ctx'> 	release_stripe(sh);</div><div class='ctx'> </div><div class='ctx'> 	return STRIPE_SECTORS;</div><div class='hunk'>@@ -3811,10 +3832,8 @@ static void raid5d(mddev_t *mddev)</div><div class='ctx'> </div><div class='ctx'> 		sh = __get_priority_stripe(conf);</div><div class='ctx'> </div><div class='del'>-		if (!sh) {</div><div class='del'>-			async_tx_issue_pending_all();</div><div class='add'>+		if (!sh)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> 		spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='ctx'> 		</div><div class='ctx'> 		handled++;</div><div class='hunk'>@@ -3827,6 +3846,7 @@ static void raid5d(mddev_t *mddev)</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='ctx'> </div><div class='add'>+	async_tx_issue_pending_all();</div><div class='ctx'> 	unplug_slaves(mddev);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("--- raid5d inactive\n");</div><div class='hunk'>@@ -4439,6 +4459,9 @@ static int raid5_check_reshape(mddev_t *mddev)</div><div class='ctx'> 		return -EINVAL; /* Cannot shrink array or change level yet */</div><div class='ctx'> 	if (mddev-&gt;delta_disks == 0)</div><div class='ctx'> 		return 0; /* nothing to do */</div><div class='add'>+	if (mddev-&gt;bitmap)</div><div class='add'>+		/* Cannot grow a bitmap yet */</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	/* Can only proceed if there are plenty of stripe_heads.</div><div class='ctx'> 	 * We need a minimum of one full stripe,, and for sensible progress</div><div class='head'>diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c<br/>index e8bc7abf2409..99be9e5c85f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/saa7146_video.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/common/saa7146_video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/saa7146_video.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/saa7146_video.c</a></div><div class='hunk'>@@ -1068,7 +1068,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int</div><div class='ctx'> 	{</div><div class='ctx'> 		v4l2_std_id *id = arg;</div><div class='ctx'> 		int found = 0;</div><div class='del'>-		int i, err;</div><div class='add'>+		int i;</div><div class='ctx'> </div><div class='ctx'> 		DEB_EE(("VIDIOC_S_STD\n"));</div><div class='ctx'> </div><div class='hunk'>@@ -1116,7 +1116,6 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int</div><div class='ctx'> 	case VIDIOC_OVERLAY:</div><div class='ctx'> 	{</div><div class='ctx'> 		int on = *(int *)arg;</div><div class='del'>-		int err = 0;</div><div class='ctx'> </div><div class='ctx'> 		DEB_D(("VIDIOC_OVERLAY on:%d\n",on));</div><div class='ctx'> 		if (on != 0) {</div><div class='hunk'>@@ -1192,7 +1191,6 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int</div><div class='ctx'> 	case VIDIOCGMBUF:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct video_mbuf *mbuf = arg;</div><div class='del'>-		struct videobuf_queue *q;</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='ctx'> 		/* fixme: number of capture buffers and sizes for v4l apps */</div><div class='head'>diff --git a/drivers/media/common/tuners/mt2131.c b/drivers/media/common/tuners/mt2131.c<br/>index e254bcfc2efb..e8d3c48f8605 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2131.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/common/tuners/mt2131.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2131.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/mt2131.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for Microtune MT2131 "QAM/8VSB single chip tuner"</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2006 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2006 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/common/tuners/mt2131.h b/drivers/media/common/tuners/mt2131.h<br/>index cd8376f6f7b4..6632de640df0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2131.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/common/tuners/mt2131.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2131.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/mt2131.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for Microtune MT2131 "QAM/8VSB single chip tuner"</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2006 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2006 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/common/tuners/mt2131_priv.h b/drivers/media/common/tuners/mt2131_priv.h<br/>index e930759c2c00..4e05a67e88c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2131_priv.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/common/tuners/mt2131_priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2131_priv.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/mt2131_priv.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for Microtune MT2131 "QAM/8VSB single chip tuner"</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2006 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2006 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/common/tuners/mxl5005s.c b/drivers/media/common/tuners/mxl5005s.c<br/>index 0dc2bef9f6a3..227642b044ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mxl5005s.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/common/tuners/mxl5005s.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mxl5005s.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/mxl5005s.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>     MaxLinear MXL5005S VSB/QAM/DVBT tuner driver</div><div class='ctx'> </div><div class='ctx'>     Copyright (C) 2008 MaxLinear</div><div class='del'>-    Copyright (C) 2006 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+    Copyright (C) 2006 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>       Functions:</div><div class='ctx'> 	mxl5005s_reset()</div><div class='ctx'> 	mxl5005s_writereg()</div><div class='hunk'>@@ -3837,7 +3837,7 @@ static u16 MXL_Hystersis_Test(struct dvb_frontend *fe, int Hystersis)</div><div class='ctx'> /* ----------------------------------------------------------------</div><div class='ctx'>  * Begin: Everything after here is new code to adapt the</div><div class='ctx'>  * proprietary Realtek driver into a Linux API tuner.</div><div class='del'>- * Copyright (C) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ * Copyright (C) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> static int mxl5005s_reset(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/media/common/tuners/mxl5005s.h b/drivers/media/common/tuners/mxl5005s.h<br/>index 396db150bf0c..7ac6815b30aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mxl5005s.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/common/tuners/mxl5005s.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mxl5005s.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/mxl5005s.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>     MaxLinear MXL5005S VSB/QAM/DVBT tuner driver</div><div class='ctx'> </div><div class='ctx'>     Copyright (C) 2008 MaxLinear</div><div class='del'>-    Copyright (C) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+    Copyright (C) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'> </div><div class='ctx'>     This program is free software; you can redistribute it and/or modify</div><div class='ctx'>     it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c<br/>index 597e47f5d69c..aa773a658a2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tuner-simple.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/common/tuners/tuner-simple.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tuner-simple.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/tuner-simple.c</a></div><div class='hunk'>@@ -253,7 +253,7 @@ static struct tuner_params *simple_tuner_params(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> static int simple_config_lookup(struct dvb_frontend *fe,</div><div class='ctx'> 				struct tuner_params *t_params,</div><div class='del'>-				int *frequency, u8 *config, u8 *cb)</div><div class='add'>+				unsigned *frequency, u8 *config, u8 *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct tuner_simple_priv *priv = fe-&gt;tuner_priv;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -587,45 +587,45 @@ static int simple_set_tv_freq(struct dvb_frontend *fe,</div><div class='ctx'> 	priv-&gt;last_div = div;</div><div class='ctx'> 	if (t_params-&gt;has_tda9887) {</div><div class='ctx'> 		struct v4l2_priv_tun_config tda9887_cfg;</div><div class='del'>-		int config = 0;</div><div class='add'>+		int tda_config = 0;</div><div class='ctx'> 		int is_secam_l = (params-&gt;std &amp; (V4L2_STD_SECAM_L |</div><div class='ctx'> 						 V4L2_STD_SECAM_LC)) &amp;&amp;</div><div class='ctx'> 			!(params-&gt;std &amp; ~(V4L2_STD_SECAM_L |</div><div class='ctx'> 					  V4L2_STD_SECAM_LC));</div><div class='ctx'> </div><div class='ctx'> 		tda9887_cfg.tuner = TUNER_TDA9887;</div><div class='del'>-		tda9887_cfg.priv  = &amp;config;</div><div class='add'>+		tda9887_cfg.priv  = &amp;tda_config;</div><div class='ctx'> </div><div class='ctx'> 		if (params-&gt;std == V4L2_STD_SECAM_LC) {</div><div class='ctx'> 			if (t_params-&gt;port1_active ^ t_params-&gt;port1_invert_for_secam_lc)</div><div class='del'>-				config |= TDA9887_PORT1_ACTIVE;</div><div class='add'>+				tda_config |= TDA9887_PORT1_ACTIVE;</div><div class='ctx'> 			if (t_params-&gt;port2_active ^ t_params-&gt;port2_invert_for_secam_lc)</div><div class='del'>-				config |= TDA9887_PORT2_ACTIVE;</div><div class='add'>+				tda_config |= TDA9887_PORT2_ACTIVE;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (t_params-&gt;port1_active)</div><div class='del'>-				config |= TDA9887_PORT1_ACTIVE;</div><div class='add'>+				tda_config |= TDA9887_PORT1_ACTIVE;</div><div class='ctx'> 			if (t_params-&gt;port2_active)</div><div class='del'>-				config |= TDA9887_PORT2_ACTIVE;</div><div class='add'>+				tda_config |= TDA9887_PORT2_ACTIVE;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (t_params-&gt;intercarrier_mode)</div><div class='del'>-			config |= TDA9887_INTERCARRIER;</div><div class='add'>+			tda_config |= TDA9887_INTERCARRIER;</div><div class='ctx'> 		if (is_secam_l) {</div><div class='ctx'> 			if (i == 0 &amp;&amp; t_params-&gt;default_top_secam_low)</div><div class='del'>-				config |= TDA9887_TOP(t_params-&gt;default_top_secam_low);</div><div class='add'>+				tda_config |= TDA9887_TOP(t_params-&gt;default_top_secam_low);</div><div class='ctx'> 			else if (i == 1 &amp;&amp; t_params-&gt;default_top_secam_mid)</div><div class='del'>-				config |= TDA9887_TOP(t_params-&gt;default_top_secam_mid);</div><div class='add'>+				tda_config |= TDA9887_TOP(t_params-&gt;default_top_secam_mid);</div><div class='ctx'> 			else if (t_params-&gt;default_top_secam_high)</div><div class='del'>-				config |= TDA9887_TOP(t_params-&gt;default_top_secam_high);</div><div class='add'>+				tda_config |= TDA9887_TOP(t_params-&gt;default_top_secam_high);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (i == 0 &amp;&amp; t_params-&gt;default_top_low)</div><div class='del'>-				config |= TDA9887_TOP(t_params-&gt;default_top_low);</div><div class='add'>+				tda_config |= TDA9887_TOP(t_params-&gt;default_top_low);</div><div class='ctx'> 			else if (i == 1 &amp;&amp; t_params-&gt;default_top_mid)</div><div class='del'>-				config |= TDA9887_TOP(t_params-&gt;default_top_mid);</div><div class='add'>+				tda_config |= TDA9887_TOP(t_params-&gt;default_top_mid);</div><div class='ctx'> 			else if (t_params-&gt;default_top_high)</div><div class='del'>-				config |= TDA9887_TOP(t_params-&gt;default_top_high);</div><div class='add'>+				tda_config |= TDA9887_TOP(t_params-&gt;default_top_high);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (t_params-&gt;default_pll_gating_18)</div><div class='del'>-			config |= TDA9887_GATING_18;</div><div class='add'>+			tda_config |= TDA9887_GATING_18;</div><div class='ctx'> 		i2c_clients_command(priv-&gt;i2c_props.adap, TUNER_SET_CONFIG,</div><div class='ctx'> 				    &amp;tda9887_cfg);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -813,7 +813,8 @@ static u32 simple_dvb_configure(struct dvb_frontend *fe, u8 *buf,</div><div class='ctx'> 	static struct tuner_params *t_params;</div><div class='ctx'> 	u8 config, cb;</div><div class='ctx'> 	u32 div;</div><div class='del'>-	int ret, frequency = params-&gt;frequency / 62500;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned frequency = params-&gt;frequency / 62500;</div><div class='ctx'> </div><div class='ctx'> 	t_params = simple_tuner_params(fe, TUNER_PARAM_TYPE_DIGITAL);</div><div class='ctx'> 	ret = simple_config_lookup(fe, t_params, &amp;frequency, &amp;config, &amp;cb);</div><div class='head'>diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c<br/>index 5f99de0ad612..dcddfa803a75 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/xc5000.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/common/tuners/xc5000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/xc5000.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/xc5000.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  *  Driver for Xceive XC5000 "QAM/8VSB single chip tuner"</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) 2007 Xceive Corporation</div><div class='del'>- *  Copyright (c) 2007 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2007 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/common/tuners/xc5000.h b/drivers/media/common/tuners/xc5000.h<br/>index c910715addc9..5389f740945a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/xc5000.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/common/tuners/xc5000.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/xc5000.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/xc5000.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for Xceive XC5000 "QAM/8VSB single chip tuner"</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2007 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2007 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/common/tuners/xc5000_priv.h b/drivers/media/common/tuners/xc5000_priv.h<br/>index a72a9887fe7f..b2a0074c99c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/xc5000_priv.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/common/tuners/xc5000_priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/xc5000_priv.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/common/tuners/xc5000_priv.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for Xceive XC5000 "QAM/8VSB single chip tuner"</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2007 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2007 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c<br/>index f9d087669d5d..4eed783f4bce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop-fe-tuner.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/b2c2/flexcop-fe-tuner.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop-fe-tuner.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/b2c2/flexcop-fe-tuner.c</a></div><div class='hunk'>@@ -137,7 +137,8 @@ static int flexcop_send_diseqc_msg(struct dvb_frontend* fe, int len, u8 *msg, un</div><div class='ctx'> 			flexcop_diseqc_send_byte(fe, 0xff);</div><div class='ctx'> 		else {</div><div class='ctx'> 			flexcop_set_tone(fe, SEC_TONE_ON);</div><div class='del'>-			udelay(12500);</div><div class='add'>+			mdelay(12);</div><div class='add'>+			udelay(500);</div><div class='ctx'> 			flexcop_set_tone(fe, SEC_TONE_OFF);</div><div class='ctx'> 		}</div><div class='ctx'> 		msleep(20);</div><div class='head'>diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/dvb/b2c2/flexcop-i2c.c<br/>index 55973eaf3711..43a112ec6d44 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop-i2c.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/b2c2/flexcop-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop-i2c.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/b2c2/flexcop-i2c.c</a></div><div class='hunk'>@@ -221,12 +221,12 @@ int flexcop_i2c_init(struct flexcop_device *fc)</div><div class='ctx'> 	fc-&gt;fc_i2c_adap[1].port = FC_I2C_PORT_EEPROM;</div><div class='ctx'> 	fc-&gt;fc_i2c_adap[2].port = FC_I2C_PORT_TUNER;</div><div class='ctx'> </div><div class='del'>-	strncpy(fc-&gt;fc_i2c_adap[0].i2c_adap.name,</div><div class='del'>-		"B2C2 FlexCop I2C to demod", I2C_NAME_SIZE);</div><div class='del'>-	strncpy(fc-&gt;fc_i2c_adap[1].i2c_adap.name,</div><div class='del'>-		"B2C2 FlexCop I2C to eeprom", I2C_NAME_SIZE);</div><div class='del'>-	strncpy(fc-&gt;fc_i2c_adap[2].i2c_adap.name,</div><div class='del'>-		"B2C2 FlexCop I2C to tuner", I2C_NAME_SIZE);</div><div class='add'>+	strlcpy(fc-&gt;fc_i2c_adap[0].i2c_adap.name, "B2C2 FlexCop I2C to demod",</div><div class='add'>+		sizeof(fc-&gt;fc_i2c_adap[0].i2c_adap.name));</div><div class='add'>+	strlcpy(fc-&gt;fc_i2c_adap[1].i2c_adap.name, "B2C2 FlexCop I2C to eeprom",</div><div class='add'>+		sizeof(fc-&gt;fc_i2c_adap[1].i2c_adap.name));</div><div class='add'>+	strlcpy(fc-&gt;fc_i2c_adap[2].i2c_adap.name, "B2C2 FlexCop I2C to tuner",</div><div class='add'>+		sizeof(fc-&gt;fc_i2c_adap[2].i2c_adap.name));</div><div class='ctx'> </div><div class='ctx'> 	i2c_set_adapdata(&amp;fc-&gt;fc_i2c_adap[0].i2c_adap, &amp;fc-&gt;fc_i2c_adap[0]);</div><div class='ctx'> 	i2c_set_adapdata(&amp;fc-&gt;fc_i2c_adap[1].i2c_adap, &amp;fc-&gt;fc_i2c_adap[1]);</div><div class='head'>diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c<br/>index a7637562e742..aa3db57d32d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dst.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/bt8xx/dst.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dst.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/bt8xx/dst.c</a></div><div class='hunk'>@@ -1244,7 +1244,7 @@ static int dst_command(struct dst_state *state, u8 *data, u8 len)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (state-&gt;type_flags &amp; DST_TYPE_HAS_FW_1)</div><div class='del'>-		udelay(3000);</div><div class='add'>+		mdelay(3);</div><div class='ctx'> 	if (read_dst(state, &amp;reply, GET_ACK)) {</div><div class='ctx'> 		dprintk(verbose, DST_DEBUG, 1, "Trying to recover.. ");</div><div class='ctx'> 		if ((dst_error_recovery(state)) &lt; 0) {</div><div class='hunk'>@@ -1260,7 +1260,7 @@ static int dst_command(struct dst_state *state, u8 *data, u8 len)</div><div class='ctx'> 	if (len &gt;= 2 &amp;&amp; data[0] == 0 &amp;&amp; (data[1] == 1 || data[1] == 3))</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	if (state-&gt;type_flags &amp; DST_TYPE_HAS_FW_1)</div><div class='del'>-		udelay(3000);</div><div class='add'>+		mdelay(3);</div><div class='ctx'> 	else</div><div class='ctx'> 		udelay(2000);</div><div class='ctx'> 	if (!dst_wait_dst_ready(state, NO_DELAY))</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c<br/>index 1cf9fcb6f514..069d847ba887 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dmxdev.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/dvb-core/dmxdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dmxdev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/dvb-core/dmxdev.c</a></div><div class='hunk'>@@ -641,7 +641,6 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter)</div><div class='ctx'> 		struct timespec timeout = { 0 };</div><div class='ctx'> 		struct dmx_pes_filter_params *para = &amp;filter-&gt;params.pes;</div><div class='ctx'> 		dmx_output_t otype;</div><div class='del'>-		int ret;</div><div class='ctx'> 		int ts_type;</div><div class='ctx'> 		enum dmx_ts_pes ts_pes;</div><div class='ctx'> 		struct dmx_ts_feed **tsfeed = &amp;filter-&gt;feed.ts;</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c<br/>index 8e5dd7b1f034..98ee16773ff2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_ca_en50221.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/dvb-core/dvb_ca_en50221.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_ca_en50221.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/dvb-core/dvb_ca_en50221.c</a></div><div class='hunk'>@@ -1032,7 +1032,7 @@ static int dvb_ca_en50221_thread(void *data)</div><div class='ctx'> 					/* we need this extra check for annoying interfaces like the budget-av */</div><div class='ctx'> 					if ((!(ca-&gt;flags &amp; DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE)) &amp;&amp;</div><div class='ctx'> 					    (ca-&gt;pub-&gt;poll_slot_status)) {</div><div class='del'>-						int status = ca-&gt;pub-&gt;poll_slot_status(ca-&gt;pub, slot, 0);</div><div class='add'>+						status = ca-&gt;pub-&gt;poll_slot_status(ca-&gt;pub, slot, 0);</div><div class='ctx'> 						if (!(status &amp; DVB_CA_EN50221_POLL_CAM_PRESENT)) {</div><div class='ctx'> 							ca-&gt;slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE;</div><div class='ctx'> 							dvb_ca_en50221_thread_update_delay(ca);</div><div class='hunk'>@@ -1089,7 +1089,7 @@ static int dvb_ca_en50221_thread(void *data)</div><div class='ctx'> 					/* we need this extra check for annoying interfaces like the budget-av */</div><div class='ctx'> 					if ((!(ca-&gt;flags &amp; DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE)) &amp;&amp;</div><div class='ctx'> 					    (ca-&gt;pub-&gt;poll_slot_status)) {</div><div class='del'>-						int status = ca-&gt;pub-&gt;poll_slot_status(ca-&gt;pub, slot, 0);</div><div class='add'>+						status = ca-&gt;pub-&gt;poll_slot_status(ca-&gt;pub, slot, 0);</div><div class='ctx'> 						if (!(status &amp; DVB_CA_EN50221_POLL_CAM_PRESENT)) {</div><div class='ctx'> 							ca-&gt;slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE;</div><div class='ctx'> 							dvb_ca_en50221_thread_update_delay(ca);</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c<br/>index 8cbdb218952f..3526e3ee9487 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_frontend.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/dvb-core/dvb_frontend.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_frontend.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/dvb-core/dvb_frontend.c</a></div><div class='hunk'>@@ -889,13 +889,13 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			 * initialization, so parg is 8 bits and does not</div><div class='ctx'> 			 * include the initialization or start bit</div><div class='ctx'> 			 */</div><div class='del'>-			unsigned long cmd = ((unsigned long) parg) &lt;&lt; 1;</div><div class='add'>+			unsigned long swcmd = ((unsigned long) parg) &lt;&lt; 1;</div><div class='ctx'> 			struct timeval nexttime;</div><div class='ctx'> 			struct timeval tv[10];</div><div class='ctx'> 			int i;</div><div class='ctx'> 			u8 last = 1;</div><div class='ctx'> 			if (dvb_frontend_debug)</div><div class='del'>-				printk("%s switch command: 0x%04lx\n", __func__, cmd);</div><div class='add'>+				printk("%s switch command: 0x%04lx\n", __func__, swcmd);</div><div class='ctx'> 			do_gettimeofday(&amp;nexttime);</div><div class='ctx'> 			if (dvb_frontend_debug)</div><div class='ctx'> 				memcpy(&amp;tv[0], &amp;nexttime, sizeof(struct timeval));</div><div class='hunk'>@@ -908,12 +908,12 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			for (i = 0; i &lt; 9; i++) {</div><div class='ctx'> 				if (dvb_frontend_debug)</div><div class='ctx'> 					do_gettimeofday(&amp;tv[i + 1]);</div><div class='del'>-				if ((cmd &amp; 0x01) != last) {</div><div class='add'>+				if ((swcmd &amp; 0x01) != last) {</div><div class='ctx'> 					/* set voltage to (last ? 13V : 18V) */</div><div class='ctx'> 					fe-&gt;ops.set_voltage(fe, (last) ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18);</div><div class='ctx'> 					last = (last) ? 0 : 1;</div><div class='ctx'> 				}</div><div class='del'>-				cmd = cmd &gt;&gt; 1;</div><div class='add'>+				swcmd = swcmd &gt;&gt; 1;</div><div class='ctx'> 				if (i != 8)</div><div class='ctx'> 					dvb_frontend_sleep_until(&amp;nexttime, 8000);</div><div class='ctx'> 			}</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c<br/>index 578afce6884c..563400277a42 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/cxusb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/dvb-usb/cxusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/cxusb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/dvb-usb/cxusb.c</a></div><div class='hunk'>@@ -210,7 +210,7 @@ static int cxusb_aver_power_ctrl(struct dvb_usb_device *d, int onoff)</div><div class='ctx'> 	if (d-&gt;state == DVB_USB_STATE_INIT &amp;&amp;</div><div class='ctx'> 	    usb_set_interface(d-&gt;udev, 0, 0) &lt; 0)</div><div class='ctx'> 		err("set interface failed");</div><div class='del'>-	do; while (!(ret = cxusb_ctrl_msg(d, CMD_POWER_ON, NULL, 0, NULL, 0)) &amp;&amp;</div><div class='add'>+	do {} while (!(ret = cxusb_ctrl_msg(d, CMD_POWER_ON, NULL, 0, NULL, 0)) &amp;&amp;</div><div class='ctx'> 		   !(ret = cxusb_ctrl_msg(d, 0x15, NULL, 0, NULL, 0)) &amp;&amp;</div><div class='ctx'> 		   !(ret = cxusb_ctrl_msg(d, 0x17, NULL, 0, NULL, 0)) &amp;&amp; 0);</div><div class='ctx'> 	if (!ret) {</div><div class='hunk'>@@ -565,7 +565,8 @@ static int cxusb_lgh064f_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> </div><div class='ctx'> static int dvico_bluebird_xc2028_callback(void *ptr, int command, int arg)</div><div class='ctx'> {</div><div class='del'>-	struct dvb_usb_device *d = ptr;</div><div class='add'>+	struct dvb_usb_adapter *adap = ptr;</div><div class='add'>+	struct dvb_usb_device *d = adap-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	switch (command) {</div><div class='ctx'> 	case XC2028_TUNER_RESET:</div><div class='hunk'>@@ -593,9 +594,9 @@ static int cxusb_dvico_xc3028_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 		.callback  = dvico_bluebird_xc2028_callback,</div><div class='ctx'> 	};</div><div class='ctx'> 	static struct xc2028_ctrl ctl = {</div><div class='del'>-		.fname       = "xc3028-dvico-au-01.fw",</div><div class='add'>+		.fname       = "xc3028-v27.fw",</div><div class='ctx'> 		.max_len     = 64,</div><div class='del'>-		.scode_table = XC3028_FE_ZARLINK456,</div><div class='add'>+		.demod       = XC3028_FE_ZARLINK456,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	fe = dvb_attach(xc2028_attach, adap-&gt;fe, &amp;cfg);</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c<br/>index 3dd20bfbed32..6c0e5c5f4362 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dib0700_devices.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/dvb-usb/dib0700_devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dib0700_devices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/dvb-usb/dib0700_devices.c</a></div><div class='hunk'>@@ -1117,7 +1117,8 @@ struct usb_device_id dib0700_usb_id_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(USB_VID_TERRATEC,	USB_PID_TERRATEC_CINERGY_HT_EXPRESS) },</div><div class='ctx'> 	{ USB_DEVICE(USB_VID_TERRATEC,	USB_PID_TERRATEC_CINERGY_T_XXS) },</div><div class='ctx'> 	{ USB_DEVICE(USB_VID_LEADTEK,   USB_PID_WINFAST_DTV_DONGLE_STK7700P_2) },</div><div class='del'>-	{ USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_TD_STICK_52009) },</div><div class='add'>+/* 35 */{ USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_TD_STICK_52009) },</div><div class='add'>+	{ USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500_3) },</div><div class='ctx'> 	{ 0 }		/* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);</div><div class='hunk'>@@ -1373,7 +1374,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {</div><div class='ctx'> 			}</div><div class='ctx'> 		},</div><div class='ctx'> </div><div class='del'>-		.num_device_descs = 3,</div><div class='add'>+		.num_device_descs = 4,</div><div class='ctx'> 		.devices = {</div><div class='ctx'> 			{   "DiBcom STK7070PD reference design",</div><div class='ctx'> 				{ &amp;dib0700_usb_id_table[17], NULL },</div><div class='hunk'>@@ -1386,6 +1387,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {</div><div class='ctx'> 			{   "Hauppauge Nova-TD Stick (52009)",</div><div class='ctx'> 				{ &amp;dib0700_usb_id_table[35], NULL },</div><div class='ctx'> 				{ NULL },</div><div class='add'>+			},</div><div class='add'>+			{   "Hauppauge Nova-TD-500 (84xxx)",</div><div class='add'>+				{ &amp;dib0700_usb_id_table[36], NULL },</div><div class='add'>+				{ NULL },</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h<br/>index 029b437caf9a..03dfb9f2fe30 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dvb-usb-ids.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/dvb-usb/dvb-usb-ids.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dvb-usb-ids.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/dvb-usb/dvb-usb-ids.h</a></div><div class='hunk'>@@ -129,6 +129,7 @@</div><div class='ctx'> #define USB_PID_WINTV_NOVA_T_USB2_WARM			0x9301</div><div class='ctx'> #define USB_PID_HAUPPAUGE_NOVA_T_500			0x9941</div><div class='ctx'> #define USB_PID_HAUPPAUGE_NOVA_T_500_2			0x9950</div><div class='add'>+#define USB_PID_HAUPPAUGE_NOVA_T_500_3			0x8400</div><div class='ctx'> #define USB_PID_HAUPPAUGE_NOVA_T_STICK			0x7050</div><div class='ctx'> #define USB_PID_HAUPPAUGE_NOVA_T_STICK_2		0x7060</div><div class='ctx'> #define USB_PID_HAUPPAUGE_NOVA_T_STICK_3		0x7070</div><div class='head'>diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig<br/>index 574dffe91b68..7dbb4a223c99 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/frontends/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/Kconfig</a></div><div class='hunk'>@@ -135,9 +135,8 @@ config DVB_CX22702</div><div class='ctx'> </div><div class='ctx'> config DVB_DRX397XD</div><div class='ctx'> 	tristate "Micronas DRX3975D/DRX3977D based"</div><div class='del'>-	depends on DVB_CORE &amp;&amp; I2C &amp;&amp; HOTPLUG</div><div class='add'>+	depends on DVB_CORE &amp;&amp; I2C</div><div class='ctx'> 	default m if DVB_FE_CUSTOMISE</div><div class='del'>-	select FW_LOADER</div><div class='ctx'> 	help</div><div class='ctx'> 	  A DVB-T tuner module. Say Y when you want to support this frontend.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/au8522.c b/drivers/media/dvb/frontends/au8522.c<br/>index f7b71657f0f6..0b82cc2a1e16 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/au8522.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/frontends/au8522.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/au8522.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/au8522.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>     Auvitek AU8522 QAM/8VSB demodulator driver</div><div class='ctx'> </div><div class='del'>-    Copyright (C) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+    Copyright (C) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'> </div><div class='ctx'>     This program is free software; you can redistribute it and/or modify</div><div class='ctx'>     it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -304,6 +304,43 @@ static int au8522_mse2snr_lookup(struct mse2snr_tab *tab, int sz, int mse,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int au8522_set_if(struct dvb_frontend *fe, enum au8522_if_freq if_freq)</div><div class='add'>+{</div><div class='add'>+	struct au8522_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 r0b5, r0b6, r0b7;</div><div class='add'>+	char *ifmhz;</div><div class='add'>+</div><div class='add'>+	switch (if_freq) {</div><div class='add'>+	case AU8522_IF_3_25MHZ:</div><div class='add'>+		ifmhz = "3.25";</div><div class='add'>+		r0b5 = 0x00;</div><div class='add'>+		r0b6 = 0x3d;</div><div class='add'>+		r0b7 = 0xa0;</div><div class='add'>+		break;</div><div class='add'>+	case AU8522_IF_4MHZ:</div><div class='add'>+		ifmhz = "4.00";</div><div class='add'>+		r0b5 = 0x00;</div><div class='add'>+		r0b6 = 0x4b;</div><div class='add'>+		r0b7 = 0xd9;</div><div class='add'>+		break;</div><div class='add'>+	case AU8522_IF_6MHZ:</div><div class='add'>+		ifmhz = "6.00";</div><div class='add'>+		r0b5 = 0xfb;</div><div class='add'>+		r0b6 = 0x8e;</div><div class='add'>+		r0b7 = 0x39;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dprintk("%s() IF Frequency not supported\n", __func__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	dprintk("%s() %s MHz\n", __func__, ifmhz);</div><div class='add'>+	au8522_writereg(state, 0x80b5, r0b5);</div><div class='add'>+	au8522_writereg(state, 0x80b6, r0b6);</div><div class='add'>+	au8522_writereg(state, 0x80b7, r0b7);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* VSB Modulation table */</div><div class='ctx'> static struct {</div><div class='ctx'> 	u16 reg;</div><div class='hunk'>@@ -334,9 +371,6 @@ static struct {</div><div class='ctx'> 	{ 0x80af, 0x66 },</div><div class='ctx'> 	{ 0x821b, 0xcc },</div><div class='ctx'> 	{ 0x821d, 0x80 },</div><div class='del'>-	{ 0x80b5, 0xfb },</div><div class='del'>-	{ 0x80b6, 0x8e },</div><div class='del'>-	{ 0x80b7, 0x39 },</div><div class='ctx'> 	{ 0x80a4, 0xe8 },</div><div class='ctx'> 	{ 0x8231, 0x13 },</div><div class='ctx'> };</div><div class='hunk'>@@ -350,9 +384,6 @@ static struct {</div><div class='ctx'> 	{ 0x80a4, 0x00 },</div><div class='ctx'> 	{ 0x8081, 0xc4 },</div><div class='ctx'> 	{ 0x80a5, 0x40 },</div><div class='del'>-	{ 0x80b5, 0xfb },</div><div class='del'>-	{ 0x80b6, 0x8e },</div><div class='del'>-	{ 0x80b7, 0x39 },</div><div class='ctx'> 	{ 0x80aa, 0x77 },</div><div class='ctx'> 	{ 0x80ad, 0x77 },</div><div class='ctx'> 	{ 0x80a6, 0x67 },</div><div class='hunk'>@@ -438,6 +469,7 @@ static int au8522_enable_modulation(struct dvb_frontend *fe,</div><div class='ctx'> 			au8522_writereg(state,</div><div class='ctx'> 				VSB_mod_tab[i].reg,</div><div class='ctx'> 				VSB_mod_tab[i].data);</div><div class='add'>+		au8522_set_if(fe, state-&gt;config-&gt;vsb_if);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case QAM_64:</div><div class='ctx'> 	case QAM_256:</div><div class='hunk'>@@ -446,6 +478,7 @@ static int au8522_enable_modulation(struct dvb_frontend *fe,</div><div class='ctx'> 			au8522_writereg(state,</div><div class='ctx'> 				QAM_mod_tab[i].reg,</div><div class='ctx'> 				QAM_mod_tab[i].data);</div><div class='add'>+		au8522_set_if(fe, state-&gt;config-&gt;qam_if);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dprintk("%s() Invalid modulation\n", __func__);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/au8522.h b/drivers/media/dvb/frontends/au8522.h<br/>index d7affa3cdb27..595915ade8c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/au8522.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/frontends/au8522.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/au8522.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/au8522.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>     Auvitek AU8522 QAM/8VSB demodulator driver</div><div class='ctx'> </div><div class='del'>-    Copyright (C) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+    Copyright (C) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'> </div><div class='ctx'>     This program is free software; you can redistribute it and/or modify</div><div class='ctx'>     it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -24,6 +24,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dvb/frontend.h&gt;</div><div class='ctx'> </div><div class='add'>+enum au8522_if_freq {</div><div class='add'>+	AU8522_IF_6MHZ = 0,</div><div class='add'>+	AU8522_IF_4MHZ,</div><div class='add'>+	AU8522_IF_3_25MHZ,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct au8522_config {</div><div class='ctx'> 	/* the demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='hunk'>@@ -32,6 +38,9 @@ struct au8522_config {</div><div class='ctx'> #define AU8522_TUNERLOCKING 0</div><div class='ctx'> #define AU8522_DEMODLOCKING 1</div><div class='ctx'> 	u8 status_mode;</div><div class='add'>+</div><div class='add'>+	enum au8522_if_freq vsb_if;</div><div class='add'>+	enum au8522_if_freq qam_if;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_DVB_AU8522) || 				\</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c<br/>index cc1db4e371c3..9430e03dba6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx22702.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/frontends/cx22702.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx22702.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/cx22702.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>     Copyright (C) 2001-2002 Convergence Integrated Media GmbH</div><div class='ctx'> 	  Holger Waechtler &lt;holger@convergence.de&gt;</div><div class='ctx'> </div><div class='del'>-    Copyright (C) 2004 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+    Copyright (C) 2004 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'> </div><div class='ctx'>     This program is free software; you can redistribute it and/or modify</div><div class='ctx'>     it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx22702.h b/drivers/media/dvb/frontends/cx22702.h<br/>index 8af766a31552..b1e465c6c2ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx22702.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/frontends/cx22702.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx22702.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/cx22702.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>     Copyright (C) 2001-2002 Convergence Integrated Media GmbH</div><div class='ctx'> 	  Holger Waechtler &lt;holger@convergence.de&gt;</div><div class='ctx'> </div><div class='del'>-    Copyright (C) 2004 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+    Copyright (C) 2004 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'> </div><div class='ctx'>     This program is free software; you can redistribute it and/or modify</div><div class='ctx'>     it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c<br/>index 7f68d78c6558..7156157cb34b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24123.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/frontends/cx24123.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24123.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/cx24123.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *   Conexant cx24123/cx24109 - DVB QPSK Satellite demod/tuner driver</div><div class='ctx'>  *</div><div class='del'>- *   Copyright (C) 2005 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *   Copyright (C) 2005 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *   Support for KWorld DVB-S 100 by Vadim Catana &lt;skystar@moldova.cc&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -1072,8 +1072,8 @@ struct dvb_frontend* cx24123_attach(const struct cx24123_config* config,</div><div class='ctx'>     if (config-&gt;dont_use_pll)</div><div class='ctx'> 	cx24123_repeater_mode(state, 1, 0);</div><div class='ctx'> </div><div class='del'>-	strncpy(state-&gt;tuner_i2c_adapter.name,</div><div class='del'>-		"CX24123 tuner I2C bus", I2C_NAME_SIZE);</div><div class='add'>+	strlcpy(state-&gt;tuner_i2c_adapter.name, "CX24123 tuner I2C bus",</div><div class='add'>+		sizeof(state-&gt;tuner_i2c_adapter.name));</div><div class='ctx'> 	state-&gt;tuner_i2c_adapter.class     = I2C_CLASS_TV_DIGITAL,</div><div class='ctx'> 	state-&gt;tuner_i2c_adapter.algo      = &amp;cx24123_tuner_i2c_algo;</div><div class='ctx'> 	state-&gt;tuner_i2c_adapter.algo_data = NULL;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx24123.h b/drivers/media/dvb/frontends/cx24123.h<br/>index 81ebc3d2f19f..cc6b411d6d20 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24123.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/frontends/cx24123.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24123.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/cx24123.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>     Conexant cx24123/cx24109 - DVB QPSK Satellite demod/tuner driver</div><div class='ctx'> </div><div class='del'>-    Copyright (C) 2005 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+    Copyright (C) 2005 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'> </div><div class='ctx'>     This program is free software; you can redistribute it and/or modify</div><div class='ctx'>     it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c<br/>index 5ddb2dca305c..7500a1c53e68 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1409.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/frontends/s5h1409.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1409.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/s5h1409.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>     Samsung S5H1409 VSB/QAM demodulator driver</div><div class='ctx'> </div><div class='del'>-    Copyright (C) 2006 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+    Copyright (C) 2006 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'> </div><div class='ctx'>     This program is free software; you can redistribute it and/or modify</div><div class='ctx'>     it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -404,6 +404,7 @@ static int s5h1409_enable_modulation(struct dvb_frontend* fe,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case QAM_64:</div><div class='ctx'> 	case QAM_256:</div><div class='add'>+	case QAM_AUTO:</div><div class='ctx'> 		dprintk("%s() QAM_AUTO (64/256)\n", __func__);</div><div class='ctx'> 		if (state-&gt;if_freq != S5H1409_QAM_IF_FREQ)</div><div class='ctx'> 			s5h1409_set_if_freq(fe, S5H1409_QAM_IF_FREQ);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/s5h1409.h b/drivers/media/dvb/frontends/s5h1409.h<br/>index 59f4335964c6..d1a1d2eb8e11 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1409.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/frontends/s5h1409.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1409.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/s5h1409.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>     Samsung S5H1409 VSB/QAM demodulator driver</div><div class='ctx'> </div><div class='del'>-    Copyright (C) 2006 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+    Copyright (C) 2006 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'> </div><div class='ctx'>     This program is free software; you can redistribute it and/or modify</div><div class='ctx'>     it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/dvb/frontends/s5h1411.c b/drivers/media/dvb/frontends/s5h1411.c<br/>index cff360ce1ba3..2da1a3763de9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1411.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/frontends/s5h1411.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1411.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/s5h1411.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>     Samsung S5H1411 VSB/QAM demodulator driver</div><div class='ctx'> </div><div class='del'>-    Copyright (C) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+    Copyright (C) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'> </div><div class='ctx'>     This program is free software; you can redistribute it and/or modify</div><div class='ctx'>     it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -488,6 +488,7 @@ static int s5h1411_enable_modulation(struct dvb_frontend *fe,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case QAM_64:</div><div class='ctx'> 	case QAM_256:</div><div class='add'>+	case QAM_AUTO:</div><div class='ctx'> 		dprintk("%s() QAM_AUTO (64/256)\n", __func__);</div><div class='ctx'> 		s5h1411_set_if_freq(fe, state-&gt;config-&gt;qam_if);</div><div class='ctx'> 		s5h1411_writereg(state, S5H1411_I2C_TOP_ADDR, 0x00, 0x0171);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/s5h1411.h b/drivers/media/dvb/frontends/s5h1411.h<br/>index 1855f64ed4d8..7d542bc00c48 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1411.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/frontends/s5h1411.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1411.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/s5h1411.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>     Samsung S5H1411 VSB/QAM demodulator driver</div><div class='ctx'> </div><div class='del'>-    Copyright (C) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+    Copyright (C) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'> </div><div class='ctx'>     This program is free software; you can redistribute it and/or modify</div><div class='ctx'>     it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c<br/>index 720ed9ff7c5f..747d3fa2e5e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1420.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/frontends/s5h1420.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1420.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/s5h1420.c</a></div><div class='hunk'>@@ -915,7 +915,8 @@ struct dvb_frontend *s5h1420_attach(const struct s5h1420_config *config,</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> </div><div class='ctx'> 	/* create tuner i2c adapter */</div><div class='del'>-	strncpy(state-&gt;tuner_i2c_adapter.name, "S5H1420-PN1010 tuner I2C bus", I2C_NAME_SIZE);</div><div class='add'>+	strlcpy(state-&gt;tuner_i2c_adapter.name, "S5H1420-PN1010 tuner I2C bus",</div><div class='add'>+		sizeof(state-&gt;tuner_i2c_adapter.name));</div><div class='ctx'> 	state-&gt;tuner_i2c_adapter.class     = I2C_CLASS_TV_DIGITAL,</div><div class='ctx'> 	state-&gt;tuner_i2c_adapter.algo      = &amp;s5h1420_tuner_i2c_algo;</div><div class='ctx'> 	state-&gt;tuner_i2c_adapter.algo_data = NULL;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda10048.c b/drivers/media/dvb/frontends/tda10048.c<br/>index 0ab8d86b3ae3..04e7f1cc1403 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10048.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/frontends/tda10048.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10048.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/tda10048.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>     NXP TDA10048HN DVB OFDM demodulator driver</div><div class='ctx'> </div><div class='del'>-    Copyright (C) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+    Copyright (C) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'> </div><div class='ctx'>     This program is free software; you can redistribute it and/or modify</div><div class='ctx'>     it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -303,7 +303,7 @@ static int tda10048_firmware_upload(struct dvb_frontend *fe)</div><div class='ctx'> </div><div class='ctx'> 	if (fw-&gt;size != TDA10048_DEFAULT_FIRMWARE_SIZE) {</div><div class='ctx'> 		printk(KERN_ERR "%s: firmware incorrect size\n", __func__);</div><div class='del'>-		return -EIO;</div><div class='add'>+		ret = -EIO;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		printk(KERN_INFO "%s: firmware uploading\n", __func__);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda10048.h b/drivers/media/dvb/frontends/tda10048.h<br/>index 2b5c78e62c86..0457b24601fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10048.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/frontends/tda10048.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10048.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/frontends/tda10048.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>     NXP TDA10048HN DVB OFDM demodulator driver</div><div class='ctx'> </div><div class='del'>-    Copyright (C) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+    Copyright (C) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'> </div><div class='ctx'>     This program is free software; you can redistribute it and/or modify</div><div class='ctx'>     it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c<br/>index e7a8ac0c4049..cc5efb643f33 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/siano/sms-cards.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/siano/sms-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/siano/sms-cards.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/siano/sms-cards.c</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  *  Copyright (c) 2008 Michael Krufky &lt;mkrufky@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 3 as</div><div class='add'>+ *  it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  *  published by the Free Software Foundation;</div><div class='ctx'>  *</div><div class='ctx'>  *  Software distributed under the License is distributed on an "AS IS"</div><div class='head'>diff --git a/drivers/media/dvb/siano/sms-cards.h b/drivers/media/dvb/siano/sms-cards.h<br/>index 83b39bc203fe..c8f3da6f9bc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/siano/sms-cards.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/siano/sms-cards.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/siano/sms-cards.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/siano/sms-cards.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  *  Copyright (c) 2008 Michael Krufky &lt;mkrufky@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 3 as</div><div class='add'>+ *  it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  *  published by the Free Software Foundation;</div><div class='ctx'>  *</div><div class='ctx'>  *  Software distributed under the License is distributed on an "AS IS"</div><div class='head'>diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c<br/>index c5f45fed69dc..6576fbb40fc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/siano/smscoreapi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/siano/smscoreapi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/siano/smscoreapi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/siano/smscoreapi.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  *  Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 3 as</div><div class='add'>+ *  it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  *  published by the Free Software Foundation;</div><div class='ctx'>  *</div><div class='ctx'>  *  Software distributed under the License is distributed on an "AS IS"</div><div class='head'>diff --git a/drivers/media/dvb/siano/smscoreapi.h b/drivers/media/dvb/siano/smscoreapi.h<br/>index c1f8f1dccb11..8d973f726fb8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/siano/smscoreapi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/siano/smscoreapi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/siano/smscoreapi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/siano/smscoreapi.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *  Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 3 as</div><div class='add'>+ *  it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  *  published by the Free Software Foundation;</div><div class='ctx'>  *</div><div class='ctx'>  *  Software distributed under the License is distributed on an "AS IS"</div><div class='head'>diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c<br/>index 229274a14110..8d490e133f35 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/siano/smsdvb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/siano/smsdvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/siano/smsdvb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/siano/smsdvb.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *  Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 3 as</div><div class='add'>+ *  it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  *  published by the Free Software Foundation;</div><div class='ctx'>  *</div><div class='ctx'>  *  Software distributed under the License is distributed on an "AS IS"</div><div class='head'>diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c<br/>index c10b1849c6a3..87a3c24454b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/siano/smsusb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/siano/smsusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/siano/smsusb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/siano/smsusb.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *  Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 3 as</div><div class='add'>+ *  it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  *  published by the Free Software Foundation;</div><div class='ctx'>  *</div><div class='ctx'>  *  Software distributed under the License is distributed on an "AS IS"</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c<br/>index 39bd0a20f53a..aa5ed4ef19f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget-patch.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/ttpci/budget-patch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget-patch.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/ttpci/budget-patch.c</a></div><div class='hunk'>@@ -116,7 +116,8 @@ static int SendDiSEqCMsg (struct budget *budget, int len, u8 *msg, unsigned long</div><div class='ctx'> 			DiseqcSendByte(budget, 0xff);</div><div class='ctx'> 		else {</div><div class='ctx'> 			saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI);</div><div class='del'>-			udelay(12500);</div><div class='add'>+			mdelay(12);</div><div class='add'>+			udelay(500);</div><div class='ctx'> 			saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);</div><div class='ctx'> 		}</div><div class='ctx'> 		msleep(20);</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c<br/>index 2293d80c6e51..f0068996ac07 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/dvb/ttpci/budget.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/dvb/ttpci/budget.c</a></div><div class='hunk'>@@ -108,7 +108,8 @@ static int SendDiSEqCMsg (struct budget *budget, int len, u8 *msg, unsigned long</div><div class='ctx'> 			DiseqcSendByte(budget, 0xff);</div><div class='ctx'> 		else {</div><div class='ctx'> 			saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI);</div><div class='del'>-			udelay(12500);</div><div class='add'>+			mdelay(12);</div><div class='add'>+			udelay(500);</div><div class='ctx'> 			saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);</div><div class='ctx'> 		}</div><div class='ctx'> 		msleep(20);</div><div class='head'>diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile<br/>index a30159f6fa42..7ca71ab96b43 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/Makefile</a></div><div class='hunk'>@@ -2,8 +2,6 @@</div><div class='ctx'> # Makefile for the kernel character device drivers.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-miropcm20-objs	:= miropcm20-rds-core.o miropcm20-radio.o</div><div class='del'>-</div><div class='ctx'> obj-$(CONFIG_RADIO_AZTECH) += radio-aztech.o</div><div class='ctx'> obj-$(CONFIG_RADIO_RTRACK2) += radio-rtrack2.o</div><div class='ctx'> obj-$(CONFIG_RADIO_SF16FMI) += radio-sf16fmi.o</div><div class='hunk'>@@ -14,8 +12,6 @@ obj-$(CONFIG_RADIO_TERRATEC) += radio-terratec.o</div><div class='ctx'> obj-$(CONFIG_RADIO_MAXIRADIO) += radio-maxiradio.o</div><div class='ctx'> obj-$(CONFIG_RADIO_RTRACK) += radio-aimslab.o</div><div class='ctx'> obj-$(CONFIG_RADIO_ZOLTRIX) += radio-zoltrix.o</div><div class='del'>-obj-$(CONFIG_RADIO_MIROPCM20) += miropcm20.o</div><div class='del'>-obj-$(CONFIG_RADIO_MIROPCM20_RDS) += miropcm20-rds.o</div><div class='ctx'> obj-$(CONFIG_RADIO_GEMTEK) += radio-gemtek.o</div><div class='ctx'> obj-$(CONFIG_RADIO_GEMTEK_PCI) += radio-gemtek-pci.o</div><div class='ctx'> obj-$(CONFIG_RADIO_TRUST) += radio-trust.o</div><div class='head'>diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c<br/>index 1ed88f3abe61..70c65a745923 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/dsbr100.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/dsbr100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/dsbr100.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/dsbr100.c</a></div><div class='hunk'>@@ -493,7 +493,7 @@ static int usb_dsbr100_probe(struct usb_interface *intf,</div><div class='ctx'> 	radio-&gt;usbdev = interface_to_usbdev(intf);</div><div class='ctx'> 	radio-&gt;curfreq = FREQ_MIN*FREQ_MUL;</div><div class='ctx'> 	video_set_drvdata(radio-&gt;videodev, radio);</div><div class='del'>-	if (video_register_device(radio-&gt;videodev, VFL_TYPE_RADIO,radio_nr)) {</div><div class='add'>+	if (video_register_device(radio-&gt;videodev, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='ctx'> 		warn("Could not register video device");</div><div class='ctx'> 		video_device_release(radio-&gt;videodev);</div><div class='ctx'> 		kfree(radio-&gt;transfer_buffer);</div><div class='head'>diff --git a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c<br/>deleted file mode 100644<br/>index 7fd7ee2d32c1..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/miropcm20-radio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/miropcm20-radio.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,266 +0,0 @@</div><div class='del'>-/* Miro PCM20 radio driver for Linux radio support</div><div class='del'>- * (c) 1998 Ruurd Reitsma &lt;R.A.Reitsma@wbmt.tudelft.nl&gt;</div><div class='del'>- * Thanks to Norberto Pellici for the ACI device interface specification</div><div class='del'>- * The API part is based on the radiotrack driver by M. Kirkwood</div><div class='del'>- * This driver relies on the aci mixer (drivers/sound/aci.c)</div><div class='del'>- * Look there for further info...</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Revision history:</div><div class='del'>- *</div><div class='del'>- *   1998        Ruurd Reitsma &lt;R.A.Reitsma@wbmt.tudelft.nl&gt;</div><div class='del'>- *   2000-09-05  Robert Siemer &lt;Robert.Siemer@gmx.de&gt;</div><div class='del'>- *        removed unfinished volume control (maybe adding it later again)</div><div class='del'>- *        use OSS-mixer; added stereo control</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* What ever you think about the ACI, version 0x07 is not very well!</div><div class='del'>- * I can't get frequency, 'tuner status', 'tuner flags' or mute/mono</div><div class='del'>- * conditions...                Robert</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/videodev.h&gt;</div><div class='del'>-#include &lt;media/v4l2-common.h&gt;</div><div class='del'>-#include &lt;media/v4l2-ioctl.h&gt;</div><div class='del'>-#include "oss/aci.h"</div><div class='del'>-#include "miropcm20-rds-core.h"</div><div class='del'>-</div><div class='del'>-static int radio_nr = -1;</div><div class='del'>-module_param(radio_nr, int, 0);</div><div class='del'>-</div><div class='del'>-struct pcm20_device {</div><div class='del'>-	unsigned long freq;</div><div class='del'>-	int muted;</div><div class='del'>-	int stereo;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int pcm20_mute(struct pcm20_device *dev, unsigned char mute)</div><div class='del'>-{</div><div class='del'>-	dev-&gt;muted = mute;</div><div class='del'>-	return aci_write_cmd(ACI_SET_TUNERMUTE, mute);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pcm20_stereo(struct pcm20_device *dev, unsigned char stereo)</div><div class='del'>-{</div><div class='del'>-	dev-&gt;stereo = stereo;</div><div class='del'>-	return aci_write_cmd(ACI_SET_TUNERMONO, !stereo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pcm20_setfreq(struct pcm20_device *dev, unsigned long freq)</div><div class='del'>-{</div><div class='del'>-	unsigned char freql;</div><div class='del'>-	unsigned char freqh;</div><div class='del'>-</div><div class='del'>-	dev-&gt;freq=freq;</div><div class='del'>-</div><div class='del'>-	freq /= 160;</div><div class='del'>-	if (!(aci_version==0x07 || aci_version&gt;=0xb0))</div><div class='del'>-		freq /= 10;  /* I don't know exactly which version</div><div class='del'>-			      * needs this hack */</div><div class='del'>-	freql = freq &amp; 0xff;</div><div class='del'>-	freqh = freq &gt;&gt; 8;</div><div class='del'>-</div><div class='del'>-	aci_rds_cmd(RDS_RESET, NULL, 0);</div><div class='del'>-	pcm20_stereo(dev, 1);</div><div class='del'>-</div><div class='del'>-	return aci_rw_cmd(ACI_WRITE_TUNE, freql, freqh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pcm20_getflags(struct pcm20_device *dev, __u32 *flags, __u16 *signal)</div><div class='del'>-{</div><div class='del'>-	/* okay, check for signal, stereo and rds here... */</div><div class='del'>-	int i;</div><div class='del'>-	unsigned char buf;</div><div class='del'>-</div><div class='del'>-	if ((i=aci_rw_cmd(ACI_READ_TUNERSTATION, -1, -1))&lt;0)</div><div class='del'>-		return i;</div><div class='del'>-	pr_debug("check_sig: 0x%x\n", i);</div><div class='del'>-	if (i &amp; 0x80) {</div><div class='del'>-		/* no signal from tuner */</div><div class='del'>-		*flags=0;</div><div class='del'>-		*signal=0;</div><div class='del'>-		return 0;</div><div class='del'>-	} else</div><div class='del'>-		*signal=0xffff;</div><div class='del'>-</div><div class='del'>-	if ((i=aci_rw_cmd(ACI_READ_TUNERSTEREO, -1, -1))&lt;0)</div><div class='del'>-		return i;</div><div class='del'>-	if (i &amp; 0x40) {</div><div class='del'>-		*flags=0;</div><div class='del'>-	} else {</div><div class='del'>-		/* stereo */</div><div class='del'>-		*flags=VIDEO_TUNER_STEREO_ON;</div><div class='del'>-		/* I can't see stereo, when forced to mono */</div><div class='del'>-		dev-&gt;stereo=1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((i=aci_rds_cmd(RDS_STATUS, &amp;buf, 1))&lt;0)</div><div class='del'>-		return i;</div><div class='del'>-	if (buf &amp; 1)</div><div class='del'>-		/* RDS available */</div><div class='del'>-		*flags|=VIDEO_TUNER_RDS_ON;</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if ((i=aci_rds_cmd(RDS_RXVALUE, &amp;buf, 1))&lt;0)</div><div class='del'>-		return i;</div><div class='del'>-	pr_debug("rds-signal: %d\n", buf);</div><div class='del'>-	if (buf &gt; 15) {</div><div class='del'>-		printk("miropcm20-radio: RX strengths unexpected high...\n");</div><div class='del'>-		buf=15;</div><div class='del'>-	}</div><div class='del'>-	/* refine signal */</div><div class='del'>-	if ((*signal=SCALE(15, 0xffff, buf))==0)</div><div class='del'>-		*signal = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pcm20_do_ioctl(struct inode *inode, struct file *file,</div><div class='del'>-			  unsigned int cmd, void *arg)</div><div class='del'>-{</div><div class='del'>-	struct video_device *dev = video_devdata(file);</div><div class='del'>-	struct pcm20_device *pcm20 = dev-&gt;priv;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	switch(cmd)</div><div class='del'>-	{</div><div class='del'>-		case VIDIOCGCAP:</div><div class='del'>-		{</div><div class='del'>-			struct video_capability *v = arg;</div><div class='del'>-			memset(v,0,sizeof(*v));</div><div class='del'>-			v-&gt;type=VID_TYPE_TUNER;</div><div class='del'>-			strcpy(v-&gt;name, "Miro PCM20");</div><div class='del'>-			v-&gt;channels=1;</div><div class='del'>-			v-&gt;audios=1;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		case VIDIOCGTUNER:</div><div class='del'>-		{</div><div class='del'>-			struct video_tuner *v = arg;</div><div class='del'>-			if(v-&gt;tuner)	/* Only 1 tuner */</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			v-&gt;rangelow=87*16000;</div><div class='del'>-			v-&gt;rangehigh=108*16000;</div><div class='del'>-			pcm20_getflags(pcm20, &amp;v-&gt;flags, &amp;v-&gt;signal);</div><div class='del'>-			v-&gt;flags|=VIDEO_TUNER_LOW;</div><div class='del'>-			v-&gt;mode=VIDEO_MODE_AUTO;</div><div class='del'>-			strcpy(v-&gt;name, "FM");</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		case VIDIOCSTUNER:</div><div class='del'>-		{</div><div class='del'>-			struct video_tuner *v = arg;</div><div class='del'>-			if(v-&gt;tuner!=0)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			/* Only 1 tuner so no setting needed ! */</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		case VIDIOCGFREQ:</div><div class='del'>-		{</div><div class='del'>-			unsigned long *freq = arg;</div><div class='del'>-			*freq = pcm20-&gt;freq;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		case VIDIOCSFREQ:</div><div class='del'>-		{</div><div class='del'>-			unsigned long *freq = arg;</div><div class='del'>-			pcm20-&gt;freq = *freq;</div><div class='del'>-			i=pcm20_setfreq(pcm20, pcm20-&gt;freq);</div><div class='del'>-			pr_debug("First view (setfreq): 0x%x\n", i);</div><div class='del'>-			return i;</div><div class='del'>-		}</div><div class='del'>-		case VIDIOCGAUDIO:</div><div class='del'>-		{</div><div class='del'>-			struct video_audio *v = arg;</div><div class='del'>-			memset(v,0, sizeof(*v));</div><div class='del'>-			v-&gt;flags=VIDEO_AUDIO_MUTABLE;</div><div class='del'>-			if (pcm20-&gt;muted)</div><div class='del'>-				v-&gt;flags|=VIDEO_AUDIO_MUTE;</div><div class='del'>-			v-&gt;mode=VIDEO_SOUND_STEREO;</div><div class='del'>-			if (pcm20-&gt;stereo)</div><div class='del'>-				v-&gt;mode|=VIDEO_SOUND_MONO;</div><div class='del'>-			/* v-&gt;step=2048; */</div><div class='del'>-			strcpy(v-&gt;name, "Radio");</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		case VIDIOCSAUDIO:</div><div class='del'>-		{</div><div class='del'>-			struct video_audio *v = arg;</div><div class='del'>-			if(v-&gt;audio)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-</div><div class='del'>-			pcm20_mute(pcm20, !!(v-&gt;flags&amp;VIDEO_AUDIO_MUTE));</div><div class='del'>-			if(v-&gt;flags&amp;VIDEO_SOUND_MONO)</div><div class='del'>-				pcm20_stereo(pcm20, 0);</div><div class='del'>-			if(v-&gt;flags&amp;VIDEO_SOUND_STEREO)</div><div class='del'>-				pcm20_stereo(pcm20, 1);</div><div class='del'>-</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		default:</div><div class='del'>-			return -ENOIOCTLCMD;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pcm20_ioctl(struct inode *inode, struct file *file,</div><div class='del'>-		       unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	return video_usercopy(inode, file, cmd, arg, pcm20_do_ioctl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pcm20_device pcm20_unit = {</div><div class='del'>-	.freq   = 87*16000,</div><div class='del'>-	.muted  = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct file_operations pcm20_fops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = video_exclusive_open,</div><div class='del'>-	.release        = video_exclusive_release,</div><div class='del'>-	.ioctl		= pcm20_ioctl,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='del'>-#endif</div><div class='del'>-	.llseek         = no_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct video_device pcm20_radio = {</div><div class='del'>-	.name		= "Miro PCM 20 radio",</div><div class='del'>-	.fops           = &amp;pcm20_fops,</div><div class='del'>-	.priv		= &amp;pcm20_unit</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init pcm20_init(void)</div><div class='del'>-{</div><div class='del'>-	if(video_register_device(&amp;pcm20_radio, VFL_TYPE_RADIO, radio_nr)==-1)</div><div class='del'>-		goto video_register_device;</div><div class='del'>-</div><div class='del'>-	if(attach_aci_rds()&lt;0)</div><div class='del'>-		goto attach_aci_rds;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "Miro PCM20 radio card driver.\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- attach_aci_rds:</div><div class='del'>-	video_unregister_device(&amp;pcm20_radio);</div><div class='del'>- video_register_device:</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Ruurd Reitsma");</div><div class='del'>-MODULE_DESCRIPTION("A driver for the Miro PCM20 radio card.");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-static void __exit pcm20_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	unload_aci_rds();</div><div class='del'>-	video_unregister_device(&amp;pcm20_radio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(pcm20_init);</div><div class='del'>-module_exit(pcm20_cleanup);</div><div class='head'>diff --git a/drivers/media/radio/miropcm20-rds-core.c b/drivers/media/radio/miropcm20-rds-core.c<br/>deleted file mode 100644<br/>index 9428d8b2642c..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/miropcm20-rds-core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/miropcm20-rds-core.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,211 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Many thanks to Fred Seidel &lt;seidel@metabox.de&gt;, the</div><div class='del'>- *  designer of the RDS decoder hardware. With his help</div><div class='del'>- *  I was able to code this driver.</div><div class='del'>- *  Thanks also to Norberto Pellicci, Dominic Mounteney</div><div class='del'>- *  &lt;DMounteney@pinnaclesys.com&gt; and www.teleauskunft.de</div><div class='del'>- *  for good hints on finding Fred. It was somewhat hard</div><div class='del'>- *  to locate him here in Germany... [:</div><div class='del'>- *</div><div class='del'>- * Revision history:</div><div class='del'>- *</div><div class='del'>- *   2000-08-09  Robert Siemer &lt;Robert.Siemer@gmx.de&gt;</div><div class='del'>- *        RDS support for MiroSound PCM20 radio</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include "oss/aci.h"</div><div class='del'>-#include "miropcm20-rds-core.h"</div><div class='del'>-</div><div class='del'>-#define DEBUG 0</div><div class='del'>-</div><div class='del'>-static struct mutex aci_rds_mutex;</div><div class='del'>-</div><div class='del'>-#define RDS_DATASHIFT          2   /* Bit 2 */</div><div class='del'>-#define RDS_DATAMASK        (1 &lt;&lt; RDS_DATASHIFT)</div><div class='del'>-#define RDS_BUSYMASK        0x10   /* Bit 4 */</div><div class='del'>-#define RDS_CLOCKMASK       0x08   /* Bit 3 */</div><div class='del'>-</div><div class='del'>-#define RDS_DATA(x)         (((x) &gt;&gt; RDS_DATASHIFT) &amp; 1)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if DEBUG</div><div class='del'>-static void print_matrix(char array[], unsigned int length)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;length; i++) {</div><div class='del'>-		printk(KERN_DEBUG "aci-rds: ");</div><div class='del'>-		for (j=7; j&gt;=0; j--) {</div><div class='del'>-			printk("%d", (array[i] &gt;&gt; j) &amp; 0x1);</div><div class='del'>-		}</div><div class='del'>-		if (i%8 == 0)</div><div class='del'>-			printk(" byte-border\n");</div><div class='del'>-		else</div><div class='del'>-			printk("\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif /* DEBUG */</div><div class='del'>-</div><div class='del'>-static int byte2trans(unsigned char byte, unsigned char sendbuffer[], int size)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (size != 8)</div><div class='del'>-		return -1;</div><div class='del'>-	for (i = 7; i &gt;= 0; i--)</div><div class='del'>-		sendbuffer[7-i] = (byte &amp; (1 &lt;&lt; i)) ? RDS_DATAMASK : 0;</div><div class='del'>-	sendbuffer[0] |= RDS_CLOCKMASK;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rds_waitread(void)</div><div class='del'>-{</div><div class='del'>-	unsigned char byte;</div><div class='del'>-	int i=2000;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		byte=inb(RDS_REGISTER);</div><div class='del'>-		i--;</div><div class='del'>-	}</div><div class='del'>-	while ((byte &amp; RDS_BUSYMASK) &amp;&amp; i);</div><div class='del'>-</div><div class='del'>-	if (i) {</div><div class='del'>-		#if DEBUG</div><div class='del'>-		printk(KERN_DEBUG "rds_waitread()");</div><div class='del'>-		print_matrix(&amp;byte, 1);</div><div class='del'>-		#endif</div><div class='del'>-		return (byte);</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_WARNING "aci-rds: rds_waitread() timeout...\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* don't use any ..._nowait() function if you are not sure what you do... */</div><div class='del'>-</div><div class='del'>-static inline void rds_rawwrite_nowait(unsigned char byte)</div><div class='del'>-{</div><div class='del'>-	#if DEBUG</div><div class='del'>-	printk(KERN_DEBUG "rds_rawwrite()");</div><div class='del'>-	print_matrix(&amp;byte, 1);</div><div class='del'>-	#endif</div><div class='del'>-	outb(byte, RDS_REGISTER);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rds_rawwrite(unsigned char byte)</div><div class='del'>-{</div><div class='del'>-	if (rds_waitread() &gt;= 0) {</div><div class='del'>-		rds_rawwrite_nowait(byte);</div><div class='del'>-		return 0;</div><div class='del'>-	} else</div><div class='del'>-		return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rds_write(unsigned char cmd)</div><div class='del'>-{</div><div class='del'>-	unsigned char sendbuffer[8];</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (byte2trans(cmd, sendbuffer, 8) != 0){</div><div class='del'>-		return -1;</div><div class='del'>-	} else {</div><div class='del'>-		for (i=0; i&lt;8; i++) {</div><div class='del'>-			rds_rawwrite(sendbuffer[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rds_readcycle_nowait(void)</div><div class='del'>-{</div><div class='del'>-	rds_rawwrite_nowait(0);</div><div class='del'>-	return rds_waitread();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rds_readcycle(void)</div><div class='del'>-{</div><div class='del'>-	if (rds_rawwrite(0) &lt; 0)</div><div class='del'>-		return -1;</div><div class='del'>-	return rds_waitread();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rds_read(unsigned char databuffer[], int datasize)</div><div class='del'>-{</div><div class='del'>-	#define READSIZE (8*datasize)</div><div class='del'>-</div><div class='del'>-	int i,j;</div><div class='del'>-</div><div class='del'>-	if (datasize &lt; 1)  /* nothing to read */</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* to be able to use rds_readcycle_nowait()</div><div class='del'>-	   I have to waitread() here */</div><div class='del'>-	if (rds_waitread() &lt; 0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	memset(databuffer, 0, datasize);</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt; READSIZE; i++)</div><div class='del'>-		if((j=rds_readcycle_nowait()) &lt; 0) {</div><div class='del'>-			return -1;</div><div class='del'>-		} else {</div><div class='del'>-			databuffer[i/8]|=(RDS_DATA(j) &lt;&lt; (7-(i%8)));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rds_ack(void)</div><div class='del'>-{</div><div class='del'>-	int i=rds_readcycle();</div><div class='del'>-</div><div class='del'>-	if (i &lt; 0)</div><div class='del'>-		return -1;</div><div class='del'>-	if (i &amp; RDS_DATAMASK) {</div><div class='del'>-		return 0;  /* ACK  */</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_DEBUG "aci-rds: NACK\n");</div><div class='del'>-		return 1;  /* NACK */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int aci_rds_cmd(unsigned char cmd, unsigned char databuffer[], int datasize)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (mutex_lock_interruptible(&amp;aci_rds_mutex))</div><div class='del'>-		return -EINTR;</div><div class='del'>-</div><div class='del'>-	rds_write(cmd);</div><div class='del'>-</div><div class='del'>-	/* RDS_RESET doesn't need further processing */</div><div class='del'>-	if (cmd!=RDS_RESET &amp;&amp; (rds_ack() || rds_read(databuffer, datasize)))</div><div class='del'>-		ret = -1;</div><div class='del'>-	else</div><div class='del'>-		ret = 0;</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;aci_rds_mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(aci_rds_cmd);</div><div class='del'>-</div><div class='del'>-int __init attach_aci_rds(void)</div><div class='del'>-{</div><div class='del'>-	mutex_init(&amp;aci_rds_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __exit unload_aci_rds(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/radio/miropcm20-rds-core.h b/drivers/media/radio/miropcm20-rds-core.h<br/>deleted file mode 100644<br/>index aeb5761f0469..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/miropcm20-rds-core.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/miropcm20-rds-core.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-#ifndef _MIROPCM20_RDS_CORE_H_</div><div class='del'>-#define _MIROPCM20_RDS_CORE_H_</div><div class='del'>-</div><div class='del'>-extern int aci_rds_cmd(unsigned char cmd, unsigned char databuffer[], int datasize);</div><div class='del'>-</div><div class='del'>-#define RDS_STATUS      0x01</div><div class='del'>-#define RDS_STATIONNAME 0x02</div><div class='del'>-#define RDS_TEXT        0x03</div><div class='del'>-#define RDS_ALTFREQ     0x04</div><div class='del'>-#define RDS_TIMEDATE    0x05</div><div class='del'>-#define RDS_PI_CODE     0x06</div><div class='del'>-#define RDS_PTYTATP     0x07</div><div class='del'>-#define RDS_RESET       0x08</div><div class='del'>-#define RDS_RXVALUE     0x09</div><div class='del'>-</div><div class='del'>-extern void __exit unload_aci_rds(void);</div><div class='del'>-extern int __init attach_aci_rds(void);</div><div class='del'>-</div><div class='del'>-#endif /* _MIROPCM20_RDS_CORE_H_ */</div><div class='head'>diff --git a/drivers/media/radio/miropcm20-rds.c b/drivers/media/radio/miropcm20-rds.c<br/>deleted file mode 100644<br/>index 3e840f74d45c..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/miropcm20-rds.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/miropcm20-rds.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,136 +0,0 @@</div><div class='del'>-/* MiroSOUND PCM20 radio rds interface driver</div><div class='del'>- * (c) 2001 Robert Siemer &lt;Robert.Siemer@gmx.de&gt;</div><div class='del'>- * Thanks to Fred Seidel. See miropcm20-rds-core.c for further information.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Revision history:</div><div class='del'>- *</div><div class='del'>- *   2001-04-18  Robert Siemer &lt;Robert.Siemer@gmx.de&gt;</div><div class='del'>- *        separate file for user interface driver</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/miscdevice.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include "miropcm20-rds-core.h"</div><div class='del'>-</div><div class='del'>-static char * text_buffer;</div><div class='del'>-static int rds_users;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int rds_f_open(struct inode *in, struct file *fi)</div><div class='del'>-{</div><div class='del'>-	if (rds_users)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	lock_kernel();</div><div class='del'>-	rds_users++;</div><div class='del'>-	if ((text_buffer=kmalloc(66, GFP_KERNEL)) == 0) {</div><div class='del'>-		rds_users--;</div><div class='del'>-		printk(KERN_NOTICE "aci-rds: Out of memory by open()...\n");</div><div class='del'>-		unlock_kernel();</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	unlock_kernel();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rds_f_release(struct inode *in, struct file *fi)</div><div class='del'>-{</div><div class='del'>-	kfree(text_buffer);</div><div class='del'>-</div><div class='del'>-	rds_users--;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void print_matrix(char *ch, char out[])</div><div class='del'>-{</div><div class='del'>-	int j;</div><div class='del'>-</div><div class='del'>-	for (j=7; j&gt;=0; j--) {</div><div class='del'>-		 out[7-j] = ((*ch &gt;&gt; j) &amp; 0x1) + '0';</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t rds_f_read(struct file *file, char __user *buffer, size_t length, loff_t *offset)</div><div class='del'>-{</div><div class='del'>-//	i = sprintf(text_buffer, "length: %d, offset: %d\n", length, *offset);</div><div class='del'>-</div><div class='del'>-	char c;</div><div class='del'>-	char bits[8];</div><div class='del'>-</div><div class='del'>-	msleep(2000);</div><div class='del'>-	aci_rds_cmd(RDS_STATUS, &amp;c, 1);</div><div class='del'>-	print_matrix(&amp;c, bits);</div><div class='del'>-	if (copy_to_user(buffer, bits, 8))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-/*	if ((c &gt;&gt; 3) &amp; 1) {</div><div class='del'>-		aci_rds_cmd(RDS_STATIONNAME, text_buffer+1, 8);</div><div class='del'>-		text_buffer[0]  = ' ' ;</div><div class='del'>-		text_buffer[9]  = '\n';</div><div class='del'>-		return copy_to_user(buffer+8, text_buffer, 10) ? -EFAULT: 18;</div><div class='del'>-	}</div><div class='del'>-*/</div><div class='del'>-/*	if ((c &gt;&gt; 6) &amp; 1) {</div><div class='del'>-		aci_rds_cmd(RDS_PTYTATP, &amp;c, 1);</div><div class='del'>-		if ( c &amp; 1)</div><div class='del'>-			sprintf(text_buffer, " M");</div><div class='del'>-		else</div><div class='del'>-			sprintf(text_buffer, " S");</div><div class='del'>-		if ((c &gt;&gt; 1) &amp; 1)</div><div class='del'>-			sprintf(text_buffer+2, " TA");</div><div class='del'>-		else</div><div class='del'>-			sprintf(text_buffer+2, " --");</div><div class='del'>-		if ((c &gt;&gt; 7) &amp; 1)</div><div class='del'>-			sprintf(text_buffer+5, " TP");</div><div class='del'>-		else</div><div class='del'>-			sprintf(text_buffer+5, " --");</div><div class='del'>-		sprintf(text_buffer+8, " %2d\n", (c &gt;&gt; 2) &amp; 0x1f);</div><div class='del'>-		return copy_to_user(buffer+8, text_buffer, 12) ? -EFAULT: 20;</div><div class='del'>-	}</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-	if ((c &gt;&gt; 4) &amp; 1) {</div><div class='del'>-		aci_rds_cmd(RDS_TEXT, text_buffer, 65);</div><div class='del'>-		text_buffer[0]  = ' ' ;</div><div class='del'>-		text_buffer[65] = '\n';</div><div class='del'>-		return copy_to_user(buffer+8, text_buffer,66) ? -EFAULT : 66+8;</div><div class='del'>-	} else {</div><div class='del'>-		put_user('\n', buffer+8);</div><div class='del'>-		return 9;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations rds_fops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.read		= rds_f_read,</div><div class='del'>-	.open		= rds_f_open,</div><div class='del'>-	.release	= rds_f_release</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct miscdevice rds_miscdev = {</div><div class='del'>-	.minor		= MISC_DYNAMIC_MINOR,</div><div class='del'>-	.name		= "radiotext",</div><div class='del'>-	.fops		= &amp;rds_fops,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init miropcm20_rds_init(void)</div><div class='del'>-{</div><div class='del'>-	return misc_register(&amp;rds_miscdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit miropcm20_rds_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	misc_deregister(&amp;rds_miscdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(miropcm20_rds_init);</div><div class='del'>-module_exit(miropcm20_rds_cleanup);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c<br/>index eba9209b3024..1f064f4b32df 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-aimslab.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/radio-aimslab.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-aimslab.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-aimslab.c</a></div><div class='hunk'>@@ -426,8 +426,7 @@ static int __init rtrack_init(void)</div><div class='ctx'> </div><div class='ctx'> 	rtrack_radio.priv=&amp;rtrack_unit;</div><div class='ctx'> </div><div class='del'>-	if(video_register_device(&amp;rtrack_radio, VFL_TYPE_RADIO, radio_nr)==-1)</div><div class='del'>-	{</div><div class='add'>+	if (video_register_device(&amp;rtrack_radio, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='ctx'> 		release_region(io, 2);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c<br/>index 3fe5504428c5..628c689e3ffe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-aztech.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/radio-aztech.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-aztech.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-aztech.c</a></div><div class='hunk'>@@ -394,8 +394,7 @@ static int __init aztech_init(void)</div><div class='ctx'> 	mutex_init(&amp;lock);</div><div class='ctx'> 	aztech_radio.priv=&amp;aztech_unit;</div><div class='ctx'> </div><div class='del'>-	if(video_register_device(&amp;aztech_radio, VFL_TYPE_RADIO, radio_nr)==-1)</div><div class='del'>-	{</div><div class='add'>+	if (video_register_device(&amp;aztech_radio, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='ctx'> 		release_region(io,2);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c<br/>index 6166e726ed72..04c3698d32e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-cadet.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/radio-cadet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-cadet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-cadet.c</a></div><div class='hunk'>@@ -682,7 +682,7 @@ static int __init cadet_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!request_region(io,2,"cadet"))</div><div class='ctx'> 		goto fail;</div><div class='del'>-	if(video_register_device(&amp;cadet_radio,VFL_TYPE_RADIO,radio_nr)==-1) {</div><div class='add'>+	if (video_register_device(&amp;cadet_radio, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='ctx'> 		release_region(io,2);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c<br/>index 36e754e3ffb2..5cd7f032298d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-gemtek-pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/radio-gemtek-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-gemtek-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-gemtek-pci.c</a></div><div class='hunk'>@@ -425,7 +425,7 @@ static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci</div><div class='ctx'> 	}</div><div class='ctx'> 	*devradio = vdev_template;</div><div class='ctx'> </div><div class='del'>-	if ( video_register_device( devradio, VFL_TYPE_RADIO , nr_radio) == -1 ) {</div><div class='add'>+	if (video_register_device(devradio, VFL_TYPE_RADIO, nr_radio) &lt; 0) {</div><div class='ctx'> 		kfree( devradio );</div><div class='ctx'> 		goto err_video;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c<br/>index 2b1a6221de6d..0a0f956bb308 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-gemtek.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/radio-gemtek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-gemtek.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-gemtek.c</a></div><div class='hunk'>@@ -612,8 +612,7 @@ static int __init gemtek_init(void)</div><div class='ctx'> </div><div class='ctx'> 	gemtek_radio.priv = &amp;gemtek_unit;</div><div class='ctx'> </div><div class='del'>-	if (video_register_device(&amp;gemtek_radio, VFL_TYPE_RADIO,</div><div class='del'>-		radio_nr) == -1) {</div><div class='add'>+	if (video_register_device(&amp;gemtek_radio, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='ctx'> 		release_region(io, 1);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c<br/>index 0ada1c697e8a..9ef0a763eeb7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-maestro.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/radio-maestro.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-maestro.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-maestro.c</a></div><div class='hunk'>@@ -409,8 +409,7 @@ static int __devinit maestro_probe(struct pci_dev *pdev,</div><div class='ctx'> 	video_set_drvdata(maestro_radio_inst, radio_unit);</div><div class='ctx'> 	pci_set_drvdata(pdev, maestro_radio_inst);</div><div class='ctx'> </div><div class='del'>-	retval = video_register_device(maestro_radio_inst, VFL_TYPE_RADIO,</div><div class='del'>-		radio_nr);</div><div class='add'>+	retval = video_register_device(maestro_radio_inst, VFL_TYPE_RADIO, radio_nr);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		printk(KERN_ERR "can't register video device!\n");</div><div class='ctx'> 		goto errfr1;</div><div class='head'>diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c<br/>index 43c75497dc49..0cc6fcb041fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-maxiradio.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/radio-maxiradio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-maxiradio.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-maxiradio.c</a></div><div class='hunk'>@@ -156,28 +156,28 @@ static void set_freq(__u16 io, __u32 freq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long int si;</div><div class='ctx'> 	int bl;</div><div class='del'>-	int data = FREQ2BITS(freq);</div><div class='add'>+	int val = FREQ2BITS(freq);</div><div class='ctx'> </div><div class='ctx'> 	/* TEA5757 shift register bits (see pdf) */</div><div class='ctx'> </div><div class='del'>-	outbit(0,io); // 24  search</div><div class='del'>-	outbit(1,io); // 23  search up/down</div><div class='add'>+	outbit(0, io); /* 24  search */</div><div class='add'>+	outbit(1, io); /* 23  search up/down */</div><div class='ctx'> </div><div class='del'>-	outbit(0,io); // 22  stereo/mono</div><div class='add'>+	outbit(0, io); /* 22  stereo/mono */</div><div class='ctx'> </div><div class='del'>-	outbit(0,io); // 21  band</div><div class='del'>-	outbit(0,io); // 20  band (only 00=FM works I think)</div><div class='add'>+	outbit(0, io); /* 21  band */</div><div class='add'>+	outbit(0, io); /* 20  band (only 00=FM works I think) */</div><div class='ctx'> </div><div class='del'>-	outbit(0,io); // 19  port ?</div><div class='del'>-	outbit(0,io); // 18  port ?</div><div class='add'>+	outbit(0, io); /* 19  port ? */</div><div class='add'>+	outbit(0, io); /* 18  port ? */</div><div class='ctx'> </div><div class='del'>-	outbit(0,io); // 17  search level</div><div class='del'>-	outbit(0,io); // 16  search level</div><div class='add'>+	outbit(0, io); /* 17  search level */</div><div class='add'>+	outbit(0, io); /* 16  search level */</div><div class='ctx'> </div><div class='ctx'> 	si = 0x8000;</div><div class='del'>-	for (bl = 1; bl &lt;= 16 ; bl++) {</div><div class='del'>-		outbit(data &amp; si,io);</div><div class='del'>-		si &gt;&gt;=1;</div><div class='add'>+	for (bl = 1; bl &lt;= 16; bl++) {</div><div class='add'>+		outbit(val &amp; si, io);</div><div class='add'>+		si &gt;&gt;= 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "Radio freq set to %d.%02d MHz\n",</div><div class='hunk'>@@ -410,7 +410,7 @@ static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_d</div><div class='ctx'> 	mutex_init(&amp;radio_unit.lock);</div><div class='ctx'> 	maxiradio_radio.priv = &amp;radio_unit;</div><div class='ctx'> </div><div class='del'>-	if (video_register_device(&amp;maxiradio_radio, VFL_TYPE_RADIO, radio_nr)==-1) {</div><div class='add'>+	if (video_register_device(&amp;maxiradio_radio, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='ctx'> 		printk("radio-maxiradio: can't register device!");</div><div class='ctx'> 		goto err_out_free_region;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c<br/>index e2dde0807268..6d820e2481e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-rtrack2.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/radio-rtrack2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-rtrack2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-rtrack2.c</a></div><div class='hunk'>@@ -332,8 +332,7 @@ static int __init rtrack2_init(void)</div><div class='ctx'> 	rtrack2_radio.priv=&amp;rtrack2_unit;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;lock);</div><div class='del'>-	if(video_register_device(&amp;rtrack2_radio, VFL_TYPE_RADIO, radio_nr)==-1)</div><div class='del'>-	{</div><div class='add'>+	if (video_register_device(&amp;rtrack2_radio, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='ctx'> 		release_region(io, 4);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c<br/>index bb5d92f104af..0d478f54a907 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-sf16fmi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/radio-sf16fmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-sf16fmi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-sf16fmi.c</a></div><div class='hunk'>@@ -377,7 +377,7 @@ static int __init fmi_init(void)</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;lock);</div><div class='ctx'> </div><div class='del'>-	if (video_register_device(&amp;fmi_radio, VFL_TYPE_RADIO, radio_nr) == -1) {</div><div class='add'>+	if (video_register_device(&amp;fmi_radio, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='ctx'> 		release_region(io, 2);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c<br/>index a4984ff87c9c..16c7ef20265c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-si470x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/radio-si470x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-si470x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-si470x.c</a></div><div class='hunk'>@@ -1694,8 +1694,8 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;radio-&gt;work, si470x_work);</div><div class='ctx'> </div><div class='ctx'> 	/* register video device */</div><div class='del'>-	if (video_register_device(radio-&gt;videodev, VFL_TYPE_RADIO, radio_nr)) {</div><div class='del'>-		retval = -EIO;</div><div class='add'>+	retval = video_register_device(radio-&gt;videodev, VFL_TYPE_RADIO, radio_nr);</div><div class='add'>+	if (retval) {</div><div class='ctx'> 		printk(KERN_WARNING DRIVER_NAME</div><div class='ctx'> 				": Could not register video device\n");</div><div class='ctx'> 		goto err_all;</div><div class='head'>diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c<br/>index cefa44fc5aed..0876fecc5f27 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-terratec.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/radio-terratec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-terratec.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-terratec.c</a></div><div class='hunk'>@@ -405,8 +405,7 @@ static int __init terratec_init(void)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;lock);</div><div class='ctx'> </div><div class='del'>-	if(video_register_device(&amp;terratec_radio, VFL_TYPE_RADIO, radio_nr)==-1)</div><div class='del'>-	{</div><div class='add'>+	if (video_register_device(&amp;terratec_radio, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='ctx'> 		release_region(io,2);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c<br/>index d70172d23edb..193161956253 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-trust.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/radio-trust.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-trust.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-trust.c</a></div><div class='hunk'>@@ -378,8 +378,7 @@ static int __init trust_init(void)</div><div class='ctx'> 		printk(KERN_ERR "trust: port 0x%x already in use\n", io);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	if(video_register_device(&amp;trust_radio, VFL_TYPE_RADIO, radio_nr)==-1)</div><div class='del'>-	{</div><div class='add'>+	if (video_register_device(&amp;trust_radio, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='ctx'> 		release_region(io, 2);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c<br/>index 9f17a332fa11..51d57ed3b3e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-zoltrix.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/radio/radio-zoltrix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-zoltrix.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/radio/radio-zoltrix.c</a></div><div class='hunk'>@@ -446,8 +446,7 @@ static int __init zoltrix_init(void)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (video_register_device(&amp;zoltrix_radio, VFL_TYPE_RADIO, radio_nr) == -1)</div><div class='del'>-	{</div><div class='add'>+	if (video_register_device(&amp;zoltrix_radio, VFL_TYPE_RADIO, radio_nr) &lt; 0) {</div><div class='ctx'> 		release_region(io, 2);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig<br/>index d4a6e56a7135..3e9e0dcd217e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/Kconfig</a></div><div class='hunk'>@@ -630,7 +630,7 @@ config VIDEO_ZORAN_ZR36060</div><div class='ctx'> 	depends on VIDEO_ZORAN</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y to support Zoran boards based on 36060 chips.</div><div class='del'>-	  This includes Iomega Bus, Pinnacle DC10, Linux media Labs 33</div><div class='add'>+	  This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33</div><div class='ctx'> 	  and 33 R10 and AverMedia 6 boards.</div><div class='ctx'> </div><div class='ctx'> config VIDEO_ZORAN_BUZ</div><div class='hunk'>@@ -968,7 +968,7 @@ config VIDEO_PXA27x</div><div class='ctx'> </div><div class='ctx'> config VIDEO_SH_MOBILE_CEU</div><div class='ctx'> 	tristate "SuperH Mobile CEU Interface driver"</div><div class='del'>-	depends on VIDEO_DEV</div><div class='add'>+	depends on VIDEO_DEV &amp;&amp; HAS_DMA</div><div class='ctx'> 	select SOC_CAMERA</div><div class='ctx'> 	select VIDEOBUF_DMA_CONTIG</div><div class='ctx'> 	---help---</div><div class='head'>diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile<br/>index bbc6f8b82297..ef7c8d3ffb18 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/Makefile</a></div><div class='hunk'>@@ -20,6 +20,8 @@ ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)</div><div class='ctx'>   obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_VIDEO_TUNER) += tuner.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_VIDEO_BT848) += bt8xx/</div><div class='ctx'> obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o</div><div class='hunk'>@@ -85,8 +87,6 @@ obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_DPC) += dpc7146.o</div><div class='ctx'> obj-$(CONFIG_TUNER_3036) += tuner-3036.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_VIDEO_TUNER) += tuner.o</div><div class='del'>-</div><div class='ctx'> obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o</div><div class='ctx'> obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o</div><div class='ctx'> obj-$(CONFIG_VIDEOBUF_DMA_CONTIG) += videobuf-dma-contig.o</div><div class='head'>diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c<br/>index 56ebfd5ef6fa..9e436ad3d34b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/arv.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/arv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/arv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/arv.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-ioctl.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -755,7 +756,6 @@ static const struct file_operations ar_fops = {</div><div class='ctx'> </div><div class='ctx'> static struct video_device ar_template = {</div><div class='ctx'> 	.name		= "Colour AR VGA",</div><div class='del'>-	.type		= VID_TYPE_CAPTURE,</div><div class='ctx'> 	.fops		= &amp;ar_fops,</div><div class='ctx'> 	.release	= ar_release,</div><div class='ctx'> 	.minor		= -1,</div><div class='head'>diff --git a/drivers/media/video/au0828/Kconfig b/drivers/media/video/au0828/Kconfig<br/>index ed9a50f189fc..018f72b8e3e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/au0828/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/au0828/Kconfig</a></div><div class='hunk'>@@ -7,6 +7,7 @@ config VIDEO_AU0828</div><div class='ctx'> 	select DVB_AU8522 if !DVB_FE_CUSTOMIZE</div><div class='ctx'> 	select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE</div><div class='ctx'> 	select MEDIA_TUNER_MXL5007T if !DVB_FE_CUSTOMIZE</div><div class='add'>+	select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This is a video4linux driver for Auvitek's USB device.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/au0828/au0828-cards.c b/drivers/media/video/au0828/au0828-cards.c<br/>index 443e59009762..ed48908a9034 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/au0828-cards.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/au0828/au0828-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/au0828-cards.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/au0828/au0828-cards.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for the Auvitek USB bridge</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -38,6 +38,9 @@ struct au0828_board au0828_boards[] = {</div><div class='ctx'> 	[AU0828_BOARD_DVICO_FUSIONHDTV7] = {</div><div class='ctx'> 		.name	= "DViCO FusionHDTV USB",</div><div class='ctx'> 	},</div><div class='add'>+	[AU0828_BOARD_HAUPPAUGE_WOODBURY] = {</div><div class='add'>+		.name = "Hauppauge Woodbury",</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Tuner callback function for au0828 boards. Currently only needed</div><div class='hunk'>@@ -115,6 +118,7 @@ void au0828_card_setup(struct au0828_dev *dev)</div><div class='ctx'> 	case AU0828_BOARD_HAUPPAUGE_HVR850:</div><div class='ctx'> 	case AU0828_BOARD_HAUPPAUGE_HVR950Q:</div><div class='ctx'> 	case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:</div><div class='add'>+	case AU0828_BOARD_HAUPPAUGE_WOODBURY:</div><div class='ctx'> 		if (dev-&gt;i2c_rc == 0)</div><div class='ctx'> 			hauppauge_eeprom(dev, eeprom+0xa0);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -134,6 +138,7 @@ void au0828_gpio_setup(struct au0828_dev *dev)</div><div class='ctx'> 	case AU0828_BOARD_HAUPPAUGE_HVR850:</div><div class='ctx'> 	case AU0828_BOARD_HAUPPAUGE_HVR950Q:</div><div class='ctx'> 	case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:</div><div class='add'>+	case AU0828_BOARD_HAUPPAUGE_WOODBURY:</div><div class='ctx'> 		/* GPIO's</div><div class='ctx'> 		 * 4 - CS5340</div><div class='ctx'> 		 * 5 - AU8522 Demodulator</div><div class='hunk'>@@ -205,6 +210,8 @@ struct usb_device_id au0828_usb_id_table [] = {</div><div class='ctx'> 		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },</div><div class='ctx'> 	{ USB_DEVICE(0x2040, 0x7281),</div><div class='ctx'> 		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },</div><div class='add'>+	{ USB_DEVICE(0x2040, 0x8200),</div><div class='add'>+		.driver_info = AU0828_BOARD_HAUPPAUGE_WOODBURY },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/au0828/au0828-cards.h b/drivers/media/video/au0828/au0828-cards.h<br/>index c37f5fd0fa80..48a1882c2b6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/au0828-cards.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/au0828/au0828-cards.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/au0828-cards.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/au0828/au0828-cards.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for the Auvitek USB bridge</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -24,3 +24,4 @@</div><div class='ctx'> #define AU0828_BOARD_HAUPPAUGE_HVR850 	2</div><div class='ctx'> #define AU0828_BOARD_DVICO_FUSIONHDTV7	3</div><div class='ctx'> #define AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL	4</div><div class='add'>+#define AU0828_BOARD_HAUPPAUGE_WOODBURY	5</div><div class='head'>diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/video/au0828/au0828-core.c<br/>index 54bfc0f05295..d856de9f742f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/au0828-core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/au0828/au0828-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/au0828-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/au0828/au0828-core.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for the Auvitek USB bridge</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -252,5 +252,5 @@ module_init(au0828_init);</div><div class='ctx'> module_exit(au0828_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Driver for Auvitek AU0828 based products");</div><div class='del'>-MODULE_AUTHOR("Steven Toth &lt;stoth@hauppauge.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Steven Toth &lt;stoth@linuxtv.org&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c<br/>index 584a83a94a2a..ba94be7e0ac1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/au0828-dvb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/au0828/au0828-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/au0828-dvb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/au0828/au0828-dvb.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for the Auvitek USB bridge</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include "au8522.h"</div><div class='ctx'> #include "xc5000.h"</div><div class='ctx'> #include "mxl5007t.h"</div><div class='add'>+#include "tda18271.h"</div><div class='ctx'> </div><div class='ctx'> DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='ctx'> </div><div class='hunk'>@@ -38,6 +39,15 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='ctx'> static struct au8522_config hauppauge_hvr950q_config = {</div><div class='ctx'> 	.demod_address = 0x8e &gt;&gt; 1,</div><div class='ctx'> 	.status_mode   = AU8522_DEMODLOCKING,</div><div class='add'>+	.qam_if        = AU8522_IF_6MHZ,</div><div class='add'>+	.vsb_if        = AU8522_IF_6MHZ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct au8522_config hauppauge_woodbury_config = {</div><div class='add'>+	.demod_address = 0x8e &gt;&gt; 1,</div><div class='add'>+	.status_mode   = AU8522_DEMODLOCKING,</div><div class='add'>+	.qam_if        = AU8522_IF_4MHZ,</div><div class='add'>+	.vsb_if        = AU8522_IF_3_25MHZ,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct xc5000_config hauppauge_hvr950q_tunerconfig = {</div><div class='hunk'>@@ -51,6 +61,10 @@ static struct mxl5007t_config mxl5007t_hvr950q_config = {</div><div class='ctx'> 	.if_freq_hz = MxL_IF_6_MHZ,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct tda18271_config hauppauge_woodbury_tunerconfig = {</div><div class='add'>+	.gate    = TDA18271_GATE_DIGITAL,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*-------------------------------------------------------------------*/</div><div class='ctx'> static void urb_completion(struct urb *purb)</div><div class='ctx'> {</div><div class='hunk'>@@ -357,6 +371,15 @@ int au0828_dvb_register(struct au0828_dev *dev)</div><div class='ctx'> 				   &amp;dev-&gt;i2c_adap, 0x60,</div><div class='ctx'> 				   &amp;mxl5007t_hvr950q_config);</div><div class='ctx'> 		break;</div><div class='add'>+	case AU0828_BOARD_HAUPPAUGE_WOODBURY:</div><div class='add'>+		dvb-&gt;frontend = dvb_attach(au8522_attach,</div><div class='add'>+				&amp;hauppauge_woodbury_config,</div><div class='add'>+				&amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dvb-&gt;frontend != NULL)</div><div class='add'>+			dvb_attach(tda18271_attach, dvb-&gt;frontend,</div><div class='add'>+				   0x60, &amp;dev-&gt;i2c_adap,</div><div class='add'>+				   &amp;hauppauge_woodbury_tunerconfig);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_WARNING "The frontend of your DVB/ATSC card "</div><div class='ctx'> 		       "isn't supported yet\n");</div><div class='head'>diff --git a/drivers/media/video/au0828/au0828-i2c.c b/drivers/media/video/au0828/au0828-i2c.c<br/>index 741a4937b050..d618fbaade1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/au0828-i2c.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/au0828/au0828-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/au0828-i2c.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/au0828/au0828-i2c.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for the Auvitek AU0828 USB bridge</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/video/au0828/au0828-reg.h b/drivers/media/video/au0828/au0828-reg.h<br/>index 39827550891c..1e87fa0c6842 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/au0828-reg.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/au0828/au0828-reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/au0828-reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/au0828/au0828-reg.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for the Auvitek USB bridge</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h<br/>index 7beb571798e5..4f10ff300135 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/au0828.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/au0828/au0828.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/au0828.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/au0828/au0828.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for the Auvitek AU0828 USB bridge</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c<br/>index 1c56ae92ce74..6081edc362df 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-cards.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/bt8xx/bttv-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-cards.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/bt8xx/bttv-cards.c</a></div><div class='hunk'>@@ -3144,8 +3144,9 @@ static void identify_by_eeprom(struct bttv *btv, unsigned char eeprom_data[256])</div><div class='ctx'> </div><div class='ctx'> static void flyvideo_gpio(struct bttv *btv)</div><div class='ctx'> {</div><div class='del'>-	int gpio,has_remote,has_radio,is_capture_only,is_lr90,has_tda9820_tda9821;</div><div class='del'>-	int tuner=UNSET,ttype;</div><div class='add'>+	int gpio, has_remote, has_radio, is_capture_only;</div><div class='add'>+	int is_lr90, has_tda9820_tda9821;</div><div class='add'>+	int tuner_type = UNSET, ttype;</div><div class='ctx'> </div><div class='ctx'> 	gpio_inout(0xffffff, 0);</div><div class='ctx'> 	udelay(8);  /* without this we would see the 0x1800 mask */</div><div class='hunk'>@@ -3163,20 +3164,26 @@ static void flyvideo_gpio(struct bttv *btv)</div><div class='ctx'> 	 * xxxF00(LR26/LR50), xxxFE0(LR90): Remote control chip (LVA001 or CF45) soldered</div><div class='ctx'> 	 * Note: Some bits are Audio_Mask !</div><div class='ctx'> 	 */</div><div class='del'>-	ttype=(gpio&amp;0x0f0000)&gt;&gt;16;</div><div class='del'>-	switch(ttype) {</div><div class='del'>-	case 0x0: tuner=2; /* NTSC, e.g. TPI8NSR11P */</div><div class='add'>+	ttype = (gpio &amp; 0x0f0000) &gt;&gt; 16;</div><div class='add'>+	switch (ttype) {</div><div class='add'>+	case 0x0:</div><div class='add'>+		tuner_type = 2;  /* NTSC, e.g. TPI8NSR11P */</div><div class='ctx'> 		break;</div><div class='del'>-	case 0x2: tuner=39;/* LG NTSC (newer TAPC series) TAPC-H701P */</div><div class='add'>+	case 0x2:</div><div class='add'>+		tuner_type = 39; /* LG NTSC (newer TAPC series) TAPC-H701P */</div><div class='ctx'> 		break;</div><div class='del'>-	case 0x4: tuner=5; /* Philips PAL TPI8PSB02P, TPI8PSB12P, TPI8PSB12D or FI1216, FM1216 */</div><div class='add'>+	case 0x4:</div><div class='add'>+		tuner_type = 5;  /* Philips PAL TPI8PSB02P, TPI8PSB12P, TPI8PSB12D or FI1216, FM1216 */</div><div class='ctx'> 		break;</div><div class='del'>-	case 0x6: tuner=37;/* LG PAL (newer TAPC series) TAPC-G702P */</div><div class='add'>+	case 0x6:</div><div class='add'>+		tuner_type = 37; /* LG PAL (newer TAPC series) TAPC-G702P */</div><div class='ctx'> 		break;</div><div class='del'>-		case 0xC: tuner=3; /* Philips SECAM(+PAL) FQ1216ME or FI1216MF */</div><div class='add'>+	case 0xC:</div><div class='add'>+		tuner_type = 3;  /* Philips SECAM(+PAL) FQ1216ME or FI1216MF */</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_INFO "bttv%d: FlyVideo_gpio: unknown tuner type.\n", btv-&gt;c.nr);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	has_remote          =   gpio &amp; 0x800000;</div><div class='hunk'>@@ -3189,23 +3196,26 @@ static void flyvideo_gpio(struct bttv *btv)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * gpio &amp; 0x001000    output bit for audio routing */</div><div class='ctx'> </div><div class='del'>-	if(is_capture_only)</div><div class='del'>-		tuner = TUNER_ABSENT; /* No tuner present */</div><div class='add'>+	if (is_capture_only)</div><div class='add'>+		tuner_type = TUNER_ABSENT; /* No tuner present */</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "bttv%d: FlyVideo Radio=%s RemoteControl=%s Tuner=%d gpio=0x%06x\n",</div><div class='del'>-	       btv-&gt;c.nr, has_radio? "yes":"no ", has_remote? "yes":"no ", tuner, gpio);</div><div class='add'>+		btv-&gt;c.nr, has_radio ? "yes" : "no ",</div><div class='add'>+		has_remote ? "yes" : "no ", tuner_type, gpio);</div><div class='ctx'> 	printk(KERN_INFO "bttv%d: FlyVideo  LR90=%s tda9821/tda9820=%s capture_only=%s\n",</div><div class='del'>-		btv-&gt;c.nr, is_lr90?"yes":"no ", has_tda9820_tda9821?"yes":"no ",</div><div class='del'>-		is_capture_only?"yes":"no ");</div><div class='add'>+		btv-&gt;c.nr, is_lr90 ? "yes" : "no ",</div><div class='add'>+		has_tda9820_tda9821 ? "yes" : "no ",</div><div class='add'>+		is_capture_only ? "yes" : "no ");</div><div class='ctx'> </div><div class='del'>-	if (tuner != UNSET) /* only set if known tuner autodetected, else let insmod option through */</div><div class='del'>-		btv-&gt;tuner_type = tuner;</div><div class='add'>+	if (tuner_type != UNSET) /* only set if known tuner autodetected, else let insmod option through */</div><div class='add'>+		btv-&gt;tuner_type = tuner_type;</div><div class='ctx'> 	btv-&gt;has_radio = has_radio;</div><div class='ctx'> </div><div class='ctx'> 	/* LR90 Audio Routing is done by 2 hef4052, so Audio_Mask has 4 bits: 0x001c80</div><div class='ctx'> 	 * LR26/LR50 only has 1 hef4052, Audio_Mask 0x000c00</div><div class='ctx'> 	 * Audio options: from tuner, from tda9821/tda9821(mono,stereo,sap), from tda9874, ext., mute */</div><div class='del'>-	if(has_tda9820_tda9821) btv-&gt;audio_mode_gpio = lt9415_audio;</div><div class='add'>+	if (has_tda9820_tda9821)</div><div class='add'>+		btv-&gt;audio_mode_gpio = lt9415_audio;</div><div class='ctx'> 	/* todo: if(has_tda9874) btv-&gt;audio_mode_gpio = fv2000s_audio; */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3962,7 +3972,7 @@ static int tuner_1_table[] = {</div><div class='ctx'> </div><div class='ctx'> static void __devinit avermedia_eeprom(struct bttv *btv)</div><div class='ctx'> {</div><div class='del'>-	int tuner_make,tuner_tv_fm,tuner_format,tuner=0;</div><div class='add'>+	int tuner_make, tuner_tv_fm, tuner_format, tuner_type = 0;</div><div class='ctx'> </div><div class='ctx'> 	tuner_make      = (eeprom_data[0x41] &amp; 0x7);</div><div class='ctx'> 	tuner_tv_fm     = (eeprom_data[0x41] &amp; 0x18) &gt;&gt; 3;</div><div class='hunk'>@@ -3970,24 +3980,24 @@ static void __devinit avermedia_eeprom(struct bttv *btv)</div><div class='ctx'> 	btv-&gt;has_remote = (eeprom_data[0x42] &amp; 0x01);</div><div class='ctx'> </div><div class='ctx'> 	if (tuner_make == 0 || tuner_make == 2)</div><div class='del'>-		if(tuner_format &lt;=0x0a)</div><div class='del'>-			tuner = tuner_0_table[tuner_format];</div><div class='add'>+		if (tuner_format &lt;= 0x0a)</div><div class='add'>+			tuner_type = tuner_0_table[tuner_format];</div><div class='ctx'> 	if (tuner_make == 1)</div><div class='del'>-		if(tuner_format &lt;=9)</div><div class='del'>-			tuner = tuner_1_table[tuner_format];</div><div class='add'>+		if (tuner_format &lt;= 9)</div><div class='add'>+			tuner_type = tuner_1_table[tuner_format];</div><div class='ctx'> </div><div class='ctx'> 	if (tuner_make == 4)</div><div class='del'>-		if(tuner_format == 0x09)</div><div class='del'>-			tuner = TUNER_LG_NTSC_NEW_TAPC; /* TAPC-G702P */</div><div class='add'>+		if (tuner_format == 0x09)</div><div class='add'>+			tuner_type = TUNER_LG_NTSC_NEW_TAPC; /* TAPC-G702P */</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "bttv%d: Avermedia eeprom[0x%02x%02x]: tuner=",</div><div class='del'>-		btv-&gt;c.nr,eeprom_data[0x41],eeprom_data[0x42]);</div><div class='del'>-	if(tuner) {</div><div class='del'>-		btv-&gt;tuner_type=tuner;</div><div class='del'>-		printk("%d",tuner);</div><div class='add'>+		btv-&gt;c.nr, eeprom_data[0x41], eeprom_data[0x42]);</div><div class='add'>+	if (tuner_type) {</div><div class='add'>+		btv-&gt;tuner_type = tuner_type;</div><div class='add'>+		printk(KERN_CONT "%d", tuner_type);</div><div class='ctx'> 	} else</div><div class='del'>-		printk("Unknown type");</div><div class='del'>-	printk(" radio:%s remote control:%s\n",</div><div class='add'>+		printk(KERN_CONT "Unknown type");</div><div class='add'>+	printk(KERN_CONT " radio:%s remote control:%s\n",</div><div class='ctx'> 	       tuner_tv_fm     ? "yes" : "no",</div><div class='ctx'> 	       btv-&gt;has_remote ? "yes" : "no");</div><div class='ctx'> }</div><div class='hunk'>@@ -4029,7 +4039,8 @@ static void __devinit boot_msp34xx(struct bttv *btv, int pin)</div><div class='ctx'> </div><div class='ctx'> 	gpio_inout(mask,mask);</div><div class='ctx'> 	gpio_bits(mask,0);</div><div class='del'>-	udelay(2500);</div><div class='add'>+	mdelay(2);</div><div class='add'>+	udelay(500);</div><div class='ctx'> 	gpio_bits(mask,mask);</div><div class='ctx'> </div><div class='ctx'> 	if (bttv_gpio)</div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c<br/>index 85bf31ab8789..6ae4cc860efe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-driver.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/bt8xx/bttv-driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-driver.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/bt8xx/bttv-driver.c</a></div><div class='hunk'>@@ -96,7 +96,6 @@ static unsigned int irq_iswitch;</div><div class='ctx'> static unsigned int uv_ratio    = 50;</div><div class='ctx'> static unsigned int full_luma_range;</div><div class='ctx'> static unsigned int coring;</div><div class='del'>-extern int no_overlay;</div><div class='ctx'> </div><div class='ctx'> /* API features (turn on/off stuff for testing) */</div><div class='ctx'> static unsigned int v4l2        = 1;</div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c<br/>index 649682aac1ac..5b1b8e4c78ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-risc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/bt8xx/bttv-risc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-risc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/bt8xx/bttv-risc.c</a></div><div class='hunk'>@@ -244,7 +244,8 @@ bttv_risc_overlay(struct bttv *btv, struct btcx_riscmem *risc,</div><div class='ctx'> 		  const struct bttv_format *fmt, struct bttv_overlay *ov,</div><div class='ctx'> 		  int skip_even, int skip_odd)</div><div class='ctx'> {</div><div class='del'>-	int dwords,rc,line,maxy,start,end,skip,nskips;</div><div class='add'>+	int dwords, rc, line, maxy, start, end;</div><div class='add'>+	unsigned skip, nskips;</div><div class='ctx'> 	struct btcx_skiplist *skips;</div><div class='ctx'> 	__le32 *rp;</div><div class='ctx'> 	u32 ri,ra;</div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h<br/>index 08ef54a22c9e..b4d940b2e447 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttvp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/bt8xx/bttvp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttvp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/bt8xx/bttvp.h</a></div><div class='hunk'>@@ -267,6 +267,11 @@ int bttv_sub_add_device(struct bttv_core *core, char *name);</div><div class='ctx'> int bttv_sub_del_devices(struct bttv_core *core);</div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------- */</div><div class='add'>+/* bttv-cards.c                                               */</div><div class='add'>+</div><div class='add'>+extern int no_overlay;</div><div class='add'>+</div><div class='add'>+/* ---------------------------------------------------------- */</div><div class='ctx'> /* bttv-driver.c                                              */</div><div class='ctx'> </div><div class='ctx'> /* insmod options */</div><div class='head'>diff --git a/drivers/media/video/btcx-risc.c b/drivers/media/video/btcx-risc.c<br/>index f42701f82e7f..3324ab38f58c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/btcx-risc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/btcx-risc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/btcx-risc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/btcx-risc.c</a></div><div class='hunk'>@@ -184,12 +184,12 @@ btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='del'>-btcx_calc_skips(int line, int width, unsigned int *maxy,</div><div class='add'>+btcx_calc_skips(int line, int width, int *maxy,</div><div class='ctx'> 		struct btcx_skiplist *skips, unsigned int *nskips,</div><div class='ctx'> 		const struct v4l2_clip *clips, unsigned int nclips)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int clip,skip;</div><div class='del'>-	int end,maxline;</div><div class='add'>+	int end, maxline;</div><div class='ctx'> </div><div class='ctx'> 	skip=0;</div><div class='ctx'> 	maxline = 9999;</div><div class='head'>diff --git a/drivers/media/video/btcx-risc.h b/drivers/media/video/btcx-risc.h<br/>index 861bc8112824..f8bc6e8e7b51 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/btcx-risc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/btcx-risc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/btcx-risc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/btcx-risc.h</a></div><div class='hunk'>@@ -23,7 +23,7 @@ int btcx_screen_clips(int swidth, int sheight, struct v4l2_rect *win,</div><div class='ctx'> int btcx_align(struct v4l2_rect *win, struct v4l2_clip *clips,</div><div class='ctx'> 	       unsigned int n, int mask);</div><div class='ctx'> void btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips);</div><div class='del'>-void btcx_calc_skips(int line, int width, unsigned int *maxy,</div><div class='add'>+void btcx_calc_skips(int line, int width, int *maxy,</div><div class='ctx'> 		     struct btcx_skiplist *skips, unsigned int *nskips,</div><div class='ctx'> 		     const struct v4l2_clip *clips, unsigned int nclips);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c<br/>index d3b3268bace8..6e39e253ce53 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bw-qcam.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/bw-qcam.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bw-qcam.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/bw-qcam.c</a></div><div class='hunk'>@@ -946,8 +946,7 @@ static int init_bwqcam(struct parport *port)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "Connectix Quickcam on %s\n", qcam-&gt;pport-&gt;name);</div><div class='ctx'> </div><div class='del'>-	if(video_register_device(&amp;qcam-&gt;vdev, VFL_TYPE_GRABBER, video_nr)==-1)</div><div class='del'>-	{</div><div class='add'>+	if (video_register_device(&amp;qcam-&gt;vdev, VFL_TYPE_GRABBER, video_nr) &lt; 0) {</div><div class='ctx'> 		parport_unregister_device(qcam-&gt;pdev);</div><div class='ctx'> 		kfree(qcam);</div><div class='ctx'> 		return -ENODEV;</div><div class='head'>diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c<br/>index fe9379b282d3..7f6c6b4bec10 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/c-qcam.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/c-qcam.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/c-qcam.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/c-qcam.c</a></div><div class='hunk'>@@ -787,8 +787,7 @@ static int init_cqcam(struct parport *port)</div><div class='ctx'> </div><div class='ctx'> 	parport_release(qcam-&gt;pdev);</div><div class='ctx'> </div><div class='del'>-	if (video_register_device(&amp;qcam-&gt;vdev, VFL_TYPE_GRABBER, video_nr)==-1)</div><div class='del'>-	{</div><div class='add'>+	if (video_register_device(&amp;qcam-&gt;vdev, VFL_TYPE_GRABBER, video_nr) &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "Unable to register Colour QuickCam on %s\n",</div><div class='ctx'> 		       qcam-&gt;pport-&gt;name);</div><div class='ctx'> 		parport_unregister_device(qcam-&gt;pdev);</div><div class='head'>diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c<br/>index dc8cc6115e2f..a661800b0e69 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cpia.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cpia.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cpia.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cpia.c</a></div><div class='hunk'>@@ -3955,7 +3955,7 @@ struct cam_data *cpia_register_camera(struct cpia_camera_ops *ops, void *lowleve</div><div class='ctx'> 	camera-&gt;lowlevel_data = lowlevel;</div><div class='ctx'> </div><div class='ctx'> 	/* register v4l device */</div><div class='del'>-	if (video_register_device(&amp;camera-&gt;vdev, VFL_TYPE_GRABBER, video_nr) == -1) {</div><div class='add'>+	if (video_register_device(&amp;camera-&gt;vdev, VFL_TYPE_GRABBER, video_nr) &lt; 0) {</div><div class='ctx'> 		kfree(camera);</div><div class='ctx'> 		printk(KERN_DEBUG "video_register_device failed\n");</div><div class='ctx'> 		return NULL;</div><div class='head'>diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c<br/>index 515c8b57a60d..eb9f15cd4c45 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cpia2/cpia2_v4l.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cpia2/cpia2_v4l.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cpia2/cpia2_v4l.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cpia2/cpia2_v4l.c</a></div><div class='hunk'>@@ -1024,7 +1024,6 @@ static int ioctl_queryctrl(void *arg,struct camera_data *cam)</div><div class='ctx'> 		if(cam-&gt;params.pnp_id.device_type == DEVICE_STV_672 &amp;&amp;</div><div class='ctx'> 		   cam-&gt;params.version.sensor_flags==CPIA2_VP_SENSOR_FLAGS_500){</div><div class='ctx'> 			// Maximum 15fps</div><div class='del'>-			int i;</div><div class='ctx'> 			for(i=0; i&lt;c-&gt;maximum; ++i) {</div><div class='ctx'> 				if(framerate_controls[i].value ==</div><div class='ctx'> 				   CPIA2_VP_FRAMERATE_15) {</div><div class='hunk'>@@ -1959,8 +1958,7 @@ int cpia2_register_camera(struct camera_data *cam)</div><div class='ctx'> 	reset_camera_struct_v4l(cam);</div><div class='ctx'> </div><div class='ctx'> 	/* register v4l device */</div><div class='del'>-	if (video_register_device</div><div class='del'>-	    (cam-&gt;vdev, VFL_TYPE_GRABBER, video_nr) == -1) {</div><div class='add'>+	if (video_register_device(cam-&gt;vdev, VFL_TYPE_GRABBER, video_nr) &lt; 0) {</div><div class='ctx'> 		ERR("video_register_device failed\n");</div><div class='ctx'> 		video_device_release(cam-&gt;vdev);</div><div class='ctx'> 		return -ENODEV;</div><div class='head'>diff --git a/drivers/media/video/cs5345.c b/drivers/media/video/cs5345.c<br/>index 61d14d26686f..a662b15d5b90 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cs5345.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cs5345.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cs5345.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cs5345.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@ static int debug;</div><div class='ctx'> </div><div class='ctx'> module_param(debug, bool, 0644);</div><div class='ctx'> </div><div class='del'>-MODULE_PARM_DESC(debug, "Debugging messages\n\t\t\t0=Off (default), 1=On");</div><div class='add'>+MODULE_PARM_DESC(debug, "Debugging messages, 0=Off (default), 1=On");</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='head'>diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c<br/>index e30a589c0e18..c4444500b330 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cs53l32a.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cs53l32a.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cs53l32a.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cs53l32a.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@ static int debug;</div><div class='ctx'> </div><div class='ctx'> module_param(debug, bool, 0644);</div><div class='ctx'> </div><div class='del'>-MODULE_PARM_DESC(debug, "Debugging messages\n\t\t\t0=Off (default), 1=On");</div><div class='add'>+MODULE_PARM_DESC(debug, "Debugging messages, 0=Off (default), 1=On");</div><div class='ctx'> </div><div class='ctx'> static unsigned short normal_i2c[] = { 0x22 &gt;&gt; 1, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-av-firmware.c b/drivers/media/video/cx18/cx18-av-firmware.c<br/>index 834b9248242e..e996a4e3123a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-av-firmware.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx18/cx18-av-firmware.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-av-firmware.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx18/cx18-av-firmware.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@ int cx18_av_loadfw(struct cx18 *cx)</div><div class='ctx'> 	u32 v;</div><div class='ctx'> 	const u8 *ptr;</div><div class='ctx'> 	int i;</div><div class='del'>-	int retries = 0;</div><div class='add'>+	int retries1 = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (request_firmware(&amp;fw, FWFILE, &amp;cx-&gt;dev-&gt;dev) != 0) {</div><div class='ctx'> 		CX18_ERR("unable to open firmware %s\n", FWFILE);</div><div class='hunk'>@@ -41,7 +41,7 @@ int cx18_av_loadfw(struct cx18 *cx)</div><div class='ctx'> </div><div class='ctx'> 	/* The firmware load often has byte errors, so allow for several</div><div class='ctx'> 	   retries, both at byte level and at the firmware load level. */</div><div class='del'>-	while (retries &lt; 5) {</div><div class='add'>+	while (retries1 &lt; 5) {</div><div class='ctx'> 		cx18_av_write4(cx, CXADEC_CHIP_CTRL, 0x00010000);</div><div class='ctx'> 		cx18_av_write(cx, CXADEC_STD_DET_CTL, 0xf6);</div><div class='ctx'> </div><div class='hunk'>@@ -57,9 +57,9 @@ int cx18_av_loadfw(struct cx18 *cx)</div><div class='ctx'> 		for (i = 0; i &lt; size; i++) {</div><div class='ctx'> 			u32 dl_control = 0x0F000000 | i | ((u32)ptr[i] &lt;&lt; 16);</div><div class='ctx'> 			u32 value = 0;</div><div class='del'>-			int retries;</div><div class='add'>+			int retries2;</div><div class='ctx'> </div><div class='del'>-			for (retries = 0; retries &lt; 5; retries++) {</div><div class='add'>+			for (retries2 = 0; retries2 &lt; 5; retries2++) {</div><div class='ctx'> 				cx18_av_write4(cx, CXADEC_DL_CTL, dl_control);</div><div class='ctx'> 				udelay(10);</div><div class='ctx'> 				value = cx18_av_read4(cx, CXADEC_DL_CTL);</div><div class='hunk'>@@ -69,18 +69,18 @@ int cx18_av_loadfw(struct cx18 *cx)</div><div class='ctx'> 				   the address.  We can only write the lower</div><div class='ctx'> 				   address byte of the address. */</div><div class='ctx'> 				if ((value &amp; 0x3F00) != (dl_control &amp; 0x3F00)) {</div><div class='del'>-					retries = 5;</div><div class='add'>+					retries2 = 5;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-			if (retries &gt;= 5)</div><div class='add'>+			if (retries2 &gt;= 5)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (i == size)</div><div class='ctx'> 			break;</div><div class='del'>-		retries++;</div><div class='add'>+		retries1++;</div><div class='ctx'> 	}</div><div class='del'>-	if (retries &gt;= 5) {</div><div class='add'>+	if (retries1 &gt;= 5) {</div><div class='ctx'> 		CX18_ERR("unable to load firmware %s\n", FWFILE);</div><div class='ctx'> 		release_firmware(fw);</div><div class='ctx'> 		return -EIO;</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c<br/>index 22434aadde31..bd18afebbf86 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-driver.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx18/cx18-driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-driver.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx18/cx18-driver.c</a></div><div class='hunk'>@@ -74,9 +74,9 @@ static int radio[CX18_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1,</div><div class='ctx'> 				     -1, -1, -1, -1, -1, -1, -1, -1,</div><div class='ctx'> 				     -1, -1, -1, -1, -1, -1, -1, -1 };</div><div class='ctx'> </div><div class='del'>-static int cardtype_c = 1;</div><div class='del'>-static int tuner_c = 1;</div><div class='del'>-static int radio_c = 1;</div><div class='add'>+static unsigned cardtype_c = 1;</div><div class='add'>+static unsigned tuner_c = 1;</div><div class='add'>+static unsigned radio_c = 1;</div><div class='ctx'> static char pal[] = "--";</div><div class='ctx'> static char secam[] = "--";</div><div class='ctx'> static char ntsc[] = "-";</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-dvb.c b/drivers/media/video/cx18/cx18-dvb.c<br/>index cae38985b131..1e420a804fc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-dvb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx18/cx18-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-dvb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx18/cx18-dvb.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  cx18 functions for DVB support</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-dvb.h b/drivers/media/video/cx18/cx18-dvb.h<br/>index d6a6ccda79a9..bf8d8f6f5455 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-dvb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx18/cx18-dvb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-dvb.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx18/cx18-dvb.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  cx18 functions for DVB support</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-irq.c b/drivers/media/video/cx18/cx18-irq.c<br/>index 25114a5cbd57..ab218315c84b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx18/cx18-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx18/cx18-irq.c</a></div><div class='hunk'>@@ -61,7 +61,7 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)</div><div class='ctx'> 		CX18_WARN("Ack struct = %d for %s\n",</div><div class='ctx'> 			mb-&gt;args[2], s-&gt;name);</div><div class='ctx'> 	id = read_enc(off);</div><div class='del'>-	buf = cx18_queue_find_buf(s, id, read_enc(off + 4));</div><div class='add'>+	buf = cx18_queue_get_buf_irq(s, id, read_enc(off + 4));</div><div class='ctx'> 	CX18_DEBUG_HI_DMA("DMA DONE for %s (buffer %d)\n", s-&gt;name, id);</div><div class='ctx'> 	if (buf) {</div><div class='ctx'> 		cx18_buf_sync_for_cpu(s, buf);</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-queue.c b/drivers/media/video/cx18/cx18-queue.c<br/>index 6990b77c6200..dbe792ac3001 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-queue.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx18/cx18-queue.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-queue.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx18/cx18-queue.c</a></div><div class='hunk'>@@ -78,12 +78,13 @@ struct cx18_buffer *cx18_dequeue(struct cx18_stream *s, struct cx18_queue *q)</div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct cx18_buffer *cx18_queue_find_buf(struct cx18_stream *s, u32 id,</div><div class='add'>+struct cx18_buffer *cx18_queue_get_buf_irq(struct cx18_stream *s, u32 id,</div><div class='ctx'> 	u32 bytesused)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx18 *cx = s-&gt;cx;</div><div class='ctx'> 	struct list_head *p;</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;s-&gt;qlock);</div><div class='ctx'> 	list_for_each(p, &amp;s-&gt;q_free.list) {</div><div class='ctx'> 		struct cx18_buffer *buf =</div><div class='ctx'> 			list_entry(p, struct cx18_buffer, list);</div><div class='hunk'>@@ -92,114 +93,48 @@ struct cx18_buffer *cx18_queue_find_buf(struct cx18_stream *s, u32 id,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		buf-&gt;bytesused = bytesused;</div><div class='ctx'> 		/* the transport buffers are handled differently,</div><div class='del'>-		   so there is no need to move them to the full queue */</div><div class='del'>-		if (s-&gt;type == CX18_ENC_STREAM_TYPE_TS)</div><div class='del'>-			return buf;</div><div class='del'>-		s-&gt;q_free.buffers--;</div><div class='del'>-		s-&gt;q_free.length -= s-&gt;buf_size;</div><div class='del'>-		s-&gt;q_full.buffers++;</div><div class='del'>-		s-&gt;q_full.length += s-&gt;buf_size;</div><div class='del'>-		s-&gt;q_full.bytesused += buf-&gt;bytesused;</div><div class='del'>-		list_move_tail(&amp;buf-&gt;list, &amp;s-&gt;q_full.list);</div><div class='add'>+		   they are not moved to the full queue */</div><div class='add'>+		if (s-&gt;type != CX18_ENC_STREAM_TYPE_TS) {</div><div class='add'>+			s-&gt;q_free.buffers--;</div><div class='add'>+			s-&gt;q_free.length -= s-&gt;buf_size;</div><div class='add'>+			s-&gt;q_full.buffers++;</div><div class='add'>+			s-&gt;q_full.length += s-&gt;buf_size;</div><div class='add'>+			s-&gt;q_full.bytesused += buf-&gt;bytesused;</div><div class='add'>+			list_move_tail(&amp;buf-&gt;list, &amp;s-&gt;q_full.list);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;s-&gt;qlock);</div><div class='ctx'> 		return buf;</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock(&amp;s-&gt;qlock);</div><div class='ctx'> 	CX18_ERR("Cannot find buffer %d for stream %s\n", id, s-&gt;name);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cx18_queue_move_buf(struct cx18_stream *s, struct cx18_queue *from,</div><div class='del'>-		struct cx18_queue *to, int clear, int full)</div><div class='del'>-{</div><div class='del'>-	struct cx18_buffer *buf =</div><div class='del'>-		list_entry(from-&gt;list.next, struct cx18_buffer, list);</div><div class='del'>-</div><div class='del'>-	list_move_tail(from-&gt;list.next, &amp;to-&gt;list);</div><div class='del'>-	from-&gt;buffers--;</div><div class='del'>-	from-&gt;length -= s-&gt;buf_size;</div><div class='del'>-	from-&gt;bytesused -= buf-&gt;bytesused - buf-&gt;readpos;</div><div class='del'>-	/* special handling for q_free */</div><div class='del'>-	if (clear)</div><div class='del'>-		buf-&gt;bytesused = buf-&gt;readpos = buf-&gt;b_flags = 0;</div><div class='del'>-	else if (full) {</div><div class='del'>-		/* special handling for stolen buffers, assume</div><div class='del'>-		   all bytes are used. */</div><div class='del'>-		buf-&gt;bytesused = s-&gt;buf_size;</div><div class='del'>-		buf-&gt;readpos = buf-&gt;b_flags = 0;</div><div class='del'>-	}</div><div class='del'>-	to-&gt;buffers++;</div><div class='del'>-	to-&gt;length += s-&gt;buf_size;</div><div class='del'>-	to-&gt;bytesused += buf-&gt;bytesused - buf-&gt;readpos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Move 'needed_bytes' worth of buffers from queue 'from' into queue 'to'.</div><div class='del'>-   If 'needed_bytes' == 0, then move all buffers from 'from' into 'to'.</div><div class='del'>-   If 'steal' != NULL, then buffers may also taken from that queue if</div><div class='del'>-   needed.</div><div class='del'>-</div><div class='del'>-   The buffer is automatically cleared if it goes to the free queue. It is</div><div class='del'>-   also cleared if buffers need to be taken from the 'steal' queue and</div><div class='del'>-   the 'from' queue is the free queue.</div><div class='del'>-</div><div class='del'>-   When 'from' is q_free, then needed_bytes is compared to the total</div><div class='del'>-   available buffer length, otherwise needed_bytes is compared to the</div><div class='del'>-   bytesused value. For the 'steal' queue the total available buffer</div><div class='del'>-   length is always used.</div><div class='del'>-</div><div class='del'>-   -ENOMEM is returned if the buffers could not be obtained, 0 if all</div><div class='del'>-   buffers where obtained from the 'from' list and if non-zero then</div><div class='del'>-   the number of stolen buffers is returned. */</div><div class='del'>-static int cx18_queue_move(struct cx18_stream *s, struct cx18_queue *from,</div><div class='del'>-			   struct cx18_queue *steal, struct cx18_queue *to,</div><div class='del'>-			   int needed_bytes)</div><div class='add'>+/* Move all buffers of a queue to q_free, while flushing the buffers */</div><div class='add'>+static void cx18_queue_flush(struct cx18_stream *s, struct cx18_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int rc = 0;</div><div class='del'>-	int from_free = from == &amp;s-&gt;q_free;</div><div class='del'>-	int to_free = to == &amp;s-&gt;q_free;</div><div class='del'>-	int bytes_available;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;s-&gt;qlock, flags);</div><div class='del'>-	if (needed_bytes == 0) {</div><div class='del'>-		from_free = 1;</div><div class='del'>-		needed_bytes = from-&gt;length;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bytes_available = from_free ? from-&gt;length : from-&gt;bytesused;</div><div class='del'>-	bytes_available += steal ? steal-&gt;length : 0;</div><div class='add'>+	struct cx18_buffer *buf;</div><div class='ctx'> </div><div class='del'>-	if (bytes_available &lt; needed_bytes) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;qlock, flags);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	if (from_free) {</div><div class='del'>-		u32 old_length = to-&gt;length;</div><div class='add'>+	if (q == &amp;s-&gt;q_free)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		while (to-&gt;length - old_length &lt; needed_bytes) {</div><div class='del'>-			if (list_empty(&amp;from-&gt;list))</div><div class='del'>-				from = steal;</div><div class='del'>-			if (from == steal)</div><div class='del'>-				rc++; 	/* keep track of 'stolen' buffers */</div><div class='del'>-			cx18_queue_move_buf(s, from, to, 1, 0);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		u32 old_bytesused = to-&gt;bytesused;</div><div class='del'>-</div><div class='del'>-		while (to-&gt;bytesused - old_bytesused &lt; needed_bytes) {</div><div class='del'>-			if (list_empty(&amp;from-&gt;list))</div><div class='del'>-				from = steal;</div><div class='del'>-			if (from == steal)</div><div class='del'>-				rc++; 	/* keep track of 'stolen' buffers */</div><div class='del'>-			cx18_queue_move_buf(s, from, to, to_free, rc);</div><div class='del'>-		}</div><div class='add'>+	spin_lock_irqsave(&amp;s-&gt;qlock, flags);</div><div class='add'>+	while (!list_empty(&amp;q-&gt;list)) {</div><div class='add'>+		buf = list_entry(q-&gt;list.next, struct cx18_buffer, list);</div><div class='add'>+		list_move_tail(q-&gt;list.next, &amp;s-&gt;q_free.list);</div><div class='add'>+		buf-&gt;bytesused = buf-&gt;readpos = buf-&gt;b_flags = 0;</div><div class='add'>+		s-&gt;q_free.buffers++;</div><div class='add'>+		s-&gt;q_free.length += s-&gt;buf_size;</div><div class='ctx'> 	}</div><div class='add'>+	cx18_queue_init(q);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;s-&gt;qlock, flags);</div><div class='del'>-	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void cx18_flush_queues(struct cx18_stream *s)</div><div class='ctx'> {</div><div class='del'>-	cx18_queue_move(s, &amp;s-&gt;q_io, NULL, &amp;s-&gt;q_free, 0);</div><div class='del'>-	cx18_queue_move(s, &amp;s-&gt;q_full, NULL, &amp;s-&gt;q_free, 0);</div><div class='add'>+	cx18_queue_flush(s, &amp;s-&gt;q_io);</div><div class='add'>+	cx18_queue_flush(s, &amp;s-&gt;q_full);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cx18_stream_alloc(struct cx18_stream *s)</div><div class='hunk'>@@ -214,10 +149,10 @@ int cx18_stream_alloc(struct cx18_stream *s)</div><div class='ctx'> 		s-&gt;name, s-&gt;buffers, s-&gt;buf_size,</div><div class='ctx'> 		s-&gt;buffers * s-&gt;buf_size / 1024);</div><div class='ctx'> </div><div class='del'>-	if (((char *)&amp;cx-&gt;scb-&gt;cpu_mdl[cx-&gt;mdl_offset + s-&gt;buffers] -</div><div class='del'>-				(char *)cx-&gt;scb) &gt; SCB_RESERVED_SIZE) {</div><div class='del'>-		unsigned bufsz = (((char *)cx-&gt;scb) + SCB_RESERVED_SIZE -</div><div class='del'>-					((char *)cx-&gt;scb-&gt;cpu_mdl));</div><div class='add'>+	if (((char __iomem *)&amp;cx-&gt;scb-&gt;cpu_mdl[cx-&gt;mdl_offset + s-&gt;buffers] -</div><div class='add'>+				(char __iomem *)cx-&gt;scb) &gt; SCB_RESERVED_SIZE) {</div><div class='add'>+		unsigned bufsz = (((char __iomem *)cx-&gt;scb) + SCB_RESERVED_SIZE -</div><div class='add'>+					((char __iomem *)cx-&gt;scb-&gt;cpu_mdl));</div><div class='ctx'> </div><div class='ctx'> 		CX18_ERR("Too many buffers, cannot fit in SCB area\n");</div><div class='ctx'> 		CX18_ERR("Max buffers = %zd\n",</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-queue.h b/drivers/media/video/cx18/cx18-queue.h<br/>index 91423b9863a4..7f93bb13c09f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-queue.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx18/cx18-queue.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-queue.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx18/cx18-queue.h</a></div><div class='hunk'>@@ -46,7 +46,7 @@ void cx18_queue_init(struct cx18_queue *q);</div><div class='ctx'> void cx18_enqueue(struct cx18_stream *s, struct cx18_buffer *buf,</div><div class='ctx'> 	struct cx18_queue *q);</div><div class='ctx'> struct cx18_buffer *cx18_dequeue(struct cx18_stream *s, struct cx18_queue *q);</div><div class='del'>-struct cx18_buffer *cx18_queue_find_buf(struct cx18_stream *s, u32 id,</div><div class='add'>+struct cx18_buffer *cx18_queue_get_buf_irq(struct cx18_stream *s, u32 id,</div><div class='ctx'> 	u32 bytesused);</div><div class='ctx'> void cx18_flush_queues(struct cx18_stream *s);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c<br/>index 8118091568fc..7b0e8c01692e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-417.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx23885/cx23885-417.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-417.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885-417.c</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  *    (c) 2004 Jelle Foks &lt;jelle@foks.8m.com&gt;</div><div class='ctx'>  *    (c) 2004 Gerd Knorr &lt;kraxel@bytesex.org&gt;</div><div class='del'>- *    (c) 2008 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *    (c) 2008 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *      - CX23885/7/8 support</div><div class='ctx'>  *</div><div class='ctx'>  *  Includes parts from the ivtv driver( http://ivtv.sourceforge.net/),</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c<br/>index a19de850955d..c36d3f632104 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-cards.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx23885/cx23885-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-cards.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885-cards.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for the Conexant CX23885 PCIe bridge</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2006 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2006 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c<br/>index 6286a9cf957e..25fb09938744 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx23885/cx23885-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885-core.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for the Conexant CX23885 PCIe bridge</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2006 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2006 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include "cx23885.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Driver for cx23885 based TV cards");</div><div class='del'>-MODULE_AUTHOR("Steven Toth &lt;stoth@hauppauge.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Steven Toth &lt;stoth@linuxtv.org&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static unsigned int debug;</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c<br/>index 0a2e6558cd66..291b9d008da8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-dvb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx23885/cx23885-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-dvb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885-dvb.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for the Conexant CX23885 PCIe bridge</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2006 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2006 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c<br/>index c6bb0a05bc1c..f98e476e9617 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-i2c.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx23885/cx23885-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-i2c.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885-i2c.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for the Conexant CX23885 PCIe bridge</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2006 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2006 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-reg.h b/drivers/media/video/cx23885/cx23885-reg.h<br/>index bdd11bc513ad..20b68a236260 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-reg.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx23885/cx23885-reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885-reg.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for the Conexant CX23885 PCIe bridge</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2006 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2006 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-vbi.c b/drivers/media/video/cx23885/cx23885-vbi.c<br/>index e36e3fcae2fb..35e61cd112fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-vbi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx23885/cx23885-vbi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-vbi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885-vbi.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for the Conexant CX23885 PCIe bridge</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2007 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2007 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c<br/>index ad2235dab5b1..6047c78d84bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-video.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx23885/cx23885-video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-video.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885-video.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for the Conexant CX23885 PCIe bridge</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2007 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2007 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("v4l2 driver module for cx23885 based TV cards");</div><div class='del'>-MODULE_AUTHOR("Steven Toth &lt;stoth@hauppauge.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Steven Toth &lt;stoth@linuxtv.org&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h<br/>index 00dfdc89d641..e23d97c071e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx23885/cx23885.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx23885/cx23885.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for the Conexant CX23885 PCIe bridge</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2006 Steven Toth &lt;stoth@hauppauge.com&gt;</div><div class='add'>+ *  Copyright (c) 2006 Steven Toth &lt;stoth@linuxtv.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c<br/>index 209d3bcb5dbb..4da8cd74f00e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25840/cx25840-core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/cx25840/cx25840-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25840/cx25840-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/cx25840/cx25840-core.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  * NTSC sliced VBI support by Christopher Neufeld &lt;television@cneufeld.ca&gt;</div><div class='ctx'>  * with additional fixes by Hans Verkuil &lt;hverkuil@xs4all.nl&gt;.</div><div class='ctx'>  *</div><div class='del'>- * CX23885 support by Steven Toth &lt;stoth@hauppauge.com&gt;.</div><div class='add'>+ * CX23885 support by Steven Toth &lt;stoth@linuxtv.org&gt;.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or</div><div class='ctx'>  * modify it under the terms of the GNU General Public License</div><div class='head'>diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c<br/>index 48f4b92a8f8b..79faedf58521 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/dabusb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/dabusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/dabusb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/dabusb.c</a></div><div class='hunk'>@@ -403,6 +403,7 @@ static int dabusb_fpga_download (pdabusb_t s, const char *fname)</div><div class='ctx'> 	ret = request_firmware(&amp;fw, "dabusb/bitstream.bin", &amp;s-&gt;usbdev-&gt;dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		err("Failed to load \"dabusb/bitstream.bin\": %d\n", ret);</div><div class='add'>+		kfree(b);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c<br/>index 476ae44a62d2..452da70e719f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-cards.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/em28xx/em28xx-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-cards.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/em28xx/em28xx-cards.c</a></div><div class='hunk'>@@ -1015,6 +1015,7 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 		.valid        = EM28XX_BOARD_NOT_VALIDATED,</div><div class='ctx'> 		.vchannels    = 3,</div><div class='ctx'> 		.tuner_type   = TUNER_XC2028,</div><div class='add'>+		.mts_firmware = 1,</div><div class='ctx'> 		.decoder      = EM28XX_TVP5150,</div><div class='ctx'> 		.input          = { {</div><div class='ctx'> 			.type     = EM28XX_VMUX_TELEVISION,</div><div class='head'>diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c<br/>index 2d170d101c21..8db2a05bf9c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/et61x251/et61x251_core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/et61x251/et61x251_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/et61x251/et61x251_core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/et61x251/et61x251_core.c</a></div><div class='hunk'>@@ -2588,6 +2588,7 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)</div><div class='ctx'> 	cam-&gt;v4ldev-&gt;fops = &amp;et61x251_fops;</div><div class='ctx'> 	cam-&gt;v4ldev-&gt;minor = video_nr[dev_nr];</div><div class='ctx'> 	cam-&gt;v4ldev-&gt;release = video_device_release;</div><div class='add'>+	cam-&gt;v4ldev-&gt;parent = &amp;udev-&gt;dev;</div><div class='ctx'> 	video_set_drvdata(cam-&gt;v4ldev, cam);</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;cam-&gt;probe);</div><div class='head'>diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c<br/>index 44b0bffeb20e..4d9f4cc255a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/conex.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/conex.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/conex.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/conex.c</a></div><div class='hunk'>@@ -123,8 +123,8 @@ static void reg_r(struct gspca_dev *gspca_dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='del'>-	if (len &gt; sizeof gspca_dev-&gt;usb_buf) {</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='add'>+	if (len &gt; USB_BUF_SZ) {</div><div class='ctx'> 		err("reg_r: buffer overflow");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -163,8 +163,8 @@ static void reg_w(struct gspca_dev *gspca_dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='del'>-	if (len &gt; sizeof gspca_dev-&gt;usb_buf) {</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='add'>+	if (len &gt; USB_BUF_SZ) {</div><div class='ctx'> 		err("reg_w: buffer overflow");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -731,13 +731,13 @@ static void cx11646_jpeg(struct gspca_dev*gspca_dev)</div><div class='ctx'> 	reg_w_val(gspca_dev, 0x0000, 0x00);</div><div class='ctx'> 	/* wait for completion */</div><div class='ctx'> 	retry = 50;</div><div class='del'>-	while (retry--) {</div><div class='add'>+	do {</div><div class='ctx'> 		reg_r(gspca_dev, 0x0002, 1);</div><div class='ctx'> 							/* 0x07 until 0x00 */</div><div class='ctx'> 		if (gspca_dev-&gt;usb_buf[0] == 0x00)</div><div class='ctx'> 			break;</div><div class='ctx'> 		reg_w_val(gspca_dev, 0x0053, 0x00);</div><div class='del'>-	}</div><div class='add'>+	} while (--retry);</div><div class='ctx'> 	if (retry == 0)</div><div class='ctx'> 		PDEBUG(D_ERR, "Damned Errors sending jpeg Table");</div><div class='ctx'> 	/* send the qtable now */</div><div class='hunk'>@@ -826,8 +826,8 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	cx11646_init1(gspca_dev);</div><div class='ctx'> 	cx11646_initsize(gspca_dev);</div><div class='hunk'>@@ -845,10 +845,6 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	cx11646_jpeg(gspca_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	int retry = 50;</div><div class='hunk'>@@ -871,10 +867,6 @@ static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	reg_w_val(gspca_dev, 0x00fc, 0xe0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			struct gspca_frame *frame,	/* target */</div><div class='ctx'> 			__u8 *data,			/* isoc packet */</div><div class='hunk'>@@ -998,11 +990,9 @@ static struct sd_desc sd_desc = {</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='del'>-	.stopN = sd_stopN,</div><div class='ctx'> 	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1026,6 +1016,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c<br/>index c8c2f02fcf00..4ff0e386914b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/etoms.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/etoms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/etoms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/etoms.c</a></div><div class='hunk'>@@ -81,6 +81,7 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 	 .set = sd_setcontrast,</div><div class='ctx'> 	 .get = sd_getcontrast,</div><div class='ctx'> 	 },</div><div class='add'>+#define COLOR_IDX 2</div><div class='ctx'> 	{</div><div class='ctx'> 	 {</div><div class='ctx'> 	  .id = V4L2_CID_SATURATION,</div><div class='hunk'>@@ -233,8 +234,8 @@ static void reg_r(struct gspca_dev *gspca_dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='del'>-	if (len &gt; sizeof gspca_dev-&gt;usb_buf) {</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='add'>+	if (len &gt; USB_BUF_SZ) {</div><div class='ctx'> 		err("reg_r: buffer overflow");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -271,8 +272,8 @@ static void reg_w(struct gspca_dev *gspca_dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='del'>-	if (len &gt; sizeof gspca_dev-&gt;usb_buf) {</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='add'>+	if (len &gt; USB_BUF_SZ) {</div><div class='ctx'> 		err("reg_w: buffer overflow");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -461,6 +462,52 @@ static void Et_init2(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	reg_w_val(gspca_dev, 0x80, 0x20);	/* 0x20; */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void setbrightness(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	int i;</div><div class='add'>+	__u8 brightness = sd-&gt;brightness;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		reg_w_val(gspca_dev, ET_O_RED + i, brightness);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void getbrightness(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	int i;</div><div class='add'>+	int brightness = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		reg_r(gspca_dev, ET_O_RED + i, 1);</div><div class='add'>+		brightness += gspca_dev-&gt;usb_buf[0];</div><div class='add'>+	}</div><div class='add'>+	sd-&gt;brightness = brightness &gt;&gt; 3;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setcontrast(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	__u8 RGBG[] = { 0x80, 0x80, 0x80, 0x80, 0x00, 0x00 };</div><div class='add'>+	__u8 contrast = sd-&gt;contrast;</div><div class='add'>+</div><div class='add'>+	memset(RGBG, contrast, sizeof(RGBG) - 2);</div><div class='add'>+	reg_w(gspca_dev, ET_G_RED, RGBG, 6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void getcontrast(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	int i;</div><div class='add'>+	int contrast = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		reg_r(gspca_dev, ET_G_RED + i, 1);</div><div class='add'>+		contrast += gspca_dev-&gt;usb_buf[0];</div><div class='add'>+	}</div><div class='add'>+	sd-&gt;contrast = contrast &gt;&gt; 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void setcolors(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='hunk'>@@ -492,6 +539,16 @@ static void getcolors(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void setautogain(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;autogain)</div><div class='add'>+		sd-&gt;ag_cnt = AG_CNT_START;</div><div class='add'>+	else</div><div class='add'>+		sd-&gt;ag_cnt = -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void Et_init1(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	__u8 value;</div><div class='hunk'>@@ -609,16 +666,18 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		cam-&gt;cam_mode = vga_mode;</div><div class='ctx'> 		cam-&gt;nmodes = sizeof vga_mode / sizeof vga_mode[0];</div><div class='add'>+		gspca_dev-&gt;ctrl_dis = (1 &lt;&lt; COLOR_IDX);</div><div class='ctx'> 	}</div><div class='ctx'> 	sd-&gt;brightness = BRIGHTNESS_DEF;</div><div class='ctx'> 	sd-&gt;contrast = CONTRAST_DEF;</div><div class='ctx'> 	sd-&gt;colors = COLOR_DEF;</div><div class='ctx'> 	sd-&gt;autogain = AUTOGAIN_DEF;</div><div class='add'>+	sd-&gt;ag_cnt = -1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='hunk'>@@ -641,6 +700,8 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	else</div><div class='ctx'> 		Et_init2(gspca_dev);</div><div class='ctx'> </div><div class='add'>+	setautogain(gspca_dev);</div><div class='add'>+</div><div class='ctx'> 	reg_w_val(gspca_dev, ET_RESET_ALL, 0x08);</div><div class='ctx'> 	et_video(gspca_dev, 1);		/* video on */</div><div class='ctx'> }</div><div class='hunk'>@@ -650,60 +711,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	et_video(gspca_dev, 0);		/* video off */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void setbrightness(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	int i;</div><div class='del'>-	__u8 brightness = sd-&gt;brightness;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 4; i++)</div><div class='del'>-		reg_w_val(gspca_dev, ET_O_RED + i, brightness);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void getbrightness(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	int i;</div><div class='del'>-	int brightness = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		reg_r(gspca_dev, ET_O_RED + i, 1);</div><div class='del'>-		brightness += gspca_dev-&gt;usb_buf[0];</div><div class='del'>-	}</div><div class='del'>-	sd-&gt;brightness = brightness &gt;&gt; 3;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void setcontrast(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	__u8 RGBG[] = { 0x80, 0x80, 0x80, 0x80, 0x00, 0x00 };</div><div class='del'>-	__u8 contrast = sd-&gt;contrast;</div><div class='del'>-</div><div class='del'>-	memset(RGBG, contrast, sizeof(RGBG) - 2);</div><div class='del'>-	reg_w(gspca_dev, ET_G_RED, RGBG, 6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void getcontrast(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	int i;</div><div class='del'>-	int contrast = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		reg_r(gspca_dev, ET_G_RED + i, 1);</div><div class='del'>-		contrast += gspca_dev-&gt;usb_buf[0];</div><div class='del'>-	}</div><div class='del'>-	sd-&gt;contrast = contrast &gt;&gt; 2;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static __u8 Et_getgainG(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='hunk'>@@ -733,15 +740,22 @@ static void Et_setgainG(struct gspca_dev *gspca_dev, __u8 gain)</div><div class='ctx'> #define LIMIT(color) \</div><div class='ctx'> 	(unsigned char)((color &gt; 0xff)?0xff:((color &lt; 0)?0:color))</div><div class='ctx'> </div><div class='del'>-static void setautogain(struct gspca_dev *gspca_dev)</div><div class='add'>+static void do_autogain(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='del'>-	__u8 luma = 0;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	__u8 luma;</div><div class='ctx'> 	__u8 luma_mean = 128;</div><div class='ctx'> 	__u8 luma_delta = 20;</div><div class='ctx'> 	__u8 spring = 4;</div><div class='del'>-	int Gbright = 0;</div><div class='add'>+	int Gbright;</div><div class='ctx'> 	__u8 r, g, b;</div><div class='ctx'> </div><div class='add'>+	if (sd-&gt;ag_cnt &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	if (--sd-&gt;ag_cnt &gt;= 0)</div><div class='add'>+		return;</div><div class='add'>+	sd-&gt;ag_cnt = AG_CNT_START;</div><div class='add'>+</div><div class='ctx'> 	Gbright = Et_getgainG(gspca_dev);</div><div class='ctx'> 	reg_r(gspca_dev, ET_LUMA_CENTER, 4);</div><div class='ctx'> 	g = (gspca_dev-&gt;usb_buf[0] + gspca_dev-&gt;usb_buf[3]) &gt;&gt; 1;</div><div class='hunk'>@@ -768,7 +782,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			__u8 *data,			/* isoc packet */</div><div class='ctx'> 			int len)			/* iso packet length */</div><div class='ctx'> {</div><div class='del'>-	struct sd *sd;</div><div class='ctx'> 	int seqframe;</div><div class='ctx'> </div><div class='ctx'> 	seqframe = data[0] &amp; 0x3f;</div><div class='hunk'>@@ -783,13 +796,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 		frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,</div><div class='ctx'> 					data, 0);</div><div class='ctx'> 		gspca_frame_add(gspca_dev, FIRST_PACKET, frame, data, len);</div><div class='del'>-		sd = (struct sd *) gspca_dev;</div><div class='del'>-		if (sd-&gt;ag_cnt &gt;= 0) {</div><div class='del'>-			if (--sd-&gt;ag_cnt &lt; 0) {</div><div class='del'>-				sd-&gt;ag_cnt = AG_CNT_START;</div><div class='del'>-				setautogain(gspca_dev);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (len) {</div><div class='hunk'>@@ -862,10 +868,8 @@ static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='ctx'> 	sd-&gt;autogain = val;</div><div class='del'>-	if (val)</div><div class='del'>-		sd-&gt;ag_cnt = AG_CNT_START;</div><div class='del'>-	else</div><div class='del'>-		sd-&gt;ag_cnt = -1;</div><div class='add'>+	if (gspca_dev-&gt;streaming)</div><div class='add'>+		setautogain(gspca_dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -883,20 +887,19 @@ static struct sd_desc sd_desc = {</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='del'>-	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='add'>+	.dq_callback = do_autogain,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module initialisation -- */</div><div class='ctx'> static __devinitdata struct usb_device_id device_table[] = {</div><div class='del'>-#ifndef CONFIG_USB_ET61X251</div><div class='ctx'> 	{USB_DEVICE(0x102c, 0x6151), .driver_info = SENSOR_PAS106},</div><div class='del'>-#endif</div><div class='add'>+#if !defined CONFIG_USB_ET61X251 &amp;&amp; !defined CONFIG_USB_ET61X251_MODULE</div><div class='ctx'> 	{USB_DEVICE(0x102c, 0x6251), .driver_info = SENSOR_TAS5130CXX},</div><div class='add'>+#endif</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -915,6 +918,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c<br/>index 3a051c925ff6..7be69284da03 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/gspca.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/gspca.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/gspca.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/gspca.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int video_nr = -1;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='ctx'> int gspca_debug = D_ERR | D_PROBE;</div><div class='ctx'> EXPORT_SYMBOL(gspca_debug);</div><div class='ctx'> </div><div class='hunk'>@@ -114,7 +114,10 @@ static void fill_frame(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	cam_pkt_op pkt_scan;</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;status != 0) {</div><div class='del'>-		PDEBUG(D_ERR|D_PACK, "urb status: %d", urb-&gt;status);</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+		if (!gspca_dev-&gt;frozen)</div><div class='add'>+#endif</div><div class='add'>+			PDEBUG(D_ERR|D_PACK, "urb status: %d", urb-&gt;status);</div><div class='ctx'> 		return;		/* disconnection ? */</div><div class='ctx'> 	}</div><div class='ctx'> 	pkt_scan = gspca_dev-&gt;sd_desc-&gt;pkt_scan;</div><div class='hunk'>@@ -555,10 +558,12 @@ static void gspca_stream_off(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	gspca_dev-&gt;streaming = 0;</div><div class='ctx'> 	atomic_set(&amp;gspca_dev-&gt;nevent, 0);</div><div class='ctx'> 	if (gspca_dev-&gt;present) {</div><div class='del'>-		gspca_dev-&gt;sd_desc-&gt;stopN(gspca_dev);</div><div class='add'>+		if (gspca_dev-&gt;sd_desc-&gt;stopN)</div><div class='add'>+			gspca_dev-&gt;sd_desc-&gt;stopN(gspca_dev);</div><div class='ctx'> 		destroy_urbs(gspca_dev);</div><div class='ctx'> 		gspca_set_alt0(gspca_dev);</div><div class='del'>-		gspca_dev-&gt;sd_desc-&gt;stop0(gspca_dev);</div><div class='add'>+		if (gspca_dev-&gt;sd_desc-&gt;stop0)</div><div class='add'>+			gspca_dev-&gt;sd_desc-&gt;stop0(gspca_dev);</div><div class='ctx'> 		PDEBUG(D_STREAM, "stream off OK");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -677,7 +682,7 @@ static int try_fmt_vid_cap(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	w = fmt-&gt;fmt.pix.width;</div><div class='ctx'> 	h = fmt-&gt;fmt.pix.height;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='ctx'> 	if (gspca_debug &amp; D_CONF)</div><div class='ctx'> 		PDEBUG_MODE("try fmt cap", fmt-&gt;fmt.pix.pixelformat, w, h);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -767,31 +772,20 @@ static int dev_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* if not done yet, initialize the sensor */</div><div class='del'>-	if (gspca_dev-&gt;users == 0) {</div><div class='del'>-		if (mutex_lock_interruptible(&amp;gspca_dev-&gt;usb_lock)) {</div><div class='del'>-			ret = -ERESTARTSYS;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		ret = gspca_dev-&gt;sd_desc-&gt;open(gspca_dev);</div><div class='del'>-		mutex_unlock(&amp;gspca_dev-&gt;usb_lock);</div><div class='del'>-		if (ret != 0) {</div><div class='del'>-			PDEBUG(D_ERR|D_CONF, "init device failed %d", ret);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	} else if (gspca_dev-&gt;users &gt; 4) {	/* (arbitrary value) */</div><div class='add'>+	if (gspca_dev-&gt;users &gt; 4) {	/* (arbitrary value) */</div><div class='ctx'> 		ret = -EBUSY;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	gspca_dev-&gt;users++;</div><div class='ctx'> 	file-&gt;private_data = gspca_dev;</div><div class='del'>-#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='ctx'> 	/* activate the v4l2 debug */</div><div class='ctx'> 	if (gspca_debug &amp; D_V4L2)</div><div class='ctx'> 		gspca_dev-&gt;vdev.debug |= 3;</div><div class='ctx'> 	else</div><div class='ctx'> 		gspca_dev-&gt;vdev.debug &amp;= ~3;</div><div class='ctx'> #endif</div><div class='add'>+	ret = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;gspca_dev-&gt;queue_lock);</div><div class='ctx'> 	if (ret != 0)</div><div class='hunk'>@@ -812,11 +806,11 @@ static int dev_close(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	/* if the file did the capture, free the streaming resources */</div><div class='ctx'> 	if (gspca_dev-&gt;capt_file == file) {</div><div class='del'>-		mutex_lock(&amp;gspca_dev-&gt;usb_lock);</div><div class='del'>-		if (gspca_dev-&gt;streaming)</div><div class='add'>+		if (gspca_dev-&gt;streaming) {</div><div class='add'>+			mutex_lock(&amp;gspca_dev-&gt;usb_lock);</div><div class='ctx'> 			gspca_stream_off(gspca_dev);</div><div class='del'>-		gspca_dev-&gt;sd_desc-&gt;close(gspca_dev);</div><div class='del'>-		mutex_unlock(&amp;gspca_dev-&gt;usb_lock);</div><div class='add'>+			mutex_unlock(&amp;gspca_dev-&gt;usb_lock);</div><div class='add'>+		}</div><div class='ctx'> 		frame_free(gspca_dev);</div><div class='ctx'> 		gspca_dev-&gt;capt_file = NULL;</div><div class='ctx'> 		gspca_dev-&gt;memory = GSPCA_MEMORY_NO;</div><div class='hunk'>@@ -853,42 +847,44 @@ static int vidioc_querycap(struct file *file, void  *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* the use of V4L2_CTRL_FLAG_NEXT_CTRL asks for the controls to be sorted */</div><div class='ctx'> static int vidioc_queryctrl(struct file *file, void *priv,</div><div class='ctx'> 			   struct v4l2_queryctrl *q_ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	struct gspca_dev *gspca_dev = priv;</div><div class='del'>-	int i;</div><div class='add'>+	int i, ix;</div><div class='ctx'> 	u32 id;</div><div class='ctx'> </div><div class='add'>+	ix = -1;</div><div class='ctx'> 	id = q_ctrl-&gt;id;</div><div class='ctx'> 	if (id &amp; V4L2_CTRL_FLAG_NEXT_CTRL) {</div><div class='ctx'> 		id &amp;= V4L2_CTRL_ID_MASK;</div><div class='ctx'> 		id++;</div><div class='ctx'> 		for (i = 0; i &lt; gspca_dev-&gt;sd_desc-&gt;nctrls; i++) {</div><div class='del'>-			if (id &gt;= gspca_dev-&gt;sd_desc-&gt;ctrls[i].qctrl.id) {</div><div class='del'>-				memcpy(q_ctrl,</div><div class='del'>-					&amp;gspca_dev-&gt;sd_desc-&gt;ctrls[i].qctrl,</div><div class='del'>-					sizeof *q_ctrl);</div><div class='del'>-				return 0;</div><div class='add'>+			if (gspca_dev-&gt;sd_desc-&gt;ctrls[i].qctrl.id &lt; id)</div><div class='add'>+				continue;</div><div class='add'>+			if (ix &lt; 0) {</div><div class='add'>+				ix = i;</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='add'>+			if (gspca_dev-&gt;sd_desc-&gt;ctrls[i].qctrl.id</div><div class='add'>+				    &gt; gspca_dev-&gt;sd_desc-&gt;ctrls[ix].qctrl.id)</div><div class='add'>+				continue;</div><div class='add'>+			ix = i;</div><div class='ctx'> 		}</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; gspca_dev-&gt;sd_desc-&gt;nctrls; i++) {</div><div class='ctx'> 		if (id == gspca_dev-&gt;sd_desc-&gt;ctrls[i].qctrl.id) {</div><div class='del'>-			memcpy(q_ctrl,</div><div class='del'>-				&amp;gspca_dev-&gt;sd_desc-&gt;ctrls[i].qctrl,</div><div class='del'>-				sizeof *q_ctrl);</div><div class='del'>-			return 0;</div><div class='add'>+			ix = i;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (id &gt;= V4L2_CID_BASE</div><div class='del'>-	    &amp;&amp; id &lt;= V4L2_CID_LASTP1) {</div><div class='add'>+	if (ix &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	memcpy(q_ctrl, &amp;gspca_dev-&gt;sd_desc-&gt;ctrls[ix].qctrl,</div><div class='add'>+		sizeof *q_ctrl);</div><div class='add'>+	if (gspca_dev-&gt;ctrl_dis &amp; (1 &lt;&lt; ix))</div><div class='ctx'> 		q_ctrl-&gt;flags |= V4L2_CTRL_FLAG_DISABLED;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='hunk'>@@ -903,8 +899,10 @@ static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='ctx'> 	     i++, ctrls++) {</div><div class='ctx'> 		if (ctrl-&gt;id != ctrls-&gt;qctrl.id)</div><div class='ctx'> 			continue;</div><div class='add'>+		if (gspca_dev-&gt;ctrl_dis &amp; (1 &lt;&lt; i))</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		if (ctrl-&gt;value &lt; ctrls-&gt;qctrl.minimum</div><div class='del'>-		    &amp;&amp; ctrl-&gt;value &gt; ctrls-&gt;qctrl.maximum)</div><div class='add'>+		    || ctrl-&gt;value &gt; ctrls-&gt;qctrl.maximum)</div><div class='ctx'> 			return -ERANGE;</div><div class='ctx'> 		PDEBUG(D_CONF, "set ctrl [%08x] = %d", ctrl-&gt;id, ctrl-&gt;value);</div><div class='ctx'> 		if (mutex_lock_interruptible(&amp;gspca_dev-&gt;usb_lock))</div><div class='hunk'>@@ -929,6 +927,8 @@ static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='ctx'> 	     i++, ctrls++) {</div><div class='ctx'> 		if (ctrl-&gt;id != ctrls-&gt;qctrl.id)</div><div class='ctx'> 			continue;</div><div class='add'>+		if (gspca_dev-&gt;ctrl_dis &amp; (1 &lt;&lt; i))</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		if (mutex_lock_interruptible(&amp;gspca_dev-&gt;usb_lock))</div><div class='ctx'> 			return -ERESTARTSYS;</div><div class='ctx'> 		ret = ctrls-&gt;get(gspca_dev, &amp;ctrl-&gt;value);</div><div class='hunk'>@@ -1080,7 +1080,7 @@ static int vidioc_streamon(struct file *file, void *priv,</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='del'>-#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='ctx'> 	if (gspca_debug &amp; D_STREAM) {</div><div class='ctx'> 		PDEBUG_MODE("stream on OK",</div><div class='ctx'> 			gspca_dev-&gt;pixfmt,</div><div class='hunk'>@@ -1403,7 +1403,7 @@ static int vidioc_dqbuf(struct file *file, void *priv,</div><div class='ctx'> 	i = ret;				/* frame index */</div><div class='ctx'> 	frame = &amp;gspca_dev-&gt;frame[i];</div><div class='ctx'> 	if (gspca_dev-&gt;memory == V4L2_MEMORY_USERPTR) {</div><div class='del'>-		if (copy_to_user((__u8 *) frame-&gt;v4l2_buf.m.userptr,</div><div class='add'>+		if (copy_to_user((__u8 __user *) frame-&gt;v4l2_buf.m.userptr,</div><div class='ctx'> 				 frame-&gt;data,</div><div class='ctx'> 				 frame-&gt;v4l2_buf.bytesused)) {</div><div class='ctx'> 			PDEBUG(D_ERR|D_STREAM,</div><div class='hunk'>@@ -1731,6 +1731,12 @@ int gspca_dev_probe(struct usb_interface *intf,</div><div class='ctx'> 		err("couldn't kzalloc gspca struct");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='add'>+	gspca_dev-&gt;usb_buf = kmalloc(USB_BUF_SZ, GFP_KERNEL);</div><div class='add'>+	if (!gspca_dev-&gt;usb_buf) {</div><div class='add'>+		err("out of memory");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	gspca_dev-&gt;dev = dev;</div><div class='ctx'> 	gspca_dev-&gt;iface = interface-&gt;bInterfaceNumber;</div><div class='ctx'> 	gspca_dev-&gt;nbalt = intf-&gt;num_altsetting;</div><div class='hunk'>@@ -1738,10 +1744,13 @@ int gspca_dev_probe(struct usb_interface *intf,</div><div class='ctx'> /*	gspca_dev-&gt;users = 0;			(done by kzalloc) */</div><div class='ctx'> 	gspca_dev-&gt;nbufread = 2;</div><div class='ctx'> </div><div class='del'>-	/* configure the subdriver */</div><div class='add'>+	/* configure the subdriver and initialize the USB device */</div><div class='ctx'> 	ret = gspca_dev-&gt;sd_desc-&gt;config(gspca_dev, id);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='add'>+	ret = gspca_dev-&gt;sd_desc-&gt;init(gspca_dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='ctx'> 	ret = gspca_set_alt0(gspca_dev);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1771,6 +1780,7 @@ int gspca_dev_probe(struct usb_interface *intf,</div><div class='ctx'> 	PDEBUG(D_PROBE, "probe ok");</div><div class='ctx'> 	return 0;</div><div class='ctx'> out:</div><div class='add'>+	kfree(gspca_dev-&gt;usb_buf);</div><div class='ctx'> 	kfree(gspca_dev);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1803,11 +1813,42 @@ void gspca_disconnect(struct usb_interface *intf)</div><div class='ctx'> /* We don't want people trying to open up the device */</div><div class='ctx'> 	video_unregister_device(&amp;gspca_dev-&gt;vdev);</div><div class='ctx'> /* Free the memory */</div><div class='add'>+	kfree(gspca_dev-&gt;usb_buf);</div><div class='ctx'> 	kfree(gspca_dev);</div><div class='ctx'> 	PDEBUG(D_PROBE, "disconnect complete");</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(gspca_disconnect);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+int gspca_suspend(struct usb_interface *intf, pm_message_t message)</div><div class='add'>+{</div><div class='add'>+	struct gspca_dev *gspca_dev = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	if (!gspca_dev-&gt;streaming)</div><div class='add'>+		return 0;</div><div class='add'>+	gspca_dev-&gt;frozen = 1;		/* avoid urb error messages */</div><div class='add'>+	if (gspca_dev-&gt;sd_desc-&gt;stopN)</div><div class='add'>+		gspca_dev-&gt;sd_desc-&gt;stopN(gspca_dev);</div><div class='add'>+	destroy_urbs(gspca_dev);</div><div class='add'>+	gspca_set_alt0(gspca_dev);</div><div class='add'>+	if (gspca_dev-&gt;sd_desc-&gt;stop0)</div><div class='add'>+		gspca_dev-&gt;sd_desc-&gt;stop0(gspca_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(gspca_suspend);</div><div class='add'>+</div><div class='add'>+int gspca_resume(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct gspca_dev *gspca_dev = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	gspca_dev-&gt;frozen = 0;</div><div class='add'>+	gspca_dev-&gt;sd_desc-&gt;init(gspca_dev);</div><div class='add'>+	if (gspca_dev-&gt;streaming)</div><div class='add'>+		return gspca_init_transfer(gspca_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(gspca_resume);</div><div class='add'>+#endif</div><div class='ctx'> /* -- cam driver utility functions -- */</div><div class='ctx'> </div><div class='ctx'> /* auto gain and exposure algorithm based on the knee algorithm described here:</div><div class='hunk'>@@ -1913,7 +1954,7 @@ static void __exit gspca_exit(void)</div><div class='ctx'> module_init(gspca_init);</div><div class='ctx'> module_exit(gspca_exit);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='ctx'> module_param_named(debug, gspca_debug, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(debug,</div><div class='ctx'> 		"Debug (bit) 0x01:error 0x02:probe 0x04:config"</div><div class='head'>diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h<br/>index 3fd2c4eee204..c17625cff9ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/gspca.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/gspca.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/gspca.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/gspca.h</a></div><div class='hunk'>@@ -9,7 +9,10 @@</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='add'>+/* compilation option */</div><div class='add'>+#define GSPCA_DEBUG 1</div><div class='add'>+</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='ctx'> /* GSPCA our debug messages */</div><div class='ctx'> extern int gspca_debug;</div><div class='ctx'> #define PDEBUG(level, fmt, args...) \</div><div class='hunk'>@@ -53,7 +56,6 @@ extern int gspca_debug;</div><div class='ctx'> </div><div class='ctx'> /* device information - set at probe time */</div><div class='ctx'> struct cam {</div><div class='del'>-	char *dev_name;</div><div class='ctx'> 	struct v4l2_pix_format *cam_mode;	/* size nmodes */</div><div class='ctx'> 	char nmodes;</div><div class='ctx'> 	__u8 epaddr;</div><div class='hunk'>@@ -88,15 +90,14 @@ struct sd_desc {</div><div class='ctx'> /* controls */</div><div class='ctx'> 	const struct ctrl *ctrls;</div><div class='ctx'> 	int nctrls;</div><div class='del'>-/* operations */</div><div class='add'>+/* mandatory operations */</div><div class='ctx'> 	cam_cf_op config;	/* called on probe */</div><div class='del'>-	cam_op open;		/* called on open */</div><div class='add'>+	cam_op init;		/* called on probe and resume */</div><div class='ctx'> 	cam_v_op start;		/* called on stream on */</div><div class='del'>-	cam_v_op stopN;		/* called on stream off - main alt */</div><div class='del'>-	cam_v_op stop0;		/* called on stream off - alt 0 */</div><div class='del'>-	cam_v_op close;		/* called on close */</div><div class='ctx'> 	cam_pkt_op pkt_scan;</div><div class='ctx'> /* optional operations */</div><div class='add'>+	cam_v_op stopN;		/* called on stream off - main alt */</div><div class='add'>+	cam_v_op stop0;		/* called on stream off - alt 0 */</div><div class='ctx'> 	cam_v_op dq_callback;	/* called when a frame has been dequeued */</div><div class='ctx'> 	cam_jpg_op get_jcomp;</div><div class='ctx'> 	cam_jpg_op set_jcomp;</div><div class='hunk'>@@ -124,8 +125,10 @@ struct gspca_dev {</div><div class='ctx'> </div><div class='ctx'> 	struct cam cam;				/* device information */</div><div class='ctx'> 	const struct sd_desc *sd_desc;		/* subdriver description */</div><div class='add'>+	unsigned ctrl_dis;		/* disabled controls (bit map) */</div><div class='ctx'> </div><div class='del'>-	__u8 usb_buf[8];			/* buffer for USB exchanges */</div><div class='add'>+#define USB_BUF_SZ 64</div><div class='add'>+	__u8 *usb_buf;				/* buffer for USB exchanges */</div><div class='ctx'> 	struct urb *urb[MAX_NURBS];</div><div class='ctx'> </div><div class='ctx'> 	__u8 *frbuf;				/* buffer for nframes */</div><div class='hunk'>@@ -152,6 +155,9 @@ struct gspca_dev {</div><div class='ctx'> 	struct mutex queue_lock;	/* ISOC queue protection */</div><div class='ctx'> 	__u32 sequence;			/* frame sequence number */</div><div class='ctx'> 	char streaming;</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	char frozen;			/* suspend - resume */</div><div class='add'>+#endif</div><div class='ctx'> 	char users;			/* number of opens */</div><div class='ctx'> 	char present;			/* device connected */</div><div class='ctx'> 	char nbufread;			/* number of buffers for read() */</div><div class='hunk'>@@ -171,6 +177,10 @@ struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,</div><div class='ctx'> 				    struct gspca_frame *frame,</div><div class='ctx'> 				    const __u8 *data,</div><div class='ctx'> 				    int len);</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+int gspca_suspend(struct usb_interface *intf, pm_message_t message);</div><div class='add'>+int gspca_resume(struct usb_interface *intf);</div><div class='add'>+#endif</div><div class='ctx'> int gspca_auto_gain_n_exposure(struct gspca_dev *gspca_dev, int avg_lum,</div><div class='ctx'> 	int desired_avg_lum, int deadzone, int gain_knee, int exposure_knee);</div><div class='ctx'> #endif /* GSPCAV2_H */</div><div class='head'>diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c<br/>index 21c4ee56a10a..4d5db47ba8cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/mars.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/mars.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/mars.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/mars.c</a></div><div class='hunk'>@@ -100,22 +100,6 @@ static int reg_w(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int reg_w_buf(struct gspca_dev *gspca_dev,</div><div class='del'>-			__u16 index, __u8 *buf, int len)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	rc = usb_control_msg(gspca_dev-&gt;dev,</div><div class='del'>-			 usb_sndbulkpipe(gspca_dev-&gt;dev, 4),</div><div class='del'>-			 0x12,</div><div class='del'>-			 0xc8,		/* ?? */</div><div class='del'>-			 0,		/* value */</div><div class='del'>-			 index, buf, len, 500);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		PDEBUG(D_ERR, "reg write [%02x] error %d", index, rc);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void bulk_w(struct gspca_dev *gspca_dev,</div><div class='ctx'> 		   __u16 *pch,</div><div class='ctx'> 		   __u16 Address)</div><div class='hunk'>@@ -144,8 +128,8 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -175,7 +159,6 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	   Initialize the MR97113 chip register</div><div class='ctx'> 	 */</div><div class='del'>-	data = kmalloc(16, GFP_KERNEL);</div><div class='ctx'> 	data[0] = 0x00;		/* address */</div><div class='ctx'> 	data[1] = 0x0c | 0x01;	/* reg 0 */</div><div class='ctx'> 	data[2] = 0x01;		/* reg 1 */</div><div class='hunk'>@@ -195,12 +178,10 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	data[10] = 0x5d;	/* reg 9, I2C device address</div><div class='ctx'> 				 *	[for PAS5101 (0x40)] [for MI (0x5d)] */</div><div class='ctx'> </div><div class='del'>-	err_code = reg_w_buf(gspca_dev, data[0], data, 11);</div><div class='del'>-	kfree(data);</div><div class='add'>+	err_code = reg_w(gspca_dev, data[0], 11);</div><div class='ctx'> 	if (err_code &lt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	data = gspca_dev-&gt;usb_buf;</div><div class='ctx'> 	data[0] = 0x23;		/* address */</div><div class='ctx'> 	data[1] = 0x09;		/* reg 35, append frame header */</div><div class='ctx'> </div><div class='hunk'>@@ -358,14 +339,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		PDEBUG(D_ERR, "Camera Stop failed");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			struct gspca_frame *frame,	/* target */</div><div class='ctx'> 			__u8 *data,			/* isoc packet */</div><div class='hunk'>@@ -411,11 +384,9 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='del'>-	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -439,6 +410,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c<br/>index 83139efc4629..4df4eec9f7e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/ov519.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/ov519.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/ov519.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/ov519.c</a></div><div class='hunk'>@@ -40,14 +40,15 @@ struct sd {</div><div class='ctx'> 	struct gspca_dev gspca_dev;		/* !! must be the first item */</div><div class='ctx'> </div><div class='ctx'> 	/* Determined by sensor type */</div><div class='del'>-	short maxwidth;</div><div class='del'>-	short maxheight;</div><div class='add'>+	char sif;</div><div class='ctx'> </div><div class='ctx'> 	unsigned char primary_i2c_slave;	/* I2C write id of sensor */</div><div class='ctx'> </div><div class='ctx'> 	unsigned char brightness;</div><div class='ctx'> 	unsigned char contrast;</div><div class='ctx'> 	unsigned char colors;</div><div class='add'>+	__u8 hflip;</div><div class='add'>+	__u8 vflip;</div><div class='ctx'> </div><div class='ctx'> 	char compress;		/* Should the next frame be compressed? */</div><div class='ctx'> 	char compress_inited;	/* Are compression params uploaded? */</div><div class='hunk'>@@ -62,11 +63,10 @@ struct sd {</div><div class='ctx'> #define SEN_OV6630 2</div><div class='ctx'> #define SEN_OV7610 3</div><div class='ctx'> #define SEN_OV7620 4</div><div class='del'>-#define SEN_OV7630 5</div><div class='del'>-#define SEN_OV7640 6</div><div class='del'>-#define SEN_OV7670 7</div><div class='del'>-#define SEN_OV76BE 8</div><div class='del'>-#define SEN_OV8610 9</div><div class='add'>+#define SEN_OV7640 5</div><div class='add'>+#define SEN_OV7670 6</div><div class='add'>+#define SEN_OV76BE 7</div><div class='add'>+#define SEN_OV8610 8</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -77,9 +77,12 @@ static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);</div><div class='ctx'> static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='ctx'> static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);</div><div class='ctx'> static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+static int sd_gethflip(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='ctx'> </div><div class='ctx'> static struct ctrl sd_ctrls[] = {</div><div class='del'>-#define SD_BRIGHTNESS 0</div><div class='ctx'> 	{</div><div class='ctx'> 	    {</div><div class='ctx'> 		.id      = V4L2_CID_BRIGHTNESS,</div><div class='hunk'>@@ -88,12 +91,12 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 		.minimum = 0,</div><div class='ctx'> 		.maximum = 255,</div><div class='ctx'> 		.step    = 1,</div><div class='del'>-		.default_value = 127,</div><div class='add'>+#define BRIGHTNESS_DEF 127</div><div class='add'>+		.default_value = BRIGHTNESS_DEF,</div><div class='ctx'> 	    },</div><div class='ctx'> 	    .set = sd_setbrightness,</div><div class='ctx'> 	    .get = sd_getbrightness,</div><div class='ctx'> 	},</div><div class='del'>-#define SD_CONTRAST 1</div><div class='ctx'> 	{</div><div class='ctx'> 	    {</div><div class='ctx'> 		.id      = V4L2_CID_CONTRAST,</div><div class='hunk'>@@ -102,31 +105,63 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 		.minimum = 0,</div><div class='ctx'> 		.maximum = 255,</div><div class='ctx'> 		.step    = 1,</div><div class='del'>-		.default_value = 127,</div><div class='add'>+#define CONTRAST_DEF 127</div><div class='add'>+		.default_value = CONTRAST_DEF,</div><div class='ctx'> 	    },</div><div class='ctx'> 	    .set = sd_setcontrast,</div><div class='ctx'> 	    .get = sd_getcontrast,</div><div class='ctx'> 	},</div><div class='del'>-#define SD_COLOR 2</div><div class='ctx'> 	{</div><div class='ctx'> 	    {</div><div class='ctx'> 		.id      = V4L2_CID_SATURATION,</div><div class='ctx'> 		.type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		.name    = "Saturation",</div><div class='add'>+		.name    = "Color",</div><div class='ctx'> 		.minimum = 0,</div><div class='ctx'> 		.maximum = 255,</div><div class='ctx'> 		.step    = 1,</div><div class='del'>-		.default_value = 127,</div><div class='add'>+#define COLOR_DEF 127</div><div class='add'>+		.default_value = COLOR_DEF,</div><div class='ctx'> 	    },</div><div class='ctx'> 	    .set = sd_setcolors,</div><div class='ctx'> 	    .get = sd_getcolors,</div><div class='ctx'> 	},</div><div class='add'>+/* next controls work with ov7670 only */</div><div class='add'>+#define HFLIP_IDX 3</div><div class='add'>+	{</div><div class='add'>+	    {</div><div class='add'>+		.id      = V4L2_CID_HFLIP,</div><div class='add'>+		.type    = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+		.name    = "Mirror",</div><div class='add'>+		.minimum = 0,</div><div class='add'>+		.maximum = 1,</div><div class='add'>+		.step    = 1,</div><div class='add'>+#define HFLIP_DEF 0</div><div class='add'>+		.default_value = HFLIP_DEF,</div><div class='add'>+	    },</div><div class='add'>+	    .set = sd_sethflip,</div><div class='add'>+	    .get = sd_gethflip,</div><div class='add'>+	},</div><div class='add'>+#define VFLIP_IDX 4</div><div class='add'>+	{</div><div class='add'>+	    {</div><div class='add'>+		.id      = V4L2_CID_VFLIP,</div><div class='add'>+		.type    = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+		.name    = "Vflip",</div><div class='add'>+		.minimum = 0,</div><div class='add'>+		.maximum = 1,</div><div class='add'>+		.step    = 1,</div><div class='add'>+#define VFLIP_DEF 0</div><div class='add'>+		.default_value = VFLIP_DEF,</div><div class='add'>+	    },</div><div class='add'>+	    .set = sd_setvflip,</div><div class='add'>+	    .get = sd_getvflip,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct v4l2_pix_format vga_mode[] = {</div><div class='ctx'> 	{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,</div><div class='ctx'> 		.bytesperline = 320,</div><div class='del'>-		.sizeimage = 320 * 240 * 3 / 8 + 589,</div><div class='add'>+		.sizeimage = 320 * 240 * 3 / 8 + 590,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_JPEG,</div><div class='ctx'> 		.priv = 1},</div><div class='ctx'> 	{640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,</div><div class='hunk'>@@ -138,12 +173,12 @@ static struct v4l2_pix_format vga_mode[] = {</div><div class='ctx'> static struct v4l2_pix_format sif_mode[] = {</div><div class='ctx'> 	{176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,</div><div class='ctx'> 		.bytesperline = 176,</div><div class='del'>-		.sizeimage = 176 * 144 * 3 / 8 + 589,</div><div class='add'>+		.sizeimage = 176 * 144 * 3 / 8 + 590,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_JPEG,</div><div class='ctx'> 		.priv = 1},</div><div class='ctx'> 	{352, 288, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,</div><div class='ctx'> 		.bytesperline = 352,</div><div class='del'>-		.sizeimage = 352 * 288 * 3 / 8 + 589,</div><div class='add'>+		.sizeimage = 352 * 288 * 3 / 8 + 590,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_JPEG,</div><div class='ctx'> 		.priv = 0},</div><div class='ctx'> };</div><div class='hunk'>@@ -225,6 +260,7 @@ static struct v4l2_pix_format sif_mode[] = {</div><div class='ctx'> #define OV7670_REG_VSTART      0x19    /* Vert start high bits */</div><div class='ctx'> #define OV7670_REG_VSTOP       0x1a    /* Vert stop high bits */</div><div class='ctx'> #define OV7670_REG_MVFP        0x1e    /* Mirror / vflip */</div><div class='add'>+#define   OV7670_MVFP_VFLIP	 0x10    /* vertical flip */</div><div class='ctx'> #define   OV7670_MVFP_MIRROR     0x20    /* Mirror image */</div><div class='ctx'> #define OV7670_REG_AEW         0x24    /* AGC upper limit */</div><div class='ctx'> #define OV7670_REG_AEB         0x25    /* AGC lower limit */</div><div class='hunk'>@@ -258,14 +294,539 @@ static struct v4l2_pix_format sif_mode[] = {</div><div class='ctx'> #define OV7670_REG_HAECC7      0xaa    /* Hist AEC/AGC control 7 */</div><div class='ctx'> #define OV7670_REG_BD60MAX     0xab    /* 60hz banding step limit */</div><div class='ctx'> </div><div class='del'>-struct ovsensor_window {</div><div class='del'>-	short x;</div><div class='del'>-	short y;</div><div class='del'>-	short width;</div><div class='del'>-	short height;</div><div class='del'>-/*	int format; */</div><div class='del'>-	short quarter;		/* Scale width and height down 2x */</div><div class='del'>-	short clockdiv;		/* Clock divisor setting */</div><div class='add'>+struct ov_regvals {</div><div class='add'>+	__u8 reg;</div><div class='add'>+	__u8 val;</div><div class='add'>+};</div><div class='add'>+struct ov_i2c_regvals {</div><div class='add'>+	__u8 reg;</div><div class='add'>+	__u8 val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ov_i2c_regvals norm_6x20[] = {</div><div class='add'>+	{ 0x12, 0x80 }, /* reset */</div><div class='add'>+	{ 0x11, 0x01 },</div><div class='add'>+	{ 0x03, 0x60 },</div><div class='add'>+	{ 0x05, 0x7f }, /* For when autoadjust is off */</div><div class='add'>+	{ 0x07, 0xa8 },</div><div class='add'>+	/* The ratio of 0x0c and 0x0d  controls the white point */</div><div class='add'>+	{ 0x0c, 0x24 },</div><div class='add'>+	{ 0x0d, 0x24 },</div><div class='add'>+	{ 0x0f, 0x15 }, /* COMS */</div><div class='add'>+	{ 0x10, 0x75 }, /* AEC Exposure time */</div><div class='add'>+	{ 0x12, 0x24 }, /* Enable AGC */</div><div class='add'>+	{ 0x14, 0x04 },</div><div class='add'>+	/* 0x16: 0x06 helps frame stability with moving objects */</div><div class='add'>+	{ 0x16, 0x06 },</div><div class='add'>+/*	{ 0x20, 0x30 },  * Aperture correction enable */</div><div class='add'>+	{ 0x26, 0xb2 }, /* BLC enable */</div><div class='add'>+	/* 0x28: 0x05 Selects RGB format if RGB on */</div><div class='add'>+	{ 0x28, 0x05 },</div><div class='add'>+	{ 0x2a, 0x04 }, /* Disable framerate adjust */</div><div class='add'>+/*	{ 0x2b, 0xac },  * Framerate; Set 2a[7] first */</div><div class='add'>+	{ 0x2d, 0x99 },</div><div class='add'>+	{ 0x33, 0xa0 }, /* Color Processing Parameter */</div><div class='add'>+	{ 0x34, 0xd2 }, /* Max A/D range */</div><div class='add'>+	{ 0x38, 0x8b },</div><div class='add'>+	{ 0x39, 0x40 },</div><div class='add'>+</div><div class='add'>+	{ 0x3c, 0x39 }, /* Enable AEC mode changing */</div><div class='add'>+	{ 0x3c, 0x3c }, /* Change AEC mode */</div><div class='add'>+	{ 0x3c, 0x24 }, /* Disable AEC mode changing */</div><div class='add'>+</div><div class='add'>+	{ 0x3d, 0x80 },</div><div class='add'>+	/* These next two registers (0x4a, 0x4b) are undocumented.</div><div class='add'>+	 * They control the color balance */</div><div class='add'>+	{ 0x4a, 0x80 },</div><div class='add'>+	{ 0x4b, 0x80 },</div><div class='add'>+	{ 0x4d, 0xd2 }, /* This reduces noise a bit */</div><div class='add'>+	{ 0x4e, 0xc1 },</div><div class='add'>+	{ 0x4f, 0x04 },</div><div class='add'>+/* Do 50-53 have any effect? */</div><div class='add'>+/* Toggle 0x12[2] off and on here? */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ov_i2c_regvals norm_6x30[] = {</div><div class='add'>+	{ 0x12, 0x80 }, /* Reset */</div><div class='add'>+	{ 0x00, 0x1f }, /* Gain */</div><div class='add'>+	{ 0x01, 0x99 }, /* Blue gain */</div><div class='add'>+	{ 0x02, 0x7c }, /* Red gain */</div><div class='add'>+	{ 0x03, 0xc0 }, /* Saturation */</div><div class='add'>+	{ 0x05, 0x0a }, /* Contrast */</div><div class='add'>+	{ 0x06, 0x95 }, /* Brightness */</div><div class='add'>+	{ 0x07, 0x2d }, /* Sharpness */</div><div class='add'>+	{ 0x0c, 0x20 },</div><div class='add'>+	{ 0x0d, 0x20 },</div><div class='add'>+	{ 0x0e, 0x20 },</div><div class='add'>+	{ 0x0f, 0x05 },</div><div class='add'>+	{ 0x10, 0x9a },</div><div class='add'>+	{ 0x11, 0x00 }, /* Pixel clock = fastest */</div><div class='add'>+	{ 0x12, 0x24 }, /* Enable AGC and AWB */</div><div class='add'>+	{ 0x13, 0x21 },</div><div class='add'>+	{ 0x14, 0x80 },</div><div class='add'>+	{ 0x15, 0x01 },</div><div class='add'>+	{ 0x16, 0x03 },</div><div class='add'>+	{ 0x17, 0x38 },</div><div class='add'>+	{ 0x18, 0xea },</div><div class='add'>+	{ 0x19, 0x04 },</div><div class='add'>+	{ 0x1a, 0x93 },</div><div class='add'>+	{ 0x1b, 0x00 },</div><div class='add'>+	{ 0x1e, 0xc4 },</div><div class='add'>+	{ 0x1f, 0x04 },</div><div class='add'>+	{ 0x20, 0x20 },</div><div class='add'>+	{ 0x21, 0x10 },</div><div class='add'>+	{ 0x22, 0x88 },</div><div class='add'>+	{ 0x23, 0xc0 }, /* Crystal circuit power level */</div><div class='add'>+	{ 0x25, 0x9a }, /* Increase AEC black ratio */</div><div class='add'>+	{ 0x26, 0xb2 }, /* BLC enable */</div><div class='add'>+	{ 0x27, 0xa2 },</div><div class='add'>+	{ 0x28, 0x00 },</div><div class='add'>+	{ 0x29, 0x00 },</div><div class='add'>+	{ 0x2a, 0x84 }, /* 60 Hz power */</div><div class='add'>+	{ 0x2b, 0xa8 }, /* 60 Hz power */</div><div class='add'>+	{ 0x2c, 0xa0 },</div><div class='add'>+	{ 0x2d, 0x95 }, /* Enable auto-brightness */</div><div class='add'>+	{ 0x2e, 0x88 },</div><div class='add'>+	{ 0x33, 0x26 },</div><div class='add'>+	{ 0x34, 0x03 },</div><div class='add'>+	{ 0x36, 0x8f },</div><div class='add'>+	{ 0x37, 0x80 },</div><div class='add'>+	{ 0x38, 0x83 },</div><div class='add'>+	{ 0x39, 0x80 },</div><div class='add'>+	{ 0x3a, 0x0f },</div><div class='add'>+	{ 0x3b, 0x3c },</div><div class='add'>+	{ 0x3c, 0x1a },</div><div class='add'>+	{ 0x3d, 0x80 },</div><div class='add'>+	{ 0x3e, 0x80 },</div><div class='add'>+	{ 0x3f, 0x0e },</div><div class='add'>+	{ 0x40, 0x00 }, /* White bal */</div><div class='add'>+	{ 0x41, 0x00 }, /* White bal */</div><div class='add'>+	{ 0x42, 0x80 },</div><div class='add'>+	{ 0x43, 0x3f }, /* White bal */</div><div class='add'>+	{ 0x44, 0x80 },</div><div class='add'>+	{ 0x45, 0x20 },</div><div class='add'>+	{ 0x46, 0x20 },</div><div class='add'>+	{ 0x47, 0x80 },</div><div class='add'>+	{ 0x48, 0x7f },</div><div class='add'>+	{ 0x49, 0x00 },</div><div class='add'>+	{ 0x4a, 0x00 },</div><div class='add'>+	{ 0x4b, 0x80 },</div><div class='add'>+	{ 0x4c, 0xd0 },</div><div class='add'>+	{ 0x4d, 0x10 }, /* U = 0.563u, V = 0.714v */</div><div class='add'>+	{ 0x4e, 0x40 },</div><div class='add'>+	{ 0x4f, 0x07 }, /* UV avg., col. killer: max */</div><div class='add'>+	{ 0x50, 0xff },</div><div class='add'>+	{ 0x54, 0x23 }, /* Max AGC gain: 18dB */</div><div class='add'>+	{ 0x55, 0xff },</div><div class='add'>+	{ 0x56, 0x12 },</div><div class='add'>+	{ 0x57, 0x81 },</div><div class='add'>+	{ 0x58, 0x75 },</div><div class='add'>+	{ 0x59, 0x01 }, /* AGC dark current comp.: +1 */</div><div class='add'>+	{ 0x5a, 0x2c },</div><div class='add'>+	{ 0x5b, 0x0f }, /* AWB chrominance levels */</div><div class='add'>+	{ 0x5c, 0x10 },</div><div class='add'>+	{ 0x3d, 0x80 },</div><div class='add'>+	{ 0x27, 0xa6 },</div><div class='add'>+	{ 0x12, 0x20 }, /* Toggle AWB */</div><div class='add'>+	{ 0x12, 0x24 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Lawrence Glaister &lt;lg@jfm.bc.ca&gt; reports:</div><div class='add'>+ *</div><div class='add'>+ * Register 0x0f in the 7610 has the following effects:</div><div class='add'>+ *</div><div class='add'>+ * 0x85 (AEC method 1): Best overall, good contrast range</div><div class='add'>+ * 0x45 (AEC method 2): Very overexposed</div><div class='add'>+ * 0xa5 (spec sheet default): Ok, but the black level is</div><div class='add'>+ *	shifted resulting in loss of contrast</div><div class='add'>+ * 0x05 (old driver setting): very overexposed, too much</div><div class='add'>+ *	contrast</div><div class='add'>+ */</div><div class='add'>+static const struct ov_i2c_regvals norm_7610[] = {</div><div class='add'>+	{ 0x10, 0xff },</div><div class='add'>+	{ 0x16, 0x06 },</div><div class='add'>+	{ 0x28, 0x24 },</div><div class='add'>+	{ 0x2b, 0xac },</div><div class='add'>+	{ 0x12, 0x00 },</div><div class='add'>+	{ 0x38, 0x81 },</div><div class='add'>+	{ 0x28, 0x24 },	/* 0c */</div><div class='add'>+	{ 0x0f, 0x85 },	/* lg's setting */</div><div class='add'>+	{ 0x15, 0x01 },</div><div class='add'>+	{ 0x20, 0x1c },</div><div class='add'>+	{ 0x23, 0x2a },</div><div class='add'>+	{ 0x24, 0x10 },</div><div class='add'>+	{ 0x25, 0x8a },</div><div class='add'>+	{ 0x26, 0xa2 },</div><div class='add'>+	{ 0x27, 0xc2 },</div><div class='add'>+	{ 0x2a, 0x04 },</div><div class='add'>+	{ 0x2c, 0xfe },</div><div class='add'>+	{ 0x2d, 0x93 },</div><div class='add'>+	{ 0x30, 0x71 },</div><div class='add'>+	{ 0x31, 0x60 },</div><div class='add'>+	{ 0x32, 0x26 },</div><div class='add'>+	{ 0x33, 0x20 },</div><div class='add'>+	{ 0x34, 0x48 },</div><div class='add'>+	{ 0x12, 0x24 },</div><div class='add'>+	{ 0x11, 0x01 },</div><div class='add'>+	{ 0x0c, 0x24 },</div><div class='add'>+	{ 0x0d, 0x24 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ov_i2c_regvals norm_7620[] = {</div><div class='add'>+	{ 0x00, 0x00 },		/* gain */</div><div class='add'>+	{ 0x01, 0x80 },		/* blue gain */</div><div class='add'>+	{ 0x02, 0x80 },		/* red gain */</div><div class='add'>+	{ 0x03, 0xc0 },		/* OV7670_REG_VREF */</div><div class='add'>+	{ 0x06, 0x60 },</div><div class='add'>+	{ 0x07, 0x00 },</div><div class='add'>+	{ 0x0c, 0x24 },</div><div class='add'>+	{ 0x0c, 0x24 },</div><div class='add'>+	{ 0x0d, 0x24 },</div><div class='add'>+	{ 0x11, 0x01 },</div><div class='add'>+	{ 0x12, 0x24 },</div><div class='add'>+	{ 0x13, 0x01 },</div><div class='add'>+	{ 0x14, 0x84 },</div><div class='add'>+	{ 0x15, 0x01 },</div><div class='add'>+	{ 0x16, 0x03 },</div><div class='add'>+	{ 0x17, 0x2f },</div><div class='add'>+	{ 0x18, 0xcf },</div><div class='add'>+	{ 0x19, 0x06 },</div><div class='add'>+	{ 0x1a, 0xf5 },</div><div class='add'>+	{ 0x1b, 0x00 },</div><div class='add'>+	{ 0x20, 0x18 },</div><div class='add'>+	{ 0x21, 0x80 },</div><div class='add'>+	{ 0x22, 0x80 },</div><div class='add'>+	{ 0x23, 0x00 },</div><div class='add'>+	{ 0x26, 0xa2 },</div><div class='add'>+	{ 0x27, 0xea },</div><div class='add'>+	{ 0x28, 0x20 },</div><div class='add'>+	{ 0x29, 0x00 },</div><div class='add'>+	{ 0x2a, 0x10 },</div><div class='add'>+	{ 0x2b, 0x00 },</div><div class='add'>+	{ 0x2c, 0x88 },</div><div class='add'>+	{ 0x2d, 0x91 },</div><div class='add'>+	{ 0x2e, 0x80 },</div><div class='add'>+	{ 0x2f, 0x44 },</div><div class='add'>+	{ 0x60, 0x27 },</div><div class='add'>+	{ 0x61, 0x02 },</div><div class='add'>+	{ 0x62, 0x5f },</div><div class='add'>+	{ 0x63, 0xd5 },</div><div class='add'>+	{ 0x64, 0x57 },</div><div class='add'>+	{ 0x65, 0x83 },</div><div class='add'>+	{ 0x66, 0x55 },</div><div class='add'>+	{ 0x67, 0x92 },</div><div class='add'>+	{ 0x68, 0xcf },</div><div class='add'>+	{ 0x69, 0x76 },</div><div class='add'>+	{ 0x6a, 0x22 },</div><div class='add'>+	{ 0x6b, 0x00 },</div><div class='add'>+	{ 0x6c, 0x02 },</div><div class='add'>+	{ 0x6d, 0x44 },</div><div class='add'>+	{ 0x6e, 0x80 },</div><div class='add'>+	{ 0x6f, 0x1d },</div><div class='add'>+	{ 0x70, 0x8b },</div><div class='add'>+	{ 0x71, 0x00 },</div><div class='add'>+	{ 0x72, 0x14 },</div><div class='add'>+	{ 0x73, 0x54 },</div><div class='add'>+	{ 0x74, 0x00 },</div><div class='add'>+	{ 0x75, 0x8e },</div><div class='add'>+	{ 0x76, 0x00 },</div><div class='add'>+	{ 0x77, 0xff },</div><div class='add'>+	{ 0x78, 0x80 },</div><div class='add'>+	{ 0x79, 0x80 },</div><div class='add'>+	{ 0x7a, 0x80 },</div><div class='add'>+	{ 0x7b, 0xe2 },</div><div class='add'>+	{ 0x7c, 0x00 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 7640 and 7648. The defaults should be OK for most registers. */</div><div class='add'>+static const struct ov_i2c_regvals norm_7640[] = {</div><div class='add'>+	{ 0x12, 0x80 },</div><div class='add'>+	{ 0x12, 0x14 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 7670. Defaults taken from OmniVision provided data,</div><div class='add'>+*  as provided by Jonathan Corbet of OLPC		*/</div><div class='add'>+static const struct ov_i2c_regvals norm_7670[] = {</div><div class='add'>+	{ OV7670_REG_COM7, OV7670_COM7_RESET },</div><div class='add'>+	{ OV7670_REG_TSLB, 0x04 },		/* OV */</div><div class='add'>+	{ OV7670_REG_COM7, OV7670_COM7_FMT_VGA }, /* VGA */</div><div class='add'>+	{ OV7670_REG_CLKRC, 0x01 },</div><div class='add'>+/*</div><div class='add'>+ * Set the hardware window.  These values from OV don't entirely</div><div class='add'>+ * make sense - hstop is less than hstart.  But they work...</div><div class='add'>+ */</div><div class='add'>+	{ OV7670_REG_HSTART, 0x13 },</div><div class='add'>+	{ OV7670_REG_HSTOP, 0x01 },</div><div class='add'>+	{ OV7670_REG_HREF, 0xb6 },</div><div class='add'>+	{ OV7670_REG_VSTART, 0x02 },</div><div class='add'>+	{ OV7670_REG_VSTOP, 0x7a },</div><div class='add'>+	{ OV7670_REG_VREF, 0x0a },</div><div class='add'>+</div><div class='add'>+	{ OV7670_REG_COM3, 0 },</div><div class='add'>+	{ OV7670_REG_COM14, 0 },</div><div class='add'>+/* Mystery scaling numbers */</div><div class='add'>+	{ 0x70, 0x3a },</div><div class='add'>+	{ 0x71, 0x35 },</div><div class='add'>+	{ 0x72, 0x11 },</div><div class='add'>+	{ 0x73, 0xf0 },</div><div class='add'>+	{ 0xa2, 0x02 },</div><div class='add'>+/*	{ OV7670_REG_COM10, 0x0 }, */</div><div class='add'>+</div><div class='add'>+/* Gamma curve values */</div><div class='add'>+	{ 0x7a, 0x20 },</div><div class='add'>+	{ 0x7b, 0x10 },</div><div class='add'>+	{ 0x7c, 0x1e },</div><div class='add'>+	{ 0x7d, 0x35 },</div><div class='add'>+	{ 0x7e, 0x5a },</div><div class='add'>+	{ 0x7f, 0x69 },</div><div class='add'>+	{ 0x80, 0x76 },</div><div class='add'>+	{ 0x81, 0x80 },</div><div class='add'>+	{ 0x82, 0x88 },</div><div class='add'>+	{ 0x83, 0x8f },</div><div class='add'>+	{ 0x84, 0x96 },</div><div class='add'>+	{ 0x85, 0xa3 },</div><div class='add'>+	{ 0x86, 0xaf },</div><div class='add'>+	{ 0x87, 0xc4 },</div><div class='add'>+	{ 0x88, 0xd7 },</div><div class='add'>+	{ 0x89, 0xe8 },</div><div class='add'>+</div><div class='add'>+/* AGC and AEC parameters.  Note we start by disabling those features,</div><div class='add'>+   then turn them only after tweaking the values. */</div><div class='add'>+	{ OV7670_REG_COM8, OV7670_COM8_FASTAEC</div><div class='add'>+			 | OV7670_COM8_AECSTEP</div><div class='add'>+			 | OV7670_COM8_BFILT },</div><div class='add'>+	{ OV7670_REG_GAIN, 0 },</div><div class='add'>+	{ OV7670_REG_AECH, 0 },</div><div class='add'>+	{ OV7670_REG_COM4, 0x40 }, /* magic reserved bit */</div><div class='add'>+	{ OV7670_REG_COM9, 0x18 }, /* 4x gain + magic rsvd bit */</div><div class='add'>+	{ OV7670_REG_BD50MAX, 0x05 },</div><div class='add'>+	{ OV7670_REG_BD60MAX, 0x07 },</div><div class='add'>+	{ OV7670_REG_AEW, 0x95 },</div><div class='add'>+	{ OV7670_REG_AEB, 0x33 },</div><div class='add'>+	{ OV7670_REG_VPT, 0xe3 },</div><div class='add'>+	{ OV7670_REG_HAECC1, 0x78 },</div><div class='add'>+	{ OV7670_REG_HAECC2, 0x68 },</div><div class='add'>+	{ 0xa1, 0x03 }, /* magic */</div><div class='add'>+	{ OV7670_REG_HAECC3, 0xd8 },</div><div class='add'>+	{ OV7670_REG_HAECC4, 0xd8 },</div><div class='add'>+	{ OV7670_REG_HAECC5, 0xf0 },</div><div class='add'>+	{ OV7670_REG_HAECC6, 0x90 },</div><div class='add'>+	{ OV7670_REG_HAECC7, 0x94 },</div><div class='add'>+	{ OV7670_REG_COM8, OV7670_COM8_FASTAEC</div><div class='add'>+			| OV7670_COM8_AECSTEP</div><div class='add'>+			| OV7670_COM8_BFILT</div><div class='add'>+			| OV7670_COM8_AGC</div><div class='add'>+			| OV7670_COM8_AEC },</div><div class='add'>+</div><div class='add'>+/* Almost all of these are magic "reserved" values.  */</div><div class='add'>+	{ OV7670_REG_COM5, 0x61 },</div><div class='add'>+	{ OV7670_REG_COM6, 0x4b },</div><div class='add'>+	{ 0x16, 0x02 },</div><div class='add'>+	{ OV7670_REG_MVFP, 0x07 },</div><div class='add'>+	{ 0x21, 0x02 },</div><div class='add'>+	{ 0x22, 0x91 },</div><div class='add'>+	{ 0x29, 0x07 },</div><div class='add'>+	{ 0x33, 0x0b },</div><div class='add'>+	{ 0x35, 0x0b },</div><div class='add'>+	{ 0x37, 0x1d },</div><div class='add'>+	{ 0x38, 0x71 },</div><div class='add'>+	{ 0x39, 0x2a },</div><div class='add'>+	{ OV7670_REG_COM12, 0x78 },</div><div class='add'>+	{ 0x4d, 0x40 },</div><div class='add'>+	{ 0x4e, 0x20 },</div><div class='add'>+	{ OV7670_REG_GFIX, 0 },</div><div class='add'>+	{ 0x6b, 0x4a },</div><div class='add'>+	{ 0x74, 0x10 },</div><div class='add'>+	{ 0x8d, 0x4f },</div><div class='add'>+	{ 0x8e, 0 },</div><div class='add'>+	{ 0x8f, 0 },</div><div class='add'>+	{ 0x90, 0 },</div><div class='add'>+	{ 0x91, 0 },</div><div class='add'>+	{ 0x96, 0 },</div><div class='add'>+	{ 0x9a, 0 },</div><div class='add'>+	{ 0xb0, 0x84 },</div><div class='add'>+	{ 0xb1, 0x0c },</div><div class='add'>+	{ 0xb2, 0x0e },</div><div class='add'>+	{ 0xb3, 0x82 },</div><div class='add'>+	{ 0xb8, 0x0a },</div><div class='add'>+</div><div class='add'>+/* More reserved magic, some of which tweaks white balance */</div><div class='add'>+	{ 0x43, 0x0a },</div><div class='add'>+	{ 0x44, 0xf0 },</div><div class='add'>+	{ 0x45, 0x34 },</div><div class='add'>+	{ 0x46, 0x58 },</div><div class='add'>+	{ 0x47, 0x28 },</div><div class='add'>+	{ 0x48, 0x3a },</div><div class='add'>+	{ 0x59, 0x88 },</div><div class='add'>+	{ 0x5a, 0x88 },</div><div class='add'>+	{ 0x5b, 0x44 },</div><div class='add'>+	{ 0x5c, 0x67 },</div><div class='add'>+	{ 0x5d, 0x49 },</div><div class='add'>+	{ 0x5e, 0x0e },</div><div class='add'>+	{ 0x6c, 0x0a },</div><div class='add'>+	{ 0x6d, 0x55 },</div><div class='add'>+	{ 0x6e, 0x11 },</div><div class='add'>+	{ 0x6f, 0x9f },</div><div class='add'>+					/* "9e for advance AWB" */</div><div class='add'>+	{ 0x6a, 0x40 },</div><div class='add'>+	{ OV7670_REG_BLUE, 0x40 },</div><div class='add'>+	{ OV7670_REG_RED, 0x60 },</div><div class='add'>+	{ OV7670_REG_COM8, OV7670_COM8_FASTAEC</div><div class='add'>+			| OV7670_COM8_AECSTEP</div><div class='add'>+			| OV7670_COM8_BFILT</div><div class='add'>+			| OV7670_COM8_AGC</div><div class='add'>+			| OV7670_COM8_AEC</div><div class='add'>+			| OV7670_COM8_AWB },</div><div class='add'>+</div><div class='add'>+/* Matrix coefficients */</div><div class='add'>+	{ 0x4f, 0x80 },</div><div class='add'>+	{ 0x50, 0x80 },</div><div class='add'>+	{ 0x51, 0 },</div><div class='add'>+	{ 0x52, 0x22 },</div><div class='add'>+	{ 0x53, 0x5e },</div><div class='add'>+	{ 0x54, 0x80 },</div><div class='add'>+	{ 0x58, 0x9e },</div><div class='add'>+</div><div class='add'>+	{ OV7670_REG_COM16, OV7670_COM16_AWBGAIN },</div><div class='add'>+	{ OV7670_REG_EDGE, 0 },</div><div class='add'>+	{ 0x75, 0x05 },</div><div class='add'>+	{ 0x76, 0xe1 },</div><div class='add'>+	{ 0x4c, 0 },</div><div class='add'>+	{ 0x77, 0x01 },</div><div class='add'>+	{ OV7670_REG_COM13, OV7670_COM13_GAMMA</div><div class='add'>+			  | OV7670_COM13_UVSAT</div><div class='add'>+			  | 2},		/* was 3 */</div><div class='add'>+	{ 0x4b, 0x09 },</div><div class='add'>+	{ 0xc9, 0x60 },</div><div class='add'>+	{ OV7670_REG_COM16, 0x38 },</div><div class='add'>+	{ 0x56, 0x40 },</div><div class='add'>+</div><div class='add'>+	{ 0x34, 0x11 },</div><div class='add'>+	{ OV7670_REG_COM11, OV7670_COM11_EXP|OV7670_COM11_HZAUTO },</div><div class='add'>+	{ 0xa4, 0x88 },</div><div class='add'>+	{ 0x96, 0 },</div><div class='add'>+	{ 0x97, 0x30 },</div><div class='add'>+	{ 0x98, 0x20 },</div><div class='add'>+	{ 0x99, 0x30 },</div><div class='add'>+	{ 0x9a, 0x84 },</div><div class='add'>+	{ 0x9b, 0x29 },</div><div class='add'>+	{ 0x9c, 0x03 },</div><div class='add'>+	{ 0x9d, 0x4c },</div><div class='add'>+	{ 0x9e, 0x3f },</div><div class='add'>+	{ 0x78, 0x04 },</div><div class='add'>+</div><div class='add'>+/* Extra-weird stuff.  Some sort of multiplexor register */</div><div class='add'>+	{ 0x79, 0x01 },</div><div class='add'>+	{ 0xc8, 0xf0 },</div><div class='add'>+	{ 0x79, 0x0f },</div><div class='add'>+	{ 0xc8, 0x00 },</div><div class='add'>+	{ 0x79, 0x10 },</div><div class='add'>+	{ 0xc8, 0x7e },</div><div class='add'>+	{ 0x79, 0x0a },</div><div class='add'>+	{ 0xc8, 0x80 },</div><div class='add'>+	{ 0x79, 0x0b },</div><div class='add'>+	{ 0xc8, 0x01 },</div><div class='add'>+	{ 0x79, 0x0c },</div><div class='add'>+	{ 0xc8, 0x0f },</div><div class='add'>+	{ 0x79, 0x0d },</div><div class='add'>+	{ 0xc8, 0x20 },</div><div class='add'>+	{ 0x79, 0x09 },</div><div class='add'>+	{ 0xc8, 0x80 },</div><div class='add'>+	{ 0x79, 0x02 },</div><div class='add'>+	{ 0xc8, 0xc0 },</div><div class='add'>+	{ 0x79, 0x03 },</div><div class='add'>+	{ 0xc8, 0x40 },</div><div class='add'>+	{ 0x79, 0x05 },</div><div class='add'>+	{ 0xc8, 0x30 },</div><div class='add'>+	{ 0x79, 0x26 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ov_i2c_regvals norm_8610[] = {</div><div class='add'>+	{ 0x12, 0x80 },</div><div class='add'>+	{ 0x00, 0x00 },</div><div class='add'>+	{ 0x01, 0x80 },</div><div class='add'>+	{ 0x02, 0x80 },</div><div class='add'>+	{ 0x03, 0xc0 },</div><div class='add'>+	{ 0x04, 0x30 },</div><div class='add'>+	{ 0x05, 0x30 }, /* was 0x10, new from windrv 090403 */</div><div class='add'>+	{ 0x06, 0x70 }, /* was 0x80, new from windrv 090403 */</div><div class='add'>+	{ 0x0a, 0x86 },</div><div class='add'>+	{ 0x0b, 0xb0 },</div><div class='add'>+	{ 0x0c, 0x20 },</div><div class='add'>+	{ 0x0d, 0x20 },</div><div class='add'>+	{ 0x11, 0x01 },</div><div class='add'>+	{ 0x12, 0x25 },</div><div class='add'>+	{ 0x13, 0x01 },</div><div class='add'>+	{ 0x14, 0x04 },</div><div class='add'>+	{ 0x15, 0x01 }, /* Lin and Win think different about UV order */</div><div class='add'>+	{ 0x16, 0x03 },</div><div class='add'>+	{ 0x17, 0x38 }, /* was 0x2f, new from windrv 090403 */</div><div class='add'>+	{ 0x18, 0xea }, /* was 0xcf, new from windrv 090403 */</div><div class='add'>+	{ 0x19, 0x02 }, /* was 0x06, new from windrv 090403 */</div><div class='add'>+	{ 0x1a, 0xf5 },</div><div class='add'>+	{ 0x1b, 0x00 },</div><div class='add'>+	{ 0x20, 0xd0 }, /* was 0x90, new from windrv 090403 */</div><div class='add'>+	{ 0x23, 0xc0 }, /* was 0x00, new from windrv 090403 */</div><div class='add'>+	{ 0x24, 0x30 }, /* was 0x1d, new from windrv 090403 */</div><div class='add'>+	{ 0x25, 0x50 }, /* was 0x57, new from windrv 090403 */</div><div class='add'>+	{ 0x26, 0xa2 },</div><div class='add'>+	{ 0x27, 0xea },</div><div class='add'>+	{ 0x28, 0x00 },</div><div class='add'>+	{ 0x29, 0x00 },</div><div class='add'>+	{ 0x2a, 0x80 },</div><div class='add'>+	{ 0x2b, 0xc8 }, /* was 0xcc, new from windrv 090403 */</div><div class='add'>+	{ 0x2c, 0xac },</div><div class='add'>+	{ 0x2d, 0x45 }, /* was 0xd5, new from windrv 090403 */</div><div class='add'>+	{ 0x2e, 0x80 },</div><div class='add'>+	{ 0x2f, 0x14 }, /* was 0x01, new from windrv 090403 */</div><div class='add'>+	{ 0x4c, 0x00 },</div><div class='add'>+	{ 0x4d, 0x30 }, /* was 0x10, new from windrv 090403 */</div><div class='add'>+	{ 0x60, 0x02 }, /* was 0x01, new from windrv 090403 */</div><div class='add'>+	{ 0x61, 0x00 }, /* was 0x09, new from windrv 090403 */</div><div class='add'>+	{ 0x62, 0x5f }, /* was 0xd7, new from windrv 090403 */</div><div class='add'>+	{ 0x63, 0xff },</div><div class='add'>+	{ 0x64, 0x53 }, /* new windrv 090403 says 0x57,</div><div class='add'>+			 * maybe thats wrong */</div><div class='add'>+	{ 0x65, 0x00 },</div><div class='add'>+	{ 0x66, 0x55 },</div><div class='add'>+	{ 0x67, 0xb0 },</div><div class='add'>+	{ 0x68, 0xc0 }, /* was 0xaf, new from windrv 090403 */</div><div class='add'>+	{ 0x69, 0x02 },</div><div class='add'>+	{ 0x6a, 0x22 },</div><div class='add'>+	{ 0x6b, 0x00 },</div><div class='add'>+	{ 0x6c, 0x99 }, /* was 0x80, old windrv says 0x00, but</div><div class='add'>+			 * deleting bit7 colors the first images red */</div><div class='add'>+	{ 0x6d, 0x11 }, /* was 0x00, new from windrv 090403 */</div><div class='add'>+	{ 0x6e, 0x11 }, /* was 0x00, new from windrv 090403 */</div><div class='add'>+	{ 0x6f, 0x01 },</div><div class='add'>+	{ 0x70, 0x8b },</div><div class='add'>+	{ 0x71, 0x00 },</div><div class='add'>+	{ 0x72, 0x14 },</div><div class='add'>+	{ 0x73, 0x54 },</div><div class='add'>+	{ 0x74, 0x00 },/* 0x60? - was 0x00, new from windrv 090403 */</div><div class='add'>+	{ 0x75, 0x0e },</div><div class='add'>+	{ 0x76, 0x02 }, /* was 0x02, new from windrv 090403 */</div><div class='add'>+	{ 0x77, 0xff },</div><div class='add'>+	{ 0x78, 0x80 },</div><div class='add'>+	{ 0x79, 0x80 },</div><div class='add'>+	{ 0x7a, 0x80 },</div><div class='add'>+	{ 0x7b, 0x10 }, /* was 0x13, new from windrv 090403 */</div><div class='add'>+	{ 0x7c, 0x00 },</div><div class='add'>+	{ 0x7d, 0x08 }, /* was 0x09, new from windrv 090403 */</div><div class='add'>+	{ 0x7e, 0x08 }, /* was 0xc0, new from windrv 090403 */</div><div class='add'>+	{ 0x7f, 0xfb },</div><div class='add'>+	{ 0x80, 0x28 },</div><div class='add'>+	{ 0x81, 0x00 },</div><div class='add'>+	{ 0x82, 0x23 },</div><div class='add'>+	{ 0x83, 0x0b },</div><div class='add'>+	{ 0x84, 0x00 },</div><div class='add'>+	{ 0x85, 0x62 }, /* was 0x61, new from windrv 090403 */</div><div class='add'>+	{ 0x86, 0xc9 },</div><div class='add'>+	{ 0x87, 0x00 },</div><div class='add'>+	{ 0x88, 0x00 },</div><div class='add'>+	{ 0x89, 0x01 },</div><div class='add'>+	{ 0x12, 0x20 },</div><div class='add'>+	{ 0x12, 0x25 }, /* was 0x24, new from windrv 090403 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static unsigned char ov7670_abs_to_sm(unsigned char v)</div><div class='hunk'>@@ -499,19 +1060,6 @@ static int init_ov_sensor(struct sd *sd)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Switch on standard JPEG compression. Returns 0 for success. */</div><div class='del'>-static int ov519_init_compression(struct sd *sd)</div><div class='del'>-{</div><div class='del'>-	if (!sd-&gt;compress_inited) {</div><div class='del'>-		if (reg_w_mask(sd, OV519_SYS_EN_CLK1, 1 &lt;&lt; 2, 1 &lt;&lt; 2) &lt; 0) {</div><div class='del'>-			PDEBUG(D_ERR, "Error switching to compressed mode");</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-		sd-&gt;compress_inited = 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Set the read and write slave IDs. The "slave" argument is the write slave,</div><div class='ctx'>  * and the read slave will be set to (slave + 1).</div><div class='ctx'>  * This should not be called from outside the i2c I/O functions.</div><div class='hunk'>@@ -525,18 +1073,10 @@ static int ov51x_set_slave_ids(struct sd *sd,</div><div class='ctx'> 	rc = reg_w(sd, R51x_I2C_W_SID, slave);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='add'>+	sd-&gt;primary_i2c_slave = slave;</div><div class='ctx'> 	return reg_w(sd, R51x_I2C_R_SID, slave + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ov_regvals {</div><div class='del'>-	__u8 reg;</div><div class='del'>-	__u8 val;</div><div class='del'>-};</div><div class='del'>-struct ov_i2c_regvals {</div><div class='del'>-	__u8 reg;</div><div class='del'>-	__u8 val;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int write_regvals(struct sd *sd,</div><div class='ctx'> 			 const struct ov_regvals *regvals,</div><div class='ctx'> 			 int n)</div><div class='hunk'>@@ -579,101 +1119,9 @@ static int write_i2c_regvals(struct sd *sd,</div><div class='ctx'> static int ov8xx0_configure(struct sd *sd)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='del'>-	static const struct ov_i2c_regvals norm_8610[] = {</div><div class='del'>-		{ 0x12, 0x80 },</div><div class='del'>-		{ 0x00, 0x00 },</div><div class='del'>-		{ 0x01, 0x80 },</div><div class='del'>-		{ 0x02, 0x80 },</div><div class='del'>-		{ 0x03, 0xc0 },</div><div class='del'>-		{ 0x04, 0x30 },</div><div class='del'>-		{ 0x05, 0x30 }, /* was 0x10, new from windrv 090403 */</div><div class='del'>-		{ 0x06, 0x70 }, /* was 0x80, new from windrv 090403 */</div><div class='del'>-		{ 0x0a, 0x86 },</div><div class='del'>-		{ 0x0b, 0xb0 },</div><div class='del'>-		{ 0x0c, 0x20 },</div><div class='del'>-		{ 0x0d, 0x20 },</div><div class='del'>-		{ 0x11, 0x01 },</div><div class='del'>-		{ 0x12, 0x25 },</div><div class='del'>-		{ 0x13, 0x01 },</div><div class='del'>-		{ 0x14, 0x04 },</div><div class='del'>-		{ 0x15, 0x01 }, /* Lin and Win think different about UV order */</div><div class='del'>-		{ 0x16, 0x03 },</div><div class='del'>-		{ 0x17, 0x38 }, /* was 0x2f, new from windrv 090403 */</div><div class='del'>-		{ 0x18, 0xea }, /* was 0xcf, new from windrv 090403 */</div><div class='del'>-		{ 0x19, 0x02 }, /* was 0x06, new from windrv 090403 */</div><div class='del'>-		{ 0x1a, 0xf5 },</div><div class='del'>-		{ 0x1b, 0x00 },</div><div class='del'>-		{ 0x20, 0xd0 }, /* was 0x90, new from windrv 090403 */</div><div class='del'>-		{ 0x23, 0xc0 }, /* was 0x00, new from windrv 090403 */</div><div class='del'>-		{ 0x24, 0x30 }, /* was 0x1d, new from windrv 090403 */</div><div class='del'>-		{ 0x25, 0x50 }, /* was 0x57, new from windrv 090403 */</div><div class='del'>-		{ 0x26, 0xa2 },</div><div class='del'>-		{ 0x27, 0xea },</div><div class='del'>-		{ 0x28, 0x00 },</div><div class='del'>-		{ 0x29, 0x00 },</div><div class='del'>-		{ 0x2a, 0x80 },</div><div class='del'>-		{ 0x2b, 0xc8 }, /* was 0xcc, new from windrv 090403 */</div><div class='del'>-		{ 0x2c, 0xac },</div><div class='del'>-		{ 0x2d, 0x45 }, /* was 0xd5, new from windrv 090403 */</div><div class='del'>-		{ 0x2e, 0x80 },</div><div class='del'>-		{ 0x2f, 0x14 }, /* was 0x01, new from windrv 090403 */</div><div class='del'>-		{ 0x4c, 0x00 },</div><div class='del'>-		{ 0x4d, 0x30 }, /* was 0x10, new from windrv 090403 */</div><div class='del'>-		{ 0x60, 0x02 }, /* was 0x01, new from windrv 090403 */</div><div class='del'>-		{ 0x61, 0x00 }, /* was 0x09, new from windrv 090403 */</div><div class='del'>-		{ 0x62, 0x5f }, /* was 0xd7, new from windrv 090403 */</div><div class='del'>-		{ 0x63, 0xff },</div><div class='del'>-		{ 0x64, 0x53 }, /* new windrv 090403 says 0x57,</div><div class='del'>-				 * maybe thats wrong */</div><div class='del'>-		{ 0x65, 0x00 },</div><div class='del'>-		{ 0x66, 0x55 },</div><div class='del'>-		{ 0x67, 0xb0 },</div><div class='del'>-		{ 0x68, 0xc0 }, /* was 0xaf, new from windrv 090403 */</div><div class='del'>-		{ 0x69, 0x02 },</div><div class='del'>-		{ 0x6a, 0x22 },</div><div class='del'>-		{ 0x6b, 0x00 },</div><div class='del'>-		{ 0x6c, 0x99 }, /* was 0x80, old windrv says 0x00, but</div><div class='del'>-				   deleting bit7 colors the first images red */</div><div class='del'>-		{ 0x6d, 0x11 }, /* was 0x00, new from windrv 090403 */</div><div class='del'>-		{ 0x6e, 0x11 }, /* was 0x00, new from windrv 090403 */</div><div class='del'>-		{ 0x6f, 0x01 },</div><div class='del'>-		{ 0x70, 0x8b },</div><div class='del'>-		{ 0x71, 0x00 },</div><div class='del'>-		{ 0x72, 0x14 },</div><div class='del'>-		{ 0x73, 0x54 },</div><div class='del'>-		{ 0x74, 0x00 },/* 0x60? - was 0x00, new from windrv 090403 */</div><div class='del'>-		{ 0x75, 0x0e },</div><div class='del'>-		{ 0x76, 0x02 }, /* was 0x02, new from windrv 090403 */</div><div class='del'>-		{ 0x77, 0xff },</div><div class='del'>-		{ 0x78, 0x80 },</div><div class='del'>-		{ 0x79, 0x80 },</div><div class='del'>-		{ 0x7a, 0x80 },</div><div class='del'>-		{ 0x7b, 0x10 }, /* was 0x13, new from windrv 090403 */</div><div class='del'>-		{ 0x7c, 0x00 },</div><div class='del'>-		{ 0x7d, 0x08 }, /* was 0x09, new from windrv 090403 */</div><div class='del'>-		{ 0x7e, 0x08 }, /* was 0xc0, new from windrv 090403 */</div><div class='del'>-		{ 0x7f, 0xfb },</div><div class='del'>-		{ 0x80, 0x28 },</div><div class='del'>-		{ 0x81, 0x00 },</div><div class='del'>-		{ 0x82, 0x23 },</div><div class='del'>-		{ 0x83, 0x0b },</div><div class='del'>-		{ 0x84, 0x00 },</div><div class='del'>-		{ 0x85, 0x62 }, /* was 0x61, new from windrv 090403 */</div><div class='del'>-		{ 0x86, 0xc9 },</div><div class='del'>-		{ 0x87, 0x00 },</div><div class='del'>-		{ 0x88, 0x00 },</div><div class='del'>-		{ 0x89, 0x01 },</div><div class='del'>-		{ 0x12, 0x20 },</div><div class='del'>-		{ 0x12, 0x25 }, /* was 0x24, new from windrv 090403 */</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	PDEBUG(D_PROBE, "starting ov8xx0 configuration");</div><div class='ctx'> </div><div class='del'>-	if (init_ov_sensor(sd) &lt; 0)</div><div class='del'>-		PDEBUG(D_ERR|D_PROBE, "Failed to read sensor ID");</div><div class='del'>-	else</div><div class='del'>-		PDEBUG(D_PROBE, "OV86x0 initialized");</div><div class='del'>-</div><div class='ctx'> 	/* Detect sensor (sub)type */</div><div class='ctx'> 	rc = i2c_r(sd, OV7610_REG_COM_I);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='hunk'>@@ -681,21 +1129,14 @@ static int ov8xx0_configure(struct sd *sd)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((rc &amp; 3) == 1) {</div><div class='del'>-		PDEBUG(D_PROBE, "Sensor is an OV8610");</div><div class='ctx'> 		sd-&gt;sensor = SEN_OV8610;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		PDEBUG(D_ERR, "Unknown image sensor version: %d", rc &amp; 3);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='del'>-	PDEBUG(D_PROBE, "Writing 8610 registers");</div><div class='del'>-	if (write_i2c_regvals(sd,</div><div class='del'>-			norm_8610,</div><div class='del'>-			sizeof norm_8610 / sizeof norm_8610[0]))</div><div class='del'>-		return -1;</div><div class='ctx'> </div><div class='ctx'> 	/* Set sensor-specific vars */</div><div class='del'>-	sd-&gt;maxwidth = 640;</div><div class='del'>-	sd-&gt;maxheight = 480;</div><div class='add'>+/*	sd-&gt;sif = 0;		already done */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -706,280 +1147,9 @@ static int ov7xx0_configure(struct sd *sd)</div><div class='ctx'> {</div><div class='ctx'> 	int rc, high, low;</div><div class='ctx'> </div><div class='del'>-	/* Lawrence Glaister &lt;lg@jfm.bc.ca&gt; reports:</div><div class='del'>-	 *</div><div class='del'>-	 * Register 0x0f in the 7610 has the following effects:</div><div class='del'>-	 *</div><div class='del'>-	 * 0x85 (AEC method 1): Best overall, good contrast range</div><div class='del'>-	 * 0x45 (AEC method 2): Very overexposed</div><div class='del'>-	 * 0xa5 (spec sheet default): Ok, but the black level is</div><div class='del'>-	 *	shifted resulting in loss of contrast</div><div class='del'>-	 * 0x05 (old driver setting): very overexposed, too much</div><div class='del'>-	 *	contrast</div><div class='del'>-	 */</div><div class='del'>-	static const struct ov_i2c_regvals norm_7610[] = {</div><div class='del'>-		{ 0x10, 0xff },</div><div class='del'>-		{ 0x16, 0x06 },</div><div class='del'>-		{ 0x28, 0x24 },</div><div class='del'>-		{ 0x2b, 0xac },</div><div class='del'>-		{ 0x12, 0x00 },</div><div class='del'>-		{ 0x38, 0x81 },</div><div class='del'>-		{ 0x28, 0x24 },	/* 0c */</div><div class='del'>-		{ 0x0f, 0x85 },	/* lg's setting */</div><div class='del'>-		{ 0x15, 0x01 },</div><div class='del'>-		{ 0x20, 0x1c },</div><div class='del'>-		{ 0x23, 0x2a },</div><div class='del'>-		{ 0x24, 0x10 },</div><div class='del'>-		{ 0x25, 0x8a },</div><div class='del'>-		{ 0x26, 0xa2 },</div><div class='del'>-		{ 0x27, 0xc2 },</div><div class='del'>-		{ 0x2a, 0x04 },</div><div class='del'>-		{ 0x2c, 0xfe },</div><div class='del'>-		{ 0x2d, 0x93 },</div><div class='del'>-		{ 0x30, 0x71 },</div><div class='del'>-		{ 0x31, 0x60 },</div><div class='del'>-		{ 0x32, 0x26 },</div><div class='del'>-		{ 0x33, 0x20 },</div><div class='del'>-		{ 0x34, 0x48 },</div><div class='del'>-		{ 0x12, 0x24 },</div><div class='del'>-		{ 0x11, 0x01 },</div><div class='del'>-		{ 0x0c, 0x24 },</div><div class='del'>-		{ 0x0d, 0x24 },</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	static const struct ov_i2c_regvals norm_7620[] = {</div><div class='del'>-		{ 0x00, 0x00 },		/* gain */</div><div class='del'>-		{ 0x01, 0x80 },		/* blue gain */</div><div class='del'>-		{ 0x02, 0x80 },		/* red gain */</div><div class='del'>-		{ 0x03, 0xc0 },		/* OV7670_REG_VREF */</div><div class='del'>-		{ 0x06, 0x60 },</div><div class='del'>-		{ 0x07, 0x00 },</div><div class='del'>-		{ 0x0c, 0x24 },</div><div class='del'>-		{ 0x0c, 0x24 },</div><div class='del'>-		{ 0x0d, 0x24 },</div><div class='del'>-		{ 0x11, 0x01 },</div><div class='del'>-		{ 0x12, 0x24 },</div><div class='del'>-		{ 0x13, 0x01 },</div><div class='del'>-		{ 0x14, 0x84 },</div><div class='del'>-		{ 0x15, 0x01 },</div><div class='del'>-		{ 0x16, 0x03 },</div><div class='del'>-		{ 0x17, 0x2f },</div><div class='del'>-		{ 0x18, 0xcf },</div><div class='del'>-		{ 0x19, 0x06 },</div><div class='del'>-		{ 0x1a, 0xf5 },</div><div class='del'>-		{ 0x1b, 0x00 },</div><div class='del'>-		{ 0x20, 0x18 },</div><div class='del'>-		{ 0x21, 0x80 },</div><div class='del'>-		{ 0x22, 0x80 },</div><div class='del'>-		{ 0x23, 0x00 },</div><div class='del'>-		{ 0x26, 0xa2 },</div><div class='del'>-		{ 0x27, 0xea },</div><div class='del'>-		{ 0x28, 0x20 },</div><div class='del'>-		{ 0x29, 0x00 },</div><div class='del'>-		{ 0x2a, 0x10 },</div><div class='del'>-		{ 0x2b, 0x00 },</div><div class='del'>-		{ 0x2c, 0x88 },</div><div class='del'>-		{ 0x2d, 0x91 },</div><div class='del'>-		{ 0x2e, 0x80 },</div><div class='del'>-		{ 0x2f, 0x44 },</div><div class='del'>-		{ 0x60, 0x27 },</div><div class='del'>-		{ 0x61, 0x02 },</div><div class='del'>-		{ 0x62, 0x5f },</div><div class='del'>-		{ 0x63, 0xd5 },</div><div class='del'>-		{ 0x64, 0x57 },</div><div class='del'>-		{ 0x65, 0x83 },</div><div class='del'>-		{ 0x66, 0x55 },</div><div class='del'>-		{ 0x67, 0x92 },</div><div class='del'>-		{ 0x68, 0xcf },</div><div class='del'>-		{ 0x69, 0x76 },</div><div class='del'>-		{ 0x6a, 0x22 },</div><div class='del'>-		{ 0x6b, 0x00 },</div><div class='del'>-		{ 0x6c, 0x02 },</div><div class='del'>-		{ 0x6d, 0x44 },</div><div class='del'>-		{ 0x6e, 0x80 },</div><div class='del'>-		{ 0x6f, 0x1d },</div><div class='del'>-		{ 0x70, 0x8b },</div><div class='del'>-		{ 0x71, 0x00 },</div><div class='del'>-		{ 0x72, 0x14 },</div><div class='del'>-		{ 0x73, 0x54 },</div><div class='del'>-		{ 0x74, 0x00 },</div><div class='del'>-		{ 0x75, 0x8e },</div><div class='del'>-		{ 0x76, 0x00 },</div><div class='del'>-		{ 0x77, 0xff },</div><div class='del'>-		{ 0x78, 0x80 },</div><div class='del'>-		{ 0x79, 0x80 },</div><div class='del'>-		{ 0x7a, 0x80 },</div><div class='del'>-		{ 0x7b, 0xe2 },</div><div class='del'>-		{ 0x7c, 0x00 },</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* 7640 and 7648. The defaults should be OK for most registers. */</div><div class='del'>-	static const struct ov_i2c_regvals norm_7640[] = {</div><div class='del'>-		{ 0x12, 0x80 },</div><div class='del'>-		{ 0x12, 0x14 },</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* 7670. Defaults taken from OmniVision provided data,</div><div class='del'>-	*  as provided by Jonathan Corbet of OLPC		*/</div><div class='del'>-	static const struct ov_i2c_regvals norm_7670[] = {</div><div class='del'>-		{ OV7670_REG_COM7, OV7670_COM7_RESET },</div><div class='del'>-		{ OV7670_REG_TSLB, 0x04 },		/* OV */</div><div class='del'>-		{ OV7670_REG_COM7, OV7670_COM7_FMT_VGA }, /* VGA */</div><div class='del'>-		{ OV7670_REG_CLKRC, 0x1 },</div><div class='del'>-	/*</div><div class='del'>-	 * Set the hardware window.  These values from OV don't entirely</div><div class='del'>-	 * make sense - hstop is less than hstart.  But they work...</div><div class='del'>-	 */</div><div class='del'>-		{ OV7670_REG_HSTART, 0x13 },	{ OV7670_REG_HSTOP, 0x01 },</div><div class='del'>-		{ OV7670_REG_HREF, 0xb6 },	{ OV7670_REG_VSTART, 0x02 },</div><div class='del'>-		{ OV7670_REG_VSTOP, 0x7a },	{ OV7670_REG_VREF, 0x0a },</div><div class='del'>-</div><div class='del'>-		{ OV7670_REG_COM3, 0 },	{ OV7670_REG_COM14, 0 },</div><div class='del'>-	/* Mystery scaling numbers */</div><div class='del'>-		{ 0x70, 0x3a },		{ 0x71, 0x35 },</div><div class='del'>-		{ 0x72, 0x11 },		{ 0x73, 0xf0 },</div><div class='del'>-		{ 0xa2, 0x02 },</div><div class='del'>-/* jfm */</div><div class='del'>-/* { OV7670_REG_COM10, 0x0 }, */</div><div class='del'>-</div><div class='del'>-	/* Gamma curve values */</div><div class='del'>-		{ 0x7a, 0x20 },</div><div class='del'>-/* jfm:win 7b=1c */</div><div class='del'>-		{ 0x7b, 0x10 },</div><div class='del'>-/* jfm:win 7c=28 */</div><div class='del'>-		{ 0x7c, 0x1e },</div><div class='del'>-/* jfm:win 7d=3c */</div><div class='del'>-		{ 0x7d, 0x35 },</div><div class='del'>-		{ 0x7e, 0x5a },		{ 0x7f, 0x69 },</div><div class='del'>-		{ 0x80, 0x76 },		{ 0x81, 0x80 },</div><div class='del'>-		{ 0x82, 0x88 },		{ 0x83, 0x8f },</div><div class='del'>-		{ 0x84, 0x96 },		{ 0x85, 0xa3 },</div><div class='del'>-		{ 0x86, 0xaf },		{ 0x87, 0xc4 },</div><div class='del'>-		{ 0x88, 0xd7 },		{ 0x89, 0xe8 },</div><div class='del'>-</div><div class='del'>-	/* AGC and AEC parameters.  Note we start by disabling those features,</div><div class='del'>-	   then turn them only after tweaking the values. */</div><div class='del'>-		{ OV7670_REG_COM8, OV7670_COM8_FASTAEC</div><div class='del'>-				 | OV7670_COM8_AECSTEP</div><div class='del'>-				 | OV7670_COM8_BFILT },</div><div class='del'>-		{ OV7670_REG_GAIN, 0 },	{ OV7670_REG_AECH, 0 },</div><div class='del'>-		{ OV7670_REG_COM4, 0x40 }, /* magic reserved bit */</div><div class='del'>-/* jfm:win 14=38 */</div><div class='del'>-		{ OV7670_REG_COM9, 0x18 }, /* 4x gain + magic rsvd bit */</div><div class='del'>-		{ OV7670_REG_BD50MAX, 0x05 },	{ OV7670_REG_BD60MAX, 0x07 },</div><div class='del'>-		{ OV7670_REG_AEW, 0x95 },	{ OV7670_REG_AEB, 0x33 },</div><div class='del'>-		{ OV7670_REG_VPT, 0xe3 },	{ OV7670_REG_HAECC1, 0x78 },</div><div class='del'>-		{ OV7670_REG_HAECC2, 0x68 },</div><div class='del'>-/* jfm:win a1=0b */</div><div class='del'>-		{ 0xa1, 0x03 }, /* magic */</div><div class='del'>-		{ OV7670_REG_HAECC3, 0xd8 },	{ OV7670_REG_HAECC4, 0xd8 },</div><div class='del'>-		{ OV7670_REG_HAECC5, 0xf0 },	{ OV7670_REG_HAECC6, 0x90 },</div><div class='del'>-		{ OV7670_REG_HAECC7, 0x94 },</div><div class='del'>-		{ OV7670_REG_COM8, OV7670_COM8_FASTAEC</div><div class='del'>-				| OV7670_COM8_AECSTEP</div><div class='del'>-				| OV7670_COM8_BFILT</div><div class='del'>-				| OV7670_COM8_AGC</div><div class='del'>-				| OV7670_COM8_AEC },</div><div class='del'>-</div><div class='del'>-	/* Almost all of these are magic "reserved" values.  */</div><div class='del'>-		{ OV7670_REG_COM5, 0x61 },	{ OV7670_REG_COM6, 0x4b },</div><div class='del'>-		{ 0x16, 0x02 },</div><div class='del'>-/* jfm */</div><div class='del'>-/*		{ OV7670_REG_MVFP, 0x07|OV7670_MVFP_MIRROR }, */</div><div class='del'>-		{ OV7670_REG_MVFP, 0x07 },</div><div class='del'>-		{ 0x21, 0x02 },		{ 0x22, 0x91 },</div><div class='del'>-		{ 0x29, 0x07 },		{ 0x33, 0x0b },</div><div class='del'>-		{ 0x35, 0x0b },		{ 0x37, 0x1d },</div><div class='del'>-		{ 0x38, 0x71 },		{ 0x39, 0x2a },</div><div class='del'>-		{ OV7670_REG_COM12, 0x78 },	{ 0x4d, 0x40 },</div><div class='del'>-		{ 0x4e, 0x20 },		{ OV7670_REG_GFIX, 0 },</div><div class='del'>-		{ 0x6b, 0x4a },		{ 0x74, 0x10 },</div><div class='del'>-		{ 0x8d, 0x4f },		{ 0x8e, 0 },</div><div class='del'>-		{ 0x8f, 0 },		{ 0x90, 0 },</div><div class='del'>-		{ 0x91, 0 },		{ 0x96, 0 },</div><div class='del'>-		{ 0x9a, 0 },		{ 0xb0, 0x84 },</div><div class='del'>-		{ 0xb1, 0x0c },		{ 0xb2, 0x0e },</div><div class='del'>-		{ 0xb3, 0x82 },		{ 0xb8, 0x0a },</div><div class='del'>-</div><div class='del'>-	/* More reserved magic, some of which tweaks white balance */</div><div class='del'>-		{ 0x43, 0x0a },		{ 0x44, 0xf0 },</div><div class='del'>-		{ 0x45, 0x34 },		{ 0x46, 0x58 },</div><div class='del'>-		{ 0x47, 0x28 },		{ 0x48, 0x3a },</div><div class='del'>-		{ 0x59, 0x88 },		{ 0x5a, 0x88 },</div><div class='del'>-		{ 0x5b, 0x44 },		{ 0x5c, 0x67 },</div><div class='del'>-		{ 0x5d, 0x49 },		{ 0x5e, 0x0e },</div><div class='del'>-		{ 0x6c, 0x0a },		{ 0x6d, 0x55 },</div><div class='del'>-		{ 0x6e, 0x11 },		{ 0x6f, 0x9f },</div><div class='del'>-						/* "9e for advance AWB" */</div><div class='del'>-		{ 0x6a, 0x40 },		{ OV7670_REG_BLUE, 0x40 },</div><div class='del'>-		{ OV7670_REG_RED, 0x60 },</div><div class='del'>-		{ OV7670_REG_COM8, OV7670_COM8_FASTAEC</div><div class='del'>-				| OV7670_COM8_AECSTEP</div><div class='del'>-				| OV7670_COM8_BFILT</div><div class='del'>-				| OV7670_COM8_AGC</div><div class='del'>-				| OV7670_COM8_AEC</div><div class='del'>-				| OV7670_COM8_AWB },</div><div class='del'>-</div><div class='del'>-	/* Matrix coefficients */</div><div class='del'>-		{ 0x4f, 0x80 },		{ 0x50, 0x80 },</div><div class='del'>-		{ 0x51, 0 },		{ 0x52, 0x22 },</div><div class='del'>-		{ 0x53, 0x5e },		{ 0x54, 0x80 },</div><div class='del'>-		{ 0x58, 0x9e },</div><div class='del'>-</div><div class='del'>-		{ OV7670_REG_COM16, OV7670_COM16_AWBGAIN },</div><div class='del'>-		{ OV7670_REG_EDGE, 0 },</div><div class='del'>-		{ 0x75, 0x05 },		{ 0x76, 0xe1 },</div><div class='del'>-		{ 0x4c, 0 },		{ 0x77, 0x01 },</div><div class='del'>-		{ OV7670_REG_COM13, 0xc3 },	{ 0x4b, 0x09 },</div><div class='del'>-		{ 0xc9, 0x60 },		{ OV7670_REG_COM16, 0x38 },</div><div class='del'>-		{ 0x56, 0x40 },</div><div class='del'>-</div><div class='del'>-		{ 0x34, 0x11 },</div><div class='del'>-		{ OV7670_REG_COM11, OV7670_COM11_EXP|OV7670_COM11_HZAUTO },</div><div class='del'>-		{ 0xa4, 0x88 },		{ 0x96, 0 },</div><div class='del'>-		{ 0x97, 0x30 },		{ 0x98, 0x20 },</div><div class='del'>-		{ 0x99, 0x30 },		{ 0x9a, 0x84 },</div><div class='del'>-		{ 0x9b, 0x29 },		{ 0x9c, 0x03 },</div><div class='del'>-		{ 0x9d, 0x4c },		{ 0x9e, 0x3f },</div><div class='del'>-		{ 0x78, 0x04 },</div><div class='del'>-</div><div class='del'>-	/* Extra-weird stuff.  Some sort of multiplexor register */</div><div class='del'>-		{ 0x79, 0x01 },		{ 0xc8, 0xf0 },</div><div class='del'>-		{ 0x79, 0x0f },		{ 0xc8, 0x00 },</div><div class='del'>-		{ 0x79, 0x10 },		{ 0xc8, 0x7e },</div><div class='del'>-		{ 0x79, 0x0a },		{ 0xc8, 0x80 },</div><div class='del'>-		{ 0x79, 0x0b },		{ 0xc8, 0x01 },</div><div class='del'>-		{ 0x79, 0x0c },		{ 0xc8, 0x0f },</div><div class='del'>-		{ 0x79, 0x0d },		{ 0xc8, 0x20 },</div><div class='del'>-		{ 0x79, 0x09 },		{ 0xc8, 0x80 },</div><div class='del'>-		{ 0x79, 0x02 },		{ 0xc8, 0xc0 },</div><div class='del'>-		{ 0x79, 0x03 },		{ 0xc8, 0x40 },</div><div class='del'>-		{ 0x79, 0x05 },		{ 0xc8, 0x30 },</div><div class='del'>-		{ 0x79, 0x26 },</div><div class='del'>-</div><div class='del'>-	/* Format YUV422 */</div><div class='del'>-		{ OV7670_REG_COM7, OV7670_COM7_YUV },  /* Selects YUV mode */</div><div class='del'>-		{ OV7670_REG_RGB444, 0 },	/* No RGB444 please */</div><div class='del'>-		{ OV7670_REG_COM1, 0 },</div><div class='del'>-		{ OV7670_REG_COM15, OV7670_COM15_R00FF },</div><div class='del'>-		{ OV7670_REG_COM9, 0x18 },</div><div class='del'>-				/* 4x gain ceiling; 0x8 is reserved bit */</div><div class='del'>-		{ 0x4f, 0x80 }, 	/* "matrix coefficient 1" */</div><div class='del'>-		{ 0x50, 0x80 }, 	/* "matrix coefficient 2" */</div><div class='del'>-		{ 0x52, 0x22 }, 	/* "matrix coefficient 4" */</div><div class='del'>-		{ 0x53, 0x5e }, 	/* "matrix coefficient 5" */</div><div class='del'>-		{ 0x54, 0x80 }, 	/* "matrix coefficient 6" */</div><div class='del'>-		{ OV7670_REG_COM13, OV7670_COM13_GAMMA|OV7670_COM13_UVSAT },</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> 	PDEBUG(D_PROBE, "starting OV7xx0 configuration");</div><div class='ctx'> </div><div class='del'>-/* jfm:already done? */</div><div class='del'>-	if (init_ov_sensor(sd) &lt; 0)</div><div class='del'>-		PDEBUG(D_ERR, "Failed to read sensor ID");</div><div class='del'>-	else</div><div class='del'>-		PDEBUG(D_PROBE, "OV7xx0 initialized");</div><div class='del'>-</div><div class='ctx'> 	/* Detect sensor (sub)type */</div><div class='ctx'> 	rc = i2c_r(sd, OV7610_REG_COM_I);</div><div class='ctx'> </div><div class='hunk'>@@ -1025,20 +1195,26 @@ static int ov7xx0_configure(struct sd *sd)</div><div class='ctx'> 			return low;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (high == 0x76) {</div><div class='del'>-			if (low == 0x30) {</div><div class='add'>+			switch (low) {</div><div class='add'>+			case 0x30:</div><div class='ctx'> 				PDEBUG(D_PROBE, "Sensor is an OV7630/OV7635");</div><div class='del'>-				sd-&gt;sensor = SEN_OV7630;</div><div class='del'>-			} else if (low == 0x40) {</div><div class='add'>+				PDEBUG(D_ERR,</div><div class='add'>+				      "7630 is not supported by this driver");</div><div class='add'>+				return -1;</div><div class='add'>+			case 0x40:</div><div class='ctx'> 				PDEBUG(D_PROBE, "Sensor is an OV7645");</div><div class='ctx'> 				sd-&gt;sensor = SEN_OV7640; /* FIXME */</div><div class='del'>-			} else if (low == 0x45) {</div><div class='add'>+				break;</div><div class='add'>+			case 0x45:</div><div class='ctx'> 				PDEBUG(D_PROBE, "Sensor is an OV7645B");</div><div class='ctx'> 				sd-&gt;sensor = SEN_OV7640; /* FIXME */</div><div class='del'>-			} else if (low == 0x48) {</div><div class='add'>+				break;</div><div class='add'>+			case 0x48:</div><div class='ctx'> 				PDEBUG(D_PROBE, "Sensor is an OV7648");</div><div class='ctx'> 				sd-&gt;sensor = SEN_OV7640; /* FIXME */</div><div class='del'>-			} else {</div><div class='del'>-				PDEBUG(D_PROBE, "Unknown sensor: 0x76%X", low);</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				PDEBUG(D_PROBE, "Unknown sensor: 0x76%x", low);</div><div class='ctx'> 				return -1;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1050,34 +1226,8 @@ static int ov7xx0_configure(struct sd *sd)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sd-&gt;sensor == SEN_OV7620) {</div><div class='del'>-		PDEBUG(D_PROBE, "Writing 7620 registers");</div><div class='del'>-		if (write_i2c_regvals(sd, norm_7620,</div><div class='del'>-				sizeof norm_7620 / sizeof norm_7620[0]))</div><div class='del'>-			return -1;</div><div class='del'>-	} else if (sd-&gt;sensor == SEN_OV7630) {</div><div class='del'>-		PDEBUG(D_ERR, "7630 is not supported by this driver version");</div><div class='del'>-		return -1;</div><div class='del'>-	} else if (sd-&gt;sensor == SEN_OV7640) {</div><div class='del'>-		PDEBUG(D_PROBE, "Writing 7640 registers");</div><div class='del'>-		if (write_i2c_regvals(sd, norm_7640,</div><div class='del'>-				sizeof norm_7640 / sizeof norm_7640[0]))</div><div class='del'>-			return -1;</div><div class='del'>-	} else if (sd-&gt;sensor == SEN_OV7670) {</div><div class='del'>-		PDEBUG(D_PROBE, "Writing 7670 registers");</div><div class='del'>-		if (write_i2c_regvals(sd, norm_7670,</div><div class='del'>-				sizeof norm_7670 / sizeof norm_7670[0]))</div><div class='del'>-			return -1;</div><div class='del'>-	} else {</div><div class='del'>-		PDEBUG(D_PROBE, "Writing 7610 registers");</div><div class='del'>-		if (write_i2c_regvals(sd, norm_7610,</div><div class='del'>-				sizeof norm_7610 / sizeof norm_7610[0]))</div><div class='del'>-			return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Set sensor-specific vars */</div><div class='del'>-	sd-&gt;maxwidth = 640;</div><div class='del'>-	sd-&gt;maxheight = 480;</div><div class='add'>+/*	sd-&gt;sif = 0;		already done */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1085,141 +1235,7 @@ static int ov7xx0_configure(struct sd *sd)</div><div class='ctx'> static int ov6xx0_configure(struct sd *sd)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='del'>-	static const struct ov_i2c_regvals norm_6x20[] = {</div><div class='del'>-		{ 0x12, 0x80 }, /* reset */</div><div class='del'>-		{ 0x11, 0x01 },</div><div class='del'>-		{ 0x03, 0x60 },</div><div class='del'>-		{ 0x05, 0x7f }, /* For when autoadjust is off */</div><div class='del'>-		{ 0x07, 0xa8 },</div><div class='del'>-		/* The ratio of 0x0c and 0x0d  controls the white point */</div><div class='del'>-		{ 0x0c, 0x24 },</div><div class='del'>-		{ 0x0d, 0x24 },</div><div class='del'>-		{ 0x0f, 0x15 }, /* COMS */</div><div class='del'>-		{ 0x10, 0x75 }, /* AEC Exposure time */</div><div class='del'>-		{ 0x12, 0x24 }, /* Enable AGC */</div><div class='del'>-		{ 0x14, 0x04 },</div><div class='del'>-		/* 0x16: 0x06 helps frame stability with moving objects */</div><div class='del'>-		{ 0x16, 0x06 },</div><div class='del'>-/*		{ 0x20, 0x30 },  * Aperture correction enable */</div><div class='del'>-		{ 0x26, 0xb2 }, /* BLC enable */</div><div class='del'>-		/* 0x28: 0x05 Selects RGB format if RGB on */</div><div class='del'>-		{ 0x28, 0x05 },</div><div class='del'>-		{ 0x2a, 0x04 }, /* Disable framerate adjust */</div><div class='del'>-/*		{ 0x2b, 0xac },  * Framerate; Set 2a[7] first */</div><div class='del'>-		{ 0x2d, 0x99 },</div><div class='del'>-		{ 0x33, 0xa0 }, /* Color Processing Parameter */</div><div class='del'>-		{ 0x34, 0xd2 }, /* Max A/D range */</div><div class='del'>-		{ 0x38, 0x8b },</div><div class='del'>-		{ 0x39, 0x40 },</div><div class='del'>-</div><div class='del'>-		{ 0x3c, 0x39 }, /* Enable AEC mode changing */</div><div class='del'>-		{ 0x3c, 0x3c }, /* Change AEC mode */</div><div class='del'>-		{ 0x3c, 0x24 }, /* Disable AEC mode changing */</div><div class='del'>-</div><div class='del'>-		{ 0x3d, 0x80 },</div><div class='del'>-		/* These next two registers (0x4a, 0x4b) are undocumented.</div><div class='del'>-		 * They control the color balance */</div><div class='del'>-		{ 0x4a, 0x80 },</div><div class='del'>-		{ 0x4b, 0x80 },</div><div class='del'>-		{ 0x4d, 0xd2 }, /* This reduces noise a bit */</div><div class='del'>-		{ 0x4e, 0xc1 },</div><div class='del'>-		{ 0x4f, 0x04 },</div><div class='del'>-/* Do 50-53 have any effect? */</div><div class='del'>-/* Toggle 0x12[2] off and on here? */</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	static const struct ov_i2c_regvals norm_6x30[] = {</div><div class='del'>-		{ 0x12, 0x80 }, /* Reset */</div><div class='del'>-		{ 0x00, 0x1f }, /* Gain */</div><div class='del'>-		{ 0x01, 0x99 }, /* Blue gain */</div><div class='del'>-		{ 0x02, 0x7c }, /* Red gain */</div><div class='del'>-		{ 0x03, 0xc0 }, /* Saturation */</div><div class='del'>-		{ 0x05, 0x0a }, /* Contrast */</div><div class='del'>-		{ 0x06, 0x95 }, /* Brightness */</div><div class='del'>-		{ 0x07, 0x2d }, /* Sharpness */</div><div class='del'>-		{ 0x0c, 0x20 },</div><div class='del'>-		{ 0x0d, 0x20 },</div><div class='del'>-		{ 0x0e, 0x20 },</div><div class='del'>-		{ 0x0f, 0x05 },</div><div class='del'>-		{ 0x10, 0x9a },</div><div class='del'>-		{ 0x11, 0x00 }, /* Pixel clock = fastest */</div><div class='del'>-		{ 0x12, 0x24 }, /* Enable AGC and AWB */</div><div class='del'>-		{ 0x13, 0x21 },</div><div class='del'>-		{ 0x14, 0x80 },</div><div class='del'>-		{ 0x15, 0x01 },</div><div class='del'>-		{ 0x16, 0x03 },</div><div class='del'>-		{ 0x17, 0x38 },</div><div class='del'>-		{ 0x18, 0xea },</div><div class='del'>-		{ 0x19, 0x04 },</div><div class='del'>-		{ 0x1a, 0x93 },</div><div class='del'>-		{ 0x1b, 0x00 },</div><div class='del'>-		{ 0x1e, 0xc4 },</div><div class='del'>-		{ 0x1f, 0x04 },</div><div class='del'>-		{ 0x20, 0x20 },</div><div class='del'>-		{ 0x21, 0x10 },</div><div class='del'>-		{ 0x22, 0x88 },</div><div class='del'>-		{ 0x23, 0xc0 }, /* Crystal circuit power level */</div><div class='del'>-		{ 0x25, 0x9a }, /* Increase AEC black ratio */</div><div class='del'>-		{ 0x26, 0xb2 }, /* BLC enable */</div><div class='del'>-		{ 0x27, 0xa2 },</div><div class='del'>-		{ 0x28, 0x00 },</div><div class='del'>-		{ 0x29, 0x00 },</div><div class='del'>-		{ 0x2a, 0x84 }, /* 60 Hz power */</div><div class='del'>-		{ 0x2b, 0xa8 }, /* 60 Hz power */</div><div class='del'>-		{ 0x2c, 0xa0 },</div><div class='del'>-		{ 0x2d, 0x95 }, /* Enable auto-brightness */</div><div class='del'>-		{ 0x2e, 0x88 },</div><div class='del'>-		{ 0x33, 0x26 },</div><div class='del'>-		{ 0x34, 0x03 },</div><div class='del'>-		{ 0x36, 0x8f },</div><div class='del'>-		{ 0x37, 0x80 },</div><div class='del'>-		{ 0x38, 0x83 },</div><div class='del'>-		{ 0x39, 0x80 },</div><div class='del'>-		{ 0x3a, 0x0f },</div><div class='del'>-		{ 0x3b, 0x3c },</div><div class='del'>-		{ 0x3c, 0x1a },</div><div class='del'>-		{ 0x3d, 0x80 },</div><div class='del'>-		{ 0x3e, 0x80 },</div><div class='del'>-		{ 0x3f, 0x0e },</div><div class='del'>-		{ 0x40, 0x00 }, /* White bal */</div><div class='del'>-		{ 0x41, 0x00 }, /* White bal */</div><div class='del'>-		{ 0x42, 0x80 },</div><div class='del'>-		{ 0x43, 0x3f }, /* White bal */</div><div class='del'>-		{ 0x44, 0x80 },</div><div class='del'>-		{ 0x45, 0x20 },</div><div class='del'>-		{ 0x46, 0x20 },</div><div class='del'>-		{ 0x47, 0x80 },</div><div class='del'>-		{ 0x48, 0x7f },</div><div class='del'>-		{ 0x49, 0x00 },</div><div class='del'>-		{ 0x4a, 0x00 },</div><div class='del'>-		{ 0x4b, 0x80 },</div><div class='del'>-		{ 0x4c, 0xd0 },</div><div class='del'>-		{ 0x4d, 0x10 }, /* U = 0.563u, V = 0.714v */</div><div class='del'>-		{ 0x4e, 0x40 },</div><div class='del'>-		{ 0x4f, 0x07 }, /* UV avg., col. killer: max */</div><div class='del'>-		{ 0x50, 0xff },</div><div class='del'>-		{ 0x54, 0x23 }, /* Max AGC gain: 18dB */</div><div class='del'>-		{ 0x55, 0xff },</div><div class='del'>-		{ 0x56, 0x12 },</div><div class='del'>-		{ 0x57, 0x81 },</div><div class='del'>-		{ 0x58, 0x75 },</div><div class='del'>-		{ 0x59, 0x01 }, /* AGC dark current comp.: +1 */</div><div class='del'>-		{ 0x5a, 0x2c },</div><div class='del'>-		{ 0x5b, 0x0f }, /* AWB chrominance levels */</div><div class='del'>-		{ 0x5c, 0x10 },</div><div class='del'>-		{ 0x3d, 0x80 },</div><div class='del'>-		{ 0x27, 0xa6 },</div><div class='del'>-		{ 0x12, 0x20 }, /* Toggle AWB */</div><div class='del'>-		{ 0x12, 0x24 },</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	PDEBUG(D_PROBE, "starting sensor configuration");</div><div class='del'>-</div><div class='del'>-	if (init_ov_sensor(sd) &lt; 0) {</div><div class='del'>-		PDEBUG(D_ERR, "Failed to read sensor ID.");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	PDEBUG(D_PROBE, "OV6xx0 sensor detected");</div><div class='add'>+	PDEBUG(D_PROBE, "starting OV6xx0 configuration");</div><div class='ctx'> </div><div class='ctx'> 	/* Detect sensor (sub)type */</div><div class='ctx'> 	rc = i2c_r(sd, OV7610_REG_COM_I);</div><div class='hunk'>@@ -1231,59 +1247,46 @@ static int ov6xx0_configure(struct sd *sd)</div><div class='ctx'> 	/* Ugh. The first two bits are the version bits, but</div><div class='ctx'> 	 * the entire register value must be used. I guess OVT</div><div class='ctx'> 	 * underestimated how many variants they would make. */</div><div class='del'>-	if (rc == 0x00) {</div><div class='add'>+	switch (rc) {</div><div class='add'>+	case 0x00:</div><div class='ctx'> 		sd-&gt;sensor = SEN_OV6630;</div><div class='ctx'> 		PDEBUG(D_ERR,</div><div class='ctx'> 			"WARNING: Sensor is an OV66308. Your camera may have");</div><div class='ctx'> 		PDEBUG(D_ERR, "been misdetected in previous driver versions.");</div><div class='del'>-	} else if (rc == 0x01) {</div><div class='add'>+		break;</div><div class='add'>+	case 0x01:</div><div class='ctx'> 		sd-&gt;sensor = SEN_OV6620;</div><div class='del'>-		PDEBUG(D_PROBE, "Sensor is an OV6620");</div><div class='del'>-	} else if (rc == 0x02) {</div><div class='add'>+		break;</div><div class='add'>+	case 0x02:</div><div class='ctx'> 		sd-&gt;sensor = SEN_OV6630;</div><div class='ctx'> 		PDEBUG(D_PROBE, "Sensor is an OV66308AE");</div><div class='del'>-	} else if (rc == 0x03) {</div><div class='add'>+		break;</div><div class='add'>+	case 0x03:</div><div class='ctx'> 		sd-&gt;sensor = SEN_OV6630;</div><div class='ctx'> 		PDEBUG(D_PROBE, "Sensor is an OV66308AF");</div><div class='del'>-	} else if (rc == 0x90) {</div><div class='add'>+		break;</div><div class='add'>+	case 0x90:</div><div class='ctx'> 		sd-&gt;sensor = SEN_OV6630;</div><div class='ctx'> 		PDEBUG(D_ERR,</div><div class='ctx'> 			"WARNING: Sensor is an OV66307. Your camera may have");</div><div class='ctx'> 		PDEBUG(D_ERR, "been misdetected in previous driver versions.");</div><div class='del'>-	} else {</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		PDEBUG(D_ERR, "FATAL: Unknown sensor version: 0x%02x", rc);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set sensor-specific vars */</div><div class='del'>-	sd-&gt;maxwidth = 352;</div><div class='del'>-	sd-&gt;maxheight = 288;</div><div class='add'>+	sd-&gt;sif = 1;</div><div class='ctx'> </div><div class='del'>-	if (sd-&gt;sensor == SEN_OV6620) {</div><div class='del'>-		PDEBUG(D_PROBE, "Writing 6x20 registers");</div><div class='del'>-		if (write_i2c_regvals(sd, norm_6x20,</div><div class='del'>-				sizeof norm_6x20 / sizeof norm_6x20[0]))</div><div class='del'>-			return -1;</div><div class='del'>-	} else {</div><div class='del'>-		PDEBUG(D_PROBE, "Writing 6x30 registers");</div><div class='del'>-		if (write_i2c_regvals(sd, norm_6x30,</div><div class='del'>-				sizeof norm_6x30 / sizeof norm_6x30[0]))</div><div class='del'>-			return -1;</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Turns on or off the LED. Only has an effect with OV511+/OV518(+)/OV519 */</div><div class='ctx'> static void ov51x_led_control(struct sd *sd, int on)</div><div class='ctx'> {</div><div class='del'>-	PDEBUG(D_STREAM, "LED (%s)", on ? "on" : "off");</div><div class='del'>-</div><div class='del'>-/*	if (sd-&gt;bridge == BRG_OV511PLUS) */</div><div class='del'>-/*		reg_w(sd, R511_SYS_LED_CTL, on ? 1 : 0); */</div><div class='del'>-/*	else if (sd-&gt;bridge == BRG_OV519) */</div><div class='del'>-		reg_w_mask(sd, OV519_GPIO_DATA_OUT0, !on, 1);	/* 0 / 1 */</div><div class='del'>-/*	else if (sd-&gt;bclass == BCL_OV518) */</div><div class='del'>-/*		reg_w_mask(sd, R518_GPIO_OUT, on ? 0x02 : 0x00, 0x02); */</div><div class='add'>+/*	PDEBUG(D_STREAM, "LED (%s)", on ? "on" : "off"); */</div><div class='add'>+	reg_w_mask(sd, OV519_GPIO_DATA_OUT0, !on, 1);	/* 0 / 1 */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* this function is called at probe time */</div><div class='hunk'>@@ -1293,11 +1296,8 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	struct cam *cam;</div><div class='ctx'> </div><div class='del'>-/* (from ov519_configure) */</div><div class='ctx'> 	static const struct ov_regvals init_519[] = {</div><div class='ctx'> 		{ 0x5a,  0x6d }, /* EnableSystem */</div><div class='del'>-/* jfm trace usbsnoop3-1.txt */</div><div class='del'>-/* jfm 53 = fb */</div><div class='ctx'> 		{ 0x53,  0x9b },</div><div class='ctx'> 		{ 0x54,  0xff }, /* set bit2 to enable jpeg */</div><div class='ctx'> 		{ 0x5d,  0x03 },</div><div class='hunk'>@@ -1314,28 +1314,34 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> </div><div class='ctx'> 	if (write_regvals(sd, init_519, ARRAY_SIZE(init_519)))</div><div class='ctx'> 		goto error;</div><div class='del'>-/* jfm: not seen in windows trace */</div><div class='del'>-	if (ov519_init_compression(sd))</div><div class='del'>-		goto error;</div><div class='ctx'> 	ov51x_led_control(sd, 0);	/* turn LED off */</div><div class='ctx'> </div><div class='ctx'> 	/* Test for 76xx */</div><div class='del'>-	sd-&gt;primary_i2c_slave = OV7xx0_SID;</div><div class='ctx'> 	if (ov51x_set_slave_ids(sd, OV7xx0_SID) &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* The OV519 must be more aggressive about sensor detection since</div><div class='ctx'> 	 * I2C write will never fail if the sensor is not present. We have</div><div class='ctx'> 	 * to try to initialize the sensor to detect its presence */</div><div class='del'>-	if (init_ov_sensor(sd) &lt; 0) {</div><div class='add'>+	if (init_ov_sensor(sd) &gt;= 0) {</div><div class='add'>+		if (ov7xx0_configure(sd) &lt; 0) {</div><div class='add'>+			PDEBUG(D_ERR, "Failed to configure OV7xx0");</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='ctx'> 		/* Test for 6xx0 */</div><div class='del'>-		sd-&gt;primary_i2c_slave = OV6xx0_SID;</div><div class='ctx'> 		if (ov51x_set_slave_ids(sd, OV6xx0_SID) &lt; 0)</div><div class='ctx'> 			goto error;</div><div class='ctx'> </div><div class='del'>-		if (init_ov_sensor(sd) &lt; 0) {</div><div class='add'>+		if (init_ov_sensor(sd) &gt;= 0) {</div><div class='add'>+			if (ov6xx0_configure(sd) &lt; 0) {</div><div class='add'>+				PDEBUG(D_ERR, "Failed to configure OV6xx0");</div><div class='add'>+				goto error;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+</div><div class='ctx'> 			/* Test for 8xx0 */</div><div class='del'>-			sd-&gt;primary_i2c_slave = OV8xx0_SID;</div><div class='ctx'> 			if (ov51x_set_slave_ids(sd, OV8xx0_SID) &lt; 0)</div><div class='ctx'> 				goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -1343,47 +1349,76 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 				PDEBUG(D_ERR,</div><div class='ctx'> 					"Can't determine sensor slave IDs");</div><div class='ctx'> 				goto error;</div><div class='del'>-			} else {</div><div class='del'>-				if (ov8xx0_configure(sd) &lt; 0) {</div><div class='del'>-					PDEBUG(D_ERR,</div><div class='del'>-					   "Failed to configure OV8xx0 sensor");</div><div class='del'>-					goto error;</div><div class='del'>-				}</div><div class='ctx'> 			}</div><div class='del'>-		} else {</div><div class='del'>-			if (ov6xx0_configure(sd) &lt; 0) {</div><div class='del'>-				PDEBUG(D_ERR, "Failed to configure OV6xx0");</div><div class='add'>+			if (ov8xx0_configure(sd) &lt; 0) {</div><div class='add'>+				PDEBUG(D_ERR,</div><div class='add'>+				   "Failed to configure OV8xx0 sensor");</div><div class='ctx'> 				goto error;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		if (ov7xx0_configure(sd) &lt; 0) {</div><div class='del'>-			PDEBUG(D_ERR, "Failed to configure OV7xx0");</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cam = &amp;gspca_dev-&gt;cam;</div><div class='ctx'> 	cam-&gt;epaddr = OV511_ENDPOINT_ADDRESS;</div><div class='del'>-	if (sd-&gt;maxwidth == 640) {</div><div class='add'>+	if (!sd-&gt;sif) {</div><div class='ctx'> 		cam-&gt;cam_mode = vga_mode;</div><div class='del'>-		cam-&gt;nmodes = sizeof vga_mode / sizeof vga_mode[0];</div><div class='add'>+		cam-&gt;nmodes = ARRAY_SIZE(vga_mode);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		cam-&gt;cam_mode = sif_mode;</div><div class='del'>-		cam-&gt;nmodes = sizeof sif_mode / sizeof sif_mode[0];</div><div class='add'>+		cam-&gt;nmodes = ARRAY_SIZE(sif_mode);</div><div class='ctx'> 	}</div><div class='del'>-	sd-&gt;brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;</div><div class='del'>-	sd-&gt;contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;</div><div class='del'>-	sd-&gt;colors = sd_ctrls[SD_COLOR].qctrl.default_value;</div><div class='add'>+	sd-&gt;brightness = BRIGHTNESS_DEF;</div><div class='add'>+	sd-&gt;contrast = CONTRAST_DEF;</div><div class='add'>+	sd-&gt;colors = COLOR_DEF;</div><div class='add'>+	sd-&gt;hflip = HFLIP_DEF;</div><div class='add'>+	sd-&gt;vflip = VFLIP_DEF;</div><div class='add'>+	if (sd-&gt;sensor != SEN_OV7670)</div><div class='add'>+		gspca_dev-&gt;ctrl_dis = (1 &lt;&lt; HFLIP_IDX)</div><div class='add'>+					| (1 &lt;&lt; VFLIP_IDX);</div><div class='ctx'> 	return 0;</div><div class='ctx'> error:</div><div class='ctx'> 	PDEBUG(D_ERR, "OV519 Config failed");</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	/* initialize the sensor */</div><div class='add'>+	switch (sd-&gt;sensor) {</div><div class='add'>+	case SEN_OV6620:</div><div class='add'>+		if (write_i2c_regvals(sd, norm_6x20, ARRAY_SIZE(norm_6x20)))</div><div class='add'>+			return -EIO;</div><div class='add'>+		break;</div><div class='add'>+	case SEN_OV6630:</div><div class='add'>+		if (write_i2c_regvals(sd, norm_6x30, ARRAY_SIZE(norm_6x30)))</div><div class='add'>+			return -EIO;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+/*	case SEN_OV7610: */</div><div class='add'>+/*	case SEN_OV76BE: */</div><div class='add'>+		if (write_i2c_regvals(sd, norm_7610, ARRAY_SIZE(norm_7610)))</div><div class='add'>+			return -EIO;</div><div class='add'>+		break;</div><div class='add'>+	case SEN_OV7620:</div><div class='add'>+		if (write_i2c_regvals(sd, norm_7620, ARRAY_SIZE(norm_7620)))</div><div class='add'>+			return -EIO;</div><div class='add'>+		break;</div><div class='add'>+	case SEN_OV7640:</div><div class='add'>+		if (write_i2c_regvals(sd, norm_7640, ARRAY_SIZE(norm_7640)))</div><div class='add'>+			return -EIO;</div><div class='add'>+		break;</div><div class='add'>+	case SEN_OV7670:</div><div class='add'>+		if (write_i2c_regvals(sd, norm_7670, ARRAY_SIZE(norm_7670)))</div><div class='add'>+			return -EIO;</div><div class='add'>+		break;</div><div class='add'>+	case SEN_OV8610:</div><div class='add'>+		if (write_i2c_regvals(sd, norm_8610, ARRAY_SIZE(norm_8610)))</div><div class='add'>+			return -EIO;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1394,8 +1429,7 @@ static int sd_open(struct gspca_dev *gspca_dev)</div><div class='ctx'>  *</div><div class='ctx'>  * Do not put any sensor-specific code in here (including I2C I/O functions)</div><div class='ctx'>  */</div><div class='del'>-static int ov519_mode_init_regs(struct sd *sd,</div><div class='del'>-				int width, int height)</div><div class='add'>+static int ov519_mode_init_regs(struct sd *sd)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct ov_regvals mode_init_519_ov7670[] = {</div><div class='ctx'> 		{ 0x5d,	0x03 }, /* Turn off suspend mode */</div><div class='hunk'>@@ -1441,36 +1475,23 @@ static int ov519_mode_init_regs(struct sd *sd,</div><div class='ctx'> 		/* windows reads 0x55 at this point, why? */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-/* int hi_res; */</div><div class='del'>-</div><div class='del'>-	PDEBUG(D_CONF, "mode init %dx%d", width, height);</div><div class='del'>-</div><div class='del'>-/*	if (width &gt;= 800 &amp;&amp; height &gt;= 600)</div><div class='del'>-		hi_res = 1;</div><div class='del'>-	else</div><div class='del'>-		hi_res = 0; */</div><div class='del'>-</div><div class='del'>-/*	if (ov51x_stop(sd) &lt; 0)</div><div class='del'>-		return -EIO; */</div><div class='del'>-</div><div class='ctx'> 	/******** Set the mode ********/</div><div class='ctx'> 	if (sd-&gt;sensor != SEN_OV7670) {</div><div class='ctx'> 		if (write_regvals(sd, mode_init_519,</div><div class='ctx'> 				  ARRAY_SIZE(mode_init_519)))</div><div class='ctx'> 			return -EIO;</div><div class='add'>+		if (sd-&gt;sensor == SEN_OV7640) {</div><div class='add'>+			/* Select 8-bit input mode */</div><div class='add'>+			reg_w_mask(sd, OV519_CAM_DFR, 0x10, 0x10);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (write_regvals(sd, mode_init_519_ov7670,</div><div class='ctx'> 				  ARRAY_SIZE(mode_init_519_ov7670)))</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sd-&gt;sensor == SEN_OV7640) {</div><div class='del'>-		/* Select 8-bit input mode */</div><div class='del'>-		reg_w_mask(sd, OV519_CAM_DFR, 0x10, 0x10);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reg_w(sd, OV519_CAM_H_SIZE,	width &gt;&gt; 4);</div><div class='del'>-	reg_w(sd, OV519_CAM_V_SIZE,	height &gt;&gt; 3);</div><div class='add'>+	reg_w(sd, OV519_CAM_H_SIZE,	sd-&gt;gspca_dev.width &gt;&gt; 4);</div><div class='add'>+	reg_w(sd, OV519_CAM_V_SIZE,	sd-&gt;gspca_dev.height &gt;&gt; 3);</div><div class='ctx'> 	reg_w(sd, OV519_CAM_X_OFFSETL,	0x00);</div><div class='ctx'> 	reg_w(sd, OV519_CAM_X_OFFSETH,	0x00);</div><div class='ctx'> 	reg_w(sd, OV519_CAM_Y_OFFSETL,	0x00);</div><div class='hunk'>@@ -1485,9 +1506,10 @@ static int ov519_mode_init_regs(struct sd *sd,</div><div class='ctx'> </div><div class='ctx'> /* FIXME: These are only valid at the max resolution. */</div><div class='ctx'> 	sd-&gt;clockdiv = 0;</div><div class='del'>-	if (sd-&gt;sensor == SEN_OV7640) {</div><div class='add'>+	switch (sd-&gt;sensor) {</div><div class='add'>+	case SEN_OV7640:</div><div class='ctx'> 		switch (sd-&gt;frame_rate) {</div><div class='del'>-/*jfm: default was 30 fps */</div><div class='add'>+/*fixme: default was 30 fps */</div><div class='ctx'> 		case 30:</div><div class='ctx'> 			reg_w(sd, 0xa4, 0x0c);</div><div class='ctx'> 			reg_w(sd, 0x23, 0xff);</div><div class='hunk'>@@ -1517,7 +1539,8 @@ static int ov519_mode_init_regs(struct sd *sd,</div><div class='ctx'> 			sd-&gt;clockdiv = 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (sd-&gt;sensor == SEN_OV8610) {</div><div class='add'>+		break;</div><div class='add'>+	case SEN_OV8610:</div><div class='ctx'> 		switch (sd-&gt;frame_rate) {</div><div class='ctx'> 		default:	/* 15 fps */</div><div class='ctx'> /*		case 15: */</div><div class='hunk'>@@ -1533,41 +1556,37 @@ static int ov519_mode_init_regs(struct sd *sd,</div><div class='ctx'> 			reg_w(sd, 0x23, 0x1b);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		sd-&gt;clockdiv = 0;</div><div class='del'>-	} else if (sd-&gt;sensor == SEN_OV7670) { /* guesses, based on 7640 */</div><div class='add'>+		break;</div><div class='add'>+	case SEN_OV7670:		/* guesses, based on 7640 */</div><div class='ctx'> 		PDEBUG(D_STREAM, "Setting framerate to %d fps",</div><div class='ctx'> 				 (sd-&gt;frame_rate == 0) ? 15 : sd-&gt;frame_rate);</div><div class='add'>+		reg_w(sd, 0xa4, 0x10);</div><div class='ctx'> 		switch (sd-&gt;frame_rate) {</div><div class='ctx'> 		case 30:</div><div class='del'>-			reg_w(sd, 0xa4, 0x10);</div><div class='ctx'> 			reg_w(sd, 0x23, 0xff);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 20:</div><div class='del'>-			reg_w(sd, 0xa4, 0x10);</div><div class='ctx'> 			reg_w(sd, 0x23, 0x1b);</div><div class='ctx'> 			break;</div><div class='del'>-		default: /* 15 fps */</div><div class='del'>-/*			case 15: */</div><div class='del'>-			reg_w(sd, 0xa4, 0x10);</div><div class='add'>+		default:</div><div class='add'>+/*		case 15: */</div><div class='ctx'> 			reg_w(sd, 0x23, 0xff);</div><div class='ctx'> 			sd-&gt;clockdiv = 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-/*	if (ov51x_restart(sd) &lt; 0)</div><div class='del'>-		return -EIO; */</div><div class='del'>-</div><div class='del'>-	/* Reset it just for good measure */</div><div class='del'>-/*	if (ov51x_reset(sd, OV511_RESET_NOREGS) &lt; 0)</div><div class='del'>-		return -EIO; */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mode_init_ov_sensor_regs(struct sd *sd,</div><div class='del'>-				struct ovsensor_window *win)</div><div class='add'>+static int mode_init_ov_sensor_regs(struct sd *sd)</div><div class='ctx'> {</div><div class='del'>-	int qvga = win-&gt;quarter;</div><div class='add'>+	struct gspca_dev *gspca_dev;</div><div class='add'>+	int qvga;</div><div class='add'>+</div><div class='add'>+	gspca_dev = &amp;sd-&gt;gspca_dev;</div><div class='add'>+	qvga = gspca_dev-&gt;cam.cam_mode[(int) gspca_dev-&gt;curr_mode].priv;</div><div class='ctx'> </div><div class='ctx'> 	/******** Mode (VGA/QVGA) and sensor specific regs ********/</div><div class='ctx'> 	switch (sd-&gt;sensor) {</div><div class='hunk'>@@ -1611,8 +1630,6 @@ static int mode_init_ov_sensor_regs(struct sd *sd,</div><div class='ctx'> 			 OV7670_COM7_FMT_MASK);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SEN_OV6620:</div><div class='del'>-		i2c_w_mask(sd, 0x14, qvga ? 0x20 : 0x00, 0x20);</div><div class='del'>-		break;</div><div class='ctx'> 	case SEN_OV6630:</div><div class='ctx'> 		i2c_w_mask(sd, 0x14, qvga ? 0x20 : 0x00, 0x20);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1621,24 +1638,21 @@ static int mode_init_ov_sensor_regs(struct sd *sd,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/******** Palette-specific regs ********/</div><div class='del'>-/* Need to do work here for the OV7670 */</div><div class='del'>-</div><div class='del'>-		if (sd-&gt;sensor == SEN_OV7610 || sd-&gt;sensor == SEN_OV76BE) {</div><div class='del'>-			/* not valid on the OV6620/OV7620/6630? */</div><div class='del'>-			i2c_w_mask(sd, 0x0e, 0x00, 0x40);</div><div class='del'>-		}</div><div class='add'>+	if (sd-&gt;sensor == SEN_OV7610 || sd-&gt;sensor == SEN_OV76BE) {</div><div class='add'>+		/* not valid on the OV6620/OV7620/6630? */</div><div class='add'>+		i2c_w_mask(sd, 0x0e, 0x00, 0x40);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* The OV518 needs special treatment. Although both the OV518</div><div class='del'>-		 * and the OV6630 support a 16-bit video bus, only the 8 bit Y</div><div class='del'>-		 * bus is actually used. The UV bus is tied to ground.</div><div class='del'>-		 * Therefore, the OV6630 needs to be in 8-bit multiplexed</div><div class='del'>-		 * output mode */</div><div class='add'>+	/* The OV518 needs special treatment. Although both the OV518</div><div class='add'>+	 * and the OV6630 support a 16-bit video bus, only the 8 bit Y</div><div class='add'>+	 * bus is actually used. The UV bus is tied to ground.</div><div class='add'>+	 * Therefore, the OV6630 needs to be in 8-bit multiplexed</div><div class='add'>+	 * output mode */</div><div class='ctx'> </div><div class='del'>-		/* OV7640 is 8-bit only */</div><div class='add'>+	/* OV7640 is 8-bit only */</div><div class='ctx'> </div><div class='del'>-		if (sd-&gt;sensor != SEN_OV6630 &amp;&amp; sd-&gt;sensor != SEN_OV7640)</div><div class='del'>-			i2c_w_mask(sd, 0x13, 0x00, 0x20);</div><div class='del'>-/*	} */</div><div class='add'>+	if (sd-&gt;sensor != SEN_OV6630 &amp;&amp; sd-&gt;sensor != SEN_OV7640)</div><div class='add'>+		i2c_w_mask(sd, 0x13, 0x00, 0x20);</div><div class='ctx'> </div><div class='ctx'> 	/******** Clock programming ********/</div><div class='ctx'> 	/* The OV6620 needs special handling. This prevents the</div><div class='hunk'>@@ -1647,14 +1661,14 @@ static int mode_init_ov_sensor_regs(struct sd *sd,</div><div class='ctx'> </div><div class='ctx'> 		/* Clock down */</div><div class='ctx'> 		i2c_w(sd, 0x2a, 0x04);</div><div class='del'>-		i2c_w(sd, 0x11, win-&gt;clockdiv);</div><div class='add'>+		i2c_w(sd, 0x11, sd-&gt;clockdiv);</div><div class='ctx'> 		i2c_w(sd, 0x2a, 0x84);</div><div class='ctx'> 		/* This next setting is critical. It seems to improve</div><div class='ctx'> 		 * the gain or the contrast. The "reserved" bits seem</div><div class='ctx'> 		 * to have some effect in this case. */</div><div class='ctx'> 		i2c_w(sd, 0x2d, 0x85);</div><div class='del'>-	} else if (win-&gt;clockdiv &gt;= 0) {</div><div class='del'>-		i2c_w(sd, 0x11, win-&gt;clockdiv);</div><div class='add'>+	} else if (sd-&gt;clockdiv &gt;= 0) {</div><div class='add'>+		i2c_w(sd, 0x11, sd-&gt;clockdiv);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/******** Special Features ********/</div><div class='hunk'>@@ -1674,7 +1688,7 @@ static int mode_init_ov_sensor_regs(struct sd *sd,</div><div class='ctx'> 	/* is fully tested. */</div><div class='ctx'> 	/* 7620/6620/6630? don't have register 0x35, so play it safe */</div><div class='ctx'> 	if (sd-&gt;sensor == SEN_OV7610 || sd-&gt;sensor == SEN_OV76BE) {</div><div class='del'>-		if (win-&gt;width == 640 /*&amp;&amp; win-&gt;height == 480*/)</div><div class='add'>+		if (!qvga)</div><div class='ctx'> 			i2c_w(sd, 0x35, 0x9e);</div><div class='ctx'> 		else</div><div class='ctx'> 			i2c_w(sd, 0x35, 0x1e);</div><div class='hunk'>@@ -1682,13 +1696,31 @@ static int mode_init_ov_sensor_regs(struct sd *sd,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_ov_sensor_window(struct sd *sd,</div><div class='del'>-				struct ovsensor_window *win)</div><div class='add'>+static void sethvflip(struct sd *sd)</div><div class='add'>+{</div><div class='add'>+	if (sd-&gt;sensor != SEN_OV7670)</div><div class='add'>+		return;</div><div class='add'>+	if (sd-&gt;gspca_dev.streaming)</div><div class='add'>+		ov51x_stop(sd);</div><div class='add'>+	i2c_w_mask(sd, OV7670_REG_MVFP,</div><div class='add'>+		OV7670_MVFP_MIRROR * sd-&gt;hflip</div><div class='add'>+			| OV7670_MVFP_VFLIP * sd-&gt;vflip,</div><div class='add'>+		OV7670_MVFP_MIRROR | OV7670_MVFP_VFLIP);</div><div class='add'>+	if (sd-&gt;gspca_dev.streaming)</div><div class='add'>+		ov51x_restart(sd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_ov_sensor_window(struct sd *sd)</div><div class='ctx'> {</div><div class='add'>+	struct gspca_dev *gspca_dev;</div><div class='add'>+	int qvga;</div><div class='ctx'> 	int hwsbase, hwebase, vwsbase, vwebase, hwscale, vwscale;</div><div class='ctx'> 	int ret, hstart, hstop, vstop, vstart;</div><div class='ctx'> 	__u8 v;</div><div class='ctx'> </div><div class='add'>+	gspca_dev = &amp;sd-&gt;gspca_dev;</div><div class='add'>+	qvga = gspca_dev-&gt;cam.cam_mode[(int) gspca_dev-&gt;curr_mode].priv;</div><div class='add'>+</div><div class='ctx'> 	/* The different sensor ICs handle setting up of window differently.</div><div class='ctx'> 	 * IF YOU SET IT WRONG, YOU WILL GET ALL ZERO ISOC DATA FROM OV51x!! */</div><div class='ctx'> 	switch (sd-&gt;sensor) {</div><div class='hunk'>@@ -1733,7 +1765,7 @@ static int set_ov_sensor_window(struct sd *sd,</div><div class='ctx'> 	switch (sd-&gt;sensor) {</div><div class='ctx'> 	case SEN_OV6620:</div><div class='ctx'> 	case SEN_OV6630:</div><div class='del'>-		if (win-&gt;quarter) {	/* QCIF */</div><div class='add'>+		if (qvga) {		/* QCIF */</div><div class='ctx'> 			hwscale = 0;</div><div class='ctx'> 			vwscale = 0;</div><div class='ctx'> 		} else {		/* CIF */</div><div class='hunk'>@@ -1743,7 +1775,7 @@ static int set_ov_sensor_window(struct sd *sd,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SEN_OV8610:</div><div class='del'>-		if (win-&gt;quarter) {	/* QSVGA */</div><div class='add'>+		if (qvga) {		/* QSVGA */</div><div class='ctx'> 			hwscale = 1;</div><div class='ctx'> 			vwscale = 1;</div><div class='ctx'> 		} else {		/* SVGA */</div><div class='hunk'>@@ -1752,7 +1784,7 @@ static int set_ov_sensor_window(struct sd *sd,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:			/* SEN_OV7xx0 */</div><div class='del'>-		if (win-&gt;quarter) {	/* QVGA */</div><div class='add'>+		if (qvga) {		/* QVGA */</div><div class='ctx'> 			hwscale = 1;</div><div class='ctx'> 			vwscale = 0;</div><div class='ctx'> 		} else {		/* VGA */</div><div class='hunk'>@@ -1761,7 +1793,7 @@ static int set_ov_sensor_window(struct sd *sd,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = mode_init_ov_sensor_regs(sd, win);</div><div class='add'>+	ret = mode_init_ov_sensor_regs(sd);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1782,7 +1814,7 @@ static int set_ov_sensor_window(struct sd *sd,</div><div class='ctx'> 	/* I can hard code this for OV7670s */</div><div class='ctx'> 	/* Yes, these numbers do look odd, but they're tested and work! */</div><div class='ctx'> 	if (sd-&gt;sensor == SEN_OV7670) {</div><div class='del'>-		if (win-&gt;quarter) {	/* QVGA from ov7670.c by</div><div class='add'>+		if (qvga) {		/* QVGA from ov7670.c by</div><div class='ctx'> 					 * Jonathan Corbet */</div><div class='ctx'> 			hstart = 164;</div><div class='ctx'> 			hstop = 20;</div><div class='hunk'>@@ -1796,75 +1828,45 @@ static int set_ov_sensor_window(struct sd *sd,</div><div class='ctx'> 		}</div><div class='ctx'> 		/* OV7670 hardware window registers are split across</div><div class='ctx'> 		 * multiple locations */</div><div class='del'>-		i2c_w(sd, OV7670_REG_HSTART, (hstart &gt;&gt; 3) &amp; 0xff);</div><div class='del'>-		i2c_w(sd, OV7670_REG_HSTOP, (hstop &gt;&gt; 3) &amp; 0xff);</div><div class='add'>+		i2c_w(sd, OV7670_REG_HSTART, hstart &gt;&gt; 3);</div><div class='add'>+		i2c_w(sd, OV7670_REG_HSTOP, hstop &gt;&gt; 3);</div><div class='ctx'> 		v = i2c_r(sd, OV7670_REG_HREF);</div><div class='ctx'> 		v = (v &amp; 0xc0) | ((hstop &amp; 0x7) &lt;&lt; 3) | (hstart &amp; 0x07);</div><div class='ctx'> 		msleep(10);	/* need to sleep between read and write to</div><div class='ctx'> 				 * same reg! */</div><div class='ctx'> 		i2c_w(sd, OV7670_REG_HREF, v);</div><div class='ctx'> </div><div class='del'>-		i2c_w(sd, OV7670_REG_VSTART, (vstart &gt;&gt; 2) &amp; 0xff);</div><div class='del'>-		i2c_w(sd, OV7670_REG_VSTOP, (vstop &gt;&gt; 2) &amp; 0xff);</div><div class='add'>+		i2c_w(sd, OV7670_REG_VSTART, vstart &gt;&gt; 2);</div><div class='add'>+		i2c_w(sd, OV7670_REG_VSTOP, vstop &gt;&gt; 2);</div><div class='ctx'> 		v = i2c_r(sd, OV7670_REG_VREF);</div><div class='ctx'> 		v = (v &amp; 0xc0) | ((vstop &amp; 0x3) &lt;&lt; 2) | (vstart &amp; 0x03);</div><div class='ctx'> 		msleep(10);	/* need to sleep between read and write to</div><div class='ctx'> 				 * same reg! */</div><div class='ctx'> 		i2c_w(sd, OV7670_REG_VREF, v);</div><div class='del'>-</div><div class='add'>+		sethvflip(sd);</div><div class='ctx'> 	} else {</div><div class='del'>-		i2c_w(sd, 0x17, hwsbase + (win-&gt;x &gt;&gt; hwscale));</div><div class='del'>-		i2c_w(sd, 0x18, hwebase + ((win-&gt;x + win-&gt;width) &gt;&gt; hwscale));</div><div class='del'>-		i2c_w(sd, 0x19, vwsbase + (win-&gt;y &gt;&gt; vwscale));</div><div class='del'>-		i2c_w(sd, 0x1a, vwebase + ((win-&gt;y + win-&gt;height) &gt;&gt; vwscale));</div><div class='add'>+		i2c_w(sd, 0x17, hwsbase);</div><div class='add'>+		i2c_w(sd, 0x18, hwebase + (sd-&gt;gspca_dev.width &gt;&gt; hwscale));</div><div class='add'>+		i2c_w(sd, 0x19, vwsbase);</div><div class='add'>+		i2c_w(sd, 0x1a, vwebase + (sd-&gt;gspca_dev.height &gt;&gt; vwscale));</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ov_sensor_mode_setup(struct sd *sd,</div><div class='del'>-				int width, int height)</div><div class='del'>-{</div><div class='del'>-	struct ovsensor_window win;</div><div class='del'>-</div><div class='del'>-/*	win.format = mode; */</div><div class='del'>-</div><div class='del'>-	/* Unless subcapture is enabled,</div><div class='del'>-	 * center the image window and downsample</div><div class='del'>-	 * if possible to increase the field of view */</div><div class='del'>-	/* NOTE: OV518(+) and OV519 does downsampling on its own */</div><div class='del'>-	win.width = width;</div><div class='del'>-	win.height = height;</div><div class='del'>-	if (width == sd-&gt;maxwidth)</div><div class='del'>-		win.quarter = 0;</div><div class='del'>-	else</div><div class='del'>-		win.quarter = 1;</div><div class='del'>-</div><div class='del'>-	/* Center it */</div><div class='del'>-	win.x = (win.width - width) / 2;</div><div class='del'>-	win.y = (win.height - height) / 2;</div><div class='del'>-</div><div class='del'>-	/* Clock is determined by OV519 frame rate code */</div><div class='del'>-	win.clockdiv = sd-&gt;clockdiv;</div><div class='del'>-</div><div class='del'>-	PDEBUG(D_CONF, "Setting clock divider to %d", win.clockdiv);</div><div class='del'>-	return set_ov_sensor_window(sd, &amp;win);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* -- start the camera -- */</div><div class='ctx'> static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	ret = ov519_mode_init_regs(sd, gspca_dev-&gt;width, gspca_dev-&gt;height);</div><div class='add'>+	ret = ov519_mode_init_regs(sd);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='del'>-	ret = ov_sensor_mode_setup(sd, gspca_dev-&gt;width, gspca_dev-&gt;height);</div><div class='add'>+	ret = set_ov_sensor_window(sd);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = ov51x_restart((struct sd *) gspca_dev);</div><div class='add'>+	ret = ov51x_restart(sd);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	PDEBUG(D_STREAM, "camera started alt: 0x%02x", gspca_dev-&gt;alt);</div><div class='hunk'>@@ -1880,14 +1882,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	ov51x_led_control((struct sd *) gspca_dev, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			struct gspca_frame *frame,	/* target */</div><div class='ctx'> 			__u8 *data,			/* isoc packet */</div><div class='hunk'>@@ -1938,12 +1932,10 @@ static void setbrightness(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	int val;</div><div class='del'>-/*	int was_streaming; */</div><div class='ctx'> </div><div class='ctx'> 	val = sd-&gt;brightness;</div><div class='ctx'> 	PDEBUG(D_CONF, "brightness:%d", val);</div><div class='del'>-/*	was_streaming = gspca_dev-&gt;streaming;</div><div class='del'>- *	if (was_streaming)</div><div class='add'>+/*	if (gspca_dev-&gt;streaming)</div><div class='ctx'>  *		ov51x_stop(sd); */</div><div class='ctx'> 	switch (sd-&gt;sensor) {</div><div class='ctx'> 	case SEN_OV8610:</div><div class='hunk'>@@ -1961,12 +1953,12 @@ static void setbrightness(struct gspca_dev *gspca_dev)</div><div class='ctx'> 			i2c_w(sd, OV7610_REG_BRT, val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SEN_OV7670:</div><div class='del'>-/*jfm - from windblows</div><div class='add'>+/*win trace</div><div class='ctx'>  *		i2c_w_mask(sd, OV7670_REG_COM8, 0, OV7670_COM8_AEC); */</div><div class='ctx'> 		i2c_w(sd, OV7670_REG_BRIGHT, ov7670_abs_to_sm(val));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-/*	if (was_streaming)</div><div class='add'>+/*	if (gspca_dev-&gt;streaming)</div><div class='ctx'>  *		ov51x_restart(sd); */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1974,12 +1966,10 @@ static void setcontrast(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	int val;</div><div class='del'>-/*	int was_streaming; */</div><div class='ctx'> </div><div class='ctx'> 	val = sd-&gt;contrast;</div><div class='ctx'> 	PDEBUG(D_CONF, "contrast:%d", val);</div><div class='del'>-/*	was_streaming = gspca_dev-&gt;streaming;</div><div class='del'>-	if (was_streaming)</div><div class='add'>+/*	if (gspca_dev-&gt;streaming)</div><div class='ctx'> 		ov51x_stop(sd); */</div><div class='ctx'> 	switch (sd-&gt;sensor) {</div><div class='ctx'> 	case SEN_OV7610:</div><div class='hunk'>@@ -2016,7 +2006,7 @@ static void setcontrast(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		i2c_w(sd, OV7670_REG_CONTRAS, val &gt;&gt; 1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-/*	if (was_streaming)</div><div class='add'>+/*	if (gspca_dev-&gt;streaming)</div><div class='ctx'> 		ov51x_restart(sd); */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2024,12 +2014,10 @@ static void setcolors(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	int val;</div><div class='del'>-/*	int was_streaming; */</div><div class='ctx'> </div><div class='ctx'> 	val = sd-&gt;colors;</div><div class='ctx'> 	PDEBUG(D_CONF, "saturation:%d", val);</div><div class='del'>-/*	was_streaming = gspca_dev-&gt;streaming;</div><div class='del'>-	if (was_streaming)</div><div class='add'>+/*	if (gspca_dev-&gt;streaming)</div><div class='ctx'> 		ov51x_stop(sd); */</div><div class='ctx'> 	switch (sd-&gt;sensor) {</div><div class='ctx'> 	case SEN_OV8610:</div><div class='hunk'>@@ -2055,7 +2043,7 @@ static void setcolors(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		/* set REG_COM13 values for UV sat auto mode */</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-/*	if (was_streaming)</div><div class='add'>+/*	if (gspca_dev-&gt;streaming)</div><div class='ctx'> 		ov51x_restart(sd); */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2110,17 +2098,49 @@ static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	sd-&gt;hflip = val;</div><div class='add'>+	sethvflip(sd);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sd_gethflip(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	*val = sd-&gt;hflip;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	sd-&gt;vflip = val;</div><div class='add'>+	sethvflip(sd);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	*val = sd-&gt;vflip;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* sub-driver description */</div><div class='ctx'> static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.name = MODULE_NAME,</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='del'>-	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2157,6 +2177,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='hunk'>@@ -2178,4 +2202,3 @@ module_exit(sd_mod_exit);</div><div class='ctx'> </div><div class='ctx'> module_param(frame_rate, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(frame_rate, "Frame rate (5, 10, 15, 20 or 30 fps)");</div><div class='del'>-</div><div class='head'>diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c<br/>index 7ef18d578811..83b5f740c947 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/pac207.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/pac207.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/pac207.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/pac207.c</a></div><div class='hunk'>@@ -56,12 +56,6 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> #define PAC207_GAIN_KNEE		20</div><div class='ctx'> </div><div class='ctx'> #define PAC207_AUTOGAIN_DEADZONE	30</div><div class='del'>-/* We calculating the autogain at the end of the transfer of a frame, at this</div><div class='del'>-   moment a frame with the old settings is being transmitted, and a frame is</div><div class='del'>-   being captured with the old settings. So if we adjust the autogain we must</div><div class='del'>-   ignore atleast the 2 next frames for the new settings to come into effect</div><div class='del'>-   before doing any other adjustments */</div><div class='del'>-#define PAC207_AUTOGAIN_IGNORE_FRAMES	3</div><div class='ctx'> </div><div class='ctx'> /* specific webcam descriptor */</div><div class='ctx'> struct sd {</div><div class='hunk'>@@ -131,7 +125,8 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 		.minimum = 0,</div><div class='ctx'> 		.maximum = 1,</div><div class='ctx'> 		.step	= 1,</div><div class='del'>-		.default_value = 1,</div><div class='add'>+#define AUTOGAIN_DEF 1</div><div class='add'>+		.default_value = AUTOGAIN_DEF,</div><div class='ctx'> 		.flags = 0,</div><div class='ctx'> 	    },</div><div class='ctx'> 	    .set = sd_setautogain,</div><div class='hunk'>@@ -181,9 +176,6 @@ static const __u8 pac207_sensor_init[][8] = {</div><div class='ctx'> 			/* 48 reg_72 Rate Control end BalSize_4a =0x36 */</div><div class='ctx'> static const __u8 PacReg72[] = { 0x00, 0x00, 0x36, 0x00 };</div><div class='ctx'> </div><div class='del'>-static const unsigned char pac207_sof_marker[5] =</div><div class='del'>-		{ 0xff, 0xff, 0x00, 0xff, 0x96 };</div><div class='del'>-</div><div class='ctx'> static int pac207_write_regs(struct gspca_dev *gspca_dev, u16 index,</div><div class='ctx'> 	const u8 *buffer, u16 length)</div><div class='ctx'> {</div><div class='hunk'>@@ -259,35 +251,32 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pac207_write_reg(gspca_dev, 0x41, 0x00);</div><div class='del'>-				/* Bit_0=Image Format,</div><div class='del'>-				 * Bit_1=LED,</div><div class='del'>-				 * Bit_2=Compression test mode enable */</div><div class='del'>-	pac207_write_reg(gspca_dev, 0x0f, 0x00); /* Power Control */</div><div class='del'>-	pac207_write_reg(gspca_dev, 0x11, 0x30); /* Analog Bias */</div><div class='del'>-</div><div class='ctx'> 	PDEBUG(D_PROBE,</div><div class='ctx'> 		"Pixart PAC207BCA Image Processor and Control Chip detected"</div><div class='ctx'> 		" (vid/pid 0x%04X:0x%04X)", id-&gt;idVendor, id-&gt;idProduct);</div><div class='ctx'> </div><div class='ctx'> 	cam = &amp;gspca_dev-&gt;cam;</div><div class='del'>-	cam-&gt;dev_name = (char *) id-&gt;driver_info;</div><div class='ctx'> 	cam-&gt;epaddr = 0x05;</div><div class='ctx'> 	cam-&gt;cam_mode = sif_mode;</div><div class='ctx'> 	cam-&gt;nmodes = ARRAY_SIZE(sif_mode);</div><div class='ctx'> 	sd-&gt;brightness = PAC207_BRIGHTNESS_DEFAULT;</div><div class='ctx'> 	sd-&gt;exposure = PAC207_EXPOSURE_DEFAULT;</div><div class='ctx'> 	sd-&gt;gain = PAC207_GAIN_DEFAULT;</div><div class='add'>+	sd-&gt;autogain = AUTOGAIN_DEF;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='del'>-	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	pac207_write_reg(gspca_dev, 0x41, 0x00);</div><div class='add'>+				/* Bit_0=Image Format,</div><div class='add'>+				 * Bit_1=LED,</div><div class='add'>+				 * Bit_2=Compression test mode enable */</div><div class='add'>+	pac207_write_reg(gspca_dev, 0x0f, 0x00); /* Power Control */</div><div class='add'>+	pac207_write_reg(gspca_dev, 0x11, 0x30); /* Analog Bias */</div><div class='ctx'> </div><div class='del'>-	sd-&gt;autogain = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -343,14 +332,8 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	pac207_write_reg(gspca_dev, 0x0f, 0x00); /* Power Control */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this function is called at close time */</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='add'>+/* Include pac common sof detection functions */</div><div class='add'>+#include "pac_common.h"</div><div class='ctx'> </div><div class='ctx'> static void pac207_do_auto_gain(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -365,33 +348,7 @@ static void pac207_do_auto_gain(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	else if (gspca_auto_gain_n_exposure(gspca_dev, avg_lum,</div><div class='ctx'> 			100 + sd-&gt;brightness / 2, PAC207_AUTOGAIN_DEADZONE,</div><div class='ctx'> 			PAC207_GAIN_KNEE, PAC207_EXPOSURE_KNEE))</div><div class='del'>-		sd-&gt;autogain_ignore_frames = PAC207_AUTOGAIN_IGNORE_FRAMES;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned char *pac207_find_sof(struct gspca_dev *gspca_dev,</div><div class='del'>-					unsigned char *m, int len)</div><div class='del'>-{</div><div class='del'>-	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Search for the SOF marker (fixed part) in the header */</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		if (m[i] == pac207_sof_marker[sd-&gt;sof_read]) {</div><div class='del'>-			sd-&gt;sof_read++;</div><div class='del'>-			if (sd-&gt;sof_read == sizeof(pac207_sof_marker)) {</div><div class='del'>-				PDEBUG(D_STREAM,</div><div class='del'>-					"SOF found, bytes to analyze: %u."</div><div class='del'>-					" Frame starts at byte #%u",</div><div class='del'>-					len, i + 1);</div><div class='del'>-				sd-&gt;sof_read = 0;</div><div class='del'>-				return m + i + 1;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			sd-&gt;sof_read = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='add'>+		sd-&gt;autogain_ignore_frames = PAC_AUTOGAIN_IGNORE_FRAMES;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='hunk'>@@ -402,14 +359,14 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	unsigned char *sof;</div><div class='ctx'> </div><div class='del'>-	sof = pac207_find_sof(gspca_dev, data, len);</div><div class='add'>+	sof = pac_find_sof(gspca_dev, data, len);</div><div class='ctx'> 	if (sof) {</div><div class='ctx'> 		int n;</div><div class='ctx'> </div><div class='ctx'> 		/* finish decoding current frame */</div><div class='ctx'> 		n = sof - data;</div><div class='del'>-		if (n &gt; sizeof pac207_sof_marker)</div><div class='del'>-			n -= sizeof pac207_sof_marker;</div><div class='add'>+		if (n &gt; sizeof pac_sof_marker)</div><div class='add'>+			n -= sizeof pac_sof_marker;</div><div class='ctx'> 		else</div><div class='ctx'> 			n = 0;</div><div class='ctx'> 		frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,</div><div class='hunk'>@@ -537,7 +494,7 @@ static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)</div><div class='ctx'> 		sd-&gt;gain = PAC207_GAIN_DEFAULT;</div><div class='ctx'> 		if (gspca_dev-&gt;streaming) {</div><div class='ctx'> 			sd-&gt;autogain_ignore_frames =</div><div class='del'>-				PAC207_AUTOGAIN_IGNORE_FRAMES;</div><div class='add'>+				PAC_AUTOGAIN_IGNORE_FRAMES;</div><div class='ctx'> 			setexposure(gspca_dev);</div><div class='ctx'> 			setgain(gspca_dev);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -560,11 +517,9 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='del'>-	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.dq_callback = pac207_do_auto_gain,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> };</div><div class='hunk'>@@ -597,6 +552,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c<br/>index ea3d7021f401..d4be51843286 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/pac7311.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/pac7311.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/pac7311.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/pac7311.c</a></div><div class='hunk'>@@ -19,6 +19,36 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/* Some documentation about various registers as determined by trial and error.</div><div class='add'>+   When the register addresses differ between the 7202 and the 7311 the 2</div><div class='add'>+   different addresses are written as 7302addr/7311addr, when one of the 2</div><div class='add'>+   addresses is a - sign that register description is not valid for the</div><div class='add'>+   matching IC.</div><div class='add'>+</div><div class='add'>+   Register page 1:</div><div class='add'>+</div><div class='add'>+   Address	Description</div><div class='add'>+   -/0x08	Unknown compressor related, must always be 8 except when not</div><div class='add'>+		in 640x480 resolution and page 4 reg 2 &lt;= 3 then set it to 9 !</div><div class='add'>+   -/0x1b	Auto white balance related, bit 0 is AWB enable (inverted)</div><div class='add'>+		bits 345 seem to toggle per color gains on/off (inverted)</div><div class='add'>+   0x78		Global control, bit 6 controls the LED (inverted)</div><div class='add'>+   -/0x80	JPEG compression ratio ? Best not touched</div><div class='add'>+</div><div class='add'>+   Register page 3/4:</div><div class='add'>+</div><div class='add'>+   Address	Description</div><div class='add'>+   0x02		Clock divider 2-63, fps =~ 60 / val. Must be a multiple of 3 on</div><div class='add'>+		the 7302, so one of 3, 6, 9, ..., except when between 6 and 12?</div><div class='add'>+   -/0x0f	Master gain 1-245, low value = high gain</div><div class='add'>+   0x10/-	Master gain 0-31</div><div class='add'>+   -/0x10	Another gain 0-15, limited influence (1-2x gain I guess)</div><div class='add'>+   0x21		Bitfield: 0-1 unused, 2-3 vflip/hflip, 4-5 unknown, 6-7 unused</div><div class='add'>+   -/0x27	Seems to toggle various gains on / off, Setting bit 7 seems to</div><div class='add'>+		completely disable the analog amplification block. Set to 0x68</div><div class='add'>+		for max gain, 0x14 for minimal gain.</div><div class='add'>+*/</div><div class='add'>+</div><div class='ctx'> #define MODULE_NAME "pac7311"</div><div class='ctx'> </div><div class='ctx'> #include "gspca.h"</div><div class='hunk'>@@ -31,16 +61,23 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> struct sd {</div><div class='ctx'> 	struct gspca_dev gspca_dev;		/* !! must be the first item */</div><div class='ctx'> </div><div class='del'>-	int avg_lum;</div><div class='del'>-</div><div class='ctx'> 	unsigned char brightness;</div><div class='ctx'> 	unsigned char contrast;</div><div class='ctx'> 	unsigned char colors;</div><div class='add'>+	unsigned char gain;</div><div class='add'>+	unsigned char exposure;</div><div class='ctx'> 	unsigned char autogain;</div><div class='add'>+	__u8 hflip;</div><div class='add'>+	__u8 vflip;</div><div class='add'>+</div><div class='add'>+	__u8 sensor;</div><div class='add'>+#define SENSOR_PAC7302 0</div><div class='add'>+#define SENSOR_PAC7311 1</div><div class='add'>+</div><div class='add'>+	u8 sof_read;</div><div class='add'>+	u8 autogain_ignore_frames;</div><div class='ctx'> </div><div class='del'>-	char ffseq;</div><div class='del'>-	signed char ag_cnt;</div><div class='del'>-#define AG_CNT_START 13</div><div class='add'>+	atomic_t avg_lum;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* V4L2 controls supported by the driver */</div><div class='hunk'>@@ -52,8 +89,18 @@ static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);</div><div class='ctx'> static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='ctx'> static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val);</div><div class='ctx'> static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+static int sd_gethflip(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='add'>+static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val);</div><div class='add'>+static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='ctx'> </div><div class='ctx'> static struct ctrl sd_ctrls[] = {</div><div class='add'>+/* This control is pac7302 only */</div><div class='add'>+#define BRIGHTNESS_IDX 0</div><div class='ctx'> 	{</div><div class='ctx'> 	    {</div><div class='ctx'> 		.id      = V4L2_CID_BRIGHTNESS,</div><div class='hunk'>@@ -69,13 +116,15 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 	    .set = sd_setbrightness,</div><div class='ctx'> 	    .get = sd_getbrightness,</div><div class='ctx'> 	},</div><div class='add'>+/* This control is for both the 7302 and the 7311 */</div><div class='ctx'> 	{</div><div class='ctx'> 	    {</div><div class='ctx'> 		.id      = V4L2_CID_CONTRAST,</div><div class='ctx'> 		.type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='ctx'> 		.name    = "Contrast",</div><div class='ctx'> 		.minimum = 0,</div><div class='del'>-		.maximum = 255,</div><div class='add'>+#define CONTRAST_MAX 255</div><div class='add'>+		.maximum = CONTRAST_MAX,</div><div class='ctx'> 		.step    = 1,</div><div class='ctx'> #define CONTRAST_DEF 127</div><div class='ctx'> 		.default_value = CONTRAST_DEF,</div><div class='hunk'>@@ -83,13 +132,16 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 	    .set = sd_setcontrast,</div><div class='ctx'> 	    .get = sd_getcontrast,</div><div class='ctx'> 	},</div><div class='add'>+/* This control is pac7302 only */</div><div class='add'>+#define SATURATION_IDX 2</div><div class='ctx'> 	{</div><div class='ctx'> 	    {</div><div class='ctx'> 		.id      = V4L2_CID_SATURATION,</div><div class='ctx'> 		.type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		.name    = "Color",</div><div class='add'>+		.name    = "Saturation",</div><div class='ctx'> 		.minimum = 0,</div><div class='del'>-		.maximum = 255,</div><div class='add'>+#define COLOR_MAX 255</div><div class='add'>+		.maximum = COLOR_MAX,</div><div class='ctx'> 		.step    = 1,</div><div class='ctx'> #define COLOR_DEF 127</div><div class='ctx'> 		.default_value = COLOR_DEF,</div><div class='hunk'>@@ -97,6 +149,39 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 	    .set = sd_setcolors,</div><div class='ctx'> 	    .get = sd_getcolors,</div><div class='ctx'> 	},</div><div class='add'>+/* All controls below are for both the 7302 and the 7311 */</div><div class='add'>+	{</div><div class='add'>+	    {</div><div class='add'>+		.id      = V4L2_CID_GAIN,</div><div class='add'>+		.type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+		.name    = "Gain",</div><div class='add'>+		.minimum = 0,</div><div class='add'>+#define GAIN_MAX 255</div><div class='add'>+		.maximum = GAIN_MAX,</div><div class='add'>+		.step    = 1,</div><div class='add'>+#define GAIN_DEF 127</div><div class='add'>+#define GAIN_KNEE 255 /* Gain seems to cause little noise on the pac73xx */</div><div class='add'>+		.default_value = GAIN_DEF,</div><div class='add'>+	    },</div><div class='add'>+	    .set = sd_setgain,</div><div class='add'>+	    .get = sd_getgain,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    {</div><div class='add'>+		.id      = V4L2_CID_EXPOSURE,</div><div class='add'>+		.type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+		.name    = "Exposure",</div><div class='add'>+		.minimum = 0,</div><div class='add'>+#define EXPOSURE_MAX 255</div><div class='add'>+		.maximum = EXPOSURE_MAX,</div><div class='add'>+		.step    = 1,</div><div class='add'>+#define EXPOSURE_DEF  16 /*  32 ms / 30 fps */</div><div class='add'>+#define EXPOSURE_KNEE 50 /* 100 ms / 10 fps */</div><div class='add'>+		.default_value = EXPOSURE_DEF,</div><div class='add'>+	    },</div><div class='add'>+	    .set = sd_setexposure,</div><div class='add'>+	    .get = sd_getexposure,</div><div class='add'>+	},</div><div class='ctx'> 	{</div><div class='ctx'> 	    {</div><div class='ctx'> 		.id      = V4L2_CID_AUTOGAIN,</div><div class='hunk'>@@ -111,101 +196,207 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 	    .set = sd_setautogain,</div><div class='ctx'> 	    .get = sd_getautogain,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+	    {</div><div class='add'>+		.id      = V4L2_CID_HFLIP,</div><div class='add'>+		.type    = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+		.name    = "Mirror",</div><div class='add'>+		.minimum = 0,</div><div class='add'>+		.maximum = 1,</div><div class='add'>+		.step    = 1,</div><div class='add'>+#define HFLIP_DEF 0</div><div class='add'>+		.default_value = HFLIP_DEF,</div><div class='add'>+	    },</div><div class='add'>+	    .set = sd_sethflip,</div><div class='add'>+	    .get = sd_gethflip,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    {</div><div class='add'>+		.id      = V4L2_CID_VFLIP,</div><div class='add'>+		.type    = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+		.name    = "Vflip",</div><div class='add'>+		.minimum = 0,</div><div class='add'>+		.maximum = 1,</div><div class='add'>+		.step    = 1,</div><div class='add'>+#define VFLIP_DEF 0</div><div class='add'>+		.default_value = VFLIP_DEF,</div><div class='add'>+	    },</div><div class='add'>+	    .set = sd_setvflip,</div><div class='add'>+	    .get = sd_getvflip,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct v4l2_pix_format vga_mode[] = {</div><div class='del'>-	{160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,</div><div class='add'>+	{160, 120, V4L2_PIX_FMT_PJPG, V4L2_FIELD_NONE,</div><div class='ctx'> 		.bytesperline = 160,</div><div class='ctx'> 		.sizeimage = 160 * 120 * 3 / 8 + 590,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_JPEG,</div><div class='ctx'> 		.priv = 2},</div><div class='del'>-	{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,</div><div class='add'>+	{320, 240, V4L2_PIX_FMT_PJPG, V4L2_FIELD_NONE,</div><div class='ctx'> 		.bytesperline = 320,</div><div class='ctx'> 		.sizeimage = 320 * 240 * 3 / 8 + 590,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_JPEG,</div><div class='ctx'> 		.priv = 1},</div><div class='del'>-	{640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,</div><div class='add'>+	{640, 480, V4L2_PIX_FMT_PJPG, V4L2_FIELD_NONE,</div><div class='ctx'> 		.bytesperline = 640,</div><div class='ctx'> 		.sizeimage = 640 * 480 * 3 / 8 + 590,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_JPEG,</div><div class='ctx'> 		.priv = 0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define PAC7311_JPEG_HEADER_SIZE (sizeof pac7311_jpeg_header)	/* (594) */</div><div class='del'>-</div><div class='del'>-static const __u8 pac7311_jpeg_header[] = {</div><div class='del'>-	0xff, 0xd8,</div><div class='del'>-	0xff, 0xe0, 0x00, 0x03, 0x20,</div><div class='del'>-	0xff, 0xc0, 0x00, 0x11, 0x08,</div><div class='del'>-		0x01, 0xe0,			/* 12: height */</div><div class='del'>-		0x02, 0x80,			/* 14: width */</div><div class='del'>-		0x03,				/* 16 */</div><div class='del'>-			0x01, 0x21, 0x00,</div><div class='del'>-			0x02, 0x11, 0x01,</div><div class='del'>-			0x03, 0x11, 0x01,</div><div class='del'>-	0xff, 0xdb, 0x00, 0x84,</div><div class='del'>-	0x00, 0x10, 0x0b, 0x0c, 0x0e, 0x0c, 0x0a, 0x10, 0x0e, 0x0d,</div><div class='del'>-	0x0e, 0x12, 0x11, 0x10, 0x13, 0x18, 0x28, 0x1a, 0x18, 0x16,</div><div class='del'>-	0x16, 0x18, 0x31, 0x23, 0x25, 0x1d, 0x28, 0x3a, 0x33, 0x3d,</div><div class='del'>-	0x3c, 0x39, 0x33, 0x38, 0x37, 0x40, 0x48, 0x5c, 0x4e, 0x40,</div><div class='del'>-	0x44, 0x57, 0x45, 0x37, 0x38, 0x50, 0x6d, 0x51, 0x57, 0x5f,</div><div class='del'>-	0x62, 0x67, 0x68, 0x67, 0x3e, 0x4d, 0x71, 0x79, 0x70, 0x64,</div><div class='del'>-	0x78, 0x5c, 0x65, 0x67, 0x63, 0x01, 0x11, 0x12, 0x12, 0x18,</div><div class='del'>-	0x15, 0x18, 0x2f, 0x1a, 0x1a, 0x2f, 0x63, 0x42, 0x38, 0x42,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,</div><div class='del'>-	0xff, 0xc4, 0x01, 0xa2, 0x00, 0x00, 0x01, 0x05, 0x01, 0x01,</div><div class='del'>-	0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='del'>-	0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,</div><div class='del'>-	0x09, 0x0a, 0x0b, 0x10, 0x00, 0x02, 0x01, 0x03, 0x03, 0x02,</div><div class='del'>-	0x04, 0x03, 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7d,</div><div class='del'>-	0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31,</div><div class='del'>-	0x41, 0x06, 0x13, 0x51, 0x61, 0x07, 0x22, 0x71, 0x14, 0x32,</div><div class='del'>-	0x81, 0x91, 0xa1, 0x08, 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52,</div><div class='del'>-	0xd1, 0xf0, 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,</div><div class='del'>-	0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,</div><div class='del'>-	0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45,</div><div class='del'>-	0x46, 0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57,</div><div class='del'>-	0x58, 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,</div><div class='del'>-	0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x83,</div><div class='del'>-	0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94,</div><div class='del'>-	0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,</div><div class='del'>-	0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,</div><div class='del'>-	0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,</div><div class='del'>-	0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8,</div><div class='del'>-	0xd9, 0xda, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8,</div><div class='del'>-	0xe9, 0xea, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,</div><div class='del'>-	0xf9, 0xfa, 0x01, 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01,</div><div class='del'>-	0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='del'>-	0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,</div><div class='del'>-	0x0b, 0x11, 0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04,</div><div class='del'>-	0x07, 0x05, 0x04, 0x04, 0x00, 0x01, 0x02, 0x77, 0x00, 0x01,</div><div class='del'>-	0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31, 0x06, 0x12, 0x41,</div><div class='del'>-	0x51, 0x07, 0x61, 0x71, 0x13, 0x22, 0x32, 0x81, 0x08, 0x14,</div><div class='del'>-	0x42, 0x91, 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,</div><div class='del'>-	0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, 0xe1, 0x25,</div><div class='del'>-	0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, 0x27, 0x28, 0x29, 0x2a,</div><div class='del'>-	0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46,</div><div class='del'>-	0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,</div><div class='del'>-	0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a,</div><div class='del'>-	0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x82, 0x83,</div><div class='del'>-	0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94,</div><div class='del'>-	0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,</div><div class='del'>-	0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,</div><div class='del'>-	0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,</div><div class='del'>-	0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8,</div><div class='del'>-	0xd9, 0xda, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,</div><div class='del'>-	0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa,</div><div class='del'>-	0xff, 0xda, 0x00, 0x0c, 0x03, 0x01, 0x00, 0x02, 0x11, 0x03,</div><div class='del'>-	0x11, 0x00, 0x3f, 0x00</div><div class='add'>+/* pac 7302 */</div><div class='add'>+static const __u8 init_7302[] = {</div><div class='add'>+/*	index,value */</div><div class='add'>+	0xff, 0x01,		/* page 1 */</div><div class='add'>+	0x78, 0x00,		/* deactivate */</div><div class='add'>+	0xff, 0x01,</div><div class='add'>+	0x78, 0x40,		/* led off */</div><div class='add'>+};</div><div class='add'>+static const __u8 start_7302[] = {</div><div class='add'>+/*	index, len, [value]* */</div><div class='add'>+	0xff, 1,	0x00,		/* page 0 */</div><div class='add'>+	0x00, 12,	0x01, 0x40, 0x40, 0x40, 0x01, 0xe0, 0x02, 0x80,</div><div class='add'>+			0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x0d, 24,	0x03, 0x01, 0x00, 0xb5, 0x07, 0xcb, 0x00, 0x00,</div><div class='add'>+			0x07, 0xc8, 0x00, 0xea, 0x07, 0xcf, 0x07, 0xf7,</div><div class='add'>+			0x07, 0x7e, 0x01, 0x0b, 0x00, 0x00, 0x00, 0x11,</div><div class='add'>+	0x26, 2,	0xaa, 0xaa,</div><div class='add'>+	0x2e, 1,	0x31,</div><div class='add'>+	0x38, 1,	0x01,</div><div class='add'>+	0x3a, 3,	0x14, 0xff, 0x5a,</div><div class='add'>+	0x43, 11,	0x00, 0x0a, 0x18, 0x11, 0x01, 0x2c, 0x88, 0x11,</div><div class='add'>+			0x00, 0x54, 0x11,</div><div class='add'>+	0x55, 1,	0x00,</div><div class='add'>+	0x62, 4, 	0x10, 0x1e, 0x1e, 0x18,</div><div class='add'>+	0x6b, 1,	0x00,</div><div class='add'>+	0x6e, 3,	0x08, 0x06, 0x00,</div><div class='add'>+	0x72, 3,	0x00, 0xff, 0x00,</div><div class='add'>+	0x7d, 23,	0x01, 0x01, 0x58, 0x46, 0x50, 0x3c, 0x50, 0x3c,</div><div class='add'>+			0x54, 0x46, 0x54, 0x56, 0x52, 0x50, 0x52, 0x50,</div><div class='add'>+			0x56, 0x64, 0xa4, 0x00, 0xda, 0x00, 0x00,</div><div class='add'>+	0xa2, 10,	0x22, 0x2c, 0x3c, 0x54, 0x69, 0x7c, 0x9c, 0xb9,</div><div class='add'>+			0xd2, 0xeb,</div><div class='add'>+	0xaf, 1,	0x02,</div><div class='add'>+	0xb5, 2,	0x08, 0x08,</div><div class='add'>+	0xb8, 2,	0x08, 0x88,</div><div class='add'>+	0xc4, 4,	0xae, 0x01, 0x04, 0x01,</div><div class='add'>+	0xcc, 1,	0x00,</div><div class='add'>+	0xd1, 11,	0x01, 0x30, 0x49, 0x5e, 0x6f, 0x7f, 0x8e, 0xa9,</div><div class='add'>+			0xc1, 0xd7, 0xec,</div><div class='add'>+	0xdc, 1,	0x01,</div><div class='add'>+	0xff, 1,	0x01,		/* page 1 */</div><div class='add'>+	0x12, 3,	0x02, 0x00, 0x01,</div><div class='add'>+	0x3e, 2,	0x00, 0x00,</div><div class='add'>+	0x76, 5,	0x01, 0x20, 0x40, 0x00, 0xf2,</div><div class='add'>+	0x7c, 1,	0x00,</div><div class='add'>+	0x7f, 10,	0x4b, 0x0f, 0x01, 0x2c, 0x02, 0x58, 0x03, 0x20,</div><div class='add'>+			0x02, 0x00,</div><div class='add'>+	0x96, 5,	0x01, 0x10, 0x04, 0x01, 0x04,</div><div class='add'>+	0xc8, 14,	0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00,</div><div class='add'>+			0x07, 0x00, 0x01, 0x07, 0x04, 0x01,</div><div class='add'>+	0xd8, 1,	0x01,</div><div class='add'>+	0xdb, 2,	0x00, 0x01,</div><div class='add'>+	0xde, 7,	0x00, 0x01, 0x04, 0x04, 0x00, 0x00, 0x00,</div><div class='add'>+	0xe6, 4,	0x00, 0x00, 0x00, 0x01,</div><div class='add'>+	0xeb, 1,	0x00,</div><div class='add'>+	0xff, 1,	0x02,		/* page 2 */</div><div class='add'>+	0x22, 1,	0x00,</div><div class='add'>+	0xff, 1,	0x03,		/* page 3 */</div><div class='add'>+	0x00, 255,			/* load the page 3 */</div><div class='add'>+	0x11, 1,	0x01,</div><div class='add'>+	0xff, 1,	0x02,		/* page 2 */</div><div class='add'>+	0x13, 1,	0x00,</div><div class='add'>+	0x22, 4,	0x1f, 0xa4, 0xf0, 0x96,</div><div class='add'>+	0x27, 2,	0x14, 0x0c,</div><div class='add'>+	0x2a, 5,	0xc8, 0x00, 0x18, 0x12, 0x22,</div><div class='add'>+	0x64, 8,	0x00, 0x00, 0xf0, 0x01, 0x14, 0x44, 0x44, 0x44,</div><div class='add'>+	0x6e, 1,	0x08,</div><div class='add'>+	0xff, 1,	0x01,		/* page 1 */</div><div class='add'>+	0x78, 1,	0x00,</div><div class='add'>+	0, 0				/* end of sequence */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* page 3 - the value 0xaa says skip the index - see reg_w_page() */</div><div class='add'>+static const __u8 page3_7302[] = {</div><div class='add'>+	0x90, 0x40, 0x03, 0x50, 0xc2, 0x01, 0x14, 0x16,</div><div class='add'>+	0x14, 0x12, 0x00, 0x00, 0x00, 0x02, 0x33, 0x00,</div><div class='add'>+	0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x47, 0x01, 0xb3, 0x01, 0x00,</div><div class='add'>+	0x00, 0x08, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x21,</div><div class='add'>+	0x00, 0x00, 0x00, 0x54, 0xf4, 0x02, 0x52, 0x54,</div><div class='add'>+	0xa4, 0xb8, 0xe0, 0x2a, 0xf6, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0xfc, 0x00, 0xf2, 0x1f, 0x04, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0xc0, 0xc0, 0x10, 0x00, 0x00,</div><div class='add'>+	0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x40, 0xff, 0x03, 0x19, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0xc8, 0xc8,</div><div class='add'>+	0xc8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,</div><div class='add'>+	0x08, 0x10, 0x24, 0x40, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x01, 0x00, 0x02, 0x47, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x02, 0xfa, 0x00, 0x64, 0x5a, 0x28, 0x00,</div><div class='add'>+	0x00</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* pac 7311 */</div><div class='add'>+static const __u8 init_7311[] = {</div><div class='add'>+	0x78, 0x40,	/* Bit_0=start stream, Bit_6=LED */</div><div class='add'>+	0x78, 0x40,	/* Bit_0=start stream, Bit_6=LED */</div><div class='add'>+	0x78, 0x44,	/* Bit_0=start stream, Bit_6=LED */</div><div class='add'>+	0xff, 0x04,</div><div class='add'>+	0x27, 0x80,</div><div class='add'>+	0x28, 0xca,</div><div class='add'>+	0x29, 0x53,</div><div class='add'>+	0x2a, 0x0e,</div><div class='add'>+	0xff, 0x01,</div><div class='add'>+	0x3e, 0x20,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const __u8 start_7311[] = {</div><div class='add'>+/*	index, len, [value]* */</div><div class='add'>+	0xff, 1,	0x01,		/* page 1 */</div><div class='add'>+	0x02, 43,	0x48, 0x0a, 0x40, 0x08, 0x00, 0x00, 0x08, 0x00,</div><div class='add'>+			0x06, 0xff, 0x11, 0xff, 0x5a, 0x30, 0x90, 0x4c,</div><div class='add'>+			0x00, 0x07, 0x00, 0x0a, 0x10, 0x00, 0xa0, 0x10,</div><div class='add'>+			0x02, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x01, 0x00,</div><div class='add'>+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+			0x00, 0x00, 0x00,</div><div class='add'>+	0x3e, 42,	0x00, 0x00, 0x78, 0x52, 0x4a, 0x52, 0x78, 0x6e,</div><div class='add'>+			0x48, 0x46, 0x48, 0x6e, 0x5f, 0x49, 0x42, 0x49,</div><div class='add'>+			0x5f, 0x5f, 0x49, 0x42, 0x49, 0x5f, 0x6e, 0x48,</div><div class='add'>+			0x46, 0x48, 0x6e, 0x78, 0x52, 0x4a, 0x52, 0x78,</div><div class='add'>+			0x00, 0x00, 0x09, 0x1b, 0x34, 0x49, 0x5c, 0x9b,</div><div class='add'>+			0xd0, 0xff,</div><div class='add'>+	0x78, 6,	0x44, 0x00, 0xf2, 0x01, 0x01, 0x80,</div><div class='add'>+	0x7f, 18,	0x2a, 0x1c, 0x00, 0xc8, 0x02, 0x58, 0x03, 0x84,</div><div class='add'>+			0x12, 0x00, 0x1a, 0x04, 0x08, 0x0c, 0x10, 0x14,</div><div class='add'>+			0x18, 0x20,</div><div class='add'>+	0x96, 3,	0x01, 0x08, 0x04,</div><div class='add'>+	0xa0, 4,	0x44, 0x44, 0x44, 0x04,</div><div class='add'>+	0xf0, 13,	0x01, 0x00, 0x00, 0x00, 0x22, 0x00, 0x20, 0x00,</div><div class='add'>+			0x3f, 0x00, 0x0a, 0x01, 0x00,</div><div class='add'>+	0xff, 1,	0x04,		/* page 4 */</div><div class='add'>+	0x00, 254,			/* load the page 4 */</div><div class='add'>+	0x11, 1,	0x01,</div><div class='add'>+	0, 0				/* end of sequence */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* page 4 - the value 0xaa says skip the index - see reg_w_page() */</div><div class='add'>+static const __u8 page4_7311[] = {</div><div class='add'>+	0xaa, 0xaa, 0x04, 0x54, 0x07, 0x2b, 0x09, 0x0f,</div><div class='add'>+	0x09, 0x00, 0xaa, 0xaa, 0x07, 0x00, 0x00, 0x62,</div><div class='add'>+	0x08, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x00, 0x00, 0x03, 0xa0, 0x01, 0xf4, 0xaa,</div><div class='add'>+	0xaa, 0x00, 0x08, 0xaa, 0x03, 0xaa, 0x00, 0x68,</div><div class='add'>+	0xca, 0x10, 0x06, 0x78, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+	0x23, 0x28, 0x04, 0x11, 0x00, 0x00</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void reg_w_buf(struct gspca_dev *gspca_dev,</div><div class='del'>-		  __u16 index,</div><div class='del'>-		  const char *buffer, __u16 len)</div><div class='add'>+		  __u8 index,</div><div class='add'>+		  const char *buffer, int len)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(gspca_dev-&gt;usb_buf, buffer, len);</div><div class='ctx'> 	usb_control_msg(gspca_dev-&gt;dev,</div><div class='hunk'>@@ -217,21 +408,9 @@ static void reg_w_buf(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			500);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __u8 reg_r(struct gspca_dev *gspca_dev,</div><div class='del'>-			     __u16 index)</div><div class='del'>-{</div><div class='del'>-	usb_control_msg(gspca_dev-&gt;dev,</div><div class='del'>-			usb_rcvctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='del'>-			0,			/* request */</div><div class='del'>-			USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='del'>-			0,			/* value */</div><div class='del'>-			index, gspca_dev-&gt;usb_buf, 1,</div><div class='del'>-			500);</div><div class='del'>-	return gspca_dev-&gt;usb_buf[0];</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static void reg_w(struct gspca_dev *gspca_dev,</div><div class='del'>-		  __u16 index,</div><div class='add'>+		  __u8 index,</div><div class='ctx'> 		  __u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	gspca_dev-&gt;usb_buf[0] = value;</div><div class='hunk'>@@ -239,10 +418,78 @@ static void reg_w(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			usb_sndctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='ctx'> 			0,			/* request */</div><div class='ctx'> 			USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='del'>-			value, index, gspca_dev-&gt;usb_buf, 1,</div><div class='add'>+			0, index, gspca_dev-&gt;usb_buf, 1,</div><div class='ctx'> 			500);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void reg_w_seq(struct gspca_dev *gspca_dev,</div><div class='add'>+		const __u8 *seq, int len)</div><div class='add'>+{</div><div class='add'>+	while (--len &gt;= 0) {</div><div class='add'>+		reg_w(gspca_dev, seq[0], seq[1]);</div><div class='add'>+		seq += 2;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* load the beginning of a page */</div><div class='add'>+static void reg_w_page(struct gspca_dev *gspca_dev,</div><div class='add'>+			const __u8 *page, int len)</div><div class='add'>+{</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	for (index = 0; index &lt; len; index++) {</div><div class='add'>+		if (page[index] == 0xaa)		/* skip this index */</div><div class='add'>+			continue;</div><div class='add'>+		gspca_dev-&gt;usb_buf[0] = page[index];</div><div class='add'>+		usb_control_msg(gspca_dev-&gt;dev,</div><div class='add'>+				usb_sndctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='add'>+				0,			/* request */</div><div class='add'>+			USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='add'>+				0, index, gspca_dev-&gt;usb_buf, 1,</div><div class='add'>+				500);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* output a variable sequence */</div><div class='add'>+static void reg_w_var(struct gspca_dev *gspca_dev,</div><div class='add'>+			const __u8 *seq)</div><div class='add'>+{</div><div class='add'>+	int index, len;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		index = *seq++;</div><div class='add'>+		len = *seq++;</div><div class='add'>+		switch (len) {</div><div class='add'>+		case 0:</div><div class='add'>+			return;</div><div class='add'>+		case 254:</div><div class='add'>+			reg_w_page(gspca_dev, page4_7311, sizeof page4_7311);</div><div class='add'>+			break;</div><div class='add'>+		case 255:</div><div class='add'>+			reg_w_page(gspca_dev, page3_7302, sizeof page3_7302);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			if (len &gt; 64) {</div><div class='add'>+				PDEBUG(D_ERR|D_STREAM,</div><div class='add'>+					"Incorrect variable sequence");</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+			while (len &gt; 0) {</div><div class='add'>+				if (len &lt; 8) {</div><div class='add'>+					reg_w_buf(gspca_dev, index, seq, len);</div><div class='add'>+					seq += len;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				reg_w_buf(gspca_dev, index, seq, 8);</div><div class='add'>+				seq += 8;</div><div class='add'>+				index += 8;</div><div class='add'>+				len -= 8;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* not reached */</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* this function is called at probe time */</div><div class='ctx'> static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			const struct usb_device_id *id)</div><div class='hunk'>@@ -250,71 +497,181 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	struct cam *cam;</div><div class='ctx'> </div><div class='del'>-	PDEBUG(D_CONF, "Find Sensor PAC7311");</div><div class='del'>-	reg_w(gspca_dev, 0x78, 0x40); /* Bit_0=start stream, Bit_7=LED */</div><div class='del'>-	reg_w(gspca_dev, 0x78, 0x40); /* Bit_0=start stream, Bit_7=LED */</div><div class='del'>-	reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_7=LED */</div><div class='del'>-	reg_w(gspca_dev, 0xff, 0x04);</div><div class='del'>-	reg_w(gspca_dev, 0x27, 0x80);</div><div class='del'>-	reg_w(gspca_dev, 0x28, 0xca);</div><div class='del'>-	reg_w(gspca_dev, 0x29, 0x53);</div><div class='del'>-	reg_w(gspca_dev, 0x2a, 0x0e);</div><div class='del'>-	reg_w(gspca_dev, 0xff, 0x01);</div><div class='del'>-	reg_w(gspca_dev, 0x3e, 0x20);</div><div class='del'>-</div><div class='ctx'> 	cam = &amp;gspca_dev-&gt;cam;</div><div class='ctx'> 	cam-&gt;epaddr = 0x05;</div><div class='del'>-	cam-&gt;cam_mode = vga_mode;</div><div class='del'>-	cam-&gt;nmodes = ARRAY_SIZE(vga_mode);</div><div class='add'>+</div><div class='add'>+	sd-&gt;sensor = id-&gt;driver_info;</div><div class='add'>+	if (sd-&gt;sensor == SENSOR_PAC7302) {</div><div class='add'>+		PDEBUG(D_CONF, "Find Sensor PAC7302");</div><div class='add'>+		cam-&gt;cam_mode = &amp;vga_mode[2];	/* only 640x480 */</div><div class='add'>+		cam-&gt;nmodes = 1;</div><div class='add'>+	} else {</div><div class='add'>+		PDEBUG(D_CONF, "Find Sensor PAC7311");</div><div class='add'>+		cam-&gt;cam_mode = vga_mode;</div><div class='add'>+		cam-&gt;nmodes = ARRAY_SIZE(vga_mode);</div><div class='add'>+		gspca_dev-&gt;ctrl_dis = (1 &lt;&lt; BRIGHTNESS_IDX)</div><div class='add'>+				| (1 &lt;&lt; SATURATION_IDX);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	sd-&gt;brightness = BRIGHTNESS_DEF;</div><div class='ctx'> 	sd-&gt;contrast = CONTRAST_DEF;</div><div class='ctx'> 	sd-&gt;colors = COLOR_DEF;</div><div class='add'>+	sd-&gt;gain = GAIN_DEF;</div><div class='add'>+	sd-&gt;exposure = EXPOSURE_DEF;</div><div class='ctx'> 	sd-&gt;autogain = AUTOGAIN_DEF;</div><div class='add'>+	sd-&gt;hflip = HFLIP_DEF;</div><div class='add'>+	sd-&gt;vflip = VFLIP_DEF;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void setbrightness(struct gspca_dev *gspca_dev)</div><div class='add'>+/* This function is used by pac7302 only */</div><div class='add'>+static void setbrightcont(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	int i, v;</div><div class='add'>+	static const __u8 max[10] =</div><div class='add'>+		{0x29, 0x33, 0x42, 0x5a, 0x6e, 0x80, 0x9f, 0xbb,</div><div class='add'>+		 0xd4, 0xec};</div><div class='add'>+	static const __u8 delta[10] =</div><div class='add'>+		{0x35, 0x33, 0x33, 0x2f, 0x2a, 0x25, 0x1e, 0x17,</div><div class='add'>+		 0x11, 0x0b};</div><div class='add'>+</div><div class='add'>+	reg_w(gspca_dev, 0xff, 0x00);	/* page 0 */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		v = max[i];</div><div class='add'>+		v += (sd-&gt;brightness - BRIGHTNESS_MAX)</div><div class='add'>+			* 150 / BRIGHTNESS_MAX;		/* 200 ? */</div><div class='add'>+		v -= delta[i] * sd-&gt;contrast / CONTRAST_MAX;</div><div class='add'>+		if (v &lt; 0)</div><div class='add'>+			v = 0;</div><div class='add'>+		else if (v &gt; 0xff)</div><div class='add'>+			v = 0xff;</div><div class='add'>+		reg_w(gspca_dev, 0xa2 + i, v);</div><div class='add'>+	}</div><div class='add'>+	reg_w(gspca_dev, 0xdc, 0x01);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function is used by pac7311 only */</div><div class='add'>+static void setcontrast(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	int brightness;</div><div class='ctx'> </div><div class='del'>-/*jfm: inverted?*/</div><div class='del'>-	brightness = BRIGHTNESS_MAX - sd-&gt;brightness;</div><div class='ctx'> 	reg_w(gspca_dev, 0xff, 0x04);</div><div class='del'>-/*	reg_w(gspca_dev, 0x0e, 0x00); */</div><div class='del'>-	reg_w(gspca_dev, 0x0f, brightness);</div><div class='add'>+	reg_w(gspca_dev, 0x10, sd-&gt;contrast &gt;&gt; 4);</div><div class='ctx'> 	/* load registers to sensor (Bit 0, auto clear) */</div><div class='ctx'> 	reg_w(gspca_dev, 0x11, 0x01);</div><div class='del'>-	PDEBUG(D_CONF|D_STREAM, "brightness: %i", brightness);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void setcontrast(struct gspca_dev *gspca_dev)</div><div class='add'>+/* This function is used by pac7302 only */</div><div class='add'>+static void setcolors(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	int i, v;</div><div class='add'>+	static const int a[9] =</div><div class='add'>+		{217, -212, 0, -101, 170, -67, -38, -315, 355};</div><div class='add'>+	static const int b[9] =</div><div class='add'>+		{19, 106, 0, 19, 106, 1, 19, 106, 1};</div><div class='ctx'> </div><div class='del'>-	reg_w(gspca_dev, 0xff, 0x01);</div><div class='del'>-	reg_w(gspca_dev, 0x80, sd-&gt;contrast);</div><div class='add'>+	reg_w(gspca_dev, 0xff, 0x03);	/* page 3 */</div><div class='add'>+	reg_w(gspca_dev, 0x11, 0x01);</div><div class='add'>+	reg_w(gspca_dev, 0xff, 0x00);	/* page 0 */</div><div class='add'>+	reg_w(gspca_dev, 0xff, 0x00);	/* page 0 */</div><div class='add'>+	for (i = 0; i &lt; 9; i++) {</div><div class='add'>+		v = a[i] * sd-&gt;colors / COLOR_MAX + b[i];</div><div class='add'>+		reg_w(gspca_dev, 0x0f + 2 * i, (v &gt;&gt; 8) &amp; 0x07);</div><div class='add'>+		reg_w(gspca_dev, 0x0f + 2 * i + 1, v);</div><div class='add'>+	}</div><div class='add'>+	reg_w(gspca_dev, 0xdc, 0x01);</div><div class='add'>+	PDEBUG(D_CONF|D_STREAM, "color: %i", sd-&gt;colors);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setgain(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;sensor == SENSOR_PAC7302) {</div><div class='add'>+		reg_w(gspca_dev, 0xff, 0x03);		/* page 3 */</div><div class='add'>+		reg_w(gspca_dev, 0x10, sd-&gt;gain &gt;&gt; 3);</div><div class='add'>+	} else {</div><div class='add'>+		int gain = GAIN_MAX - sd-&gt;gain;</div><div class='add'>+		if (gain &lt; 1)</div><div class='add'>+			gain = 1;</div><div class='add'>+		else if (gain &gt; 245)</div><div class='add'>+			gain = 245;</div><div class='add'>+		reg_w(gspca_dev, 0xff, 0x04);		/* page 4 */</div><div class='add'>+		reg_w(gspca_dev, 0x0e, 0x00);</div><div class='add'>+		reg_w(gspca_dev, 0x0f, gain);</div><div class='add'>+	}</div><div class='ctx'> 	/* load registers to sensor (Bit 0, auto clear) */</div><div class='ctx'> 	reg_w(gspca_dev, 0x11, 0x01);</div><div class='del'>-	PDEBUG(D_CONF|D_STREAM, "contrast: %i", sd-&gt;contrast);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void setcolors(struct gspca_dev *gspca_dev)</div><div class='add'>+static void setexposure(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	__u8 reg;</div><div class='add'>+</div><div class='add'>+	/* register 2 of frame 3/4 contains the clock divider configuring the</div><div class='add'>+	   no fps according to the formula: 60 / reg. sd-&gt;exposure is the</div><div class='add'>+	   desired exposure time in ms. */</div><div class='add'>+	reg = 120 * sd-&gt;exposure / 1000;</div><div class='add'>+	if (reg &lt; 2)</div><div class='add'>+		reg = 2;</div><div class='add'>+	else if (reg &gt; 63)</div><div class='add'>+		reg = 63;</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;sensor == SENSOR_PAC7302) {</div><div class='add'>+		/* On the pac7302 reg2 MUST be a multiple of 3, so round it to</div><div class='add'>+		   the nearest multiple of 3, except when between 6 and 12? */</div><div class='add'>+		if (reg &lt; 6 || reg &gt; 12)</div><div class='add'>+			reg = ((reg + 1) / 3) * 3;</div><div class='add'>+		reg_w(gspca_dev, 0xff, 0x03);		/* page 3 */</div><div class='add'>+		reg_w(gspca_dev, 0x02, reg);</div><div class='add'>+	} else {</div><div class='add'>+		reg_w(gspca_dev, 0xff, 0x04);		/* page 4 */</div><div class='add'>+		reg_w(gspca_dev, 0x02, reg);</div><div class='add'>+		/* Page 1 register 8 must always be 0x08 except when not in</div><div class='add'>+		   640x480 mode and Page3/4 reg 2 &lt;= 3 then it must be 9 */</div><div class='add'>+		reg_w(gspca_dev, 0xff, 0x01);</div><div class='add'>+		if (gspca_dev-&gt;cam.cam_mode[(int)gspca_dev-&gt;curr_mode].priv &amp;&amp;</div><div class='add'>+				reg &lt;= 3)</div><div class='add'>+			reg_w(gspca_dev, 0x08, 0x09);</div><div class='add'>+		else</div><div class='add'>+			reg_w(gspca_dev, 0x08, 0x08);</div><div class='add'>+	}</div><div class='add'>+	/* load registers to sensor (Bit 0, auto clear) */</div><div class='add'>+	reg_w(gspca_dev, 0x11, 0x01);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	reg_w(gspca_dev, 0xff, 0x01);</div><div class='del'>-	reg_w(gspca_dev, 0x10, sd-&gt;colors);</div><div class='add'>+static void sethvflip(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	__u8 data;</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;sensor == SENSOR_PAC7302) {</div><div class='add'>+		reg_w(gspca_dev, 0xff, 0x03);		/* page 3 */</div><div class='add'>+		data = (sd-&gt;hflip ? 0x08 : 0x00)</div><div class='add'>+			| (sd-&gt;vflip ? 0x04 : 0x00);</div><div class='add'>+	} else {</div><div class='add'>+		reg_w(gspca_dev, 0xff, 0x04);		/* page 4 */</div><div class='add'>+		data = (sd-&gt;hflip ? 0x04 : 0x00)</div><div class='add'>+			| (sd-&gt;vflip ? 0x08 : 0x00);</div><div class='add'>+	}</div><div class='add'>+	reg_w(gspca_dev, 0x21, data);</div><div class='ctx'> 	/* load registers to sensor (Bit 0, auto clear) */</div><div class='ctx'> 	reg_w(gspca_dev, 0x11, 0x01);</div><div class='del'>-	PDEBUG(D_CONF|D_STREAM, "color: %i", sd-&gt;colors);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='del'>-	reg_w(gspca_dev, 0x78, 0x00);	/* Turn on LED */</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;sensor == SENSOR_PAC7302)</div><div class='add'>+		reg_w_seq(gspca_dev, init_7302, sizeof init_7302);</div><div class='add'>+	else</div><div class='add'>+		reg_w_seq(gspca_dev, init_7311, sizeof init_7311);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -322,126 +679,63 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='del'>-	reg_w(gspca_dev, 0xff, 0x01);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x0002, "\x48\x0a\x40\x08\x00\x00\x08\x00", 8);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x000a, "\x06\xff\x11\xff\x5a\x30\x90\x4c", 8);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x0012, "\x00\x07\x00\x0a\x10\x00\xa0\x10", 8);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x001a, "\x02\x00\x00\x00\x00\x0b\x01\x00", 8);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x0022, "\x00\x00\x00\x00\x00\x00\x00\x00", 8);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x002a, "\x00\x00\x00", 3);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x003e, "\x00\x00\x78\x52\x4a\x52\x78\x6e", 8);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x0046, "\x48\x46\x48\x6e\x5f\x49\x42\x49", 8);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x004e, "\x5f\x5f\x49\x42\x49\x5f\x6e\x48", 8);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x0056, "\x46\x48\x6e\x78\x52\x4a\x52\x78", 8);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x005e, "\x00\x00\x09\x1b\x34\x49\x5c\x9b", 8);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x0066, "\xd0\xff", 2);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x0078, "\x44\x00\xf2\x01\x01\x80", 6);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x007f, "\x2a\x1c\x00\xc8\x02\x58\x03\x84", 8);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x0087, "\x12\x00\x1a\x04\x08\x0c\x10\x14", 8);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x008f, "\x18\x20", 2);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x0096, "\x01\x08\x04", 3);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x00a0, "\x44\x44\x44\x04", 4);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x00f0, "\x01\x00\x00\x00\x22\x00\x20\x00", 8);</div><div class='del'>-	reg_w_buf(gspca_dev, 0x00f8, "\x3f\x00\x0a\x01\x00", 5);</div><div class='add'>+	sd-&gt;sof_read = 0;</div><div class='ctx'> </div><div class='del'>-	reg_w(gspca_dev, 0xff, 0x04);</div><div class='del'>-	reg_w(gspca_dev, 0x02, 0x04);</div><div class='del'>-	reg_w(gspca_dev, 0x03, 0x54);</div><div class='del'>-	reg_w(gspca_dev, 0x04, 0x07);</div><div class='del'>-	reg_w(gspca_dev, 0x05, 0x2b);</div><div class='del'>-	reg_w(gspca_dev, 0x06, 0x09);</div><div class='del'>-	reg_w(gspca_dev, 0x07, 0x0f);</div><div class='del'>-	reg_w(gspca_dev, 0x08, 0x09);</div><div class='del'>-	reg_w(gspca_dev, 0x09, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x0c, 0x07);</div><div class='del'>-	reg_w(gspca_dev, 0x0d, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x0e, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x0f, 0x62);</div><div class='del'>-	reg_w(gspca_dev, 0x10, 0x08);</div><div class='del'>-	reg_w(gspca_dev, 0x12, 0x07);</div><div class='del'>-	reg_w(gspca_dev, 0x13, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x14, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x15, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x16, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x17, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x18, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x19, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x1a, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x1b, 0x03);</div><div class='del'>-	reg_w(gspca_dev, 0x1c, 0xa0);</div><div class='del'>-	reg_w(gspca_dev, 0x1d, 0x01);</div><div class='del'>-	reg_w(gspca_dev, 0x1e, 0xf4);</div><div class='del'>-	reg_w(gspca_dev, 0x21, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x22, 0x08);</div><div class='del'>-	reg_w(gspca_dev, 0x24, 0x03);</div><div class='del'>-	reg_w(gspca_dev, 0x26, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x27, 0x01);</div><div class='del'>-	reg_w(gspca_dev, 0x28, 0xca);</div><div class='del'>-	reg_w(gspca_dev, 0x29, 0x10);</div><div class='del'>-	reg_w(gspca_dev, 0x2a, 0x06);</div><div class='del'>-	reg_w(gspca_dev, 0x2b, 0x78);</div><div class='del'>-	reg_w(gspca_dev, 0x2c, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x2d, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x2e, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x2f, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x30, 0x23);</div><div class='del'>-	reg_w(gspca_dev, 0x31, 0x28);</div><div class='del'>-	reg_w(gspca_dev, 0x32, 0x04);</div><div class='del'>-	reg_w(gspca_dev, 0x33, 0x11);</div><div class='del'>-	reg_w(gspca_dev, 0x34, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x35, 0x00);</div><div class='del'>-	reg_w(gspca_dev, 0x11, 0x01);</div><div class='del'>-	setcontrast(gspca_dev);</div><div class='del'>-	setbrightness(gspca_dev);</div><div class='del'>-	setcolors(gspca_dev);</div><div class='add'>+	if (sd-&gt;sensor == SENSOR_PAC7302) {</div><div class='add'>+		reg_w_var(gspca_dev, start_7302);</div><div class='add'>+		setbrightcont(gspca_dev);</div><div class='add'>+		setcolors(gspca_dev);</div><div class='add'>+	} else {</div><div class='add'>+		reg_w_var(gspca_dev, start_7311);</div><div class='add'>+		setcontrast(gspca_dev);</div><div class='add'>+	}</div><div class='add'>+	setgain(gspca_dev);</div><div class='add'>+	setexposure(gspca_dev);</div><div class='add'>+	sethvflip(gspca_dev);</div><div class='ctx'> </div><div class='ctx'> 	/* set correct resolution */</div><div class='ctx'> 	switch (gspca_dev-&gt;cam.cam_mode[(int) gspca_dev-&gt;curr_mode].priv) {</div><div class='del'>-	case 2:					/* 160x120 */</div><div class='del'>-		reg_w(gspca_dev, 0xff, 0x04);</div><div class='del'>-		reg_w(gspca_dev, 0x02, 0x03);</div><div class='add'>+	case 2:					/* 160x120 pac7311 */</div><div class='ctx'> 		reg_w(gspca_dev, 0xff, 0x01);</div><div class='del'>-		reg_w(gspca_dev, 0x08, 0x09);</div><div class='ctx'> 		reg_w(gspca_dev, 0x17, 0x20);</div><div class='del'>-		reg_w(gspca_dev, 0x1b, 0x00);</div><div class='del'>-/*		reg_w(gspca_dev, 0x80, 0x69); */</div><div class='ctx'> 		reg_w(gspca_dev, 0x87, 0x10);</div><div class='ctx'> 		break;</div><div class='del'>-	case 1:					/* 320x240 */</div><div class='del'>-		reg_w(gspca_dev, 0xff, 0x04);</div><div class='del'>-		reg_w(gspca_dev, 0x02, 0x03);</div><div class='add'>+	case 1:					/* 320x240 pac7311 */</div><div class='ctx'> 		reg_w(gspca_dev, 0xff, 0x01);</div><div class='del'>-		reg_w(gspca_dev, 0x08, 0x09);</div><div class='ctx'> 		reg_w(gspca_dev, 0x17, 0x30);</div><div class='del'>-/*		reg_w(gspca_dev, 0x80, 0x3f); */</div><div class='ctx'> 		reg_w(gspca_dev, 0x87, 0x11);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0:					/* 640x480 */</div><div class='del'>-		reg_w(gspca_dev, 0xff, 0x04);</div><div class='del'>-		reg_w(gspca_dev, 0x02, 0x03);</div><div class='add'>+		if (sd-&gt;sensor == SENSOR_PAC7302)</div><div class='add'>+			break;</div><div class='ctx'> 		reg_w(gspca_dev, 0xff, 0x01);</div><div class='del'>-		reg_w(gspca_dev, 0x08, 0x08);</div><div class='ctx'> 		reg_w(gspca_dev, 0x17, 0x00);</div><div class='del'>-/*		reg_w(gspca_dev, 0x80, 0x1c); */</div><div class='ctx'> 		reg_w(gspca_dev, 0x87, 0x12);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	sd-&gt;sof_read = 0;</div><div class='add'>+	sd-&gt;autogain_ignore_frames = 0;</div><div class='add'>+	atomic_set(&amp;sd-&gt;avg_lum, -1);</div><div class='add'>+</div><div class='ctx'> 	/* start stream */</div><div class='ctx'> 	reg_w(gspca_dev, 0xff, 0x01);</div><div class='del'>-	reg_w(gspca_dev, 0x78, 0x04);</div><div class='del'>-	reg_w(gspca_dev, 0x78, 0x05);</div><div class='del'>-</div><div class='del'>-	if (sd-&gt;autogain) {</div><div class='del'>-		sd-&gt;ag_cnt = AG_CNT_START;</div><div class='del'>-		sd-&gt;avg_lum = 0;</div><div class='del'>-	} else {</div><div class='del'>-		sd-&gt;ag_cnt = -1;</div><div class='del'>-	}</div><div class='add'>+	if (sd-&gt;sensor == SENSOR_PAC7302)</div><div class='add'>+		reg_w(gspca_dev, 0x78, 0x01);</div><div class='add'>+	else</div><div class='add'>+		reg_w(gspca_dev, 0x78, 0x05);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;sensor == SENSOR_PAC7302) {</div><div class='add'>+		reg_w(gspca_dev, 0xff, 0x01);</div><div class='add'>+		reg_w(gspca_dev, 0x78, 0x00);</div><div class='add'>+		reg_w(gspca_dev, 0x78, 0x00);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	reg_w(gspca_dev, 0xff, 0x04);</div><div class='ctx'> 	reg_w(gspca_dev, 0x27, 0x80);</div><div class='ctx'> 	reg_w(gspca_dev, 0x28, 0xca);</div><div class='hunk'>@@ -449,179 +743,147 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	reg_w(gspca_dev, 0x2a, 0x0e);</div><div class='ctx'> 	reg_w(gspca_dev, 0xff, 0x01);</div><div class='ctx'> 	reg_w(gspca_dev, 0x3e, 0x20);</div><div class='del'>-	reg_w(gspca_dev, 0x78, 0x04); /* Bit_0=start stream, Bit_7=LED */</div><div class='del'>-	reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_7=LED */</div><div class='del'>-	reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_7=LED */</div><div class='add'>+	reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_6=LED */</div><div class='add'>+	reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_6=LED */</div><div class='add'>+	reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_6=LED */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;sensor == SENSOR_PAC7302) {</div><div class='add'>+		reg_w(gspca_dev, 0xff, 0x01);</div><div class='add'>+		reg_w(gspca_dev, 0x78, 0x40);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at close time */</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='add'>+/* Include pac common sof detection functions */</div><div class='add'>+#include "pac_common.h"</div><div class='add'>+</div><div class='add'>+static void do_autogain(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='del'>-	reg_w(gspca_dev, 0xff, 0x04);</div><div class='del'>-	reg_w(gspca_dev, 0x27, 0x80);</div><div class='del'>-	reg_w(gspca_dev, 0x28, 0xca);</div><div class='del'>-	reg_w(gspca_dev, 0x29, 0x53);</div><div class='del'>-	reg_w(gspca_dev, 0x2a, 0x0e);</div><div class='del'>-	reg_w(gspca_dev, 0xff, 0x01);</div><div class='del'>-	reg_w(gspca_dev, 0x3e, 0x20);</div><div class='del'>-	reg_w(gspca_dev, 0x78, 0x04); /* Bit_0=start stream, Bit_7=LED */</div><div class='del'>-	reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_7=LED */</div><div class='del'>-	reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_7=LED */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void setautogain(struct gspca_dev *gspca_dev, int luma)</div><div class='del'>-{</div><div class='del'>-	int luma_mean = 128;</div><div class='del'>-	int luma_delta = 20;</div><div class='del'>-	__u8 spring = 5;</div><div class='del'>-	int Gbright;</div><div class='del'>-</div><div class='del'>-	Gbright = reg_r(gspca_dev, 0x02);</div><div class='del'>-	PDEBUG(D_FRAM, "luma mean %d", luma);</div><div class='del'>-	if (luma &lt; luma_mean - luma_delta ||</div><div class='del'>-	    luma &gt; luma_mean + luma_delta) {</div><div class='del'>-		Gbright += (luma_mean - luma) &gt;&gt; spring;</div><div class='del'>-		if (Gbright &gt; 0x1a)</div><div class='del'>-			Gbright = 0x1a;</div><div class='del'>-		else if (Gbright &lt; 4)</div><div class='del'>-			Gbright = 4;</div><div class='del'>-		PDEBUG(D_FRAM, "gbright %d", Gbright);</div><div class='del'>-		reg_w(gspca_dev, 0xff, 0x04);</div><div class='del'>-		reg_w(gspca_dev, 0x0f, Gbright);</div><div class='del'>-		/* load registers to sensor (Bit 0, auto clear) */</div><div class='del'>-		reg_w(gspca_dev, 0x11, 0x01);</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	int avg_lum = atomic_read(&amp;sd-&gt;avg_lum);</div><div class='add'>+	int desired_lum, deadzone;</div><div class='add'>+</div><div class='add'>+	if (avg_lum == -1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;sensor == SENSOR_PAC7302) {</div><div class='add'>+		desired_lum = 270 + sd-&gt;brightness * 4;</div><div class='add'>+		/* Hack hack, with the 7202 the first exposure step is</div><div class='add'>+		   pretty large, so if we're about to make the first</div><div class='add'>+		   exposure increase make the deadzone large to avoid</div><div class='add'>+		   oscilating */</div><div class='add'>+		if (desired_lum &gt; avg_lum &amp;&amp; sd-&gt;gain == GAIN_DEF &amp;&amp;</div><div class='add'>+				sd-&gt;exposure &gt; EXPOSURE_DEF &amp;&amp;</div><div class='add'>+				sd-&gt;exposure &lt; 42)</div><div class='add'>+			deadzone = 90;</div><div class='add'>+		else</div><div class='add'>+			deadzone = 30;</div><div class='add'>+	} else {</div><div class='add'>+		desired_lum = 200;</div><div class='add'>+		deadzone = 20;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;autogain_ignore_frames &gt; 0)</div><div class='add'>+		sd-&gt;autogain_ignore_frames--;</div><div class='add'>+	else if (gspca_auto_gain_n_exposure(gspca_dev, avg_lum, desired_lum,</div><div class='add'>+			deadzone, GAIN_KNEE, EXPOSURE_KNEE))</div><div class='add'>+		sd-&gt;autogain_ignore_frames = PAC_AUTOGAIN_IGNORE_FRAMES;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const unsigned char pac7311_jpeg_header1[] = {</div><div class='add'>+  0xff, 0xd8, 0xff, 0xc0, 0x00, 0x11, 0x08</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned char pac7311_jpeg_header2[] = {</div><div class='add'>+  0x03, 0x01, 0x21, 0x00, 0x02, 0x11, 0x01, 0x03, 0x11, 0x01, 0xff, 0xda,</div><div class='add'>+  0x00, 0x0c, 0x03, 0x01, 0x00, 0x02, 0x11, 0x03, 0x11, 0x00, 0x3f, 0x00</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* this function is run at interrupt level */</div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			struct gspca_frame *frame,	/* target */</div><div class='ctx'> 			__u8 *data,			/* isoc packet */</div><div class='ctx'> 			int len)			/* iso packet length */</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	unsigned char tmpbuf[4];</div><div class='del'>-	int i, p, ffseq;</div><div class='del'>-</div><div class='del'>-/*	if (len &lt; 5) { */</div><div class='del'>-	if (len &lt; 6) {</div><div class='del'>-/*		gspca_dev-&gt;last_packet_type = DISCARD_PACKET; */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ffseq = sd-&gt;ffseq;</div><div class='del'>-</div><div class='del'>-	for (p = 0; p &lt; len - 6; p++) {</div><div class='del'>-		if ((data[0 + p] == 0xff)</div><div class='del'>-		    &amp;&amp; (data[1 + p] == 0xff)</div><div class='del'>-		    &amp;&amp; (data[2 + p] == 0x00)</div><div class='del'>-		    &amp;&amp; (data[3 + p] == 0xff)</div><div class='del'>-		    &amp;&amp; (data[4 + p] == 0x96)) {</div><div class='del'>-</div><div class='del'>-			/* start of frame */</div><div class='del'>-			if (sd-&gt;ag_cnt &gt;= 0 &amp;&amp; p &gt; 28) {</div><div class='del'>-				sd-&gt;avg_lum += data[p - 23];</div><div class='del'>-				if (--sd-&gt;ag_cnt &lt; 0) {</div><div class='del'>-					sd-&gt;ag_cnt = AG_CNT_START;</div><div class='del'>-					setautogain(gspca_dev,</div><div class='del'>-						sd-&gt;avg_lum / AG_CNT_START);</div><div class='del'>-					sd-&gt;avg_lum = 0;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+	unsigned char *sof;</div><div class='add'>+</div><div class='add'>+	sof = pac_find_sof(gspca_dev, data, len);</div><div class='add'>+	if (sof) {</div><div class='add'>+		unsigned char tmpbuf[4];</div><div class='add'>+		int n, lum_offset, footer_length;</div><div class='add'>+</div><div class='add'>+		if (sd-&gt;sensor == SENSOR_PAC7302) {</div><div class='add'>+		  /* 6 bytes after the FF D9 EOF marker a number of lumination</div><div class='add'>+		     bytes are send corresponding to different parts of the</div><div class='add'>+		     image, the 14th and 15th byte after the EOF seem to</div><div class='add'>+		     correspond to the center of the image */</div><div class='add'>+		  lum_offset = 61 + sizeof pac_sof_marker;</div><div class='add'>+		  footer_length = 74;</div><div class='add'>+		} else {</div><div class='add'>+		  lum_offset = 24 + sizeof pac_sof_marker;</div><div class='add'>+		  footer_length = 26;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			/* copy the end of data to the current frame */</div><div class='add'>+		/* Finish decoding current frame */</div><div class='add'>+		n = (sof - data) - (footer_length + sizeof pac_sof_marker);</div><div class='add'>+		if (n &lt; 0) {</div><div class='add'>+			frame-&gt;data_end += n;</div><div class='add'>+			n = 0;</div><div class='add'>+		}</div><div class='add'>+		frame = gspca_frame_add(gspca_dev, INTER_PACKET, frame,</div><div class='add'>+					data, n);</div><div class='add'>+		if (gspca_dev-&gt;last_packet_type != DISCARD_PACKET &amp;&amp;</div><div class='add'>+				frame-&gt;data_end[-2] == 0xff &amp;&amp;</div><div class='add'>+				frame-&gt;data_end[-1] == 0xd9)</div><div class='ctx'> 			frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,</div><div class='del'>-						data, p);</div><div class='del'>-</div><div class='del'>-			/* put the JPEG header in the new frame */</div><div class='del'>-			gspca_frame_add(gspca_dev, FIRST_PACKET, frame,</div><div class='del'>-					(unsigned char *) pac7311_jpeg_header,</div><div class='del'>-					12);</div><div class='add'>+						NULL, 0);</div><div class='add'>+</div><div class='add'>+		n = sof - data;</div><div class='add'>+		len -= n;</div><div class='add'>+		data = sof;</div><div class='add'>+</div><div class='add'>+		/* Get average lumination */</div><div class='add'>+		if (gspca_dev-&gt;last_packet_type == LAST_PACKET &amp;&amp;</div><div class='add'>+				n &gt;= lum_offset)</div><div class='add'>+			atomic_set(&amp;sd-&gt;avg_lum, data[-lum_offset] +</div><div class='add'>+						data[-lum_offset + 1]);</div><div class='add'>+		else</div><div class='add'>+			atomic_set(&amp;sd-&gt;avg_lum, -1);</div><div class='add'>+</div><div class='add'>+		/* Start the new frame with the jpeg header */</div><div class='add'>+		gspca_frame_add(gspca_dev, FIRST_PACKET, frame,</div><div class='add'>+			pac7311_jpeg_header1, sizeof(pac7311_jpeg_header1));</div><div class='add'>+		if (sd-&gt;sensor == SENSOR_PAC7302) {</div><div class='add'>+			/* The PAC7302 has the image rotated 90 degrees */</div><div class='add'>+			tmpbuf[0] = gspca_dev-&gt;width &gt;&gt; 8;</div><div class='add'>+			tmpbuf[1] = gspca_dev-&gt;width &amp; 0xff;</div><div class='add'>+			tmpbuf[2] = gspca_dev-&gt;height &gt;&gt; 8;</div><div class='add'>+			tmpbuf[3] = gspca_dev-&gt;height &amp; 0xff;</div><div class='add'>+		} else {</div><div class='ctx'> 			tmpbuf[0] = gspca_dev-&gt;height &gt;&gt; 8;</div><div class='ctx'> 			tmpbuf[1] = gspca_dev-&gt;height &amp; 0xff;</div><div class='ctx'> 			tmpbuf[2] = gspca_dev-&gt;width &gt;&gt; 8;</div><div class='ctx'> 			tmpbuf[3] = gspca_dev-&gt;width &amp; 0xff;</div><div class='del'>-			gspca_frame_add(gspca_dev, INTER_PACKET, frame,</div><div class='del'>-					tmpbuf, 4);</div><div class='del'>-			gspca_frame_add(gspca_dev, INTER_PACKET, frame,</div><div class='del'>-				(unsigned char *) &amp;pac7311_jpeg_header[16],</div><div class='del'>-				PAC7311_JPEG_HEADER_SIZE - 16);</div><div class='del'>-</div><div class='del'>-			data += p + 7;</div><div class='del'>-			len -= p + 7;</div><div class='del'>-			ffseq = 0;</div><div class='del'>-			break;</div><div class='ctx'> 		}</div><div class='add'>+		gspca_frame_add(gspca_dev, INTER_PACKET, frame, tmpbuf, 4);</div><div class='add'>+		gspca_frame_add(gspca_dev, INTER_PACKET, frame,</div><div class='add'>+			pac7311_jpeg_header2, sizeof(pac7311_jpeg_header2));</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* remove the 'ff ff ff xx' sequences */</div><div class='del'>-	switch (ffseq) {</div><div class='del'>-	case 3:</div><div class='del'>-		data += 1;</div><div class='del'>-		len -= 1;</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		if (data[0] == 0xff) {</div><div class='del'>-			data += 2;</div><div class='del'>-			len -= 2;</div><div class='del'>-			frame-&gt;data_end -= 2;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		if (data[0] == 0xff</div><div class='del'>-		    &amp;&amp; data[1] == 0xff) {</div><div class='del'>-			data += 3;</div><div class='del'>-			len -= 3;</div><div class='del'>-			frame-&gt;data_end -= 1;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; len - 4; i++) {</div><div class='del'>-		if (data[i] == 0xff</div><div class='del'>-		    &amp;&amp; data[i + 1] == 0xff</div><div class='del'>-		    &amp;&amp; data[i + 2] == 0xff) {</div><div class='del'>-			memmove(&amp;data[i], &amp;data[i + 4], len - i - 4);</div><div class='del'>-			len -= 4;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ffseq = 0;</div><div class='del'>-	if (data[len - 4] == 0xff) {</div><div class='del'>-		if (data[len - 3] == 0xff</div><div class='del'>-		    &amp;&amp; data[len - 2] == 0xff) {</div><div class='del'>-			len -= 4;</div><div class='del'>-		}</div><div class='del'>-	} else if (data[len - 3] == 0xff) {</div><div class='del'>-		if (data[len - 2] == 0xff</div><div class='del'>-		    &amp;&amp; data[len - 1] == 0xff)</div><div class='del'>-			ffseq = 3;</div><div class='del'>-	} else if (data[len - 2] == 0xff) {</div><div class='del'>-		if (data[len - 1] == 0xff)</div><div class='del'>-			ffseq = 2;</div><div class='del'>-	} else if (data[len - 1] == 0xff)</div><div class='del'>-		ffseq = 1;</div><div class='del'>-	sd-&gt;ffseq = ffseq;</div><div class='ctx'> 	gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void getbrightness(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-/*	sd-&gt;brightness = reg_r(gspca_dev, 0x08);</div><div class='del'>-	return sd-&gt;brightness;	*/</div><div class='del'>-/*	PDEBUG(D_CONF, "Called pac7311_getbrightness: Not implemented yet"); */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='ctx'> 	sd-&gt;brightness = val;</div><div class='ctx'> 	if (gspca_dev-&gt;streaming)</div><div class='del'>-		setbrightness(gspca_dev);</div><div class='add'>+		setbrightcont(gspca_dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -629,7 +891,6 @@ static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='del'>-	getbrightness(gspca_dev);</div><div class='ctx'> 	*val = sd-&gt;brightness;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -639,8 +900,12 @@ static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='ctx'> 	sd-&gt;contrast = val;</div><div class='del'>-	if (gspca_dev-&gt;streaming)</div><div class='del'>-		setcontrast(gspca_dev);</div><div class='add'>+	if (gspca_dev-&gt;streaming) {</div><div class='add'>+		if (sd-&gt;sensor == SENSOR_PAC7302)</div><div class='add'>+			setbrightcont(gspca_dev);</div><div class='add'>+		else</div><div class='add'>+			setcontrast(gspca_dev);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -648,7 +913,6 @@ static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='del'>-/*	getcontrast(gspca_dev); */</div><div class='ctx'> 	*val = sd-&gt;contrast;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -667,22 +931,66 @@ static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='del'>-/*	getcolors(gspca_dev); */</div><div class='ctx'> 	*val = sd-&gt;colors;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	sd-&gt;gain = val;</div><div class='add'>+	if (gspca_dev-&gt;streaming)</div><div class='add'>+		setgain(gspca_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	*val = sd-&gt;gain;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	sd-&gt;exposure = val;</div><div class='add'>+	if (gspca_dev-&gt;streaming)</div><div class='add'>+		setexposure(gspca_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	*val = sd-&gt;exposure;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='ctx'> 	sd-&gt;autogain = val;</div><div class='del'>-	if (val) {</div><div class='del'>-		sd-&gt;ag_cnt = AG_CNT_START;</div><div class='del'>-		sd-&gt;avg_lum = 0;</div><div class='del'>-	} else {</div><div class='del'>-		sd-&gt;ag_cnt = -1;</div><div class='add'>+	/* when switching to autogain set defaults to make sure</div><div class='add'>+	   we are on a valid point of the autogain gain /</div><div class='add'>+	   exposure knee graph, and give this change time to</div><div class='add'>+	   take effect before doing autogain. */</div><div class='add'>+	if (sd-&gt;autogain) {</div><div class='add'>+		sd-&gt;exposure = EXPOSURE_DEF;</div><div class='add'>+		sd-&gt;gain = GAIN_DEF;</div><div class='add'>+		if (gspca_dev-&gt;streaming) {</div><div class='add'>+			sd-&gt;autogain_ignore_frames =</div><div class='add'>+				PAC_AUTOGAIN_IGNORE_FRAMES;</div><div class='add'>+			setexposure(gspca_dev);</div><div class='add'>+			setgain(gspca_dev);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -694,29 +1002,67 @@ static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	sd-&gt;hflip = val;</div><div class='add'>+	if (gspca_dev-&gt;streaming)</div><div class='add'>+		sethvflip(gspca_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sd_gethflip(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	*val = sd-&gt;hflip;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	sd-&gt;vflip = val;</div><div class='add'>+	if (gspca_dev-&gt;streaming)</div><div class='add'>+		sethvflip(gspca_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	*val = sd-&gt;vflip;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* sub-driver description */</div><div class='ctx'> static struct sd_desc sd_desc = {</div><div class='ctx'> 	.name = MODULE_NAME,</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='ctx'> 	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='add'>+	.dq_callback = do_autogain,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module initialisation -- */</div><div class='ctx'> static __devinitdata struct usb_device_id device_table[] = {</div><div class='del'>-	{USB_DEVICE(0x093a, 0x2600)},</div><div class='del'>-	{USB_DEVICE(0x093a, 0x2601)},</div><div class='del'>-	{USB_DEVICE(0x093a, 0x2603)},</div><div class='del'>-	{USB_DEVICE(0x093a, 0x2608)},</div><div class='del'>-	{USB_DEVICE(0x093a, 0x260e)},</div><div class='del'>-	{USB_DEVICE(0x093a, 0x260f)},</div><div class='del'>-	{USB_DEVICE(0x093a, 0x2621)},</div><div class='add'>+	{USB_DEVICE(0x093a, 0x2600), .driver_info = SENSOR_PAC7311},</div><div class='add'>+	{USB_DEVICE(0x093a, 0x2601), .driver_info = SENSOR_PAC7311},</div><div class='add'>+	{USB_DEVICE(0x093a, 0x2603), .driver_info = SENSOR_PAC7311},</div><div class='add'>+	{USB_DEVICE(0x093a, 0x2608), .driver_info = SENSOR_PAC7311},</div><div class='add'>+	{USB_DEVICE(0x093a, 0x260e), .driver_info = SENSOR_PAC7311},</div><div class='add'>+	{USB_DEVICE(0x093a, 0x260f), .driver_info = SENSOR_PAC7311},</div><div class='add'>+	{USB_DEVICE(0x093a, 0x2621), .driver_info = SENSOR_PAC7302},</div><div class='add'>+	{USB_DEVICE(0x093a, 0x2624), .driver_info = SENSOR_PAC7302},</div><div class='add'>+	{USB_DEVICE(0x093a, 0x2626), .driver_info = SENSOR_PAC7302},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, device_table);</div><div class='hunk'>@@ -734,6 +1080,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/pac_common.h b/drivers/media/video/gspca/pac_common.h<br/>new file mode 100644<br/>index 000000000000..34d4b1494cd5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/pac_common.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/pac_common.h</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+/*</div><div class='add'>+ * Pixart PAC207BCA / PAC73xx common functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Hans de Goede &lt;j.w.r.degoede@hhs.nl&gt;</div><div class='add'>+ * Copyright (C) 2005 Thomas Kaiser thomas@kaiser-linux.li</div><div class='add'>+ * Copyleft (C) 2005 Michel Xhaard mxhaard@magic.fr</div><div class='add'>+ *</div><div class='add'>+ * V4L2 by Jean-Francois Moine &lt;http://moinejf.free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* We calculate the autogain at the end of the transfer of a frame, at this</div><div class='add'>+   moment a frame with the old settings is being transmitted, and a frame is</div><div class='add'>+   being captured with the old settings. So if we adjust the autogain we must</div><div class='add'>+   ignore atleast the 2 next frames for the new settings to come into effect</div><div class='add'>+   before doing any other adjustments */</div><div class='add'>+#define PAC_AUTOGAIN_IGNORE_FRAMES	3</div><div class='add'>+</div><div class='add'>+static const unsigned char pac_sof_marker[5] =</div><div class='add'>+		{ 0xff, 0xff, 0x00, 0xff, 0x96 };</div><div class='add'>+</div><div class='add'>+static unsigned char *pac_find_sof(struct gspca_dev *gspca_dev,</div><div class='add'>+					unsigned char *m, int len)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Search for the SOF marker (fixed part) in the header */</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		if (m[i] == pac_sof_marker[sd-&gt;sof_read]) {</div><div class='add'>+			sd-&gt;sof_read++;</div><div class='add'>+			if (sd-&gt;sof_read == sizeof(pac_sof_marker)) {</div><div class='add'>+				PDEBUG(D_FRAM,</div><div class='add'>+					"SOF found, bytes to analyze: %u."</div><div class='add'>+					" Frame starts at byte #%u",</div><div class='add'>+					len, i + 1);</div><div class='add'>+				sd-&gt;sof_read = 0;</div><div class='add'>+				return m + i + 1;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			sd-&gt;sof_read = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c<br/>index e18748c5a14d..5dd78c6766ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sonixb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/sonixb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sonixb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/sonixb.c</a></div><div class='hunk'>@@ -20,6 +20,26 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/* Some documentation on known sonixb registers:</div><div class='add'>+</div><div class='add'>+Reg	Use</div><div class='add'>+0x10	high nibble red gain low nibble blue gain</div><div class='add'>+0x11	low nibble green gain</div><div class='add'>+0x12	hstart</div><div class='add'>+0x13	vstart</div><div class='add'>+0x15	hsize (hsize = register-value * 16)</div><div class='add'>+0x16	vsize (vsize = register-value * 16)</div><div class='add'>+0x17	bit 0 toggle compression quality (according to sn9c102 driver)</div><div class='add'>+0x18	bit 7 enables compression, bit 4-5 set image down scaling:</div><div class='add'>+	00 scale 1, 01 scale 1/2, 10, scale 1/4</div><div class='add'>+0x19	high-nibble is sensor clock divider, changes exposure on sensors which</div><div class='add'>+	use a clock generated by the bridge. Some sensors have their own clock.</div><div class='add'>+0x1c	auto_exposure area (for avg_lum) startx (startx = register-value * 32)</div><div class='add'>+0x1d	auto_exposure area (for avg_lum) starty (starty = register-value * 32)</div><div class='add'>+0x1e	auto_exposure area (for avg_lum) stopx (hsize = (0x1e - 0x1c) * 32)</div><div class='add'>+0x1f	auto_exposure area (for avg_lum) stopy (vsize = (0x1f - 0x1d) * 32)</div><div class='add'>+*/</div><div class='add'>+</div><div class='ctx'> #define MODULE_NAME "sonixb"</div><div class='ctx'> </div><div class='ctx'> #include "gspca.h"</div><div class='hunk'>@@ -31,10 +51,8 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> /* specific webcam descriptor */</div><div class='ctx'> struct sd {</div><div class='ctx'> 	struct gspca_dev gspca_dev;	/* !! must be the first item */</div><div class='del'>-</div><div class='del'>-	struct sd_desc sd_desc;		/* our nctrls differ dependend upon the</div><div class='del'>-					   sensor, so we use a per cam copy */</div><div class='ctx'> 	atomic_t avg_lum;</div><div class='add'>+	int prev_avg_lum;</div><div class='ctx'> </div><div class='ctx'> 	unsigned char gain;</div><div class='ctx'> 	unsigned char exposure;</div><div class='hunk'>@@ -44,8 +62,12 @@ struct sd {</div><div class='ctx'> 	unsigned char frames_to_drop;</div><div class='ctx'> 	unsigned char freq;		/* light freq filter setting */</div><div class='ctx'> </div><div class='del'>-	unsigned char fr_h_sz;		/* size of frame header */</div><div class='del'>-	char sensor;			/* Type of image sensor chip */</div><div class='add'>+	__u8 bridge;			/* Type of bridge */</div><div class='add'>+#define BRIDGE_101 0</div><div class='add'>+#define BRIDGE_102 0 /* We make no difference between 101 and 102 */</div><div class='add'>+#define BRIDGE_103 1</div><div class='add'>+</div><div class='add'>+	__u8 sensor;			/* Type of image sensor chip */</div><div class='ctx'> #define SENSOR_HV7131R 0</div><div class='ctx'> #define SENSOR_OV6650 1</div><div class='ctx'> #define SENSOR_OV7630 2</div><div class='hunk'>@@ -53,16 +75,35 @@ struct sd {</div><div class='ctx'> #define SENSOR_PAS202 4</div><div class='ctx'> #define SENSOR_TAS5110 5</div><div class='ctx'> #define SENSOR_TAS5130CXX 6</div><div class='del'>-	char sensor_has_gain;</div><div class='del'>-	__u8 sensor_addr;</div><div class='ctx'> 	__u8 reg11;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* flags used in the device id table */</div><div class='add'>+typedef const __u8 sensor_init_t[8];</div><div class='add'>+</div><div class='add'>+struct sensor_data {</div><div class='add'>+	const __u8 *bridge_init[2];</div><div class='add'>+	int bridge_init_size[2];</div><div class='add'>+	sensor_init_t *sensor_init;</div><div class='add'>+	int sensor_init_size;</div><div class='add'>+	sensor_init_t *sensor_bridge_init[2];</div><div class='add'>+	int sensor_bridge_init_size[2];</div><div class='add'>+	int flags;</div><div class='add'>+	unsigned ctrl_dis;</div><div class='add'>+	__u8 sensor_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* sensor_data flags */</div><div class='ctx'> #define F_GAIN 0x01		/* has gain */</div><div class='del'>-#define F_AUTO 0x02		/* has autogain */</div><div class='del'>-#define F_SIF  0x04		/* sif or vga */</div><div class='del'>-#define F_H18  0x08		/* long (18 b) or short (12 b) frame header */</div><div class='add'>+#define F_SIF  0x02		/* sif or vga */</div><div class='add'>+</div><div class='add'>+/* priv field of struct v4l2_pix_format flags (do not use low nibble!) */</div><div class='add'>+#define MODE_RAW 0x10		/* raw bayer mode */</div><div class='add'>+#define MODE_REDUCED_SIF 0x20	/* vga mode (320x240 / 160x120) on sif cam */</div><div class='add'>+</div><div class='add'>+/* ctrl_dis helper macros */</div><div class='add'>+#define NO_EXPO ((1 &lt;&lt; EXPOSURE_IDX) | (1 &lt;&lt; AUTOGAIN_IDX))</div><div class='add'>+#define NO_FREQ (1 &lt;&lt; FREQ_IDX)</div><div class='add'>+#define NO_BRIGHTNESS (1 &lt;&lt; BRIGHTNESS_IDX)</div><div class='ctx'> </div><div class='ctx'> #define COMP2 0x8f</div><div class='ctx'> #define COMP 0xc7		/* 0x87 //0x07 */</div><div class='hunk'>@@ -73,6 +114,18 @@ struct sd {</div><div class='ctx'> </div><div class='ctx'> #define SYS_CLK 0x04</div><div class='ctx'> </div><div class='add'>+#define SENS(bridge_1, bridge_3, sensor, sensor_1, \</div><div class='add'>+	sensor_3, _flags, _ctrl_dis, _sensor_addr) \</div><div class='add'>+{ \</div><div class='add'>+	.bridge_init = { bridge_1, bridge_3 }, \</div><div class='add'>+	.bridge_init_size = { sizeof(bridge_1), sizeof(bridge_3) }, \</div><div class='add'>+	.sensor_init = sensor, \</div><div class='add'>+	.sensor_init_size = sizeof(sensor), \</div><div class='add'>+	.sensor_bridge_init = { sensor_1, sensor_3,}, \</div><div class='add'>+	.sensor_bridge_init_size = { sizeof(sensor_1), sizeof(sensor_3)}, \</div><div class='add'>+	.flags = _flags, .ctrl_dis = _ctrl_dis, .sensor_addr = _sensor_addr \</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* We calculate the autogain at the end of the transfer of a frame, at this</div><div class='ctx'>    moment a frame with the old settings is being transmitted, and a frame is</div><div class='ctx'>    being captured with the old settings. So if we adjust the autogain we must</div><div class='hunk'>@@ -95,6 +148,7 @@ static int sd_setfreq(struct gspca_dev *gspca_dev, __s32 val);</div><div class='ctx'> static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='ctx'> </div><div class='ctx'> static struct ctrl sd_ctrls[] = {</div><div class='add'>+#define BRIGHTNESS_IDX 0</div><div class='ctx'> 	{</div><div class='ctx'> 	    {</div><div class='ctx'> 		.id      = V4L2_CID_BRIGHTNESS,</div><div class='hunk'>@@ -109,6 +163,7 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 	    .set = sd_setbrightness,</div><div class='ctx'> 	    .get = sd_getbrightness,</div><div class='ctx'> 	},</div><div class='add'>+#define GAIN_IDX 1</div><div class='ctx'> 	{</div><div class='ctx'> 	    {</div><div class='ctx'> 		.id      = V4L2_CID_GAIN,</div><div class='hunk'>@@ -124,6 +179,7 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 	    .set = sd_setgain,</div><div class='ctx'> 	    .get = sd_getgain,</div><div class='ctx'> 	},</div><div class='add'>+#define EXPOSURE_IDX 2</div><div class='ctx'> 	{</div><div class='ctx'> 		{</div><div class='ctx'> 			.id = V4L2_CID_EXPOSURE,</div><div class='hunk'>@@ -140,6 +196,7 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 		.set = sd_setexposure,</div><div class='ctx'> 		.get = sd_getexposure,</div><div class='ctx'> 	},</div><div class='add'>+#define AUTOGAIN_IDX 3</div><div class='ctx'> 	{</div><div class='ctx'> 		{</div><div class='ctx'> 			.id = V4L2_CID_AUTOGAIN,</div><div class='hunk'>@@ -155,6 +212,7 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 		.set = sd_setautogain,</div><div class='ctx'> 		.get = sd_getautogain,</div><div class='ctx'> 	},</div><div class='add'>+#define FREQ_IDX 4</div><div class='ctx'> 	{</div><div class='ctx'> 		{</div><div class='ctx'> 			.id	 = V4L2_CID_POWER_LINE_FREQUENCY,</div><div class='hunk'>@@ -172,31 +230,56 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct v4l2_pix_format vga_mode[] = {</div><div class='add'>+	{160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 160,</div><div class='add'>+		.sizeimage = 160 * 120 * 5 / 4,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 2 | MODE_RAW},</div><div class='ctx'> 	{160, 120, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,</div><div class='ctx'> 		.bytesperline = 160,</div><div class='del'>-		.sizeimage = 160 * 120,</div><div class='add'>+		.sizeimage = 160 * 120 * 5 / 4,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 2},</div><div class='ctx'> 	{320, 240, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,</div><div class='ctx'> 		.bytesperline = 320,</div><div class='del'>-		.sizeimage = 320 * 240,</div><div class='add'>+		.sizeimage = 320 * 240 * 5 / 4,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 1},</div><div class='ctx'> 	{640, 480, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,</div><div class='ctx'> 		.bytesperline = 640,</div><div class='del'>-		.sizeimage = 640 * 480,</div><div class='add'>+		.sizeimage = 640 * 480 * 5 / 4,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 0},</div><div class='ctx'> };</div><div class='ctx'> static struct v4l2_pix_format sif_mode[] = {</div><div class='add'>+	{160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 160,</div><div class='add'>+		.sizeimage = 160 * 120,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 1 | MODE_RAW | MODE_REDUCED_SIF},</div><div class='add'>+	{160, 120, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 160,</div><div class='add'>+		.sizeimage = 160 * 120 * 5 / 4,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 1 | MODE_REDUCED_SIF},</div><div class='add'>+	{176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 176,</div><div class='add'>+		.sizeimage = 176 * 144 * 5 / 4,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 1 | MODE_RAW},</div><div class='ctx'> 	{176, 144, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,</div><div class='ctx'> 		.bytesperline = 176,</div><div class='del'>-		.sizeimage = 176 * 144,</div><div class='add'>+		.sizeimage = 176 * 144 * 5 / 4,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 1},</div><div class='add'>+	{320, 240, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 320,</div><div class='add'>+		.sizeimage = 320 * 240 * 5 / 4,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 0 | MODE_REDUCED_SIF},</div><div class='ctx'> 	{352, 288, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,</div><div class='ctx'> 		.bytesperline = 352,</div><div class='del'>-		.sizeimage = 352 * 288,</div><div class='add'>+		.sizeimage = 352 * 288 * 5 / 4,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 0},</div><div class='ctx'> };</div><div class='hunk'>@@ -204,7 +287,7 @@ static struct v4l2_pix_format sif_mode[] = {</div><div class='ctx'> static const __u8 initHv7131[] = {</div><div class='ctx'> 	0x46, 0x77, 0x00, 0x04, 0x00, 0x00, 0x00, 0x80, 0x11, 0x00, 0x00, 0x00,</div><div class='ctx'> 	0x00, 0x00,</div><div class='del'>-	0x00, 0x00, 0x00, 0x03, 0x01, 0x00,	/* shift from 0x02 0x01 0x00 */</div><div class='add'>+	0x00, 0x00, 0x00, 0x02, 0x01, 0x00,</div><div class='ctx'> 	0x28, 0x1e, 0x60, 0x8a, 0x20,</div><div class='ctx'> 	0x1d, 0x10, 0x02, 0x03, 0x0f, 0x0c</div><div class='ctx'> };</div><div class='hunk'>@@ -218,8 +301,8 @@ static const __u8 hv7131_sensor_init[][8] = {</div><div class='ctx'> static const __u8 initOv6650[] = {</div><div class='ctx'> 	0x44, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,</div><div class='ctx'> 	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='del'>-	0x00, 0x02, 0x01, 0x0a, 0x16, 0x12, 0x68, 0x0b,</div><div class='del'>-	0x10, 0x1d, 0x10, 0x00, 0x06, 0x1f, 0x00</div><div class='add'>+	0x00, 0x01, 0x01, 0x0a, 0x16, 0x12, 0x68, 0x8b,</div><div class='add'>+	0x10, 0x1d, 0x10, 0x02, 0x02, 0x09, 0x07</div><div class='ctx'> };</div><div class='ctx'> static const __u8 ov6650_sensor_init[][8] =</div><div class='ctx'> {</div><div class='hunk'>@@ -257,15 +340,15 @@ static const __u8 ov6650_sensor_init[][8] =</div><div class='ctx'> static const __u8 initOv7630[] = {</div><div class='ctx'> 	0x04, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,	/* r01 .. r08 */</div><div class='ctx'> 	0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	/* r09 .. r10 */</div><div class='del'>-	0x00, 0x02, 0x01, 0x0a,				/* r11 .. r14 */</div><div class='add'>+	0x00, 0x01, 0x01, 0x0a,				/* r11 .. r14 */</div><div class='ctx'> 	0x28, 0x1e,			/* H &amp; V sizes     r15 .. r16 */</div><div class='del'>-	0x68, COMP1, MCK_INIT1,				/* r17 .. r19 */</div><div class='add'>+	0x68, COMP2, MCK_INIT1,				/* r17 .. r19 */</div><div class='ctx'> 	0x1d, 0x10, 0x02, 0x03, 0x0f, 0x0c		/* r1a .. r1f */</div><div class='ctx'> };</div><div class='ctx'> static const __u8 initOv7630_3[] = {</div><div class='ctx'> 	0x44, 0x44, 0x00, 0x1a, 0x20, 0x20, 0x20, 0x80,	/* r01 .. r08 */</div><div class='ctx'> 	0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,	/* r09 .. r10 */</div><div class='del'>-	0x00, 0x01, 0x01, 0x0a,				/* r11 .. r14 */</div><div class='add'>+	0x00, 0x02, 0x01, 0x0a,				/* r11 .. r14 */</div><div class='ctx'> 	0x28, 0x1e,			/* H &amp; V sizes     r15 .. r16 */</div><div class='ctx'> 	0x68, 0x8f, MCK_INIT1,				/* r17 .. r19 */</div><div class='ctx'> 	0x1d, 0x10, 0x02, 0x03, 0x0f, 0x0c, 0x00,	/* r1a .. r20 */</div><div class='hunk'>@@ -294,47 +377,65 @@ static const __u8 ov7630_sensor_init[][8] = {</div><div class='ctx'> 	{0xd0, 0x21, 0x17, 0x1c, 0xbd, 0x06, 0xf6, 0x10},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const __u8 ov7630_sensor_init_3[][8] = {</div><div class='add'>+	{0xa0, 0x21, 0x13, 0x80, 0x00,	0x00, 0x00, 0x10},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const __u8 initPas106[] = {</div><div class='ctx'> 	0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x40, 0x00, 0x00, 0x00,</div><div class='ctx'> 	0x00, 0x00,</div><div class='del'>-	0x00, 0x00, 0x00, 0x05, 0x01, 0x00,</div><div class='del'>-	0x16, 0x12, 0x28, COMP1, MCK_INIT1,</div><div class='del'>-	0x18, 0x10, 0x04, 0x03, 0x11, 0x0c</div><div class='add'>+	0x00, 0x00, 0x00, 0x04, 0x01, 0x00,</div><div class='add'>+	0x16, 0x12, 0x24, COMP1, MCK_INIT1,</div><div class='add'>+	0x18, 0x10, 0x02, 0x02, 0x09, 0x07</div><div class='ctx'> };</div><div class='ctx'> /* compression 0x86 mckinit1 0x2b */</div><div class='del'>-static const __u8 pas106_data[][2] = {</div><div class='del'>-	{0x02, 0x04},		/* Pixel Clock Divider 6 */</div><div class='del'>-	{0x03, 0x13},		/* Frame Time MSB */</div><div class='del'>-/*	{0x03, 0x12},		 * Frame Time MSB */</div><div class='del'>-	{0x04, 0x06},		/* Frame Time LSB */</div><div class='del'>-/*	{0x04, 0x05},		 * Frame Time LSB */</div><div class='del'>-	{0x05, 0x65},		/* Shutter Time Line Offset */</div><div class='del'>-/*	{0x05, 0x6d},		 * Shutter Time Line Offset */</div><div class='del'>-/*	{0x06, 0xb1},		 * Shutter Time Pixel Offset */</div><div class='del'>-	{0x06, 0xcd},		/* Shutter Time Pixel Offset */</div><div class='del'>-	{0x07, 0xc1},		/* Black Level Subtract Sign */</div><div class='del'>-/*	{0x07, 0x00},		 * Black Level Subtract Sign */</div><div class='del'>-	{0x08, 0x06},		/* Black Level Subtract Level */</div><div class='del'>-	{0x08, 0x06},		/* Black Level Subtract Level */</div><div class='del'>-/*	{0x08, 0x01},		 * Black Level Subtract Level */</div><div class='del'>-	{0x09, 0x05},		/* Color Gain B Pixel 5 a */</div><div class='del'>-	{0x0a, 0x04},		/* Color Gain G1 Pixel 1 5 */</div><div class='del'>-	{0x0b, 0x04},		/* Color Gain G2 Pixel 1 0 5 */</div><div class='del'>-	{0x0c, 0x05},		/* Color Gain R Pixel 3 1 */</div><div class='del'>-	{0x0d, 0x00},		/* Color GainH  Pixel */</div><div class='del'>-	{0x0e, 0x0e},		/* Global Gain */</div><div class='del'>-	{0x0f, 0x00},		/* Contrast */</div><div class='del'>-	{0x10, 0x06},		/* H&amp;V synchro polarity */</div><div class='del'>-	{0x11, 0x06},		/* ?default */</div><div class='del'>-	{0x12, 0x06},		/* DAC scale */</div><div class='del'>-	{0x14, 0x02},		/* ?default */</div><div class='del'>-	{0x13, 0x01},		/* Validate Settings */</div><div class='add'>+static const __u8 pas106_sensor_init[][8] = {</div><div class='add'>+	/* Pixel Clock Divider 6 */</div><div class='add'>+	{ 0xa1, 0x40, 0x02, 0x04, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* Frame Time MSB (also seen as 0x12) */</div><div class='add'>+	{ 0xa1, 0x40, 0x03, 0x13, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* Frame Time LSB (also seen as 0x05) */</div><div class='add'>+	{ 0xa1, 0x40, 0x04, 0x06, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* Shutter Time Line Offset (also seen as 0x6d) */</div><div class='add'>+	{ 0xa1, 0x40, 0x05, 0x65, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* Shutter Time Pixel Offset (also seen as 0xb1) */</div><div class='add'>+	{ 0xa1, 0x40, 0x06, 0xcd, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* Black Level Subtract Sign (also seen 0x00) */</div><div class='add'>+	{ 0xa1, 0x40, 0x07, 0xc1, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* Black Level Subtract Level (also seen 0x01) */</div><div class='add'>+	{ 0xa1, 0x40, 0x08, 0x06, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	{ 0xa1, 0x40, 0x08, 0x06, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* Color Gain B Pixel 5 a */</div><div class='add'>+	{ 0xa1, 0x40, 0x09, 0x05, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* Color Gain G1 Pixel 1 5 */</div><div class='add'>+	{ 0xa1, 0x40, 0x0a, 0x04, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* Color Gain G2 Pixel 1 0 5 */</div><div class='add'>+	{ 0xa1, 0x40, 0x0b, 0x04, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* Color Gain R Pixel 3 1 */</div><div class='add'>+	{ 0xa1, 0x40, 0x0c, 0x05, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* Color GainH  Pixel */</div><div class='add'>+	{ 0xa1, 0x40, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* Global Gain */</div><div class='add'>+	{ 0xa1, 0x40, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* Contrast */</div><div class='add'>+	{ 0xa1, 0x40, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* H&amp;V synchro polarity */</div><div class='add'>+	{ 0xa1, 0x40, 0x10, 0x06, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* ?default */</div><div class='add'>+	{ 0xa1, 0x40, 0x11, 0x06, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* DAC scale */</div><div class='add'>+	{ 0xa1, 0x40, 0x12, 0x06, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* ?default */</div><div class='add'>+	{ 0xa1, 0x40, 0x14, 0x02, 0x00, 0x00, 0x00, 0x14 },</div><div class='add'>+	/* Validate Settings */</div><div class='add'>+	{ 0xa1, 0x40, 0x13, 0x01, 0x00, 0x00, 0x00, 0x14 },</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static const __u8 initPas202[] = {</div><div class='ctx'> 	0x44, 0x44, 0x21, 0x30, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00,</div><div class='ctx'> 	0x00, 0x00,</div><div class='del'>-	0x00, 0x00, 0x00, 0x07, 0x03, 0x0a,	/* 6 */</div><div class='del'>-	0x28, 0x1e, 0x28, 0x89, 0x30,</div><div class='add'>+	0x00, 0x00, 0x00, 0x06, 0x03, 0x0a,</div><div class='add'>+	0x28, 0x1e, 0x28, 0x89, 0x20,</div><div class='ctx'> 	0x00, 0x00, 0x02, 0x03, 0x0f, 0x0c</div><div class='ctx'> };</div><div class='ctx'> static const __u8 pas202_sensor_init[][8] = {</div><div class='hunk'>@@ -364,7 +465,7 @@ static const __u8 pas202_sensor_init[][8] = {</div><div class='ctx'> static const __u8 initTas5110[] = {</div><div class='ctx'> 	0x44, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x11, 0x00, 0x00, 0x00,</div><div class='ctx'> 	0x00, 0x00,</div><div class='del'>-	0x00, 0x01, 0x00, 0x46, 0x09, 0x0a,	/* shift from 0x45 0x09 0x0a */</div><div class='add'>+	0x00, 0x01, 0x00, 0x45, 0x09, 0x0a,</div><div class='ctx'> 	0x16, 0x12, 0x60, 0x86, 0x2b,</div><div class='ctx'> 	0x14, 0x0a, 0x02, 0x02, 0x09, 0x07</div><div class='ctx'> };</div><div class='hunk'>@@ -377,7 +478,7 @@ static const __u8 tas5110_sensor_init[][8] = {</div><div class='ctx'> static const __u8 initTas5130[] = {</div><div class='ctx'> 	0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x11, 0x00, 0x00, 0x00,</div><div class='ctx'> 	0x00, 0x00,</div><div class='del'>-	0x00, 0x01, 0x00, 0x69, 0x0c, 0x0a,</div><div class='add'>+	0x00, 0x01, 0x00, 0x68, 0x0c, 0x0a,</div><div class='ctx'> 	0x28, 0x1e, 0x60, COMP, MCK_INIT,</div><div class='ctx'> 	0x18, 0x10, 0x04, 0x03, 0x11, 0x0c</div><div class='ctx'> };</div><div class='hunk'>@@ -389,6 +490,21 @@ static const __u8 tas5130_sensor_init[][8] = {</div><div class='ctx'> 	{0x30, 0x11, 0x02, 0x20, 0x70, 0x00, 0x00, 0x10},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct sensor_data sensor_data[] = {</div><div class='add'>+SENS(initHv7131, NULL, hv7131_sensor_init, NULL, NULL, 0, NO_EXPO|NO_FREQ, 0),</div><div class='add'>+SENS(initOv6650, NULL, ov6650_sensor_init, NULL, NULL, F_GAIN|F_SIF, 0, 0x60),</div><div class='add'>+SENS(initOv7630, initOv7630_3, ov7630_sensor_init, NULL, ov7630_sensor_init_3,</div><div class='add'>+	F_GAIN, 0, 0x21),</div><div class='add'>+SENS(initPas106, NULL, pas106_sensor_init, NULL, NULL, F_SIF, NO_EXPO|NO_FREQ,</div><div class='add'>+	0),</div><div class='add'>+SENS(initPas202, initPas202, pas202_sensor_init, NULL, NULL, 0,</div><div class='add'>+	NO_EXPO|NO_FREQ, 0),</div><div class='add'>+SENS(initTas5110, NULL, tas5110_sensor_init, NULL, NULL, F_GAIN|F_SIF,</div><div class='add'>+	NO_BRIGHTNESS|NO_FREQ, 0),</div><div class='add'>+SENS(initTas5130, NULL, tas5130_sensor_init, NULL, NULL, 0, NO_EXPO|NO_FREQ,</div><div class='add'>+	0),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* get one byte in gspca_dev-&gt;usb_buf */</div><div class='ctx'> static void reg_r(struct gspca_dev *gspca_dev,</div><div class='ctx'> 		  __u16 value)</div><div class='hunk'>@@ -408,8 +524,8 @@ static void reg_w(struct gspca_dev *gspca_dev,</div><div class='ctx'> 		  const __u8 *buffer,</div><div class='ctx'> 		  int len)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='del'>-	if (len &gt; sizeof gspca_dev-&gt;usb_buf) {</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='add'>+	if (len &gt; USB_BUF_SZ) {</div><div class='ctx'> 		PDEBUG(D_ERR|D_PACK, "reg_w: buffer overflow");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -425,26 +541,6 @@ static void reg_w(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			500);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void reg_w_big(struct gspca_dev *gspca_dev,</div><div class='del'>-		  __u16 value,</div><div class='del'>-		  const __u8 *buffer,</div><div class='del'>-		  int len)</div><div class='del'>-{</div><div class='del'>-	__u8 *tmpbuf;</div><div class='del'>-</div><div class='del'>-	tmpbuf = kmalloc(len, GFP_KERNEL);</div><div class='del'>-	memcpy(tmpbuf, buffer, len);</div><div class='del'>-	usb_control_msg(gspca_dev-&gt;dev,</div><div class='del'>-			usb_sndctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='del'>-			0x08,			/* request */</div><div class='del'>-			USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='del'>-			value,</div><div class='del'>-			0,			/* index */</div><div class='del'>-			tmpbuf, len,</div><div class='del'>-			500);</div><div class='del'>-	kfree(tmpbuf);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int i2c_w(struct gspca_dev *gspca_dev, const __u8 *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	int retry = 60;</div><div class='hunk'>@@ -487,7 +583,7 @@ static void setbrightness(struct gspca_dev *gspca_dev)</div><div class='ctx'> 			{0xa0, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x10};</div><div class='ctx'> </div><div class='ctx'> 		/* change reg 0x06 */</div><div class='del'>-		i2cOV[1] = sd-&gt;sensor_addr;</div><div class='add'>+		i2cOV[1] = sensor_data[sd-&gt;sensor].sensor_addr;</div><div class='ctx'> 		i2cOV[3] = sd-&gt;brightness;</div><div class='ctx'> 		if (i2c_w(gspca_dev, i2cOV) &lt; 0)</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -545,9 +641,6 @@ static void setbrightness(struct gspca_dev *gspca_dev)</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	    }</div><div class='del'>-	case SENSOR_TAS5110:</div><div class='del'>-		/* FIXME figure out howto control brightness on TAS5110 */</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return;</div><div class='ctx'> err:</div><div class='hunk'>@@ -577,7 +670,7 @@ static void setsensorgain(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	case SENSOR_OV7630: {</div><div class='ctx'> 		__u8 i2c[] = {0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10};</div><div class='ctx'> </div><div class='del'>-		i2c[1] = sd-&gt;sensor_addr;</div><div class='add'>+		i2c[1] = sensor_data[sd-&gt;sensor].sensor_addr;</div><div class='ctx'> 		i2c[3] = gain &gt;&gt; 2;</div><div class='ctx'> 		if (i2c_w(gspca_dev, i2c) &lt; 0)</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -604,7 +697,7 @@ static void setgain(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	rgb_value = gain;</div><div class='ctx'> 	reg_w(gspca_dev, 0x11, &amp;rgb_value, 1);</div><div class='ctx'> </div><div class='del'>-	if (sd-&gt;sensor_has_gain)</div><div class='add'>+	if (sensor_data[sd-&gt;sensor].flags &amp; F_GAIN)</div><div class='ctx'> 		setsensorgain(gspca_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -665,6 +758,11 @@ static void setexposure(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		else if (reg11 &gt; 16)</div><div class='ctx'> 			reg11 = 16;</div><div class='ctx'> </div><div class='add'>+		/* In 640x480, if the reg11 has less than 3, the image is</div><div class='add'>+		   unstable (not enough bandwidth). */</div><div class='add'>+		if (gspca_dev-&gt;width == 640 &amp;&amp; reg11 &lt; 3)</div><div class='add'>+			reg11 = 3;</div><div class='add'>+</div><div class='ctx'> 		/* frame exposure time in ms = 1000 * reg11 / 30    -&gt;</div><div class='ctx'> 		reg10 = sd-&gt;exposure * 2 * reg10_max / (1000 * reg11 / 30) */</div><div class='ctx'> 		reg10 = (sd-&gt;exposure * 60 * reg10_max) / (1000 * reg11);</div><div class='hunk'>@@ -678,13 +776,8 @@ static void setexposure(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		else if (reg10 &gt; reg10_max)</div><div class='ctx'> 			reg10 = reg10_max;</div><div class='ctx'> </div><div class='del'>-		/* In 640x480, if the reg11 has less than 3, the image is</div><div class='del'>-		   unstable (not enough bandwidth). */</div><div class='del'>-		if (gspca_dev-&gt;width == 640 &amp;&amp; reg11 &lt; 3)</div><div class='del'>-			reg11 = 3;</div><div class='del'>-</div><div class='ctx'> 		/* Write reg 10 and reg11 low nibble */</div><div class='del'>-		i2c[1] = sd-&gt;sensor_addr;</div><div class='add'>+		i2c[1] = sensor_data[sd-&gt;sensor].sensor_addr;</div><div class='ctx'> 		i2c[3] = reg10;</div><div class='ctx'> 		i2c[4] |= reg11 - 1;</div><div class='ctx'> </div><div class='hunk'>@@ -724,7 +817,7 @@ static void setfreq(struct gspca_dev *gspca_dev)</div><div class='ctx'> 					? 0x4f : 0x8a;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		i2c[1] = sd-&gt;sensor_addr;</div><div class='add'>+		i2c[1] = sensor_data[sd-&gt;sensor].sensor_addr;</div><div class='ctx'> 		if (i2c_w(gspca_dev, i2c) &lt; 0)</div><div class='ctx'> 			PDEBUG(D_ERR, "i2c error setfreq");</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -757,30 +850,19 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	struct cam *cam;</div><div class='del'>-	int sif = 0;</div><div class='ctx'> </div><div class='del'>-	/* nctrls depends upon the sensor, so we use a per cam copy */</div><div class='del'>-	memcpy(&amp;sd-&gt;sd_desc, gspca_dev-&gt;sd_desc, sizeof(struct sd_desc));</div><div class='del'>-	gspca_dev-&gt;sd_desc = &amp;sd-&gt;sd_desc;</div><div class='add'>+	reg_r(gspca_dev, 0x00);</div><div class='add'>+	if (gspca_dev-&gt;usb_buf[0] != 0x10)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* copy the webcam info from the device id */</div><div class='del'>-	sd-&gt;sensor = (id-&gt;driver_info &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-	if (id-&gt;driver_info &amp; (F_GAIN &lt;&lt; 16))</div><div class='del'>-		sd-&gt;sensor_has_gain = 1;</div><div class='del'>-	if (id-&gt;driver_info &amp; (F_AUTO &lt;&lt; 16))</div><div class='del'>-		sd-&gt;sd_desc.dq_callback = do_autogain;</div><div class='del'>-	if (id-&gt;driver_info &amp; (F_SIF &lt;&lt; 16))</div><div class='del'>-		sif = 1;</div><div class='del'>-	if (id-&gt;driver_info &amp; (F_H18 &lt;&lt; 16))</div><div class='del'>-		sd-&gt;fr_h_sz = 18;		/* size of frame header */</div><div class='del'>-	else</div><div class='del'>-		sd-&gt;fr_h_sz = 12;</div><div class='del'>-	sd-&gt;sd_desc.nctrls = (id-&gt;driver_info &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	sd-&gt;sensor_addr = id-&gt;driver_info &amp; 0xff;</div><div class='add'>+	sd-&gt;sensor = id-&gt;driver_info &gt;&gt; 8;</div><div class='add'>+	sd-&gt;bridge = id-&gt;driver_info &amp; 0xff;</div><div class='add'>+	gspca_dev-&gt;ctrl_dis = sensor_data[sd-&gt;sensor].ctrl_dis;</div><div class='ctx'> </div><div class='ctx'> 	cam = &amp;gspca_dev-&gt;cam;</div><div class='ctx'> 	cam-&gt;epaddr = 0x01;</div><div class='del'>-	if (!sif) {</div><div class='add'>+	if (!(sensor_data[sd-&gt;sensor].flags &amp; F_SIF)) {</div><div class='ctx'> 		cam-&gt;cam_mode = vga_mode;</div><div class='ctx'> 		cam-&gt;nmodes = ARRAY_SIZE(vga_mode);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -790,157 +872,98 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	sd-&gt;brightness = BRIGHTNESS_DEF;</div><div class='ctx'> 	sd-&gt;gain = GAIN_DEF;</div><div class='ctx'> 	sd-&gt;exposure = EXPOSURE_DEF;</div><div class='del'>-	sd-&gt;autogain = AUTOGAIN_DEF;</div><div class='add'>+	if (gspca_dev-&gt;ctrl_dis &amp; (1 &lt;&lt; AUTOGAIN_IDX))</div><div class='add'>+		sd-&gt;autogain = 0; /* Disable do_autogain callback */</div><div class='add'>+	else</div><div class='add'>+		sd-&gt;autogain = AUTOGAIN_DEF;</div><div class='ctx'> 	sd-&gt;freq = FREQ_DEF;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='del'>-	reg_r(gspca_dev, 0x00);</div><div class='del'>-	if (gspca_dev-&gt;usb_buf[0] != 0x10)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	const __u8 stop = 0x09; /* Disable stream turn of LED */</div><div class='ctx'> </div><div class='del'>-static void pas106_i2cinit(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	const __u8 *data;</div><div class='del'>-	__u8 i2c1[] = { 0xa1, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14 };</div><div class='del'>-</div><div class='del'>-	i = ARRAY_SIZE(pas106_data);</div><div class='del'>-	data = pas106_data[0];</div><div class='del'>-	while (--i &gt;= 0) {</div><div class='del'>-		memcpy(&amp;i2c1[2], data, 2);</div><div class='del'>-					/* copy 2 bytes from the template */</div><div class='del'>-		if (i2c_w(gspca_dev, i2c1) &lt; 0)</div><div class='del'>-			PDEBUG(D_ERR, "i2c error pas106");</div><div class='del'>-		data += 2;</div><div class='del'>-	}</div><div class='add'>+	reg_w(gspca_dev, 0x01, &amp;stop, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -- start the camera -- */</div><div class='ctx'> static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	int mode, l = 0x1f;</div><div class='add'>+	struct cam *cam = &amp;gspca_dev-&gt;cam;</div><div class='add'>+	int mode, l;</div><div class='ctx'> 	const __u8 *sn9c10x;</div><div class='del'>-	__u8 reg17_19[3];</div><div class='del'>-</div><div class='del'>-	mode = gspca_dev-&gt;cam.cam_mode[(int) gspca_dev-&gt;curr_mode].priv;</div><div class='add'>+	__u8 reg12_19[8];</div><div class='add'>+</div><div class='add'>+	mode = cam-&gt;cam_mode[gspca_dev-&gt;curr_mode].priv &amp; 0x07;</div><div class='add'>+	sn9c10x = sensor_data[sd-&gt;sensor].bridge_init[sd-&gt;bridge];</div><div class='add'>+	l = sensor_data[sd-&gt;sensor].bridge_init_size[sd-&gt;bridge];</div><div class='add'>+	memcpy(reg12_19, &amp;sn9c10x[0x12 - 1], 8);</div><div class='add'>+	reg12_19[6] = sn9c10x[0x18 - 1] | (mode &lt;&lt; 4);</div><div class='add'>+	/* Special cases where reg 17 and or 19 value depends on mode */</div><div class='ctx'> 	switch (sd-&gt;sensor) {</div><div class='del'>-	case SENSOR_HV7131R:</div><div class='del'>-		sn9c10x = initHv7131;</div><div class='del'>-		reg17_19[0] = 0x60;</div><div class='del'>-		reg17_19[1] = (mode &lt;&lt; 4) | 0x8a;</div><div class='del'>-		reg17_19[2] = 0x20;</div><div class='del'>-		break;</div><div class='del'>-	case SENSOR_OV6650:</div><div class='del'>-		sn9c10x = initOv6650;</div><div class='del'>-		reg17_19[0] = 0x68;</div><div class='del'>-		reg17_19[1] = (mode &lt;&lt; 4) | 0x8b;</div><div class='del'>-		reg17_19[2] = 0x20;</div><div class='del'>-		break;</div><div class='del'>-	case SENSOR_OV7630:</div><div class='del'>-		if (sd-&gt;fr_h_sz == 18) { /* SN9C103 */</div><div class='del'>-			sn9c10x = initOv7630_3;</div><div class='del'>-			l = sizeof initOv7630_3;</div><div class='del'>-		} else</div><div class='del'>-			sn9c10x = initOv7630;</div><div class='del'>-		reg17_19[0] = 0x68;</div><div class='del'>-		reg17_19[1] = (mode &lt;&lt; 4) | COMP2;</div><div class='del'>-		reg17_19[2] = MCK_INIT1;</div><div class='del'>-		break;</div><div class='del'>-	case SENSOR_PAS106:</div><div class='del'>-		sn9c10x = initPas106;</div><div class='del'>-		reg17_19[0] = 0x24;		/* 0x28 */</div><div class='del'>-		reg17_19[1] = (mode &lt;&lt; 4) | COMP1;</div><div class='del'>-		reg17_19[2] = MCK_INIT1;</div><div class='del'>-		break;</div><div class='ctx'> 	case SENSOR_PAS202:</div><div class='del'>-		sn9c10x = initPas202;</div><div class='del'>-		reg17_19[0] = mode ? 0x24 : 0x20;</div><div class='del'>-		reg17_19[1] = (mode &lt;&lt; 4) | 0x89;</div><div class='del'>-		reg17_19[2] = 0x20;</div><div class='add'>+		reg12_19[5] = mode ? 0x24 : 0x20;</div><div class='ctx'> 		break;</div><div class='del'>-	case SENSOR_TAS5110:</div><div class='del'>-		sn9c10x = initTas5110;</div><div class='del'>-		reg17_19[0] = 0x60;</div><div class='del'>-		reg17_19[1] = (mode &lt;&lt; 4) | 0x86;</div><div class='del'>-		reg17_19[2] = 0x2b;		/* 0xf3; */</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-/*	case SENSOR_TAS5130CXX: */</div><div class='del'>-		sn9c10x = initTas5130;</div><div class='del'>-		reg17_19[0] = 0x60;</div><div class='del'>-		reg17_19[1] = (mode &lt;&lt; 4) | COMP;</div><div class='del'>-		reg17_19[2] = mode ? 0x23 : 0x43;</div><div class='add'>+	case SENSOR_TAS5130CXX:</div><div class='add'>+		/* probably not mode specific at all most likely the upper</div><div class='add'>+		   nibble of 0x19 is exposure (clock divider) just as with</div><div class='add'>+		   the tas5110, we need someone to test this. */</div><div class='add'>+		reg12_19[7] = mode ? 0x23 : 0x43;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	/* Disable compression when the raw bayer format has been selected */</div><div class='add'>+	if (cam-&gt;cam_mode[gspca_dev-&gt;curr_mode].priv &amp; MODE_RAW)</div><div class='add'>+		reg12_19[6] &amp;= ~0x80;</div><div class='add'>+</div><div class='add'>+	/* Vga mode emulation on SIF sensor? */</div><div class='add'>+	if (cam-&gt;cam_mode[gspca_dev-&gt;curr_mode].priv &amp; MODE_REDUCED_SIF) {</div><div class='add'>+		reg12_19[0] += 16; /* 0x12: hstart adjust */</div><div class='add'>+		reg12_19[1] += 24; /* 0x13: vstart adjust */</div><div class='add'>+		reg12_19[3] = 320 / 16; /* 0x15: hsize */</div><div class='add'>+		reg12_19[4] = 240 / 16; /* 0x16: vsize */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* reg 0x01 bit 2 video transfert on */</div><div class='ctx'> 	reg_w(gspca_dev, 0x01, &amp;sn9c10x[0x01 - 1], 1);</div><div class='ctx'> 	/* reg 0x17 SensorClk enable inv Clk 0x60 */</div><div class='ctx'> 	reg_w(gspca_dev, 0x17, &amp;sn9c10x[0x17 - 1], 1);</div><div class='ctx'> 	/* Set the registers from the template */</div><div class='del'>-	reg_w_big(gspca_dev, 0x01, sn9c10x, l);</div><div class='del'>-	switch (sd-&gt;sensor) {</div><div class='del'>-	case SENSOR_HV7131R:</div><div class='del'>-		i2c_w_vector(gspca_dev, hv7131_sensor_init,</div><div class='del'>-				sizeof hv7131_sensor_init);</div><div class='del'>-		break;</div><div class='del'>-	case SENSOR_OV6650:</div><div class='del'>-		i2c_w_vector(gspca_dev, ov6650_sensor_init,</div><div class='del'>-				sizeof ov6650_sensor_init);</div><div class='del'>-		break;</div><div class='del'>-	case SENSOR_OV7630:</div><div class='del'>-		i2c_w_vector(gspca_dev, ov7630_sensor_init,</div><div class='del'>-				sizeof ov7630_sensor_init);</div><div class='del'>-		if (sd-&gt;fr_h_sz == 18) { /* SN9C103 */</div><div class='del'>-			const __u8 i2c[] = { 0xa0, 0x21, 0x13, 0x80, 0x00,</div><div class='del'>-						0x00, 0x00, 0x10 };</div><div class='del'>-			i2c_w(gspca_dev, i2c);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case SENSOR_PAS106:</div><div class='del'>-		pas106_i2cinit(gspca_dev);</div><div class='del'>-		break;</div><div class='del'>-	case SENSOR_PAS202:</div><div class='del'>-		i2c_w_vector(gspca_dev, pas202_sensor_init,</div><div class='del'>-				sizeof pas202_sensor_init);</div><div class='del'>-		break;</div><div class='del'>-	case SENSOR_TAS5110:</div><div class='del'>-		i2c_w_vector(gspca_dev, tas5110_sensor_init,</div><div class='del'>-				sizeof tas5110_sensor_init);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-/*	case SENSOR_TAS5130CXX: */</div><div class='del'>-		i2c_w_vector(gspca_dev, tas5130_sensor_init,</div><div class='del'>-				sizeof tas5130_sensor_init);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	reg_w(gspca_dev, 0x01, sn9c10x, l);</div><div class='add'>+</div><div class='add'>+	/* Init the sensor */</div><div class='add'>+	i2c_w_vector(gspca_dev, sensor_data[sd-&gt;sensor].sensor_init,</div><div class='add'>+			sensor_data[sd-&gt;sensor].sensor_init_size);</div><div class='add'>+	if (sensor_data[sd-&gt;sensor].sensor_bridge_init[sd-&gt;bridge])</div><div class='add'>+		i2c_w_vector(gspca_dev,</div><div class='add'>+			sensor_data[sd-&gt;sensor].sensor_bridge_init[sd-&gt;bridge],</div><div class='add'>+			sensor_data[sd-&gt;sensor].sensor_bridge_init_size[</div><div class='add'>+				sd-&gt;bridge]);</div><div class='add'>+</div><div class='ctx'> 	/* H_size V_size 0x28, 0x1e -&gt; 640x480. 0x16, 0x12 -&gt; 352x288 */</div><div class='del'>-	reg_w(gspca_dev, 0x15, &amp;sn9c10x[0x15 - 1], 2);</div><div class='add'>+	reg_w(gspca_dev, 0x15, &amp;reg12_19[3], 2);</div><div class='ctx'> 	/* compression register */</div><div class='del'>-	reg_w(gspca_dev, 0x18, &amp;reg17_19[1], 1);</div><div class='add'>+	reg_w(gspca_dev, 0x18, &amp;reg12_19[6], 1);</div><div class='ctx'> 	/* H_start */</div><div class='del'>-	reg_w(gspca_dev, 0x12, &amp;sn9c10x[0x12 - 1], 1);</div><div class='add'>+	reg_w(gspca_dev, 0x12, &amp;reg12_19[0], 1);</div><div class='ctx'> 	/* V_START */</div><div class='del'>-	reg_w(gspca_dev, 0x13, &amp;sn9c10x[0x13 - 1], 1);</div><div class='add'>+	reg_w(gspca_dev, 0x13, &amp;reg12_19[1], 1);</div><div class='ctx'> 	/* reset 0x17 SensorClk enable inv Clk 0x60 */</div><div class='ctx'> 				/*fixme: ov7630 [17]=68 8f (+20 if 102)*/</div><div class='del'>-	reg_w(gspca_dev, 0x17, &amp;reg17_19[0], 1);</div><div class='add'>+	reg_w(gspca_dev, 0x17, &amp;reg12_19[5], 1);</div><div class='ctx'> 	/*MCKSIZE -&gt;3 */	/*fixme: not ov7630*/</div><div class='del'>-	reg_w(gspca_dev, 0x19, &amp;reg17_19[2], 1);</div><div class='add'>+	reg_w(gspca_dev, 0x19, &amp;reg12_19[7], 1);</div><div class='ctx'> 	/* AE_STRX AE_STRY AE_ENDX AE_ENDY */</div><div class='ctx'> 	reg_w(gspca_dev, 0x1c, &amp;sn9c10x[0x1c - 1], 4);</div><div class='ctx'> 	/* Enable video transfert */</div><div class='ctx'> 	reg_w(gspca_dev, 0x01, &amp;sn9c10x[0], 1);</div><div class='ctx'> 	/* Compression */</div><div class='del'>-	reg_w(gspca_dev, 0x18, &amp;reg17_19[1], 2);</div><div class='add'>+	reg_w(gspca_dev, 0x18, &amp;reg12_19[6], 2);</div><div class='ctx'> 	msleep(20);</div><div class='ctx'> </div><div class='ctx'> 	sd-&gt;reg11 = -1;</div><div class='hunk'>@@ -957,18 +980,7 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='del'>-	__u8 ByteSend;</div><div class='del'>-</div><div class='del'>-	ByteSend = 0x09;	/* 0X00 */</div><div class='del'>-	reg_w(gspca_dev, 0x01, &amp;ByteSend, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='add'>+	sd_init(gspca_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='hunk'>@@ -978,6 +990,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	struct cam *cam = &amp;gspca_dev-&gt;cam;</div><div class='ctx'> </div><div class='ctx'> 	/* frames start with:</div><div class='ctx'> 	 *	ff ff 00 c4 c4 96	synchro</div><div class='hunk'>@@ -998,20 +1011,31 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			    &amp;&amp; data[5 + i] == 0x96) {	/* start of frame */</div><div class='ctx'> 				int lum = -1;</div><div class='ctx'> 				int pkt_type = LAST_PACKET;</div><div class='add'>+				int fr_h_sz = (sd-&gt;bridge == BRIDGE_103) ?</div><div class='add'>+					18 : 12;</div><div class='ctx'> </div><div class='del'>-				if (len - i &lt; sd-&gt;fr_h_sz) {</div><div class='add'>+				if (len - i &lt; fr_h_sz) {</div><div class='ctx'> 					PDEBUG(D_STREAM, "packet too short to"</div><div class='ctx'> 						" get avg brightness");</div><div class='del'>-				} else if (sd-&gt;fr_h_sz == 12) {</div><div class='del'>-					lum = data[i + 8] + (data[i + 9] &lt;&lt; 8);</div><div class='del'>-				} else {</div><div class='add'>+				} else if (sd-&gt;bridge == BRIDGE_103) {</div><div class='ctx'> 					lum = data[i + 9] +</div><div class='ctx'> 						(data[i + 10] &lt;&lt; 8);</div><div class='add'>+				} else {</div><div class='add'>+					lum = data[i + 8] + (data[i + 9] &lt;&lt; 8);</div><div class='ctx'> 				}</div><div class='del'>-				if (lum == 0) {</div><div class='add'>+				/* When exposure changes midway a frame we</div><div class='add'>+				   get a lum of 0 in this case drop 2 frames</div><div class='add'>+				   as the frames directly after an exposure</div><div class='add'>+				   change have an unstable image. Sometimes lum</div><div class='add'>+				   *really* is 0 (cam used in low light with</div><div class='add'>+				   low exposure setting), so do not drop frames</div><div class='add'>+				   if the previous lum was 0 too. */</div><div class='add'>+				if (lum == 0 &amp;&amp; sd-&gt;prev_avg_lum != 0) {</div><div class='ctx'> 					lum = -1;</div><div class='ctx'> 					sd-&gt;frames_to_drop = 2;</div><div class='del'>-				}</div><div class='add'>+					sd-&gt;prev_avg_lum = 0;</div><div class='add'>+				} else</div><div class='add'>+					sd-&gt;prev_avg_lum = lum;</div><div class='ctx'> 				atomic_set(&amp;sd-&gt;avg_lum, lum);</div><div class='ctx'> </div><div class='ctx'> 				if (sd-&gt;frames_to_drop) {</div><div class='hunk'>@@ -1021,14 +1045,25 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> </div><div class='ctx'> 				frame = gspca_frame_add(gspca_dev, pkt_type,</div><div class='ctx'> 							frame, data, 0);</div><div class='del'>-				data += i + sd-&gt;fr_h_sz;</div><div class='del'>-				len -= i + sd-&gt;fr_h_sz;</div><div class='add'>+				data += i + fr_h_sz;</div><div class='add'>+				len -= i + fr_h_sz;</div><div class='ctx'> 				gspca_frame_add(gspca_dev, FIRST_PACKET,</div><div class='ctx'> 						frame, data, len);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (cam-&gt;cam_mode[gspca_dev-&gt;curr_mode].priv &amp; MODE_RAW) {</div><div class='add'>+		/* In raw mode we sometimes get some garbage after the frame</div><div class='add'>+		   ignore this */</div><div class='add'>+		int used = frame-&gt;data_end - frame-&gt;data;</div><div class='add'>+		int size = cam-&gt;cam_mode[gspca_dev-&gt;curr_mode].sizeimage;</div><div class='add'>+</div><div class='add'>+		if (used + len &gt; size)</div><div class='add'>+			len = size - used;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	gspca_frame_add(gspca_dev, INTER_PACKET,</div><div class='ctx'> 			frame, data, len);</div><div class='ctx'> }</div><div class='hunk'>@@ -1162,58 +1197,45 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='del'>-	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> 	.querymenu = sd_querymenu,</div><div class='add'>+	.dq_callback = do_autogain,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module initialisation -- */</div><div class='del'>-#define SFCI(sensor, flags, nctrls, i2c_addr) \</div><div class='del'>-	.driver_info = (SENSOR_ ## sensor &lt;&lt; 24) \</div><div class='del'>-			| ((flags) &lt;&lt; 16) \</div><div class='del'>-			| ((nctrls) &lt;&lt; 8) \</div><div class='del'>-			| (i2c_addr)</div><div class='add'>+#define SB(sensor, bridge) \</div><div class='add'>+	.driver_info = (SENSOR_ ## sensor &lt;&lt; 8) | BRIDGE_ ## bridge</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static __devinitdata struct usb_device_id device_table[] = {</div><div class='del'>-#ifndef CONFIG_USB_SN9C102</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x6001),			/* SN9C102 */</div><div class='del'>-			SFCI(TAS5110, F_GAIN|F_AUTO|F_SIF, 4, 0)},</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x6005),			/* SN9C101 */</div><div class='del'>-			SFCI(TAS5110, F_GAIN|F_AUTO|F_SIF, 4, 0)},</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x6007),			/* SN9C101 */</div><div class='del'>-			SFCI(TAS5110, F_GAIN|F_AUTO|F_SIF, 4, 0)},</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x6009),			/* SN9C101 */</div><div class='del'>-			SFCI(PAS106, F_SIF, 2, 0)},</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x600d),			/* SN9C101 */</div><div class='del'>-			SFCI(PAS106, F_SIF, 2, 0)},</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x6001), SB(TAS5110, 102)}, /* TAS5110C1B */</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x6005), SB(TAS5110, 101)}, /* TAS5110C1B */</div><div class='add'>+#if !defined CONFIG_USB_SN9C102 &amp;&amp; !defined CONFIG_USB_SN9C102_MODULE</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x6007), SB(TAS5110, 101)}, /* TAS5110D */</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x6009), SB(PAS106, 101)},</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x600d), SB(PAS106, 101)},</div><div class='ctx'> #endif</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x6011),		/* SN9C101 - SN9C101G */</div><div class='del'>-			SFCI(OV6650, F_GAIN|F_AUTO|F_SIF, 5, 0x60)},</div><div class='del'>-#ifndef CONFIG_USB_SN9C102</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x6019),			/* SN9C101 */</div><div class='del'>-			SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)},</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x6024),			/* SN9C102 */</div><div class='del'>-			SFCI(TAS5130CXX, 0, 2, 0)},</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x6025),			/* SN9C102 */</div><div class='del'>-			SFCI(TAS5130CXX, 0, 2, 0)},</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x6028),			/* SN9C102 */</div><div class='del'>-			SFCI(PAS202, 0, 2, 0)},</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x6029),			/* SN9C101 */</div><div class='del'>-			SFCI(PAS106, F_SIF, 2, 0)},</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x602c),			/* SN9C102 */</div><div class='del'>-			SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)},</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x602d),			/* SN9C102 */</div><div class='del'>-			SFCI(HV7131R, 0, 2, 0)},</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x602e),			/* SN9C102 */</div><div class='del'>-			SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)},</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x60af),			/* SN9C103 */</div><div class='del'>-			SFCI(PAS202, F_H18, 2, 0)},</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x60b0),			/* SN9C103 */</div><div class='del'>-			SFCI(OV7630, F_GAIN|F_AUTO|F_H18, 5, 0x21)},</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x6011), SB(OV6650, 101)},</div><div class='add'>+#if !defined CONFIG_USB_SN9C102 &amp;&amp; !defined CONFIG_USB_SN9C102_MODULE</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x6019), SB(OV7630, 101)},</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x6024), SB(TAS5130CXX, 102)},</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x6025), SB(TAS5130CXX, 102)},</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x6028), SB(PAS202, 102)},</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x6029), SB(PAS106, 102)},</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x602c), SB(OV7630, 102)},</div><div class='ctx'> #endif</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x602d), SB(HV7131R, 102)},</div><div class='add'>+#if !defined CONFIG_USB_SN9C102 &amp;&amp; !defined CONFIG_USB_SN9C102_MODULE</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x602e), SB(OV7630, 102)},</div><div class='add'>+#endif</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x608f), SB(OV7630, 103)},</div><div class='add'>+#if !defined CONFIG_USB_SN9C102 &amp;&amp; !defined CONFIG_USB_SN9C102_MODULE</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x60af), SB(PAS202, 103)},</div><div class='add'>+#endif</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x60b0), SB(OV7630, 103)},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, device_table);</div><div class='hunk'>@@ -1231,6 +1253,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c<br/>index 33a3df1f6915..d75b1d20b318 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sonixj.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/sonixj.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sonixj.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/sonixj.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> struct sd {</div><div class='ctx'> 	struct gspca_dev gspca_dev;	/* !! must be the first item */</div><div class='ctx'> </div><div class='del'>-	int avg_lum;</div><div class='add'>+	atomic_t avg_lum;</div><div class='ctx'> 	unsigned int exposure;</div><div class='ctx'> </div><div class='ctx'> 	unsigned short brightness;</div><div class='hunk'>@@ -54,8 +54,10 @@ struct sd {</div><div class='ctx'> #define SENSOR_HV7131R 0</div><div class='ctx'> #define SENSOR_MI0360 1</div><div class='ctx'> #define SENSOR_MO4000 2</div><div class='del'>-#define SENSOR_OV7648 3</div><div class='del'>-#define SENSOR_OV7660 4</div><div class='add'>+#define SENSOR_OM6802 3</div><div class='add'>+#define SENSOR_OV7630 4</div><div class='add'>+#define SENSOR_OV7648 5</div><div class='add'>+#define SENSOR_OV7660 6</div><div class='ctx'> 	unsigned char i2c_base;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -76,7 +78,8 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 		.type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='ctx'> 		.name    = "Brightness",</div><div class='ctx'> 		.minimum = 0,</div><div class='del'>-		.maximum = 0xffff,</div><div class='add'>+#define BRIGHTNESS_MAX 0xffff</div><div class='add'>+		.maximum = BRIGHTNESS_MAX,</div><div class='ctx'> 		.step    = 1,</div><div class='ctx'> #define BRIGHTNESS_DEF 0x7fff</div><div class='ctx'> 		.default_value = BRIGHTNESS_DEF,</div><div class='hunk'>@@ -90,7 +93,8 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 		.type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='ctx'> 		.name    = "Contrast",</div><div class='ctx'> 		.minimum = 0,</div><div class='del'>-		.maximum = 127,</div><div class='add'>+#define CONTRAST_MAX 127</div><div class='add'>+		.maximum = CONTRAST_MAX,</div><div class='ctx'> 		.step    = 1,</div><div class='ctx'> #define CONTRAST_DEF 63</div><div class='ctx'> 		.default_value = CONTRAST_DEF,</div><div class='hunk'>@@ -104,14 +108,15 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 		.type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='ctx'> 		.name    = "Color",</div><div class='ctx'> 		.minimum = 0,</div><div class='del'>-		.maximum = 255,</div><div class='add'>+		.maximum = 64,</div><div class='ctx'> 		.step    = 1,</div><div class='del'>-#define COLOR_DEF 127</div><div class='add'>+#define COLOR_DEF 32</div><div class='ctx'> 		.default_value = COLOR_DEF,</div><div class='ctx'> 	    },</div><div class='ctx'> 	    .set = sd_setcolors,</div><div class='ctx'> 	    .get = sd_getcolors,</div><div class='ctx'> 	},</div><div class='add'>+#define AUTOGAIN_IDX 3</div><div class='ctx'> 	{</div><div class='ctx'> 	    {</div><div class='ctx'> 		.id      = V4L2_CID_AUTOGAIN,</div><div class='hunk'>@@ -131,7 +136,7 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> static struct v4l2_pix_format vga_mode[] = {</div><div class='ctx'> 	{160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,</div><div class='ctx'> 		.bytesperline = 160,</div><div class='del'>-		.sizeimage = 160 * 120 * 3 / 8 + 590,</div><div class='add'>+		.sizeimage = 160 * 120 * 4 / 8 + 590,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_JPEG,</div><div class='ctx'> 		.priv = 2},</div><div class='ctx'> 	{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,</div><div class='hunk'>@@ -148,55 +153,83 @@ static struct v4l2_pix_format vga_mode[] = {</div><div class='ctx'> </div><div class='ctx'> /*Data from sn9c102p+hv71331r */</div><div class='ctx'> static const __u8 sn_hv7131[] = {</div><div class='del'>-/*	reg0  reg1  reg2  reg3  reg4  reg5  reg6  reg7  reg8  reg9 */</div><div class='del'>-	0x00, 0x03, 0x64, 0x00, 0x1A, 0x20, 0x20, 0x20, 0xA1, 0x11,</div><div class='del'>-/*	rega  regb  regc  regd  rege  regf  reg10 reg11 */</div><div class='del'>-	0x02, 0x09, 0x00, 0x00, 0x00, 0x10, 0x03, 0x00,		/* 00 */</div><div class='del'>-/*	reg12 reg13 reg14 reg15 reg16 reg17 reg18 reg19 reg1a reg1b */</div><div class='del'>-	0x00, 0x01, 0x03, 0x28, 0x1e, 0x41, 0x0a, 0x00, 0x00, 0x00,</div><div class='del'>-/*	reg1c reg1d reg1e reg1f reg20 reg21 reg22 reg23 */</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00</div><div class='add'>+/*	reg0	reg1	reg2	reg3	reg4	reg5	reg6	reg7 */</div><div class='add'>+	0x00,	0x03,	0x64,	0x00,	0x1a,	0x20,	0x20,	0x20,</div><div class='add'>+/*	reg8	reg9	rega	regb	regc	regd	rege	regf */</div><div class='add'>+	0xa1,	0x11,	0x02,	0x09,	0x00,	0x00,	0x00,	0x10,</div><div class='add'>+/*	reg10	reg11	reg12	reg13	reg14	reg15	reg16	reg17 */</div><div class='add'>+	0x03,	0x00,	0x00,	0x01,	0x03,	0x28,	0x1e,	0x41,</div><div class='add'>+/*	reg18	reg19	reg1a	reg1b	reg1c	reg1d	reg1e	reg1f */</div><div class='add'>+	0x0a,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const __u8 sn_mi0360[] = {</div><div class='del'>-/*	reg0  reg1  reg2  reg3  reg4  reg5  reg6  reg7  reg8  reg9 */</div><div class='del'>-	0x00, 0x61, 0x44, 0x00, 0x1a, 0x20, 0x20, 0x20, 0xb1, 0x5d,</div><div class='del'>-/*	rega  regb  regc  regd  rege  regf  reg10 reg11 */</div><div class='del'>-	0x07, 0x00, 0x00, 0x00, 0x00, 0x10, 0x03, 0x00,</div><div class='del'>-/*	reg12 reg13 reg14 reg15 reg16 reg17 reg18 reg19 reg1a reg1b */</div><div class='del'>-	0x00, 0x02, 0x0a, 0x28, 0x1e, 0x61, 0x06, 0x00, 0x00, 0x00,</div><div class='del'>-/*	reg1c reg1d reg1e reg1f reg20 reg21 reg22 reg23 */</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00</div><div class='add'>+/*	reg0	reg1	reg2	reg3	reg4	reg5	reg6	reg7 */</div><div class='add'>+	0x00,	0x61,	0x44,	0x00,	0x1a,	0x20,	0x20,	0x20,</div><div class='add'>+/*	reg8	reg9	rega	regb	regc	regd	rege	regf */</div><div class='add'>+	0xb1,	0x5d,	0x07,	0x00,	0x00,	0x00,	0x00,	0x10,</div><div class='add'>+/*	reg10	reg11	reg12	reg13	reg14	reg15	reg16	reg17 */</div><div class='add'>+	0x03,	0x00,	0x00,	0x02,	0x0a,	0x28,	0x1e,	0x61,</div><div class='add'>+/*	reg18	reg19	reg1a	reg1b	reg1c	reg1d	reg1e	reg1f */</div><div class='add'>+	0x06,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const __u8 sn_mo4000[] = {</div><div class='del'>-/*	reg0	reg1	reg2	reg3	reg4	reg5	reg6	reg7	reg8 */</div><div class='del'>-	0x12,	0x23,	0x60,	0x00,	0x1A,	0x00,	0x20,	0x18,	0x81,</div><div class='del'>-/*	reg9	rega	regb	regc	regd	rege	regf	reg10	reg11*/</div><div class='del'>-	0x21,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00,	0x03,	0x00,</div><div class='del'>-/*	reg12	reg13	reg14	reg15	reg16	reg17	reg18	reg19	reg1a*/</div><div class='del'>-	0x0b,	0x0f,	0x14,	0x28,	0x1e,	0x40,	0x08,	0x00,	0x00,</div><div class='del'>-/*	reg1b	reg1c	reg1d	reg1e	reg1f	reg20	reg21	reg22	reg23*/</div><div class='del'>-	0x00,	0x00,	0x00,	0x00,	0x00,	0x08,	0x25,	0x39,	0x4b,</div><div class='del'>-	0x5c,	0x6b,	0x79,	0x87,	0x95,	0xa2,	0xaf,	0xbb,	0xc7,</div><div class='del'>-	0xd3,	0xdf,	0xea,	0xf5</div><div class='add'>+/*	reg0	reg1	reg2	reg3	reg4	reg5	reg6	reg7 */</div><div class='add'>+	0x12,	0x23,	0x60,	0x00,	0x1a,	0x00,	0x20,	0x18,</div><div class='add'>+/*	reg8	reg9	rega	regb	regc	regd	rege	regf */</div><div class='add'>+	0x81,	0x21,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00,</div><div class='add'>+/*	reg10	reg11	reg12	reg13	reg14	reg15	reg16	reg17 */</div><div class='add'>+	0x03,	 0x00,	0x0b,	0x0f,	0x14,	0x28,	0x1e,	0x40,</div><div class='add'>+/*	reg18	reg19	reg1a	reg1b	reg1c	reg1d	reg1e	reg1f */</div><div class='add'>+	0x08,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const __u8 sn_om6802[] = {</div><div class='add'>+/*	reg0	reg1	reg2	reg3	reg4	reg5	reg6	reg7 */</div><div class='add'>+	0x00,	0x23,	0x72,	0x00,	0x1a,	0x34,	0x27,	0x20,</div><div class='add'>+/*	reg8	reg9	rega	regb	regc	regd	rege	regf */</div><div class='add'>+	0x80,	0x34,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00,</div><div class='add'>+/*	reg10	reg11	reg12	reg13	reg14	reg15	reg16	reg17 */</div><div class='add'>+	0x03,	0x00,	0x51,	0x01,	0x00,	0x28,	0x1e,	0x40,</div><div class='add'>+/*	reg18	reg19	reg1a	reg1b	reg1c	reg1d	reg1e	reg1f */</div><div class='add'>+	0x05,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00,</div><div class='add'>+	0x08,	0x22,	0x44,	0x63,	0x7d,	0x92,	0xa3,	0xaf,</div><div class='add'>+	0xbc,	0xc4,	0xcd,	0xd5,	0xdc,	0xe1,	0xe8,	0xef,</div><div class='add'>+	0xf7</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const __u8 sn_ov7630[] = {</div><div class='add'>+/*	reg0	reg1	reg2	reg3	reg4	reg5	reg6	reg7 */</div><div class='add'>+	0x00,	0x21,	0x40,	0x00,	0x1a,	0x20,	0x1f,	0x20,</div><div class='add'>+/*	reg8	reg9	rega	regb	regc	regd	rege	regf */</div><div class='add'>+	0xa1,	0x21,	0x76,	0x21,	0x00,	0x00,	0x00,	0x10,</div><div class='add'>+/*	reg10	reg11	reg12	reg13	reg14	reg15	reg16	reg17 */</div><div class='add'>+	0x03,	0x00,	0x04,	0x01,	0x0a,	0x28,	0x1e,	0xc2,</div><div class='add'>+/*	reg18	reg19	reg1a	reg1b	reg1c	reg1d	reg1e	reg1f */</div><div class='add'>+	0x0b,	0x00,	0x00,	0x00,	0x00,	0x00</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const __u8 sn_ov7648[] = {</div><div class='del'>-	0x00, 0x21, 0x62, 0x00, 0x1a, 0x20, 0x20, 0x20, 0xA1, 0x6E, 0x18, 0x65,</div><div class='del'>-	0x00, 0x00, 0x00, 0x10, 0x03, 0x00, 0x00, 0x06, 0x06, 0x28, 0x1E, 0x82,</div><div class='del'>-	0x07, 0x00, 0x00, 0x00, 0x00, 0x00</div><div class='add'>+/*	reg0	reg1	reg2	reg3	reg4	reg5	reg6	reg7 */</div><div class='add'>+	0x00,	0x21,	0x62,	0x00,	0x1a,	0x20,	0x20,	0x20,</div><div class='add'>+/*	reg8	reg9	rega	regb	regc	regd	rege	regf */</div><div class='add'>+	0xa1,	0x6e,	0x18,	0x65,	0x00,	0x00,	0x00,	0x10,</div><div class='add'>+/*	reg10	reg11	reg12	reg13	reg14	reg15	reg16	reg17 */</div><div class='add'>+	0x03,	0x00,	0x00,	0x06,	0x06,	0x28,	0x1e,	0x82,</div><div class='add'>+/*	reg18	reg19	reg1a	reg1b	reg1c	reg1d	reg1e	reg1f */</div><div class='add'>+	0x07,	0x00,	0x00,	0x00,	0x00,	0x00</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const __u8 sn_ov7660[]	= {</div><div class='del'>-/*	reg0	reg1	reg2	reg3	reg4	reg5	reg6	reg7	reg8 */</div><div class='del'>-	0x00,	0x61,	0x40,	0x00,	0x1a,	0x00,	0x00,	0x00,	0x81,</div><div class='del'>-/* 	reg9	rega	regb	regc	regd	rege	regf	reg10	reg11*/</div><div class='del'>-	0x21,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00,	0x03,	0x00,</div><div class='del'>-/*	reg12	reg13	reg14	reg15	reg16	reg17	reg18	reg19	reg1a*/</div><div class='del'>-	0x01,	0x01,	0x14,	0x28,	0x1e,	0x00,	0x07,	0x00,	0x00,</div><div class='del'>-/*	reg1b	reg1c	reg1d	reg1e	reg1f	reg20	reg21	reg22	reg23*/</div><div class='del'>-	0x00,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00</div><div class='add'>+/*	reg0	reg1	reg2	reg3	reg4	reg5	reg6	reg7 */</div><div class='add'>+	0x00,	0x61,	0x40,	0x00,	0x1a,	0x20,	0x20,	0x20,</div><div class='add'>+/*	reg8	reg9	rega	regb	regc	regd	rege	regf */</div><div class='add'>+	0x81,	0x21,	0x07,	0x00,	0x00,	0x00,	0x00,	0x10,</div><div class='add'>+/*	reg10	reg11	reg12	reg13	reg14	reg15	reg16	reg17 */</div><div class='add'>+	0x03,	0x00,	0x01,	0x01,	0x08,	0x28,	0x1e,	0x20,</div><div class='add'>+/*	reg18	reg19	reg1a	reg1b	reg1c	reg1d	reg1e	reg1f */</div><div class='add'>+	0x07,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* sequence specific to the sensors - !! index = SENSOR_xxx */</div><div class='hunk'>@@ -204,50 +237,22 @@ static const __u8 *sn_tb[] = {</div><div class='ctx'> 	sn_hv7131,</div><div class='ctx'> 	sn_mi0360,</div><div class='ctx'> 	sn_mo4000,</div><div class='add'>+	sn_om6802,</div><div class='add'>+	sn_ov7630,</div><div class='ctx'> 	sn_ov7648,</div><div class='ctx'> 	sn_ov7660</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const __u8 regsn20[] = {</div><div class='add'>+static const __u8 gamma_def[] = {</div><div class='ctx'> 	0x00, 0x2d, 0x46, 0x5a, 0x6c, 0x7c, 0x8b, 0x99,</div><div class='ctx'> 	0xa6, 0xb2, 0xbf, 0xca, 0xd5, 0xe0, 0xeb, 0xf5, 0xff</div><div class='ctx'> };</div><div class='del'>-static const __u8 regsn20_sn9c120[] = {</div><div class='del'>-	0x00, 0x25, 0x3c, 0x50, 0x62, 0x72, 0x81, 0x90,</div><div class='del'>-	0x9e, 0xab, 0xb8, 0xc5, 0xd1, 0xdd, 0xe9, 0xf4, 0xff</div><div class='del'>-};</div><div class='del'>-static const __u8 regsn20_sn9c325[] = {</div><div class='del'>-	0x0a, 0x3a, 0x56, 0x6c, 0x7e, 0x8d, 0x9a, 0xa4,</div><div class='del'>-	0xaf, 0xbb, 0xc5, 0xcd, 0xd5, 0xde, 0xe8, 0xed, 0xf5</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static const __u8 reg84[] = {</div><div class='ctx'> 	0x14, 0x00, 0x27, 0x00, 0x07, 0x00, 0xe5, 0x0f,</div><div class='ctx'> 	0xe4, 0x0f, 0x38, 0x00, 0x3e, 0x00, 0xc3, 0x0f,</div><div class='del'>-/*	0x00, 0x00, 0x00, 0x00, 0x00 */</div><div class='del'>-	0xf7, 0x0f, 0x0a, 0x00, 0x00</div><div class='del'>-};</div><div class='del'>-static const __u8 reg84_sn9c120_1[] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='del'>-	0x00, 0x00, 0x0c, 0x00, 0x00</div><div class='del'>-};</div><div class='del'>-static const __u8 reg84_sn9c120_2[] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='del'>-	0x00, 0x00, 0x0c, 0x02, 0x3b</div><div class='add'>+	0xf7, 0x0f, 0x00, 0x00, 0x00</div><div class='ctx'> };</div><div class='del'>-static const __u8 reg84_sn9c120_3[] = {</div><div class='del'>-	0x14, 0x00, 0x27, 0x00, 0x08, 0x00, 0xeb, 0x0f,</div><div class='del'>-	0xd5, 0x0f, 0x42, 0x00, 0x41, 0x00, 0xca, 0x0f,</div><div class='del'>-	0xf5, 0x0f, 0x0c, 0x02, 0x3b</div><div class='del'>-};</div><div class='del'>-static const __u8 reg84_sn9c325[] = {</div><div class='del'>-	0x14, 0x00, 0x27, 0x00, 0x07, 0x00, 0xe4, 0x0f,</div><div class='del'>-	0xd3, 0x0f, 0x4b, 0x00, 0x48, 0x00, 0xc0, 0x0f,</div><div class='del'>-	0xf8, 0x0f, 0x00, 0x00, 0x00</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const __u8 hv7131r_sensor_init[][8] = {</div><div class='ctx'> 	{0xC1, 0x11, 0x01, 0x08, 0x01, 0x00, 0x00, 0x10},</div><div class='ctx'> 	{0xB1, 0x11, 0x34, 0x17, 0x7F, 0x00, 0x00, 0x10},</div><div class='hunk'>@@ -356,21 +361,105 @@ static const __u8 mo4000_sensor_init[][8] = {</div><div class='ctx'> 	{0xa1, 0x21, 0x11, 0x38, 0x00, 0x00, 0x00, 0x10},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='add'>+static __u8 om6802_sensor_init[][8] = {</div><div class='add'>+	{0xa0, 0x34, 0x90, 0x05, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xa0, 0x34, 0x49, 0x85, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xa0, 0x34, 0x5a, 0xc0, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xa0, 0x34, 0xdd, 0x18, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+/*	{0xa0, 0x34, 0xfb, 0x11, 0x00, 0x00, 0x00, 0x10}, */</div><div class='add'>+	{0xa0, 0x34, 0xf0, 0x04, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+					/* white balance &amp; auto-exposure */</div><div class='add'>+/*	{0xa0, 0x34, 0xf1, 0x02, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+							 * set color mode */</div><div class='add'>+/*	{0xa0, 0x34, 0xfe, 0x5b, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+						 * max AGC value in AE */</div><div class='add'>+/*	{0xa0, 0x34, 0xe5, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+							 * preset AGC */</div><div class='add'>+/*	{0xa0, 0x34, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+						 * preset brightness */</div><div class='add'>+/*	{0xa0, 0x34, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+							 * preset contrast */</div><div class='add'>+/*	{0xa0, 0x34, 0xe8, 0x31, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+							 * preset gamma */</div><div class='add'>+	{0xa0, 0x34, 0xe9, 0x0f, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+					/* luminance mode (0x4f = AE) */</div><div class='add'>+	{0xa0, 0x34, 0xe4, 0xff, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+							/* preset shutter */</div><div class='add'>+/*	{0xa0, 0x34, 0xef, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+							 * auto frame rate */</div><div class='add'>+/*	{0xa0, 0x34, 0xfb, 0xee, 0x00, 0x00, 0x00, 0x10}, */</div><div class='add'>+</div><div class='add'>+/*	{0xa0, 0x34, 0x71, 0x84, 0x00, 0x00, 0x00, 0x10}, */</div><div class='add'>+/*	{0xa0, 0x34, 0x72, 0x05, 0x00, 0x00, 0x00, 0x10}, */</div><div class='add'>+/*	{0xa0, 0x34, 0x68, 0x80, 0x00, 0x00, 0x00, 0x10}, */</div><div class='add'>+/*	{0xa0, 0x34, 0x69, 0x01, 0x00, 0x00, 0x00, 0x10}, */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+static const __u8 ov7630_sensor_init[][8] = {</div><div class='add'>+	{0xa1, 0x21, 0x76, 0x01, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x12, 0xc8, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+/* win: delay 20ms */</div><div class='add'>+	{0xa1, 0x21, 0x12, 0x48, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x12, 0xc8, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+/* win: delay 20ms */</div><div class='add'>+	{0xa1, 0x21, 0x12, 0x48, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+/* win: i2c_r from 00 to 80 */</div><div class='add'>+	{0xd1, 0x21, 0x03, 0x80, 0x10, 0x20, 0x80, 0x10},</div><div class='add'>+	{0xb1, 0x21, 0x0c, 0x20, 0x20, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xd1, 0x21, 0x11, 0x00, 0x48, 0xc0, 0x00, 0x10},</div><div class='add'>+	{0xb1, 0x21, 0x15, 0x80, 0x03, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xd1, 0x21, 0x17, 0x1b, 0xbd, 0x05, 0xf6, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x1b, 0x04, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xd1, 0x21, 0x1f, 0x00, 0x80, 0x80, 0x80, 0x10},</div><div class='add'>+	{0xd1, 0x21, 0x23, 0xde, 0x10, 0x8a, 0xa0, 0x10},</div><div class='add'>+	{0xc1, 0x21, 0x27, 0xca, 0xa2, 0x74, 0x00, 0x10},</div><div class='add'>+	{0xd1, 0x21, 0x2a, 0x88, 0x00, 0x88, 0x01, 0x10},</div><div class='add'>+	{0xc1, 0x21, 0x2e, 0x80, 0x00, 0x18, 0x00, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x21, 0x08, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x22, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xb1, 0x21, 0x32, 0xc2, 0x08, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xb1, 0x21, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xd1, 0x21, 0x60, 0x05, 0x40, 0x12, 0x57, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x64, 0x73, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xd1, 0x21, 0x65, 0x00, 0x55, 0x01, 0xac, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x69, 0x38, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xd1, 0x21, 0x6f, 0x1f, 0x01, 0x00, 0x10, 0x10},</div><div class='add'>+	{0xd1, 0x21, 0x73, 0x50, 0x20, 0x02, 0x01, 0x10},</div><div class='add'>+	{0xd1, 0x21, 0x77, 0xf3, 0x90, 0x98, 0x98, 0x10},</div><div class='add'>+	{0xc1, 0x21, 0x7b, 0x00, 0x4c, 0xf7, 0x00, 0x10},</div><div class='add'>+	{0xd1, 0x21, 0x17, 0x1b, 0xbd, 0x05, 0xf6, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x1b, 0x04, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+/* */</div><div class='add'>+	{0xa1, 0x21, 0x12, 0x48, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x12, 0x48, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+/*fixme: + 0x12, 0x04*/</div><div class='add'>+	{0xa1, 0x21, 0x75, 0x82, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x10, 0x32, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xb1, 0x21, 0x01, 0x80, 0x80, 0x00, 0x00, 0x10},</div><div class='add'>+/* */</div><div class='add'>+	{0xa1, 0x21, 0x11, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x2a, 0x88, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x2b, 0x34, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+/* */</div><div class='add'>+	{0xa1, 0x21, 0x10, 0x83, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+/*	{0xb1, 0x21, 0x01, 0x88, 0x70, 0x00, 0x00, 0x10}, */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='ctx'> static const __u8 ov7660_sensor_init[][8] = {</div><div class='ctx'> 	{0xa1, 0x21, 0x12, 0x80, 0x00, 0x00, 0x00, 0x10}, /* reset SCCB */</div><div class='ctx'> /*		(delay 20ms) */</div><div class='ctx'> 	{0xa1, 0x21, 0x12, 0x05, 0x00, 0x00, 0x00, 0x10},</div><div class='del'>-						/* Outformat ?? rawRGB */</div><div class='add'>+						/* Outformat = rawRGB */</div><div class='ctx'> 	{0xa1, 0x21, 0x13, 0xb8, 0x00, 0x00, 0x00, 0x10}, /* init COM8 */</div><div class='del'>-	{0xd1, 0x21, 0x00, 0x01, 0x74, 0x92, 0x00, 0x10},</div><div class='del'>-/*	{0xd1, 0x21, 0x00, 0x01, 0x74, 0x74, 0x00, 0x10}, */</div><div class='add'>+	{0xd1, 0x21, 0x00, 0x01, 0x74, 0x74, 0x00, 0x10},</div><div class='ctx'> 						/* GAIN BLUE RED VREF */</div><div class='ctx'> 	{0xd1, 0x21, 0x04, 0x00, 0x7d, 0x62, 0x00, 0x10},</div><div class='ctx'> 						/* COM 1 BAVE GEAVE AECHH */</div><div class='ctx'> 	{0xb1, 0x21, 0x08, 0x83, 0x01, 0x00, 0x00, 0x10}, /* RAVE COM2 */</div><div class='ctx'> 	{0xd1, 0x21, 0x0c, 0x00, 0x08, 0x04, 0x4f, 0x10}, /* COM 3 4 5 6 */</div><div class='del'>-	{0xd1, 0x21, 0x10, 0x7f, 0x40, 0x05, 0xf8, 0x10},</div><div class='del'>-/*	{0xd1, 0x21, 0x10, 0x7f, 0x40, 0x05, 0xff, 0x10}, */</div><div class='add'>+	{0xd1, 0x21, 0x10, 0x7f, 0x40, 0x05, 0xff, 0x10},</div><div class='ctx'> 						/* AECH CLKRC COM7 COM8 */</div><div class='ctx'> 	{0xc1, 0x21, 0x14, 0x2c, 0x00, 0x02, 0x00, 0x10}, /* COM9 COM10 */</div><div class='ctx'> 	{0xd1, 0x21, 0x17, 0x10, 0x60, 0x02, 0x7b, 0x10},</div><div class='hunk'>@@ -379,8 +468,8 @@ static const __u8 ov7660_sensor_init[][8] = {</div><div class='ctx'> 	{0xb1, 0x21, 0x1e, 0x01, 0x0e, 0x00, 0x00, 0x10}, /* MVFP LAEC */</div><div class='ctx'> 	{0xd1, 0x21, 0x20, 0x07, 0x07, 0x07, 0x07, 0x10},</div><div class='ctx'> 					/* BOS GBOS GROS ROS (BGGR offset) */</div><div class='del'>-	{0xd1, 0x21, 0x24, 0x68, 0x58, 0xd4, 0x80, 0x10},</div><div class='del'>-/*	{0xd1, 0x21, 0x24, 0x78, 0x68, 0xd4, 0x80, 0x10}, */</div><div class='add'>+/*	{0xd1, 0x21, 0x24, 0x68, 0x58, 0xd4, 0x80, 0x10}, */</div><div class='add'>+	{0xd1, 0x21, 0x24, 0x78, 0x68, 0xd4, 0x80, 0x10},</div><div class='ctx'> 						/* AEW AEB VPT BBIAS */</div><div class='ctx'> 	{0xd1, 0x21, 0x28, 0x80, 0x30, 0x00, 0x00, 0x10},</div><div class='ctx'> 						/* GbBIAS RSVD EXHCH EXHCL */</div><div class='hunk'>@@ -407,9 +496,9 @@ static const __u8 ov7660_sensor_init[][8] = {</div><div class='ctx'> 	{0xd1, 0x21, 0x62, 0x00, 0x00, 0x50, 0x30, 0x10},</div><div class='ctx'> 						/* LCC1 LCC2 LCC3 LCC4 */</div><div class='ctx'> 	{0xa1, 0x21, 0x66, 0x00, 0x00, 0x00, 0x00, 0x10}, /* LCC5 */</div><div class='del'>-	{0xd1, 0x21, 0x67, 0x80, 0x7a, 0x90, 0x80, 0x10},</div><div class='add'>+	{0xd1, 0x21, 0x67, 0x80, 0x7a, 0x90, 0x80, 0x10}, /* MANU */</div><div class='ctx'> 	{0xa1, 0x21, 0x6b, 0x0a, 0x00, 0x00, 0x00, 0x10},</div><div class='del'>-					/* band gap reference [0..3] DBLV */</div><div class='add'>+					/* band gap reference [0:3] DBLV */</div><div class='ctx'> 	{0xd1, 0x21, 0x6c, 0x30, 0x48, 0x80, 0x74, 0x10}, /* gamma curve */</div><div class='ctx'> 	{0xd1, 0x21, 0x70, 0x64, 0x60, 0x5c, 0x58, 0x10}, /* gamma curve */</div><div class='ctx'> 	{0xd1, 0x21, 0x74, 0x54, 0x4c, 0x40, 0x38, 0x10}, /* gamma curve */</div><div class='hunk'>@@ -419,37 +508,35 @@ static const __u8 ov7660_sensor_init[][8] = {</div><div class='ctx'> 	{0xd1, 0x21, 0x84, 0x6e, 0x77, 0x87, 0x95, 0x10}, /* gamma curve */</div><div class='ctx'> 	{0xc1, 0x21, 0x88, 0xaf, 0xc7, 0xdf, 0x00, 0x10}, /* gamma curve */</div><div class='ctx'> 	{0xc1, 0x21, 0x8b, 0x99, 0x99, 0xcf, 0x00, 0x10}, /* reserved */</div><div class='del'>-	{0xb1, 0x21, 0x92, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xb1, 0x21, 0x92, 0x00, 0x00, 0x00, 0x00, 0x10}, /* DM_LNL/H */</div><div class='ctx'> /****** (some exchanges in the win trace) ******/</div><div class='del'>-	{0xa1, 0x21, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x10}, /* MVFP */</div><div class='ctx'> 						/* bits[3..0]reserved */</div><div class='ctx'> 	{0xa1, 0x21, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x10},</div><div class='ctx'> 	{0xa1, 0x21, 0x03, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='ctx'> 						/* VREF vertical frame ctrl */</div><div class='ctx'> 	{0xa1, 0x21, 0x03, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='del'>-	{0xa1, 0x21, 0x10, 0x20, 0x00, 0x00, 0x00, 0x10}, /* 0x20 */</div><div class='del'>-	{0xa1, 0x21, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='del'>-	{0xa1, 0x21, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='del'>-/*	{0xa1, 0x21, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x10}, */</div><div class='del'>-	{0xa1, 0x21, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x10},</div><div class='del'>-	{0xb1, 0x21, 0x01, 0x78, 0x78, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x10, 0x20, 0x00, 0x00, 0x00, 0x10}, /* AECH 0x20 */</div><div class='add'>+	{0xa1, 0x21, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x10}, /* ADVFL */</div><div class='add'>+	{0xa1, 0x21, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x10}, /* ADVFH */</div><div class='add'>+	{0xa1, 0x21, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x10}, /* GAIN */</div><div class='add'>+/*	{0xb1, 0x21, 0x01, 0x78, 0x78, 0x00, 0x00, 0x10}, * BLUE */</div><div class='ctx'> /****** (some exchanges in the win trace) ******/</div><div class='ctx'> 	{0xa1, 0x21, 0x93, 0x00, 0x00, 0x00, 0x00, 0x10},/* dummy line hight */</div><div class='del'>-	{0xa1, 0x21, 0x92, 0x25, 0x00, 0x00, 0x00, 0x10},/* dummy line low */</div><div class='del'>-	{0xa1, 0x21, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='del'>-	{0xa1, 0x21, 0x2b, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='del'>-	{0xa1, 0x21, 0x02, 0x90, 0x00, 0x00, 0x00, 0x10},</div><div class='add'>+	{0xa1, 0x21, 0x92, 0x25, 0x00, 0x00, 0x00, 0x10}, /* dummy line low */</div><div class='add'>+	{0xa1, 0x21, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x10}, /* EXHCH */</div><div class='add'>+	{0xa1, 0x21, 0x2b, 0x00, 0x00, 0x00, 0x00, 0x10}, /* EXHCL */</div><div class='add'>+/*	{0xa1, 0x21, 0x02, 0x90, 0x00, 0x00, 0x00, 0x10},  * RED */</div><div class='ctx'> /****** (some exchanges in the win trace) ******/</div><div class='del'>-/**********startsensor KO if changed !!****/</div><div class='add'>+/******!! startsensor KO if changed !!****/</div><div class='ctx'> 	{0xa1, 0x21, 0x93, 0x01, 0x00, 0x00, 0x00, 0x10},</div><div class='ctx'> 	{0xa1, 0x21, 0x92, 0xff, 0x00, 0x00, 0x00, 0x10},</div><div class='ctx'> 	{0xa1, 0x21, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='ctx'> 	{0xa1, 0x21, 0x2b, 0xc3, 0x00, 0x00, 0x00, 0x10},</div><div class='del'>-/* here may start the isoc exchanges */</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='del'>-/* reg0x04		reg0x07		reg 0x10 */</div><div class='del'>-/* expo  = (COM1 &amp; 0x02) | (AECHH &amp; 0x2f &lt;&lt;10) [ (AECh &lt;&lt; 2) */</div><div class='add'>+/*	  reg 0x04	  reg 0x07		   reg 0x10 */</div><div class='add'>+/* expo = (COM1 &amp; 0x02) | ((AECHH &amp; 0x2f) &lt;&lt; 10) | (AECh &lt;&lt; 2) */</div><div class='ctx'> </div><div class='ctx'> static const __u8 ov7648_sensor_init[][8] = {</div><div class='ctx'> 	{0xC1, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00},</div><div class='hunk'>@@ -526,10 +613,16 @@ static const __u8 qtable4[] = {</div><div class='ctx'> 	0x29, 0x29, 0x29, 0x29</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* read &lt;len&gt; bytes (len &lt; sizeof gspca_dev-&gt;usb_buf) to gspca_dev-&gt;usb_buf */</div><div class='add'>+/* read &lt;len&gt; bytes to gspca_dev-&gt;usb_buf */</div><div class='ctx'> static void reg_r(struct gspca_dev *gspca_dev,</div><div class='ctx'> 		  __u16 value, int len)</div><div class='ctx'> {</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='add'>+	if (len &gt; USB_BUF_SZ) {</div><div class='add'>+		err("reg_r: buffer overflow");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	usb_control_msg(gspca_dev-&gt;dev,</div><div class='ctx'> 			usb_rcvctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='ctx'> 			0,</div><div class='hunk'>@@ -562,29 +655,20 @@ static void reg_w(struct gspca_dev *gspca_dev,</div><div class='ctx'> {</div><div class='ctx'> 	PDEBUG(D_USBO, "reg_w [%02x] = %02x %02x ..",</div><div class='ctx'> 		value, buffer[0], buffer[1]);</div><div class='del'>-	if (len &lt;= sizeof gspca_dev-&gt;usb_buf) {</div><div class='del'>-		memcpy(gspca_dev-&gt;usb_buf, buffer, len);</div><div class='del'>-		usb_control_msg(gspca_dev-&gt;dev,</div><div class='del'>-				usb_sndctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='del'>-				0x08,</div><div class='del'>-			   USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='del'>-				value, 0,</div><div class='del'>-				gspca_dev-&gt;usb_buf, len,</div><div class='del'>-				500);</div><div class='del'>-	} else {</div><div class='del'>-		__u8 *tmpbuf;</div><div class='del'>-</div><div class='del'>-		tmpbuf = kmalloc(len, GFP_KERNEL);</div><div class='del'>-		memcpy(tmpbuf, buffer, len);</div><div class='del'>-		usb_control_msg(gspca_dev-&gt;dev,</div><div class='del'>-				usb_sndctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='del'>-				0x08,</div><div class='del'>-			   USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='del'>-				value, 0,</div><div class='del'>-				tmpbuf, len,</div><div class='del'>-				500);</div><div class='del'>-		kfree(tmpbuf);</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='add'>+	if (len &gt; USB_BUF_SZ) {</div><div class='add'>+		err("reg_w: buffer overflow");</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='add'>+	memcpy(gspca_dev-&gt;usb_buf, buffer, len);</div><div class='add'>+	usb_control_msg(gspca_dev-&gt;dev,</div><div class='add'>+			usb_sndctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='add'>+			0x08,</div><div class='add'>+			USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='add'>+			value, 0,</div><div class='add'>+			gspca_dev-&gt;usb_buf, len,</div><div class='add'>+			500);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* I2C write 1 byte */</div><div class='hunk'>@@ -680,13 +764,12 @@ static int configure_gpio(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	const __u8 *reg9a;</div><div class='ctx'> 	static const __u8 reg9a_def[] =</div><div class='ctx'> 		{0x08, 0x40, 0x20, 0x10, 0x00, 0x04};</div><div class='del'>-	static const __u8 reg9a_sn9c120[] =		/* from win trace */</div><div class='del'>-		{0x00, 0x40, 0x38, 0x30, 0x00, 0x20};</div><div class='ctx'> 	static const __u8 reg9a_sn9c325[] =</div><div class='ctx'> 		{0x0a, 0x40, 0x38, 0x30, 0x00, 0x20};</div><div class='add'>+	static const __u8 regd4[] = {0x60, 0x00, 0x00};</div><div class='ctx'> </div><div class='ctx'> 	reg_w1(gspca_dev, 0xf1, 0x00);</div><div class='del'>-	reg_w1(gspca_dev, 0x01, sn9c1xx[0]);	/*fixme:jfm was [1] en v1*/</div><div class='add'>+	reg_w1(gspca_dev, 0x01, sn9c1xx[1]);</div><div class='ctx'> </div><div class='ctx'> 	/* configure gpio */</div><div class='ctx'> 	reg_w(gspca_dev, 0x01, &amp;sn9c1xx[1], 2);</div><div class='hunk'>@@ -696,39 +779,51 @@ static int configure_gpio(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	case BRIDGE_SN9C325:</div><div class='ctx'> 		reg9a = reg9a_sn9c325;</div><div class='ctx'> 		break;</div><div class='del'>-	case BRIDGE_SN9C120:</div><div class='del'>-		reg9a = reg9a_sn9c120;</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		reg9a = reg9a_def;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	reg_w(gspca_dev, 0x9a, reg9a, 6);</div><div class='ctx'> </div><div class='del'>-	reg_w1(gspca_dev, 0xd4, 0x60);	/*fixme:jfm 60 00 00 (3) ? */</div><div class='add'>+	reg_w(gspca_dev, 0xd4, regd4, sizeof regd4); /*fixme:jfm was 60 only*/</div><div class='ctx'> </div><div class='ctx'> 	reg_w(gspca_dev, 0x03, &amp;sn9c1xx[3], 0x0f);</div><div class='ctx'> </div><div class='del'>-	switch (sd-&gt;bridge) {</div><div class='del'>-	case BRIDGE_SN9C120:			/* from win trace */</div><div class='add'>+	switch (sd-&gt;sensor) {</div><div class='add'>+	case SENSOR_OM6802:</div><div class='add'>+		reg_w1(gspca_dev, 0x02, 0x71);</div><div class='add'>+		reg_w1(gspca_dev, 0x01, 0x42);</div><div class='add'>+		reg_w1(gspca_dev, 0x17, 0x64);</div><div class='add'>+		reg_w1(gspca_dev, 0x01, 0x42);</div><div class='add'>+		break;</div><div class='add'>+/*jfm: from win trace */</div><div class='add'>+	case SENSOR_OV7630:</div><div class='ctx'> 		reg_w1(gspca_dev, 0x01, 0x61);</div><div class='del'>-		reg_w1(gspca_dev, 0x17, 0x20);</div><div class='add'>+		reg_w1(gspca_dev, 0x17, 0xe2);</div><div class='ctx'> 		reg_w1(gspca_dev, 0x01, 0x60);</div><div class='add'>+		reg_w1(gspca_dev, 0x01, 0x40);</div><div class='ctx'> 		break;</div><div class='del'>-	case BRIDGE_SN9C325:</div><div class='add'>+	case SENSOR_OV7648:</div><div class='ctx'> 		reg_w1(gspca_dev, 0x01, 0x43);</div><div class='ctx'> 		reg_w1(gspca_dev, 0x17, 0xae);</div><div class='ctx'> 		reg_w1(gspca_dev, 0x01, 0x42);</div><div class='ctx'> 		break;</div><div class='add'>+/*jfm: from win trace */</div><div class='add'>+	case SENSOR_OV7660:</div><div class='add'>+		reg_w1(gspca_dev, 0x01, 0x61);</div><div class='add'>+		reg_w1(gspca_dev, 0x17, 0x20);</div><div class='add'>+		reg_w1(gspca_dev, 0x01, 0x60);</div><div class='add'>+		reg_w1(gspca_dev, 0x01, 0x40);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		reg_w1(gspca_dev, 0x01, 0x43);</div><div class='ctx'> 		reg_w1(gspca_dev, 0x17, 0x61);</div><div class='ctx'> 		reg_w1(gspca_dev, 0x01, 0x42);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sd-&gt;sensor == SENSOR_HV7131R) {</div><div class='del'>-		if (probesensor(gspca_dev) &lt; 0)</div><div class='del'>-			return -ENODEV;</div><div class='add'>+		if (sd-&gt;sensor == SENSOR_HV7131R) {</div><div class='add'>+			if (probesensor(gspca_dev) &lt; 0)</div><div class='add'>+				return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -766,6 +861,40 @@ static void mo4000_InitSensor(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void om6802_InitSensor(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	while (om6802_sensor_init[i][0]) {</div><div class='add'>+		i2c_w8(gspca_dev, om6802_sensor_init[i]);</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ov7630_InitSensor(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	i2c_w8(gspca_dev, ov7630_sensor_init[i]);	/* 76 01 */</div><div class='add'>+	i++;</div><div class='add'>+	i2c_w8(gspca_dev, ov7630_sensor_init[i]);	/* 12 c8 (RGB+SRST) */</div><div class='add'>+	i++;</div><div class='add'>+	msleep(20);</div><div class='add'>+	i2c_w8(gspca_dev, ov7630_sensor_init[i]);	/* 12 48 */</div><div class='add'>+	i++;</div><div class='add'>+	i2c_w8(gspca_dev, ov7630_sensor_init[i]);	/* 12 c8 */</div><div class='add'>+	i++;</div><div class='add'>+	msleep(20);</div><div class='add'>+	i2c_w8(gspca_dev, ov7630_sensor_init[i]);	/* 12 48 */</div><div class='add'>+	i++;</div><div class='add'>+/*jfm:win i2c_r from 00 to 80*/</div><div class='add'>+</div><div class='add'>+	while (ov7630_sensor_init[i][0]) {</div><div class='add'>+		i2c_w8(gspca_dev, ov7630_sensor_init[i]);</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ov7648_InitSensor(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i = 0;</div><div class='hunk'>@@ -810,11 +939,21 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	sd-&gt;contrast = CONTRAST_DEF;</div><div class='ctx'> 	sd-&gt;colors = COLOR_DEF;</div><div class='ctx'> 	sd-&gt;autogain = AUTOGAIN_DEF;</div><div class='add'>+	sd-&gt;ag_cnt = -1;</div><div class='add'>+</div><div class='add'>+	switch (sd-&gt;sensor) {</div><div class='add'>+	case SENSOR_OV7630:</div><div class='add'>+	case SENSOR_OV7648:</div><div class='add'>+	case SENSOR_OV7660:</div><div class='add'>+		gspca_dev-&gt;ctrl_dis = (1 &lt;&lt; AUTOGAIN_IDX);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> /*	const __u8 *sn9c1xx; */</div><div class='hunk'>@@ -823,10 +962,11 @@ static int sd_open(struct gspca_dev *gspca_dev)</div><div class='ctx'> </div><div class='ctx'> 	/* setup a selector by bridge */</div><div class='ctx'> 	reg_w1(gspca_dev, 0xf1, 0x01);</div><div class='del'>-	reg_r(gspca_dev, 0x00, 1);		/* -&gt; regF1 = 0x00 */</div><div class='del'>-	reg_w1(gspca_dev, 0xf1, gspca_dev-&gt;usb_buf[0]);</div><div class='ctx'> 	reg_r(gspca_dev, 0x00, 1);</div><div class='add'>+	reg_w1(gspca_dev, 0xf1, gspca_dev-&gt;usb_buf[0]);</div><div class='add'>+	reg_r(gspca_dev, 0x00, 1);		/* get sonix chip id */</div><div class='ctx'> 	regF1 = gspca_dev-&gt;usb_buf[0];</div><div class='add'>+	PDEBUG(D_PROBE, "Sonix chip id: %02x", regF1);</div><div class='ctx'> 	switch (sd-&gt;bridge) {</div><div class='ctx'> 	case BRIDGE_SN9C102P:</div><div class='ctx'> 		if (regF1 != 0x11)</div><div class='hunk'>@@ -917,16 +1057,53 @@ static unsigned int setexposure(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			| ((expoMo10[3] &amp; 0x30) &gt;&gt; 4));</div><div class='ctx'> 		break;</div><div class='ctx'> 	    }</div><div class='add'>+	case SENSOR_OM6802: {</div><div class='add'>+		__u8 gainOm[] =</div><div class='add'>+			{ 0xa0, 0x34, 0xe5, 0x00, 0x00, 0x00, 0x00, 0x10 };</div><div class='add'>+</div><div class='add'>+		if (expo &gt; 0x03ff)</div><div class='add'>+			expo = 0x03ff;</div><div class='add'>+		 if (expo &lt; 0x0001)</div><div class='add'>+			expo = 0x0001;</div><div class='add'>+		gainOm[3] = expo &gt;&gt; 2;</div><div class='add'>+		i2c_w8(gspca_dev, gainOm);</div><div class='add'>+		reg_w1(gspca_dev, 0x96, (expo &gt;&gt; 5) &amp; 0x1f);</div><div class='add'>+		PDEBUG(D_CONF, "set exposure %d", gainOm[3]);</div><div class='add'>+		break;</div><div class='add'>+	    }</div><div class='ctx'> 	}</div><div class='ctx'> 	return expo;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* this function is used for sensors o76xx only */</div><div class='add'>+static void setbrightcont(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	unsigned val;</div><div class='add'>+	__u8 reg84_full[0x15];</div><div class='add'>+</div><div class='add'>+	memset(reg84_full, 0, sizeof reg84_full);</div><div class='add'>+	val = sd-&gt;contrast * 0x20 / CONTRAST_MAX + 0x10;	/* 10..30 */</div><div class='add'>+	reg84_full[2] = val;</div><div class='add'>+	reg84_full[0] = (val + 1) / 2;</div><div class='add'>+	reg84_full[4] = (val + 1) / 5;</div><div class='add'>+	if (val &gt; BRIGHTNESS_DEF)</div><div class='add'>+		val = (sd-&gt;brightness - BRIGHTNESS_DEF) * 0x20</div><div class='add'>+			/ BRIGHTNESS_MAX;</div><div class='add'>+	else</div><div class='add'>+		val = 0;</div><div class='add'>+	reg84_full[0x12] = val;			/* 00..1f */</div><div class='add'>+	reg_w(gspca_dev, 0x84, reg84_full, sizeof reg84_full);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* sensor != ov76xx */</div><div class='ctx'> static void setbrightness(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	unsigned int expo;</div><div class='ctx'> 	__u8 k2;</div><div class='ctx'> </div><div class='add'>+	k2 = sd-&gt;brightness &gt;&gt; 10;</div><div class='ctx'> 	switch (sd-&gt;sensor) {</div><div class='ctx'> 	case SENSOR_HV7131R:</div><div class='ctx'> 		expo = sd-&gt;brightness &lt;&lt; 4;</div><div class='hunk'>@@ -937,29 +1114,27 @@ static void setbrightness(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		sd-&gt;exposure = setexposure(gspca_dev, expo);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SENSOR_MI0360:</div><div class='add'>+	case SENSOR_MO4000:</div><div class='ctx'> 		expo = sd-&gt;brightness &gt;&gt; 4;</div><div class='ctx'> 		sd-&gt;exposure = setexposure(gspca_dev, expo);</div><div class='ctx'> 		break;</div><div class='del'>-	case SENSOR_MO4000:</div><div class='del'>-		expo = sd-&gt;brightness &gt;&gt; 4;</div><div class='add'>+	case SENSOR_OM6802:</div><div class='add'>+		expo = sd-&gt;brightness &gt;&gt; 6;</div><div class='ctx'> 		sd-&gt;exposure = setexposure(gspca_dev, expo);</div><div class='add'>+		k2 = sd-&gt;brightness &gt;&gt; 11;</div><div class='ctx'> 		break;</div><div class='del'>-	case SENSOR_OV7660:</div><div class='del'>-		return;				/*jfm??*/</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	k2 = sd-&gt;brightness &gt;&gt; 10;</div><div class='ctx'> 	reg_w1(gspca_dev, 0x96, k2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* sensor != ov76xx */</div><div class='ctx'> static void setcontrast(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	__u8 k2;</div><div class='ctx'> 	__u8 contrast[] = { 0x00, 0x00, 0x28, 0x00, 0x07, 0x00 };</div><div class='ctx'> </div><div class='del'>-	if (sd-&gt;sensor == SENSOR_OV7660)</div><div class='del'>-		return;				/*jfm??*/</div><div class='ctx'> 	k2 = sd-&gt;contrast;</div><div class='ctx'> 	contrast[2] = k2;</div><div class='ctx'> 	contrast[0] = (k2 + 1) &gt;&gt; 1;</div><div class='hunk'>@@ -970,15 +1145,30 @@ static void setcontrast(struct gspca_dev *gspca_dev)</div><div class='ctx'> static void setcolors(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	__u8 data;</div><div class='del'>-	int colour;</div><div class='add'>+	__u8 blue, red;</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;colors &gt;= 32) {</div><div class='add'>+		red = 32 + (sd-&gt;colors - 32) / 2;</div><div class='add'>+		blue = 64 - sd-&gt;colors;</div><div class='add'>+	} else {</div><div class='add'>+		red = sd-&gt;colors;</div><div class='add'>+		blue = 32 + (32 - sd-&gt;colors) / 2;</div><div class='add'>+	}</div><div class='add'>+	reg_w1(gspca_dev, 0x05, red);</div><div class='add'>+/*	reg_w1(gspca_dev, 0x07, 32); */</div><div class='add'>+	reg_w1(gspca_dev, 0x06, blue);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	colour = sd-&gt;colors - 128;</div><div class='del'>-	if (colour &gt; 0)</div><div class='del'>-		data = (colour + 32) &amp; 0x7f;	/* blue */</div><div class='add'>+static void setautogain(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	if (gspca_dev-&gt;ctrl_dis &amp; (1 &lt;&lt; AUTOGAIN_IDX))</div><div class='add'>+		return;</div><div class='add'>+	if (sd-&gt;autogain)</div><div class='add'>+		sd-&gt;ag_cnt = AG_CNT_START;</div><div class='ctx'> 	else</div><div class='del'>-		data = (-colour + 32) &amp; 0x7f;	/* red */</div><div class='del'>-	reg_w1(gspca_dev, 0x05, data);</div><div class='add'>+		sd-&gt;ag_cnt = -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -- start the camera -- */</div><div class='hunk'>@@ -986,25 +1176,18 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	int i;</div><div class='del'>-	__u8 data;</div><div class='del'>-	__u8 reg1;</div><div class='del'>-	__u8 reg17;</div><div class='add'>+	__u8 reg1, reg17, reg18;</div><div class='ctx'> 	const __u8 *sn9c1xx;</div><div class='ctx'> 	int mode;</div><div class='ctx'> 	static const __u8 C0[] = { 0x2d, 0x2d, 0x3a, 0x05, 0x04, 0x3f };</div><div class='ctx'> 	static const __u8 CA[] = { 0x28, 0xd8, 0x14, 0xec };</div><div class='del'>-	static const __u8 CA_sn9c120[] =</div><div class='del'>-				 { 0x14, 0xec, 0x0a, 0xf6 };	/* SN9C120 */</div><div class='ctx'> 	static const __u8 CE[] = { 0x32, 0xdd, 0x2d, 0xdd };	/* MI0360 */</div><div class='del'>-	static const __u8 CE_sn9c325[] =</div><div class='del'>-			{ 0x32, 0xdd, 0x32, 0xdd };	/* OV7648 - SN9C325 */</div><div class='add'>+	static const __u8 CE_ov76xx[] =</div><div class='add'>+			{ 0x32, 0xdd, 0x32, 0xdd };	/* OV7630/48 */</div><div class='ctx'> </div><div class='ctx'> 	sn9c1xx = sn_tb[(int) sd-&gt;sensor];</div><div class='ctx'> 	configure_gpio(gspca_dev, sn9c1xx);</div><div class='ctx'> </div><div class='del'>-/*fixme:jfm this sequence should appear at end of sd_start */</div><div class='del'>-/* with</div><div class='del'>-	reg_w1(gspca_dev, 0x01, 0x44); */</div><div class='ctx'> 	reg_w1(gspca_dev, 0x15, sn9c1xx[0x15]);</div><div class='ctx'> 	reg_w1(gspca_dev, 0x16, sn9c1xx[0x16]);</div><div class='ctx'> 	reg_w1(gspca_dev, 0x12, sn9c1xx[0x12]);</div><div class='hunk'>@@ -1016,56 +1199,32 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	reg_w1(gspca_dev, 0xc7, 0x00);</div><div class='ctx'> 	reg_w1(gspca_dev, 0xc8, 0x50);</div><div class='ctx'> 	reg_w1(gspca_dev, 0xc9, 0x3c);</div><div class='del'>-/*fixme:jfm end of ending sequence */</div><div class='ctx'> 	reg_w1(gspca_dev, 0x18, sn9c1xx[0x18]);</div><div class='del'>-	switch (sd-&gt;bridge) {</div><div class='del'>-	case BRIDGE_SN9C325:</div><div class='del'>-		data = 0xae;</div><div class='add'>+	switch (sd-&gt;sensor) {</div><div class='add'>+	case SENSOR_OV7630:</div><div class='add'>+		reg17 = 0xe2;</div><div class='ctx'> 		break;</div><div class='del'>-	case BRIDGE_SN9C120:</div><div class='del'>-		data = 0xa0;</div><div class='add'>+	case SENSOR_OV7648:</div><div class='add'>+		reg17 = 0xae;</div><div class='add'>+		break;</div><div class='add'>+/*jfm: from win trace */</div><div class='add'>+	case SENSOR_OV7660:</div><div class='add'>+		reg17 = 0xa0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		data = 0x60;</div><div class='add'>+		reg17 = 0x60;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	reg_w1(gspca_dev, 0x17, data);</div><div class='add'>+	reg_w1(gspca_dev, 0x17, reg17);</div><div class='ctx'> 	reg_w1(gspca_dev, 0x05, sn9c1xx[5]);</div><div class='ctx'> 	reg_w1(gspca_dev, 0x07, sn9c1xx[7]);</div><div class='ctx'> 	reg_w1(gspca_dev, 0x06, sn9c1xx[6]);</div><div class='ctx'> 	reg_w1(gspca_dev, 0x14, sn9c1xx[0x14]);</div><div class='del'>-	switch (sd-&gt;bridge) {</div><div class='del'>-	case BRIDGE_SN9C325:</div><div class='del'>-		reg_w(gspca_dev, 0x20, regsn20_sn9c325,</div><div class='del'>-				sizeof regsn20_sn9c325);</div><div class='del'>-		for (i = 0; i &lt; 8; i++)</div><div class='del'>-			reg_w(gspca_dev, 0x84, reg84_sn9c325,</div><div class='del'>-					sizeof reg84_sn9c325);</div><div class='del'>-		reg_w1(gspca_dev, 0x9a, 0x0a);</div><div class='del'>-		reg_w1(gspca_dev, 0x99, 0x60);</div><div class='del'>-		break;</div><div class='del'>-	case BRIDGE_SN9C120:</div><div class='del'>-		reg_w(gspca_dev, 0x20, regsn20_sn9c120,</div><div class='del'>-				sizeof regsn20_sn9c120);</div><div class='del'>-		for (i = 0; i &lt; 2; i++)</div><div class='del'>-			reg_w(gspca_dev, 0x84, reg84_sn9c120_1,</div><div class='del'>-					sizeof reg84_sn9c120_1);</div><div class='del'>-		for (i = 0; i &lt; 6; i++)</div><div class='del'>-			reg_w(gspca_dev, 0x84, reg84_sn9c120_2,</div><div class='del'>-					sizeof reg84_sn9c120_2);</div><div class='del'>-		reg_w(gspca_dev, 0x84, reg84_sn9c120_3,</div><div class='del'>-				sizeof reg84_sn9c120_3);</div><div class='del'>-		reg_w1(gspca_dev, 0x9a, 0x05);</div><div class='del'>-		reg_w1(gspca_dev, 0x99, 0x5b);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		reg_w(gspca_dev, 0x20, regsn20, sizeof regsn20);</div><div class='del'>-		for (i = 0; i &lt; 8; i++)</div><div class='del'>-			reg_w(gspca_dev, 0x84, reg84, sizeof reg84);</div><div class='add'>+	reg_w(gspca_dev, 0x20, gamma_def, sizeof gamma_def);</div><div class='add'>+	for (i = 0; i &lt; 8; i++)</div><div class='add'>+		reg_w(gspca_dev, 0x84, reg84, sizeof reg84);</div><div class='ctx'> 		reg_w1(gspca_dev, 0x9a, 0x08);</div><div class='ctx'> 		reg_w1(gspca_dev, 0x99, 0x59);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	mode = gspca_dev-&gt;cam.cam_mode[(int) gspca_dev-&gt;curr_mode].priv;</div><div class='ctx'> 	if (mode)</div><div class='hunk'>@@ -1090,6 +1249,15 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> /*			reg1 = 0x06;	 * 640 clk 24Mz (done) */</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case SENSOR_OM6802:</div><div class='add'>+		om6802_InitSensor(gspca_dev);</div><div class='add'>+		reg17 = 0x64;		/* 640 MCKSIZE */</div><div class='add'>+		break;</div><div class='add'>+	case SENSOR_OV7630:</div><div class='add'>+		ov7630_InitSensor(gspca_dev);</div><div class='add'>+		reg17 = 0xe2;</div><div class='add'>+		reg1 = 0x44;</div><div class='add'>+		break;</div><div class='ctx'> 	case SENSOR_OV7648:</div><div class='ctx'> 		ov7648_InitSensor(gspca_dev);</div><div class='ctx'> 		reg17 = 0xa2;</div><div class='hunk'>@@ -1107,24 +1275,17 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> /*			reg1 = 0x44; */</div><div class='ctx'> /*			reg1 = 0x46;	(done) */</div><div class='ctx'> 		} else {</div><div class='del'>-			reg17 = 0xa2;	/* 640 */</div><div class='del'>-			reg1 = 0x40;</div><div class='add'>+			reg17 = 0x22;	/* 640 MCKSIZE */</div><div class='add'>+			reg1 = 0x06;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	reg_w(gspca_dev, 0xc0, C0, 6);</div><div class='del'>-	switch (sd-&gt;bridge) {</div><div class='del'>-	case BRIDGE_SN9C120:			/*jfm ?? */</div><div class='del'>-		reg_w(gspca_dev, 0xca, CA_sn9c120, 4);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		reg_w(gspca_dev, 0xca, CA, 4);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	switch (sd-&gt;bridge) {</div><div class='del'>-	case BRIDGE_SN9C120:			/*jfm ?? */</div><div class='del'>-	case BRIDGE_SN9C325:</div><div class='del'>-		reg_w(gspca_dev, 0xce, CE_sn9c325, 4);</div><div class='add'>+	reg_w(gspca_dev, 0xca, CA, 4);</div><div class='add'>+	switch (sd-&gt;sensor) {</div><div class='add'>+	case SENSOR_OV7630:</div><div class='add'>+	case SENSOR_OV7648:</div><div class='add'>+		reg_w(gspca_dev, 0xce, CE_ov76xx, 4);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		reg_w(gspca_dev, 0xce, CE, 4);</div><div class='hunk'>@@ -1133,19 +1294,29 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* here change size mode 0 -&gt; VGA; 1 -&gt; CIF */</div><div class='del'>-	data = 0x40 | sn9c1xx[0x18] | (mode &lt;&lt; 4);</div><div class='del'>-	reg_w1(gspca_dev, 0x18, data);</div><div class='add'>+	reg18 = sn9c1xx[0x18] | (mode &lt;&lt; 4);</div><div class='add'>+	reg_w1(gspca_dev, 0x18, reg18 | 0x40);</div><div class='ctx'> </div><div class='ctx'> 	reg_w(gspca_dev, 0x100, qtable4, 0x40);</div><div class='ctx'> 	reg_w(gspca_dev, 0x140, qtable4 + 0x40, 0x40);</div><div class='ctx'> </div><div class='del'>-	data = sn9c1xx[0x18] | (mode &lt;&lt; 4);</div><div class='del'>-	reg_w1(gspca_dev, 0x18, data);</div><div class='add'>+	reg_w1(gspca_dev, 0x18, reg18);</div><div class='ctx'> </div><div class='ctx'> 	reg_w1(gspca_dev, 0x17, reg17);</div><div class='add'>+	switch (sd-&gt;sensor) {</div><div class='add'>+	case SENSOR_HV7131R:</div><div class='add'>+	case SENSOR_MI0360:</div><div class='add'>+	case SENSOR_MO4000:</div><div class='add'>+	case SENSOR_OM6802:</div><div class='add'>+		setbrightness(gspca_dev);</div><div class='add'>+		setcontrast(gspca_dev);</div><div class='add'>+		break;</div><div class='add'>+	default:			/* OV76xx */</div><div class='add'>+		setbrightcont(gspca_dev);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	setautogain(gspca_dev);</div><div class='ctx'> 	reg_w1(gspca_dev, 0x01, reg1);</div><div class='del'>-	setbrightness(gspca_dev);</div><div class='del'>-	setcontrast(gspca_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='hunk'>@@ -1168,12 +1339,12 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		i2c_w8(gspca_dev, stopmi0360);</div><div class='ctx'> 		data = 0x29;</div><div class='ctx'> 		break;</div><div class='del'>-	case SENSOR_MO4000:</div><div class='del'>-		break;</div><div class='add'>+	case SENSOR_OV7630:</div><div class='ctx'> 	case SENSOR_OV7648:</div><div class='ctx'> 		data = 0x29;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='add'>+/*	case SENSOR_MO4000: */</div><div class='ctx'> /*	case SENSOR_OV7660: */</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1182,27 +1353,26 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	reg_w1(gspca_dev, 0x17, sn9c1xx[0x17]);</div><div class='ctx'> 	reg_w1(gspca_dev, 0x01, sn9c1xx[1]);</div><div class='ctx'> 	reg_w1(gspca_dev, 0x01, data);</div><div class='del'>-	reg_w1(gspca_dev, 0xf1, 0x01);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='add'>+	reg_w1(gspca_dev, 0xf1, 0x00);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void setautogain(struct gspca_dev *gspca_dev)</div><div class='add'>+static void do_autogain(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	/* Thanks S., without your advice, autobright should not work :) */</div><div class='ctx'> 	int delta;</div><div class='del'>-	int expotimes = 0;</div><div class='add'>+	int expotimes;</div><div class='ctx'> 	__u8 luma_mean = 130;</div><div class='ctx'> 	__u8 luma_delta = 20;</div><div class='ctx'> </div><div class='del'>-	delta = sd-&gt;avg_lum;</div><div class='add'>+	/* Thanks S., without your advice, autobright should not work :) */</div><div class='add'>+	if (sd-&gt;ag_cnt &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	if (--sd-&gt;ag_cnt &gt;= 0)</div><div class='add'>+		return;</div><div class='add'>+	sd-&gt;ag_cnt = AG_CNT_START;</div><div class='add'>+</div><div class='add'>+	delta = atomic_read(&amp;sd-&gt;avg_lum);</div><div class='add'>+	PDEBUG(D_FRAM, "mean lum %d", delta);</div><div class='ctx'> 	if (delta &lt; luma_mean - luma_delta ||</div><div class='ctx'> 	    delta &gt; luma_mean + luma_delta) {</div><div class='ctx'> 		switch (sd-&gt;sensor) {</div><div class='hunk'>@@ -1214,8 +1384,10 @@ static void setautogain(struct gspca_dev *gspca_dev)</div><div class='ctx'> 			sd-&gt;exposure = setexposure(gspca_dev,</div><div class='ctx'> 					(unsigned int) (expotimes &lt;&lt; 8));</div><div class='ctx'> 			break;</div><div class='del'>-		case SENSOR_MO4000:</div><div class='del'>-		case SENSOR_MI0360:</div><div class='add'>+		default:</div><div class='add'>+/*		case SENSOR_MO4000: */</div><div class='add'>+/*		case SENSOR_MI0360: */</div><div class='add'>+/*		case SENSOR_OM6802: */</div><div class='ctx'> 			expotimes = sd-&gt;exposure;</div><div class='ctx'> 			expotimes += (luma_mean - delta) &gt;&gt; 6;</div><div class='ctx'> 			if (expotimes &lt; 0)</div><div class='hunk'>@@ -1228,6 +1400,8 @@ static void setautogain(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* scan the URB packets */</div><div class='add'>+/* This function is run at interrupt level. */</div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			struct gspca_frame *frame,	/* target */</div><div class='ctx'> 			__u8 *data,			/* isoc packet */</div><div class='hunk'>@@ -1244,9 +1418,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 				frame, data, sof + 2);</div><div class='ctx'> 		if (sd-&gt;ag_cnt &lt; 0)</div><div class='ctx'> 			return;</div><div class='del'>-		if (--sd-&gt;ag_cnt &gt;= 0)</div><div class='del'>-			return;</div><div class='del'>-		sd-&gt;ag_cnt = AG_CNT_START;</div><div class='ctx'> /* w1 w2 w3 */</div><div class='ctx'> /* w4 w5 w6 */</div><div class='ctx'> /* w7 w8 */</div><div class='hunk'>@@ -1261,9 +1432,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> /* w5 */</div><div class='ctx'> 		avg_lum += ((data[sof + 31] &lt;&lt; 8) | data[sof + 32]) &gt;&gt; 4;</div><div class='ctx'> 		avg_lum &gt;&gt;= 4;</div><div class='del'>-		sd-&gt;avg_lum = avg_lum;</div><div class='del'>-		PDEBUG(D_PACK, "mean lum %d", avg_lum);</div><div class='del'>-		setautogain(gspca_dev);</div><div class='add'>+		atomic_set(&amp;sd-&gt;avg_lum, avg_lum);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (gspca_dev-&gt;last_packet_type == LAST_PACKET) {</div><div class='hunk'>@@ -1274,70 +1443,24 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int getexposure(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	__u8 hexpo, mexpo, lexpo;</div><div class='del'>-</div><div class='del'>-	switch (sd-&gt;sensor) {</div><div class='del'>-	case SENSOR_HV7131R:</div><div class='del'>-		/* read sensor exposure */</div><div class='del'>-		i2c_r5(gspca_dev, 0x25);</div><div class='del'>-		return (gspca_dev-&gt;usb_buf[0] &lt;&lt; 16)</div><div class='del'>-			| (gspca_dev-&gt;usb_buf[1] &lt;&lt; 8)</div><div class='del'>-			| gspca_dev-&gt;usb_buf[2];</div><div class='del'>-	case SENSOR_MI0360:</div><div class='del'>-		/* read sensor exposure */</div><div class='del'>-		i2c_r5(gspca_dev, 0x09);</div><div class='del'>-		return (gspca_dev-&gt;usb_buf[0] &lt;&lt; 8)</div><div class='del'>-			| gspca_dev-&gt;usb_buf[1];</div><div class='del'>-	case SENSOR_MO4000:</div><div class='del'>-		i2c_r5(gspca_dev, 0x0e);</div><div class='del'>-		hexpo = 0;		/* gspca_dev-&gt;usb_buf[1] &amp; 0x07; */</div><div class='del'>-		mexpo = 0x40;		/* gspca_dev-&gt;usb_buf[2] &amp; 0xff; */</div><div class='del'>-		lexpo = (gspca_dev-&gt;usb_buf[1] &amp; 0x30) &gt;&gt; 4;</div><div class='del'>-		PDEBUG(D_CONF, "exposure %d",</div><div class='del'>-			(hexpo &lt;&lt; 10) | (mexpo &lt;&lt; 2) | lexpo);</div><div class='del'>-		return (hexpo &lt;&lt; 10) | (mexpo &lt;&lt; 2) | lexpo;</div><div class='del'>-	default:</div><div class='del'>-/*	case SENSOR_OV7660: */</div><div class='del'>-		/* read sensor exposure */</div><div class='del'>-		i2c_r5(gspca_dev, 0x04);</div><div class='del'>-		hexpo = gspca_dev-&gt;usb_buf[3] &amp; 0x2f;</div><div class='del'>-		lexpo = gspca_dev-&gt;usb_buf[0] &amp; 0x02;</div><div class='del'>-		i2c_r5(gspca_dev, 0x08);</div><div class='del'>-		mexpo = gspca_dev-&gt;usb_buf[2];</div><div class='del'>-		return (hexpo &lt;&lt; 10) | (mexpo &lt;&lt; 2) | lexpo;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void getbrightness(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-</div><div class='del'>-	/* hardcoded registers seem not readable */</div><div class='del'>-	switch (sd-&gt;sensor) {</div><div class='del'>-	case SENSOR_HV7131R:</div><div class='del'>-/*		sd-&gt;brightness = 0x7fff; */</div><div class='del'>-		sd-&gt;brightness = getexposure(gspca_dev) &gt;&gt; 4;</div><div class='del'>-		break;</div><div class='del'>-	case SENSOR_MI0360:</div><div class='del'>-		sd-&gt;brightness = getexposure(gspca_dev) &lt;&lt; 4;</div><div class='del'>-		break;</div><div class='del'>-	case SENSOR_MO4000:</div><div class='del'>-/*		sd-&gt;brightness = 0x1fff; */</div><div class='del'>-		sd-&gt;brightness = getexposure(gspca_dev) &lt;&lt; 4;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='ctx'> 	sd-&gt;brightness = val;</div><div class='del'>-	if (gspca_dev-&gt;streaming)</div><div class='del'>-		setbrightness(gspca_dev);</div><div class='add'>+	if (gspca_dev-&gt;streaming) {</div><div class='add'>+		switch (sd-&gt;sensor) {</div><div class='add'>+		case SENSOR_HV7131R:</div><div class='add'>+		case SENSOR_MI0360:</div><div class='add'>+		case SENSOR_MO4000:</div><div class='add'>+		case SENSOR_OM6802:</div><div class='add'>+			setbrightness(gspca_dev);</div><div class='add'>+			break;</div><div class='add'>+		default:			/* OV76xx */</div><div class='add'>+			setbrightcont(gspca_dev);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1345,7 +1468,6 @@ static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='del'>-	getbrightness(gspca_dev);</div><div class='ctx'> 	*val = sd-&gt;brightness;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1355,8 +1477,19 @@ static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='ctx'> 	sd-&gt;contrast = val;</div><div class='del'>-	if (gspca_dev-&gt;streaming)</div><div class='del'>-		setcontrast(gspca_dev);</div><div class='add'>+	if (gspca_dev-&gt;streaming) {</div><div class='add'>+		switch (sd-&gt;sensor) {</div><div class='add'>+		case SENSOR_HV7131R:</div><div class='add'>+		case SENSOR_MI0360:</div><div class='add'>+		case SENSOR_MO4000:</div><div class='add'>+		case SENSOR_OM6802:</div><div class='add'>+			setcontrast(gspca_dev);</div><div class='add'>+			break;</div><div class='add'>+		default:			/* OV76xx */</div><div class='add'>+			setbrightcont(gspca_dev);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1391,10 +1524,8 @@ static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='ctx'> 	sd-&gt;autogain = val;</div><div class='del'>-	if (val)</div><div class='del'>-		sd-&gt;ag_cnt = AG_CNT_START;</div><div class='del'>-	else</div><div class='del'>-		sd-&gt;ag_cnt = -1;</div><div class='add'>+	if (gspca_dev-&gt;streaming)</div><div class='add'>+		setautogain(gspca_dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1412,12 +1543,11 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='del'>-	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='add'>+	.dq_callback = do_autogain,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module initialisation -- */</div><div class='hunk'>@@ -1426,7 +1556,7 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 			| (SENSOR_ ## sensor &lt;&lt; 8) \</div><div class='ctx'> 			| (i2c_addr)</div><div class='ctx'> static const __devinitdata struct usb_device_id device_table[] = {</div><div class='del'>-#ifndef CONFIG_USB_SN9C102</div><div class='add'>+#if !defined CONFIG_USB_SN9C102 &amp;&amp; !defined CONFIG_USB_SN9C102_MODULE</div><div class='ctx'> 	{USB_DEVICE(0x0458, 0x7025), BSI(SN9C120, MI0360, 0x5d)},</div><div class='ctx'> 	{USB_DEVICE(0x045e, 0x00f5), BSI(SN9C105, OV7660, 0x21)},</div><div class='ctx'> 	{USB_DEVICE(0x045e, 0x00f7), BSI(SN9C105, OV7660, 0x21)},</div><div class='hunk'>@@ -1453,15 +1583,17 @@ static const __devinitdata struct usb_device_id device_table[] = {</div><div class='ctx'> /*	{USB_DEVICE(0x0c45, 0x6108), BSI(SN9C120, OM6801, 0x??)}, */</div><div class='ctx'> /*	{USB_DEVICE(0x0c45, 0x6122), BSI(SN9C110, ICM105C, 0x??)}, */</div><div class='ctx'> /*	{USB_DEVICE(0x0c45, 0x6123), BSI(SN9C110, SanyoCCD, 0x??)}, */</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x612a), BSI(SN9C325, OV7648, 0x21)},</div><div class='del'>-/* bw600.inf:</div><div class='del'>-	{USB_DEVICE(0x0c45, 0x612a), BSI(SN9C110, OV7648, 0x21)}, */</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x6128), BSI(SN9C110, OM6802, 0x21)}, /*sn9c325?*/</div><div class='add'>+/*bw600.inf:*/</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x612a), BSI(SN9C110, OV7648, 0x21)}, /*sn9c325?*/</div><div class='ctx'> 	{USB_DEVICE(0x0c45, 0x612c), BSI(SN9C110, MO4000, 0x21)},</div><div class='del'>-/*	{USB_DEVICE(0x0c45, 0x612e), BSI(SN9C110, OV7630, 0x??)}, */</div><div class='add'>+	{USB_DEVICE(0x0c45, 0x612e), BSI(SN9C110, OV7630, 0x21)},</div><div class='ctx'> /*	{USB_DEVICE(0x0c45, 0x612f), BSI(SN9C110, ICM105C, 0x??)}, */</div><div class='del'>-#ifndef CONFIG_USB_SN9C102</div><div class='add'>+#if !defined CONFIG_USB_SN9C102 &amp;&amp; !defined CONFIG_USB_SN9C102_MODULE</div><div class='ctx'> 	{USB_DEVICE(0x0c45, 0x6130), BSI(SN9C120, MI0360, 0x5d)},</div><div class='add'>+#endif</div><div class='ctx'> 	{USB_DEVICE(0x0c45, 0x6138), BSI(SN9C120, MO4000, 0x21)},</div><div class='add'>+#if !defined CONFIG_USB_SN9C102 &amp;&amp; !defined CONFIG_USB_SN9C102_MODULE</div><div class='ctx'> /*	{USB_DEVICE(0x0c45, 0x613a), BSI(SN9C120, OV7648, 0x??)}, */</div><div class='ctx'> 	{USB_DEVICE(0x0c45, 0x613b), BSI(SN9C120, OV7660, 0x21)},</div><div class='ctx'> 	{USB_DEVICE(0x0c45, 0x613c), BSI(SN9C120, HV7131R, 0x11)},</div><div class='hunk'>@@ -1485,6 +1617,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c<br/>index 17fe2c2a440d..6e733901fcca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca500.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/spca500.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca500.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/spca500.c</a></div><div class='hunk'>@@ -645,8 +645,8 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='hunk'>@@ -880,14 +880,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		gspca_dev-&gt;usb_buf[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			struct gspca_frame *frame,	/* target */</div><div class='ctx'> 			__u8 *data,			/* isoc packet */</div><div class='hunk'>@@ -1051,11 +1043,9 @@ static struct sd_desc sd_desc = {</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='del'>-	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1093,6 +1083,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c<br/>index 51a3c3429ef0..e9eb59bae4fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca501.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/spca501.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca501.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/spca501.c</a></div><div class='hunk'>@@ -1953,8 +1953,8 @@ error:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='hunk'>@@ -2023,11 +2023,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> </div><div class='ctx'> static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this function is called at close time */</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='ctx'> 	reg_write(gspca_dev-&gt;dev, SPCA501_REG_CTLRL, 0x05, 0x00);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2120,11 +2115,10 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='ctx'> 	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2154,6 +2148,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c<br/>index 3c2be80cbd65..f601daf19ebe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca505.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/spca505.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca505.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/spca505.c</a></div><div class='hunk'>@@ -61,27 +61,27 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> </div><div class='ctx'> static struct v4l2_pix_format vga_mode[] = {</div><div class='ctx'> 	{160, 120, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,</div><div class='del'>-		.bytesperline = 160 * 3,</div><div class='add'>+		.bytesperline = 160,</div><div class='ctx'> 		.sizeimage = 160 * 120 * 3 / 2,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 5},</div><div class='ctx'> 	{176, 144, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,</div><div class='del'>-		.bytesperline = 176 * 3,</div><div class='add'>+		.bytesperline = 176,</div><div class='ctx'> 		.sizeimage = 176 * 144 * 3 / 2,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 4},</div><div class='ctx'> 	{320, 240, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,</div><div class='del'>-		.bytesperline = 320 * 3,</div><div class='add'>+		.bytesperline = 320,</div><div class='ctx'> 		.sizeimage = 320 * 240 * 3 / 2,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 2},</div><div class='ctx'> 	{352, 288, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,</div><div class='del'>-		.bytesperline = 352 * 3,</div><div class='add'>+		.bytesperline = 352,</div><div class='ctx'> 		.sizeimage = 352 * 288 * 3 / 2,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 1},</div><div class='ctx'> 	{640, 480, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,</div><div class='del'>-		.bytesperline = 640 * 3,</div><div class='add'>+		.bytesperline = 640,</div><div class='ctx'> 		.sizeimage = 640 * 480 * 3 / 2,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 0},</div><div class='hunk'>@@ -655,8 +655,8 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -743,11 +743,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> </div><div class='ctx'> static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this function is called at close time */</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='ctx'> 	/* This maybe reset or power control */</div><div class='ctx'> 	reg_write(gspca_dev-&gt;dev, 0x03, 0x03, 0x20);</div><div class='ctx'> 	reg_write(gspca_dev-&gt;dev, 0x03, 0x01, 0x0);</div><div class='hunk'>@@ -776,7 +771,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	default:</div><div class='ctx'> 		data += 1;</div><div class='ctx'> 		len -= 1;</div><div class='del'>-		gspca_frame_add(gspca_dev, FIRST_PACKET, frame,</div><div class='add'>+		gspca_frame_add(gspca_dev, INTER_PACKET, frame,</div><div class='ctx'> 				data, len);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -825,11 +820,10 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='ctx'> 	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -855,6 +849,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/spca506.c b/drivers/media/video/gspca/spca506.c<br/>index 6fe715c80ad2..195dce96ef06 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca506.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/spca506.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca506.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/spca506.c</a></div><div class='hunk'>@@ -112,27 +112,27 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> </div><div class='ctx'> static struct v4l2_pix_format vga_mode[] = {</div><div class='ctx'> 	{160, 120, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,</div><div class='del'>-		.bytesperline = 160 * 3,</div><div class='add'>+		.bytesperline = 160,</div><div class='ctx'> 		.sizeimage = 160 * 120 * 3 / 2,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 5},</div><div class='ctx'> 	{176, 144, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,</div><div class='del'>-		.bytesperline = 176 * 3,</div><div class='add'>+		.bytesperline = 176,</div><div class='ctx'> 		.sizeimage = 176 * 144 * 3 / 2,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 4},</div><div class='ctx'> 	{320, 240, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,</div><div class='del'>-		.bytesperline = 320 * 3,</div><div class='add'>+		.bytesperline = 320,</div><div class='ctx'> 		.sizeimage = 320 * 240 * 3 / 2,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 2},</div><div class='ctx'> 	{352, 288, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,</div><div class='del'>-		.bytesperline = 352 * 3,</div><div class='add'>+		.bytesperline = 352,</div><div class='ctx'> 		.sizeimage = 352 * 288 * 3 / 2,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 1},</div><div class='ctx'> 	{640, 480, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,</div><div class='del'>-		.bytesperline = 640 * 3,</div><div class='add'>+		.bytesperline = 640,</div><div class='ctx'> 		.sizeimage = 640 * 480 * 3 / 2,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 0},</div><div class='hunk'>@@ -313,8 +313,8 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='ctx'> </div><div class='hunk'>@@ -560,14 +560,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	reg_w(dev, 0x03, 0x00, 0x0003);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			struct gspca_frame *frame,	/* target */</div><div class='ctx'> 			__u8 *data,			/* isoc packet */</div><div class='hunk'>@@ -588,7 +580,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	default:</div><div class='ctx'> 		data += 1;</div><div class='ctx'> 		len -= 1;</div><div class='del'>-		gspca_frame_add(gspca_dev, FIRST_PACKET, frame,</div><div class='add'>+		gspca_frame_add(gspca_dev, INTER_PACKET, frame,</div><div class='ctx'> 				data, len);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -740,11 +732,9 @@ static struct sd_desc sd_desc = {</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='del'>-	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -772,6 +762,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c<br/>index b608a27ad115..281ce02103a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca508.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/spca508.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca508.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/spca508.c</a></div><div class='hunk'>@@ -63,23 +63,23 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct v4l2_pix_format sif_mode[] = {</div><div class='del'>-	{160, 120, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,</div><div class='del'>-		.bytesperline = 160 * 3,</div><div class='add'>+	{160, 120, V4L2_PIX_FMT_SPCA508, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 160,</div><div class='ctx'> 		.sizeimage = 160 * 120 * 3 / 2,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 3},</div><div class='del'>-	{176, 144, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,</div><div class='del'>-		.bytesperline = 176 * 3,</div><div class='add'>+	{176, 144, V4L2_PIX_FMT_SPCA508, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 176,</div><div class='ctx'> 		.sizeimage = 176 * 144 * 3 / 2,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 2},</div><div class='del'>-	{320, 240, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,</div><div class='del'>-		.bytesperline = 320 * 3,</div><div class='add'>+	{320, 240, V4L2_PIX_FMT_SPCA508, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 320,</div><div class='ctx'> 		.sizeimage = 320 * 240 * 3 / 2,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 1},</div><div class='del'>-	{352, 288, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,</div><div class='del'>-		.bytesperline = 352 * 3,</div><div class='add'>+	{352, 288, V4L2_PIX_FMT_SPCA508, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 352,</div><div class='ctx'> 		.sizeimage = 352 * 288 * 3 / 2,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 0},</div><div class='hunk'>@@ -1521,8 +1521,8 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	return 0;			/* success */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> /*	write_vector(gspca_dev, spca508_open_data); */</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1554,15 +1554,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	reg_write(gspca_dev-&gt;dev, 0x8112, 0x20);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this function is called at close time */</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			struct gspca_frame *frame,	/* target */</div><div class='ctx'> 			__u8 *data,			/* isoc packet */</div><div class='hunk'>@@ -1583,7 +1574,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	default:</div><div class='ctx'> 		data += 1;</div><div class='ctx'> 		len -= 1;</div><div class='del'>-		gspca_frame_add(gspca_dev, FIRST_PACKET, frame,</div><div class='add'>+		gspca_frame_add(gspca_dev, INTER_PACKET, frame,</div><div class='ctx'> 				data, len);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1633,11 +1624,9 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='del'>-	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1667,6 +1656,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c<br/>index a26174508cb9..cfbc9ebc5c5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca561.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/spca561.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca561.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/spca561.c</a></div><div class='hunk'>@@ -32,69 +32,48 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> struct sd {</div><div class='ctx'> 	struct gspca_dev gspca_dev;	/* !! must be the first item */</div><div class='ctx'> </div><div class='del'>-	unsigned short contrast;</div><div class='del'>-	__u8 brightness;</div><div class='add'>+	__u16 contrast;			/* rev72a only */</div><div class='add'>+#define CONTRAST_MIN 0x0000</div><div class='add'>+#define CONTRAST_DEF 0x2000</div><div class='add'>+#define CONTRAST_MAX 0x3fff</div><div class='add'>+</div><div class='add'>+	__u16 exposure;			/* rev12a only */</div><div class='add'>+#define EXPOSURE_MIN 1</div><div class='add'>+#define EXPOSURE_DEF 200</div><div class='add'>+#define EXPOSURE_MAX (4095 - 900) /* see set_exposure */</div><div class='add'>+</div><div class='add'>+	__u8 brightness;		/* rev72a only */</div><div class='add'>+#define BRIGHTNESS_MIN 0</div><div class='add'>+#define BRIGHTNESS_DEF 32</div><div class='add'>+#define BRIGHTNESS_MAX 63</div><div class='add'>+</div><div class='add'>+	__u8 white;			/* rev12a only */</div><div class='add'>+#define WHITE_MIN 1</div><div class='add'>+#define WHITE_DEF 0x40</div><div class='add'>+#define WHITE_MAX 0x7f</div><div class='add'>+</div><div class='ctx'> 	__u8 autogain;</div><div class='add'>+#define AUTOGAIN_MIN 0</div><div class='add'>+#define AUTOGAIN_DEF 1</div><div class='add'>+#define AUTOGAIN_MAX 1</div><div class='add'>+</div><div class='add'>+	__u8 gain;			/* rev12a only */</div><div class='add'>+#define GAIN_MIN 0x0</div><div class='add'>+#define GAIN_DEF 0x24</div><div class='add'>+#define GAIN_MAX 0x24</div><div class='add'>+</div><div class='add'>+#define EXPO12A_DEF 3</div><div class='add'>+	__u8 expo12a;		/* expo/gain? for rev 12a */</div><div class='ctx'> </div><div class='ctx'> 	__u8 chip_revision;</div><div class='add'>+#define Rev012A 0</div><div class='add'>+#define Rev072A 1</div><div class='add'>+</div><div class='ctx'> 	signed char ag_cnt;</div><div class='ctx'> #define AG_CNT_START 13</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* V4L2 controls supported by the driver */</div><div class='del'>-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);</div><div class='del'>-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='del'>-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);</div><div class='del'>-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='del'>-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val);</div><div class='del'>-static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='del'>-</div><div class='del'>-static struct ctrl sd_ctrls[] = {</div><div class='del'>-#define SD_BRIGHTNESS 0</div><div class='del'>-	{</div><div class='del'>-	 {</div><div class='del'>-	  .id = V4L2_CID_BRIGHTNESS,</div><div class='del'>-	  .type = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-	  .name = "Brightness",</div><div class='del'>-	  .minimum = 0,</div><div class='del'>-	  .maximum = 63,</div><div class='del'>-	  .step = 1,</div><div class='del'>-	  .default_value = 32,</div><div class='del'>-	  },</div><div class='del'>-	 .set = sd_setbrightness,</div><div class='del'>-	 .get = sd_getbrightness,</div><div class='del'>-	 },</div><div class='del'>-#define SD_CONTRAST 1</div><div class='del'>-	{</div><div class='del'>-	 {</div><div class='del'>-	  .id = V4L2_CID_CONTRAST,</div><div class='del'>-	  .type = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-	  .name = "Contrast",</div><div class='del'>-	  .minimum = 0,</div><div class='del'>-	  .maximum = 0x3fff,</div><div class='del'>-	  .step = 1,</div><div class='del'>-	  .default_value = 0x2000,</div><div class='del'>-	  },</div><div class='del'>-	 .set = sd_setcontrast,</div><div class='del'>-	 .get = sd_getcontrast,</div><div class='del'>-	 },</div><div class='del'>-#define SD_AUTOGAIN 2</div><div class='del'>-	{</div><div class='del'>-	 {</div><div class='del'>-	  .id = V4L2_CID_AUTOGAIN,</div><div class='del'>-	  .type = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='del'>-	  .name = "Auto Gain",</div><div class='del'>-	  .minimum = 0,</div><div class='del'>-	  .maximum = 1,</div><div class='del'>-	  .step = 1,</div><div class='del'>-	  .default_value = 1,</div><div class='del'>-	  },</div><div class='del'>-	 .set = sd_setautogain,</div><div class='del'>-	 .get = sd_getautogain,</div><div class='del'>-	 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct v4l2_pix_format sif_mode[] = {</div><div class='add'>+static struct v4l2_pix_format sif_012a_mode[] = {</div><div class='ctx'> 	{160, 120, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,</div><div class='ctx'> 		.bytesperline = 160,</div><div class='ctx'> 		.sizeimage = 160 * 120,</div><div class='hunk'>@@ -117,6 +96,29 @@ static struct v4l2_pix_format sif_mode[] = {</div><div class='ctx'> 		.priv = 0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct v4l2_pix_format sif_072a_mode[] = {</div><div class='add'>+	{160, 120, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 160,</div><div class='add'>+		.sizeimage = 160 * 120,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 3},</div><div class='add'>+	{176, 144, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 176,</div><div class='add'>+		.sizeimage = 176 * 144,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 2},</div><div class='add'>+	{320, 240, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 320,</div><div class='add'>+		.sizeimage = 320 * 240,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 1},</div><div class='add'>+	{352, 288, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 352,</div><div class='add'>+		.sizeimage = 352 * 288,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Initialization data</div><div class='ctx'>  * I'm not very sure how to split initialization from open data</div><div class='hunk'>@@ -143,12 +145,8 @@ static struct v4l2_pix_format sif_mode[] = {</div><div class='ctx'> #define SPCA561_INDEX_I2C_BASE 0x8800</div><div class='ctx'> #define SPCA561_SNAPBIT 0x20</div><div class='ctx'> #define SPCA561_SNAPCTRL 0x40</div><div class='del'>-enum {</div><div class='del'>-	Rev072A = 0,</div><div class='del'>-	Rev012A,</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static void reg_w_val(struct usb_device *dev, __u16 index, __u16 value)</div><div class='add'>+static void reg_w_val(struct usb_device *dev, __u16 index, __u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -198,12 +196,6 @@ static void reg_w_buf(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			index, gspca_dev-&gt;usb_buf, len, 500);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void i2c_init(struct gspca_dev *gspca_dev, __u8 mode)</div><div class='del'>-{</div><div class='del'>-	reg_w_val(gspca_dev-&gt;dev, 0x92, 0x8804);</div><div class='del'>-	reg_w_val(gspca_dev-&gt;dev, mode, 0x8802);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void i2c_write(struct gspca_dev *gspca_dev, __u16 valeur, __u16 reg)</div><div class='ctx'> {</div><div class='ctx'> 	int retry = 60;</div><div class='hunk'>@@ -212,9 +204,9 @@ static void i2c_write(struct gspca_dev *gspca_dev, __u16 valeur, __u16 reg)</div><div class='ctx'> </div><div class='ctx'> 	DataLow = valeur;</div><div class='ctx'> 	DataHight = valeur &gt;&gt; 8;</div><div class='del'>-	reg_w_val(gspca_dev-&gt;dev, reg, 0x8801);</div><div class='del'>-	reg_w_val(gspca_dev-&gt;dev, DataLow, 0x8805);</div><div class='del'>-	reg_w_val(gspca_dev-&gt;dev, DataHight, 0x8800);</div><div class='add'>+	reg_w_val(gspca_dev-&gt;dev, 0x8801, reg);</div><div class='add'>+	reg_w_val(gspca_dev-&gt;dev, 0x8805, DataLow);</div><div class='add'>+	reg_w_val(gspca_dev-&gt;dev, 0x8800, DataHight);</div><div class='ctx'> 	while (retry--) {</div><div class='ctx'> 		reg_r(gspca_dev, 0x8803, 1);</div><div class='ctx'> 		if (!gspca_dev-&gt;usb_buf[0])</div><div class='hunk'>@@ -228,14 +220,14 @@ static int i2c_read(struct gspca_dev *gspca_dev, __u16 reg, __u8 mode)</div><div class='ctx'> 	__u8 value;</div><div class='ctx'> 	__u8 vallsb;</div><div class='ctx'> </div><div class='del'>-	reg_w_val(gspca_dev-&gt;dev, 0x92, 0x8804);</div><div class='del'>-	reg_w_val(gspca_dev-&gt;dev, reg, 0x8801);</div><div class='del'>-	reg_w_val(gspca_dev-&gt;dev, (mode | 0x01), 0x8802);</div><div class='del'>-	while (retry--) {</div><div class='add'>+	reg_w_val(gspca_dev-&gt;dev, 0x8804, 0x92);</div><div class='add'>+	reg_w_val(gspca_dev-&gt;dev, 0x8801, reg);</div><div class='add'>+	reg_w_val(gspca_dev-&gt;dev, 0x8802, (mode | 0x01));</div><div class='add'>+	do {</div><div class='ctx'> 		reg_r(gspca_dev, 0x8803, 1);</div><div class='ctx'> 		if (!gspca_dev-&gt;usb_buf)</div><div class='ctx'> 			break;</div><div class='del'>-	}</div><div class='add'>+	} while (--retry);</div><div class='ctx'> 	if (retry == 0)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	reg_r(gspca_dev, 0x8800, 1);</div><div class='hunk'>@@ -438,21 +430,10 @@ static const __u16 spca561_init_data[][2] = {</div><div class='ctx'> 	{0x0035, 0x8801},	/* 0x14 - set gain general */</div><div class='ctx'> 	{0x001f, 0x8805},	/* 0x14 */</div><div class='ctx'> 	{0x0000, 0x8800},</div><div class='del'>-	{0x0030, 0x8112},</div><div class='add'>+	{0x000e, 0x8112},	/* white balance - was 30 */</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void sensor_reset(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-	reg_w_val(gspca_dev-&gt;dev, 0x8631, 0xc8);</div><div class='del'>-	reg_w_val(gspca_dev-&gt;dev, 0x8634, 0xc8);</div><div class='del'>-	reg_w_val(gspca_dev-&gt;dev, 0x8112, 0x00);</div><div class='del'>-	reg_w_val(gspca_dev-&gt;dev, 0x8114, 0x00);</div><div class='del'>-	reg_w_val(gspca_dev-&gt;dev, 0x8118, 0x21);</div><div class='del'>-	i2c_init(gspca_dev, 0x14);</div><div class='del'>-	i2c_write(gspca_dev, 1, 0x0d);</div><div class='del'>-	i2c_write(gspca_dev, 0, 0x0d);</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> /******************** QC Express etch2 stuff ********************/</div><div class='ctx'> static const __u16 Pb100_1map8300[][2] = {</div><div class='hunk'>@@ -462,9 +443,9 @@ static const __u16 Pb100_1map8300[][2] = {</div><div class='ctx'> 	{0x8303, 0x0125},	/* image area */</div><div class='ctx'> 	{0x8304, 0x0169},</div><div class='ctx'> 	{0x8328, 0x000b},</div><div class='del'>-	{0x833c, 0x0001},</div><div class='add'>+	{0x833c, 0x0001},		/*fixme: win:07*/</div><div class='ctx'> </div><div class='del'>-	{0x832f, 0x0419},</div><div class='add'>+	{0x832f, 0x1904},		/*fixme: was 0419*/</div><div class='ctx'> 	{0x8307, 0x00aa},</div><div class='ctx'> 	{0x8301, 0x0003},</div><div class='ctx'> 	{0x8302, 0x000e},</div><div class='hunk'>@@ -478,9 +459,10 @@ static const __u16 Pb100_2map8300[][2] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const __u16 spca561_161rev12A_data1[][2] = {</div><div class='del'>-	{0x21, 0x8118},</div><div class='del'>-	{0x01, 0x8114},</div><div class='del'>-	{0x00, 0x8112},</div><div class='add'>+	{0x29, 0x8118},		/* white balance - was 21 */</div><div class='add'>+	{0x08, 0x8114},		/* white balance - was 01 */</div><div class='add'>+	{0x0e, 0x8112},		/* white balance - was 00 */</div><div class='add'>+	{0x00, 0x8102},		/* white balance - new */</div><div class='ctx'> 	{0x92, 0x8804},</div><div class='ctx'> 	{0x04, 0x8802},		/* windows uses 08 */</div><div class='ctx'> 	{}</div><div class='hunk'>@@ -505,14 +487,16 @@ static const __u16 spca561_161rev12A_data2[][2] = {</div><div class='ctx'> 	{0xb0, 0x8603},</div><div class='ctx'> </div><div class='ctx'> 	/* sensor gains */</div><div class='add'>+	{0x07, 0x8601},		/* white balance - new */</div><div class='add'>+	{0x07, 0x8602},		/* white balance - new */</div><div class='ctx'> 	{0x00, 0x8610},		/* *red */</div><div class='ctx'> 	{0x00, 0x8611},		/* 3f   *green */</div><div class='ctx'> 	{0x00, 0x8612},		/* green *blue */</div><div class='ctx'> 	{0x00, 0x8613},		/* blue *green */</div><div class='del'>-	{0x35, 0x8614},		/* green *red */</div><div class='del'>-	{0x35, 0x8615},		/* 40   *green */</div><div class='del'>-	{0x35, 0x8616},		/* 7a   *blue */</div><div class='del'>-	{0x35, 0x8617},		/* 40   *green */</div><div class='add'>+	{0x43, 0x8614},		/* green *red - white balance - was 0x35 */</div><div class='add'>+	{0x40, 0x8615},		/* 40   *green - white balance - was 0x35 */</div><div class='add'>+	{0x71, 0x8616},		/* 7a   *blue - white balance - was 0x35 */</div><div class='add'>+	{0x40, 0x8617},		/* 40   *green - white balance - was 0x35 */</div><div class='ctx'> </div><div class='ctx'> 	{0x0c, 0x8620},		/* 0c */</div><div class='ctx'> 	{0xc8, 0x8631},		/* c8 */</div><div class='hunk'>@@ -527,6 +511,7 @@ static const __u16 spca561_161rev12A_data2[][2] = {</div><div class='ctx'> 	{0xdf, 0x863c},		/* df */</div><div class='ctx'> 	{0xf0, 0x8505},</div><div class='ctx'> 	{0x32, 0x850a},</div><div class='add'>+/*	{0x99, 0x8700},		 * - white balance - new (removed) */</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -545,9 +530,10 @@ static void sensor_mapwrite(struct gspca_dev *gspca_dev,</div><div class='ctx'> }</div><div class='ctx'> static void init_161rev12A(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='del'>-	sensor_reset(gspca_dev);</div><div class='add'>+/*	sensor_reset(gspca_dev);	(not in win) */</div><div class='ctx'> 	write_vector(gspca_dev, spca561_161rev12A_data1);</div><div class='ctx'> 	sensor_mapwrite(gspca_dev, Pb100_1map8300);</div><div class='add'>+/*fixme: should be in sd_start*/</div><div class='ctx'> 	write_vector(gspca_dev, spca561_161rev12A_data2);</div><div class='ctx'> 	sensor_mapwrite(gspca_dev, Pb100_2map8300);</div><div class='ctx'> }</div><div class='hunk'>@@ -581,35 +567,38 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cam = &amp;gspca_dev-&gt;cam;</div><div class='del'>-	cam-&gt;dev_name = (char *) id-&gt;driver_info;</div><div class='ctx'> 	cam-&gt;epaddr = 0x01;</div><div class='ctx'> 	gspca_dev-&gt;nbalt = 7 + 1;	/* choose alternate 7 first */</div><div class='del'>-	cam-&gt;cam_mode = sif_mode;</div><div class='del'>-	cam-&gt;nmodes = sizeof sif_mode / sizeof sif_mode[0];</div><div class='ctx'> </div><div class='ctx'> 	sd-&gt;chip_revision = id-&gt;driver_info;</div><div class='del'>-	sd-&gt;brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;</div><div class='del'>-	sd-&gt;contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;</div><div class='del'>-	sd-&gt;autogain = sd_ctrls[SD_AUTOGAIN].qctrl.default_value;</div><div class='add'>+	if (sd-&gt;chip_revision == Rev012A) {</div><div class='add'>+		cam-&gt;cam_mode = sif_012a_mode;</div><div class='add'>+		cam-&gt;nmodes = ARRAY_SIZE(sif_012a_mode);</div><div class='add'>+	} else {</div><div class='add'>+		cam-&gt;cam_mode = sif_072a_mode;</div><div class='add'>+		cam-&gt;nmodes = ARRAY_SIZE(sif_072a_mode);</div><div class='add'>+	}</div><div class='add'>+	sd-&gt;brightness = BRIGHTNESS_DEF;</div><div class='add'>+	sd-&gt;contrast = CONTRAST_DEF;</div><div class='add'>+	sd-&gt;white = WHITE_DEF;</div><div class='add'>+	sd-&gt;exposure = EXPOSURE_DEF;</div><div class='add'>+	sd-&gt;autogain = AUTOGAIN_DEF;</div><div class='add'>+	sd-&gt;gain = GAIN_DEF;</div><div class='add'>+	sd-&gt;expo12a = EXPO12A_DEF;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init_12a(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='del'>-	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-</div><div class='del'>-	switch (sd-&gt;chip_revision) {</div><div class='del'>-	case Rev072A:</div><div class='del'>-		PDEBUG(D_STREAM, "Chip revision id: 072a");</div><div class='del'>-		write_vector(gspca_dev, spca561_init_data);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-/*	case Rev012A: */</div><div class='del'>-		PDEBUG(D_STREAM, "Chip revision id: 012a");</div><div class='del'>-		init_161rev12A(gspca_dev);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	PDEBUG(D_STREAM, "Chip revision: 012a");</div><div class='add'>+	init_161rev12A(gspca_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int sd_init_72a(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	PDEBUG(D_STREAM, "Chip revision: 072a");</div><div class='add'>+	write_vector(gspca_dev, spca561_init_data);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -618,25 +607,20 @@ static void setcontrast(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='ctx'> 	__u8 lowb;</div><div class='del'>-	int expotimes;</div><div class='ctx'> </div><div class='ctx'> 	switch (sd-&gt;chip_revision) {</div><div class='ctx'> 	case Rev072A:</div><div class='ctx'> 		lowb = sd-&gt;contrast &gt;&gt; 8;</div><div class='del'>-		reg_w_val(dev, lowb, 0x8651);</div><div class='del'>-		reg_w_val(dev, lowb, 0x8652);</div><div class='del'>-		reg_w_val(dev, lowb, 0x8653);</div><div class='del'>-		reg_w_val(dev, lowb, 0x8654);</div><div class='add'>+		reg_w_val(dev, 0x8651, lowb);</div><div class='add'>+		reg_w_val(dev, 0x8652, lowb);</div><div class='add'>+		reg_w_val(dev, 0x8653, lowb);</div><div class='add'>+		reg_w_val(dev, 0x8654, lowb);</div><div class='ctx'> 		break;</div><div class='del'>-	case Rev012A: {</div><div class='del'>-		__u8 Reg8391[] =</div><div class='del'>-			{ 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00 };</div><div class='del'>-</div><div class='del'>-		/* Write camera sensor settings */</div><div class='del'>-		expotimes = (sd-&gt;contrast &gt;&gt; 5) &amp; 0x07ff;</div><div class='del'>-		Reg8391[0] = expotimes &amp; 0xff;	/* exposure */</div><div class='del'>-		Reg8391[1] = 0x18 | (expotimes &gt;&gt; 8);</div><div class='del'>-		Reg8391[2] = sd-&gt;brightness;	/* gain */</div><div class='add'>+	default: {</div><div class='add'>+/*	case Rev012A: { */</div><div class='add'>+		static const __u8 Reg8391[] =</div><div class='add'>+			{ 0x92, 0x30, 0x20, 0x00, 0x0c, 0x00, 0x00, 0x00 };</div><div class='add'>+</div><div class='ctx'> 		reg_w_buf(gspca_dev, 0x8391, Reg8391, 8);</div><div class='ctx'> 		reg_w_buf(gspca_dev, 0x8390, Reg8391, 8);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -644,93 +628,171 @@ static void setcontrast(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+/* rev12a only */</div><div class='add'>+static void setwhite(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	__u16 white;</div><div class='add'>+	__u8 reg8614, reg8616;</div><div class='add'>+</div><div class='add'>+	white = sd-&gt;white;</div><div class='add'>+	/* try to emulate MS-win as possible */</div><div class='add'>+	reg8616 = 0x90 - white * 5 / 8;</div><div class='add'>+	reg_w_val(gspca_dev-&gt;dev, 0x8616, reg8616);</div><div class='add'>+	reg8614 = 0x20 + white * 3 / 8;</div><div class='add'>+	reg_w_val(gspca_dev-&gt;dev, 0x8614, reg8614);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rev 12a only */</div><div class='add'>+static void setexposure(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	int expo;</div><div class='add'>+	int clock_divider;</div><div class='add'>+	__u8 data[2];</div><div class='add'>+</div><div class='add'>+	/* Register 0x8309 controls exposure for the spca561,</div><div class='add'>+	   the basic exposure setting goes from 1-2047, where 1 is completely</div><div class='add'>+	   dark and 2047 is very bright. It not only influences exposure but</div><div class='add'>+	   also the framerate (to allow for longer exposure) from 1 - 300 it</div><div class='add'>+	   only raises the exposure time then from 300 - 600 it halves the</div><div class='add'>+	   framerate to be able to further raise the exposure time and for every</div><div class='add'>+	   300 more it halves the framerate again. This allows for a maximum</div><div class='add'>+	   exposure time of circa 0.2 - 0.25 seconds (30 / (2000/3000) fps).</div><div class='add'>+	   Sometimes this is not enough, the 1-2047 uses bits 0-10, bits 11-12</div><div class='add'>+	   configure a divider for the base framerate which us used at the</div><div class='add'>+	   exposure setting of 1-300. These bits configure the base framerate</div><div class='add'>+	   according to the following formula: fps = 60 / (value + 2) */</div><div class='add'>+	if (sd-&gt;exposure &lt; 2048) {</div><div class='add'>+		expo = sd-&gt;exposure;</div><div class='add'>+		clock_divider = 0;</div><div class='add'>+	} else {</div><div class='add'>+		/* Add 900 to make the 0 setting of the second part of the</div><div class='add'>+		   exposure equal to the 2047 setting of the first part. */</div><div class='add'>+		expo = (sd-&gt;exposure - 2048) + 900;</div><div class='add'>+		clock_divider = 3;</div><div class='add'>+	}</div><div class='add'>+	expo |= clock_divider &lt;&lt; 11;</div><div class='add'>+	data[0] = expo;</div><div class='add'>+	data[1] = expo &gt;&gt; 8;</div><div class='add'>+	reg_w_buf(gspca_dev, 0x8309, data, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rev 12a only */</div><div class='add'>+static void setgain(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	__u8 data[2];</div><div class='add'>+</div><div class='add'>+	data[0] = sd-&gt;gain;</div><div class='add'>+	data[1] = 0;</div><div class='add'>+	reg_w_buf(gspca_dev, 0x8335, data, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setautogain(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;autogain)</div><div class='add'>+		sd-&gt;ag_cnt = AG_CNT_START;</div><div class='add'>+	else</div><div class='add'>+		sd-&gt;ag_cnt = -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sd_start_12a(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='ctx'> 	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='del'>-	int Clck;</div><div class='add'>+	int Clck = 0x8a; /* lower 0x8X values lead to fps &gt; 30 */</div><div class='ctx'> 	__u8 Reg8307[] = { 0xaa, 0x00 };</div><div class='ctx'> 	int mode;</div><div class='ctx'> </div><div class='ctx'> 	mode = gspca_dev-&gt;cam.cam_mode[(int) gspca_dev-&gt;curr_mode].priv;</div><div class='del'>-	switch (sd-&gt;chip_revision) {</div><div class='del'>-	case Rev072A:</div><div class='del'>-		switch (mode) {</div><div class='del'>-		default:</div><div class='del'>-/*		case 0:</div><div class='del'>-		case 1: */</div><div class='del'>-			Clck = 0x25;</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			Clck = 0x22;</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-			Clck = 0x21;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		reg_w_val(dev, 0x8500, mode);	/* mode */</div><div class='del'>-		reg_w_val(dev, 0x8700, Clck);	/* 0x27 clock */</div><div class='del'>-		reg_w_val(dev, 0x8112, 0x10 | 0x20);</div><div class='del'>-		break;</div><div class='add'>+	if (mode &lt;= 1) {</div><div class='add'>+		/* Use compression on 320x240 and above */</div><div class='add'>+		reg_w_val(dev, 0x8500, 0x10 | mode);</div><div class='add'>+	} else {</div><div class='add'>+		/* I couldn't get the compression to work below 320x240</div><div class='add'>+		 * Fortunately at these resolutions the bandwidth</div><div class='add'>+		 * is sufficient to push raw frames at ~20fps */</div><div class='add'>+		reg_w_val(dev, 0x8500, mode);</div><div class='add'>+	}		/* -- qq@kuku.eu.org */</div><div class='add'>+	reg_w_buf(gspca_dev, 0x8307, Reg8307, 2);</div><div class='add'>+	reg_w_val(gspca_dev-&gt;dev, 0x8700, Clck);</div><div class='add'>+					/* 0x8f 0x85 0x27 clock */</div><div class='add'>+	reg_w_val(gspca_dev-&gt;dev, 0x8112, 0x1e | 0x20);</div><div class='add'>+	reg_w_val(gspca_dev-&gt;dev, 0x850b, 0x03);</div><div class='add'>+	setcontrast(gspca_dev);</div><div class='add'>+	setwhite(gspca_dev);</div><div class='add'>+	setautogain(gspca_dev);</div><div class='add'>+	setexposure(gspca_dev);</div><div class='add'>+}</div><div class='add'>+static void sd_start_72a(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='add'>+	int Clck;</div><div class='add'>+	int mode;</div><div class='add'>+</div><div class='add'>+	mode = gspca_dev-&gt;cam.cam_mode[(int) gspca_dev-&gt;curr_mode].priv;</div><div class='add'>+	switch (mode) {</div><div class='ctx'> 	default:</div><div class='del'>-/*	case Rev012A: */</div><div class='del'>-		switch (mode) {</div><div class='del'>-		case 0:</div><div class='del'>-		case 1:</div><div class='del'>-			Clck = 0x8a;</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			Clck = 0x85;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			Clck = 0x83;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (mode &lt;= 1) {</div><div class='del'>-			/* Use compression on 320x240 and above */</div><div class='del'>-			reg_w_val(dev, 0x8500, 0x10 | mode);</div><div class='del'>-		} else {</div><div class='del'>-			/* I couldn't get the compression to work below 320x240</div><div class='del'>-			 * Fortunately at these resolutions the bandwidth</div><div class='del'>-			 * is sufficient to push raw frames at ~20fps */</div><div class='del'>-			reg_w_val(dev, 0x8500, mode);</div><div class='del'>-		}		/* -- qq@kuku.eu.org */</div><div class='del'>-		reg_w_buf(gspca_dev, 0x8307, Reg8307, 2);</div><div class='del'>-		reg_w_val(gspca_dev-&gt;dev, 0x8700, Clck);</div><div class='del'>-						/* 0x8f 0x85 0x27 clock */</div><div class='del'>-		reg_w_val(gspca_dev-&gt;dev, 0x8112, 0x1e | 0x20);</div><div class='del'>-		reg_w_val(gspca_dev-&gt;dev, 0x850b, 0x03);</div><div class='del'>-		setcontrast(gspca_dev);</div><div class='add'>+/*	case 0:</div><div class='add'>+	case 1: */</div><div class='add'>+		Clck = 0x25;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		Clck = 0x22;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		Clck = 0x21;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	reg_w_val(dev, 0x8500, mode);	/* mode */</div><div class='add'>+	reg_w_val(dev, 0x8700, Clck);	/* 0x27 clock */</div><div class='add'>+	reg_w_val(dev, 0x8112, 0x10 | 0x20);</div><div class='add'>+	setautogain(gspca_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='del'>-	reg_w_val(gspca_dev-&gt;dev, 0x8112, 0x20);</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;chip_revision == Rev012A) {</div><div class='add'>+		reg_w_val(gspca_dev-&gt;dev, 0x8112, 0x0e);</div><div class='add'>+	} else {</div><div class='add'>+		reg_w_val(gspca_dev-&gt;dev, 0x8112, 0x20);</div><div class='add'>+/*		reg_w_val(gspca_dev-&gt;dev, 0x8102, 0x00); ?? */</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='del'>-}</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='del'>-/* this function is called at close time */</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-	reg_w_val(gspca_dev-&gt;dev, 0x8114, 0);</div><div class='add'>+	if (sd-&gt;chip_revision == Rev012A) {</div><div class='add'>+		reg_w_val(gspca_dev-&gt;dev, 0x8118, 0x29);</div><div class='add'>+		reg_w_val(gspca_dev-&gt;dev, 0x8114, 0x08);</div><div class='add'>+	}</div><div class='add'>+/*	reg_w_val(gspca_dev-&gt;dev, 0x8114, 0); */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void setautogain(struct gspca_dev *gspca_dev)</div><div class='add'>+static void do_autogain(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	int expotimes = 0;</div><div class='del'>-	int pixelclk = 0;</div><div class='del'>-	int gainG = 0;</div><div class='add'>+	int expotimes;</div><div class='add'>+	int pixelclk;</div><div class='add'>+	int gainG;</div><div class='ctx'> 	__u8 R, Gr, Gb, B;</div><div class='ctx'> 	int y;</div><div class='ctx'> 	__u8 luma_mean = 110;</div><div class='ctx'> 	__u8 luma_delta = 20;</div><div class='ctx'> 	__u8 spring = 4;</div><div class='add'>+	__u8 reg8339[2];</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;ag_cnt &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	if (--sd-&gt;ag_cnt &gt;= 0)</div><div class='add'>+		return;</div><div class='add'>+	sd-&gt;ag_cnt = AG_CNT_START;</div><div class='ctx'> </div><div class='ctx'> 	switch (sd-&gt;chip_revision) {</div><div class='ctx'> 	case Rev072A:</div><div class='hunk'>@@ -779,13 +841,16 @@ static void setautogain(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Rev012A:</div><div class='del'>-		/* sensor registers is access and memory mapped to 0x8300 */</div><div class='del'>-		/* readind all 0x83xx block the sensor */</div><div class='del'>-		/*</div><div class='del'>-		 * The data from the header seem wrong where is the luma</div><div class='del'>-		 * and chroma mean value</div><div class='del'>-		 * at the moment set exposure in contrast set</div><div class='del'>-		 */</div><div class='add'>+		reg_r(gspca_dev, 0x8330, 2);</div><div class='add'>+		if (gspca_dev-&gt;usb_buf[1] &gt; 0x08) {</div><div class='add'>+			reg8339[0] = ++sd-&gt;expo12a;</div><div class='add'>+			reg8339[1] = 0;</div><div class='add'>+			reg_w_buf(gspca_dev, 0x8339, reg8339, 2);</div><div class='add'>+		} else if (gspca_dev-&gt;usb_buf[1] &lt; 0x02) {</div><div class='add'>+			reg8339[0] = --sd-&gt;expo12a;</div><div class='add'>+			reg8339[1] = 0;</div><div class='add'>+			reg_w_buf(gspca_dev, 0x8339, reg8339, 2);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -801,12 +866,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	case 0:		/* start of frame */</div><div class='ctx'> 		frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,</div><div class='ctx'> 					data, 0);</div><div class='del'>-		if (sd-&gt;ag_cnt &gt;= 0) {</div><div class='del'>-			if (--sd-&gt;ag_cnt &lt; 0) {</div><div class='del'>-				sd-&gt;ag_cnt = AG_CNT_START;</div><div class='del'>-				setautogain(gspca_dev);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='ctx'> 		data += SPCA561_OFFSET_DATA;</div><div class='ctx'> 		len -= SPCA561_OFFSET_DATA;</div><div class='ctx'> 		if (data[1] &amp; 0x10) {</div><div class='hunk'>@@ -815,8 +874,13 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 					frame, data, len);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* raw bayer (with a header, which we skip) */</div><div class='del'>-			data += 20;</div><div class='del'>-			len -= 20;</div><div class='add'>+			if (sd-&gt;chip_revision == Rev012A) {</div><div class='add'>+				data += 20;</div><div class='add'>+				len -= 20;</div><div class='add'>+			} else {</div><div class='add'>+				data += 16;</div><div class='add'>+				len -= 16;</div><div class='add'>+			}</div><div class='ctx'> 			gspca_frame_add(gspca_dev, FIRST_PACKET,</div><div class='ctx'> 						frame, data, len);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -830,24 +894,17 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* rev 72a only */</div><div class='ctx'> static void setbrightness(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	__u8 value;</div><div class='ctx'> </div><div class='del'>-	switch (sd-&gt;chip_revision) {</div><div class='del'>-	case Rev072A:</div><div class='del'>-		value = sd-&gt;brightness;</div><div class='del'>-		reg_w_val(gspca_dev-&gt;dev, value, 0x8611);</div><div class='del'>-		reg_w_val(gspca_dev-&gt;dev, value, 0x8612);</div><div class='del'>-		reg_w_val(gspca_dev-&gt;dev, value, 0x8613);</div><div class='del'>-		reg_w_val(gspca_dev-&gt;dev, value, 0x8614);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-/*	case Rev012A: */</div><div class='del'>-		setcontrast(gspca_dev);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	value = sd-&gt;brightness;</div><div class='add'>+	reg_w_val(gspca_dev-&gt;dev, 0x8611, value);</div><div class='add'>+	reg_w_val(gspca_dev-&gt;dev, 0x8612, value);</div><div class='add'>+	reg_w_val(gspca_dev-&gt;dev, 0x8613, value);</div><div class='add'>+	reg_w_val(gspca_dev-&gt;dev, 0x8614, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void getbrightness(struct gspca_dev *gspca_dev)</div><div class='hunk'>@@ -855,52 +912,38 @@ static void getbrightness(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	__u16 tot;</div><div class='ctx'> </div><div class='del'>-	switch (sd-&gt;chip_revision) {</div><div class='del'>-	case Rev072A:</div><div class='del'>-		tot = 0;</div><div class='del'>-		reg_r(gspca_dev, 0x8611, 1);</div><div class='del'>-		tot += gspca_dev-&gt;usb_buf[0];</div><div class='del'>-		reg_r(gspca_dev, 0x8612, 1);</div><div class='del'>-		tot += gspca_dev-&gt;usb_buf[0];</div><div class='del'>-		reg_r(gspca_dev, 0x8613, 1);</div><div class='del'>-		tot += gspca_dev-&gt;usb_buf[0];</div><div class='del'>-		reg_r(gspca_dev, 0x8614, 1);</div><div class='del'>-		tot += gspca_dev-&gt;usb_buf[0];</div><div class='del'>-		sd-&gt;brightness = tot &gt;&gt; 2;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-/*	case Rev012A: */</div><div class='del'>-		/* no way to read sensor settings */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	tot = 0;</div><div class='add'>+	reg_r(gspca_dev, 0x8611, 1);</div><div class='add'>+	tot += gspca_dev-&gt;usb_buf[0];</div><div class='add'>+	reg_r(gspca_dev, 0x8612, 1);</div><div class='add'>+	tot += gspca_dev-&gt;usb_buf[0];</div><div class='add'>+	reg_r(gspca_dev, 0x8613, 1);</div><div class='add'>+	tot += gspca_dev-&gt;usb_buf[0];</div><div class='add'>+	reg_r(gspca_dev, 0x8614, 1);</div><div class='add'>+	tot += gspca_dev-&gt;usb_buf[0];</div><div class='add'>+	sd-&gt;brightness = tot &gt;&gt; 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* rev72a only */</div><div class='ctx'> static void getcontrast(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	__u16 tot;</div><div class='ctx'> </div><div class='del'>-	switch (sd-&gt;chip_revision) {</div><div class='del'>-	case Rev072A:</div><div class='del'>-		tot = 0;</div><div class='del'>-		reg_r(gspca_dev, 0x8651, 1);</div><div class='del'>-		tot += gspca_dev-&gt;usb_buf[0];</div><div class='del'>-		reg_r(gspca_dev, 0x8652, 1);</div><div class='del'>-		tot += gspca_dev-&gt;usb_buf[0];</div><div class='del'>-		reg_r(gspca_dev, 0x8653, 1);</div><div class='del'>-		tot += gspca_dev-&gt;usb_buf[0];</div><div class='del'>-		reg_r(gspca_dev, 0x8654, 1);</div><div class='del'>-		tot += gspca_dev-&gt;usb_buf[0];</div><div class='del'>-		sd-&gt;contrast = tot &lt;&lt; 6;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-/*	case Rev012A: */</div><div class='del'>-		/* no way to read sensor settings */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	tot = 0;</div><div class='add'>+	reg_r(gspca_dev, 0x8651, 1);</div><div class='add'>+	tot += gspca_dev-&gt;usb_buf[0];</div><div class='add'>+	reg_r(gspca_dev, 0x8652, 1);</div><div class='add'>+	tot += gspca_dev-&gt;usb_buf[0];</div><div class='add'>+	reg_r(gspca_dev, 0x8653, 1);</div><div class='add'>+	tot += gspca_dev-&gt;usb_buf[0];</div><div class='add'>+	reg_r(gspca_dev, 0x8654, 1);</div><div class='add'>+	tot += gspca_dev-&gt;usb_buf[0];</div><div class='add'>+	sd-&gt;contrast = tot &lt;&lt; 6;</div><div class='ctx'> 	PDEBUG(D_CONF, "get contrast %d", sd-&gt;contrast);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* rev 72a only */</div><div class='ctx'> static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='hunk'>@@ -920,6 +963,7 @@ static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* rev 72a only */</div><div class='ctx'> static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='hunk'>@@ -944,10 +988,8 @@ static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='ctx'> 	sd-&gt;autogain = val;</div><div class='del'>-	if (val)</div><div class='del'>-		sd-&gt;ag_cnt = AG_CNT_START;</div><div class='del'>-	else</div><div class='del'>-		sd-&gt;ag_cnt = -1;</div><div class='add'>+	if (gspca_dev-&gt;streaming)</div><div class='add'>+		setautogain(gspca_dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -959,18 +1001,189 @@ static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* rev12a only */</div><div class='add'>+static int sd_setwhite(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	sd-&gt;white = val;</div><div class='add'>+	if (gspca_dev-&gt;streaming)</div><div class='add'>+		setwhite(gspca_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sd_getwhite(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	*val = sd-&gt;white;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rev12a only */</div><div class='add'>+static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	sd-&gt;exposure = val;</div><div class='add'>+	if (gspca_dev-&gt;streaming)</div><div class='add'>+		setexposure(gspca_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	*val = sd-&gt;exposure;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rev12a only */</div><div class='add'>+static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	sd-&gt;gain = val;</div><div class='add'>+	if (gspca_dev-&gt;streaming)</div><div class='add'>+		setgain(gspca_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	*val = sd-&gt;gain;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* control tables */</div><div class='add'>+static struct ctrl sd_ctrls_12a[] = {</div><div class='add'>+	{</div><div class='add'>+	    {</div><div class='add'>+		.id = V4L2_CID_DO_WHITE_BALANCE,</div><div class='add'>+		.type = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+		.name = "While Balance",</div><div class='add'>+		.minimum = WHITE_MIN,</div><div class='add'>+		.maximum = WHITE_MAX,</div><div class='add'>+		.step = 1,</div><div class='add'>+		.default_value = WHITE_DEF,</div><div class='add'>+	    },</div><div class='add'>+	    .set = sd_setwhite,</div><div class='add'>+	    .get = sd_getwhite,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    {</div><div class='add'>+		.id = V4L2_CID_EXPOSURE,</div><div class='add'>+		.type = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+		.name = "Exposure",</div><div class='add'>+		.minimum = EXPOSURE_MIN,</div><div class='add'>+		.maximum = EXPOSURE_MAX,</div><div class='add'>+		.step = 1,</div><div class='add'>+		.default_value = EXPOSURE_DEF,</div><div class='add'>+	    },</div><div class='add'>+	    .set = sd_setexposure,</div><div class='add'>+	    .get = sd_getexposure,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    {</div><div class='add'>+		.id = V4L2_CID_AUTOGAIN,</div><div class='add'>+		.type = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+		.name = "Auto Gain",</div><div class='add'>+		.minimum = AUTOGAIN_MIN,</div><div class='add'>+		.maximum = AUTOGAIN_MAX,</div><div class='add'>+		.step = 1,</div><div class='add'>+		.default_value = AUTOGAIN_DEF,</div><div class='add'>+	    },</div><div class='add'>+	    .set = sd_setautogain,</div><div class='add'>+	    .get = sd_getautogain,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    {</div><div class='add'>+		.id = V4L2_CID_GAIN,</div><div class='add'>+		.type = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+		.name = "Gain",</div><div class='add'>+		.minimum = GAIN_MIN,</div><div class='add'>+		.maximum = GAIN_MAX,</div><div class='add'>+		.step = 1,</div><div class='add'>+		.default_value = GAIN_DEF,</div><div class='add'>+	    },</div><div class='add'>+	    .set = sd_setgain,</div><div class='add'>+	    .get = sd_getgain,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ctrl sd_ctrls_72a[] = {</div><div class='add'>+	{</div><div class='add'>+	   {</div><div class='add'>+		.id = V4L2_CID_BRIGHTNESS,</div><div class='add'>+		.type = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+		.name = "Brightness",</div><div class='add'>+		.minimum = BRIGHTNESS_MIN,</div><div class='add'>+		.maximum = BRIGHTNESS_MAX,</div><div class='add'>+		.step = 1,</div><div class='add'>+		.default_value = BRIGHTNESS_DEF,</div><div class='add'>+	    },</div><div class='add'>+	    .set = sd_setbrightness,</div><div class='add'>+	    .get = sd_getbrightness,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    {</div><div class='add'>+		.id = V4L2_CID_CONTRAST,</div><div class='add'>+		.type = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+		.name = "Contrast",</div><div class='add'>+		.minimum = CONTRAST_MIN,</div><div class='add'>+		.maximum = CONTRAST_MAX,</div><div class='add'>+		.step = 1,</div><div class='add'>+		.default_value = CONTRAST_DEF,</div><div class='add'>+	    },</div><div class='add'>+	    .set = sd_setcontrast,</div><div class='add'>+	    .get = sd_getcontrast,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    {</div><div class='add'>+		.id = V4L2_CID_AUTOGAIN,</div><div class='add'>+		.type = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+		.name = "Auto Gain",</div><div class='add'>+		.minimum = AUTOGAIN_MIN,</div><div class='add'>+		.maximum = AUTOGAIN_MAX,</div><div class='add'>+		.step = 1,</div><div class='add'>+		.default_value = AUTOGAIN_DEF,</div><div class='add'>+	    },</div><div class='add'>+	    .set = sd_setautogain,</div><div class='add'>+	    .get = sd_getautogain,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* sub-driver description */</div><div class='del'>-static const struct sd_desc sd_desc = {</div><div class='add'>+static const struct sd_desc sd_desc_12a = {</div><div class='add'>+	.name = MODULE_NAME,</div><div class='add'>+	.ctrls = sd_ctrls_12a,</div><div class='add'>+	.nctrls = ARRAY_SIZE(sd_ctrls_12a),</div><div class='add'>+	.config = sd_config,</div><div class='add'>+	.init = sd_init_12a,</div><div class='add'>+	.start = sd_start_12a,</div><div class='add'>+	.stopN = sd_stopN,</div><div class='add'>+	.stop0 = sd_stop0,</div><div class='add'>+	.pkt_scan = sd_pkt_scan,</div><div class='add'>+/*	.dq_callback = do_autogain,	 * fixme */</div><div class='add'>+};</div><div class='add'>+static const struct sd_desc sd_desc_72a = {</div><div class='ctx'> 	.name = MODULE_NAME,</div><div class='del'>-	.ctrls = sd_ctrls,</div><div class='del'>-	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='add'>+	.ctrls = sd_ctrls_72a,</div><div class='add'>+	.nctrls = ARRAY_SIZE(sd_ctrls_72a),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='del'>-	.start = sd_start,</div><div class='add'>+	.init = sd_init_72a,</div><div class='add'>+	.start = sd_start_72a,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='ctx'> 	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='add'>+	.dq_callback = do_autogain,</div><div class='add'>+};</div><div class='add'>+static const struct sd_desc *sd_desc[2] = {</div><div class='add'>+	&amp;sd_desc_12a,</div><div class='add'>+	&amp;sd_desc_72a</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module initialisation -- */</div><div class='hunk'>@@ -999,7 +1212,9 @@ MODULE_DEVICE_TABLE(usb, device_table);</div><div class='ctx'> static int sd_probe(struct usb_interface *intf,</div><div class='ctx'> 		    const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	return gspca_dev_probe(intf, id, &amp;sd_desc, sizeof(struct sd),</div><div class='add'>+	return gspca_dev_probe(intf, id,</div><div class='add'>+				sd_desc[id-&gt;driver_info],</div><div class='add'>+				sizeof(struct sd),</div><div class='ctx'> 			       THIS_MODULE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1008,6 +1223,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c<br/>index 16219cf6a6d5..2f2de429e273 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/stk014.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/stk014.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/stk014.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/stk014.c</a></div><div class='hunk'>@@ -306,8 +306,8 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -398,14 +398,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	PDEBUG(D_STREAM, "camera stopped");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			struct gspca_frame *frame,	/* target */</div><div class='ctx'> 			__u8 *data,			/* isoc packet */</div><div class='hunk'>@@ -535,11 +527,9 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='del'>-	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> 	.querymenu = sd_querymenu,</div><div class='ctx'> };</div><div class='hunk'>@@ -564,6 +554,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c<br/>index 54efa48bee01..1cfcc6c49558 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sunplus.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/sunplus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sunplus.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/sunplus.c</a></div><div class='hunk'>@@ -449,31 +449,47 @@ static const __u8 qtable_spca504_default[2][64] = {</div><div class='ctx'> 	 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void reg_r(struct usb_device *dev,</div><div class='del'>-			   __u16 req,</div><div class='del'>-			   __u16 index,</div><div class='del'>-			   __u8 *buffer, __u16 length)</div><div class='add'>+/* read &lt;len&gt; bytes to gspca_dev-&gt;usb_buf */</div><div class='add'>+static void reg_r(struct gspca_dev *gspca_dev,</div><div class='add'>+		  __u16 req,</div><div class='add'>+		  __u16 index,</div><div class='add'>+		  __u16 len)</div><div class='ctx'> {</div><div class='del'>-	usb_control_msg(dev,</div><div class='del'>-			usb_rcvctrlpipe(dev, 0),</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='add'>+	if (len &gt; USB_BUF_SZ) {</div><div class='add'>+		err("reg_r: buffer overflow");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	usb_control_msg(gspca_dev-&gt;dev,</div><div class='add'>+			usb_rcvctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='ctx'> 			req,</div><div class='ctx'> 			USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='ctx'> 			0,		/* value */</div><div class='del'>-			index, buffer, length,</div><div class='add'>+			index,</div><div class='add'>+			len ? gspca_dev-&gt;usb_buf : NULL, len,</div><div class='ctx'> 			500);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void reg_w(struct usb_device *dev,</div><div class='del'>-			    __u16 req,</div><div class='del'>-			    __u16 value,</div><div class='del'>-			    __u16 index,</div><div class='del'>-			    __u8 *buffer, __u16 length)</div><div class='add'>+/* write &lt;len&gt; bytes from gspca_dev-&gt;usb_buf */</div><div class='add'>+static void reg_w(struct gspca_dev *gspca_dev,</div><div class='add'>+		   __u16 req,</div><div class='add'>+		   __u16 value,</div><div class='add'>+		   __u16 index,</div><div class='add'>+		   __u16 len)</div><div class='ctx'> {</div><div class='del'>-	usb_control_msg(dev,</div><div class='del'>-			usb_sndctrlpipe(dev, 0),</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='add'>+	if (len &gt; USB_BUF_SZ) {</div><div class='add'>+		err("reg_w: buffer overflow");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	usb_control_msg(gspca_dev-&gt;dev,</div><div class='add'>+			usb_sndctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='ctx'> 			req,</div><div class='ctx'> 			USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='del'>-			value, index, buffer, length,</div><div class='add'>+			value, index,</div><div class='add'>+			len ? gspca_dev-&gt;usb_buf : NULL, len,</div><div class='ctx'> 			500);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -634,7 +650,7 @@ static int spca504B_PollingDataReady(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	int count = 10;</div><div class='ctx'> </div><div class='ctx'> 	while (--count &gt; 0) {</div><div class='del'>-		reg_r(gspca_dev-&gt;dev, 0x21, 0, gspca_dev-&gt;usb_buf, 1);</div><div class='add'>+		reg_r(gspca_dev, 0x21, 0, 1);</div><div class='ctx'> 		if ((gspca_dev-&gt;usb_buf[0] &amp; 0x01) == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		msleep(10);</div><div class='hunk'>@@ -644,15 +660,14 @@ static int spca504B_PollingDataReady(struct gspca_dev *gspca_dev)</div><div class='ctx'> </div><div class='ctx'> static void spca504B_WaitCmdStatus(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='del'>-	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='ctx'> 	int count = 50;</div><div class='ctx'> </div><div class='ctx'> 	while (--count &gt; 0) {</div><div class='del'>-		reg_r(dev, 0x21, 1, gspca_dev-&gt;usb_buf, 1);</div><div class='add'>+		reg_r(gspca_dev, 0x21, 1, 1);</div><div class='ctx'> 		if (gspca_dev-&gt;usb_buf[0] != 0) {</div><div class='ctx'> 			gspca_dev-&gt;usb_buf[0] = 0;</div><div class='del'>-			reg_w(dev, 0x21, 0, 1, gspca_dev-&gt;usb_buf, 1);</div><div class='del'>-			reg_r(dev, 0x21, 1, gspca_dev-&gt;usb_buf, 1);</div><div class='add'>+			reg_w(gspca_dev, 0x21, 0, 1, 1);</div><div class='add'>+			reg_r(gspca_dev, 0x21, 1, 1);</div><div class='ctx'> 			spca504B_PollingDataReady(gspca_dev);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -662,16 +677,14 @@ static void spca504B_WaitCmdStatus(struct gspca_dev *gspca_dev)</div><div class='ctx'> </div><div class='ctx'> static void spca50x_GetFirmware(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='del'>-	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='ctx'> 	__u8 *data;</div><div class='ctx'> </div><div class='del'>-	data = kmalloc(64, GFP_KERNEL);</div><div class='del'>-	reg_r(dev, 0x20, 0, data, 5);</div><div class='add'>+	data = gspca_dev-&gt;usb_buf;</div><div class='add'>+	reg_r(gspca_dev, 0x20, 0, 5);</div><div class='ctx'> 	PDEBUG(D_STREAM, "FirmWare : %d %d %d %d %d ",</div><div class='ctx'> 		data[0], data[1], data[2], data[3], data[4]);</div><div class='del'>-	reg_r(dev, 0x23, 0, data, 64);</div><div class='del'>-	reg_r(dev, 0x23, 1, data, 64);</div><div class='del'>-	kfree(data);</div><div class='add'>+	reg_r(gspca_dev, 0x23, 0, 64);</div><div class='add'>+	reg_r(gspca_dev, 0x23, 1, 64);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void spca504B_SetSizeType(struct gspca_dev *gspca_dev)</div><div class='hunk'>@@ -686,21 +699,21 @@ static void spca504B_SetSizeType(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	Type = 0;</div><div class='ctx'> 	switch (sd-&gt;bridge) {</div><div class='ctx'> 	case BRIDGE_SPCA533:</div><div class='del'>-		reg_w(dev, 0x31, 0, 0, NULL, 0);</div><div class='add'>+		reg_w(gspca_dev, 0x31, 0, 0, 0);</div><div class='ctx'> 		spca504B_WaitCmdStatus(gspca_dev);</div><div class='ctx'> 		rc = spca504B_PollingDataReady(gspca_dev);</div><div class='ctx'> 		spca50x_GetFirmware(gspca_dev);</div><div class='ctx'> 		gspca_dev-&gt;usb_buf[0] = 2;			/* type */</div><div class='del'>-		reg_w(dev, 0x24, 0, 8, gspca_dev-&gt;usb_buf, 1);</div><div class='del'>-		reg_r(dev, 0x24, 8, gspca_dev-&gt;usb_buf, 1);</div><div class='add'>+		reg_w(gspca_dev, 0x24, 0, 8, 1);</div><div class='add'>+		reg_r(gspca_dev, 0x24, 8, 1);</div><div class='ctx'> </div><div class='ctx'> 		gspca_dev-&gt;usb_buf[0] = Size;</div><div class='del'>-		reg_w(dev, 0x25, 0, 4, gspca_dev-&gt;usb_buf, 1);</div><div class='del'>-		reg_r(dev, 0x25, 4, gspca_dev-&gt;usb_buf, 1);	/* size */</div><div class='add'>+		reg_w(gspca_dev, 0x25, 0, 4, 1);</div><div class='add'>+		reg_r(gspca_dev, 0x25, 4, 1);			/* size */</div><div class='ctx'> 		rc = spca504B_PollingDataReady(gspca_dev);</div><div class='ctx'> </div><div class='ctx'> 		/* Init the cam width height with some values get on init ? */</div><div class='del'>-		reg_w(dev, 0x31, 0, 4, NULL, 0);</div><div class='add'>+		reg_w(gspca_dev, 0x31, 0, 4, 0);</div><div class='ctx'> 		spca504B_WaitCmdStatus(gspca_dev);</div><div class='ctx'> 		rc = spca504B_PollingDataReady(gspca_dev);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -708,12 +721,12 @@ static void spca504B_SetSizeType(struct gspca_dev *gspca_dev)</div><div class='ctx'> /* case BRIDGE_SPCA504B: */</div><div class='ctx'> /* case BRIDGE_SPCA536: */</div><div class='ctx'> 		gspca_dev-&gt;usb_buf[0] = Size;</div><div class='del'>-		reg_w(dev, 0x25, 0, 4, gspca_dev-&gt;usb_buf, 1);</div><div class='del'>-		reg_r(dev, 0x25, 4, gspca_dev-&gt;usb_buf, 1);	/* size */</div><div class='add'>+		reg_w(gspca_dev, 0x25, 0, 4, 1);</div><div class='add'>+		reg_r(gspca_dev, 0x25, 4, 1);			/* size */</div><div class='ctx'> 		Type = 6;</div><div class='ctx'> 		gspca_dev-&gt;usb_buf[0] = Type;</div><div class='del'>-		reg_w(dev, 0x27, 0, 0, gspca_dev-&gt;usb_buf, 1);</div><div class='del'>-		reg_r(dev, 0x27, 0, gspca_dev-&gt;usb_buf, 1);	/* type */</div><div class='add'>+		reg_w(gspca_dev, 0x27, 0, 0, 1);</div><div class='add'>+		reg_r(gspca_dev, 0x27, 0, 1);			/* type */</div><div class='ctx'> 		rc = spca504B_PollingDataReady(gspca_dev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BRIDGE_SPCA504:</div><div class='hunk'>@@ -752,18 +765,15 @@ static void spca504_wait_status(struct gspca_dev *gspca_dev)</div><div class='ctx'> </div><div class='ctx'> static void spca504B_setQtable(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='del'>-	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='del'>-</div><div class='ctx'> 	gspca_dev-&gt;usb_buf[0] = 3;</div><div class='del'>-	reg_w(dev, 0x26, 0, 0, gspca_dev-&gt;usb_buf, 1);</div><div class='del'>-	reg_r(dev, 0x26, 0, gspca_dev-&gt;usb_buf, 1);</div><div class='add'>+	reg_w(gspca_dev, 0x26, 0, 0, 1);</div><div class='add'>+	reg_r(gspca_dev, 0x26, 0, 1);</div><div class='ctx'> 	spca504B_PollingDataReady(gspca_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sp5xx_initContBrigHueRegisters(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='ctx'> 	int pollreg = 1;</div><div class='ctx'> </div><div class='ctx'> 	switch (sd-&gt;bridge) {</div><div class='hunk'>@@ -774,20 +784,20 @@ static void sp5xx_initContBrigHueRegisters(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	default:</div><div class='ctx'> /*	case BRIDGE_SPCA533: */</div><div class='ctx'> /*	case BRIDGE_SPCA504B: */</div><div class='del'>-		reg_w(dev, 0, 0, 0x21a7, NULL, 0);	/* brightness */</div><div class='del'>-		reg_w(dev, 0, 0x20, 0x21a8, NULL, 0);	/* contrast */</div><div class='del'>-		reg_w(dev, 0, 0, 0x21ad, NULL, 0);	/* hue */</div><div class='del'>-		reg_w(dev, 0, 1, 0x21ac, NULL, 0);	/* sat/hue */</div><div class='del'>-		reg_w(dev, 0, 0x20, 0x21ae, NULL, 0);	/* saturation */</div><div class='del'>-		reg_w(dev, 0, 0, 0x21a3, NULL, 0);	/* gamma */</div><div class='add'>+		reg_w(gspca_dev, 0, 0, 0x21a7, 0);	/* brightness */</div><div class='add'>+		reg_w(gspca_dev, 0, 0x20, 0x21a8, 0);	/* contrast */</div><div class='add'>+		reg_w(gspca_dev, 0, 0, 0x21ad, 0);	/* hue */</div><div class='add'>+		reg_w(gspca_dev, 0, 1, 0x21ac, 0);	/* sat/hue */</div><div class='add'>+		reg_w(gspca_dev, 0, 0x20, 0x21ae, 0);	/* saturation */</div><div class='add'>+		reg_w(gspca_dev, 0, 0, 0x21a3, 0);	/* gamma */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BRIDGE_SPCA536:</div><div class='del'>-		reg_w(dev, 0, 0, 0x20f0, NULL, 0);</div><div class='del'>-		reg_w(dev, 0, 0x21, 0x20f1, NULL, 0);</div><div class='del'>-		reg_w(dev, 0, 0x40, 0x20f5, NULL, 0);</div><div class='del'>-		reg_w(dev, 0, 1, 0x20f4, NULL, 0);</div><div class='del'>-		reg_w(dev, 0, 0x40, 0x20f6, NULL, 0);</div><div class='del'>-		reg_w(dev, 0, 0, 0x2089, NULL, 0);</div><div class='add'>+		reg_w(gspca_dev, 0, 0, 0x20f0, 0);</div><div class='add'>+		reg_w(gspca_dev, 0, 0x21, 0x20f1, 0);</div><div class='add'>+		reg_w(gspca_dev, 0, 0x40, 0x20f5, 0);</div><div class='add'>+		reg_w(gspca_dev, 0, 1, 0x20f4, 0);</div><div class='add'>+		reg_w(gspca_dev, 0, 0x40, 0x20f6, 0);</div><div class='add'>+		reg_w(gspca_dev, 0, 0, 0x2089, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pollreg)</div><div class='hunk'>@@ -799,7 +809,6 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='del'>-	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='ctx'> 	struct cam *cam;</div><div class='ctx'> </div><div class='ctx'> 	cam = &amp;gspca_dev-&gt;cam;</div><div class='hunk'>@@ -811,7 +820,7 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	if (sd-&gt;subtype == AiptekMiniPenCam13) {</div><div class='ctx'> /* try to get the firmware as some cam answer 2.0.1.2.2</div><div class='ctx'>  * and should be a spca504b then overwrite that setting */</div><div class='del'>-		reg_r(dev, 0x20, 0, gspca_dev-&gt;usb_buf, 1);</div><div class='add'>+		reg_r(gspca_dev, 0x20, 0, 1);</div><div class='ctx'> 		switch (gspca_dev-&gt;usb_buf[0]) {</div><div class='ctx'> 		case 1:</div><div class='ctx'> 			break;		/* (right bridge/subtype) */</div><div class='hunk'>@@ -848,8 +857,8 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='hunk'>@@ -860,12 +869,12 @@ static int sd_open(struct gspca_dev *gspca_dev)</div><div class='ctx'> </div><div class='ctx'> 	switch (sd-&gt;bridge) {</div><div class='ctx'> 	case BRIDGE_SPCA504B:</div><div class='del'>-		reg_w(dev, 0x1d, 0, 0, NULL, 0);</div><div class='del'>-		reg_w(dev, 0, 1, 0x2306, NULL, 0);</div><div class='del'>-		reg_w(dev, 0, 0, 0x0d04, NULL, 0);</div><div class='del'>-		reg_w(dev, 0, 0, 0x2000, NULL, 0);</div><div class='del'>-		reg_w(dev, 0, 0x13, 0x2301, NULL, 0);</div><div class='del'>-		reg_w(dev, 0, 0, 0x2306, NULL, 0);</div><div class='add'>+		reg_w(gspca_dev, 0x1d, 0, 0, 0);</div><div class='add'>+		reg_w(gspca_dev, 0, 1, 0x2306, 0);</div><div class='add'>+		reg_w(gspca_dev, 0, 0, 0x0d04, 0);</div><div class='add'>+		reg_w(gspca_dev, 0, 0, 0x2000, 0);</div><div class='add'>+		reg_w(gspca_dev, 0, 0x13, 0x2301, 0);</div><div class='add'>+		reg_w(gspca_dev, 0, 0, 0x2306, 0);</div><div class='ctx'> 		/* fall thru */</div><div class='ctx'> 	case BRIDGE_SPCA533:</div><div class='ctx'> 		rc = spca504B_PollingDataReady(gspca_dev);</div><div class='hunk'>@@ -873,12 +882,12 @@ static int sd_open(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BRIDGE_SPCA536:</div><div class='ctx'> 		spca50x_GetFirmware(gspca_dev);</div><div class='del'>-		reg_r(dev, 0x00, 0x5002, gspca_dev-&gt;usb_buf, 1);</div><div class='add'>+		reg_r(gspca_dev, 0x00, 0x5002, 1);</div><div class='ctx'> 		gspca_dev-&gt;usb_buf[0] = 0;</div><div class='del'>-		reg_w(dev, 0x24, 0, 0, gspca_dev-&gt;usb_buf, 1);</div><div class='del'>-		reg_r(dev, 0x24, 0, gspca_dev-&gt;usb_buf, 1);</div><div class='add'>+		reg_w(gspca_dev, 0x24, 0, 0, 1);</div><div class='add'>+		reg_r(gspca_dev, 0x24, 0, 1);</div><div class='ctx'> 		rc = spca504B_PollingDataReady(gspca_dev);</div><div class='del'>-		reg_w(dev, 0x34, 0, 0, NULL, 0);</div><div class='add'>+		reg_w(gspca_dev, 0x34, 0, 0, 0);</div><div class='ctx'> 		spca504B_WaitCmdStatus(gspca_dev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BRIDGE_SPCA504C:	/* pccam600 */</div><div class='hunk'>@@ -971,12 +980,12 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> /*	case BRIDGE_SPCA536: */</div><div class='ctx'> 		if (sd-&gt;subtype == MegapixV4 ||</div><div class='ctx'> 		    sd-&gt;subtype == LogitechClickSmart820) {</div><div class='del'>-			reg_w(dev, 0xf0, 0, 0, NULL, 0);</div><div class='add'>+			reg_w(gspca_dev, 0xf0, 0, 0, 0);</div><div class='ctx'> 			spca504B_WaitCmdStatus(gspca_dev);</div><div class='del'>-			reg_r(dev, 0xf0, 4, NULL, 0);</div><div class='add'>+			reg_r(gspca_dev, 0xf0, 4, 0);</div><div class='ctx'> 			spca504B_WaitCmdStatus(gspca_dev);</div><div class='ctx'> 		} else {</div><div class='del'>-			reg_w(dev, 0x31, 0, 4, NULL, 0);</div><div class='add'>+			reg_w(gspca_dev, 0x31, 0, 4, 0);</div><div class='ctx'> 			spca504B_WaitCmdStatus(gspca_dev);</div><div class='ctx'> 			rc = spca504B_PollingDataReady(gspca_dev);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1045,7 +1054,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> /*	case BRIDGE_SPCA533: */</div><div class='ctx'> /*	case BRIDGE_SPCA536: */</div><div class='ctx'> /*	case BRIDGE_SPCA504B: */</div><div class='del'>-		reg_w(dev, 0x31, 0, 0, NULL, 0);</div><div class='add'>+		reg_w(gspca_dev, 0x31, 0, 0, 0);</div><div class='ctx'> 		spca504B_WaitCmdStatus(gspca_dev);</div><div class='ctx'> 		spca504B_PollingDataReady(gspca_dev);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1069,14 +1078,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			struct gspca_frame *frame,	/* target */</div><div class='ctx'> 			__u8 *data,			/* isoc packet */</div><div class='hunk'>@@ -1369,11 +1370,9 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='del'>-	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1456,6 +1455,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c<br/>index 91b555c34c68..f034c748fc7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/t613.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/t613.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/t613.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/t613.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> </div><div class='ctx'> #define MAX_GAMMA 0x10		/* 0 to 15 */</div><div class='ctx'> </div><div class='del'>-#define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 3)</div><div class='add'>+#define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 0)</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Leandro Costantino &lt;le_costantino@pixartargentina.com.ar&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("GSPCA/T613 (JPEG Compliance) USB Camera Driver");</div><div class='hunk'>@@ -233,7 +233,7 @@ static char *effects_control[] = {</div><div class='ctx'> static struct v4l2_pix_format vga_mode_t16[] = {</div><div class='ctx'> 	{160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,</div><div class='ctx'> 		.bytesperline = 160,</div><div class='del'>-		.sizeimage = 160 * 120 * 3 / 8 + 590,</div><div class='add'>+		.sizeimage = 160 * 120 * 4 / 8 + 590,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_JPEG,</div><div class='ctx'> 		.priv = 4},</div><div class='ctx'> 	{176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,</div><div class='hunk'>@@ -391,7 +391,7 @@ static void reg_w(struct gspca_dev *gspca_dev,</div><div class='ctx'> 				NULL, 0, 500);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (len &lt;= sizeof gspca_dev-&gt;usb_buf) {</div><div class='add'>+	if (len &lt;= USB_BUF_SZ) {</div><div class='ctx'> 		memcpy(gspca_dev-&gt;usb_buf, buffer, len);</div><div class='ctx'> 		usb_control_msg(gspca_dev-&gt;dev,</div><div class='ctx'> 				usb_sndctrlpipe(gspca_dev-&gt;dev, 0),</div><div class='hunk'>@@ -552,6 +552,13 @@ static int init_default_parameters(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	init_default_parameters(gspca_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void setbrightness(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='hunk'>@@ -893,18 +900,6 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	setcolors(gspca_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			struct gspca_frame *frame,	/* target */</div><div class='ctx'> 			__u8 *data,			/* isoc packet */</div><div class='hunk'>@@ -972,24 +967,14 @@ static int sd_querymenu(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-	init_default_parameters(gspca_dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* sub-driver description */</div><div class='ctx'> static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.name = MODULE_NAME,</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='del'>-	.stopN = sd_stopN,</div><div class='del'>-	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> 	.querymenu = sd_querymenu,</div><div class='ctx'> };</div><div class='hunk'>@@ -1014,6 +999,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c<br/>index 1ff8ba2f7fe5..084af05302a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/tv8532.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/tv8532.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/tv8532.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/tv8532.c</a></div><div class='hunk'>@@ -331,8 +331,8 @@ static void tv_8532_PollReg(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	reg_w_1(gspca_dev, TV8532_AD_SLOPE, 0x32);</div><div class='ctx'> 	reg_w_1(gspca_dev, TV8532_AD_BITCTRL, 0x00);</div><div class='hunk'>@@ -450,14 +450,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	reg_w_1(gspca_dev, TV8532_GPIO_OE, 0x0b);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void tv8532_preprocess(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='hunk'>@@ -611,11 +603,9 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='del'>-	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -644,6 +634,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c<br/>index a4221753e1bf..bd4c226c9a07 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/vc032x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/vc032x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/vc032x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/vc032x.c</a></div><div class='hunk'>@@ -69,6 +69,7 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 	    .set = sd_setautogain,</div><div class='ctx'> 	    .get = sd_getautogain,</div><div class='ctx'> 	},</div><div class='add'>+#define LIGHTFREQ_IDX 1</div><div class='ctx'> 	{</div><div class='ctx'> 	    {</div><div class='ctx'> 		.id	 = V4L2_CID_POWER_LINE_FREQUENCY,</div><div class='hunk'>@@ -87,13 +88,13 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct v4l2_pix_format vc0321_mode[] = {</div><div class='del'>-	{320, 240, V4L2_PIX_FMT_YUV420, V4L2_FIELD_NONE,</div><div class='del'>-		.bytesperline = 320 * 2,</div><div class='add'>+	{320, 240, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 320,</div><div class='ctx'> 		.sizeimage = 320 * 240 * 2,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 1},</div><div class='del'>-	{640, 480, V4L2_PIX_FMT_YUV420, V4L2_FIELD_NONE,</div><div class='del'>-		.bytesperline = 640 * 2,</div><div class='add'>+	{640, 480, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 640,</div><div class='ctx'> 		.sizeimage = 640 * 480 * 2,</div><div class='ctx'> 		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='ctx'> 		.priv = 0},</div><div class='hunk'>@@ -1463,6 +1464,8 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	sd-&gt;qindex = 7;</div><div class='ctx'> 	sd-&gt;autogain = AUTOGAIN_DEF;</div><div class='ctx'> 	sd-&gt;lightfreq = FREQ_DEF;</div><div class='add'>+	if (sd-&gt;sensor != SENSOR_OV7670)</div><div class='add'>+		gspca_dev-&gt;ctrl_dis = (1 &lt;&lt; LIGHTFREQ_IDX);</div><div class='ctx'> </div><div class='ctx'> 	if (sd-&gt;bridge == BRIDGE_VC0321) {</div><div class='ctx'> 		reg_r(gspca_dev, 0x8a, 0, 3);</div><div class='hunk'>@@ -1474,8 +1477,8 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1637,19 +1640,6 @@ static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	reg_w(dev, 0x89, 0xffff, 0xffff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at close time */</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-/*	struct usb_device *dev = gspca_dev-&gt;dev;</div><div class='del'>-	__u8 buffread;</div><div class='del'>-</div><div class='del'>-	reg_w(dev, 0x89, 0xffff, 0xffff);</div><div class='del'>-	reg_w(dev, 0xa0, 0x01, 0xb301);</div><div class='del'>-	reg_w(dev, 0xa0, 0x09, 0xb303);</div><div class='del'>-	reg_w(dev, 0x89, 0xffff, 0xffff);</div><div class='del'>-*/</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			struct gspca_frame *frame,	/* target */</div><div class='ctx'> 			__u8 *data,			/* isoc packet */</div><div class='hunk'>@@ -1738,11 +1728,10 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='ctx'> 	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> 	.querymenu = sd_querymenu,</div><div class='ctx'> };</div><div class='hunk'>@@ -1774,6 +1763,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module insert / remove -- */</div><div class='head'>diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c<br/>index 22a994ccb1d5..8d7c27e6ac77 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/zc3xx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/gspca/zc3xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/zc3xx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/gspca/zc3xx.c</a></div><div class='hunk'>@@ -85,6 +85,7 @@ static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val);</div><div class='ctx'> static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val);</div><div class='ctx'> </div><div class='ctx'> static struct ctrl sd_ctrls[] = {</div><div class='add'>+#define BRIGHTNESS_IDX 0</div><div class='ctx'> #define SD_BRIGHTNESS 0</div><div class='ctx'> 	{</div><div class='ctx'> 	    {</div><div class='hunk'>@@ -141,6 +142,7 @@ static struct ctrl sd_ctrls[] = {</div><div class='ctx'> 	    .set = sd_setautogain,</div><div class='ctx'> 	    .get = sd_getautogain,</div><div class='ctx'> 	},</div><div class='add'>+#define LIGHTFREQ_IDX 4</div><div class='ctx'> #define SD_FREQ 4</div><div class='ctx'> 	{</div><div class='ctx'> 	    {</div><div class='hunk'>@@ -6469,7 +6471,7 @@ static void setcontrast(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		NULL, Tgradient_1, Tgradient_2,</div><div class='ctx'> 		Tgradient_3, Tgradient_4, Tgradient_5, Tgradient_6</div><div class='ctx'> 	};</div><div class='del'>-#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='ctx'> 	__u8 v[16];</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -6487,7 +6489,7 @@ static void setcontrast(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		else if (g &lt;= 0)</div><div class='ctx'> 			g = 1;</div><div class='ctx'> 		reg_w(dev, g, 0x0120 + i);	/* gamma */</div><div class='del'>-#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='ctx'> 		if (gspca_debug &amp; D_CONF)</div><div class='ctx'> 			v[i] = g;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -6507,7 +6509,7 @@ static void setcontrast(struct gspca_dev *gspca_dev)</div><div class='ctx'> 				g = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		reg_w(dev, g, 0x0130 + i);	/* gradient */</div><div class='del'>-#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='add'>+#ifdef GSPCA_DEBUG</div><div class='ctx'> 		if (gspca_debug &amp; D_CONF)</div><div class='ctx'> 			v[i] = g;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -6964,8 +6966,13 @@ static int zcxx_probeSensor(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	case SENSOR_MC501CB:</div><div class='ctx'> 		return -1;		/* don't probe */</div><div class='ctx'> 	case SENSOR_TAS5130C_VF0250:</div><div class='del'>-				/* may probe but with write in reg 0x0010 */</div><div class='add'>+			/* may probe but with no write in reg 0x0010 */</div><div class='ctx'> 		return -1;		/* don't probe */</div><div class='add'>+	case SENSOR_PAS106:</div><div class='add'>+		sensor =  sif_probe(gspca_dev);</div><div class='add'>+		if (sensor &gt;= 0)</div><div class='add'>+			return sensor;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	sensor = vga_2wr_probe(gspca_dev);</div><div class='ctx'> 	if (sensor &gt;= 0) {</div><div class='hunk'>@@ -6974,12 +6981,10 @@ static int zcxx_probeSensor(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		/* next probe is needed for OmniVision ? */</div><div class='ctx'> 	}</div><div class='ctx'> 	sensor2 = vga_3wr_probe(gspca_dev);</div><div class='del'>-	if (sensor2 &gt;= 0) {</div><div class='del'>-		if (sensor &gt;= 0)</div><div class='del'>-			return sensor;</div><div class='del'>-		return sensor2;</div><div class='del'>-	}</div><div class='del'>-	return sif_probe(gspca_dev);</div><div class='add'>+	if (sensor2 &gt;= 0</div><div class='add'>+	    &amp;&amp; sensor &gt;= 0)</div><div class='add'>+		return sensor;</div><div class='add'>+	return sensor2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* this function is called at probe time */</div><div class='hunk'>@@ -7147,13 +7152,27 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	sd-&gt;lightfreq = sd_ctrls[SD_FREQ].qctrl.default_value;</div><div class='ctx'> 	sd-&gt;sharpness = sd_ctrls[SD_SHARPNESS].qctrl.default_value;</div><div class='ctx'> </div><div class='add'>+	switch (sd-&gt;sensor) {</div><div class='add'>+	case SENSOR_GC0305:</div><div class='add'>+	case SENSOR_OV7620:</div><div class='add'>+	case SENSOR_PO2030:</div><div class='add'>+		gspca_dev-&gt;ctrl_dis = (1 &lt;&lt; BRIGHTNESS_IDX);</div><div class='add'>+		break;</div><div class='add'>+	case SENSOR_HDCS2020:</div><div class='add'>+	case SENSOR_HV7131B:</div><div class='add'>+	case SENSOR_HV7131C:</div><div class='add'>+	case SENSOR_OV7630C:</div><div class='add'>+		gspca_dev-&gt;ctrl_dis = (1 &lt;&lt; LIGHTFREQ_IDX);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* switch the led off */</div><div class='ctx'> 	reg_w(gspca_dev-&gt;dev, 0x01, 0x0000);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at open time */</div><div class='del'>-static int sd_open(struct gspca_dev *gspca_dev)</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	reg_w(gspca_dev-&gt;dev, 0x01, 0x0000);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -7314,10 +7333,6 @@ static void sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='hunk'>@@ -7325,11 +7340,6 @@ static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	send_unknown(gspca_dev-&gt;dev, sd-&gt;sensor);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this function is called at close time */</div><div class='del'>-static void sd_close(struct gspca_dev *gspca_dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			struct gspca_frame *frame,</div><div class='ctx'> 			__u8 *data,</div><div class='hunk'>@@ -7489,37 +7499,30 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.ctrls = sd_ctrls,</div><div class='ctx'> 	.nctrls = sizeof sd_ctrls / sizeof sd_ctrls[0],</div><div class='ctx'> 	.config = sd_config,</div><div class='del'>-	.open = sd_open,</div><div class='add'>+	.init = sd_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='del'>-	.stopN = sd_stopN,</div><div class='ctx'> 	.stop0 = sd_stop0,</div><div class='del'>-	.close = sd_close,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> 	.querymenu = sd_querymenu,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const __devinitdata struct usb_device_id device_table[] = {</div><div class='ctx'> 	{USB_DEVICE(0x041e, 0x041e)},</div><div class='del'>-#ifndef CONFIG_USB_ZC0301</div><div class='ctx'> 	{USB_DEVICE(0x041e, 0x4017)},</div><div class='del'>-	{USB_DEVICE(0x041e, 0x401c)},</div><div class='add'>+	{USB_DEVICE(0x041e, 0x401c), .driver_info = SENSOR_PAS106},</div><div class='ctx'> 	{USB_DEVICE(0x041e, 0x401e)},</div><div class='ctx'> 	{USB_DEVICE(0x041e, 0x401f)},</div><div class='del'>-#endif</div><div class='add'>+	{USB_DEVICE(0x041e, 0x4022)},</div><div class='ctx'> 	{USB_DEVICE(0x041e, 0x4029)},</div><div class='del'>-#ifndef CONFIG_USB_ZC0301</div><div class='del'>-	{USB_DEVICE(0x041e, 0x4034)},</div><div class='del'>-	{USB_DEVICE(0x041e, 0x4035)},</div><div class='add'>+	{USB_DEVICE(0x041e, 0x4034), .driver_info = SENSOR_PAS106},</div><div class='add'>+	{USB_DEVICE(0x041e, 0x4035), .driver_info = SENSOR_PAS106},</div><div class='ctx'> 	{USB_DEVICE(0x041e, 0x4036)},</div><div class='ctx'> 	{USB_DEVICE(0x041e, 0x403a)},</div><div class='del'>-#endif</div><div class='ctx'> 	{USB_DEVICE(0x041e, 0x4051), .driver_info = SENSOR_TAS5130C_VF0250},</div><div class='ctx'> 	{USB_DEVICE(0x041e, 0x4053), .driver_info = SENSOR_TAS5130C_VF0250},</div><div class='del'>-#ifndef CONFIG_USB_ZC0301</div><div class='ctx'> 	{USB_DEVICE(0x0458, 0x7007)},</div><div class='ctx'> 	{USB_DEVICE(0x0458, 0x700c)},</div><div class='ctx'> 	{USB_DEVICE(0x0458, 0x700f)},</div><div class='del'>-#endif</div><div class='ctx'> 	{USB_DEVICE(0x0461, 0x0a00)},</div><div class='ctx'> 	{USB_DEVICE(0x046d, 0x08a0)},</div><div class='ctx'> 	{USB_DEVICE(0x046d, 0x08a1)},</div><div class='hunk'>@@ -7531,7 +7534,7 @@ static const __devinitdata struct usb_device_id device_table[] = {</div><div class='ctx'> 	{USB_DEVICE(0x046d, 0x08aa)},</div><div class='ctx'> 	{USB_DEVICE(0x046d, 0x08ac)},</div><div class='ctx'> 	{USB_DEVICE(0x046d, 0x08ad)},</div><div class='del'>-#ifndef CONFIG_USB_ZC0301</div><div class='add'>+#if !defined CONFIG_USB_ZC0301 &amp;&amp; !defined CONFIG_USB_ZC0301_MODULE</div><div class='ctx'> 	{USB_DEVICE(0x046d, 0x08ae)},</div><div class='ctx'> #endif</div><div class='ctx'> 	{USB_DEVICE(0x046d, 0x08af)},</div><div class='hunk'>@@ -7541,27 +7544,25 @@ static const __devinitdata struct usb_device_id device_table[] = {</div><div class='ctx'> 	{USB_DEVICE(0x046d, 0x08d8)},</div><div class='ctx'> 	{USB_DEVICE(0x046d, 0x08da)},</div><div class='ctx'> 	{USB_DEVICE(0x046d, 0x08dd), .driver_info = SENSOR_MC501CB},</div><div class='del'>-	{USB_DEVICE(0x0471, 0x0325)},</div><div class='del'>-	{USB_DEVICE(0x0471, 0x0326)},</div><div class='del'>-	{USB_DEVICE(0x0471, 0x032d)},</div><div class='del'>-	{USB_DEVICE(0x0471, 0x032e)},</div><div class='add'>+	{USB_DEVICE(0x0471, 0x0325), .driver_info = SENSOR_PAS106},</div><div class='add'>+	{USB_DEVICE(0x0471, 0x0326), .driver_info = SENSOR_PAS106},</div><div class='add'>+	{USB_DEVICE(0x0471, 0x032d), .driver_info = SENSOR_PAS106},</div><div class='add'>+	{USB_DEVICE(0x0471, 0x032e), .driver_info = SENSOR_PAS106},</div><div class='ctx'> 	{USB_DEVICE(0x055f, 0xc005)},</div><div class='del'>-#ifndef CONFIG_USB_ZC0301</div><div class='ctx'> 	{USB_DEVICE(0x055f, 0xd003)},</div><div class='ctx'> 	{USB_DEVICE(0x055f, 0xd004)},</div><div class='del'>-#endif</div><div class='ctx'> 	{USB_DEVICE(0x0698, 0x2003)},</div><div class='add'>+	{USB_DEVICE(0x0ac8, 0x0301), .driver_info = SENSOR_PAS106},</div><div class='ctx'> 	{USB_DEVICE(0x0ac8, 0x0302)},</div><div class='del'>-#ifndef CONFIG_USB_ZC0301</div><div class='ctx'> 	{USB_DEVICE(0x0ac8, 0x301b)},</div><div class='add'>+#if !defined CONFIG_USB_ZC0301 &amp;&amp; !defined CONFIG_USB_ZC0301_MODULE</div><div class='ctx'> 	{USB_DEVICE(0x0ac8, 0x303b)},</div><div class='ctx'> #endif</div><div class='ctx'> 	{USB_DEVICE(0x0ac8, 0x305b), .driver_info = SENSOR_TAS5130C_VF0250},</div><div class='del'>-#ifndef CONFIG_USB_ZC0301</div><div class='ctx'> 	{USB_DEVICE(0x0ac8, 0x307b)},</div><div class='ctx'> 	{USB_DEVICE(0x10fd, 0x0128)},</div><div class='add'>+	{USB_DEVICE(0x10fd, 0x804d)},</div><div class='ctx'> 	{USB_DEVICE(0x10fd, 0x8050)},</div><div class='del'>-#endif</div><div class='ctx'> 	{}			/* end of entry */</div><div class='ctx'> };</div><div class='ctx'> #undef DVNAME</div><div class='hunk'>@@ -7581,6 +7582,10 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.id_table = device_table,</div><div class='ctx'> 	.probe = sd_probe,</div><div class='ctx'> 	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init sd_mod_init(void)</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c<br/>index aea1664948ce..4afc7ea07e86 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-driver.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/ivtv/ivtv-driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-driver.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ivtv/ivtv-driver.c</a></div><div class='hunk'>@@ -688,7 +688,7 @@ static int __devinit ivtv_init_struct1(struct ivtv *itv)</div><div class='ctx'> 	spin_lock_init(&amp;itv-&gt;lock);</div><div class='ctx'> 	spin_lock_init(&amp;itv-&gt;dma_reg_lock);</div><div class='ctx'> </div><div class='del'>-	itv-&gt;irq_work_queues = create_workqueue(itv-&gt;name);</div><div class='add'>+	itv-&gt;irq_work_queues = create_singlethread_workqueue(itv-&gt;name);</div><div class='ctx'> 	if (itv-&gt;irq_work_queues == NULL) {</div><div class='ctx'> 		IVTV_ERR("Could not create ivtv workqueue\n");</div><div class='ctx'> 		return -1;</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h<br/>index ab287b48fc2b..2ceb5227637c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-driver.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/ivtv/ivtv-driver.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-driver.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ivtv/ivtv-driver.h</a></div><div class='hunk'>@@ -251,6 +251,7 @@ struct ivtv_mailbox_data {</div><div class='ctx'> #define IVTV_F_I_DEC_PAUSED	   20 	/* the decoder is paused */</div><div class='ctx'> #define IVTV_F_I_INITED		   21 	/* set after first open */</div><div class='ctx'> #define IVTV_F_I_FAILED		   22 	/* set if first open failed */</div><div class='add'>+#define IVTV_F_I_WORK_INITED       23	/* worker thread was initialized */</div><div class='ctx'> </div><div class='ctx'> /* Event notifications */</div><div class='ctx'> #define IVTV_F_I_EV_DEC_STOPPED	   28	/* decoder stopped event */</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-irq.c b/drivers/media/video/ivtv/ivtv-irq.c<br/>index fba150a6cd23..34f3ab827858 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-irq.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/ivtv/ivtv-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-irq.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ivtv/ivtv-irq.c</a></div><div class='hunk'>@@ -76,6 +76,13 @@ void ivtv_irq_work_handler(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	DEFINE_WAIT(wait);</div><div class='ctx'> </div><div class='add'>+	if (test_and_clear_bit(IVTV_F_I_WORK_INITED, &amp;itv-&gt;i_flags)) {</div><div class='add'>+		struct sched_param param = { .sched_priority = 99 };</div><div class='add'>+</div><div class='add'>+		/* This thread must use the FIFO scheduler as it</div><div class='add'>+		   is realtime sensitive. */</div><div class='add'>+		sched_setscheduler(current, SCHED_FIFO, &amp;param);</div><div class='add'>+	}</div><div class='ctx'> 	if (test_and_clear_bit(IVTV_F_I_WORK_HANDLER_PIO, &amp;itv-&gt;i_flags))</div><div class='ctx'> 		ivtv_pio_work_handler(itv);</div><div class='ctx'> </div><div class='hunk'>@@ -678,34 +685,14 @@ static void ivtv_irq_enc_start_cap(struct ivtv *itv)</div><div class='ctx'> </div><div class='ctx'> static void ivtv_irq_enc_vbi_cap(struct ivtv *itv)</div><div class='ctx'> {</div><div class='del'>-	struct ivtv_stream *s_mpg = &amp;itv-&gt;streams[IVTV_ENC_STREAM_TYPE_MPG];</div><div class='ctx'> 	u32 data[CX2341X_MBOX_MAX_DATA];</div><div class='ctx'> 	struct ivtv_stream *s;</div><div class='ctx'> </div><div class='ctx'> 	IVTV_DEBUG_HI_IRQ("ENC START VBI CAP\n");</div><div class='ctx'> 	s = &amp;itv-&gt;streams[IVTV_ENC_STREAM_TYPE_VBI];</div><div class='ctx'> </div><div class='del'>-	/* If more than two VBI buffers are pending, then</div><div class='del'>-	   clear the old ones and start with this new one.</div><div class='del'>-	   This can happen during transition stages when MPEG capturing is</div><div class='del'>-	   started, but the first interrupts haven't arrived yet. During</div><div class='del'>-	   that period VBI requests can accumulate without being able to</div><div class='del'>-	   DMA the data. Since at most four VBI DMA buffers are available,</div><div class='del'>-	   we just drop the old requests when there are already three</div><div class='del'>-	   requests queued. */</div><div class='del'>-	if (s-&gt;sg_pending_size &gt; 2) {</div><div class='del'>-		struct ivtv_buffer *buf;</div><div class='del'>-		list_for_each_entry(buf, &amp;s-&gt;q_predma.list, list)</div><div class='del'>-			ivtv_buf_sync_for_cpu(s, buf);</div><div class='del'>-		ivtv_queue_move(s, &amp;s-&gt;q_predma, NULL, &amp;s-&gt;q_free, 0);</div><div class='del'>-		s-&gt;sg_pending_size = 0;</div><div class='del'>-	}</div><div class='del'>-	/* if we can append the data, and the MPEG stream isn't capturing,</div><div class='del'>-	   then start a DMA request for just the VBI data. */</div><div class='del'>-	if (!stream_enc_dma_append(s, data) &amp;&amp;</div><div class='del'>-			!test_bit(IVTV_F_S_STREAMING, &amp;s_mpg-&gt;s_flags)) {</div><div class='add'>+	if (!stream_enc_dma_append(s, data))</div><div class='ctx'> 		set_bit(ivtv_use_pio(s) ? IVTV_F_S_PIO_PENDING : IVTV_F_S_DMA_PENDING, &amp;s-&gt;s_flags);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ivtv_irq_dec_vbi_reinsert(struct ivtv *itv)</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-queue.h b/drivers/media/video/ivtv/ivtv-queue.h<br/>index 7cfc0c9ab050..476556afd39a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-queue.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/ivtv/ivtv-queue.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-queue.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ivtv/ivtv-queue.h</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #define IVTV_QUEUE_H</div><div class='ctx'> </div><div class='ctx'> #define IVTV_DMA_UNMAPPED	((u32) -1)</div><div class='del'>-#define SLICED_VBI_PIO 1</div><div class='add'>+#define SLICED_VBI_PIO 0</div><div class='ctx'> </div><div class='ctx'> /* ivtv_buffer utility functions */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c<br/>index 54d2023b26c4..730e85d86fc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-streams.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/ivtv/ivtv-streams.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-streams.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ivtv/ivtv-streams.c</a></div><div class='hunk'>@@ -363,7 +363,7 @@ static void ivtv_vbi_setup(struct ivtv *itv)</div><div class='ctx'> 	/* Every X number of frames a VBI interrupt arrives (frames as in 25 or 30 fps) */</div><div class='ctx'> 	data[1] = 1;</div><div class='ctx'> 	/* The VBI frames are stored in a ringbuffer with this size (with a VBI frame as unit) */</div><div class='del'>-	data[2] = raw ? 4 : 8;</div><div class='add'>+	data[2] = raw ? 4 : 4 * (itv-&gt;vbi.raw_size / itv-&gt;vbi.enc_size);</div><div class='ctx'> 	/* The start/stop codes determine which VBI lines end up in the raw VBI data area.</div><div class='ctx'> 	   The codes are from table 24 in the saa7115 datasheet. Each raw/sliced/video line</div><div class='ctx'> 	   is framed with codes FF0000XX where XX is the SAV/EAV (Start/End of Active Video)</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-vbi.c b/drivers/media/video/ivtv/ivtv-vbi.c<br/>index 71798f0da27f..1ce9deb1104f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-vbi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/ivtv/ivtv-vbi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-vbi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ivtv/ivtv-vbi.c</a></div><div class='hunk'>@@ -293,6 +293,7 @@ static u32 compress_sliced_buf(struct ivtv *itv, u32 line, u8 *buf, u32 size, u8</div><div class='ctx'> 	u32 line_size = itv-&gt;vbi.sliced_decoder_line_size;</div><div class='ctx'> 	struct v4l2_decode_vbi_line vbi;</div><div class='ctx'> 	int i;</div><div class='add'>+	unsigned lines = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* find the first valid line */</div><div class='ctx'> 	for (i = 0; i &lt; size; i++, buf++) {</div><div class='hunk'>@@ -313,7 +314,8 @@ static u32 compress_sliced_buf(struct ivtv *itv, u32 line, u8 *buf, u32 size, u8</div><div class='ctx'> 		}</div><div class='ctx'> 		vbi.p = p + 4;</div><div class='ctx'> 		itv-&gt;video_dec_func(itv, VIDIOC_INT_DECODE_VBI_LINE, &amp;vbi);</div><div class='del'>-		if (vbi.type) {</div><div class='add'>+		if (vbi.type &amp;&amp; !(lines &amp; (1 &lt;&lt; vbi.line))) {</div><div class='add'>+			lines |= 1 &lt;&lt; vbi.line;</div><div class='ctx'> 			itv-&gt;vbi.sliced_data[line].id = vbi.type;</div><div class='ctx'> 			itv-&gt;vbi.sliced_data[line].field = vbi.is_second_field;</div><div class='ctx'> 			itv-&gt;vbi.sliced_data[line].line = vbi.line;</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-version.h b/drivers/media/video/ivtv/ivtv-version.h<br/>index 442f43f11b73..8cd753d30bf7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-version.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/ivtv/ivtv-version.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-version.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ivtv/ivtv-version.h</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> </div><div class='ctx'> #define IVTV_DRIVER_NAME "ivtv"</div><div class='ctx'> #define IVTV_DRIVER_VERSION_MAJOR 1</div><div class='del'>-#define IVTV_DRIVER_VERSION_MINOR 3</div><div class='add'>+#define IVTV_DRIVER_VERSION_MINOR 4</div><div class='ctx'> #define IVTV_DRIVER_VERSION_PATCHLEVEL 0</div><div class='ctx'> </div><div class='ctx'> #define IVTV_VERSION __stringify(IVTV_DRIVER_VERSION_MAJOR) "." __stringify(IVTV_DRIVER_VERSION_MINOR) "." __stringify(IVTV_DRIVER_VERSION_PATCHLEVEL)</div><div class='head'>diff --git a/drivers/media/video/ks0127.c b/drivers/media/video/ks0127.c<br/>index 4895540be195..2fd4b4a44aa9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ks0127.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/ks0127.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ks0127.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ks0127.c</a></div><div class='hunk'>@@ -679,26 +679,27 @@ static int ks0127_command(struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 	case DECODER_ENABLE_OUTPUT:</div><div class='ctx'> 	{</div><div class='add'>+		int enable;</div><div class='ctx'> </div><div class='del'>-		int *iarg = arg;</div><div class='del'>-		int enable = (*iarg != 0);</div><div class='del'>-			if (enable) {</div><div class='del'>-				dprintk("ks0127: command "</div><div class='add'>+		iarg = arg;</div><div class='add'>+		enable = (*iarg != 0);</div><div class='add'>+		if (enable) {</div><div class='add'>+			dprintk("ks0127: command "</div><div class='ctx'> 					"DECODER_ENABLE_OUTPUT on "</div><div class='ctx'> 					"(%d)\n", enable);</div><div class='del'>-				/* All output pins on */</div><div class='del'>-				ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x30);</div><div class='del'>-				/* Obey the OEN pin */</div><div class='del'>-				ks0127_and_or(ks, KS_CDEM, 0x7f, 0x00);</div><div class='del'>-			} else {</div><div class='del'>-				dprintk("ks0127: command "</div><div class='add'>+			/* All output pins on */</div><div class='add'>+			ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x30);</div><div class='add'>+			/* Obey the OEN pin */</div><div class='add'>+			ks0127_and_or(ks, KS_CDEM, 0x7f, 0x00);</div><div class='add'>+		} else {</div><div class='add'>+			dprintk("ks0127: command "</div><div class='ctx'> 					"DECODER_ENABLE_OUTPUT off "</div><div class='ctx'> 					"(%d)\n", enable);</div><div class='del'>-				/* Video output pins off */</div><div class='del'>-				ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x00);</div><div class='del'>-				/* Ignore the OEN pin */</div><div class='del'>-				ks0127_and_or(ks, KS_CDEM, 0x7f, 0x80);</div><div class='del'>-			}</div><div class='add'>+			/* Video output pins off */</div><div class='add'>+			ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x00);</div><div class='add'>+			/* Ignore the OEN pin */</div><div class='add'>+			ks0127_and_or(ks, KS_CDEM, 0x7f, 0x80);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c<br/>index 7c8ef6ac6c39..a9ef7802eb5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/meye.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/meye.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/meye.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/meye.c</a></div><div class='hunk'>@@ -1806,6 +1806,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev,</div><div class='ctx'> 	memcpy(meye.video_dev, &amp;meye_template, sizeof(meye_template));</div><div class='ctx'> 	meye.video_dev-&gt;parent = &amp;meye.mchip_dev-&gt;dev;</div><div class='ctx'> </div><div class='add'>+	ret = -EIO;</div><div class='ctx'> 	if ((ret = sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERA, 1))) {</div><div class='ctx'> 		printk(KERN_ERR "meye: unable to power on the camera\n");</div><div class='ctx'> 		printk(KERN_ERR "meye: did you enable the camera in "</div><div class='hunk'>@@ -1813,7 +1814,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev,</div><div class='ctx'> 		goto outsonypienable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = -EIO;</div><div class='ctx'> 	if ((ret = pci_enable_device(meye.mchip_dev))) {</div><div class='ctx'> 		printk(KERN_ERR "meye: pci_enable_device failed\n");</div><div class='ctx'> 		goto outenabledev;</div><div class='head'>diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c<br/>index b31ba4e09327..56808cd2f8a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/mt9v022.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/mt9v022.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/mt9v022.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/mt9v022.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> static char *sensor_type;</div><div class='ctx'> module_param(sensor_type, charp, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(sensor_type, "Sensor type: \"colour\" or \"monochrome\"\n");</div><div class='add'>+MODULE_PARM_DESC(sensor_type, "Sensor type: \"colour\" or \"monochrome\"");</div><div class='ctx'> </div><div class='ctx'> /* mt9v022 selected register addresses */</div><div class='ctx'> #define MT9V022_CHIP_VERSION		0x00</div><div class='head'>diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c<br/>index f68e91fbe7fb..8ef578caba3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/mxb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/mxb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/mxb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/mxb.c</a></div><div class='hunk'>@@ -931,27 +931,29 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std)</div><div class='add'>+static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *standard)</div><div class='ctx'> {</div><div class='del'>-	struct mxb* mxb = (struct mxb*)dev-&gt;ext_priv;</div><div class='add'>+	struct mxb *mxb = (struct mxb *)dev-&gt;ext_priv;</div><div class='ctx'> 	int zero = 0;</div><div class='ctx'> 	int one = 1;</div><div class='ctx'> </div><div class='del'>-	if(V4L2_STD_PAL_I == std-&gt;id ) {</div><div class='add'>+	if (V4L2_STD_PAL_I == standard-&gt;id) {</div><div class='ctx'> 		v4l2_std_id std = V4L2_STD_PAL_I;</div><div class='add'>+</div><div class='ctx'> 		DEB_D(("VIDIOC_S_STD: setting mxb for PAL_I.\n"));</div><div class='ctx'> 		/* set the 7146 gpio register -- I don't know what this does exactly */</div><div class='ctx'> 		saa7146_write(dev, GPIO_CTRL, 0x00404050);</div><div class='ctx'> 		/* unset the 7111 gpio register -- I don't know what this does exactly */</div><div class='del'>-		mxb-&gt;saa7111a-&gt;driver-&gt;command(mxb-&gt;saa7111a,DECODER_SET_GPIO, &amp;zero);</div><div class='add'>+		mxb-&gt;saa7111a-&gt;driver-&gt;command(mxb-&gt;saa7111a, DECODER_SET_GPIO, &amp;zero);</div><div class='ctx'> 		mxb-&gt;tuner-&gt;driver-&gt;command(mxb-&gt;tuner, VIDIOC_S_STD, &amp;std);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		v4l2_std_id std = V4L2_STD_PAL_BG;</div><div class='add'>+</div><div class='ctx'> 		DEB_D(("VIDIOC_S_STD: setting mxb for PAL/NTSC/SECAM.\n"));</div><div class='ctx'> 		/* set the 7146 gpio register -- I don't know what this does exactly */</div><div class='ctx'> 		saa7146_write(dev, GPIO_CTRL, 0x00404050);</div><div class='ctx'> 		/* set the 7111 gpio register -- I don't know what this does exactly */</div><div class='del'>-		mxb-&gt;saa7111a-&gt;driver-&gt;command(mxb-&gt;saa7111a,DECODER_SET_GPIO, &amp;one);</div><div class='add'>+		mxb-&gt;saa7111a-&gt;driver-&gt;command(mxb-&gt;saa7111a, DECODER_SET_GPIO, &amp;one);</div><div class='ctx'> 		mxb-&gt;tuner-&gt;driver-&gt;command(mxb-&gt;tuner, VIDIOC_S_STD, &amp;std);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c<br/>index 9edaca4371d7..3d3c48db45d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ov511.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/ov511.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ov511.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/ov511.c</a></div><div class='hunk'>@@ -626,9 +626,9 @@ ov511_i2c_write_internal(struct usb_ov511 *ov,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		/* Retry until idle */</div><div class='del'>-		do</div><div class='add'>+		do {</div><div class='ctx'> 			rc = reg_r(ov, R511_I2C_CTL);</div><div class='del'>-		while (rc &gt; 0 &amp;&amp; ((rc&amp;1) == 0));</div><div class='add'>+		} while (rc &gt; 0 &amp;&amp; ((rc&amp;1) == 0));</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -703,9 +703,9 @@ ov511_i2c_read_internal(struct usb_ov511 *ov, unsigned char reg)</div><div class='ctx'> 			return rc;</div><div class='ctx'> </div><div class='ctx'> 		/* Retry until idle */</div><div class='del'>-		do</div><div class='del'>-			 rc = reg_r(ov, R511_I2C_CTL);</div><div class='del'>-		while (rc &gt; 0 &amp;&amp; ((rc&amp;1) == 0));</div><div class='add'>+		do {</div><div class='add'>+			rc = reg_r(ov, R511_I2C_CTL);</div><div class='add'>+		} while (rc &gt; 0 &amp;&amp; ((rc &amp; 1) == 0));</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			return rc;</div><div class='ctx'> </div><div class='hunk'>@@ -729,9 +729,9 @@ ov511_i2c_read_internal(struct usb_ov511 *ov, unsigned char reg)</div><div class='ctx'> 			return rc;</div><div class='ctx'> </div><div class='ctx'> 		/* Retry until idle */</div><div class='del'>-		do</div><div class='add'>+		do {</div><div class='ctx'> 			rc = reg_r(ov, R511_I2C_CTL);</div><div class='del'>-		while (rc &gt; 0 &amp;&amp; ((rc&amp;1) == 0));</div><div class='add'>+		} while (rc &gt; 0 &amp;&amp; ((rc&amp;1) == 0));</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			return rc;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c<br/>deleted file mode 100644<br/>index e69de29bb2d1..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/planb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/planb.c</a><br/>+++ /dev/null</div><div class='head'>diff --git a/drivers/media/video/planb.h b/drivers/media/video/planb.h<br/>deleted file mode 100644<br/>index e69de29bb2d1..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/planb.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/planb.h</a><br/>+++ /dev/null</div><div class='head'>diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c<br/>index 00425d743656..7c84f795db54 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pms.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/pms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/pms.c</a></div><div class='hunk'>@@ -1019,10 +1019,23 @@ static int init_mediavision(void)</div><div class='ctx'>  *	Initialization and module stuff</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#ifndef MODULE</div><div class='add'>+static int enable;</div><div class='add'>+module_param(enable, int, 0);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int __init init_pms_cards(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "Mediavision Pro Movie Studio driver 0.02\n");</div><div class='ctx'> </div><div class='add'>+#ifndef MODULE</div><div class='add'>+	if (!enable) {</div><div class='add'>+		printk(KERN_INFO "PMS: not enabled, use pms.enable=1 to "</div><div class='add'>+				 "probe\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	data_port = io_port +1;</div><div class='ctx'> </div><div class='ctx'> 	if(init_mediavision())</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c<br/>index 1cccd5c77048..dbc560742553 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-ctrl.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/pwc/pwc-ctrl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-ctrl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/pwc/pwc-ctrl.c</a></div><div class='hunk'>@@ -1635,15 +1635,15 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCGVIDCMD:</div><div class='ctx'> 	{</div><div class='del'>-		ARG_DEF(struct pwc_video_command, cmd);</div><div class='del'>-</div><div class='del'>-		ARGR(cmd).type = pdev-&gt;type;</div><div class='del'>-		ARGR(cmd).release = pdev-&gt;release;</div><div class='del'>-		ARGR(cmd).command_len = pdev-&gt;cmd_len;</div><div class='del'>-		memcpy(&amp;ARGR(cmd).command_buf, pdev-&gt;cmd_buf, pdev-&gt;cmd_len);</div><div class='del'>-		ARGR(cmd).bandlength = pdev-&gt;vbandlength;</div><div class='del'>-		ARGR(cmd).frame_size = pdev-&gt;frame_size;</div><div class='del'>-		ARG_OUT(cmd)</div><div class='add'>+		ARG_DEF(struct pwc_video_command, vcmd);</div><div class='add'>+</div><div class='add'>+		ARGR(vcmd).type = pdev-&gt;type;</div><div class='add'>+		ARGR(vcmd).release = pdev-&gt;release;</div><div class='add'>+		ARGR(vcmd).command_len = pdev-&gt;cmd_len;</div><div class='add'>+		memcpy(&amp;ARGR(vcmd).command_buf, pdev-&gt;cmd_buf, pdev-&gt;cmd_len);</div><div class='add'>+		ARGR(vcmd).bandlength = pdev-&gt;vbandlength;</div><div class='add'>+		ARGR(vcmd).frame_size = pdev-&gt;frame_size;</div><div class='add'>+		ARG_OUT(vcmd)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c<br/>index b15f82c49766..388cf94055d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pxa_camera.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/pxa_camera.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pxa_camera.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/pxa_camera.c</a></div><div class='hunk'>@@ -36,8 +36,8 @@</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/camera.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/camera.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5)</div><div class='ctx'> #define PXA_CAM_DRV_NAME "pxa27x-camera"</div><div class='hunk'>@@ -128,6 +128,8 @@ struct pxa_camera_dev {</div><div class='ctx'> </div><div class='ctx'> 	struct pxa_buffer	*active;</div><div class='ctx'> 	struct pxa_dma_desc	*sg_tail[3];</div><div class='add'>+</div><div class='add'>+	u32			save_cicr[5];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const char *pxa_cam_driver_description = "PXA_Camera";</div><div class='hunk'>@@ -997,10 +999,64 @@ static int pxa_camera_querycap(struct soc_camera_host *ici,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pxa_camera_suspend(struct soc_camera_device *icd, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct soc_camera_host *ici =</div><div class='add'>+		to_soc_camera_host(icd-&gt;dev.parent);</div><div class='add'>+	struct pxa_camera_dev *pcdev = ici-&gt;priv;</div><div class='add'>+	int i = 0, ret = 0;</div><div class='add'>+</div><div class='add'>+	pcdev-&gt;save_cicr[i++] = CICR0;</div><div class='add'>+	pcdev-&gt;save_cicr[i++] = CICR1;</div><div class='add'>+	pcdev-&gt;save_cicr[i++] = CICR2;</div><div class='add'>+	pcdev-&gt;save_cicr[i++] = CICR3;</div><div class='add'>+	pcdev-&gt;save_cicr[i++] = CICR4;</div><div class='add'>+</div><div class='add'>+	if ((pcdev-&gt;icd) &amp;&amp; (pcdev-&gt;icd-&gt;ops-&gt;suspend))</div><div class='add'>+		ret = pcdev-&gt;icd-&gt;ops-&gt;suspend(pcdev-&gt;icd, state);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pxa_camera_resume(struct soc_camera_device *icd)</div><div class='add'>+{</div><div class='add'>+	struct soc_camera_host *ici =</div><div class='add'>+		to_soc_camera_host(icd-&gt;dev.parent);</div><div class='add'>+	struct pxa_camera_dev *pcdev = ici-&gt;priv;</div><div class='add'>+	int i = 0, ret = 0;</div><div class='add'>+</div><div class='add'>+	DRCMR68 = pcdev-&gt;dma_chans[0] | DRCMR_MAPVLD;</div><div class='add'>+	DRCMR69 = pcdev-&gt;dma_chans[1] | DRCMR_MAPVLD;</div><div class='add'>+	DRCMR70 = pcdev-&gt;dma_chans[2] | DRCMR_MAPVLD;</div><div class='add'>+</div><div class='add'>+	CICR0 = pcdev-&gt;save_cicr[i++] &amp; ~CICR0_ENB;</div><div class='add'>+	CICR1 = pcdev-&gt;save_cicr[i++];</div><div class='add'>+	CICR2 = pcdev-&gt;save_cicr[i++];</div><div class='add'>+	CICR3 = pcdev-&gt;save_cicr[i++];</div><div class='add'>+	CICR4 = pcdev-&gt;save_cicr[i++];</div><div class='add'>+</div><div class='add'>+	if ((pcdev-&gt;icd) &amp;&amp; (pcdev-&gt;icd-&gt;ops-&gt;resume))</div><div class='add'>+		ret = pcdev-&gt;icd-&gt;ops-&gt;resume(pcdev-&gt;icd);</div><div class='add'>+</div><div class='add'>+	/* Restart frame capture if active buffer exists */</div><div class='add'>+	if (!ret &amp;&amp; pcdev-&gt;active) {</div><div class='add'>+		/* Reset the FIFOs */</div><div class='add'>+		CIFR |= CIFR_RESET_F;</div><div class='add'>+		/* Enable End-Of-Frame Interrupt */</div><div class='add'>+		CICR0 &amp;= ~CICR0_EOFM;</div><div class='add'>+		/* Restart the Capture Interface */</div><div class='add'>+		CICR0 |= CICR0_ENB;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct soc_camera_host_ops pxa_soc_camera_host_ops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.add		= pxa_camera_add_device,</div><div class='ctx'> 	.remove		= pxa_camera_remove_device,</div><div class='add'>+	.suspend	= pxa_camera_suspend,</div><div class='add'>+	.resume		= pxa_camera_resume,</div><div class='ctx'> 	.set_fmt_cap	= pxa_camera_set_fmt_cap,</div><div class='ctx'> 	.try_fmt_cap	= pxa_camera_try_fmt_cap,</div><div class='ctx'> 	.init_videobuf	= pxa_camera_init_videobuf,</div><div class='hunk'>@@ -1198,7 +1254,7 @@ static int __devinit pxa_camera_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __exit pxa_camera_exit(void)</div><div class='ctx'> {</div><div class='del'>-	return platform_driver_unregister(&amp;pxa_camera_driver);</div><div class='add'>+	platform_driver_unregister(&amp;pxa_camera_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(pxa_camera_init);</div><div class='head'>diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c<br/>index bcd1c8f6cf6b..ad733caec720 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7115.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/saa7115.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7115.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/saa7115.c</a></div><div class='hunk'>@@ -1489,10 +1489,9 @@ static int saa7115_probe(struct i2c_client *client,</div><div class='ctx'> 		 client-&gt;addr &lt;&lt; 1, client-&gt;adapter-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	state = kzalloc(sizeof(struct saa711x_state), GFP_KERNEL);</div><div class='del'>-	i2c_set_clientdata(client, state);</div><div class='del'>-	if (state == NULL) {</div><div class='add'>+	if (state == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	i2c_set_clientdata(client, state);</div><div class='ctx'> 	state-&gt;input = -1;</div><div class='ctx'> 	state-&gt;output = SAA7115_IPORT_ON;</div><div class='ctx'> 	state-&gt;enable = 1;</div><div class='head'>diff --git a/drivers/media/video/saa7196.h b/drivers/media/video/saa7196.h<br/>deleted file mode 100644<br/>index e69de29bb2d1..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7196.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/saa7196.h</a><br/>+++ /dev/null</div><div class='head'>diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c<br/>index f481277892da..acceed5d04ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/se401.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/se401.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/se401.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/se401.c</a></div><div class='hunk'>@@ -1397,7 +1397,7 @@ static int se401_probe(struct usb_interface *intf,</div><div class='ctx'> 	mutex_init(&amp;se401-&gt;lock);</div><div class='ctx'> 	wmb();</div><div class='ctx'> </div><div class='del'>-	if (video_register_device(&amp;se401-&gt;vdev, VFL_TYPE_GRABBER, video_nr) == -1) {</div><div class='add'>+	if (video_register_device(&amp;se401-&gt;vdev, VFL_TYPE_GRABBER, video_nr) &lt; 0) {</div><div class='ctx'> 		kfree(se401);</div><div class='ctx'> 		err("video_register_device failed");</div><div class='ctx'> 		return -EIO;</div><div class='head'>diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c<br/>index f7ca3cb9340a..318754e73132 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/sh_mobile_ceu_camera.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/sh_mobile_ceu_camera.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/sh_mobile_ceu_camera.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/sh_mobile_ceu_camera.c</a></div><div class='hunk'>@@ -647,7 +647,7 @@ static int __init sh_mobile_ceu_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __exit sh_mobile_ceu_exit(void)</div><div class='ctx'> {</div><div class='del'>-	return platform_driver_unregister(&amp;sh_mobile_ceu_driver);</div><div class='add'>+	platform_driver_unregister(&amp;sh_mobile_ceu_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(sh_mobile_ceu_init);</div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c<br/>index 23408764d0ef..2da6938718f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/sn9c102/sn9c102_core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/sn9c102/sn9c102_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/sn9c102/sn9c102_core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/sn9c102/sn9c102_core.c</a></div><div class='hunk'>@@ -3312,6 +3312,7 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)</div><div class='ctx'> 	cam-&gt;v4ldev-&gt;fops = &amp;sn9c102_fops;</div><div class='ctx'> 	cam-&gt;v4ldev-&gt;minor = video_nr[dev_nr];</div><div class='ctx'> 	cam-&gt;v4ldev-&gt;release = video_device_release;</div><div class='add'>+	cam-&gt;v4ldev-&gt;parent = &amp;udev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;cam-&gt;probe);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_devtable.h b/drivers/media/video/sn9c102/sn9c102_devtable.h<br/>index 6ff489baacf3..90a401dc3884 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/sn9c102/sn9c102_devtable.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/sn9c102/sn9c102_devtable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/sn9c102/sn9c102_devtable.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/sn9c102/sn9c102_devtable.h</a></div><div class='hunk'>@@ -40,11 +40,14 @@ struct sn9c102_device;</div><div class='ctx'> </div><div class='ctx'> static const struct usb_device_id sn9c102_id_table[] = {</div><div class='ctx'> 	/* SN9C101 and SN9C102 */</div><div class='add'>+#if !defined CONFIG_USB_GSPCA &amp;&amp; !defined CONFIG_USB_GSPCA_MODULE</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x6001, BRIDGE_SN9C102), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x6005, BRIDGE_SN9C102), },</div><div class='add'>+#endif</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x6007, BRIDGE_SN9C102), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x6009, BRIDGE_SN9C102), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x600d, BRIDGE_SN9C102), },</div><div class='add'>+/*	{ SN9C102_USB_DEVICE(0x0c45, 0x6011, BRIDGE_SN9C102), }, OV6650 */</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x6019, BRIDGE_SN9C102), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x6024, BRIDGE_SN9C102), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x6025, BRIDGE_SN9C102), },</div><div class='hunk'>@@ -53,29 +56,33 @@ static const struct usb_device_id sn9c102_id_table[] = {</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x602a, BRIDGE_SN9C102), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x602b, BRIDGE_SN9C102), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x602c, BRIDGE_SN9C102), },</div><div class='del'>-	{ SN9C102_USB_DEVICE(0x0c45, 0x602d, BRIDGE_SN9C102), },</div><div class='add'>+/*	{ SN9C102_USB_DEVICE(0x0c45, 0x602d, BRIDGE_SN9C102), }, HV7131R */</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x602e, BRIDGE_SN9C102), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x6030, BRIDGE_SN9C102), },</div><div class='ctx'> 	/* SN9C103 */</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x6080, BRIDGE_SN9C103), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x6082, BRIDGE_SN9C103), },</div><div class='del'>-	{ SN9C102_USB_DEVICE(0x0c45, 0x6083, BRIDGE_SN9C103), },</div><div class='add'>+/*	{ SN9C102_USB_DEVICE(0x0c45, 0x6083, BRIDGE_SN9C103), }, HY7131D/E */</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x6088, BRIDGE_SN9C103), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x608a, BRIDGE_SN9C103), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x608b, BRIDGE_SN9C103), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x608c, BRIDGE_SN9C103), },</div><div class='del'>-	{ SN9C102_USB_DEVICE(0x0c45, 0x608e, BRIDGE_SN9C103), },</div><div class='add'>+/*	{ SN9C102_USB_DEVICE(0x0c45, 0x608e, BRIDGE_SN9C103), }, CISVF10 */</div><div class='add'>+#if !defined CONFIG_USB_GSPCA &amp;&amp; !defined CONFIG_USB_GSPCA_MODULE</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x608f, BRIDGE_SN9C103), },</div><div class='add'>+#endif</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x60a0, BRIDGE_SN9C103), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x60a2, BRIDGE_SN9C103), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x60a3, BRIDGE_SN9C103), },</div><div class='del'>-	{ SN9C102_USB_DEVICE(0x0c45, 0x60a8, BRIDGE_SN9C103), },</div><div class='del'>-	{ SN9C102_USB_DEVICE(0x0c45, 0x60aa, BRIDGE_SN9C103), },</div><div class='del'>-	{ SN9C102_USB_DEVICE(0x0c45, 0x60ab, BRIDGE_SN9C103), },</div><div class='add'>+/*	{ SN9C102_USB_DEVICE(0x0c45, 0x60a8, BRIDGE_SN9C103), }, PAS106 */</div><div class='add'>+/*	{ SN9C102_USB_DEVICE(0x0c45, 0x60aa, BRIDGE_SN9C103), }, TAS5130 */</div><div class='add'>+/*	{ SN9C102_USB_DEVICE(0x0c45, 0x60ab, BRIDGE_SN9C103), }, TAS5130 */</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x60ac, BRIDGE_SN9C103), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x60ae, BRIDGE_SN9C103), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x60af, BRIDGE_SN9C103), },</div><div class='add'>+#if !defined CONFIG_USB_GSPCA &amp;&amp; !defined CONFIG_USB_GSPCA_MODULE</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x60b0, BRIDGE_SN9C103), },</div><div class='add'>+#endif</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x60b2, BRIDGE_SN9C103), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x60b3, BRIDGE_SN9C103), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x60b8, BRIDGE_SN9C103), },</div><div class='hunk'>@@ -105,7 +112,7 @@ static const struct usb_device_id sn9c102_id_table[] = {</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x6108, BRIDGE_SN9C120), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x610f, BRIDGE_SN9C120), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x6130, BRIDGE_SN9C120), },</div><div class='del'>-	{ SN9C102_USB_DEVICE(0x0c45, 0x6138, BRIDGE_SN9C120), },</div><div class='add'>+/*	{ SN9C102_USB_DEVICE(0x0c45, 0x6138, BRIDGE_SN9C120), }, MO8000 */</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x613a, BRIDGE_SN9C120), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x613b, BRIDGE_SN9C120), },</div><div class='ctx'> 	{ SN9C102_USB_DEVICE(0x0c45, 0x613c, BRIDGE_SN9C120), },</div><div class='head'>diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c<br/>index b6be5ee678b6..66ebe5956a87 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/soc_camera.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/soc_camera.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/soc_camera.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/soc_camera.c</a></div><div class='hunk'>@@ -732,10 +732,36 @@ static int soc_camera_remove(struct device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int soc_camera_suspend(struct device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct soc_camera_device *icd = to_soc_camera_dev(dev);</div><div class='add'>+	struct soc_camera_host *ici = to_soc_camera_host(icd-&gt;dev.parent);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (ici-&gt;ops-&gt;suspend)</div><div class='add'>+		ret = ici-&gt;ops-&gt;suspend(icd, state);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int soc_camera_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct soc_camera_device *icd = to_soc_camera_dev(dev);</div><div class='add'>+	struct soc_camera_host *ici = to_soc_camera_host(icd-&gt;dev.parent);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (ici-&gt;ops-&gt;resume)</div><div class='add'>+		ret = ici-&gt;ops-&gt;resume(icd);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct bus_type soc_camera_bus_type = {</div><div class='ctx'> 	.name		= "soc-camera",</div><div class='ctx'> 	.probe		= soc_camera_probe,</div><div class='ctx'> 	.remove		= soc_camera_remove,</div><div class='add'>+	.suspend	= soc_camera_suspend,</div><div class='add'>+	.resume		= soc_camera_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct device_driver ic_drv = {</div><div class='head'>diff --git a/drivers/media/video/soc_camera_platform.c b/drivers/media/video/soc_camera_platform.c<br/>index eefb0327ebb6..1adc257ebdb9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/soc_camera_platform.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/soc_camera_platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/soc_camera_platform.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/soc_camera_platform.c</a></div><div class='hunk'>@@ -187,7 +187,7 @@ static int __init soc_camera_platform_module_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __exit soc_camera_platform_module_exit(void)</div><div class='ctx'> {</div><div class='del'>-	return platform_driver_unregister(&amp;soc_camera_platform_driver);</div><div class='add'>+	platform_driver_unregister(&amp;soc_camera_platform_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(soc_camera_platform_module_init);</div><div class='head'>diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c<br/>index 56dc3d6b5b29..dce947439459 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/stv680.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/stv680.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/stv680.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/stv680.c</a></div><div class='hunk'>@@ -1462,7 +1462,7 @@ static int stv680_probe (struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	mutex_init (&amp;stv680-&gt;lock);</div><div class='ctx'> 	wmb ();</div><div class='ctx'> </div><div class='del'>-	if (video_register_device (stv680-&gt;vdev, VFL_TYPE_GRABBER, video_nr) == -1) {</div><div class='add'>+	if (video_register_device(stv680-&gt;vdev, VFL_TYPE_GRABBER, video_nr) &lt; 0) {</div><div class='ctx'> 		PDEBUG (0, "STV(e): video_register_device failed");</div><div class='ctx'> 		retval = -EIO;</div><div class='ctx'> 		goto error_vdev;</div><div class='head'>diff --git a/drivers/media/video/usbvideo/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c<br/>index 59166b760104..cc27efe121dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/usbvideo/ibmcam.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/usbvideo/ibmcam.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/usbvideo/ibmcam.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/usbvideo/ibmcam.c</a></div><div class='hunk'>@@ -736,12 +736,12 @@ static enum ParseState ibmcam_model2_320x240_parse_lines(</div><div class='ctx'> 		 * make black color and quit the horizontal scanning loop.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (((frame-&gt;curline + 2) &gt;= scanHeight) || (i &gt;= scanLength)) {</div><div class='del'>-			const int j = i * V4L_BYTES_PER_PIXEL;</div><div class='add'>+			const int offset = i * V4L_BYTES_PER_PIXEL;</div><div class='ctx'> #if USES_IBMCAM_PUTPIXEL</div><div class='ctx'> 			/* Refresh 'f' because we don't use it much with PUTPIXEL */</div><div class='del'>-			f = frame-&gt;data + (v4l_linesize * frame-&gt;curline) + j;</div><div class='add'>+			f = frame-&gt;data + (v4l_linesize * frame-&gt;curline) + offset;</div><div class='ctx'> #endif</div><div class='del'>-			memset(f, 0, v4l_linesize - j);</div><div class='add'>+			memset(f, 0, v4l_linesize - offset);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c<br/>index b7792451a299..2eb45829791c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/usbvideo/vicam.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/usbvideo/vicam.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/usbvideo/vicam.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/usbvideo/vicam.c</a></div><div class='hunk'>@@ -866,7 +866,7 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> 	cam-&gt;udev = dev;</div><div class='ctx'> 	cam-&gt;bulkEndpoint = bulkEndpoint;</div><div class='ctx'> </div><div class='del'>-	if (video_register_device(&amp;cam-&gt;vdev, VFL_TYPE_GRABBER, -1) == -1) {</div><div class='add'>+	if (video_register_device(&amp;cam-&gt;vdev, VFL_TYPE_GRABBER, -1) &lt; 0) {</div><div class='ctx'> 		kfree(cam);</div><div class='ctx'> 		printk(KERN_WARNING "video_register_device failed\n");</div><div class='ctx'> 		return -EIO;</div><div class='head'>diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c<br/>index 626f4ad7e876..6ef3e5297de8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_ctrl.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/uvc/uvc_ctrl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_ctrl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/uvc/uvc_ctrl.c</a></div><div class='hunk'>@@ -585,13 +585,17 @@ int uvc_query_v4l2_ctrl(struct uvc_video_device *video,</div><div class='ctx'> 	struct uvc_control_mapping *mapping;</div><div class='ctx'> 	struct uvc_menu_info *menu;</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	__u8 data[8];</div><div class='add'>+	__u8 *data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ctrl = uvc_find_control(video, v4l2_ctrl-&gt;id, &amp;mapping);</div><div class='ctx'> 	if (ctrl == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	data = kmalloc(8, GFP_KERNEL);</div><div class='add'>+	if (data == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	memset(v4l2_ctrl, 0, sizeof *v4l2_ctrl);</div><div class='ctx'> 	v4l2_ctrl-&gt;id = mapping-&gt;id;</div><div class='ctx'> 	v4l2_ctrl-&gt;type = mapping-&gt;v4l2_type;</div><div class='hunk'>@@ -604,8 +608,8 @@ int uvc_query_v4l2_ctrl(struct uvc_video_device *video,</div><div class='ctx'> 	if (ctrl-&gt;info-&gt;flags &amp; UVC_CONTROL_GET_DEF) {</div><div class='ctx'> 		if ((ret = uvc_query_ctrl(video-&gt;dev, GET_DEF, ctrl-&gt;entity-&gt;id,</div><div class='ctx'> 				video-&gt;dev-&gt;intfnum, ctrl-&gt;info-&gt;selector,</div><div class='del'>-				&amp;data, ctrl-&gt;info-&gt;size)) &lt; 0)</div><div class='del'>-			return ret;</div><div class='add'>+				data, ctrl-&gt;info-&gt;size)) &lt; 0)</div><div class='add'>+			goto out;</div><div class='ctx'> 		v4l2_ctrl-&gt;default_value = uvc_get_le_value(data, mapping);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -623,13 +627,15 @@ int uvc_query_v4l2_ctrl(struct uvc_video_device *video,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		return 0;</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	case V4L2_CTRL_TYPE_BOOLEAN:</div><div class='ctx'> 		v4l2_ctrl-&gt;minimum = 0;</div><div class='ctx'> 		v4l2_ctrl-&gt;maximum = 1;</div><div class='ctx'> 		v4l2_ctrl-&gt;step = 1;</div><div class='del'>-		return 0;</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -638,26 +644,29 @@ int uvc_query_v4l2_ctrl(struct uvc_video_device *video,</div><div class='ctx'> 	if (ctrl-&gt;info-&gt;flags &amp; UVC_CONTROL_GET_MIN) {</div><div class='ctx'> 		if ((ret = uvc_query_ctrl(video-&gt;dev, GET_MIN, ctrl-&gt;entity-&gt;id,</div><div class='ctx'> 				video-&gt;dev-&gt;intfnum, ctrl-&gt;info-&gt;selector,</div><div class='del'>-				&amp;data, ctrl-&gt;info-&gt;size)) &lt; 0)</div><div class='del'>-			return ret;</div><div class='add'>+				data, ctrl-&gt;info-&gt;size)) &lt; 0)</div><div class='add'>+			goto out;</div><div class='ctx'> 		v4l2_ctrl-&gt;minimum = uvc_get_le_value(data, mapping);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ctrl-&gt;info-&gt;flags &amp; UVC_CONTROL_GET_MAX) {</div><div class='ctx'> 		if ((ret = uvc_query_ctrl(video-&gt;dev, GET_MAX, ctrl-&gt;entity-&gt;id,</div><div class='ctx'> 				video-&gt;dev-&gt;intfnum, ctrl-&gt;info-&gt;selector,</div><div class='del'>-				&amp;data, ctrl-&gt;info-&gt;size)) &lt; 0)</div><div class='del'>-			return ret;</div><div class='add'>+				data, ctrl-&gt;info-&gt;size)) &lt; 0)</div><div class='add'>+			goto out;</div><div class='ctx'> 		v4l2_ctrl-&gt;maximum = uvc_get_le_value(data, mapping);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ctrl-&gt;info-&gt;flags &amp; UVC_CONTROL_GET_RES) {</div><div class='ctx'> 		if ((ret = uvc_query_ctrl(video-&gt;dev, GET_RES, ctrl-&gt;entity-&gt;id,</div><div class='ctx'> 				video-&gt;dev-&gt;intfnum, ctrl-&gt;info-&gt;selector,</div><div class='del'>-				&amp;data, ctrl-&gt;info-&gt;size)) &lt; 0)</div><div class='del'>-			return ret;</div><div class='add'>+				data, ctrl-&gt;info-&gt;size)) &lt; 0)</div><div class='add'>+			goto out;</div><div class='ctx'> 		v4l2_ctrl-&gt;step = uvc_get_le_value(data, mapping);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c<br/>index b3c4d75e8490..7e102034d38d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_driver.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/uvc/uvc_driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_driver.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/uvc/uvc_driver.c</a></div><div class='hunk'>@@ -1884,7 +1884,7 @@ static struct usb_device_id uvc_ids[] = {</div><div class='ctx'> 	  .bInterfaceSubClass	= 1,</div><div class='ctx'> 	  .bInterfaceProtocol	= 0,</div><div class='ctx'> 	  .driver_info		= UVC_QUIRK_PROBE_MINMAX },</div><div class='del'>-	/* Packard Bell OEM Webcam */</div><div class='add'>+	/* Packard Bell OEM Webcam - Bison Electronics */</div><div class='ctx'> 	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE</div><div class='ctx'> 				| USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='ctx'> 	  .idVendor		= 0x5986,</div><div class='hunk'>@@ -1893,7 +1893,7 @@ static struct usb_device_id uvc_ids[] = {</div><div class='ctx'> 	  .bInterfaceSubClass	= 1,</div><div class='ctx'> 	  .bInterfaceProtocol	= 0,</div><div class='ctx'> 	  .driver_info		= UVC_QUIRK_PROBE_MINMAX },</div><div class='del'>-	/* Acer Crystal Eye webcam */</div><div class='add'>+	/* Acer Crystal Eye webcam - Bison Electronics */</div><div class='ctx'> 	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE</div><div class='ctx'> 				| USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='ctx'> 	  .idVendor		= 0x5986,</div><div class='hunk'>@@ -1902,7 +1902,7 @@ static struct usb_device_id uvc_ids[] = {</div><div class='ctx'> 	  .bInterfaceSubClass	= 1,</div><div class='ctx'> 	  .bInterfaceProtocol	= 0,</div><div class='ctx'> 	  .driver_info		= UVC_QUIRK_PROBE_MINMAX },</div><div class='del'>-	/* Medion Akoya Mini E1210 */</div><div class='add'>+	/* Medion Akoya Mini E1210 - Bison Electronics */</div><div class='ctx'> 	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE</div><div class='ctx'> 				| USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='ctx'> 	  .idVendor		= 0x5986,</div><div class='hunk'>@@ -1911,7 +1911,7 @@ static struct usb_device_id uvc_ids[] = {</div><div class='ctx'> 	  .bInterfaceSubClass	= 1,</div><div class='ctx'> 	  .bInterfaceProtocol	= 0,</div><div class='ctx'> 	  .driver_info		= UVC_QUIRK_PROBE_MINMAX },</div><div class='del'>-	/* Acer OrbiCam - Unknown vendor */</div><div class='add'>+	/* Acer OrbiCam - Bison Electronics */</div><div class='ctx'> 	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE</div><div class='ctx'> 				| USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='ctx'> 	  .idVendor		= 0x5986,</div><div class='hunk'>@@ -1920,6 +1920,24 @@ static struct usb_device_id uvc_ids[] = {</div><div class='ctx'> 	  .bInterfaceSubClass	= 1,</div><div class='ctx'> 	  .bInterfaceProtocol	= 0,</div><div class='ctx'> 	  .driver_info		= UVC_QUIRK_PROBE_MINMAX },</div><div class='add'>+	/* Bison Electronics */</div><div class='add'>+	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE</div><div class='add'>+				| USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='add'>+	  .idVendor		= 0x5986,</div><div class='add'>+	  .idProduct		= 0x0300,</div><div class='add'>+	  .bInterfaceClass	= USB_CLASS_VIDEO,</div><div class='add'>+	  .bInterfaceSubClass	= 1,</div><div class='add'>+	  .bInterfaceProtocol	= 0,</div><div class='add'>+	  .driver_info		= UVC_QUIRK_PROBE_MINMAX },</div><div class='add'>+	/* Clevo M570TU - Bison Electronics */</div><div class='add'>+	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE</div><div class='add'>+				| USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='add'>+	  .idVendor		= 0x5986,</div><div class='add'>+	  .idProduct		= 0x0303,</div><div class='add'>+	  .bInterfaceClass	= USB_CLASS_VIDEO,</div><div class='add'>+	  .bInterfaceSubClass	= 1,</div><div class='add'>+	  .bInterfaceProtocol	= 0,</div><div class='add'>+	  .driver_info		= UVC_QUIRK_PROBE_MINMAX },</div><div class='ctx'> 	/* Generic USB Video Class */</div><div class='ctx'> 	{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, 0) },</div><div class='ctx'> 	{}</div><div class='head'>diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c<br/>index ad63794fda77..6854ac78a161 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_video.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/uvc/uvc_video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_video.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/uvc/uvc_video.c</a></div><div class='hunk'>@@ -90,17 +90,20 @@ static void uvc_fixup_buffer_size(struct uvc_video_device *video,</div><div class='ctx'> static int uvc_get_video_ctrl(struct uvc_video_device *video,</div><div class='ctx'> 	struct uvc_streaming_control *ctrl, int probe, __u8 query)</div><div class='ctx'> {</div><div class='del'>-	__u8 data[34];</div><div class='del'>-	__u8 size;</div><div class='add'>+	__u8 *data;</div><div class='add'>+	__u16 size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	size = video-&gt;dev-&gt;uvc_version &gt;= 0x0110 ? 34 : 26;</div><div class='add'>+	data = kmalloc(size, GFP_KERNEL);</div><div class='add'>+	if (data == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	ret = __uvc_query_ctrl(video-&gt;dev, query, 0, video-&gt;streaming-&gt;intfnum,</div><div class='del'>-		probe ? VS_PROBE_CONTROL : VS_COMMIT_CONTROL, &amp;data, size,</div><div class='add'>+		probe ? VS_PROBE_CONTROL : VS_COMMIT_CONTROL, data, size,</div><div class='ctx'> 		UVC_CTRL_STREAMING_TIMEOUT);</div><div class='del'>-</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ctrl-&gt;bmHint = le16_to_cpup((__le16 *)&amp;data[0]);</div><div class='ctx'> 	ctrl-&gt;bFormatIndex = data[2];</div><div class='hunk'>@@ -136,17 +139,22 @@ static int uvc_get_video_ctrl(struct uvc_video_device *video,</div><div class='ctx'> 	 */</div><div class='ctx'> 	uvc_fixup_buffer_size(video, ctrl);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+out:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int uvc_set_video_ctrl(struct uvc_video_device *video,</div><div class='ctx'> 	struct uvc_streaming_control *ctrl, int probe)</div><div class='ctx'> {</div><div class='del'>-	__u8 data[34];</div><div class='del'>-	__u8 size;</div><div class='add'>+	__u8 *data;</div><div class='add'>+	__u16 size;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	size = video-&gt;dev-&gt;uvc_version &gt;= 0x0110 ? 34 : 26;</div><div class='del'>-	memset(data, 0, sizeof data);</div><div class='add'>+	data = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (data == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	*(__le16 *)&amp;data[0] = cpu_to_le16(ctrl-&gt;bmHint);</div><div class='ctx'> 	data[2] = ctrl-&gt;bFormatIndex;</div><div class='hunk'>@@ -174,10 +182,13 @@ int uvc_set_video_ctrl(struct uvc_video_device *video,</div><div class='ctx'> 		data[33] = ctrl-&gt;bMaxVersion;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return __uvc_query_ctrl(video-&gt;dev, SET_CUR, 0,</div><div class='add'>+	ret = __uvc_query_ctrl(video-&gt;dev, SET_CUR, 0,</div><div class='ctx'> 		video-&gt;streaming-&gt;intfnum,</div><div class='del'>-		probe ? VS_PROBE_CONTROL : VS_COMMIT_CONTROL, &amp;data, size,</div><div class='add'>+		probe ? VS_PROBE_CONTROL : VS_COMMIT_CONTROL, data, size,</div><div class='ctx'> 		UVC_CTRL_STREAMING_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int uvc_probe_video(struct uvc_video_device *video,</div><div class='head'>diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c<br/>index 556615fe93de..155fdec9ac7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-dev.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/v4l2-dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-dev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/v4l2-dev.c</a></div><div class='hunk'>@@ -222,11 +222,13 @@ int video_register_device(struct video_device *vfd, int type, int nr)</div><div class='ctx'> EXPORT_SYMBOL(video_register_device);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	video_register_device - register video4linux devices</div><div class='add'>+ *	video_register_device_index - register video4linux devices</div><div class='ctx'>  *	@vfd:  video device structure we want to register</div><div class='ctx'>  *	@type: type of device to register</div><div class='ctx'>  *	@nr:   which device number (0 == /dev/video0, 1 == /dev/video1, ...</div><div class='ctx'>  *             -1 == first free)</div><div class='add'>+ *	@index: stream number based on parent device;</div><div class='add'>+ *		-1 if auto assign, requested number otherwise</div><div class='ctx'>  *</div><div class='ctx'>  *	The registration code assigns minor numbers based on the type</div><div class='ctx'>  *	requested. -ENFILE is returned in all the device slots for this</div><div class='hunk'>@@ -255,6 +257,9 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	char *name_base;</div><div class='ctx'> </div><div class='add'>+	if (vfd == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case VFL_TYPE_GRABBER:</div><div class='ctx'> 		base = MINOR_VFL_TYPE_GRABBER_MIN;</div><div class='hunk'>@@ -279,7 +284,7 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_ERR "%s called with unknown type: %d\n",</div><div class='ctx'> 		       __func__, type);</div><div class='del'>-		return -1;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* pick a minor number */</div><div class='head'>diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c<br/>index fdfe7739c96e..140ef92c19c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-ioctl.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/v4l2-ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-ioctl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/v4l2-ioctl.c</a></div><div class='hunk'>@@ -499,7 +499,7 @@ static void dbgbuf(unsigned int cmd, struct video_device *vfd,</div><div class='ctx'> 			p-&gt;timestamp.tv_sec / 3600,</div><div class='ctx'> 			(int)(p-&gt;timestamp.tv_sec / 60) % 60,</div><div class='ctx'> 			(int)(p-&gt;timestamp.tv_sec % 60),</div><div class='del'>-			p-&gt;timestamp.tv_usec,</div><div class='add'>+			(long)p-&gt;timestamp.tv_usec,</div><div class='ctx'> 			p-&gt;index,</div><div class='ctx'> 			prt_names(p-&gt;type, v4l2_type_names),</div><div class='ctx'> 			p-&gt;bytesused, p-&gt;flags,</div><div class='hunk'>@@ -674,7 +674,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	 __video_do_ioctl will be called again, with one or more</div><div class='ctx'> 	 V4L2 ioctls.</div><div class='ctx'> 	 ********************************************************/</div><div class='del'>-	if (_IOC_TYPE(cmd) == 'v')</div><div class='add'>+	if (_IOC_TYPE(cmd) == 'v' &amp;&amp; _IOC_NR(cmd) &lt; BASE_VIDIOCPRIVATE)</div><div class='ctx'> 		return v4l_compat_translate_ioctl(inode, file, cmd, arg,</div><div class='ctx'> 						__video_do_ioctl);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c<br/>deleted file mode 100644<br/>index e69de29bb2d1..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/videodev.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/videodev.c</a><br/>+++ /dev/null</div><div class='head'>diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c<br/>index 3989b0eded28..1edda456fc64 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/vino.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/vino.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/vino.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/vino.c</a></div><div class='hunk'>@@ -39,7 +39,9 @@</div><div class='ctx'> #include &lt;linux/i2c-algo-sgi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;media/v4l2-ioctl.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-ioctl.h&gt;</div><div class='ctx'> #include &lt;linux/video_decoder.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c<br/>index 3518af071a2e..8ba8daafd7ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/vivi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/vivi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/vivi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/vivi.c</a></div><div class='hunk'>@@ -1021,13 +1021,13 @@ static int vivi_release(void)</div><div class='ctx'> 		dev = list_entry(list, struct vivi_dev, vivi_devlist);</div><div class='ctx'> </div><div class='ctx'> 		if (-1 != dev-&gt;vfd-&gt;minor) {</div><div class='del'>-			video_unregister_device(dev-&gt;vfd);</div><div class='del'>-			printk(KERN_INFO "%s: /dev/video%d unregistered.\n",</div><div class='add'>+			printk(KERN_INFO "%s: unregistering /dev/video%d\n",</div><div class='ctx'> 				VIVI_MODULE_NAME, dev-&gt;vfd-&gt;minor);</div><div class='add'>+			video_unregister_device(dev-&gt;vfd);</div><div class='ctx'> 		} else {</div><div class='del'>-			video_device_release(dev-&gt;vfd);</div><div class='del'>-			printk(KERN_INFO "%s: /dev/video%d released.\n",</div><div class='add'>+			printk(KERN_INFO "%s: releasing /dev/video%d\n",</div><div class='ctx'> 				VIVI_MODULE_NAME, dev-&gt;vfd-&gt;minor);</div><div class='add'>+			video_device_release(dev-&gt;vfd);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		kfree(dev);</div><div class='hunk'>@@ -1104,19 +1104,29 @@ static struct video_device vivi_template = {</div><div class='ctx'> 	Initialization and module stuff</div><div class='ctx'>    ------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='add'>+/* This routine allocates from 1 to n_devs virtual drivers.</div><div class='add'>+</div><div class='add'>+   The real maximum number of virtual drivers will depend on how many drivers</div><div class='add'>+   will succeed. This is limited to the maximum number of devices that</div><div class='add'>+   videodev supports. Since there are 64 minors for video grabbers, this is</div><div class='add'>+   currently the theoretical maximum limit. However, a further limit does</div><div class='add'>+   exist at videodev that forbids any driver to register more than 32 video</div><div class='add'>+   grabbers.</div><div class='add'>+ */</div><div class='ctx'> static int __init vivi_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -ENOMEM, i;</div><div class='ctx'> 	struct vivi_dev *dev;</div><div class='ctx'> 	struct video_device *vfd;</div><div class='ctx'> </div><div class='add'>+	if (n_devs &lt;= 0)</div><div class='add'>+		n_devs = 1;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; n_devs; i++) {</div><div class='ctx'> 		dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='del'>-		if (NULL == dev)</div><div class='add'>+		if (!dev)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		list_add_tail(&amp;dev-&gt;vivi_devlist, &amp;vivi_devlist);</div><div class='del'>-</div><div class='ctx'> 		/* init video dma queues */</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;dev-&gt;vidq.active);</div><div class='ctx'> 		init_waitqueue_head(&amp;dev-&gt;vidq.wq);</div><div class='hunk'>@@ -1126,14 +1136,27 @@ static int __init vivi_init(void)</div><div class='ctx'> 		mutex_init(&amp;dev-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 		vfd = video_device_alloc();</div><div class='del'>-		if (NULL == vfd)</div><div class='add'>+		if (!vfd) {</div><div class='add'>+			kfree(dev);</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		*vfd = vivi_template;</div><div class='ctx'> </div><div class='ctx'> 		ret = video_register_device(vfd, VFL_TYPE_GRABBER, video_nr);</div><div class='del'>-		if (ret &lt; 0)</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			video_device_release(vfd);</div><div class='add'>+			kfree(dev);</div><div class='add'>+</div><div class='add'>+			/* If some registers succeeded, keep driver */</div><div class='add'>+			if (i)</div><div class='add'>+				ret = 0;</div><div class='add'>+</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Now that everything is fine, let's add it to device list */</div><div class='add'>+		list_add_tail(&amp;dev-&gt;vivi_devlist, &amp;vivi_devlist);</div><div class='ctx'> </div><div class='ctx'> 		snprintf(vfd-&gt;name, sizeof(vfd-&gt;name), "%s (%i)",</div><div class='ctx'> 			 vivi_template.name, vfd-&gt;minor);</div><div class='hunk'>@@ -1149,11 +1172,16 @@ static int __init vivi_init(void)</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		vivi_release();</div><div class='ctx'> 		printk(KERN_INFO "Error %d while loading vivi driver\n", ret);</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='ctx'> 		printk(KERN_INFO "Video Technology Magazine Virtual Video "</div><div class='ctx'> 			"Capture Board ver %u.%u.%u successfully loaded.\n",</div><div class='ctx'> 			(VIVI_VERSION &gt;&gt; 16) &amp; 0xFF, (VIVI_VERSION &gt;&gt; 8) &amp; 0xFF,</div><div class='ctx'> 			VIVI_VERSION &amp; 0xFF);</div><div class='add'>+</div><div class='add'>+		/* n_devs will reflect the actual number of allocated devices */</div><div class='add'>+		n_devs = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1169,10 +1197,10 @@ MODULE_DESCRIPTION("Video Technology Magazine Virtual Video Capture Board");</div><div class='ctx'> MODULE_AUTHOR("Mauro Carvalho Chehab, Ted Walther and John Sokol");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> </div><div class='del'>-module_param(video_nr, int, 0);</div><div class='add'>+module_param(video_nr, uint, 0444);</div><div class='ctx'> MODULE_PARM_DESC(video_nr, "video iminor start number");</div><div class='ctx'> </div><div class='del'>-module_param(n_devs, int, 0);</div><div class='add'>+module_param(n_devs, uint, 0444);</div><div class='ctx'> MODULE_PARM_DESC(n_devs, "number of video devices to create");</div><div class='ctx'> </div><div class='ctx'> module_param_named(debug, vivi_template.debug, int, 0444);</div><div class='head'>diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c<br/>index 9402f40095b4..2ff00bc5ad64 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/w9966.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/w9966.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/w9966.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/w9966.c</a></div><div class='hunk'>@@ -334,7 +334,7 @@ static int w9966_init(struct w9966_dev* cam, struct parport* port)</div><div class='ctx'> 	memcpy(&amp;cam-&gt;vdev, &amp;w9966_template, sizeof(struct video_device));</div><div class='ctx'> 	cam-&gt;vdev.priv = cam;</div><div class='ctx'> </div><div class='del'>-	if (video_register_device(&amp;cam-&gt;vdev, VFL_TYPE_GRABBER, video_nr) == -1)</div><div class='add'>+	if (video_register_device(&amp;cam-&gt;vdev, VFL_TYPE_GRABBER, video_nr) &lt; 0)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	w9966_setState(cam, W9966_STATE_VDEV, W9966_STATE_VDEV);</div><div class='head'>diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c<br/>index 550ce7bd5c87..0c3287734c93 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zc0301/zc0301_core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/zc0301/zc0301_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zc0301/zc0301_core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/zc0301/zc0301_core.c</a></div><div class='hunk'>@@ -1988,6 +1988,7 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)</div><div class='ctx'> 	cam-&gt;v4ldev-&gt;fops = &amp;zc0301_fops;</div><div class='ctx'> 	cam-&gt;v4ldev-&gt;minor = video_nr[dev_nr];</div><div class='ctx'> 	cam-&gt;v4ldev-&gt;release = video_device_release;</div><div class='add'>+	cam-&gt;v4ldev-&gt;parent = &amp;udev-&gt;dev;</div><div class='ctx'> 	video_set_drvdata(cam-&gt;v4ldev, cam);</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;cam-&gt;probe);</div><div class='head'>diff --git a/drivers/media/video/zc0301/zc0301_sensor.h b/drivers/media/video/zc0301/zc0301_sensor.h<br/>index 70fe6fc6cdd5..b0cd49c438a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zc0301/zc0301_sensor.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/media/video/zc0301/zc0301_sensor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zc0301/zc0301_sensor.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/media/video/zc0301/zc0301_sensor.h</a></div><div class='hunk'>@@ -60,27 +60,8 @@ zc0301_attach_sensor(struct zc0301_device* cam, struct zc0301_sensor* sensor);</div><div class='ctx'> </div><div class='ctx'> #define ZC0301_ID_TABLE                                                       \</div><div class='ctx'> static const struct usb_device_id zc0301_id_table[] =  {                      \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x041e, 0x4017, 0xff), }, /* ICM105 */            \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x041e, 0x401c, 0xff), }, /* PAS106 */            \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x041e, 0x401e, 0xff), }, /* HV7131 */            \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x041e, 0x401f, 0xff), }, /* TAS5130 */           \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x041e, 0x4022, 0xff), },                         \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x041e, 0x4034, 0xff), }, /* PAS106 */            \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x041e, 0x4035, 0xff), }, /* PAS106 */            \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x041e, 0x4036, 0xff), }, /* HV7131 */            \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x041e, 0x403a, 0xff), }, /* HV7131 */            \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x0458, 0x7007, 0xff), }, /* TAS5130 */           \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x0458, 0x700c, 0xff), }, /* TAS5130 */           \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x0458, 0x700f, 0xff), }, /* TAS5130 */           \</div><div class='ctx'> 	{ ZC0301_USB_DEVICE(0x046d, 0x08ae, 0xff), }, /* PAS202 */            \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x055f, 0xd003, 0xff), }, /* TAS5130 */           \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x055f, 0xd004, 0xff), }, /* TAS5130 */           \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x0ac8, 0x0301, 0xff), },                         \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x0ac8, 0x301b, 0xff), }, /* PB-0330/HV7131 */    \</div><div class='ctx'> 	{ ZC0301_USB_DEVICE(0x0ac8, 0x303b, 0xff), }, /* PB-0330 */           \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x10fd, 0x0128, 0xff), }, /* TAS5130 */           \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x10fd, 0x8050, 0xff), }, /* TAS5130 */           \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x10fd, 0x804e, 0xff), }, /* TAS5130 */           \</div><div class='ctx'> 	{ }                                                                   \</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c<br/>index a38005008a20..cea46906408e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/memstick/core/memstick.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/memstick/core/memstick.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/memstick/core/memstick.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/memstick/core/memstick.c</a></div><div class='hunk'>@@ -185,7 +185,7 @@ static void memstick_free(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct class memstick_host_class = {</div><div class='del'>-	.name       = "memstick_host",</div><div class='add'>+	.name        = "memstick_host",</div><div class='ctx'> 	.dev_release = memstick_free</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -264,7 +264,7 @@ EXPORT_SYMBOL(memstick_new_req);</div><div class='ctx'>  * @sg - TPC argument</div><div class='ctx'>  */</div><div class='ctx'> void memstick_init_req_sg(struct memstick_request *mrq, unsigned char tpc,</div><div class='del'>-			  struct scatterlist *sg)</div><div class='add'>+			  const struct scatterlist *sg)</div><div class='ctx'> {</div><div class='ctx'> 	mrq-&gt;tpc = tpc;</div><div class='ctx'> 	if (tpc &amp; 8)</div><div class='hunk'>@@ -294,7 +294,7 @@ EXPORT_SYMBOL(memstick_init_req_sg);</div><div class='ctx'>  * user supplied buffer.</div><div class='ctx'>  */</div><div class='ctx'> void memstick_init_req(struct memstick_request *mrq, unsigned char tpc,</div><div class='del'>-		       void *buf, size_t length)</div><div class='add'>+		       const void *buf, size_t length)</div><div class='ctx'> {</div><div class='ctx'> 	mrq-&gt;tpc = tpc;</div><div class='ctx'> 	if (tpc &amp; 8)</div><div class='hunk'>@@ -439,7 +439,7 @@ static void memstick_check(struct work_struct *work)</div><div class='ctx'> 	if (!host-&gt;card) {</div><div class='ctx'> 		if (memstick_power_on(host))</div><div class='ctx'> 			goto out_power_off;</div><div class='del'>-	} else</div><div class='add'>+	} else if (host-&gt;card-&gt;stop)</div><div class='ctx'> 		host-&gt;card-&gt;stop(host-&gt;card);</div><div class='ctx'> </div><div class='ctx'> 	card = memstick_alloc_card(host);</div><div class='hunk'>@@ -458,7 +458,7 @@ static void memstick_check(struct work_struct *work)</div><div class='ctx'> 			    || !(host-&gt;card-&gt;check(host-&gt;card))) {</div><div class='ctx'> 				device_unregister(&amp;host-&gt;card-&gt;dev);</div><div class='ctx'> 				host-&gt;card = NULL;</div><div class='del'>-			} else</div><div class='add'>+			} else if (host-&gt;card-&gt;start)</div><div class='ctx'> 				host-&gt;card-&gt;start(host-&gt;card);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c<br/>index 44b1817f2f2f..d2d2318dafa4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/memstick/core/mspro_block.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/memstick/core/mspro_block.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/memstick/core/mspro_block.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/memstick/core/mspro_block.c</a></div><div class='hunk'>@@ -30,6 +30,8 @@ module_param(major, int, 0644);</div><div class='ctx'> #define MSPRO_BLOCK_SIGNATURE        0xa5c3</div><div class='ctx'> #define MSPRO_BLOCK_MAX_ATTRIBUTES   41</div><div class='ctx'> </div><div class='add'>+#define MSPRO_BLOCK_PART_SHIFT 3</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	MSPRO_BLOCK_ID_SYSINFO         = 0x10,</div><div class='ctx'> 	MSPRO_BLOCK_ID_MODELNAME       = 0x15,</div><div class='hunk'>@@ -195,7 +197,7 @@ static int mspro_block_bd_open(struct inode *inode, struct file *filp)</div><div class='ctx'> static int mspro_block_disk_release(struct gendisk *disk)</div><div class='ctx'> {</div><div class='ctx'> 	struct mspro_block_data *msb = disk-&gt;private_data;</div><div class='del'>-	int disk_id = disk-&gt;first_minor &gt;&gt; MEMSTICK_PART_SHIFT;</div><div class='add'>+	int disk_id = disk-&gt;first_minor &gt;&gt; MSPRO_BLOCK_PART_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mspro_block_disk_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -877,6 +879,7 @@ static int mspro_block_switch_interface(struct memstick_dev *card)</div><div class='ctx'> 	struct mspro_block_data *msb = memstick_get_drvdata(card);</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='add'>+try_again:</div><div class='ctx'> 	if (msb-&gt;caps &amp; MEMSTICK_CAP_PAR4)</div><div class='ctx'> 		rc = mspro_block_set_interface(card, MEMSTICK_SYS_PAR4);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -930,6 +933,18 @@ static int mspro_block_switch_interface(struct memstick_dev *card)</div><div class='ctx'> 		rc = memstick_set_rw_addr(card);</div><div class='ctx'> 		if (!rc)</div><div class='ctx'> 			rc = mspro_block_set_interface(card, msb-&gt;system);</div><div class='add'>+</div><div class='add'>+		if (!rc) {</div><div class='add'>+			msleep(150);</div><div class='add'>+			rc = mspro_block_wait_for_ced(card);</div><div class='add'>+			if (rc)</div><div class='add'>+				return rc;</div><div class='add'>+</div><div class='add'>+			if (msb-&gt;caps &amp; MEMSTICK_CAP_PAR8) {</div><div class='add'>+				msb-&gt;caps &amp;= ~MEMSTICK_CAP_PAR8;</div><div class='add'>+				goto try_again;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -1117,14 +1132,16 @@ static int mspro_block_init_card(struct memstick_dev *card)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	msb-&gt;caps = host-&gt;caps;</div><div class='del'>-	rc = mspro_block_switch_interface(card);</div><div class='add'>+</div><div class='add'>+	msleep(150);</div><div class='add'>+	rc = mspro_block_wait_for_ced(card);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	msleep(200);</div><div class='del'>-	rc = mspro_block_wait_for_ced(card);</div><div class='add'>+	rc = mspro_block_switch_interface(card);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='add'>+</div><div class='ctx'> 	dev_dbg(&amp;card-&gt;dev, "card activated\n");</div><div class='ctx'> 	if (msb-&gt;system != MEMSTICK_SYS_SERIAL)</div><div class='ctx'> 		msb-&gt;caps |= MEMSTICK_CAP_AUTO_GET_INT;</div><div class='hunk'>@@ -1192,12 +1209,12 @@ static int mspro_block_init_disk(struct memstick_dev *card)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	if ((disk_id &lt;&lt; MEMSTICK_PART_SHIFT) &gt; 255) {</div><div class='add'>+	if ((disk_id &lt;&lt; MSPRO_BLOCK_PART_SHIFT) &gt; 255) {</div><div class='ctx'> 		rc = -ENOSPC;</div><div class='ctx'> 		goto out_release_id;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	msb-&gt;disk = alloc_disk(1 &lt;&lt; MEMSTICK_PART_SHIFT);</div><div class='add'>+	msb-&gt;disk = alloc_disk(1 &lt;&lt; MSPRO_BLOCK_PART_SHIFT);</div><div class='ctx'> 	if (!msb-&gt;disk) {</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto out_release_id;</div><div class='hunk'>@@ -1220,7 +1237,7 @@ static int mspro_block_init_disk(struct memstick_dev *card)</div><div class='ctx'> 				   MSPRO_BLOCK_MAX_PAGES * msb-&gt;page_size);</div><div class='ctx'> </div><div class='ctx'> 	msb-&gt;disk-&gt;major = major;</div><div class='del'>-	msb-&gt;disk-&gt;first_minor = disk_id &lt;&lt; MEMSTICK_PART_SHIFT;</div><div class='add'>+	msb-&gt;disk-&gt;first_minor = disk_id &lt;&lt; MSPRO_BLOCK_PART_SHIFT;</div><div class='ctx'> 	msb-&gt;disk-&gt;fops = &amp;ms_block_bdops;</div><div class='ctx'> 	msb-&gt;usage_count = 1;</div><div class='ctx'> 	msb-&gt;disk-&gt;private_data = msb;</div><div class='hunk'>@@ -1416,7 +1433,7 @@ out_unlock:</div><div class='ctx'> </div><div class='ctx'> static struct memstick_device_id mspro_block_id_tbl[] = {</div><div class='ctx'> 	{MEMSTICK_MATCH_ALL, MEMSTICK_TYPE_PRO, MEMSTICK_CATEGORY_STORAGE_DUO,</div><div class='del'>-	 MEMSTICK_CLASS_GENERIC_DUO},</div><div class='add'>+	 MEMSTICK_CLASS_DUO},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c<br/>index 3485c63d20b0..2fb95a5b72eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/memstick/host/jmb38x_ms.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/memstick/host/jmb38x_ms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/memstick/host/jmb38x_ms.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/memstick/host/jmb38x_ms.c</a></div><div class='hunk'>@@ -81,6 +81,8 @@ struct jmb38x_ms {</div><div class='ctx'> #define TPC_CODE_SZ_MASK       0x00000700</div><div class='ctx'> #define TPC_DATA_SZ_MASK       0x00000007</div><div class='ctx'> </div><div class='add'>+#define HOST_CONTROL_TDELAY_EN 0x00040000</div><div class='add'>+#define HOST_CONTROL_HW_OC_P   0x00010000</div><div class='ctx'> #define HOST_CONTROL_RESET_REQ 0x00008000</div><div class='ctx'> #define HOST_CONTROL_REI       0x00004000</div><div class='ctx'> #define HOST_CONTROL_LED       0x00000400</div><div class='hunk'>@@ -88,6 +90,7 @@ struct jmb38x_ms {</div><div class='ctx'> #define HOST_CONTROL_RESET     0x00000100</div><div class='ctx'> #define HOST_CONTROL_POWER_EN  0x00000080</div><div class='ctx'> #define HOST_CONTROL_CLOCK_EN  0x00000040</div><div class='add'>+#define HOST_CONTROL_REO       0x00000008</div><div class='ctx'> #define HOST_CONTROL_IF_SHIFT  4</div><div class='ctx'> </div><div class='ctx'> #define HOST_CONTROL_IF_SERIAL 0x0</div><div class='hunk'>@@ -133,11 +136,15 @@ struct jmb38x_ms {</div><div class='ctx'> #define PAD_PU_PD_ON_MS_SOCK1 0x0f0f0000</div><div class='ctx'> </div><div class='ctx'> #define CLOCK_CONTROL_40MHZ   0x00000001</div><div class='del'>-#define CLOCK_CONTROL_50MHZ   0x00000002</div><div class='add'>+#define CLOCK_CONTROL_50MHZ   0x0000000a</div><div class='ctx'> #define CLOCK_CONTROL_60MHZ   0x00000008</div><div class='ctx'> #define CLOCK_CONTROL_62_5MHZ 0x0000000c</div><div class='ctx'> #define CLOCK_CONTROL_OFF     0x00000000</div><div class='ctx'> </div><div class='add'>+#define PCI_CTL_CLOCK_DLY_ADDR   0x000000b0</div><div class='add'>+#define PCI_CTL_CLOCK_DLY_MASK_A 0x00000f00</div><div class='add'>+#define PCI_CTL_CLOCK_DLY_MASK_B 0x0000f000</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	CMD_READY    = 0x01,</div><div class='ctx'> 	FIFO_READY   = 0x02,</div><div class='hunk'>@@ -367,8 +374,7 @@ static int jmb38x_ms_issue_cmd(struct memstick_host *msh)</div><div class='ctx'> 		return host-&gt;req-&gt;error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;msh-&gt;dev, "control %08x\n",</div><div class='del'>-		readl(host-&gt;addr + HOST_CONTROL));</div><div class='add'>+	dev_dbg(&amp;msh-&gt;dev, "control %08x\n", readl(host-&gt;addr + HOST_CONTROL));</div><div class='ctx'> 	dev_dbg(&amp;msh-&gt;dev, "status %08x\n", readl(host-&gt;addr + INT_STATUS));</div><div class='ctx'> 	dev_dbg(&amp;msh-&gt;dev, "hstatus %08x\n", readl(host-&gt;addr + STATUS));</div><div class='ctx'> </div><div class='hunk'>@@ -637,7 +643,7 @@ static int jmb38x_ms_reset(struct jmb38x_ms_host *host)</div><div class='ctx'> 		ndelay(20);</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_dbg(&amp;host-&gt;chip-&gt;pdev-&gt;dev, "reset_req timeout\n");</div><div class='del'>-	return -EIO;</div><div class='add'>+	/* return -EIO; */</div><div class='ctx'> </div><div class='ctx'> reset_next:</div><div class='ctx'> 	writel(HOST_CONTROL_RESET | HOST_CONTROL_CLOCK_EN</div><div class='hunk'>@@ -680,7 +686,9 @@ static int jmb38x_ms_set_param(struct memstick_host *msh,</div><div class='ctx'> </div><div class='ctx'> 			host_ctl = 7;</div><div class='ctx'> 			host_ctl |= HOST_CONTROL_POWER_EN</div><div class='del'>-				 | HOST_CONTROL_CLOCK_EN;</div><div class='add'>+				    | HOST_CONTROL_CLOCK_EN</div><div class='add'>+				    | HOST_CONTROL_HW_OC_P</div><div class='add'>+				    | HOST_CONTROL_TDELAY_EN;</div><div class='ctx'> 			writel(host_ctl, host-&gt;addr + HOST_CONTROL);</div><div class='ctx'> </div><div class='ctx'> 			writel(host-&gt;id ? PAD_PU_PD_ON_MS_SOCK1</div><div class='hunk'>@@ -704,33 +712,40 @@ static int jmb38x_ms_set_param(struct memstick_host *msh,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MEMSTICK_INTERFACE:</div><div class='ctx'> 		host_ctl &amp;= ~(3 &lt;&lt; HOST_CONTROL_IF_SHIFT);</div><div class='add'>+		pci_read_config_dword(host-&gt;chip-&gt;pdev,</div><div class='add'>+				      PCI_CTL_CLOCK_DLY_ADDR,</div><div class='add'>+				      &amp;clock_delay);</div><div class='add'>+		clock_delay &amp;= host-&gt;id ? ~PCI_CTL_CLOCK_DLY_MASK_B</div><div class='add'>+					: ~PCI_CTL_CLOCK_DLY_MASK_A;</div><div class='ctx'> </div><div class='ctx'> 		if (value == MEMSTICK_SERIAL) {</div><div class='ctx'> 			host_ctl &amp;= ~HOST_CONTROL_FAST_CLK;</div><div class='add'>+			host_ctl &amp;= ~HOST_CONTROL_REO;</div><div class='ctx'> 			host_ctl |= HOST_CONTROL_IF_SERIAL</div><div class='ctx'> 				    &lt;&lt; HOST_CONTROL_IF_SHIFT;</div><div class='ctx'> 			host_ctl |= HOST_CONTROL_REI;</div><div class='ctx'> 			clock_ctl = CLOCK_CONTROL_40MHZ;</div><div class='del'>-			clock_delay = 0;</div><div class='ctx'> 		} else if (value == MEMSTICK_PAR4) {</div><div class='del'>-			host_ctl |= HOST_CONTROL_FAST_CLK;</div><div class='add'>+			host_ctl |= HOST_CONTROL_FAST_CLK | HOST_CONTROL_REO;</div><div class='ctx'> 			host_ctl |= HOST_CONTROL_IF_PAR4</div><div class='ctx'> 				    &lt;&lt; HOST_CONTROL_IF_SHIFT;</div><div class='ctx'> 			host_ctl &amp;= ~HOST_CONTROL_REI;</div><div class='ctx'> 			clock_ctl = CLOCK_CONTROL_40MHZ;</div><div class='del'>-			clock_delay = 4;</div><div class='add'>+			clock_delay |= host-&gt;id ? (4 &lt;&lt; 12) : (4 &lt;&lt; 8);</div><div class='ctx'> 		} else if (value == MEMSTICK_PAR8) {</div><div class='ctx'> 			host_ctl |= HOST_CONTROL_FAST_CLK;</div><div class='ctx'> 			host_ctl |= HOST_CONTROL_IF_PAR8</div><div class='ctx'> 				    &lt;&lt; HOST_CONTROL_IF_SHIFT;</div><div class='del'>-			host_ctl &amp;= ~HOST_CONTROL_REI;</div><div class='del'>-			clock_ctl = CLOCK_CONTROL_60MHZ;</div><div class='del'>-			clock_delay = 0;</div><div class='add'>+			host_ctl &amp;= ~(HOST_CONTROL_REI | HOST_CONTROL_REO);</div><div class='add'>+			clock_ctl = CLOCK_CONTROL_50MHZ;</div><div class='ctx'> 		} else</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 		writel(host_ctl, host-&gt;addr + HOST_CONTROL);</div><div class='ctx'> 		writel(clock_ctl, host-&gt;addr + CLOCK_CONTROL);</div><div class='del'>-		writel(clock_delay, host-&gt;addr + CLOCK_DELAY);</div><div class='add'>+		pci_write_config_dword(host-&gt;chip-&gt;pdev,</div><div class='add'>+				       PCI_CTL_CLOCK_DLY_ADDR,</div><div class='add'>+				       clock_delay);</div><div class='ctx'> 		break;</div><div class='ctx'> 	};</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig<br/>index 883e7ea31de2..10c44d3fe01a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mfd/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/Kconfig</a></div><div class='hunk'>@@ -50,10 +50,31 @@ config HTC_PASIC3</div><div class='ctx'> 	  HTC Magician devices, respectively. Actual functionality is</div><div class='ctx'> 	  handled by the leds-pasic3 and ds1wm drivers.</div><div class='ctx'> </div><div class='add'>+config MFD_TMIO</div><div class='add'>+	bool</div><div class='add'>+	default n</div><div class='add'>+</div><div class='add'>+config MFD_T7L66XB</div><div class='add'>+	bool "Support Toshiba T7L66XB"</div><div class='add'>+	depends on ARM</div><div class='add'>+	select MFD_CORE</div><div class='add'>+	select MFD_TMIO</div><div class='add'>+	help</div><div class='add'>+	  Support for Toshiba Mobile IO Controller T7L66XB</div><div class='add'>+</div><div class='add'>+config MFD_TC6387XB</div><div class='add'>+	bool "Support Toshiba TC6387XB"</div><div class='add'>+	depends on ARM</div><div class='add'>+	select MFD_CORE</div><div class='add'>+	select MFD_TMIO</div><div class='add'>+	help</div><div class='add'>+	  Support for Toshiba Mobile IO Controller TC6387XB</div><div class='add'>+</div><div class='ctx'> config MFD_TC6393XB</div><div class='ctx'> 	bool "Support Toshiba TC6393XB"</div><div class='ctx'> 	depends on GPIOLIB &amp;&amp; ARM</div><div class='ctx'> 	select MFD_CORE</div><div class='add'>+	select MFD_TMIO</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for Toshiba Mobile IO Controller TC6393XB</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile<br/>index 33daa2f45dd8..03ad239ecef0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mfd/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/Makefile</a></div><div class='hunk'>@@ -8,6 +8,8 @@ obj-$(CONFIG_MFD_ASIC3)		+= asic3.o</div><div class='ctx'> obj-$(CONFIG_HTC_EGPIO)		+= htc-egpio.o</div><div class='ctx'> obj-$(CONFIG_HTC_PASIC3)	+= htc-pasic3.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_MFD_T7L66XB)	+= t7l66xb.o</div><div class='add'>+obj-$(CONFIG_MFD_TC6387XB)	+= tc6387xb.o</div><div class='ctx'> obj-$(CONFIG_MFD_TC6393XB)	+= tc6393xb.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MFD_CORE)		+= mfd-core.o</div><div class='head'>diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c<br/>index c6408a62d95e..bc2a807f210d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/asic3.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mfd/asic3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/asic3.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/asic3.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='head'>diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c<br/>index b5272b5ce3fa..28380b20bc70 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/mcp-sa11x0.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mfd/mcp-sa11x0.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/mcp-sa11x0.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/mcp-sa11x0.c</a></div><div class='hunk'>@@ -21,12 +21,12 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/arch/mcp.h&gt;</div><div class='add'>+#include &lt;mach/mcp.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/assabet.h&gt;</div><div class='add'>+#include &lt;mach/assabet.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mcp.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c<br/>new file mode 100644<br/>index 000000000000..49a0fffc02af<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/t7l66xb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/t7l66xb.c</a></div><div class='hunk'>@@ -0,0 +1,419 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * Toshiba T7L66XB core mfd support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005, 2007, 2008 Ian Molton</div><div class='add'>+ * Copyright (c) 2008 Dmitry Baryshkov</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * T7L66 features:</div><div class='add'>+ *</div><div class='add'>+ * Supported in this driver:</div><div class='add'>+ * SD/MMC</div><div class='add'>+ * SM/NAND flash controller</div><div class='add'>+ *</div><div class='add'>+ * As yet not supported</div><div class='add'>+ * GPIO interface (on NAND pins)</div><div class='add'>+ * Serial interface</div><div class='add'>+ * TFT 'interface converter'</div><div class='add'>+ * PCMCIA interface logic</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/mfd/core.h&gt;</div><div class='add'>+#include &lt;linux/mfd/tmio.h&gt;</div><div class='add'>+#include &lt;linux/mfd/t7l66xb.h&gt;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	T7L66XB_CELL_NAND,</div><div class='add'>+	T7L66XB_CELL_MMC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SCR_REVID	0x08		/* b Revision ID	*/</div><div class='add'>+#define SCR_IMR		0x42		/* b Interrupt Mask	*/</div><div class='add'>+#define SCR_DEV_CTL	0xe0		/* b Device control	*/</div><div class='add'>+#define SCR_ISR		0xe1		/* b Interrupt Status	*/</div><div class='add'>+#define SCR_GPO_OC	0xf0		/* b GPO output control	*/</div><div class='add'>+#define SCR_GPO_OS	0xf1		/* b GPO output enable	*/</div><div class='add'>+#define SCR_GPI_S	0xf2		/* w GPI status		*/</div><div class='add'>+#define SCR_APDC	0xf8		/* b Active pullup down ctrl */</div><div class='add'>+</div><div class='add'>+#define SCR_DEV_CTL_USB		BIT(0)	/* USB enable		*/</div><div class='add'>+#define SCR_DEV_CTL_MMC		BIT(1)	/* MMC enable		*/</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+struct t7l66xb {</div><div class='add'>+	void __iomem		*scr;</div><div class='add'>+	/* Lock to protect registers requiring read/modify/write ops. */</div><div class='add'>+	spinlock_t		lock;</div><div class='add'>+</div><div class='add'>+	struct resource		rscr;</div><div class='add'>+	int			irq;</div><div class='add'>+	int			irq_base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int t7l66xb_mmc_enable(struct platform_device *mmc)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *dev = to_platform_device(mmc-&gt;dev.parent);</div><div class='add'>+	struct t7l66xb_platform_data   *pdata = dev-&gt;dev.platform_data;</div><div class='add'>+	struct t7l66xb *t7l66xb = platform_get_drvdata(dev);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 dev_ctl;</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;enable_clk32k)</div><div class='add'>+		pdata-&gt;enable_clk32k(dev);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;t7l66xb-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	dev_ctl = tmio_ioread8(t7l66xb-&gt;scr + SCR_DEV_CTL);</div><div class='add'>+	dev_ctl |= SCR_DEV_CTL_MMC;</div><div class='add'>+	tmio_iowrite8(dev_ctl, t7l66xb-&gt;scr + SCR_DEV_CTL);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;t7l66xb-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int t7l66xb_mmc_disable(struct platform_device *mmc)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *dev = to_platform_device(mmc-&gt;dev.parent);</div><div class='add'>+	struct t7l66xb_platform_data   *pdata = dev-&gt;dev.platform_data;</div><div class='add'>+	struct t7l66xb *t7l66xb = platform_get_drvdata(dev);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 dev_ctl;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;t7l66xb-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	dev_ctl = tmio_ioread8(t7l66xb-&gt;scr + SCR_DEV_CTL);</div><div class='add'>+	dev_ctl &amp;= ~SCR_DEV_CTL_MMC;</div><div class='add'>+	tmio_iowrite8(dev_ctl, t7l66xb-&gt;scr + SCR_DEV_CTL);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;t7l66xb-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;disable_clk32k)</div><div class='add'>+		pdata-&gt;disable_clk32k(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+const static struct resource t7l66xb_mmc_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = 0x800,</div><div class='add'>+		.end	= 0x9ff,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = 0x200,</div><div class='add'>+		.end	= 0x2ff,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = IRQ_T7L66XB_MMC,</div><div class='add'>+		.end	= IRQ_T7L66XB_MMC,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const static struct resource t7l66xb_nand_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= 0xc00,</div><div class='add'>+		.end	= 0xc07,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start	= 0x0100,</div><div class='add'>+		.end	= 0x01ff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start	= IRQ_T7L66XB_NAND,</div><div class='add'>+		.end	= IRQ_T7L66XB_NAND,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mfd_cell t7l66xb_cells[] = {</div><div class='add'>+	[T7L66XB_CELL_MMC] = {</div><div class='add'>+		.name = "tmio-mmc",</div><div class='add'>+		.enable = t7l66xb_mmc_enable,</div><div class='add'>+		.disable = t7l66xb_mmc_disable,</div><div class='add'>+		.num_resources = ARRAY_SIZE(t7l66xb_mmc_resources),</div><div class='add'>+		.resources = t7l66xb_mmc_resources,</div><div class='add'>+	},</div><div class='add'>+	[T7L66XB_CELL_NAND] = {</div><div class='add'>+		.name = "tmio-nand",</div><div class='add'>+		.num_resources = ARRAY_SIZE(t7l66xb_nand_resources),</div><div class='add'>+		.resources = t7l66xb_nand_resources,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* Handle the T7L66XB interrupt mux */</div><div class='add'>+static void t7l66xb_irq(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct t7l66xb *t7l66xb = get_irq_data(irq);</div><div class='add'>+	unsigned int isr;</div><div class='add'>+	unsigned int i, irq_base;</div><div class='add'>+</div><div class='add'>+	irq_base = t7l66xb-&gt;irq_base;</div><div class='add'>+</div><div class='add'>+	while ((isr = tmio_ioread8(t7l66xb-&gt;scr + SCR_ISR) &amp;</div><div class='add'>+				~tmio_ioread8(t7l66xb-&gt;scr + SCR_IMR)))</div><div class='add'>+		for (i = 0; i &lt; T7L66XB_NR_IRQS; i++)</div><div class='add'>+			if (isr &amp; (1 &lt;&lt; i))</div><div class='add'>+				generic_handle_irq(irq_base + i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void t7l66xb_irq_mask(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	struct t7l66xb *t7l66xb = get_irq_chip_data(irq);</div><div class='add'>+	unsigned long			flags;</div><div class='add'>+	u8 imr;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;t7l66xb-&gt;lock, flags);</div><div class='add'>+	imr = tmio_ioread8(t7l66xb-&gt;scr + SCR_IMR);</div><div class='add'>+	imr |= 1 &lt;&lt; (irq - t7l66xb-&gt;irq_base);</div><div class='add'>+	tmio_iowrite8(imr, t7l66xb-&gt;scr + SCR_IMR);</div><div class='add'>+	spin_unlock_irqrestore(&amp;t7l66xb-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void t7l66xb_irq_unmask(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	struct t7l66xb *t7l66xb = get_irq_chip_data(irq);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 imr;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;t7l66xb-&gt;lock, flags);</div><div class='add'>+	imr = tmio_ioread8(t7l66xb-&gt;scr + SCR_IMR);</div><div class='add'>+	imr &amp;= ~(1 &lt;&lt; (irq - t7l66xb-&gt;irq_base));</div><div class='add'>+	tmio_iowrite8(imr, t7l66xb-&gt;scr + SCR_IMR);</div><div class='add'>+	spin_unlock_irqrestore(&amp;t7l66xb-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip t7l66xb_chip = {</div><div class='add'>+	.name	= "t7l66xb",</div><div class='add'>+	.ack	= t7l66xb_irq_mask,</div><div class='add'>+	.mask	= t7l66xb_irq_mask,</div><div class='add'>+	.unmask	= t7l66xb_irq_unmask,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/* Install the IRQ handler */</div><div class='add'>+static void t7l66xb_attach_irq(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct t7l66xb *t7l66xb = platform_get_drvdata(dev);</div><div class='add'>+	unsigned int irq, irq_base;</div><div class='add'>+</div><div class='add'>+	irq_base = t7l66xb-&gt;irq_base;</div><div class='add'>+</div><div class='add'>+	for (irq = irq_base; irq &lt; irq_base + T7L66XB_NR_IRQS; irq++) {</div><div class='add'>+		set_irq_chip(irq, &amp;t7l66xb_chip);</div><div class='add'>+		set_irq_chip_data(irq, t7l66xb);</div><div class='add'>+		set_irq_handler(irq, handle_level_irq);</div><div class='add'>+#ifdef CONFIG_ARM</div><div class='add'>+		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_irq_type(t7l66xb-&gt;irq, IRQ_TYPE_EDGE_FALLING);</div><div class='add'>+	set_irq_data(t7l66xb-&gt;irq, t7l66xb);</div><div class='add'>+	set_irq_chained_handler(t7l66xb-&gt;irq, t7l66xb_irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void t7l66xb_detach_irq(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct t7l66xb *t7l66xb = platform_get_drvdata(dev);</div><div class='add'>+	unsigned int irq, irq_base;</div><div class='add'>+</div><div class='add'>+	irq_base = t7l66xb-&gt;irq_base;</div><div class='add'>+</div><div class='add'>+	set_irq_chained_handler(t7l66xb-&gt;irq, NULL);</div><div class='add'>+	set_irq_data(t7l66xb-&gt;irq, NULL);</div><div class='add'>+</div><div class='add'>+	for (irq = irq_base; irq &lt; irq_base + T7L66XB_NR_IRQS; irq++) {</div><div class='add'>+#ifdef CONFIG_ARM</div><div class='add'>+		set_irq_flags(irq, 0);</div><div class='add'>+#endif</div><div class='add'>+		set_irq_chip(irq, NULL);</div><div class='add'>+		set_irq_chip_data(irq, NULL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int t7l66xb_suspend(struct platform_device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct t7l66xb_platform_data *pdata = dev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	if (pdata &amp;&amp; pdata-&gt;suspend)</div><div class='add'>+		pdata-&gt;suspend(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int t7l66xb_resume(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct t7l66xb_platform_data *pdata = dev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	if (pdata &amp;&amp; pdata-&gt;resume)</div><div class='add'>+		pdata-&gt;resume(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define t7l66xb_suspend NULL</div><div class='add'>+#define t7l66xb_resume	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int t7l66xb_probe(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct t7l66xb_platform_data *pdata = dev-&gt;dev.platform_data;</div><div class='add'>+	struct t7l66xb *t7l66xb;</div><div class='add'>+	struct resource *iomem, *rscr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	iomem = platform_get_resource(dev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!iomem)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	t7l66xb = kzalloc(sizeof *t7l66xb, GFP_KERNEL);</div><div class='add'>+	if (!t7l66xb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;t7l66xb-&gt;lock);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(dev, t7l66xb);</div><div class='add'>+</div><div class='add'>+	ret = platform_get_irq(dev, 0);</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		t7l66xb-&gt;irq = ret;</div><div class='add'>+	else</div><div class='add'>+		goto err_noirq;</div><div class='add'>+</div><div class='add'>+	t7l66xb-&gt;irq_base = pdata-&gt;irq_base;</div><div class='add'>+</div><div class='add'>+	rscr = &amp;t7l66xb-&gt;rscr;</div><div class='add'>+	rscr-&gt;name = "t7l66xb-core";</div><div class='add'>+	rscr-&gt;start = iomem-&gt;start;</div><div class='add'>+	rscr-&gt;end = iomem-&gt;start + 0xff;</div><div class='add'>+	rscr-&gt;flags = IORESOURCE_MEM;</div><div class='add'>+</div><div class='add'>+	ret = request_resource(iomem, rscr);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_request_scr;</div><div class='add'>+</div><div class='add'>+	t7l66xb-&gt;scr = ioremap(rscr-&gt;start, rscr-&gt;end - rscr-&gt;start + 1);</div><div class='add'>+	if (!t7l66xb-&gt;scr) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_ioremap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdata &amp;&amp; pdata-&gt;enable)</div><div class='add'>+		pdata-&gt;enable(dev);</div><div class='add'>+</div><div class='add'>+	/* Mask all interrupts */</div><div class='add'>+	tmio_iowrite8(0xbf, t7l66xb-&gt;scr + SCR_IMR);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s rev %d @ 0x%08lx, irq %d\n",</div><div class='add'>+		dev-&gt;name, tmio_ioread8(t7l66xb-&gt;scr + SCR_REVID),</div><div class='add'>+		(unsigned long)iomem-&gt;start, t7l66xb-&gt;irq);</div><div class='add'>+</div><div class='add'>+	t7l66xb_attach_irq(dev);</div><div class='add'>+</div><div class='add'>+	t7l66xb_cells[T7L66XB_CELL_NAND].driver_data = pdata-&gt;nand_data;</div><div class='add'>+	t7l66xb_cells[T7L66XB_CELL_NAND].platform_data =</div><div class='add'>+		&amp;t7l66xb_cells[T7L66XB_CELL_NAND];</div><div class='add'>+	t7l66xb_cells[T7L66XB_CELL_NAND].data_size =</div><div class='add'>+		sizeof(t7l66xb_cells[T7L66XB_CELL_NAND]);</div><div class='add'>+</div><div class='add'>+	t7l66xb_cells[T7L66XB_CELL_MMC].platform_data =</div><div class='add'>+		&amp;t7l66xb_cells[T7L66XB_CELL_MMC];</div><div class='add'>+	t7l66xb_cells[T7L66XB_CELL_MMC].data_size =</div><div class='add'>+		sizeof(t7l66xb_cells[T7L66XB_CELL_MMC]);</div><div class='add'>+</div><div class='add'>+	ret = mfd_add_devices(&amp;dev-&gt;dev, dev-&gt;id,</div><div class='add'>+			      t7l66xb_cells, ARRAY_SIZE(t7l66xb_cells),</div><div class='add'>+			      iomem, t7l66xb-&gt;irq_base);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	t7l66xb_detach_irq(dev);</div><div class='add'>+	iounmap(t7l66xb-&gt;scr);</div><div class='add'>+err_ioremap:</div><div class='add'>+	release_resource(&amp;t7l66xb-&gt;rscr);</div><div class='add'>+err_noirq:</div><div class='add'>+err_request_scr:</div><div class='add'>+	kfree(t7l66xb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int t7l66xb_remove(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct t7l66xb_platform_data *pdata = dev-&gt;dev.platform_data;</div><div class='add'>+	struct t7l66xb *t7l66xb = platform_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pdata-&gt;disable(dev);</div><div class='add'>+</div><div class='add'>+	t7l66xb_detach_irq(dev);</div><div class='add'>+	iounmap(t7l66xb-&gt;scr);</div><div class='add'>+	release_resource(&amp;t7l66xb-&gt;rscr);</div><div class='add'>+	mfd_remove_devices(&amp;dev-&gt;dev);</div><div class='add'>+	platform_set_drvdata(dev, NULL);</div><div class='add'>+	kfree(t7l66xb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver t7l66xb_platform_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "t7l66xb",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.suspend	= t7l66xb_suspend,</div><div class='add'>+	.resume		= t7l66xb_resume,</div><div class='add'>+	.probe		= t7l66xb_probe,</div><div class='add'>+	.remove		= t7l66xb_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int __init t7l66xb_init(void)</div><div class='add'>+{</div><div class='add'>+	int retval = 0;</div><div class='add'>+</div><div class='add'>+	retval = platform_driver_register(&amp;t7l66xb_platform_driver);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit t7l66xb_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;t7l66xb_platform_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(t7l66xb_init);</div><div class='add'>+module_exit(t7l66xb_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Toshiba T7L66XB core driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_AUTHOR("Ian Molton");</div><div class='add'>+MODULE_ALIAS("platform:t7l66xb");</div><div class='head'>diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c<br/>new file mode 100644<br/>index 000000000000..a22b21ac6cf8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/tc6387xb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/tc6387xb.c</a></div><div class='hunk'>@@ -0,0 +1,181 @@</div><div class='add'>+/*</div><div class='add'>+ * Toshiba TC6387XB support</div><div class='add'>+ * Copyright (c) 2005 Ian Molton</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This file contains TC6387XB base support.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/mfd/core.h&gt;</div><div class='add'>+#include &lt;linux/mfd/tmio.h&gt;</div><div class='add'>+#include &lt;linux/mfd/tc6387xb.h&gt;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	TC6387XB_CELL_MMC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int tc6387xb_suspend(struct platform_device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct tc6387xb_platform_data *pdata = platform_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (pdata &amp;&amp; pdata-&gt;suspend)</div><div class='add'>+		pdata-&gt;suspend(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tc6387xb_resume(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct tc6387xb_platform_data *pdata = platform_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (pdata &amp;&amp; pdata-&gt;resume)</div><div class='add'>+		pdata-&gt;resume(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define tc6387xb_suspend  NULL</div><div class='add'>+#define tc6387xb_resume   NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int tc6387xb_mmc_enable(struct platform_device *mmc)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *dev      = to_platform_device(mmc-&gt;dev.parent);</div><div class='add'>+	struct tc6387xb_platform_data *tc6387xb = dev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	if (tc6387xb-&gt;enable_clk32k)</div><div class='add'>+		tc6387xb-&gt;enable_clk32k(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tc6387xb_mmc_disable(struct platform_device *mmc)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *dev      = to_platform_device(mmc-&gt;dev.parent);</div><div class='add'>+	struct tc6387xb_platform_data *tc6387xb = dev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	if (tc6387xb-&gt;disable_clk32k)</div><div class='add'>+		tc6387xb-&gt;disable_clk32k(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static struct resource tc6387xb_mmc_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = 0x800,</div><div class='add'>+		.end   = 0x9ff,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = 0x200,</div><div class='add'>+		.end   = 0x2ff,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = 0,</div><div class='add'>+		.end   = 0,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mfd_cell tc6387xb_cells[] = {</div><div class='add'>+	[TC6387XB_CELL_MMC] = {</div><div class='add'>+		.name = "tmio-mmc",</div><div class='add'>+		.enable = tc6387xb_mmc_enable,</div><div class='add'>+		.disable = tc6387xb_mmc_disable,</div><div class='add'>+		.num_resources = ARRAY_SIZE(tc6387xb_mmc_resources),</div><div class='add'>+		.resources = tc6387xb_mmc_resources,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tc6387xb_probe(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct tc6387xb_platform_data *data = platform_get_drvdata(dev);</div><div class='add'>+	struct resource *iomem;</div><div class='add'>+	int irq, ret;</div><div class='add'>+</div><div class='add'>+	iomem = platform_get_resource(dev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!iomem) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_resource;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret  = platform_get_irq(dev, 0);</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		irq = ret;</div><div class='add'>+	else</div><div class='add'>+		goto err_resource;</div><div class='add'>+</div><div class='add'>+	if (data &amp;&amp; data-&gt;enable)</div><div class='add'>+		data-&gt;enable(dev);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Toshiba tc6387xb initialised\n");</div><div class='add'>+</div><div class='add'>+	tc6387xb_cells[TC6387XB_CELL_MMC].platform_data =</div><div class='add'>+		&amp;tc6387xb_cells[TC6387XB_CELL_MMC];</div><div class='add'>+	tc6387xb_cells[TC6387XB_CELL_MMC].data_size =</div><div class='add'>+		sizeof(tc6387xb_cells[TC6387XB_CELL_MMC]);</div><div class='add'>+</div><div class='add'>+	ret = mfd_add_devices(&amp;dev-&gt;dev, dev-&gt;id, tc6387xb_cells,</div><div class='add'>+			      ARRAY_SIZE(tc6387xb_cells), iomem, irq);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+err_resource:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tc6387xb_remove(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct tc6387xb_platform_data *data = platform_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (data &amp;&amp; data-&gt;disable)</div><div class='add'>+		data-&gt;disable(dev);</div><div class='add'>+</div><div class='add'>+	/* FIXME - free the resources! */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct platform_driver tc6387xb_platform_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name		= "tc6387xb",</div><div class='add'>+	},</div><div class='add'>+	.probe		= tc6387xb_probe,</div><div class='add'>+	.remove		= tc6387xb_remove,</div><div class='add'>+	.suspend        = tc6387xb_suspend,</div><div class='add'>+	.resume         = tc6387xb_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __init tc6387xb_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;tc6387xb_platform_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit tc6387xb_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;tc6387xb_platform_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(tc6387xb_init);</div><div class='add'>+module_exit(tc6387xb_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Toshiba TC6387XB core driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_AUTHOR("Ian Molton");</div><div class='add'>+MODULE_ALIAS("platform:tc6387xb");</div><div class='head'>diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c<br/>index f4fd797c1590..e4c1c788b5f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/tc6393xb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mfd/tc6393xb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/tc6393xb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/tc6393xb.c</a></div><div class='hunk'>@@ -19,8 +19,8 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/core.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/tmio.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/tc6393xb.h&gt;</div><div class='hunk'>@@ -112,6 +112,7 @@ struct tc6393xb {</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	TC6393XB_CELL_NAND,</div><div class='add'>+	TC6393XB_CELL_MMC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*--------------------------------------------------------------------------*/</div><div class='hunk'>@@ -126,7 +127,7 @@ static int tc6393xb_nand_enable(struct platform_device *nand)</div><div class='ctx'> </div><div class='ctx'> 	/* SMD buffer on */</div><div class='ctx'> 	dev_dbg(&amp;dev-&gt;dev, "SMD buffer on\n");</div><div class='del'>-	iowrite8(0xff, tc6393xb-&gt;scr + SCR_GPI_BCR(1));</div><div class='add'>+	tmio_iowrite8(0xff, tc6393xb-&gt;scr + SCR_GPI_BCR(1));</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;tc6393xb-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -135,25 +136,40 @@ static int tc6393xb_nand_enable(struct platform_device *nand)</div><div class='ctx'> </div><div class='ctx'> static struct resource __devinitdata tc6393xb_nand_resources[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name	= TMIO_NAND_CONFIG,</div><div class='del'>-		.start	= 0x0100,</div><div class='del'>-		.end	= 0x01ff,</div><div class='add'>+		.start	= 0x1000,</div><div class='add'>+		.end	= 0x1007,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.name	= TMIO_NAND_CONTROL,</div><div class='del'>-		.start	= 0x1000,</div><div class='del'>-		.end	= 0x1007,</div><div class='add'>+		.start	= 0x0100,</div><div class='add'>+		.end	= 0x01ff,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.name	= TMIO_NAND_IRQ,</div><div class='ctx'> 		.start	= IRQ_TC6393_NAND,</div><div class='ctx'> 		.end	= IRQ_TC6393_NAND,</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct resource __devinitdata tc6393xb_mmc_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= 0x800,</div><div class='add'>+		.end	= 0x9ff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start	= 0x200,</div><div class='add'>+		.end	= 0x2ff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start	= IRQ_TC6393_MMC,</div><div class='add'>+		.end	= IRQ_TC6393_MMC,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct mfd_cell __devinitdata tc6393xb_cells[] = {</div><div class='ctx'> 	[TC6393XB_CELL_NAND] = {</div><div class='ctx'> 		.name = "tmio-nand",</div><div class='hunk'>@@ -161,6 +177,11 @@ static struct mfd_cell __devinitdata tc6393xb_cells[] = {</div><div class='ctx'> 		.num_resources = ARRAY_SIZE(tc6393xb_nand_resources),</div><div class='ctx'> 		.resources = tc6393xb_nand_resources,</div><div class='ctx'> 	},</div><div class='add'>+	[TC6393XB_CELL_MMC] = {</div><div class='add'>+		.name = "tmio-mmc",</div><div class='add'>+		.num_resources = ARRAY_SIZE(tc6393xb_mmc_resources),</div><div class='add'>+		.resources = tc6393xb_mmc_resources,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*--------------------------------------------------------------------------*/</div><div class='hunk'>@@ -171,7 +192,7 @@ static int tc6393xb_gpio_get(struct gpio_chip *chip,</div><div class='ctx'> 	struct tc6393xb *tc6393xb = container_of(chip, struct tc6393xb, gpio);</div><div class='ctx'> </div><div class='ctx'> 	/* XXX: does dsr also represent inputs? */</div><div class='del'>-	return ioread8(tc6393xb-&gt;scr + SCR_GPO_DSR(offset / 8))</div><div class='add'>+	return tmio_ioread8(tc6393xb-&gt;scr + SCR_GPO_DSR(offset / 8))</div><div class='ctx'> 		&amp; TC_GPIO_BIT(offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -181,13 +202,13 @@ static void __tc6393xb_gpio_set(struct gpio_chip *chip,</div><div class='ctx'> 	struct tc6393xb *tc6393xb = container_of(chip, struct tc6393xb, gpio);</div><div class='ctx'> 	u8  dsr;</div><div class='ctx'> </div><div class='del'>-	dsr = ioread8(tc6393xb-&gt;scr + SCR_GPO_DSR(offset / 8));</div><div class='add'>+	dsr = tmio_ioread8(tc6393xb-&gt;scr + SCR_GPO_DSR(offset / 8));</div><div class='ctx'> 	if (value)</div><div class='ctx'> 		dsr |= TC_GPIO_BIT(offset);</div><div class='ctx'> 	else</div><div class='ctx'> 		dsr &amp;= ~TC_GPIO_BIT(offset);</div><div class='ctx'> </div><div class='del'>-	iowrite8(dsr, tc6393xb-&gt;scr + SCR_GPO_DSR(offset / 8));</div><div class='add'>+	tmio_iowrite8(dsr, tc6393xb-&gt;scr + SCR_GPO_DSR(offset / 8));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tc6393xb_gpio_set(struct gpio_chip *chip,</div><div class='hunk'>@@ -212,9 +233,9 @@ static int tc6393xb_gpio_direction_input(struct gpio_chip *chip,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;tc6393xb-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	doecr = ioread8(tc6393xb-&gt;scr + SCR_GPO_DOECR(offset / 8));</div><div class='add'>+	doecr = tmio_ioread8(tc6393xb-&gt;scr + SCR_GPO_DOECR(offset / 8));</div><div class='ctx'> 	doecr &amp;= ~TC_GPIO_BIT(offset);</div><div class='del'>-	iowrite8(doecr, tc6393xb-&gt;scr + SCR_GPO_DOECR(offset / 8));</div><div class='add'>+	tmio_iowrite8(doecr, tc6393xb-&gt;scr + SCR_GPO_DOECR(offset / 8));</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;tc6393xb-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -232,9 +253,9 @@ static int tc6393xb_gpio_direction_output(struct gpio_chip *chip,</div><div class='ctx'> </div><div class='ctx'> 	__tc6393xb_gpio_set(chip, offset, value);</div><div class='ctx'> </div><div class='del'>-	doecr = ioread8(tc6393xb-&gt;scr + SCR_GPO_DOECR(offset / 8));</div><div class='add'>+	doecr = tmio_ioread8(tc6393xb-&gt;scr + SCR_GPO_DOECR(offset / 8));</div><div class='ctx'> 	doecr |= TC_GPIO_BIT(offset);</div><div class='del'>-	iowrite8(doecr, tc6393xb-&gt;scr + SCR_GPO_DOECR(offset / 8));</div><div class='add'>+	tmio_iowrite8(doecr, tc6393xb-&gt;scr + SCR_GPO_DOECR(offset / 8));</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;tc6393xb-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -265,8 +286,8 @@ tc6393xb_irq(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> 	irq_base = tc6393xb-&gt;irq_base;</div><div class='ctx'> </div><div class='del'>-	while ((isr = ioread8(tc6393xb-&gt;scr + SCR_ISR) &amp;</div><div class='del'>-				~ioread8(tc6393xb-&gt;scr + SCR_IMR)))</div><div class='add'>+	while ((isr = tmio_ioread8(tc6393xb-&gt;scr + SCR_ISR) &amp;</div><div class='add'>+				~tmio_ioread8(tc6393xb-&gt;scr + SCR_IMR)))</div><div class='ctx'> 		for (i = 0; i &lt; TC6393XB_NR_IRQS; i++) {</div><div class='ctx'> 			if (isr &amp; (1 &lt;&lt; i))</div><div class='ctx'> 				generic_handle_irq(irq_base + i);</div><div class='hunk'>@@ -284,9 +305,9 @@ static void tc6393xb_irq_mask(unsigned int irq)</div><div class='ctx'> 	u8 imr;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;tc6393xb-&gt;lock, flags);</div><div class='del'>-	imr = ioread8(tc6393xb-&gt;scr + SCR_IMR);</div><div class='add'>+	imr = tmio_ioread8(tc6393xb-&gt;scr + SCR_IMR);</div><div class='ctx'> 	imr |= 1 &lt;&lt; (irq - tc6393xb-&gt;irq_base);</div><div class='del'>-	iowrite8(imr, tc6393xb-&gt;scr + SCR_IMR);</div><div class='add'>+	tmio_iowrite8(imr, tc6393xb-&gt;scr + SCR_IMR);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;tc6393xb-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -297,9 +318,9 @@ static void tc6393xb_irq_unmask(unsigned int irq)</div><div class='ctx'> 	u8 imr;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;tc6393xb-&gt;lock, flags);</div><div class='del'>-	imr = ioread8(tc6393xb-&gt;scr + SCR_IMR);</div><div class='add'>+	imr = tmio_ioread8(tc6393xb-&gt;scr + SCR_IMR);</div><div class='ctx'> 	imr &amp;= ~(1 &lt;&lt; (irq - tc6393xb-&gt;irq_base));</div><div class='del'>-	iowrite8(imr, tc6393xb-&gt;scr + SCR_IMR);</div><div class='add'>+	tmio_iowrite8(imr, tc6393xb-&gt;scr + SCR_IMR);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;tc6393xb-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -380,9 +401,8 @@ static int __devinit tc6393xb_probe(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tc6393xb_platform_data *tcpd = dev-&gt;dev.platform_data;</div><div class='ctx'> 	struct tc6393xb *tc6393xb;</div><div class='del'>-	struct resource *iomem;</div><div class='del'>-	struct resource *rscr;</div><div class='del'>-	int retval, temp;</div><div class='add'>+	struct resource *iomem, *rscr;</div><div class='add'>+	int ret, temp;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	iomem = platform_get_resource(dev, IORESOURCE_MEM, 0);</div><div class='hunk'>@@ -391,20 +411,26 @@ static int __devinit tc6393xb_probe(struct platform_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	tc6393xb = kzalloc(sizeof *tc6393xb, GFP_KERNEL);</div><div class='ctx'> 	if (!tc6393xb) {</div><div class='del'>-		retval = -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto err_kzalloc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;tc6393xb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(dev, tc6393xb);</div><div class='add'>+</div><div class='add'>+	ret = platform_get_irq(dev, 0);</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		tc6393xb-&gt;irq = ret;</div><div class='add'>+	else</div><div class='add'>+		goto err_noirq;</div><div class='add'>+</div><div class='ctx'> 	tc6393xb-&gt;iomem = iomem;</div><div class='del'>-	tc6393xb-&gt;irq = platform_get_irq(dev, 0);</div><div class='ctx'> 	tc6393xb-&gt;irq_base = tcpd-&gt;irq_base;</div><div class='ctx'> </div><div class='del'>-	tc6393xb-&gt;clk = clk_get(&amp;dev-&gt;dev, "GPIO27_CLK" /* "CK3P6MI" */);</div><div class='add'>+	tc6393xb-&gt;clk = clk_get(&amp;dev-&gt;dev, "CLK_CK3P6MI");</div><div class='ctx'> 	if (IS_ERR(tc6393xb-&gt;clk)) {</div><div class='del'>-		retval = PTR_ERR(tc6393xb-&gt;clk);</div><div class='add'>+		ret = PTR_ERR(tc6393xb-&gt;clk);</div><div class='ctx'> 		goto err_clk_get;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -414,71 +440,73 @@ static int __devinit tc6393xb_probe(struct platform_device *dev)</div><div class='ctx'> 	rscr-&gt;end = iomem-&gt;start + 0xff;</div><div class='ctx'> 	rscr-&gt;flags = IORESOURCE_MEM;</div><div class='ctx'> </div><div class='del'>-	retval = request_resource(iomem, rscr);</div><div class='del'>-	if (retval)</div><div class='add'>+	ret = request_resource(iomem, rscr);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto err_request_scr;</div><div class='ctx'> </div><div class='ctx'> 	tc6393xb-&gt;scr = ioremap(rscr-&gt;start, rscr-&gt;end - rscr-&gt;start + 1);</div><div class='ctx'> 	if (!tc6393xb-&gt;scr) {</div><div class='del'>-		retval = -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto err_ioremap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	retval = clk_enable(tc6393xb-&gt;clk);</div><div class='del'>-	if (retval)</div><div class='add'>+	ret = clk_enable(tc6393xb-&gt;clk);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto err_clk_enable;</div><div class='ctx'> </div><div class='del'>-	retval = tcpd-&gt;enable(dev);</div><div class='del'>-	if (retval)</div><div class='add'>+	ret = tcpd-&gt;enable(dev);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto err_enable;</div><div class='ctx'> </div><div class='ctx'> 	tc6393xb-&gt;suspend_state.fer = 0;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 3; i++) {</div><div class='ctx'> 		tc6393xb-&gt;suspend_state.gpo_dsr[i] =</div><div class='ctx'> 			(tcpd-&gt;scr_gpo_dsr &gt;&gt; (8 * i)) &amp; 0xff;</div><div class='ctx'> 		tc6393xb-&gt;suspend_state.gpo_doecr[i] =</div><div class='ctx'> 			(tcpd-&gt;scr_gpo_doecr &gt;&gt; (8 * i)) &amp; 0xff;</div><div class='ctx'> 	}</div><div class='del'>-	/*</div><div class='del'>-	 * It may be necessary to change this back to</div><div class='del'>-	 * platform-dependant code</div><div class='del'>-	 */</div><div class='add'>+</div><div class='ctx'> 	tc6393xb-&gt;suspend_state.ccr = SCR_CCR_UNK1 |</div><div class='ctx'> 					SCR_CCR_HCLK_48;</div><div class='ctx'> </div><div class='del'>-	retval = tc6393xb_hw_init(dev);</div><div class='del'>-	if (retval)</div><div class='add'>+	ret = tc6393xb_hw_init(dev);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto err_hw_init;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "Toshiba tc6393xb revision %d at 0x%08lx, irq %d\n",</div><div class='del'>-			ioread8(tc6393xb-&gt;scr + SCR_REVID),</div><div class='add'>+			tmio_ioread8(tc6393xb-&gt;scr + SCR_REVID),</div><div class='ctx'> 			(unsigned long) iomem-&gt;start, tc6393xb-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	tc6393xb-&gt;gpio.base = -1;</div><div class='ctx'> </div><div class='ctx'> 	if (tcpd-&gt;gpio_base &gt;= 0) {</div><div class='del'>-		retval = tc6393xb_register_gpio(tc6393xb, tcpd-&gt;gpio_base);</div><div class='del'>-		if (retval)</div><div class='add'>+		ret = tc6393xb_register_gpio(tc6393xb, tcpd-&gt;gpio_base);</div><div class='add'>+		if (ret)</div><div class='ctx'> 			goto err_gpio_add;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tc6393xb-&gt;irq)</div><div class='del'>-		tc6393xb_attach_irq(dev);</div><div class='add'>+	tc6393xb_attach_irq(dev);</div><div class='ctx'> </div><div class='ctx'> 	tc6393xb_cells[TC6393XB_CELL_NAND].driver_data = tcpd-&gt;nand_data;</div><div class='ctx'> 	tc6393xb_cells[TC6393XB_CELL_NAND].platform_data =</div><div class='ctx'> 		&amp;tc6393xb_cells[TC6393XB_CELL_NAND];</div><div class='ctx'> 	tc6393xb_cells[TC6393XB_CELL_NAND].data_size =</div><div class='ctx'> 		sizeof(tc6393xb_cells[TC6393XB_CELL_NAND]);</div><div class='add'>+	tc6393xb_cells[TC6393XB_CELL_MMC].platform_data =</div><div class='add'>+		&amp;tc6393xb_cells[TC6393XB_CELL_MMC];</div><div class='add'>+	tc6393xb_cells[TC6393XB_CELL_MMC].data_size =</div><div class='add'>+		sizeof(tc6393xb_cells[TC6393XB_CELL_MMC]);</div><div class='add'>+</div><div class='ctx'> </div><div class='del'>-	retval = mfd_add_devices(&amp;dev-&gt;dev, dev-&gt;id,</div><div class='add'>+	ret = mfd_add_devices(&amp;dev-&gt;dev, dev-&gt;id,</div><div class='ctx'> 			tc6393xb_cells, ARRAY_SIZE(tc6393xb_cells),</div><div class='ctx'> 			iomem, tcpd-&gt;irq_base);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	if (tc6393xb-&gt;irq)</div><div class='del'>-		tc6393xb_detach_irq(dev);</div><div class='add'>+	tc6393xb_detach_irq(dev);</div><div class='ctx'> </div><div class='ctx'> err_gpio_add:</div><div class='ctx'> 	if (tc6393xb-&gt;gpio.base != -1)</div><div class='hunk'>@@ -493,10 +521,11 @@ err_ioremap:</div><div class='ctx'> 	release_resource(&amp;tc6393xb-&gt;rscr);</div><div class='ctx'> err_request_scr:</div><div class='ctx'> 	clk_put(tc6393xb-&gt;clk);</div><div class='add'>+err_noirq:</div><div class='ctx'> err_clk_get:</div><div class='ctx'> 	kfree(tc6393xb);</div><div class='ctx'> err_kzalloc:</div><div class='del'>-	return retval;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __devexit tc6393xb_remove(struct platform_device *dev)</div><div class='hunk'>@@ -506,9 +535,7 @@ static int __devexit tc6393xb_remove(struct platform_device *dev)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mfd_remove_devices(&amp;dev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if (tc6393xb-&gt;irq)</div><div class='del'>-		tc6393xb_detach_irq(dev);</div><div class='add'>+	tc6393xb_detach_irq(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (tc6393xb-&gt;gpio.base != -1) {</div><div class='ctx'> 		ret = gpiochip_remove(&amp;tc6393xb-&gt;gpio);</div><div class='hunk'>@@ -519,17 +546,11 @@ static int __devexit tc6393xb_remove(struct platform_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = tcpd-&gt;disable(dev);</div><div class='del'>-</div><div class='ctx'> 	clk_disable(tc6393xb-&gt;clk);</div><div class='del'>-</div><div class='ctx'> 	iounmap(tc6393xb-&gt;scr);</div><div class='del'>-</div><div class='ctx'> 	release_resource(&amp;tc6393xb-&gt;rscr);</div><div class='del'>-</div><div class='ctx'> 	platform_set_drvdata(dev, NULL);</div><div class='del'>-</div><div class='ctx'> 	clk_put(tc6393xb-&gt;clk);</div><div class='del'>-</div><div class='ctx'> 	kfree(tc6393xb);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -540,8 +561,7 @@ static int tc6393xb_suspend(struct platform_device *dev, pm_message_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct tc6393xb_platform_data *tcpd = dev-&gt;dev.platform_data;</div><div class='ctx'> 	struct tc6393xb *tc6393xb = platform_get_drvdata(dev);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='add'>+	int i, ret;</div><div class='ctx'> </div><div class='ctx'> 	tc6393xb-&gt;suspend_state.ccr = ioread16(tc6393xb-&gt;scr + SCR_CCR);</div><div class='ctx'> 	tc6393xb-&gt;suspend_state.fer = ioread8(tc6393xb-&gt;scr + SCR_FER);</div><div class='hunk'>@@ -554,14 +574,21 @@ static int tc6393xb_suspend(struct platform_device *dev, pm_message_t state)</div><div class='ctx'> 		tc6393xb-&gt;suspend_state.gpi_bcr[i] =</div><div class='ctx'> 			ioread8(tc6393xb-&gt;scr + SCR_GPI_BCR(i));</div><div class='ctx'> 	}</div><div class='add'>+	ret = tcpd-&gt;suspend(dev);</div><div class='add'>+	clk_disable(tc6393xb-&gt;clk);</div><div class='ctx'> </div><div class='del'>-	return tcpd-&gt;suspend(dev);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tc6393xb_resume(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tc6393xb_platform_data *tcpd = dev-&gt;dev.platform_data;</div><div class='del'>-	int ret = tcpd-&gt;resume(dev);</div><div class='add'>+	struct tc6393xb *tc6393xb = platform_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	clk_enable(tc6393xb-&gt;clk);</div><div class='add'>+</div><div class='add'>+	ret = tcpd-&gt;resume(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -598,7 +625,7 @@ static void __exit tc6393xb_exit(void)</div><div class='ctx'> subsys_initcall(tc6393xb_init);</div><div class='ctx'> module_exit(tc6393xb_exit);</div><div class='ctx'> </div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_AUTHOR("Ian Molton, Dmitry Baryshkov and Dirk Opfer");</div><div class='ctx'> MODULE_DESCRIPTION("tc6393xb Toshiba Mobile IO Controller");</div><div class='ctx'> MODULE_ALIAS("platform:tc6393xb");</div><div class='head'>diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c<br/>index f6b10dda31fd..a316f1b75933 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/ucb1x00-core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mfd/ucb1x00-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/ucb1x00-core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/ucb1x00-core.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ucb1x00.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c<br/>index ad34e2d22524..44762ca86a8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/ucb1x00-ts.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mfd/ucb1x00-ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/ucb1x00-ts.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mfd/ucb1x00-ts.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/collie.h&gt;</div><div class='add'>+#include &lt;mach/collie.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ucb1x00.h"</div><div class='head'>diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig<br/>index f5ade1904aad..a726f3b01a6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/misc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/Kconfig</a></div><div class='hunk'>@@ -426,9 +426,11 @@ config ENCLOSURE_SERVICES</div><div class='ctx'> </div><div class='ctx'> config SGI_XP</div><div class='ctx'> 	tristate "Support communication between SGI SSIs"</div><div class='del'>-	depends on IA64_GENERIC || IA64_SGI_SN2</div><div class='add'>+	depends on NET</div><div class='add'>+	depends on (IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || X86_64) &amp;&amp; SMP</div><div class='ctx'> 	select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2</div><div class='ctx'> 	select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2</div><div class='add'>+	select SGI_GRU if (IA64_GENERIC || IA64_SGI_UV || X86_64) &amp;&amp; SMP</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  An SGI machine can be divided into multiple Single System</div><div class='ctx'> 	  Images which act independently of each other and have</div><div class='hunk'>@@ -450,4 +452,27 @@ config HP_ILO</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called hpilo.</div><div class='ctx'> </div><div class='add'>+config SGI_GRU</div><div class='add'>+	tristate "SGI GRU driver"</div><div class='add'>+	depends on (X86_64 || IA64_SGI_UV || IA64_GENERIC) &amp;&amp; SMP</div><div class='add'>+	default n</div><div class='add'>+	select MMU_NOTIFIER</div><div class='add'>+	---help---</div><div class='add'>+	The GRU is a hardware resource located in the system chipset. The GRU</div><div class='add'>+	contains memory that can be mmapped into the user address space. This memory is</div><div class='add'>+	used to communicate with the GRU to perform functions such as load/store,</div><div class='add'>+	scatter/gather, bcopy, AMOs, etc.  The GRU is directly accessed by user</div><div class='add'>+	instructions using user virtual addresses. GRU instructions (ex., bcopy) use</div><div class='add'>+	user virtual addresses for operands.</div><div class='add'>+</div><div class='add'>+	If you are not running on a SGI UV system, say N.</div><div class='add'>+</div><div class='add'>+config SGI_GRU_DEBUG</div><div class='add'>+	bool  "SGI GRU driver debug"</div><div class='add'>+	depends on SGI_GRU</div><div class='add'>+	default n</div><div class='add'>+	---help---</div><div class='add'>+	This option enables addition debugging code for the SGI GRU driver. If</div><div class='add'>+	you are unsure, say N.</div><div class='add'>+</div><div class='ctx'> endif # MISC_DEVICES</div><div class='head'>diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile<br/>index f5e273420c09..c6c13f60b452 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/misc/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/Makefile</a></div><div class='hunk'>@@ -28,4 +28,5 @@ obj-$(CONFIG_INTEL_MENLOW)	+= intel_menlow.o</div><div class='ctx'> obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o</div><div class='ctx'> obj-$(CONFIG_KGDB_TESTS)	+= kgdbts.o</div><div class='ctx'> obj-$(CONFIG_SGI_XP)		+= sgi-xp/</div><div class='add'>+obj-$(CONFIG_SGI_GRU)		+= sgi-gru/</div><div class='ctx'> obj-$(CONFIG_HP_ILO)		+= hpilo.o</div><div class='head'>diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c<br/>index e7a3fe508dff..d8b0d326e452 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/acer-wmi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/misc/acer-wmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/acer-wmi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/acer-wmi.c</a></div><div class='hunk'>@@ -192,6 +192,9 @@ static struct quirk_entry *quirks;</div><div class='ctx'> </div><div class='ctx'> static void set_quirks(void)</div><div class='ctx'> {</div><div class='add'>+	if (!interface)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (quirks-&gt;mailled)</div><div class='ctx'> 		interface-&gt;capability |= ACER_CAP_MAILLED;</div><div class='ctx'> </div><div class='hunk'>@@ -803,11 +806,30 @@ static acpi_status get_u32(u32 *value, u32 cap)</div><div class='ctx'> </div><div class='ctx'> static acpi_status set_u32(u32 value, u32 cap)</div><div class='ctx'> {</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='ctx'> 	if (interface-&gt;capability &amp; cap) {</div><div class='ctx'> 		switch (interface-&gt;type) {</div><div class='ctx'> 		case ACER_AMW0:</div><div class='ctx'> 			return AMW0_set_u32(value, cap, interface);</div><div class='ctx'> 		case ACER_AMW0_V2:</div><div class='add'>+			if (cap == ACER_CAP_MAILLED)</div><div class='add'>+				return AMW0_set_u32(value, cap, interface);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * On some models, some WMID methods don't toggle</div><div class='add'>+			 * properly. For those cases, we want to run the AMW0</div><div class='add'>+			 * method afterwards to be certain we've really toggled</div><div class='add'>+			 * the device state.</div><div class='add'>+			 */</div><div class='add'>+			if (cap == ACER_CAP_WIRELESS ||</div><div class='add'>+				cap == ACER_CAP_BLUETOOTH) {</div><div class='add'>+				status = WMID_set_u32(value, cap, interface);</div><div class='add'>+				if (ACPI_FAILURE(status))</div><div class='add'>+					return status;</div><div class='add'>+</div><div class='add'>+				return AMW0_set_u32(value, cap, interface);</div><div class='add'>+			}</div><div class='ctx'> 		case ACER_WMID:</div><div class='ctx'> 			return WMID_set_u32(value, cap, interface);</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -1167,7 +1189,7 @@ static int create_debugfs(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error_debugfs:</div><div class='del'>-		remove_debugfs();</div><div class='add'>+	remove_debugfs();</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1218,6 +1240,8 @@ static int __init acer_wmi_init(void)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	set_quirks();</div><div class='add'>+</div><div class='ctx'> 	if (platform_driver_register(&amp;acer_platform_driver)) {</div><div class='ctx'> 		printk(ACER_ERR "Unable to register platform driver.\n");</div><div class='ctx'> 		goto error_platform_register;</div><div class='hunk'>@@ -1248,6 +1272,7 @@ error_platform_register:</div><div class='ctx'> static void __exit acer_wmi_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	remove_sysfs(acer_platform_device);</div><div class='add'>+	remove_debugfs();</div><div class='ctx'> 	platform_device_del(acer_platform_device);</div><div class='ctx'> 	platform_driver_unregister(&amp;acer_platform_driver);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/eeepc-laptop.c b/drivers/misc/eeepc-laptop.c<br/>index 9e8d79e7e9f4..facdb9893c84 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/eeepc-laptop.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/misc/eeepc-laptop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/eeepc-laptop.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/eeepc-laptop.c</a></div><div class='hunk'>@@ -553,9 +553,9 @@ static void eeepc_hwmon_exit(void)</div><div class='ctx'> 	hwmon = eeepc_hwmon_device;</div><div class='ctx'> 	if (!hwmon)</div><div class='ctx'> 		return ;</div><div class='del'>-	hwmon_device_unregister(hwmon);</div><div class='ctx'> 	sysfs_remove_group(&amp;hwmon-&gt;kobj,</div><div class='ctx'> 			   &amp;hwmon_attribute_group);</div><div class='add'>+	hwmon_device_unregister(hwmon);</div><div class='ctx'> 	eeepc_hwmon_device = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/eeprom_93cx6.c b/drivers/misc/eeprom_93cx6.c<br/>index ea55654e5948..15b1780025c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/eeprom_93cx6.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/misc/eeprom_93cx6.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/eeprom_93cx6.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/eeprom_93cx6.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/eeprom_93cx6.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/fujitsu-laptop.c b/drivers/misc/fujitsu-laptop.c<br/>index 7a1ef6c262de..3e56203e4947 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/fujitsu-laptop.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/misc/fujitsu-laptop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/fujitsu-laptop.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/fujitsu-laptop.c</a></div><div class='hunk'>@@ -463,6 +463,13 @@ static struct dmi_system_id __initdata fujitsu_dmi_table[] = {</div><div class='ctx'> 		     DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK S6410"),</div><div class='ctx'> 		     },</div><div class='ctx'> 	 .callback = dmi_check_cb_s6410},</div><div class='add'>+	{</div><div class='add'>+	 .ident = "FUJITSU LifeBook P8010",</div><div class='add'>+	 .matches = {</div><div class='add'>+		     DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),</div><div class='add'>+		     DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook P8010"),</div><div class='add'>+		    },</div><div class='add'>+	 .callback = dmi_check_cb_s6410},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/hp-wmi.c b/drivers/misc/hp-wmi.c<br/>index 1dbcbcb323a2..6d407c2a4f91 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/hp-wmi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/misc/hp-wmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/hp-wmi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/hp-wmi.c</a></div><div class='hunk'>@@ -49,6 +49,7 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4");</div><div class='ctx'> #define HPWMI_ALS_QUERY 0x3</div><div class='ctx'> #define HPWMI_DOCK_QUERY 0x4</div><div class='ctx'> #define HPWMI_WIRELESS_QUERY 0x5</div><div class='add'>+#define HPWMI_HOTKEY_QUERY 0xc</div><div class='ctx'> </div><div class='ctx'> static int __init hp_wmi_bios_setup(struct platform_device *device);</div><div class='ctx'> static int __exit hp_wmi_bios_remove(struct platform_device *device);</div><div class='hunk'>@@ -69,7 +70,7 @@ struct bios_return {</div><div class='ctx'> </div><div class='ctx'> struct key_entry {</div><div class='ctx'> 	char type;		/* See KE_* below */</div><div class='del'>-	u8 code;</div><div class='add'>+	u16 code;</div><div class='ctx'> 	u16 keycode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -79,7 +80,9 @@ static struct key_entry hp_wmi_keymap[] = {</div><div class='ctx'> 	{KE_SW, 0x01, SW_DOCK},</div><div class='ctx'> 	{KE_KEY, 0x02, KEY_BRIGHTNESSUP},</div><div class='ctx'> 	{KE_KEY, 0x03, KEY_BRIGHTNESSDOWN},</div><div class='del'>-	{KE_KEY, 0x04, KEY_HELP},</div><div class='add'>+	{KE_KEY, 0x20e6, KEY_PROG1},</div><div class='add'>+	{KE_KEY, 0x2142, KEY_MEDIA},</div><div class='add'>+	{KE_KEY, 0x231b, KEY_HELP},</div><div class='ctx'> 	{KE_END, 0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -177,9 +180,9 @@ static int hp_wmi_wifi_state(void)</div><div class='ctx'> 	int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (wireless &amp; 0x100)</div><div class='del'>-		return 1;</div><div class='add'>+		return RFKILL_STATE_UNBLOCKED;</div><div class='ctx'> 	else</div><div class='del'>-		return 0;</div><div class='add'>+		return RFKILL_STATE_SOFT_BLOCKED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hp_wmi_bluetooth_state(void)</div><div class='hunk'>@@ -187,9 +190,9 @@ static int hp_wmi_bluetooth_state(void)</div><div class='ctx'> 	int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (wireless &amp; 0x10000)</div><div class='del'>-		return 1;</div><div class='add'>+		return RFKILL_STATE_UNBLOCKED;</div><div class='ctx'> 	else</div><div class='del'>-		return 0;</div><div class='add'>+		return RFKILL_STATE_SOFT_BLOCKED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hp_wmi_wwan_state(void)</div><div class='hunk'>@@ -197,9 +200,9 @@ static int hp_wmi_wwan_state(void)</div><div class='ctx'> 	int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (wireless &amp; 0x1000000)</div><div class='del'>-		return 1;</div><div class='add'>+		return RFKILL_STATE_UNBLOCKED;</div><div class='ctx'> 	else</div><div class='del'>-		return 0;</div><div class='add'>+		return RFKILL_STATE_SOFT_BLOCKED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t show_display(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -318,6 +321,9 @@ void hp_wmi_notify(u32 value, void *context)</div><div class='ctx'> </div><div class='ctx'> 	if (obj &amp;&amp; obj-&gt;type == ACPI_TYPE_BUFFER &amp;&amp; obj-&gt;buffer.length == 8) {</div><div class='ctx'> 		int eventcode = *((u8 *) obj-&gt;buffer.pointer);</div><div class='add'>+		if (eventcode == 0x4)</div><div class='add'>+			eventcode = hp_wmi_perform_query(HPWMI_HOTKEY_QUERY, 0,</div><div class='add'>+							 0);</div><div class='ctx'> 		key = hp_wmi_get_entry_by_scancode(eventcode);</div><div class='ctx'> 		if (key) {</div><div class='ctx'> 			switch (key-&gt;type) {</div><div class='hunk'>@@ -338,12 +344,14 @@ void hp_wmi_notify(u32 value, void *context)</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (eventcode == 0x5) {</div><div class='ctx'> 			if (wifi_rfkill)</div><div class='del'>-				wifi_rfkill-&gt;state = hp_wmi_wifi_state();</div><div class='add'>+				rfkill_force_state(wifi_rfkill,</div><div class='add'>+						   hp_wmi_wifi_state());</div><div class='ctx'> 			if (bluetooth_rfkill)</div><div class='del'>-				bluetooth_rfkill-&gt;state =</div><div class='del'>-				    hp_wmi_bluetooth_state();</div><div class='add'>+				rfkill_force_state(bluetooth_rfkill,</div><div class='add'>+						   hp_wmi_bluetooth_state());</div><div class='ctx'> 			if (wwan_rfkill)</div><div class='del'>-				wwan_rfkill-&gt;state = hp_wmi_wwan_state();</div><div class='add'>+				rfkill_force_state(wwan_rfkill,</div><div class='add'>+						   hp_wmi_wwan_state());</div><div class='ctx'> 		} else</div><div class='ctx'> 			printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n",</div><div class='ctx'> 			       eventcode);</div><div class='hunk'>@@ -398,6 +406,7 @@ static void cleanup_sysfs(struct platform_device *device)</div><div class='ctx'> static int __init hp_wmi_bios_setup(struct platform_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='add'>+	int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	err = device_create_file(&amp;device-&gt;dev, &amp;dev_attr_display);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -412,28 +421,33 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto add_sysfs_error;</div><div class='ctx'> </div><div class='del'>-	wifi_rfkill = rfkill_allocate(&amp;device-&gt;dev, RFKILL_TYPE_WLAN);</div><div class='del'>-	wifi_rfkill-&gt;name = "hp-wifi";</div><div class='del'>-	wifi_rfkill-&gt;state = hp_wmi_wifi_state();</div><div class='del'>-	wifi_rfkill-&gt;toggle_radio = hp_wmi_wifi_set;</div><div class='del'>-	wifi_rfkill-&gt;user_claim_unsupported = 1;</div><div class='del'>-</div><div class='del'>-	bluetooth_rfkill = rfkill_allocate(&amp;device-&gt;dev,</div><div class='del'>-					   RFKILL_TYPE_BLUETOOTH);</div><div class='del'>-	bluetooth_rfkill-&gt;name = "hp-bluetooth";</div><div class='del'>-	bluetooth_rfkill-&gt;state = hp_wmi_bluetooth_state();</div><div class='del'>-	bluetooth_rfkill-&gt;toggle_radio = hp_wmi_bluetooth_set;</div><div class='del'>-	bluetooth_rfkill-&gt;user_claim_unsupported = 1;</div><div class='del'>-</div><div class='del'>-	wwan_rfkill = rfkill_allocate(&amp;device-&gt;dev, RFKILL_TYPE_WIMAX);</div><div class='del'>-	wwan_rfkill-&gt;name = "hp-wwan";</div><div class='del'>-	wwan_rfkill-&gt;state = hp_wmi_wwan_state();</div><div class='del'>-	wwan_rfkill-&gt;toggle_radio = hp_wmi_wwan_set;</div><div class='del'>-	wwan_rfkill-&gt;user_claim_unsupported = 1;</div><div class='del'>-</div><div class='del'>-	rfkill_register(wifi_rfkill);</div><div class='del'>-	rfkill_register(bluetooth_rfkill);</div><div class='del'>-	rfkill_register(wwan_rfkill);</div><div class='add'>+	if (wireless &amp; 0x1) {</div><div class='add'>+		wifi_rfkill = rfkill_allocate(&amp;device-&gt;dev, RFKILL_TYPE_WLAN);</div><div class='add'>+		wifi_rfkill-&gt;name = "hp-wifi";</div><div class='add'>+		wifi_rfkill-&gt;state = hp_wmi_wifi_state();</div><div class='add'>+		wifi_rfkill-&gt;toggle_radio = hp_wmi_wifi_set;</div><div class='add'>+		wifi_rfkill-&gt;user_claim_unsupported = 1;</div><div class='add'>+		rfkill_register(wifi_rfkill);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wireless &amp; 0x2) {</div><div class='add'>+		bluetooth_rfkill = rfkill_allocate(&amp;device-&gt;dev,</div><div class='add'>+						   RFKILL_TYPE_BLUETOOTH);</div><div class='add'>+		bluetooth_rfkill-&gt;name = "hp-bluetooth";</div><div class='add'>+		bluetooth_rfkill-&gt;state = hp_wmi_bluetooth_state();</div><div class='add'>+		bluetooth_rfkill-&gt;toggle_radio = hp_wmi_bluetooth_set;</div><div class='add'>+		bluetooth_rfkill-&gt;user_claim_unsupported = 1;</div><div class='add'>+		rfkill_register(bluetooth_rfkill);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wireless &amp; 0x4) {</div><div class='add'>+		wwan_rfkill = rfkill_allocate(&amp;device-&gt;dev, RFKILL_TYPE_WWAN);</div><div class='add'>+		wwan_rfkill-&gt;name = "hp-wwan";</div><div class='add'>+		wwan_rfkill-&gt;state = hp_wmi_wwan_state();</div><div class='add'>+		wwan_rfkill-&gt;toggle_radio = hp_wmi_wwan_set;</div><div class='add'>+		wwan_rfkill-&gt;user_claim_unsupported = 1;</div><div class='add'>+		rfkill_register(wwan_rfkill);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> add_sysfs_error:</div><div class='hunk'>@@ -445,9 +459,12 @@ static int __exit hp_wmi_bios_remove(struct platform_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	cleanup_sysfs(device);</div><div class='ctx'> </div><div class='del'>-	rfkill_unregister(wifi_rfkill);</div><div class='del'>-	rfkill_unregister(bluetooth_rfkill);</div><div class='del'>-	rfkill_unregister(wwan_rfkill);</div><div class='add'>+	if (wifi_rfkill)</div><div class='add'>+		rfkill_unregister(wifi_rfkill);</div><div class='add'>+	if (bluetooth_rfkill)</div><div class='add'>+		rfkill_unregister(bluetooth_rfkill);</div><div class='add'>+	if (wwan_rfkill)</div><div class='add'>+		rfkill_unregister(wwan_rfkill);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/misc/sgi-gru/Makefile b/drivers/misc/sgi-gru/Makefile<br/>new file mode 100644<br/>index 000000000000..d03597a521b0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-gru/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+obj-$(CONFIG_SGI_GRU) := gru.o</div><div class='add'>+gru-y := grufile.o grumain.o grufault.o grutlbpurge.o gruprocfs.o grukservices.o</div><div class='add'>+</div><div class='head'>diff --git a/drivers/misc/sgi-gru/gru.h b/drivers/misc/sgi-gru/gru.h<br/>new file mode 100644<br/>index 000000000000..40df7cb3f0a5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-gru/gru.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/gru.h</a></div><div class='hunk'>@@ -0,0 +1,67 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU Lesser General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2.1 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU Lesser General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU Lesser General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __GRU_H__</div><div class='add'>+#define __GRU_H__</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GRU architectural definitions</div><div class='add'>+ */</div><div class='add'>+#define GRU_CACHE_LINE_BYTES		64</div><div class='add'>+#define GRU_HANDLE_STRIDE		256</div><div class='add'>+#define GRU_CB_BASE			0</div><div class='add'>+#define GRU_DS_BASE			0x20000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Size used to map GRU GSeg</div><div class='add'>+ */</div><div class='add'>+#if defined CONFIG_IA64</div><div class='add'>+#define GRU_GSEG_PAGESIZE	(256 * 1024UL)</div><div class='add'>+#elif defined CONFIG_X86_64</div><div class='add'>+#define GRU_GSEG_PAGESIZE	(256 * 1024UL)		/* ZZZ 2MB ??? */</div><div class='add'>+#else</div><div class='add'>+#error "Unsupported architecture"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Structure for obtaining GRU resource information</div><div class='add'>+ */</div><div class='add'>+struct gru_chiplet_info {</div><div class='add'>+	int	node;</div><div class='add'>+	int	chiplet;</div><div class='add'>+	int	blade;</div><div class='add'>+	int	total_dsr_bytes;</div><div class='add'>+	int	total_cbr;</div><div class='add'>+	int	total_user_dsr_bytes;</div><div class='add'>+	int	total_user_cbr;</div><div class='add'>+	int	free_user_dsr_bytes;</div><div class='add'>+	int	free_user_cbr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Flags for GRU options on the gru_create_context() call */</div><div class='add'>+/* Select one of the follow 4 options to specify how TLB misses are handled */</div><div class='add'>+#define GRU_OPT_MISS_DEFAULT	0x0000	/* Use default mode */</div><div class='add'>+#define GRU_OPT_MISS_USER_POLL	0x0001	/* User will poll CB for faults */</div><div class='add'>+#define GRU_OPT_MISS_FMM_INTR	0x0002	/* Send interrupt to cpu to</div><div class='add'>+					   handle fault */</div><div class='add'>+#define GRU_OPT_MISS_FMM_POLL	0x0003	/* Use system polling thread */</div><div class='add'>+#define GRU_OPT_MISS_MASK	0x0003	/* Mask for TLB MISS option */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif		/* __GRU_H__ */</div><div class='head'>diff --git a/drivers/misc/sgi-gru/gru_instructions.h b/drivers/misc/sgi-gru/gru_instructions.h<br/>new file mode 100644<br/>index 000000000000..0dc36225c7c6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-gru/gru_instructions.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/gru_instructions.h</a></div><div class='hunk'>@@ -0,0 +1,669 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU Lesser General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2.1 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU Lesser General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU Lesser General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __GRU_INSTRUCTIONS_H__</div><div class='add'>+#define __GRU_INSTRUCTIONS_H__</div><div class='add'>+</div><div class='add'>+#define gru_flush_cache_hook(p)</div><div class='add'>+#define gru_emulator_wait_hook(p, w)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Architecture dependent functions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if defined CONFIG_IA64</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;asm/intrinsics.h&gt;</div><div class='add'>+#define __flush_cache(p)		ia64_fc(p)</div><div class='add'>+/* Use volatile on IA64 to ensure ordering via st4.rel */</div><div class='add'>+#define gru_ordered_store_int(p,v)					\</div><div class='add'>+		do {							\</div><div class='add'>+			barrier();					\</div><div class='add'>+			*((volatile int *)(p)) = v; /* force st.rel */	\</div><div class='add'>+		} while (0)</div><div class='add'>+#elif defined CONFIG_X86_64</div><div class='add'>+#define __flush_cache(p)		clflush(p)</div><div class='add'>+#define gru_ordered_store_int(p,v)					\</div><div class='add'>+		do {							\</div><div class='add'>+			barrier();					\</div><div class='add'>+			*(int *)p = v;					\</div><div class='add'>+		} while (0)</div><div class='add'>+#else</div><div class='add'>+#error "Unsupported architecture"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Control block status and exception codes</div><div class='add'>+ */</div><div class='add'>+#define CBS_IDLE			0</div><div class='add'>+#define CBS_EXCEPTION			1</div><div class='add'>+#define CBS_ACTIVE			2</div><div class='add'>+#define CBS_CALL_OS			3</div><div class='add'>+</div><div class='add'>+/* CB substatus bitmasks */</div><div class='add'>+#define CBSS_MSG_QUEUE_MASK		7</div><div class='add'>+#define CBSS_IMPLICIT_ABORT_ACTIVE_MASK	8</div><div class='add'>+</div><div class='add'>+/* CB substatus message queue values (low 3 bits of substatus) */</div><div class='add'>+#define CBSS_NO_ERROR			0</div><div class='add'>+#define CBSS_LB_OVERFLOWED		1</div><div class='add'>+#define CBSS_QLIMIT_REACHED		2</div><div class='add'>+#define CBSS_PAGE_OVERFLOW		3</div><div class='add'>+#define CBSS_AMO_NACKED			4</div><div class='add'>+#define CBSS_PUT_NACKED			5</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Structure used to fetch exception detail for CBs that terminate with</div><div class='add'>+ * CBS_EXCEPTION</div><div class='add'>+ */</div><div class='add'>+struct control_block_extended_exc_detail {</div><div class='add'>+	unsigned long	cb;</div><div class='add'>+	int		opc;</div><div class='add'>+	int		ecause;</div><div class='add'>+	int		exopc;</div><div class='add'>+	long		exceptdet0;</div><div class='add'>+	int		exceptdet1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Instruction formats</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generic instruction format.</div><div class='add'>+ * This definition has precise bit field definitions.</div><div class='add'>+ */</div><div class='add'>+struct gru_instruction_bits {</div><div class='add'>+    /* DW 0  - low */</div><div class='add'>+    unsigned int		icmd:      1;</div><div class='add'>+    unsigned char		ima:	   3;	/* CB_DelRep, unmapped mode */</div><div class='add'>+    unsigned char		reserved0: 4;</div><div class='add'>+    unsigned int		xtype:     3;</div><div class='add'>+    unsigned int		iaa0:      2;</div><div class='add'>+    unsigned int		iaa1:      2;</div><div class='add'>+    unsigned char		reserved1: 1;</div><div class='add'>+    unsigned char		opc:       8;	/* opcode */</div><div class='add'>+    unsigned char		exopc:     8;	/* extended opcode */</div><div class='add'>+    /* DW 0  - high */</div><div class='add'>+    unsigned int		idef2:    22;	/* TRi0 */</div><div class='add'>+    unsigned char		reserved2: 2;</div><div class='add'>+    unsigned char		istatus:   2;</div><div class='add'>+    unsigned char		isubstatus:4;</div><div class='add'>+    unsigned char		reserved3: 2;</div><div class='add'>+    /* DW 1 */</div><div class='add'>+    unsigned long		idef4;		/* 42 bits: TRi1, BufSize */</div><div class='add'>+    /* DW 2-6 */</div><div class='add'>+    unsigned long		idef1;		/* BAddr0 */</div><div class='add'>+    unsigned long		idef5;		/* Nelem */</div><div class='add'>+    unsigned long		idef6;		/* Stride, Operand1 */</div><div class='add'>+    unsigned long		idef3;		/* BAddr1, Value, Operand2 */</div><div class='add'>+    unsigned long		reserved4;</div><div class='add'>+    /* DW 7 */</div><div class='add'>+    unsigned long		avalue;		 /* AValue */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generic instruction with friendlier names. This format is used</div><div class='add'>+ * for inline instructions.</div><div class='add'>+ */</div><div class='add'>+struct gru_instruction {</div><div class='add'>+    /* DW 0 */</div><div class='add'>+    unsigned int		op32;    /* icmd,xtype,iaa0,ima,opc */</div><div class='add'>+    unsigned int		tri0;</div><div class='add'>+    unsigned long		tri1_bufsize;		/* DW 1 */</div><div class='add'>+    unsigned long		baddr0;			/* DW 2 */</div><div class='add'>+    unsigned long		nelem;			/* DW 3 */</div><div class='add'>+    unsigned long		op1_stride;		/* DW 4 */</div><div class='add'>+    unsigned long		op2_value_baddr1;	/* DW 5 */</div><div class='add'>+    unsigned long		reserved0;		/* DW 6 */</div><div class='add'>+    unsigned long		avalue;			/* DW 7 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Some shifts and masks for the low 32 bits of a GRU command */</div><div class='add'>+#define GRU_CB_ICMD_SHFT	0</div><div class='add'>+#define GRU_CB_ICMD_MASK	0x1</div><div class='add'>+#define GRU_CB_XTYPE_SHFT	8</div><div class='add'>+#define GRU_CB_XTYPE_MASK	0x7</div><div class='add'>+#define GRU_CB_IAA0_SHFT	11</div><div class='add'>+#define GRU_CB_IAA0_MASK	0x3</div><div class='add'>+#define GRU_CB_IAA1_SHFT	13</div><div class='add'>+#define GRU_CB_IAA1_MASK	0x3</div><div class='add'>+#define GRU_CB_IMA_SHFT		1</div><div class='add'>+#define GRU_CB_IMA_MASK		0x3</div><div class='add'>+#define GRU_CB_OPC_SHFT		16</div><div class='add'>+#define GRU_CB_OPC_MASK		0xff</div><div class='add'>+#define GRU_CB_EXOPC_SHFT	24</div><div class='add'>+#define GRU_CB_EXOPC_MASK	0xff</div><div class='add'>+</div><div class='add'>+/* GRU instruction opcodes (opc field) */</div><div class='add'>+#define OP_NOP		0x00</div><div class='add'>+#define OP_BCOPY	0x01</div><div class='add'>+#define OP_VLOAD	0x02</div><div class='add'>+#define OP_IVLOAD	0x03</div><div class='add'>+#define OP_VSTORE	0x04</div><div class='add'>+#define OP_IVSTORE	0x05</div><div class='add'>+#define OP_VSET		0x06</div><div class='add'>+#define OP_IVSET	0x07</div><div class='add'>+#define OP_MESQ		0x08</div><div class='add'>+#define OP_GAMXR	0x09</div><div class='add'>+#define OP_GAMIR	0x0a</div><div class='add'>+#define OP_GAMIRR	0x0b</div><div class='add'>+#define OP_GAMER	0x0c</div><div class='add'>+#define OP_GAMERR	0x0d</div><div class='add'>+#define OP_BSTORE	0x0e</div><div class='add'>+#define OP_VFLUSH	0x0f</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Extended opcodes values (exopc field) */</div><div class='add'>+</div><div class='add'>+/* GAMIR - AMOs with implicit operands */</div><div class='add'>+#define EOP_IR_FETCH	0x01 /* Plain fetch of memory */</div><div class='add'>+#define EOP_IR_CLR	0x02 /* Fetch and clear */</div><div class='add'>+#define EOP_IR_INC	0x05 /* Fetch and increment */</div><div class='add'>+#define EOP_IR_DEC	0x07 /* Fetch and decrement */</div><div class='add'>+#define EOP_IR_QCHK1	0x0d /* Queue check, 64 byte msg */</div><div class='add'>+#define EOP_IR_QCHK2	0x0e /* Queue check, 128 byte msg */</div><div class='add'>+</div><div class='add'>+/* GAMIRR - Registered AMOs with implicit operands */</div><div class='add'>+#define EOP_IRR_FETCH	0x01 /* Registered fetch of memory */</div><div class='add'>+#define EOP_IRR_CLR	0x02 /* Registered fetch and clear */</div><div class='add'>+#define EOP_IRR_INC	0x05 /* Registered fetch and increment */</div><div class='add'>+#define EOP_IRR_DEC	0x07 /* Registered fetch and decrement */</div><div class='add'>+#define EOP_IRR_DECZ	0x0f /* Registered fetch and decrement, update on zero*/</div><div class='add'>+</div><div class='add'>+/* GAMER - AMOs with explicit operands */</div><div class='add'>+#define EOP_ER_SWAP	0x00 /* Exchange argument and memory */</div><div class='add'>+#define EOP_ER_OR	0x01 /* Logical OR with memory */</div><div class='add'>+#define EOP_ER_AND	0x02 /* Logical AND with memory */</div><div class='add'>+#define EOP_ER_XOR	0x03 /* Logical XOR with memory */</div><div class='add'>+#define EOP_ER_ADD	0x04 /* Add value to memory */</div><div class='add'>+#define EOP_ER_CSWAP	0x08 /* Compare with operand2, write operand1 if match*/</div><div class='add'>+#define EOP_ER_CADD	0x0c /* Queue check, operand1*64 byte msg */</div><div class='add'>+</div><div class='add'>+/* GAMERR - Registered AMOs with explicit operands */</div><div class='add'>+#define EOP_ERR_SWAP	0x00 /* Exchange argument and memory */</div><div class='add'>+#define EOP_ERR_OR	0x01 /* Logical OR with memory */</div><div class='add'>+#define EOP_ERR_AND	0x02 /* Logical AND with memory */</div><div class='add'>+#define EOP_ERR_XOR	0x03 /* Logical XOR with memory */</div><div class='add'>+#define EOP_ERR_ADD	0x04 /* Add value to memory */</div><div class='add'>+#define EOP_ERR_CSWAP	0x08 /* Compare with operand2, write operand1 if match*/</div><div class='add'>+#define EOP_ERR_EPOLL	0x09 /* Poll for equality */</div><div class='add'>+#define EOP_ERR_NPOLL	0x0a /* Poll for inequality */</div><div class='add'>+</div><div class='add'>+/* GAMXR - SGI Arithmetic unit */</div><div class='add'>+#define EOP_XR_CSWAP	0x0b /* Masked compare exchange */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Transfer types (xtype field) */</div><div class='add'>+#define XTYPE_B		0x0	/* byte */</div><div class='add'>+#define XTYPE_S		0x1	/* short (2-byte) */</div><div class='add'>+#define XTYPE_W		0x2	/* word (4-byte) */</div><div class='add'>+#define XTYPE_DW	0x3	/* doubleword (8-byte) */</div><div class='add'>+#define XTYPE_CL	0x6	/* cacheline (64-byte) */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Instruction access attributes (iaa0, iaa1 fields) */</div><div class='add'>+#define IAA_RAM		0x0	/* normal cached RAM access */</div><div class='add'>+#define IAA_NCRAM	0x2	/* noncoherent RAM access */</div><div class='add'>+#define IAA_MMIO	0x1	/* noncoherent memory-mapped I/O space */</div><div class='add'>+#define IAA_REGISTER	0x3	/* memory-mapped registers, etc. */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Instruction mode attributes (ima field) */</div><div class='add'>+#define IMA_MAPPED	0x0	/* Virtual mode  */</div><div class='add'>+#define IMA_CB_DELAY	0x1	/* hold read responses until status changes */</div><div class='add'>+#define IMA_UNMAPPED	0x2	/* bypass the TLBs (OS only) */</div><div class='add'>+#define IMA_INTERRUPT	0x4	/* Interrupt when instruction completes */</div><div class='add'>+</div><div class='add'>+/* CBE ecause bits */</div><div class='add'>+#define CBE_CAUSE_RI				(1 &lt;&lt; 0)</div><div class='add'>+#define CBE_CAUSE_INVALID_INSTRUCTION		(1 &lt;&lt; 1)</div><div class='add'>+#define CBE_CAUSE_UNMAPPED_MODE_FORBIDDEN	(1 &lt;&lt; 2)</div><div class='add'>+#define CBE_CAUSE_PE_CHECK_DATA_ERROR		(1 &lt;&lt; 3)</div><div class='add'>+#define CBE_CAUSE_IAA_GAA_MISMATCH		(1 &lt;&lt; 4)</div><div class='add'>+#define CBE_CAUSE_DATA_SEGMENT_LIMIT_EXCEPTION	(1 &lt;&lt; 5)</div><div class='add'>+#define CBE_CAUSE_OS_FATAL_TLB_FAULT		(1 &lt;&lt; 6)</div><div class='add'>+#define CBE_CAUSE_EXECUTION_HW_ERROR		(1 &lt;&lt; 7)</div><div class='add'>+#define CBE_CAUSE_TLBHW_ERROR			(1 &lt;&lt; 8)</div><div class='add'>+#define CBE_CAUSE_RA_REQUEST_TIMEOUT		(1 &lt;&lt; 9)</div><div class='add'>+#define CBE_CAUSE_HA_REQUEST_TIMEOUT		(1 &lt;&lt; 10)</div><div class='add'>+#define CBE_CAUSE_RA_RESPONSE_FATAL		(1 &lt;&lt; 11)</div><div class='add'>+#define CBE_CAUSE_RA_RESPONSE_NON_FATAL		(1 &lt;&lt; 12)</div><div class='add'>+#define CBE_CAUSE_HA_RESPONSE_FATAL		(1 &lt;&lt; 13)</div><div class='add'>+#define CBE_CAUSE_HA_RESPONSE_NON_FATAL		(1 &lt;&lt; 14)</div><div class='add'>+#define CBE_CAUSE_ADDRESS_SPACE_DECODE_ERROR	(1 &lt;&lt; 15)</div><div class='add'>+#define CBE_CAUSE_RESPONSE_DATA_ERROR		(1 &lt;&lt; 16)</div><div class='add'>+#define CBE_CAUSE_PROTOCOL_STATE_DATA_ERROR	(1 &lt;&lt; 17)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Exceptions are retried for the following cases. If any OTHER bits are set</div><div class='add'>+ * in ecause, the exception is not retryable.</div><div class='add'>+ */</div><div class='add'>+#define EXCEPTION_RETRY_BITS (CBE_CAUSE_RESPONSE_DATA_ERROR |		\</div><div class='add'>+			      CBE_CAUSE_RA_REQUEST_TIMEOUT |		\</div><div class='add'>+			      CBE_CAUSE_TLBHW_ERROR |			\</div><div class='add'>+			      CBE_CAUSE_HA_REQUEST_TIMEOUT)</div><div class='add'>+</div><div class='add'>+/* Message queue head structure */</div><div class='add'>+union gru_mesqhead {</div><div class='add'>+	unsigned long	val;</div><div class='add'>+	struct {</div><div class='add'>+		unsigned int	head;</div><div class='add'>+		unsigned int	limit;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Generate the low word of a GRU instruction */</div><div class='add'>+static inline unsigned int</div><div class='add'>+__opword(unsigned char opcode, unsigned char exopc, unsigned char xtype,</div><div class='add'>+       unsigned char iaa0, unsigned char iaa1,</div><div class='add'>+       unsigned char ima)</div><div class='add'>+{</div><div class='add'>+    return (1 &lt;&lt; GRU_CB_ICMD_SHFT) |</div><div class='add'>+	   (iaa0 &lt;&lt; GRU_CB_IAA0_SHFT) |</div><div class='add'>+	   (iaa1 &lt;&lt; GRU_CB_IAA1_SHFT) |</div><div class='add'>+	   (ima &lt;&lt; GRU_CB_IMA_SHFT) |</div><div class='add'>+	   (xtype &lt;&lt; GRU_CB_XTYPE_SHFT) |</div><div class='add'>+	   (opcode &lt;&lt; GRU_CB_OPC_SHFT) |</div><div class='add'>+	   (exopc &lt;&lt; GRU_CB_EXOPC_SHFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Architecture specific intrinsics</div><div class='add'>+ */</div><div class='add'>+static inline void gru_flush_cache(void *p)</div><div class='add'>+{</div><div class='add'>+	__flush_cache(p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Store the lower 32 bits of the command including the "start" bit. Then</div><div class='add'>+ * start the instruction executing.</div><div class='add'>+ */</div><div class='add'>+static inline void gru_start_instruction(struct gru_instruction *ins, int op32)</div><div class='add'>+{</div><div class='add'>+	gru_ordered_store_int(ins, op32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Convert "hints" to IMA */</div><div class='add'>+#define CB_IMA(h)		((h) | IMA_UNMAPPED)</div><div class='add'>+</div><div class='add'>+/* Convert data segment cache line index into TRI0 / TRI1 value */</div><div class='add'>+#define GRU_DINDEX(i)		((i) * GRU_CACHE_LINE_BYTES)</div><div class='add'>+</div><div class='add'>+/* Inline functions for GRU instructions.</div><div class='add'>+ *     Note:</div><div class='add'>+ *     	- nelem and stride are in elements</div><div class='add'>+ *     	- tri0/tri1 is in bytes for the beginning of the data segment.</div><div class='add'>+ */</div><div class='add'>+static inline void gru_vload(void *cb, unsigned long mem_addr,</div><div class='add'>+		unsigned int tri0, unsigned char xtype, unsigned long nelem,</div><div class='add'>+		unsigned long stride, unsigned long hints)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (struct gru_instruction *)cb;</div><div class='add'>+</div><div class='add'>+	ins-&gt;baddr0 = (long)mem_addr;</div><div class='add'>+	ins-&gt;nelem = nelem;</div><div class='add'>+	ins-&gt;tri0 = tri0;</div><div class='add'>+	ins-&gt;op1_stride = stride;</div><div class='add'>+	gru_start_instruction(ins, __opword(OP_VLOAD, 0, xtype, IAA_RAM, 0,</div><div class='add'>+					CB_IMA(hints)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gru_vstore(void *cb, unsigned long mem_addr,</div><div class='add'>+		unsigned int tri0, unsigned char xtype, unsigned long nelem,</div><div class='add'>+		unsigned long stride, unsigned long hints)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	ins-&gt;baddr0 = (long)mem_addr;</div><div class='add'>+	ins-&gt;nelem = nelem;</div><div class='add'>+	ins-&gt;tri0 = tri0;</div><div class='add'>+	ins-&gt;op1_stride = stride;</div><div class='add'>+	gru_start_instruction(ins, __opword(OP_VSTORE, 0, xtype, IAA_RAM, 0,</div><div class='add'>+					CB_IMA(hints)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gru_ivload(void *cb, unsigned long mem_addr,</div><div class='add'>+		unsigned int tri0, unsigned int tri1, unsigned char xtype,</div><div class='add'>+		unsigned long nelem, unsigned long hints)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	ins-&gt;baddr0 = (long)mem_addr;</div><div class='add'>+	ins-&gt;nelem = nelem;</div><div class='add'>+	ins-&gt;tri0 = tri0;</div><div class='add'>+	ins-&gt;tri1_bufsize = tri1;</div><div class='add'>+	gru_start_instruction(ins, __opword(OP_IVLOAD, 0, xtype, IAA_RAM, 0,</div><div class='add'>+					CB_IMA(hints)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gru_ivstore(void *cb, unsigned long mem_addr,</div><div class='add'>+		unsigned int tri0, unsigned int tri1,</div><div class='add'>+		unsigned char xtype, unsigned long nelem, unsigned long hints)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	ins-&gt;baddr0 = (long)mem_addr;</div><div class='add'>+	ins-&gt;nelem = nelem;</div><div class='add'>+	ins-&gt;tri0 = tri0;</div><div class='add'>+	ins-&gt;tri1_bufsize = tri1;</div><div class='add'>+	gru_start_instruction(ins, __opword(OP_IVSTORE, 0, xtype, IAA_RAM, 0,</div><div class='add'>+					CB_IMA(hints)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gru_vset(void *cb, unsigned long mem_addr,</div><div class='add'>+		unsigned long value, unsigned char xtype, unsigned long nelem,</div><div class='add'>+		unsigned long stride, unsigned long hints)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	ins-&gt;baddr0 = (long)mem_addr;</div><div class='add'>+	ins-&gt;op2_value_baddr1 = value;</div><div class='add'>+	ins-&gt;nelem = nelem;</div><div class='add'>+	ins-&gt;op1_stride = stride;</div><div class='add'>+	gru_start_instruction(ins, __opword(OP_VSET, 0, xtype, IAA_RAM, 0,</div><div class='add'>+					 CB_IMA(hints)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gru_ivset(void *cb, unsigned long mem_addr,</div><div class='add'>+		unsigned int tri1, unsigned long value, unsigned char xtype,</div><div class='add'>+		unsigned long nelem, unsigned long hints)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	ins-&gt;baddr0 = (long)mem_addr;</div><div class='add'>+	ins-&gt;op2_value_baddr1 = value;</div><div class='add'>+	ins-&gt;nelem = nelem;</div><div class='add'>+	ins-&gt;tri1_bufsize = tri1;</div><div class='add'>+	gru_start_instruction(ins, __opword(OP_IVSET, 0, xtype, IAA_RAM, 0,</div><div class='add'>+					CB_IMA(hints)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gru_vflush(void *cb, unsigned long mem_addr,</div><div class='add'>+		unsigned long nelem, unsigned char xtype, unsigned long stride,</div><div class='add'>+		unsigned long hints)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	ins-&gt;baddr0 = (long)mem_addr;</div><div class='add'>+	ins-&gt;op1_stride = stride;</div><div class='add'>+	ins-&gt;nelem = nelem;</div><div class='add'>+	gru_start_instruction(ins, __opword(OP_VFLUSH, 0, xtype, IAA_RAM, 0,</div><div class='add'>+					CB_IMA(hints)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gru_nop(void *cb, int hints)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	gru_start_instruction(ins, __opword(OP_NOP, 0, 0, 0, 0, CB_IMA(hints)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline void gru_bcopy(void *cb, const unsigned long src,</div><div class='add'>+		unsigned long dest,</div><div class='add'>+		unsigned int tri0, unsigned int xtype, unsigned long nelem,</div><div class='add'>+		unsigned int bufsize, unsigned long hints)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	ins-&gt;baddr0 = (long)src;</div><div class='add'>+	ins-&gt;op2_value_baddr1 = (long)dest;</div><div class='add'>+	ins-&gt;nelem = nelem;</div><div class='add'>+	ins-&gt;tri0 = tri0;</div><div class='add'>+	ins-&gt;tri1_bufsize = bufsize;</div><div class='add'>+	gru_start_instruction(ins, __opword(OP_BCOPY, 0, xtype, IAA_RAM,</div><div class='add'>+					IAA_RAM, CB_IMA(hints)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gru_bstore(void *cb, const unsigned long src,</div><div class='add'>+		unsigned long dest, unsigned int tri0, unsigned int xtype,</div><div class='add'>+		unsigned long nelem, unsigned long hints)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	ins-&gt;baddr0 = (long)src;</div><div class='add'>+	ins-&gt;op2_value_baddr1 = (long)dest;</div><div class='add'>+	ins-&gt;nelem = nelem;</div><div class='add'>+	ins-&gt;tri0 = tri0;</div><div class='add'>+	gru_start_instruction(ins, __opword(OP_BSTORE, 0, xtype, 0, IAA_RAM,</div><div class='add'>+					CB_IMA(hints)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gru_gamir(void *cb, int exopc, unsigned long src,</div><div class='add'>+		unsigned int xtype, unsigned long hints)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	ins-&gt;baddr0 = (long)src;</div><div class='add'>+	gru_start_instruction(ins, __opword(OP_GAMIR, exopc, xtype, IAA_RAM, 0,</div><div class='add'>+					CB_IMA(hints)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gru_gamirr(void *cb, int exopc, unsigned long src,</div><div class='add'>+		unsigned int xtype, unsigned long hints)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	ins-&gt;baddr0 = (long)src;</div><div class='add'>+	gru_start_instruction(ins, __opword(OP_GAMIRR, exopc, xtype, IAA_RAM, 0,</div><div class='add'>+					CB_IMA(hints)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gru_gamer(void *cb, int exopc, unsigned long src,</div><div class='add'>+		unsigned int xtype,</div><div class='add'>+		unsigned long operand1, unsigned long operand2,</div><div class='add'>+		unsigned long hints)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	ins-&gt;baddr0 = (long)src;</div><div class='add'>+	ins-&gt;op1_stride = operand1;</div><div class='add'>+	ins-&gt;op2_value_baddr1 = operand2;</div><div class='add'>+	gru_start_instruction(ins, __opword(OP_GAMER, exopc, xtype, IAA_RAM, 0,</div><div class='add'>+					CB_IMA(hints)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gru_gamerr(void *cb, int exopc, unsigned long src,</div><div class='add'>+		unsigned int xtype, unsigned long operand1,</div><div class='add'>+		unsigned long operand2, unsigned long hints)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	ins-&gt;baddr0 = (long)src;</div><div class='add'>+	ins-&gt;op1_stride = operand1;</div><div class='add'>+	ins-&gt;op2_value_baddr1 = operand2;</div><div class='add'>+	gru_start_instruction(ins, __opword(OP_GAMERR, exopc, xtype, IAA_RAM, 0,</div><div class='add'>+					CB_IMA(hints)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gru_gamxr(void *cb, unsigned long src,</div><div class='add'>+		unsigned int tri0, unsigned long hints)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	ins-&gt;baddr0 = (long)src;</div><div class='add'>+	ins-&gt;nelem = 4;</div><div class='add'>+	gru_start_instruction(ins, __opword(OP_GAMXR, EOP_XR_CSWAP, XTYPE_DW,</div><div class='add'>+				 IAA_RAM, 0, CB_IMA(hints)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gru_mesq(void *cb, unsigned long queue,</div><div class='add'>+		unsigned long tri0, unsigned long nelem,</div><div class='add'>+		unsigned long hints)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	ins-&gt;baddr0 = (long)queue;</div><div class='add'>+	ins-&gt;nelem = nelem;</div><div class='add'>+	ins-&gt;tri0 = tri0;</div><div class='add'>+	gru_start_instruction(ins, __opword(OP_MESQ, 0, XTYPE_CL, IAA_RAM, 0,</div><div class='add'>+					CB_IMA(hints)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long gru_get_amo_value(void *cb)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	return ins-&gt;avalue;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gru_get_amo_value_head(void *cb)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	return ins-&gt;avalue &amp; 0xffffffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gru_get_amo_value_limit(void *cb)</div><div class='add'>+{</div><div class='add'>+	struct gru_instruction *ins = (void *)cb;</div><div class='add'>+</div><div class='add'>+	return ins-&gt;avalue &gt;&gt; 32;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline union gru_mesqhead  gru_mesq_head(int head, int limit)</div><div class='add'>+{</div><div class='add'>+	union gru_mesqhead mqh;</div><div class='add'>+</div><div class='add'>+	mqh.head = head;</div><div class='add'>+	mqh.limit = limit;</div><div class='add'>+	return mqh;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get struct control_block_extended_exc_detail for CB.</div><div class='add'>+ */</div><div class='add'>+extern int gru_get_cb_exception_detail(void *cb,</div><div class='add'>+		       struct control_block_extended_exc_detail *excdet);</div><div class='add'>+</div><div class='add'>+#define GRU_EXC_STR_SIZE		256</div><div class='add'>+</div><div class='add'>+extern int gru_check_status_proc(void *cb);</div><div class='add'>+extern int gru_wait_proc(void *cb);</div><div class='add'>+extern void gru_wait_abort_proc(void *cb);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Control block definition for checking status</div><div class='add'>+ */</div><div class='add'>+struct gru_control_block_status {</div><div class='add'>+	unsigned int	icmd		:1;</div><div class='add'>+	unsigned int	unused1		:31;</div><div class='add'>+	unsigned int	unused2		:24;</div><div class='add'>+	unsigned int	istatus		:2;</div><div class='add'>+	unsigned int	isubstatus	:4;</div><div class='add'>+	unsigned int	inused3		:2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Get CB status */</div><div class='add'>+static inline int gru_get_cb_status(void *cb)</div><div class='add'>+{</div><div class='add'>+	struct gru_control_block_status *cbs = (void *)cb;</div><div class='add'>+</div><div class='add'>+	return cbs-&gt;istatus;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get CB message queue substatus */</div><div class='add'>+static inline int gru_get_cb_message_queue_substatus(void *cb)</div><div class='add'>+{</div><div class='add'>+	struct gru_control_block_status *cbs = (void *)cb;</div><div class='add'>+</div><div class='add'>+	return cbs-&gt;isubstatus &amp; CBSS_MSG_QUEUE_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get CB substatus */</div><div class='add'>+static inline int gru_get_cb_substatus(void *cb)</div><div class='add'>+{</div><div class='add'>+	struct gru_control_block_status *cbs = (void *)cb;</div><div class='add'>+</div><div class='add'>+	return cbs-&gt;isubstatus;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check the status of a CB. If the CB is in UPM mode, call the</div><div class='add'>+ * OS to handle the UPM status.</div><div class='add'>+ * Returns the CB status field value (0 for normal completion)</div><div class='add'>+ */</div><div class='add'>+static inline int gru_check_status(void *cb)</div><div class='add'>+{</div><div class='add'>+	struct gru_control_block_status *cbs = (void *)cb;</div><div class='add'>+	int ret = cbs-&gt;istatus;</div><div class='add'>+</div><div class='add'>+	if (ret == CBS_CALL_OS)</div><div class='add'>+		ret = gru_check_status_proc(cb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Wait for CB to complete.</div><div class='add'>+ * Returns the CB status field value (0 for normal completion)</div><div class='add'>+ */</div><div class='add'>+static inline int gru_wait(void *cb)</div><div class='add'>+{</div><div class='add'>+	struct gru_control_block_status *cbs = (void *)cb;</div><div class='add'>+	int ret = cbs-&gt;istatus;;</div><div class='add'>+</div><div class='add'>+	if (ret != CBS_IDLE)</div><div class='add'>+		ret = gru_wait_proc(cb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Wait for CB to complete. Aborts program if error. (Note: error does NOT</div><div class='add'>+ * mean TLB mis - only fatal errors such as memory parity error or user</div><div class='add'>+ * bugs will cause termination.</div><div class='add'>+ */</div><div class='add'>+static inline void gru_wait_abort(void *cb)</div><div class='add'>+{</div><div class='add'>+	struct gru_control_block_status *cbs = (void *)cb;</div><div class='add'>+</div><div class='add'>+	if (cbs-&gt;istatus != CBS_IDLE)</div><div class='add'>+		gru_wait_abort_proc(cb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get a pointer to a control block</div><div class='add'>+ * 	gseg	- GSeg address returned from gru_get_thread_gru_segment()</div><div class='add'>+ * 	index	- index of desired CB</div><div class='add'>+ */</div><div class='add'>+static inline void *gru_get_cb_pointer(void *gseg,</div><div class='add'>+						      int index)</div><div class='add'>+{</div><div class='add'>+	return gseg + GRU_CB_BASE + index * GRU_HANDLE_STRIDE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get a pointer to a cacheline in the data segment portion of a GSeg</div><div class='add'>+ * 	gseg	- GSeg address returned from gru_get_thread_gru_segment()</div><div class='add'>+ * 	index	- index of desired cache line</div><div class='add'>+ */</div><div class='add'>+static inline void *gru_get_data_pointer(void *gseg, int index)</div><div class='add'>+{</div><div class='add'>+	return gseg + GRU_DS_BASE + index * GRU_CACHE_LINE_BYTES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert a vaddr into the tri index within the GSEG</div><div class='add'>+ * 	vaddr		- virtual address of within gseg</div><div class='add'>+ */</div><div class='add'>+static inline int gru_get_tri(void *vaddr)</div><div class='add'>+{</div><div class='add'>+	return ((unsigned long)vaddr &amp; (GRU_GSEG_PAGESIZE - 1)) - GRU_DS_BASE;</div><div class='add'>+}</div><div class='add'>+#endif		/* __GRU_INSTRUCTIONS_H__ */</div><div class='head'>diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c<br/>new file mode 100644<br/>index 000000000000..3d33015bbf31<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-gru/grufault.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/grufault.c</a></div><div class='hunk'>@@ -0,0 +1,633 @@</div><div class='add'>+/*</div><div class='add'>+ * SN Platform GRU Driver</div><div class='add'>+ *</div><div class='add'>+ *              FAULT HANDLER FOR GRU DETECTED TLB MISSES</div><div class='add'>+ *</div><div class='add'>+ * This file contains code that handles TLB misses within the GRU.</div><div class='add'>+ * These misses are reported either via interrupts or user polling of</div><div class='add'>+ * the user CB.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/hugetlb.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include "gru.h"</div><div class='add'>+#include "grutables.h"</div><div class='add'>+#include "grulib.h"</div><div class='add'>+#include "gru_instructions.h"</div><div class='add'>+#include &lt;asm/uv/uv_hub.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test if a physical address is a valid GRU GSEG address</div><div class='add'>+ */</div><div class='add'>+static inline int is_gru_paddr(unsigned long paddr)</div><div class='add'>+{</div><div class='add'>+	return paddr &gt;= gru_start_paddr &amp;&amp; paddr &lt; gru_end_paddr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find the vma of a GRU segment. Caller must hold mmap_sem.</div><div class='add'>+ */</div><div class='add'>+struct vm_area_struct *gru_find_vma(unsigned long vaddr)</div><div class='add'>+{</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+</div><div class='add'>+	vma = find_vma(current-&gt;mm, vaddr);</div><div class='add'>+	if (vma &amp;&amp; vma-&gt;vm_start &lt;= vaddr &amp;&amp; vma-&gt;vm_ops == &amp;gru_vm_ops)</div><div class='add'>+		return vma;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find and lock the gts that contains the specified user vaddr.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * 	- *gts with the mmap_sem locked for read and the GTS locked.</div><div class='add'>+ *	- NULL if vaddr invalid OR is not a valid GSEG vaddr.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct gru_thread_state *gru_find_lock_gts(unsigned long vaddr)</div><div class='add'>+{</div><div class='add'>+	struct mm_struct *mm = current-&gt;mm;</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+	struct gru_thread_state *gts = NULL;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;mm-&gt;mmap_sem);</div><div class='add'>+	vma = gru_find_vma(vaddr);</div><div class='add'>+	if (vma)</div><div class='add'>+		gts = gru_find_thread_state(vma, TSID(vaddr, vma));</div><div class='add'>+	if (gts)</div><div class='add'>+		mutex_lock(&amp;gts-&gt;ts_ctxlock);</div><div class='add'>+	else</div><div class='add'>+		up_read(&amp;mm-&gt;mmap_sem);</div><div class='add'>+	return gts;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct gru_thread_state *gru_alloc_locked_gts(unsigned long vaddr)</div><div class='add'>+{</div><div class='add'>+	struct mm_struct *mm = current-&gt;mm;</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+	struct gru_thread_state *gts = NULL;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;mm-&gt;mmap_sem);</div><div class='add'>+	vma = gru_find_vma(vaddr);</div><div class='add'>+	if (vma)</div><div class='add'>+		gts = gru_alloc_thread_state(vma, TSID(vaddr, vma));</div><div class='add'>+	if (gts) {</div><div class='add'>+		mutex_lock(&amp;gts-&gt;ts_ctxlock);</div><div class='add'>+		downgrade_write(&amp;mm-&gt;mmap_sem);</div><div class='add'>+	} else {</div><div class='add'>+		up_write(&amp;mm-&gt;mmap_sem);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return gts;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Unlock a GTS that was previously locked with gru_find_lock_gts().</div><div class='add'>+ */</div><div class='add'>+static void gru_unlock_gts(struct gru_thread_state *gts)</div><div class='add'>+{</div><div class='add'>+	mutex_unlock(&amp;gts-&gt;ts_ctxlock);</div><div class='add'>+	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set a CB.istatus to active using a user virtual address. This must be done</div><div class='add'>+ * just prior to a TFH RESTART. The new cb.istatus is an in-cache status ONLY.</div><div class='add'>+ * If the line is evicted, the status may be lost. The in-cache update</div><div class='add'>+ * is necessary to prevent the user from seeing a stale cb.istatus that will</div><div class='add'>+ * change as soon as the TFH restart is complete. Races may cause an</div><div class='add'>+ * occasional failure to clear the cb.istatus, but that is ok.</div><div class='add'>+ *</div><div class='add'>+ * If the cb address is not valid (should not happen, but...), nothing</div><div class='add'>+ * bad will happen.. The get_user()/put_user() will fail but there</div><div class='add'>+ * are no bad side-effects.</div><div class='add'>+ */</div><div class='add'>+static void gru_cb_set_istatus_active(unsigned long __user *cb)</div><div class='add'>+{</div><div class='add'>+	union {</div><div class='add'>+		struct gru_instruction_bits bits;</div><div class='add'>+		unsigned long dw;</div><div class='add'>+	} u;</div><div class='add'>+</div><div class='add'>+	if (cb) {</div><div class='add'>+		get_user(u.dw, cb);</div><div class='add'>+		u.bits.istatus = CBS_ACTIVE;</div><div class='add'>+		put_user(u.dw, cb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert a interrupt IRQ to a pointer to the GRU GTS that caused the</div><div class='add'>+ * interrupt. Interrupts are always sent to a cpu on the blade that contains the</div><div class='add'>+ * GRU (except for headless blades which are not currently supported). A blade</div><div class='add'>+ * has N grus; a block of N consecutive IRQs is assigned to the GRUs. The IRQ</div><div class='add'>+ * number uniquely identifies the GRU chiplet on the local blade that caused the</div><div class='add'>+ * interrupt. Always called in interrupt context.</div><div class='add'>+ */</div><div class='add'>+static inline struct gru_state *irq_to_gru(int irq)</div><div class='add'>+{</div><div class='add'>+	return &amp;gru_base[uv_numa_blade_id()]-&gt;bs_grus[irq - IRQ_GRU];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read &amp; clear a TFM</div><div class='add'>+ *</div><div class='add'>+ * The GRU has an array of fault maps. A map is private to a cpu</div><div class='add'>+ * Only one cpu will be accessing a cpu's fault map.</div><div class='add'>+ *</div><div class='add'>+ * This function scans the cpu-private fault map &amp; clears all bits that</div><div class='add'>+ * are set. The function returns a bitmap that indicates the bits that</div><div class='add'>+ * were cleared. Note that sense the maps may be updated asynchronously by</div><div class='add'>+ * the GRU, atomic operations must be used to clear bits.</div><div class='add'>+ */</div><div class='add'>+static void get_clear_fault_map(struct gru_state *gru,</div><div class='add'>+				struct gru_tlb_fault_map *map)</div><div class='add'>+{</div><div class='add'>+	unsigned long i, k;</div><div class='add'>+	struct gru_tlb_fault_map *tfm;</div><div class='add'>+</div><div class='add'>+	tfm = get_tfm_for_cpu(gru, gru_cpu_fault_map_id());</div><div class='add'>+	prefetchw(tfm);		/* Helps on hardware, required for emulator */</div><div class='add'>+	for (i = 0; i &lt; BITS_TO_LONGS(GRU_NUM_CBE); i++) {</div><div class='add'>+		k = tfm-&gt;fault_bits[i];</div><div class='add'>+		if (k)</div><div class='add'>+			k = xchg(&amp;tfm-&gt;fault_bits[i], 0UL);</div><div class='add'>+		map-&gt;fault_bits[i] = k;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Not functionally required but helps performance. (Required</div><div class='add'>+	 * on emulator)</div><div class='add'>+	 */</div><div class='add'>+	gru_flush_cache(tfm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Atomic (interrupt context) &amp; non-atomic (user context) functions to</div><div class='add'>+ * convert a vaddr into a physical address. The size of the page</div><div class='add'>+ * is returned in pageshift.</div><div class='add'>+ * 	returns:</div><div class='add'>+ * 		  0 - successful</div><div class='add'>+ * 		&lt; 0 - error code</div><div class='add'>+ * 		  1 - (atomic only) try again in non-atomic context</div><div class='add'>+ */</div><div class='add'>+static int non_atomic_pte_lookup(struct vm_area_struct *vma,</div><div class='add'>+				 unsigned long vaddr, int write,</div><div class='add'>+				 unsigned long *paddr, int *pageshift)</div><div class='add'>+{</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	/* ZZZ Need to handle HUGE pages */</div><div class='add'>+	if (is_vm_hugetlb_page(vma))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	*pageshift = PAGE_SHIFT;</div><div class='add'>+	if (get_user_pages</div><div class='add'>+	    (current, current-&gt;mm, vaddr, 1, write, 0, &amp;page, NULL) &lt;= 0)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	*paddr = page_to_phys(page);</div><div class='add'>+	put_page(page);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * atomic_pte_lookup</div><div class='add'>+ *</div><div class='add'>+ * Convert a user virtual address to a physical address</div><div class='add'>+ * Only supports Intel large pages (2MB only) on x86_64.</div><div class='add'>+ *	ZZZ - hugepage support is incomplete</div><div class='add'>+ */</div><div class='add'>+static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr,</div><div class='add'>+	int write, unsigned long *paddr, int *pageshift)</div><div class='add'>+{</div><div class='add'>+	pgd_t *pgdp;</div><div class='add'>+	pmd_t *pmdp;</div><div class='add'>+	pud_t *pudp;</div><div class='add'>+	pte_t pte;</div><div class='add'>+</div><div class='add'>+	WARN_ON(irqs_disabled());		/* ZZZ debug */</div><div class='add'>+</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	pgdp = pgd_offset(vma-&gt;vm_mm, vaddr);</div><div class='add'>+	if (unlikely(pgd_none(*pgdp)))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	pudp = pud_offset(pgdp, vaddr);</div><div class='add'>+	if (unlikely(pud_none(*pudp)))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	pmdp = pmd_offset(pudp, vaddr);</div><div class='add'>+	if (unlikely(pmd_none(*pmdp)))</div><div class='add'>+		goto err;</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	if (unlikely(pmd_large(*pmdp)))</div><div class='add'>+		pte = *(pte_t *) pmdp;</div><div class='add'>+	else</div><div class='add'>+#endif</div><div class='add'>+		pte = *pte_offset_kernel(pmdp, vaddr);</div><div class='add'>+</div><div class='add'>+	local_irq_enable();</div><div class='add'>+</div><div class='add'>+	if (unlikely(!pte_present(pte) ||</div><div class='add'>+		     (write &amp;&amp; (!pte_write(pte) || !pte_dirty(pte)))))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	*paddr = pte_pfn(pte) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	*pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	local_irq_enable();</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Drop a TLB entry into the GRU. The fault is described by info in an TFH.</div><div class='add'>+ *	Input:</div><div class='add'>+ *		cb    Address of user CBR. Null if not running in user context</div><div class='add'>+ * 	Return:</div><div class='add'>+ * 		  0 = dropin, exception, or switch to UPM successful</div><div class='add'>+ * 		  1 = range invalidate active</div><div class='add'>+ * 		&lt; 0 = error code</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static int gru_try_dropin(struct gru_thread_state *gts,</div><div class='add'>+			  struct gru_tlb_fault_handle *tfh,</div><div class='add'>+			  unsigned long __user *cb)</div><div class='add'>+{</div><div class='add'>+	struct mm_struct *mm = gts-&gt;ts_mm;</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+	int pageshift, asid, write, ret;</div><div class='add'>+	unsigned long paddr, gpa, vaddr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * NOTE: The GRU contains magic hardware that eliminates races between</div><div class='add'>+	 * TLB invalidates and TLB dropins. If an invalidate occurs</div><div class='add'>+	 * in the window between reading the TFH and the subsequent TLB dropin,</div><div class='add'>+	 * the dropin is ignored. This eliminates the need for additional locks.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Error if TFH state is IDLE or FMM mode &amp; the user issuing a UPM call.</div><div class='add'>+	 * Might be a hardware race OR a stupid user. Ignore FMM because FMM</div><div class='add'>+	 * is a transient state.</div><div class='add'>+	 */</div><div class='add'>+	if (tfh-&gt;state == TFHSTATE_IDLE)</div><div class='add'>+		goto failidle;</div><div class='add'>+	if (tfh-&gt;state == TFHSTATE_MISS_FMM &amp;&amp; cb)</div><div class='add'>+		goto failfmm;</div><div class='add'>+</div><div class='add'>+	write = (tfh-&gt;cause &amp; TFHCAUSE_TLB_MOD) != 0;</div><div class='add'>+	vaddr = tfh-&gt;missvaddr;</div><div class='add'>+	asid = tfh-&gt;missasid;</div><div class='add'>+	if (asid == 0)</div><div class='add'>+		goto failnoasid;</div><div class='add'>+</div><div class='add'>+	rmb();	/* TFH must be cache resident before reading ms_range_active */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TFH is cache resident - at least briefly. Fail the dropin</div><div class='add'>+	 * if a range invalidate is active.</div><div class='add'>+	 */</div><div class='add'>+	if (atomic_read(&amp;gts-&gt;ts_gms-&gt;ms_range_active))</div><div class='add'>+		goto failactive;</div><div class='add'>+</div><div class='add'>+	vma = find_vma(mm, vaddr);</div><div class='add'>+	if (!vma)</div><div class='add'>+		goto failinval;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Atomic lookup is faster &amp; usually works even if called in non-atomic</div><div class='add'>+	 * context.</div><div class='add'>+	 */</div><div class='add'>+	ret = atomic_pte_lookup(vma, vaddr, write, &amp;paddr, &amp;pageshift);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (!cb)</div><div class='add'>+			goto failupm;</div><div class='add'>+		if (non_atomic_pte_lookup(vma, vaddr, write, &amp;paddr,</div><div class='add'>+					  &amp;pageshift))</div><div class='add'>+			goto failinval;</div><div class='add'>+	}</div><div class='add'>+	if (is_gru_paddr(paddr))</div><div class='add'>+		goto failinval;</div><div class='add'>+</div><div class='add'>+	paddr = paddr &amp; ~((1UL &lt;&lt; pageshift) - 1);</div><div class='add'>+	gpa = uv_soc_phys_ram_to_gpa(paddr);</div><div class='add'>+	gru_cb_set_istatus_active(cb);</div><div class='add'>+	tfh_write_restart(tfh, gpa, GAA_RAM, vaddr, asid, write,</div><div class='add'>+			  GRU_PAGESIZE(pageshift));</div><div class='add'>+	STAT(tlb_dropin);</div><div class='add'>+	gru_dbg(grudev,</div><div class='add'>+		"%s: tfh 0x%p, vaddr 0x%lx, asid 0x%x, ps %d, gpa 0x%lx\n",</div><div class='add'>+		ret ? "non-atomic" : "atomic", tfh, vaddr, asid,</div><div class='add'>+		pageshift, gpa);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+failnoasid:</div><div class='add'>+	/* No asid (delayed unload). */</div><div class='add'>+	STAT(tlb_dropin_fail_no_asid);</div><div class='add'>+	gru_dbg(grudev, "FAILED no_asid tfh: 0x%p, vaddr 0x%lx\n", tfh, vaddr);</div><div class='add'>+	if (!cb)</div><div class='add'>+		tfh_user_polling_mode(tfh);</div><div class='add'>+	else</div><div class='add'>+		gru_flush_cache(tfh);</div><div class='add'>+	return -EAGAIN;</div><div class='add'>+</div><div class='add'>+failupm:</div><div class='add'>+	/* Atomic failure switch CBR to UPM */</div><div class='add'>+	tfh_user_polling_mode(tfh);</div><div class='add'>+	STAT(tlb_dropin_fail_upm);</div><div class='add'>+	gru_dbg(grudev, "FAILED upm tfh: 0x%p, vaddr 0x%lx\n", tfh, vaddr);</div><div class='add'>+	return 1;</div><div class='add'>+</div><div class='add'>+failfmm:</div><div class='add'>+	/* FMM state on UPM call */</div><div class='add'>+	STAT(tlb_dropin_fail_fmm);</div><div class='add'>+	gru_dbg(grudev, "FAILED fmm tfh: 0x%p, state %d\n", tfh, tfh-&gt;state);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+failidle:</div><div class='add'>+	/* TFH was idle  - no miss pending */</div><div class='add'>+	gru_flush_cache(tfh);</div><div class='add'>+	if (cb)</div><div class='add'>+		gru_flush_cache(cb);</div><div class='add'>+	STAT(tlb_dropin_fail_idle);</div><div class='add'>+	gru_dbg(grudev, "FAILED idle tfh: 0x%p, state %d\n", tfh, tfh-&gt;state);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+failinval:</div><div class='add'>+	/* All errors (atomic &amp; non-atomic) switch CBR to EXCEPTION state */</div><div class='add'>+	tfh_exception(tfh);</div><div class='add'>+	STAT(tlb_dropin_fail_invalid);</div><div class='add'>+	gru_dbg(grudev, "FAILED inval tfh: 0x%p, vaddr 0x%lx\n", tfh, vaddr);</div><div class='add'>+	return -EFAULT;</div><div class='add'>+</div><div class='add'>+failactive:</div><div class='add'>+	/* Range invalidate active. Switch to UPM iff atomic */</div><div class='add'>+	if (!cb)</div><div class='add'>+		tfh_user_polling_mode(tfh);</div><div class='add'>+	else</div><div class='add'>+		gru_flush_cache(tfh);</div><div class='add'>+	STAT(tlb_dropin_fail_range_active);</div><div class='add'>+	gru_dbg(grudev, "FAILED range active: tfh 0x%p, vaddr 0x%lx\n",</div><div class='add'>+		tfh, vaddr);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Process an external interrupt from the GRU. This interrupt is</div><div class='add'>+ * caused by a TLB miss.</div><div class='add'>+ * Note that this is the interrupt handler that is registered with linux</div><div class='add'>+ * interrupt handlers.</div><div class='add'>+ */</div><div class='add'>+irqreturn_t gru_intr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct gru_state *gru;</div><div class='add'>+	struct gru_tlb_fault_map map;</div><div class='add'>+	struct gru_thread_state *gts;</div><div class='add'>+	struct gru_tlb_fault_handle *tfh = NULL;</div><div class='add'>+	int cbrnum, ctxnum;</div><div class='add'>+</div><div class='add'>+	STAT(intr);</div><div class='add'>+</div><div class='add'>+	gru = irq_to_gru(irq);</div><div class='add'>+	if (!gru) {</div><div class='add'>+		dev_err(grudev, "GRU: invalid interrupt: cpu %d, irq %d\n",</div><div class='add'>+			raw_smp_processor_id(), irq);</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+	get_clear_fault_map(gru, &amp;map);</div><div class='add'>+	gru_dbg(grudev, "irq %d, gru %x, map 0x%lx\n", irq, gru-&gt;gs_gid,</div><div class='add'>+		map.fault_bits[0]);</div><div class='add'>+</div><div class='add'>+	for_each_cbr_in_tfm(cbrnum, map.fault_bits) {</div><div class='add'>+		tfh = get_tfh_by_index(gru, cbrnum);</div><div class='add'>+		prefetchw(tfh);	/* Helps on hdw, required for emulator */</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * When hardware sets a bit in the faultmap, it implicitly</div><div class='add'>+		 * locks the GRU context so that it cannot be unloaded.</div><div class='add'>+		 * The gts cannot change until a TFH start/writestart command</div><div class='add'>+		 * is issued.</div><div class='add'>+		 */</div><div class='add'>+		ctxnum = tfh-&gt;ctxnum;</div><div class='add'>+		gts = gru-&gt;gs_gts[ctxnum];</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * This is running in interrupt context. Trylock the mmap_sem.</div><div class='add'>+		 * If it fails, retry the fault in user context.</div><div class='add'>+		 */</div><div class='add'>+		if (down_read_trylock(&amp;gts-&gt;ts_mm-&gt;mmap_sem)) {</div><div class='add'>+			gru_try_dropin(gts, tfh, NULL);</div><div class='add'>+			up_read(&amp;gts-&gt;ts_mm-&gt;mmap_sem);</div><div class='add'>+		} else {</div><div class='add'>+			tfh_user_polling_mode(tfh);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int gru_user_dropin(struct gru_thread_state *gts,</div><div class='add'>+			   struct gru_tlb_fault_handle *tfh,</div><div class='add'>+			   unsigned long __user *cb)</div><div class='add'>+{</div><div class='add'>+	struct gru_mm_struct *gms = gts-&gt;ts_gms;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		wait_event(gms-&gt;ms_wait_queue,</div><div class='add'>+			   atomic_read(&amp;gms-&gt;ms_range_active) == 0);</div><div class='add'>+		prefetchw(tfh);	/* Helps on hdw, required for emulator */</div><div class='add'>+		ret = gru_try_dropin(gts, tfh, cb);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			return ret;</div><div class='add'>+		STAT(call_os_wait_queue);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This interface is called as a result of a user detecting a "call OS" bit</div><div class='add'>+ * in a user CB. Normally means that a TLB fault has occurred.</div><div class='add'>+ * 	cb - user virtual address of the CB</div><div class='add'>+ */</div><div class='add'>+int gru_handle_user_call_os(unsigned long cb)</div><div class='add'>+{</div><div class='add'>+	struct gru_tlb_fault_handle *tfh;</div><div class='add'>+	struct gru_thread_state *gts;</div><div class='add'>+	unsigned long __user *cbp;</div><div class='add'>+	int ucbnum, cbrnum, ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	STAT(call_os);</div><div class='add'>+	gru_dbg(grudev, "address 0x%lx\n", cb);</div><div class='add'>+</div><div class='add'>+	/* sanity check the cb pointer */</div><div class='add'>+	ucbnum = get_cb_number((void *)cb);</div><div class='add'>+	if ((cb &amp; (GRU_HANDLE_STRIDE - 1)) || ucbnum &gt;= GRU_NUM_CB)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	cbp = (unsigned long *)cb;</div><div class='add'>+</div><div class='add'>+	gts = gru_find_lock_gts(cb);</div><div class='add'>+	if (!gts)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ucbnum &gt;= gts-&gt;ts_cbr_au_count * GRU_CBR_AU_SIZE) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If force_unload is set, the UPM TLB fault is phony. The task</div><div class='add'>+	 * has migrated to another node and the GSEG must be moved. Just</div><div class='add'>+	 * unload the context. The task will page fault and assign a new</div><div class='add'>+	 * context.</div><div class='add'>+	 */</div><div class='add'>+	ret = -EAGAIN;</div><div class='add'>+	cbrnum = thread_cbr_number(gts, ucbnum);</div><div class='add'>+	if (gts-&gt;ts_force_unload) {</div><div class='add'>+		gru_unload_context(gts, 1);</div><div class='add'>+	} else if (gts-&gt;ts_gru) {</div><div class='add'>+		tfh = get_tfh_by_index(gts-&gt;ts_gru, cbrnum);</div><div class='add'>+		ret = gru_user_dropin(gts, tfh, cbp);</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	gru_unlock_gts(gts);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Fetch the exception detail information for a CB that terminated with</div><div class='add'>+ * an exception.</div><div class='add'>+ */</div><div class='add'>+int gru_get_exception_detail(unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct control_block_extended_exc_detail excdet;</div><div class='add'>+	struct gru_control_block_extended *cbe;</div><div class='add'>+	struct gru_thread_state *gts;</div><div class='add'>+	int ucbnum, cbrnum, ret;</div><div class='add'>+</div><div class='add'>+	STAT(user_exception);</div><div class='add'>+	if (copy_from_user(&amp;excdet, (void __user *)arg, sizeof(excdet)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	gru_dbg(grudev, "address 0x%lx\n", excdet.cb);</div><div class='add'>+	gts = gru_find_lock_gts(excdet.cb);</div><div class='add'>+	if (!gts)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (gts-&gt;ts_gru) {</div><div class='add'>+		ucbnum = get_cb_number((void *)excdet.cb);</div><div class='add'>+		cbrnum = thread_cbr_number(gts, ucbnum);</div><div class='add'>+		cbe = get_cbe_by_index(gts-&gt;ts_gru, cbrnum);</div><div class='add'>+		excdet.opc = cbe-&gt;opccpy;</div><div class='add'>+		excdet.exopc = cbe-&gt;exopccpy;</div><div class='add'>+		excdet.ecause = cbe-&gt;ecause;</div><div class='add'>+		excdet.exceptdet0 = cbe-&gt;idef1upd;</div><div class='add'>+		excdet.exceptdet1 = cbe-&gt;idef3upd;</div><div class='add'>+		ret = 0;</div><div class='add'>+	} else {</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+	gru_unlock_gts(gts);</div><div class='add'>+</div><div class='add'>+	gru_dbg(grudev, "address 0x%lx, ecause 0x%x\n", excdet.cb,</div><div class='add'>+		excdet.ecause);</div><div class='add'>+	if (!ret &amp;&amp; copy_to_user((void __user *)arg, &amp;excdet, sizeof(excdet)))</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * User request to unload a context. Content is saved for possible reload.</div><div class='add'>+ */</div><div class='add'>+int gru_user_unload_context(unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct gru_thread_state *gts;</div><div class='add'>+	struct gru_unload_context_req req;</div><div class='add'>+</div><div class='add'>+	STAT(user_unload_context);</div><div class='add'>+	if (copy_from_user(&amp;req, (void __user *)arg, sizeof(req)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	gru_dbg(grudev, "gseg 0x%lx\n", req.gseg);</div><div class='add'>+</div><div class='add'>+	gts = gru_find_lock_gts(req.gseg);</div><div class='add'>+	if (!gts)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (gts-&gt;ts_gru)</div><div class='add'>+		gru_unload_context(gts, 1);</div><div class='add'>+	gru_unlock_gts(gts);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * User request to flush a range of virtual addresses from the GRU TLB</div><div class='add'>+ * (Mainly for testing).</div><div class='add'>+ */</div><div class='add'>+int gru_user_flush_tlb(unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct gru_thread_state *gts;</div><div class='add'>+	struct gru_flush_tlb_req req;</div><div class='add'>+</div><div class='add'>+	STAT(user_flush_tlb);</div><div class='add'>+	if (copy_from_user(&amp;req, (void __user *)arg, sizeof(req)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	gru_dbg(grudev, "gseg 0x%lx, vaddr 0x%lx, len 0x%lx\n", req.gseg,</div><div class='add'>+		req.vaddr, req.len);</div><div class='add'>+</div><div class='add'>+	gts = gru_find_lock_gts(req.gseg);</div><div class='add'>+	if (!gts)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	gru_flush_tlb_range(gts-&gt;ts_gms, req.vaddr, req.vaddr + req.len);</div><div class='add'>+	gru_unlock_gts(gts);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Register the current task as the user of the GSEG slice.</div><div class='add'>+ * Needed for TLB fault interrupt targeting.</div><div class='add'>+ */</div><div class='add'>+int gru_set_task_slice(long address)</div><div class='add'>+{</div><div class='add'>+	struct gru_thread_state *gts;</div><div class='add'>+</div><div class='add'>+	STAT(set_task_slice);</div><div class='add'>+	gru_dbg(grudev, "address 0x%lx\n", address);</div><div class='add'>+	gts = gru_alloc_locked_gts(address);</div><div class='add'>+	if (!gts)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	gts-&gt;ts_tgid_owner = current-&gt;tgid;</div><div class='add'>+	gru_unlock_gts(gts);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c<br/>new file mode 100644<br/>index 000000000000..d61cee796efd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-gru/grufile.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/grufile.c</a></div><div class='hunk'>@@ -0,0 +1,488 @@</div><div class='add'>+/*</div><div class='add'>+ * SN Platform GRU Driver</div><div class='add'>+ *</div><div class='add'>+ *              FILE OPERATIONS &amp; DRIVER INITIALIZATION</div><div class='add'>+ *</div><div class='add'>+ * This file supports the user system call for file open, close, mmap, etc.</div><div class='add'>+ * This also incudes the driver initialization code.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include "gru.h"</div><div class='add'>+#include "grulib.h"</div><div class='add'>+#include "grutables.h"</div><div class='add'>+</div><div class='add'>+#if defined CONFIG_X86_64</div><div class='add'>+#include &lt;asm/genapic.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#define IS_UV()		is_uv_system()</div><div class='add'>+#elif defined CONFIG_IA64</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/sn/simulator.h&gt;</div><div class='add'>+/* temp support for running on hardware simulator */</div><div class='add'>+#define IS_UV()		IS_MEDUSA() || ia64_platform_is("uv")</div><div class='add'>+#else</div><div class='add'>+#define IS_UV()		0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;asm/uv/uv_hub.h&gt;</div><div class='add'>+#include &lt;asm/uv/uv_mmrs.h&gt;</div><div class='add'>+</div><div class='add'>+struct gru_blade_state *gru_base[GRU_MAX_BLADES] __read_mostly;</div><div class='add'>+unsigned long gru_start_paddr, gru_end_paddr __read_mostly;</div><div class='add'>+struct gru_stats_s gru_stats;</div><div class='add'>+</div><div class='add'>+/* Guaranteed user available resources on each node */</div><div class='add'>+static int max_user_cbrs, max_user_dsr_bytes;</div><div class='add'>+</div><div class='add'>+static struct file_operations gru_fops;</div><div class='add'>+static struct miscdevice gru_miscdev;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * gru_vma_close</div><div class='add'>+ *</div><div class='add'>+ * Called when unmapping a device mapping. Frees all gru resources</div><div class='add'>+ * and tables belonging to the vma.</div><div class='add'>+ */</div><div class='add'>+static void gru_vma_close(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	struct gru_vma_data *vdata;</div><div class='add'>+	struct gru_thread_state *gts;</div><div class='add'>+	struct list_head *entry, *next;</div><div class='add'>+</div><div class='add'>+	if (!vma-&gt;vm_private_data)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vdata = vma-&gt;vm_private_data;</div><div class='add'>+	vma-&gt;vm_private_data = NULL;</div><div class='add'>+	gru_dbg(grudev, "vma %p, file %p, vdata %p\n", vma, vma-&gt;vm_file,</div><div class='add'>+				vdata);</div><div class='add'>+	list_for_each_safe(entry, next, &amp;vdata-&gt;vd_head) {</div><div class='add'>+		gts =</div><div class='add'>+		    list_entry(entry, struct gru_thread_state, ts_next);</div><div class='add'>+		list_del(&amp;gts-&gt;ts_next);</div><div class='add'>+		mutex_lock(&amp;gts-&gt;ts_ctxlock);</div><div class='add'>+		if (gts-&gt;ts_gru)</div><div class='add'>+			gru_unload_context(gts, 0);</div><div class='add'>+		mutex_unlock(&amp;gts-&gt;ts_ctxlock);</div><div class='add'>+		gts_drop(gts);</div><div class='add'>+	}</div><div class='add'>+	kfree(vdata);</div><div class='add'>+	STAT(vdata_free);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * gru_file_mmap</div><div class='add'>+ *</div><div class='add'>+ * Called when mmaping the device.  Initializes the vma with a fault handler</div><div class='add'>+ * and private data structure necessary to allocate, track, and free the</div><div class='add'>+ * underlying pages.</div><div class='add'>+ */</div><div class='add'>+static int gru_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	if ((vma-&gt;vm_flags &amp; (VM_SHARED | VM_WRITE)) != (VM_SHARED | VM_WRITE))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (vma-&gt;vm_start &amp; (GRU_GSEG_PAGESIZE - 1) ||</div><div class='add'>+			vma-&gt;vm_end &amp; (GRU_GSEG_PAGESIZE - 1))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	vma-&gt;vm_flags |=</div><div class='add'>+	    (VM_IO | VM_DONTCOPY | VM_LOCKED | VM_DONTEXPAND | VM_PFNMAP |</div><div class='add'>+			VM_RESERVED);</div><div class='add'>+	vma-&gt;vm_page_prot = PAGE_SHARED;</div><div class='add'>+	vma-&gt;vm_ops = &amp;gru_vm_ops;</div><div class='add'>+</div><div class='add'>+	vma-&gt;vm_private_data = gru_alloc_vma_data(vma, 0);</div><div class='add'>+	if (!vma-&gt;vm_private_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	gru_dbg(grudev, "file %p, vaddr 0x%lx, vma %p, vdata %p\n",</div><div class='add'>+		file, vma-&gt;vm_start, vma, vma-&gt;vm_private_data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create a new GRU context</div><div class='add'>+ */</div><div class='add'>+static int gru_create_new_context(unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct gru_create_context_req req;</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+	struct gru_vma_data *vdata;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;req, (void __user *)arg, sizeof(req)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (req.data_segment_bytes == 0 ||</div><div class='add'>+				req.data_segment_bytes &gt; max_user_dsr_bytes)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!req.control_blocks || !req.maximum_thread_count ||</div><div class='add'>+				req.control_blocks &gt; max_user_cbrs)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!(req.options &amp; GRU_OPT_MISS_MASK))</div><div class='add'>+		req.options |= GRU_OPT_MISS_FMM_INTR;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+	vma = gru_find_vma(req.gseg);</div><div class='add'>+	if (vma) {</div><div class='add'>+		vdata = vma-&gt;vm_private_data;</div><div class='add'>+		vdata-&gt;vd_user_options = req.options;</div><div class='add'>+		vdata-&gt;vd_dsr_au_count =</div><div class='add'>+		    GRU_DS_BYTES_TO_AU(req.data_segment_bytes);</div><div class='add'>+		vdata-&gt;vd_cbr_au_count = GRU_CB_COUNT_TO_AU(req.control_blocks);</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+	up_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get GRU configuration info (temp - for emulator testing)</div><div class='add'>+ */</div><div class='add'>+static long gru_get_config_info(unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct gru_config_info info;</div><div class='add'>+	int nodesperblade;</div><div class='add'>+</div><div class='add'>+	if (num_online_nodes() &gt; 1 &amp;&amp;</div><div class='add'>+			(uv_node_to_blade_id(1) == uv_node_to_blade_id(0)))</div><div class='add'>+		nodesperblade = 2;</div><div class='add'>+	else</div><div class='add'>+		nodesperblade = 1;</div><div class='add'>+	info.cpus = num_online_cpus();</div><div class='add'>+	info.nodes = num_online_nodes();</div><div class='add'>+	info.blades = info.nodes / nodesperblade;</div><div class='add'>+	info.chiplets = GRU_CHIPLETS_PER_BLADE * info.blades;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user((void __user *)arg, &amp;info, sizeof(info)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get GRU chiplet status</div><div class='add'>+ */</div><div class='add'>+static long gru_get_chiplet_status(unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct gru_state *gru;</div><div class='add'>+	struct gru_chiplet_info info;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;info, (void __user *)arg, sizeof(info)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (info.node == -1)</div><div class='add'>+		info.node = numa_node_id();</div><div class='add'>+	if (info.node &gt;= num_possible_nodes() ||</div><div class='add'>+			info.chiplet &gt;= GRU_CHIPLETS_PER_HUB ||</div><div class='add'>+			info.node &lt; 0 || info.chiplet &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	info.blade = uv_node_to_blade_id(info.node);</div><div class='add'>+	gru = get_gru(info.blade, info.chiplet);</div><div class='add'>+</div><div class='add'>+	info.total_dsr_bytes = GRU_NUM_DSR_BYTES;</div><div class='add'>+	info.total_cbr = GRU_NUM_CB;</div><div class='add'>+	info.total_user_dsr_bytes = GRU_NUM_DSR_BYTES -</div><div class='add'>+		gru-&gt;gs_reserved_dsr_bytes;</div><div class='add'>+	info.total_user_cbr = GRU_NUM_CB - gru-&gt;gs_reserved_cbrs;</div><div class='add'>+	info.free_user_dsr_bytes = hweight64(gru-&gt;gs_dsr_map) *</div><div class='add'>+			GRU_DSR_AU_BYTES;</div><div class='add'>+	info.free_user_cbr = hweight64(gru-&gt;gs_cbr_map) * GRU_CBR_AU_SIZE;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user((void __user *)arg, &amp;info, sizeof(info)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * gru_file_unlocked_ioctl</div><div class='add'>+ *</div><div class='add'>+ * Called to update file attributes via IOCTL calls.</div><div class='add'>+ */</div><div class='add'>+static long gru_file_unlocked_ioctl(struct file *file, unsigned int req,</div><div class='add'>+				    unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	int err = -EBADRQC;</div><div class='add'>+</div><div class='add'>+	gru_dbg(grudev, "file %p\n", file);</div><div class='add'>+</div><div class='add'>+	switch (req) {</div><div class='add'>+	case GRU_CREATE_CONTEXT:</div><div class='add'>+		err = gru_create_new_context(arg);</div><div class='add'>+		break;</div><div class='add'>+	case GRU_SET_TASK_SLICE:</div><div class='add'>+		err = gru_set_task_slice(arg);</div><div class='add'>+		break;</div><div class='add'>+	case GRU_USER_GET_EXCEPTION_DETAIL:</div><div class='add'>+		err = gru_get_exception_detail(arg);</div><div class='add'>+		break;</div><div class='add'>+	case GRU_USER_UNLOAD_CONTEXT:</div><div class='add'>+		err = gru_user_unload_context(arg);</div><div class='add'>+		break;</div><div class='add'>+	case GRU_GET_CHIPLET_STATUS:</div><div class='add'>+		err = gru_get_chiplet_status(arg);</div><div class='add'>+		break;</div><div class='add'>+	case GRU_USER_FLUSH_TLB:</div><div class='add'>+		err = gru_user_flush_tlb(arg);</div><div class='add'>+		break;</div><div class='add'>+	case GRU_USER_CALL_OS:</div><div class='add'>+		err = gru_handle_user_call_os(arg);</div><div class='add'>+		break;</div><div class='add'>+	case GRU_GET_CONFIG_INFO:</div><div class='add'>+		err = gru_get_config_info(arg);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called at init time to build tables for all GRUs that are present in the</div><div class='add'>+ * system.</div><div class='add'>+ */</div><div class='add'>+static void gru_init_chiplet(struct gru_state *gru, unsigned long paddr,</div><div class='add'>+			     void *vaddr, int nid, int bid, int grunum)</div><div class='add'>+{</div><div class='add'>+	spin_lock_init(&amp;gru-&gt;gs_lock);</div><div class='add'>+	spin_lock_init(&amp;gru-&gt;gs_asid_lock);</div><div class='add'>+	gru-&gt;gs_gru_base_paddr = paddr;</div><div class='add'>+	gru-&gt;gs_gru_base_vaddr = vaddr;</div><div class='add'>+	gru-&gt;gs_gid = bid * GRU_CHIPLETS_PER_BLADE + grunum;</div><div class='add'>+	gru-&gt;gs_blade = gru_base[bid];</div><div class='add'>+	gru-&gt;gs_blade_id = bid;</div><div class='add'>+	gru-&gt;gs_cbr_map = (GRU_CBR_AU == 64) ? ~0 : (1UL &lt;&lt; GRU_CBR_AU) - 1;</div><div class='add'>+	gru-&gt;gs_dsr_map = (1UL &lt;&lt; GRU_DSR_AU) - 1;</div><div class='add'>+	gru_tgh_flush_init(gru);</div><div class='add'>+	gru_dbg(grudev, "bid %d, nid %d, gru %x, vaddr %p (0x%lx)\n",</div><div class='add'>+		bid, nid, gru-&gt;gs_gid, gru-&gt;gs_gru_base_vaddr,</div><div class='add'>+		gru-&gt;gs_gru_base_paddr);</div><div class='add'>+	gru_kservices_init(gru);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gru_init_tables(unsigned long gru_base_paddr, void *gru_base_vaddr)</div><div class='add'>+{</div><div class='add'>+	int pnode, nid, bid, chip;</div><div class='add'>+	int cbrs, dsrbytes, n;</div><div class='add'>+	int order = get_order(sizeof(struct gru_blade_state));</div><div class='add'>+	struct page *page;</div><div class='add'>+	struct gru_state *gru;</div><div class='add'>+	unsigned long paddr;</div><div class='add'>+	void *vaddr;</div><div class='add'>+</div><div class='add'>+	max_user_cbrs = GRU_NUM_CB;</div><div class='add'>+	max_user_dsr_bytes = GRU_NUM_DSR_BYTES;</div><div class='add'>+	for_each_online_node(nid) {</div><div class='add'>+		bid = uv_node_to_blade_id(nid);</div><div class='add'>+		pnode = uv_node_to_pnode(nid);</div><div class='add'>+		if (gru_base[bid])</div><div class='add'>+			continue;</div><div class='add'>+		page = alloc_pages_node(nid, GFP_KERNEL, order);</div><div class='add'>+		if (!page)</div><div class='add'>+			goto fail;</div><div class='add'>+		gru_base[bid] = page_address(page);</div><div class='add'>+		memset(gru_base[bid], 0, sizeof(struct gru_blade_state));</div><div class='add'>+		gru_base[bid]-&gt;bs_lru_gru = &amp;gru_base[bid]-&gt;bs_grus[0];</div><div class='add'>+		spin_lock_init(&amp;gru_base[bid]-&gt;bs_lock);</div><div class='add'>+</div><div class='add'>+		dsrbytes = 0;</div><div class='add'>+		cbrs = 0;</div><div class='add'>+		for (gru = gru_base[bid]-&gt;bs_grus, chip = 0;</div><div class='add'>+		     		chip &lt; GRU_CHIPLETS_PER_BLADE;</div><div class='add'>+				chip++, gru++) {</div><div class='add'>+			paddr = gru_chiplet_paddr(gru_base_paddr, pnode, chip);</div><div class='add'>+			vaddr = gru_chiplet_vaddr(gru_base_vaddr, pnode, chip);</div><div class='add'>+			gru_init_chiplet(gru, paddr, vaddr, bid, nid, chip);</div><div class='add'>+			n = hweight64(gru-&gt;gs_cbr_map) * GRU_CBR_AU_SIZE;</div><div class='add'>+			cbrs = max(cbrs, n);</div><div class='add'>+			n = hweight64(gru-&gt;gs_dsr_map) * GRU_DSR_AU_BYTES;</div><div class='add'>+			dsrbytes = max(dsrbytes, n);</div><div class='add'>+		}</div><div class='add'>+		max_user_cbrs = min(max_user_cbrs, cbrs);</div><div class='add'>+		max_user_dsr_bytes = min(max_user_dsr_bytes, dsrbytes);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	for (nid--; nid &gt;= 0; nid--)</div><div class='add'>+		free_pages((unsigned long)gru_base[nid], order);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IA64</div><div class='add'>+</div><div class='add'>+static int get_base_irq(void)</div><div class='add'>+{</div><div class='add'>+	return IRQ_GRU;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#elif defined CONFIG_X86_64</div><div class='add'>+</div><div class='add'>+static void noop(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip gru_chip = {</div><div class='add'>+	.name		= "gru",</div><div class='add'>+	.mask		= noop,</div><div class='add'>+	.unmask		= noop,</div><div class='add'>+	.ack		= noop,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int get_base_irq(void)</div><div class='add'>+{</div><div class='add'>+	set_irq_chip(IRQ_GRU, &amp;gru_chip);</div><div class='add'>+	set_irq_chip(IRQ_GRU + 1, &amp;gru_chip);</div><div class='add'>+	return IRQ_GRU;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * gru_init</div><div class='add'>+ *</div><div class='add'>+ * Called at boot or module load time to initialize the GRUs.</div><div class='add'>+ */</div><div class='add'>+static int __init gru_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret, irq, chip;</div><div class='add'>+	char id[10];</div><div class='add'>+	void *gru_start_vaddr;</div><div class='add'>+</div><div class='add'>+	if (!IS_UV())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+#if defined CONFIG_IA64</div><div class='add'>+	gru_start_paddr = 0xd000000000UL; /* ZZZZZZZZZZZZZZZZZZZ fixme */</div><div class='add'>+#else</div><div class='add'>+	gru_start_paddr = uv_read_local_mmr(UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR) &amp;</div><div class='add'>+				0x7fffffffffffUL;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+	gru_start_vaddr = __va(gru_start_paddr);</div><div class='add'>+	gru_end_paddr = gru_start_paddr + MAX_NUMNODES * GRU_SIZE;</div><div class='add'>+	printk(KERN_INFO "GRU space: 0x%lx - 0x%lx\n",</div><div class='add'>+	       gru_start_paddr, gru_end_paddr);</div><div class='add'>+	irq = get_base_irq();</div><div class='add'>+	for (chip = 0; chip &lt; GRU_CHIPLETS_PER_BLADE; chip++) {</div><div class='add'>+		ret = request_irq(irq + chip, gru_intr, 0, id, NULL);</div><div class='add'>+		if (ret) {</div><div class='add'>+			printk(KERN_ERR "%s: request_irq failed\n",</div><div class='add'>+			       GRU_DRIVER_ID_STR);</div><div class='add'>+			goto exit1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = misc_register(&amp;gru_miscdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR "%s: misc_register failed\n",</div><div class='add'>+		       GRU_DRIVER_ID_STR);</div><div class='add'>+		goto exit1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = gru_proc_init();</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR "%s: proc init failed\n", GRU_DRIVER_ID_STR);</div><div class='add'>+		goto exit2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = gru_init_tables(gru_start_paddr, gru_start_vaddr);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR "%s: init tables failed\n", GRU_DRIVER_ID_STR);</div><div class='add'>+		goto exit3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s: v%s\n", GRU_DRIVER_ID_STR,</div><div class='add'>+	       GRU_DRIVER_VERSION_STR);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+exit3:</div><div class='add'>+	gru_proc_exit();</div><div class='add'>+exit2:</div><div class='add'>+	misc_deregister(&amp;gru_miscdev);</div><div class='add'>+exit1:</div><div class='add'>+	for (--chip; chip &gt;= 0; chip--)</div><div class='add'>+		free_irq(irq + chip, NULL);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit gru_exit(void)</div><div class='add'>+{</div><div class='add'>+	int i, bid;</div><div class='add'>+	int order = get_order(sizeof(struct gru_state) *</div><div class='add'>+			      GRU_CHIPLETS_PER_BLADE);</div><div class='add'>+</div><div class='add'>+	if (!IS_UV())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; GRU_CHIPLETS_PER_BLADE; i++)</div><div class='add'>+		free_irq(IRQ_GRU + i, NULL);</div><div class='add'>+</div><div class='add'>+	for (bid = 0; bid &lt; GRU_MAX_BLADES; bid++)</div><div class='add'>+		free_pages((unsigned long)gru_base[bid], order);</div><div class='add'>+</div><div class='add'>+	misc_deregister(&amp;gru_miscdev);</div><div class='add'>+	gru_proc_exit();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_operations gru_fops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.unlocked_ioctl	= gru_file_unlocked_ioctl,</div><div class='add'>+	.mmap		= gru_file_mmap,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct miscdevice gru_miscdev = {</div><div class='add'>+	.minor		= MISC_DYNAMIC_MINOR,</div><div class='add'>+	.name		= "gru",</div><div class='add'>+	.fops		= &amp;gru_fops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vm_operations_struct gru_vm_ops = {</div><div class='add'>+	.close		= gru_vma_close,</div><div class='add'>+	.fault		= gru_fault,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_init(gru_init);</div><div class='add'>+module_exit(gru_exit);</div><div class='add'>+</div><div class='add'>+module_param(gru_options, ulong, 0644);</div><div class='add'>+MODULE_PARM_DESC(gru_options, "Various debug options");</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Silicon Graphics, Inc.");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION(GRU_DRIVER_ID_STR GRU_DRIVER_VERSION_STR);</div><div class='add'>+MODULE_VERSION(GRU_DRIVER_VERSION_STR);</div><div class='add'>+</div><div class='head'>diff --git a/drivers/misc/sgi-gru/gruhandles.h b/drivers/misc/sgi-gru/gruhandles.h<br/>new file mode 100644<br/>index 000000000000..d16031d62673<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-gru/gruhandles.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/gruhandles.h</a></div><div class='hunk'>@@ -0,0 +1,663 @@</div><div class='add'>+/*</div><div class='add'>+ * SN Platform GRU Driver</div><div class='add'>+ *</div><div class='add'>+ *              GRU HANDLE DEFINITION</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __GRUHANDLES_H__</div><div class='add'>+#define __GRUHANDLES_H__</div><div class='add'>+#include "gru_instructions.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Manifest constants for GRU Memory Map</div><div class='add'>+ */</div><div class='add'>+#define GRU_GSEG0_BASE		0</div><div class='add'>+#define GRU_MCS_BASE		(64 * 1024 * 1024)</div><div class='add'>+#define GRU_SIZE		(128UL * 1024 * 1024)</div><div class='add'>+</div><div class='add'>+/* Handle &amp; resource counts */</div><div class='add'>+#define GRU_NUM_CB		128</div><div class='add'>+#define GRU_NUM_DSR_BYTES	(32 * 1024)</div><div class='add'>+#define GRU_NUM_TFM		16</div><div class='add'>+#define GRU_NUM_TGH		24</div><div class='add'>+#define GRU_NUM_CBE		128</div><div class='add'>+#define GRU_NUM_TFH		128</div><div class='add'>+#define GRU_NUM_CCH		16</div><div class='add'>+#define GRU_NUM_GSH		1</div><div class='add'>+</div><div class='add'>+/* Maximum resource counts that can be reserved by user programs */</div><div class='add'>+#define GRU_NUM_USER_CBR	GRU_NUM_CBE</div><div class='add'>+#define GRU_NUM_USER_DSR_BYTES	GRU_NUM_DSR_BYTES</div><div class='add'>+</div><div class='add'>+/* Bytes per handle &amp; handle stride. Code assumes all cb, tfh, cbe handles</div><div class='add'>+ * are the same */</div><div class='add'>+#define GRU_HANDLE_BYTES	64</div><div class='add'>+#define GRU_HANDLE_STRIDE	256</div><div class='add'>+</div><div class='add'>+/* Base addresses of handles */</div><div class='add'>+#define GRU_TFM_BASE		(GRU_MCS_BASE + 0x00000)</div><div class='add'>+#define GRU_TGH_BASE		(GRU_MCS_BASE + 0x08000)</div><div class='add'>+#define GRU_CBE_BASE		(GRU_MCS_BASE + 0x10000)</div><div class='add'>+#define GRU_TFH_BASE		(GRU_MCS_BASE + 0x18000)</div><div class='add'>+#define GRU_CCH_BASE		(GRU_MCS_BASE + 0x20000)</div><div class='add'>+#define GRU_GSH_BASE		(GRU_MCS_BASE + 0x30000)</div><div class='add'>+</div><div class='add'>+/* User gseg constants */</div><div class='add'>+#define GRU_GSEG_STRIDE		(4 * 1024 * 1024)</div><div class='add'>+#define GSEG_BASE(a)		((a) &amp; ~(GRU_GSEG_PAGESIZE - 1))</div><div class='add'>+</div><div class='add'>+/* Data segment constants */</div><div class='add'>+#define GRU_DSR_AU_BYTES	1024</div><div class='add'>+#define GRU_DSR_CL		(GRU_NUM_DSR_BYTES / GRU_CACHE_LINE_BYTES)</div><div class='add'>+#define GRU_DSR_AU_CL		(GRU_DSR_AU_BYTES / GRU_CACHE_LINE_BYTES)</div><div class='add'>+#define GRU_DSR_AU		(GRU_NUM_DSR_BYTES / GRU_DSR_AU_BYTES)</div><div class='add'>+</div><div class='add'>+/* Control block constants */</div><div class='add'>+#define GRU_CBR_AU_SIZE		2</div><div class='add'>+#define GRU_CBR_AU		(GRU_NUM_CBE / GRU_CBR_AU_SIZE)</div><div class='add'>+</div><div class='add'>+/* Convert resource counts to the number of AU */</div><div class='add'>+#define GRU_DS_BYTES_TO_AU(n)	DIV_ROUND_UP(n, GRU_DSR_AU_BYTES)</div><div class='add'>+#define GRU_CB_COUNT_TO_AU(n)	DIV_ROUND_UP(n, GRU_CBR_AU_SIZE)</div><div class='add'>+</div><div class='add'>+/* UV limits */</div><div class='add'>+#define GRU_CHIPLETS_PER_HUB	2</div><div class='add'>+#define GRU_HUBS_PER_BLADE	1</div><div class='add'>+#define GRU_CHIPLETS_PER_BLADE	(GRU_HUBS_PER_BLADE * GRU_CHIPLETS_PER_HUB)</div><div class='add'>+</div><div class='add'>+/* User GRU Gseg offsets */</div><div class='add'>+#define GRU_CB_BASE		0</div><div class='add'>+#define GRU_CB_LIMIT		(GRU_CB_BASE + GRU_HANDLE_STRIDE * GRU_NUM_CBE)</div><div class='add'>+#define GRU_DS_BASE		0x20000</div><div class='add'>+#define GRU_DS_LIMIT		(GRU_DS_BASE + GRU_NUM_DSR_BYTES)</div><div class='add'>+</div><div class='add'>+/* Convert a GRU physical address to the chiplet offset */</div><div class='add'>+#define GSEGPOFF(h) 		((h) &amp; (GRU_SIZE - 1))</div><div class='add'>+</div><div class='add'>+/* Convert an arbitrary handle address to the beginning of the GRU segment */</div><div class='add'>+#ifndef __PLUGIN__</div><div class='add'>+#define GRUBASE(h)		((void *)((unsigned long)(h) &amp; ~(GRU_SIZE - 1)))</div><div class='add'>+#else</div><div class='add'>+extern void *gmu_grubase(void *h);</div><div class='add'>+#define GRUBASE(h)		gmu_grubase(h)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* General addressing macros. */</div><div class='add'>+static inline void *get_gseg_base_address(void *base, int ctxnum)</div><div class='add'>+{</div><div class='add'>+	return (void *)(base + GRU_GSEG0_BASE + GRU_GSEG_STRIDE * ctxnum);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *get_gseg_base_address_cb(void *base, int ctxnum, int line)</div><div class='add'>+{</div><div class='add'>+	return (void *)(get_gseg_base_address(base, ctxnum) +</div><div class='add'>+			GRU_CB_BASE + GRU_HANDLE_STRIDE * line);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *get_gseg_base_address_ds(void *base, int ctxnum, int line)</div><div class='add'>+{</div><div class='add'>+	return (void *)(get_gseg_base_address(base, ctxnum) + GRU_DS_BASE +</div><div class='add'>+			GRU_CACHE_LINE_BYTES * line);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct gru_tlb_fault_map *get_tfm(void *base, int ctxnum)</div><div class='add'>+{</div><div class='add'>+	return (struct gru_tlb_fault_map *)(base + GRU_TFM_BASE +</div><div class='add'>+					ctxnum * GRU_HANDLE_STRIDE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct gru_tlb_global_handle *get_tgh(void *base, int ctxnum)</div><div class='add'>+{</div><div class='add'>+	return (struct gru_tlb_global_handle *)(base + GRU_TGH_BASE +</div><div class='add'>+					ctxnum * GRU_HANDLE_STRIDE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct gru_control_block_extended *get_cbe(void *base, int ctxnum)</div><div class='add'>+{</div><div class='add'>+	return (struct gru_control_block_extended *)(base + GRU_CBE_BASE +</div><div class='add'>+					ctxnum * GRU_HANDLE_STRIDE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct gru_tlb_fault_handle *get_tfh(void *base, int ctxnum)</div><div class='add'>+{</div><div class='add'>+	return (struct gru_tlb_fault_handle *)(base + GRU_TFH_BASE +</div><div class='add'>+					ctxnum * GRU_HANDLE_STRIDE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct gru_context_configuration_handle *get_cch(void *base,</div><div class='add'>+					int ctxnum)</div><div class='add'>+{</div><div class='add'>+	return (struct gru_context_configuration_handle *)(base +</div><div class='add'>+				GRU_CCH_BASE + ctxnum * GRU_HANDLE_STRIDE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long get_cb_number(void *cb)</div><div class='add'>+{</div><div class='add'>+	return (((unsigned long)cb - GRU_CB_BASE) % GRU_GSEG_PAGESIZE) /</div><div class='add'>+					GRU_HANDLE_STRIDE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* byte offset to a specific GRU chiplet. (p=pnode, c=chiplet (0 or 1)*/</div><div class='add'>+static inline unsigned long gru_chiplet_paddr(unsigned long paddr, int pnode,</div><div class='add'>+							int chiplet)</div><div class='add'>+{</div><div class='add'>+	return paddr + GRU_SIZE * (2 * pnode  + chiplet);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *gru_chiplet_vaddr(void *vaddr, int pnode, int chiplet)</div><div class='add'>+{</div><div class='add'>+	return vaddr + GRU_SIZE * (2 * pnode  + chiplet);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Global TLB Fault Map</div><div class='add'>+ * 	Bitmap of outstanding TLB misses needing interrupt/polling service.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct gru_tlb_fault_map {</div><div class='add'>+	unsigned long fault_bits[BITS_TO_LONGS(GRU_NUM_CBE)];</div><div class='add'>+	unsigned long fill0[2];</div><div class='add'>+	unsigned long done_bits[BITS_TO_LONGS(GRU_NUM_CBE)];</div><div class='add'>+	unsigned long fill1[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TGH - TLB Global Handle</div><div class='add'>+ * 	Used for TLB flushing.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct gru_tlb_global_handle {</div><div class='add'>+	unsigned int cmd:1;		/* DW 0 */</div><div class='add'>+	unsigned int delresp:1;</div><div class='add'>+	unsigned int opc:1;</div><div class='add'>+	unsigned int fill1:5;</div><div class='add'>+</div><div class='add'>+	unsigned int fill2:8;</div><div class='add'>+</div><div class='add'>+	unsigned int status:2;</div><div class='add'>+	unsigned long fill3:2;</div><div class='add'>+	unsigned int state:3;</div><div class='add'>+	unsigned long fill4:1;</div><div class='add'>+</div><div class='add'>+	unsigned int cause:3;</div><div class='add'>+	unsigned long fill5:37;</div><div class='add'>+</div><div class='add'>+	unsigned long vaddr:64;		/* DW 1 */</div><div class='add'>+</div><div class='add'>+	unsigned int asid:24;		/* DW 2 */</div><div class='add'>+	unsigned int fill6:8;</div><div class='add'>+</div><div class='add'>+	unsigned int pagesize:5;</div><div class='add'>+	unsigned int fill7:11;</div><div class='add'>+</div><div class='add'>+	unsigned int global:1;</div><div class='add'>+	unsigned int fill8:15;</div><div class='add'>+</div><div class='add'>+	unsigned long vaddrmask:39;	/* DW 3 */</div><div class='add'>+	unsigned int fill9:9;</div><div class='add'>+	unsigned int n:10;</div><div class='add'>+	unsigned int fill10:6;</div><div class='add'>+</div><div class='add'>+	unsigned int ctxbitmap:16;	/* DW4 */</div><div class='add'>+	unsigned long fill11[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum gru_tgh_cmd {</div><div class='add'>+	TGHCMD_START</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum gru_tgh_opc {</div><div class='add'>+	TGHOP_TLBNOP,</div><div class='add'>+	TGHOP_TLBINV</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum gru_tgh_status {</div><div class='add'>+	TGHSTATUS_IDLE,</div><div class='add'>+	TGHSTATUS_EXCEPTION,</div><div class='add'>+	TGHSTATUS_ACTIVE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum gru_tgh_state {</div><div class='add'>+	TGHSTATE_IDLE,</div><div class='add'>+	TGHSTATE_PE_INVAL,</div><div class='add'>+	TGHSTATE_INTERRUPT_INVAL,</div><div class='add'>+	TGHSTATE_WAITDONE,</div><div class='add'>+	TGHSTATE_RESTART_CTX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TFH - TLB Global Handle</div><div class='add'>+ * 	Used for TLB dropins into the GRU TLB.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct gru_tlb_fault_handle {</div><div class='add'>+	unsigned int cmd:1;		/* DW 0 - low 32*/</div><div class='add'>+	unsigned int delresp:1;</div><div class='add'>+	unsigned int fill0:2;</div><div class='add'>+	unsigned int opc:3;</div><div class='add'>+	unsigned int fill1:9;</div><div class='add'>+</div><div class='add'>+	unsigned int status:2;</div><div class='add'>+	unsigned int fill2:1;</div><div class='add'>+	unsigned int color:1;</div><div class='add'>+	unsigned int state:3;</div><div class='add'>+	unsigned int fill3:1;</div><div class='add'>+</div><div class='add'>+	unsigned int cause:7;		/* DW 0 - high 32 */</div><div class='add'>+	unsigned int fill4:1;</div><div class='add'>+</div><div class='add'>+	unsigned int indexway:12;</div><div class='add'>+	unsigned int fill5:4;</div><div class='add'>+</div><div class='add'>+	unsigned int ctxnum:4;</div><div class='add'>+	unsigned int fill6:12;</div><div class='add'>+</div><div class='add'>+	unsigned long missvaddr:64;	/* DW 1 */</div><div class='add'>+</div><div class='add'>+	unsigned int missasid:24;	/* DW 2 */</div><div class='add'>+	unsigned int fill7:8;</div><div class='add'>+	unsigned int fillasid:24;</div><div class='add'>+	unsigned int dirty:1;</div><div class='add'>+	unsigned int gaa:2;</div><div class='add'>+	unsigned long fill8:5;</div><div class='add'>+</div><div class='add'>+	unsigned long pfn:41;		/* DW 3 */</div><div class='add'>+	unsigned int fill9:7;</div><div class='add'>+	unsigned int pagesize:5;</div><div class='add'>+	unsigned int fill10:11;</div><div class='add'>+</div><div class='add'>+	unsigned long fillvaddr:64;	/* DW 4 */</div><div class='add'>+</div><div class='add'>+	unsigned long fill11[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum gru_tfh_opc {</div><div class='add'>+	TFHOP_NOOP,</div><div class='add'>+	TFHOP_RESTART,</div><div class='add'>+	TFHOP_WRITE_ONLY,</div><div class='add'>+	TFHOP_WRITE_RESTART,</div><div class='add'>+	TFHOP_EXCEPTION,</div><div class='add'>+	TFHOP_USER_POLLING_MODE = 7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tfh_status {</div><div class='add'>+	TFHSTATUS_IDLE,</div><div class='add'>+	TFHSTATUS_EXCEPTION,</div><div class='add'>+	TFHSTATUS_ACTIVE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tfh_state {</div><div class='add'>+	TFHSTATE_INACTIVE,</div><div class='add'>+	TFHSTATE_IDLE,</div><div class='add'>+	TFHSTATE_MISS_UPM,</div><div class='add'>+	TFHSTATE_MISS_FMM,</div><div class='add'>+	TFHSTATE_HW_ERR,</div><div class='add'>+	TFHSTATE_WRITE_TLB,</div><div class='add'>+	TFHSTATE_RESTART_CBR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* TFH cause bits */</div><div class='add'>+enum tfh_cause {</div><div class='add'>+	TFHCAUSE_NONE,</div><div class='add'>+	TFHCAUSE_TLB_MISS,</div><div class='add'>+	TFHCAUSE_TLB_MOD,</div><div class='add'>+	TFHCAUSE_HW_ERROR_RR,</div><div class='add'>+	TFHCAUSE_HW_ERROR_MAIN_ARRAY,</div><div class='add'>+	TFHCAUSE_HW_ERROR_VALID,</div><div class='add'>+	TFHCAUSE_HW_ERROR_PAGESIZE,</div><div class='add'>+	TFHCAUSE_INSTRUCTION_EXCEPTION,</div><div class='add'>+	TFHCAUSE_UNCORRECTIBLE_ERROR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* GAA values */</div><div class='add'>+#define GAA_RAM				0x0</div><div class='add'>+#define GAA_NCRAM			0x2</div><div class='add'>+#define GAA_MMIO			0x1</div><div class='add'>+#define GAA_REGISTER			0x3</div><div class='add'>+</div><div class='add'>+/* GRU paddr shift for pfn. (NOTE: shift is NOT by actual pagesize) */</div><div class='add'>+#define GRU_PADDR_SHIFT			12</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Context Configuration handle</div><div class='add'>+ * 	Used to allocate resources to a GSEG context.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct gru_context_configuration_handle {</div><div class='add'>+	unsigned int cmd:1;			/* DW0 */</div><div class='add'>+	unsigned int delresp:1;</div><div class='add'>+	unsigned int opc:3;</div><div class='add'>+	unsigned int unmap_enable:1;</div><div class='add'>+	unsigned int req_slice_set_enable:1;</div><div class='add'>+	unsigned int req_slice:2;</div><div class='add'>+	unsigned int cb_int_enable:1;</div><div class='add'>+	unsigned int tlb_int_enable:1;</div><div class='add'>+	unsigned int tfm_fault_bit_enable:1;</div><div class='add'>+	unsigned int tlb_int_select:4;</div><div class='add'>+</div><div class='add'>+	unsigned int status:2;</div><div class='add'>+	unsigned int state:2;</div><div class='add'>+	unsigned int reserved2:4;</div><div class='add'>+</div><div class='add'>+	unsigned int cause:4;</div><div class='add'>+	unsigned int tfm_done_bit_enable:1;</div><div class='add'>+	unsigned int unused:3;</div><div class='add'>+</div><div class='add'>+	unsigned int dsr_allocation_map;</div><div class='add'>+</div><div class='add'>+	unsigned long cbr_allocation_map;	/* DW1 */</div><div class='add'>+</div><div class='add'>+	unsigned int asid[8];			/* DW 2 - 5 */</div><div class='add'>+	unsigned short sizeavail[8];		/* DW 6 - 7 */</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+enum gru_cch_opc {</div><div class='add'>+	CCHOP_START = 1,</div><div class='add'>+	CCHOP_ALLOCATE,</div><div class='add'>+	CCHOP_INTERRUPT,</div><div class='add'>+	CCHOP_DEALLOCATE,</div><div class='add'>+	CCHOP_INTERRUPT_SYNC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum gru_cch_status {</div><div class='add'>+	CCHSTATUS_IDLE,</div><div class='add'>+	CCHSTATUS_EXCEPTION,</div><div class='add'>+	CCHSTATUS_ACTIVE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum gru_cch_state {</div><div class='add'>+	CCHSTATE_INACTIVE,</div><div class='add'>+	CCHSTATE_MAPPED,</div><div class='add'>+	CCHSTATE_ACTIVE,</div><div class='add'>+	CCHSTATE_INTERRUPTED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CCH Exception cause */</div><div class='add'>+enum gru_cch_cause {</div><div class='add'>+	CCHCAUSE_REGION_REGISTER_WRITE_ERROR = 1,</div><div class='add'>+	CCHCAUSE_ILLEGAL_OPCODE = 2,</div><div class='add'>+	CCHCAUSE_INVALID_START_REQUEST = 3,</div><div class='add'>+	CCHCAUSE_INVALID_ALLOCATION_REQUEST = 4,</div><div class='add'>+	CCHCAUSE_INVALID_DEALLOCATION_REQUEST = 5,</div><div class='add'>+	CCHCAUSE_INVALID_INTERRUPT_REQUEST = 6,</div><div class='add'>+	CCHCAUSE_CCH_BUSY = 7,</div><div class='add'>+	CCHCAUSE_NO_CBRS_TO_ALLOCATE = 8,</div><div class='add'>+	CCHCAUSE_BAD_TFM_CONFIG = 9,</div><div class='add'>+	CCHCAUSE_CBR_RESOURCES_OVERSUBSCRIPED = 10,</div><div class='add'>+	CCHCAUSE_DSR_RESOURCES_OVERSUBSCRIPED = 11,</div><div class='add'>+	CCHCAUSE_CBR_DEALLOCATION_ERROR = 12,</div><div class='add'>+};</div><div class='add'>+/*</div><div class='add'>+ * CBE - Control Block Extended</div><div class='add'>+ * 	Maintains internal GRU state for active CBs.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct gru_control_block_extended {</div><div class='add'>+	unsigned int reserved0:1;	/* DW 0  - low */</div><div class='add'>+	unsigned int imacpy:3;</div><div class='add'>+	unsigned int reserved1:4;</div><div class='add'>+	unsigned int xtypecpy:3;</div><div class='add'>+	unsigned int iaa0cpy:2;</div><div class='add'>+	unsigned int iaa1cpy:2;</div><div class='add'>+	unsigned int reserved2:1;</div><div class='add'>+	unsigned int opccpy:8;</div><div class='add'>+	unsigned int exopccpy:8;</div><div class='add'>+</div><div class='add'>+	unsigned int idef2cpy:22;	/* DW 0  - high */</div><div class='add'>+	unsigned int reserved3:10;</div><div class='add'>+</div><div class='add'>+	unsigned int idef4cpy:22;	/* DW 1 */</div><div class='add'>+	unsigned int reserved4:10;</div><div class='add'>+	unsigned int idef4upd:22;</div><div class='add'>+	unsigned int reserved5:10;</div><div class='add'>+</div><div class='add'>+	unsigned long idef1upd:64;	/* DW 2 */</div><div class='add'>+</div><div class='add'>+	unsigned long idef5cpy:64;	/* DW 3 */</div><div class='add'>+</div><div class='add'>+	unsigned long idef6cpy:64;	/* DW 4 */</div><div class='add'>+</div><div class='add'>+	unsigned long idef3upd:64;	/* DW 5 */</div><div class='add'>+</div><div class='add'>+	unsigned long idef5upd:64;	/* DW 6 */</div><div class='add'>+</div><div class='add'>+	unsigned int idef2upd:22;	/* DW 7 */</div><div class='add'>+	unsigned int reserved6:10;</div><div class='add'>+</div><div class='add'>+	unsigned int ecause:20;</div><div class='add'>+	unsigned int cbrstate:4;</div><div class='add'>+	unsigned int cbrexecstatus:8;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum gru_cbr_state {</div><div class='add'>+	CBRSTATE_INACTIVE,</div><div class='add'>+	CBRSTATE_IDLE,</div><div class='add'>+	CBRSTATE_PE_CHECK,</div><div class='add'>+	CBRSTATE_QUEUED,</div><div class='add'>+	CBRSTATE_WAIT_RESPONSE,</div><div class='add'>+	CBRSTATE_INTERRUPTED,</div><div class='add'>+	CBRSTATE_INTERRUPTED_MISS_FMM,</div><div class='add'>+	CBRSTATE_BUSY_INTERRUPT_MISS_FMM,</div><div class='add'>+	CBRSTATE_INTERRUPTED_MISS_UPM,</div><div class='add'>+	CBRSTATE_BUSY_INTERRUPTED_MISS_UPM,</div><div class='add'>+	CBRSTATE_REQUEST_ISSUE,</div><div class='add'>+	CBRSTATE_BUSY_INTERRUPT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CBE cbrexecstatus bits */</div><div class='add'>+#define CBR_EXS_ABORT_OCC_BIT			0</div><div class='add'>+#define CBR_EXS_INT_OCC_BIT			1</div><div class='add'>+#define CBR_EXS_PENDING_BIT			2</div><div class='add'>+#define CBR_EXS_QUEUED_BIT			3</div><div class='add'>+#define CBR_EXS_TLBHW_BIT			4</div><div class='add'>+#define CBR_EXS_EXCEPTION_BIT			5</div><div class='add'>+</div><div class='add'>+#define CBR_EXS_ABORT_OCC			(1 &lt;&lt; CBR_EXS_ABORT_OCC_BIT)</div><div class='add'>+#define CBR_EXS_INT_OCC				(1 &lt;&lt; CBR_EXS_INT_OCC_BIT)</div><div class='add'>+#define CBR_EXS_PENDING				(1 &lt;&lt; CBR_EXS_PENDING_BIT)</div><div class='add'>+#define CBR_EXS_QUEUED				(1 &lt;&lt; CBR_EXS_QUEUED_BIT)</div><div class='add'>+#define CBR_EXS_TLBHW				(1 &lt;&lt; CBR_EXS_TLBHW_BIT)</div><div class='add'>+#define CBR_EXS_EXCEPTION			(1 &lt;&lt; CBR_EXS_EXCEPTION_BIT)</div><div class='add'>+</div><div class='add'>+/* CBE ecause bits  - defined in gru_instructions.h */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert a processor pagesize into the strange encoded pagesize used by the</div><div class='add'>+ * GRU. Processor pagesize is encoded as log of bytes per page. (or PAGE_SHIFT)</div><div class='add'>+ * 	pagesize	log pagesize	grupagesize</div><div class='add'>+ * 	  4k			12	0</div><div class='add'>+ * 	 16k 			14	1</div><div class='add'>+ * 	 64k			16	2</div><div class='add'>+ * 	256k			18	3</div><div class='add'>+ * 	  1m			20	4</div><div class='add'>+ * 	  2m			21	5</div><div class='add'>+ * 	  4m			22	6</div><div class='add'>+ * 	 16m			24	7</div><div class='add'>+ * 	 64m			26	8</div><div class='add'>+ * 	...</div><div class='add'>+ */</div><div class='add'>+#define GRU_PAGESIZE(sh)	((((sh) &gt; 20 ? (sh) + 2: (sh)) &gt;&gt; 1) - 6)</div><div class='add'>+#define GRU_SIZEAVAIL(sh)	(1UL &lt;&lt; GRU_PAGESIZE(sh))</div><div class='add'>+</div><div class='add'>+/* minimum TLB purge count to ensure a full purge */</div><div class='add'>+#define GRUMAXINVAL		1024UL</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Extract the status field from a kernel handle */</div><div class='add'>+#define GET_MSEG_HANDLE_STATUS(h)	(((*(unsigned long *)(h)) &gt;&gt; 16) &amp; 3)</div><div class='add'>+</div><div class='add'>+static inline void start_instruction(void *h)</div><div class='add'>+{</div><div class='add'>+	unsigned long *w0 = h;</div><div class='add'>+</div><div class='add'>+	wmb();		/* setting CMD bit must be last */</div><div class='add'>+	*w0 = *w0 | 1;</div><div class='add'>+	gru_flush_cache(h);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int wait_instruction_complete(void *h)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		cpu_relax();</div><div class='add'>+		barrier();</div><div class='add'>+		status = GET_MSEG_HANDLE_STATUS(h);</div><div class='add'>+	} while (status == CCHSTATUS_ACTIVE);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined CONFIG_IA64</div><div class='add'>+static inline void cch_allocate_set_asids(</div><div class='add'>+		  struct gru_context_configuration_handle *cch, int asidval)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= RGN_HPAGE; i++) {  /*  assume HPAGE is last region */</div><div class='add'>+		cch-&gt;asid[i] = (asidval++);</div><div class='add'>+#if 0</div><div class='add'>+		/* ZZZ hugepages not supported yet */</div><div class='add'>+		if (i == RGN_HPAGE)</div><div class='add'>+			cch-&gt;sizeavail[i] = GRU_SIZEAVAIL(hpage_shift);</div><div class='add'>+		else</div><div class='add'>+#endif</div><div class='add'>+			cch-&gt;sizeavail[i] = GRU_SIZEAVAIL(PAGE_SHIFT);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#elif defined CONFIG_X86_64</div><div class='add'>+static inline void cch_allocate_set_asids(</div><div class='add'>+		  struct gru_context_configuration_handle *cch, int asidval)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		cch-&gt;asid[i] = asidval++;</div><div class='add'>+		cch-&gt;sizeavail[i] = GRU_SIZEAVAIL(PAGE_SHIFT) |</div><div class='add'>+			GRU_SIZEAVAIL(21);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline int cch_allocate(struct gru_context_configuration_handle *cch,</div><div class='add'>+			       int asidval, unsigned long cbrmap,</div><div class='add'>+			       unsigned long dsrmap)</div><div class='add'>+{</div><div class='add'>+	cch_allocate_set_asids(cch, asidval);</div><div class='add'>+	cch-&gt;dsr_allocation_map = dsrmap;</div><div class='add'>+	cch-&gt;cbr_allocation_map = cbrmap;</div><div class='add'>+	cch-&gt;opc = CCHOP_ALLOCATE;</div><div class='add'>+	start_instruction(cch);</div><div class='add'>+	return wait_instruction_complete(cch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cch_start(struct gru_context_configuration_handle *cch)</div><div class='add'>+{</div><div class='add'>+	cch-&gt;opc = CCHOP_START;</div><div class='add'>+	start_instruction(cch);</div><div class='add'>+	return wait_instruction_complete(cch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cch_interrupt(struct gru_context_configuration_handle *cch)</div><div class='add'>+{</div><div class='add'>+	cch-&gt;opc = CCHOP_INTERRUPT;</div><div class='add'>+	start_instruction(cch);</div><div class='add'>+	return wait_instruction_complete(cch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cch_deallocate(struct gru_context_configuration_handle *cch)</div><div class='add'>+{</div><div class='add'>+	cch-&gt;opc = CCHOP_DEALLOCATE;</div><div class='add'>+	start_instruction(cch);</div><div class='add'>+	return wait_instruction_complete(cch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cch_interrupt_sync(struct gru_context_configuration_handle</div><div class='add'>+				     *cch)</div><div class='add'>+{</div><div class='add'>+	cch-&gt;opc = CCHOP_INTERRUPT_SYNC;</div><div class='add'>+	start_instruction(cch);</div><div class='add'>+	return wait_instruction_complete(cch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int tgh_invalidate(struct gru_tlb_global_handle *tgh,</div><div class='add'>+				 unsigned long vaddr, unsigned long vaddrmask,</div><div class='add'>+				 int asid, int pagesize, int global, int n,</div><div class='add'>+				 unsigned short ctxbitmap)</div><div class='add'>+{</div><div class='add'>+	tgh-&gt;vaddr = vaddr;</div><div class='add'>+	tgh-&gt;asid = asid;</div><div class='add'>+	tgh-&gt;pagesize = pagesize;</div><div class='add'>+	tgh-&gt;n = n;</div><div class='add'>+	tgh-&gt;global = global;</div><div class='add'>+	tgh-&gt;vaddrmask = vaddrmask;</div><div class='add'>+	tgh-&gt;ctxbitmap = ctxbitmap;</div><div class='add'>+	tgh-&gt;opc = TGHOP_TLBINV;</div><div class='add'>+	start_instruction(tgh);</div><div class='add'>+	return wait_instruction_complete(tgh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void tfh_write_only(struct gru_tlb_fault_handle *tfh,</div><div class='add'>+				  unsigned long pfn, unsigned long vaddr,</div><div class='add'>+				  int asid, int dirty, int pagesize)</div><div class='add'>+{</div><div class='add'>+	tfh-&gt;fillasid = asid;</div><div class='add'>+	tfh-&gt;fillvaddr = vaddr;</div><div class='add'>+	tfh-&gt;pfn = pfn;</div><div class='add'>+	tfh-&gt;dirty = dirty;</div><div class='add'>+	tfh-&gt;pagesize = pagesize;</div><div class='add'>+	tfh-&gt;opc = TFHOP_WRITE_ONLY;</div><div class='add'>+	start_instruction(tfh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void tfh_write_restart(struct gru_tlb_fault_handle *tfh,</div><div class='add'>+				     unsigned long paddr, int gaa,</div><div class='add'>+				     unsigned long vaddr, int asid, int dirty,</div><div class='add'>+				     int pagesize)</div><div class='add'>+{</div><div class='add'>+	tfh-&gt;fillasid = asid;</div><div class='add'>+	tfh-&gt;fillvaddr = vaddr;</div><div class='add'>+	tfh-&gt;pfn = paddr &gt;&gt; GRU_PADDR_SHIFT;</div><div class='add'>+	tfh-&gt;gaa = gaa;</div><div class='add'>+	tfh-&gt;dirty = dirty;</div><div class='add'>+	tfh-&gt;pagesize = pagesize;</div><div class='add'>+	tfh-&gt;opc = TFHOP_WRITE_RESTART;</div><div class='add'>+	start_instruction(tfh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void tfh_restart(struct gru_tlb_fault_handle *tfh)</div><div class='add'>+{</div><div class='add'>+	tfh-&gt;opc = TFHOP_RESTART;</div><div class='add'>+	start_instruction(tfh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void tfh_user_polling_mode(struct gru_tlb_fault_handle *tfh)</div><div class='add'>+{</div><div class='add'>+	tfh-&gt;opc = TFHOP_USER_POLLING_MODE;</div><div class='add'>+	start_instruction(tfh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void tfh_exception(struct gru_tlb_fault_handle *tfh)</div><div class='add'>+{</div><div class='add'>+	tfh-&gt;opc = TFHOP_EXCEPTION;</div><div class='add'>+	start_instruction(tfh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __GRUHANDLES_H__ */</div><div class='head'>diff --git a/drivers/misc/sgi-gru/grukservices.c b/drivers/misc/sgi-gru/grukservices.c<br/>new file mode 100644<br/>index 000000000000..dfd49af0fe18<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-gru/grukservices.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/grukservices.c</a></div><div class='hunk'>@@ -0,0 +1,679 @@</div><div class='add'>+/*</div><div class='add'>+ * SN Platform GRU Driver</div><div class='add'>+ *</div><div class='add'>+ *              KERNEL SERVICES THAT USE THE GRU</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include "gru.h"</div><div class='add'>+#include "grulib.h"</div><div class='add'>+#include "grutables.h"</div><div class='add'>+#include "grukservices.h"</div><div class='add'>+#include "gru_instructions.h"</div><div class='add'>+#include &lt;asm/uv/uv_hub.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Kernel GRU Usage</div><div class='add'>+ *</div><div class='add'>+ * The following is an interim algorithm for management of kernel GRU</div><div class='add'>+ * resources. This will likely be replaced when we better understand the</div><div class='add'>+ * kernel/user requirements.</div><div class='add'>+ *</div><div class='add'>+ * At boot time, the kernel permanently reserves a fixed number of</div><div class='add'>+ * CBRs/DSRs for each cpu to use. The resources are all taken from</div><div class='add'>+ * the GRU chiplet 1 on the blade. This leaves the full set of resources</div><div class='add'>+ * of chiplet 0 available to be allocated to a single user.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Blade percpu resources PERMANENTLY reserved for kernel use */</div><div class='add'>+#define GRU_NUM_KERNEL_CBR      1</div><div class='add'>+#define GRU_NUM_KERNEL_DSR_BYTES 256</div><div class='add'>+#define KERNEL_CTXNUM           15</div><div class='add'>+</div><div class='add'>+/* GRU instruction attributes for all instructions */</div><div class='add'>+#define IMA			IMA_CB_DELAY</div><div class='add'>+</div><div class='add'>+/* GRU cacheline size is always 64 bytes - even on arches with 128 byte lines */</div><div class='add'>+#define __gru_cacheline_aligned__                               \</div><div class='add'>+	__attribute__((__aligned__(GRU_CACHE_LINE_BYTES)))</div><div class='add'>+</div><div class='add'>+#define MAGIC	0x1234567887654321UL</div><div class='add'>+</div><div class='add'>+/* Default retry count for GRU errors on kernel instructions */</div><div class='add'>+#define EXCEPTION_RETRY_LIMIT	3</div><div class='add'>+</div><div class='add'>+/* Status of message queue sections */</div><div class='add'>+#define MQS_EMPTY		0</div><div class='add'>+#define MQS_FULL		1</div><div class='add'>+#define MQS_NOOP		2</div><div class='add'>+</div><div class='add'>+/*----------------- RESOURCE MANAGEMENT -------------------------------------*/</div><div class='add'>+/* optimized for x86_64 */</div><div class='add'>+struct message_queue {</div><div class='add'>+	union gru_mesqhead	head __gru_cacheline_aligned__;	/* CL 0 */</div><div class='add'>+	int			qlines;				/* DW 1 */</div><div class='add'>+	long 			hstatus[2];</div><div class='add'>+	void 			*next __gru_cacheline_aligned__;/* CL 1 */</div><div class='add'>+	void 			*limit;</div><div class='add'>+	void 			*start;</div><div class='add'>+	void 			*start2;</div><div class='add'>+	char			data ____cacheline_aligned;	/* CL 2 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* First word in every message - used by mesq interface */</div><div class='add'>+struct message_header {</div><div class='add'>+	char	present;</div><div class='add'>+	char	present2;</div><div class='add'>+	char 	lines;</div><div class='add'>+	char	fill;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QLINES(mq)	((mq) + offsetof(struct message_queue, qlines))</div><div class='add'>+#define HSTATUS(mq, h)	((mq) + offsetof(struct message_queue, hstatus[h]))</div><div class='add'>+</div><div class='add'>+static int gru_get_cpu_resources(int dsr_bytes, void **cb, void **dsr)</div><div class='add'>+{</div><div class='add'>+	struct gru_blade_state *bs;</div><div class='add'>+	int lcpu;</div><div class='add'>+</div><div class='add'>+	BUG_ON(dsr_bytes &gt; GRU_NUM_KERNEL_DSR_BYTES);</div><div class='add'>+	preempt_disable();</div><div class='add'>+	bs = gru_base[uv_numa_blade_id()];</div><div class='add'>+	lcpu = uv_blade_processor_id();</div><div class='add'>+	*cb = bs-&gt;kernel_cb + lcpu * GRU_HANDLE_STRIDE;</div><div class='add'>+	*dsr = bs-&gt;kernel_dsr + lcpu * GRU_NUM_KERNEL_DSR_BYTES;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gru_free_cpu_resources(void *cb, void *dsr)</div><div class='add'>+{</div><div class='add'>+	preempt_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int gru_get_cb_exception_detail(void *cb,</div><div class='add'>+		struct control_block_extended_exc_detail *excdet)</div><div class='add'>+{</div><div class='add'>+	struct gru_control_block_extended *cbe;</div><div class='add'>+</div><div class='add'>+	cbe = get_cbe(GRUBASE(cb), get_cb_number(cb));</div><div class='add'>+	excdet-&gt;opc = cbe-&gt;opccpy;</div><div class='add'>+	excdet-&gt;exopc = cbe-&gt;exopccpy;</div><div class='add'>+	excdet-&gt;ecause = cbe-&gt;ecause;</div><div class='add'>+	excdet-&gt;exceptdet0 = cbe-&gt;idef1upd;</div><div class='add'>+	excdet-&gt;exceptdet1 = cbe-&gt;idef3upd;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char *gru_get_cb_exception_detail_str(int ret, void *cb,</div><div class='add'>+				      char *buf, int size)</div><div class='add'>+{</div><div class='add'>+	struct gru_control_block_status *gen = (void *)cb;</div><div class='add'>+	struct control_block_extended_exc_detail excdet;</div><div class='add'>+</div><div class='add'>+	if (ret &gt; 0 &amp;&amp; gen-&gt;istatus == CBS_EXCEPTION) {</div><div class='add'>+		gru_get_cb_exception_detail(cb, &amp;excdet);</div><div class='add'>+		snprintf(buf, size,</div><div class='add'>+			"GRU exception: cb %p, opc %d, exopc %d, ecause 0x%x,"</div><div class='add'>+			"excdet0 0x%lx, excdet1 0x%x",</div><div class='add'>+			gen, excdet.opc, excdet.exopc, excdet.ecause,</div><div class='add'>+			excdet.exceptdet0, excdet.exceptdet1);</div><div class='add'>+	} else {</div><div class='add'>+		snprintf(buf, size, "No exception");</div><div class='add'>+	}</div><div class='add'>+	return buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gru_wait_idle_or_exception(struct gru_control_block_status *gen)</div><div class='add'>+{</div><div class='add'>+	while (gen-&gt;istatus &gt;= CBS_ACTIVE) {</div><div class='add'>+		cpu_relax();</div><div class='add'>+		barrier();</div><div class='add'>+	}</div><div class='add'>+	return gen-&gt;istatus;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gru_retry_exception(void *cb)</div><div class='add'>+{</div><div class='add'>+	struct gru_control_block_status *gen = (void *)cb;</div><div class='add'>+	struct control_block_extended_exc_detail excdet;</div><div class='add'>+	int retry = EXCEPTION_RETRY_LIMIT;</div><div class='add'>+</div><div class='add'>+	while (1)  {</div><div class='add'>+		if (gru_get_cb_message_queue_substatus(cb))</div><div class='add'>+			break;</div><div class='add'>+		if (gru_wait_idle_or_exception(gen) == CBS_IDLE)</div><div class='add'>+			return CBS_IDLE;</div><div class='add'>+</div><div class='add'>+		gru_get_cb_exception_detail(cb, &amp;excdet);</div><div class='add'>+		if (excdet.ecause &amp; ~EXCEPTION_RETRY_BITS)</div><div class='add'>+			break;</div><div class='add'>+		if (retry-- == 0)</div><div class='add'>+			break;</div><div class='add'>+		gen-&gt;icmd = 1;</div><div class='add'>+		gru_flush_cache(gen);</div><div class='add'>+	}</div><div class='add'>+	return CBS_EXCEPTION;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int gru_check_status_proc(void *cb)</div><div class='add'>+{</div><div class='add'>+	struct gru_control_block_status *gen = (void *)cb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = gen-&gt;istatus;</div><div class='add'>+	if (ret != CBS_EXCEPTION)</div><div class='add'>+		return ret;</div><div class='add'>+	return gru_retry_exception(cb);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int gru_wait_proc(void *cb)</div><div class='add'>+{</div><div class='add'>+	struct gru_control_block_status *gen = (void *)cb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = gru_wait_idle_or_exception(gen);</div><div class='add'>+	if (ret == CBS_EXCEPTION)</div><div class='add'>+		ret = gru_retry_exception(cb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gru_abort(int ret, void *cb, char *str)</div><div class='add'>+{</div><div class='add'>+	char buf[GRU_EXC_STR_SIZE];</div><div class='add'>+</div><div class='add'>+	panic("GRU FATAL ERROR: %s - %s\n", str,</div><div class='add'>+	      gru_get_cb_exception_detail_str(ret, cb, buf, sizeof(buf)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gru_wait_abort_proc(void *cb)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = gru_wait_proc(cb);</div><div class='add'>+	if (ret)</div><div class='add'>+		gru_abort(ret, cb, "gru_wait_abort");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*------------------------------ MESSAGE QUEUES -----------------------------*/</div><div class='add'>+</div><div class='add'>+/* Internal status . These are NOT returned to the user. */</div><div class='add'>+#define MQIE_AGAIN		-1	/* try again */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Save/restore the "present" flag that is in the second line of 2-line</div><div class='add'>+ * messages</div><div class='add'>+ */</div><div class='add'>+static inline int get_present2(void *p)</div><div class='add'>+{</div><div class='add'>+	struct message_header *mhdr = p + GRU_CACHE_LINE_BYTES;</div><div class='add'>+	return mhdr-&gt;present;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void restore_present2(void *p, int val)</div><div class='add'>+{</div><div class='add'>+	struct message_header *mhdr = p + GRU_CACHE_LINE_BYTES;</div><div class='add'>+	mhdr-&gt;present = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create a message queue.</div><div class='add'>+ * 	qlines - message queue size in cache lines. Includes 2-line header.</div><div class='add'>+ */</div><div class='add'>+int gru_create_message_queue(void *p, unsigned int bytes)</div><div class='add'>+{</div><div class='add'>+	struct message_queue *mq = p;</div><div class='add'>+	unsigned int qlines;</div><div class='add'>+</div><div class='add'>+	qlines = bytes / GRU_CACHE_LINE_BYTES - 2;</div><div class='add'>+	memset(mq, 0, bytes);</div><div class='add'>+	mq-&gt;start = &amp;mq-&gt;data;</div><div class='add'>+	mq-&gt;start2 = &amp;mq-&gt;data + (qlines / 2 - 1) * GRU_CACHE_LINE_BYTES;</div><div class='add'>+	mq-&gt;next = &amp;mq-&gt;data;</div><div class='add'>+	mq-&gt;limit = &amp;mq-&gt;data + (qlines - 2) * GRU_CACHE_LINE_BYTES;</div><div class='add'>+	mq-&gt;qlines = qlines;</div><div class='add'>+	mq-&gt;hstatus[0] = 0;</div><div class='add'>+	mq-&gt;hstatus[1] = 1;</div><div class='add'>+	mq-&gt;head = gru_mesq_head(2, qlines / 2 + 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(gru_create_message_queue);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Send a NOOP message to a message queue</div><div class='add'>+ * 	Returns:</div><div class='add'>+ * 		 0 - if queue is full after the send. This is the normal case</div><div class='add'>+ * 		     but various races can change this.</div><div class='add'>+ *		-1 - if mesq sent successfully but queue not full</div><div class='add'>+ *		&gt;0 - unexpected error. MQE_xxx returned</div><div class='add'>+ */</div><div class='add'>+static int send_noop_message(void *cb,</div><div class='add'>+				unsigned long mq, void *mesg)</div><div class='add'>+{</div><div class='add'>+	const struct message_header noop_header = {</div><div class='add'>+					.present = MQS_NOOP, .lines = 1};</div><div class='add'>+	unsigned long m;</div><div class='add'>+	int substatus, ret;</div><div class='add'>+	struct message_header save_mhdr, *mhdr = mesg;</div><div class='add'>+</div><div class='add'>+	STAT(mesq_noop);</div><div class='add'>+	save_mhdr = *mhdr;</div><div class='add'>+	*mhdr = noop_header;</div><div class='add'>+	gru_mesq(cb, mq, gru_get_tri(mhdr), 1, IMA);</div><div class='add'>+	ret = gru_wait(cb);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		substatus = gru_get_cb_message_queue_substatus(cb);</div><div class='add'>+		switch (substatus) {</div><div class='add'>+		case CBSS_NO_ERROR:</div><div class='add'>+			STAT(mesq_noop_unexpected_error);</div><div class='add'>+			ret = MQE_UNEXPECTED_CB_ERR;</div><div class='add'>+			break;</div><div class='add'>+		case CBSS_LB_OVERFLOWED:</div><div class='add'>+			STAT(mesq_noop_lb_overflow);</div><div class='add'>+			ret = MQE_CONGESTION;</div><div class='add'>+			break;</div><div class='add'>+		case CBSS_QLIMIT_REACHED:</div><div class='add'>+			STAT(mesq_noop_qlimit_reached);</div><div class='add'>+			ret = 0;</div><div class='add'>+			break;</div><div class='add'>+		case CBSS_AMO_NACKED:</div><div class='add'>+			STAT(mesq_noop_amo_nacked);</div><div class='add'>+			ret = MQE_CONGESTION;</div><div class='add'>+			break;</div><div class='add'>+		case CBSS_PUT_NACKED:</div><div class='add'>+			STAT(mesq_noop_put_nacked);</div><div class='add'>+			m = mq + (gru_get_amo_value_head(cb) &lt;&lt; 6);</div><div class='add'>+			gru_vstore(cb, m, gru_get_tri(mesg), XTYPE_CL, 1, 1,</div><div class='add'>+						IMA);</div><div class='add'>+			if (gru_wait(cb) == CBS_IDLE)</div><div class='add'>+				ret = MQIE_AGAIN;</div><div class='add'>+			else</div><div class='add'>+				ret = MQE_UNEXPECTED_CB_ERR;</div><div class='add'>+			break;</div><div class='add'>+		case CBSS_PAGE_OVERFLOW:</div><div class='add'>+		default:</div><div class='add'>+			BUG();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	*mhdr = save_mhdr;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handle a gru_mesq full.</div><div class='add'>+ */</div><div class='add'>+static int send_message_queue_full(void *cb,</div><div class='add'>+			   unsigned long mq, void *mesg, int lines)</div><div class='add'>+{</div><div class='add'>+	union gru_mesqhead mqh;</div><div class='add'>+	unsigned int limit, head;</div><div class='add'>+	unsigned long avalue;</div><div class='add'>+	int half, qlines, save;</div><div class='add'>+</div><div class='add'>+	/* Determine if switching to first/second half of q */</div><div class='add'>+	avalue = gru_get_amo_value(cb);</div><div class='add'>+	head = gru_get_amo_value_head(cb);</div><div class='add'>+	limit = gru_get_amo_value_limit(cb);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Fetch "qlines" from the queue header. Since the queue may be</div><div class='add'>+	 * in memory that can't be accessed using socket addresses, use</div><div class='add'>+	 * the GRU to access the data. Use DSR space from the message.</div><div class='add'>+	 */</div><div class='add'>+	save = *(int *)mesg;</div><div class='add'>+	gru_vload(cb, QLINES(mq), gru_get_tri(mesg), XTYPE_W, 1, 1, IMA);</div><div class='add'>+	if (gru_wait(cb) != CBS_IDLE)</div><div class='add'>+		goto cberr;</div><div class='add'>+	qlines = *(int *)mesg;</div><div class='add'>+	*(int *)mesg = save;</div><div class='add'>+	half = (limit != qlines);</div><div class='add'>+</div><div class='add'>+	if (half)</div><div class='add'>+		mqh = gru_mesq_head(qlines / 2 + 1, qlines);</div><div class='add'>+	else</div><div class='add'>+		mqh = gru_mesq_head(2, qlines / 2 + 1);</div><div class='add'>+</div><div class='add'>+	/* Try to get lock for switching head pointer */</div><div class='add'>+	gru_gamir(cb, EOP_IR_CLR, HSTATUS(mq, half), XTYPE_DW, IMA);</div><div class='add'>+	if (gru_wait(cb) != CBS_IDLE)</div><div class='add'>+		goto cberr;</div><div class='add'>+	if (!gru_get_amo_value(cb)) {</div><div class='add'>+		STAT(mesq_qf_locked);</div><div class='add'>+		return MQE_QUEUE_FULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Got the lock. Send optional NOP if queue not full, */</div><div class='add'>+	if (head != limit) {</div><div class='add'>+		if (send_noop_message(cb, mq, mesg)) {</div><div class='add'>+			gru_gamir(cb, EOP_IR_INC, HSTATUS(mq, half),</div><div class='add'>+					XTYPE_DW, IMA);</div><div class='add'>+			if (gru_wait(cb) != CBS_IDLE)</div><div class='add'>+				goto cberr;</div><div class='add'>+			STAT(mesq_qf_noop_not_full);</div><div class='add'>+			return MQIE_AGAIN;</div><div class='add'>+		}</div><div class='add'>+		avalue++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Then flip queuehead to other half of queue. */</div><div class='add'>+	gru_gamer(cb, EOP_ERR_CSWAP, mq, XTYPE_DW, mqh.val, avalue, IMA);</div><div class='add'>+	if (gru_wait(cb) != CBS_IDLE)</div><div class='add'>+		goto cberr;</div><div class='add'>+</div><div class='add'>+	/* If not successfully in swapping queue head, clear the hstatus lock */</div><div class='add'>+	if (gru_get_amo_value(cb) != avalue) {</div><div class='add'>+		STAT(mesq_qf_switch_head_failed);</div><div class='add'>+		gru_gamir(cb, EOP_IR_INC, HSTATUS(mq, half), XTYPE_DW, IMA);</div><div class='add'>+		if (gru_wait(cb) != CBS_IDLE)</div><div class='add'>+			goto cberr;</div><div class='add'>+	}</div><div class='add'>+	return MQIE_AGAIN;</div><div class='add'>+cberr:</div><div class='add'>+	STAT(mesq_qf_unexpected_error);</div><div class='add'>+	return MQE_UNEXPECTED_CB_ERR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handle a gru_mesq failure. Some of these failures are software recoverable</div><div class='add'>+ * or retryable.</div><div class='add'>+ */</div><div class='add'>+static int send_message_failure(void *cb,</div><div class='add'>+				unsigned long mq,</div><div class='add'>+				void *mesg,</div><div class='add'>+				int lines)</div><div class='add'>+{</div><div class='add'>+	int substatus, ret = 0;</div><div class='add'>+	unsigned long m;</div><div class='add'>+</div><div class='add'>+	substatus = gru_get_cb_message_queue_substatus(cb);</div><div class='add'>+	switch (substatus) {</div><div class='add'>+	case CBSS_NO_ERROR:</div><div class='add'>+		STAT(mesq_send_unexpected_error);</div><div class='add'>+		ret = MQE_UNEXPECTED_CB_ERR;</div><div class='add'>+		break;</div><div class='add'>+	case CBSS_LB_OVERFLOWED:</div><div class='add'>+		STAT(mesq_send_lb_overflow);</div><div class='add'>+		ret = MQE_CONGESTION;</div><div class='add'>+		break;</div><div class='add'>+	case CBSS_QLIMIT_REACHED:</div><div class='add'>+		STAT(mesq_send_qlimit_reached);</div><div class='add'>+		ret = send_message_queue_full(cb, mq, mesg, lines);</div><div class='add'>+		break;</div><div class='add'>+	case CBSS_AMO_NACKED:</div><div class='add'>+		STAT(mesq_send_amo_nacked);</div><div class='add'>+		ret = MQE_CONGESTION;</div><div class='add'>+		break;</div><div class='add'>+	case CBSS_PUT_NACKED:</div><div class='add'>+		STAT(mesq_send_put_nacked);</div><div class='add'>+		m =mq + (gru_get_amo_value_head(cb) &lt;&lt; 6);</div><div class='add'>+		gru_vstore(cb, m, gru_get_tri(mesg), XTYPE_CL, lines, 1, IMA);</div><div class='add'>+		if (gru_wait(cb) == CBS_IDLE)</div><div class='add'>+			ret = MQE_OK;</div><div class='add'>+		else</div><div class='add'>+			ret = MQE_UNEXPECTED_CB_ERR;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Send a message to a message queue</div><div class='add'>+ * 	cb	GRU control block to use to send message</div><div class='add'>+ * 	mq	message queue</div><div class='add'>+ * 	mesg	message. ust be vaddr within a GSEG</div><div class='add'>+ * 	bytes	message size (&lt;= 2 CL)</div><div class='add'>+ */</div><div class='add'>+int gru_send_message_gpa(unsigned long mq, void *mesg, unsigned int bytes)</div><div class='add'>+{</div><div class='add'>+	struct message_header *mhdr;</div><div class='add'>+	void *cb;</div><div class='add'>+	void *dsr;</div><div class='add'>+	int istatus, clines, ret;</div><div class='add'>+</div><div class='add'>+	STAT(mesq_send);</div><div class='add'>+	BUG_ON(bytes &lt; sizeof(int) || bytes &gt; 2 * GRU_CACHE_LINE_BYTES);</div><div class='add'>+</div><div class='add'>+	clines = (bytes + GRU_CACHE_LINE_BYTES - 1) / GRU_CACHE_LINE_BYTES;</div><div class='add'>+	if (gru_get_cpu_resources(bytes, &amp;cb, &amp;dsr))</div><div class='add'>+		return MQE_BUG_NO_RESOURCES;</div><div class='add'>+	memcpy(dsr, mesg, bytes);</div><div class='add'>+	mhdr = dsr;</div><div class='add'>+	mhdr-&gt;present = MQS_FULL;</div><div class='add'>+	mhdr-&gt;lines = clines;</div><div class='add'>+	if (clines == 2) {</div><div class='add'>+		mhdr-&gt;present2 = get_present2(mhdr);</div><div class='add'>+		restore_present2(mhdr, MQS_FULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ret = MQE_OK;</div><div class='add'>+		gru_mesq(cb, mq, gru_get_tri(mhdr), clines, IMA);</div><div class='add'>+		istatus = gru_wait(cb);</div><div class='add'>+		if (istatus != CBS_IDLE)</div><div class='add'>+			ret = send_message_failure(cb, mq, dsr, clines);</div><div class='add'>+	} while (ret == MQIE_AGAIN);</div><div class='add'>+	gru_free_cpu_resources(cb, dsr);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		STAT(mesq_send_failed);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(gru_send_message_gpa);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Advance the receive pointer for the queue to the next message.</div><div class='add'>+ */</div><div class='add'>+void gru_free_message(void *rmq, void *mesg)</div><div class='add'>+{</div><div class='add'>+	struct message_queue *mq = rmq;</div><div class='add'>+	struct message_header *mhdr = mq-&gt;next;</div><div class='add'>+	void *next, *pnext;</div><div class='add'>+	int half = -1;</div><div class='add'>+	int lines = mhdr-&gt;lines;</div><div class='add'>+</div><div class='add'>+	if (lines == 2)</div><div class='add'>+		restore_present2(mhdr, MQS_EMPTY);</div><div class='add'>+	mhdr-&gt;present = MQS_EMPTY;</div><div class='add'>+</div><div class='add'>+	pnext = mq-&gt;next;</div><div class='add'>+	next = pnext + GRU_CACHE_LINE_BYTES * lines;</div><div class='add'>+	if (next == mq-&gt;limit) {</div><div class='add'>+		next = mq-&gt;start;</div><div class='add'>+		half = 1;</div><div class='add'>+	} else if (pnext &lt; mq-&gt;start2 &amp;&amp; next &gt;= mq-&gt;start2) {</div><div class='add'>+		half = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (half &gt;= 0)</div><div class='add'>+		mq-&gt;hstatus[half] = 1;</div><div class='add'>+	mq-&gt;next = next;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(gru_free_message);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get next message from message queue. Return NULL if no message</div><div class='add'>+ * present. User must call next_message() to move to next message.</div><div class='add'>+ * 	rmq	message queue</div><div class='add'>+ */</div><div class='add'>+void *gru_get_next_message(void *rmq)</div><div class='add'>+{</div><div class='add'>+	struct message_queue *mq = rmq;</div><div class='add'>+	struct message_header *mhdr = mq-&gt;next;</div><div class='add'>+	int present = mhdr-&gt;present;</div><div class='add'>+</div><div class='add'>+	/* skip NOOP messages */</div><div class='add'>+	STAT(mesq_receive);</div><div class='add'>+	while (present == MQS_NOOP) {</div><div class='add'>+		gru_free_message(rmq, mhdr);</div><div class='add'>+		mhdr = mq-&gt;next;</div><div class='add'>+		present = mhdr-&gt;present;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for both halves of 2 line messages */</div><div class='add'>+	if (present == MQS_FULL &amp;&amp; mhdr-&gt;lines == 2 &amp;&amp;</div><div class='add'>+				get_present2(mhdr) == MQS_EMPTY)</div><div class='add'>+		present = MQS_EMPTY;</div><div class='add'>+</div><div class='add'>+	if (!present) {</div><div class='add'>+		STAT(mesq_receive_none);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mhdr-&gt;lines == 2)</div><div class='add'>+		restore_present2(mhdr, mhdr-&gt;present2);</div><div class='add'>+</div><div class='add'>+	return mhdr;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(gru_get_next_message);</div><div class='add'>+</div><div class='add'>+/* ---------------------- GRU DATA COPY FUNCTIONS ---------------------------*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copy a block of data using the GRU resources</div><div class='add'>+ */</div><div class='add'>+int gru_copy_gpa(unsigned long dest_gpa, unsigned long src_gpa,</div><div class='add'>+				unsigned int bytes)</div><div class='add'>+{</div><div class='add'>+	void *cb;</div><div class='add'>+	void *dsr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	STAT(copy_gpa);</div><div class='add'>+	if (gru_get_cpu_resources(GRU_NUM_KERNEL_DSR_BYTES, &amp;cb, &amp;dsr))</div><div class='add'>+		return MQE_BUG_NO_RESOURCES;</div><div class='add'>+	gru_bcopy(cb, src_gpa, dest_gpa, gru_get_tri(dsr),</div><div class='add'>+		  XTYPE_B, bytes, GRU_NUM_KERNEL_DSR_BYTES, IMA);</div><div class='add'>+	ret = gru_wait(cb);</div><div class='add'>+	gru_free_cpu_resources(cb, dsr);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(gru_copy_gpa);</div><div class='add'>+</div><div class='add'>+/* ------------------- KERNEL QUICKTESTS RUN AT STARTUP ----------------*/</div><div class='add'>+/* 	Temp - will delete after we gain confidence in the GRU		*/</div><div class='add'>+static __cacheline_aligned unsigned long word0;</div><div class='add'>+static __cacheline_aligned unsigned long word1;</div><div class='add'>+</div><div class='add'>+static int quicktest(struct gru_state *gru)</div><div class='add'>+{</div><div class='add'>+	void *cb;</div><div class='add'>+	void *ds;</div><div class='add'>+	unsigned long *p;</div><div class='add'>+</div><div class='add'>+	cb = get_gseg_base_address_cb(gru-&gt;gs_gru_base_vaddr, KERNEL_CTXNUM, 0);</div><div class='add'>+	ds = get_gseg_base_address_ds(gru-&gt;gs_gru_base_vaddr, KERNEL_CTXNUM, 0);</div><div class='add'>+	p = ds;</div><div class='add'>+	word0 = MAGIC;</div><div class='add'>+</div><div class='add'>+	gru_vload(cb, uv_gpa(&amp;word0), 0, XTYPE_DW, 1, 1, IMA);</div><div class='add'>+	if (gru_wait(cb) != CBS_IDLE)</div><div class='add'>+		BUG();</div><div class='add'>+</div><div class='add'>+	if (*(unsigned long *)ds != MAGIC)</div><div class='add'>+		BUG();</div><div class='add'>+	gru_vstore(cb, uv_gpa(&amp;word1), 0, XTYPE_DW, 1, 1, IMA);</div><div class='add'>+	if (gru_wait(cb) != CBS_IDLE)</div><div class='add'>+		BUG();</div><div class='add'>+</div><div class='add'>+	if (word0 != word1 || word0 != MAGIC) {</div><div class='add'>+		printk</div><div class='add'>+		    ("GRU quicktest err: gru %d, found 0x%lx, expected 0x%lx\n",</div><div class='add'>+		     gru-&gt;gs_gid, word1, MAGIC);</div><div class='add'>+		BUG();		/* ZZZ should not be fatal */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int gru_kservices_init(struct gru_state *gru)</div><div class='add'>+{</div><div class='add'>+	struct gru_blade_state *bs;</div><div class='add'>+	struct gru_context_configuration_handle *cch;</div><div class='add'>+	unsigned long cbr_map, dsr_map;</div><div class='add'>+	int err, num, cpus_possible;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Currently, resources are reserved ONLY on the second chiplet</div><div class='add'>+	 * on each blade. This leaves ALL resources on chiplet 0 available</div><div class='add'>+	 * for user code.</div><div class='add'>+	 */</div><div class='add'>+	bs = gru-&gt;gs_blade;</div><div class='add'>+	if (gru != &amp;bs-&gt;bs_grus[1])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cpus_possible = uv_blade_nr_possible_cpus(gru-&gt;gs_blade_id);</div><div class='add'>+</div><div class='add'>+	num = GRU_NUM_KERNEL_CBR * cpus_possible;</div><div class='add'>+	cbr_map = gru_reserve_cb_resources(gru, GRU_CB_COUNT_TO_AU(num), NULL);</div><div class='add'>+	gru-&gt;gs_reserved_cbrs += num;</div><div class='add'>+</div><div class='add'>+	num = GRU_NUM_KERNEL_DSR_BYTES * cpus_possible;</div><div class='add'>+	dsr_map = gru_reserve_ds_resources(gru, GRU_DS_BYTES_TO_AU(num), NULL);</div><div class='add'>+	gru-&gt;gs_reserved_dsr_bytes += num;</div><div class='add'>+</div><div class='add'>+	gru-&gt;gs_active_contexts++;</div><div class='add'>+	__set_bit(KERNEL_CTXNUM, &amp;gru-&gt;gs_context_map);</div><div class='add'>+	cch = get_cch(gru-&gt;gs_gru_base_vaddr, KERNEL_CTXNUM);</div><div class='add'>+</div><div class='add'>+	bs-&gt;kernel_cb = get_gseg_base_address_cb(gru-&gt;gs_gru_base_vaddr,</div><div class='add'>+					KERNEL_CTXNUM, 0);</div><div class='add'>+	bs-&gt;kernel_dsr = get_gseg_base_address_ds(gru-&gt;gs_gru_base_vaddr,</div><div class='add'>+					KERNEL_CTXNUM, 0);</div><div class='add'>+</div><div class='add'>+	lock_cch_handle(cch);</div><div class='add'>+	cch-&gt;tfm_fault_bit_enable = 0;</div><div class='add'>+	cch-&gt;tlb_int_enable = 0;</div><div class='add'>+	cch-&gt;tfm_done_bit_enable = 0;</div><div class='add'>+	cch-&gt;unmap_enable = 1;</div><div class='add'>+	err = cch_allocate(cch, 0, cbr_map, dsr_map);</div><div class='add'>+	if (err) {</div><div class='add'>+		gru_dbg(grudev,</div><div class='add'>+			"Unable to allocate kernel CCH: gru %d, err %d\n",</div><div class='add'>+			gru-&gt;gs_gid, err);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+	if (cch_start(cch)) {</div><div class='add'>+		gru_dbg(grudev, "Unable to start kernel CCH: gru %d, err %d\n",</div><div class='add'>+			gru-&gt;gs_gid, err);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+	unlock_cch_handle(cch);</div><div class='add'>+</div><div class='add'>+	if (gru_options &amp; GRU_QUICKLOOK)</div><div class='add'>+		quicktest(gru);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/misc/sgi-gru/grukservices.h b/drivers/misc/sgi-gru/grukservices.h<br/>new file mode 100644<br/>index 000000000000..eb17e0a3ac61<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-gru/grukservices.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/grukservices.h</a></div><div class='hunk'>@@ -0,0 +1,134 @@</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+#ifndef __GRU_KSERVICES_H_</div><div class='add'>+#define __GRU_KSERVICES_H_</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Message queues using the GRU to send/receive messages.</div><div class='add'>+ *</div><div class='add'>+ * These function allow the user to create a message queue for</div><div class='add'>+ * sending/receiving 1 or 2 cacheline messages using the GRU.</div><div class='add'>+ *</div><div class='add'>+ * Processes SENDING messages will use a kernel CBR/DSR to send</div><div class='add'>+ * the message. This is transparent to the caller.</div><div class='add'>+ *</div><div class='add'>+ * The receiver does not use any GRU resources.</div><div class='add'>+ *</div><div class='add'>+ * The functions support:</div><div class='add'>+ * 	- single receiver</div><div class='add'>+ * 	- multiple senders</div><div class='add'>+ *	- cross partition message</div><div class='add'>+ *</div><div class='add'>+ * Missing features ZZZ:</div><div class='add'>+ * 	- user options for dealing with timeouts, queue full, etc.</div><div class='add'>+ * 	- gru_create_message_queue() needs interrupt vector info</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize a user allocated chunk of memory to be used as</div><div class='add'>+ * a message queue. The caller must ensure that the queue is</div><div class='add'>+ * in contiguous physical memory and is cacheline aligned.</div><div class='add'>+ *</div><div class='add'>+ * Message queue size is the total number of bytes allocated</div><div class='add'>+ * to the queue including a 2 cacheline header that is used</div><div class='add'>+ * to manage the queue.</div><div class='add'>+ *</div><div class='add'>+ *  Input:</div><div class='add'>+ * 	p	pointer to user allocated memory.</div><div class='add'>+ * 	bytes	size of message queue in bytes</div><div class='add'>+ *</div><div class='add'>+ *  Errors:</div><div class='add'>+ *  	0	OK</div><div class='add'>+ *  	&gt;0	error</div><div class='add'>+ */</div><div class='add'>+extern int gru_create_message_queue(void *p, unsigned int bytes);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Send a message to a message queue.</div><div class='add'>+ *</div><div class='add'>+ * Note: The message queue transport mechanism uses the first 32</div><div class='add'>+ * bits of the message. Users should avoid using these bits.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ *   Input:</div><div class='add'>+ * 	xmq	message queue - must be a UV global physical address</div><div class='add'>+ * 	mesg	pointer to message. Must be 64-bit aligned</div><div class='add'>+ * 	bytes	size of message in bytes</div><div class='add'>+ *</div><div class='add'>+ *   Output:</div><div class='add'>+ *      0	message sent</div><div class='add'>+ *     &gt;0	Send failure - see error codes below</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+extern int gru_send_message_gpa(unsigned long mq_gpa, void *mesg,</div><div class='add'>+						unsigned int bytes);</div><div class='add'>+</div><div class='add'>+/* Status values for gru_send_message() */</div><div class='add'>+#define MQE_OK			0	/* message sent successfully */</div><div class='add'>+#define MQE_CONGESTION		1	/* temporary congestion, try again */</div><div class='add'>+#define MQE_QUEUE_FULL		2	/* queue is full */</div><div class='add'>+#define MQE_UNEXPECTED_CB_ERR	3	/* unexpected CB error */</div><div class='add'>+#define MQE_PAGE_OVERFLOW	10	/* BUG - queue overflowed a page */</div><div class='add'>+#define MQE_BUG_NO_RESOURCES	11	/* BUG - could not alloc GRU cb/dsr */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Advance the receive pointer for the message queue to the next message.</div><div class='add'>+ * Note: current API requires messages to be gotten &amp; freed in order. Future</div><div class='add'>+ * API extensions may allow for out-of-order freeing.</div><div class='add'>+ *</div><div class='add'>+ *   Input</div><div class='add'>+ * 	mq	message queue</div><div class='add'>+ * 	mesq	message being freed</div><div class='add'>+ */</div><div class='add'>+extern void gru_free_message(void *mq, void *mesq);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get next message from message queue. Returns pointer to</div><div class='add'>+ * message OR NULL if no message present.</div><div class='add'>+ * User must call gru_free_message() after message is processed</div><div class='add'>+ * in order to move the queue pointers to next message.</div><div class='add'>+ *</div><div class='add'>+ *   Input</div><div class='add'>+ * 	mq	message queue</div><div class='add'>+ *</div><div class='add'>+ *   Output:</div><div class='add'>+ *	p	pointer to message</div><div class='add'>+ *	NULL	no message available</div><div class='add'>+ */</div><div class='add'>+extern void *gru_get_next_message(void *mq);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copy data using the GRU. Source or destination can be located in a remote</div><div class='add'>+ * partition.</div><div class='add'>+ *</div><div class='add'>+ *    Input:</div><div class='add'>+ *    	dest_gpa	destination global physical address</div><div class='add'>+ *    	src_gpa		source global physical address</div><div class='add'>+ *    	bytes		number of bytes to copy</div><div class='add'>+ *</div><div class='add'>+ *    Output:</div><div class='add'>+ *	0		OK</div><div class='add'>+ *	&gt;0		error</div><div class='add'>+ */</div><div class='add'>+extern int gru_copy_gpa(unsigned long dest_gpa, unsigned long src_gpa,</div><div class='add'>+							unsigned int bytes);</div><div class='add'>+</div><div class='add'>+#endif 		/* __GRU_KSERVICES_H_ */</div><div class='head'>diff --git a/drivers/misc/sgi-gru/grulib.h b/drivers/misc/sgi-gru/grulib.h<br/>new file mode 100644<br/>index 000000000000..e56e196a6998<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-gru/grulib.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/grulib.h</a></div><div class='hunk'>@@ -0,0 +1,97 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU Lesser General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2.1 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU Lesser General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU Lesser General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __GRULIB_H__</div><div class='add'>+#define __GRULIB_H__</div><div class='add'>+</div><div class='add'>+#define GRU_BASENAME		"gru"</div><div class='add'>+#define GRU_FULLNAME		"/dev/gru"</div><div class='add'>+#define GRU_IOCTL_NUM 		 'G'</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Maximum number of GRU segments that a user can have open</div><div class='add'>+ * ZZZ temp - set high for testing. Revisit.</div><div class='add'>+ */</div><div class='add'>+#define GRU_MAX_OPEN_CONTEXTS		32</div><div class='add'>+</div><div class='add'>+/* Set Number of Request Blocks */</div><div class='add'>+#define GRU_CREATE_CONTEXT		_IOWR(GRU_IOCTL_NUM, 1, void *)</div><div class='add'>+</div><div class='add'>+/* Register task as using the slice */</div><div class='add'>+#define GRU_SET_TASK_SLICE		_IOWR(GRU_IOCTL_NUM, 5, void *)</div><div class='add'>+</div><div class='add'>+/* Fetch exception detail */</div><div class='add'>+#define GRU_USER_GET_EXCEPTION_DETAIL	_IOWR(GRU_IOCTL_NUM, 6, void *)</div><div class='add'>+</div><div class='add'>+/* For user call_os handling - normally a TLB fault */</div><div class='add'>+#define GRU_USER_CALL_OS		_IOWR(GRU_IOCTL_NUM, 8, void *)</div><div class='add'>+</div><div class='add'>+/* For user unload context */</div><div class='add'>+#define GRU_USER_UNLOAD_CONTEXT		_IOWR(GRU_IOCTL_NUM, 9, void *)</div><div class='add'>+</div><div class='add'>+/* For fetching GRU chiplet status */</div><div class='add'>+#define GRU_GET_CHIPLET_STATUS		_IOWR(GRU_IOCTL_NUM, 10, void *)</div><div class='add'>+</div><div class='add'>+/* For user TLB flushing (primarily for tests) */</div><div class='add'>+#define GRU_USER_FLUSH_TLB		_IOWR(GRU_IOCTL_NUM, 50, void *)</div><div class='add'>+</div><div class='add'>+/* Get some config options (primarily for tests &amp; emulator) */</div><div class='add'>+#define GRU_GET_CONFIG_INFO		_IOWR(GRU_IOCTL_NUM, 51, void *)</div><div class='add'>+</div><div class='add'>+#define CONTEXT_WINDOW_BYTES(th)        (GRU_GSEG_PAGESIZE * (th))</div><div class='add'>+#define THREAD_POINTER(p, th)		(p + GRU_GSEG_PAGESIZE * (th))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Structure used to pass TLB flush parameters to the driver</div><div class='add'>+ */</div><div class='add'>+struct gru_create_context_req {</div><div class='add'>+	unsigned long		gseg;</div><div class='add'>+	unsigned int		data_segment_bytes;</div><div class='add'>+	unsigned int		control_blocks;</div><div class='add'>+	unsigned int		maximum_thread_count;</div><div class='add'>+	unsigned int		options;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Structure used to pass unload context parameters to the driver</div><div class='add'>+ */</div><div class='add'>+struct gru_unload_context_req {</div><div class='add'>+	unsigned long	gseg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Structure used to pass TLB flush parameters to the driver</div><div class='add'>+ */</div><div class='add'>+struct gru_flush_tlb_req {</div><div class='add'>+	unsigned long	gseg;</div><div class='add'>+	unsigned long	vaddr;</div><div class='add'>+	size_t		len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GRU configuration info (temp - for testing)</div><div class='add'>+ */</div><div class='add'>+struct gru_config_info {</div><div class='add'>+	int		cpus;</div><div class='add'>+	int		blades;</div><div class='add'>+	int		nodes;</div><div class='add'>+	int		chiplets;</div><div class='add'>+	int		fill[16];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __GRULIB_H__ */</div><div class='head'>diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c<br/>new file mode 100644<br/>index 000000000000..0eeb8dddd2f5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-gru/grumain.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/grumain.c</a></div><div class='hunk'>@@ -0,0 +1,802 @@</div><div class='add'>+/*</div><div class='add'>+ * SN Platform GRU Driver</div><div class='add'>+ *</div><div class='add'>+ *            DRIVER TABLE MANAGER + GRU CONTEXT LOAD/UNLOAD</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;asm/uv/uv_hub.h&gt;</div><div class='add'>+#include "gru.h"</div><div class='add'>+#include "grutables.h"</div><div class='add'>+#include "gruhandles.h"</div><div class='add'>+</div><div class='add'>+unsigned long gru_options __read_mostly;</div><div class='add'>+</div><div class='add'>+static struct device_driver gru_driver = {</div><div class='add'>+	.name = "gru"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct device gru_device = {</div><div class='add'>+	.bus_id = {0},</div><div class='add'>+	.driver = &amp;gru_driver,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct device *grudev = &amp;gru_device;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Select a gru fault map to be used by the current cpu. Note that</div><div class='add'>+ * multiple cpus may be using the same map.</div><div class='add'>+ *	ZZZ should "shift" be used?? Depends on HT cpu numbering</div><div class='add'>+ *	ZZZ should be inline but did not work on emulator</div><div class='add'>+ */</div><div class='add'>+int gru_cpu_fault_map_id(void)</div><div class='add'>+{</div><div class='add'>+	return uv_blade_processor_id() % GRU_NUM_TFM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*--------- ASID Management -------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ *  Initially, assign asids sequentially from MIN_ASID .. MAX_ASID.</div><div class='add'>+ *  Once MAX is reached, flush the TLB &amp; start over. However,</div><div class='add'>+ *  some asids may still be in use. There won't be many (percentage wise) still</div><div class='add'>+ *  in use. Search active contexts &amp; determine the value of the first</div><div class='add'>+ *  asid in use ("x"s below). Set "limit" to this value.</div><div class='add'>+ *  This defines a block of assignable asids.</div><div class='add'>+ *</div><div class='add'>+ *  When "limit" is reached, search forward from limit+1 and determine the</div><div class='add'>+ *  next block of assignable asids.</div><div class='add'>+ *</div><div class='add'>+ *  Repeat until MAX_ASID is reached, then start over again.</div><div class='add'>+ *</div><div class='add'>+ *  Each time MAX_ASID is reached, increment the asid generation. Since</div><div class='add'>+ *  the search for in-use asids only checks contexts with GRUs currently</div><div class='add'>+ *  assigned, asids in some contexts will be missed. Prior to loading</div><div class='add'>+ *  a context, the asid generation of the GTS asid is rechecked. If it</div><div class='add'>+ *  doesn't match the current generation, a new asid will be assigned.</div><div class='add'>+ *</div><div class='add'>+ *   	0---------------x------------x---------------------x----|</div><div class='add'>+ *	  ^-next	^-limit	   				^-MAX_ASID</div><div class='add'>+ *</div><div class='add'>+ * All asid manipulation &amp; context loading/unloading is protected by the</div><div class='add'>+ * gs_lock.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Hit the asid limit. Start over */</div><div class='add'>+static int gru_wrap_asid(struct gru_state *gru)</div><div class='add'>+{</div><div class='add'>+	gru_dbg(grudev, "gru %p\n", gru);</div><div class='add'>+	STAT(asid_wrap);</div><div class='add'>+	gru-&gt;gs_asid_gen++;</div><div class='add'>+	gru_flush_all_tlb(gru);</div><div class='add'>+	return MIN_ASID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Find the next chunk of unused asids */</div><div class='add'>+static int gru_reset_asid_limit(struct gru_state *gru, int asid)</div><div class='add'>+{</div><div class='add'>+	int i, gid, inuse_asid, limit;</div><div class='add'>+</div><div class='add'>+	gru_dbg(grudev, "gru %p, asid 0x%x\n", gru, asid);</div><div class='add'>+	STAT(asid_next);</div><div class='add'>+	limit = MAX_ASID;</div><div class='add'>+	if (asid &gt;= limit)</div><div class='add'>+		asid = gru_wrap_asid(gru);</div><div class='add'>+	gid = gru-&gt;gs_gid;</div><div class='add'>+again:</div><div class='add'>+	for (i = 0; i &lt; GRU_NUM_CCH; i++) {</div><div class='add'>+		if (!gru-&gt;gs_gts[i])</div><div class='add'>+			continue;</div><div class='add'>+		inuse_asid = gru-&gt;gs_gts[i]-&gt;ts_gms-&gt;ms_asids[gid].mt_asid;</div><div class='add'>+		gru_dbg(grudev, "gru %p, inuse_asid 0x%x, cxtnum %d, gts %p\n",</div><div class='add'>+			gru, inuse_asid, i, gru-&gt;gs_gts[i]);</div><div class='add'>+		if (inuse_asid == asid) {</div><div class='add'>+			asid += ASID_INC;</div><div class='add'>+			if (asid &gt;= limit) {</div><div class='add'>+				/*</div><div class='add'>+				 * empty range: reset the range limit and</div><div class='add'>+				 * start over</div><div class='add'>+				 */</div><div class='add'>+				limit = MAX_ASID;</div><div class='add'>+				if (asid &gt;= MAX_ASID)</div><div class='add'>+					asid = gru_wrap_asid(gru);</div><div class='add'>+				goto again;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((inuse_asid &gt; asid) &amp;&amp; (inuse_asid &lt; limit))</div><div class='add'>+			limit = inuse_asid;</div><div class='add'>+	}</div><div class='add'>+	gru-&gt;gs_asid_limit = limit;</div><div class='add'>+	gru-&gt;gs_asid = asid;</div><div class='add'>+	gru_dbg(grudev, "gru %p, new asid 0x%x, new_limit 0x%x\n", gru, asid,</div><div class='add'>+		limit);</div><div class='add'>+	return asid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Assign a new ASID to a thread context.  */</div><div class='add'>+static int gru_assign_asid(struct gru_state *gru)</div><div class='add'>+{</div><div class='add'>+	int asid;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;gru-&gt;gs_asid_lock);</div><div class='add'>+	gru-&gt;gs_asid += ASID_INC;</div><div class='add'>+	asid = gru-&gt;gs_asid;</div><div class='add'>+	if (asid &gt;= gru-&gt;gs_asid_limit)</div><div class='add'>+		asid = gru_reset_asid_limit(gru, asid);</div><div class='add'>+	spin_unlock(&amp;gru-&gt;gs_asid_lock);</div><div class='add'>+</div><div class='add'>+	gru_dbg(grudev, "gru %p, asid 0x%x\n", gru, asid);</div><div class='add'>+	return asid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clear n bits in a word. Return a word indicating the bits that were cleared.</div><div class='add'>+ * Optionally, build an array of chars that contain the bit numbers allocated.</div><div class='add'>+ */</div><div class='add'>+static unsigned long reserve_resources(unsigned long *p, int n, int mmax,</div><div class='add'>+				       char *idx)</div><div class='add'>+{</div><div class='add'>+	unsigned long bits = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		i = find_first_bit(p, mmax);</div><div class='add'>+		if (i == mmax)</div><div class='add'>+			BUG();</div><div class='add'>+		__clear_bit(i, p);</div><div class='add'>+		__set_bit(i, &amp;bits);</div><div class='add'>+		if (idx)</div><div class='add'>+			*idx++ = i;</div><div class='add'>+	} while (--n);</div><div class='add'>+	return bits;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long gru_reserve_cb_resources(struct gru_state *gru, int cbr_au_count,</div><div class='add'>+				       char *cbmap)</div><div class='add'>+{</div><div class='add'>+	return reserve_resources(&amp;gru-&gt;gs_cbr_map, cbr_au_count, GRU_CBR_AU,</div><div class='add'>+				 cbmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long gru_reserve_ds_resources(struct gru_state *gru, int dsr_au_count,</div><div class='add'>+				       char *dsmap)</div><div class='add'>+{</div><div class='add'>+	return reserve_resources(&amp;gru-&gt;gs_dsr_map, dsr_au_count, GRU_DSR_AU,</div><div class='add'>+				 dsmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reserve_gru_resources(struct gru_state *gru,</div><div class='add'>+				  struct gru_thread_state *gts)</div><div class='add'>+{</div><div class='add'>+	gru-&gt;gs_active_contexts++;</div><div class='add'>+	gts-&gt;ts_cbr_map =</div><div class='add'>+	    gru_reserve_cb_resources(gru, gts-&gt;ts_cbr_au_count,</div><div class='add'>+				     gts-&gt;ts_cbr_idx);</div><div class='add'>+	gts-&gt;ts_dsr_map =</div><div class='add'>+	    gru_reserve_ds_resources(gru, gts-&gt;ts_dsr_au_count, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_gru_resources(struct gru_state *gru,</div><div class='add'>+			       struct gru_thread_state *gts)</div><div class='add'>+{</div><div class='add'>+	gru-&gt;gs_active_contexts--;</div><div class='add'>+	gru-&gt;gs_cbr_map |= gts-&gt;ts_cbr_map;</div><div class='add'>+	gru-&gt;gs_dsr_map |= gts-&gt;ts_dsr_map;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if a GRU has sufficient free resources to satisfy an allocation</div><div class='add'>+ * request. Note: GRU locks may or may not be held when this is called. If</div><div class='add'>+ * not held, recheck after acquiring the appropriate locks.</div><div class='add'>+ *</div><div class='add'>+ * Returns 1 if sufficient resources, 0 if not</div><div class='add'>+ */</div><div class='add'>+static int check_gru_resources(struct gru_state *gru, int cbr_au_count,</div><div class='add'>+			       int dsr_au_count, int max_active_contexts)</div><div class='add'>+{</div><div class='add'>+	return hweight64(gru-&gt;gs_cbr_map) &gt;= cbr_au_count</div><div class='add'>+		&amp;&amp; hweight64(gru-&gt;gs_dsr_map) &gt;= dsr_au_count</div><div class='add'>+		&amp;&amp; gru-&gt;gs_active_contexts &lt; max_active_contexts;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TLB manangment requires tracking all GRU chiplets that have loaded a GSEG</div><div class='add'>+ * context.</div><div class='add'>+ */</div><div class='add'>+static int gru_load_mm_tracker(struct gru_state *gru, struct gru_mm_struct *gms,</div><div class='add'>+			       int ctxnum)</div><div class='add'>+{</div><div class='add'>+	struct gru_mm_tracker *asids = &amp;gms-&gt;ms_asids[gru-&gt;gs_gid];</div><div class='add'>+	unsigned short ctxbitmap = (1 &lt;&lt; ctxnum);</div><div class='add'>+	int asid;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;gms-&gt;ms_asid_lock);</div><div class='add'>+	asid = asids-&gt;mt_asid;</div><div class='add'>+</div><div class='add'>+	if (asid == 0 || asids-&gt;mt_asid_gen != gru-&gt;gs_asid_gen) {</div><div class='add'>+		asid = gru_assign_asid(gru);</div><div class='add'>+		asids-&gt;mt_asid = asid;</div><div class='add'>+		asids-&gt;mt_asid_gen = gru-&gt;gs_asid_gen;</div><div class='add'>+		STAT(asid_new);</div><div class='add'>+	} else {</div><div class='add'>+		STAT(asid_reuse);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUG_ON(asids-&gt;mt_ctxbitmap &amp; ctxbitmap);</div><div class='add'>+	asids-&gt;mt_ctxbitmap |= ctxbitmap;</div><div class='add'>+	if (!test_bit(gru-&gt;gs_gid, gms-&gt;ms_asidmap))</div><div class='add'>+		__set_bit(gru-&gt;gs_gid, gms-&gt;ms_asidmap);</div><div class='add'>+	spin_unlock(&amp;gms-&gt;ms_asid_lock);</div><div class='add'>+</div><div class='add'>+	gru_dbg(grudev,</div><div class='add'>+		"gru %x, gms %p, ctxnum 0x%d, asid 0x%x, asidmap 0x%lx\n",</div><div class='add'>+		gru-&gt;gs_gid, gms, ctxnum, asid, gms-&gt;ms_asidmap[0]);</div><div class='add'>+	return asid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gru_unload_mm_tracker(struct gru_state *gru,</div><div class='add'>+				  struct gru_mm_struct *gms, int ctxnum)</div><div class='add'>+{</div><div class='add'>+	struct gru_mm_tracker *asids;</div><div class='add'>+	unsigned short ctxbitmap;</div><div class='add'>+</div><div class='add'>+	asids = &amp;gms-&gt;ms_asids[gru-&gt;gs_gid];</div><div class='add'>+	ctxbitmap = (1 &lt;&lt; ctxnum);</div><div class='add'>+	spin_lock(&amp;gms-&gt;ms_asid_lock);</div><div class='add'>+	BUG_ON((asids-&gt;mt_ctxbitmap &amp; ctxbitmap) != ctxbitmap);</div><div class='add'>+	asids-&gt;mt_ctxbitmap ^= ctxbitmap;</div><div class='add'>+	gru_dbg(grudev, "gru %x, gms %p, ctxnum 0x%d, asidmap 0x%lx\n",</div><div class='add'>+		gru-&gt;gs_gid, gms, ctxnum, gms-&gt;ms_asidmap[0]);</div><div class='add'>+	spin_unlock(&amp;gms-&gt;ms_asid_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Decrement the reference count on a GTS structure. Free the structure</div><div class='add'>+ * if the reference count goes to zero.</div><div class='add'>+ */</div><div class='add'>+void gts_drop(struct gru_thread_state *gts)</div><div class='add'>+{</div><div class='add'>+	if (gts &amp;&amp; atomic_dec_return(&amp;gts-&gt;ts_refcnt) == 0) {</div><div class='add'>+		gru_drop_mmu_notifier(gts-&gt;ts_gms);</div><div class='add'>+		kfree(gts);</div><div class='add'>+		STAT(gts_free);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Locate the GTS structure for the current thread.</div><div class='add'>+ */</div><div class='add'>+static struct gru_thread_state *gru_find_current_gts_nolock(struct gru_vma_data</div><div class='add'>+			    *vdata, int tsid)</div><div class='add'>+{</div><div class='add'>+	struct gru_thread_state *gts;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(gts, &amp;vdata-&gt;vd_head, ts_next)</div><div class='add'>+	    if (gts-&gt;ts_tsid == tsid)</div><div class='add'>+		return gts;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate a thread state structure.</div><div class='add'>+ */</div><div class='add'>+static struct gru_thread_state *gru_alloc_gts(struct vm_area_struct *vma,</div><div class='add'>+					      struct gru_vma_data *vdata,</div><div class='add'>+					      int tsid)</div><div class='add'>+{</div><div class='add'>+	struct gru_thread_state *gts;</div><div class='add'>+	int bytes;</div><div class='add'>+</div><div class='add'>+	bytes = DSR_BYTES(vdata-&gt;vd_dsr_au_count) +</div><div class='add'>+				CBR_BYTES(vdata-&gt;vd_cbr_au_count);</div><div class='add'>+	bytes += sizeof(struct gru_thread_state);</div><div class='add'>+	gts = kzalloc(bytes, GFP_KERNEL);</div><div class='add'>+	if (!gts)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	STAT(gts_alloc);</div><div class='add'>+	atomic_set(&amp;gts-&gt;ts_refcnt, 1);</div><div class='add'>+	mutex_init(&amp;gts-&gt;ts_ctxlock);</div><div class='add'>+	gts-&gt;ts_cbr_au_count = vdata-&gt;vd_cbr_au_count;</div><div class='add'>+	gts-&gt;ts_dsr_au_count = vdata-&gt;vd_dsr_au_count;</div><div class='add'>+	gts-&gt;ts_user_options = vdata-&gt;vd_user_options;</div><div class='add'>+	gts-&gt;ts_tsid = tsid;</div><div class='add'>+	gts-&gt;ts_user_options = vdata-&gt;vd_user_options;</div><div class='add'>+	gts-&gt;ts_ctxnum = NULLCTX;</div><div class='add'>+	gts-&gt;ts_mm = current-&gt;mm;</div><div class='add'>+	gts-&gt;ts_vma = vma;</div><div class='add'>+	gts-&gt;ts_tlb_int_select = -1;</div><div class='add'>+	gts-&gt;ts_gms = gru_register_mmu_notifier();</div><div class='add'>+	if (!gts-&gt;ts_gms)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	gru_dbg(grudev, "alloc vdata %p, new gts %p\n", vdata, gts);</div><div class='add'>+	return gts;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	gts_drop(gts);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate a vma private data structure.</div><div class='add'>+ */</div><div class='add'>+struct gru_vma_data *gru_alloc_vma_data(struct vm_area_struct *vma, int tsid)</div><div class='add'>+{</div><div class='add'>+	struct gru_vma_data *vdata = NULL;</div><div class='add'>+</div><div class='add'>+	vdata = kmalloc(sizeof(*vdata), GFP_KERNEL);</div><div class='add'>+	if (!vdata)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;vdata-&gt;vd_head);</div><div class='add'>+	spin_lock_init(&amp;vdata-&gt;vd_lock);</div><div class='add'>+	gru_dbg(grudev, "alloc vdata %p\n", vdata);</div><div class='add'>+	return vdata;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find the thread state structure for the current thread.</div><div class='add'>+ */</div><div class='add'>+struct gru_thread_state *gru_find_thread_state(struct vm_area_struct *vma,</div><div class='add'>+					int tsid)</div><div class='add'>+{</div><div class='add'>+	struct gru_vma_data *vdata = vma-&gt;vm_private_data;</div><div class='add'>+	struct gru_thread_state *gts;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;vdata-&gt;vd_lock);</div><div class='add'>+	gts = gru_find_current_gts_nolock(vdata, tsid);</div><div class='add'>+	spin_unlock(&amp;vdata-&gt;vd_lock);</div><div class='add'>+	gru_dbg(grudev, "vma %p, gts %p\n", vma, gts);</div><div class='add'>+	return gts;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate a new thread state for a GSEG. Note that races may allow</div><div class='add'>+ * another thread to race to create a gts.</div><div class='add'>+ */</div><div class='add'>+struct gru_thread_state *gru_alloc_thread_state(struct vm_area_struct *vma,</div><div class='add'>+					int tsid)</div><div class='add'>+{</div><div class='add'>+	struct gru_vma_data *vdata = vma-&gt;vm_private_data;</div><div class='add'>+	struct gru_thread_state *gts, *ngts;</div><div class='add'>+</div><div class='add'>+	gts = gru_alloc_gts(vma, vdata, tsid);</div><div class='add'>+	if (!gts)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;vdata-&gt;vd_lock);</div><div class='add'>+	ngts = gru_find_current_gts_nolock(vdata, tsid);</div><div class='add'>+	if (ngts) {</div><div class='add'>+		gts_drop(gts);</div><div class='add'>+		gts = ngts;</div><div class='add'>+		STAT(gts_double_allocate);</div><div class='add'>+	} else {</div><div class='add'>+		list_add(&amp;gts-&gt;ts_next, &amp;vdata-&gt;vd_head);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;vdata-&gt;vd_lock);</div><div class='add'>+	gru_dbg(grudev, "vma %p, gts %p\n", vma, gts);</div><div class='add'>+	return gts;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Free the GRU context assigned to the thread state.</div><div class='add'>+ */</div><div class='add'>+static void gru_free_gru_context(struct gru_thread_state *gts)</div><div class='add'>+{</div><div class='add'>+	struct gru_state *gru;</div><div class='add'>+</div><div class='add'>+	gru = gts-&gt;ts_gru;</div><div class='add'>+	gru_dbg(grudev, "gts %p, gru %p\n", gts, gru);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;gru-&gt;gs_lock);</div><div class='add'>+	gru-&gt;gs_gts[gts-&gt;ts_ctxnum] = NULL;</div><div class='add'>+	free_gru_resources(gru, gts);</div><div class='add'>+	BUG_ON(test_bit(gts-&gt;ts_ctxnum, &amp;gru-&gt;gs_context_map) == 0);</div><div class='add'>+	__clear_bit(gts-&gt;ts_ctxnum, &amp;gru-&gt;gs_context_map);</div><div class='add'>+	gts-&gt;ts_ctxnum = NULLCTX;</div><div class='add'>+	gts-&gt;ts_gru = NULL;</div><div class='add'>+	spin_unlock(&amp;gru-&gt;gs_lock);</div><div class='add'>+</div><div class='add'>+	gts_drop(gts);</div><div class='add'>+	STAT(free_context);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Prefetching cachelines help hardware performance.</div><div class='add'>+ * (Strictly a performance enhancement. Not functionally required).</div><div class='add'>+ */</div><div class='add'>+static void prefetch_data(void *p, int num, int stride)</div><div class='add'>+{</div><div class='add'>+	while (num-- &gt; 0) {</div><div class='add'>+		prefetchw(p);</div><div class='add'>+		p += stride;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline long gru_copy_handle(void *d, void *s)</div><div class='add'>+{</div><div class='add'>+	memcpy(d, s, GRU_HANDLE_BYTES);</div><div class='add'>+	return GRU_HANDLE_BYTES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rewrite in assembly &amp; use lots of prefetch */</div><div class='add'>+static void gru_load_context_data(void *save, void *grubase, int ctxnum,</div><div class='add'>+				  unsigned long cbrmap, unsigned long dsrmap)</div><div class='add'>+{</div><div class='add'>+	void *gseg, *cb, *cbe;</div><div class='add'>+	unsigned long length;</div><div class='add'>+	int i, scr;</div><div class='add'>+</div><div class='add'>+	gseg = grubase + ctxnum * GRU_GSEG_STRIDE;</div><div class='add'>+	length = hweight64(dsrmap) * GRU_DSR_AU_BYTES;</div><div class='add'>+	prefetch_data(gseg + GRU_DS_BASE, length / GRU_CACHE_LINE_BYTES,</div><div class='add'>+		      GRU_CACHE_LINE_BYTES);</div><div class='add'>+</div><div class='add'>+	cb = gseg + GRU_CB_BASE;</div><div class='add'>+	cbe = grubase + GRU_CBE_BASE;</div><div class='add'>+	for_each_cbr_in_allocation_map(i, &amp;cbrmap, scr) {</div><div class='add'>+		prefetch_data(cb, 1, GRU_CACHE_LINE_BYTES);</div><div class='add'>+		prefetch_data(cbe + i * GRU_HANDLE_STRIDE, 1,</div><div class='add'>+			      GRU_CACHE_LINE_BYTES);</div><div class='add'>+		cb += GRU_HANDLE_STRIDE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cb = gseg + GRU_CB_BASE;</div><div class='add'>+	for_each_cbr_in_allocation_map(i, &amp;cbrmap, scr) {</div><div class='add'>+		save += gru_copy_handle(cb, save);</div><div class='add'>+		save += gru_copy_handle(cbe + i * GRU_HANDLE_STRIDE, save);</div><div class='add'>+		cb += GRU_HANDLE_STRIDE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(gseg + GRU_DS_BASE, save, length);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gru_unload_context_data(void *save, void *grubase, int ctxnum,</div><div class='add'>+				    unsigned long cbrmap, unsigned long dsrmap)</div><div class='add'>+{</div><div class='add'>+	void *gseg, *cb, *cbe;</div><div class='add'>+	unsigned long length;</div><div class='add'>+	int i, scr;</div><div class='add'>+</div><div class='add'>+	gseg = grubase + ctxnum * GRU_GSEG_STRIDE;</div><div class='add'>+</div><div class='add'>+	cb = gseg + GRU_CB_BASE;</div><div class='add'>+	cbe = grubase + GRU_CBE_BASE;</div><div class='add'>+	for_each_cbr_in_allocation_map(i, &amp;cbrmap, scr) {</div><div class='add'>+		save += gru_copy_handle(save, cb);</div><div class='add'>+		save += gru_copy_handle(save, cbe + i * GRU_HANDLE_STRIDE);</div><div class='add'>+		cb += GRU_HANDLE_STRIDE;</div><div class='add'>+	}</div><div class='add'>+	length = hweight64(dsrmap) * GRU_DSR_AU_BYTES;</div><div class='add'>+	memcpy(save, gseg + GRU_DS_BASE, length);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gru_unload_context(struct gru_thread_state *gts, int savestate)</div><div class='add'>+{</div><div class='add'>+	struct gru_state *gru = gts-&gt;ts_gru;</div><div class='add'>+	struct gru_context_configuration_handle *cch;</div><div class='add'>+	int ctxnum = gts-&gt;ts_ctxnum;</div><div class='add'>+</div><div class='add'>+	zap_vma_ptes(gts-&gt;ts_vma, UGRUADDR(gts), GRU_GSEG_PAGESIZE);</div><div class='add'>+	cch = get_cch(gru-&gt;gs_gru_base_vaddr, ctxnum);</div><div class='add'>+</div><div class='add'>+	lock_cch_handle(cch);</div><div class='add'>+	if (cch_interrupt_sync(cch))</div><div class='add'>+		BUG();</div><div class='add'>+	gru_dbg(grudev, "gts %p\n", gts);</div><div class='add'>+</div><div class='add'>+	gru_unload_mm_tracker(gru, gts-&gt;ts_gms, gts-&gt;ts_ctxnum);</div><div class='add'>+	if (savestate)</div><div class='add'>+		gru_unload_context_data(gts-&gt;ts_gdata, gru-&gt;gs_gru_base_vaddr,</div><div class='add'>+					ctxnum, gts-&gt;ts_cbr_map,</div><div class='add'>+					gts-&gt;ts_dsr_map);</div><div class='add'>+</div><div class='add'>+	if (cch_deallocate(cch))</div><div class='add'>+		BUG();</div><div class='add'>+	gts-&gt;ts_force_unload = 0;	/* ts_force_unload locked by CCH lock */</div><div class='add'>+	unlock_cch_handle(cch);</div><div class='add'>+</div><div class='add'>+	gru_free_gru_context(gts);</div><div class='add'>+	STAT(unload_context);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Load a GRU context by copying it from the thread data structure in memory</div><div class='add'>+ * to the GRU.</div><div class='add'>+ */</div><div class='add'>+static void gru_load_context(struct gru_thread_state *gts)</div><div class='add'>+{</div><div class='add'>+	struct gru_state *gru = gts-&gt;ts_gru;</div><div class='add'>+	struct gru_context_configuration_handle *cch;</div><div class='add'>+	int err, asid, ctxnum = gts-&gt;ts_ctxnum;</div><div class='add'>+</div><div class='add'>+	gru_dbg(grudev, "gts %p\n", gts);</div><div class='add'>+	cch = get_cch(gru-&gt;gs_gru_base_vaddr, ctxnum);</div><div class='add'>+</div><div class='add'>+	lock_cch_handle(cch);</div><div class='add'>+	asid = gru_load_mm_tracker(gru, gts-&gt;ts_gms, gts-&gt;ts_ctxnum);</div><div class='add'>+	cch-&gt;tfm_fault_bit_enable =</div><div class='add'>+	    (gts-&gt;ts_user_options == GRU_OPT_MISS_FMM_POLL</div><div class='add'>+	     || gts-&gt;ts_user_options == GRU_OPT_MISS_FMM_INTR);</div><div class='add'>+	cch-&gt;tlb_int_enable = (gts-&gt;ts_user_options == GRU_OPT_MISS_FMM_INTR);</div><div class='add'>+	if (cch-&gt;tlb_int_enable) {</div><div class='add'>+		gts-&gt;ts_tlb_int_select = gru_cpu_fault_map_id();</div><div class='add'>+		cch-&gt;tlb_int_select = gts-&gt;ts_tlb_int_select;</div><div class='add'>+	}</div><div class='add'>+	cch-&gt;tfm_done_bit_enable = 0;</div><div class='add'>+	err = cch_allocate(cch, asid, gts-&gt;ts_cbr_map, gts-&gt;ts_dsr_map);</div><div class='add'>+	if (err) {</div><div class='add'>+		gru_dbg(grudev,</div><div class='add'>+			"err %d: cch %p, gts %p, cbr 0x%lx, dsr 0x%lx\n",</div><div class='add'>+			err, cch, gts, gts-&gt;ts_cbr_map, gts-&gt;ts_dsr_map);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gru_load_context_data(gts-&gt;ts_gdata, gru-&gt;gs_gru_base_vaddr, ctxnum,</div><div class='add'>+			      gts-&gt;ts_cbr_map, gts-&gt;ts_dsr_map);</div><div class='add'>+</div><div class='add'>+	if (cch_start(cch))</div><div class='add'>+		BUG();</div><div class='add'>+	unlock_cch_handle(cch);</div><div class='add'>+</div><div class='add'>+	STAT(load_context);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Update fields in an active CCH:</div><div class='add'>+ * 	- retarget interrupts on local blade</div><div class='add'>+ * 	- force a delayed context unload by clearing the CCH asids. This</div><div class='add'>+ * 	  forces TLB misses for new GRU instructions. The context is unloaded</div><div class='add'>+ * 	  when the next TLB miss occurs.</div><div class='add'>+ */</div><div class='add'>+static int gru_update_cch(struct gru_thread_state *gts, int int_select)</div><div class='add'>+{</div><div class='add'>+	struct gru_context_configuration_handle *cch;</div><div class='add'>+	struct gru_state *gru = gts-&gt;ts_gru;</div><div class='add'>+	int i, ctxnum = gts-&gt;ts_ctxnum, ret = 0;</div><div class='add'>+</div><div class='add'>+	cch = get_cch(gru-&gt;gs_gru_base_vaddr, ctxnum);</div><div class='add'>+</div><div class='add'>+	lock_cch_handle(cch);</div><div class='add'>+	if (cch-&gt;state == CCHSTATE_ACTIVE) {</div><div class='add'>+		if (gru-&gt;gs_gts[gts-&gt;ts_ctxnum] != gts)</div><div class='add'>+			goto exit;</div><div class='add'>+		if (cch_interrupt(cch))</div><div class='add'>+			BUG();</div><div class='add'>+		if (int_select &gt;= 0) {</div><div class='add'>+			gts-&gt;ts_tlb_int_select = int_select;</div><div class='add'>+			cch-&gt;tlb_int_select = int_select;</div><div class='add'>+		} else {</div><div class='add'>+			for (i = 0; i &lt; 8; i++)</div><div class='add'>+				cch-&gt;asid[i] = 0;</div><div class='add'>+			cch-&gt;tfm_fault_bit_enable = 0;</div><div class='add'>+			cch-&gt;tlb_int_enable = 0;</div><div class='add'>+			gts-&gt;ts_force_unload = 1;</div><div class='add'>+		}</div><div class='add'>+		if (cch_start(cch))</div><div class='add'>+			BUG();</div><div class='add'>+		ret = 1;</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	unlock_cch_handle(cch);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Update CCH tlb interrupt select. Required when all the following is true:</div><div class='add'>+ * 	- task's GRU context is loaded into a GRU</div><div class='add'>+ * 	- task is using interrupt notification for TLB faults</div><div class='add'>+ * 	- task has migrated to a different cpu on the same blade where</div><div class='add'>+ * 	  it was previously running.</div><div class='add'>+ */</div><div class='add'>+static int gru_retarget_intr(struct gru_thread_state *gts)</div><div class='add'>+{</div><div class='add'>+	if (gts-&gt;ts_tlb_int_select &lt; 0</div><div class='add'>+	    || gts-&gt;ts_tlb_int_select == gru_cpu_fault_map_id())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	gru_dbg(grudev, "retarget from %d to %d\n", gts-&gt;ts_tlb_int_select,</div><div class='add'>+		gru_cpu_fault_map_id());</div><div class='add'>+	return gru_update_cch(gts, gru_cpu_fault_map_id());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Insufficient GRU resources available on the local blade. Steal a context from</div><div class='add'>+ * a process. This is a hack until a _real_ resource scheduler is written....</div><div class='add'>+ */</div><div class='add'>+#define next_ctxnum(n)	((n) &lt;  GRU_NUM_CCH - 2 ? (n) + 1 : 0)</div><div class='add'>+#define next_gru(b, g)	(((g) &lt; &amp;(b)-&gt;bs_grus[GRU_CHIPLETS_PER_BLADE - 1]) ?  \</div><div class='add'>+				 ((g)+1) : &amp;(b)-&gt;bs_grus[0])</div><div class='add'>+</div><div class='add'>+static void gru_steal_context(struct gru_thread_state *gts)</div><div class='add'>+{</div><div class='add'>+	struct gru_blade_state *blade;</div><div class='add'>+	struct gru_state *gru, *gru0;</div><div class='add'>+	struct gru_thread_state *ngts = NULL;</div><div class='add'>+	int ctxnum, ctxnum0, flag = 0, cbr, dsr;</div><div class='add'>+</div><div class='add'>+	cbr = gts-&gt;ts_cbr_au_count;</div><div class='add'>+	dsr = gts-&gt;ts_dsr_au_count;</div><div class='add'>+</div><div class='add'>+	preempt_disable();</div><div class='add'>+	blade = gru_base[uv_numa_blade_id()];</div><div class='add'>+	spin_lock(&amp;blade-&gt;bs_lock);</div><div class='add'>+</div><div class='add'>+	ctxnum = next_ctxnum(blade-&gt;bs_lru_ctxnum);</div><div class='add'>+	gru = blade-&gt;bs_lru_gru;</div><div class='add'>+	if (ctxnum == 0)</div><div class='add'>+		gru = next_gru(blade, gru);</div><div class='add'>+	ctxnum0 = ctxnum;</div><div class='add'>+	gru0 = gru;</div><div class='add'>+	while (1) {</div><div class='add'>+		if (check_gru_resources(gru, cbr, dsr, GRU_NUM_CCH))</div><div class='add'>+			break;</div><div class='add'>+		spin_lock(&amp;gru-&gt;gs_lock);</div><div class='add'>+		for (; ctxnum &lt; GRU_NUM_CCH; ctxnum++) {</div><div class='add'>+			if (flag &amp;&amp; gru == gru0 &amp;&amp; ctxnum == ctxnum0)</div><div class='add'>+				break;</div><div class='add'>+			ngts = gru-&gt;gs_gts[ctxnum];</div><div class='add'>+			/*</div><div class='add'>+			 * We are grabbing locks out of order, so trylock is</div><div class='add'>+			 * needed. GTSs are usually not locked, so the odds of</div><div class='add'>+			 * success are high. If trylock fails, try to steal a</div><div class='add'>+			 * different GSEG.</div><div class='add'>+			 */</div><div class='add'>+			if (ngts &amp;&amp; mutex_trylock(&amp;ngts-&gt;ts_ctxlock))</div><div class='add'>+				break;</div><div class='add'>+			ngts = NULL;</div><div class='add'>+			flag = 1;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;gru-&gt;gs_lock);</div><div class='add'>+		if (ngts || (flag &amp;&amp; gru == gru0 &amp;&amp; ctxnum == ctxnum0))</div><div class='add'>+			break;</div><div class='add'>+		ctxnum = 0;</div><div class='add'>+		gru = next_gru(blade, gru);</div><div class='add'>+	}</div><div class='add'>+	blade-&gt;bs_lru_gru = gru;</div><div class='add'>+	blade-&gt;bs_lru_ctxnum = ctxnum;</div><div class='add'>+	spin_unlock(&amp;blade-&gt;bs_lock);</div><div class='add'>+	preempt_enable();</div><div class='add'>+</div><div class='add'>+	if (ngts) {</div><div class='add'>+		STAT(steal_context);</div><div class='add'>+		ngts-&gt;ts_steal_jiffies = jiffies;</div><div class='add'>+		gru_unload_context(ngts, 1);</div><div class='add'>+		mutex_unlock(&amp;ngts-&gt;ts_ctxlock);</div><div class='add'>+	} else {</div><div class='add'>+		STAT(steal_context_failed);</div><div class='add'>+	}</div><div class='add'>+	gru_dbg(grudev,</div><div class='add'>+		"stole gru %x, ctxnum %d from gts %p. Need cb %d, ds %d;"</div><div class='add'>+		" avail cb %ld, ds %ld\n",</div><div class='add'>+		gru-&gt;gs_gid, ctxnum, ngts, cbr, dsr, hweight64(gru-&gt;gs_cbr_map),</div><div class='add'>+		hweight64(gru-&gt;gs_dsr_map));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Scan the GRUs on the local blade &amp; assign a GRU context.</div><div class='add'>+ */</div><div class='add'>+static struct gru_state *gru_assign_gru_context(struct gru_thread_state *gts)</div><div class='add'>+{</div><div class='add'>+	struct gru_state *gru, *grux;</div><div class='add'>+	int i, max_active_contexts;</div><div class='add'>+</div><div class='add'>+	preempt_disable();</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	gru = NULL;</div><div class='add'>+	max_active_contexts = GRU_NUM_CCH;</div><div class='add'>+	for_each_gru_on_blade(grux, uv_numa_blade_id(), i) {</div><div class='add'>+		if (check_gru_resources(grux, gts-&gt;ts_cbr_au_count,</div><div class='add'>+					gts-&gt;ts_dsr_au_count,</div><div class='add'>+					max_active_contexts)) {</div><div class='add'>+			gru = grux;</div><div class='add'>+			max_active_contexts = grux-&gt;gs_active_contexts;</div><div class='add'>+			if (max_active_contexts == 0)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (gru) {</div><div class='add'>+		spin_lock(&amp;gru-&gt;gs_lock);</div><div class='add'>+		if (!check_gru_resources(gru, gts-&gt;ts_cbr_au_count,</div><div class='add'>+					 gts-&gt;ts_dsr_au_count, GRU_NUM_CCH)) {</div><div class='add'>+			spin_unlock(&amp;gru-&gt;gs_lock);</div><div class='add'>+			goto again;</div><div class='add'>+		}</div><div class='add'>+		reserve_gru_resources(gru, gts);</div><div class='add'>+		gts-&gt;ts_gru = gru;</div><div class='add'>+		gts-&gt;ts_ctxnum =</div><div class='add'>+		    find_first_zero_bit(&amp;gru-&gt;gs_context_map, GRU_NUM_CCH);</div><div class='add'>+		BUG_ON(gts-&gt;ts_ctxnum == GRU_NUM_CCH);</div><div class='add'>+		atomic_inc(&amp;gts-&gt;ts_refcnt);</div><div class='add'>+		gru-&gt;gs_gts[gts-&gt;ts_ctxnum] = gts;</div><div class='add'>+		__set_bit(gts-&gt;ts_ctxnum, &amp;gru-&gt;gs_context_map);</div><div class='add'>+		spin_unlock(&amp;gru-&gt;gs_lock);</div><div class='add'>+</div><div class='add'>+		STAT(assign_context);</div><div class='add'>+		gru_dbg(grudev,</div><div class='add'>+			"gseg %p, gts %p, gru %x, ctx %d, cbr %d, dsr %d\n",</div><div class='add'>+			gseg_virtual_address(gts-&gt;ts_gru, gts-&gt;ts_ctxnum), gts,</div><div class='add'>+			gts-&gt;ts_gru-&gt;gs_gid, gts-&gt;ts_ctxnum,</div><div class='add'>+			gts-&gt;ts_cbr_au_count, gts-&gt;ts_dsr_au_count);</div><div class='add'>+	} else {</div><div class='add'>+		gru_dbg(grudev, "failed to allocate a GTS %s\n", "");</div><div class='add'>+		STAT(assign_context_failed);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	preempt_enable();</div><div class='add'>+	return gru;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * gru_nopage</div><div class='add'>+ *</div><div class='add'>+ * Map the user's GRU segment</div><div class='add'>+ *</div><div class='add'>+ * 	Note: gru segments alway mmaped on GRU_GSEG_PAGESIZE boundaries.</div><div class='add'>+ */</div><div class='add'>+int gru_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='add'>+{</div><div class='add'>+	struct gru_thread_state *gts;</div><div class='add'>+	unsigned long paddr, vaddr;</div><div class='add'>+</div><div class='add'>+	vaddr = (unsigned long)vmf-&gt;virtual_address;</div><div class='add'>+	gru_dbg(grudev, "vma %p, vaddr 0x%lx (0x%lx)\n",</div><div class='add'>+		vma, vaddr, GSEG_BASE(vaddr));</div><div class='add'>+	STAT(nopfn);</div><div class='add'>+</div><div class='add'>+	/* The following check ensures vaddr is a valid address in the VMA */</div><div class='add'>+	gts = gru_find_thread_state(vma, TSID(vaddr, vma));</div><div class='add'>+	if (!gts)</div><div class='add'>+		return VM_FAULT_SIGBUS;</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	preempt_disable();</div><div class='add'>+	mutex_lock(&amp;gts-&gt;ts_ctxlock);</div><div class='add'>+	if (gts-&gt;ts_gru) {</div><div class='add'>+		if (gts-&gt;ts_gru-&gt;gs_blade_id != uv_numa_blade_id()) {</div><div class='add'>+			STAT(migrated_nopfn_unload);</div><div class='add'>+			gru_unload_context(gts, 1);</div><div class='add'>+		} else {</div><div class='add'>+			if (gru_retarget_intr(gts))</div><div class='add'>+				STAT(migrated_nopfn_retarget);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!gts-&gt;ts_gru) {</div><div class='add'>+		if (!gru_assign_gru_context(gts)) {</div><div class='add'>+			mutex_unlock(&amp;gts-&gt;ts_ctxlock);</div><div class='add'>+			preempt_enable();</div><div class='add'>+			schedule_timeout(GRU_ASSIGN_DELAY);  /* true hack ZZZ */</div><div class='add'>+			if (gts-&gt;ts_steal_jiffies + GRU_STEAL_DELAY &lt; jiffies)</div><div class='add'>+				gru_steal_context(gts);</div><div class='add'>+			goto again;</div><div class='add'>+		}</div><div class='add'>+		gru_load_context(gts);</div><div class='add'>+		paddr = gseg_physical_address(gts-&gt;ts_gru, gts-&gt;ts_ctxnum);</div><div class='add'>+		remap_pfn_range(vma, vaddr &amp; ~(GRU_GSEG_PAGESIZE - 1),</div><div class='add'>+				paddr &gt;&gt; PAGE_SHIFT, GRU_GSEG_PAGESIZE,</div><div class='add'>+				vma-&gt;vm_page_prot);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;gts-&gt;ts_ctxlock);</div><div class='add'>+	preempt_enable();</div><div class='add'>+</div><div class='add'>+	return VM_FAULT_NOPAGE;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c<br/>new file mode 100644<br/>index 000000000000..533923f83f1a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-gru/gruprocfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/gruprocfs.c</a></div><div class='hunk'>@@ -0,0 +1,336 @@</div><div class='add'>+/*</div><div class='add'>+ * SN Platform GRU Driver</div><div class='add'>+ *</div><div class='add'>+ *              PROC INTERFACES</div><div class='add'>+ *</div><div class='add'>+ * This file supports the /proc interfaces for the GRU driver</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include "gru.h"</div><div class='add'>+#include "grulib.h"</div><div class='add'>+#include "grutables.h"</div><div class='add'>+</div><div class='add'>+#define printstat(s, f)		printstat_val(s, &amp;gru_stats.f, #f)</div><div class='add'>+</div><div class='add'>+static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)</div><div class='add'>+{</div><div class='add'>+	unsigned long val = atomic_long_read(v);</div><div class='add'>+</div><div class='add'>+	if (val)</div><div class='add'>+		seq_printf(s, "%16lu %s\n", val, id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int statistics_show(struct seq_file *s, void *p)</div><div class='add'>+{</div><div class='add'>+	printstat(s, vdata_alloc);</div><div class='add'>+	printstat(s, vdata_free);</div><div class='add'>+	printstat(s, gts_alloc);</div><div class='add'>+	printstat(s, gts_free);</div><div class='add'>+	printstat(s, vdata_double_alloc);</div><div class='add'>+	printstat(s, gts_double_allocate);</div><div class='add'>+	printstat(s, assign_context);</div><div class='add'>+	printstat(s, assign_context_failed);</div><div class='add'>+	printstat(s, free_context);</div><div class='add'>+	printstat(s, load_context);</div><div class='add'>+	printstat(s, unload_context);</div><div class='add'>+	printstat(s, steal_context);</div><div class='add'>+	printstat(s, steal_context_failed);</div><div class='add'>+	printstat(s, nopfn);</div><div class='add'>+	printstat(s, break_cow);</div><div class='add'>+	printstat(s, asid_new);</div><div class='add'>+	printstat(s, asid_next);</div><div class='add'>+	printstat(s, asid_wrap);</div><div class='add'>+	printstat(s, asid_reuse);</div><div class='add'>+	printstat(s, intr);</div><div class='add'>+	printstat(s, call_os);</div><div class='add'>+	printstat(s, call_os_check_for_bug);</div><div class='add'>+	printstat(s, call_os_wait_queue);</div><div class='add'>+	printstat(s, user_flush_tlb);</div><div class='add'>+	printstat(s, user_unload_context);</div><div class='add'>+	printstat(s, user_exception);</div><div class='add'>+	printstat(s, set_task_slice);</div><div class='add'>+	printstat(s, migrate_check);</div><div class='add'>+	printstat(s, migrated_retarget);</div><div class='add'>+	printstat(s, migrated_unload);</div><div class='add'>+	printstat(s, migrated_unload_delay);</div><div class='add'>+	printstat(s, migrated_nopfn_retarget);</div><div class='add'>+	printstat(s, migrated_nopfn_unload);</div><div class='add'>+	printstat(s, tlb_dropin);</div><div class='add'>+	printstat(s, tlb_dropin_fail_no_asid);</div><div class='add'>+	printstat(s, tlb_dropin_fail_upm);</div><div class='add'>+	printstat(s, tlb_dropin_fail_invalid);</div><div class='add'>+	printstat(s, tlb_dropin_fail_range_active);</div><div class='add'>+	printstat(s, tlb_dropin_fail_idle);</div><div class='add'>+	printstat(s, tlb_dropin_fail_fmm);</div><div class='add'>+	printstat(s, mmu_invalidate_range);</div><div class='add'>+	printstat(s, mmu_invalidate_page);</div><div class='add'>+	printstat(s, mmu_clear_flush_young);</div><div class='add'>+	printstat(s, flush_tlb);</div><div class='add'>+	printstat(s, flush_tlb_gru);</div><div class='add'>+	printstat(s, flush_tlb_gru_tgh);</div><div class='add'>+	printstat(s, flush_tlb_gru_zero_asid);</div><div class='add'>+	printstat(s, copy_gpa);</div><div class='add'>+	printstat(s, mesq_receive);</div><div class='add'>+	printstat(s, mesq_receive_none);</div><div class='add'>+	printstat(s, mesq_send);</div><div class='add'>+	printstat(s, mesq_send_failed);</div><div class='add'>+	printstat(s, mesq_noop);</div><div class='add'>+	printstat(s, mesq_send_unexpected_error);</div><div class='add'>+	printstat(s, mesq_send_lb_overflow);</div><div class='add'>+	printstat(s, mesq_send_qlimit_reached);</div><div class='add'>+	printstat(s, mesq_send_amo_nacked);</div><div class='add'>+	printstat(s, mesq_send_put_nacked);</div><div class='add'>+	printstat(s, mesq_qf_not_full);</div><div class='add'>+	printstat(s, mesq_qf_locked);</div><div class='add'>+	printstat(s, mesq_qf_noop_not_full);</div><div class='add'>+	printstat(s, mesq_qf_switch_head_failed);</div><div class='add'>+	printstat(s, mesq_qf_unexpected_error);</div><div class='add'>+	printstat(s, mesq_noop_unexpected_error);</div><div class='add'>+	printstat(s, mesq_noop_lb_overflow);</div><div class='add'>+	printstat(s, mesq_noop_qlimit_reached);</div><div class='add'>+	printstat(s, mesq_noop_amo_nacked);</div><div class='add'>+	printstat(s, mesq_noop_put_nacked);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t statistics_write(struct file *file, const char __user *userbuf,</div><div class='add'>+				size_t count, loff_t *data)</div><div class='add'>+{</div><div class='add'>+	memset(&amp;gru_stats, 0, sizeof(gru_stats));</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int options_show(struct seq_file *s, void *p)</div><div class='add'>+{</div><div class='add'>+	seq_printf(s, "0x%lx\n", gru_options);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t options_write(struct file *file, const char __user *userbuf,</div><div class='add'>+			     size_t count, loff_t *data)</div><div class='add'>+{</div><div class='add'>+	unsigned long val;</div><div class='add'>+	char buf[80];</div><div class='add'>+</div><div class='add'>+	if (copy_from_user</div><div class='add'>+	    (buf, userbuf, count &lt; sizeof(buf) ? count : sizeof(buf)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (!strict_strtoul(buf, 10, &amp;val))</div><div class='add'>+		gru_options = val;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cch_seq_show(struct seq_file *file, void *data)</div><div class='add'>+{</div><div class='add'>+	long gid = *(long *)data;</div><div class='add'>+	int i;</div><div class='add'>+	struct gru_state *gru = GID_TO_GRU(gid);</div><div class='add'>+	struct gru_thread_state *ts;</div><div class='add'>+	const char *mode[] = { "??", "UPM", "INTR", "OS_POLL" };</div><div class='add'>+</div><div class='add'>+	if (gid == 0)</div><div class='add'>+		seq_printf(file, "#%5s%5s%6s%9s%6s%8s%8s\n", "gid", "bid",</div><div class='add'>+			   "ctx#", "pid", "cbrs", "dsbytes", "mode");</div><div class='add'>+	if (gru)</div><div class='add'>+		for (i = 0; i &lt; GRU_NUM_CCH; i++) {</div><div class='add'>+			ts = gru-&gt;gs_gts[i];</div><div class='add'>+			if (!ts)</div><div class='add'>+				continue;</div><div class='add'>+			seq_printf(file, " %5d%5d%6d%9d%6d%8d%8s\n",</div><div class='add'>+				   gru-&gt;gs_gid, gru-&gt;gs_blade_id, i,</div><div class='add'>+				   ts-&gt;ts_tgid_owner,</div><div class='add'>+				   ts-&gt;ts_cbr_au_count * GRU_CBR_AU_SIZE,</div><div class='add'>+				   ts-&gt;ts_cbr_au_count * GRU_DSR_AU_BYTES,</div><div class='add'>+				   mode[ts-&gt;ts_user_options &amp;</div><div class='add'>+					GRU_OPT_MISS_MASK]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gru_seq_show(struct seq_file *file, void *data)</div><div class='add'>+{</div><div class='add'>+	long gid = *(long *)data, ctxfree, cbrfree, dsrfree;</div><div class='add'>+	struct gru_state *gru = GID_TO_GRU(gid);</div><div class='add'>+</div><div class='add'>+	if (gid == 0) {</div><div class='add'>+		seq_printf(file, "#%5s%5s%7s%6s%6s%8s%6s%6s\n", "gid", "nid",</div><div class='add'>+			   "ctx", "cbr", "dsr", "ctx", "cbr", "dsr");</div><div class='add'>+		seq_printf(file, "#%5s%5s%7s%6s%6s%8s%6s%6s\n", "", "", "busy",</div><div class='add'>+			   "busy", "busy", "free", "free", "free");</div><div class='add'>+	}</div><div class='add'>+	if (gru) {</div><div class='add'>+		ctxfree = GRU_NUM_CCH - gru-&gt;gs_active_contexts;</div><div class='add'>+		cbrfree = hweight64(gru-&gt;gs_cbr_map) * GRU_CBR_AU_SIZE;</div><div class='add'>+		dsrfree = hweight64(gru-&gt;gs_dsr_map) * GRU_DSR_AU_BYTES;</div><div class='add'>+		seq_printf(file, " %5d%5d%7ld%6ld%6ld%8ld%6ld%6ld\n",</div><div class='add'>+			   gru-&gt;gs_gid, gru-&gt;gs_blade_id, GRU_NUM_CCH - ctxfree,</div><div class='add'>+			   GRU_NUM_CBE - cbrfree, GRU_NUM_DSR_BYTES - dsrfree,</div><div class='add'>+			   ctxfree, cbrfree, dsrfree);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void seq_stop(struct seq_file *file, void *data)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *seq_start(struct seq_file *file, loff_t *gid)</div><div class='add'>+{</div><div class='add'>+	if (*gid &lt; GRU_MAX_GRUS)</div><div class='add'>+		return gid;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *seq_next(struct seq_file *file, void *data, loff_t *gid)</div><div class='add'>+{</div><div class='add'>+	(*gid)++;</div><div class='add'>+	if (*gid &lt; GRU_MAX_GRUS)</div><div class='add'>+		return gid;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct seq_operations cch_seq_ops = {</div><div class='add'>+	.start	= seq_start,</div><div class='add'>+	.next	= seq_next,</div><div class='add'>+	.stop	= seq_stop,</div><div class='add'>+	.show	= cch_seq_show</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct seq_operations gru_seq_ops = {</div><div class='add'>+	.start	= seq_start,</div><div class='add'>+	.next	= seq_next,</div><div class='add'>+	.stop	= seq_stop,</div><div class='add'>+	.show	= gru_seq_show</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int statistics_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, statistics_show, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int options_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, options_show, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cch_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return seq_open(file, &amp;cch_seq_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gru_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return seq_open(file, &amp;gru_seq_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* *INDENT-OFF* */</div><div class='add'>+static const struct file_operations statistics_fops = {</div><div class='add'>+	.open 		= statistics_open,</div><div class='add'>+	.read 		= seq_read,</div><div class='add'>+	.write 		= statistics_write,</div><div class='add'>+	.llseek 	= seq_lseek,</div><div class='add'>+	.release 	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations options_fops = {</div><div class='add'>+	.open 		= options_open,</div><div class='add'>+	.read 		= seq_read,</div><div class='add'>+	.write 		= options_write,</div><div class='add'>+	.llseek 	= seq_lseek,</div><div class='add'>+	.release 	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations cch_fops = {</div><div class='add'>+	.open 		= cch_open,</div><div class='add'>+	.read 		= seq_read,</div><div class='add'>+	.llseek 	= seq_lseek,</div><div class='add'>+	.release 	= seq_release,</div><div class='add'>+};</div><div class='add'>+static const struct file_operations gru_fops = {</div><div class='add'>+	.open 		= gru_open,</div><div class='add'>+	.read 		= seq_read,</div><div class='add'>+	.llseek 	= seq_lseek,</div><div class='add'>+	.release 	= seq_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct proc_entry {</div><div class='add'>+	char *name;</div><div class='add'>+	int mode;</div><div class='add'>+	const struct file_operations *fops;</div><div class='add'>+	struct proc_dir_entry *entry;</div><div class='add'>+} proc_files[] = {</div><div class='add'>+	{"statistics", 0644, &amp;statistics_fops},</div><div class='add'>+	{"debug_options", 0644, &amp;options_fops},</div><div class='add'>+	{"cch_status", 0444, &amp;cch_fops},</div><div class='add'>+	{"gru_status", 0444, &amp;gru_fops},</div><div class='add'>+	{NULL}</div><div class='add'>+};</div><div class='add'>+/* *INDENT-ON* */</div><div class='add'>+</div><div class='add'>+static struct proc_dir_entry *proc_gru __read_mostly;</div><div class='add'>+</div><div class='add'>+static int create_proc_file(struct proc_entry *p)</div><div class='add'>+{</div><div class='add'>+	p-&gt;entry = create_proc_entry(p-&gt;name, p-&gt;mode, proc_gru);</div><div class='add'>+	if (!p-&gt;entry)</div><div class='add'>+		return -1;</div><div class='add'>+	p-&gt;entry-&gt;proc_fops = p-&gt;fops;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void delete_proc_files(void)</div><div class='add'>+{</div><div class='add'>+	struct proc_entry *p;</div><div class='add'>+</div><div class='add'>+	if (proc_gru) {</div><div class='add'>+		for (p = proc_files; p-&gt;name; p++)</div><div class='add'>+			if (p-&gt;entry)</div><div class='add'>+				remove_proc_entry(p-&gt;name, proc_gru);</div><div class='add'>+		remove_proc_entry("gru", NULL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int gru_proc_init(void)</div><div class='add'>+{</div><div class='add'>+	struct proc_entry *p;</div><div class='add'>+</div><div class='add'>+	proc_mkdir("sgi_uv", NULL);</div><div class='add'>+	proc_gru = proc_mkdir("sgi_uv/gru", NULL);</div><div class='add'>+</div><div class='add'>+	for (p = proc_files; p-&gt;name; p++)</div><div class='add'>+		if (create_proc_file(p))</div><div class='add'>+			goto err;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	delete_proc_files();</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gru_proc_exit(void)</div><div class='add'>+{</div><div class='add'>+	delete_proc_files();</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h<br/>new file mode 100644<br/>index 000000000000..a78f70deeb59<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-gru/grutables.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/grutables.h</a></div><div class='hunk'>@@ -0,0 +1,609 @@</div><div class='add'>+/*</div><div class='add'>+ * SN Platform GRU Driver</div><div class='add'>+ *</div><div class='add'>+ *            GRU DRIVER TABLES, MACROS, externs, etc</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __GRUTABLES_H__</div><div class='add'>+#define __GRUTABLES_H__</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GRU Chiplet:</div><div class='add'>+ *   The GRU is a user addressible memory accelerator. It provides</div><div class='add'>+ *   several forms of load, store, memset, bcopy instructions. In addition, it</div><div class='add'>+ *   contains special instructions for AMOs, sending messages to message</div><div class='add'>+ *   queues, etc.</div><div class='add'>+ *</div><div class='add'>+ *   The GRU is an integral part of the node controller. It connects</div><div class='add'>+ *   directly to the cpu socket. In its current implementation, there are 2</div><div class='add'>+ *   GRU chiplets in the node controller on each blade (~node).</div><div class='add'>+ *</div><div class='add'>+ *   The entire GRU memory space is fully coherent and cacheable by the cpus.</div><div class='add'>+ *</div><div class='add'>+ *   Each GRU chiplet has a physical memory map that looks like the following:</div><div class='add'>+ *</div><div class='add'>+ *   	+-----------------+</div><div class='add'>+ *   	|/////////////////|</div><div class='add'>+ *   	|/////////////////|</div><div class='add'>+ *   	|/////////////////|</div><div class='add'>+ *   	|/////////////////|</div><div class='add'>+ *   	|/////////////////|</div><div class='add'>+ *   	|/////////////////|</div><div class='add'>+ *   	|/////////////////|</div><div class='add'>+ *   	|/////////////////|</div><div class='add'>+ *   	+-----------------+</div><div class='add'>+ *   	|  system control |</div><div class='add'>+ *   	+-----------------+        _______ +-------------+</div><div class='add'>+ *   	|/////////////////|       /        |             |</div><div class='add'>+ *   	|/////////////////|      /         |             |</div><div class='add'>+ *   	|/////////////////|     /          | instructions|</div><div class='add'>+ *   	|/////////////////|    /           |             |</div><div class='add'>+ *   	|/////////////////|   /            |             |</div><div class='add'>+ *   	|/////////////////|  /             |-------------|</div><div class='add'>+ *   	|/////////////////| /              |             |</div><div class='add'>+ *   	+-----------------+                |             |</div><div class='add'>+ *   	|   context 15    |                |  data       |</div><div class='add'>+ *   	+-----------------+                |             |</div><div class='add'>+ *   	|    ......       | \              |             |</div><div class='add'>+ *   	+-----------------+  \____________ +-------------+</div><div class='add'>+ *   	|   context 1     |</div><div class='add'>+ *   	+-----------------+</div><div class='add'>+ *   	|   context 0     |</div><div class='add'>+ *   	+-----------------+</div><div class='add'>+ *</div><div class='add'>+ *   Each of the "contexts" is a chunk of memory that can be mmaped into user</div><div class='add'>+ *   space. The context consists of 2 parts:</div><div class='add'>+ *</div><div class='add'>+ *  	- an instruction space that can be directly accessed by the user</div><div class='add'>+ *  	  to issue GRU instructions and to check instruction status.</div><div class='add'>+ *</div><div class='add'>+ *  	- a data area that acts as normal RAM.</div><div class='add'>+ *</div><div class='add'>+ *   User instructions contain virtual addresses of data to be accessed by the</div><div class='add'>+ *   GRU. The GRU contains a TLB that is used to convert these user virtual</div><div class='add'>+ *   addresses to physical addresses.</div><div class='add'>+ *</div><div class='add'>+ *   The "system control" area of the GRU chiplet is used by the kernel driver</div><div class='add'>+ *   to manage user contexts and to perform functions such as TLB dropin and</div><div class='add'>+ *   purging.</div><div class='add'>+ *</div><div class='add'>+ *   One context may be reserved for the kernel and used for cross-partition</div><div class='add'>+ *   communication. The GRU will also be used to asynchronously zero out</div><div class='add'>+ *   large blocks of memory (not currently implemented).</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * Tables:</div><div class='add'>+ *</div><div class='add'>+ * 	VDATA-VMA Data		- Holds a few parameters. Head of linked list of</div><div class='add'>+ * 				  GTS tables for threads using the GSEG</div><div class='add'>+ * 	GTS - Gru Thread State  - contains info for managing a GSEG context. A</div><div class='add'>+ * 				  GTS is allocated for each thread accessing a</div><div class='add'>+ * 				  GSEG.</div><div class='add'>+ *     	GTD - GRU Thread Data   - contains shadow copy of GRU data when GSEG is</div><div class='add'>+ *     				  not loaded into a GRU</div><div class='add'>+ *	GMS - GRU Memory Struct - Used to manage TLB shootdowns. Tracks GRUs</div><div class='add'>+ *				  where a GSEG has been loaded. Similar to</div><div class='add'>+ *				  an mm_struct but for GRU.</div><div class='add'>+ *</div><div class='add'>+ *	GS  - GRU State 	- Used to manage the state of a GRU chiplet</div><div class='add'>+ *	BS  - Blade State	- Used to manage state of all GRU chiplets</div><div class='add'>+ *				  on a blade</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ *  Normal task tables for task using GRU.</div><div class='add'>+ *  		- 2 threads in process</div><div class='add'>+ *  		- 2 GSEGs open in process</div><div class='add'>+ *  		- GSEG1 is being used by both threads</div><div class='add'>+ *  		- GSEG2 is used only by thread 2</div><div class='add'>+ *</div><div class='add'>+ *       task --&gt;|</div><div class='add'>+ *       task ---+---&gt; mm -&gt;------ (notifier) -------+-&gt; gms</div><div class='add'>+ *                     |                             |</div><div class='add'>+ *                     |--&gt; vma -&gt; vdata ---&gt; gts---&gt;|		GSEG1 (thread1)</div><div class='add'>+ *                     |                  |          |</div><div class='add'>+ *                     |                  +-&gt; gts---&gt;|		GSEG1 (thread2)</div><div class='add'>+ *                     |                             |</div><div class='add'>+ *                     |--&gt; vma -&gt; vdata ---&gt; gts---&gt;|		GSEG2 (thread2)</div><div class='add'>+ *                     .</div><div class='add'>+ *                     .</div><div class='add'>+ *</div><div class='add'>+ *  GSEGs are marked DONTCOPY on fork</div><div class='add'>+ *</div><div class='add'>+ * At open</div><div class='add'>+ * 	file.private_data -&gt; NULL</div><div class='add'>+ *</div><div class='add'>+ * At mmap,</div><div class='add'>+ * 	vma -&gt; vdata</div><div class='add'>+ *</div><div class='add'>+ * After gseg reference</div><div class='add'>+ * 	vma -&gt; vdata -&gt;gts</div><div class='add'>+ *</div><div class='add'>+ * After fork</div><div class='add'>+ *   parent</div><div class='add'>+ * 	vma -&gt; vdata -&gt; gts</div><div class='add'>+ *   child</div><div class='add'>+ * 	(vma is not copied)</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/rmap.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/mmu_notifier.h&gt;</div><div class='add'>+#include "gru.h"</div><div class='add'>+#include "gruhandles.h"</div><div class='add'>+</div><div class='add'>+extern struct gru_stats_s gru_stats;</div><div class='add'>+extern struct gru_blade_state *gru_base[];</div><div class='add'>+extern unsigned long gru_start_paddr, gru_end_paddr;</div><div class='add'>+</div><div class='add'>+#define GRU_MAX_BLADES		MAX_NUMNODES</div><div class='add'>+#define GRU_MAX_GRUS		(GRU_MAX_BLADES * GRU_CHIPLETS_PER_BLADE)</div><div class='add'>+</div><div class='add'>+#define GRU_DRIVER_ID_STR	"SGI GRU Device Driver"</div><div class='add'>+#define GRU_DRIVER_VERSION_STR	"0.80"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GRU statistics.</div><div class='add'>+ */</div><div class='add'>+struct gru_stats_s {</div><div class='add'>+	atomic_long_t vdata_alloc;</div><div class='add'>+	atomic_long_t vdata_free;</div><div class='add'>+	atomic_long_t gts_alloc;</div><div class='add'>+	atomic_long_t gts_free;</div><div class='add'>+	atomic_long_t vdata_double_alloc;</div><div class='add'>+	atomic_long_t gts_double_allocate;</div><div class='add'>+	atomic_long_t assign_context;</div><div class='add'>+	atomic_long_t assign_context_failed;</div><div class='add'>+	atomic_long_t free_context;</div><div class='add'>+	atomic_long_t load_context;</div><div class='add'>+	atomic_long_t unload_context;</div><div class='add'>+	atomic_long_t steal_context;</div><div class='add'>+	atomic_long_t steal_context_failed;</div><div class='add'>+	atomic_long_t nopfn;</div><div class='add'>+	atomic_long_t break_cow;</div><div class='add'>+	atomic_long_t asid_new;</div><div class='add'>+	atomic_long_t asid_next;</div><div class='add'>+	atomic_long_t asid_wrap;</div><div class='add'>+	atomic_long_t asid_reuse;</div><div class='add'>+	atomic_long_t intr;</div><div class='add'>+	atomic_long_t call_os;</div><div class='add'>+	atomic_long_t call_os_check_for_bug;</div><div class='add'>+	atomic_long_t call_os_wait_queue;</div><div class='add'>+	atomic_long_t user_flush_tlb;</div><div class='add'>+	atomic_long_t user_unload_context;</div><div class='add'>+	atomic_long_t user_exception;</div><div class='add'>+	atomic_long_t set_task_slice;</div><div class='add'>+	atomic_long_t migrate_check;</div><div class='add'>+	atomic_long_t migrated_retarget;</div><div class='add'>+	atomic_long_t migrated_unload;</div><div class='add'>+	atomic_long_t migrated_unload_delay;</div><div class='add'>+	atomic_long_t migrated_nopfn_retarget;</div><div class='add'>+	atomic_long_t migrated_nopfn_unload;</div><div class='add'>+	atomic_long_t tlb_dropin;</div><div class='add'>+	atomic_long_t tlb_dropin_fail_no_asid;</div><div class='add'>+	atomic_long_t tlb_dropin_fail_upm;</div><div class='add'>+	atomic_long_t tlb_dropin_fail_invalid;</div><div class='add'>+	atomic_long_t tlb_dropin_fail_range_active;</div><div class='add'>+	atomic_long_t tlb_dropin_fail_idle;</div><div class='add'>+	atomic_long_t tlb_dropin_fail_fmm;</div><div class='add'>+	atomic_long_t mmu_invalidate_range;</div><div class='add'>+	atomic_long_t mmu_invalidate_page;</div><div class='add'>+	atomic_long_t mmu_clear_flush_young;</div><div class='add'>+	atomic_long_t flush_tlb;</div><div class='add'>+	atomic_long_t flush_tlb_gru;</div><div class='add'>+	atomic_long_t flush_tlb_gru_tgh;</div><div class='add'>+	atomic_long_t flush_tlb_gru_zero_asid;</div><div class='add'>+</div><div class='add'>+	atomic_long_t copy_gpa;</div><div class='add'>+</div><div class='add'>+	atomic_long_t mesq_receive;</div><div class='add'>+	atomic_long_t mesq_receive_none;</div><div class='add'>+	atomic_long_t mesq_send;</div><div class='add'>+	atomic_long_t mesq_send_failed;</div><div class='add'>+	atomic_long_t mesq_noop;</div><div class='add'>+	atomic_long_t mesq_send_unexpected_error;</div><div class='add'>+	atomic_long_t mesq_send_lb_overflow;</div><div class='add'>+	atomic_long_t mesq_send_qlimit_reached;</div><div class='add'>+	atomic_long_t mesq_send_amo_nacked;</div><div class='add'>+	atomic_long_t mesq_send_put_nacked;</div><div class='add'>+	atomic_long_t mesq_qf_not_full;</div><div class='add'>+	atomic_long_t mesq_qf_locked;</div><div class='add'>+	atomic_long_t mesq_qf_noop_not_full;</div><div class='add'>+	atomic_long_t mesq_qf_switch_head_failed;</div><div class='add'>+	atomic_long_t mesq_qf_unexpected_error;</div><div class='add'>+	atomic_long_t mesq_noop_unexpected_error;</div><div class='add'>+	atomic_long_t mesq_noop_lb_overflow;</div><div class='add'>+	atomic_long_t mesq_noop_qlimit_reached;</div><div class='add'>+	atomic_long_t mesq_noop_amo_nacked;</div><div class='add'>+	atomic_long_t mesq_noop_put_nacked;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define OPT_DPRINT	1</div><div class='add'>+#define OPT_STATS	2</div><div class='add'>+#define GRU_QUICKLOOK	4</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define IRQ_GRU			110	/* Starting IRQ number for interrupts */</div><div class='add'>+</div><div class='add'>+/* Delay in jiffies between attempts to assign a GRU context */</div><div class='add'>+#define GRU_ASSIGN_DELAY	((HZ * 20) / 1000)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If a process has it's context stolen, min delay in jiffies before trying to</div><div class='add'>+ * steal a context from another process.</div><div class='add'>+ */</div><div class='add'>+#define GRU_STEAL_DELAY		((HZ * 200) / 1000)</div><div class='add'>+</div><div class='add'>+#define STAT(id)	do {						\</div><div class='add'>+				if (gru_options &amp; OPT_STATS)		\</div><div class='add'>+					atomic_long_inc(&amp;gru_stats.id);	\</div><div class='add'>+			} while (0)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SGI_GRU_DEBUG</div><div class='add'>+#define gru_dbg(dev, fmt, x...)						\</div><div class='add'>+	do {								\</div><div class='add'>+		if (gru_options &amp; OPT_DPRINT)				\</div><div class='add'>+			dev_dbg(dev, "%s: " fmt, __func__, x);		\</div><div class='add'>+	} while (0)</div><div class='add'>+#else</div><div class='add'>+#define gru_dbg(x...)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+ * ASID management</div><div class='add'>+ */</div><div class='add'>+#define MAX_ASID	0xfffff0</div><div class='add'>+#define MIN_ASID	8</div><div class='add'>+#define ASID_INC	8	/* number of regions */</div><div class='add'>+</div><div class='add'>+/* Generate a GRU asid value from a GRU base asid &amp; a virtual address. */</div><div class='add'>+#if defined CONFIG_IA64</div><div class='add'>+#define VADDR_HI_BIT		64</div><div class='add'>+#define GRUREGION(addr)		((addr) &gt;&gt; (VADDR_HI_BIT - 3) &amp; 3)</div><div class='add'>+#elif defined CONFIG_X86_64</div><div class='add'>+#define VADDR_HI_BIT		48</div><div class='add'>+#define GRUREGION(addr)		(0)		/* ZZZ could do better */</div><div class='add'>+#else</div><div class='add'>+#error "Unsupported architecture"</div><div class='add'>+#endif</div><div class='add'>+#define GRUASID(asid, addr)	((asid) + GRUREGION(addr))</div><div class='add'>+</div><div class='add'>+/*------------------------------------------------------------------------------</div><div class='add'>+ *  File &amp; VMS Tables</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct gru_state;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This structure is pointed to from the mmstruct via the notifier pointer.</div><div class='add'>+ * There is one of these per address space.</div><div class='add'>+ */</div><div class='add'>+struct gru_mm_tracker {</div><div class='add'>+	unsigned int		mt_asid_gen;	/* ASID wrap count */</div><div class='add'>+	int			mt_asid;	/* current base ASID for gru */</div><div class='add'>+	unsigned short		mt_ctxbitmap;	/* bitmap of contexts using</div><div class='add'>+						   asid */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct gru_mm_struct {</div><div class='add'>+	struct mmu_notifier	ms_notifier;</div><div class='add'>+	atomic_t		ms_refcnt;</div><div class='add'>+	spinlock_t		ms_asid_lock;	/* protects ASID assignment */</div><div class='add'>+	atomic_t		ms_range_active;/* num range_invals active */</div><div class='add'>+	char			ms_released;</div><div class='add'>+	wait_queue_head_t	ms_wait_queue;</div><div class='add'>+	DECLARE_BITMAP(ms_asidmap, GRU_MAX_GRUS);</div><div class='add'>+	struct gru_mm_tracker	ms_asids[GRU_MAX_GRUS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * One of these structures is allocated when a GSEG is mmaped. The</div><div class='add'>+ * structure is pointed to by the vma-&gt;vm_private_data field in the vma struct.</div><div class='add'>+ */</div><div class='add'>+struct gru_vma_data {</div><div class='add'>+	spinlock_t		vd_lock;	/* Serialize access to vma */</div><div class='add'>+	struct list_head	vd_head;	/* head of linked list of gts */</div><div class='add'>+	long			vd_user_options;/* misc user option flags */</div><div class='add'>+	int			vd_cbr_au_count;</div><div class='add'>+	int			vd_dsr_au_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * One of these is allocated for each thread accessing a mmaped GRU. A linked</div><div class='add'>+ * list of these structure is hung off the struct gru_vma_data in the mm_struct.</div><div class='add'>+ */</div><div class='add'>+struct gru_thread_state {</div><div class='add'>+	struct list_head	ts_next;	/* list - head at vma-private */</div><div class='add'>+	struct mutex		ts_ctxlock;	/* load/unload CTX lock */</div><div class='add'>+	struct mm_struct	*ts_mm;		/* mm currently mapped to</div><div class='add'>+						   context */</div><div class='add'>+	struct vm_area_struct	*ts_vma;	/* vma of GRU context */</div><div class='add'>+	struct gru_state	*ts_gru;	/* GRU where the context is</div><div class='add'>+						   loaded */</div><div class='add'>+	struct gru_mm_struct	*ts_gms;	/* asid &amp; ioproc struct */</div><div class='add'>+	unsigned long		ts_cbr_map;	/* map of allocated CBRs */</div><div class='add'>+	unsigned long		ts_dsr_map;	/* map of allocated DATA</div><div class='add'>+						   resources */</div><div class='add'>+	unsigned long		ts_steal_jiffies;/* jiffies when context last</div><div class='add'>+						    stolen */</div><div class='add'>+	long			ts_user_options;/* misc user option flags */</div><div class='add'>+	pid_t			ts_tgid_owner;	/* task that is using the</div><div class='add'>+						   context - for migration */</div><div class='add'>+	int			ts_tsid;	/* thread that owns the</div><div class='add'>+						   structure */</div><div class='add'>+	int			ts_tlb_int_select;/* target cpu if interrupts</div><div class='add'>+						     enabled */</div><div class='add'>+	int			ts_ctxnum;	/* context number where the</div><div class='add'>+						   context is loaded */</div><div class='add'>+	atomic_t		ts_refcnt;	/* reference count GTS */</div><div class='add'>+	unsigned char		ts_dsr_au_count;/* Number of DSR resources</div><div class='add'>+						   required for contest */</div><div class='add'>+	unsigned char		ts_cbr_au_count;/* Number of CBR resources</div><div class='add'>+						   required for contest */</div><div class='add'>+	char			ts_force_unload;/* force context to be unloaded</div><div class='add'>+						   after migration */</div><div class='add'>+	char			ts_cbr_idx[GRU_CBR_AU];/* CBR numbers of each</div><div class='add'>+							  allocated CB */</div><div class='add'>+	unsigned long		ts_gdata[0];	/* save area for GRU data (CB,</div><div class='add'>+						   DS, CBE) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Threaded programs actually allocate an array of GSEGs when a context is</div><div class='add'>+ * created. Each thread uses a separate GSEG. TSID is the index into the GSEG</div><div class='add'>+ * array.</div><div class='add'>+ */</div><div class='add'>+#define TSID(a, v)		(((a) - (v)-&gt;vm_start) / GRU_GSEG_PAGESIZE)</div><div class='add'>+#define UGRUADDR(gts)		((gts)-&gt;ts_vma-&gt;vm_start +		\</div><div class='add'>+					(gts)-&gt;ts_tsid * GRU_GSEG_PAGESIZE)</div><div class='add'>+</div><div class='add'>+#define NULLCTX			(-1)	/* if context not loaded into GRU */</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+ *  GRU State Tables</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * One of these exists for each GRU chiplet.</div><div class='add'>+ */</div><div class='add'>+struct gru_state {</div><div class='add'>+	struct gru_blade_state	*gs_blade;		/* GRU state for entire</div><div class='add'>+							   blade */</div><div class='add'>+	unsigned long		gs_gru_base_paddr;	/* Physical address of</div><div class='add'>+							   gru segments (64) */</div><div class='add'>+	void			*gs_gru_base_vaddr;	/* Virtual address of</div><div class='add'>+							   gru segments (64) */</div><div class='add'>+	unsigned char		gs_gid;			/* unique GRU number */</div><div class='add'>+	unsigned char		gs_tgh_local_shift;	/* used to pick TGH for</div><div class='add'>+							   local flush */</div><div class='add'>+	unsigned char		gs_tgh_first_remote;	/* starting TGH# for</div><div class='add'>+							   remote flush */</div><div class='add'>+	unsigned short		gs_blade_id;		/* blade of GRU */</div><div class='add'>+	spinlock_t		gs_asid_lock;		/* lock used for</div><div class='add'>+							   assigning asids */</div><div class='add'>+	spinlock_t		gs_lock;		/* lock used for</div><div class='add'>+							   assigning contexts */</div><div class='add'>+</div><div class='add'>+	/* -- the following are protected by the gs_asid_lock spinlock ---- */</div><div class='add'>+	unsigned int		gs_asid;		/* Next availe ASID */</div><div class='add'>+	unsigned int		gs_asid_limit;		/* Limit of available</div><div class='add'>+							   ASIDs */</div><div class='add'>+	unsigned int		gs_asid_gen;		/* asid generation.</div><div class='add'>+							   Inc on wrap */</div><div class='add'>+</div><div class='add'>+	/* --- the following fields are protected by the gs_lock spinlock --- */</div><div class='add'>+	unsigned long		gs_context_map;		/* bitmap to manage</div><div class='add'>+							   contexts in use */</div><div class='add'>+	unsigned long		gs_cbr_map;		/* bitmap to manage CB</div><div class='add'>+							   resources */</div><div class='add'>+	unsigned long		gs_dsr_map;		/* bitmap used to manage</div><div class='add'>+							   DATA resources */</div><div class='add'>+	unsigned int		gs_reserved_cbrs;	/* Number of kernel-</div><div class='add'>+							   reserved cbrs */</div><div class='add'>+	unsigned int		gs_reserved_dsr_bytes;	/* Bytes of kernel-</div><div class='add'>+							   reserved dsrs */</div><div class='add'>+	unsigned short		gs_active_contexts;	/* number of contexts</div><div class='add'>+							   in use */</div><div class='add'>+	struct gru_thread_state	*gs_gts[GRU_NUM_CCH];	/* GTS currently using</div><div class='add'>+							   the context */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This structure contains the GRU state for all the GRUs on a blade.</div><div class='add'>+ */</div><div class='add'>+struct gru_blade_state {</div><div class='add'>+	void			*kernel_cb;		/* First kernel</div><div class='add'>+							   reserved cb */</div><div class='add'>+	void			*kernel_dsr;		/* First kernel</div><div class='add'>+							   reserved DSR */</div><div class='add'>+	/* ---- the following are protected by the bs_lock spinlock ---- */</div><div class='add'>+	spinlock_t		bs_lock;		/* lock used for</div><div class='add'>+							   stealing contexts */</div><div class='add'>+	int			bs_lru_ctxnum;		/* STEAL - last context</div><div class='add'>+							   stolen */</div><div class='add'>+	struct gru_state	*bs_lru_gru;		/* STEAL - last gru</div><div class='add'>+							   stolen */</div><div class='add'>+</div><div class='add'>+	struct gru_state	bs_grus[GRU_CHIPLETS_PER_BLADE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+ * Address Primitives</div><div class='add'>+ */</div><div class='add'>+#define get_tfm_for_cpu(g, c)						\</div><div class='add'>+	((struct gru_tlb_fault_map *)get_tfm((g)-&gt;gs_gru_base_vaddr, (c)))</div><div class='add'>+#define get_tfh_by_index(g, i)						\</div><div class='add'>+	((struct gru_tlb_fault_handle *)get_tfh((g)-&gt;gs_gru_base_vaddr, (i)))</div><div class='add'>+#define get_tgh_by_index(g, i)						\</div><div class='add'>+	((struct gru_tlb_global_handle *)get_tgh((g)-&gt;gs_gru_base_vaddr, (i)))</div><div class='add'>+#define get_cbe_by_index(g, i)						\</div><div class='add'>+	((struct gru_control_block_extended *)get_cbe((g)-&gt;gs_gru_base_vaddr,\</div><div class='add'>+			(i)))</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+ * Useful Macros</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Given a blade# &amp; chiplet#, get a pointer to the GRU */</div><div class='add'>+#define get_gru(b, c)		(&amp;gru_base[b]-&gt;bs_grus[c])</div><div class='add'>+</div><div class='add'>+/* Number of bytes to save/restore when unloading/loading GRU contexts */</div><div class='add'>+#define DSR_BYTES(dsr)		((dsr) * GRU_DSR_AU_BYTES)</div><div class='add'>+#define CBR_BYTES(cbr)		((cbr) * GRU_HANDLE_BYTES * GRU_CBR_AU_SIZE * 2)</div><div class='add'>+</div><div class='add'>+/* Convert a user CB number to the actual CBRNUM */</div><div class='add'>+#define thread_cbr_number(gts, n) ((gts)-&gt;ts_cbr_idx[(n) / GRU_CBR_AU_SIZE] \</div><div class='add'>+				  * GRU_CBR_AU_SIZE + (n) % GRU_CBR_AU_SIZE)</div><div class='add'>+</div><div class='add'>+/* Convert a gid to a pointer to the GRU */</div><div class='add'>+#define GID_TO_GRU(gid)							\</div><div class='add'>+	(gru_base[(gid) / GRU_CHIPLETS_PER_BLADE] ?			\</div><div class='add'>+		(&amp;gru_base[(gid) / GRU_CHIPLETS_PER_BLADE]-&gt;		\</div><div class='add'>+			bs_grus[(gid) % GRU_CHIPLETS_PER_BLADE]) :	\</div><div class='add'>+	 NULL)</div><div class='add'>+</div><div class='add'>+/* Scan all active GRUs in a GRU bitmap */</div><div class='add'>+#define for_each_gru_in_bitmap(gid, map)				\</div><div class='add'>+	for ((gid) = find_first_bit((map), GRU_MAX_GRUS); (gid) &lt; GRU_MAX_GRUS;\</div><div class='add'>+		(gid)++, (gid) = find_next_bit((map), GRU_MAX_GRUS, (gid)))</div><div class='add'>+</div><div class='add'>+/* Scan all active GRUs on a specific blade */</div><div class='add'>+#define for_each_gru_on_blade(gru, nid, i)				\</div><div class='add'>+	for ((gru) = gru_base[nid]-&gt;bs_grus, (i) = 0;			\</div><div class='add'>+			(i) &lt; GRU_CHIPLETS_PER_BLADE;			\</div><div class='add'>+			(i)++, (gru)++)</div><div class='add'>+</div><div class='add'>+/* Scan all active GTSs on a gru. Note: must hold ss_lock to use this macro. */</div><div class='add'>+#define for_each_gts_on_gru(gts, gru, ctxnum)				\</div><div class='add'>+	for ((ctxnum) = 0; (ctxnum) &lt; GRU_NUM_CCH; (ctxnum)++)		\</div><div class='add'>+		if (((gts) = (gru)-&gt;gs_gts[ctxnum]))</div><div class='add'>+</div><div class='add'>+/* Scan each CBR whose bit is set in a TFM (or copy of) */</div><div class='add'>+#define for_each_cbr_in_tfm(i, map)					\</div><div class='add'>+	for ((i) = find_first_bit(map, GRU_NUM_CBE);			\</div><div class='add'>+			(i) &lt; GRU_NUM_CBE;				\</div><div class='add'>+			(i)++, (i) = find_next_bit(map, GRU_NUM_CBE, i))</div><div class='add'>+</div><div class='add'>+/* Scan each CBR in a CBR bitmap. Note: multiple CBRs in an allocation unit */</div><div class='add'>+#define for_each_cbr_in_allocation_map(i, map, k)			\</div><div class='add'>+	for ((k) = find_first_bit(map, GRU_CBR_AU); (k) &lt; GRU_CBR_AU;	\</div><div class='add'>+			(k) = find_next_bit(map, GRU_CBR_AU, (k) + 1)) 	\</div><div class='add'>+		for ((i) = (k)*GRU_CBR_AU_SIZE;				\</div><div class='add'>+				(i) &lt; ((k) + 1) * GRU_CBR_AU_SIZE; (i)++)</div><div class='add'>+</div><div class='add'>+/* Scan each DSR in a DSR bitmap. Note: multiple DSRs in an allocation unit */</div><div class='add'>+#define for_each_dsr_in_allocation_map(i, map, k)			\</div><div class='add'>+	for ((k) = find_first_bit((const unsigned long *)map, GRU_DSR_AU);\</div><div class='add'>+			(k) &lt; GRU_DSR_AU;				\</div><div class='add'>+			(k) = find_next_bit((const unsigned long *)map,	\</div><div class='add'>+					  GRU_DSR_AU, (k) + 1))		\</div><div class='add'>+		for ((i) = (k) * GRU_DSR_AU_CL;				\</div><div class='add'>+				(i) &lt; ((k) + 1) * GRU_DSR_AU_CL; (i)++)</div><div class='add'>+</div><div class='add'>+#define gseg_physical_address(gru, ctxnum)				\</div><div class='add'>+		((gru)-&gt;gs_gru_base_paddr + ctxnum * GRU_GSEG_STRIDE)</div><div class='add'>+#define gseg_virtual_address(gru, ctxnum)				\</div><div class='add'>+		((gru)-&gt;gs_gru_base_vaddr + ctxnum * GRU_GSEG_STRIDE)</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+ * Lock / Unlock GRU handles</div><div class='add'>+ * 	Use the "delresp" bit in the handle as a "lock" bit.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Lock hierarchy checking enabled only in emulator */</div><div class='add'>+</div><div class='add'>+static inline void __lock_handle(void *h)</div><div class='add'>+{</div><div class='add'>+	while (test_and_set_bit(1, h))</div><div class='add'>+		cpu_relax();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __unlock_handle(void *h)</div><div class='add'>+{</div><div class='add'>+	clear_bit(1, h);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void lock_cch_handle(struct gru_context_configuration_handle *cch)</div><div class='add'>+{</div><div class='add'>+	__lock_handle(cch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void unlock_cch_handle(struct gru_context_configuration_handle</div><div class='add'>+				     *cch)</div><div class='add'>+{</div><div class='add'>+	__unlock_handle(cch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void lock_tgh_handle(struct gru_tlb_global_handle *tgh)</div><div class='add'>+{</div><div class='add'>+	__lock_handle(tgh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void unlock_tgh_handle(struct gru_tlb_global_handle *tgh)</div><div class='add'>+{</div><div class='add'>+	__unlock_handle(tgh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------------------</div><div class='add'>+ * Function prototypes &amp; externs</div><div class='add'>+ */</div><div class='add'>+struct gru_unload_context_req;</div><div class='add'>+</div><div class='add'>+extern struct vm_operations_struct gru_vm_ops;</div><div class='add'>+extern struct device *grudev;</div><div class='add'>+</div><div class='add'>+extern struct gru_vma_data *gru_alloc_vma_data(struct vm_area_struct *vma,</div><div class='add'>+				int tsid);</div><div class='add'>+extern struct gru_thread_state *gru_find_thread_state(struct vm_area_struct</div><div class='add'>+				*vma, int tsid);</div><div class='add'>+extern struct gru_thread_state *gru_alloc_thread_state(struct vm_area_struct</div><div class='add'>+				*vma, int tsid);</div><div class='add'>+extern void gru_unload_context(struct gru_thread_state *gts, int savestate);</div><div class='add'>+extern void gts_drop(struct gru_thread_state *gts);</div><div class='add'>+extern void gru_tgh_flush_init(struct gru_state *gru);</div><div class='add'>+extern int gru_kservices_init(struct gru_state *gru);</div><div class='add'>+extern irqreturn_t gru_intr(int irq, void *dev_id);</div><div class='add'>+extern int gru_handle_user_call_os(unsigned long address);</div><div class='add'>+extern int gru_user_flush_tlb(unsigned long arg);</div><div class='add'>+extern int gru_user_unload_context(unsigned long arg);</div><div class='add'>+extern int gru_get_exception_detail(unsigned long arg);</div><div class='add'>+extern int gru_set_task_slice(long address);</div><div class='add'>+extern int gru_cpu_fault_map_id(void);</div><div class='add'>+extern struct vm_area_struct *gru_find_vma(unsigned long vaddr);</div><div class='add'>+extern void gru_flush_all_tlb(struct gru_state *gru);</div><div class='add'>+extern int gru_proc_init(void);</div><div class='add'>+extern void gru_proc_exit(void);</div><div class='add'>+</div><div class='add'>+extern unsigned long gru_reserve_cb_resources(struct gru_state *gru,</div><div class='add'>+		int cbr_au_count, char *cbmap);</div><div class='add'>+extern unsigned long gru_reserve_ds_resources(struct gru_state *gru,</div><div class='add'>+		int dsr_au_count, char *dsmap);</div><div class='add'>+extern int gru_fault(struct vm_area_struct *, struct vm_fault *vmf);</div><div class='add'>+extern struct gru_mm_struct *gru_register_mmu_notifier(void);</div><div class='add'>+extern void gru_drop_mmu_notifier(struct gru_mm_struct *gms);</div><div class='add'>+</div><div class='add'>+extern void gru_flush_tlb_range(struct gru_mm_struct *gms, unsigned long start,</div><div class='add'>+					unsigned long len);</div><div class='add'>+</div><div class='add'>+extern unsigned long gru_options;</div><div class='add'>+</div><div class='add'>+#endif /* __GRUTABLES_H__ */</div><div class='head'>diff --git a/drivers/misc/sgi-gru/grutlbpurge.c b/drivers/misc/sgi-gru/grutlbpurge.c<br/>new file mode 100644<br/>index 000000000000..c84496a77691<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-gru/grutlbpurge.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-gru/grutlbpurge.c</a></div><div class='hunk'>@@ -0,0 +1,371 @@</div><div class='add'>+/*</div><div class='add'>+ * SN Platform GRU Driver</div><div class='add'>+ *</div><div class='add'>+ * 		MMUOPS callbacks  + TLB flushing</div><div class='add'>+ *</div><div class='add'>+ * This file handles emu notifier callbacks from the core kernel. The callbacks</div><div class='add'>+ * are used to update the TLB in the GRU as a result of changes in the</div><div class='add'>+ * state of a process address space. This file also handles TLB invalidates</div><div class='add'>+ * from the GRU driver.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hugetlb.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/timex.h&gt;</div><div class='add'>+#include &lt;linux/srcu.h&gt;</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#include "gru.h"</div><div class='add'>+#include "grutables.h"</div><div class='add'>+#include &lt;asm/uv/uv_hub.h&gt;</div><div class='add'>+</div><div class='add'>+#define gru_random()	get_cycles()</div><div class='add'>+</div><div class='add'>+/* ---------------------------------- TLB Invalidation functions --------</div><div class='add'>+ * get_tgh_handle</div><div class='add'>+ *</div><div class='add'>+ * Find a TGH to use for issuing a TLB invalidate. For GRUs that are on the</div><div class='add'>+ * local blade, use a fixed TGH that is a function of the blade-local cpu</div><div class='add'>+ * number. Normally, this TGH is private to the cpu &amp; no contention occurs for</div><div class='add'>+ * the TGH. For offblade GRUs, select a random TGH in the range above the</div><div class='add'>+ * private TGHs. A spinlock is required to access this TGH &amp; the lock must be</div><div class='add'>+ * released when the invalidate is completes. This sucks, but it is the best we</div><div class='add'>+ * can do.</div><div class='add'>+ *</div><div class='add'>+ * Note that the spinlock is IN the TGH handle so locking does not involve</div><div class='add'>+ * additional cache lines.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static inline int get_off_blade_tgh(struct gru_state *gru)</div><div class='add'>+{</div><div class='add'>+	int n;</div><div class='add'>+</div><div class='add'>+	n = GRU_NUM_TGH - gru-&gt;gs_tgh_first_remote;</div><div class='add'>+	n = gru_random() % n;</div><div class='add'>+	n += gru-&gt;gs_tgh_first_remote;</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int get_on_blade_tgh(struct gru_state *gru)</div><div class='add'>+{</div><div class='add'>+	return uv_blade_processor_id() &gt;&gt; gru-&gt;gs_tgh_local_shift;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct gru_tlb_global_handle *get_lock_tgh_handle(struct gru_state</div><div class='add'>+							 *gru)</div><div class='add'>+{</div><div class='add'>+	struct gru_tlb_global_handle *tgh;</div><div class='add'>+	int n;</div><div class='add'>+</div><div class='add'>+	preempt_disable();</div><div class='add'>+	if (uv_numa_blade_id() == gru-&gt;gs_blade_id)</div><div class='add'>+		n = get_on_blade_tgh(gru);</div><div class='add'>+	else</div><div class='add'>+		n = get_off_blade_tgh(gru);</div><div class='add'>+	tgh = get_tgh_by_index(gru, n);</div><div class='add'>+	lock_tgh_handle(tgh);</div><div class='add'>+</div><div class='add'>+	return tgh;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void get_unlock_tgh_handle(struct gru_tlb_global_handle *tgh)</div><div class='add'>+{</div><div class='add'>+	unlock_tgh_handle(tgh);</div><div class='add'>+	preempt_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * gru_flush_tlb_range</div><div class='add'>+ *</div><div class='add'>+ * General purpose TLB invalidation function. This function scans every GRU in</div><div class='add'>+ * the ENTIRE system (partition) looking for GRUs where the specified MM has</div><div class='add'>+ * been accessed by the GRU. For each GRU found, the TLB must be invalidated OR</div><div class='add'>+ * the ASID invalidated. Invalidating an ASID causes a new ASID to be assigned</div><div class='add'>+ * on the next fault. This effectively flushes the ENTIRE TLB for the MM at the</div><div class='add'>+ * cost of (possibly) a large number of future TLBmisses.</div><div class='add'>+ *</div><div class='add'>+ * The current algorithm is optimized based on the following (somewhat true)</div><div class='add'>+ * assumptions:</div><div class='add'>+ * 	- GRU contexts are not loaded into a GRU unless a reference is made to</div><div class='add'>+ * 	  the data segment or control block (this is true, not an assumption).</div><div class='add'>+ * 	  If a DS/CB is referenced, the user will also issue instructions that</div><div class='add'>+ * 	  cause TLBmisses. It is not necessary to optimize for the case where</div><div class='add'>+ * 	  contexts are loaded but no instructions cause TLB misses. (I know</div><div class='add'>+ * 	  this will happen but I'm not optimizing for it).</div><div class='add'>+ * 	- GRU instructions to invalidate TLB entries are SLOOOOWWW - normally</div><div class='add'>+ * 	  a few usec but in unusual cases, it could be longer. Avoid if</div><div class='add'>+ * 	  possible.</div><div class='add'>+ * 	- intrablade process migration between cpus is not frequent but is</div><div class='add'>+ * 	  common.</div><div class='add'>+ * 	- a GRU context is not typically migrated to a different GRU on the</div><div class='add'>+ * 	  blade because of intrablade migration</div><div class='add'>+ *	- interblade migration is rare. Processes migrate their GRU context to</div><div class='add'>+ *	  the new blade.</div><div class='add'>+ *	- if interblade migration occurs, migration back to the original blade</div><div class='add'>+ *	  is very very rare (ie., no optimization for this case)</div><div class='add'>+ *	- most GRU instruction operate on a subset of the user REGIONS. Code</div><div class='add'>+ *	  &amp; shared library regions are not likely targets of GRU instructions.</div><div class='add'>+ *</div><div class='add'>+ * To help improve the efficiency of TLB invalidation, the GMS data</div><div class='add'>+ * structure is maintained for EACH address space (MM struct). The GMS is</div><div class='add'>+ * also the structure that contains the pointer to the mmu callout</div><div class='add'>+ * functions. This structure is linked to the mm_struct for the address space</div><div class='add'>+ * using the mmu "register" function. The mmu interfaces are used to</div><div class='add'>+ * provide the callbacks for TLB invalidation. The GMS contains:</div><div class='add'>+ *</div><div class='add'>+ * 	- asid[maxgrus] array. ASIDs are assigned to a GRU when a context is</div><div class='add'>+ * 	  loaded into the GRU.</div><div class='add'>+ * 	- asidmap[maxgrus]. bitmap to make it easier to find non-zero asids in</div><div class='add'>+ * 	  the above array</div><div class='add'>+ *	- ctxbitmap[maxgrus]. Indicates the contexts that are currently active</div><div class='add'>+ *	  in the GRU for the address space. This bitmap must be passed to the</div><div class='add'>+ *	  GRU to do an invalidate.</div><div class='add'>+ *</div><div class='add'>+ * The current algorithm for invalidating TLBs is:</div><div class='add'>+ * 	- scan the asidmap for GRUs where the context has been loaded, ie,</div><div class='add'>+ * 	  asid is non-zero.</div><div class='add'>+ * 	- for each gru found:</div><div class='add'>+ * 		- if the ctxtmap is non-zero, there are active contexts in the</div><div class='add'>+ * 		  GRU. TLB invalidate instructions must be issued to the GRU.</div><div class='add'>+ *		- if the ctxtmap is zero, no context is active. Set the ASID to</div><div class='add'>+ *		  zero to force a full TLB invalidation. This is fast but will</div><div class='add'>+ *		  cause a lot of TLB misses if the context is reloaded onto the</div><div class='add'>+ *		  GRU</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void gru_flush_tlb_range(struct gru_mm_struct *gms, unsigned long start,</div><div class='add'>+			 unsigned long len)</div><div class='add'>+{</div><div class='add'>+	struct gru_state *gru;</div><div class='add'>+	struct gru_mm_tracker *asids;</div><div class='add'>+	struct gru_tlb_global_handle *tgh;</div><div class='add'>+	unsigned long num;</div><div class='add'>+	int grupagesize, pagesize, pageshift, gid, asid;</div><div class='add'>+</div><div class='add'>+	/* ZZZ TODO - handle huge pages */</div><div class='add'>+	pageshift = PAGE_SHIFT;</div><div class='add'>+	pagesize = (1UL &lt;&lt; pageshift);</div><div class='add'>+	grupagesize = GRU_PAGESIZE(pageshift);</div><div class='add'>+	num = min(((len + pagesize - 1) &gt;&gt; pageshift), GRUMAXINVAL);</div><div class='add'>+</div><div class='add'>+	STAT(flush_tlb);</div><div class='add'>+	gru_dbg(grudev, "gms %p, start 0x%lx, len 0x%lx, asidmap 0x%lx\n", gms,</div><div class='add'>+		start, len, gms-&gt;ms_asidmap[0]);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;gms-&gt;ms_asid_lock);</div><div class='add'>+	for_each_gru_in_bitmap(gid, gms-&gt;ms_asidmap) {</div><div class='add'>+		STAT(flush_tlb_gru);</div><div class='add'>+		gru = GID_TO_GRU(gid);</div><div class='add'>+		asids = gms-&gt;ms_asids + gid;</div><div class='add'>+		asid = asids-&gt;mt_asid;</div><div class='add'>+		if (asids-&gt;mt_ctxbitmap &amp;&amp; asid) {</div><div class='add'>+			STAT(flush_tlb_gru_tgh);</div><div class='add'>+			asid = GRUASID(asid, start);</div><div class='add'>+			gru_dbg(grudev,</div><div class='add'>+	"  FLUSH gruid %d, asid 0x%x, num %ld, cbmap 0x%x\n",</div><div class='add'>+				gid, asid, num, asids-&gt;mt_ctxbitmap);</div><div class='add'>+			tgh = get_lock_tgh_handle(gru);</div><div class='add'>+			tgh_invalidate(tgh, start, 0, asid, grupagesize, 0,</div><div class='add'>+				       num - 1, asids-&gt;mt_ctxbitmap);</div><div class='add'>+			get_unlock_tgh_handle(tgh);</div><div class='add'>+		} else {</div><div class='add'>+			STAT(flush_tlb_gru_zero_asid);</div><div class='add'>+			asids-&gt;mt_asid = 0;</div><div class='add'>+			__clear_bit(gru-&gt;gs_gid, gms-&gt;ms_asidmap);</div><div class='add'>+			gru_dbg(grudev,</div><div class='add'>+	"  CLEARASID gruid %d, asid 0x%x, cbtmap 0x%x, asidmap 0x%lx\n",</div><div class='add'>+				gid, asid, asids-&gt;mt_ctxbitmap,</div><div class='add'>+				gms-&gt;ms_asidmap[0]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;gms-&gt;ms_asid_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flush the entire TLB on a chiplet.</div><div class='add'>+ */</div><div class='add'>+void gru_flush_all_tlb(struct gru_state *gru)</div><div class='add'>+{</div><div class='add'>+	struct gru_tlb_global_handle *tgh;</div><div class='add'>+</div><div class='add'>+	gru_dbg(grudev, "gru %p, gid %d\n", gru, gru-&gt;gs_gid);</div><div class='add'>+	tgh = get_lock_tgh_handle(gru);</div><div class='add'>+	tgh_invalidate(tgh, 0, ~0, 0, 1, 1, GRUMAXINVAL - 1, 0);</div><div class='add'>+	get_unlock_tgh_handle(tgh);</div><div class='add'>+	preempt_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MMUOPS notifier callout functions</div><div class='add'>+ */</div><div class='add'>+static void gru_invalidate_range_start(struct mmu_notifier *mn,</div><div class='add'>+				       struct mm_struct *mm,</div><div class='add'>+				       unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	struct gru_mm_struct *gms = container_of(mn, struct gru_mm_struct,</div><div class='add'>+						 ms_notifier);</div><div class='add'>+</div><div class='add'>+	STAT(mmu_invalidate_range);</div><div class='add'>+	atomic_inc(&amp;gms-&gt;ms_range_active);</div><div class='add'>+	gru_dbg(grudev, "gms %p, start 0x%lx, end 0x%lx, act %d\n", gms,</div><div class='add'>+		start, end, atomic_read(&amp;gms-&gt;ms_range_active));</div><div class='add'>+	gru_flush_tlb_range(gms, start, end - start);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gru_invalidate_range_end(struct mmu_notifier *mn,</div><div class='add'>+				     struct mm_struct *mm, unsigned long start,</div><div class='add'>+				     unsigned long end)</div><div class='add'>+{</div><div class='add'>+	struct gru_mm_struct *gms = container_of(mn, struct gru_mm_struct,</div><div class='add'>+						 ms_notifier);</div><div class='add'>+</div><div class='add'>+	/* ..._and_test() provides needed barrier */</div><div class='add'>+	(void)atomic_dec_and_test(&amp;gms-&gt;ms_range_active);</div><div class='add'>+</div><div class='add'>+	wake_up_all(&amp;gms-&gt;ms_wait_queue);</div><div class='add'>+	gru_dbg(grudev, "gms %p, start 0x%lx, end 0x%lx\n", gms, start, end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gru_invalidate_page(struct mmu_notifier *mn, struct mm_struct *mm,</div><div class='add'>+				unsigned long address)</div><div class='add'>+{</div><div class='add'>+	struct gru_mm_struct *gms = container_of(mn, struct gru_mm_struct,</div><div class='add'>+						 ms_notifier);</div><div class='add'>+</div><div class='add'>+	STAT(mmu_invalidate_page);</div><div class='add'>+	gru_flush_tlb_range(gms, address, PAGE_SIZE);</div><div class='add'>+	gru_dbg(grudev, "gms %p, address 0x%lx\n", gms, address);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gru_release(struct mmu_notifier *mn, struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	struct gru_mm_struct *gms = container_of(mn, struct gru_mm_struct,</div><div class='add'>+						 ms_notifier);</div><div class='add'>+</div><div class='add'>+	gms-&gt;ms_released = 1;</div><div class='add'>+	gru_dbg(grudev, "gms %p\n", gms);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const struct mmu_notifier_ops gru_mmuops = {</div><div class='add'>+	.invalidate_page	= gru_invalidate_page,</div><div class='add'>+	.invalidate_range_start	= gru_invalidate_range_start,</div><div class='add'>+	.invalidate_range_end	= gru_invalidate_range_end,</div><div class='add'>+	.release		= gru_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Move this to the basic mmu_notifier file. But for now... */</div><div class='add'>+static struct mmu_notifier *mmu_find_ops(struct mm_struct *mm,</div><div class='add'>+			const struct mmu_notifier_ops *ops)</div><div class='add'>+{</div><div class='add'>+	struct mmu_notifier *mn, *gru_mn = NULL;</div><div class='add'>+	struct hlist_node *n;</div><div class='add'>+</div><div class='add'>+	if (mm-&gt;mmu_notifier_mm) {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		hlist_for_each_entry_rcu(mn, n, &amp;mm-&gt;mmu_notifier_mm-&gt;list,</div><div class='add'>+					 hlist)</div><div class='add'>+		    if (mn-&gt;ops == ops) {</div><div class='add'>+			gru_mn = mn;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='add'>+	return gru_mn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct gru_mm_struct *gru_register_mmu_notifier(void)</div><div class='add'>+{</div><div class='add'>+	struct gru_mm_struct *gms;</div><div class='add'>+	struct mmu_notifier *mn;</div><div class='add'>+</div><div class='add'>+	mn = mmu_find_ops(current-&gt;mm, &amp;gru_mmuops);</div><div class='add'>+	if (mn) {</div><div class='add'>+		gms = container_of(mn, struct gru_mm_struct, ms_notifier);</div><div class='add'>+		atomic_inc(&amp;gms-&gt;ms_refcnt);</div><div class='add'>+	} else {</div><div class='add'>+		gms = kzalloc(sizeof(*gms), GFP_KERNEL);</div><div class='add'>+		if (gms) {</div><div class='add'>+			spin_lock_init(&amp;gms-&gt;ms_asid_lock);</div><div class='add'>+			gms-&gt;ms_notifier.ops = &amp;gru_mmuops;</div><div class='add'>+			atomic_set(&amp;gms-&gt;ms_refcnt, 1);</div><div class='add'>+			init_waitqueue_head(&amp;gms-&gt;ms_wait_queue);</div><div class='add'>+			__mmu_notifier_register(&amp;gms-&gt;ms_notifier, current-&gt;mm);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	gru_dbg(grudev, "gms %p, refcnt %d\n", gms,</div><div class='add'>+		atomic_read(&amp;gms-&gt;ms_refcnt));</div><div class='add'>+	return gms;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gru_drop_mmu_notifier(struct gru_mm_struct *gms)</div><div class='add'>+{</div><div class='add'>+	gru_dbg(grudev, "gms %p, refcnt %d, released %d\n", gms,</div><div class='add'>+		atomic_read(&amp;gms-&gt;ms_refcnt), gms-&gt;ms_released);</div><div class='add'>+	if (atomic_dec_return(&amp;gms-&gt;ms_refcnt) == 0) {</div><div class='add'>+		if (!gms-&gt;ms_released)</div><div class='add'>+			mmu_notifier_unregister(&amp;gms-&gt;ms_notifier, current-&gt;mm);</div><div class='add'>+		kfree(gms);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup TGH parameters. There are:</div><div class='add'>+ * 	- 24 TGH handles per GRU chiplet</div><div class='add'>+ * 	- a portion (MAX_LOCAL_TGH) of the handles are reserved for</div><div class='add'>+ * 	  use by blade-local cpus</div><div class='add'>+ * 	- the rest are used by off-blade cpus. This usage is</div><div class='add'>+ * 	  less frequent than blade-local usage.</div><div class='add'>+ *</div><div class='add'>+ * For now, use 16 handles for local flushes, 8 for remote flushes. If the blade</div><div class='add'>+ * has less tan or equal to 16 cpus, each cpu has a unique handle that it can</div><div class='add'>+ * use.</div><div class='add'>+ */</div><div class='add'>+#define MAX_LOCAL_TGH	16</div><div class='add'>+</div><div class='add'>+void gru_tgh_flush_init(struct gru_state *gru)</div><div class='add'>+{</div><div class='add'>+	int cpus, shift = 0, n;</div><div class='add'>+</div><div class='add'>+	cpus = uv_blade_nr_possible_cpus(gru-&gt;gs_blade_id);</div><div class='add'>+</div><div class='add'>+	/* n = cpus rounded up to next power of 2 */</div><div class='add'>+	if (cpus) {</div><div class='add'>+		n = 1 &lt;&lt; fls(cpus - 1);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * shift count for converting local cpu# to TGH index</div><div class='add'>+		 *      0 if cpus &lt;= MAX_LOCAL_TGH,</div><div class='add'>+		 *      1 if cpus &lt;= 2*MAX_LOCAL_TGH,</div><div class='add'>+		 *      etc</div><div class='add'>+		 */</div><div class='add'>+		shift = max(0, fls(n - 1) - fls(MAX_LOCAL_TGH - 1));</div><div class='add'>+	}</div><div class='add'>+	gru-&gt;gs_tgh_local_shift = shift;</div><div class='add'>+</div><div class='add'>+	/* first starting TGH index to use for remote purges */</div><div class='add'>+	gru-&gt;gs_tgh_first_remote = (cpus + (1 &lt;&lt; shift) - 1) &gt;&gt; shift;</div><div class='add'>+</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/misc/sgi-xp/Makefile b/drivers/misc/sgi-xp/Makefile<br/>index b6e40a7958ce..35ce28578075 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/misc/sgi-xp/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/Makefile</a></div><div class='hunk'>@@ -3,9 +3,17 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SGI_XP)		+= xp.o</div><div class='del'>-xp-y				:= xp_main.o xp_nofault.o</div><div class='add'>+xp-y				:= xp_main.o</div><div class='add'>+xp-$(CONFIG_IA64_SGI_SN2)	+= xp_sn2.o xp_nofault.o</div><div class='add'>+xp-$(CONFIG_IA64_GENERIC)	+= xp_sn2.o xp_nofault.o xp_uv.o</div><div class='add'>+xp-$(CONFIG_IA64_SGI_UV)	+= xp_uv.o</div><div class='add'>+xp-$(CONFIG_X86_64)		+= xp_uv.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SGI_XP)		+= xpc.o</div><div class='ctx'> xpc-y				:= xpc_main.o xpc_channel.o xpc_partition.o</div><div class='add'>+xpc-$(CONFIG_IA64_SGI_SN2)	+= xpc_sn2.o</div><div class='add'>+xpc-$(CONFIG_IA64_GENERIC)	+= xpc_sn2.o xpc_uv.o</div><div class='add'>+xpc-$(CONFIG_IA64_SGI_UV) 	+= xpc_uv.o</div><div class='add'>+xpc-$(CONFIG_X86_64)		+= xpc_uv.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SGI_XP)		+= xpnet.o</div><div class='head'>diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h<br/>index 03a87a307e32..859a5281c61b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/misc/sgi-xp/xp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xp.h</a></div><div class='hunk'>@@ -13,11 +13,34 @@</div><div class='ctx'> #ifndef _DRIVERS_MISC_SGIXP_XP_H</div><div class='ctx'> #define _DRIVERS_MISC_SGIXP_XP_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/cache.h&gt;</div><div class='del'>-#include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;asm/sn/types.h&gt;</div><div class='del'>-#include &lt;asm/sn/bte.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IA64</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/sn/arch.h&gt;	/* defines is_shub1() and is_shub2() */</div><div class='add'>+#define is_shub()	ia64_platform_is("sn2")</div><div class='add'>+#define is_uv()		ia64_platform_is("uv")</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+#include &lt;asm/genapic.h&gt;</div><div class='add'>+#define is_uv()		is_uv_system()</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef is_shub1</div><div class='add'>+#define is_shub1()	0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef is_shub2</div><div class='add'>+#define is_shub2()	0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef is_shub</div><div class='add'>+#define is_shub()	0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef is_uv</div><div class='add'>+#define is_uv()		0</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef USE_DBUG_ON</div><div class='ctx'> #define DBUG_ON(condition)	BUG_ON(condition)</div><div class='hunk'>@@ -26,133 +49,56 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Define the maximum number of logically defined partitions the system</div><div class='del'>- * can support. It is constrained by the maximum number of hardware</div><div class='del'>- * partitionable regions. The term 'region' in this context refers to the</div><div class='del'>- * minimum number of nodes that can comprise an access protection grouping.</div><div class='del'>- * The access protection is in regards to memory, IPI and IOI.</div><div class='add'>+ * Define the maximum number of partitions the system can possibly support.</div><div class='add'>+ * It is based on the maximum number of hardware partitionable regions. The</div><div class='add'>+ * term 'region' in this context refers to the minimum number of nodes that</div><div class='add'>+ * can comprise an access protection grouping. The access protection is in</div><div class='add'>+ * regards to memory, IPI and IOI.</div><div class='ctx'>  *</div><div class='ctx'>  * The maximum number of hardware partitionable regions is equal to the</div><div class='ctx'>  * maximum number of nodes in the entire system divided by the minimum number</div><div class='ctx'>  * of nodes that comprise an access protection grouping.</div><div class='ctx'>  */</div><div class='del'>-#define XP_MAX_PARTITIONS	64</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Define the number of u64s required to represent all the C-brick nasids</div><div class='del'>- * as a bitmap.  The cross-partition kernel modules deal only with</div><div class='del'>- * C-brick nasids, thus the need for bitmaps which don't account for</div><div class='del'>- * odd-numbered (non C-brick) nasids.</div><div class='del'>- */</div><div class='del'>-#define XP_MAX_PHYSNODE_ID	(MAX_NUMALINK_NODES / 2)</div><div class='del'>-#define XP_NASID_MASK_BYTES	((XP_MAX_PHYSNODE_ID + 7) / 8)</div><div class='del'>-#define XP_NASID_MASK_WORDS	((XP_MAX_PHYSNODE_ID + 63) / 64)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Wrapper for bte_copy() that should it return a failure status will retry</div><div class='del'>- * the bte_copy() once in the hope that the failure was due to a temporary</div><div class='del'>- * aberration (i.e., the link going down temporarily).</div><div class='del'>- *</div><div class='del'>- * 	src - physical address of the source of the transfer.</div><div class='del'>- *	vdst - virtual address of the destination of the transfer.</div><div class='del'>- *	len - number of bytes to transfer from source to destination.</div><div class='del'>- *	mode - see bte_copy() for definition.</div><div class='del'>- *	notification - see bte_copy() for definition.</div><div class='del'>- *</div><div class='del'>- * Note: xp_bte_copy() should never be called while holding a spinlock.</div><div class='del'>- */</div><div class='del'>-static inline bte_result_t</div><div class='del'>-xp_bte_copy(u64 src, u64 vdst, u64 len, u64 mode, void *notification)</div><div class='del'>-{</div><div class='del'>-	bte_result_t ret;</div><div class='del'>-	u64 pdst = ia64_tpa(vdst);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Ensure that the physically mapped memory is contiguous.</div><div class='del'>-	 *</div><div class='del'>-	 * We do this by ensuring that the memory is from region 7 only.</div><div class='del'>-	 * If the need should arise to use memory from one of the other</div><div class='del'>-	 * regions, then modify the BUG_ON() statement to ensure that the</div><div class='del'>-	 * memory from that region is always physically contiguous.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(REGION_NUMBER(vdst) != RGN_KERNEL);</div><div class='del'>-</div><div class='del'>-	ret = bte_copy(src, pdst, len, mode, notification);</div><div class='del'>-	if ((ret != BTE_SUCCESS) &amp;&amp; BTE_ERROR_RETRY(ret)) {</div><div class='del'>-		if (!in_interrupt())</div><div class='del'>-			cond_resched();</div><div class='del'>-</div><div class='del'>-		ret = bte_copy(src, pdst, len, mode, notification);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+#define XP_MAX_NPARTITIONS_SN2	64</div><div class='add'>+#define XP_MAX_NPARTITIONS_UV	256</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * XPC establishes channel connections between the local partition and any</div><div class='ctx'>  * other partition that is currently up. Over these channels, kernel-level</div><div class='ctx'>  * `users' can communicate with their counterparts on the other partitions.</div><div class='ctx'>  *</div><div class='del'>- * The maxinum number of channels is limited to eight. For performance reasons,</div><div class='del'>- * the internal cross partition structures require sixteen bytes per channel,</div><div class='del'>- * and eight allows all of this interface-shared info to fit in one cache line.</div><div class='del'>- *</div><div class='del'>- * XPC_NCHANNELS reflects the total number of channels currently defined.</div><div class='ctx'>  * If the need for additional channels arises, one can simply increase</div><div class='del'>- * XPC_NCHANNELS accordingly. If the day should come where that number</div><div class='del'>- * exceeds the MAXIMUM number of channels allowed (eight), then one will need</div><div class='del'>- * to make changes to the XPC code to allow for this.</div><div class='add'>+ * XPC_MAX_NCHANNELS accordingly. If the day should come where that number</div><div class='add'>+ * exceeds the absolute MAXIMUM number of channels possible (eight), then one</div><div class='add'>+ * will need to make changes to the XPC code to accommodate for this.</div><div class='add'>+ *</div><div class='add'>+ * The absolute maximum number of channels possible is limited to eight for</div><div class='add'>+ * performance reasons on sn2 hardware. The internal cross partition structures</div><div class='add'>+ * require sixteen bytes per channel, and eight allows all of this</div><div class='add'>+ * interface-shared info to fit in one 128-byte cacheline.</div><div class='ctx'>  */</div><div class='ctx'> #define XPC_MEM_CHANNEL		0	/* memory channel number */</div><div class='ctx'> #define	XPC_NET_CHANNEL		1	/* network channel number */</div><div class='ctx'> </div><div class='del'>-#define	XPC_NCHANNELS		2	/* #of defined channels */</div><div class='del'>-#define XPC_MAX_NCHANNELS	8	/* max #of channels allowed */</div><div class='add'>+#define XPC_MAX_NCHANNELS	2	/* max #of channels allowed */</div><div class='ctx'> </div><div class='del'>-#if XPC_NCHANNELS &gt; XPC_MAX_NCHANNELS</div><div class='del'>-#error	XPC_NCHANNELS exceeds MAXIMUM allowed.</div><div class='add'>+#if XPC_MAX_NCHANNELS &gt; 8</div><div class='add'>+#error	XPC_MAX_NCHANNELS exceeds absolute MAXIMUM possible.</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The format of an XPC message is as follows:</div><div class='del'>- *</div><div class='del'>- *      +-------+--------------------------------+</div><div class='del'>- *      | flags |////////////////////////////////|</div><div class='del'>- *      +-------+--------------------------------+</div><div class='del'>- *      |             message #                  |</div><div class='del'>- *      +----------------------------------------+</div><div class='del'>- *      |     payload (user-defined message)     |</div><div class='del'>- *      |                                        |</div><div class='del'>- *         		:</div><div class='del'>- *      |                                        |</div><div class='del'>- *      +----------------------------------------+</div><div class='del'>- *</div><div class='del'>- * The size of the payload is defined by the user via xpc_connect(). A user-</div><div class='del'>- * defined message resides in the payload area.</div><div class='del'>- *</div><div class='del'>- * The user should have no dealings with the message header, but only the</div><div class='del'>- * message's payload. When a message entry is allocated (via xpc_allocate())</div><div class='del'>- * a pointer to the payload area is returned and not the actual beginning of</div><div class='del'>- * the XPC message. The user then constructs a message in the payload area</div><div class='del'>- * and passes that pointer as an argument on xpc_send() or xpc_send_notify().</div><div class='del'>- *</div><div class='del'>- * The size of a message entry (within a message queue) must be a cacheline</div><div class='del'>- * sized multiple in order to facilitate the BTE transfer of messages from one</div><div class='del'>- * message queue to another. A macro, XPC_MSG_SIZE(), is provided for the user</div><div class='add'>+ * Define macro, XPC_MSG_SIZE(), is provided for the user</div><div class='ctx'>  * that wants to fit as many msg entries as possible in a given memory size</div><div class='ctx'>  * (e.g. a memory page).</div><div class='ctx'>  */</div><div class='del'>-struct xpc_msg {</div><div class='del'>-	u8 flags;		/* FOR XPC INTERNAL USE ONLY */</div><div class='del'>-	u8 reserved[7];		/* FOR XPC INTERNAL USE ONLY */</div><div class='del'>-	s64 number;		/* FOR XPC INTERNAL USE ONLY */</div><div class='del'>-</div><div class='del'>-	u64 payload;		/* user defined portion of message */</div><div class='del'>-};</div><div class='add'>+#define XPC_MSG_MAX_SIZE	128</div><div class='add'>+#define XPC_MSG_HDR_MAX_SIZE	16</div><div class='add'>+#define XPC_MSG_PAYLOAD_MAX_SIZE (XPC_MSG_MAX_SIZE - XPC_MSG_HDR_MAX_SIZE)</div><div class='ctx'> </div><div class='del'>-#define XPC_MSG_PAYLOAD_OFFSET	(u64) (&amp;((struct xpc_msg *)0)-&gt;payload)</div><div class='ctx'> #define XPC_MSG_SIZE(_payload_size) \</div><div class='del'>-		L1_CACHE_ALIGN(XPC_MSG_PAYLOAD_OFFSET + (_payload_size))</div><div class='add'>+				ALIGN(XPC_MSG_HDR_MAX_SIZE + (_payload_size), \</div><div class='add'>+				      is_uv() ? 64 : 128)</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Define the return values and values passed to user's callout functions.</div><div class='hunk'>@@ -233,8 +179,20 @@ enum xp_retval {</div><div class='ctx'> 	xpDisconnected,		/* 51: channel disconnected (closed) */</div><div class='ctx'> </div><div class='ctx'> 	xpBteCopyError,		/* 52: bte_copy() returned error */</div><div class='add'>+	xpSalError,		/* 53: sn SAL error */</div><div class='add'>+	xpRsvdPageNotSet,	/* 54: the reserved page is not set up */</div><div class='add'>+	xpPayloadTooBig,	/* 55: payload too large for message slot */</div><div class='add'>+</div><div class='add'>+	xpUnsupported,		/* 56: unsupported functionality or resource */</div><div class='add'>+	xpNeedMoreInfo,		/* 57: more info is needed by SAL */</div><div class='ctx'> </div><div class='del'>-	xpUnknownReason		/* 53: unknown reason - must be last in enum */</div><div class='add'>+	xpGruCopyError,		/* 58: gru_copy_gru() returned error */</div><div class='add'>+	xpGruSendMqError,	/* 59: gru send message queue related error */</div><div class='add'>+</div><div class='add'>+	xpBadChannelNumber,	/* 60: invalid channel number */</div><div class='add'>+	xpBadMsgType,		/* 60: invalid message type */</div><div class='add'>+</div><div class='add'>+	xpUnknownReason		/* 61: unknown reason - must be last in enum */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -285,6 +243,9 @@ typedef void (*xpc_channel_func) (enum xp_retval reason, short partid,</div><div class='ctx'>  * calling xpc_received().</div><div class='ctx'>  *</div><div class='ctx'>  * All other reason codes indicate failure.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: The user defined function must be callable by an interrupt handler</div><div class='add'>+ *       and thus cannot block.</div><div class='ctx'>  */</div><div class='ctx'> typedef void (*xpc_notify_func) (enum xp_retval reason, short partid,</div><div class='ctx'> 				 int ch_number, void *key);</div><div class='hunk'>@@ -308,23 +269,22 @@ struct xpc_registration {</div><div class='ctx'> 	xpc_channel_func func;	/* function to call */</div><div class='ctx'> 	void *key;		/* pointer to user's key */</div><div class='ctx'> 	u16 nentries;		/* #of msg entries in local msg queue */</div><div class='del'>-	u16 msg_size;		/* message queue's message size */</div><div class='add'>+	u16 entry_size;		/* message queue's message entry size */</div><div class='ctx'> 	u32 assigned_limit;	/* limit on #of assigned kthreads */</div><div class='ctx'> 	u32 idle_limit;		/* limit on #of idle kthreads */</div><div class='ctx'> } ____cacheline_aligned;</div><div class='ctx'> </div><div class='ctx'> #define XPC_CHANNEL_REGISTERED(_c)	(xpc_registrations[_c].func != NULL)</div><div class='ctx'> </div><div class='del'>-/* the following are valid xpc_allocate() flags */</div><div class='add'>+/* the following are valid xpc_send() or xpc_send_notify() flags */</div><div class='ctx'> #define XPC_WAIT	0	/* wait flag */</div><div class='ctx'> #define XPC_NOWAIT	1	/* no wait flag */</div><div class='ctx'> </div><div class='ctx'> struct xpc_interface {</div><div class='ctx'> 	void (*connect) (int);</div><div class='ctx'> 	void (*disconnect) (int);</div><div class='del'>-	enum xp_retval (*allocate) (short, int, u32, void **);</div><div class='del'>-	enum xp_retval (*send) (short, int, void *);</div><div class='del'>-	enum xp_retval (*send_notify) (short, int, void *,</div><div class='add'>+	enum xp_retval (*send) (short, int, u32, void *, u16);</div><div class='add'>+	enum xp_retval (*send_notify) (short, int, u32, void *, u16,</div><div class='ctx'> 					xpc_notify_func, void *);</div><div class='ctx'> 	void (*received) (short, int, void *);</div><div class='ctx'> 	enum xp_retval (*partid_to_nasids) (short, void *);</div><div class='hunk'>@@ -334,10 +294,9 @@ extern struct xpc_interface xpc_interface;</div><div class='ctx'> </div><div class='ctx'> extern void xpc_set_interface(void (*)(int),</div><div class='ctx'> 			      void (*)(int),</div><div class='del'>-			      enum xp_retval (*)(short, int, u32, void **),</div><div class='del'>-			      enum xp_retval (*)(short, int, void *),</div><div class='del'>-			      enum xp_retval (*)(short, int, void *,</div><div class='del'>-						  xpc_notify_func, void *),</div><div class='add'>+			      enum xp_retval (*)(short, int, u32, void *, u16),</div><div class='add'>+			      enum xp_retval (*)(short, int, u32, void *, u16,</div><div class='add'>+						 xpc_notify_func, void *),</div><div class='ctx'> 			      void (*)(short, int, void *),</div><div class='ctx'> 			      enum xp_retval (*)(short, void *));</div><div class='ctx'> extern void xpc_clear_interface(void);</div><div class='hunk'>@@ -347,22 +306,19 @@ extern enum xp_retval xpc_connect(int, xpc_channel_func, void *, u16,</div><div class='ctx'> extern void xpc_disconnect(int);</div><div class='ctx'> </div><div class='ctx'> static inline enum xp_retval</div><div class='del'>-xpc_allocate(short partid, int ch_number, u32 flags, void **payload)</div><div class='del'>-{</div><div class='del'>-	return xpc_interface.allocate(partid, ch_number, flags, payload);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum xp_retval</div><div class='del'>-xpc_send(short partid, int ch_number, void *payload)</div><div class='add'>+xpc_send(short partid, int ch_number, u32 flags, void *payload,</div><div class='add'>+	 u16 payload_size)</div><div class='ctx'> {</div><div class='del'>-	return xpc_interface.send(partid, ch_number, payload);</div><div class='add'>+	return xpc_interface.send(partid, ch_number, flags, payload,</div><div class='add'>+				  payload_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline enum xp_retval</div><div class='del'>-xpc_send_notify(short partid, int ch_number, void *payload,</div><div class='del'>-		xpc_notify_func func, void *key)</div><div class='add'>+xpc_send_notify(short partid, int ch_number, u32 flags, void *payload,</div><div class='add'>+		u16 payload_size, xpc_notify_func func, void *key)</div><div class='ctx'> {</div><div class='del'>-	return xpc_interface.send_notify(partid, ch_number, payload, func, key);</div><div class='add'>+	return xpc_interface.send_notify(partid, ch_number, flags, payload,</div><div class='add'>+					 payload_size, func, key);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='hunk'>@@ -377,8 +333,23 @@ xpc_partid_to_nasids(short partid, void *nasids)</div><div class='ctx'> 	return xpc_interface.partid_to_nasids(partid, nasids);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern short xp_max_npartitions;</div><div class='add'>+extern short xp_partition_id;</div><div class='add'>+extern u8 xp_region_size;</div><div class='add'>+</div><div class='add'>+extern unsigned long (*xp_pa) (void *);</div><div class='add'>+extern enum xp_retval (*xp_remote_memcpy) (unsigned long, const unsigned long,</div><div class='add'>+		       size_t);</div><div class='add'>+extern int (*xp_cpu_to_nasid) (int);</div><div class='add'>+</div><div class='ctx'> extern u64 xp_nofault_PIOR_target;</div><div class='ctx'> extern int xp_nofault_PIOR(void *);</div><div class='ctx'> extern int xp_error_PIOR(void);</div><div class='ctx'> </div><div class='add'>+extern struct device *xp;</div><div class='add'>+extern enum xp_retval xp_init_sn2(void);</div><div class='add'>+extern enum xp_retval xp_init_uv(void);</div><div class='add'>+extern void xp_exit_sn2(void);</div><div class='add'>+extern void xp_exit_uv(void);</div><div class='add'>+</div><div class='ctx'> #endif /* _DRIVERS_MISC_SGIXP_XP_H */</div><div class='head'>diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c<br/>index 196480b691a1..66a1d19e08ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xp_main.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/misc/sgi-xp/xp_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xp_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xp_main.c</a></div><div class='hunk'>@@ -14,29 +14,48 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;asm/sn/intr.h&gt;</div><div class='del'>-#include &lt;asm/sn/sn_sal.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include "xp.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The export of xp_nofault_PIOR needs to happen here since it is defined</div><div class='del'>- * in drivers/misc/sgi-xp/xp_nofault.S. The target of the nofault read is</div><div class='del'>- * defined here.</div><div class='del'>- */</div><div class='del'>-EXPORT_SYMBOL_GPL(xp_nofault_PIOR);</div><div class='add'>+/* define the XP debug device structures to be used with dev_dbg() et al */</div><div class='add'>+</div><div class='add'>+struct device_driver xp_dbg_name = {</div><div class='add'>+	.name = "xp"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct device xp_dbg_subname = {</div><div class='add'>+	.bus_id = {0},		/* set to "" */</div><div class='add'>+	.driver = &amp;xp_dbg_name</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct device *xp = &amp;xp_dbg_subname;</div><div class='add'>+</div><div class='add'>+/* max #of partitions possible */</div><div class='add'>+short xp_max_npartitions;</div><div class='add'>+EXPORT_SYMBOL_GPL(xp_max_npartitions);</div><div class='add'>+</div><div class='add'>+short xp_partition_id;</div><div class='add'>+EXPORT_SYMBOL_GPL(xp_partition_id);</div><div class='add'>+</div><div class='add'>+u8 xp_region_size;</div><div class='add'>+EXPORT_SYMBOL_GPL(xp_region_size);</div><div class='add'>+</div><div class='add'>+unsigned long (*xp_pa) (void *addr);</div><div class='add'>+EXPORT_SYMBOL_GPL(xp_pa);</div><div class='add'>+</div><div class='add'>+enum xp_retval (*xp_remote_memcpy) (unsigned long dst_gpa,</div><div class='add'>+				    const unsigned long src_gpa, size_t len);</div><div class='add'>+EXPORT_SYMBOL_GPL(xp_remote_memcpy);</div><div class='ctx'> </div><div class='del'>-u64 xp_nofault_PIOR_target;</div><div class='del'>-EXPORT_SYMBOL_GPL(xp_nofault_PIOR_target);</div><div class='add'>+int (*xp_cpu_to_nasid) (int cpuid);</div><div class='add'>+EXPORT_SYMBOL_GPL(xp_cpu_to_nasid);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * xpc_registrations[] keeps track of xpc_connect()'s done by the kernel-level</div><div class='ctx'>  * users of XPC.</div><div class='ctx'>  */</div><div class='del'>-struct xpc_registration xpc_registrations[XPC_NCHANNELS];</div><div class='add'>+struct xpc_registration xpc_registrations[XPC_MAX_NCHANNELS];</div><div class='ctx'> EXPORT_SYMBOL_GPL(xpc_registrations);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -51,10 +70,9 @@ xpc_notloaded(void)</div><div class='ctx'> struct xpc_interface xpc_interface = {</div><div class='ctx'> 	(void (*)(int))xpc_notloaded,</div><div class='ctx'> 	(void (*)(int))xpc_notloaded,</div><div class='del'>-	(enum xp_retval(*)(short, int, u32, void **))xpc_notloaded,</div><div class='del'>-	(enum xp_retval(*)(short, int, void *))xpc_notloaded,</div><div class='del'>-	(enum xp_retval(*)(short, int, void *, xpc_notify_func, void *))</div><div class='del'>-	    xpc_notloaded,</div><div class='add'>+	(enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,</div><div class='add'>+	(enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,</div><div class='add'>+			   void *))xpc_notloaded,</div><div class='ctx'> 	(void (*)(short, int, void *))xpc_notloaded,</div><div class='ctx'> 	(enum xp_retval(*)(short, void *))xpc_notloaded</div><div class='ctx'> };</div><div class='hunk'>@@ -66,16 +84,14 @@ EXPORT_SYMBOL_GPL(xpc_interface);</div><div class='ctx'> void</div><div class='ctx'> xpc_set_interface(void (*connect) (int),</div><div class='ctx'> 		  void (*disconnect) (int),</div><div class='del'>-		  enum xp_retval (*allocate) (short, int, u32, void **),</div><div class='del'>-		  enum xp_retval (*send) (short, int, void *),</div><div class='del'>-		  enum xp_retval (*send_notify) (short, int, void *,</div><div class='add'>+		  enum xp_retval (*send) (short, int, u32, void *, u16),</div><div class='add'>+		  enum xp_retval (*send_notify) (short, int, u32, void *, u16,</div><div class='ctx'> 						  xpc_notify_func, void *),</div><div class='ctx'> 		  void (*received) (short, int, void *),</div><div class='ctx'> 		  enum xp_retval (*partid_to_nasids) (short, void *))</div><div class='ctx'> {</div><div class='ctx'> 	xpc_interface.connect = connect;</div><div class='ctx'> 	xpc_interface.disconnect = disconnect;</div><div class='del'>-	xpc_interface.allocate = allocate;</div><div class='ctx'> 	xpc_interface.send = send;</div><div class='ctx'> 	xpc_interface.send_notify = send_notify;</div><div class='ctx'> 	xpc_interface.received = received;</div><div class='hunk'>@@ -91,13 +107,11 @@ xpc_clear_interface(void)</div><div class='ctx'> {</div><div class='ctx'> 	xpc_interface.connect = (void (*)(int))xpc_notloaded;</div><div class='ctx'> 	xpc_interface.disconnect = (void (*)(int))xpc_notloaded;</div><div class='del'>-	xpc_interface.allocate = (enum xp_retval(*)(short, int, u32,</div><div class='del'>-						     void **))xpc_notloaded;</div><div class='del'>-	xpc_interface.send = (enum xp_retval(*)(short, int, void *))</div><div class='add'>+	xpc_interface.send = (enum xp_retval(*)(short, int, u32, void *, u16))</div><div class='ctx'> 	    xpc_notloaded;</div><div class='del'>-	xpc_interface.send_notify = (enum xp_retval(*)(short, int, void *,</div><div class='del'>-							xpc_notify_func,</div><div class='del'>-							void *))xpc_notloaded;</div><div class='add'>+	xpc_interface.send_notify = (enum xp_retval(*)(short, int, u32, void *,</div><div class='add'>+						       u16, xpc_notify_func,</div><div class='add'>+						       void *))xpc_notloaded;</div><div class='ctx'> 	xpc_interface.received = (void (*)(short, int, void *))</div><div class='ctx'> 	    xpc_notloaded;</div><div class='ctx'> 	xpc_interface.partid_to_nasids = (enum xp_retval(*)(short, void *))</div><div class='hunk'>@@ -135,11 +149,14 @@ xpc_connect(int ch_number, xpc_channel_func func, void *key, u16 payload_size,</div><div class='ctx'> {</div><div class='ctx'> 	struct xpc_registration *registration;</div><div class='ctx'> </div><div class='del'>-	DBUG_ON(ch_number &lt; 0 || ch_number &gt;= XPC_NCHANNELS);</div><div class='add'>+	DBUG_ON(ch_number &lt; 0 || ch_number &gt;= XPC_MAX_NCHANNELS);</div><div class='ctx'> 	DBUG_ON(payload_size == 0 || nentries == 0);</div><div class='ctx'> 	DBUG_ON(func == NULL);</div><div class='ctx'> 	DBUG_ON(assigned_limit == 0 || idle_limit &gt; assigned_limit);</div><div class='ctx'> </div><div class='add'>+	if (XPC_MSG_SIZE(payload_size) &gt; XPC_MSG_MAX_SIZE)</div><div class='add'>+		return xpPayloadTooBig;</div><div class='add'>+</div><div class='ctx'> 	registration = &amp;xpc_registrations[ch_number];</div><div class='ctx'> </div><div class='ctx'> 	if (mutex_lock_interruptible(&amp;registration-&gt;mutex) != 0)</div><div class='hunk'>@@ -152,7 +169,7 @@ xpc_connect(int ch_number, xpc_channel_func func, void *key, u16 payload_size,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* register the channel for connection */</div><div class='del'>-	registration-&gt;msg_size = XPC_MSG_SIZE(payload_size);</div><div class='add'>+	registration-&gt;entry_size = XPC_MSG_SIZE(payload_size);</div><div class='ctx'> 	registration-&gt;nentries = nentries;</div><div class='ctx'> 	registration-&gt;assigned_limit = assigned_limit;</div><div class='ctx'> 	registration-&gt;idle_limit = idle_limit;</div><div class='hunk'>@@ -185,7 +202,7 @@ xpc_disconnect(int ch_number)</div><div class='ctx'> {</div><div class='ctx'> 	struct xpc_registration *registration;</div><div class='ctx'> </div><div class='del'>-	DBUG_ON(ch_number &lt; 0 || ch_number &gt;= XPC_NCHANNELS);</div><div class='add'>+	DBUG_ON(ch_number &lt; 0 || ch_number &gt;= XPC_MAX_NCHANNELS);</div><div class='ctx'> </div><div class='ctx'> 	registration = &amp;xpc_registrations[ch_number];</div><div class='ctx'> </div><div class='hunk'>@@ -206,7 +223,7 @@ xpc_disconnect(int ch_number)</div><div class='ctx'> 	registration-&gt;func = NULL;</div><div class='ctx'> 	registration-&gt;key = NULL;</div><div class='ctx'> 	registration-&gt;nentries = 0;</div><div class='del'>-	registration-&gt;msg_size = 0;</div><div class='add'>+	registration-&gt;entry_size = 0;</div><div class='ctx'> 	registration-&gt;assigned_limit = 0;</div><div class='ctx'> 	registration-&gt;idle_limit = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -221,39 +238,21 @@ EXPORT_SYMBOL_GPL(xpc_disconnect);</div><div class='ctx'> int __init</div><div class='ctx'> xp_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret, ch_number;</div><div class='del'>-	u64 func_addr = *(u64 *)xp_nofault_PIOR;</div><div class='del'>-	u64 err_func_addr = *(u64 *)xp_error_PIOR;</div><div class='del'>-</div><div class='del'>-	if (!ia64_platform_is("sn2"))</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+	int ch_number;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Register a nofault code region which performs a cross-partition</div><div class='del'>-	 * PIO read. If the PIO read times out, the MCA handler will consume</div><div class='del'>-	 * the error and return to a kernel-provided instruction to indicate</div><div class='del'>-	 * an error. This PIO read exists because it is guaranteed to timeout</div><div class='del'>-	 * if the destination is down (AMO operations do not timeout on at</div><div class='del'>-	 * least some CPUs on Shubs &lt;= v1.2, which unfortunately we have to</div><div class='del'>-	 * work around).</div><div class='del'>-	 */</div><div class='del'>-	ret = sn_register_nofault_code(func_addr, err_func_addr, err_func_addr,</div><div class='del'>-				       1, 1);</div><div class='del'>-	if (ret != 0) {</div><div class='del'>-		printk(KERN_ERR "XP: can't register nofault code, error=%d\n",</div><div class='del'>-		       ret);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Setup the nofault PIO read target. (There is no special reason why</div><div class='del'>-	 * SH_IPI_ACCESS was selected.)</div><div class='del'>-	 */</div><div class='del'>-	if (is_shub2())</div><div class='del'>-		xp_nofault_PIOR_target = SH2_IPI_ACCESS0;</div><div class='add'>+	if (is_shub())</div><div class='add'>+		ret = xp_init_sn2();</div><div class='add'>+	else if (is_uv())</div><div class='add'>+		ret = xp_init_uv();</div><div class='ctx'> 	else</div><div class='del'>-		xp_nofault_PIOR_target = SH1_IPI_ACCESS;</div><div class='add'>+		ret = xpUnsupported;</div><div class='add'>+</div><div class='add'>+	if (ret != xpSuccess)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* initialize the connection registration mutex */</div><div class='del'>-	for (ch_number = 0; ch_number &lt; XPC_NCHANNELS; ch_number++)</div><div class='add'>+	for (ch_number = 0; ch_number &lt; XPC_MAX_NCHANNELS; ch_number++)</div><div class='ctx'> 		mutex_init(&amp;xpc_registrations[ch_number].mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -264,12 +263,10 @@ module_init(xp_init);</div><div class='ctx'> void __exit</div><div class='ctx'> xp_exit(void)</div><div class='ctx'> {</div><div class='del'>-	u64 func_addr = *(u64 *)xp_nofault_PIOR;</div><div class='del'>-	u64 err_func_addr = *(u64 *)xp_error_PIOR;</div><div class='del'>-</div><div class='del'>-	/* unregister the PIO read nofault code region */</div><div class='del'>-	(void)sn_register_nofault_code(func_addr, err_func_addr,</div><div class='del'>-				       err_func_addr, 1, 0);</div><div class='add'>+	if (is_shub())</div><div class='add'>+		xp_exit_sn2();</div><div class='add'>+	else if (is_uv())</div><div class='add'>+		xp_exit_uv();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_exit(xp_exit);</div><div class='head'>diff --git a/drivers/misc/sgi-xp/xp_sn2.c b/drivers/misc/sgi-xp/xp_sn2.c<br/>new file mode 100644<br/>index 000000000000..1440134caf31<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xp_sn2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xp_sn2.c</a></div><div class='hunk'>@@ -0,0 +1,146 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Cross Partition (XP) sn2-based functions.</div><div class='add'>+ *</div><div class='add'>+ *      Architecture specific implementation of common functions.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;asm/sn/bte.h&gt;</div><div class='add'>+#include &lt;asm/sn/sn_sal.h&gt;</div><div class='add'>+#include "xp.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The export of xp_nofault_PIOR needs to happen here since it is defined</div><div class='add'>+ * in drivers/misc/sgi-xp/xp_nofault.S. The target of the nofault read is</div><div class='add'>+ * defined here.</div><div class='add'>+ */</div><div class='add'>+EXPORT_SYMBOL_GPL(xp_nofault_PIOR);</div><div class='add'>+</div><div class='add'>+u64 xp_nofault_PIOR_target;</div><div class='add'>+EXPORT_SYMBOL_GPL(xp_nofault_PIOR_target);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Register a nofault code region which performs a cross-partition PIO read.</div><div class='add'>+ * If the PIO read times out, the MCA handler will consume the error and</div><div class='add'>+ * return to a kernel-provided instruction to indicate an error. This PIO read</div><div class='add'>+ * exists because it is guaranteed to timeout if the destination is down</div><div class='add'>+ * (amo operations do not timeout on at least some CPUs on Shubs &lt;= v1.2,</div><div class='add'>+ * which unfortunately we have to work around).</div><div class='add'>+ */</div><div class='add'>+static enum xp_retval</div><div class='add'>+xp_register_nofault_code_sn2(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u64 func_addr;</div><div class='add'>+	u64 err_func_addr;</div><div class='add'>+</div><div class='add'>+	func_addr = *(u64 *)xp_nofault_PIOR;</div><div class='add'>+	err_func_addr = *(u64 *)xp_error_PIOR;</div><div class='add'>+	ret = sn_register_nofault_code(func_addr, err_func_addr, err_func_addr,</div><div class='add'>+				       1, 1);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(xp, "can't register nofault code, error=%d\n", ret);</div><div class='add'>+		return xpSalError;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Setup the nofault PIO read target. (There is no special reason why</div><div class='add'>+	 * SH_IPI_ACCESS was selected.)</div><div class='add'>+	 */</div><div class='add'>+	if (is_shub1())</div><div class='add'>+		xp_nofault_PIOR_target = SH1_IPI_ACCESS;</div><div class='add'>+	else if (is_shub2())</div><div class='add'>+		xp_nofault_PIOR_target = SH2_IPI_ACCESS0;</div><div class='add'>+</div><div class='add'>+	return xpSuccess;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xp_unregister_nofault_code_sn2(void)</div><div class='add'>+{</div><div class='add'>+	u64 func_addr = *(u64 *)xp_nofault_PIOR;</div><div class='add'>+	u64 err_func_addr = *(u64 *)xp_error_PIOR;</div><div class='add'>+</div><div class='add'>+	/* unregister the PIO read nofault code region */</div><div class='add'>+	(void)sn_register_nofault_code(func_addr, err_func_addr,</div><div class='add'>+				       err_func_addr, 1, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert a virtual memory address to a physical memory address.</div><div class='add'>+ */</div><div class='add'>+static unsigned long</div><div class='add'>+xp_pa_sn2(void *addr)</div><div class='add'>+{</div><div class='add'>+	return __pa(addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wrapper for bte_copy().</div><div class='add'>+ *</div><div class='add'>+ *	dst_pa - physical address of the destination of the transfer.</div><div class='add'>+ *	src_pa - physical address of the source of the transfer.</div><div class='add'>+ *	len - number of bytes to transfer from source to destination.</div><div class='add'>+ *</div><div class='add'>+ * Note: xp_remote_memcpy_sn2() should never be called while holding a spinlock.</div><div class='add'>+ */</div><div class='add'>+static enum xp_retval</div><div class='add'>+xp_remote_memcpy_sn2(unsigned long dst_pa, const unsigned long src_pa,</div><div class='add'>+		     size_t len)</div><div class='add'>+{</div><div class='add'>+	bte_result_t ret;</div><div class='add'>+</div><div class='add'>+	ret = bte_copy(src_pa, dst_pa, len, (BTE_NOTIFY | BTE_WACQUIRE), NULL);</div><div class='add'>+	if (ret == BTE_SUCCESS)</div><div class='add'>+		return xpSuccess;</div><div class='add'>+</div><div class='add'>+	if (is_shub2()) {</div><div class='add'>+		dev_err(xp, "bte_copy() on shub2 failed, error=0x%x dst_pa="</div><div class='add'>+			"0x%016lx src_pa=0x%016lx len=%ld\\n", ret, dst_pa,</div><div class='add'>+			src_pa, len);</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(xp, "bte_copy() failed, error=%d dst_pa=0x%016lx "</div><div class='add'>+			"src_pa=0x%016lx len=%ld\\n", ret, dst_pa, src_pa, len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return xpBteCopyError;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+xp_cpu_to_nasid_sn2(int cpuid)</div><div class='add'>+{</div><div class='add'>+	return cpuid_to_nasid(cpuid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum xp_retval</div><div class='add'>+xp_init_sn2(void)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(!is_shub());</div><div class='add'>+</div><div class='add'>+	xp_max_npartitions = XP_MAX_NPARTITIONS_SN2;</div><div class='add'>+	xp_partition_id = sn_partition_id;</div><div class='add'>+	xp_region_size = sn_region_size;</div><div class='add'>+</div><div class='add'>+	xp_pa = xp_pa_sn2;</div><div class='add'>+	xp_remote_memcpy = xp_remote_memcpy_sn2;</div><div class='add'>+	xp_cpu_to_nasid = xp_cpu_to_nasid_sn2;</div><div class='add'>+</div><div class='add'>+	return xp_register_nofault_code_sn2();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+xp_exit_sn2(void)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(!is_shub());</div><div class='add'>+</div><div class='add'>+	xp_unregister_nofault_code_sn2();</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/misc/sgi-xp/xp_uv.c b/drivers/misc/sgi-xp/xp_uv.c<br/>new file mode 100644<br/>index 000000000000..d9f7ce2510bc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xp_uv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xp_uv.c</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Cross Partition (XP) uv-based functions.</div><div class='add'>+ *</div><div class='add'>+ *      Architecture specific implementation of common functions.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;asm/uv/uv_hub.h&gt;</div><div class='add'>+#include "../sgi-gru/grukservices.h"</div><div class='add'>+#include "xp.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert a virtual memory address to a physical memory address.</div><div class='add'>+ */</div><div class='add'>+static unsigned long</div><div class='add'>+xp_pa_uv(void *addr)</div><div class='add'>+{</div><div class='add'>+	return uv_gpa(addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum xp_retval</div><div class='add'>+xp_remote_memcpy_uv(unsigned long dst_gpa, const unsigned long src_gpa,</div><div class='add'>+		    size_t len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = gru_copy_gpa(dst_gpa, src_gpa, len);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		return xpSuccess;</div><div class='add'>+</div><div class='add'>+	dev_err(xp, "gru_copy_gpa() failed, dst_gpa=0x%016lx src_gpa=0x%016lx "</div><div class='add'>+		"len=%ld\n", dst_gpa, src_gpa, len);</div><div class='add'>+	return xpGruCopyError;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+xp_cpu_to_nasid_uv(int cpuid)</div><div class='add'>+{</div><div class='add'>+	/* ??? Is this same as sn2 nasid in mach/part bitmaps set up by SAL? */</div><div class='add'>+	return UV_PNODE_TO_NASID(uv_cpu_to_pnode(cpuid));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum xp_retval</div><div class='add'>+xp_init_uv(void)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(!is_uv());</div><div class='add'>+</div><div class='add'>+	xp_max_npartitions = XP_MAX_NPARTITIONS_UV;</div><div class='add'>+	xp_partition_id = 0;	/* !!! not correct value */</div><div class='add'>+	xp_region_size = 0;	/* !!! not correct value */</div><div class='add'>+</div><div class='add'>+	xp_pa = xp_pa_uv;</div><div class='add'>+	xp_remote_memcpy = xp_remote_memcpy_uv;</div><div class='add'>+	xp_cpu_to_nasid = xp_cpu_to_nasid_uv;</div><div class='add'>+</div><div class='add'>+	return xpSuccess;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+xp_exit_uv(void)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(!is_uv());</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h<br/>index 11ac267ed68f..619208d61862 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xpc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/misc/sgi-xp/xpc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xpc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xpc.h</a></div><div class='hunk'>@@ -13,18 +13,10 @@</div><div class='ctx'> #ifndef _DRIVERS_MISC_SGIXP_XPC_H</div><div class='ctx'> #define _DRIVERS_MISC_SGIXP_XPC_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/sysctl.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/sn/bte.h&gt;</div><div class='del'>-#include &lt;asm/sn/clksupport.h&gt;</div><div class='del'>-#include &lt;asm/sn/addrs.h&gt;</div><div class='del'>-#include &lt;asm/sn/mspec.h&gt;</div><div class='del'>-#include &lt;asm/sn/shub_mmr.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include "xp.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -36,23 +28,7 @@</div><div class='ctx'> #define XPC_VERSION_MAJOR(_v)		((_v) &gt;&gt; 4)</div><div class='ctx'> #define XPC_VERSION_MINOR(_v)		((_v) &amp; 0xf)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The next macros define word or bit representations for given</div><div class='del'>- * C-brick nasid in either the SAL provided bit array representing</div><div class='del'>- * nasids in the partition/machine or the AMO_t array used for</div><div class='del'>- * inter-partition initiation communications.</div><div class='del'>- *</div><div class='del'>- * For SN2 machines, C-Bricks are alway even numbered NASIDs.  As</div><div class='del'>- * such, some space will be saved by insisting that nasid information</div><div class='del'>- * passed from SAL always be packed for C-Bricks and the</div><div class='del'>- * cross-partition interrupts use the same packing scheme.</div><div class='del'>- */</div><div class='del'>-#define XPC_NASID_W_INDEX(_n)	(((_n) / 64) / 2)</div><div class='del'>-#define XPC_NASID_B_INDEX(_n)	(((_n) / 2) &amp; (64 - 1))</div><div class='del'>-#define XPC_NASID_IN_ARRAY(_n, _p) ((_p)[XPC_NASID_W_INDEX(_n)] &amp; \</div><div class='del'>-				    (1UL &lt;&lt; XPC_NASID_B_INDEX(_n)))</div><div class='del'>-#define XPC_NASID_FROM_W_B(_w, _b) (((_w) * 64 + (_b)) * 2)</div><div class='del'>-</div><div class='add'>+/* define frequency of the heartbeat and frequency how often it's checked */</div><div class='ctx'> #define XPC_HB_DEFAULT_INTERVAL		5	/* incr HB every x secs */</div><div class='ctx'> #define XPC_HB_CHECK_DEFAULT_INTERVAL	20	/* check HB every x secs */</div><div class='ctx'> </div><div class='hunk'>@@ -72,11 +48,11 @@</div><div class='ctx'>  *</div><div class='ctx'>  *   reserved page header</div><div class='ctx'>  *</div><div class='del'>- *     The first cacheline of the reserved page contains the header</div><div class='del'>- *     (struct xpc_rsvd_page). Before SAL initialization has completed,</div><div class='add'>+ *     The first two 64-byte cachelines of the reserved page contain the</div><div class='add'>+ *     header (struct xpc_rsvd_page). Before SAL initialization has completed,</div><div class='ctx'>  *     SAL has set up the following fields of the reserved page header:</div><div class='del'>- *     SAL_signature, SAL_version, partid, and nasids_size. The other</div><div class='del'>- *     fields are set up by XPC. (xpc_rsvd_page points to the local</div><div class='add'>+ *     SAL_signature, SAL_version, SAL_partid, and SAL_nasids_size. The</div><div class='add'>+ *     other fields are set up by XPC. (xpc_rsvd_page points to the local</div><div class='ctx'>  *     partition's reserved page.)</div><div class='ctx'>  *</div><div class='ctx'>  *   part_nasids mask</div><div class='hunk'>@@ -87,14 +63,16 @@</div><div class='ctx'>  *     the actual nasids in the entire machine (mach_nasids). We're only</div><div class='ctx'>  *     interested in the even numbered nasids (which contain the processors</div><div class='ctx'>  *     and/or memory), so we only need half as many bits to represent the</div><div class='del'>- *     nasids. The part_nasids mask is located starting at the first cacheline</div><div class='del'>- *     following the reserved page header. The mach_nasids mask follows right</div><div class='del'>- *     after the part_nasids mask. The size in bytes of each mask is reflected</div><div class='del'>- *     by the reserved page header field 'nasids_size'. (Local partition's</div><div class='del'>- *     mask pointers are xpc_part_nasids and xpc_mach_nasids.)</div><div class='add'>+ *     nasids. When mapping nasid to bit in a mask (or bit to nasid) be sure</div><div class='add'>+ *     to either divide or multiply by 2. The part_nasids mask is located</div><div class='add'>+ *     starting at the first cacheline following the reserved page header. The</div><div class='add'>+ *     mach_nasids mask follows right after the part_nasids mask. The size in</div><div class='add'>+ *     bytes of each mask is reflected by the reserved page header field</div><div class='add'>+ *     'SAL_nasids_size'. (Local partition's mask pointers are xpc_part_nasids</div><div class='add'>+ *     and xpc_mach_nasids.)</div><div class='ctx'>  *</div><div class='del'>- *   vars</div><div class='del'>- *   vars part</div><div class='add'>+ *   vars	(ia64-sn2 only)</div><div class='add'>+ *   vars part	(ia64-sn2 only)</div><div class='ctx'>  *</div><div class='ctx'>  *     Immediately following the mach_nasids mask are the XPC variables</div><div class='ctx'>  *     required by other partitions. First are those that are generic to all</div><div class='hunk'>@@ -102,43 +80,26 @@</div><div class='ctx'>  *     which are partition specific (vars part). These are setup by XPC.</div><div class='ctx'>  *     (Local partition's vars pointers are xpc_vars and xpc_vars_part.)</div><div class='ctx'>  *</div><div class='del'>- * Note: Until vars_pa is set, the partition XPC code has not been initialized.</div><div class='add'>+ * Note: Until 'ts_jiffies' is set non-zero, the partition XPC code has not been</div><div class='add'>+ *       initialized.</div><div class='ctx'>  */</div><div class='ctx'> struct xpc_rsvd_page {</div><div class='ctx'> 	u64 SAL_signature;	/* SAL: unique signature */</div><div class='ctx'> 	u64 SAL_version;	/* SAL: version */</div><div class='del'>-	u8 partid;		/* SAL: partition ID */</div><div class='add'>+	short SAL_partid;	/* SAL: partition ID */</div><div class='add'>+	short max_npartitions;	/* value of XPC_MAX_PARTITIONS */</div><div class='ctx'> 	u8 version;</div><div class='del'>-	u8 pad1[6];		/* align to next u64 in cacheline */</div><div class='del'>-	u64 vars_pa;		/* physical address of struct xpc_vars */</div><div class='del'>-	struct timespec stamp;	/* time when reserved page was setup by XPC */</div><div class='del'>-	u64 pad2[9];		/* align to last u64 in cacheline */</div><div class='del'>-	u64 nasids_size;	/* SAL: size of each nasid mask in bytes */</div><div class='add'>+	u8 pad1[3];		/* align to next u64 in 1st 64-byte cacheline */</div><div class='add'>+	union {</div><div class='add'>+		unsigned long vars_pa;	/* phys address of struct xpc_vars */</div><div class='add'>+		unsigned long activate_mq_gpa; /* gru phy addr of activate_mq */</div><div class='add'>+	} sn;</div><div class='add'>+	unsigned long ts_jiffies; /* timestamp when rsvd pg was setup by XPC */</div><div class='add'>+	u64 pad2[10];		/* align to last u64 in 2nd 64-byte cacheline */</div><div class='add'>+	u64 SAL_nasids_size;	/* SAL: size of each nasid mask in bytes */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define XPC_RP_VERSION _XPC_VERSION(1, 1) /* version 1.1 of the reserved page */</div><div class='del'>-</div><div class='del'>-#define XPC_SUPPORTS_RP_STAMP(_version) \</div><div class='del'>-			(_version &gt;= _XPC_VERSION(1, 1))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * compare stamps - the return value is:</div><div class='del'>- *</div><div class='del'>- *	&lt; 0,	if stamp1 &lt; stamp2</div><div class='del'>- *	= 0,	if stamp1 == stamp2</div><div class='del'>- *	&gt; 0,	if stamp1 &gt; stamp2</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-xpc_compare_stamps(struct timespec *stamp1, struct timespec *stamp2)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = stamp1-&gt;tv_sec - stamp2-&gt;tv_sec;</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		ret = stamp1-&gt;tv_nsec - stamp2-&gt;tv_nsec;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+#define XPC_RP_VERSION _XPC_VERSION(2, 0) /* version 2.0 of the reserved page */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Define the structures by which XPC variables can be exported to other</div><div class='hunk'>@@ -154,85 +115,40 @@ xpc_compare_stamps(struct timespec *stamp1, struct timespec *stamp2)</div><div class='ctx'>  * reflected by incrementing either the major or minor version numbers</div><div class='ctx'>  * of struct xpc_vars.</div><div class='ctx'>  */</div><div class='del'>-struct xpc_vars {</div><div class='add'>+struct xpc_vars_sn2 {</div><div class='ctx'> 	u8 version;</div><div class='ctx'> 	u64 heartbeat;</div><div class='del'>-	u64 heartbeating_to_mask;</div><div class='add'>+	DECLARE_BITMAP(heartbeating_to_mask, XP_MAX_NPARTITIONS_SN2);</div><div class='ctx'> 	u64 heartbeat_offline;	/* if 0, heartbeat should be changing */</div><div class='del'>-	int act_nasid;</div><div class='del'>-	int act_phys_cpuid;</div><div class='del'>-	u64 vars_part_pa;</div><div class='del'>-	u64 amos_page_pa;	/* paddr of page of AMOs from MSPEC driver */</div><div class='del'>-	AMO_t *amos_page;	/* vaddr of page of AMOs from MSPEC driver */</div><div class='add'>+	int activate_IRQ_nasid;</div><div class='add'>+	int activate_IRQ_phys_cpuid;</div><div class='add'>+	unsigned long vars_part_pa;</div><div class='add'>+	unsigned long amos_page_pa;/* paddr of page of amos from MSPEC driver */</div><div class='add'>+	struct amo *amos_page;	/* vaddr of page of amos from MSPEC driver */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define XPC_V_VERSION _XPC_VERSION(3, 1)    /* version 3.1 of the cross vars */</div><div class='ctx'> </div><div class='del'>-#define XPC_SUPPORTS_DISENGAGE_REQUEST(_version) \</div><div class='del'>-			(_version &gt;= _XPC_VERSION(3, 1))</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-xpc_hb_allowed(short partid, struct xpc_vars *vars)</div><div class='del'>-{</div><div class='del'>-	return ((vars-&gt;heartbeating_to_mask &amp; (1UL &lt;&lt; partid)) != 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_allow_hb(short partid, struct xpc_vars *vars)</div><div class='del'>-{</div><div class='del'>-	u64 old_mask, new_mask;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		old_mask = vars-&gt;heartbeating_to_mask;</div><div class='del'>-		new_mask = (old_mask | (1UL &lt;&lt; partid));</div><div class='del'>-	} while (cmpxchg(&amp;vars-&gt;heartbeating_to_mask, old_mask, new_mask) !=</div><div class='del'>-		 old_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_disallow_hb(short partid, struct xpc_vars *vars)</div><div class='del'>-{</div><div class='del'>-	u64 old_mask, new_mask;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		old_mask = vars-&gt;heartbeating_to_mask;</div><div class='del'>-		new_mask = (old_mask &amp; ~(1UL &lt;&lt; partid));</div><div class='del'>-	} while (cmpxchg(&amp;vars-&gt;heartbeating_to_mask, old_mask, new_mask) !=</div><div class='del'>-		 old_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The AMOs page consists of a number of AMO variables which are divided into</div><div class='del'>- * four groups, The first two groups are used to identify an IRQ's sender.</div><div class='del'>- * These two groups consist of 64 and 128 AMO variables respectively. The last</div><div class='del'>- * two groups, consisting of just one AMO variable each, are used to identify</div><div class='del'>- * the remote partitions that are currently engaged (from the viewpoint of</div><div class='del'>- * the XPC running on the remote partition).</div><div class='del'>- */</div><div class='del'>-#define XPC_NOTIFY_IRQ_AMOS	   0</div><div class='del'>-#define XPC_ACTIVATE_IRQ_AMOS	   (XPC_NOTIFY_IRQ_AMOS + XP_MAX_PARTITIONS)</div><div class='del'>-#define XPC_ENGAGED_PARTITIONS_AMO (XPC_ACTIVATE_IRQ_AMOS + XP_NASID_MASK_WORDS)</div><div class='del'>-#define XPC_DISENGAGE_REQUEST_AMO  (XPC_ENGAGED_PARTITIONS_AMO + 1)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The following structure describes the per partition specific variables.</div><div class='ctx'>  *</div><div class='ctx'>  * An array of these structures, one per partition, will be defined. As a</div><div class='ctx'>  * partition becomes active XPC will copy the array entry corresponding to</div><div class='del'>- * itself from that partition. It is desirable that the size of this</div><div class='del'>- * structure evenly divide into a cacheline, such that none of the entries</div><div class='del'>- * in this array crosses a cacheline boundary. As it is now, each entry</div><div class='del'>- * occupies half a cacheline.</div><div class='add'>+ * itself from that partition. It is desirable that the size of this structure</div><div class='add'>+ * evenly divides into a 128-byte cacheline, such that none of the entries in</div><div class='add'>+ * this array crosses a 128-byte cacheline boundary. As it is now, each entry</div><div class='add'>+ * occupies 64-bytes.</div><div class='ctx'>  */</div><div class='del'>-struct xpc_vars_part {</div><div class='add'>+struct xpc_vars_part_sn2 {</div><div class='ctx'> 	u64 magic;</div><div class='ctx'> </div><div class='del'>-	u64 openclose_args_pa;	/* physical address of open and close args */</div><div class='del'>-	u64 GPs_pa;		/* physical address of Get/Put values */</div><div class='add'>+	unsigned long openclose_args_pa; /* phys addr of open and close args */</div><div class='add'>+	unsigned long GPs_pa;	/* physical address of Get/Put values */</div><div class='add'>+</div><div class='add'>+	unsigned long chctl_amo_pa; /* physical address of chctl flags' amo */</div><div class='ctx'> </div><div class='del'>-	u64 IPI_amo_pa;		/* physical address of IPI AMO_t structure */</div><div class='del'>-	int IPI_nasid;		/* nasid of where to send IPIs */</div><div class='del'>-	int IPI_phys_cpuid;	/* physical CPU ID of where to send IPIs */</div><div class='add'>+	int notify_IRQ_nasid;	/* nasid of where to send notify IRQs */</div><div class='add'>+	int notify_IRQ_phys_cpuid;	/* CPUID of where to send notify IRQs */</div><div class='ctx'> </div><div class='ctx'> 	u8 nchannels;		/* #of defined channels supported */</div><div class='ctx'> </div><div class='hunk'>@@ -248,20 +164,95 @@ struct xpc_vars_part {</div><div class='ctx'>  * MAGIC2 indicates that this partition has pulled the remote partititions</div><div class='ctx'>  * per partition variables that pertain to this partition.</div><div class='ctx'>  */</div><div class='del'>-#define XPC_VP_MAGIC1	0x0053524156435058L   /* 'XPCVARS\0'L (little endian) */</div><div class='del'>-#define XPC_VP_MAGIC2	0x0073726176435058L   /* 'XPCvars\0'L (little endian) */</div><div class='add'>+#define XPC_VP_MAGIC1_SN2 0x0053524156435058L /* 'XPCVARS\0'L (little endian) */</div><div class='add'>+#define XPC_VP_MAGIC2_SN2 0x0073726176435058L /* 'XPCvars\0'L (little endian) */</div><div class='ctx'> </div><div class='ctx'> /* the reserved page sizes and offsets */</div><div class='ctx'> </div><div class='ctx'> #define XPC_RP_HEADER_SIZE	L1_CACHE_ALIGN(sizeof(struct xpc_rsvd_page))</div><div class='del'>-#define XPC_RP_VARS_SIZE	L1_CACHE_ALIGN(sizeof(struct xpc_vars))</div><div class='add'>+#define XPC_RP_VARS_SIZE	L1_CACHE_ALIGN(sizeof(struct xpc_vars_sn2))</div><div class='ctx'> </div><div class='del'>-#define XPC_RP_PART_NASIDS(_rp) ((u64 *)((u8 *)(_rp) + XPC_RP_HEADER_SIZE))</div><div class='del'>-#define XPC_RP_MACH_NASIDS(_rp) (XPC_RP_PART_NASIDS(_rp) + xp_nasid_mask_words)</div><div class='del'>-#define XPC_RP_VARS(_rp)	((struct xpc_vars *)(XPC_RP_MACH_NASIDS(_rp) + \</div><div class='del'>-				    xp_nasid_mask_words))</div><div class='del'>-#define XPC_RP_VARS_PART(_rp)	((struct xpc_vars_part *) \</div><div class='del'>-				    ((u8 *)XPC_RP_VARS(_rp) + XPC_RP_VARS_SIZE))</div><div class='add'>+#define XPC_RP_PART_NASIDS(_rp) ((unsigned long *)((u8 *)(_rp) + \</div><div class='add'>+				 XPC_RP_HEADER_SIZE))</div><div class='add'>+#define XPC_RP_MACH_NASIDS(_rp) (XPC_RP_PART_NASIDS(_rp) + \</div><div class='add'>+				 xpc_nasid_mask_nlongs)</div><div class='add'>+#define XPC_RP_VARS(_rp)	((struct xpc_vars_sn2 *) \</div><div class='add'>+				 (XPC_RP_MACH_NASIDS(_rp) + \</div><div class='add'>+				  xpc_nasid_mask_nlongs))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The activate_mq is used to send/receive GRU messages that affect XPC's</div><div class='add'>+ * heartbeat, partition active state, and channel state. This is UV only.</div><div class='add'>+ */</div><div class='add'>+struct xpc_activate_mq_msghdr_uv {</div><div class='add'>+	short partid;		/* sender's partid */</div><div class='add'>+	u8 act_state;		/* sender's act_state at time msg sent */</div><div class='add'>+	u8 type;		/* message's type */</div><div class='add'>+	unsigned long rp_ts_jiffies; /* timestamp of sender's rp setup by XPC */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* activate_mq defined message types */</div><div class='add'>+#define XPC_ACTIVATE_MQ_MSG_SYNC_ACT_STATE_UV		0</div><div class='add'>+#define XPC_ACTIVATE_MQ_MSG_INC_HEARTBEAT_UV		1</div><div class='add'>+#define XPC_ACTIVATE_MQ_MSG_OFFLINE_HEARTBEAT_UV	2</div><div class='add'>+#define XPC_ACTIVATE_MQ_MSG_ONLINE_HEARTBEAT_UV		3</div><div class='add'>+</div><div class='add'>+#define XPC_ACTIVATE_MQ_MSG_ACTIVATE_REQ_UV		4</div><div class='add'>+#define XPC_ACTIVATE_MQ_MSG_DEACTIVATE_REQ_UV		5</div><div class='add'>+</div><div class='add'>+#define XPC_ACTIVATE_MQ_MSG_CHCTL_CLOSEREQUEST_UV	6</div><div class='add'>+#define XPC_ACTIVATE_MQ_MSG_CHCTL_CLOSEREPLY_UV		7</div><div class='add'>+#define XPC_ACTIVATE_MQ_MSG_CHCTL_OPENREQUEST_UV	8</div><div class='add'>+#define XPC_ACTIVATE_MQ_MSG_CHCTL_OPENREPLY_UV		9</div><div class='add'>+</div><div class='add'>+#define XPC_ACTIVATE_MQ_MSG_MARK_ENGAGED_UV		10</div><div class='add'>+#define XPC_ACTIVATE_MQ_MSG_MARK_DISENGAGED_UV		11</div><div class='add'>+</div><div class='add'>+struct xpc_activate_mq_msg_uv {</div><div class='add'>+	struct xpc_activate_mq_msghdr_uv hdr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xpc_activate_mq_msg_heartbeat_req_uv {</div><div class='add'>+	struct xpc_activate_mq_msghdr_uv hdr;</div><div class='add'>+	u64 heartbeat;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xpc_activate_mq_msg_activate_req_uv {</div><div class='add'>+	struct xpc_activate_mq_msghdr_uv hdr;</div><div class='add'>+	unsigned long rp_gpa;</div><div class='add'>+	unsigned long activate_mq_gpa;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xpc_activate_mq_msg_deactivate_req_uv {</div><div class='add'>+	struct xpc_activate_mq_msghdr_uv hdr;</div><div class='add'>+	enum xp_retval reason;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xpc_activate_mq_msg_chctl_closerequest_uv {</div><div class='add'>+	struct xpc_activate_mq_msghdr_uv hdr;</div><div class='add'>+	short ch_number;</div><div class='add'>+	enum xp_retval reason;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xpc_activate_mq_msg_chctl_closereply_uv {</div><div class='add'>+	struct xpc_activate_mq_msghdr_uv hdr;</div><div class='add'>+	short ch_number;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xpc_activate_mq_msg_chctl_openrequest_uv {</div><div class='add'>+	struct xpc_activate_mq_msghdr_uv hdr;</div><div class='add'>+	short ch_number;</div><div class='add'>+	short entry_size;	/* size of notify_mq's GRU messages */</div><div class='add'>+	short local_nentries;	/* ??? Is this needed? What is? */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xpc_activate_mq_msg_chctl_openreply_uv {</div><div class='add'>+	struct xpc_activate_mq_msghdr_uv hdr;</div><div class='add'>+	short ch_number;</div><div class='add'>+	short remote_nentries;	/* ??? Is this needed? What is? */</div><div class='add'>+	short local_nentries;	/* ??? Is this needed? What is? */</div><div class='add'>+	unsigned long local_notify_mq_gpa;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Functions registered by add_timer() or called by kernel_thread() only</div><div class='hunk'>@@ -270,22 +261,22 @@ struct xpc_vars_part {</div><div class='ctx'>  * the passed argument.</div><div class='ctx'>  */</div><div class='ctx'> #define XPC_PACK_ARGS(_arg1, _arg2) \</div><div class='del'>-			((((u64) _arg1) &amp; 0xffffffff) | \</div><div class='del'>-			((((u64) _arg2) &amp; 0xffffffff) &lt;&lt; 32))</div><div class='add'>+			((((u64)_arg1) &amp; 0xffffffff) | \</div><div class='add'>+			((((u64)_arg2) &amp; 0xffffffff) &lt;&lt; 32))</div><div class='ctx'> </div><div class='del'>-#define XPC_UNPACK_ARG1(_args)	(((u64) _args) &amp; 0xffffffff)</div><div class='del'>-#define XPC_UNPACK_ARG2(_args)	((((u64) _args) &gt;&gt; 32) &amp; 0xffffffff)</div><div class='add'>+#define XPC_UNPACK_ARG1(_args)	(((u64)_args) &amp; 0xffffffff)</div><div class='add'>+#define XPC_UNPACK_ARG2(_args)	((((u64)_args) &gt;&gt; 32) &amp; 0xffffffff)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Define a Get/Put value pair (pointers) used with a message queue.</div><div class='ctx'>  */</div><div class='del'>-struct xpc_gp {</div><div class='add'>+struct xpc_gp_sn2 {</div><div class='ctx'> 	s64 get;		/* Get value */</div><div class='ctx'> 	s64 put;		/* Put value */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define XPC_GP_SIZE \</div><div class='del'>-		L1_CACHE_ALIGN(sizeof(struct xpc_gp) * XPC_NCHANNELS)</div><div class='add'>+		L1_CACHE_ALIGN(sizeof(struct xpc_gp_sn2) * XPC_MAX_NCHANNELS)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Define a structure that contains arguments associated with opening and</div><div class='hunk'>@@ -293,31 +284,89 @@ struct xpc_gp {</div><div class='ctx'>  */</div><div class='ctx'> struct xpc_openclose_args {</div><div class='ctx'> 	u16 reason;		/* reason why channel is closing */</div><div class='del'>-	u16 msg_size;		/* sizeof each message entry */</div><div class='add'>+	u16 entry_size;		/* sizeof each message entry */</div><div class='ctx'> 	u16 remote_nentries;	/* #of message entries in remote msg queue */</div><div class='ctx'> 	u16 local_nentries;	/* #of message entries in local msg queue */</div><div class='del'>-	u64 local_msgqueue_pa;	/* physical address of local message queue */</div><div class='add'>+	unsigned long local_msgqueue_pa; /* phys addr of local message queue */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define XPC_OPENCLOSE_ARGS_SIZE \</div><div class='del'>-	      L1_CACHE_ALIGN(sizeof(struct xpc_openclose_args) * XPC_NCHANNELS)</div><div class='add'>+	      L1_CACHE_ALIGN(sizeof(struct xpc_openclose_args) * \</div><div class='add'>+	      XPC_MAX_NCHANNELS)</div><div class='ctx'> </div><div class='del'>-/* struct xpc_msg flags */</div><div class='ctx'> </div><div class='del'>-#define	XPC_M_DONE		0x01	/* msg has been received/consumed */</div><div class='del'>-#define	XPC_M_READY		0x02	/* msg is ready to be sent */</div><div class='del'>-#define	XPC_M_INTERRUPT		0x04	/* send interrupt when msg consumed */</div><div class='add'>+/*</div><div class='add'>+ * Structures to define a fifo singly-linked list.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='del'>-#define XPC_MSG_ADDRESS(_payload) \</div><div class='del'>-		((struct xpc_msg *)((u8 *)(_payload) - XPC_MSG_PAYLOAD_OFFSET))</div><div class='add'>+struct xpc_fifo_entry_uv {</div><div class='add'>+	struct xpc_fifo_entry_uv *next;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xpc_fifo_head_uv {</div><div class='add'>+	struct xpc_fifo_entry_uv *first;</div><div class='add'>+	struct xpc_fifo_entry_uv *last;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	int n_entries;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Defines notify entry.</div><div class='add'>+ * Define a sn2 styled message.</div><div class='add'>+ *</div><div class='add'>+ * A user-defined message resides in the payload area. The max size of the</div><div class='add'>+ * payload is defined by the user via xpc_connect().</div><div class='add'>+ *</div><div class='add'>+ * The size of a message entry (within a message queue) must be a 128-byte</div><div class='add'>+ * cacheline sized multiple in order to facilitate the BTE transfer of messages</div><div class='add'>+ * from one message queue to another.</div><div class='add'>+ */</div><div class='add'>+struct xpc_msg_sn2 {</div><div class='add'>+	u8 flags;		/* FOR XPC INTERNAL USE ONLY */</div><div class='add'>+	u8 reserved[7];		/* FOR XPC INTERNAL USE ONLY */</div><div class='add'>+	s64 number;		/* FOR XPC INTERNAL USE ONLY */</div><div class='add'>+</div><div class='add'>+	u64 payload;		/* user defined portion of message */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* struct xpc_msg_sn2 flags */</div><div class='add'>+</div><div class='add'>+#define	XPC_M_SN2_DONE		0x01	/* msg has been received/consumed */</div><div class='add'>+#define	XPC_M_SN2_READY		0x02	/* msg is ready to be sent */</div><div class='add'>+#define	XPC_M_SN2_INTERRUPT	0x04	/* send interrupt when msg consumed */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The format of a uv XPC notify_mq GRU message is as follows:</div><div class='add'>+ *</div><div class='add'>+ * A user-defined message resides in the payload area. The max size of the</div><div class='add'>+ * payload is defined by the user via xpc_connect().</div><div class='add'>+ *</div><div class='add'>+ * The size of a message (payload and header) sent via the GRU must be either 1</div><div class='add'>+ * or 2 GRU_CACHE_LINE_BYTES in length.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct xpc_notify_mq_msghdr_uv {</div><div class='add'>+	union {</div><div class='add'>+		unsigned int gru_msg_hdr;	/* FOR GRU INTERNAL USE ONLY */</div><div class='add'>+		struct xpc_fifo_entry_uv next;	/* FOR XPC INTERNAL USE ONLY */</div><div class='add'>+	} u;</div><div class='add'>+	short partid;		/* FOR XPC INTERNAL USE ONLY */</div><div class='add'>+	u8 ch_number;		/* FOR XPC INTERNAL USE ONLY */</div><div class='add'>+	u8 size;		/* FOR XPC INTERNAL USE ONLY */</div><div class='add'>+	unsigned int msg_slot_number;	/* FOR XPC INTERNAL USE ONLY */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xpc_notify_mq_msg_uv {</div><div class='add'>+	struct xpc_notify_mq_msghdr_uv hdr;</div><div class='add'>+	unsigned long payload;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define sn2's notify entry.</div><div class='ctx'>  *</div><div class='ctx'>  * This is used to notify a message's sender that their message was received</div><div class='ctx'>  * and consumed by the intended recipient.</div><div class='ctx'>  */</div><div class='del'>-struct xpc_notify {</div><div class='add'>+struct xpc_notify_sn2 {</div><div class='ctx'> 	u8 type;		/* type of notification */</div><div class='ctx'> </div><div class='ctx'> 	/* the following two fields are only used if type == XPC_N_CALL */</div><div class='hunk'>@@ -325,9 +374,20 @@ struct xpc_notify {</div><div class='ctx'> 	void *key;		/* pointer to user's key */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* struct xpc_notify type of notification */</div><div class='add'>+/* struct xpc_notify_sn2 type of notification */</div><div class='add'>+</div><div class='add'>+#define	XPC_N_CALL	0x01	/* notify function provided by user */</div><div class='ctx'> </div><div class='del'>-#define	XPC_N_CALL		0x01	/* notify function provided by user */</div><div class='add'>+/*</div><div class='add'>+ * Define uv's version of the notify entry. It additionally is used to allocate</div><div class='add'>+ * a msg slot on the remote partition into which is copied a sent message.</div><div class='add'>+ */</div><div class='add'>+struct xpc_send_msg_slot_uv {</div><div class='add'>+	struct xpc_fifo_entry_uv next;</div><div class='add'>+	unsigned int msg_slot_number;</div><div class='add'>+	xpc_notify_func func;	/* user's notify function */</div><div class='add'>+	void *key;		/* pointer to user's key */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Define the structure that manages all the stuff required by a channel. In</div><div class='hunk'>@@ -339,8 +399,12 @@ struct xpc_notify {</div><div class='ctx'>  * There is an array of these structures for each remote partition. It is</div><div class='ctx'>  * allocated at the time a partition becomes active. The array contains one</div><div class='ctx'>  * of these structures for each potential channel connection to that partition.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The following is sn2 only.</div><div class='ctx'>  *</div><div class='del'>- * Each of these structures manages two message queues (circular buffers).</div><div class='add'>+ * Each channel structure manages two message queues (circular buffers).</div><div class='ctx'>  * They are allocated at the time a channel connection is made. One of</div><div class='ctx'>  * these message queues (local_msgqueue) holds the locally created messages</div><div class='ctx'>  * that are destined for the remote partition. The other of these message</div><div class='hunk'>@@ -407,58 +471,72 @@ struct xpc_notify {</div><div class='ctx'>  *	new messages, by the clearing of the message flags of the acknowledged</div><div class='ctx'>  *	messages.</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+struct xpc_channel_sn2 {</div><div class='add'>+	struct xpc_openclose_args *local_openclose_args; /* args passed on */</div><div class='add'>+					     /* opening or closing of channel */</div><div class='add'>+</div><div class='add'>+	void *local_msgqueue_base;	/* base address of kmalloc'd space */</div><div class='add'>+	struct xpc_msg_sn2 *local_msgqueue;	/* local message queue */</div><div class='add'>+	void *remote_msgqueue_base;	/* base address of kmalloc'd space */</div><div class='add'>+	struct xpc_msg_sn2 *remote_msgqueue; /* cached copy of remote */</div><div class='add'>+					   /* partition's local message queue */</div><div class='add'>+	unsigned long remote_msgqueue_pa; /* phys addr of remote partition's */</div><div class='add'>+					  /* local message queue */</div><div class='add'>+</div><div class='add'>+	struct xpc_notify_sn2 *notify_queue;/* notify queue for messages sent */</div><div class='add'>+</div><div class='add'>+	/* various flavors of local and remote Get/Put values */</div><div class='add'>+</div><div class='add'>+	struct xpc_gp_sn2 *local_GP;	/* local Get/Put values */</div><div class='add'>+	struct xpc_gp_sn2 remote_GP;	/* remote Get/Put values */</div><div class='add'>+	struct xpc_gp_sn2 w_local_GP;	/* working local Get/Put values */</div><div class='add'>+	struct xpc_gp_sn2 w_remote_GP;	/* working remote Get/Put values */</div><div class='add'>+	s64 next_msg_to_pull;	/* Put value of next msg to pull */</div><div class='add'>+</div><div class='add'>+	struct mutex msg_to_pull_mutex;	/* next msg to pull serialization */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xpc_channel_uv {</div><div class='add'>+	unsigned long remote_notify_mq_gpa;	/* gru phys address of remote */</div><div class='add'>+						/* partition's notify mq */</div><div class='add'>+</div><div class='add'>+	struct xpc_send_msg_slot_uv *send_msg_slots;</div><div class='add'>+	struct xpc_notify_mq_msg_uv *recv_msg_slots;</div><div class='add'>+</div><div class='add'>+	struct xpc_fifo_head_uv msg_slot_free_list;</div><div class='add'>+	struct xpc_fifo_head_uv recv_msg_list;	/* deliverable payloads */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct xpc_channel {</div><div class='ctx'> 	short partid;		/* ID of remote partition connected */</div><div class='ctx'> 	spinlock_t lock;	/* lock for updating this structure */</div><div class='del'>-	u32 flags;		/* general flags */</div><div class='add'>+	unsigned int flags;	/* general flags */</div><div class='ctx'> </div><div class='ctx'> 	enum xp_retval reason;	/* reason why channel is disconnect'g */</div><div class='ctx'> 	int reason_line;	/* line# disconnect initiated from */</div><div class='ctx'> </div><div class='ctx'> 	u16 number;		/* channel # */</div><div class='ctx'> </div><div class='del'>-	u16 msg_size;		/* sizeof each msg entry */</div><div class='add'>+	u16 entry_size;		/* sizeof each msg entry */</div><div class='ctx'> 	u16 local_nentries;	/* #of msg entries in local msg queue */</div><div class='ctx'> 	u16 remote_nentries;	/* #of msg entries in remote msg queue */</div><div class='ctx'> </div><div class='del'>-	void *local_msgqueue_base;	/* base address of kmalloc'd space */</div><div class='del'>-	struct xpc_msg *local_msgqueue;	/* local message queue */</div><div class='del'>-	void *remote_msgqueue_base;	/* base address of kmalloc'd space */</div><div class='del'>-	struct xpc_msg *remote_msgqueue; /* cached copy of remote partition's */</div><div class='del'>-					 /* local message queue */</div><div class='del'>-	u64 remote_msgqueue_pa;	/* phys addr of remote partition's */</div><div class='del'>-				/* local message queue */</div><div class='del'>-</div><div class='ctx'> 	atomic_t references;	/* #of external references to queues */</div><div class='ctx'> </div><div class='ctx'> 	atomic_t n_on_msg_allocate_wq;	/* #on msg allocation wait queue */</div><div class='ctx'> 	wait_queue_head_t msg_allocate_wq;	/* msg allocation wait queue */</div><div class='ctx'> </div><div class='del'>-	u8 delayed_IPI_flags;	/* IPI flags received, but delayed */</div><div class='add'>+	u8 delayed_chctl_flags;	/* chctl flags received, but delayed */</div><div class='ctx'> 				/* action until channel disconnected */</div><div class='ctx'> </div><div class='del'>-	/* queue of msg senders who want to be notified when msg received */</div><div class='del'>-</div><div class='ctx'> 	atomic_t n_to_notify;	/* #of msg senders to notify */</div><div class='del'>-	struct xpc_notify *notify_queue;    /* notify queue for messages sent */</div><div class='ctx'> </div><div class='ctx'> 	xpc_channel_func func;	/* user's channel function */</div><div class='ctx'> 	void *key;		/* pointer to user's key */</div><div class='ctx'> </div><div class='del'>-	struct mutex msg_to_pull_mutex;	/* next msg to pull serialization */</div><div class='ctx'> 	struct completion wdisconnect_wait;    /* wait for channel disconnect */</div><div class='ctx'> </div><div class='del'>-	struct xpc_openclose_args *local_openclose_args; /* args passed on */</div><div class='del'>-					     /* opening or closing of channel */</div><div class='del'>-</div><div class='del'>-	/* various flavors of local and remote Get/Put values */</div><div class='del'>-</div><div class='del'>-	struct xpc_gp *local_GP;	/* local Get/Put values */</div><div class='del'>-	struct xpc_gp remote_GP;	/* remote Get/Put values */</div><div class='del'>-	struct xpc_gp w_local_GP;	/* working local Get/Put values */</div><div class='del'>-	struct xpc_gp w_remote_GP;	/* working remote Get/Put values */</div><div class='del'>-	s64 next_msg_to_pull;	/* Put value of next msg to pull */</div><div class='del'>-</div><div class='ctx'> 	/* kthread management related fields */</div><div class='ctx'> </div><div class='ctx'> 	atomic_t kthreads_assigned;	/* #of kthreads assigned to channel */</div><div class='hunk'>@@ -469,6 +547,11 @@ struct xpc_channel {</div><div class='ctx'> </div><div class='ctx'> 	wait_queue_head_t idle_wq;	/* idle kthread wait queue */</div><div class='ctx'> </div><div class='add'>+	union {</div><div class='add'>+		struct xpc_channel_sn2 sn2;</div><div class='add'>+		struct xpc_channel_uv uv;</div><div class='add'>+	} sn;</div><div class='add'>+</div><div class='ctx'> } ____cacheline_aligned;</div><div class='ctx'> </div><div class='ctx'> /* struct xpc_channel flags */</div><div class='hunk'>@@ -501,33 +584,128 @@ struct xpc_channel {</div><div class='ctx'> #define	XPC_C_WDISCONNECT	0x00040000  /* waiting for channel disconnect */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Manages channels on a partition basis. There is one of these structures</div><div class='add'>+ * The channel control flags (chctl) union consists of a 64-bit variable which</div><div class='add'>+ * is divided up into eight bytes, ordered from right to left. Byte zero</div><div class='add'>+ * pertains to channel 0, byte one to channel 1, and so on. Each channel's byte</div><div class='add'>+ * can have one or more of the chctl flags set in it.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+union xpc_channel_ctl_flags {</div><div class='add'>+	u64 all_flags;</div><div class='add'>+	u8 flags[XPC_MAX_NCHANNELS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* chctl flags */</div><div class='add'>+#define	XPC_CHCTL_CLOSEREQUEST	0x01</div><div class='add'>+#define	XPC_CHCTL_CLOSEREPLY	0x02</div><div class='add'>+#define	XPC_CHCTL_OPENREQUEST	0x04</div><div class='add'>+#define	XPC_CHCTL_OPENREPLY	0x08</div><div class='add'>+#define	XPC_CHCTL_MSGREQUEST	0x10</div><div class='add'>+</div><div class='add'>+#define XPC_OPENCLOSE_CHCTL_FLAGS \</div><div class='add'>+			(XPC_CHCTL_CLOSEREQUEST | XPC_CHCTL_CLOSEREPLY | \</div><div class='add'>+			 XPC_CHCTL_OPENREQUEST | XPC_CHCTL_OPENREPLY)</div><div class='add'>+#define XPC_MSG_CHCTL_FLAGS	XPC_CHCTL_MSGREQUEST</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+xpc_any_openclose_chctl_flags_set(union xpc_channel_ctl_flags *chctl)</div><div class='add'>+{</div><div class='add'>+	int ch_number;</div><div class='add'>+</div><div class='add'>+	for (ch_number = 0; ch_number &lt; XPC_MAX_NCHANNELS; ch_number++) {</div><div class='add'>+		if (chctl-&gt;flags[ch_number] &amp; XPC_OPENCLOSE_CHCTL_FLAGS)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+xpc_any_msg_chctl_flags_set(union xpc_channel_ctl_flags *chctl)</div><div class='add'>+{</div><div class='add'>+	int ch_number;</div><div class='add'>+</div><div class='add'>+	for (ch_number = 0; ch_number &lt; XPC_MAX_NCHANNELS; ch_number++) {</div><div class='add'>+		if (chctl-&gt;flags[ch_number] &amp; XPC_MSG_CHCTL_FLAGS)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Manage channels on a partition basis. There is one of these structures</div><div class='ctx'>  * for each partition (a partition will never utilize the structure that</div><div class='ctx'>  * represents itself).</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+struct xpc_partition_sn2 {</div><div class='add'>+	unsigned long remote_amos_page_pa; /* paddr of partition's amos page */</div><div class='add'>+	int activate_IRQ_nasid;	/* active partition's act/deact nasid */</div><div class='add'>+	int activate_IRQ_phys_cpuid;	/* active part's act/deact phys cpuid */</div><div class='add'>+</div><div class='add'>+	unsigned long remote_vars_pa;	/* phys addr of partition's vars */</div><div class='add'>+	unsigned long remote_vars_part_pa; /* paddr of partition's vars part */</div><div class='add'>+	u8 remote_vars_version;	/* version# of partition's vars */</div><div class='add'>+</div><div class='add'>+	void *local_GPs_base;	/* base address of kmalloc'd space */</div><div class='add'>+	struct xpc_gp_sn2 *local_GPs;	/* local Get/Put values */</div><div class='add'>+	void *remote_GPs_base;	/* base address of kmalloc'd space */</div><div class='add'>+	struct xpc_gp_sn2 *remote_GPs;	/* copy of remote partition's local */</div><div class='add'>+					/* Get/Put values */</div><div class='add'>+	unsigned long remote_GPs_pa; /* phys addr of remote partition's local */</div><div class='add'>+				     /* Get/Put values */</div><div class='add'>+</div><div class='add'>+	void *local_openclose_args_base;   /* base address of kmalloc'd space */</div><div class='add'>+	struct xpc_openclose_args *local_openclose_args;      /* local's args */</div><div class='add'>+	unsigned long remote_openclose_args_pa;	/* phys addr of remote's args */</div><div class='add'>+</div><div class='add'>+	int notify_IRQ_nasid;	/* nasid of where to send notify IRQs */</div><div class='add'>+	int notify_IRQ_phys_cpuid;	/* CPUID of where to send notify IRQs */</div><div class='add'>+	char notify_IRQ_owner[8];	/* notify IRQ's owner's name */</div><div class='add'>+</div><div class='add'>+	struct amo *remote_chctl_amo_va; /* addr of remote chctl flags' amo */</div><div class='add'>+	struct amo *local_chctl_amo_va;	/* address of chctl flags' amo */</div><div class='add'>+</div><div class='add'>+	struct timer_list dropped_notify_IRQ_timer;	/* dropped IRQ timer */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xpc_partition_uv {</div><div class='add'>+	unsigned long remote_activate_mq_gpa;	/* gru phys address of remote */</div><div class='add'>+						/* partition's activate mq */</div><div class='add'>+	spinlock_t flags_lock;	/* protect updating of flags */</div><div class='add'>+	unsigned int flags;	/* general flags */</div><div class='add'>+	u8 remote_act_state;	/* remote partition's act_state */</div><div class='add'>+	u8 act_state_req;	/* act_state request from remote partition */</div><div class='add'>+	enum xp_retval reason;	/* reason for deactivate act_state request */</div><div class='add'>+	u64 heartbeat;		/* incremented by remote partition */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* struct xpc_partition_uv flags */</div><div class='add'>+</div><div class='add'>+#define XPC_P_HEARTBEAT_OFFLINE_UV	0x00000001</div><div class='add'>+#define XPC_P_ENGAGED_UV		0x00000002</div><div class='add'>+</div><div class='add'>+/* struct xpc_partition_uv act_state change requests */</div><div class='add'>+</div><div class='add'>+#define XPC_P_ASR_ACTIVATE_UV		0x01</div><div class='add'>+#define XPC_P_ASR_REACTIVATE_UV		0x02</div><div class='add'>+#define XPC_P_ASR_DEACTIVATE_UV		0x03</div><div class='add'>+</div><div class='ctx'> struct xpc_partition {</div><div class='ctx'> </div><div class='ctx'> 	/* XPC HB infrastructure */</div><div class='ctx'> </div><div class='ctx'> 	u8 remote_rp_version;	/* version# of partition's rsvd pg */</div><div class='del'>-	struct timespec remote_rp_stamp; /* time when rsvd pg was initialized */</div><div class='del'>-	u64 remote_rp_pa;	/* phys addr of partition's rsvd pg */</div><div class='del'>-	u64 remote_vars_pa;	/* phys addr of partition's vars */</div><div class='del'>-	u64 remote_vars_part_pa;	/* phys addr of partition's vars part */</div><div class='add'>+	unsigned long remote_rp_ts_jiffies; /* timestamp when rsvd pg setup */</div><div class='add'>+	unsigned long remote_rp_pa;	/* phys addr of partition's rsvd pg */</div><div class='ctx'> 	u64 last_heartbeat;	/* HB at last read */</div><div class='del'>-	u64 remote_amos_page_pa;	/* phys addr of partition's amos page */</div><div class='del'>-	int remote_act_nasid;	/* active part's act/deact nasid */</div><div class='del'>-	int remote_act_phys_cpuid;	/* active part's act/deact phys cpuid */</div><div class='del'>-	u32 act_IRQ_rcvd;	/* IRQs since activation */</div><div class='add'>+	u32 activate_IRQ_rcvd;	/* IRQs since activation */</div><div class='ctx'> 	spinlock_t act_lock;	/* protect updating of act_state */</div><div class='ctx'> 	u8 act_state;		/* from XPC HB viewpoint */</div><div class='del'>-	u8 remote_vars_version;	/* version# of partition's vars */</div><div class='ctx'> 	enum xp_retval reason;	/* reason partition is deactivating */</div><div class='ctx'> 	int reason_line;	/* line# deactivation initiated from */</div><div class='del'>-	int reactivate_nasid;	/* nasid in partition to reactivate */</div><div class='ctx'> </div><div class='del'>-	unsigned long disengage_request_timeout;	/* timeout in jiffies */</div><div class='del'>-	struct timer_list disengage_request_timer;</div><div class='add'>+	unsigned long disengage_timeout;	/* timeout in jiffies */</div><div class='add'>+	struct timer_list disengage_timer;</div><div class='ctx'> </div><div class='ctx'> 	/* XPC infrastructure referencing and teardown control */</div><div class='ctx'> </div><div class='hunk'>@@ -535,85 +713,63 @@ struct xpc_partition {</div><div class='ctx'> 	wait_queue_head_t teardown_wq;	/* kthread waiting to teardown infra */</div><div class='ctx'> 	atomic_t references;	/* #of references to infrastructure */</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * NONE OF THE PRECEDING FIELDS OF THIS STRUCTURE WILL BE CLEARED WHEN</div><div class='del'>-	 * XPC SETS UP THE NECESSARY INFRASTRUCTURE TO SUPPORT CROSS PARTITION</div><div class='del'>-	 * COMMUNICATION. ALL OF THE FOLLOWING FIELDS WILL BE CLEARED. (THE</div><div class='del'>-	 * 'nchannels' FIELD MUST BE THE FIRST OF THE FIELDS TO BE CLEARED.)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='ctx'> 	u8 nchannels;		/* #of defined channels supported */</div><div class='ctx'> 	atomic_t nchannels_active;  /* #of channels that are not DISCONNECTED */</div><div class='ctx'> 	atomic_t nchannels_engaged;  /* #of channels engaged with remote part */</div><div class='ctx'> 	struct xpc_channel *channels;	/* array of channel structures */</div><div class='ctx'> </div><div class='del'>-	void *local_GPs_base;	/* base address of kmalloc'd space */</div><div class='del'>-	struct xpc_gp *local_GPs;	/* local Get/Put values */</div><div class='del'>-	void *remote_GPs_base;	/* base address of kmalloc'd space */</div><div class='del'>-	struct xpc_gp *remote_GPs;	/* copy of remote partition's local */</div><div class='del'>-					/* Get/Put values */</div><div class='del'>-	u64 remote_GPs_pa;	/* phys address of remote partition's local */</div><div class='del'>-				/* Get/Put values */</div><div class='add'>+	/* fields used for managing channel avialability and activity */</div><div class='ctx'> </div><div class='del'>-	/* fields used to pass args when opening or closing a channel */</div><div class='add'>+	union xpc_channel_ctl_flags chctl; /* chctl flags yet to be processed */</div><div class='add'>+	spinlock_t chctl_lock;	/* chctl flags lock */</div><div class='ctx'> </div><div class='del'>-	void *local_openclose_args_base;   /* base address of kmalloc'd space */</div><div class='del'>-	struct xpc_openclose_args *local_openclose_args;      /* local's args */</div><div class='ctx'> 	void *remote_openclose_args_base;  /* base address of kmalloc'd space */</div><div class='ctx'> 	struct xpc_openclose_args *remote_openclose_args; /* copy of remote's */</div><div class='ctx'> 							  /* args */</div><div class='del'>-	u64 remote_openclose_args_pa;	/* phys addr of remote's args */</div><div class='del'>-</div><div class='del'>-	/* IPI sending, receiving and handling related fields */</div><div class='del'>-</div><div class='del'>-	int remote_IPI_nasid;	/* nasid of where to send IPIs */</div><div class='del'>-	int remote_IPI_phys_cpuid;	/* phys CPU ID of where to send IPIs */</div><div class='del'>-	AMO_t *remote_IPI_amo_va;    /* address of remote IPI AMO_t structure */</div><div class='del'>-</div><div class='del'>-	AMO_t *local_IPI_amo_va;	/* address of IPI AMO_t structure */</div><div class='del'>-	u64 local_IPI_amo;	/* IPI amo flags yet to be handled */</div><div class='del'>-	char IPI_owner[8];	/* IPI owner's name */</div><div class='del'>-	struct timer_list dropped_IPI_timer;	/* dropped IPI timer */</div><div class='del'>-</div><div class='del'>-	spinlock_t IPI_lock;	/* IPI handler lock */</div><div class='ctx'> </div><div class='ctx'> 	/* channel manager related fields */</div><div class='ctx'> </div><div class='ctx'> 	atomic_t channel_mgr_requests;	/* #of requests to activate chan mgr */</div><div class='ctx'> 	wait_queue_head_t channel_mgr_wq;	/* channel mgr's wait queue */</div><div class='ctx'> </div><div class='add'>+	union {</div><div class='add'>+		struct xpc_partition_sn2 sn2;</div><div class='add'>+		struct xpc_partition_uv uv;</div><div class='add'>+	} sn;</div><div class='add'>+</div><div class='ctx'> } ____cacheline_aligned;</div><div class='ctx'> </div><div class='ctx'> /* struct xpc_partition act_state values (for XPC HB) */</div><div class='ctx'> </div><div class='del'>-#define	XPC_P_INACTIVE		0x00	/* partition is not active */</div><div class='del'>-#define XPC_P_ACTIVATION_REQ	0x01	/* created thread to activate */</div><div class='del'>-#define XPC_P_ACTIVATING	0x02	/* activation thread started */</div><div class='del'>-#define XPC_P_ACTIVE		0x03	/* xpc_partition_up() was called */</div><div class='del'>-#define XPC_P_DEACTIVATING	0x04	/* partition deactivation initiated */</div><div class='add'>+#define	XPC_P_AS_INACTIVE	0x00	/* partition is not active */</div><div class='add'>+#define XPC_P_AS_ACTIVATION_REQ	0x01	/* created thread to activate */</div><div class='add'>+#define XPC_P_AS_ACTIVATING	0x02	/* activation thread started */</div><div class='add'>+#define XPC_P_AS_ACTIVE		0x03	/* xpc_partition_up() was called */</div><div class='add'>+#define XPC_P_AS_DEACTIVATING	0x04	/* partition deactivation initiated */</div><div class='ctx'> </div><div class='ctx'> #define XPC_DEACTIVATE_PARTITION(_p, _reason) \</div><div class='ctx'> 			xpc_deactivate_partition(__LINE__, (_p), (_reason))</div><div class='ctx'> </div><div class='ctx'> /* struct xpc_partition setup_state values */</div><div class='ctx'> </div><div class='del'>-#define XPC_P_UNSET		0x00	/* infrastructure was never setup */</div><div class='del'>-#define XPC_P_SETUP		0x01	/* infrastructure is setup */</div><div class='del'>-#define XPC_P_WTEARDOWN		0x02	/* waiting to teardown infrastructure */</div><div class='del'>-#define XPC_P_TORNDOWN		0x03	/* infrastructure is torndown */</div><div class='add'>+#define XPC_P_SS_UNSET		0x00	/* infrastructure was never setup */</div><div class='add'>+#define XPC_P_SS_SETUP		0x01	/* infrastructure is setup */</div><div class='add'>+#define XPC_P_SS_WTEARDOWN	0x02	/* waiting to teardown infrastructure */</div><div class='add'>+#define XPC_P_SS_TORNDOWN	0x03	/* infrastructure is torndown */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * struct xpc_partition IPI_timer #of seconds to wait before checking for</div><div class='del'>- * dropped IPIs. These occur whenever an IPI amo write doesn't complete until</div><div class='del'>- * after the IPI was received.</div><div class='add'>+ * struct xpc_partition_sn2's dropped notify IRQ timer is set to wait the</div><div class='add'>+ * following interval #of seconds before checking for dropped notify IRQs.</div><div class='add'>+ * These can occur whenever an IRQ's associated amo write doesn't complete</div><div class='add'>+ * until after the IRQ was received.</div><div class='ctx'>  */</div><div class='del'>-#define XPC_P_DROPPED_IPI_WAIT	(0.25 * HZ)</div><div class='add'>+#define XPC_DROPPED_NOTIFY_IRQ_WAIT_INTERVAL	(0.25 * HZ)</div><div class='ctx'> </div><div class='ctx'> /* number of seconds to wait for other partitions to disengage */</div><div class='del'>-#define XPC_DISENGAGE_REQUEST_DEFAULT_TIMELIMIT	90</div><div class='add'>+#define XPC_DISENGAGE_DEFAULT_TIMELIMIT		90</div><div class='ctx'> </div><div class='del'>-/* interval in seconds to print 'waiting disengagement' messages */</div><div class='del'>-#define XPC_DISENGAGE_PRINTMSG_INTERVAL		10</div><div class='add'>+/* interval in seconds to print 'waiting deactivation' messages */</div><div class='add'>+#define XPC_DEACTIVATE_PRINTMSG_INTERVAL	10</div><div class='ctx'> </div><div class='ctx'> #define XPC_PARTID(_p)	((short)((_p) - &amp;xpc_partitions[0]))</div><div class='ctx'> </div><div class='hunk'>@@ -623,33 +779,92 @@ extern struct xpc_registration xpc_registrations[];</div><div class='ctx'> /* found in xpc_main.c */</div><div class='ctx'> extern struct device *xpc_part;</div><div class='ctx'> extern struct device *xpc_chan;</div><div class='del'>-extern int xpc_disengage_request_timelimit;</div><div class='del'>-extern int xpc_disengage_request_timedout;</div><div class='del'>-extern irqreturn_t xpc_notify_IRQ_handler(int, void *);</div><div class='del'>-extern void xpc_dropped_IPI_check(struct xpc_partition *);</div><div class='add'>+extern int xpc_disengage_timelimit;</div><div class='add'>+extern int xpc_disengage_timedout;</div><div class='add'>+extern int xpc_activate_IRQ_rcvd;</div><div class='add'>+extern spinlock_t xpc_activate_IRQ_rcvd_lock;</div><div class='add'>+extern wait_queue_head_t xpc_activate_IRQ_wq;</div><div class='add'>+extern void *xpc_heartbeating_to_mask;</div><div class='add'>+extern void *xpc_kzalloc_cacheline_aligned(size_t, gfp_t, void **);</div><div class='ctx'> extern void xpc_activate_partition(struct xpc_partition *);</div><div class='ctx'> extern void xpc_activate_kthreads(struct xpc_channel *, int);</div><div class='ctx'> extern void xpc_create_kthreads(struct xpc_channel *, int, int);</div><div class='ctx'> extern void xpc_disconnect_wait(int);</div><div class='add'>+extern int (*xpc_setup_partitions_sn) (void);</div><div class='add'>+extern enum xp_retval (*xpc_get_partition_rsvd_page_pa) (void *, u64 *,</div><div class='add'>+							 unsigned long *,</div><div class='add'>+							 size_t *);</div><div class='add'>+extern int (*xpc_setup_rsvd_page_sn) (struct xpc_rsvd_page *);</div><div class='add'>+extern void (*xpc_heartbeat_init) (void);</div><div class='add'>+extern void (*xpc_heartbeat_exit) (void);</div><div class='add'>+extern void (*xpc_increment_heartbeat) (void);</div><div class='add'>+extern void (*xpc_offline_heartbeat) (void);</div><div class='add'>+extern void (*xpc_online_heartbeat) (void);</div><div class='add'>+extern enum xp_retval (*xpc_get_remote_heartbeat) (struct xpc_partition *);</div><div class='add'>+extern enum xp_retval (*xpc_make_first_contact) (struct xpc_partition *);</div><div class='add'>+extern u64 (*xpc_get_chctl_all_flags) (struct xpc_partition *);</div><div class='add'>+extern enum xp_retval (*xpc_setup_msg_structures) (struct xpc_channel *);</div><div class='add'>+extern void (*xpc_teardown_msg_structures) (struct xpc_channel *);</div><div class='add'>+extern void (*xpc_notify_senders_of_disconnect) (struct xpc_channel *);</div><div class='add'>+extern void (*xpc_process_msg_chctl_flags) (struct xpc_partition *, int);</div><div class='add'>+extern int (*xpc_n_of_deliverable_payloads) (struct xpc_channel *);</div><div class='add'>+extern void *(*xpc_get_deliverable_payload) (struct xpc_channel *);</div><div class='add'>+extern void (*xpc_request_partition_activation) (struct xpc_rsvd_page *,</div><div class='add'>+						 unsigned long, int);</div><div class='add'>+extern void (*xpc_request_partition_reactivation) (struct xpc_partition *);</div><div class='add'>+extern void (*xpc_request_partition_deactivation) (struct xpc_partition *);</div><div class='add'>+extern void (*xpc_cancel_partition_deactivation_request) (</div><div class='add'>+							struct xpc_partition *);</div><div class='add'>+extern void (*xpc_process_activate_IRQ_rcvd) (void);</div><div class='add'>+extern enum xp_retval (*xpc_setup_ch_structures_sn) (struct xpc_partition *);</div><div class='add'>+extern void (*xpc_teardown_ch_structures_sn) (struct xpc_partition *);</div><div class='add'>+</div><div class='add'>+extern void (*xpc_indicate_partition_engaged) (struct xpc_partition *);</div><div class='add'>+extern int (*xpc_partition_engaged) (short);</div><div class='add'>+extern int (*xpc_any_partition_engaged) (void);</div><div class='add'>+extern void (*xpc_indicate_partition_disengaged) (struct xpc_partition *);</div><div class='add'>+extern void (*xpc_assume_partition_disengaged) (short);</div><div class='add'>+</div><div class='add'>+extern void (*xpc_send_chctl_closerequest) (struct xpc_channel *,</div><div class='add'>+					    unsigned long *);</div><div class='add'>+extern void (*xpc_send_chctl_closereply) (struct xpc_channel *,</div><div class='add'>+					  unsigned long *);</div><div class='add'>+extern void (*xpc_send_chctl_openrequest) (struct xpc_channel *,</div><div class='add'>+					   unsigned long *);</div><div class='add'>+extern void (*xpc_send_chctl_openreply) (struct xpc_channel *, unsigned long *);</div><div class='add'>+</div><div class='add'>+extern void (*xpc_save_remote_msgqueue_pa) (struct xpc_channel *,</div><div class='add'>+					    unsigned long);</div><div class='add'>+</div><div class='add'>+extern enum xp_retval (*xpc_send_payload) (struct xpc_channel *, u32, void *,</div><div class='add'>+					   u16, u8, xpc_notify_func, void *);</div><div class='add'>+extern void (*xpc_received_payload) (struct xpc_channel *, void *);</div><div class='add'>+</div><div class='add'>+/* found in xpc_sn2.c */</div><div class='add'>+extern int xpc_init_sn2(void);</div><div class='add'>+extern void xpc_exit_sn2(void);</div><div class='add'>+</div><div class='add'>+/* found in xpc_uv.c */</div><div class='add'>+extern int xpc_init_uv(void);</div><div class='add'>+extern void xpc_exit_uv(void);</div><div class='ctx'> </div><div class='ctx'> /* found in xpc_partition.c */</div><div class='ctx'> extern int xpc_exiting;</div><div class='del'>-extern struct xpc_vars *xpc_vars;</div><div class='add'>+extern int xpc_nasid_mask_nlongs;</div><div class='ctx'> extern struct xpc_rsvd_page *xpc_rsvd_page;</div><div class='del'>-extern struct xpc_vars_part *xpc_vars_part;</div><div class='del'>-extern struct xpc_partition xpc_partitions[XP_MAX_PARTITIONS + 1];</div><div class='del'>-extern char *xpc_remote_copy_buffer;</div><div class='del'>-extern void *xpc_remote_copy_buffer_base;</div><div class='add'>+extern unsigned long *xpc_mach_nasids;</div><div class='add'>+extern struct xpc_partition *xpc_partitions;</div><div class='ctx'> extern void *xpc_kmalloc_cacheline_aligned(size_t, gfp_t, void **);</div><div class='del'>-extern struct xpc_rsvd_page *xpc_rsvd_page_init(void);</div><div class='del'>-extern void xpc_allow_IPI_ops(void);</div><div class='del'>-extern void xpc_restrict_IPI_ops(void);</div><div class='del'>-extern int xpc_identify_act_IRQ_sender(void);</div><div class='add'>+extern int xpc_setup_rsvd_page(void);</div><div class='add'>+extern void xpc_teardown_rsvd_page(void);</div><div class='add'>+extern int xpc_identify_activate_IRQ_sender(void);</div><div class='ctx'> extern int xpc_partition_disengaged(struct xpc_partition *);</div><div class='ctx'> extern enum xp_retval xpc_mark_partition_active(struct xpc_partition *);</div><div class='ctx'> extern void xpc_mark_partition_inactive(struct xpc_partition *);</div><div class='ctx'> extern void xpc_discovery(void);</div><div class='del'>-extern void xpc_check_remote_hb(void);</div><div class='add'>+extern enum xp_retval xpc_get_remote_rp(int, unsigned long *,</div><div class='add'>+					struct xpc_rsvd_page *,</div><div class='add'>+					unsigned long *);</div><div class='ctx'> extern void xpc_deactivate_partition(const int, struct xpc_partition *,</div><div class='ctx'> 				     enum xp_retval);</div><div class='ctx'> extern enum xp_retval xpc_initiate_partid_to_nasids(short, void *);</div><div class='hunk'>@@ -657,21 +872,52 @@ extern enum xp_retval xpc_initiate_partid_to_nasids(short, void *);</div><div class='ctx'> /* found in xpc_channel.c */</div><div class='ctx'> extern void xpc_initiate_connect(int);</div><div class='ctx'> extern void xpc_initiate_disconnect(int);</div><div class='del'>-extern enum xp_retval xpc_initiate_allocate(short, int, u32, void **);</div><div class='del'>-extern enum xp_retval xpc_initiate_send(short, int, void *);</div><div class='del'>-extern enum xp_retval xpc_initiate_send_notify(short, int, void *,</div><div class='add'>+extern enum xp_retval xpc_allocate_msg_wait(struct xpc_channel *);</div><div class='add'>+extern enum xp_retval xpc_initiate_send(short, int, u32, void *, u16);</div><div class='add'>+extern enum xp_retval xpc_initiate_send_notify(short, int, u32, void *, u16,</div><div class='ctx'> 					       xpc_notify_func, void *);</div><div class='ctx'> extern void xpc_initiate_received(short, int, void *);</div><div class='del'>-extern enum xp_retval xpc_setup_infrastructure(struct xpc_partition *);</div><div class='del'>-extern enum xp_retval xpc_pull_remote_vars_part(struct xpc_partition *);</div><div class='del'>-extern void xpc_process_channel_activity(struct xpc_partition *);</div><div class='add'>+extern void xpc_process_sent_chctl_flags(struct xpc_partition *);</div><div class='ctx'> extern void xpc_connected_callout(struct xpc_channel *);</div><div class='del'>-extern void xpc_deliver_msg(struct xpc_channel *);</div><div class='add'>+extern void xpc_deliver_payload(struct xpc_channel *);</div><div class='ctx'> extern void xpc_disconnect_channel(const int, struct xpc_channel *,</div><div class='ctx'> 				   enum xp_retval, unsigned long *);</div><div class='ctx'> extern void xpc_disconnect_callout(struct xpc_channel *, enum xp_retval);</div><div class='ctx'> extern void xpc_partition_going_down(struct xpc_partition *, enum xp_retval);</div><div class='del'>-extern void xpc_teardown_infrastructure(struct xpc_partition *);</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+xpc_hb_allowed(short partid, void *heartbeating_to_mask)</div><div class='add'>+{</div><div class='add'>+	return test_bit(partid, heartbeating_to_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+xpc_any_hbs_allowed(void)</div><div class='add'>+{</div><div class='add'>+	DBUG_ON(xpc_heartbeating_to_mask == NULL);</div><div class='add'>+	return !bitmap_empty(xpc_heartbeating_to_mask, xp_max_npartitions);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+xpc_allow_hb(short partid)</div><div class='add'>+{</div><div class='add'>+	DBUG_ON(xpc_heartbeating_to_mask == NULL);</div><div class='add'>+	set_bit(partid, xpc_heartbeating_to_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+xpc_disallow_hb(short partid)</div><div class='add'>+{</div><div class='add'>+	DBUG_ON(xpc_heartbeating_to_mask == NULL);</div><div class='add'>+	clear_bit(partid, xpc_heartbeating_to_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+xpc_disallow_all_hbs(void)</div><div class='add'>+{</div><div class='add'>+	DBUG_ON(xpc_heartbeating_to_mask == NULL);</div><div class='add'>+	bitmap_zero(xpc_heartbeating_to_mask, xp_max_npartitions);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> xpc_wakeup_channel_mgr(struct xpc_partition *part)</div><div class='hunk'>@@ -713,7 +959,7 @@ xpc_part_deref(struct xpc_partition *part)</div><div class='ctx'> 	s32 refs = atomic_dec_return(&amp;part-&gt;references);</div><div class='ctx'> </div><div class='ctx'> 	DBUG_ON(refs &lt; 0);</div><div class='del'>-	if (refs == 0 &amp;&amp; part-&gt;setup_state == XPC_P_WTEARDOWN)</div><div class='add'>+	if (refs == 0 &amp;&amp; part-&gt;setup_state == XPC_P_SS_WTEARDOWN)</div><div class='ctx'> 		wake_up(&amp;part-&gt;teardown_wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -723,7 +969,7 @@ xpc_part_ref(struct xpc_partition *part)</div><div class='ctx'> 	int setup;</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;part-&gt;references);</div><div class='del'>-	setup = (part-&gt;setup_state == XPC_P_SETUP);</div><div class='add'>+	setup = (part-&gt;setup_state == XPC_P_SS_SETUP);</div><div class='ctx'> 	if (!setup)</div><div class='ctx'> 		xpc_part_deref(part);</div><div class='ctx'> </div><div class='hunk'>@@ -741,416 +987,4 @@ xpc_part_ref(struct xpc_partition *part)</div><div class='ctx'> 		(_p)-&gt;reason_line = _line; \</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This next set of inlines are used to keep track of when a partition is</div><div class='del'>- * potentially engaged in accessing memory belonging to another partition.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_mark_partition_engaged(struct xpc_partition *part)</div><div class='del'>-{</div><div class='del'>-	unsigned long irq_flags;</div><div class='del'>-	AMO_t *amo = (AMO_t *)__va(part-&gt;remote_amos_page_pa +</div><div class='del'>-				   (XPC_ENGAGED_PARTITIONS_AMO *</div><div class='del'>-				    sizeof(AMO_t)));</div><div class='del'>-</div><div class='del'>-	local_irq_save(irq_flags);</div><div class='del'>-</div><div class='del'>-	/* set bit corresponding to our partid in remote partition's AMO */</div><div class='del'>-	FETCHOP_STORE_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_OR,</div><div class='del'>-			 (1UL &lt;&lt; sn_partition_id));</div><div class='del'>-	/*</div><div class='del'>-	 * We must always use the nofault function regardless of whether we</div><div class='del'>-	 * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we</div><div class='del'>-	 * didn't, we'd never know that the other partition is down and would</div><div class='del'>-	 * keep sending IPIs and AMOs to it until the heartbeat times out.</div><div class='del'>-	 */</div><div class='del'>-	(void)xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amp;amo-&gt;</div><div class='del'>-							       variable),</div><div class='del'>-						     xp_nofault_PIOR_target));</div><div class='del'>-</div><div class='del'>-	local_irq_restore(irq_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_mark_partition_disengaged(struct xpc_partition *part)</div><div class='del'>-{</div><div class='del'>-	unsigned long irq_flags;</div><div class='del'>-	AMO_t *amo = (AMO_t *)__va(part-&gt;remote_amos_page_pa +</div><div class='del'>-				   (XPC_ENGAGED_PARTITIONS_AMO *</div><div class='del'>-				    sizeof(AMO_t)));</div><div class='del'>-</div><div class='del'>-	local_irq_save(irq_flags);</div><div class='del'>-</div><div class='del'>-	/* clear bit corresponding to our partid in remote partition's AMO */</div><div class='del'>-	FETCHOP_STORE_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_AND,</div><div class='del'>-			 ~(1UL &lt;&lt; sn_partition_id));</div><div class='del'>-	/*</div><div class='del'>-	 * We must always use the nofault function regardless of whether we</div><div class='del'>-	 * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we</div><div class='del'>-	 * didn't, we'd never know that the other partition is down and would</div><div class='del'>-	 * keep sending IPIs and AMOs to it until the heartbeat times out.</div><div class='del'>-	 */</div><div class='del'>-	(void)xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amp;amo-&gt;</div><div class='del'>-							       variable),</div><div class='del'>-						     xp_nofault_PIOR_target));</div><div class='del'>-</div><div class='del'>-	local_irq_restore(irq_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_request_partition_disengage(struct xpc_partition *part)</div><div class='del'>-{</div><div class='del'>-	unsigned long irq_flags;</div><div class='del'>-	AMO_t *amo = (AMO_t *)__va(part-&gt;remote_amos_page_pa +</div><div class='del'>-				   (XPC_DISENGAGE_REQUEST_AMO * sizeof(AMO_t)));</div><div class='del'>-</div><div class='del'>-	local_irq_save(irq_flags);</div><div class='del'>-</div><div class='del'>-	/* set bit corresponding to our partid in remote partition's AMO */</div><div class='del'>-	FETCHOP_STORE_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_OR,</div><div class='del'>-			 (1UL &lt;&lt; sn_partition_id));</div><div class='del'>-	/*</div><div class='del'>-	 * We must always use the nofault function regardless of whether we</div><div class='del'>-	 * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we</div><div class='del'>-	 * didn't, we'd never know that the other partition is down and would</div><div class='del'>-	 * keep sending IPIs and AMOs to it until the heartbeat times out.</div><div class='del'>-	 */</div><div class='del'>-	(void)xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amp;amo-&gt;</div><div class='del'>-							       variable),</div><div class='del'>-						     xp_nofault_PIOR_target));</div><div class='del'>-</div><div class='del'>-	local_irq_restore(irq_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_cancel_partition_disengage_request(struct xpc_partition *part)</div><div class='del'>-{</div><div class='del'>-	unsigned long irq_flags;</div><div class='del'>-	AMO_t *amo = (AMO_t *)__va(part-&gt;remote_amos_page_pa +</div><div class='del'>-				   (XPC_DISENGAGE_REQUEST_AMO * sizeof(AMO_t)));</div><div class='del'>-</div><div class='del'>-	local_irq_save(irq_flags);</div><div class='del'>-</div><div class='del'>-	/* clear bit corresponding to our partid in remote partition's AMO */</div><div class='del'>-	FETCHOP_STORE_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_AND,</div><div class='del'>-			 ~(1UL &lt;&lt; sn_partition_id));</div><div class='del'>-	/*</div><div class='del'>-	 * We must always use the nofault function regardless of whether we</div><div class='del'>-	 * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we</div><div class='del'>-	 * didn't, we'd never know that the other partition is down and would</div><div class='del'>-	 * keep sending IPIs and AMOs to it until the heartbeat times out.</div><div class='del'>-	 */</div><div class='del'>-	(void)xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amp;amo-&gt;</div><div class='del'>-							       variable),</div><div class='del'>-						     xp_nofault_PIOR_target));</div><div class='del'>-</div><div class='del'>-	local_irq_restore(irq_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64</div><div class='del'>-xpc_partition_engaged(u64 partid_mask)</div><div class='del'>-{</div><div class='del'>-	AMO_t *amo = xpc_vars-&gt;amos_page + XPC_ENGAGED_PARTITIONS_AMO;</div><div class='del'>-</div><div class='del'>-	/* return our partition's AMO variable ANDed with partid_mask */</div><div class='del'>-	return (FETCHOP_LOAD_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_LOAD) &amp;</div><div class='del'>-		partid_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64</div><div class='del'>-xpc_partition_disengage_requested(u64 partid_mask)</div><div class='del'>-{</div><div class='del'>-	AMO_t *amo = xpc_vars-&gt;amos_page + XPC_DISENGAGE_REQUEST_AMO;</div><div class='del'>-</div><div class='del'>-	/* return our partition's AMO variable ANDed with partid_mask */</div><div class='del'>-	return (FETCHOP_LOAD_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_LOAD) &amp;</div><div class='del'>-		partid_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_clear_partition_engaged(u64 partid_mask)</div><div class='del'>-{</div><div class='del'>-	AMO_t *amo = xpc_vars-&gt;amos_page + XPC_ENGAGED_PARTITIONS_AMO;</div><div class='del'>-</div><div class='del'>-	/* clear bit(s) based on partid_mask in our partition's AMO */</div><div class='del'>-	FETCHOP_STORE_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_AND,</div><div class='del'>-			 ~partid_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_clear_partition_disengage_request(u64 partid_mask)</div><div class='del'>-{</div><div class='del'>-	AMO_t *amo = xpc_vars-&gt;amos_page + XPC_DISENGAGE_REQUEST_AMO;</div><div class='del'>-</div><div class='del'>-	/* clear bit(s) based on partid_mask in our partition's AMO */</div><div class='del'>-	FETCHOP_STORE_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_AND,</div><div class='del'>-			 ~partid_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The following set of macros and inlines are used for the sending and</div><div class='del'>- * receiving of IPIs (also known as IRQs). There are two flavors of IPIs,</div><div class='del'>- * one that is associated with partition activity (SGI_XPC_ACTIVATE) and</div><div class='del'>- * the other that is associated with channel activity (SGI_XPC_NOTIFY).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline u64</div><div class='del'>-xpc_IPI_receive(AMO_t *amo)</div><div class='del'>-{</div><div class='del'>-	return FETCHOP_LOAD_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_CLEAR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum xp_retval</div><div class='del'>-xpc_IPI_send(AMO_t *amo, u64 flag, int nasid, int phys_cpuid, int vector)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	unsigned long irq_flags;</div><div class='del'>-</div><div class='del'>-	local_irq_save(irq_flags);</div><div class='del'>-</div><div class='del'>-	FETCHOP_STORE_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_OR, flag);</div><div class='del'>-	sn_send_IPI_phys(nasid, phys_cpuid, vector, 0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We must always use the nofault function regardless of whether we</div><div class='del'>-	 * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we</div><div class='del'>-	 * didn't, we'd never know that the other partition is down and would</div><div class='del'>-	 * keep sending IPIs and AMOs to it until the heartbeat times out.</div><div class='del'>-	 */</div><div class='del'>-	ret = xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amp;amo-&gt;variable),</div><div class='del'>-						     xp_nofault_PIOR_target));</div><div class='del'>-</div><div class='del'>-	local_irq_restore(irq_flags);</div><div class='del'>-</div><div class='del'>-	return ((ret == 0) ? xpSuccess : xpPioReadError);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * IPIs associated with SGI_XPC_ACTIVATE IRQ.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Flag the appropriate AMO variable and send an IPI to the specified node.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-xpc_activate_IRQ_send(u64 amos_page_pa, int from_nasid, int to_nasid,</div><div class='del'>-		      int to_phys_cpuid)</div><div class='del'>-{</div><div class='del'>-	int w_index = XPC_NASID_W_INDEX(from_nasid);</div><div class='del'>-	int b_index = XPC_NASID_B_INDEX(from_nasid);</div><div class='del'>-	AMO_t *amos = (AMO_t *)__va(amos_page_pa +</div><div class='del'>-				    (XPC_ACTIVATE_IRQ_AMOS * sizeof(AMO_t)));</div><div class='del'>-</div><div class='del'>-	(void)xpc_IPI_send(&amp;amos[w_index], (1UL &lt;&lt; b_index), to_nasid,</div><div class='del'>-			   to_phys_cpuid, SGI_XPC_ACTIVATE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_IPI_send_activate(struct xpc_vars *vars)</div><div class='del'>-{</div><div class='del'>-	xpc_activate_IRQ_send(vars-&gt;amos_page_pa, cnodeid_to_nasid(0),</div><div class='del'>-			      vars-&gt;act_nasid, vars-&gt;act_phys_cpuid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_IPI_send_activated(struct xpc_partition *part)</div><div class='del'>-{</div><div class='del'>-	xpc_activate_IRQ_send(part-&gt;remote_amos_page_pa, cnodeid_to_nasid(0),</div><div class='del'>-			      part-&gt;remote_act_nasid,</div><div class='del'>-			      part-&gt;remote_act_phys_cpuid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_IPI_send_reactivate(struct xpc_partition *part)</div><div class='del'>-{</div><div class='del'>-	xpc_activate_IRQ_send(xpc_vars-&gt;amos_page_pa, part-&gt;reactivate_nasid,</div><div class='del'>-			      xpc_vars-&gt;act_nasid, xpc_vars-&gt;act_phys_cpuid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_IPI_send_disengage(struct xpc_partition *part)</div><div class='del'>-{</div><div class='del'>-	xpc_activate_IRQ_send(part-&gt;remote_amos_page_pa, cnodeid_to_nasid(0),</div><div class='del'>-			      part-&gt;remote_act_nasid,</div><div class='del'>-			      part-&gt;remote_act_phys_cpuid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * IPIs associated with SGI_XPC_NOTIFY IRQ.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Send an IPI to the remote partition that is associated with the</div><div class='del'>- * specified channel.</div><div class='del'>- */</div><div class='del'>-#define XPC_NOTIFY_IRQ_SEND(_ch, _ipi_f, _irq_f) \</div><div class='del'>-		xpc_notify_IRQ_send(_ch, _ipi_f, #_ipi_f, _irq_f)</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_notify_IRQ_send(struct xpc_channel *ch, u8 ipi_flag, char *ipi_flag_string,</div><div class='del'>-		    unsigned long *irq_flags)</div><div class='del'>-{</div><div class='del'>-	struct xpc_partition *part = &amp;xpc_partitions[ch-&gt;partid];</div><div class='del'>-	enum xp_retval ret;</div><div class='del'>-</div><div class='del'>-	if (likely(part-&gt;act_state != XPC_P_DEACTIVATING)) {</div><div class='del'>-		ret = xpc_IPI_send(part-&gt;remote_IPI_amo_va,</div><div class='del'>-				   (u64)ipi_flag &lt;&lt; (ch-&gt;number * 8),</div><div class='del'>-				   part-&gt;remote_IPI_nasid,</div><div class='del'>-				   part-&gt;remote_IPI_phys_cpuid, SGI_XPC_NOTIFY);</div><div class='del'>-		dev_dbg(xpc_chan, "%s sent to partid=%d, channel=%d, ret=%d\n",</div><div class='del'>-			ipi_flag_string, ch-&gt;partid, ch-&gt;number, ret);</div><div class='del'>-		if (unlikely(ret != xpSuccess)) {</div><div class='del'>-			if (irq_flags != NULL)</div><div class='del'>-				spin_unlock_irqrestore(&amp;ch-&gt;lock, *irq_flags);</div><div class='del'>-			XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='del'>-			if (irq_flags != NULL)</div><div class='del'>-				spin_lock_irqsave(&amp;ch-&gt;lock, *irq_flags);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Make it look like the remote partition, which is associated with the</div><div class='del'>- * specified channel, sent us an IPI. This faked IPI will be handled</div><div class='del'>- * by xpc_dropped_IPI_check().</div><div class='del'>- */</div><div class='del'>-#define XPC_NOTIFY_IRQ_SEND_LOCAL(_ch, _ipi_f) \</div><div class='del'>-		xpc_notify_IRQ_send_local(_ch, _ipi_f, #_ipi_f)</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_notify_IRQ_send_local(struct xpc_channel *ch, u8 ipi_flag,</div><div class='del'>-			  char *ipi_flag_string)</div><div class='del'>-{</div><div class='del'>-	struct xpc_partition *part = &amp;xpc_partitions[ch-&gt;partid];</div><div class='del'>-</div><div class='del'>-	FETCHOP_STORE_OP(TO_AMO((u64)&amp;part-&gt;local_IPI_amo_va-&gt;variable),</div><div class='del'>-			 FETCHOP_OR, ((u64)ipi_flag &lt;&lt; (ch-&gt;number * 8)));</div><div class='del'>-	dev_dbg(xpc_chan, "%s sent local from partid=%d, channel=%d\n",</div><div class='del'>-		ipi_flag_string, ch-&gt;partid, ch-&gt;number);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The sending and receiving of IPIs includes the setting of an AMO variable</div><div class='del'>- * to indicate the reason the IPI was sent. The 64-bit variable is divided</div><div class='del'>- * up into eight bytes, ordered from right to left. Byte zero pertains to</div><div class='del'>- * channel 0, byte one to channel 1, and so on. Each byte is described by</div><div class='del'>- * the following IPI flags.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define	XPC_IPI_CLOSEREQUEST	0x01</div><div class='del'>-#define	XPC_IPI_CLOSEREPLY	0x02</div><div class='del'>-#define	XPC_IPI_OPENREQUEST	0x04</div><div class='del'>-#define	XPC_IPI_OPENREPLY	0x08</div><div class='del'>-#define	XPC_IPI_MSGREQUEST	0x10</div><div class='del'>-</div><div class='del'>-/* given an AMO variable and a channel#, get its associated IPI flags */</div><div class='del'>-#define XPC_GET_IPI_FLAGS(_amo, _c)	((u8) (((_amo) &gt;&gt; ((_c) * 8)) &amp; 0xff))</div><div class='del'>-#define XPC_SET_IPI_FLAGS(_amo, _c, _f)	(_amo) |= ((u64) (_f) &lt;&lt; ((_c) * 8))</div><div class='del'>-</div><div class='del'>-#define	XPC_ANY_OPENCLOSE_IPI_FLAGS_SET(_amo) ((_amo) &amp; 0x0f0f0f0f0f0f0f0fUL)</div><div class='del'>-#define XPC_ANY_MSG_IPI_FLAGS_SET(_amo)       ((_amo) &amp; 0x1010101010101010UL)</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_IPI_send_closerequest(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='del'>-{</div><div class='del'>-	struct xpc_openclose_args *args = ch-&gt;local_openclose_args;</div><div class='del'>-</div><div class='del'>-	args-&gt;reason = ch-&gt;reason;</div><div class='del'>-</div><div class='del'>-	XPC_NOTIFY_IRQ_SEND(ch, XPC_IPI_CLOSEREQUEST, irq_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_IPI_send_closereply(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='del'>-{</div><div class='del'>-	XPC_NOTIFY_IRQ_SEND(ch, XPC_IPI_CLOSEREPLY, irq_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_IPI_send_openrequest(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='del'>-{</div><div class='del'>-	struct xpc_openclose_args *args = ch-&gt;local_openclose_args;</div><div class='del'>-</div><div class='del'>-	args-&gt;msg_size = ch-&gt;msg_size;</div><div class='del'>-	args-&gt;local_nentries = ch-&gt;local_nentries;</div><div class='del'>-</div><div class='del'>-	XPC_NOTIFY_IRQ_SEND(ch, XPC_IPI_OPENREQUEST, irq_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_IPI_send_openreply(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='del'>-{</div><div class='del'>-	struct xpc_openclose_args *args = ch-&gt;local_openclose_args;</div><div class='del'>-</div><div class='del'>-	args-&gt;remote_nentries = ch-&gt;remote_nentries;</div><div class='del'>-	args-&gt;local_nentries = ch-&gt;local_nentries;</div><div class='del'>-	args-&gt;local_msgqueue_pa = __pa(ch-&gt;local_msgqueue);</div><div class='del'>-</div><div class='del'>-	XPC_NOTIFY_IRQ_SEND(ch, XPC_IPI_OPENREPLY, irq_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_IPI_send_msgrequest(struct xpc_channel *ch)</div><div class='del'>-{</div><div class='del'>-	XPC_NOTIFY_IRQ_SEND(ch, XPC_IPI_MSGREQUEST, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-xpc_IPI_send_local_msgrequest(struct xpc_channel *ch)</div><div class='del'>-{</div><div class='del'>-	XPC_NOTIFY_IRQ_SEND_LOCAL(ch, XPC_IPI_MSGREQUEST);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Memory for XPC's AMO variables is allocated by the MSPEC driver. These</div><div class='del'>- * pages are located in the lowest granule. The lowest granule uses 4k pages</div><div class='del'>- * for cached references and an alternate TLB handler to never provide a</div><div class='del'>- * cacheable mapping for the entire region. This will prevent speculative</div><div class='del'>- * reading of cached copies of our lines from being issued which will cause</div><div class='del'>- * a PI FSB Protocol error to be generated by the SHUB. For XPC, we need 64</div><div class='del'>- * AMO variables (based on XP_MAX_PARTITIONS) for message notification and an</div><div class='del'>- * additional 128 AMO variables (based on XP_NASID_MASK_WORDS) for partition</div><div class='del'>- * activation and 2 AMO variables for partition deactivation.</div><div class='del'>- */</div><div class='del'>-static inline AMO_t *</div><div class='del'>-xpc_IPI_init(int index)</div><div class='del'>-{</div><div class='del'>-	AMO_t *amo = xpc_vars-&gt;amos_page + index;</div><div class='del'>-</div><div class='del'>-	(void)xpc_IPI_receive(amo);	/* clear AMO variable */</div><div class='del'>-	return amo;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum xp_retval</div><div class='del'>-xpc_map_bte_errors(bte_result_t error)</div><div class='del'>-{</div><div class='del'>-	return ((error == BTE_SUCCESS) ? xpSuccess : xpBteCopyError);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check to see if there is any channel activity to/from the specified</div><div class='del'>- * partition.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-xpc_check_for_channel_activity(struct xpc_partition *part)</div><div class='del'>-{</div><div class='del'>-	u64 IPI_amo;</div><div class='del'>-	unsigned long irq_flags;</div><div class='del'>-</div><div class='del'>-	IPI_amo = xpc_IPI_receive(part-&gt;local_IPI_amo_va);</div><div class='del'>-	if (IPI_amo == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;part-&gt;IPI_lock, irq_flags);</div><div class='del'>-	part-&gt;local_IPI_amo |= IPI_amo;</div><div class='del'>-	spin_unlock_irqrestore(&amp;part-&gt;IPI_lock, irq_flags);</div><div class='del'>-</div><div class='del'>-	dev_dbg(xpc_chan, "received IPI from partid=%d, IPI_amo=0x%lx\n",</div><div class='del'>-		XPC_PARTID(part), IPI_amo);</div><div class='del'>-</div><div class='del'>-	xpc_wakeup_channel_mgr(part);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif /* _DRIVERS_MISC_SGIXP_XPC_H */</div><div class='head'>diff --git a/drivers/misc/sgi-xp/xpc_channel.c b/drivers/misc/sgi-xp/xpc_channel.c<br/>index 9c90c2d55c08..9cd2ebe2a3b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xpc_channel.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/misc/sgi-xp/xpc_channel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xpc_channel.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xpc_channel.c</a></div><div class='hunk'>@@ -14,536 +14,10 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/cache.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/completion.h&gt;</div><div class='del'>-#include &lt;asm/sn/bte.h&gt;</div><div class='del'>-#include &lt;asm/sn/sn_sal.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include "xpc.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Guarantee that the kzalloc'd memory is cacheline aligned.</div><div class='del'>- */</div><div class='del'>-static void *</div><div class='del'>-xpc_kzalloc_cacheline_aligned(size_t size, gfp_t flags, void **base)</div><div class='del'>-{</div><div class='del'>-	/* see if kzalloc will give us cachline aligned memory by default */</div><div class='del'>-	*base = kzalloc(size, flags);</div><div class='del'>-	if (*base == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if ((u64)*base == L1_CACHE_ALIGN((u64)*base))</div><div class='del'>-		return *base;</div><div class='del'>-</div><div class='del'>-	kfree(*base);</div><div class='del'>-</div><div class='del'>-	/* nope, we'll have to do it ourselves */</div><div class='del'>-	*base = kzalloc(size + L1_CACHE_BYTES, flags);</div><div class='del'>-	if (*base == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return (void *)L1_CACHE_ALIGN((u64)*base);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set up the initial values for the XPartition Communication channels.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-xpc_initialize_channels(struct xpc_partition *part, short partid)</div><div class='del'>-{</div><div class='del'>-	int ch_number;</div><div class='del'>-	struct xpc_channel *ch;</div><div class='del'>-</div><div class='del'>-	for (ch_number = 0; ch_number &lt; part-&gt;nchannels; ch_number++) {</div><div class='del'>-		ch = &amp;part-&gt;channels[ch_number];</div><div class='del'>-</div><div class='del'>-		ch-&gt;partid = partid;</div><div class='del'>-		ch-&gt;number = ch_number;</div><div class='del'>-		ch-&gt;flags = XPC_C_DISCONNECTED;</div><div class='del'>-</div><div class='del'>-		ch-&gt;local_GP = &amp;part-&gt;local_GPs[ch_number];</div><div class='del'>-		ch-&gt;local_openclose_args =</div><div class='del'>-		    &amp;part-&gt;local_openclose_args[ch_number];</div><div class='del'>-</div><div class='del'>-		atomic_set(&amp;ch-&gt;kthreads_assigned, 0);</div><div class='del'>-		atomic_set(&amp;ch-&gt;kthreads_idle, 0);</div><div class='del'>-		atomic_set(&amp;ch-&gt;kthreads_active, 0);</div><div class='del'>-</div><div class='del'>-		atomic_set(&amp;ch-&gt;references, 0);</div><div class='del'>-		atomic_set(&amp;ch-&gt;n_to_notify, 0);</div><div class='del'>-</div><div class='del'>-		spin_lock_init(&amp;ch-&gt;lock);</div><div class='del'>-		mutex_init(&amp;ch-&gt;msg_to_pull_mutex);</div><div class='del'>-		init_completion(&amp;ch-&gt;wdisconnect_wait);</div><div class='del'>-</div><div class='del'>-		atomic_set(&amp;ch-&gt;n_on_msg_allocate_wq, 0);</div><div class='del'>-		init_waitqueue_head(&amp;ch-&gt;msg_allocate_wq);</div><div class='del'>-		init_waitqueue_head(&amp;ch-&gt;idle_wq);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Setup the infrastructure necessary to support XPartition Communication</div><div class='del'>- * between the specified remote partition and the local one.</div><div class='del'>- */</div><div class='del'>-enum xp_retval</div><div class='del'>-xpc_setup_infrastructure(struct xpc_partition *part)</div><div class='del'>-{</div><div class='del'>-	int ret, cpuid;</div><div class='del'>-	struct timer_list *timer;</div><div class='del'>-	short partid = XPC_PARTID(part);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Zero out MOST of the entry for this partition. Only the fields</div><div class='del'>-	 * starting with `nchannels' will be zeroed. The preceding fields must</div><div class='del'>-	 * remain `viable' across partition ups and downs, since they may be</div><div class='del'>-	 * referenced during this memset() operation.</div><div class='del'>-	 */</div><div class='del'>-	memset(&amp;part-&gt;nchannels, 0, sizeof(struct xpc_partition) -</div><div class='del'>-	       offsetof(struct xpc_partition, nchannels));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Allocate all of the channel structures as a contiguous chunk of</div><div class='del'>-	 * memory.</div><div class='del'>-	 */</div><div class='del'>-	part-&gt;channels = kzalloc(sizeof(struct xpc_channel) * XPC_NCHANNELS,</div><div class='del'>-				 GFP_KERNEL);</div><div class='del'>-	if (part-&gt;channels == NULL) {</div><div class='del'>-		dev_err(xpc_chan, "can't get memory for channels\n");</div><div class='del'>-		return xpNoMemory;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	part-&gt;nchannels = XPC_NCHANNELS;</div><div class='del'>-</div><div class='del'>-	/* allocate all the required GET/PUT values */</div><div class='del'>-</div><div class='del'>-	part-&gt;local_GPs = xpc_kzalloc_cacheline_aligned(XPC_GP_SIZE,</div><div class='del'>-							GFP_KERNEL,</div><div class='del'>-							&amp;part-&gt;local_GPs_base);</div><div class='del'>-	if (part-&gt;local_GPs == NULL) {</div><div class='del'>-		kfree(part-&gt;channels);</div><div class='del'>-		part-&gt;channels = NULL;</div><div class='del'>-		dev_err(xpc_chan, "can't get memory for local get/put "</div><div class='del'>-			"values\n");</div><div class='del'>-		return xpNoMemory;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	part-&gt;remote_GPs = xpc_kzalloc_cacheline_aligned(XPC_GP_SIZE,</div><div class='del'>-							 GFP_KERNEL,</div><div class='del'>-							 &amp;part-&gt;</div><div class='del'>-							 remote_GPs_base);</div><div class='del'>-	if (part-&gt;remote_GPs == NULL) {</div><div class='del'>-		dev_err(xpc_chan, "can't get memory for remote get/put "</div><div class='del'>-			"values\n");</div><div class='del'>-		kfree(part-&gt;local_GPs_base);</div><div class='del'>-		part-&gt;local_GPs = NULL;</div><div class='del'>-		kfree(part-&gt;channels);</div><div class='del'>-		part-&gt;channels = NULL;</div><div class='del'>-		return xpNoMemory;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* allocate all the required open and close args */</div><div class='del'>-</div><div class='del'>-	part-&gt;local_openclose_args =</div><div class='del'>-	    xpc_kzalloc_cacheline_aligned(XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL,</div><div class='del'>-					  &amp;part-&gt;local_openclose_args_base);</div><div class='del'>-	if (part-&gt;local_openclose_args == NULL) {</div><div class='del'>-		dev_err(xpc_chan, "can't get memory for local connect args\n");</div><div class='del'>-		kfree(part-&gt;remote_GPs_base);</div><div class='del'>-		part-&gt;remote_GPs = NULL;</div><div class='del'>-		kfree(part-&gt;local_GPs_base);</div><div class='del'>-		part-&gt;local_GPs = NULL;</div><div class='del'>-		kfree(part-&gt;channels);</div><div class='del'>-		part-&gt;channels = NULL;</div><div class='del'>-		return xpNoMemory;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	part-&gt;remote_openclose_args =</div><div class='del'>-	    xpc_kzalloc_cacheline_aligned(XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL,</div><div class='del'>-					  &amp;part-&gt;remote_openclose_args_base);</div><div class='del'>-	if (part-&gt;remote_openclose_args == NULL) {</div><div class='del'>-		dev_err(xpc_chan, "can't get memory for remote connect args\n");</div><div class='del'>-		kfree(part-&gt;local_openclose_args_base);</div><div class='del'>-		part-&gt;local_openclose_args = NULL;</div><div class='del'>-		kfree(part-&gt;remote_GPs_base);</div><div class='del'>-		part-&gt;remote_GPs = NULL;</div><div class='del'>-		kfree(part-&gt;local_GPs_base);</div><div class='del'>-		part-&gt;local_GPs = NULL;</div><div class='del'>-		kfree(part-&gt;channels);</div><div class='del'>-		part-&gt;channels = NULL;</div><div class='del'>-		return xpNoMemory;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	xpc_initialize_channels(part, partid);</div><div class='del'>-</div><div class='del'>-	atomic_set(&amp;part-&gt;nchannels_active, 0);</div><div class='del'>-	atomic_set(&amp;part-&gt;nchannels_engaged, 0);</div><div class='del'>-</div><div class='del'>-	/* local_IPI_amo were set to 0 by an earlier memset() */</div><div class='del'>-</div><div class='del'>-	/* Initialize this partitions AMO_t structure */</div><div class='del'>-	part-&gt;local_IPI_amo_va = xpc_IPI_init(partid);</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;part-&gt;IPI_lock);</div><div class='del'>-</div><div class='del'>-	atomic_set(&amp;part-&gt;channel_mgr_requests, 1);</div><div class='del'>-	init_waitqueue_head(&amp;part-&gt;channel_mgr_wq);</div><div class='del'>-</div><div class='del'>-	sprintf(part-&gt;IPI_owner, "xpc%02d", partid);</div><div class='del'>-	ret = request_irq(SGI_XPC_NOTIFY, xpc_notify_IRQ_handler, IRQF_SHARED,</div><div class='del'>-			  part-&gt;IPI_owner, (void *)(u64)partid);</div><div class='del'>-	if (ret != 0) {</div><div class='del'>-		dev_err(xpc_chan, "can't register NOTIFY IRQ handler, "</div><div class='del'>-			"errno=%d\n", -ret);</div><div class='del'>-		kfree(part-&gt;remote_openclose_args_base);</div><div class='del'>-		part-&gt;remote_openclose_args = NULL;</div><div class='del'>-		kfree(part-&gt;local_openclose_args_base);</div><div class='del'>-		part-&gt;local_openclose_args = NULL;</div><div class='del'>-		kfree(part-&gt;remote_GPs_base);</div><div class='del'>-		part-&gt;remote_GPs = NULL;</div><div class='del'>-		kfree(part-&gt;local_GPs_base);</div><div class='del'>-		part-&gt;local_GPs = NULL;</div><div class='del'>-		kfree(part-&gt;channels);</div><div class='del'>-		part-&gt;channels = NULL;</div><div class='del'>-		return xpLackOfResources;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Setup a timer to check for dropped IPIs */</div><div class='del'>-	timer = &amp;part-&gt;dropped_IPI_timer;</div><div class='del'>-	init_timer(timer);</div><div class='del'>-	timer-&gt;function = (void (*)(unsigned long))xpc_dropped_IPI_check;</div><div class='del'>-	timer-&gt;data = (unsigned long)part;</div><div class='del'>-	timer-&gt;expires = jiffies + XPC_P_DROPPED_IPI_WAIT;</div><div class='del'>-	add_timer(timer);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * With the setting of the partition setup_state to XPC_P_SETUP, we're</div><div class='del'>-	 * declaring that this partition is ready to go.</div><div class='del'>-	 */</div><div class='del'>-	part-&gt;setup_state = XPC_P_SETUP;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Setup the per partition specific variables required by the</div><div class='del'>-	 * remote partition to establish channel connections with us.</div><div class='del'>-	 *</div><div class='del'>-	 * The setting of the magic # indicates that these per partition</div><div class='del'>-	 * specific variables are ready to be used.</div><div class='del'>-	 */</div><div class='del'>-	xpc_vars_part[partid].GPs_pa = __pa(part-&gt;local_GPs);</div><div class='del'>-	xpc_vars_part[partid].openclose_args_pa =</div><div class='del'>-	    __pa(part-&gt;local_openclose_args);</div><div class='del'>-	xpc_vars_part[partid].IPI_amo_pa = __pa(part-&gt;local_IPI_amo_va);</div><div class='del'>-	cpuid = raw_smp_processor_id();	/* any CPU in this partition will do */</div><div class='del'>-	xpc_vars_part[partid].IPI_nasid = cpuid_to_nasid(cpuid);</div><div class='del'>-	xpc_vars_part[partid].IPI_phys_cpuid = cpu_physical_id(cpuid);</div><div class='del'>-	xpc_vars_part[partid].nchannels = part-&gt;nchannels;</div><div class='del'>-	xpc_vars_part[partid].magic = XPC_VP_MAGIC1;</div><div class='del'>-</div><div class='del'>-	return xpSuccess;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Create a wrapper that hides the underlying mechanism for pulling a cacheline</div><div class='del'>- * (or multiple cachelines) from a remote partition.</div><div class='del'>- *</div><div class='del'>- * src must be a cacheline aligned physical address on the remote partition.</div><div class='del'>- * dst must be a cacheline aligned virtual address on this partition.</div><div class='del'>- * cnt must be an cacheline sized</div><div class='del'>- */</div><div class='del'>-static enum xp_retval</div><div class='del'>-xpc_pull_remote_cachelines(struct xpc_partition *part, void *dst,</div><div class='del'>-			   const void *src, size_t cnt)</div><div class='del'>-{</div><div class='del'>-	bte_result_t bte_ret;</div><div class='del'>-</div><div class='del'>-	DBUG_ON((u64)src != L1_CACHE_ALIGN((u64)src));</div><div class='del'>-	DBUG_ON((u64)dst != L1_CACHE_ALIGN((u64)dst));</div><div class='del'>-	DBUG_ON(cnt != L1_CACHE_ALIGN(cnt));</div><div class='del'>-</div><div class='del'>-	if (part-&gt;act_state == XPC_P_DEACTIVATING)</div><div class='del'>-		return part-&gt;reason;</div><div class='del'>-</div><div class='del'>-	bte_ret = xp_bte_copy((u64)src, (u64)dst, (u64)cnt,</div><div class='del'>-			      (BTE_NORMAL | BTE_WACQUIRE), NULL);</div><div class='del'>-	if (bte_ret == BTE_SUCCESS)</div><div class='del'>-		return xpSuccess;</div><div class='del'>-</div><div class='del'>-	dev_dbg(xpc_chan, "xp_bte_copy() from partition %d failed, ret=%d\n",</div><div class='del'>-		XPC_PARTID(part), bte_ret);</div><div class='del'>-</div><div class='del'>-	return xpc_map_bte_errors(bte_ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Pull the remote per partition specific variables from the specified</div><div class='del'>- * partition.</div><div class='del'>- */</div><div class='del'>-enum xp_retval</div><div class='del'>-xpc_pull_remote_vars_part(struct xpc_partition *part)</div><div class='del'>-{</div><div class='del'>-	u8 buffer[L1_CACHE_BYTES * 2];</div><div class='del'>-	struct xpc_vars_part *pulled_entry_cacheline =</div><div class='del'>-	    (struct xpc_vars_part *)L1_CACHE_ALIGN((u64)buffer);</div><div class='del'>-	struct xpc_vars_part *pulled_entry;</div><div class='del'>-	u64 remote_entry_cacheline_pa, remote_entry_pa;</div><div class='del'>-	short partid = XPC_PARTID(part);</div><div class='del'>-	enum xp_retval ret;</div><div class='del'>-</div><div class='del'>-	/* pull the cacheline that contains the variables we're interested in */</div><div class='del'>-</div><div class='del'>-	DBUG_ON(part-&gt;remote_vars_part_pa !=</div><div class='del'>-		L1_CACHE_ALIGN(part-&gt;remote_vars_part_pa));</div><div class='del'>-	DBUG_ON(sizeof(struct xpc_vars_part) != L1_CACHE_BYTES / 2);</div><div class='del'>-</div><div class='del'>-	remote_entry_pa = part-&gt;remote_vars_part_pa +</div><div class='del'>-	    sn_partition_id * sizeof(struct xpc_vars_part);</div><div class='del'>-</div><div class='del'>-	remote_entry_cacheline_pa = (remote_entry_pa &amp; ~(L1_CACHE_BYTES - 1));</div><div class='del'>-</div><div class='del'>-	pulled_entry = (struct xpc_vars_part *)((u64)pulled_entry_cacheline +</div><div class='del'>-						(remote_entry_pa &amp;</div><div class='del'>-						 (L1_CACHE_BYTES - 1)));</div><div class='del'>-</div><div class='del'>-	ret = xpc_pull_remote_cachelines(part, pulled_entry_cacheline,</div><div class='del'>-					 (void *)remote_entry_cacheline_pa,</div><div class='del'>-					 L1_CACHE_BYTES);</div><div class='del'>-	if (ret != xpSuccess) {</div><div class='del'>-		dev_dbg(xpc_chan, "failed to pull XPC vars_part from "</div><div class='del'>-			"partition %d, ret=%d\n", partid, ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* see if they've been set up yet */</div><div class='del'>-</div><div class='del'>-	if (pulled_entry-&gt;magic != XPC_VP_MAGIC1 &amp;&amp;</div><div class='del'>-	    pulled_entry-&gt;magic != XPC_VP_MAGIC2) {</div><div class='del'>-</div><div class='del'>-		if (pulled_entry-&gt;magic != 0) {</div><div class='del'>-			dev_dbg(xpc_chan, "partition %d's XPC vars_part for "</div><div class='del'>-				"partition %d has bad magic value (=0x%lx)\n",</div><div class='del'>-				partid, sn_partition_id, pulled_entry-&gt;magic);</div><div class='del'>-			return xpBadMagic;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* they've not been initialized yet */</div><div class='del'>-		return xpRetry;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (xpc_vars_part[partid].magic == XPC_VP_MAGIC1) {</div><div class='del'>-</div><div class='del'>-		/* validate the variables */</div><div class='del'>-</div><div class='del'>-		if (pulled_entry-&gt;GPs_pa == 0 ||</div><div class='del'>-		    pulled_entry-&gt;openclose_args_pa == 0 ||</div><div class='del'>-		    pulled_entry-&gt;IPI_amo_pa == 0) {</div><div class='del'>-</div><div class='del'>-			dev_err(xpc_chan, "partition %d's XPC vars_part for "</div><div class='del'>-				"partition %d are not valid\n", partid,</div><div class='del'>-				sn_partition_id);</div><div class='del'>-			return xpInvalidAddress;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* the variables we imported look to be valid */</div><div class='del'>-</div><div class='del'>-		part-&gt;remote_GPs_pa = pulled_entry-&gt;GPs_pa;</div><div class='del'>-		part-&gt;remote_openclose_args_pa =</div><div class='del'>-		    pulled_entry-&gt;openclose_args_pa;</div><div class='del'>-		part-&gt;remote_IPI_amo_va =</div><div class='del'>-		    (AMO_t *)__va(pulled_entry-&gt;IPI_amo_pa);</div><div class='del'>-		part-&gt;remote_IPI_nasid = pulled_entry-&gt;IPI_nasid;</div><div class='del'>-		part-&gt;remote_IPI_phys_cpuid = pulled_entry-&gt;IPI_phys_cpuid;</div><div class='del'>-</div><div class='del'>-		if (part-&gt;nchannels &gt; pulled_entry-&gt;nchannels)</div><div class='del'>-			part-&gt;nchannels = pulled_entry-&gt;nchannels;</div><div class='del'>-</div><div class='del'>-		/* let the other side know that we've pulled their variables */</div><div class='del'>-</div><div class='del'>-		xpc_vars_part[partid].magic = XPC_VP_MAGIC2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pulled_entry-&gt;magic == XPC_VP_MAGIC1)</div><div class='del'>-		return xpRetry;</div><div class='del'>-</div><div class='del'>-	return xpSuccess;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get the IPI flags and pull the openclose args and/or remote GPs as needed.</div><div class='del'>- */</div><div class='del'>-static u64</div><div class='del'>-xpc_get_IPI_flags(struct xpc_partition *part)</div><div class='del'>-{</div><div class='del'>-	unsigned long irq_flags;</div><div class='del'>-	u64 IPI_amo;</div><div class='del'>-	enum xp_retval ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * See if there are any IPI flags to be handled.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;part-&gt;IPI_lock, irq_flags);</div><div class='del'>-	IPI_amo = part-&gt;local_IPI_amo;</div><div class='del'>-	if (IPI_amo != 0)</div><div class='del'>-		part-&gt;local_IPI_amo = 0;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;part-&gt;IPI_lock, irq_flags);</div><div class='del'>-</div><div class='del'>-	if (XPC_ANY_OPENCLOSE_IPI_FLAGS_SET(IPI_amo)) {</div><div class='del'>-		ret = xpc_pull_remote_cachelines(part,</div><div class='del'>-						 part-&gt;remote_openclose_args,</div><div class='del'>-						 (void *)part-&gt;</div><div class='del'>-						 remote_openclose_args_pa,</div><div class='del'>-						 XPC_OPENCLOSE_ARGS_SIZE);</div><div class='del'>-		if (ret != xpSuccess) {</div><div class='del'>-			XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='del'>-</div><div class='del'>-			dev_dbg(xpc_chan, "failed to pull openclose args from "</div><div class='del'>-				"partition %d, ret=%d\n", XPC_PARTID(part),</div><div class='del'>-				ret);</div><div class='del'>-</div><div class='del'>-			/* don't bother processing IPIs anymore */</div><div class='del'>-			IPI_amo = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (XPC_ANY_MSG_IPI_FLAGS_SET(IPI_amo)) {</div><div class='del'>-		ret = xpc_pull_remote_cachelines(part, part-&gt;remote_GPs,</div><div class='del'>-						 (void *)part-&gt;remote_GPs_pa,</div><div class='del'>-						 XPC_GP_SIZE);</div><div class='del'>-		if (ret != xpSuccess) {</div><div class='del'>-			XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='del'>-</div><div class='del'>-			dev_dbg(xpc_chan, "failed to pull GPs from partition "</div><div class='del'>-				"%d, ret=%d\n", XPC_PARTID(part), ret);</div><div class='del'>-</div><div class='del'>-			/* don't bother processing IPIs anymore */</div><div class='del'>-			IPI_amo = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return IPI_amo;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Allocate the local message queue and the notify queue.</div><div class='del'>- */</div><div class='del'>-static enum xp_retval</div><div class='del'>-xpc_allocate_local_msgqueue(struct xpc_channel *ch)</div><div class='del'>-{</div><div class='del'>-	unsigned long irq_flags;</div><div class='del'>-	int nentries;</div><div class='del'>-	size_t nbytes;</div><div class='del'>-</div><div class='del'>-	for (nentries = ch-&gt;local_nentries; nentries &gt; 0; nentries--) {</div><div class='del'>-</div><div class='del'>-		nbytes = nentries * ch-&gt;msg_size;</div><div class='del'>-		ch-&gt;local_msgqueue = xpc_kzalloc_cacheline_aligned(nbytes,</div><div class='del'>-								   GFP_KERNEL,</div><div class='del'>-						      &amp;ch-&gt;local_msgqueue_base);</div><div class='del'>-		if (ch-&gt;local_msgqueue == NULL)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		nbytes = nentries * sizeof(struct xpc_notify);</div><div class='del'>-		ch-&gt;notify_queue = kzalloc(nbytes, GFP_KERNEL);</div><div class='del'>-		if (ch-&gt;notify_queue == NULL) {</div><div class='del'>-			kfree(ch-&gt;local_msgqueue_base);</div><div class='del'>-			ch-&gt;local_msgqueue = NULL;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;ch-&gt;lock, irq_flags);</div><div class='del'>-		if (nentries &lt; ch-&gt;local_nentries) {</div><div class='del'>-			dev_dbg(xpc_chan, "nentries=%d local_nentries=%d, "</div><div class='del'>-				"partid=%d, channel=%d\n", nentries,</div><div class='del'>-				ch-&gt;local_nentries, ch-&gt;partid, ch-&gt;number);</div><div class='del'>-</div><div class='del'>-			ch-&gt;local_nentries = nentries;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='del'>-		return xpSuccess;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_dbg(xpc_chan, "can't get memory for local message queue and notify "</div><div class='del'>-		"queue, partid=%d, channel=%d\n", ch-&gt;partid, ch-&gt;number);</div><div class='del'>-	return xpNoMemory;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Allocate the cached remote message queue.</div><div class='del'>- */</div><div class='del'>-static enum xp_retval</div><div class='del'>-xpc_allocate_remote_msgqueue(struct xpc_channel *ch)</div><div class='del'>-{</div><div class='del'>-	unsigned long irq_flags;</div><div class='del'>-	int nentries;</div><div class='del'>-	size_t nbytes;</div><div class='del'>-</div><div class='del'>-	DBUG_ON(ch-&gt;remote_nentries &lt;= 0);</div><div class='del'>-</div><div class='del'>-	for (nentries = ch-&gt;remote_nentries; nentries &gt; 0; nentries--) {</div><div class='del'>-</div><div class='del'>-		nbytes = nentries * ch-&gt;msg_size;</div><div class='del'>-		ch-&gt;remote_msgqueue = xpc_kzalloc_cacheline_aligned(nbytes,</div><div class='del'>-								    GFP_KERNEL,</div><div class='del'>-						     &amp;ch-&gt;remote_msgqueue_base);</div><div class='del'>-		if (ch-&gt;remote_msgqueue == NULL)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;ch-&gt;lock, irq_flags);</div><div class='del'>-		if (nentries &lt; ch-&gt;remote_nentries) {</div><div class='del'>-			dev_dbg(xpc_chan, "nentries=%d remote_nentries=%d, "</div><div class='del'>-				"partid=%d, channel=%d\n", nentries,</div><div class='del'>-				ch-&gt;remote_nentries, ch-&gt;partid, ch-&gt;number);</div><div class='del'>-</div><div class='del'>-			ch-&gt;remote_nentries = nentries;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='del'>-		return xpSuccess;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_dbg(xpc_chan, "can't get memory for cached remote message queue, "</div><div class='del'>-		"partid=%d, channel=%d\n", ch-&gt;partid, ch-&gt;number);</div><div class='del'>-	return xpNoMemory;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Allocate message queues and other stuff associated with a channel.</div><div class='del'>- *</div><div class='del'>- * Note: Assumes all of the channel sizes are filled in.</div><div class='del'>- */</div><div class='del'>-static enum xp_retval</div><div class='del'>-xpc_allocate_msgqueues(struct xpc_channel *ch)</div><div class='del'>-{</div><div class='del'>-	unsigned long irq_flags;</div><div class='del'>-	enum xp_retval ret;</div><div class='del'>-</div><div class='del'>-	DBUG_ON(ch-&gt;flags &amp; XPC_C_SETUP);</div><div class='del'>-</div><div class='del'>-	ret = xpc_allocate_local_msgqueue(ch);</div><div class='del'>-	if (ret != xpSuccess)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = xpc_allocate_remote_msgqueue(ch);</div><div class='del'>-	if (ret != xpSuccess) {</div><div class='del'>-		kfree(ch-&gt;local_msgqueue_base);</div><div class='del'>-		ch-&gt;local_msgqueue = NULL;</div><div class='del'>-		kfree(ch-&gt;notify_queue);</div><div class='del'>-		ch-&gt;notify_queue = NULL;</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;ch-&gt;lock, irq_flags);</div><div class='del'>-	ch-&gt;flags |= XPC_C_SETUP;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='del'>-</div><div class='del'>-	return xpSuccess;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Process a connect message from a remote partition.</div><div class='ctx'>  *</div><div class='ctx'>  * Note: xpc_process_connect() is expecting to be called with the</div><div class='hunk'>@@ -565,30 +39,29 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='ctx'> </div><div class='ctx'> 	if (!(ch-&gt;flags &amp; XPC_C_SETUP)) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ch-&gt;lock, *irq_flags);</div><div class='del'>-		ret = xpc_allocate_msgqueues(ch);</div><div class='add'>+		ret = xpc_setup_msg_structures(ch);</div><div class='ctx'> 		spin_lock_irqsave(&amp;ch-&gt;lock, *irq_flags);</div><div class='ctx'> </div><div class='ctx'> 		if (ret != xpSuccess)</div><div class='ctx'> 			XPC_DISCONNECT_CHANNEL(ch, ret, irq_flags);</div><div class='ctx'> </div><div class='add'>+		ch-&gt;flags |= XPC_C_SETUP;</div><div class='add'>+</div><div class='ctx'> 		if (ch-&gt;flags &amp; (XPC_C_CONNECTED | XPC_C_DISCONNECTING))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-		DBUG_ON(!(ch-&gt;flags &amp; XPC_C_SETUP));</div><div class='ctx'> 		DBUG_ON(ch-&gt;local_msgqueue == NULL);</div><div class='ctx'> 		DBUG_ON(ch-&gt;remote_msgqueue == NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(ch-&gt;flags &amp; XPC_C_OPENREPLY)) {</div><div class='ctx'> 		ch-&gt;flags |= XPC_C_OPENREPLY;</div><div class='del'>-		xpc_IPI_send_openreply(ch, irq_flags);</div><div class='add'>+		xpc_send_chctl_openreply(ch, irq_flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(ch-&gt;flags &amp; XPC_C_ROPENREPLY))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	DBUG_ON(ch-&gt;remote_msgqueue_pa == 0);</div><div class='del'>-</div><div class='ctx'> 	ch-&gt;flags = (XPC_C_CONNECTED | XPC_C_SETUP);	/* clear all else */</div><div class='ctx'> </div><div class='ctx'> 	dev_info(xpc_chan, "channel %d to partition %d connected\n",</div><div class='hunk'>@@ -600,99 +73,6 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Notify those who wanted to be notified upon delivery of their message.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-xpc_notify_senders(struct xpc_channel *ch, enum xp_retval reason, s64 put)</div><div class='del'>-{</div><div class='del'>-	struct xpc_notify *notify;</div><div class='del'>-	u8 notify_type;</div><div class='del'>-	s64 get = ch-&gt;w_remote_GP.get - 1;</div><div class='del'>-</div><div class='del'>-	while (++get &lt; put &amp;&amp; atomic_read(&amp;ch-&gt;n_to_notify) &gt; 0) {</div><div class='del'>-</div><div class='del'>-		notify = &amp;ch-&gt;notify_queue[get % ch-&gt;local_nentries];</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * See if the notify entry indicates it was associated with</div><div class='del'>-		 * a message who's sender wants to be notified. It is possible</div><div class='del'>-		 * that it is, but someone else is doing or has done the</div><div class='del'>-		 * notification.</div><div class='del'>-		 */</div><div class='del'>-		notify_type = notify-&gt;type;</div><div class='del'>-		if (notify_type == 0 ||</div><div class='del'>-		    cmpxchg(&amp;notify-&gt;type, notify_type, 0) != notify_type) {</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		DBUG_ON(notify_type != XPC_N_CALL);</div><div class='del'>-</div><div class='del'>-		atomic_dec(&amp;ch-&gt;n_to_notify);</div><div class='del'>-</div><div class='del'>-		if (notify-&gt;func != NULL) {</div><div class='del'>-			dev_dbg(xpc_chan, "notify-&gt;func() called, notify=0x%p, "</div><div class='del'>-				"msg_number=%ld, partid=%d, channel=%d\n",</div><div class='del'>-				(void *)notify, get, ch-&gt;partid, ch-&gt;number);</div><div class='del'>-</div><div class='del'>-			notify-&gt;func(reason, ch-&gt;partid, ch-&gt;number,</div><div class='del'>-				     notify-&gt;key);</div><div class='del'>-</div><div class='del'>-			dev_dbg(xpc_chan, "notify-&gt;func() returned, "</div><div class='del'>-				"notify=0x%p, msg_number=%ld, partid=%d, "</div><div class='del'>-				"channel=%d\n", (void *)notify, get,</div><div class='del'>-				ch-&gt;partid, ch-&gt;number);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Free up message queues and other stuff that were allocated for the specified</div><div class='del'>- * channel.</div><div class='del'>- *</div><div class='del'>- * Note: ch-&gt;reason and ch-&gt;reason_line are left set for debugging purposes,</div><div class='del'>- * they're cleared when XPC_C_DISCONNECTED is cleared.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-xpc_free_msgqueues(struct xpc_channel *ch)</div><div class='del'>-{</div><div class='del'>-	DBUG_ON(!spin_is_locked(&amp;ch-&gt;lock));</div><div class='del'>-	DBUG_ON(atomic_read(&amp;ch-&gt;n_to_notify) != 0);</div><div class='del'>-</div><div class='del'>-	ch-&gt;remote_msgqueue_pa = 0;</div><div class='del'>-	ch-&gt;func = NULL;</div><div class='del'>-	ch-&gt;key = NULL;</div><div class='del'>-	ch-&gt;msg_size = 0;</div><div class='del'>-	ch-&gt;local_nentries = 0;</div><div class='del'>-	ch-&gt;remote_nentries = 0;</div><div class='del'>-	ch-&gt;kthreads_assigned_limit = 0;</div><div class='del'>-	ch-&gt;kthreads_idle_limit = 0;</div><div class='del'>-</div><div class='del'>-	ch-&gt;local_GP-&gt;get = 0;</div><div class='del'>-	ch-&gt;local_GP-&gt;put = 0;</div><div class='del'>-	ch-&gt;remote_GP.get = 0;</div><div class='del'>-	ch-&gt;remote_GP.put = 0;</div><div class='del'>-	ch-&gt;w_local_GP.get = 0;</div><div class='del'>-	ch-&gt;w_local_GP.put = 0;</div><div class='del'>-	ch-&gt;w_remote_GP.get = 0;</div><div class='del'>-	ch-&gt;w_remote_GP.put = 0;</div><div class='del'>-	ch-&gt;next_msg_to_pull = 0;</div><div class='del'>-</div><div class='del'>-	if (ch-&gt;flags &amp; XPC_C_SETUP) {</div><div class='del'>-		ch-&gt;flags &amp;= ~XPC_C_SETUP;</div><div class='del'>-</div><div class='del'>-		dev_dbg(xpc_chan, "ch-&gt;flags=0x%x, partid=%d, channel=%d\n",</div><div class='del'>-			ch-&gt;flags, ch-&gt;partid, ch-&gt;number);</div><div class='del'>-</div><div class='del'>-		kfree(ch-&gt;local_msgqueue_base);</div><div class='del'>-		ch-&gt;local_msgqueue = NULL;</div><div class='del'>-		kfree(ch-&gt;remote_msgqueue_base);</div><div class='del'>-		ch-&gt;remote_msgqueue = NULL;</div><div class='del'>-		kfree(ch-&gt;notify_queue);</div><div class='del'>-		ch-&gt;notify_queue = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * spin_lock_irqsave() is expected to be held on entry.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='hunk'>@@ -717,9 +97,9 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='ctx'> 	DBUG_ON((ch-&gt;flags &amp; XPC_C_CONNECTEDCALLOUT_MADE) &amp;&amp;</div><div class='ctx'> 		!(ch-&gt;flags &amp; XPC_C_DISCONNECTINGCALLOUT_MADE));</div><div class='ctx'> </div><div class='del'>-	if (part-&gt;act_state == XPC_P_DEACTIVATING) {</div><div class='add'>+	if (part-&gt;act_state == XPC_P_AS_DEACTIVATING) {</div><div class='ctx'> 		/* can't proceed until the other side disengages from us */</div><div class='del'>-		if (xpc_partition_engaged(1UL &lt;&lt; ch-&gt;partid))</div><div class='add'>+		if (xpc_partition_engaged(ch-&gt;partid))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -731,7 +111,7 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='ctx'> </div><div class='ctx'> 		if (!(ch-&gt;flags &amp; XPC_C_CLOSEREPLY)) {</div><div class='ctx'> 			ch-&gt;flags |= XPC_C_CLOSEREPLY;</div><div class='del'>-			xpc_IPI_send_closereply(ch, irq_flags);</div><div class='add'>+			xpc_send_chctl_closereply(ch, irq_flags);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!(ch-&gt;flags &amp; XPC_C_RCLOSEREPLY))</div><div class='hunk'>@@ -740,8 +120,8 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='ctx'> </div><div class='ctx'> 	/* wake those waiting for notify completion */</div><div class='ctx'> 	if (atomic_read(&amp;ch-&gt;n_to_notify) &gt; 0) {</div><div class='del'>-		/* &gt;&gt;&gt; we do callout while holding ch-&gt;lock */</div><div class='del'>-		xpc_notify_senders(ch, ch-&gt;reason, ch-&gt;w_local_GP.put);</div><div class='add'>+		/* we do callout while holding ch-&gt;lock, callout can't block */</div><div class='add'>+		xpc_notify_senders_of_disconnect(ch);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* both sides are disconnected now */</div><div class='hunk'>@@ -752,10 +132,24 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='ctx'> 		spin_lock_irqsave(&amp;ch-&gt;lock, *irq_flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	DBUG_ON(atomic_read(&amp;ch-&gt;n_to_notify) != 0);</div><div class='add'>+</div><div class='ctx'> 	/* it's now safe to free the channel's message queues */</div><div class='del'>-	xpc_free_msgqueues(ch);</div><div class='add'>+	xpc_teardown_msg_structures(ch);</div><div class='ctx'> </div><div class='del'>-	/* mark disconnected, clear all other flags except XPC_C_WDISCONNECT */</div><div class='add'>+	ch-&gt;func = NULL;</div><div class='add'>+	ch-&gt;key = NULL;</div><div class='add'>+	ch-&gt;entry_size = 0;</div><div class='add'>+	ch-&gt;local_nentries = 0;</div><div class='add'>+	ch-&gt;remote_nentries = 0;</div><div class='add'>+	ch-&gt;kthreads_assigned_limit = 0;</div><div class='add'>+	ch-&gt;kthreads_idle_limit = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Mark the channel disconnected and clear all other flags, including</div><div class='add'>+	 * XPC_C_SETUP (because of call to xpc_teardown_msg_structures()) but</div><div class='add'>+	 * not including XPC_C_WDISCONNECT (if it was set).</div><div class='add'>+	 */</div><div class='ctx'> 	ch-&gt;flags = (XPC_C_DISCONNECTED | (ch-&gt;flags &amp; XPC_C_WDISCONNECT));</div><div class='ctx'> </div><div class='ctx'> 	atomic_dec(&amp;part-&gt;nchannels_active);</div><div class='hunk'>@@ -768,15 +162,15 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='ctx'> 	if (ch-&gt;flags &amp; XPC_C_WDISCONNECT) {</div><div class='ctx'> 		/* we won't lose the CPU since we're holding ch-&gt;lock */</div><div class='ctx'> 		complete(&amp;ch-&gt;wdisconnect_wait);</div><div class='del'>-	} else if (ch-&gt;delayed_IPI_flags) {</div><div class='del'>-		if (part-&gt;act_state != XPC_P_DEACTIVATING) {</div><div class='del'>-			/* time to take action on any delayed IPI flags */</div><div class='del'>-			spin_lock(&amp;part-&gt;IPI_lock);</div><div class='del'>-			XPC_SET_IPI_FLAGS(part-&gt;local_IPI_amo, ch-&gt;number,</div><div class='del'>-					  ch-&gt;delayed_IPI_flags);</div><div class='del'>-			spin_unlock(&amp;part-&gt;IPI_lock);</div><div class='add'>+	} else if (ch-&gt;delayed_chctl_flags) {</div><div class='add'>+		if (part-&gt;act_state != XPC_P_AS_DEACTIVATING) {</div><div class='add'>+			/* time to take action on any delayed chctl flags */</div><div class='add'>+			spin_lock(&amp;part-&gt;chctl_lock);</div><div class='add'>+			part-&gt;chctl.flags[ch-&gt;number] |=</div><div class='add'>+			    ch-&gt;delayed_chctl_flags;</div><div class='add'>+			spin_unlock(&amp;part-&gt;chctl_lock);</div><div class='ctx'> 		}</div><div class='del'>-		ch-&gt;delayed_IPI_flags = 0;</div><div class='add'>+		ch-&gt;delayed_chctl_flags = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -784,8 +178,8 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='ctx'>  * Process a change in the channel's remote connection state.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number,</div><div class='del'>-			  u8 IPI_flags)</div><div class='add'>+xpc_process_openclose_chctl_flags(struct xpc_partition *part, int ch_number,</div><div class='add'>+				  u8 chctl_flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='ctx'> 	struct xpc_openclose_args *args =</div><div class='hunk'>@@ -800,24 +194,24 @@ again:</div><div class='ctx'> 	if ((ch-&gt;flags &amp; XPC_C_DISCONNECTED) &amp;&amp;</div><div class='ctx'> 	    (ch-&gt;flags &amp; XPC_C_WDISCONNECT)) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Delay processing IPI flags until thread waiting disconnect</div><div class='add'>+		 * Delay processing chctl flags until thread waiting disconnect</div><div class='ctx'> 		 * has had a chance to see that the channel is disconnected.</div><div class='ctx'> 		 */</div><div class='del'>-		ch-&gt;delayed_IPI_flags |= IPI_flags;</div><div class='add'>+		ch-&gt;delayed_chctl_flags |= chctl_flags;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IPI_flags &amp; XPC_IPI_CLOSEREQUEST) {</div><div class='add'>+	if (chctl_flags &amp; XPC_CHCTL_CLOSEREQUEST) {</div><div class='ctx'> </div><div class='del'>-		dev_dbg(xpc_chan, "XPC_IPI_CLOSEREQUEST (reason=%d) received "</div><div class='add'>+		dev_dbg(xpc_chan, "XPC_CHCTL_CLOSEREQUEST (reason=%d) received "</div><div class='ctx'> 			"from partid=%d, channel=%d\n", args-&gt;reason,</div><div class='ctx'> 			ch-&gt;partid, ch-&gt;number);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If RCLOSEREQUEST is set, we're probably waiting for</div><div class='ctx'> 		 * RCLOSEREPLY. We should find it and a ROPENREQUEST packed</div><div class='del'>-		 * with this RCLOSEREQUEST in the IPI_flags.</div><div class='add'>+		 * with this RCLOSEREQUEST in the chctl_flags.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		if (ch-&gt;flags &amp; XPC_C_RCLOSEREQUEST) {</div><div class='hunk'>@@ -826,8 +220,8 @@ again:</div><div class='ctx'> 			DBUG_ON(!(ch-&gt;flags &amp; XPC_C_CLOSEREPLY));</div><div class='ctx'> 			DBUG_ON(ch-&gt;flags &amp; XPC_C_RCLOSEREPLY);</div><div class='ctx'> </div><div class='del'>-			DBUG_ON(!(IPI_flags &amp; XPC_IPI_CLOSEREPLY));</div><div class='del'>-			IPI_flags &amp;= ~XPC_IPI_CLOSEREPLY;</div><div class='add'>+			DBUG_ON(!(chctl_flags &amp; XPC_CHCTL_CLOSEREPLY));</div><div class='add'>+			chctl_flags &amp;= ~XPC_CHCTL_CLOSEREPLY;</div><div class='ctx'> 			ch-&gt;flags |= XPC_C_RCLOSEREPLY;</div><div class='ctx'> </div><div class='ctx'> 			/* both sides have finished disconnecting */</div><div class='hunk'>@@ -837,17 +231,15 @@ again:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ch-&gt;flags &amp; XPC_C_DISCONNECTED) {</div><div class='del'>-			if (!(IPI_flags &amp; XPC_IPI_OPENREQUEST)) {</div><div class='del'>-				if ((XPC_GET_IPI_FLAGS(part-&gt;local_IPI_amo,</div><div class='del'>-						       ch_number) &amp;</div><div class='del'>-				     XPC_IPI_OPENREQUEST)) {</div><div class='del'>-</div><div class='del'>-					DBUG_ON(ch-&gt;delayed_IPI_flags != 0);</div><div class='del'>-					spin_lock(&amp;part-&gt;IPI_lock);</div><div class='del'>-					XPC_SET_IPI_FLAGS(part-&gt;local_IPI_amo,</div><div class='del'>-							  ch_number,</div><div class='del'>-							  XPC_IPI_CLOSEREQUEST);</div><div class='del'>-					spin_unlock(&amp;part-&gt;IPI_lock);</div><div class='add'>+			if (!(chctl_flags &amp; XPC_CHCTL_OPENREQUEST)) {</div><div class='add'>+				if (part-&gt;chctl.flags[ch_number] &amp;</div><div class='add'>+				    XPC_CHCTL_OPENREQUEST) {</div><div class='add'>+</div><div class='add'>+					DBUG_ON(ch-&gt;delayed_chctl_flags != 0);</div><div class='add'>+					spin_lock(&amp;part-&gt;chctl_lock);</div><div class='add'>+					part-&gt;chctl.flags[ch_number] |=</div><div class='add'>+					    XPC_CHCTL_CLOSEREQUEST;</div><div class='add'>+					spin_unlock(&amp;part-&gt;chctl_lock);</div><div class='ctx'> 				}</div><div class='ctx'> 				spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='ctx'> 				return;</div><div class='hunk'>@@ -860,7 +252,7 @@ again:</div><div class='ctx'> 			ch-&gt;flags |= (XPC_C_CONNECTING | XPC_C_ROPENREQUEST);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		IPI_flags &amp;= ~(XPC_IPI_OPENREQUEST | XPC_IPI_OPENREPLY);</div><div class='add'>+		chctl_flags &amp;= ~(XPC_CHCTL_OPENREQUEST | XPC_CHCTL_OPENREPLY);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The meaningful CLOSEREQUEST connection state fields are:</div><div class='hunk'>@@ -878,7 +270,7 @@ again:</div><div class='ctx'> </div><div class='ctx'> 			XPC_DISCONNECT_CHANNEL(ch, reason, &amp;irq_flags);</div><div class='ctx'> </div><div class='del'>-			DBUG_ON(IPI_flags &amp; XPC_IPI_CLOSEREPLY);</div><div class='add'>+			DBUG_ON(chctl_flags &amp; XPC_CHCTL_CLOSEREPLY);</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -886,13 +278,13 @@ again:</div><div class='ctx'> 		xpc_process_disconnect(ch, &amp;irq_flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IPI_flags &amp; XPC_IPI_CLOSEREPLY) {</div><div class='add'>+	if (chctl_flags &amp; XPC_CHCTL_CLOSEREPLY) {</div><div class='ctx'> </div><div class='del'>-		dev_dbg(xpc_chan, "XPC_IPI_CLOSEREPLY received from partid=%d,"</div><div class='del'>-			" channel=%d\n", ch-&gt;partid, ch-&gt;number);</div><div class='add'>+		dev_dbg(xpc_chan, "XPC_CHCTL_CLOSEREPLY received from partid="</div><div class='add'>+			"%d, channel=%d\n", ch-&gt;partid, ch-&gt;number);</div><div class='ctx'> </div><div class='ctx'> 		if (ch-&gt;flags &amp; XPC_C_DISCONNECTED) {</div><div class='del'>-			DBUG_ON(part-&gt;act_state != XPC_P_DEACTIVATING);</div><div class='add'>+			DBUG_ON(part-&gt;act_state != XPC_P_AS_DEACTIVATING);</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -900,15 +292,14 @@ again:</div><div class='ctx'> 		DBUG_ON(!(ch-&gt;flags &amp; XPC_C_CLOSEREQUEST));</div><div class='ctx'> </div><div class='ctx'> 		if (!(ch-&gt;flags &amp; XPC_C_RCLOSEREQUEST)) {</div><div class='del'>-			if ((XPC_GET_IPI_FLAGS(part-&gt;local_IPI_amo, ch_number)</div><div class='del'>-			     &amp; XPC_IPI_CLOSEREQUEST)) {</div><div class='del'>-</div><div class='del'>-				DBUG_ON(ch-&gt;delayed_IPI_flags != 0);</div><div class='del'>-				spin_lock(&amp;part-&gt;IPI_lock);</div><div class='del'>-				XPC_SET_IPI_FLAGS(part-&gt;local_IPI_amo,</div><div class='del'>-						  ch_number,</div><div class='del'>-						  XPC_IPI_CLOSEREPLY);</div><div class='del'>-				spin_unlock(&amp;part-&gt;IPI_lock);</div><div class='add'>+			if (part-&gt;chctl.flags[ch_number] &amp;</div><div class='add'>+			    XPC_CHCTL_CLOSEREQUEST) {</div><div class='add'>+</div><div class='add'>+				DBUG_ON(ch-&gt;delayed_chctl_flags != 0);</div><div class='add'>+				spin_lock(&amp;part-&gt;chctl_lock);</div><div class='add'>+				part-&gt;chctl.flags[ch_number] |=</div><div class='add'>+				    XPC_CHCTL_CLOSEREPLY;</div><div class='add'>+				spin_unlock(&amp;part-&gt;chctl_lock);</div><div class='ctx'> 			}</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -922,21 +313,21 @@ again:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IPI_flags &amp; XPC_IPI_OPENREQUEST) {</div><div class='add'>+	if (chctl_flags &amp; XPC_CHCTL_OPENREQUEST) {</div><div class='ctx'> </div><div class='del'>-		dev_dbg(xpc_chan, "XPC_IPI_OPENREQUEST (msg_size=%d, "</div><div class='add'>+		dev_dbg(xpc_chan, "XPC_CHCTL_OPENREQUEST (entry_size=%d, "</div><div class='ctx'> 			"local_nentries=%d) received from partid=%d, "</div><div class='del'>-			"channel=%d\n", args-&gt;msg_size, args-&gt;local_nentries,</div><div class='add'>+			"channel=%d\n", args-&gt;entry_size, args-&gt;local_nentries,</div><div class='ctx'> 			ch-&gt;partid, ch-&gt;number);</div><div class='ctx'> </div><div class='del'>-		if (part-&gt;act_state == XPC_P_DEACTIVATING ||</div><div class='add'>+		if (part-&gt;act_state == XPC_P_AS_DEACTIVATING ||</div><div class='ctx'> 		    (ch-&gt;flags &amp; XPC_C_ROPENREQUEST)) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ch-&gt;flags &amp; (XPC_C_DISCONNECTING | XPC_C_WDISCONNECT)) {</div><div class='del'>-			ch-&gt;delayed_IPI_flags |= XPC_IPI_OPENREQUEST;</div><div class='add'>+			ch-&gt;delayed_chctl_flags |= XPC_CHCTL_OPENREQUEST;</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -947,10 +338,10 @@ again:</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The meaningful OPENREQUEST connection state fields are:</div><div class='del'>-		 *      msg_size = size of channel's messages in bytes</div><div class='add'>+		 *      entry_size = size of channel's messages in bytes</div><div class='ctx'> 		 *      local_nentries = remote partition's local_nentries</div><div class='ctx'> 		 */</div><div class='del'>-		if (args-&gt;msg_size == 0 || args-&gt;local_nentries == 0) {</div><div class='add'>+		if (args-&gt;entry_size == 0 || args-&gt;local_nentries == 0) {</div><div class='ctx'> 			/* assume OPENREQUEST was delayed by mistake */</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -960,14 +351,14 @@ again:</div><div class='ctx'> 		ch-&gt;remote_nentries = args-&gt;local_nentries;</div><div class='ctx'> </div><div class='ctx'> 		if (ch-&gt;flags &amp; XPC_C_OPENREQUEST) {</div><div class='del'>-			if (args-&gt;msg_size != ch-&gt;msg_size) {</div><div class='add'>+			if (args-&gt;entry_size != ch-&gt;entry_size) {</div><div class='ctx'> 				XPC_DISCONNECT_CHANNEL(ch, xpUnequalMsgSizes,</div><div class='ctx'> 						       &amp;irq_flags);</div><div class='ctx'> 				spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			ch-&gt;msg_size = args-&gt;msg_size;</div><div class='add'>+			ch-&gt;entry_size = args-&gt;entry_size;</div><div class='ctx'> </div><div class='ctx'> 			XPC_SET_REASON(ch, 0, 0);</div><div class='ctx'> 			ch-&gt;flags &amp;= ~XPC_C_DISCONNECTED;</div><div class='hunk'>@@ -978,13 +369,13 @@ again:</div><div class='ctx'> 		xpc_process_connect(ch, &amp;irq_flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IPI_flags &amp; XPC_IPI_OPENREPLY) {</div><div class='add'>+	if (chctl_flags &amp; XPC_CHCTL_OPENREPLY) {</div><div class='ctx'> </div><div class='del'>-		dev_dbg(xpc_chan, "XPC_IPI_OPENREPLY (local_msgqueue_pa=0x%lx, "</div><div class='del'>-			"local_nentries=%d, remote_nentries=%d) received from "</div><div class='del'>-			"partid=%d, channel=%d\n", args-&gt;local_msgqueue_pa,</div><div class='del'>-			args-&gt;local_nentries, args-&gt;remote_nentries,</div><div class='del'>-			ch-&gt;partid, ch-&gt;number);</div><div class='add'>+		dev_dbg(xpc_chan, "XPC_CHCTL_OPENREPLY (local_msgqueue_pa="</div><div class='add'>+			"0x%lx, local_nentries=%d, remote_nentries=%d) "</div><div class='add'>+			"received from partid=%d, channel=%d\n",</div><div class='add'>+			args-&gt;local_msgqueue_pa, args-&gt;local_nentries,</div><div class='add'>+			args-&gt;remote_nentries, ch-&gt;partid, ch-&gt;number);</div><div class='ctx'> </div><div class='ctx'> 		if (ch-&gt;flags &amp; (XPC_C_DISCONNECTING | XPC_C_DISCONNECTED)) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='hunk'>@@ -1012,10 +403,10 @@ again:</div><div class='ctx'> 		DBUG_ON(args-&gt;remote_nentries == 0);</div><div class='ctx'> </div><div class='ctx'> 		ch-&gt;flags |= XPC_C_ROPENREPLY;</div><div class='del'>-		ch-&gt;remote_msgqueue_pa = args-&gt;local_msgqueue_pa;</div><div class='add'>+		xpc_save_remote_msgqueue_pa(ch, args-&gt;local_msgqueue_pa);</div><div class='ctx'> </div><div class='ctx'> 		if (args-&gt;local_nentries &lt; ch-&gt;remote_nentries) {</div><div class='del'>-			dev_dbg(xpc_chan, "XPC_IPI_OPENREPLY: new "</div><div class='add'>+			dev_dbg(xpc_chan, "XPC_CHCTL_OPENREPLY: new "</div><div class='ctx'> 				"remote_nentries=%d, old remote_nentries=%d, "</div><div class='ctx'> 				"partid=%d, channel=%d\n",</div><div class='ctx'> 				args-&gt;local_nentries, ch-&gt;remote_nentries,</div><div class='hunk'>@@ -1024,7 +415,7 @@ again:</div><div class='ctx'> 			ch-&gt;remote_nentries = args-&gt;local_nentries;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (args-&gt;remote_nentries &lt; ch-&gt;local_nentries) {</div><div class='del'>-			dev_dbg(xpc_chan, "XPC_IPI_OPENREPLY: new "</div><div class='add'>+			dev_dbg(xpc_chan, "XPC_CHCTL_OPENREPLY: new "</div><div class='ctx'> 				"local_nentries=%d, old local_nentries=%d, "</div><div class='ctx'> 				"partid=%d, channel=%d\n",</div><div class='ctx'> 				args-&gt;remote_nentries, ch-&gt;local_nentries,</div><div class='hunk'>@@ -1082,7 +473,7 @@ xpc_connect_channel(struct xpc_channel *ch)</div><div class='ctx'> 	ch-&gt;local_nentries = registration-&gt;nentries;</div><div class='ctx'> </div><div class='ctx'> 	if (ch-&gt;flags &amp; XPC_C_ROPENREQUEST) {</div><div class='del'>-		if (registration-&gt;msg_size != ch-&gt;msg_size) {</div><div class='add'>+		if (registration-&gt;entry_size != ch-&gt;entry_size) {</div><div class='ctx'> 			/* the local and remote sides aren't the same */</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='hunk'>@@ -1101,7 +492,7 @@ xpc_connect_channel(struct xpc_channel *ch)</div><div class='ctx'> 			return xpUnequalMsgSizes;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		ch-&gt;msg_size = registration-&gt;msg_size;</div><div class='add'>+		ch-&gt;entry_size = registration-&gt;entry_size;</div><div class='ctx'> </div><div class='ctx'> 		XPC_SET_REASON(ch, 0, 0);</div><div class='ctx'> 		ch-&gt;flags &amp;= ~XPC_C_DISCONNECTED;</div><div class='hunk'>@@ -1114,7 +505,7 @@ xpc_connect_channel(struct xpc_channel *ch)</div><div class='ctx'> 	/* initiate the connection */</div><div class='ctx'> </div><div class='ctx'> 	ch-&gt;flags |= (XPC_C_OPENREQUEST | XPC_C_CONNECTING);</div><div class='del'>-	xpc_IPI_send_openrequest(ch, &amp;irq_flags);</div><div class='add'>+	xpc_send_chctl_openrequest(ch, &amp;irq_flags);</div><div class='ctx'> </div><div class='ctx'> 	xpc_process_connect(ch, &amp;irq_flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1123,152 +514,16 @@ xpc_connect_channel(struct xpc_channel *ch)</div><div class='ctx'> 	return xpSuccess;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Clear some of the msg flags in the local message queue.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-xpc_clear_local_msgqueue_flags(struct xpc_channel *ch)</div><div class='del'>-{</div><div class='del'>-	struct xpc_msg *msg;</div><div class='del'>-	s64 get;</div><div class='del'>-</div><div class='del'>-	get = ch-&gt;w_remote_GP.get;</div><div class='del'>-	do {</div><div class='del'>-		msg = (struct xpc_msg *)((u64)ch-&gt;local_msgqueue +</div><div class='del'>-					 (get % ch-&gt;local_nentries) *</div><div class='del'>-					 ch-&gt;msg_size);</div><div class='del'>-		msg-&gt;flags = 0;</div><div class='del'>-	} while (++get &lt; ch-&gt;remote_GP.get);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Clear some of the msg flags in the remote message queue.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-xpc_clear_remote_msgqueue_flags(struct xpc_channel *ch)</div><div class='del'>-{</div><div class='del'>-	struct xpc_msg *msg;</div><div class='del'>-	s64 put;</div><div class='del'>-</div><div class='del'>-	put = ch-&gt;w_remote_GP.put;</div><div class='del'>-	do {</div><div class='del'>-		msg = (struct xpc_msg *)((u64)ch-&gt;remote_msgqueue +</div><div class='del'>-					 (put % ch-&gt;remote_nentries) *</div><div class='del'>-					 ch-&gt;msg_size);</div><div class='del'>-		msg-&gt;flags = 0;</div><div class='del'>-	} while (++put &lt; ch-&gt;remote_GP.put);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-xpc_process_msg_IPI(struct xpc_partition *part, int ch_number)</div><div class='del'>-{</div><div class='del'>-	struct xpc_channel *ch = &amp;part-&gt;channels[ch_number];</div><div class='del'>-	int nmsgs_sent;</div><div class='del'>-</div><div class='del'>-	ch-&gt;remote_GP = part-&gt;remote_GPs[ch_number];</div><div class='del'>-</div><div class='del'>-	/* See what, if anything, has changed for each connected channel */</div><div class='del'>-</div><div class='del'>-	xpc_msgqueue_ref(ch);</div><div class='del'>-</div><div class='del'>-	if (ch-&gt;w_remote_GP.get == ch-&gt;remote_GP.get &amp;&amp;</div><div class='del'>-	    ch-&gt;w_remote_GP.put == ch-&gt;remote_GP.put) {</div><div class='del'>-		/* nothing changed since GPs were last pulled */</div><div class='del'>-		xpc_msgqueue_deref(ch);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(ch-&gt;flags &amp; XPC_C_CONNECTED)) {</div><div class='del'>-		xpc_msgqueue_deref(ch);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * First check to see if messages recently sent by us have been</div><div class='del'>-	 * received by the other side. (The remote GET value will have</div><div class='del'>-	 * changed since we last looked at it.)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (ch-&gt;w_remote_GP.get != ch-&gt;remote_GP.get) {</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We need to notify any senders that want to be notified</div><div class='del'>-		 * that their sent messages have been received by their</div><div class='del'>-		 * intended recipients. We need to do this before updating</div><div class='del'>-		 * w_remote_GP.get so that we don't allocate the same message</div><div class='del'>-		 * queue entries prematurely (see xpc_allocate_msg()).</div><div class='del'>-		 */</div><div class='del'>-		if (atomic_read(&amp;ch-&gt;n_to_notify) &gt; 0) {</div><div class='del'>-			/*</div><div class='del'>-			 * Notify senders that messages sent have been</div><div class='del'>-			 * received and delivered by the other side.</div><div class='del'>-			 */</div><div class='del'>-			xpc_notify_senders(ch, xpMsgDelivered,</div><div class='del'>-					   ch-&gt;remote_GP.get);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Clear msg-&gt;flags in previously sent messages, so that</div><div class='del'>-		 * they're ready for xpc_allocate_msg().</div><div class='del'>-		 */</div><div class='del'>-		xpc_clear_local_msgqueue_flags(ch);</div><div class='del'>-</div><div class='del'>-		ch-&gt;w_remote_GP.get = ch-&gt;remote_GP.get;</div><div class='del'>-</div><div class='del'>-		dev_dbg(xpc_chan, "w_remote_GP.get changed to %ld, partid=%d, "</div><div class='del'>-			"channel=%d\n", ch-&gt;w_remote_GP.get, ch-&gt;partid,</div><div class='del'>-			ch-&gt;number);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If anyone was waiting for message queue entries to become</div><div class='del'>-		 * available, wake them up.</div><div class='del'>-		 */</div><div class='del'>-		if (atomic_read(&amp;ch-&gt;n_on_msg_allocate_wq) &gt; 0)</div><div class='del'>-			wake_up(&amp;ch-&gt;msg_allocate_wq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now check for newly sent messages by the other side. (The remote</div><div class='del'>-	 * PUT value will have changed since we last looked at it.)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (ch-&gt;w_remote_GP.put != ch-&gt;remote_GP.put) {</div><div class='del'>-		/*</div><div class='del'>-		 * Clear msg-&gt;flags in previously received messages, so that</div><div class='del'>-		 * they're ready for xpc_get_deliverable_msg().</div><div class='del'>-		 */</div><div class='del'>-		xpc_clear_remote_msgqueue_flags(ch);</div><div class='del'>-</div><div class='del'>-		ch-&gt;w_remote_GP.put = ch-&gt;remote_GP.put;</div><div class='del'>-</div><div class='del'>-		dev_dbg(xpc_chan, "w_remote_GP.put changed to %ld, partid=%d, "</div><div class='del'>-			"channel=%d\n", ch-&gt;w_remote_GP.put, ch-&gt;partid,</div><div class='del'>-			ch-&gt;number);</div><div class='del'>-</div><div class='del'>-		nmsgs_sent = ch-&gt;w_remote_GP.put - ch-&gt;w_local_GP.get;</div><div class='del'>-		if (nmsgs_sent &gt; 0) {</div><div class='del'>-			dev_dbg(xpc_chan, "msgs waiting to be copied and "</div><div class='del'>-				"delivered=%d, partid=%d, channel=%d\n",</div><div class='del'>-				nmsgs_sent, ch-&gt;partid, ch-&gt;number);</div><div class='del'>-</div><div class='del'>-			if (ch-&gt;flags &amp; XPC_C_CONNECTEDCALLOUT_MADE)</div><div class='del'>-				xpc_activate_kthreads(ch, nmsgs_sent);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	xpc_msgqueue_deref(ch);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void</div><div class='del'>-xpc_process_channel_activity(struct xpc_partition *part)</div><div class='add'>+xpc_process_sent_chctl_flags(struct xpc_partition *part)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='del'>-	u64 IPI_amo, IPI_flags;</div><div class='add'>+	union xpc_channel_ctl_flags chctl;</div><div class='ctx'> 	struct xpc_channel *ch;</div><div class='ctx'> 	int ch_number;</div><div class='ctx'> 	u32 ch_flags;</div><div class='ctx'> </div><div class='del'>-	IPI_amo = xpc_get_IPI_flags(part);</div><div class='add'>+	chctl.all_flags = xpc_get_chctl_all_flags(part);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initiate channel connections for registered channels.</div><div class='hunk'>@@ -1281,14 +536,14 @@ xpc_process_channel_activity(struct xpc_partition *part)</div><div class='ctx'> 		ch = &amp;part-&gt;channels[ch_number];</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Process any open or close related IPI flags, and then deal</div><div class='add'>+		 * Process any open or close related chctl flags, and then deal</div><div class='ctx'> 		 * with connecting or disconnecting the channel as required.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		IPI_flags = XPC_GET_IPI_FLAGS(IPI_amo, ch_number);</div><div class='del'>-</div><div class='del'>-		if (XPC_ANY_OPENCLOSE_IPI_FLAGS_SET(IPI_flags))</div><div class='del'>-			xpc_process_openclose_IPI(part, ch_number, IPI_flags);</div><div class='add'>+		if (chctl.flags[ch_number] &amp; XPC_OPENCLOSE_CHCTL_FLAGS) {</div><div class='add'>+			xpc_process_openclose_chctl_flags(part, ch_number,</div><div class='add'>+							chctl.flags[ch_number]);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		ch_flags = ch-&gt;flags;	/* need an atomic snapshot of flags */</div><div class='ctx'> </div><div class='hunk'>@@ -1299,7 +554,7 @@ xpc_process_channel_activity(struct xpc_partition *part)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (part-&gt;act_state == XPC_P_DEACTIVATING)</div><div class='add'>+		if (part-&gt;act_state == XPC_P_AS_DEACTIVATING)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (!(ch_flags &amp; XPC_C_CONNECTED)) {</div><div class='hunk'>@@ -1315,13 +570,13 @@ xpc_process_channel_activity(struct xpc_partition *part)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Process any message related IPI flags, this may involve the</div><div class='del'>-		 * activation of kthreads to deliver any pending messages sent</div><div class='del'>-		 * from the other partition.</div><div class='add'>+		 * Process any message related chctl flags, this may involve</div><div class='add'>+		 * the activation of kthreads to deliver any pending messages</div><div class='add'>+		 * sent from the other partition.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		if (XPC_ANY_MSG_IPI_FLAGS_SET(IPI_flags))</div><div class='del'>-			xpc_process_msg_IPI(part, ch_number);</div><div class='add'>+		if (chctl.flags[ch_number] &amp; XPC_MSG_CHCTL_FLAGS)</div><div class='add'>+			xpc_process_msg_chctl_flags(part, ch_number);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1369,59 +624,6 @@ xpc_partition_going_down(struct xpc_partition *part, enum xp_retval reason)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Teardown the infrastructure necessary to support XPartition Communication</div><div class='del'>- * between the specified remote partition and the local one.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-xpc_teardown_infrastructure(struct xpc_partition *part)</div><div class='del'>-{</div><div class='del'>-	short partid = XPC_PARTID(part);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We start off by making this partition inaccessible to local</div><div class='del'>-	 * processes by marking it as no longer setup. Then we make it</div><div class='del'>-	 * inaccessible to remote processes by clearing the XPC per partition</div><div class='del'>-	 * specific variable's magic # (which indicates that these variables</div><div class='del'>-	 * are no longer valid) and by ignoring all XPC notify IPIs sent to</div><div class='del'>-	 * this partition.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	DBUG_ON(atomic_read(&amp;part-&gt;nchannels_engaged) != 0);</div><div class='del'>-	DBUG_ON(atomic_read(&amp;part-&gt;nchannels_active) != 0);</div><div class='del'>-	DBUG_ON(part-&gt;setup_state != XPC_P_SETUP);</div><div class='del'>-	part-&gt;setup_state = XPC_P_WTEARDOWN;</div><div class='del'>-</div><div class='del'>-	xpc_vars_part[partid].magic = 0;</div><div class='del'>-</div><div class='del'>-	free_irq(SGI_XPC_NOTIFY, (void *)(u64)partid);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Before proceeding with the teardown we have to wait until all</div><div class='del'>-	 * existing references cease.</div><div class='del'>-	 */</div><div class='del'>-	wait_event(part-&gt;teardown_wq, (atomic_read(&amp;part-&gt;references) == 0));</div><div class='del'>-</div><div class='del'>-	/* now we can begin tearing down the infrastructure */</div><div class='del'>-</div><div class='del'>-	part-&gt;setup_state = XPC_P_TORNDOWN;</div><div class='del'>-</div><div class='del'>-	/* in case we've still got outstanding timers registered... */</div><div class='del'>-	del_timer_sync(&amp;part-&gt;dropped_IPI_timer);</div><div class='del'>-</div><div class='del'>-	kfree(part-&gt;remote_openclose_args_base);</div><div class='del'>-	part-&gt;remote_openclose_args = NULL;</div><div class='del'>-	kfree(part-&gt;local_openclose_args_base);</div><div class='del'>-	part-&gt;local_openclose_args = NULL;</div><div class='del'>-	kfree(part-&gt;remote_GPs_base);</div><div class='del'>-	part-&gt;remote_GPs = NULL;</div><div class='del'>-	kfree(part-&gt;local_GPs_base);</div><div class='del'>-	part-&gt;local_GPs = NULL;</div><div class='del'>-	kfree(part-&gt;channels);</div><div class='del'>-	part-&gt;channels = NULL;</div><div class='del'>-	part-&gt;local_IPI_amo_va = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Called by XP at the time of channel connection registration to cause</div><div class='ctx'>  * XPC to establish connections to all currently active partitions.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1432,9 +634,9 @@ xpc_initiate_connect(int ch_number)</div><div class='ctx'> 	struct xpc_partition *part;</div><div class='ctx'> 	struct xpc_channel *ch;</div><div class='ctx'> </div><div class='del'>-	DBUG_ON(ch_number &lt; 0 || ch_number &gt;= XPC_NCHANNELS);</div><div class='add'>+	DBUG_ON(ch_number &lt; 0 || ch_number &gt;= XPC_MAX_NCHANNELS);</div><div class='ctx'> </div><div class='del'>-	for (partid = 1; partid &lt; XP_MAX_PARTITIONS; partid++) {</div><div class='add'>+	for (partid = 0; partid &lt; xp_max_npartitions; partid++) {</div><div class='ctx'> 		part = &amp;xpc_partitions[partid];</div><div class='ctx'> </div><div class='ctx'> 		if (xpc_part_ref(part)) {</div><div class='hunk'>@@ -1488,10 +690,10 @@ xpc_initiate_disconnect(int ch_number)</div><div class='ctx'> 	struct xpc_partition *part;</div><div class='ctx'> 	struct xpc_channel *ch;</div><div class='ctx'> </div><div class='del'>-	DBUG_ON(ch_number &lt; 0 || ch_number &gt;= XPC_NCHANNELS);</div><div class='add'>+	DBUG_ON(ch_number &lt; 0 || ch_number &gt;= XPC_MAX_NCHANNELS);</div><div class='ctx'> </div><div class='ctx'> 	/* initiate the channel disconnect for every active partition */</div><div class='del'>-	for (partid = 1; partid &lt; XP_MAX_PARTITIONS; partid++) {</div><div class='add'>+	for (partid = 0; partid &lt; xp_max_npartitions; partid++) {</div><div class='ctx'> 		part = &amp;xpc_partitions[partid];</div><div class='ctx'> </div><div class='ctx'> 		if (xpc_part_ref(part)) {</div><div class='hunk'>@@ -1550,7 +752,7 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch,</div><div class='ctx'> 		       XPC_C_ROPENREQUEST | XPC_C_ROPENREPLY |</div><div class='ctx'> 		       XPC_C_CONNECTING | XPC_C_CONNECTED);</div><div class='ctx'> </div><div class='del'>-	xpc_IPI_send_closerequest(ch, irq_flags);</div><div class='add'>+	xpc_send_chctl_closerequest(ch, irq_flags);</div><div class='ctx'> </div><div class='ctx'> 	if (channel_was_connected)</div><div class='ctx'> 		ch-&gt;flags |= XPC_C_WASCONNECTED;</div><div class='hunk'>@@ -1598,7 +800,7 @@ xpc_disconnect_callout(struct xpc_channel *ch, enum xp_retval reason)</div><div class='ctx'>  * Wait for a message entry to become available for the specified channel,</div><div class='ctx'>  * but don't wait any longer than 1 jiffy.</div><div class='ctx'>  */</div><div class='del'>-static enum xp_retval</div><div class='add'>+enum xp_retval</div><div class='ctx'> xpc_allocate_msg_wait(struct xpc_channel *ch)</div><div class='ctx'> {</div><div class='ctx'> 	enum xp_retval ret;</div><div class='hunk'>@@ -1625,315 +827,54 @@ xpc_allocate_msg_wait(struct xpc_channel *ch)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Allocate an entry for a message from the message queue associated with the</div><div class='del'>- * specified channel.</div><div class='del'>- */</div><div class='del'>-static enum xp_retval</div><div class='del'>-xpc_allocate_msg(struct xpc_channel *ch, u32 flags,</div><div class='del'>-		 struct xpc_msg **address_of_msg)</div><div class='del'>-{</div><div class='del'>-	struct xpc_msg *msg;</div><div class='del'>-	enum xp_retval ret;</div><div class='del'>-	s64 put;</div><div class='del'>-</div><div class='del'>-	/* this reference will be dropped in xpc_send_msg() */</div><div class='del'>-	xpc_msgqueue_ref(ch);</div><div class='del'>-</div><div class='del'>-	if (ch-&gt;flags &amp; XPC_C_DISCONNECTING) {</div><div class='del'>-		xpc_msgqueue_deref(ch);</div><div class='del'>-		return ch-&gt;reason;</div><div class='del'>-	}</div><div class='del'>-	if (!(ch-&gt;flags &amp; XPC_C_CONNECTED)) {</div><div class='del'>-		xpc_msgqueue_deref(ch);</div><div class='del'>-		return xpNotConnected;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get the next available message entry from the local message queue.</div><div class='del'>-	 * If none are available, we'll make sure that we grab the latest</div><div class='del'>-	 * GP values.</div><div class='del'>-	 */</div><div class='del'>-	ret = xpTimeout;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-</div><div class='del'>-		put = ch-&gt;w_local_GP.put;</div><div class='del'>-		rmb();	/* guarantee that .put loads before .get */</div><div class='del'>-		if (put - ch-&gt;w_remote_GP.get &lt; ch-&gt;local_nentries) {</div><div class='del'>-</div><div class='del'>-			/* There are available message entries. We need to try</div><div class='del'>-			 * to secure one for ourselves. We'll do this by trying</div><div class='del'>-			 * to increment w_local_GP.put as long as someone else</div><div class='del'>-			 * doesn't beat us to it. If they do, we'll have to</div><div class='del'>-			 * try again.</div><div class='del'>-			 */</div><div class='del'>-			if (cmpxchg(&amp;ch-&gt;w_local_GP.put, put, put + 1) == put) {</div><div class='del'>-				/* we got the entry referenced by put */</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			continue;	/* try again */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * There aren't any available msg entries at this time.</div><div class='del'>-		 *</div><div class='del'>-		 * In waiting for a message entry to become available,</div><div class='del'>-		 * we set a timeout in case the other side is not</div><div class='del'>-		 * sending completion IPIs. This lets us fake an IPI</div><div class='del'>-		 * that will cause the IPI handler to fetch the latest</div><div class='del'>-		 * GP values as if an IPI was sent by the other side.</div><div class='del'>-		 */</div><div class='del'>-		if (ret == xpTimeout)</div><div class='del'>-			xpc_IPI_send_local_msgrequest(ch);</div><div class='del'>-</div><div class='del'>-		if (flags &amp; XPC_NOWAIT) {</div><div class='del'>-			xpc_msgqueue_deref(ch);</div><div class='del'>-			return xpNoWait;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = xpc_allocate_msg_wait(ch);</div><div class='del'>-		if (ret != xpInterrupted &amp;&amp; ret != xpTimeout) {</div><div class='del'>-			xpc_msgqueue_deref(ch);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* get the message's address and initialize it */</div><div class='del'>-	msg = (struct xpc_msg *)((u64)ch-&gt;local_msgqueue +</div><div class='del'>-				 (put % ch-&gt;local_nentries) * ch-&gt;msg_size);</div><div class='del'>-</div><div class='del'>-	DBUG_ON(msg-&gt;flags != 0);</div><div class='del'>-	msg-&gt;number = put;</div><div class='del'>-</div><div class='del'>-	dev_dbg(xpc_chan, "w_local_GP.put changed to %ld; msg=0x%p, "</div><div class='del'>-		"msg_number=%ld, partid=%d, channel=%d\n", put + 1,</div><div class='del'>-		(void *)msg, msg-&gt;number, ch-&gt;partid, ch-&gt;number);</div><div class='del'>-</div><div class='del'>-	*address_of_msg = msg;</div><div class='del'>-</div><div class='del'>-	return xpSuccess;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Allocate an entry for a message from the message queue associated with the</div><div class='del'>- * specified channel. NOTE that this routine can sleep waiting for a message</div><div class='del'>- * entry to become available. To not sleep, pass in the XPC_NOWAIT flag.</div><div class='add'>+ * Send a message that contains the user's payload on the specified channel</div><div class='add'>+ * connected to the specified partition.</div><div class='ctx'>  *</div><div class='del'>- * Arguments:</div><div class='add'>+ * NOTE that this routine can sleep waiting for a message entry to become</div><div class='add'>+ * available. To not sleep, pass in the XPC_NOWAIT flag.</div><div class='ctx'>  *</div><div class='del'>- *	partid - ID of partition to which the channel is connected.</div><div class='del'>- *	ch_number - channel #.</div><div class='del'>- *	flags - see xpc.h for valid flags.</div><div class='del'>- *	payload - address of the allocated payload area pointer (filled in on</div><div class='del'>- * 	          return) in which the user-defined message is constructed.</div><div class='del'>- */</div><div class='del'>-enum xp_retval</div><div class='del'>-xpc_initiate_allocate(short partid, int ch_number, u32 flags, void **payload)</div><div class='del'>-{</div><div class='del'>-	struct xpc_partition *part = &amp;xpc_partitions[partid];</div><div class='del'>-	enum xp_retval ret = xpUnknownReason;</div><div class='del'>-	struct xpc_msg *msg = NULL;</div><div class='del'>-</div><div class='del'>-	DBUG_ON(partid &lt;= 0 || partid &gt;= XP_MAX_PARTITIONS);</div><div class='del'>-	DBUG_ON(ch_number &lt; 0 || ch_number &gt;= part-&gt;nchannels);</div><div class='del'>-</div><div class='del'>-	*payload = NULL;</div><div class='del'>-</div><div class='del'>-	if (xpc_part_ref(part)) {</div><div class='del'>-		ret = xpc_allocate_msg(&amp;part-&gt;channels[ch_number], flags, &amp;msg);</div><div class='del'>-		xpc_part_deref(part);</div><div class='del'>-</div><div class='del'>-		if (msg != NULL)</div><div class='del'>-			*payload = &amp;msg-&gt;payload;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Now we actually send the messages that are ready to be sent by advancing</div><div class='del'>- * the local message queue's Put value and then send an IPI to the recipient</div><div class='del'>- * partition.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-xpc_send_msgs(struct xpc_channel *ch, s64 initial_put)</div><div class='del'>-{</div><div class='del'>-	struct xpc_msg *msg;</div><div class='del'>-	s64 put = initial_put + 1;</div><div class='del'>-	int send_IPI = 0;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-</div><div class='del'>-		while (1) {</div><div class='del'>-			if (put == ch-&gt;w_local_GP.put)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			msg = (struct xpc_msg *)((u64)ch-&gt;local_msgqueue +</div><div class='del'>-						 (put % ch-&gt;local_nentries) *</div><div class='del'>-						 ch-&gt;msg_size);</div><div class='del'>-</div><div class='del'>-			if (!(msg-&gt;flags &amp; XPC_M_READY))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			put++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (put == initial_put) {</div><div class='del'>-			/* nothing's changed */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (cmpxchg_rel(&amp;ch-&gt;local_GP-&gt;put, initial_put, put) !=</div><div class='del'>-		    initial_put) {</div><div class='del'>-			/* someone else beat us to it */</div><div class='del'>-			DBUG_ON(ch-&gt;local_GP-&gt;put &lt; initial_put);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* we just set the new value of local_GP-&gt;put */</div><div class='del'>-</div><div class='del'>-		dev_dbg(xpc_chan, "local_GP-&gt;put changed to %ld, partid=%d, "</div><div class='del'>-			"channel=%d\n", put, ch-&gt;partid, ch-&gt;number);</div><div class='del'>-</div><div class='del'>-		send_IPI = 1;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We need to ensure that the message referenced by</div><div class='del'>-		 * local_GP-&gt;put is not XPC_M_READY or that local_GP-&gt;put</div><div class='del'>-		 * equals w_local_GP.put, so we'll go have a look.</div><div class='del'>-		 */</div><div class='del'>-		initial_put = put;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (send_IPI)</div><div class='del'>-		xpc_IPI_send_msgrequest(ch);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Common code that does the actual sending of the message by advancing the</div><div class='del'>- * local message queue's Put value and sends an IPI to the partition the</div><div class='del'>- * message is being sent to.</div><div class='del'>- */</div><div class='del'>-static enum xp_retval</div><div class='del'>-xpc_send_msg(struct xpc_channel *ch, struct xpc_msg *msg, u8 notify_type,</div><div class='del'>-	     xpc_notify_func func, void *key)</div><div class='del'>-{</div><div class='del'>-	enum xp_retval ret = xpSuccess;</div><div class='del'>-	struct xpc_notify *notify = notify;</div><div class='del'>-	s64 put, msg_number = msg-&gt;number;</div><div class='del'>-</div><div class='del'>-	DBUG_ON(notify_type == XPC_N_CALL &amp;&amp; func == NULL);</div><div class='del'>-	DBUG_ON((((u64)msg - (u64)ch-&gt;local_msgqueue) / ch-&gt;msg_size) !=</div><div class='del'>-		msg_number % ch-&gt;local_nentries);</div><div class='del'>-	DBUG_ON(msg-&gt;flags &amp; XPC_M_READY);</div><div class='del'>-</div><div class='del'>-	if (ch-&gt;flags &amp; XPC_C_DISCONNECTING) {</div><div class='del'>-		/* drop the reference grabbed in xpc_allocate_msg() */</div><div class='del'>-		xpc_msgqueue_deref(ch);</div><div class='del'>-		return ch-&gt;reason;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (notify_type != 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * Tell the remote side to send an ACK interrupt when the</div><div class='del'>-		 * message has been delivered.</div><div class='del'>-		 */</div><div class='del'>-		msg-&gt;flags |= XPC_M_INTERRUPT;</div><div class='del'>-</div><div class='del'>-		atomic_inc(&amp;ch-&gt;n_to_notify);</div><div class='del'>-</div><div class='del'>-		notify = &amp;ch-&gt;notify_queue[msg_number % ch-&gt;local_nentries];</div><div class='del'>-		notify-&gt;func = func;</div><div class='del'>-		notify-&gt;key = key;</div><div class='del'>-		notify-&gt;type = notify_type;</div><div class='del'>-</div><div class='del'>-		/* &gt;&gt;&gt; is a mb() needed here? */</div><div class='del'>-</div><div class='del'>-		if (ch-&gt;flags &amp; XPC_C_DISCONNECTING) {</div><div class='del'>-			/*</div><div class='del'>-			 * An error occurred between our last error check and</div><div class='del'>-			 * this one. We will try to clear the type field from</div><div class='del'>-			 * the notify entry. If we succeed then</div><div class='del'>-			 * xpc_disconnect_channel() didn't already process</div><div class='del'>-			 * the notify entry.</div><div class='del'>-			 */</div><div class='del'>-			if (cmpxchg(&amp;notify-&gt;type, notify_type, 0) ==</div><div class='del'>-			    notify_type) {</div><div class='del'>-				atomic_dec(&amp;ch-&gt;n_to_notify);</div><div class='del'>-				ret = ch-&gt;reason;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* drop the reference grabbed in xpc_allocate_msg() */</div><div class='del'>-			xpc_msgqueue_deref(ch);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	msg-&gt;flags |= XPC_M_READY;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The preceding store of msg-&gt;flags must occur before the following</div><div class='del'>-	 * load of ch-&gt;local_GP-&gt;put.</div><div class='del'>-	 */</div><div class='del'>-	mb();</div><div class='del'>-</div><div class='del'>-	/* see if the message is next in line to be sent, if so send it */</div><div class='del'>-</div><div class='del'>-	put = ch-&gt;local_GP-&gt;put;</div><div class='del'>-	if (put == msg_number)</div><div class='del'>-		xpc_send_msgs(ch, put);</div><div class='del'>-</div><div class='del'>-	/* drop the reference grabbed in xpc_allocate_msg() */</div><div class='del'>-	xpc_msgqueue_deref(ch);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Send a message previously allocated using xpc_initiate_allocate() on the</div><div class='del'>- * specified channel connected to the specified partition.</div><div class='del'>- *</div><div class='del'>- * This routine will not wait for the message to be received, nor will</div><div class='del'>- * notification be given when it does happen. Once this routine has returned</div><div class='del'>- * the message entry allocated via xpc_initiate_allocate() is no longer</div><div class='del'>- * accessable to the caller.</div><div class='del'>- *</div><div class='del'>- * This routine, although called by users, does not call xpc_part_ref() to</div><div class='del'>- * ensure that the partition infrastructure is in place. It relies on the</div><div class='del'>- * fact that we called xpc_msgqueue_ref() in xpc_allocate_msg().</div><div class='add'>+ * Once sent, this routine will not wait for the message to be received, nor</div><div class='add'>+ * will notification be given when it does happen.</div><div class='ctx'>  *</div><div class='ctx'>  * Arguments:</div><div class='ctx'>  *</div><div class='ctx'>  *	partid - ID of partition to which the channel is connected.</div><div class='ctx'>  *	ch_number - channel # to send message on.</div><div class='del'>- *	payload - pointer to the payload area allocated via</div><div class='del'>- *			xpc_initiate_allocate().</div><div class='add'>+ *	flags - see xp.h for valid flags.</div><div class='add'>+ *	payload - pointer to the payload which is to be sent.</div><div class='add'>+ *	payload_size - size of the payload in bytes.</div><div class='ctx'>  */</div><div class='ctx'> enum xp_retval</div><div class='del'>-xpc_initiate_send(short partid, int ch_number, void *payload)</div><div class='add'>+xpc_initiate_send(short partid, int ch_number, u32 flags, void *payload,</div><div class='add'>+		  u16 payload_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct xpc_partition *part = &amp;xpc_partitions[partid];</div><div class='del'>-	struct xpc_msg *msg = XPC_MSG_ADDRESS(payload);</div><div class='del'>-	enum xp_retval ret;</div><div class='add'>+	enum xp_retval ret = xpUnknownReason;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(xpc_chan, "msg=0x%p, partid=%d, channel=%d\n", (void *)msg,</div><div class='add'>+	dev_dbg(xpc_chan, "payload=0x%p, partid=%d, channel=%d\n", payload,</div><div class='ctx'> 		partid, ch_number);</div><div class='ctx'> </div><div class='del'>-	DBUG_ON(partid &lt;= 0 || partid &gt;= XP_MAX_PARTITIONS);</div><div class='add'>+	DBUG_ON(partid &lt; 0 || partid &gt;= xp_max_npartitions);</div><div class='ctx'> 	DBUG_ON(ch_number &lt; 0 || ch_number &gt;= part-&gt;nchannels);</div><div class='del'>-	DBUG_ON(msg == NULL);</div><div class='add'>+	DBUG_ON(payload == NULL);</div><div class='ctx'> </div><div class='del'>-	ret = xpc_send_msg(&amp;part-&gt;channels[ch_number], msg, 0, NULL, NULL);</div><div class='add'>+	if (xpc_part_ref(part)) {</div><div class='add'>+		ret = xpc_send_payload(&amp;part-&gt;channels[ch_number], flags,</div><div class='add'>+				       payload, payload_size, 0, NULL, NULL);</div><div class='add'>+		xpc_part_deref(part);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Send a message previously allocated using xpc_initiate_allocate on the</div><div class='del'>- * specified channel connected to the specified partition.</div><div class='add'>+ * Send a message that contains the user's payload on the specified channel</div><div class='add'>+ * connected to the specified partition.</div><div class='ctx'>  *</div><div class='del'>- * This routine will not wait for the message to be sent. Once this routine</div><div class='del'>- * has returned the message entry allocated via xpc_initiate_allocate() is no</div><div class='del'>- * longer accessable to the caller.</div><div class='add'>+ * NOTE that this routine can sleep waiting for a message entry to become</div><div class='add'>+ * available. To not sleep, pass in the XPC_NOWAIT flag.</div><div class='add'>+ *</div><div class='add'>+ * This routine will not wait for the message to be sent or received.</div><div class='ctx'>  *</div><div class='ctx'>  * Once the remote end of the channel has received the message, the function</div><div class='ctx'>  * passed as an argument to xpc_initiate_send_notify() will be called. This</div><div class='hunk'>@@ -1943,158 +884,51 @@ xpc_initiate_send(short partid, int ch_number, void *payload)</div><div class='ctx'>  *</div><div class='ctx'>  * If this routine returns an error, the caller's function will NOT be called.</div><div class='ctx'>  *</div><div class='del'>- * This routine, although called by users, does not call xpc_part_ref() to</div><div class='del'>- * ensure that the partition infrastructure is in place. It relies on the</div><div class='del'>- * fact that we called xpc_msgqueue_ref() in xpc_allocate_msg().</div><div class='del'>- *</div><div class='ctx'>  * Arguments:</div><div class='ctx'>  *</div><div class='ctx'>  *	partid - ID of partition to which the channel is connected.</div><div class='ctx'>  *	ch_number - channel # to send message on.</div><div class='del'>- *	payload - pointer to the payload area allocated via</div><div class='del'>- *			xpc_initiate_allocate().</div><div class='add'>+ *	flags - see xp.h for valid flags.</div><div class='add'>+ *	payload - pointer to the payload which is to be sent.</div><div class='add'>+ *	payload_size - size of the payload in bytes.</div><div class='ctx'>  *	func - function to call with asynchronous notification of message</div><div class='ctx'>  *		  receipt. THIS FUNCTION MUST BE NON-BLOCKING.</div><div class='ctx'>  *	key - user-defined key to be passed to the function when it's called.</div><div class='ctx'>  */</div><div class='ctx'> enum xp_retval</div><div class='del'>-xpc_initiate_send_notify(short partid, int ch_number, void *payload,</div><div class='del'>-			 xpc_notify_func func, void *key)</div><div class='add'>+xpc_initiate_send_notify(short partid, int ch_number, u32 flags, void *payload,</div><div class='add'>+			 u16 payload_size, xpc_notify_func func, void *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct xpc_partition *part = &amp;xpc_partitions[partid];</div><div class='del'>-	struct xpc_msg *msg = XPC_MSG_ADDRESS(payload);</div><div class='del'>-	enum xp_retval ret;</div><div class='add'>+	enum xp_retval ret = xpUnknownReason;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(xpc_chan, "msg=0x%p, partid=%d, channel=%d\n", (void *)msg,</div><div class='add'>+	dev_dbg(xpc_chan, "payload=0x%p, partid=%d, channel=%d\n", payload,</div><div class='ctx'> 		partid, ch_number);</div><div class='ctx'> </div><div class='del'>-	DBUG_ON(partid &lt;= 0 || partid &gt;= XP_MAX_PARTITIONS);</div><div class='add'>+	DBUG_ON(partid &lt; 0 || partid &gt;= xp_max_npartitions);</div><div class='ctx'> 	DBUG_ON(ch_number &lt; 0 || ch_number &gt;= part-&gt;nchannels);</div><div class='del'>-	DBUG_ON(msg == NULL);</div><div class='add'>+	DBUG_ON(payload == NULL);</div><div class='ctx'> 	DBUG_ON(func == NULL);</div><div class='ctx'> </div><div class='del'>-	ret = xpc_send_msg(&amp;part-&gt;channels[ch_number], msg, XPC_N_CALL,</div><div class='del'>-			   func, key);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct xpc_msg *</div><div class='del'>-xpc_pull_remote_msg(struct xpc_channel *ch, s64 get)</div><div class='del'>-{</div><div class='del'>-	struct xpc_partition *part = &amp;xpc_partitions[ch-&gt;partid];</div><div class='del'>-	struct xpc_msg *remote_msg, *msg;</div><div class='del'>-	u32 msg_index, nmsgs;</div><div class='del'>-	u64 msg_offset;</div><div class='del'>-	enum xp_retval ret;</div><div class='del'>-</div><div class='del'>-	if (mutex_lock_interruptible(&amp;ch-&gt;msg_to_pull_mutex) != 0) {</div><div class='del'>-		/* we were interrupted by a signal */</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (get &gt;= ch-&gt;next_msg_to_pull) {</div><div class='del'>-</div><div class='del'>-		/* pull as many messages as are ready and able to be pulled */</div><div class='del'>-</div><div class='del'>-		msg_index = ch-&gt;next_msg_to_pull % ch-&gt;remote_nentries;</div><div class='del'>-</div><div class='del'>-		DBUG_ON(ch-&gt;next_msg_to_pull &gt;= ch-&gt;w_remote_GP.put);</div><div class='del'>-		nmsgs = ch-&gt;w_remote_GP.put - ch-&gt;next_msg_to_pull;</div><div class='del'>-		if (msg_index + nmsgs &gt; ch-&gt;remote_nentries) {</div><div class='del'>-			/* ignore the ones that wrap the msg queue for now */</div><div class='del'>-			nmsgs = ch-&gt;remote_nentries - msg_index;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		msg_offset = msg_index * ch-&gt;msg_size;</div><div class='del'>-		msg = (struct xpc_msg *)((u64)ch-&gt;remote_msgqueue + msg_offset);</div><div class='del'>-		remote_msg = (struct xpc_msg *)(ch-&gt;remote_msgqueue_pa +</div><div class='del'>-						msg_offset);</div><div class='del'>-</div><div class='del'>-		ret = xpc_pull_remote_cachelines(part, msg, remote_msg,</div><div class='del'>-						 nmsgs * ch-&gt;msg_size);</div><div class='del'>-		if (ret != xpSuccess) {</div><div class='del'>-</div><div class='del'>-			dev_dbg(xpc_chan, "failed to pull %d msgs starting with"</div><div class='del'>-				" msg %ld from partition %d, channel=%d, "</div><div class='del'>-				"ret=%d\n", nmsgs, ch-&gt;next_msg_to_pull,</div><div class='del'>-				ch-&gt;partid, ch-&gt;number, ret);</div><div class='del'>-</div><div class='del'>-			XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='del'>-</div><div class='del'>-			mutex_unlock(&amp;ch-&gt;msg_to_pull_mutex);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ch-&gt;next_msg_to_pull += nmsgs;</div><div class='add'>+	if (xpc_part_ref(part)) {</div><div class='add'>+		ret = xpc_send_payload(&amp;part-&gt;channels[ch_number], flags,</div><div class='add'>+				       payload, payload_size, XPC_N_CALL, func,</div><div class='add'>+				       key);</div><div class='add'>+		xpc_part_deref(part);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;ch-&gt;msg_to_pull_mutex);</div><div class='del'>-</div><div class='del'>-	/* return the message we were looking for */</div><div class='del'>-	msg_offset = (get % ch-&gt;remote_nentries) * ch-&gt;msg_size;</div><div class='del'>-	msg = (struct xpc_msg *)((u64)ch-&gt;remote_msgqueue + msg_offset);</div><div class='del'>-</div><div class='del'>-	return msg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get a message to be delivered.</div><div class='del'>- */</div><div class='del'>-static struct xpc_msg *</div><div class='del'>-xpc_get_deliverable_msg(struct xpc_channel *ch)</div><div class='del'>-{</div><div class='del'>-	struct xpc_msg *msg = NULL;</div><div class='del'>-	s64 get;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		if (ch-&gt;flags &amp; XPC_C_DISCONNECTING)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		get = ch-&gt;w_local_GP.get;</div><div class='del'>-		rmb();	/* guarantee that .get loads before .put */</div><div class='del'>-		if (get == ch-&gt;w_remote_GP.put)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* There are messages waiting to be pulled and delivered.</div><div class='del'>-		 * We need to try to secure one for ourselves. We'll do this</div><div class='del'>-		 * by trying to increment w_local_GP.get and hope that no one</div><div class='del'>-		 * else beats us to it. If they do, we'll we'll simply have</div><div class='del'>-		 * to try again for the next one.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (cmpxchg(&amp;ch-&gt;w_local_GP.get, get, get + 1) == get) {</div><div class='del'>-			/* we got the entry referenced by get */</div><div class='del'>-</div><div class='del'>-			dev_dbg(xpc_chan, "w_local_GP.get changed to %ld, "</div><div class='del'>-				"partid=%d, channel=%d\n", get + 1,</div><div class='del'>-				ch-&gt;partid, ch-&gt;number);</div><div class='del'>-</div><div class='del'>-			/* pull the message from the remote partition */</div><div class='del'>-</div><div class='del'>-			msg = xpc_pull_remote_msg(ch, get);</div><div class='del'>-</div><div class='del'>-			DBUG_ON(msg != NULL &amp;&amp; msg-&gt;number != get);</div><div class='del'>-			DBUG_ON(msg != NULL &amp;&amp; (msg-&gt;flags &amp; XPC_M_DONE));</div><div class='del'>-			DBUG_ON(msg != NULL &amp;&amp; !(msg-&gt;flags &amp; XPC_M_READY));</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} while (1);</div><div class='del'>-</div><div class='del'>-	return msg;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Deliver a message to its intended recipient.</div><div class='add'>+ * Deliver a message's payload to its intended recipient.</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='del'>-xpc_deliver_msg(struct xpc_channel *ch)</div><div class='add'>+xpc_deliver_payload(struct xpc_channel *ch)</div><div class='ctx'> {</div><div class='del'>-	struct xpc_msg *msg;</div><div class='add'>+	void *payload;</div><div class='ctx'> </div><div class='del'>-	msg = xpc_get_deliverable_msg(ch);</div><div class='del'>-	if (msg != NULL) {</div><div class='add'>+	payload = xpc_get_deliverable_payload(ch);</div><div class='add'>+	if (payload != NULL) {</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This ref is taken to protect the payload itself from being</div><div class='hunk'>@@ -2106,18 +940,16 @@ xpc_deliver_msg(struct xpc_channel *ch)</div><div class='ctx'> 		atomic_inc(&amp;ch-&gt;kthreads_active);</div><div class='ctx'> </div><div class='ctx'> 		if (ch-&gt;func != NULL) {</div><div class='del'>-			dev_dbg(xpc_chan, "ch-&gt;func() called, msg=0x%p, "</div><div class='del'>-				"msg_number=%ld, partid=%d, channel=%d\n",</div><div class='del'>-				(void *)msg, msg-&gt;number, ch-&gt;partid,</div><div class='add'>+			dev_dbg(xpc_chan, "ch-&gt;func() called, payload=0x%p "</div><div class='add'>+				"partid=%d channel=%d\n", payload, ch-&gt;partid,</div><div class='ctx'> 				ch-&gt;number);</div><div class='ctx'> </div><div class='ctx'> 			/* deliver the message to its intended recipient */</div><div class='del'>-			ch-&gt;func(xpMsgReceived, ch-&gt;partid, ch-&gt;number,</div><div class='del'>-				 &amp;msg-&gt;payload, ch-&gt;key);</div><div class='add'>+			ch-&gt;func(xpMsgReceived, ch-&gt;partid, ch-&gt;number, payload,</div><div class='add'>+				 ch-&gt;key);</div><div class='ctx'> </div><div class='del'>-			dev_dbg(xpc_chan, "ch-&gt;func() returned, msg=0x%p, "</div><div class='del'>-				"msg_number=%ld, partid=%d, channel=%d\n",</div><div class='del'>-				(void *)msg, msg-&gt;number, ch-&gt;partid,</div><div class='add'>+			dev_dbg(xpc_chan, "ch-&gt;func() returned, payload=0x%p "</div><div class='add'>+				"partid=%d channel=%d\n", payload, ch-&gt;partid,</div><div class='ctx'> 				ch-&gt;number);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2126,118 +958,31 @@ xpc_deliver_msg(struct xpc_channel *ch)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Now we actually acknowledge the messages that have been delivered and ack'd</div><div class='del'>- * by advancing the cached remote message queue's Get value and if requested</div><div class='del'>- * send an IPI to the message sender's partition.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-xpc_acknowledge_msgs(struct xpc_channel *ch, s64 initial_get, u8 msg_flags)</div><div class='del'>-{</div><div class='del'>-	struct xpc_msg *msg;</div><div class='del'>-	s64 get = initial_get + 1;</div><div class='del'>-	int send_IPI = 0;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-</div><div class='del'>-		while (1) {</div><div class='del'>-			if (get == ch-&gt;w_local_GP.get)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			msg = (struct xpc_msg *)((u64)ch-&gt;remote_msgqueue +</div><div class='del'>-						 (get % ch-&gt;remote_nentries) *</div><div class='del'>-						 ch-&gt;msg_size);</div><div class='del'>-</div><div class='del'>-			if (!(msg-&gt;flags &amp; XPC_M_DONE))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			msg_flags |= msg-&gt;flags;</div><div class='del'>-			get++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (get == initial_get) {</div><div class='del'>-			/* nothing's changed */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (cmpxchg_rel(&amp;ch-&gt;local_GP-&gt;get, initial_get, get) !=</div><div class='del'>-		    initial_get) {</div><div class='del'>-			/* someone else beat us to it */</div><div class='del'>-			DBUG_ON(ch-&gt;local_GP-&gt;get &lt;= initial_get);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* we just set the new value of local_GP-&gt;get */</div><div class='del'>-</div><div class='del'>-		dev_dbg(xpc_chan, "local_GP-&gt;get changed to %ld, partid=%d, "</div><div class='del'>-			"channel=%d\n", get, ch-&gt;partid, ch-&gt;number);</div><div class='del'>-</div><div class='del'>-		send_IPI = (msg_flags &amp; XPC_M_INTERRUPT);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We need to ensure that the message referenced by</div><div class='del'>-		 * local_GP-&gt;get is not XPC_M_DONE or that local_GP-&gt;get</div><div class='del'>-		 * equals w_local_GP.get, so we'll go have a look.</div><div class='del'>-		 */</div><div class='del'>-		initial_get = get;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (send_IPI)</div><div class='del'>-		xpc_IPI_send_msgrequest(ch);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Acknowledge receipt of a delivered message.</div><div class='del'>- *</div><div class='del'>- * If a message has XPC_M_INTERRUPT set, send an interrupt to the partition</div><div class='del'>- * that sent the message.</div><div class='add'>+ * Acknowledge receipt of a delivered message's payload.</div><div class='ctx'>  *</div><div class='ctx'>  * This function, although called by users, does not call xpc_part_ref() to</div><div class='ctx'>  * ensure that the partition infrastructure is in place. It relies on the</div><div class='del'>- * fact that we called xpc_msgqueue_ref() in xpc_deliver_msg().</div><div class='add'>+ * fact that we called xpc_msgqueue_ref() in xpc_deliver_payload().</div><div class='ctx'>  *</div><div class='ctx'>  * Arguments:</div><div class='ctx'>  *</div><div class='ctx'>  *	partid - ID of partition to which the channel is connected.</div><div class='ctx'>  *	ch_number - channel # message received on.</div><div class='ctx'>  *	payload - pointer to the payload area allocated via</div><div class='del'>- *			xpc_initiate_allocate().</div><div class='add'>+ *			xpc_initiate_send() or xpc_initiate_send_notify().</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='ctx'> xpc_initiate_received(short partid, int ch_number, void *payload)</div><div class='ctx'> {</div><div class='ctx'> 	struct xpc_partition *part = &amp;xpc_partitions[partid];</div><div class='ctx'> 	struct xpc_channel *ch;</div><div class='del'>-	struct xpc_msg *msg = XPC_MSG_ADDRESS(payload);</div><div class='del'>-	s64 get, msg_number = msg-&gt;number;</div><div class='ctx'> </div><div class='del'>-	DBUG_ON(partid &lt;= 0 || partid &gt;= XP_MAX_PARTITIONS);</div><div class='add'>+	DBUG_ON(partid &lt; 0 || partid &gt;= xp_max_npartitions);</div><div class='ctx'> 	DBUG_ON(ch_number &lt; 0 || ch_number &gt;= part-&gt;nchannels);</div><div class='ctx'> </div><div class='ctx'> 	ch = &amp;part-&gt;channels[ch_number];</div><div class='add'>+	xpc_received_payload(ch, payload);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(xpc_chan, "msg=0x%p, msg_number=%ld, partid=%d, channel=%d\n",</div><div class='del'>-		(void *)msg, msg_number, ch-&gt;partid, ch-&gt;number);</div><div class='del'>-</div><div class='del'>-	DBUG_ON((((u64)msg - (u64)ch-&gt;remote_msgqueue) / ch-&gt;msg_size) !=</div><div class='del'>-		msg_number % ch-&gt;remote_nentries);</div><div class='del'>-	DBUG_ON(msg-&gt;flags &amp; XPC_M_DONE);</div><div class='del'>-</div><div class='del'>-	msg-&gt;flags |= XPC_M_DONE;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The preceding store of msg-&gt;flags must occur before the following</div><div class='del'>-	 * load of ch-&gt;local_GP-&gt;get.</div><div class='del'>-	 */</div><div class='del'>-	mb();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * See if this message is next in line to be acknowledged as having</div><div class='del'>-	 * been delivered.</div><div class='del'>-	 */</div><div class='del'>-	get = ch-&gt;local_GP-&gt;get;</div><div class='del'>-	if (get == msg_number)</div><div class='del'>-		xpc_acknowledge_msgs(ch, get, msg-&gt;flags);</div><div class='del'>-</div><div class='del'>-	/* the call to xpc_msgqueue_ref() was done by xpc_deliver_msg()  */</div><div class='add'>+	/* the call to xpc_msgqueue_ref() was done by xpc_deliver_payload()  */</div><div class='ctx'> 	xpc_msgqueue_deref(ch);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c<br/>index c3b4227f48a5..46325fc84811 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xpc_main.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/misc/sgi-xp/xpc_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xpc_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xpc_main.c</a></div><div class='hunk'>@@ -25,37 +25,31 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	Caveats:</div><div class='ctx'>  *</div><div class='del'>- *	  . We currently have no way to determine which nasid an IPI came</div><div class='del'>- *	    from. Thus, xpc_IPI_send() does a remote AMO write followed by</div><div class='del'>- *	    an IPI. The AMO indicates where data is to be pulled from, so</div><div class='del'>- *	    after the IPI arrives, the remote partition checks the AMO word.</div><div class='del'>- *	    The IPI can actually arrive before the AMO however, so other code</div><div class='del'>- *	    must periodically check for this case. Also, remote AMO operations</div><div class='del'>- *	    do not reliably time out. Thus we do a remote PIO read solely to</div><div class='del'>- *	    know whether the remote partition is down and whether we should</div><div class='del'>- *	    stop sending IPIs to it. This remote PIO read operation is set up</div><div class='del'>- *	    in a special nofault region so SAL knows to ignore (and cleanup)</div><div class='del'>- *	    any errors due to the remote AMO write, PIO read, and/or PIO</div><div class='del'>- *	    write operations.</div><div class='add'>+ *	  . Currently on sn2, we have no way to determine which nasid an IRQ</div><div class='add'>+ *	    came from. Thus, xpc_send_IRQ_sn2() does a remote amo write</div><div class='add'>+ *	    followed by an IPI. The amo indicates where data is to be pulled</div><div class='add'>+ *	    from, so after the IPI arrives, the remote partition checks the amo</div><div class='add'>+ *	    word. The IPI can actually arrive before the amo however, so other</div><div class='add'>+ *	    code must periodically check for this case. Also, remote amo</div><div class='add'>+ *	    operations do not reliably time out. Thus we do a remote PIO read</div><div class='add'>+ *	    solely to know whether the remote partition is down and whether we</div><div class='add'>+ *	    should stop sending IPIs to it. This remote PIO read operation is</div><div class='add'>+ *	    set up in a special nofault region so SAL knows to ignore (and</div><div class='add'>+ *	    cleanup) any errors due to the remote amo write, PIO read, and/or</div><div class='add'>+ *	    PIO write operations.</div><div class='ctx'>  *</div><div class='ctx'>  *	    If/when new hardware solves this IPI problem, we should abandon</div><div class='ctx'>  *	    the current approach.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/cache.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/sysctl.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='del'>-#include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/sn/intr.h&gt;</div><div class='del'>-#include &lt;asm/sn/sn_sal.h&gt;</div><div class='ctx'> #include "xpc.h"</div><div class='ctx'> </div><div class='ctx'> /* define two XPC debug device structures to be used with dev_dbg() et al */</div><div class='hunk'>@@ -89,9 +83,9 @@ static int xpc_hb_check_interval = XPC_HB_CHECK_DEFAULT_INTERVAL;</div><div class='ctx'> static int xpc_hb_check_min_interval = 10;</div><div class='ctx'> static int xpc_hb_check_max_interval = 120;</div><div class='ctx'> </div><div class='del'>-int xpc_disengage_request_timelimit = XPC_DISENGAGE_REQUEST_DEFAULT_TIMELIMIT;</div><div class='del'>-static int xpc_disengage_request_min_timelimit;	/* = 0 */</div><div class='del'>-static int xpc_disengage_request_max_timelimit = 120;</div><div class='add'>+int xpc_disengage_timelimit = XPC_DISENGAGE_DEFAULT_TIMELIMIT;</div><div class='add'>+static int xpc_disengage_min_timelimit;	/* = 0 */</div><div class='add'>+static int xpc_disengage_max_timelimit = 120;</div><div class='ctx'> </div><div class='ctx'> static ctl_table xpc_sys_xpc_hb_dir[] = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -124,14 +118,14 @@ static ctl_table xpc_sys_xpc_dir[] = {</div><div class='ctx'> 	 .child = xpc_sys_xpc_hb_dir},</div><div class='ctx'> 	{</div><div class='ctx'> 	 .ctl_name = CTL_UNNUMBERED,</div><div class='del'>-	 .procname = "disengage_request_timelimit",</div><div class='del'>-	 .data = &amp;xpc_disengage_request_timelimit,</div><div class='add'>+	 .procname = "disengage_timelimit",</div><div class='add'>+	 .data = &amp;xpc_disengage_timelimit,</div><div class='ctx'> 	 .maxlen = sizeof(int),</div><div class='ctx'> 	 .mode = 0644,</div><div class='ctx'> 	 .proc_handler = &amp;proc_dointvec_minmax,</div><div class='ctx'> 	 .strategy = &amp;sysctl_intvec,</div><div class='del'>-	 .extra1 = &amp;xpc_disengage_request_min_timelimit,</div><div class='del'>-	 .extra2 = &amp;xpc_disengage_request_max_timelimit},</div><div class='add'>+	 .extra1 = &amp;xpc_disengage_min_timelimit,</div><div class='add'>+	 .extra2 = &amp;xpc_disengage_max_timelimit},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> static ctl_table xpc_sys_dir[] = {</div><div class='hunk'>@@ -144,16 +138,19 @@ static ctl_table xpc_sys_dir[] = {</div><div class='ctx'> };</div><div class='ctx'> static struct ctl_table_header *xpc_sysctl;</div><div class='ctx'> </div><div class='del'>-/* non-zero if any remote partition disengage request was timed out */</div><div class='del'>-int xpc_disengage_request_timedout;</div><div class='add'>+/* non-zero if any remote partition disengage was timed out */</div><div class='add'>+int xpc_disengage_timedout;</div><div class='ctx'> </div><div class='del'>-/* #of IRQs received */</div><div class='del'>-static atomic_t xpc_act_IRQ_rcvd;</div><div class='add'>+/* #of activate IRQs received and not yet processed */</div><div class='add'>+int xpc_activate_IRQ_rcvd;</div><div class='add'>+DEFINE_SPINLOCK(xpc_activate_IRQ_rcvd_lock);</div><div class='ctx'> </div><div class='ctx'> /* IRQ handler notifies this wait queue on receipt of an IRQ */</div><div class='del'>-static DECLARE_WAIT_QUEUE_HEAD(xpc_act_IRQ_wq);</div><div class='add'>+DECLARE_WAIT_QUEUE_HEAD(xpc_activate_IRQ_wq);</div><div class='ctx'> </div><div class='ctx'> static unsigned long xpc_hb_check_timeout;</div><div class='add'>+static struct timer_list xpc_hb_timer;</div><div class='add'>+void *xpc_heartbeating_to_mask;</div><div class='ctx'> </div><div class='ctx'> /* notification that the xpc_hb_checker thread has exited */</div><div class='ctx'> static DECLARE_COMPLETION(xpc_hb_checker_exited);</div><div class='hunk'>@@ -161,8 +158,6 @@ static DECLARE_COMPLETION(xpc_hb_checker_exited);</div><div class='ctx'> /* notification that the xpc_discovery thread has exited */</div><div class='ctx'> static DECLARE_COMPLETION(xpc_discovery_exited);</div><div class='ctx'> </div><div class='del'>-static struct timer_list xpc_hb_timer;</div><div class='del'>-</div><div class='ctx'> static void xpc_kthread_waitmsgs(struct xpc_partition *, struct xpc_channel *);</div><div class='ctx'> </div><div class='ctx'> static int xpc_system_reboot(struct notifier_block *, unsigned long, void *);</div><div class='hunk'>@@ -175,31 +170,76 @@ static struct notifier_block xpc_die_notifier = {</div><div class='ctx'> 	.notifier_call = xpc_system_die,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+int (*xpc_setup_partitions_sn) (void);</div><div class='add'>+enum xp_retval (*xpc_get_partition_rsvd_page_pa) (void *buf, u64 *cookie,</div><div class='add'>+						  unsigned long *rp_pa,</div><div class='add'>+						  size_t *len);</div><div class='add'>+int (*xpc_setup_rsvd_page_sn) (struct xpc_rsvd_page *rp);</div><div class='add'>+void (*xpc_heartbeat_init) (void);</div><div class='add'>+void (*xpc_heartbeat_exit) (void);</div><div class='add'>+void (*xpc_increment_heartbeat) (void);</div><div class='add'>+void (*xpc_offline_heartbeat) (void);</div><div class='add'>+void (*xpc_online_heartbeat) (void);</div><div class='add'>+enum xp_retval (*xpc_get_remote_heartbeat) (struct xpc_partition *part);</div><div class='add'>+</div><div class='add'>+enum xp_retval (*xpc_make_first_contact) (struct xpc_partition *part);</div><div class='add'>+void (*xpc_notify_senders_of_disconnect) (struct xpc_channel *ch);</div><div class='add'>+u64 (*xpc_get_chctl_all_flags) (struct xpc_partition *part);</div><div class='add'>+enum xp_retval (*xpc_setup_msg_structures) (struct xpc_channel *ch);</div><div class='add'>+void (*xpc_teardown_msg_structures) (struct xpc_channel *ch);</div><div class='add'>+void (*xpc_process_msg_chctl_flags) (struct xpc_partition *part, int ch_number);</div><div class='add'>+int (*xpc_n_of_deliverable_payloads) (struct xpc_channel *ch);</div><div class='add'>+void *(*xpc_get_deliverable_payload) (struct xpc_channel *ch);</div><div class='add'>+</div><div class='add'>+void (*xpc_request_partition_activation) (struct xpc_rsvd_page *remote_rp,</div><div class='add'>+					  unsigned long remote_rp_pa,</div><div class='add'>+					  int nasid);</div><div class='add'>+void (*xpc_request_partition_reactivation) (struct xpc_partition *part);</div><div class='add'>+void (*xpc_request_partition_deactivation) (struct xpc_partition *part);</div><div class='add'>+void (*xpc_cancel_partition_deactivation_request) (struct xpc_partition *part);</div><div class='add'>+</div><div class='add'>+void (*xpc_process_activate_IRQ_rcvd) (void);</div><div class='add'>+enum xp_retval (*xpc_setup_ch_structures_sn) (struct xpc_partition *part);</div><div class='add'>+void (*xpc_teardown_ch_structures_sn) (struct xpc_partition *part);</div><div class='add'>+</div><div class='add'>+void (*xpc_indicate_partition_engaged) (struct xpc_partition *part);</div><div class='add'>+int (*xpc_partition_engaged) (short partid);</div><div class='add'>+int (*xpc_any_partition_engaged) (void);</div><div class='add'>+void (*xpc_indicate_partition_disengaged) (struct xpc_partition *part);</div><div class='add'>+void (*xpc_assume_partition_disengaged) (short partid);</div><div class='add'>+</div><div class='add'>+void (*xpc_send_chctl_closerequest) (struct xpc_channel *ch,</div><div class='add'>+				     unsigned long *irq_flags);</div><div class='add'>+void (*xpc_send_chctl_closereply) (struct xpc_channel *ch,</div><div class='add'>+				   unsigned long *irq_flags);</div><div class='add'>+void (*xpc_send_chctl_openrequest) (struct xpc_channel *ch,</div><div class='add'>+				    unsigned long *irq_flags);</div><div class='add'>+void (*xpc_send_chctl_openreply) (struct xpc_channel *ch,</div><div class='add'>+				  unsigned long *irq_flags);</div><div class='add'>+</div><div class='add'>+void (*xpc_save_remote_msgqueue_pa) (struct xpc_channel *ch,</div><div class='add'>+				     unsigned long msgqueue_pa);</div><div class='add'>+</div><div class='add'>+enum xp_retval (*xpc_send_payload) (struct xpc_channel *ch, u32 flags,</div><div class='add'>+				    void *payload, u16 payload_size,</div><div class='add'>+				    u8 notify_type, xpc_notify_func func,</div><div class='add'>+				    void *key);</div><div class='add'>+void (*xpc_received_payload) (struct xpc_channel *ch, void *payload);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * Timer function to enforce the timelimit on the partition disengage request.</div><div class='add'>+ * Timer function to enforce the timelimit on the partition disengage.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-xpc_timeout_partition_disengage_request(unsigned long data)</div><div class='add'>+xpc_timeout_partition_disengage(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct xpc_partition *part = (struct xpc_partition *)data;</div><div class='ctx'> </div><div class='del'>-	DBUG_ON(time_before(jiffies, part-&gt;disengage_request_timeout));</div><div class='add'>+	DBUG_ON(time_is_after_jiffies(part-&gt;disengage_timeout));</div><div class='ctx'> </div><div class='ctx'> 	(void)xpc_partition_disengaged(part);</div><div class='ctx'> </div><div class='del'>-	DBUG_ON(part-&gt;disengage_request_timeout != 0);</div><div class='del'>-	DBUG_ON(xpc_partition_engaged(1UL &lt;&lt; XPC_PARTID(part)) != 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Notify the heartbeat check thread that an IRQ has been received.</div><div class='del'>- */</div><div class='del'>-static irqreturn_t</div><div class='del'>-xpc_act_IRQ_handler(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	atomic_inc(&amp;xpc_act_IRQ_rcvd);</div><div class='del'>-	wake_up_interruptible(&amp;xpc_act_IRQ_wq);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='add'>+	DBUG_ON(part-&gt;disengage_timeout != 0);</div><div class='add'>+	DBUG_ON(xpc_partition_engaged(XPC_PARTID(part)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -210,15 +250,63 @@ xpc_act_IRQ_handler(int irq, void *dev_id)</div><div class='ctx'> static void</div><div class='ctx'> xpc_hb_beater(unsigned long dummy)</div><div class='ctx'> {</div><div class='del'>-	xpc_vars-&gt;heartbeat++;</div><div class='add'>+	xpc_increment_heartbeat();</div><div class='ctx'> </div><div class='del'>-	if (time_after_eq(jiffies, xpc_hb_check_timeout))</div><div class='del'>-		wake_up_interruptible(&amp;xpc_act_IRQ_wq);</div><div class='add'>+	if (time_is_before_eq_jiffies(xpc_hb_check_timeout))</div><div class='add'>+		wake_up_interruptible(&amp;xpc_activate_IRQ_wq);</div><div class='ctx'> </div><div class='ctx'> 	xpc_hb_timer.expires = jiffies + (xpc_hb_interval * HZ);</div><div class='ctx'> 	add_timer(&amp;xpc_hb_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+xpc_start_hb_beater(void)</div><div class='add'>+{</div><div class='add'>+	xpc_heartbeat_init();</div><div class='add'>+	init_timer(&amp;xpc_hb_timer);</div><div class='add'>+	xpc_hb_timer.function = xpc_hb_beater;</div><div class='add'>+	xpc_hb_beater(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_stop_hb_beater(void)</div><div class='add'>+{</div><div class='add'>+	del_timer_sync(&amp;xpc_hb_timer);</div><div class='add'>+	xpc_heartbeat_exit();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * At periodic intervals, scan through all active partitions and ensure</div><div class='add'>+ * their heartbeat is still active.  If not, the partition is deactivated.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_check_remote_hb(void)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition *part;</div><div class='add'>+	short partid;</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+</div><div class='add'>+	for (partid = 0; partid &lt; xp_max_npartitions; partid++) {</div><div class='add'>+</div><div class='add'>+		if (xpc_exiting)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (partid == xp_partition_id)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		part = &amp;xpc_partitions[partid];</div><div class='add'>+</div><div class='add'>+		if (part-&gt;act_state == XPC_P_AS_INACTIVE ||</div><div class='add'>+		    part-&gt;act_state == XPC_P_AS_DEACTIVATING) {</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = xpc_get_remote_heartbeat(part);</div><div class='add'>+		if (ret != xpSuccess)</div><div class='add'>+			XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This thread is responsible for nearly all of the partition</div><div class='ctx'>  * activation/deactivation.</div><div class='hunk'>@@ -226,8 +314,6 @@ xpc_hb_beater(unsigned long dummy)</div><div class='ctx'> static int</div><div class='ctx'> xpc_hb_checker(void *ignore)</div><div class='ctx'> {</div><div class='del'>-	int last_IRQ_count = 0;</div><div class='del'>-	int new_IRQ_count;</div><div class='ctx'> 	int force_IRQ = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* this thread was marked active by xpc_hb_init() */</div><div class='hunk'>@@ -236,56 +322,49 @@ xpc_hb_checker(void *ignore)</div><div class='ctx'> </div><div class='ctx'> 	/* set our heartbeating to other partitions into motion */</div><div class='ctx'> 	xpc_hb_check_timeout = jiffies + (xpc_hb_check_interval * HZ);</div><div class='del'>-	xpc_hb_beater(0);</div><div class='add'>+	xpc_start_hb_beater();</div><div class='ctx'> </div><div class='ctx'> 	while (!xpc_exiting) {</div><div class='ctx'> </div><div class='ctx'> 		dev_dbg(xpc_part, "woke up with %d ticks rem; %d IRQs have "</div><div class='ctx'> 			"been received\n",</div><div class='ctx'> 			(int)(xpc_hb_check_timeout - jiffies),</div><div class='del'>-			atomic_read(&amp;xpc_act_IRQ_rcvd) - last_IRQ_count);</div><div class='add'>+			xpc_activate_IRQ_rcvd);</div><div class='ctx'> </div><div class='ctx'> 		/* checking of remote heartbeats is skewed by IRQ handling */</div><div class='del'>-		if (time_after_eq(jiffies, xpc_hb_check_timeout)) {</div><div class='add'>+		if (time_is_before_eq_jiffies(xpc_hb_check_timeout)) {</div><div class='add'>+			xpc_hb_check_timeout = jiffies +</div><div class='add'>+			    (xpc_hb_check_interval * HZ);</div><div class='add'>+</div><div class='ctx'> 			dev_dbg(xpc_part, "checking remote heartbeats\n");</div><div class='ctx'> 			xpc_check_remote_hb();</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='del'>-			 * We need to periodically recheck to ensure no</div><div class='del'>-			 * IPI/AMO pairs have been missed.  That check</div><div class='del'>-			 * must always reset xpc_hb_check_timeout.</div><div class='add'>+			 * On sn2 we need to periodically recheck to ensure no</div><div class='add'>+			 * IRQ/amo pairs have been missed.</div><div class='ctx'> 			 */</div><div class='del'>-			force_IRQ = 1;</div><div class='add'>+			if (is_shub())</div><div class='add'>+				force_IRQ = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* check for outstanding IRQs */</div><div class='del'>-		new_IRQ_count = atomic_read(&amp;xpc_act_IRQ_rcvd);</div><div class='del'>-		if (last_IRQ_count &lt; new_IRQ_count || force_IRQ != 0) {</div><div class='add'>+		if (xpc_activate_IRQ_rcvd &gt; 0 || force_IRQ != 0) {</div><div class='ctx'> 			force_IRQ = 0;</div><div class='del'>-</div><div class='del'>-			dev_dbg(xpc_part, "found an IRQ to process; will be "</div><div class='del'>-				"resetting xpc_hb_check_timeout\n");</div><div class='del'>-</div><div class='del'>-			last_IRQ_count += xpc_identify_act_IRQ_sender();</div><div class='del'>-			if (last_IRQ_count &lt; new_IRQ_count) {</div><div class='del'>-				/* retry once to help avoid missing AMO */</div><div class='del'>-				(void)xpc_identify_act_IRQ_sender();</div><div class='del'>-			}</div><div class='del'>-			last_IRQ_count = new_IRQ_count;</div><div class='del'>-</div><div class='del'>-			xpc_hb_check_timeout = jiffies +</div><div class='del'>-			    (xpc_hb_check_interval * HZ);</div><div class='add'>+			dev_dbg(xpc_part, "processing activate IRQs "</div><div class='add'>+				"received\n");</div><div class='add'>+			xpc_process_activate_IRQ_rcvd();</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* wait for IRQ or timeout */</div><div class='del'>-		(void)wait_event_interruptible(xpc_act_IRQ_wq,</div><div class='del'>-					       (last_IRQ_count &lt;</div><div class='del'>-						atomic_read(&amp;xpc_act_IRQ_rcvd)</div><div class='del'>-						|| time_after_eq(jiffies,</div><div class='del'>-							xpc_hb_check_timeout) ||</div><div class='add'>+		(void)wait_event_interruptible(xpc_activate_IRQ_wq,</div><div class='add'>+					       (time_is_before_eq_jiffies(</div><div class='add'>+						xpc_hb_check_timeout) ||</div><div class='add'>+						xpc_activate_IRQ_rcvd &gt; 0 ||</div><div class='ctx'> 						xpc_exiting));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	xpc_stop_hb_beater();</div><div class='add'>+</div><div class='ctx'> 	dev_dbg(xpc_part, "heartbeat checker is exiting\n");</div><div class='ctx'> </div><div class='ctx'> 	/* mark this thread as having exited */</div><div class='hunk'>@@ -311,37 +390,8 @@ xpc_initiate_discovery(void *ignore)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Establish first contact with the remote partititon. This involves pulling</div><div class='del'>- * the XPC per partition variables from the remote partition and waiting for</div><div class='del'>- * the remote partition to pull ours.</div><div class='del'>- */</div><div class='del'>-static enum xp_retval</div><div class='del'>-xpc_make_first_contact(struct xpc_partition *part)</div><div class='del'>-{</div><div class='del'>-	enum xp_retval ret;</div><div class='del'>-</div><div class='del'>-	while ((ret = xpc_pull_remote_vars_part(part)) != xpSuccess) {</div><div class='del'>-		if (ret != xpRetry) {</div><div class='del'>-			XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dev_dbg(xpc_chan, "waiting to make first contact with "</div><div class='del'>-			"partition %d\n", XPC_PARTID(part));</div><div class='del'>-</div><div class='del'>-		/* wait a 1/4 of a second or so */</div><div class='del'>-		(void)msleep_interruptible(250);</div><div class='del'>-</div><div class='del'>-		if (part-&gt;act_state == XPC_P_DEACTIVATING)</div><div class='del'>-			return part-&gt;reason;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return xpc_mark_partition_active(part);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * The first kthread assigned to a newly activated partition is the one</div><div class='del'>- * created by XPC HB with which it calls xpc_partition_up(). XPC hangs on to</div><div class='add'>+ * created by XPC HB with which it calls xpc_activating(). XPC hangs on to</div><div class='ctx'>  * that kthread until the partition is brought down, at which time that kthread</div><div class='ctx'>  * returns back to XPC HB. (The return of that kthread will signify to XPC HB</div><div class='ctx'>  * that XPC has dismantled all communication infrastructure for the associated</div><div class='hunk'>@@ -354,11 +404,11 @@ xpc_make_first_contact(struct xpc_partition *part)</div><div class='ctx'> static void</div><div class='ctx'> xpc_channel_mgr(struct xpc_partition *part)</div><div class='ctx'> {</div><div class='del'>-	while (part-&gt;act_state != XPC_P_DEACTIVATING ||</div><div class='add'>+	while (part-&gt;act_state != XPC_P_AS_DEACTIVATING ||</div><div class='ctx'> 	       atomic_read(&amp;part-&gt;nchannels_active) &gt; 0 ||</div><div class='ctx'> 	       !xpc_partition_disengaged(part)) {</div><div class='ctx'> </div><div class='del'>-		xpc_process_channel_activity(part);</div><div class='add'>+		xpc_process_sent_chctl_flags(part);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Wait until we've been requested to activate kthreads or</div><div class='hunk'>@@ -376,8 +426,8 @@ xpc_channel_mgr(struct xpc_partition *part)</div><div class='ctx'> 		atomic_dec(&amp;part-&gt;channel_mgr_requests);</div><div class='ctx'> 		(void)wait_event_interruptible(part-&gt;channel_mgr_wq,</div><div class='ctx'> 				(atomic_read(&amp;part-&gt;channel_mgr_requests) &gt; 0 ||</div><div class='del'>-				 part-&gt;local_IPI_amo != 0 ||</div><div class='del'>-				 (part-&gt;act_state == XPC_P_DEACTIVATING &amp;&amp;</div><div class='add'>+				 part-&gt;chctl.all_flags != 0 ||</div><div class='add'>+				 (part-&gt;act_state == XPC_P_AS_DEACTIVATING &amp;&amp;</div><div class='ctx'> 				 atomic_read(&amp;part-&gt;nchannels_active) == 0 &amp;&amp;</div><div class='ctx'> 				 xpc_partition_disengaged(part))));</div><div class='ctx'> 		atomic_set(&amp;part-&gt;channel_mgr_requests, 1);</div><div class='hunk'>@@ -385,47 +435,163 @@ xpc_channel_mgr(struct xpc_partition *part)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * When XPC HB determines that a partition has come up, it will create a new</div><div class='del'>- * kthread and that kthread will call this function to attempt to set up the</div><div class='del'>- * basic infrastructure used for Cross Partition Communication with the newly</div><div class='del'>- * upped partition.</div><div class='del'>- *</div><div class='del'>- * The kthread that was created by XPC HB and which setup the XPC</div><div class='del'>- * infrastructure will remain assigned to the partition until the partition</div><div class='del'>- * goes down. At which time the kthread will teardown the XPC infrastructure</div><div class='del'>- * and then exit.</div><div class='del'>- *</div><div class='del'>- * XPC HB will put the remote partition's XPC per partition specific variables</div><div class='del'>- * physical address into xpc_partitions[partid].remote_vars_part_pa prior to</div><div class='del'>- * calling xpc_partition_up().</div><div class='add'>+ * Guarantee that the kzalloc'd memory is cacheline aligned.</div><div class='ctx'>  */</div><div class='del'>-static void</div><div class='del'>-xpc_partition_up(struct xpc_partition *part)</div><div class='add'>+void *</div><div class='add'>+xpc_kzalloc_cacheline_aligned(size_t size, gfp_t flags, void **base)</div><div class='add'>+{</div><div class='add'>+	/* see if kzalloc will give us cachline aligned memory by default */</div><div class='add'>+	*base = kzalloc(size, flags);</div><div class='add'>+	if (*base == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if ((u64)*base == L1_CACHE_ALIGN((u64)*base))</div><div class='add'>+		return *base;</div><div class='add'>+</div><div class='add'>+	kfree(*base);</div><div class='add'>+</div><div class='add'>+	/* nope, we'll have to do it ourselves */</div><div class='add'>+	*base = kzalloc(size + L1_CACHE_BYTES, flags);</div><div class='add'>+	if (*base == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return (void *)L1_CACHE_ALIGN((u64)*base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup the channel structures necessary to support XPartition Communication</div><div class='add'>+ * between the specified remote partition and the local one.</div><div class='add'>+ */</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_setup_ch_structures(struct xpc_partition *part)</div><div class='ctx'> {</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+	int ch_number;</div><div class='add'>+	struct xpc_channel *ch;</div><div class='add'>+	short partid = XPC_PARTID(part);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Allocate all of the channel structures as a contiguous chunk of</div><div class='add'>+	 * memory.</div><div class='add'>+	 */</div><div class='ctx'> 	DBUG_ON(part-&gt;channels != NULL);</div><div class='add'>+	part-&gt;channels = kzalloc(sizeof(struct xpc_channel) * XPC_MAX_NCHANNELS,</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (part-&gt;channels == NULL) {</div><div class='add'>+		dev_err(xpc_chan, "can't get memory for channels\n");</div><div class='add'>+		return xpNoMemory;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	dev_dbg(xpc_chan, "activating partition %d\n", XPC_PARTID(part));</div><div class='add'>+	/* allocate the remote open and close args */</div><div class='ctx'> </div><div class='del'>-	if (xpc_setup_infrastructure(part) != xpSuccess)</div><div class='del'>-		return;</div><div class='add'>+	part-&gt;remote_openclose_args =</div><div class='add'>+	    xpc_kzalloc_cacheline_aligned(XPC_OPENCLOSE_ARGS_SIZE,</div><div class='add'>+					  GFP_KERNEL, &amp;part-&gt;</div><div class='add'>+					  remote_openclose_args_base);</div><div class='add'>+	if (part-&gt;remote_openclose_args == NULL) {</div><div class='add'>+		dev_err(xpc_chan, "can't get memory for remote connect args\n");</div><div class='add'>+		ret = xpNoMemory;</div><div class='add'>+		goto out_1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	part-&gt;chctl.all_flags = 0;</div><div class='add'>+	spin_lock_init(&amp;part-&gt;chctl_lock);</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;part-&gt;channel_mgr_requests, 1);</div><div class='add'>+	init_waitqueue_head(&amp;part-&gt;channel_mgr_wq);</div><div class='add'>+</div><div class='add'>+	part-&gt;nchannels = XPC_MAX_NCHANNELS;</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;part-&gt;nchannels_active, 0);</div><div class='add'>+	atomic_set(&amp;part-&gt;nchannels_engaged, 0);</div><div class='add'>+</div><div class='add'>+	for (ch_number = 0; ch_number &lt; part-&gt;nchannels; ch_number++) {</div><div class='add'>+		ch = &amp;part-&gt;channels[ch_number];</div><div class='add'>+</div><div class='add'>+		ch-&gt;partid = partid;</div><div class='add'>+		ch-&gt;number = ch_number;</div><div class='add'>+		ch-&gt;flags = XPC_C_DISCONNECTED;</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;ch-&gt;kthreads_assigned, 0);</div><div class='add'>+		atomic_set(&amp;ch-&gt;kthreads_idle, 0);</div><div class='add'>+		atomic_set(&amp;ch-&gt;kthreads_active, 0);</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;ch-&gt;references, 0);</div><div class='add'>+		atomic_set(&amp;ch-&gt;n_to_notify, 0);</div><div class='add'>+</div><div class='add'>+		spin_lock_init(&amp;ch-&gt;lock);</div><div class='add'>+		init_completion(&amp;ch-&gt;wdisconnect_wait);</div><div class='add'>+</div><div class='add'>+		atomic_set(&amp;ch-&gt;n_on_msg_allocate_wq, 0);</div><div class='add'>+		init_waitqueue_head(&amp;ch-&gt;msg_allocate_wq);</div><div class='add'>+		init_waitqueue_head(&amp;ch-&gt;idle_wq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = xpc_setup_ch_structures_sn(part);</div><div class='add'>+	if (ret != xpSuccess)</div><div class='add'>+		goto out_2;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * With the setting of the partition setup_state to XPC_P_SS_SETUP,</div><div class='add'>+	 * we're declaring that this partition is ready to go.</div><div class='add'>+	 */</div><div class='add'>+	part-&gt;setup_state = XPC_P_SS_SETUP;</div><div class='add'>+</div><div class='add'>+	return xpSuccess;</div><div class='add'>+</div><div class='add'>+	/* setup of ch structures failed */</div><div class='add'>+out_2:</div><div class='add'>+	kfree(part-&gt;remote_openclose_args_base);</div><div class='add'>+	part-&gt;remote_openclose_args = NULL;</div><div class='add'>+out_1:</div><div class='add'>+	kfree(part-&gt;channels);</div><div class='add'>+	part-&gt;channels = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Teardown the channel structures necessary to support XPartition Communication</div><div class='add'>+ * between the specified remote partition and the local one.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_teardown_ch_structures(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	DBUG_ON(atomic_read(&amp;part-&gt;nchannels_engaged) != 0);</div><div class='add'>+	DBUG_ON(atomic_read(&amp;part-&gt;nchannels_active) != 0);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * The kthread that XPC HB called us with will become the</div><div class='del'>-	 * channel manager for this partition. It will not return</div><div class='del'>-	 * back to XPC HB until the partition's XPC infrastructure</div><div class='del'>-	 * has been dismantled.</div><div class='add'>+	 * Make this partition inaccessible to local processes by marking it</div><div class='add'>+	 * as no longer setup. Then wait before proceeding with the teardown</div><div class='add'>+	 * until all existing references cease.</div><div class='ctx'> 	 */</div><div class='add'>+	DBUG_ON(part-&gt;setup_state != XPC_P_SS_SETUP);</div><div class='add'>+	part-&gt;setup_state = XPC_P_SS_WTEARDOWN;</div><div class='ctx'> </div><div class='del'>-	(void)xpc_part_ref(part);	/* this will always succeed */</div><div class='add'>+	wait_event(part-&gt;teardown_wq, (atomic_read(&amp;part-&gt;references) == 0));</div><div class='ctx'> </div><div class='del'>-	if (xpc_make_first_contact(part) == xpSuccess)</div><div class='del'>-		xpc_channel_mgr(part);</div><div class='add'>+	/* now we can begin tearing down the infrastructure */</div><div class='ctx'> </div><div class='del'>-	xpc_part_deref(part);</div><div class='add'>+	xpc_teardown_ch_structures_sn(part);</div><div class='ctx'> </div><div class='del'>-	xpc_teardown_infrastructure(part);</div><div class='add'>+	kfree(part-&gt;remote_openclose_args_base);</div><div class='add'>+	part-&gt;remote_openclose_args = NULL;</div><div class='add'>+	kfree(part-&gt;channels);</div><div class='add'>+	part-&gt;channels = NULL;</div><div class='add'>+</div><div class='add'>+	part-&gt;setup_state = XPC_P_SS_TORNDOWN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * When XPC HB determines that a partition has come up, it will create a new</div><div class='add'>+ * kthread and that kthread will call this function to attempt to set up the</div><div class='add'>+ * basic infrastructure used for Cross Partition Communication with the newly</div><div class='add'>+ * upped partition.</div><div class='add'>+ *</div><div class='add'>+ * The kthread that was created by XPC HB and which setup the XPC</div><div class='add'>+ * infrastructure will remain assigned to the partition becoming the channel</div><div class='add'>+ * manager for that partition until the partition is deactivating, at which</div><div class='add'>+ * time the kthread will teardown the XPC infrastructure and then exit.</div><div class='add'>+ */</div><div class='ctx'> static int</div><div class='ctx'> xpc_activating(void *__partid)</div><div class='ctx'> {</div><div class='hunk'>@@ -433,64 +599,47 @@ xpc_activating(void *__partid)</div><div class='ctx'> 	struct xpc_partition *part = &amp;xpc_partitions[partid];</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='ctx'> </div><div class='del'>-	DBUG_ON(partid &lt;= 0 || partid &gt;= XP_MAX_PARTITIONS);</div><div class='add'>+	DBUG_ON(partid &lt; 0 || partid &gt;= xp_max_npartitions);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;part-&gt;act_lock, irq_flags);</div><div class='ctx'> </div><div class='del'>-	if (part-&gt;act_state == XPC_P_DEACTIVATING) {</div><div class='del'>-		part-&gt;act_state = XPC_P_INACTIVE;</div><div class='add'>+	if (part-&gt;act_state == XPC_P_AS_DEACTIVATING) {</div><div class='add'>+		part-&gt;act_state = XPC_P_AS_INACTIVE;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;part-&gt;act_lock, irq_flags);</div><div class='ctx'> 		part-&gt;remote_rp_pa = 0;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* indicate the thread is activating */</div><div class='del'>-	DBUG_ON(part-&gt;act_state != XPC_P_ACTIVATION_REQ);</div><div class='del'>-	part-&gt;act_state = XPC_P_ACTIVATING;</div><div class='add'>+	DBUG_ON(part-&gt;act_state != XPC_P_AS_ACTIVATION_REQ);</div><div class='add'>+	part-&gt;act_state = XPC_P_AS_ACTIVATING;</div><div class='ctx'> </div><div class='ctx'> 	XPC_SET_REASON(part, 0, 0);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;part-&gt;act_lock, irq_flags);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(xpc_part, "bringing partition %d up\n", partid);</div><div class='add'>+	dev_dbg(xpc_part, "activating partition %d\n", partid);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Register the remote partition's AMOs with SAL so it can handle</div><div class='del'>-	 * and cleanup errors within that address range should the remote</div><div class='del'>-	 * partition go down. We don't unregister this range because it is</div><div class='del'>-	 * difficult to tell when outstanding writes to the remote partition</div><div class='del'>-	 * are finished and thus when it is safe to unregister. This should</div><div class='del'>-	 * not result in wasted space in the SAL xp_addr_region table because</div><div class='del'>-	 * we should get the same page for remote_amos_page_pa after module</div><div class='del'>-	 * reloads and system reboots.</div><div class='del'>-	 */</div><div class='del'>-	if (sn_register_xp_addr_region(part-&gt;remote_amos_page_pa,</div><div class='del'>-				       PAGE_SIZE, 1) &lt; 0) {</div><div class='del'>-		dev_warn(xpc_part, "xpc_partition_up(%d) failed to register "</div><div class='del'>-			 "xp_addr region\n", partid);</div><div class='add'>+	xpc_allow_hb(partid);</div><div class='ctx'> </div><div class='del'>-		spin_lock_irqsave(&amp;part-&gt;act_lock, irq_flags);</div><div class='del'>-		part-&gt;act_state = XPC_P_INACTIVE;</div><div class='del'>-		XPC_SET_REASON(part, xpPhysAddrRegFailed, __LINE__);</div><div class='del'>-		spin_unlock_irqrestore(&amp;part-&gt;act_lock, irq_flags);</div><div class='del'>-		part-&gt;remote_rp_pa = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	if (xpc_setup_ch_structures(part) == xpSuccess) {</div><div class='add'>+		(void)xpc_part_ref(part);	/* this will always succeed */</div><div class='ctx'> </div><div class='del'>-	xpc_allow_hb(partid, xpc_vars);</div><div class='del'>-	xpc_IPI_send_activated(part);</div><div class='add'>+		if (xpc_make_first_contact(part) == xpSuccess) {</div><div class='add'>+			xpc_mark_partition_active(part);</div><div class='add'>+			xpc_channel_mgr(part);</div><div class='add'>+			/* won't return until partition is deactivating */</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * xpc_partition_up() holds this thread and marks this partition as</div><div class='del'>-	 * XPC_P_ACTIVE by calling xpc_hb_mark_active().</div><div class='del'>-	 */</div><div class='del'>-	(void)xpc_partition_up(part);</div><div class='add'>+		xpc_part_deref(part);</div><div class='add'>+		xpc_teardown_ch_structures(part);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	xpc_disallow_hb(partid, xpc_vars);</div><div class='add'>+	xpc_disallow_hb(partid);</div><div class='ctx'> 	xpc_mark_partition_inactive(part);</div><div class='ctx'> </div><div class='ctx'> 	if (part-&gt;reason == xpReactivating) {</div><div class='ctx'> 		/* interrupting ourselves results in activating partition */</div><div class='del'>-		xpc_IPI_send_reactivate(part);</div><div class='add'>+		xpc_request_partition_reactivation(part);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -505,9 +654,9 @@ xpc_activate_partition(struct xpc_partition *part)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;part-&gt;act_lock, irq_flags);</div><div class='ctx'> </div><div class='del'>-	DBUG_ON(part-&gt;act_state != XPC_P_INACTIVE);</div><div class='add'>+	DBUG_ON(part-&gt;act_state != XPC_P_AS_INACTIVE);</div><div class='ctx'> </div><div class='del'>-	part-&gt;act_state = XPC_P_ACTIVATION_REQ;</div><div class='add'>+	part-&gt;act_state = XPC_P_AS_ACTIVATION_REQ;</div><div class='ctx'> 	XPC_SET_REASON(part, xpCloneKThread, __LINE__);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;part-&gt;act_lock, irq_flags);</div><div class='hunk'>@@ -516,62 +665,12 @@ xpc_activate_partition(struct xpc_partition *part)</div><div class='ctx'> 			      partid);</div><div class='ctx'> 	if (IS_ERR(kthread)) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;part-&gt;act_lock, irq_flags);</div><div class='del'>-		part-&gt;act_state = XPC_P_INACTIVE;</div><div class='add'>+		part-&gt;act_state = XPC_P_AS_INACTIVE;</div><div class='ctx'> 		XPC_SET_REASON(part, xpCloneKThreadFailed, __LINE__);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;part-&gt;act_lock, irq_flags);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Handle the receipt of a SGI_XPC_NOTIFY IRQ by seeing whether the specified</div><div class='del'>- * partition actually sent it. Since SGI_XPC_NOTIFY IRQs may be shared by more</div><div class='del'>- * than one partition, we use an AMO_t structure per partition to indicate</div><div class='del'>- * whether a partition has sent an IPI or not.  If it has, then wake up the</div><div class='del'>- * associated kthread to handle it.</div><div class='del'>- *</div><div class='del'>- * All SGI_XPC_NOTIFY IRQs received by XPC are the result of IPIs sent by XPC</div><div class='del'>- * running on other partitions.</div><div class='del'>- *</div><div class='del'>- * Noteworthy Arguments:</div><div class='del'>- *</div><div class='del'>- *	irq - Interrupt ReQuest number. NOT USED.</div><div class='del'>- *</div><div class='del'>- *	dev_id - partid of IPI's potential sender.</div><div class='del'>- */</div><div class='del'>-irqreturn_t</div><div class='del'>-xpc_notify_IRQ_handler(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	short partid = (short)(u64)dev_id;</div><div class='del'>-	struct xpc_partition *part = &amp;xpc_partitions[partid];</div><div class='del'>-</div><div class='del'>-	DBUG_ON(partid &lt;= 0 || partid &gt;= XP_MAX_PARTITIONS);</div><div class='del'>-</div><div class='del'>-	if (xpc_part_ref(part)) {</div><div class='del'>-		xpc_check_for_channel_activity(part);</div><div class='del'>-</div><div class='del'>-		xpc_part_deref(part);</div><div class='del'>-	}</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check to see if xpc_notify_IRQ_handler() dropped any IPIs on the floor</div><div class='del'>- * because the write to their associated IPI amo completed after the IRQ/IPI</div><div class='del'>- * was received.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-xpc_dropped_IPI_check(struct xpc_partition *part)</div><div class='del'>-{</div><div class='del'>-	if (xpc_part_ref(part)) {</div><div class='del'>-		xpc_check_for_channel_activity(part);</div><div class='del'>-</div><div class='del'>-		part-&gt;dropped_IPI_timer.expires = jiffies +</div><div class='del'>-		    XPC_P_DROPPED_IPI_WAIT;</div><div class='del'>-		add_timer(&amp;part-&gt;dropped_IPI_timer);</div><div class='del'>-		xpc_part_deref(part);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void</div><div class='ctx'> xpc_activate_kthreads(struct xpc_channel *ch, int needed)</div><div class='ctx'> {</div><div class='hunk'>@@ -616,9 +715,9 @@ xpc_kthread_waitmsgs(struct xpc_partition *part, struct xpc_channel *ch)</div><div class='ctx'> 	do {</div><div class='ctx'> 		/* deliver messages to their intended recipients */</div><div class='ctx'> </div><div class='del'>-		while (ch-&gt;w_local_GP.get &lt; ch-&gt;w_remote_GP.put &amp;&amp;</div><div class='add'>+		while (xpc_n_of_deliverable_payloads(ch) &gt; 0 &amp;&amp;</div><div class='ctx'> 		       !(ch-&gt;flags &amp; XPC_C_DISCONNECTING)) {</div><div class='del'>-			xpc_deliver_msg(ch);</div><div class='add'>+			xpc_deliver_payload(ch);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (atomic_inc_return(&amp;ch-&gt;kthreads_idle) &gt;</div><div class='hunk'>@@ -632,7 +731,7 @@ xpc_kthread_waitmsgs(struct xpc_partition *part, struct xpc_channel *ch)</div><div class='ctx'> 			"wait_event_interruptible_exclusive()\n");</div><div class='ctx'> </div><div class='ctx'> 		(void)wait_event_interruptible_exclusive(ch-&gt;idle_wq,</div><div class='del'>-				(ch-&gt;w_local_GP.get &lt; ch-&gt;w_remote_GP.put ||</div><div class='add'>+				(xpc_n_of_deliverable_payloads(ch) &gt; 0 ||</div><div class='ctx'> 				 (ch-&gt;flags &amp; XPC_C_DISCONNECTING)));</div><div class='ctx'> </div><div class='ctx'> 		atomic_dec(&amp;ch-&gt;kthreads_idle);</div><div class='hunk'>@@ -677,7 +776,7 @@ xpc_kthread_start(void *args)</div><div class='ctx'> 			 * additional kthreads to help deliver them. We only</div><div class='ctx'> 			 * need one less than total #of messages to deliver.</div><div class='ctx'> 			 */</div><div class='del'>-			n_needed = ch-&gt;w_remote_GP.put - ch-&gt;w_local_GP.get - 1;</div><div class='add'>+			n_needed = xpc_n_of_deliverable_payloads(ch) - 1;</div><div class='ctx'> 			if (n_needed &gt; 0 &amp;&amp; !(ch-&gt;flags &amp; XPC_C_DISCONNECTING))</div><div class='ctx'> 				xpc_activate_kthreads(ch, n_needed);</div><div class='ctx'> </div><div class='hunk'>@@ -703,11 +802,9 @@ xpc_kthread_start(void *args)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='ctx'> </div><div class='del'>-	if (atomic_dec_return(&amp;ch-&gt;kthreads_assigned) == 0) {</div><div class='del'>-		if (atomic_dec_return(&amp;part-&gt;nchannels_engaged) == 0) {</div><div class='del'>-			xpc_mark_partition_disengaged(part);</div><div class='del'>-			xpc_IPI_send_disengage(part);</div><div class='del'>-		}</div><div class='add'>+	if (atomic_dec_return(&amp;ch-&gt;kthreads_assigned) == 0 &amp;&amp;</div><div class='add'>+	    atomic_dec_return(&amp;part-&gt;nchannels_engaged) == 0) {</div><div class='add'>+		xpc_indicate_partition_disengaged(part);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	xpc_msgqueue_deref(ch);</div><div class='hunk'>@@ -758,9 +855,9 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed,</div><div class='ctx'> 		} else if (ch-&gt;flags &amp; XPC_C_DISCONNECTING) {</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		} else if (atomic_inc_return(&amp;ch-&gt;kthreads_assigned) == 1) {</div><div class='del'>-			if (atomic_inc_return(&amp;part-&gt;nchannels_engaged) == 1)</div><div class='del'>-				xpc_mark_partition_engaged(part);</div><div class='add'>+		} else if (atomic_inc_return(&amp;ch-&gt;kthreads_assigned) == 1 &amp;&amp;</div><div class='add'>+			   atomic_inc_return(&amp;part-&gt;nchannels_engaged) == 1) {</div><div class='add'>+				xpc_indicate_partition_engaged(part);</div><div class='ctx'> 		}</div><div class='ctx'> 		(void)xpc_part_ref(part);</div><div class='ctx'> 		xpc_msgqueue_ref(ch);</div><div class='hunk'>@@ -782,8 +879,7 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed,</div><div class='ctx'> </div><div class='ctx'> 			if (atomic_dec_return(&amp;ch-&gt;kthreads_assigned) == 0 &amp;&amp;</div><div class='ctx'> 			    atomic_dec_return(&amp;part-&gt;nchannels_engaged) == 0) {</div><div class='del'>-				xpc_mark_partition_disengaged(part);</div><div class='del'>-				xpc_IPI_send_disengage(part);</div><div class='add'>+				xpc_indicate_partition_disengaged(part);</div><div class='ctx'> 			}</div><div class='ctx'> 			xpc_msgqueue_deref(ch);</div><div class='ctx'> 			xpc_part_deref(part);</div><div class='hunk'>@@ -815,7 +911,7 @@ xpc_disconnect_wait(int ch_number)</div><div class='ctx'> 	int wakeup_channel_mgr;</div><div class='ctx'> </div><div class='ctx'> 	/* now wait for all callouts to the caller's function to cease */</div><div class='del'>-	for (partid = 1; partid &lt; XP_MAX_PARTITIONS; partid++) {</div><div class='add'>+	for (partid = 0; partid &lt; xp_max_npartitions; partid++) {</div><div class='ctx'> 		part = &amp;xpc_partitions[partid];</div><div class='ctx'> </div><div class='ctx'> 		if (!xpc_part_ref(part))</div><div class='hunk'>@@ -834,16 +930,15 @@ xpc_disconnect_wait(int ch_number)</div><div class='ctx'> 		DBUG_ON(!(ch-&gt;flags &amp; XPC_C_DISCONNECTED));</div><div class='ctx'> 		wakeup_channel_mgr = 0;</div><div class='ctx'> </div><div class='del'>-		if (ch-&gt;delayed_IPI_flags) {</div><div class='del'>-			if (part-&gt;act_state != XPC_P_DEACTIVATING) {</div><div class='del'>-				spin_lock(&amp;part-&gt;IPI_lock);</div><div class='del'>-				XPC_SET_IPI_FLAGS(part-&gt;local_IPI_amo,</div><div class='del'>-						  ch-&gt;number,</div><div class='del'>-						  ch-&gt;delayed_IPI_flags);</div><div class='del'>-				spin_unlock(&amp;part-&gt;IPI_lock);</div><div class='add'>+		if (ch-&gt;delayed_chctl_flags) {</div><div class='add'>+			if (part-&gt;act_state != XPC_P_AS_DEACTIVATING) {</div><div class='add'>+				spin_lock(&amp;part-&gt;chctl_lock);</div><div class='add'>+				part-&gt;chctl.flags[ch-&gt;number] |=</div><div class='add'>+				    ch-&gt;delayed_chctl_flags;</div><div class='add'>+				spin_unlock(&amp;part-&gt;chctl_lock);</div><div class='ctx'> 				wakeup_channel_mgr = 1;</div><div class='ctx'> 			}</div><div class='del'>-			ch-&gt;delayed_IPI_flags = 0;</div><div class='add'>+			ch-&gt;delayed_chctl_flags = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ch-&gt;flags &amp;= ~XPC_C_WDISCONNECT;</div><div class='hunk'>@@ -856,13 +951,63 @@ xpc_disconnect_wait(int ch_number)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+xpc_setup_partitions(void)</div><div class='add'>+{</div><div class='add'>+	short partid;</div><div class='add'>+	struct xpc_partition *part;</div><div class='add'>+</div><div class='add'>+	xpc_partitions = kzalloc(sizeof(struct xpc_partition) *</div><div class='add'>+				 xp_max_npartitions, GFP_KERNEL);</div><div class='add'>+	if (xpc_partitions == NULL) {</div><div class='add'>+		dev_err(xpc_part, "can't get memory for partition structure\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The first few fields of each entry of xpc_partitions[] need to</div><div class='add'>+	 * be initialized now so that calls to xpc_connect() and</div><div class='add'>+	 * xpc_disconnect() can be made prior to the activation of any remote</div><div class='add'>+	 * partition. NOTE THAT NONE OF THE OTHER FIELDS BELONGING TO THESE</div><div class='add'>+	 * ENTRIES ARE MEANINGFUL UNTIL AFTER AN ENTRY'S CORRESPONDING</div><div class='add'>+	 * PARTITION HAS BEEN ACTIVATED.</div><div class='add'>+	 */</div><div class='add'>+	for (partid = 0; partid &lt; xp_max_npartitions; partid++) {</div><div class='add'>+		part = &amp;xpc_partitions[partid];</div><div class='add'>+</div><div class='add'>+		DBUG_ON((u64)part != L1_CACHE_ALIGN((u64)part));</div><div class='add'>+</div><div class='add'>+		part-&gt;activate_IRQ_rcvd = 0;</div><div class='add'>+		spin_lock_init(&amp;part-&gt;act_lock);</div><div class='add'>+		part-&gt;act_state = XPC_P_AS_INACTIVE;</div><div class='add'>+		XPC_SET_REASON(part, 0, 0);</div><div class='add'>+</div><div class='add'>+		init_timer(&amp;part-&gt;disengage_timer);</div><div class='add'>+		part-&gt;disengage_timer.function =</div><div class='add'>+		    xpc_timeout_partition_disengage;</div><div class='add'>+		part-&gt;disengage_timer.data = (unsigned long)part;</div><div class='add'>+</div><div class='add'>+		part-&gt;setup_state = XPC_P_SS_UNSET;</div><div class='add'>+		init_waitqueue_head(&amp;part-&gt;teardown_wq);</div><div class='add'>+		atomic_set(&amp;part-&gt;references, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return xpc_setup_partitions_sn();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_teardown_partitions(void)</div><div class='add'>+{</div><div class='add'>+	kfree(xpc_partitions);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> xpc_do_exit(enum xp_retval reason)</div><div class='ctx'> {</div><div class='ctx'> 	short partid;</div><div class='ctx'> 	int active_part_count, printed_waiting_msg = 0;</div><div class='ctx'> 	struct xpc_partition *part;</div><div class='del'>-	unsigned long printmsg_time, disengage_request_timeout = 0;</div><div class='add'>+	unsigned long printmsg_time, disengage_timeout = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* a 'rmmod XPC' and a 'reboot' cannot both end up here together */</div><div class='ctx'> 	DBUG_ON(xpc_exiting == 1);</div><div class='hunk'>@@ -873,10 +1018,7 @@ xpc_do_exit(enum xp_retval reason)</div><div class='ctx'> 	 * the heartbeat checker thread in case it's sleeping.</div><div class='ctx'> 	 */</div><div class='ctx'> 	xpc_exiting = 1;</div><div class='del'>-	wake_up_interruptible(&amp;xpc_act_IRQ_wq);</div><div class='del'>-</div><div class='del'>-	/* ignore all incoming interrupts */</div><div class='del'>-	free_irq(SGI_XPC_ACTIVATE, NULL);</div><div class='add'>+	wake_up_interruptible(&amp;xpc_activate_IRQ_wq);</div><div class='ctx'> </div><div class='ctx'> 	/* wait for the discovery thread to exit */</div><div class='ctx'> 	wait_for_completion(&amp;xpc_discovery_exited);</div><div class='hunk'>@@ -889,17 +1031,17 @@ xpc_do_exit(enum xp_retval reason)</div><div class='ctx'> </div><div class='ctx'> 	/* wait for all partitions to become inactive */</div><div class='ctx'> </div><div class='del'>-	printmsg_time = jiffies + (XPC_DISENGAGE_PRINTMSG_INTERVAL * HZ);</div><div class='del'>-	xpc_disengage_request_timedout = 0;</div><div class='add'>+	printmsg_time = jiffies + (XPC_DEACTIVATE_PRINTMSG_INTERVAL * HZ);</div><div class='add'>+	xpc_disengage_timedout = 0;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		active_part_count = 0;</div><div class='ctx'> </div><div class='del'>-		for (partid = 1; partid &lt; XP_MAX_PARTITIONS; partid++) {</div><div class='add'>+		for (partid = 0; partid &lt; xp_max_npartitions; partid++) {</div><div class='ctx'> 			part = &amp;xpc_partitions[partid];</div><div class='ctx'> </div><div class='ctx'> 			if (xpc_partition_disengaged(part) &amp;&amp;</div><div class='del'>-			    part-&gt;act_state == XPC_P_INACTIVE) {</div><div class='add'>+			    part-&gt;act_state == XPC_P_AS_INACTIVE) {</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -907,36 +1049,32 @@ xpc_do_exit(enum xp_retval reason)</div><div class='ctx'> </div><div class='ctx'> 			XPC_DEACTIVATE_PARTITION(part, reason);</div><div class='ctx'> </div><div class='del'>-			if (part-&gt;disengage_request_timeout &gt;</div><div class='del'>-			    disengage_request_timeout) {</div><div class='del'>-				disengage_request_timeout =</div><div class='del'>-				    part-&gt;disengage_request_timeout;</div><div class='del'>-			}</div><div class='add'>+			if (part-&gt;disengage_timeout &gt; disengage_timeout)</div><div class='add'>+				disengage_timeout = part-&gt;disengage_timeout;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (xpc_partition_engaged(-1UL)) {</div><div class='del'>-			if (time_after(jiffies, printmsg_time)) {</div><div class='add'>+		if (xpc_any_partition_engaged()) {</div><div class='add'>+			if (time_is_before_jiffies(printmsg_time)) {</div><div class='ctx'> 				dev_info(xpc_part, "waiting for remote "</div><div class='del'>-					 "partitions to disengage, timeout in "</div><div class='del'>-					 "%ld seconds\n",</div><div class='del'>-					 (disengage_request_timeout - jiffies)</div><div class='del'>-					 / HZ);</div><div class='add'>+					 "partitions to deactivate, timeout in "</div><div class='add'>+					 "%ld seconds\n", (disengage_timeout -</div><div class='add'>+					 jiffies) / HZ);</div><div class='ctx'> 				printmsg_time = jiffies +</div><div class='del'>-				    (XPC_DISENGAGE_PRINTMSG_INTERVAL * HZ);</div><div class='add'>+				    (XPC_DEACTIVATE_PRINTMSG_INTERVAL * HZ);</div><div class='ctx'> 				printed_waiting_msg = 1;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 		} else if (active_part_count &gt; 0) {</div><div class='ctx'> 			if (printed_waiting_msg) {</div><div class='ctx'> 				dev_info(xpc_part, "waiting for local partition"</div><div class='del'>-					 " to disengage\n");</div><div class='add'>+					 " to deactivate\n");</div><div class='ctx'> 				printed_waiting_msg = 0;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 		} else {</div><div class='del'>-			if (!xpc_disengage_request_timedout) {</div><div class='add'>+			if (!xpc_disengage_timedout) {</div><div class='ctx'> 				dev_info(xpc_part, "all partitions have "</div><div class='del'>-					 "disengaged\n");</div><div class='add'>+					 "deactivated\n");</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -946,33 +1084,28 @@ xpc_do_exit(enum xp_retval reason)</div><div class='ctx'> </div><div class='ctx'> 	} while (1);</div><div class='ctx'> </div><div class='del'>-	DBUG_ON(xpc_partition_engaged(-1UL));</div><div class='add'>+	DBUG_ON(xpc_any_partition_engaged());</div><div class='add'>+	DBUG_ON(xpc_any_hbs_allowed() != 0);</div><div class='ctx'> </div><div class='del'>-	/* indicate to others that our reserved page is uninitialized */</div><div class='del'>-	xpc_rsvd_page-&gt;vars_pa = 0;</div><div class='del'>-</div><div class='del'>-	/* now it's time to eliminate our heartbeat */</div><div class='del'>-	del_timer_sync(&amp;xpc_hb_timer);</div><div class='del'>-	DBUG_ON(xpc_vars-&gt;heartbeating_to_mask != 0);</div><div class='add'>+	xpc_teardown_rsvd_page();</div><div class='ctx'> </div><div class='ctx'> 	if (reason == xpUnloading) {</div><div class='del'>-		/* take ourselves off of the reboot_notifier_list */</div><div class='del'>-		(void)unregister_reboot_notifier(&amp;xpc_reboot_notifier);</div><div class='del'>-</div><div class='del'>-		/* take ourselves off of the die_notifier list */</div><div class='ctx'> 		(void)unregister_die_notifier(&amp;xpc_die_notifier);</div><div class='add'>+		(void)unregister_reboot_notifier(&amp;xpc_reboot_notifier);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* close down protections for IPI operations */</div><div class='del'>-	xpc_restrict_IPI_ops();</div><div class='del'>-</div><div class='ctx'> 	/* clear the interface to XPC's functions */</div><div class='ctx'> 	xpc_clear_interface();</div><div class='ctx'> </div><div class='ctx'> 	if (xpc_sysctl)</div><div class='ctx'> 		unregister_sysctl_table(xpc_sysctl);</div><div class='ctx'> </div><div class='del'>-	kfree(xpc_remote_copy_buffer_base);</div><div class='add'>+	xpc_teardown_partitions();</div><div class='add'>+</div><div class='add'>+	if (is_shub())</div><div class='add'>+		xpc_exit_sn2();</div><div class='add'>+	else</div><div class='add'>+		xpc_exit_uv();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1002,60 +1135,57 @@ xpc_system_reboot(struct notifier_block *nb, unsigned long event, void *unused)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Notify other partitions to disengage from all references to our memory.</div><div class='add'>+ * Notify other partitions to deactivate from us by first disengaging from all</div><div class='add'>+ * references to our memory.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-xpc_die_disengage(void)</div><div class='add'>+xpc_die_deactivate(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct xpc_partition *part;</div><div class='ctx'> 	short partid;</div><div class='del'>-	unsigned long engaged;</div><div class='del'>-	long time, printmsg_time, disengage_request_timeout;</div><div class='add'>+	int any_engaged;</div><div class='add'>+	long keep_waiting;</div><div class='add'>+	long wait_to_print;</div><div class='ctx'> </div><div class='ctx'> 	/* keep xpc_hb_checker thread from doing anything (just in case) */</div><div class='ctx'> 	xpc_exiting = 1;</div><div class='ctx'> </div><div class='del'>-	xpc_vars-&gt;heartbeating_to_mask = 0;	/* indicate we're deactivated */</div><div class='add'>+	xpc_disallow_all_hbs();	/*indicate we're deactivated */</div><div class='ctx'> </div><div class='del'>-	for (partid = 1; partid &lt; XP_MAX_PARTITIONS; partid++) {</div><div class='add'>+	for (partid = 0; partid &lt; xp_max_npartitions; partid++) {</div><div class='ctx'> 		part = &amp;xpc_partitions[partid];</div><div class='ctx'> </div><div class='del'>-		if (!XPC_SUPPORTS_DISENGAGE_REQUEST(part-&gt;</div><div class='del'>-		    remote_vars_version)) {</div><div class='del'>-</div><div class='del'>-			/* just in case it was left set by an earlier XPC */</div><div class='del'>-			xpc_clear_partition_engaged(1UL &lt;&lt; partid);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (xpc_partition_engaged(1UL &lt;&lt; partid) ||</div><div class='del'>-		    part-&gt;act_state != XPC_P_INACTIVE) {</div><div class='del'>-			xpc_request_partition_disengage(part);</div><div class='del'>-			xpc_mark_partition_disengaged(part);</div><div class='del'>-			xpc_IPI_send_disengage(part);</div><div class='add'>+		if (xpc_partition_engaged(partid) ||</div><div class='add'>+		    part-&gt;act_state != XPC_P_AS_INACTIVE) {</div><div class='add'>+			xpc_request_partition_deactivation(part);</div><div class='add'>+			xpc_indicate_partition_disengaged(part);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	time = rtc_time();</div><div class='del'>-	printmsg_time = time +</div><div class='del'>-	    (XPC_DISENGAGE_PRINTMSG_INTERVAL * sn_rtc_cycles_per_second);</div><div class='del'>-	disengage_request_timeout = time +</div><div class='del'>-	    (xpc_disengage_request_timelimit * sn_rtc_cycles_per_second);</div><div class='del'>-</div><div class='del'>-	/* wait for all other partitions to disengage from us */</div><div class='add'>+	/*</div><div class='add'>+	 * Though we requested that all other partitions deactivate from us,</div><div class='add'>+	 * we only wait until they've all disengaged or we've reached the</div><div class='add'>+	 * defined timelimit.</div><div class='add'>+	 *</div><div class='add'>+	 * Given that one iteration through the following while-loop takes</div><div class='add'>+	 * approximately 200 microseconds, calculate the #of loops to take</div><div class='add'>+	 * before bailing and the #of loops before printing a waiting message.</div><div class='add'>+	 */</div><div class='add'>+	keep_waiting = xpc_disengage_timelimit * 1000 * 5;</div><div class='add'>+	wait_to_print = XPC_DEACTIVATE_PRINTMSG_INTERVAL * 1000 * 5;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='del'>-		engaged = xpc_partition_engaged(-1UL);</div><div class='del'>-		if (!engaged) {</div><div class='del'>-			dev_info(xpc_part, "all partitions have disengaged\n");</div><div class='add'>+		any_engaged = xpc_any_partition_engaged();</div><div class='add'>+		if (!any_engaged) {</div><div class='add'>+			dev_info(xpc_part, "all partitions have deactivated\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		time = rtc_time();</div><div class='del'>-		if (time &gt;= disengage_request_timeout) {</div><div class='del'>-			for (partid = 1; partid &lt; XP_MAX_PARTITIONS; partid++) {</div><div class='del'>-				if (engaged &amp; (1UL &lt;&lt; partid)) {</div><div class='del'>-					dev_info(xpc_part, "disengage from "</div><div class='add'>+		if (!keep_waiting--) {</div><div class='add'>+			for (partid = 0; partid &lt; xp_max_npartitions;</div><div class='add'>+			     partid++) {</div><div class='add'>+				if (xpc_partition_engaged(partid)) {</div><div class='add'>+					dev_info(xpc_part, "deactivate from "</div><div class='ctx'> 						 "remote partition %d timed "</div><div class='ctx'> 						 "out\n", partid);</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1063,15 +1193,15 @@ xpc_die_disengage(void)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (time &gt;= printmsg_time) {</div><div class='add'>+		if (!wait_to_print--) {</div><div class='ctx'> 			dev_info(xpc_part, "waiting for remote partitions to "</div><div class='del'>-				 "disengage, timeout in %ld seconds\n",</div><div class='del'>-				 (disengage_request_timeout - time) /</div><div class='del'>-				 sn_rtc_cycles_per_second);</div><div class='del'>-			printmsg_time = time +</div><div class='del'>-			    (XPC_DISENGAGE_PRINTMSG_INTERVAL *</div><div class='del'>-			     sn_rtc_cycles_per_second);</div><div class='add'>+				 "deactivate, timeout in %ld seconds\n",</div><div class='add'>+				 keep_waiting / (1000 * 5));</div><div class='add'>+			wait_to_print = XPC_DEACTIVATE_PRINTMSG_INTERVAL *</div><div class='add'>+			    1000 * 5;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		udelay(200);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1086,10 +1216,11 @@ xpc_die_disengage(void)</div><div class='ctx'> static int</div><div class='ctx'> xpc_system_die(struct notifier_block *nb, unsigned long event, void *unused)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_IA64		/* !!! temporary kludge */</div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case DIE_MACHINE_RESTART:</div><div class='ctx'> 	case DIE_MACHINE_HALT:</div><div class='del'>-		xpc_die_disengage();</div><div class='add'>+		xpc_die_deactivate();</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case DIE_KDEBUG_ENTER:</div><div class='hunk'>@@ -1100,8 +1231,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *unused)</div><div class='ctx'> 		/* fall through */</div><div class='ctx'> 	case DIE_MCA_MONARCH_ENTER:</div><div class='ctx'> 	case DIE_INIT_MONARCH_ENTER:</div><div class='del'>-		xpc_vars-&gt;heartbeat++;</div><div class='del'>-		xpc_vars-&gt;heartbeat_offline = 1;</div><div class='add'>+		xpc_offline_heartbeat();</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case DIE_KDEBUG_LEAVE:</div><div class='hunk'>@@ -1112,10 +1242,12 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *unused)</div><div class='ctx'> 		/* fall through */</div><div class='ctx'> 	case DIE_MCA_MONARCH_LEAVE:</div><div class='ctx'> 	case DIE_INIT_MONARCH_LEAVE:</div><div class='del'>-		xpc_vars-&gt;heartbeat++;</div><div class='del'>-		xpc_vars-&gt;heartbeat_offline = 0;</div><div class='add'>+		xpc_online_heartbeat();</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+#else</div><div class='add'>+	xpc_die_deactivate();</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='hunk'>@@ -1124,105 +1256,52 @@ int __init</div><div class='ctx'> xpc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	short partid;</div><div class='del'>-	struct xpc_partition *part;</div><div class='ctx'> 	struct task_struct *kthread;</div><div class='del'>-	size_t buf_size;</div><div class='del'>-</div><div class='del'>-	if (!ia64_platform_is("sn2"))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	buf_size = max(XPC_RP_VARS_SIZE,</div><div class='del'>-		       XPC_RP_HEADER_SIZE + XP_NASID_MASK_BYTES);</div><div class='del'>-	xpc_remote_copy_buffer = xpc_kmalloc_cacheline_aligned(buf_size,</div><div class='del'>-							       GFP_KERNEL,</div><div class='del'>-						  &amp;xpc_remote_copy_buffer_base);</div><div class='del'>-	if (xpc_remote_copy_buffer == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	snprintf(xpc_part-&gt;bus_id, BUS_ID_SIZE, "part");</div><div class='ctx'> 	snprintf(xpc_chan-&gt;bus_id, BUS_ID_SIZE, "chan");</div><div class='ctx'> </div><div class='del'>-	xpc_sysctl = register_sysctl_table(xpc_sys_dir);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The first few fields of each entry of xpc_partitions[] need to</div><div class='del'>-	 * be initialized now so that calls to xpc_connect() and</div><div class='del'>-	 * xpc_disconnect() can be made prior to the activation of any remote</div><div class='del'>-	 * partition. NOTE THAT NONE OF THE OTHER FIELDS BELONGING TO THESE</div><div class='del'>-	 * ENTRIES ARE MEANINGFUL UNTIL AFTER AN ENTRY'S CORRESPONDING</div><div class='del'>-	 * PARTITION HAS BEEN ACTIVATED.</div><div class='del'>-	 */</div><div class='del'>-	for (partid = 1; partid &lt; XP_MAX_PARTITIONS; partid++) {</div><div class='del'>-		part = &amp;xpc_partitions[partid];</div><div class='del'>-</div><div class='del'>-		DBUG_ON((u64)part != L1_CACHE_ALIGN((u64)part));</div><div class='del'>-</div><div class='del'>-		part-&gt;act_IRQ_rcvd = 0;</div><div class='del'>-		spin_lock_init(&amp;part-&gt;act_lock);</div><div class='del'>-		part-&gt;act_state = XPC_P_INACTIVE;</div><div class='del'>-		XPC_SET_REASON(part, 0, 0);</div><div class='add'>+	if (is_shub()) {</div><div class='add'>+		/*</div><div class='add'>+		 * The ia64-sn2 architecture supports at most 64 partitions.</div><div class='add'>+		 * And the inability to unregister remote amos restricts us</div><div class='add'>+		 * further to only support exactly 64 partitions on this</div><div class='add'>+		 * architecture, no less.</div><div class='add'>+		 */</div><div class='add'>+		if (xp_max_npartitions != 64) {</div><div class='add'>+			dev_err(xpc_part, "max #of partitions not set to 64\n");</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		} else {</div><div class='add'>+			ret = xpc_init_sn2();</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		init_timer(&amp;part-&gt;disengage_request_timer);</div><div class='del'>-		part-&gt;disengage_request_timer.function =</div><div class='del'>-		    xpc_timeout_partition_disengage_request;</div><div class='del'>-		part-&gt;disengage_request_timer.data = (unsigned long)part;</div><div class='add'>+	} else if (is_uv()) {</div><div class='add'>+		ret = xpc_init_uv();</div><div class='ctx'> </div><div class='del'>-		part-&gt;setup_state = XPC_P_UNSET;</div><div class='del'>-		init_waitqueue_head(&amp;part-&gt;teardown_wq);</div><div class='del'>-		atomic_set(&amp;part-&gt;references, 0);</div><div class='add'>+	} else {</div><div class='add'>+		ret = -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Open up protections for IPI operations (and AMO operations on</div><div class='del'>-	 * Shub 1.1 systems).</div><div class='del'>-	 */</div><div class='del'>-	xpc_allow_IPI_ops();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Interrupts being processed will increment this atomic variable and</div><div class='del'>-	 * awaken the heartbeat thread which will process the interrupts.</div><div class='del'>-	 */</div><div class='del'>-	atomic_set(&amp;xpc_act_IRQ_rcvd, 0);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * This is safe to do before the xpc_hb_checker thread has started</div><div class='del'>-	 * because the handler releases a wait queue.  If an interrupt is</div><div class='del'>-	 * received before the thread is waiting, it will not go to sleep,</div><div class='del'>-	 * but rather immediately process the interrupt.</div><div class='del'>-	 */</div><div class='del'>-	ret = request_irq(SGI_XPC_ACTIVATE, xpc_act_IRQ_handler, 0,</div><div class='del'>-			  "xpc hb", NULL);</div><div class='add'>+	ret = xpc_setup_partitions();</div><div class='ctx'> 	if (ret != 0) {</div><div class='del'>-		dev_err(xpc_part, "can't register ACTIVATE IRQ handler, "</div><div class='del'>-			"errno=%d\n", -ret);</div><div class='del'>-</div><div class='del'>-		xpc_restrict_IPI_ops();</div><div class='del'>-</div><div class='del'>-		if (xpc_sysctl)</div><div class='del'>-			unregister_sysctl_table(xpc_sysctl);</div><div class='del'>-</div><div class='del'>-		kfree(xpc_remote_copy_buffer_base);</div><div class='del'>-		return -EBUSY;</div><div class='add'>+		dev_err(xpc_part, "can't get memory for partition structure\n");</div><div class='add'>+		goto out_1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	xpc_sysctl = register_sysctl_table(xpc_sys_dir);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Fill the partition reserved page with the information needed by</div><div class='ctx'> 	 * other partitions to discover we are alive and establish initial</div><div class='ctx'> 	 * communications.</div><div class='ctx'> 	 */</div><div class='del'>-	xpc_rsvd_page = xpc_rsvd_page_init();</div><div class='del'>-	if (xpc_rsvd_page == NULL) {</div><div class='del'>-		dev_err(xpc_part, "could not setup our reserved page\n");</div><div class='del'>-</div><div class='del'>-		free_irq(SGI_XPC_ACTIVATE, NULL);</div><div class='del'>-		xpc_restrict_IPI_ops();</div><div class='del'>-</div><div class='del'>-		if (xpc_sysctl)</div><div class='del'>-			unregister_sysctl_table(xpc_sysctl);</div><div class='del'>-</div><div class='del'>-		kfree(xpc_remote_copy_buffer_base);</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	ret = xpc_setup_rsvd_page();</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(xpc_part, "can't setup our reserved page\n");</div><div class='add'>+		goto out_2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* add ourselves to the reboot_notifier_list */</div><div class='hunk'>@@ -1235,9 +1314,6 @@ xpc_init(void)</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		dev_warn(xpc_part, "can't register die notifier\n");</div><div class='ctx'> </div><div class='del'>-	init_timer(&amp;xpc_hb_timer);</div><div class='del'>-	xpc_hb_timer.function = xpc_hb_beater;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The real work-horse behind xpc.  This processes incoming</div><div class='ctx'> 	 * interrupts and monitors remote heartbeats.</div><div class='hunk'>@@ -1245,25 +1321,8 @@ xpc_init(void)</div><div class='ctx'> 	kthread = kthread_run(xpc_hb_checker, NULL, XPC_HB_CHECK_THREAD_NAME);</div><div class='ctx'> 	if (IS_ERR(kthread)) {</div><div class='ctx'> 		dev_err(xpc_part, "failed while forking hb check thread\n");</div><div class='del'>-</div><div class='del'>-		/* indicate to others that our reserved page is uninitialized */</div><div class='del'>-		xpc_rsvd_page-&gt;vars_pa = 0;</div><div class='del'>-</div><div class='del'>-		/* take ourselves off of the reboot_notifier_list */</div><div class='del'>-		(void)unregister_reboot_notifier(&amp;xpc_reboot_notifier);</div><div class='del'>-</div><div class='del'>-		/* take ourselves off of the die_notifier list */</div><div class='del'>-		(void)unregister_die_notifier(&amp;xpc_die_notifier);</div><div class='del'>-</div><div class='del'>-		del_timer_sync(&amp;xpc_hb_timer);</div><div class='del'>-		free_irq(SGI_XPC_ACTIVATE, NULL);</div><div class='del'>-		xpc_restrict_IPI_ops();</div><div class='del'>-</div><div class='del'>-		if (xpc_sysctl)</div><div class='del'>-			unregister_sysctl_table(xpc_sysctl);</div><div class='del'>-</div><div class='del'>-		kfree(xpc_remote_copy_buffer_base);</div><div class='del'>-		return -EBUSY;</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out_3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1285,11 +1344,28 @@ xpc_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* set the interface to point at XPC's functions */</div><div class='ctx'> 	xpc_set_interface(xpc_initiate_connect, xpc_initiate_disconnect,</div><div class='del'>-			  xpc_initiate_allocate, xpc_initiate_send,</div><div class='del'>-			  xpc_initiate_send_notify, xpc_initiate_received,</div><div class='del'>-			  xpc_initiate_partid_to_nasids);</div><div class='add'>+			  xpc_initiate_send, xpc_initiate_send_notify,</div><div class='add'>+			  xpc_initiate_received, xpc_initiate_partid_to_nasids);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+	/* initialization was not successful */</div><div class='add'>+out_3:</div><div class='add'>+	xpc_teardown_rsvd_page();</div><div class='add'>+</div><div class='add'>+	(void)unregister_die_notifier(&amp;xpc_die_notifier);</div><div class='add'>+	(void)unregister_reboot_notifier(&amp;xpc_reboot_notifier);</div><div class='add'>+out_2:</div><div class='add'>+	if (xpc_sysctl)</div><div class='add'>+		unregister_sysctl_table(xpc_sysctl);</div><div class='add'>+</div><div class='add'>+	xpc_teardown_partitions();</div><div class='add'>+out_1:</div><div class='add'>+	if (is_shub())</div><div class='add'>+		xpc_exit_sn2();</div><div class='add'>+	else</div><div class='add'>+		xpc_exit_uv();</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(xpc_init);</div><div class='hunk'>@@ -1314,9 +1390,9 @@ module_param(xpc_hb_check_interval, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(xpc_hb_check_interval, "Number of seconds between "</div><div class='ctx'> 		 "heartbeat checks.");</div><div class='ctx'> </div><div class='del'>-module_param(xpc_disengage_request_timelimit, int, 0);</div><div class='del'>-MODULE_PARM_DESC(xpc_disengage_request_timelimit, "Number of seconds to wait "</div><div class='del'>-		 "for disengage request to complete.");</div><div class='add'>+module_param(xpc_disengage_timelimit, int, 0);</div><div class='add'>+MODULE_PARM_DESC(xpc_disengage_timelimit, "Number of seconds to wait "</div><div class='add'>+		 "for disengage to complete.");</div><div class='ctx'> </div><div class='ctx'> module_param(xpc_kdebug_ignore, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(xpc_kdebug_ignore, "Should lack of heartbeat be ignored by "</div><div class='head'>diff --git a/drivers/misc/sgi-xp/xpc_partition.c b/drivers/misc/sgi-xp/xpc_partition.c<br/>index 7dd4b5812c42..6722f6fe4dc7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xpc_partition.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/misc/sgi-xp/xpc_partition.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xpc_partition.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xpc_partition.c</a></div><div class='hunk'>@@ -15,57 +15,22 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sysctl.h&gt;</div><div class='del'>-#include &lt;linux/cache.h&gt;</div><div class='del'>-#include &lt;linux/mmzone.h&gt;</div><div class='del'>-#include &lt;linux/nodemask.h&gt;</div><div class='del'>-#include &lt;asm/uncached.h&gt;</div><div class='del'>-#include &lt;asm/sn/bte.h&gt;</div><div class='del'>-#include &lt;asm/sn/intr.h&gt;</div><div class='del'>-#include &lt;asm/sn/sn_sal.h&gt;</div><div class='del'>-#include &lt;asm/sn/nodepda.h&gt;</div><div class='del'>-#include &lt;asm/sn/addrs.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include "xpc.h"</div><div class='ctx'> </div><div class='ctx'> /* XPC is exiting flag */</div><div class='ctx'> int xpc_exiting;</div><div class='ctx'> </div><div class='del'>-/* SH_IPI_ACCESS shub register value on startup */</div><div class='del'>-static u64 xpc_sh1_IPI_access;</div><div class='del'>-static u64 xpc_sh2_IPI_access0;</div><div class='del'>-static u64 xpc_sh2_IPI_access1;</div><div class='del'>-static u64 xpc_sh2_IPI_access2;</div><div class='del'>-static u64 xpc_sh2_IPI_access3;</div><div class='del'>-</div><div class='del'>-/* original protection values for each node */</div><div class='del'>-u64 xpc_prot_vec[MAX_NUMNODES];</div><div class='del'>-</div><div class='ctx'> /* this partition's reserved page pointers */</div><div class='ctx'> struct xpc_rsvd_page *xpc_rsvd_page;</div><div class='del'>-static u64 *xpc_part_nasids;</div><div class='del'>-static u64 *xpc_mach_nasids;</div><div class='del'>-struct xpc_vars *xpc_vars;</div><div class='del'>-struct xpc_vars_part *xpc_vars_part;</div><div class='add'>+static unsigned long *xpc_part_nasids;</div><div class='add'>+unsigned long *xpc_mach_nasids;</div><div class='ctx'> </div><div class='del'>-static int xp_nasid_mask_bytes;	/* actual size in bytes of nasid mask */</div><div class='del'>-static int xp_nasid_mask_words;	/* actual size in words of nasid mask */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For performance reasons, each entry of xpc_partitions[] is cacheline</div><div class='del'>- * aligned. And xpc_partitions[] is padded with an additional entry at the</div><div class='del'>- * end so that the last legitimate entry doesn't share its cacheline with</div><div class='del'>- * another variable.</div><div class='del'>- */</div><div class='del'>-struct xpc_partition xpc_partitions[XP_MAX_PARTITIONS + 1];</div><div class='add'>+static int xpc_nasid_mask_nbytes;	/* #of bytes in nasid mask */</div><div class='add'>+int xpc_nasid_mask_nlongs;	/* #of longs in nasid mask */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Generic buffer used to store a local copy of portions of a remote</div><div class='del'>- * partition's reserved page (either its header and part_nasids mask,</div><div class='del'>- * or its vars).</div><div class='del'>- */</div><div class='del'>-char *xpc_remote_copy_buffer;</div><div class='del'>-void *xpc_remote_copy_buffer_base;</div><div class='add'>+struct xpc_partition *xpc_partitions;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Guarantee that the kmalloc'd memory is cacheline aligned.</div><div class='hunk'>@@ -95,56 +60,59 @@ xpc_kmalloc_cacheline_aligned(size_t size, gfp_t flags, void **base)</div><div class='ctx'>  * Given a nasid, get the physical address of the  partition's reserved page</div><div class='ctx'>  * for that nasid. This function returns 0 on any error.</div><div class='ctx'>  */</div><div class='del'>-static u64</div><div class='add'>+static unsigned long</div><div class='ctx'> xpc_get_rsvd_page_pa(int nasid)</div><div class='ctx'> {</div><div class='del'>-	bte_result_t bte_res;</div><div class='del'>-	s64 status;</div><div class='add'>+	enum xp_retval ret;</div><div class='ctx'> 	u64 cookie = 0;</div><div class='del'>-	u64 rp_pa = nasid;	/* seed with nasid */</div><div class='del'>-	u64 len = 0;</div><div class='del'>-	u64 buf = buf;</div><div class='del'>-	u64 buf_len = 0;</div><div class='add'>+	unsigned long rp_pa = nasid;	/* seed with nasid */</div><div class='add'>+	size_t len = 0;</div><div class='add'>+	size_t buf_len = 0;</div><div class='add'>+	void *buf = buf;</div><div class='ctx'> 	void *buf_base = NULL;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> </div><div class='del'>-		status = sn_partition_reserved_page_pa(buf, &amp;cookie, &amp;rp_pa,</div><div class='del'>-						       &amp;len);</div><div class='add'>+		/* !!! rp_pa will need to be _gpa on UV.</div><div class='add'>+		 * ??? So do we save it into the architecture specific parts</div><div class='add'>+		 * ??? of the xpc_partition structure? Do we rename this</div><div class='add'>+		 * ??? function or have two versions? Rename rp_pa for UV to</div><div class='add'>+		 * ??? rp_gpa?</div><div class='add'>+		 */</div><div class='add'>+		ret = xpc_get_partition_rsvd_page_pa(buf, &amp;cookie, &amp;rp_pa,</div><div class='add'>+						     &amp;len);</div><div class='ctx'> </div><div class='del'>-		dev_dbg(xpc_part, "SAL returned with status=%li, cookie="</div><div class='del'>-			"0x%016lx, address=0x%016lx, len=0x%016lx\n",</div><div class='del'>-			status, cookie, rp_pa, len);</div><div class='add'>+		dev_dbg(xpc_part, "SAL returned with ret=%d, cookie=0x%016lx, "</div><div class='add'>+			"address=0x%016lx, len=0x%016lx\n", ret,</div><div class='add'>+			(unsigned long)cookie, rp_pa, len);</div><div class='ctx'> </div><div class='del'>-		if (status != SALRET_MORE_PASSES)</div><div class='add'>+		if (ret != xpNeedMoreInfo)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		/* !!! L1_CACHE_ALIGN() is only a sn2-bte_copy requirement */</div><div class='ctx'> 		if (L1_CACHE_ALIGN(len) &gt; buf_len) {</div><div class='ctx'> 			kfree(buf_base);</div><div class='ctx'> 			buf_len = L1_CACHE_ALIGN(len);</div><div class='del'>-			buf = (u64)xpc_kmalloc_cacheline_aligned(buf_len,</div><div class='del'>-								 GFP_KERNEL,</div><div class='del'>-								 &amp;buf_base);</div><div class='add'>+			buf = xpc_kmalloc_cacheline_aligned(buf_len, GFP_KERNEL,</div><div class='add'>+							    &amp;buf_base);</div><div class='ctx'> 			if (buf_base == NULL) {</div><div class='ctx'> 				dev_err(xpc_part, "unable to kmalloc "</div><div class='ctx'> 					"len=0x%016lx\n", buf_len);</div><div class='del'>-				status = SALRET_ERROR;</div><div class='add'>+				ret = xpNoMemory;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		bte_res = xp_bte_copy(rp_pa, buf, buf_len,</div><div class='del'>-				      (BTE_NOTIFY | BTE_WACQUIRE), NULL);</div><div class='del'>-		if (bte_res != BTE_SUCCESS) {</div><div class='del'>-			dev_dbg(xpc_part, "xp_bte_copy failed %i\n", bte_res);</div><div class='del'>-			status = SALRET_ERROR;</div><div class='add'>+		ret = xp_remote_memcpy(xp_pa(buf), rp_pa, buf_len);</div><div class='add'>+		if (ret != xpSuccess) {</div><div class='add'>+			dev_dbg(xpc_part, "xp_remote_memcpy failed %d\n", ret);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(buf_base);</div><div class='ctx'> </div><div class='del'>-	if (status != SALRET_OK)</div><div class='add'>+	if (ret != xpSuccess)</div><div class='ctx'> 		rp_pa = 0;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(xpc_part, "reserved page at phys address 0x%016lx\n", rp_pa);</div><div class='hunk'>@@ -156,300 +124,77 @@ xpc_get_rsvd_page_pa(int nasid)</div><div class='ctx'>  * other partitions to discover we are alive and establish initial</div><div class='ctx'>  * communications.</div><div class='ctx'>  */</div><div class='del'>-struct xpc_rsvd_page *</div><div class='del'>-xpc_rsvd_page_init(void)</div><div class='add'>+int</div><div class='add'>+xpc_setup_rsvd_page(void)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct xpc_rsvd_page *rp;</div><div class='del'>-	AMO_t *amos_page;</div><div class='del'>-	u64 rp_pa, nasid_array = 0;</div><div class='del'>-	int i, ret;</div><div class='add'>+	unsigned long rp_pa;</div><div class='add'>+	unsigned long new_ts_jiffies;</div><div class='ctx'> </div><div class='ctx'> 	/* get the local reserved page's address */</div><div class='ctx'> </div><div class='ctx'> 	preempt_disable();</div><div class='del'>-	rp_pa = xpc_get_rsvd_page_pa(cpuid_to_nasid(smp_processor_id()));</div><div class='add'>+	rp_pa = xpc_get_rsvd_page_pa(xp_cpu_to_nasid(smp_processor_id()));</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> 	if (rp_pa == 0) {</div><div class='ctx'> 		dev_err(xpc_part, "SAL failed to locate the reserved page\n");</div><div class='del'>-		return NULL;</div><div class='add'>+		return -ESRCH;</div><div class='ctx'> 	}</div><div class='ctx'> 	rp = (struct xpc_rsvd_page *)__va(rp_pa);</div><div class='ctx'> </div><div class='del'>-	if (rp-&gt;partid != sn_partition_id) {</div><div class='del'>-		dev_err(xpc_part, "the reserved page's partid of %d should be "</div><div class='del'>-			"%d\n", rp-&gt;partid, sn_partition_id);</div><div class='del'>-		return NULL;</div><div class='add'>+	if (rp-&gt;SAL_version &lt; 3) {</div><div class='add'>+		/* SAL_versions &lt; 3 had a SAL_partid defined as a u8 */</div><div class='add'>+		rp-&gt;SAL_partid &amp;= 0xff;</div><div class='add'>+	}</div><div class='add'>+	BUG_ON(rp-&gt;SAL_partid != xp_partition_id);</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;SAL_partid &lt; 0 || rp-&gt;SAL_partid &gt;= xp_max_npartitions) {</div><div class='add'>+		dev_err(xpc_part, "the reserved page's partid of %d is outside "</div><div class='add'>+			"supported range (&lt; 0 || &gt;= %d)\n", rp-&gt;SAL_partid,</div><div class='add'>+			xp_max_npartitions);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rp-&gt;version = XPC_RP_VERSION;</div><div class='add'>+	rp-&gt;max_npartitions = xp_max_npartitions;</div><div class='ctx'> </div><div class='ctx'> 	/* establish the actual sizes of the nasid masks */</div><div class='ctx'> 	if (rp-&gt;SAL_version == 1) {</div><div class='ctx'> 		/* SAL_version 1 didn't set the nasids_size field */</div><div class='del'>-		rp-&gt;nasids_size = 128;</div><div class='add'>+		rp-&gt;SAL_nasids_size = 128;</div><div class='ctx'> 	}</div><div class='del'>-	xp_nasid_mask_bytes = rp-&gt;nasids_size;</div><div class='del'>-	xp_nasid_mask_words = xp_nasid_mask_bytes / 8;</div><div class='add'>+	xpc_nasid_mask_nbytes = rp-&gt;SAL_nasids_size;</div><div class='add'>+	xpc_nasid_mask_nlongs = BITS_TO_LONGS(rp-&gt;SAL_nasids_size *</div><div class='add'>+					      BITS_PER_BYTE);</div><div class='ctx'> </div><div class='ctx'> 	/* setup the pointers to the various items in the reserved page */</div><div class='ctx'> 	xpc_part_nasids = XPC_RP_PART_NASIDS(rp);</div><div class='ctx'> 	xpc_mach_nasids = XPC_RP_MACH_NASIDS(rp);</div><div class='del'>-	xpc_vars = XPC_RP_VARS(rp);</div><div class='del'>-	xpc_vars_part = XPC_RP_VARS_PART(rp);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Before clearing xpc_vars, see if a page of AMOs had been previously</div><div class='del'>-	 * allocated. If not we'll need to allocate one and set permissions</div><div class='del'>-	 * so that cross-partition AMOs are allowed.</div><div class='del'>-	 *</div><div class='del'>-	 * The allocated AMO page needs MCA reporting to remain disabled after</div><div class='del'>-	 * XPC has unloaded.  To make this work, we keep a copy of the pointer</div><div class='del'>-	 * to this page (i.e., amos_page) in the struct xpc_vars structure,</div><div class='del'>-	 * which is pointed to by the reserved page, and re-use that saved copy</div><div class='del'>-	 * on subsequent loads of XPC. This AMO page is never freed, and its</div><div class='del'>-	 * memory protections are never restricted.</div><div class='del'>-	 */</div><div class='del'>-	amos_page = xpc_vars-&gt;amos_page;</div><div class='del'>-	if (amos_page == NULL) {</div><div class='del'>-		amos_page = (AMO_t *)TO_AMO(uncached_alloc_page(0, 1));</div><div class='del'>-		if (amos_page == NULL) {</div><div class='del'>-			dev_err(xpc_part, "can't allocate page of AMOs\n");</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Open up AMO-R/W to cpu.  This is done for Shub 1.1 systems</div><div class='del'>-		 * when xpc_allow_IPI_ops() is called via xpc_hb_init().</div><div class='del'>-		 */</div><div class='del'>-		if (!enable_shub_wars_1_1()) {</div><div class='del'>-			ret = sn_change_memprotect(ia64_tpa((u64)amos_page),</div><div class='del'>-						   PAGE_SIZE,</div><div class='del'>-						   SN_MEMPROT_ACCESS_CLASS_1,</div><div class='del'>-						   &amp;nasid_array);</div><div class='del'>-			if (ret != 0) {</div><div class='del'>-				dev_err(xpc_part, "can't change memory "</div><div class='del'>-					"protections\n");</div><div class='del'>-				uncached_free_page(__IA64_UNCACHED_OFFSET |</div><div class='del'>-						   TO_PHYS((u64)amos_page), 1);</div><div class='del'>-				return NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (!IS_AMO_ADDRESS((u64)amos_page)) {</div><div class='del'>-		/*</div><div class='del'>-		 * EFI's XPBOOT can also set amos_page in the reserved page,</div><div class='del'>-		 * but it happens to leave it as an uncached physical address</div><div class='del'>-		 * and we need it to be an uncached virtual, so we'll have to</div><div class='del'>-		 * convert it.</div><div class='del'>-		 */</div><div class='del'>-		if (!IS_AMO_PHYS_ADDRESS((u64)amos_page)) {</div><div class='del'>-			dev_err(xpc_part, "previously used amos_page address "</div><div class='del'>-				"is bad = 0x%p\n", (void *)amos_page);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		amos_page = (AMO_t *)TO_AMO((u64)amos_page);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* clear xpc_vars */</div><div class='del'>-	memset(xpc_vars, 0, sizeof(struct xpc_vars));</div><div class='del'>-</div><div class='del'>-	xpc_vars-&gt;version = XPC_V_VERSION;</div><div class='del'>-	xpc_vars-&gt;act_nasid = cpuid_to_nasid(0);</div><div class='del'>-	xpc_vars-&gt;act_phys_cpuid = cpu_physical_id(0);</div><div class='del'>-	xpc_vars-&gt;vars_part_pa = __pa(xpc_vars_part);</div><div class='del'>-	xpc_vars-&gt;amos_page_pa = ia64_tpa((u64)amos_page);</div><div class='del'>-	xpc_vars-&gt;amos_page = amos_page;	/* save for next load of XPC */</div><div class='del'>-</div><div class='del'>-	/* clear xpc_vars_part */</div><div class='del'>-	memset((u64 *)xpc_vars_part, 0, sizeof(struct xpc_vars_part) *</div><div class='del'>-	       XP_MAX_PARTITIONS);</div><div class='del'>-</div><div class='del'>-	/* initialize the activate IRQ related AMO variables */</div><div class='del'>-	for (i = 0; i &lt; xp_nasid_mask_words; i++)</div><div class='del'>-		(void)xpc_IPI_init(XPC_ACTIVATE_IRQ_AMOS + i);</div><div class='del'>-</div><div class='del'>-	/* initialize the engaged remote partitions related AMO variables */</div><div class='del'>-	(void)xpc_IPI_init(XPC_ENGAGED_PARTITIONS_AMO);</div><div class='del'>-	(void)xpc_IPI_init(XPC_DISENGAGE_REQUEST_AMO);</div><div class='ctx'> </div><div class='del'>-	/* timestamp of when reserved page was setup by XPC */</div><div class='del'>-	rp-&gt;stamp = CURRENT_TIME;</div><div class='add'>+	ret = xpc_setup_rsvd_page_sn(rp);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Set timestamp of when reserved page was setup by XPC.</div><div class='ctx'> 	 * This signifies to the remote partition that our reserved</div><div class='ctx'> 	 * page is initialized.</div><div class='ctx'> 	 */</div><div class='del'>-	rp-&gt;vars_pa = __pa(xpc_vars);</div><div class='add'>+	new_ts_jiffies = jiffies;</div><div class='add'>+	if (new_ts_jiffies == 0 || new_ts_jiffies == rp-&gt;ts_jiffies)</div><div class='add'>+		new_ts_jiffies++;</div><div class='add'>+	rp-&gt;ts_jiffies = new_ts_jiffies;</div><div class='ctx'> </div><div class='del'>-	return rp;</div><div class='add'>+	xpc_rsvd_page = rp;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Change protections to allow IPI operations (and AMO operations on</div><div class='del'>- * Shub 1.1 systems).</div><div class='del'>- */</div><div class='ctx'> void</div><div class='del'>-xpc_allow_IPI_ops(void)</div><div class='add'>+xpc_teardown_rsvd_page(void)</div><div class='ctx'> {</div><div class='del'>-	int node;</div><div class='del'>-	int nasid;</div><div class='del'>-</div><div class='del'>-	/* &gt;&gt;&gt; Change SH_IPI_ACCESS code to use SAL call once it is available */</div><div class='del'>-</div><div class='del'>-	if (is_shub2()) {</div><div class='del'>-		xpc_sh2_IPI_access0 =</div><div class='del'>-		    (u64)HUB_L((u64 *)LOCAL_MMR_ADDR(SH2_IPI_ACCESS0));</div><div class='del'>-		xpc_sh2_IPI_access1 =</div><div class='del'>-		    (u64)HUB_L((u64 *)LOCAL_MMR_ADDR(SH2_IPI_ACCESS1));</div><div class='del'>-		xpc_sh2_IPI_access2 =</div><div class='del'>-		    (u64)HUB_L((u64 *)LOCAL_MMR_ADDR(SH2_IPI_ACCESS2));</div><div class='del'>-		xpc_sh2_IPI_access3 =</div><div class='del'>-		    (u64)HUB_L((u64 *)LOCAL_MMR_ADDR(SH2_IPI_ACCESS3));</div><div class='del'>-</div><div class='del'>-		for_each_online_node(node) {</div><div class='del'>-			nasid = cnodeid_to_nasid(node);</div><div class='del'>-			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS0),</div><div class='del'>-			      -1UL);</div><div class='del'>-			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS1),</div><div class='del'>-			      -1UL);</div><div class='del'>-			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS2),</div><div class='del'>-			      -1UL);</div><div class='del'>-			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS3),</div><div class='del'>-			      -1UL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		xpc_sh1_IPI_access =</div><div class='del'>-		    (u64)HUB_L((u64 *)LOCAL_MMR_ADDR(SH1_IPI_ACCESS));</div><div class='del'>-</div><div class='del'>-		for_each_online_node(node) {</div><div class='del'>-			nasid = cnodeid_to_nasid(node);</div><div class='del'>-			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH1_IPI_ACCESS),</div><div class='del'>-			      -1UL);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Since the BIST collides with memory operations on</div><div class='del'>-			 * SHUB 1.1 sn_change_memprotect() cannot be used.</div><div class='del'>-			 */</div><div class='del'>-			if (enable_shub_wars_1_1()) {</div><div class='del'>-				/* open up everything */</div><div class='del'>-				xpc_prot_vec[node] = (u64)HUB_L((u64 *)</div><div class='del'>-								GLOBAL_MMR_ADDR</div><div class='del'>-								(nasid,</div><div class='del'>-						  SH1_MD_DQLP_MMR_DIR_PRIVEC0));</div><div class='del'>-				HUB_S((u64 *)</div><div class='del'>-				      GLOBAL_MMR_ADDR(nasid,</div><div class='del'>-						   SH1_MD_DQLP_MMR_DIR_PRIVEC0),</div><div class='del'>-				      -1UL);</div><div class='del'>-				HUB_S((u64 *)</div><div class='del'>-				      GLOBAL_MMR_ADDR(nasid,</div><div class='del'>-						   SH1_MD_DQRP_MMR_DIR_PRIVEC0),</div><div class='del'>-				      -1UL);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Restrict protections to disallow IPI operations (and AMO operations on</div><div class='del'>- * Shub 1.1 systems).</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-xpc_restrict_IPI_ops(void)</div><div class='del'>-{</div><div class='del'>-	int node;</div><div class='del'>-	int nasid;</div><div class='del'>-</div><div class='del'>-	/* &gt;&gt;&gt; Change SH_IPI_ACCESS code to use SAL call once it is available */</div><div class='del'>-</div><div class='del'>-	if (is_shub2()) {</div><div class='del'>-</div><div class='del'>-		for_each_online_node(node) {</div><div class='del'>-			nasid = cnodeid_to_nasid(node);</div><div class='del'>-			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS0),</div><div class='del'>-			      xpc_sh2_IPI_access0);</div><div class='del'>-			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS1),</div><div class='del'>-			      xpc_sh2_IPI_access1);</div><div class='del'>-			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS2),</div><div class='del'>-			      xpc_sh2_IPI_access2);</div><div class='del'>-			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS3),</div><div class='del'>-			      xpc_sh2_IPI_access3);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-</div><div class='del'>-		for_each_online_node(node) {</div><div class='del'>-			nasid = cnodeid_to_nasid(node);</div><div class='del'>-			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH1_IPI_ACCESS),</div><div class='del'>-			      xpc_sh1_IPI_access);</div><div class='del'>-</div><div class='del'>-			if (enable_shub_wars_1_1()) {</div><div class='del'>-				HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid,</div><div class='del'>-						   SH1_MD_DQLP_MMR_DIR_PRIVEC0),</div><div class='del'>-				      xpc_prot_vec[node]);</div><div class='del'>-				HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid,</div><div class='del'>-						   SH1_MD_DQRP_MMR_DIR_PRIVEC0),</div><div class='del'>-				      xpc_prot_vec[node]);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * At periodic intervals, scan through all active partitions and ensure</div><div class='del'>- * their heartbeat is still active.  If not, the partition is deactivated.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-xpc_check_remote_hb(void)</div><div class='del'>-{</div><div class='del'>-	struct xpc_vars *remote_vars;</div><div class='del'>-	struct xpc_partition *part;</div><div class='del'>-	short partid;</div><div class='del'>-	bte_result_t bres;</div><div class='del'>-</div><div class='del'>-	remote_vars = (struct xpc_vars *)xpc_remote_copy_buffer;</div><div class='del'>-</div><div class='del'>-	for (partid = 1; partid &lt; XP_MAX_PARTITIONS; partid++) {</div><div class='del'>-</div><div class='del'>-		if (xpc_exiting)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (partid == sn_partition_id)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		part = &amp;xpc_partitions[partid];</div><div class='del'>-</div><div class='del'>-		if (part-&gt;act_state == XPC_P_INACTIVE ||</div><div class='del'>-		    part-&gt;act_state == XPC_P_DEACTIVATING) {</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* pull the remote_hb cache line */</div><div class='del'>-		bres = xp_bte_copy(part-&gt;remote_vars_pa,</div><div class='del'>-				   (u64)remote_vars,</div><div class='del'>-				   XPC_RP_VARS_SIZE,</div><div class='del'>-				   (BTE_NOTIFY | BTE_WACQUIRE), NULL);</div><div class='del'>-		if (bres != BTE_SUCCESS) {</div><div class='del'>-			XPC_DEACTIVATE_PARTITION(part,</div><div class='del'>-						 xpc_map_bte_errors(bres));</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dev_dbg(xpc_part, "partid = %d, heartbeat = %ld, last_heartbeat"</div><div class='del'>-			" = %ld, heartbeat_offline = %ld, HB_mask = 0x%lx\n",</div><div class='del'>-			partid, remote_vars-&gt;heartbeat, part-&gt;last_heartbeat,</div><div class='del'>-			remote_vars-&gt;heartbeat_offline,</div><div class='del'>-			remote_vars-&gt;heartbeating_to_mask);</div><div class='del'>-</div><div class='del'>-		if (((remote_vars-&gt;heartbeat == part-&gt;last_heartbeat) &amp;&amp;</div><div class='del'>-		     (remote_vars-&gt;heartbeat_offline == 0)) ||</div><div class='del'>-		    !xpc_hb_allowed(sn_partition_id, remote_vars)) {</div><div class='del'>-</div><div class='del'>-			XPC_DEACTIVATE_PARTITION(part, xpNoHeartbeat);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		part-&gt;last_heartbeat = remote_vars-&gt;heartbeat;</div><div class='del'>-	}</div><div class='add'>+	/* a zero timestamp indicates our rsvd page is not initialized */</div><div class='add'>+	xpc_rsvd_page-&gt;ts_jiffies = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -459,11 +204,12 @@ xpc_check_remote_hb(void)</div><div class='ctx'>  * is large enough to contain a copy of their reserved page header and</div><div class='ctx'>  * part_nasids mask.</div><div class='ctx'>  */</div><div class='del'>-static enum xp_retval</div><div class='del'>-xpc_get_remote_rp(int nasid, u64 *discovered_nasids,</div><div class='del'>-		  struct xpc_rsvd_page *remote_rp, u64 *remote_rp_pa)</div><div class='add'>+enum xp_retval</div><div class='add'>+xpc_get_remote_rp(int nasid, unsigned long *discovered_nasids,</div><div class='add'>+		  struct xpc_rsvd_page *remote_rp, unsigned long *remote_rp_pa)</div><div class='ctx'> {</div><div class='del'>-	int bres, i;</div><div class='add'>+	int l;</div><div class='add'>+	enum xp_retval ret;</div><div class='ctx'> </div><div class='ctx'> 	/* get the reserved page's physical address */</div><div class='ctx'> </div><div class='hunk'>@@ -472,355 +218,45 @@ xpc_get_remote_rp(int nasid, u64 *discovered_nasids,</div><div class='ctx'> 		return xpNoRsvdPageAddr;</div><div class='ctx'> </div><div class='ctx'> 	/* pull over the reserved page header and part_nasids mask */</div><div class='del'>-	bres = xp_bte_copy(*remote_rp_pa, (u64)remote_rp,</div><div class='del'>-			   XPC_RP_HEADER_SIZE + xp_nasid_mask_bytes,</div><div class='del'>-			   (BTE_NOTIFY | BTE_WACQUIRE), NULL);</div><div class='del'>-	if (bres != BTE_SUCCESS)</div><div class='del'>-		return xpc_map_bte_errors(bres);</div><div class='add'>+	ret = xp_remote_memcpy(xp_pa(remote_rp), *remote_rp_pa,</div><div class='add'>+			       XPC_RP_HEADER_SIZE + xpc_nasid_mask_nbytes);</div><div class='add'>+	if (ret != xpSuccess)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (discovered_nasids != NULL) {</div><div class='del'>-		u64 *remote_part_nasids = XPC_RP_PART_NASIDS(remote_rp);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; xp_nasid_mask_words; i++)</div><div class='del'>-			discovered_nasids[i] |= remote_part_nasids[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check that the partid is for another partition */</div><div class='add'>+		unsigned long *remote_part_nasids =</div><div class='add'>+		    XPC_RP_PART_NASIDS(remote_rp);</div><div class='ctx'> </div><div class='del'>-	if (remote_rp-&gt;partid &lt; 1 ||</div><div class='del'>-	    remote_rp-&gt;partid &gt; (XP_MAX_PARTITIONS - 1)) {</div><div class='del'>-		return xpInvalidPartid;</div><div class='add'>+		for (l = 0; l &lt; xpc_nasid_mask_nlongs; l++)</div><div class='add'>+			discovered_nasids[l] |= remote_part_nasids[l];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (remote_rp-&gt;partid == sn_partition_id)</div><div class='del'>-		return xpLocalPartid;</div><div class='add'>+	/* zero timestamp indicates the reserved page has not been setup */</div><div class='add'>+	if (remote_rp-&gt;ts_jiffies == 0)</div><div class='add'>+		return xpRsvdPageNotSet;</div><div class='ctx'> </div><div class='ctx'> 	if (XPC_VERSION_MAJOR(remote_rp-&gt;version) !=</div><div class='ctx'> 	    XPC_VERSION_MAJOR(XPC_RP_VERSION)) {</div><div class='ctx'> 		return xpBadVersion;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return xpSuccess;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get a copy of the remote partition's XPC variables from the reserved page.</div><div class='del'>- *</div><div class='del'>- * remote_vars points to a buffer that is cacheline aligned for BTE copies and</div><div class='del'>- * assumed to be of size XPC_RP_VARS_SIZE.</div><div class='del'>- */</div><div class='del'>-static enum xp_retval</div><div class='del'>-xpc_get_remote_vars(u64 remote_vars_pa, struct xpc_vars *remote_vars)</div><div class='del'>-{</div><div class='del'>-	int bres;</div><div class='del'>-</div><div class='del'>-	if (remote_vars_pa == 0)</div><div class='del'>-		return xpVarsNotSet;</div><div class='del'>-</div><div class='del'>-	/* pull over the cross partition variables */</div><div class='del'>-	bres = xp_bte_copy(remote_vars_pa, (u64)remote_vars, XPC_RP_VARS_SIZE,</div><div class='del'>-			   (BTE_NOTIFY | BTE_WACQUIRE), NULL);</div><div class='del'>-	if (bres != BTE_SUCCESS)</div><div class='del'>-		return xpc_map_bte_errors(bres);</div><div class='del'>-</div><div class='del'>-	if (XPC_VERSION_MAJOR(remote_vars-&gt;version) !=</div><div class='del'>-	    XPC_VERSION_MAJOR(XPC_V_VERSION)) {</div><div class='del'>-		return xpBadVersion;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return xpSuccess;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Update the remote partition's info.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-xpc_update_partition_info(struct xpc_partition *part, u8 remote_rp_version,</div><div class='del'>-			  struct timespec *remote_rp_stamp, u64 remote_rp_pa,</div><div class='del'>-			  u64 remote_vars_pa, struct xpc_vars *remote_vars)</div><div class='del'>-{</div><div class='del'>-	part-&gt;remote_rp_version = remote_rp_version;</div><div class='del'>-	dev_dbg(xpc_part, "  remote_rp_version = 0x%016x\n",</div><div class='del'>-		part-&gt;remote_rp_version);</div><div class='del'>-</div><div class='del'>-	part-&gt;remote_rp_stamp = *remote_rp_stamp;</div><div class='del'>-	dev_dbg(xpc_part, "  remote_rp_stamp (tv_sec = 0x%lx tv_nsec = 0x%lx\n",</div><div class='del'>-		part-&gt;remote_rp_stamp.tv_sec, part-&gt;remote_rp_stamp.tv_nsec);</div><div class='del'>-</div><div class='del'>-	part-&gt;remote_rp_pa = remote_rp_pa;</div><div class='del'>-	dev_dbg(xpc_part, "  remote_rp_pa = 0x%016lx\n", part-&gt;remote_rp_pa);</div><div class='del'>-</div><div class='del'>-	part-&gt;remote_vars_pa = remote_vars_pa;</div><div class='del'>-	dev_dbg(xpc_part, "  remote_vars_pa = 0x%016lx\n",</div><div class='del'>-		part-&gt;remote_vars_pa);</div><div class='del'>-</div><div class='del'>-	part-&gt;last_heartbeat = remote_vars-&gt;heartbeat;</div><div class='del'>-	dev_dbg(xpc_part, "  last_heartbeat = 0x%016lx\n",</div><div class='del'>-		part-&gt;last_heartbeat);</div><div class='del'>-</div><div class='del'>-	part-&gt;remote_vars_part_pa = remote_vars-&gt;vars_part_pa;</div><div class='del'>-	dev_dbg(xpc_part, "  remote_vars_part_pa = 0x%016lx\n",</div><div class='del'>-		part-&gt;remote_vars_part_pa);</div><div class='del'>-</div><div class='del'>-	part-&gt;remote_act_nasid = remote_vars-&gt;act_nasid;</div><div class='del'>-	dev_dbg(xpc_part, "  remote_act_nasid = 0x%x\n",</div><div class='del'>-		part-&gt;remote_act_nasid);</div><div class='del'>-</div><div class='del'>-	part-&gt;remote_act_phys_cpuid = remote_vars-&gt;act_phys_cpuid;</div><div class='del'>-	dev_dbg(xpc_part, "  remote_act_phys_cpuid = 0x%x\n",</div><div class='del'>-		part-&gt;remote_act_phys_cpuid);</div><div class='del'>-</div><div class='del'>-	part-&gt;remote_amos_page_pa = remote_vars-&gt;amos_page_pa;</div><div class='del'>-	dev_dbg(xpc_part, "  remote_amos_page_pa = 0x%lx\n",</div><div class='del'>-		part-&gt;remote_amos_page_pa);</div><div class='del'>-</div><div class='del'>-	part-&gt;remote_vars_version = remote_vars-&gt;version;</div><div class='del'>-	dev_dbg(xpc_part, "  remote_vars_version = 0x%x\n",</div><div class='del'>-		part-&gt;remote_vars_version);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Prior code has determined the nasid which generated an IPI.  Inspect</div><div class='del'>- * that nasid to determine if its partition needs to be activated or</div><div class='del'>- * deactivated.</div><div class='del'>- *</div><div class='del'>- * A partition is consider "awaiting activation" if our partition</div><div class='del'>- * flags indicate it is not active and it has a heartbeat.  A</div><div class='del'>- * partition is considered "awaiting deactivation" if our partition</div><div class='del'>- * flags indicate it is active but it has no heartbeat or it is not</div><div class='del'>- * sending its heartbeat to us.</div><div class='del'>- *</div><div class='del'>- * To determine the heartbeat, the remote nasid must have a properly</div><div class='del'>- * initialized reserved page.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-xpc_identify_act_IRQ_req(int nasid)</div><div class='del'>-{</div><div class='del'>-	struct xpc_rsvd_page *remote_rp;</div><div class='del'>-	struct xpc_vars *remote_vars;</div><div class='del'>-	u64 remote_rp_pa;</div><div class='del'>-	u64 remote_vars_pa;</div><div class='del'>-	int remote_rp_version;</div><div class='del'>-	int reactivate = 0;</div><div class='del'>-	int stamp_diff;</div><div class='del'>-	struct timespec remote_rp_stamp = { 0, 0 };</div><div class='del'>-	short partid;</div><div class='del'>-	struct xpc_partition *part;</div><div class='del'>-	enum xp_retval ret;</div><div class='del'>-</div><div class='del'>-	/* pull over the reserved page structure */</div><div class='del'>-</div><div class='del'>-	remote_rp = (struct xpc_rsvd_page *)xpc_remote_copy_buffer;</div><div class='del'>-</div><div class='del'>-	ret = xpc_get_remote_rp(nasid, NULL, remote_rp, &amp;remote_rp_pa);</div><div class='del'>-	if (ret != xpSuccess) {</div><div class='del'>-		dev_warn(xpc_part, "unable to get reserved page from nasid %d, "</div><div class='del'>-			 "which sent interrupt, reason=%d\n", nasid, ret);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	remote_vars_pa = remote_rp-&gt;vars_pa;</div><div class='del'>-	remote_rp_version = remote_rp-&gt;version;</div><div class='del'>-	if (XPC_SUPPORTS_RP_STAMP(remote_rp_version))</div><div class='del'>-		remote_rp_stamp = remote_rp-&gt;stamp;</div><div class='del'>-</div><div class='del'>-	partid = remote_rp-&gt;partid;</div><div class='del'>-	part = &amp;xpc_partitions[partid];</div><div class='del'>-</div><div class='del'>-	/* pull over the cross partition variables */</div><div class='del'>-</div><div class='del'>-	remote_vars = (struct xpc_vars *)xpc_remote_copy_buffer;</div><div class='del'>-</div><div class='del'>-	ret = xpc_get_remote_vars(remote_vars_pa, remote_vars);</div><div class='del'>-	if (ret != xpSuccess) {</div><div class='del'>-</div><div class='del'>-		dev_warn(xpc_part, "unable to get XPC variables from nasid %d, "</div><div class='del'>-			 "which sent interrupt, reason=%d\n", nasid, ret);</div><div class='del'>-</div><div class='del'>-		XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	part-&gt;act_IRQ_rcvd++;</div><div class='del'>-</div><div class='del'>-	dev_dbg(xpc_part, "partid for nasid %d is %d; IRQs = %d; HB = "</div><div class='del'>-		"%ld:0x%lx\n", (int)nasid, (int)partid, part-&gt;act_IRQ_rcvd,</div><div class='del'>-		remote_vars-&gt;heartbeat, remote_vars-&gt;heartbeating_to_mask);</div><div class='del'>-</div><div class='del'>-	if (xpc_partition_disengaged(part) &amp;&amp;</div><div class='del'>-	    part-&gt;act_state == XPC_P_INACTIVE) {</div><div class='del'>-</div><div class='del'>-		xpc_update_partition_info(part, remote_rp_version,</div><div class='del'>-					  &amp;remote_rp_stamp, remote_rp_pa,</div><div class='del'>-					  remote_vars_pa, remote_vars);</div><div class='del'>-</div><div class='del'>-		if (XPC_SUPPORTS_DISENGAGE_REQUEST(part-&gt;remote_vars_version)) {</div><div class='del'>-			if (xpc_partition_disengage_requested(1UL &lt;&lt; partid)) {</div><div class='del'>-				/*</div><div class='del'>-				 * Other side is waiting on us to disengage,</div><div class='del'>-				 * even though we already have.</div><div class='del'>-				 */</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* other side doesn't support disengage requests */</div><div class='del'>-			xpc_clear_partition_disengage_request(1UL &lt;&lt; partid);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		xpc_activate_partition(part);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DBUG_ON(part-&gt;remote_rp_version == 0);</div><div class='del'>-	DBUG_ON(part-&gt;remote_vars_version == 0);</div><div class='del'>-</div><div class='del'>-	if (!XPC_SUPPORTS_RP_STAMP(part-&gt;remote_rp_version)) {</div><div class='del'>-		DBUG_ON(XPC_SUPPORTS_DISENGAGE_REQUEST(part-&gt;</div><div class='del'>-						       remote_vars_version));</div><div class='del'>-</div><div class='del'>-		if (!XPC_SUPPORTS_RP_STAMP(remote_rp_version)) {</div><div class='del'>-			DBUG_ON(XPC_SUPPORTS_DISENGAGE_REQUEST(remote_vars-&gt;</div><div class='del'>-							       version));</div><div class='del'>-			/* see if the other side rebooted */</div><div class='del'>-			if (part-&gt;remote_amos_page_pa ==</div><div class='del'>-			    remote_vars-&gt;amos_page_pa &amp;&amp;</div><div class='del'>-			    xpc_hb_allowed(sn_partition_id, remote_vars)) {</div><div class='del'>-				/* doesn't look that way, so ignore the IPI */</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Other side rebooted and previous XPC didn't support the</div><div class='del'>-		 * disengage request, so we don't need to do anything special.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		xpc_update_partition_info(part, remote_rp_version,</div><div class='del'>-					  &amp;remote_rp_stamp, remote_rp_pa,</div><div class='del'>-					  remote_vars_pa, remote_vars);</div><div class='del'>-		part-&gt;reactivate_nasid = nasid;</div><div class='del'>-		XPC_DEACTIVATE_PARTITION(part, xpReactivating);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DBUG_ON(!XPC_SUPPORTS_DISENGAGE_REQUEST(part-&gt;remote_vars_version));</div><div class='del'>-</div><div class='del'>-	if (!XPC_SUPPORTS_RP_STAMP(remote_rp_version)) {</div><div class='del'>-		DBUG_ON(!XPC_SUPPORTS_DISENGAGE_REQUEST(remote_vars-&gt;version));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Other side rebooted and previous XPC did support the</div><div class='del'>-		 * disengage request, but the new one doesn't.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		xpc_clear_partition_engaged(1UL &lt;&lt; partid);</div><div class='del'>-		xpc_clear_partition_disengage_request(1UL &lt;&lt; partid);</div><div class='del'>-</div><div class='del'>-		xpc_update_partition_info(part, remote_rp_version,</div><div class='del'>-					  &amp;remote_rp_stamp, remote_rp_pa,</div><div class='del'>-					  remote_vars_pa, remote_vars);</div><div class='del'>-		reactivate = 1;</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		DBUG_ON(!XPC_SUPPORTS_DISENGAGE_REQUEST(remote_vars-&gt;version));</div><div class='del'>-</div><div class='del'>-		stamp_diff = xpc_compare_stamps(&amp;part-&gt;remote_rp_stamp,</div><div class='del'>-						&amp;remote_rp_stamp);</div><div class='del'>-		if (stamp_diff != 0) {</div><div class='del'>-			DBUG_ON(stamp_diff &gt;= 0);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Other side rebooted and the previous XPC did support</div><div class='del'>-			 * the disengage request, as does the new one.</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			DBUG_ON(xpc_partition_engaged(1UL &lt;&lt; partid));</div><div class='del'>-			DBUG_ON(xpc_partition_disengage_requested(1UL &lt;&lt;</div><div class='del'>-								  partid));</div><div class='del'>-</div><div class='del'>-			xpc_update_partition_info(part, remote_rp_version,</div><div class='del'>-						  &amp;remote_rp_stamp,</div><div class='del'>-						  remote_rp_pa, remote_vars_pa,</div><div class='del'>-						  remote_vars);</div><div class='del'>-			reactivate = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (part-&gt;disengage_request_timeout &gt; 0 &amp;&amp;</div><div class='del'>-	    !xpc_partition_disengaged(part)) {</div><div class='del'>-		/* still waiting on other side to disengage from us */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (reactivate) {</div><div class='del'>-		part-&gt;reactivate_nasid = nasid;</div><div class='del'>-		XPC_DEACTIVATE_PARTITION(part, xpReactivating);</div><div class='del'>-</div><div class='del'>-	} else if (XPC_SUPPORTS_DISENGAGE_REQUEST(part-&gt;remote_vars_version) &amp;&amp;</div><div class='del'>-		   xpc_partition_disengage_requested(1UL &lt;&lt; partid)) {</div><div class='del'>-		XPC_DEACTIVATE_PARTITION(part, xpOtherGoingDown);</div><div class='add'>+	/* check that both remote and local partids are valid for each side */</div><div class='add'>+	if (remote_rp-&gt;SAL_partid &lt; 0 ||</div><div class='add'>+	    remote_rp-&gt;SAL_partid &gt;= xp_max_npartitions ||</div><div class='add'>+	    remote_rp-&gt;max_npartitions &lt;= xp_partition_id) {</div><div class='add'>+		return xpInvalidPartid;</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Loop through the activation AMO variables and process any bits</div><div class='del'>- * which are set.  Each bit indicates a nasid sending a partition</div><div class='del'>- * activation or deactivation request.</div><div class='del'>- *</div><div class='del'>- * Return #of IRQs detected.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-xpc_identify_act_IRQ_sender(void)</div><div class='del'>-{</div><div class='del'>-	int word, bit;</div><div class='del'>-	u64 nasid_mask;</div><div class='del'>-	u64 nasid;		/* remote nasid */</div><div class='del'>-	int n_IRQs_detected = 0;</div><div class='del'>-	AMO_t *act_amos;</div><div class='del'>-</div><div class='del'>-	act_amos = xpc_vars-&gt;amos_page + XPC_ACTIVATE_IRQ_AMOS;</div><div class='del'>-</div><div class='del'>-	/* scan through act AMO variable looking for non-zero entries */</div><div class='del'>-	for (word = 0; word &lt; xp_nasid_mask_words; word++) {</div><div class='del'>-</div><div class='del'>-		if (xpc_exiting)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		nasid_mask = xpc_IPI_receive(&amp;act_amos[word]);</div><div class='del'>-		if (nasid_mask == 0) {</div><div class='del'>-			/* no IRQs from nasids in this variable */</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dev_dbg(xpc_part, "AMO[%d] gave back 0x%lx\n", word,</div><div class='del'>-			nasid_mask);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If this nasid has been added to the machine since</div><div class='del'>-		 * our partition was reset, this will retain the</div><div class='del'>-		 * remote nasid in our reserved pages machine mask.</div><div class='del'>-		 * This is used in the event of module reload.</div><div class='del'>-		 */</div><div class='del'>-		xpc_mach_nasids[word] |= nasid_mask;</div><div class='del'>-</div><div class='del'>-		/* locate the nasid(s) which sent interrupts */</div><div class='add'>+	if (remote_rp-&gt;SAL_partid == xp_partition_id)</div><div class='add'>+		return xpLocalPartid;</div><div class='ctx'> </div><div class='del'>-		for (bit = 0; bit &lt; (8 * sizeof(u64)); bit++) {</div><div class='del'>-			if (nasid_mask &amp; (1UL &lt;&lt; bit)) {</div><div class='del'>-				n_IRQs_detected++;</div><div class='del'>-				nasid = XPC_NASID_FROM_W_B(word, bit);</div><div class='del'>-				dev_dbg(xpc_part, "interrupt from nasid %ld\n",</div><div class='del'>-					nasid);</div><div class='del'>-				xpc_identify_act_IRQ_req(nasid);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return n_IRQs_detected;</div><div class='add'>+	return xpSuccess;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * See if the other side has responded to a partition disengage request</div><div class='del'>- * from us.</div><div class='add'>+ * See if the other side has responded to a partition deactivate request</div><div class='add'>+ * from us. Though we requested the remote partition to deactivate with regard</div><div class='add'>+ * to us, we really only need to wait for the other side to disengage from us.</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='ctx'> xpc_partition_disengaged(struct xpc_partition *part)</div><div class='hunk'>@@ -828,41 +264,37 @@ xpc_partition_disengaged(struct xpc_partition *part)</div><div class='ctx'> 	short partid = XPC_PARTID(part);</div><div class='ctx'> 	int disengaged;</div><div class='ctx'> </div><div class='del'>-	disengaged = (xpc_partition_engaged(1UL &lt;&lt; partid) == 0);</div><div class='del'>-	if (part-&gt;disengage_request_timeout) {</div><div class='add'>+	disengaged = !xpc_partition_engaged(partid);</div><div class='add'>+	if (part-&gt;disengage_timeout) {</div><div class='ctx'> 		if (!disengaged) {</div><div class='del'>-			if (time_before(jiffies,</div><div class='del'>-			    part-&gt;disengage_request_timeout)) {</div><div class='add'>+			if (time_is_after_jiffies(part-&gt;disengage_timeout)) {</div><div class='ctx'> 				/* timelimit hasn't been reached yet */</div><div class='ctx'> 				return 0;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='del'>-			 * Other side hasn't responded to our disengage</div><div class='add'>+			 * Other side hasn't responded to our deactivate</div><div class='ctx'> 			 * request in a timely fashion, so assume it's dead.</div><div class='ctx'> 			 */</div><div class='ctx'> </div><div class='del'>-			dev_info(xpc_part, "disengage from remote partition %d "</div><div class='del'>-				 "timed out\n", partid);</div><div class='del'>-			xpc_disengage_request_timedout = 1;</div><div class='del'>-			xpc_clear_partition_engaged(1UL &lt;&lt; partid);</div><div class='add'>+			dev_info(xpc_part, "deactivate request to remote "</div><div class='add'>+				 "partition %d timed out\n", partid);</div><div class='add'>+			xpc_disengage_timedout = 1;</div><div class='add'>+			xpc_assume_partition_disengaged(partid);</div><div class='ctx'> 			disengaged = 1;</div><div class='ctx'> 		}</div><div class='del'>-		part-&gt;disengage_request_timeout = 0;</div><div class='add'>+		part-&gt;disengage_timeout = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* cancel the timer function, provided it's not us */</div><div class='del'>-		if (!in_interrupt()) {</div><div class='del'>-			del_singleshot_timer_sync(&amp;part-&gt;</div><div class='del'>-						  disengage_request_timer);</div><div class='del'>-		}</div><div class='add'>+		if (!in_interrupt())</div><div class='add'>+			del_singleshot_timer_sync(&amp;part-&gt;disengage_timer);</div><div class='ctx'> </div><div class='del'>-		DBUG_ON(part-&gt;act_state != XPC_P_DEACTIVATING &amp;&amp;</div><div class='del'>-			part-&gt;act_state != XPC_P_INACTIVE);</div><div class='del'>-		if (part-&gt;act_state != XPC_P_INACTIVE)</div><div class='add'>+		DBUG_ON(part-&gt;act_state != XPC_P_AS_DEACTIVATING &amp;&amp;</div><div class='add'>+			part-&gt;act_state != XPC_P_AS_INACTIVE);</div><div class='add'>+		if (part-&gt;act_state != XPC_P_AS_INACTIVE)</div><div class='ctx'> 			xpc_wakeup_channel_mgr(part);</div><div class='ctx'> </div><div class='del'>-		if (XPC_SUPPORTS_DISENGAGE_REQUEST(part-&gt;remote_vars_version))</div><div class='del'>-			xpc_cancel_partition_disengage_request(part);</div><div class='add'>+		xpc_cancel_partition_deactivation_request(part);</div><div class='ctx'> 	}</div><div class='ctx'> 	return disengaged;</div><div class='ctx'> }</div><div class='hunk'>@@ -879,8 +311,8 @@ xpc_mark_partition_active(struct xpc_partition *part)</div><div class='ctx'> 	dev_dbg(xpc_part, "setting partition %d to ACTIVE\n", XPC_PARTID(part));</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;part-&gt;act_lock, irq_flags);</div><div class='del'>-	if (part-&gt;act_state == XPC_P_ACTIVATING) {</div><div class='del'>-		part-&gt;act_state = XPC_P_ACTIVE;</div><div class='add'>+	if (part-&gt;act_state == XPC_P_AS_ACTIVATING) {</div><div class='add'>+		part-&gt;act_state = XPC_P_AS_ACTIVE;</div><div class='ctx'> 		ret = xpSuccess;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		DBUG_ON(part-&gt;reason == xpSuccess);</div><div class='hunk'>@@ -892,7 +324,7 @@ xpc_mark_partition_active(struct xpc_partition *part)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Notify XPC that the partition is down.</div><div class='add'>+ * Start the process of deactivating the specified partition.</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='ctx'> xpc_deactivate_partition(const int line, struct xpc_partition *part,</div><div class='hunk'>@@ -902,16 +334,16 @@ xpc_deactivate_partition(const int line, struct xpc_partition *part,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;part-&gt;act_lock, irq_flags);</div><div class='ctx'> </div><div class='del'>-	if (part-&gt;act_state == XPC_P_INACTIVE) {</div><div class='add'>+	if (part-&gt;act_state == XPC_P_AS_INACTIVE) {</div><div class='ctx'> 		XPC_SET_REASON(part, reason, line);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;part-&gt;act_lock, irq_flags);</div><div class='ctx'> 		if (reason == xpReactivating) {</div><div class='ctx'> 			/* we interrupt ourselves to reactivate partition */</div><div class='del'>-			xpc_IPI_send_reactivate(part);</div><div class='add'>+			xpc_request_partition_reactivation(part);</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (part-&gt;act_state == XPC_P_DEACTIVATING) {</div><div class='add'>+	if (part-&gt;act_state == XPC_P_AS_DEACTIVATING) {</div><div class='ctx'> 		if ((part-&gt;reason == xpUnloading &amp;&amp; reason != xpUnloading) ||</div><div class='ctx'> 		    reason == xpReactivating) {</div><div class='ctx'> 			XPC_SET_REASON(part, reason, line);</div><div class='hunk'>@@ -920,22 +352,18 @@ xpc_deactivate_partition(const int line, struct xpc_partition *part,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	part-&gt;act_state = XPC_P_DEACTIVATING;</div><div class='add'>+	part-&gt;act_state = XPC_P_AS_DEACTIVATING;</div><div class='ctx'> 	XPC_SET_REASON(part, reason, line);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;part-&gt;act_lock, irq_flags);</div><div class='ctx'> </div><div class='del'>-	if (XPC_SUPPORTS_DISENGAGE_REQUEST(part-&gt;remote_vars_version)) {</div><div class='del'>-		xpc_request_partition_disengage(part);</div><div class='del'>-		xpc_IPI_send_disengage(part);</div><div class='add'>+	/* ask remote partition to deactivate with regard to us */</div><div class='add'>+	xpc_request_partition_deactivation(part);</div><div class='ctx'> </div><div class='del'>-		/* set a timelimit on the disengage request */</div><div class='del'>-		part-&gt;disengage_request_timeout = jiffies +</div><div class='del'>-		    (xpc_disengage_request_timelimit * HZ);</div><div class='del'>-		part-&gt;disengage_request_timer.expires =</div><div class='del'>-		    part-&gt;disengage_request_timeout;</div><div class='del'>-		add_timer(&amp;part-&gt;disengage_request_timer);</div><div class='del'>-	}</div><div class='add'>+	/* set a timelimit on the disengage phase of the deactivation request */</div><div class='add'>+	part-&gt;disengage_timeout = jiffies + (xpc_disengage_timelimit * HZ);</div><div class='add'>+	part-&gt;disengage_timer.expires = part-&gt;disengage_timeout;</div><div class='add'>+	add_timer(&amp;part-&gt;disengage_timer);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(xpc_part, "bringing partition %d down, reason = %d\n",</div><div class='ctx'> 		XPC_PARTID(part), reason);</div><div class='hunk'>@@ -955,7 +383,7 @@ xpc_mark_partition_inactive(struct xpc_partition *part)</div><div class='ctx'> 		XPC_PARTID(part));</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;part-&gt;act_lock, irq_flags);</div><div class='del'>-	part-&gt;act_state = XPC_P_INACTIVE;</div><div class='add'>+	part-&gt;act_state = XPC_P_AS_INACTIVE;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;part-&gt;act_lock, irq_flags);</div><div class='ctx'> 	part-&gt;remote_rp_pa = 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -974,28 +402,22 @@ xpc_discovery(void)</div><div class='ctx'> {</div><div class='ctx'> 	void *remote_rp_base;</div><div class='ctx'> 	struct xpc_rsvd_page *remote_rp;</div><div class='del'>-	struct xpc_vars *remote_vars;</div><div class='del'>-	u64 remote_rp_pa;</div><div class='del'>-	u64 remote_vars_pa;</div><div class='add'>+	unsigned long remote_rp_pa;</div><div class='ctx'> 	int region;</div><div class='ctx'> 	int region_size;</div><div class='ctx'> 	int max_regions;</div><div class='ctx'> 	int nasid;</div><div class='ctx'> 	struct xpc_rsvd_page *rp;</div><div class='del'>-	short partid;</div><div class='del'>-	struct xpc_partition *part;</div><div class='del'>-	u64 *discovered_nasids;</div><div class='add'>+	unsigned long *discovered_nasids;</div><div class='ctx'> 	enum xp_retval ret;</div><div class='ctx'> </div><div class='ctx'> 	remote_rp = xpc_kmalloc_cacheline_aligned(XPC_RP_HEADER_SIZE +</div><div class='del'>-						  xp_nasid_mask_bytes,</div><div class='add'>+						  xpc_nasid_mask_nbytes,</div><div class='ctx'> 						  GFP_KERNEL, &amp;remote_rp_base);</div><div class='ctx'> 	if (remote_rp == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	remote_vars = (struct xpc_vars *)remote_rp;</div><div class='del'>-</div><div class='del'>-	discovered_nasids = kzalloc(sizeof(u64) * xp_nasid_mask_words,</div><div class='add'>+	discovered_nasids = kzalloc(sizeof(long) * xpc_nasid_mask_nlongs,</div><div class='ctx'> 				    GFP_KERNEL);</div><div class='ctx'> 	if (discovered_nasids == NULL) {</div><div class='ctx'> 		kfree(remote_rp_base);</div><div class='hunk'>@@ -1010,7 +432,7 @@ xpc_discovery(void)</div><div class='ctx'> 	 * protection is in regards to memory, IOI and IPI.</div><div class='ctx'> 	 */</div><div class='ctx'> 	max_regions = 64;</div><div class='del'>-	region_size = sn_region_size;</div><div class='add'>+	region_size = xp_region_size;</div><div class='ctx'> </div><div class='ctx'> 	switch (region_size) {</div><div class='ctx'> 	case 128:</div><div class='hunk'>@@ -1038,28 +460,28 @@ xpc_discovery(void)</div><div class='ctx'> </div><div class='ctx'> 			dev_dbg(xpc_part, "checking nasid %d\n", nasid);</div><div class='ctx'> </div><div class='del'>-			if (XPC_NASID_IN_ARRAY(nasid, xpc_part_nasids)) {</div><div class='add'>+			if (test_bit(nasid / 2, xpc_part_nasids)) {</div><div class='ctx'> 				dev_dbg(xpc_part, "PROM indicates Nasid %d is "</div><div class='ctx'> 					"part of the local partition; skipping "</div><div class='ctx'> 					"region\n", nasid);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (!(XPC_NASID_IN_ARRAY(nasid, xpc_mach_nasids))) {</div><div class='add'>+			if (!(test_bit(nasid / 2, xpc_mach_nasids))) {</div><div class='ctx'> 				dev_dbg(xpc_part, "PROM indicates Nasid %d was "</div><div class='ctx'> 					"not on Numa-Link network at reset\n",</div><div class='ctx'> 					nasid);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (XPC_NASID_IN_ARRAY(nasid, discovered_nasids)) {</div><div class='add'>+			if (test_bit(nasid / 2, discovered_nasids)) {</div><div class='ctx'> 				dev_dbg(xpc_part, "Nasid %d is part of a "</div><div class='ctx'> 					"partition which was previously "</div><div class='ctx'> 					"discovered\n", nasid);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/* pull over the reserved page structure */</div><div class='add'>+			/* pull over the rsvd page header &amp; part_nasids mask */</div><div class='ctx'> </div><div class='ctx'> 			ret = xpc_get_remote_rp(nasid, discovered_nasids,</div><div class='ctx'> 						remote_rp, &amp;remote_rp_pa);</div><div class='hunk'>@@ -1074,72 +496,8 @@ xpc_discovery(void)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			remote_vars_pa = remote_rp-&gt;vars_pa;</div><div class='del'>-</div><div class='del'>-			partid = remote_rp-&gt;partid;</div><div class='del'>-			part = &amp;xpc_partitions[partid];</div><div class='del'>-</div><div class='del'>-			/* pull over the cross partition variables */</div><div class='del'>-</div><div class='del'>-			ret = xpc_get_remote_vars(remote_vars_pa, remote_vars);</div><div class='del'>-			if (ret != xpSuccess) {</div><div class='del'>-				dev_dbg(xpc_part, "unable to get XPC variables "</div><div class='del'>-					"from nasid %d, reason=%d\n", nasid,</div><div class='del'>-					ret);</div><div class='del'>-</div><div class='del'>-				XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (part-&gt;act_state != XPC_P_INACTIVE) {</div><div class='del'>-				dev_dbg(xpc_part, "partition %d on nasid %d is "</div><div class='del'>-					"already activating\n", partid, nasid);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Register the remote partition's AMOs with SAL so it</div><div class='del'>-			 * can handle and cleanup errors within that address</div><div class='del'>-			 * range should the remote partition go down. We don't</div><div class='del'>-			 * unregister this range because it is difficult to</div><div class='del'>-			 * tell when outstanding writes to the remote partition</div><div class='del'>-			 * are finished and thus when it is thus safe to</div><div class='del'>-			 * unregister. This should not result in wasted space</div><div class='del'>-			 * in the SAL xp_addr_region table because we should</div><div class='del'>-			 * get the same page for remote_act_amos_pa after</div><div class='del'>-			 * module reloads and system reboots.</div><div class='del'>-			 */</div><div class='del'>-			if (sn_register_xp_addr_region</div><div class='del'>-			    (remote_vars-&gt;amos_page_pa, PAGE_SIZE, 1) &lt; 0) {</div><div class='del'>-				dev_dbg(xpc_part,</div><div class='del'>-					"partition %d failed to "</div><div class='del'>-					"register xp_addr region 0x%016lx\n",</div><div class='del'>-					partid, remote_vars-&gt;amos_page_pa);</div><div class='del'>-</div><div class='del'>-				XPC_SET_REASON(part, xpPhysAddrRegFailed,</div><div class='del'>-					       __LINE__);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * The remote nasid is valid and available.</div><div class='del'>-			 * Send an interrupt to that nasid to notify</div><div class='del'>-			 * it that we are ready to begin activation.</div><div class='del'>-			 */</div><div class='del'>-			dev_dbg(xpc_part, "sending an interrupt to AMO 0x%lx, "</div><div class='del'>-				"nasid %d, phys_cpuid 0x%x\n",</div><div class='del'>-				remote_vars-&gt;amos_page_pa,</div><div class='del'>-				remote_vars-&gt;act_nasid,</div><div class='del'>-				remote_vars-&gt;act_phys_cpuid);</div><div class='del'>-</div><div class='del'>-			if (XPC_SUPPORTS_DISENGAGE_REQUEST(remote_vars-&gt;</div><div class='del'>-							   version)) {</div><div class='del'>-				part-&gt;remote_amos_page_pa =</div><div class='del'>-				    remote_vars-&gt;amos_page_pa;</div><div class='del'>-				xpc_mark_partition_disengaged(part);</div><div class='del'>-				xpc_cancel_partition_disengage_request(part);</div><div class='del'>-			}</div><div class='del'>-			xpc_IPI_send_activate(remote_vars);</div><div class='add'>+			xpc_request_partition_activation(remote_rp,</div><div class='add'>+							 remote_rp_pa, nasid);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1155,20 +513,16 @@ enum xp_retval</div><div class='ctx'> xpc_initiate_partid_to_nasids(short partid, void *nasid_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct xpc_partition *part;</div><div class='del'>-	u64 part_nasid_pa;</div><div class='del'>-	int bte_res;</div><div class='add'>+	unsigned long part_nasid_pa;</div><div class='ctx'> </div><div class='ctx'> 	part = &amp;xpc_partitions[partid];</div><div class='ctx'> 	if (part-&gt;remote_rp_pa == 0)</div><div class='ctx'> 		return xpPartitionDown;</div><div class='ctx'> </div><div class='del'>-	memset(nasid_mask, 0, XP_NASID_MASK_BYTES);</div><div class='del'>-</div><div class='del'>-	part_nasid_pa = (u64)XPC_RP_PART_NASIDS(part-&gt;remote_rp_pa);</div><div class='add'>+	memset(nasid_mask, 0, xpc_nasid_mask_nbytes);</div><div class='ctx'> </div><div class='del'>-	bte_res = xp_bte_copy(part_nasid_pa, (u64)nasid_mask,</div><div class='del'>-			      xp_nasid_mask_bytes, (BTE_NOTIFY | BTE_WACQUIRE),</div><div class='del'>-			      NULL);</div><div class='add'>+	part_nasid_pa = (unsigned long)XPC_RP_PART_NASIDS(part-&gt;remote_rp_pa);</div><div class='ctx'> </div><div class='del'>-	return xpc_map_bte_errors(bte_res);</div><div class='add'>+	return xp_remote_memcpy(xp_pa(nasid_mask), part_nasid_pa,</div><div class='add'>+				xpc_nasid_mask_nbytes);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/misc/sgi-xp/xpc_sn2.c b/drivers/misc/sgi-xp/xpc_sn2.c<br/>new file mode 100644<br/>index 000000000000..b4882ccf6344<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xpc_sn2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xpc_sn2.c</a></div><div class='hunk'>@@ -0,0 +1,2404 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Cross Partition Communication (XPC) sn2-based functions.</div><div class='add'>+ *</div><div class='add'>+ *     Architecture specific implementation of common functions.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/uncached.h&gt;</div><div class='add'>+#include &lt;asm/sn/mspec.h&gt;</div><div class='add'>+#include &lt;asm/sn/sn_sal.h&gt;</div><div class='add'>+#include "xpc.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define the number of u64s required to represent all the C-brick nasids</div><div class='add'>+ * as a bitmap.  The cross-partition kernel modules deal only with</div><div class='add'>+ * C-brick nasids, thus the need for bitmaps which don't account for</div><div class='add'>+ * odd-numbered (non C-brick) nasids.</div><div class='add'>+ */</div><div class='add'>+#define XPC_MAX_PHYSNODES_SN2	(MAX_NUMALINK_NODES / 2)</div><div class='add'>+#define XP_NASID_MASK_BYTES_SN2	((XPC_MAX_PHYSNODES_SN2 + 7) / 8)</div><div class='add'>+#define XP_NASID_MASK_WORDS_SN2	((XPC_MAX_PHYSNODES_SN2 + 63) / 64)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Memory for XPC's amo variables is allocated by the MSPEC driver. These</div><div class='add'>+ * pages are located in the lowest granule. The lowest granule uses 4k pages</div><div class='add'>+ * for cached references and an alternate TLB handler to never provide a</div><div class='add'>+ * cacheable mapping for the entire region. This will prevent speculative</div><div class='add'>+ * reading of cached copies of our lines from being issued which will cause</div><div class='add'>+ * a PI FSB Protocol error to be generated by the SHUB. For XPC, we need 64</div><div class='add'>+ * amo variables (based on XP_MAX_NPARTITIONS_SN2) to identify the senders of</div><div class='add'>+ * NOTIFY IRQs, 128 amo variables (based on XP_NASID_MASK_WORDS_SN2) to identify</div><div class='add'>+ * the senders of ACTIVATE IRQs, 1 amo variable to identify which remote</div><div class='add'>+ * partitions (i.e., XPCs) consider themselves currently engaged with the</div><div class='add'>+ * local XPC and 1 amo variable to request partition deactivation.</div><div class='add'>+ */</div><div class='add'>+#define XPC_NOTIFY_IRQ_AMOS_SN2		0</div><div class='add'>+#define XPC_ACTIVATE_IRQ_AMOS_SN2	(XPC_NOTIFY_IRQ_AMOS_SN2 + \</div><div class='add'>+					 XP_MAX_NPARTITIONS_SN2)</div><div class='add'>+#define XPC_ENGAGED_PARTITIONS_AMO_SN2	(XPC_ACTIVATE_IRQ_AMOS_SN2 + \</div><div class='add'>+					 XP_NASID_MASK_WORDS_SN2)</div><div class='add'>+#define XPC_DEACTIVATE_REQUEST_AMO_SN2	(XPC_ENGAGED_PARTITIONS_AMO_SN2 + 1)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Buffer used to store a local copy of portions of a remote partition's</div><div class='add'>+ * reserved page (either its header and part_nasids mask, or its vars).</div><div class='add'>+ */</div><div class='add'>+static void *xpc_remote_copy_buffer_base_sn2;</div><div class='add'>+static char *xpc_remote_copy_buffer_sn2;</div><div class='add'>+</div><div class='add'>+static struct xpc_vars_sn2 *xpc_vars_sn2;</div><div class='add'>+static struct xpc_vars_part_sn2 *xpc_vars_part_sn2;</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+xpc_setup_partitions_sn_sn2(void)</div><div class='add'>+{</div><div class='add'>+	/* nothing needs to be done */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* SH_IPI_ACCESS shub register value on startup */</div><div class='add'>+static u64 xpc_sh1_IPI_access_sn2;</div><div class='add'>+static u64 xpc_sh2_IPI_access0_sn2;</div><div class='add'>+static u64 xpc_sh2_IPI_access1_sn2;</div><div class='add'>+static u64 xpc_sh2_IPI_access2_sn2;</div><div class='add'>+static u64 xpc_sh2_IPI_access3_sn2;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Change protections to allow IPI operations.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_allow_IPI_ops_sn2(void)</div><div class='add'>+{</div><div class='add'>+	int node;</div><div class='add'>+	int nasid;</div><div class='add'>+</div><div class='add'>+	/* !!! The following should get moved into SAL. */</div><div class='add'>+	if (is_shub2()) {</div><div class='add'>+		xpc_sh2_IPI_access0_sn2 =</div><div class='add'>+		    (u64)HUB_L((u64 *)LOCAL_MMR_ADDR(SH2_IPI_ACCESS0));</div><div class='add'>+		xpc_sh2_IPI_access1_sn2 =</div><div class='add'>+		    (u64)HUB_L((u64 *)LOCAL_MMR_ADDR(SH2_IPI_ACCESS1));</div><div class='add'>+		xpc_sh2_IPI_access2_sn2 =</div><div class='add'>+		    (u64)HUB_L((u64 *)LOCAL_MMR_ADDR(SH2_IPI_ACCESS2));</div><div class='add'>+		xpc_sh2_IPI_access3_sn2 =</div><div class='add'>+		    (u64)HUB_L((u64 *)LOCAL_MMR_ADDR(SH2_IPI_ACCESS3));</div><div class='add'>+</div><div class='add'>+		for_each_online_node(node) {</div><div class='add'>+			nasid = cnodeid_to_nasid(node);</div><div class='add'>+			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS0),</div><div class='add'>+			      -1UL);</div><div class='add'>+			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS1),</div><div class='add'>+			      -1UL);</div><div class='add'>+			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS2),</div><div class='add'>+			      -1UL);</div><div class='add'>+			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS3),</div><div class='add'>+			      -1UL);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		xpc_sh1_IPI_access_sn2 =</div><div class='add'>+		    (u64)HUB_L((u64 *)LOCAL_MMR_ADDR(SH1_IPI_ACCESS));</div><div class='add'>+</div><div class='add'>+		for_each_online_node(node) {</div><div class='add'>+			nasid = cnodeid_to_nasid(node);</div><div class='add'>+			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH1_IPI_ACCESS),</div><div class='add'>+			      -1UL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Restrict protections to disallow IPI operations.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_disallow_IPI_ops_sn2(void)</div><div class='add'>+{</div><div class='add'>+	int node;</div><div class='add'>+	int nasid;</div><div class='add'>+</div><div class='add'>+	/* !!! The following should get moved into SAL. */</div><div class='add'>+	if (is_shub2()) {</div><div class='add'>+		for_each_online_node(node) {</div><div class='add'>+			nasid = cnodeid_to_nasid(node);</div><div class='add'>+			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS0),</div><div class='add'>+			      xpc_sh2_IPI_access0_sn2);</div><div class='add'>+			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS1),</div><div class='add'>+			      xpc_sh2_IPI_access1_sn2);</div><div class='add'>+			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS2),</div><div class='add'>+			      xpc_sh2_IPI_access2_sn2);</div><div class='add'>+			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS3),</div><div class='add'>+			      xpc_sh2_IPI_access3_sn2);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		for_each_online_node(node) {</div><div class='add'>+			nasid = cnodeid_to_nasid(node);</div><div class='add'>+			HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH1_IPI_ACCESS),</div><div class='add'>+			      xpc_sh1_IPI_access_sn2);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The following set of functions are used for the sending and receiving of</div><div class='add'>+ * IRQs (also known as IPIs). There are two flavors of IRQs, one that is</div><div class='add'>+ * associated with partition activity (SGI_XPC_ACTIVATE) and the other that</div><div class='add'>+ * is associated with channel activity (SGI_XPC_NOTIFY).</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static u64</div><div class='add'>+xpc_receive_IRQ_amo_sn2(struct amo *amo)</div><div class='add'>+{</div><div class='add'>+	return FETCHOP_LOAD_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_CLEAR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_send_IRQ_sn2(struct amo *amo, u64 flag, int nasid, int phys_cpuid,</div><div class='add'>+		 int vector)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+</div><div class='add'>+	local_irq_save(irq_flags);</div><div class='add'>+</div><div class='add'>+	FETCHOP_STORE_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_OR, flag);</div><div class='add'>+	sn_send_IPI_phys(nasid, phys_cpuid, vector, 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We must always use the nofault function regardless of whether we</div><div class='add'>+	 * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we</div><div class='add'>+	 * didn't, we'd never know that the other partition is down and would</div><div class='add'>+	 * keep sending IRQs and amos to it until the heartbeat times out.</div><div class='add'>+	 */</div><div class='add'>+	ret = xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amp;amo-&gt;variable),</div><div class='add'>+						     xp_nofault_PIOR_target));</div><div class='add'>+</div><div class='add'>+	local_irq_restore(irq_flags);</div><div class='add'>+</div><div class='add'>+	return (ret == 0) ? xpSuccess : xpPioReadError;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct amo *</div><div class='add'>+xpc_init_IRQ_amo_sn2(int index)</div><div class='add'>+{</div><div class='add'>+	struct amo *amo = xpc_vars_sn2-&gt;amos_page + index;</div><div class='add'>+</div><div class='add'>+	(void)xpc_receive_IRQ_amo_sn2(amo);	/* clear amo variable */</div><div class='add'>+	return amo;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Functions associated with SGI_XPC_ACTIVATE IRQ.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Notify the heartbeat check thread that an activate IRQ has been received.</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t</div><div class='add'>+xpc_handle_activate_IRQ_sn2(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+	xpc_activate_IRQ_rcvd++;</div><div class='add'>+	spin_unlock_irqrestore(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+	wake_up_interruptible(&amp;xpc_activate_IRQ_wq);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flag the appropriate amo variable and send an IRQ to the specified node.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_send_activate_IRQ_sn2(unsigned long amos_page_pa, int from_nasid,</div><div class='add'>+			  int to_nasid, int to_phys_cpuid)</div><div class='add'>+{</div><div class='add'>+	struct amo *amos = (struct amo *)__va(amos_page_pa +</div><div class='add'>+					      (XPC_ACTIVATE_IRQ_AMOS_SN2 *</div><div class='add'>+					      sizeof(struct amo)));</div><div class='add'>+</div><div class='add'>+	(void)xpc_send_IRQ_sn2(&amp;amos[BIT_WORD(from_nasid / 2)],</div><div class='add'>+			       BIT_MASK(from_nasid / 2), to_nasid,</div><div class='add'>+			       to_phys_cpuid, SGI_XPC_ACTIVATE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_send_local_activate_IRQ_sn2(int from_nasid)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	struct amo *amos = (struct amo *)__va(xpc_vars_sn2-&gt;amos_page_pa +</div><div class='add'>+					      (XPC_ACTIVATE_IRQ_AMOS_SN2 *</div><div class='add'>+					      sizeof(struct amo)));</div><div class='add'>+</div><div class='add'>+	/* fake the sending and receipt of an activate IRQ from remote nasid */</div><div class='add'>+	FETCHOP_STORE_OP(TO_AMO((u64)&amp;amos[BIT_WORD(from_nasid / 2)].variable),</div><div class='add'>+			 FETCHOP_OR, BIT_MASK(from_nasid / 2));</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+	xpc_activate_IRQ_rcvd++;</div><div class='add'>+	spin_unlock_irqrestore(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+	wake_up_interruptible(&amp;xpc_activate_IRQ_wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Functions associated with SGI_XPC_NOTIFY IRQ.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check to see if any chctl flags were sent from the specified partition.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_check_for_sent_chctl_flags_sn2(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	union xpc_channel_ctl_flags chctl;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+</div><div class='add'>+	chctl.all_flags = xpc_receive_IRQ_amo_sn2(part-&gt;sn.sn2.</div><div class='add'>+						  local_chctl_amo_va);</div><div class='add'>+	if (chctl.all_flags == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;part-&gt;chctl_lock, irq_flags);</div><div class='add'>+	part-&gt;chctl.all_flags |= chctl.all_flags;</div><div class='add'>+	spin_unlock_irqrestore(&amp;part-&gt;chctl_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+	dev_dbg(xpc_chan, "received notify IRQ from partid=%d, chctl.all_flags="</div><div class='add'>+		"0x%lx\n", XPC_PARTID(part), chctl.all_flags);</div><div class='add'>+</div><div class='add'>+	xpc_wakeup_channel_mgr(part);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handle the receipt of a SGI_XPC_NOTIFY IRQ by seeing whether the specified</div><div class='add'>+ * partition actually sent it. Since SGI_XPC_NOTIFY IRQs may be shared by more</div><div class='add'>+ * than one partition, we use an amo structure per partition to indicate</div><div class='add'>+ * whether a partition has sent an IRQ or not.  If it has, then wake up the</div><div class='add'>+ * associated kthread to handle it.</div><div class='add'>+ *</div><div class='add'>+ * All SGI_XPC_NOTIFY IRQs received by XPC are the result of IRQs sent by XPC</div><div class='add'>+ * running on other partitions.</div><div class='add'>+ *</div><div class='add'>+ * Noteworthy Arguments:</div><div class='add'>+ *</div><div class='add'>+ *	irq - Interrupt ReQuest number. NOT USED.</div><div class='add'>+ *</div><div class='add'>+ *	dev_id - partid of IRQ's potential sender.</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t</div><div class='add'>+xpc_handle_notify_IRQ_sn2(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	short partid = (short)(u64)dev_id;</div><div class='add'>+	struct xpc_partition *part = &amp;xpc_partitions[partid];</div><div class='add'>+</div><div class='add'>+	DBUG_ON(partid &lt; 0 || partid &gt;= XP_MAX_NPARTITIONS_SN2);</div><div class='add'>+</div><div class='add'>+	if (xpc_part_ref(part)) {</div><div class='add'>+		xpc_check_for_sent_chctl_flags_sn2(part);</div><div class='add'>+</div><div class='add'>+		xpc_part_deref(part);</div><div class='add'>+	}</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check to see if xpc_handle_notify_IRQ_sn2() dropped any IRQs on the floor</div><div class='add'>+ * because the write to their associated amo variable completed after the IRQ</div><div class='add'>+ * was received.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_check_for_dropped_notify_IRQ_sn2(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition_sn2 *part_sn2 = &amp;part-&gt;sn.sn2;</div><div class='add'>+</div><div class='add'>+	if (xpc_part_ref(part)) {</div><div class='add'>+		xpc_check_for_sent_chctl_flags_sn2(part);</div><div class='add'>+</div><div class='add'>+		part_sn2-&gt;dropped_notify_IRQ_timer.expires = jiffies +</div><div class='add'>+		    XPC_DROPPED_NOTIFY_IRQ_WAIT_INTERVAL;</div><div class='add'>+		add_timer(&amp;part_sn2-&gt;dropped_notify_IRQ_timer);</div><div class='add'>+		xpc_part_deref(part);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Send a notify IRQ to the remote partition that is associated with the</div><div class='add'>+ * specified channel.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_send_notify_IRQ_sn2(struct xpc_channel *ch, u8 chctl_flag,</div><div class='add'>+			char *chctl_flag_string, unsigned long *irq_flags)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition *part = &amp;xpc_partitions[ch-&gt;partid];</div><div class='add'>+	struct xpc_partition_sn2 *part_sn2 = &amp;part-&gt;sn.sn2;</div><div class='add'>+	union xpc_channel_ctl_flags chctl = { 0 };</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+</div><div class='add'>+	if (likely(part-&gt;act_state != XPC_P_AS_DEACTIVATING)) {</div><div class='add'>+		chctl.flags[ch-&gt;number] = chctl_flag;</div><div class='add'>+		ret = xpc_send_IRQ_sn2(part_sn2-&gt;remote_chctl_amo_va,</div><div class='add'>+				       chctl.all_flags,</div><div class='add'>+				       part_sn2-&gt;notify_IRQ_nasid,</div><div class='add'>+				       part_sn2-&gt;notify_IRQ_phys_cpuid,</div><div class='add'>+				       SGI_XPC_NOTIFY);</div><div class='add'>+		dev_dbg(xpc_chan, "%s sent to partid=%d, channel=%d, ret=%d\n",</div><div class='add'>+			chctl_flag_string, ch-&gt;partid, ch-&gt;number, ret);</div><div class='add'>+		if (unlikely(ret != xpSuccess)) {</div><div class='add'>+			if (irq_flags != NULL)</div><div class='add'>+				spin_unlock_irqrestore(&amp;ch-&gt;lock, *irq_flags);</div><div class='add'>+			XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='add'>+			if (irq_flags != NULL)</div><div class='add'>+				spin_lock_irqsave(&amp;ch-&gt;lock, *irq_flags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define XPC_SEND_NOTIFY_IRQ_SN2(_ch, _ipi_f, _irq_f) \</div><div class='add'>+		xpc_send_notify_IRQ_sn2(_ch, _ipi_f, #_ipi_f, _irq_f)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Make it look like the remote partition, which is associated with the</div><div class='add'>+ * specified channel, sent us a notify IRQ. This faked IRQ will be handled</div><div class='add'>+ * by xpc_check_for_dropped_notify_IRQ_sn2().</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_send_local_notify_IRQ_sn2(struct xpc_channel *ch, u8 chctl_flag,</div><div class='add'>+			      char *chctl_flag_string)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition *part = &amp;xpc_partitions[ch-&gt;partid];</div><div class='add'>+	union xpc_channel_ctl_flags chctl = { 0 };</div><div class='add'>+</div><div class='add'>+	chctl.flags[ch-&gt;number] = chctl_flag;</div><div class='add'>+	FETCHOP_STORE_OP(TO_AMO((u64)&amp;part-&gt;sn.sn2.local_chctl_amo_va-&gt;</div><div class='add'>+				variable), FETCHOP_OR, chctl.all_flags);</div><div class='add'>+	dev_dbg(xpc_chan, "%s sent local from partid=%d, channel=%d\n",</div><div class='add'>+		chctl_flag_string, ch-&gt;partid, ch-&gt;number);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define XPC_SEND_LOCAL_NOTIFY_IRQ_SN2(_ch, _ipi_f) \</div><div class='add'>+		xpc_send_local_notify_IRQ_sn2(_ch, _ipi_f, #_ipi_f)</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_send_chctl_closerequest_sn2(struct xpc_channel *ch,</div><div class='add'>+				unsigned long *irq_flags)</div><div class='add'>+{</div><div class='add'>+	struct xpc_openclose_args *args = ch-&gt;sn.sn2.local_openclose_args;</div><div class='add'>+</div><div class='add'>+	args-&gt;reason = ch-&gt;reason;</div><div class='add'>+	XPC_SEND_NOTIFY_IRQ_SN2(ch, XPC_CHCTL_CLOSEREQUEST, irq_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_send_chctl_closereply_sn2(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='add'>+{</div><div class='add'>+	XPC_SEND_NOTIFY_IRQ_SN2(ch, XPC_CHCTL_CLOSEREPLY, irq_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_send_chctl_openrequest_sn2(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='add'>+{</div><div class='add'>+	struct xpc_openclose_args *args = ch-&gt;sn.sn2.local_openclose_args;</div><div class='add'>+</div><div class='add'>+	args-&gt;entry_size = ch-&gt;entry_size;</div><div class='add'>+	args-&gt;local_nentries = ch-&gt;local_nentries;</div><div class='add'>+	XPC_SEND_NOTIFY_IRQ_SN2(ch, XPC_CHCTL_OPENREQUEST, irq_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_send_chctl_openreply_sn2(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='add'>+{</div><div class='add'>+	struct xpc_openclose_args *args = ch-&gt;sn.sn2.local_openclose_args;</div><div class='add'>+</div><div class='add'>+	args-&gt;remote_nentries = ch-&gt;remote_nentries;</div><div class='add'>+	args-&gt;local_nentries = ch-&gt;local_nentries;</div><div class='add'>+	args-&gt;local_msgqueue_pa = xp_pa(ch-&gt;sn.sn2.local_msgqueue);</div><div class='add'>+	XPC_SEND_NOTIFY_IRQ_SN2(ch, XPC_CHCTL_OPENREPLY, irq_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_send_chctl_msgrequest_sn2(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	XPC_SEND_NOTIFY_IRQ_SN2(ch, XPC_CHCTL_MSGREQUEST, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_send_chctl_local_msgrequest_sn2(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	XPC_SEND_LOCAL_NOTIFY_IRQ_SN2(ch, XPC_CHCTL_MSGREQUEST);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_save_remote_msgqueue_pa_sn2(struct xpc_channel *ch,</div><div class='add'>+				unsigned long msgqueue_pa)</div><div class='add'>+{</div><div class='add'>+	ch-&gt;sn.sn2.remote_msgqueue_pa = msgqueue_pa;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This next set of functions are used to keep track of when a partition is</div><div class='add'>+ * potentially engaged in accessing memory belonging to another partition.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_indicate_partition_engaged_sn2(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	struct amo *amo = (struct amo *)__va(part-&gt;sn.sn2.remote_amos_page_pa +</div><div class='add'>+					     (XPC_ENGAGED_PARTITIONS_AMO_SN2 *</div><div class='add'>+					     sizeof(struct amo)));</div><div class='add'>+</div><div class='add'>+	local_irq_save(irq_flags);</div><div class='add'>+</div><div class='add'>+	/* set bit corresponding to our partid in remote partition's amo */</div><div class='add'>+	FETCHOP_STORE_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_OR,</div><div class='add'>+			 BIT(sn_partition_id));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We must always use the nofault function regardless of whether we</div><div class='add'>+	 * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we</div><div class='add'>+	 * didn't, we'd never know that the other partition is down and would</div><div class='add'>+	 * keep sending IRQs and amos to it until the heartbeat times out.</div><div class='add'>+	 */</div><div class='add'>+	(void)xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amp;amo-&gt;</div><div class='add'>+							       variable),</div><div class='add'>+						     xp_nofault_PIOR_target));</div><div class='add'>+</div><div class='add'>+	local_irq_restore(irq_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_indicate_partition_disengaged_sn2(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition_sn2 *part_sn2 = &amp;part-&gt;sn.sn2;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	struct amo *amo = (struct amo *)__va(part_sn2-&gt;remote_amos_page_pa +</div><div class='add'>+					     (XPC_ENGAGED_PARTITIONS_AMO_SN2 *</div><div class='add'>+					     sizeof(struct amo)));</div><div class='add'>+</div><div class='add'>+	local_irq_save(irq_flags);</div><div class='add'>+</div><div class='add'>+	/* clear bit corresponding to our partid in remote partition's amo */</div><div class='add'>+	FETCHOP_STORE_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_AND,</div><div class='add'>+			 ~BIT(sn_partition_id));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We must always use the nofault function regardless of whether we</div><div class='add'>+	 * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we</div><div class='add'>+	 * didn't, we'd never know that the other partition is down and would</div><div class='add'>+	 * keep sending IRQs and amos to it until the heartbeat times out.</div><div class='add'>+	 */</div><div class='add'>+	(void)xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amp;amo-&gt;</div><div class='add'>+							       variable),</div><div class='add'>+						     xp_nofault_PIOR_target));</div><div class='add'>+</div><div class='add'>+	local_irq_restore(irq_flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Send activate IRQ to get other side to see that we've cleared our</div><div class='add'>+	 * bit in their engaged partitions amo.</div><div class='add'>+	 */</div><div class='add'>+	xpc_send_activate_IRQ_sn2(part_sn2-&gt;remote_amos_page_pa,</div><div class='add'>+				  cnodeid_to_nasid(0),</div><div class='add'>+				  part_sn2-&gt;activate_IRQ_nasid,</div><div class='add'>+				  part_sn2-&gt;activate_IRQ_phys_cpuid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_assume_partition_disengaged_sn2(short partid)</div><div class='add'>+{</div><div class='add'>+	struct amo *amo = xpc_vars_sn2-&gt;amos_page +</div><div class='add'>+			  XPC_ENGAGED_PARTITIONS_AMO_SN2;</div><div class='add'>+</div><div class='add'>+	/* clear bit(s) based on partid mask in our partition's amo */</div><div class='add'>+	FETCHOP_STORE_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_AND,</div><div class='add'>+			 ~BIT(partid));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+xpc_partition_engaged_sn2(short partid)</div><div class='add'>+{</div><div class='add'>+	struct amo *amo = xpc_vars_sn2-&gt;amos_page +</div><div class='add'>+			  XPC_ENGAGED_PARTITIONS_AMO_SN2;</div><div class='add'>+</div><div class='add'>+	/* our partition's amo variable ANDed with partid mask */</div><div class='add'>+	return (FETCHOP_LOAD_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_LOAD) &amp;</div><div class='add'>+		BIT(partid)) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+xpc_any_partition_engaged_sn2(void)</div><div class='add'>+{</div><div class='add'>+	struct amo *amo = xpc_vars_sn2-&gt;amos_page +</div><div class='add'>+			  XPC_ENGAGED_PARTITIONS_AMO_SN2;</div><div class='add'>+</div><div class='add'>+	/* our partition's amo variable */</div><div class='add'>+	return FETCHOP_LOAD_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_LOAD) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* original protection values for each node */</div><div class='add'>+static u64 xpc_prot_vec_sn2[MAX_NUMNODES];</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Change protections to allow amo operations on non-Shub 1.1 systems.</div><div class='add'>+ */</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_allow_amo_ops_sn2(struct amo *amos_page)</div><div class='add'>+{</div><div class='add'>+	u64 nasid_array = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * On SHUB 1.1, we cannot call sn_change_memprotect() since the BIST</div><div class='add'>+	 * collides with memory operations. On those systems we call</div><div class='add'>+	 * xpc_allow_amo_ops_shub_wars_1_1_sn2() instead.</div><div class='add'>+	 */</div><div class='add'>+	if (!enable_shub_wars_1_1()) {</div><div class='add'>+		ret = sn_change_memprotect(ia64_tpa((u64)amos_page), PAGE_SIZE,</div><div class='add'>+					   SN_MEMPROT_ACCESS_CLASS_1,</div><div class='add'>+					   &amp;nasid_array);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			return xpSalError;</div><div class='add'>+	}</div><div class='add'>+	return xpSuccess;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Change protections to allow amo operations on Shub 1.1 systems.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_allow_amo_ops_shub_wars_1_1_sn2(void)</div><div class='add'>+{</div><div class='add'>+	int node;</div><div class='add'>+	int nasid;</div><div class='add'>+</div><div class='add'>+	if (!enable_shub_wars_1_1())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for_each_online_node(node) {</div><div class='add'>+		nasid = cnodeid_to_nasid(node);</div><div class='add'>+		/* save current protection values */</div><div class='add'>+		xpc_prot_vec_sn2[node] =</div><div class='add'>+		    (u64)HUB_L((u64 *)GLOBAL_MMR_ADDR(nasid,</div><div class='add'>+						  SH1_MD_DQLP_MMR_DIR_PRIVEC0));</div><div class='add'>+		/* open up everything */</div><div class='add'>+		HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid,</div><div class='add'>+					     SH1_MD_DQLP_MMR_DIR_PRIVEC0),</div><div class='add'>+		      -1UL);</div><div class='add'>+		HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid,</div><div class='add'>+					     SH1_MD_DQRP_MMR_DIR_PRIVEC0),</div><div class='add'>+		      -1UL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_get_partition_rsvd_page_pa_sn2(void *buf, u64 *cookie, unsigned long *rp_pa,</div><div class='add'>+				   size_t *len)</div><div class='add'>+{</div><div class='add'>+	s64 status;</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+</div><div class='add'>+	status = sn_partition_reserved_page_pa((u64)buf, cookie, rp_pa, len);</div><div class='add'>+	if (status == SALRET_OK)</div><div class='add'>+		ret = xpSuccess;</div><div class='add'>+	else if (status == SALRET_MORE_PASSES)</div><div class='add'>+		ret = xpNeedMoreInfo;</div><div class='add'>+	else</div><div class='add'>+		ret = xpSalError;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+xpc_setup_rsvd_page_sn_sn2(struct xpc_rsvd_page *rp)</div><div class='add'>+{</div><div class='add'>+	struct amo *amos_page;</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	xpc_vars_sn2 = XPC_RP_VARS(rp);</div><div class='add'>+</div><div class='add'>+	rp-&gt;sn.vars_pa = xp_pa(xpc_vars_sn2);</div><div class='add'>+</div><div class='add'>+	/* vars_part array follows immediately after vars */</div><div class='add'>+	xpc_vars_part_sn2 = (struct xpc_vars_part_sn2 *)((u8 *)XPC_RP_VARS(rp) +</div><div class='add'>+							 XPC_RP_VARS_SIZE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Before clearing xpc_vars_sn2, see if a page of amos had been</div><div class='add'>+	 * previously allocated. If not we'll need to allocate one and set</div><div class='add'>+	 * permissions so that cross-partition amos are allowed.</div><div class='add'>+	 *</div><div class='add'>+	 * The allocated amo page needs MCA reporting to remain disabled after</div><div class='add'>+	 * XPC has unloaded.  To make this work, we keep a copy of the pointer</div><div class='add'>+	 * to this page (i.e., amos_page) in the struct xpc_vars_sn2 structure,</div><div class='add'>+	 * which is pointed to by the reserved page, and re-use that saved copy</div><div class='add'>+	 * on subsequent loads of XPC. This amo page is never freed, and its</div><div class='add'>+	 * memory protections are never restricted.</div><div class='add'>+	 */</div><div class='add'>+	amos_page = xpc_vars_sn2-&gt;amos_page;</div><div class='add'>+	if (amos_page == NULL) {</div><div class='add'>+		amos_page = (struct amo *)TO_AMO(uncached_alloc_page(0, 1));</div><div class='add'>+		if (amos_page == NULL) {</div><div class='add'>+			dev_err(xpc_part, "can't allocate page of amos\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Open up amo-R/W to cpu.  This is done on Shub 1.1 systems</div><div class='add'>+		 * when xpc_allow_amo_ops_shub_wars_1_1_sn2() is called.</div><div class='add'>+		 */</div><div class='add'>+		ret = xpc_allow_amo_ops_sn2(amos_page);</div><div class='add'>+		if (ret != xpSuccess) {</div><div class='add'>+			dev_err(xpc_part, "can't allow amo operations\n");</div><div class='add'>+			uncached_free_page(__IA64_UNCACHED_OFFSET |</div><div class='add'>+					   TO_PHYS((u64)amos_page), 1);</div><div class='add'>+			return -EPERM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* clear xpc_vars_sn2 */</div><div class='add'>+	memset(xpc_vars_sn2, 0, sizeof(struct xpc_vars_sn2));</div><div class='add'>+</div><div class='add'>+	xpc_vars_sn2-&gt;version = XPC_V_VERSION;</div><div class='add'>+	xpc_vars_sn2-&gt;activate_IRQ_nasid = cpuid_to_nasid(0);</div><div class='add'>+	xpc_vars_sn2-&gt;activate_IRQ_phys_cpuid = cpu_physical_id(0);</div><div class='add'>+	xpc_vars_sn2-&gt;vars_part_pa = xp_pa(xpc_vars_part_sn2);</div><div class='add'>+	xpc_vars_sn2-&gt;amos_page_pa = ia64_tpa((u64)amos_page);</div><div class='add'>+	xpc_vars_sn2-&gt;amos_page = amos_page;	/* save for next load of XPC */</div><div class='add'>+</div><div class='add'>+	/* clear xpc_vars_part_sn2 */</div><div class='add'>+	memset((u64 *)xpc_vars_part_sn2, 0, sizeof(struct xpc_vars_part_sn2) *</div><div class='add'>+	       XP_MAX_NPARTITIONS_SN2);</div><div class='add'>+</div><div class='add'>+	/* initialize the activate IRQ related amo variables */</div><div class='add'>+	for (i = 0; i &lt; xpc_nasid_mask_nlongs; i++)</div><div class='add'>+		(void)xpc_init_IRQ_amo_sn2(XPC_ACTIVATE_IRQ_AMOS_SN2 + i);</div><div class='add'>+</div><div class='add'>+	/* initialize the engaged remote partitions related amo variables */</div><div class='add'>+	(void)xpc_init_IRQ_amo_sn2(XPC_ENGAGED_PARTITIONS_AMO_SN2);</div><div class='add'>+	(void)xpc_init_IRQ_amo_sn2(XPC_DEACTIVATE_REQUEST_AMO_SN2);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_increment_heartbeat_sn2(void)</div><div class='add'>+{</div><div class='add'>+	xpc_vars_sn2-&gt;heartbeat++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_offline_heartbeat_sn2(void)</div><div class='add'>+{</div><div class='add'>+	xpc_increment_heartbeat_sn2();</div><div class='add'>+	xpc_vars_sn2-&gt;heartbeat_offline = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_online_heartbeat_sn2(void)</div><div class='add'>+{</div><div class='add'>+	xpc_increment_heartbeat_sn2();</div><div class='add'>+	xpc_vars_sn2-&gt;heartbeat_offline = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_heartbeat_init_sn2(void)</div><div class='add'>+{</div><div class='add'>+	DBUG_ON(xpc_vars_sn2 == NULL);</div><div class='add'>+</div><div class='add'>+	bitmap_zero(xpc_vars_sn2-&gt;heartbeating_to_mask, XP_MAX_NPARTITIONS_SN2);</div><div class='add'>+	xpc_heartbeating_to_mask = &amp;xpc_vars_sn2-&gt;heartbeating_to_mask[0];</div><div class='add'>+	xpc_online_heartbeat_sn2();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_heartbeat_exit_sn2(void)</div><div class='add'>+{</div><div class='add'>+	xpc_offline_heartbeat_sn2();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_get_remote_heartbeat_sn2(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	struct xpc_vars_sn2 *remote_vars;</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+</div><div class='add'>+	remote_vars = (struct xpc_vars_sn2 *)xpc_remote_copy_buffer_sn2;</div><div class='add'>+</div><div class='add'>+	/* pull the remote vars structure that contains the heartbeat */</div><div class='add'>+	ret = xp_remote_memcpy(xp_pa(remote_vars),</div><div class='add'>+			       part-&gt;sn.sn2.remote_vars_pa,</div><div class='add'>+			       XPC_RP_VARS_SIZE);</div><div class='add'>+	if (ret != xpSuccess)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(xpc_part, "partid=%d, heartbeat=%ld, last_heartbeat=%ld, "</div><div class='add'>+		"heartbeat_offline=%ld, HB_mask[0]=0x%lx\n", XPC_PARTID(part),</div><div class='add'>+		remote_vars-&gt;heartbeat, part-&gt;last_heartbeat,</div><div class='add'>+		remote_vars-&gt;heartbeat_offline,</div><div class='add'>+		remote_vars-&gt;heartbeating_to_mask[0]);</div><div class='add'>+</div><div class='add'>+	if ((remote_vars-&gt;heartbeat == part-&gt;last_heartbeat &amp;&amp;</div><div class='add'>+	    remote_vars-&gt;heartbeat_offline == 0) ||</div><div class='add'>+	    !xpc_hb_allowed(sn_partition_id,</div><div class='add'>+			    &amp;remote_vars-&gt;heartbeating_to_mask)) {</div><div class='add'>+		ret = xpNoHeartbeat;</div><div class='add'>+	} else {</div><div class='add'>+		part-&gt;last_heartbeat = remote_vars-&gt;heartbeat;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get a copy of the remote partition's XPC variables from the reserved page.</div><div class='add'>+ *</div><div class='add'>+ * remote_vars points to a buffer that is cacheline aligned for BTE copies and</div><div class='add'>+ * assumed to be of size XPC_RP_VARS_SIZE.</div><div class='add'>+ */</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_get_remote_vars_sn2(unsigned long remote_vars_pa,</div><div class='add'>+			struct xpc_vars_sn2 *remote_vars)</div><div class='add'>+{</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+</div><div class='add'>+	if (remote_vars_pa == 0)</div><div class='add'>+		return xpVarsNotSet;</div><div class='add'>+</div><div class='add'>+	/* pull over the cross partition variables */</div><div class='add'>+	ret = xp_remote_memcpy(xp_pa(remote_vars), remote_vars_pa,</div><div class='add'>+			       XPC_RP_VARS_SIZE);</div><div class='add'>+	if (ret != xpSuccess)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (XPC_VERSION_MAJOR(remote_vars-&gt;version) !=</div><div class='add'>+	    XPC_VERSION_MAJOR(XPC_V_VERSION)) {</div><div class='add'>+		return xpBadVersion;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return xpSuccess;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_request_partition_activation_sn2(struct xpc_rsvd_page *remote_rp,</div><div class='add'>+				     unsigned long remote_rp_pa, int nasid)</div><div class='add'>+{</div><div class='add'>+	xpc_send_local_activate_IRQ_sn2(nasid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_request_partition_reactivation_sn2(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	xpc_send_local_activate_IRQ_sn2(part-&gt;sn.sn2.activate_IRQ_nasid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_request_partition_deactivation_sn2(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition_sn2 *part_sn2 = &amp;part-&gt;sn.sn2;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	struct amo *amo = (struct amo *)__va(part_sn2-&gt;remote_amos_page_pa +</div><div class='add'>+					     (XPC_DEACTIVATE_REQUEST_AMO_SN2 *</div><div class='add'>+					     sizeof(struct amo)));</div><div class='add'>+</div><div class='add'>+	local_irq_save(irq_flags);</div><div class='add'>+</div><div class='add'>+	/* set bit corresponding to our partid in remote partition's amo */</div><div class='add'>+	FETCHOP_STORE_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_OR,</div><div class='add'>+			 BIT(sn_partition_id));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We must always use the nofault function regardless of whether we</div><div class='add'>+	 * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we</div><div class='add'>+	 * didn't, we'd never know that the other partition is down and would</div><div class='add'>+	 * keep sending IRQs and amos to it until the heartbeat times out.</div><div class='add'>+	 */</div><div class='add'>+	(void)xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amp;amo-&gt;</div><div class='add'>+							       variable),</div><div class='add'>+						     xp_nofault_PIOR_target));</div><div class='add'>+</div><div class='add'>+	local_irq_restore(irq_flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Send activate IRQ to get other side to see that we've set our</div><div class='add'>+	 * bit in their deactivate request amo.</div><div class='add'>+	 */</div><div class='add'>+	xpc_send_activate_IRQ_sn2(part_sn2-&gt;remote_amos_page_pa,</div><div class='add'>+				  cnodeid_to_nasid(0),</div><div class='add'>+				  part_sn2-&gt;activate_IRQ_nasid,</div><div class='add'>+				  part_sn2-&gt;activate_IRQ_phys_cpuid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_cancel_partition_deactivation_request_sn2(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	struct amo *amo = (struct amo *)__va(part-&gt;sn.sn2.remote_amos_page_pa +</div><div class='add'>+					     (XPC_DEACTIVATE_REQUEST_AMO_SN2 *</div><div class='add'>+					     sizeof(struct amo)));</div><div class='add'>+</div><div class='add'>+	local_irq_save(irq_flags);</div><div class='add'>+</div><div class='add'>+	/* clear bit corresponding to our partid in remote partition's amo */</div><div class='add'>+	FETCHOP_STORE_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_AND,</div><div class='add'>+			 ~BIT(sn_partition_id));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We must always use the nofault function regardless of whether we</div><div class='add'>+	 * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we</div><div class='add'>+	 * didn't, we'd never know that the other partition is down and would</div><div class='add'>+	 * keep sending IRQs and amos to it until the heartbeat times out.</div><div class='add'>+	 */</div><div class='add'>+	(void)xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amp;amo-&gt;</div><div class='add'>+							       variable),</div><div class='add'>+						     xp_nofault_PIOR_target));</div><div class='add'>+</div><div class='add'>+	local_irq_restore(irq_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+xpc_partition_deactivation_requested_sn2(short partid)</div><div class='add'>+{</div><div class='add'>+	struct amo *amo = xpc_vars_sn2-&gt;amos_page +</div><div class='add'>+			  XPC_DEACTIVATE_REQUEST_AMO_SN2;</div><div class='add'>+</div><div class='add'>+	/* our partition's amo variable ANDed with partid mask */</div><div class='add'>+	return (FETCHOP_LOAD_OP(TO_AMO((u64)&amp;amo-&gt;variable), FETCHOP_LOAD) &amp;</div><div class='add'>+		BIT(partid)) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Update the remote partition's info.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_update_partition_info_sn2(struct xpc_partition *part, u8 remote_rp_version,</div><div class='add'>+			      unsigned long *remote_rp_ts_jiffies,</div><div class='add'>+			      unsigned long remote_rp_pa,</div><div class='add'>+			      unsigned long remote_vars_pa,</div><div class='add'>+			      struct xpc_vars_sn2 *remote_vars)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition_sn2 *part_sn2 = &amp;part-&gt;sn.sn2;</div><div class='add'>+</div><div class='add'>+	part-&gt;remote_rp_version = remote_rp_version;</div><div class='add'>+	dev_dbg(xpc_part, "  remote_rp_version = 0x%016x\n",</div><div class='add'>+		part-&gt;remote_rp_version);</div><div class='add'>+</div><div class='add'>+	part-&gt;remote_rp_ts_jiffies = *remote_rp_ts_jiffies;</div><div class='add'>+	dev_dbg(xpc_part, "  remote_rp_ts_jiffies = 0x%016lx\n",</div><div class='add'>+		part-&gt;remote_rp_ts_jiffies);</div><div class='add'>+</div><div class='add'>+	part-&gt;remote_rp_pa = remote_rp_pa;</div><div class='add'>+	dev_dbg(xpc_part, "  remote_rp_pa = 0x%016lx\n", part-&gt;remote_rp_pa);</div><div class='add'>+</div><div class='add'>+	part_sn2-&gt;remote_vars_pa = remote_vars_pa;</div><div class='add'>+	dev_dbg(xpc_part, "  remote_vars_pa = 0x%016lx\n",</div><div class='add'>+		part_sn2-&gt;remote_vars_pa);</div><div class='add'>+</div><div class='add'>+	part-&gt;last_heartbeat = remote_vars-&gt;heartbeat;</div><div class='add'>+	dev_dbg(xpc_part, "  last_heartbeat = 0x%016lx\n",</div><div class='add'>+		part-&gt;last_heartbeat);</div><div class='add'>+</div><div class='add'>+	part_sn2-&gt;remote_vars_part_pa = remote_vars-&gt;vars_part_pa;</div><div class='add'>+	dev_dbg(xpc_part, "  remote_vars_part_pa = 0x%016lx\n",</div><div class='add'>+		part_sn2-&gt;remote_vars_part_pa);</div><div class='add'>+</div><div class='add'>+	part_sn2-&gt;activate_IRQ_nasid = remote_vars-&gt;activate_IRQ_nasid;</div><div class='add'>+	dev_dbg(xpc_part, "  activate_IRQ_nasid = 0x%x\n",</div><div class='add'>+		part_sn2-&gt;activate_IRQ_nasid);</div><div class='add'>+</div><div class='add'>+	part_sn2-&gt;activate_IRQ_phys_cpuid =</div><div class='add'>+	    remote_vars-&gt;activate_IRQ_phys_cpuid;</div><div class='add'>+	dev_dbg(xpc_part, "  activate_IRQ_phys_cpuid = 0x%x\n",</div><div class='add'>+		part_sn2-&gt;activate_IRQ_phys_cpuid);</div><div class='add'>+</div><div class='add'>+	part_sn2-&gt;remote_amos_page_pa = remote_vars-&gt;amos_page_pa;</div><div class='add'>+	dev_dbg(xpc_part, "  remote_amos_page_pa = 0x%lx\n",</div><div class='add'>+		part_sn2-&gt;remote_amos_page_pa);</div><div class='add'>+</div><div class='add'>+	part_sn2-&gt;remote_vars_version = remote_vars-&gt;version;</div><div class='add'>+	dev_dbg(xpc_part, "  remote_vars_version = 0x%x\n",</div><div class='add'>+		part_sn2-&gt;remote_vars_version);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Prior code has determined the nasid which generated a activate IRQ.</div><div class='add'>+ * Inspect that nasid to determine if its partition needs to be activated</div><div class='add'>+ * or deactivated.</div><div class='add'>+ *</div><div class='add'>+ * A partition is considered "awaiting activation" if our partition</div><div class='add'>+ * flags indicate it is not active and it has a heartbeat.  A</div><div class='add'>+ * partition is considered "awaiting deactivation" if our partition</div><div class='add'>+ * flags indicate it is active but it has no heartbeat or it is not</div><div class='add'>+ * sending its heartbeat to us.</div><div class='add'>+ *</div><div class='add'>+ * To determine the heartbeat, the remote nasid must have a properly</div><div class='add'>+ * initialized reserved page.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_identify_activate_IRQ_req_sn2(int nasid)</div><div class='add'>+{</div><div class='add'>+	struct xpc_rsvd_page *remote_rp;</div><div class='add'>+	struct xpc_vars_sn2 *remote_vars;</div><div class='add'>+	unsigned long remote_rp_pa;</div><div class='add'>+	unsigned long remote_vars_pa;</div><div class='add'>+	int remote_rp_version;</div><div class='add'>+	int reactivate = 0;</div><div class='add'>+	unsigned long remote_rp_ts_jiffies = 0;</div><div class='add'>+	short partid;</div><div class='add'>+	struct xpc_partition *part;</div><div class='add'>+	struct xpc_partition_sn2 *part_sn2;</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+</div><div class='add'>+	/* pull over the reserved page structure */</div><div class='add'>+</div><div class='add'>+	remote_rp = (struct xpc_rsvd_page *)xpc_remote_copy_buffer_sn2;</div><div class='add'>+</div><div class='add'>+	ret = xpc_get_remote_rp(nasid, NULL, remote_rp, &amp;remote_rp_pa);</div><div class='add'>+	if (ret != xpSuccess) {</div><div class='add'>+		dev_warn(xpc_part, "unable to get reserved page from nasid %d, "</div><div class='add'>+			 "which sent interrupt, reason=%d\n", nasid, ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	remote_vars_pa = remote_rp-&gt;sn.vars_pa;</div><div class='add'>+	remote_rp_version = remote_rp-&gt;version;</div><div class='add'>+	remote_rp_ts_jiffies = remote_rp-&gt;ts_jiffies;</div><div class='add'>+</div><div class='add'>+	partid = remote_rp-&gt;SAL_partid;</div><div class='add'>+	part = &amp;xpc_partitions[partid];</div><div class='add'>+	part_sn2 = &amp;part-&gt;sn.sn2;</div><div class='add'>+</div><div class='add'>+	/* pull over the cross partition variables */</div><div class='add'>+</div><div class='add'>+	remote_vars = (struct xpc_vars_sn2 *)xpc_remote_copy_buffer_sn2;</div><div class='add'>+</div><div class='add'>+	ret = xpc_get_remote_vars_sn2(remote_vars_pa, remote_vars);</div><div class='add'>+	if (ret != xpSuccess) {</div><div class='add'>+		dev_warn(xpc_part, "unable to get XPC variables from nasid %d, "</div><div class='add'>+			 "which sent interrupt, reason=%d\n", nasid, ret);</div><div class='add'>+</div><div class='add'>+		XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	part-&gt;activate_IRQ_rcvd++;</div><div class='add'>+</div><div class='add'>+	dev_dbg(xpc_part, "partid for nasid %d is %d; IRQs = %d; HB = "</div><div class='add'>+		"%ld:0x%lx\n", (int)nasid, (int)partid, part-&gt;activate_IRQ_rcvd,</div><div class='add'>+		remote_vars-&gt;heartbeat, remote_vars-&gt;heartbeating_to_mask[0]);</div><div class='add'>+</div><div class='add'>+	if (xpc_partition_disengaged(part) &amp;&amp;</div><div class='add'>+	    part-&gt;act_state == XPC_P_AS_INACTIVE) {</div><div class='add'>+</div><div class='add'>+		xpc_update_partition_info_sn2(part, remote_rp_version,</div><div class='add'>+					      &amp;remote_rp_ts_jiffies,</div><div class='add'>+					      remote_rp_pa, remote_vars_pa,</div><div class='add'>+					      remote_vars);</div><div class='add'>+</div><div class='add'>+		if (xpc_partition_deactivation_requested_sn2(partid)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Other side is waiting on us to deactivate even though</div><div class='add'>+			 * we already have.</div><div class='add'>+			 */</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		xpc_activate_partition(part);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBUG_ON(part-&gt;remote_rp_version == 0);</div><div class='add'>+	DBUG_ON(part_sn2-&gt;remote_vars_version == 0);</div><div class='add'>+</div><div class='add'>+	if (remote_rp_ts_jiffies != part-&gt;remote_rp_ts_jiffies) {</div><div class='add'>+</div><div class='add'>+		/* the other side rebooted */</div><div class='add'>+</div><div class='add'>+		DBUG_ON(xpc_partition_engaged_sn2(partid));</div><div class='add'>+		DBUG_ON(xpc_partition_deactivation_requested_sn2(partid));</div><div class='add'>+</div><div class='add'>+		xpc_update_partition_info_sn2(part, remote_rp_version,</div><div class='add'>+					      &amp;remote_rp_ts_jiffies,</div><div class='add'>+					      remote_rp_pa, remote_vars_pa,</div><div class='add'>+					      remote_vars);</div><div class='add'>+		reactivate = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (part-&gt;disengage_timeout &gt; 0 &amp;&amp; !xpc_partition_disengaged(part)) {</div><div class='add'>+		/* still waiting on other side to disengage from us */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (reactivate)</div><div class='add'>+		XPC_DEACTIVATE_PARTITION(part, xpReactivating);</div><div class='add'>+	else if (xpc_partition_deactivation_requested_sn2(partid))</div><div class='add'>+		XPC_DEACTIVATE_PARTITION(part, xpOtherGoingDown);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Loop through the activation amo variables and process any bits</div><div class='add'>+ * which are set.  Each bit indicates a nasid sending a partition</div><div class='add'>+ * activation or deactivation request.</div><div class='add'>+ *</div><div class='add'>+ * Return #of IRQs detected.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+xpc_identify_activate_IRQ_sender_sn2(void)</div><div class='add'>+{</div><div class='add'>+	int l;</div><div class='add'>+	int b;</div><div class='add'>+	unsigned long nasid_mask_long;</div><div class='add'>+	u64 nasid;		/* remote nasid */</div><div class='add'>+	int n_IRQs_detected = 0;</div><div class='add'>+	struct amo *act_amos;</div><div class='add'>+</div><div class='add'>+	act_amos = xpc_vars_sn2-&gt;amos_page + XPC_ACTIVATE_IRQ_AMOS_SN2;</div><div class='add'>+</div><div class='add'>+	/* scan through activate amo variables looking for non-zero entries */</div><div class='add'>+	for (l = 0; l &lt; xpc_nasid_mask_nlongs; l++) {</div><div class='add'>+</div><div class='add'>+		if (xpc_exiting)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		nasid_mask_long = xpc_receive_IRQ_amo_sn2(&amp;act_amos[l]);</div><div class='add'>+</div><div class='add'>+		b = find_first_bit(&amp;nasid_mask_long, BITS_PER_LONG);</div><div class='add'>+		if (b &gt;= BITS_PER_LONG) {</div><div class='add'>+			/* no IRQs from nasids in this amo variable */</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev_dbg(xpc_part, "amo[%d] gave back 0x%lx\n", l,</div><div class='add'>+			nasid_mask_long);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If this nasid has been added to the machine since</div><div class='add'>+		 * our partition was reset, this will retain the</div><div class='add'>+		 * remote nasid in our reserved pages machine mask.</div><div class='add'>+		 * This is used in the event of module reload.</div><div class='add'>+		 */</div><div class='add'>+		xpc_mach_nasids[l] |= nasid_mask_long;</div><div class='add'>+</div><div class='add'>+		/* locate the nasid(s) which sent interrupts */</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			n_IRQs_detected++;</div><div class='add'>+			nasid = (l * BITS_PER_LONG + b) * 2;</div><div class='add'>+			dev_dbg(xpc_part, "interrupt from nasid %ld\n", nasid);</div><div class='add'>+			xpc_identify_activate_IRQ_req_sn2(nasid);</div><div class='add'>+</div><div class='add'>+			b = find_next_bit(&amp;nasid_mask_long, BITS_PER_LONG,</div><div class='add'>+					  b + 1);</div><div class='add'>+		} while (b &lt; BITS_PER_LONG);</div><div class='add'>+	}</div><div class='add'>+	return n_IRQs_detected;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_process_activate_IRQ_rcvd_sn2(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	int n_IRQs_expected;</div><div class='add'>+	int n_IRQs_detected;</div><div class='add'>+</div><div class='add'>+	DBUG_ON(xpc_activate_IRQ_rcvd == 0);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+	n_IRQs_expected = xpc_activate_IRQ_rcvd;</div><div class='add'>+	xpc_activate_IRQ_rcvd = 0;</div><div class='add'>+	spin_unlock_irqrestore(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+	n_IRQs_detected = xpc_identify_activate_IRQ_sender_sn2();</div><div class='add'>+	if (n_IRQs_detected &lt; n_IRQs_expected) {</div><div class='add'>+		/* retry once to help avoid missing amo */</div><div class='add'>+		(void)xpc_identify_activate_IRQ_sender_sn2();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup the channel structures that are sn2 specific.</div><div class='add'>+ */</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_setup_ch_structures_sn_sn2(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition_sn2 *part_sn2 = &amp;part-&gt;sn.sn2;</div><div class='add'>+	struct xpc_channel_sn2 *ch_sn2;</div><div class='add'>+	enum xp_retval retval;</div><div class='add'>+	int ret;</div><div class='add'>+	int cpuid;</div><div class='add'>+	int ch_number;</div><div class='add'>+	struct timer_list *timer;</div><div class='add'>+	short partid = XPC_PARTID(part);</div><div class='add'>+</div><div class='add'>+	/* allocate all the required GET/PUT values */</div><div class='add'>+</div><div class='add'>+	part_sn2-&gt;local_GPs =</div><div class='add'>+	    xpc_kzalloc_cacheline_aligned(XPC_GP_SIZE, GFP_KERNEL,</div><div class='add'>+					  &amp;part_sn2-&gt;local_GPs_base);</div><div class='add'>+	if (part_sn2-&gt;local_GPs == NULL) {</div><div class='add'>+		dev_err(xpc_chan, "can't get memory for local get/put "</div><div class='add'>+			"values\n");</div><div class='add'>+		return xpNoMemory;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	part_sn2-&gt;remote_GPs =</div><div class='add'>+	    xpc_kzalloc_cacheline_aligned(XPC_GP_SIZE, GFP_KERNEL,</div><div class='add'>+					  &amp;part_sn2-&gt;remote_GPs_base);</div><div class='add'>+	if (part_sn2-&gt;remote_GPs == NULL) {</div><div class='add'>+		dev_err(xpc_chan, "can't get memory for remote get/put "</div><div class='add'>+			"values\n");</div><div class='add'>+		retval = xpNoMemory;</div><div class='add'>+		goto out_1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	part_sn2-&gt;remote_GPs_pa = 0;</div><div class='add'>+</div><div class='add'>+	/* allocate all the required open and close args */</div><div class='add'>+</div><div class='add'>+	part_sn2-&gt;local_openclose_args =</div><div class='add'>+	    xpc_kzalloc_cacheline_aligned(XPC_OPENCLOSE_ARGS_SIZE,</div><div class='add'>+					  GFP_KERNEL, &amp;part_sn2-&gt;</div><div class='add'>+					  local_openclose_args_base);</div><div class='add'>+	if (part_sn2-&gt;local_openclose_args == NULL) {</div><div class='add'>+		dev_err(xpc_chan, "can't get memory for local connect args\n");</div><div class='add'>+		retval = xpNoMemory;</div><div class='add'>+		goto out_2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	part_sn2-&gt;remote_openclose_args_pa = 0;</div><div class='add'>+</div><div class='add'>+	part_sn2-&gt;local_chctl_amo_va = xpc_init_IRQ_amo_sn2(partid);</div><div class='add'>+</div><div class='add'>+	part_sn2-&gt;notify_IRQ_nasid = 0;</div><div class='add'>+	part_sn2-&gt;notify_IRQ_phys_cpuid = 0;</div><div class='add'>+	part_sn2-&gt;remote_chctl_amo_va = NULL;</div><div class='add'>+</div><div class='add'>+	sprintf(part_sn2-&gt;notify_IRQ_owner, "xpc%02d", partid);</div><div class='add'>+	ret = request_irq(SGI_XPC_NOTIFY, xpc_handle_notify_IRQ_sn2,</div><div class='add'>+			  IRQF_SHARED, part_sn2-&gt;notify_IRQ_owner,</div><div class='add'>+			  (void *)(u64)partid);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(xpc_chan, "can't register NOTIFY IRQ handler, "</div><div class='add'>+			"errno=%d\n", -ret);</div><div class='add'>+		retval = xpLackOfResources;</div><div class='add'>+		goto out_3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup a timer to check for dropped notify IRQs */</div><div class='add'>+	timer = &amp;part_sn2-&gt;dropped_notify_IRQ_timer;</div><div class='add'>+	init_timer(timer);</div><div class='add'>+	timer-&gt;function =</div><div class='add'>+	    (void (*)(unsigned long))xpc_check_for_dropped_notify_IRQ_sn2;</div><div class='add'>+	timer-&gt;data = (unsigned long)part;</div><div class='add'>+	timer-&gt;expires = jiffies + XPC_DROPPED_NOTIFY_IRQ_WAIT_INTERVAL;</div><div class='add'>+	add_timer(timer);</div><div class='add'>+</div><div class='add'>+	for (ch_number = 0; ch_number &lt; part-&gt;nchannels; ch_number++) {</div><div class='add'>+		ch_sn2 = &amp;part-&gt;channels[ch_number].sn.sn2;</div><div class='add'>+</div><div class='add'>+		ch_sn2-&gt;local_GP = &amp;part_sn2-&gt;local_GPs[ch_number];</div><div class='add'>+		ch_sn2-&gt;local_openclose_args =</div><div class='add'>+		    &amp;part_sn2-&gt;local_openclose_args[ch_number];</div><div class='add'>+</div><div class='add'>+		mutex_init(&amp;ch_sn2-&gt;msg_to_pull_mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup the per partition specific variables required by the</div><div class='add'>+	 * remote partition to establish channel connections with us.</div><div class='add'>+	 *</div><div class='add'>+	 * The setting of the magic # indicates that these per partition</div><div class='add'>+	 * specific variables are ready to be used.</div><div class='add'>+	 */</div><div class='add'>+	xpc_vars_part_sn2[partid].GPs_pa = xp_pa(part_sn2-&gt;local_GPs);</div><div class='add'>+	xpc_vars_part_sn2[partid].openclose_args_pa =</div><div class='add'>+	    xp_pa(part_sn2-&gt;local_openclose_args);</div><div class='add'>+	xpc_vars_part_sn2[partid].chctl_amo_pa =</div><div class='add'>+	    xp_pa(part_sn2-&gt;local_chctl_amo_va);</div><div class='add'>+	cpuid = raw_smp_processor_id();	/* any CPU in this partition will do */</div><div class='add'>+	xpc_vars_part_sn2[partid].notify_IRQ_nasid = cpuid_to_nasid(cpuid);</div><div class='add'>+	xpc_vars_part_sn2[partid].notify_IRQ_phys_cpuid =</div><div class='add'>+	    cpu_physical_id(cpuid);</div><div class='add'>+	xpc_vars_part_sn2[partid].nchannels = part-&gt;nchannels;</div><div class='add'>+	xpc_vars_part_sn2[partid].magic = XPC_VP_MAGIC1_SN2;</div><div class='add'>+</div><div class='add'>+	return xpSuccess;</div><div class='add'>+</div><div class='add'>+	/* setup of ch structures failed */</div><div class='add'>+out_3:</div><div class='add'>+	kfree(part_sn2-&gt;local_openclose_args_base);</div><div class='add'>+	part_sn2-&gt;local_openclose_args = NULL;</div><div class='add'>+out_2:</div><div class='add'>+	kfree(part_sn2-&gt;remote_GPs_base);</div><div class='add'>+	part_sn2-&gt;remote_GPs = NULL;</div><div class='add'>+out_1:</div><div class='add'>+	kfree(part_sn2-&gt;local_GPs_base);</div><div class='add'>+	part_sn2-&gt;local_GPs = NULL;</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Teardown the channel structures that are sn2 specific.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_teardown_ch_structures_sn_sn2(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition_sn2 *part_sn2 = &amp;part-&gt;sn.sn2;</div><div class='add'>+	short partid = XPC_PARTID(part);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Indicate that the variables specific to the remote partition are no</div><div class='add'>+	 * longer available for its use.</div><div class='add'>+	 */</div><div class='add'>+	xpc_vars_part_sn2[partid].magic = 0;</div><div class='add'>+</div><div class='add'>+	/* in case we've still got outstanding timers registered... */</div><div class='add'>+	del_timer_sync(&amp;part_sn2-&gt;dropped_notify_IRQ_timer);</div><div class='add'>+	free_irq(SGI_XPC_NOTIFY, (void *)(u64)partid);</div><div class='add'>+</div><div class='add'>+	kfree(part_sn2-&gt;local_openclose_args_base);</div><div class='add'>+	part_sn2-&gt;local_openclose_args = NULL;</div><div class='add'>+	kfree(part_sn2-&gt;remote_GPs_base);</div><div class='add'>+	part_sn2-&gt;remote_GPs = NULL;</div><div class='add'>+	kfree(part_sn2-&gt;local_GPs_base);</div><div class='add'>+	part_sn2-&gt;local_GPs = NULL;</div><div class='add'>+	part_sn2-&gt;local_chctl_amo_va = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create a wrapper that hides the underlying mechanism for pulling a cacheline</div><div class='add'>+ * (or multiple cachelines) from a remote partition.</div><div class='add'>+ *</div><div class='add'>+ * src_pa must be a cacheline aligned physical address on the remote partition.</div><div class='add'>+ * dst must be a cacheline aligned virtual address on this partition.</div><div class='add'>+ * cnt must be cacheline sized</div><div class='add'>+ */</div><div class='add'>+/* ??? Replace this function by call to xp_remote_memcpy() or bte_copy()? */</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_pull_remote_cachelines_sn2(struct xpc_partition *part, void *dst,</div><div class='add'>+			       const unsigned long src_pa, size_t cnt)</div><div class='add'>+{</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+</div><div class='add'>+	DBUG_ON(src_pa != L1_CACHE_ALIGN(src_pa));</div><div class='add'>+	DBUG_ON((unsigned long)dst != L1_CACHE_ALIGN((unsigned long)dst));</div><div class='add'>+	DBUG_ON(cnt != L1_CACHE_ALIGN(cnt));</div><div class='add'>+</div><div class='add'>+	if (part-&gt;act_state == XPC_P_AS_DEACTIVATING)</div><div class='add'>+		return part-&gt;reason;</div><div class='add'>+</div><div class='add'>+	ret = xp_remote_memcpy(xp_pa(dst), src_pa, cnt);</div><div class='add'>+	if (ret != xpSuccess) {</div><div class='add'>+		dev_dbg(xpc_chan, "xp_remote_memcpy() from partition %d failed,"</div><div class='add'>+			" ret=%d\n", XPC_PARTID(part), ret);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Pull the remote per partition specific variables from the specified</div><div class='add'>+ * partition.</div><div class='add'>+ */</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_pull_remote_vars_part_sn2(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition_sn2 *part_sn2 = &amp;part-&gt;sn.sn2;</div><div class='add'>+	u8 buffer[L1_CACHE_BYTES * 2];</div><div class='add'>+	struct xpc_vars_part_sn2 *pulled_entry_cacheline =</div><div class='add'>+	    (struct xpc_vars_part_sn2 *)L1_CACHE_ALIGN((u64)buffer);</div><div class='add'>+	struct xpc_vars_part_sn2 *pulled_entry;</div><div class='add'>+	unsigned long remote_entry_cacheline_pa;</div><div class='add'>+	unsigned long remote_entry_pa;</div><div class='add'>+	short partid = XPC_PARTID(part);</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+</div><div class='add'>+	/* pull the cacheline that contains the variables we're interested in */</div><div class='add'>+</div><div class='add'>+	DBUG_ON(part_sn2-&gt;remote_vars_part_pa !=</div><div class='add'>+		L1_CACHE_ALIGN(part_sn2-&gt;remote_vars_part_pa));</div><div class='add'>+	DBUG_ON(sizeof(struct xpc_vars_part_sn2) != L1_CACHE_BYTES / 2);</div><div class='add'>+</div><div class='add'>+	remote_entry_pa = part_sn2-&gt;remote_vars_part_pa +</div><div class='add'>+	    sn_partition_id * sizeof(struct xpc_vars_part_sn2);</div><div class='add'>+</div><div class='add'>+	remote_entry_cacheline_pa = (remote_entry_pa &amp; ~(L1_CACHE_BYTES - 1));</div><div class='add'>+</div><div class='add'>+	pulled_entry = (struct xpc_vars_part_sn2 *)((u64)pulled_entry_cacheline</div><div class='add'>+						    + (remote_entry_pa &amp;</div><div class='add'>+						    (L1_CACHE_BYTES - 1)));</div><div class='add'>+</div><div class='add'>+	ret = xpc_pull_remote_cachelines_sn2(part, pulled_entry_cacheline,</div><div class='add'>+					     remote_entry_cacheline_pa,</div><div class='add'>+					     L1_CACHE_BYTES);</div><div class='add'>+	if (ret != xpSuccess) {</div><div class='add'>+		dev_dbg(xpc_chan, "failed to pull XPC vars_part from "</div><div class='add'>+			"partition %d, ret=%d\n", partid, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* see if they've been set up yet */</div><div class='add'>+</div><div class='add'>+	if (pulled_entry-&gt;magic != XPC_VP_MAGIC1_SN2 &amp;&amp;</div><div class='add'>+	    pulled_entry-&gt;magic != XPC_VP_MAGIC2_SN2) {</div><div class='add'>+</div><div class='add'>+		if (pulled_entry-&gt;magic != 0) {</div><div class='add'>+			dev_dbg(xpc_chan, "partition %d's XPC vars_part for "</div><div class='add'>+				"partition %d has bad magic value (=0x%lx)\n",</div><div class='add'>+				partid, sn_partition_id, pulled_entry-&gt;magic);</div><div class='add'>+			return xpBadMagic;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* they've not been initialized yet */</div><div class='add'>+		return xpRetry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (xpc_vars_part_sn2[partid].magic == XPC_VP_MAGIC1_SN2) {</div><div class='add'>+</div><div class='add'>+		/* validate the variables */</div><div class='add'>+</div><div class='add'>+		if (pulled_entry-&gt;GPs_pa == 0 ||</div><div class='add'>+		    pulled_entry-&gt;openclose_args_pa == 0 ||</div><div class='add'>+		    pulled_entry-&gt;chctl_amo_pa == 0) {</div><div class='add'>+</div><div class='add'>+			dev_err(xpc_chan, "partition %d's XPC vars_part for "</div><div class='add'>+				"partition %d are not valid\n", partid,</div><div class='add'>+				sn_partition_id);</div><div class='add'>+			return xpInvalidAddress;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* the variables we imported look to be valid */</div><div class='add'>+</div><div class='add'>+		part_sn2-&gt;remote_GPs_pa = pulled_entry-&gt;GPs_pa;</div><div class='add'>+		part_sn2-&gt;remote_openclose_args_pa =</div><div class='add'>+		    pulled_entry-&gt;openclose_args_pa;</div><div class='add'>+		part_sn2-&gt;remote_chctl_amo_va =</div><div class='add'>+		    (struct amo *)__va(pulled_entry-&gt;chctl_amo_pa);</div><div class='add'>+		part_sn2-&gt;notify_IRQ_nasid = pulled_entry-&gt;notify_IRQ_nasid;</div><div class='add'>+		part_sn2-&gt;notify_IRQ_phys_cpuid =</div><div class='add'>+		    pulled_entry-&gt;notify_IRQ_phys_cpuid;</div><div class='add'>+</div><div class='add'>+		if (part-&gt;nchannels &gt; pulled_entry-&gt;nchannels)</div><div class='add'>+			part-&gt;nchannels = pulled_entry-&gt;nchannels;</div><div class='add'>+</div><div class='add'>+		/* let the other side know that we've pulled their variables */</div><div class='add'>+</div><div class='add'>+		xpc_vars_part_sn2[partid].magic = XPC_VP_MAGIC2_SN2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pulled_entry-&gt;magic == XPC_VP_MAGIC1_SN2)</div><div class='add'>+		return xpRetry;</div><div class='add'>+</div><div class='add'>+	return xpSuccess;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Establish first contact with the remote partititon. This involves pulling</div><div class='add'>+ * the XPC per partition variables from the remote partition and waiting for</div><div class='add'>+ * the remote partition to pull ours.</div><div class='add'>+ */</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_make_first_contact_sn2(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition_sn2 *part_sn2 = &amp;part-&gt;sn.sn2;</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Register the remote partition's amos with SAL so it can handle</div><div class='add'>+	 * and cleanup errors within that address range should the remote</div><div class='add'>+	 * partition go down. We don't unregister this range because it is</div><div class='add'>+	 * difficult to tell when outstanding writes to the remote partition</div><div class='add'>+	 * are finished and thus when it is safe to unregister. This should</div><div class='add'>+	 * not result in wasted space in the SAL xp_addr_region table because</div><div class='add'>+	 * we should get the same page for remote_amos_page_pa after module</div><div class='add'>+	 * reloads and system reboots.</div><div class='add'>+	 */</div><div class='add'>+	if (sn_register_xp_addr_region(part_sn2-&gt;remote_amos_page_pa,</div><div class='add'>+				       PAGE_SIZE, 1) &lt; 0) {</div><div class='add'>+		dev_warn(xpc_part, "xpc_activating(%d) failed to register "</div><div class='add'>+			 "xp_addr region\n", XPC_PARTID(part));</div><div class='add'>+</div><div class='add'>+		ret = xpPhysAddrRegFailed;</div><div class='add'>+		XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Send activate IRQ to get other side to activate if they've not</div><div class='add'>+	 * already begun to do so.</div><div class='add'>+	 */</div><div class='add'>+	xpc_send_activate_IRQ_sn2(part_sn2-&gt;remote_amos_page_pa,</div><div class='add'>+				  cnodeid_to_nasid(0),</div><div class='add'>+				  part_sn2-&gt;activate_IRQ_nasid,</div><div class='add'>+				  part_sn2-&gt;activate_IRQ_phys_cpuid);</div><div class='add'>+</div><div class='add'>+	while ((ret = xpc_pull_remote_vars_part_sn2(part)) != xpSuccess) {</div><div class='add'>+		if (ret != xpRetry) {</div><div class='add'>+			XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev_dbg(xpc_part, "waiting to make first contact with "</div><div class='add'>+			"partition %d\n", XPC_PARTID(part));</div><div class='add'>+</div><div class='add'>+		/* wait a 1/4 of a second or so */</div><div class='add'>+		(void)msleep_interruptible(250);</div><div class='add'>+</div><div class='add'>+		if (part-&gt;act_state == XPC_P_AS_DEACTIVATING)</div><div class='add'>+			return part-&gt;reason;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return xpSuccess;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get the chctl flags and pull the openclose args and/or remote GPs as needed.</div><div class='add'>+ */</div><div class='add'>+static u64</div><div class='add'>+xpc_get_chctl_all_flags_sn2(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition_sn2 *part_sn2 = &amp;part-&gt;sn.sn2;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	union xpc_channel_ctl_flags chctl;</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * See if there are any chctl flags to be handled.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;part-&gt;chctl_lock, irq_flags);</div><div class='add'>+	chctl = part-&gt;chctl;</div><div class='add'>+	if (chctl.all_flags != 0)</div><div class='add'>+		part-&gt;chctl.all_flags = 0;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;part-&gt;chctl_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+	if (xpc_any_openclose_chctl_flags_set(&amp;chctl)) {</div><div class='add'>+		ret = xpc_pull_remote_cachelines_sn2(part, part-&gt;</div><div class='add'>+						     remote_openclose_args,</div><div class='add'>+						     part_sn2-&gt;</div><div class='add'>+						     remote_openclose_args_pa,</div><div class='add'>+						     XPC_OPENCLOSE_ARGS_SIZE);</div><div class='add'>+		if (ret != xpSuccess) {</div><div class='add'>+			XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='add'>+</div><div class='add'>+			dev_dbg(xpc_chan, "failed to pull openclose args from "</div><div class='add'>+				"partition %d, ret=%d\n", XPC_PARTID(part),</div><div class='add'>+				ret);</div><div class='add'>+</div><div class='add'>+			/* don't bother processing chctl flags anymore */</div><div class='add'>+			chctl.all_flags = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (xpc_any_msg_chctl_flags_set(&amp;chctl)) {</div><div class='add'>+		ret = xpc_pull_remote_cachelines_sn2(part, part_sn2-&gt;remote_GPs,</div><div class='add'>+						     part_sn2-&gt;remote_GPs_pa,</div><div class='add'>+						     XPC_GP_SIZE);</div><div class='add'>+		if (ret != xpSuccess) {</div><div class='add'>+			XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='add'>+</div><div class='add'>+			dev_dbg(xpc_chan, "failed to pull GPs from partition "</div><div class='add'>+				"%d, ret=%d\n", XPC_PARTID(part), ret);</div><div class='add'>+</div><div class='add'>+			/* don't bother processing chctl flags anymore */</div><div class='add'>+			chctl.all_flags = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return chctl.all_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate the local message queue and the notify queue.</div><div class='add'>+ */</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_allocate_local_msgqueue_sn2(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	struct xpc_channel_sn2 *ch_sn2 = &amp;ch-&gt;sn.sn2;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	int nentries;</div><div class='add'>+	size_t nbytes;</div><div class='add'>+</div><div class='add'>+	for (nentries = ch-&gt;local_nentries; nentries &gt; 0; nentries--) {</div><div class='add'>+</div><div class='add'>+		nbytes = nentries * ch-&gt;entry_size;</div><div class='add'>+		ch_sn2-&gt;local_msgqueue =</div><div class='add'>+		    xpc_kzalloc_cacheline_aligned(nbytes, GFP_KERNEL,</div><div class='add'>+						  &amp;ch_sn2-&gt;local_msgqueue_base);</div><div class='add'>+		if (ch_sn2-&gt;local_msgqueue == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		nbytes = nentries * sizeof(struct xpc_notify_sn2);</div><div class='add'>+		ch_sn2-&gt;notify_queue = kzalloc(nbytes, GFP_KERNEL);</div><div class='add'>+		if (ch_sn2-&gt;notify_queue == NULL) {</div><div class='add'>+			kfree(ch_sn2-&gt;local_msgqueue_base);</div><div class='add'>+			ch_sn2-&gt;local_msgqueue = NULL;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;ch-&gt;lock, irq_flags);</div><div class='add'>+		if (nentries &lt; ch-&gt;local_nentries) {</div><div class='add'>+			dev_dbg(xpc_chan, "nentries=%d local_nentries=%d, "</div><div class='add'>+				"partid=%d, channel=%d\n", nentries,</div><div class='add'>+				ch-&gt;local_nentries, ch-&gt;partid, ch-&gt;number);</div><div class='add'>+</div><div class='add'>+			ch-&gt;local_nentries = nentries;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='add'>+		return xpSuccess;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(xpc_chan, "can't get memory for local message queue and notify "</div><div class='add'>+		"queue, partid=%d, channel=%d\n", ch-&gt;partid, ch-&gt;number);</div><div class='add'>+	return xpNoMemory;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate the cached remote message queue.</div><div class='add'>+ */</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_allocate_remote_msgqueue_sn2(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	struct xpc_channel_sn2 *ch_sn2 = &amp;ch-&gt;sn.sn2;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	int nentries;</div><div class='add'>+	size_t nbytes;</div><div class='add'>+</div><div class='add'>+	DBUG_ON(ch-&gt;remote_nentries &lt;= 0);</div><div class='add'>+</div><div class='add'>+	for (nentries = ch-&gt;remote_nentries; nentries &gt; 0; nentries--) {</div><div class='add'>+</div><div class='add'>+		nbytes = nentries * ch-&gt;entry_size;</div><div class='add'>+		ch_sn2-&gt;remote_msgqueue =</div><div class='add'>+		    xpc_kzalloc_cacheline_aligned(nbytes, GFP_KERNEL, &amp;ch_sn2-&gt;</div><div class='add'>+						  remote_msgqueue_base);</div><div class='add'>+		if (ch_sn2-&gt;remote_msgqueue == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;ch-&gt;lock, irq_flags);</div><div class='add'>+		if (nentries &lt; ch-&gt;remote_nentries) {</div><div class='add'>+			dev_dbg(xpc_chan, "nentries=%d remote_nentries=%d, "</div><div class='add'>+				"partid=%d, channel=%d\n", nentries,</div><div class='add'>+				ch-&gt;remote_nentries, ch-&gt;partid, ch-&gt;number);</div><div class='add'>+</div><div class='add'>+			ch-&gt;remote_nentries = nentries;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='add'>+		return xpSuccess;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(xpc_chan, "can't get memory for cached remote message queue, "</div><div class='add'>+		"partid=%d, channel=%d\n", ch-&gt;partid, ch-&gt;number);</div><div class='add'>+	return xpNoMemory;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate message queues and other stuff associated with a channel.</div><div class='add'>+ *</div><div class='add'>+ * Note: Assumes all of the channel sizes are filled in.</div><div class='add'>+ */</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_setup_msg_structures_sn2(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	struct xpc_channel_sn2 *ch_sn2 = &amp;ch-&gt;sn.sn2;</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+</div><div class='add'>+	DBUG_ON(ch-&gt;flags &amp; XPC_C_SETUP);</div><div class='add'>+</div><div class='add'>+	ret = xpc_allocate_local_msgqueue_sn2(ch);</div><div class='add'>+	if (ret == xpSuccess) {</div><div class='add'>+</div><div class='add'>+		ret = xpc_allocate_remote_msgqueue_sn2(ch);</div><div class='add'>+		if (ret != xpSuccess) {</div><div class='add'>+			kfree(ch_sn2-&gt;local_msgqueue_base);</div><div class='add'>+			ch_sn2-&gt;local_msgqueue = NULL;</div><div class='add'>+			kfree(ch_sn2-&gt;notify_queue);</div><div class='add'>+			ch_sn2-&gt;notify_queue = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Free up message queues and other stuff that were allocated for the specified</div><div class='add'>+ * channel.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_teardown_msg_structures_sn2(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	struct xpc_channel_sn2 *ch_sn2 = &amp;ch-&gt;sn.sn2;</div><div class='add'>+</div><div class='add'>+	DBUG_ON(!spin_is_locked(&amp;ch-&gt;lock));</div><div class='add'>+</div><div class='add'>+	ch_sn2-&gt;remote_msgqueue_pa = 0;</div><div class='add'>+</div><div class='add'>+	ch_sn2-&gt;local_GP-&gt;get = 0;</div><div class='add'>+	ch_sn2-&gt;local_GP-&gt;put = 0;</div><div class='add'>+	ch_sn2-&gt;remote_GP.get = 0;</div><div class='add'>+	ch_sn2-&gt;remote_GP.put = 0;</div><div class='add'>+	ch_sn2-&gt;w_local_GP.get = 0;</div><div class='add'>+	ch_sn2-&gt;w_local_GP.put = 0;</div><div class='add'>+	ch_sn2-&gt;w_remote_GP.get = 0;</div><div class='add'>+	ch_sn2-&gt;w_remote_GP.put = 0;</div><div class='add'>+	ch_sn2-&gt;next_msg_to_pull = 0;</div><div class='add'>+</div><div class='add'>+	if (ch-&gt;flags &amp; XPC_C_SETUP) {</div><div class='add'>+		dev_dbg(xpc_chan, "ch-&gt;flags=0x%x, partid=%d, channel=%d\n",</div><div class='add'>+			ch-&gt;flags, ch-&gt;partid, ch-&gt;number);</div><div class='add'>+</div><div class='add'>+		kfree(ch_sn2-&gt;local_msgqueue_base);</div><div class='add'>+		ch_sn2-&gt;local_msgqueue = NULL;</div><div class='add'>+		kfree(ch_sn2-&gt;remote_msgqueue_base);</div><div class='add'>+		ch_sn2-&gt;remote_msgqueue = NULL;</div><div class='add'>+		kfree(ch_sn2-&gt;notify_queue);</div><div class='add'>+		ch_sn2-&gt;notify_queue = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Notify those who wanted to be notified upon delivery of their message.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_notify_senders_sn2(struct xpc_channel *ch, enum xp_retval reason, s64 put)</div><div class='add'>+{</div><div class='add'>+	struct xpc_notify_sn2 *notify;</div><div class='add'>+	u8 notify_type;</div><div class='add'>+	s64 get = ch-&gt;sn.sn2.w_remote_GP.get - 1;</div><div class='add'>+</div><div class='add'>+	while (++get &lt; put &amp;&amp; atomic_read(&amp;ch-&gt;n_to_notify) &gt; 0) {</div><div class='add'>+</div><div class='add'>+		notify = &amp;ch-&gt;sn.sn2.notify_queue[get % ch-&gt;local_nentries];</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * See if the notify entry indicates it was associated with</div><div class='add'>+		 * a message who's sender wants to be notified. It is possible</div><div class='add'>+		 * that it is, but someone else is doing or has done the</div><div class='add'>+		 * notification.</div><div class='add'>+		 */</div><div class='add'>+		notify_type = notify-&gt;type;</div><div class='add'>+		if (notify_type == 0 ||</div><div class='add'>+		    cmpxchg(&amp;notify-&gt;type, notify_type, 0) != notify_type) {</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		DBUG_ON(notify_type != XPC_N_CALL);</div><div class='add'>+</div><div class='add'>+		atomic_dec(&amp;ch-&gt;n_to_notify);</div><div class='add'>+</div><div class='add'>+		if (notify-&gt;func != NULL) {</div><div class='add'>+			dev_dbg(xpc_chan, "notify-&gt;func() called, notify=0x%p "</div><div class='add'>+				"msg_number=%ld partid=%d channel=%d\n",</div><div class='add'>+				(void *)notify, get, ch-&gt;partid, ch-&gt;number);</div><div class='add'>+</div><div class='add'>+			notify-&gt;func(reason, ch-&gt;partid, ch-&gt;number,</div><div class='add'>+				     notify-&gt;key);</div><div class='add'>+</div><div class='add'>+			dev_dbg(xpc_chan, "notify-&gt;func() returned, notify=0x%p"</div><div class='add'>+				" msg_number=%ld partid=%d channel=%d\n",</div><div class='add'>+				(void *)notify, get, ch-&gt;partid, ch-&gt;number);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_notify_senders_of_disconnect_sn2(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	xpc_notify_senders_sn2(ch, ch-&gt;reason, ch-&gt;sn.sn2.w_local_GP.put);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clear some of the msg flags in the local message queue.</div><div class='add'>+ */</div><div class='add'>+static inline void</div><div class='add'>+xpc_clear_local_msgqueue_flags_sn2(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	struct xpc_channel_sn2 *ch_sn2 = &amp;ch-&gt;sn.sn2;</div><div class='add'>+	struct xpc_msg_sn2 *msg;</div><div class='add'>+	s64 get;</div><div class='add'>+</div><div class='add'>+	get = ch_sn2-&gt;w_remote_GP.get;</div><div class='add'>+	do {</div><div class='add'>+		msg = (struct xpc_msg_sn2 *)((u64)ch_sn2-&gt;local_msgqueue +</div><div class='add'>+					     (get % ch-&gt;local_nentries) *</div><div class='add'>+					     ch-&gt;entry_size);</div><div class='add'>+		msg-&gt;flags = 0;</div><div class='add'>+	} while (++get &lt; ch_sn2-&gt;remote_GP.get);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clear some of the msg flags in the remote message queue.</div><div class='add'>+ */</div><div class='add'>+static inline void</div><div class='add'>+xpc_clear_remote_msgqueue_flags_sn2(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	struct xpc_channel_sn2 *ch_sn2 = &amp;ch-&gt;sn.sn2;</div><div class='add'>+	struct xpc_msg_sn2 *msg;</div><div class='add'>+	s64 put;</div><div class='add'>+</div><div class='add'>+	put = ch_sn2-&gt;w_remote_GP.put;</div><div class='add'>+	do {</div><div class='add'>+		msg = (struct xpc_msg_sn2 *)((u64)ch_sn2-&gt;remote_msgqueue +</div><div class='add'>+					     (put % ch-&gt;remote_nentries) *</div><div class='add'>+					     ch-&gt;entry_size);</div><div class='add'>+		msg-&gt;flags = 0;</div><div class='add'>+	} while (++put &lt; ch_sn2-&gt;remote_GP.put);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+xpc_n_of_deliverable_payloads_sn2(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	return ch-&gt;sn.sn2.w_remote_GP.put - ch-&gt;sn.sn2.w_local_GP.get;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_process_msg_chctl_flags_sn2(struct xpc_partition *part, int ch_number)</div><div class='add'>+{</div><div class='add'>+	struct xpc_channel *ch = &amp;part-&gt;channels[ch_number];</div><div class='add'>+	struct xpc_channel_sn2 *ch_sn2 = &amp;ch-&gt;sn.sn2;</div><div class='add'>+	int npayloads_sent;</div><div class='add'>+</div><div class='add'>+	ch_sn2-&gt;remote_GP = part-&gt;sn.sn2.remote_GPs[ch_number];</div><div class='add'>+</div><div class='add'>+	/* See what, if anything, has changed for each connected channel */</div><div class='add'>+</div><div class='add'>+	xpc_msgqueue_ref(ch);</div><div class='add'>+</div><div class='add'>+	if (ch_sn2-&gt;w_remote_GP.get == ch_sn2-&gt;remote_GP.get &amp;&amp;</div><div class='add'>+	    ch_sn2-&gt;w_remote_GP.put == ch_sn2-&gt;remote_GP.put) {</div><div class='add'>+		/* nothing changed since GPs were last pulled */</div><div class='add'>+		xpc_msgqueue_deref(ch);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(ch-&gt;flags &amp; XPC_C_CONNECTED)) {</div><div class='add'>+		xpc_msgqueue_deref(ch);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * First check to see if messages recently sent by us have been</div><div class='add'>+	 * received by the other side. (The remote GET value will have</div><div class='add'>+	 * changed since we last looked at it.)</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (ch_sn2-&gt;w_remote_GP.get != ch_sn2-&gt;remote_GP.get) {</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We need to notify any senders that want to be notified</div><div class='add'>+		 * that their sent messages have been received by their</div><div class='add'>+		 * intended recipients. We need to do this before updating</div><div class='add'>+		 * w_remote_GP.get so that we don't allocate the same message</div><div class='add'>+		 * queue entries prematurely (see xpc_allocate_msg()).</div><div class='add'>+		 */</div><div class='add'>+		if (atomic_read(&amp;ch-&gt;n_to_notify) &gt; 0) {</div><div class='add'>+			/*</div><div class='add'>+			 * Notify senders that messages sent have been</div><div class='add'>+			 * received and delivered by the other side.</div><div class='add'>+			 */</div><div class='add'>+			xpc_notify_senders_sn2(ch, xpMsgDelivered,</div><div class='add'>+					       ch_sn2-&gt;remote_GP.get);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Clear msg-&gt;flags in previously sent messages, so that</div><div class='add'>+		 * they're ready for xpc_allocate_msg().</div><div class='add'>+		 */</div><div class='add'>+		xpc_clear_local_msgqueue_flags_sn2(ch);</div><div class='add'>+</div><div class='add'>+		ch_sn2-&gt;w_remote_GP.get = ch_sn2-&gt;remote_GP.get;</div><div class='add'>+</div><div class='add'>+		dev_dbg(xpc_chan, "w_remote_GP.get changed to %ld, partid=%d, "</div><div class='add'>+			"channel=%d\n", ch_sn2-&gt;w_remote_GP.get, ch-&gt;partid,</div><div class='add'>+			ch-&gt;number);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If anyone was waiting for message queue entries to become</div><div class='add'>+		 * available, wake them up.</div><div class='add'>+		 */</div><div class='add'>+		if (atomic_read(&amp;ch-&gt;n_on_msg_allocate_wq) &gt; 0)</div><div class='add'>+			wake_up(&amp;ch-&gt;msg_allocate_wq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now check for newly sent messages by the other side. (The remote</div><div class='add'>+	 * PUT value will have changed since we last looked at it.)</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (ch_sn2-&gt;w_remote_GP.put != ch_sn2-&gt;remote_GP.put) {</div><div class='add'>+		/*</div><div class='add'>+		 * Clear msg-&gt;flags in previously received messages, so that</div><div class='add'>+		 * they're ready for xpc_get_deliverable_payload_sn2().</div><div class='add'>+		 */</div><div class='add'>+		xpc_clear_remote_msgqueue_flags_sn2(ch);</div><div class='add'>+</div><div class='add'>+		ch_sn2-&gt;w_remote_GP.put = ch_sn2-&gt;remote_GP.put;</div><div class='add'>+</div><div class='add'>+		dev_dbg(xpc_chan, "w_remote_GP.put changed to %ld, partid=%d, "</div><div class='add'>+			"channel=%d\n", ch_sn2-&gt;w_remote_GP.put, ch-&gt;partid,</div><div class='add'>+			ch-&gt;number);</div><div class='add'>+</div><div class='add'>+		npayloads_sent = xpc_n_of_deliverable_payloads_sn2(ch);</div><div class='add'>+		if (npayloads_sent &gt; 0) {</div><div class='add'>+			dev_dbg(xpc_chan, "msgs waiting to be copied and "</div><div class='add'>+				"delivered=%d, partid=%d, channel=%d\n",</div><div class='add'>+				npayloads_sent, ch-&gt;partid, ch-&gt;number);</div><div class='add'>+</div><div class='add'>+			if (ch-&gt;flags &amp; XPC_C_CONNECTEDCALLOUT_MADE)</div><div class='add'>+				xpc_activate_kthreads(ch, npayloads_sent);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xpc_msgqueue_deref(ch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct xpc_msg_sn2 *</div><div class='add'>+xpc_pull_remote_msg_sn2(struct xpc_channel *ch, s64 get)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition *part = &amp;xpc_partitions[ch-&gt;partid];</div><div class='add'>+	struct xpc_channel_sn2 *ch_sn2 = &amp;ch-&gt;sn.sn2;</div><div class='add'>+	unsigned long remote_msg_pa;</div><div class='add'>+	struct xpc_msg_sn2 *msg;</div><div class='add'>+	u32 msg_index;</div><div class='add'>+	u32 nmsgs;</div><div class='add'>+	u64 msg_offset;</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+</div><div class='add'>+	if (mutex_lock_interruptible(&amp;ch_sn2-&gt;msg_to_pull_mutex) != 0) {</div><div class='add'>+		/* we were interrupted by a signal */</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (get &gt;= ch_sn2-&gt;next_msg_to_pull) {</div><div class='add'>+</div><div class='add'>+		/* pull as many messages as are ready and able to be pulled */</div><div class='add'>+</div><div class='add'>+		msg_index = ch_sn2-&gt;next_msg_to_pull % ch-&gt;remote_nentries;</div><div class='add'>+</div><div class='add'>+		DBUG_ON(ch_sn2-&gt;next_msg_to_pull &gt;= ch_sn2-&gt;w_remote_GP.put);</div><div class='add'>+		nmsgs = ch_sn2-&gt;w_remote_GP.put - ch_sn2-&gt;next_msg_to_pull;</div><div class='add'>+		if (msg_index + nmsgs &gt; ch-&gt;remote_nentries) {</div><div class='add'>+			/* ignore the ones that wrap the msg queue for now */</div><div class='add'>+			nmsgs = ch-&gt;remote_nentries - msg_index;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msg_offset = msg_index * ch-&gt;entry_size;</div><div class='add'>+		msg = (struct xpc_msg_sn2 *)((u64)ch_sn2-&gt;remote_msgqueue +</div><div class='add'>+		    msg_offset);</div><div class='add'>+		remote_msg_pa = ch_sn2-&gt;remote_msgqueue_pa + msg_offset;</div><div class='add'>+</div><div class='add'>+		ret = xpc_pull_remote_cachelines_sn2(part, msg, remote_msg_pa,</div><div class='add'>+						     nmsgs * ch-&gt;entry_size);</div><div class='add'>+		if (ret != xpSuccess) {</div><div class='add'>+</div><div class='add'>+			dev_dbg(xpc_chan, "failed to pull %d msgs starting with"</div><div class='add'>+				" msg %ld from partition %d, channel=%d, "</div><div class='add'>+				"ret=%d\n", nmsgs, ch_sn2-&gt;next_msg_to_pull,</div><div class='add'>+				ch-&gt;partid, ch-&gt;number, ret);</div><div class='add'>+</div><div class='add'>+			XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='add'>+</div><div class='add'>+			mutex_unlock(&amp;ch_sn2-&gt;msg_to_pull_mutex);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ch_sn2-&gt;next_msg_to_pull += nmsgs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ch_sn2-&gt;msg_to_pull_mutex);</div><div class='add'>+</div><div class='add'>+	/* return the message we were looking for */</div><div class='add'>+	msg_offset = (get % ch-&gt;remote_nentries) * ch-&gt;entry_size;</div><div class='add'>+	msg = (struct xpc_msg_sn2 *)((u64)ch_sn2-&gt;remote_msgqueue + msg_offset);</div><div class='add'>+</div><div class='add'>+	return msg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get the next deliverable message's payload.</div><div class='add'>+ */</div><div class='add'>+static void *</div><div class='add'>+xpc_get_deliverable_payload_sn2(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	struct xpc_channel_sn2 *ch_sn2 = &amp;ch-&gt;sn.sn2;</div><div class='add'>+	struct xpc_msg_sn2 *msg;</div><div class='add'>+	void *payload = NULL;</div><div class='add'>+	s64 get;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (ch-&gt;flags &amp; XPC_C_DISCONNECTING)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		get = ch_sn2-&gt;w_local_GP.get;</div><div class='add'>+		rmb();	/* guarantee that .get loads before .put */</div><div class='add'>+		if (get == ch_sn2-&gt;w_remote_GP.put)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* There are messages waiting to be pulled and delivered.</div><div class='add'>+		 * We need to try to secure one for ourselves. We'll do this</div><div class='add'>+		 * by trying to increment w_local_GP.get and hope that no one</div><div class='add'>+		 * else beats us to it. If they do, we'll we'll simply have</div><div class='add'>+		 * to try again for the next one.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		if (cmpxchg(&amp;ch_sn2-&gt;w_local_GP.get, get, get + 1) == get) {</div><div class='add'>+			/* we got the entry referenced by get */</div><div class='add'>+</div><div class='add'>+			dev_dbg(xpc_chan, "w_local_GP.get changed to %ld, "</div><div class='add'>+				"partid=%d, channel=%d\n", get + 1,</div><div class='add'>+				ch-&gt;partid, ch-&gt;number);</div><div class='add'>+</div><div class='add'>+			/* pull the message from the remote partition */</div><div class='add'>+</div><div class='add'>+			msg = xpc_pull_remote_msg_sn2(ch, get);</div><div class='add'>+</div><div class='add'>+			DBUG_ON(msg != NULL &amp;&amp; msg-&gt;number != get);</div><div class='add'>+			DBUG_ON(msg != NULL &amp;&amp; (msg-&gt;flags &amp; XPC_M_SN2_DONE));</div><div class='add'>+			DBUG_ON(msg != NULL &amp;&amp; !(msg-&gt;flags &amp; XPC_M_SN2_READY));</div><div class='add'>+</div><div class='add'>+			payload = &amp;msg-&gt;payload;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} while (1);</div><div class='add'>+</div><div class='add'>+	return payload;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Now we actually send the messages that are ready to be sent by advancing</div><div class='add'>+ * the local message queue's Put value and then send a chctl msgrequest to the</div><div class='add'>+ * recipient partition.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_send_msgs_sn2(struct xpc_channel *ch, s64 initial_put)</div><div class='add'>+{</div><div class='add'>+	struct xpc_channel_sn2 *ch_sn2 = &amp;ch-&gt;sn.sn2;</div><div class='add'>+	struct xpc_msg_sn2 *msg;</div><div class='add'>+	s64 put = initial_put + 1;</div><div class='add'>+	int send_msgrequest = 0;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+</div><div class='add'>+		while (1) {</div><div class='add'>+			if (put == ch_sn2-&gt;w_local_GP.put)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			msg = (struct xpc_msg_sn2 *)((u64)ch_sn2-&gt;</div><div class='add'>+						     local_msgqueue + (put %</div><div class='add'>+						     ch-&gt;local_nentries) *</div><div class='add'>+						     ch-&gt;entry_size);</div><div class='add'>+</div><div class='add'>+			if (!(msg-&gt;flags &amp; XPC_M_SN2_READY))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			put++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (put == initial_put) {</div><div class='add'>+			/* nothing's changed */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cmpxchg_rel(&amp;ch_sn2-&gt;local_GP-&gt;put, initial_put, put) !=</div><div class='add'>+		    initial_put) {</div><div class='add'>+			/* someone else beat us to it */</div><div class='add'>+			DBUG_ON(ch_sn2-&gt;local_GP-&gt;put &lt; initial_put);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* we just set the new value of local_GP-&gt;put */</div><div class='add'>+</div><div class='add'>+		dev_dbg(xpc_chan, "local_GP-&gt;put changed to %ld, partid=%d, "</div><div class='add'>+			"channel=%d\n", put, ch-&gt;partid, ch-&gt;number);</div><div class='add'>+</div><div class='add'>+		send_msgrequest = 1;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We need to ensure that the message referenced by</div><div class='add'>+		 * local_GP-&gt;put is not XPC_M_SN2_READY or that local_GP-&gt;put</div><div class='add'>+		 * equals w_local_GP.put, so we'll go have a look.</div><div class='add'>+		 */</div><div class='add'>+		initial_put = put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (send_msgrequest)</div><div class='add'>+		xpc_send_chctl_msgrequest_sn2(ch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate an entry for a message from the message queue associated with the</div><div class='add'>+ * specified channel.</div><div class='add'>+ */</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_allocate_msg_sn2(struct xpc_channel *ch, u32 flags,</div><div class='add'>+		     struct xpc_msg_sn2 **address_of_msg)</div><div class='add'>+{</div><div class='add'>+	struct xpc_channel_sn2 *ch_sn2 = &amp;ch-&gt;sn.sn2;</div><div class='add'>+	struct xpc_msg_sn2 *msg;</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+	s64 put;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get the next available message entry from the local message queue.</div><div class='add'>+	 * If none are available, we'll make sure that we grab the latest</div><div class='add'>+	 * GP values.</div><div class='add'>+	 */</div><div class='add'>+	ret = xpTimeout;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+</div><div class='add'>+		put = ch_sn2-&gt;w_local_GP.put;</div><div class='add'>+		rmb();	/* guarantee that .put loads before .get */</div><div class='add'>+		if (put - ch_sn2-&gt;w_remote_GP.get &lt; ch-&gt;local_nentries) {</div><div class='add'>+</div><div class='add'>+			/* There are available message entries. We need to try</div><div class='add'>+			 * to secure one for ourselves. We'll do this by trying</div><div class='add'>+			 * to increment w_local_GP.put as long as someone else</div><div class='add'>+			 * doesn't beat us to it. If they do, we'll have to</div><div class='add'>+			 * try again.</div><div class='add'>+			 */</div><div class='add'>+			if (cmpxchg(&amp;ch_sn2-&gt;w_local_GP.put, put, put + 1) ==</div><div class='add'>+			    put) {</div><div class='add'>+				/* we got the entry referenced by put */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			continue;	/* try again */</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * There aren't any available msg entries at this time.</div><div class='add'>+		 *</div><div class='add'>+		 * In waiting for a message entry to become available,</div><div class='add'>+		 * we set a timeout in case the other side is not sending</div><div class='add'>+		 * completion interrupts. This lets us fake a notify IRQ</div><div class='add'>+		 * that will cause the notify IRQ handler to fetch the latest</div><div class='add'>+		 * GP values as if an interrupt was sent by the other side.</div><div class='add'>+		 */</div><div class='add'>+		if (ret == xpTimeout)</div><div class='add'>+			xpc_send_chctl_local_msgrequest_sn2(ch);</div><div class='add'>+</div><div class='add'>+		if (flags &amp; XPC_NOWAIT)</div><div class='add'>+			return xpNoWait;</div><div class='add'>+</div><div class='add'>+		ret = xpc_allocate_msg_wait(ch);</div><div class='add'>+		if (ret != xpInterrupted &amp;&amp; ret != xpTimeout)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get the message's address and initialize it */</div><div class='add'>+	msg = (struct xpc_msg_sn2 *)((u64)ch_sn2-&gt;local_msgqueue +</div><div class='add'>+				     (put % ch-&gt;local_nentries) *</div><div class='add'>+				     ch-&gt;entry_size);</div><div class='add'>+</div><div class='add'>+	DBUG_ON(msg-&gt;flags != 0);</div><div class='add'>+	msg-&gt;number = put;</div><div class='add'>+</div><div class='add'>+	dev_dbg(xpc_chan, "w_local_GP.put changed to %ld; msg=0x%p, "</div><div class='add'>+		"msg_number=%ld, partid=%d, channel=%d\n", put + 1,</div><div class='add'>+		(void *)msg, msg-&gt;number, ch-&gt;partid, ch-&gt;number);</div><div class='add'>+</div><div class='add'>+	*address_of_msg = msg;</div><div class='add'>+	return xpSuccess;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Common code that does the actual sending of the message by advancing the</div><div class='add'>+ * local message queue's Put value and sends a chctl msgrequest to the</div><div class='add'>+ * partition the message is being sent to.</div><div class='add'>+ */</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_send_payload_sn2(struct xpc_channel *ch, u32 flags, void *payload,</div><div class='add'>+		     u16 payload_size, u8 notify_type, xpc_notify_func func,</div><div class='add'>+		     void *key)</div><div class='add'>+{</div><div class='add'>+	enum xp_retval ret = xpSuccess;</div><div class='add'>+	struct xpc_channel_sn2 *ch_sn2 = &amp;ch-&gt;sn.sn2;</div><div class='add'>+	struct xpc_msg_sn2 *msg = msg;</div><div class='add'>+	struct xpc_notify_sn2 *notify = notify;</div><div class='add'>+	s64 msg_number;</div><div class='add'>+	s64 put;</div><div class='add'>+</div><div class='add'>+	DBUG_ON(notify_type == XPC_N_CALL &amp;&amp; func == NULL);</div><div class='add'>+</div><div class='add'>+	if (XPC_MSG_SIZE(payload_size) &gt; ch-&gt;entry_size)</div><div class='add'>+		return xpPayloadTooBig;</div><div class='add'>+</div><div class='add'>+	xpc_msgqueue_ref(ch);</div><div class='add'>+</div><div class='add'>+	if (ch-&gt;flags &amp; XPC_C_DISCONNECTING) {</div><div class='add'>+		ret = ch-&gt;reason;</div><div class='add'>+		goto out_1;</div><div class='add'>+	}</div><div class='add'>+	if (!(ch-&gt;flags &amp; XPC_C_CONNECTED)) {</div><div class='add'>+		ret = xpNotConnected;</div><div class='add'>+		goto out_1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = xpc_allocate_msg_sn2(ch, flags, &amp;msg);</div><div class='add'>+	if (ret != xpSuccess)</div><div class='add'>+		goto out_1;</div><div class='add'>+</div><div class='add'>+	msg_number = msg-&gt;number;</div><div class='add'>+</div><div class='add'>+	if (notify_type != 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * Tell the remote side to send an ACK interrupt when the</div><div class='add'>+		 * message has been delivered.</div><div class='add'>+		 */</div><div class='add'>+		msg-&gt;flags |= XPC_M_SN2_INTERRUPT;</div><div class='add'>+</div><div class='add'>+		atomic_inc(&amp;ch-&gt;n_to_notify);</div><div class='add'>+</div><div class='add'>+		notify = &amp;ch_sn2-&gt;notify_queue[msg_number % ch-&gt;local_nentries];</div><div class='add'>+		notify-&gt;func = func;</div><div class='add'>+		notify-&gt;key = key;</div><div class='add'>+		notify-&gt;type = notify_type;</div><div class='add'>+</div><div class='add'>+		/* ??? Is a mb() needed here? */</div><div class='add'>+</div><div class='add'>+		if (ch-&gt;flags &amp; XPC_C_DISCONNECTING) {</div><div class='add'>+			/*</div><div class='add'>+			 * An error occurred between our last error check and</div><div class='add'>+			 * this one. We will try to clear the type field from</div><div class='add'>+			 * the notify entry. If we succeed then</div><div class='add'>+			 * xpc_disconnect_channel() didn't already process</div><div class='add'>+			 * the notify entry.</div><div class='add'>+			 */</div><div class='add'>+			if (cmpxchg(&amp;notify-&gt;type, notify_type, 0) ==</div><div class='add'>+			    notify_type) {</div><div class='add'>+				atomic_dec(&amp;ch-&gt;n_to_notify);</div><div class='add'>+				ret = ch-&gt;reason;</div><div class='add'>+			}</div><div class='add'>+			goto out_1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;msg-&gt;payload, payload, payload_size);</div><div class='add'>+</div><div class='add'>+	msg-&gt;flags |= XPC_M_SN2_READY;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The preceding store of msg-&gt;flags must occur before the following</div><div class='add'>+	 * load of local_GP-&gt;put.</div><div class='add'>+	 */</div><div class='add'>+	mb();</div><div class='add'>+</div><div class='add'>+	/* see if the message is next in line to be sent, if so send it */</div><div class='add'>+</div><div class='add'>+	put = ch_sn2-&gt;local_GP-&gt;put;</div><div class='add'>+	if (put == msg_number)</div><div class='add'>+		xpc_send_msgs_sn2(ch, put);</div><div class='add'>+</div><div class='add'>+out_1:</div><div class='add'>+	xpc_msgqueue_deref(ch);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Now we actually acknowledge the messages that have been delivered and ack'd</div><div class='add'>+ * by advancing the cached remote message queue's Get value and if requested</div><div class='add'>+ * send a chctl msgrequest to the message sender's partition.</div><div class='add'>+ *</div><div class='add'>+ * If a message has XPC_M_SN2_INTERRUPT set, send an interrupt to the partition</div><div class='add'>+ * that sent the message.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_acknowledge_msgs_sn2(struct xpc_channel *ch, s64 initial_get, u8 msg_flags)</div><div class='add'>+{</div><div class='add'>+	struct xpc_channel_sn2 *ch_sn2 = &amp;ch-&gt;sn.sn2;</div><div class='add'>+	struct xpc_msg_sn2 *msg;</div><div class='add'>+	s64 get = initial_get + 1;</div><div class='add'>+	int send_msgrequest = 0;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+</div><div class='add'>+		while (1) {</div><div class='add'>+			if (get == ch_sn2-&gt;w_local_GP.get)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			msg = (struct xpc_msg_sn2 *)((u64)ch_sn2-&gt;</div><div class='add'>+						     remote_msgqueue + (get %</div><div class='add'>+						     ch-&gt;remote_nentries) *</div><div class='add'>+						     ch-&gt;entry_size);</div><div class='add'>+</div><div class='add'>+			if (!(msg-&gt;flags &amp; XPC_M_SN2_DONE))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			msg_flags |= msg-&gt;flags;</div><div class='add'>+			get++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (get == initial_get) {</div><div class='add'>+			/* nothing's changed */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cmpxchg_rel(&amp;ch_sn2-&gt;local_GP-&gt;get, initial_get, get) !=</div><div class='add'>+		    initial_get) {</div><div class='add'>+			/* someone else beat us to it */</div><div class='add'>+			DBUG_ON(ch_sn2-&gt;local_GP-&gt;get &lt;= initial_get);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* we just set the new value of local_GP-&gt;get */</div><div class='add'>+</div><div class='add'>+		dev_dbg(xpc_chan, "local_GP-&gt;get changed to %ld, partid=%d, "</div><div class='add'>+			"channel=%d\n", get, ch-&gt;partid, ch-&gt;number);</div><div class='add'>+</div><div class='add'>+		send_msgrequest = (msg_flags &amp; XPC_M_SN2_INTERRUPT);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We need to ensure that the message referenced by</div><div class='add'>+		 * local_GP-&gt;get is not XPC_M_SN2_DONE or that local_GP-&gt;get</div><div class='add'>+		 * equals w_local_GP.get, so we'll go have a look.</div><div class='add'>+		 */</div><div class='add'>+		initial_get = get;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (send_msgrequest)</div><div class='add'>+		xpc_send_chctl_msgrequest_sn2(ch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_received_payload_sn2(struct xpc_channel *ch, void *payload)</div><div class='add'>+{</div><div class='add'>+	struct xpc_msg_sn2 *msg;</div><div class='add'>+	s64 msg_number;</div><div class='add'>+	s64 get;</div><div class='add'>+</div><div class='add'>+	msg = container_of(payload, struct xpc_msg_sn2, payload);</div><div class='add'>+	msg_number = msg-&gt;number;</div><div class='add'>+</div><div class='add'>+	dev_dbg(xpc_chan, "msg=0x%p, msg_number=%ld, partid=%d, channel=%d\n",</div><div class='add'>+		(void *)msg, msg_number, ch-&gt;partid, ch-&gt;number);</div><div class='add'>+</div><div class='add'>+	DBUG_ON((((u64)msg - (u64)ch-&gt;remote_msgqueue) / ch-&gt;entry_size) !=</div><div class='add'>+		msg_number % ch-&gt;remote_nentries);</div><div class='add'>+	DBUG_ON(msg-&gt;flags &amp; XPC_M_SN2_DONE);</div><div class='add'>+</div><div class='add'>+	msg-&gt;flags |= XPC_M_SN2_DONE;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The preceding store of msg-&gt;flags must occur before the following</div><div class='add'>+	 * load of local_GP-&gt;get.</div><div class='add'>+	 */</div><div class='add'>+	mb();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * See if this message is next in line to be acknowledged as having</div><div class='add'>+	 * been delivered.</div><div class='add'>+	 */</div><div class='add'>+	get = ch-&gt;sn.sn2.local_GP-&gt;get;</div><div class='add'>+	if (get == msg_number)</div><div class='add'>+		xpc_acknowledge_msgs_sn2(ch, get, msg-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+xpc_init_sn2(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	size_t buf_size;</div><div class='add'>+</div><div class='add'>+	xpc_setup_partitions_sn = xpc_setup_partitions_sn_sn2;</div><div class='add'>+	xpc_get_partition_rsvd_page_pa = xpc_get_partition_rsvd_page_pa_sn2;</div><div class='add'>+	xpc_setup_rsvd_page_sn = xpc_setup_rsvd_page_sn_sn2;</div><div class='add'>+	xpc_increment_heartbeat = xpc_increment_heartbeat_sn2;</div><div class='add'>+	xpc_offline_heartbeat = xpc_offline_heartbeat_sn2;</div><div class='add'>+	xpc_online_heartbeat = xpc_online_heartbeat_sn2;</div><div class='add'>+	xpc_heartbeat_init = xpc_heartbeat_init_sn2;</div><div class='add'>+	xpc_heartbeat_exit = xpc_heartbeat_exit_sn2;</div><div class='add'>+	xpc_get_remote_heartbeat = xpc_get_remote_heartbeat_sn2;</div><div class='add'>+</div><div class='add'>+	xpc_request_partition_activation = xpc_request_partition_activation_sn2;</div><div class='add'>+	xpc_request_partition_reactivation =</div><div class='add'>+	    xpc_request_partition_reactivation_sn2;</div><div class='add'>+	xpc_request_partition_deactivation =</div><div class='add'>+	    xpc_request_partition_deactivation_sn2;</div><div class='add'>+	xpc_cancel_partition_deactivation_request =</div><div class='add'>+	    xpc_cancel_partition_deactivation_request_sn2;</div><div class='add'>+</div><div class='add'>+	xpc_process_activate_IRQ_rcvd = xpc_process_activate_IRQ_rcvd_sn2;</div><div class='add'>+	xpc_setup_ch_structures_sn = xpc_setup_ch_structures_sn_sn2;</div><div class='add'>+	xpc_teardown_ch_structures_sn = xpc_teardown_ch_structures_sn_sn2;</div><div class='add'>+	xpc_make_first_contact = xpc_make_first_contact_sn2;</div><div class='add'>+</div><div class='add'>+	xpc_get_chctl_all_flags = xpc_get_chctl_all_flags_sn2;</div><div class='add'>+	xpc_send_chctl_closerequest = xpc_send_chctl_closerequest_sn2;</div><div class='add'>+	xpc_send_chctl_closereply = xpc_send_chctl_closereply_sn2;</div><div class='add'>+	xpc_send_chctl_openrequest = xpc_send_chctl_openrequest_sn2;</div><div class='add'>+	xpc_send_chctl_openreply = xpc_send_chctl_openreply_sn2;</div><div class='add'>+</div><div class='add'>+	xpc_save_remote_msgqueue_pa = xpc_save_remote_msgqueue_pa_sn2;</div><div class='add'>+</div><div class='add'>+	xpc_setup_msg_structures = xpc_setup_msg_structures_sn2;</div><div class='add'>+	xpc_teardown_msg_structures = xpc_teardown_msg_structures_sn2;</div><div class='add'>+</div><div class='add'>+	xpc_notify_senders_of_disconnect = xpc_notify_senders_of_disconnect_sn2;</div><div class='add'>+	xpc_process_msg_chctl_flags = xpc_process_msg_chctl_flags_sn2;</div><div class='add'>+	xpc_n_of_deliverable_payloads = xpc_n_of_deliverable_payloads_sn2;</div><div class='add'>+	xpc_get_deliverable_payload = xpc_get_deliverable_payload_sn2;</div><div class='add'>+</div><div class='add'>+	xpc_indicate_partition_engaged = xpc_indicate_partition_engaged_sn2;</div><div class='add'>+	xpc_indicate_partition_disengaged =</div><div class='add'>+	    xpc_indicate_partition_disengaged_sn2;</div><div class='add'>+	xpc_partition_engaged = xpc_partition_engaged_sn2;</div><div class='add'>+	xpc_any_partition_engaged = xpc_any_partition_engaged_sn2;</div><div class='add'>+	xpc_assume_partition_disengaged = xpc_assume_partition_disengaged_sn2;</div><div class='add'>+</div><div class='add'>+	xpc_send_payload = xpc_send_payload_sn2;</div><div class='add'>+	xpc_received_payload = xpc_received_payload_sn2;</div><div class='add'>+</div><div class='add'>+	if (offsetof(struct xpc_msg_sn2, payload) &gt; XPC_MSG_HDR_MAX_SIZE) {</div><div class='add'>+		dev_err(xpc_part, "header portion of struct xpc_msg_sn2 is "</div><div class='add'>+			"larger than %d\n", XPC_MSG_HDR_MAX_SIZE);</div><div class='add'>+		return -E2BIG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf_size = max(XPC_RP_VARS_SIZE,</div><div class='add'>+		       XPC_RP_HEADER_SIZE + XP_NASID_MASK_BYTES_SN2);</div><div class='add'>+	xpc_remote_copy_buffer_sn2 = xpc_kmalloc_cacheline_aligned(buf_size,</div><div class='add'>+								   GFP_KERNEL,</div><div class='add'>+					      &amp;xpc_remote_copy_buffer_base_sn2);</div><div class='add'>+	if (xpc_remote_copy_buffer_sn2 == NULL) {</div><div class='add'>+		dev_err(xpc_part, "can't get memory for remote copy buffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* open up protections for IPI and [potentially] amo operations */</div><div class='add'>+	xpc_allow_IPI_ops_sn2();</div><div class='add'>+	xpc_allow_amo_ops_shub_wars_1_1_sn2();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is safe to do before the xpc_hb_checker thread has started</div><div class='add'>+	 * because the handler releases a wait queue.  If an interrupt is</div><div class='add'>+	 * received before the thread is waiting, it will not go to sleep,</div><div class='add'>+	 * but rather immediately process the interrupt.</div><div class='add'>+	 */</div><div class='add'>+	ret = request_irq(SGI_XPC_ACTIVATE, xpc_handle_activate_IRQ_sn2, 0,</div><div class='add'>+			  "xpc hb", NULL);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(xpc_part, "can't register ACTIVATE IRQ handler, "</div><div class='add'>+			"errno=%d\n", -ret);</div><div class='add'>+		xpc_disallow_IPI_ops_sn2();</div><div class='add'>+		kfree(xpc_remote_copy_buffer_base_sn2);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+xpc_exit_sn2(void)</div><div class='add'>+{</div><div class='add'>+	free_irq(SGI_XPC_ACTIVATE, NULL);</div><div class='add'>+	xpc_disallow_IPI_ops_sn2();</div><div class='add'>+	kfree(xpc_remote_copy_buffer_base_sn2);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c<br/>new file mode 100644<br/>index 000000000000..1ac694c01623<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xpc_uv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xpc_uv.c</a></div><div class='hunk'>@@ -0,0 +1,1443 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Cross Partition Communication (XPC) uv-based functions.</div><div class='add'>+ *</div><div class='add'>+ *     Architecture specific implementation of common functions.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;asm/uv/uv_hub.h&gt;</div><div class='add'>+#include "../sgi-gru/gru.h"</div><div class='add'>+#include "../sgi-gru/grukservices.h"</div><div class='add'>+#include "xpc.h"</div><div class='add'>+</div><div class='add'>+static atomic64_t xpc_heartbeat_uv;</div><div class='add'>+static DECLARE_BITMAP(xpc_heartbeating_to_mask_uv, XP_MAX_NPARTITIONS_UV);</div><div class='add'>+</div><div class='add'>+#define XPC_ACTIVATE_MSG_SIZE_UV	(1 * GRU_CACHE_LINE_BYTES)</div><div class='add'>+#define XPC_NOTIFY_MSG_SIZE_UV		(2 * GRU_CACHE_LINE_BYTES)</div><div class='add'>+</div><div class='add'>+#define XPC_ACTIVATE_MQ_SIZE_UV	(4 * XP_MAX_NPARTITIONS_UV * \</div><div class='add'>+				 XPC_ACTIVATE_MSG_SIZE_UV)</div><div class='add'>+#define XPC_NOTIFY_MQ_SIZE_UV	(4 * XP_MAX_NPARTITIONS_UV * \</div><div class='add'>+				 XPC_NOTIFY_MSG_SIZE_UV)</div><div class='add'>+</div><div class='add'>+static void *xpc_activate_mq_uv;</div><div class='add'>+static void *xpc_notify_mq_uv;</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+xpc_setup_partitions_sn_uv(void)</div><div class='add'>+{</div><div class='add'>+	short partid;</div><div class='add'>+	struct xpc_partition_uv *part_uv;</div><div class='add'>+</div><div class='add'>+	for (partid = 0; partid &lt; XP_MAX_NPARTITIONS_UV; partid++) {</div><div class='add'>+		part_uv = &amp;xpc_partitions[partid].sn.uv;</div><div class='add'>+</div><div class='add'>+		spin_lock_init(&amp;part_uv-&gt;flags_lock);</div><div class='add'>+		part_uv-&gt;remote_act_state = XPC_P_AS_INACTIVE;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *</div><div class='add'>+xpc_create_gru_mq_uv(unsigned int mq_size, int cpuid, unsigned int irq,</div><div class='add'>+		     irq_handler_t irq_handler)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int nid;</div><div class='add'>+	int mq_order;</div><div class='add'>+	struct page *page;</div><div class='add'>+	void *mq;</div><div class='add'>+</div><div class='add'>+	nid = cpu_to_node(cpuid);</div><div class='add'>+	mq_order = get_order(mq_size);</div><div class='add'>+	page = alloc_pages_node(nid, GFP_KERNEL | __GFP_ZERO | GFP_THISNODE,</div><div class='add'>+				mq_order);</div><div class='add'>+	if (page == NULL) {</div><div class='add'>+		dev_err(xpc_part, "xpc_create_gru_mq_uv() failed to alloc %d "</div><div class='add'>+			"bytes of memory on nid=%d for GRU mq\n", mq_size, nid);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mq = page_address(page);</div><div class='add'>+	ret = gru_create_message_queue(mq, mq_size);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(xpc_part, "gru_create_message_queue() returned "</div><div class='add'>+			"error=%d\n", ret);</div><div class='add'>+		free_pages((unsigned long)mq, mq_order);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* !!! Need to do some other things to set up IRQ */</div><div class='add'>+</div><div class='add'>+	ret = request_irq(irq, irq_handler, 0, "xpc", NULL);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(xpc_part, "request_irq(irq=%d) returned error=%d\n",</div><div class='add'>+			irq, ret);</div><div class='add'>+		free_pages((unsigned long)mq, mq_order);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* !!! enable generation of irq when GRU mq op occurs to this mq */</div><div class='add'>+</div><div class='add'>+	/* ??? allow other partitions to access GRU mq? */</div><div class='add'>+</div><div class='add'>+	return mq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_destroy_gru_mq_uv(void *mq, unsigned int mq_size, unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	/* ??? disallow other partitions to access GRU mq? */</div><div class='add'>+</div><div class='add'>+	/* !!! disable generation of irq when GRU mq op occurs to this mq */</div><div class='add'>+</div><div class='add'>+	free_irq(irq, NULL);</div><div class='add'>+</div><div class='add'>+	free_pages((unsigned long)mq, get_order(mq_size));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_send_gru_msg(unsigned long mq_gpa, void *msg, size_t msg_size)</div><div class='add'>+{</div><div class='add'>+	enum xp_retval xp_ret;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		ret = gru_send_message_gpa(mq_gpa, msg, msg_size);</div><div class='add'>+		if (ret == MQE_OK) {</div><div class='add'>+			xp_ret = xpSuccess;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ret == MQE_QUEUE_FULL) {</div><div class='add'>+			dev_dbg(xpc_chan, "gru_send_message_gpa() returned "</div><div class='add'>+				"error=MQE_QUEUE_FULL\n");</div><div class='add'>+			/* !!! handle QLimit reached; delay &amp; try again */</div><div class='add'>+			/* ??? Do we add a limit to the number of retries? */</div><div class='add'>+			(void)msleep_interruptible(10);</div><div class='add'>+		} else if (ret == MQE_CONGESTION) {</div><div class='add'>+			dev_dbg(xpc_chan, "gru_send_message_gpa() returned "</div><div class='add'>+				"error=MQE_CONGESTION\n");</div><div class='add'>+			/* !!! handle LB Overflow; simply try again */</div><div class='add'>+			/* ??? Do we add a limit to the number of retries? */</div><div class='add'>+		} else {</div><div class='add'>+			/* !!! Currently this is MQE_UNEXPECTED_CB_ERR */</div><div class='add'>+			dev_err(xpc_chan, "gru_send_message_gpa() returned "</div><div class='add'>+				"error=%d\n", ret);</div><div class='add'>+			xp_ret = xpGruSendMqError;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return xp_ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_process_activate_IRQ_rcvd_uv(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	short partid;</div><div class='add'>+	struct xpc_partition *part;</div><div class='add'>+	u8 act_state_req;</div><div class='add'>+</div><div class='add'>+	DBUG_ON(xpc_activate_IRQ_rcvd == 0);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+	for (partid = 0; partid &lt; XP_MAX_NPARTITIONS_UV; partid++) {</div><div class='add'>+		part = &amp;xpc_partitions[partid];</div><div class='add'>+</div><div class='add'>+		if (part-&gt;sn.uv.act_state_req == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		xpc_activate_IRQ_rcvd--;</div><div class='add'>+		BUG_ON(xpc_activate_IRQ_rcvd &lt; 0);</div><div class='add'>+</div><div class='add'>+		act_state_req = part-&gt;sn.uv.act_state_req;</div><div class='add'>+		part-&gt;sn.uv.act_state_req = 0;</div><div class='add'>+		spin_unlock_irqrestore(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+		if (act_state_req == XPC_P_ASR_ACTIVATE_UV) {</div><div class='add'>+			if (part-&gt;act_state == XPC_P_AS_INACTIVE)</div><div class='add'>+				xpc_activate_partition(part);</div><div class='add'>+			else if (part-&gt;act_state == XPC_P_AS_DEACTIVATING)</div><div class='add'>+				XPC_DEACTIVATE_PARTITION(part, xpReactivating);</div><div class='add'>+</div><div class='add'>+		} else if (act_state_req == XPC_P_ASR_REACTIVATE_UV) {</div><div class='add'>+			if (part-&gt;act_state == XPC_P_AS_INACTIVE)</div><div class='add'>+				xpc_activate_partition(part);</div><div class='add'>+			else</div><div class='add'>+				XPC_DEACTIVATE_PARTITION(part, xpReactivating);</div><div class='add'>+</div><div class='add'>+		} else if (act_state_req == XPC_P_ASR_DEACTIVATE_UV) {</div><div class='add'>+			XPC_DEACTIVATE_PARTITION(part, part-&gt;sn.uv.reason);</div><div class='add'>+</div><div class='add'>+		} else {</div><div class='add'>+			BUG();</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+		if (xpc_activate_IRQ_rcvd == 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_handle_activate_mq_msg_uv(struct xpc_partition *part,</div><div class='add'>+			      struct xpc_activate_mq_msghdr_uv *msg_hdr,</div><div class='add'>+			      int *wakeup_hb_checker)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	struct xpc_partition_uv *part_uv = &amp;part-&gt;sn.uv;</div><div class='add'>+	struct xpc_openclose_args *args;</div><div class='add'>+</div><div class='add'>+	part_uv-&gt;remote_act_state = msg_hdr-&gt;act_state;</div><div class='add'>+</div><div class='add'>+	switch (msg_hdr-&gt;type) {</div><div class='add'>+	case XPC_ACTIVATE_MQ_MSG_SYNC_ACT_STATE_UV:</div><div class='add'>+		/* syncing of remote_act_state was just done above */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case XPC_ACTIVATE_MQ_MSG_INC_HEARTBEAT_UV: {</div><div class='add'>+		struct xpc_activate_mq_msg_heartbeat_req_uv *msg;</div><div class='add'>+</div><div class='add'>+		msg = container_of(msg_hdr,</div><div class='add'>+				   struct xpc_activate_mq_msg_heartbeat_req_uv,</div><div class='add'>+				   hdr);</div><div class='add'>+		part_uv-&gt;heartbeat = msg-&gt;heartbeat;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case XPC_ACTIVATE_MQ_MSG_OFFLINE_HEARTBEAT_UV: {</div><div class='add'>+		struct xpc_activate_mq_msg_heartbeat_req_uv *msg;</div><div class='add'>+</div><div class='add'>+		msg = container_of(msg_hdr,</div><div class='add'>+				   struct xpc_activate_mq_msg_heartbeat_req_uv,</div><div class='add'>+				   hdr);</div><div class='add'>+		part_uv-&gt;heartbeat = msg-&gt;heartbeat;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;part_uv-&gt;flags_lock, irq_flags);</div><div class='add'>+		part_uv-&gt;flags |= XPC_P_HEARTBEAT_OFFLINE_UV;</div><div class='add'>+		spin_unlock_irqrestore(&amp;part_uv-&gt;flags_lock, irq_flags);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case XPC_ACTIVATE_MQ_MSG_ONLINE_HEARTBEAT_UV: {</div><div class='add'>+		struct xpc_activate_mq_msg_heartbeat_req_uv *msg;</div><div class='add'>+</div><div class='add'>+		msg = container_of(msg_hdr,</div><div class='add'>+				   struct xpc_activate_mq_msg_heartbeat_req_uv,</div><div class='add'>+				   hdr);</div><div class='add'>+		part_uv-&gt;heartbeat = msg-&gt;heartbeat;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;part_uv-&gt;flags_lock, irq_flags);</div><div class='add'>+		part_uv-&gt;flags &amp;= ~XPC_P_HEARTBEAT_OFFLINE_UV;</div><div class='add'>+		spin_unlock_irqrestore(&amp;part_uv-&gt;flags_lock, irq_flags);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case XPC_ACTIVATE_MQ_MSG_ACTIVATE_REQ_UV: {</div><div class='add'>+		struct xpc_activate_mq_msg_activate_req_uv *msg;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * ??? Do we deal here with ts_jiffies being different</div><div class='add'>+		 * ??? if act_state != XPC_P_AS_INACTIVE instead of</div><div class='add'>+		 * ??? below?</div><div class='add'>+		 */</div><div class='add'>+		msg = container_of(msg_hdr, struct</div><div class='add'>+				   xpc_activate_mq_msg_activate_req_uv, hdr);</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+		if (part_uv-&gt;act_state_req == 0)</div><div class='add'>+			xpc_activate_IRQ_rcvd++;</div><div class='add'>+		part_uv-&gt;act_state_req = XPC_P_ASR_ACTIVATE_UV;</div><div class='add'>+		part-&gt;remote_rp_pa = msg-&gt;rp_gpa; /* !!! _pa is _gpa */</div><div class='add'>+		part-&gt;remote_rp_ts_jiffies = msg_hdr-&gt;rp_ts_jiffies;</div><div class='add'>+		part_uv-&gt;remote_activate_mq_gpa = msg-&gt;activate_mq_gpa;</div><div class='add'>+		spin_unlock_irqrestore(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+		(*wakeup_hb_checker)++;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case XPC_ACTIVATE_MQ_MSG_DEACTIVATE_REQ_UV: {</div><div class='add'>+		struct xpc_activate_mq_msg_deactivate_req_uv *msg;</div><div class='add'>+</div><div class='add'>+		msg = container_of(msg_hdr, struct</div><div class='add'>+				   xpc_activate_mq_msg_deactivate_req_uv, hdr);</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+		if (part_uv-&gt;act_state_req == 0)</div><div class='add'>+			xpc_activate_IRQ_rcvd++;</div><div class='add'>+		part_uv-&gt;act_state_req = XPC_P_ASR_DEACTIVATE_UV;</div><div class='add'>+		part_uv-&gt;reason = msg-&gt;reason;</div><div class='add'>+		spin_unlock_irqrestore(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+		(*wakeup_hb_checker)++;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	case XPC_ACTIVATE_MQ_MSG_CHCTL_CLOSEREQUEST_UV: {</div><div class='add'>+		struct xpc_activate_mq_msg_chctl_closerequest_uv *msg;</div><div class='add'>+</div><div class='add'>+		msg = container_of(msg_hdr, struct</div><div class='add'>+				   xpc_activate_mq_msg_chctl_closerequest_uv,</div><div class='add'>+				   hdr);</div><div class='add'>+		args = &amp;part-&gt;remote_openclose_args[msg-&gt;ch_number];</div><div class='add'>+		args-&gt;reason = msg-&gt;reason;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;part-&gt;chctl_lock, irq_flags);</div><div class='add'>+		part-&gt;chctl.flags[msg-&gt;ch_number] |= XPC_CHCTL_CLOSEREQUEST;</div><div class='add'>+		spin_unlock_irqrestore(&amp;part-&gt;chctl_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+		xpc_wakeup_channel_mgr(part);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case XPC_ACTIVATE_MQ_MSG_CHCTL_CLOSEREPLY_UV: {</div><div class='add'>+		struct xpc_activate_mq_msg_chctl_closereply_uv *msg;</div><div class='add'>+</div><div class='add'>+		msg = container_of(msg_hdr, struct</div><div class='add'>+				   xpc_activate_mq_msg_chctl_closereply_uv,</div><div class='add'>+				   hdr);</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;part-&gt;chctl_lock, irq_flags);</div><div class='add'>+		part-&gt;chctl.flags[msg-&gt;ch_number] |= XPC_CHCTL_CLOSEREPLY;</div><div class='add'>+		spin_unlock_irqrestore(&amp;part-&gt;chctl_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+		xpc_wakeup_channel_mgr(part);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case XPC_ACTIVATE_MQ_MSG_CHCTL_OPENREQUEST_UV: {</div><div class='add'>+		struct xpc_activate_mq_msg_chctl_openrequest_uv *msg;</div><div class='add'>+</div><div class='add'>+		msg = container_of(msg_hdr, struct</div><div class='add'>+				   xpc_activate_mq_msg_chctl_openrequest_uv,</div><div class='add'>+				   hdr);</div><div class='add'>+		args = &amp;part-&gt;remote_openclose_args[msg-&gt;ch_number];</div><div class='add'>+		args-&gt;entry_size = msg-&gt;entry_size;</div><div class='add'>+		args-&gt;local_nentries = msg-&gt;local_nentries;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;part-&gt;chctl_lock, irq_flags);</div><div class='add'>+		part-&gt;chctl.flags[msg-&gt;ch_number] |= XPC_CHCTL_OPENREQUEST;</div><div class='add'>+		spin_unlock_irqrestore(&amp;part-&gt;chctl_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+		xpc_wakeup_channel_mgr(part);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case XPC_ACTIVATE_MQ_MSG_CHCTL_OPENREPLY_UV: {</div><div class='add'>+		struct xpc_activate_mq_msg_chctl_openreply_uv *msg;</div><div class='add'>+</div><div class='add'>+		msg = container_of(msg_hdr, struct</div><div class='add'>+				   xpc_activate_mq_msg_chctl_openreply_uv, hdr);</div><div class='add'>+		args = &amp;part-&gt;remote_openclose_args[msg-&gt;ch_number];</div><div class='add'>+		args-&gt;remote_nentries = msg-&gt;remote_nentries;</div><div class='add'>+		args-&gt;local_nentries = msg-&gt;local_nentries;</div><div class='add'>+		args-&gt;local_msgqueue_pa = msg-&gt;local_notify_mq_gpa;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;part-&gt;chctl_lock, irq_flags);</div><div class='add'>+		part-&gt;chctl.flags[msg-&gt;ch_number] |= XPC_CHCTL_OPENREPLY;</div><div class='add'>+		spin_unlock_irqrestore(&amp;part-&gt;chctl_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+		xpc_wakeup_channel_mgr(part);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case XPC_ACTIVATE_MQ_MSG_MARK_ENGAGED_UV:</div><div class='add'>+		spin_lock_irqsave(&amp;part_uv-&gt;flags_lock, irq_flags);</div><div class='add'>+		part_uv-&gt;flags |= XPC_P_ENGAGED_UV;</div><div class='add'>+		spin_unlock_irqrestore(&amp;part_uv-&gt;flags_lock, irq_flags);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case XPC_ACTIVATE_MQ_MSG_MARK_DISENGAGED_UV:</div><div class='add'>+		spin_lock_irqsave(&amp;part_uv-&gt;flags_lock, irq_flags);</div><div class='add'>+		part_uv-&gt;flags &amp;= ~XPC_P_ENGAGED_UV;</div><div class='add'>+		spin_unlock_irqrestore(&amp;part_uv-&gt;flags_lock, irq_flags);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_err(xpc_part, "received unknown activate_mq msg type=%d "</div><div class='add'>+			"from partition=%d\n", msg_hdr-&gt;type, XPC_PARTID(part));</div><div class='add'>+</div><div class='add'>+		/* get hb checker to deactivate from the remote partition */</div><div class='add'>+		spin_lock_irqsave(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+		if (part_uv-&gt;act_state_req == 0)</div><div class='add'>+			xpc_activate_IRQ_rcvd++;</div><div class='add'>+		part_uv-&gt;act_state_req = XPC_P_ASR_DEACTIVATE_UV;</div><div class='add'>+		part_uv-&gt;reason = xpBadMsgType;</div><div class='add'>+		spin_unlock_irqrestore(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+		(*wakeup_hb_checker)++;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (msg_hdr-&gt;rp_ts_jiffies != part-&gt;remote_rp_ts_jiffies &amp;&amp;</div><div class='add'>+	    part-&gt;remote_rp_ts_jiffies != 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * ??? Does what we do here need to be sensitive to</div><div class='add'>+		 * ??? act_state or remote_act_state?</div><div class='add'>+		 */</div><div class='add'>+		spin_lock_irqsave(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+		if (part_uv-&gt;act_state_req == 0)</div><div class='add'>+			xpc_activate_IRQ_rcvd++;</div><div class='add'>+		part_uv-&gt;act_state_req = XPC_P_ASR_REACTIVATE_UV;</div><div class='add'>+		spin_unlock_irqrestore(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+		(*wakeup_hb_checker)++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t</div><div class='add'>+xpc_handle_activate_IRQ_uv(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct xpc_activate_mq_msghdr_uv *msg_hdr;</div><div class='add'>+	short partid;</div><div class='add'>+	struct xpc_partition *part;</div><div class='add'>+	int wakeup_hb_checker = 0;</div><div class='add'>+</div><div class='add'>+	while ((msg_hdr = gru_get_next_message(xpc_activate_mq_uv)) != NULL) {</div><div class='add'>+</div><div class='add'>+		partid = msg_hdr-&gt;partid;</div><div class='add'>+		if (partid &lt; 0 || partid &gt;= XP_MAX_NPARTITIONS_UV) {</div><div class='add'>+			dev_err(xpc_part, "xpc_handle_activate_IRQ_uv() "</div><div class='add'>+				"received invalid partid=0x%x in message\n",</div><div class='add'>+				partid);</div><div class='add'>+		} else {</div><div class='add'>+			part = &amp;xpc_partitions[partid];</div><div class='add'>+			if (xpc_part_ref(part)) {</div><div class='add'>+				xpc_handle_activate_mq_msg_uv(part, msg_hdr,</div><div class='add'>+							    &amp;wakeup_hb_checker);</div><div class='add'>+				xpc_part_deref(part);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		gru_free_message(xpc_activate_mq_uv, msg_hdr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wakeup_hb_checker)</div><div class='add'>+		wake_up_interruptible(&amp;xpc_activate_IRQ_wq);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_send_activate_IRQ_uv(struct xpc_partition *part, void *msg, size_t msg_size,</div><div class='add'>+			 int msg_type)</div><div class='add'>+{</div><div class='add'>+	struct xpc_activate_mq_msghdr_uv *msg_hdr = msg;</div><div class='add'>+</div><div class='add'>+	DBUG_ON(msg_size &gt; XPC_ACTIVATE_MSG_SIZE_UV);</div><div class='add'>+</div><div class='add'>+	msg_hdr-&gt;type = msg_type;</div><div class='add'>+	msg_hdr-&gt;partid = XPC_PARTID(part);</div><div class='add'>+	msg_hdr-&gt;act_state = part-&gt;act_state;</div><div class='add'>+	msg_hdr-&gt;rp_ts_jiffies = xpc_rsvd_page-&gt;ts_jiffies;</div><div class='add'>+</div><div class='add'>+	/* ??? Is holding a spin_lock (ch-&gt;lock) during this call a bad idea? */</div><div class='add'>+	return xpc_send_gru_msg(part-&gt;sn.uv.remote_activate_mq_gpa, msg,</div><div class='add'>+				msg_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_send_activate_IRQ_part_uv(struct xpc_partition *part, void *msg,</div><div class='add'>+			      size_t msg_size, int msg_type)</div><div class='add'>+{</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+</div><div class='add'>+	ret = xpc_send_activate_IRQ_uv(part, msg, msg_size, msg_type);</div><div class='add'>+	if (unlikely(ret != xpSuccess))</div><div class='add'>+		XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_send_activate_IRQ_ch_uv(struct xpc_channel *ch, unsigned long *irq_flags,</div><div class='add'>+			 void *msg, size_t msg_size, int msg_type)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition *part = &amp;xpc_partitions[ch-&gt;number];</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+</div><div class='add'>+	ret = xpc_send_activate_IRQ_uv(part, msg, msg_size, msg_type);</div><div class='add'>+	if (unlikely(ret != xpSuccess)) {</div><div class='add'>+		if (irq_flags != NULL)</div><div class='add'>+			spin_unlock_irqrestore(&amp;ch-&gt;lock, *irq_flags);</div><div class='add'>+</div><div class='add'>+		XPC_DEACTIVATE_PARTITION(part, ret);</div><div class='add'>+</div><div class='add'>+		if (irq_flags != NULL)</div><div class='add'>+			spin_lock_irqsave(&amp;ch-&gt;lock, *irq_flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_send_local_activate_IRQ_uv(struct xpc_partition *part, int act_state_req)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	struct xpc_partition_uv *part_uv = &amp;part-&gt;sn.uv;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * !!! Make our side think that the remote parition sent an activate</div><div class='add'>+	 * !!! message our way by doing what the activate IRQ handler would</div><div class='add'>+	 * !!! do had one really been sent.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+	if (part_uv-&gt;act_state_req == 0)</div><div class='add'>+		xpc_activate_IRQ_rcvd++;</div><div class='add'>+	part_uv-&gt;act_state_req = act_state_req;</div><div class='add'>+	spin_unlock_irqrestore(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+	wake_up_interruptible(&amp;xpc_activate_IRQ_wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_get_partition_rsvd_page_pa_uv(void *buf, u64 *cookie, unsigned long *rp_pa,</div><div class='add'>+				  size_t *len)</div><div class='add'>+{</div><div class='add'>+	/* !!! call the UV version of sn_partition_reserved_page_pa() */</div><div class='add'>+	return xpUnsupported;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+xpc_setup_rsvd_page_sn_uv(struct xpc_rsvd_page *rp)</div><div class='add'>+{</div><div class='add'>+	rp-&gt;sn.activate_mq_gpa = uv_gpa(xpc_activate_mq_uv);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_send_heartbeat_uv(int msg_type)</div><div class='add'>+{</div><div class='add'>+	short partid;</div><div class='add'>+	struct xpc_partition *part;</div><div class='add'>+	struct xpc_activate_mq_msg_heartbeat_req_uv msg;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * !!! On uv we're broadcasting a heartbeat message every 5 seconds.</div><div class='add'>+	 * !!! Whereas on sn2 we're bte_copy'ng the heartbeat info every 20</div><div class='add'>+	 * !!! seconds. This is an increase in numalink traffic.</div><div class='add'>+	 * ??? Is this good?</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	msg.heartbeat = atomic64_inc_return(&amp;xpc_heartbeat_uv);</div><div class='add'>+</div><div class='add'>+	partid = find_first_bit(xpc_heartbeating_to_mask_uv,</div><div class='add'>+				XP_MAX_NPARTITIONS_UV);</div><div class='add'>+</div><div class='add'>+	while (partid &lt; XP_MAX_NPARTITIONS_UV) {</div><div class='add'>+		part = &amp;xpc_partitions[partid];</div><div class='add'>+</div><div class='add'>+		xpc_send_activate_IRQ_part_uv(part, &amp;msg, sizeof(msg),</div><div class='add'>+					      msg_type);</div><div class='add'>+</div><div class='add'>+		partid = find_next_bit(xpc_heartbeating_to_mask_uv,</div><div class='add'>+				       XP_MAX_NPARTITIONS_UV, partid + 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_increment_heartbeat_uv(void)</div><div class='add'>+{</div><div class='add'>+	xpc_send_heartbeat_uv(XPC_ACTIVATE_MQ_MSG_INC_HEARTBEAT_UV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_offline_heartbeat_uv(void)</div><div class='add'>+{</div><div class='add'>+	xpc_send_heartbeat_uv(XPC_ACTIVATE_MQ_MSG_OFFLINE_HEARTBEAT_UV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_online_heartbeat_uv(void)</div><div class='add'>+{</div><div class='add'>+	xpc_send_heartbeat_uv(XPC_ACTIVATE_MQ_MSG_ONLINE_HEARTBEAT_UV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_heartbeat_init_uv(void)</div><div class='add'>+{</div><div class='add'>+	atomic64_set(&amp;xpc_heartbeat_uv, 0);</div><div class='add'>+	bitmap_zero(xpc_heartbeating_to_mask_uv, XP_MAX_NPARTITIONS_UV);</div><div class='add'>+	xpc_heartbeating_to_mask = &amp;xpc_heartbeating_to_mask_uv[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_heartbeat_exit_uv(void)</div><div class='add'>+{</div><div class='add'>+	xpc_send_heartbeat_uv(XPC_ACTIVATE_MQ_MSG_OFFLINE_HEARTBEAT_UV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_get_remote_heartbeat_uv(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition_uv *part_uv = &amp;part-&gt;sn.uv;</div><div class='add'>+	enum xp_retval ret = xpNoHeartbeat;</div><div class='add'>+</div><div class='add'>+	if (part_uv-&gt;remote_act_state != XPC_P_AS_INACTIVE &amp;&amp;</div><div class='add'>+	    part_uv-&gt;remote_act_state != XPC_P_AS_DEACTIVATING) {</div><div class='add'>+</div><div class='add'>+		if (part_uv-&gt;heartbeat != part-&gt;last_heartbeat ||</div><div class='add'>+		    (part_uv-&gt;flags &amp; XPC_P_HEARTBEAT_OFFLINE_UV)) {</div><div class='add'>+</div><div class='add'>+			part-&gt;last_heartbeat = part_uv-&gt;heartbeat;</div><div class='add'>+			ret = xpSuccess;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_request_partition_activation_uv(struct xpc_rsvd_page *remote_rp,</div><div class='add'>+				    unsigned long remote_rp_gpa, int nasid)</div><div class='add'>+{</div><div class='add'>+	short partid = remote_rp-&gt;SAL_partid;</div><div class='add'>+	struct xpc_partition *part = &amp;xpc_partitions[partid];</div><div class='add'>+	struct xpc_activate_mq_msg_activate_req_uv msg;</div><div class='add'>+</div><div class='add'>+	part-&gt;remote_rp_pa = remote_rp_gpa; /* !!! _pa here is really _gpa */</div><div class='add'>+	part-&gt;remote_rp_ts_jiffies = remote_rp-&gt;ts_jiffies;</div><div class='add'>+	part-&gt;sn.uv.remote_activate_mq_gpa = remote_rp-&gt;sn.activate_mq_gpa;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ??? Is it a good idea to make this conditional on what is</div><div class='add'>+	 * ??? potentially stale state information?</div><div class='add'>+	 */</div><div class='add'>+	if (part-&gt;sn.uv.remote_act_state == XPC_P_AS_INACTIVE) {</div><div class='add'>+		msg.rp_gpa = uv_gpa(xpc_rsvd_page);</div><div class='add'>+		msg.activate_mq_gpa = xpc_rsvd_page-&gt;sn.activate_mq_gpa;</div><div class='add'>+		xpc_send_activate_IRQ_part_uv(part, &amp;msg, sizeof(msg),</div><div class='add'>+					   XPC_ACTIVATE_MQ_MSG_ACTIVATE_REQ_UV);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (part-&gt;act_state == XPC_P_AS_INACTIVE)</div><div class='add'>+		xpc_send_local_activate_IRQ_uv(part, XPC_P_ASR_ACTIVATE_UV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_request_partition_reactivation_uv(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	xpc_send_local_activate_IRQ_uv(part, XPC_P_ASR_ACTIVATE_UV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_request_partition_deactivation_uv(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	struct xpc_activate_mq_msg_deactivate_req_uv msg;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ??? Is it a good idea to make this conditional on what is</div><div class='add'>+	 * ??? potentially stale state information?</div><div class='add'>+	 */</div><div class='add'>+	if (part-&gt;sn.uv.remote_act_state != XPC_P_AS_DEACTIVATING &amp;&amp;</div><div class='add'>+	    part-&gt;sn.uv.remote_act_state != XPC_P_AS_INACTIVE) {</div><div class='add'>+</div><div class='add'>+		msg.reason = part-&gt;reason;</div><div class='add'>+		xpc_send_activate_IRQ_part_uv(part, &amp;msg, sizeof(msg),</div><div class='add'>+					 XPC_ACTIVATE_MQ_MSG_DEACTIVATE_REQ_UV);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_cancel_partition_deactivation_request_uv(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	/* nothing needs to be done */</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_init_fifo_uv(struct xpc_fifo_head_uv *head)</div><div class='add'>+{</div><div class='add'>+	head-&gt;first = NULL;</div><div class='add'>+	head-&gt;last = NULL;</div><div class='add'>+	spin_lock_init(&amp;head-&gt;lock);</div><div class='add'>+	head-&gt;n_entries = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *</div><div class='add'>+xpc_get_fifo_entry_uv(struct xpc_fifo_head_uv *head)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	struct xpc_fifo_entry_uv *first;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;head-&gt;lock, irq_flags);</div><div class='add'>+	first = head-&gt;first;</div><div class='add'>+	if (head-&gt;first != NULL) {</div><div class='add'>+		head-&gt;first = first-&gt;next;</div><div class='add'>+		if (head-&gt;first == NULL)</div><div class='add'>+			head-&gt;last = NULL;</div><div class='add'>+	}</div><div class='add'>+	head-&gt;n_entries++;</div><div class='add'>+	spin_unlock_irqrestore(&amp;head-&gt;lock, irq_flags);</div><div class='add'>+	first-&gt;next = NULL;</div><div class='add'>+	return first;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_put_fifo_entry_uv(struct xpc_fifo_head_uv *head,</div><div class='add'>+		      struct xpc_fifo_entry_uv *last)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+</div><div class='add'>+	last-&gt;next = NULL;</div><div class='add'>+	spin_lock_irqsave(&amp;head-&gt;lock, irq_flags);</div><div class='add'>+	if (head-&gt;last != NULL)</div><div class='add'>+		head-&gt;last-&gt;next = last;</div><div class='add'>+	else</div><div class='add'>+		head-&gt;first = last;</div><div class='add'>+	head-&gt;last = last;</div><div class='add'>+	head-&gt;n_entries--;</div><div class='add'>+	BUG_ON(head-&gt;n_entries &lt; 0);</div><div class='add'>+	spin_unlock_irqrestore(&amp;head-&gt;lock, irq_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+xpc_n_of_fifo_entries_uv(struct xpc_fifo_head_uv *head)</div><div class='add'>+{</div><div class='add'>+	return head-&gt;n_entries;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup the channel structures that are uv specific.</div><div class='add'>+ */</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_setup_ch_structures_sn_uv(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	struct xpc_channel_uv *ch_uv;</div><div class='add'>+	int ch_number;</div><div class='add'>+</div><div class='add'>+	for (ch_number = 0; ch_number &lt; part-&gt;nchannels; ch_number++) {</div><div class='add'>+		ch_uv = &amp;part-&gt;channels[ch_number].sn.uv;</div><div class='add'>+</div><div class='add'>+		xpc_init_fifo_uv(&amp;ch_uv-&gt;msg_slot_free_list);</div><div class='add'>+		xpc_init_fifo_uv(&amp;ch_uv-&gt;recv_msg_list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return xpSuccess;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Teardown the channel structures that are uv specific.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_teardown_ch_structures_sn_uv(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	/* nothing needs to be done */</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_make_first_contact_uv(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	struct xpc_activate_mq_msg_uv msg;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We send a sync msg to get the remote partition's remote_act_state</div><div class='add'>+	 * updated to our current act_state which at this point should</div><div class='add'>+	 * be XPC_P_AS_ACTIVATING.</div><div class='add'>+	 */</div><div class='add'>+	xpc_send_activate_IRQ_part_uv(part, &amp;msg, sizeof(msg),</div><div class='add'>+				      XPC_ACTIVATE_MQ_MSG_SYNC_ACT_STATE_UV);</div><div class='add'>+</div><div class='add'>+	while (part-&gt;sn.uv.remote_act_state != XPC_P_AS_ACTIVATING) {</div><div class='add'>+</div><div class='add'>+		dev_dbg(xpc_part, "waiting to make first contact with "</div><div class='add'>+			"partition %d\n", XPC_PARTID(part));</div><div class='add'>+</div><div class='add'>+		/* wait a 1/4 of a second or so */</div><div class='add'>+		(void)msleep_interruptible(250);</div><div class='add'>+</div><div class='add'>+		if (part-&gt;act_state == XPC_P_AS_DEACTIVATING)</div><div class='add'>+			return part-&gt;reason;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return xpSuccess;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64</div><div class='add'>+xpc_get_chctl_all_flags_uv(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	union xpc_channel_ctl_flags chctl;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;part-&gt;chctl_lock, irq_flags);</div><div class='add'>+	chctl = part-&gt;chctl;</div><div class='add'>+	if (chctl.all_flags != 0)</div><div class='add'>+		part-&gt;chctl.all_flags = 0;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;part-&gt;chctl_lock, irq_flags);</div><div class='add'>+	return chctl.all_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_allocate_send_msg_slot_uv(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	struct xpc_channel_uv *ch_uv = &amp;ch-&gt;sn.uv;</div><div class='add'>+	struct xpc_send_msg_slot_uv *msg_slot;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	int nentries;</div><div class='add'>+	int entry;</div><div class='add'>+	size_t nbytes;</div><div class='add'>+</div><div class='add'>+	for (nentries = ch-&gt;local_nentries; nentries &gt; 0; nentries--) {</div><div class='add'>+		nbytes = nentries * sizeof(struct xpc_send_msg_slot_uv);</div><div class='add'>+		ch_uv-&gt;send_msg_slots = kzalloc(nbytes, GFP_KERNEL);</div><div class='add'>+		if (ch_uv-&gt;send_msg_slots == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (entry = 0; entry &lt; nentries; entry++) {</div><div class='add'>+			msg_slot = &amp;ch_uv-&gt;send_msg_slots[entry];</div><div class='add'>+</div><div class='add'>+			msg_slot-&gt;msg_slot_number = entry;</div><div class='add'>+			xpc_put_fifo_entry_uv(&amp;ch_uv-&gt;msg_slot_free_list,</div><div class='add'>+					      &amp;msg_slot-&gt;next);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;ch-&gt;lock, irq_flags);</div><div class='add'>+		if (nentries &lt; ch-&gt;local_nentries)</div><div class='add'>+			ch-&gt;local_nentries = nentries;</div><div class='add'>+		spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='add'>+		return xpSuccess;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return xpNoMemory;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_allocate_recv_msg_slot_uv(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	struct xpc_channel_uv *ch_uv = &amp;ch-&gt;sn.uv;</div><div class='add'>+	struct xpc_notify_mq_msg_uv *msg_slot;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	int nentries;</div><div class='add'>+	int entry;</div><div class='add'>+	size_t nbytes;</div><div class='add'>+</div><div class='add'>+	for (nentries = ch-&gt;remote_nentries; nentries &gt; 0; nentries--) {</div><div class='add'>+		nbytes = nentries * ch-&gt;entry_size;</div><div class='add'>+		ch_uv-&gt;recv_msg_slots = kzalloc(nbytes, GFP_KERNEL);</div><div class='add'>+		if (ch_uv-&gt;recv_msg_slots == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (entry = 0; entry &lt; nentries; entry++) {</div><div class='add'>+			msg_slot = ch_uv-&gt;recv_msg_slots + entry *</div><div class='add'>+			    ch-&gt;entry_size;</div><div class='add'>+</div><div class='add'>+			msg_slot-&gt;hdr.msg_slot_number = entry;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;ch-&gt;lock, irq_flags);</div><div class='add'>+		if (nentries &lt; ch-&gt;remote_nentries)</div><div class='add'>+			ch-&gt;remote_nentries = nentries;</div><div class='add'>+		spin_unlock_irqrestore(&amp;ch-&gt;lock, irq_flags);</div><div class='add'>+		return xpSuccess;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return xpNoMemory;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate msg_slots associated with the channel.</div><div class='add'>+ */</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_setup_msg_structures_uv(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	static enum xp_retval ret;</div><div class='add'>+	struct xpc_channel_uv *ch_uv = &amp;ch-&gt;sn.uv;</div><div class='add'>+</div><div class='add'>+	DBUG_ON(ch-&gt;flags &amp; XPC_C_SETUP);</div><div class='add'>+</div><div class='add'>+	ret = xpc_allocate_send_msg_slot_uv(ch);</div><div class='add'>+	if (ret == xpSuccess) {</div><div class='add'>+</div><div class='add'>+		ret = xpc_allocate_recv_msg_slot_uv(ch);</div><div class='add'>+		if (ret != xpSuccess) {</div><div class='add'>+			kfree(ch_uv-&gt;send_msg_slots);</div><div class='add'>+			xpc_init_fifo_uv(&amp;ch_uv-&gt;msg_slot_free_list);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Free up msg_slots and clear other stuff that were setup for the specified</div><div class='add'>+ * channel.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_teardown_msg_structures_uv(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	struct xpc_channel_uv *ch_uv = &amp;ch-&gt;sn.uv;</div><div class='add'>+</div><div class='add'>+	DBUG_ON(!spin_is_locked(&amp;ch-&gt;lock));</div><div class='add'>+</div><div class='add'>+	ch_uv-&gt;remote_notify_mq_gpa = 0;</div><div class='add'>+</div><div class='add'>+	if (ch-&gt;flags &amp; XPC_C_SETUP) {</div><div class='add'>+		xpc_init_fifo_uv(&amp;ch_uv-&gt;msg_slot_free_list);</div><div class='add'>+		kfree(ch_uv-&gt;send_msg_slots);</div><div class='add'>+		xpc_init_fifo_uv(&amp;ch_uv-&gt;recv_msg_list);</div><div class='add'>+		kfree(ch_uv-&gt;recv_msg_slots);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_send_chctl_closerequest_uv(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='add'>+{</div><div class='add'>+	struct xpc_activate_mq_msg_chctl_closerequest_uv msg;</div><div class='add'>+</div><div class='add'>+	msg.ch_number = ch-&gt;number;</div><div class='add'>+	msg.reason = ch-&gt;reason;</div><div class='add'>+	xpc_send_activate_IRQ_ch_uv(ch, irq_flags, &amp;msg, sizeof(msg),</div><div class='add'>+				    XPC_ACTIVATE_MQ_MSG_CHCTL_CLOSEREQUEST_UV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_send_chctl_closereply_uv(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='add'>+{</div><div class='add'>+	struct xpc_activate_mq_msg_chctl_closereply_uv msg;</div><div class='add'>+</div><div class='add'>+	msg.ch_number = ch-&gt;number;</div><div class='add'>+	xpc_send_activate_IRQ_ch_uv(ch, irq_flags, &amp;msg, sizeof(msg),</div><div class='add'>+				    XPC_ACTIVATE_MQ_MSG_CHCTL_CLOSEREPLY_UV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_send_chctl_openrequest_uv(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='add'>+{</div><div class='add'>+	struct xpc_activate_mq_msg_chctl_openrequest_uv msg;</div><div class='add'>+</div><div class='add'>+	msg.ch_number = ch-&gt;number;</div><div class='add'>+	msg.entry_size = ch-&gt;entry_size;</div><div class='add'>+	msg.local_nentries = ch-&gt;local_nentries;</div><div class='add'>+	xpc_send_activate_IRQ_ch_uv(ch, irq_flags, &amp;msg, sizeof(msg),</div><div class='add'>+				    XPC_ACTIVATE_MQ_MSG_CHCTL_OPENREQUEST_UV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_send_chctl_openreply_uv(struct xpc_channel *ch, unsigned long *irq_flags)</div><div class='add'>+{</div><div class='add'>+	struct xpc_activate_mq_msg_chctl_openreply_uv msg;</div><div class='add'>+</div><div class='add'>+	msg.ch_number = ch-&gt;number;</div><div class='add'>+	msg.local_nentries = ch-&gt;local_nentries;</div><div class='add'>+	msg.remote_nentries = ch-&gt;remote_nentries;</div><div class='add'>+	msg.local_notify_mq_gpa = uv_gpa(xpc_notify_mq_uv);</div><div class='add'>+	xpc_send_activate_IRQ_ch_uv(ch, irq_flags, &amp;msg, sizeof(msg),</div><div class='add'>+				    XPC_ACTIVATE_MQ_MSG_CHCTL_OPENREPLY_UV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_send_chctl_local_msgrequest_uv(struct xpc_partition *part, int ch_number)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;part-&gt;chctl_lock, irq_flags);</div><div class='add'>+	part-&gt;chctl.flags[ch_number] |= XPC_CHCTL_MSGREQUEST;</div><div class='add'>+	spin_unlock_irqrestore(&amp;part-&gt;chctl_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+	xpc_wakeup_channel_mgr(part);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_save_remote_msgqueue_pa_uv(struct xpc_channel *ch,</div><div class='add'>+			       unsigned long msgqueue_pa)</div><div class='add'>+{</div><div class='add'>+	ch-&gt;sn.uv.remote_notify_mq_gpa = msgqueue_pa;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_indicate_partition_engaged_uv(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	struct xpc_activate_mq_msg_uv msg;</div><div class='add'>+</div><div class='add'>+	xpc_send_activate_IRQ_part_uv(part, &amp;msg, sizeof(msg),</div><div class='add'>+				      XPC_ACTIVATE_MQ_MSG_MARK_ENGAGED_UV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_indicate_partition_disengaged_uv(struct xpc_partition *part)</div><div class='add'>+{</div><div class='add'>+	struct xpc_activate_mq_msg_uv msg;</div><div class='add'>+</div><div class='add'>+	xpc_send_activate_IRQ_part_uv(part, &amp;msg, sizeof(msg),</div><div class='add'>+				      XPC_ACTIVATE_MQ_MSG_MARK_DISENGAGED_UV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_assume_partition_disengaged_uv(short partid)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition_uv *part_uv = &amp;xpc_partitions[partid].sn.uv;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;part_uv-&gt;flags_lock, irq_flags);</div><div class='add'>+	part_uv-&gt;flags &amp;= ~XPC_P_ENGAGED_UV;</div><div class='add'>+	spin_unlock_irqrestore(&amp;part_uv-&gt;flags_lock, irq_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+xpc_partition_engaged_uv(short partid)</div><div class='add'>+{</div><div class='add'>+	return (xpc_partitions[partid].sn.uv.flags &amp; XPC_P_ENGAGED_UV) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+xpc_any_partition_engaged_uv(void)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition_uv *part_uv;</div><div class='add'>+	short partid;</div><div class='add'>+</div><div class='add'>+	for (partid = 0; partid &lt; XP_MAX_NPARTITIONS_UV; partid++) {</div><div class='add'>+		part_uv = &amp;xpc_partitions[partid].sn.uv;</div><div class='add'>+		if ((part_uv-&gt;flags &amp; XPC_P_ENGAGED_UV) != 0)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_allocate_msg_slot_uv(struct xpc_channel *ch, u32 flags,</div><div class='add'>+			 struct xpc_send_msg_slot_uv **address_of_msg_slot)</div><div class='add'>+{</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+	struct xpc_send_msg_slot_uv *msg_slot;</div><div class='add'>+	struct xpc_fifo_entry_uv *entry;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		entry = xpc_get_fifo_entry_uv(&amp;ch-&gt;sn.uv.msg_slot_free_list);</div><div class='add'>+		if (entry != NULL)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (flags &amp; XPC_NOWAIT)</div><div class='add'>+			return xpNoWait;</div><div class='add'>+</div><div class='add'>+		ret = xpc_allocate_msg_wait(ch);</div><div class='add'>+		if (ret != xpInterrupted &amp;&amp; ret != xpTimeout)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg_slot = container_of(entry, struct xpc_send_msg_slot_uv, next);</div><div class='add'>+	*address_of_msg_slot = msg_slot;</div><div class='add'>+	return xpSuccess;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_free_msg_slot_uv(struct xpc_channel *ch,</div><div class='add'>+		     struct xpc_send_msg_slot_uv *msg_slot)</div><div class='add'>+{</div><div class='add'>+	xpc_put_fifo_entry_uv(&amp;ch-&gt;sn.uv.msg_slot_free_list, &amp;msg_slot-&gt;next);</div><div class='add'>+</div><div class='add'>+	/* wakeup anyone waiting for a free msg slot */</div><div class='add'>+	if (atomic_read(&amp;ch-&gt;n_on_msg_allocate_wq) &gt; 0)</div><div class='add'>+		wake_up(&amp;ch-&gt;msg_allocate_wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_notify_sender_uv(struct xpc_channel *ch,</div><div class='add'>+		     struct xpc_send_msg_slot_uv *msg_slot,</div><div class='add'>+		     enum xp_retval reason)</div><div class='add'>+{</div><div class='add'>+	xpc_notify_func func = msg_slot-&gt;func;</div><div class='add'>+</div><div class='add'>+	if (func != NULL &amp;&amp; cmpxchg(&amp;msg_slot-&gt;func, func, NULL) == func) {</div><div class='add'>+</div><div class='add'>+		atomic_dec(&amp;ch-&gt;n_to_notify);</div><div class='add'>+</div><div class='add'>+		dev_dbg(xpc_chan, "msg_slot-&gt;func() called, msg_slot=0x%p "</div><div class='add'>+			"msg_slot_number=%d partid=%d channel=%d\n", msg_slot,</div><div class='add'>+			msg_slot-&gt;msg_slot_number, ch-&gt;partid, ch-&gt;number);</div><div class='add'>+</div><div class='add'>+		func(reason, ch-&gt;partid, ch-&gt;number, msg_slot-&gt;key);</div><div class='add'>+</div><div class='add'>+		dev_dbg(xpc_chan, "msg_slot-&gt;func() returned, msg_slot=0x%p "</div><div class='add'>+			"msg_slot_number=%d partid=%d channel=%d\n", msg_slot,</div><div class='add'>+			msg_slot-&gt;msg_slot_number, ch-&gt;partid, ch-&gt;number);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_handle_notify_mq_ack_uv(struct xpc_channel *ch,</div><div class='add'>+			    struct xpc_notify_mq_msg_uv *msg)</div><div class='add'>+{</div><div class='add'>+	struct xpc_send_msg_slot_uv *msg_slot;</div><div class='add'>+	int entry = msg-&gt;hdr.msg_slot_number % ch-&gt;local_nentries;</div><div class='add'>+</div><div class='add'>+	msg_slot = &amp;ch-&gt;sn.uv.send_msg_slots[entry];</div><div class='add'>+</div><div class='add'>+	BUG_ON(msg_slot-&gt;msg_slot_number != msg-&gt;hdr.msg_slot_number);</div><div class='add'>+	msg_slot-&gt;msg_slot_number += ch-&gt;local_nentries;</div><div class='add'>+</div><div class='add'>+	if (msg_slot-&gt;func != NULL)</div><div class='add'>+		xpc_notify_sender_uv(ch, msg_slot, xpMsgDelivered);</div><div class='add'>+</div><div class='add'>+	xpc_free_msg_slot_uv(ch, msg_slot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_handle_notify_mq_msg_uv(struct xpc_partition *part,</div><div class='add'>+			    struct xpc_notify_mq_msg_uv *msg)</div><div class='add'>+{</div><div class='add'>+	struct xpc_partition_uv *part_uv = &amp;part-&gt;sn.uv;</div><div class='add'>+	struct xpc_channel *ch;</div><div class='add'>+	struct xpc_channel_uv *ch_uv;</div><div class='add'>+	struct xpc_notify_mq_msg_uv *msg_slot;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	int ch_number = msg-&gt;hdr.ch_number;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ch_number &gt;= part-&gt;nchannels)) {</div><div class='add'>+		dev_err(xpc_part, "xpc_handle_notify_IRQ_uv() received invalid "</div><div class='add'>+			"channel number=0x%x in message from partid=%d\n",</div><div class='add'>+			ch_number, XPC_PARTID(part));</div><div class='add'>+</div><div class='add'>+		/* get hb checker to deactivate from the remote partition */</div><div class='add'>+		spin_lock_irqsave(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+		if (part_uv-&gt;act_state_req == 0)</div><div class='add'>+			xpc_activate_IRQ_rcvd++;</div><div class='add'>+		part_uv-&gt;act_state_req = XPC_P_ASR_DEACTIVATE_UV;</div><div class='add'>+		part_uv-&gt;reason = xpBadChannelNumber;</div><div class='add'>+		spin_unlock_irqrestore(&amp;xpc_activate_IRQ_rcvd_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+		wake_up_interruptible(&amp;xpc_activate_IRQ_wq);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ch = &amp;part-&gt;channels[ch_number];</div><div class='add'>+	xpc_msgqueue_ref(ch);</div><div class='add'>+</div><div class='add'>+	if (!(ch-&gt;flags &amp; XPC_C_CONNECTED)) {</div><div class='add'>+		xpc_msgqueue_deref(ch);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* see if we're really dealing with an ACK for a previously sent msg */</div><div class='add'>+	if (msg-&gt;hdr.size == 0) {</div><div class='add'>+		xpc_handle_notify_mq_ack_uv(ch, msg);</div><div class='add'>+		xpc_msgqueue_deref(ch);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we're dealing with a normal message sent via the notify_mq */</div><div class='add'>+	ch_uv = &amp;ch-&gt;sn.uv;</div><div class='add'>+</div><div class='add'>+	msg_slot = (struct xpc_notify_mq_msg_uv *)((u64)ch_uv-&gt;recv_msg_slots +</div><div class='add'>+		    (msg-&gt;hdr.msg_slot_number % ch-&gt;remote_nentries) *</div><div class='add'>+		    ch-&gt;entry_size);</div><div class='add'>+</div><div class='add'>+	BUG_ON(msg-&gt;hdr.msg_slot_number != msg_slot-&gt;hdr.msg_slot_number);</div><div class='add'>+	BUG_ON(msg_slot-&gt;hdr.size != 0);</div><div class='add'>+</div><div class='add'>+	memcpy(msg_slot, msg, msg-&gt;hdr.size);</div><div class='add'>+</div><div class='add'>+	xpc_put_fifo_entry_uv(&amp;ch_uv-&gt;recv_msg_list, &amp;msg_slot-&gt;hdr.u.next);</div><div class='add'>+</div><div class='add'>+	if (ch-&gt;flags &amp; XPC_C_CONNECTEDCALLOUT_MADE) {</div><div class='add'>+		/*</div><div class='add'>+		 * If there is an existing idle kthread get it to deliver</div><div class='add'>+		 * the payload, otherwise we'll have to get the channel mgr</div><div class='add'>+		 * for this partition to create a kthread to do the delivery.</div><div class='add'>+		 */</div><div class='add'>+		if (atomic_read(&amp;ch-&gt;kthreads_idle) &gt; 0)</div><div class='add'>+			wake_up_nr(&amp;ch-&gt;idle_wq, 1);</div><div class='add'>+		else</div><div class='add'>+			xpc_send_chctl_local_msgrequest_uv(part, ch-&gt;number);</div><div class='add'>+	}</div><div class='add'>+	xpc_msgqueue_deref(ch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t</div><div class='add'>+xpc_handle_notify_IRQ_uv(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct xpc_notify_mq_msg_uv *msg;</div><div class='add'>+	short partid;</div><div class='add'>+	struct xpc_partition *part;</div><div class='add'>+</div><div class='add'>+	while ((msg = gru_get_next_message(xpc_notify_mq_uv)) != NULL) {</div><div class='add'>+</div><div class='add'>+		partid = msg-&gt;hdr.partid;</div><div class='add'>+		if (partid &lt; 0 || partid &gt;= XP_MAX_NPARTITIONS_UV) {</div><div class='add'>+			dev_err(xpc_part, "xpc_handle_notify_IRQ_uv() received "</div><div class='add'>+				"invalid partid=0x%x in message\n", partid);</div><div class='add'>+		} else {</div><div class='add'>+			part = &amp;xpc_partitions[partid];</div><div class='add'>+</div><div class='add'>+			if (xpc_part_ref(part)) {</div><div class='add'>+				xpc_handle_notify_mq_msg_uv(part, msg);</div><div class='add'>+				xpc_part_deref(part);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		gru_free_message(xpc_notify_mq_uv, msg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+xpc_n_of_deliverable_payloads_uv(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	return xpc_n_of_fifo_entries_uv(&amp;ch-&gt;sn.uv.recv_msg_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_process_msg_chctl_flags_uv(struct xpc_partition *part, int ch_number)</div><div class='add'>+{</div><div class='add'>+	struct xpc_channel *ch = &amp;part-&gt;channels[ch_number];</div><div class='add'>+	int ndeliverable_payloads;</div><div class='add'>+</div><div class='add'>+	xpc_msgqueue_ref(ch);</div><div class='add'>+</div><div class='add'>+	ndeliverable_payloads = xpc_n_of_deliverable_payloads_uv(ch);</div><div class='add'>+</div><div class='add'>+	if (ndeliverable_payloads &gt; 0 &amp;&amp;</div><div class='add'>+	    (ch-&gt;flags &amp; XPC_C_CONNECTED) &amp;&amp;</div><div class='add'>+	    (ch-&gt;flags &amp; XPC_C_CONNECTEDCALLOUT_MADE)) {</div><div class='add'>+</div><div class='add'>+		xpc_activate_kthreads(ch, ndeliverable_payloads);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xpc_msgqueue_deref(ch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum xp_retval</div><div class='add'>+xpc_send_payload_uv(struct xpc_channel *ch, u32 flags, void *payload,</div><div class='add'>+		    u16 payload_size, u8 notify_type, xpc_notify_func func,</div><div class='add'>+		    void *key)</div><div class='add'>+{</div><div class='add'>+	enum xp_retval ret = xpSuccess;</div><div class='add'>+	struct xpc_send_msg_slot_uv *msg_slot = NULL;</div><div class='add'>+	struct xpc_notify_mq_msg_uv *msg;</div><div class='add'>+	u8 msg_buffer[XPC_NOTIFY_MSG_SIZE_UV];</div><div class='add'>+	size_t msg_size;</div><div class='add'>+</div><div class='add'>+	DBUG_ON(notify_type != XPC_N_CALL);</div><div class='add'>+</div><div class='add'>+	msg_size = sizeof(struct xpc_notify_mq_msghdr_uv) + payload_size;</div><div class='add'>+	if (msg_size &gt; ch-&gt;entry_size)</div><div class='add'>+		return xpPayloadTooBig;</div><div class='add'>+</div><div class='add'>+	xpc_msgqueue_ref(ch);</div><div class='add'>+</div><div class='add'>+	if (ch-&gt;flags &amp; XPC_C_DISCONNECTING) {</div><div class='add'>+		ret = ch-&gt;reason;</div><div class='add'>+		goto out_1;</div><div class='add'>+	}</div><div class='add'>+	if (!(ch-&gt;flags &amp; XPC_C_CONNECTED)) {</div><div class='add'>+		ret = xpNotConnected;</div><div class='add'>+		goto out_1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = xpc_allocate_msg_slot_uv(ch, flags, &amp;msg_slot);</div><div class='add'>+	if (ret != xpSuccess)</div><div class='add'>+		goto out_1;</div><div class='add'>+</div><div class='add'>+	if (func != NULL) {</div><div class='add'>+		atomic_inc(&amp;ch-&gt;n_to_notify);</div><div class='add'>+</div><div class='add'>+		msg_slot-&gt;key = key;</div><div class='add'>+		wmb(); /* a non-NULL func must hit memory after the key */</div><div class='add'>+		msg_slot-&gt;func = func;</div><div class='add'>+</div><div class='add'>+		if (ch-&gt;flags &amp; XPC_C_DISCONNECTING) {</div><div class='add'>+			ret = ch-&gt;reason;</div><div class='add'>+			goto out_2;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg = (struct xpc_notify_mq_msg_uv *)&amp;msg_buffer;</div><div class='add'>+	msg-&gt;hdr.partid = xp_partition_id;</div><div class='add'>+	msg-&gt;hdr.ch_number = ch-&gt;number;</div><div class='add'>+	msg-&gt;hdr.size = msg_size;</div><div class='add'>+	msg-&gt;hdr.msg_slot_number = msg_slot-&gt;msg_slot_number;</div><div class='add'>+	memcpy(&amp;msg-&gt;payload, payload, payload_size);</div><div class='add'>+</div><div class='add'>+	ret = xpc_send_gru_msg(ch-&gt;sn.uv.remote_notify_mq_gpa, msg, msg_size);</div><div class='add'>+	if (ret == xpSuccess)</div><div class='add'>+		goto out_1;</div><div class='add'>+</div><div class='add'>+	XPC_DEACTIVATE_PARTITION(&amp;xpc_partitions[ch-&gt;partid], ret);</div><div class='add'>+out_2:</div><div class='add'>+	if (func != NULL) {</div><div class='add'>+		/*</div><div class='add'>+		 * Try to NULL the msg_slot's func field. If we fail, then</div><div class='add'>+		 * xpc_notify_senders_of_disconnect_uv() beat us to it, in which</div><div class='add'>+		 * case we need to pretend we succeeded to send the message</div><div class='add'>+		 * since the user will get a callout for the disconnect error</div><div class='add'>+		 * by xpc_notify_senders_of_disconnect_uv(), and to also get an</div><div class='add'>+		 * error returned here will confuse them. Additionally, since</div><div class='add'>+		 * in this case the channel is being disconnected we don't need</div><div class='add'>+		 * to put the the msg_slot back on the free list.</div><div class='add'>+		 */</div><div class='add'>+		if (cmpxchg(&amp;msg_slot-&gt;func, func, NULL) != func) {</div><div class='add'>+			ret = xpSuccess;</div><div class='add'>+			goto out_1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msg_slot-&gt;key = NULL;</div><div class='add'>+		atomic_dec(&amp;ch-&gt;n_to_notify);</div><div class='add'>+	}</div><div class='add'>+	xpc_free_msg_slot_uv(ch, msg_slot);</div><div class='add'>+out_1:</div><div class='add'>+	xpc_msgqueue_deref(ch);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Tell the callers of xpc_send_notify() that the status of their payloads</div><div class='add'>+ * is unknown because the channel is now disconnecting.</div><div class='add'>+ *</div><div class='add'>+ * We don't worry about putting these msg_slots on the free list since the</div><div class='add'>+ * msg_slots themselves are about to be kfree'd.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+xpc_notify_senders_of_disconnect_uv(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	struct xpc_send_msg_slot_uv *msg_slot;</div><div class='add'>+	int entry;</div><div class='add'>+</div><div class='add'>+	DBUG_ON(!(ch-&gt;flags &amp; XPC_C_DISCONNECTING));</div><div class='add'>+</div><div class='add'>+	for (entry = 0; entry &lt; ch-&gt;local_nentries; entry++) {</div><div class='add'>+</div><div class='add'>+		if (atomic_read(&amp;ch-&gt;n_to_notify) == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		msg_slot = &amp;ch-&gt;sn.uv.send_msg_slots[entry];</div><div class='add'>+		if (msg_slot-&gt;func != NULL)</div><div class='add'>+			xpc_notify_sender_uv(ch, msg_slot, ch-&gt;reason);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get the next deliverable message's payload.</div><div class='add'>+ */</div><div class='add'>+static void *</div><div class='add'>+xpc_get_deliverable_payload_uv(struct xpc_channel *ch)</div><div class='add'>+{</div><div class='add'>+	struct xpc_fifo_entry_uv *entry;</div><div class='add'>+	struct xpc_notify_mq_msg_uv *msg;</div><div class='add'>+	void *payload = NULL;</div><div class='add'>+</div><div class='add'>+	if (!(ch-&gt;flags &amp; XPC_C_DISCONNECTING)) {</div><div class='add'>+		entry = xpc_get_fifo_entry_uv(&amp;ch-&gt;sn.uv.recv_msg_list);</div><div class='add'>+		if (entry != NULL) {</div><div class='add'>+			msg = container_of(entry, struct xpc_notify_mq_msg_uv,</div><div class='add'>+					   hdr.u.next);</div><div class='add'>+			payload = &amp;msg-&gt;payload;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return payload;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+xpc_received_payload_uv(struct xpc_channel *ch, void *payload)</div><div class='add'>+{</div><div class='add'>+	struct xpc_notify_mq_msg_uv *msg;</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+</div><div class='add'>+	msg = container_of(payload, struct xpc_notify_mq_msg_uv, payload);</div><div class='add'>+</div><div class='add'>+	/* return an ACK to the sender of this message */</div><div class='add'>+</div><div class='add'>+	msg-&gt;hdr.partid = xp_partition_id;</div><div class='add'>+	msg-&gt;hdr.size = 0;	/* size of zero indicates this is an ACK */</div><div class='add'>+</div><div class='add'>+	ret = xpc_send_gru_msg(ch-&gt;sn.uv.remote_notify_mq_gpa, msg,</div><div class='add'>+			       sizeof(struct xpc_notify_mq_msghdr_uv));</div><div class='add'>+	if (ret != xpSuccess)</div><div class='add'>+		XPC_DEACTIVATE_PARTITION(&amp;xpc_partitions[ch-&gt;partid], ret);</div><div class='add'>+</div><div class='add'>+	msg-&gt;hdr.msg_slot_number += ch-&gt;remote_nentries;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+xpc_init_uv(void)</div><div class='add'>+{</div><div class='add'>+	xpc_setup_partitions_sn = xpc_setup_partitions_sn_uv;</div><div class='add'>+	xpc_process_activate_IRQ_rcvd = xpc_process_activate_IRQ_rcvd_uv;</div><div class='add'>+	xpc_get_partition_rsvd_page_pa = xpc_get_partition_rsvd_page_pa_uv;</div><div class='add'>+	xpc_setup_rsvd_page_sn = xpc_setup_rsvd_page_sn_uv;</div><div class='add'>+	xpc_increment_heartbeat = xpc_increment_heartbeat_uv;</div><div class='add'>+	xpc_offline_heartbeat = xpc_offline_heartbeat_uv;</div><div class='add'>+	xpc_online_heartbeat = xpc_online_heartbeat_uv;</div><div class='add'>+	xpc_heartbeat_init = xpc_heartbeat_init_uv;</div><div class='add'>+	xpc_heartbeat_exit = xpc_heartbeat_exit_uv;</div><div class='add'>+	xpc_get_remote_heartbeat = xpc_get_remote_heartbeat_uv;</div><div class='add'>+</div><div class='add'>+	xpc_request_partition_activation = xpc_request_partition_activation_uv;</div><div class='add'>+	xpc_request_partition_reactivation =</div><div class='add'>+	    xpc_request_partition_reactivation_uv;</div><div class='add'>+	xpc_request_partition_deactivation =</div><div class='add'>+	    xpc_request_partition_deactivation_uv;</div><div class='add'>+	xpc_cancel_partition_deactivation_request =</div><div class='add'>+	    xpc_cancel_partition_deactivation_request_uv;</div><div class='add'>+</div><div class='add'>+	xpc_setup_ch_structures_sn = xpc_setup_ch_structures_sn_uv;</div><div class='add'>+	xpc_teardown_ch_structures_sn = xpc_teardown_ch_structures_sn_uv;</div><div class='add'>+</div><div class='add'>+	xpc_make_first_contact = xpc_make_first_contact_uv;</div><div class='add'>+</div><div class='add'>+	xpc_get_chctl_all_flags = xpc_get_chctl_all_flags_uv;</div><div class='add'>+	xpc_send_chctl_closerequest = xpc_send_chctl_closerequest_uv;</div><div class='add'>+	xpc_send_chctl_closereply = xpc_send_chctl_closereply_uv;</div><div class='add'>+	xpc_send_chctl_openrequest = xpc_send_chctl_openrequest_uv;</div><div class='add'>+	xpc_send_chctl_openreply = xpc_send_chctl_openreply_uv;</div><div class='add'>+</div><div class='add'>+	xpc_save_remote_msgqueue_pa = xpc_save_remote_msgqueue_pa_uv;</div><div class='add'>+</div><div class='add'>+	xpc_setup_msg_structures = xpc_setup_msg_structures_uv;</div><div class='add'>+	xpc_teardown_msg_structures = xpc_teardown_msg_structures_uv;</div><div class='add'>+</div><div class='add'>+	xpc_indicate_partition_engaged = xpc_indicate_partition_engaged_uv;</div><div class='add'>+	xpc_indicate_partition_disengaged =</div><div class='add'>+	    xpc_indicate_partition_disengaged_uv;</div><div class='add'>+	xpc_assume_partition_disengaged = xpc_assume_partition_disengaged_uv;</div><div class='add'>+	xpc_partition_engaged = xpc_partition_engaged_uv;</div><div class='add'>+	xpc_any_partition_engaged = xpc_any_partition_engaged_uv;</div><div class='add'>+</div><div class='add'>+	xpc_n_of_deliverable_payloads = xpc_n_of_deliverable_payloads_uv;</div><div class='add'>+	xpc_process_msg_chctl_flags = xpc_process_msg_chctl_flags_uv;</div><div class='add'>+	xpc_send_payload = xpc_send_payload_uv;</div><div class='add'>+	xpc_notify_senders_of_disconnect = xpc_notify_senders_of_disconnect_uv;</div><div class='add'>+	xpc_get_deliverable_payload = xpc_get_deliverable_payload_uv;</div><div class='add'>+	xpc_received_payload = xpc_received_payload_uv;</div><div class='add'>+</div><div class='add'>+	if (sizeof(struct xpc_notify_mq_msghdr_uv) &gt; XPC_MSG_HDR_MAX_SIZE) {</div><div class='add'>+		dev_err(xpc_part, "xpc_notify_mq_msghdr_uv is larger than %d\n",</div><div class='add'>+			XPC_MSG_HDR_MAX_SIZE);</div><div class='add'>+		return -E2BIG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ??? The cpuid argument's value is 0, is that what we want? */</div><div class='add'>+	/* !!! The irq argument's value isn't correct. */</div><div class='add'>+	xpc_activate_mq_uv = xpc_create_gru_mq_uv(XPC_ACTIVATE_MQ_SIZE_UV, 0, 0,</div><div class='add'>+						  xpc_handle_activate_IRQ_uv);</div><div class='add'>+	if (xpc_activate_mq_uv == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* ??? The cpuid argument's value is 0, is that what we want? */</div><div class='add'>+	/* !!! The irq argument's value isn't correct. */</div><div class='add'>+	xpc_notify_mq_uv = xpc_create_gru_mq_uv(XPC_NOTIFY_MQ_SIZE_UV, 0, 0,</div><div class='add'>+						xpc_handle_notify_IRQ_uv);</div><div class='add'>+	if (xpc_notify_mq_uv == NULL) {</div><div class='add'>+		/* !!! The irq argument's value isn't correct. */</div><div class='add'>+		xpc_destroy_gru_mq_uv(xpc_activate_mq_uv,</div><div class='add'>+				      XPC_ACTIVATE_MQ_SIZE_UV, 0);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+xpc_exit_uv(void)</div><div class='add'>+{</div><div class='add'>+	/* !!! The irq argument's value isn't correct. */</div><div class='add'>+	xpc_destroy_gru_mq_uv(xpc_notify_mq_uv, XPC_NOTIFY_MQ_SIZE_UV, 0);</div><div class='add'>+</div><div class='add'>+	/* !!! The irq argument's value isn't correct. */</div><div class='add'>+	xpc_destroy_gru_mq_uv(xpc_activate_mq_uv, XPC_ACTIVATE_MQ_SIZE_UV, 0);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c<br/>index 822dc8e8d7f0..71513b3af708 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xpnet.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/misc/sgi-xp/xpnet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xpnet.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/sgi-xp/xpnet.c</a></div><div class='hunk'>@@ -21,21 +21,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/ethtool.h&gt;</div><div class='del'>-#include &lt;linux/mii.h&gt;</div><div class='del'>-#include &lt;linux/smp.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;asm/sn/bte.h&gt;</div><div class='del'>-#include &lt;asm/sn/io.h&gt;</div><div class='del'>-#include &lt;asm/sn/sn_sal.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include "xp.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -57,7 +44,7 @@ struct xpnet_message {</div><div class='ctx'> 	u16 version;		/* Version for this message */</div><div class='ctx'> 	u16 embedded_bytes;	/* #of bytes embedded in XPC message */</div><div class='ctx'> 	u32 magic;		/* Special number indicating this is xpnet */</div><div class='del'>-	u64 buf_pa;		/* phys address of buffer to retrieve */</div><div class='add'>+	unsigned long buf_pa;	/* phys address of buffer to retrieve */</div><div class='ctx'> 	u32 size;		/* #of bytes in buffer */</div><div class='ctx'> 	u8 leadin_ignore;	/* #of bytes to ignore at the beginning */</div><div class='ctx'> 	u8 tailout_ignore;	/* #of bytes to ignore at the end */</div><div class='hunk'>@@ -70,11 +57,10 @@ struct xpnet_message {</div><div class='ctx'>  *</div><div class='ctx'>  * XPC expects each message to exist in an individual cacheline.</div><div class='ctx'>  */</div><div class='del'>-#define XPNET_MSG_SIZE		(L1_CACHE_BYTES - XPC_MSG_PAYLOAD_OFFSET)</div><div class='add'>+#define XPNET_MSG_SIZE		XPC_MSG_PAYLOAD_MAX_SIZE</div><div class='ctx'> #define XPNET_MSG_DATA_MAX	\</div><div class='del'>-		(XPNET_MSG_SIZE - (u64)(&amp;((struct xpnet_message *)0)-&gt;data))</div><div class='del'>-#define XPNET_MSG_ALIGNED_SIZE	(L1_CACHE_ALIGN(XPNET_MSG_SIZE))</div><div class='del'>-#define XPNET_MSG_NENTRIES	(PAGE_SIZE / XPNET_MSG_ALIGNED_SIZE)</div><div class='add'>+		(XPNET_MSG_SIZE - offsetof(struct xpnet_message, data))</div><div class='add'>+#define XPNET_MSG_NENTRIES	(PAGE_SIZE / XPC_MSG_MAX_SIZE)</div><div class='ctx'> </div><div class='ctx'> #define XPNET_MAX_KTHREADS	(XPNET_MSG_NENTRIES + 1)</div><div class='ctx'> #define XPNET_MAX_IDLE_KTHREADS	(XPNET_MSG_NENTRIES + 1)</div><div class='hunk'>@@ -105,7 +91,6 @@ struct xpnet_message {</div><div class='ctx'>  * then be released.</div><div class='ctx'>  */</div><div class='ctx'> struct xpnet_pending_msg {</div><div class='del'>-	struct list_head free_list;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	atomic_t use_count;</div><div class='ctx'> };</div><div class='hunk'>@@ -121,7 +106,7 @@ struct net_device *xpnet_device;</div><div class='ctx'>  * When we are notified of other partitions activating, we add them to</div><div class='ctx'>  * our bitmask of partitions to which we broadcast.</div><div class='ctx'>  */</div><div class='del'>-static u64 xpnet_broadcast_partitions;</div><div class='add'>+static unsigned long *xpnet_broadcast_partitions;</div><div class='ctx'> /* protect above */</div><div class='ctx'> static DEFINE_SPINLOCK(xpnet_broadcast_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -141,16 +126,13 @@ static DEFINE_SPINLOCK(xpnet_broadcast_lock);</div><div class='ctx'> #define XPNET_DEF_MTU (0x8000UL)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The partition id is encapsulated in the MAC address.  The following</div><div class='del'>- * define locates the octet the partid is in.</div><div class='add'>+ * The partid is encapsulated in the MAC address beginning in the following</div><div class='add'>+ * octet and it consists of two octets.</div><div class='ctx'>  */</div><div class='del'>-#define XPNET_PARTID_OCTET	1</div><div class='del'>-#define XPNET_LICENSE_OCTET	2</div><div class='add'>+#define XPNET_PARTID_OCTET	2</div><div class='add'>+</div><div class='add'>+/* Define the XPNET debug device structures to be used with dev_dbg() et al */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Define the XPNET debug device structure that is to be used with dev_dbg(),</div><div class='del'>- * dev_err(), dev_warn(), and dev_info().</div><div class='del'>- */</div><div class='ctx'> struct device_driver xpnet_dbg_name = {</div><div class='ctx'> 	.name = "xpnet"</div><div class='ctx'> };</div><div class='hunk'>@@ -169,7 +151,8 @@ static void</div><div class='ctx'> xpnet_receive(short partid, int channel, struct xpnet_message *msg)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	bte_result_t bret;</div><div class='add'>+	void *dst;</div><div class='add'>+	enum xp_retval ret;</div><div class='ctx'> 	struct xpnet_dev_private *priv =</div><div class='ctx'> 	    (struct xpnet_dev_private *)xpnet_device-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -201,7 +184,7 @@ xpnet_receive(short partid, int channel, struct xpnet_message *msg)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The allocated skb has some reserved space.</div><div class='del'>-	 * In order to use bte_copy, we need to get the</div><div class='add'>+	 * In order to use xp_remote_memcpy(), we need to get the</div><div class='ctx'> 	 * skb-&gt;data pointer moved forward.</div><div class='ctx'> 	 */</div><div class='ctx'> 	skb_reserve(skb, (L1_CACHE_BYTES - ((u64)skb-&gt;data &amp;</div><div class='hunk'>@@ -226,26 +209,21 @@ xpnet_receive(short partid, int channel, struct xpnet_message *msg)</div><div class='ctx'> 		skb_copy_to_linear_data(skb, &amp;msg-&gt;data,</div><div class='ctx'> 					(size_t)msg-&gt;embedded_bytes);</div><div class='ctx'> 	} else {</div><div class='add'>+		dst = (void *)((u64)skb-&gt;data &amp; ~(L1_CACHE_BYTES - 1));</div><div class='ctx'> 		dev_dbg(xpnet, "transferring buffer to the skb-&gt;data area;\n\t"</div><div class='del'>-			"bte_copy(0x%p, 0x%p, %hu)\n", (void *)msg-&gt;buf_pa,</div><div class='del'>-			(void *)__pa((u64)skb-&gt;data &amp; ~(L1_CACHE_BYTES - 1)),</div><div class='del'>-			msg-&gt;size);</div><div class='del'>-</div><div class='del'>-		bret = bte_copy(msg-&gt;buf_pa,</div><div class='del'>-				__pa((u64)skb-&gt;data &amp; ~(L1_CACHE_BYTES - 1)),</div><div class='del'>-				msg-&gt;size, (BTE_NOTIFY | BTE_WACQUIRE), NULL);</div><div class='add'>+			"xp_remote_memcpy(0x%p, 0x%p, %hu)\n", dst,</div><div class='add'>+					  (void *)msg-&gt;buf_pa, msg-&gt;size);</div><div class='ctx'> </div><div class='del'>-		if (bret != BTE_SUCCESS) {</div><div class='add'>+		ret = xp_remote_memcpy(xp_pa(dst), msg-&gt;buf_pa, msg-&gt;size);</div><div class='add'>+		if (ret != xpSuccess) {</div><div class='ctx'> 			/*</div><div class='del'>-			 * &gt;&gt;&gt; Need better way of cleaning skb.  Currently skb</div><div class='del'>-			 * &gt;&gt;&gt; appears in_use and we can't just call</div><div class='del'>-			 * &gt;&gt;&gt; dev_kfree_skb.</div><div class='add'>+			 * !!! Need better way of cleaning skb.  Currently skb</div><div class='add'>+			 * !!! appears in_use and we can't just call</div><div class='add'>+			 * !!! dev_kfree_skb.</div><div class='ctx'> 			 */</div><div class='del'>-			dev_err(xpnet, "bte_copy(0x%p, 0x%p, 0x%hx) returned "</div><div class='del'>-				"error=0x%x\n", (void *)msg-&gt;buf_pa,</div><div class='del'>-				(void *)__pa((u64)skb-&gt;data &amp;</div><div class='del'>-					     ~(L1_CACHE_BYTES - 1)),</div><div class='del'>-				msg-&gt;size, bret);</div><div class='add'>+			dev_err(xpnet, "xp_remote_memcpy(0x%p, 0x%p, 0x%hx) "</div><div class='add'>+				"returned error=0x%x\n", dst,</div><div class='add'>+				(void *)msg-&gt;buf_pa, msg-&gt;size, ret);</div><div class='ctx'> </div><div class='ctx'> 			xpc_received(partid, channel, (void *)msg);</div><div class='ctx'> </div><div class='hunk'>@@ -285,9 +263,7 @@ static void</div><div class='ctx'> xpnet_connection_activity(enum xp_retval reason, short partid, int channel,</div><div class='ctx'> 			  void *data, void *key)</div><div class='ctx'> {</div><div class='del'>-	long bp;</div><div class='del'>-</div><div class='del'>-	DBUG_ON(partid &lt;= 0 || partid &gt;= XP_MAX_PARTITIONS);</div><div class='add'>+	DBUG_ON(partid &lt; 0 || partid &gt;= xp_max_npartitions);</div><div class='ctx'> 	DBUG_ON(channel != XPC_NET_CHANNEL);</div><div class='ctx'> </div><div class='ctx'> 	switch (reason) {</div><div class='hunk'>@@ -299,31 +275,28 @@ xpnet_connection_activity(enum xp_retval reason, short partid, int channel,</div><div class='ctx'> </div><div class='ctx'> 	case xpConnected:	/* connection completed to a partition */</div><div class='ctx'> 		spin_lock_bh(&amp;xpnet_broadcast_lock);</div><div class='del'>-		xpnet_broadcast_partitions |= 1UL &lt;&lt; (partid - 1);</div><div class='del'>-		bp = xpnet_broadcast_partitions;</div><div class='add'>+		__set_bit(partid, xpnet_broadcast_partitions);</div><div class='ctx'> 		spin_unlock_bh(&amp;xpnet_broadcast_lock);</div><div class='ctx'> </div><div class='ctx'> 		netif_carrier_on(xpnet_device);</div><div class='ctx'> </div><div class='del'>-		dev_dbg(xpnet, "%s connection created to partition %d; "</div><div class='del'>-			"xpnet_broadcast_partitions=0x%lx\n",</div><div class='del'>-			xpnet_device-&gt;name, partid, bp);</div><div class='add'>+		dev_dbg(xpnet, "%s connected to partition %d\n",</div><div class='add'>+			xpnet_device-&gt;name, partid);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		spin_lock_bh(&amp;xpnet_broadcast_lock);</div><div class='del'>-		xpnet_broadcast_partitions &amp;= ~(1UL &lt;&lt; (partid - 1));</div><div class='del'>-		bp = xpnet_broadcast_partitions;</div><div class='add'>+		__clear_bit(partid, xpnet_broadcast_partitions);</div><div class='ctx'> 		spin_unlock_bh(&amp;xpnet_broadcast_lock);</div><div class='ctx'> </div><div class='del'>-		if (bp == 0)</div><div class='add'>+		if (bitmap_empty((unsigned long *)xpnet_broadcast_partitions,</div><div class='add'>+				 xp_max_npartitions)) {</div><div class='ctx'> 			netif_carrier_off(xpnet_device);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		dev_dbg(xpnet, "%s disconnected from partition %d; "</div><div class='del'>-			"xpnet_broadcast_partitions=0x%lx\n",</div><div class='del'>-			xpnet_device-&gt;name, partid, bp);</div><div class='add'>+		dev_dbg(xpnet, "%s disconnected from partition %d\n",</div><div class='add'>+			xpnet_device-&gt;name, partid);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -334,8 +307,10 @@ xpnet_dev_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(xpnet, "calling xpc_connect(%d, 0x%p, NULL, %ld, %ld, %ld, "</div><div class='ctx'> 		"%ld)\n", XPC_NET_CHANNEL, xpnet_connection_activity,</div><div class='del'>-		XPNET_MSG_SIZE, XPNET_MSG_NENTRIES, XPNET_MAX_KTHREADS,</div><div class='del'>-		XPNET_MAX_IDLE_KTHREADS);</div><div class='add'>+		(unsigned long)XPNET_MSG_SIZE,</div><div class='add'>+		(unsigned long)XPNET_MSG_NENTRIES,</div><div class='add'>+		(unsigned long)XPNET_MAX_KTHREADS,</div><div class='add'>+		(unsigned long)XPNET_MAX_IDLE_KTHREADS);</div><div class='ctx'> </div><div class='ctx'> 	ret = xpc_connect(XPC_NET_CHANNEL, xpnet_connection_activity, NULL,</div><div class='ctx'> 			  XPNET_MSG_SIZE, XPNET_MSG_NENTRIES,</div><div class='hunk'>@@ -426,35 +401,74 @@ xpnet_send_completed(enum xp_retval reason, short partid, int channel,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+xpnet_send(struct sk_buff *skb, struct xpnet_pending_msg *queued_msg,</div><div class='add'>+	   u64 start_addr, u64 end_addr, u16 embedded_bytes, int dest_partid)</div><div class='add'>+{</div><div class='add'>+	u8 msg_buffer[XPNET_MSG_SIZE];</div><div class='add'>+	struct xpnet_message *msg = (struct xpnet_message *)&amp;msg_buffer;</div><div class='add'>+	u16 msg_size = sizeof(struct xpnet_message);</div><div class='add'>+	enum xp_retval ret;</div><div class='add'>+</div><div class='add'>+	msg-&gt;embedded_bytes = embedded_bytes;</div><div class='add'>+	if (unlikely(embedded_bytes != 0)) {</div><div class='add'>+		msg-&gt;version = XPNET_VERSION_EMBED;</div><div class='add'>+		dev_dbg(xpnet, "calling memcpy(0x%p, 0x%p, 0x%lx)\n",</div><div class='add'>+			&amp;msg-&gt;data, skb-&gt;data, (size_t)embedded_bytes);</div><div class='add'>+		skb_copy_from_linear_data(skb, &amp;msg-&gt;data,</div><div class='add'>+					  (size_t)embedded_bytes);</div><div class='add'>+		msg_size += embedded_bytes - 1;</div><div class='add'>+	} else {</div><div class='add'>+		msg-&gt;version = XPNET_VERSION;</div><div class='add'>+	}</div><div class='add'>+	msg-&gt;magic = XPNET_MAGIC;</div><div class='add'>+	msg-&gt;size = end_addr - start_addr;</div><div class='add'>+	msg-&gt;leadin_ignore = (u64)skb-&gt;data - start_addr;</div><div class='add'>+	msg-&gt;tailout_ignore = end_addr - (u64)skb_tail_pointer(skb);</div><div class='add'>+	msg-&gt;buf_pa = xp_pa((void *)start_addr);</div><div class='add'>+</div><div class='add'>+	dev_dbg(xpnet, "sending XPC message to %d:%d\n"</div><div class='add'>+		KERN_DEBUG "msg-&gt;buf_pa=0x%lx, msg-&gt;size=%u, "</div><div class='add'>+		"msg-&gt;leadin_ignore=%u, msg-&gt;tailout_ignore=%u\n",</div><div class='add'>+		dest_partid, XPC_NET_CHANNEL, msg-&gt;buf_pa, msg-&gt;size,</div><div class='add'>+		msg-&gt;leadin_ignore, msg-&gt;tailout_ignore);</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;queued_msg-&gt;use_count);</div><div class='add'>+</div><div class='add'>+	ret = xpc_send_notify(dest_partid, XPC_NET_CHANNEL, XPC_NOWAIT, msg,</div><div class='add'>+			      msg_size, xpnet_send_completed, queued_msg);</div><div class='add'>+	if (unlikely(ret != xpSuccess))</div><div class='add'>+		atomic_dec(&amp;queued_msg-&gt;use_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Network layer has formatted a packet (skb) and is ready to place it</div><div class='ctx'>  * "on the wire".  Prepare and send an xpnet_message to all partitions</div><div class='ctx'>  * which have connected with us and are targets of this packet.</div><div class='ctx'>  *</div><div class='ctx'>  * MAC-NOTE:  For the XPNET driver, the MAC address contains the</div><div class='del'>- * destination partition_id.  If the destination partition id word</div><div class='del'>- * is 0xff, this packet is to broadcast to all partitions.</div><div class='add'>+ * destination partid.  If the destination partid octets are 0xffff,</div><div class='add'>+ * this packet is to be broadcast to all connected partitions.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct xpnet_pending_msg *queued_msg;</div><div class='del'>-	enum xp_retval ret;</div><div class='del'>-	struct xpnet_message *msg;</div><div class='ctx'> 	u64 start_addr, end_addr;</div><div class='del'>-	long dp;</div><div class='del'>-	u8 second_mac_octet;</div><div class='ctx'> 	short dest_partid;</div><div class='del'>-	struct xpnet_dev_private *priv;</div><div class='del'>-	u16 embedded_bytes;</div><div class='del'>-</div><div class='del'>-	priv = (struct xpnet_dev_private *)dev-&gt;priv;</div><div class='add'>+	struct xpnet_dev_private *priv = (struct xpnet_dev_private *)dev-&gt;priv;</div><div class='add'>+	u16 embedded_bytes = 0;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(xpnet, "&gt;skb-&gt;head=0x%p skb-&gt;data=0x%p skb-&gt;tail=0x%p "</div><div class='ctx'> 		"skb-&gt;end=0x%p skb-&gt;len=%d\n", (void *)skb-&gt;head,</div><div class='ctx'> 		(void *)skb-&gt;data, skb_tail_pointer(skb), skb_end_pointer(skb),</div><div class='ctx'> 		skb-&gt;len);</div><div class='ctx'> </div><div class='add'>+	if (skb-&gt;data[0] == 0x33) {</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return 0;	/* nothing needed to be done */</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The xpnet_pending_msg tracks how many outstanding</div><div class='ctx'> 	 * xpc_send_notifies are relying on this skb.  When none</div><div class='hunk'>@@ -466,7 +480,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			 "packet\n", sizeof(struct xpnet_pending_msg));</div><div class='ctx'> </div><div class='ctx'> 		priv-&gt;stats.tx_errors++;</div><div class='del'>-</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -475,7 +488,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	end_addr = L1_CACHE_ALIGN((u64)skb_tail_pointer(skb));</div><div class='ctx'> </div><div class='ctx'> 	/* calculate how many bytes to embed in the XPC message */</div><div class='del'>-	embedded_bytes = 0;</div><div class='ctx'> 	if (unlikely(skb-&gt;len &lt;= XPNET_MSG_DATA_MAX)) {</div><div class='ctx'> 		/* skb-&gt;data does fit so embed */</div><div class='ctx'> 		embedded_bytes = skb-&gt;len;</div><div class='hunk'>@@ -491,82 +503,28 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	atomic_set(&amp;queued_msg-&gt;use_count, 1);</div><div class='ctx'> 	queued_msg-&gt;skb = skb;</div><div class='ctx'> </div><div class='del'>-	second_mac_octet = skb-&gt;data[XPNET_PARTID_OCTET];</div><div class='del'>-	if (second_mac_octet == 0xff) {</div><div class='add'>+	if (skb-&gt;data[0] == 0xff) {</div><div class='ctx'> 		/* we are being asked to broadcast to all partitions */</div><div class='del'>-		dp = xpnet_broadcast_partitions;</div><div class='del'>-	} else if (second_mac_octet != 0) {</div><div class='del'>-		dp = xpnet_broadcast_partitions &amp;</div><div class='del'>-		    (1UL &lt;&lt; (second_mac_octet - 1));</div><div class='del'>-	} else {</div><div class='del'>-		/* 0 is an invalid partid.  Ignore */</div><div class='del'>-		dp = 0;</div><div class='del'>-	}</div><div class='del'>-	dev_dbg(xpnet, "destination Partitions mask (dp) = 0x%lx\n", dp);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we wanted to allow promiscuous mode to work like an</div><div class='del'>-	 * unswitched network, this would be a good point to OR in a</div><div class='del'>-	 * mask of partitions which should be receiving all packets.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Main send loop.</div><div class='del'>-	 */</div><div class='del'>-	for (dest_partid = 1; dp &amp;&amp; dest_partid &lt; XP_MAX_PARTITIONS;</div><div class='del'>-	     dest_partid++) {</div><div class='add'>+		for_each_bit(dest_partid, xpnet_broadcast_partitions,</div><div class='add'>+			     xp_max_npartitions) {</div><div class='ctx'> </div><div class='del'>-		if (!(dp &amp; (1UL &lt;&lt; (dest_partid - 1)))) {</div><div class='del'>-			/* not destined for this partition */</div><div class='del'>-			continue;</div><div class='add'>+			xpnet_send(skb, queued_msg, start_addr, end_addr,</div><div class='add'>+				   embedded_bytes, dest_partid);</div><div class='ctx'> 		}</div><div class='add'>+	} else {</div><div class='add'>+		dest_partid = (short)skb-&gt;data[XPNET_PARTID_OCTET + 1];</div><div class='add'>+		dest_partid |= (short)skb-&gt;data[XPNET_PARTID_OCTET + 0] &lt;&lt; 8;</div><div class='ctx'> </div><div class='del'>-		/* remove this partition from the destinations mask */</div><div class='del'>-		dp &amp;= ~(1UL &lt;&lt; (dest_partid - 1));</div><div class='del'>-</div><div class='del'>-		/* found a partition to send to */</div><div class='del'>-</div><div class='del'>-		ret = xpc_allocate(dest_partid, XPC_NET_CHANNEL,</div><div class='del'>-				   XPC_NOWAIT, (void **)&amp;msg);</div><div class='del'>-		if (unlikely(ret != xpSuccess))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		msg-&gt;embedded_bytes = embedded_bytes;</div><div class='del'>-		if (unlikely(embedded_bytes != 0)) {</div><div class='del'>-			msg-&gt;version = XPNET_VERSION_EMBED;</div><div class='del'>-			dev_dbg(xpnet, "calling memcpy(0x%p, 0x%p, 0x%lx)\n",</div><div class='del'>-				&amp;msg-&gt;data, skb-&gt;data, (size_t)embedded_bytes);</div><div class='del'>-			skb_copy_from_linear_data(skb, &amp;msg-&gt;data,</div><div class='del'>-						  (size_t)embedded_bytes);</div><div class='del'>-		} else {</div><div class='del'>-			msg-&gt;version = XPNET_VERSION;</div><div class='del'>-		}</div><div class='del'>-		msg-&gt;magic = XPNET_MAGIC;</div><div class='del'>-		msg-&gt;size = end_addr - start_addr;</div><div class='del'>-		msg-&gt;leadin_ignore = (u64)skb-&gt;data - start_addr;</div><div class='del'>-		msg-&gt;tailout_ignore = end_addr - (u64)skb_tail_pointer(skb);</div><div class='del'>-		msg-&gt;buf_pa = __pa(start_addr);</div><div class='del'>-</div><div class='del'>-		dev_dbg(xpnet, "sending XPC message to %d:%d\n"</div><div class='del'>-			KERN_DEBUG "msg-&gt;buf_pa=0x%lx, msg-&gt;size=%u, "</div><div class='del'>-			"msg-&gt;leadin_ignore=%u, msg-&gt;tailout_ignore=%u\n",</div><div class='del'>-			dest_partid, XPC_NET_CHANNEL, msg-&gt;buf_pa, msg-&gt;size,</div><div class='del'>-			msg-&gt;leadin_ignore, msg-&gt;tailout_ignore);</div><div class='del'>-</div><div class='del'>-		atomic_inc(&amp;queued_msg-&gt;use_count);</div><div class='del'>-</div><div class='del'>-		ret = xpc_send_notify(dest_partid, XPC_NET_CHANNEL, msg,</div><div class='del'>-				      xpnet_send_completed, queued_msg);</div><div class='del'>-		if (unlikely(ret != xpSuccess)) {</div><div class='del'>-			atomic_dec(&amp;queued_msg-&gt;use_count);</div><div class='del'>-			continue;</div><div class='add'>+		if (dest_partid &gt;= 0 &amp;&amp;</div><div class='add'>+		    dest_partid &lt; xp_max_npartitions &amp;&amp;</div><div class='add'>+		    test_bit(dest_partid, xpnet_broadcast_partitions) != 0) {</div><div class='add'>+</div><div class='add'>+			xpnet_send(skb, queued_msg, start_addr, end_addr,</div><div class='add'>+				   embedded_bytes, dest_partid);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_dec_return(&amp;queued_msg-&gt;use_count) == 0) {</div><div class='del'>-		dev_dbg(xpnet, "no partitions to receive packet destined for "</div><div class='del'>-			"%d\n", dest_partid);</div><div class='del'>-</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		kfree(queued_msg);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -594,23 +552,28 @@ xpnet_dev_tx_timeout(struct net_device *dev)</div><div class='ctx'> static int __init</div><div class='ctx'> xpnet_init(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	u32 license_num;</div><div class='del'>-	int result = -ENOMEM;</div><div class='add'>+	int result;</div><div class='ctx'> </div><div class='del'>-	if (!ia64_platform_is("sn2"))</div><div class='add'>+	if (!is_shub() &amp;&amp; !is_uv())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	dev_info(xpnet, "registering network device %s\n", XPNET_DEVICE_NAME);</div><div class='ctx'> </div><div class='add'>+	xpnet_broadcast_partitions = kzalloc(BITS_TO_LONGS(xp_max_npartitions) *</div><div class='add'>+					     sizeof(long), GFP_KERNEL);</div><div class='add'>+	if (xpnet_broadcast_partitions == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * use ether_setup() to init the majority of our device</div><div class='ctx'> 	 * structure and then override the necessary pieces.</div><div class='ctx'> 	 */</div><div class='ctx'> 	xpnet_device = alloc_netdev(sizeof(struct xpnet_dev_private),</div><div class='ctx'> 				    XPNET_DEVICE_NAME, ether_setup);</div><div class='del'>-	if (xpnet_device == NULL)</div><div class='add'>+	if (xpnet_device == NULL) {</div><div class='add'>+		kfree(xpnet_broadcast_partitions);</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(xpnet_device);</div><div class='ctx'> </div><div class='hunk'>@@ -628,14 +591,10 @@ xpnet_init(void)</div><div class='ctx'> 	 * MAC addresses.  We chose the first octet of the MAC to be unlikely</div><div class='ctx'> 	 * to collide with any vendor's officially issued MAC.</div><div class='ctx'> 	 */</div><div class='del'>-	xpnet_device-&gt;dev_addr[0] = 0xfe;</div><div class='del'>-	xpnet_device-&gt;dev_addr[XPNET_PARTID_OCTET] = sn_partition_id;</div><div class='del'>-	license_num = sn_partition_serial_number_val();</div><div class='del'>-	for (i = 3; i &gt;= 0; i--) {</div><div class='del'>-		xpnet_device-&gt;dev_addr[XPNET_LICENSE_OCTET + i] =</div><div class='del'>-		    license_num &amp; 0xff;</div><div class='del'>-		license_num = license_num &gt;&gt; 8;</div><div class='del'>-	}</div><div class='add'>+	xpnet_device-&gt;dev_addr[0] = 0x02;     /* locally administered, no OUI */</div><div class='add'>+</div><div class='add'>+	xpnet_device-&gt;dev_addr[XPNET_PARTID_OCTET + 1] = xp_partition_id;</div><div class='add'>+	xpnet_device-&gt;dev_addr[XPNET_PARTID_OCTET + 0] = (xp_partition_id &gt;&gt; 8);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * ether_setup() sets this to a multicast device.  We are</div><div class='hunk'>@@ -651,8 +610,10 @@ xpnet_init(void)</div><div class='ctx'> 	xpnet_device-&gt;features = NETIF_F_NO_CSUM;</div><div class='ctx'> </div><div class='ctx'> 	result = register_netdev(xpnet_device);</div><div class='del'>-	if (result != 0)</div><div class='add'>+	if (result != 0) {</div><div class='ctx'> 		free_netdev(xpnet_device);</div><div class='add'>+		kfree(xpnet_broadcast_partitions);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='hunk'>@@ -666,8 +627,8 @@ xpnet_exit(void)</div><div class='ctx'> 		 xpnet_device[0].name);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(xpnet_device);</div><div class='del'>-</div><div class='ctx'> 	free_netdev(xpnet_device);</div><div class='add'>+	kfree(xpnet_broadcast_partitions);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_exit(xpnet_exit);</div><div class='head'>diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c<br/>index d3eb7903c346..6b9300779a43 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/thinkpad_acpi.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/misc/thinkpad_acpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/thinkpad_acpi.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/misc/thinkpad_acpi.c</a></div><div class='hunk'>@@ -3086,7 +3086,6 @@ static struct ibm_struct wan_driver_data = {</div><div class='ctx'> 	.read = wan_read,</div><div class='ctx'> 	.write = wan_write,</div><div class='ctx'> 	.exit = wan_exit,</div><div class='del'>-	.flags.experimental = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*************************************************************************</div><div class='head'>diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c<br/>index 66e5a5487c20..ebc8b9d77613 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/card/block.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mmc/card/block.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/card/block.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/card/block.c</a></div><div class='hunk'>@@ -103,8 +103,10 @@ static int mmc_blk_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 			check_disk_change(inode-&gt;i_bdev);</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> </div><div class='del'>-		if ((filp-&gt;f_mode &amp; FMODE_WRITE) &amp;&amp; md-&gt;read_only)</div><div class='add'>+		if ((filp-&gt;f_mode &amp; FMODE_WRITE) &amp;&amp; md-&gt;read_only) {</div><div class='add'>+			mmc_blk_put(md);</div><div class='ctx'> 			ret = -EROFS;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -213,7 +215,8 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)</div><div class='ctx'> 	struct mmc_blk_data *md = mq-&gt;data;</div><div class='ctx'> 	struct mmc_card *card = md-&gt;queue.card;</div><div class='ctx'> 	struct mmc_blk_request brq;</div><div class='del'>-	int ret = 1, sg_pos, data_size;</div><div class='add'>+	int ret = 1, data_size, i;</div><div class='add'>+	struct scatterlist *sg;</div><div class='ctx'> </div><div class='ctx'> 	mmc_claim_host(card-&gt;host);</div><div class='ctx'> </div><div class='hunk'>@@ -267,18 +270,22 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)</div><div class='ctx'> </div><div class='ctx'> 		mmc_queue_bounce_pre(mq);</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Adjust the sg list so it is the same size as the</div><div class='add'>+		 * request.</div><div class='add'>+		 */</div><div class='ctx'> 		if (brq.data.blocks !=</div><div class='ctx'> 		    (req-&gt;nr_sectors &gt;&gt; (md-&gt;block_bits - 9))) {</div><div class='ctx'> 			data_size = brq.data.blocks * brq.data.blksz;</div><div class='del'>-			for (sg_pos = 0; sg_pos &lt; brq.data.sg_len; sg_pos++) {</div><div class='del'>-				data_size -= mq-&gt;sg[sg_pos].length;</div><div class='add'>+			for_each_sg(brq.data.sg, sg, brq.data.sg_len, i) {</div><div class='add'>+				data_size -= sg-&gt;length;</div><div class='ctx'> 				if (data_size &lt;= 0) {</div><div class='del'>-					mq-&gt;sg[sg_pos].length += data_size;</div><div class='del'>-					sg_pos++;</div><div class='add'>+					sg-&gt;length += data_size;</div><div class='add'>+					i++;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-			brq.data.sg_len = sg_pos;</div><div class='add'>+			brq.data.sg_len = i;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		mmc_wait_for_req(card-&gt;host, &amp;brq.mrq);</div><div class='hunk'>@@ -608,14 +615,19 @@ static struct mmc_driver mmc_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init mmc_blk_init(void)</div><div class='ctx'> {</div><div class='del'>-	int res = -ENOMEM;</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='ctx'> 	res = register_blkdev(MMC_BLOCK_MAJOR, "mmc");</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	return mmc_register_driver(&amp;mmc_driver);</div><div class='add'>+	res = mmc_register_driver(&amp;mmc_driver);</div><div class='add'>+	if (res)</div><div class='add'>+		goto out2;</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+ out2:</div><div class='add'>+	unregister_blkdev(MMC_BLOCK_MAJOR, "mmc");</div><div class='ctx'>  out:</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c<br/>index a067fe436301..b92b172074ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/card/mmc_test.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mmc/card/mmc_test.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/card/mmc_test.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/card/mmc_test.c</a></div><div class='hunk'>@@ -388,16 +388,14 @@ static int mmc_test_transfer(struct mmc_test_card *test,</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(blocks * blksz &gt; BUFFER_SIZE);</div><div class='del'>-</div><div class='ctx'> 	if (write) {</div><div class='ctx'> 		for (i = 0;i &lt; blocks * blksz;i++)</div><div class='ctx'> 			test-&gt;scratch[i] = i;</div><div class='ctx'> 	} else {</div><div class='del'>-		memset(test-&gt;scratch, 0, blocks * blksz);</div><div class='add'>+		memset(test-&gt;scratch, 0, BUFFER_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	local_irq_save(flags);</div><div class='del'>-	sg_copy_from_buffer(sg, sg_len, test-&gt;scratch, blocks * blksz);</div><div class='add'>+	sg_copy_from_buffer(sg, sg_len, test-&gt;scratch, BUFFER_SIZE);</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> </div><div class='ctx'> 	ret = mmc_test_set_blksize(test, blksz);</div><div class='hunk'>@@ -444,7 +442,7 @@ static int mmc_test_transfer(struct mmc_test_card *test,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		local_irq_save(flags);</div><div class='del'>-		sg_copy_to_buffer(sg, sg_len, test-&gt;scratch, blocks * blksz);</div><div class='add'>+		sg_copy_to_buffer(sg, sg_len, test-&gt;scratch, BUFFER_SIZE);</div><div class='ctx'> 		local_irq_restore(flags);</div><div class='ctx'> 		for (i = 0;i &lt; blocks * blksz;i++) {</div><div class='ctx'> 			if (test-&gt;scratch[i] != (u8)i)</div><div class='hunk'>@@ -805,69 +803,6 @@ static int mmc_test_multi_xfersize_read(struct mmc_test_card *test)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mmc_test_bigsg_write(struct mmc_test_card *test)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	unsigned int size;</div><div class='del'>-	struct scatterlist sg;</div><div class='del'>-</div><div class='del'>-	if (test-&gt;card-&gt;host-&gt;max_blk_count == 1)</div><div class='del'>-		return RESULT_UNSUP_HOST;</div><div class='del'>-</div><div class='del'>-	size = PAGE_SIZE * 2;</div><div class='del'>-	size = min(size, test-&gt;card-&gt;host-&gt;max_req_size);</div><div class='del'>-	size = min(size, test-&gt;card-&gt;host-&gt;max_seg_size);</div><div class='del'>-	size = min(size, test-&gt;card-&gt;host-&gt;max_blk_count * 512);</div><div class='del'>-</div><div class='del'>-	memset(test-&gt;buffer, 0, BUFFER_SIZE);</div><div class='del'>-</div><div class='del'>-	if (size &lt; 1024)</div><div class='del'>-		return RESULT_UNSUP_HOST;</div><div class='del'>-</div><div class='del'>-	sg_init_table(&amp;sg, 1);</div><div class='del'>-	sg_init_one(&amp;sg, test-&gt;buffer, BUFFER_SIZE);</div><div class='del'>-</div><div class='del'>-	ret = mmc_test_transfer(test, &amp;sg, 1, 0, size/512, 512, 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mmc_test_bigsg_read(struct mmc_test_card *test)</div><div class='del'>-{</div><div class='del'>-	int ret, i;</div><div class='del'>-	unsigned int size;</div><div class='del'>-	struct scatterlist sg;</div><div class='del'>-</div><div class='del'>-	if (test-&gt;card-&gt;host-&gt;max_blk_count == 1)</div><div class='del'>-		return RESULT_UNSUP_HOST;</div><div class='del'>-</div><div class='del'>-	size = PAGE_SIZE * 2;</div><div class='del'>-	size = min(size, test-&gt;card-&gt;host-&gt;max_req_size);</div><div class='del'>-	size = min(size, test-&gt;card-&gt;host-&gt;max_seg_size);</div><div class='del'>-	size = min(size, test-&gt;card-&gt;host-&gt;max_blk_count * 512);</div><div class='del'>-</div><div class='del'>-	if (size &lt; 1024)</div><div class='del'>-		return RESULT_UNSUP_HOST;</div><div class='del'>-</div><div class='del'>-	memset(test-&gt;buffer, 0xCD, BUFFER_SIZE);</div><div class='del'>-</div><div class='del'>-	sg_init_table(&amp;sg, 1);</div><div class='del'>-	sg_init_one(&amp;sg, test-&gt;buffer, BUFFER_SIZE);</div><div class='del'>-	ret = mmc_test_transfer(test, &amp;sg, 1, 0, size/512, 512, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* mmc_test_transfer() doesn't check for read overflows */</div><div class='del'>-	for (i = size;i &lt; BUFFER_SIZE;i++) {</div><div class='del'>-		if (test-&gt;buffer[i] != 0xCD)</div><div class='del'>-			return RESULT_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_HIGHMEM</div><div class='ctx'> </div><div class='ctx'> static int mmc_test_write_high(struct mmc_test_card *test)</div><div class='hunk'>@@ -1071,20 +1006,6 @@ static const struct mmc_test_case mmc_test_cases[] = {</div><div class='ctx'> 		.run = mmc_test_multi_xfersize_read,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{</div><div class='del'>-		.name = "Over-sized SG list write",</div><div class='del'>-		.prepare = mmc_test_prepare_write,</div><div class='del'>-		.run = mmc_test_bigsg_write,</div><div class='del'>-		.cleanup = mmc_test_cleanup,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		.name = "Over-sized SG list read",</div><div class='del'>-		.prepare = mmc_test_prepare_read,</div><div class='del'>-		.run = mmc_test_bigsg_read,</div><div class='del'>-		.cleanup = mmc_test_cleanup,</div><div class='del'>-	},</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_HIGHMEM</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='hunk'>@@ -1119,7 +1040,7 @@ static const struct mmc_test_case mmc_test_cases[] = {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct mutex mmc_test_lock;</div><div class='add'>+static DEFINE_MUTEX(mmc_test_lock);</div><div class='ctx'> </div><div class='ctx'> static void mmc_test_run(struct mmc_test_card *test, int testcase)</div><div class='ctx'> {</div><div class='hunk'>@@ -1250,8 +1171,6 @@ static int mmc_test_probe(struct mmc_card *card)</div><div class='ctx'> 	if ((card-&gt;type != MMC_TYPE_MMC) &amp;&amp; (card-&gt;type != MMC_TYPE_SD))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	mutex_init(&amp;mmc_test_lock);</div><div class='del'>-</div><div class='ctx'> 	ret = device_create_file(&amp;card-&gt;dev, &amp;dev_attr_test);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='head'>diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c<br/>index 3ee5b8c3b5ce..044d84eeed7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/core/core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mmc/core/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/core/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/core/core.c</a></div><div class='hunk'>@@ -121,6 +121,7 @@ mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_MMC_DEBUG</div><div class='ctx'> 	unsigned int i, sz;</div><div class='add'>+	struct scatterlist *sg;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s: starting CMD%u arg %08x flags %08x\n",</div><div class='hunk'>@@ -156,8 +157,8 @@ mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMC_DEBUG</div><div class='ctx'> 		sz = 0;</div><div class='del'>-		for (i = 0;i &lt; mrq-&gt;data-&gt;sg_len;i++)</div><div class='del'>-			sz += mrq-&gt;data-&gt;sg[i].length;</div><div class='add'>+		for_each_sg(mrq-&gt;data-&gt;sg, sg, mrq-&gt;data-&gt;sg_len, i)</div><div class='add'>+			sz += sg-&gt;length;</div><div class='ctx'> 		BUG_ON(sz != mrq-&gt;data-&gt;blocks * mrq-&gt;data-&gt;blksz);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig<br/>index dc6f2579f85c..ea8d7a3490d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mmc/host/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/Kconfig</a></div><div class='hunk'>@@ -174,3 +174,9 @@ config MMC_SDRICOH_CS</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called sdricoh_cs.</div><div class='ctx'> </div><div class='add'>+config MMC_TMIO</div><div class='add'>+	tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support"</div><div class='add'>+	depends on MFD_TMIO</div><div class='add'>+	help</div><div class='add'>+	  This provides support for the SD/MMC cell found in TC6393XB,</div><div class='add'>+	  T7L66XB and also ipaq ASIC3</div><div class='head'>diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile<br/>index db52eebfb50e..c794cc5ce442 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mmc/host/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/Makefile</a></div><div class='hunk'>@@ -21,4 +21,5 @@ obj-$(CONFIG_MMC_TIFM_SD)	+= tifm_sd.o</div><div class='ctx'> obj-$(CONFIG_MMC_SPI)		+= mmc_spi.o</div><div class='ctx'> obj-$(CONFIG_MMC_S3C)   	+= s3cmci.o</div><div class='ctx'> obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_cs.o</div><div class='add'>+obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c<br/>index f15e2064305c..1f8b5b36222c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/at91_mci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mmc/host/at91_mci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/at91_mci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/at91_mci.c</a></div><div class='hunk'>@@ -73,9 +73,9 @@</div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='del'>-#include &lt;asm/arch/at91_mci.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='add'>+#include &lt;mach/at91_mci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME "at91_mci"</div><div class='ctx'> </div><div class='hunk'>@@ -621,12 +621,21 @@ static void at91_mci_send_command(struct at91mci_host *host, struct mmc_command</div><div class='ctx'> 				if (cpu_is_at91sam9260 () || cpu_is_at91sam9263())</div><div class='ctx'> 					if (host-&gt;total_length &lt; 12)</div><div class='ctx'> 						host-&gt;total_length = 12;</div><div class='del'>-				host-&gt;buffer = dma_alloc_coherent(NULL,</div><div class='del'>-						host-&gt;total_length,</div><div class='del'>-						&amp;host-&gt;physical_address, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+				host-&gt;buffer = kmalloc(host-&gt;total_length, GFP_KERNEL);</div><div class='add'>+				if (!host-&gt;buffer) {</div><div class='add'>+					pr_debug("Can't alloc tx buffer\n");</div><div class='add'>+					cmd-&gt;error = -ENOMEM;</div><div class='add'>+					mmc_request_done(host-&gt;mmc, host-&gt;request);</div><div class='add'>+					return;</div><div class='add'>+				}</div><div class='ctx'> </div><div class='ctx'> 				at91_mci_sg_to_dma(host, data);</div><div class='ctx'> </div><div class='add'>+				host-&gt;physical_address = dma_map_single(NULL,</div><div class='add'>+						host-&gt;buffer, host-&gt;total_length,</div><div class='add'>+						DMA_TO_DEVICE);</div><div class='add'>+</div><div class='ctx'> 				pr_debug("Transmitting %d bytes\n", host-&gt;total_length);</div><div class='ctx'> </div><div class='ctx'> 				at91_mci_write(host, ATMEL_PDC_TPR, host-&gt;physical_address);</div><div class='hunk'>@@ -694,7 +703,10 @@ static void at91_mci_completed_command(struct at91mci_host *host, unsigned int s</div><div class='ctx'> 	cmd-&gt;resp[3] = at91_mci_read(host, AT91_MCI_RSPR(3));</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;buffer) {</div><div class='del'>-		dma_free_coherent(NULL, host-&gt;total_length, host-&gt;buffer, host-&gt;physical_address);</div><div class='add'>+		dma_unmap_single(NULL,</div><div class='add'>+				host-&gt;physical_address, host-&gt;total_length,</div><div class='add'>+				DMA_TO_DEVICE);</div><div class='add'>+		kfree(host-&gt;buffer);</div><div class='ctx'> 		host-&gt;buffer = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c<br/>index 992b4beb757c..917035e16da4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/atmel-mci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mmc/host/atmel-mci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/atmel-mci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/atmel-mci.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "atmel-mci-regs.h"</div><div class='ctx'> </div><div class='hunk'>@@ -195,7 +195,9 @@ static int atmci_regs_show(struct seq_file *s, void *v)</div><div class='ctx'> </div><div class='ctx'> 	/* Grab a more or less consistent snapshot */</div><div class='ctx'> 	spin_lock_irq(&amp;host-&gt;mmc-&gt;lock);</div><div class='add'>+	clk_enable(host-&gt;mck);</div><div class='ctx'> 	memcpy_fromio(buf, host-&gt;regs, MCI_REGS_SIZE);</div><div class='add'>+	clk_disable(host-&gt;mck);</div><div class='ctx'> 	spin_unlock_irq(&amp;host-&gt;mmc-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(s, "MR:\t0x%08x%s%s CLKDIV=%u\n",</div><div class='hunk'>@@ -216,6 +218,8 @@ static int atmci_regs_show(struct seq_file *s, void *v)</div><div class='ctx'> 	atmci_show_status_reg(s, "SR", buf[MCI_SR / 4]);</div><div class='ctx'> 	atmci_show_status_reg(s, "IMR", buf[MCI_IMR / 4]);</div><div class='ctx'> </div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -237,7 +241,6 @@ static void atmci_init_debugfs(struct atmel_mci *host)</div><div class='ctx'> 	struct mmc_host	*mmc;</div><div class='ctx'> 	struct dentry	*root;</div><div class='ctx'> 	struct dentry	*node;</div><div class='del'>-	struct resource	*res;</div><div class='ctx'> </div><div class='ctx'> 	mmc = host-&gt;mmc;</div><div class='ctx'> 	root = mmc-&gt;debugfs_root;</div><div class='hunk'>@@ -251,9 +254,6 @@ static void atmci_init_debugfs(struct atmel_mci *host)</div><div class='ctx'> 	if (!node)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(host-&gt;pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	node-&gt;d_inode-&gt;i_size = res-&gt;end - res-&gt;start + 1;</div><div class='del'>-</div><div class='ctx'> 	node = debugfs_create_file("req", S_IRUSR, root, host, &amp;atmci_req_fops);</div><div class='ctx'> 	if (!node)</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -1059,6 +1059,10 @@ static int __init atmci_probe(struct platform_device *pdev)</div><div class='ctx'> 			host-&gt;present = !gpio_get_value(host-&gt;detect_pin);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (!gpio_is_valid(host-&gt;detect_pin))</div><div class='add'>+		mmc-&gt;caps |= MMC_CAP_NEEDS_POLL;</div><div class='add'>+</div><div class='ctx'> 	if (gpio_is_valid(host-&gt;wp_pin)) {</div><div class='ctx'> 		if (gpio_request(host-&gt;wp_pin, "mmc_wp")) {</div><div class='ctx'> 			dev_dbg(&amp;mmc-&gt;class_dev, "no WP pin available\n");</div><div class='head'>diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c<br/>index 99b20917cc0f..d3f55615c099 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/au1xmmc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mmc/host/au1xmmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/au1xmmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/au1xmmc.c</a></div><div class='hunk'>@@ -61,7 +61,13 @@</div><div class='ctx'> </div><div class='ctx'> /* Hardware definitions */</div><div class='ctx'> #define AU1XMMC_DESCRIPTOR_COUNT 1</div><div class='del'>-#define AU1XMMC_DESCRIPTOR_SIZE  2048</div><div class='add'>+</div><div class='add'>+/* max DMA seg size: 64KB on Au1100, 4MB on Au1200 */</div><div class='add'>+#ifdef CONFIG_SOC_AU1100</div><div class='add'>+#define AU1XMMC_DESCRIPTOR_SIZE 0x0000ffff</div><div class='add'>+#else	/* Au1200 */</div><div class='add'>+#define AU1XMMC_DESCRIPTOR_SIZE 0x003fffff</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #define AU1XMMC_OCR (MMC_VDD_27_28 | MMC_VDD_28_29 | MMC_VDD_29_30 | \</div><div class='ctx'> 		     MMC_VDD_30_31 | MMC_VDD_31_32 | MMC_VDD_32_33 | \</div><div class='head'>diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c<br/>index f61406da65d2..2f0fcdb869b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/imxmmc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mmc/host/imxmmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/imxmmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/imxmmc.c</a></div><div class='hunk'>@@ -42,8 +42,8 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/imx-dma.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/imx-dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "imxmmc.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c<br/>index dbc26eb6a89e..c16028872bbb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/omap.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mmc/host/omap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/omap.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/omap.c</a></div><div class='hunk'>@@ -29,14 +29,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/mux.h&gt;</div><div class='del'>-#include &lt;asm/arch/fpga.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='add'>+#include &lt;mach/fpga.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define	OMAP_MMC_REG_CMD	0x00</div><div class='ctx'> #define	OMAP_MMC_REG_ARGL	0x04</div><div class='head'>diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c<br/>index a8e18fe53077..55093ad132ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/pxamci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mmc/host/pxamci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/pxamci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/pxamci.c</a></div><div class='hunk'>@@ -31,8 +31,8 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/mmc.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/mmc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pxamci.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c<br/>index be550c26da68..ae16d845d746 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/s3cmci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mmc/host/s3cmci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/s3cmci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/s3cmci.c</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/regs-sdi.h&gt;</div><div class='del'>-#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-sdi.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/plat-s3c24xx/mci.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -595,8 +595,9 @@ static irqreturn_t s3cmci_irq_cd(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void s3cmci_dma_done_callback(struct s3c2410_dma_chan *dma_ch, void *buf_id,</div><div class='del'>-			      int size, enum s3c2410_dma_buffresult result)</div><div class='add'>+static void s3cmci_dma_done_callback(struct s3c2410_dma_chan *dma_ch,</div><div class='add'>+				     void *buf_id, int size,</div><div class='add'>+				     enum s3c2410_dma_buffresult result)</div><div class='ctx'> {</div><div class='ctx'> 	struct s3cmci_host *host = buf_id;</div><div class='ctx'> 	unsigned long iflags;</div><div class='hunk'>@@ -740,8 +741,8 @@ request_done:</div><div class='ctx'> 	mmc_request_done(host-&gt;mmc, mrq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-void s3cmci_dma_setup(struct s3cmci_host *host, enum s3c2410_dmasrc source)</div><div class='add'>+static void s3cmci_dma_setup(struct s3cmci_host *host,</div><div class='add'>+			     enum s3c2410_dmasrc source)</div><div class='ctx'> {</div><div class='ctx'> 	static enum s3c2410_dmasrc last_source = -1;</div><div class='ctx'> 	static int setup_ok;</div><div class='hunk'>@@ -1003,8 +1004,9 @@ static void s3cmci_send_request(struct mmc_host *mmc)</div><div class='ctx'> 	enable_irq(host-&gt;irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s3cmci_card_present(struct s3cmci_host *host)</div><div class='add'>+static int s3cmci_card_present(struct mmc_host *mmc)</div><div class='ctx'> {</div><div class='add'>+	struct s3cmci_host *host = mmc_priv(mmc);</div><div class='ctx'> 	struct s3c24xx_mci_pdata *pdata = host-&gt;pdata;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1023,7 +1025,7 @@ static void s3cmci_request(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='ctx'> 	host-&gt;cmd_is_stop = 0;</div><div class='ctx'> 	host-&gt;mrq = mrq;</div><div class='ctx'> </div><div class='del'>-	if (s3cmci_card_present(host) == 0) {</div><div class='add'>+	if (s3cmci_card_present(mmc) == 0) {</div><div class='ctx'> 		dbg(host, dbg_err, "%s: no medium present\n", __func__);</div><div class='ctx'> 		host-&gt;mrq-&gt;cmd-&gt;error = -ENOMEDIUM;</div><div class='ctx'> 		mmc_request_done(mmc, mrq);</div><div class='hunk'>@@ -1138,6 +1140,7 @@ static struct mmc_host_ops s3cmci_ops = {</div><div class='ctx'> 	.request	= s3cmci_request,</div><div class='ctx'> 	.set_ios	= s3cmci_set_ios,</div><div class='ctx'> 	.get_ro		= s3cmci_get_ro,</div><div class='add'>+	.get_cd		= s3cmci_card_present,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct s3c24xx_mci_pdata s3cmci_def_pdata = {</div><div class='hunk'>@@ -1206,7 +1209,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev, int is2440)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;base = ioremap(host-&gt;mem-&gt;start, RESSIZE(host-&gt;mem));</div><div class='del'>-	if (host-&gt;base == 0) {</div><div class='add'>+	if (!host-&gt;base) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to ioremap() io memory region.\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto probe_free_mem_region;</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c<br/>index deb607c52c0d..fcb14c2346cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-pci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mmc/host/sdhci-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-pci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/sdhci-pci.c</a></div><div class='hunk'>@@ -143,7 +143,8 @@ static int jmicron_probe(struct sdhci_pci_chip *chip)</div><div class='ctx'> 		chip-&gt;quirks |= SDHCI_QUIRK_32BIT_DMA_ADDR |</div><div class='ctx'> 			  SDHCI_QUIRK_32BIT_DMA_SIZE |</div><div class='ctx'> 			  SDHCI_QUIRK_32BIT_ADMA_SIZE |</div><div class='del'>-			  SDHCI_QUIRK_RESET_AFTER_REQUEST;</div><div class='add'>+			  SDHCI_QUIRK_RESET_AFTER_REQUEST |</div><div class='add'>+			  SDHCI_QUIRK_BROKEN_SMALL_PIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c<br/>index 5f95e10229b5..e3a8133560a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mmc/host/sdhci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/sdhci.c</a></div><div class='hunk'>@@ -278,6 +278,15 @@ static void sdhci_transfer_pio(struct sdhci_host *host)</div><div class='ctx'> 	else</div><div class='ctx'> 		mask = SDHCI_SPACE_AVAILABLE;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Some controllers (JMicron JMB38x) mess up the buffer bits</div><div class='add'>+	 * for transfers &lt; 4 bytes. As long as it is just one block,</div><div class='add'>+	 * we can ignore the bits.</div><div class='add'>+	 */</div><div class='add'>+	if ((host-&gt;quirks &amp; SDHCI_QUIRK_BROKEN_SMALL_PIO) &amp;&amp;</div><div class='add'>+		(host-&gt;data-&gt;blocks == 1))</div><div class='add'>+		mask = ~0;</div><div class='add'>+</div><div class='ctx'> 	while (readl(host-&gt;ioaddr + SDHCI_PRESENT_STATE) &amp; mask) {</div><div class='ctx'> 		if (host-&gt;data-&gt;flags &amp; MMC_DATA_READ)</div><div class='ctx'> 			sdhci_read_block_pio(host);</div><div class='hunk'>@@ -439,7 +448,7 @@ static int sdhci_adma_table_pre(struct sdhci_host *host,</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;adma_addr = dma_map_single(mmc_dev(host-&gt;mmc),</div><div class='ctx'> 		host-&gt;adma_desc, (128 * 2 + 1) * 4, DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(mmc_dev(host-&gt;mmc), host-&gt;align_addr))</div><div class='add'>+	if (dma_mapping_error(mmc_dev(host-&gt;mmc), host-&gt;adma_addr))</div><div class='ctx'> 		goto unmap_entries;</div><div class='ctx'> 	BUG_ON(host-&gt;adma_addr &amp; 0x3);</div><div class='ctx'> </div><div class='hunk'>@@ -645,7 +654,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)</div><div class='ctx'> 				 * us an invalid request.</div><div class='ctx'> 				 */</div><div class='ctx'> 				WARN_ON(1);</div><div class='del'>-				host-&gt;flags &amp;= ~SDHCI_USE_DMA;</div><div class='add'>+				host-&gt;flags &amp;= ~SDHCI_REQ_USE_DMA;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				writel(host-&gt;adma_addr,</div><div class='ctx'> 					host-&gt;ioaddr + SDHCI_ADMA_ADDRESS);</div><div class='hunk'>@@ -664,7 +673,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)</div><div class='ctx'> 				 * us an invalid request.</div><div class='ctx'> 				 */</div><div class='ctx'> 				WARN_ON(1);</div><div class='del'>-				host-&gt;flags &amp;= ~SDHCI_USE_DMA;</div><div class='add'>+				host-&gt;flags &amp;= ~SDHCI_REQ_USE_DMA;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				WARN_ON(sg_cnt != 1);</div><div class='ctx'> 				writel(sg_dma_address(data-&gt;sg),</div><div class='head'>diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h<br/>index e354faee5df0..197d4a05f4ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mmc/host/sdhci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/sdhci.h</a></div><div class='hunk'>@@ -206,6 +206,8 @@ struct sdhci_host {</div><div class='ctx'> #define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER		(1&lt;&lt;11)</div><div class='ctx'> /* Controller provides an incorrect timeout value for transfers */</div><div class='ctx'> #define SDHCI_QUIRK_BROKEN_TIMEOUT_VAL			(1&lt;&lt;12)</div><div class='add'>+/* Controller has an issue with buffer bits for small transfers */</div><div class='add'>+#define SDHCI_QUIRK_BROKEN_SMALL_PIO			(1&lt;&lt;13)</div><div class='ctx'> </div><div class='ctx'> 	int			irq;		/* Device IRQ */</div><div class='ctx'> 	void __iomem *		ioaddr;		/* Mapped address */</div><div class='head'>diff --git a/drivers/mmc/host/sdricoh_cs.c b/drivers/mmc/host/sdricoh_cs.c<br/>index f99e9f721629..1df44d966bdb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdricoh_cs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mmc/host/sdricoh_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdricoh_cs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/sdricoh_cs.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;pcmcia/cs_types.h&gt;</div><div class='ctx'> #include &lt;pcmcia/cs.h&gt;</div><div class='head'>diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c<br/>new file mode 100644<br/>index 000000000000..95430b81ec11<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/tmio_mmc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/tmio_mmc.c</a></div><div class='hunk'>@@ -0,0 +1,691 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/drivers/mmc/tmio_mmc.c</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004 Ian Molton</div><div class='add'>+ *  Copyright (C) 2007 Ian Molton</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * Driver for the MMC / SD / SDIO cell found in:</div><div class='add'>+ *</div><div class='add'>+ * TC6393XB TC6391XB TC6387XB T7L66XB</div><div class='add'>+ *</div><div class='add'>+ * This driver draws mainly on scattered spec sheets, Reverse engineering</div><div class='add'>+ * of the toshiba e800  SD driver and some parts of the 2.4 ASIC3 driver (4 bit</div><div class='add'>+ * support). (Further 4 bit support from a later datasheet).</div><div class='add'>+ *</div><div class='add'>+ * TODO:</div><div class='add'>+ *   Investigate using a workqueue for PIO transfers</div><div class='add'>+ *   Eliminate FIXMEs</div><div class='add'>+ *   SDIO support</div><div class='add'>+ *   Better Power management</div><div class='add'>+ *   Handle MMC errors better</div><div class='add'>+ *   double buffer support</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/mmc/host.h&gt;</div><div class='add'>+#include &lt;linux/mfd/core.h&gt;</div><div class='add'>+#include &lt;linux/mfd/tmio.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tmio_mmc.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Fixme - documentation conflicts on what the clock values are for the</div><div class='add'>+ * various dividers.</div><div class='add'>+ * One document I have says that its a divisor of a 24MHz clock, another 33.</div><div class='add'>+ * This probably depends on HCLK for a given platform, so we may need to</div><div class='add'>+ * require HCLK be passed to us from the MFD core.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void tmio_mmc_set_clock(struct tmio_mmc_host *host, int new_clock)</div><div class='add'>+{</div><div class='add'>+	void __iomem *cnf = host-&gt;cnf;</div><div class='add'>+	void __iomem *ctl = host-&gt;ctl;</div><div class='add'>+	u32 clk = 0, clock;</div><div class='add'>+</div><div class='add'>+	if (new_clock) {</div><div class='add'>+		for (clock = 46875, clk = 0x100; new_clock &gt;= (clock&lt;&lt;1); ) {</div><div class='add'>+			clock &lt;&lt;= 1;</div><div class='add'>+			clk &gt;&gt;= 1;</div><div class='add'>+		}</div><div class='add'>+		if (clk &amp; 0x1)</div><div class='add'>+			clk = 0x20000;</div><div class='add'>+</div><div class='add'>+		clk &gt;&gt;= 2;</div><div class='add'>+		tmio_iowrite8((clk &amp; 0x8000) ? 0 : 1, cnf + CNF_SD_CLK_MODE);</div><div class='add'>+		clk |= 0x100;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmio_iowrite16(clk, ctl + CTL_SD_CARD_CLK_CTL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tmio_mmc_clk_stop(struct tmio_mmc_host *host)</div><div class='add'>+{</div><div class='add'>+	void __iomem *ctl = host-&gt;ctl;</div><div class='add'>+</div><div class='add'>+	tmio_iowrite16(0x0000, ctl + CTL_CLK_AND_WAIT_CTL);</div><div class='add'>+	msleep(10);</div><div class='add'>+	tmio_iowrite16(tmio_ioread16(ctl + CTL_SD_CARD_CLK_CTL) &amp; ~0x0100,</div><div class='add'>+	       ctl + CTL_SD_CARD_CLK_CTL);</div><div class='add'>+	msleep(10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tmio_mmc_clk_start(struct tmio_mmc_host *host)</div><div class='add'>+{</div><div class='add'>+	void __iomem *ctl = host-&gt;ctl;</div><div class='add'>+</div><div class='add'>+	tmio_iowrite16(tmio_ioread16(ctl + CTL_SD_CARD_CLK_CTL) | 0x0100,</div><div class='add'>+	       ctl + CTL_SD_CARD_CLK_CTL);</div><div class='add'>+	msleep(10);</div><div class='add'>+	tmio_iowrite16(0x0100, ctl + CTL_CLK_AND_WAIT_CTL);</div><div class='add'>+	msleep(10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reset(struct tmio_mmc_host *host)</div><div class='add'>+{</div><div class='add'>+	void __iomem *ctl = host-&gt;ctl;</div><div class='add'>+</div><div class='add'>+	/* FIXME - should we set stop clock reg here */</div><div class='add'>+	tmio_iowrite16(0x0000, ctl + CTL_RESET_SD);</div><div class='add'>+	tmio_iowrite16(0x0000, ctl + CTL_RESET_SDIO);</div><div class='add'>+	msleep(10);</div><div class='add'>+	tmio_iowrite16(0x0001, ctl + CTL_RESET_SD);</div><div class='add'>+	tmio_iowrite16(0x0001, ctl + CTL_RESET_SDIO);</div><div class='add'>+	msleep(10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+tmio_mmc_finish_request(struct tmio_mmc_host *host)</div><div class='add'>+{</div><div class='add'>+	struct mmc_request *mrq = host-&gt;mrq;</div><div class='add'>+</div><div class='add'>+	host-&gt;mrq = NULL;</div><div class='add'>+	host-&gt;cmd = NULL;</div><div class='add'>+	host-&gt;data = NULL;</div><div class='add'>+</div><div class='add'>+	mmc_request_done(host-&gt;mmc, mrq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* These are the bitmasks the tmio chip requires to implement the MMC response</div><div class='add'>+ * types. Note that R1 and R6 are the same in this scheme. */</div><div class='add'>+#define APP_CMD        0x0040</div><div class='add'>+#define RESP_NONE      0x0300</div><div class='add'>+#define RESP_R1        0x0400</div><div class='add'>+#define RESP_R1B       0x0500</div><div class='add'>+#define RESP_R2        0x0600</div><div class='add'>+#define RESP_R3        0x0700</div><div class='add'>+#define DATA_PRESENT   0x0800</div><div class='add'>+#define TRANSFER_READ  0x1000</div><div class='add'>+#define TRANSFER_MULTI 0x2000</div><div class='add'>+#define SECURITY_CMD   0x4000</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command *cmd)</div><div class='add'>+{</div><div class='add'>+	void __iomem *ctl = host-&gt;ctl;</div><div class='add'>+	struct mmc_data *data = host-&gt;data;</div><div class='add'>+	int c = cmd-&gt;opcode;</div><div class='add'>+</div><div class='add'>+	/* Command 12 is handled by hardware */</div><div class='add'>+	if (cmd-&gt;opcode == 12 &amp;&amp; !cmd-&gt;arg) {</div><div class='add'>+		tmio_iowrite16(0x001, ctl + CTL_STOP_INTERNAL_ACTION);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (mmc_resp_type(cmd)) {</div><div class='add'>+	case MMC_RSP_NONE: c |= RESP_NONE; break;</div><div class='add'>+	case MMC_RSP_R1:   c |= RESP_R1;   break;</div><div class='add'>+	case MMC_RSP_R1B:  c |= RESP_R1B;  break;</div><div class='add'>+	case MMC_RSP_R2:   c |= RESP_R2;   break;</div><div class='add'>+	case MMC_RSP_R3:   c |= RESP_R3;   break;</div><div class='add'>+	default:</div><div class='add'>+		pr_debug("Unknown response type %d\n", mmc_resp_type(cmd));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	host-&gt;cmd = cmd;</div><div class='add'>+</div><div class='add'>+/* FIXME - this seems to be ok comented out but the spec suggest this bit should</div><div class='add'>+ *         be set when issuing app commands.</div><div class='add'>+ *	if(cmd-&gt;flags &amp; MMC_FLAG_ACMD)</div><div class='add'>+ *		c |= APP_CMD;</div><div class='add'>+ */</div><div class='add'>+	if (data) {</div><div class='add'>+		c |= DATA_PRESENT;</div><div class='add'>+		if (data-&gt;blocks &gt; 1) {</div><div class='add'>+			tmio_iowrite16(0x100, ctl + CTL_STOP_INTERNAL_ACTION);</div><div class='add'>+			c |= TRANSFER_MULTI;</div><div class='add'>+		}</div><div class='add'>+		if (data-&gt;flags &amp; MMC_DATA_READ)</div><div class='add'>+			c |= TRANSFER_READ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	enable_mmc_irqs(ctl, TMIO_MASK_CMD);</div><div class='add'>+</div><div class='add'>+	/* Fire off the command */</div><div class='add'>+	tmio_iowrite32(cmd-&gt;arg, ctl + CTL_ARG_REG);</div><div class='add'>+	tmio_iowrite16(c, ctl + CTL_SD_CMD);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This chip always returns (at least?) as much data as you ask for.</div><div class='add'>+ * I'm unsure what happens if you ask for less than a block. This should be</div><div class='add'>+ * looked into to ensure that a funny length read doesnt hose the controller.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static inline void tmio_mmc_pio_irq(struct tmio_mmc_host *host)</div><div class='add'>+{</div><div class='add'>+	void __iomem *ctl = host-&gt;ctl;</div><div class='add'>+	struct mmc_data *data = host-&gt;data;</div><div class='add'>+	unsigned short *buf;</div><div class='add'>+	unsigned int count;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!data) {</div><div class='add'>+		pr_debug("Spurious PIO IRQ\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf = (unsigned short *)(tmio_mmc_kmap_atomic(host, &amp;flags) +</div><div class='add'>+	      host-&gt;sg_off);</div><div class='add'>+</div><div class='add'>+	count = host-&gt;sg_ptr-&gt;length - host-&gt;sg_off;</div><div class='add'>+	if (count &gt; data-&gt;blksz)</div><div class='add'>+		count = data-&gt;blksz;</div><div class='add'>+</div><div class='add'>+	pr_debug("count: %08x offset: %08x flags %08x\n",</div><div class='add'>+	    count, host-&gt;sg_off, data-&gt;flags);</div><div class='add'>+</div><div class='add'>+	/* Transfer the data */</div><div class='add'>+	if (data-&gt;flags &amp; MMC_DATA_READ)</div><div class='add'>+		tmio_ioread16_rep(ctl + CTL_SD_DATA_PORT, buf, count &gt;&gt; 1);</div><div class='add'>+	else</div><div class='add'>+		tmio_iowrite16_rep(ctl + CTL_SD_DATA_PORT, buf, count &gt;&gt; 1);</div><div class='add'>+</div><div class='add'>+	host-&gt;sg_off += count;</div><div class='add'>+</div><div class='add'>+	tmio_mmc_kunmap_atomic(host, &amp;flags);</div><div class='add'>+</div><div class='add'>+	if (host-&gt;sg_off == host-&gt;sg_ptr-&gt;length)</div><div class='add'>+		tmio_mmc_next_sg(host);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void tmio_mmc_data_irq(struct tmio_mmc_host *host)</div><div class='add'>+{</div><div class='add'>+	void __iomem *ctl = host-&gt;ctl;</div><div class='add'>+	struct mmc_data *data = host-&gt;data;</div><div class='add'>+	struct mmc_command *stop = data-&gt;stop;</div><div class='add'>+</div><div class='add'>+	host-&gt;data = NULL;</div><div class='add'>+</div><div class='add'>+	if (!data) {</div><div class='add'>+		pr_debug("Spurious data end IRQ\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FIXME - return correct transfer count on errors */</div><div class='add'>+	if (!data-&gt;error)</div><div class='add'>+		data-&gt;bytes_xfered = data-&gt;blocks * data-&gt;blksz;</div><div class='add'>+	else</div><div class='add'>+		data-&gt;bytes_xfered = 0;</div><div class='add'>+</div><div class='add'>+	pr_debug("Completed data request\n");</div><div class='add'>+</div><div class='add'>+	/*FIXME - other drivers allow an optional stop command of any given type</div><div class='add'>+	 *        which we dont do, as the chip can auto generate them.</div><div class='add'>+	 *        Perhaps we can be smarter about when to use auto CMD12 and</div><div class='add'>+	 *        only issue the auto request when we know this is the desired</div><div class='add'>+	 *        stop command, allowing fallback to the stop command the</div><div class='add'>+	 *        upper layers expect. For now, we do what works.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (data-&gt;flags &amp; MMC_DATA_READ)</div><div class='add'>+		disable_mmc_irqs(ctl, TMIO_MASK_READOP);</div><div class='add'>+	else</div><div class='add'>+		disable_mmc_irqs(ctl, TMIO_MASK_WRITEOP);</div><div class='add'>+</div><div class='add'>+	if (stop) {</div><div class='add'>+		if (stop-&gt;opcode == 12 &amp;&amp; !stop-&gt;arg)</div><div class='add'>+			tmio_iowrite16(0x000, ctl + CTL_STOP_INTERNAL_ACTION);</div><div class='add'>+		else</div><div class='add'>+			BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmio_mmc_finish_request(host);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void tmio_mmc_cmd_irq(struct tmio_mmc_host *host,</div><div class='add'>+	unsigned int stat)</div><div class='add'>+{</div><div class='add'>+	void __iomem *ctl = host-&gt;ctl, *addr;</div><div class='add'>+	struct mmc_command *cmd = host-&gt;cmd;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!host-&gt;cmd) {</div><div class='add'>+		pr_debug("Spurious CMD irq\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	host-&gt;cmd = NULL;</div><div class='add'>+</div><div class='add'>+	/* This controller is sicker than the PXA one. Not only do we need to</div><div class='add'>+	 * drop the top 8 bits of the first response word, we also need to</div><div class='add'>+	 * modify the order of the response for short response command types.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (i = 3, addr = ctl + CTL_RESPONSE ; i &gt;= 0 ; i--, addr += 4)</div><div class='add'>+		cmd-&gt;resp[i] = tmio_ioread32(addr);</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;flags &amp;  MMC_RSP_136) {</div><div class='add'>+		cmd-&gt;resp[0] = (cmd-&gt;resp[0] &lt;&lt; 8) | (cmd-&gt;resp[1] &gt;&gt; 24);</div><div class='add'>+		cmd-&gt;resp[1] = (cmd-&gt;resp[1] &lt;&lt; 8) | (cmd-&gt;resp[2] &gt;&gt; 24);</div><div class='add'>+		cmd-&gt;resp[2] = (cmd-&gt;resp[2] &lt;&lt; 8) | (cmd-&gt;resp[3] &gt;&gt; 24);</div><div class='add'>+		cmd-&gt;resp[3] &lt;&lt;= 8;</div><div class='add'>+	} else if (cmd-&gt;flags &amp; MMC_RSP_R3) {</div><div class='add'>+		cmd-&gt;resp[0] = cmd-&gt;resp[3];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (stat &amp; TMIO_STAT_CMDTIMEOUT)</div><div class='add'>+		cmd-&gt;error = -ETIMEDOUT;</div><div class='add'>+	else if (stat &amp; TMIO_STAT_CRCFAIL &amp;&amp; cmd-&gt;flags &amp; MMC_RSP_CRC)</div><div class='add'>+		cmd-&gt;error = -EILSEQ;</div><div class='add'>+</div><div class='add'>+	/* If there is data to handle we enable data IRQs here, and</div><div class='add'>+	 * we will ultimatley finish the request in the data_end handler.</div><div class='add'>+	 * If theres no data or we encountered an error, finish now.</div><div class='add'>+	 */</div><div class='add'>+	if (host-&gt;data &amp;&amp; !cmd-&gt;error) {</div><div class='add'>+		if (host-&gt;data-&gt;flags &amp; MMC_DATA_READ)</div><div class='add'>+			enable_mmc_irqs(ctl, TMIO_MASK_READOP);</div><div class='add'>+		else</div><div class='add'>+			enable_mmc_irqs(ctl, TMIO_MASK_WRITEOP);</div><div class='add'>+	} else {</div><div class='add'>+		tmio_mmc_finish_request(host);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static irqreturn_t tmio_mmc_irq(int irq, void *devid)</div><div class='add'>+{</div><div class='add'>+	struct tmio_mmc_host *host = devid;</div><div class='add'>+	void __iomem *ctl = host-&gt;ctl;</div><div class='add'>+	unsigned int ireg, irq_mask, status;</div><div class='add'>+</div><div class='add'>+	pr_debug("MMC IRQ begin\n");</div><div class='add'>+</div><div class='add'>+	status = tmio_ioread32(ctl + CTL_STATUS);</div><div class='add'>+	irq_mask = tmio_ioread32(ctl + CTL_IRQ_MASK);</div><div class='add'>+	ireg = status &amp; TMIO_MASK_IRQ &amp; ~irq_mask;</div><div class='add'>+</div><div class='add'>+	pr_debug_status(status);</div><div class='add'>+	pr_debug_status(ireg);</div><div class='add'>+</div><div class='add'>+	if (!ireg) {</div><div class='add'>+		disable_mmc_irqs(ctl, status &amp; ~irq_mask);</div><div class='add'>+</div><div class='add'>+		pr_debug("tmio_mmc: Spurious irq, disabling! "</div><div class='add'>+			"0x%08x 0x%08x 0x%08x\n", status, irq_mask, ireg);</div><div class='add'>+		pr_debug_status(status);</div><div class='add'>+</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (ireg) {</div><div class='add'>+		/* Card insert / remove attempts */</div><div class='add'>+		if (ireg &amp; (TMIO_STAT_CARD_INSERT | TMIO_STAT_CARD_REMOVE)) {</div><div class='add'>+			ack_mmc_irqs(ctl, TMIO_STAT_CARD_INSERT |</div><div class='add'>+				TMIO_STAT_CARD_REMOVE);</div><div class='add'>+			mmc_detect_change(host-&gt;mmc, 0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* CRC and other errors */</div><div class='add'>+/*		if (ireg &amp; TMIO_STAT_ERR_IRQ)</div><div class='add'>+ *			handled |= tmio_error_irq(host, irq, stat);</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+		/* Command completion */</div><div class='add'>+		if (ireg &amp; TMIO_MASK_CMD) {</div><div class='add'>+			ack_mmc_irqs(ctl, TMIO_MASK_CMD);</div><div class='add'>+			tmio_mmc_cmd_irq(host, status);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Data transfer */</div><div class='add'>+		if (ireg &amp; (TMIO_STAT_RXRDY | TMIO_STAT_TXRQ)) {</div><div class='add'>+			ack_mmc_irqs(ctl, TMIO_STAT_RXRDY | TMIO_STAT_TXRQ);</div><div class='add'>+			tmio_mmc_pio_irq(host);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Data transfer completion */</div><div class='add'>+		if (ireg &amp; TMIO_STAT_DATAEND) {</div><div class='add'>+			ack_mmc_irqs(ctl, TMIO_STAT_DATAEND);</div><div class='add'>+			tmio_mmc_data_irq(host);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check status - keep going until we've handled it all */</div><div class='add'>+		status = tmio_ioread32(ctl + CTL_STATUS);</div><div class='add'>+		irq_mask = tmio_ioread32(ctl + CTL_IRQ_MASK);</div><div class='add'>+		ireg = status &amp; TMIO_MASK_IRQ &amp; ~irq_mask;</div><div class='add'>+</div><div class='add'>+		pr_debug("Status at end of loop: %08x\n", status);</div><div class='add'>+		pr_debug_status(status);</div><div class='add'>+	}</div><div class='add'>+	pr_debug("MMC IRQ end\n");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmio_mmc_start_data(struct tmio_mmc_host *host,</div><div class='add'>+	struct mmc_data *data)</div><div class='add'>+{</div><div class='add'>+	void __iomem *ctl = host-&gt;ctl;</div><div class='add'>+</div><div class='add'>+	pr_debug("setup data transfer: blocksize %08x  nr_blocks %d\n",</div><div class='add'>+	    data-&gt;blksz, data-&gt;blocks);</div><div class='add'>+</div><div class='add'>+	/* Hardware cannot perform 1 and 2 byte requests in 4 bit mode */</div><div class='add'>+	if (data-&gt;blksz &lt; 4 &amp;&amp; host-&gt;mmc-&gt;ios.bus_width == MMC_BUS_WIDTH_4) {</div><div class='add'>+		printk(KERN_ERR "%s: %d byte block unsupported in 4 bit mode\n",</div><div class='add'>+			mmc_hostname(host-&gt;mmc), data-&gt;blksz);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmio_mmc_init_sg(host, data);</div><div class='add'>+	host-&gt;data = data;</div><div class='add'>+</div><div class='add'>+	/* Set transfer length / blocksize */</div><div class='add'>+	tmio_iowrite16(data-&gt;blksz,  ctl + CTL_SD_XFER_LEN);</div><div class='add'>+	tmio_iowrite16(data-&gt;blocks, ctl + CTL_XFER_BLK_COUNT);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Process requests from the MMC layer */</div><div class='add'>+static void tmio_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='add'>+{</div><div class='add'>+	struct tmio_mmc_host *host = mmc_priv(mmc);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (host-&gt;mrq)</div><div class='add'>+		pr_debug("request not null\n");</div><div class='add'>+</div><div class='add'>+	host-&gt;mrq = mrq;</div><div class='add'>+</div><div class='add'>+	if (mrq-&gt;data) {</div><div class='add'>+		ret = tmio_mmc_start_data(host, mrq-&gt;data);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = tmio_mmc_start_command(host, mrq-&gt;cmd);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	mrq-&gt;cmd-&gt;error = ret;</div><div class='add'>+	mmc_request_done(mmc, mrq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set MMC clock / power.</div><div class='add'>+ * Note: This controller uses a simple divider scheme therefore it cannot</div><div class='add'>+ * run a MMC card at full speed (20MHz). The max clock is 24MHz on SD, but as</div><div class='add'>+ * MMC wont run that fast, it has to be clocked at 12MHz which is the next</div><div class='add'>+ * slowest setting.</div><div class='add'>+ */</div><div class='add'>+static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='add'>+{</div><div class='add'>+	struct tmio_mmc_host *host = mmc_priv(mmc);</div><div class='add'>+	void __iomem *cnf = host-&gt;cnf;</div><div class='add'>+	void __iomem *ctl = host-&gt;ctl;</div><div class='add'>+</div><div class='add'>+	if (ios-&gt;clock)</div><div class='add'>+		tmio_mmc_set_clock(host, ios-&gt;clock);</div><div class='add'>+</div><div class='add'>+	/* Power sequence - OFF -&gt; ON -&gt; UP */</div><div class='add'>+	switch (ios-&gt;power_mode) {</div><div class='add'>+	case MMC_POWER_OFF: /* power down SD bus */</div><div class='add'>+		tmio_iowrite8(0x00, cnf + CNF_PWR_CTL_2);</div><div class='add'>+		tmio_mmc_clk_stop(host);</div><div class='add'>+		break;</div><div class='add'>+	case MMC_POWER_ON: /* power up SD bus */</div><div class='add'>+</div><div class='add'>+		tmio_iowrite8(0x02, cnf + CNF_PWR_CTL_2);</div><div class='add'>+		break;</div><div class='add'>+	case MMC_POWER_UP: /* start bus clock */</div><div class='add'>+		tmio_mmc_clk_start(host);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ios-&gt;bus_width) {</div><div class='add'>+	case MMC_BUS_WIDTH_1:</div><div class='add'>+		tmio_iowrite16(0x80e0, ctl + CTL_SD_MEM_CARD_OPT);</div><div class='add'>+	break;</div><div class='add'>+	case MMC_BUS_WIDTH_4:</div><div class='add'>+		tmio_iowrite16(0x00e0, ctl + CTL_SD_MEM_CARD_OPT);</div><div class='add'>+	break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Let things settle. delay taken from winCE driver */</div><div class='add'>+	udelay(140);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmio_mmc_get_ro(struct mmc_host *mmc)</div><div class='add'>+{</div><div class='add'>+	struct tmio_mmc_host *host = mmc_priv(mmc);</div><div class='add'>+	void __iomem *ctl = host-&gt;ctl;</div><div class='add'>+</div><div class='add'>+	return (tmio_ioread16(ctl + CTL_STATUS) &amp; TMIO_STAT_WRPROTECT) ? 0 : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mmc_host_ops tmio_mmc_ops = {</div><div class='add'>+	.request	= tmio_mmc_request,</div><div class='add'>+	.set_ios	= tmio_mmc_set_ios,</div><div class='add'>+	.get_ro         = tmio_mmc_get_ro,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int tmio_mmc_suspend(struct platform_device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct mfd_cell	*cell = (struct mfd_cell *)dev-&gt;dev.platform_data;</div><div class='add'>+	struct mmc_host *mmc = platform_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mmc_suspend_host(mmc, state);</div><div class='add'>+</div><div class='add'>+	/* Tell MFD core it can disable us now.*/</div><div class='add'>+	if (!ret &amp;&amp; cell-&gt;disable)</div><div class='add'>+		cell-&gt;disable(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmio_mmc_resume(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct mfd_cell	*cell = (struct mfd_cell *)dev-&gt;dev.platform_data;</div><div class='add'>+	struct mmc_host *mmc = platform_get_drvdata(dev);</div><div class='add'>+	struct tmio_mmc_host *host = mmc_priv(mmc);</div><div class='add'>+	void __iomem *cnf = host-&gt;cnf;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Enable the MMC/SD Control registers */</div><div class='add'>+	tmio_iowrite16(SDCREN, cnf + CNF_CMD);</div><div class='add'>+	tmio_iowrite32(dev-&gt;resource[0].start &amp; 0xfffe, cnf + CNF_CTL_BASE);</div><div class='add'>+</div><div class='add'>+	/* Tell the MFD core we are ready to be enabled */</div><div class='add'>+	if (cell-&gt;enable) {</div><div class='add'>+		ret = cell-&gt;enable(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mmc_resume_host(mmc);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define tmio_mmc_suspend NULL</div><div class='add'>+#define tmio_mmc_resume NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int __devinit tmio_mmc_probe(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct mfd_cell	*cell = (struct mfd_cell *)dev-&gt;dev.platform_data;</div><div class='add'>+	struct resource *res_ctl, *res_cnf;</div><div class='add'>+	struct tmio_mmc_host *host;</div><div class='add'>+	struct mmc_host *mmc;</div><div class='add'>+	int ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;num_resources != 3)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	res_ctl = platform_get_resource(dev, IORESOURCE_MEM, 0);</div><div class='add'>+	res_cnf = platform_get_resource(dev, IORESOURCE_MEM, 1);</div><div class='add'>+	if (!res_ctl || !res_cnf) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mmc = mmc_alloc_host(sizeof(struct tmio_mmc_host), &amp;dev-&gt;dev);</div><div class='add'>+	if (!mmc)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	host = mmc_priv(mmc);</div><div class='add'>+	host-&gt;mmc = mmc;</div><div class='add'>+	platform_set_drvdata(dev, mmc);</div><div class='add'>+</div><div class='add'>+	host-&gt;ctl = ioremap(res_ctl-&gt;start, res_ctl-&gt;end - res_ctl-&gt;start);</div><div class='add'>+	if (!host-&gt;ctl)</div><div class='add'>+		goto host_free;</div><div class='add'>+</div><div class='add'>+	host-&gt;cnf = ioremap(res_cnf-&gt;start, res_cnf-&gt;end - res_cnf-&gt;start);</div><div class='add'>+	if (!host-&gt;cnf)</div><div class='add'>+		goto unmap_ctl;</div><div class='add'>+</div><div class='add'>+	mmc-&gt;ops = &amp;tmio_mmc_ops;</div><div class='add'>+	mmc-&gt;caps = MMC_CAP_4_BIT_DATA;</div><div class='add'>+	mmc-&gt;f_min = 46875; /* 24000000 / 512 */</div><div class='add'>+	mmc-&gt;f_max = 24000000;</div><div class='add'>+	mmc-&gt;ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;</div><div class='add'>+</div><div class='add'>+	/* Enable the MMC/SD Control registers */</div><div class='add'>+	tmio_iowrite16(SDCREN, host-&gt;cnf + CNF_CMD);</div><div class='add'>+	tmio_iowrite32(dev-&gt;resource[0].start &amp; 0xfffe,</div><div class='add'>+		host-&gt;cnf + CNF_CTL_BASE);</div><div class='add'>+</div><div class='add'>+	/* Tell the MFD core we are ready to be enabled */</div><div class='add'>+	if (cell-&gt;enable) {</div><div class='add'>+		ret = cell-&gt;enable(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto unmap_cnf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable SD power during suspend */</div><div class='add'>+	tmio_iowrite8(0x01, host-&gt;cnf + CNF_PWR_CTL_3);</div><div class='add'>+</div><div class='add'>+	/* The below is required but why? FIXME */</div><div class='add'>+	tmio_iowrite8(0x1f, host-&gt;cnf + CNF_STOP_CLK_CTL);</div><div class='add'>+</div><div class='add'>+	/* Power down SD bus*/</div><div class='add'>+	tmio_iowrite8(0x0,  host-&gt;cnf + CNF_PWR_CTL_2);</div><div class='add'>+</div><div class='add'>+	tmio_mmc_clk_stop(host);</div><div class='add'>+	reset(host);</div><div class='add'>+</div><div class='add'>+	ret = platform_get_irq(dev, 0);</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		host-&gt;irq = ret;</div><div class='add'>+	else</div><div class='add'>+		goto unmap_cnf;</div><div class='add'>+</div><div class='add'>+	disable_mmc_irqs(host-&gt;ctl, TMIO_MASK_ALL);</div><div class='add'>+</div><div class='add'>+	ret = request_irq(host-&gt;irq, tmio_mmc_irq, IRQF_DISABLED, "tmio-mmc",</div><div class='add'>+		host);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unmap_cnf;</div><div class='add'>+</div><div class='add'>+	set_irq_type(host-&gt;irq, IRQ_TYPE_EDGE_FALLING);</div><div class='add'>+</div><div class='add'>+	mmc_add_host(mmc);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s at 0x%08lx irq %d\n", mmc_hostname(host-&gt;mmc),</div><div class='add'>+	       (unsigned long)host-&gt;ctl, host-&gt;irq);</div><div class='add'>+</div><div class='add'>+	/* Unmask the IRQs we want to know about */</div><div class='add'>+	enable_mmc_irqs(host-&gt;ctl,  TMIO_MASK_IRQ);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unmap_cnf:</div><div class='add'>+	iounmap(host-&gt;cnf);</div><div class='add'>+unmap_ctl:</div><div class='add'>+	iounmap(host-&gt;ctl);</div><div class='add'>+host_free:</div><div class='add'>+	mmc_free_host(mmc);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit tmio_mmc_remove(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct mmc_host *mmc = platform_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(dev, NULL);</div><div class='add'>+</div><div class='add'>+	if (mmc) {</div><div class='add'>+		struct tmio_mmc_host *host = mmc_priv(mmc);</div><div class='add'>+		mmc_remove_host(mmc);</div><div class='add'>+		mmc_free_host(mmc);</div><div class='add'>+		free_irq(host-&gt;irq, host);</div><div class='add'>+		iounmap(host-&gt;ctl);</div><div class='add'>+		iounmap(host-&gt;cnf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ------------------- device registration ----------------------- */</div><div class='add'>+</div><div class='add'>+static struct platform_driver tmio_mmc_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "tmio-mmc",</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe = tmio_mmc_probe,</div><div class='add'>+	.remove = __devexit_p(tmio_mmc_remove),</div><div class='add'>+	.suspend = tmio_mmc_suspend,</div><div class='add'>+	.resume = tmio_mmc_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __init tmio_mmc_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;tmio_mmc_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit tmio_mmc_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;tmio_mmc_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(tmio_mmc_init);</div><div class='add'>+module_exit(tmio_mmc_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Toshiba TMIO SD/MMC driver");</div><div class='add'>+MODULE_AUTHOR("Ian Molton &lt;spyro@f2s.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS("platform:tmio-mmc");</div><div class='head'>diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h<br/>new file mode 100644<br/>index 000000000000..ba2b4240a86a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/tmio_mmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mmc/host/tmio_mmc.h</a></div><div class='hunk'>@@ -0,0 +1,194 @@</div><div class='add'>+/* Definitons for use with the tmio_mmc.c</div><div class='add'>+ *</div><div class='add'>+ * (c) 2004 Ian Molton &lt;spyro@f2s.com&gt;</div><div class='add'>+ * (c) 2007 Ian Molton &lt;spyro@f2s.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#define CNF_CMD     0x04</div><div class='add'>+#define CNF_CTL_BASE   0x10</div><div class='add'>+#define CNF_INT_PIN  0x3d</div><div class='add'>+#define CNF_STOP_CLK_CTL 0x40</div><div class='add'>+#define CNF_GCLK_CTL 0x41</div><div class='add'>+#define CNF_SD_CLK_MODE 0x42</div><div class='add'>+#define CNF_PIN_STATUS 0x44</div><div class='add'>+#define CNF_PWR_CTL_1 0x48</div><div class='add'>+#define CNF_PWR_CTL_2 0x49</div><div class='add'>+#define CNF_PWR_CTL_3 0x4a</div><div class='add'>+#define CNF_CARD_DETECT_MODE 0x4c</div><div class='add'>+#define CNF_SD_SLOT 0x50</div><div class='add'>+#define CNF_EXT_GCLK_CTL_1 0xf0</div><div class='add'>+#define CNF_EXT_GCLK_CTL_2 0xf1</div><div class='add'>+#define CNF_EXT_GCLK_CTL_3 0xf9</div><div class='add'>+#define CNF_SD_LED_EN_1 0xfa</div><div class='add'>+#define CNF_SD_LED_EN_2 0xfe</div><div class='add'>+</div><div class='add'>+#define   SDCREN 0x2   /* Enable access to MMC CTL regs. (flag in COMMAND_REG)*/</div><div class='add'>+</div><div class='add'>+#define CTL_SD_CMD 0x00</div><div class='add'>+#define CTL_ARG_REG 0x04</div><div class='add'>+#define CTL_STOP_INTERNAL_ACTION 0x08</div><div class='add'>+#define CTL_XFER_BLK_COUNT 0xa</div><div class='add'>+#define CTL_RESPONSE 0x0c</div><div class='add'>+#define CTL_STATUS 0x1c</div><div class='add'>+#define CTL_IRQ_MASK 0x20</div><div class='add'>+#define CTL_SD_CARD_CLK_CTL 0x24</div><div class='add'>+#define CTL_SD_XFER_LEN 0x26</div><div class='add'>+#define CTL_SD_MEM_CARD_OPT 0x28</div><div class='add'>+#define CTL_SD_ERROR_DETAIL_STATUS 0x2c</div><div class='add'>+#define CTL_SD_DATA_PORT 0x30</div><div class='add'>+#define CTL_TRANSACTION_CTL 0x34</div><div class='add'>+#define CTL_RESET_SD 0xe0</div><div class='add'>+#define CTL_SDIO_REGS 0x100</div><div class='add'>+#define CTL_CLK_AND_WAIT_CTL 0x138</div><div class='add'>+#define CTL_RESET_SDIO 0x1e0</div><div class='add'>+</div><div class='add'>+/* Definitions for values the CTRL_STATUS register can take. */</div><div class='add'>+#define TMIO_STAT_CMDRESPEND    0x00000001</div><div class='add'>+#define TMIO_STAT_DATAEND       0x00000004</div><div class='add'>+#define TMIO_STAT_CARD_REMOVE   0x00000008</div><div class='add'>+#define TMIO_STAT_CARD_INSERT   0x00000010</div><div class='add'>+#define TMIO_STAT_SIGSTATE      0x00000020</div><div class='add'>+#define TMIO_STAT_WRPROTECT     0x00000080</div><div class='add'>+#define TMIO_STAT_CARD_REMOVE_A 0x00000100</div><div class='add'>+#define TMIO_STAT_CARD_INSERT_A 0x00000200</div><div class='add'>+#define TMIO_STAT_SIGSTATE_A    0x00000400</div><div class='add'>+#define TMIO_STAT_CMD_IDX_ERR   0x00010000</div><div class='add'>+#define TMIO_STAT_CRCFAIL       0x00020000</div><div class='add'>+#define TMIO_STAT_STOPBIT_ERR   0x00040000</div><div class='add'>+#define TMIO_STAT_DATATIMEOUT   0x00080000</div><div class='add'>+#define TMIO_STAT_RXOVERFLOW    0x00100000</div><div class='add'>+#define TMIO_STAT_TXUNDERRUN    0x00200000</div><div class='add'>+#define TMIO_STAT_CMDTIMEOUT    0x00400000</div><div class='add'>+#define TMIO_STAT_RXRDY         0x01000000</div><div class='add'>+#define TMIO_STAT_TXRQ          0x02000000</div><div class='add'>+#define TMIO_STAT_ILL_FUNC      0x20000000</div><div class='add'>+#define TMIO_STAT_CMD_BUSY      0x40000000</div><div class='add'>+#define TMIO_STAT_ILL_ACCESS    0x80000000</div><div class='add'>+</div><div class='add'>+/* Define some IRQ masks */</div><div class='add'>+/* This is the mask used at reset by the chip */</div><div class='add'>+#define TMIO_MASK_ALL           0x837f031d</div><div class='add'>+#define TMIO_MASK_READOP  (TMIO_STAT_RXRDY | TMIO_STAT_DATAEND | \</div><div class='add'>+		TMIO_STAT_CARD_REMOVE | TMIO_STAT_CARD_INSERT)</div><div class='add'>+#define TMIO_MASK_WRITEOP (TMIO_STAT_TXRQ | TMIO_STAT_DATAEND | \</div><div class='add'>+		TMIO_STAT_CARD_REMOVE | TMIO_STAT_CARD_INSERT)</div><div class='add'>+#define TMIO_MASK_CMD     (TMIO_STAT_CMDRESPEND | TMIO_STAT_CMDTIMEOUT | \</div><div class='add'>+		TMIO_STAT_CARD_REMOVE | TMIO_STAT_CARD_INSERT)</div><div class='add'>+#define TMIO_MASK_IRQ     (TMIO_MASK_READOP | TMIO_MASK_WRITEOP | TMIO_MASK_CMD)</div><div class='add'>+</div><div class='add'>+#define enable_mmc_irqs(ctl, i) \</div><div class='add'>+	do { \</div><div class='add'>+		u32 mask;\</div><div class='add'>+		mask  = tmio_ioread32((ctl) + CTL_IRQ_MASK); \</div><div class='add'>+		mask &amp;= ~((i) &amp; TMIO_MASK_IRQ); \</div><div class='add'>+		tmio_iowrite32(mask, (ctl) + CTL_IRQ_MASK); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define disable_mmc_irqs(ctl, i) \</div><div class='add'>+	do { \</div><div class='add'>+		u32 mask;\</div><div class='add'>+		mask  = tmio_ioread32((ctl) + CTL_IRQ_MASK); \</div><div class='add'>+		mask |= ((i) &amp; TMIO_MASK_IRQ); \</div><div class='add'>+		tmio_iowrite32(mask, (ctl) + CTL_IRQ_MASK); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define ack_mmc_irqs(ctl, i) \</div><div class='add'>+	do { \</div><div class='add'>+		u32 mask;\</div><div class='add'>+		mask  = tmio_ioread32((ctl) + CTL_STATUS); \</div><div class='add'>+		mask &amp;= ~((i) &amp; TMIO_MASK_IRQ); \</div><div class='add'>+		tmio_iowrite32(mask, (ctl) + CTL_STATUS); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct tmio_mmc_host {</div><div class='add'>+	void __iomem *cnf;</div><div class='add'>+	void __iomem *ctl;</div><div class='add'>+	struct mmc_command      *cmd;</div><div class='add'>+	struct mmc_request      *mrq;</div><div class='add'>+	struct mmc_data         *data;</div><div class='add'>+	struct mmc_host         *mmc;</div><div class='add'>+	int                     irq;</div><div class='add'>+</div><div class='add'>+	/* pio related stuff */</div><div class='add'>+	struct scatterlist      *sg_ptr;</div><div class='add'>+	unsigned int            sg_len;</div><div class='add'>+	unsigned int            sg_off;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/blkdev.h&gt;</div><div class='add'>+</div><div class='add'>+static inline void tmio_mmc_init_sg(struct tmio_mmc_host *host,</div><div class='add'>+	struct mmc_data *data)</div><div class='add'>+{</div><div class='add'>+	host-&gt;sg_len = data-&gt;sg_len;</div><div class='add'>+	host-&gt;sg_ptr = data-&gt;sg;</div><div class='add'>+	host-&gt;sg_off = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int tmio_mmc_next_sg(struct tmio_mmc_host *host)</div><div class='add'>+{</div><div class='add'>+	host-&gt;sg_ptr = sg_next(host-&gt;sg_ptr);</div><div class='add'>+	host-&gt;sg_off = 0;</div><div class='add'>+	return --host-&gt;sg_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline char *tmio_mmc_kmap_atomic(struct tmio_mmc_host *host,</div><div class='add'>+	unsigned long *flags)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sg = host-&gt;sg_ptr;</div><div class='add'>+</div><div class='add'>+	local_irq_save(*flags);</div><div class='add'>+	return kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg-&gt;offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void tmio_mmc_kunmap_atomic(struct tmio_mmc_host *host,</div><div class='add'>+	unsigned long *flags)</div><div class='add'>+{</div><div class='add'>+	kunmap_atomic(sg_page(host-&gt;sg_ptr), KM_BIO_SRC_IRQ);</div><div class='add'>+	local_irq_restore(*flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MMC_DEBUG</div><div class='add'>+</div><div class='add'>+#define STATUS_TO_TEXT(a) \</div><div class='add'>+	do { \</div><div class='add'>+		if (status &amp; TMIO_STAT_##a) \</div><div class='add'>+			printk(#a); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+void pr_debug_status(u32 status)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_DEBUG "status: %08x = ", status);</div><div class='add'>+	STATUS_TO_TEXT(CARD_REMOVE);</div><div class='add'>+	STATUS_TO_TEXT(CARD_INSERT);</div><div class='add'>+	STATUS_TO_TEXT(SIGSTATE);</div><div class='add'>+	STATUS_TO_TEXT(WRPROTECT);</div><div class='add'>+	STATUS_TO_TEXT(CARD_REMOVE_A);</div><div class='add'>+	STATUS_TO_TEXT(CARD_INSERT_A);</div><div class='add'>+	STATUS_TO_TEXT(SIGSTATE_A);</div><div class='add'>+	STATUS_TO_TEXT(CMD_IDX_ERR);</div><div class='add'>+	STATUS_TO_TEXT(STOPBIT_ERR);</div><div class='add'>+	STATUS_TO_TEXT(ILL_FUNC);</div><div class='add'>+	STATUS_TO_TEXT(CMD_BUSY);</div><div class='add'>+	STATUS_TO_TEXT(CMDRESPEND);</div><div class='add'>+	STATUS_TO_TEXT(DATAEND);</div><div class='add'>+	STATUS_TO_TEXT(CRCFAIL);</div><div class='add'>+	STATUS_TO_TEXT(DATATIMEOUT);</div><div class='add'>+	STATUS_TO_TEXT(CMDTIMEOUT);</div><div class='add'>+	STATUS_TO_TEXT(RXOVERFLOW);</div><div class='add'>+	STATUS_TO_TEXT(TXUNDERRUN);</div><div class='add'>+	STATUS_TO_TEXT(RXRDY);</div><div class='add'>+	STATUS_TO_TEXT(TXRQ);</div><div class='add'>+	STATUS_TO_TEXT(ILL_ACCESS);</div><div class='add'>+	printk("\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define pr_debug_status(s)  do { } while (0)</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c<br/>index dbba5abf0db8..f84ab6182148 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/jedec_probe.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/chips/jedec_probe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/jedec_probe.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/chips/jedec_probe.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* AMD */</div><div class='del'>-#define AM29DL800BB	0x22C8</div><div class='add'>+#define AM29DL800BB	0x22CB</div><div class='ctx'> #define AM29DL800BT	0x224A</div><div class='ctx'> </div><div class='ctx'> #define AM29F800BB	0x2258</div><div class='head'>diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c<br/>index 54e36bfc2c3b..8bd0dea6885f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/mtd_dataflash.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/devices/mtd_dataflash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/mtd_dataflash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/devices/mtd_dataflash.c</a></div><div class='hunk'>@@ -15,6 +15,8 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spi/flash.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -487,9 +489,8 @@ add_dataflash(struct spi_device *spi, char *name,</div><div class='ctx'> 	device-&gt;write = dataflash_write;</div><div class='ctx'> 	device-&gt;priv = priv;</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;spi-&gt;dev, "%s (%d KBytes) pagesize %d bytes, "</div><div class='del'>-		"erasesize %d bytes\n", name, device-&gt;size/1024,</div><div class='del'>-		 pagesize, pagesize * 8);	/* 8 pages = 1 block */</div><div class='add'>+	dev_info(&amp;spi-&gt;dev, "%s (%d KBytes) pagesize %d bytes\n",</div><div class='add'>+			name, DIV_ROUND_UP(device-&gt;size, 1024), pagesize);</div><div class='ctx'> 	dev_set_drvdata(&amp;spi-&gt;dev, priv);</div><div class='ctx'> </div><div class='ctx'> 	if (mtd_has_partitions()) {</div><div class='hunk'>@@ -518,65 +519,57 @@ add_dataflash(struct spi_device *spi, char *name,</div><div class='ctx'> 	return add_mtd_device(device) == 1 ? -ENODEV : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Detect and initialize DataFlash device:</div><div class='del'>- *</div><div class='del'>- *   Device      Density         ID code          #Pages PageSize  Offset</div><div class='del'>- *   AT45DB011B  1Mbit   (128K)  xx0011xx (0x0c)    512    264      9</div><div class='del'>- *   AT45DB021B  2Mbit   (256K)  xx0101xx (0x14)   1024    264      9</div><div class='del'>- *   AT45DB041B  4Mbit   (512K)  xx0111xx (0x1c)   2048    264      9</div><div class='del'>- *   AT45DB081B  8Mbit   (1M)    xx1001xx (0x24)   4096    264      9</div><div class='del'>- *   AT45DB0161B 16Mbit  (2M)    xx1011xx (0x2c)   4096    528     10</div><div class='del'>- *   AT45DB0321B 32Mbit  (4M)    xx1101xx (0x34)   8192    528     10</div><div class='del'>- *   AT45DB0642  64Mbit  (8M)    xx111xxx (0x3c)   8192   1056     11</div><div class='del'>- *   AT45DB1282  128Mbit (16M)   xx0100xx (0x10)  16384   1056     11</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> struct flash_info {</div><div class='ctx'> 	char		*name;</div><div class='ctx'> </div><div class='del'>-	/* JEDEC id zero means "no ID" (most older chips); otherwise it has</div><div class='del'>-	 * a high byte of zero plus three data bytes: the manufacturer id,</div><div class='del'>-	 * then a two byte device id.</div><div class='add'>+	/* JEDEC id has a high byte of zero plus three data bytes:</div><div class='add'>+	 * the manufacturer id, then a two byte device id.</div><div class='ctx'> 	 */</div><div class='ctx'> 	uint32_t	jedec_id;</div><div class='ctx'> </div><div class='del'>-	/* The size listed here is what works with OPCODE_SE, which isn't</div><div class='del'>-	 * necessarily called a "sector" by the vendor.</div><div class='del'>-	 */</div><div class='add'>+	/* The size listed here is what works with OP_ERASE_PAGE. */</div><div class='ctx'> 	unsigned	nr_pages;</div><div class='ctx'> 	uint16_t	pagesize;</div><div class='ctx'> 	uint16_t	pageoffset;</div><div class='ctx'> </div><div class='ctx'> 	uint16_t	flags;</div><div class='del'>-#define	SUP_POW2PS	0x02</div><div class='del'>-#define	IS_POW2PS	0x01</div><div class='add'>+#define SUP_POW2PS	0x0002		/* supports 2^N byte pages */</div><div class='add'>+#define IS_POW2PS	0x0001		/* uses 2^N byte pages */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct flash_info __devinitdata dataflash_data [] = {</div><div class='ctx'> </div><div class='del'>-	{ "at45db011d",  0x1f2200, 512, 264, 9, SUP_POW2PS},</div><div class='add'>+	/*</div><div class='add'>+	 * NOTE:  chips with SUP_POW2PS (rev D and up) need two entries,</div><div class='add'>+	 * one with IS_POW2PS and the other without.  The entry with the</div><div class='add'>+	 * non-2^N byte page size can't name exact chip revisions without</div><div class='add'>+	 * losing backwards compatibility for cmdlinepart.</div><div class='add'>+	 *</div><div class='add'>+	 * These newer chips also support 128-byte security registers (with</div><div class='add'>+	 * 64 bytes one-time-programmable) and software write-protection.</div><div class='add'>+	 */</div><div class='add'>+	{ "AT45DB011B",  0x1f2200, 512, 264, 9, SUP_POW2PS},</div><div class='ctx'> 	{ "at45db011d",  0x1f2200, 512, 256, 8, SUP_POW2PS | IS_POW2PS},</div><div class='ctx'> </div><div class='del'>-	{ "at45db021d",  0x1f2300, 1024, 264, 9, SUP_POW2PS},</div><div class='add'>+	{ "AT45DB021B",  0x1f2300, 1024, 264, 9, SUP_POW2PS},</div><div class='ctx'> 	{ "at45db021d",  0x1f2300, 1024, 256, 8, SUP_POW2PS | IS_POW2PS},</div><div class='ctx'> </div><div class='del'>-	{ "at45db041d",  0x1f2400, 2048, 264, 9, SUP_POW2PS},</div><div class='add'>+	{ "AT45DB041x",  0x1f2400, 2048, 264, 9, SUP_POW2PS},</div><div class='ctx'> 	{ "at45db041d",  0x1f2400, 2048, 256, 8, SUP_POW2PS | IS_POW2PS},</div><div class='ctx'> </div><div class='del'>-	{ "at45db081d",  0x1f2500, 4096, 264, 9, SUP_POW2PS},</div><div class='add'>+	{ "AT45DB081B",  0x1f2500, 4096, 264, 9, SUP_POW2PS},</div><div class='ctx'> 	{ "at45db081d",  0x1f2500, 4096, 256, 8, SUP_POW2PS | IS_POW2PS},</div><div class='ctx'> </div><div class='del'>-	{ "at45db161d",  0x1f2600, 4096, 528, 10, SUP_POW2PS},</div><div class='add'>+	{ "AT45DB161x",  0x1f2600, 4096, 528, 10, SUP_POW2PS},</div><div class='ctx'> 	{ "at45db161d",  0x1f2600, 4096, 512, 9, SUP_POW2PS | IS_POW2PS},</div><div class='ctx'> </div><div class='del'>-	{ "at45db321c",  0x1f2700, 8192, 528, 10, },</div><div class='add'>+	{ "AT45DB321x",  0x1f2700, 8192, 528, 10, 0},		/* rev C */</div><div class='ctx'> </div><div class='del'>-	{ "at45db321d",  0x1f2701, 8192, 528, 10, SUP_POW2PS},</div><div class='add'>+	{ "AT45DB321x",  0x1f2701, 8192, 528, 10, SUP_POW2PS},</div><div class='ctx'> 	{ "at45db321d",  0x1f2701, 8192, 512, 9, SUP_POW2PS | IS_POW2PS},</div><div class='ctx'> </div><div class='del'>-	{ "at45db641d",  0x1f2800, 8192, 1056, 11, SUP_POW2PS},</div><div class='del'>-	{ "at45db641d",  0x1f2800, 8192, 1024, 10, SUP_POW2PS | IS_POW2PS},</div><div class='add'>+	{ "AT45DB642x",  0x1f2800, 8192, 1056, 11, SUP_POW2PS},</div><div class='add'>+	{ "at45db642d",  0x1f2800, 8192, 1024, 10, SUP_POW2PS | IS_POW2PS},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct flash_info *__devinit jedec_probe(struct spi_device *spi)</div><div class='hunk'>@@ -588,17 +581,23 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)</div><div class='ctx'> 	struct flash_info	*info;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/* JEDEC also defines an optional "extended device information"</div><div class='ctx'> 	 * string for after vendor-specific data, after the three bytes</div><div class='ctx'> 	 * we use here.  Supporting some chips might require using it.</div><div class='add'>+	 *</div><div class='add'>+	 * If the vendor ID isn't Atmel's (0x1f), assume this call failed.</div><div class='add'>+	 * That's not an error; only rev C and newer chips handle it, and</div><div class='add'>+	 * only Atmel sells these chips.</div><div class='ctx'> 	 */</div><div class='ctx'> 	tmp = spi_write_then_read(spi, &amp;code, 1, id, 3);</div><div class='ctx'> 	if (tmp &lt; 0) {</div><div class='ctx'> 		DEBUG(MTD_DEBUG_LEVEL0, "%s: error %d reading JEDEC ID\n",</div><div class='ctx'> 			spi-&gt;dev.bus_id, tmp);</div><div class='del'>-		return NULL;</div><div class='add'>+		return ERR_PTR(tmp);</div><div class='ctx'> 	}</div><div class='add'>+	if (id[0] != 0x1f)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	jedec = id[0];</div><div class='ctx'> 	jedec = jedec &lt;&lt; 8;</div><div class='ctx'> 	jedec |= id[1];</div><div class='hunk'>@@ -609,19 +608,53 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)</div><div class='ctx'> 			tmp &lt; ARRAY_SIZE(dataflash_data);</div><div class='ctx'> 			tmp++, info++) {</div><div class='ctx'> 		if (info-&gt;jedec_id == jedec) {</div><div class='add'>+			DEBUG(MTD_DEBUG_LEVEL1, "%s: OTP, sector protect%s\n",</div><div class='add'>+				dev_name(&amp;spi-&gt;dev),</div><div class='add'>+				(info-&gt;flags &amp; SUP_POW2PS)</div><div class='add'>+					? ", binary pagesize" : ""</div><div class='add'>+				);</div><div class='ctx'> 			if (info-&gt;flags &amp; SUP_POW2PS) {</div><div class='ctx'> 				status = dataflash_status(spi);</div><div class='del'>-				if (status &amp; 0x1)</div><div class='del'>-					/* return power of 2 pagesize */</div><div class='del'>-					return ++info;</div><div class='del'>-				else</div><div class='del'>-					return info;</div><div class='add'>+				if (status &lt; 0) {</div><div class='add'>+					DEBUG(MTD_DEBUG_LEVEL1,</div><div class='add'>+						"%s: status error %d\n",</div><div class='add'>+						dev_name(&amp;spi-&gt;dev), status);</div><div class='add'>+					return ERR_PTR(status);</div><div class='add'>+				}</div><div class='add'>+				if (status &amp; 0x1) {</div><div class='add'>+					if (info-&gt;flags &amp; IS_POW2PS)</div><div class='add'>+						return info;</div><div class='add'>+				} else {</div><div class='add'>+					if (!(info-&gt;flags &amp; IS_POW2PS))</div><div class='add'>+						return info;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Treat other chips as errors ... we won't know the right page</div><div class='add'>+	 * size (it might be binary) even when we can tell which density</div><div class='add'>+	 * class is involved (legacy chip id scheme).</div><div class='add'>+	 */</div><div class='add'>+	dev_warn(&amp;spi-&gt;dev, "JEDEC id %06x not handled\n", jedec);</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Detect and initialize DataFlash device, using JEDEC IDs on newer chips</div><div class='add'>+ * or else the ID code embedded in the status bits:</div><div class='add'>+ *</div><div class='add'>+ *   Device      Density         ID code          #Pages PageSize  Offset</div><div class='add'>+ *   AT45DB011B  1Mbit   (128K)  xx0011xx (0x0c)    512    264      9</div><div class='add'>+ *   AT45DB021B  2Mbit   (256K)  xx0101xx (0x14)   1024    264      9</div><div class='add'>+ *   AT45DB041B  4Mbit   (512K)  xx0111xx (0x1c)   2048    264      9</div><div class='add'>+ *   AT45DB081B  8Mbit   (1M)    xx1001xx (0x24)   4096    264      9</div><div class='add'>+ *   AT45DB0161B 16Mbit  (2M)    xx1011xx (0x2c)   4096    528     10</div><div class='add'>+ *   AT45DB0321B 32Mbit  (4M)    xx1101xx (0x34)   8192    528     10</div><div class='add'>+ *   AT45DB0642  64Mbit  (8M)    xx111xxx (0x3c)   8192   1056     11</div><div class='add'>+ *   AT45DB1282  128Mbit (16M)   xx0100xx (0x10)  16384   1056     11</div><div class='add'>+ */</div><div class='ctx'> static int __devinit dataflash_probe(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='hunk'>@@ -632,14 +665,17 @@ static int __devinit dataflash_probe(struct spi_device *spi)</div><div class='ctx'> 	 * If it succeeds we know we have either a C or D part.</div><div class='ctx'> 	 * D will support power of 2 pagesize option.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='ctx'> 	info = jedec_probe(spi);</div><div class='del'>-</div><div class='add'>+	if (IS_ERR(info))</div><div class='add'>+		return PTR_ERR(info);</div><div class='ctx'> 	if (info != NULL)</div><div class='ctx'> 		return add_dataflash(spi, info-&gt;name, info-&gt;nr_pages,</div><div class='ctx'> 				 info-&gt;pagesize, info-&gt;pageoffset);</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+	/*</div><div class='add'>+	 * Older chips support only legacy commands, identifing</div><div class='add'>+	 * capacity using bits in the status byte.</div><div class='add'>+	 */</div><div class='ctx'> 	status = dataflash_status(spi);</div><div class='ctx'> 	if (status &lt;= 0 || status == 0xff) {</div><div class='ctx'> 		DEBUG(MTD_DEBUG_LEVEL1, "%s: status error %d\n",</div><div class='hunk'>@@ -661,13 +697,13 @@ static int __devinit dataflash_probe(struct spi_device *spi)</div><div class='ctx'> 		status = add_dataflash(spi, "AT45DB021B", 1024, 264, 9);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x1c:	/* 0 1 1 1 x x */</div><div class='del'>-		status = add_dataflash(spi, "AT45DB041B", 2048, 264, 9);</div><div class='add'>+		status = add_dataflash(spi, "AT45DB041x", 2048, 264, 9);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x24:	/* 1 0 0 1 x x */</div><div class='ctx'> 		status = add_dataflash(spi, "AT45DB081B", 4096, 264, 9);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x2c:	/* 1 0 1 1 x x */</div><div class='del'>-		status = add_dataflash(spi, "AT45DB161B", 4096, 528, 10);</div><div class='add'>+		status = add_dataflash(spi, "AT45DB161x", 4096, 528, 10);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x34:	/* 1 1 0 1 x x */</div><div class='ctx'> 		status = add_dataflash(spi, "AT45DB321x", 8192, 528, 10);</div><div class='head'>diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c<br/>index 948b86f35ef4..d1eec7d3243f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/amd76xrom.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/maps/amd76xrom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/amd76xrom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/amd76xrom.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/autcpu12-nvram.c b/drivers/mtd/maps/autcpu12-nvram.c<br/>index cf32267263df..53664188fc47 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/autcpu12-nvram.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/maps/autcpu12-nvram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/autcpu12-nvram.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/autcpu12-nvram.c</a></div><div class='hunk'>@@ -25,8 +25,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/autcpu12.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/autcpu12.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/cdb89712.c b/drivers/mtd/maps/cdb89712.c<br/>index cb507da0a87d..e5059aa3c724 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/cdb89712.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/maps/cdb89712.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/cdb89712.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/cdb89712.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c<br/>index 6464d487eb1a..60e68bde0fea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ceiva.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/maps/ceiva.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ceiva.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/ceiva.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/concat.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c<br/>index effaf7cdefab..1a6feb4474de 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ck804xrom.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/maps/ck804xrom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ck804xrom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/ck804xrom.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/esb2rom.c b/drivers/mtd/maps/esb2rom.c<br/>index aa64a4752781..bbbcdd4c8d13 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/esb2rom.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/maps/esb2rom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/esb2rom.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/esb2rom.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/h720x-flash.c b/drivers/mtd/maps/h720x-flash.c<br/>index ef8915474462..35fef655ccc4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/h720x-flash.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/maps/h720x-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/h720x-flash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/h720x-flash.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct mtd_info *mymtd;</div><div class='head'>diff --git a/drivers/mtd/maps/integrator-flash.c b/drivers/mtd/maps/integrator-flash.c<br/>index ee361aaadb1e..7100ee3c7b01 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/integrator-flash.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/maps/integrator-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/integrator-flash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/integrator-flash.c</a></div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/maps/ipaq-flash.c b/drivers/mtd/maps/ipaq-flash.c<br/>index a806119797e0..ed58f6a77bd9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ipaq-flash.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/maps/ipaq-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ipaq-flash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/ipaq-flash.c</a></div><div class='hunk'>@@ -24,8 +24,8 @@</div><div class='ctx'> #include &lt;linux/mtd/concat.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch-sa1100/h3600.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/h3600.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c<br/>index c2264792a20b..dcdb1f17577d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ixp2000.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/maps/ixp2000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ixp2000.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/ixp2000.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c<br/>index 68eec6c6c517..05f276af15da 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/omap_nor.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/maps/omap_nor.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/omap_nor.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/omap_nor.c</a></div><div class='hunk'>@@ -43,9 +43,9 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='del'>-#include &lt;asm/arch/tc.h&gt;</div><div class='add'>+#include &lt;mach/tc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTD_PARTITIONS</div><div class='ctx'> static const char *part_probes[] = { /* "RedBoot", */ "cmdlinepart", NULL };</div><div class='head'>diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c<br/>index 82113295c266..771139c5bf87 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/pxa2xx-flash.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/maps/pxa2xx-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/pxa2xx-flash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/pxa2xx-flash.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c<br/>index e177a43dfff0..7df6bbf0e4d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/sa1100-flash.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/maps/sa1100-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/sa1100-flash.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/maps/sa1100-flash.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/concat.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='head'>diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c<br/>index d2f331876e4c..e00d424e6575 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtdchar.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/mtdchar.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtdchar.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/mtdchar.c</a></div><div class='hunk'>@@ -410,16 +410,20 @@ static int mtd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	case MEMGETREGIONINFO:</div><div class='ctx'> 	{</div><div class='del'>-		struct region_info_user ur;</div><div class='add'>+		uint32_t ur_idx;</div><div class='add'>+		struct mtd_erase_region_info *kr;</div><div class='add'>+		struct region_info_user *ur = (struct region_info_user *) argp;</div><div class='ctx'> </div><div class='del'>-		if (copy_from_user(&amp;ur, argp, sizeof(struct region_info_user)))</div><div class='add'>+		if (get_user(ur_idx, &amp;(ur-&gt;regionindex)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		if (ur.regionindex &gt;= mtd-&gt;numeraseregions)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (copy_to_user(argp, &amp;(mtd-&gt;eraseregions[ur.regionindex]),</div><div class='del'>-				sizeof(struct mtd_erase_region_info)))</div><div class='add'>+		kr = &amp;(mtd-&gt;eraseregions[ur_idx]);</div><div class='add'>+</div><div class='add'>+		if (put_user(kr-&gt;offset, &amp;(ur-&gt;offset))</div><div class='add'>+		    || put_user(kr-&gt;erasesize, &amp;(ur-&gt;erasesize))</div><div class='add'>+		    || put_user(kr-&gt;numblocks, &amp;(ur-&gt;numblocks)))</div><div class='ctx'> 			return -EFAULT;</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c<br/>index 28cc6787a800..00d46e137b2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtdsuper.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/mtdsuper.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtdsuper.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/mtdsuper.c</a></div><div class='hunk'>@@ -125,8 +125,11 @@ int get_sb_mtd(struct file_system_type *fs_type, int flags,</div><div class='ctx'> 	       int (*fill_super)(struct super_block *, void *, int),</div><div class='ctx'> 	       struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	struct nameidata nd;</div><div class='del'>-	int mtdnr, ret;</div><div class='add'>+#ifdef CONFIG_BLOCK</div><div class='add'>+	struct block_device *bdev;</div><div class='add'>+	int ret, major;</div><div class='add'>+#endif</div><div class='add'>+	int mtdnr;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev_name)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -178,45 +181,38 @@ int get_sb_mtd(struct file_system_type *fs_type, int flags,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BLOCK</div><div class='ctx'> 	/* try the old way - the hack where we allowed users to mount</div><div class='ctx'> 	 * /dev/mtdblock$(n) but didn't actually _use_ the blockdev</div><div class='ctx'> 	 */</div><div class='del'>-	ret = path_lookup(dev_name, LOOKUP_FOLLOW, &amp;nd);</div><div class='del'>-</div><div class='del'>-	DEBUG(1, "MTDSB: path_lookup() returned %d, inode %p\n",</div><div class='del'>-	      ret, nd.path.dentry ? nd.path.dentry-&gt;d_inode : NULL);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='add'>+	bdev = lookup_bdev(dev_name);</div><div class='add'>+	if (IS_ERR(bdev)) {</div><div class='add'>+		ret = PTR_ERR(bdev);</div><div class='add'>+		DEBUG(1, "MTDSB: lookup_bdev() returned %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='add'>+	}</div><div class='add'>+	DEBUG(1, "MTDSB: lookup_bdev() returned 0\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!S_ISBLK(nd.path.dentry-&gt;d_inode-&gt;i_mode))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (nd.path.mnt-&gt;mnt_flags &amp; MNT_NODEV) {</div><div class='del'>-		ret = -EACCES;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	major = MAJOR(bdev-&gt;bd_dev);</div><div class='add'>+	mtdnr = MINOR(bdev-&gt;bd_dev);</div><div class='add'>+	bdput(bdev);</div><div class='ctx'> </div><div class='del'>-	if (imajor(nd.path.dentry-&gt;d_inode) != MTD_BLOCK_MAJOR)</div><div class='add'>+	if (major != MTD_BLOCK_MAJOR)</div><div class='ctx'> 		goto not_an_MTD_device;</div><div class='ctx'> </div><div class='del'>-	mtdnr = iminor(nd.path.dentry-&gt;d_inode);</div><div class='del'>-	path_put(&amp;nd.path);</div><div class='del'>-</div><div class='ctx'> 	return get_sb_mtd_nr(fs_type, flags, dev_name, data, mtdnr, fill_super,</div><div class='ctx'> 			     mnt);</div><div class='ctx'> </div><div class='ctx'> not_an_MTD_device:</div><div class='add'>+#endif /* CONFIG_BLOCK */</div><div class='add'>+</div><div class='ctx'> 	if (!(flags &amp; MS_SILENT))</div><div class='ctx'> 		printk(KERN_NOTICE</div><div class='ctx'> 		       "MTD: Attempt to mount non-MTD device \"%s\"\n",</div><div class='ctx'> 		       dev_name);</div><div class='del'>-out:</div><div class='del'>-	path_put(&amp;nd.path);</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(get_sb_mtd);</div><div class='head'>diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig<br/>index 71406e517857..41f361c49b32 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/Kconfig</a></div><div class='hunk'>@@ -104,11 +104,24 @@ config MTD_NAND_BF5XX</div><div class='ctx'> </div><div class='ctx'> config MTD_NAND_BF5XX_HWECC</div><div class='ctx'> 	bool "BF5XX NAND Hardware ECC"</div><div class='add'>+	default y</div><div class='ctx'> 	depends on MTD_NAND_BF5XX</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable the use of the BF5XX's internal ECC generator when</div><div class='ctx'> 	  using NAND.</div><div class='ctx'> </div><div class='add'>+config MTD_NAND_BF5XX_BOOTROM_ECC</div><div class='add'>+	bool "Use Blackfin BootROM ECC Layout"</div><div class='add'>+	default n</div><div class='add'>+	depends on MTD_NAND_BF5XX_HWECC</div><div class='add'>+	help</div><div class='add'>+	  If you wish to modify NAND pages and allow the Blackfin on-chip</div><div class='add'>+	  BootROM to boot from them, say Y here.  This is only necessary</div><div class='add'>+	  if you are booting U-Boot out of NAND and you wish to update</div><div class='add'>+	  U-Boot from Linux' userspace.  Otherwise, you should say N here.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config MTD_NAND_RTC_FROM4</div><div class='ctx'> 	tristate "Renesas Flash ROM 4-slot interface board (FROM_BOARD4)"</div><div class='ctx'> 	depends on SH_SOLUTION_ENGINE</div><div class='hunk'>@@ -338,6 +351,13 @@ config MTD_NAND_PASEMI</div><div class='ctx'> 	  Enables support for NAND Flash interface on PA Semi PWRficient</div><div class='ctx'> 	  based boards</div><div class='ctx'> </div><div class='add'>+config MTD_NAND_TMIO</div><div class='add'>+	tristate "NAND Flash device on Toshiba Mobile IO Controller"</div><div class='add'>+	depends on MTD_NAND &amp;&amp; MFD_TMIO</div><div class='add'>+	help</div><div class='add'>+	  Support for NAND flash connected to a Toshiba Mobile IO</div><div class='add'>+	  Controller in some PDAs, including the Sharp SL6000x.</div><div class='add'>+</div><div class='ctx'> config MTD_NAND_NANDSIM</div><div class='ctx'> 	tristate "Support for NAND Flash Simulator"</div><div class='ctx'> 	depends on MTD_PARTITIONS</div><div class='head'>diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile<br/>index d772581de573..b786c5da82da 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/Makefile</a></div><div class='hunk'>@@ -27,6 +27,7 @@ obj-$(CONFIG_MTD_NAND_ATMEL)		+= atmel_nand.o</div><div class='ctx'> obj-$(CONFIG_MTD_NAND_CM_X270)		+= cmx270_nand.o</div><div class='ctx'> obj-$(CONFIG_MTD_NAND_BASLER_EXCITE)	+= excite_nandflash.o</div><div class='ctx'> obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx_nand.o</div><div class='add'>+obj-$(CONFIG_MTD_NAND_TMIO)		+= tmio_nand.o</div><div class='ctx'> obj-$(CONFIG_MTD_NAND_PLATFORM)		+= plat_nand.o</div><div class='ctx'> obj-$(CONFIG_MTD_ALAUDA)		+= alauda.o</div><div class='ctx'> obj-$(CONFIG_MTD_NAND_PASEMI)		+= pasemi_nand.o</div><div class='head'>diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c<br/>index a0ba07c36ee9..26d42987971f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/ams-delta.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/ams-delta.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/ams-delta.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/ams-delta.c</a></div><div class='hunk'>@@ -22,10 +22,10 @@</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/board-ams-delta.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board-ams-delta.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MTD structure for E3 (Delta)</div><div class='head'>diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c<br/>index 99aec46e2145..3387e0d5076b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/atmel_nand.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/atmel_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/atmel_nand.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/atmel_nand.c</a></div><div class='hunk'>@@ -32,8 +32,8 @@</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTD_NAND_ATMEL_ECC_HW</div><div class='ctx'> #define hard_ecc	1</div><div class='head'>diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c<br/>index 761946ea45b1..92c334ff4508 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/au1550nd.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/au1550nd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/au1550nd.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/au1550nd.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-au1x00/au1xxx.h&gt;</div><div class='head'>diff --git a/drivers/mtd/nand/autcpu12.c b/drivers/mtd/nand/autcpu12.c<br/>index 553dd7e9b41c..7c95da1f612c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/autcpu12.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/autcpu12.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/autcpu12.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/autcpu12.c</a></div><div class='hunk'>@@ -32,9 +32,9 @@</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='del'>-#include &lt;asm/arch/autcpu12.h&gt;</div><div class='add'>+#include &lt;mach/autcpu12.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MTD structure for AUTCPU12 board</div><div class='head'>diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c<br/>index e87a57297328..9af2a2cc1153 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/bf5xx_nand.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/bf5xx_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/bf5xx_nand.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/bf5xx_nand.c</a></div><div class='hunk'>@@ -91,6 +91,41 @@ static const unsigned short bfin_nfc_pin_req[] =</div><div class='ctx'> 	 P_NAND_ALE,</div><div class='ctx'> 	 0};</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MTD_NAND_BF5XX_BOOTROM_ECC</div><div class='add'>+static uint8_t bbt_pattern[] = { 0xff };</div><div class='add'>+</div><div class='add'>+static struct nand_bbt_descr bootrom_bbt = {</div><div class='add'>+	.options = 0,</div><div class='add'>+	.offs = 63,</div><div class='add'>+	.len = 1,</div><div class='add'>+	.pattern = bbt_pattern,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct nand_ecclayout bootrom_ecclayout = {</div><div class='add'>+	.eccbytes = 24,</div><div class='add'>+	.eccpos = {</div><div class='add'>+		0x8 * 0, 0x8 * 0 + 1, 0x8 * 0 + 2,</div><div class='add'>+		0x8 * 1, 0x8 * 1 + 1, 0x8 * 1 + 2,</div><div class='add'>+		0x8 * 2, 0x8 * 2 + 1, 0x8 * 2 + 2,</div><div class='add'>+		0x8 * 3, 0x8 * 3 + 1, 0x8 * 3 + 2,</div><div class='add'>+		0x8 * 4, 0x8 * 4 + 1, 0x8 * 4 + 2,</div><div class='add'>+		0x8 * 5, 0x8 * 5 + 1, 0x8 * 5 + 2,</div><div class='add'>+		0x8 * 6, 0x8 * 6 + 1, 0x8 * 6 + 2,</div><div class='add'>+		0x8 * 7, 0x8 * 7 + 1, 0x8 * 7 + 2</div><div class='add'>+	},</div><div class='add'>+	.oobfree = {</div><div class='add'>+		{ 0x8 * 0 + 3, 5 },</div><div class='add'>+		{ 0x8 * 1 + 3, 5 },</div><div class='add'>+		{ 0x8 * 2 + 3, 5 },</div><div class='add'>+		{ 0x8 * 3 + 3, 5 },</div><div class='add'>+		{ 0x8 * 4 + 3, 5 },</div><div class='add'>+		{ 0x8 * 5 + 3, 5 },</div><div class='add'>+		{ 0x8 * 6 + 3, 5 },</div><div class='add'>+		{ 0x8 * 7 + 3, 5 },</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Data structures for bf5xx nand flash controller driver</div><div class='ctx'>  */</div><div class='hunk'>@@ -273,7 +308,7 @@ static int bf5xx_nand_correct_data(struct mtd_info *mtd, u_char *dat,</div><div class='ctx'> 		dat += 256;</div><div class='ctx'> 		read_ecc += 8;</div><div class='ctx'> 		calc_ecc += 8;</div><div class='del'>-		ret = bf5xx_nand_correct_data_256(mtd, dat, read_ecc, calc_ecc);</div><div class='add'>+		ret |= bf5xx_nand_correct_data_256(mtd, dat, read_ecc, calc_ecc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -298,7 +333,7 @@ static int bf5xx_nand_calculate_ecc(struct mtd_info *mtd,</div><div class='ctx'> 	ecc0 = bfin_read_NFC_ECC0();</div><div class='ctx'> 	ecc1 = bfin_read_NFC_ECC1();</div><div class='ctx'> </div><div class='del'>-	code[0] = (ecc0 &amp; 0x3FF) | ((ecc1 &amp; 0x3FF) &lt;&lt; 11);</div><div class='add'>+	code[0] = (ecc0 &amp; 0x7ff) | ((ecc1 &amp; 0x7ff) &lt;&lt; 11);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(info-&gt;device, "returning ecc 0x%08x\n", code[0]);</div><div class='ctx'> </div><div class='hunk'>@@ -310,7 +345,7 @@ static int bf5xx_nand_calculate_ecc(struct mtd_info *mtd,</div><div class='ctx'> 	if (page_size == 512) {</div><div class='ctx'> 		ecc0 = bfin_read_NFC_ECC2();</div><div class='ctx'> 		ecc1 = bfin_read_NFC_ECC3();</div><div class='del'>-		code[1] = (ecc0 &amp; 0x3FF) | ((ecc1 &amp; 0x3FF) &lt;&lt; 11);</div><div class='add'>+		code[1] = (ecc0 &amp; 0x7ff) | ((ecc1 &amp; 0x7ff) &lt;&lt; 11);</div><div class='ctx'> </div><div class='ctx'> 		/* second 3 bytes in ecc_code for second 256</div><div class='ctx'> 		 * bytes of 512 page size</div><div class='hunk'>@@ -514,7 +549,6 @@ static void bf5xx_nand_dma_write_buf(struct mtd_info *mtd,</div><div class='ctx'> /*</div><div class='ctx'>  * System initialization functions</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> static int bf5xx_nand_dma_init(struct bf5xx_nand_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -547,6 +581,13 @@ static int bf5xx_nand_dma_init(struct bf5xx_nand_info *info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bf5xx_nand_dma_remove(struct bf5xx_nand_info *info)</div><div class='add'>+{</div><div class='add'>+	/* Free NFC DMA channel */</div><div class='add'>+	if (hardware_ecc)</div><div class='add'>+		free_dma(CH_NFC);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * BF5XX NFC hardware initialization</div><div class='ctx'>  *  - pin mux setup</div><div class='hunk'>@@ -605,7 +646,7 @@ static int bf5xx_nand_add_partition(struct bf5xx_nand_info *info)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bf5xx_nand_remove(struct platform_device *pdev)</div><div class='add'>+static int __devexit bf5xx_nand_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bf5xx_nand_info *info = to_nand_info(pdev);</div><div class='ctx'> 	struct mtd_info *mtd = NULL;</div><div class='hunk'>@@ -623,6 +664,7 @@ static int bf5xx_nand_remove(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	peripheral_free_list(bfin_nfc_pin_req);</div><div class='add'>+	bf5xx_nand_dma_remove(info);</div><div class='ctx'> </div><div class='ctx'> 	/* free the common resources */</div><div class='ctx'> 	kfree(info);</div><div class='hunk'>@@ -638,7 +680,7 @@ static int bf5xx_nand_remove(struct platform_device *pdev)</div><div class='ctx'>  * it can allocate all necessary resources then calls the</div><div class='ctx'>  * nand layer to look for devices</div><div class='ctx'>  */</div><div class='del'>-static int bf5xx_nand_probe(struct platform_device *pdev)</div><div class='add'>+static int __devinit bf5xx_nand_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bf5xx_nand_platform *plat = to_nand_plat(pdev);</div><div class='ctx'> 	struct bf5xx_nand_info *info = NULL;</div><div class='hunk'>@@ -648,22 +690,21 @@ static int bf5xx_nand_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;pdev-&gt;dev, "(%p)\n", pdev);</div><div class='ctx'> </div><div class='del'>-	if (peripheral_request_list(bfin_nfc_pin_req, DRV_NAME)) {</div><div class='del'>-		printk(KERN_ERR DRV_NAME</div><div class='del'>-		": Requesting Peripherals failed\n");</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!plat) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "no platform specific information\n");</div><div class='del'>-		goto exit_error;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (peripheral_request_list(bfin_nfc_pin_req, DRV_NAME)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "requesting Peripherals failed\n");</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='ctx'> 	if (info == NULL) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "no memory for flash info\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto exit_error;</div><div class='add'>+		goto out_err_kzalloc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, info);</div><div class='hunk'>@@ -707,11 +748,16 @@ static int bf5xx_nand_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* initialise the hardware */</div><div class='ctx'> 	err = bf5xx_nand_hw_init(info);</div><div class='del'>-	if (err != 0)</div><div class='del'>-		goto exit_error;</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_err_hw_init;</div><div class='ctx'> </div><div class='ctx'> 	/* setup hardware ECC data struct */</div><div class='ctx'> 	if (hardware_ecc) {</div><div class='add'>+#ifdef CONFIG_MTD_NAND_BF5XX_BOOTROM_ECC</div><div class='add'>+		chip-&gt;badblock_pattern = &amp;bootrom_bbt;</div><div class='add'>+		chip-&gt;ecc.layout = &amp;bootrom_ecclayout;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 		if (plat-&gt;page_size == NFC_PG_SIZE_256) {</div><div class='ctx'> 			chip-&gt;ecc.bytes = 3;</div><div class='ctx'> 			chip-&gt;ecc.size = 256;</div><div class='hunk'>@@ -733,7 +779,7 @@ static int bf5xx_nand_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* scan hardware nand chip and setup mtd info data struct */</div><div class='ctx'> 	if (nand_scan(mtd, 1)) {</div><div class='ctx'> 		err = -ENXIO;</div><div class='del'>-		goto exit_error;</div><div class='add'>+		goto out_err_nand_scan;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* add NAND partition */</div><div class='hunk'>@@ -742,11 +788,14 @@ static int bf5xx_nand_probe(struct platform_device *pdev)</div><div class='ctx'> 	dev_dbg(&amp;pdev-&gt;dev, "initialised ok\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-exit_error:</div><div class='del'>-	bf5xx_nand_remove(pdev);</div><div class='add'>+out_err_nand_scan:</div><div class='add'>+	bf5xx_nand_dma_remove(info);</div><div class='add'>+out_err_hw_init:</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+	kfree(info);</div><div class='add'>+out_err_kzalloc:</div><div class='add'>+	peripheral_free_list(bfin_nfc_pin_req);</div><div class='ctx'> </div><div class='del'>-	if (err == 0)</div><div class='del'>-		err = -EINVAL;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -775,7 +824,7 @@ static int bf5xx_nand_resume(struct platform_device *dev)</div><div class='ctx'> /* driver device registration */</div><div class='ctx'> static struct platform_driver bf5xx_nand_driver = {</div><div class='ctx'> 	.probe		= bf5xx_nand_probe,</div><div class='del'>-	.remove		= bf5xx_nand_remove,</div><div class='add'>+	.remove		= __devexit_p(bf5xx_nand_remove),</div><div class='ctx'> 	.suspend	= bf5xx_nand_suspend,</div><div class='ctx'> 	.resume		= bf5xx_nand_resume,</div><div class='ctx'> 	.driver		= {</div><div class='head'>diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c<br/>index fc8529bedfdf..9eba3f04783a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/cmx270_nand.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/cmx270_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/cmx270_nand.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/cmx270_nand.c</a></div><div class='hunk'>@@ -26,8 +26,8 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define GPIO_NAND_CS	(11)</div><div class='ctx'> #define GPIO_NAND_RB	(89)</div><div class='head'>diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c<br/>index 765d4f0f7c86..e4226e02d63e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/diskonchip.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/diskonchip.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/diskonchip.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/diskonchip.c</a></div><div class='hunk'>@@ -1125,9 +1125,9 @@ static inline int __init nftl_partscan(struct mtd_info *mtd, struct mtd_partitio</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	mh = (struct NFTLMediaHeader *)buf;</div><div class='ctx'> </div><div class='del'>-	mh-&gt;NumEraseUnits = le16_to_cpu(mh-&gt;NumEraseUnits);</div><div class='del'>-	mh-&gt;FirstPhysicalEUN = le16_to_cpu(mh-&gt;FirstPhysicalEUN);</div><div class='del'>-	mh-&gt;FormattedSize = le32_to_cpu(mh-&gt;FormattedSize);</div><div class='add'>+	le16_to_cpus(&amp;mh-&gt;NumEraseUnits);</div><div class='add'>+	le16_to_cpus(&amp;mh-&gt;FirstPhysicalEUN);</div><div class='add'>+	le32_to_cpus(&amp;mh-&gt;FormattedSize);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "    DataOrgID        = %s\n"</div><div class='ctx'> 			 "    NumEraseUnits    = %d\n"</div><div class='hunk'>@@ -1235,12 +1235,12 @@ static inline int __init inftl_partscan(struct mtd_info *mtd, struct mtd_partiti</div><div class='ctx'> 	doc-&gt;mh1_page = doc-&gt;mh0_page + (4096 &gt;&gt; this-&gt;page_shift);</div><div class='ctx'> 	mh = (struct INFTLMediaHeader *)buf;</div><div class='ctx'> </div><div class='del'>-	mh-&gt;NoOfBootImageBlocks = le32_to_cpu(mh-&gt;NoOfBootImageBlocks);</div><div class='del'>-	mh-&gt;NoOfBinaryPartitions = le32_to_cpu(mh-&gt;NoOfBinaryPartitions);</div><div class='del'>-	mh-&gt;NoOfBDTLPartitions = le32_to_cpu(mh-&gt;NoOfBDTLPartitions);</div><div class='del'>-	mh-&gt;BlockMultiplierBits = le32_to_cpu(mh-&gt;BlockMultiplierBits);</div><div class='del'>-	mh-&gt;FormatFlags = le32_to_cpu(mh-&gt;FormatFlags);</div><div class='del'>-	mh-&gt;PercentUsed = le32_to_cpu(mh-&gt;PercentUsed);</div><div class='add'>+	le32_to_cpus(&amp;mh-&gt;NoOfBootImageBlocks);</div><div class='add'>+	le32_to_cpus(&amp;mh-&gt;NoOfBinaryPartitions);</div><div class='add'>+	le32_to_cpus(&amp;mh-&gt;NoOfBDTLPartitions);</div><div class='add'>+	le32_to_cpus(&amp;mh-&gt;BlockMultiplierBits);</div><div class='add'>+	le32_to_cpus(&amp;mh-&gt;FormatFlags);</div><div class='add'>+	le32_to_cpus(&amp;mh-&gt;PercentUsed);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "    bootRecordID          = %s\n"</div><div class='ctx'> 			 "    NoOfBootImageBlocks   = %d\n"</div><div class='hunk'>@@ -1277,12 +1277,12 @@ static inline int __init inftl_partscan(struct mtd_info *mtd, struct mtd_partiti</div><div class='ctx'> 	/* Scan the partitions */</div><div class='ctx'> 	for (i = 0; (i &lt; 4); i++) {</div><div class='ctx'> 		ip = &amp;(mh-&gt;Partitions[i]);</div><div class='del'>-		ip-&gt;virtualUnits = le32_to_cpu(ip-&gt;virtualUnits);</div><div class='del'>-		ip-&gt;firstUnit = le32_to_cpu(ip-&gt;firstUnit);</div><div class='del'>-		ip-&gt;lastUnit = le32_to_cpu(ip-&gt;lastUnit);</div><div class='del'>-		ip-&gt;flags = le32_to_cpu(ip-&gt;flags);</div><div class='del'>-		ip-&gt;spareUnits = le32_to_cpu(ip-&gt;spareUnits);</div><div class='del'>-		ip-&gt;Reserved0 = le32_to_cpu(ip-&gt;Reserved0);</div><div class='add'>+		le32_to_cpus(&amp;ip-&gt;virtualUnits);</div><div class='add'>+		le32_to_cpus(&amp;ip-&gt;firstUnit);</div><div class='add'>+		le32_to_cpus(&amp;ip-&gt;lastUnit);</div><div class='add'>+		le32_to_cpus(&amp;ip-&gt;flags);</div><div class='add'>+		le32_to_cpus(&amp;ip-&gt;spareUnits);</div><div class='add'>+		le32_to_cpus(&amp;ip-&gt;Reserved0);</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_INFO	"    PARTITION[%d] -&gt;\n"</div><div class='ctx'> 			"        virtualUnits    = %d\n"</div><div class='head'>diff --git a/drivers/mtd/nand/edb7312.c b/drivers/mtd/nand/edb7312.c<br/>index 387e4352903e..86366bfba9f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/edb7312.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/edb7312.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/edb7312.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/edb7312.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;	/* for CLPS7111_VIRT_BASE */</div><div class='add'>+#include &lt;mach/hardware.h&gt;	/* for CLPS7111_VIRT_BASE */</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/clps7111.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c<br/>index 9dff51351f4f..98ad3cefcaf4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/fsl_elbc_nand.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/fsl_elbc_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/fsl_elbc_nand.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/fsl_elbc_nand.c</a></div><div class='hunk'>@@ -887,7 +887,7 @@ static int __devinit fsl_elbc_chip_probe(struct fsl_elbc_ctrl *ctrl,</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;mtd.name = kasprintf(GFP_KERNEL, "%x.flash", res.start);</div><div class='add'>+	priv-&gt;mtd.name = kasprintf(GFP_KERNEL, "%x.flash", (unsigned)res.start);</div><div class='ctx'> 	if (!priv-&gt;mtd.name) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto err;</div><div class='head'>diff --git a/drivers/mtd/nand/h1910.c b/drivers/mtd/nand/h1910.c<br/>index 9e59de501c2e..f8ce79b446ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/h1910.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/h1910.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/h1910.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/h1910.c</a></div><div class='hunk'>@@ -24,10 +24,10 @@</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;	/* for CLPS7111_VIRT_BASE */</div><div class='add'>+#include &lt;mach/hardware.h&gt;	/* for CLPS7111_VIRT_BASE */</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='del'>-#include &lt;asm/arch/h1900-gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/ipaq.h&gt;</div><div class='add'>+#include &lt;mach/h1900-gpio.h&gt;</div><div class='add'>+#include &lt;mach/ipaq.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MTD structure for EDB7312 board</div><div class='head'>diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c<br/>index ecd70e2504f6..556e8131ecdc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nandsim.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/nandsim.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nandsim.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/nandsim.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;asm/div64.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -207,13 +208,16 @@ MODULE_PARM_DESC(overridesize,   "Specifies the NAND Flash size overriding the I</div><div class='ctx'> #define STATE_CMD_READID       0x0000000A /* read ID */</div><div class='ctx'> #define STATE_CMD_ERASE2       0x0000000B /* sector erase second command */</div><div class='ctx'> #define STATE_CMD_RESET        0x0000000C /* reset */</div><div class='add'>+#define STATE_CMD_RNDOUT       0x0000000D /* random output command */</div><div class='add'>+#define STATE_CMD_RNDOUTSTART  0x0000000E /* random output start command */</div><div class='ctx'> #define STATE_CMD_MASK         0x0000000F /* command states mask */</div><div class='ctx'> </div><div class='ctx'> /* After an address is input, the simulator goes to one of these states */</div><div class='ctx'> #define STATE_ADDR_PAGE        0x00000010 /* full (row, column) address is accepted */</div><div class='ctx'> #define STATE_ADDR_SEC         0x00000020 /* sector address was accepted */</div><div class='del'>-#define STATE_ADDR_ZERO        0x00000030 /* one byte zero address was accepted */</div><div class='del'>-#define STATE_ADDR_MASK        0x00000030 /* address states mask */</div><div class='add'>+#define STATE_ADDR_COLUMN      0x00000030 /* column address was accepted */</div><div class='add'>+#define STATE_ADDR_ZERO        0x00000040 /* one byte zero address was accepted */</div><div class='add'>+#define STATE_ADDR_MASK        0x00000070 /* address states mask */</div><div class='ctx'> </div><div class='ctx'> /* Durind data input/output the simulator is in these states */</div><div class='ctx'> #define STATE_DATAIN           0x00000100 /* waiting for data input */</div><div class='hunk'>@@ -240,7 +244,7 @@ MODULE_PARM_DESC(overridesize,   "Specifies the NAND Flash size overriding the I</div><div class='ctx'> #define ACTION_OOBOFF    0x00600000 /* add to address OOB offset */</div><div class='ctx'> #define ACTION_MASK      0x00700000 /* action mask */</div><div class='ctx'> </div><div class='del'>-#define NS_OPER_NUM      12 /* Number of operations supported by the simulator */</div><div class='add'>+#define NS_OPER_NUM      13 /* Number of operations supported by the simulator */</div><div class='ctx'> #define NS_OPER_STATES   6  /* Maximum number of states in operation */</div><div class='ctx'> </div><div class='ctx'> #define OPT_ANY          0xFFFFFFFF /* any chip supports this operation */</div><div class='hunk'>@@ -373,7 +377,10 @@ static struct nandsim_operations {</div><div class='ctx'> 	{OPT_ANY, {STATE_CMD_READID, STATE_ADDR_ZERO, STATE_DATAOUT_ID, STATE_READY}},</div><div class='ctx'> 	/* Large page devices read page */</div><div class='ctx'> 	{OPT_LARGEPAGE, {STATE_CMD_READ0, STATE_ADDR_PAGE, STATE_CMD_READSTART | ACTION_CPY,</div><div class='del'>-			       STATE_DATAOUT, STATE_READY}}</div><div class='add'>+			       STATE_DATAOUT, STATE_READY}},</div><div class='add'>+	/* Large page devices random page read */</div><div class='add'>+	{OPT_LARGEPAGE, {STATE_CMD_RNDOUT, STATE_ADDR_COLUMN, STATE_CMD_RNDOUTSTART | ACTION_CPY,</div><div class='add'>+			       STATE_DATAOUT, STATE_READY}},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct weak_block {</div><div class='hunk'>@@ -579,7 +586,8 @@ static int init_nandsim(struct mtd_info *mtd)</div><div class='ctx'> 	if (ns-&gt;busw == 16)</div><div class='ctx'> 		NS_WARN("16-bit flashes support wasn't tested\n");</div><div class='ctx'> </div><div class='del'>-	printk("flash size: %llu MiB\n",        ns-&gt;geom.totsz &gt;&gt; 20);</div><div class='add'>+	printk("flash size: %llu MiB\n",</div><div class='add'>+			(unsigned long long)ns-&gt;geom.totsz &gt;&gt; 20);</div><div class='ctx'> 	printk("page size: %u bytes\n",         ns-&gt;geom.pgsz);</div><div class='ctx'> 	printk("OOB area size: %u bytes\n",     ns-&gt;geom.oobsz);</div><div class='ctx'> 	printk("sector size: %u KiB\n",         ns-&gt;geom.secsz &gt;&gt; 10);</div><div class='hunk'>@@ -588,8 +596,9 @@ static int init_nandsim(struct mtd_info *mtd)</div><div class='ctx'> 	printk("bus width: %u\n",               ns-&gt;busw);</div><div class='ctx'> 	printk("bits in sector size: %u\n",     ns-&gt;geom.secshift);</div><div class='ctx'> 	printk("bits in page size: %u\n",       ns-&gt;geom.pgshift);</div><div class='del'>-	printk("bits in OOB size: %u\n",        ns-&gt;geom.oobshift);</div><div class='del'>-	printk("flash size with OOB: %llu KiB\n", ns-&gt;geom.totszoob &gt;&gt; 10);</div><div class='add'>+	printk("bits in OOB size: %u\n",	ns-&gt;geom.oobshift);</div><div class='add'>+	printk("flash size with OOB: %llu KiB\n",</div><div class='add'>+			(unsigned long long)ns-&gt;geom.totszoob &gt;&gt; 10);</div><div class='ctx'> 	printk("page address bytes: %u\n",      ns-&gt;geom.pgaddrbytes);</div><div class='ctx'> 	printk("sector address bytes: %u\n",    ns-&gt;geom.secaddrbytes);</div><div class='ctx'> 	printk("options: %#x\n",                ns-&gt;options);</div><div class='hunk'>@@ -937,12 +946,18 @@ static char *get_state_name(uint32_t state)</div><div class='ctx'> 			return "STATE_CMD_ERASE2";</div><div class='ctx'> 		case STATE_CMD_RESET:</div><div class='ctx'> 			return "STATE_CMD_RESET";</div><div class='add'>+		case STATE_CMD_RNDOUT:</div><div class='add'>+			return "STATE_CMD_RNDOUT";</div><div class='add'>+		case STATE_CMD_RNDOUTSTART:</div><div class='add'>+			return "STATE_CMD_RNDOUTSTART";</div><div class='ctx'> 		case STATE_ADDR_PAGE:</div><div class='ctx'> 			return "STATE_ADDR_PAGE";</div><div class='ctx'> 		case STATE_ADDR_SEC:</div><div class='ctx'> 			return "STATE_ADDR_SEC";</div><div class='ctx'> 		case STATE_ADDR_ZERO:</div><div class='ctx'> 			return "STATE_ADDR_ZERO";</div><div class='add'>+		case STATE_ADDR_COLUMN:</div><div class='add'>+			return "STATE_ADDR_COLUMN";</div><div class='ctx'> 		case STATE_DATAIN:</div><div class='ctx'> 			return "STATE_DATAIN";</div><div class='ctx'> 		case STATE_DATAOUT:</div><div class='hunk'>@@ -973,6 +988,7 @@ static int check_command(int cmd)</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> </div><div class='ctx'> 	case NAND_CMD_READ0:</div><div class='add'>+	case NAND_CMD_READ1:</div><div class='ctx'> 	case NAND_CMD_READSTART:</div><div class='ctx'> 	case NAND_CMD_PAGEPROG:</div><div class='ctx'> 	case NAND_CMD_READOOB:</div><div class='hunk'>@@ -982,7 +998,8 @@ static int check_command(int cmd)</div><div class='ctx'> 	case NAND_CMD_READID:</div><div class='ctx'> 	case NAND_CMD_ERASE2:</div><div class='ctx'> 	case NAND_CMD_RESET:</div><div class='del'>-	case NAND_CMD_READ1:</div><div class='add'>+	case NAND_CMD_RNDOUT:</div><div class='add'>+	case NAND_CMD_RNDOUTSTART:</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case NAND_CMD_STATUS_MULTI:</div><div class='hunk'>@@ -1021,6 +1038,10 @@ static uint32_t get_state_by_command(unsigned command)</div><div class='ctx'> 			return STATE_CMD_ERASE2;</div><div class='ctx'> 		case NAND_CMD_RESET:</div><div class='ctx'> 			return STATE_CMD_RESET;</div><div class='add'>+		case NAND_CMD_RNDOUT:</div><div class='add'>+			return STATE_CMD_RNDOUT;</div><div class='add'>+		case NAND_CMD_RNDOUTSTART:</div><div class='add'>+			return STATE_CMD_RNDOUTSTART;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	NS_ERR("get_state_by_command: unknown command, BUG\n");</div><div class='hunk'>@@ -1582,6 +1603,11 @@ static void switch_state(struct nandsim *ns)</div><div class='ctx'> 				ns-&gt;regs.num = 1;</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='add'>+			case STATE_ADDR_COLUMN:</div><div class='add'>+				/* Column address is always 2 bytes */</div><div class='add'>+				ns-&gt;regs.num = ns-&gt;geom.pgaddrbytes - ns-&gt;geom.secaddrbytes;</div><div class='add'>+				break;</div><div class='add'>+</div><div class='ctx'> 			default:</div><div class='ctx'> 				NS_ERR("switch_state: BUG! unknown address state\n");</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1693,15 +1719,21 @@ static void ns_nand_write_byte(struct mtd_info *mtd, u_char byte)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Chip might still be in STATE_DATAOUT</div><div class='del'>-		 * (if OPT_AUTOINCR feature is supported), STATE_DATAOUT_STATUS or</div><div class='del'>-		 * STATE_DATAOUT_STATUS_M state. If so, switch state.</div><div class='del'>-		 */</div><div class='add'>+		/* Check that the command byte is correct */</div><div class='add'>+		if (check_command(byte)) {</div><div class='add'>+			NS_ERR("write_byte: unknown command %#x\n", (uint)byte);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (NS_STATE(ns-&gt;state) == STATE_DATAOUT_STATUS</div><div class='ctx'> 			|| NS_STATE(ns-&gt;state) == STATE_DATAOUT_STATUS_M</div><div class='del'>-			|| ((ns-&gt;options &amp; OPT_AUTOINCR) &amp;&amp; NS_STATE(ns-&gt;state) == STATE_DATAOUT))</div><div class='add'>+			|| NS_STATE(ns-&gt;state) == STATE_DATAOUT) {</div><div class='add'>+			int row = ns-&gt;regs.row;</div><div class='add'>+</div><div class='ctx'> 			switch_state(ns);</div><div class='add'>+			if (byte == NAND_CMD_RNDOUT)</div><div class='add'>+				ns-&gt;regs.row = row;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* Check if chip is expecting command */</div><div class='ctx'> 		if (NS_STATE(ns-&gt;nxstate) != STATE_UNKNOWN &amp;&amp; !(ns-&gt;nxstate &amp; STATE_CMD_MASK)) {</div><div class='hunk'>@@ -1715,12 +1747,6 @@ static void ns_nand_write_byte(struct mtd_info *mtd, u_char byte)</div><div class='ctx'> 			switch_to_ready_state(ns, NS_STATUS_FAILED(ns));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Check that the command byte is correct */</div><div class='del'>-		if (check_command(byte)) {</div><div class='del'>-			NS_ERR("write_byte: unknown command %#x\n", (uint)byte);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		NS_DBG("command byte corresponding to %s state accepted\n",</div><div class='ctx'> 			get_state_name(get_state_by_command(byte)));</div><div class='ctx'> 		ns-&gt;regs.command = byte;</div><div class='head'>diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c<br/>index ee2ac3948cd8..917cf8d3ae95 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/orion_nand.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/orion_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/orion_nand.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/orion_nand.c</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/plat-orion/orion_nand.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;plat/orion_nand.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTD_CMDLINE_PARTS</div><div class='ctx'> static const char *part_probes[] = { "cmdlinepart", NULL };</div><div class='head'>diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c<br/>index fe2bc7e42119..a64ad15b8fdd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/pxa3xx_nand.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/pxa3xx_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/pxa3xx_nand.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/pxa3xx_nand.c</a></div><div class='hunk'>@@ -22,8 +22,8 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa3xx_nand.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa3xx_nand.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define	CHIP_DELAY_TIMEOUT	(2 * HZ/10)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c<br/>index 6dba2fb66ae5..30a518e211bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/sharpsl.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/sharpsl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/sharpsl.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/sharpsl.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void __iomem *sharpsl_io_base;</div><div class='head'>diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c<br/>new file mode 100644<br/>index 000000000000..edb1e322113d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/tmio_nand.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/tmio_nand.c</a></div><div class='hunk'>@@ -0,0 +1,556 @@</div><div class='add'>+/*</div><div class='add'>+ * Toshiba TMIO NAND flash controller driver</div><div class='add'>+ *</div><div class='add'>+ * Slightly murky pre-git history of the driver:</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Ian Molton 2004, 2005, 2008</div><div class='add'>+ *    Original work, independant of sharps code. Included hardware ECC support.</div><div class='add'>+ *    Hard ECC did not work for writes in the early revisions.</div><div class='add'>+ * Copyright (c) Dirk Opfer 2005.</div><div class='add'>+ *    Modifications developed from sharps code but</div><div class='add'>+ *    NOT containing any, ported onto Ians base.</div><div class='add'>+ * Copyright (c) Chris Humbert 2005</div><div class='add'>+ * Copyright (c) Dmitry Baryshkov 2008</div><div class='add'>+ *    Minor fixes</div><div class='add'>+ *</div><div class='add'>+ * Parts copyright Sebastian Carlier</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2. This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/mfd/core.h&gt;</div><div class='add'>+#include &lt;linux/mfd/tmio.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand_ecc.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND Flash Host Controller Configuration Register</div><div class='add'>+ */</div><div class='add'>+#define CCR_COMMAND	0x04	/* w Command				*/</div><div class='add'>+#define CCR_BASE	0x10	/* l NAND Flash Control Reg Base Addr	*/</div><div class='add'>+#define CCR_INTP	0x3d	/* b Interrupt Pin			*/</div><div class='add'>+#define CCR_INTE	0x48	/* b Interrupt Enable			*/</div><div class='add'>+#define CCR_EC		0x4a	/* b Event Control			*/</div><div class='add'>+#define CCR_ICC		0x4c	/* b Internal Clock Control		*/</div><div class='add'>+#define CCR_ECCC	0x5b	/* b ECC Control			*/</div><div class='add'>+#define CCR_NFTC	0x60	/* b NAND Flash Transaction Control	*/</div><div class='add'>+#define CCR_NFM		0x61	/* b NAND Flash Monitor			*/</div><div class='add'>+#define CCR_NFPSC	0x62	/* b NAND Flash Power Supply Control	*/</div><div class='add'>+#define CCR_NFDC	0x63	/* b NAND Flash Detect Control		*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND Flash Control Register</div><div class='add'>+ */</div><div class='add'>+#define FCR_DATA	0x00	/* bwl Data Register			*/</div><div class='add'>+#define FCR_MODE	0x04	/* b Mode Register			*/</div><div class='add'>+#define FCR_STATUS	0x05	/* b Status Register			*/</div><div class='add'>+#define FCR_ISR		0x06	/* b Interrupt Status Register		*/</div><div class='add'>+#define FCR_IMR		0x07	/* b Interrupt Mask Register		*/</div><div class='add'>+</div><div class='add'>+/* FCR_MODE Register Command List */</div><div class='add'>+#define FCR_MODE_DATA	0x94	/* Data Data_Mode */</div><div class='add'>+#define FCR_MODE_COMMAND 0x95	/* Data Command_Mode */</div><div class='add'>+#define FCR_MODE_ADDRESS 0x96	/* Data Address_Mode */</div><div class='add'>+</div><div class='add'>+#define FCR_MODE_HWECC_CALC	0xB4	/* HW-ECC Data */</div><div class='add'>+#define FCR_MODE_HWECC_RESULT	0xD4	/* HW-ECC Calc result Read_Mode */</div><div class='add'>+#define FCR_MODE_HWECC_RESET	0xF4	/* HW-ECC Reset */</div><div class='add'>+</div><div class='add'>+#define FCR_MODE_POWER_ON	0x0C	/* Power Supply ON  to SSFDC card */</div><div class='add'>+#define FCR_MODE_POWER_OFF	0x08	/* Power Supply OFF to SSFDC card */</div><div class='add'>+</div><div class='add'>+#define FCR_MODE_LED_OFF	0x00	/* LED OFF */</div><div class='add'>+#define FCR_MODE_LED_ON		0x04	/* LED ON */</div><div class='add'>+</div><div class='add'>+#define FCR_MODE_EJECT_ON	0x68	/* Ejection events active  */</div><div class='add'>+#define FCR_MODE_EJECT_OFF	0x08	/* Ejection events ignored */</div><div class='add'>+</div><div class='add'>+#define FCR_MODE_LOCK		0x6C	/* Lock_Mode. Eject Switch Invalid */</div><div class='add'>+#define FCR_MODE_UNLOCK		0x0C	/* UnLock_Mode. Eject Switch is valid */</div><div class='add'>+</div><div class='add'>+#define FCR_MODE_CONTROLLER_ID	0x40	/* Controller ID Read */</div><div class='add'>+#define FCR_MODE_STANDBY	0x00	/* SSFDC card Changes Standby State */</div><div class='add'>+</div><div class='add'>+#define FCR_MODE_WE		0x80</div><div class='add'>+#define FCR_MODE_ECC1		0x40</div><div class='add'>+#define FCR_MODE_ECC0		0x20</div><div class='add'>+#define FCR_MODE_CE		0x10</div><div class='add'>+#define FCR_MODE_PCNT1		0x08</div><div class='add'>+#define FCR_MODE_PCNT0		0x04</div><div class='add'>+#define FCR_MODE_ALE		0x02</div><div class='add'>+#define FCR_MODE_CLE		0x01</div><div class='add'>+</div><div class='add'>+#define FCR_STATUS_BUSY		0x80</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+struct tmio_nand {</div><div class='add'>+	struct mtd_info mtd;</div><div class='add'>+	struct nand_chip chip;</div><div class='add'>+</div><div class='add'>+	struct platform_device *dev;</div><div class='add'>+</div><div class='add'>+	void __iomem *ccr;</div><div class='add'>+	void __iomem *fcr;</div><div class='add'>+	unsigned long fcr_base;</div><div class='add'>+</div><div class='add'>+	unsigned int irq;</div><div class='add'>+</div><div class='add'>+	/* for tmio_nand_read_byte */</div><div class='add'>+	u8			read;</div><div class='add'>+	unsigned read_good:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define mtd_to_tmio(m)			container_of(m, struct tmio_nand, mtd)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MTD_CMDLINE_PARTS</div><div class='add'>+static const char *part_probes[] = { "cmdlinepart", NULL };</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*--------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static void tmio_nand_hwcontrol(struct mtd_info *mtd, int cmd,</div><div class='add'>+				   unsigned int ctrl)</div><div class='add'>+{</div><div class='add'>+	struct tmio_nand *tmio = mtd_to_tmio(mtd);</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (ctrl &amp; NAND_CTRL_CHANGE) {</div><div class='add'>+		u8 mode;</div><div class='add'>+</div><div class='add'>+		if (ctrl &amp; NAND_NCE) {</div><div class='add'>+			mode = FCR_MODE_DATA;</div><div class='add'>+</div><div class='add'>+			if (ctrl &amp; NAND_CLE)</div><div class='add'>+				mode |=  FCR_MODE_CLE;</div><div class='add'>+			else</div><div class='add'>+				mode &amp;= ~FCR_MODE_CLE;</div><div class='add'>+</div><div class='add'>+			if (ctrl &amp; NAND_ALE)</div><div class='add'>+				mode |=  FCR_MODE_ALE;</div><div class='add'>+			else</div><div class='add'>+				mode &amp;= ~FCR_MODE_ALE;</div><div class='add'>+		} else {</div><div class='add'>+			mode = FCR_MODE_STANDBY;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tmio_iowrite8(mode, tmio-&gt;fcr + FCR_MODE);</div><div class='add'>+		tmio-&gt;read_good = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd != NAND_CMD_NONE)</div><div class='add'>+		tmio_iowrite8(cmd, chip-&gt;IO_ADDR_W);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmio_nand_dev_ready(struct mtd_info *mtd)</div><div class='add'>+{</div><div class='add'>+	struct tmio_nand *tmio = mtd_to_tmio(mtd);</div><div class='add'>+</div><div class='add'>+	return !(tmio_ioread8(tmio-&gt;fcr + FCR_STATUS) &amp; FCR_STATUS_BUSY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t tmio_irq(int irq, void *__tmio)</div><div class='add'>+{</div><div class='add'>+	struct tmio_nand *tmio = __tmio;</div><div class='add'>+	struct nand_chip *nand_chip = &amp;tmio-&gt;chip;</div><div class='add'>+</div><div class='add'>+	/* disable RDYREQ interrupt */</div><div class='add'>+	tmio_iowrite8(0x00, tmio-&gt;fcr + FCR_IMR);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!waitqueue_active(&amp;nand_chip-&gt;controller-&gt;wq)))</div><div class='add'>+		dev_warn(&amp;tmio-&gt;dev-&gt;dev, "spurious interrupt\n");</div><div class='add'>+</div><div class='add'>+	wake_up(&amp;nand_chip-&gt;controller-&gt;wq);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  *The TMIO core has a RDYREQ interrupt on the posedge of #SMRB.</div><div class='add'>+  *This interrupt is normally disabled, but for long operations like</div><div class='add'>+  *erase and write, we enable it to wake us up.  The irq handler</div><div class='add'>+  *disables the interrupt.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+tmio_nand_wait(struct mtd_info *mtd, struct nand_chip *nand_chip)</div><div class='add'>+{</div><div class='add'>+	struct tmio_nand *tmio = mtd_to_tmio(mtd);</div><div class='add'>+	long timeout;</div><div class='add'>+</div><div class='add'>+	/* enable RDYREQ interrupt */</div><div class='add'>+	tmio_iowrite8(0x0f, tmio-&gt;fcr + FCR_ISR);</div><div class='add'>+	tmio_iowrite8(0x81, tmio-&gt;fcr + FCR_IMR);</div><div class='add'>+</div><div class='add'>+	timeout = wait_event_timeout(nand_chip-&gt;controller-&gt;wq,</div><div class='add'>+		tmio_nand_dev_ready(mtd),</div><div class='add'>+		msecs_to_jiffies(nand_chip-&gt;state == FL_ERASING ? 400 : 20));</div><div class='add'>+</div><div class='add'>+	if (unlikely(!tmio_nand_dev_ready(mtd))) {</div><div class='add'>+		tmio_iowrite8(0x00, tmio-&gt;fcr + FCR_IMR);</div><div class='add'>+		dev_warn(&amp;tmio-&gt;dev-&gt;dev, "still busy with %s after %d ms\n",</div><div class='add'>+			nand_chip-&gt;state == FL_ERASING ? "erase" : "program",</div><div class='add'>+			nand_chip-&gt;state == FL_ERASING ? 400 : 20);</div><div class='add'>+</div><div class='add'>+	} else if (unlikely(!timeout)) {</div><div class='add'>+		tmio_iowrite8(0x00, tmio-&gt;fcr + FCR_IMR);</div><div class='add'>+		dev_warn(&amp;tmio-&gt;dev-&gt;dev, "timeout waiting for interrupt\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nand_chip-&gt;cmdfunc(mtd, NAND_CMD_STATUS, -1, -1);</div><div class='add'>+	return nand_chip-&gt;read_byte(mtd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  *The TMIO controller combines two 8-bit data bytes into one 16-bit</div><div class='add'>+  *word. This function separates them so nand_base.c works as expected,</div><div class='add'>+  *especially its NAND_CMD_READID routines.</div><div class='add'>+ *</div><div class='add'>+  *To prevent stale data from being read, tmio_nand_hwcontrol() clears</div><div class='add'>+  *tmio-&gt;read_good.</div><div class='add'>+ */</div><div class='add'>+static u_char tmio_nand_read_byte(struct mtd_info *mtd)</div><div class='add'>+{</div><div class='add'>+	struct tmio_nand *tmio = mtd_to_tmio(mtd);</div><div class='add'>+	unsigned int data;</div><div class='add'>+</div><div class='add'>+	if (tmio-&gt;read_good--)</div><div class='add'>+		return tmio-&gt;read;</div><div class='add'>+</div><div class='add'>+	data = tmio_ioread16(tmio-&gt;fcr + FCR_DATA);</div><div class='add'>+	tmio-&gt;read = data &gt;&gt; 8;</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  *The TMIO controller converts an 8-bit NAND interface to a 16-bit</div><div class='add'>+  *bus interface, so all data reads and writes must be 16-bit wide.</div><div class='add'>+  *Thus, we implement 16-bit versions of the read, write, and verify</div><div class='add'>+  *buffer functions.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+tmio_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='add'>+{</div><div class='add'>+	struct tmio_nand *tmio = mtd_to_tmio(mtd);</div><div class='add'>+</div><div class='add'>+	tmio_iowrite16_rep(tmio-&gt;fcr + FCR_DATA, buf, len &gt;&gt; 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tmio_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)</div><div class='add'>+{</div><div class='add'>+	struct tmio_nand *tmio = mtd_to_tmio(mtd);</div><div class='add'>+</div><div class='add'>+	tmio_ioread16_rep(tmio-&gt;fcr + FCR_DATA, buf, len &gt;&gt; 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+tmio_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='add'>+{</div><div class='add'>+	struct tmio_nand *tmio = mtd_to_tmio(mtd);</div><div class='add'>+	u16				*p = (u16 *) buf;</div><div class='add'>+</div><div class='add'>+	for (len &gt;&gt;= 1; len; len--)</div><div class='add'>+		if (*(p++) != tmio_ioread16(tmio-&gt;fcr + FCR_DATA))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tmio_nand_enable_hwecc(struct mtd_info *mtd, int mode)</div><div class='add'>+{</div><div class='add'>+	struct tmio_nand *tmio = mtd_to_tmio(mtd);</div><div class='add'>+</div><div class='add'>+	tmio_iowrite8(FCR_MODE_HWECC_RESET, tmio-&gt;fcr + FCR_MODE);</div><div class='add'>+	tmio_ioread8(tmio-&gt;fcr + FCR_DATA);	/* dummy read */</div><div class='add'>+	tmio_iowrite8(FCR_MODE_HWECC_CALC, tmio-&gt;fcr + FCR_MODE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmio_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,</div><div class='add'>+							u_char *ecc_code)</div><div class='add'>+{</div><div class='add'>+	struct tmio_nand *tmio = mtd_to_tmio(mtd);</div><div class='add'>+	unsigned int ecc;</div><div class='add'>+</div><div class='add'>+	tmio_iowrite8(FCR_MODE_HWECC_RESULT, tmio-&gt;fcr + FCR_MODE);</div><div class='add'>+</div><div class='add'>+	ecc = tmio_ioread16(tmio-&gt;fcr + FCR_DATA);</div><div class='add'>+	ecc_code[1] = ecc;	/* 000-255 LP7-0 */</div><div class='add'>+	ecc_code[0] = ecc &gt;&gt; 8;	/* 000-255 LP15-8 */</div><div class='add'>+	ecc = tmio_ioread16(tmio-&gt;fcr + FCR_DATA);</div><div class='add'>+	ecc_code[2] = ecc;	/* 000-255 CP5-0,11b */</div><div class='add'>+	ecc_code[4] = ecc &gt;&gt; 8;	/* 256-511 LP7-0 */</div><div class='add'>+	ecc = tmio_ioread16(tmio-&gt;fcr + FCR_DATA);</div><div class='add'>+	ecc_code[3] = ecc;	/* 256-511 LP15-8 */</div><div class='add'>+	ecc_code[5] = ecc &gt;&gt; 8;	/* 256-511 CP5-0,11b */</div><div class='add'>+</div><div class='add'>+	tmio_iowrite8(FCR_MODE_DATA, tmio-&gt;fcr + FCR_MODE);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmio_hw_init(struct platform_device *dev, struct tmio_nand *tmio)</div><div class='add'>+{</div><div class='add'>+	struct mfd_cell *cell = (struct mfd_cell *)dev-&gt;dev.platform_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (cell-&gt;enable) {</div><div class='add'>+		ret = cell-&gt;enable(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* (4Ch) CLKRUN Enable    1st spcrunc */</div><div class='add'>+	tmio_iowrite8(0x81, tmio-&gt;ccr + CCR_ICC);</div><div class='add'>+</div><div class='add'>+	/* (10h)BaseAddress    0x1000 spba.spba2 */</div><div class='add'>+	tmio_iowrite16(tmio-&gt;fcr_base, tmio-&gt;ccr + CCR_BASE);</div><div class='add'>+	tmio_iowrite16(tmio-&gt;fcr_base &gt;&gt; 16, tmio-&gt;ccr + CCR_BASE + 2);</div><div class='add'>+</div><div class='add'>+	/* (04h)Command Register I/O spcmd */</div><div class='add'>+	tmio_iowrite8(0x02, tmio-&gt;ccr + CCR_COMMAND);</div><div class='add'>+</div><div class='add'>+	/* (62h) Power Supply Control ssmpwc */</div><div class='add'>+	/* HardPowerOFF - SuspendOFF - PowerSupplyWait_4MS */</div><div class='add'>+	tmio_iowrite8(0x02, tmio-&gt;ccr + CCR_NFPSC);</div><div class='add'>+</div><div class='add'>+	/* (63h) Detect Control ssmdtc */</div><div class='add'>+	tmio_iowrite8(0x02, tmio-&gt;ccr + CCR_NFDC);</div><div class='add'>+</div><div class='add'>+	/* Interrupt status register clear sintst */</div><div class='add'>+	tmio_iowrite8(0x0f, tmio-&gt;fcr + FCR_ISR);</div><div class='add'>+</div><div class='add'>+	/* After power supply, Media are reset smode */</div><div class='add'>+	tmio_iowrite8(FCR_MODE_POWER_ON, tmio-&gt;fcr + FCR_MODE);</div><div class='add'>+	tmio_iowrite8(FCR_MODE_COMMAND, tmio-&gt;fcr + FCR_MODE);</div><div class='add'>+	tmio_iowrite8(NAND_CMD_RESET, tmio-&gt;fcr + FCR_DATA);</div><div class='add'>+</div><div class='add'>+	/* Standby Mode smode */</div><div class='add'>+	tmio_iowrite8(FCR_MODE_STANDBY, tmio-&gt;fcr + FCR_MODE);</div><div class='add'>+</div><div class='add'>+	mdelay(5);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tmio_hw_stop(struct platform_device *dev, struct tmio_nand *tmio)</div><div class='add'>+{</div><div class='add'>+	struct mfd_cell *cell = (struct mfd_cell *)dev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	tmio_iowrite8(FCR_MODE_POWER_OFF, tmio-&gt;fcr + FCR_MODE);</div><div class='add'>+	if (cell-&gt;disable)</div><div class='add'>+		cell-&gt;disable(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmio_probe(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct mfd_cell *cell = (struct mfd_cell *)dev-&gt;dev.platform_data;</div><div class='add'>+	struct tmio_nand_data *data = cell-&gt;driver_data;</div><div class='add'>+	struct resource *fcr = platform_get_resource(dev,</div><div class='add'>+			IORESOURCE_MEM, 0);</div><div class='add'>+	struct resource *ccr = platform_get_resource(dev,</div><div class='add'>+			IORESOURCE_MEM, 1);</div><div class='add'>+	int irq = platform_get_irq(dev, 0);</div><div class='add'>+	struct tmio_nand *tmio;</div><div class='add'>+	struct mtd_info *mtd;</div><div class='add'>+	struct nand_chip *nand_chip;</div><div class='add'>+#ifdef CONFIG_MTD_PARTITIONS</div><div class='add'>+	struct mtd_partition *parts;</div><div class='add'>+	int nbparts = 0;</div><div class='add'>+#endif</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (data == NULL)</div><div class='add'>+		dev_warn(&amp;dev-&gt;dev, "NULL platform data!\n");</div><div class='add'>+</div><div class='add'>+	tmio = kzalloc(sizeof *tmio, GFP_KERNEL);</div><div class='add'>+	if (!tmio) {</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto err_kzalloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmio-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(dev, tmio);</div><div class='add'>+	mtd = &amp;tmio-&gt;mtd;</div><div class='add'>+	nand_chip = &amp;tmio-&gt;chip;</div><div class='add'>+	mtd-&gt;priv = nand_chip;</div><div class='add'>+	mtd-&gt;name = "tmio-nand";</div><div class='add'>+</div><div class='add'>+	tmio-&gt;ccr = ioremap(ccr-&gt;start, ccr-&gt;end - ccr-&gt;start + 1);</div><div class='add'>+	if (!tmio-&gt;ccr) {</div><div class='add'>+		retval = -EIO;</div><div class='add'>+		goto err_iomap_ccr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmio-&gt;fcr_base = fcr-&gt;start &amp; 0xfffff;</div><div class='add'>+	tmio-&gt;fcr = ioremap(fcr-&gt;start, fcr-&gt;end - fcr-&gt;start + 1);</div><div class='add'>+	if (!tmio-&gt;fcr) {</div><div class='add'>+		retval = -EIO;</div><div class='add'>+		goto err_iomap_fcr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = tmio_hw_init(dev, tmio);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto err_hwinit;</div><div class='add'>+</div><div class='add'>+	/* Set address of NAND IO lines */</div><div class='add'>+	nand_chip-&gt;IO_ADDR_R = tmio-&gt;fcr;</div><div class='add'>+	nand_chip-&gt;IO_ADDR_W = tmio-&gt;fcr;</div><div class='add'>+</div><div class='add'>+	/* Set address of hardware control function */</div><div class='add'>+	nand_chip-&gt;cmd_ctrl = tmio_nand_hwcontrol;</div><div class='add'>+	nand_chip-&gt;dev_ready = tmio_nand_dev_ready;</div><div class='add'>+	nand_chip-&gt;read_byte = tmio_nand_read_byte;</div><div class='add'>+	nand_chip-&gt;write_buf = tmio_nand_write_buf;</div><div class='add'>+	nand_chip-&gt;read_buf = tmio_nand_read_buf;</div><div class='add'>+	nand_chip-&gt;verify_buf = tmio_nand_verify_buf;</div><div class='add'>+</div><div class='add'>+	/* set eccmode using hardware ECC */</div><div class='add'>+	nand_chip-&gt;ecc.mode = NAND_ECC_HW;</div><div class='add'>+	nand_chip-&gt;ecc.size = 512;</div><div class='add'>+	nand_chip-&gt;ecc.bytes = 6;</div><div class='add'>+	nand_chip-&gt;ecc.hwctl = tmio_nand_enable_hwecc;</div><div class='add'>+	nand_chip-&gt;ecc.calculate = tmio_nand_calculate_ecc;</div><div class='add'>+	nand_chip-&gt;ecc.correct = nand_correct_data;</div><div class='add'>+</div><div class='add'>+	if (data)</div><div class='add'>+		nand_chip-&gt;badblock_pattern = data-&gt;badblock_pattern;</div><div class='add'>+</div><div class='add'>+	/* 15 us command delay time */</div><div class='add'>+	nand_chip-&gt;chip_delay = 15;</div><div class='add'>+</div><div class='add'>+	retval = request_irq(irq, &amp;tmio_irq,</div><div class='add'>+				IRQF_DISABLED, dev-&gt;dev.bus_id, tmio);</div><div class='add'>+	if (retval) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "request_irq error %d\n", retval);</div><div class='add'>+		goto err_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmio-&gt;irq = irq;</div><div class='add'>+	nand_chip-&gt;waitfunc = tmio_nand_wait;</div><div class='add'>+</div><div class='add'>+	/* Scan to find existence of the device */</div><div class='add'>+	if (nand_scan(mtd, 1)) {</div><div class='add'>+		retval = -ENODEV;</div><div class='add'>+		goto err_scan;</div><div class='add'>+	}</div><div class='add'>+	/* Register the partitions */</div><div class='add'>+#ifdef CONFIG_MTD_PARTITIONS</div><div class='add'>+#ifdef CONFIG_MTD_CMDLINE_PARTS</div><div class='add'>+	nbparts = parse_mtd_partitions(mtd, part_probes, &amp;parts, 0);</div><div class='add'>+#endif</div><div class='add'>+	if (nbparts &lt;= 0 &amp;&amp; data) {</div><div class='add'>+		parts = data-&gt;partition;</div><div class='add'>+		nbparts = data-&gt;num_partitions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nbparts)</div><div class='add'>+		retval = add_mtd_partitions(mtd, parts, nbparts);</div><div class='add'>+	else</div><div class='add'>+#endif</div><div class='add'>+	retval = add_mtd_device(mtd);</div><div class='add'>+</div><div class='add'>+	if (!retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	nand_release(mtd);</div><div class='add'>+</div><div class='add'>+err_scan:</div><div class='add'>+	if (tmio-&gt;irq)</div><div class='add'>+		free_irq(tmio-&gt;irq, tmio);</div><div class='add'>+err_irq:</div><div class='add'>+	tmio_hw_stop(dev, tmio);</div><div class='add'>+err_hwinit:</div><div class='add'>+	iounmap(tmio-&gt;fcr);</div><div class='add'>+err_iomap_fcr:</div><div class='add'>+	iounmap(tmio-&gt;ccr);</div><div class='add'>+err_iomap_ccr:</div><div class='add'>+	kfree(tmio);</div><div class='add'>+err_kzalloc:</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmio_remove(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct tmio_nand *tmio = platform_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	nand_release(&amp;tmio-&gt;mtd);</div><div class='add'>+	if (tmio-&gt;irq)</div><div class='add'>+		free_irq(tmio-&gt;irq, tmio);</div><div class='add'>+	tmio_hw_stop(dev, tmio);</div><div class='add'>+	iounmap(tmio-&gt;fcr);</div><div class='add'>+	iounmap(tmio-&gt;ccr);</div><div class='add'>+	kfree(tmio);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int tmio_suspend(struct platform_device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct mfd_cell *cell = (struct mfd_cell *)dev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	if (cell-&gt;suspend)</div><div class='add'>+		cell-&gt;suspend(dev);</div><div class='add'>+</div><div class='add'>+	tmio_hw_stop(dev, platform_get_drvdata(dev));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tmio_resume(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct mfd_cell *cell = (struct mfd_cell *)dev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	/* FIXME - is this required or merely another attack of the broken</div><div class='add'>+	 * SHARP platform? Looks suspicious.</div><div class='add'>+	 */</div><div class='add'>+	tmio_hw_init(dev, platform_get_drvdata(dev));</div><div class='add'>+</div><div class='add'>+	if (cell-&gt;resume)</div><div class='add'>+		cell-&gt;resume(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define tmio_suspend NULL</div><div class='add'>+#define tmio_resume NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct platform_driver tmio_driver = {</div><div class='add'>+	.driver.name	= "tmio-nand",</div><div class='add'>+	.driver.owner	= THIS_MODULE,</div><div class='add'>+	.probe		= tmio_probe,</div><div class='add'>+	.remove		= tmio_remove,</div><div class='add'>+	.suspend	= tmio_suspend,</div><div class='add'>+	.resume		= tmio_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init tmio_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;tmio_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit tmio_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;tmio_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(tmio_init);</div><div class='add'>+module_exit(tmio_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_AUTHOR("Ian Molton, Dirk Opfer, Chris Humbert, Dmitry Baryshkov");</div><div class='add'>+MODULE_DESCRIPTION("NAND flash driver on Toshiba Mobile IO controller");</div><div class='add'>+MODULE_ALIAS("platform:tmio-nand");</div><div class='head'>diff --git a/drivers/mtd/nand/ts7250.c b/drivers/mtd/nand/ts7250.c<br/>index 807a72752eeb..2c410a011317 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/ts7250.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/mtd/nand/ts7250.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/ts7250.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/mtd/nand/ts7250.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c<br/>index dc6e474229b1..e2ce41d3828e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/3c523.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/3c523.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/3c523.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/3c523.c</a></div><div class='hunk'>@@ -640,10 +640,8 @@ static int init586(struct net_device *dev)</div><div class='ctx'> 	cfg_cmd-&gt;time_low = 0x00;</div><div class='ctx'> 	cfg_cmd-&gt;time_high = 0xf2;</div><div class='ctx'> 	cfg_cmd-&gt;promisc = 0;</div><div class='del'>-	if (dev-&gt;flags &amp; (IFF_ALLMULTI | IFF_PROMISC)) {</div><div class='add'>+	if (dev-&gt;flags &amp; (IFF_ALLMULTI | IFF_PROMISC))</div><div class='ctx'> 		cfg_cmd-&gt;promisc = 1;</div><div class='del'>-		dev-&gt;flags |= IFF_PROMISC;</div><div class='del'>-	}</div><div class='ctx'> 	cfg_cmd-&gt;carr_coll = 0x00;</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;scb-&gt;cbl_offset = make16(cfg_cmd);</div><div class='head'>diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c<br/>index 6aca0c640f13..abc84f765973 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/3c527.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/3c527.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/3c527.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/3c527.c</a></div><div class='hunk'>@@ -1521,14 +1521,11 @@ static void do_mc32_set_multicast_list(struct net_device *dev, int retry)</div><div class='ctx'> 	struct mc32_local *lp = netdev_priv(dev);</div><div class='ctx'> 	u16 filt = (1&lt;&lt;2); /* Save Bad Packets, for stats purposes */</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;flags&amp;IFF_PROMISC)</div><div class='add'>+	if ((dev-&gt;flags&amp;IFF_PROMISC) ||</div><div class='add'>+	    (dev-&gt;flags&amp;IFF_ALLMULTI) ||</div><div class='add'>+	    dev-&gt;mc_count &gt; 10)</div><div class='ctx'> 		/* Enable promiscuous mode */</div><div class='ctx'> 		filt |= 1;</div><div class='del'>-	else if((dev-&gt;flags&amp;IFF_ALLMULTI) || dev-&gt;mc_count &gt; 10)</div><div class='del'>-	{</div><div class='del'>-		dev-&gt;flags|=IFF_PROMISC;</div><div class='del'>-		filt |= 1;</div><div class='del'>-	}</div><div class='ctx'> 	else if(dev-&gt;mc_count)</div><div class='ctx'> 	{</div><div class='ctx'> 		unsigned char block[62];</div><div class='head'>diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c<br/>index 8db4e6b89482..491ee16da5c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/3c59x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/3c59x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/3c59x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/3c59x.c</a></div><div class='hunk'>@@ -1692,12 +1692,14 @@ vortex_open(struct net_device *dev)</div><div class='ctx'> 			vp-&gt;rx_ring[i].next = cpu_to_le32(vp-&gt;rx_ring_dma + sizeof(struct boom_rx_desc) * (i+1));</div><div class='ctx'> 			vp-&gt;rx_ring[i].status = 0;	/* Clear complete bit. */</div><div class='ctx'> 			vp-&gt;rx_ring[i].length = cpu_to_le32(PKT_BUF_SZ | LAST_FRAG);</div><div class='del'>-			skb = dev_alloc_skb(PKT_BUF_SZ);</div><div class='add'>+</div><div class='add'>+			skb = __netdev_alloc_skb(dev, PKT_BUF_SZ + NET_IP_ALIGN,</div><div class='add'>+						 GFP_KERNEL);</div><div class='ctx'> 			vp-&gt;rx_skbuff[i] = skb;</div><div class='ctx'> 			if (skb == NULL)</div><div class='ctx'> 				break;			/* Bad news!  */</div><div class='del'>-			skb-&gt;dev = dev;			/* Mark as being used by this device. */</div><div class='del'>-			skb_reserve(skb, 2);	/* Align IP on 16 byte boundaries */</div><div class='add'>+</div><div class='add'>+			skb_reserve(skb, NET_IP_ALIGN);	/* Align IP on 16 byte boundaries */</div><div class='ctx'> 			vp-&gt;rx_ring[i].addr = cpu_to_le32(pci_map_single(VORTEX_PCI(vp), skb-&gt;data, PKT_BUF_SZ, PCI_DMA_FROMDEVICE));</div><div class='ctx'> 		}</div><div class='ctx'> 		if (i != RX_RING_SIZE) {</div><div class='hunk'>@@ -2538,7 +2540,7 @@ boomerang_rx(struct net_device *dev)</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> 		entry = vp-&gt;dirty_rx % RX_RING_SIZE;</div><div class='ctx'> 		if (vp-&gt;rx_skbuff[entry] == NULL) {</div><div class='del'>-			skb = dev_alloc_skb(PKT_BUF_SZ);</div><div class='add'>+			skb = netdev_alloc_skb(dev, PKT_BUF_SZ + NET_IP_ALIGN);</div><div class='ctx'> 			if (skb == NULL) {</div><div class='ctx'> 				static unsigned long last_jif;</div><div class='ctx'> 				if (time_after(jiffies, last_jif + 10 * HZ)) {</div><div class='hunk'>@@ -2549,8 +2551,8 @@ boomerang_rx(struct net_device *dev)</div><div class='ctx'> 					mod_timer(&amp;vp-&gt;rx_oom_timer, RUN_AT(HZ * 1));</div><div class='ctx'> 				break;			/* Bad news!  */</div><div class='ctx'> 			}</div><div class='del'>-			skb-&gt;dev = dev;			/* Mark as being used by this device. */</div><div class='del'>-			skb_reserve(skb, 2);	/* Align IP on 16 byte boundaries */</div><div class='add'>+</div><div class='add'>+			skb_reserve(skb, NET_IP_ALIGN);</div><div class='ctx'> 			vp-&gt;rx_ring[entry].addr = cpu_to_le32(pci_map_single(VORTEX_PCI(vp), skb-&gt;data, PKT_BUF_SZ, PCI_DMA_FROMDEVICE));</div><div class='ctx'> 			vp-&gt;rx_skbuff[entry] = skb;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/8390.c b/drivers/net/8390.c<br/>index dc5d2584bd0c..f72a2e87d569 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/8390.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/8390.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/8390.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/8390.c</a></div><div class='hunk'>@@ -9,42 +9,39 @@ int ei_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return __ei_open(dev);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ei_open);</div><div class='ctx'> </div><div class='ctx'> int ei_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return __ei_close(dev);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ei_close);</div><div class='ctx'> </div><div class='ctx'> irqreturn_t ei_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	return __ei_interrupt(irq, dev_id);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ei_interrupt);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> void ei_poll(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	__ei_poll(dev);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ei_poll);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct net_device *__alloc_ei_netdev(int size)</div><div class='ctx'> {</div><div class='ctx'> 	return ____alloc_ei_netdev(size);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__alloc_ei_netdev);</div><div class='ctx'> </div><div class='ctx'> void NS8390_init(struct net_device *dev, int startp)</div><div class='ctx'> {</div><div class='ctx'> 	__NS8390_init(dev, startp);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(ei_open);</div><div class='del'>-EXPORT_SYMBOL(ei_close);</div><div class='del'>-EXPORT_SYMBOL(ei_interrupt);</div><div class='del'>-#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='del'>-EXPORT_SYMBOL(ei_poll);</div><div class='del'>-#endif</div><div class='ctx'> EXPORT_SYMBOL(NS8390_init);</div><div class='del'>-EXPORT_SYMBOL(__alloc_ei_netdev);</div><div class='ctx'> </div><div class='ctx'> #if defined(MODULE)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/8390p.c b/drivers/net/8390p.c<br/>index 71f19884c4b1..4c6eea4611a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/8390p.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/8390p.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/8390p.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/8390p.c</a></div><div class='hunk'>@@ -4,9 +4,9 @@ static const char version[] =</div><div class='ctx'>     "8390p.c:v1.10cvs 9/23/94 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n";</div><div class='ctx'> </div><div class='ctx'> #define ei_inb(_p)	inb(_p)</div><div class='del'>-#define ei_outb(_v,_p)	outb(_v,_p)</div><div class='add'>+#define ei_outb(_v, _p)	outb(_v, _p)</div><div class='ctx'> #define ei_inb_p(_p)	inb_p(_p)</div><div class='del'>-#define ei_outb_p(_v,_p) outb_p(_v,_p)</div><div class='add'>+#define ei_outb_p(_v, _p) outb_p(_v, _p)</div><div class='ctx'> </div><div class='ctx'> #include "lib8390.c"</div><div class='ctx'> </div><div class='hunk'>@@ -14,42 +14,39 @@ int eip_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return __ei_open(dev);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(eip_open);</div><div class='ctx'> </div><div class='ctx'> int eip_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return __ei_close(dev);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(eip_close);</div><div class='ctx'> </div><div class='ctx'> irqreturn_t eip_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	return __ei_interrupt(irq, dev_id);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(eip_interrupt);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> void eip_poll(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	__ei_poll(dev);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(eip_poll);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct net_device *__alloc_eip_netdev(int size)</div><div class='ctx'> {</div><div class='ctx'> 	return ____alloc_ei_netdev(size);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__alloc_eip_netdev);</div><div class='ctx'> </div><div class='ctx'> void NS8390p_init(struct net_device *dev, int startp)</div><div class='ctx'> {</div><div class='del'>-	return __NS8390_init(dev, startp);</div><div class='add'>+	__NS8390_init(dev, startp);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(eip_open);</div><div class='del'>-EXPORT_SYMBOL(eip_close);</div><div class='del'>-EXPORT_SYMBOL(eip_interrupt);</div><div class='del'>-#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='del'>-EXPORT_SYMBOL(eip_poll);</div><div class='del'>-#endif</div><div class='ctx'> EXPORT_SYMBOL(NS8390p_init);</div><div class='del'>-EXPORT_SYMBOL(__alloc_eip_netdev);</div><div class='ctx'> </div><div class='ctx'> #if defined(MODULE)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig<br/>index fa533c27052a..4a11296a9514 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/Kconfig</a></div><div class='hunk'>@@ -510,14 +510,15 @@ config STNIC</div><div class='ctx'> config SH_ETH</div><div class='ctx'> 	tristate "Renesas SuperH Ethernet support"</div><div class='ctx'> 	depends on SUPERH &amp;&amp; \</div><div class='del'>-		(CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712)</div><div class='add'>+		(CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7763 || \</div><div class='add'>+		 CPU_SUBTYPE_SH7619)</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MII</div><div class='ctx'> 	select MDIO_BITBANG</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	help</div><div class='ctx'> 	  Renesas SuperH Ethernet device driver.</div><div class='del'>-	  This driver support SH7710 and SH7712.</div><div class='add'>+	  This driver support SH7710, SH7712, SH7763 and SH7619.</div><div class='ctx'> </div><div class='ctx'> config SUNLANCE</div><div class='ctx'> 	tristate "Sun LANCE support"</div><div class='hunk'>@@ -821,14 +822,14 @@ config ULTRA32</div><div class='ctx'> 	  will be called smc-ultra32.</div><div class='ctx'> </div><div class='ctx'> config BFIN_MAC</div><div class='del'>-	tristate "Blackfin 527/536/537 on-chip mac support"</div><div class='del'>-	depends on NET_ETHERNET &amp;&amp; (BF527 || BF537 || BF536)</div><div class='add'>+	tristate "Blackfin on-chip MAC support"</div><div class='add'>+	depends on NET_ETHERNET &amp;&amp; (BF526 || BF527 || BF536 || BF537)</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MII</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE</div><div class='ctx'> 	help</div><div class='del'>-	  This is the driver for blackfin on-chip mac device. Say Y if you want it</div><div class='add'>+	  This is the driver for Blackfin on-chip mac device. Say Y if you want it</div><div class='ctx'> 	  compiled into the kernel. This driver is also available as a module</div><div class='ctx'> 	  ( = code which can be inserted in and removed from the running kernel</div><div class='ctx'> 	  whenever you want). The module will be called bfin_mac.</div><div class='hunk'>@@ -1171,7 +1172,7 @@ config ETH16I</div><div class='ctx'> </div><div class='ctx'> config NE2000</div><div class='ctx'> 	tristate "NE2000/NE1000 support"</div><div class='del'>-	depends on NET_ISA || (Q40 &amp;&amp; m) || M32R || TOSHIBA_RBTX4927 || TOSHIBA_RBTX4938</div><div class='add'>+	depends on NET_ISA || (Q40 &amp;&amp; m) || M32R || MACH_TX49XX</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  If you have a network (Ethernet) card of this type, say Y and read</div><div class='head'>diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c<br/>index e4483de84e7f..66de80b64b92 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/acenic.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/acenic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/acenic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/acenic.c</a></div><div class='hunk'>@@ -52,7 +52,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c<br/>index a637910b02dd..aa4a5246be53 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/arm/am79c961a.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/arm/am79c961a.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/arm/am79c961a.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/arm/am79c961a.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c<br/>index ffae266e2d7f..0fa53464efb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/arm/at91_ether.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/arm/at91_ether.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/arm/at91_ether.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/arm/at91_ether.c</a></div><div class='hunk'>@@ -32,9 +32,9 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/at91rm9200_emac.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;mach/at91rm9200_emac.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "at91_ether.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c<br/>index 18d3eeb7eab2..1267444d79da 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/arm/ep93xx_eth.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/arm/ep93xx_eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/arm/ep93xx_eth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/arm/ep93xx_eth.c</a></div><div class='hunk'>@@ -20,8 +20,8 @@</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;asm/arch/ep93xx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/platform.h&gt;</div><div class='add'>+#include &lt;mach/ep93xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/platform.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_MODULE_NAME		"ep93xx-eth"</div><div class='head'>diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c<br/>index 9b777d9433cd..e2d702b8b2e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/arm/ixp4xx_eth.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/arm/ixp4xx_eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/arm/ixp4xx_eth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/arm/ixp4xx_eth.c</a></div><div class='hunk'>@@ -32,8 +32,8 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/arch/npe.h&gt;</div><div class='del'>-#include &lt;asm/arch/qmgr.h&gt;</div><div class='add'>+#include &lt;mach/npe.h&gt;</div><div class='add'>+#include &lt;mach/qmgr.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DEBUG_QUEUES		0</div><div class='ctx'> #define DEBUG_DESC		0</div><div class='hunk'>@@ -551,7 +551,7 @@ static int eth_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 		if ((skb = netdev_alloc_skb(dev, RX_BUFF_SIZE))) {</div><div class='ctx'> 			phys = dma_map_single(&amp;dev-&gt;dev, skb-&gt;data,</div><div class='ctx'> 					      RX_BUFF_SIZE, DMA_FROM_DEVICE);</div><div class='del'>-			if (dma_mapping_error(phys)) {</div><div class='add'>+			if (dma_mapping_error(&amp;dev-&gt;dev, phys)) {</div><div class='ctx'> 				dev_kfree_skb(skb);</div><div class='ctx'> 				skb = NULL;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -698,7 +698,7 @@ static int eth_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	phys = dma_map_single(&amp;dev-&gt;dev, mem, bytes, DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(phys)) {</div><div class='add'>+	if (dma_mapping_error(&amp;dev-&gt;dev, phys)) {</div><div class='ctx'> #ifdef __ARMEB__</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> #else</div><div class='hunk'>@@ -883,7 +883,7 @@ static int init_queues(struct port *port)</div><div class='ctx'> 		desc-&gt;buf_len = MAX_MRU;</div><div class='ctx'> 		desc-&gt;data = dma_map_single(&amp;port-&gt;netdev-&gt;dev, data,</div><div class='ctx'> 					    RX_BUFF_SIZE, DMA_FROM_DEVICE);</div><div class='del'>-		if (dma_mapping_error(desc-&gt;data)) {</div><div class='add'>+		if (dma_mapping_error(&amp;port-&gt;netdev-&gt;dev, desc-&gt;data)) {</div><div class='ctx'> 			free_buffer(buff);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c<br/>index cdc3b85b10b9..619c6583e1aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/atl1e/atl1e_ethtool.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/atl1e/atl1e_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/atl1e/atl1e_ethtool.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/atl1e/atl1e_ethtool.c</a></div><div class='hunk'>@@ -355,7 +355,7 @@ static int atl1e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)</div><div class='ctx'> 	struct atl1e_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='ctx'> 	if (wol-&gt;wolopts &amp; (WAKE_ARP | WAKE_MAGICSECURE |</div><div class='del'>-			    WAKE_MCAST | WAKE_BCAST | WAKE_MCAST))</div><div class='add'>+			    WAKE_UCAST | WAKE_MCAST | WAKE_BCAST))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	/* these settings will always override what we currently have */</div><div class='ctx'> 	adapter-&gt;wol = 0;</div><div class='head'>diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c<br/>index 35264c244cfd..7685b995ff9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/atl1e/atl1e_main.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/atl1e/atl1e_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/atl1e/atl1e_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/atl1e/atl1e_main.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ MODULE_DESCRIPTION("Atheros 1000M Ethernet Network Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> </div><div class='del'>-static inline void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter);</div><div class='add'>+static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter);</div><div class='ctx'> </div><div class='ctx'> static const u16</div><div class='ctx'> atl1e_rx_page_vld_regs[AT_MAX_RECEIVE_QUEUE][AT_PAGE_NUM_PER_QUEUE] =</div><div class='hunk'>@@ -1037,7 +1037,7 @@ static inline void atl1e_configure_dma(struct atl1e_adapter *adapter)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter)</div><div class='add'>+static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	u32 value;</div><div class='ctx'> 	struct atl1e_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -2232,10 +2232,11 @@ static int atl1e_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	AT_WRITE_REG(&amp;adapter-&gt;hw, REG_WOL_CTRL, 0);</div><div class='ctx'> </div><div class='del'>-	if (netif_running(netdev))</div><div class='add'>+	if (netif_running(netdev)) {</div><div class='ctx'> 		err = atl1e_request_irq(adapter);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	atl1e_reset_hw(&amp;adapter-&gt;hw);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c<br/>index f12e3d12474b..e23ce77712f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/atlx/atl1.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/atlx/atl1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/atlx/atl1.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/atlx/atl1.c</a></div><div class='hunk'>@@ -1790,6 +1790,17 @@ static void atl1_rx_checksum(struct atl1_adapter *adapter,</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * The L1 hardware contains a bug that erroneously sets the</div><div class='add'>+	 * PACKET_FLAG_ERR and ERR_FLAG_L4_CHKSUM bits whenever a</div><div class='add'>+	 * fragmented IP packet is received, even though the packet</div><div class='add'>+	 * is perfectly valid and its checksum is correct. There's</div><div class='add'>+	 * no way to distinguish between one of these good packets</div><div class='add'>+	 * and a packet that actually contains a TCP/UDP checksum</div><div class='add'>+	 * error, so all we can do is allow it to be handed up to</div><div class='add'>+	 * the higher layers and let it be sorted out there.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='ctx'> 	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(rrd-&gt;pkt_flg &amp; PACKET_FLAG_ERR)) {</div><div class='hunk'>@@ -1816,14 +1827,6 @@ static void atl1_rx_checksum(struct atl1_adapter *adapter,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* IPv4, but hardware thinks its checksum is wrong */</div><div class='del'>-	if (netif_msg_rx_err(adapter))</div><div class='del'>-		dev_printk(KERN_DEBUG, &amp;pdev-&gt;dev,</div><div class='del'>-			"hw csum wrong, pkt_flag:%x, err_flag:%x\n",</div><div class='del'>-			rrd-&gt;pkt_flg, rrd-&gt;err_flg);</div><div class='del'>-	skb-&gt;ip_summed = CHECKSUM_COMPLETE;</div><div class='del'>-	skb-&gt;csum = htons(rrd-&gt;xsz.xsum_sz.rx_chksum);</div><div class='del'>-	adapter-&gt;hw_csum_err++;</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3019,7 +3022,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev,</div><div class='ctx'> 	netdev-&gt;features = NETIF_F_HW_CSUM;</div><div class='ctx'> 	netdev-&gt;features |= NETIF_F_SG;</div><div class='ctx'> 	netdev-&gt;features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);</div><div class='del'>-	netdev-&gt;features |= NETIF_F_TSO;</div><div class='ctx'> 	netdev-&gt;features |= NETIF_F_LLTX;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/net/atp.c b/drivers/net/atp.c<br/>index 3d4433358a36..c10cd8058e23 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/atp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/atp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/atp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/atp.c</a></div><div class='hunk'>@@ -854,14 +854,9 @@ static void set_rx_mode_8002(struct net_device *dev)</div><div class='ctx'> 	struct net_local *lp = netdev_priv(dev);</div><div class='ctx'> 	long ioaddr = dev-&gt;base_addr;</div><div class='ctx'> </div><div class='del'>-	if ( dev-&gt;mc_count &gt; 0 || (dev-&gt;flags &amp; (IFF_ALLMULTI|IFF_PROMISC))) {</div><div class='del'>-		/* We must make the kernel realise we had to move</div><div class='del'>-		 *	into promisc mode or we start all out war on</div><div class='del'>-		 *	the cable. - AC</div><div class='del'>-		 */</div><div class='del'>-		dev-&gt;flags|=IFF_PROMISC;</div><div class='add'>+	if (dev-&gt;mc_count &gt; 0 || (dev-&gt;flags &amp; (IFF_ALLMULTI|IFF_PROMISC)))</div><div class='ctx'> 		lp-&gt;addr_mode = CMR2h_PROMISC;</div><div class='del'>-	} else</div><div class='add'>+	else</div><div class='ctx'> 		lp-&gt;addr_mode = CMR2h_Normal;</div><div class='ctx'> 	write_reg_high(ioaddr, CMR2, lp-&gt;addr_mode);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c<br/>index cb8be490e5ae..5ee1b0557a02 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/au1000_eth.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/au1000_eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/au1000_eth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/au1000_eth.c</a></div><div class='hunk'>@@ -807,7 +807,7 @@ err_out:</div><div class='ctx'> static int au1000_init(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct au1000_private *aup = (struct au1000_private *) dev-&gt;priv;</div><div class='del'>-	u32 flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 control;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c<br/>index 0b4adf4a0f7d..a886a4b9f7e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ax88796.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/ax88796.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ax88796.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ax88796.c</a></div><div class='hunk'>@@ -554,7 +554,7 @@ static int ax_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;ax-&gt;mii_lock, flags);</div><div class='ctx'> 	mii_ethtool_gset(&amp;ax-&gt;mii, cmd);</div><div class='del'>-	spin_lock_irqsave(&amp;ax-&gt;mii_lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ax-&gt;mii_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -567,7 +567,7 @@ static int ax_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;ax-&gt;mii_lock, flags);</div><div class='ctx'> 	rc = mii_ethtool_sset(&amp;ax-&gt;mii, cmd);</div><div class='del'>-	spin_lock_irqsave(&amp;ax-&gt;mii_lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ax-&gt;mii_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c<br/>index a8ec60e1ed75..3db7db1828e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bfin_mac.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/bfin_mac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bfin_mac.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bfin_mac.c</a></div><div class='hunk'>@@ -605,36 +605,87 @@ adjust_head:</div><div class='ctx'> static int bfin_mac_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 				struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	unsigned int data;</div><div class='add'>+	u16 *data;</div><div class='ctx'> </div><div class='ctx'> 	current_tx_ptr-&gt;skb = skb;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Is skb-&gt;data always 16-bit aligned?</div><div class='del'>-	 * Do we need to memcpy((char *)(tail-&gt;packet + 2), skb-&gt;data, len)?</div><div class='del'>-	 */</div><div class='del'>-	if ((((unsigned int)(skb-&gt;data)) &amp; 0x02) == 2) {</div><div class='del'>-		/* move skb-&gt;data to current_tx_ptr payload */</div><div class='del'>-		data = (unsigned int)(skb-&gt;data) - 2;</div><div class='del'>-		*((unsigned short *)data) = (unsigned short)(skb-&gt;len);</div><div class='del'>-		current_tx_ptr-&gt;desc_a.start_addr = (unsigned long)data;</div><div class='del'>-		/* this is important! */</div><div class='del'>-		blackfin_dcache_flush_range(data, (data + (skb-&gt;len)) + 2);</div><div class='del'>-</div><div class='add'>+	if (ANOMALY_05000285) {</div><div class='add'>+		/*</div><div class='add'>+		 * TXDWA feature is not avaible to older revision &lt; 0.3 silicon</div><div class='add'>+		 * of BF537</div><div class='add'>+		 *</div><div class='add'>+		 * Only if data buffer is ODD WORD alignment, we do not</div><div class='add'>+		 * need to memcpy</div><div class='add'>+		 */</div><div class='add'>+		u32 data_align = (u32)(skb-&gt;data) &amp; 0x3;</div><div class='add'>+		if (data_align == 0x2) {</div><div class='add'>+			/* move skb-&gt;data to current_tx_ptr payload */</div><div class='add'>+			data = (u16 *)(skb-&gt;data) - 1;</div><div class='add'>+			*data = (u16)(skb-&gt;len);</div><div class='add'>+			current_tx_ptr-&gt;desc_a.start_addr = (u32)data;</div><div class='add'>+			/* this is important! */</div><div class='add'>+			blackfin_dcache_flush_range((u32)data,</div><div class='add'>+					(u32)((u8 *)data + skb-&gt;len + 4));</div><div class='add'>+		} else {</div><div class='add'>+			*((u16 *)(current_tx_ptr-&gt;packet)) = (u16)(skb-&gt;len);</div><div class='add'>+			memcpy((u8 *)(current_tx_ptr-&gt;packet + 2), skb-&gt;data,</div><div class='add'>+				skb-&gt;len);</div><div class='add'>+			current_tx_ptr-&gt;desc_a.start_addr =</div><div class='add'>+				(u32)current_tx_ptr-&gt;packet;</div><div class='add'>+			if (current_tx_ptr-&gt;status.status_word != 0)</div><div class='add'>+				current_tx_ptr-&gt;status.status_word = 0;</div><div class='add'>+			blackfin_dcache_flush_range(</div><div class='add'>+				(u32)current_tx_ptr-&gt;packet,</div><div class='add'>+				(u32)(current_tx_ptr-&gt;packet + skb-&gt;len + 2));</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='del'>-		*((unsigned short *)(current_tx_ptr-&gt;packet)) =</div><div class='del'>-		    (unsigned short)(skb-&gt;len);</div><div class='del'>-		memcpy((char *)(current_tx_ptr-&gt;packet + 2), skb-&gt;data,</div><div class='del'>-		       (skb-&gt;len));</div><div class='del'>-		current_tx_ptr-&gt;desc_a.start_addr =</div><div class='del'>-		    (unsigned long)current_tx_ptr-&gt;packet;</div><div class='del'>-		if (current_tx_ptr-&gt;status.status_word != 0)</div><div class='del'>-			current_tx_ptr-&gt;status.status_word = 0;</div><div class='del'>-		blackfin_dcache_flush_range((unsigned int)current_tx_ptr-&gt;</div><div class='del'>-					    packet,</div><div class='del'>-					    (unsigned int)(current_tx_ptr-&gt;</div><div class='del'>-							   packet + skb-&gt;len) +</div><div class='del'>-					    2);</div><div class='add'>+		/*</div><div class='add'>+		 * TXDWA feature is avaible to revision &lt; 0.3 silicon of</div><div class='add'>+		 * BF537 and always avaible to BF52x</div><div class='add'>+		 */</div><div class='add'>+		u32 data_align = (u32)(skb-&gt;data) &amp; 0x3;</div><div class='add'>+		if (data_align == 0x0) {</div><div class='add'>+			u16 sysctl = bfin_read_EMAC_SYSCTL();</div><div class='add'>+			sysctl |= TXDWA;</div><div class='add'>+			bfin_write_EMAC_SYSCTL(sysctl);</div><div class='add'>+</div><div class='add'>+			/* move skb-&gt;data to current_tx_ptr payload */</div><div class='add'>+			data = (u16 *)(skb-&gt;data) - 2;</div><div class='add'>+			*data = (u16)(skb-&gt;len);</div><div class='add'>+			current_tx_ptr-&gt;desc_a.start_addr = (u32)data;</div><div class='add'>+			/* this is important! */</div><div class='add'>+			blackfin_dcache_flush_range(</div><div class='add'>+					(u32)data,</div><div class='add'>+					(u32)((u8 *)data + skb-&gt;len + 4));</div><div class='add'>+		} else if (data_align == 0x2) {</div><div class='add'>+			u16 sysctl = bfin_read_EMAC_SYSCTL();</div><div class='add'>+			sysctl &amp;= ~TXDWA;</div><div class='add'>+			bfin_write_EMAC_SYSCTL(sysctl);</div><div class='add'>+</div><div class='add'>+			/* move skb-&gt;data to current_tx_ptr payload */</div><div class='add'>+			data = (u16 *)(skb-&gt;data) - 1;</div><div class='add'>+			*data = (u16)(skb-&gt;len);</div><div class='add'>+			current_tx_ptr-&gt;desc_a.start_addr = (u32)data;</div><div class='add'>+			/* this is important! */</div><div class='add'>+			blackfin_dcache_flush_range(</div><div class='add'>+					(u32)data,</div><div class='add'>+					(u32)((u8 *)data + skb-&gt;len + 4));</div><div class='add'>+		} else {</div><div class='add'>+			u16 sysctl = bfin_read_EMAC_SYSCTL();</div><div class='add'>+			sysctl &amp;= ~TXDWA;</div><div class='add'>+			bfin_write_EMAC_SYSCTL(sysctl);</div><div class='add'>+</div><div class='add'>+			*((u16 *)(current_tx_ptr-&gt;packet)) = (u16)(skb-&gt;len);</div><div class='add'>+			memcpy((u8 *)(current_tx_ptr-&gt;packet + 2), skb-&gt;data,</div><div class='add'>+				skb-&gt;len);</div><div class='add'>+			current_tx_ptr-&gt;desc_a.start_addr =</div><div class='add'>+				(u32)current_tx_ptr-&gt;packet;</div><div class='add'>+			if (current_tx_ptr-&gt;status.status_word != 0)</div><div class='add'>+				current_tx_ptr-&gt;status.status_word = 0;</div><div class='add'>+			blackfin_dcache_flush_range(</div><div class='add'>+				(u32)current_tx_ptr-&gt;packet,</div><div class='add'>+				(u32)(current_tx_ptr-&gt;packet + skb-&gt;len + 2));</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* enable this packet's dma */</div><div class='hunk'>@@ -691,7 +742,6 @@ static void bfin_mac_rx(struct net_device *dev)</div><div class='ctx'> 					 (unsigned long)skb-&gt;tail);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;last_rx = jiffies;</div><div class='del'>-	skb-&gt;dev = dev;</div><div class='ctx'> 	skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='ctx'> #if defined(BFIN_MAC_CSUM_OFFLOAD)</div><div class='ctx'> 	skb-&gt;csum = current_rx_ptr-&gt;status.ip_payload_csum;</div><div class='hunk'>@@ -920,6 +970,7 @@ static int bfin_mac_open(struct net_device *dev)</div><div class='ctx'> 	phy_start(lp-&gt;phydev);</div><div class='ctx'> 	phy_write(lp-&gt;phydev, MII_BMCR, BMCR_RESET);</div><div class='ctx'> 	setup_system_regs(dev);</div><div class='add'>+	setup_mac_addr(dev-&gt;dev_addr);</div><div class='ctx'> 	bfin_mac_disable();</div><div class='ctx'> 	bfin_mac_enable();</div><div class='ctx'> 	pr_debug("hardware init finished\n");</div><div class='hunk'>@@ -955,7 +1006,7 @@ static int bfin_mac_close(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init bfin_mac_probe(struct platform_device *pdev)</div><div class='add'>+static int __devinit bfin_mac_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	struct bfin_mac_local *lp;</div><div class='hunk'>@@ -1081,7 +1132,7 @@ out_err_probe_mac:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bfin_mac_remove(struct platform_device *pdev)</div><div class='add'>+static int __devexit bfin_mac_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct bfin_mac_local *lp = netdev_priv(ndev);</div><div class='hunk'>@@ -1128,7 +1179,7 @@ static int bfin_mac_resume(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver bfin_mac_driver = {</div><div class='ctx'> 	.probe = bfin_mac_probe,</div><div class='del'>-	.remove = bfin_mac_remove,</div><div class='add'>+	.remove = __devexit_p(bfin_mac_remove),</div><div class='ctx'> 	.resume = bfin_mac_resume,</div><div class='ctx'> 	.suspend = bfin_mac_suspend,</div><div class='ctx'> 	.driver = {</div><div class='head'>diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c<br/>index 5ebde67d4297..2486a656f12d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bnx2.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/bnx2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bnx2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2.c</a></div><div class='hunk'>@@ -35,8 +35,8 @@</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='del'>-#ifdef NETIF_F_HW_VLAN_TX</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)</div><div class='ctx'> #define BCM_VLAN 1</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='hunk'>@@ -57,8 +57,8 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_MODULE_NAME		"bnx2"</div><div class='ctx'> #define PFX DRV_MODULE_NAME	": "</div><div class='del'>-#define DRV_MODULE_VERSION	"1.7.9"</div><div class='del'>-#define DRV_MODULE_RELDATE	"July 18, 2008"</div><div class='add'>+#define DRV_MODULE_VERSION	"1.8.0"</div><div class='add'>+#define DRV_MODULE_RELDATE	"Aug 14, 2008"</div><div class='ctx'> </div><div class='ctx'> #define RUN_AT(x) (jiffies + (x))</div><div class='ctx'> </div><div class='hunk'>@@ -2876,6 +2876,8 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> 		struct sw_bd *rx_buf;</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> 		dma_addr_t dma_addr;</div><div class='add'>+		u16 vtag = 0;</div><div class='add'>+		int hw_vlan __maybe_unused = 0;</div><div class='ctx'> </div><div class='ctx'> 		sw_ring_cons = RX_RING_IDX(sw_cons);</div><div class='ctx'> 		sw_ring_prod = RX_RING_IDX(sw_prod);</div><div class='hunk'>@@ -2919,7 +2921,7 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> 		if (len &lt;= bp-&gt;rx_copy_thresh) {</div><div class='ctx'> 			struct sk_buff *new_skb;</div><div class='ctx'> </div><div class='del'>-			new_skb = netdev_alloc_skb(bp-&gt;dev, len + 2);</div><div class='add'>+			new_skb = netdev_alloc_skb(bp-&gt;dev, len + 6);</div><div class='ctx'> 			if (new_skb == NULL) {</div><div class='ctx'> 				bnx2_reuse_rx_skb(bp, rxr, skb, sw_ring_cons,</div><div class='ctx'> 						  sw_ring_prod);</div><div class='hunk'>@@ -2928,9 +2930,9 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> </div><div class='ctx'> 			/* aligned copy */</div><div class='ctx'> 			skb_copy_from_linear_data_offset(skb,</div><div class='del'>-							 BNX2_RX_OFFSET - 2,</div><div class='del'>-				      new_skb-&gt;data, len + 2);</div><div class='del'>-			skb_reserve(new_skb, 2);</div><div class='add'>+							 BNX2_RX_OFFSET - 6,</div><div class='add'>+				      new_skb-&gt;data, len + 6);</div><div class='add'>+			skb_reserve(new_skb, 6);</div><div class='ctx'> 			skb_put(new_skb, len);</div><div class='ctx'> </div><div class='ctx'> 			bnx2_reuse_rx_skb(bp, rxr, skb,</div><div class='hunk'>@@ -2941,6 +2943,25 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> 			   dma_addr, (sw_ring_cons &lt;&lt; 16) | sw_ring_prod)))</div><div class='ctx'> 			goto next_rx;</div><div class='ctx'> </div><div class='add'>+		if ((status &amp; L2_FHDR_STATUS_L2_VLAN_TAG) &amp;&amp;</div><div class='add'>+		    !(bp-&gt;rx_mode &amp; BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG)) {</div><div class='add'>+			vtag = rx_hdr-&gt;l2_fhdr_vlan_tag;</div><div class='add'>+#ifdef BCM_VLAN</div><div class='add'>+			if (bp-&gt;vlgrp)</div><div class='add'>+				hw_vlan = 1;</div><div class='add'>+			else</div><div class='add'>+#endif</div><div class='add'>+			{</div><div class='add'>+				struct vlan_ethhdr *ve = (struct vlan_ethhdr *)</div><div class='add'>+					__skb_push(skb, 4);</div><div class='add'>+</div><div class='add'>+				memmove(ve, skb-&gt;data + 4, ETH_ALEN * 2);</div><div class='add'>+				ve-&gt;h_vlan_proto = htons(ETH_P_8021Q);</div><div class='add'>+				ve-&gt;h_vlan_TCI = htons(vtag);</div><div class='add'>+				len += 4;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		skb-&gt;protocol = eth_type_trans(skb, bp-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 		if ((len &gt; (bp-&gt;dev-&gt;mtu + ETH_HLEN)) &amp;&amp;</div><div class='hunk'>@@ -2962,10 +2983,8 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> #ifdef BCM_VLAN</div><div class='del'>-		if ((status &amp; L2_FHDR_STATUS_L2_VLAN_TAG) &amp;&amp; bp-&gt;vlgrp) {</div><div class='del'>-			vlan_hwaccel_receive_skb(skb, bp-&gt;vlgrp,</div><div class='del'>-				rx_hdr-&gt;l2_fhdr_vlan_tag);</div><div class='del'>-		}</div><div class='add'>+		if (hw_vlan)</div><div class='add'>+			vlan_hwaccel_receive_skb(skb, bp-&gt;vlgrp, vtag);</div><div class='ctx'> 		else</div><div class='ctx'> #endif</div><div class='ctx'> 			netif_receive_skb(skb);</div><div class='hunk'>@@ -3237,10 +3256,10 @@ bnx2_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 				  BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG);</div><div class='ctx'> 	sort_mode = 1 | BNX2_RPM_SORT_USER0_BC_EN;</div><div class='ctx'> #ifdef BCM_VLAN</div><div class='del'>-	if (!bp-&gt;vlgrp &amp;&amp; !(bp-&gt;flags &amp; BNX2_FLAG_ASF_ENABLE))</div><div class='add'>+	if (!bp-&gt;vlgrp &amp;&amp; (bp-&gt;flags &amp; BNX2_FLAG_CAN_KEEP_VLAN))</div><div class='ctx'> 		rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG;</div><div class='ctx'> #else</div><div class='del'>-	if (!(bp-&gt;flags &amp; BNX2_FLAG_ASF_ENABLE))</div><div class='add'>+	if (bp-&gt;flags &amp; BNX2_FLAG_CAN_KEEP_VLAN)</div><div class='ctx'> 		rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG;</div><div class='ctx'> #endif</div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='hunk'>@@ -5963,10 +5982,12 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		vlan_tag_flags |= TX_BD_FLAGS_TCP_UDP_CKSUM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef BCM_VLAN</div><div class='ctx'> 	if (bp-&gt;vlgrp &amp;&amp; vlan_tx_tag_present(skb)) {</div><div class='ctx'> 		vlan_tag_flags |=</div><div class='ctx'> 			(TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) &lt;&lt; 16));</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> 	if ((mss = skb_shinfo(skb)-&gt;gso_size)) {</div><div class='ctx'> 		u32 tcp_opt_len, ip_tcp_len;</div><div class='ctx'> 		struct iphdr *iph;</div><div class='head'>diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h<br/>index c3c579f98ed0..dfacd31f7ed0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bnx2.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/bnx2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bnx2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2.h</a></div><div class='hunk'>@@ -6597,7 +6597,7 @@ struct flash_spec {</div><div class='ctx'> </div><div class='ctx'> struct bnx2_irq {</div><div class='ctx'> 	irq_handler_t	handler;</div><div class='del'>-	u16		vector;</div><div class='add'>+	unsigned int	vector;</div><div class='ctx'> 	u8		requested;</div><div class='ctx'> 	char		name[16];</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h<br/>index 4bf4f7b205f2..fd705d1295a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bnx2x.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/bnx2x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bnx2x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x.h</a></div><div class='hunk'>@@ -40,20 +40,20 @@</div><div class='ctx'> #define DP(__mask, __fmt, __args...) do { \</div><div class='ctx'> 	if (bp-&gt;msglevel &amp; (__mask)) \</div><div class='ctx'> 		printk(DP_LEVEL "[%s:%d(%s)]" __fmt, __func__, __LINE__, \</div><div class='del'>-			bp-&gt;dev?(bp-&gt;dev-&gt;name):"?", ##__args); \</div><div class='add'>+			bp-&gt;dev ? (bp-&gt;dev-&gt;name) : "?", ##__args); \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> /* errors debug print */</div><div class='ctx'> #define BNX2X_DBG_ERR(__fmt, __args...) do { \</div><div class='ctx'> 	if (bp-&gt;msglevel &amp; NETIF_MSG_PROBE) \</div><div class='ctx'> 		printk(KERN_ERR "[%s:%d(%s)]" __fmt, __func__, __LINE__, \</div><div class='del'>-			bp-&gt;dev?(bp-&gt;dev-&gt;name):"?", ##__args); \</div><div class='add'>+			bp-&gt;dev ? (bp-&gt;dev-&gt;name) : "?", ##__args); \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> /* for errors (never masked) */</div><div class='ctx'> #define BNX2X_ERR(__fmt, __args...) do { \</div><div class='ctx'> 	printk(KERN_ERR "[%s:%d(%s)]" __fmt, __func__, __LINE__, \</div><div class='del'>-		bp-&gt;dev?(bp-&gt;dev-&gt;name):"?", ##__args); \</div><div class='add'>+		bp-&gt;dev ? (bp-&gt;dev-&gt;name) : "?", ##__args); \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> /* before we have a dev-&gt;name use dev_info() */</div><div class='hunk'>@@ -120,16 +120,8 @@</div><div class='ctx'> #define SHMEM_RD(bp, field)		REG_RD(bp, SHMEM_ADDR(bp, field))</div><div class='ctx'> #define SHMEM_WR(bp, field, val)	REG_WR(bp, SHMEM_ADDR(bp, field), val)</div><div class='ctx'> </div><div class='del'>-#define NIG_WR(reg, val)	REG_WR(bp, reg, val)</div><div class='del'>-#define EMAC_WR(reg, val)	REG_WR(bp, emac_base + reg, val)</div><div class='del'>-#define BMAC_WR(reg, val)	REG_WR(bp, GRCBASE_NIG + bmac_addr + reg, val)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define for_each_queue(bp, var)	for (var = 0; var &lt; bp-&gt;num_queues; var++)</div><div class='del'>-</div><div class='del'>-#define for_each_nondefault_queue(bp, var) \</div><div class='del'>-				for (var = 1; var &lt; bp-&gt;num_queues; var++)</div><div class='del'>-#define is_multi(bp)		(bp-&gt;num_queues &gt; 1)</div><div class='add'>+#define EMAC_RD(bp, reg)		REG_RD(bp, emac_base + reg)</div><div class='add'>+#define EMAC_WR(bp, reg, val)		REG_WR(bp, emac_base + reg, val)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* fast path */</div><div class='hunk'>@@ -159,11 +151,13 @@ struct sw_rx_page {</div><div class='ctx'> #define PAGES_PER_SGE_SHIFT		0</div><div class='ctx'> #define PAGES_PER_SGE			(1 &lt;&lt; PAGES_PER_SGE_SHIFT)</div><div class='ctx'> </div><div class='add'>+#define BCM_RX_ETH_PAYLOAD_ALIGN	64</div><div class='add'>+</div><div class='ctx'> /* SGE ring related macros */</div><div class='ctx'> #define NUM_RX_SGE_PAGES		2</div><div class='ctx'> #define RX_SGE_CNT		(BCM_PAGE_SIZE / sizeof(struct eth_rx_sge))</div><div class='ctx'> #define MAX_RX_SGE_CNT			(RX_SGE_CNT - 2)</div><div class='del'>-/* RX_SGE_CNT is promissed to be a power of 2 */</div><div class='add'>+/* RX_SGE_CNT is promised to be a power of 2 */</div><div class='ctx'> #define RX_SGE_MASK			(RX_SGE_CNT - 1)</div><div class='ctx'> #define NUM_RX_SGE			(RX_SGE_CNT * NUM_RX_SGE_PAGES)</div><div class='ctx'> #define MAX_RX_SGE			(NUM_RX_SGE - 1)</div><div class='hunk'>@@ -258,8 +252,7 @@ struct bnx2x_fastpath {</div><div class='ctx'> </div><div class='ctx'> 	unsigned long		tx_pkt,</div><div class='ctx'> 				rx_pkt,</div><div class='del'>-				rx_calls,</div><div class='del'>-				rx_alloc_failed;</div><div class='add'>+				rx_calls;</div><div class='ctx'> 	/* TPA related */</div><div class='ctx'> 	struct sw_rx_bd		tpa_pool[ETH_MAX_AGGREGATION_QUEUES_E1H];</div><div class='ctx'> 	u8			tpa_state[ETH_MAX_AGGREGATION_QUEUES_E1H];</div><div class='hunk'>@@ -275,6 +268,15 @@ struct bnx2x_fastpath {</div><div class='ctx'> </div><div class='ctx'> #define bnx2x_fp(bp, nr, var)		(bp-&gt;fp[nr].var)</div><div class='ctx'> </div><div class='add'>+#define BNX2X_HAS_TX_WORK(fp) \</div><div class='add'>+			((fp-&gt;tx_pkt_prod != le16_to_cpu(*fp-&gt;tx_cons_sb)) || \</div><div class='add'>+			 (fp-&gt;tx_pkt_prod != fp-&gt;tx_pkt_cons))</div><div class='add'>+</div><div class='add'>+#define BNX2X_HAS_RX_WORK(fp) \</div><div class='add'>+			(fp-&gt;rx_comp_cons != rx_cons_sb)</div><div class='add'>+</div><div class='add'>+#define BNX2X_HAS_WORK(fp)	(BNX2X_HAS_RX_WORK(fp) || BNX2X_HAS_TX_WORK(fp))</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* MC hsi */</div><div class='ctx'> #define MAX_FETCH_BD			13	/* HW max BDs per packet */</div><div class='hunk'>@@ -317,7 +319,7 @@ struct bnx2x_fastpath {</div><div class='ctx'> #define RCQ_BD(x)			((x) &amp; MAX_RCQ_BD)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* This is needed for determening of last_max */</div><div class='add'>+/* This is needed for determining of last_max */</div><div class='ctx'> #define SUB_S16(a, b)			(s16)((s16)(a) - (s16)(b))</div><div class='ctx'> </div><div class='ctx'> #define __SGE_MASK_SET_BIT(el, bit) \</div><div class='hunk'>@@ -386,20 +388,28 @@ struct bnx2x_fastpath {</div><div class='ctx'> #define TPA_TYPE(cqe_fp_flags)		((cqe_fp_flags) &amp; \</div><div class='ctx'> 					 (TPA_TYPE_START | TPA_TYPE_END))</div><div class='ctx'> </div><div class='del'>-#define BNX2X_RX_SUM_OK(cqe) \</div><div class='del'>-			(!(cqe-&gt;fast_path_cqe.status_flags &amp; \</div><div class='del'>-			 (ETH_FAST_PATH_RX_CQE_IP_XSUM_NO_VALIDATION_FLG | \</div><div class='del'>-			  ETH_FAST_PATH_RX_CQE_L4_XSUM_NO_VALIDATION_FLG)))</div><div class='add'>+#define ETH_RX_ERROR_FALGS		ETH_FAST_PATH_RX_CQE_PHY_DECODE_ERR_FLG</div><div class='add'>+</div><div class='add'>+#define BNX2X_IP_CSUM_ERR(cqe) \</div><div class='add'>+			(!((cqe)-&gt;fast_path_cqe.status_flags &amp; \</div><div class='add'>+			   ETH_FAST_PATH_RX_CQE_IP_XSUM_NO_VALIDATION_FLG) &amp;&amp; \</div><div class='add'>+			 ((cqe)-&gt;fast_path_cqe.type_error_flags &amp; \</div><div class='add'>+			  ETH_FAST_PATH_RX_CQE_IP_BAD_XSUM_FLG))</div><div class='add'>+</div><div class='add'>+#define BNX2X_L4_CSUM_ERR(cqe) \</div><div class='add'>+			(!((cqe)-&gt;fast_path_cqe.status_flags &amp; \</div><div class='add'>+			   ETH_FAST_PATH_RX_CQE_L4_XSUM_NO_VALIDATION_FLG) &amp;&amp; \</div><div class='add'>+			 ((cqe)-&gt;fast_path_cqe.type_error_flags &amp; \</div><div class='add'>+			  ETH_FAST_PATH_RX_CQE_L4_BAD_XSUM_FLG))</div><div class='add'>+</div><div class='add'>+#define BNX2X_RX_CSUM_OK(cqe) \</div><div class='add'>+			(!(BNX2X_L4_CSUM_ERR(cqe) || BNX2X_IP_CSUM_ERR(cqe)))</div><div class='ctx'> </div><div class='ctx'> #define BNX2X_RX_SUM_FIX(cqe) \</div><div class='ctx'> 			((le16_to_cpu(cqe-&gt;fast_path_cqe.pars_flags.flags) &amp; \</div><div class='ctx'> 			  PARSING_FLAGS_OVER_ETHERNET_PROTOCOL) == \</div><div class='ctx'> 			 (1 &lt;&lt; PARSING_FLAGS_OVER_ETHERNET_PROTOCOL_SHIFT))</div><div class='ctx'> </div><div class='del'>-#define ETH_RX_ERROR_FALGS	(ETH_FAST_PATH_RX_CQE_PHY_DECODE_ERR_FLG | \</div><div class='del'>-				 ETH_FAST_PATH_RX_CQE_IP_BAD_XSUM_FLG | \</div><div class='del'>-				 ETH_FAST_PATH_RX_CQE_L4_BAD_XSUM_FLG)</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> #define FP_USB_FUNC_OFF			(2 + 2*HC_USTORM_SB_NUM_INDICES)</div><div class='ctx'> #define FP_CSB_FUNC_OFF			(2 + 2*HC_CSTORM_SB_NUM_INDICES)</div><div class='hunk'>@@ -647,6 +657,8 @@ struct bnx2x_eth_stats {</div><div class='ctx'> </div><div class='ctx'> 	u32 brb_drop_hi;</div><div class='ctx'> 	u32 brb_drop_lo;</div><div class='add'>+	u32 brb_truncate_hi;</div><div class='add'>+	u32 brb_truncate_lo;</div><div class='ctx'> </div><div class='ctx'> 	u32 jabber_packets_received;</div><div class='ctx'> </div><div class='hunk'>@@ -663,6 +675,9 @@ struct bnx2x_eth_stats {</div><div class='ctx'> 	u32 mac_discard;</div><div class='ctx'> </div><div class='ctx'> 	u32 driver_xoff;</div><div class='add'>+	u32 rx_err_discard_pkt;</div><div class='add'>+	u32 rx_skb_alloc_failed;</div><div class='add'>+	u32 hw_csum_err;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define STATS_OFFSET32(stat_name) \</div><div class='hunk'>@@ -737,8 +752,7 @@ struct bnx2x {</div><div class='ctx'> </div><div class='ctx'> 	u32			rx_csum;</div><div class='ctx'> 	u32			rx_offset;</div><div class='del'>-	u32			rx_buf_use_size;	/* useable size */</div><div class='del'>-	u32			rx_buf_size;		/* with alignment */</div><div class='add'>+	u32			rx_buf_size;</div><div class='ctx'> #define ETH_OVREHEAD			(ETH_HLEN + 8)	/* 8 for CRC + VLAN */</div><div class='ctx'> #define ETH_MIN_PACKET_SIZE		60</div><div class='ctx'> #define ETH_MAX_PACKET_SIZE		1500</div><div class='hunk'>@@ -753,7 +767,6 @@ struct bnx2x {</div><div class='ctx'> 	u16			def_att_idx;</div><div class='ctx'> 	u32			attn_state;</div><div class='ctx'> 	struct attn_route	attn_group[MAX_DYNAMIC_ATTN_GRPS];</div><div class='del'>-	u32			aeu_mask;</div><div class='ctx'> 	u32			nig_mask;</div><div class='ctx'> </div><div class='ctx'> 	/* slow path ring */</div><div class='hunk'>@@ -772,7 +785,7 @@ struct bnx2x {</div><div class='ctx'> 	u8			stats_pending;</div><div class='ctx'> 	u8			set_mac_pending;</div><div class='ctx'> </div><div class='del'>-	/* End of fileds used in the performance code paths */</div><div class='add'>+	/* End of fields used in the performance code paths */</div><div class='ctx'> </div><div class='ctx'> 	int			panic;</div><div class='ctx'> 	int			msglevel;</div><div class='hunk'>@@ -794,9 +807,6 @@ struct bnx2x {</div><div class='ctx'> #define BP_FUNC(bp)			(bp-&gt;func)</div><div class='ctx'> #define BP_E1HVN(bp)			(bp-&gt;func &gt;&gt; 1)</div><div class='ctx'> #define BP_L_ID(bp)			(BP_E1HVN(bp) &lt;&lt; 2)</div><div class='del'>-/* assorted E1HVN */</div><div class='del'>-#define IS_E1HMF(bp)			(bp-&gt;e1hmf != 0)</div><div class='del'>-#define BP_MAX_QUEUES(bp)		(IS_E1HMF(bp) ? 4 : 16)</div><div class='ctx'> </div><div class='ctx'> 	int			pm_cap;</div><div class='ctx'> 	int			pcie_cap;</div><div class='hunk'>@@ -821,6 +831,7 @@ struct bnx2x {</div><div class='ctx'> 	u32			mf_config;</div><div class='ctx'> 	u16			e1hov;</div><div class='ctx'> 	u8			e1hmf;</div><div class='add'>+#define IS_E1HMF(bp)			(bp-&gt;e1hmf != 0)</div><div class='ctx'> </div><div class='ctx'> 	u8			wol;</div><div class='ctx'> </div><div class='hunk'>@@ -836,7 +847,6 @@ struct bnx2x {</div><div class='ctx'> 	u16			rx_ticks_int;</div><div class='ctx'> 	u16			rx_ticks;</div><div class='ctx'> </div><div class='del'>-	u32			stats_ticks;</div><div class='ctx'> 	u32			lin_cnt;</div><div class='ctx'> </div><div class='ctx'> 	int			state;</div><div class='hunk'>@@ -852,6 +862,7 @@ struct bnx2x {</div><div class='ctx'> #define BNX2X_STATE_ERROR		0xf000</div><div class='ctx'> </div><div class='ctx'> 	int			num_queues;</div><div class='add'>+#define BP_MAX_QUEUES(bp)		(IS_E1HMF(bp) ? 4 : 16)</div><div class='ctx'> </div><div class='ctx'> 	u32			rx_mode;</div><div class='ctx'> #define BNX2X_RX_MODE_NONE		0</div><div class='hunk'>@@ -902,10 +913,17 @@ struct bnx2x {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+#define for_each_queue(bp, var)	for (var = 0; var &lt; bp-&gt;num_queues; var++)</div><div class='add'>+</div><div class='add'>+#define for_each_nondefault_queue(bp, var) \</div><div class='add'>+				for (var = 1; var &lt; bp-&gt;num_queues; var++)</div><div class='add'>+#define is_multi(bp)		(bp-&gt;num_queues &gt; 1)</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32);</div><div class='ctx'> void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr, u32 dst_addr,</div><div class='ctx'> 		      u32 len32);</div><div class='del'>-int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode);</div><div class='add'>+int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode, u8 port);</div><div class='ctx'> </div><div class='ctx'> static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,</div><div class='ctx'> 			   int wait)</div><div class='hunk'>@@ -976,7 +994,7 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,</div><div class='ctx'> #define PCICFG_LINK_SPEED_SHIFT		16</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define BNX2X_NUM_STATS			39</div><div class='add'>+#define BNX2X_NUM_STATS			42</div><div class='ctx'> #define BNX2X_NUM_TESTS			8</div><div class='ctx'> </div><div class='ctx'> #define BNX2X_MAC_LOOPBACK		0</div><div class='hunk'>@@ -1007,10 +1025,10 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,</div><div class='ctx'> /* resolution of the rate shaping timer - 100 usec */</div><div class='ctx'> #define RS_PERIODIC_TIMEOUT_USEC	100</div><div class='ctx'> /* resolution of fairness algorithm in usecs -</div><div class='del'>-   coefficient for clauclating the actuall t fair */</div><div class='add'>+   coefficient for calculating the actual t fair */</div><div class='ctx'> #define T_FAIR_COEF			10000000</div><div class='ctx'> /* number of bytes in single QM arbitration cycle -</div><div class='del'>-   coeffiecnt for calculating the fairness timer */</div><div class='add'>+   coefficient for calculating the fairness timer */</div><div class='ctx'> #define QM_ARB_BYTES			40000</div><div class='ctx'> #define FAIR_MEM			2</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/bnx2x_fw_defs.h b/drivers/net/bnx2x_fw_defs.h<br/>index e3da7f69d27b..192fa981b930 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bnx2x_fw_defs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/bnx2x_fw_defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bnx2x_fw_defs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x_fw_defs.h</a></div><div class='hunk'>@@ -9,165 +9,171 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define CSTORM_ASSERT_LIST_INDEX_OFFSET \</div><div class='del'>-	(IS_E1H_OFFSET? 0x7000 : 0x1000)</div><div class='add'>+	(IS_E1H_OFFSET ? 0x7000 : 0x1000)</div><div class='ctx'> #define CSTORM_ASSERT_LIST_OFFSET(idx) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x7020 + (idx * 0x10)) : (0x1020 + (idx * 0x10)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0x7020 + (idx * 0x10)) : (0x1020 + (idx * 0x10)))</div><div class='ctx'> #define CSTORM_DEF_SB_HC_DISABLE_OFFSET(function, index) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x8522 + ((function&gt;&gt;1) * 0x40) + ((function&amp;1) \</div><div class='del'>-	* 0x100) + (index * 0x4)) : (0x1922 + (function * 0x40) + (index \</div><div class='del'>-	* 0x4)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0x8522 + ((function&gt;&gt;1) * 0x40) + \</div><div class='add'>+	((function&amp;1) * 0x100) + (index * 0x4)) : (0x1922 + (function * \</div><div class='add'>+	0x40) + (index * 0x4)))</div><div class='ctx'> #define CSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x8500 + ((function&gt;&gt;1) * 0x40) + ((function&amp;1) \</div><div class='del'>-	* 0x100)) : (0x1900 + (function * 0x40)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0x8500 + ((function&gt;&gt;1) * 0x40) + \</div><div class='add'>+	((function&amp;1) * 0x100)) : (0x1900 + (function * 0x40)))</div><div class='ctx'> #define CSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x8508 + ((function&gt;&gt;1) * 0x40) + ((function&amp;1) \</div><div class='del'>-	* 0x100)) : (0x1908 + (function * 0x40)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0x8508 + ((function&gt;&gt;1) * 0x40) + \</div><div class='add'>+	((function&amp;1) * 0x100)) : (0x1908 + (function * 0x40)))</div><div class='ctx'> #define CSTORM_FUNCTION_MODE_OFFSET \</div><div class='del'>-	(IS_E1H_OFFSET? 0x11e8 : 0xffffffff)</div><div class='add'>+	(IS_E1H_OFFSET ? 0x11e8 : 0xffffffff)</div><div class='ctx'> #define CSTORM_HC_BTR_OFFSET(port) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x8704 + (port * 0xf0)) : (0x1984 + (port * 0xc0)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0x8704 + (port * 0xf0)) : (0x1984 + (port * 0xc0)))</div><div class='ctx'> #define CSTORM_SB_HC_DISABLE_OFFSET(port, cpu_id, index) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x801a + (port * 0x280) + (cpu_id * 0x28) + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x801a + (port * 0x280) + (cpu_id * 0x28) + \</div><div class='ctx'> 	(index * 0x4)) : (0x141a + (port * 0x280) + (cpu_id * 0x28) + \</div><div class='ctx'> 	(index * 0x4)))</div><div class='ctx'> #define CSTORM_SB_HC_TIMEOUT_OFFSET(port, cpu_id, index) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x8018 + (port * 0x280) + (cpu_id * 0x28) + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x8018 + (port * 0x280) + (cpu_id * 0x28) + \</div><div class='ctx'> 	(index * 0x4)) : (0x1418 + (port * 0x280) + (cpu_id * 0x28) + \</div><div class='ctx'> 	(index * 0x4)))</div><div class='ctx'> #define CSTORM_SB_HOST_SB_ADDR_OFFSET(port, cpu_id) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x8000 + (port * 0x280) + (cpu_id * 0x28)) : \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x8000 + (port * 0x280) + (cpu_id * 0x28)) : \</div><div class='ctx'> 	(0x1400 + (port * 0x280) + (cpu_id * 0x28)))</div><div class='ctx'> #define CSTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, cpu_id) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x8008 + (port * 0x280) + (cpu_id * 0x28)) : \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x8008 + (port * 0x280) + (cpu_id * 0x28)) : \</div><div class='ctx'> 	(0x1408 + (port * 0x280) + (cpu_id * 0x28)))</div><div class='ctx'> #define CSTORM_STATS_FLAGS_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x1108 + (function * 0x8)) : (0x5108 + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x1108 + (function * 0x8)) : (0x5108 + \</div><div class='ctx'> 	(function * 0x8)))</div><div class='ctx'> #define TSTORM_APPROXIMATE_MATCH_MULTICAST_FILTERING_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x31c0 + (function * 0x20)) : 0xffffffff)</div><div class='add'>+	(IS_E1H_OFFSET ? (0x31c0 + (function * 0x20)) : 0xffffffff)</div><div class='ctx'> #define TSTORM_ASSERT_LIST_INDEX_OFFSET \</div><div class='del'>-	(IS_E1H_OFFSET? 0xa000 : 0x1000)</div><div class='add'>+	(IS_E1H_OFFSET ? 0xa000 : 0x1000)</div><div class='ctx'> #define TSTORM_ASSERT_LIST_OFFSET(idx) \</div><div class='del'>-	(IS_E1H_OFFSET? (0xa020 + (idx * 0x10)) : (0x1020 + (idx * 0x10)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0xa020 + (idx * 0x10)) : (0x1020 + (idx * 0x10)))</div><div class='ctx'> #define TSTORM_CLIENT_CONFIG_OFFSET(port, client_id) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x3358 + (port * 0x3e8) + (client_id * 0x28)) : \</div><div class='del'>-	(0x9c8 + (port * 0x2f8) + (client_id * 0x28)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0x3358 + (port * 0x3e8) + (client_id * 0x28)) \</div><div class='add'>+	: (0x9c8 + (port * 0x2f8) + (client_id * 0x28)))</div><div class='ctx'> #define TSTORM_DEF_SB_HC_DISABLE_OFFSET(function, index) \</div><div class='del'>-	(IS_E1H_OFFSET? (0xb01a + ((function&gt;&gt;1) * 0x28) + ((function&amp;1) \</div><div class='del'>-	* 0xa0) + (index * 0x4)) : (0x141a + (function * 0x28) + (index * \</div><div class='del'>-	0x4)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0xb01a + ((function&gt;&gt;1) * 0x28) + \</div><div class='add'>+	((function&amp;1) * 0xa0) + (index * 0x4)) : (0x141a + (function * \</div><div class='add'>+	0x28) + (index * 0x4)))</div><div class='ctx'> #define TSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0xb000 + ((function&gt;&gt;1) * 0x28) + ((function&amp;1) \</div><div class='del'>-	* 0xa0)) : (0x1400 + (function * 0x28)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0xb000 + ((function&gt;&gt;1) * 0x28) + \</div><div class='add'>+	((function&amp;1) * 0xa0)) : (0x1400 + (function * 0x28)))</div><div class='ctx'> #define TSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0xb008 + ((function&gt;&gt;1) * 0x28) + ((function&amp;1) \</div><div class='del'>-	* 0xa0)) : (0x1408 + (function * 0x28)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0xb008 + ((function&gt;&gt;1) * 0x28) + \</div><div class='add'>+	((function&amp;1) * 0xa0)) : (0x1408 + (function * 0x28)))</div><div class='ctx'> #define TSTORM_ETH_STATS_QUERY_ADDR_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x2b80 + (function * 0x8)) : (0x4b68 + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x2b80 + (function * 0x8)) : (0x4b68 + \</div><div class='ctx'> 	(function * 0x8)))</div><div class='ctx'> #define TSTORM_FUNCTION_COMMON_CONFIG_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x3000 + (function * 0x38)) : (0x1500 + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x3000 + (function * 0x38)) : (0x1500 + \</div><div class='ctx'> 	(function * 0x38)))</div><div class='ctx'> #define TSTORM_FUNCTION_MODE_OFFSET \</div><div class='del'>-	(IS_E1H_OFFSET? 0x1ad0 : 0xffffffff)</div><div class='add'>+	(IS_E1H_OFFSET ? 0x1ad0 : 0xffffffff)</div><div class='ctx'> #define TSTORM_HC_BTR_OFFSET(port) \</div><div class='del'>-	(IS_E1H_OFFSET? (0xb144 + (port * 0x30)) : (0x1454 + (port * 0x18)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0xb144 + (port * 0x30)) : (0x1454 + (port * 0x18)))</div><div class='ctx'> #define TSTORM_INDIRECTION_TABLE_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x12c8 + (function * 0x80)) : (0x22c8 + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x12c8 + (function * 0x80)) : (0x22c8 + \</div><div class='ctx'> 	(function * 0x80)))</div><div class='ctx'> #define TSTORM_INDIRECTION_TABLE_SIZE 0x80</div><div class='ctx'> #define TSTORM_MAC_FILTER_CONFIG_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x3008 + (function * 0x38)) : (0x1508 + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x3008 + (function * 0x38)) : (0x1508 + \</div><div class='ctx'> 	(function * 0x38)))</div><div class='add'>+#define TSTORM_PER_COUNTER_ID_STATS_OFFSET(port, stats_counter_id) \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x2010 + (port * 0x5b0) + (stats_counter_id * \</div><div class='add'>+	0x50)) : (0x4000 + (port * 0x3f0) + (stats_counter_id * 0x38)))</div><div class='ctx'> #define TSTORM_RX_PRODS_OFFSET(port, client_id) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x3350 + (port * 0x3e8) + (client_id * 0x28)) : \</div><div class='del'>-	(0x9c0 + (port * 0x2f8) + (client_id * 0x28)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0x3350 + (port * 0x3e8) + (client_id * 0x28)) \</div><div class='add'>+	: (0x9c0 + (port * 0x2f8) + (client_id * 0x28)))</div><div class='ctx'> #define TSTORM_STATS_FLAGS_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x2c00 + (function * 0x8)) : (0x4b88 + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x2c00 + (function * 0x8)) : (0x4b88 + \</div><div class='ctx'> 	(function * 0x8)))</div><div class='del'>-#define TSTORM_TPA_EXIST_OFFSET (IS_E1H_OFFSET? 0x3b30 : 0x1c20)</div><div class='del'>-#define USTORM_AGG_DATA_OFFSET (IS_E1H_OFFSET? 0xa040 : 0x2c10)</div><div class='del'>-#define USTORM_AGG_DATA_SIZE (IS_E1H_OFFSET? 0x2440 : 0x1200)</div><div class='add'>+#define TSTORM_TPA_EXIST_OFFSET (IS_E1H_OFFSET ? 0x3b30 : 0x1c20)</div><div class='add'>+#define USTORM_AGG_DATA_OFFSET (IS_E1H_OFFSET ? 0xa040 : 0x2c10)</div><div class='add'>+#define USTORM_AGG_DATA_SIZE (IS_E1H_OFFSET ? 0x2440 : 0x1200)</div><div class='ctx'> #define USTORM_ASSERT_LIST_INDEX_OFFSET \</div><div class='del'>-	(IS_E1H_OFFSET? 0x8000 : 0x1000)</div><div class='add'>+	(IS_E1H_OFFSET ? 0x8000 : 0x1000)</div><div class='ctx'> #define USTORM_ASSERT_LIST_OFFSET(idx) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x8020 + (idx * 0x10)) : (0x1020 + (idx * 0x10)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0x8020 + (idx * 0x10)) : (0x1020 + (idx * 0x10)))</div><div class='ctx'> #define USTORM_CQE_PAGE_BASE_OFFSET(port, clientId) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x3298 + (port * 0x258) + (clientId * 0x18)) : \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x3298 + (port * 0x258) + (clientId * 0x18)) : \</div><div class='ctx'> 	(0x5450 + (port * 0x1c8) + (clientId * 0x18)))</div><div class='ctx'> #define USTORM_DEF_SB_HC_DISABLE_OFFSET(function, index) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x951a + ((function&gt;&gt;1) * 0x28) + ((function&amp;1) \</div><div class='del'>-	* 0xa0) + (index * 0x4)) : (0x191a + (function * 0x28) + (index * \</div><div class='del'>-	0x4)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0x951a + ((function&gt;&gt;1) * 0x28) + \</div><div class='add'>+	((function&amp;1) * 0xa0) + (index * 0x4)) : (0x191a + (function * \</div><div class='add'>+	0x28) + (index * 0x4)))</div><div class='ctx'> #define USTORM_DEF_SB_HOST_SB_ADDR_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x9500 + ((function&gt;&gt;1) * 0x28) + ((function&amp;1) \</div><div class='del'>-	* 0xa0)) : (0x1900 + (function * 0x28)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0x9500 + ((function&gt;&gt;1) * 0x28) + \</div><div class='add'>+	((function&amp;1) * 0xa0)) : (0x1900 + (function * 0x28)))</div><div class='ctx'> #define USTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x9508 + ((function&gt;&gt;1) * 0x28) + ((function&amp;1) \</div><div class='del'>-	* 0xa0)) : (0x1908 + (function * 0x28)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0x9508 + ((function&gt;&gt;1) * 0x28) + \</div><div class='add'>+	((function&amp;1) * 0xa0)) : (0x1908 + (function * 0x28)))</div><div class='ctx'> #define USTORM_FUNCTION_MODE_OFFSET \</div><div class='del'>-	(IS_E1H_OFFSET? 0x2448 : 0xffffffff)</div><div class='add'>+	(IS_E1H_OFFSET ? 0x2448 : 0xffffffff)</div><div class='ctx'> #define USTORM_HC_BTR_OFFSET(port) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x9644 + (port * 0xd0)) : (0x1954 + (port * 0xb8)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0x9644 + (port * 0xd0)) : (0x1954 + (port * 0xb8)))</div><div class='ctx'> #define USTORM_MAX_AGG_SIZE_OFFSET(port, clientId) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x3290 + (port * 0x258) + (clientId * 0x18)) : \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x3290 + (port * 0x258) + (clientId * 0x18)) : \</div><div class='ctx'> 	(0x5448 + (port * 0x1c8) + (clientId * 0x18)))</div><div class='ctx'> #define USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x2408 + (function * 0x8)) : (0x5408 + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x2408 + (function * 0x8)) : (0x5408 + \</div><div class='ctx'> 	(function * 0x8)))</div><div class='ctx'> #define USTORM_SB_HC_DISABLE_OFFSET(port, cpu_id, index) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x901a + (port * 0x280) + (cpu_id * 0x28) + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x901a + (port * 0x280) + (cpu_id * 0x28) + \</div><div class='ctx'> 	(index * 0x4)) : (0x141a + (port * 0x280) + (cpu_id * 0x28) + \</div><div class='ctx'> 	(index * 0x4)))</div><div class='ctx'> #define USTORM_SB_HC_TIMEOUT_OFFSET(port, cpu_id, index) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x9018 + (port * 0x280) + (cpu_id * 0x28) + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x9018 + (port * 0x280) + (cpu_id * 0x28) + \</div><div class='ctx'> 	(index * 0x4)) : (0x1418 + (port * 0x280) + (cpu_id * 0x28) + \</div><div class='ctx'> 	(index * 0x4)))</div><div class='ctx'> #define USTORM_SB_HOST_SB_ADDR_OFFSET(port, cpu_id) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x9000 + (port * 0x280) + (cpu_id * 0x28)) : \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x9000 + (port * 0x280) + (cpu_id * 0x28)) : \</div><div class='ctx'> 	(0x1400 + (port * 0x280) + (cpu_id * 0x28)))</div><div class='ctx'> #define USTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, cpu_id) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x9008 + (port * 0x280) + (cpu_id * 0x28)) : \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x9008 + (port * 0x280) + (cpu_id * 0x28)) : \</div><div class='ctx'> 	(0x1408 + (port * 0x280) + (cpu_id * 0x28)))</div><div class='ctx'> #define XSTORM_ASSERT_LIST_INDEX_OFFSET \</div><div class='del'>-	(IS_E1H_OFFSET? 0x9000 : 0x1000)</div><div class='add'>+	(IS_E1H_OFFSET ? 0x9000 : 0x1000)</div><div class='ctx'> #define XSTORM_ASSERT_LIST_OFFSET(idx) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x9020 + (idx * 0x10)) : (0x1020 + (idx * 0x10)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0x9020 + (idx * 0x10)) : (0x1020 + (idx * 0x10)))</div><div class='ctx'> #define XSTORM_CMNG_PER_PORT_VARS_OFFSET(port) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x24a8 + (port * 0x40)) : (0x3ba0 + (port * 0x40)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0x24a8 + (port * 0x40)) : (0x3ba0 + (port * 0x40)))</div><div class='ctx'> #define XSTORM_DEF_SB_HC_DISABLE_OFFSET(function, index) \</div><div class='del'>-	(IS_E1H_OFFSET? (0xa01a + ((function&gt;&gt;1) * 0x28) + ((function&amp;1) \</div><div class='del'>-	* 0xa0) + (index * 0x4)) : (0x141a + (function * 0x28) + (index * \</div><div class='del'>-	0x4)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0xa01a + ((function&gt;&gt;1) * 0x28) + \</div><div class='add'>+	((function&amp;1) * 0xa0) + (index * 0x4)) : (0x141a + (function * \</div><div class='add'>+	0x28) + (index * 0x4)))</div><div class='ctx'> #define XSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0xa000 + ((function&gt;&gt;1) * 0x28) + ((function&amp;1) \</div><div class='del'>-	* 0xa0)) : (0x1400 + (function * 0x28)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0xa000 + ((function&gt;&gt;1) * 0x28) + \</div><div class='add'>+	((function&amp;1) * 0xa0)) : (0x1400 + (function * 0x28)))</div><div class='ctx'> #define XSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0xa008 + ((function&gt;&gt;1) * 0x28) + ((function&amp;1) \</div><div class='del'>-	* 0xa0)) : (0x1408 + (function * 0x28)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0xa008 + ((function&gt;&gt;1) * 0x28) + \</div><div class='add'>+	((function&amp;1) * 0xa0)) : (0x1408 + (function * 0x28)))</div><div class='ctx'> #define XSTORM_E1HOV_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x2ab8 + (function * 0x2)) : 0xffffffff)</div><div class='add'>+	(IS_E1H_OFFSET ? (0x2ab8 + (function * 0x2)) : 0xffffffff)</div><div class='ctx'> #define XSTORM_ETH_STATS_QUERY_ADDR_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x2418 + (function * 0x8)) : (0x3b70 + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x2418 + (function * 0x8)) : (0x3b70 + \</div><div class='ctx'> 	(function * 0x8)))</div><div class='ctx'> #define XSTORM_FAIRNESS_PER_VN_VARS_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x2568 + (function * 0x70)) : (0x3c60 + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x2568 + (function * 0x70)) : (0x3c60 + \</div><div class='ctx'> 	(function * 0x70)))</div><div class='ctx'> #define XSTORM_FUNCTION_MODE_OFFSET \</div><div class='del'>-	(IS_E1H_OFFSET? 0x2ac8 : 0xffffffff)</div><div class='add'>+	(IS_E1H_OFFSET ? 0x2ac8 : 0xffffffff)</div><div class='ctx'> #define XSTORM_HC_BTR_OFFSET(port) \</div><div class='del'>-	(IS_E1H_OFFSET? (0xa144 + (port * 0x30)) : (0x1454 + (port * 0x18)))</div><div class='add'>+	(IS_E1H_OFFSET ? (0xa144 + (port * 0x30)) : (0x1454 + (port * 0x18)))</div><div class='add'>+#define XSTORM_PER_COUNTER_ID_STATS_OFFSET(port, stats_counter_id) \</div><div class='add'>+	(IS_E1H_OFFSET ? (0xc000 + (port * 0x3f0) + (stats_counter_id * \</div><div class='add'>+	0x38)) : (0x3378 + (port * 0x3f0) + (stats_counter_id * 0x38)))</div><div class='ctx'> #define XSTORM_RATE_SHAPING_PER_VN_VARS_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x2528 + (function * 0x70)) : (0x3c20 + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x2528 + (function * 0x70)) : (0x3c20 + \</div><div class='ctx'> 	(function * 0x70)))</div><div class='ctx'> #define XSTORM_SPQ_PAGE_BASE_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x2000 + (function * 0x10)) : (0x3328 + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x2000 + (function * 0x10)) : (0x3328 + \</div><div class='ctx'> 	(function * 0x10)))</div><div class='ctx'> #define XSTORM_SPQ_PROD_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x2008 + (function * 0x10)) : (0x3330 + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x2008 + (function * 0x10)) : (0x3330 + \</div><div class='ctx'> 	(function * 0x10)))</div><div class='ctx'> #define XSTORM_STATS_FLAGS_OFFSET(function) \</div><div class='del'>-	(IS_E1H_OFFSET? (0x23d8 + (function * 0x8)) : (0x3b60 + \</div><div class='add'>+	(IS_E1H_OFFSET ? (0x23d8 + (function * 0x8)) : (0x3b60 + \</div><div class='ctx'> 	(function * 0x8)))</div><div class='ctx'> #define COMMON_ASM_INVALID_ASSERT_OPCODE 0x0</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/bnx2x_hsi.h b/drivers/net/bnx2x_hsi.h<br/>index d3e8198d7dba..efd764427fa1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bnx2x_hsi.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/bnx2x_hsi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bnx2x_hsi.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x_hsi.h</a></div><div class='hunk'>@@ -1268,7 +1268,7 @@ struct doorbell {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * IGU driver acknowlegement register</div><div class='add'>+ * IGU driver acknowledgement register</div><div class='ctx'>  */</div><div class='ctx'> struct igu_ack_register {</div><div class='ctx'> #if defined(__BIG_ENDIAN)</div><div class='hunk'>@@ -1882,7 +1882,7 @@ struct timers_block_context {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * structure for easy accessability to assembler</div><div class='add'>+ * structure for easy accessibility to assembler</div><div class='ctx'>  */</div><div class='ctx'> struct eth_tx_bd_flags {</div><div class='ctx'> 	u8 as_bitfield;</div><div class='hunk'>@@ -2044,7 +2044,7 @@ struct eth_context {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ethernet doorbell</div><div class='add'>+ * Ethernet doorbell</div><div class='ctx'>  */</div><div class='ctx'> struct eth_tx_doorbell {</div><div class='ctx'> #if defined(__BIG_ENDIAN)</div><div class='hunk'>@@ -2256,7 +2256,7 @@ struct ramrod_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * union for ramrod data for ethernet protocol (CQE) (force size of 16 bits)</div><div class='add'>+ * union for ramrod data for Ethernet protocol (CQE) (force size of 16 bits)</div><div class='ctx'>  */</div><div class='ctx'> union eth_ramrod_data {</div><div class='ctx'> 	struct ramrod_data general;</div><div class='hunk'>@@ -2330,7 +2330,7 @@ struct spe_hdr {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ethernet slow path element</div><div class='add'>+ * Ethernet slow path element</div><div class='ctx'>  */</div><div class='ctx'> union eth_specific_data {</div><div class='ctx'> 	u8 protocol_data[8];</div><div class='hunk'>@@ -2343,7 +2343,7 @@ union eth_specific_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ethernet slow path element</div><div class='add'>+ * Ethernet slow path element</div><div class='ctx'>  */</div><div class='ctx'> struct eth_spe {</div><div class='ctx'> 	struct spe_hdr hdr;</div><div class='hunk'>@@ -2615,7 +2615,7 @@ struct tstorm_eth_rx_producers {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * common flag to indicate existance of TPA.</div><div class='add'>+ * common flag to indicate existence of TPA.</div><div class='ctx'>  */</div><div class='ctx'> struct tstorm_eth_tpa_exist {</div><div class='ctx'> #if defined(__BIG_ENDIAN)</div><div class='hunk'>@@ -2765,7 +2765,7 @@ struct tstorm_common_stats {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Eth statistics query sturcture for the eth_stats_quesry ramrod</div><div class='add'>+ * Eth statistics query structure for the eth_stats_query ramrod</div><div class='ctx'>  */</div><div class='ctx'> struct eth_stats_query {</div><div class='ctx'> 	struct xstorm_common_stats xstorm_common;</div><div class='head'>diff --git a/drivers/net/bnx2x_init.h b/drivers/net/bnx2x_init.h<br/>index 4c7750789b62..130927cfc75b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bnx2x_init.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/bnx2x_init.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bnx2x_init.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x_init.h</a></div><div class='hunk'>@@ -72,26 +72,26 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct raw_op {</div><div class='del'>-	u32 op		:8;</div><div class='del'>-	u32 offset	:24;</div><div class='add'>+	u32 op:8;</div><div class='add'>+	u32 offset:24;</div><div class='ctx'> 	u32 raw_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct op_read {</div><div class='del'>-	u32 op		:8;</div><div class='del'>-	u32 offset	:24;</div><div class='add'>+	u32 op:8;</div><div class='add'>+	u32 offset:24;</div><div class='ctx'> 	u32 pad;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct op_write {</div><div class='del'>-	u32 op		:8;</div><div class='del'>-	u32 offset	:24;</div><div class='add'>+	u32 op:8;</div><div class='add'>+	u32 offset:24;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct op_string_write {</div><div class='del'>-	u32 op		:8;</div><div class='del'>-	u32 offset	:24;</div><div class='add'>+	u32 op:8;</div><div class='add'>+	u32 offset:24;</div><div class='ctx'> #ifdef __LITTLE_ENDIAN</div><div class='ctx'> 	u16 data_off;</div><div class='ctx'> 	u16 data_len;</div><div class='hunk'>@@ -102,8 +102,8 @@ struct op_string_write {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct op_zero {</div><div class='del'>-	u32 op		:8;</div><div class='del'>-	u32 offset	:24;</div><div class='add'>+	u32 op:8;</div><div class='add'>+	u32 offset:24;</div><div class='ctx'> 	u32 len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -208,7 +208,7 @@ static void bnx2x_init_wr_64(struct bnx2x *bp, u32 addr, const u32 *data,</div><div class='ctx'> /*********************************************************</div><div class='ctx'>    There are different blobs for each PRAM section.</div><div class='ctx'>    In addition, each blob write operation is divided into a few operations</div><div class='del'>-   in order to decrease the amount of phys. contigious buffer needed.</div><div class='add'>+   in order to decrease the amount of phys. contiguous buffer needed.</div><div class='ctx'>    Thus, when we select a blob the address may be with some offset</div><div class='ctx'>    from the beginning of PRAM section.</div><div class='ctx'>    The same holds for the INT_TABLE sections.</div><div class='hunk'>@@ -336,7 +336,7 @@ static void bnx2x_init_block(struct bnx2x *bp, u32 op_start, u32 op_end)</div><div class='ctx'> 		len = op-&gt;str_wr.data_len;</div><div class='ctx'> 		data = data_base + op-&gt;str_wr.data_off;</div><div class='ctx'> </div><div class='del'>-		/* carefull! it must be in order */</div><div class='add'>+		/* careful! it must be in order */</div><div class='ctx'> 		if (unlikely(op_type &gt; OP_WB)) {</div><div class='ctx'> </div><div class='ctx'> 			/* If E1 only */</div><div class='hunk'>@@ -740,7 +740,7 @@ static u8 calc_crc8(u32 data, u8 crc)</div><div class='ctx'> 	return crc_res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* regiesers addresses are not in order</div><div class='add'>+/* registers addresses are not in order</div><div class='ctx'>    so these arrays help simplify the code */</div><div class='ctx'> static const int cm_start[E1H_FUNC_MAX][9] = {</div><div class='ctx'> 	{MISC_FUNC0_START, TCM_FUNC0_START, UCM_FUNC0_START, CCM_FUNC0_START,</div><div class='head'>diff --git a/drivers/net/bnx2x_init_values.h b/drivers/net/bnx2x_init_values.h<br/>index 63019055e4bb..9755bf6b08dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bnx2x_init_values.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/bnx2x_init_values.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bnx2x_init_values.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x_init_values.h</a></div><div class='hunk'>@@ -901,31 +901,28 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3760, 0x4},</div><div class='ctx'> 	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x1e20, 0x42},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3738, 0x9},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3000, 0x400},</div><div class='add'>+	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4b68, 0x2},</div><div class='ctx'> 	{OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x3738 + 0x24, 0x10293},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x2c00, 0x2},</div><div class='add'>+	{OP_SW_E1, USEM_REG_FAST_MEMORY + 0x4b68 + 0x8, 0x20278},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3180, 0x42},</div><div class='del'>-	{OP_SW_E1, USEM_REG_FAST_MEMORY + 0x2c00 + 0x8, 0x20278},</div><div class='add'>+	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4b10, 0x2},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5000, 0x400},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4b68, 0x2},</div><div class='add'>+	{OP_SW_E1, USEM_REG_FAST_MEMORY + 0x2830, 0x2027a},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4000, 0x2},</div><div class='del'>-	{OP_SW_E1, USEM_REG_FAST_MEMORY + 0x4b68 + 0x8, 0x2027a},</div><div class='ctx'> 	{OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x4000 + 0x8, 0x20294},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4b10, 0x2},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6b68, 0x2},</div><div class='del'>-	{OP_SW_E1, USEM_REG_FAST_MEMORY + 0x2830, 0x2027c},</div><div class='ctx'> 	{OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x6b68 + 0x8, 0x20296},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6b10, 0x2},</div><div class='ctx'> 	{OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x74c0, 0x20298},</div><div class='ctx'> 	{OP_WR, USEM_REG_FAST_MEMORY + 0x10800, 0x1000000},</div><div class='del'>-	{OP_SW_E1, USEM_REG_FAST_MEMORY + 0x10c00, 0x10027e},</div><div class='add'>+	{OP_SW_E1, USEM_REG_FAST_MEMORY + 0x10c00, 0x10027c},</div><div class='ctx'> 	{OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x10c00, 0x10029a},</div><div class='ctx'> 	{OP_WR, USEM_REG_FAST_MEMORY + 0x10800, 0x0},</div><div class='del'>-	{OP_SW_E1, USEM_REG_FAST_MEMORY + 0x10c40, 0x10028e},</div><div class='add'>+	{OP_SW_E1, USEM_REG_FAST_MEMORY + 0x10c40, 0x10028c},</div><div class='ctx'> 	{OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x10c40, 0x1002aa},</div><div class='ctx'> 	{OP_ZP_E1, USEM_REG_INT_TABLE, 0xc20000},</div><div class='ctx'> 	{OP_ZP_E1H, USEM_REG_INT_TABLE, 0xc40000},</div><div class='del'>-	{OP_WR_64_E1, USEM_REG_INT_TABLE + 0x368, 0x13029e},</div><div class='add'>+	{OP_WR_64_E1, USEM_REG_INT_TABLE + 0x368, 0x13029c},</div><div class='ctx'> 	{OP_WR_64_E1H, USEM_REG_INT_TABLE + 0x368, 0x1302ba},</div><div class='ctx'> 	{OP_ZP_E1, USEM_REG_PRAM, 0x311c0000},</div><div class='ctx'> 	{OP_ZP_E1H, USEM_REG_PRAM, 0x31070000},</div><div class='hunk'>@@ -933,11 +930,11 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZP_E1H, USEM_REG_PRAM + 0x8000, 0x330e0c42},</div><div class='ctx'> 	{OP_ZP_E1, USEM_REG_PRAM + 0x10000, 0x38561919},</div><div class='ctx'> 	{OP_ZP_E1H, USEM_REG_PRAM + 0x10000, 0x389b1906},</div><div class='del'>-	{OP_WR_64_E1, USEM_REG_PRAM + 0x17fe0, 0x500402a0},</div><div class='add'>+	{OP_WR_64_E1, USEM_REG_PRAM + 0x17fe0, 0x5004029e},</div><div class='ctx'> 	{OP_ZP_E1H, USEM_REG_PRAM + 0x18000, 0x132272d},</div><div class='ctx'> 	{OP_WR_64_E1H, USEM_REG_PRAM + 0x18250, 0x4fb602bc},</div><div class='del'>-#define USEM_COMMON_END         790</div><div class='del'>-#define USEM_PORT0_START        790</div><div class='add'>+#define USEM_COMMON_END         787</div><div class='add'>+#define USEM_PORT0_START        787</div><div class='ctx'> 	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x1400, 0xa0},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x9000, 0xa0},</div><div class='ctx'> 	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x1900, 0xa},</div><div class='hunk'>@@ -950,44 +947,27 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3288, 0x96},</div><div class='ctx'> 	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x5440, 0x72},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5000, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3000, 0x20},</div><div class='add'>+	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4b78, 0x52},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5100, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3100, 0x20},</div><div class='add'>+	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4e08, 0xc},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5200, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3200, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5300, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3300, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5400, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3400, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5500, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3500, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5600, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3600, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5700, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3700, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5800, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3800, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5900, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3900, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5a00, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3a00, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5b00, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3b00, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5c00, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3c00, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5d00, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3d00, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5e00, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3e00, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5f00, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3f00, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6b78, 0x52},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x2c10, 0x2},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6e08, 0xc},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4b78, 0x52},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4e08, 0xc},</div><div class='del'>-#define USEM_PORT0_END          838</div><div class='del'>-#define USEM_PORT1_START        838</div><div class='add'>+#define USEM_PORT0_END          818</div><div class='add'>+#define USEM_PORT1_START        818</div><div class='ctx'> 	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x1680, 0xa0},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x9280, 0xa0},</div><div class='ctx'> 	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x1928, 0xa},</div><div class='hunk'>@@ -1000,76 +980,59 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x34e0, 0x96},</div><div class='ctx'> 	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x5608, 0x72},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5080, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3080, 0x20},</div><div class='add'>+	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4cc0, 0x52},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5180, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3180, 0x20},</div><div class='add'>+	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4e38, 0xc},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5280, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3280, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5380, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3380, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5480, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3480, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5580, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3580, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5680, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3680, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5780, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3780, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5880, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3880, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5980, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3980, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5a80, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3a80, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5b80, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3b80, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5c80, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3c80, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5d80, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3d80, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5e80, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3e80, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5f80, 0x20},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3f80, 0x20},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6cc0, 0x52},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x2c20, 0x2},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6e38, 0xc},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4cc0, 0x52},</div><div class='del'>-	{OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4e38, 0xc},</div><div class='del'>-#define USEM_PORT1_END          886</div><div class='del'>-#define USEM_FUNC0_START        886</div><div class='add'>+#define USEM_PORT1_END          849</div><div class='add'>+#define USEM_FUNC0_START        849</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3000, 0x4},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4010, 0x2},</div><div class='del'>-#define USEM_FUNC0_END          888</div><div class='del'>-#define USEM_FUNC1_START        888</div><div class='add'>+#define USEM_FUNC0_END          851</div><div class='add'>+#define USEM_FUNC1_START        851</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3010, 0x4},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4020, 0x2},</div><div class='del'>-#define USEM_FUNC1_END          890</div><div class='del'>-#define USEM_FUNC2_START        890</div><div class='add'>+#define USEM_FUNC1_END          853</div><div class='add'>+#define USEM_FUNC2_START        853</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3020, 0x4},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4030, 0x2},</div><div class='del'>-#define USEM_FUNC2_END          892</div><div class='del'>-#define USEM_FUNC3_START        892</div><div class='add'>+#define USEM_FUNC2_END          855</div><div class='add'>+#define USEM_FUNC3_START        855</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3030, 0x4},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4040, 0x2},</div><div class='del'>-#define USEM_FUNC3_END          894</div><div class='del'>-#define USEM_FUNC4_START        894</div><div class='add'>+#define USEM_FUNC3_END          857</div><div class='add'>+#define USEM_FUNC4_START        857</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3040, 0x4},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4050, 0x2},</div><div class='del'>-#define USEM_FUNC4_END          896</div><div class='del'>-#define USEM_FUNC5_START        896</div><div class='add'>+#define USEM_FUNC4_END          859</div><div class='add'>+#define USEM_FUNC5_START        859</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3050, 0x4},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4060, 0x2},</div><div class='del'>-#define USEM_FUNC5_END          898</div><div class='del'>-#define USEM_FUNC6_START        898</div><div class='add'>+#define USEM_FUNC5_END          861</div><div class='add'>+#define USEM_FUNC6_START        861</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3060, 0x4},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4070, 0x2},</div><div class='del'>-#define USEM_FUNC6_END          900</div><div class='del'>-#define USEM_FUNC7_START        900</div><div class='add'>+#define USEM_FUNC6_END          863</div><div class='add'>+#define USEM_FUNC7_START        863</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3070, 0x4},</div><div class='ctx'> 	{OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4080, 0x2},</div><div class='del'>-#define USEM_FUNC7_END          902</div><div class='del'>-#define CSEM_COMMON_START       902</div><div class='add'>+#define USEM_FUNC7_END          865</div><div class='add'>+#define CSEM_COMMON_START       865</div><div class='ctx'> 	{OP_RD, CSEM_REG_MSG_NUM_FIC0, 0x0},</div><div class='ctx'> 	{OP_RD, CSEM_REG_MSG_NUM_FIC1, 0x0},</div><div class='ctx'> 	{OP_RD, CSEM_REG_MSG_NUM_FOC0, 0x0},</div><div class='hunk'>@@ -1128,29 +1091,29 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x11e8, 0x0},</div><div class='ctx'> 	{OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x25c0, 0x240},</div><div class='ctx'> 	{OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3000, 0xc0},</div><div class='del'>-	{OP_SW_E1, CSEM_REG_FAST_MEMORY + 0x2ec8, 0x802a2},</div><div class='add'>+	{OP_SW_E1, CSEM_REG_FAST_MEMORY + 0x2ec8, 0x802a0},</div><div class='ctx'> 	{OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x4070, 0x80},</div><div class='ctx'> 	{OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x5280, 0x4},</div><div class='ctx'> 	{OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x6280, 0x240},</div><div class='ctx'> 	{OP_SW_E1H, CSEM_REG_FAST_MEMORY + 0x6b88, 0x2002be},</div><div class='ctx'> 	{OP_WR, CSEM_REG_FAST_MEMORY + 0x10800, 0x13fffff},</div><div class='del'>-	{OP_SW_E1, CSEM_REG_FAST_MEMORY + 0x10c00, 0x1002aa},</div><div class='add'>+	{OP_SW_E1, CSEM_REG_FAST_MEMORY + 0x10c00, 0x1002a8},</div><div class='ctx'> 	{OP_SW_E1H, CSEM_REG_FAST_MEMORY + 0x10c00, 0x1002de},</div><div class='ctx'> 	{OP_WR, CSEM_REG_FAST_MEMORY + 0x10800, 0x0},</div><div class='del'>-	{OP_SW_E1, CSEM_REG_FAST_MEMORY + 0x10c40, 0x1002ba},</div><div class='add'>+	{OP_SW_E1, CSEM_REG_FAST_MEMORY + 0x10c40, 0x1002b8},</div><div class='ctx'> 	{OP_SW_E1H, CSEM_REG_FAST_MEMORY + 0x10c40, 0x1002ee},</div><div class='ctx'> 	{OP_ZP_E1, CSEM_REG_INT_TABLE, 0x6e0000},</div><div class='ctx'> 	{OP_ZP_E1H, CSEM_REG_INT_TABLE, 0x6f0000},</div><div class='del'>-	{OP_WR_64_E1, CSEM_REG_INT_TABLE + 0x380, 0x1002ca},</div><div class='add'>+	{OP_WR_64_E1, CSEM_REG_INT_TABLE + 0x380, 0x1002c8},</div><div class='ctx'> 	{OP_WR_64_E1H, CSEM_REG_INT_TABLE + 0x380, 0x1002fe},</div><div class='ctx'> 	{OP_ZP_E1, CSEM_REG_PRAM, 0x32580000},</div><div class='ctx'> 	{OP_ZP_E1H, CSEM_REG_PRAM, 0x31fa0000},</div><div class='ctx'> 	{OP_ZP_E1, CSEM_REG_PRAM + 0x8000, 0x18270c96},</div><div class='ctx'> 	{OP_ZP_E1H, CSEM_REG_PRAM + 0x8000, 0x19040c7f},</div><div class='del'>-	{OP_WR_64_E1, CSEM_REG_PRAM + 0xb210, 0x682402cc},</div><div class='add'>+	{OP_WR_64_E1, CSEM_REG_PRAM + 0xb210, 0x682402ca},</div><div class='ctx'> 	{OP_WR_64_E1H, CSEM_REG_PRAM + 0xb430, 0x67e00300},</div><div class='del'>-#define CSEM_COMMON_END         981</div><div class='del'>-#define CSEM_PORT0_START        981</div><div class='add'>+#define CSEM_COMMON_END         944</div><div class='add'>+#define CSEM_PORT0_START        944</div><div class='ctx'> 	{OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x1400, 0xa0},</div><div class='ctx'> 	{OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x8000, 0xa0},</div><div class='ctx'> 	{OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x1900, 0x10},</div><div class='hunk'>@@ -1163,8 +1126,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x6040, 0x30},</div><div class='ctx'> 	{OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x3040, 0x6},</div><div class='ctx'> 	{OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x2410, 0x30},</div><div class='del'>-#define CSEM_PORT0_END          993</div><div class='del'>-#define CSEM_PORT1_START        993</div><div class='add'>+#define CSEM_PORT0_END          956</div><div class='add'>+#define CSEM_PORT1_START        956</div><div class='ctx'> 	{OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x1680, 0xa0},</div><div class='ctx'> 	{OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x8280, 0xa0},</div><div class='ctx'> 	{OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x1940, 0x10},</div><div class='hunk'>@@ -1177,43 +1140,43 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x6100, 0x30},</div><div class='ctx'> 	{OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x3058, 0x6},</div><div class='ctx'> 	{OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x24d0, 0x30},</div><div class='del'>-#define CSEM_PORT1_END          1005</div><div class='del'>-#define CSEM_FUNC0_START        1005</div><div class='add'>+#define CSEM_PORT1_END          968</div><div class='add'>+#define CSEM_FUNC0_START        968</div><div class='ctx'> 	{OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1148, 0x0},</div><div class='ctx'> 	{OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3300, 0x2},</div><div class='del'>-#define CSEM_FUNC0_END          1007</div><div class='del'>-#define CSEM_FUNC1_START        1007</div><div class='add'>+#define CSEM_FUNC0_END          970</div><div class='add'>+#define CSEM_FUNC1_START        970</div><div class='ctx'> 	{OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x114c, 0x0},</div><div class='ctx'> 	{OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3308, 0x2},</div><div class='del'>-#define CSEM_FUNC1_END          1009</div><div class='del'>-#define CSEM_FUNC2_START        1009</div><div class='add'>+#define CSEM_FUNC1_END          972</div><div class='add'>+#define CSEM_FUNC2_START        972</div><div class='ctx'> 	{OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1150, 0x0},</div><div class='ctx'> 	{OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3310, 0x2},</div><div class='del'>-#define CSEM_FUNC2_END          1011</div><div class='del'>-#define CSEM_FUNC3_START        1011</div><div class='add'>+#define CSEM_FUNC2_END          974</div><div class='add'>+#define CSEM_FUNC3_START        974</div><div class='ctx'> 	{OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1154, 0x0},</div><div class='ctx'> 	{OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3318, 0x2},</div><div class='del'>-#define CSEM_FUNC3_END          1013</div><div class='del'>-#define CSEM_FUNC4_START        1013</div><div class='add'>+#define CSEM_FUNC3_END          976</div><div class='add'>+#define CSEM_FUNC4_START        976</div><div class='ctx'> 	{OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1158, 0x0},</div><div class='ctx'> 	{OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3320, 0x2},</div><div class='del'>-#define CSEM_FUNC4_END          1015</div><div class='del'>-#define CSEM_FUNC5_START        1015</div><div class='add'>+#define CSEM_FUNC4_END          978</div><div class='add'>+#define CSEM_FUNC5_START        978</div><div class='ctx'> 	{OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x115c, 0x0},</div><div class='ctx'> 	{OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3328, 0x2},</div><div class='del'>-#define CSEM_FUNC5_END          1017</div><div class='del'>-#define CSEM_FUNC6_START        1017</div><div class='add'>+#define CSEM_FUNC5_END          980</div><div class='add'>+#define CSEM_FUNC6_START        980</div><div class='ctx'> 	{OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1160, 0x0},</div><div class='ctx'> 	{OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3330, 0x2},</div><div class='del'>-#define CSEM_FUNC6_END          1019</div><div class='del'>-#define CSEM_FUNC7_START        1019</div><div class='add'>+#define CSEM_FUNC6_END          982</div><div class='add'>+#define CSEM_FUNC7_START        982</div><div class='ctx'> 	{OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1164, 0x0},</div><div class='ctx'> 	{OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3338, 0x2},</div><div class='del'>-#define CSEM_FUNC7_END          1021</div><div class='del'>-#define XPB_COMMON_START        1021</div><div class='add'>+#define CSEM_FUNC7_END          984</div><div class='add'>+#define XPB_COMMON_START        984</div><div class='ctx'> 	{OP_WR, GRCBASE_XPB + PB_REG_CONTROL, 0x20},</div><div class='del'>-#define XPB_COMMON_END          1022</div><div class='del'>-#define DQ_COMMON_START         1022</div><div class='add'>+#define XPB_COMMON_END          985</div><div class='add'>+#define DQ_COMMON_START         985</div><div class='ctx'> 	{OP_WR, DORQ_REG_MODE_ACT, 0x2},</div><div class='ctx'> 	{OP_WR, DORQ_REG_NORM_CID_OFST, 0x3},</div><div class='ctx'> 	{OP_WR, DORQ_REG_OUTST_REQ, 0x4},</div><div class='hunk'>@@ -1232,8 +1195,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR, DORQ_REG_DQ_FIFO_AFULL_TH, 0x76c},</div><div class='ctx'> 	{OP_WR, DORQ_REG_REGN, 0x7c1004},</div><div class='ctx'> 	{OP_WR, DORQ_REG_IF_EN, 0xf},</div><div class='del'>-#define DQ_COMMON_END           1040</div><div class='del'>-#define TIMERS_COMMON_START     1040</div><div class='add'>+#define DQ_COMMON_END           1003</div><div class='add'>+#define TIMERS_COMMON_START     1003</div><div class='ctx'> 	{OP_ZR, TM_REG_CLIN_PRIOR0_CLIENT, 0x2},</div><div class='ctx'> 	{OP_WR, TM_REG_LIN_SETCLR_FIFO_ALFULL_THR, 0x1c},</div><div class='ctx'> 	{OP_WR, TM_REG_CFC_AC_CRDCNT_VAL, 0x1},</div><div class='hunk'>@@ -1256,14 +1219,14 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR, TM_REG_EN_CL0_INPUT, 0x1},</div><div class='ctx'> 	{OP_WR, TM_REG_EN_CL1_INPUT, 0x1},</div><div class='ctx'> 	{OP_WR, TM_REG_EN_CL2_INPUT, 0x1},</div><div class='del'>-#define TIMERS_COMMON_END       1062</div><div class='del'>-#define TIMERS_PORT0_START      1062</div><div class='add'>+#define TIMERS_COMMON_END       1025</div><div class='add'>+#define TIMERS_PORT0_START      1025</div><div class='ctx'> 	{OP_ZR, TM_REG_LIN0_PHY_ADDR, 0x2},</div><div class='del'>-#define TIMERS_PORT0_END        1063</div><div class='del'>-#define TIMERS_PORT1_START      1063</div><div class='add'>+#define TIMERS_PORT0_END        1026</div><div class='add'>+#define TIMERS_PORT1_START      1026</div><div class='ctx'> 	{OP_ZR, TM_REG_LIN1_PHY_ADDR, 0x2},</div><div class='del'>-#define TIMERS_PORT1_END        1064</div><div class='del'>-#define XSDM_COMMON_START       1064</div><div class='add'>+#define TIMERS_PORT1_END        1027</div><div class='add'>+#define XSDM_COMMON_START       1027</div><div class='ctx'> 	{OP_WR_E1, XSDM_REG_CFC_RSP_START_ADDR, 0x614},</div><div class='ctx'> 	{OP_WR_E1H, XSDM_REG_CFC_RSP_START_ADDR, 0x424},</div><div class='ctx'> 	{OP_WR_E1, XSDM_REG_CMP_COUNTER_START_ADDR, 0x600},</div><div class='hunk'>@@ -1311,8 +1274,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_ASIC, XSDM_REG_TIMER_TICK, 0x3e8},</div><div class='ctx'> 	{OP_WR_EMUL, XSDM_REG_TIMER_TICK, 0x1},</div><div class='ctx'> 	{OP_WR_FPGA, XSDM_REG_TIMER_TICK, 0xa},</div><div class='del'>-#define XSDM_COMMON_END         1111</div><div class='del'>-#define QM_COMMON_START         1111</div><div class='add'>+#define XSDM_COMMON_END         1074</div><div class='add'>+#define QM_COMMON_START         1074</div><div class='ctx'> 	{OP_WR, QM_REG_ACTCTRINITVAL_0, 0x6},</div><div class='ctx'> 	{OP_WR, QM_REG_ACTCTRINITVAL_1, 0x5},</div><div class='ctx'> 	{OP_WR, QM_REG_ACTCTRINITVAL_2, 0xa},</div><div class='hunk'>@@ -1613,8 +1576,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1H, QM_REG_PQ2PCIFUNC_6, 0x5},</div><div class='ctx'> 	{OP_WR_E1H, QM_REG_PQ2PCIFUNC_7, 0x7},</div><div class='ctx'> 	{OP_WR, QM_REG_CMINTEN, 0xff},</div><div class='del'>-#define QM_COMMON_END           1411</div><div class='del'>-#define PBF_COMMON_START        1411</div><div class='add'>+#define QM_COMMON_END           1374</div><div class='add'>+#define PBF_COMMON_START        1374</div><div class='ctx'> 	{OP_WR, PBF_REG_INIT, 0x1},</div><div class='ctx'> 	{OP_WR, PBF_REG_INIT_P4, 0x1},</div><div class='ctx'> 	{OP_WR, PBF_REG_MAC_LB_ENABLE, 0x1},</div><div class='hunk'>@@ -1622,20 +1585,20 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR, PBF_REG_INIT_P4, 0x0},</div><div class='ctx'> 	{OP_WR, PBF_REG_INIT, 0x0},</div><div class='ctx'> 	{OP_WR, PBF_REG_DISABLE_NEW_TASK_PROC_P4, 0x0},</div><div class='del'>-#define PBF_COMMON_END          1418</div><div class='del'>-#define PBF_PORT0_START         1418</div><div class='add'>+#define PBF_COMMON_END          1381</div><div class='add'>+#define PBF_PORT0_START         1381</div><div class='ctx'> 	{OP_WR, PBF_REG_INIT_P0, 0x1},</div><div class='ctx'> 	{OP_WR, PBF_REG_MAC_IF0_ENABLE, 0x1},</div><div class='ctx'> 	{OP_WR, PBF_REG_INIT_P0, 0x0},</div><div class='ctx'> 	{OP_WR, PBF_REG_DISABLE_NEW_TASK_PROC_P0, 0x0},</div><div class='del'>-#define PBF_PORT0_END           1422</div><div class='del'>-#define PBF_PORT1_START         1422</div><div class='add'>+#define PBF_PORT0_END           1385</div><div class='add'>+#define PBF_PORT1_START         1385</div><div class='ctx'> 	{OP_WR, PBF_REG_INIT_P1, 0x1},</div><div class='ctx'> 	{OP_WR, PBF_REG_MAC_IF1_ENABLE, 0x1},</div><div class='ctx'> 	{OP_WR, PBF_REG_INIT_P1, 0x0},</div><div class='ctx'> 	{OP_WR, PBF_REG_DISABLE_NEW_TASK_PROC_P1, 0x0},</div><div class='del'>-#define PBF_PORT1_END           1426</div><div class='del'>-#define XCM_COMMON_START        1426</div><div class='add'>+#define PBF_PORT1_END           1389</div><div class='add'>+#define XCM_COMMON_START        1389</div><div class='ctx'> 	{OP_WR, XCM_REG_XX_OVFL_EVNT_ID, 0x32},</div><div class='ctx'> 	{OP_WR, XCM_REG_XQM_XCM_HDR_P, 0x3150020},</div><div class='ctx'> 	{OP_WR, XCM_REG_XQM_XCM_HDR_S, 0x3150020},</div><div class='hunk'>@@ -1670,7 +1633,7 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1, XCM_REG_XX_MSG_NUM, 0x1f},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_XX_MSG_NUM, 0x20},</div><div class='ctx'> 	{OP_ZR, XCM_REG_XX_TABLE, 0x12},</div><div class='del'>-	{OP_SW_E1, XCM_REG_XX_DESCR_TABLE, 0x1f02ce},</div><div class='add'>+	{OP_SW_E1, XCM_REG_XX_DESCR_TABLE, 0x1f02cc},</div><div class='ctx'> 	{OP_SW_E1H, XCM_REG_XX_DESCR_TABLE, 0x1f0302},</div><div class='ctx'> 	{OP_WR, XCM_REG_N_SM_CTX_LD_0, 0xf},</div><div class='ctx'> 	{OP_WR, XCM_REG_N_SM_CTX_LD_1, 0x7},</div><div class='hunk'>@@ -1700,8 +1663,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR, XCM_REG_CDU_SM_WR_IFEN, 0x1},</div><div class='ctx'> 	{OP_WR, XCM_REG_CDU_SM_RD_IFEN, 0x1},</div><div class='ctx'> 	{OP_WR, XCM_REG_XCM_CFC_IFEN, 0x1},</div><div class='del'>-#define XCM_COMMON_END          1490</div><div class='del'>-#define XCM_PORT0_START         1490</div><div class='add'>+#define XCM_COMMON_END          1453</div><div class='add'>+#define XCM_PORT0_START         1453</div><div class='ctx'> 	{OP_WR_E1, XCM_REG_GLB_DEL_ACK_TMR_VAL_0, 0xc8},</div><div class='ctx'> 	{OP_WR_E1, XCM_REG_GLB_DEL_ACK_MAX_CNT_0, 0x2},</div><div class='ctx'> 	{OP_WR_E1, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 0x0},</div><div class='hunk'>@@ -1710,8 +1673,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1, XCM_REG_WU_DA_CNT_CMD10, 0x2},</div><div class='ctx'> 	{OP_WR_E1, XCM_REG_WU_DA_CNT_UPD_VAL00, 0xff},</div><div class='ctx'> 	{OP_WR_E1, XCM_REG_WU_DA_CNT_UPD_VAL10, 0xff},</div><div class='del'>-#define XCM_PORT0_END           1498</div><div class='del'>-#define XCM_PORT1_START         1498</div><div class='add'>+#define XCM_PORT0_END           1461</div><div class='add'>+#define XCM_PORT1_START         1461</div><div class='ctx'> 	{OP_WR_E1, XCM_REG_GLB_DEL_ACK_TMR_VAL_1, 0xc8},</div><div class='ctx'> 	{OP_WR_E1, XCM_REG_GLB_DEL_ACK_MAX_CNT_1, 0x2},</div><div class='ctx'> 	{OP_WR_E1, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD01, 0x0},</div><div class='hunk'>@@ -1720,8 +1683,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1, XCM_REG_WU_DA_CNT_CMD11, 0x2},</div><div class='ctx'> 	{OP_WR_E1, XCM_REG_WU_DA_CNT_UPD_VAL01, 0xff},</div><div class='ctx'> 	{OP_WR_E1, XCM_REG_WU_DA_CNT_UPD_VAL11, 0xff},</div><div class='del'>-#define XCM_PORT1_END           1506</div><div class='del'>-#define XCM_FUNC0_START         1506</div><div class='add'>+#define XCM_PORT1_END           1469</div><div class='add'>+#define XCM_FUNC0_START         1469</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_0, 0xc8},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_0, 0x2},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 0x0},</div><div class='hunk'>@@ -1731,8 +1694,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL00, 0xff},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL10, 0xff},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_PHYS_QNUM3_0, 0x0},</div><div class='del'>-#define XCM_FUNC0_END           1515</div><div class='del'>-#define XCM_FUNC1_START         1515</div><div class='add'>+#define XCM_FUNC0_END           1478</div><div class='add'>+#define XCM_FUNC1_START         1478</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_1, 0xc8},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_1, 0x2},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD01, 0x0},</div><div class='hunk'>@@ -1742,8 +1705,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL01, 0xff},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL11, 0xff},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_PHYS_QNUM3_1, 0x0},</div><div class='del'>-#define XCM_FUNC1_END           1524</div><div class='del'>-#define XCM_FUNC2_START         1524</div><div class='add'>+#define XCM_FUNC1_END           1487</div><div class='add'>+#define XCM_FUNC2_START         1487</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_0, 0xc8},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_0, 0x2},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 0x0},</div><div class='hunk'>@@ -1753,8 +1716,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL00, 0xff},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL10, 0xff},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_PHYS_QNUM3_0, 0x0},</div><div class='del'>-#define XCM_FUNC2_END           1533</div><div class='del'>-#define XCM_FUNC3_START         1533</div><div class='add'>+#define XCM_FUNC2_END           1496</div><div class='add'>+#define XCM_FUNC3_START         1496</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_1, 0xc8},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_1, 0x2},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD01, 0x0},</div><div class='hunk'>@@ -1764,8 +1727,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL01, 0xff},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL11, 0xff},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_PHYS_QNUM3_1, 0x0},</div><div class='del'>-#define XCM_FUNC3_END           1542</div><div class='del'>-#define XCM_FUNC4_START         1542</div><div class='add'>+#define XCM_FUNC3_END           1505</div><div class='add'>+#define XCM_FUNC4_START         1505</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_0, 0xc8},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_0, 0x2},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 0x0},</div><div class='hunk'>@@ -1775,8 +1738,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL00, 0xff},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL10, 0xff},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_PHYS_QNUM3_0, 0x0},</div><div class='del'>-#define XCM_FUNC4_END           1551</div><div class='del'>-#define XCM_FUNC5_START         1551</div><div class='add'>+#define XCM_FUNC4_END           1514</div><div class='add'>+#define XCM_FUNC5_START         1514</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_1, 0xc8},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_1, 0x2},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD01, 0x0},</div><div class='hunk'>@@ -1786,8 +1749,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL01, 0xff},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL11, 0xff},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_PHYS_QNUM3_1, 0x0},</div><div class='del'>-#define XCM_FUNC5_END           1560</div><div class='del'>-#define XCM_FUNC6_START         1560</div><div class='add'>+#define XCM_FUNC5_END           1523</div><div class='add'>+#define XCM_FUNC6_START         1523</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_0, 0xc8},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_0, 0x2},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 0x0},</div><div class='hunk'>@@ -1797,8 +1760,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL00, 0xff},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL10, 0xff},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_PHYS_QNUM3_0, 0x0},</div><div class='del'>-#define XCM_FUNC6_END           1569</div><div class='del'>-#define XCM_FUNC7_START         1569</div><div class='add'>+#define XCM_FUNC6_END           1532</div><div class='add'>+#define XCM_FUNC7_START         1532</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_1, 0xc8},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_1, 0x2},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD01, 0x0},</div><div class='hunk'>@@ -1808,8 +1771,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL01, 0xff},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL11, 0xff},</div><div class='ctx'> 	{OP_WR_E1H, XCM_REG_PHYS_QNUM3_1, 0x0},</div><div class='del'>-#define XCM_FUNC7_END           1578</div><div class='del'>-#define XSEM_COMMON_START       1578</div><div class='add'>+#define XCM_FUNC7_END           1541</div><div class='add'>+#define XSEM_COMMON_START       1541</div><div class='ctx'> 	{OP_RD, XSEM_REG_MSG_NUM_FIC0, 0x0},</div><div class='ctx'> 	{OP_RD, XSEM_REG_MSG_NUM_FIC1, 0x0},</div><div class='ctx'> 	{OP_RD, XSEM_REG_MSG_NUM_FOC0, 0x0},</div><div class='hunk'>@@ -1876,9 +1839,9 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x9000, 0x2},</div><div class='ctx'> 	{OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x3368, 0x0},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x21a8, 0x86},</div><div class='del'>-	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x3370, 0x202ed},</div><div class='add'>+	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x3370, 0x202eb},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x2000, 0x20},</div><div class='del'>-	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x3b90, 0x402ef},</div><div class='add'>+	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x3b90, 0x402ed},</div><div class='ctx'> 	{OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0x23c8, 0x0},</div><div class='ctx'> 	{OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x1518, 0x1},</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x23d0, 0x20321},</div><div class='hunk'>@@ -1886,29 +1849,29 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x2498, 0x40323},</div><div class='ctx'> 	{OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x1838, 0x0},</div><div class='ctx'> 	{OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0x2ac8, 0x0},</div><div class='del'>-	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x1820, 0x202f3},</div><div class='add'>+	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x1820, 0x202f1},</div><div class='ctx'> 	{OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0x2ab8, 0x0},</div><div class='ctx'> 	{OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4ac0, 0x2},</div><div class='ctx'> 	{OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0x3010, 0x1},</div><div class='ctx'> 	{OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4b00, 0x4},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x4040, 0x10},</div><div class='del'>-	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x1f50, 0x202f5},</div><div class='add'>+	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x1f50, 0x202f3},</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x4000, 0x100327},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6ac0, 0x2},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6b00, 0x4},</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x83b0, 0x20337},</div><div class='ctx'> 	{OP_WR, XSEM_REG_FAST_MEMORY + 0x10800, 0x0},</div><div class='del'>-	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x10c00, 0x1002f7},</div><div class='add'>+	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x10c00, 0x1002f5},</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x10c00, 0x100339},</div><div class='ctx'> 	{OP_WR, XSEM_REG_FAST_MEMORY + 0x10800, 0x1000000},</div><div class='del'>-	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x10c40, 0x80307},</div><div class='add'>+	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x10c40, 0x80305},</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x10c40, 0x80349},</div><div class='ctx'> 	{OP_WR, XSEM_REG_FAST_MEMORY + 0x10800, 0x2000000},</div><div class='del'>-	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x10c60, 0x8030f},</div><div class='add'>+	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x10c60, 0x8030d},</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x10c60, 0x80351},</div><div class='ctx'> 	{OP_ZP_E1, XSEM_REG_INT_TABLE, 0xa90000},</div><div class='ctx'> 	{OP_ZP_E1H, XSEM_REG_INT_TABLE, 0xac0000},</div><div class='del'>-	{OP_WR_64_E1, XSEM_REG_INT_TABLE + 0x368, 0x130317},</div><div class='add'>+	{OP_WR_64_E1, XSEM_REG_INT_TABLE + 0x368, 0x130315},</div><div class='ctx'> 	{OP_WR_64_E1H, XSEM_REG_INT_TABLE + 0x368, 0x130359},</div><div class='ctx'> 	{OP_ZP_E1, XSEM_REG_PRAM, 0x344e0000},</div><div class='ctx'> 	{OP_ZP_E1H, XSEM_REG_PRAM, 0x34620000},</div><div class='hunk'>@@ -1918,10 +1881,10 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZP_E1H, XSEM_REG_PRAM + 0x10000, 0x3e971b22},</div><div class='ctx'> 	{OP_ZP_E1, XSEM_REG_PRAM + 0x18000, 0x1dd02ad2},</div><div class='ctx'> 	{OP_ZP_E1H, XSEM_REG_PRAM + 0x18000, 0x21542ac8},</div><div class='del'>-	{OP_WR_64_E1, XSEM_REG_PRAM + 0x1c0d0, 0x47e60319},</div><div class='add'>+	{OP_WR_64_E1, XSEM_REG_PRAM + 0x1c0d0, 0x47e60317},</div><div class='ctx'> 	{OP_WR_64_E1H, XSEM_REG_PRAM + 0x1c8d0, 0x46e6035b},</div><div class='del'>-#define XSEM_COMMON_END         1688</div><div class='del'>-#define XSEM_PORT0_START        1688</div><div class='add'>+#define XSEM_COMMON_END         1651</div><div class='add'>+#define XSEM_PORT0_START        1651</div><div class='ctx'> 	{OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x3ba0, 0x10},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xc000, 0xfc},</div><div class='ctx'> 	{OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x3c20, 0x1c},</div><div class='hunk'>@@ -1934,7 +1897,7 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x26e8, 0x1c},</div><div class='ctx'> 	{OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x3b58, 0x0},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x27c8, 0x1c},</div><div class='del'>-	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x3d10, 0x10031b},</div><div class='add'>+	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x3d10, 0x100319},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xa000, 0x28},</div><div class='ctx'> 	{OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x1500, 0x0},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xa140, 0xc},</div><div class='hunk'>@@ -1950,12 +1913,12 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x6ac8, 0x2035d},</div><div class='ctx'> 	{OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x50b8, 0x1},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6b10, 0x42},</div><div class='del'>-	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x4ac8, 0x2032b},</div><div class='add'>+	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x4ac8, 0x20329},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6d20, 0x4},</div><div class='ctx'> 	{OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4b10, 0x42},</div><div class='ctx'> 	{OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4d20, 0x4},</div><div class='del'>-#define XSEM_PORT0_END          1720</div><div class='del'>-#define XSEM_PORT1_START        1720</div><div class='add'>+#define XSEM_PORT0_END          1683</div><div class='add'>+#define XSEM_PORT1_START        1683</div><div class='ctx'> 	{OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x3be0, 0x10},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xc3f0, 0xfc},</div><div class='ctx'> 	{OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x3c90, 0x1c},</div><div class='hunk'>@@ -1968,7 +1931,7 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x2758, 0x1c},</div><div class='ctx'> 	{OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x3b5c, 0x0},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x2838, 0x1c},</div><div class='del'>-	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x3d50, 0x10032d},</div><div class='add'>+	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x3d50, 0x10032b},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xa0a0, 0x28},</div><div class='ctx'> 	{OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x1504, 0x0},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xa170, 0xc},</div><div class='hunk'>@@ -1984,65 +1947,65 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x6ad0, 0x2035f},</div><div class='ctx'> 	{OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x50bc, 0x1},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6c18, 0x42},</div><div class='del'>-	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x4ad0, 0x2033d},</div><div class='add'>+	{OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x4ad0, 0x2033b},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6d30, 0x4},</div><div class='ctx'> 	{OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4c18, 0x42},</div><div class='ctx'> 	{OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4d30, 0x4},</div><div class='del'>-#define XSEM_PORT1_END          1752</div><div class='del'>-#define XSEM_FUNC0_START        1752</div><div class='add'>+#define XSEM_PORT1_END          1715</div><div class='add'>+#define XSEM_FUNC0_START        1715</div><div class='ctx'> 	{OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7e0, 0x0},</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x28b8, 0x100361},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x5048, 0xe},</div><div class='del'>-#define XSEM_FUNC0_END          1755</div><div class='del'>-#define XSEM_FUNC1_START        1755</div><div class='add'>+#define XSEM_FUNC0_END          1718</div><div class='add'>+#define XSEM_FUNC1_START        1718</div><div class='ctx'> 	{OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7e4, 0x0},</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x28f8, 0x100371},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x5080, 0xe},</div><div class='del'>-#define XSEM_FUNC1_END          1758</div><div class='del'>-#define XSEM_FUNC2_START        1758</div><div class='add'>+#define XSEM_FUNC1_END          1721</div><div class='add'>+#define XSEM_FUNC2_START        1721</div><div class='ctx'> 	{OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7e8, 0x0},</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x2938, 0x100381},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x50b8, 0xe},</div><div class='del'>-#define XSEM_FUNC2_END          1761</div><div class='del'>-#define XSEM_FUNC3_START        1761</div><div class='add'>+#define XSEM_FUNC2_END          1724</div><div class='add'>+#define XSEM_FUNC3_START        1724</div><div class='ctx'> 	{OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7ec, 0x0},</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x2978, 0x100391},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x50f0, 0xe},</div><div class='del'>-#define XSEM_FUNC3_END          1764</div><div class='del'>-#define XSEM_FUNC4_START        1764</div><div class='add'>+#define XSEM_FUNC3_END          1727</div><div class='add'>+#define XSEM_FUNC4_START        1727</div><div class='ctx'> 	{OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7f0, 0x0},</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x29b8, 0x1003a1},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x5128, 0xe},</div><div class='del'>-#define XSEM_FUNC4_END          1767</div><div class='del'>-#define XSEM_FUNC5_START        1767</div><div class='add'>+#define XSEM_FUNC4_END          1730</div><div class='add'>+#define XSEM_FUNC5_START        1730</div><div class='ctx'> 	{OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7f4, 0x0},</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x29f8, 0x1003b1},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x5160, 0xe},</div><div class='del'>-#define XSEM_FUNC5_END          1770</div><div class='del'>-#define XSEM_FUNC6_START        1770</div><div class='add'>+#define XSEM_FUNC5_END          1733</div><div class='add'>+#define XSEM_FUNC6_START        1733</div><div class='ctx'> 	{OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7f8, 0x0},</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x2a38, 0x1003c1},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x5198, 0xe},</div><div class='del'>-#define XSEM_FUNC6_END          1773</div><div class='del'>-#define XSEM_FUNC7_START        1773</div><div class='add'>+#define XSEM_FUNC6_END          1736</div><div class='add'>+#define XSEM_FUNC7_START        1736</div><div class='ctx'> 	{OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7fc, 0x0},</div><div class='ctx'> 	{OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x2a78, 0x1003d1},</div><div class='ctx'> 	{OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x51d0, 0xe},</div><div class='del'>-#define XSEM_FUNC7_END          1776</div><div class='del'>-#define CDU_COMMON_START        1776</div><div class='add'>+#define XSEM_FUNC7_END          1739</div><div class='add'>+#define CDU_COMMON_START        1739</div><div class='ctx'> 	{OP_WR, CDU_REG_CDU_CONTROL0, 0x1},</div><div class='ctx'> 	{OP_WR_E1H, CDU_REG_MF_MODE, 0x1},</div><div class='ctx'> 	{OP_WR, CDU_REG_CDU_CHK_MASK0, 0x3d000},</div><div class='ctx'> 	{OP_WR, CDU_REG_CDU_CHK_MASK1, 0x3d},</div><div class='del'>-	{OP_WB_E1, CDU_REG_L1TT, 0x200033f},</div><div class='add'>+	{OP_WB_E1, CDU_REG_L1TT, 0x200033d},</div><div class='ctx'> 	{OP_WB_E1H, CDU_REG_L1TT, 0x20003e1},</div><div class='del'>-	{OP_WB_E1, CDU_REG_MATT, 0x20053f},</div><div class='add'>+	{OP_WB_E1, CDU_REG_MATT, 0x20053d},</div><div class='ctx'> 	{OP_WB_E1H, CDU_REG_MATT, 0x2805e1},</div><div class='ctx'> 	{OP_ZR_E1, CDU_REG_MATT + 0x80, 0x2},</div><div class='del'>-	{OP_WB_E1, CDU_REG_MATT + 0x88, 0x6055f},</div><div class='add'>+	{OP_WB_E1, CDU_REG_MATT + 0x88, 0x6055d},</div><div class='ctx'> 	{OP_ZR, CDU_REG_MATT + 0xa0, 0x18},</div><div class='del'>-#define CDU_COMMON_END          1787</div><div class='del'>-#define DMAE_COMMON_START       1787</div><div class='add'>+#define CDU_COMMON_END          1750</div><div class='add'>+#define DMAE_COMMON_START       1750</div><div class='ctx'> 	{OP_ZR, DMAE_REG_CMD_MEM, 0xe0},</div><div class='ctx'> 	{OP_WR, DMAE_REG_CRC16C_INIT, 0x0},</div><div class='ctx'> 	{OP_WR, DMAE_REG_CRC16T10_INIT, 0x1},</div><div class='hunk'>@@ -2050,24 +2013,24 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1H, DMAE_REG_PXP_REQ_INIT_CRD, 0x2},</div><div class='ctx'> 	{OP_WR, DMAE_REG_PCI_IFEN, 0x1},</div><div class='ctx'> 	{OP_WR, DMAE_REG_GRC_IFEN, 0x1},</div><div class='del'>-#define DMAE_COMMON_END         1794</div><div class='del'>-#define PXP_COMMON_START        1794</div><div class='del'>-	{OP_WB_E1, PXP_REG_HST_INBOUND_INT + 0x400, 0x50565},</div><div class='add'>+#define DMAE_COMMON_END         1757</div><div class='add'>+#define PXP_COMMON_START        1757</div><div class='add'>+	{OP_WB_E1, PXP_REG_HST_INBOUND_INT + 0x400, 0x50563},</div><div class='ctx'> 	{OP_WB_E1H, PXP_REG_HST_INBOUND_INT + 0x400, 0x50609},</div><div class='del'>-	{OP_WB_E1, PXP_REG_HST_INBOUND_INT + 0x420, 0x5056a},</div><div class='add'>+	{OP_WB_E1, PXP_REG_HST_INBOUND_INT + 0x420, 0x50568},</div><div class='ctx'> 	{OP_WB_E1H, PXP_REG_HST_INBOUND_INT, 0x5060e},</div><div class='del'>-	{OP_WB_E1, PXP_REG_HST_INBOUND_INT, 0x5056f},</div><div class='del'>-#define PXP_COMMON_END          1799</div><div class='del'>-#define CFC_COMMON_START        1799</div><div class='add'>+	{OP_WB_E1, PXP_REG_HST_INBOUND_INT, 0x5056d},</div><div class='add'>+#define PXP_COMMON_END          1762</div><div class='add'>+#define CFC_COMMON_START        1762</div><div class='ctx'> 	{OP_ZR_E1H, CFC_REG_LINK_LIST, 0x100},</div><div class='ctx'> 	{OP_WR, CFC_REG_CONTROL0, 0x10},</div><div class='ctx'> 	{OP_WR, CFC_REG_DISABLE_ON_ERROR, 0x3fff},</div><div class='ctx'> 	{OP_WR, CFC_REG_LCREQ_WEIGHTS, 0x84924a},</div><div class='del'>-#define CFC_COMMON_END          1803</div><div class='del'>-#define HC_COMMON_START         1803</div><div class='add'>+#define CFC_COMMON_END          1766</div><div class='add'>+#define HC_COMMON_START         1766</div><div class='ctx'> 	{OP_ZR_E1, HC_REG_USTORM_ADDR_FOR_COALESCE, 0x4},</div><div class='del'>-#define HC_COMMON_END           1804</div><div class='del'>-#define HC_PORT0_START          1804</div><div class='add'>+#define HC_COMMON_END           1767</div><div class='add'>+#define HC_PORT0_START          1767</div><div class='ctx'> 	{OP_WR_E1, HC_REG_CONFIG_0, 0x1080},</div><div class='ctx'> 	{OP_ZR_E1, HC_REG_UC_RAM_ADDR_0, 0x2},</div><div class='ctx'> 	{OP_WR_E1, HC_REG_ATTN_NUM_P0, 0x10},</div><div class='hunk'>@@ -2086,8 +2049,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x120, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x370, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x5c0, 0x4a},</div><div class='del'>-#define HC_PORT0_END            1822</div><div class='del'>-#define HC_PORT1_START          1822</div><div class='add'>+#define HC_PORT0_END            1785</div><div class='add'>+#define HC_PORT1_START          1785</div><div class='ctx'> 	{OP_WR_E1, HC_REG_CONFIG_1, 0x1080},</div><div class='ctx'> 	{OP_ZR_E1, HC_REG_UC_RAM_ADDR_1, 0x2},</div><div class='ctx'> 	{OP_WR_E1, HC_REG_ATTN_NUM_P1, 0x10},</div><div class='hunk'>@@ -2106,8 +2069,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x248, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x498, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x6e8, 0x4a},</div><div class='del'>-#define HC_PORT1_END            1840</div><div class='del'>-#define HC_FUNC0_START          1840</div><div class='add'>+#define HC_PORT1_END            1803</div><div class='add'>+#define HC_FUNC0_START          1803</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_CONFIG_0, 0x1080},</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_FUNC_NUM_P0, 0x0},</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_ATTN_NUM_P0, 0x10},</div><div class='hunk'>@@ -2123,8 +2086,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x120, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x370, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x5c0, 0x4a},</div><div class='del'>-#define HC_FUNC0_END            1855</div><div class='del'>-#define HC_FUNC1_START          1855</div><div class='add'>+#define HC_FUNC0_END            1818</div><div class='add'>+#define HC_FUNC1_START          1818</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_CONFIG_1, 0x1080},</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_FUNC_NUM_P1, 0x1},</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_ATTN_NUM_P1, 0x10},</div><div class='hunk'>@@ -2140,8 +2103,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x248, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x498, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x6e8, 0x4a},</div><div class='del'>-#define HC_FUNC1_END            1870</div><div class='del'>-#define HC_FUNC2_START          1870</div><div class='add'>+#define HC_FUNC1_END            1833</div><div class='add'>+#define HC_FUNC2_START          1833</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_CONFIG_0, 0x1080},</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_FUNC_NUM_P0, 0x2},</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_ATTN_NUM_P0, 0x10},</div><div class='hunk'>@@ -2157,8 +2120,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x120, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x370, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x5c0, 0x4a},</div><div class='del'>-#define HC_FUNC2_END            1885</div><div class='del'>-#define HC_FUNC3_START          1885</div><div class='add'>+#define HC_FUNC2_END            1848</div><div class='add'>+#define HC_FUNC3_START          1848</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_CONFIG_1, 0x1080},</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_FUNC_NUM_P1, 0x3},</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_ATTN_NUM_P1, 0x10},</div><div class='hunk'>@@ -2174,8 +2137,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x248, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x498, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x6e8, 0x4a},</div><div class='del'>-#define HC_FUNC3_END            1900</div><div class='del'>-#define HC_FUNC4_START          1900</div><div class='add'>+#define HC_FUNC3_END            1863</div><div class='add'>+#define HC_FUNC4_START          1863</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_CONFIG_0, 0x1080},</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_FUNC_NUM_P0, 0x4},</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_ATTN_NUM_P0, 0x10},</div><div class='hunk'>@@ -2191,8 +2154,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x120, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x370, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x5c0, 0x4a},</div><div class='del'>-#define HC_FUNC4_END            1915</div><div class='del'>-#define HC_FUNC5_START          1915</div><div class='add'>+#define HC_FUNC4_END            1878</div><div class='add'>+#define HC_FUNC5_START          1878</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_CONFIG_1, 0x1080},</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_FUNC_NUM_P1, 0x5},</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_ATTN_NUM_P1, 0x10},</div><div class='hunk'>@@ -2208,8 +2171,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x248, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x498, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x6e8, 0x4a},</div><div class='del'>-#define HC_FUNC5_END            1930</div><div class='del'>-#define HC_FUNC6_START          1930</div><div class='add'>+#define HC_FUNC5_END            1893</div><div class='add'>+#define HC_FUNC6_START          1893</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_CONFIG_0, 0x1080},</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_FUNC_NUM_P0, 0x6},</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_ATTN_NUM_P0, 0x10},</div><div class='hunk'>@@ -2225,8 +2188,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x120, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x370, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x5c0, 0x4a},</div><div class='del'>-#define HC_FUNC6_END            1945</div><div class='del'>-#define HC_FUNC7_START          1945</div><div class='add'>+#define HC_FUNC6_END            1908</div><div class='add'>+#define HC_FUNC7_START          1908</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_CONFIG_1, 0x1080},</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_FUNC_NUM_P1, 0x7},</div><div class='ctx'> 	{OP_WR_E1H, HC_REG_ATTN_NUM_P1, 0x10},</div><div class='hunk'>@@ -2242,8 +2205,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x248, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x498, 0x4a},</div><div class='ctx'> 	{OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x6e8, 0x4a},</div><div class='del'>-#define HC_FUNC7_END            1960</div><div class='del'>-#define PXP2_COMMON_START       1960</div><div class='add'>+#define HC_FUNC7_END            1923</div><div class='add'>+#define PXP2_COMMON_START       1923</div><div class='ctx'> 	{OP_WR_E1, PXP2_REG_PGL_CONTROL0, 0xe38340},</div><div class='ctx'> 	{OP_WR_E1H, PXP2_REG_RQ_DRAM_ALIGN, 0x1},</div><div class='ctx'> 	{OP_WR, PXP2_REG_PGL_CONTROL1, 0x3c10},</div><div class='hunk'>@@ -2361,8 +2324,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1H, PXP2_REG_RQ_ILT_MODE, 0x1},</div><div class='ctx'> 	{OP_WR, PXP2_REG_RQ_RBC_DONE, 0x1},</div><div class='ctx'> 	{OP_WR_E1H, PXP2_REG_PGL_CONTROL0, 0xe38340},</div><div class='del'>-#define PXP2_COMMON_END         2077</div><div class='del'>-#define MISC_AEU_COMMON_START   2077</div><div class='add'>+#define PXP2_COMMON_END         2040</div><div class='add'>+#define MISC_AEU_COMMON_START   2040</div><div class='ctx'> 	{OP_ZR, MISC_REG_AEU_GENERAL_ATTN_0, 0x16},</div><div class='ctx'> 	{OP_WR_E1H, MISC_REG_AEU_ENABLE1_NIG_0, 0x55540000},</div><div class='ctx'> 	{OP_WR_E1H, MISC_REG_AEU_ENABLE2_NIG_0, 0x55555555},</div><div class='hunk'>@@ -2382,8 +2345,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1H, MISC_REG_AEU_ENABLE4_PXP_1, 0x0},</div><div class='ctx'> 	{OP_WR_E1H, MISC_REG_AEU_CLR_LATCH_SIGNAL, 0xc00},</div><div class='ctx'> 	{OP_WR_E1H, MISC_REG_AEU_GENERAL_MASK, 0x3},</div><div class='del'>-#define MISC_AEU_COMMON_END     2096</div><div class='del'>-#define MISC_AEU_PORT0_START    2096</div><div class='add'>+#define MISC_AEU_COMMON_END     2059</div><div class='add'>+#define MISC_AEU_PORT0_START    2059</div><div class='ctx'> 	{OP_WR_E1, MISC_REG_AEU_ENABLE1_FUNC_0_OUT_0, 0xbf5c0000},</div><div class='ctx'> 	{OP_WR_E1H, MISC_REG_AEU_ENABLE1_FUNC_0_OUT_0, 0xff5c0000},</div><div class='ctx'> 	{OP_WR_E1, MISC_REG_AEU_ENABLE2_FUNC_0_OUT_0, 0xfff51fef},</div><div class='hunk'>@@ -2416,8 +2379,8 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1, MISC_REG_AEU_INVERTER_1_FUNC_0, 0x0},</div><div class='ctx'> 	{OP_ZR_E1, MISC_REG_AEU_INVERTER_2_FUNC_0, 0x3},</div><div class='ctx'> 	{OP_WR_E1, MISC_REG_AEU_MASK_ATTN_FUNC_0, 0x7},</div><div class='del'>-#define MISC_AEU_PORT0_END      2128</div><div class='del'>-#define MISC_AEU_PORT1_START    2128</div><div class='add'>+#define MISC_AEU_PORT0_END      2091</div><div class='add'>+#define MISC_AEU_PORT1_START    2091</div><div class='ctx'> 	{OP_WR_E1, MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0, 0xbf5c0000},</div><div class='ctx'> 	{OP_WR_E1H, MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0, 0xff5c0000},</div><div class='ctx'> 	{OP_WR_E1, MISC_REG_AEU_ENABLE2_FUNC_1_OUT_0, 0xfff51fef},</div><div class='hunk'>@@ -2450,7 +2413,7 @@ static const struct raw_op init_ops[] = {</div><div class='ctx'> 	{OP_WR_E1, MISC_REG_AEU_INVERTER_1_FUNC_1, 0x0},</div><div class='ctx'> 	{OP_ZR_E1, MISC_REG_AEU_INVERTER_2_FUNC_1, 0x3},</div><div class='ctx'> 	{OP_WR_E1, MISC_REG_AEU_MASK_ATTN_FUNC_1, 0x7},</div><div class='del'>-#define MISC_AEU_PORT1_END      2160</div><div class='add'>+#define MISC_AEU_PORT1_END      2123</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2560,103 +2523,92 @@ static const u32 init_data_e1[] = {</div><div class='ctx'> 	0x00049c00, 0x00051f80, 0x0005a300, 0x00062680, 0x0006aa00, 0x00072d80,</div><div class='ctx'> 	0x0007b100, 0x00083480, 0x0008b800, 0x00093b80, 0x0009bf00, 0x000a4280,</div><div class='ctx'> 	0x000ac600, 0x000b4980, 0x000bcd00, 0x000c5080, 0x000cd400, 0x000d5780,</div><div class='del'>-	0x000ddb00, 0x00001900, 0x00000028, 0x00000000, 0x00100000, 0x00000000,</div><div class='del'>-	0x00000000, 0xffffffff, 0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='add'>+	0x000ddb00, 0x00001900, 0x00100000, 0x00000000, 0x00000000, 0xffffffff,</div><div class='ctx'> 	0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='ctx'> 	0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='ctx'> 	0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='ctx'> 	0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='del'>-	0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x00000000, 0x00007ff8,</div><div class='del'>-	0x00000000, 0x00001500, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,</div><div class='del'>-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0x40000000, 0x40000000,</div><div class='ctx'> 	0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='add'>+	0x40000000, 0x40000000, 0x00000000, 0x00007ff8, 0x00000000, 0x00001500,</div><div class='add'>+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,</div><div class='add'>+	0xffffffff, 0xffffffff, 0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='ctx'> 	0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='ctx'> 	0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='ctx'> 	0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='ctx'> 	0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='del'>-	0x00000000, 0x00007ff8, 0x00000000, 0x00003500, 0x00001000, 0x00002080,</div><div class='del'>-	0x00003100, 0x00004180, 0x00005200, 0x00006280, 0x00007300, 0x00008380,</div><div class='del'>-	0x00009400, 0x0000a480, 0x0000b500, 0x0000c580, 0x0000d600, 0x0000e680,</div><div class='del'>-	0x0000f700, 0x00010780, 0x00011800, 0x00012880, 0x00013900, 0x00014980,</div><div class='del'>-	0x00015a00, 0x00016a80, 0x00017b00, 0x00018b80, 0x00019c00, 0x0001ac80,</div><div class='del'>-	0x0001bd00, 0x0001cd80, 0x0001de00, 0x0001ee80, 0x0001ff00, 0x00000000,</div><div class='del'>-	0x00010001, 0x00000604, 0xccccccc1, 0xffffffff, 0xffffffff, 0xcccc0201,</div><div class='del'>-	0xcccccccc, 0x00000000, 0xffffffff, 0x40000000, 0x40000000, 0x40000000,</div><div class='add'>+	0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x00000000, 0x00007ff8,</div><div class='add'>+	0x00000000, 0x00003500, 0x00001000, 0x00002080, 0x00003100, 0x00004180,</div><div class='add'>+	0x00005200, 0x00006280, 0x00007300, 0x00008380, 0x00009400, 0x0000a480,</div><div class='add'>+	0x0000b500, 0x0000c580, 0x0000d600, 0x0000e680, 0x0000f700, 0x00010780,</div><div class='add'>+	0x00011800, 0x00012880, 0x00013900, 0x00014980, 0x00015a00, 0x00016a80,</div><div class='add'>+	0x00017b00, 0x00018b80, 0x00019c00, 0x0001ac80, 0x0001bd00, 0x0001cd80,</div><div class='add'>+	0x0001de00, 0x0001ee80, 0x0001ff00, 0x00000000, 0x00010001, 0x00000604,</div><div class='add'>+	0xccccccc1, 0xffffffff, 0xffffffff, 0xcccc0201, 0xcccccccc, 0x00000000,</div><div class='add'>+	0xffffffff, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='ctx'> 	0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='ctx'> 	0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='ctx'> 	0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='ctx'> 	0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='del'>-	0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x00000000,</div><div class='del'>-	0x00007ff8, 0x00000000, 0x00003500, 0x0000ffff, 0x00000000, 0x0000ffff,</div><div class='add'>+	0x40000000, 0x40000000, 0x40000000, 0x00000000, 0x00007ff8, 0x00000000,</div><div class='add'>+	0x00003500, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff,</div><div class='ctx'> 	0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff,</div><div class='add'>+	0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x00100000,</div><div class='ctx'> 	0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff,</div><div class='del'>-	0x00000000, 0x00100000, 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff,</div><div class='ctx'> 	0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff,</div><div class='del'>-	0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff,</div><div class='del'>-	0x00000000, 0x00100000, 0x00000000, 0xfffffff3, 0x320fffff, 0x0c30c30c,</div><div class='del'>-	0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0000cf3c, 0xcdcdcdcd, 0xfffffff1,</div><div class='del'>-	0x30efffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0001cf3c,</div><div class='del'>-	0xcdcdcdcd, 0xfffffff6, 0x305fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='del'>-	0xf3cf3cf3, 0x0002cf3c, 0xcdcdcdcd, 0xfffff406, 0x1cbfffff, 0x0c30c305,</div><div class='del'>-	0xc30c30c3, 0xcf300014, 0xf3cf3cf3, 0x0004cf3c, 0xcdcdcdcd, 0xfffffff2,</div><div class='del'>-	0x304fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0008cf3c,</div><div class='del'>-	0xcdcdcdcd, 0xfffffffa, 0x302fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='del'>-	0xf3cf3cf3, 0x0010cf3c, 0xcdcdcdcd, 0xfffffff7, 0x31efffff, 0x0c30c30c,</div><div class='del'>-	0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0020cf3c, 0xcdcdcdcd, 0xfffffff5,</div><div class='del'>-	0x302fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0040cf3c,</div><div class='del'>-	0xcdcdcdcd, 0xfffffff3, 0x310fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='del'>-	0xf3cf3cf3, 0x0000cf3c, 0xcdcdcdcd, 0xfffffff1, 0x310fffff, 0x0c30c30c,</div><div class='add'>+	0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x00100000,</div><div class='add'>+	0x00000000, 0xfffffff3, 0x320fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='add'>+	0xf3cf3cf3, 0x0000cf3c, 0xcdcdcdcd, 0xfffffff1, 0x30efffff, 0x0c30c30c,</div><div class='ctx'> 	0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0001cf3c, 0xcdcdcdcd, 0xfffffff6,</div><div class='ctx'> 	0x305fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0002cf3c,</div><div class='ctx'> 	0xcdcdcdcd, 0xfffff406, 0x1cbfffff, 0x0c30c305, 0xc30c30c3, 0xcf300014,</div><div class='ctx'> 	0xf3cf3cf3, 0x0004cf3c, 0xcdcdcdcd, 0xfffffff2, 0x304fffff, 0x0c30c30c,</div><div class='ctx'> 	0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0008cf3c, 0xcdcdcdcd, 0xfffffffa,</div><div class='ctx'> 	0x302fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0010cf3c,</div><div class='del'>-	0xcdcdcdcd, 0xfffffff7, 0x30efffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='del'>-	0xf3cf3cf3, 0x0020cf3c, 0xcdcdcdcd, 0xfffffff5, 0x304fffff, 0x0c30c30c,</div><div class='add'>+	0xcdcdcdcd, 0xfffffff7, 0x31efffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='add'>+	0xf3cf3cf3, 0x0020cf3c, 0xcdcdcdcd, 0xfffffff5, 0x302fffff, 0x0c30c30c,</div><div class='ctx'> 	0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0xfffffff3,</div><div class='del'>-	0x31efffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0000cf3c,</div><div class='add'>+	0x310fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0000cf3c,</div><div class='ctx'> 	0xcdcdcdcd, 0xfffffff1, 0x310fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='ctx'> 	0xf3cf3cf3, 0x0001cf3c, 0xcdcdcdcd, 0xfffffff6, 0x305fffff, 0x0c30c30c,</div><div class='ctx'> 	0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0002cf3c, 0xcdcdcdcd, 0xfffff406,</div><div class='ctx'> 	0x1cbfffff, 0x0c30c305, 0xc30c30c3, 0xcf300014, 0xf3cf3cf3, 0x0004cf3c,</div><div class='ctx'> 	0xcdcdcdcd, 0xfffffff2, 0x304fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='ctx'> 	0xf3cf3cf3, 0x0008cf3c, 0xcdcdcdcd, 0xfffffffa, 0x302fffff, 0x0c30c30c,</div><div class='del'>-	0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0010cf3c, 0xcdcdcdcd, 0xffffff97,</div><div class='del'>-	0x056fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cc000, 0xf3cf3cf3, 0x0020cf3c,</div><div class='del'>-	0xcdcdcdcd, 0xfffffff5, 0x310fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='del'>-	0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0xfffffff3, 0x320fffff, 0x0c30c30c,</div><div class='add'>+	0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0010cf3c, 0xcdcdcdcd, 0xfffffff7,</div><div class='add'>+	0x30efffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0020cf3c,</div><div class='add'>+	0xcdcdcdcd, 0xfffffff5, 0x304fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='add'>+	0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0xfffffff3, 0x31efffff, 0x0c30c30c,</div><div class='ctx'> 	0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0000cf3c, 0xcdcdcdcd, 0xfffffff1,</div><div class='ctx'> 	0x310fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0001cf3c,</div><div class='ctx'> 	0xcdcdcdcd, 0xfffffff6, 0x305fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='ctx'> 	0xf3cf3cf3, 0x0002cf3c, 0xcdcdcdcd, 0xfffff406, 0x1cbfffff, 0x0c30c305,</div><div class='ctx'> 	0xc30c30c3, 0xcf300014, 0xf3cf3cf3, 0x0004cf3c, 0xcdcdcdcd, 0xfffffff2,</div><div class='ctx'> 	0x304fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0008cf3c,</div><div class='del'>-	0xcdcdcdcd, 0xffffff8a, 0x042fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cc000,</div><div class='del'>-	0xf3cf3cf3, 0x0010cf3c, 0xcdcdcdcd, 0xffffff97, 0x05cfffff, 0x0c30c30c,</div><div class='add'>+	0xcdcdcdcd, 0xfffffffa, 0x302fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='add'>+	0xf3cf3cf3, 0x0010cf3c, 0xcdcdcdcd, 0xffffff97, 0x056fffff, 0x0c30c30c,</div><div class='ctx'> 	0xc30c30c3, 0xcf3cc000, 0xf3cf3cf3, 0x0020cf3c, 0xcdcdcdcd, 0xfffffff5,</div><div class='ctx'> 	0x310fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0040cf3c,</div><div class='del'>-	0xcdcdcdcd, 0xfffffff3, 0x300fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='del'>-	0xf3cf3cf3, 0x0000cf3c, 0xcdcdcdcd, 0xfffffff1, 0x300fffff, 0x0c30c30c,</div><div class='add'>+	0xcdcdcdcd, 0xfffffff3, 0x320fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='add'>+	0xf3cf3cf3, 0x0000cf3c, 0xcdcdcdcd, 0xfffffff1, 0x310fffff, 0x0c30c30c,</div><div class='ctx'> 	0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0001cf3c, 0xcdcdcdcd, 0xfffffff6,</div><div class='ctx'> 	0x305fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0002cf3c,</div><div class='ctx'> 	0xcdcdcdcd, 0xfffff406, 0x1cbfffff, 0x0c30c305, 0xc30c30c3, 0xcf300014,</div><div class='ctx'> 	0xf3cf3cf3, 0x0004cf3c, 0xcdcdcdcd, 0xfffffff2, 0x304fffff, 0x0c30c30c,</div><div class='del'>-	0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0008cf3c, 0xcdcdcdcd, 0xfffffffa,</div><div class='del'>-	0x302fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0010cf3c,</div><div class='del'>-	0xcdcdcdcd, 0xffffff97, 0x040fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cc000,</div><div class='del'>-	0xf3cf3cf3, 0x0020cf3c, 0xcdcdcdcd, 0xfffffff5, 0x300fffff, 0x0c30c30c,</div><div class='del'>-	0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0xffffffff,</div><div class='del'>-	0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0000cf3c,</div><div class='del'>-	0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc,</div><div class='del'>-	0xf3cf3cf3, 0x0001cf3c, 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c,</div><div class='del'>-	0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0002cf3c, 0xcdcdcdcd, 0xffffffff,</div><div class='del'>-	0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0004cf3c,</div><div class='del'>-	0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc,</div><div class='del'>-	0xf3cf3cf3, 0x0008cf3c, 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c,</div><div class='del'>-	0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0010cf3c, 0xcdcdcdcd, 0xffffffff,</div><div class='del'>-	0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0020cf3c,</div><div class='del'>-	0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc,</div><div class='add'>+	0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0008cf3c, 0xcdcdcdcd, 0xffffff8a,</div><div class='add'>+	0x042fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cc000, 0xf3cf3cf3, 0x0010cf3c,</div><div class='add'>+	0xcdcdcdcd, 0xffffff97, 0x05cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cc000,</div><div class='add'>+	0xf3cf3cf3, 0x0020cf3c, 0xcdcdcdcd, 0xfffffff5, 0x310fffff, 0x0c30c30c,</div><div class='add'>+	0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0xfffffff3,</div><div class='add'>+	0x300fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0000cf3c,</div><div class='add'>+	0xcdcdcdcd, 0xfffffff1, 0x300fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='add'>+	0xf3cf3cf3, 0x0001cf3c, 0xcdcdcdcd, 0xfffffff6, 0x305fffff, 0x0c30c30c,</div><div class='add'>+	0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0002cf3c, 0xcdcdcdcd, 0xfffff406,</div><div class='add'>+	0x1cbfffff, 0x0c30c305, 0xc30c30c3, 0xcf300014, 0xf3cf3cf3, 0x0004cf3c,</div><div class='add'>+	0xcdcdcdcd, 0xfffffff2, 0x304fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='add'>+	0xf3cf3cf3, 0x0008cf3c, 0xcdcdcdcd, 0xfffffffa, 0x302fffff, 0x0c30c30c,</div><div class='add'>+	0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0010cf3c, 0xcdcdcdcd, 0xffffff97,</div><div class='add'>+	0x040fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cc000, 0xf3cf3cf3, 0x0020cf3c,</div><div class='add'>+	0xcdcdcdcd, 0xfffffff5, 0x300fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300,</div><div class='ctx'> 	0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c,</div><div class='ctx'> 	0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0000cf3c, 0xcdcdcdcd, 0xffffffff,</div><div class='ctx'> 	0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0001cf3c,</div><div class='hunk'>@@ -2678,16 +2630,27 @@ static const u32 init_data_e1[] = {</div><div class='ctx'> 	0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0010cf3c,</div><div class='ctx'> 	0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc,</div><div class='ctx'> 	0xf3cf3cf3, 0x0020cf3c, 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c,</div><div class='del'>-	0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0x00100000,</div><div class='del'>-	0x00070100, 0x00028170, 0x000b8198, 0x00020250, 0x00010270, 0x000f0280,</div><div class='del'>-	0x00010370, 0x00080000, 0x00080080, 0x00028100, 0x000b8128, 0x000201e0,</div><div class='del'>-	0x00010200, 0x00070210, 0x00020280, 0x000f0000, 0x000800f0, 0x00028170,</div><div class='del'>-	0x000b8198, 0x00020250, 0x00010270, 0x000b8280, 0x00080338, 0x00100000,</div><div class='del'>-	0x00080100, 0x00028180, 0x000b81a8, 0x00020260, 0x00018280, 0x000e8298,</div><div class='del'>-	0x00080380, 0x00028000, 0x000b8028, 0x000200e0, 0x00010100, 0x00008110,</div><div class='del'>-	0x00000118, 0xcccccccc, 0xcccccccc, 0xcccccccc, 0xcccccccc, 0x00002000,</div><div class='del'>-	0xcccccccc, 0xcccccccc, 0xcccccccc, 0xcccccccc, 0x00002000, 0xcccccccc,</div><div class='del'>-	0xcccccccc, 0xcccccccc, 0xcccccccc, 0x00002000</div><div class='add'>+	0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0xffffffff,</div><div class='add'>+	0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0000cf3c,</div><div class='add'>+	0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc,</div><div class='add'>+	0xf3cf3cf3, 0x0001cf3c, 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c,</div><div class='add'>+	0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0002cf3c, 0xcdcdcdcd, 0xffffffff,</div><div class='add'>+	0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0004cf3c,</div><div class='add'>+	0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc,</div><div class='add'>+	0xf3cf3cf3, 0x0008cf3c, 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c,</div><div class='add'>+	0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0010cf3c, 0xcdcdcdcd, 0xffffffff,</div><div class='add'>+	0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0020cf3c,</div><div class='add'>+	0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc,</div><div class='add'>+	0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0x00100000, 0x00070100, 0x00028170,</div><div class='add'>+	0x000b8198, 0x00020250, 0x00010270, 0x000f0280, 0x00010370, 0x00080000,</div><div class='add'>+	0x00080080, 0x00028100, 0x000b8128, 0x000201e0, 0x00010200, 0x00070210,</div><div class='add'>+	0x00020280, 0x000f0000, 0x000800f0, 0x00028170, 0x000b8198, 0x00020250,</div><div class='add'>+	0x00010270, 0x000b8280, 0x00080338, 0x00100000, 0x00080100, 0x00028180,</div><div class='add'>+	0x000b81a8, 0x00020260, 0x00018280, 0x000e8298, 0x00080380, 0x00028000,</div><div class='add'>+	0x000b8028, 0x000200e0, 0x00010100, 0x00008110, 0x00000118, 0xcccccccc,</div><div class='add'>+	0xcccccccc, 0xcccccccc, 0xcccccccc, 0x00002000, 0xcccccccc, 0xcccccccc,</div><div class='add'>+	0xcccccccc, 0xcccccccc, 0x00002000, 0xcccccccc, 0xcccccccc, 0xcccccccc,</div><div class='add'>+	0xcccccccc, 0x00002000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const u32 init_data_e1h[] = {</div><div class='head'>diff --git a/drivers/net/bnx2x_link.c b/drivers/net/bnx2x_link.c<br/>index ff2743db10d9..4ce7fe9c5251 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bnx2x_link.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/bnx2x_link.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bnx2x_link.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x_link.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "bnx2x_reg.h"</div><div class='ctx'> #include "bnx2x_fw_defs.h"</div><div class='hunk'>@@ -31,17 +30,16 @@</div><div class='ctx'> </div><div class='ctx'> /********************************************************/</div><div class='ctx'> #define SUPPORT_CL73 0 /* Currently no */</div><div class='del'>-#define ETH_HLEN 			14</div><div class='add'>+#define ETH_HLEN			14</div><div class='ctx'> #define ETH_OVREHEAD		(ETH_HLEN + 8)/* 8 for CRC + VLAN*/</div><div class='ctx'> #define ETH_MIN_PACKET_SIZE		60</div><div class='ctx'> #define ETH_MAX_PACKET_SIZE		1500</div><div class='ctx'> #define ETH_MAX_JUMBO_PACKET_SIZE	9600</div><div class='ctx'> #define MDIO_ACCESS_TIMEOUT		1000</div><div class='ctx'> #define BMAC_CONTROL_RX_ENABLE	2</div><div class='del'>-#define MAX_MTU_SIZE		5000</div><div class='ctx'> </div><div class='ctx'> /***********************************************************/</div><div class='del'>-/*                       Shortcut definitions              */</div><div class='add'>+/*			Shortcut definitions		   */</div><div class='ctx'> /***********************************************************/</div><div class='ctx'> </div><div class='ctx'> #define NIG_STATUS_XGXS0_LINK10G \</div><div class='hunk'>@@ -80,12 +78,12 @@</div><div class='ctx'> </div><div class='ctx'> #define AUTONEG_CL37		SHARED_HW_CFG_AN_ENABLE_CL37</div><div class='ctx'> #define AUTONEG_CL73		SHARED_HW_CFG_AN_ENABLE_CL73</div><div class='del'>-#define AUTONEG_BAM			SHARED_HW_CFG_AN_ENABLE_BAM</div><div class='del'>-#define AUTONEG_PARALLEL		\</div><div class='add'>+#define AUTONEG_BAM 		SHARED_HW_CFG_AN_ENABLE_BAM</div><div class='add'>+#define AUTONEG_PARALLEL \</div><div class='ctx'> 				SHARED_HW_CFG_AN_ENABLE_PARALLEL_DETECTION</div><div class='del'>-#define AUTONEG_SGMII_FIBER_AUTODET	\</div><div class='add'>+#define AUTONEG_SGMII_FIBER_AUTODET \</div><div class='ctx'> 				SHARED_HW_CFG_AN_EN_SGMII_FIBER_AUTO_DETECT</div><div class='del'>-#define AUTONEG_REMOTE_PHY		SHARED_HW_CFG_AN_ENABLE_REMOTE_PHY</div><div class='add'>+#define AUTONEG_REMOTE_PHY	SHARED_HW_CFG_AN_ENABLE_REMOTE_PHY</div><div class='ctx'> </div><div class='ctx'> #define GP_STATUS_PAUSE_RSOLUTION_TXSIDE \</div><div class='ctx'> 			MDIO_GP_STATUS_TOP_AN_STATUS1_PAUSE_RSOLUTION_TXSIDE</div><div class='hunk'>@@ -202,11 +200,10 @@ static void bnx2x_emac_init(struct link_params *params,</div><div class='ctx'> 	/* init emac - use read-modify-write */</div><div class='ctx'> 	/* self clear reset */</div><div class='ctx'> 	val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE);</div><div class='del'>-	EMAC_WR(EMAC_REG_EMAC_MODE, (val | EMAC_MODE_RESET));</div><div class='add'>+	EMAC_WR(bp, EMAC_REG_EMAC_MODE, (val | EMAC_MODE_RESET));</div><div class='ctx'> </div><div class='ctx'> 	timeout = 200;</div><div class='del'>-	do</div><div class='del'>-	{</div><div class='add'>+	do {</div><div class='ctx'> 		val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE);</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "EMAC reset reg is %u\n", val);</div><div class='ctx'> 		if (!timeout) {</div><div class='hunk'>@@ -214,18 +211,18 @@ static void bnx2x_emac_init(struct link_params *params,</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		timeout--;</div><div class='del'>-	}while (val &amp; EMAC_MODE_RESET);</div><div class='add'>+	} while (val &amp; EMAC_MODE_RESET);</div><div class='ctx'> </div><div class='ctx'> 	/* Set mac address */</div><div class='ctx'> 	val = ((params-&gt;mac_addr[0] &lt;&lt; 8) |</div><div class='ctx'> 		params-&gt;mac_addr[1]);</div><div class='del'>-	EMAC_WR(EMAC_REG_EMAC_MAC_MATCH, val);</div><div class='add'>+	EMAC_WR(bp, EMAC_REG_EMAC_MAC_MATCH, val);</div><div class='ctx'> </div><div class='ctx'> 	val = ((params-&gt;mac_addr[2] &lt;&lt; 24) |</div><div class='ctx'> 	       (params-&gt;mac_addr[3] &lt;&lt; 16) |</div><div class='ctx'> 	       (params-&gt;mac_addr[4] &lt;&lt; 8) |</div><div class='ctx'> 		params-&gt;mac_addr[5]);</div><div class='del'>-	EMAC_WR(EMAC_REG_EMAC_MAC_MATCH + 4, val);</div><div class='add'>+	EMAC_WR(bp, EMAC_REG_EMAC_MAC_MATCH + 4, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 bnx2x_emac_enable(struct link_params *params,</div><div class='hunk'>@@ -286,7 +283,7 @@ static u8 bnx2x_emac_enable(struct link_params *params,</div><div class='ctx'> 	if (CHIP_REV_IS_SLOW(bp)) {</div><div class='ctx'> 		/* config GMII mode */</div><div class='ctx'> 		val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE);</div><div class='del'>-		EMAC_WR(EMAC_REG_EMAC_MODE,</div><div class='add'>+		EMAC_WR(bp, EMAC_REG_EMAC_MODE,</div><div class='ctx'> 			    (val | EMAC_MODE_PORT_GMII));</div><div class='ctx'> 	} else { /* ASIC */</div><div class='ctx'> 		/* pause enable/disable */</div><div class='hunk'>@@ -298,17 +295,19 @@ static u8 bnx2x_emac_enable(struct link_params *params,</div><div class='ctx'> 				    EMAC_RX_MODE_FLOW_EN);</div><div class='ctx'> </div><div class='ctx'> 		bnx2x_bits_dis(bp,  emac_base + EMAC_REG_EMAC_TX_MODE,</div><div class='del'>-			       EMAC_TX_MODE_EXT_PAUSE_EN);</div><div class='add'>+			     (EMAC_TX_MODE_EXT_PAUSE_EN |</div><div class='add'>+			      EMAC_TX_MODE_FLOW_EN));</div><div class='ctx'> 		if (vars-&gt;flow_ctrl &amp; FLOW_CTRL_TX)</div><div class='ctx'> 			bnx2x_bits_en(bp, emac_base +</div><div class='ctx'> 				    EMAC_REG_EMAC_TX_MODE,</div><div class='del'>-				      EMAC_TX_MODE_EXT_PAUSE_EN);</div><div class='add'>+				   (EMAC_TX_MODE_EXT_PAUSE_EN |</div><div class='add'>+				    EMAC_TX_MODE_FLOW_EN));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* KEEP_VLAN_TAG, promiscuous */</div><div class='ctx'> 	val = REG_RD(bp, emac_base + EMAC_REG_EMAC_RX_MODE);</div><div class='ctx'> 	val |= EMAC_RX_MODE_KEEP_VLAN_TAG | EMAC_RX_MODE_PROMISCUOUS;</div><div class='del'>-	EMAC_WR(EMAC_REG_EMAC_RX_MODE, val);</div><div class='add'>+	EMAC_WR(bp, EMAC_REG_EMAC_RX_MODE, val);</div><div class='ctx'> </div><div class='ctx'> 	/* Set Loopback */</div><div class='ctx'> 	val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE);</div><div class='hunk'>@@ -316,10 +315,10 @@ static u8 bnx2x_emac_enable(struct link_params *params,</div><div class='ctx'> 		val |= 0x810;</div><div class='ctx'> 	else</div><div class='ctx'> 		val &amp;= ~0x810;</div><div class='del'>-	EMAC_WR(EMAC_REG_EMAC_MODE, val);</div><div class='add'>+	EMAC_WR(bp, EMAC_REG_EMAC_MODE, val);</div><div class='ctx'> </div><div class='ctx'> 	/* enable emac for jumbo packets */</div><div class='del'>-	EMAC_WR(EMAC_REG_EMAC_RX_MTU_SIZE,</div><div class='add'>+	EMAC_WR(bp, EMAC_REG_EMAC_RX_MTU_SIZE,</div><div class='ctx'> 		(EMAC_RX_MTU_SIZE_JUMBO_ENA |</div><div class='ctx'> 		 (ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD)));</div><div class='ctx'> </div><div class='hunk'>@@ -591,9 +590,9 @@ void bnx2x_link_status_update(struct link_params *params,</div><div class='ctx'> 			vars-&gt;flow_ctrl &amp;= ~FLOW_CTRL_RX;</div><div class='ctx'> </div><div class='ctx'> 		if (vars-&gt;phy_flags &amp; PHY_XGXS_FLAG) {</div><div class='del'>-			if (params-&gt;req_line_speed &amp;&amp;</div><div class='del'>-			    ((params-&gt;req_line_speed == SPEED_10) ||</div><div class='del'>-			     (params-&gt;req_line_speed == SPEED_100))) {</div><div class='add'>+			if (vars-&gt;line_speed &amp;&amp;</div><div class='add'>+			    ((vars-&gt;line_speed == SPEED_10) ||</div><div class='add'>+			     (vars-&gt;line_speed == SPEED_100))) {</div><div class='ctx'> 				vars-&gt;phy_flags |= PHY_SGMII_FLAG;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				vars-&gt;phy_flags &amp;= ~PHY_SGMII_FLAG;</div><div class='hunk'>@@ -645,7 +644,7 @@ static void bnx2x_bmac_rx_disable(struct bnx2x *bp, u8 port)</div><div class='ctx'> 	u32 bmac_addr = port ? NIG_REG_INGRESS_BMAC1_MEM :</div><div class='ctx'> 		NIG_REG_INGRESS_BMAC0_MEM;</div><div class='ctx'> 	u32 wb_data[2];</div><div class='del'>-    u32 nig_bmac_enable = REG_RD(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4);</div><div class='add'>+	u32 nig_bmac_enable = REG_RD(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4);</div><div class='ctx'> </div><div class='ctx'> 	/* Only if the bmac is out of reset */</div><div class='ctx'> 	if (REG_RD(bp, MISC_REG_RESET_REG_2) &amp;</div><div class='hunk'>@@ -670,7 +669,6 @@ static u8 bnx2x_pbf_update(struct link_params *params, u32 flow_ctrl,</div><div class='ctx'> 	u8 port = params-&gt;port;</div><div class='ctx'> 	u32 init_crd, crd;</div><div class='ctx'> 	u32 count = 1000;</div><div class='del'>-	u32 pause = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* disable port */</div><div class='ctx'> 	REG_WR(bp, PBF_REG_DISABLE_NEW_TASK_PROC_P0 + port*4, 0x1);</div><div class='hunk'>@@ -693,33 +691,25 @@ static u8 bnx2x_pbf_update(struct link_params *params, u32 flow_ctrl,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (flow_ctrl &amp; FLOW_CTRL_RX)</div><div class='del'>-		pause = 1;</div><div class='del'>-	REG_WR(bp, PBF_REG_P0_PAUSE_ENABLE + port*4, pause);</div><div class='del'>-	if (pause) {</div><div class='add'>+	if (flow_ctrl &amp; FLOW_CTRL_RX ||</div><div class='add'>+	    line_speed == SPEED_10 ||</div><div class='add'>+	    line_speed == SPEED_100 ||</div><div class='add'>+	    line_speed == SPEED_1000 ||</div><div class='add'>+	    line_speed == SPEED_2500) {</div><div class='add'>+		REG_WR(bp, PBF_REG_P0_PAUSE_ENABLE + port*4, 1);</div><div class='ctx'> 		/* update threshold */</div><div class='ctx'> 		REG_WR(bp, PBF_REG_P0_ARB_THRSH + port*4, 0);</div><div class='ctx'> 		/* update init credit */</div><div class='del'>-		init_crd = 778;		/* (800-18-4) */</div><div class='add'>+		init_crd = 778; 	/* (800-18-4) */</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		u32 thresh = (ETH_MAX_JUMBO_PACKET_SIZE +</div><div class='ctx'> 			      ETH_OVREHEAD)/16;</div><div class='del'>-</div><div class='add'>+		REG_WR(bp, PBF_REG_P0_PAUSE_ENABLE + port*4, 0);</div><div class='ctx'> 		/* update threshold */</div><div class='ctx'> 		REG_WR(bp, PBF_REG_P0_ARB_THRSH + port*4, thresh);</div><div class='ctx'> 		/* update init credit */</div><div class='ctx'> 		switch (line_speed) {</div><div class='del'>-		case SPEED_10:</div><div class='del'>-		case SPEED_100:</div><div class='del'>-		case SPEED_1000:</div><div class='del'>-			init_crd = thresh + 55 - 22;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SPEED_2500:</div><div class='del'>-			init_crd = thresh + 138 - 22;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='ctx'> 		case SPEED_10000:</div><div class='ctx'> 			init_crd = thresh + 553 - 22;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -764,10 +754,10 @@ static u32 bnx2x_get_emac_base(u32 ext_phy_type, u8 port)</div><div class='ctx'> 		emac_base = GRCBASE_EMAC0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073:</div><div class='del'>-		emac_base = (port) ? GRCBASE_EMAC0: GRCBASE_EMAC1;</div><div class='add'>+		emac_base = (port) ? GRCBASE_EMAC0 : GRCBASE_EMAC1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		emac_base = (port) ? GRCBASE_EMAC1: GRCBASE_EMAC0;</div><div class='add'>+		emac_base = (port) ? GRCBASE_EMAC1 : GRCBASE_EMAC0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return emac_base;</div><div class='hunk'>@@ -1044,7 +1034,7 @@ static void bnx2x_set_swap_lanes(struct link_params *params)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_set_parallel_detection(struct link_params *params,</div><div class='del'>-				       u8                phy_flags)</div><div class='add'>+				       u8       	 phy_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u16 control2;</div><div class='hunk'>@@ -1114,7 +1104,7 @@ static void bnx2x_set_autoneg(struct link_params *params,</div><div class='ctx'> 			      MDIO_COMBO_IEEE0_MII_CONTROL, &amp;reg_val);</div><div class='ctx'> </div><div class='ctx'> 	/* CL37 Autoneg Enabled */</div><div class='del'>-	if (params-&gt;req_line_speed == SPEED_AUTO_NEG)</div><div class='add'>+	if (vars-&gt;line_speed == SPEED_AUTO_NEG)</div><div class='ctx'> 		reg_val |= MDIO_COMBO_IEEO_MII_CONTROL_AN_EN;</div><div class='ctx'> 	else /* CL37 Autoneg Disabled */</div><div class='ctx'> 		reg_val &amp;= ~(MDIO_COMBO_IEEO_MII_CONTROL_AN_EN |</div><div class='hunk'>@@ -1132,7 +1122,7 @@ static void bnx2x_set_autoneg(struct link_params *params,</div><div class='ctx'> 			      MDIO_REG_BANK_SERDES_DIGITAL,</div><div class='ctx'> 			      MDIO_SERDES_DIGITAL_A_1000X_CONTROL1, &amp;reg_val);</div><div class='ctx'> 	reg_val &amp;= ~MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_SIGNAL_DETECT_EN;</div><div class='del'>-	if (params-&gt;req_line_speed == SPEED_AUTO_NEG)</div><div class='add'>+	if (vars-&gt;line_speed == SPEED_AUTO_NEG)</div><div class='ctx'> 		reg_val |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_AUTODET;</div><div class='ctx'> 	else</div><div class='ctx'> 		reg_val &amp;= ~MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_AUTODET;</div><div class='hunk'>@@ -1148,7 +1138,7 @@ static void bnx2x_set_autoneg(struct link_params *params,</div><div class='ctx'> 			      MDIO_REG_BANK_BAM_NEXT_PAGE,</div><div class='ctx'> 			      MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL,</div><div class='ctx'> 			  &amp;reg_val);</div><div class='del'>-	if (params-&gt;req_line_speed == SPEED_AUTO_NEG) {</div><div class='add'>+	if (vars-&gt;line_speed == SPEED_AUTO_NEG) {</div><div class='ctx'> 		/* Enable BAM aneg Mode and TetonII aneg Mode */</div><div class='ctx'> 		reg_val |= (MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL_BAM_MODE |</div><div class='ctx'> 			    MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL_TETON_AN);</div><div class='hunk'>@@ -1164,7 +1154,7 @@ static void bnx2x_set_autoneg(struct link_params *params,</div><div class='ctx'> 			      reg_val);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable Clause 73 Aneg */</div><div class='del'>-	if ((params-&gt;req_line_speed == SPEED_AUTO_NEG) &amp;&amp;</div><div class='add'>+	if ((vars-&gt;line_speed == SPEED_AUTO_NEG) &amp;&amp;</div><div class='ctx'> 	    (SUPPORT_CL73)) {</div><div class='ctx'> 		/* Enable BAM Station Manager */</div><div class='ctx'> </div><div class='hunk'>@@ -1226,7 +1216,8 @@ static void bnx2x_set_autoneg(struct link_params *params,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* program SerDes, forced speed */</div><div class='del'>-static void bnx2x_program_serdes(struct link_params *params)</div><div class='add'>+static void bnx2x_program_serdes(struct link_params *params,</div><div class='add'>+			       struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u16 reg_val;</div><div class='hunk'>@@ -1248,28 +1239,35 @@ static void bnx2x_program_serdes(struct link_params *params)</div><div class='ctx'> </div><div class='ctx'> 	/* program speed</div><div class='ctx'> 	   - needed only if the speed is greater than 1G (2.5G or 10G) */</div><div class='del'>-	if (!((params-&gt;req_line_speed == SPEED_1000) ||</div><div class='del'>-	      (params-&gt;req_line_speed == SPEED_100) ||</div><div class='del'>-	      (params-&gt;req_line_speed == SPEED_10))) {</div><div class='del'>-		CL45_RD_OVER_CL22(bp, params-&gt;port,</div><div class='add'>+	CL45_RD_OVER_CL22(bp, params-&gt;port,</div><div class='ctx'> 				      params-&gt;phy_addr,</div><div class='ctx'> 				      MDIO_REG_BANK_SERDES_DIGITAL,</div><div class='ctx'> 				      MDIO_SERDES_DIGITAL_MISC1, &amp;reg_val);</div><div class='del'>-		/* clearing the speed value before setting the right speed */</div><div class='del'>-		reg_val &amp;= ~MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_MASK;</div><div class='add'>+	/* clearing the speed value before setting the right speed */</div><div class='add'>+	DP(NETIF_MSG_LINK, "MDIO_REG_BANK_SERDES_DIGITAL = 0x%x\n", reg_val);</div><div class='add'>+</div><div class='add'>+	reg_val &amp;= ~(MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_MASK |</div><div class='add'>+		     MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_SEL);</div><div class='add'>+</div><div class='add'>+	if (!((vars-&gt;line_speed == SPEED_1000) ||</div><div class='add'>+	      (vars-&gt;line_speed == SPEED_100) ||</div><div class='add'>+	      (vars-&gt;line_speed == SPEED_10))) {</div><div class='add'>+</div><div class='ctx'> 		reg_val |= (MDIO_SERDES_DIGITAL_MISC1_REFCLK_SEL_156_25M |</div><div class='ctx'> 			    MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_SEL);</div><div class='del'>-		if (params-&gt;req_line_speed == SPEED_10000)</div><div class='add'>+		if (vars-&gt;line_speed == SPEED_10000)</div><div class='ctx'> 			reg_val |=</div><div class='ctx'> 				MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_10G_CX4;</div><div class='del'>-		if (params-&gt;req_line_speed == SPEED_13000)</div><div class='add'>+		if (vars-&gt;line_speed == SPEED_13000)</div><div class='ctx'> 			reg_val |=</div><div class='ctx'> 				MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_13G;</div><div class='del'>-		CL45_WR_OVER_CL22(bp, params-&gt;port,</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	CL45_WR_OVER_CL22(bp, params-&gt;port,</div><div class='ctx'> 				      params-&gt;phy_addr,</div><div class='ctx'> 				      MDIO_REG_BANK_SERDES_DIGITAL,</div><div class='ctx'> 				      MDIO_SERDES_DIGITAL_MISC1, reg_val);</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_set_brcm_cl37_advertisment(struct link_params *params)</div><div class='hunk'>@@ -1295,48 +1293,49 @@ static void bnx2x_set_brcm_cl37_advertisment(struct link_params *params)</div><div class='ctx'> 			      MDIO_OVER_1G_UP3, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnx2x_set_ieee_aneg_advertisment(struct link_params *params,</div><div class='del'>-					   u32 *ieee_fc)</div><div class='add'>+static void bnx2x_calc_ieee_aneg_adv(struct link_params *params, u32 *ieee_fc)</div><div class='ctx'> {</div><div class='del'>-	struct bnx2x *bp = params-&gt;bp;</div><div class='del'>-	/* for AN, we are always publishing full duplex */</div><div class='del'>-	u16 an_adv = MDIO_COMBO_IEEE0_AUTO_NEG_ADV_FULL_DUPLEX;</div><div class='del'>-</div><div class='add'>+	*ieee_fc = MDIO_COMBO_IEEE0_AUTO_NEG_ADV_FULL_DUPLEX;</div><div class='ctx'> 	/* resolve pause mode and advertisement</div><div class='ctx'> 	 * Please refer to Table 28B-3 of the 802.3ab-1999 spec */</div><div class='ctx'> </div><div class='ctx'> 	switch (params-&gt;req_flow_ctrl) {</div><div class='ctx'> 	case FLOW_CTRL_AUTO:</div><div class='del'>-		if (params-&gt;mtu &lt;= MAX_MTU_SIZE) {</div><div class='del'>-			an_adv |=</div><div class='add'>+		if (params-&gt;req_fc_auto_adv == FLOW_CTRL_BOTH) {</div><div class='add'>+			*ieee_fc |=</div><div class='ctx'> 			     MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH;</div><div class='ctx'> 		} else {</div><div class='del'>-			an_adv |=</div><div class='add'>+			*ieee_fc |=</div><div class='ctx'> 		       MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FLOW_CTRL_TX:</div><div class='del'>-		an_adv |=</div><div class='add'>+		*ieee_fc |=</div><div class='ctx'> 		       MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FLOW_CTRL_RX:</div><div class='ctx'> 	case FLOW_CTRL_BOTH:</div><div class='del'>-		an_adv |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH;</div><div class='add'>+		*ieee_fc |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FLOW_CTRL_NONE:</div><div class='ctx'> 	default:</div><div class='del'>-		an_adv |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_NONE;</div><div class='add'>+		*ieee_fc |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_NONE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	*ieee_fc = an_adv;</div><div class='add'>+static void bnx2x_set_ieee_aneg_advertisment(struct link_params *params,</div><div class='add'>+					   u32 ieee_fc)</div><div class='add'>+{</div><div class='add'>+	struct bnx2x *bp = params-&gt;bp;</div><div class='add'>+	/* for AN, we are always publishing full duplex */</div><div class='ctx'> </div><div class='ctx'> 	CL45_WR_OVER_CL22(bp, params-&gt;port,</div><div class='ctx'> 			      params-&gt;phy_addr,</div><div class='ctx'> 			      MDIO_REG_BANK_COMBO_IEEE0,</div><div class='del'>-			      MDIO_COMBO_IEEE0_AUTO_NEG_ADV, an_adv);</div><div class='add'>+			      MDIO_COMBO_IEEE0_AUTO_NEG_ADV, (u16)ieee_fc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_restart_autoneg(struct link_params *params)</div><div class='hunk'>@@ -1382,7 +1381,8 @@ static void bnx2x_restart_autoneg(struct link_params *params)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnx2x_initialize_sgmii_process(struct link_params *params)</div><div class='add'>+static void bnx2x_initialize_sgmii_process(struct link_params *params,</div><div class='add'>+					 struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u16 control1;</div><div class='hunk'>@@ -1406,7 +1406,7 @@ static void bnx2x_initialize_sgmii_process(struct link_params *params)</div><div class='ctx'> 			      control1);</div><div class='ctx'> </div><div class='ctx'> 	/* if forced speed */</div><div class='del'>-	if (!(params-&gt;req_line_speed == SPEED_AUTO_NEG)) {</div><div class='add'>+	if (!(vars-&gt;line_speed == SPEED_AUTO_NEG)) {</div><div class='ctx'> 		/* set speed, disable autoneg */</div><div class='ctx'> 		u16 mii_control;</div><div class='ctx'> </div><div class='hunk'>@@ -1419,7 +1419,7 @@ static void bnx2x_initialize_sgmii_process(struct link_params *params)</div><div class='ctx'> 				 MDIO_COMBO_IEEO_MII_CONTROL_MAN_SGMII_SP_MASK|</div><div class='ctx'> 				 MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX);</div><div class='ctx'> </div><div class='del'>-		switch (params-&gt;req_line_speed) {</div><div class='add'>+		switch (vars-&gt;line_speed) {</div><div class='ctx'> 		case SPEED_100:</div><div class='ctx'> 			mii_control |=</div><div class='ctx'> 				MDIO_COMBO_IEEO_MII_CONTROL_MAN_SGMII_SP_100;</div><div class='hunk'>@@ -1433,8 +1433,8 @@ static void bnx2x_initialize_sgmii_process(struct link_params *params)</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			/* invalid speed for SGMII */</div><div class='del'>-			DP(NETIF_MSG_LINK, "Invalid req_line_speed 0x%x\n",</div><div class='del'>-				  params-&gt;req_line_speed);</div><div class='add'>+			DP(NETIF_MSG_LINK, "Invalid line_speed 0x%x\n",</div><div class='add'>+				  vars-&gt;line_speed);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1460,20 +1460,20 @@ static void bnx2x_initialize_sgmii_process(struct link_params *params)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_pause_resolve(struct link_vars *vars, u32 pause_result)</div><div class='del'>-{</div><div class='del'>-	switch (pause_result) {			/* ASYM P ASYM P */</div><div class='del'>-	case 0xb:				/*   1  0   1  1 */</div><div class='add'>+{						/*  LD	    LP	 */</div><div class='add'>+	switch (pause_result) { 		/* ASYM P ASYM P */</div><div class='add'>+	case 0xb:       			/*   1  0   1  1 */</div><div class='ctx'> 		vars-&gt;flow_ctrl = FLOW_CTRL_TX;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case 0xe:				/*   1  1   1  0 */</div><div class='add'>+	case 0xe:       			/*   1  1   1  0 */</div><div class='ctx'> 		vars-&gt;flow_ctrl = FLOW_CTRL_RX;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case 0x5:				/*   0  1   0  1 */</div><div class='del'>-	case 0x7:				/*   0  1   1  1 */</div><div class='del'>-	case 0xd:				/*   1  1   0  1 */</div><div class='del'>-	case 0xf:				/*   1  1   1  1 */</div><div class='add'>+	case 0x5:       			/*   0  1   0  1 */</div><div class='add'>+	case 0x7:       			/*   0  1   1  1 */</div><div class='add'>+	case 0xd:       			/*   1  1   0  1 */</div><div class='add'>+	case 0xf:       			/*   1  1   1  1 */</div><div class='ctx'> 		vars-&gt;flow_ctrl = FLOW_CTRL_BOTH;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1531,6 +1531,28 @@ static u8 bnx2x_ext_phy_resove_fc(struct link_params *params,</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "Ext PHY pause result 0x%x \n",</div><div class='ctx'> 		   pause_result);</div><div class='ctx'> 		bnx2x_pause_resolve(vars, pause_result);</div><div class='add'>+		if (vars-&gt;flow_ctrl == FLOW_CTRL_NONE &amp;&amp;</div><div class='add'>+		     ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073) {</div><div class='add'>+			bnx2x_cl45_read(bp, port,</div><div class='add'>+				      ext_phy_type,</div><div class='add'>+				      ext_phy_addr,</div><div class='add'>+				      MDIO_AN_DEVAD,</div><div class='add'>+				      MDIO_AN_REG_CL37_FC_LD, &amp;ld_pause);</div><div class='add'>+</div><div class='add'>+			bnx2x_cl45_read(bp, port,</div><div class='add'>+				      ext_phy_type,</div><div class='add'>+				      ext_phy_addr,</div><div class='add'>+				      MDIO_AN_DEVAD,</div><div class='add'>+				      MDIO_AN_REG_CL37_FC_LP, &amp;lp_pause);</div><div class='add'>+			pause_result = (ld_pause &amp;</div><div class='add'>+				MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) &gt;&gt; 5;</div><div class='add'>+			pause_result |= (lp_pause &amp;</div><div class='add'>+				MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) &gt;&gt; 7;</div><div class='add'>+</div><div class='add'>+			bnx2x_pause_resolve(vars, pause_result);</div><div class='add'>+			DP(NETIF_MSG_LINK, "Ext PHY CL37 pause result 0x%x \n",</div><div class='add'>+				 pause_result);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1541,8 +1563,8 @@ static void bnx2x_flow_ctrl_resolve(struct link_params *params,</div><div class='ctx'> 				  u32 gp_status)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='del'>-	u16 ld_pause;	/* local driver */</div><div class='del'>-	u16 lp_pause;	/* link partner */</div><div class='add'>+	u16 ld_pause;   /* local driver */</div><div class='add'>+	u16 lp_pause;   /* link partner */</div><div class='ctx'> 	u16 pause_result;</div><div class='ctx'> </div><div class='ctx'> 	vars-&gt;flow_ctrl = FLOW_CTRL_NONE;</div><div class='hunk'>@@ -1573,13 +1595,10 @@ static void bnx2x_flow_ctrl_resolve(struct link_params *params,</div><div class='ctx'> 		   (bnx2x_ext_phy_resove_fc(params, vars))) {</div><div class='ctx'> 		return;</div><div class='ctx'> 	} else {</div><div class='del'>-		vars-&gt;flow_ctrl = params-&gt;req_flow_ctrl;</div><div class='del'>-		if (vars-&gt;flow_ctrl == FLOW_CTRL_AUTO) {</div><div class='del'>-			if (params-&gt;mtu &lt;= MAX_MTU_SIZE)</div><div class='del'>-				vars-&gt;flow_ctrl = FLOW_CTRL_BOTH;</div><div class='del'>-			else</div><div class='del'>-				vars-&gt;flow_ctrl = FLOW_CTRL_TX;</div><div class='del'>-		}</div><div class='add'>+		if (params-&gt;req_flow_ctrl == FLOW_CTRL_AUTO)</div><div class='add'>+			vars-&gt;flow_ctrl = params-&gt;req_fc_auto_adv;</div><div class='add'>+		else</div><div class='add'>+			vars-&gt;flow_ctrl = params-&gt;req_flow_ctrl;</div><div class='ctx'> 	}</div><div class='ctx'> 	DP(NETIF_MSG_LINK, "flow_ctrl 0x%x\n", vars-&gt;flow_ctrl);</div><div class='ctx'> }</div><div class='hunk'>@@ -1590,6 +1609,7 @@ static u8 bnx2x_link_settings_status(struct link_params *params,</div><div class='ctx'> 				      u32 gp_status)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='add'>+</div><div class='ctx'> 	u8 rc = 0;</div><div class='ctx'> 	vars-&gt;link_status = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1690,7 +1710,11 @@ static u8 bnx2x_link_settings_status(struct link_params *params,</div><div class='ctx'> </div><div class='ctx'> 		vars-&gt;link_status |= LINK_STATUS_SERDES_LINK;</div><div class='ctx'> </div><div class='del'>-		if (params-&gt;req_line_speed == SPEED_AUTO_NEG) {</div><div class='add'>+		if ((params-&gt;req_line_speed == SPEED_AUTO_NEG) &amp;&amp;</div><div class='add'>+		    ((XGXS_EXT_PHY_TYPE(params-&gt;ext_phy_config) ==</div><div class='add'>+		     PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT) ||</div><div class='add'>+		    (XGXS_EXT_PHY_TYPE(params-&gt;ext_phy_config) ==</div><div class='add'>+		     PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705))) {</div><div class='ctx'> 			vars-&gt;autoneg = AUTO_NEG_ENABLED;</div><div class='ctx'> </div><div class='ctx'> 			if (gp_status &amp; MDIO_AN_CL73_OR_37_COMPLETE) {</div><div class='hunk'>@@ -1705,18 +1729,18 @@ static u8 bnx2x_link_settings_status(struct link_params *params,</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='ctx'> 		if (vars-&gt;flow_ctrl &amp; FLOW_CTRL_TX)</div><div class='del'>-		       vars-&gt;link_status |=</div><div class='del'>-			LINK_STATUS_TX_FLOW_CONTROL_ENABLED;</div><div class='add'>+			vars-&gt;link_status |=</div><div class='add'>+				LINK_STATUS_TX_FLOW_CONTROL_ENABLED;</div><div class='ctx'> </div><div class='ctx'> 		if (vars-&gt;flow_ctrl &amp; FLOW_CTRL_RX)</div><div class='del'>-		       vars-&gt;link_status |=</div><div class='del'>-			LINK_STATUS_RX_FLOW_CONTROL_ENABLED;</div><div class='add'>+			vars-&gt;link_status |=</div><div class='add'>+				LINK_STATUS_RX_FLOW_CONTROL_ENABLED;</div><div class='ctx'> </div><div class='ctx'> 	} else { /* link_down */</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "phy link down\n");</div><div class='ctx'> </div><div class='ctx'> 		vars-&gt;phy_link_up = 0;</div><div class='del'>-		vars-&gt;line_speed = 0;</div><div class='add'>+</div><div class='ctx'> 		vars-&gt;duplex = DUPLEX_FULL;</div><div class='ctx'> 		vars-&gt;flow_ctrl = FLOW_CTRL_NONE;</div><div class='ctx'> 		vars-&gt;autoneg = AUTO_NEG_DISABLED;</div><div class='hunk'>@@ -1817,15 +1841,15 @@ static u8 bnx2x_emac_program(struct link_params *params,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='del'>-/*                           External Phy section                            */</div><div class='add'>+/*      		     External Phy section       		     */</div><div class='ctx'> /*****************************************************************************/</div><div class='del'>-static void bnx2x_hw_reset(struct bnx2x *bp)</div><div class='add'>+static void bnx2x_hw_reset(struct bnx2x *bp, u8 port)</div><div class='ctx'> {</div><div class='ctx'> 	bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,</div><div class='del'>-		       MISC_REGISTERS_GPIO_OUTPUT_LOW);</div><div class='add'>+		       MISC_REGISTERS_GPIO_OUTPUT_LOW, port);</div><div class='ctx'> 	msleep(1);</div><div class='ctx'> 	bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,</div><div class='del'>-		      MISC_REGISTERS_GPIO_OUTPUT_HIGH);</div><div class='add'>+		      MISC_REGISTERS_GPIO_OUTPUT_HIGH, port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_ext_phy_reset(struct link_params *params,</div><div class='hunk'>@@ -1854,10 +1878,11 @@ static void bnx2x_ext_phy_reset(struct link_params *params,</div><div class='ctx'> </div><div class='ctx'> 			/* Restore normal power mode*/</div><div class='ctx'> 			bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,</div><div class='del'>-				      MISC_REGISTERS_GPIO_OUTPUT_HIGH);</div><div class='add'>+				      MISC_REGISTERS_GPIO_OUTPUT_HIGH,</div><div class='add'>+					  params-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 			/* HW reset */</div><div class='del'>-			bnx2x_hw_reset(bp);</div><div class='add'>+			bnx2x_hw_reset(bp, params-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 			bnx2x_cl45_write(bp, params-&gt;port,</div><div class='ctx'> 				       ext_phy_type,</div><div class='hunk'>@@ -1869,7 +1894,8 @@ static void bnx2x_ext_phy_reset(struct link_params *params,</div><div class='ctx'> 			/* Unset Low Power Mode and SW reset */</div><div class='ctx'> 			/* Restore normal power mode*/</div><div class='ctx'> 			bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,</div><div class='del'>-				      MISC_REGISTERS_GPIO_OUTPUT_HIGH);</div><div class='add'>+				      MISC_REGISTERS_GPIO_OUTPUT_HIGH,</div><div class='add'>+					  params-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 			DP(NETIF_MSG_LINK, "XGXS 8072\n");</div><div class='ctx'> 			bnx2x_cl45_write(bp, params-&gt;port,</div><div class='hunk'>@@ -1887,19 +1913,14 @@ static void bnx2x_ext_phy_reset(struct link_params *params,</div><div class='ctx'> </div><div class='ctx'> 			/* Restore normal power mode*/</div><div class='ctx'> 			bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,</div><div class='del'>-				      MISC_REGISTERS_GPIO_OUTPUT_HIGH);</div><div class='add'>+				      MISC_REGISTERS_GPIO_OUTPUT_HIGH,</div><div class='add'>+					  params-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 			bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,</div><div class='del'>-				      MISC_REGISTERS_GPIO_OUTPUT_HIGH);</div><div class='add'>+				      MISC_REGISTERS_GPIO_OUTPUT_HIGH,</div><div class='add'>+					  params-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 			DP(NETIF_MSG_LINK, "XGXS 8073\n");</div><div class='del'>-			bnx2x_cl45_write(bp,</div><div class='del'>-				       params-&gt;port,</div><div class='del'>-				       ext_phy_type,</div><div class='del'>-				       ext_phy_addr,</div><div class='del'>-				       MDIO_PMA_DEVAD,</div><div class='del'>-				       MDIO_PMA_REG_CTRL,</div><div class='del'>-				       1&lt;&lt;15);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1908,10 +1929,11 @@ static void bnx2x_ext_phy_reset(struct link_params *params,</div><div class='ctx'> </div><div class='ctx'> 			/* Restore normal power mode*/</div><div class='ctx'> 			bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,</div><div class='del'>-				      MISC_REGISTERS_GPIO_OUTPUT_HIGH);</div><div class='add'>+				      MISC_REGISTERS_GPIO_OUTPUT_HIGH,</div><div class='add'>+					  params-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 			/* HW reset */</div><div class='del'>-			bnx2x_hw_reset(bp);</div><div class='add'>+			bnx2x_hw_reset(bp, params-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1934,7 +1956,7 @@ static void bnx2x_ext_phy_reset(struct link_params *params,</div><div class='ctx'> </div><div class='ctx'> 		case PORT_HW_CFG_SERDES_EXT_PHY_TYPE_BCM5482:</div><div class='ctx'> 			DP(NETIF_MSG_LINK, "SerDes 5482\n");</div><div class='del'>-			bnx2x_hw_reset(bp);</div><div class='add'>+			bnx2x_hw_reset(bp, params-&gt;port);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='hunk'>@@ -2098,42 +2120,45 @@ static u8 bnx2x_bcm8073_xaui_wa(struct link_params *params)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnx2x_bcm8073_external_rom_boot(struct link_params *params)</div><div class='add'>+static void bnx2x_bcm8073_external_rom_boot(struct bnx2x *bp, u8 port,</div><div class='add'>+					  u8 ext_phy_addr)</div><div class='ctx'> {</div><div class='del'>-	struct bnx2x *bp = params-&gt;bp;</div><div class='del'>-	u8 port = params-&gt;port;</div><div class='del'>-	u8 ext_phy_addr = ((params-&gt;ext_phy_config &amp;</div><div class='del'>-			     PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) &gt;&gt;</div><div class='del'>-			    PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);</div><div class='del'>-	u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params-&gt;ext_phy_config);</div><div class='del'>-	u16 fw_ver1, fw_ver2, val;</div><div class='del'>-	/* Need to wait 100ms after reset */</div><div class='del'>-	msleep(100);</div><div class='del'>-	/* Boot port from external ROM	*/</div><div class='add'>+	u16 fw_ver1, fw_ver2;</div><div class='add'>+	/* Boot port from external ROM  */</div><div class='ctx'> 	/* EDC grst */</div><div class='del'>-	bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='add'>+	bnx2x_cl45_write(bp, port,</div><div class='add'>+		       PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='add'>+		       ext_phy_addr,</div><div class='ctx'> 		       MDIO_PMA_DEVAD,</div><div class='ctx'> 		       MDIO_PMA_REG_GEN_CTRL,</div><div class='ctx'> 		       0x0001);</div><div class='ctx'> </div><div class='ctx'> 	/* ucode reboot and rst */</div><div class='del'>-	bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='add'>+	bnx2x_cl45_write(bp, port,</div><div class='add'>+		       PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='add'>+		       ext_phy_addr,</div><div class='ctx'> 		       MDIO_PMA_DEVAD,</div><div class='ctx'> 		       MDIO_PMA_REG_GEN_CTRL,</div><div class='ctx'> 		       0x008c);</div><div class='ctx'> </div><div class='del'>-	bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='add'>+	bnx2x_cl45_write(bp, port,</div><div class='add'>+		       PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='add'>+		       ext_phy_addr,</div><div class='ctx'> 		       MDIO_PMA_DEVAD,</div><div class='ctx'> 		       MDIO_PMA_REG_MISC_CTRL1, 0x0001);</div><div class='ctx'> </div><div class='ctx'> 	/* Reset internal microprocessor */</div><div class='del'>-	bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='add'>+	bnx2x_cl45_write(bp, port,</div><div class='add'>+		       PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='add'>+		       ext_phy_addr,</div><div class='ctx'> 		       MDIO_PMA_DEVAD,</div><div class='ctx'> 		       MDIO_PMA_REG_GEN_CTRL,</div><div class='ctx'> 		       MDIO_PMA_REG_GEN_CTRL_ROM_MICRO_RESET);</div><div class='ctx'> </div><div class='ctx'> 	/* Release srst bit */</div><div class='del'>-	bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='add'>+	bnx2x_cl45_write(bp, port,</div><div class='add'>+		       PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='add'>+		       ext_phy_addr,</div><div class='ctx'> 		       MDIO_PMA_DEVAD,</div><div class='ctx'> 		       MDIO_PMA_REG_GEN_CTRL,</div><div class='ctx'> 		       MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP);</div><div class='hunk'>@@ -2142,35 +2167,52 @@ static void bnx2x_bcm8073_external_rom_boot(struct link_params *params)</div><div class='ctx'> 	msleep(100);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear ser_boot_ctl bit */</div><div class='del'>-	bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='add'>+	bnx2x_cl45_write(bp, port,</div><div class='add'>+		       PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='add'>+		       ext_phy_addr,</div><div class='ctx'> 		       MDIO_PMA_DEVAD,</div><div class='ctx'> 		       MDIO_PMA_REG_MISC_CTRL1, 0x0000);</div><div class='ctx'> </div><div class='del'>-	bnx2x_cl45_read(bp, port, ext_phy_type, ext_phy_addr,</div><div class='del'>-		       MDIO_PMA_DEVAD,</div><div class='del'>-		       MDIO_PMA_REG_ROM_VER1, &amp;fw_ver1);</div><div class='del'>-	bnx2x_cl45_read(bp, port, ext_phy_type, ext_phy_addr,</div><div class='del'>-		       MDIO_PMA_DEVAD,</div><div class='del'>-		       MDIO_PMA_REG_ROM_VER2, &amp;fw_ver2);</div><div class='add'>+	bnx2x_cl45_read(bp, port, PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='add'>+		      ext_phy_addr,</div><div class='add'>+		      MDIO_PMA_DEVAD,</div><div class='add'>+		      MDIO_PMA_REG_ROM_VER1, &amp;fw_ver1);</div><div class='add'>+	bnx2x_cl45_read(bp, port,</div><div class='add'>+		      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='add'>+		      ext_phy_addr,</div><div class='add'>+		      MDIO_PMA_DEVAD,</div><div class='add'>+		      MDIO_PMA_REG_ROM_VER2, &amp;fw_ver2);</div><div class='ctx'> 	DP(NETIF_MSG_LINK, "8073 FW version 0x%x:0x%x\n", fw_ver1, fw_ver2);</div><div class='ctx'> </div><div class='del'>-	/* Only set bit 10 = 1 (Tx power down) */</div><div class='del'>-	bnx2x_cl45_read(bp, port, ext_phy_type, ext_phy_addr,</div><div class='del'>-		       MDIO_PMA_DEVAD,</div><div class='del'>-		       MDIO_PMA_REG_TX_POWER_DOWN, &amp;val);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static void bnx2x_bcm807x_force_10G(struct link_params *params)</div><div class='add'>+{</div><div class='add'>+	struct bnx2x *bp = params-&gt;bp;</div><div class='add'>+	u8 port = params-&gt;port;</div><div class='add'>+	u8 ext_phy_addr = ((params-&gt;ext_phy_config &amp;</div><div class='add'>+				PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) &gt;&gt;</div><div class='add'>+				PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);</div><div class='add'>+	u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params-&gt;ext_phy_config);</div><div class='add'>+</div><div class='add'>+	/* Force KR or KX */</div><div class='ctx'> 	bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='ctx'> 		       MDIO_PMA_DEVAD,</div><div class='del'>-		       MDIO_PMA_REG_TX_POWER_DOWN, (val | 1&lt;&lt;10));</div><div class='del'>-</div><div class='del'>-	msleep(600);</div><div class='del'>-	/* Release bit 10 (Release Tx power down) */</div><div class='add'>+		       MDIO_PMA_REG_CTRL,</div><div class='add'>+		       0x2040);</div><div class='ctx'> 	bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='ctx'> 		       MDIO_PMA_DEVAD,</div><div class='del'>-		       MDIO_PMA_REG_TX_POWER_DOWN, (val &amp; (~(1&lt;&lt;10))));</div><div class='del'>-</div><div class='add'>+		       MDIO_PMA_REG_10G_CTRL2,</div><div class='add'>+		       0x000b);</div><div class='add'>+	bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='add'>+		       MDIO_PMA_DEVAD,</div><div class='add'>+		       MDIO_PMA_REG_BCM_CTRL,</div><div class='add'>+		       0x0000);</div><div class='add'>+	bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='add'>+		       MDIO_AN_DEVAD,</div><div class='add'>+		       MDIO_AN_REG_CTRL,</div><div class='add'>+		       0x0000);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> static void bnx2x_bcm8073_set_xaui_low_power_mode(struct link_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='hunk'>@@ -2236,32 +2278,51 @@ static void bnx2x_bcm8073_set_xaui_low_power_mode(struct link_params *params)</div><div class='ctx'> 	bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='ctx'> 		       MDIO_XS_DEVAD, MDIO_XS_PLL_SEQUENCER, val);</div><div class='ctx'> }</div><div class='del'>-static void bnx2x_bcm807x_force_10G(struct link_params *params)</div><div class='add'>+</div><div class='add'>+static void bnx2x_8073_set_pause_cl37(struct link_params *params,</div><div class='add'>+				  struct link_vars *vars)</div><div class='ctx'> {</div><div class='add'>+</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='del'>-	u8 port = params-&gt;port;</div><div class='add'>+	u16 cl37_val;</div><div class='ctx'> 	u8 ext_phy_addr = ((params-&gt;ext_phy_config &amp;</div><div class='ctx'> 				PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) &gt;&gt;</div><div class='ctx'> 				PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);</div><div class='ctx'> 	u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params-&gt;ext_phy_config);</div><div class='ctx'> </div><div class='del'>-	/* Force KR or KX */</div><div class='del'>-	bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='del'>-		       MDIO_PMA_DEVAD,</div><div class='del'>-		       MDIO_PMA_REG_CTRL,</div><div class='del'>-		       0x2040);</div><div class='del'>-	bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='del'>-		       MDIO_PMA_DEVAD,</div><div class='del'>-		       MDIO_PMA_REG_10G_CTRL2,</div><div class='del'>-		       0x000b);</div><div class='del'>-	bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='del'>-		       MDIO_PMA_DEVAD,</div><div class='del'>-		       MDIO_PMA_REG_BCM_CTRL,</div><div class='del'>-		       0x0000);</div><div class='del'>-	bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='add'>+	bnx2x_cl45_read(bp, params-&gt;port,</div><div class='add'>+		      ext_phy_type,</div><div class='add'>+		      ext_phy_addr,</div><div class='add'>+		      MDIO_AN_DEVAD,</div><div class='add'>+		      MDIO_AN_REG_CL37_FC_LD, &amp;cl37_val);</div><div class='add'>+</div><div class='add'>+	cl37_val &amp;= ~MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH;</div><div class='add'>+	/* Please refer to Table 28B-3 of 802.3ab-1999 spec. */</div><div class='add'>+</div><div class='add'>+	if ((vars-&gt;ieee_fc &amp;</div><div class='add'>+	    MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_SYMMETRIC) ==</div><div class='add'>+	    MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_SYMMETRIC) {</div><div class='add'>+		cl37_val |=  MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_SYMMETRIC;</div><div class='add'>+	}</div><div class='add'>+	if ((vars-&gt;ieee_fc &amp;</div><div class='add'>+	    MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC) ==</div><div class='add'>+	    MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC) {</div><div class='add'>+		cl37_val |=  MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;</div><div class='add'>+	}</div><div class='add'>+	if ((vars-&gt;ieee_fc &amp;</div><div class='add'>+	    MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) ==</div><div class='add'>+	    MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) {</div><div class='add'>+		cl37_val |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH;</div><div class='add'>+	}</div><div class='add'>+	DP(NETIF_MSG_LINK,</div><div class='add'>+		 "Ext phy AN advertize cl37 0x%x\n", cl37_val);</div><div class='add'>+</div><div class='add'>+	bnx2x_cl45_write(bp, params-&gt;port,</div><div class='add'>+		       ext_phy_type,</div><div class='add'>+		       ext_phy_addr,</div><div class='ctx'> 		       MDIO_AN_DEVAD,</div><div class='del'>-		       MDIO_AN_REG_CTRL,</div><div class='del'>-		       0x0000);</div><div class='add'>+		       MDIO_AN_REG_CL37_FC_LD, cl37_val);</div><div class='add'>+	msleep(500);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_ext_phy_set_pause(struct link_params *params,</div><div class='hunk'>@@ -2282,13 +2343,16 @@ static void bnx2x_ext_phy_set_pause(struct link_params *params,</div><div class='ctx'> 		      MDIO_AN_REG_ADV_PAUSE, &amp;val);</div><div class='ctx'> </div><div class='ctx'> 	val &amp;= ~MDIO_AN_REG_ADV_PAUSE_BOTH;</div><div class='add'>+</div><div class='ctx'> 	/* Please refer to Table 28B-3 of 802.3ab-1999 spec. */</div><div class='ctx'> </div><div class='del'>-	if (vars-&gt;ieee_fc &amp;</div><div class='add'>+	if ((vars-&gt;ieee_fc &amp;</div><div class='add'>+	    MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC) ==</div><div class='ctx'> 	    MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC) {</div><div class='ctx'> 		val |=  MDIO_AN_REG_ADV_PAUSE_ASYMMETRIC;</div><div class='ctx'> 	}</div><div class='del'>-	if (vars-&gt;ieee_fc &amp;</div><div class='add'>+	if ((vars-&gt;ieee_fc &amp;</div><div class='add'>+	    MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) ==</div><div class='ctx'> 	    MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) {</div><div class='ctx'> 		val |=</div><div class='ctx'> 		 MDIO_AN_REG_ADV_PAUSE_PAUSE;</div><div class='hunk'>@@ -2302,6 +2366,65 @@ static void bnx2x_ext_phy_set_pause(struct link_params *params,</div><div class='ctx'> 		       MDIO_AN_REG_ADV_PAUSE, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static void bnx2x_init_internal_phy(struct link_params *params,</div><div class='add'>+				struct link_vars *vars)</div><div class='add'>+{</div><div class='add'>+	struct bnx2x *bp = params-&gt;bp;</div><div class='add'>+	u8 port = params-&gt;port;</div><div class='add'>+	if (!(vars-&gt;phy_flags &amp; PHY_SGMII_FLAG)) {</div><div class='add'>+		u16 bank, rx_eq;</div><div class='add'>+</div><div class='add'>+		rx_eq = ((params-&gt;serdes_config &amp;</div><div class='add'>+			  PORT_HW_CFG_SERDES_RX_DRV_EQUALIZER_MASK) &gt;&gt;</div><div class='add'>+			 PORT_HW_CFG_SERDES_RX_DRV_EQUALIZER_SHIFT);</div><div class='add'>+</div><div class='add'>+		DP(NETIF_MSG_LINK, "setting rx eq to 0x%x\n", rx_eq);</div><div class='add'>+		for (bank = MDIO_REG_BANK_RX0; bank &lt;= MDIO_REG_BANK_RX_ALL;</div><div class='add'>+		      bank += (MDIO_REG_BANK_RX1-MDIO_REG_BANK_RX0)) {</div><div class='add'>+			CL45_WR_OVER_CL22(bp, port,</div><div class='add'>+					      params-&gt;phy_addr,</div><div class='add'>+					      bank ,</div><div class='add'>+					      MDIO_RX0_RX_EQ_BOOST,</div><div class='add'>+					      ((rx_eq &amp;</div><div class='add'>+				MDIO_RX0_RX_EQ_BOOST_EQUALIZER_CTRL_MASK) |</div><div class='add'>+				MDIO_RX0_RX_EQ_BOOST_OFFSET_CTRL));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* forced speed requested? */</div><div class='add'>+		if (vars-&gt;line_speed != SPEED_AUTO_NEG) {</div><div class='add'>+			DP(NETIF_MSG_LINK, "not SGMII, no AN\n");</div><div class='add'>+</div><div class='add'>+			/* disable autoneg */</div><div class='add'>+			bnx2x_set_autoneg(params, vars);</div><div class='add'>+</div><div class='add'>+			/* program speed and duplex */</div><div class='add'>+			bnx2x_program_serdes(params, vars);</div><div class='add'>+</div><div class='add'>+		} else { /* AN_mode */</div><div class='add'>+			DP(NETIF_MSG_LINK, "not SGMII, AN\n");</div><div class='add'>+</div><div class='add'>+			/* AN enabled */</div><div class='add'>+			bnx2x_set_brcm_cl37_advertisment(params);</div><div class='add'>+</div><div class='add'>+			/* program duplex &amp; pause advertisement (for aneg) */</div><div class='add'>+			bnx2x_set_ieee_aneg_advertisment(params,</div><div class='add'>+						       vars-&gt;ieee_fc);</div><div class='add'>+</div><div class='add'>+			/* enable autoneg */</div><div class='add'>+			bnx2x_set_autoneg(params, vars);</div><div class='add'>+</div><div class='add'>+			/* enable and restart AN */</div><div class='add'>+			bnx2x_restart_autoneg(params);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else { /* SGMII mode */</div><div class='add'>+		DP(NETIF_MSG_LINK, "SGMII\n");</div><div class='add'>+</div><div class='add'>+		bnx2x_initialize_sgmii_process(params, vars);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='hunk'>@@ -2343,7 +2466,6 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> </div><div class='ctx'> 		switch (ext_phy_type) {</div><div class='ctx'> 		case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT:</div><div class='del'>-			DP(NETIF_MSG_LINK, "XGXS Direct\n");</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705:</div><div class='hunk'>@@ -2419,7 +2541,7 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> 					       ext_phy_type,</div><div class='ctx'> 					       ext_phy_addr,</div><div class='ctx'> 					       MDIO_AN_DEVAD,</div><div class='del'>-					       MDIO_AN_REG_CL37_FD,</div><div class='add'>+					       MDIO_AN_REG_CL37_FC_LP,</div><div class='ctx'> 					       0x0020);</div><div class='ctx'> 				/* Enable CL37 AN */</div><div class='ctx'> 				bnx2x_cl45_write(bp, params-&gt;port,</div><div class='hunk'>@@ -2458,54 +2580,43 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> 				rx_alarm_ctrl_val = 0x400;</div><div class='ctx'> 				lasi_ctrl_val = 0x0004;</div><div class='ctx'> 			} else {</div><div class='del'>-				/* In 8073, port1 is directed through emac0 and</div><div class='del'>-				 * port0 is directed through emac1</div><div class='del'>-				 */</div><div class='ctx'> 				rx_alarm_ctrl_val = (1&lt;&lt;2);</div><div class='del'>-				/*lasi_ctrl_val = 0x0005;*/</div><div class='ctx'> 				lasi_ctrl_val = 0x0004;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/* Wait for soft reset to get cleared upto 1 sec */</div><div class='del'>-			for (cnt = 0; cnt &lt; 1000; cnt++) {</div><div class='del'>-				bnx2x_cl45_read(bp, params-&gt;port,</div><div class='del'>-					      ext_phy_type,</div><div class='del'>-					      ext_phy_addr,</div><div class='del'>-					      MDIO_PMA_DEVAD,</div><div class='del'>-					      MDIO_PMA_REG_CTRL,</div><div class='del'>-					      &amp;ctrl);</div><div class='del'>-				if (!(ctrl &amp; (1&lt;&lt;15)))</div><div class='del'>-					break;</div><div class='del'>-				msleep(1);</div><div class='del'>-			}</div><div class='del'>-			DP(NETIF_MSG_LINK,</div><div class='del'>-				"807x control reg 0x%x (after %d ms)\n",</div><div class='del'>-				ctrl, cnt);</div><div class='add'>+			/* enable LASI */</div><div class='add'>+			bnx2x_cl45_write(bp, params-&gt;port,</div><div class='add'>+				   ext_phy_type,</div><div class='add'>+				   ext_phy_addr,</div><div class='add'>+				   MDIO_PMA_DEVAD,</div><div class='add'>+				   MDIO_PMA_REG_RX_ALARM_CTRL,</div><div class='add'>+				   rx_alarm_ctrl_val);</div><div class='add'>+</div><div class='add'>+			bnx2x_cl45_write(bp, params-&gt;port,</div><div class='add'>+				       ext_phy_type,</div><div class='add'>+				       ext_phy_addr,</div><div class='add'>+				       MDIO_PMA_DEVAD,</div><div class='add'>+				       MDIO_PMA_REG_LASI_CTRL,</div><div class='add'>+				       lasi_ctrl_val);</div><div class='add'>+</div><div class='add'>+			bnx2x_8073_set_pause_cl37(params, vars);</div><div class='ctx'> </div><div class='ctx'> 			if (ext_phy_type ==</div><div class='ctx'> 			    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072){</div><div class='ctx'> 				bnx2x_bcm8072_external_rom_boot(params);</div><div class='ctx'> 			} else {</div><div class='del'>-				bnx2x_bcm8073_external_rom_boot(params);</div><div class='add'>+</div><div class='ctx'> 				/* In case of 8073 with long xaui lines,</div><div class='ctx'> 				don't set the 8073 xaui low power*/</div><div class='ctx'> 				bnx2x_bcm8073_set_xaui_low_power_mode(params);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/* enable LASI */</div><div class='del'>-			bnx2x_cl45_write(bp, params-&gt;port,</div><div class='del'>-				       ext_phy_type,</div><div class='del'>-				       ext_phy_addr,</div><div class='del'>-				       MDIO_PMA_DEVAD,</div><div class='del'>-				       MDIO_PMA_REG_RX_ALARM_CTRL,</div><div class='del'>-				       rx_alarm_ctrl_val);</div><div class='del'>-</div><div class='del'>-			bnx2x_cl45_write(bp, params-&gt;port,</div><div class='del'>-				       ext_phy_type,</div><div class='del'>-				       ext_phy_addr,</div><div class='del'>-				       MDIO_PMA_DEVAD,</div><div class='del'>-				       MDIO_PMA_REG_LASI_CTRL,</div><div class='del'>-				       lasi_ctrl_val);</div><div class='add'>+			bnx2x_cl45_read(bp, params-&gt;port,</div><div class='add'>+				      ext_phy_type,</div><div class='add'>+				      ext_phy_addr,</div><div class='add'>+				      MDIO_PMA_DEVAD,</div><div class='add'>+				      0xca13,</div><div class='add'>+				      &amp;tmp1);</div><div class='ctx'> </div><div class='ctx'> 			bnx2x_cl45_read(bp, params-&gt;port,</div><div class='ctx'> 				      ext_phy_type,</div><div class='hunk'>@@ -2519,12 +2630,21 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> 			/* If this is forced speed, set to KR or KX</div><div class='ctx'> 			 * (all other are not supported)</div><div class='ctx'> 			 */</div><div class='del'>-			if (!(params-&gt;req_line_speed == SPEED_AUTO_NEG)) {</div><div class='del'>-			if (params-&gt;req_line_speed == SPEED_10000) {</div><div class='del'>-					bnx2x_bcm807x_force_10G(params);</div><div class='del'>-					DP(NETIF_MSG_LINK,</div><div class='del'>-					   "Forced speed 10G on 807X\n");</div><div class='del'>-					break;</div><div class='add'>+			if (params-&gt;loopback_mode == LOOPBACK_EXT) {</div><div class='add'>+				bnx2x_bcm807x_force_10G(params);</div><div class='add'>+				DP(NETIF_MSG_LINK,</div><div class='add'>+					"Forced speed 10G on 807X\n");</div><div class='add'>+				break;</div><div class='add'>+			} else {</div><div class='add'>+				bnx2x_cl45_write(bp, params-&gt;port,</div><div class='add'>+					       ext_phy_type, ext_phy_addr,</div><div class='add'>+					       MDIO_PMA_DEVAD,</div><div class='add'>+					       MDIO_PMA_REG_BCM_CTRL,</div><div class='add'>+					       0x0002);</div><div class='add'>+			}</div><div class='add'>+			if (params-&gt;req_line_speed != SPEED_AUTO_NEG) {</div><div class='add'>+				if (params-&gt;req_line_speed == SPEED_10000) {</div><div class='add'>+					val = (1&lt;&lt;7);</div><div class='ctx'> 				} else if (params-&gt;req_line_speed ==</div><div class='ctx'> 					   SPEED_2500) {</div><div class='ctx'> 					val = (1&lt;&lt;5);</div><div class='hunk'>@@ -2539,11 +2659,14 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> 					PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)</div><div class='ctx'> 					val |= (1&lt;&lt;7);</div><div class='ctx'> </div><div class='add'>+				/* Note that 2.5G works only when</div><div class='add'>+				used with 1G advertisment */</div><div class='ctx'> 				if (params-&gt;speed_cap_mask &amp;</div><div class='del'>-					PORT_HW_CFG_SPEED_CAPABILITY_D0_1G)</div><div class='add'>+					(PORT_HW_CFG_SPEED_CAPABILITY_D0_1G |</div><div class='add'>+					 PORT_HW_CFG_SPEED_CAPABILITY_D0_2_5G))</div><div class='ctx'> 					val |= (1&lt;&lt;5);</div><div class='del'>-				DP(NETIF_MSG_LINK, "807x autoneg val = 0x%x\n", val);</div><div class='del'>-				/*val = ((1&lt;&lt;5)|(1&lt;&lt;7));*/</div><div class='add'>+				DP(NETIF_MSG_LINK,</div><div class='add'>+					 "807x autoneg val = 0x%x\n", val);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			bnx2x_cl45_write(bp, params-&gt;port,</div><div class='hunk'>@@ -2554,20 +2677,19 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> </div><div class='ctx'> 			if (ext_phy_type ==</div><div class='ctx'> 			    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073) {</div><div class='del'>-				/* Disable 2.5Ghz */</div><div class='add'>+</div><div class='ctx'> 				bnx2x_cl45_read(bp, params-&gt;port,</div><div class='ctx'> 					      ext_phy_type,</div><div class='ctx'> 					      ext_phy_addr,</div><div class='ctx'> 					      MDIO_AN_DEVAD,</div><div class='ctx'> 					      0x8329, &amp;tmp1);</div><div class='del'>-/* SUPPORT_SPEED_CAPABILITY</div><div class='del'>-				(Due to the nature of the link order, its not</div><div class='del'>-				possible to enable 2.5G within the autoneg</div><div class='del'>-				capabilities)</div><div class='del'>-				if (params-&gt;speed_cap_mask &amp;</div><div class='del'>-				PORT_HW_CFG_SPEED_CAPABILITY_D0_2_5G)</div><div class='del'>-*/</div><div class='del'>-				if (params-&gt;req_line_speed == SPEED_2500) {</div><div class='add'>+</div><div class='add'>+				if (((params-&gt;speed_cap_mask &amp;</div><div class='add'>+				      PORT_HW_CFG_SPEED_CAPABILITY_D0_2_5G) &amp;&amp;</div><div class='add'>+				     (params-&gt;req_line_speed ==</div><div class='add'>+				      SPEED_AUTO_NEG)) ||</div><div class='add'>+				    (params-&gt;req_line_speed ==</div><div class='add'>+				     SPEED_2500)) {</div><div class='ctx'> 					u16 phy_ver;</div><div class='ctx'> 					/* Allow 2.5G for A1 and above */</div><div class='ctx'> 					bnx2x_cl45_read(bp, params-&gt;port,</div><div class='hunk'>@@ -2575,49 +2697,53 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> 					 ext_phy_addr,</div><div class='ctx'> 					 MDIO_PMA_DEVAD,</div><div class='ctx'> 					 0xc801, &amp;phy_ver);</div><div class='del'>-</div><div class='add'>+					DP(NETIF_MSG_LINK, "Add 2.5G\n");</div><div class='ctx'> 					if (phy_ver &gt; 0)</div><div class='ctx'> 						tmp1 |= 1;</div><div class='ctx'> 					else</div><div class='ctx'> 						tmp1 &amp;= 0xfffe;</div><div class='del'>-			}</div><div class='del'>-				else</div><div class='add'>+				} else {</div><div class='add'>+					DP(NETIF_MSG_LINK, "Disable 2.5G\n");</div><div class='ctx'> 					tmp1 &amp;= 0xfffe;</div><div class='add'>+				}</div><div class='ctx'> </div><div class='del'>-			bnx2x_cl45_write(bp, params-&gt;port,</div><div class='del'>-				       ext_phy_type,</div><div class='del'>-				       ext_phy_addr,</div><div class='del'>-				       MDIO_AN_DEVAD,</div><div class='add'>+				bnx2x_cl45_write(bp, params-&gt;port,</div><div class='add'>+					       ext_phy_type,</div><div class='add'>+					       ext_phy_addr,</div><div class='add'>+					       MDIO_AN_DEVAD,</div><div class='ctx'> 					       0x8329, tmp1);</div><div class='ctx'> 			}</div><div class='del'>-			/* Add support for CL37 (passive mode) I */</div><div class='del'>-			bnx2x_cl45_write(bp, params-&gt;port,</div><div class='add'>+</div><div class='add'>+			/* Add support for CL37 (passive mode) II */</div><div class='add'>+</div><div class='add'>+			bnx2x_cl45_read(bp, params-&gt;port,</div><div class='ctx'> 				       ext_phy_type,</div><div class='ctx'> 				       ext_phy_addr,</div><div class='ctx'> 				       MDIO_AN_DEVAD,</div><div class='del'>-				       MDIO_AN_REG_CL37_CL73, 0x040c);</div><div class='del'>-			/* Add support for CL37 (passive mode) II */</div><div class='add'>+				       MDIO_AN_REG_CL37_FC_LD,</div><div class='add'>+				       &amp;tmp1);</div><div class='add'>+</div><div class='ctx'> 			bnx2x_cl45_write(bp, params-&gt;port,</div><div class='ctx'> 				       ext_phy_type,</div><div class='ctx'> 				       ext_phy_addr,</div><div class='ctx'> 				       MDIO_AN_DEVAD,</div><div class='del'>-				       MDIO_AN_REG_CL37_FD, 0x20);</div><div class='add'>+				       MDIO_AN_REG_CL37_FC_LD, (tmp1 |</div><div class='add'>+				       ((params-&gt;req_duplex == DUPLEX_FULL) ?</div><div class='add'>+				       0x20 : 0x40)));</div><div class='add'>+</div><div class='ctx'> 			/* Add support for CL37 (passive mode) III */</div><div class='ctx'> 			bnx2x_cl45_write(bp, params-&gt;port,</div><div class='ctx'> 				       ext_phy_type,</div><div class='ctx'> 				       ext_phy_addr,</div><div class='ctx'> 				       MDIO_AN_DEVAD,</div><div class='ctx'> 				       MDIO_AN_REG_CL37_AN, 0x1000);</div><div class='del'>-			/* Restart autoneg */</div><div class='del'>-			msleep(500);</div><div class='ctx'> </div><div class='ctx'> 			if (ext_phy_type ==</div><div class='ctx'> 			    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073) {</div><div class='del'>-</div><div class='del'>-			/* The SNR will improve about 2db by changing the</div><div class='add'>+				/* The SNR will improve about 2db by changing</div><div class='ctx'> 				BW and FEE main tap. Rest commands are executed</div><div class='ctx'> 				after link is up*/</div><div class='del'>-			/* Change FFE main cursor to 5 in EDC register */</div><div class='add'>+				/*Change FFE main cursor to 5 in EDC register*/</div><div class='ctx'> 				if (bnx2x_8073_is_snr_needed(params))</div><div class='ctx'> 					bnx2x_cl45_write(bp, params-&gt;port,</div><div class='ctx'> 						    ext_phy_type,</div><div class='hunk'>@@ -2626,25 +2752,28 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> 						    MDIO_PMA_REG_EDC_FFE_MAIN,</div><div class='ctx'> 						    0xFB0C);</div><div class='ctx'> </div><div class='del'>-			/* Enable FEC (Forware Error Correction)</div><div class='del'>-			   Request in the AN */</div><div class='del'>-			bnx2x_cl45_read(bp, params-&gt;port,</div><div class='del'>-				      ext_phy_type,</div><div class='del'>-				      ext_phy_addr,</div><div class='del'>-				      MDIO_AN_DEVAD,</div><div class='del'>-				      MDIO_AN_REG_ADV2, &amp;tmp1);</div><div class='add'>+				/* Enable FEC (Forware Error Correction)</div><div class='add'>+				Request in the AN */</div><div class='add'>+				bnx2x_cl45_read(bp, params-&gt;port,</div><div class='add'>+					      ext_phy_type,</div><div class='add'>+					      ext_phy_addr,</div><div class='add'>+					      MDIO_AN_DEVAD,</div><div class='add'>+					      MDIO_AN_REG_ADV2, &amp;tmp1);</div><div class='ctx'> </div><div class='del'>-			tmp1 |= (1&lt;&lt;15);</div><div class='add'>+				tmp1 |= (1&lt;&lt;15);</div><div class='add'>+</div><div class='add'>+				bnx2x_cl45_write(bp, params-&gt;port,</div><div class='add'>+					       ext_phy_type,</div><div class='add'>+					       ext_phy_addr,</div><div class='add'>+					       MDIO_AN_DEVAD,</div><div class='add'>+					       MDIO_AN_REG_ADV2, tmp1);</div><div class='ctx'> </div><div class='del'>-			bnx2x_cl45_write(bp, params-&gt;port,</div><div class='del'>-				      ext_phy_type,</div><div class='del'>-				      ext_phy_addr,</div><div class='del'>-				      MDIO_AN_DEVAD,</div><div class='del'>-				      MDIO_AN_REG_ADV2, tmp1);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			bnx2x_ext_phy_set_pause(params, vars);</div><div class='ctx'> </div><div class='add'>+			/* Restart autoneg */</div><div class='add'>+			msleep(500);</div><div class='ctx'> 			bnx2x_cl45_write(bp, params-&gt;port,</div><div class='ctx'> 				       ext_phy_type,</div><div class='ctx'> 				       ext_phy_addr,</div><div class='hunk'>@@ -2701,10 +2830,7 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	} else { /* SerDes */</div><div class='del'>-/*		ext_phy_addr = ((bp-&gt;ext_phy_config &amp;</div><div class='del'>-				 PORT_HW_CFG_SERDES_EXT_PHY_ADDR_MASK) &gt;&gt;</div><div class='del'>-				PORT_HW_CFG_SERDES_EXT_PHY_ADDR_SHIFT);</div><div class='del'>-*/</div><div class='add'>+</div><div class='ctx'> 		ext_phy_type = SERDES_EXT_PHY_TYPE(params-&gt;ext_phy_config);</div><div class='ctx'> 		switch (ext_phy_type) {</div><div class='ctx'> 		case PORT_HW_CFG_SERDES_EXT_PHY_TYPE_DIRECT:</div><div class='hunk'>@@ -2726,7 +2852,7 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,</div><div class='del'>-				  struct link_vars *vars)</div><div class='add'>+				 struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u32 ext_phy_type;</div><div class='hunk'>@@ -2767,6 +2893,8 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,</div><div class='ctx'> 				      MDIO_PMA_REG_RX_SD, &amp;rx_sd);</div><div class='ctx'> 			DP(NETIF_MSG_LINK, "8705 rx_sd 0x%x\n", rx_sd);</div><div class='ctx'> 			ext_phy_link_up = (rx_sd &amp; 0x1);</div><div class='add'>+			if (ext_phy_link_up)</div><div class='add'>+				vars-&gt;line_speed = SPEED_10000;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706:</div><div class='hunk'>@@ -2810,6 +2938,13 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,</div><div class='ctx'> 			 */</div><div class='ctx'> 			ext_phy_link_up = ((rx_sd &amp; pcs_status &amp; 0x1) ||</div><div class='ctx'> 					   (val2 &amp; (1&lt;&lt;1)));</div><div class='add'>+			if (ext_phy_link_up) {</div><div class='add'>+				if (val2 &amp; (1&lt;&lt;1))</div><div class='add'>+					vars-&gt;line_speed = SPEED_1000;</div><div class='add'>+				else</div><div class='add'>+					vars-&gt;line_speed = SPEED_10000;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			/* clear LASI indication*/</div><div class='ctx'> 			bnx2x_cl45_read(bp, params-&gt;port, ext_phy_type,</div><div class='ctx'> 				      ext_phy_addr,</div><div class='hunk'>@@ -2820,6 +2955,8 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,</div><div class='ctx'> 		case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072:</div><div class='ctx'> 		case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073:</div><div class='ctx'> 		{</div><div class='add'>+			u16 link_status = 0;</div><div class='add'>+			u16 an1000_status = 0;</div><div class='ctx'> 			if (ext_phy_type ==</div><div class='ctx'> 			     PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072) {</div><div class='ctx'> 				bnx2x_cl45_read(bp, params-&gt;port,</div><div class='hunk'>@@ -2846,14 +2983,9 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,</div><div class='ctx'> 					      MDIO_PMA_DEVAD,</div><div class='ctx'> 					      MDIO_PMA_REG_LASI_STATUS, &amp;val1);</div><div class='ctx'> </div><div class='del'>-				bnx2x_cl45_read(bp, params-&gt;port,</div><div class='del'>-					      ext_phy_type,</div><div class='del'>-					      ext_phy_addr,</div><div class='del'>-					      MDIO_PMA_DEVAD,</div><div class='del'>-					      MDIO_PMA_REG_LASI_STATUS, &amp;val2);</div><div class='ctx'> 				DP(NETIF_MSG_LINK,</div><div class='del'>-					 "8703 LASI status 0x%x-&gt;0x%x\n",</div><div class='del'>-					  val1, val2);</div><div class='add'>+					 "8703 LASI status 0x%x\n",</div><div class='add'>+					  val1);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* clear the interrupt LASI status register */</div><div class='hunk'>@@ -2869,20 +3001,23 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,</div><div class='ctx'> 				      MDIO_PCS_REG_STATUS, &amp;val1);</div><div class='ctx'> 			DP(NETIF_MSG_LINK, "807x PCS status 0x%x-&gt;0x%x\n",</div><div class='ctx'> 			   val2, val1);</div><div class='del'>-			/* Check the LASI */</div><div class='add'>+			/* Clear MSG-OUT */</div><div class='ctx'> 			bnx2x_cl45_read(bp, params-&gt;port,</div><div class='ctx'> 				      ext_phy_type,</div><div class='ctx'> 				      ext_phy_addr,</div><div class='ctx'> 				      MDIO_PMA_DEVAD,</div><div class='del'>-				      MDIO_PMA_REG_RX_ALARM, &amp;val2);</div><div class='add'>+				      0xca13,</div><div class='add'>+				      &amp;val1);</div><div class='add'>+</div><div class='add'>+			/* Check the LASI */</div><div class='ctx'> 			bnx2x_cl45_read(bp, params-&gt;port,</div><div class='ctx'> 				      ext_phy_type,</div><div class='ctx'> 				      ext_phy_addr,</div><div class='ctx'> 				      MDIO_PMA_DEVAD,</div><div class='del'>-				      MDIO_PMA_REG_RX_ALARM,</div><div class='del'>-				      &amp;val1);</div><div class='del'>-			DP(NETIF_MSG_LINK, "KR 0x9003 0x%x-&gt;0x%x\n",</div><div class='del'>-			   val2, val1);</div><div class='add'>+				      MDIO_PMA_REG_RX_ALARM, &amp;val2);</div><div class='add'>+</div><div class='add'>+			DP(NETIF_MSG_LINK, "KR 0x9003 0x%x\n", val2);</div><div class='add'>+</div><div class='ctx'> 			/* Check the link status */</div><div class='ctx'> 			bnx2x_cl45_read(bp, params-&gt;port,</div><div class='ctx'> 				      ext_phy_type,</div><div class='hunk'>@@ -2905,29 +3040,29 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,</div><div class='ctx'> 			DP(NETIF_MSG_LINK, "PMA_REG_STATUS=0x%x\n", val1);</div><div class='ctx'> 			if (ext_phy_type ==</div><div class='ctx'> 			    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073) {</div><div class='del'>-				u16 an1000_status = 0;</div><div class='add'>+</div><div class='ctx'> 				if (ext_phy_link_up &amp;&amp;</div><div class='del'>-				    (</div><div class='del'>-				     (params-&gt;req_line_speed != SPEED_10000)</div><div class='del'>-				     )) {</div><div class='add'>+				    ((params-&gt;req_line_speed !=</div><div class='add'>+					SPEED_10000))) {</div><div class='ctx'> 					if (bnx2x_bcm8073_xaui_wa(params)</div><div class='ctx'> 					     != 0) {</div><div class='ctx'> 						ext_phy_link_up = 0;</div><div class='ctx'> 						break;</div><div class='ctx'> 					}</div><div class='del'>-					bnx2x_cl45_read(bp, params-&gt;port,</div><div class='add'>+				}</div><div class='add'>+				bnx2x_cl45_read(bp, params-&gt;port,</div><div class='ctx'> 						      ext_phy_type,</div><div class='ctx'> 						      ext_phy_addr,</div><div class='del'>-						      MDIO_XS_DEVAD,</div><div class='add'>+						      MDIO_AN_DEVAD,</div><div class='ctx'> 						      0x8304,</div><div class='ctx'> 						      &amp;an1000_status);</div><div class='del'>-					bnx2x_cl45_read(bp, params-&gt;port,</div><div class='add'>+				bnx2x_cl45_read(bp, params-&gt;port,</div><div class='ctx'> 						      ext_phy_type,</div><div class='ctx'> 						      ext_phy_addr,</div><div class='del'>-						      MDIO_XS_DEVAD,</div><div class='add'>+						      MDIO_AN_DEVAD,</div><div class='ctx'> 						      0x8304,</div><div class='ctx'> 						      &amp;an1000_status);</div><div class='del'>-				}</div><div class='add'>+</div><div class='ctx'> 				/* Check the link status on 1.1.2 */</div><div class='ctx'> 				bnx2x_cl45_read(bp, params-&gt;port,</div><div class='ctx'> 					      ext_phy_type,</div><div class='hunk'>@@ -2943,8 +3078,8 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,</div><div class='ctx'> 					     "an_link_status=0x%x\n",</div><div class='ctx'> 					  val2, val1, an1000_status);</div><div class='ctx'> </div><div class='del'>-				ext_phy_link_up = (((val1 &amp; 4) == 4) ||</div><div class='del'>-						    (an1000_status &amp; (1&lt;&lt;1)));</div><div class='add'>+					ext_phy_link_up = (((val1 &amp; 4) == 4) ||</div><div class='add'>+						(an1000_status &amp; (1&lt;&lt;1)));</div><div class='ctx'> 				if (ext_phy_link_up &amp;&amp;</div><div class='ctx'> 				    bnx2x_8073_is_snr_needed(params)) {</div><div class='ctx'> 					/* The SNR will improve about 2dbby</div><div class='hunk'>@@ -2968,8 +3103,74 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,</div><div class='ctx'> 						    MDIO_PMA_REG_CDR_BANDWIDTH,</div><div class='ctx'> 						    0x0333);</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+				}</div><div class='add'>+				bnx2x_cl45_read(bp, params-&gt;port,</div><div class='add'>+						      ext_phy_type,</div><div class='add'>+						      ext_phy_addr,</div><div class='add'>+						      MDIO_PMA_DEVAD,</div><div class='add'>+						      0xc820,</div><div class='add'>+						      &amp;link_status);</div><div class='add'>+</div><div class='add'>+				/* Bits 0..2 --&gt; speed detected,</div><div class='add'>+				   bits 13..15--&gt; link is down */</div><div class='add'>+				if ((link_status &amp; (1&lt;&lt;2)) &amp;&amp;</div><div class='add'>+				    (!(link_status &amp; (1&lt;&lt;15)))) {</div><div class='add'>+					ext_phy_link_up = 1;</div><div class='add'>+					vars-&gt;line_speed = SPEED_10000;</div><div class='add'>+					DP(NETIF_MSG_LINK,</div><div class='add'>+						 "port %x: External link"</div><div class='add'>+						 " up in 10G\n", params-&gt;port);</div><div class='add'>+				} else if ((link_status &amp; (1&lt;&lt;1)) &amp;&amp;</div><div class='add'>+					   (!(link_status &amp; (1&lt;&lt;14)))) {</div><div class='add'>+					ext_phy_link_up = 1;</div><div class='add'>+					vars-&gt;line_speed = SPEED_2500;</div><div class='add'>+					DP(NETIF_MSG_LINK,</div><div class='add'>+						 "port %x: External link"</div><div class='add'>+						 " up in 2.5G\n", params-&gt;port);</div><div class='add'>+				} else if ((link_status &amp; (1&lt;&lt;0)) &amp;&amp;</div><div class='add'>+					   (!(link_status &amp; (1&lt;&lt;13)))) {</div><div class='add'>+					ext_phy_link_up = 1;</div><div class='add'>+					vars-&gt;line_speed = SPEED_1000;</div><div class='add'>+					DP(NETIF_MSG_LINK,</div><div class='add'>+						 "port %x: External link"</div><div class='add'>+						 " up in 1G\n", params-&gt;port);</div><div class='add'>+				} else {</div><div class='add'>+					ext_phy_link_up = 0;</div><div class='add'>+					DP(NETIF_MSG_LINK,</div><div class='add'>+						 "port %x: External link"</div><div class='add'>+						 " is down\n", params-&gt;port);</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				/* See if 1G link is up for the 8072 */</div><div class='add'>+				bnx2x_cl45_read(bp, params-&gt;port,</div><div class='add'>+						      ext_phy_type,</div><div class='add'>+						      ext_phy_addr,</div><div class='add'>+						      MDIO_AN_DEVAD,</div><div class='add'>+						      0x8304,</div><div class='add'>+						      &amp;an1000_status);</div><div class='add'>+				bnx2x_cl45_read(bp, params-&gt;port,</div><div class='add'>+						      ext_phy_type,</div><div class='add'>+						      ext_phy_addr,</div><div class='add'>+						      MDIO_AN_DEVAD,</div><div class='add'>+						      0x8304,</div><div class='add'>+						      &amp;an1000_status);</div><div class='add'>+				if (an1000_status &amp; (1&lt;&lt;1)) {</div><div class='add'>+					ext_phy_link_up = 1;</div><div class='add'>+					vars-&gt;line_speed = SPEED_1000;</div><div class='add'>+					DP(NETIF_MSG_LINK,</div><div class='add'>+						 "port %x: External link"</div><div class='add'>+						 " up in 1G\n", params-&gt;port);</div><div class='add'>+				} else if (ext_phy_link_up) {</div><div class='add'>+					ext_phy_link_up = 1;</div><div class='add'>+					vars-&gt;line_speed = SPEED_10000;</div><div class='add'>+					DP(NETIF_MSG_LINK,</div><div class='add'>+						 "port %x: External link"</div><div class='add'>+						 " up in 10G\n", params-&gt;port);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:</div><div class='hunk'>@@ -3006,6 +3207,7 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,</div><div class='ctx'> 					      MDIO_AN_DEVAD,</div><div class='ctx'> 					      MDIO_AN_REG_MASTER_STATUS,</div><div class='ctx'> 					      &amp;val2);</div><div class='add'>+				vars-&gt;line_speed = SPEED_10000;</div><div class='ctx'> 				DP(NETIF_MSG_LINK,</div><div class='ctx'> 					 "SFX7101 AN status 0x%x-&gt;Master=%x\n",</div><div class='ctx'> 					  val2,</div><div class='hunk'>@@ -3100,7 +3302,7 @@ static void bnx2x_link_int_enable(struct link_params *params)</div><div class='ctx'>  * link management</div><div class='ctx'>  */</div><div class='ctx'> static void bnx2x_link_int_ack(struct link_params *params,</div><div class='del'>-			     struct link_vars *vars, u16 is_10g)</div><div class='add'>+			     struct link_vars *vars, u8 is_10g)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u8 port = params-&gt;port;</div><div class='hunk'>@@ -3181,7 +3383,8 @@ static u8 bnx2x_format_ver(u32 num, u8 *str, u16 len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void bnx2x_turn_on_sf(struct bnx2x *bp, u8 port, u8 ext_phy_addr)</div><div class='add'>+static void bnx2x_turn_on_ef(struct bnx2x *bp, u8 port, u8 ext_phy_addr,</div><div class='add'>+			   u32 ext_phy_type)</div><div class='ctx'> {</div><div class='ctx'> 	u32 cnt = 0;</div><div class='ctx'> 	u16 ctrl = 0;</div><div class='hunk'>@@ -3192,12 +3395,14 @@ static void bnx2x_turn_on_sf(struct bnx2x *bp, u8 port, u8 ext_phy_addr)</div><div class='ctx'> </div><div class='ctx'> 	/* take ext phy out of reset */</div><div class='ctx'> 	bnx2x_set_gpio(bp,</div><div class='del'>-			MISC_REGISTERS_GPIO_2,</div><div class='del'>-			MISC_REGISTERS_GPIO_HIGH);</div><div class='add'>+			  MISC_REGISTERS_GPIO_2,</div><div class='add'>+			  MISC_REGISTERS_GPIO_HIGH,</div><div class='add'>+			  port);</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_set_gpio(bp,</div><div class='del'>-			MISC_REGISTERS_GPIO_1,</div><div class='del'>-			MISC_REGISTERS_GPIO_HIGH);</div><div class='add'>+			  MISC_REGISTERS_GPIO_1,</div><div class='add'>+			  MISC_REGISTERS_GPIO_HIGH,</div><div class='add'>+			  port);</div><div class='ctx'> </div><div class='ctx'> 	/* wait for 5ms */</div><div class='ctx'> 	msleep(5);</div><div class='hunk'>@@ -3205,7 +3410,7 @@ static void bnx2x_turn_on_sf(struct bnx2x *bp, u8 port, u8 ext_phy_addr)</div><div class='ctx'> 	for (cnt = 0; cnt &lt; 1000; cnt++) {</div><div class='ctx'> 		msleep(1);</div><div class='ctx'> 		bnx2x_cl45_read(bp, port,</div><div class='del'>-			      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,</div><div class='add'>+			      ext_phy_type,</div><div class='ctx'> 			      ext_phy_addr,</div><div class='ctx'> 			      MDIO_PMA_DEVAD,</div><div class='ctx'> 			      MDIO_PMA_REG_CTRL,</div><div class='hunk'>@@ -3217,13 +3422,17 @@ static void bnx2x_turn_on_sf(struct bnx2x *bp, u8 port, u8 ext_phy_addr)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnx2x_turn_off_sf(struct bnx2x *bp)</div><div class='add'>+static void bnx2x_turn_off_sf(struct bnx2x *bp, u8 port)</div><div class='ctx'> {</div><div class='ctx'> 	/* put sf to reset */</div><div class='del'>-	bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1, MISC_REGISTERS_GPIO_LOW);</div><div class='ctx'> 	bnx2x_set_gpio(bp,</div><div class='del'>-			MISC_REGISTERS_GPIO_2,</div><div class='del'>-			MISC_REGISTERS_GPIO_LOW);</div><div class='add'>+			  MISC_REGISTERS_GPIO_1,</div><div class='add'>+			  MISC_REGISTERS_GPIO_LOW,</div><div class='add'>+			  port);</div><div class='add'>+	bnx2x_set_gpio(bp,</div><div class='add'>+			  MISC_REGISTERS_GPIO_2,</div><div class='add'>+			  MISC_REGISTERS_GPIO_LOW,</div><div class='add'>+			  port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded,</div><div class='hunk'>@@ -3253,7 +3462,8 @@ u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded,</div><div class='ctx'> </div><div class='ctx'> 		/* Take ext phy out of reset */</div><div class='ctx'> 		if (!driver_loaded)</div><div class='del'>-			bnx2x_turn_on_sf(bp, params-&gt;port, ext_phy_addr);</div><div class='add'>+			bnx2x_turn_on_ef(bp, params-&gt;port, ext_phy_addr,</div><div class='add'>+				       ext_phy_type);</div><div class='ctx'> </div><div class='ctx'> 		/*  wait for 1ms */</div><div class='ctx'> 		msleep(1);</div><div class='hunk'>@@ -3276,11 +3486,16 @@ u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded,</div><div class='ctx'> 		version[4] = '\0';</div><div class='ctx'> </div><div class='ctx'> 		if (!driver_loaded)</div><div class='del'>-			bnx2x_turn_off_sf(bp);</div><div class='add'>+			bnx2x_turn_off_sf(bp, params-&gt;port);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072:</div><div class='ctx'> 	case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073:</div><div class='ctx'> 	{</div><div class='add'>+		/* Take ext phy out of reset */</div><div class='add'>+		if (!driver_loaded)</div><div class='add'>+			bnx2x_turn_on_ef(bp, params-&gt;port, ext_phy_addr,</div><div class='add'>+				       ext_phy_type);</div><div class='add'>+</div><div class='ctx'> 		bnx2x_cl45_read(bp, params-&gt;port, ext_phy_type,</div><div class='ctx'> 			      ext_phy_addr,</div><div class='ctx'> 			      MDIO_PMA_DEVAD,</div><div class='hunk'>@@ -3333,7 +3548,7 @@ static void bnx2x_set_xgxs_loopback(struct link_params *params,</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> </div><div class='ctx'> 	if (is_10g) {</div><div class='del'>-		 u32 md_devad;</div><div class='add'>+		u32 md_devad;</div><div class='ctx'> </div><div class='ctx'> 		DP(NETIF_MSG_LINK, "XGXS 10G loopback enable\n");</div><div class='ctx'> </div><div class='hunk'>@@ -3553,6 +3768,8 @@ u8 bnx2x_set_led(struct bnx2x *bp, u8 port, u8 mode, u32 speed,</div><div class='ctx'> 	       u16 hw_led_mode, u32 chip_id)</div><div class='ctx'> {</div><div class='ctx'> 	u8 rc = 0;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	u32 emac_base = port ? GRCBASE_EMAC1 : GRCBASE_EMAC0;</div><div class='ctx'> 	DP(NETIF_MSG_LINK, "bnx2x_set_led: port %x, mode %d\n", port, mode);</div><div class='ctx'> 	DP(NETIF_MSG_LINK, "speed 0x%x, hw_led_mode 0x%x\n",</div><div class='ctx'> 		 speed, hw_led_mode);</div><div class='hunk'>@@ -3561,6 +3778,9 @@ u8 bnx2x_set_led(struct bnx2x *bp, u8 port, u8 mode, u32 speed,</div><div class='ctx'> 		REG_WR(bp, NIG_REG_LED_10G_P0 + port*4, 0);</div><div class='ctx'> 		REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4,</div><div class='ctx'> 			   SHARED_HW_CFG_LED_MAC1);</div><div class='add'>+</div><div class='add'>+		tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);</div><div class='add'>+		EMAC_WR(bp, EMAC_REG_EMAC_LED, (tmp | EMAC_LED_OVERRIDE));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case LED_MODE_OPER:</div><div class='hunk'>@@ -3572,6 +3792,10 @@ u8 bnx2x_set_led(struct bnx2x *bp, u8 port, u8 mode, u32 speed,</div><div class='ctx'> 			   LED_BLINK_RATE_VAL);</div><div class='ctx'> 		REG_WR(bp, NIG_REG_LED_CONTROL_BLINK_RATE_ENA_P0 +</div><div class='ctx'> 			   port*4, 1);</div><div class='add'>+		tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);</div><div class='add'>+		EMAC_WR(bp, EMAC_REG_EMAC_LED,</div><div class='add'>+			    (tmp &amp; (~EMAC_LED_OVERRIDE)));</div><div class='add'>+</div><div class='ctx'> 		if (!CHIP_IS_E1H(bp) &amp;&amp;</div><div class='ctx'> 		    ((speed == SPEED_2500) ||</div><div class='ctx'> 		     (speed == SPEED_1000) ||</div><div class='hunk'>@@ -3622,7 +3846,8 @@ static u8 bnx2x_link_initialize(struct link_params *params,</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u8 port = params-&gt;port;</div><div class='ctx'> 	u8 rc = 0;</div><div class='del'>-</div><div class='add'>+	u8 non_ext_phy;</div><div class='add'>+	u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params-&gt;ext_phy_config);</div><div class='ctx'> 	/* Activate the external PHY */</div><div class='ctx'> 	bnx2x_ext_phy_reset(params, vars);</div><div class='ctx'> </div><div class='hunk'>@@ -3644,10 +3869,6 @@ static u8 bnx2x_link_initialize(struct link_params *params,</div><div class='ctx'> 		bnx2x_set_swap_lanes(params);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Set Parallel Detect */</div><div class='del'>-	if (params-&gt;req_line_speed == SPEED_AUTO_NEG)</div><div class='del'>-		bnx2x_set_parallel_detection(params, vars-&gt;phy_flags);</div><div class='del'>-</div><div class='ctx'> 	if (vars-&gt;phy_flags &amp; PHY_XGXS_FLAG) {</div><div class='ctx'> 		if (params-&gt;req_line_speed &amp;&amp;</div><div class='ctx'> 		    ((params-&gt;req_line_speed == SPEED_100) ||</div><div class='hunk'>@@ -3657,68 +3878,33 @@ static u8 bnx2x_link_initialize(struct link_params *params,</div><div class='ctx'> 			vars-&gt;phy_flags &amp;= ~PHY_SGMII_FLAG;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	/* In case of external phy existance, the line speed would be the</div><div class='add'>+	 line speed linked up by the external phy. In case it is direct only,</div><div class='add'>+	  then the line_speed during initialization will be equal to the</div><div class='add'>+	   req_line_speed*/</div><div class='add'>+	vars-&gt;line_speed = params-&gt;req_line_speed;</div><div class='ctx'> </div><div class='del'>-	if (!(vars-&gt;phy_flags &amp; PHY_SGMII_FLAG)) {</div><div class='del'>-		u16 bank, rx_eq;</div><div class='del'>-</div><div class='del'>-		rx_eq = ((params-&gt;serdes_config &amp;</div><div class='del'>-			  PORT_HW_CFG_SERDES_RX_DRV_EQUALIZER_MASK) &gt;&gt;</div><div class='del'>-			 PORT_HW_CFG_SERDES_RX_DRV_EQUALIZER_SHIFT);</div><div class='add'>+	bnx2x_calc_ieee_aneg_adv(params, &amp;vars-&gt;ieee_fc);</div><div class='ctx'> </div><div class='del'>-		DP(NETIF_MSG_LINK, "setting rx eq to 0x%x\n", rx_eq);</div><div class='del'>-		for (bank = MDIO_REG_BANK_RX0; bank &lt;= MDIO_REG_BANK_RX_ALL;</div><div class='del'>-		      bank += (MDIO_REG_BANK_RX1-MDIO_REG_BANK_RX0)) {</div><div class='del'>-			CL45_WR_OVER_CL22(bp, port,</div><div class='del'>-					      params-&gt;phy_addr,</div><div class='del'>-					      bank ,</div><div class='del'>-					      MDIO_RX0_RX_EQ_BOOST,</div><div class='del'>-					      ((rx_eq &amp;</div><div class='del'>-				MDIO_RX0_RX_EQ_BOOST_EQUALIZER_CTRL_MASK) |</div><div class='del'>-				MDIO_RX0_RX_EQ_BOOST_OFFSET_CTRL));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* forced speed requested? */</div><div class='del'>-		if (params-&gt;req_line_speed != SPEED_AUTO_NEG) {</div><div class='del'>-			DP(NETIF_MSG_LINK, "not SGMII, no AN\n");</div><div class='del'>-</div><div class='del'>-			/* disable autoneg */</div><div class='del'>-			bnx2x_set_autoneg(params, vars);</div><div class='del'>-</div><div class='del'>-			/* program speed and duplex */</div><div class='del'>-			bnx2x_program_serdes(params);</div><div class='del'>-			vars-&gt;ieee_fc =</div><div class='del'>-				MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_NONE;</div><div class='del'>-</div><div class='del'>-		} else { /* AN_mode */</div><div class='del'>-			DP(NETIF_MSG_LINK, "not SGMII, AN\n");</div><div class='del'>-</div><div class='del'>-			/* AN enabled */</div><div class='del'>-			bnx2x_set_brcm_cl37_advertisment(params);</div><div class='del'>-</div><div class='del'>-			/* program duplex &amp; pause advertisement (for aneg) */</div><div class='del'>-			bnx2x_set_ieee_aneg_advertisment(params,</div><div class='del'>-						       &amp;vars-&gt;ieee_fc);</div><div class='del'>-</div><div class='del'>-			/* enable autoneg */</div><div class='del'>-			bnx2x_set_autoneg(params, vars);</div><div class='del'>-</div><div class='del'>-			/* enable and restart AN */</div><div class='del'>-			bnx2x_restart_autoneg(params);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else { /* SGMII mode */</div><div class='del'>-		DP(NETIF_MSG_LINK, "SGMII\n");</div><div class='del'>-</div><div class='del'>-		bnx2x_initialize_sgmii_process(params);</div><div class='add'>+	/* init ext phy and enable link state int */</div><div class='add'>+	non_ext_phy = ((ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT) ||</div><div class='add'>+		       (params-&gt;loopback_mode == LOOPBACK_XGXS_10) ||</div><div class='add'>+		       (params-&gt;loopback_mode == LOOPBACK_EXT_PHY));</div><div class='add'>+</div><div class='add'>+	if (non_ext_phy ||</div><div class='add'>+	    (ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705)) {</div><div class='add'>+		if (params-&gt;req_line_speed == SPEED_AUTO_NEG)</div><div class='add'>+			bnx2x_set_parallel_detection(params, vars-&gt;phy_flags);</div><div class='add'>+		bnx2x_init_internal_phy(params, vars);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* init ext phy and enable link state int */</div><div class='del'>-	rc |= bnx2x_ext_phy_init(params, vars);</div><div class='add'>+	if (!non_ext_phy)</div><div class='add'>+		rc |= bnx2x_ext_phy_init(params, vars);</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_bits_dis(bp, NIG_REG_STATUS_INTERRUPT_PORT0 + port*4,</div><div class='del'>-		       (NIG_STATUS_XGXS0_LINK10G |</div><div class='del'>-			NIG_STATUS_XGXS0_LINK_STATUS |</div><div class='del'>-			NIG_STATUS_SERDES0_LINK_STATUS));</div><div class='add'>+		     (NIG_STATUS_XGXS0_LINK10G |</div><div class='add'>+		      NIG_STATUS_XGXS0_LINK_STATUS |</div><div class='add'>+		      NIG_STATUS_SERDES0_LINK_STATUS));</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> </div><div class='hunk'>@@ -3730,15 +3916,23 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> </div><div class='ctx'> 	u32 val;</div><div class='del'>-	DP(NETIF_MSG_LINK, "Phy Initialization started\n");</div><div class='add'>+	DP(NETIF_MSG_LINK, "Phy Initialization started \n");</div><div class='ctx'> 	DP(NETIF_MSG_LINK, "req_speed = %d, req_flowctrl=%d\n",</div><div class='ctx'> 		  params-&gt;req_line_speed, params-&gt;req_flow_ctrl);</div><div class='ctx'> 	vars-&gt;link_status = 0;</div><div class='add'>+	vars-&gt;phy_link_up = 0;</div><div class='add'>+	vars-&gt;link_up = 0;</div><div class='add'>+	vars-&gt;line_speed = 0;</div><div class='add'>+	vars-&gt;duplex = DUPLEX_FULL;</div><div class='add'>+	vars-&gt;flow_ctrl = FLOW_CTRL_NONE;</div><div class='add'>+	vars-&gt;mac_type = MAC_TYPE_NONE;</div><div class='add'>+</div><div class='ctx'> 	if (params-&gt;switch_cfg ==  SWITCH_CFG_1G)</div><div class='ctx'> 		vars-&gt;phy_flags = PHY_SERDES_FLAG;</div><div class='ctx'> 	else</div><div class='ctx'> 		vars-&gt;phy_flags = PHY_XGXS_FLAG;</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 	/* disable attentions */</div><div class='ctx'> 	bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 + params-&gt;port*4,</div><div class='ctx'> 		       (NIG_MASK_XGXS0_LINK_STATUS |</div><div class='hunk'>@@ -3894,6 +4088,7 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		bnx2x_link_initialize(params, vars);</div><div class='add'>+		msleep(30);</div><div class='ctx'> 		bnx2x_link_int_enable(params);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3943,39 +4138,22 @@ u8 bnx2x_link_reset(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> 			/* HW reset */</div><div class='ctx'> </div><div class='ctx'> 			bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,</div><div class='del'>-				       MISC_REGISTERS_GPIO_OUTPUT_LOW);</div><div class='add'>+					  MISC_REGISTERS_GPIO_OUTPUT_LOW,</div><div class='add'>+					  port);</div><div class='ctx'> </div><div class='ctx'> 			bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,</div><div class='del'>-				       MISC_REGISTERS_GPIO_OUTPUT_LOW);</div><div class='add'>+					  MISC_REGISTERS_GPIO_OUTPUT_LOW,</div><div class='add'>+					  port);</div><div class='ctx'> </div><div class='ctx'> 			DP(NETIF_MSG_LINK, "reset external PHY\n");</div><div class='del'>-		} else {</div><div class='del'>-</div><div class='del'>-			u8 ext_phy_addr = ((ext_phy_config &amp;</div><div class='del'>-					 PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) &gt;&gt;</div><div class='del'>-					 PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);</div><div class='del'>-</div><div class='del'>-			/* SW reset */</div><div class='del'>-			bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='del'>-				       MDIO_PMA_DEVAD,</div><div class='del'>-				       MDIO_PMA_REG_CTRL,</div><div class='del'>-				       1&lt;&lt;15);</div><div class='del'>-</div><div class='del'>-			/* Set Low Power Mode */</div><div class='del'>-			bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,</div><div class='del'>-				  MDIO_PMA_DEVAD,</div><div class='del'>-				  MDIO_PMA_REG_CTRL,</div><div class='del'>-				  1&lt;&lt;11);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-			if (ext_phy_type ==</div><div class='del'>-			    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073) {</div><div class='del'>-				DP(NETIF_MSG_LINK, "Setting 8073 port %d into"</div><div class='add'>+		} else if (ext_phy_type ==</div><div class='add'>+			   PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073) {</div><div class='add'>+				DP(NETIF_MSG_LINK, "Setting 8073 port %d into "</div><div class='ctx'> 					 "low power mode\n",</div><div class='ctx'> 					 port);</div><div class='ctx'> 				bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,</div><div class='del'>-					MISC_REGISTERS_GPIO_OUTPUT_LOW);</div><div class='del'>-			}</div><div class='add'>+					MISC_REGISTERS_GPIO_OUTPUT_LOW,</div><div class='add'>+						  port);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* reset the SerDes/XGXS */</div><div class='hunk'>@@ -3995,6 +4173,73 @@ u8 bnx2x_link_reset(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u8 bnx2x_update_link_down(struct link_params *params,</div><div class='add'>+			       struct link_vars *vars)</div><div class='add'>+{</div><div class='add'>+	struct bnx2x *bp = params-&gt;bp;</div><div class='add'>+	u8 port = params-&gt;port;</div><div class='add'>+	DP(NETIF_MSG_LINK, "Port %x: Link is down\n", port);</div><div class='add'>+	bnx2x_set_led(bp, port, LED_MODE_OFF,</div><div class='add'>+		    0, params-&gt;hw_led_mode,</div><div class='add'>+		    params-&gt;chip_id);</div><div class='add'>+</div><div class='add'>+	/* indicate no mac active */</div><div class='add'>+	vars-&gt;mac_type = MAC_TYPE_NONE;</div><div class='add'>+</div><div class='add'>+	/* update shared memory */</div><div class='add'>+	vars-&gt;link_status = 0;</div><div class='add'>+	vars-&gt;line_speed = 0;</div><div class='add'>+	bnx2x_update_mng(params, vars-&gt;link_status);</div><div class='add'>+</div><div class='add'>+	/* activate nig drain */</div><div class='add'>+	REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + port*4, 1);</div><div class='add'>+</div><div class='add'>+	/* reset BigMac */</div><div class='add'>+	bnx2x_bmac_rx_disable(bp, params-&gt;port);</div><div class='add'>+	REG_WR(bp, GRCBASE_MISC +</div><div class='add'>+		   MISC_REGISTERS_RESET_REG_2_CLEAR,</div><div class='add'>+		   (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 &lt;&lt; port));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 bnx2x_update_link_up(struct link_params *params,</div><div class='add'>+			     struct link_vars *vars,</div><div class='add'>+			     u8 link_10g, u32 gp_status)</div><div class='add'>+{</div><div class='add'>+	struct bnx2x *bp = params-&gt;bp;</div><div class='add'>+	u8 port = params-&gt;port;</div><div class='add'>+	u8 rc = 0;</div><div class='add'>+	vars-&gt;link_status |= LINK_STATUS_LINK_UP;</div><div class='add'>+	if (link_10g) {</div><div class='add'>+		bnx2x_bmac_enable(params, vars, 0);</div><div class='add'>+		bnx2x_set_led(bp, port, LED_MODE_OPER,</div><div class='add'>+			    SPEED_10000, params-&gt;hw_led_mode,</div><div class='add'>+			    params-&gt;chip_id);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		bnx2x_emac_enable(params, vars, 0);</div><div class='add'>+		rc = bnx2x_emac_program(params, vars-&gt;line_speed,</div><div class='add'>+				      vars-&gt;duplex);</div><div class='add'>+</div><div class='add'>+		/* AN complete? */</div><div class='add'>+		if (gp_status &amp; MDIO_AN_CL73_OR_37_COMPLETE) {</div><div class='add'>+			if (!(vars-&gt;phy_flags &amp;</div><div class='add'>+			      PHY_SGMII_FLAG))</div><div class='add'>+				bnx2x_set_sgmii_tx_driver(params);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* PBF - link up */</div><div class='add'>+	rc |= bnx2x_pbf_update(params, vars-&gt;flow_ctrl,</div><div class='add'>+			      vars-&gt;line_speed);</div><div class='add'>+</div><div class='add'>+	/* disable drain */</div><div class='add'>+	REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + port*4, 0);</div><div class='add'>+</div><div class='add'>+	/* update shared memory */</div><div class='add'>+	bnx2x_update_mng(params, vars-&gt;link_status);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='ctx'> /* This function should called upon link interrupt */</div><div class='ctx'> /* In case vars-&gt;link_up, driver needs to</div><div class='ctx'> 	1. Update the pbf</div><div class='hunk'>@@ -4012,10 +4257,10 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u8 port = params-&gt;port;</div><div class='del'>-	u16 i;</div><div class='ctx'> 	u16 gp_status;</div><div class='del'>-	u16 link_10g;</div><div class='del'>-	u8 rc = 0;</div><div class='add'>+	u8 link_10g;</div><div class='add'>+	u8 ext_phy_link_up, rc = 0;</div><div class='add'>+	u32 ext_phy_type;</div><div class='ctx'> </div><div class='ctx'> 	DP(NETIF_MSG_LINK, "port %x, XGXS?%x, int_status 0x%x\n",</div><div class='ctx'> 	 port,</div><div class='hunk'>@@ -4031,15 +4276,16 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> 	  REG_RD(bp, NIG_REG_XGXS0_STATUS_LINK10G + port*0x68),</div><div class='ctx'> 	  REG_RD(bp, NIG_REG_XGXS0_STATUS_LINK_STATUS + port*0x68));</div><div class='ctx'> </div><div class='add'>+	ext_phy_type = XGXS_EXT_PHY_TYPE(params-&gt;ext_phy_config);</div><div class='ctx'> </div><div class='del'>-	/* avoid fast toggling */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		msleep(10);</div><div class='del'>-		CL45_RD_OVER_CL22(bp, port, params-&gt;phy_addr,</div><div class='del'>-				      MDIO_REG_BANK_GP_STATUS,</div><div class='del'>-				      MDIO_GP_STATUS_TOP_AN_STATUS1,</div><div class='del'>-				      &amp;gp_status);</div><div class='del'>-	}</div><div class='add'>+	/* Check external link change only for non-direct */</div><div class='add'>+	ext_phy_link_up = bnx2x_ext_phy_is_link_up(params, vars);</div><div class='add'>+</div><div class='add'>+	/* Read gp_status */</div><div class='add'>+	CL45_RD_OVER_CL22(bp, port, params-&gt;phy_addr,</div><div class='add'>+			      MDIO_REG_BANK_GP_STATUS,</div><div class='add'>+			      MDIO_GP_STATUS_TOP_AN_STATUS1,</div><div class='add'>+			      &amp;gp_status);</div><div class='ctx'> </div><div class='ctx'> 	rc = bnx2x_link_settings_status(params, vars, gp_status);</div><div class='ctx'> 	if (rc != 0)</div><div class='hunk'>@@ -4055,73 +4301,177 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_link_int_ack(params, vars, link_10g);</div><div class='ctx'> </div><div class='add'>+	/* In case external phy link is up, and internal link is down</div><div class='add'>+	( not initialized yet probably after link initialization, it needs</div><div class='add'>+	to be initialized.</div><div class='add'>+	Note that after link down-up as result of cable plug,</div><div class='add'>+	the xgxs link would probably become up again without the need to</div><div class='add'>+	initialize it*/</div><div class='add'>+</div><div class='add'>+	if ((ext_phy_type != PORT_HW_CFG_SERDES_EXT_PHY_TYPE_DIRECT) &amp;&amp;</div><div class='add'>+	    (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705) &amp;&amp;</div><div class='add'>+	    (ext_phy_link_up &amp;&amp; !vars-&gt;phy_link_up))</div><div class='add'>+		bnx2x_init_internal_phy(params, vars);</div><div class='add'>+</div><div class='ctx'> 	/* link is up only if both local phy and external phy are up */</div><div class='del'>-	vars-&gt;link_up = (vars-&gt;phy_link_up &amp;&amp;</div><div class='del'>-			   bnx2x_ext_phy_is_link_up(params, vars));</div><div class='add'>+	vars-&gt;link_up = (ext_phy_link_up &amp;&amp; vars-&gt;phy_link_up);</div><div class='ctx'> </div><div class='del'>-	if (!vars-&gt;phy_link_up &amp;&amp;</div><div class='del'>-	    REG_RD(bp, NIG_REG_EMAC0_STATUS_MISC_MI_INT + port*0x18)) {</div><div class='del'>-		bnx2x_ext_phy_is_link_up(params, vars); /* Clear interrupt */</div><div class='add'>+	if (vars-&gt;link_up)</div><div class='add'>+		rc = bnx2x_update_link_up(params, vars, link_10g, gp_status);</div><div class='add'>+	else</div><div class='add'>+		rc = bnx2x_update_link_down(params, vars);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp, u32 shmem_base)</div><div class='add'>+{</div><div class='add'>+	u8 ext_phy_addr[PORT_MAX];</div><div class='add'>+	u16 val;</div><div class='add'>+	s8 port;</div><div class='add'>+</div><div class='add'>+	/* PART1 - Reset both phys */</div><div class='add'>+	for (port = PORT_MAX - 1; port &gt;= PORT_0; port--) {</div><div class='add'>+		/* Extract the ext phy address for the port */</div><div class='add'>+		u32 ext_phy_config = REG_RD(bp, shmem_base +</div><div class='add'>+					offsetof(struct shmem_region,</div><div class='add'>+		   dev_info.port_hw_config[port].external_phy_config));</div><div class='add'>+</div><div class='add'>+		/* disable attentions */</div><div class='add'>+		bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4,</div><div class='add'>+			     (NIG_MASK_XGXS0_LINK_STATUS |</div><div class='add'>+			      NIG_MASK_XGXS0_LINK10G |</div><div class='add'>+			      NIG_MASK_SERDES0_LINK_STATUS |</div><div class='add'>+			      NIG_MASK_MI_INT));</div><div class='add'>+</div><div class='add'>+		ext_phy_addr[port] =</div><div class='add'>+			((ext_phy_config &amp;</div><div class='add'>+			      PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) &gt;&gt;</div><div class='add'>+			      PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);</div><div class='add'>+</div><div class='add'>+		/* Need to take the phy out of low power mode in order</div><div class='add'>+			to write to access its registers */</div><div class='add'>+		bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,</div><div class='add'>+				  MISC_REGISTERS_GPIO_OUTPUT_HIGH, port);</div><div class='add'>+</div><div class='add'>+		/* Reset the phy */</div><div class='add'>+		bnx2x_cl45_write(bp, port,</div><div class='add'>+			       PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='add'>+			       ext_phy_addr[port],</div><div class='add'>+			       MDIO_PMA_DEVAD,</div><div class='add'>+			       MDIO_PMA_REG_CTRL,</div><div class='add'>+			       1&lt;&lt;15);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (vars-&gt;link_up) {</div><div class='del'>-		vars-&gt;link_status |= LINK_STATUS_LINK_UP;</div><div class='del'>-		if (link_10g) {</div><div class='del'>-			bnx2x_bmac_enable(params, vars, 0);</div><div class='del'>-			bnx2x_set_led(bp, port, LED_MODE_OPER,</div><div class='del'>-				    SPEED_10000, params-&gt;hw_led_mode,</div><div class='del'>-				    params-&gt;chip_id);</div><div class='add'>+	/* Add delay of 150ms after reset */</div><div class='add'>+	msleep(150);</div><div class='ctx'> </div><div class='del'>-		} else {</div><div class='del'>-			bnx2x_emac_enable(params, vars, 0);</div><div class='del'>-			rc = bnx2x_emac_program(params, vars-&gt;line_speed,</div><div class='del'>-					      vars-&gt;duplex);</div><div class='add'>+	/* PART2 - Download firmware to both phys */</div><div class='add'>+	for (port = PORT_MAX - 1; port &gt;= PORT_0; port--) {</div><div class='add'>+		u16 fw_ver1;</div><div class='ctx'> </div><div class='del'>-			/* AN complete? */</div><div class='del'>-			if (gp_status &amp; MDIO_AN_CL73_OR_37_COMPLETE) {</div><div class='del'>-				if (!(vars-&gt;phy_flags &amp;</div><div class='del'>-				      PHY_SGMII_FLAG))</div><div class='del'>-					bnx2x_set_sgmii_tx_driver(params);</div><div class='del'>-			}</div><div class='add'>+		bnx2x_bcm8073_external_rom_boot(bp, port,</div><div class='add'>+						      ext_phy_addr[port]);</div><div class='add'>+</div><div class='add'>+		bnx2x_cl45_read(bp, port, PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='add'>+			      ext_phy_addr[port],</div><div class='add'>+			      MDIO_PMA_DEVAD,</div><div class='add'>+			      MDIO_PMA_REG_ROM_VER1, &amp;fw_ver1);</div><div class='add'>+		if (fw_ver1 == 0) {</div><div class='add'>+			DP(NETIF_MSG_LINK,</div><div class='add'>+				 "bnx2x_8073_common_init_phy port %x "</div><div class='add'>+				 "fw Download failed\n", port);</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* PBF - link up */</div><div class='del'>-		rc |= bnx2x_pbf_update(params, vars-&gt;flow_ctrl,</div><div class='del'>-				      vars-&gt;line_speed);</div><div class='add'>+		/* Only set bit 10 = 1 (Tx power down) */</div><div class='add'>+		bnx2x_cl45_read(bp, port,</div><div class='add'>+			      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='add'>+			      ext_phy_addr[port],</div><div class='add'>+			      MDIO_PMA_DEVAD,</div><div class='add'>+			      MDIO_PMA_REG_TX_POWER_DOWN, &amp;val);</div><div class='ctx'> </div><div class='del'>-		/* disable drain */</div><div class='del'>-		REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + port*4, 0);</div><div class='add'>+		/* Phase1 of TX_POWER_DOWN reset */</div><div class='add'>+		bnx2x_cl45_write(bp, port,</div><div class='add'>+			       PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='add'>+			       ext_phy_addr[port],</div><div class='add'>+			       MDIO_PMA_DEVAD,</div><div class='add'>+			       MDIO_PMA_REG_TX_POWER_DOWN,</div><div class='add'>+			       (val | 1&lt;&lt;10));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* update shared memory */</div><div class='del'>-		bnx2x_update_mng(params, vars-&gt;link_status);</div><div class='add'>+	/* Toggle Transmitter: Power down and then up with 600ms</div><div class='add'>+	   delay between */</div><div class='add'>+	msleep(600);</div><div class='ctx'> </div><div class='del'>-	} else { /* link down */</div><div class='del'>-		DP(NETIF_MSG_LINK, "Port %x: Link is down\n", params-&gt;port);</div><div class='del'>-		bnx2x_set_led(bp, port, LED_MODE_OFF,</div><div class='del'>-			    0, params-&gt;hw_led_mode,</div><div class='del'>-			    params-&gt;chip_id);</div><div class='add'>+	/* PART3 - complete TX_POWER_DOWN process, and set GPIO2 back to low */</div><div class='add'>+	for (port = PORT_MAX - 1; port &gt;= PORT_0; port--) {</div><div class='add'>+		/* Phase2 of POWER_DOWN_RESET*/</div><div class='add'>+		/* Release bit 10 (Release Tx power down) */</div><div class='add'>+		bnx2x_cl45_read(bp, port,</div><div class='add'>+			      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='add'>+			      ext_phy_addr[port],</div><div class='add'>+			      MDIO_PMA_DEVAD,</div><div class='add'>+			      MDIO_PMA_REG_TX_POWER_DOWN, &amp;val);</div><div class='ctx'> </div><div class='del'>-		/* indicate no mac active */</div><div class='del'>-		vars-&gt;mac_type = MAC_TYPE_NONE;</div><div class='add'>+		bnx2x_cl45_write(bp, port,</div><div class='add'>+			       PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='add'>+			       ext_phy_addr[port],</div><div class='add'>+			       MDIO_PMA_DEVAD,</div><div class='add'>+			       MDIO_PMA_REG_TX_POWER_DOWN, (val &amp; (~(1&lt;&lt;10))));</div><div class='add'>+		msleep(15);</div><div class='ctx'> </div><div class='del'>-		/* update shared memory */</div><div class='del'>-		vars-&gt;link_status = 0;</div><div class='del'>-		bnx2x_update_mng(params, vars-&gt;link_status);</div><div class='add'>+		/* Read modify write the SPI-ROM version select register */</div><div class='add'>+		bnx2x_cl45_read(bp, port,</div><div class='add'>+			      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='add'>+			      ext_phy_addr[port],</div><div class='add'>+			      MDIO_PMA_DEVAD,</div><div class='add'>+			      MDIO_PMA_REG_EDC_FFE_MAIN, &amp;val);</div><div class='add'>+		bnx2x_cl45_write(bp, port,</div><div class='add'>+			      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='add'>+			      ext_phy_addr[port],</div><div class='add'>+			      MDIO_PMA_DEVAD,</div><div class='add'>+			      MDIO_PMA_REG_EDC_FFE_MAIN, (val | (1&lt;&lt;12)));</div><div class='ctx'> </div><div class='del'>-		/* activate nig drain */</div><div class='del'>-		REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + port*4, 1);</div><div class='add'>+		/* set GPIO2 back to LOW */</div><div class='add'>+		bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,</div><div class='add'>+				  MISC_REGISTERS_GPIO_OUTPUT_LOW, port);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='del'>-		/* reset BigMac */</div><div class='del'>-		bnx2x_bmac_rx_disable(bp, params-&gt;port);</div><div class='del'>-		REG_WR(bp, GRCBASE_MISC +</div><div class='del'>-			   MISC_REGISTERS_RESET_REG_2_CLEAR,</div><div class='del'>-			   (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 &lt;&lt; port));</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+u8 bnx2x_common_init_phy(struct bnx2x *bp, u32 shmem_base)</div><div class='add'>+{</div><div class='add'>+	u8 rc = 0;</div><div class='add'>+	u32 ext_phy_type;</div><div class='add'>+</div><div class='add'>+	DP(NETIF_MSG_LINK, "bnx2x_common_init_phy\n");</div><div class='add'>+</div><div class='add'>+	/* Read the ext_phy_type for arbitrary port(0) */</div><div class='add'>+	ext_phy_type = XGXS_EXT_PHY_TYPE(</div><div class='add'>+			REG_RD(bp, shmem_base +</div><div class='add'>+			   offsetof(struct shmem_region,</div><div class='add'>+			     dev_info.port_hw_config[0].external_phy_config)));</div><div class='add'>+</div><div class='add'>+	switch (ext_phy_type) {</div><div class='add'>+	case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073:</div><div class='add'>+	{</div><div class='add'>+		rc = bnx2x_8073_common_init_phy(bp, shmem_base);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		DP(NETIF_MSG_LINK,</div><div class='add'>+			 "bnx2x_common_init_phy: ext_phy 0x%x not required\n",</div><div class='add'>+			 ext_phy_type);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static void bnx2x_sfx7101_sp_sw_reset(struct bnx2x *bp, u8 port, u8 phy_addr)</div><div class='ctx'> {</div><div class='ctx'> 	u16 val, cnt;</div><div class='hunk'>@@ -4154,7 +4504,7 @@ static void bnx2x_sfx7101_sp_sw_reset(struct bnx2x *bp, u8 port, u8 phy_addr)</div><div class='ctx'> }</div><div class='ctx'> #define RESERVED_SIZE 256</div><div class='ctx'> /* max application is 160K bytes - data at end of RAM */</div><div class='del'>-#define MAX_APP_SIZE 160*1024 - RESERVED_SIZE</div><div class='add'>+#define MAX_APP_SIZE (160*1024 - RESERVED_SIZE)</div><div class='ctx'> </div><div class='ctx'> /* Header is 14 bytes */</div><div class='ctx'> #define HEADER_SIZE 14</div><div class='hunk'>@@ -4192,12 +4542,12 @@ static u8 bnx2x_sfx7101_flash_download(struct bnx2x *bp, u8 port,</div><div class='ctx'> 		size = MAX_APP_SIZE+HEADER_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> 	DP(NETIF_MSG_LINK, "File version is %c%c\n", data[0x14e], data[0x14f]);</div><div class='del'>-	DP(NETIF_MSG_LINK, "                %c%c\n", data[0x150], data[0x151]);</div><div class='add'>+	DP(NETIF_MSG_LINK, "  	      %c%c\n", data[0x150], data[0x151]);</div><div class='ctx'> 	/* Put the DSP in download mode by setting FLASH_CFG[2] to 1</div><div class='ctx'> 	   and issuing a reset.*/</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,</div><div class='del'>-			  MISC_REGISTERS_GPIO_HIGH);</div><div class='add'>+			  MISC_REGISTERS_GPIO_HIGH, port);</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_sfx7101_sp_sw_reset(bp, port, ext_phy_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -4429,7 +4779,8 @@ static u8 bnx2x_sfx7101_flash_download(struct bnx2x *bp, u8 port,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* DSP Remove Download Mode */</div><div class='del'>-	bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0, MISC_REGISTERS_GPIO_LOW);</div><div class='add'>+	bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,</div><div class='add'>+			  MISC_REGISTERS_GPIO_LOW, port);</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_sfx7101_sp_sw_reset(bp, port, ext_phy_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -4437,7 +4788,7 @@ static u8 bnx2x_sfx7101_flash_download(struct bnx2x *bp, u8 port,</div><div class='ctx'> 	for (cnt = 0; cnt &lt; 100; cnt++)</div><div class='ctx'> 		msleep(5);</div><div class='ctx'> </div><div class='del'>-	bnx2x_hw_reset(bp);</div><div class='add'>+	bnx2x_hw_reset(bp, port);</div><div class='ctx'> </div><div class='ctx'> 	for (cnt = 0; cnt &lt; 100; cnt++)</div><div class='ctx'> 		msleep(5);</div><div class='hunk'>@@ -4473,7 +4824,7 @@ static u8 bnx2x_sfx7101_flash_download(struct bnx2x *bp, u8 port,</div><div class='ctx'> 		      MDIO_PMA_REG_7101_VER2,</div><div class='ctx'> 		      &amp;image_revision2);</div><div class='ctx'> </div><div class='del'>-	if (data[0x14e]	!= (image_revision2&amp;0xFF) ||</div><div class='add'>+	if (data[0x14e] != (image_revision2&amp;0xFF) ||</div><div class='ctx'> 	    data[0x14f] != ((image_revision2&amp;0xFF00)&gt;&gt;8) ||</div><div class='ctx'> 	    data[0x150] != (image_revision1&amp;0xFF) ||</div><div class='ctx'> 	    data[0x151] != ((image_revision1&amp;0xFF00)&gt;&gt;8)) {</div><div class='hunk'>@@ -4508,11 +4859,11 @@ u8 bnx2x_flash_download(struct bnx2x *bp, u8 port, u32 ext_phy_config,</div><div class='ctx'> 	case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:</div><div class='ctx'> 		/* Take ext phy out of reset */</div><div class='ctx'> 		if (!driver_loaded)</div><div class='del'>-			bnx2x_turn_on_sf(bp, port, ext_phy_addr);</div><div class='add'>+			bnx2x_turn_on_ef(bp, port, ext_phy_addr, ext_phy_type);</div><div class='ctx'> 		rc = bnx2x_sfx7101_flash_download(bp, port, ext_phy_addr,</div><div class='ctx'> 						data, size);</div><div class='ctx'> 		if (!driver_loaded)</div><div class='del'>-			bnx2x_turn_off_sf(bp);</div><div class='add'>+			bnx2x_turn_off_sf(bp, port);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT:</div><div class='ctx'> 	case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE:</div><div class='head'>diff --git a/drivers/net/bnx2x_link.h b/drivers/net/bnx2x_link.h<br/>index 714d37ac95de..86d54a17b411 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bnx2x_link.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/bnx2x_link.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bnx2x_link.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x_link.h</a></div><div class='hunk'>@@ -55,14 +55,17 @@ struct link_params {</div><div class='ctx'> #define LOOPBACK_BMAC	2</div><div class='ctx'> #define LOOPBACK_XGXS_10	3</div><div class='ctx'> #define LOOPBACK_EXT_PHY	4</div><div class='add'>+#define LOOPBACK_EXT 	5</div><div class='ctx'> </div><div class='ctx'> 	u16 req_duplex;</div><div class='ctx'> 	u16 req_flow_ctrl;</div><div class='add'>+	u16 req_fc_auto_adv; /* Should be set to TX / BOTH when</div><div class='add'>+	req_flow_ctrl is set to AUTO */</div><div class='ctx'> 	u16 req_line_speed; /* Also determine AutoNeg */</div><div class='ctx'> </div><div class='ctx'> 	/* Device parameters */</div><div class='ctx'> 	u8 mac_addr[6];</div><div class='del'>-	u16 mtu;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* shmem parameters */</div><div class='hunk'>@@ -140,7 +143,7 @@ u8 bnx2x_cl45_write(struct bnx2x *bp, u8 port, u32 ext_phy_type,</div><div class='ctx'> 		  u8 phy_addr, u8 devad, u16 reg, u16 val);</div><div class='ctx'> </div><div class='ctx'> /* Reads the link_status from the shmem,</div><div class='del'>-   and update the link vars accordinaly */</div><div class='add'>+   and update the link vars accordingly */</div><div class='ctx'> void bnx2x_link_status_update(struct link_params *input,</div><div class='ctx'> 			    struct link_vars *output);</div><div class='ctx'> /* returns string representing the fw_version of the external phy */</div><div class='hunk'>@@ -149,7 +152,7 @@ u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded,</div><div class='ctx'> </div><div class='ctx'> /* Set/Unset the led</div><div class='ctx'>    Basically, the CLC takes care of the led for the link, but in case one needs</div><div class='del'>-   to set/unset the led unnatually, set the "mode" to LED_MODE_OPER to</div><div class='add'>+   to set/unset the led unnaturally, set the "mode" to LED_MODE_OPER to</div><div class='ctx'>    blink the led, and LED_MODE_OFF to set the led off.*/</div><div class='ctx'> u8 bnx2x_set_led(struct bnx2x *bp, u8 port, u8 mode, u32 speed,</div><div class='ctx'> 	       u16 hw_led_mode, u32 chip_id);</div><div class='hunk'>@@ -164,5 +167,7 @@ u8 bnx2x_flash_download(struct bnx2x *bp, u8 port, u32 ext_phy_config,</div><div class='ctx'> 	otherwise link is down*/</div><div class='ctx'> u8 bnx2x_test_link(struct link_params *input, struct link_vars *vars);</div><div class='ctx'> </div><div class='add'>+/* One-time initialization for external phy after power up */</div><div class='add'>+u8 bnx2x_common_init_phy(struct bnx2x *bp, u32 shmem_base);</div><div class='ctx'> </div><div class='ctx'> #endif /* BNX2X_LINK_H */</div><div class='head'>diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c<br/>index af251a5df844..a8eb3c4a47c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bnx2x_main.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/bnx2x_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bnx2x_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x_main.c</a></div><div class='hunk'>@@ -44,7 +44,6 @@</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> #include &lt;net/checksum.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;net/ip6_checksum.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='hunk'>@@ -60,8 +59,8 @@</div><div class='ctx'> #include "bnx2x.h"</div><div class='ctx'> #include "bnx2x_init.h"</div><div class='ctx'> </div><div class='del'>-#define DRV_MODULE_VERSION      "1.45.6"</div><div class='del'>-#define DRV_MODULE_RELDATE      "2008/06/23"</div><div class='add'>+#define DRV_MODULE_VERSION	"1.45.21"</div><div class='add'>+#define DRV_MODULE_RELDATE	"2008/09/03"</div><div class='ctx'> #define BNX2X_BC_VER		0x040200</div><div class='ctx'> </div><div class='ctx'> /* Time in jiffies before concluding the transmitter is hung */</div><div class='hunk'>@@ -76,23 +75,21 @@ MODULE_DESCRIPTION("Broadcom NetXtreme II BCM57710 Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(DRV_MODULE_VERSION);</div><div class='ctx'> </div><div class='add'>+static int disable_tpa;</div><div class='ctx'> static int use_inta;</div><div class='ctx'> static int poll;</div><div class='ctx'> static int debug;</div><div class='del'>-static int disable_tpa;</div><div class='del'>-static int nomcp;</div><div class='ctx'> static int load_count[3]; /* 0-common, 1-port0, 2-port1 */</div><div class='ctx'> static int use_multi;</div><div class='ctx'> </div><div class='add'>+module_param(disable_tpa, int, 0);</div><div class='ctx'> module_param(use_inta, int, 0);</div><div class='ctx'> module_param(poll, int, 0);</div><div class='ctx'> module_param(debug, int, 0);</div><div class='del'>-module_param(disable_tpa, int, 0);</div><div class='del'>-module_param(nomcp, int, 0);</div><div class='add'>+MODULE_PARM_DESC(disable_tpa, "disable the TPA (LRO) feature");</div><div class='ctx'> MODULE_PARM_DESC(use_inta, "use INT#A instead of MSI-X");</div><div class='ctx'> MODULE_PARM_DESC(poll, "use polling (for debug)");</div><div class='ctx'> MODULE_PARM_DESC(debug, "default debug msglevel");</div><div class='del'>-MODULE_PARM_DESC(nomcp, "ignore management CPU");</div><div class='ctx'> </div><div class='ctx'> #ifdef BNX2X_MULTI</div><div class='ctx'> module_param(use_multi, int, 0);</div><div class='hunk'>@@ -237,17 +234,16 @@ void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr, u32 dst_addr,</div><div class='ctx'> 	while (*wb_comp != DMAE_COMP_VAL) {</div><div class='ctx'> 		DP(BNX2X_MSG_OFF, "wb_comp 0x%08x\n", *wb_comp);</div><div class='ctx'> </div><div class='del'>-		/* adjust delay for emulation/FPGA */</div><div class='del'>-		if (CHIP_REV_IS_SLOW(bp))</div><div class='del'>-			msleep(100);</div><div class='del'>-		else</div><div class='del'>-			udelay(5);</div><div class='del'>-</div><div class='ctx'> 		if (!cnt) {</div><div class='ctx'> 			BNX2X_ERR("dmae timeout!\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		cnt--;</div><div class='add'>+		/* adjust delay for emulation/FPGA */</div><div class='add'>+		if (CHIP_REV_IS_SLOW(bp))</div><div class='add'>+			msleep(100);</div><div class='add'>+		else</div><div class='add'>+			udelay(5);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;bp-&gt;dmae_mutex);</div><div class='hunk'>@@ -310,17 +306,16 @@ void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32)</div><div class='ctx'> </div><div class='ctx'> 	while (*wb_comp != DMAE_COMP_VAL) {</div><div class='ctx'> </div><div class='del'>-		/* adjust delay for emulation/FPGA */</div><div class='del'>-		if (CHIP_REV_IS_SLOW(bp))</div><div class='del'>-			msleep(100);</div><div class='del'>-		else</div><div class='del'>-			udelay(5);</div><div class='del'>-</div><div class='ctx'> 		if (!cnt) {</div><div class='ctx'> 			BNX2X_ERR("dmae timeout!\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		cnt--;</div><div class='add'>+		/* adjust delay for emulation/FPGA */</div><div class='add'>+		if (CHIP_REV_IS_SLOW(bp))</div><div class='add'>+			msleep(100);</div><div class='add'>+		else</div><div class='add'>+			udelay(5);</div><div class='ctx'> 	}</div><div class='ctx'> 	DP(BNX2X_MSG_OFF, "data [0x%08x 0x%08x 0x%08x 0x%08x]\n",</div><div class='ctx'> 	   bp-&gt;slowpath-&gt;wb_data[0], bp-&gt;slowpath-&gt;wb_data[1],</div><div class='hunk'>@@ -503,6 +498,9 @@ static void bnx2x_panic_dump(struct bnx2x *bp)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u16 j, start, end;</div><div class='ctx'> </div><div class='add'>+	bp-&gt;stats_state = STATS_STATE_DISABLED;</div><div class='add'>+	DP(BNX2X_MSG_STATS, "stats_state - DISABLED\n");</div><div class='add'>+</div><div class='ctx'> 	BNX2X_ERR("begin crash dump -----------------\n");</div><div class='ctx'> </div><div class='ctx'> 	for_each_queue(bp, i) {</div><div class='hunk'>@@ -513,17 +511,20 @@ static void bnx2x_panic_dump(struct bnx2x *bp)</div><div class='ctx'> 			  "  tx_bd_prod(%x)  tx_bd_cons(%x)  *tx_cons_sb(%x)\n",</div><div class='ctx'> 			  i, fp-&gt;tx_pkt_prod, fp-&gt;tx_pkt_cons, fp-&gt;tx_bd_prod,</div><div class='ctx'> 			  fp-&gt;tx_bd_cons, le16_to_cpu(*fp-&gt;tx_cons_sb));</div><div class='del'>-		BNX2X_ERR("          rx_comp_prod(%x)  rx_comp_cons(%x)"</div><div class='del'>-			  "  *rx_cons_sb(%x)  *rx_bd_cons_sb(%x)"</div><div class='del'>-			  "  rx_sge_prod(%x)  last_max_sge(%x)\n",</div><div class='del'>-			  fp-&gt;rx_comp_prod, fp-&gt;rx_comp_cons,</div><div class='del'>-			  le16_to_cpu(*fp-&gt;rx_cons_sb),</div><div class='del'>-			  le16_to_cpu(*fp-&gt;rx_bd_cons_sb),</div><div class='del'>-			  fp-&gt;rx_sge_prod, fp-&gt;last_max_sge);</div><div class='del'>-		BNX2X_ERR("          fp_c_idx(%x)  fp_u_idx(%x)"</div><div class='del'>-			  "  bd data(%x,%x)  rx_alloc_failed(%lx)\n",</div><div class='del'>-			  fp-&gt;fp_c_idx, fp-&gt;fp_u_idx, hw_prods-&gt;packets_prod,</div><div class='del'>-			  hw_prods-&gt;bds_prod, fp-&gt;rx_alloc_failed);</div><div class='add'>+		BNX2X_ERR("          rx_bd_prod(%x)  rx_bd_cons(%x)"</div><div class='add'>+			  "  *rx_bd_cons_sb(%x)  rx_comp_prod(%x)"</div><div class='add'>+			  "  rx_comp_cons(%x)  *rx_cons_sb(%x)\n",</div><div class='add'>+			  fp-&gt;rx_bd_prod, fp-&gt;rx_bd_cons,</div><div class='add'>+			  le16_to_cpu(*fp-&gt;rx_bd_cons_sb), fp-&gt;rx_comp_prod,</div><div class='add'>+			  fp-&gt;rx_comp_cons, le16_to_cpu(*fp-&gt;rx_cons_sb));</div><div class='add'>+		BNX2X_ERR("          rx_sge_prod(%x)  last_max_sge(%x)"</div><div class='add'>+			  "  fp_c_idx(%x)  *sb_c_idx(%x)  fp_u_idx(%x)"</div><div class='add'>+			  "  *sb_u_idx(%x)  bd data(%x,%x)\n",</div><div class='add'>+			  fp-&gt;rx_sge_prod, fp-&gt;last_max_sge, fp-&gt;fp_c_idx,</div><div class='add'>+			  fp-&gt;status_blk-&gt;c_status_block.status_block_index,</div><div class='add'>+			  fp-&gt;fp_u_idx,</div><div class='add'>+			  fp-&gt;status_blk-&gt;u_status_block.status_block_index,</div><div class='add'>+			  hw_prods-&gt;packets_prod, hw_prods-&gt;bds_prod);</div><div class='ctx'> </div><div class='ctx'> 		start = TX_BD(le16_to_cpu(*fp-&gt;tx_cons_sb) - 10);</div><div class='ctx'> 		end = TX_BD(le16_to_cpu(*fp-&gt;tx_cons_sb) + 245);</div><div class='hunk'>@@ -553,8 +554,8 @@ static void bnx2x_panic_dump(struct bnx2x *bp)</div><div class='ctx'> 				  j, rx_bd[1], rx_bd[0], sw_bd-&gt;skb);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		start = 0;</div><div class='del'>-		end = RX_SGE_CNT*NUM_RX_SGE_PAGES;</div><div class='add'>+		start = RX_SGE(fp-&gt;rx_sge_prod);</div><div class='add'>+		end = RX_SGE(fp-&gt;last_max_sge);</div><div class='ctx'> 		for (j = start; j &lt; end; j++) {</div><div class='ctx'> 			u32 *rx_sge = (u32 *)&amp;fp-&gt;rx_sge_ring[j];</div><div class='ctx'> 			struct sw_rx_page *sw_page = &amp;fp-&gt;rx_page_ring[j];</div><div class='hunk'>@@ -582,9 +583,6 @@ static void bnx2x_panic_dump(struct bnx2x *bp)</div><div class='ctx'> 	bnx2x_fw_dump(bp);</div><div class='ctx'> 	bnx2x_mc_assert(bp);</div><div class='ctx'> 	BNX2X_ERR("end crash dump -----------------\n");</div><div class='del'>-</div><div class='del'>-	bp-&gt;stats_state = STATS_STATE_DISABLED;</div><div class='del'>-	DP(BNX2X_MSG_STATS, "stats_state - DISABLED\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_int_enable(struct bnx2x *bp)</div><div class='hunk'>@@ -684,7 +682,8 @@ static void bnx2x_int_disable_sync(struct bnx2x *bp)</div><div class='ctx'> static inline void bnx2x_ack_sb(struct bnx2x *bp, u8 sb_id,</div><div class='ctx'> 				u8 storm, u16 index, u8 op, u8 update)</div><div class='ctx'> {</div><div class='del'>-	u32 igu_addr = (IGU_ADDR_INT_ACK + IGU_FUNC_BASE * BP_FUNC(bp)) * 8;</div><div class='add'>+	u32 hc_addr = (HC_REG_COMMAND_REG + BP_PORT(bp)*32 +</div><div class='add'>+		       COMMAND_REG_INT_ACK);</div><div class='ctx'> 	struct igu_ack_register igu_ack;</div><div class='ctx'> </div><div class='ctx'> 	igu_ack.status_block_index = index;</div><div class='hunk'>@@ -694,9 +693,9 @@ static inline void bnx2x_ack_sb(struct bnx2x *bp, u8 sb_id,</div><div class='ctx'> 			 (update &lt;&lt; IGU_ACK_REGISTER_UPDATE_INDEX_SHIFT) |</div><div class='ctx'> 			 (op &lt;&lt; IGU_ACK_REGISTER_INTERRUPT_MODE_SHIFT));</div><div class='ctx'> </div><div class='del'>-	DP(BNX2X_MSG_OFF, "write 0x%08x to IGU addr 0x%x\n",</div><div class='del'>-	   (*(u32 *)&amp;igu_ack), BAR_IGU_INTMEM + igu_addr);</div><div class='del'>-	REG_WR(bp, BAR_IGU_INTMEM + igu_addr, (*(u32 *)&amp;igu_ack));</div><div class='add'>+	DP(BNX2X_MSG_OFF, "write 0x%08x to HC addr 0x%x\n",</div><div class='add'>+	   (*(u32 *)&amp;igu_ack), hc_addr);</div><div class='add'>+	REG_WR(bp, hc_addr, (*(u32 *)&amp;igu_ack));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u16 bnx2x_update_fpsb_idx(struct bnx2x_fastpath *fp)</div><div class='hunk'>@@ -716,36 +715,15 @@ static inline u16 bnx2x_update_fpsb_idx(struct bnx2x_fastpath *fp)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int bnx2x_has_work(struct bnx2x_fastpath *fp)</div><div class='del'>-{</div><div class='del'>-	u16 rx_cons_sb = le16_to_cpu(*fp-&gt;rx_cons_sb);</div><div class='del'>-</div><div class='del'>-	if ((rx_cons_sb &amp; MAX_RCQ_DESC_CNT) == MAX_RCQ_DESC_CNT)</div><div class='del'>-		rx_cons_sb++;</div><div class='del'>-</div><div class='del'>-	if ((fp-&gt;rx_comp_cons != rx_cons_sb) ||</div><div class='del'>-	    (fp-&gt;tx_pkt_prod != le16_to_cpu(*fp-&gt;tx_cons_sb)) ||</div><div class='del'>-	    (fp-&gt;tx_pkt_prod != fp-&gt;tx_pkt_cons))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static u16 bnx2x_ack_int(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='del'>-	u32 igu_addr = (IGU_ADDR_SIMD_MASK + IGU_FUNC_BASE * BP_FUNC(bp)) * 8;</div><div class='del'>-	u32 result = REG_RD(bp, BAR_IGU_INTMEM + igu_addr);</div><div class='add'>+	u32 hc_addr = (HC_REG_COMMAND_REG + BP_PORT(bp)*32 +</div><div class='add'>+		       COMMAND_REG_SIMD_MASK);</div><div class='add'>+	u32 result = REG_RD(bp, hc_addr);</div><div class='ctx'> </div><div class='del'>-	DP(BNX2X_MSG_OFF, "read 0x%08x from IGU addr 0x%x\n",</div><div class='del'>-	   result, BAR_IGU_INTMEM + igu_addr);</div><div class='add'>+	DP(BNX2X_MSG_OFF, "read 0x%08x from HC addr 0x%x\n",</div><div class='add'>+	   result, hc_addr);</div><div class='ctx'> </div><div class='del'>-#ifdef IGU_DEBUG</div><div class='del'>-#warning IGU_DEBUG active</div><div class='del'>-	if (result == 0) {</div><div class='del'>-		BNX2X_ERR("read %x from IGU\n", result);</div><div class='del'>-		REG_WR(bp, TM_REG_TIMER_SOFT_RST, 0);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -898,6 +876,7 @@ static void bnx2x_tx_int(struct bnx2x_fastpath *fp, int work)</div><div class='ctx'> 		netif_tx_lock(bp-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 		if (netif_queue_stopped(bp-&gt;dev) &amp;&amp;</div><div class='add'>+		    (bp-&gt;state == BNX2X_STATE_OPEN) &amp;&amp;</div><div class='ctx'> 		    (bnx2x_tx_avail(fp) &gt;= MAX_SKB_FRAGS + 3))</div><div class='ctx'> 			netif_wake_queue(bp-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -905,6 +884,7 @@ static void bnx2x_tx_int(struct bnx2x_fastpath *fp, int work)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> static void bnx2x_sp_event(struct bnx2x_fastpath *fp,</div><div class='ctx'> 			   union eth_rx_cqe *rr_cqe)</div><div class='ctx'> {</div><div class='hunk'>@@ -960,6 +940,7 @@ static void bnx2x_sp_event(struct bnx2x_fastpath *fp,</div><div class='ctx'> 		bnx2x_fp(bp, cid, state) = BNX2X_FP_STATE_CLOSED;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 	case (RAMROD_CMD_ID_ETH_SET_MAC | BNX2X_STATE_OPEN):</div><div class='ctx'> 	case (RAMROD_CMD_ID_ETH_SET_MAC | BNX2X_STATE_DIAG):</div><div class='ctx'> 		DP(NETIF_MSG_IFUP, "got set mac ramrod\n");</div><div class='hunk'>@@ -1046,7 +1027,7 @@ static inline int bnx2x_alloc_rx_skb(struct bnx2x *bp,</div><div class='ctx'> 	if (unlikely(skb == NULL))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	mapping = pci_map_single(bp-&gt;pdev, skb-&gt;data, bp-&gt;rx_buf_use_size,</div><div class='add'>+	mapping = pci_map_single(bp-&gt;pdev, skb-&gt;data, bp-&gt;rx_buf_size,</div><div class='ctx'> 				 PCI_DMA_FROMDEVICE);</div><div class='ctx'> 	if (unlikely(dma_mapping_error(&amp;bp-&gt;pdev-&gt;dev, mapping))) {</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='hunk'>@@ -1169,8 +1150,8 @@ static inline void bnx2x_init_sge_ring_bit_mask(struct bnx2x_fastpath *fp)</div><div class='ctx'> 	memset(fp-&gt;sge_mask, 0xff,</div><div class='ctx'> 	       (NUM_RX_SGE &gt;&gt; RX_SGE_MASK_ELEM_SHIFT)*sizeof(u64));</div><div class='ctx'> </div><div class='del'>-	/* Clear the two last indeces in the page to 1:</div><div class='del'>-	   these are the indeces that correspond to the "next" element,</div><div class='add'>+	/* Clear the two last indices in the page to 1:</div><div class='add'>+	   these are the indices that correspond to the "next" element,</div><div class='ctx'> 	   hence will never be indicated and should be removed from</div><div class='ctx'> 	   the calculations. */</div><div class='ctx'> 	bnx2x_clear_sge_mask_next_elems(fp);</div><div class='hunk'>@@ -1188,7 +1169,7 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,</div><div class='ctx'> 	/* move empty skb from pool to prod and map it */</div><div class='ctx'> 	prod_rx_buf-&gt;skb = fp-&gt;tpa_pool[queue].skb;</div><div class='ctx'> 	mapping = pci_map_single(bp-&gt;pdev, fp-&gt;tpa_pool[queue].skb-&gt;data,</div><div class='del'>-				 bp-&gt;rx_buf_use_size, PCI_DMA_FROMDEVICE);</div><div class='add'>+				 bp-&gt;rx_buf_size, PCI_DMA_FROMDEVICE);</div><div class='ctx'> 	pci_unmap_addr_set(prod_rx_buf, mapping, mapping);</div><div class='ctx'> </div><div class='ctx'> 	/* move partial skb from cons to pool (don't unmap yet) */</div><div class='hunk'>@@ -1261,7 +1242,7 @@ static int bnx2x_fill_frag_skb(struct bnx2x *bp, struct bnx2x_fastpath *fp,</div><div class='ctx'> 		   where we are and drop the whole packet */</div><div class='ctx'> 		err = bnx2x_alloc_rx_sge(bp, fp, sge_idx);</div><div class='ctx'> 		if (unlikely(err)) {</div><div class='del'>-			fp-&gt;rx_alloc_failed++;</div><div class='add'>+			bp-&gt;eth_stats.rx_skb_alloc_failed++;</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1295,16 +1276,15 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,</div><div class='ctx'> 	   pool entry status to BNX2X_TPA_STOP even if new skb allocation</div><div class='ctx'> 	   fails. */</div><div class='ctx'> 	pci_unmap_single(bp-&gt;pdev, pci_unmap_addr(rx_buf, mapping),</div><div class='del'>-			 bp-&gt;rx_buf_use_size, PCI_DMA_FROMDEVICE);</div><div class='add'>+			 bp-&gt;rx_buf_size, PCI_DMA_FROMDEVICE);</div><div class='ctx'> </div><div class='del'>-	/* if alloc failed drop the packet and keep the buffer in the bin */</div><div class='ctx'> 	if (likely(new_skb)) {</div><div class='add'>+		/* fix ip xsum and give it to the stack */</div><div class='add'>+		/* (no need to map the new skb) */</div><div class='ctx'> </div><div class='ctx'> 		prefetch(skb);</div><div class='ctx'> 		prefetch(((char *)(skb)) + 128);</div><div class='ctx'> </div><div class='del'>-		/* else fix ip xsum and give it to the stack */</div><div class='del'>-		/* (no need to map the new skb) */</div><div class='ctx'> #ifdef BNX2X_STOP_ON_ERROR</div><div class='ctx'> 		if (pad + len &gt; bp-&gt;rx_buf_size) {</div><div class='ctx'> 			BNX2X_ERR("skb_put is about to fail...  "</div><div class='hunk'>@@ -1353,9 +1333,10 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,</div><div class='ctx'> 		fp-&gt;tpa_pool[queue].skb = new_skb;</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='add'>+		/* else drop the packet and keep the buffer in the bin */</div><div class='ctx'> 		DP(NETIF_MSG_RX_STATUS,</div><div class='ctx'> 		   "Failed to allocate new skb - dropping packet!\n");</div><div class='del'>-		fp-&gt;rx_alloc_failed++;</div><div class='add'>+		bp-&gt;eth_stats.rx_skb_alloc_failed++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fp-&gt;tpa_state[queue] = BNX2X_TPA_STOP;</div><div class='hunk'>@@ -1390,7 +1371,6 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)</div><div class='ctx'> 	u16 bd_cons, bd_prod, bd_prod_fw, comp_ring_cons;</div><div class='ctx'> 	u16 hw_comp_cons, sw_comp_cons, sw_comp_prod;</div><div class='ctx'> 	int rx_pkt = 0;</div><div class='del'>-	u16 queue;</div><div class='ctx'> </div><div class='ctx'> #ifdef BNX2X_STOP_ON_ERROR</div><div class='ctx'> 	if (unlikely(bp-&gt;panic))</div><div class='hunk'>@@ -1456,7 +1436,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)</div><div class='ctx'> 			if ((!fp-&gt;disable_tpa) &amp;&amp;</div><div class='ctx'> 			    (TPA_TYPE(cqe_fp_flags) !=</div><div class='ctx'> 					(TPA_TYPE_START | TPA_TYPE_END))) {</div><div class='del'>-				queue = cqe-&gt;fast_path_cqe.queue_index;</div><div class='add'>+				u16 queue = cqe-&gt;fast_path_cqe.queue_index;</div><div class='ctx'> </div><div class='ctx'> 				if (TPA_TYPE(cqe_fp_flags) == TPA_TYPE_START) {</div><div class='ctx'> 					DP(NETIF_MSG_RX_STATUS,</div><div class='hunk'>@@ -1503,11 +1483,10 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)</div><div class='ctx'> </div><div class='ctx'> 			/* is this an error packet? */</div><div class='ctx'> 			if (unlikely(cqe_fp_flags &amp; ETH_RX_ERROR_FALGS)) {</div><div class='del'>-			/* do we sometimes forward error packets anyway? */</div><div class='ctx'> 				DP(NETIF_MSG_RX_ERR,</div><div class='ctx'> 				   "ERROR  flags %x  rx packet %u\n",</div><div class='ctx'> 				   cqe_fp_flags, sw_comp_cons);</div><div class='del'>-				/* TBD make sure MC counts this as a drop */</div><div class='add'>+				bp-&gt;eth_stats.rx_err_discard_pkt++;</div><div class='ctx'> 				goto reuse_rx;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -1524,7 +1503,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)</div><div class='ctx'> 					DP(NETIF_MSG_RX_ERR,</div><div class='ctx'> 					   "ERROR  packet dropped "</div><div class='ctx'> 					   "because of alloc failure\n");</div><div class='del'>-					fp-&gt;rx_alloc_failed++;</div><div class='add'>+					bp-&gt;eth_stats.rx_skb_alloc_failed++;</div><div class='ctx'> 					goto reuse_rx;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='hunk'>@@ -1541,7 +1520,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)</div><div class='ctx'> 			} else if (bnx2x_alloc_rx_skb(bp, fp, bd_prod) == 0) {</div><div class='ctx'> 				pci_unmap_single(bp-&gt;pdev,</div><div class='ctx'> 					pci_unmap_addr(rx_buf, mapping),</div><div class='del'>-						 bp-&gt;rx_buf_use_size,</div><div class='add'>+						 bp-&gt;rx_buf_size,</div><div class='ctx'> 						 PCI_DMA_FROMDEVICE);</div><div class='ctx'> 				skb_reserve(skb, pad);</div><div class='ctx'> 				skb_put(skb, len);</div><div class='hunk'>@@ -1550,7 +1529,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)</div><div class='ctx'> 				DP(NETIF_MSG_RX_ERR,</div><div class='ctx'> 				   "ERROR  packet dropped because "</div><div class='ctx'> 				   "of alloc failure\n");</div><div class='del'>-				fp-&gt;rx_alloc_failed++;</div><div class='add'>+				bp-&gt;eth_stats.rx_skb_alloc_failed++;</div><div class='ctx'> reuse_rx:</div><div class='ctx'> 				bnx2x_reuse_rx_skb(fp, skb, bd_cons, bd_prod);</div><div class='ctx'> 				goto next_rx;</div><div class='hunk'>@@ -1559,10 +1538,12 @@ reuse_rx:</div><div class='ctx'> 			skb-&gt;protocol = eth_type_trans(skb, bp-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 			skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-			if (bp-&gt;rx_csum &amp;&amp; BNX2X_RX_SUM_OK(cqe))</div><div class='del'>-				skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-</div><div class='del'>-			/* TBD do we pass bad csum packets in promisc */</div><div class='add'>+			if (bp-&gt;rx_csum) {</div><div class='add'>+				if (likely(BNX2X_RX_CSUM_OK(cqe)))</div><div class='add'>+					skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+				else</div><div class='add'>+					bp-&gt;eth_stats.hw_csum_err++;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> #ifdef BCM_VLAN</div><div class='hunk'>@@ -1615,6 +1596,12 @@ static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie)</div><div class='ctx'> 	struct net_device *dev = bp-&gt;dev;</div><div class='ctx'> 	int index = FP_IDX(fp);</div><div class='ctx'> </div><div class='add'>+	/* Return here if interrupt is disabled */</div><div class='add'>+	if (unlikely(atomic_read(&amp;bp-&gt;intr_sem) != 0)) {</div><div class='add'>+		DP(NETIF_MSG_INTR, "called but intr_sem not 0, returning\n");</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	DP(BNX2X_MSG_FP, "got an MSI-X interrupt on IDX:SB [%d:%d]\n",</div><div class='ctx'> 	   index, FP_SB_ID(fp));</div><div class='ctx'> 	bnx2x_ack_sb(bp, FP_SB_ID(fp), USTORM_ID, 0, IGU_INT_DISABLE, 0);</div><div class='hunk'>@@ -1648,17 +1635,17 @@ static irqreturn_t bnx2x_interrupt(int irq, void *dev_instance)</div><div class='ctx'> 	}</div><div class='ctx'> 	DP(NETIF_MSG_INTR, "got an interrupt  status %u\n", status);</div><div class='ctx'> </div><div class='del'>-#ifdef BNX2X_STOP_ON_ERROR</div><div class='del'>-	if (unlikely(bp-&gt;panic))</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/* Return here if interrupt is disabled */</div><div class='ctx'> 	if (unlikely(atomic_read(&amp;bp-&gt;intr_sem) != 0)) {</div><div class='ctx'> 		DP(NETIF_MSG_INTR, "called but intr_sem not 0, returning\n");</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef BNX2X_STOP_ON_ERROR</div><div class='add'>+	if (unlikely(bp-&gt;panic))</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	mask = 0x2 &lt;&lt; bp-&gt;fp[0].sb_id;</div><div class='ctx'> 	if (status &amp; mask) {</div><div class='ctx'> 		struct bnx2x_fastpath *fp = &amp;bp-&gt;fp[0];</div><div class='hunk'>@@ -1699,11 +1686,12 @@ static void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event);</div><div class='ctx'>  * General service functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int bnx2x_hw_lock(struct bnx2x *bp, u32 resource)</div><div class='add'>+static int bnx2x_acquire_hw_lock(struct bnx2x *bp, u32 resource)</div><div class='ctx'> {</div><div class='ctx'> 	u32 lock_status;</div><div class='ctx'> 	u32 resource_bit = (1 &lt;&lt; resource);</div><div class='del'>-	u8 port = BP_PORT(bp);</div><div class='add'>+	int func = BP_FUNC(bp);</div><div class='add'>+	u32 hw_lock_control_reg;</div><div class='ctx'> 	int cnt;</div><div class='ctx'> </div><div class='ctx'> 	/* Validating that the resource is within range */</div><div class='hunk'>@@ -1714,20 +1702,26 @@ static int bnx2x_hw_lock(struct bnx2x *bp, u32 resource)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (func &lt;= 5) {</div><div class='add'>+		hw_lock_control_reg = (MISC_REG_DRIVER_CONTROL_1 + func*8);</div><div class='add'>+	} else {</div><div class='add'>+		hw_lock_control_reg =</div><div class='add'>+				(MISC_REG_DRIVER_CONTROL_7 + (func - 6)*8);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Validating that the resource is not already taken */</div><div class='del'>-	lock_status = REG_RD(bp, MISC_REG_DRIVER_CONTROL_1 + port*8);</div><div class='add'>+	lock_status = REG_RD(bp, hw_lock_control_reg);</div><div class='ctx'> 	if (lock_status &amp; resource_bit) {</div><div class='ctx'> 		DP(NETIF_MSG_HW, "lock_status 0x%x  resource_bit 0x%x\n",</div><div class='ctx'> 		   lock_status, resource_bit);</div><div class='ctx'> 		return -EEXIST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Try for 1 second every 5ms */</div><div class='del'>-	for (cnt = 0; cnt &lt; 200; cnt++) {</div><div class='add'>+	/* Try for 5 second every 5ms */</div><div class='add'>+	for (cnt = 0; cnt &lt; 1000; cnt++) {</div><div class='ctx'> 		/* Try to acquire the lock */</div><div class='del'>-		REG_WR(bp, MISC_REG_DRIVER_CONTROL_1 + port*8 + 4,</div><div class='del'>-		       resource_bit);</div><div class='del'>-		lock_status = REG_RD(bp, MISC_REG_DRIVER_CONTROL_1 + port*8);</div><div class='add'>+		REG_WR(bp, hw_lock_control_reg + 4, resource_bit);</div><div class='add'>+		lock_status = REG_RD(bp, hw_lock_control_reg);</div><div class='ctx'> 		if (lock_status &amp; resource_bit)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1737,11 +1731,12 @@ static int bnx2x_hw_lock(struct bnx2x *bp, u32 resource)</div><div class='ctx'> 	return -EAGAIN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_hw_unlock(struct bnx2x *bp, u32 resource)</div><div class='add'>+static int bnx2x_release_hw_lock(struct bnx2x *bp, u32 resource)</div><div class='ctx'> {</div><div class='ctx'> 	u32 lock_status;</div><div class='ctx'> 	u32 resource_bit = (1 &lt;&lt; resource);</div><div class='del'>-	u8 port = BP_PORT(bp);</div><div class='add'>+	int func = BP_FUNC(bp);</div><div class='add'>+	u32 hw_lock_control_reg;</div><div class='ctx'> </div><div class='ctx'> 	/* Validating that the resource is within range */</div><div class='ctx'> 	if (resource &gt; HW_LOCK_MAX_RESOURCE_VALUE) {</div><div class='hunk'>@@ -1751,20 +1746,27 @@ static int bnx2x_hw_unlock(struct bnx2x *bp, u32 resource)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (func &lt;= 5) {</div><div class='add'>+		hw_lock_control_reg = (MISC_REG_DRIVER_CONTROL_1 + func*8);</div><div class='add'>+	} else {</div><div class='add'>+		hw_lock_control_reg =</div><div class='add'>+				(MISC_REG_DRIVER_CONTROL_7 + (func - 6)*8);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Validating that the resource is currently taken */</div><div class='del'>-	lock_status = REG_RD(bp, MISC_REG_DRIVER_CONTROL_1 + port*8);</div><div class='add'>+	lock_status = REG_RD(bp, hw_lock_control_reg);</div><div class='ctx'> 	if (!(lock_status &amp; resource_bit)) {</div><div class='ctx'> 		DP(NETIF_MSG_HW, "lock_status 0x%x  resource_bit 0x%x\n",</div><div class='ctx'> 		   lock_status, resource_bit);</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	REG_WR(bp, MISC_REG_DRIVER_CONTROL_1 + port*8, resource_bit);</div><div class='add'>+	REG_WR(bp, hw_lock_control_reg, resource_bit);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* HW Lock for shared dual port PHYs */</div><div class='del'>-static void bnx2x_phy_hw_lock(struct bnx2x *bp)</div><div class='add'>+static void bnx2x_acquire_phy_lock(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ext_phy_type = XGXS_EXT_PHY_TYPE(bp-&gt;link_params.ext_phy_config);</div><div class='ctx'> </div><div class='hunk'>@@ -1772,25 +1774,25 @@ static void bnx2x_phy_hw_lock(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 	if ((ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072) ||</div><div class='ctx'> 	    (ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073))</div><div class='del'>-		bnx2x_hw_lock(bp, HW_LOCK_RESOURCE_8072_MDIO);</div><div class='add'>+		bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_8072_MDIO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnx2x_phy_hw_unlock(struct bnx2x *bp)</div><div class='add'>+static void bnx2x_release_phy_lock(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ext_phy_type = XGXS_EXT_PHY_TYPE(bp-&gt;link_params.ext_phy_config);</div><div class='ctx'> </div><div class='ctx'> 	if ((ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072) ||</div><div class='ctx'> 	    (ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073))</div><div class='del'>-		bnx2x_hw_unlock(bp, HW_LOCK_RESOURCE_8072_MDIO);</div><div class='add'>+		bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_8072_MDIO);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;bp-&gt;port.phy_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode)</div><div class='add'>+int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode, u8 port)</div><div class='ctx'> {</div><div class='ctx'> 	/* The GPIO should be swapped if swap register is set and active */</div><div class='ctx'> 	int gpio_port = (REG_RD(bp, NIG_REG_PORT_SWAP) &amp;&amp;</div><div class='del'>-			 REG_RD(bp, NIG_REG_STRAP_OVERRIDE)) ^ BP_PORT(bp);</div><div class='add'>+			 REG_RD(bp, NIG_REG_STRAP_OVERRIDE)) ^ port;</div><div class='ctx'> 	int gpio_shift = gpio_num +</div><div class='ctx'> 			(gpio_port ? MISC_REGISTERS_GPIO_PORT_SHIFT : 0);</div><div class='ctx'> 	u32 gpio_mask = (1 &lt;&lt; gpio_shift);</div><div class='hunk'>@@ -1801,7 +1803,7 @@ int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bnx2x_hw_lock(bp, HW_LOCK_RESOURCE_GPIO);</div><div class='add'>+	bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_GPIO);</div><div class='ctx'> 	/* read GPIO and mask except the float bits */</div><div class='ctx'> 	gpio_reg = (REG_RD(bp, MISC_REG_GPIO) &amp; MISC_REGISTERS_GPIO_FLOAT);</div><div class='ctx'> </div><div class='hunk'>@@ -1822,7 +1824,7 @@ int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode)</div><div class='ctx'> 		gpio_reg |=  (gpio_mask &lt;&lt; MISC_REGISTERS_GPIO_SET_POS);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case MISC_REGISTERS_GPIO_INPUT_HI_Z :</div><div class='add'>+	case MISC_REGISTERS_GPIO_INPUT_HI_Z:</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "Set GPIO %d (shift %d) -&gt; input\n",</div><div class='ctx'> 		   gpio_num, gpio_shift);</div><div class='ctx'> 		/* set FLOAT */</div><div class='hunk'>@@ -1834,7 +1836,7 @@ int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	REG_WR(bp, MISC_REG_GPIO, gpio_reg);</div><div class='del'>-	bnx2x_hw_unlock(bp, HW_LOCK_RESOURCE_GPIO);</div><div class='add'>+	bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_GPIO);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1850,19 +1852,19 @@ static int bnx2x_set_spio(struct bnx2x *bp, int spio_num, u32 mode)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bnx2x_hw_lock(bp, HW_LOCK_RESOURCE_SPIO);</div><div class='add'>+	bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_SPIO);</div><div class='ctx'> 	/* read SPIO and mask except the float bits */</div><div class='ctx'> 	spio_reg = (REG_RD(bp, MISC_REG_SPIO) &amp; MISC_REGISTERS_SPIO_FLOAT);</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='del'>-	case MISC_REGISTERS_SPIO_OUTPUT_LOW :</div><div class='add'>+	case MISC_REGISTERS_SPIO_OUTPUT_LOW:</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "Set SPIO %d -&gt; output low\n", spio_num);</div><div class='ctx'> 		/* clear FLOAT and set CLR */</div><div class='ctx'> 		spio_reg &amp;= ~(spio_mask &lt;&lt; MISC_REGISTERS_SPIO_FLOAT_POS);</div><div class='ctx'> 		spio_reg |=  (spio_mask &lt;&lt; MISC_REGISTERS_SPIO_CLR_POS);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case MISC_REGISTERS_SPIO_OUTPUT_HIGH :</div><div class='add'>+	case MISC_REGISTERS_SPIO_OUTPUT_HIGH:</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "Set SPIO %d -&gt; output high\n", spio_num);</div><div class='ctx'> 		/* clear FLOAT and set SET */</div><div class='ctx'> 		spio_reg &amp;= ~(spio_mask &lt;&lt; MISC_REGISTERS_SPIO_FLOAT_POS);</div><div class='hunk'>@@ -1880,7 +1882,7 @@ static int bnx2x_set_spio(struct bnx2x *bp, int spio_num, u32 mode)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	REG_WR(bp, MISC_REG_SPIO, spio_reg);</div><div class='del'>-	bnx2x_hw_unlock(bp, HW_LOCK_RESOURCE_SPIO);</div><div class='add'>+	bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_SPIO);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1940,46 +1942,63 @@ static void bnx2x_link_report(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> static u8 bnx2x_initial_phy_init(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='del'>-	u8 rc;</div><div class='add'>+	if (!BP_NOMCP(bp)) {</div><div class='add'>+		u8 rc;</div><div class='ctx'> </div><div class='del'>-	/* Initialize link parameters structure variables */</div><div class='del'>-	bp-&gt;link_params.mtu = bp-&gt;dev-&gt;mtu;</div><div class='add'>+		/* Initialize link parameters structure variables */</div><div class='add'>+		/* It is recommended to turn off RX FC for jumbo frames</div><div class='add'>+		   for better performance */</div><div class='add'>+		if (IS_E1HMF(bp))</div><div class='add'>+			bp-&gt;link_params.req_fc_auto_adv = FLOW_CTRL_BOTH;</div><div class='add'>+		else if (bp-&gt;dev-&gt;mtu &gt; 5000)</div><div class='add'>+			bp-&gt;link_params.req_fc_auto_adv = FLOW_CTRL_TX;</div><div class='add'>+		else</div><div class='add'>+			bp-&gt;link_params.req_fc_auto_adv = FLOW_CTRL_BOTH;</div><div class='ctx'> </div><div class='del'>-	bnx2x_phy_hw_lock(bp);</div><div class='del'>-	rc = bnx2x_phy_init(&amp;bp-&gt;link_params, &amp;bp-&gt;link_vars);</div><div class='del'>-	bnx2x_phy_hw_unlock(bp);</div><div class='add'>+		bnx2x_acquire_phy_lock(bp);</div><div class='add'>+		rc = bnx2x_phy_init(&amp;bp-&gt;link_params, &amp;bp-&gt;link_vars);</div><div class='add'>+		bnx2x_release_phy_lock(bp);</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;link_vars.link_up)</div><div class='del'>-		bnx2x_link_report(bp);</div><div class='add'>+		if (bp-&gt;link_vars.link_up)</div><div class='add'>+			bnx2x_link_report(bp);</div><div class='ctx'> </div><div class='del'>-	bnx2x_calc_fc_adv(bp);</div><div class='add'>+		bnx2x_calc_fc_adv(bp);</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	BNX2X_ERR("Bootcode is missing -not initializing link\n");</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_link_set(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='del'>-	bnx2x_phy_hw_lock(bp);</div><div class='del'>-	bnx2x_phy_init(&amp;bp-&gt;link_params, &amp;bp-&gt;link_vars);</div><div class='del'>-	bnx2x_phy_hw_unlock(bp);</div><div class='add'>+	if (!BP_NOMCP(bp)) {</div><div class='add'>+		bnx2x_acquire_phy_lock(bp);</div><div class='add'>+		bnx2x_phy_init(&amp;bp-&gt;link_params, &amp;bp-&gt;link_vars);</div><div class='add'>+		bnx2x_release_phy_lock(bp);</div><div class='ctx'> </div><div class='del'>-	bnx2x_calc_fc_adv(bp);</div><div class='add'>+		bnx2x_calc_fc_adv(bp);</div><div class='add'>+	} else</div><div class='add'>+		BNX2X_ERR("Bootcode is missing -not setting link\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x__link_reset(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='del'>-	bnx2x_phy_hw_lock(bp);</div><div class='del'>-	bnx2x_link_reset(&amp;bp-&gt;link_params, &amp;bp-&gt;link_vars);</div><div class='del'>-	bnx2x_phy_hw_unlock(bp);</div><div class='add'>+	if (!BP_NOMCP(bp)) {</div><div class='add'>+		bnx2x_acquire_phy_lock(bp);</div><div class='add'>+		bnx2x_link_reset(&amp;bp-&gt;link_params, &amp;bp-&gt;link_vars);</div><div class='add'>+		bnx2x_release_phy_lock(bp);</div><div class='add'>+	} else</div><div class='add'>+		BNX2X_ERR("Bootcode is missing -not resetting link\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 bnx2x_link_test(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u8 rc;</div><div class='ctx'> </div><div class='del'>-	bnx2x_phy_hw_lock(bp);</div><div class='add'>+	bnx2x_acquire_phy_lock(bp);</div><div class='ctx'> 	rc = bnx2x_test_link(&amp;bp-&gt;link_params, &amp;bp-&gt;link_vars);</div><div class='del'>-	bnx2x_phy_hw_unlock(bp);</div><div class='add'>+	bnx2x_release_phy_lock(bp);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -1991,7 +2010,7 @@ static u8 bnx2x_link_test(struct bnx2x *bp)</div><div class='ctx'>      sum of vn_min_rates</div><div class='ctx'>        or</div><div class='ctx'>      0 - if all the min_rates are 0.</div><div class='del'>-     In the later case fainess algorithm should be deactivated.</div><div class='add'>+     In the later case fairness algorithm should be deactivated.</div><div class='ctx'>      If not all min_rates are zero then those that are zeroes will</div><div class='ctx'>      be set to 1.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2114,7 +2133,7 @@ static void bnx2x_init_vn_minmax(struct bnx2x *bp, int func,</div><div class='ctx'> 				FUNC_MF_CFG_MIN_BW_SHIFT) * 100;</div><div class='ctx'> 		/* If FAIRNESS is enabled (not all min rates are zeroes) and</div><div class='ctx'> 		   if current min rate is zero - set it to 1.</div><div class='del'>-		   This is a requirment of the algorithm. */</div><div class='add'>+		   This is a requirement of the algorithm. */</div><div class='ctx'> 		if ((vn_min_rate == 0) &amp;&amp; wsum)</div><div class='ctx'> 			vn_min_rate = DEF_MIN_RATE;</div><div class='ctx'> 		vn_max_rate = ((vn_cfg &amp; FUNC_MF_CFG_MAX_BW_MASK) &gt;&gt;</div><div class='hunk'>@@ -2203,9 +2222,9 @@ static void bnx2x_link_attn(struct bnx2x *bp)</div><div class='ctx'> 	/* Make sure that we are synced with the current statistics */</div><div class='ctx'> 	bnx2x_stats_handle(bp, STATS_EVENT_STOP);</div><div class='ctx'> </div><div class='del'>-	bnx2x_phy_hw_lock(bp);</div><div class='add'>+	bnx2x_acquire_phy_lock(bp);</div><div class='ctx'> 	bnx2x_link_update(&amp;bp-&gt;link_params, &amp;bp-&gt;link_vars);</div><div class='del'>-	bnx2x_phy_hw_unlock(bp);</div><div class='add'>+	bnx2x_release_phy_lock(bp);</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;link_vars.link_up) {</div><div class='ctx'> </div><div class='hunk'>@@ -2357,7 +2376,7 @@ static int bnx2x_sp_post(struct bnx2x *bp, int command, int cid,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* acquire split MCP access lock register */</div><div class='del'>-static int bnx2x_lock_alr(struct bnx2x *bp)</div><div class='add'>+static int bnx2x_acquire_alr(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i, j, val;</div><div class='ctx'> 	int rc = 0;</div><div class='hunk'>@@ -2374,15 +2393,15 @@ static int bnx2x_lock_alr(struct bnx2x *bp)</div><div class='ctx'> 		msleep(5);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!(val &amp; (1L &lt;&lt; 31))) {</div><div class='del'>-		BNX2X_ERR("Cannot acquire nvram interface\n");</div><div class='add'>+		BNX2X_ERR("Cannot acquire MCP access lock register\n");</div><div class='ctx'> 		rc = -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Release split MCP access lock register */</div><div class='del'>-static void bnx2x_unlock_alr(struct bnx2x *bp)</div><div class='add'>+/* release split MCP access lock register */</div><div class='add'>+static void bnx2x_release_alr(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2395,7 +2414,6 @@ static inline u16 bnx2x_update_dsb_idx(struct bnx2x *bp)</div><div class='ctx'> 	u16 rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	barrier(); /* status block is written to by the chip */</div><div class='del'>-</div><div class='ctx'> 	if (bp-&gt;def_att_idx != def_sb-&gt;atten_status_block.attn_bits_index) {</div><div class='ctx'> 		bp-&gt;def_att_idx = def_sb-&gt;atten_status_block.attn_bits_index;</div><div class='ctx'> 		rc |= 1;</div><div class='hunk'>@@ -2426,26 +2444,31 @@ static inline u16 bnx2x_update_dsb_idx(struct bnx2x *bp)</div><div class='ctx'> static void bnx2x_attn_int_asserted(struct bnx2x *bp, u32 asserted)</div><div class='ctx'> {</div><div class='ctx'> 	int port = BP_PORT(bp);</div><div class='del'>-	int func = BP_FUNC(bp);</div><div class='del'>-	u32 igu_addr = (IGU_ADDR_ATTN_BITS_SET + IGU_FUNC_BASE * func) * 8;</div><div class='add'>+	u32 hc_addr = (HC_REG_COMMAND_REG + port*32 +</div><div class='add'>+		       COMMAND_REG_ATTN_BITS_SET);</div><div class='ctx'> 	u32 aeu_addr = port ? MISC_REG_AEU_MASK_ATTN_FUNC_1 :</div><div class='ctx'> 			      MISC_REG_AEU_MASK_ATTN_FUNC_0;</div><div class='ctx'> 	u32 nig_int_mask_addr = port ? NIG_REG_MASK_INTERRUPT_PORT1 :</div><div class='ctx'> 				       NIG_REG_MASK_INTERRUPT_PORT0;</div><div class='add'>+	u32 aeu_mask;</div><div class='ctx'> </div><div class='del'>-	if (~bp-&gt;aeu_mask &amp; (asserted &amp; 0xff))</div><div class='del'>-		BNX2X_ERR("IGU ERROR\n");</div><div class='ctx'> 	if (bp-&gt;attn_state &amp; asserted)</div><div class='ctx'> 		BNX2X_ERR("IGU ERROR\n");</div><div class='ctx'> </div><div class='add'>+	bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_PORT0_ATT_MASK + port);</div><div class='add'>+	aeu_mask = REG_RD(bp, aeu_addr);</div><div class='add'>+</div><div class='ctx'> 	DP(NETIF_MSG_HW, "aeu_mask %x  newly asserted %x\n",</div><div class='del'>-	   bp-&gt;aeu_mask, asserted);</div><div class='del'>-	bp-&gt;aeu_mask &amp;= ~(asserted &amp; 0xff);</div><div class='del'>-	DP(NETIF_MSG_HW, "after masking: aeu_mask %x\n", bp-&gt;aeu_mask);</div><div class='add'>+	   aeu_mask, asserted);</div><div class='add'>+	aeu_mask &amp;= ~(asserted &amp; 0xff);</div><div class='add'>+	DP(NETIF_MSG_HW, "new mask %x\n", aeu_mask);</div><div class='ctx'> </div><div class='del'>-	REG_WR(bp, aeu_addr, bp-&gt;aeu_mask);</div><div class='add'>+	REG_WR(bp, aeu_addr, aeu_mask);</div><div class='add'>+	bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_PORT0_ATT_MASK + port);</div><div class='ctx'> </div><div class='add'>+	DP(NETIF_MSG_HW, "attn_state %x\n", bp-&gt;attn_state);</div><div class='ctx'> 	bp-&gt;attn_state |= asserted;</div><div class='add'>+	DP(NETIF_MSG_HW, "new state %x\n", bp-&gt;attn_state);</div><div class='ctx'> </div><div class='ctx'> 	if (asserted &amp; ATTN_HARD_WIRED_MASK) {</div><div class='ctx'> 		if (asserted &amp; ATTN_NIG_FOR_FUNC) {</div><div class='hunk'>@@ -2500,9 +2523,9 @@ static void bnx2x_attn_int_asserted(struct bnx2x *bp, u32 asserted)</div><div class='ctx'> </div><div class='ctx'> 	} /* if hardwired */</div><div class='ctx'> </div><div class='del'>-	DP(NETIF_MSG_HW, "about to mask 0x%08x at IGU addr 0x%x\n",</div><div class='del'>-	   asserted, BAR_IGU_INTMEM + igu_addr);</div><div class='del'>-	REG_WR(bp, BAR_IGU_INTMEM + igu_addr, asserted);</div><div class='add'>+	DP(NETIF_MSG_HW, "about to mask 0x%08x at HC addr 0x%x\n",</div><div class='add'>+	   asserted, hc_addr);</div><div class='add'>+	REG_WR(bp, hc_addr, asserted);</div><div class='ctx'> </div><div class='ctx'> 	/* now set back the mask */</div><div class='ctx'> 	if (asserted &amp; ATTN_NIG_FOR_FUNC)</div><div class='hunk'>@@ -2527,15 +2550,16 @@ static inline void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn)</div><div class='ctx'> 		BNX2X_ERR("SPIO5 hw attention\n");</div><div class='ctx'> </div><div class='ctx'> 		switch (bp-&gt;common.board &amp; SHARED_HW_CFG_BOARD_TYPE_MASK) {</div><div class='add'>+		case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1021G:</div><div class='ctx'> 		case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G:</div><div class='ctx'> 			/* Fan failure attention */</div><div class='ctx'> </div><div class='del'>-			/* The PHY reset is controled by GPIO 1 */</div><div class='add'>+			/* The PHY reset is controlled by GPIO 1 */</div><div class='ctx'> 			bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,</div><div class='del'>-				       MISC_REGISTERS_GPIO_OUTPUT_LOW);</div><div class='del'>-			/* Low power mode is controled by GPIO 2 */</div><div class='add'>+				       MISC_REGISTERS_GPIO_OUTPUT_LOW, port);</div><div class='add'>+			/* Low power mode is controlled by GPIO 2 */</div><div class='ctx'> 			bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,</div><div class='del'>-				       MISC_REGISTERS_GPIO_OUTPUT_LOW);</div><div class='add'>+				       MISC_REGISTERS_GPIO_OUTPUT_LOW, port);</div><div class='ctx'> 			/* mark the failure */</div><div class='ctx'> 			bp-&gt;link_params.ext_phy_config &amp;=</div><div class='ctx'> 					~PORT_HW_CFG_XGXS_EXT_PHY_TYPE_MASK;</div><div class='hunk'>@@ -2699,10 +2723,11 @@ static void bnx2x_attn_int_deasserted(struct bnx2x *bp, u32 deasserted)</div><div class='ctx'> 	int index;</div><div class='ctx'> 	u32 reg_addr;</div><div class='ctx'> 	u32 val;</div><div class='add'>+	u32 aeu_mask;</div><div class='ctx'> </div><div class='ctx'> 	/* need to take HW lock because MCP or other port might also</div><div class='ctx'> 	   try to handle this event */</div><div class='del'>-	bnx2x_lock_alr(bp);</div><div class='add'>+	bnx2x_acquire_alr(bp);</div><div class='ctx'> </div><div class='ctx'> 	attn.sig[0] = REG_RD(bp, MISC_REG_AEU_AFTER_INVERT_1_FUNC_0 + port*4);</div><div class='ctx'> 	attn.sig[1] = REG_RD(bp, MISC_REG_AEU_AFTER_INVERT_2_FUNC_0 + port*4);</div><div class='hunk'>@@ -2734,32 +2759,35 @@ static void bnx2x_attn_int_deasserted(struct bnx2x *bp, u32 deasserted)</div><div class='ctx'> 						HW_PRTY_ASSERT_SET_1) ||</div><div class='ctx'> 			    (attn.sig[2] &amp; group_mask.sig[2] &amp;</div><div class='ctx'> 						HW_PRTY_ASSERT_SET_2))</div><div class='del'>-			       BNX2X_ERR("FATAL HW block parity attention\n");</div><div class='add'>+				BNX2X_ERR("FATAL HW block parity attention\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bnx2x_unlock_alr(bp);</div><div class='add'>+	bnx2x_release_alr(bp);</div><div class='ctx'> </div><div class='del'>-	reg_addr = (IGU_ADDR_ATTN_BITS_CLR + IGU_FUNC_BASE * BP_FUNC(bp)) * 8;</div><div class='add'>+	reg_addr = (HC_REG_COMMAND_REG + port*32 + COMMAND_REG_ATTN_BITS_CLR);</div><div class='ctx'> </div><div class='ctx'> 	val = ~deasserted;</div><div class='del'>-/*	DP(NETIF_MSG_INTR, "write 0x%08x to IGU addr 0x%x\n",</div><div class='del'>-	   val, BAR_IGU_INTMEM + reg_addr); */</div><div class='del'>-	REG_WR(bp, BAR_IGU_INTMEM + reg_addr, val);</div><div class='add'>+	DP(NETIF_MSG_HW, "about to mask 0x%08x at HC addr 0x%x\n",</div><div class='add'>+	   val, reg_addr);</div><div class='add'>+	REG_WR(bp, reg_addr, val);</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;aeu_mask &amp; (deasserted &amp; 0xff))</div><div class='del'>-		BNX2X_ERR("IGU BUG!\n");</div><div class='ctx'> 	if (~bp-&gt;attn_state &amp; deasserted)</div><div class='del'>-		BNX2X_ERR("IGU BUG!\n");</div><div class='add'>+		BNX2X_ERR("IGU ERROR\n");</div><div class='ctx'> </div><div class='ctx'> 	reg_addr = port ? MISC_REG_AEU_MASK_ATTN_FUNC_1 :</div><div class='ctx'> 			  MISC_REG_AEU_MASK_ATTN_FUNC_0;</div><div class='ctx'> </div><div class='del'>-	DP(NETIF_MSG_HW, "aeu_mask %x\n", bp-&gt;aeu_mask);</div><div class='del'>-	bp-&gt;aeu_mask |= (deasserted &amp; 0xff);</div><div class='add'>+	bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_PORT0_ATT_MASK + port);</div><div class='add'>+	aeu_mask = REG_RD(bp, reg_addr);</div><div class='ctx'> </div><div class='del'>-	DP(NETIF_MSG_HW, "new mask %x\n", bp-&gt;aeu_mask);</div><div class='del'>-	REG_WR(bp, reg_addr, bp-&gt;aeu_mask);</div><div class='add'>+	DP(NETIF_MSG_HW, "aeu_mask %x  newly deasserted %x\n",</div><div class='add'>+	   aeu_mask, deasserted);</div><div class='add'>+	aeu_mask |= (deasserted &amp; 0xff);</div><div class='add'>+	DP(NETIF_MSG_HW, "new mask %x\n", aeu_mask);</div><div class='add'>+</div><div class='add'>+	REG_WR(bp, reg_addr, aeu_mask);</div><div class='add'>+	bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_PORT0_ATT_MASK + port);</div><div class='ctx'> </div><div class='ctx'> 	DP(NETIF_MSG_HW, "attn_state %x\n", bp-&gt;attn_state);</div><div class='ctx'> 	bp-&gt;attn_state &amp;= ~deasserted;</div><div class='hunk'>@@ -2800,7 +2828,7 @@ static void bnx2x_sp_task(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	/* Return here if interrupt is disabled */</div><div class='ctx'> 	if (unlikely(atomic_read(&amp;bp-&gt;intr_sem) != 0)) {</div><div class='del'>-		DP(BNX2X_MSG_SP, "called but intr_sem not 0, returning\n");</div><div class='add'>+		DP(NETIF_MSG_INTR, "called but intr_sem not 0, returning\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2808,7 +2836,7 @@ static void bnx2x_sp_task(struct work_struct *work)</div><div class='ctx'> /*	if (status == 0)				     */</div><div class='ctx'> /*		BNX2X_ERR("spurious slowpath interrupt!\n"); */</div><div class='ctx'> </div><div class='del'>-	DP(BNX2X_MSG_SP, "got a slowpath interrupt (updated %x)\n", status);</div><div class='add'>+	DP(NETIF_MSG_INTR, "got a slowpath interrupt (updated %x)\n", status);</div><div class='ctx'> </div><div class='ctx'> 	/* HW attentions */</div><div class='ctx'> 	if (status &amp; 0x1)</div><div class='hunk'>@@ -2838,7 +2866,7 @@ static irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance)</div><div class='ctx'> </div><div class='ctx'> 	/* Return here if interrupt is disabled */</div><div class='ctx'> 	if (unlikely(atomic_read(&amp;bp-&gt;intr_sem) != 0)) {</div><div class='del'>-		DP(BNX2X_MSG_SP, "called but intr_sem not 0, returning\n");</div><div class='add'>+		DP(NETIF_MSG_INTR, "called but intr_sem not 0, returning\n");</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2876,11 +2904,11 @@ static irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance)</div><div class='ctx'> 			/* underflow */ \</div><div class='ctx'> 			d_hi = m_hi - s_hi; \</div><div class='ctx'> 			if (d_hi &gt; 0) { \</div><div class='del'>-			/* we can 'loan' 1 */ \</div><div class='add'>+				/* we can 'loan' 1 */ \</div><div class='ctx'> 				d_hi--; \</div><div class='ctx'> 				d_lo = m_lo + (UINT_MAX - s_lo) + 1; \</div><div class='ctx'> 			} else { \</div><div class='del'>-			/* m_hi &lt;= s_hi */ \</div><div class='add'>+				/* m_hi &lt;= s_hi */ \</div><div class='ctx'> 				d_hi = 0; \</div><div class='ctx'> 				d_lo = 0; \</div><div class='ctx'> 			} \</div><div class='hunk'>@@ -2890,7 +2918,7 @@ static irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance)</div><div class='ctx'> 				d_hi = 0; \</div><div class='ctx'> 				d_lo = 0; \</div><div class='ctx'> 			} else { \</div><div class='del'>-			/* m_hi &gt;= s_hi */ \</div><div class='add'>+				/* m_hi &gt;= s_hi */ \</div><div class='ctx'> 				d_hi = m_hi - s_hi; \</div><div class='ctx'> 				d_lo = m_lo - s_lo; \</div><div class='ctx'> 			} \</div><div class='hunk'>@@ -2963,37 +2991,6 @@ static inline long bnx2x_hilo(u32 *hiref)</div><div class='ctx'>  * Init service functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void bnx2x_storm_stats_init(struct bnx2x *bp)</div><div class='del'>-{</div><div class='del'>-	int func = BP_FUNC(bp);</div><div class='del'>-</div><div class='del'>-	REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_STATS_FLAGS_OFFSET(func), 1);</div><div class='del'>-	REG_WR(bp, BAR_XSTRORM_INTMEM +</div><div class='del'>-	       XSTORM_STATS_FLAGS_OFFSET(func) + 4, 0);</div><div class='del'>-</div><div class='del'>-	REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_STATS_FLAGS_OFFSET(func), 1);</div><div class='del'>-	REG_WR(bp, BAR_TSTRORM_INTMEM +</div><div class='del'>-	       TSTORM_STATS_FLAGS_OFFSET(func) + 4, 0);</div><div class='del'>-</div><div class='del'>-	REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_STATS_FLAGS_OFFSET(func), 0);</div><div class='del'>-	REG_WR(bp, BAR_CSTRORM_INTMEM +</div><div class='del'>-	       CSTORM_STATS_FLAGS_OFFSET(func) + 4, 0);</div><div class='del'>-</div><div class='del'>-	REG_WR(bp, BAR_XSTRORM_INTMEM +</div><div class='del'>-	       XSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func),</div><div class='del'>-	       U64_LO(bnx2x_sp_mapping(bp, fw_stats)));</div><div class='del'>-	REG_WR(bp, BAR_XSTRORM_INTMEM +</div><div class='del'>-	       XSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func) + 4,</div><div class='del'>-	       U64_HI(bnx2x_sp_mapping(bp, fw_stats)));</div><div class='del'>-</div><div class='del'>-	REG_WR(bp, BAR_TSTRORM_INTMEM +</div><div class='del'>-	       TSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func),</div><div class='del'>-	       U64_LO(bnx2x_sp_mapping(bp, fw_stats)));</div><div class='del'>-	REG_WR(bp, BAR_TSTRORM_INTMEM +</div><div class='del'>-	       TSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func) + 4,</div><div class='del'>-	       U64_HI(bnx2x_sp_mapping(bp, fw_stats)));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void bnx2x_storm_stats_post(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	if (!bp-&gt;stats_pending) {</div><div class='hunk'>@@ -3032,6 +3029,8 @@ static void bnx2x_stats_init(struct bnx2x *bp)</div><div class='ctx'> 	memset(&amp;(bp-&gt;port.old_nig_stats), 0, sizeof(struct nig_stats));</div><div class='ctx'> 	bp-&gt;port.old_nig_stats.brb_discard =</div><div class='ctx'> 			REG_RD(bp, NIG_REG_STAT0_BRB_DISCARD + port*0x38);</div><div class='add'>+	bp-&gt;port.old_nig_stats.brb_truncate =</div><div class='add'>+			REG_RD(bp, NIG_REG_STAT0_BRB_TRUNCATE + port*0x38);</div><div class='ctx'> 	REG_RD_DMAE(bp, NIG_REG_STAT0_EGRESS_MAC_PKT0 + port*0x50,</div><div class='ctx'> 		    &amp;(bp-&gt;port.old_nig_stats.egress_mac_pkt0_lo), 2);</div><div class='ctx'> 	REG_RD_DMAE(bp, NIG_REG_STAT0_EGRESS_MAC_PKT1 + port*0x50,</div><div class='hunk'>@@ -3101,12 +3100,12 @@ static int bnx2x_stats_comp(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 	might_sleep();</div><div class='ctx'> 	while (*stats_comp != DMAE_COMP_VAL) {</div><div class='del'>-		msleep(1);</div><div class='ctx'> 		if (!cnt) {</div><div class='ctx'> 			BNX2X_ERR("timeout waiting for stats finished\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		cnt--;</div><div class='add'>+		msleep(1);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -3451,8 +3450,7 @@ static void bnx2x_bmac_stats_update(struct bnx2x *bp)</div><div class='ctx'> 	UPDATE_STAT64(rx_stat_grovr, rx_stat_dot3statsframestoolong);</div><div class='ctx'> 	UPDATE_STAT64(rx_stat_grfrg, rx_stat_etherstatsfragments);</div><div class='ctx'> 	UPDATE_STAT64(rx_stat_grjbr, rx_stat_etherstatsjabbers);</div><div class='del'>-	UPDATE_STAT64(rx_stat_grxpf, rx_stat_bmac_xpf);</div><div class='del'>-	UPDATE_STAT64(rx_stat_grxcf, rx_stat_bmac_xcf);</div><div class='add'>+	UPDATE_STAT64(rx_stat_grxcf, rx_stat_maccontrolframesreceived);</div><div class='ctx'> 	UPDATE_STAT64(rx_stat_grxpf, rx_stat_xoffstateentered);</div><div class='ctx'> 	UPDATE_STAT64(rx_stat_grxpf, rx_stat_xoffpauseframesreceived);</div><div class='ctx'> 	UPDATE_STAT64(tx_stat_gtxpf, tx_stat_outxoffsent);</div><div class='hunk'>@@ -3536,6 +3534,8 @@ static int bnx2x_hw_stats_update(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 	ADD_EXTEND_64(pstats-&gt;brb_drop_hi, pstats-&gt;brb_drop_lo,</div><div class='ctx'> 		      new-&gt;brb_discard - old-&gt;brb_discard);</div><div class='add'>+	ADD_EXTEND_64(estats-&gt;brb_truncate_hi, estats-&gt;brb_truncate_lo,</div><div class='add'>+		      new-&gt;brb_truncate - old-&gt;brb_truncate);</div><div class='ctx'> </div><div class='ctx'> 	UPDATE_STAT64_NIG(egress_mac_pkt0,</div><div class='ctx'> 					etherstatspkts1024octetsto1522octets);</div><div class='hunk'>@@ -3713,8 +3713,7 @@ static void bnx2x_net_stats_update(struct bnx2x *bp)</div><div class='ctx'> 	nstats-&gt;rx_length_errors =</div><div class='ctx'> 				estats-&gt;rx_stat_etherstatsundersizepkts_lo +</div><div class='ctx'> 				estats-&gt;jabber_packets_received;</div><div class='del'>-	nstats-&gt;rx_over_errors = estats-&gt;brb_drop_lo +</div><div class='del'>-				 estats-&gt;brb_truncate_discard;</div><div class='add'>+	nstats-&gt;rx_over_errors = estats-&gt;brb_drop_lo + estats-&gt;brb_truncate_lo;</div><div class='ctx'> 	nstats-&gt;rx_crc_errors = estats-&gt;rx_stat_dot3statsfcserrors_lo;</div><div class='ctx'> 	nstats-&gt;rx_frame_errors = estats-&gt;rx_stat_dot3statsalignmenterrors_lo;</div><div class='ctx'> 	nstats-&gt;rx_fifo_errors = old_tclient-&gt;no_buff_discard;</div><div class='hunk'>@@ -3783,7 +3782,7 @@ static void bnx2x_stats_update(struct bnx2x *bp)</div><div class='ctx'> 			     bp-&gt;fp-&gt;rx_comp_cons),</div><div class='ctx'> 		       le16_to_cpu(*bp-&gt;fp-&gt;rx_cons_sb), nstats-&gt;rx_packets);</div><div class='ctx'> 		printk(KERN_DEBUG "  %s (Xoff events %u)  brb drops %u\n",</div><div class='del'>-		       netif_queue_stopped(bp-&gt;dev)? "Xoff" : "Xon",</div><div class='add'>+		       netif_queue_stopped(bp-&gt;dev) ? "Xoff" : "Xon",</div><div class='ctx'> 		       estats-&gt;driver_xoff, estats-&gt;brb_drop_lo);</div><div class='ctx'> 		printk(KERN_DEBUG "tstats: checksum_discard %u  "</div><div class='ctx'> 			"packets_too_big_discard %u  no_buff_discard %u  "</div><div class='hunk'>@@ -3994,14 +3993,14 @@ static void bnx2x_zero_sb(struct bnx2x *bp, int sb_id)</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_init_fill(bp, BAR_USTRORM_INTMEM +</div><div class='ctx'> 			USTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, sb_id), 0,</div><div class='del'>-			sizeof(struct ustorm_def_status_block)/4);</div><div class='add'>+			sizeof(struct ustorm_status_block)/4);</div><div class='ctx'> 	bnx2x_init_fill(bp, BAR_CSTRORM_INTMEM +</div><div class='ctx'> 			CSTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, sb_id), 0,</div><div class='del'>-			sizeof(struct cstorm_def_status_block)/4);</div><div class='add'>+			sizeof(struct cstorm_status_block)/4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnx2x_init_sb(struct bnx2x *bp, int sb_id,</div><div class='del'>-			  struct host_status_block *sb,	dma_addr_t mapping)</div><div class='add'>+static void bnx2x_init_sb(struct bnx2x *bp, struct host_status_block *sb,</div><div class='add'>+			  dma_addr_t mapping, int sb_id)</div><div class='ctx'> {</div><div class='ctx'> 	int port = BP_PORT(bp);</div><div class='ctx'> 	int func = BP_FUNC(bp);</div><div class='hunk'>@@ -4077,7 +4076,6 @@ static void bnx2x_init_def_sb(struct bnx2x *bp,</div><div class='ctx'> 					    atten_status_block);</div><div class='ctx'> 	def_sb-&gt;atten_status_block.status_block_id = sb_id;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;def_att_idx = 0;</div><div class='ctx'> 	bp-&gt;attn_state = 0;</div><div class='ctx'> </div><div class='ctx'> 	reg_offset = (port ? MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0 :</div><div class='hunk'>@@ -4094,9 +4092,6 @@ static void bnx2x_init_def_sb(struct bnx2x *bp,</div><div class='ctx'> 					       reg_offset + 0xc + 0x10*index);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bp-&gt;aeu_mask = REG_RD(bp, (port ? MISC_REG_AEU_MASK_ATTN_FUNC_1 :</div><div class='del'>-					  MISC_REG_AEU_MASK_ATTN_FUNC_0));</div><div class='del'>-</div><div class='ctx'> 	reg_offset = (port ? HC_REG_ATTN_MSG1_ADDR_L :</div><div class='ctx'> 			     HC_REG_ATTN_MSG0_ADDR_L);</div><div class='ctx'> </div><div class='hunk'>@@ -4114,17 +4109,13 @@ static void bnx2x_init_def_sb(struct bnx2x *bp,</div><div class='ctx'> 					    u_def_status_block);</div><div class='ctx'> 	def_sb-&gt;u_def_status_block.status_block_id = sb_id;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;def_u_idx = 0;</div><div class='del'>-</div><div class='ctx'> 	REG_WR(bp, BAR_USTRORM_INTMEM +</div><div class='ctx'> 	       USTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func), U64_LO(section));</div><div class='ctx'> 	REG_WR(bp, BAR_USTRORM_INTMEM +</div><div class='ctx'> 	       ((USTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func)) + 4),</div><div class='ctx'> 	       U64_HI(section));</div><div class='del'>-	REG_WR8(bp, BAR_USTRORM_INTMEM +  DEF_USB_FUNC_OFF +</div><div class='add'>+	REG_WR8(bp, BAR_USTRORM_INTMEM + DEF_USB_FUNC_OFF +</div><div class='ctx'> 		USTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), func);</div><div class='del'>-	REG_WR(bp, BAR_USTRORM_INTMEM + USTORM_HC_BTR_OFFSET(func),</div><div class='del'>-	       BNX2X_BTR);</div><div class='ctx'> </div><div class='ctx'> 	for (index = 0; index &lt; HC_USTORM_DEF_SB_NUM_INDICES; index++)</div><div class='ctx'> 		REG_WR16(bp, BAR_USTRORM_INTMEM +</div><div class='hunk'>@@ -4135,17 +4126,13 @@ static void bnx2x_init_def_sb(struct bnx2x *bp,</div><div class='ctx'> 					    c_def_status_block);</div><div class='ctx'> 	def_sb-&gt;c_def_status_block.status_block_id = sb_id;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;def_c_idx = 0;</div><div class='del'>-</div><div class='ctx'> 	REG_WR(bp, BAR_CSTRORM_INTMEM +</div><div class='ctx'> 	       CSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func), U64_LO(section));</div><div class='ctx'> 	REG_WR(bp, BAR_CSTRORM_INTMEM +</div><div class='ctx'> 	       ((CSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func)) + 4),</div><div class='ctx'> 	       U64_HI(section));</div><div class='del'>-	REG_WR8(bp, BAR_CSTRORM_INTMEM +  DEF_CSB_FUNC_OFF +</div><div class='add'>+	REG_WR8(bp, BAR_CSTRORM_INTMEM + DEF_CSB_FUNC_OFF +</div><div class='ctx'> 		CSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), func);</div><div class='del'>-	REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_HC_BTR_OFFSET(func),</div><div class='del'>-	       BNX2X_BTR);</div><div class='ctx'> </div><div class='ctx'> 	for (index = 0; index &lt; HC_CSTORM_DEF_SB_NUM_INDICES; index++)</div><div class='ctx'> 		REG_WR16(bp, BAR_CSTRORM_INTMEM +</div><div class='hunk'>@@ -4156,17 +4143,13 @@ static void bnx2x_init_def_sb(struct bnx2x *bp,</div><div class='ctx'> 					    t_def_status_block);</div><div class='ctx'> 	def_sb-&gt;t_def_status_block.status_block_id = sb_id;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;def_t_idx = 0;</div><div class='del'>-</div><div class='ctx'> 	REG_WR(bp, BAR_TSTRORM_INTMEM +</div><div class='ctx'> 	       TSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func), U64_LO(section));</div><div class='ctx'> 	REG_WR(bp, BAR_TSTRORM_INTMEM +</div><div class='ctx'> 	       ((TSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func)) + 4),</div><div class='ctx'> 	       U64_HI(section));</div><div class='del'>-	REG_WR8(bp, BAR_TSTRORM_INTMEM +  DEF_TSB_FUNC_OFF +</div><div class='add'>+	REG_WR8(bp, BAR_TSTRORM_INTMEM + DEF_TSB_FUNC_OFF +</div><div class='ctx'> 		TSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), func);</div><div class='del'>-	REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_HC_BTR_OFFSET(func),</div><div class='del'>-	       BNX2X_BTR);</div><div class='ctx'> </div><div class='ctx'> 	for (index = 0; index &lt; HC_TSTORM_DEF_SB_NUM_INDICES; index++)</div><div class='ctx'> 		REG_WR16(bp, BAR_TSTRORM_INTMEM +</div><div class='hunk'>@@ -4177,23 +4160,20 @@ static void bnx2x_init_def_sb(struct bnx2x *bp,</div><div class='ctx'> 					    x_def_status_block);</div><div class='ctx'> 	def_sb-&gt;x_def_status_block.status_block_id = sb_id;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;def_x_idx = 0;</div><div class='del'>-</div><div class='ctx'> 	REG_WR(bp, BAR_XSTRORM_INTMEM +</div><div class='ctx'> 	       XSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func), U64_LO(section));</div><div class='ctx'> 	REG_WR(bp, BAR_XSTRORM_INTMEM +</div><div class='ctx'> 	       ((XSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func)) + 4),</div><div class='ctx'> 	       U64_HI(section));</div><div class='del'>-	REG_WR8(bp, BAR_XSTRORM_INTMEM +  DEF_XSB_FUNC_OFF +</div><div class='add'>+	REG_WR8(bp, BAR_XSTRORM_INTMEM + DEF_XSB_FUNC_OFF +</div><div class='ctx'> 		XSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), func);</div><div class='del'>-	REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_HC_BTR_OFFSET(func),</div><div class='del'>-	       BNX2X_BTR);</div><div class='ctx'> </div><div class='ctx'> 	for (index = 0; index &lt; HC_XSTORM_DEF_SB_NUM_INDICES; index++)</div><div class='ctx'> 		REG_WR16(bp, BAR_XSTRORM_INTMEM +</div><div class='ctx'> 			 XSTORM_DEF_SB_HC_DISABLE_OFFSET(func, index), 1);</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;stats_pending = 0;</div><div class='add'>+	bp-&gt;set_mac_pending = 0;</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_ack_sb(bp, sb_id, CSTORM_ID, 0, IGU_INT_ENABLE, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -4209,21 +4189,25 @@ static void bnx2x_update_coalesce(struct bnx2x *bp)</div><div class='ctx'> 		/* HC_INDEX_U_ETH_RX_CQ_CONS */</div><div class='ctx'> 		REG_WR8(bp, BAR_USTRORM_INTMEM +</div><div class='ctx'> 			USTORM_SB_HC_TIMEOUT_OFFSET(port, sb_id,</div><div class='del'>-						   HC_INDEX_U_ETH_RX_CQ_CONS),</div><div class='add'>+						    U_SB_ETH_RX_CQ_INDEX),</div><div class='ctx'> 			bp-&gt;rx_ticks/12);</div><div class='ctx'> 		REG_WR16(bp, BAR_USTRORM_INTMEM +</div><div class='ctx'> 			 USTORM_SB_HC_DISABLE_OFFSET(port, sb_id,</div><div class='del'>-						   HC_INDEX_U_ETH_RX_CQ_CONS),</div><div class='add'>+						     U_SB_ETH_RX_CQ_INDEX),</div><div class='add'>+			 bp-&gt;rx_ticks ? 0 : 1);</div><div class='add'>+		REG_WR16(bp, BAR_USTRORM_INTMEM +</div><div class='add'>+			 USTORM_SB_HC_DISABLE_OFFSET(port, sb_id,</div><div class='add'>+						     U_SB_ETH_RX_BD_INDEX),</div><div class='ctx'> 			 bp-&gt;rx_ticks ? 0 : 1);</div><div class='ctx'> </div><div class='ctx'> 		/* HC_INDEX_C_ETH_TX_CQ_CONS */</div><div class='ctx'> 		REG_WR8(bp, BAR_CSTRORM_INTMEM +</div><div class='ctx'> 			CSTORM_SB_HC_TIMEOUT_OFFSET(port, sb_id,</div><div class='del'>-						   HC_INDEX_C_ETH_TX_CQ_CONS),</div><div class='add'>+						    C_SB_ETH_TX_CQ_INDEX),</div><div class='ctx'> 			bp-&gt;tx_ticks/12);</div><div class='ctx'> 		REG_WR16(bp, BAR_CSTRORM_INTMEM +</div><div class='ctx'> 			 CSTORM_SB_HC_DISABLE_OFFSET(port, sb_id,</div><div class='del'>-						   HC_INDEX_C_ETH_TX_CQ_CONS),</div><div class='add'>+						     C_SB_ETH_TX_CQ_INDEX),</div><div class='ctx'> 			 bp-&gt;tx_ticks ? 0 : 1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -4245,7 +4229,7 @@ static inline void bnx2x_free_tpa_pool(struct bnx2x *bp,</div><div class='ctx'> 		if (fp-&gt;tpa_state[i] == BNX2X_TPA_START)</div><div class='ctx'> 			pci_unmap_single(bp-&gt;pdev,</div><div class='ctx'> 					 pci_unmap_addr(rx_buf, mapping),</div><div class='del'>-					 bp-&gt;rx_buf_use_size,</div><div class='add'>+					 bp-&gt;rx_buf_size,</div><div class='ctx'> 					 PCI_DMA_FROMDEVICE);</div><div class='ctx'> </div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='hunk'>@@ -4256,23 +4240,24 @@ static inline void bnx2x_free_tpa_pool(struct bnx2x *bp,</div><div class='ctx'> static void bnx2x_init_rx_rings(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int func = BP_FUNC(bp);</div><div class='del'>-	u16 ring_prod, cqe_ring_prod = 0;</div><div class='add'>+	int max_agg_queues = CHIP_IS_E1(bp) ? ETH_MAX_AGGREGATION_QUEUES_E1 :</div><div class='add'>+					      ETH_MAX_AGGREGATION_QUEUES_E1H;</div><div class='add'>+	u16 ring_prod, cqe_ring_prod;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;rx_buf_use_size = bp-&gt;dev-&gt;mtu;</div><div class='del'>-	bp-&gt;rx_buf_use_size += bp-&gt;rx_offset + ETH_OVREHEAD;</div><div class='del'>-	bp-&gt;rx_buf_size = bp-&gt;rx_buf_use_size + 64;</div><div class='add'>+	bp-&gt;rx_buf_size = bp-&gt;dev-&gt;mtu;</div><div class='add'>+	bp-&gt;rx_buf_size += bp-&gt;rx_offset + ETH_OVREHEAD +</div><div class='add'>+		BCM_RX_ETH_PAYLOAD_ALIGN;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;flags &amp; TPA_ENABLE_FLAG) {</div><div class='ctx'> 		DP(NETIF_MSG_IFUP,</div><div class='del'>-		   "rx_buf_use_size %d  rx_buf_size %d  effective_mtu %d\n",</div><div class='del'>-		   bp-&gt;rx_buf_use_size, bp-&gt;rx_buf_size,</div><div class='del'>-		   bp-&gt;dev-&gt;mtu + ETH_OVREHEAD);</div><div class='add'>+		   "rx_buf_size %d  effective_mtu %d\n",</div><div class='add'>+		   bp-&gt;rx_buf_size, bp-&gt;dev-&gt;mtu + ETH_OVREHEAD);</div><div class='ctx'> </div><div class='ctx'> 		for_each_queue(bp, j) {</div><div class='del'>-			for (i = 0; i &lt; ETH_MAX_AGGREGATION_QUEUES_E1H; i++) {</div><div class='del'>-				struct bnx2x_fastpath *fp = &amp;bp-&gt;fp[j];</div><div class='add'>+			struct bnx2x_fastpath *fp = &amp;bp-&gt;fp[j];</div><div class='ctx'> </div><div class='add'>+			for (i = 0; i &lt; max_agg_queues; i++) {</div><div class='ctx'> 				fp-&gt;tpa_pool[i].skb =</div><div class='ctx'> 				   netdev_alloc_skb(bp-&gt;dev, bp-&gt;rx_buf_size);</div><div class='ctx'> 				if (!fp-&gt;tpa_pool[i].skb) {</div><div class='hunk'>@@ -4352,8 +4337,7 @@ static void bnx2x_init_rx_rings(struct bnx2x *bp)</div><div class='ctx'> 				BNX2X_ERR("disabling TPA for queue[%d]\n", j);</div><div class='ctx'> 				/* Cleanup already allocated elements */</div><div class='ctx'> 				bnx2x_free_rx_sge_range(bp, fp, ring_prod);</div><div class='del'>-				bnx2x_free_tpa_pool(bp, fp,</div><div class='del'>-					      ETH_MAX_AGGREGATION_QUEUES_E1H);</div><div class='add'>+				bnx2x_free_tpa_pool(bp, fp, max_agg_queues);</div><div class='ctx'> 				fp-&gt;disable_tpa = 1;</div><div class='ctx'> 				ring_prod = 0;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -4363,13 +4347,13 @@ static void bnx2x_init_rx_rings(struct bnx2x *bp)</div><div class='ctx'> 		fp-&gt;rx_sge_prod = ring_prod;</div><div class='ctx'> </div><div class='ctx'> 		/* Allocate BDs and initialize BD ring */</div><div class='del'>-		fp-&gt;rx_comp_cons = fp-&gt;rx_alloc_failed = 0;</div><div class='add'>+		fp-&gt;rx_comp_cons = 0;</div><div class='ctx'> 		cqe_ring_prod = ring_prod = 0;</div><div class='ctx'> 		for (i = 0; i &lt; bp-&gt;rx_ring_size; i++) {</div><div class='ctx'> 			if (bnx2x_alloc_rx_skb(bp, fp, ring_prod) &lt; 0) {</div><div class='ctx'> 				BNX2X_ERR("was only able to allocate "</div><div class='ctx'> 					  "%d rx skbs\n", i);</div><div class='del'>-				fp-&gt;rx_alloc_failed++;</div><div class='add'>+				bp-&gt;eth_stats.rx_skb_alloc_failed++;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			ring_prod = NEXT_RX_IDX(ring_prod);</div><div class='hunk'>@@ -4477,9 +4461,10 @@ static void bnx2x_init_context(struct bnx2x *bp)</div><div class='ctx'> 		context-&gt;ustorm_st_context.common.status_block_id = sb_id;</div><div class='ctx'> 		context-&gt;ustorm_st_context.common.flags =</div><div class='ctx'> 			USTORM_ETH_ST_CONTEXT_CONFIG_ENABLE_MC_ALIGNMENT;</div><div class='del'>-		context-&gt;ustorm_st_context.common.mc_alignment_size = 64;</div><div class='add'>+		context-&gt;ustorm_st_context.common.mc_alignment_size =</div><div class='add'>+			BCM_RX_ETH_PAYLOAD_ALIGN;</div><div class='ctx'> 		context-&gt;ustorm_st_context.common.bd_buff_size =</div><div class='del'>-						bp-&gt;rx_buf_use_size;</div><div class='add'>+						bp-&gt;rx_buf_size;</div><div class='ctx'> 		context-&gt;ustorm_st_context.common.bd_page_base_hi =</div><div class='ctx'> 						U64_HI(fp-&gt;rx_desc_mapping);</div><div class='ctx'> 		context-&gt;ustorm_st_context.common.bd_page_base_lo =</div><div class='hunk'>@@ -4497,7 +4482,7 @@ static void bnx2x_init_context(struct bnx2x *bp)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		context-&gt;cstorm_st_context.sb_index_number =</div><div class='del'>-						HC_INDEX_C_ETH_TX_CQ_CONS;</div><div class='add'>+						C_SB_ETH_TX_CQ_INDEX;</div><div class='ctx'> 		context-&gt;cstorm_st_context.status_block_id = sb_id;</div><div class='ctx'> </div><div class='ctx'> 		context-&gt;xstorm_ag_context.cdu_reserved =</div><div class='hunk'>@@ -4535,7 +4520,7 @@ static void bnx2x_set_client_config(struct bnx2x *bp)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	tstorm_client.mtu = bp-&gt;dev-&gt;mtu + ETH_OVREHEAD;</div><div class='del'>-	tstorm_client.statistics_counter_id = 0;</div><div class='add'>+	tstorm_client.statistics_counter_id = BP_CL_ID(bp);</div><div class='ctx'> 	tstorm_client.config_flags =</div><div class='ctx'> 				TSTORM_ETH_CLIENT_CONFIG_STATSITICS_ENABLE;</div><div class='ctx'> #ifdef BCM_VLAN</div><div class='hunk'>@@ -4579,7 +4564,7 @@ static void bnx2x_set_storm_rx_mode(struct bnx2x *bp)</div><div class='ctx'> 	int func = BP_FUNC(bp);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	DP(NETIF_MSG_RX_STATUS, "rx mode is %d\n", mode);</div><div class='add'>+	DP(NETIF_MSG_IFUP, "rx mode %d  mask 0x%x\n", mode, mask);</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case BNX2X_RX_MODE_NONE: /* no Rx */</div><div class='hunk'>@@ -4617,13 +4602,46 @@ static void bnx2x_set_storm_rx_mode(struct bnx2x *bp)</div><div class='ctx'> 		bnx2x_set_client_config(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnx2x_init_internal(struct bnx2x *bp)</div><div class='add'>+static void bnx2x_init_internal_common(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;flags &amp; TPA_ENABLE_FLAG) {</div><div class='add'>+		struct tstorm_eth_tpa_exist tpa = {0};</div><div class='add'>+</div><div class='add'>+		tpa.tpa_exist = 1;</div><div class='add'>+</div><div class='add'>+		REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET,</div><div class='add'>+		       ((u32 *)&amp;tpa)[0]);</div><div class='add'>+		REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET + 4,</div><div class='add'>+		       ((u32 *)&amp;tpa)[1]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Zero this manually as its initialization is</div><div class='add'>+	   currently missing in the initTool */</div><div class='add'>+	for (i = 0; i &lt; (USTORM_AGG_DATA_SIZE &gt;&gt; 2); i++)</div><div class='add'>+		REG_WR(bp, BAR_USTRORM_INTMEM +</div><div class='add'>+		       USTORM_AGG_DATA_OFFSET + i * 4, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnx2x_init_internal_port(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+	int port = BP_PORT(bp);</div><div class='add'>+</div><div class='add'>+	REG_WR(bp, BAR_USTRORM_INTMEM + USTORM_HC_BTR_OFFSET(port), BNX2X_BTR);</div><div class='add'>+	REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_HC_BTR_OFFSET(port), BNX2X_BTR);</div><div class='add'>+	REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_HC_BTR_OFFSET(port), BNX2X_BTR);</div><div class='add'>+	REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_HC_BTR_OFFSET(port), BNX2X_BTR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnx2x_init_internal_func(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	struct tstorm_eth_function_common_config tstorm_config = {0};</div><div class='ctx'> 	struct stats_indication_flags stats_flags = {0};</div><div class='ctx'> 	int port = BP_PORT(bp);</div><div class='ctx'> 	int func = BP_FUNC(bp);</div><div class='ctx'> 	int i;</div><div class='add'>+	u16 max_agg_size;</div><div class='ctx'> </div><div class='ctx'> 	if (is_multi(bp)) {</div><div class='ctx'> 		tstorm_config.config_flags = MULTI_FLAGS;</div><div class='hunk'>@@ -4636,31 +4654,53 @@ static void bnx2x_init_internal(struct bnx2x *bp)</div><div class='ctx'> 	       TSTORM_FUNCTION_COMMON_CONFIG_OFFSET(func),</div><div class='ctx'> 	       (*(u32 *)&amp;tstorm_config));</div><div class='ctx'> </div><div class='del'>-/*	DP(NETIF_MSG_IFUP, "tstorm_config: 0x%08x\n",</div><div class='del'>-	   (*(u32 *)&amp;tstorm_config)); */</div><div class='del'>-</div><div class='ctx'> 	bp-&gt;rx_mode = BNX2X_RX_MODE_NONE; /* no rx until link is up */</div><div class='ctx'> 	bnx2x_set_storm_rx_mode(bp);</div><div class='ctx'> </div><div class='add'>+	/* reset xstorm per client statistics */</div><div class='add'>+	for (i = 0; i &lt; sizeof(struct xstorm_per_client_stats) / 4; i++) {</div><div class='add'>+		REG_WR(bp, BAR_XSTRORM_INTMEM +</div><div class='add'>+		       XSTORM_PER_COUNTER_ID_STATS_OFFSET(port, BP_CL_ID(bp)) +</div><div class='add'>+		       i*4, 0);</div><div class='add'>+	}</div><div class='add'>+	/* reset tstorm per client statistics */</div><div class='add'>+	for (i = 0; i &lt; sizeof(struct tstorm_per_client_stats) / 4; i++) {</div><div class='add'>+		REG_WR(bp, BAR_TSTRORM_INTMEM +</div><div class='add'>+		       TSTORM_PER_COUNTER_ID_STATS_OFFSET(port, BP_CL_ID(bp)) +</div><div class='add'>+		       i*4, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Init statistics related context */</div><div class='ctx'> 	stats_flags.collect_eth = 1;</div><div class='ctx'> </div><div class='del'>-	REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_STATS_FLAGS_OFFSET(port),</div><div class='add'>+	REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_STATS_FLAGS_OFFSET(func),</div><div class='ctx'> 	       ((u32 *)&amp;stats_flags)[0]);</div><div class='del'>-	REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_STATS_FLAGS_OFFSET(port) + 4,</div><div class='add'>+	REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_STATS_FLAGS_OFFSET(func) + 4,</div><div class='ctx'> 	       ((u32 *)&amp;stats_flags)[1]);</div><div class='ctx'> </div><div class='del'>-	REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_STATS_FLAGS_OFFSET(port),</div><div class='add'>+	REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_STATS_FLAGS_OFFSET(func),</div><div class='ctx'> 	       ((u32 *)&amp;stats_flags)[0]);</div><div class='del'>-	REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_STATS_FLAGS_OFFSET(port) + 4,</div><div class='add'>+	REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_STATS_FLAGS_OFFSET(func) + 4,</div><div class='ctx'> 	       ((u32 *)&amp;stats_flags)[1]);</div><div class='ctx'> </div><div class='del'>-	REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_STATS_FLAGS_OFFSET(port),</div><div class='add'>+	REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_STATS_FLAGS_OFFSET(func),</div><div class='ctx'> 	       ((u32 *)&amp;stats_flags)[0]);</div><div class='del'>-	REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_STATS_FLAGS_OFFSET(port) + 4,</div><div class='add'>+	REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_STATS_FLAGS_OFFSET(func) + 4,</div><div class='ctx'> 	       ((u32 *)&amp;stats_flags)[1]);</div><div class='ctx'> </div><div class='del'>-/*	DP(NETIF_MSG_IFUP, "stats_flags: 0x%08x 0x%08x\n",</div><div class='del'>-	   ((u32 *)&amp;stats_flags)[0], ((u32 *)&amp;stats_flags)[1]); */</div><div class='add'>+	REG_WR(bp, BAR_XSTRORM_INTMEM +</div><div class='add'>+	       XSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func),</div><div class='add'>+	       U64_LO(bnx2x_sp_mapping(bp, fw_stats)));</div><div class='add'>+	REG_WR(bp, BAR_XSTRORM_INTMEM +</div><div class='add'>+	       XSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func) + 4,</div><div class='add'>+	       U64_HI(bnx2x_sp_mapping(bp, fw_stats)));</div><div class='add'>+</div><div class='add'>+	REG_WR(bp, BAR_TSTRORM_INTMEM +</div><div class='add'>+	       TSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func),</div><div class='add'>+	       U64_LO(bnx2x_sp_mapping(bp, fw_stats)));</div><div class='add'>+	REG_WR(bp, BAR_TSTRORM_INTMEM +</div><div class='add'>+	       TSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func) + 4,</div><div class='add'>+	       U64_HI(bnx2x_sp_mapping(bp, fw_stats)));</div><div class='ctx'> </div><div class='ctx'> 	if (CHIP_IS_E1H(bp)) {</div><div class='ctx'> 		REG_WR8(bp, BAR_XSTRORM_INTMEM + XSTORM_FUNCTION_MODE_OFFSET,</div><div class='hunk'>@@ -4676,15 +4716,12 @@ static void bnx2x_init_internal(struct bnx2x *bp)</div><div class='ctx'> 			 bp-&gt;e1hov);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Zero this manualy as its initialization is</div><div class='del'>-	   currently missing in the initTool */</div><div class='del'>-	for (i = 0; i &lt; USTORM_AGG_DATA_SIZE &gt;&gt; 2; i++)</div><div class='del'>-		REG_WR(bp, BAR_USTRORM_INTMEM +</div><div class='del'>-		       USTORM_AGG_DATA_OFFSET + 4*i, 0);</div><div class='del'>-</div><div class='add'>+	/* Init CQ ring mapping and aggregation size */</div><div class='add'>+	max_agg_size = min((u32)(bp-&gt;rx_buf_size +</div><div class='add'>+				 8*BCM_PAGE_SIZE*PAGES_PER_SGE),</div><div class='add'>+			   (u32)0xffff);</div><div class='ctx'> 	for_each_queue(bp, i) {</div><div class='ctx'> 		struct bnx2x_fastpath *fp = &amp;bp-&gt;fp[i];</div><div class='del'>-		u16 max_agg_size;</div><div class='ctx'> </div><div class='ctx'> 		REG_WR(bp, BAR_USTRORM_INTMEM +</div><div class='ctx'> 		       USTORM_CQE_PAGE_BASE_OFFSET(port, FP_CL_ID(fp)),</div><div class='hunk'>@@ -4693,16 +4730,34 @@ static void bnx2x_init_internal(struct bnx2x *bp)</div><div class='ctx'> 		       USTORM_CQE_PAGE_BASE_OFFSET(port, FP_CL_ID(fp)) + 4,</div><div class='ctx'> 		       U64_HI(fp-&gt;rx_comp_mapping));</div><div class='ctx'> </div><div class='del'>-		max_agg_size = min((u32)(bp-&gt;rx_buf_use_size +</div><div class='del'>-					 8*BCM_PAGE_SIZE*PAGES_PER_SGE),</div><div class='del'>-				   (u32)0xffff);</div><div class='ctx'> 		REG_WR16(bp, BAR_USTRORM_INTMEM +</div><div class='ctx'> 			 USTORM_MAX_AGG_SIZE_OFFSET(port, FP_CL_ID(fp)),</div><div class='ctx'> 			 max_agg_size);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnx2x_nic_init(struct bnx2x *bp)</div><div class='add'>+static void bnx2x_init_internal(struct bnx2x *bp, u32 load_code)</div><div class='add'>+{</div><div class='add'>+	switch (load_code) {</div><div class='add'>+	case FW_MSG_CODE_DRV_LOAD_COMMON:</div><div class='add'>+		bnx2x_init_internal_common(bp);</div><div class='add'>+		/* no break */</div><div class='add'>+</div><div class='add'>+	case FW_MSG_CODE_DRV_LOAD_PORT:</div><div class='add'>+		bnx2x_init_internal_port(bp);</div><div class='add'>+		/* no break */</div><div class='add'>+</div><div class='add'>+	case FW_MSG_CODE_DRV_LOAD_FUNCTION:</div><div class='add'>+		bnx2x_init_internal_func(bp);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		BNX2X_ERR("Unknown load_code (0x%x) from MCP\n", load_code);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnx2x_nic_init(struct bnx2x *bp, u32 load_code)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -4717,19 +4772,20 @@ static void bnx2x_nic_init(struct bnx2x *bp)</div><div class='ctx'> 		DP(NETIF_MSG_IFUP,</div><div class='ctx'> 		   "bnx2x_init_sb(%p,%p) index %d  cl_id %d  sb %d\n",</div><div class='ctx'> 		   bp, fp-&gt;status_blk, i, FP_CL_ID(fp), FP_SB_ID(fp));</div><div class='del'>-		bnx2x_init_sb(bp, FP_SB_ID(fp), fp-&gt;status_blk,</div><div class='del'>-			      fp-&gt;status_blk_mapping);</div><div class='add'>+		bnx2x_init_sb(bp, fp-&gt;status_blk, fp-&gt;status_blk_mapping,</div><div class='add'>+			      FP_SB_ID(fp));</div><div class='add'>+		bnx2x_update_fpsb_idx(fp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bnx2x_init_def_sb(bp, bp-&gt;def_status_blk,</div><div class='del'>-			  bp-&gt;def_status_blk_mapping, DEF_SB_ID);</div><div class='add'>+	bnx2x_init_def_sb(bp, bp-&gt;def_status_blk, bp-&gt;def_status_blk_mapping,</div><div class='add'>+			  DEF_SB_ID);</div><div class='add'>+	bnx2x_update_dsb_idx(bp);</div><div class='ctx'> 	bnx2x_update_coalesce(bp);</div><div class='ctx'> 	bnx2x_init_rx_rings(bp);</div><div class='ctx'> 	bnx2x_init_tx_ring(bp);</div><div class='ctx'> 	bnx2x_init_sp_ring(bp);</div><div class='ctx'> 	bnx2x_init_context(bp);</div><div class='del'>-	bnx2x_init_internal(bp);</div><div class='del'>-	bnx2x_storm_stats_init(bp);</div><div class='add'>+	bnx2x_init_internal(bp, load_code);</div><div class='ctx'> 	bnx2x_init_ind_table(bp);</div><div class='ctx'> 	bnx2x_int_enable(bp);</div><div class='ctx'> }</div><div class='hunk'>@@ -4878,7 +4934,7 @@ static int bnx2x_int_mem_test(struct bnx2x *bp)</div><div class='ctx'> 	REG_WR(bp, TSDM_REG_ENABLE_IN1, 0x0);</div><div class='ctx'> 	REG_WR(bp, TCM_REG_PRS_IFEN, 0x0);</div><div class='ctx'> 	REG_WR(bp, CFC_REG_DEBUG0, 0x1);</div><div class='del'>-	NIG_WR(NIG_REG_PRS_REQ_IN_EN, 0x0);</div><div class='add'>+	REG_WR(bp, NIG_REG_PRS_REQ_IN_EN, 0x0);</div><div class='ctx'> </div><div class='ctx'> 	/*  Write 0 to parser credits for CFC search request */</div><div class='ctx'> 	REG_WR(bp, PRS_REG_CFC_SEARCH_INITIAL_CREDIT, 0x0);</div><div class='hunk'>@@ -4933,7 +4989,7 @@ static int bnx2x_int_mem_test(struct bnx2x *bp)</div><div class='ctx'> 	REG_WR(bp, TSDM_REG_ENABLE_IN1, 0x0);</div><div class='ctx'> 	REG_WR(bp, TCM_REG_PRS_IFEN, 0x0);</div><div class='ctx'> 	REG_WR(bp, CFC_REG_DEBUG0, 0x1);</div><div class='del'>-	NIG_WR(NIG_REG_PRS_REQ_IN_EN, 0x0);</div><div class='add'>+	REG_WR(bp, NIG_REG_PRS_REQ_IN_EN, 0x0);</div><div class='ctx'> </div><div class='ctx'> 	/* Write 0 to parser credits for CFC search request */</div><div class='ctx'> 	REG_WR(bp, PRS_REG_CFC_SEARCH_INITIAL_CREDIT, 0x0);</div><div class='hunk'>@@ -5000,7 +5056,7 @@ static int bnx2x_int_mem_test(struct bnx2x *bp)</div><div class='ctx'> 	REG_WR(bp, TSDM_REG_ENABLE_IN1, 0x7fffffff);</div><div class='ctx'> 	REG_WR(bp, TCM_REG_PRS_IFEN, 0x1);</div><div class='ctx'> 	REG_WR(bp, CFC_REG_DEBUG0, 0x0);</div><div class='del'>-	NIG_WR(NIG_REG_PRS_REQ_IN_EN, 0x1);</div><div class='add'>+	REG_WR(bp, NIG_REG_PRS_REQ_IN_EN, 0x1);</div><div class='ctx'> </div><div class='ctx'> 	DP(NETIF_MSG_HW, "done\n");</div><div class='ctx'> </div><div class='hunk'>@@ -5089,11 +5145,6 @@ static int bnx2x_init_common(struct bnx2x *bp)</div><div class='ctx'> 	REG_WR(bp, PXP2_REG_RD_CDURD_SWAP_MODE, 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef BCM_ISCSI</div><div class='del'>-		/* set NIC mode */</div><div class='del'>-		REG_WR(bp, PRS_REG_NIC_MODE, 1);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	REG_WR(bp, PXP2_REG_RQ_CDU_P_SIZE, 2);</div><div class='ctx'> #ifdef BCM_ISCSI</div><div class='ctx'> 	REG_WR(bp, PXP2_REG_RQ_TM_P_SIZE, 5);</div><div class='hunk'>@@ -5163,6 +5214,8 @@ static int bnx2x_init_common(struct bnx2x *bp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_init_block(bp, PRS_COMMON_START, PRS_COMMON_END);</div><div class='add'>+	/* set NIC mode */</div><div class='add'>+	REG_WR(bp, PRS_REG_NIC_MODE, 1);</div><div class='ctx'> 	if (CHIP_IS_E1H(bp))</div><div class='ctx'> 		REG_WR(bp, PRS_REG_E1HOV_MODE, IS_E1HMF(bp));</div><div class='ctx'> </div><div class='hunk'>@@ -5296,6 +5349,7 @@ static int bnx2x_init_common(struct bnx2x *bp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (bp-&gt;common.board &amp; SHARED_HW_CFG_BOARD_TYPE_MASK) {</div><div class='add'>+	case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1021G:</div><div class='ctx'> 	case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G:</div><div class='ctx'> 		/* Fan failure is indicated by SPIO 5 */</div><div class='ctx'> 		bnx2x_set_spio(bp, MISC_REGISTERS_SPIO_5,</div><div class='hunk'>@@ -5322,16 +5376,12 @@ static int bnx2x_init_common(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 	enable_blocks_attention(bp);</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; TPA_ENABLE_FLAG) {</div><div class='del'>-		struct tstorm_eth_tpa_exist tmp = {0};</div><div class='del'>-</div><div class='del'>-		tmp.tpa_exist = 1;</div><div class='del'>-</div><div class='del'>-		REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET,</div><div class='del'>-		       ((u32 *)&amp;tmp)[0]);</div><div class='del'>-		REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET + 4,</div><div class='del'>-		       ((u32 *)&amp;tmp)[1]);</div><div class='del'>-	}</div><div class='add'>+	if (!BP_NOMCP(bp)) {</div><div class='add'>+		bnx2x_acquire_phy_lock(bp);</div><div class='add'>+		bnx2x_common_init_phy(bp, bp-&gt;common.shmem_base);</div><div class='add'>+		bnx2x_release_phy_lock(bp);</div><div class='add'>+	} else</div><div class='add'>+		BNX2X_ERR("Bootcode is missing - can not initialize link\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -5483,6 +5533,7 @@ static int bnx2x_init_port(struct bnx2x *bp)</div><div class='ctx'> 	/* Port DMAE comes here */</div><div class='ctx'> </div><div class='ctx'> 	switch (bp-&gt;common.board &amp; SHARED_HW_CFG_BOARD_TYPE_MASK) {</div><div class='add'>+	case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1021G:</div><div class='ctx'> 	case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G:</div><div class='ctx'> 		/* add SPIO 5 to group 0 */</div><div class='ctx'> 		val = REG_RD(bp, MISC_REG_AEU_ENABLE1_FUNC_0_OUT_0);</div><div class='hunk'>@@ -5638,18 +5689,23 @@ static u32 bnx2x_fw_command(struct bnx2x *bp, u32 command)</div><div class='ctx'> 	int func = BP_FUNC(bp);</div><div class='ctx'> 	u32 seq = ++bp-&gt;fw_seq;</div><div class='ctx'> 	u32 rc = 0;</div><div class='add'>+	u32 cnt = 1;</div><div class='add'>+	u8 delay = CHIP_REV_IS_SLOW(bp) ? 100 : 10;</div><div class='ctx'> </div><div class='ctx'> 	SHMEM_WR(bp, func_mb[func].drv_mb_header, (command | seq));</div><div class='ctx'> 	DP(BNX2X_MSG_MCP, "wrote command (%x) to FW MB\n", (command | seq));</div><div class='ctx'> </div><div class='del'>-	/* let the FW do it's magic ... */</div><div class='del'>-	msleep(100); /* TBD */</div><div class='add'>+	do {</div><div class='add'>+		/* let the FW do it's magic ... */</div><div class='add'>+		msleep(delay);</div><div class='ctx'> </div><div class='del'>-	if (CHIP_REV_IS_SLOW(bp))</div><div class='del'>-		msleep(900);</div><div class='add'>+		rc = SHMEM_RD(bp, func_mb[func].fw_mb_header);</div><div class='ctx'> </div><div class='del'>-	rc = SHMEM_RD(bp, func_mb[func].fw_mb_header);</div><div class='del'>-	DP(BNX2X_MSG_MCP, "read (%x) seq is (%x) from FW MB\n", rc, seq);</div><div class='add'>+		/* Give the FW up to 2 second (200*10ms) */</div><div class='add'>+	} while ((seq != (rc &amp; FW_MSG_SEQ_NUMBER_MASK)) &amp;&amp; (cnt++ &lt; 200));</div><div class='add'>+</div><div class='add'>+	DP(BNX2X_MSG_MCP, "[after %d ms] read (%x) seq is (%x) from FW MB\n",</div><div class='add'>+	   cnt*delay, rc, seq);</div><div class='ctx'> </div><div class='ctx'> 	/* is this a reply to our command? */</div><div class='ctx'> 	if (seq == (rc &amp; FW_MSG_SEQ_NUMBER_MASK)) {</div><div class='hunk'>@@ -5713,6 +5769,7 @@ static void bnx2x_free_mem(struct bnx2x *bp)</div><div class='ctx'> 			       NUM_RCQ_BD);</div><div class='ctx'> </div><div class='ctx'> 		/* SGE ring */</div><div class='add'>+		BNX2X_FREE(bnx2x_fp(bp, i, rx_page_ring));</div><div class='ctx'> 		BNX2X_PCI_FREE(bnx2x_fp(bp, i, rx_sge_ring),</div><div class='ctx'> 			       bnx2x_fp(bp, i, rx_sge_mapping),</div><div class='ctx'> 			       BCM_PAGE_SIZE * NUM_RX_SGE_PAGES);</div><div class='hunk'>@@ -5883,14 +5940,15 @@ static void bnx2x_free_rx_skbs(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 			pci_unmap_single(bp-&gt;pdev,</div><div class='ctx'> 					 pci_unmap_addr(rx_buf, mapping),</div><div class='del'>-					 bp-&gt;rx_buf_use_size,</div><div class='add'>+					 bp-&gt;rx_buf_size,</div><div class='ctx'> 					 PCI_DMA_FROMDEVICE);</div><div class='ctx'> </div><div class='ctx'> 			rx_buf-&gt;skb = NULL;</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!fp-&gt;disable_tpa)</div><div class='del'>-			bnx2x_free_tpa_pool(bp, fp,</div><div class='add'>+			bnx2x_free_tpa_pool(bp, fp, CHIP_IS_E1(bp) ?</div><div class='add'>+					    ETH_MAX_AGGREGATION_QUEUES_E1 :</div><div class='ctx'> 					    ETH_MAX_AGGREGATION_QUEUES_E1H);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -5976,8 +6034,8 @@ static int bnx2x_req_msix_irqs(struct bnx2x *bp)</div><div class='ctx'> 				 bnx2x_msix_fp_int, 0,</div><div class='ctx'> 				 bp-&gt;dev-&gt;name, &amp;bp-&gt;fp[i]);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			BNX2X_ERR("request fp #%d irq failed  rc %d\n",</div><div class='del'>-				  i + offset, rc);</div><div class='add'>+			BNX2X_ERR("request fp #%d irq failed  rc -%d\n",</div><div class='add'>+				  i + offset, -rc);</div><div class='ctx'> 			bnx2x_free_msix_irqs(bp);</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -6000,11 +6058,49 @@ static int bnx2x_req_irq(struct bnx2x *bp)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnx2x_napi_enable(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_queue(bp, i)</div><div class='add'>+		napi_enable(&amp;bnx2x_fp(bp, i, napi));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnx2x_napi_disable(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_queue(bp, i)</div><div class='add'>+		napi_disable(&amp;bnx2x_fp(bp, i, napi));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnx2x_netif_start(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+	if (atomic_dec_and_test(&amp;bp-&gt;intr_sem)) {</div><div class='add'>+		if (netif_running(bp-&gt;dev)) {</div><div class='add'>+			if (bp-&gt;state == BNX2X_STATE_OPEN)</div><div class='add'>+				netif_wake_queue(bp-&gt;dev);</div><div class='add'>+			bnx2x_napi_enable(bp);</div><div class='add'>+			bnx2x_int_enable(bp);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnx2x_netif_stop(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+	bnx2x_int_disable_sync(bp);</div><div class='add'>+	if (netif_running(bp-&gt;dev)) {</div><div class='add'>+		bnx2x_napi_disable(bp);</div><div class='add'>+		netif_tx_disable(bp-&gt;dev);</div><div class='add'>+		bp-&gt;dev-&gt;trans_start = jiffies;	/* prevent tx timeout */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Init service functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void bnx2x_set_mac_addr_e1(struct bnx2x *bp)</div><div class='add'>+static void bnx2x_set_mac_addr_e1(struct bnx2x *bp, int set)</div><div class='ctx'> {</div><div class='ctx'> 	struct mac_configuration_cmd *config = bnx2x_sp(bp, mac_config);</div><div class='ctx'> 	int port = BP_PORT(bp);</div><div class='hunk'>@@ -6026,11 +6122,15 @@ static void bnx2x_set_mac_addr_e1(struct bnx2x *bp)</div><div class='ctx'> 	config-&gt;config_table[0].cam_entry.lsb_mac_addr =</div><div class='ctx'> 					swab16(*(u16 *)&amp;bp-&gt;dev-&gt;dev_addr[4]);</div><div class='ctx'> 	config-&gt;config_table[0].cam_entry.flags = cpu_to_le16(port);</div><div class='del'>-	config-&gt;config_table[0].target_table_entry.flags = 0;</div><div class='add'>+	if (set)</div><div class='add'>+		config-&gt;config_table[0].target_table_entry.flags = 0;</div><div class='add'>+	else</div><div class='add'>+		CAM_INVALIDATE(config-&gt;config_table[0]);</div><div class='ctx'> 	config-&gt;config_table[0].target_table_entry.client_id = 0;</div><div class='ctx'> 	config-&gt;config_table[0].target_table_entry.vlan_id = 0;</div><div class='ctx'> </div><div class='del'>-	DP(NETIF_MSG_IFUP, "setting MAC (%04x:%04x:%04x)\n",</div><div class='add'>+	DP(NETIF_MSG_IFUP, "%s MAC (%04x:%04x:%04x)\n",</div><div class='add'>+	   (set ? "setting" : "clearing"),</div><div class='ctx'> 	   config-&gt;config_table[0].cam_entry.msb_mac_addr,</div><div class='ctx'> 	   config-&gt;config_table[0].cam_entry.middle_mac_addr,</div><div class='ctx'> 	   config-&gt;config_table[0].cam_entry.lsb_mac_addr);</div><div class='hunk'>@@ -6040,8 +6140,11 @@ static void bnx2x_set_mac_addr_e1(struct bnx2x *bp)</div><div class='ctx'> 	config-&gt;config_table[1].cam_entry.middle_mac_addr = 0xffff;</div><div class='ctx'> 	config-&gt;config_table[1].cam_entry.lsb_mac_addr = 0xffff;</div><div class='ctx'> 	config-&gt;config_table[1].cam_entry.flags = cpu_to_le16(port);</div><div class='del'>-	config-&gt;config_table[1].target_table_entry.flags =</div><div class='add'>+	if (set)</div><div class='add'>+		config-&gt;config_table[1].target_table_entry.flags =</div><div class='ctx'> 				TSTORM_CAM_TARGET_TABLE_ENTRY_BROADCAST;</div><div class='add'>+	else</div><div class='add'>+		CAM_INVALIDATE(config-&gt;config_table[1]);</div><div class='ctx'> 	config-&gt;config_table[1].target_table_entry.client_id = 0;</div><div class='ctx'> 	config-&gt;config_table[1].target_table_entry.vlan_id = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -6050,12 +6153,12 @@ static void bnx2x_set_mac_addr_e1(struct bnx2x *bp)</div><div class='ctx'> 		      U64_LO(bnx2x_sp_mapping(bp, mac_config)), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnx2x_set_mac_addr_e1h(struct bnx2x *bp)</div><div class='add'>+static void bnx2x_set_mac_addr_e1h(struct bnx2x *bp, int set)</div><div class='ctx'> {</div><div class='ctx'> 	struct mac_configuration_cmd_e1h *config =</div><div class='ctx'> 		(struct mac_configuration_cmd_e1h *)bnx2x_sp(bp, mac_config);</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;state != BNX2X_STATE_OPEN) {</div><div class='add'>+	if (set &amp;&amp; (bp-&gt;state != BNX2X_STATE_OPEN)) {</div><div class='ctx'> 		DP(NETIF_MSG_IFUP, "state is %x, returning\n", bp-&gt;state);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6079,9 +6182,14 @@ static void bnx2x_set_mac_addr_e1h(struct bnx2x *bp)</div><div class='ctx'> 	config-&gt;config_table[0].client_id = BP_L_ID(bp);</div><div class='ctx'> 	config-&gt;config_table[0].vlan_id = 0;</div><div class='ctx'> 	config-&gt;config_table[0].e1hov_id = cpu_to_le16(bp-&gt;e1hov);</div><div class='del'>-	config-&gt;config_table[0].flags = BP_PORT(bp);</div><div class='add'>+	if (set)</div><div class='add'>+		config-&gt;config_table[0].flags = BP_PORT(bp);</div><div class='add'>+	else</div><div class='add'>+		config-&gt;config_table[0].flags =</div><div class='add'>+				MAC_CONFIGURATION_ENTRY_E1H_ACTION_TYPE;</div><div class='ctx'> </div><div class='del'>-	DP(NETIF_MSG_IFUP, "setting MAC (%04x:%04x:%04x)  E1HOV %d  CLID %d\n",</div><div class='add'>+	DP(NETIF_MSG_IFUP, "%s MAC (%04x:%04x:%04x)  E1HOV %d  CLID %d\n",</div><div class='add'>+	   (set ? "setting" : "clearing"),</div><div class='ctx'> 	   config-&gt;config_table[0].msb_mac_addr,</div><div class='ctx'> 	   config-&gt;config_table[0].middle_mac_addr,</div><div class='ctx'> 	   config-&gt;config_table[0].lsb_mac_addr, bp-&gt;e1hov, BP_L_ID(bp));</div><div class='hunk'>@@ -6106,13 +6214,13 @@ static int bnx2x_wait_ramrod(struct bnx2x *bp, int state, int idx,</div><div class='ctx'> 			bnx2x_rx_int(bp-&gt;fp, 10);</div><div class='ctx'> 			/* if index is different from 0</div><div class='ctx'> 			 * the reply for some commands will</div><div class='del'>-			 * be on the none default queue</div><div class='add'>+			 * be on the non default queue</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (idx)</div><div class='ctx'> 				bnx2x_rx_int(&amp;bp-&gt;fp[idx], 10);</div><div class='ctx'> 		}</div><div class='del'>-		mb(); /* state is changed by bnx2x_sp_event() */</div><div class='ctx'> </div><div class='add'>+		mb(); /* state is changed by bnx2x_sp_event() */</div><div class='ctx'> 		if (*state_p == state)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -6167,7 +6275,6 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)</div><div class='ctx'> {</div><div class='ctx'> 	u32 load_code;</div><div class='ctx'> 	int i, rc;</div><div class='del'>-</div><div class='ctx'> #ifdef BNX2X_STOP_ON_ERROR</div><div class='ctx'> 	if (unlikely(bp-&gt;panic))</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -6183,22 +6290,24 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)</div><div class='ctx'> 	if (!BP_NOMCP(bp)) {</div><div class='ctx'> 		load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_REQ);</div><div class='ctx'> 		if (!load_code) {</div><div class='del'>-			BNX2X_ERR("MCP response failure, unloading\n");</div><div class='add'>+			BNX2X_ERR("MCP response failure, aborting\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (load_code == FW_MSG_CODE_DRV_LOAD_REFUSED)</div><div class='ctx'> 			return -EBUSY; /* other port in diagnostic mode */</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='add'>+		int port = BP_PORT(bp);</div><div class='add'>+</div><div class='ctx'> 		DP(NETIF_MSG_IFUP, "NO MCP load counts before us %d, %d, %d\n",</div><div class='ctx'> 		   load_count[0], load_count[1], load_count[2]);</div><div class='ctx'> 		load_count[0]++;</div><div class='del'>-		load_count[1 + BP_PORT(bp)]++;</div><div class='add'>+		load_count[1 + port]++;</div><div class='ctx'> 		DP(NETIF_MSG_IFUP, "NO MCP new load counts       %d, %d, %d\n",</div><div class='ctx'> 		   load_count[0], load_count[1], load_count[2]);</div><div class='ctx'> 		if (load_count[0] == 1)</div><div class='ctx'> 			load_code = FW_MSG_CODE_DRV_LOAD_COMMON;</div><div class='del'>-		else if (load_count[1 + BP_PORT(bp)] == 1)</div><div class='add'>+		else if (load_count[1 + port] == 1)</div><div class='ctx'> 			load_code = FW_MSG_CODE_DRV_LOAD_PORT;</div><div class='ctx'> 		else</div><div class='ctx'> 			load_code = FW_MSG_CODE_DRV_LOAD_FUNCTION;</div><div class='hunk'>@@ -6247,9 +6356,6 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)</div><div class='ctx'> 		bnx2x_fp(bp, i, disable_tpa) =</div><div class='ctx'> 					((bp-&gt;flags &amp; TPA_ENABLE_FLAG) == 0);</div><div class='ctx'> </div><div class='del'>-	/* Disable interrupt handling until HW is initialized */</div><div class='del'>-	atomic_set(&amp;bp-&gt;intr_sem, 1);</div><div class='del'>-</div><div class='ctx'> 	if (bp-&gt;flags &amp; USING_MSIX_FLAG) {</div><div class='ctx'> 		rc = bnx2x_req_msix_irqs(bp);</div><div class='ctx'> 		if (rc) {</div><div class='hunk'>@@ -6273,22 +6379,19 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)</div><div class='ctx'> 	rc = bnx2x_init_hw(bp, load_code);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		BNX2X_ERR("HW init failed, aborting\n");</div><div class='del'>-		goto load_error;</div><div class='add'>+		goto load_int_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Enable interrupt handling */</div><div class='del'>-	atomic_set(&amp;bp-&gt;intr_sem, 0);</div><div class='del'>-</div><div class='ctx'> 	/* Setup NIC internals and enable interrupts */</div><div class='del'>-	bnx2x_nic_init(bp);</div><div class='add'>+	bnx2x_nic_init(bp, load_code);</div><div class='ctx'> </div><div class='ctx'> 	/* Send LOAD_DONE command to MCP */</div><div class='ctx'> 	if (!BP_NOMCP(bp)) {</div><div class='ctx'> 		load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_DONE);</div><div class='ctx'> 		if (!load_code) {</div><div class='del'>-			BNX2X_ERR("MCP response failure, unloading\n");</div><div class='add'>+			BNX2X_ERR("MCP response failure, aborting\n");</div><div class='ctx'> 			rc = -EBUSY;</div><div class='del'>-			goto load_int_disable;</div><div class='add'>+			goto load_rings_free;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6298,15 +6401,15 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)</div><div class='ctx'> </div><div class='ctx'> 	/* Enable Rx interrupt handling before sending the ramrod</div><div class='ctx'> 	   as it's completed on Rx FP queue */</div><div class='del'>-	for_each_queue(bp, i)</div><div class='del'>-		napi_enable(&amp;bnx2x_fp(bp, i, napi));</div><div class='add'>+	bnx2x_napi_enable(bp);</div><div class='add'>+</div><div class='add'>+	/* Enable interrupt handling */</div><div class='add'>+	atomic_set(&amp;bp-&gt;intr_sem, 0);</div><div class='ctx'> </div><div class='ctx'> 	rc = bnx2x_setup_leading(bp);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-#ifdef BNX2X_STOP_ON_ERROR</div><div class='del'>-		bp-&gt;panic = 1;</div><div class='del'>-#endif</div><div class='del'>-		goto load_stop_netif;</div><div class='add'>+		BNX2X_ERR("Setup leading failed!\n");</div><div class='add'>+		goto load_netif_stop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (CHIP_IS_E1H(bp))</div><div class='hunk'>@@ -6319,13 +6422,13 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)</div><div class='ctx'> 		for_each_nondefault_queue(bp, i) {</div><div class='ctx'> 			rc = bnx2x_setup_multi(bp, i);</div><div class='ctx'> 			if (rc)</div><div class='del'>-				goto load_stop_netif;</div><div class='add'>+				goto load_netif_stop;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	if (CHIP_IS_E1(bp))</div><div class='del'>-		bnx2x_set_mac_addr_e1(bp);</div><div class='add'>+		bnx2x_set_mac_addr_e1(bp, 1);</div><div class='ctx'> 	else</div><div class='del'>-		bnx2x_set_mac_addr_e1h(bp);</div><div class='add'>+		bnx2x_set_mac_addr_e1h(bp, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;port.pmf)</div><div class='ctx'> 		bnx2x_initial_phy_init(bp);</div><div class='hunk'>@@ -6339,7 +6442,6 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case LOAD_OPEN:</div><div class='del'>-		/* IRQ is only requested from bnx2x_open */</div><div class='ctx'> 		netif_start_queue(bp-&gt;dev);</div><div class='ctx'> 		bnx2x_set_rx_mode(bp-&gt;dev);</div><div class='ctx'> 		if (bp-&gt;flags &amp; USING_MSIX_FLAG)</div><div class='hunk'>@@ -6365,21 +6467,17 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-load_stop_netif:</div><div class='add'>+load_netif_stop:</div><div class='add'>+	bnx2x_napi_disable(bp);</div><div class='add'>+load_rings_free:</div><div class='add'>+	/* Free SKBs, SGEs, TPA pool and driver internals */</div><div class='add'>+	bnx2x_free_skbs(bp);</div><div class='ctx'> 	for_each_queue(bp, i)</div><div class='del'>-		napi_disable(&amp;bnx2x_fp(bp, i, napi));</div><div class='del'>-</div><div class='add'>+		bnx2x_free_rx_sge_range(bp, bp-&gt;fp + i, NUM_RX_SGE);</div><div class='ctx'> load_int_disable:</div><div class='ctx'> 	bnx2x_int_disable_sync(bp);</div><div class='del'>-</div><div class='ctx'> 	/* Release IRQs */</div><div class='ctx'> 	bnx2x_free_irq(bp);</div><div class='del'>-</div><div class='del'>-	/* Free SKBs, SGEs, TPA pool and driver internals */</div><div class='del'>-	bnx2x_free_skbs(bp);</div><div class='del'>-	for_each_queue(bp, i)</div><div class='del'>-		bnx2x_free_rx_sge_range(bp, bp-&gt;fp + i,</div><div class='del'>-					RX_SGE_CNT*NUM_RX_SGE_PAGES);</div><div class='ctx'> load_error:</div><div class='ctx'> 	bnx2x_free_mem(bp);</div><div class='ctx'> </div><div class='hunk'>@@ -6394,7 +6492,7 @@ static int bnx2x_stop_multi(struct bnx2x *bp, int index)</div><div class='ctx'> </div><div class='ctx'> 	/* halt the connection */</div><div class='ctx'> 	bp-&gt;fp[index].state = BNX2X_FP_STATE_HALTING;</div><div class='del'>-	bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_HALT, index, 0, 0, 0);</div><div class='add'>+	bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_HALT, index, 0, index, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for completion */</div><div class='ctx'> 	rc = bnx2x_wait_ramrod(bp, BNX2X_FP_STATE_HALTED, index,</div><div class='hunk'>@@ -6411,7 +6509,7 @@ static int bnx2x_stop_multi(struct bnx2x *bp, int index)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnx2x_stop_leading(struct bnx2x *bp)</div><div class='add'>+static int bnx2x_stop_leading(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u16 dsb_sp_prod_idx;</div><div class='ctx'> 	/* if the other port is handling traffic,</div><div class='hunk'>@@ -6429,7 +6527,7 @@ static void bnx2x_stop_leading(struct bnx2x *bp)</div><div class='ctx'> 	rc = bnx2x_wait_ramrod(bp, BNX2X_FP_STATE_HALTED, 0,</div><div class='ctx'> 			       &amp;(bp-&gt;fp[0].state), 1);</div><div class='ctx'> 	if (rc) /* timeout */</div><div class='del'>-		return;</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	dsb_sp_prod_idx = *bp-&gt;dsb_sp_prod;</div><div class='ctx'> </div><div class='hunk'>@@ -6441,20 +6539,24 @@ static void bnx2x_stop_leading(struct bnx2x *bp)</div><div class='ctx'> 	   so there is not much to do if this times out</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (dsb_sp_prod_idx == *bp-&gt;dsb_sp_prod) {</div><div class='del'>-		msleep(1);</div><div class='ctx'> 		if (!cnt) {</div><div class='ctx'> 			DP(NETIF_MSG_IFDOWN, "timeout waiting for port del "</div><div class='ctx'> 			   "dsb_sp_prod 0x%x != dsb_sp_prod_idx 0x%x\n",</div><div class='ctx'> 			   *bp-&gt;dsb_sp_prod, dsb_sp_prod_idx);</div><div class='ctx'> #ifdef BNX2X_STOP_ON_ERROR</div><div class='ctx'> 			bnx2x_panic();</div><div class='add'>+#else</div><div class='add'>+			rc = -EBUSY;</div><div class='ctx'> #endif</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		cnt--;</div><div class='add'>+		msleep(1);</div><div class='ctx'> 	}</div><div class='ctx'> 	bp-&gt;state = BNX2X_STATE_CLOSING_WAIT4_UNLOAD;</div><div class='ctx'> 	bp-&gt;fp[0].state = BNX2X_FP_STATE_CLOSED;</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_reset_func(struct bnx2x *bp)</div><div class='hunk'>@@ -6496,7 +6598,7 @@ static void bnx2x_reset_port(struct bnx2x *bp)</div><div class='ctx'> 	val = REG_RD(bp, BRB1_REG_PORT_NUM_OCC_BLOCKS_0 + port*4);</div><div class='ctx'> 	if (val)</div><div class='ctx'> 		DP(NETIF_MSG_IFDOWN,</div><div class='del'>-		   "BRB1 is not empty  %d blooks are occupied\n", val);</div><div class='add'>+		   "BRB1 is not empty  %d blocks are occupied\n", val);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: Close Doorbell port? */</div><div class='ctx'> }</div><div class='hunk'>@@ -6536,43 +6638,35 @@ static void bnx2x_reset_chip(struct bnx2x *bp, u32 reset_code)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* msut be called with rtnl_lock */</div><div class='add'>+/* must be called with rtnl_lock */</div><div class='ctx'> static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)</div><div class='ctx'> {</div><div class='add'>+	int port = BP_PORT(bp);</div><div class='ctx'> 	u32 reset_code = 0;</div><div class='del'>-	int i, cnt;</div><div class='add'>+	int i, cnt, rc;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;state = BNX2X_STATE_CLOSING_WAIT4_HALT;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;rx_mode = BNX2X_RX_MODE_NONE;</div><div class='ctx'> 	bnx2x_set_storm_rx_mode(bp);</div><div class='ctx'> </div><div class='del'>-	if (netif_running(bp-&gt;dev)) {</div><div class='del'>-		netif_tx_disable(bp-&gt;dev);</div><div class='del'>-		bp-&gt;dev-&gt;trans_start = jiffies;	/* prevent tx timeout */</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	bnx2x_netif_stop(bp);</div><div class='add'>+	if (!netif_running(bp-&gt;dev))</div><div class='add'>+		bnx2x_napi_disable(bp);</div><div class='ctx'> 	del_timer_sync(&amp;bp-&gt;timer);</div><div class='ctx'> 	SHMEM_WR(bp, func_mb[BP_FUNC(bp)].drv_pulse_mb,</div><div class='ctx'> 		 (DRV_PULSE_ALWAYS_ALIVE | bp-&gt;fw_drv_pulse_wr_seq));</div><div class='ctx'> 	bnx2x_stats_handle(bp, STATS_EVENT_STOP);</div><div class='ctx'> </div><div class='del'>-	/* Wait until all fast path tasks complete */</div><div class='add'>+	/* Wait until tx fast path tasks complete */</div><div class='ctx'> 	for_each_queue(bp, i) {</div><div class='ctx'> 		struct bnx2x_fastpath *fp = &amp;bp-&gt;fp[i];</div><div class='ctx'> </div><div class='del'>-#ifdef BNX2X_STOP_ON_ERROR</div><div class='del'>-#ifdef __powerpc64__</div><div class='del'>-		DP(NETIF_MSG_RX_STATUS, "fp-&gt;tpa_queue_used = 0x%lx\n",</div><div class='del'>-#else</div><div class='del'>-		DP(NETIF_MSG_IFDOWN, "fp-&gt;tpa_queue_used = 0x%llx\n",</div><div class='del'>-#endif</div><div class='del'>-		   fp-&gt;tpa_queue_used);</div><div class='del'>-#endif</div><div class='ctx'> 		cnt = 1000;</div><div class='ctx'> 		smp_rmb();</div><div class='del'>-		while (bnx2x_has_work(fp)) {</div><div class='del'>-			msleep(1);</div><div class='add'>+		while (BNX2X_HAS_TX_WORK(fp)) {</div><div class='add'>+</div><div class='add'>+			bnx2x_tx_int(fp, 1000);</div><div class='ctx'> 			if (!cnt) {</div><div class='ctx'> 				BNX2X_ERR("timeout waiting for queue[%d]\n",</div><div class='ctx'> 					  i);</div><div class='hunk'>@@ -6584,40 +6678,68 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)</div><div class='ctx'> #endif</div><div class='ctx'> 			}</div><div class='ctx'> 			cnt--;</div><div class='add'>+			msleep(1);</div><div class='ctx'> 			smp_rmb();</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* Wait until all slow path tasks complete */</div><div class='del'>-	cnt = 1000;</div><div class='del'>-	while ((bp-&gt;spq_left != MAX_SPQ_PENDING) &amp;&amp; cnt--)</div><div class='del'>-		msleep(1);</div><div class='del'>-</div><div class='del'>-	for_each_queue(bp, i)</div><div class='del'>-		napi_disable(&amp;bnx2x_fp(bp, i, napi));</div><div class='del'>-	/* Disable interrupts after Tx and Rx are disabled on stack level */</div><div class='del'>-	bnx2x_int_disable_sync(bp);</div><div class='add'>+	/* Give HW time to discard old tx messages */</div><div class='add'>+	msleep(1);</div><div class='ctx'> </div><div class='ctx'> 	/* Release IRQs */</div><div class='ctx'> 	bnx2x_free_irq(bp);</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; NO_WOL_FLAG)</div><div class='add'>+	if (CHIP_IS_E1(bp)) {</div><div class='add'>+		struct mac_configuration_cmd *config =</div><div class='add'>+						bnx2x_sp(bp, mcast_config);</div><div class='add'>+</div><div class='add'>+		bnx2x_set_mac_addr_e1(bp, 0);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; config-&gt;hdr.length_6b; i++)</div><div class='add'>+			CAM_INVALIDATE(config-&gt;config_table[i]);</div><div class='add'>+</div><div class='add'>+		config-&gt;hdr.length_6b = i;</div><div class='add'>+		if (CHIP_REV_IS_SLOW(bp))</div><div class='add'>+			config-&gt;hdr.offset = BNX2X_MAX_EMUL_MULTI*(1 + port);</div><div class='add'>+		else</div><div class='add'>+			config-&gt;hdr.offset = BNX2X_MAX_MULTICAST*(1 + port);</div><div class='add'>+		config-&gt;hdr.client_id = BP_CL_ID(bp);</div><div class='add'>+		config-&gt;hdr.reserved1 = 0;</div><div class='add'>+</div><div class='add'>+		bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_SET_MAC, 0,</div><div class='add'>+			      U64_HI(bnx2x_sp_mapping(bp, mcast_config)),</div><div class='add'>+			      U64_LO(bnx2x_sp_mapping(bp, mcast_config)), 0);</div><div class='add'>+</div><div class='add'>+	} else { /* E1H */</div><div class='add'>+		REG_WR(bp, NIG_REG_LLH0_FUNC_EN + port*8, 0);</div><div class='add'>+</div><div class='add'>+		bnx2x_set_mac_addr_e1h(bp, 0);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; MC_HASH_SIZE; i++)</div><div class='add'>+			REG_WR(bp, MC_HASH_OFFSET(bp, i), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unload_mode == UNLOAD_NORMAL)</div><div class='add'>+		reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS;</div><div class='add'>+</div><div class='add'>+	else if (bp-&gt;flags &amp; NO_WOL_FLAG) {</div><div class='ctx'> 		reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_MCP;</div><div class='add'>+		if (CHIP_IS_E1H(bp))</div><div class='add'>+			REG_WR(bp, MISC_REG_E1HMF_MODE, 0);</div><div class='ctx'> </div><div class='del'>-	else if (bp-&gt;wol) {</div><div class='del'>-		u32 emac_base = BP_PORT(bp) ? GRCBASE_EMAC1 : GRCBASE_EMAC0;</div><div class='add'>+	} else if (bp-&gt;wol) {</div><div class='add'>+		u32 emac_base = port ? GRCBASE_EMAC1 : GRCBASE_EMAC0;</div><div class='ctx'> 		u8 *mac_addr = bp-&gt;dev-&gt;dev_addr;</div><div class='ctx'> 		u32 val;</div><div class='del'>-</div><div class='ctx'> 		/* The mac address is written to entries 1-4 to</div><div class='ctx'> 		   preserve entry 0 which is used by the PMF */</div><div class='add'>+		u8 entry = (BP_E1HVN(bp) + 1)*8;</div><div class='add'>+</div><div class='ctx'> 		val = (mac_addr[0] &lt;&lt; 8) | mac_addr[1];</div><div class='del'>-		EMAC_WR(EMAC_REG_EMAC_MAC_MATCH + (BP_E1HVN(bp) + 1)*8, val);</div><div class='add'>+		EMAC_WR(bp, EMAC_REG_EMAC_MAC_MATCH + entry, val);</div><div class='ctx'> </div><div class='ctx'> 		val = (mac_addr[2] &lt;&lt; 24) | (mac_addr[3] &lt;&lt; 16) |</div><div class='ctx'> 		      (mac_addr[4] &lt;&lt; 8) | mac_addr[5];</div><div class='del'>-		EMAC_WR(EMAC_REG_EMAC_MAC_MATCH + (BP_E1HVN(bp) + 1)*8 + 4,</div><div class='del'>-			val);</div><div class='add'>+		EMAC_WR(bp, EMAC_REG_EMAC_MAC_MATCH + entry + 4, val);</div><div class='ctx'> </div><div class='ctx'> 		reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_EN;</div><div class='ctx'> </div><div class='hunk'>@@ -6630,23 +6752,14 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)</div><div class='ctx'> 		if (bnx2x_stop_multi(bp, i))</div><div class='ctx'> 			goto unload_error;</div><div class='ctx'> </div><div class='del'>-	if (CHIP_IS_E1H(bp))</div><div class='del'>-		REG_WR(bp, NIG_REG_LLH0_FUNC_EN + BP_PORT(bp)*8, 0);</div><div class='del'>-</div><div class='del'>-	bnx2x_stop_leading(bp);</div><div class='del'>-#ifdef BNX2X_STOP_ON_ERROR</div><div class='del'>-	/* If ramrod completion timed out - break here! */</div><div class='del'>-	if (bp-&gt;panic) {</div><div class='add'>+	rc = bnx2x_stop_leading(bp);</div><div class='add'>+	if (rc) {</div><div class='ctx'> 		BNX2X_ERR("Stop leading failed!\n");</div><div class='add'>+#ifdef BNX2X_STOP_ON_ERROR</div><div class='ctx'> 		return -EBUSY;</div><div class='del'>-	}</div><div class='add'>+#else</div><div class='add'>+		goto unload_error;</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	if ((bp-&gt;state != BNX2X_STATE_CLOSING_WAIT4_UNLOAD) ||</div><div class='del'>-	    (bp-&gt;fp[0].state != BNX2X_FP_STATE_CLOSED)) {</div><div class='del'>-		DP(NETIF_MSG_IFDOWN, "failed to close leading properly!  "</div><div class='del'>-		   "state 0x%x  fp[0].state 0x%x\n",</div><div class='del'>-		   bp-&gt;state, bp-&gt;fp[0].state);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> unload_error:</div><div class='hunk'>@@ -6656,12 +6769,12 @@ unload_error:</div><div class='ctx'> 		DP(NETIF_MSG_IFDOWN, "NO MCP load counts      %d, %d, %d\n",</div><div class='ctx'> 		   load_count[0], load_count[1], load_count[2]);</div><div class='ctx'> 		load_count[0]--;</div><div class='del'>-		load_count[1 + BP_PORT(bp)]--;</div><div class='add'>+		load_count[1 + port]--;</div><div class='ctx'> 		DP(NETIF_MSG_IFDOWN, "NO MCP new load counts  %d, %d, %d\n",</div><div class='ctx'> 		   load_count[0], load_count[1], load_count[2]);</div><div class='ctx'> 		if (load_count[0] == 0)</div><div class='ctx'> 			reset_code = FW_MSG_CODE_DRV_UNLOAD_COMMON;</div><div class='del'>-		else if (load_count[1 + BP_PORT(bp)] == 0)</div><div class='add'>+		else if (load_count[1 + port] == 0)</div><div class='ctx'> 			reset_code = FW_MSG_CODE_DRV_UNLOAD_PORT;</div><div class='ctx'> 		else</div><div class='ctx'> 			reset_code = FW_MSG_CODE_DRV_UNLOAD_FUNCTION;</div><div class='hunk'>@@ -6681,8 +6794,7 @@ unload_error:</div><div class='ctx'> 	/* Free SKBs, SGEs, TPA pool and driver internals */</div><div class='ctx'> 	bnx2x_free_skbs(bp);</div><div class='ctx'> 	for_each_queue(bp, i)</div><div class='del'>-		bnx2x_free_rx_sge_range(bp, bp-&gt;fp + i,</div><div class='del'>-					RX_SGE_CNT*NUM_RX_SGE_PAGES);</div><div class='add'>+		bnx2x_free_rx_sge_range(bp, bp-&gt;fp + i, NUM_RX_SGE);</div><div class='ctx'> 	bnx2x_free_mem(bp);</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;state = BNX2X_STATE_CLOSED;</div><div class='hunk'>@@ -6733,49 +6845,88 @@ static void __devinit bnx2x_undi_unload(struct bnx2x *bp)</div><div class='ctx'> 		/* Check if it is the UNDI driver</div><div class='ctx'> 		 * UNDI driver initializes CID offset for normal bell to 0x7</div><div class='ctx'> 		 */</div><div class='add'>+		bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_UNDI);</div><div class='ctx'> 		val = REG_RD(bp, DORQ_REG_NORM_CID_OFST);</div><div class='add'>+		if (val == 0x7)</div><div class='add'>+			REG_WR(bp, DORQ_REG_NORM_CID_OFST, 0);</div><div class='add'>+		bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_UNDI);</div><div class='add'>+</div><div class='ctx'> 		if (val == 0x7) {</div><div class='ctx'> 			u32 reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS;</div><div class='del'>-			/* save our func and fw_seq */</div><div class='add'>+			/* save our func */</div><div class='ctx'> 			int func = BP_FUNC(bp);</div><div class='del'>-			u16 fw_seq = bp-&gt;fw_seq;</div><div class='add'>+			u32 swap_en;</div><div class='add'>+			u32 swap_val;</div><div class='ctx'> </div><div class='ctx'> 			BNX2X_DEV_INFO("UNDI is active! reset device\n");</div><div class='ctx'> </div><div class='ctx'> 			/* try unload UNDI on port 0 */</div><div class='ctx'> 			bp-&gt;func = 0;</div><div class='del'>-			bp-&gt;fw_seq = (SHMEM_RD(bp,</div><div class='del'>-					     func_mb[bp-&gt;func].drv_mb_header) &amp;</div><div class='del'>-				      DRV_MSG_SEQ_NUMBER_MASK);</div><div class='del'>-</div><div class='add'>+			bp-&gt;fw_seq =</div><div class='add'>+			       (SHMEM_RD(bp, func_mb[bp-&gt;func].drv_mb_header) &amp;</div><div class='add'>+				DRV_MSG_SEQ_NUMBER_MASK);</div><div class='ctx'> 			reset_code = bnx2x_fw_command(bp, reset_code);</div><div class='del'>-			bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE);</div><div class='ctx'> </div><div class='ctx'> 			/* if UNDI is loaded on the other port */</div><div class='ctx'> 			if (reset_code != FW_MSG_CODE_DRV_UNLOAD_COMMON) {</div><div class='ctx'> </div><div class='add'>+				/* send "DONE" for previous unload */</div><div class='add'>+				bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE);</div><div class='add'>+</div><div class='add'>+				/* unload UNDI on port 1 */</div><div class='ctx'> 				bp-&gt;func = 1;</div><div class='del'>-				bp-&gt;fw_seq = (SHMEM_RD(bp,</div><div class='del'>-					     func_mb[bp-&gt;func].drv_mb_header) &amp;</div><div class='del'>-					      DRV_MSG_SEQ_NUMBER_MASK);</div><div class='del'>-</div><div class='del'>-				bnx2x_fw_command(bp,</div><div class='del'>-					     DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS);</div><div class='del'>-				bnx2x_fw_command(bp,</div><div class='del'>-						 DRV_MSG_CODE_UNLOAD_DONE);</div><div class='del'>-</div><div class='del'>-				/* restore our func and fw_seq */</div><div class='del'>-				bp-&gt;func = func;</div><div class='del'>-				bp-&gt;fw_seq = fw_seq;</div><div class='add'>+				bp-&gt;fw_seq =</div><div class='add'>+			       (SHMEM_RD(bp, func_mb[bp-&gt;func].drv_mb_header) &amp;</div><div class='add'>+					DRV_MSG_SEQ_NUMBER_MASK);</div><div class='add'>+				reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS;</div><div class='add'>+</div><div class='add'>+				bnx2x_fw_command(bp, reset_code);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			REG_WR(bp, (BP_PORT(bp) ? HC_REG_CONFIG_1 :</div><div class='add'>+				    HC_REG_CONFIG_0), 0x1000);</div><div class='add'>+</div><div class='add'>+			/* close input traffic and wait for it */</div><div class='add'>+			/* Do not rcv packets to BRB */</div><div class='add'>+			REG_WR(bp,</div><div class='add'>+			      (BP_PORT(bp) ? NIG_REG_LLH1_BRB1_DRV_MASK :</div><div class='add'>+					     NIG_REG_LLH0_BRB1_DRV_MASK), 0x0);</div><div class='add'>+			/* Do not direct rcv packets that are not for MCP to</div><div class='add'>+			 * the BRB */</div><div class='add'>+			REG_WR(bp,</div><div class='add'>+			       (BP_PORT(bp) ? NIG_REG_LLH1_BRB1_NOT_MCP :</div><div class='add'>+					      NIG_REG_LLH0_BRB1_NOT_MCP), 0x0);</div><div class='add'>+			/* clear AEU */</div><div class='add'>+			REG_WR(bp,</div><div class='add'>+			     (BP_PORT(bp) ? MISC_REG_AEU_MASK_ATTN_FUNC_1 :</div><div class='add'>+					    MISC_REG_AEU_MASK_ATTN_FUNC_0), 0);</div><div class='add'>+			msleep(10);</div><div class='add'>+</div><div class='add'>+			/* save NIG port swap info */</div><div class='add'>+			swap_val = REG_RD(bp, NIG_REG_PORT_SWAP);</div><div class='add'>+			swap_en = REG_RD(bp, NIG_REG_STRAP_OVERRIDE);</div><div class='ctx'> 			/* reset device */</div><div class='ctx'> 			REG_WR(bp,</div><div class='ctx'> 			       GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_CLEAR,</div><div class='del'>-			       0xd3ffff7f);</div><div class='add'>+			       0xd3ffffff);</div><div class='ctx'> 			REG_WR(bp,</div><div class='ctx'> 			       GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,</div><div class='ctx'> 			       0x1403);</div><div class='add'>+			/* take the NIG out of reset and restore swap values */</div><div class='add'>+			REG_WR(bp,</div><div class='add'>+			       GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET,</div><div class='add'>+			       MISC_REGISTERS_RESET_REG_1_RST_NIG);</div><div class='add'>+			REG_WR(bp, NIG_REG_PORT_SWAP, swap_val);</div><div class='add'>+			REG_WR(bp, NIG_REG_STRAP_OVERRIDE, swap_en);</div><div class='add'>+</div><div class='add'>+			/* send unload done to the MCP */</div><div class='add'>+			bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE);</div><div class='add'>+</div><div class='add'>+			/* restore our func and fw_seq */</div><div class='add'>+			bp-&gt;func = func;</div><div class='add'>+			bp-&gt;fw_seq =</div><div class='add'>+			       (SHMEM_RD(bp, func_mb[bp-&gt;func].drv_mb_header) &amp;</div><div class='add'>+				DRV_MSG_SEQ_NUMBER_MASK);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -6783,6 +6934,7 @@ static void __devinit bnx2x_undi_unload(struct bnx2x *bp)</div><div class='ctx'> static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val, val2, val3, val4, id;</div><div class='add'>+	u16 pmc;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the chip revision id and number. */</div><div class='ctx'> 	/* chip num:16-31, rev:12-15, metal:4-11, bond_id:0-3 */</div><div class='hunk'>@@ -6840,8 +6992,16 @@ static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp)</div><div class='ctx'> 		BNX2X_ERR("This driver needs bc_ver %X but found %X,"</div><div class='ctx'> 			  " please upgrade BC\n", BNX2X_BC_VER, val);</div><div class='ctx'> 	}</div><div class='del'>-	BNX2X_DEV_INFO("%sWoL Capable\n",</div><div class='del'>-		       (bp-&gt;flags &amp; NO_WOL_FLAG)? "Not " : "");</div><div class='add'>+</div><div class='add'>+	if (BP_E1HVN(bp) == 0) {</div><div class='add'>+		pci_read_config_word(bp-&gt;pdev, bp-&gt;pm_cap + PCI_PM_PMC, &amp;pmc);</div><div class='add'>+		bp-&gt;flags |= (pmc &amp; PCI_PM_CAP_PME_D3cold) ? 0 : NO_WOL_FLAG;</div><div class='add'>+	} else {</div><div class='add'>+		/* no WOL capability for E1HVN != 0 */</div><div class='add'>+		bp-&gt;flags |= NO_WOL_FLAG;</div><div class='add'>+	}</div><div class='add'>+	BNX2X_DEV_INFO("%sWoL capable\n",</div><div class='add'>+		       (bp-&gt;flags &amp; NO_WOL_FLAG) ? "Not " : "");</div><div class='ctx'> </div><div class='ctx'> 	val = SHMEM_RD(bp, dev_info.shared_hw_config.part_num);</div><div class='ctx'> 	val2 = SHMEM_RD(bp, dev_info.shared_hw_config.part_num[4]);</div><div class='hunk'>@@ -7202,7 +7362,7 @@ static void __devinit bnx2x_link_settings_requested(struct bnx2x *bp)</div><div class='ctx'> 	bp-&gt;link_params.req_flow_ctrl = (bp-&gt;port.link_config &amp;</div><div class='ctx'> 					 PORT_FEATURE_FLOW_CONTROL_MASK);</div><div class='ctx'> 	if ((bp-&gt;link_params.req_flow_ctrl == FLOW_CTRL_AUTO) &amp;&amp;</div><div class='del'>-	    (!bp-&gt;port.supported &amp; SUPPORTED_Autoneg))</div><div class='add'>+	    !(bp-&gt;port.supported &amp; SUPPORTED_Autoneg))</div><div class='ctx'> 		bp-&gt;link_params.req_flow_ctrl = FLOW_CTRL_NONE;</div><div class='ctx'> </div><div class='ctx'> 	BNX2X_DEV_INFO("req_line_speed %d  req_duplex %d  req_flow_ctrl 0x%x"</div><div class='hunk'>@@ -7274,9 +7434,8 @@ static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp)</div><div class='ctx'> 		bp-&gt;mf_config =</div><div class='ctx'> 			SHMEM_RD(bp, mf_cfg.func_mf_config[func].config);</div><div class='ctx'> </div><div class='del'>-		val =</div><div class='del'>-		   (SHMEM_RD(bp, mf_cfg.func_mf_config[func].e1hov_tag) &amp;</div><div class='del'>-		    FUNC_MF_CFG_E1HOV_TAG_MASK);</div><div class='add'>+		val = (SHMEM_RD(bp, mf_cfg.func_mf_config[func].e1hov_tag) &amp;</div><div class='add'>+		       FUNC_MF_CFG_E1HOV_TAG_MASK);</div><div class='ctx'> 		if (val != FUNC_MF_CFG_E1HOV_TAG_DEFAULT) {</div><div class='ctx'> </div><div class='ctx'> 			bp-&gt;e1hov = val;</div><div class='hunk'>@@ -7324,7 +7483,7 @@ static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 	if (BP_NOMCP(bp)) {</div><div class='ctx'> 		/* only supposed to happen on emulation/FPGA */</div><div class='del'>-		BNX2X_ERR("warning rendom MAC workaround active\n");</div><div class='add'>+		BNX2X_ERR("warning random MAC workaround active\n");</div><div class='ctx'> 		random_ether_addr(bp-&gt;dev-&gt;dev_addr);</div><div class='ctx'> 		memcpy(bp-&gt;dev-&gt;perm_addr, bp-&gt;dev-&gt;dev_addr, ETH_ALEN);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -7337,8 +7496,8 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)</div><div class='ctx'> 	int func = BP_FUNC(bp);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (nomcp)</div><div class='del'>-		bp-&gt;flags |= NO_MCP_FLAG;</div><div class='add'>+	/* Disable interrupt handling until HW is initialized */</div><div class='add'>+	atomic_set(&amp;bp-&gt;intr_sem, 1);</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;bp-&gt;port.phy_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -7377,8 +7536,6 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)</div><div class='ctx'> 	bp-&gt;tx_ticks = 50;</div><div class='ctx'> 	bp-&gt;rx_ticks = 25;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;stats_ticks = 1000000 &amp; 0xffff00;</div><div class='del'>-</div><div class='ctx'> 	bp-&gt;timer_interval = (CHIP_REV_IS_SLOW(bp) ? 5*HZ : HZ);</div><div class='ctx'> 	bp-&gt;current_interval = (poll ? poll : bp-&gt;timer_interval);</div><div class='ctx'> </div><div class='hunk'>@@ -7628,25 +7785,25 @@ static void bnx2x_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 			      struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='del'>-	char phy_fw_ver[PHY_FW_VER_LEN];</div><div class='add'>+	u8 phy_fw_ver[PHY_FW_VER_LEN];</div><div class='ctx'> </div><div class='ctx'> 	strcpy(info-&gt;driver, DRV_MODULE_NAME);</div><div class='ctx'> 	strcpy(info-&gt;version, DRV_MODULE_VERSION);</div><div class='ctx'> </div><div class='ctx'> 	phy_fw_ver[0] = '\0';</div><div class='ctx'> 	if (bp-&gt;port.pmf) {</div><div class='del'>-		bnx2x_phy_hw_lock(bp);</div><div class='add'>+		bnx2x_acquire_phy_lock(bp);</div><div class='ctx'> 		bnx2x_get_ext_phy_fw_version(&amp;bp-&gt;link_params,</div><div class='ctx'> 					     (bp-&gt;state != BNX2X_STATE_CLOSED),</div><div class='ctx'> 					     phy_fw_ver, PHY_FW_VER_LEN);</div><div class='del'>-		bnx2x_phy_hw_unlock(bp);</div><div class='add'>+		bnx2x_release_phy_lock(bp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snprintf(info-&gt;fw_version, 32, "%d.%d.%d:%d BC:%x%s%s",</div><div class='del'>-		 BCM_5710_FW_MAJOR_VERSION, BCM_5710_FW_MINOR_VERSION,</div><div class='del'>-		 BCM_5710_FW_REVISION_VERSION,</div><div class='del'>-		 BCM_5710_FW_COMPILE_FLAGS, bp-&gt;common.bc_ver,</div><div class='del'>-		 ((phy_fw_ver[0] != '\0')? " PHY:":""), phy_fw_ver);</div><div class='add'>+	snprintf(info-&gt;fw_version, 32, "BC:%d.%d.%d%s%s",</div><div class='add'>+		 (bp-&gt;common.bc_ver &amp; 0xff0000) &gt;&gt; 16,</div><div class='add'>+		 (bp-&gt;common.bc_ver &amp; 0xff00) &gt;&gt; 8,</div><div class='add'>+		 (bp-&gt;common.bc_ver &amp; 0xff),</div><div class='add'>+		 ((phy_fw_ver[0] != '\0') ? " PHY:" : ""), phy_fw_ver);</div><div class='ctx'> 	strcpy(info-&gt;bus_info, pci_name(bp-&gt;pdev));</div><div class='ctx'> 	info-&gt;n_stats = BNX2X_NUM_STATS;</div><div class='ctx'> 	info-&gt;testinfo_len = BNX2X_NUM_TESTS;</div><div class='hunk'>@@ -8097,7 +8254,7 @@ static int bnx2x_set_eeprom(struct net_device *dev,</div><div class='ctx'> 	if (eeprom-&gt;magic == 0x00504859)</div><div class='ctx'> 		if (bp-&gt;port.pmf) {</div><div class='ctx'> </div><div class='del'>-			bnx2x_phy_hw_lock(bp);</div><div class='add'>+			bnx2x_acquire_phy_lock(bp);</div><div class='ctx'> 			rc = bnx2x_flash_download(bp, BP_PORT(bp),</div><div class='ctx'> 					     bp-&gt;link_params.ext_phy_config,</div><div class='ctx'> 					     (bp-&gt;state != BNX2X_STATE_CLOSED),</div><div class='hunk'>@@ -8109,7 +8266,7 @@ static int bnx2x_set_eeprom(struct net_device *dev,</div><div class='ctx'> 				rc |= bnx2x_phy_init(&amp;bp-&gt;link_params,</div><div class='ctx'> 						     &amp;bp-&gt;link_vars);</div><div class='ctx'> 			}</div><div class='del'>-			bnx2x_phy_hw_unlock(bp);</div><div class='add'>+			bnx2x_release_phy_lock(bp);</div><div class='ctx'> </div><div class='ctx'> 		} else /* Only the PMF can access the PHY */</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -8128,7 +8285,6 @@ static int bnx2x_get_coalesce(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	coal-&gt;rx_coalesce_usecs = bp-&gt;rx_ticks;</div><div class='ctx'> 	coal-&gt;tx_coalesce_usecs = bp-&gt;tx_ticks;</div><div class='del'>-	coal-&gt;stats_block_coalesce_usecs = bp-&gt;stats_ticks;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -8146,44 +8302,12 @@ static int bnx2x_set_coalesce(struct net_device *dev,</div><div class='ctx'> 	if (bp-&gt;tx_ticks &gt; 0x3000)</div><div class='ctx'> 		bp-&gt;tx_ticks = 0x3000;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;stats_ticks = coal-&gt;stats_block_coalesce_usecs;</div><div class='del'>-	if (bp-&gt;stats_ticks &gt; 0xffff00)</div><div class='del'>-		bp-&gt;stats_ticks = 0xffff00;</div><div class='del'>-	bp-&gt;stats_ticks &amp;= 0xffff00;</div><div class='del'>-</div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		bnx2x_update_coalesce(bp);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_set_flags(struct net_device *dev, u32 data)</div><div class='del'>-{</div><div class='del'>-	struct bnx2x *bp = netdev_priv(dev);</div><div class='del'>-	int changed = 0;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	if (data &amp; ETH_FLAG_LRO) {</div><div class='del'>-		if (!(dev-&gt;features &amp; NETIF_F_LRO)) {</div><div class='del'>-			dev-&gt;features |= NETIF_F_LRO;</div><div class='del'>-			bp-&gt;flags |= TPA_ENABLE_FLAG;</div><div class='del'>-			changed = 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else if (dev-&gt;features &amp; NETIF_F_LRO) {</div><div class='del'>-		dev-&gt;features &amp;= ~NETIF_F_LRO;</div><div class='del'>-		bp-&gt;flags &amp;= ~TPA_ENABLE_FLAG;</div><div class='del'>-		changed = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed &amp;&amp; netif_running(dev)) {</div><div class='del'>-		bnx2x_nic_unload(bp, UNLOAD_NORMAL);</div><div class='del'>-		rc = bnx2x_nic_load(bp, LOAD_NORMAL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void bnx2x_get_ringparam(struct net_device *dev,</div><div class='ctx'> 				struct ethtool_ringparam *ering)</div><div class='ctx'> {</div><div class='hunk'>@@ -8266,7 +8390,7 @@ static int bnx2x_set_pauseparam(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (epause-&gt;autoneg) {</div><div class='ctx'> 		if (!(bp-&gt;port.supported &amp; SUPPORTED_Autoneg)) {</div><div class='del'>-			DP(NETIF_MSG_LINK, "Autoneg not supported\n");</div><div class='add'>+			DP(NETIF_MSG_LINK, "autoneg not supported\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -8285,6 +8409,34 @@ static int bnx2x_set_pauseparam(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnx2x_set_flags(struct net_device *dev, u32 data)</div><div class='add'>+{</div><div class='add'>+	struct bnx2x *bp = netdev_priv(dev);</div><div class='add'>+	int changed = 0;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	/* TPA requires Rx CSUM offloading */</div><div class='add'>+	if ((data &amp; ETH_FLAG_LRO) &amp;&amp; bp-&gt;rx_csum) {</div><div class='add'>+		if (!(dev-&gt;features &amp; NETIF_F_LRO)) {</div><div class='add'>+			dev-&gt;features |= NETIF_F_LRO;</div><div class='add'>+			bp-&gt;flags |= TPA_ENABLE_FLAG;</div><div class='add'>+			changed = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else if (dev-&gt;features &amp; NETIF_F_LRO) {</div><div class='add'>+		dev-&gt;features &amp;= ~NETIF_F_LRO;</div><div class='add'>+		bp-&gt;flags &amp;= ~TPA_ENABLE_FLAG;</div><div class='add'>+		changed = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp;&amp; netif_running(dev)) {</div><div class='add'>+		bnx2x_nic_unload(bp, UNLOAD_NORMAL);</div><div class='add'>+		rc = bnx2x_nic_load(bp, LOAD_NORMAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u32 bnx2x_get_rx_csum(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='hunk'>@@ -8295,9 +8447,19 @@ static u32 bnx2x_get_rx_csum(struct net_device *dev)</div><div class='ctx'> static int bnx2x_set_rx_csum(struct net_device *dev, u32 data)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='add'>+	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;rx_csum = data;</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	/* Disable TPA, when Rx CSUM is disabled. Otherwise all</div><div class='add'>+	   TPA'ed packets will be discarded due to wrong TCP CSUM */</div><div class='add'>+	if (!data) {</div><div class='add'>+		u32 flags = ethtool_op_get_flags(dev);</div><div class='add'>+</div><div class='add'>+		rc = bnx2x_set_flags(dev, (flags &amp; ~ETH_FLAG_LRO));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnx2x_set_tso(struct net_device *dev, u32 data)</div><div class='hunk'>@@ -8335,6 +8497,7 @@ static int bnx2x_test_registers(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int idx, i, rc = -ENODEV;</div><div class='ctx'> 	u32 wr_val = 0;</div><div class='add'>+	int port = BP_PORT(bp);</div><div class='ctx'> 	static const struct {</div><div class='ctx'> 		u32  offset0;</div><div class='ctx'> 		u32  offset1;</div><div class='hunk'>@@ -8400,7 +8563,6 @@ static int bnx2x_test_registers(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; reg_tbl[i].offset0 != 0xffffffff; i++) {</div><div class='ctx'> 			u32 offset, mask, save_val, val;</div><div class='del'>-			int port = BP_PORT(bp);</div><div class='ctx'> </div><div class='ctx'> 			offset = reg_tbl[i].offset0 + port*reg_tbl[i].offset1;</div><div class='ctx'> 			mask = reg_tbl[i].mask;</div><div class='hunk'>@@ -8446,16 +8608,17 @@ static int bnx2x_test_memory(struct bnx2x *bp)</div><div class='ctx'> 	static const struct {</div><div class='ctx'> 		char *name;</div><div class='ctx'> 		u32 offset;</div><div class='del'>-		u32 mask;</div><div class='add'>+		u32 e1_mask;</div><div class='add'>+		u32 e1h_mask;</div><div class='ctx'> 	} prty_tbl[] = {</div><div class='del'>-		{ "CCM_REG_CCM_PRTY_STS",     CCM_REG_CCM_PRTY_STS,     0 },</div><div class='del'>-		{ "CFC_REG_CFC_PRTY_STS",     CFC_REG_CFC_PRTY_STS,     0 },</div><div class='del'>-		{ "DMAE_REG_DMAE_PRTY_STS",   DMAE_REG_DMAE_PRTY_STS,   0 },</div><div class='del'>-		{ "TCM_REG_TCM_PRTY_STS",     TCM_REG_TCM_PRTY_STS,     0 },</div><div class='del'>-		{ "UCM_REG_UCM_PRTY_STS",     UCM_REG_UCM_PRTY_STS,     0 },</div><div class='del'>-		{ "XCM_REG_XCM_PRTY_STS",     XCM_REG_XCM_PRTY_STS,     0x1 },</div><div class='del'>-</div><div class='del'>-		{ NULL, 0xffffffff, 0 }</div><div class='add'>+		{ "CCM_PRTY_STS",  CCM_REG_CCM_PRTY_STS,   0x3ffc0, 0 },</div><div class='add'>+		{ "CFC_PRTY_STS",  CFC_REG_CFC_PRTY_STS,   0x2,     0x2 },</div><div class='add'>+		{ "DMAE_PRTY_STS", DMAE_REG_DMAE_PRTY_STS, 0,       0 },</div><div class='add'>+		{ "TCM_PRTY_STS",  TCM_REG_TCM_PRTY_STS,   0x3ffc0, 0 },</div><div class='add'>+		{ "UCM_PRTY_STS",  UCM_REG_UCM_PRTY_STS,   0x3ffc0, 0 },</div><div class='add'>+		{ "XCM_PRTY_STS",  XCM_REG_XCM_PRTY_STS,   0x3ffc1, 0 },</div><div class='add'>+</div><div class='add'>+		{ NULL, 0xffffffff, 0, 0 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(bp-&gt;dev))</div><div class='hunk'>@@ -8469,7 +8632,8 @@ static int bnx2x_test_memory(struct bnx2x *bp)</div><div class='ctx'> 	/* Check the parity status */</div><div class='ctx'> 	for (i = 0; prty_tbl[i].offset != 0xffffffff; i++) {</div><div class='ctx'> 		val = REG_RD(bp, prty_tbl[i].offset);</div><div class='del'>-		if (val &amp; ~(prty_tbl[i].mask)) {</div><div class='add'>+		if ((CHIP_IS_E1(bp) &amp;&amp; (val &amp; ~(prty_tbl[i].e1_mask))) ||</div><div class='add'>+		    (CHIP_IS_E1H(bp) &amp;&amp; (val &amp; ~(prty_tbl[i].e1h_mask)))) {</div><div class='ctx'> 			DP(NETIF_MSG_HW,</div><div class='ctx'> 			   "%s is 0x%x\n", prty_tbl[i].name, val);</div><div class='ctx'> 			goto test_mem_exit;</div><div class='hunk'>@@ -8482,34 +8646,6 @@ test_mem_exit:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnx2x_netif_start(struct bnx2x *bp)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (atomic_dec_and_test(&amp;bp-&gt;intr_sem)) {</div><div class='del'>-		if (netif_running(bp-&gt;dev)) {</div><div class='del'>-			bnx2x_int_enable(bp);</div><div class='del'>-			for_each_queue(bp, i)</div><div class='del'>-				napi_enable(&amp;bnx2x_fp(bp, i, napi));</div><div class='del'>-			if (bp-&gt;state == BNX2X_STATE_OPEN)</div><div class='del'>-				netif_wake_queue(bp-&gt;dev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bnx2x_netif_stop(struct bnx2x *bp)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (netif_running(bp-&gt;dev)) {</div><div class='del'>-		netif_tx_disable(bp-&gt;dev);</div><div class='del'>-		bp-&gt;dev-&gt;trans_start = jiffies;	/* prevent tx timeout */</div><div class='del'>-		for_each_queue(bp, i)</div><div class='del'>-			napi_disable(&amp;bnx2x_fp(bp, i, napi));</div><div class='del'>-	}</div><div class='del'>-	bnx2x_int_disable_sync(bp);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void bnx2x_wait_for_link(struct bnx2x *bp, u8 link_up)</div><div class='ctx'> {</div><div class='ctx'> 	int cnt = 1000;</div><div class='hunk'>@@ -8539,15 +8675,15 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up)</div><div class='ctx'> </div><div class='ctx'> 	if (loopback_mode == BNX2X_MAC_LOOPBACK) {</div><div class='ctx'> 		bp-&gt;link_params.loopback_mode = LOOPBACK_BMAC;</div><div class='del'>-		bnx2x_phy_hw_lock(bp);</div><div class='add'>+		bnx2x_acquire_phy_lock(bp);</div><div class='ctx'> 		bnx2x_phy_init(&amp;bp-&gt;link_params, &amp;bp-&gt;link_vars);</div><div class='del'>-		bnx2x_phy_hw_unlock(bp);</div><div class='add'>+		bnx2x_release_phy_lock(bp);</div><div class='ctx'> </div><div class='ctx'> 	} else if (loopback_mode == BNX2X_PHY_LOOPBACK) {</div><div class='ctx'> 		bp-&gt;link_params.loopback_mode = LOOPBACK_XGXS_10;</div><div class='del'>-		bnx2x_phy_hw_lock(bp);</div><div class='add'>+		bnx2x_acquire_phy_lock(bp);</div><div class='ctx'> 		bnx2x_phy_init(&amp;bp-&gt;link_params, &amp;bp-&gt;link_vars);</div><div class='del'>-		bnx2x_phy_hw_unlock(bp);</div><div class='add'>+		bnx2x_release_phy_lock(bp);</div><div class='ctx'> 		/* wait until link state is restored */</div><div class='ctx'> 		bnx2x_wait_for_link(bp, link_up);</div><div class='ctx'> </div><div class='hunk'>@@ -8771,7 +8907,7 @@ static void bnx2x_self_test(struct net_device *dev,</div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* offline tests are not suppoerted in MF mode */</div><div class='add'>+	/* offline tests are not supported in MF mode */</div><div class='ctx'> 	if (IS_E1HMF(bp))</div><div class='ctx'> 		etest-&gt;flags &amp;= ~ETH_TEST_FL_OFFLINE;</div><div class='ctx'> </div><div class='hunk'>@@ -8827,76 +8963,99 @@ static const struct {</div><div class='ctx'> 	long offset;</div><div class='ctx'> 	int size;</div><div class='ctx'> 	u32 flags;</div><div class='del'>-	char string[ETH_GSTRING_LEN];</div><div class='add'>+#define STATS_FLAGS_PORT		1</div><div class='add'>+#define STATS_FLAGS_FUNC		2</div><div class='add'>+	u8 string[ETH_GSTRING_LEN];</div><div class='ctx'> } bnx2x_stats_arr[BNX2X_NUM_STATS] = {</div><div class='del'>-/* 1 */	{ STATS_OFFSET32(valid_bytes_received_hi),     8, 1, "rx_bytes" },</div><div class='del'>-	{ STATS_OFFSET32(error_bytes_received_hi),     8, 1, "rx_error_bytes" },</div><div class='del'>-	{ STATS_OFFSET32(total_bytes_transmitted_hi),  8, 1, "tx_bytes" },</div><div class='del'>-	{ STATS_OFFSET32(tx_stat_ifhcoutbadoctets_hi), 8, 0, "tx_error_bytes" },</div><div class='add'>+/* 1 */	{ STATS_OFFSET32(valid_bytes_received_hi),</div><div class='add'>+				8, STATS_FLAGS_FUNC, "rx_bytes" },</div><div class='add'>+	{ STATS_OFFSET32(error_bytes_received_hi),</div><div class='add'>+				8, STATS_FLAGS_FUNC, "rx_error_bytes" },</div><div class='add'>+	{ STATS_OFFSET32(total_bytes_transmitted_hi),</div><div class='add'>+				8, STATS_FLAGS_FUNC, "tx_bytes" },</div><div class='add'>+	{ STATS_OFFSET32(tx_stat_ifhcoutbadoctets_hi),</div><div class='add'>+				8, STATS_FLAGS_PORT, "tx_error_bytes" },</div><div class='ctx'> 	{ STATS_OFFSET32(total_unicast_packets_received_hi),</div><div class='del'>-						8, 1, "rx_ucast_packets" },</div><div class='add'>+				8, STATS_FLAGS_FUNC, "rx_ucast_packets" },</div><div class='ctx'> 	{ STATS_OFFSET32(total_multicast_packets_received_hi),</div><div class='del'>-						8, 1, "rx_mcast_packets" },</div><div class='add'>+				8, STATS_FLAGS_FUNC, "rx_mcast_packets" },</div><div class='ctx'> 	{ STATS_OFFSET32(total_broadcast_packets_received_hi),</div><div class='del'>-						8, 1, "rx_bcast_packets" },</div><div class='add'>+				8, STATS_FLAGS_FUNC, "rx_bcast_packets" },</div><div class='ctx'> 	{ STATS_OFFSET32(total_unicast_packets_transmitted_hi),</div><div class='del'>-						8, 1, "tx_packets" },</div><div class='add'>+				8, STATS_FLAGS_FUNC, "tx_packets" },</div><div class='ctx'> 	{ STATS_OFFSET32(tx_stat_dot3statsinternalmactransmiterrors_hi),</div><div class='del'>-						8, 0, "tx_mac_errors" },</div><div class='add'>+				8, STATS_FLAGS_PORT, "tx_mac_errors" },</div><div class='ctx'> /* 10 */{ STATS_OFFSET32(rx_stat_dot3statscarriersenseerrors_hi),</div><div class='del'>-						8, 0, "tx_carrier_errors" },</div><div class='add'>+				8, STATS_FLAGS_PORT, "tx_carrier_errors" },</div><div class='ctx'> 	{ STATS_OFFSET32(rx_stat_dot3statsfcserrors_hi),</div><div class='del'>-						8, 0, "rx_crc_errors" },</div><div class='add'>+				8, STATS_FLAGS_PORT, "rx_crc_errors" },</div><div class='ctx'> 	{ STATS_OFFSET32(rx_stat_dot3statsalignmenterrors_hi),</div><div class='del'>-						8, 0, "rx_align_errors" },</div><div class='add'>+				8, STATS_FLAGS_PORT, "rx_align_errors" },</div><div class='ctx'> 	{ STATS_OFFSET32(tx_stat_dot3statssinglecollisionframes_hi),</div><div class='del'>-						8, 0, "tx_single_collisions" },</div><div class='add'>+				8, STATS_FLAGS_PORT, "tx_single_collisions" },</div><div class='ctx'> 	{ STATS_OFFSET32(tx_stat_dot3statsmultiplecollisionframes_hi),</div><div class='del'>-						8, 0, "tx_multi_collisions" },</div><div class='add'>+				8, STATS_FLAGS_PORT, "tx_multi_collisions" },</div><div class='ctx'> 	{ STATS_OFFSET32(tx_stat_dot3statsdeferredtransmissions_hi),</div><div class='del'>-						8, 0, "tx_deferred" },</div><div class='add'>+				8, STATS_FLAGS_PORT, "tx_deferred" },</div><div class='ctx'> 	{ STATS_OFFSET32(tx_stat_dot3statsexcessivecollisions_hi),</div><div class='del'>-						8, 0, "tx_excess_collisions" },</div><div class='add'>+				8, STATS_FLAGS_PORT, "tx_excess_collisions" },</div><div class='ctx'> 	{ STATS_OFFSET32(tx_stat_dot3statslatecollisions_hi),</div><div class='del'>-						8, 0, "tx_late_collisions" },</div><div class='add'>+				8, STATS_FLAGS_PORT, "tx_late_collisions" },</div><div class='ctx'> 	{ STATS_OFFSET32(tx_stat_etherstatscollisions_hi),</div><div class='del'>-						8, 0, "tx_total_collisions" },</div><div class='add'>+				8, STATS_FLAGS_PORT, "tx_total_collisions" },</div><div class='ctx'> 	{ STATS_OFFSET32(rx_stat_etherstatsfragments_hi),</div><div class='del'>-						8, 0, "rx_fragments" },</div><div class='del'>-/* 20 */{ STATS_OFFSET32(rx_stat_etherstatsjabbers_hi), 8, 0, "rx_jabbers" },</div><div class='add'>+				8, STATS_FLAGS_PORT, "rx_fragments" },</div><div class='add'>+/* 20 */{ STATS_OFFSET32(rx_stat_etherstatsjabbers_hi),</div><div class='add'>+				8, STATS_FLAGS_PORT, "rx_jabbers" },</div><div class='ctx'> 	{ STATS_OFFSET32(rx_stat_etherstatsundersizepkts_hi),</div><div class='del'>-						8, 0, "rx_undersize_packets" },</div><div class='add'>+				8, STATS_FLAGS_PORT, "rx_undersize_packets" },</div><div class='ctx'> 	{ STATS_OFFSET32(jabber_packets_received),</div><div class='del'>-						4, 1, "rx_oversize_packets" },</div><div class='add'>+				4, STATS_FLAGS_FUNC, "rx_oversize_packets" },</div><div class='ctx'> 	{ STATS_OFFSET32(tx_stat_etherstatspkts64octets_hi),</div><div class='del'>-						8, 0, "tx_64_byte_packets" },</div><div class='add'>+				8, STATS_FLAGS_PORT, "tx_64_byte_packets" },</div><div class='ctx'> 	{ STATS_OFFSET32(tx_stat_etherstatspkts65octetsto127octets_hi),</div><div class='del'>-					8, 0, "tx_65_to_127_byte_packets" },</div><div class='add'>+			8, STATS_FLAGS_PORT, "tx_65_to_127_byte_packets" },</div><div class='ctx'> 	{ STATS_OFFSET32(tx_stat_etherstatspkts128octetsto255octets_hi),</div><div class='del'>-					8, 0, "tx_128_to_255_byte_packets" },</div><div class='add'>+			8, STATS_FLAGS_PORT, "tx_128_to_255_byte_packets" },</div><div class='ctx'> 	{ STATS_OFFSET32(tx_stat_etherstatspkts256octetsto511octets_hi),</div><div class='del'>-					8, 0, "tx_256_to_511_byte_packets" },</div><div class='add'>+			8, STATS_FLAGS_PORT, "tx_256_to_511_byte_packets" },</div><div class='ctx'> 	{ STATS_OFFSET32(tx_stat_etherstatspkts512octetsto1023octets_hi),</div><div class='del'>-					8, 0, "tx_512_to_1023_byte_packets" },</div><div class='add'>+			8, STATS_FLAGS_PORT, "tx_512_to_1023_byte_packets" },</div><div class='ctx'> 	{ STATS_OFFSET32(etherstatspkts1024octetsto1522octets_hi),</div><div class='del'>-					8, 0, "tx_1024_to_1522_byte_packets" },</div><div class='add'>+			8, STATS_FLAGS_PORT, "tx_1024_to_1522_byte_packets" },</div><div class='ctx'> 	{ STATS_OFFSET32(etherstatspktsover1522octets_hi),</div><div class='del'>-					8, 0, "tx_1523_to_9022_byte_packets" },</div><div class='add'>+			8, STATS_FLAGS_PORT, "tx_1523_to_9022_byte_packets" },</div><div class='ctx'> /* 30 */{ STATS_OFFSET32(rx_stat_xonpauseframesreceived_hi),</div><div class='del'>-						8, 0, "rx_xon_frames" },</div><div class='add'>+				8, STATS_FLAGS_PORT, "rx_xon_frames" },</div><div class='ctx'> 	{ STATS_OFFSET32(rx_stat_xoffpauseframesreceived_hi),</div><div class='del'>-						8, 0, "rx_xoff_frames" },</div><div class='del'>-	{ STATS_OFFSET32(tx_stat_outxonsent_hi),  8, 0, "tx_xon_frames" },</div><div class='del'>-	{ STATS_OFFSET32(tx_stat_outxoffsent_hi), 8, 0, "tx_xoff_frames" },</div><div class='add'>+				8, STATS_FLAGS_PORT, "rx_xoff_frames" },</div><div class='add'>+	{ STATS_OFFSET32(tx_stat_outxonsent_hi),</div><div class='add'>+				8, STATS_FLAGS_PORT, "tx_xon_frames" },</div><div class='add'>+	{ STATS_OFFSET32(tx_stat_outxoffsent_hi),</div><div class='add'>+				8, STATS_FLAGS_PORT, "tx_xoff_frames" },</div><div class='ctx'> 	{ STATS_OFFSET32(rx_stat_maccontrolframesreceived_hi),</div><div class='del'>-						8, 0, "rx_mac_ctrl_frames" },</div><div class='del'>-	{ STATS_OFFSET32(mac_filter_discard),   4, 1, "rx_filtered_packets" },</div><div class='del'>-	{ STATS_OFFSET32(no_buff_discard),      4, 1, "rx_discards" },</div><div class='del'>-	{ STATS_OFFSET32(xxoverflow_discard),   4, 1, "rx_fw_discards" },</div><div class='del'>-	{ STATS_OFFSET32(brb_drop_hi),          8, 1, "brb_discard" },</div><div class='del'>-/* 39 */{ STATS_OFFSET32(brb_truncate_discard), 8, 1, "brb_truncate" }</div><div class='add'>+				8, STATS_FLAGS_PORT, "rx_mac_ctrl_frames" },</div><div class='add'>+	{ STATS_OFFSET32(mac_filter_discard),</div><div class='add'>+				4, STATS_FLAGS_PORT, "rx_filtered_packets" },</div><div class='add'>+	{ STATS_OFFSET32(no_buff_discard),</div><div class='add'>+				4, STATS_FLAGS_FUNC, "rx_discards" },</div><div class='add'>+	{ STATS_OFFSET32(xxoverflow_discard),</div><div class='add'>+				4, STATS_FLAGS_PORT, "rx_fw_discards" },</div><div class='add'>+	{ STATS_OFFSET32(brb_drop_hi),</div><div class='add'>+				8, STATS_FLAGS_PORT, "brb_discard" },</div><div class='add'>+	{ STATS_OFFSET32(brb_truncate_hi),</div><div class='add'>+				8, STATS_FLAGS_PORT, "brb_truncate" },</div><div class='add'>+/* 40 */{ STATS_OFFSET32(rx_err_discard_pkt),</div><div class='add'>+				4, STATS_FLAGS_FUNC, "rx_phy_ip_err_discards"},</div><div class='add'>+	{ STATS_OFFSET32(rx_skb_alloc_failed),</div><div class='add'>+				4, STATS_FLAGS_FUNC, "rx_skb_alloc_discard" },</div><div class='add'>+/* 42 */{ STATS_OFFSET32(hw_csum_err),</div><div class='add'>+				4, STATS_FLAGS_FUNC, "rx_csum_offload_errors" }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define IS_NOT_E1HMF_STAT(bp, i) \</div><div class='add'>+		(IS_E1HMF(bp) &amp;&amp; (bnx2x_stats_arr[i].flags &amp; STATS_FLAGS_PORT))</div><div class='add'>+</div><div class='ctx'> static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='hunk'>@@ -8905,7 +9064,7 @@ static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf)</div><div class='ctx'> 	switch (stringset) {</div><div class='ctx'> 	case ETH_SS_STATS:</div><div class='ctx'> 		for (i = 0, j = 0; i &lt; BNX2X_NUM_STATS; i++) {</div><div class='del'>-			if (IS_E1HMF(bp) &amp;&amp; (!bnx2x_stats_arr[i].flags))</div><div class='add'>+			if (IS_NOT_E1HMF_STAT(bp, i))</div><div class='ctx'> 				continue;</div><div class='ctx'> 			strcpy(buf + j*ETH_GSTRING_LEN,</div><div class='ctx'> 			       bnx2x_stats_arr[i].string);</div><div class='hunk'>@@ -8925,7 +9084,7 @@ static int bnx2x_get_stats_count(struct net_device *dev)</div><div class='ctx'> 	int i, num_stats = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; BNX2X_NUM_STATS; i++) {</div><div class='del'>-		if (IS_E1HMF(bp) &amp;&amp; (!bnx2x_stats_arr[i].flags))</div><div class='add'>+		if (IS_NOT_E1HMF_STAT(bp, i))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		num_stats++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -8940,7 +9099,7 @@ static void bnx2x_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, j = 0; i &lt; BNX2X_NUM_STATS; i++) {</div><div class='del'>-		if (IS_E1HMF(bp) &amp;&amp; (!bnx2x_stats_arr[i].flags))</div><div class='add'>+		if (IS_NOT_E1HMF_STAT(bp, i))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (bnx2x_stats_arr[i].size == 0) {</div><div class='hunk'>@@ -9057,7 +9216,7 @@ static int bnx2x_set_power_state(struct bnx2x *bp, pci_power_t state)</div><div class='ctx'> 				       PCI_PM_CTRL_PME_STATUS));</div><div class='ctx'> </div><div class='ctx'> 		if (pmcsr &amp; PCI_PM_CTRL_STATE_MASK)</div><div class='del'>-		/* delay required during transition out of D3hot */</div><div class='add'>+			/* delay required during transition out of D3hot */</div><div class='ctx'> 			msleep(20);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -9092,6 +9251,7 @@ static int bnx2x_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 						 napi);</div><div class='ctx'> 	struct bnx2x *bp = fp-&gt;bp;</div><div class='ctx'> 	int work_done = 0;</div><div class='add'>+	u16 rx_cons_sb;</div><div class='ctx'> </div><div class='ctx'> #ifdef BNX2X_STOP_ON_ERROR</div><div class='ctx'> 	if (unlikely(bp-&gt;panic))</div><div class='hunk'>@@ -9104,17 +9264,22 @@ static int bnx2x_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_update_fpsb_idx(fp);</div><div class='ctx'> </div><div class='del'>-	if ((fp-&gt;tx_pkt_prod != le16_to_cpu(*fp-&gt;tx_cons_sb)) ||</div><div class='del'>-	    (fp-&gt;tx_pkt_prod != fp-&gt;tx_pkt_cons))</div><div class='add'>+	if (BNX2X_HAS_TX_WORK(fp))</div><div class='ctx'> 		bnx2x_tx_int(fp, budget);</div><div class='ctx'> </div><div class='del'>-	if (le16_to_cpu(*fp-&gt;rx_cons_sb) != fp-&gt;rx_comp_cons)</div><div class='add'>+	rx_cons_sb = le16_to_cpu(*fp-&gt;rx_cons_sb);</div><div class='add'>+	if ((rx_cons_sb &amp; MAX_RCQ_DESC_CNT) == MAX_RCQ_DESC_CNT)</div><div class='add'>+		rx_cons_sb++;</div><div class='add'>+	if (BNX2X_HAS_RX_WORK(fp))</div><div class='ctx'> 		work_done = bnx2x_rx_int(fp, budget);</div><div class='ctx'> </div><div class='del'>-	rmb(); /* bnx2x_has_work() reads the status block */</div><div class='add'>+	rmb(); /* BNX2X_HAS_WORK() reads the status block */</div><div class='add'>+	rx_cons_sb = le16_to_cpu(*fp-&gt;rx_cons_sb);</div><div class='add'>+	if ((rx_cons_sb &amp; MAX_RCQ_DESC_CNT) == MAX_RCQ_DESC_CNT)</div><div class='add'>+		rx_cons_sb++;</div><div class='ctx'> </div><div class='ctx'> 	/* must not complete if we consumed full budget */</div><div class='del'>-	if ((work_done &lt; budget) &amp;&amp; !bnx2x_has_work(fp)) {</div><div class='add'>+	if ((work_done &lt; budget) &amp;&amp; !BNX2X_HAS_WORK(fp)) {</div><div class='ctx'> </div><div class='ctx'> #ifdef BNX2X_STOP_ON_ERROR</div><div class='ctx'> poll_panic:</div><div class='hunk'>@@ -9131,7 +9296,7 @@ poll_panic:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* we split the first BD into headers and data BDs</div><div class='del'>- * to ease the pain of our fellow micocode engineers</div><div class='add'>+ * to ease the pain of our fellow microcode engineers</div><div class='ctx'>  * we use one mapping for both BDs</div><div class='ctx'>  * So far this has only been observed to happen</div><div class='ctx'>  * in Other Operating Systems(TM)</div><div class='hunk'>@@ -9238,7 +9403,7 @@ static int bnx2x_pkt_req_lin(struct bnx2x *bp, struct sk_buff *skb,</div><div class='ctx'> 			/* Check if LSO packet needs to be copied:</div><div class='ctx'> 			   3 = 1 (for headers BD) + 2 (for PBD and last BD) */</div><div class='ctx'> 			int wnd_size = MAX_FETCH_BD - 3;</div><div class='del'>-			/* Number of widnows to check */</div><div class='add'>+			/* Number of windows to check */</div><div class='ctx'> 			int num_wnds = skb_shinfo(skb)-&gt;nr_frags - wnd_size;</div><div class='ctx'> 			int wnd_idx = 0;</div><div class='ctx'> 			int frag_idx = 0;</div><div class='hunk'>@@ -9327,8 +9492,7 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	fp_index = (smp_processor_id() % bp-&gt;num_queues);</div><div class='ctx'> 	fp = &amp;bp-&gt;fp[fp_index];</div><div class='ctx'> </div><div class='del'>-	if (unlikely(bnx2x_tx_avail(bp-&gt;fp) &lt;</div><div class='del'>-					(skb_shinfo(skb)-&gt;nr_frags + 3))) {</div><div class='add'>+	if (unlikely(bnx2x_tx_avail(fp) &lt; (skb_shinfo(skb)-&gt;nr_frags + 3))) {</div><div class='ctx'> 		bp-&gt;eth_stats.driver_xoff++,</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> 		BNX2X_ERR("BUG! Tx ring full when queue awake!\n");</div><div class='hunk'>@@ -9340,7 +9504,7 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	   skb-&gt;ip_summed, skb-&gt;protocol, ipv6_hdr(skb)-&gt;nexthdr,</div><div class='ctx'> 	   ip_hdr(skb)-&gt;protocol, skb_shinfo(skb)-&gt;gso_type, xmit_type);</div><div class='ctx'> </div><div class='del'>-	/* First, check if we need to linearaize the skb</div><div class='add'>+	/* First, check if we need to linearize the skb</div><div class='ctx'> 	   (due to FW restrictions) */</div><div class='ctx'> 	if (bnx2x_pkt_req_lin(bp, skb, xmit_type)) {</div><div class='ctx'> 		/* Statistics of linearization */</div><div class='hunk'>@@ -9349,7 +9513,7 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			DP(NETIF_MSG_TX_QUEUED, "SKB linearization failed - "</div><div class='ctx'> 			   "silently dropping this SKB\n");</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='del'>-			return 0;</div><div class='add'>+			return NETDEV_TX_OK;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -9372,7 +9536,8 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	tx_bd-&gt;bd_flags.as_bitfield = ETH_TX_BD_FLAGS_START_BD;</div><div class='ctx'> 	tx_bd-&gt;general_data = (UNICAST_ADDRESS &lt;&lt;</div><div class='ctx'> 			       ETH_TX_BD_ETH_ADDR_TYPE_SHIFT);</div><div class='del'>-	tx_bd-&gt;general_data |= 1; /* header nbd */</div><div class='add'>+	/* header nbd */</div><div class='add'>+	tx_bd-&gt;general_data |= (1 &lt;&lt; ETH_TX_BD_HDR_NBDS_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	/* remember the first BD of the packet */</div><div class='ctx'> 	tx_buf-&gt;first_bd = fp-&gt;tx_bd_prod;</div><div class='hunk'>@@ -9390,7 +9555,6 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		tx_bd-&gt;vlan = cpu_to_le16(pkt_prod);</div><div class='ctx'> </div><div class='ctx'> 	if (xmit_type) {</div><div class='del'>-</div><div class='ctx'> 		/* turn on parsing and get a BD */</div><div class='ctx'> 		bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));</div><div class='ctx'> 		pbd = (void *)&amp;fp-&gt;tx_desc_ring[bd_prod];</div><div class='hunk'>@@ -9451,7 +9615,7 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	tx_bd-&gt;addr_hi = cpu_to_le32(U64_HI(mapping));</div><div class='ctx'> 	tx_bd-&gt;addr_lo = cpu_to_le32(U64_LO(mapping));</div><div class='del'>-	nbd = skb_shinfo(skb)-&gt;nr_frags + ((pbd == NULL)? 1 : 2);</div><div class='add'>+	nbd = skb_shinfo(skb)-&gt;nr_frags + ((pbd == NULL) ? 1 : 2);</div><div class='ctx'> 	tx_bd-&gt;nbd = cpu_to_le16(nbd);</div><div class='ctx'> 	tx_bd-&gt;nbytes = cpu_to_le16(skb_headlen(skb));</div><div class='ctx'> </div><div class='hunk'>@@ -9721,9 +9885,9 @@ static int bnx2x_change_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> 	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='ctx'> 		if (CHIP_IS_E1(bp))</div><div class='del'>-			bnx2x_set_mac_addr_e1(bp);</div><div class='add'>+			bnx2x_set_mac_addr_e1(bp, 1);</div><div class='ctx'> 		else</div><div class='del'>-			bnx2x_set_mac_addr_e1h(bp);</div><div class='add'>+			bnx2x_set_mac_addr_e1h(bp, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -9734,6 +9898,7 @@ static int bnx2x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct mii_ioctl_data *data = if_mii(ifr);</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='add'>+	int port = BP_PORT(bp);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='hunk'>@@ -9749,7 +9914,7 @@ static int bnx2x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 		mutex_lock(&amp;bp-&gt;port.phy_mutex);</div><div class='del'>-		err = bnx2x_cl45_read(bp, BP_PORT(bp), 0, bp-&gt;port.phy_addr,</div><div class='add'>+		err = bnx2x_cl45_read(bp, port, 0, bp-&gt;port.phy_addr,</div><div class='ctx'> 				      DEFAULT_PHY_DEV_ADDR,</div><div class='ctx'> 				      (data-&gt;reg_num &amp; 0x1f), &amp;mii_regval);</div><div class='ctx'> 		data-&gt;val_out = mii_regval;</div><div class='hunk'>@@ -9765,7 +9930,7 @@ static int bnx2x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 		mutex_lock(&amp;bp-&gt;port.phy_mutex);</div><div class='del'>-		err = bnx2x_cl45_write(bp, BP_PORT(bp), 0, bp-&gt;port.phy_addr,</div><div class='add'>+		err = bnx2x_cl45_write(bp, port, 0, bp-&gt;port.phy_addr,</div><div class='ctx'> 				       DEFAULT_PHY_DEV_ADDR,</div><div class='ctx'> 				       (data-&gt;reg_num &amp; 0x1f), data-&gt;val_in);</div><div class='ctx'> 		mutex_unlock(&amp;bp-&gt;port.phy_mutex);</div><div class='hunk'>@@ -10141,7 +10306,7 @@ static int bnx2x_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 	netif_device_detach(dev);</div><div class='ctx'> </div><div class='del'>-	bnx2x_nic_unload(bp, UNLOAD_NORMAL);</div><div class='add'>+	bnx2x_nic_unload(bp, UNLOAD_CLOSE);</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_set_power_state(bp, pci_choose_state(pdev, state));</div><div class='ctx'> </div><div class='hunk'>@@ -10174,7 +10339,7 @@ static int bnx2x_resume(struct pci_dev *pdev)</div><div class='ctx'> 	bnx2x_set_power_state(bp, PCI_D0);</div><div class='ctx'> 	netif_device_attach(dev);</div><div class='ctx'> </div><div class='del'>-	rc = bnx2x_nic_load(bp, LOAD_NORMAL);</div><div class='add'>+	rc = bnx2x_nic_load(bp, LOAD_OPEN);</div><div class='ctx'> </div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/bnx2x_reg.h b/drivers/net/bnx2x_reg.h<br/>index 15c9a9946724..a67b0c358ae4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bnx2x_reg.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/bnx2x_reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bnx2x_reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bnx2x_reg.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='ctx'>  * the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- * The registers description starts with the regsister Access type followed</div><div class='add'>+ * The registers description starts with the register Access type followed</div><div class='ctx'>  * by size in bits. For example [RW 32]. The access types are:</div><div class='ctx'>  * R  - Read only</div><div class='ctx'>  * RC - Clear on read</div><div class='hunk'>@@ -49,7 +49,7 @@</div><div class='ctx'> /* [RW 10] Write client 0: Assert pause threshold. */</div><div class='ctx'> #define BRB1_REG_PAUSE_LOW_THRESHOLD_0				 0x60068</div><div class='ctx'> #define BRB1_REG_PAUSE_LOW_THRESHOLD_1				 0x6006c</div><div class='del'>-/* [R 24] The number of full blocks occpied by port. */</div><div class='add'>+/* [R 24] The number of full blocks occupied by port. */</div><div class='ctx'> #define BRB1_REG_PORT_NUM_OCC_BLOCKS_0				 0x60094</div><div class='ctx'> /* [RW 1] Reset the design by software. */</div><div class='ctx'> #define BRB1_REG_SOFT_RESET					 0x600dc</div><div class='hunk'>@@ -740,6 +740,7 @@</div><div class='ctx'> #define HC_REG_ATTN_MSG1_ADDR_L 				 0x108020</div><div class='ctx'> #define HC_REG_ATTN_NUM_P0					 0x108038</div><div class='ctx'> #define HC_REG_ATTN_NUM_P1					 0x10803c</div><div class='add'>+#define HC_REG_COMMAND_REG					 0x108180</div><div class='ctx'> #define HC_REG_CONFIG_0 					 0x108000</div><div class='ctx'> #define HC_REG_CONFIG_1 					 0x108004</div><div class='ctx'> #define HC_REG_FUNC_NUM_P0					 0x1080ac</div><div class='hunk'>@@ -1372,6 +1373,23 @@</div><div class='ctx'>    be asserted). */</div><div class='ctx'> #define MISC_REG_DRIVER_CONTROL_16				 0xa5f0</div><div class='ctx'> #define MISC_REG_DRIVER_CONTROL_16_SIZE 			 2</div><div class='add'>+/* [RW 32] The following driver registers(1...16) represent 16 drivers and</div><div class='add'>+   32 clients. Each client can be controlled by one driver only. One in each</div><div class='add'>+   bit represent that this driver control the appropriate client (Ex: bit 5</div><div class='add'>+   is set means this driver control client number 5). addr1 = set; addr0 =</div><div class='add'>+   clear; read from both addresses will give the same result = status. write</div><div class='add'>+   to address 1 will set a request to control all the clients that their</div><div class='add'>+   appropriate bit (in the write command) is set. if the client is free (the</div><div class='add'>+   appropriate bit in all the other drivers is clear) one will be written to</div><div class='add'>+   that driver register; if the client isn't free the bit will remain zero.</div><div class='add'>+   if the appropriate bit is set (the driver request to gain control on a</div><div class='add'>+   client it already controls the ~MISC_REGISTERS_INT_STS.GENERIC_SW</div><div class='add'>+   interrupt will be asserted). write to address 0 will set a request to</div><div class='add'>+   free all the clients that their appropriate bit (in the write command) is</div><div class='add'>+   set. if the appropriate bit is clear (the driver request to free a client</div><div class='add'>+   it doesn't controls the ~MISC_REGISTERS_INT_STS.GENERIC_SW interrupt will</div><div class='add'>+   be asserted). */</div><div class='add'>+#define MISC_REG_DRIVER_CONTROL_7				 0xa3c8</div><div class='ctx'> /* [RW 1] e1hmf for WOL. If clr WOL signal o the PXP will be send on bit 0</div><div class='ctx'>    only. */</div><div class='ctx'> #define MISC_REG_E1HMF_MODE					 0xa5f8</div><div class='hunk'>@@ -1394,13 +1412,13 @@</div><div class='ctx'> #define MISC_REG_GPIO						 0xa490</div><div class='ctx'> /* [R 28] this field hold the last information that caused reserved</div><div class='ctx'>    attention. bits [19:0] - address; [22:20] function; [23] reserved;</div><div class='del'>-   [27:24] the master thatcaused the attention - according to the following</div><div class='add'>+   [27:24] the master that caused the attention - according to the following</div><div class='ctx'>    encodeing:1 = pxp; 2 = mcp; 3 = usdm; 4 = tsdm; 5 = xsdm; 6 = csdm; 7 =</div><div class='ctx'>    dbu; 8 = dmae */</div><div class='ctx'> #define MISC_REG_GRC_RSV_ATTN					 0xa3c0</div><div class='ctx'> /* [R 28] this field hold the last information that caused timeout</div><div class='ctx'>    attention. bits [19:0] - address; [22:20] function; [23] reserved;</div><div class='del'>-   [27:24] the master thatcaused the attention - according to the following</div><div class='add'>+   [27:24] the master that caused the attention - according to the following</div><div class='ctx'>    encodeing:1 = pxp; 2 = mcp; 3 = usdm; 4 = tsdm; 5 = xsdm; 6 = csdm; 7 =</div><div class='ctx'>    dbu; 8 = dmae */</div><div class='ctx'> #define MISC_REG_GRC_TIMEOUT_ATTN				 0xa3c4</div><div class='hunk'>@@ -1677,6 +1695,7 @@</div><div class='ctx'> /* [RW 8] init credit counter for port0 in LLH */</div><div class='ctx'> #define NIG_REG_LLH0_XCM_INIT_CREDIT				 0x10554</div><div class='ctx'> #define NIG_REG_LLH0_XCM_MASK					 0x10130</div><div class='add'>+#define NIG_REG_LLH1_BRB1_DRV_MASK				 0x10248</div><div class='ctx'> /* [RW 1] send to BRB1 if no match on any of RMP rules. */</div><div class='ctx'> #define NIG_REG_LLH1_BRB1_NOT_MCP				 0x102dc</div><div class='ctx'> /* [RW 2] Determine the classification participants. 0: no classification.1:</div><div class='hunk'>@@ -1727,6 +1746,9 @@</div><div class='ctx'> /* [R 32] Rx statistics : In user packets discarded due to BRB backpressure</div><div class='ctx'>    for port0 */</div><div class='ctx'> #define NIG_REG_STAT0_BRB_DISCARD				 0x105f0</div><div class='add'>+/* [R 32] Rx statistics : In user packets truncated due to BRB backpressure</div><div class='add'>+   for port0 */</div><div class='add'>+#define NIG_REG_STAT0_BRB_TRUNCATE				 0x105f8</div><div class='ctx'> /* [WB_R 36] Tx statistics : Number of packets from emac0 or bmac0 that</div><div class='ctx'>    between 1024 and 1522 bytes for port0 */</div><div class='ctx'> #define NIG_REG_STAT0_EGRESS_MAC_PKT0				 0x10750</div><div class='hunk'>@@ -2298,7 +2320,7 @@</div><div class='ctx'> /* [RW 3] page size in L2P table for QM module; -4k; -8k; -16k; -32k; -64k;</div><div class='ctx'>    -128k */</div><div class='ctx'> #define PXP2_REG_RQ_QM_P_SIZE					 0x120050</div><div class='del'>-/* [RW 1] 1' indicates that the RBC has finished configurating the PSWRQ */</div><div class='add'>+/* [RW 1] 1' indicates that the RBC has finished configuring the PSWRQ */</div><div class='ctx'> #define PXP2_REG_RQ_RBC_DONE					 0x1201b0</div><div class='ctx'> /* [RW 3] Max burst size filed for read requests port 0; 000 - 128B;</div><div class='ctx'>    001:256B; 010: 512B; 11:1K:100:2K; 01:4K */</div><div class='hunk'>@@ -2406,7 +2428,7 @@</div><div class='ctx'> /* [RW 2] 0 - 128B;  - 256B;  - 512B;  - 1024B; when the payload in the</div><div class='ctx'>    buffer reaches this number has_payload will be asserted */</div><div class='ctx'> #define PXP2_REG_WR_DMAE_MPS					 0x1205ec</div><div class='del'>-/* [RW 10] if Number of entries in dmae fifo will be higer than this</div><div class='add'>+/* [RW 10] if Number of entries in dmae fifo will be higher than this</div><div class='ctx'>    threshold then has_payload indication will be asserted; the default value</div><div class='ctx'>    should be equal to &amp;gt;  write MBS size! */</div><div class='ctx'> #define PXP2_REG_WR_DMAE_TH					 0x120368</div><div class='hunk'>@@ -2427,7 +2449,7 @@</div><div class='ctx'> /* [RW 2] 0 - 128B;  - 256B;  - 512B;  - 1024B; when the payload in the</div><div class='ctx'>    buffer reaches this number has_payload will be asserted */</div><div class='ctx'> #define PXP2_REG_WR_TSDM_MPS					 0x1205d4</div><div class='del'>-/* [RW 10] if Number of entries in usdmdp fifo will be higer than this</div><div class='add'>+/* [RW 10] if Number of entries in usdmdp fifo will be higher than this</div><div class='ctx'>    threshold then has_payload indication will be asserted; the default value</div><div class='ctx'>    should be equal to &amp;gt;  write MBS size! */</div><div class='ctx'> #define PXP2_REG_WR_USDMDP_TH					 0x120348</div><div class='hunk'>@@ -3294,12 +3316,12 @@</div><div class='ctx'> #define XSEM_XSEM_INT_MASK_0_REG_ADDRESS_ERROR_SIZE		 0</div><div class='ctx'> #define CFC_DEBUG1_REG_WRITE_AC 				 (0x1&lt;&lt;4)</div><div class='ctx'> #define CFC_DEBUG1_REG_WRITE_AC_SIZE				 4</div><div class='del'>-/* [R 1] debug only: This bit indicates wheter indicates that external</div><div class='add'>+/* [R 1] debug only: This bit indicates whether indicates that external</div><div class='ctx'>    buffer was wrapped (oldest data was thrown); Relevant only when</div><div class='ctx'>    ~dbg_registers_debug_target=2 (PCI) &amp; ~dbg_registers_full_mode=1 (wrap); */</div><div class='ctx'> #define DBG_REG_WRAP_ON_EXT_BUFFER				 0xc124</div><div class='ctx'> #define DBG_REG_WRAP_ON_EXT_BUFFER_SIZE 			 1</div><div class='del'>-/* [R 1] debug only: This bit indicates wheter the internal buffer was</div><div class='add'>+/* [R 1] debug only: This bit indicates whether the internal buffer was</div><div class='ctx'>    wrapped (oldest data was thrown) Relevant only when</div><div class='ctx'>    ~dbg_registers_debug_target=0 (internal buffer) */</div><div class='ctx'> #define DBG_REG_WRAP_ON_INT_BUFFER				 0xc128</div><div class='hunk'>@@ -4944,6 +4966,7 @@</div><div class='ctx'> #define EMAC_RX_MODE_PROMISCUOUS				 (1L&lt;&lt;8)</div><div class='ctx'> #define EMAC_RX_MTU_SIZE_JUMBO_ENA				 (1L&lt;&lt;31)</div><div class='ctx'> #define EMAC_TX_MODE_EXT_PAUSE_EN				 (1L&lt;&lt;3)</div><div class='add'>+#define EMAC_TX_MODE_FLOW_EN					 (1L&lt;&lt;4)</div><div class='ctx'> #define MISC_REGISTERS_GPIO_0					 0</div><div class='ctx'> #define MISC_REGISTERS_GPIO_1					 1</div><div class='ctx'> #define MISC_REGISTERS_GPIO_2					 2</div><div class='hunk'>@@ -4959,6 +4982,7 @@</div><div class='ctx'> #define MISC_REGISTERS_GPIO_PORT_SHIFT				 4</div><div class='ctx'> #define MISC_REGISTERS_GPIO_SET_POS				 8</div><div class='ctx'> #define MISC_REGISTERS_RESET_REG_1_CLEAR			 0x588</div><div class='add'>+#define MISC_REGISTERS_RESET_REG_1_RST_NIG			 (0x1&lt;&lt;7)</div><div class='ctx'> #define MISC_REGISTERS_RESET_REG_1_SET				 0x584</div><div class='ctx'> #define MISC_REGISTERS_RESET_REG_2_CLEAR			 0x598</div><div class='ctx'> #define MISC_REGISTERS_RESET_REG_2_RST_BMAC0			 (0x1&lt;&lt;0)</div><div class='hunk'>@@ -4993,7 +5017,9 @@</div><div class='ctx'> #define HW_LOCK_MAX_RESOURCE_VALUE				 31</div><div class='ctx'> #define HW_LOCK_RESOURCE_8072_MDIO				 0</div><div class='ctx'> #define HW_LOCK_RESOURCE_GPIO					 1</div><div class='add'>+#define HW_LOCK_RESOURCE_PORT0_ATT_MASK 			 3</div><div class='ctx'> #define HW_LOCK_RESOURCE_SPIO					 2</div><div class='add'>+#define HW_LOCK_RESOURCE_UNDI					 5</div><div class='ctx'> #define AEU_INPUTS_ATTN_BITS_BRB_PARITY_ERROR		      (1&lt;&lt;18)</div><div class='ctx'> #define AEU_INPUTS_ATTN_BITS_CCM_HW_INTERRUPT		      (1&lt;&lt;31)</div><div class='ctx'> #define AEU_INPUTS_ATTN_BITS_CDU_HW_INTERRUPT		      (1&lt;&lt;9)</div><div class='hunk'>@@ -5144,59 +5170,73 @@</div><div class='ctx'> #define GRCBASE_MISC_AEU	GRCBASE_MISC</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*the offset of the configuration space in the pci core register*/</div><div class='add'>+/* offset of configuration space in the pci core register */</div><div class='ctx'> #define PCICFG_OFFSET					0x2000</div><div class='ctx'> #define PCICFG_VENDOR_ID_OFFSET 			0x00</div><div class='ctx'> #define PCICFG_DEVICE_ID_OFFSET 			0x02</div><div class='ctx'> #define PCICFG_COMMAND_OFFSET				0x04</div><div class='add'>+#define PCICFG_COMMAND_IO_SPACE 		(1&lt;&lt;0)</div><div class='add'>+#define PCICFG_COMMAND_MEM_SPACE		(1&lt;&lt;1)</div><div class='add'>+#define PCICFG_COMMAND_BUS_MASTER		(1&lt;&lt;2)</div><div class='add'>+#define PCICFG_COMMAND_SPECIAL_CYCLES		(1&lt;&lt;3)</div><div class='add'>+#define PCICFG_COMMAND_MWI_CYCLES		(1&lt;&lt;4)</div><div class='add'>+#define PCICFG_COMMAND_VGA_SNOOP		(1&lt;&lt;5)</div><div class='add'>+#define PCICFG_COMMAND_PERR_ENA 		(1&lt;&lt;6)</div><div class='add'>+#define PCICFG_COMMAND_STEPPING 		(1&lt;&lt;7)</div><div class='add'>+#define PCICFG_COMMAND_SERR_ENA 		(1&lt;&lt;8)</div><div class='add'>+#define PCICFG_COMMAND_FAST_B2B 		(1&lt;&lt;9)</div><div class='add'>+#define PCICFG_COMMAND_INT_DISABLE		(1&lt;&lt;10)</div><div class='add'>+#define PCICFG_COMMAND_RESERVED 		(0x1f&lt;&lt;11)</div><div class='ctx'> #define PCICFG_STATUS_OFFSET				0x06</div><div class='del'>-#define PCICFG_REVESION_ID				    0x08</div><div class='add'>+#define PCICFG_REVESION_ID				0x08</div><div class='ctx'> #define PCICFG_CACHE_LINE_SIZE				0x0c</div><div class='ctx'> #define PCICFG_LATENCY_TIMER				0x0d</div><div class='del'>-#define PCICFG_BAR_1_LOW				    0x10</div><div class='del'>-#define PCICFG_BAR_1_HIGH				    0x14</div><div class='del'>-#define PCICFG_BAR_2_LOW				    0x18</div><div class='del'>-#define PCICFG_BAR_2_HIGH				    0x1c</div><div class='del'>-#define PCICFG_SUBSYSTEM_VENDOR_ID_OFFSET	0x2c</div><div class='add'>+#define PCICFG_BAR_1_LOW				0x10</div><div class='add'>+#define PCICFG_BAR_1_HIGH				0x14</div><div class='add'>+#define PCICFG_BAR_2_LOW				0x18</div><div class='add'>+#define PCICFG_BAR_2_HIGH				0x1c</div><div class='add'>+#define PCICFG_SUBSYSTEM_VENDOR_ID_OFFSET		0x2c</div><div class='ctx'> #define PCICFG_SUBSYSTEM_ID_OFFSET			0x2e</div><div class='del'>-#define PCICFG_INT_LINE 				    0x3c</div><div class='del'>-#define PCICFG_INT_PIN					    0x3d</div><div class='del'>-#define PCICFG_PM_CSR_OFFSET			0x4c</div><div class='del'>-#define PCICFG_GRC_ADDRESS				    0x78</div><div class='del'>-#define PCICFG_GRC_DATA 				    0x80</div><div class='add'>+#define PCICFG_INT_LINE 				0x3c</div><div class='add'>+#define PCICFG_INT_PIN					0x3d</div><div class='add'>+#define PCICFG_PM_CAPABILITY				0x48</div><div class='add'>+#define PCICFG_PM_CAPABILITY_VERSION		(0x3&lt;&lt;16)</div><div class='add'>+#define PCICFG_PM_CAPABILITY_CLOCK		(1&lt;&lt;19)</div><div class='add'>+#define PCICFG_PM_CAPABILITY_RESERVED		(1&lt;&lt;20)</div><div class='add'>+#define PCICFG_PM_CAPABILITY_DSI		(1&lt;&lt;21)</div><div class='add'>+#define PCICFG_PM_CAPABILITY_AUX_CURRENT	(0x7&lt;&lt;22)</div><div class='add'>+#define PCICFG_PM_CAPABILITY_D1_SUPPORT 	(1&lt;&lt;25)</div><div class='add'>+#define PCICFG_PM_CAPABILITY_D2_SUPPORT 	(1&lt;&lt;26)</div><div class='add'>+#define PCICFG_PM_CAPABILITY_PME_IN_D0		(1&lt;&lt;27)</div><div class='add'>+#define PCICFG_PM_CAPABILITY_PME_IN_D1		(1&lt;&lt;28)</div><div class='add'>+#define PCICFG_PM_CAPABILITY_PME_IN_D2		(1&lt;&lt;29)</div><div class='add'>+#define PCICFG_PM_CAPABILITY_PME_IN_D3_HOT	(1&lt;&lt;30)</div><div class='add'>+#define PCICFG_PM_CAPABILITY_PME_IN_D3_COLD	(1&lt;&lt;31)</div><div class='add'>+#define PCICFG_PM_CSR_OFFSET				0x4c</div><div class='add'>+#define PCICFG_PM_CSR_STATE			(0x3&lt;&lt;0)</div><div class='add'>+#define PCICFG_PM_CSR_PME_ENABLE		(1&lt;&lt;8)</div><div class='add'>+#define PCICFG_PM_CSR_PME_STATUS		(1&lt;&lt;15)</div><div class='add'>+#define PCICFG_GRC_ADDRESS				0x78</div><div class='add'>+#define PCICFG_GRC_DATA 				0x80</div><div class='ctx'> #define PCICFG_DEVICE_CONTROL				0xb4</div><div class='ctx'> #define PCICFG_LINK_CONTROL				0xbc</div><div class='ctx'> </div><div class='del'>-#define PCICFG_COMMAND_IO_SPACE 		    (1&lt;&lt;0)</div><div class='del'>-#define PCICFG_COMMAND_MEM_SPACE		    (1&lt;&lt;1)</div><div class='del'>-#define PCICFG_COMMAND_BUS_MASTER		    (1&lt;&lt;2)</div><div class='del'>-#define PCICFG_COMMAND_SPECIAL_CYCLES		    (1&lt;&lt;3)</div><div class='del'>-#define PCICFG_COMMAND_MWI_CYCLES		    (1&lt;&lt;4)</div><div class='del'>-#define PCICFG_COMMAND_VGA_SNOOP		    (1&lt;&lt;5)</div><div class='del'>-#define PCICFG_COMMAND_PERR_ENA 		    (1&lt;&lt;6)</div><div class='del'>-#define PCICFG_COMMAND_STEPPING 		    (1&lt;&lt;7)</div><div class='del'>-#define PCICFG_COMMAND_SERR_ENA 		    (1&lt;&lt;8)</div><div class='del'>-#define PCICFG_COMMAND_FAST_B2B 		    (1&lt;&lt;9)</div><div class='del'>-#define PCICFG_COMMAND_INT_DISABLE		    (1&lt;&lt;10)</div><div class='del'>-#define PCICFG_COMMAND_RESERVED 		    (0x1f&lt;&lt;11)</div><div class='del'>-</div><div class='del'>-#define PCICFG_PM_CSR_STATE			    (0x3&lt;&lt;0)</div><div class='del'>-#define PCICFG_PM_CSR_PME_STATUS		    (1&lt;&lt;15)</div><div class='ctx'> </div><div class='ctx'> #define BAR_USTRORM_INTMEM				0x400000</div><div class='ctx'> #define BAR_CSTRORM_INTMEM				0x410000</div><div class='ctx'> #define BAR_XSTRORM_INTMEM				0x420000</div><div class='ctx'> #define BAR_TSTRORM_INTMEM				0x430000</div><div class='ctx'> </div><div class='add'>+/* for accessing the IGU in case of status block ACK */</div><div class='ctx'> #define BAR_IGU_INTMEM					0x440000</div><div class='ctx'> </div><div class='ctx'> #define BAR_DOORBELL_OFFSET				0x800000</div><div class='ctx'> </div><div class='ctx'> #define BAR_ME_REGISTER 				0x450000</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define GRC_CONFIG_2_SIZE_REG		    0x408 /* config_2 offset */</div><div class='del'>-#define PCI_CONFIG_2_BAR1_SIZE			    (0xfL&lt;&lt;0)</div><div class='add'>+/* config_2 offset */</div><div class='add'>+#define GRC_CONFIG_2_SIZE_REG				0x408</div><div class='add'>+#define PCI_CONFIG_2_BAR1_SIZE			(0xfL&lt;&lt;0)</div><div class='ctx'> #define PCI_CONFIG_2_BAR1_SIZE_DISABLED 	(0L&lt;&lt;0)</div><div class='ctx'> #define PCI_CONFIG_2_BAR1_SIZE_64K		(1L&lt;&lt;0)</div><div class='ctx'> #define PCI_CONFIG_2_BAR1_SIZE_128K		(2L&lt;&lt;0)</div><div class='hunk'>@@ -5213,11 +5253,11 @@</div><div class='ctx'> #define PCI_CONFIG_2_BAR1_SIZE_256M		(13L&lt;&lt;0)</div><div class='ctx'> #define PCI_CONFIG_2_BAR1_SIZE_512M		(14L&lt;&lt;0)</div><div class='ctx'> #define PCI_CONFIG_2_BAR1_SIZE_1G		(15L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR1_64ENA 		    (1L&lt;&lt;4)</div><div class='del'>-#define PCI_CONFIG_2_EXP_ROM_RETRY		    (1L&lt;&lt;5)</div><div class='del'>-#define PCI_CONFIG_2_CFG_CYCLE_RETRY		    (1L&lt;&lt;6)</div><div class='del'>-#define PCI_CONFIG_2_FIRST_CFG_DONE		    (1L&lt;&lt;7)</div><div class='del'>-#define PCI_CONFIG_2_EXP_ROM_SIZE		    (0xffL&lt;&lt;8)</div><div class='add'>+#define PCI_CONFIG_2_BAR1_64ENA 		(1L&lt;&lt;4)</div><div class='add'>+#define PCI_CONFIG_2_EXP_ROM_RETRY		(1L&lt;&lt;5)</div><div class='add'>+#define PCI_CONFIG_2_CFG_CYCLE_RETRY		(1L&lt;&lt;6)</div><div class='add'>+#define PCI_CONFIG_2_FIRST_CFG_DONE		(1L&lt;&lt;7)</div><div class='add'>+#define PCI_CONFIG_2_EXP_ROM_SIZE		(0xffL&lt;&lt;8)</div><div class='ctx'> #define PCI_CONFIG_2_EXP_ROM_SIZE_DISABLED	(0L&lt;&lt;8)</div><div class='ctx'> #define PCI_CONFIG_2_EXP_ROM_SIZE_2K		(1L&lt;&lt;8)</div><div class='ctx'> #define PCI_CONFIG_2_EXP_ROM_SIZE_4K		(2L&lt;&lt;8)</div><div class='hunk'>@@ -5234,46 +5274,44 @@</div><div class='ctx'> #define PCI_CONFIG_2_EXP_ROM_SIZE_8M		(13L&lt;&lt;8)</div><div class='ctx'> #define PCI_CONFIG_2_EXP_ROM_SIZE_16M		(14L&lt;&lt;8)</div><div class='ctx'> #define PCI_CONFIG_2_EXP_ROM_SIZE_32M		(15L&lt;&lt;8)</div><div class='del'>-#define PCI_CONFIG_2_BAR_PREFETCH		    (1L&lt;&lt;16)</div><div class='del'>-#define PCI_CONFIG_2_RESERVED0			    (0x7fffL&lt;&lt;17)</div><div class='add'>+#define PCI_CONFIG_2_BAR_PREFETCH		(1L&lt;&lt;16)</div><div class='add'>+#define PCI_CONFIG_2_RESERVED0			(0x7fffL&lt;&lt;17)</div><div class='ctx'> </div><div class='ctx'> /* config_3 offset */</div><div class='del'>-#define GRC_CONFIG_3_SIZE_REG				(0x40c)</div><div class='del'>-#define PCI_CONFIG_3_STICKY_BYTE		    (0xffL&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_3_FORCE_PME			    (1L&lt;&lt;24)</div><div class='del'>-#define PCI_CONFIG_3_PME_STATUS 		    (1L&lt;&lt;25)</div><div class='del'>-#define PCI_CONFIG_3_PME_ENABLE 		    (1L&lt;&lt;26)</div><div class='del'>-#define PCI_CONFIG_3_PM_STATE			    (0x3L&lt;&lt;27)</div><div class='del'>-#define PCI_CONFIG_3_VAUX_PRESET		    (1L&lt;&lt;30)</div><div class='del'>-#define PCI_CONFIG_3_PCI_POWER			    (1L&lt;&lt;31)</div><div class='del'>-</div><div class='del'>-/* config_2 offset */</div><div class='del'>-#define GRC_CONFIG_2_SIZE_REG		    0x408</div><div class='add'>+#define GRC_CONFIG_3_SIZE_REG				0x40c</div><div class='add'>+#define PCI_CONFIG_3_STICKY_BYTE		(0xffL&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_3_FORCE_PME			(1L&lt;&lt;24)</div><div class='add'>+#define PCI_CONFIG_3_PME_STATUS 		(1L&lt;&lt;25)</div><div class='add'>+#define PCI_CONFIG_3_PME_ENABLE 		(1L&lt;&lt;26)</div><div class='add'>+#define PCI_CONFIG_3_PM_STATE			(0x3L&lt;&lt;27)</div><div class='add'>+#define PCI_CONFIG_3_VAUX_PRESET		(1L&lt;&lt;30)</div><div class='add'>+#define PCI_CONFIG_3_PCI_POWER			(1L&lt;&lt;31)</div><div class='ctx'> </div><div class='ctx'> #define GRC_BAR2_CONFIG 				0x4e0</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE			    (0xfL&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE_DISABLED 	    (0L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE_64K		    (1L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE_128K		    (2L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE_256K		    (3L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE_512K		    (4L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE_1M		    (5L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE_2M		    (6L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE_4M		    (7L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE_8M		    (8L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE_16M		    (9L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE_32M		    (10L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE_64M		    (11L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE_128M		    (12L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE_256M		    (13L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE_512M		    (14L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_SIZE_1G		    (15L&lt;&lt;0)</div><div class='del'>-#define PCI_CONFIG_2_BAR2_64ENA 		    (1L&lt;&lt;4)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE			(0xfL&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE_DISABLED 	(0L&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE_64K		(1L&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE_128K		(2L&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE_256K		(3L&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE_512K		(4L&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE_1M		(5L&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE_2M		(6L&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE_4M		(7L&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE_8M		(8L&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE_16M		(9L&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE_32M		(10L&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE_64M		(11L&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE_128M		(12L&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE_256M		(13L&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE_512M		(14L&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_SIZE_1G		(15L&lt;&lt;0)</div><div class='add'>+#define PCI_CONFIG_2_BAR2_64ENA 		(1L&lt;&lt;4)</div><div class='add'>+</div><div class='add'>+#define PCI_PM_DATA_A					0x410</div><div class='add'>+#define PCI_PM_DATA_B					0x414</div><div class='add'>+#define PCI_ID_VAL1					0x434</div><div class='add'>+#define PCI_ID_VAL2					0x438</div><div class='ctx'> </div><div class='del'>-#define PCI_PM_DATA_A					(0x410)</div><div class='del'>-#define PCI_PM_DATA_B					(0x414)</div><div class='del'>-#define PCI_ID_VAL1					(0x434)</div><div class='del'>-#define PCI_ID_VAL2					(0x438)</div><div class='ctx'> </div><div class='ctx'> #define MDIO_REG_BANK_CL73_IEEEB0			0x0</div><div class='ctx'> #define MDIO_CL73_IEEEB0_CL73_AN_CONTROL		0x0</div><div class='hunk'>@@ -5522,6 +5560,8 @@ Theotherbitsarereservedandshouldbezero*/</div><div class='ctx'> #define MDIO_PMA_REG_GEN_CTRL		0xca10</div><div class='ctx'> #define MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP	0x0188</div><div class='ctx'> #define MDIO_PMA_REG_GEN_CTRL_ROM_MICRO_RESET		0x018a</div><div class='add'>+#define MDIO_PMA_REG_M8051_MSGIN_REG	0xca12</div><div class='add'>+#define MDIO_PMA_REG_M8051_MSGOUT_REG	0xca13</div><div class='ctx'> #define MDIO_PMA_REG_ROM_VER1		0xca19</div><div class='ctx'> #define MDIO_PMA_REG_ROM_VER2		0xca1a</div><div class='ctx'> #define MDIO_PMA_REG_EDC_FFE_MAIN	0xca1b</div><div class='hunk'>@@ -5576,7 +5616,8 @@ Theotherbitsarereservedandshouldbezero*/</div><div class='ctx'> #define MDIO_AN_REG_LINK_STATUS 	0x8304</div><div class='ctx'> #define MDIO_AN_REG_CL37_CL73		0x8370</div><div class='ctx'> #define MDIO_AN_REG_CL37_AN		0xffe0</div><div class='del'>-#define MDIO_AN_REG_CL37_FD		0xffe4</div><div class='add'>+#define MDIO_AN_REG_CL37_FC_LD		0xffe4</div><div class='add'>+#define MDIO_AN_REG_CL37_FC_LP		0xffe5</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define IGU_FUNC_BASE			0x0400</div><div class='hunk'>@@ -5600,4 +5641,13 @@ Theotherbitsarereservedandshouldbezero*/</div><div class='ctx'> #define IGU_INT_NOP				2</div><div class='ctx'> #define IGU_INT_NOP2			3</div><div class='ctx'> </div><div class='add'>+#define COMMAND_REG_INT_ACK	    0x0</div><div class='add'>+#define COMMAND_REG_PROD_UPD	    0x4</div><div class='add'>+#define COMMAND_REG_ATTN_BITS_UPD   0x8</div><div class='add'>+#define COMMAND_REG_ATTN_BITS_SET   0xc</div><div class='add'>+#define COMMAND_REG_ATTN_BITS_CLR   0x10</div><div class='add'>+#define COMMAND_REG_COALESCE_NOW    0x14</div><div class='add'>+#define COMMAND_REG_SIMD_MASK	    0x18</div><div class='add'>+#define COMMAND_REG_SIMD_NOMASK     0x1c</div><div class='add'>+</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c<br/>index ebb539e090c3..6106660a4a44 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_3ad.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/bonding/bond_3ad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_3ad.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bonding/bond_3ad.c</a></div><div class='hunk'>@@ -2107,6 +2107,7 @@ void bond_3ad_state_machine_handler(struct work_struct *work)</div><div class='ctx'> 			aggregator = __get_first_agg(port);</div><div class='ctx'> 			ad_agg_selection_logic(aggregator);</div><div class='ctx'> 		}</div><div class='add'>+		bond_3ad_set_carrier(bond);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	// for each port run the state machines</div><div class='head'>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c<br/>index a641eeaa2a2f..c792138511e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_main.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/bonding/bond_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bonding/bond_main.c</a></div><div class='hunk'>@@ -2223,272 +2223,217 @@ static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *in</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------- Monitoring -------------------------------*/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * if !have_locks, return nonzero if a failover is necessary.  if</div><div class='del'>- * have_locks, do whatever failover activities are needed.</div><div class='del'>- *</div><div class='del'>- * This is to separate the inspection and failover steps for locking</div><div class='del'>- * purposes; failover requires rtnl, but acquiring it for every</div><div class='del'>- * inspection is undesirable, so a wrapper first does inspection, and</div><div class='del'>- * the acquires the necessary locks and calls again to perform</div><div class='del'>- * failover if needed.  Since all locks are dropped, a complete</div><div class='del'>- * restart is needed between calls.</div><div class='del'>- */</div><div class='del'>-static int __bond_mii_monitor(struct bonding *bond, int have_locks)</div><div class='del'>-{</div><div class='del'>-	struct slave *slave, *oldcurrent;</div><div class='del'>-	int do_failover = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (bond-&gt;slave_cnt == 0)</div><div class='del'>-		goto out;</div><div class='ctx'> </div><div class='del'>-	/* we will try to read the link status of each of our slaves, and</div><div class='del'>-	 * set their IFF_RUNNING flag appropriately. For each slave not</div><div class='del'>-	 * supporting MII status, we won't do anything so that a user-space</div><div class='del'>-	 * program could monitor the link itself if needed.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	read_lock(&amp;bond-&gt;curr_slave_lock);</div><div class='del'>-	oldcurrent = bond-&gt;curr_active_slave;</div><div class='del'>-	read_unlock(&amp;bond-&gt;curr_slave_lock);</div><div class='add'>+static int bond_miimon_inspect(struct bonding *bond)</div><div class='add'>+{</div><div class='add'>+	struct slave *slave;</div><div class='add'>+	int i, link_state, commit = 0;</div><div class='ctx'> </div><div class='ctx'> 	bond_for_each_slave(bond, slave, i) {</div><div class='del'>-		struct net_device *slave_dev = slave-&gt;dev;</div><div class='del'>-		int link_state;</div><div class='del'>-		u16 old_speed = slave-&gt;speed;</div><div class='del'>-		u8 old_duplex = slave-&gt;duplex;</div><div class='add'>+		slave-&gt;new_link = BOND_LINK_NOCHANGE;</div><div class='ctx'> </div><div class='del'>-		link_state = bond_check_dev_link(bond, slave_dev, 0);</div><div class='add'>+		link_state = bond_check_dev_link(bond, slave-&gt;dev, 0);</div><div class='ctx'> </div><div class='ctx'> 		switch (slave-&gt;link) {</div><div class='del'>-		case BOND_LINK_UP:	/* the link was up */</div><div class='del'>-			if (link_state == BMSR_LSTATUS) {</div><div class='del'>-				if (!oldcurrent) {</div><div class='del'>-					if (!have_locks)</div><div class='del'>-						return 1;</div><div class='del'>-					do_failover = 1;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			} else { /* link going down */</div><div class='del'>-				slave-&gt;link  = BOND_LINK_FAIL;</div><div class='del'>-				slave-&gt;delay = bond-&gt;params.downdelay;</div><div class='del'>-</div><div class='del'>-				if (slave-&gt;link_failure_count &lt; UINT_MAX) {</div><div class='del'>-					slave-&gt;link_failure_count++;</div><div class='del'>-				}</div><div class='add'>+		case BOND_LINK_UP:</div><div class='add'>+			if (link_state)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-				if (bond-&gt;params.downdelay) {</div><div class='del'>-					printk(KERN_INFO DRV_NAME</div><div class='del'>-					       ": %s: link status down for %s "</div><div class='del'>-					       "interface %s, disabling it in "</div><div class='del'>-					       "%d ms.\n",</div><div class='del'>-					       bond-&gt;dev-&gt;name,</div><div class='del'>-					       IS_UP(slave_dev)</div><div class='del'>-					       ? ((bond-&gt;params.mode == BOND_MODE_ACTIVEBACKUP)</div><div class='del'>-						  ? ((slave == oldcurrent)</div><div class='del'>-						     ? "active " : "backup ")</div><div class='del'>-						  : "")</div><div class='del'>-					       : "idle ",</div><div class='del'>-					       slave_dev-&gt;name,</div><div class='del'>-					       bond-&gt;params.downdelay * bond-&gt;params.miimon);</div><div class='del'>-				}</div><div class='add'>+			slave-&gt;link = BOND_LINK_FAIL;</div><div class='add'>+			slave-&gt;delay = bond-&gt;params.downdelay;</div><div class='add'>+			if (slave-&gt;delay) {</div><div class='add'>+				printk(KERN_INFO DRV_NAME</div><div class='add'>+				       ": %s: link status down for %s"</div><div class='add'>+				       "interface %s, disabling it in %d ms.\n",</div><div class='add'>+				       bond-&gt;dev-&gt;name,</div><div class='add'>+				       (bond-&gt;params.mode ==</div><div class='add'>+					BOND_MODE_ACTIVEBACKUP) ?</div><div class='add'>+				       ((slave-&gt;state == BOND_STATE_ACTIVE) ?</div><div class='add'>+					"active " : "backup ") : "",</div><div class='add'>+				       slave-&gt;dev-&gt;name,</div><div class='add'>+				       bond-&gt;params.downdelay * bond-&gt;params.miimon);</div><div class='ctx'> 			}</div><div class='del'>-			/* no break ! fall through the BOND_LINK_FAIL test to</div><div class='del'>-			   ensure proper action to be taken</div><div class='del'>-			*/</div><div class='del'>-		case BOND_LINK_FAIL:	/* the link has just gone down */</div><div class='del'>-			if (link_state != BMSR_LSTATUS) {</div><div class='del'>-				/* link stays down */</div><div class='del'>-				if (slave-&gt;delay &lt;= 0) {</div><div class='del'>-					if (!have_locks)</div><div class='del'>-						return 1;</div><div class='del'>-</div><div class='del'>-					/* link down for too long time */</div><div class='del'>-					slave-&gt;link = BOND_LINK_DOWN;</div><div class='del'>-</div><div class='del'>-					/* in active/backup mode, we must</div><div class='del'>-					 * completely disable this interface</div><div class='del'>-					 */</div><div class='del'>-					if ((bond-&gt;params.mode == BOND_MODE_ACTIVEBACKUP) ||</div><div class='del'>-					    (bond-&gt;params.mode == BOND_MODE_8023AD)) {</div><div class='del'>-						bond_set_slave_inactive_flags(slave);</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					printk(KERN_INFO DRV_NAME</div><div class='del'>-					       ": %s: link status definitely "</div><div class='del'>-					       "down for interface %s, "</div><div class='del'>-					       "disabling it\n",</div><div class='del'>-					       bond-&gt;dev-&gt;name,</div><div class='del'>-					       slave_dev-&gt;name);</div><div class='del'>-</div><div class='del'>-					/* notify ad that the link status has changed */</div><div class='del'>-					if (bond-&gt;params.mode == BOND_MODE_8023AD) {</div><div class='del'>-						bond_3ad_handle_link_change(slave, BOND_LINK_DOWN);</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					if ((bond-&gt;params.mode == BOND_MODE_TLB) ||</div><div class='del'>-					    (bond-&gt;params.mode == BOND_MODE_ALB)) {</div><div class='del'>-						bond_alb_handle_link_change(bond, slave, BOND_LINK_DOWN);</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					if (slave == oldcurrent) {</div><div class='del'>-						do_failover = 1;</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					slave-&gt;delay--;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				/* link up again */</div><div class='del'>-				slave-&gt;link  = BOND_LINK_UP;</div><div class='add'>+			/*FALLTHRU*/</div><div class='add'>+		case BOND_LINK_FAIL:</div><div class='add'>+			if (link_state) {</div><div class='add'>+				/*</div><div class='add'>+				 * recovered before downdelay expired</div><div class='add'>+				 */</div><div class='add'>+				slave-&gt;link = BOND_LINK_UP;</div><div class='ctx'> 				slave-&gt;jiffies = jiffies;</div><div class='ctx'> 				printk(KERN_INFO DRV_NAME</div><div class='ctx'> 				       ": %s: link status up again after %d "</div><div class='ctx'> 				       "ms for interface %s.\n",</div><div class='ctx'> 				       bond-&gt;dev-&gt;name,</div><div class='del'>-				       (bond-&gt;params.downdelay - slave-&gt;delay) * bond-&gt;params.miimon,</div><div class='del'>-				       slave_dev-&gt;name);</div><div class='add'>+				       (bond-&gt;params.downdelay - slave-&gt;delay) *</div><div class='add'>+				       bond-&gt;params.miimon,</div><div class='add'>+				       slave-&gt;dev-&gt;name);</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='del'>-			break;</div><div class='del'>-		case BOND_LINK_DOWN:	/* the link was down */</div><div class='del'>-			if (link_state != BMSR_LSTATUS) {</div><div class='del'>-				/* the link stays down, nothing more to do */</div><div class='del'>-				break;</div><div class='del'>-			} else {	/* link going up */</div><div class='del'>-				slave-&gt;link  = BOND_LINK_BACK;</div><div class='del'>-				slave-&gt;delay = bond-&gt;params.updelay;</div><div class='ctx'> </div><div class='del'>-				if (bond-&gt;params.updelay) {</div><div class='del'>-					/* if updelay == 0, no need to</div><div class='del'>-					   advertise about a 0 ms delay */</div><div class='del'>-					printk(KERN_INFO DRV_NAME</div><div class='del'>-					       ": %s: link status up for "</div><div class='del'>-					       "interface %s, enabling it "</div><div class='del'>-					       "in %d ms.\n",</div><div class='del'>-					       bond-&gt;dev-&gt;name,</div><div class='del'>-					       slave_dev-&gt;name,</div><div class='del'>-					       bond-&gt;params.updelay * bond-&gt;params.miimon);</div><div class='del'>-				}</div><div class='add'>+			if (slave-&gt;delay &lt;= 0) {</div><div class='add'>+				slave-&gt;new_link = BOND_LINK_DOWN;</div><div class='add'>+				commit++;</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='del'>-			/* no break ! fall through the BOND_LINK_BACK state in</div><div class='del'>-			   case there's something to do.</div><div class='del'>-			*/</div><div class='del'>-		case BOND_LINK_BACK:	/* the link has just come back */</div><div class='del'>-			if (link_state != BMSR_LSTATUS) {</div><div class='del'>-				/* link down again */</div><div class='del'>-				slave-&gt;link  = BOND_LINK_DOWN;</div><div class='ctx'> </div><div class='add'>+			slave-&gt;delay--;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case BOND_LINK_DOWN:</div><div class='add'>+			if (!link_state)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			slave-&gt;link = BOND_LINK_BACK;</div><div class='add'>+			slave-&gt;delay = bond-&gt;params.updelay;</div><div class='add'>+</div><div class='add'>+			if (slave-&gt;delay) {</div><div class='add'>+				printk(KERN_INFO DRV_NAME</div><div class='add'>+				       ": %s: link status up for "</div><div class='add'>+				       "interface %s, enabling it in %d ms.\n",</div><div class='add'>+				       bond-&gt;dev-&gt;name, slave-&gt;dev-&gt;name,</div><div class='add'>+				       bond-&gt;params.updelay *</div><div class='add'>+				       bond-&gt;params.miimon);</div><div class='add'>+			}</div><div class='add'>+			/*FALLTHRU*/</div><div class='add'>+		case BOND_LINK_BACK:</div><div class='add'>+			if (!link_state) {</div><div class='add'>+				slave-&gt;link = BOND_LINK_DOWN;</div><div class='ctx'> 				printk(KERN_INFO DRV_NAME</div><div class='ctx'> 				       ": %s: link status down again after %d "</div><div class='ctx'> 				       "ms for interface %s.\n",</div><div class='ctx'> 				       bond-&gt;dev-&gt;name,</div><div class='del'>-				       (bond-&gt;params.updelay - slave-&gt;delay) * bond-&gt;params.miimon,</div><div class='del'>-				       slave_dev-&gt;name);</div><div class='del'>-			} else {</div><div class='del'>-				/* link stays up */</div><div class='del'>-				if (slave-&gt;delay == 0) {</div><div class='del'>-					if (!have_locks)</div><div class='del'>-						return 1;</div><div class='del'>-</div><div class='del'>-					/* now the link has been up for long time enough */</div><div class='del'>-					slave-&gt;link = BOND_LINK_UP;</div><div class='del'>-					slave-&gt;jiffies = jiffies;</div><div class='del'>-</div><div class='del'>-					if (bond-&gt;params.mode == BOND_MODE_8023AD) {</div><div class='del'>-						/* prevent it from being the active one */</div><div class='del'>-						slave-&gt;state = BOND_STATE_BACKUP;</div><div class='del'>-					} else if (bond-&gt;params.mode != BOND_MODE_ACTIVEBACKUP) {</div><div class='del'>-						/* make it immediately active */</div><div class='del'>-						slave-&gt;state = BOND_STATE_ACTIVE;</div><div class='del'>-					} else if (slave != bond-&gt;primary_slave) {</div><div class='del'>-						/* prevent it from being the active one */</div><div class='del'>-						slave-&gt;state = BOND_STATE_BACKUP;</div><div class='del'>-					}</div><div class='add'>+				       (bond-&gt;params.updelay - slave-&gt;delay) *</div><div class='add'>+				       bond-&gt;params.miimon,</div><div class='add'>+				       slave-&gt;dev-&gt;name);</div><div class='ctx'> </div><div class='del'>-					printk(KERN_INFO DRV_NAME</div><div class='del'>-					       ": %s: link status definitely "</div><div class='del'>-					       "up for interface %s.\n",</div><div class='del'>-					       bond-&gt;dev-&gt;name,</div><div class='del'>-					       slave_dev-&gt;name);</div><div class='del'>-</div><div class='del'>-					/* notify ad that the link status has changed */</div><div class='del'>-					if (bond-&gt;params.mode == BOND_MODE_8023AD) {</div><div class='del'>-						bond_3ad_handle_link_change(slave, BOND_LINK_UP);</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					if ((bond-&gt;params.mode == BOND_MODE_TLB) ||</div><div class='del'>-					    (bond-&gt;params.mode == BOND_MODE_ALB)) {</div><div class='del'>-						bond_alb_handle_link_change(bond, slave, BOND_LINK_UP);</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					if ((!oldcurrent) ||</div><div class='del'>-					    (slave == bond-&gt;primary_slave)) {</div><div class='del'>-						do_failover = 1;</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					slave-&gt;delay--;</div><div class='del'>-				}</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			if (slave-&gt;delay &lt;= 0) {</div><div class='add'>+				slave-&gt;new_link = BOND_LINK_UP;</div><div class='add'>+				commit++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			slave-&gt;delay--;</div><div class='ctx'> 			break;</div><div class='del'>-		default:</div><div class='del'>-			/* Should not happen */</div><div class='del'>-			printk(KERN_ERR DRV_NAME</div><div class='del'>-			       ": %s: Error: %s Illegal value (link=%d)\n",</div><div class='del'>-			       bond-&gt;dev-&gt;name,</div><div class='del'>-			       slave-&gt;dev-&gt;name,</div><div class='del'>-			       slave-&gt;link);</div><div class='del'>-			goto out;</div><div class='del'>-		} /* end of switch (slave-&gt;link) */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		bond_update_speed_duplex(slave);</div><div class='add'>+	return commit;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (bond-&gt;params.mode == BOND_MODE_8023AD) {</div><div class='del'>-			if (old_speed != slave-&gt;speed) {</div><div class='del'>-				bond_3ad_adapter_speed_changed(slave);</div><div class='del'>-			}</div><div class='add'>+static void bond_miimon_commit(struct bonding *bond)</div><div class='add'>+{</div><div class='add'>+	struct slave *slave;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bond_for_each_slave(bond, slave, i) {</div><div class='add'>+		switch (slave-&gt;new_link) {</div><div class='add'>+		case BOND_LINK_NOCHANGE:</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		case BOND_LINK_UP:</div><div class='add'>+			slave-&gt;link = BOND_LINK_UP;</div><div class='add'>+			slave-&gt;jiffies = jiffies;</div><div class='ctx'> </div><div class='del'>-			if (old_duplex != slave-&gt;duplex) {</div><div class='del'>-				bond_3ad_adapter_duplex_changed(slave);</div><div class='add'>+			if (bond-&gt;params.mode == BOND_MODE_8023AD) {</div><div class='add'>+				/* prevent it from being the active one */</div><div class='add'>+				slave-&gt;state = BOND_STATE_BACKUP;</div><div class='add'>+			} else if (bond-&gt;params.mode != BOND_MODE_ACTIVEBACKUP) {</div><div class='add'>+				/* make it immediately active */</div><div class='add'>+				slave-&gt;state = BOND_STATE_ACTIVE;</div><div class='add'>+			} else if (slave != bond-&gt;primary_slave) {</div><div class='add'>+				/* prevent it from being the active one */</div><div class='add'>+				slave-&gt;state = BOND_STATE_BACKUP;</div><div class='ctx'> 			}</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-	} /* end of for */</div><div class='add'>+			printk(KERN_INFO DRV_NAME</div><div class='add'>+			       ": %s: link status definitely "</div><div class='add'>+			       "up for interface %s.\n",</div><div class='add'>+			       bond-&gt;dev-&gt;name, slave-&gt;dev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	if (do_failover) {</div><div class='del'>-		ASSERT_RTNL();</div><div class='add'>+			/* notify ad that the link status has changed */</div><div class='add'>+			if (bond-&gt;params.mode == BOND_MODE_8023AD)</div><div class='add'>+				bond_3ad_handle_link_change(slave, BOND_LINK_UP);</div><div class='ctx'> </div><div class='del'>-		write_lock_bh(&amp;bond-&gt;curr_slave_lock);</div><div class='add'>+			if ((bond-&gt;params.mode == BOND_MODE_TLB) ||</div><div class='add'>+			    (bond-&gt;params.mode == BOND_MODE_ALB))</div><div class='add'>+				bond_alb_handle_link_change(bond, slave,</div><div class='add'>+							    BOND_LINK_UP);</div><div class='ctx'> </div><div class='del'>-		bond_select_active_slave(bond);</div><div class='add'>+			if (!bond-&gt;curr_active_slave ||</div><div class='add'>+			    (slave == bond-&gt;primary_slave))</div><div class='add'>+				goto do_failover;</div><div class='ctx'> </div><div class='del'>-		write_unlock_bh(&amp;bond-&gt;curr_slave_lock);</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	} else</div><div class='del'>-		bond_set_carrier(bond);</div><div class='add'>+		case BOND_LINK_DOWN:</div><div class='add'>+			slave-&gt;link = BOND_LINK_DOWN;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return 0;</div><div class='add'>+			if (bond-&gt;params.mode == BOND_MODE_ACTIVEBACKUP ||</div><div class='add'>+			    bond-&gt;params.mode == BOND_MODE_8023AD)</div><div class='add'>+				bond_set_slave_inactive_flags(slave);</div><div class='add'>+</div><div class='add'>+			printk(KERN_INFO DRV_NAME</div><div class='add'>+			       ": %s: link status definitely down for "</div><div class='add'>+			       "interface %s, disabling it\n",</div><div class='add'>+			       bond-&gt;dev-&gt;name, slave-&gt;dev-&gt;name);</div><div class='add'>+</div><div class='add'>+			if (bond-&gt;params.mode == BOND_MODE_8023AD)</div><div class='add'>+				bond_3ad_handle_link_change(slave,</div><div class='add'>+							    BOND_LINK_DOWN);</div><div class='add'>+</div><div class='add'>+			if (bond-&gt;params.mode == BOND_MODE_TLB ||</div><div class='add'>+			    bond-&gt;params.mode == BOND_MODE_ALB)</div><div class='add'>+				bond_alb_handle_link_change(bond, slave,</div><div class='add'>+							    BOND_LINK_DOWN);</div><div class='add'>+</div><div class='add'>+			if (slave == bond-&gt;curr_active_slave)</div><div class='add'>+				goto do_failover;</div><div class='add'>+</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_ERR DRV_NAME</div><div class='add'>+			       ": %s: invalid new link %d on slave %s\n",</div><div class='add'>+			       bond-&gt;dev-&gt;name, slave-&gt;new_link,</div><div class='add'>+			       slave-&gt;dev-&gt;name);</div><div class='add'>+			slave-&gt;new_link = BOND_LINK_NOCHANGE;</div><div class='add'>+</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+do_failover:</div><div class='add'>+		ASSERT_RTNL();</div><div class='add'>+		write_lock_bh(&amp;bond-&gt;curr_slave_lock);</div><div class='add'>+		bond_select_active_slave(bond);</div><div class='add'>+		write_unlock_bh(&amp;bond-&gt;curr_slave_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bond_set_carrier(bond);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * bond_mii_monitor</div><div class='ctx'>  *</div><div class='ctx'>  * Really a wrapper that splits the mii monitor into two phases: an</div><div class='del'>- * inspection, then (if inspection indicates something needs to be</div><div class='del'>- * done) an acquisition of appropriate locks followed by another pass</div><div class='del'>- * to implement whatever link state changes are indicated.</div><div class='add'>+ * inspection, then (if inspection indicates something needs to be done)</div><div class='add'>+ * an acquisition of appropriate locks followed by a commit phase to</div><div class='add'>+ * implement whatever link state changes are indicated.</div><div class='ctx'>  */</div><div class='ctx'> void bond_mii_monitor(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = container_of(work, struct bonding,</div><div class='ctx'> 					    mii_work.work);</div><div class='del'>-	unsigned long delay;</div><div class='ctx'> </div><div class='ctx'> 	read_lock(&amp;bond-&gt;lock);</div><div class='del'>-	if (bond-&gt;kill_timers) {</div><div class='del'>-		read_unlock(&amp;bond-&gt;lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	if (bond-&gt;kill_timers)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (bond-&gt;slave_cnt == 0)</div><div class='add'>+		goto re_arm;</div><div class='ctx'> </div><div class='ctx'> 	if (bond-&gt;send_grat_arp) {</div><div class='ctx'> 		read_lock(&amp;bond-&gt;curr_slave_lock);</div><div class='hunk'>@@ -2496,19 +2441,24 @@ void bond_mii_monitor(struct work_struct *work)</div><div class='ctx'> 		read_unlock(&amp;bond-&gt;curr_slave_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (__bond_mii_monitor(bond, 0)) {</div><div class='add'>+	if (bond_miimon_inspect(bond)) {</div><div class='ctx'> 		read_unlock(&amp;bond-&gt;lock);</div><div class='ctx'> 		rtnl_lock();</div><div class='ctx'> 		read_lock(&amp;bond-&gt;lock);</div><div class='del'>-		__bond_mii_monitor(bond, 1);</div><div class='add'>+</div><div class='add'>+		bond_miimon_commit(bond);</div><div class='add'>+</div><div class='ctx'> 		read_unlock(&amp;bond-&gt;lock);</div><div class='ctx'> 		rtnl_unlock();	/* might sleep, hold no other locks */</div><div class='ctx'> 		read_lock(&amp;bond-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	delay = msecs_to_jiffies(bond-&gt;params.miimon);</div><div class='add'>+re_arm:</div><div class='add'>+	if (bond-&gt;params.miimon)</div><div class='add'>+		queue_delayed_work(bond-&gt;wq, &amp;bond-&gt;mii_work,</div><div class='add'>+				   msecs_to_jiffies(bond-&gt;params.miimon));</div><div class='add'>+out:</div><div class='ctx'> 	read_unlock(&amp;bond-&gt;lock);</div><div class='del'>-	queue_delayed_work(bond-&gt;wq, &amp;bond-&gt;mii_work, delay);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32 bond_glean_dev_ip(struct net_device *dev)</div><div class='head'>diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c<br/>index 6caac0ffb2f2..3bdb47382521 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_sysfs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/bonding/bond_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_sysfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/bonding/bond_sysfs.c</a></div><div class='hunk'>@@ -350,9 +350,6 @@ static ssize_t bonding_store_slaves(struct device *d,</div><div class='ctx'> 		if (dev) {</div><div class='ctx'> 			printk(KERN_INFO DRV_NAME ": %s: Removing slave %s\n",</div><div class='ctx'> 				bond-&gt;dev-&gt;name, dev-&gt;name);</div><div class='del'>-			if (bond-&gt;setup_by_slave)</div><div class='del'>-				res = bond_release_and_destroy(bond-&gt;dev, dev);</div><div class='del'>-			else</div><div class='ctx'> 				res = bond_release(bond-&gt;dev, dev);</div><div class='ctx'> 			if (res) {</div><div class='ctx'> 				ret = res;</div><div class='head'>diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c<br/>index a7800e559090..ec6b0af3d46b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/cpmac.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/cpmac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/cpmac.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/cpmac.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='head'>diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c<br/>index fba87abe78ee..ea6144a9565e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/cs89x0.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/cs89x0.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/cs89x0.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/cs89x0.c</a></div><div class='hunk'>@@ -189,7 +189,7 @@ static unsigned int netcard_portlist[] __used __initdata = {IXDP2X01_CS8900_VIRT</div><div class='ctx'> static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};</div><div class='ctx'> #elif defined(CONFIG_ARCH_PNX010X)</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;mach/gpio.h&gt;</div><div class='ctx'> #define CIRRUS_DEFAULT_BASE	IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000)	/* = Physical address 0x48200000 */</div><div class='ctx'> #define CIRRUS_DEFAULT_IRQ	VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */</div><div class='ctx'> static unsigned int netcard_portlist[] __used __initdata = {CIRRUS_DEFAULT_BASE, 0};</div><div class='head'>diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c<br/>index 47d51788a462..04c0e90119af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/cxgb3/t3_hw.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/cxgb3/t3_hw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/cxgb3/t3_hw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/cxgb3/t3_hw.c</a></div><div class='hunk'>@@ -683,7 +683,7 @@ enum {</div><div class='ctx'> 	SF_ERASE_SECTOR = 0xd8,	/* erase sector */</div><div class='ctx'> </div><div class='ctx'> 	FW_FLASH_BOOT_ADDR = 0x70000,	/* start address of FW in flash */</div><div class='del'>-	FW_VERS_ADDR = 0x77ffc,    /* flash address holding FW version */</div><div class='add'>+	FW_VERS_ADDR = 0x7fffc,    /* flash address holding FW version */</div><div class='ctx'> 	FW_MIN_SIZE = 8            /* at least version and csum */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/de620.c b/drivers/net/de620.c<br/>index 3f5190c654cf..d454e143483e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/de620.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/de620.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/de620.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/de620.c</a></div><div class='hunk'>@@ -488,13 +488,6 @@ static void de620_set_multicast_list(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (dev-&gt;mc_count || dev-&gt;flags&amp;(IFF_ALLMULTI|IFF_PROMISC))</div><div class='ctx'> 	{ /* Enable promiscuous mode */</div><div class='del'>-		/*</div><div class='del'>-		 *	We must make the kernel realise we had to move</div><div class='del'>-		 *	into promisc mode or we start all out war on</div><div class='del'>-		 *	the cable. - AC</div><div class='del'>-		 */</div><div class='del'>-		dev-&gt;flags|=IFF_PROMISC;</div><div class='del'>-</div><div class='ctx'> 		de620_set_register(dev, W_TCR, (TCR_DEF &amp; ~RXPBM) | RXALL);</div><div class='ctx'> 	}</div><div class='ctx'> 	else</div><div class='head'>diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c<br/>index 0b0f1c407a7e..f42c23f42652 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/dm9000.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/dm9000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/dm9000.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/dm9000.c</a></div><div class='hunk'>@@ -1374,6 +1374,11 @@ dm9000_probe(struct platform_device *pdev)</div><div class='ctx'> 	for (i = 0; i &lt; 6; i += 2)</div><div class='ctx'> 		dm9000_read_eeprom(db, i / 2, ndev-&gt;dev_addr+i);</div><div class='ctx'> </div><div class='add'>+	if (!is_valid_ether_addr(ndev-&gt;dev_addr) &amp;&amp; pdata != NULL) {</div><div class='add'>+		mac_src = "platform data";</div><div class='add'>+		memcpy(ndev-&gt;dev_addr, pdata-&gt;dev_addr, 6);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!is_valid_ether_addr(ndev-&gt;dev_addr)) {</div><div class='ctx'> 		/* try reading from mac */</div><div class='ctx'> 		</div><div class='head'>diff --git a/drivers/net/e100.c b/drivers/net/e100.c<br/>index 19d32a227be1..5cf78d612c45 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e100.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/e100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e100.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/e100.c</a></div><div class='hunk'>@@ -1838,7 +1838,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx,</div><div class='ctx'> 		if ((le16_to_cpu(rfd-&gt;command) &amp; cb_el) &amp;&amp;</div><div class='ctx'> 		    (RU_RUNNING == nic-&gt;ru_running))</div><div class='ctx'> </div><div class='del'>-			if (readb(&amp;nic-&gt;csr-&gt;scb.status) &amp; rus_no_res)</div><div class='add'>+			if (ioread8(&amp;nic-&gt;csr-&gt;scb.status) &amp; rus_no_res)</div><div class='ctx'> 				nic-&gt;ru_running = RU_SUSPENDED;</div><div class='ctx'> 		return -ENODATA;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1861,7 +1861,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx,</div><div class='ctx'> 	if ((le16_to_cpu(rfd-&gt;command) &amp; cb_el) &amp;&amp;</div><div class='ctx'> 	    (RU_RUNNING == nic-&gt;ru_running)) {</div><div class='ctx'> </div><div class='del'>-	    if (readb(&amp;nic-&gt;csr-&gt;scb.status) &amp; rus_no_res)</div><div class='add'>+	    if (ioread8(&amp;nic-&gt;csr-&gt;scb.status) &amp; rus_no_res)</div><div class='ctx'> 		nic-&gt;ru_running = RU_SUSPENDED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2738,9 +2738,7 @@ static int __devinit e100_probe(struct pci_dev *pdev,</div><div class='ctx'> 		nic-&gt;flags |= wol_magic;</div><div class='ctx'> </div><div class='ctx'> 	/* ack any pending wake events, disable PME */</div><div class='del'>-	err = pci_enable_wake(pdev, 0, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		DPRINTK(PROBE, ERR, "Error clearing wake event\n");</div><div class='add'>+	pci_pme_active(pdev, false);</div><div class='ctx'> </div><div class='ctx'> 	strcpy(netdev-&gt;name, "eth%d");</div><div class='ctx'> 	if((err = register_netdev(netdev))) {</div><div class='head'>diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c<br/>index 9d6edf3e73f9..d04eef53571e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000_hw.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/e1000/e1000_hw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000_hw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/e1000/e1000_hw.c</a></div><div class='hunk'>@@ -144,6 +144,8 @@ static s32 e1000_host_if_read_cookie(struct e1000_hw *hw, u8 *buffer);</div><div class='ctx'> static u8 e1000_calculate_mng_checksum(char *buffer, u32 length);</div><div class='ctx'> static s32 e1000_configure_kmrn_for_10_100(struct e1000_hw *hw, u16 duplex);</div><div class='ctx'> static s32 e1000_configure_kmrn_for_1000(struct e1000_hw *hw);</div><div class='add'>+static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);</div><div class='add'>+static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);</div><div class='ctx'> </div><div class='ctx'> /* IGP cable length table */</div><div class='ctx'> static const</div><div class='hunk'>@@ -168,6 +170,8 @@ u16 e1000_igp_2_cable_length_table[IGP02E1000_AGC_LENGTH_TABLE_SIZE] =</div><div class='ctx'>       83, 89, 95, 100, 105, 109, 113, 116, 119, 122, 124,</div><div class='ctx'>       104, 109, 114, 118, 121, 124};</div><div class='ctx'> </div><div class='add'>+static DEFINE_SPINLOCK(e1000_eeprom_lock);</div><div class='add'>+</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * Set the phy type member in the hw struct.</div><div class='ctx'>  *</div><div class='hunk'>@@ -4904,6 +4908,15 @@ static s32 e1000_spi_eeprom_ready(struct e1000_hw *hw)</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> s32 e1000_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)</div><div class='ctx'> {</div><div class='add'>+    s32 ret;</div><div class='add'>+    spin_lock(&amp;e1000_eeprom_lock);</div><div class='add'>+    ret = e1000_do_read_eeprom(hw, offset, words, data);</div><div class='add'>+    spin_unlock(&amp;e1000_eeprom_lock);</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)</div><div class='add'>+{</div><div class='ctx'>     struct e1000_eeprom_info *eeprom = &amp;hw-&gt;eeprom;</div><div class='ctx'>     u32 i = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -5236,6 +5249,16 @@ s32 e1000_update_eeprom_checksum(struct e1000_hw *hw)</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> s32 e1000_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)</div><div class='ctx'> {</div><div class='add'>+    s32 ret;</div><div class='add'>+    spin_lock(&amp;e1000_eeprom_lock);</div><div class='add'>+    ret = e1000_do_write_eeprom(hw, offset, words, data);</div><div class='add'>+    spin_unlock(&amp;e1000_eeprom_lock);</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)</div><div class='add'>+{</div><div class='ctx'>     struct e1000_eeprom_info *eeprom = &amp;hw-&gt;eeprom;</div><div class='ctx'>     s32 status = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c<br/>index b9f90a5d3d4d..213437d13154 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000_param.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/e1000/e1000_param.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000_param.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/e1000/e1000_param.c</a></div><div class='hunk'>@@ -208,7 +208,7 @@ struct e1000_option {</div><div class='ctx'> 		} r;</div><div class='ctx'> 		struct { /* list_option info */</div><div class='ctx'> 			int nr;</div><div class='del'>-			struct e1000_opt_list { int i; char *str; } *p;</div><div class='add'>+			const struct e1000_opt_list { int i; char *str; } *p;</div><div class='ctx'> 		} l;</div><div class='ctx'> 	} arg;</div><div class='ctx'> };</div><div class='hunk'>@@ -242,7 +242,7 @@ static int __devinit e1000_validate_option(unsigned int *value,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case list_option: {</div><div class='ctx'> 		int i;</div><div class='del'>-		struct e1000_opt_list *ent;</div><div class='add'>+		const struct e1000_opt_list *ent;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; opt-&gt;arg.l.nr; i++) {</div><div class='ctx'> 			ent = &amp;opt-&gt;arg.l.p[i];</div><div class='hunk'>@@ -279,7 +279,9 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter);</div><div class='ctx'> </div><div class='ctx'> void __devinit e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='add'>+	struct e1000_option opt;</div><div class='ctx'> 	int bd = adapter-&gt;bd_number;</div><div class='add'>+</div><div class='ctx'> 	if (bd &gt;= E1000_MAX_NIC) {</div><div class='ctx'> 		DPRINTK(PROBE, NOTICE,</div><div class='ctx'> 		       "Warning: no configuration for board #%i\n", bd);</div><div class='hunk'>@@ -287,19 +289,21 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	{ /* Transmit Descriptor Count */</div><div class='del'>-		struct e1000_option opt = {</div><div class='add'>+		struct e1000_tx_ring *tx_ring = adapter-&gt;tx_ring;</div><div class='add'>+		int i;</div><div class='add'>+		e1000_mac_type mac_type = adapter-&gt;hw.mac_type;</div><div class='add'>+</div><div class='add'>+		opt = (struct e1000_option) {</div><div class='ctx'> 			.type = range_option,</div><div class='ctx'> 			.name = "Transmit Descriptors",</div><div class='ctx'> 			.err  = "using default of "</div><div class='ctx'> 				__MODULE_STRING(E1000_DEFAULT_TXD),</div><div class='ctx'> 			.def  = E1000_DEFAULT_TXD,</div><div class='del'>-			.arg  = { .r = { .min = E1000_MIN_TXD }}</div><div class='add'>+			.arg  = { .r = {</div><div class='add'>+				.min = E1000_MIN_TXD,</div><div class='add'>+				.max = mac_type &lt; e1000_82544 ? E1000_MAX_TXD : E1000_MAX_82544_TXD</div><div class='add'>+				}}</div><div class='ctx'> 		};</div><div class='del'>-		struct e1000_tx_ring *tx_ring = adapter-&gt;tx_ring;</div><div class='del'>-		int i;</div><div class='del'>-		e1000_mac_type mac_type = adapter-&gt;hw.mac_type;</div><div class='del'>-		opt.arg.r.max = mac_type &lt; e1000_82544 ?</div><div class='del'>-			E1000_MAX_TXD : E1000_MAX_82544_TXD;</div><div class='ctx'> </div><div class='ctx'> 		if (num_TxDescriptors &gt; bd) {</div><div class='ctx'> 			tx_ring-&gt;count = TxDescriptors[bd];</div><div class='hunk'>@@ -313,19 +317,21 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 			tx_ring[i].count = tx_ring-&gt;count;</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Receive Descriptor Count */</div><div class='del'>-		struct e1000_option opt = {</div><div class='add'>+		struct e1000_rx_ring *rx_ring = adapter-&gt;rx_ring;</div><div class='add'>+		int i;</div><div class='add'>+		e1000_mac_type mac_type = adapter-&gt;hw.mac_type;</div><div class='add'>+</div><div class='add'>+		opt = (struct e1000_option) {</div><div class='ctx'> 			.type = range_option,</div><div class='ctx'> 			.name = "Receive Descriptors",</div><div class='ctx'> 			.err  = "using default of "</div><div class='ctx'> 				__MODULE_STRING(E1000_DEFAULT_RXD),</div><div class='ctx'> 			.def  = E1000_DEFAULT_RXD,</div><div class='del'>-			.arg  = { .r = { .min = E1000_MIN_RXD }}</div><div class='add'>+			.arg  = { .r = {</div><div class='add'>+				.min = E1000_MIN_RXD,</div><div class='add'>+				.max = mac_type &lt; e1000_82544 ? E1000_MAX_RXD : E1000_MAX_82544_RXD</div><div class='add'>+			}}</div><div class='ctx'> 		};</div><div class='del'>-		struct e1000_rx_ring *rx_ring = adapter-&gt;rx_ring;</div><div class='del'>-		int i;</div><div class='del'>-		e1000_mac_type mac_type = adapter-&gt;hw.mac_type;</div><div class='del'>-		opt.arg.r.max = mac_type &lt; e1000_82544 ? E1000_MAX_RXD :</div><div class='del'>-			E1000_MAX_82544_RXD;</div><div class='ctx'> </div><div class='ctx'> 		if (num_RxDescriptors &gt; bd) {</div><div class='ctx'> 			rx_ring-&gt;count = RxDescriptors[bd];</div><div class='hunk'>@@ -339,7 +345,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 			rx_ring[i].count = rx_ring-&gt;count;</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Checksum Offload Enable/Disable */</div><div class='del'>-		struct e1000_option opt = {</div><div class='add'>+		opt = (struct e1000_option) {</div><div class='ctx'> 			.type = enable_option,</div><div class='ctx'> 			.name = "Checksum Offload",</div><div class='ctx'> 			.err  = "defaulting to Enabled",</div><div class='hunk'>@@ -363,7 +369,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 			 { E1000_FC_FULL,    "Flow Control Enabled" },</div><div class='ctx'> 			 { E1000_FC_DEFAULT, "Flow Control Hardware Default" }};</div><div class='ctx'> </div><div class='del'>-		struct e1000_option opt = {</div><div class='add'>+		opt = (struct e1000_option) {</div><div class='ctx'> 			.type = list_option,</div><div class='ctx'> 			.name = "Flow Control",</div><div class='ctx'> 			.err  = "reading default settings from EEPROM",</div><div class='hunk'>@@ -381,7 +387,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Transmit Interrupt Delay */</div><div class='del'>-		struct e1000_option opt = {</div><div class='add'>+		opt = (struct e1000_option) {</div><div class='ctx'> 			.type = range_option,</div><div class='ctx'> 			.name = "Transmit Interrupt Delay",</div><div class='ctx'> 			.err  = "using default of " __MODULE_STRING(DEFAULT_TIDV),</div><div class='hunk'>@@ -399,7 +405,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Transmit Absolute Interrupt Delay */</div><div class='del'>-		struct e1000_option opt = {</div><div class='add'>+		opt = (struct e1000_option) {</div><div class='ctx'> 			.type = range_option,</div><div class='ctx'> 			.name = "Transmit Absolute Interrupt Delay",</div><div class='ctx'> 			.err  = "using default of " __MODULE_STRING(DEFAULT_TADV),</div><div class='hunk'>@@ -417,7 +423,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Receive Interrupt Delay */</div><div class='del'>-		struct e1000_option opt = {</div><div class='add'>+		opt = (struct e1000_option) {</div><div class='ctx'> 			.type = range_option,</div><div class='ctx'> 			.name = "Receive Interrupt Delay",</div><div class='ctx'> 			.err  = "using default of " __MODULE_STRING(DEFAULT_RDTR),</div><div class='hunk'>@@ -435,7 +441,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Receive Absolute Interrupt Delay */</div><div class='del'>-		struct e1000_option opt = {</div><div class='add'>+		opt = (struct e1000_option) {</div><div class='ctx'> 			.type = range_option,</div><div class='ctx'> 			.name = "Receive Absolute Interrupt Delay",</div><div class='ctx'> 			.err  = "using default of " __MODULE_STRING(DEFAULT_RADV),</div><div class='hunk'>@@ -453,7 +459,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Interrupt Throttling Rate */</div><div class='del'>-		struct e1000_option opt = {</div><div class='add'>+		opt = (struct e1000_option) {</div><div class='ctx'> 			.type = range_option,</div><div class='ctx'> 			.name = "Interrupt Throttling Rate (ints/sec)",</div><div class='ctx'> 			.err  = "using default of " __MODULE_STRING(DEFAULT_ITR),</div><div class='hunk'>@@ -497,7 +503,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Smart Power Down */</div><div class='del'>-		struct e1000_option opt = {</div><div class='add'>+		opt = (struct e1000_option) {</div><div class='ctx'> 			.type = enable_option,</div><div class='ctx'> 			.name = "PHY Smart Power Down",</div><div class='ctx'> 			.err  = "defaulting to Disabled",</div><div class='hunk'>@@ -513,7 +519,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Kumeran Lock Loss Workaround */</div><div class='del'>-		struct e1000_option opt = {</div><div class='add'>+		opt = (struct e1000_option) {</div><div class='ctx'> 			.type = enable_option,</div><div class='ctx'> 			.name = "Kumeran Lock Loss Workaround",</div><div class='ctx'> 			.err  = "defaulting to Enabled",</div><div class='hunk'>@@ -578,16 +584,18 @@ static void __devinit e1000_check_fiber_options(struct e1000_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='add'>+	struct e1000_option opt;</div><div class='ctx'> 	unsigned int speed, dplx, an;</div><div class='ctx'> 	int bd = adapter-&gt;bd_number;</div><div class='ctx'> </div><div class='ctx'> 	{ /* Speed */</div><div class='del'>-		struct e1000_opt_list speed_list[] = {{          0, "" },</div><div class='del'>-						      {   SPEED_10, "" },</div><div class='del'>-						      {  SPEED_100, "" },</div><div class='del'>-						      { SPEED_1000, "" }};</div><div class='add'>+		static const struct e1000_opt_list speed_list[] = {</div><div class='add'>+			{          0, "" },</div><div class='add'>+			{   SPEED_10, "" },</div><div class='add'>+			{  SPEED_100, "" },</div><div class='add'>+			{ SPEED_1000, "" }};</div><div class='ctx'> </div><div class='del'>-		struct e1000_option opt = {</div><div class='add'>+		opt = (struct e1000_option) {</div><div class='ctx'> 			.type = list_option,</div><div class='ctx'> 			.name = "Speed",</div><div class='ctx'> 			.err  = "parameter ignored",</div><div class='hunk'>@@ -604,11 +612,12 @@ static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Duplex */</div><div class='del'>-		struct e1000_opt_list dplx_list[] = {{           0, "" },</div><div class='del'>-						     { HALF_DUPLEX, "" },</div><div class='del'>-						     { FULL_DUPLEX, "" }};</div><div class='add'>+		static const struct e1000_opt_list dplx_list[] = {</div><div class='add'>+			{           0, "" },</div><div class='add'>+			{ HALF_DUPLEX, "" },</div><div class='add'>+			{ FULL_DUPLEX, "" }};</div><div class='ctx'> </div><div class='del'>-		struct e1000_option opt = {</div><div class='add'>+		opt = (struct e1000_option) {</div><div class='ctx'> 			.type = list_option,</div><div class='ctx'> 			.name = "Duplex",</div><div class='ctx'> 			.err  = "parameter ignored",</div><div class='hunk'>@@ -637,7 +646,7 @@ static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)</div><div class='ctx'> 		       "parameter ignored\n");</div><div class='ctx'> 		adapter-&gt;hw.autoneg_advertised = AUTONEG_ADV_DEFAULT;</div><div class='ctx'> 	} else { /* Autoneg */</div><div class='del'>-		struct e1000_opt_list an_list[] =</div><div class='add'>+		static const struct e1000_opt_list an_list[] =</div><div class='ctx'> 			#define AA "AutoNeg advertising "</div><div class='ctx'> 			{{ 0x01, AA "10/HD" },</div><div class='ctx'> 			 { 0x02, AA "10/FD" },</div><div class='hunk'>@@ -671,7 +680,7 @@ static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)</div><div class='ctx'> 			 { 0x2e, AA "1000/FD, 100/FD, 100/HD, 10/FD" },</div><div class='ctx'> 			 { 0x2f, AA "1000/FD, 100/FD, 100/HD, 10/FD, 10/HD" }};</div><div class='ctx'> </div><div class='del'>-		struct e1000_option opt = {</div><div class='add'>+		opt = (struct e1000_option) {</div><div class='ctx'> 			.type = list_option,</div><div class='ctx'> 			.name = "AutoNeg",</div><div class='ctx'> 			.err  = "parameter ignored",</div><div class='head'>diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h<br/>index f823b8ba5785..14b0e6cd3b8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e1000e/defines.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/e1000e/defines.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e1000e/defines.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/e1000e/defines.h</a></div><div class='hunk'>@@ -389,7 +389,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Interrupt Cause Set */</div><div class='ctx'> #define E1000_ICS_LSC       E1000_ICR_LSC       /* Link Status Change */</div><div class='del'>-#define E1000_ICS_RXDMT0    E1000_ICR_RXDMT0    /* rx desc min. threshold */</div><div class='add'>+#define E1000_ICS_RXSEQ     E1000_ICR_RXSEQ     /* Rx sequence error */</div><div class='ctx'> #define E1000_ICS_RXDMT0    E1000_ICR_RXDMT0    /* Rx desc min. threshold */</div><div class='ctx'> </div><div class='ctx'> /* Transmit Descriptor Control */</div><div class='head'>diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h<br/>index 4a4f62e002b2..ac4e506b4f88 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e1000e/e1000.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/e1000e/e1000.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e1000e/e1000.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/e1000e/e1000.h</a></div><div class='hunk'>@@ -41,24 +41,25 @@</div><div class='ctx'> </div><div class='ctx'> struct e1000_info;</div><div class='ctx'> </div><div class='del'>-#define ndev_printk(level, netdev, format, arg...) \</div><div class='del'>-	printk(level "%s: " format, (netdev)-&gt;name, ## arg)</div><div class='add'>+#define e_printk(level, adapter, format, arg...) \</div><div class='add'>+	printk(level "%s: %s: " format, pci_name(adapter-&gt;pdev), \</div><div class='add'>+	       adapter-&gt;netdev-&gt;name, ## arg)</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-#define ndev_dbg(netdev, format, arg...) \</div><div class='del'>-	ndev_printk(KERN_DEBUG , netdev, format, ## arg)</div><div class='add'>+#define e_dbg(format, arg...) \</div><div class='add'>+	e_printk(KERN_DEBUG , adapter, format, ## arg)</div><div class='ctx'> #else</div><div class='del'>-#define ndev_dbg(netdev, format, arg...) do { (void)(netdev); } while (0)</div><div class='add'>+#define e_dbg(format, arg...) do { (void)(adapter); } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define ndev_err(netdev, format, arg...) \</div><div class='del'>-	ndev_printk(KERN_ERR , netdev, format, ## arg)</div><div class='del'>-#define ndev_info(netdev, format, arg...) \</div><div class='del'>-	ndev_printk(KERN_INFO , netdev, format, ## arg)</div><div class='del'>-#define ndev_warn(netdev, format, arg...) \</div><div class='del'>-	ndev_printk(KERN_WARNING , netdev, format, ## arg)</div><div class='del'>-#define ndev_notice(netdev, format, arg...) \</div><div class='del'>-	ndev_printk(KERN_NOTICE , netdev, format, ## arg)</div><div class='add'>+#define e_err(format, arg...) \</div><div class='add'>+	e_printk(KERN_ERR, adapter, format, ## arg)</div><div class='add'>+#define e_info(format, arg...) \</div><div class='add'>+	e_printk(KERN_INFO, adapter, format, ## arg)</div><div class='add'>+#define e_warn(format, arg...) \</div><div class='add'>+	e_printk(KERN_WARNING, adapter, format, ## arg)</div><div class='add'>+#define e_notice(format, arg...) \</div><div class='add'>+	e_printk(KERN_NOTICE, adapter, format, ## arg)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Tx/Rx descriptor defines */</div><div class='hunk'>@@ -283,10 +284,6 @@ struct e1000_adapter {</div><div class='ctx'> 	unsigned long led_status;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int flags;</div><div class='del'>-</div><div class='del'>-	/* for ioport free */</div><div class='del'>-	int bars;</div><div class='del'>-	int need_ioport;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct e1000_info {</div><div class='hunk'>@@ -329,6 +326,7 @@ struct e1000_info {</div><div class='ctx'> #define FLAG_RX_CSUM_ENABLED              (1 &lt;&lt; 28)</div><div class='ctx'> #define FLAG_TSO_FORCE                    (1 &lt;&lt; 29)</div><div class='ctx'> #define FLAG_RX_RESTART_NOW               (1 &lt;&lt; 30)</div><div class='add'>+#define FLAG_MSI_TEST_FAILED              (1 &lt;&lt; 31)</div><div class='ctx'> </div><div class='ctx'> #define E1000_RX_DESC_PS(R, i)	    \</div><div class='ctx'> 	(&amp;(((union e1000_rx_desc_packet_split *)((R).desc))[i]))</div><div class='head'>diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c<br/>index 9350564065e7..e21c9e0f3738 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e1000e/ethtool.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/e1000e/ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e1000e/ethtool.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/e1000e/ethtool.c</a></div><div class='hunk'>@@ -177,7 +177,7 @@ static u32 e1000_get_link(struct net_device *netdev)</div><div class='ctx'> 	u32 status;</div><div class='ctx'> 	</div><div class='ctx'> 	status = er32(STATUS);</div><div class='del'>-	return (status &amp; E1000_STATUS_LU);</div><div class='add'>+	return (status &amp; E1000_STATUS_LU) ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)</div><div class='hunk'>@@ -189,8 +189,7 @@ static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)</div><div class='ctx'> 	/* Fiber NICs only allow 1000 gbps Full duplex */</div><div class='ctx'> 	if ((adapter-&gt;hw.phy.media_type == e1000_media_type_fiber) &amp;&amp;</div><div class='ctx'> 		spddplx != (SPEED_1000 + DUPLEX_FULL)) {</div><div class='del'>-		ndev_err(adapter-&gt;netdev, "Unsupported Speed/Duplex "</div><div class='del'>-			 "configuration\n");</div><div class='add'>+		e_err("Unsupported Speed/Duplex configuration\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -213,8 +212,7 @@ static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPEED_1000 + DUPLEX_HALF: /* not supported */</div><div class='ctx'> 	default:</div><div class='del'>-		ndev_err(adapter-&gt;netdev, "Unsupported Speed/Duplex "</div><div class='del'>-			 "configuration\n");</div><div class='add'>+		e_err("Unsupported Speed/Duplex configuration\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -231,8 +229,8 @@ static int e1000_set_settings(struct net_device *netdev,</div><div class='ctx'> 	 * cannot be changed</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (e1000_check_reset_block(hw)) {</div><div class='del'>-		ndev_err(netdev, "Cannot change link "</div><div class='del'>-			 "characteristics when SoL/IDER is active.\n");</div><div class='add'>+		e_err("Cannot change link characteristics when SoL/IDER is "</div><div class='add'>+		      "active.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -380,8 +378,7 @@ static int e1000_set_tso(struct net_device *netdev, u32 data)</div><div class='ctx'> 		netdev-&gt;features &amp;= ~NETIF_F_TSO6;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ndev_info(netdev, "TSO is %s\n",</div><div class='del'>-		  data ? "Enabled" : "Disabled");</div><div class='add'>+	e_info("TSO is %s\n", data ? "Enabled" : "Disabled");</div><div class='ctx'> 	adapter-&gt;flags |= FLAG_TSO_FORCE;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -722,10 +719,9 @@ static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data,</div><div class='ctx'> 				      (test[pat] &amp; write));</div><div class='ctx'> 		val = E1000_READ_REG_ARRAY(&amp;adapter-&gt;hw, reg, offset);</div><div class='ctx'> 		if (val != (test[pat] &amp; write &amp; mask)) {</div><div class='del'>-			ndev_err(adapter-&gt;netdev, "pattern test reg %04X "</div><div class='del'>-				 "failed: got 0x%08X expected 0x%08X\n",</div><div class='del'>-				 reg + offset,</div><div class='del'>-				 val, (test[pat] &amp; write &amp; mask));</div><div class='add'>+			e_err("pattern test reg %04X failed: got 0x%08X "</div><div class='add'>+			      "expected 0x%08X\n", reg + offset, val,</div><div class='add'>+			      (test[pat] &amp; write &amp; mask));</div><div class='ctx'> 			*data = reg;</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -740,9 +736,8 @@ static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data,</div><div class='ctx'> 	__ew32(&amp;adapter-&gt;hw, reg, write &amp; mask);</div><div class='ctx'> 	val = __er32(&amp;adapter-&gt;hw, reg);</div><div class='ctx'> 	if ((write &amp; mask) != (val &amp; mask)) {</div><div class='del'>-		ndev_err(adapter-&gt;netdev, "set/check reg %04X test failed: "</div><div class='del'>-			 "got 0x%08X expected 0x%08X\n", reg, (val &amp; mask),</div><div class='del'>-			 (write &amp; mask));</div><div class='add'>+		e_err("set/check reg %04X test failed: got 0x%08X "</div><div class='add'>+		      "expected 0x%08X\n", reg, (val &amp; mask), (write &amp; mask));</div><div class='ctx'> 		*data = reg;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -766,7 +761,6 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	struct e1000_mac_info *mac = &amp;adapter-&gt;hw.mac;</div><div class='del'>-	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> 	u32 value;</div><div class='ctx'> 	u32 before;</div><div class='ctx'> 	u32 after;</div><div class='hunk'>@@ -799,8 +793,8 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)</div><div class='ctx'> 	ew32(STATUS, toggle);</div><div class='ctx'> 	after = er32(STATUS) &amp; toggle;</div><div class='ctx'> 	if (value != after) {</div><div class='del'>-		ndev_err(netdev, "failed STATUS register test got: "</div><div class='del'>-			 "0x%08X expected: 0x%08X\n", after, value);</div><div class='add'>+		e_err("failed STATUS register test got: 0x%08X expected: "</div><div class='add'>+		      "0x%08X\n", after, value);</div><div class='ctx'> 		*data = 1;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -903,8 +897,7 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)</div><div class='ctx'> 		*data = 1;</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='del'>-	ndev_info(netdev, "testing %s interrupt\n",</div><div class='del'>-		  (shared_int ? "shared" : "unshared"));</div><div class='add'>+	e_info("testing %s interrupt\n", (shared_int ? "shared" : "unshared"));</div><div class='ctx'> </div><div class='ctx'> 	/* Disable all the interrupts */</div><div class='ctx'> 	ew32(IMC, 0xFFFFFFFF);</div><div class='hunk'>@@ -1526,8 +1519,7 @@ static int e1000_loopback_test(struct e1000_adapter *adapter, u64 *data)</div><div class='ctx'> 	 * sessions are active</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (e1000_check_reset_block(&amp;adapter-&gt;hw)) {</div><div class='del'>-		ndev_err(adapter-&gt;netdev, "Cannot do PHY loopback test "</div><div class='del'>-			 "when SoL/IDER is active.\n");</div><div class='add'>+		e_err("Cannot do PHY loopback test when SoL/IDER is active.\n");</div><div class='ctx'> 		*data = 0;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1612,7 +1604,7 @@ static void e1000_diag_test(struct net_device *netdev,</div><div class='ctx'> 		forced_speed_duplex = adapter-&gt;hw.mac.forced_speed_duplex;</div><div class='ctx'> 		autoneg = adapter-&gt;hw.mac.autoneg;</div><div class='ctx'> </div><div class='del'>-		ndev_info(netdev, "offline testing starting\n");</div><div class='add'>+		e_info("offline testing starting\n");</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Link test performed before hardware reset so autoneg doesn't</div><div class='hunk'>@@ -1658,7 +1650,7 @@ static void e1000_diag_test(struct net_device *netdev,</div><div class='ctx'> 		if (if_running)</div><div class='ctx'> 			dev_open(netdev);</div><div class='ctx'> 	} else {</div><div class='del'>-		ndev_info(netdev, "online testing starting\n");</div><div class='add'>+		e_info("online testing starting\n");</div><div class='ctx'> 		/* Online tests */</div><div class='ctx'> 		if (e1000_link_test(adapter, &amp;data[4]))</div><div class='ctx'> 			eth_test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='hunk'>@@ -1694,8 +1686,8 @@ static void e1000_get_wol(struct net_device *netdev,</div><div class='ctx'> 		wol-&gt;supported &amp;= ~WAKE_UCAST;</div><div class='ctx'> </div><div class='ctx'> 		if (adapter-&gt;wol &amp; E1000_WUFC_EX)</div><div class='del'>-			ndev_err(netdev, "Interface does not support "</div><div class='del'>-				 "directed (unicast) frame wake-up packets\n");</div><div class='add'>+			e_err("Interface does not support directed (unicast) "</div><div class='add'>+			      "frame wake-up packets\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;wol &amp; E1000_WUFC_EX)</div><div class='head'>diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c<br/>index d13677899767..d266510c8a94 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e1000e/netdev.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/e1000e/netdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e1000e/netdev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/e1000e/netdev.c</a></div><div class='hunk'>@@ -484,8 +484,8 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,</div><div class='ctx'> 		 * packet, also make sure the frame isn't just CRC only */</div><div class='ctx'> 		if (!(status &amp; E1000_RXD_STAT_EOP) || (length &lt;= 4)) {</div><div class='ctx'> 			/* All receives must fit into a single buffer */</div><div class='del'>-			ndev_dbg(netdev, "%s: Receive packet consumed "</div><div class='del'>-				 "multiple buffers\n", netdev-&gt;name);</div><div class='add'>+			e_dbg("%s: Receive packet consumed multiple buffers\n",</div><div class='add'>+			      netdev-&gt;name);</div><div class='ctx'> 			/* recycle */</div><div class='ctx'> 			buffer_info-&gt;skb = skb;</div><div class='ctx'> 			goto next_desc;</div><div class='hunk'>@@ -510,9 +510,12 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,</div><div class='ctx'> 			    netdev_alloc_skb(netdev, length + NET_IP_ALIGN);</div><div class='ctx'> 			if (new_skb) {</div><div class='ctx'> 				skb_reserve(new_skb, NET_IP_ALIGN);</div><div class='del'>-				memcpy(new_skb-&gt;data - NET_IP_ALIGN,</div><div class='del'>-				       skb-&gt;data - NET_IP_ALIGN,</div><div class='del'>-				       length + NET_IP_ALIGN);</div><div class='add'>+				skb_copy_to_linear_data_offset(new_skb,</div><div class='add'>+							       -NET_IP_ALIGN,</div><div class='add'>+							       (skb-&gt;data -</div><div class='add'>+								NET_IP_ALIGN),</div><div class='add'>+							       (length +</div><div class='add'>+								NET_IP_ALIGN));</div><div class='ctx'> 				/* save the skb in buffer_info as good */</div><div class='ctx'> 				buffer_info-&gt;skb = skb;</div><div class='ctx'> 				skb = new_skb;</div><div class='hunk'>@@ -576,28 +579,26 @@ static void e1000_print_tx_hang(struct e1000_adapter *adapter)</div><div class='ctx'> 	unsigned int i = tx_ring-&gt;next_to_clean;</div><div class='ctx'> 	unsigned int eop = tx_ring-&gt;buffer_info[i].next_to_watch;</div><div class='ctx'> 	struct e1000_tx_desc *eop_desc = E1000_TX_DESC(*tx_ring, eop);</div><div class='del'>-	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> </div><div class='ctx'> 	/* detected Tx unit hang */</div><div class='del'>-	ndev_err(netdev,</div><div class='del'>-		 "Detected Tx Unit Hang:\n"</div><div class='del'>-		 "  TDH                  &lt;%x&gt;\n"</div><div class='del'>-		 "  TDT                  &lt;%x&gt;\n"</div><div class='del'>-		 "  next_to_use          &lt;%x&gt;\n"</div><div class='del'>-		 "  next_to_clean        &lt;%x&gt;\n"</div><div class='del'>-		 "buffer_info[next_to_clean]:\n"</div><div class='del'>-		 "  time_stamp           &lt;%lx&gt;\n"</div><div class='del'>-		 "  next_to_watch        &lt;%x&gt;\n"</div><div class='del'>-		 "  jiffies              &lt;%lx&gt;\n"</div><div class='del'>-		 "  next_to_watch.status &lt;%x&gt;\n",</div><div class='del'>-		 readl(adapter-&gt;hw.hw_addr + tx_ring-&gt;head),</div><div class='del'>-		 readl(adapter-&gt;hw.hw_addr + tx_ring-&gt;tail),</div><div class='del'>-		 tx_ring-&gt;next_to_use,</div><div class='del'>-		 tx_ring-&gt;next_to_clean,</div><div class='del'>-		 tx_ring-&gt;buffer_info[eop].time_stamp,</div><div class='del'>-		 eop,</div><div class='del'>-		 jiffies,</div><div class='del'>-		 eop_desc-&gt;upper.fields.status);</div><div class='add'>+	e_err("Detected Tx Unit Hang:\n"</div><div class='add'>+	      "  TDH                  &lt;%x&gt;\n"</div><div class='add'>+	      "  TDT                  &lt;%x&gt;\n"</div><div class='add'>+	      "  next_to_use          &lt;%x&gt;\n"</div><div class='add'>+	      "  next_to_clean        &lt;%x&gt;\n"</div><div class='add'>+	      "buffer_info[next_to_clean]:\n"</div><div class='add'>+	      "  time_stamp           &lt;%lx&gt;\n"</div><div class='add'>+	      "  next_to_watch        &lt;%x&gt;\n"</div><div class='add'>+	      "  jiffies              &lt;%lx&gt;\n"</div><div class='add'>+	      "  next_to_watch.status &lt;%x&gt;\n",</div><div class='add'>+	      readl(adapter-&gt;hw.hw_addr + tx_ring-&gt;head),</div><div class='add'>+	      readl(adapter-&gt;hw.hw_addr + tx_ring-&gt;tail),</div><div class='add'>+	      tx_ring-&gt;next_to_use,</div><div class='add'>+	      tx_ring-&gt;next_to_clean,</div><div class='add'>+	      tx_ring-&gt;buffer_info[eop].time_stamp,</div><div class='add'>+	      eop,</div><div class='add'>+	      jiffies,</div><div class='add'>+	      eop_desc-&gt;upper.fields.status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -747,8 +748,8 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,</div><div class='ctx'> 		buffer_info-&gt;dma = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (!(staterr &amp; E1000_RXD_STAT_EOP)) {</div><div class='del'>-			ndev_dbg(netdev, "%s: Packet Split buffers didn't pick "</div><div class='del'>-				 "up the full packet\n", netdev-&gt;name);</div><div class='add'>+			e_dbg("%s: Packet Split buffers didn't pick up the "</div><div class='add'>+			      "full packet\n", netdev-&gt;name);</div><div class='ctx'> 			dev_kfree_skb_irq(skb);</div><div class='ctx'> 			goto next_desc;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -761,8 +762,8 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,</div><div class='ctx'> 		length = le16_to_cpu(rx_desc-&gt;wb.middle.length0);</div><div class='ctx'> </div><div class='ctx'> 		if (!length) {</div><div class='del'>-			ndev_dbg(netdev, "%s: Last part of the packet spanning"</div><div class='del'>-				 " multiple descriptors\n", netdev-&gt;name);</div><div class='add'>+			e_dbg("%s: Last part of the packet spanning multiple "</div><div class='add'>+			      "descriptors\n", netdev-&gt;name);</div><div class='ctx'> 			dev_kfree_skb_irq(skb);</div><div class='ctx'> 			goto next_desc;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1011,7 +1012,7 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 		/* eth type trans needs skb-&gt;data to point to something */</div><div class='ctx'> 		if (!pskb_may_pull(skb, ETH_HLEN)) {</div><div class='del'>-			ndev_err(netdev, "pskb_may_pull failed.\n");</div><div class='add'>+			e_err("pskb_may_pull failed.\n");</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 			goto next_desc;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1235,28 +1236,36 @@ static irqreturn_t e1000_intr(int irq, void *data)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * e1000_request_irq - initialize interrupts</div><div class='add'>+ *</div><div class='add'>+ * Attempts to configure interrupts using the best available</div><div class='add'>+ * capabilities of the hardware and kernel.</div><div class='add'>+ **/</div><div class='ctx'> static int e1000_request_irq(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='del'>-	irq_handler_t handler = e1000_intr;</div><div class='ctx'> 	int irq_flags = IRQF_SHARED;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!pci_enable_msi(adapter-&gt;pdev)) {</div><div class='del'>-		adapter-&gt;flags |= FLAG_MSI_ENABLED;</div><div class='del'>-		handler = e1000_intr_msi;</div><div class='del'>-		irq_flags = 0;</div><div class='add'>+	if (!(adapter-&gt;flags &amp; FLAG_MSI_TEST_FAILED)) {</div><div class='add'>+		err = pci_enable_msi(adapter-&gt;pdev);</div><div class='add'>+		if (!err) {</div><div class='add'>+			adapter-&gt;flags |= FLAG_MSI_ENABLED;</div><div class='add'>+			irq_flags = 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = request_irq(adapter-&gt;pdev-&gt;irq, handler, irq_flags, netdev-&gt;name,</div><div class='del'>-			  netdev);</div><div class='add'>+	err = request_irq(adapter-&gt;pdev-&gt;irq,</div><div class='add'>+			  ((adapter-&gt;flags &amp; FLAG_MSI_ENABLED) ?</div><div class='add'>+				&amp;e1000_intr_msi : &amp;e1000_intr),</div><div class='add'>+			  irq_flags, netdev-&gt;name, netdev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		ndev_err(netdev,</div><div class='del'>-		       "Unable to allocate %s interrupt (return: %d)\n",</div><div class='del'>-			adapter-&gt;flags &amp; FLAG_MSI_ENABLED ? "MSI":"INTx",</div><div class='del'>-			err);</div><div class='del'>-		if (adapter-&gt;flags &amp; FLAG_MSI_ENABLED)</div><div class='add'>+		if (adapter-&gt;flags &amp; FLAG_MSI_ENABLED) {</div><div class='ctx'> 			pci_disable_msi(adapter-&gt;pdev);</div><div class='add'>+			adapter-&gt;flags &amp;= ~FLAG_MSI_ENABLED;</div><div class='add'>+		}</div><div class='add'>+		e_err("Unable to allocate interrupt, Error: %d\n", err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1395,8 +1404,7 @@ int e1000e_setup_tx_resources(struct e1000_adapter *adapter)</div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='ctx'> 	vfree(tx_ring-&gt;buffer_info);</div><div class='del'>-	ndev_err(adapter-&gt;netdev,</div><div class='del'>-	"Unable to allocate memory for the transmit descriptor ring\n");</div><div class='add'>+	e_err("Unable to allocate memory for the transmit descriptor ring\n");</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1450,8 +1458,7 @@ err_pages:</div><div class='ctx'> 	}</div><div class='ctx'> err:</div><div class='ctx'> 	vfree(rx_ring-&gt;buffer_info);</div><div class='del'>-	ndev_err(adapter-&gt;netdev,</div><div class='del'>-	"Unable to allocate memory for the transmit descriptor ring\n");</div><div class='add'>+	e_err("Unable to allocate memory for the transmit descriptor ring\n");</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2450,13 +2457,13 @@ void e1000e_reset(struct e1000_adapter *adapter)</div><div class='ctx'> 	 * For parts with AMT enabled, let the firmware know</div><div class='ctx'> 	 * that the network interface is in control</div><div class='ctx'> 	 */</div><div class='del'>-	if ((adapter-&gt;flags &amp; FLAG_HAS_AMT) &amp;&amp; e1000e_check_mng_mode(hw))</div><div class='add'>+	if (adapter-&gt;flags &amp; FLAG_HAS_AMT)</div><div class='ctx'> 		e1000_get_hw_control(adapter);</div><div class='ctx'> </div><div class='ctx'> 	ew32(WUC, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (mac-&gt;ops.init_hw(hw))</div><div class='del'>-		ndev_err(adapter-&gt;netdev, "Hardware Error\n");</div><div class='add'>+		e_err("Hardware Error\n");</div><div class='ctx'> </div><div class='ctx'> 	e1000_update_mng_vlan(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -2591,13 +2598,142 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	ndev_err(netdev, "Unable to allocate memory for queues\n");</div><div class='add'>+	e_err("Unable to allocate memory for queues\n");</div><div class='ctx'> 	kfree(adapter-&gt;rx_ring);</div><div class='ctx'> 	kfree(adapter-&gt;tx_ring);</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * e1000_intr_msi_test - Interrupt Handler</div><div class='add'>+ * @irq: interrupt number</div><div class='add'>+ * @data: pointer to a network interface device structure</div><div class='add'>+ **/</div><div class='add'>+static irqreturn_t e1000_intr_msi_test(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = data;</div><div class='add'>+	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u32 icr = er32(ICR);</div><div class='add'>+</div><div class='add'>+	e_dbg("%s: icr is %08X\n", netdev-&gt;name, icr);</div><div class='add'>+	if (icr &amp; E1000_ICR_RXSEQ) {</div><div class='add'>+		adapter-&gt;flags &amp;= ~FLAG_MSI_TEST_FAILED;</div><div class='add'>+		wmb();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * e1000_test_msi_interrupt - Returns 0 for successful test</div><div class='add'>+ * @adapter: board private struct</div><div class='add'>+ *</div><div class='add'>+ * code flow taken from tg3.c</div><div class='add'>+ **/</div><div class='add'>+static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* poll_enable hasn't been called yet, so don't need disable */</div><div class='add'>+	/* clear any pending events */</div><div class='add'>+	er32(ICR);</div><div class='add'>+</div><div class='add'>+	/* free the real vector and request a test handler */</div><div class='add'>+	e1000_free_irq(adapter);</div><div class='add'>+</div><div class='add'>+	/* Assume that the test fails, if it succeeds then the test</div><div class='add'>+	 * MSI irq handler will unset this flag */</div><div class='add'>+	adapter-&gt;flags |= FLAG_MSI_TEST_FAILED;</div><div class='add'>+</div><div class='add'>+	err = pci_enable_msi(adapter-&gt;pdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto msi_test_failed;</div><div class='add'>+</div><div class='add'>+	err = request_irq(adapter-&gt;pdev-&gt;irq, &amp;e1000_intr_msi_test, 0,</div><div class='add'>+			  netdev-&gt;name, netdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		pci_disable_msi(adapter-&gt;pdev);</div><div class='add'>+		goto msi_test_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	e1000_irq_enable(adapter);</div><div class='add'>+</div><div class='add'>+	/* fire an unusual interrupt on the test handler */</div><div class='add'>+	ew32(ICS, E1000_ICS_RXSEQ);</div><div class='add'>+	e1e_flush();</div><div class='add'>+	msleep(50);</div><div class='add'>+</div><div class='add'>+	e1000_irq_disable(adapter);</div><div class='add'>+</div><div class='add'>+	rmb();</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;flags &amp; FLAG_MSI_TEST_FAILED) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		e_info("MSI interrupt test failed!\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	free_irq(adapter-&gt;pdev-&gt;irq, netdev);</div><div class='add'>+	pci_disable_msi(adapter-&gt;pdev);</div><div class='add'>+</div><div class='add'>+	if (err == -EIO)</div><div class='add'>+		goto msi_test_failed;</div><div class='add'>+</div><div class='add'>+	/* okay so the test worked, restore settings */</div><div class='add'>+	e_dbg("%s: MSI interrupt test succeeded!\n", netdev-&gt;name);</div><div class='add'>+msi_test_failed:</div><div class='add'>+	/* restore the original vector, even if it failed */</div><div class='add'>+	e1000_request_irq(adapter);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * e1000_test_msi - Returns 0 if MSI test succeeds or INTx mode is restored</div><div class='add'>+ * @adapter: board private struct</div><div class='add'>+ *</div><div class='add'>+ * code flow taken from tg3.c, called with e1000 interrupts disabled.</div><div class='add'>+ **/</div><div class='add'>+static int e1000_test_msi(struct e1000_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u16 pci_cmd;</div><div class='add'>+</div><div class='add'>+	if (!(adapter-&gt;flags &amp; FLAG_MSI_ENABLED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* disable SERR in case the MSI write causes a master abort */</div><div class='add'>+	pci_read_config_word(adapter-&gt;pdev, PCI_COMMAND, &amp;pci_cmd);</div><div class='add'>+	pci_write_config_word(adapter-&gt;pdev, PCI_COMMAND,</div><div class='add'>+			      pci_cmd &amp; ~PCI_COMMAND_SERR);</div><div class='add'>+</div><div class='add'>+	err = e1000_test_msi_interrupt(adapter);</div><div class='add'>+</div><div class='add'>+	/* restore previous setting of command word */</div><div class='add'>+	pci_write_config_word(adapter-&gt;pdev, PCI_COMMAND, pci_cmd);</div><div class='add'>+</div><div class='add'>+	/* success ! */</div><div class='add'>+	if (!err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* EIO means MSI test failed */</div><div class='add'>+	if (err != -EIO)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* back to INTx mode */</div><div class='add'>+	e_warn("MSI interrupt test failed, using legacy interrupt.\n");</div><div class='add'>+</div><div class='add'>+	e1000_free_irq(adapter);</div><div class='add'>+</div><div class='add'>+	err = e1000_request_irq(adapter);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * e1000_open - Called when a network interface is made active</div><div class='ctx'>  * @netdev: network interface device structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -2640,8 +2776,7 @@ static int e1000_open(struct net_device *netdev)</div><div class='ctx'> 	 * If AMT is enabled, let the firmware know that the network</div><div class='ctx'> 	 * interface is now open</div><div class='ctx'> 	 */</div><div class='del'>-	if ((adapter-&gt;flags &amp; FLAG_HAS_AMT) &amp;&amp;</div><div class='del'>-	    e1000e_check_mng_mode(&amp;adapter-&gt;hw))</div><div class='add'>+	if (adapter-&gt;flags &amp; FLAG_HAS_AMT)</div><div class='ctx'> 		e1000_get_hw_control(adapter);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2656,6 +2791,19 @@ static int e1000_open(struct net_device *netdev)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_req_irq;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Work around PCIe errata with MSI interrupts causing some chipsets to</div><div class='add'>+	 * ignore e1000e MSI messages, which means we need to test our MSI</div><div class='add'>+	 * interrupt now</div><div class='add'>+	 */</div><div class='add'>+	{</div><div class='add'>+		err = e1000_test_msi(adapter);</div><div class='add'>+		if (err) {</div><div class='add'>+			e_err("Interrupt allocation failed\n");</div><div class='add'>+			goto err_req_irq;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* From here on the code is the same as e1000e_up() */</div><div class='ctx'> 	clear_bit(__E1000_DOWN, &amp;adapter-&gt;state);</div><div class='ctx'> </div><div class='hunk'>@@ -2719,8 +2867,7 @@ static int e1000_close(struct net_device *netdev)</div><div class='ctx'> 	 * If AMT is enabled, let the firmware know that the network</div><div class='ctx'> 	 * interface is now closed</div><div class='ctx'> 	 */</div><div class='del'>-	if ((adapter-&gt;flags &amp; FLAG_HAS_AMT) &amp;&amp;</div><div class='del'>-	    e1000e_check_mng_mode(&amp;adapter-&gt;hw))</div><div class='add'>+	if (adapter-&gt;flags &amp; FLAG_HAS_AMT)</div><div class='ctx'> 		e1000_release_hw_control(adapter);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2917,8 +3064,7 @@ static void e1000_phy_read_status(struct e1000_adapter *adapter)</div><div class='ctx'> 		ret_val |= e1e_rphy(hw, PHY_1000T_STATUS, &amp;phy-&gt;stat1000);</div><div class='ctx'> 		ret_val |= e1e_rphy(hw, PHY_EXT_STATUS, &amp;phy-&gt;estatus);</div><div class='ctx'> 		if (ret_val)</div><div class='del'>-			ndev_warn(adapter-&gt;netdev,</div><div class='del'>-				  "Error reading PHY register\n");</div><div class='add'>+			e_warn("Error reading PHY register\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Do not read PHY registers if link is not up</div><div class='hunk'>@@ -2943,18 +3089,16 @@ static void e1000_phy_read_status(struct e1000_adapter *adapter)</div><div class='ctx'> static void e1000_print_link_info(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='del'>-	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> 	u32 ctrl = er32(CTRL);</div><div class='ctx'> </div><div class='del'>-	ndev_info(netdev,</div><div class='del'>-		"Link is Up %d Mbps %s, Flow Control: %s\n",</div><div class='del'>-		adapter-&gt;link_speed,</div><div class='del'>-		(adapter-&gt;link_duplex == FULL_DUPLEX) ?</div><div class='del'>-				"Full Duplex" : "Half Duplex",</div><div class='del'>-		((ctrl &amp; E1000_CTRL_TFCE) &amp;&amp; (ctrl &amp; E1000_CTRL_RFCE)) ?</div><div class='del'>-				"RX/TX" :</div><div class='del'>-		((ctrl &amp; E1000_CTRL_RFCE) ? "RX" :</div><div class='del'>-		((ctrl &amp; E1000_CTRL_TFCE) ? "TX" : "None" )));</div><div class='add'>+	e_info("Link is Up %d Mbps %s, Flow Control: %s\n",</div><div class='add'>+	       adapter-&gt;link_speed,</div><div class='add'>+	       (adapter-&gt;link_duplex == FULL_DUPLEX) ?</div><div class='add'>+	                        "Full Duplex" : "Half Duplex",</div><div class='add'>+	       ((ctrl &amp; E1000_CTRL_TFCE) &amp;&amp; (ctrl &amp; E1000_CTRL_RFCE)) ?</div><div class='add'>+	                        "RX/TX" :</div><div class='add'>+	       ((ctrl &amp; E1000_CTRL_RFCE) ? "RX" :</div><div class='add'>+	       ((ctrl &amp; E1000_CTRL_TFCE) ? "TX" : "None" )));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool e1000_has_link(struct e1000_adapter *adapter)</div><div class='hunk'>@@ -2994,8 +3138,7 @@ static bool e1000_has_link(struct e1000_adapter *adapter)</div><div class='ctx'> 	if ((ret_val == E1000_ERR_PHY) &amp;&amp; (hw-&gt;phy.type == e1000_phy_igp_3) &amp;&amp;</div><div class='ctx'> 	    (er32(CTRL) &amp; E1000_PHY_CTRL_GBE_DISABLE)) {</div><div class='ctx'> 		/* See e1000_kmrn_lock_loss_workaround_ich8lan() */</div><div class='del'>-		ndev_info(adapter-&gt;netdev,</div><div class='del'>-			  "Gigabit has been disabled, downgrading speed\n");</div><div class='add'>+		e_info("Gigabit has been disabled, downgrading speed\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return link_active;</div><div class='hunk'>@@ -3067,7 +3210,7 @@ static void e1000_watchdog_task(struct work_struct *work)</div><div class='ctx'> 			case SPEED_10:</div><div class='ctx'> 				txb2b = 0;</div><div class='ctx'> 				netdev-&gt;tx_queue_len = 10;</div><div class='del'>-				adapter-&gt;tx_timeout_factor = 14;</div><div class='add'>+				adapter-&gt;tx_timeout_factor = 16;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case SPEED_100:</div><div class='ctx'> 				txb2b = 0;</div><div class='hunk'>@@ -3096,8 +3239,7 @@ static void e1000_watchdog_task(struct work_struct *work)</div><div class='ctx'> 				switch (adapter-&gt;link_speed) {</div><div class='ctx'> 				case SPEED_10:</div><div class='ctx'> 				case SPEED_100:</div><div class='del'>-					ndev_info(netdev,</div><div class='del'>-					"10/100 speed: disabling TSO\n");</div><div class='add'>+					e_info("10/100 speed: disabling TSO\n");</div><div class='ctx'> 					netdev-&gt;features &amp;= ~NETIF_F_TSO;</div><div class='ctx'> 					netdev-&gt;features &amp;= ~NETIF_F_TSO6;</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -3130,7 +3272,7 @@ static void e1000_watchdog_task(struct work_struct *work)</div><div class='ctx'> 		if (netif_carrier_ok(netdev)) {</div><div class='ctx'> 			adapter-&gt;link_speed = 0;</div><div class='ctx'> 			adapter-&gt;link_duplex = 0;</div><div class='del'>-			ndev_info(netdev, "Link is Down\n");</div><div class='add'>+			e_info("Link is Down\n");</div><div class='ctx'> 			netif_carrier_off(netdev);</div><div class='ctx'> 			netif_tx_stop_all_queues(netdev);</div><div class='ctx'> 			if (!test_bit(__E1000_DOWN, &amp;adapter-&gt;state))</div><div class='hunk'>@@ -3604,8 +3746,7 @@ static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 			pull_size = min((unsigned int)4, skb-&gt;data_len);</div><div class='ctx'> 			if (!__pskb_pull_tail(skb, pull_size)) {</div><div class='del'>-				ndev_err(netdev,</div><div class='del'>-					 "__pskb_pull_tail failed.\n");</div><div class='add'>+				e_err("__pskb_pull_tail failed.\n");</div><div class='ctx'> 				dev_kfree_skb_any(skb);</div><div class='ctx'> 				return NETDEV_TX_OK;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -3735,27 +3876,27 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;</div><div class='ctx'> </div><div class='del'>-	if ((max_frame &lt; ETH_ZLEN + ETH_FCS_LEN) ||</div><div class='add'>+	if ((new_mtu &lt; ETH_ZLEN + ETH_FCS_LEN + VLAN_HLEN) ||</div><div class='ctx'> 	    (max_frame &gt; MAX_JUMBO_FRAME_SIZE)) {</div><div class='del'>-		ndev_err(netdev, "Invalid MTU setting\n");</div><div class='add'>+		e_err("Invalid MTU setting\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Jumbo frame size limits */</div><div class='ctx'> 	if (max_frame &gt; ETH_FRAME_LEN + ETH_FCS_LEN) {</div><div class='ctx'> 		if (!(adapter-&gt;flags &amp; FLAG_HAS_JUMBO_FRAMES)) {</div><div class='del'>-			ndev_err(netdev, "Jumbo Frames not supported.\n");</div><div class='add'>+			e_err("Jumbo Frames not supported.\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (adapter-&gt;hw.phy.type == e1000_phy_ife) {</div><div class='del'>-			ndev_err(netdev, "Jumbo Frames not supported.\n");</div><div class='add'>+			e_err("Jumbo Frames not supported.\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #define MAX_STD_JUMBO_FRAME_SIZE 9234</div><div class='ctx'> 	if (max_frame &gt; MAX_STD_JUMBO_FRAME_SIZE) {</div><div class='del'>-		ndev_err(netdev, "MTU &gt; 9216 not supported.\n");</div><div class='add'>+		e_err("MTU &gt; 9216 not supported.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3792,8 +3933,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 		adapter-&gt;rx_buffer_len = ETH_FRAME_LEN + VLAN_HLEN</div><div class='ctx'> 					 + ETH_FCS_LEN;</div><div class='ctx'> </div><div class='del'>-	ndev_info(netdev, "changing MTU from %d to %d\n",</div><div class='del'>-		netdev-&gt;mtu, new_mtu);</div><div class='add'>+	e_info("changing MTU from %d to %d\n", netdev-&gt;mtu, new_mtu);</div><div class='ctx'> 	netdev-&gt;mtu = new_mtu;</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(netdev))</div><div class='hunk'>@@ -4006,10 +4146,7 @@ static int e1000_resume(struct pci_dev *pdev)</div><div class='ctx'> 	pci_restore_state(pdev);</div><div class='ctx'> 	e1000e_disable_l1aspm(pdev);</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;need_ioport)</div><div class='del'>-		err = pci_enable_device(pdev);</div><div class='del'>-	else</div><div class='del'>-		err = pci_enable_device_mem(pdev);</div><div class='add'>+	err = pci_enable_device_mem(pdev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 			"Cannot enable PCI device from suspend\n");</div><div class='hunk'>@@ -4043,7 +4180,7 @@ static int e1000_resume(struct pci_dev *pdev)</div><div class='ctx'> 	 * is up.  For all other cases, let the f/w know that the h/w is now</div><div class='ctx'> 	 * under the control of the driver.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(adapter-&gt;flags &amp; FLAG_HAS_AMT) || !e1000e_check_mng_mode(&amp;adapter-&gt;hw))</div><div class='add'>+	if (!(adapter-&gt;flags &amp; FLAG_HAS_AMT))</div><div class='ctx'> 		e1000_get_hw_control(adapter);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -4111,10 +4248,7 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	e1000e_disable_l1aspm(pdev);</div><div class='del'>-	if (adapter-&gt;need_ioport)</div><div class='del'>-		err = pci_enable_device(pdev);</div><div class='del'>-	else</div><div class='del'>-		err = pci_enable_device_mem(pdev);</div><div class='add'>+	err = pci_enable_device_mem(pdev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 			"Cannot re-enable PCI device after reset.\n");</div><div class='hunk'>@@ -4162,8 +4296,7 @@ static void e1000_io_resume(struct pci_dev *pdev)</div><div class='ctx'> 	 * is up.  For all other cases, let the f/w know that the h/w is now</div><div class='ctx'> 	 * under the control of the driver.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(adapter-&gt;flags &amp; FLAG_HAS_AMT) ||</div><div class='del'>-	    !e1000e_check_mng_mode(&amp;adapter-&gt;hw))</div><div class='add'>+	if (!(adapter-&gt;flags &amp; FLAG_HAS_AMT))</div><div class='ctx'> 		e1000_get_hw_control(adapter);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -4175,36 +4308,40 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)</div><div class='ctx'> 	u32 pba_num;</div><div class='ctx'> </div><div class='ctx'> 	/* print bus type/speed/width info */</div><div class='del'>-	ndev_info(netdev, "(PCI Express:2.5GB/s:%s) "</div><div class='del'>-		  "%02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='del'>-		  /* bus width */</div><div class='del'>-		 ((hw-&gt;bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :</div><div class='del'>-		  "Width x1"),</div><div class='del'>-		  /* MAC address */</div><div class='del'>-		  netdev-&gt;dev_addr[0], netdev-&gt;dev_addr[1],</div><div class='del'>-		  netdev-&gt;dev_addr[2], netdev-&gt;dev_addr[3],</div><div class='del'>-		  netdev-&gt;dev_addr[4], netdev-&gt;dev_addr[5]);</div><div class='del'>-	ndev_info(netdev, "Intel(R) PRO/%s Network Connection\n",</div><div class='del'>-		  (hw-&gt;phy.type == e1000_phy_ife)</div><div class='del'>-		   ? "10/100" : "1000");</div><div class='add'>+	e_info("(PCI Express:2.5GB/s:%s) %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+	       /* bus width */</div><div class='add'>+	       ((hw-&gt;bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :</div><div class='add'>+	        "Width x1"),</div><div class='add'>+	       /* MAC address */</div><div class='add'>+	       netdev-&gt;dev_addr[0], netdev-&gt;dev_addr[1],</div><div class='add'>+	       netdev-&gt;dev_addr[2], netdev-&gt;dev_addr[3],</div><div class='add'>+	       netdev-&gt;dev_addr[4], netdev-&gt;dev_addr[5]);</div><div class='add'>+	e_info("Intel(R) PRO/%s Network Connection\n",</div><div class='add'>+	       (hw-&gt;phy.type == e1000_phy_ife) ? "10/100" : "1000");</div><div class='ctx'> 	e1000e_read_pba_num(hw, &amp;pba_num);</div><div class='del'>-	ndev_info(netdev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n",</div><div class='del'>-		  hw-&gt;mac.type, hw-&gt;phy.type,</div><div class='del'>-		  (pba_num &gt;&gt; 8), (pba_num &amp; 0xff));</div><div class='add'>+	e_info("MAC: %d, PHY: %d, PBA No: %06x-%03x\n",</div><div class='add'>+	       hw-&gt;mac.type, hw-&gt;phy.type, (pba_num &gt;&gt; 8), (pba_num &amp; 0xff));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * e1000e_is_need_ioport - determine if an adapter needs ioport resources or not</div><div class='del'>- * @pdev: PCI device information struct</div><div class='del'>- *</div><div class='del'>- * Returns true if an adapters needs ioport resources</div><div class='del'>- **/</div><div class='del'>-static int e1000e_is_need_ioport(struct pci_dev *pdev)</div><div class='add'>+static void e1000_eeprom_checks(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	switch (pdev-&gt;device) {</div><div class='del'>-	/* Currently there are no adapters that need ioport resources */</div><div class='del'>-	default:</div><div class='del'>-		return false;</div><div class='add'>+	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	int ret_val;</div><div class='add'>+	u16 buf = 0;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;mac.type != e1000_82573)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret_val = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &amp;buf);</div><div class='add'>+	if (!(le16_to_cpu(buf) &amp; (1 &lt;&lt; 0))) {</div><div class='add'>+		/* Deep Smart Power Down (DSPD) */</div><div class='add'>+		e_warn("Warning: detected DSPD enabled in EEPROM\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret_val = e1000_read_nvm(hw, NVM_INIT_3GIO_3, 1, &amp;buf);</div><div class='add'>+	if (le16_to_cpu(buf) &amp; (3 &lt;&lt; 2)) {</div><div class='add'>+		/* ASPM enable */</div><div class='add'>+		e_warn("Warning: detected ASPM enabled in EEPROM\n");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4233,19 +4370,10 @@ static int __devinit e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 	int i, err, pci_using_dac;</div><div class='ctx'> 	u16 eeprom_data = 0;</div><div class='ctx'> 	u16 eeprom_apme_mask = E1000_EEPROM_APME;</div><div class='del'>-	int bars, need_ioport;</div><div class='ctx'> </div><div class='ctx'> 	e1000e_disable_l1aspm(pdev);</div><div class='ctx'> </div><div class='del'>-	/* do not allocate ioport bars when not needed */</div><div class='del'>-	need_ioport = e1000e_is_need_ioport(pdev);</div><div class='del'>-	if (need_ioport) {</div><div class='del'>-		bars = pci_select_bars(pdev, IORESOURCE_MEM | IORESOURCE_IO);</div><div class='del'>-		err = pci_enable_device(pdev);</div><div class='del'>-	} else {</div><div class='del'>-		bars = pci_select_bars(pdev, IORESOURCE_MEM);</div><div class='del'>-		err = pci_enable_device_mem(pdev);</div><div class='del'>-	}</div><div class='add'>+	err = pci_enable_device_mem(pdev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -4268,7 +4396,9 @@ static int __devinit e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = pci_request_selected_regions(pdev, bars, e1000e_driver_name);</div><div class='add'>+	err = pci_request_selected_regions(pdev,</div><div class='add'>+	                                  pci_select_bars(pdev, IORESOURCE_MEM),</div><div class='add'>+	                                  e1000e_driver_name);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_pci_reg;</div><div class='ctx'> </div><div class='hunk'>@@ -4293,8 +4423,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 	adapter-&gt;hw.adapter = adapter;</div><div class='ctx'> 	adapter-&gt;hw.mac.type = ei-&gt;mac;</div><div class='ctx'> 	adapter-&gt;msg_enable = (1 &lt;&lt; NETIF_MSG_DRV | NETIF_MSG_PROBE) - 1;</div><div class='del'>-	adapter-&gt;bars = bars;</div><div class='del'>-	adapter-&gt;need_ioport = need_ioport;</div><div class='ctx'> </div><div class='ctx'> 	mmio_start = pci_resource_start(pdev, 0);</div><div class='ctx'> 	mmio_len = pci_resource_len(pdev, 0);</div><div class='hunk'>@@ -4366,8 +4494,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (e1000_check_reset_block(&amp;adapter-&gt;hw))</div><div class='del'>-		ndev_info(netdev,</div><div class='del'>-			  "PHY reset is blocked due to SOL/IDER session.\n");</div><div class='add'>+		e_info("PHY reset is blocked due to SOL/IDER session.\n");</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;features = NETIF_F_SG |</div><div class='ctx'> 			   NETIF_F_HW_CSUM |</div><div class='hunk'>@@ -4411,25 +4538,26 @@ static int __devinit e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 		if (e1000_validate_nvm_checksum(&amp;adapter-&gt;hw) &gt;= 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (i == 2) {</div><div class='del'>-			ndev_err(netdev, "The NVM Checksum Is Not Valid\n");</div><div class='add'>+			e_err("The NVM Checksum Is Not Valid\n");</div><div class='ctx'> 			err = -EIO;</div><div class='ctx'> 			goto err_eeprom;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	e1000_eeprom_checks(adapter);</div><div class='add'>+</div><div class='ctx'> 	/* copy the MAC address out of the NVM */</div><div class='ctx'> 	if (e1000e_read_mac_addr(&amp;adapter-&gt;hw))</div><div class='del'>-		ndev_err(netdev, "NVM Read Error while reading MAC address\n");</div><div class='add'>+		e_err("NVM Read Error while reading MAC address\n");</div><div class='ctx'> </div><div class='ctx'> 	memcpy(netdev-&gt;dev_addr, adapter-&gt;hw.mac.addr, netdev-&gt;addr_len);</div><div class='ctx'> 	memcpy(netdev-&gt;perm_addr, adapter-&gt;hw.mac.addr, netdev-&gt;addr_len);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(netdev-&gt;perm_addr)) {</div><div class='del'>-		ndev_err(netdev, "Invalid MAC Address: "</div><div class='del'>-			 "%02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='del'>-			 netdev-&gt;perm_addr[0], netdev-&gt;perm_addr[1],</div><div class='del'>-			 netdev-&gt;perm_addr[2], netdev-&gt;perm_addr[3],</div><div class='del'>-			 netdev-&gt;perm_addr[4], netdev-&gt;perm_addr[5]);</div><div class='add'>+		e_err("Invalid MAC Address: %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+		      netdev-&gt;perm_addr[0], netdev-&gt;perm_addr[1],</div><div class='add'>+		      netdev-&gt;perm_addr[2], netdev-&gt;perm_addr[3],</div><div class='add'>+		      netdev-&gt;perm_addr[4], netdev-&gt;perm_addr[5]);</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto err_eeprom;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4499,8 +4627,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 	 * is up.  For all other cases, let the f/w know that the h/w is now</div><div class='ctx'> 	 * under the control of the driver.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(adapter-&gt;flags &amp; FLAG_HAS_AMT) ||</div><div class='del'>-	    !e1000e_check_mng_mode(&amp;adapter-&gt;hw))</div><div class='add'>+	if (!(adapter-&gt;flags &amp; FLAG_HAS_AMT))</div><div class='ctx'> 		e1000_get_hw_control(adapter);</div><div class='ctx'> </div><div class='ctx'> 	/* tell the stack to leave us alone until e1000_open() is called */</div><div class='hunk'>@@ -4517,24 +4644,25 @@ static int __devinit e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_register:</div><div class='del'>-err_hw_init:</div><div class='del'>-	e1000_release_hw_control(adapter);</div><div class='add'>+	if (!(adapter-&gt;flags &amp; FLAG_HAS_AMT))</div><div class='add'>+		e1000_release_hw_control(adapter);</div><div class='ctx'> err_eeprom:</div><div class='ctx'> 	if (!e1000_check_reset_block(&amp;adapter-&gt;hw))</div><div class='ctx'> 		e1000_phy_hw_reset(&amp;adapter-&gt;hw);</div><div class='add'>+err_hw_init:</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;hw.flash_address)</div><div class='del'>-		iounmap(adapter-&gt;hw.flash_address);</div><div class='del'>-</div><div class='del'>-err_flashmap:</div><div class='ctx'> 	kfree(adapter-&gt;tx_ring);</div><div class='ctx'> 	kfree(adapter-&gt;rx_ring);</div><div class='ctx'> err_sw_init:</div><div class='add'>+	if (adapter-&gt;hw.flash_address)</div><div class='add'>+		iounmap(adapter-&gt;hw.flash_address);</div><div class='add'>+err_flashmap:</div><div class='ctx'> 	iounmap(adapter-&gt;hw.hw_addr);</div><div class='ctx'> err_ioremap:</div><div class='ctx'> 	free_netdev(netdev);</div><div class='ctx'> err_alloc_etherdev:</div><div class='del'>-	pci_release_selected_regions(pdev, bars);</div><div class='add'>+	pci_release_selected_regions(pdev,</div><div class='add'>+	                             pci_select_bars(pdev, IORESOURCE_MEM));</div><div class='ctx'> err_pci_reg:</div><div class='ctx'> err_dma:</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='hunk'>@@ -4582,7 +4710,8 @@ static void __devexit e1000_remove(struct pci_dev *pdev)</div><div class='ctx'> 	iounmap(adapter-&gt;hw.hw_addr);</div><div class='ctx'> 	if (adapter-&gt;hw.flash_address)</div><div class='ctx'> 		iounmap(adapter-&gt;hw.flash_address);</div><div class='del'>-	pci_release_selected_regions(pdev, adapter-&gt;bars);</div><div class='add'>+	pci_release_selected_regions(pdev,</div><div class='add'>+	                             pci_select_bars(pdev, IORESOURCE_MEM));</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(netdev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c<br/>index a66b92efcf80..ed912e023a72 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e1000e/param.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/e1000e/param.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e1000e/param.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/e1000e/param.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> *******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "e1000.h"</div><div class='ctx'> </div><div class='hunk'>@@ -162,17 +163,16 @@ static int __devinit e1000_validate_option(unsigned int *value,</div><div class='ctx'> 	case enable_option:</div><div class='ctx'> 		switch (*value) {</div><div class='ctx'> 		case OPTION_ENABLED:</div><div class='del'>-			ndev_info(adapter-&gt;netdev, "%s Enabled\n", opt-&gt;name);</div><div class='add'>+			e_info("%s Enabled\n", opt-&gt;name);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		case OPTION_DISABLED:</div><div class='del'>-			ndev_info(adapter-&gt;netdev, "%s Disabled\n", opt-&gt;name);</div><div class='add'>+			e_info("%s Disabled\n", opt-&gt;name);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case range_option:</div><div class='ctx'> 		if (*value &gt;= opt-&gt;arg.r.min &amp;&amp; *value &lt;= opt-&gt;arg.r.max) {</div><div class='del'>-			ndev_info(adapter-&gt;netdev,</div><div class='del'>-					"%s set to %i\n", opt-&gt;name, *value);</div><div class='add'>+			e_info("%s set to %i\n", opt-&gt;name, *value);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -184,8 +184,7 @@ static int __devinit e1000_validate_option(unsigned int *value,</div><div class='ctx'> 			ent = &amp;opt-&gt;arg.l.p[i];</div><div class='ctx'> 			if (*value == ent-&gt;i) {</div><div class='ctx'> 				if (ent-&gt;str[0] != '\0')</div><div class='del'>-					ndev_info(adapter-&gt;netdev, "%s\n",</div><div class='del'>-						  ent-&gt;str);</div><div class='add'>+					e_info("%s\n", ent-&gt;str);</div><div class='ctx'> 				return 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -195,8 +194,8 @@ static int __devinit e1000_validate_option(unsigned int *value,</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ndev_info(adapter-&gt;netdev, "Invalid %s value specified (%i) %s\n",</div><div class='del'>-	       opt-&gt;name, *value, opt-&gt;err);</div><div class='add'>+	e_info("Invalid %s value specified (%i) %s\n", opt-&gt;name, *value,</div><div class='add'>+	       opt-&gt;err);</div><div class='ctx'> 	*value = opt-&gt;def;</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='hunk'>@@ -213,13 +212,11 @@ static int __devinit e1000_validate_option(unsigned int *value,</div><div class='ctx'> void __devinit e1000e_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='del'>-	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> 	int bd = adapter-&gt;bd_number;</div><div class='ctx'> </div><div class='ctx'> 	if (bd &gt;= E1000_MAX_NIC) {</div><div class='del'>-		ndev_notice(netdev,</div><div class='del'>-		       "Warning: no configuration for board #%i\n", bd);</div><div class='del'>-		ndev_notice(netdev, "Using defaults for all values\n");</div><div class='add'>+		e_notice("Warning: no configuration for board #%i\n", bd);</div><div class='add'>+		e_notice("Using defaults for all values\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	{ /* Transmit Interrupt Delay */</div><div class='hunk'>@@ -313,32 +310,41 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 			adapter-&gt;itr = InterruptThrottleRate[bd];</div><div class='ctx'> 			switch (adapter-&gt;itr) {</div><div class='ctx'> 			case 0:</div><div class='del'>-				ndev_info(netdev, "%s turned off\n",</div><div class='del'>-					opt.name);</div><div class='add'>+				e_info("%s turned off\n", opt.name);</div><div class='ctx'> 				break;</div><div class='ctx'> 			case 1:</div><div class='del'>-				ndev_info(netdev,</div><div class='del'>-					  "%s set to dynamic mode\n",</div><div class='del'>-					  opt.name);</div><div class='add'>+				e_info("%s set to dynamic mode\n", opt.name);</div><div class='ctx'> 				adapter-&gt;itr_setting = adapter-&gt;itr;</div><div class='ctx'> 				adapter-&gt;itr = 20000;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case 3:</div><div class='del'>-				ndev_info(netdev,</div><div class='del'>-					"%s set to dynamic conservative mode\n",</div><div class='add'>+				e_info("%s set to dynamic conservative mode\n",</div><div class='ctx'> 					opt.name);</div><div class='ctx'> 				adapter-&gt;itr_setting = adapter-&gt;itr;</div><div class='ctx'> 				adapter-&gt;itr = 20000;</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='del'>-				e1000_validate_option(&amp;adapter-&gt;itr, &amp;opt,</div><div class='del'>-					adapter);</div><div class='ctx'> 				/*</div><div class='del'>-				 * save the setting, because the dynamic bits</div><div class='del'>-				 * change itr. clear the lower two bits</div><div class='del'>-				 * because they are used as control</div><div class='add'>+				 * Save the setting, because the dynamic bits</div><div class='add'>+				 * change itr.</div><div class='ctx'> 				 */</div><div class='del'>-				adapter-&gt;itr_setting = adapter-&gt;itr &amp; ~3;</div><div class='add'>+				if (e1000_validate_option(&amp;adapter-&gt;itr, &amp;opt,</div><div class='add'>+							  adapter) &amp;&amp;</div><div class='add'>+				    (adapter-&gt;itr == 3)) {</div><div class='add'>+					/*</div><div class='add'>+					 * In case of invalid user value,</div><div class='add'>+					 * default to conservative mode.</div><div class='add'>+					 */</div><div class='add'>+					adapter-&gt;itr_setting = adapter-&gt;itr;</div><div class='add'>+					adapter-&gt;itr = 20000;</div><div class='add'>+				} else {</div><div class='add'>+					/*</div><div class='add'>+					 * Clear the lower two bits because</div><div class='add'>+					 * they are used as control.</div><div class='add'>+					 */</div><div class='add'>+					adapter-&gt;itr_setting =</div><div class='add'>+						adapter-&gt;itr &amp; ~3;</div><div class='add'>+				}</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='head'>diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c<br/>index 56f50491a453..1f11350e16cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/eepro.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/eepro.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/eepro.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/eepro.c</a></div><div class='hunk'>@@ -1283,14 +1283,6 @@ set_multicast_list(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;flags&amp;(IFF_ALLMULTI|IFF_PROMISC) || dev-&gt;mc_count &gt; 63)</div><div class='ctx'> 	{</div><div class='del'>-		/*</div><div class='del'>-		 *	We must make the kernel realise we had to move</div><div class='del'>-		 *	into promisc mode or we start all out war on</div><div class='del'>-		 *	the cable. If it was a promisc request the</div><div class='del'>-		 *	flag is already set. If not we assert it.</div><div class='del'>-		 */</div><div class='del'>-		dev-&gt;flags|=IFF_PROMISC;</div><div class='del'>-</div><div class='ctx'> 		eepro_sw2bank2(ioaddr); /* be CAREFUL, BANK 2 now */</div><div class='ctx'> 		mode = inb(ioaddr + REG2);</div><div class='ctx'> 		outb(mode | PRMSC_Mode, ioaddr + REG2);</div><div class='head'>diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c<br/>index 0920b796bd78..b70c5314f537 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ehea/ehea_main.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/ehea/ehea_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ehea/ehea_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ehea/ehea_main.c</a></div><div class='hunk'>@@ -2937,9 +2937,9 @@ static void ehea_rereg_mrs(struct work_struct *work)</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-       mutex_unlock(&amp;dlpar_mem_lock);</div><div class='del'>-       ehea_info("re-initializing driver complete");</div><div class='add'>+	ehea_info("re-initializing driver complete");</div><div class='ctx'> out:</div><div class='add'>+	mutex_unlock(&amp;dlpar_mem_lock);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c<br/>index c05cb159c772..aa0bf6e1c694 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/enc28j60.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/enc28j60.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/enc28j60.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/enc28j60.c</a></div><div class='hunk'>@@ -1547,8 +1547,10 @@ static int __devinit enc28j60_probe(struct spi_device *spi)</div><div class='ctx'> 	random_ether_addr(dev-&gt;dev_addr);</div><div class='ctx'> 	enc28j60_set_hw_macaddr(dev);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(spi-&gt;irq, enc28j60_irq, IRQF_TRIGGER_FALLING,</div><div class='del'>-			  DRV_NAME, priv);</div><div class='add'>+	/* Board setup must set the relevant edge trigger type;</div><div class='add'>+	 * level triggers won't currently work.</div><div class='add'>+	 */</div><div class='add'>+	ret = request_irq(spi-&gt;irq, enc28j60_irq, 0, DRV_NAME, priv);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		if (netif_msg_probe(priv))</div><div class='ctx'> 			dev_err(&amp;spi-&gt;dev, DRV_NAME ": request irq %d failed "</div><div class='head'>diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c<br/>index e3dd8b136908..bee8b3fbc565 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/eth16i.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/eth16i.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/eth16i.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/eth16i.c</a></div><div class='hunk'>@@ -1356,7 +1356,6 @@ static void eth16i_multicast(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if(dev-&gt;mc_count || dev-&gt;flags&amp;(IFF_ALLMULTI|IFF_PROMISC))</div><div class='ctx'> 	{</div><div class='del'>-		dev-&gt;flags|=IFF_PROMISC;	/* Must do this */</div><div class='ctx'> 		outb(3, ioaddr + RECEIVE_MODE_REG);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		outb(2, ioaddr + RECEIVE_MODE_REG);</div><div class='head'>diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c<br/>index 4ed89fa9ae46..eeb55ed2152d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/forcedeth.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/forcedeth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/forcedeth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/forcedeth.c</a></div><div class='hunk'>@@ -77,26 +77,27 @@</div><div class='ctx'>  * Hardware access:</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define DEV_NEED_TIMERIRQ          0x00001  /* set the timer irq flag in the irq mask */</div><div class='del'>-#define DEV_NEED_LINKTIMER         0x00002  /* poll link settings. Relies on the timer irq */</div><div class='del'>-#define DEV_HAS_LARGEDESC          0x00004  /* device supports jumbo frames and needs packet format 2 */</div><div class='del'>-#define DEV_HAS_HIGH_DMA           0x00008  /* device supports 64bit dma */</div><div class='del'>-#define DEV_HAS_CHECKSUM           0x00010  /* device supports tx and rx checksum offloads */</div><div class='del'>-#define DEV_HAS_VLAN               0x00020  /* device supports vlan tagging and striping */</div><div class='del'>-#define DEV_HAS_MSI                0x00040  /* device supports MSI */</div><div class='del'>-#define DEV_HAS_MSI_X              0x00080  /* device supports MSI-X */</div><div class='del'>-#define DEV_HAS_POWER_CNTRL        0x00100  /* device supports power savings */</div><div class='del'>-#define DEV_HAS_STATISTICS_V1      0x00200  /* device supports hw statistics version 1 */</div><div class='del'>-#define DEV_HAS_STATISTICS_V2      0x00400  /* device supports hw statistics version 2 */</div><div class='del'>-#define DEV_HAS_TEST_EXTENDED      0x00800  /* device supports extended diagnostic test */</div><div class='del'>-#define DEV_HAS_MGMT_UNIT          0x01000  /* device supports management unit */</div><div class='del'>-#define DEV_HAS_CORRECT_MACADDR    0x02000  /* device supports correct mac address order */</div><div class='del'>-#define DEV_HAS_COLLISION_FIX      0x04000  /* device supports tx collision fix */</div><div class='del'>-#define DEV_HAS_PAUSEFRAME_TX_V1   0x08000  /* device supports tx pause frames version 1 */</div><div class='del'>-#define DEV_HAS_PAUSEFRAME_TX_V2   0x10000  /* device supports tx pause frames version 2 */</div><div class='del'>-#define DEV_HAS_PAUSEFRAME_TX_V3   0x20000  /* device supports tx pause frames version 3 */</div><div class='del'>-#define DEV_NEED_TX_LIMIT          0x40000  /* device needs to limit tx */</div><div class='del'>-#define DEV_HAS_GEAR_MODE          0x80000  /* device supports gear mode */</div><div class='add'>+#define DEV_NEED_TIMERIRQ          0x000001  /* set the timer irq flag in the irq mask */</div><div class='add'>+#define DEV_NEED_LINKTIMER         0x000002  /* poll link settings. Relies on the timer irq */</div><div class='add'>+#define DEV_HAS_LARGEDESC          0x000004  /* device supports jumbo frames and needs packet format 2 */</div><div class='add'>+#define DEV_HAS_HIGH_DMA           0x000008  /* device supports 64bit dma */</div><div class='add'>+#define DEV_HAS_CHECKSUM           0x000010  /* device supports tx and rx checksum offloads */</div><div class='add'>+#define DEV_HAS_VLAN               0x000020  /* device supports vlan tagging and striping */</div><div class='add'>+#define DEV_HAS_MSI                0x000040  /* device supports MSI */</div><div class='add'>+#define DEV_HAS_MSI_X              0x000080  /* device supports MSI-X */</div><div class='add'>+#define DEV_HAS_POWER_CNTRL        0x000100  /* device supports power savings */</div><div class='add'>+#define DEV_HAS_STATISTICS_V1      0x000200  /* device supports hw statistics version 1 */</div><div class='add'>+#define DEV_HAS_STATISTICS_V2      0x000400  /* device supports hw statistics version 2 */</div><div class='add'>+#define DEV_HAS_STATISTICS_V3      0x000800  /* device supports hw statistics version 3 */</div><div class='add'>+#define DEV_HAS_TEST_EXTENDED      0x001000  /* device supports extended diagnostic test */</div><div class='add'>+#define DEV_HAS_MGMT_UNIT          0x002000  /* device supports management unit */</div><div class='add'>+#define DEV_HAS_CORRECT_MACADDR    0x004000  /* device supports correct mac address order */</div><div class='add'>+#define DEV_HAS_COLLISION_FIX      0x008000  /* device supports tx collision fix */</div><div class='add'>+#define DEV_HAS_PAUSEFRAME_TX_V1   0x010000  /* device supports tx pause frames version 1 */</div><div class='add'>+#define DEV_HAS_PAUSEFRAME_TX_V2   0x020000  /* device supports tx pause frames version 2 */</div><div class='add'>+#define DEV_HAS_PAUSEFRAME_TX_V3   0x040000  /* device supports tx pause frames version 3 */</div><div class='add'>+#define DEV_NEED_TX_LIMIT          0x080000  /* device needs to limit tx */</div><div class='add'>+#define DEV_HAS_GEAR_MODE          0x100000  /* device supports gear mode */</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	NvRegIrqStatus = 0x000,</div><div class='hunk'>@@ -248,6 +249,8 @@ enum {</div><div class='ctx'> #define NVREG_TX_PAUSEFRAME_ENABLE_V1	0x01800010</div><div class='ctx'> #define NVREG_TX_PAUSEFRAME_ENABLE_V2	0x056003f0</div><div class='ctx'> #define NVREG_TX_PAUSEFRAME_ENABLE_V3	0x09f00880</div><div class='add'>+	NvRegTxPauseFrameLimit = 0x174,</div><div class='add'>+#define NVREG_TX_PAUSEFRAMELIMIT_ENABLE	0x00010000</div><div class='ctx'> 	NvRegMIIStatus = 0x180,</div><div class='ctx'> #define NVREG_MIISTAT_ERROR		0x0001</div><div class='ctx'> #define NVREG_MIISTAT_LINKCHANGE	0x0008</div><div class='hunk'>@@ -270,6 +273,9 @@ enum {</div><div class='ctx'> #define NVREG_MIICTL_WRITE	0x00400</div><div class='ctx'> #define NVREG_MIICTL_ADDRSHIFT	5</div><div class='ctx'> 	NvRegMIIData = 0x194,</div><div class='add'>+	NvRegTxUnicast = 0x1a0,</div><div class='add'>+	NvRegTxMulticast = 0x1a4,</div><div class='add'>+	NvRegTxBroadcast = 0x1a8,</div><div class='ctx'> 	NvRegWakeUpFlags = 0x200,</div><div class='ctx'> #define NVREG_WAKEUPFLAGS_VAL		0x7770</div><div class='ctx'> #define NVREG_WAKEUPFLAGS_BUSYSHIFT	24</div><div class='hunk'>@@ -333,6 +339,7 @@ enum {</div><div class='ctx'> 	NvRegPowerState2 = 0x600,</div><div class='ctx'> #define NVREG_POWERSTATE2_POWERUP_MASK		0x0F11</div><div class='ctx'> #define NVREG_POWERSTATE2_POWERUP_REV_A3	0x0001</div><div class='add'>+#define NVREG_POWERSTATE2_PHY_RESET		0x0004</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Big endian: should work, but is untested */</div><div class='hunk'>@@ -401,6 +408,7 @@ union ring_type {</div><div class='ctx'> #define NV_RX_FRAMINGERR	(1&lt;&lt;29)</div><div class='ctx'> #define NV_RX_ERROR		(1&lt;&lt;30)</div><div class='ctx'> #define NV_RX_AVAIL		(1&lt;&lt;31)</div><div class='add'>+#define NV_RX_ERROR_MASK	(NV_RX_ERROR1|NV_RX_ERROR2|NV_RX_ERROR3|NV_RX_ERROR4|NV_RX_CRCERR|NV_RX_OVERFLOW|NV_RX_FRAMINGERR)</div><div class='ctx'> </div><div class='ctx'> #define NV_RX2_CHECKSUMMASK	(0x1C000000)</div><div class='ctx'> #define NV_RX2_CHECKSUM_IP	(0x10000000)</div><div class='hunk'>@@ -418,6 +426,7 @@ union ring_type {</div><div class='ctx'> /* error and avail are the same for both */</div><div class='ctx'> #define NV_RX2_ERROR		(1&lt;&lt;30)</div><div class='ctx'> #define NV_RX2_AVAIL		(1&lt;&lt;31)</div><div class='add'>+#define NV_RX2_ERROR_MASK	(NV_RX2_ERROR1|NV_RX2_ERROR2|NV_RX2_ERROR3|NV_RX2_ERROR4|NV_RX2_CRCERR|NV_RX2_OVERFLOW|NV_RX2_FRAMINGERR)</div><div class='ctx'> </div><div class='ctx'> #define NV_RX3_VLAN_TAG_PRESENT (1&lt;&lt;16)</div><div class='ctx'> #define NV_RX3_VLAN_TAG_MASK	(0x0000FFFF)</div><div class='hunk'>@@ -529,6 +538,7 @@ union ring_type {</div><div class='ctx'> #define PHY_REALTEK_INIT_REG4	0x14</div><div class='ctx'> #define PHY_REALTEK_INIT_REG5	0x18</div><div class='ctx'> #define PHY_REALTEK_INIT_REG6	0x11</div><div class='add'>+#define PHY_REALTEK_INIT_REG7	0x01</div><div class='ctx'> #define PHY_REALTEK_INIT1	0x0000</div><div class='ctx'> #define PHY_REALTEK_INIT2	0x8e00</div><div class='ctx'> #define PHY_REALTEK_INIT3	0x0001</div><div class='hunk'>@@ -537,6 +547,9 @@ union ring_type {</div><div class='ctx'> #define PHY_REALTEK_INIT6	0xf5c7</div><div class='ctx'> #define PHY_REALTEK_INIT7	0x1000</div><div class='ctx'> #define PHY_REALTEK_INIT8	0x0003</div><div class='add'>+#define PHY_REALTEK_INIT9	0x0008</div><div class='add'>+#define PHY_REALTEK_INIT10	0x0005</div><div class='add'>+#define PHY_REALTEK_INIT11	0x0200</div><div class='ctx'> #define PHY_REALTEK_INIT_MSK1	0x0003</div><div class='ctx'> </div><div class='ctx'> #define PHY_GIGABIT	0x0100</div><div class='hunk'>@@ -611,7 +624,12 @@ static const struct nv_ethtool_str nv_estats_str[] = {</div><div class='ctx'> 	{ "rx_bytes" },</div><div class='ctx'> 	{ "tx_pause" },</div><div class='ctx'> 	{ "rx_pause" },</div><div class='del'>-	{ "rx_drop_frame" }</div><div class='add'>+	{ "rx_drop_frame" },</div><div class='add'>+</div><div class='add'>+	/* version 3 stats */</div><div class='add'>+	{ "tx_unicast" },</div><div class='add'>+	{ "tx_multicast" },</div><div class='add'>+	{ "tx_broadcast" }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nv_ethtool_stats {</div><div class='hunk'>@@ -647,9 +665,15 @@ struct nv_ethtool_stats {</div><div class='ctx'> 	u64 tx_pause;</div><div class='ctx'> 	u64 rx_pause;</div><div class='ctx'> 	u64 rx_drop_frame;</div><div class='add'>+</div><div class='add'>+	/* version 3 stats */</div><div class='add'>+	u64 tx_unicast;</div><div class='add'>+	u64 tx_multicast;</div><div class='add'>+	u64 tx_broadcast;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define NV_DEV_STATISTICS_V2_COUNT (sizeof(struct nv_ethtool_stats)/sizeof(u64))</div><div class='add'>+#define NV_DEV_STATISTICS_V3_COUNT (sizeof(struct nv_ethtool_stats)/sizeof(u64))</div><div class='add'>+#define NV_DEV_STATISTICS_V2_COUNT (NV_DEV_STATISTICS_V3_COUNT - 3)</div><div class='ctx'> #define NV_DEV_STATISTICS_V1_COUNT (NV_DEV_STATISTICS_V2_COUNT - 6)</div><div class='ctx'> </div><div class='ctx'> /* diagnostics */</div><div class='hunk'>@@ -1149,6 +1173,42 @@ static int phy_init(struct net_device *dev)</div><div class='ctx'> 				return PHY_ERROR;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		if (np-&gt;phy_model == PHY_MODEL_REALTEK_8211 &amp;&amp;</div><div class='add'>+		    np-&gt;phy_rev == PHY_REV_REALTEK_8211C) {</div><div class='add'>+			u32 powerstate = readl(base + NvRegPowerState2);</div><div class='add'>+</div><div class='add'>+			/* need to perform hw phy reset */</div><div class='add'>+			powerstate |= NVREG_POWERSTATE2_PHY_RESET;</div><div class='add'>+			writel(powerstate, base + NvRegPowerState2);</div><div class='add'>+			msleep(25);</div><div class='add'>+</div><div class='add'>+			powerstate &amp;= ~NVREG_POWERSTATE2_PHY_RESET;</div><div class='add'>+			writel(powerstate, base + NvRegPowerState2);</div><div class='add'>+			msleep(25);</div><div class='add'>+</div><div class='add'>+			reg = mii_rw(dev, np-&gt;phyaddr, PHY_REALTEK_INIT_REG6, MII_READ);</div><div class='add'>+			reg |= PHY_REALTEK_INIT9;</div><div class='add'>+			if (mii_rw(dev, np-&gt;phyaddr, PHY_REALTEK_INIT_REG6, reg)) {</div><div class='add'>+				printk(KERN_INFO "%s: phy init failed.\n", pci_name(np-&gt;pci_dev));</div><div class='add'>+				return PHY_ERROR;</div><div class='add'>+			}</div><div class='add'>+			if (mii_rw(dev, np-&gt;phyaddr, PHY_REALTEK_INIT_REG1, PHY_REALTEK_INIT10)) {</div><div class='add'>+				printk(KERN_INFO "%s: phy init failed.\n", pci_name(np-&gt;pci_dev));</div><div class='add'>+				return PHY_ERROR;</div><div class='add'>+			}</div><div class='add'>+			reg = mii_rw(dev, np-&gt;phyaddr, PHY_REALTEK_INIT_REG7, MII_READ);</div><div class='add'>+			if (!(reg &amp; PHY_REALTEK_INIT11)) {</div><div class='add'>+				reg |= PHY_REALTEK_INIT11;</div><div class='add'>+				if (mii_rw(dev, np-&gt;phyaddr, PHY_REALTEK_INIT_REG7, reg)) {</div><div class='add'>+					printk(KERN_INFO "%s: phy init failed.\n", pci_name(np-&gt;pci_dev));</div><div class='add'>+					return PHY_ERROR;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (mii_rw(dev, np-&gt;phyaddr, PHY_REALTEK_INIT_REG1, PHY_REALTEK_INIT1)) {</div><div class='add'>+				printk(KERN_INFO "%s: phy init failed.\n", pci_name(np-&gt;pci_dev));</div><div class='add'>+				return PHY_ERROR;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		if (np-&gt;phy_model == PHY_MODEL_REALTEK_8201) {</div><div class='ctx'> 			if (np-&gt;device_id == PCI_DEVICE_ID_NVIDIA_NVENET_32 ||</div><div class='ctx'> 			    np-&gt;device_id == PCI_DEVICE_ID_NVIDIA_NVENET_33 ||</div><div class='hunk'>@@ -1201,12 +1261,23 @@ static int phy_init(struct net_device *dev)</div><div class='ctx'> 	mii_control = mii_rw(dev, np-&gt;phyaddr, MII_BMCR, MII_READ);</div><div class='ctx'> 	mii_control |= BMCR_ANENABLE;</div><div class='ctx'> </div><div class='del'>-	/* reset the phy</div><div class='del'>-	 * (certain phys need bmcr to be setup with reset)</div><div class='del'>-	 */</div><div class='del'>-	if (phy_reset(dev, mii_control)) {</div><div class='del'>-		printk(KERN_INFO "%s: phy reset failed\n", pci_name(np-&gt;pci_dev));</div><div class='del'>-		return PHY_ERROR;</div><div class='add'>+	if (np-&gt;phy_oui == PHY_OUI_REALTEK &amp;&amp;</div><div class='add'>+	    np-&gt;phy_model == PHY_MODEL_REALTEK_8211 &amp;&amp;</div><div class='add'>+	    np-&gt;phy_rev == PHY_REV_REALTEK_8211C) {</div><div class='add'>+		/* start autoneg since we already performed hw reset above */</div><div class='add'>+		mii_control |= BMCR_ANRESTART;</div><div class='add'>+		if (mii_rw(dev, np-&gt;phyaddr, MII_BMCR, mii_control)) {</div><div class='add'>+			printk(KERN_INFO "%s: phy init failed\n", pci_name(np-&gt;pci_dev));</div><div class='add'>+			return PHY_ERROR;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* reset the phy</div><div class='add'>+		 * (certain phys need bmcr to be setup with reset)</div><div class='add'>+		 */</div><div class='add'>+		if (phy_reset(dev, mii_control)) {</div><div class='add'>+			printk(KERN_INFO "%s: phy reset failed\n", pci_name(np-&gt;pci_dev));</div><div class='add'>+			return PHY_ERROR;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* phy vendor specific configuration */</div><div class='hunk'>@@ -1576,6 +1647,12 @@ static void nv_get_hw_stats(struct net_device *dev)</div><div class='ctx'> 		np-&gt;estats.rx_pause += readl(base + NvRegRxPause);</div><div class='ctx'> 		np-&gt;estats.rx_drop_frame += readl(base + NvRegRxDropFrame);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (np-&gt;driver_data &amp; DEV_HAS_STATISTICS_V3) {</div><div class='add'>+		np-&gt;estats.tx_unicast += readl(base + NvRegTxUnicast);</div><div class='add'>+		np-&gt;estats.tx_multicast += readl(base + NvRegTxMulticast);</div><div class='add'>+		np-&gt;estats.tx_broadcast += readl(base + NvRegTxBroadcast);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1589,7 +1666,7 @@ static struct net_device_stats *nv_get_stats(struct net_device *dev)</div><div class='ctx'> 	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* If the nic supports hw counters then retrieve latest values */</div><div class='del'>-	if (np-&gt;driver_data &amp; (DEV_HAS_STATISTICS_V1|DEV_HAS_STATISTICS_V2)) {</div><div class='add'>+	if (np-&gt;driver_data &amp; (DEV_HAS_STATISTICS_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_STATISTICS_V3)) {</div><div class='ctx'> 		nv_get_hw_stats(dev);</div><div class='ctx'> </div><div class='ctx'> 		/* copy to net_device stats */</div><div class='hunk'>@@ -2580,7 +2657,7 @@ static int nv_rx_process(struct net_device *dev, int limit)</div><div class='ctx'> 			if (likely(flags &amp; NV_RX_DESCRIPTORVALID)) {</div><div class='ctx'> 				len = flags &amp; LEN_MASK_V1;</div><div class='ctx'> 				if (unlikely(flags &amp; NV_RX_ERROR)) {</div><div class='del'>-					if (flags &amp; NV_RX_ERROR4) {</div><div class='add'>+					if ((flags &amp; NV_RX_ERROR_MASK) == NV_RX_ERROR4) {</div><div class='ctx'> 						len = nv_getlen(dev, skb-&gt;data, len);</div><div class='ctx'> 						if (len &lt; 0) {</div><div class='ctx'> 							dev-&gt;stats.rx_errors++;</div><div class='hunk'>@@ -2589,7 +2666,7 @@ static int nv_rx_process(struct net_device *dev, int limit)</div><div class='ctx'> 						}</div><div class='ctx'> 					}</div><div class='ctx'> 					/* framing errors are soft errors */</div><div class='del'>-					else if (flags &amp; NV_RX_FRAMINGERR) {</div><div class='add'>+					else if ((flags &amp; NV_RX_ERROR_MASK) == NV_RX_FRAMINGERR) {</div><div class='ctx'> 						if (flags &amp; NV_RX_SUBSTRACT1) {</div><div class='ctx'> 							len--;</div><div class='ctx'> 						}</div><div class='hunk'>@@ -2615,7 +2692,7 @@ static int nv_rx_process(struct net_device *dev, int limit)</div><div class='ctx'> 			if (likely(flags &amp; NV_RX2_DESCRIPTORVALID)) {</div><div class='ctx'> 				len = flags &amp; LEN_MASK_V2;</div><div class='ctx'> 				if (unlikely(flags &amp; NV_RX2_ERROR)) {</div><div class='del'>-					if (flags &amp; NV_RX2_ERROR4) {</div><div class='add'>+					if ((flags &amp; NV_RX2_ERROR_MASK) == NV_RX2_ERROR4) {</div><div class='ctx'> 						len = nv_getlen(dev, skb-&gt;data, len);</div><div class='ctx'> 						if (len &lt; 0) {</div><div class='ctx'> 							dev-&gt;stats.rx_errors++;</div><div class='hunk'>@@ -2624,7 +2701,7 @@ static int nv_rx_process(struct net_device *dev, int limit)</div><div class='ctx'> 						}</div><div class='ctx'> 					}</div><div class='ctx'> 					/* framing errors are soft errors */</div><div class='del'>-					else if (flags &amp; NV_RX2_FRAMINGERR) {</div><div class='add'>+					else if ((flags &amp; NV_RX2_ERROR_MASK) == NV_RX2_FRAMINGERR) {</div><div class='ctx'> 						if (flags &amp; NV_RX2_SUBSTRACT1) {</div><div class='ctx'> 							len--;</div><div class='ctx'> 						}</div><div class='hunk'>@@ -2714,7 +2791,7 @@ static int nv_rx_process_optimized(struct net_device *dev, int limit)</div><div class='ctx'> 		if (likely(flags &amp; NV_RX2_DESCRIPTORVALID)) {</div><div class='ctx'> 			len = flags &amp; LEN_MASK_V2;</div><div class='ctx'> 			if (unlikely(flags &amp; NV_RX2_ERROR)) {</div><div class='del'>-				if (flags &amp; NV_RX2_ERROR4) {</div><div class='add'>+				if ((flags &amp; NV_RX2_ERROR_MASK) == NV_RX2_ERROR4) {</div><div class='ctx'> 					len = nv_getlen(dev, skb-&gt;data, len);</div><div class='ctx'> 					if (len &lt; 0) {</div><div class='ctx'> 						dev_kfree_skb(skb);</div><div class='hunk'>@@ -2722,7 +2799,7 @@ static int nv_rx_process_optimized(struct net_device *dev, int limit)</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='ctx'> 				/* framing errors are soft errors */</div><div class='del'>-				else if (flags &amp; NV_RX2_FRAMINGERR) {</div><div class='add'>+				else if ((flags &amp; NV_RX2_ERROR_MASK) == NV_RX2_FRAMINGERR) {</div><div class='ctx'> 					if (flags &amp; NV_RX2_SUBSTRACT1) {</div><div class='ctx'> 						len--;</div><div class='ctx'> 					}</div><div class='hunk'>@@ -3001,8 +3078,11 @@ static void nv_update_pause(struct net_device *dev, u32 pause_flags)</div><div class='ctx'> 			u32 pause_enable = NVREG_TX_PAUSEFRAME_ENABLE_V1;</div><div class='ctx'> 			if (np-&gt;driver_data &amp; DEV_HAS_PAUSEFRAME_TX_V2)</div><div class='ctx'> 				pause_enable = NVREG_TX_PAUSEFRAME_ENABLE_V2;</div><div class='del'>-			if (np-&gt;driver_data &amp; DEV_HAS_PAUSEFRAME_TX_V3)</div><div class='add'>+			if (np-&gt;driver_data &amp; DEV_HAS_PAUSEFRAME_TX_V3) {</div><div class='ctx'> 				pause_enable = NVREG_TX_PAUSEFRAME_ENABLE_V3;</div><div class='add'>+				/* limit the number of tx pause frames to a default of 8 */</div><div class='add'>+				writel(readl(base + NvRegTxPauseFrameLimit)|NVREG_TX_PAUSEFRAMELIMIT_ENABLE, base + NvRegTxPauseFrameLimit);</div><div class='add'>+			}</div><div class='ctx'> 			writel(pause_enable,  base + NvRegTxPauseFrame);</div><div class='ctx'> 			writel(regmisc|NVREG_MISC1_PAUSE_TX, base + NvRegMisc1);</div><div class='ctx'> 			np-&gt;pause_flags |= NV_PAUSEFRAME_TX_ENABLE;</div><div class='hunk'>@@ -4688,6 +4768,8 @@ static int nv_get_sset_count(struct net_device *dev, int sset)</div><div class='ctx'> 			return NV_DEV_STATISTICS_V1_COUNT;</div><div class='ctx'> 		else if (np-&gt;driver_data &amp; DEV_HAS_STATISTICS_V2)</div><div class='ctx'> 			return NV_DEV_STATISTICS_V2_COUNT;</div><div class='add'>+		else if (np-&gt;driver_data &amp; DEV_HAS_STATISTICS_V3)</div><div class='add'>+			return NV_DEV_STATISTICS_V3_COUNT;</div><div class='ctx'> 		else</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -5272,7 +5354,7 @@ static int nv_open(struct net_device *dev)</div><div class='ctx'> 		mod_timer(&amp;np-&gt;oom_kick, jiffies + OOM_REFILL);</div><div class='ctx'> </div><div class='ctx'> 	/* start statistics timer */</div><div class='del'>-	if (np-&gt;driver_data &amp; (DEV_HAS_STATISTICS_V1|DEV_HAS_STATISTICS_V2))</div><div class='add'>+	if (np-&gt;driver_data &amp; (DEV_HAS_STATISTICS_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_STATISTICS_V3))</div><div class='ctx'> 		mod_timer(&amp;np-&gt;stats_poll,</div><div class='ctx'> 			round_jiffies(jiffies + STATS_INTERVAL));</div><div class='ctx'> </div><div class='hunk'>@@ -5376,7 +5458,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out_disable;</div><div class='ctx'> </div><div class='del'>-	if (id-&gt;driver_data &amp; (DEV_HAS_VLAN|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL|DEV_HAS_STATISTICS_V2))</div><div class='add'>+	if (id-&gt;driver_data &amp; (DEV_HAS_VLAN|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL|DEV_HAS_STATISTICS_V2|DEV_HAS_STATISTICS_V3))</div><div class='ctx'> 		np-&gt;register_size = NV_PCI_REGSZ_VER3;</div><div class='ctx'> 	else if (id-&gt;driver_data &amp; DEV_HAS_STATISTICS_V1)</div><div class='ctx'> 		np-&gt;register_size = NV_PCI_REGSZ_VER2;</div><div class='hunk'>@@ -5440,7 +5522,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i</div><div class='ctx'> 	if (id-&gt;driver_data &amp; DEV_HAS_CHECKSUM) {</div><div class='ctx'> 		np-&gt;rx_csum = 1;</div><div class='ctx'> 		np-&gt;txrxctl_bits |= NVREG_TXRXCTL_RXCHECK;</div><div class='del'>-		dev-&gt;features |= NETIF_F_HW_CSUM | NETIF_F_SG;</div><div class='add'>+		dev-&gt;features |= NETIF_F_IP_CSUM | NETIF_F_SG;</div><div class='ctx'> 		dev-&gt;features |= NETIF_F_TSO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5561,6 +5643,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i</div><div class='ctx'> 		dev-&gt;dev_addr[4] = (np-&gt;orig_mac[0] &gt;&gt;  8) &amp; 0xff;</div><div class='ctx'> 		dev-&gt;dev_addr[5] = (np-&gt;orig_mac[0] &gt;&gt;  0) &amp; 0xff;</div><div class='ctx'> 		writel(txreg|NVREG_TRANSMITPOLL_MAC_ADDR_REV, base + NvRegTransmitPoll);</div><div class='add'>+		printk(KERN_DEBUG "nv_probe: set workaround bit for reversed mac addr\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	memcpy(dev-&gt;perm_addr, dev-&gt;dev_addr, dev-&gt;addr_len);</div><div class='ctx'> </div><div class='hunk'>@@ -5753,7 +5836,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i</div><div class='ctx'> </div><div class='ctx'> 	dev_printk(KERN_INFO, &amp;pci_dev-&gt;dev, "%s%s%s%s%s%s%s%s%s%sdesc-v%u\n",</div><div class='ctx'> 		   dev-&gt;features &amp; NETIF_F_HIGHDMA ? "highdma " : "",</div><div class='del'>-		   dev-&gt;features &amp; (NETIF_F_HW_CSUM | NETIF_F_SG) ?</div><div class='add'>+		   dev-&gt;features &amp; (NETIF_F_IP_CSUM | NETIF_F_SG) ?</div><div class='ctx'> 		   	"csum " : "",</div><div class='ctx'> 		   dev-&gt;features &amp; (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX) ?</div><div class='ctx'> 		   	"vlan " : "",</div><div class='hunk'>@@ -5808,14 +5891,12 @@ static void nv_restore_phy(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit nv_remove(struct pci_dev *pci_dev)</div><div class='add'>+static void nv_restore_mac_addr(struct pci_dev *pci_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pci_dev);</div><div class='ctx'> 	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> 	u8 __iomem *base = get_hwbase(dev);</div><div class='ctx'> </div><div class='del'>-	unregister_netdev(dev);</div><div class='del'>-</div><div class='ctx'> 	/* special op: write back the misordered MAC address - otherwise</div><div class='ctx'> 	 * the next nv_probe would see a wrong address.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -5823,6 +5904,15 @@ static void __devexit nv_remove(struct pci_dev *pci_dev)</div><div class='ctx'> 	writel(np-&gt;orig_mac[1], base + NvRegMacAddrB);</div><div class='ctx'> 	writel(readl(base + NvRegTransmitPoll) &amp; ~NVREG_TRANSMITPOLL_MAC_ADDR_REV,</div><div class='ctx'> 	       base + NvRegTransmitPoll);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit nv_remove(struct pci_dev *pci_dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = pci_get_drvdata(pci_dev);</div><div class='add'>+</div><div class='add'>+	unregister_netdev(dev);</div><div class='add'>+</div><div class='add'>+	nv_restore_mac_addr(pci_dev);</div><div class='ctx'> </div><div class='ctx'> 	/* restore any phy related changes */</div><div class='ctx'> 	nv_restore_phy(dev);</div><div class='hunk'>@@ -5893,10 +5983,14 @@ static void nv_shutdown(struct pci_dev *pdev)</div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		nv_close(dev);</div><div class='ctx'> </div><div class='del'>-	pci_enable_wake(pdev, PCI_D3hot, np-&gt;wolenabled);</div><div class='del'>-	pci_enable_wake(pdev, PCI_D3cold, np-&gt;wolenabled);</div><div class='add'>+	nv_restore_mac_addr(pdev);</div><div class='add'>+</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='del'>-	pci_set_power_state(pdev, PCI_D3hot);</div><div class='add'>+	if (system_state == SYSTEM_POWER_OFF) {</div><div class='add'>+		if (pci_enable_wake(pdev, PCI_D3cold, np-&gt;wolenabled))</div><div class='add'>+			pci_enable_wake(pdev, PCI_D3hot, np-&gt;wolenabled);</div><div class='add'>+		pci_set_power_state(pdev, PCI_D3hot);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> #define nv_suspend NULL</div><div class='hunk'>@@ -6031,35 +6125,35 @@ static struct pci_device_id pci_tbl[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{	/* MCP77 Ethernet Controller */</div><div class='ctx'> 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_32),</div><div class='del'>-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{	/* MCP77 Ethernet Controller */</div><div class='ctx'> 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_33),</div><div class='del'>-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{	/* MCP77 Ethernet Controller */</div><div class='ctx'> 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_34),</div><div class='del'>-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{	/* MCP77 Ethernet Controller */</div><div class='ctx'> 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_35),</div><div class='del'>-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{	/* MCP79 Ethernet Controller */</div><div class='ctx'> 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_36),</div><div class='del'>-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{	/* MCP79 Ethernet Controller */</div><div class='ctx'> 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_37),</div><div class='del'>-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{	/* MCP79 Ethernet Controller */</div><div class='ctx'> 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_38),</div><div class='del'>-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{	/* MCP79 Ethernet Controller */</div><div class='ctx'> 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_39),</div><div class='del'>-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{0,},</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c<br/>index 9a51ec8293cc..9d461825bf4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/fs_enet-main.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/fs_enet/fs_enet-main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/fs_enet-main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/fs_enet/fs_enet-main.c</a></div><div class='hunk'>@@ -792,6 +792,10 @@ static int fs_enet_open(struct net_device *dev)</div><div class='ctx'> 	int r;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	/* to initialize the fep-&gt;cur_rx,... */</div><div class='add'>+	/* not doing this, will cause a crash in fs_enet_rx_napi */</div><div class='add'>+	fs_init_bds(fep-&gt;ndev);</div><div class='add'>+</div><div class='ctx'> 	if (fep-&gt;fpi-&gt;use_napi)</div><div class='ctx'> 		napi_enable(&amp;fep-&gt;napi);</div><div class='ctx'> </div><div class='hunk'>@@ -1167,6 +1171,10 @@ static struct of_device_id fs_enet_match[] = {</div><div class='ctx'> 		.compatible = "fsl,cpm1-scc-enet",</div><div class='ctx'> 		.data = (void *)&amp;fs_scc_ops,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "fsl,cpm2-scc-enet",</div><div class='add'>+		.data = (void *)&amp;fs_scc_ops,</div><div class='add'>+	},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_FS_ENET_HAS_FCC</div><div class='ctx'> 	{</div><div class='head'>diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c<br/>index 0a97fc2d97ec..1c7ef812a8e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/mac-fcc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/fs_enet/mac-fcc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/mac-fcc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/fs_enet/mac-fcc.c</a></div><div class='hunk'>@@ -126,7 +126,7 @@ out:</div><div class='ctx'> #define FCC_NAPI_RX_EVENT_MSK	(FCC_ENET_RXF | FCC_ENET_RXB)</div><div class='ctx'> #define FCC_RX_EVENT		(FCC_ENET_RXF)</div><div class='ctx'> #define FCC_TX_EVENT		(FCC_ENET_TXB)</div><div class='del'>-#define FCC_ERR_EVENT_MSK	(FCC_ENET_TXE | FCC_ENET_BSY)</div><div class='add'>+#define FCC_ERR_EVENT_MSK	(FCC_ENET_TXE)</div><div class='ctx'> </div><div class='ctx'> static int setup_data(struct net_device *dev)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c<br/>index 029b3c7ef29c..22f50dd8b277 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/mac-scc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/fs_enet/mac-scc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/mac-scc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/fs_enet/mac-scc.c</a></div><div class='hunk'>@@ -47,7 +47,6 @@</div><div class='ctx'> #include "fs_enet.h"</div><div class='ctx'> </div><div class='ctx'> /*************************************************/</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_CPM1)</div><div class='ctx'> /* for a 8xx __raw_xxx's are sufficient */</div><div class='ctx'> #define __fs_out32(addr, x)	__raw_writel(x, addr)</div><div class='hunk'>@@ -62,6 +61,8 @@</div><div class='ctx'> #define __fs_out16(addr, x)	out_be16(addr, x)</div><div class='ctx'> #define __fs_in32(addr)	in_be32(addr)</div><div class='ctx'> #define __fs_in16(addr)	in_be16(addr)</div><div class='add'>+#define __fs_out8(addr, x)	out_8(addr, x)</div><div class='add'>+#define __fs_in8(addr)	in_8(addr)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* write, read, set bits, clear bits */</div><div class='hunk'>@@ -262,8 +263,13 @@ static void restart(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize function code registers for big-endian.</div><div class='ctx'> 	 */</div><div class='add'>+#ifndef CONFIG_NOT_COHERENT_CACHE</div><div class='add'>+	W8(ep, sen_genscc.scc_rfcr, SCC_EB | SCC_GBL);</div><div class='add'>+	W8(ep, sen_genscc.scc_tfcr, SCC_EB | SCC_GBL);</div><div class='add'>+#else</div><div class='ctx'> 	W8(ep, sen_genscc.scc_rfcr, SCC_EB);</div><div class='ctx'> 	W8(ep, sen_genscc.scc_tfcr, SCC_EB);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Set maximum bytes per receive buffer.</div><div class='ctx'> 	 * This appears to be an Ethernet frame size, not the buffer</div><div class='head'>diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c<br/>index b8394cf134e8..4320a983a588 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/gianfar.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/gianfar.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/gianfar.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/gianfar.c</a></div><div class='hunk'>@@ -105,6 +105,7 @@ const char gfar_driver_version[] = "1.3";</div><div class='ctx'> </div><div class='ctx'> static int gfar_enet_open(struct net_device *dev);</div><div class='ctx'> static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='add'>+static void gfar_reset_task(struct work_struct *work);</div><div class='ctx'> static void gfar_timeout(struct net_device *dev);</div><div class='ctx'> static int gfar_close(struct net_device *dev);</div><div class='ctx'> struct sk_buff *gfar_new_skb(struct net_device *dev);</div><div class='hunk'>@@ -134,9 +135,7 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, int l</div><div class='ctx'> static void gfar_vlan_rx_register(struct net_device *netdev,</div><div class='ctx'> 		                struct vlan_group *grp);</div><div class='ctx'> void gfar_halt(struct net_device *dev);</div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> static void gfar_halt_nodisable(struct net_device *dev);</div><div class='del'>-#endif</div><div class='ctx'> void gfar_start(struct net_device *dev);</div><div class='ctx'> static void gfar_clear_exact_match(struct net_device *dev);</div><div class='ctx'> static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr);</div><div class='hunk'>@@ -211,6 +210,7 @@ static int gfar_probe(struct platform_device *pdev)</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;txlock);</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;rxlock);</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;bflock);</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;reset_task, gfar_reset_task);</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='hunk'>@@ -414,9 +414,7 @@ static int gfar_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='ctx'> 		spin_unlock(&amp;priv-&gt;rxlock);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;priv-&gt;txlock, flags);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_GFAR_NAPI</div><div class='ctx'> 		napi_disable(&amp;priv-&gt;napi);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 		if (magic_packet) {</div><div class='ctx'> 			/* Enable interrupt on Magic Packet */</div><div class='hunk'>@@ -469,9 +467,7 @@ static int gfar_resume(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	netif_device_attach(dev);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_GFAR_NAPI</div><div class='ctx'> 	napi_enable(&amp;priv-&gt;napi);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -635,7 +631,6 @@ static void init_registers(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> /* Halt the receive and transmit queues */</div><div class='ctx'> static void gfar_halt_nodisable(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -661,7 +656,6 @@ static void gfar_halt_nodisable(struct net_device *dev)</div><div class='ctx'> 			cpu_relax();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /* Halt the receive and transmit queues */</div><div class='ctx'> void gfar_halt(struct net_device *dev)</div><div class='hunk'>@@ -670,6 +664,8 @@ void gfar_halt(struct net_device *dev)</div><div class='ctx'> 	struct gfar __iomem *regs = priv-&gt;regs;</div><div class='ctx'> 	u32 tempval;</div><div class='ctx'> </div><div class='add'>+	gfar_halt_nodisable(dev);</div><div class='add'>+</div><div class='ctx'> 	/* Disable Rx and Tx */</div><div class='ctx'> 	tempval = gfar_read(&amp;regs-&gt;maccfg1);</div><div class='ctx'> 	tempval &amp;= ~(MACCFG1_RX_EN | MACCFG1_TX_EN);</div><div class='hunk'>@@ -1218,6 +1214,7 @@ static int gfar_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	napi_disable(&amp;priv-&gt;napi);</div><div class='ctx'> </div><div class='add'>+	cancel_work_sync(&amp;priv-&gt;reset_task);</div><div class='ctx'> 	stop_gfar(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Disconnect from the PHY */</div><div class='hunk'>@@ -1332,13 +1329,16 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* gfar_timeout gets called when a packet has not been</div><div class='add'>+/* gfar_reset_task gets scheduled when a packet has not been</div><div class='ctx'>  * transmitted after a set amount of time.</div><div class='ctx'>  * For now, assume that clearing out all the structures, and</div><div class='del'>- * starting over will fix the problem. */</div><div class='del'>-static void gfar_timeout(struct net_device *dev)</div><div class='add'>+ * starting over will fix the problem.</div><div class='add'>+ */</div><div class='add'>+static void gfar_reset_task(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	dev-&gt;stats.tx_errors++;</div><div class='add'>+	struct gfar_private *priv = container_of(work, struct gfar_private,</div><div class='add'>+			reset_task);</div><div class='add'>+	struct net_device *dev = priv-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_UP) {</div><div class='ctx'> 		stop_gfar(dev);</div><div class='hunk'>@@ -1348,6 +1348,14 @@ static void gfar_timeout(struct net_device *dev)</div><div class='ctx'> 	netif_tx_schedule_all(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void gfar_timeout(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct gfar_private *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;stats.tx_errors++;</div><div class='add'>+	schedule_work(&amp;priv-&gt;reset_task);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Interrupt Handler for Transmit complete */</div><div class='ctx'> static int gfar_clean_tx_ring(struct net_device *dev)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h<br/>index d59df98bd636..f46e9b63af13 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/gianfar.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/gianfar.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/gianfar.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/gianfar.h</a></div><div class='hunk'>@@ -756,6 +756,7 @@ struct gfar_private {</div><div class='ctx'> </div><div class='ctx'> 	uint32_t msg_enable;</div><div class='ctx'> </div><div class='add'>+	struct work_struct reset_task;</div><div class='ctx'> 	/* Network Statistics */</div><div class='ctx'> 	struct gfar_extra_stats extra_stats;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/gianfar_sysfs.c b/drivers/net/gianfar_sysfs.c<br/>index 5116f68e01b9..782c20170082 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/gianfar_sysfs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/gianfar_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/gianfar_sysfs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/gianfar_sysfs.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "gianfar.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c<br/>index 3249df5e0f17..b8e25c4624d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/hamradio/mkiss.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/hamradio/mkiss.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hamradio/mkiss.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/hamradio/mkiss.c</a></div><div class='hunk'>@@ -548,7 +548,7 @@ static int ax_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_ERR "mkiss: %s: transmit timed out, %s?\n", dev-&gt;name,</div><div class='del'>-		       (ax-&gt;tty-&gt;ops-&gt;chars_in_buffer(ax-&gt;tty) || ax-&gt;xleft) ?</div><div class='add'>+		       (tty_chars_in_buffer(ax-&gt;tty) || ax-&gt;xleft) ?</div><div class='ctx'> 		       "bad line quality" : "driver error");</div><div class='ctx'> </div><div class='ctx'> 		ax-&gt;xleft = 0;</div><div class='head'>diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c<br/>index 8239939554bc..fbbd3e660c27 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/hp-plus.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/hp-plus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hp-plus.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/hp-plus.c</a></div><div class='hunk'>@@ -139,7 +139,7 @@ static int __init do_hpp_probe(struct net_device *dev)</div><div class='ctx'> #ifndef MODULE</div><div class='ctx'> struct net_device * __init hp_plus_probe(int unit)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = alloc_ei_netdev();</div><div class='add'>+	struct net_device *dev = alloc_eip_netdev();</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='hunk'>@@ -284,7 +284,7 @@ hpp_open(struct net_device *dev)</div><div class='ctx'> 	int option_reg;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	if ((retval = request_irq(dev-&gt;irq, ei_interrupt, 0, dev-&gt;name, dev))) {</div><div class='add'>+	if ((retval = request_irq(dev-&gt;irq, eip_interrupt, 0, dev-&gt;name, dev))) {</div><div class='ctx'> 	    return retval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -302,7 +302,7 @@ hpp_open(struct net_device *dev)</div><div class='ctx'> 	/* Select the operational page. */</div><div class='ctx'> 	outw(Perf_Page, ioaddr + HP_PAGING);</div><div class='ctx'> </div><div class='del'>-	ei_open(dev);</div><div class='add'>+	eip_open(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -313,7 +313,7 @@ hpp_close(struct net_device *dev)</div><div class='ctx'> 	int option_reg = inw(ioaddr + HPP_OPTION);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='del'>-	ei_close(dev);</div><div class='add'>+	eip_close(dev);</div><div class='ctx'> 	outw((option_reg &amp; ~EnableIRQ) | MemDisable | NICReset | ChipReset,</div><div class='ctx'> 		 ioaddr + HPP_OPTION);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c<br/>index 2e720f26ca83..ccd9d9058f6d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibm_newemac/core.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/ibm_newemac/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibm_newemac/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ibm_newemac/core.c</a></div><div class='hunk'>@@ -663,9 +663,6 @@ static int emac_configure(struct emac_instance *dev)</div><div class='ctx'> 	if (emac_phy_gpcs(dev-&gt;phy.mode))</div><div class='ctx'> 		emac_mii_reset_phy(&amp;dev-&gt;phy);</div><div class='ctx'> </div><div class='del'>-	/* Required for Pause packet support in EMAC */</div><div class='del'>-	dev_mc_add(ndev, default_mcast_addr, sizeof(default_mcast_addr), 1);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1150,6 +1147,9 @@ static int emac_open(struct net_device *ndev)</div><div class='ctx'> 	} else</div><div class='ctx'> 		netif_carrier_on(dev-&gt;ndev);</div><div class='ctx'> </div><div class='add'>+	/* Required for Pause packet support in EMAC */</div><div class='add'>+	dev_mc_add(ndev, default_mcast_addr, sizeof(default_mcast_addr), 1);</div><div class='add'>+</div><div class='ctx'> 	emac_configure(dev);</div><div class='ctx'> 	mal_poll_add(dev-&gt;mal, &amp;dev-&gt;commac);</div><div class='ctx'> 	mal_enable_tx_channel(dev-&gt;mal, dev-&gt;mal_tx_chan);</div><div class='head'>diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c<br/>index a03fe1fb61ca..c2d57f836088 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibmveth.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/ibmveth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibmveth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ibmveth.c</a></div><div class='hunk'>@@ -904,8 +904,6 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	unsigned long data_dma_addr;</div><div class='ctx'> </div><div class='ctx'> 	desc.fields.flags_len = IBMVETH_BUF_VALID | skb-&gt;len;</div><div class='del'>-	data_dma_addr = dma_map_single(&amp;adapter-&gt;vdev-&gt;dev, skb-&gt;data,</div><div class='del'>-				       skb-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp;</div><div class='ctx'> 	    ip_hdr(skb)-&gt;protocol != IPPROTO_TCP &amp;&amp; skb_checksum_help(skb)) {</div><div class='hunk'>@@ -924,6 +922,8 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 		buf[1] = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	data_dma_addr = dma_map_single(&amp;adapter-&gt;vdev-&gt;dev, skb-&gt;data,</div><div class='add'>+				       skb-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(&amp;adapter-&gt;vdev-&gt;dev, data_dma_addr)) {</div><div class='ctx'> 		if (!firmware_has_feature(FW_FEATURE_CMO))</div><div class='ctx'> 			ibmveth_error_printk("tx: unable to map xmit buffer\n");</div><div class='hunk'>@@ -932,6 +932,7 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 		desc.fields.address = adapter-&gt;bounce_buffer_dma;</div><div class='ctx'> 		tx_map_failed++;</div><div class='ctx'> 		used_bounce = 1;</div><div class='add'>+		wmb();</div><div class='ctx'> 	} else</div><div class='ctx'> 		desc.fields.address = data_dma_addr;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c<br/>index 0960e69b2da4..e4fbefc8c82f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ifb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/ifb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ifb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ifb.c</a></div><div class='hunk'>@@ -69,18 +69,20 @@ static void ri_tasklet(unsigned long dev)</div><div class='ctx'> 	struct net_device *_dev = (struct net_device *)dev;</div><div class='ctx'> 	struct ifb_private *dp = netdev_priv(_dev);</div><div class='ctx'> 	struct net_device_stats *stats = &amp;_dev-&gt;stats;</div><div class='add'>+	struct netdev_queue *txq;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='add'>+	txq = netdev_get_tx_queue(_dev, 0);</div><div class='ctx'> 	dp-&gt;st_task_enter++;</div><div class='ctx'> 	if ((skb = skb_peek(&amp;dp-&gt;tq)) == NULL) {</div><div class='ctx'> 		dp-&gt;st_txq_refl_try++;</div><div class='del'>-		if (netif_tx_trylock(_dev)) {</div><div class='add'>+		if (__netif_tx_trylock(txq)) {</div><div class='ctx'> 			dp-&gt;st_rxq_enter++;</div><div class='ctx'> 			while ((skb = skb_dequeue(&amp;dp-&gt;rq)) != NULL) {</div><div class='ctx'> 				skb_queue_tail(&amp;dp-&gt;tq, skb);</div><div class='ctx'> 				dp-&gt;st_rx2tx_tran++;</div><div class='ctx'> 			}</div><div class='del'>-			netif_tx_unlock(_dev);</div><div class='add'>+			__netif_tx_unlock(txq);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* reschedule */</div><div class='ctx'> 			dp-&gt;st_rxq_notenter++;</div><div class='hunk'>@@ -115,7 +117,7 @@ static void ri_tasklet(unsigned long dev)</div><div class='ctx'> 			BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (netif_tx_trylock(_dev)) {</div><div class='add'>+	if (__netif_tx_trylock(txq)) {</div><div class='ctx'> 		dp-&gt;st_rxq_check++;</div><div class='ctx'> 		if ((skb = skb_peek(&amp;dp-&gt;rq)) == NULL) {</div><div class='ctx'> 			dp-&gt;tasklet_pending = 0;</div><div class='hunk'>@@ -123,10 +125,10 @@ static void ri_tasklet(unsigned long dev)</div><div class='ctx'> 				netif_wake_queue(_dev);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dp-&gt;st_rxq_rsch++;</div><div class='del'>-			netif_tx_unlock(_dev);</div><div class='add'>+			__netif_tx_unlock(txq);</div><div class='ctx'> 			goto resched;</div><div class='ctx'> 		}</div><div class='del'>-		netif_tx_unlock(_dev);</div><div class='add'>+		__netif_tx_unlock(txq);</div><div class='ctx'> 	} else {</div><div class='ctx'> resched:</div><div class='ctx'> 		dp-&gt;tasklet_pending = 1;</div><div class='head'>diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c<br/>index e098f234770f..f5e2e7235fcb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/igb/e1000_82575.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/igb/e1000_82575.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/igb/e1000_82575.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/e1000_82575.c</a></div><div class='hunk'>@@ -87,7 +87,6 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)</div><div class='ctx'> 	case E1000_DEV_ID_82576:</div><div class='ctx'> 	case E1000_DEV_ID_82576_FIBER:</div><div class='ctx'> 	case E1000_DEV_ID_82576_SERDES:</div><div class='del'>-	case E1000_DEV_ID_82576_QUAD_COPPER:</div><div class='ctx'> 		mac-&gt;type = e1000_82576;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -850,7 +849,7 @@ void igb_update_mc_addr_list_82575(struct e1000_hw *hw,</div><div class='ctx'> 	for (; mc_addr_count &gt; 0; mc_addr_count--) {</div><div class='ctx'> 		hash_value = igb_hash_mc_addr(hw, mc_addr_list);</div><div class='ctx'> 		hw_dbg("Hash value = 0x%03X\n", hash_value);</div><div class='del'>-		hw-&gt;mac.ops.mta_set(hw, hash_value);</div><div class='add'>+		igb_mta_set(hw, hash_value);</div><div class='ctx'> 		mc_addr_list += ETH_ALEN;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1136,6 +1135,12 @@ static s32 igb_setup_fiber_serdes_link_82575(struct e1000_hw *hw)</div><div class='ctx'> 		       E1000_PCS_LCTL_FORCE_LINK;     /* Force Link */</div><div class='ctx'> 		hw_dbg("Configuring Forced Link; PCS_LCTL = 0x%08X\n", reg);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;mac.type == e1000_82576) {</div><div class='add'>+		reg |= E1000_PCS_LCTL_FORCE_FCTRL;</div><div class='add'>+		igb_force_mac_fc(hw);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	wr32(E1000_PCS_LCTL, reg);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1232,70 +1237,6 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  igb_translate_register_82576 - Translate the proper register offset</div><div class='del'>- *  @reg: e1000 register to be read</div><div class='del'>- *</div><div class='del'>- *  Registers in 82576 are located in different offsets than other adapters</div><div class='del'>- *  even though they function in the same manner.  This function takes in</div><div class='del'>- *  the name of the register to read and returns the correct offset for</div><div class='del'>- *  82576 silicon.</div><div class='del'>- **/</div><div class='del'>-u32 igb_translate_register_82576(u32 reg)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Some of the Kawela registers are located at different</div><div class='del'>-	 * offsets than they are in older adapters.</div><div class='del'>-	 * Despite the difference in location, the registers</div><div class='del'>-	 * function in the same manner.</div><div class='del'>-	 */</div><div class='del'>-	switch (reg) {</div><div class='del'>-	case E1000_TDBAL(0):</div><div class='del'>-		reg = 0x0E000;</div><div class='del'>-		break;</div><div class='del'>-	case E1000_TDBAH(0):</div><div class='del'>-		reg = 0x0E004;</div><div class='del'>-		break;</div><div class='del'>-	case E1000_TDLEN(0):</div><div class='del'>-		reg = 0x0E008;</div><div class='del'>-		break;</div><div class='del'>-	case E1000_TDH(0):</div><div class='del'>-		reg = 0x0E010;</div><div class='del'>-		break;</div><div class='del'>-	case E1000_TDT(0):</div><div class='del'>-		reg = 0x0E018;</div><div class='del'>-		break;</div><div class='del'>-	case E1000_TXDCTL(0):</div><div class='del'>-		reg = 0x0E028;</div><div class='del'>-		break;</div><div class='del'>-	case E1000_RDBAL(0):</div><div class='del'>-		reg = 0x0C000;</div><div class='del'>-		break;</div><div class='del'>-	case E1000_RDBAH(0):</div><div class='del'>-		reg = 0x0C004;</div><div class='del'>-		break;</div><div class='del'>-	case E1000_RDLEN(0):</div><div class='del'>-		reg = 0x0C008;</div><div class='del'>-		break;</div><div class='del'>-	case E1000_RDH(0):</div><div class='del'>-		reg = 0x0C010;</div><div class='del'>-		break;</div><div class='del'>-	case E1000_RDT(0):</div><div class='del'>-		reg = 0x0C018;</div><div class='del'>-		break;</div><div class='del'>-	case E1000_RXDCTL(0):</div><div class='del'>-		reg = 0x0C028;</div><div class='del'>-		break;</div><div class='del'>-	case E1000_SRRCTL(0):</div><div class='del'>-		reg = 0x0C00C;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return reg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  *  igb_reset_init_script_82575 - Inits HW defaults after reset</div><div class='ctx'>  *  @hw: pointer to the HW structure</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/net/igb/e1000_82575.h b/drivers/net/igb/e1000_82575.h<br/>index 2f848e578a24..c1928b5efe1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/igb/e1000_82575.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/igb/e1000_82575.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/igb/e1000_82575.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/e1000_82575.h</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #ifndef _E1000_82575_H_</div><div class='ctx'> #define _E1000_82575_H_</div><div class='ctx'> </div><div class='del'>-u32 igb_translate_register_82576(u32 reg);</div><div class='ctx'> void igb_update_mc_addr_list_82575(struct e1000_hw*, u8*, u32, u32, u32);</div><div class='ctx'> extern void igb_shutdown_fiber_serdes_link_82575(struct e1000_hw *hw);</div><div class='ctx'> extern void igb_rx_fifo_flush_82575(struct e1000_hw *hw);</div><div class='head'>diff --git a/drivers/net/igb/e1000_defines.h b/drivers/net/igb/e1000_defines.h<br/>index afdba3c9073c..ce700689fb57 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/igb/e1000_defines.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/igb/e1000_defines.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/igb/e1000_defines.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/e1000_defines.h</a></div><div class='hunk'>@@ -257,6 +257,7 @@</div><div class='ctx'> #define E1000_PCS_LCTL_FDV_FULL          8</div><div class='ctx'> #define E1000_PCS_LCTL_FSD               0x10</div><div class='ctx'> #define E1000_PCS_LCTL_FORCE_LINK        0x20</div><div class='add'>+#define E1000_PCS_LCTL_FORCE_FCTRL       0x80</div><div class='ctx'> #define E1000_PCS_LCTL_AN_ENABLE         0x10000</div><div class='ctx'> #define E1000_PCS_LCTL_AN_RESTART        0x20000</div><div class='ctx'> #define E1000_PCS_LCTL_AN_TIMEOUT        0x40000</div><div class='head'>diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h<br/>index 19fa4ee96f2e..99504a600a80 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/igb/e1000_hw.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/igb/e1000_hw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/igb/e1000_hw.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/e1000_hw.h</a></div><div class='hunk'>@@ -41,7 +41,6 @@ struct e1000_hw;</div><div class='ctx'> #define E1000_DEV_ID_82576                    0x10C9</div><div class='ctx'> #define E1000_DEV_ID_82576_FIBER              0x10E6</div><div class='ctx'> #define E1000_DEV_ID_82576_SERDES             0x10E7</div><div class='del'>-#define E1000_DEV_ID_82576_QUAD_COPPER        0x10E8</div><div class='ctx'> #define E1000_DEV_ID_82575EB_COPPER           0x10A7</div><div class='ctx'> #define E1000_DEV_ID_82575EB_FIBER_SERDES     0x10A9</div><div class='ctx'> #define E1000_DEV_ID_82575GB_QUAD_COPPER      0x10D6</div><div class='hunk'>@@ -420,7 +419,6 @@ struct e1000_mac_operations {</div><div class='ctx'> 	void (*rar_set)(struct e1000_hw *, u8 *, u32);</div><div class='ctx'> 	s32  (*read_mac_addr)(struct e1000_hw *);</div><div class='ctx'> 	s32  (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);</div><div class='del'>-	void (*mta_set)(struct e1000_hw *, u32);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct e1000_phy_operations {</div><div class='head'>diff --git a/drivers/net/igb/e1000_mac.c b/drivers/net/igb/e1000_mac.c<br/>index 20408aa1f916..e18747c70bec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/igb/e1000_mac.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/igb/e1000_mac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/igb/e1000_mac.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/e1000_mac.c</a></div><div class='hunk'>@@ -144,34 +144,6 @@ void igb_write_vfta(struct e1000_hw *hw, u32 offset, u32 value)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  igb_init_rx_addrs - Initialize receive address's</div><div class='del'>- *  @hw: pointer to the HW structure</div><div class='del'>- *  @rar_count: receive address registers</div><div class='del'>- *</div><div class='del'>- *  Setups the receive address registers by setting the base receive address</div><div class='del'>- *  register to the devices MAC address and clearing all the other receive</div><div class='del'>- *  address registers to 0.</div><div class='del'>- **/</div><div class='del'>-void igb_init_rx_addrs(struct e1000_hw *hw, u16 rar_count)</div><div class='del'>-{</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	/* Setup the receive address */</div><div class='del'>-	hw_dbg("Programming MAC Address into RAR[0]\n");</div><div class='del'>-</div><div class='del'>-	hw-&gt;mac.ops.rar_set(hw, hw-&gt;mac.addr, 0);</div><div class='del'>-</div><div class='del'>-	/* Zero out the other (rar_entry_count - 1) receive addresses */</div><div class='del'>-	hw_dbg("Clearing RAR[1-%u]\n", rar_count-1);</div><div class='del'>-	for (i = 1; i &lt; rar_count; i++) {</div><div class='del'>-		array_wr32(E1000_RA, (i &lt;&lt; 1), 0);</div><div class='del'>-		wrfl();</div><div class='del'>-		array_wr32(E1000_RA, ((i &lt;&lt; 1) + 1), 0);</div><div class='del'>-		wrfl();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  *  igb_check_alt_mac_addr - Check for alternate MAC addr</div><div class='ctx'>  *  @hw: pointer to the HW structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -271,7 +243,7 @@ void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index)</div><div class='ctx'>  *  current value is read, the new bit is OR'd in and the new value is</div><div class='ctx'>  *  written back into the register.</div><div class='ctx'>  **/</div><div class='del'>-static void igb_mta_set(struct e1000_hw *hw, u32 hash_value)</div><div class='add'>+void igb_mta_set(struct e1000_hw *hw, u32 hash_value)</div><div class='ctx'> {</div><div class='ctx'> 	u32 hash_bit, hash_reg, mta;</div><div class='ctx'> </div><div class='hunk'>@@ -297,60 +269,6 @@ static void igb_mta_set(struct e1000_hw *hw, u32 hash_value)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  igb_update_mc_addr_list - Update Multicast addresses</div><div class='del'>- *  @hw: pointer to the HW structure</div><div class='del'>- *  @mc_addr_list: array of multicast addresses to program</div><div class='del'>- *  @mc_addr_count: number of multicast addresses to program</div><div class='del'>- *  @rar_used_count: the first RAR register free to program</div><div class='del'>- *  @rar_count: total number of supported Receive Address Registers</div><div class='del'>- *</div><div class='del'>- *  Updates the Receive Address Registers and Multicast Table Array.</div><div class='del'>- *  The caller must have a packed mc_addr_list of multicast addresses.</div><div class='del'>- *  The parameter rar_count will usually be hw-&gt;mac.rar_entry_count</div><div class='del'>- *  unless there are workarounds that change this.</div><div class='del'>- **/</div><div class='del'>-void igb_update_mc_addr_list(struct e1000_hw *hw,</div><div class='del'>-			       u8 *mc_addr_list, u32 mc_addr_count,</div><div class='del'>-			       u32 rar_used_count, u32 rar_count)</div><div class='del'>-{</div><div class='del'>-	u32 hash_value;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Load the first set of multicast addresses into the exact</div><div class='del'>-	 * filters (RAR).  If there are not enough to fill the RAR</div><div class='del'>-	 * array, clear the filters.</div><div class='del'>-	 */</div><div class='del'>-	for (i = rar_used_count; i &lt; rar_count; i++) {</div><div class='del'>-		if (mc_addr_count) {</div><div class='del'>-			hw-&gt;mac.ops.rar_set(hw, mc_addr_list, i);</div><div class='del'>-			mc_addr_count--;</div><div class='del'>-			mc_addr_list += ETH_ALEN;</div><div class='del'>-		} else {</div><div class='del'>-			array_wr32(E1000_RA, i &lt;&lt; 1, 0);</div><div class='del'>-			wrfl();</div><div class='del'>-			array_wr32(E1000_RA, (i &lt;&lt; 1) + 1, 0);</div><div class='del'>-			wrfl();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clear the old settings from the MTA */</div><div class='del'>-	hw_dbg("Clearing MTA\n");</div><div class='del'>-	for (i = 0; i &lt; hw-&gt;mac.mta_reg_count; i++) {</div><div class='del'>-		array_wr32(E1000_MTA, i, 0);</div><div class='del'>-		wrfl();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Load any remaining multicast addresses into the hash table. */</div><div class='del'>-	for (; mc_addr_count &gt; 0; mc_addr_count--) {</div><div class='del'>-		hash_value = igb_hash_mc_addr(hw, mc_addr_list);</div><div class='del'>-		hw_dbg("Hash value = 0x%03X\n", hash_value);</div><div class='del'>-		igb_mta_set(hw, hash_value);</div><div class='del'>-		mc_addr_list += ETH_ALEN;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  *  igb_hash_mc_addr - Generate a multicast hash value</div><div class='ctx'>  *  @hw: pointer to the HW structure</div><div class='ctx'>  *  @mc_addr: pointer to a multicast address</div><div class='head'>diff --git a/drivers/net/igb/e1000_mac.h b/drivers/net/igb/e1000_mac.h<br/>index dc2f8cce15e7..cbee6af7d912 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/igb/e1000_mac.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/igb/e1000_mac.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/igb/e1000_mac.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/e1000_mac.h</a></div><div class='hunk'>@@ -51,9 +51,6 @@ s32  igb_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed,</div><div class='ctx'> 				       u16 *duplex);</div><div class='ctx'> s32  igb_id_led_init(struct e1000_hw *hw);</div><div class='ctx'> s32  igb_led_off(struct e1000_hw *hw);</div><div class='del'>-void igb_update_mc_addr_list(struct e1000_hw *hw,</div><div class='del'>-			       u8 *mc_addr_list, u32 mc_addr_count,</div><div class='del'>-			       u32 rar_used_count, u32 rar_count);</div><div class='ctx'> s32  igb_setup_link(struct e1000_hw *hw);</div><div class='ctx'> s32  igb_validate_mdi_setting(struct e1000_hw *hw);</div><div class='ctx'> s32  igb_write_8bit_ctrl_reg(struct e1000_hw *hw, u32 reg,</div><div class='hunk'>@@ -62,7 +59,7 @@ s32  igb_write_8bit_ctrl_reg(struct e1000_hw *hw, u32 reg,</div><div class='ctx'> void igb_clear_hw_cntrs_base(struct e1000_hw *hw);</div><div class='ctx'> void igb_clear_vfta(struct e1000_hw *hw);</div><div class='ctx'> void igb_config_collision_dist(struct e1000_hw *hw);</div><div class='del'>-void igb_init_rx_addrs(struct e1000_hw *hw, u16 rar_count);</div><div class='add'>+void igb_mta_set(struct e1000_hw *hw, u32 hash_value);</div><div class='ctx'> void igb_put_hw_semaphore(struct e1000_hw *hw);</div><div class='ctx'> void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);</div><div class='ctx'> s32  igb_check_alt_mac_addr(struct e1000_hw *hw);</div><div class='head'>diff --git a/drivers/net/igb/e1000_regs.h b/drivers/net/igb/e1000_regs.h<br/>index b95093d24c09..95523af26056 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/igb/e1000_regs.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/igb/e1000_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/igb/e1000_regs.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/e1000_regs.h</a></div><div class='hunk'>@@ -262,9 +262,6 @@</div><div class='ctx'> #define E1000_RETA(_i)  (0x05C00 + ((_i) * 4))</div><div class='ctx'> #define E1000_RSSRK(_i) (0x05C80 + ((_i) * 4)) /* RSS Random Key - RW Array */</div><div class='ctx'> </div><div class='del'>-#define E1000_REGISTER(a, reg) (((a)-&gt;mac.type &lt; e1000_82576) \</div><div class='del'>-                               ? reg : e1000_translate_register_82576(reg))</div><div class='del'>-</div><div class='ctx'> #define wr32(reg, value) (writel(value, hw-&gt;hw_addr + reg))</div><div class='ctx'> #define rd32(reg) (readl(hw-&gt;hw_addr + reg))</div><div class='ctx'> #define wrfl() ((void)rd32(E1000_STATUS))</div><div class='head'>diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c<br/>index 11aee1309951..58906c984be9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/igb/igb_ethtool.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/igb/igb_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/igb/igb_ethtool.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/igb_ethtool.c</a></div><div class='hunk'>@@ -373,13 +373,17 @@ static void igb_get_regs(struct net_device *netdev,</div><div class='ctx'> 	regs_buff[12] = rd32(E1000_EECD);</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt */</div><div class='del'>-	regs_buff[13] = rd32(E1000_EICR);</div><div class='add'>+	/* Reading EICS for EICR because they read the</div><div class='add'>+	 * same but EICS does not clear on read */</div><div class='add'>+	regs_buff[13] = rd32(E1000_EICS);</div><div class='ctx'> 	regs_buff[14] = rd32(E1000_EICS);</div><div class='ctx'> 	regs_buff[15] = rd32(E1000_EIMS);</div><div class='ctx'> 	regs_buff[16] = rd32(E1000_EIMC);</div><div class='ctx'> 	regs_buff[17] = rd32(E1000_EIAC);</div><div class='ctx'> 	regs_buff[18] = rd32(E1000_EIAM);</div><div class='del'>-	regs_buff[19] = rd32(E1000_ICR);</div><div class='add'>+	/* Reading ICS for ICR because they read the</div><div class='add'>+	 * same but ICS does not clear on read */</div><div class='add'>+	regs_buff[19] = rd32(E1000_ICS);</div><div class='ctx'> 	regs_buff[20] = rd32(E1000_ICS);</div><div class='ctx'> 	regs_buff[21] = rd32(E1000_IMS);</div><div class='ctx'> 	regs_buff[22] = rd32(E1000_IMC);</div><div class='hunk'>@@ -1746,15 +1750,6 @@ static int igb_wol_exclusion(struct igb_adapter *adapter,</div><div class='ctx'> 		/* return success for non excluded adapter ports */</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='del'>-	case E1000_DEV_ID_82576_QUAD_COPPER:</div><div class='del'>-		/* quad port adapters only support WoL on port A */</div><div class='del'>-		if (!(adapter-&gt;flags &amp; IGB_FLAG_QUAD_PORT_A)) {</div><div class='del'>-			wol-&gt;supported = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/* return success for non excluded adapter ports */</div><div class='del'>-		retval = 0;</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* dual port cards only support WoL on port A from now on</div><div class='ctx'> 		 * unless it was enabled in the eeprom for port B</div><div class='head'>diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c<br/>index b602c4dd0d14..634c4c9d87be 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/igb/igb_main.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/igb/igb_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/igb/igb_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/igb/igb_main.c</a></div><div class='hunk'>@@ -61,7 +61,6 @@ static struct pci_device_id igb_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576), board_82575 },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_FIBER), board_82575 },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES), board_82575 },</div><div class='del'>-	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER), board_82575 },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_COPPER), board_82575 },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_FIBER_SERDES), board_82575 },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575GB_QUAD_COPPER), board_82575 },</div><div class='hunk'>@@ -311,7 +310,7 @@ static void igb_assign_vector(struct igb_adapter *adapter, int rx_queue,</div><div class='ctx'> 		array_wr32(E1000_MSIXBM(0), msix_vector, msixbm);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case e1000_82576:</div><div class='del'>-		/* Kawela uses a table-based method for assigning vectors.</div><div class='add'>+		/* The 82576 uses a table-based method for assigning vectors.</div><div class='ctx'> 		   Each queue has a single entry in the table to which we write</div><div class='ctx'> 		   a vector number along with a "valid" bit.  Sadly, the layout</div><div class='ctx'> 		   of the table is somewhat counterintuitive. */</div><div class='hunk'>@@ -521,7 +520,7 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter)</div><div class='ctx'> 			      adapter-&gt;msix_entries,</div><div class='ctx'> 			      numvecs);</div><div class='ctx'> 	if (err == 0)</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	igb_reset_interrupt_capability(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -531,7 +530,7 @@ msi_only:</div><div class='ctx'> 	adapter-&gt;num_tx_queues = 1;</div><div class='ctx'> 	if (!pci_enable_msi(adapter-&gt;pdev))</div><div class='ctx'> 		adapter-&gt;flags |= IGB_FLAG_HAS_MSI;</div><div class='del'>-</div><div class='add'>+out:</div><div class='ctx'> 	/* Notify the stack of the (possibly) reduced Tx Queue count. */</div><div class='ctx'> 	adapter-&gt;netdev-&gt;real_num_tx_queues = adapter-&gt;num_tx_queues;</div><div class='ctx'> 	return;</div><div class='hunk'>@@ -720,28 +719,6 @@ static void igb_get_hw_control(struct igb_adapter *adapter)</div><div class='ctx'> 			ctrl_ext | E1000_CTRL_EXT_DRV_LOAD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void igb_init_manageability(struct igb_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='del'>-</div><div class='del'>-	if (adapter-&gt;en_mng_pt) {</div><div class='del'>-		u32 manc2h = rd32(E1000_MANC2H);</div><div class='del'>-		u32 manc = rd32(E1000_MANC);</div><div class='del'>-</div><div class='del'>-		/* enable receiving management packets to the host */</div><div class='del'>-		/* this will probably generate destination unreachable messages</div><div class='del'>-		 * from the host OS, but the packets will be handled on SMBUS */</div><div class='del'>-		manc |= E1000_MANC_EN_MNG2HOST;</div><div class='del'>-#define E1000_MNG2HOST_PORT_623 (1 &lt;&lt; 5)</div><div class='del'>-#define E1000_MNG2HOST_PORT_664 (1 &lt;&lt; 6)</div><div class='del'>-		manc2h |= E1000_MNG2HOST_PORT_623;</div><div class='del'>-		manc2h |= E1000_MNG2HOST_PORT_664;</div><div class='del'>-		wr32(E1000_MANC2H, manc2h);</div><div class='del'>-</div><div class='del'>-		wr32(E1000_MANC, manc);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * igb_configure - configure the hardware for RX and TX</div><div class='ctx'>  * @adapter: private board structure</div><div class='hunk'>@@ -755,7 +732,6 @@ static void igb_configure(struct igb_adapter *adapter)</div><div class='ctx'> 	igb_set_multi(netdev);</div><div class='ctx'> </div><div class='ctx'> 	igb_restore_vlan(adapter);</div><div class='del'>-	igb_init_manageability(adapter);</div><div class='ctx'> </div><div class='ctx'> 	igb_configure_tx(adapter);</div><div class='ctx'> 	igb_setup_rctl(adapter);</div><div class='hunk'>@@ -1240,16 +1216,6 @@ static int __devinit igb_probe(struct pci_dev *pdev,</div><div class='ctx'> 		if (rd32(E1000_STATUS) &amp; E1000_STATUS_FUNC_1)</div><div class='ctx'> 			adapter-&gt;eeprom_wol = 0;</div><div class='ctx'> 		break;</div><div class='del'>-	case E1000_DEV_ID_82576_QUAD_COPPER:</div><div class='del'>-		/* if quad port adapter, disable WoL on all but port A */</div><div class='del'>-		if (global_quad_port_a != 0)</div><div class='del'>-			adapter-&gt;eeprom_wol = 0;</div><div class='del'>-		else</div><div class='del'>-			adapter-&gt;flags |= IGB_FLAG_QUAD_PORT_A;</div><div class='del'>-		/* Reset for multiple quad port adapters */</div><div class='del'>-		if (++global_quad_port_a == 4)</div><div class='del'>-			global_quad_port_a = 0;</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* initialize the wol settings based on the eeprom settings */</div><div class='hunk'>@@ -1372,7 +1338,8 @@ static void __devexit igb_remove(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(netdev);</div><div class='ctx'> </div><div class='del'>-	if (!igb_check_reset_block(&amp;adapter-&gt;hw))</div><div class='add'>+	if (adapter-&gt;hw.phy.ops.reset_phy &amp;&amp;</div><div class='add'>+	    !igb_check_reset_block(&amp;adapter-&gt;hw))</div><div class='ctx'> 		adapter-&gt;hw.phy.ops.reset_phy(&amp;adapter-&gt;hw);</div><div class='ctx'> </div><div class='ctx'> 	igb_remove_device(&amp;adapter-&gt;hw);</div><div class='hunk'>@@ -2312,7 +2279,9 @@ static void igb_watchdog_task(struct work_struct *work)</div><div class='ctx'> 	struct igb_ring *tx_ring = adapter-&gt;tx_ring;</div><div class='ctx'> 	struct e1000_mac_info *mac = &amp;adapter-&gt;hw.mac;</div><div class='ctx'> 	u32 link;</div><div class='add'>+	u32 eics = 0;</div><div class='ctx'> 	s32 ret_val;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if ((netif_carrier_ok(netdev)) &amp;&amp;</div><div class='ctx'> 	    (rd32(E1000_STATUS) &amp; E1000_STATUS_LU))</div><div class='hunk'>@@ -2414,7 +2383,13 @@ link_up:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Cause software interrupt to ensure rx ring is cleaned */</div><div class='del'>-	wr32(E1000_ICS, E1000_ICS_RXDMT0);</div><div class='add'>+	if (adapter-&gt;msix_entries) {</div><div class='add'>+		for (i = 0; i &lt; adapter-&gt;num_rx_queues; i++)</div><div class='add'>+			eics |= adapter-&gt;rx_ring[i].eims_value;</div><div class='add'>+		wr32(E1000_EICS, eics);</div><div class='add'>+	} else {</div><div class='add'>+		wr32(E1000_ICS, E1000_ICS_RXDMT0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Force detection of hung controller every watchdog period */</div><div class='ctx'> 	tx_ring-&gt;detect_tx_hung = true;</div><div class='hunk'>@@ -4523,8 +4498,6 @@ static void igb_io_resume(struct pci_dev *pdev)</div><div class='ctx'> 	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct igb_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	igb_init_manageability(adapter);</div><div class='del'>-</div><div class='ctx'> 	if (netif_running(netdev)) {</div><div class='ctx'> 		if (igb_up(adapter)) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "igb_up failed after reset\n");</div><div class='head'>diff --git a/drivers/net/ipg.h b/drivers/net/ipg.h<br/>index e0e718ab4c2e..dd9318f19497 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ipg.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/ipg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ipg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ipg.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #ifndef __LINUX_IPG_H</div><div class='ctx'> #define __LINUX_IPG_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -21,7 +20,6 @@</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;asm/bitops.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/net/irda/act200l-sir.c b/drivers/net/irda/act200l-sir.c<br/>index d8b89c74aabd..37ab8c855719 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/act200l-sir.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/act200l-sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/act200l-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/act200l-sir.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static int act200l_open(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct qos_info *qos = &amp;dev-&gt;qos;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__ );</div><div class='ctx'> </div><div class='ctx'> 	/* Power on the dongle */</div><div class='ctx'> 	sirdev_set_dtr_rts(dev, TRUE, TRUE);</div><div class='hunk'>@@ -124,7 +124,7 @@ static int act200l_open(struct sir_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static int act200l_close(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__ );</div><div class='ctx'> </div><div class='ctx'> 	/* Power off the dongle */</div><div class='ctx'> 	sirdev_set_dtr_rts(dev, FALSE, FALSE);</div><div class='hunk'>@@ -143,7 +143,7 @@ static int act200l_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> 	u8 control[3];</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__ );</div><div class='ctx'> </div><div class='ctx'> 	/* Clear DTR and set RTS to enter command mode */</div><div class='ctx'> 	sirdev_set_dtr_rts(dev, FALSE, TRUE);</div><div class='hunk'>@@ -212,7 +212,7 @@ static int act200l_reset(struct sir_dev *dev)</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__ );</div><div class='ctx'> </div><div class='ctx'> 	switch (state) {</div><div class='ctx'> 	case SIRDEV_STATE_DONGLE_RESET:</div><div class='hunk'>@@ -240,7 +240,7 @@ static int act200l_reset(struct sir_dev *dev)</div><div class='ctx'> 		dev-&gt;speed = 9600;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		IRDA_ERROR("%s(), unknown state %d\n", __FUNCTION__, state);</div><div class='add'>+		IRDA_ERROR("%s(), unknown state %d\n", __func__, state);</div><div class='ctx'> 		ret = -1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/irda/actisys-sir.c b/drivers/net/irda/actisys-sir.c<br/>index 736d2473b7e1..50b2141a6103 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/actisys-sir.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/actisys-sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/actisys-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/actisys-sir.c</a></div><div class='hunk'>@@ -165,7 +165,7 @@ static int actisys_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='del'>-        IRDA_DEBUG(4, "%s(), speed=%d (was %d)\n", __FUNCTION__,</div><div class='add'>+        IRDA_DEBUG(4, "%s(), speed=%d (was %d)\n", __func__,</div><div class='ctx'>         	speed, dev-&gt;speed);</div><div class='ctx'> </div><div class='ctx'> 	/* dongle was already resetted from irda_request state machine,</div><div class='head'>diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c<br/>index 083b0dd70fef..2ff181861d2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/ali-ircc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/ali-ircc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/ali-ircc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/ali-ircc.c</a></div><div class='hunk'>@@ -152,7 +152,7 @@ static int __init ali_ircc_init(void)</div><div class='ctx'> 	int reg, revision;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	ret = platform_driver_register(&amp;ali_ircc_driver);</div><div class='ctx'>         if (ret) {</div><div class='hunk'>@@ -166,7 +166,7 @@ static int __init ali_ircc_init(void)</div><div class='ctx'> 	/* Probe for all the ALi chipsets we know about */</div><div class='ctx'> 	for (chip= chips; chip-&gt;name; chip++, i++) </div><div class='ctx'> 	{</div><div class='del'>-		IRDA_DEBUG(2, "%s(), Probing for %s ...\n", __FUNCTION__, chip-&gt;name);</div><div class='add'>+		IRDA_DEBUG(2, "%s(), Probing for %s ...\n", __func__, chip-&gt;name);</div><div class='ctx'> 				</div><div class='ctx'> 		/* Try all config registers for this chip */</div><div class='ctx'> 		for (cfg=0; cfg&lt;2; cfg++)</div><div class='hunk'>@@ -196,11 +196,11 @@ static int __init ali_ircc_init(void)</div><div class='ctx'> 				</div><div class='ctx'> 			if (reg == chip-&gt;cid_value)</div><div class='ctx'> 			{</div><div class='del'>-				IRDA_DEBUG(2, "%s(), Chip found at 0x%03x\n", __FUNCTION__, cfg_base);</div><div class='add'>+				IRDA_DEBUG(2, "%s(), Chip found at 0x%03x\n", __func__, cfg_base);</div><div class='ctx'> 					   </div><div class='ctx'> 				outb(0x1F, cfg_base);</div><div class='ctx'> 				revision = inb(cfg_base+1);</div><div class='del'>-				IRDA_DEBUG(2, "%s(), Found %s chip, revision=%d\n", __FUNCTION__,</div><div class='add'>+				IRDA_DEBUG(2, "%s(), Found %s chip, revision=%d\n", __func__,</div><div class='ctx'> 					   chip-&gt;name, revision);					</div><div class='ctx'> 				</div><div class='ctx'> 				/* </div><div class='hunk'>@@ -223,14 +223,14 @@ static int __init ali_ircc_init(void)</div><div class='ctx'> 			}</div><div class='ctx'> 			else</div><div class='ctx'> 			{</div><div class='del'>-				IRDA_DEBUG(2, "%s(), No %s chip at 0x%03x\n", __FUNCTION__, chip-&gt;name, cfg_base);</div><div class='add'>+				IRDA_DEBUG(2, "%s(), No %s chip at 0x%03x\n", __func__, chip-&gt;name, cfg_base);</div><div class='ctx'> 			}</div><div class='ctx'> 			/* Exit configuration */</div><div class='ctx'> 			outb(0xbb, cfg_base);</div><div class='ctx'> 		}</div><div class='ctx'> 	}		</div><div class='ctx'> 		</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End -----------------\n", __FUNCTION__);					   		</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End -----------------\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		platform_driver_unregister(&amp;ali_ircc_driver);</div><div class='hunk'>@@ -248,7 +248,7 @@ static void __exit ali_ircc_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__);	</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; i &lt; ARRAY_SIZE(dev_self); i++) {</div><div class='ctx'> 		if (dev_self[i])</div><div class='hunk'>@@ -257,7 +257,7 @@ static void __exit ali_ircc_cleanup(void)</div><div class='ctx'> 	</div><div class='ctx'> 	platform_driver_unregister(&amp;ali_ircc_driver);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End -----------------\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End -----------------\n", __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -273,11 +273,11 @@ static int ali_ircc_open(int i, chipio_t *info)</div><div class='ctx'> 	int dongle_id;</div><div class='ctx'> 	int err;</div><div class='ctx'> 			</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__);	</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (i &gt;= ARRAY_SIZE(dev_self)) {</div><div class='ctx'> 		IRDA_ERROR("%s(), maximum number of supported chips reached!\n",</div><div class='del'>-			   __FUNCTION__);</div><div class='add'>+			   __func__);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='hunk'>@@ -288,7 +288,7 @@ static int ali_ircc_open(int i, chipio_t *info)</div><div class='ctx'> 	dev = alloc_irdadev(sizeof(*self));</div><div class='ctx'> 	if (dev == NULL) {</div><div class='ctx'> 		IRDA_ERROR("%s(), can't allocate memory for control block!\n",</div><div class='del'>-			   __FUNCTION__);</div><div class='add'>+			   __func__);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -312,7 +312,7 @@ static int ali_ircc_open(int i, chipio_t *info)</div><div class='ctx'> 	/* Reserve the ioports that we need */</div><div class='ctx'> 	if (!request_region(self-&gt;io.fir_base, self-&gt;io.fir_ext,</div><div class='ctx'> 			    ALI_IRCC_DRIVER_NAME)) {</div><div class='del'>-		IRDA_WARNING("%s(), can't get iobase of 0x%03x\n", __FUNCTION__,</div><div class='add'>+		IRDA_WARNING("%s(), can't get iobase of 0x%03x\n", __func__,</div><div class='ctx'> 			self-&gt;io.fir_base);</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto err_out1;</div><div class='hunk'>@@ -370,19 +370,19 @@ static int ali_ircc_open(int i, chipio_t *info)</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdev(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		IRDA_ERROR("%s(), register_netdev() failed!\n", __FUNCTION__);</div><div class='add'>+		IRDA_ERROR("%s(), register_netdev() failed!\n", __func__);</div><div class='ctx'> 		goto err_out4;</div><div class='ctx'> 	}</div><div class='ctx'> 	IRDA_MESSAGE("IrDA: Registered device %s\n", dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	/* Check dongle id */</div><div class='ctx'> 	dongle_id = ali_ircc_read_dongle_id(i, info);</div><div class='del'>-	IRDA_MESSAGE("%s(), %s, Found dongle: %s\n", __FUNCTION__,</div><div class='add'>+	IRDA_MESSAGE("%s(), %s, Found dongle: %s\n", __func__,</div><div class='ctx'> 		     ALI_IRCC_DRIVER_NAME, dongle_types[dongle_id]);</div><div class='ctx'> 		</div><div class='ctx'> 	self-&gt;io.dongle_id = dongle_id;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End -----------------\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End -----------------\n", __func__);</div><div class='ctx'> 	</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -411,7 +411,7 @@ static int __exit ali_ircc_close(struct ali_ircc_cb *self)</div><div class='ctx'> {</div><div class='ctx'> 	int iobase;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(4, "%s(), ---------------- Start ----------------\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(4, "%s(), ---------------- Start ----------------\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return -1;);</div><div class='ctx'> </div><div class='hunk'>@@ -421,7 +421,7 @@ static int __exit ali_ircc_close(struct ali_ircc_cb *self)</div><div class='ctx'> 	unregister_netdev(self-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Release the PORT that this driver is using */</div><div class='del'>-	IRDA_DEBUG(4, "%s(), Releasing Region %03x\n", __FUNCTION__, self-&gt;io.fir_base);</div><div class='add'>+	IRDA_DEBUG(4, "%s(), Releasing Region %03x\n", __func__, self-&gt;io.fir_base);</div><div class='ctx'> 	release_region(self-&gt;io.fir_base, self-&gt;io.fir_ext);</div><div class='ctx'> </div><div class='ctx'> 	if (self-&gt;tx_buff.head)</div><div class='hunk'>@@ -435,7 +435,7 @@ static int __exit ali_ircc_close(struct ali_ircc_cb *self)</div><div class='ctx'> 	dev_self[self-&gt;index] = NULL;</div><div class='ctx'> 	free_netdev(self-&gt;netdev);</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End -----------------\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End -----------------\n", __func__);</div><div class='ctx'> 	</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -478,7 +478,7 @@ static int ali_ircc_probe_53(ali_chip_t *chip, chipio_t *info)</div><div class='ctx'> 	int cfg_base = info-&gt;cfg_base;</div><div class='ctx'> 	int hi, low, reg;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__);</div><div class='ctx'> 	</div><div class='ctx'> 	/* Enter Configuration */</div><div class='ctx'> 	outb(chip-&gt;entr1, cfg_base);</div><div class='hunk'>@@ -497,13 +497,13 @@ static int ali_ircc_probe_53(ali_chip_t *chip, chipio_t *info)</div><div class='ctx'> 	</div><div class='ctx'> 	info-&gt;sir_base = info-&gt;fir_base;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), probing fir_base=0x%03x\n", __FUNCTION__, info-&gt;fir_base);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), probing fir_base=0x%03x\n", __func__, info-&gt;fir_base);</div><div class='ctx'> 		</div><div class='ctx'> 	/* Read IRQ control register */</div><div class='ctx'> 	outb(0x70, cfg_base);</div><div class='ctx'> 	reg = inb(cfg_base+1);</div><div class='ctx'> 	info-&gt;irq = reg &amp; 0x0f;</div><div class='del'>-	IRDA_DEBUG(2, "%s(), probing irq=%d\n", __FUNCTION__, info-&gt;irq);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), probing irq=%d\n", __func__, info-&gt;irq);</div><div class='ctx'> 	</div><div class='ctx'> 	/* Read DMA channel */</div><div class='ctx'> 	outb(0x74, cfg_base);</div><div class='hunk'>@@ -511,26 +511,26 @@ static int ali_ircc_probe_53(ali_chip_t *chip, chipio_t *info)</div><div class='ctx'> 	info-&gt;dma = reg &amp; 0x07;</div><div class='ctx'> 	</div><div class='ctx'> 	if(info-&gt;dma == 0x04)</div><div class='del'>-		IRDA_WARNING("%s(), No DMA channel assigned !\n", __FUNCTION__);</div><div class='add'>+		IRDA_WARNING("%s(), No DMA channel assigned !\n", __func__);</div><div class='ctx'> 	else</div><div class='del'>-		IRDA_DEBUG(2, "%s(), probing dma=%d\n", __FUNCTION__, info-&gt;dma);</div><div class='add'>+		IRDA_DEBUG(2, "%s(), probing dma=%d\n", __func__, info-&gt;dma);</div><div class='ctx'> 	</div><div class='ctx'> 	/* Read Enabled Status */</div><div class='ctx'> 	outb(0x30, cfg_base);</div><div class='ctx'> 	reg = inb(cfg_base+1);</div><div class='ctx'> 	info-&gt;enabled = (reg &amp; 0x80) &amp;&amp; (reg &amp; 0x01);</div><div class='del'>-	IRDA_DEBUG(2, "%s(), probing enabled=%d\n", __FUNCTION__, info-&gt;enabled);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), probing enabled=%d\n", __func__, info-&gt;enabled);</div><div class='ctx'> 	</div><div class='ctx'> 	/* Read Power Status */</div><div class='ctx'> 	outb(0x22, cfg_base);</div><div class='ctx'> 	reg = inb(cfg_base+1);</div><div class='ctx'> 	info-&gt;suspended = (reg &amp; 0x20);</div><div class='del'>-	IRDA_DEBUG(2, "%s(), probing suspended=%d\n", __FUNCTION__, info-&gt;suspended);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), probing suspended=%d\n", __func__, info-&gt;suspended);</div><div class='ctx'> 	</div><div class='ctx'> 	/* Exit configuration */</div><div class='ctx'> 	outb(0xbb, cfg_base);</div><div class='ctx'> 		</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End -----------------\n", __FUNCTION__);	</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End -----------------\n", __func__);</div><div class='ctx'> 	</div><div class='ctx'> 	return 0;	</div><div class='ctx'> }</div><div class='hunk'>@@ -548,7 +548,7 @@ static int ali_ircc_setup(chipio_t *info)</div><div class='ctx'> 	int version;</div><div class='ctx'> 	int iobase = info-&gt;fir_base;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__);</div><div class='ctx'> 	</div><div class='ctx'> 	/* Locking comments :</div><div class='ctx'> 	 * Most operations here need to be protected. We are called before</div><div class='hunk'>@@ -609,7 +609,7 @@ static int ali_ircc_setup(chipio_t *info)</div><div class='ctx'> 	// outb(UART_IER_RDI, iobase+UART_IER); //benjamin 2000/11/23 01:25PM</div><div class='ctx'> 	// Turn on the interrupts in ali_ircc_net_open</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__);	</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__);</div><div class='ctx'> 	</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -626,7 +626,7 @@ static int ali_ircc_read_dongle_id (int i, chipio_t *info)</div><div class='ctx'> 	int dongle_id, reg;</div><div class='ctx'> 	int cfg_base = info-&gt;cfg_base;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__);</div><div class='ctx'> 		</div><div class='ctx'> 	/* Enter Configuration */</div><div class='ctx'> 	outb(chips[i].entr1, cfg_base);</div><div class='hunk'>@@ -640,13 +640,13 @@ static int ali_ircc_read_dongle_id (int i, chipio_t *info)</div><div class='ctx'> 	outb(0xf0, cfg_base);</div><div class='ctx'> 	reg = inb(cfg_base+1);	</div><div class='ctx'> 	dongle_id = ((reg&gt;&gt;6)&amp;0x02) | ((reg&gt;&gt;5)&amp;0x01);</div><div class='del'>-	IRDA_DEBUG(2, "%s(), probing dongle_id=%d, dongle_types=%s\n", __FUNCTION__, </div><div class='add'>+	IRDA_DEBUG(2, "%s(), probing dongle_id=%d, dongle_types=%s\n", __func__,</div><div class='ctx'> 		dongle_id, dongle_types[dongle_id]);</div><div class='ctx'> 	</div><div class='ctx'> 	/* Exit configuration */</div><div class='ctx'> 	outb(0xbb, cfg_base);</div><div class='ctx'> 			</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__);	</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__);</div><div class='ctx'> 	</div><div class='ctx'> 	return dongle_id;</div><div class='ctx'> }</div><div class='hunk'>@@ -663,7 +663,7 @@ static irqreturn_t ali_ircc_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	struct ali_ircc_cb *self;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 		</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__);</div><div class='ctx'> 		</div><div class='ctx'> 	self = dev-&gt;priv;</div><div class='ctx'> 	</div><div class='hunk'>@@ -677,7 +677,7 @@ static irqreturn_t ali_ircc_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		</div><div class='ctx'> 	spin_unlock(&amp;self-&gt;lock);</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> /*</div><div class='hunk'>@@ -691,7 +691,7 @@ static irqreturn_t ali_ircc_fir_interrupt(struct ali_ircc_cb *self)</div><div class='ctx'> 	__u8 eir, OldMessageCount;</div><div class='ctx'> 	int iobase, tmp;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __func__);</div><div class='ctx'> 	</div><div class='ctx'> 	iobase = self-&gt;io.fir_base;</div><div class='ctx'> 	</div><div class='hunk'>@@ -704,10 +704,10 @@ static irqreturn_t ali_ircc_fir_interrupt(struct ali_ircc_cb *self)</div><div class='ctx'> 	//self-&gt;ier = inb(iobase+FIR_IER); 		2000/12/1 04:32PM</div><div class='ctx'> 	eir = self-&gt;InterruptID &amp; self-&gt;ier; /* Mask out the interesting ones */ </div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), self-&gt;InterruptID = %x\n", __FUNCTION__,self-&gt;InterruptID);</div><div class='del'>-	IRDA_DEBUG(1, "%s(), self-&gt;LineStatus = %x\n", __FUNCTION__,self-&gt;LineStatus);</div><div class='del'>-	IRDA_DEBUG(1, "%s(), self-&gt;ier = %x\n", __FUNCTION__,self-&gt;ier);</div><div class='del'>-	IRDA_DEBUG(1, "%s(), eir = %x\n", __FUNCTION__,eir);</div><div class='add'>+	IRDA_DEBUG(1, "%s(), self-&gt;InterruptID = %x\n", __func__,self-&gt;InterruptID);</div><div class='add'>+	IRDA_DEBUG(1, "%s(), self-&gt;LineStatus = %x\n", __func__,self-&gt;LineStatus);</div><div class='add'>+	IRDA_DEBUG(1, "%s(), self-&gt;ier = %x\n", __func__,self-&gt;ier);</div><div class='add'>+	IRDA_DEBUG(1, "%s(), eir = %x\n", __func__,eir);</div><div class='ctx'> 	</div><div class='ctx'> 	/* Disable interrupts */</div><div class='ctx'> 	 SetCOMInterrupts(self, FALSE);</div><div class='hunk'>@@ -718,7 +718,7 @@ static irqreturn_t ali_ircc_fir_interrupt(struct ali_ircc_cb *self)</div><div class='ctx'> 	{		</div><div class='ctx'> 		if (self-&gt;io.direction == IO_XMIT) /* TX */</div><div class='ctx'> 		{</div><div class='del'>-			IRDA_DEBUG(1, "%s(), ******* IIR_EOM (Tx) *******\n", __FUNCTION__);</div><div class='add'>+			IRDA_DEBUG(1, "%s(), ******* IIR_EOM (Tx) *******\n", __func__);</div><div class='ctx'> 			</div><div class='ctx'> 			if(ali_ircc_dma_xmit_complete(self))</div><div class='ctx'> 			{</div><div class='hunk'>@@ -737,23 +737,23 @@ static irqreturn_t ali_ircc_fir_interrupt(struct ali_ircc_cb *self)</div><div class='ctx'> 		}	</div><div class='ctx'> 		else /* RX */</div><div class='ctx'> 		{</div><div class='del'>-			IRDA_DEBUG(1, "%s(), ******* IIR_EOM (Rx) *******\n", __FUNCTION__);</div><div class='add'>+			IRDA_DEBUG(1, "%s(), ******* IIR_EOM (Rx) *******\n", __func__);</div><div class='ctx'> 			</div><div class='ctx'> 			if(OldMessageCount &gt; ((self-&gt;LineStatus+1) &amp; 0x07))</div><div class='ctx'> 			{</div><div class='ctx'> 				self-&gt;rcvFramesOverflow = TRUE;	</div><div class='del'>-				IRDA_DEBUG(1, "%s(), ******* self-&gt;rcvFramesOverflow = TRUE ******** \n", __FUNCTION__);</div><div class='add'>+				IRDA_DEBUG(1, "%s(), ******* self-&gt;rcvFramesOverflow = TRUE ******** \n", __func__);</div><div class='ctx'> 			}</div><div class='ctx'> 						</div><div class='ctx'> 			if (ali_ircc_dma_receive_complete(self))</div><div class='ctx'> 			{</div><div class='del'>-				IRDA_DEBUG(1, "%s(), ******* receive complete ******** \n", __FUNCTION__);</div><div class='add'>+				IRDA_DEBUG(1, "%s(), ******* receive complete ******** \n", __func__);</div><div class='ctx'> 				</div><div class='ctx'> 				self-&gt;ier = IER_EOM;				</div><div class='ctx'> 			}</div><div class='ctx'> 			else</div><div class='ctx'> 			{</div><div class='del'>-				IRDA_DEBUG(1, "%s(), ******* Not receive complete ******** \n", __FUNCTION__);</div><div class='add'>+				IRDA_DEBUG(1, "%s(), ******* Not receive complete ******** \n", __func__);</div><div class='ctx'> 				</div><div class='ctx'> 				self-&gt;ier = IER_EOM | IER_TIMER;								</div><div class='ctx'> 			}	</div><div class='hunk'>@@ -766,7 +766,7 @@ static irqreturn_t ali_ircc_fir_interrupt(struct ali_ircc_cb *self)</div><div class='ctx'> 		if(OldMessageCount &gt; ((self-&gt;LineStatus+1) &amp; 0x07))</div><div class='ctx'> 		{</div><div class='ctx'> 			self-&gt;rcvFramesOverflow = TRUE;	</div><div class='del'>-			IRDA_DEBUG(1, "%s(), ******* self-&gt;rcvFramesOverflow = TRUE ******* \n", __FUNCTION__);</div><div class='add'>+			IRDA_DEBUG(1, "%s(), ******* self-&gt;rcvFramesOverflow = TRUE ******* \n", __func__);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Disable Timer */</div><div class='ctx'> 		switch_bank(iobase, BANK1);</div><div class='hunk'>@@ -798,7 +798,7 @@ static irqreturn_t ali_ircc_fir_interrupt(struct ali_ircc_cb *self)</div><div class='ctx'> 	/* Restore Interrupt */	</div><div class='ctx'> 	SetCOMInterrupts(self, TRUE);	</div><div class='ctx'> 		</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ----------------- End ---------------\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ----------------- End ---------------\n", __func__);</div><div class='ctx'> 	return IRQ_RETVAL(eir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -813,7 +813,7 @@ static irqreturn_t ali_ircc_sir_interrupt(struct ali_ircc_cb *self)</div><div class='ctx'> 	int iobase;</div><div class='ctx'> 	int iir, lsr;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__);</div><div class='ctx'> 	</div><div class='ctx'> 	iobase = self-&gt;io.sir_base;</div><div class='ctx'> </div><div class='hunk'>@@ -822,13 +822,13 @@ static irqreturn_t ali_ircc_sir_interrupt(struct ali_ircc_cb *self)</div><div class='ctx'> 		/* Clear interrupt */</div><div class='ctx'> 		lsr = inb(iobase+UART_LSR);</div><div class='ctx'> </div><div class='del'>-		IRDA_DEBUG(4, "%s(), iir=%02x, lsr=%02x, iobase=%#x\n", __FUNCTION__, </div><div class='add'>+		IRDA_DEBUG(4, "%s(), iir=%02x, lsr=%02x, iobase=%#x\n", __func__,</div><div class='ctx'> 			   iir, lsr, iobase);</div><div class='ctx'> </div><div class='ctx'> 		switch (iir) </div><div class='ctx'> 		{</div><div class='ctx'> 			case UART_IIR_RLSI:</div><div class='del'>-				IRDA_DEBUG(2, "%s(), RLSI\n", __FUNCTION__);</div><div class='add'>+				IRDA_DEBUG(2, "%s(), RLSI\n", __func__);</div><div class='ctx'> 				break;</div><div class='ctx'> 			case UART_IIR_RDI:</div><div class='ctx'> 				/* Receive interrupt */</div><div class='hunk'>@@ -842,14 +842,14 @@ static irqreturn_t ali_ircc_sir_interrupt(struct ali_ircc_cb *self)</div><div class='ctx'> 				}				</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='del'>-				IRDA_DEBUG(0, "%s(), unhandled IIR=%#x\n", __FUNCTION__, iir);</div><div class='add'>+				IRDA_DEBUG(0, "%s(), unhandled IIR=%#x\n", __func__, iir);</div><div class='ctx'> 				break;</div><div class='ctx'> 		} </div><div class='ctx'> 		</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__);	</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_RETVAL(iir);</div><div class='ctx'> }</div><div class='hunk'>@@ -866,7 +866,7 @@ static void ali_ircc_sir_receive(struct ali_ircc_cb *self)</div><div class='ctx'> 	int boguscount = 0;</div><div class='ctx'> 	int iobase;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__);</div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return;);</div><div class='ctx'> </div><div class='ctx'> 	iobase = self-&gt;io.sir_base;</div><div class='hunk'>@@ -881,12 +881,12 @@ static void ali_ircc_sir_receive(struct ali_ircc_cb *self)</div><div class='ctx'> </div><div class='ctx'> 		/* Make sure we don't stay here too long */</div><div class='ctx'> 		if (boguscount++ &gt; 32) {</div><div class='del'>-			IRDA_DEBUG(2,"%s(), breaking!\n", __FUNCTION__);</div><div class='add'>+			IRDA_DEBUG(2,"%s(), breaking!\n", __func__);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (inb(iobase+UART_LSR) &amp; UART_LSR_DR);	</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -903,7 +903,7 @@ static void ali_ircc_sir_write_wakeup(struct ali_ircc_cb *self)</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return;);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	iobase = self-&gt;io.sir_base;</div><div class='ctx'> </div><div class='hunk'>@@ -922,16 +922,16 @@ static void ali_ircc_sir_write_wakeup(struct ali_ircc_cb *self)</div><div class='ctx'> 		{</div><div class='ctx'> 			/* We must wait until all data are gone */</div><div class='ctx'> 			while(!(inb(iobase+UART_LSR) &amp; UART_LSR_TEMT))</div><div class='del'>-				IRDA_DEBUG(1, "%s(), UART_LSR_THRE\n", __FUNCTION__ );</div><div class='add'>+				IRDA_DEBUG(1, "%s(), UART_LSR_THRE\n", __func__ );</div><div class='ctx'> 			</div><div class='del'>-			IRDA_DEBUG(1, "%s(), Changing speed! self-&gt;new_speed = %d\n", __FUNCTION__ , self-&gt;new_speed);</div><div class='add'>+			IRDA_DEBUG(1, "%s(), Changing speed! self-&gt;new_speed = %d\n", __func__ , self-&gt;new_speed);</div><div class='ctx'> 			ali_ircc_change_speed(self, self-&gt;new_speed);</div><div class='ctx'> 			self-&gt;new_speed = 0;			</div><div class='ctx'> 			</div><div class='ctx'> 			// benjamin 2000/11/10 06:32PM</div><div class='ctx'> 			if (self-&gt;io.speed &gt; 115200)</div><div class='ctx'> 			{</div><div class='del'>-				IRDA_DEBUG(2, "%s(), ali_ircc_change_speed from UART_LSR_TEMT \n", __FUNCTION__ );				</div><div class='add'>+				IRDA_DEBUG(2, "%s(), ali_ircc_change_speed from UART_LSR_TEMT \n", __func__ );</div><div class='ctx'> 					</div><div class='ctx'> 				self-&gt;ier = IER_EOM;</div><div class='ctx'> 				// SetCOMInterrupts(self, TRUE);							</div><div class='hunk'>@@ -949,7 +949,7 @@ static void ali_ircc_sir_write_wakeup(struct ali_ircc_cb *self)</div><div class='ctx'> 		outb(UART_IER_RDI, iobase+UART_IER);</div><div class='ctx'> 	}</div><div class='ctx'> 		</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ali_ircc_change_speed(struct ali_ircc_cb *self, __u32 baud)</div><div class='hunk'>@@ -957,9 +957,9 @@ static void ali_ircc_change_speed(struct ali_ircc_cb *self, __u32 baud)</div><div class='ctx'> 	struct net_device *dev = self-&gt;netdev;</div><div class='ctx'> 	int iobase;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __func__ );</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), setting speed = %d \n", __FUNCTION__ , baud);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), setting speed = %d \n", __func__ , baud);</div><div class='ctx'> 	</div><div class='ctx'> 	/* This function *must* be called with irq off and spin-lock.</div><div class='ctx'> 	 * - Jean II */</div><div class='hunk'>@@ -998,7 +998,7 @@ static void ali_ircc_change_speed(struct ali_ircc_cb *self, __u32 baud)</div><div class='ctx'> 		</div><div class='ctx'> 	netif_wake_queue(self-&gt;netdev);	</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ali_ircc_fir_change_speed(struct ali_ircc_cb *priv, __u32 baud)</div><div class='hunk'>@@ -1008,14 +1008,14 @@ static void ali_ircc_fir_change_speed(struct ali_ircc_cb *priv, __u32 baud)</div><div class='ctx'> 	struct ali_ircc_cb *self = (struct ali_ircc_cb *) priv;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __func__ );</div><div class='ctx'> 		</div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return;);</div><div class='ctx'> </div><div class='ctx'> 	dev = self-&gt;netdev;</div><div class='ctx'> 	iobase = self-&gt;io.fir_base;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), self-&gt;io.speed = %d, change to speed = %d\n", __FUNCTION__ ,self-&gt;io.speed,baud);</div><div class='add'>+	IRDA_DEBUG(1, "%s(), self-&gt;io.speed = %d, change to speed = %d\n", __func__ ,self-&gt;io.speed,baud);</div><div class='ctx'> 	</div><div class='ctx'> 	/* Come from SIR speed */</div><div class='ctx'> 	if(self-&gt;io.speed &lt;=115200)</div><div class='hunk'>@@ -1029,7 +1029,7 @@ static void ali_ircc_fir_change_speed(struct ali_ircc_cb *priv, __u32 baud)</div><div class='ctx'> 	// Set Dongle Speed mode</div><div class='ctx'> 	ali_ircc_change_dongle_speed(self, baud);</div><div class='ctx'> 		</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1047,9 +1047,9 @@ static void ali_ircc_sir_change_speed(struct ali_ircc_cb *priv, __u32 speed)</div><div class='ctx'> 	int lcr;    /* Line control reg */</div><div class='ctx'> 	int divisor;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __func__ );</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), Setting speed to: %d\n", __FUNCTION__ , speed);</div><div class='add'>+	IRDA_DEBUG(1, "%s(), Setting speed to: %d\n", __func__ , speed);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return;);</div><div class='ctx'> </div><div class='hunk'>@@ -1103,7 +1103,7 @@ static void ali_ircc_sir_change_speed(struct ali_ircc_cb *priv, __u32 speed)</div><div class='ctx'> 	</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;self-&gt;lock, flags);</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ali_ircc_change_dongle_speed(struct ali_ircc_cb *priv, int speed)</div><div class='hunk'>@@ -1113,14 +1113,14 @@ static void ali_ircc_change_dongle_speed(struct ali_ircc_cb *priv, int speed)</div><div class='ctx'> 	int iobase,dongle_id;</div><div class='ctx'> 	int tmp = 0;</div><div class='ctx'> 			</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	iobase = self-&gt;io.fir_base; 	/* or iobase = self-&gt;io.sir_base; */</div><div class='ctx'> 	dongle_id = self-&gt;io.dongle_id;</div><div class='ctx'> 	</div><div class='ctx'> 	/* We are already locked, no need to do it again */</div><div class='ctx'> 		</div><div class='del'>-	IRDA_DEBUG(1, "%s(), Set Speed for %s , Speed = %d\n", __FUNCTION__ , dongle_types[dongle_id], speed);		</div><div class='add'>+	IRDA_DEBUG(1, "%s(), Set Speed for %s , Speed = %d\n", __func__ , dongle_types[dongle_id], speed);</div><div class='ctx'> 	</div><div class='ctx'> 	switch_bank(iobase, BANK2);</div><div class='ctx'> 	tmp = inb(iobase+FIR_IRDA_CR);</div><div class='hunk'>@@ -1284,7 +1284,7 @@ static void ali_ircc_change_dongle_speed(struct ali_ircc_cb *priv, int speed)</div><div class='ctx'> 			</div><div class='ctx'> 	switch_bank(iobase, BANK0);</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __FUNCTION__ );		</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1297,11 +1297,11 @@ static int ali_ircc_sir_write(int iobase, int fifo_size, __u8 *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int actual = 0;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__ );</div><div class='ctx'> 		</div><div class='ctx'> 	/* Tx FIFO should be empty! */</div><div class='ctx'> 	if (!(inb(iobase+UART_LSR) &amp; UART_LSR_THRE)) {</div><div class='del'>-		IRDA_DEBUG(0, "%s(), failed, fifo not empty!\n", __FUNCTION__ );</div><div class='add'>+		IRDA_DEBUG(0, "%s(), failed, fifo not empty!\n", __func__ );</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'>         </div><div class='hunk'>@@ -1313,7 +1313,7 @@ static int ali_ircc_sir_write(int iobase, int fifo_size, __u8 *buf, int len)</div><div class='ctx'> 		actual++;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='del'>-        IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+        IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> 	return actual;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1329,7 +1329,7 @@ static int ali_ircc_net_open(struct net_device *dev)</div><div class='ctx'> 	int iobase;</div><div class='ctx'> 	char hwname[32];</div><div class='ctx'> 		</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	IRDA_ASSERT(dev != NULL, return -1;);</div><div class='ctx'> 	</div><div class='hunk'>@@ -1375,7 +1375,7 @@ static int ali_ircc_net_open(struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	self-&gt;irlap = irlap_open(dev, &amp;self-&gt;qos, hwname);</div><div class='ctx'> 		</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1392,7 +1392,7 @@ static int ali_ircc_net_close(struct net_device *dev)</div><div class='ctx'> 	struct ali_ircc_cb *self;</div><div class='ctx'> 	//int iobase;</div><div class='ctx'> 			</div><div class='del'>-	IRDA_DEBUG(4, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(4, "%s(), ---------------- Start ----------------\n", __func__ );</div><div class='ctx'> 		</div><div class='ctx'> 	IRDA_ASSERT(dev != NULL, return -1;);</div><div class='ctx'> </div><div class='hunk'>@@ -1415,7 +1415,7 @@ static int ali_ircc_net_close(struct net_device *dev)</div><div class='ctx'> 	free_irq(self-&gt;io.irq, dev);</div><div class='ctx'> 	free_dma(self-&gt;io.dma);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1434,7 +1434,7 @@ static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	__u32 speed;</div><div class='ctx'> 	int mtt, diff;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ---------------- Start -----------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ---------------- Start -----------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	self = (struct ali_ircc_cb *) dev-&gt;priv;</div><div class='ctx'> 	iobase = self-&gt;io.fir_base;</div><div class='hunk'>@@ -1488,7 +1488,7 @@ static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			diff = self-&gt;now.tv_usec - self-&gt;stamp.tv_usec;</div><div class='ctx'> 			/* self-&gt;stamp is set from ali_ircc_dma_receive_complete() */</div><div class='ctx'> 							</div><div class='del'>-			IRDA_DEBUG(1, "%s(), ******* diff = %d ******* \n", __FUNCTION__ , diff);	</div><div class='add'>+			IRDA_DEBUG(1, "%s(), ******* diff = %d ******* \n", __func__ , diff);</div><div class='ctx'> 			</div><div class='ctx'> 			if (diff &lt; 0) </div><div class='ctx'> 				diff += 1000000;</div><div class='hunk'>@@ -1510,7 +1510,7 @@ static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 					/* Adjust for timer resolution */</div><div class='ctx'> 					mtt = (mtt+250) / 500; 	/* 4 discard, 5 get advanced, Let's round off */</div><div class='ctx'> 					</div><div class='del'>-					IRDA_DEBUG(1, "%s(), ************** mtt = %d ***********\n", __FUNCTION__ , mtt);	</div><div class='add'>+					IRDA_DEBUG(1, "%s(), ************** mtt = %d ***********\n", __func__ , mtt);</div><div class='ctx'> 					</div><div class='ctx'> 					/* Setup timer */</div><div class='ctx'> 					if (mtt == 1) /* 500 us */</div><div class='hunk'>@@ -1567,7 +1567,7 @@ static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;self-&gt;lock, flags);</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> 	return 0;	</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1578,7 +1578,7 @@ static void ali_ircc_dma_xmit(struct ali_ircc_cb *self)</div><div class='ctx'> 	unsigned char FIFO_OPTI, Hi, Lo;</div><div class='ctx'> 	</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ---------------- Start -----------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ---------------- Start -----------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	iobase = self-&gt;io.fir_base;</div><div class='ctx'> 	</div><div class='hunk'>@@ -1629,7 +1629,7 @@ static void ali_ircc_dma_xmit(struct ali_ircc_cb *self)</div><div class='ctx'> 	tmp = inb(iobase+FIR_LCR_B);</div><div class='ctx'> 	tmp &amp;= ~0x20; // Disable SIP</div><div class='ctx'> 	outb(((unsigned char)(tmp &amp; 0x3f) | LCR_B_TX_MODE) &amp; ~LCR_B_BW, iobase+FIR_LCR_B);</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ******* Change to TX mode: FIR_LCR_B = 0x%x ******* \n", __FUNCTION__ , inb(iobase+FIR_LCR_B));</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ******* Change to TX mode: FIR_LCR_B = 0x%x ******* \n", __func__ , inb(iobase+FIR_LCR_B));</div><div class='ctx'> 	</div><div class='ctx'> 	outb(0, iobase+FIR_LSR);</div><div class='ctx'> 			</div><div class='hunk'>@@ -1639,7 +1639,7 @@ static void ali_ircc_dma_xmit(struct ali_ircc_cb *self)</div><div class='ctx'> 	</div><div class='ctx'> 	switch_bank(iobase, BANK0); </div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int  ali_ircc_dma_xmit_complete(struct ali_ircc_cb *self)</div><div class='hunk'>@@ -1647,7 +1647,7 @@ static int  ali_ircc_dma_xmit_complete(struct ali_ircc_cb *self)</div><div class='ctx'> 	int iobase;</div><div class='ctx'> 	int ret = TRUE;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ---------------- Start -----------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ---------------- Start -----------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	iobase = self-&gt;io.fir_base;</div><div class='ctx'> 	</div><div class='hunk'>@@ -1660,7 +1660,7 @@ static int  ali_ircc_dma_xmit_complete(struct ali_ircc_cb *self)</div><div class='ctx'> 	if((inb(iobase+FIR_LSR) &amp; LSR_FRAME_ABORT) == LSR_FRAME_ABORT)</div><div class='ctx'> 	</div><div class='ctx'> 	{</div><div class='del'>-		IRDA_ERROR("%s(), ********* LSR_FRAME_ABORT *********\n", __FUNCTION__);	</div><div class='add'>+		IRDA_ERROR("%s(), ********* LSR_FRAME_ABORT *********\n", __func__);</div><div class='ctx'> 		self-&gt;stats.tx_errors++;</div><div class='ctx'> 		self-&gt;stats.tx_fifo_errors++;		</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1703,7 +1703,7 @@ static int  ali_ircc_dma_xmit_complete(struct ali_ircc_cb *self)</div><div class='ctx'> 		</div><div class='ctx'> 	switch_bank(iobase, BANK0); </div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1718,7 +1718,7 @@ static int ali_ircc_dma_receive(struct ali_ircc_cb *self)</div><div class='ctx'> {</div><div class='ctx'> 	int iobase, tmp;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ---------------- Start -----------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ---------------- Start -----------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	iobase = self-&gt;io.fir_base;</div><div class='ctx'> 	</div><div class='hunk'>@@ -1756,7 +1756,7 @@ static int ali_ircc_dma_receive(struct ali_ircc_cb *self)</div><div class='ctx'> 	//switch_bank(iobase, BANK0);</div><div class='ctx'> 	tmp = inb(iobase+FIR_LCR_B);</div><div class='ctx'> 	outb((unsigned char)(tmp &amp;0x3f) | LCR_B_RX_MODE | LCR_B_BW , iobase + FIR_LCR_B); // 2000/12/1 05:16PM</div><div class='del'>-	IRDA_DEBUG(1, "%s(), *** Change To RX mode: FIR_LCR_B = 0x%x *** \n", __FUNCTION__ , inb(iobase+FIR_LCR_B));</div><div class='add'>+	IRDA_DEBUG(1, "%s(), *** Change To RX mode: FIR_LCR_B = 0x%x *** \n", __func__ , inb(iobase+FIR_LCR_B));</div><div class='ctx'> 			</div><div class='ctx'> 	/* Set Rx Threshold */</div><div class='ctx'> 	switch_bank(iobase, BANK1);</div><div class='hunk'>@@ -1768,7 +1768,7 @@ static int ali_ircc_dma_receive(struct ali_ircc_cb *self)</div><div class='ctx'> 	outb(CR_DMA_EN | CR_DMA_BURST, iobase+FIR_CR);</div><div class='ctx'> 				</div><div class='ctx'> 	switch_bank(iobase, BANK0); </div><div class='del'>-	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1779,7 +1779,7 @@ static int  ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)</div><div class='ctx'> 	__u8 status, MessageCount;</div><div class='ctx'> 	int len, i, iobase, val;	</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s(), ---------------- Start -----------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ---------------- Start -----------------\n", __func__ );</div><div class='ctx'> </div><div class='ctx'> 	st_fifo = &amp;self-&gt;st_fifo;		</div><div class='ctx'> 	iobase = self-&gt;io.fir_base;	</div><div class='hunk'>@@ -1788,7 +1788,7 @@ static int  ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)</div><div class='ctx'> 	MessageCount = inb(iobase+ FIR_LSR)&amp;0x07;</div><div class='ctx'> 	</div><div class='ctx'> 	if (MessageCount &gt; 0)	</div><div class='del'>-		IRDA_DEBUG(0, "%s(), Messsage count = %d,\n", __FUNCTION__ , MessageCount);	</div><div class='add'>+		IRDA_DEBUG(0, "%s(), Messsage count = %d,\n", __func__ , MessageCount);</div><div class='ctx'> 		</div><div class='ctx'> 	for (i=0; i&lt;=MessageCount; i++)</div><div class='ctx'> 	{</div><div class='hunk'>@@ -1801,11 +1801,11 @@ static int  ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)</div><div class='ctx'> 		len = len &lt;&lt; 8; </div><div class='ctx'> 		len |= inb(iobase+FIR_RX_DSR_LO);</div><div class='ctx'> 		</div><div class='del'>-		IRDA_DEBUG(1, "%s(), RX Length = 0x%.2x,\n", __FUNCTION__ , len);	</div><div class='del'>-		IRDA_DEBUG(1, "%s(), RX Status = 0x%.2x,\n", __FUNCTION__ , status);</div><div class='add'>+		IRDA_DEBUG(1, "%s(), RX Length = 0x%.2x,\n", __func__ , len);</div><div class='add'>+		IRDA_DEBUG(1, "%s(), RX Status = 0x%.2x,\n", __func__ , status);</div><div class='ctx'> 		</div><div class='ctx'> 		if (st_fifo-&gt;tail &gt;= MAX_RX_WINDOW) {</div><div class='del'>-			IRDA_DEBUG(0, "%s(), window is full!\n", __FUNCTION__ );</div><div class='add'>+			IRDA_DEBUG(0, "%s(), window is full!\n", __func__ );</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 			</div><div class='hunk'>@@ -1828,7 +1828,7 @@ static int  ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)</div><div class='ctx'> 		/* Check for errors */</div><div class='ctx'> 		if ((status &amp; 0xd8) || self-&gt;rcvFramesOverflow || (len==0)) 		</div><div class='ctx'> 		{</div><div class='del'>-			IRDA_DEBUG(0,"%s(), ************* RX Errors ************ \n", __FUNCTION__ );	</div><div class='add'>+			IRDA_DEBUG(0,"%s(), ************* RX Errors ************ \n", __func__ );</div><div class='ctx'> 			</div><div class='ctx'> 			/* Skip frame */</div><div class='ctx'> 			self-&gt;stats.rx_errors++;</div><div class='hunk'>@@ -1838,29 +1838,29 @@ static int  ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)</div><div class='ctx'> 			if (status &amp; LSR_FIFO_UR) </div><div class='ctx'> 			{</div><div class='ctx'> 				self-&gt;stats.rx_frame_errors++;</div><div class='del'>-				IRDA_DEBUG(0,"%s(), ************* FIFO Errors ************ \n", __FUNCTION__ );</div><div class='add'>+				IRDA_DEBUG(0,"%s(), ************* FIFO Errors ************ \n", __func__ );</div><div class='ctx'> 			}	</div><div class='ctx'> 			if (status &amp; LSR_FRAME_ERROR)</div><div class='ctx'> 			{</div><div class='ctx'> 				self-&gt;stats.rx_frame_errors++;</div><div class='del'>-				IRDA_DEBUG(0,"%s(), ************* FRAME Errors ************ \n", __FUNCTION__ );</div><div class='add'>+				IRDA_DEBUG(0,"%s(), ************* FRAME Errors ************ \n", __func__ );</div><div class='ctx'> 			}</div><div class='ctx'> 							</div><div class='ctx'> 			if (status &amp; LSR_CRC_ERROR) </div><div class='ctx'> 			{</div><div class='ctx'> 				self-&gt;stats.rx_crc_errors++;</div><div class='del'>-				IRDA_DEBUG(0,"%s(), ************* CRC Errors ************ \n", __FUNCTION__ );</div><div class='add'>+				IRDA_DEBUG(0,"%s(), ************* CRC Errors ************ \n", __func__ );</div><div class='ctx'> 			}</div><div class='ctx'> 			</div><div class='ctx'> 			if(self-&gt;rcvFramesOverflow)</div><div class='ctx'> 			{</div><div class='ctx'> 				self-&gt;stats.rx_frame_errors++;</div><div class='del'>-				IRDA_DEBUG(0,"%s(), ************* Overran DMA buffer ************ \n", __FUNCTION__ );								</div><div class='add'>+				IRDA_DEBUG(0,"%s(), ************* Overran DMA buffer ************ \n", __func__ );</div><div class='ctx'> 			}</div><div class='ctx'> 			if(len == 0)</div><div class='ctx'> 			{</div><div class='ctx'> 				self-&gt;stats.rx_frame_errors++;</div><div class='del'>-				IRDA_DEBUG(0,"%s(), ********** Receive Frame Size = 0 ********* \n", __FUNCTION__ );</div><div class='add'>+				IRDA_DEBUG(0,"%s(), ********** Receive Frame Size = 0 ********* \n", __func__ );</div><div class='ctx'> 			}</div><div class='ctx'> 		}	 </div><div class='ctx'> 		else </div><div class='hunk'>@@ -1872,7 +1872,7 @@ static int  ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)</div><div class='ctx'> 				val = inb(iobase+FIR_BSR);	</div><div class='ctx'> 				if ((val&amp; BSR_FIFO_NOT_EMPTY)== 0x80) </div><div class='ctx'> 				{</div><div class='del'>-					IRDA_DEBUG(0, "%s(), ************* BSR_FIFO_NOT_EMPTY ************ \n", __FUNCTION__ );</div><div class='add'>+					IRDA_DEBUG(0, "%s(), ************* BSR_FIFO_NOT_EMPTY ************ \n", __func__ );</div><div class='ctx'> 					</div><div class='ctx'> 					/* Put this entry back in fifo */</div><div class='ctx'> 					st_fifo-&gt;head--;</div><div class='hunk'>@@ -1909,7 +1909,7 @@ static int  ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)</div><div class='ctx'> 			{</div><div class='ctx'> 				IRDA_WARNING("%s(), memory squeeze, "</div><div class='ctx'> 					     "dropping frame.\n",</div><div class='del'>-					     __FUNCTION__);</div><div class='add'>+					     __func__);</div><div class='ctx'> 				self-&gt;stats.rx_dropped++;</div><div class='ctx'> </div><div class='ctx'> 				return FALSE;</div><div class='hunk'>@@ -1937,7 +1937,7 @@ static int  ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)</div><div class='ctx'> 	</div><div class='ctx'> 	switch_bank(iobase, BANK0);	</div><div class='ctx'> 		</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> 	return TRUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1956,7 +1956,7 @@ static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	int iobase;</div><div class='ctx'> 	__u32 speed;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	IRDA_ASSERT(dev != NULL, return 0;);</div><div class='ctx'> 	</div><div class='hunk'>@@ -2005,7 +2005,7 @@ static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	return 0;	</div><div class='ctx'> }</div><div class='hunk'>@@ -2024,7 +2024,7 @@ static int ali_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	IRDA_ASSERT(dev != NULL, return -1;);</div><div class='ctx'> </div><div class='hunk'>@@ -2032,11 +2032,11 @@ static int ali_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return -1;);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__ , dev-&gt;name, cmd);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __func__ , dev-&gt;name, cmd);</div><div class='ctx'> 	</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCSBANDWIDTH: /* Set bandwidth */</div><div class='del'>-		IRDA_DEBUG(1, "%s(), SIOCSBANDWIDTH\n", __FUNCTION__ );</div><div class='add'>+		IRDA_DEBUG(1, "%s(), SIOCSBANDWIDTH\n", __func__ );</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This function will also be used by IrLAP to change the</div><div class='ctx'> 		 * speed, so we still must allow for speed change within</div><div class='hunk'>@@ -2050,13 +2050,13 @@ static int ali_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;self-&gt;lock, flags);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SIOCSMEDIABUSY: /* Set media busy */</div><div class='del'>-		IRDA_DEBUG(1, "%s(), SIOCSMEDIABUSY\n", __FUNCTION__ );</div><div class='add'>+		IRDA_DEBUG(1, "%s(), SIOCSMEDIABUSY\n", __func__ );</div><div class='ctx'> 		if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 		irda_device_set_media_busy(self-&gt;netdev, TRUE);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SIOCGRECEIVING: /* Check if we are receiving right now */</div><div class='del'>-		IRDA_DEBUG(2, "%s(), SIOCGRECEIVING\n", __FUNCTION__ );</div><div class='add'>+		IRDA_DEBUG(2, "%s(), SIOCGRECEIVING\n", __func__ );</div><div class='ctx'> 		/* This is protected */</div><div class='ctx'> 		irq-&gt;ifr_receiving = ali_ircc_is_receiving(self);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2064,7 +2064,7 @@ static int ali_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 		ret = -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2081,7 +2081,7 @@ static int ali_ircc_is_receiving(struct ali_ircc_cb *self)</div><div class='ctx'> 	int status = FALSE;</div><div class='ctx'> 	int iobase;		</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start -----------------\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ---------------- Start -----------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return FALSE;);</div><div class='ctx'> </div><div class='hunk'>@@ -2095,7 +2095,7 @@ static int ali_ircc_is_receiving(struct ali_ircc_cb *self)</div><div class='ctx'> 		if((inb(iobase+FIR_FIFO_FR) &amp; 0x3f) != 0) 		</div><div class='ctx'> 		{</div><div class='ctx'> 			/* We are receiving something */</div><div class='del'>-			IRDA_DEBUG(1, "%s(), We are receiving something\n", __FUNCTION__ );</div><div class='add'>+			IRDA_DEBUG(1, "%s(), We are receiving something\n", __func__ );</div><div class='ctx'> 			status = TRUE;</div><div class='ctx'> 		}</div><div class='ctx'> 		switch_bank(iobase, BANK0);		</div><div class='hunk'>@@ -2107,7 +2107,7 @@ static int ali_ircc_is_receiving(struct ali_ircc_cb *self)</div><div class='ctx'> 	</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;self-&gt;lock, flags);</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -2116,9 +2116,9 @@ static struct net_device_stats *ali_ircc_net_get_stats(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ali_ircc_cb *self = (struct ali_ircc_cb *) dev-&gt;priv;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__ );</div><div class='ctx'> 		</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	return &amp;self-&gt;stats;</div><div class='ctx'> }</div><div class='hunk'>@@ -2164,7 +2164,7 @@ static void SetCOMInterrupts(struct ali_ircc_cb *self , unsigned char enable)</div><div class='ctx'> 	</div><div class='ctx'> 	int iobase = self-&gt;io.fir_base; /* or sir_base */</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(), -------- Start -------- ( Enable = %d )\n", __FUNCTION__ , enable);	</div><div class='add'>+	IRDA_DEBUG(2, "%s(), -------- Start -------- ( Enable = %d )\n", __func__ , enable);</div><div class='ctx'> 	</div><div class='ctx'> 	/* Enable the interrupt which we wish to */</div><div class='ctx'> 	if (enable){</div><div class='hunk'>@@ -2205,14 +2205,14 @@ static void SetCOMInterrupts(struct ali_ircc_cb *self , unsigned char enable)</div><div class='ctx'> 	else</div><div class='ctx'> 		outb(newMask, iobase+UART_IER);</div><div class='ctx'> 		</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void SIR2FIR(int iobase)</div><div class='ctx'> {</div><div class='ctx'> 	//unsigned char tmp;</div><div class='ctx'> 		</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	/* Already protected (change_speed() or setup()), no need to lock.</div><div class='ctx'> 	 * Jean II */</div><div class='hunk'>@@ -2228,14 +2228,14 @@ static void SIR2FIR(int iobase)</div><div class='ctx'> 	//tmp |= 0x20;</div><div class='ctx'> 	//outb(tmp, iobase+FIR_LCR_B);	</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void FIR2SIR(int iobase)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	/* Already protected (change_speed() or setup()), no need to lock.</div><div class='ctx'> 	 * Jean II */</div><div class='hunk'>@@ -2251,7 +2251,7 @@ static void FIR2SIR(int iobase)</div><div class='ctx'> 	val = inb(iobase+UART_LSR);</div><div class='ctx'> 	val = inb(iobase+UART_MSR);</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __func__ );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Benjamin Kong &lt;benjamin_kong@ali.com.tw&gt;");</div><div class='head'>diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c<br/>index 34ad189fff67..69d16b30323b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/donauboe.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/donauboe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/donauboe.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/donauboe.c</a></div><div class='hunk'>@@ -245,7 +245,7 @@ toshoboe_dumpregs (struct toshoboe_cb *self)</div><div class='ctx'> {</div><div class='ctx'>   __u32 ringbase;</div><div class='ctx'> </div><div class='del'>-  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);</div><div class='add'>+  IRDA_DEBUG (4, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'>   ringbase = INB (OBOE_RING_BASE0) &lt;&lt; 10;</div><div class='ctx'>   ringbase |= INB (OBOE_RING_BASE1) &lt;&lt; 18;</div><div class='hunk'>@@ -293,7 +293,7 @@ static void</div><div class='ctx'> toshoboe_disablebm (struct toshoboe_cb *self)</div><div class='ctx'> {</div><div class='ctx'>   __u8 command;</div><div class='del'>-  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);</div><div class='add'>+  IRDA_DEBUG (4, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'>   pci_read_config_byte (self-&gt;pdev, PCI_COMMAND, &amp;command);</div><div class='ctx'>   command &amp;= ~PCI_COMMAND_MASTER;</div><div class='hunk'>@@ -305,7 +305,7 @@ toshoboe_disablebm (struct toshoboe_cb *self)</div><div class='ctx'> static void</div><div class='ctx'> toshoboe_stopchip (struct toshoboe_cb *self)</div><div class='ctx'> {</div><div class='del'>-  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);</div><div class='add'>+  IRDA_DEBUG (4, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'>   /*Disable interrupts */</div><div class='ctx'>   OUTB (0x0, OBOE_IER);</div><div class='hunk'>@@ -350,7 +350,7 @@ toshoboe_setbaud (struct toshoboe_cb *self)</div><div class='ctx'>   __u16 pconfig = 0;</div><div class='ctx'>   __u8 config0l = 0;</div><div class='ctx'> </div><div class='del'>-  IRDA_DEBUG (2, "%s(%d/%d)\n", __FUNCTION__, self-&gt;speed, self-&gt;io.speed);</div><div class='add'>+  IRDA_DEBUG (2, "%s(%d/%d)\n", __func__, self-&gt;speed, self-&gt;io.speed);</div><div class='ctx'> </div><div class='ctx'>   switch (self-&gt;speed)</div><div class='ctx'>     {</div><div class='hunk'>@@ -482,7 +482,7 @@ toshoboe_setbaud (struct toshoboe_cb *self)</div><div class='ctx'> static void</div><div class='ctx'> toshoboe_enablebm (struct toshoboe_cb *self)</div><div class='ctx'> {</div><div class='del'>-  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);</div><div class='add'>+  IRDA_DEBUG (4, "%s()\n", __func__);</div><div class='ctx'>   pci_set_master (self-&gt;pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -492,7 +492,7 @@ toshoboe_initring (struct toshoboe_cb *self)</div><div class='ctx'> {</div><div class='ctx'>   int i;</div><div class='ctx'> </div><div class='del'>-  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);</div><div class='add'>+  IRDA_DEBUG (4, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'>   for (i = 0; i &lt; TX_SLOTS; ++i)</div><div class='ctx'>     {</div><div class='hunk'>@@ -550,7 +550,7 @@ toshoboe_startchip (struct toshoboe_cb *self)</div><div class='ctx'> {</div><div class='ctx'>   __u32 physaddr;</div><div class='ctx'> </div><div class='del'>-  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);</div><div class='add'>+  IRDA_DEBUG (4, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'>   toshoboe_initring (self);</div><div class='ctx'>   toshoboe_enablebm (self);</div><div class='hunk'>@@ -824,7 +824,7 @@ toshoboe_probe (struct toshoboe_cb *self)</div><div class='ctx'> #endif</div><div class='ctx'>   unsigned long flags;</div><div class='ctx'> </div><div class='del'>-  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);</div><div class='add'>+  IRDA_DEBUG (4, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'>   if (request_irq (self-&gt;io.irq, toshoboe_probeinterrupt,</div><div class='ctx'>                    self-&gt;io.irqflags, "toshoboe", (void *) self))</div><div class='hunk'>@@ -983,10 +983,10 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'>   IRDA_ASSERT (self != NULL, return 0; );</div><div class='ctx'> </div><div class='del'>-  IRDA_DEBUG (1, "%s.tx:%x(%x)%x\n", __FUNCTION__</div><div class='add'>+  IRDA_DEBUG (1, "%s.tx:%x(%x)%x\n", __func__</div><div class='ctx'>       ,skb-&gt;len,self-&gt;txpending,INB (OBOE_ENABLEH));</div><div class='ctx'>   if (!cb-&gt;magic) {</div><div class='del'>-      IRDA_DEBUG (2, "%s.Not IrLAP:%x\n", __FUNCTION__, cb-&gt;magic);</div><div class='add'>+      IRDA_DEBUG (2, "%s.Not IrLAP:%x\n", __func__, cb-&gt;magic);</div><div class='ctx'> #ifdef DUMP_PACKETS</div><div class='ctx'>       _dumpbufs(skb-&gt;data,skb-&gt;len,'&gt;');</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1015,7 +1015,7 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'>         {</div><div class='ctx'>           self-&gt;new_speed = speed;</div><div class='ctx'>           IRDA_DEBUG (1, "%s: Queued TxDone scheduled speed change %d\n" ,</div><div class='del'>-		      __FUNCTION__, speed);</div><div class='add'>+		      __func__, speed);</div><div class='ctx'>           /* if no data, that's all! */</div><div class='ctx'>           if (!skb-&gt;len)</div><div class='ctx'>             {</div><div class='hunk'>@@ -1057,7 +1057,7 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'>       /* which we will add a wrong checksum to */</div><div class='ctx'> </div><div class='ctx'>       mtt = toshoboe_makemttpacket (self, self-&gt;tx_bufs[self-&gt;txs], mtt);</div><div class='del'>-      IRDA_DEBUG (1, "%s.mtt:%x(%x)%d\n", __FUNCTION__</div><div class='add'>+      IRDA_DEBUG (1, "%s.mtt:%x(%x)%d\n", __func__</div><div class='ctx'>           ,skb-&gt;len,mtt,self-&gt;txpending);</div><div class='ctx'>       if (mtt)</div><div class='ctx'>         {</div><div class='hunk'>@@ -1101,7 +1101,7 @@ dumpbufs(skb-&gt;data,skb-&gt;len,'&gt;');</div><div class='ctx'> </div><div class='ctx'>   if (self-&gt;ring-&gt;tx[self-&gt;txs].control &amp; OBOE_CTL_TX_HW_OWNS)</div><div class='ctx'>     {</div><div class='del'>-      IRDA_DEBUG (0, "%s.ful:%x(%x)%x\n", __FUNCTION__</div><div class='add'>+      IRDA_DEBUG (0, "%s.ful:%x(%x)%x\n", __func__</div><div class='ctx'>           ,skb-&gt;len, self-&gt;ring-&gt;tx[self-&gt;txs].control, self-&gt;txpending);</div><div class='ctx'>       toshoboe_start_DMA(self, OBOE_CONFIG0H_ENTX);</div><div class='ctx'>       spin_unlock_irqrestore(&amp;self-&gt;spinlock, flags);</div><div class='hunk'>@@ -1179,7 +1179,7 @@ toshoboe_interrupt (int irq, void *dev_id)</div><div class='ctx'>           if (self-&gt;ring-&gt;tx[i].control &amp; OBOE_CTL_TX_HW_OWNS)</div><div class='ctx'>               self-&gt;txpending++;</div><div class='ctx'>         }</div><div class='del'>-      IRDA_DEBUG (1, "%s.txd(%x)%x/%x\n", __FUNCTION__</div><div class='add'>+      IRDA_DEBUG (1, "%s.txd(%x)%x/%x\n", __func__</div><div class='ctx'>           ,irqstat,txp,self-&gt;txpending);</div><div class='ctx'> </div><div class='ctx'>       txp = INB (OBOE_TXSLOT) &amp; OBOE_SLOT_MASK;</div><div class='hunk'>@@ -1209,7 +1209,7 @@ toshoboe_interrupt (int irq, void *dev_id)</div><div class='ctx'>         {</div><div class='ctx'>           self-&gt;speed = self-&gt;new_speed;</div><div class='ctx'>           IRDA_DEBUG (1, "%s: Executed TxDone scheduled speed change %d\n",</div><div class='del'>-		      __FUNCTION__, self-&gt;speed);</div><div class='add'>+		      __func__, self-&gt;speed);</div><div class='ctx'>           toshoboe_setbaud (self);</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='hunk'>@@ -1224,7 +1224,7 @@ toshoboe_interrupt (int irq, void *dev_id)</div><div class='ctx'>         {</div><div class='ctx'>           int len = self-&gt;ring-&gt;rx[self-&gt;rxs].len;</div><div class='ctx'>           skb = NULL;</div><div class='del'>-          IRDA_DEBUG (3, "%s.rcv:%x(%x)\n", __FUNCTION__</div><div class='add'>+          IRDA_DEBUG (3, "%s.rcv:%x(%x)\n", __func__</div><div class='ctx'> 		      ,len,self-&gt;ring-&gt;rx[self-&gt;rxs].control);</div><div class='ctx'> </div><div class='ctx'> #ifdef DUMP_PACKETS</div><div class='hunk'>@@ -1246,7 +1246,7 @@ dumpbufs(self-&gt;rx_bufs[self-&gt;rxs],len,'&lt;');</div><div class='ctx'>                       len -= 2;</div><div class='ctx'>                   else</div><div class='ctx'>                       len = 0;</div><div class='del'>-                  IRDA_DEBUG (1, "%s.SIR:%x(%x)\n", __FUNCTION__, len,enable);</div><div class='add'>+                  IRDA_DEBUG (1, "%s.SIR:%x(%x)\n", __func__, len,enable);</div><div class='ctx'>                 }</div><div class='ctx'> </div><div class='ctx'> #ifdef USE_MIR</div><div class='hunk'>@@ -1256,7 +1256,7 @@ dumpbufs(self-&gt;rx_bufs[self-&gt;rxs],len,'&lt;');</div><div class='ctx'>                       len -= 2;</div><div class='ctx'>                   else</div><div class='ctx'>                       len = 0;</div><div class='del'>-                  IRDA_DEBUG (2, "%s.MIR:%x(%x)\n", __FUNCTION__, len,enable);</div><div class='add'>+                  IRDA_DEBUG (2, "%s.MIR:%x(%x)\n", __func__, len,enable);</div><div class='ctx'>                 }</div><div class='ctx'> #endif</div><div class='ctx'>               else if (enable &amp; OBOE_ENABLEH_FIRON)</div><div class='hunk'>@@ -1265,10 +1265,10 @@ dumpbufs(self-&gt;rx_bufs[self-&gt;rxs],len,'&lt;');</div><div class='ctx'>                       len -= 4;   /*FIXME: check this */</div><div class='ctx'>                   else</div><div class='ctx'>                       len = 0;</div><div class='del'>-                  IRDA_DEBUG (1, "%s.FIR:%x(%x)\n", __FUNCTION__, len,enable);</div><div class='add'>+                  IRDA_DEBUG (1, "%s.FIR:%x(%x)\n", __func__, len,enable);</div><div class='ctx'>                 }</div><div class='ctx'>               else</div><div class='del'>-                  IRDA_DEBUG (0, "%s.?IR:%x(%x)\n", __FUNCTION__, len,enable);</div><div class='add'>+                  IRDA_DEBUG (0, "%s.?IR:%x(%x)\n", __func__, len,enable);</div><div class='ctx'> </div><div class='ctx'>               if (len)</div><div class='ctx'>                 {</div><div class='hunk'>@@ -1289,7 +1289,7 @@ dumpbufs(self-&gt;rx_bufs[self-&gt;rxs],len,'&lt;');</div><div class='ctx'>                     {</div><div class='ctx'>                       printk (KERN_INFO</div><div class='ctx'>                               "%s(), memory squeeze, dropping frame.\n",</div><div class='del'>-			      __FUNCTION__);</div><div class='add'>+			      __func__);</div><div class='ctx'>                     }</div><div class='ctx'>                 }</div><div class='ctx'>             }</div><div class='hunk'>@@ -1301,7 +1301,7 @@ dumpbufs(self-&gt;rx_bufs[self-&gt;rxs],len,'&lt;');</div><div class='ctx'>             /* (SIR) data is splitted in several slots. */</div><div class='ctx'>             /* we have to join all the received buffers received */</div><div class='ctx'>             /*in a large buffer before checking CRC. */</div><div class='del'>-            IRDA_DEBUG (0, "%s.err:%x(%x)\n", __FUNCTION__</div><div class='add'>+            IRDA_DEBUG (0, "%s.err:%x(%x)\n", __func__</div><div class='ctx'>                 ,len,self-&gt;ring-&gt;rx[self-&gt;rxs].control);</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='hunk'>@@ -1329,7 +1329,7 @@ dumpbufs(self-&gt;rx_bufs[self-&gt;rxs],len,'&lt;');</div><div class='ctx'>   if (irqstat &amp; OBOE_INT_SIP)</div><div class='ctx'>     {</div><div class='ctx'>       self-&gt;int_sip++;</div><div class='del'>-      IRDA_DEBUG (1, "%s.sip:%x(%x)%x\n", __FUNCTION__</div><div class='add'>+      IRDA_DEBUG (1, "%s.sip:%x(%x)%x\n", __func__</div><div class='ctx'> 	      ,self-&gt;int_sip,irqstat,self-&gt;txpending);</div><div class='ctx'>     }</div><div class='ctx'>   return IRQ_HANDLED;</div><div class='hunk'>@@ -1343,7 +1343,7 @@ toshoboe_net_open (struct net_device *dev)</div><div class='ctx'>   unsigned long flags;</div><div class='ctx'>   int rc;</div><div class='ctx'> </div><div class='del'>-  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);</div><div class='add'>+  IRDA_DEBUG (4, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'>   self = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1381,7 +1381,7 @@ toshoboe_net_close (struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>   struct toshoboe_cb *self;</div><div class='ctx'> </div><div class='del'>-  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);</div><div class='add'>+  IRDA_DEBUG (4, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'>   IRDA_ASSERT (dev != NULL, return -1; );</div><div class='ctx'>   self = (struct toshoboe_cb *) dev-&gt;priv;</div><div class='hunk'>@@ -1426,7 +1426,7 @@ toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> </div><div class='ctx'>   IRDA_ASSERT (self != NULL, return -1; );</div><div class='ctx'> </div><div class='del'>-  IRDA_DEBUG (5, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__, dev-&gt;name, cmd);</div><div class='add'>+  IRDA_DEBUG (5, "%s(), %s, (cmd=0x%X)\n", __func__, dev-&gt;name, cmd);</div><div class='ctx'> </div><div class='ctx'>   /* Disable interrupts &amp; save flags */</div><div class='ctx'>   spin_lock_irqsave(&amp;self-&gt;spinlock, flags);</div><div class='hunk'>@@ -1438,7 +1438,7 @@ toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'>        * speed, so we still must allow for speed change within</div><div class='ctx'>        * interrupt context.</div><div class='ctx'>        */</div><div class='del'>-      IRDA_DEBUG (1, "%s(BANDWIDTH), %s, (%X/%ld\n", __FUNCTION__</div><div class='add'>+      IRDA_DEBUG (1, "%s(BANDWIDTH), %s, (%X/%ld\n", __func__</div><div class='ctx'>           ,dev-&gt;name, INB (OBOE_STATUS), irq-&gt;ifr_baudrate );</div><div class='ctx'>       if (!in_interrupt () &amp;&amp; !capable (CAP_NET_ADMIN)) {</div><div class='ctx'> 	ret = -EPERM;</div><div class='hunk'>@@ -1451,7 +1451,7 @@ toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'>       self-&gt;new_speed = irq-&gt;ifr_baudrate;</div><div class='ctx'>       break;</div><div class='ctx'>     case SIOCSMEDIABUSY:       /* Set media busy */</div><div class='del'>-      IRDA_DEBUG (1, "%s(MEDIABUSY), %s, (%X/%x)\n", __FUNCTION__</div><div class='add'>+      IRDA_DEBUG (1, "%s(MEDIABUSY), %s, (%X/%x)\n", __func__</div><div class='ctx'>           ,dev-&gt;name, INB (OBOE_STATUS), capable (CAP_NET_ADMIN) );</div><div class='ctx'>       if (!capable (CAP_NET_ADMIN)) {</div><div class='ctx'> 	ret = -EPERM;</div><div class='hunk'>@@ -1461,11 +1461,11 @@ toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'>       break;</div><div class='ctx'>     case SIOCGRECEIVING:       /* Check if we are receiving right now */</div><div class='ctx'>       irq-&gt;ifr_receiving = (INB (OBOE_STATUS) &amp; OBOE_STATUS_RXBUSY) ? 1 : 0;</div><div class='del'>-      IRDA_DEBUG (3, "%s(RECEIVING), %s, (%X/%x)\n", __FUNCTION__</div><div class='add'>+      IRDA_DEBUG (3, "%s(RECEIVING), %s, (%X/%x)\n", __func__</div><div class='ctx'>           ,dev-&gt;name, INB (OBOE_STATUS), irq-&gt;ifr_receiving );</div><div class='ctx'>       break;</div><div class='ctx'>     default:</div><div class='del'>-      IRDA_DEBUG (1, "%s(?), %s, (cmd=0x%X)\n", __FUNCTION__, dev-&gt;name, cmd);</div><div class='add'>+      IRDA_DEBUG (1, "%s(?), %s, (cmd=0x%X)\n", __func__, dev-&gt;name, cmd);</div><div class='ctx'>       ret = -EOPNOTSUPP;</div><div class='ctx'>     }</div><div class='ctx'> out:</div><div class='hunk'>@@ -1492,7 +1492,7 @@ toshoboe_close (struct pci_dev *pci_dev)</div><div class='ctx'>   int i;</div><div class='ctx'>   struct toshoboe_cb *self = (struct toshoboe_cb*)pci_get_drvdata(pci_dev);</div><div class='ctx'> </div><div class='del'>-  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);</div><div class='add'>+  IRDA_DEBUG (4, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'>   IRDA_ASSERT (self != NULL, return; );</div><div class='ctx'> </div><div class='hunk'>@@ -1533,7 +1533,7 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)</div><div class='ctx'>   int ok = 0;</div><div class='ctx'>   int err;</div><div class='ctx'> </div><div class='del'>-  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);</div><div class='add'>+  IRDA_DEBUG (4, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'>   if ((err=pci_enable_device(pci_dev)))</div><div class='ctx'>     return err;</div><div class='hunk'>@@ -1700,7 +1700,7 @@ toshoboe_gotosleep (struct pci_dev *pci_dev, pm_message_t crap)</div><div class='ctx'>   unsigned long flags;</div><div class='ctx'>   int i = 10;</div><div class='ctx'> </div><div class='del'>-  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);</div><div class='add'>+  IRDA_DEBUG (4, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'>   if (!self || self-&gt;stopped)</div><div class='ctx'>     return 0;</div><div class='hunk'>@@ -1728,7 +1728,7 @@ toshoboe_wakeup (struct pci_dev *pci_dev)</div><div class='ctx'>   struct toshoboe_cb *self = (struct toshoboe_cb*)pci_get_drvdata(pci_dev);</div><div class='ctx'>   unsigned long flags;</div><div class='ctx'> </div><div class='del'>-  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);</div><div class='add'>+  IRDA_DEBUG (4, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'>   if (!self || !self-&gt;stopped)</div><div class='ctx'>     return 0;</div><div class='head'>diff --git a/drivers/net/irda/ep7211-sir.c b/drivers/net/irda/ep7211-sir.c<br/>index 831572429bb9..f83c5b881d2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/ep7211-sir.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/ep7211-sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/ep7211-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/ep7211-sir.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;net/irda/irda_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sir-dev.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/irda/girbil-sir.c b/drivers/net/irda/girbil-sir.c<br/>index 738531b16bd3..a31b8fa8aaa9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/girbil-sir.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/girbil-sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/girbil-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/girbil-sir.c</a></div><div class='hunk'>@@ -86,7 +86,7 @@ static int girbil_open(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct qos_info *qos = &amp;dev-&gt;qos;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Power on dongle */</div><div class='ctx'> 	sirdev_set_dtr_rts(dev, TRUE, TRUE);</div><div class='hunk'>@@ -102,7 +102,7 @@ static int girbil_open(struct sir_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static int girbil_close(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Power off dongle */</div><div class='ctx'> 	sirdev_set_dtr_rts(dev, FALSE, FALSE);</div><div class='hunk'>@@ -126,7 +126,7 @@ static int girbil_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> 	u8 control[2];</div><div class='ctx'> 	static int ret = 0;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* dongle alread reset - port and dongle at default speed */</div><div class='ctx'> </div><div class='hunk'>@@ -179,7 +179,7 @@ static int girbil_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		IRDA_ERROR("%s - undefined state %d\n", __FUNCTION__, state);</div><div class='add'>+		IRDA_ERROR("%s - undefined state %d\n", __func__, state);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -209,7 +209,7 @@ static int girbil_reset(struct sir_dev *dev)</div><div class='ctx'> 	u8 control = GIRBIL_TXEN | GIRBIL_RXEN;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	switch (state) {</div><div class='ctx'> 	case SIRDEV_STATE_DONGLE_RESET:</div><div class='hunk'>@@ -241,7 +241,7 @@ static int girbil_reset(struct sir_dev *dev)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		IRDA_ERROR("%s(), undefined state %d\n", __FUNCTION__, state);</div><div class='add'>+		IRDA_ERROR("%s(), undefined state %d\n", __func__, state);</div><div class='ctx'> 		ret = -1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c<br/>index 18b471cd1447..b5d6b9ac162a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/irda-usb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/irda-usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/irda-usb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/irda-usb.c</a></div><div class='hunk'>@@ -177,12 +177,12 @@ static void irda_usb_build_header(struct irda_usb_cb *self,</div><div class='ctx'> 		    (!force) &amp;&amp; (self-&gt;speed != -1)) {</div><div class='ctx'> 			/* No speed and xbofs change here</div><div class='ctx'> 			 * (we'll do it later in the write callback) */</div><div class='del'>-			IRDA_DEBUG(2, "%s(), not changing speed yet\n", __FUNCTION__);</div><div class='add'>+			IRDA_DEBUG(2, "%s(), not changing speed yet\n", __func__);</div><div class='ctx'> 			*header = 0;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		IRDA_DEBUG(2, "%s(), changing speed to %d\n", __FUNCTION__, self-&gt;new_speed);</div><div class='add'>+		IRDA_DEBUG(2, "%s(), changing speed to %d\n", __func__, self-&gt;new_speed);</div><div class='ctx'> 		self-&gt;speed = self-&gt;new_speed;</div><div class='ctx'> 		/* We will do ` self-&gt;new_speed = -1; ' in the completion</div><div class='ctx'> 		 * handler just in case the current URB fail - Jean II */</div><div class='hunk'>@@ -228,7 +228,7 @@ static void irda_usb_build_header(struct irda_usb_cb *self,</div><div class='ctx'> 	</div><div class='ctx'> 	/* Set the negotiated additional XBOFS */</div><div class='ctx'> 	if (self-&gt;new_xbofs != -1) {</div><div class='del'>-		IRDA_DEBUG(2, "%s(), changing xbofs to %d\n", __FUNCTION__, self-&gt;new_xbofs);</div><div class='add'>+		IRDA_DEBUG(2, "%s(), changing xbofs to %d\n", __func__, self-&gt;new_xbofs);</div><div class='ctx'> 		self-&gt;xbofs = self-&gt;new_xbofs;</div><div class='ctx'> 		/* We will do ` self-&gt;new_xbofs = -1; ' in the completion</div><div class='ctx'> 		 * handler just in case the current URB fail - Jean II */</div><div class='hunk'>@@ -302,13 +302,13 @@ static void irda_usb_change_speed_xbofs(struct irda_usb_cb *self)</div><div class='ctx'> 	struct urb *urb;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(), speed=%d, xbofs=%d\n", __FUNCTION__,</div><div class='add'>+	IRDA_DEBUG(2, "%s(), speed=%d, xbofs=%d\n", __func__,</div><div class='ctx'> 		   self-&gt;new_speed, self-&gt;new_xbofs);</div><div class='ctx'> </div><div class='ctx'> 	/* Grab the speed URB */</div><div class='ctx'> 	urb = self-&gt;speed_urb;</div><div class='ctx'> 	if (urb-&gt;status != 0) {</div><div class='del'>-		IRDA_WARNING("%s(), URB still in use!\n", __FUNCTION__);</div><div class='add'>+		IRDA_WARNING("%s(), URB still in use!\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -334,7 +334,7 @@ static void irda_usb_change_speed_xbofs(struct irda_usb_cb *self)</div><div class='ctx'> </div><div class='ctx'> 	/* Irq disabled -&gt; GFP_ATOMIC */</div><div class='ctx'> 	if ((ret = usb_submit_urb(urb, GFP_ATOMIC))) {</div><div class='del'>-		IRDA_WARNING("%s(), failed Speed URB\n", __FUNCTION__);</div><div class='add'>+		IRDA_WARNING("%s(), failed Speed URB\n", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -347,7 +347,7 @@ static void speed_bulk_callback(struct urb *urb)</div><div class='ctx'> {</div><div class='ctx'> 	struct irda_usb_cb *self = urb-&gt;context;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* We should always have a context */</div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return;);</div><div class='hunk'>@@ -357,7 +357,7 @@ static void speed_bulk_callback(struct urb *urb)</div><div class='ctx'> 	/* Check for timeout and other USB nasties */</div><div class='ctx'> 	if (urb-&gt;status != 0) {</div><div class='ctx'> 		/* I get a lot of -ECONNABORTED = -103 here - Jean II */</div><div class='del'>-		IRDA_DEBUG(0, "%s(), URB complete status %d, transfer_flags 0x%04X\n", __FUNCTION__, urb-&gt;status, urb-&gt;transfer_flags);</div><div class='add'>+		IRDA_DEBUG(0, "%s(), URB complete status %d, transfer_flags 0x%04X\n", __func__, urb-&gt;status, urb-&gt;transfer_flags);</div><div class='ctx'> </div><div class='ctx'> 		/* Don't do anything here, that might confuse the USB layer.</div><div class='ctx'> 		 * Instead, we will wait for irda_usb_net_timeout(), the</div><div class='hunk'>@@ -392,7 +392,7 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	int res, mtt;</div><div class='ctx'> 	int	err = 1;	/* Failed */</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(4, "%s() on %s\n", __FUNCTION__, netdev-&gt;name);</div><div class='add'>+	IRDA_DEBUG(4, "%s() on %s\n", __func__, netdev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -403,7 +403,7 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	 * We need to check self-&gt;present under the spinlock because</div><div class='ctx'> 	 * of irda_usb_disconnect() is synchronous - Jean II */</div><div class='ctx'> 	if (!self-&gt;present) {</div><div class='del'>-		IRDA_DEBUG(0, "%s(), Device is gone...\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(0, "%s(), Device is gone...\n", __func__);</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -437,7 +437,7 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;status != 0) {</div><div class='del'>-		IRDA_WARNING("%s(), URB still in use!\n", __FUNCTION__);</div><div class='add'>+		IRDA_WARNING("%s(), URB still in use!\n", __func__);</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -524,7 +524,7 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	</div><div class='ctx'> 	/* Ask USB to send the packet - Irq disabled -&gt; GFP_ATOMIC */</div><div class='ctx'> 	if ((res = usb_submit_urb(urb, GFP_ATOMIC))) {</div><div class='del'>-		IRDA_WARNING("%s(), failed Tx URB\n", __FUNCTION__);</div><div class='add'>+		IRDA_WARNING("%s(), failed Tx URB\n", __func__);</div><div class='ctx'> 		self-&gt;stats.tx_errors++;</div><div class='ctx'> 		/* Let USB recover : We will catch that in the watchdog */</div><div class='ctx'> 		/*netif_start_queue(netdev);*/</div><div class='hunk'>@@ -556,7 +556,7 @@ static void write_bulk_callback(struct urb *urb)</div><div class='ctx'> 	struct sk_buff *skb = urb-&gt;context;</div><div class='ctx'> 	struct irda_usb_cb *self = ((struct irda_skb_cb *) skb-&gt;cb)-&gt;context;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* We should always have a context */</div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return;);</div><div class='hunk'>@@ -570,7 +570,7 @@ static void write_bulk_callback(struct urb *urb)</div><div class='ctx'> 	/* Check for timeout and other USB nasties */</div><div class='ctx'> 	if (urb-&gt;status != 0) {</div><div class='ctx'> 		/* I get a lot of -ECONNABORTED = -103 here - Jean II */</div><div class='del'>-		IRDA_DEBUG(0, "%s(), URB complete status %d, transfer_flags 0x%04X\n", __FUNCTION__, urb-&gt;status, urb-&gt;transfer_flags);</div><div class='add'>+		IRDA_DEBUG(0, "%s(), URB complete status %d, transfer_flags 0x%04X\n", __func__, urb-&gt;status, urb-&gt;transfer_flags);</div><div class='ctx'> </div><div class='ctx'> 		/* Don't do anything here, that might confuse the USB layer,</div><div class='ctx'> 		 * and we could go in recursion and blow the kernel stack...</div><div class='hunk'>@@ -589,7 +589,7 @@ static void write_bulk_callback(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	/* If the network is closed, stop everything */</div><div class='ctx'> 	if ((!self-&gt;netopen) || (!self-&gt;present)) {</div><div class='del'>-		IRDA_DEBUG(0, "%s(), Network is gone...\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(0, "%s(), Network is gone...\n", __func__);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;self-&gt;lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -600,7 +600,7 @@ static void write_bulk_callback(struct urb *urb)</div><div class='ctx'> 		    (self-&gt;new_xbofs != self-&gt;xbofs)) {</div><div class='ctx'> 			/* We haven't changed speed yet (because of</div><div class='ctx'> 			 * IUC_SPEED_BUG), so do it now - Jean II */</div><div class='del'>-			IRDA_DEBUG(1, "%s(), Changing speed now...\n", __FUNCTION__);</div><div class='add'>+			IRDA_DEBUG(1, "%s(), Changing speed now...\n", __func__);</div><div class='ctx'> 			irda_usb_change_speed_xbofs(self);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* New speed and xbof is now commited in hardware */</div><div class='hunk'>@@ -632,7 +632,7 @@ static void irda_usb_net_timeout(struct net_device *netdev)</div><div class='ctx'> 	struct urb *urb;</div><div class='ctx'> 	int	done = 0;	/* If we have made any progress */</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(0, "%s(), Network layer thinks we timed out!\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(0, "%s(), Network layer thinks we timed out!\n", __func__);</div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return;);</div><div class='ctx'> </div><div class='ctx'> 	/* Protect us from USB callbacks, net Tx and else. */</div><div class='hunk'>@@ -640,7 +640,7 @@ static void irda_usb_net_timeout(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	/* self-&gt;present *MUST* be read under spinlock */</div><div class='ctx'> 	if (!self-&gt;present) {</div><div class='del'>-		IRDA_WARNING("%s(), device not present!\n", __FUNCTION__);</div><div class='add'>+		IRDA_WARNING("%s(), device not present!\n", __func__);</div><div class='ctx'> 		netif_stop_queue(netdev);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;self-&gt;lock, flags);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -763,7 +763,7 @@ static void irda_usb_submit(struct irda_usb_cb *self, struct sk_buff *skb, struc</div><div class='ctx'> 	struct irda_skb_cb *cb;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* This should never happen */</div><div class='ctx'> 	IRDA_ASSERT(skb != NULL, return;);</div><div class='hunk'>@@ -786,7 +786,7 @@ static void irda_usb_submit(struct irda_usb_cb *self, struct sk_buff *skb, struc</div><div class='ctx'> 		/* If this ever happen, we are in deep s***.</div><div class='ctx'> 		 * Basically, the Rx path will stop... */</div><div class='ctx'> 		IRDA_WARNING("%s(), Failed to submit Rx URB %d\n",</div><div class='del'>-			     __FUNCTION__, ret);</div><div class='add'>+			     __func__, ret);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -807,7 +807,7 @@ static void irda_usb_receive(struct urb *urb)</div><div class='ctx'> 	struct urb *next_urb;</div><div class='ctx'> 	unsigned int len, docopy;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(), len=%d\n", __FUNCTION__, urb-&gt;actual_length);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), len=%d\n", __func__, urb-&gt;actual_length);</div><div class='ctx'> 	</div><div class='ctx'> 	/* Find ourselves */</div><div class='ctx'> 	cb = (struct irda_skb_cb *) skb-&gt;cb;</div><div class='hunk'>@@ -817,7 +817,7 @@ static void irda_usb_receive(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	/* If the network is closed or the device gone, stop everything */</div><div class='ctx'> 	if ((!self-&gt;netopen) || (!self-&gt;present)) {</div><div class='del'>-		IRDA_DEBUG(0, "%s(), Network is gone!\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(0, "%s(), Network is gone!\n", __func__);</div><div class='ctx'> 		/* Don't re-submit the URB : will stall the Rx path */</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -840,7 +840,7 @@ static void irda_usb_receive(struct urb *urb)</div><div class='ctx'> 			/* Usually precursor to a hot-unplug on OHCI. */</div><div class='ctx'> 		default:</div><div class='ctx'> 			self-&gt;stats.rx_errors++;</div><div class='del'>-			IRDA_DEBUG(0, "%s(), RX status %d, transfer_flags 0x%04X \n", __FUNCTION__, urb-&gt;status, urb-&gt;transfer_flags);</div><div class='add'>+			IRDA_DEBUG(0, "%s(), RX status %d, transfer_flags 0x%04X \n", __func__, urb-&gt;status, urb-&gt;transfer_flags);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* If we received an error, we don't want to resubmit the</div><div class='hunk'>@@ -861,7 +861,7 @@ static void irda_usb_receive(struct urb *urb)</div><div class='ctx'> 	</div><div class='ctx'> 	/* Check for empty frames */</div><div class='ctx'> 	if (urb-&gt;actual_length &lt;= self-&gt;header_length) {</div><div class='del'>-		IRDA_WARNING("%s(), empty frame!\n", __FUNCTION__);</div><div class='add'>+		IRDA_WARNING("%s(), empty frame!\n", __func__);</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -967,7 +967,7 @@ static void irda_usb_rx_defer_expired(unsigned long data)</div><div class='ctx'> 	struct irda_skb_cb *cb;</div><div class='ctx'> 	struct urb *next_urb;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Find ourselves */</div><div class='ctx'> 	cb = (struct irda_skb_cb *) skb-&gt;cb;</div><div class='hunk'>@@ -1053,7 +1053,7 @@ static int stir421x_fw_upload(struct irda_usb_cb *self,</div><div class='ctx'> 				   patch_block, block_size,</div><div class='ctx'> 				   &amp;actual_len, msecs_to_jiffies(500));</div><div class='ctx'> 		IRDA_DEBUG(3,"%s(): Bulk send %u bytes, ret=%d\n",</div><div class='del'>-			   __FUNCTION__, actual_len, ret);</div><div class='add'>+			   __func__, actual_len, ret);</div><div class='ctx'> </div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1092,7 +1092,7 @@ static int stir421x_patch_device(struct irda_usb_cb *self)</div><div class='ctx'> </div><div class='ctx'>         /* We get a patch from userspace */</div><div class='ctx'>         IRDA_MESSAGE("%s(): Received firmware %s (%zu bytes)\n",</div><div class='del'>-                     __FUNCTION__, stir421x_fw_name, fw-&gt;size);</div><div class='add'>+                     __func__, stir421x_fw_name, fw-&gt;size);</div><div class='ctx'> </div><div class='ctx'>         ret = -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1116,7 +1116,7 @@ static int stir421x_patch_device(struct irda_usb_cb *self)</div><div class='ctx'> 				+ (build % 10);</div><div class='ctx'> </div><div class='ctx'> 			IRDA_DEBUG(3, "%s(): Firmware Product version %ld\n",</div><div class='del'>-                                   __FUNCTION__, fw_version);</div><div class='add'>+                                   __func__, fw_version);</div><div class='ctx'>                 }</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='hunk'>@@ -1172,7 +1172,7 @@ static int irda_usb_net_open(struct net_device *netdev)</div><div class='ctx'> 	char	hwname[16];</div><div class='ctx'> 	int i;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(netdev != NULL, return -1;);</div><div class='ctx'> 	self = (struct irda_usb_cb *) netdev-&gt;priv;</div><div class='hunk'>@@ -1182,13 +1182,13 @@ static int irda_usb_net_open(struct net_device *netdev)</div><div class='ctx'> 	/* Can only open the device if it's there */</div><div class='ctx'> 	if(!self-&gt;present) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;self-&gt;lock, flags);</div><div class='del'>-		IRDA_WARNING("%s(), device not present!\n", __FUNCTION__);</div><div class='add'>+		IRDA_WARNING("%s(), device not present!\n", __func__);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if(self-&gt;needspatch) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;self-&gt;lock, flags);</div><div class='del'>-		IRDA_WARNING("%s(), device needs patch\n", __FUNCTION__) ;</div><div class='add'>+		IRDA_WARNING("%s(), device needs patch\n", __func__) ;</div><div class='ctx'> 		return -EIO ;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1231,7 +1231,7 @@ static int irda_usb_net_open(struct net_device *netdev)</div><div class='ctx'> 			/* If this ever happen, we are in deep s***.</div><div class='ctx'> 			 * Basically, we can't start the Rx path... */</div><div class='ctx'> 			IRDA_WARNING("%s(), Failed to allocate Rx skb\n",</div><div class='del'>-				     __FUNCTION__);</div><div class='add'>+				     __func__);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 		//skb_reserve(newskb, USB_IRDA_HEADER - 1);</div><div class='hunk'>@@ -1254,7 +1254,7 @@ static int irda_usb_net_close(struct net_device *netdev)</div><div class='ctx'> 	struct irda_usb_cb *self;</div><div class='ctx'> 	int	i;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(netdev != NULL, return -1;);</div><div class='ctx'> 	self = (struct irda_usb_cb *) netdev-&gt;priv;</div><div class='hunk'>@@ -1309,7 +1309,7 @@ static int irda_usb_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 	self = dev-&gt;priv;</div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return -1;);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__, dev-&gt;name, cmd);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __func__, dev-&gt;name, cmd);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCSBANDWIDTH: /* Set bandwidth */</div><div class='hunk'>@@ -1367,7 +1367,7 @@ static inline void irda_usb_init_qos(struct irda_usb_cb *self)</div><div class='ctx'> {</div><div class='ctx'> 	struct irda_class_desc *desc;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s()\n", __func__);</div><div class='ctx'> 	</div><div class='ctx'> 	desc = self-&gt;irda_desc;</div><div class='ctx'> 	</div><div class='hunk'>@@ -1384,7 +1384,7 @@ static inline void irda_usb_init_qos(struct irda_usb_cb *self)</div><div class='ctx'> 	self-&gt;qos.data_size.bits       = desc-&gt;bmDataSize;</div><div class='ctx'> </div><div class='ctx'> 	IRDA_DEBUG(0, "%s(), dongle says speed=0x%X, size=0x%X, window=0x%X, bofs=0x%X, turn=0x%X\n", </div><div class='del'>-		__FUNCTION__, self-&gt;qos.baud_rate.bits, self-&gt;qos.data_size.bits, self-&gt;qos.window_size.bits, self-&gt;qos.additional_bofs.bits, self-&gt;qos.min_turn_time.bits);</div><div class='add'>+		__func__, self-&gt;qos.baud_rate.bits, self-&gt;qos.data_size.bits, self-&gt;qos.window_size.bits, self-&gt;qos.additional_bofs.bits, self-&gt;qos.min_turn_time.bits);</div><div class='ctx'> </div><div class='ctx'> 	/* Don't always trust what the dongle tell us */</div><div class='ctx'> 	if(self-&gt;capability &amp; IUC_SIR_ONLY)</div><div class='hunk'>@@ -1419,7 +1419,7 @@ static inline int irda_usb_open(struct irda_usb_cb *self)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = self-&gt;netdev;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	irda_usb_init_qos(self);</div><div class='ctx'> </div><div class='hunk'>@@ -1442,7 +1442,7 @@ static inline int irda_usb_open(struct irda_usb_cb *self)</div><div class='ctx'>  */</div><div class='ctx'> static inline void irda_usb_close(struct irda_usb_cb *self)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(1, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Remove netdevice */</div><div class='ctx'> 	unregister_netdev(self-&gt;netdev);</div><div class='hunk'>@@ -1515,13 +1515,13 @@ static inline int irda_usb_parse_endpoints(struct irda_usb_cb *self, struct usb_</div><div class='ctx'> 				/* This is our interrupt endpoint */</div><div class='ctx'> 				self-&gt;bulk_int_ep = ep;</div><div class='ctx'> 			} else {</div><div class='del'>-				IRDA_ERROR("%s(), Unrecognised endpoint %02X.\n", __FUNCTION__, ep);</div><div class='add'>+				IRDA_ERROR("%s(), Unrecognised endpoint %02X.\n", __func__, ep);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	IRDA_DEBUG(0, "%s(), And our endpoints are : in=%02X, out=%02X (%d), int=%02X\n",</div><div class='del'>-		__FUNCTION__, self-&gt;bulk_in_ep, self-&gt;bulk_out_ep, self-&gt;bulk_out_mtu, self-&gt;bulk_int_ep);</div><div class='add'>+		__func__, self-&gt;bulk_in_ep, self-&gt;bulk_out_ep, self-&gt;bulk_out_mtu, self-&gt;bulk_int_ep);</div><div class='ctx'> </div><div class='ctx'> 	return((self-&gt;bulk_in_ep != 0) &amp;&amp; (self-&gt;bulk_out_ep != 0));</div><div class='ctx'> }</div><div class='hunk'>@@ -1583,7 +1583,7 @@ static inline struct irda_class_desc *irda_usb_find_class_desc(struct usb_interf</div><div class='ctx'> 		0, intf-&gt;altsetting-&gt;desc.bInterfaceNumber, desc,</div><div class='ctx'> 		sizeof(*desc), 500);</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(1, "%s(), ret=%d\n", __FUNCTION__, ret);</div><div class='add'>+	IRDA_DEBUG(1, "%s(), ret=%d\n", __func__, ret);</div><div class='ctx'> 	if (ret &lt; sizeof(*desc)) {</div><div class='ctx'> 		IRDA_WARNING("usb-irda: class_descriptor read %s (%d)\n",</div><div class='ctx'> 			     (ret&lt;0) ? "failed" : "too short", ret);</div><div class='hunk'>@@ -1696,10 +1696,10 @@ static int irda_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 			/* Martin Diehl says if we get a -EPIPE we should</div><div class='ctx'> 			 * be fine and we don't need to do a usb_clear_halt().</div><div class='ctx'> 			 * - Jean II */</div><div class='del'>-			IRDA_DEBUG(0, "%s(), Received -EPIPE, ignoring...\n", __FUNCTION__);</div><div class='add'>+			IRDA_DEBUG(0, "%s(), Received -EPIPE, ignoring...\n", __func__);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			IRDA_DEBUG(0, "%s(), Unknown error %d\n", __FUNCTION__, ret);</div><div class='add'>+			IRDA_DEBUG(0, "%s(), Unknown error %d\n", __func__, ret);</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto err_out_3;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1708,7 +1708,7 @@ static int irda_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 	interface = intf-&gt;cur_altsetting;</div><div class='ctx'> 	if(!irda_usb_parse_endpoints(self, interface-&gt;endpoint,</div><div class='ctx'> 				     interface-&gt;desc.bNumEndpoints)) {</div><div class='del'>-		IRDA_ERROR("%s(), Bogus endpoints...\n", __FUNCTION__);</div><div class='add'>+		IRDA_ERROR("%s(), Bogus endpoints...\n", __func__);</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto err_out_3;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1815,7 +1815,7 @@ static void irda_usb_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	struct irda_usb_cb *self = usb_get_intfdata(intf);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, NULL);</div><div class='ctx'> 	if (!self)</div><div class='hunk'>@@ -1865,7 +1865,7 @@ static void irda_usb_disconnect(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> 	/* Free self and network device */</div><div class='ctx'> 	free_netdev(self-&gt;netdev);</div><div class='del'>-	IRDA_DEBUG(0, "%s(), USB IrDA Disconnected\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(0, "%s(), USB IrDA Disconnected\n", __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*------------------------------------------------------------------*/</div><div class='head'>diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c<br/>index 9e33196f9459..6bcee01c684c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/irtty-sir.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/irtty-sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/irtty-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/irtty-sir.c</a></div><div class='hunk'>@@ -231,7 +231,7 @@ static void irtty_receive_buf(struct tty_struct *tty, const unsigned char *cp,</div><div class='ctx'> </div><div class='ctx'> 	dev = priv-&gt;dev;</div><div class='ctx'> 	if (!dev) {</div><div class='del'>-		IRDA_WARNING("%s(), not ready yet!\n", __FUNCTION__);</div><div class='add'>+		IRDA_WARNING("%s(), not ready yet!\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -388,7 +388,7 @@ static int irtty_ioctl(struct tty_struct *tty, struct file *file, unsigned int c</div><div class='ctx'> 	IRDA_ASSERT(priv != NULL, return -ENODEV;);</div><div class='ctx'> 	IRDA_ASSERT(priv-&gt;magic == IRTTY_MAGIC, return -EBADR;);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s(cmd=0x%X)\n", __FUNCTION__, cmd);</div><div class='add'>+	IRDA_DEBUG(3, "%s(cmd=0x%X)\n", __func__, cmd);</div><div class='ctx'> </div><div class='ctx'> 	dev = priv-&gt;dev;</div><div class='ctx'> 	IRDA_ASSERT(dev != NULL, return -1;);</div><div class='hunk'>@@ -476,7 +476,7 @@ static int irtty_open(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;irtty_mutex);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(0, "%s - %s: irda line discipline opened\n", __FUNCTION__, tty-&gt;name);</div><div class='add'>+	IRDA_DEBUG(0, "%s - %s: irda line discipline opened\n", __func__, tty-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -528,7 +528,7 @@ static void irtty_close(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	kfree(priv);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(0, "%s - %s: irda line discipline closed\n", __FUNCTION__, tty-&gt;name);</div><div class='add'>+	IRDA_DEBUG(0, "%s - %s: irda line discipline closed\n", __func__, tty-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------- */</div><div class='hunk'>@@ -566,7 +566,7 @@ static void __exit irtty_sir_cleanup(void)</div><div class='ctx'> </div><div class='ctx'> 	if ((err = tty_unregister_ldisc(N_IRDA))) {</div><div class='ctx'> 		IRDA_ERROR("%s(), can't unregister line discipline (err = %d)\n",</div><div class='del'>-			   __FUNCTION__, err);</div><div class='add'>+			   __func__, err);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c<br/>index 648e54b3f00e..73fe83be34fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/kingsun-sir.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/kingsun-sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/kingsun-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/kingsun-sir.c</a></div><div class='hunk'>@@ -243,7 +243,7 @@ static void kingsun_rcv_irq(struct urb *urb)</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (urb-&gt;actual_length &gt; 0) {</div><div class='ctx'> 		err("%s(): Unexpected response length, expected %d got %d",</div><div class='del'>-		    __FUNCTION__, kingsun-&gt;max_rx, urb-&gt;actual_length);</div><div class='add'>+		    __func__, kingsun-&gt;max_rx, urb-&gt;actual_length);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* This urb has already been filled in kingsun_net_open */</div><div class='ctx'> 	ret = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='head'>diff --git a/drivers/net/irda/litelink-sir.c b/drivers/net/irda/litelink-sir.c<br/>index 73261c54bbfd..d6d9d2e5ad49 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/litelink-sir.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/litelink-sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/litelink-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/litelink-sir.c</a></div><div class='hunk'>@@ -78,7 +78,7 @@ static int litelink_open(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct qos_info *qos = &amp;dev-&gt;qos;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Power up dongle */</div><div class='ctx'> 	sirdev_set_dtr_rts(dev, TRUE, TRUE);</div><div class='hunk'>@@ -95,7 +95,7 @@ static int litelink_open(struct sir_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static int litelink_close(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Power off dongle */</div><div class='ctx'> 	sirdev_set_dtr_rts(dev, FALSE, FALSE);</div><div class='hunk'>@@ -113,7 +113,7 @@ static int litelink_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> {</div><div class='ctx'>         int i;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* dongle already reset by irda-thread - current speed (dongle and</div><div class='ctx'> 	 * port) is the default speed (115200 for litelink!)</div><div class='hunk'>@@ -156,7 +156,7 @@ static int litelink_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'>  */</div><div class='ctx'> static int litelink_reset(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* probably the power-up can be dropped here, but with only</div><div class='ctx'> 	 * 15 usec delay it's not worth the risk unless somebody with</div><div class='head'>diff --git a/drivers/net/irda/ma600-sir.c b/drivers/net/irda/ma600-sir.c<br/>index 809906d94762..1ceed9cfb7c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/ma600-sir.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/ma600-sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/ma600-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/ma600-sir.c</a></div><div class='hunk'>@@ -67,13 +67,13 @@ static struct dongle_driver ma600 = {</div><div class='ctx'> </div><div class='ctx'> static int __init ma600_sir_init(void)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> 	return irda_register_dongle(&amp;ma600);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit ma600_sir_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> 	irda_unregister_dongle(&amp;ma600);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -88,7 +88,7 @@ static int ma600_open(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct qos_info *qos = &amp;dev-&gt;qos;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	sirdev_set_dtr_rts(dev, TRUE, TRUE);</div><div class='ctx'> </div><div class='hunk'>@@ -106,7 +106,7 @@ static int ma600_open(struct sir_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static int ma600_close(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Power off dongle */</div><div class='ctx'> 	sirdev_set_dtr_rts(dev, FALSE, FALSE);</div><div class='hunk'>@@ -176,7 +176,7 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> {</div><div class='ctx'> 	u8	byte;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), speed=%d (was %d)\n", __FUNCTION__,</div><div class='add'>+	IRDA_DEBUG(2, "%s(), speed=%d (was %d)\n", __func__,</div><div class='ctx'> 		speed, dev-&gt;speed);</div><div class='ctx'> </div><div class='ctx'> 	/* dongle already reset, dongle and port at default speed (9600) */</div><div class='hunk'>@@ -201,12 +201,12 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> 	sirdev_raw_read(dev, &amp;byte, sizeof(byte));</div><div class='ctx'> 	if (byte != get_control_byte(speed))  {</div><div class='ctx'> 		IRDA_WARNING("%s(): bad control byte read-back %02x != %02x\n",</div><div class='del'>-			     __FUNCTION__, (unsigned) byte,</div><div class='add'>+			     __func__, (unsigned) byte,</div><div class='ctx'> 			     (unsigned) get_control_byte(speed));</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	else</div><div class='del'>-		IRDA_DEBUG(2, "%s() control byte write read OK\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(2, "%s() control byte write read OK\n", __func__);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Set DTR, Set RTS */</div><div class='hunk'>@@ -238,7 +238,7 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> </div><div class='ctx'> int ma600_reset(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the dongle : set DTR low for 10 ms */</div><div class='ctx'> 	sirdev_set_dtr_rts(dev, FALSE, TRUE);</div><div class='head'>diff --git a/drivers/net/irda/mcp2120-sir.c b/drivers/net/irda/mcp2120-sir.c<br/>index 67bd016e4df8..5e2f4859cee7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/mcp2120-sir.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/mcp2120-sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/mcp2120-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/mcp2120-sir.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ static int mcp2120_open(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct qos_info *qos = &amp;dev-&gt;qos;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* seems no explicit power-on required here and reset switching it on anyway */</div><div class='ctx'> </div><div class='hunk'>@@ -76,7 +76,7 @@ static int mcp2120_open(struct sir_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static int mcp2120_close(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Power off dongle */</div><div class='ctx'>         /* reset and inhibit mcp2120 */</div><div class='hunk'>@@ -102,7 +102,7 @@ static int mcp2120_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> 	u8 control[2];</div><div class='ctx'> 	static int ret = 0;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	switch (state) {</div><div class='ctx'> 	case SIRDEV_STATE_DONGLE_SPEED:</div><div class='hunk'>@@ -155,7 +155,7 @@ static int mcp2120_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		IRDA_ERROR("%s(), undefine state %d\n", __FUNCTION__, state);</div><div class='add'>+		IRDA_ERROR("%s(), undefine state %d\n", __func__, state);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -187,7 +187,7 @@ static int mcp2120_reset(struct sir_dev *dev)</div><div class='ctx'> 	unsigned delay = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	switch (state) {</div><div class='ctx'> 	case SIRDEV_STATE_DONGLE_RESET:</div><div class='hunk'>@@ -213,7 +213,7 @@ static int mcp2120_reset(struct sir_dev *dev)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		IRDA_ERROR("%s(), undefined state %d\n", __FUNCTION__, state);</div><div class='add'>+		IRDA_ERROR("%s(), undefined state %d\n", __func__, state);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c<br/>index effc1ce8179a..8583d951a6ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/nsc-ircc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/nsc-ircc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/nsc-ircc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/nsc-ircc.c</a></div><div class='hunk'>@@ -151,8 +151,8 @@ static char *dongle_types[] = {</div><div class='ctx'> static chipio_t pnp_info;</div><div class='ctx'> static const struct pnp_device_id nsc_ircc_pnp_table[] = {</div><div class='ctx'> 	{ .id = "NSC6001", .driver_data = 0 },</div><div class='del'>-	{ .id = "IBM0071", .driver_data = 0 },</div><div class='ctx'> 	{ .id = "HWPC224", .driver_data = 0 },</div><div class='add'>+	{ .id = "IBM0071", .driver_data = NSC_FORCE_DONGLE_TYPE9 },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -223,7 +223,7 @@ static int __init nsc_ircc_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Probe for all the NSC chipsets we know about */</div><div class='ctx'> 	for (chip = chips; chip-&gt;name ; chip++) {</div><div class='del'>-		IRDA_DEBUG(2, "%s(), Probing for %s ...\n", __FUNCTION__,</div><div class='add'>+		IRDA_DEBUG(2, "%s(), Probing for %s ...\n", __func__,</div><div class='ctx'> 			   chip-&gt;name);</div><div class='ctx'> 		</div><div class='ctx'> 		/* Try all config registers for this chip */</div><div class='hunk'>@@ -235,7 +235,7 @@ static int __init nsc_ircc_init(void)</div><div class='ctx'> 			/* Read index register */</div><div class='ctx'> 			reg = inb(cfg_base);</div><div class='ctx'> 			if (reg == 0xff) {</div><div class='del'>-				IRDA_DEBUG(2, "%s() no chip at 0x%03x\n", __FUNCTION__, cfg_base);</div><div class='add'>+				IRDA_DEBUG(2, "%s() no chip at 0x%03x\n", __func__, cfg_base);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			</div><div class='hunk'>@@ -244,7 +244,7 @@ static int __init nsc_ircc_init(void)</div><div class='ctx'> 			id = inb(cfg_base+1);</div><div class='ctx'> 			if ((id &amp; chip-&gt;cid_mask) == chip-&gt;cid_value) {</div><div class='ctx'> 				IRDA_DEBUG(2, "%s() Found %s chip, revision=%d\n",</div><div class='del'>-					   __FUNCTION__, chip-&gt;name, id &amp; ~chip-&gt;cid_mask);</div><div class='add'>+					   __func__, chip-&gt;name, id &amp; ~chip-&gt;cid_mask);</div><div class='ctx'> </div><div class='ctx'> 				/*</div><div class='ctx'> 				 * If we found a correct PnP setting,</div><div class='hunk'>@@ -295,7 +295,7 @@ static int __init nsc_ircc_init(void)</div><div class='ctx'> 				}</div><div class='ctx'> 				i++;</div><div class='ctx'> 			} else {</div><div class='del'>-				IRDA_DEBUG(2, "%s(), Wrong chip id=0x%02x\n", __FUNCTION__, id);</div><div class='add'>+				IRDA_DEBUG(2, "%s(), Wrong chip id=0x%02x\n", __func__, id);</div><div class='ctx'> 			}</div><div class='ctx'> 		} </div><div class='ctx'> 	}</div><div class='hunk'>@@ -345,7 +345,7 @@ static int __init nsc_ircc_open(chipio_t *info)</div><div class='ctx'> 	void *ret;</div><div class='ctx'> 	int err, chip_index;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>  	for (chip_index = 0; chip_index &lt; ARRAY_SIZE(dev_self); chip_index++) {</div><div class='hunk'>@@ -354,7 +354,7 @@ static int __init nsc_ircc_open(chipio_t *info)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (chip_index == ARRAY_SIZE(dev_self)) {</div><div class='del'>-		IRDA_ERROR("%s(), maximum number of supported chips reached!\n", __FUNCTION__);</div><div class='add'>+		IRDA_ERROR("%s(), maximum number of supported chips reached!\n", __func__);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -369,7 +369,7 @@ static int __init nsc_ircc_open(chipio_t *info)</div><div class='ctx'> 	dev = alloc_irdadev(sizeof(struct nsc_ircc_cb));</div><div class='ctx'> 	if (dev == NULL) {</div><div class='ctx'> 		IRDA_ERROR("%s(), can't allocate memory for "</div><div class='del'>-			   "control block!\n", __FUNCTION__);</div><div class='add'>+			   "control block!\n", __func__);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -393,7 +393,7 @@ static int __init nsc_ircc_open(chipio_t *info)</div><div class='ctx'> 	ret = request_region(self-&gt;io.fir_base, self-&gt;io.fir_ext, driver_name);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		IRDA_WARNING("%s(), can't get iobase of 0x%03x\n",</div><div class='del'>-			     __FUNCTION__, self-&gt;io.fir_base);</div><div class='add'>+			     __func__, self-&gt;io.fir_base);</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto out1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -450,7 +450,7 @@ static int __init nsc_ircc_open(chipio_t *info)</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdev(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		IRDA_ERROR("%s(), register_netdev() failed!\n", __FUNCTION__);</div><div class='add'>+		IRDA_ERROR("%s(), register_netdev() failed!\n", __func__);</div><div class='ctx'> 		goto out4;</div><div class='ctx'> 	}</div><div class='ctx'> 	IRDA_MESSAGE("IrDA: Registered device %s\n", dev-&gt;name);</div><div class='hunk'>@@ -506,7 +506,7 @@ static int __exit nsc_ircc_close(struct nsc_ircc_cb *self)</div><div class='ctx'> {</div><div class='ctx'> 	int iobase;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(4, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(4, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return -1;);</div><div class='ctx'> </div><div class='hunk'>@@ -519,7 +519,7 @@ static int __exit nsc_ircc_close(struct nsc_ircc_cb *self)</div><div class='ctx'> </div><div class='ctx'> 	/* Release the PORT that this driver is using */</div><div class='ctx'> 	IRDA_DEBUG(4, "%s(), Releasing Region %03x\n", </div><div class='del'>-		   __FUNCTION__, self-&gt;io.fir_base);</div><div class='add'>+		   __func__, self-&gt;io.fir_base);</div><div class='ctx'> 	release_region(self-&gt;io.fir_base, self-&gt;io.fir_ext);</div><div class='ctx'> </div><div class='ctx'> 	if (self-&gt;tx_buff.head)</div><div class='hunk'>@@ -557,7 +557,7 @@ static int nsc_ircc_init_108(nsc_chip_t *chip, chipio_t *info)</div><div class='ctx'> 	case 0x2e8: outb(0x15, cfg_base+1); break;</div><div class='ctx'> 	case 0x3f8: outb(0x16, cfg_base+1); break;</div><div class='ctx'> 	case 0x2f8: outb(0x17, cfg_base+1); break;</div><div class='del'>-	default: IRDA_ERROR("%s(), invalid base_address", __FUNCTION__);</div><div class='add'>+	default: IRDA_ERROR("%s(), invalid base_address", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	/* Control Signal Routing Register (CSRT) */</div><div class='hunk'>@@ -569,7 +569,7 @@ static int nsc_ircc_init_108(nsc_chip_t *chip, chipio_t *info)</div><div class='ctx'> 	case 9:  temp = 0x05; break;</div><div class='ctx'> 	case 11: temp = 0x06; break;</div><div class='ctx'> 	case 15: temp = 0x07; break;</div><div class='del'>-	default: IRDA_ERROR("%s(), invalid irq", __FUNCTION__);</div><div class='add'>+	default: IRDA_ERROR("%s(), invalid irq", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> 	outb(CFG_108_CSRT, cfg_base);</div><div class='ctx'> 	</div><div class='hunk'>@@ -577,7 +577,7 @@ static int nsc_ircc_init_108(nsc_chip_t *chip, chipio_t *info)</div><div class='ctx'> 	case 0: outb(0x08+temp, cfg_base+1); break;</div><div class='ctx'> 	case 1: outb(0x10+temp, cfg_base+1); break;</div><div class='ctx'> 	case 3: outb(0x18+temp, cfg_base+1); break;</div><div class='del'>-	default: IRDA_ERROR("%s(), invalid dma", __FUNCTION__);</div><div class='add'>+	default: IRDA_ERROR("%s(), invalid dma", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	outb(CFG_108_MCTL, cfg_base);      /* Mode Control Register (MCTL) */</div><div class='hunk'>@@ -616,7 +616,7 @@ static int nsc_ircc_probe_108(nsc_chip_t *chip, chipio_t *info)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	info-&gt;sir_base = info-&gt;fir_base;</div><div class='del'>-	IRDA_DEBUG(2, "%s(), probing fir_base=0x%03x\n", __FUNCTION__,</div><div class='add'>+	IRDA_DEBUG(2, "%s(), probing fir_base=0x%03x\n", __func__,</div><div class='ctx'> 		   info-&gt;fir_base);</div><div class='ctx'> </div><div class='ctx'> 	/* Read control signals routing register (CSRT) */</div><div class='hunk'>@@ -649,7 +649,7 @@ static int nsc_ircc_probe_108(nsc_chip_t *chip, chipio_t *info)</div><div class='ctx'> 		info-&gt;irq = 15;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	IRDA_DEBUG(2, "%s(), probing irq=%d\n", __FUNCTION__, info-&gt;irq);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), probing irq=%d\n", __func__, info-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	/* Currently we only read Rx DMA but it will also be used for Tx */</div><div class='ctx'> 	switch ((reg &gt;&gt; 3) &amp; 0x03) {</div><div class='hunk'>@@ -666,7 +666,7 @@ static int nsc_ircc_probe_108(nsc_chip_t *chip, chipio_t *info)</div><div class='ctx'> 		info-&gt;dma = 3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	IRDA_DEBUG(2, "%s(), probing dma=%d\n", __FUNCTION__, info-&gt;dma);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), probing dma=%d\n", __func__, info-&gt;dma);</div><div class='ctx'> </div><div class='ctx'> 	/* Read mode control register (MCTL) */</div><div class='ctx'> 	outb(CFG_108_MCTL, cfg_base);</div><div class='hunk'>@@ -823,7 +823,7 @@ static int nsc_ircc_init_39x(nsc_chip_t *chip, chipio_t *info)</div><div class='ctx'> 	/* User is sure about his config... accept it. */</div><div class='ctx'> 	IRDA_DEBUG(2, "%s(): nsc_ircc_init_39x (user settings): "</div><div class='ctx'> 		   "io=0x%04x, irq=%d, dma=%d\n", </div><div class='del'>-		   __FUNCTION__, info-&gt;fir_base, info-&gt;irq, info-&gt;dma);</div><div class='add'>+		   __func__, info-&gt;fir_base, info-&gt;irq, info-&gt;dma);</div><div class='ctx'> </div><div class='ctx'> 	/* Access bank for SP2 */</div><div class='ctx'> 	outb(CFG_39X_LDN, cfg_base);</div><div class='hunk'>@@ -864,7 +864,7 @@ static int nsc_ircc_probe_39x(nsc_chip_t *chip, chipio_t *info)</div><div class='ctx'> 	int enabled, susp;</div><div class='ctx'> </div><div class='ctx'> 	IRDA_DEBUG(2, "%s(), nsc_ircc_probe_39x, base=%d\n",</div><div class='del'>-		   __FUNCTION__, cfg_base);</div><div class='add'>+		   __func__, cfg_base);</div><div class='ctx'> </div><div class='ctx'> 	/* This function should be executed with irq off to avoid</div><div class='ctx'> 	 * another driver messing with the Super I/O bank - Jean II */</div><div class='hunk'>@@ -898,7 +898,7 @@ static int nsc_ircc_probe_39x(nsc_chip_t *chip, chipio_t *info)</div><div class='ctx'> 	outb(CFG_39X_SPC, cfg_base);</div><div class='ctx'> 	susp = 1 - ((inb(cfg_base+1) &amp; 0x02) &gt;&gt; 1);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(): io=0x%02x%02x, irq=%d (type %d), rxdma=%d, txdma=%d, enabled=%d (suspended=%d)\n", __FUNCTION__, reg1,reg2,irq,irqt,dma1,dma2,enabled,susp);</div><div class='add'>+	IRDA_DEBUG(2, "%s(): io=0x%02x%02x, irq=%d (type %d), rxdma=%d, txdma=%d, enabled=%d (suspended=%d)\n", __func__, reg1,reg2,irq,irqt,dma1,dma2,enabled,susp);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure SP2 */</div><div class='ctx'> </div><div class='hunk'>@@ -930,7 +930,10 @@ static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *i</div><div class='ctx'> 	pnp_info.dma = -1;</div><div class='ctx'> 	pnp_succeeded = 1;</div><div class='ctx'> </div><div class='del'>-	/* There don't seem to be any way to get the cfg_base.</div><div class='add'>+	if (id-&gt;driver_data &amp; NSC_FORCE_DONGLE_TYPE9)</div><div class='add'>+		dongle_id = 0x9;</div><div class='add'>+</div><div class='add'>+	/* There doesn't seem to be any way of getting the cfg_base.</div><div class='ctx'> 	 * On my box, cfg_base is in the PnP descriptor of the</div><div class='ctx'> 	 * motherboard. Oh well... Jean II */</div><div class='ctx'> </div><div class='hunk'>@@ -947,7 +950,7 @@ static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *i</div><div class='ctx'> 		pnp_info.dma = pnp_dma(dev, 0);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_DEBUG(0, "%s() : From PnP, found firbase 0x%03X ; irq %d ; dma %d.\n",</div><div class='del'>-		   __FUNCTION__, pnp_info.fir_base, pnp_info.irq, pnp_info.dma);</div><div class='add'>+		   __func__, pnp_info.fir_base, pnp_info.irq, pnp_info.dma);</div><div class='ctx'> </div><div class='ctx'> 	if((pnp_info.fir_base == 0) ||</div><div class='ctx'> 	   (pnp_info.irq == -1) || (pnp_info.dma == -1)) {</div><div class='hunk'>@@ -976,7 +979,7 @@ static int nsc_ircc_setup(chipio_t *info)</div><div class='ctx'> 	version = inb(iobase+MID);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_DEBUG(2, "%s() Driver %s Found chip version %02x\n",</div><div class='del'>-		   __FUNCTION__, driver_name, version);</div><div class='add'>+		   __func__, driver_name, version);</div><div class='ctx'> </div><div class='ctx'> 	/* Should be 0x2? */</div><div class='ctx'> 	if (0x20 != (version &amp; 0xf0)) {</div><div class='hunk'>@@ -1080,30 +1083,30 @@ static void nsc_ircc_init_dongle_interface (int iobase, int dongle_id)</div><div class='ctx'> 	case 0x00: /* same as */</div><div class='ctx'> 	case 0x01: /* Differential serial interface */</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",</div><div class='del'>-			   __FUNCTION__, dongle_types[dongle_id]); </div><div class='add'>+			   __func__, dongle_types[dongle_id]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x02: /* same as */</div><div class='ctx'> 	case 0x03: /* Reserved */</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",</div><div class='del'>-			   __FUNCTION__, dongle_types[dongle_id]); </div><div class='add'>+			   __func__, dongle_types[dongle_id]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x04: /* Sharp RY5HD01 */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x05: /* Reserved, but this is what the Thinkpad reports */</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",</div><div class='del'>-			   __FUNCTION__, dongle_types[dongle_id]); </div><div class='add'>+			   __func__, dongle_types[dongle_id]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x06: /* Single-ended serial interface */</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",</div><div class='del'>-			   __FUNCTION__, dongle_types[dongle_id]); </div><div class='add'>+			   __func__, dongle_types[dongle_id]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x07: /* Consumer-IR only */</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), %s is not for IrDA mode\n",</div><div class='del'>-			   __FUNCTION__, dongle_types[dongle_id]); </div><div class='add'>+			   __func__, dongle_types[dongle_id]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x08: /* HP HSDL-2300, HP HSDL-3600/HSDL-3610 */</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), %s\n",</div><div class='del'>-			   __FUNCTION__, dongle_types[dongle_id]);</div><div class='add'>+			   __func__, dongle_types[dongle_id]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x09: /* IBM31T1100 or Temic TFDS6000/TFDS6500 */</div><div class='ctx'> 		outb(0x28, iobase+7); /* Set irsl[0-2] as output */</div><div class='hunk'>@@ -1111,7 +1114,7 @@ static void nsc_ircc_init_dongle_interface (int iobase, int dongle_id)</div><div class='ctx'> 	case 0x0A: /* same as */</div><div class='ctx'> 	case 0x0B: /* Reserved */</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",</div><div class='del'>-			   __FUNCTION__, dongle_types[dongle_id]); </div><div class='add'>+			   __func__, dongle_types[dongle_id]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x0C: /* same as */</div><div class='ctx'> 	case 0x0D: /* HP HSDL-1100/HSDL-2100 */</div><div class='hunk'>@@ -1126,14 +1129,14 @@ static void nsc_ircc_init_dongle_interface (int iobase, int dongle_id)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x0F: /* No dongle connected */</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), %s\n",</div><div class='del'>-			   __FUNCTION__, dongle_types[dongle_id]); </div><div class='add'>+			   __func__, dongle_types[dongle_id]);</div><div class='ctx'> </div><div class='ctx'> 		switch_bank(iobase, BANK0);</div><div class='ctx'> 		outb(0x62, iobase+MCR);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default: </div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), invalid dongle_id %#x", </div><div class='del'>-			   __FUNCTION__, dongle_id);</div><div class='add'>+			   __func__, dongle_id);</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	/* IRCFG1: IRSL1 and 2 are set to IrDA mode */</div><div class='hunk'>@@ -1165,30 +1168,30 @@ static void nsc_ircc_change_dongle_speed(int iobase, int speed, int dongle_id)</div><div class='ctx'> 	case 0x00: /* same as */</div><div class='ctx'> 	case 0x01: /* Differential serial interface */</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",</div><div class='del'>-			   __FUNCTION__, dongle_types[dongle_id]); </div><div class='add'>+			   __func__, dongle_types[dongle_id]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x02: /* same as */</div><div class='ctx'> 	case 0x03: /* Reserved */</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",</div><div class='del'>-			   __FUNCTION__, dongle_types[dongle_id]); </div><div class='add'>+			   __func__, dongle_types[dongle_id]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x04: /* Sharp RY5HD01 */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x05: /* Reserved */</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",</div><div class='del'>-			   __FUNCTION__, dongle_types[dongle_id]); </div><div class='add'>+			   __func__, dongle_types[dongle_id]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x06: /* Single-ended serial interface */</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",</div><div class='del'>-			   __FUNCTION__, dongle_types[dongle_id]); </div><div class='add'>+			   __func__, dongle_types[dongle_id]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x07: /* Consumer-IR only */</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), %s is not for IrDA mode\n",</div><div class='del'>-			   __FUNCTION__, dongle_types[dongle_id]); </div><div class='add'>+			   __func__, dongle_types[dongle_id]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x08: /* HP HSDL-2300, HP HSDL-3600/HSDL-3610 */</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), %s\n", </div><div class='del'>-			   __FUNCTION__, dongle_types[dongle_id]); </div><div class='add'>+			   __func__, dongle_types[dongle_id]);</div><div class='ctx'> 		outb(0x00, iobase+4);</div><div class='ctx'> 		if (speed &gt; 115200)</div><div class='ctx'> 			outb(0x01, iobase+4);</div><div class='hunk'>@@ -1207,7 +1210,7 @@ static void nsc_ircc_change_dongle_speed(int iobase, int speed, int dongle_id)</div><div class='ctx'> 	case 0x0A: /* same as */</div><div class='ctx'> 	case 0x0B: /* Reserved */</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",</div><div class='del'>-			   __FUNCTION__, dongle_types[dongle_id]); </div><div class='add'>+			   __func__, dongle_types[dongle_id]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x0C: /* same as */</div><div class='ctx'> 	case 0x0D: /* HP HSDL-1100/HSDL-2100 */</div><div class='hunk'>@@ -1216,13 +1219,13 @@ static void nsc_ircc_change_dongle_speed(int iobase, int speed, int dongle_id)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x0F: /* No dongle connected */</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), %s is not for IrDA mode\n",</div><div class='del'>-			   __FUNCTION__, dongle_types[dongle_id]);</div><div class='add'>+			   __func__, dongle_types[dongle_id]);</div><div class='ctx'> </div><div class='ctx'> 		switch_bank(iobase, BANK0); </div><div class='ctx'> 		outb(0x62, iobase+MCR);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default: </div><div class='del'>-		IRDA_DEBUG(0, "%s(), invalid data_rate\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(0, "%s(), invalid data_rate\n", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Restore bank register */</div><div class='ctx'> 	outb(bank, iobase+BSR);</div><div class='hunk'>@@ -1243,7 +1246,7 @@ static __u8 nsc_ircc_change_speed(struct nsc_ircc_cb *self, __u32 speed)</div><div class='ctx'> 	__u8 bank;</div><div class='ctx'> 	__u8 ier;                  /* Interrupt enable register */</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(), speed=%d\n", __FUNCTION__, speed);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), speed=%d\n", __func__, speed);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return 0;);</div><div class='ctx'> </div><div class='hunk'>@@ -1276,20 +1279,20 @@ static __u8 nsc_ircc_change_speed(struct nsc_ircc_cb *self, __u32 speed)</div><div class='ctx'> 		outb(inb(iobase+4) | 0x04, iobase+4);</div><div class='ctx'> 	       </div><div class='ctx'> 		mcr = MCR_MIR;</div><div class='del'>-		IRDA_DEBUG(0, "%s(), handling baud of 576000\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(0, "%s(), handling baud of 576000\n", __func__);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1152000:</div><div class='ctx'> 		mcr = MCR_MIR;</div><div class='del'>-		IRDA_DEBUG(0, "%s(), handling baud of 1152000\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(0, "%s(), handling baud of 1152000\n", __func__);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4000000:</div><div class='ctx'> 		mcr = MCR_FIR;</div><div class='del'>-		IRDA_DEBUG(0, "%s(), handling baud of 4000000\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(0, "%s(), handling baud of 4000000\n", __func__);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		mcr = MCR_FIR;</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), unknown baud rate of %d\n", </div><div class='del'>-			   __FUNCTION__, speed);</div><div class='add'>+			   __func__, speed);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1594,7 +1597,7 @@ static int nsc_ircc_pio_write(int iobase, __u8 *buf, int len, int fifo_size)</div><div class='ctx'> 	int actual = 0;</div><div class='ctx'> 	__u8 bank;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(4, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(4, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Save current bank */</div><div class='ctx'> 	bank = inb(iobase+BSR);</div><div class='hunk'>@@ -1602,7 +1605,7 @@ static int nsc_ircc_pio_write(int iobase, __u8 *buf, int len, int fifo_size)</div><div class='ctx'> 	switch_bank(iobase, BANK0);</div><div class='ctx'> 	if (!(inb_p(iobase+LSR) &amp; LSR_TXEMP)) {</div><div class='ctx'> 		IRDA_DEBUG(4, "%s(), warning, FIFO not empty yet!\n",</div><div class='del'>-			   __FUNCTION__);</div><div class='add'>+			   __func__);</div><div class='ctx'> </div><div class='ctx'> 		/* FIFO may still be filled to the Tx interrupt threshold */</div><div class='ctx'> 		fifo_size -= 17;</div><div class='hunk'>@@ -1615,7 +1618,7 @@ static int nsc_ircc_pio_write(int iobase, __u8 *buf, int len, int fifo_size)</div><div class='ctx'> 	}</div><div class='ctx'>         </div><div class='ctx'> 	IRDA_DEBUG(4, "%s(), fifo_size %d ; %d sent of %d\n", </div><div class='del'>-		   __FUNCTION__, fifo_size, actual, len);</div><div class='add'>+		   __func__, fifo_size, actual, len);</div><div class='ctx'> 	</div><div class='ctx'> 	/* Restore bank */</div><div class='ctx'> 	outb(bank, iobase+BSR);</div><div class='hunk'>@@ -1636,7 +1639,7 @@ static int nsc_ircc_dma_xmit_complete(struct nsc_ircc_cb *self)</div><div class='ctx'> 	__u8 bank;</div><div class='ctx'> 	int ret = TRUE;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	iobase = self-&gt;io.fir_base;</div><div class='ctx'> </div><div class='hunk'>@@ -1767,7 +1770,7 @@ static int nsc_ircc_dma_receive_complete(struct nsc_ircc_cb *self, int iobase)</div><div class='ctx'> 		len = inb(iobase+RFLFL) | ((inb(iobase+RFLFH) &amp; 0x1f) &lt;&lt; 8);</div><div class='ctx'> </div><div class='ctx'> 		if (st_fifo-&gt;tail &gt;= MAX_RX_WINDOW) {</div><div class='del'>-			IRDA_DEBUG(0, "%s(), window is full!\n", __FUNCTION__);</div><div class='add'>+			IRDA_DEBUG(0, "%s(), window is full!\n", __func__);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 			</div><div class='hunk'>@@ -1859,7 +1862,7 @@ static int nsc_ircc_dma_receive_complete(struct nsc_ircc_cb *self, int iobase)</div><div class='ctx'> 			if (skb == NULL)  {</div><div class='ctx'> 				IRDA_WARNING("%s(), memory squeeze, "</div><div class='ctx'> 					     "dropping frame.\n",</div><div class='del'>-					     __FUNCTION__);</div><div class='add'>+					     __func__);</div><div class='ctx'> 				self-&gt;stats.rx_dropped++;</div><div class='ctx'> </div><div class='ctx'> 				/* Restore bank register */</div><div class='hunk'>@@ -1965,7 +1968,7 @@ static void nsc_ircc_sir_interrupt(struct nsc_ircc_cb *self, int eir)</div><div class='ctx'> 		 * Need to be after self-&gt;io.direction to avoid race with</div><div class='ctx'> 		 * nsc_ircc_hard_xmit_sir() - Jean II */</div><div class='ctx'> 		if (self-&gt;new_speed) {</div><div class='del'>-			IRDA_DEBUG(2, "%s(), Changing speed!\n", __FUNCTION__);</div><div class='add'>+			IRDA_DEBUG(2, "%s(), Changing speed!\n", __func__);</div><div class='ctx'> 			self-&gt;ier = nsc_ircc_change_speed(self,</div><div class='ctx'> 							  self-&gt;new_speed);</div><div class='ctx'> 			self-&gt;new_speed = 0;</div><div class='hunk'>@@ -2051,7 +2054,7 @@ static void nsc_ircc_fir_interrupt(struct nsc_ircc_cb *self, int iobase,</div><div class='ctx'> 				} else</div><div class='ctx'> 					IRDA_WARNING("%s(), potential "</div><div class='ctx'> 						     "Tx queue lockup !\n",</div><div class='del'>-						     __FUNCTION__);</div><div class='add'>+						     __func__);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/*  Not finished yet, so interrupt on DMA again */</div><div class='hunk'>@@ -2160,7 +2163,7 @@ static int nsc_ircc_net_open(struct net_device *dev)</div><div class='ctx'> 	char hwname[32];</div><div class='ctx'> 	__u8 bank;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(4, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(4, "%s()\n", __func__);</div><div class='ctx'> 	</div><div class='ctx'> 	IRDA_ASSERT(dev != NULL, return -1;);</div><div class='ctx'> 	self = (struct nsc_ircc_cb *) dev-&gt;priv;</div><div class='hunk'>@@ -2222,7 +2225,7 @@ static int nsc_ircc_net_close(struct net_device *dev)</div><div class='ctx'> 	int iobase;</div><div class='ctx'> 	__u8 bank;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(4, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(4, "%s()\n", __func__);</div><div class='ctx'> 	</div><div class='ctx'> 	IRDA_ASSERT(dev != NULL, return -1;);</div><div class='ctx'> </div><div class='hunk'>@@ -2276,7 +2279,7 @@ static int nsc_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return -1;);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__, dev-&gt;name, cmd);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __func__, dev-&gt;name, cmd);</div><div class='ctx'> 	</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCSBANDWIDTH: /* Set bandwidth */</div><div class='head'>diff --git a/drivers/net/irda/nsc-ircc.h b/drivers/net/irda/nsc-ircc.h<br/>index 29398a4f73fd..71cd3c5a0762 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/nsc-ircc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/nsc-ircc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/nsc-ircc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/nsc-ircc.h</a></div><div class='hunk'>@@ -35,6 +35,9 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='add'>+/* Features for chips (set in driver_data) */</div><div class='add'>+#define NSC_FORCE_DONGLE_TYPE9	0x00000001</div><div class='add'>+</div><div class='ctx'> /* DMA modes needed */</div><div class='ctx'> #define DMA_TX_MODE     0x08    /* Mem to I/O, ++, demand. */</div><div class='ctx'> #define DMA_RX_MODE     0x04    /* I/O to mem, ++, demand. */</div><div class='head'>diff --git a/drivers/net/irda/old_belkin-sir.c b/drivers/net/irda/old_belkin-sir.c<br/>index 8c22c7374a23..75714bc71030 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/old_belkin-sir.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/old_belkin-sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/old_belkin-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/old_belkin-sir.c</a></div><div class='hunk'>@@ -92,7 +92,7 @@ static int old_belkin_open(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct qos_info *qos = &amp;dev-&gt;qos;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Power on dongle */</div><div class='ctx'> 	sirdev_set_dtr_rts(dev, TRUE, TRUE);</div><div class='hunk'>@@ -110,7 +110,7 @@ static int old_belkin_open(struct sir_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static int old_belkin_close(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Power off dongle */</div><div class='ctx'> 	sirdev_set_dtr_rts(dev, FALSE, FALSE);</div><div class='hunk'>@@ -125,7 +125,7 @@ static int old_belkin_close(struct sir_dev *dev)</div><div class='ctx'>  */</div><div class='ctx'> static int old_belkin_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;speed = 9600;</div><div class='ctx'> 	return (speed==dev-&gt;speed) ? 0 : -EINVAL;</div><div class='hunk'>@@ -139,7 +139,7 @@ static int old_belkin_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'>  */</div><div class='ctx'> static int old_belkin_reset(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* This dongles speed "defaults" to 9600 bps ;-) */</div><div class='ctx'> 	dev-&gt;speed = 9600;</div><div class='head'>diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c<br/>index f76b0b6c277d..4aa61a1a3d55 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/pxaficp_ir.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/pxaficp_ir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/pxaficp_ir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/pxaficp_ir.c</a></div><div class='hunk'>@@ -23,8 +23,8 @@</div><div class='ctx'> #include &lt;net/irda/irda_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/irda.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/irda.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IrSR_RXPL_NEG_IS_ZERO (1&lt;&lt;4)</div><div class='ctx'> #define IrSR_RXPL_POS_IS_ZERO 0x0</div><div class='head'>diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c<br/>index 1bc8518f9197..a95188948de7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/sa1100_ir.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/sa1100_ir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/sa1100_ir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/sa1100_ir.c</a></div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irda.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int power_level = 3;</div><div class='head'>diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c<br/>index 6078e03de9a8..3f32909c24c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/sir_dev.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/sir_dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/sir_dev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/sir_dev.c</a></div><div class='hunk'>@@ -80,7 +80,7 @@ static int sirdev_tx_complete_fsm(struct sir_dev *dev)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			IRDA_ERROR("%s - undefined state\n", __FUNCTION__);</div><div class='add'>+			IRDA_ERROR("%s - undefined state\n", __func__);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		fsm-&gt;substate = next_state;</div><div class='hunk'>@@ -107,11 +107,11 @@ static void sirdev_config_fsm(struct work_struct *work)</div><div class='ctx'> 	int ret = -1;</div><div class='ctx'> 	unsigned delay;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(), &lt;%ld&gt;\n", __FUNCTION__, jiffies);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), &lt;%ld&gt;\n", __func__, jiffies);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		IRDA_DEBUG(3, "%s - state=0x%04x / substate=0x%04x\n",</div><div class='del'>-			__FUNCTION__, fsm-&gt;state, fsm-&gt;substate);</div><div class='add'>+			__func__, fsm-&gt;state, fsm-&gt;substate);</div><div class='ctx'> </div><div class='ctx'> 		next_state = fsm-&gt;state;</div><div class='ctx'> 		delay = 0;</div><div class='hunk'>@@ -249,12 +249,12 @@ static void sirdev_config_fsm(struct work_struct *work)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			IRDA_ERROR("%s - undefined state\n", __FUNCTION__);</div><div class='add'>+			IRDA_ERROR("%s - undefined state\n", __func__);</div><div class='ctx'> 			fsm-&gt;result = -EINVAL;</div><div class='ctx'> 			/* fall thru */</div><div class='ctx'> </div><div class='ctx'> 		case SIRDEV_STATE_ERROR:</div><div class='del'>-			IRDA_ERROR("%s - error: %d\n", __FUNCTION__, fsm-&gt;result);</div><div class='add'>+			IRDA_ERROR("%s - error: %d\n", __func__, fsm-&gt;result);</div><div class='ctx'> </div><div class='ctx'> #if 0	/* don't enable this before we have netdev-&gt;tx_timeout to recover */</div><div class='ctx'> 			netif_stop_queue(dev-&gt;netdev);</div><div class='hunk'>@@ -284,11 +284,12 @@ int sirdev_schedule_request(struct sir_dev *dev, int initial_state, unsigned par</div><div class='ctx'> {</div><div class='ctx'> 	struct sir_fsm *fsm = &amp;dev-&gt;fsm;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s - state=0x%04x / param=%u\n", __FUNCTION__, initial_state, param);</div><div class='add'>+	IRDA_DEBUG(2, "%s - state=0x%04x / param=%u\n", __func__,</div><div class='add'>+			initial_state, param);</div><div class='ctx'> </div><div class='ctx'> 	if (down_trylock(&amp;fsm-&gt;sem)) {</div><div class='ctx'> 		if (in_interrupt()  ||  in_atomic()  ||  irqs_disabled()) {</div><div class='del'>-			IRDA_DEBUG(1, "%s(), state machine busy!\n", __FUNCTION__);</div><div class='add'>+			IRDA_DEBUG(1, "%s(), state machine busy!\n", __func__);</div><div class='ctx'> 			return -EWOULDBLOCK;</div><div class='ctx'> 		} else</div><div class='ctx'> 			down(&amp;fsm-&gt;sem);</div><div class='hunk'>@@ -296,7 +297,7 @@ int sirdev_schedule_request(struct sir_dev *dev, int initial_state, unsigned par</div><div class='ctx'> </div><div class='ctx'> 	if (fsm-&gt;state == SIRDEV_STATE_DEAD) {</div><div class='ctx'> 		/* race with sirdev_close should never happen */</div><div class='del'>-		IRDA_ERROR("%s(), instance staled!\n", __FUNCTION__);</div><div class='add'>+		IRDA_ERROR("%s(), instance staled!\n", __func__);</div><div class='ctx'> 		up(&amp;fsm-&gt;sem);</div><div class='ctx'> 		return -ESTALE;		/* or better EPIPE? */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -341,7 +342,7 @@ int sirdev_set_dongle(struct sir_dev *dev, IRDA_DONGLE type)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s : requesting dongle %d.\n", __FUNCTION__, type);</div><div class='add'>+	IRDA_DEBUG(3, "%s : requesting dongle %d.\n", __func__, type);</div><div class='ctx'> </div><div class='ctx'> 	err = sirdev_schedule_dongle_open(dev, type);</div><div class='ctx'> 	if (unlikely(err))</div><div class='hunk'>@@ -376,7 +377,7 @@ int sirdev_raw_write(struct sir_dev *dev, const char *buf, int len)</div><div class='ctx'> </div><div class='ctx'> 	ret = dev-&gt;drv-&gt;do_write(dev, dev-&gt;tx_buff.data, dev-&gt;tx_buff.len);</div><div class='ctx'> 	if (ret &gt; 0) {</div><div class='del'>-		IRDA_DEBUG(3, "%s(), raw-tx started\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(3, "%s(), raw-tx started\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 		dev-&gt;tx_buff.data += ret;</div><div class='ctx'> 		dev-&gt;tx_buff.len -= ret;</div><div class='hunk'>@@ -437,7 +438,7 @@ void sirdev_write_complete(struct sir_dev *dev)</div><div class='ctx'> 	spin_lock_irqsave(&amp;dev-&gt;tx_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_DEBUG(3, "%s() - dev-&gt;tx_buff.len = %d\n",</div><div class='del'>-		   __FUNCTION__, dev-&gt;tx_buff.len);</div><div class='add'>+		   __func__, dev-&gt;tx_buff.len);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(dev-&gt;tx_buff.len &gt; 0))  {</div><div class='ctx'> 		/* Write data left in transmit buffer */</div><div class='hunk'>@@ -450,7 +451,7 @@ void sirdev_write_complete(struct sir_dev *dev)</div><div class='ctx'> 		else if (unlikely(actual&lt;0)) {</div><div class='ctx'> 			/* could be dropped later when we have tx_timeout to recover */</div><div class='ctx'> 			IRDA_ERROR("%s: drv-&gt;do_write failed (%d)\n",</div><div class='del'>-				   __FUNCTION__, actual);</div><div class='add'>+				   __func__, actual);</div><div class='ctx'> 			if ((skb=dev-&gt;tx_skb) != NULL) {</div><div class='ctx'> 				dev-&gt;tx_skb = NULL;</div><div class='ctx'> 				dev_kfree_skb_any(skb);</div><div class='hunk'>@@ -471,7 +472,7 @@ void sirdev_write_complete(struct sir_dev *dev)</div><div class='ctx'> 		 * restarted when the irda-thread has completed the request.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		IRDA_DEBUG(3, "%s(), raw-tx done\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(3, "%s(), raw-tx done\n", __func__);</div><div class='ctx'> 		dev-&gt;raw_tx = 0;</div><div class='ctx'> 		goto done;	/* no post-frame handling in raw mode */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -488,7 +489,7 @@ void sirdev_write_complete(struct sir_dev *dev)</div><div class='ctx'> 	 * re-activated.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(5, "%s(), finished with frame!\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(5, "%s(), finished with frame!\n", __func__);</div><div class='ctx'> 		</div><div class='ctx'> 	if ((skb=dev-&gt;tx_skb) != NULL) {</div><div class='ctx'> 		dev-&gt;tx_skb = NULL;</div><div class='hunk'>@@ -498,14 +499,14 @@ void sirdev_write_complete(struct sir_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(dev-&gt;new_speed &gt; 0)) {</div><div class='del'>-		IRDA_DEBUG(5, "%s(), Changing speed!\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(5, "%s(), Changing speed!\n", __func__);</div><div class='ctx'> 		err = sirdev_schedule_speed(dev, dev-&gt;new_speed);</div><div class='ctx'> 		if (unlikely(err)) {</div><div class='ctx'> 			/* should never happen</div><div class='ctx'> 			 * forget the speed change and hope the stack recovers</div><div class='ctx'> 			 */</div><div class='ctx'> 			IRDA_ERROR("%s - schedule speed change failed: %d\n",</div><div class='del'>-				   __FUNCTION__, err);</div><div class='add'>+				   __func__, err);</div><div class='ctx'> 			netif_wake_queue(dev-&gt;netdev);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* else: success</div><div class='hunk'>@@ -532,13 +533,13 @@ EXPORT_SYMBOL(sirdev_write_complete);</div><div class='ctx'> int sirdev_receive(struct sir_dev *dev, const unsigned char *cp, size_t count) </div><div class='ctx'> {</div><div class='ctx'> 	if (!dev || !dev-&gt;netdev) {</div><div class='del'>-		IRDA_WARNING("%s(), not ready yet!\n", __FUNCTION__);</div><div class='add'>+		IRDA_WARNING("%s(), not ready yet!\n", __func__);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;irlap) {</div><div class='ctx'> 		IRDA_WARNING("%s - too early: %p / %zd!\n",</div><div class='del'>-			     __FUNCTION__, cp, count);</div><div class='add'>+			     __func__, cp, count);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -548,7 +549,7 @@ int sirdev_receive(struct sir_dev *dev, const unsigned char *cp, size_t count)</div><div class='ctx'> 		 */</div><div class='ctx'> 		irda_device_set_media_busy(dev-&gt;netdev, TRUE);</div><div class='ctx'> 		dev-&gt;stats.rx_dropped++;</div><div class='del'>-		IRDA_DEBUG(0, "%s; rx-drop: %zd\n", __FUNCTION__, count);</div><div class='add'>+		IRDA_DEBUG(0, "%s; rx-drop: %zd\n", __func__, count);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -600,7 +601,7 @@ static int sirdev_hard_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(ndev);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s(), skb-&gt;len = %d\n", __FUNCTION__, skb-&gt;len);</div><div class='add'>+	IRDA_DEBUG(3, "%s(), skb-&gt;len = %d\n", __func__, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	speed = irda_get_next_speed(skb);</div><div class='ctx'> 	if ((speed != dev-&gt;speed) &amp;&amp; (speed != -1)) {</div><div class='hunk'>@@ -637,7 +638,7 @@ static int sirdev_hard_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	/* Check problems */</div><div class='ctx'> 	if(spin_is_locked(&amp;dev-&gt;tx_lock)) {</div><div class='del'>-		IRDA_DEBUG(3, "%s(), write not completed\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(3, "%s(), write not completed\n", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* serialize with write completion */</div><div class='hunk'>@@ -666,7 +667,7 @@ static int sirdev_hard_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 	else if (unlikely(actual &lt; 0)) {</div><div class='ctx'> 		/* could be dropped later when we have tx_timeout to recover */</div><div class='ctx'> 		IRDA_ERROR("%s: drv-&gt;do_write failed (%d)\n",</div><div class='del'>-			   __FUNCTION__, actual);</div><div class='add'>+			   __func__, actual);</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 		dev-&gt;stats.tx_errors++;		      </div><div class='ctx'> 		dev-&gt;stats.tx_dropped++;		      </div><div class='hunk'>@@ -687,7 +688,7 @@ static int sirdev_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(dev != NULL, return -1;);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__, ndev-&gt;name, cmd);</div><div class='add'>+	IRDA_DEBUG(3, "%s(), %s, (cmd=0x%X)\n", __func__, ndev-&gt;name, cmd);</div><div class='ctx'> 	</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCSBANDWIDTH: /* Set bandwidth */</div><div class='hunk'>@@ -804,7 +805,7 @@ static int sirdev_open(struct net_device *ndev)</div><div class='ctx'> 	if (!try_module_get(drv-&gt;owner))</div><div class='ctx'> 		return -ESTALE;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (sirdev_alloc_buffers(dev))</div><div class='ctx'> 		goto errout_dec;</div><div class='hunk'>@@ -822,7 +823,7 @@ static int sirdev_open(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	netif_wake_queue(ndev);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s - done, speed = %d\n", __FUNCTION__, dev-&gt;speed);</div><div class='add'>+	IRDA_DEBUG(2, "%s - done, speed = %d\n", __func__, dev-&gt;speed);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -842,7 +843,7 @@ static int sirdev_close(struct net_device *ndev)</div><div class='ctx'> 	struct sir_dev *dev = ndev-&gt;priv;</div><div class='ctx'> 	const struct sir_driver *drv;</div><div class='ctx'> </div><div class='del'>-//	IRDA_DEBUG(0, "%s\n", __FUNCTION__);</div><div class='add'>+//	IRDA_DEBUG(0, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(ndev);</div><div class='ctx'> </div><div class='hunk'>@@ -878,7 +879,7 @@ struct sir_dev * sirdev_get_instance(const struct sir_driver *drv, const char *n</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	struct sir_dev *dev;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(0, "%s - %s\n", __FUNCTION__, name);</div><div class='add'>+	IRDA_DEBUG(0, "%s - %s\n", __func__, name);</div><div class='ctx'> </div><div class='ctx'> 	/* instead of adding tests to protect against drv-&gt;do_write==NULL</div><div class='ctx'> 	 * at several places we refuse to create a sir_dev instance for</div><div class='hunk'>@@ -892,7 +893,7 @@ struct sir_dev * sirdev_get_instance(const struct sir_driver *drv, const char *n</div><div class='ctx'> 	 */</div><div class='ctx'> 	ndev = alloc_irdadev(sizeof(*dev));</div><div class='ctx'> 	if (ndev == NULL) {</div><div class='del'>-		IRDA_ERROR("%s - Can't allocate memory for IrDA control block!\n", __FUNCTION__);</div><div class='add'>+		IRDA_ERROR("%s - Can't allocate memory for IrDA control block!\n", __func__);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev = ndev-&gt;priv;</div><div class='hunk'>@@ -921,7 +922,7 @@ struct sir_dev * sirdev_get_instance(const struct sir_driver *drv, const char *n</div><div class='ctx'> 	ndev-&gt;do_ioctl = sirdev_ioctl;</div><div class='ctx'> </div><div class='ctx'> 	if (register_netdev(ndev)) {</div><div class='del'>-		IRDA_ERROR("%s(), register_netdev() failed!\n", __FUNCTION__);</div><div class='add'>+		IRDA_ERROR("%s(), register_netdev() failed!\n", __func__);</div><div class='ctx'> 		goto out_freenetdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -938,7 +939,7 @@ int sirdev_put_instance(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(0, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(0, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;dev-&gt;enable_rx, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -948,7 +949,7 @@ int sirdev_put_instance(struct sir_dev *dev)</div><div class='ctx'> 	if (dev-&gt;dongle_drv)</div><div class='ctx'> 		err = sirdev_schedule_dongle_close(dev);</div><div class='ctx'> 	if (err)</div><div class='del'>-		IRDA_ERROR("%s - error %d\n", __FUNCTION__, err);</div><div class='add'>+		IRDA_ERROR("%s - error %d\n", __func__, err);</div><div class='ctx'> </div><div class='ctx'> 	sirdev_close(dev-&gt;netdev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/irda/sir_dongle.c b/drivers/net/irda/sir_dongle.c<br/>index 25d5b8a96bdc..36030241f7a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/sir_dongle.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/sir_dongle.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/sir_dongle.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/sir_dongle.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@ int irda_register_dongle(struct dongle_driver *new)</div><div class='ctx'> 	struct dongle_driver *drv;</div><div class='ctx'> </div><div class='ctx'> 	IRDA_DEBUG(0, "%s : registering dongle \"%s\" (%d).\n",</div><div class='del'>-		   __FUNCTION__, new-&gt;driver_name, new-&gt;type);</div><div class='add'>+		   __func__, new-&gt;driver_name, new-&gt;type);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dongle_list_lock);</div><div class='ctx'> 	list_for_each(entry, &amp;dongle_list) {</div><div class='head'>diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c<br/>index 78dc8e7837f0..b5360fe99d3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/smsc-ircc2.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/smsc-ircc2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/smsc-ircc2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/smsc-ircc2.c</a></div><div class='hunk'>@@ -460,7 +460,7 @@ static int __init smsc_ircc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	ret = platform_driver_register(&amp;smsc_ircc_driver);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -500,7 +500,7 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	err = smsc_ircc_present(fir_base, sir_base);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -508,7 +508,7 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOMEM;</div><div class='ctx'> 	if (dev_count &gt;= ARRAY_SIZE(dev_self)) {</div><div class='del'>-	        IRDA_WARNING("%s(), too many devices!\n", __FUNCTION__);</div><div class='add'>+	        IRDA_WARNING("%s(), too many devices!\n", __func__);</div><div class='ctx'> 		goto err_out1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -517,7 +517,7 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u</div><div class='ctx'> 	 */</div><div class='ctx'> 	dev = alloc_irdadev(sizeof(struct smsc_ircc_cb));</div><div class='ctx'> 	if (!dev) {</div><div class='del'>-		IRDA_WARNING("%s() can't allocate net device\n", __FUNCTION__);</div><div class='add'>+		IRDA_WARNING("%s() can't allocate net device\n", __func__);</div><div class='ctx'> 		goto err_out1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -633,14 +633,14 @@ static int smsc_ircc_present(unsigned int fir_base, unsigned int sir_base)</div><div class='ctx'> 	if (!request_region(fir_base, SMSC_IRCC2_FIR_CHIP_IO_EXTENT,</div><div class='ctx'> 			    driver_name)) {</div><div class='ctx'> 		IRDA_WARNING("%s: can't get fir_base of 0x%03x\n",</div><div class='del'>-			     __FUNCTION__, fir_base);</div><div class='add'>+			     __func__, fir_base);</div><div class='ctx'> 		goto out1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!request_region(sir_base, SMSC_IRCC2_SIR_CHIP_IO_EXTENT,</div><div class='ctx'> 			    driver_name)) {</div><div class='ctx'> 		IRDA_WARNING("%s: can't get sir_base of 0x%03x\n",</div><div class='del'>-			     __FUNCTION__, sir_base);</div><div class='add'>+			     __func__, sir_base);</div><div class='ctx'> 		goto out2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -656,7 +656,7 @@ static int smsc_ircc_present(unsigned int fir_base, unsigned int sir_base)</div><div class='ctx'> </div><div class='ctx'> 	if (high != 0x10 || low != 0xb8 || (chip != 0xf1 &amp;&amp; chip != 0xf2)) {</div><div class='ctx'> 		IRDA_WARNING("%s(), addr 0x%04x - no device found!\n",</div><div class='del'>-			     __FUNCTION__, fir_base);</div><div class='add'>+			     __func__, fir_base);</div><div class='ctx'> 		goto out3;</div><div class='ctx'> 	}</div><div class='ctx'> 	IRDA_MESSAGE("SMsC IrDA Controller found\n IrCC version %d.%d, "</div><div class='hunk'>@@ -793,7 +793,7 @@ static int smsc_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return -1;);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__, dev-&gt;name, cmd);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __func__, dev-&gt;name, cmd);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCSBANDWIDTH: /* Set bandwidth */</div><div class='hunk'>@@ -878,7 +878,7 @@ int smsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	s32 speed;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(dev != NULL, return 0;);</div><div class='ctx'> </div><div class='hunk'>@@ -953,21 +953,21 @@ static void smsc_ircc_set_fir_speed(struct smsc_ircc_cb *self, u32 speed)</div><div class='ctx'> 		ir_mode = IRCC_CFGA_IRDA_HDLC;</div><div class='ctx'> 		ctrl = IRCC_CRC;</div><div class='ctx'> 		fast = 0;</div><div class='del'>-		IRDA_DEBUG(0, "%s(), handling baud of 576000\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(0, "%s(), handling baud of 576000\n", __func__);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1152000:</div><div class='ctx'> 		ir_mode = IRCC_CFGA_IRDA_HDLC;</div><div class='ctx'> 		ctrl = IRCC_1152 | IRCC_CRC;</div><div class='ctx'> 		fast = IRCC_LCR_A_FAST | IRCC_LCR_A_GP_DATA;</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), handling baud of 1152000\n",</div><div class='del'>-			   __FUNCTION__);</div><div class='add'>+			   __func__);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4000000:</div><div class='ctx'> 		ir_mode = IRCC_CFGA_IRDA_4PPM;</div><div class='ctx'> 		ctrl = IRCC_CRC;</div><div class='ctx'> 		fast = IRCC_LCR_A_FAST;</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), handling baud of 4000000\n",</div><div class='del'>-			   __FUNCTION__);</div><div class='add'>+			   __func__);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	#if 0</div><div class='hunk'>@@ -995,7 +995,7 @@ static void smsc_ircc_fir_start(struct smsc_ircc_cb *self)</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int fir_base;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return;);</div><div class='ctx'> 	dev = self-&gt;netdev;</div><div class='hunk'>@@ -1043,7 +1043,7 @@ static void smsc_ircc_fir_stop(struct smsc_ircc_cb *self)</div><div class='ctx'> {</div><div class='ctx'> 	int fir_base;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return;);</div><div class='ctx'> </div><div class='hunk'>@@ -1067,7 +1067,7 @@ static void smsc_ircc_change_speed(struct smsc_ircc_cb *self, u32 speed)</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int last_speed_was_sir;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(0, "%s() changing speed to: %d\n", __FUNCTION__, speed);</div><div class='add'>+	IRDA_DEBUG(0, "%s() changing speed to: %d\n", __func__, speed);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return;);</div><div class='ctx'> 	dev = self-&gt;netdev;</div><div class='hunk'>@@ -1135,7 +1135,7 @@ void smsc_ircc_set_sir_speed(struct smsc_ircc_cb *self, __u32 speed)</div><div class='ctx'> 	int lcr;    /* Line control reg */</div><div class='ctx'> 	int divisor;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(0, "%s(), Setting speed to: %d\n", __FUNCTION__, speed);</div><div class='add'>+	IRDA_DEBUG(0, "%s(), Setting speed to: %d\n", __func__, speed);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return;);</div><div class='ctx'> 	iobase = self-&gt;io.sir_base;</div><div class='hunk'>@@ -1170,7 +1170,7 @@ void smsc_ircc_set_sir_speed(struct smsc_ircc_cb *self, __u32 speed)</div><div class='ctx'> 	/* Turn on interrups */</div><div class='ctx'> 	outb(UART_IER_RLSI | UART_IER_RDI | UART_IER_THRI, iobase + UART_IER);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s() speed changed to: %d\n", __FUNCTION__, speed);</div><div class='add'>+	IRDA_DEBUG(2, "%s() speed changed to: %d\n", __func__, speed);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1253,7 +1253,7 @@ static void smsc_ircc_dma_xmit(struct smsc_ircc_cb *self, int bofs)</div><div class='ctx'> 	int iobase = self-&gt;io.fir_base;</div><div class='ctx'> 	u8 ctrl;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s\n", __func__);</div><div class='ctx'> #if 1</div><div class='ctx'> 	/* Disable Rx */</div><div class='ctx'> 	register_bank(iobase, 0);</div><div class='hunk'>@@ -1307,7 +1307,7 @@ static void smsc_ircc_dma_xmit_complete(struct smsc_ircc_cb *self)</div><div class='ctx'> {</div><div class='ctx'> 	int iobase = self-&gt;io.fir_base;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s\n", __func__);</div><div class='ctx'> #if 0</div><div class='ctx'> 	/* Disable Tx */</div><div class='ctx'> 	register_bank(iobase, 0);</div><div class='hunk'>@@ -1411,7 +1411,7 @@ static void smsc_ircc_dma_receive_complete(struct smsc_ircc_cb *self)</div><div class='ctx'> </div><div class='ctx'> 	register_bank(iobase, 0);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s\n", __func__);</div><div class='ctx'> #if 0</div><div class='ctx'> 	/* Disable Rx */</div><div class='ctx'> 	register_bank(iobase, 0);</div><div class='hunk'>@@ -1422,7 +1422,7 @@ static void smsc_ircc_dma_receive_complete(struct smsc_ircc_cb *self)</div><div class='ctx'> 	lsr= inb(iobase + IRCC_LSR);</div><div class='ctx'> 	msgcnt = inb(iobase + IRCC_LCR_B) &amp; 0x08;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s: dma count = %d\n", __FUNCTION__,</div><div class='add'>+	IRDA_DEBUG(2, "%s: dma count = %d\n", __func__,</div><div class='ctx'> 		   get_dma_residue(self-&gt;io.dma));</div><div class='ctx'> </div><div class='ctx'> 	len = self-&gt;rx_buff.truesize - get_dma_residue(self-&gt;io.dma);</div><div class='hunk'>@@ -1445,15 +1445,15 @@ static void smsc_ircc_dma_receive_complete(struct smsc_ircc_cb *self)</div><div class='ctx'> 	len -= self-&gt;io.speed &lt; 4000000 ? 2 : 4;</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt; 2 || len &gt; 2050) {</div><div class='del'>-		IRDA_WARNING("%s(), bogus len=%d\n", __FUNCTION__, len);</div><div class='add'>+		IRDA_WARNING("%s(), bogus len=%d\n", __func__, len);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	IRDA_DEBUG(2, "%s: msgcnt = %d, len=%d\n", __FUNCTION__, msgcnt, len);</div><div class='add'>+	IRDA_DEBUG(2, "%s: msgcnt = %d, len=%d\n", __func__, msgcnt, len);</div><div class='ctx'> </div><div class='ctx'> 	skb = dev_alloc_skb(len + 1);</div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		IRDA_WARNING("%s(), memory squeeze, dropping frame.\n",</div><div class='del'>-			     __FUNCTION__);</div><div class='add'>+			     __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Make sure IP header gets aligned */</div><div class='hunk'>@@ -1494,7 +1494,7 @@ static void smsc_ircc_sir_receive(struct smsc_ircc_cb *self)</div><div class='ctx'> </div><div class='ctx'> 		/* Make sure we don't stay here to long */</div><div class='ctx'> 		if (boguscount++ &gt; 32) {</div><div class='del'>-			IRDA_DEBUG(2, "%s(), breaking!\n", __FUNCTION__);</div><div class='add'>+			IRDA_DEBUG(2, "%s(), breaking!\n", __func__);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (inb(iobase + UART_LSR) &amp; UART_LSR_DR);</div><div class='hunk'>@@ -1536,7 +1536,7 @@ static irqreturn_t smsc_ircc_interrupt(int dummy, void *dev_id)</div><div class='ctx'> 	lcra = inb(iobase + IRCC_LCR_A);</div><div class='ctx'> 	lsr = inb(iobase + IRCC_LSR);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(), iir = 0x%02x\n", __FUNCTION__, iir);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), iir = 0x%02x\n", __func__, iir);</div><div class='ctx'> </div><div class='ctx'> 	if (iir &amp; IRCC_IIR_EOM) {</div><div class='ctx'> 		if (self-&gt;io.direction == IO_RECV)</div><div class='hunk'>@@ -1548,7 +1548,7 @@ static irqreturn_t smsc_ircc_interrupt(int dummy, void *dev_id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (iir &amp; IRCC_IIR_ACTIVE_FRAME) {</div><div class='del'>-		/*printk(KERN_WARNING "%s(): Active Frame\n", __FUNCTION__);*/</div><div class='add'>+		/*printk(KERN_WARNING "%s(): Active Frame\n", __func__);*/</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enable interrupts again */</div><div class='hunk'>@@ -1587,11 +1587,11 @@ static irqreturn_t smsc_ircc_interrupt_sir(struct net_device *dev)</div><div class='ctx'> 		lsr = inb(iobase + UART_LSR);</div><div class='ctx'> </div><div class='ctx'> 		IRDA_DEBUG(4, "%s(), iir=%02x, lsr=%02x, iobase=%#x\n",</div><div class='del'>-			    __FUNCTION__, iir, lsr, iobase);</div><div class='add'>+			    __func__, iir, lsr, iobase);</div><div class='ctx'> </div><div class='ctx'> 		switch (iir) {</div><div class='ctx'> 		case UART_IIR_RLSI:</div><div class='del'>-			IRDA_DEBUG(2, "%s(), RLSI\n", __FUNCTION__);</div><div class='add'>+			IRDA_DEBUG(2, "%s(), RLSI\n", __func__);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case UART_IIR_RDI:</div><div class='ctx'> 			/* Receive interrupt */</div><div class='hunk'>@@ -1604,7 +1604,7 @@ static irqreturn_t smsc_ircc_interrupt_sir(struct net_device *dev)</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			IRDA_DEBUG(0, "%s(), unhandled IIR=%#x\n",</div><div class='del'>-				   __FUNCTION__, iir);</div><div class='add'>+				   __func__, iir);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1631,11 +1631,11 @@ static int ircc_is_receiving(struct smsc_ircc_cb *self)</div><div class='ctx'> 	int status = FALSE;</div><div class='ctx'> 	/* int iobase; */</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return FALSE;);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(0, "%s: dma count = %d\n", __FUNCTION__,</div><div class='add'>+	IRDA_DEBUG(0, "%s: dma count = %d\n", __func__,</div><div class='ctx'> 		   get_dma_residue(self-&gt;io.dma));</div><div class='ctx'> </div><div class='ctx'> 	status = (self-&gt;rx_buff.state != OUTSIDE_FRAME);</div><div class='hunk'>@@ -1652,7 +1652,7 @@ static int smsc_ircc_request_irq(struct smsc_ircc_cb *self)</div><div class='ctx'> 			    self-&gt;netdev-&gt;name, self-&gt;netdev);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), unable to allocate irq=%d, err=%d\n",</div><div class='del'>-			   __FUNCTION__, self-&gt;io.irq, error);</div><div class='add'>+			   __func__, self-&gt;io.irq, error);</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -1696,21 +1696,21 @@ static int smsc_ircc_net_open(struct net_device *dev)</div><div class='ctx'> 	struct smsc_ircc_cb *self;</div><div class='ctx'> 	char hwname[16];</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(dev != NULL, return -1;);</div><div class='ctx'> 	self = netdev_priv(dev);</div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return 0;);</div><div class='ctx'> </div><div class='ctx'> 	if (self-&gt;io.suspended) {</div><div class='del'>-		IRDA_DEBUG(0, "%s(), device is suspended\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(0, "%s(), device is suspended\n", __func__);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(self-&gt;io.irq, smsc_ircc_interrupt, 0, dev-&gt;name,</div><div class='ctx'> 			(void *) dev)) {</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), unable to allocate irq=%d\n",</div><div class='del'>-			   __FUNCTION__, self-&gt;io.irq);</div><div class='add'>+			   __func__, self-&gt;io.irq);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1734,7 +1734,7 @@ static int smsc_ircc_net_open(struct net_device *dev)</div><div class='ctx'> 		smsc_ircc_net_close(dev);</div><div class='ctx'> </div><div class='ctx'> 		IRDA_WARNING("%s(), unable to allocate DMA=%d\n",</div><div class='del'>-			     __FUNCTION__, self-&gt;io.dma);</div><div class='add'>+			     __func__, self-&gt;io.dma);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1753,7 +1753,7 @@ static int smsc_ircc_net_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct smsc_ircc_cb *self;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(dev != NULL, return -1;);</div><div class='ctx'> 	self = netdev_priv(dev);</div><div class='hunk'>@@ -1836,7 +1836,7 @@ static int smsc_ircc_resume(struct platform_device *dev)</div><div class='ctx'>  */</div><div class='ctx'> static int __exit smsc_ircc_close(struct smsc_ircc_cb *self)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(1, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return -1;);</div><div class='ctx'> </div><div class='hunk'>@@ -1848,12 +1848,12 @@ static int __exit smsc_ircc_close(struct smsc_ircc_cb *self)</div><div class='ctx'> 	smsc_ircc_stop_interrupts(self);</div><div class='ctx'> </div><div class='ctx'> 	/* Release the PORTS that this driver is using */</div><div class='del'>-	IRDA_DEBUG(0, "%s(), releasing 0x%03x\n",  __FUNCTION__,</div><div class='add'>+	IRDA_DEBUG(0, "%s(), releasing 0x%03x\n",  __func__,</div><div class='ctx'> 		   self-&gt;io.fir_base);</div><div class='ctx'> </div><div class='ctx'> 	release_region(self-&gt;io.fir_base, self-&gt;io.fir_ext);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(0, "%s(), releasing 0x%03x\n", __FUNCTION__,</div><div class='add'>+	IRDA_DEBUG(0, "%s(), releasing 0x%03x\n", __func__,</div><div class='ctx'> 		   self-&gt;io.sir_base);</div><div class='ctx'> </div><div class='ctx'> 	release_region(self-&gt;io.sir_base, self-&gt;io.sir_ext);</div><div class='hunk'>@@ -1875,7 +1875,7 @@ static void __exit smsc_ircc_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		if (dev_self[i])</div><div class='hunk'>@@ -1899,7 +1899,7 @@ void smsc_ircc_sir_start(struct smsc_ircc_cb *self)</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int fir_base, sir_base;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return;);</div><div class='ctx'> 	dev = self-&gt;netdev;</div><div class='hunk'>@@ -1926,7 +1926,7 @@ void smsc_ircc_sir_start(struct smsc_ircc_cb *self)</div><div class='ctx'> 	/* Turn on interrups */</div><div class='ctx'> 	outb(UART_IER_RLSI | UART_IER_RDI |UART_IER_THRI, sir_base + UART_IER);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s() - exit\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s() - exit\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	outb(0x00, fir_base + IRCC_MASTER);</div><div class='ctx'> }</div><div class='hunk'>@@ -1936,7 +1936,7 @@ void smsc_ircc_sir_stop(struct smsc_ircc_cb *self)</div><div class='ctx'> {</div><div class='ctx'> 	int iobase;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s\n", __func__);</div><div class='ctx'> 	iobase = self-&gt;io.sir_base;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset UART */</div><div class='hunk'>@@ -1962,7 +1962,7 @@ static void smsc_ircc_sir_write_wakeup(struct smsc_ircc_cb *self)</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return;);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(4, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(4, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	iobase = self-&gt;io.sir_base;</div><div class='ctx'> </div><div class='hunk'>@@ -1984,7 +1984,7 @@ static void smsc_ircc_sir_write_wakeup(struct smsc_ircc_cb *self)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (self-&gt;new_speed) {</div><div class='ctx'> 			IRDA_DEBUG(5, "%s(), Changing speed to %d.\n",</div><div class='del'>-				   __FUNCTION__, self-&gt;new_speed);</div><div class='add'>+				   __func__, self-&gt;new_speed);</div><div class='ctx'> 			smsc_ircc_sir_wait_hw_transmitter_finish(self);</div><div class='ctx'> 			smsc_ircc_change_speed(self, self-&gt;new_speed);</div><div class='ctx'> 			self-&gt;new_speed = 0;</div><div class='hunk'>@@ -2023,7 +2023,7 @@ static int smsc_ircc_sir_write(int iobase, int fifo_size, __u8 *buf, int len)</div><div class='ctx'> </div><div class='ctx'> 	/* Tx FIFO should be empty! */</div><div class='ctx'> 	if (!(inb(iobase + UART_LSR) &amp; UART_LSR_THRE)) {</div><div class='del'>-		IRDA_WARNING("%s(), failed, fifo not empty!\n", __FUNCTION__);</div><div class='add'>+		IRDA_WARNING("%s(), failed, fifo not empty!\n", __func__);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2123,7 +2123,7 @@ static void smsc_ircc_sir_wait_hw_transmitter_finish(struct smsc_ircc_cb *self)</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> </div><div class='ctx'> 	if (count == 0)</div><div class='del'>-		IRDA_DEBUG(0, "%s(): stuck transmitter\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(0, "%s(): stuck transmitter\n", __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2145,7 +2145,7 @@ static int __init smsc_ircc_look_for_chips(void)</div><div class='ctx'> 	while (address-&gt;cfg_base) {</div><div class='ctx'> 		cfg_base = address-&gt;cfg_base;</div><div class='ctx'> </div><div class='del'>-		/*printk(KERN_WARNING "%s(): probing: 0x%02x for: 0x%02x\n", __FUNCTION__, cfg_base, address-&gt;type);*/</div><div class='add'>+		/*printk(KERN_WARNING "%s(): probing: 0x%02x for: 0x%02x\n", __func__, cfg_base, address-&gt;type);*/</div><div class='ctx'> </div><div class='ctx'> 		if (address-&gt;type &amp; SMSCSIO_TYPE_FDC) {</div><div class='ctx'> 			type = "FDC";</div><div class='hunk'>@@ -2184,7 +2184,7 @@ static int __init smsc_superio_flat(const struct smsc_chip *chips, unsigned shor</div><div class='ctx'> 	u8 mode, dma, irq;</div><div class='ctx'> 	int ret = -ENODEV;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (smsc_ircc_probe(cfgbase, SMSCSIOFLAT_DEVICEID_REG, chips, type) == NULL)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -2192,10 +2192,10 @@ static int __init smsc_superio_flat(const struct smsc_chip *chips, unsigned shor</div><div class='ctx'> 	outb(SMSCSIOFLAT_UARTMODE0C_REG, cfgbase);</div><div class='ctx'> 	mode = inb(cfgbase + 1);</div><div class='ctx'> </div><div class='del'>-	/*printk(KERN_WARNING "%s(): mode: 0x%02x\n", __FUNCTION__, mode);*/</div><div class='add'>+	/*printk(KERN_WARNING "%s(): mode: 0x%02x\n", __func__, mode);*/</div><div class='ctx'> </div><div class='ctx'> 	if (!(mode &amp; SMSCSIOFLAT_UART2MODE_VAL_IRDA))</div><div class='del'>-		IRDA_WARNING("%s(): IrDA not enabled\n", __FUNCTION__);</div><div class='add'>+		IRDA_WARNING("%s(): IrDA not enabled\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	outb(SMSCSIOFLAT_UART2BASEADDR_REG, cfgbase);</div><div class='ctx'> 	sirbase = inb(cfgbase + 1) &lt;&lt; 2;</div><div class='hunk'>@@ -2212,7 +2212,7 @@ static int __init smsc_superio_flat(const struct smsc_chip *chips, unsigned shor</div><div class='ctx'> 	outb(SMSCSIOFLAT_UARTIRQSELECT_REG, cfgbase);</div><div class='ctx'> 	irq = inb(cfgbase + 1) &amp; SMSCSIOFLAT_UART2IRQSELECT_MASK;</div><div class='ctx'> </div><div class='del'>-	IRDA_MESSAGE("%s(): fir: 0x%02x, sir: 0x%02x, dma: %02d, irq: %d, mode: 0x%02x\n", __FUNCTION__, firbase, sirbase, dma, irq, mode);</div><div class='add'>+	IRDA_MESSAGE("%s(): fir: 0x%02x, sir: 0x%02x, dma: %02d, irq: %d, mode: 0x%02x\n", __func__, firbase, sirbase, dma, irq, mode);</div><div class='ctx'> </div><div class='ctx'> 	if (firbase &amp;&amp; smsc_ircc_open(firbase, sirbase, dma, irq) == 0)</div><div class='ctx'> 		ret = 0;</div><div class='hunk'>@@ -2234,7 +2234,7 @@ static int __init smsc_superio_paged(const struct smsc_chip *chips, unsigned sho</div><div class='ctx'> 	unsigned short fir_io, sir_io;</div><div class='ctx'> 	int ret = -ENODEV;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (smsc_ircc_probe(cfg_base, 0x20, chips, type) == NULL)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -2268,7 +2268,7 @@ static int __init smsc_superio_paged(const struct smsc_chip *chips, unsigned sho</div><div class='ctx'> </div><div class='ctx'> static int __init smsc_access(unsigned short cfg_base, unsigned char reg)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(1, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	outb(reg, cfg_base);</div><div class='ctx'> 	return inb(cfg_base) != reg ? -1 : 0;</div><div class='hunk'>@@ -2278,7 +2278,7 @@ static const struct smsc_chip * __init smsc_ircc_probe(unsigned short cfg_base,</div><div class='ctx'> {</div><div class='ctx'> 	u8 devid, xdevid, rev;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(1, "%s\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(1, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Leave configuration */</div><div class='ctx'> </div><div class='hunk'>@@ -2353,7 +2353,7 @@ static int __init smsc_superio_fdc(unsigned short cfg_base)</div><div class='ctx'> </div><div class='ctx'> 	if (!request_region(cfg_base, 2, driver_name)) {</div><div class='ctx'> 		IRDA_WARNING("%s: can't get cfg_base of 0x%03x\n",</div><div class='del'>-			     __FUNCTION__, cfg_base);</div><div class='add'>+			     __func__, cfg_base);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!smsc_superio_flat(fdc_chips_flat, cfg_base, "FDC") ||</div><div class='ctx'> 		    !smsc_superio_paged(fdc_chips_paged, cfg_base, "FDC"))</div><div class='hunk'>@@ -2371,7 +2371,7 @@ static int __init smsc_superio_lpc(unsigned short cfg_base)</div><div class='ctx'> </div><div class='ctx'> 	if (!request_region(cfg_base, 2, driver_name)) {</div><div class='ctx'> 		IRDA_WARNING("%s: can't get cfg_base of 0x%03x\n",</div><div class='del'>-			     __FUNCTION__, cfg_base);</div><div class='add'>+			     __func__, cfg_base);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!smsc_superio_flat(lpc_chips_flat, cfg_base, "LPC") ||</div><div class='ctx'> 		    !smsc_superio_paged(lpc_chips_paged, cfg_base, "LPC"))</div><div class='hunk'>@@ -2932,7 +2932,7 @@ static void smsc_ircc_set_transceiver_smsc_ircc_atc(int fir_base, u32 speed)</div><div class='ctx'> 		/* empty */;</div><div class='ctx'> </div><div class='ctx'> 	if (val)</div><div class='del'>-		IRDA_WARNING("%s(): ATC: 0x%02x\n", __FUNCTION__,</div><div class='add'>+		IRDA_WARNING("%s(): ATC: 0x%02x\n", __func__,</div><div class='ctx'> 			     inb(fir_base + IRCC_ATC));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/irda/tekram-sir.c b/drivers/net/irda/tekram-sir.c<br/>index d1ce5ae6a172..048a15422844 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/tekram-sir.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/tekram-sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/tekram-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/tekram-sir.c</a></div><div class='hunk'>@@ -77,7 +77,7 @@ static int tekram_open(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct qos_info *qos = &amp;dev-&gt;qos;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	sirdev_set_dtr_rts(dev, TRUE, TRUE);</div><div class='ctx'> </div><div class='hunk'>@@ -92,7 +92,7 @@ static int tekram_open(struct sir_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static int tekram_close(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Power off dongle */</div><div class='ctx'> 	sirdev_set_dtr_rts(dev, FALSE, FALSE);</div><div class='hunk'>@@ -130,7 +130,7 @@ static int tekram_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> 	u8 byte;</div><div class='ctx'> 	static int ret = 0;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	switch(state) {</div><div class='ctx'> 	case SIRDEV_STATE_DONGLE_SPEED:</div><div class='hunk'>@@ -179,7 +179,7 @@ static int tekram_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		IRDA_ERROR("%s - undefined state %d\n", __FUNCTION__, state);</div><div class='add'>+		IRDA_ERROR("%s - undefined state %d\n", __func__, state);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -204,7 +204,7 @@ static int tekram_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> </div><div class='ctx'> static int tekram_reset(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear DTR, Set RTS */</div><div class='ctx'> 	sirdev_set_dtr_rts(dev, FALSE, TRUE); </div><div class='head'>diff --git a/drivers/net/irda/toim3232-sir.c b/drivers/net/irda/toim3232-sir.c<br/>index aa1a9b0ed83e..fcf287b749db 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/toim3232-sir.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/toim3232-sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/toim3232-sir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/toim3232-sir.c</a></div><div class='hunk'>@@ -181,7 +181,7 @@ static int toim3232_open(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct qos_info *qos = &amp;dev-&gt;qos;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Pull the lines high to start with.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -209,7 +209,7 @@ static int toim3232_open(struct sir_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static int toim3232_close(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Power off dongle */</div><div class='ctx'> 	sirdev_set_dtr_rts(dev, FALSE, FALSE);</div><div class='hunk'>@@ -241,7 +241,7 @@ static int toim3232_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> 	u8 byte;</div><div class='ctx'> 	static int ret = 0;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	switch(state) {</div><div class='ctx'> 	case SIRDEV_STATE_DONGLE_SPEED:</div><div class='hunk'>@@ -299,7 +299,7 @@ static int toim3232_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_ERR "%s - undefined state %d\n", __FUNCTION__, state);</div><div class='add'>+		printk(KERN_ERR "%s - undefined state %d\n", __func__, state);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -344,7 +344,7 @@ static int toim3232_change_speed(struct sir_dev *dev, unsigned speed)</div><div class='ctx'> </div><div class='ctx'> static int toim3232_reset(struct sir_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(2, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Switch off both DTR and RTS to switch off dongle */</div><div class='ctx'> 	sirdev_set_dtr_rts(dev, FALSE, FALSE);</div><div class='head'>diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c<br/>index 04ad3573b159..84e609ea5fbb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/via-ircc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/via-ircc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/via-ircc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/via-ircc.c</a></div><div class='hunk'>@@ -152,12 +152,12 @@ static int __init via_ircc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	rc = pci_register_driver(&amp;via_driver);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(): error rc = %d, returning  -ENODEV...\n",</div><div class='del'>-			   __FUNCTION__, rc);</div><div class='add'>+			   __func__, rc);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -170,11 +170,11 @@ static int __devinit via_init_one (struct pci_dev *pcidev, const struct pci_devi</div><div class='ctx'> 	u16 Chipset,FirDRQ1,FirDRQ0,FirIRQ,FirIOBase;</div><div class='ctx'> 	chipio_t info;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(): Device ID=(0X%X)\n", __FUNCTION__, id-&gt;device);</div><div class='add'>+	IRDA_DEBUG(2, "%s(): Device ID=(0X%X)\n", __func__, id-&gt;device);</div><div class='ctx'> </div><div class='ctx'> 	rc = pci_enable_device (pcidev);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		IRDA_DEBUG(0, "%s(): error rc = %d\n", __FUNCTION__, rc);</div><div class='add'>+		IRDA_DEBUG(0, "%s(): error rc = %d\n", __func__, rc);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -185,7 +185,7 @@ static int __devinit via_init_one (struct pci_dev *pcidev, const struct pci_devi</div><div class='ctx'> 		Chipset=0x3076;</div><div class='ctx'> </div><div class='ctx'> 	if (Chipset==0x3076) {</div><div class='del'>-		IRDA_DEBUG(2, "%s(): Chipset = 3076\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(2, "%s(): Chipset = 3076\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 		WriteLPCReg(7,0x0c );</div><div class='ctx'> 		temp=ReadLPCReg(0x30);//check if BIOS Enable Fir</div><div class='hunk'>@@ -222,7 +222,7 @@ static int __devinit via_init_one (struct pci_dev *pcidev, const struct pci_devi</div><div class='ctx'> 		} else</div><div class='ctx'> 			rc = -ENODEV; //IR not turn on	 </div><div class='ctx'> 	} else { //Not VT1211</div><div class='del'>-		IRDA_DEBUG(2, "%s(): Chipset = 3096\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(2, "%s(): Chipset = 3096\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 		pci_read_config_byte(pcidev,0x67,&amp;bTmp);//check if BIOS Enable Fir</div><div class='ctx'> 		if((bTmp&amp;0x01)==1) {  // BIOS enable FIR</div><div class='hunk'>@@ -262,7 +262,7 @@ static int __devinit via_init_one (struct pci_dev *pcidev, const struct pci_devi</div><div class='ctx'> 			rc = -ENODEV; //IR not turn on !!!!!</div><div class='ctx'> 	}//Not VT1211</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(): End - rc = %d\n", __FUNCTION__, rc);</div><div class='add'>+	IRDA_DEBUG(2, "%s(): End - rc = %d\n", __func__, rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -276,7 +276,7 @@ static void via_ircc_clean(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; i &lt; ARRAY_SIZE(dev_self); i++) {</div><div class='ctx'> 		if (dev_self[i])</div><div class='hunk'>@@ -286,7 +286,7 @@ static void via_ircc_clean(void)</div><div class='ctx'> </div><div class='ctx'> static void __devexit via_remove_one (struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(3, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME : This is ugly. We should use pci_get_drvdata(pdev);</div><div class='ctx'> 	 * to get our driver instance and call directly via_ircc_close().</div><div class='hunk'>@@ -301,7 +301,7 @@ static void __devexit via_remove_one (struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> static void __exit via_ircc_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(3, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME : This should be redundant, as pci_unregister_driver()</div><div class='ctx'> 	 * should call via_remove_one() on each device.</div><div class='hunk'>@@ -324,7 +324,7 @@ static __devinit int via_ircc_open(int i, chipio_t * info, unsigned int id)</div><div class='ctx'> 	struct via_ircc_cb *self;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (i &gt;= ARRAY_SIZE(dev_self))</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -360,7 +360,7 @@ static __devinit int via_ircc_open(int i, chipio_t * info, unsigned int id)</div><div class='ctx'> 	/* Reserve the ioports that we need */</div><div class='ctx'> 	if (!request_region(self-&gt;io.fir_base, self-&gt;io.fir_ext, driver_name)) {</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), can't get iobase of 0x%03x\n",</div><div class='del'>-			   __FUNCTION__, self-&gt;io.fir_base);</div><div class='add'>+			   __func__, self-&gt;io.fir_base);</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto err_out1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -471,7 +471,7 @@ static int via_ircc_close(struct via_ircc_cb *self)</div><div class='ctx'> {</div><div class='ctx'> 	int iobase;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return -1;);</div><div class='ctx'> </div><div class='hunk'>@@ -483,7 +483,7 @@ static int via_ircc_close(struct via_ircc_cb *self)</div><div class='ctx'> </div><div class='ctx'> 	/* Release the PORT that this driver is using */</div><div class='ctx'> 	IRDA_DEBUG(2, "%s(), Releasing Region %03x\n",</div><div class='del'>-		   __FUNCTION__, self-&gt;io.fir_base);</div><div class='add'>+		   __func__, self-&gt;io.fir_base);</div><div class='ctx'> 	release_region(self-&gt;io.fir_base, self-&gt;io.fir_ext);</div><div class='ctx'> 	if (self-&gt;tx_buff.head)</div><div class='ctx'> 		dma_free_coherent(NULL, self-&gt;tx_buff.truesize,</div><div class='hunk'>@@ -509,7 +509,7 @@ static void via_hw_init(struct via_ircc_cb *self)</div><div class='ctx'> {</div><div class='ctx'> 	int iobase = self-&gt;io.fir_base;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	SetMaxRxPacketSize(iobase, 0x0fff);	//set to max:4095</div><div class='ctx'> 	// FIFO Init</div><div class='hunk'>@@ -582,7 +582,7 @@ static void via_ircc_change_dongle_speed(int iobase, int speed,</div><div class='ctx'> 	speed = speed;</div><div class='ctx'> </div><div class='ctx'> 	IRDA_DEBUG(1, "%s(): change_dongle_speed to %d for 0x%x, %d\n",</div><div class='del'>-		   __FUNCTION__, speed, iobase, dongle_id);</div><div class='add'>+		   __func__, speed, iobase, dongle_id);</div><div class='ctx'> </div><div class='ctx'> 	switch (dongle_id) {</div><div class='ctx'> </div><div class='hunk'>@@ -671,7 +671,7 @@ static void via_ircc_change_dongle_speed(int iobase, int speed,</div><div class='ctx'> </div><div class='ctx'> 	case 0x11:		/* Temic TFDS4500 */</div><div class='ctx'> </div><div class='del'>-		IRDA_DEBUG(2, "%s: Temic TFDS4500: One RX pin, TX normal, RX inverted.\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(2, "%s: Temic TFDS4500: One RX pin, TX normal, RX inverted.\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 		UseOneRX(iobase, ON);	//use ONE RX....RX1</div><div class='ctx'> 		InvertTX(iobase, OFF);</div><div class='hunk'>@@ -689,7 +689,7 @@ static void via_ircc_change_dongle_speed(int iobase, int speed,</div><div class='ctx'> 			SlowIRRXLowActive(iobase, OFF);</div><div class='ctx'> </div><div class='ctx'> 		} else{</div><div class='del'>-			IRDA_DEBUG(0, "%s: Warning: TFDS4500 not running in SIR mode !\n", __FUNCTION__);</div><div class='add'>+			IRDA_DEBUG(0, "%s: Warning: TFDS4500 not running in SIR mode !\n", __func__);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -707,7 +707,7 @@ static void via_ircc_change_dongle_speed(int iobase, int speed,</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		IRDA_ERROR("%s: Error: dongle_id %d unsupported !\n",</div><div class='del'>-			   __FUNCTION__, dongle_id);</div><div class='add'>+			   __func__, dongle_id);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -726,7 +726,7 @@ static void via_ircc_change_speed(struct via_ircc_cb *self, __u32 speed)</div><div class='ctx'> 	iobase = self-&gt;io.fir_base;</div><div class='ctx'> 	/* Update accounting for new speed */</div><div class='ctx'> 	self-&gt;io.speed = speed;</div><div class='del'>-	IRDA_DEBUG(1, "%s: change_speed to %d bps.\n", __FUNCTION__, speed);</div><div class='add'>+	IRDA_DEBUG(1, "%s: change_speed to %d bps.\n", __func__, speed);</div><div class='ctx'> </div><div class='ctx'> 	WriteReg(iobase, I_ST_CT_0, 0x0);</div><div class='ctx'> </div><div class='hunk'>@@ -957,7 +957,7 @@ static int via_ircc_dma_xmit(struct via_ircc_cb *self, u16 iobase)</div><div class='ctx'> 			self-&gt;tx_buff.head) + self-&gt;tx_buff_dma,</div><div class='ctx'> 		       self-&gt;tx_fifo.queue[self-&gt;tx_fifo.ptr].len, DMA_TX_MODE);</div><div class='ctx'> 	IRDA_DEBUG(1, "%s: tx_fifo.ptr=%x,len=%x,tx_fifo.len=%x..\n",</div><div class='del'>-		   __FUNCTION__, self-&gt;tx_fifo.ptr,</div><div class='add'>+		   __func__, self-&gt;tx_fifo.ptr,</div><div class='ctx'> 		   self-&gt;tx_fifo.queue[self-&gt;tx_fifo.ptr].len,</div><div class='ctx'> 		   self-&gt;tx_fifo.len);</div><div class='ctx'> </div><div class='hunk'>@@ -981,7 +981,7 @@ static int via_ircc_dma_xmit_complete(struct via_ircc_cb *self)</div><div class='ctx'> 	int ret = TRUE;</div><div class='ctx'> 	u8 Tx_status;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	iobase = self-&gt;io.fir_base;</div><div class='ctx'> 	/* Disable DMA */</div><div class='hunk'>@@ -1014,7 +1014,7 @@ static int via_ircc_dma_xmit_complete(struct via_ircc_cb *self)</div><div class='ctx'> 	}</div><div class='ctx'> 	IRDA_DEBUG(1,</div><div class='ctx'> 		   "%s: tx_fifo.len=%x ,tx_fifo.ptr=%x,tx_fifo.free=%x...\n",</div><div class='del'>-		   __FUNCTION__,</div><div class='add'>+		   __func__,</div><div class='ctx'> 		   self-&gt;tx_fifo.len, self-&gt;tx_fifo.ptr, self-&gt;tx_fifo.free);</div><div class='ctx'> /* F01_S</div><div class='ctx'> 	// Any frames to be sent back-to-back? </div><div class='hunk'>@@ -1050,7 +1050,7 @@ static int via_ircc_dma_receive(struct via_ircc_cb *self)</div><div class='ctx'> </div><div class='ctx'> 	iobase = self-&gt;io.fir_base;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	self-&gt;tx_fifo.len = self-&gt;tx_fifo.ptr = self-&gt;tx_fifo.free = 0;</div><div class='ctx'> 	self-&gt;tx_fifo.tail = self-&gt;tx_buff.head;</div><div class='hunk'>@@ -1134,13 +1134,13 @@ static int via_ircc_dma_receive_complete(struct via_ircc_cb *self,</div><div class='ctx'> 			return TRUE;	//interrupt only, data maybe move by RxT  </div><div class='ctx'> 		if (((len - 4) &lt; 2) || ((len - 4) &gt; 2048)) {</div><div class='ctx'> 			IRDA_DEBUG(1, "%s(): Trouble:len=%x,CurCount=%x,LastCount=%x..\n",</div><div class='del'>-				   __FUNCTION__, len, RxCurCount(iobase, self),</div><div class='add'>+				   __func__, len, RxCurCount(iobase, self),</div><div class='ctx'> 				   self-&gt;RxLastCount);</div><div class='ctx'> 			hwreset(self);</div><div class='ctx'> 			return FALSE;</div><div class='ctx'> 		}</div><div class='ctx'> 		IRDA_DEBUG(2, "%s(): fifo.len=%x,len=%x,CurCount=%x..\n",</div><div class='del'>-			   __FUNCTION__,</div><div class='add'>+			   __func__,</div><div class='ctx'> 			   st_fifo-&gt;len, len - 4, RxCurCount(iobase, self));</div><div class='ctx'> </div><div class='ctx'> 		st_fifo-&gt;entries[st_fifo-&gt;tail].status = status;</div><div class='hunk'>@@ -1187,7 +1187,7 @@ F01_E */</div><div class='ctx'> 		skb_put(skb, len - 4);</div><div class='ctx'> </div><div class='ctx'> 		skb_copy_to_linear_data(skb, self-&gt;rx_buff.data, len - 4);</div><div class='del'>-		IRDA_DEBUG(2, "%s(): len=%x.rx_buff=%p\n", __FUNCTION__,</div><div class='add'>+		IRDA_DEBUG(2, "%s(): len=%x.rx_buff=%p\n", __func__,</div><div class='ctx'> 			   len - 4, self-&gt;rx_buff.data);</div><div class='ctx'> </div><div class='ctx'> 		// Move to next frame </div><div class='hunk'>@@ -1217,7 +1217,7 @@ static int upload_rxdata(struct via_ircc_cb *self, int iobase)</div><div class='ctx'> </div><div class='ctx'> 	len = GetRecvByte(iobase, self);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(): len=%x\n", __FUNCTION__, len);</div><div class='add'>+	IRDA_DEBUG(2, "%s(): len=%x\n", __func__, len);</div><div class='ctx'> </div><div class='ctx'> 	if ((len - 4) &lt; 2) {</div><div class='ctx'> 		self-&gt;stats.rx_dropped++;</div><div class='hunk'>@@ -1302,7 +1302,7 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase)</div><div class='ctx'> 			skb_put(skb, len - 4);</div><div class='ctx'> 			skb_copy_to_linear_data(skb, self-&gt;rx_buff.data, len - 4);</div><div class='ctx'> </div><div class='del'>-			IRDA_DEBUG(2, "%s(): len=%x.head=%x\n", __FUNCTION__,</div><div class='add'>+			IRDA_DEBUG(2, "%s(): len=%x.head=%x\n", __func__,</div><div class='ctx'> 				   len - 4, st_fifo-&gt;head);</div><div class='ctx'> </div><div class='ctx'> 			// Move to next frame </div><div class='hunk'>@@ -1318,7 +1318,7 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase)</div><div class='ctx'> </div><div class='ctx'> 		IRDA_DEBUG(2,</div><div class='ctx'> 			   "%s(): End of upload HostStatus=%x,RxStatus=%x\n",</div><div class='del'>-			   __FUNCTION__,</div><div class='add'>+			   __func__,</div><div class='ctx'> 			   GetHostStatus(iobase), GetRXStatus(iobase));</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1358,7 +1358,7 @@ static irqreturn_t via_ircc_interrupt(int dummy, void *dev_id)</div><div class='ctx'> 	iHostIntType = GetHostStatus(iobase);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_DEBUG(4, "%s(): iHostIntType %02x:  %s %s %s  %02x\n",</div><div class='del'>-		   __FUNCTION__, iHostIntType,</div><div class='add'>+		   __func__, iHostIntType,</div><div class='ctx'> 		   (iHostIntType &amp; 0x40) ? "Timer" : "",</div><div class='ctx'> 		   (iHostIntType &amp; 0x20) ? "Tx" : "",</div><div class='ctx'> 		   (iHostIntType &amp; 0x10) ? "Rx" : "",</div><div class='hunk'>@@ -1388,7 +1388,7 @@ static irqreturn_t via_ircc_interrupt(int dummy, void *dev_id)</div><div class='ctx'> 		iTxIntType = GetTXStatus(iobase);</div><div class='ctx'> </div><div class='ctx'> 		IRDA_DEBUG(4, "%s(): iTxIntType %02x:  %s %s %s %s\n",</div><div class='del'>-			   __FUNCTION__, iTxIntType,</div><div class='add'>+			   __func__, iTxIntType,</div><div class='ctx'> 			   (iTxIntType &amp; 0x08) ? "FIFO underr." : "",</div><div class='ctx'> 			   (iTxIntType &amp; 0x04) ? "EOM" : "",</div><div class='ctx'> 			   (iTxIntType &amp; 0x02) ? "FIFO ready" : "",</div><div class='hunk'>@@ -1412,7 +1412,7 @@ static irqreturn_t via_ircc_interrupt(int dummy, void *dev_id)</div><div class='ctx'> 		iRxIntType = GetRXStatus(iobase);</div><div class='ctx'> </div><div class='ctx'> 		IRDA_DEBUG(4, "%s(): iRxIntType %02x:  %s %s %s %s %s %s %s\n",</div><div class='del'>-			   __FUNCTION__, iRxIntType,</div><div class='add'>+			   __func__, iRxIntType,</div><div class='ctx'> 			   (iRxIntType &amp; 0x80) ? "PHY err."	: "",</div><div class='ctx'> 			   (iRxIntType &amp; 0x40) ? "CRC err"	: "",</div><div class='ctx'> 			   (iRxIntType &amp; 0x20) ? "FIFO overr."	: "",</div><div class='hunk'>@@ -1421,7 +1421,7 @@ static irqreturn_t via_ircc_interrupt(int dummy, void *dev_id)</div><div class='ctx'> 			   (iRxIntType &amp; 0x02) ? "RxMaxLen"	: "",</div><div class='ctx'> 			   (iRxIntType &amp; 0x01) ? "SIR bad"	: "");</div><div class='ctx'> 		if (!iRxIntType)</div><div class='del'>-			IRDA_DEBUG(3, "%s(): RxIRQ =0\n", __FUNCTION__);</div><div class='add'>+			IRDA_DEBUG(3, "%s(): RxIRQ =0\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 		if (iRxIntType &amp; 0x10) {</div><div class='ctx'> 			if (via_ircc_dma_receive_complete(self, iobase)) {</div><div class='hunk'>@@ -1431,7 +1431,7 @@ static irqreturn_t via_ircc_interrupt(int dummy, void *dev_id)</div><div class='ctx'> 		}		// No ERR     </div><div class='ctx'> 		else {		//ERR</div><div class='ctx'> 			IRDA_DEBUG(4, "%s(): RxIRQ ERR:iRxIntType=%x,HostIntType=%x,CurCount=%x,RxLastCount=%x_____\n",</div><div class='del'>-				   __FUNCTION__, iRxIntType, iHostIntType,</div><div class='add'>+				   __func__, iRxIntType, iHostIntType,</div><div class='ctx'> 				   RxCurCount(iobase, self),</div><div class='ctx'> 				   self-&gt;RxLastCount);</div><div class='ctx'> </div><div class='hunk'>@@ -1456,7 +1456,7 @@ static void hwreset(struct via_ircc_cb *self)</div><div class='ctx'> 	int iobase;</div><div class='ctx'> 	iobase = self-&gt;io.fir_base;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	ResetChip(iobase, 5);</div><div class='ctx'> 	EnableDMA(iobase, OFF);</div><div class='hunk'>@@ -1501,7 +1501,7 @@ static int via_ircc_is_receiving(struct via_ircc_cb *self)</div><div class='ctx'> 	if (CkRxRecv(iobase, self))</div><div class='ctx'> 		status = TRUE;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(): status=%x....\n", __FUNCTION__, status);</div><div class='add'>+	IRDA_DEBUG(2, "%s(): status=%x....\n", __func__, status);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -1519,7 +1519,7 @@ static int via_ircc_net_open(struct net_device *dev)</div><div class='ctx'> 	int iobase;</div><div class='ctx'> 	char hwname[32];</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(dev != NULL, return -1;);</div><div class='ctx'> 	self = (struct via_ircc_cb *) dev-&gt;priv;</div><div class='hunk'>@@ -1586,7 +1586,7 @@ static int via_ircc_net_close(struct net_device *dev)</div><div class='ctx'> 	struct via_ircc_cb *self;</div><div class='ctx'> 	int iobase;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(3, "%s()\n", __FUNCTION__);</div><div class='add'>+	IRDA_DEBUG(3, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(dev != NULL, return -1;);</div><div class='ctx'> 	self = (struct via_ircc_cb *) dev-&gt;priv;</div><div class='hunk'>@@ -1630,7 +1630,7 @@ static int via_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq,</div><div class='ctx'> 	IRDA_ASSERT(dev != NULL, return -1;);</div><div class='ctx'> 	self = dev-&gt;priv;</div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return -1;);</div><div class='del'>-	IRDA_DEBUG(1, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__, dev-&gt;name,</div><div class='add'>+	IRDA_DEBUG(1, "%s(), %s, (cmd=0x%X)\n", __func__, dev-&gt;name,</div><div class='ctx'> 		   cmd);</div><div class='ctx'> 	/* Disable interrupts &amp; save flags */</div><div class='ctx'> 	spin_lock_irqsave(&amp;self-&gt;lock, flags);</div><div class='head'>diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c<br/>index d15e00b8591e..18f4b3a96aed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/vlsi_ir.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/vlsi_ir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/vlsi_ir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/vlsi_ir.c</a></div><div class='hunk'>@@ -140,15 +140,15 @@ static void vlsi_ring_debug(struct vlsi_ring *r)</div><div class='ctx'> 	unsigned i;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEBUG "%s - ring %p / size %u / mask 0x%04x / len %u / dir %d / hw %p\n",</div><div class='del'>-		__FUNCTION__, r, r-&gt;size, r-&gt;mask, r-&gt;len, r-&gt;dir, r-&gt;rd[0].hw);</div><div class='del'>-	printk(KERN_DEBUG "%s - head = %d / tail = %d\n", __FUNCTION__,</div><div class='add'>+		__func__, r, r-&gt;size, r-&gt;mask, r-&gt;len, r-&gt;dir, r-&gt;rd[0].hw);</div><div class='add'>+	printk(KERN_DEBUG "%s - head = %d / tail = %d\n", __func__,</div><div class='ctx'> 		atomic_read(&amp;r-&gt;head) &amp; r-&gt;mask, atomic_read(&amp;r-&gt;tail) &amp; r-&gt;mask);</div><div class='ctx'> 	for (i = 0; i &lt; r-&gt;size; i++) {</div><div class='ctx'> 		rd = &amp;r-&gt;rd[i];</div><div class='del'>-		printk(KERN_DEBUG "%s - ring descr %u: ", __FUNCTION__, i);</div><div class='add'>+		printk(KERN_DEBUG "%s - ring descr %u: ", __func__, i);</div><div class='ctx'> 		printk("skb=%p data=%p hw=%p\n", rd-&gt;skb, rd-&gt;buf, rd-&gt;hw);</div><div class='ctx'> 		printk(KERN_DEBUG "%s - hw: status=%02x count=%u addr=0x%08x\n",</div><div class='del'>-			__FUNCTION__, (unsigned) rd_get_status(rd),</div><div class='add'>+			__func__, (unsigned) rd_get_status(rd),</div><div class='ctx'> 			(unsigned) rd_get_count(rd), (unsigned) rd_get_addr(rd));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -435,7 +435,7 @@ static struct vlsi_ring *vlsi_alloc_ring(struct pci_dev *pdev, struct ring_descr</div><div class='ctx'> 		    ||  !(busaddr = pci_map_single(pdev, rd-&gt;buf, len, dir))) {</div><div class='ctx'> 			if (rd-&gt;buf) {</div><div class='ctx'> 				IRDA_ERROR("%s: failed to create PCI-MAP for %p",</div><div class='del'>-					   __FUNCTION__, rd-&gt;buf);</div><div class='add'>+					   __func__, rd-&gt;buf);</div><div class='ctx'> 				kfree(rd-&gt;buf);</div><div class='ctx'> 				rd-&gt;buf = NULL;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -489,7 +489,7 @@ static int vlsi_create_hwif(vlsi_irda_dev_t *idev)</div><div class='ctx'> 	ringarea = pci_alloc_consistent(idev-&gt;pdev, HW_RING_AREA_SIZE, &amp;idev-&gt;busaddr);</div><div class='ctx'> 	if (!ringarea) {</div><div class='ctx'> 		IRDA_ERROR("%s: insufficient memory for descriptor rings\n",</div><div class='del'>-			   __FUNCTION__);</div><div class='add'>+			   __func__);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(ringarea, 0, HW_RING_AREA_SIZE);</div><div class='hunk'>@@ -564,7 +564,7 @@ static int vlsi_process_rx(struct vlsi_ring *r, struct ring_descr *rd)</div><div class='ctx'> 	crclen = (idev-&gt;mode==IFF_FIR) ? sizeof(u32) : sizeof(u16);</div><div class='ctx'> 	len -= crclen;		/* remove trailing CRC */</div><div class='ctx'> 	if (len &lt;= 0) {</div><div class='del'>-		IRDA_DEBUG(0, "%s: strange frame (len=%d)\n", __FUNCTION__, len);</div><div class='add'>+		IRDA_DEBUG(0, "%s: strange frame (len=%d)\n", __func__, len);</div><div class='ctx'> 		ret |= VLSI_RX_DROP;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -579,14 +579,14 @@ static int vlsi_process_rx(struct vlsi_ring *r, struct ring_descr *rd)</div><div class='ctx'> 		 */</div><div class='ctx'> 		le16_to_cpus(rd-&gt;buf+len);</div><div class='ctx'> 		if (irda_calc_crc16(INIT_FCS,rd-&gt;buf,len+crclen) != GOOD_FCS) {</div><div class='del'>-			IRDA_DEBUG(0, "%s: crc error\n", __FUNCTION__);</div><div class='add'>+			IRDA_DEBUG(0, "%s: crc error\n", __func__);</div><div class='ctx'> 			ret |= VLSI_RX_CRC;</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!rd-&gt;skb) {</div><div class='del'>-		IRDA_WARNING("%s: rx packet lost\n", __FUNCTION__);</div><div class='add'>+		IRDA_WARNING("%s: rx packet lost\n", __func__);</div><div class='ctx'> 		ret |= VLSI_RX_DROP;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -617,7 +617,7 @@ static void vlsi_fill_rx(struct vlsi_ring *r)</div><div class='ctx'> 	for (rd = ring_last(r); rd != NULL; rd = ring_put(r)) {</div><div class='ctx'> 		if (rd_is_active(rd)) {</div><div class='ctx'> 			IRDA_WARNING("%s: driver bug: rx descr race with hw\n",</div><div class='del'>-				     __FUNCTION__);</div><div class='add'>+				     __func__);</div><div class='ctx'> 			vlsi_ring_debug(r);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -676,7 +676,7 @@ static void vlsi_rx_interrupt(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	if (ring_first(r) == NULL) {</div><div class='ctx'> 		/* we are in big trouble, if this should ever happen */</div><div class='del'>-		IRDA_ERROR("%s: rx ring exhausted!\n", __FUNCTION__);</div><div class='add'>+		IRDA_ERROR("%s: rx ring exhausted!\n", __func__);</div><div class='ctx'> 		vlsi_ring_debug(r);</div><div class='ctx'> 	}</div><div class='ctx'> 	else</div><div class='hunk'>@@ -697,7 +697,7 @@ static void vlsi_unarm_rx(vlsi_irda_dev_t *idev)</div><div class='ctx'> 		if (rd_is_active(rd)) {</div><div class='ctx'> 			rd_set_status(rd, 0);</div><div class='ctx'> 			if (rd_get_count(rd)) {</div><div class='del'>-				IRDA_DEBUG(0, "%s - dropping rx packet\n", __FUNCTION__);</div><div class='add'>+				IRDA_DEBUG(0, "%s - dropping rx packet\n", __func__);</div><div class='ctx'> 				ret = -VLSI_RX_DROP;</div><div class='ctx'> 			}</div><div class='ctx'> 			rd_set_count(rd, 0);</div><div class='hunk'>@@ -772,7 +772,7 @@ static int vlsi_set_baud(vlsi_irda_dev_t *idev, unsigned iobase)</div><div class='ctx'> 	int	fifocnt;</div><div class='ctx'> </div><div class='ctx'> 	baudrate = idev-&gt;new_baud;</div><div class='del'>-	IRDA_DEBUG(2, "%s: %d -&gt; %d\n", __FUNCTION__, idev-&gt;baud, idev-&gt;new_baud);</div><div class='add'>+	IRDA_DEBUG(2, "%s: %d -&gt; %d\n", __func__, idev-&gt;baud, idev-&gt;new_baud);</div><div class='ctx'> 	if (baudrate == 4000000) {</div><div class='ctx'> 		mode = IFF_FIR;</div><div class='ctx'> 		config = IRCFG_FIR;</div><div class='hunk'>@@ -789,7 +789,7 @@ static int vlsi_set_baud(vlsi_irda_dev_t *idev, unsigned iobase)</div><div class='ctx'> 		switch(baudrate) {</div><div class='ctx'> 			default:</div><div class='ctx'> 				IRDA_WARNING("%s: undefined baudrate %d - fallback to 9600!\n",</div><div class='del'>-					     __FUNCTION__, baudrate);</div><div class='add'>+					     __func__, baudrate);</div><div class='ctx'> 				baudrate = 9600;</div><div class='ctx'> 				/* fallthru */</div><div class='ctx'> 			case 2400:</div><div class='hunk'>@@ -806,7 +806,7 @@ static int vlsi_set_baud(vlsi_irda_dev_t *idev, unsigned iobase)</div><div class='ctx'> </div><div class='ctx'> 	fifocnt = inw(iobase+VLSI_PIO_RCVBCNT) &amp; RCVBCNT_MASK;</div><div class='ctx'> 	if (fifocnt != 0) {</div><div class='del'>-		IRDA_DEBUG(0, "%s: rx fifo not empty(%d)\n", __FUNCTION__, fifocnt);</div><div class='add'>+		IRDA_DEBUG(0, "%s: rx fifo not empty(%d)\n", __func__, fifocnt);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	outw(0, iobase+VLSI_PIO_IRENABLE);</div><div class='hunk'>@@ -830,14 +830,14 @@ static int vlsi_set_baud(vlsi_irda_dev_t *idev, unsigned iobase)</div><div class='ctx'> 		config ^= IRENABLE_SIR_ON;</div><div class='ctx'> </div><div class='ctx'> 	if (config != (IRENABLE_PHYANDCLOCK|IRENABLE_ENRXST)) {</div><div class='del'>-		IRDA_WARNING("%s: failed to set %s mode!\n", __FUNCTION__,</div><div class='add'>+		IRDA_WARNING("%s: failed to set %s mode!\n", __func__,</div><div class='ctx'> 			(mode==IFF_SIR)?"SIR":((mode==IFF_MIR)?"MIR":"FIR"));</div><div class='ctx'> 		ret = -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	else {</div><div class='ctx'> 		if (inw(iobase+VLSI_PIO_PHYCTL) != nphyctl) {</div><div class='ctx'> 			IRDA_WARNING("%s: failed to apply baudrate %d\n",</div><div class='del'>-				     __FUNCTION__, baudrate);</div><div class='add'>+				     __func__, baudrate);</div><div class='ctx'> 			ret = -1;</div><div class='ctx'> 		}</div><div class='ctx'> 		else {</div><div class='hunk'>@@ -849,7 +849,7 @@ static int vlsi_set_baud(vlsi_irda_dev_t *idev, unsigned iobase)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='del'>-		vlsi_reg_debug(iobase,__FUNCTION__);</div><div class='add'>+		vlsi_reg_debug(iobase,__func__);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -982,7 +982,7 @@ static int vlsi_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 		if (len &gt;= r-&gt;len-5)</div><div class='ctx'> 			 IRDA_WARNING("%s: possible buffer overflow with SIR wrapping!\n",</div><div class='del'>-				      __FUNCTION__);</div><div class='add'>+				      __func__);</div><div class='ctx'> 	}</div><div class='ctx'> 	else {</div><div class='ctx'> 		/* hw deals with MIR/FIR mode wrapping */</div><div class='hunk'>@@ -1027,7 +1027,7 @@ static int vlsi_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 		fifocnt = inw(ndev-&gt;base_addr+VLSI_PIO_RCVBCNT) &amp; RCVBCNT_MASK;</div><div class='ctx'> 		if (fifocnt != 0) {</div><div class='del'>-			IRDA_DEBUG(0, "%s: rx fifo not empty(%d)\n", __FUNCTION__, fifocnt);</div><div class='add'>+			IRDA_DEBUG(0, "%s: rx fifo not empty(%d)\n", __func__, fifocnt);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		config = inw(iobase+VLSI_PIO_IRCFG);</div><div class='hunk'>@@ -1040,7 +1040,7 @@ static int vlsi_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	if (ring_put(r) == NULL) {</div><div class='ctx'> 		netif_stop_queue(ndev);</div><div class='del'>-		IRDA_DEBUG(3, "%s: tx ring full - queue stopped\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(3, "%s: tx ring full - queue stopped\n", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;idev-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1049,7 +1049,7 @@ static int vlsi_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> drop_unlock:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;idev-&gt;lock, flags);</div><div class='ctx'> drop:</div><div class='del'>-	IRDA_WARNING("%s: dropping packet - %s\n", __FUNCTION__, msg);</div><div class='add'>+	IRDA_WARNING("%s: dropping packet - %s\n", __func__, msg);</div><div class='ctx'> 	dev_kfree_skb_any(skb);</div><div class='ctx'> 	idev-&gt;stats.tx_errors++;</div><div class='ctx'> 	idev-&gt;stats.tx_dropped++;</div><div class='hunk'>@@ -1106,7 +1106,7 @@ static void vlsi_tx_interrupt(struct net_device *ndev)</div><div class='ctx'> 		fifocnt = inw(iobase+VLSI_PIO_RCVBCNT) &amp; RCVBCNT_MASK;</div><div class='ctx'> 		if (fifocnt != 0) {</div><div class='ctx'> 			IRDA_DEBUG(0, "%s: rx fifo not empty(%d)\n",</div><div class='del'>-				__FUNCTION__, fifocnt);</div><div class='add'>+				__func__, fifocnt);</div><div class='ctx'> 		}</div><div class='ctx'> 		outw(config | IRCFG_ENTX, iobase+VLSI_PIO_IRCFG);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1115,7 +1115,7 @@ static void vlsi_tx_interrupt(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	if (netif_queue_stopped(ndev)  &amp;&amp;  !idev-&gt;new_baud) {</div><div class='ctx'> 		netif_wake_queue(ndev);</div><div class='del'>-		IRDA_DEBUG(3, "%s: queue awoken\n", __FUNCTION__);</div><div class='add'>+		IRDA_DEBUG(3, "%s: queue awoken\n", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1138,7 +1138,7 @@ static void vlsi_unarm_tx(vlsi_irda_dev_t *idev)</div><div class='ctx'> 				dev_kfree_skb_any(rd-&gt;skb);</div><div class='ctx'> 				rd-&gt;skb = NULL;</div><div class='ctx'> 			}</div><div class='del'>-			IRDA_DEBUG(0, "%s - dropping tx packet\n", __FUNCTION__);</div><div class='add'>+			IRDA_DEBUG(0, "%s - dropping tx packet\n", __func__);</div><div class='ctx'> 			ret = -VLSI_TX_DROP;</div><div class='ctx'> 		}</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1188,7 +1188,7 @@ static int vlsi_start_clock(struct pci_dev *pdev)</div><div class='ctx'> 		if (count &lt; 3) {</div><div class='ctx'> 			if (clksrc == 1) { /* explicitly asked for PLL hence bail out */</div><div class='ctx'> 				IRDA_ERROR("%s: no PLL or failed to lock!\n",</div><div class='del'>-					   __FUNCTION__);</div><div class='add'>+					   __func__);</div><div class='ctx'> 				clkctl = CLKCTL_CLKSTP;</div><div class='ctx'> 				pci_write_config_byte(pdev, VLSI_PCI_CLKCTL, clkctl);</div><div class='ctx'> 				return -1;</div><div class='hunk'>@@ -1197,7 +1197,7 @@ static int vlsi_start_clock(struct pci_dev *pdev)</div><div class='ctx'> 				clksrc = 3;	/* fallback to 40MHz XCLK (OB800) */</div><div class='ctx'> </div><div class='ctx'> 			IRDA_DEBUG(0, "%s: PLL not locked, fallback to clksrc=%d\n",</div><div class='del'>-				__FUNCTION__, clksrc);</div><div class='add'>+				__func__, clksrc);</div><div class='ctx'> 		}</div><div class='ctx'> 		else</div><div class='ctx'> 			clksrc = 1;	/* got successful PLL lock */</div><div class='hunk'>@@ -1269,7 +1269,7 @@ static int vlsi_init_chip(struct pci_dev *pdev)</div><div class='ctx'> 	/* start the clock and clean the registers */</div><div class='ctx'> </div><div class='ctx'> 	if (vlsi_start_clock(pdev)) {</div><div class='del'>-		IRDA_ERROR("%s: no valid clock source\n", __FUNCTION__);</div><div class='add'>+		IRDA_ERROR("%s: no valid clock source\n", __func__);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	iobase = ndev-&gt;base_addr;</div><div class='hunk'>@@ -1386,7 +1386,7 @@ static void vlsi_tx_timeout(struct net_device *ndev)</div><div class='ctx'> 	vlsi_irda_dev_t *idev = ndev-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	vlsi_reg_debug(ndev-&gt;base_addr, __FUNCTION__);</div><div class='add'>+	vlsi_reg_debug(ndev-&gt;base_addr, __func__);</div><div class='ctx'> 	vlsi_ring_debug(idev-&gt;tx_ring);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(ndev))</div><div class='hunk'>@@ -1401,7 +1401,7 @@ static void vlsi_tx_timeout(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	if (vlsi_start_hw(idev))</div><div class='ctx'> 		IRDA_ERROR("%s: failed to restart hw - %s(%s) unusable!\n",</div><div class='del'>-			   __FUNCTION__, pci_name(idev-&gt;pdev), ndev-&gt;name);</div><div class='add'>+			   __func__, pci_name(idev-&gt;pdev), ndev-&gt;name);</div><div class='ctx'> 	else</div><div class='ctx'> 		netif_start_queue(ndev);</div><div class='ctx'> }</div><div class='hunk'>@@ -1446,7 +1446,7 @@ static int vlsi_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			IRDA_WARNING("%s: notsupp - cmd=%04x\n",</div><div class='del'>-				     __FUNCTION__, cmd);</div><div class='add'>+				     __func__, cmd);</div><div class='ctx'> 			ret = -EOPNOTSUPP;</div><div class='ctx'> 	}	</div><div class='ctx'> 	</div><div class='hunk'>@@ -1491,7 +1491,7 @@ static irqreturn_t vlsi_interrupt(int irq, void *dev_instance)</div><div class='ctx'> </div><div class='ctx'> 	if (boguscount &lt;= 0)</div><div class='ctx'> 		IRDA_MESSAGE("%s: too much work in interrupt!\n",</div><div class='del'>-			     __FUNCTION__);</div><div class='add'>+			     __func__);</div><div class='ctx'> 	return IRQ_RETVAL(handled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1504,7 +1504,7 @@ static int vlsi_open(struct net_device *ndev)</div><div class='ctx'> 	char	hwname[32];</div><div class='ctx'> </div><div class='ctx'> 	if (pci_request_regions(idev-&gt;pdev, drivername)) {</div><div class='del'>-		IRDA_WARNING("%s: io resource busy\n", __FUNCTION__);</div><div class='add'>+		IRDA_WARNING("%s: io resource busy\n", __func__);</div><div class='ctx'> 		goto errout;</div><div class='ctx'> 	}</div><div class='ctx'> 	ndev-&gt;base_addr = pci_resource_start(idev-&gt;pdev,0);</div><div class='hunk'>@@ -1519,7 +1519,7 @@ static int vlsi_open(struct net_device *ndev)</div><div class='ctx'> 	if (request_irq(ndev-&gt;irq, vlsi_interrupt, IRQF_SHARED,</div><div class='ctx'> 			drivername, ndev)) {</div><div class='ctx'> 		IRDA_WARNING("%s: couldn't get IRQ: %d\n",</div><div class='del'>-			     __FUNCTION__, ndev-&gt;irq);</div><div class='add'>+			     __func__, ndev-&gt;irq);</div><div class='ctx'> 		goto errout_io;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1540,7 +1540,7 @@ static int vlsi_open(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	netif_start_queue(ndev);</div><div class='ctx'> </div><div class='del'>-	IRDA_MESSAGE("%s: device %s operational\n", __FUNCTION__, ndev-&gt;name);</div><div class='add'>+	IRDA_MESSAGE("%s: device %s operational\n", __func__, ndev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1574,7 +1574,7 @@ static int vlsi_close(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	pci_release_regions(idev-&gt;pdev);</div><div class='ctx'> </div><div class='del'>-	IRDA_MESSAGE("%s: device %s stopped\n", __FUNCTION__, ndev-&gt;name);</div><div class='add'>+	IRDA_MESSAGE("%s: device %s stopped\n", __func__, ndev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1593,7 +1593,7 @@ static int vlsi_irda_init(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	if (pci_set_dma_mask(pdev,DMA_MASK_USED_BY_HW)</div><div class='ctx'> 	    || pci_set_dma_mask(pdev,DMA_MASK_MSTRPAGE)) {</div><div class='del'>-		IRDA_ERROR("%s: aborting due to PCI BM-DMA address limitations\n", __FUNCTION__);</div><div class='add'>+		IRDA_ERROR("%s: aborting due to PCI BM-DMA address limitations\n", __func__);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1645,14 +1645,14 @@ vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	if ( !pci_resource_start(pdev,0)</div><div class='ctx'> 	     || !(pci_resource_flags(pdev,0) &amp; IORESOURCE_IO) ) {</div><div class='del'>-		IRDA_ERROR("%s: bar 0 invalid", __FUNCTION__);</div><div class='add'>+		IRDA_ERROR("%s: bar 0 invalid", __func__);</div><div class='ctx'> 		goto out_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ndev = alloc_irdadev(sizeof(*idev));</div><div class='ctx'> 	if (ndev==NULL) {</div><div class='ctx'> 		IRDA_ERROR("%s: Unable to allocate device memory.\n",</div><div class='del'>-			   __FUNCTION__);</div><div class='add'>+			   __func__);</div><div class='ctx'> 		goto out_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1667,7 +1667,7 @@ vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		goto out_freedev;</div><div class='ctx'> </div><div class='ctx'> 	if (register_netdev(ndev) &lt; 0) {</div><div class='del'>-		IRDA_ERROR("%s: register_netdev failed\n", __FUNCTION__);</div><div class='add'>+		IRDA_ERROR("%s: register_netdev failed\n", __func__);</div><div class='ctx'> 		goto out_freedev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1678,7 +1678,7 @@ vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 				       vlsi_proc_root, VLSI_PROC_FOPS, ndev);</div><div class='ctx'> 		if (!ent) {</div><div class='ctx'> 			IRDA_WARNING("%s: failed to create proc entry\n",</div><div class='del'>-				     __FUNCTION__);</div><div class='add'>+				     __func__);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ent-&gt;size = 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1745,7 +1745,7 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 	if (!ndev) {</div><div class='ctx'> 		IRDA_ERROR("%s - %s: no netdevice \n",</div><div class='del'>-			   __FUNCTION__, pci_name(pdev));</div><div class='add'>+			   __func__, pci_name(pdev));</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	idev = ndev-&gt;priv;	</div><div class='hunk'>@@ -1756,7 +1756,7 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 			pdev-&gt;current_state = state.event;</div><div class='ctx'> 		}</div><div class='ctx'> 		else</div><div class='del'>-			IRDA_ERROR("%s - %s: invalid suspend request %u -&gt; %u\n", __FUNCTION__, pci_name(pdev), pdev-&gt;current_state, state.event);</div><div class='add'>+			IRDA_ERROR("%s - %s: invalid suspend request %u -&gt; %u\n", __func__, pci_name(pdev), pdev-&gt;current_state, state.event);</div><div class='ctx'> 		mutex_unlock(&amp;idev-&gt;mtx);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1784,7 +1784,7 @@ static int vlsi_irda_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	if (!ndev) {</div><div class='ctx'> 		IRDA_ERROR("%s - %s: no netdevice \n",</div><div class='del'>-			   __FUNCTION__, pci_name(pdev));</div><div class='add'>+			   __func__, pci_name(pdev));</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	idev = ndev-&gt;priv;	</div><div class='hunk'>@@ -1792,7 +1792,7 @@ static int vlsi_irda_resume(struct pci_dev *pdev)</div><div class='ctx'> 	if (pdev-&gt;current_state == 0) {</div><div class='ctx'> 		mutex_unlock(&amp;idev-&gt;mtx);</div><div class='ctx'> 		IRDA_WARNING("%s - %s: already resumed\n",</div><div class='del'>-			     __FUNCTION__, pci_name(pdev));</div><div class='add'>+			     __func__, pci_name(pdev));</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='hunk'>@@ -1811,7 +1811,7 @@ static int vlsi_irda_resume(struct pci_dev *pdev)</div><div class='ctx'> 		 * now we explicitly set pdev-&gt;current_state = 0 after enabling the</div><div class='ctx'> 		 * device and independently resume_ok should catch any garbage config.</div><div class='ctx'> 		 */</div><div class='del'>-		IRDA_WARNING("%s - hm, nothing to resume?\n", __FUNCTION__);</div><div class='add'>+		IRDA_WARNING("%s - hm, nothing to resume?\n", __func__);</div><div class='ctx'> 		mutex_unlock(&amp;idev-&gt;mtx);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h<br/>index c8b9c74eea52..9b1884329fba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/vlsi_ir.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/vlsi_ir.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/vlsi_ir.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/vlsi_ir.h</a></div><div class='hunk'>@@ -617,7 +617,7 @@ static inline void rd_set_addr_status(struct ring_descr *rd, dma_addr_t a, u8 s)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if ((a &amp; ~DMA_MASK_MSTRPAGE)&gt;&gt;24 != MSTRPAGE_VALUE) {</div><div class='del'>-		IRDA_ERROR("%s: pci busaddr inconsistency!\n", __FUNCTION__);</div><div class='add'>+		IRDA_ERROR("%s: pci busaddr inconsistency!\n", __func__);</div><div class='ctx'> 		dump_stack();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c<br/>index 9fd2451b0fb2..002a6d769f21 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/w83977af_ir.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/irda/w83977af_ir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/w83977af_ir.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/irda/w83977af_ir.c</a></div><div class='hunk'>@@ -114,7 +114,7 @@ static int __init w83977af_init(void)</div><div class='ctx'> {</div><div class='ctx'>         int i;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(0, "%s()\n", __func__ );</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; (io[i] &lt; 2000) &amp;&amp; (i &lt; ARRAY_SIZE(dev_self)); i++) {</div><div class='ctx'> 		if (w83977af_open(i, io[i], irq[i], dma[i]) == 0)</div><div class='hunk'>@@ -133,7 +133,7 @@ static void __exit w83977af_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );</div><div class='add'>+        IRDA_DEBUG(4, "%s()\n", __func__ );</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; i &lt; ARRAY_SIZE(dev_self); i++) {</div><div class='ctx'> 		if (dev_self[i])</div><div class='hunk'>@@ -154,12 +154,12 @@ int w83977af_open(int i, unsigned int iobase, unsigned int irq,</div><div class='ctx'>         struct w83977af_ir *self;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(0, "%s()\n", __func__ );</div><div class='ctx'> </div><div class='ctx'> 	/* Lock the port that we need */</div><div class='ctx'> 	if (!request_region(iobase, CHIP_IO_EXTENT, driver_name)) {</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), can't get iobase of 0x%03x\n",</div><div class='del'>-		      __FUNCTION__ , iobase);</div><div class='add'>+		      __func__ , iobase);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -241,7 +241,7 @@ int w83977af_open(int i, unsigned int iobase, unsigned int irq,</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdev(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		IRDA_ERROR("%s(), register_netdevice() failed!\n", __FUNCTION__);</div><div class='add'>+		IRDA_ERROR("%s(), register_netdevice() failed!\n", __func__);</div><div class='ctx'> 		goto err_out3;</div><div class='ctx'> 	}</div><div class='ctx'> 	IRDA_MESSAGE("IrDA: Registered device %s\n", dev-&gt;name);</div><div class='hunk'>@@ -273,7 +273,7 @@ static int w83977af_close(struct w83977af_ir *self)</div><div class='ctx'> {</div><div class='ctx'> 	int iobase;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(0, "%s()\n", __func__ );</div><div class='ctx'> </div><div class='ctx'>         iobase = self-&gt;io.fir_base;</div><div class='ctx'> </div><div class='hunk'>@@ -294,7 +294,7 @@ static int w83977af_close(struct w83977af_ir *self)</div><div class='ctx'> </div><div class='ctx'> 	/* Release the PORT that this driver is using */</div><div class='ctx'> 	IRDA_DEBUG(0 , "%s(), Releasing Region %03x\n", </div><div class='del'>-	      __FUNCTION__ , self-&gt;io.fir_base);</div><div class='add'>+	      __func__ , self-&gt;io.fir_base);</div><div class='ctx'> 	release_region(self-&gt;io.fir_base, self-&gt;io.fir_ext);</div><div class='ctx'> </div><div class='ctx'> 	if (self-&gt;tx_buff.head)</div><div class='hunk'>@@ -316,7 +316,7 @@ int w83977af_probe( int iobase, int irq, int dma)</div><div class='ctx'> 	int i;</div><div class='ctx'>   	</div><div class='ctx'>  	for (i=0; i &lt; 2; i++) {</div><div class='del'>- 		IRDA_DEBUG( 0, "%s()\n", __FUNCTION__ );</div><div class='add'>+		IRDA_DEBUG( 0, "%s()\n", __func__ );</div><div class='ctx'> #ifdef CONFIG_USE_W977_PNP</div><div class='ctx'>  		/* Enter PnP configuration mode */</div><div class='ctx'> 		w977_efm_enter(efbase[i]);</div><div class='hunk'>@@ -403,7 +403,7 @@ int w83977af_probe( int iobase, int irq, int dma)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Try next extented function register address */</div><div class='del'>-			IRDA_DEBUG( 0, "%s(), Wrong chip version", __FUNCTION__ );</div><div class='add'>+			IRDA_DEBUG( 0, "%s(), Wrong chip version", __func__ );</div><div class='ctx'> 		}</div><div class='ctx'>   	}   	</div><div class='ctx'> 	return -1;</div><div class='hunk'>@@ -439,19 +439,19 @@ void w83977af_change_speed(struct w83977af_ir *self, __u32 speed)</div><div class='ctx'> 	case 115200: outb(0x01, iobase+ABLL); break;</div><div class='ctx'> 	case 576000:</div><div class='ctx'> 		ir_mode = HCR_MIR_576;</div><div class='del'>-		IRDA_DEBUG(0, "%s(), handling baud of 576000\n", __FUNCTION__ );</div><div class='add'>+		IRDA_DEBUG(0, "%s(), handling baud of 576000\n", __func__ );</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1152000:</div><div class='ctx'> 		ir_mode = HCR_MIR_1152;</div><div class='del'>-		IRDA_DEBUG(0, "%s(), handling baud of 1152000\n", __FUNCTION__ );</div><div class='add'>+		IRDA_DEBUG(0, "%s(), handling baud of 1152000\n", __func__ );</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4000000:</div><div class='ctx'> 		ir_mode = HCR_FIR;</div><div class='del'>-		IRDA_DEBUG(0, "%s(), handling baud of 4000000\n", __FUNCTION__ );</div><div class='add'>+		IRDA_DEBUG(0, "%s(), handling baud of 4000000\n", __func__ );</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ir_mode = HCR_FIR;</div><div class='del'>-		IRDA_DEBUG(0, "%s(), unknown baud rate of %d\n", __FUNCTION__ , speed);</div><div class='add'>+		IRDA_DEBUG(0, "%s(), unknown baud rate of %d\n", __func__ , speed);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -501,7 +501,7 @@ int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	iobase = self-&gt;io.fir_base;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(4, "%s(%ld), skb-&gt;len=%d\n", __FUNCTION__ , jiffies, </div><div class='add'>+	IRDA_DEBUG(4, "%s(%ld), skb-&gt;len=%d\n", __func__ , jiffies,</div><div class='ctx'> 		   (int) skb-&gt;len);</div><div class='ctx'> 	</div><div class='ctx'> 	/* Lock transmit buffer */</div><div class='hunk'>@@ -549,7 +549,7 @@ int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			outb(ICR_ETMRI, iobase+ICR);</div><div class='ctx'> 		} else {</div><div class='ctx'> #endif</div><div class='del'>-			IRDA_DEBUG(4, "%s(%ld), mtt=%d\n", __FUNCTION__ , jiffies, mtt);</div><div class='add'>+			IRDA_DEBUG(4, "%s(%ld), mtt=%d\n", __func__ , jiffies, mtt);</div><div class='ctx'> 			if (mtt)</div><div class='ctx'> 				udelay(mtt);</div><div class='ctx'> </div><div class='hunk'>@@ -591,7 +591,7 @@ static void w83977af_dma_write(struct w83977af_ir *self, int iobase)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	__u8 hcr;</div><div class='ctx'> #endif</div><div class='del'>-        IRDA_DEBUG(4, "%s(), len=%d\n", __FUNCTION__ , self-&gt;tx_buff.len);</div><div class='add'>+        IRDA_DEBUG(4, "%s(), len=%d\n", __func__ , self-&gt;tx_buff.len);</div><div class='ctx'> </div><div class='ctx'> 	/* Save current set */</div><div class='ctx'> 	set = inb(iobase+SSR);</div><div class='hunk'>@@ -643,7 +643,7 @@ static int w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size)</div><div class='ctx'> 	int actual = 0;</div><div class='ctx'> 	__u8 set;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(4, "%s()\n", __func__ );</div><div class='ctx'> </div><div class='ctx'> 	/* Save current bank */</div><div class='ctx'> 	set = inb(iobase+SSR);</div><div class='hunk'>@@ -651,11 +651,11 @@ static int w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size)</div><div class='ctx'> 	switch_bank(iobase, SET0);</div><div class='ctx'> 	if (!(inb_p(iobase+USR) &amp; USR_TSRE)) {</div><div class='ctx'> 		IRDA_DEBUG(4,</div><div class='del'>-			   "%s(), warning, FIFO not empty yet!\n", __FUNCTION__  );</div><div class='add'>+			   "%s(), warning, FIFO not empty yet!\n", __func__  );</div><div class='ctx'> </div><div class='ctx'> 		fifo_size -= 17;</div><div class='ctx'> 		IRDA_DEBUG(4, "%s(), %d bytes left in tx fifo\n", </div><div class='del'>-			   __FUNCTION__ , fifo_size);</div><div class='add'>+			   __func__ , fifo_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fill FIFO with current frame */</div><div class='hunk'>@@ -665,7 +665,7 @@ static int w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size)</div><div class='ctx'> 	}</div><div class='ctx'>         </div><div class='ctx'> 	IRDA_DEBUG(4, "%s(), fifo_size %d ; %d sent of %d\n", </div><div class='del'>-		   __FUNCTION__ , fifo_size, actual, len);</div><div class='add'>+		   __func__ , fifo_size, actual, len);</div><div class='ctx'> </div><div class='ctx'> 	/* Restore bank */</div><div class='ctx'> 	outb(set, iobase+SSR);</div><div class='hunk'>@@ -685,7 +685,7 @@ static void w83977af_dma_xmit_complete(struct w83977af_ir *self)</div><div class='ctx'> 	int iobase;</div><div class='ctx'> 	__u8 set;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(4, "%s(%ld)\n", __FUNCTION__ , jiffies);</div><div class='add'>+	IRDA_DEBUG(4, "%s(%ld)\n", __func__ , jiffies);</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return;);</div><div class='ctx'> </div><div class='hunk'>@@ -700,7 +700,7 @@ static void w83977af_dma_xmit_complete(struct w83977af_ir *self)</div><div class='ctx'> 	</div><div class='ctx'> 	/* Check for underrrun! */</div><div class='ctx'> 	if (inb(iobase+AUDR) &amp; AUDR_UNDR) {</div><div class='del'>-		IRDA_DEBUG(0, "%s(), Transmit underrun!\n", __FUNCTION__ );</div><div class='add'>+		IRDA_DEBUG(0, "%s(), Transmit underrun!\n", __func__ );</div><div class='ctx'> 		</div><div class='ctx'> 		self-&gt;stats.tx_errors++;</div><div class='ctx'> 		self-&gt;stats.tx_fifo_errors++;</div><div class='hunk'>@@ -741,7 +741,7 @@ int w83977af_dma_receive(struct w83977af_ir *self)</div><div class='ctx'> #endif</div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return -1;);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(4, "%s\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(4, "%s\n", __func__ );</div><div class='ctx'> </div><div class='ctx'> 	iobase= self-&gt;io.fir_base;</div><div class='ctx'> </div><div class='hunk'>@@ -812,7 +812,7 @@ int w83977af_dma_receive_complete(struct w83977af_ir *self)</div><div class='ctx'> 	__u8 set;</div><div class='ctx'> 	__u8 status;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(4, "%s\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(4, "%s\n", __func__ );</div><div class='ctx'> </div><div class='ctx'> 	st_fifo = &amp;self-&gt;st_fifo;</div><div class='ctx'> </div><div class='hunk'>@@ -892,7 +892,7 @@ int w83977af_dma_receive_complete(struct w83977af_ir *self)</div><div class='ctx'> 			skb = dev_alloc_skb(len+1);</div><div class='ctx'> 			if (skb == NULL)  {</div><div class='ctx'> 				printk(KERN_INFO</div><div class='del'>-				       "%s(), memory squeeze, dropping frame.\n", __FUNCTION__);</div><div class='add'>+				       "%s(), memory squeeze, dropping frame.\n", __func__);</div><div class='ctx'> 				/* Restore set register */</div><div class='ctx'> 				outb(set, iobase+SSR);</div><div class='ctx'> </div><div class='hunk'>@@ -943,7 +943,7 @@ static void w83977af_pio_receive(struct w83977af_ir *self)</div><div class='ctx'> 	__u8 byte = 0x00;</div><div class='ctx'> 	int iobase;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(4, "%s()\n", __func__ );</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return;);</div><div class='ctx'> 	</div><div class='hunk'>@@ -970,7 +970,7 @@ static __u8 w83977af_sir_interrupt(struct w83977af_ir *self, int isr)</div><div class='ctx'> 	__u8 set;</div><div class='ctx'> 	int iobase;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(4, "%s(), isr=%#x\n", __FUNCTION__ , isr);</div><div class='add'>+	IRDA_DEBUG(4, "%s(), isr=%#x\n", __func__ , isr);</div><div class='ctx'> 	</div><div class='ctx'> 	iobase = self-&gt;io.fir_base;</div><div class='ctx'> 	/* Transmit FIFO low on data */</div><div class='hunk'>@@ -1007,7 +1007,7 @@ static __u8 w83977af_sir_interrupt(struct w83977af_ir *self, int isr)</div><div class='ctx'> 		/* Check if we need to change the speed? */</div><div class='ctx'> 		if (self-&gt;new_speed) {</div><div class='ctx'> 			IRDA_DEBUG(2,</div><div class='del'>-				   "%s(), Changing speed!\n", __FUNCTION__ );</div><div class='add'>+				   "%s(), Changing speed!\n", __func__ );</div><div class='ctx'> 			w83977af_change_speed(self, self-&gt;new_speed);</div><div class='ctx'> 			self-&gt;new_speed = 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1189,7 +1189,7 @@ static int w83977af_net_open(struct net_device *dev)</div><div class='ctx'> 	char hwname[32];</div><div class='ctx'> 	__u8 set;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(0, "%s()\n", __func__ );</div><div class='ctx'> 	</div><div class='ctx'> 	IRDA_ASSERT(dev != NULL, return -1;);</div><div class='ctx'> 	self = (struct w83977af_ir *) dev-&gt;priv;</div><div class='hunk'>@@ -1252,7 +1252,7 @@ static int w83977af_net_close(struct net_device *dev)</div><div class='ctx'> 	int iobase;</div><div class='ctx'> 	__u8 set;</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );</div><div class='add'>+	IRDA_DEBUG(0, "%s()\n", __func__ );</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(dev != NULL, return -1;);</div><div class='ctx'> 	</div><div class='hunk'>@@ -1307,7 +1307,7 @@ static int w83977af_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> </div><div class='ctx'> 	IRDA_ASSERT(self != NULL, return -1;);</div><div class='ctx'> </div><div class='del'>-	IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__ , dev-&gt;name, cmd);</div><div class='add'>+	IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __func__ , dev-&gt;name, cmd);</div><div class='ctx'> 	</div><div class='ctx'> 	spin_lock_irqsave(&amp;self-&gt;lock, flags);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c<br/>index 2f38e847e2cd..f96358b641af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixgbe/ixgbe_82598.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/ixgbe/ixgbe_82598.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixgbe/ixgbe_82598.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ixgbe/ixgbe_82598.c</a></div><div class='hunk'>@@ -190,6 +190,7 @@ static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw)</div><div class='ctx'> 	case IXGBE_DEV_ID_82598AF_DUAL_PORT:</div><div class='ctx'> 	case IXGBE_DEV_ID_82598AF_SINGLE_PORT:</div><div class='ctx'> 	case IXGBE_DEV_ID_82598EB_CX4:</div><div class='add'>+	case IXGBE_DEV_ID_82598_CX4_DUAL_PORT:</div><div class='ctx'> 		media_type = ixgbe_media_type_fiber;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IXGBE_DEV_ID_82598AT_DUAL_PORT:</div><div class='head'>diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c<br/>index e5f3da8468cc..a417be7f8be5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixgbe/ixgbe_main.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/ixgbe/ixgbe_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixgbe/ixgbe_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ixgbe/ixgbe_main.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@ char ixgbe_driver_name[] = "ixgbe";</div><div class='ctx'> static const char ixgbe_driver_string[] =</div><div class='ctx'> 	"Intel(R) 10 Gigabit PCI Express Network Driver";</div><div class='ctx'> </div><div class='del'>-#define DRV_VERSION "1.3.18-k2"</div><div class='add'>+#define DRV_VERSION "1.3.18-k4"</div><div class='ctx'> const char ixgbe_driver_version[] = DRV_VERSION;</div><div class='ctx'> static const char ixgbe_copyright[] =</div><div class='ctx'> 	 "Copyright (c) 1999-2007 Intel Corporation.";</div><div class='hunk'>@@ -72,6 +72,8 @@ static struct pci_device_id ixgbe_pci_tbl[] = {</div><div class='ctx'> 	 board_82598 },</div><div class='ctx'> 	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_CX4),</div><div class='ctx'> 	 board_82598 },</div><div class='add'>+	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_CX4_DUAL_PORT),</div><div class='add'>+	 board_82598 },</div><div class='ctx'> </div><div class='ctx'> 	/* required last entry */</div><div class='ctx'> 	{0, }</div><div class='hunk'>@@ -1634,16 +1636,17 @@ static void ixgbe_set_multi(struct net_device *netdev)</div><div class='ctx'> 	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	struct dev_mc_list *mc_ptr;</div><div class='ctx'> 	u8 *mta_list;</div><div class='del'>-	u32 fctrl;</div><div class='add'>+	u32 fctrl, vlnctrl;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Check for Promiscuous and All Multicast modes */</div><div class='ctx'> </div><div class='ctx'> 	fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL);</div><div class='add'>+	vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);</div><div class='ctx'> </div><div class='ctx'> 	if (netdev-&gt;flags &amp; IFF_PROMISC) {</div><div class='ctx'> 		fctrl |= (IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE);</div><div class='del'>-		fctrl &amp;= ~IXGBE_VLNCTRL_VFE;</div><div class='add'>+		vlnctrl &amp;= ~IXGBE_VLNCTRL_VFE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (netdev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='ctx'> 			fctrl |= IXGBE_FCTRL_MPE;</div><div class='hunk'>@@ -1651,10 +1654,11 @@ static void ixgbe_set_multi(struct net_device *netdev)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			fctrl &amp;= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE);</div><div class='ctx'> 		}</div><div class='del'>-		fctrl |= IXGBE_VLNCTRL_VFE;</div><div class='add'>+		vlnctrl |= IXGBE_VLNCTRL_VFE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);</div><div class='add'>+	IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);</div><div class='ctx'> </div><div class='ctx'> 	if (netdev-&gt;mc_count) {</div><div class='ctx'> 		mta_list = kcalloc(netdev-&gt;mc_count, ETH_ALEN, GFP_ATOMIC);</div><div class='hunk'>@@ -2300,6 +2304,12 @@ static int __devinit ixgbe_set_interrupt_capability(struct ixgbe_adapter</div><div class='ctx'> 	int vector, v_budget;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Set the default interrupt throttle rate.</div><div class='add'>+	 */</div><div class='add'>+	adapter-&gt;rx_eitr = (1000000 / IXGBE_DEFAULT_ITR_RX_USECS);</div><div class='add'>+	adapter-&gt;tx_eitr = (1000000 / IXGBE_DEFAULT_ITR_TX_USECS);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * It's easy to be greedy for MSI-X vectors, but it really</div><div class='ctx'> 	 * doesn't do us much good if we have a lot more vectors</div><div class='ctx'> 	 * than CPU's.  So let's be conservative and only ask for</div><div class='head'>diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h<br/>index 1ad7cb9c25a8..c0282a223df3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixgbe/ixgbe_type.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/ixgbe/ixgbe_type.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixgbe/ixgbe_type.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ixgbe/ixgbe_type.h</a></div><div class='hunk'>@@ -39,6 +39,7 @@</div><div class='ctx'> #define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7</div><div class='ctx'> #define IXGBE_DEV_ID_82598AT_DUAL_PORT   0x10C8</div><div class='ctx'> #define IXGBE_DEV_ID_82598EB_CX4         0x10DD</div><div class='add'>+#define IXGBE_DEV_ID_82598_CX4_DUAL_PORT 0x10EC</div><div class='ctx'> </div><div class='ctx'> /* General Registers */</div><div class='ctx'> #define IXGBE_CTRL      0x00000</div><div class='head'>diff --git a/drivers/net/ixp2000/ixp2400-msf.c b/drivers/net/ixp2000/ixp2400-msf.c<br/>index 9ec38eebfb56..f5ffd7e05d26 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixp2000/ixp2400-msf.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/ixp2000/ixp2400-msf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixp2000/ixp2400-msf.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ixp2000/ixp2400-msf.c</a></div><div class='hunk'>@@ -13,8 +13,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/ixp2000-regs.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/ixp2000-regs.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include "ixp2400-msf.h"</div><div class='head'>diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c<br/>index 7111c65f0b30..7b70c66504a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixp2000/ixpdev.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/ixp2000/ixpdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixp2000/ixpdev.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ixp2000/ixpdev.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/uengine.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include "ixp2400_rx.ucode"</div><div class='ctx'> #include "ixp2400_tx.ucode"</div><div class='head'>diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c<br/>index 49f6bc036a92..3b43bfd85a0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/loopback.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/loopback.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/loopback.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/loopback.c</a></div><div class='hunk'>@@ -64,68 +64,6 @@ struct pcpu_lstats {</div><div class='ctx'> 	unsigned long bytes;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* KISS: just allocate small chunks and copy bits.</div><div class='del'>- *</div><div class='del'>- * So, in fact, this is documentation, explaining what we expect</div><div class='del'>- * of largesending device modulo TCP checksum, which is ignored for loopback.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef LOOPBACK_TSO</div><div class='del'>-static void emulate_large_send_offload(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct iphdr *iph = ip_hdr(skb);</div><div class='del'>-	struct tcphdr *th = (struct tcphdr *)(skb_network_header(skb) +</div><div class='del'>-					      (iph-&gt;ihl * 4));</div><div class='del'>-	unsigned int doffset = (iph-&gt;ihl + th-&gt;doff) * 4;</div><div class='del'>-	unsigned int mtu = skb_shinfo(skb)-&gt;gso_size + doffset;</div><div class='del'>-	unsigned int offset = 0;</div><div class='del'>-	u32 seq = ntohl(th-&gt;seq);</div><div class='del'>-	u16 id  = ntohs(iph-&gt;id);</div><div class='del'>-</div><div class='del'>-	while (offset + doffset &lt; skb-&gt;len) {</div><div class='del'>-		unsigned int frag_size = min(mtu, skb-&gt;len - offset) - doffset;</div><div class='del'>-		struct sk_buff *nskb = alloc_skb(mtu + 32, GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-		if (!nskb)</div><div class='del'>-			break;</div><div class='del'>-		skb_reserve(nskb, 32);</div><div class='del'>-		skb_set_mac_header(nskb, -ETH_HLEN);</div><div class='del'>-		skb_reset_network_header(nskb);</div><div class='del'>-		iph = ip_hdr(nskb);</div><div class='del'>-		skb_copy_to_linear_data(nskb, skb_network_header(skb),</div><div class='del'>-					doffset);</div><div class='del'>-		if (skb_copy_bits(skb,</div><div class='del'>-				  doffset + offset,</div><div class='del'>-				  nskb-&gt;data + doffset,</div><div class='del'>-				  frag_size))</div><div class='del'>-			BUG();</div><div class='del'>-		skb_put(nskb, doffset + frag_size);</div><div class='del'>-		nskb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-		nskb-&gt;dev = skb-&gt;dev;</div><div class='del'>-		nskb-&gt;priority = skb-&gt;priority;</div><div class='del'>-		nskb-&gt;protocol = skb-&gt;protocol;</div><div class='del'>-		nskb-&gt;dst = dst_clone(skb-&gt;dst);</div><div class='del'>-		memcpy(nskb-&gt;cb, skb-&gt;cb, sizeof(skb-&gt;cb));</div><div class='del'>-		nskb-&gt;pkt_type = skb-&gt;pkt_type;</div><div class='del'>-</div><div class='del'>-		th = (struct tcphdr *)(skb_network_header(nskb) + iph-&gt;ihl * 4);</div><div class='del'>-		iph-&gt;tot_len = htons(frag_size + doffset);</div><div class='del'>-		iph-&gt;id = htons(id);</div><div class='del'>-		iph-&gt;check = 0;</div><div class='del'>-		iph-&gt;check = ip_fast_csum((unsigned char *) iph, iph-&gt;ihl);</div><div class='del'>-		th-&gt;seq = htonl(seq);</div><div class='del'>-		if (offset + doffset + frag_size &lt; skb-&gt;len)</div><div class='del'>-			th-&gt;fin = th-&gt;psh = 0;</div><div class='del'>-		netif_rx(nskb);</div><div class='del'>-		offset += frag_size;</div><div class='del'>-		seq += frag_size;</div><div class='del'>-		id++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-#endif /* LOOPBACK_TSO */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The higher levels take care of making this non-reentrant (it's</div><div class='ctx'>  * called with bh's disabled).</div><div class='hunk'>@@ -137,9 +75,6 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	skb_orphan(skb);</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;protocol = eth_type_trans(skb,dev);</div><div class='del'>-#ifndef LOOPBACK_MUST_CHECKSUM</div><div class='del'>-	skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef LOOPBACK_TSO</div><div class='ctx'> 	if (skb_is_gso(skb)) {</div><div class='hunk'>@@ -234,9 +169,7 @@ static void loopback_setup(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;type		= ARPHRD_LOOPBACK;	/* 0x0001*/</div><div class='ctx'> 	dev-&gt;flags		= IFF_LOOPBACK;</div><div class='ctx'> 	dev-&gt;features 		= NETIF_F_SG | NETIF_F_FRAGLIST</div><div class='del'>-#ifdef LOOPBACK_TSO</div><div class='ctx'> 		| NETIF_F_TSO</div><div class='del'>-#endif</div><div class='ctx'> 		| NETIF_F_NO_CSUM</div><div class='ctx'> 		| NETIF_F_HIGHDMA</div><div class='ctx'> 		| NETIF_F_LLTX</div><div class='head'>diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c<br/>index 591a7e4220c7..83fa9d82a004 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/lp486e.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/lp486e.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/lp486e.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/lp486e.c</a></div><div class='hunk'>@@ -1272,8 +1272,6 @@ static void set_multicast_list(struct net_device *dev) {</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (dev-&gt;mc_count == 0 &amp;&amp; !(dev-&gt;flags &amp; (IFF_PROMISC | IFF_ALLMULTI))) {</div><div class='del'>-			if (dev-&gt;flags &amp; IFF_ALLMULTI)</div><div class='del'>-				dev-&gt;flags |= IFF_PROMISC;</div><div class='ctx'> 			lp-&gt;i596_config[8] &amp;= ~0x01;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			lp-&gt;i596_config[8] |= 0x01;</div><div class='head'>diff --git a/drivers/net/macb.c b/drivers/net/macb.c<br/>index daba82bbcb56..84c77f1f9a5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/macb.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/macb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/macb.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/macb.c</a></div><div class='hunk'>@@ -21,8 +21,8 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/cpu.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "macb.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/meth.c b/drivers/net/meth.c<br/>index 4cb364e67dc6..0a97c26df6ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/meth.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/meth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/meth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/meth.c</a></div><div class='hunk'>@@ -100,7 +100,7 @@ static inline void load_eaddr(struct net_device *dev)</div><div class='ctx'> 	DPRINTK("Loading MAC Address: %s\n", print_mac(mac, dev-&gt;dev_addr));</div><div class='ctx'> 	macaddr = 0;</div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='del'>-		macaddr |= dev-&gt;dev_addr[i] &lt;&lt; ((5 - i) * 8);</div><div class='add'>+		macaddr |= (u64)dev-&gt;dev_addr[i] &lt;&lt; ((5 - i) * 8);</div><div class='ctx'> </div><div class='ctx'> 	mace-&gt;eth.mac_addr = macaddr;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c<br/>index 62071d9c4a55..d1dd5b48dbd1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/mlx4/mr.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/mlx4/mr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/mlx4/mr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/mlx4/mr.c</a></div><div class='hunk'>@@ -67,11 +67,10 @@ struct mlx4_mpt_entry {</div><div class='ctx'> #define MLX4_MPT_FLAG_PHYSICAL	    (1 &lt;&lt;  9)</div><div class='ctx'> #define MLX4_MPT_FLAG_REGION	    (1 &lt;&lt;  8)</div><div class='ctx'> </div><div class='del'>-#define MLX4_MPT_PD_FLAG_FAST_REG   (1 &lt;&lt; 26)</div><div class='add'>+#define MLX4_MPT_PD_FLAG_FAST_REG   (1 &lt;&lt; 27)</div><div class='add'>+#define MLX4_MPT_PD_FLAG_RAE	    (1 &lt;&lt; 28)</div><div class='ctx'> #define MLX4_MPT_PD_FLAG_EN_INV	    (3 &lt;&lt; 24)</div><div class='ctx'> </div><div class='del'>-#define MLX4_MTT_FLAG_PRESENT		1</div><div class='del'>-</div><div class='ctx'> #define MLX4_MPT_STATUS_SW		0xF0</div><div class='ctx'> #define MLX4_MPT_STATUS_HW		0x00</div><div class='ctx'> </div><div class='hunk'>@@ -348,7 +347,10 @@ int mlx4_mr_enable(struct mlx4_dev *dev, struct mlx4_mr *mr)</div><div class='ctx'> 	if (mr-&gt;mtt.order &gt;= 0 &amp;&amp; mr-&gt;mtt.page_shift == 0) {</div><div class='ctx'> 		/* fast register MR in free state */</div><div class='ctx'> 		mpt_entry-&gt;flags    |= cpu_to_be32(MLX4_MPT_FLAG_FREE);</div><div class='del'>-		mpt_entry-&gt;pd_flags |= cpu_to_be32(MLX4_MPT_PD_FLAG_FAST_REG);</div><div class='add'>+		mpt_entry-&gt;pd_flags |= cpu_to_be32(MLX4_MPT_PD_FLAG_FAST_REG |</div><div class='add'>+						   MLX4_MPT_PD_FLAG_RAE);</div><div class='add'>+		mpt_entry-&gt;mtt_sz    = cpu_to_be32((1 &lt;&lt; mr-&gt;mtt.order) *</div><div class='add'>+						   MLX4_MTT_ENTRY_PER_SEG);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mpt_entry-&gt;flags    |= cpu_to_be32(MLX4_MPT_FLAG_SW_OWNS);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c<br/>index 8a97a0066a88..0a18b9e96da1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/mv643xx_eth.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/mv643xx_eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/mv643xx_eth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/mv643xx_eth.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> static char mv643xx_eth_driver_name[] = "mv643xx_eth";</div><div class='del'>-static char mv643xx_eth_driver_version[] = "1.1";</div><div class='add'>+static char mv643xx_eth_driver_version[] = "1.3";</div><div class='ctx'> </div><div class='ctx'> #define MV643XX_ETH_CHECKSUM_OFFLOAD_TX</div><div class='ctx'> #define MV643XX_ETH_NAPI</div><div class='hunk'>@@ -90,12 +90,21 @@ static char mv643xx_eth_driver_version[] = "1.1";</div><div class='ctx'> #define PORT_SERIAL_CONTROL(p)		(0x043c + ((p) &lt;&lt; 10))</div><div class='ctx'> #define PORT_STATUS(p)			(0x0444 + ((p) &lt;&lt; 10))</div><div class='ctx'> #define  TX_FIFO_EMPTY			0x00000400</div><div class='add'>+#define  TX_IN_PROGRESS			0x00000080</div><div class='add'>+#define  PORT_SPEED_MASK		0x00000030</div><div class='add'>+#define  PORT_SPEED_1000		0x00000010</div><div class='add'>+#define  PORT_SPEED_100			0x00000020</div><div class='add'>+#define  PORT_SPEED_10			0x00000000</div><div class='add'>+#define  FLOW_CONTROL_ENABLED		0x00000008</div><div class='add'>+#define  FULL_DUPLEX			0x00000004</div><div class='add'>+#define  LINK_UP			0x00000002</div><div class='ctx'> #define TXQ_COMMAND(p)			(0x0448 + ((p) &lt;&lt; 10))</div><div class='ctx'> #define TXQ_FIX_PRIO_CONF(p)		(0x044c + ((p) &lt;&lt; 10))</div><div class='ctx'> #define TX_BW_RATE(p)			(0x0450 + ((p) &lt;&lt; 10))</div><div class='ctx'> #define TX_BW_MTU(p)			(0x0458 + ((p) &lt;&lt; 10))</div><div class='ctx'> #define TX_BW_BURST(p)			(0x045c + ((p) &lt;&lt; 10))</div><div class='ctx'> #define INT_CAUSE(p)			(0x0460 + ((p) &lt;&lt; 10))</div><div class='add'>+#define  INT_TX_END_0			0x00080000</div><div class='ctx'> #define  INT_TX_END			0x07f80000</div><div class='ctx'> #define  INT_RX				0x0007fbfc</div><div class='ctx'> #define  INT_EXT			0x00000002</div><div class='hunk'>@@ -127,21 +136,21 @@ static char mv643xx_eth_driver_version[] = "1.1";</div><div class='ctx'> /*</div><div class='ctx'>  * SDMA configuration register.</div><div class='ctx'>  */</div><div class='del'>-#define RX_BURST_SIZE_4_64BIT		(2 &lt;&lt; 1)</div><div class='add'>+#define RX_BURST_SIZE_16_64BIT		(4 &lt;&lt; 1)</div><div class='ctx'> #define BLM_RX_NO_SWAP			(1 &lt;&lt; 4)</div><div class='ctx'> #define BLM_TX_NO_SWAP			(1 &lt;&lt; 5)</div><div class='del'>-#define TX_BURST_SIZE_4_64BIT		(2 &lt;&lt; 22)</div><div class='add'>+#define TX_BURST_SIZE_16_64BIT		(4 &lt;&lt; 22)</div><div class='ctx'> </div><div class='ctx'> #if defined(__BIG_ENDIAN)</div><div class='ctx'> #define PORT_SDMA_CONFIG_DEFAULT_VALUE		\</div><div class='del'>-		RX_BURST_SIZE_4_64BIT	|	\</div><div class='del'>-		TX_BURST_SIZE_4_64BIT</div><div class='add'>+		RX_BURST_SIZE_16_64BIT	|	\</div><div class='add'>+		TX_BURST_SIZE_16_64BIT</div><div class='ctx'> #elif defined(__LITTLE_ENDIAN)</div><div class='ctx'> #define PORT_SDMA_CONFIG_DEFAULT_VALUE		\</div><div class='del'>-		RX_BURST_SIZE_4_64BIT	|	\</div><div class='add'>+		RX_BURST_SIZE_16_64BIT	|	\</div><div class='ctx'> 		BLM_RX_NO_SWAP		|	\</div><div class='ctx'> 		BLM_TX_NO_SWAP		|	\</div><div class='del'>-		TX_BURST_SIZE_4_64BIT</div><div class='add'>+		TX_BURST_SIZE_16_64BIT</div><div class='ctx'> #else</div><div class='ctx'> #error One of __BIG_ENDIAN or __LITTLE_ENDIAN must be defined</div><div class='ctx'> #endif</div><div class='hunk'>@@ -153,9 +162,7 @@ static char mv643xx_eth_driver_version[] = "1.1";</div><div class='ctx'> #define SET_MII_SPEED_TO_100			(1 &lt;&lt; 24)</div><div class='ctx'> #define SET_GMII_SPEED_TO_1000			(1 &lt;&lt; 23)</div><div class='ctx'> #define SET_FULL_DUPLEX_MODE			(1 &lt;&lt; 21)</div><div class='del'>-#define MAX_RX_PACKET_1522BYTE			(1 &lt;&lt; 17)</div><div class='ctx'> #define MAX_RX_PACKET_9700BYTE			(5 &lt;&lt; 17)</div><div class='del'>-#define MAX_RX_PACKET_MASK			(7 &lt;&lt; 17)</div><div class='ctx'> #define DISABLE_AUTO_NEG_SPEED_GMII		(1 &lt;&lt; 13)</div><div class='ctx'> #define DO_NOT_FORCE_LINK_FAIL			(1 &lt;&lt; 10)</div><div class='ctx'> #define SERIAL_PORT_CONTROL_RESERVED		(1 &lt;&lt; 9)</div><div class='hunk'>@@ -228,6 +235,8 @@ struct tx_desc {</div><div class='ctx'> #define GEN_IP_V4_CHECKSUM		0x00040000</div><div class='ctx'> #define GEN_TCP_UDP_CHECKSUM		0x00020000</div><div class='ctx'> #define UDP_FRAME			0x00010000</div><div class='add'>+#define MAC_HDR_EXTRA_4_BYTES		0x00008000</div><div class='add'>+#define MAC_HDR_EXTRA_8_BYTES		0x00000200</div><div class='ctx'> </div><div class='ctx'> #define TX_IHL_SHIFT			11</div><div class='ctx'> </div><div class='hunk'>@@ -404,6 +413,17 @@ static void rxq_disable(struct rx_queue *rxq)</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void txq_reset_hw_ptr(struct tx_queue *txq)</div><div class='add'>+{</div><div class='add'>+	struct mv643xx_eth_private *mp = txq_to_mp(txq);</div><div class='add'>+	int off = TXQ_CURRENT_DESC_PTR(mp-&gt;port_num, txq-&gt;index);</div><div class='add'>+	u32 addr;</div><div class='add'>+</div><div class='add'>+	addr = (u32)txq-&gt;tx_desc_dma;</div><div class='add'>+	addr += txq-&gt;tx_curr_desc * sizeof(struct tx_desc);</div><div class='add'>+	wrl(mp, off, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void txq_enable(struct tx_queue *txq)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv643xx_eth_private *mp = txq_to_mp(txq);</div><div class='hunk'>@@ -454,11 +474,19 @@ static void rxq_refill(struct rx_queue *rxq)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Reserve 2+14 bytes for an ethernet header (the</div><div class='ctx'> 		 * hardware automatically prepends 2 bytes of dummy</div><div class='del'>-		 * data to each received packet), 4 bytes for a VLAN</div><div class='del'>-		 * header, and 4 bytes for the trailing FCS -- 24</div><div class='del'>-		 * bytes total.</div><div class='add'>+		 * data to each received packet), 16 bytes for up to</div><div class='add'>+		 * four VLAN tags, and 4 bytes for the trailing FCS</div><div class='add'>+		 * -- 36 bytes total.</div><div class='add'>+		 */</div><div class='add'>+		skb_size = mp-&gt;dev-&gt;mtu + 36;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Make sure that the skb size is a multiple of 8</div><div class='add'>+		 * bytes, as the lower three bits of the receive</div><div class='add'>+		 * descriptor's buffer size field are ignored by</div><div class='add'>+		 * the hardware.</div><div class='ctx'> 		 */</div><div class='del'>-		skb_size = mp-&gt;dev-&gt;mtu + 24;</div><div class='add'>+		skb_size = (skb_size + 7) &amp; ~7;</div><div class='ctx'> </div><div class='ctx'> 		skb = dev_alloc_skb(skb_size + dma_get_cache_alignment() - 1);</div><div class='ctx'> 		if (skb == NULL)</div><div class='hunk'>@@ -489,10 +517,8 @@ static void rxq_refill(struct rx_queue *rxq)</div><div class='ctx'> 		skb_reserve(skb, 2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rxq-&gt;rx_desc_count != rxq-&gt;rx_ring_size) {</div><div class='del'>-		rxq-&gt;rx_oom.expires = jiffies + (HZ / 10);</div><div class='del'>-		add_timer(&amp;rxq-&gt;rx_oom);</div><div class='del'>-	}</div><div class='add'>+	if (rxq-&gt;rx_desc_count != rxq-&gt;rx_ring_size)</div><div class='add'>+		mod_timer(&amp;rxq-&gt;rx_oom, jiffies + (HZ / 10));</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;mp-&gt;lock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -509,7 +535,7 @@ static int rxq_process(struct rx_queue *rxq, int budget)</div><div class='ctx'> 	int rx;</div><div class='ctx'> </div><div class='ctx'> 	rx = 0;</div><div class='del'>-	while (rx &lt; budget) {</div><div class='add'>+	while (rx &lt; budget &amp;&amp; rxq-&gt;rx_desc_count) {</div><div class='ctx'> 		struct rx_desc *rx_desc;</div><div class='ctx'> 		unsigned int cmd_sts;</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='hunk'>@@ -534,7 +560,7 @@ static int rxq_process(struct rx_queue *rxq, int budget)</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;mp-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 		dma_unmap_single(NULL, rx_desc-&gt;buf_ptr + 2,</div><div class='del'>-				 mp-&gt;dev-&gt;mtu + 24, DMA_FROM_DEVICE);</div><div class='add'>+				 rx_desc-&gt;buf_size, DMA_FROM_DEVICE);</div><div class='ctx'> 		rxq-&gt;rx_desc_count--;</div><div class='ctx'> 		rx++;</div><div class='ctx'> </div><div class='hunk'>@@ -614,6 +640,12 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 		for (i = 0; i &lt; 8; i++)</div><div class='ctx'> 			if (mp-&gt;txq_mask &amp; (1 &lt;&lt; i))</div><div class='ctx'> 				txq_reclaim(mp-&gt;txq + i, 0);</div><div class='add'>+</div><div class='add'>+		if (netif_carrier_ok(mp-&gt;dev)) {</div><div class='add'>+			spin_lock_irq(&amp;mp-&gt;lock);</div><div class='add'>+			__txq_maybe_wake(mp-&gt;txq + mp-&gt;txq_primary);</div><div class='add'>+			spin_unlock_irq(&amp;mp-&gt;lock);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -624,8 +656,6 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> </div><div class='ctx'> 	if (rx &lt; budget) {</div><div class='ctx'> 		netif_rx_complete(mp-&gt;dev, napi);</div><div class='del'>-		wrl(mp, INT_CAUSE(mp-&gt;port_num), 0);</div><div class='del'>-		wrl(mp, INT_CAUSE_EXT(mp-&gt;port_num), 0);</div><div class='ctx'> 		wrl(mp, INT_MASK(mp-&gt;port_num), INT_TX_END | INT_RX | INT_EXT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -706,6 +736,7 @@ static inline __be16 sum16_as_be(__sum16 sum)</div><div class='ctx'> </div><div class='ctx'> static void txq_submit_skb(struct tx_queue *txq, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct mv643xx_eth_private *mp = txq_to_mp(txq);</div><div class='ctx'> 	int nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> 	int tx_index;</div><div class='ctx'> 	struct tx_desc *desc;</div><div class='hunk'>@@ -732,12 +763,36 @@ static void txq_submit_skb(struct tx_queue *txq, struct sk_buff *skb)</div><div class='ctx'> 	desc-&gt;buf_ptr = dma_map_single(NULL, skb-&gt;data, length, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='del'>-		BUG_ON(skb-&gt;protocol != htons(ETH_P_IP));</div><div class='add'>+		int mac_hdr_len;</div><div class='add'>+</div><div class='add'>+		BUG_ON(skb-&gt;protocol != htons(ETH_P_IP) &amp;&amp;</div><div class='add'>+		       skb-&gt;protocol != htons(ETH_P_8021Q));</div><div class='ctx'> </div><div class='ctx'> 		cmd_sts |= GEN_TCP_UDP_CHECKSUM |</div><div class='ctx'> 			   GEN_IP_V4_CHECKSUM   |</div><div class='ctx'> 			   ip_hdr(skb)-&gt;ihl &lt;&lt; TX_IHL_SHIFT;</div><div class='ctx'> </div><div class='add'>+		mac_hdr_len = (void *)ip_hdr(skb) - (void *)skb-&gt;data;</div><div class='add'>+		switch (mac_hdr_len - ETH_HLEN) {</div><div class='add'>+		case 0:</div><div class='add'>+			break;</div><div class='add'>+		case 4:</div><div class='add'>+			cmd_sts |= MAC_HDR_EXTRA_4_BYTES;</div><div class='add'>+			break;</div><div class='add'>+		case 8:</div><div class='add'>+			cmd_sts |= MAC_HDR_EXTRA_8_BYTES;</div><div class='add'>+			break;</div><div class='add'>+		case 12:</div><div class='add'>+			cmd_sts |= MAC_HDR_EXTRA_4_BYTES;</div><div class='add'>+			cmd_sts |= MAC_HDR_EXTRA_8_BYTES;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			if (net_ratelimit())</div><div class='add'>+				dev_printk(KERN_ERR, &amp;txq_to_mp(txq)-&gt;dev-&gt;dev,</div><div class='add'>+				   "mac header length is %d?!\n", mac_hdr_len);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		switch (ip_hdr(skb)-&gt;protocol) {</div><div class='ctx'> 		case IPPROTO_UDP:</div><div class='ctx'> 			cmd_sts |= UDP_FRAME;</div><div class='hunk'>@@ -759,6 +814,10 @@ static void txq_submit_skb(struct tx_queue *txq, struct sk_buff *skb)</div><div class='ctx'> 	wmb();</div><div class='ctx'> 	desc-&gt;cmd_sts = cmd_sts;</div><div class='ctx'> </div><div class='add'>+	/* clear TX_END interrupt status */</div><div class='add'>+	wrl(mp, INT_CAUSE(mp-&gt;port_num), ~(INT_TX_END_0 &lt;&lt; txq-&gt;index));</div><div class='add'>+	rdl(mp, INT_CAUSE(mp-&gt;port_num));</div><div class='add'>+</div><div class='ctx'> 	/* ensure all descriptors are written before poking hardware */</div><div class='ctx'> 	wmb();</div><div class='ctx'> 	txq_enable(txq);</div><div class='hunk'>@@ -1112,10 +1171,28 @@ static int mv643xx_eth_get_settings(struct net_device *dev, struct ethtool_cmd *</div><div class='ctx'> </div><div class='ctx'> static int mv643xx_eth_get_settings_phyless(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> {</div><div class='add'>+	struct mv643xx_eth_private *mp = netdev_priv(dev);</div><div class='add'>+	u32 port_status;</div><div class='add'>+</div><div class='add'>+	port_status = rdl(mp, PORT_STATUS(mp-&gt;port_num));</div><div class='add'>+</div><div class='ctx'> 	cmd-&gt;supported = SUPPORTED_MII;</div><div class='ctx'> 	cmd-&gt;advertising = ADVERTISED_MII;</div><div class='del'>-	cmd-&gt;speed = SPEED_1000;</div><div class='del'>-	cmd-&gt;duplex = DUPLEX_FULL;</div><div class='add'>+	switch (port_status &amp; PORT_SPEED_MASK) {</div><div class='add'>+	case PORT_SPEED_10:</div><div class='add'>+		cmd-&gt;speed = SPEED_10;</div><div class='add'>+		break;</div><div class='add'>+	case PORT_SPEED_100:</div><div class='add'>+		cmd-&gt;speed = SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	case PORT_SPEED_1000:</div><div class='add'>+		cmd-&gt;speed = SPEED_1000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		cmd-&gt;speed = -1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	cmd-&gt;duplex = (port_status &amp; FULL_DUPLEX) ? DUPLEX_FULL : DUPLEX_HALF;</div><div class='ctx'> 	cmd-&gt;port = PORT_MII;</div><div class='ctx'> 	cmd-&gt;phy_address = 0;</div><div class='ctx'> 	cmd-&gt;transceiver = XCVR_INTERNAL;</div><div class='hunk'>@@ -1539,8 +1616,11 @@ static int txq_init(struct mv643xx_eth_private *mp, int index)</div><div class='ctx'> </div><div class='ctx'> 	tx_desc = (struct tx_desc *)txq-&gt;tx_desc_area;</div><div class='ctx'> 	for (i = 0; i &lt; txq-&gt;tx_ring_size; i++) {</div><div class='add'>+		struct tx_desc *txd = tx_desc + i;</div><div class='ctx'> 		int nexti = (i + 1) % txq-&gt;tx_ring_size;</div><div class='del'>-		tx_desc[i].next_desc_ptr = txq-&gt;tx_desc_dma +</div><div class='add'>+</div><div class='add'>+		txd-&gt;cmd_sts = 0;</div><div class='add'>+		txd-&gt;next_desc_ptr = txq-&gt;tx_desc_dma +</div><div class='ctx'> 					nexti * sizeof(struct tx_desc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1577,8 +1657,11 @@ static void txq_reclaim(struct tx_queue *txq, int force)</div><div class='ctx'> 		desc = &amp;txq-&gt;tx_desc_area[tx_index];</div><div class='ctx'> 		cmd_sts = desc-&gt;cmd_sts;</div><div class='ctx'> </div><div class='del'>-		if (!force &amp;&amp; (cmd_sts &amp; BUFFER_OWNED_BY_DMA))</div><div class='del'>-			break;</div><div class='add'>+		if (cmd_sts &amp; BUFFER_OWNED_BY_DMA) {</div><div class='add'>+			if (!force)</div><div class='add'>+				break;</div><div class='add'>+			desc-&gt;cmd_sts = cmd_sts &amp; ~BUFFER_OWNED_BY_DMA;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		txq-&gt;tx_used_desc = (tx_index + 1) % txq-&gt;tx_ring_size;</div><div class='ctx'> 		txq-&gt;tx_desc_count--;</div><div class='hunk'>@@ -1632,49 +1715,61 @@ static void txq_deinit(struct tx_queue *txq)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* netdev ops and related ***************************************************/</div><div class='del'>-static void update_pscr(struct mv643xx_eth_private *mp, int speed, int duplex)</div><div class='add'>+static void handle_link_event(struct mv643xx_eth_private *mp)</div><div class='ctx'> {</div><div class='del'>-	u32 pscr_o;</div><div class='del'>-	u32 pscr_n;</div><div class='del'>-</div><div class='del'>-	pscr_o = rdl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num));</div><div class='add'>+	struct net_device *dev = mp-&gt;dev;</div><div class='add'>+	u32 port_status;</div><div class='add'>+	int speed;</div><div class='add'>+	int duplex;</div><div class='add'>+	int fc;</div><div class='add'>+</div><div class='add'>+	port_status = rdl(mp, PORT_STATUS(mp-&gt;port_num));</div><div class='add'>+	if (!(port_status &amp; LINK_UP)) {</div><div class='add'>+		if (netif_carrier_ok(dev)) {</div><div class='add'>+			int i;</div><div class='ctx'> </div><div class='del'>-	/* clear speed, duplex and rx buffer size fields */</div><div class='del'>-	pscr_n = pscr_o &amp; ~(SET_MII_SPEED_TO_100   |</div><div class='del'>-			    SET_GMII_SPEED_TO_1000 |</div><div class='del'>-			    SET_FULL_DUPLEX_MODE   |</div><div class='del'>-			    MAX_RX_PACKET_MASK);</div><div class='add'>+			printk(KERN_INFO "%s: link down\n", dev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	if (speed == SPEED_1000) {</div><div class='del'>-		pscr_n |= SET_GMII_SPEED_TO_1000 | MAX_RX_PACKET_9700BYTE;</div><div class='del'>-	} else {</div><div class='del'>-		if (speed == SPEED_100)</div><div class='del'>-			pscr_n |= SET_MII_SPEED_TO_100;</div><div class='del'>-		pscr_n |= MAX_RX_PACKET_1522BYTE;</div><div class='del'>-	}</div><div class='add'>+			netif_carrier_off(dev);</div><div class='add'>+			netif_stop_queue(dev);</div><div class='ctx'> </div><div class='del'>-	if (duplex == DUPLEX_FULL)</div><div class='del'>-		pscr_n |= SET_FULL_DUPLEX_MODE;</div><div class='add'>+			for (i = 0; i &lt; 8; i++) {</div><div class='add'>+				struct tx_queue *txq = mp-&gt;txq + i;</div><div class='ctx'> </div><div class='del'>-	if (pscr_n != pscr_o) {</div><div class='del'>-		if ((pscr_o &amp; SERIAL_PORT_ENABLE) == 0)</div><div class='del'>-			wrl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num), pscr_n);</div><div class='del'>-		else {</div><div class='del'>-			int i;</div><div class='add'>+				if (mp-&gt;txq_mask &amp; (1 &lt;&lt; i)) {</div><div class='add'>+					txq_reclaim(txq, 1);</div><div class='add'>+					txq_reset_hw_ptr(txq);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			for (i = 0; i &lt; 8; i++)</div><div class='del'>-				if (mp-&gt;txq_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-					txq_disable(mp-&gt;txq + i);</div><div class='add'>+	switch (port_status &amp; PORT_SPEED_MASK) {</div><div class='add'>+	case PORT_SPEED_10:</div><div class='add'>+		speed = 10;</div><div class='add'>+		break;</div><div class='add'>+	case PORT_SPEED_100:</div><div class='add'>+		speed = 100;</div><div class='add'>+		break;</div><div class='add'>+	case PORT_SPEED_1000:</div><div class='add'>+		speed = 1000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		speed = -1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	duplex = (port_status &amp; FULL_DUPLEX) ? 1 : 0;</div><div class='add'>+	fc = (port_status &amp; FLOW_CONTROL_ENABLED) ? 1 : 0;</div><div class='ctx'> </div><div class='del'>-			pscr_o &amp;= ~SERIAL_PORT_ENABLE;</div><div class='del'>-			wrl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num), pscr_o);</div><div class='del'>-			wrl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num), pscr_n);</div><div class='del'>-			wrl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num), pscr_n);</div><div class='add'>+	printk(KERN_INFO "%s: link up, %d Mb/s, %s duplex, "</div><div class='add'>+			 "flow control %sabled\n", dev-&gt;name,</div><div class='add'>+			 speed, duplex ? "full" : "half",</div><div class='add'>+			 fc ? "en" : "dis");</div><div class='ctx'> </div><div class='del'>-			for (i = 0; i &lt; 8; i++)</div><div class='del'>-				if (mp-&gt;txq_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-					txq_enable(mp-&gt;txq + i);</div><div class='del'>-		}</div><div class='add'>+	if (!netif_carrier_ok(dev)) {</div><div class='add'>+		netif_carrier_on(dev);</div><div class='add'>+		netif_wake_queue(dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1684,7 +1779,6 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)</div><div class='ctx'> 	struct mv643xx_eth_private *mp = netdev_priv(dev);</div><div class='ctx'> 	u32 int_cause;</div><div class='ctx'> 	u32 int_cause_ext;</div><div class='del'>-	u32 txq_active;</div><div class='ctx'> </div><div class='ctx'> 	int_cause = rdl(mp, INT_CAUSE(mp-&gt;port_num)) &amp;</div><div class='ctx'> 			(INT_TX_END | INT_RX | INT_EXT);</div><div class='hunk'>@@ -1698,36 +1792,15 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)</div><div class='ctx'> 		wrl(mp, INT_CAUSE_EXT(mp-&gt;port_num), ~int_cause_ext);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (int_cause_ext &amp; (INT_EXT_PHY | INT_EXT_LINK)) {</div><div class='del'>-		if (mp-&gt;phy_addr == -1 || mii_link_ok(&amp;mp-&gt;mii)) {</div><div class='del'>-			int i;</div><div class='del'>-</div><div class='del'>-			if (mp-&gt;phy_addr != -1) {</div><div class='del'>-				struct ethtool_cmd cmd;</div><div class='del'>-</div><div class='del'>-				mii_ethtool_gset(&amp;mp-&gt;mii, &amp;cmd);</div><div class='del'>-				update_pscr(mp, cmd.speed, cmd.duplex);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt; 8; i++)</div><div class='del'>-				if (mp-&gt;txq_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-					txq_enable(mp-&gt;txq + i);</div><div class='del'>-</div><div class='del'>-			if (!netif_carrier_ok(dev)) {</div><div class='del'>-				netif_carrier_on(dev);</div><div class='del'>-				__txq_maybe_wake(mp-&gt;txq + mp-&gt;txq_primary);</div><div class='del'>-			}</div><div class='del'>-		} else if (netif_carrier_ok(dev)) {</div><div class='del'>-			netif_stop_queue(dev);</div><div class='del'>-			netif_carrier_off(dev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (int_cause_ext &amp; (INT_EXT_PHY | INT_EXT_LINK))</div><div class='add'>+		handle_link_event(mp);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * RxBuffer or RxError set for any of the 8 queues?</div><div class='ctx'> 	 */</div><div class='ctx'> #ifdef MV643XX_ETH_NAPI</div><div class='ctx'> 	if (int_cause &amp; INT_RX) {</div><div class='add'>+		wrl(mp, INT_CAUSE(mp-&gt;port_num), ~(int_cause &amp; INT_RX));</div><div class='ctx'> 		wrl(mp, INT_MASK(mp-&gt;port_num), 0x00000000);</div><div class='ctx'> 		rdl(mp, INT_MASK(mp-&gt;port_num));</div><div class='ctx'> </div><div class='hunk'>@@ -1743,8 +1816,6 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	txq_active = rdl(mp, TXQ_COMMAND(mp-&gt;port_num));</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * TxBuffer or TxError set for any of the 8 queues?</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1754,6 +1825,16 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)</div><div class='ctx'> 		for (i = 0; i &lt; 8; i++)</div><div class='ctx'> 			if (mp-&gt;txq_mask &amp; (1 &lt;&lt; i))</div><div class='ctx'> 				txq_reclaim(mp-&gt;txq + i, 0);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Enough space again in the primary TX queue for a</div><div class='add'>+		 * full packet?</div><div class='add'>+		 */</div><div class='add'>+		if (netif_carrier_ok(dev)) {</div><div class='add'>+			spin_lock(&amp;mp-&gt;lock);</div><div class='add'>+			__txq_maybe_wake(mp-&gt;txq + mp-&gt;txq_primary);</div><div class='add'>+			spin_unlock(&amp;mp-&gt;lock);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1763,19 +1844,25 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='ctx'> 		wrl(mp, INT_CAUSE(mp-&gt;port_num), ~(int_cause &amp; INT_TX_END));</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;mp-&gt;lock);</div><div class='ctx'> 		for (i = 0; i &lt; 8; i++) {</div><div class='ctx'> 			struct tx_queue *txq = mp-&gt;txq + i;</div><div class='del'>-			if (txq-&gt;tx_desc_count &amp;&amp; !((txq_active &gt;&gt; i) &amp; 1))</div><div class='add'>+			u32 hw_desc_ptr;</div><div class='add'>+			u32 expected_ptr;</div><div class='add'>+</div><div class='add'>+			if ((int_cause &amp; (INT_TX_END_0 &lt;&lt; i)) == 0)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			hw_desc_ptr =</div><div class='add'>+				rdl(mp, TXQ_CURRENT_DESC_PTR(mp-&gt;port_num, i));</div><div class='add'>+			expected_ptr = (u32)txq-&gt;tx_desc_dma +</div><div class='add'>+				txq-&gt;tx_curr_desc * sizeof(struct tx_desc);</div><div class='add'>+</div><div class='add'>+			if (hw_desc_ptr != expected_ptr)</div><div class='ctx'> 				txq_enable(txq);</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Enough space again in the primary TX queue for a full packet?</div><div class='del'>-	 */</div><div class='del'>-	if (int_cause_ext &amp; INT_EXT_TX) {</div><div class='del'>-		struct tx_queue *txq = mp-&gt;txq + mp-&gt;txq_primary;</div><div class='del'>-		__txq_maybe_wake(txq);</div><div class='add'>+		spin_unlock(&amp;mp-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -1785,14 +1872,14 @@ static void phy_reset(struct mv643xx_eth_private *mp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int data;</div><div class='ctx'> </div><div class='del'>-	smi_reg_read(mp, mp-&gt;phy_addr, 0, &amp;data);</div><div class='del'>-	data |= 0x8000;</div><div class='del'>-	smi_reg_write(mp, mp-&gt;phy_addr, 0, data);</div><div class='add'>+	smi_reg_read(mp, mp-&gt;phy_addr, MII_BMCR, &amp;data);</div><div class='add'>+	data |= BMCR_RESET;</div><div class='add'>+	smi_reg_write(mp, mp-&gt;phy_addr, MII_BMCR, data);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		udelay(1);</div><div class='del'>-		smi_reg_read(mp, mp-&gt;phy_addr, 0, &amp;data);</div><div class='del'>-	} while (data &amp; 0x8000);</div><div class='add'>+		smi_reg_read(mp, mp-&gt;phy_addr, MII_BMCR, &amp;data);</div><div class='add'>+	} while (data &amp; BMCR_RESET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void port_start(struct mv643xx_eth_private *mp)</div><div class='hunk'>@@ -1801,23 +1888,6 @@ static void port_start(struct mv643xx_eth_private *mp)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Configure basic link parameters.</div><div class='del'>-	 */</div><div class='del'>-	pscr = rdl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num));</div><div class='del'>-	pscr &amp;= ~(SERIAL_PORT_ENABLE | FORCE_LINK_PASS);</div><div class='del'>-	wrl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num), pscr);</div><div class='del'>-	pscr |= DISABLE_AUTO_NEG_FOR_FLOW_CTRL |</div><div class='del'>-		DISABLE_AUTO_NEG_SPEED_GMII    |</div><div class='del'>-		DISABLE_AUTO_NEG_FOR_DUPLEX    |</div><div class='del'>-		DO_NOT_FORCE_LINK_FAIL	       |</div><div class='del'>-		SERIAL_PORT_CONTROL_RESERVED;</div><div class='del'>-	wrl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num), pscr);</div><div class='del'>-	pscr |= SERIAL_PORT_ENABLE;</div><div class='del'>-	wrl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num), pscr);</div><div class='del'>-</div><div class='del'>-	wrl(mp, SDMA_CONFIG(mp-&gt;port_num), PORT_SDMA_CONFIG_DEFAULT_VALUE);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Perform PHY reset, if there is a PHY.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (mp-&gt;phy_addr != -1) {</div><div class='hunk'>@@ -1829,21 +1899,31 @@ static void port_start(struct mv643xx_eth_private *mp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Configure basic link parameters.</div><div class='add'>+	 */</div><div class='add'>+	pscr = rdl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num));</div><div class='add'>+</div><div class='add'>+	pscr |= SERIAL_PORT_ENABLE;</div><div class='add'>+	wrl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num), pscr);</div><div class='add'>+</div><div class='add'>+	pscr |= DO_NOT_FORCE_LINK_FAIL;</div><div class='add'>+	if (mp-&gt;phy_addr == -1)</div><div class='add'>+		pscr |= FORCE_LINK_PASS;</div><div class='add'>+	wrl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num), pscr);</div><div class='add'>+</div><div class='add'>+	wrl(mp, SDMA_CONFIG(mp-&gt;port_num), PORT_SDMA_CONFIG_DEFAULT_VALUE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Configure TX path and queues.</div><div class='ctx'> 	 */</div><div class='ctx'> 	tx_set_rate(mp, 1000000000, 16777216);</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++) {</div><div class='ctx'> 		struct tx_queue *txq = mp-&gt;txq + i;</div><div class='del'>-		int off = TXQ_CURRENT_DESC_PTR(mp-&gt;port_num, i);</div><div class='del'>-		u32 addr;</div><div class='ctx'> </div><div class='ctx'> 		if ((mp-&gt;txq_mask &amp; (1 &lt;&lt; i)) == 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		addr = (u32)txq-&gt;tx_desc_dma;</div><div class='del'>-		addr += txq-&gt;tx_curr_desc * sizeof(struct tx_desc);</div><div class='del'>-		wrl(mp, off, addr);</div><div class='del'>-</div><div class='add'>+		txq_reset_hw_ptr(txq);</div><div class='ctx'> 		txq_set_rate(txq, 1000000000, 16777216);</div><div class='ctx'> 		txq_set_fixed_prio_mode(txq);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1965,6 +2045,9 @@ static int mv643xx_eth_open(struct net_device *dev)</div><div class='ctx'> 	napi_enable(&amp;mp-&gt;napi);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	netif_carrier_off(dev);</div><div class='add'>+	netif_stop_queue(dev);</div><div class='add'>+</div><div class='ctx'> 	port_start(mp);</div><div class='ctx'> </div><div class='ctx'> 	set_rx_coal(mp, 0);</div><div class='hunk'>@@ -1999,8 +2082,14 @@ static void port_reset(struct mv643xx_eth_private *mp)</div><div class='ctx'> 		if (mp-&gt;txq_mask &amp; (1 &lt;&lt; i))</div><div class='ctx'> 			txq_disable(mp-&gt;txq + i);</div><div class='ctx'> 	}</div><div class='del'>-	while (!(rdl(mp, PORT_STATUS(mp-&gt;port_num)) &amp; TX_FIFO_EMPTY))</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		u32 ps = rdl(mp, PORT_STATUS(mp-&gt;port_num));</div><div class='add'>+</div><div class='add'>+		if ((ps &amp; (TX_IN_PROGRESS | TX_FIFO_EMPTY)) == TX_FIFO_EMPTY)</div><div class='add'>+			break;</div><div class='ctx'> 		udelay(10);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the Enable bit in the Configuration Register */</div><div class='ctx'> 	data = rdl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num));</div><div class='hunk'>@@ -2202,7 +2291,8 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!mv643xx_eth_version_printed++)</div><div class='del'>-		printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");</div><div class='add'>+		printk(KERN_NOTICE "MV-643xx 10/100/1000 ethernet "</div><div class='add'>+			"driver version %s\n", mv643xx_eth_driver_version);</div><div class='ctx'> </div><div class='ctx'> 	ret = -EINVAL;</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='hunk'>@@ -2338,14 +2428,14 @@ static int phy_detect(struct mv643xx_eth_private *mp)</div><div class='ctx'> 	unsigned int data;</div><div class='ctx'> 	unsigned int data2;</div><div class='ctx'> </div><div class='del'>-	smi_reg_read(mp, mp-&gt;phy_addr, 0, &amp;data);</div><div class='del'>-	smi_reg_write(mp, mp-&gt;phy_addr, 0, data ^ 0x1000);</div><div class='add'>+	smi_reg_read(mp, mp-&gt;phy_addr, MII_BMCR, &amp;data);</div><div class='add'>+	smi_reg_write(mp, mp-&gt;phy_addr, MII_BMCR, data ^ BMCR_ANENABLE);</div><div class='ctx'> </div><div class='del'>-	smi_reg_read(mp, mp-&gt;phy_addr, 0, &amp;data2);</div><div class='del'>-	if (((data ^ data2) &amp; 0x1000) == 0)</div><div class='add'>+	smi_reg_read(mp, mp-&gt;phy_addr, MII_BMCR, &amp;data2);</div><div class='add'>+	if (((data ^ data2) &amp; BMCR_ANENABLE) == 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	smi_reg_write(mp, mp-&gt;phy_addr, 0, data);</div><div class='add'>+	smi_reg_write(mp, mp-&gt;phy_addr, MII_BMCR, data);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2393,12 +2483,39 @@ static int phy_init(struct mv643xx_eth_private *mp,</div><div class='ctx'> 		cmd.duplex = pd-&gt;duplex;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	update_pscr(mp, cmd.speed, cmd.duplex);</div><div class='ctx'> 	mv643xx_eth_set_settings(mp-&gt;dev, &amp;cmd);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void init_pscr(struct mv643xx_eth_private *mp, int speed, int duplex)</div><div class='add'>+{</div><div class='add'>+	u32 pscr;</div><div class='add'>+</div><div class='add'>+	pscr = rdl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num));</div><div class='add'>+	if (pscr &amp; SERIAL_PORT_ENABLE) {</div><div class='add'>+		pscr &amp;= ~SERIAL_PORT_ENABLE;</div><div class='add'>+		wrl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num), pscr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pscr = MAX_RX_PACKET_9700BYTE | SERIAL_PORT_CONTROL_RESERVED;</div><div class='add'>+	if (mp-&gt;phy_addr == -1) {</div><div class='add'>+		pscr |= DISABLE_AUTO_NEG_SPEED_GMII;</div><div class='add'>+		if (speed == SPEED_1000)</div><div class='add'>+			pscr |= SET_GMII_SPEED_TO_1000;</div><div class='add'>+		else if (speed == SPEED_100)</div><div class='add'>+			pscr |= SET_MII_SPEED_TO_100;</div><div class='add'>+</div><div class='add'>+		pscr |= DISABLE_AUTO_NEG_FOR_FLOW_CTRL;</div><div class='add'>+</div><div class='add'>+		pscr |= DISABLE_AUTO_NEG_FOR_DUPLEX;</div><div class='add'>+		if (duplex == DUPLEX_FULL)</div><div class='add'>+			pscr |= SET_FULL_DUPLEX_MODE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wrl(mp, PORT_SERIAL_CONTROL(mp-&gt;port_num), pscr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mv643xx_eth_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv643xx_eth_platform_data *pd;</div><div class='hunk'>@@ -2452,6 +2569,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		SET_ETHTOOL_OPS(dev, &amp;mv643xx_eth_ethtool_ops_phyless);</div><div class='ctx'> 	}</div><div class='add'>+	init_pscr(mp, pd-&gt;speed, pd-&gt;duplex);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='hunk'>@@ -2478,6 +2596,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)</div><div class='ctx'> 	 * have to map the buffers to ISA memory which is only 16 MB</div><div class='ctx'> 	 */</div><div class='ctx'> 	dev-&gt;features = NETIF_F_SG | NETIF_F_IP_CSUM;</div><div class='add'>+	dev-&gt;vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='head'>diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c<br/>index 3ab0e5289f7a..d6524db321af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/myri10ge/myri10ge.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/myri10ge/myri10ge.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/myri10ge/myri10ge.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/myri10ge/myri10ge.c</a></div><div class='hunk'>@@ -56,7 +56,6 @@</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='hunk'>@@ -76,7 +75,7 @@</div><div class='ctx'> #include "myri10ge_mcp.h"</div><div class='ctx'> #include "myri10ge_mcp_gen_header.h"</div><div class='ctx'> </div><div class='del'>-#define MYRI10GE_VERSION_STR "1.3.99-1.347"</div><div class='add'>+#define MYRI10GE_VERSION_STR "1.4.3-1.358"</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");</div><div class='ctx'> MODULE_AUTHOR("Maintainer: help@myri.com");</div><div class='hunk'>@@ -3548,7 +3547,11 @@ static void myri10ge_probe_slices(struct myri10ge_priv *mgp)</div><div class='ctx'> </div><div class='ctx'> 	/* try to load the slice aware rss firmware */</div><div class='ctx'> 	old_fw = mgp-&gt;fw_name;</div><div class='del'>-	if (old_fw == myri10ge_fw_aligned)</div><div class='add'>+	if (myri10ge_fw_name != NULL) {</div><div class='add'>+		dev_info(&amp;mgp-&gt;pdev-&gt;dev, "overriding rss firmware to %s\n",</div><div class='add'>+			 myri10ge_fw_name);</div><div class='add'>+		mgp-&gt;fw_name = myri10ge_fw_name;</div><div class='add'>+	} else if (old_fw == myri10ge_fw_aligned)</div><div class='ctx'> 		mgp-&gt;fw_name = myri10ge_fw_rss_aligned;</div><div class='ctx'> 	else</div><div class='ctx'> 		mgp-&gt;fw_name = myri10ge_fw_rss_unaligned;</div><div class='hunk'>@@ -3699,6 +3702,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Error %d setting DMA mask\n", status);</div><div class='ctx'> 		goto abort_with_netdev;</div><div class='ctx'> 	}</div><div class='add'>+	(void)pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);</div><div class='ctx'> 	mgp-&gt;cmd = dma_alloc_coherent(&amp;pdev-&gt;dev, sizeof(*mgp-&gt;cmd),</div><div class='ctx'> 				      &amp;mgp-&gt;cmd_bus, GFP_KERNEL);</div><div class='ctx'> 	if (mgp-&gt;cmd == NULL)</div><div class='head'>diff --git a/drivers/net/myri10ge/myri10ge_mcp.h b/drivers/net/myri10ge/myri10ge_mcp.h<br/>index fdbeeee07372..993721090777 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/myri10ge/myri10ge_mcp.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/myri10ge/myri10ge_mcp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/myri10ge/myri10ge_mcp.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/myri10ge/myri10ge_mcp.h</a></div><div class='hunk'>@@ -101,6 +101,8 @@ struct mcp_kreq_ether_recv {</div><div class='ctx'> #define	MXGEFW_ETH_SEND_3	0x2c0000</div><div class='ctx'> #define	MXGEFW_ETH_RECV_SMALL	0x300000</div><div class='ctx'> #define	MXGEFW_ETH_RECV_BIG	0x340000</div><div class='add'>+#define	MXGEFW_ETH_SEND_GO	0x380000</div><div class='add'>+#define	MXGEFW_ETH_SEND_STOP	0x3C0000</div><div class='ctx'> </div><div class='ctx'> #define	MXGEFW_ETH_SEND(n)		(0x200000 + (((n) &amp; 0x03) * 0x40000))</div><div class='ctx'> #define	MXGEFW_ETH_SEND_OFFSET(n)	(MXGEFW_ETH_SEND(n) - MXGEFW_ETH_SEND_4)</div><div class='hunk'>@@ -120,6 +122,11 @@ enum myri10ge_mcp_cmd_type {</div><div class='ctx'> 	 * MXGEFW_CMD_RESET is issued */</div><div class='ctx'> </div><div class='ctx'> 	MXGEFW_CMD_SET_INTRQ_DMA,</div><div class='add'>+	/* data0 = LSW of the host address</div><div class='add'>+	 * data1 = MSW of the host address</div><div class='add'>+	 * data2 = slice number if multiple slices are used</div><div class='add'>+	 */</div><div class='add'>+</div><div class='ctx'> 	MXGEFW_CMD_SET_BIG_BUFFER_SIZE,	/* in bytes, power of 2 */</div><div class='ctx'> 	MXGEFW_CMD_SET_SMALL_BUFFER_SIZE,	/* in bytes */</div><div class='ctx'> </div><div class='hunk'>@@ -129,6 +136,8 @@ enum myri10ge_mcp_cmd_type {</div><div class='ctx'> 	MXGEFW_CMD_GET_SEND_OFFSET,</div><div class='ctx'> 	MXGEFW_CMD_GET_SMALL_RX_OFFSET,</div><div class='ctx'> 	MXGEFW_CMD_GET_BIG_RX_OFFSET,</div><div class='add'>+	/* data0 = slice number if multiple slices are used */</div><div class='add'>+</div><div class='ctx'> 	MXGEFW_CMD_GET_IRQ_ACK_OFFSET,</div><div class='ctx'> 	MXGEFW_CMD_GET_IRQ_DEASSERT_OFFSET,</div><div class='ctx'> </div><div class='hunk'>@@ -200,7 +209,12 @@ enum myri10ge_mcp_cmd_type {</div><div class='ctx'> 	MXGEFW_CMD_SET_STATS_DMA_V2,</div><div class='ctx'> 	/* data0, data1 = bus addr,</div><div class='ctx'> 	 * data2 = sizeof(struct mcp_irq_data) from driver point of view, allows</div><div class='del'>-	 * adding new stuff to mcp_irq_data without changing the ABI */</div><div class='add'>+	 * adding new stuff to mcp_irq_data without changing the ABI</div><div class='add'>+	 *</div><div class='add'>+	 * If multiple slices are used, data2 contains both the size of the</div><div class='add'>+	 * structure (in the lower 16 bits) and the slice number</div><div class='add'>+	 * (in the upper 16 bits).</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	MXGEFW_CMD_UNALIGNED_TEST,</div><div class='ctx'> 	/* same than DMA_TEST (same args) but abort with UNALIGNED on unaligned</div><div class='hunk'>@@ -222,13 +236,18 @@ enum myri10ge_mcp_cmd_type {</div><div class='ctx'> 	MXGEFW_CMD_GET_MAX_RSS_QUEUES,</div><div class='ctx'> 	MXGEFW_CMD_ENABLE_RSS_QUEUES,</div><div class='ctx'> 	/* data0 = number of slices n (0, 1, ..., n-1) to enable</div><div class='del'>-	 * data1 = interrupt mode.</div><div class='del'>-	 * 0=share one INTx/MSI, 1=use one MSI-X per queue.</div><div class='add'>+	 * data1 = interrupt mode | use of multiple transmit queues.</div><div class='add'>+	 * 0=share one INTx/MSI.</div><div class='add'>+	 * 1=use one MSI-X per queue.</div><div class='ctx'> 	 * If all queues share one interrupt, the driver must have set</div><div class='ctx'> 	 * RSS_SHARED_INTERRUPT_DMA before enabling queues.</div><div class='add'>+	 * 2=enable both receive and send queues.</div><div class='add'>+	 * Without this bit set, only one send queue (slice 0's send queue)</div><div class='add'>+	 * is enabled.  The receive queues are always enabled.</div><div class='ctx'> 	 */</div><div class='del'>-#define MXGEFW_SLICE_INTR_MODE_SHARED 0</div><div class='del'>-#define MXGEFW_SLICE_INTR_MODE_ONE_PER_SLICE 1</div><div class='add'>+#define MXGEFW_SLICE_INTR_MODE_SHARED          0x0</div><div class='add'>+#define MXGEFW_SLICE_INTR_MODE_ONE_PER_SLICE   0x1</div><div class='add'>+#define MXGEFW_SLICE_ENABLE_MULTIPLE_TX_QUEUES 0x2</div><div class='ctx'> </div><div class='ctx'> 	MXGEFW_CMD_GET_RSS_SHARED_INTERRUPT_MASK_OFFSET,</div><div class='ctx'> 	MXGEFW_CMD_SET_RSS_SHARED_INTERRUPT_DMA,</div><div class='hunk'>@@ -250,10 +269,13 @@ enum myri10ge_mcp_cmd_type {</div><div class='ctx'> 	 * 2: TCP_IPV4        (required by RSS)</div><div class='ctx'> 	 * 3: IPV4 | TCP_IPV4 (required by RSS)</div><div class='ctx'> 	 * 4: source port</div><div class='add'>+	 * 5: source port + destination port</div><div class='ctx'> 	 */</div><div class='ctx'> #define MXGEFW_RSS_HASH_TYPE_IPV4      0x1</div><div class='ctx'> #define MXGEFW_RSS_HASH_TYPE_TCP_IPV4  0x2</div><div class='ctx'> #define MXGEFW_RSS_HASH_TYPE_SRC_PORT  0x4</div><div class='add'>+#define MXGEFW_RSS_HASH_TYPE_SRC_DST_PORT 0x5</div><div class='add'>+#define MXGEFW_RSS_HASH_TYPE_MAX 0x5</div><div class='ctx'> </div><div class='ctx'> 	MXGEFW_CMD_GET_MAX_TSO6_HDR_SIZE,</div><div class='ctx'> 	/* Return data = the max. size of the entire headers of a IPv6 TSO packet.</div><div class='hunk'>@@ -329,6 +351,20 @@ enum myri10ge_mcp_cmd_type {</div><div class='ctx'> </div><div class='ctx'> 	MXGEFW_CMD_GET_DCA_OFFSET,</div><div class='ctx'> 	/* offset of dca control for WDMAs */</div><div class='add'>+</div><div class='add'>+	/* VMWare NetQueue commands */</div><div class='add'>+	MXGEFW_CMD_NETQ_GET_FILTERS_PER_QUEUE,</div><div class='add'>+	MXGEFW_CMD_NETQ_ADD_FILTER,</div><div class='add'>+	/* data0 = filter_id &lt;&lt; 16 | queue &lt;&lt; 8 | type */</div><div class='add'>+	/* data1 = MS4 of MAC Addr */</div><div class='add'>+	/* data2 = LS2_MAC &lt;&lt; 16 | VLAN_tag */</div><div class='add'>+	MXGEFW_CMD_NETQ_DEL_FILTER,</div><div class='add'>+	/* data0 = filter_id */</div><div class='add'>+	MXGEFW_CMD_NETQ_QUERY1,</div><div class='add'>+	MXGEFW_CMD_NETQ_QUERY2,</div><div class='add'>+	MXGEFW_CMD_NETQ_QUERY3,</div><div class='add'>+	MXGEFW_CMD_NETQ_QUERY4,</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum myri10ge_mcp_cmd_status {</div><div class='hunk'>@@ -381,4 +417,10 @@ struct mcp_irq_data {</div><div class='ctx'> 	u8 valid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* definitions for NETQ filter type */</div><div class='add'>+#define MXGEFW_NETQ_FILTERTYPE_NONE 0</div><div class='add'>+#define MXGEFW_NETQ_FILTERTYPE_MACADDR 1</div><div class='add'>+#define MXGEFW_NETQ_FILTERTYPE_VLAN 2</div><div class='add'>+#define MXGEFW_NETQ_FILTERTYPE_VLANMACADDR 3</div><div class='add'>+</div><div class='ctx'> #endif				/* __MYRI10GE_MCP_H__ */</div><div class='head'>diff --git a/drivers/net/myri10ge/myri10ge_mcp_gen_header.h b/drivers/net/myri10ge/myri10ge_mcp_gen_header.h<br/>index 07d65c2cbb24..a8662ea8079a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/myri10ge/myri10ge_mcp_gen_header.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/myri10ge/myri10ge_mcp_gen_header.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/myri10ge/myri10ge_mcp_gen_header.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/myri10ge/myri10ge_mcp_gen_header.h</a></div><div class='hunk'>@@ -35,7 +35,7 @@ struct mcp_gen_header {</div><div class='ctx'> 	unsigned char mcp_index;</div><div class='ctx'> 	unsigned char disable_rabbit;</div><div class='ctx'> 	unsigned char unaligned_tlp;</div><div class='del'>-	unsigned char pad1;</div><div class='add'>+	unsigned char pcie_link_algo;</div><div class='ctx'> 	unsigned counters_addr;</div><div class='ctx'> 	unsigned copy_block_info;	/* for small mcps loaded with "lload -d" */</div><div class='ctx'> 	unsigned short handoff_id_major;	/* must be equal */</div><div class='head'>diff --git a/drivers/net/ne.c b/drivers/net/ne.c<br/>index 2fec6122c7fa..fa3ceca4e15c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ne.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/ne.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ne.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ne.c</a></div><div class='hunk'>@@ -118,7 +118,7 @@ bad_clone_list[] __initdata = {</div><div class='ctx'>     {"E-LAN100", "E-LAN200", {0x00, 0x00, 0x5d}}, /* Broken ne1000 clones */</div><div class='ctx'>     {"PCM-4823", "PCM-4823", {0x00, 0xc0, 0x6c}}, /* Broken Advantech MoBo */</div><div class='ctx'>     {"REALTEK", "RTL8019", {0x00, 0x00, 0xe8}}, /* no-name with Realtek chip */</div><div class='del'>-#if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938)</div><div class='add'>+#ifdef CONFIG_MACH_TX49XX</div><div class='ctx'>     {"RBHMA4X00-RTL8019", "RBHMA4X00/RTL8019", {0x00, 0x60, 0x0a}},  /* Toshiba built-in */</div><div class='ctx'> #endif</div><div class='ctx'>     {"LCS-8834", "LCS-8836", {0x04, 0x04, 0x37}}, /* ShinyNet (SET) */</div><div class='hunk'>@@ -142,7 +142,7 @@ bad_clone_list[] __initdata = {</div><div class='ctx'> #if defined(CONFIG_PLAT_MAPPI)</div><div class='ctx'> #  define DCR_VAL 0x4b</div><div class='ctx'> #elif defined(CONFIG_PLAT_OAKS32R)  || \</div><div class='del'>-   defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938)</div><div class='add'>+   defined(CONFIG_MACH_TX49XX)</div><div class='ctx'> #  define DCR_VAL 0x48		/* 8-bit mode */</div><div class='ctx'> #else</div><div class='ctx'> #  define DCR_VAL 0x49</div><div class='hunk'>@@ -536,7 +536,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	dev-&gt;poll_controller = eip_poll;</div><div class='ctx'> #endif</div><div class='del'>-	NS8390_init(dev, 0);</div><div class='add'>+	NS8390p_init(dev, 0);</div><div class='ctx'> </div><div class='ctx'> 	ret = register_netdev(dev);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -794,7 +794,7 @@ retry:</div><div class='ctx'> 		if (time_after(jiffies, dma_start + 2*HZ/100)) {		/* 20ms */</div><div class='ctx'> 			printk(KERN_WARNING "%s: timeout waiting for Tx RDC.\n", dev-&gt;name);</div><div class='ctx'> 			ne_reset_8390(dev);</div><div class='del'>-			NS8390_init(dev,1);</div><div class='add'>+			NS8390p_init(dev, 1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -855,7 +855,7 @@ static int ne_drv_resume(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='ctx'> 		ne_reset_8390(dev);</div><div class='del'>-		NS8390_init(dev, 1);</div><div class='add'>+		NS8390p_init(dev, 1);</div><div class='ctx'> 		netif_device_attach(dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c<br/>index e13966bb5f77..9681618c3232 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/netconsole.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/netconsole.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/netconsole.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netconsole.c</a></div><div class='hunk'>@@ -53,7 +53,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static char config[MAX_PARAM_LENGTH];</div><div class='ctx'> module_param_string(netconsole, config, MAX_PARAM_LENGTH, 0);</div><div class='del'>-MODULE_PARM_DESC(netconsole, " netconsole=[src-port]@[src-ip]/[dev],[tgt-port]@&lt;tgt-ip&gt;/[tgt-macaddr]\n");</div><div class='add'>+MODULE_PARM_DESC(netconsole, " netconsole=[src-port]@[src-ip]/[dev],[tgt-port]@&lt;tgt-ip&gt;/[tgt-macaddr]");</div><div class='ctx'> </div><div class='ctx'> #ifndef	MODULE</div><div class='ctx'> static int __init option_setup(char *opt)</div><div class='head'>diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c<br/>index dc442e370850..3f9af759cb90 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/netx-eth.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/netx-eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/netx-eth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netx-eth.c</a></div><div class='hunk'>@@ -29,12 +29,11 @@</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/netx-regs.h&gt;</div><div class='del'>-#include &lt;asm/arch/pfifo.h&gt;</div><div class='del'>-#include &lt;asm/arch/xc.h&gt;</div><div class='del'>-#include &lt;asm/arch/eth.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/netx-regs.h&gt;</div><div class='add'>+#include &lt;mach/pfifo.h&gt;</div><div class='add'>+#include &lt;mach/xc.h&gt;</div><div class='add'>+#include &lt;mach/eth.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* XC Fifo Offsets */</div><div class='ctx'> #define EMPTY_PTR_FIFO(xcno)    (0 + ((xcno) &lt;&lt; 3))	/* Index of the empty pointer FIFO */</div><div class='head'>diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h<br/>index 8e736614407d..244ab49c4337 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/netxen/netxen_nic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic.h</a></div><div class='hunk'>@@ -45,7 +45,6 @@</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='hunk'>@@ -66,8 +65,8 @@</div><div class='ctx'> </div><div class='ctx'> #define _NETXEN_NIC_LINUX_MAJOR 4</div><div class='ctx'> #define _NETXEN_NIC_LINUX_MINOR 0</div><div class='del'>-#define _NETXEN_NIC_LINUX_SUBVERSION 0</div><div class='del'>-#define NETXEN_NIC_LINUX_VERSIONID  "4.0.0"</div><div class='add'>+#define _NETXEN_NIC_LINUX_SUBVERSION 11</div><div class='add'>+#define NETXEN_NIC_LINUX_VERSIONID  "4.0.11"</div><div class='ctx'> </div><div class='ctx'> #define NETXEN_VERSION_CODE(a, b, c)	(((a) &lt;&lt; 16) + ((b) &lt;&lt; 8) + (c))</div><div class='ctx'> </div><div class='hunk'>@@ -508,6 +507,8 @@ typedef enum {</div><div class='ctx'> 	NETXEN_BRDTYPE_P3_10000_BASE_T = 0x0027,</div><div class='ctx'> 	NETXEN_BRDTYPE_P3_XG_LOM = 0x0028,</div><div class='ctx'> 	NETXEN_BRDTYPE_P3_4_GB_MM = 0x0029,</div><div class='add'>+	NETXEN_BRDTYPE_P3_10G_SFP_CT = 0x002a,</div><div class='add'>+	NETXEN_BRDTYPE_P3_10G_SFP_QT = 0x002b,</div><div class='ctx'> 	NETXEN_BRDTYPE_P3_10G_CX4 = 0x0031,</div><div class='ctx'> 	NETXEN_BRDTYPE_P3_10G_XFP = 0x0032</div><div class='ctx'> </div><div class='hunk'>@@ -1170,6 +1171,36 @@ typedef struct {</div><div class='ctx'> 	nx_nic_intr_coalesce_data_t	irq;</div><div class='ctx'> } nx_nic_intr_coalesce_t;</div><div class='ctx'> </div><div class='add'>+#define NX_HOST_REQUEST		0x13</div><div class='add'>+#define NX_NIC_REQUEST		0x14</div><div class='add'>+</div><div class='add'>+#define NX_MAC_EVENT		0x1</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	NX_NIC_H2C_OPCODE_START = 0,</div><div class='add'>+	NX_NIC_H2C_OPCODE_CONFIG_RSS,</div><div class='add'>+	NX_NIC_H2C_OPCODE_CONFIG_RSS_TBL,</div><div class='add'>+	NX_NIC_H2C_OPCODE_CONFIG_INTR_COALESCE,</div><div class='add'>+	NX_NIC_H2C_OPCODE_CONFIG_LED,</div><div class='add'>+	NX_NIC_H2C_OPCODE_CONFIG_PROMISCUOUS,</div><div class='add'>+	NX_NIC_H2C_OPCODE_CONFIG_L2_MAC,</div><div class='add'>+	NX_NIC_H2C_OPCODE_LRO_REQUEST,</div><div class='add'>+	NX_NIC_H2C_OPCODE_GET_SNMP_STATS,</div><div class='add'>+	NX_NIC_H2C_OPCODE_PROXY_START_REQUEST,</div><div class='add'>+	NX_NIC_H2C_OPCODE_PROXY_STOP_REQUEST,</div><div class='add'>+	NX_NIC_H2C_OPCODE_PROXY_SET_MTU,</div><div class='add'>+	NX_NIC_H2C_OPCODE_PROXY_SET_VPORT_MISS_MODE,</div><div class='add'>+	NX_H2P_OPCODE_GET_FINGER_PRINT_REQUEST,</div><div class='add'>+	NX_H2P_OPCODE_INSTALL_LICENSE_REQUEST,</div><div class='add'>+	NX_H2P_OPCODE_GET_LICENSE_CAPABILITY_REQUEST,</div><div class='add'>+	NX_NIC_H2C_OPCODE_GET_NET_STATS,</div><div class='add'>+	NX_NIC_H2C_OPCODE_LAST</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define VPORT_MISS_MODE_DROP		0 /* drop all unmatched */</div><div class='add'>+#define VPORT_MISS_MODE_ACCEPT_ALL	1 /* accept all packets */</div><div class='add'>+#define VPORT_MISS_MODE_ACCEPT_MULTI	2 /* accept unmatched multicast */</div><div class='add'>+</div><div class='ctx'> typedef struct {</div><div class='ctx'> 	u64 qhdr;</div><div class='ctx'> 	u64 req_hdr;</div><div class='hunk'>@@ -1288,7 +1319,7 @@ struct netxen_adapter {</div><div class='ctx'> 	int (*disable_phy_interrupts) (struct netxen_adapter *);</div><div class='ctx'> 	int (*macaddr_set) (struct netxen_adapter *, netxen_ethernet_macaddr_t);</div><div class='ctx'> 	int (*set_mtu) (struct netxen_adapter *, int);</div><div class='del'>-	int (*set_promisc) (struct netxen_adapter *, netxen_niu_prom_mode_t);</div><div class='add'>+	int (*set_promisc) (struct netxen_adapter *, u32);</div><div class='ctx'> 	int (*phy_read) (struct netxen_adapter *, long reg, u32 *);</div><div class='ctx'> 	int (*phy_write) (struct netxen_adapter *, long reg, u32 val);</div><div class='ctx'> 	int (*init_port) (struct netxen_adapter *, int);</div><div class='hunk'>@@ -1465,9 +1496,10 @@ int netxen_process_cmd_ring(struct netxen_adapter *adapter);</div><div class='ctx'> u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctx, int max);</div><div class='ctx'> void netxen_p2_nic_set_multi(struct net_device *netdev);</div><div class='ctx'> void netxen_p3_nic_set_multi(struct net_device *netdev);</div><div class='add'>+int netxen_p3_nic_set_promisc(struct netxen_adapter *adapter, u32);</div><div class='ctx'> int netxen_config_intr_coalesce(struct netxen_adapter *adapter);</div><div class='ctx'> </div><div class='del'>-u32 nx_fw_cmd_set_mtu(struct netxen_adapter *adapter, u32 mtu);</div><div class='add'>+int nx_fw_cmd_set_mtu(struct netxen_adapter *adapter, int mtu);</div><div class='ctx'> int netxen_nic_change_mtu(struct net_device *netdev, int new_mtu);</div><div class='ctx'> </div><div class='ctx'> int netxen_nic_set_mac(struct net_device *netdev, void *p);</div><div class='hunk'>@@ -1502,7 +1534,9 @@ static const struct netxen_brdinfo netxen_boards[] = {</div><div class='ctx'> 	{NETXEN_BRDTYPE_P3_10G_SFP_PLUS, 2, "Dual XGb SFP+ LP"},</div><div class='ctx'> 	{NETXEN_BRDTYPE_P3_10000_BASE_T, 1, "XGB 10G BaseT LP"},</div><div class='ctx'> 	{NETXEN_BRDTYPE_P3_XG_LOM,  2, "Dual XGb LOM"},</div><div class='del'>-	{NETXEN_BRDTYPE_P3_4_GB_MM, 4, "Quad GB - March Madness"},</div><div class='add'>+	{NETXEN_BRDTYPE_P3_4_GB_MM, 4, "NX3031 Gigabit Ethernet"},</div><div class='add'>+	{NETXEN_BRDTYPE_P3_10G_SFP_CT, 2, "NX3031 10 Gigabit Ethernet"},</div><div class='add'>+	{NETXEN_BRDTYPE_P3_10G_SFP_QT, 2, "Quanta Dual XGb SFP+"},</div><div class='ctx'> 	{NETXEN_BRDTYPE_P3_10G_CX4, 2, "Reference Dual CX4 Option"},</div><div class='ctx'> 	{NETXEN_BRDTYPE_P3_10G_XFP, 1, "Reference Single XFP Option"}</div><div class='ctx'> };</div><div class='hunk'>@@ -1580,7 +1614,8 @@ dma_watchdog_wakeup(struct netxen_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> int netxen_is_flash_supported(struct netxen_adapter *adapter);</div><div class='del'>-int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 mac[]);</div><div class='add'>+int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 *mac);</div><div class='add'>+int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, __le64 *mac);</div><div class='ctx'> extern void netxen_change_ringparam(struct netxen_adapter *adapter);</div><div class='ctx'> extern int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr,</div><div class='ctx'> 				int *valp);</div><div class='head'>diff --git a/drivers/net/netxen/netxen_nic_ctx.c b/drivers/net/netxen/netxen_nic_ctx.c<br/>index 64babc59e699..64b51643c626 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_ctx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/netxen/netxen_nic_ctx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_ctx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_ctx.c</a></div><div class='hunk'>@@ -145,8 +145,8 @@ netxen_issue_cmd(struct netxen_adapter *adapter,</div><div class='ctx'> 	return rcode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32</div><div class='del'>-nx_fw_cmd_set_mtu(struct netxen_adapter *adapter, u32 mtu)</div><div class='add'>+int</div><div class='add'>+nx_fw_cmd_set_mtu(struct netxen_adapter *adapter, int mtu)</div><div class='ctx'> {</div><div class='ctx'> 	u32 rcode = NX_RCODE_SUCCESS;</div><div class='ctx'> 	struct netxen_recv_context *recv_ctx = &amp;adapter-&gt;recv_ctx[0];</div><div class='hunk'>@@ -160,7 +160,10 @@ nx_fw_cmd_set_mtu(struct netxen_adapter *adapter, u32 mtu)</div><div class='ctx'> 				0,</div><div class='ctx'> 				NX_CDRP_CMD_SET_MTU);</div><div class='ctx'> </div><div class='del'>-	return rcode;</div><div class='add'>+	if (rcode != NX_RCODE_SUCCESS)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='head'>diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c<br/>index 48ee06b6f4e9..b974ca0fc530 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_ethtool.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/netxen/netxen_nic_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_ethtool.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_ethtool.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "netxen_nic.h"</div><div class='ctx'> #include "netxen_nic_hw.h"</div><div class='hunk'>@@ -140,18 +139,33 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 		if (netif_running(dev)) {</div><div class='ctx'> 			ecmd-&gt;speed = adapter-&gt;link_speed;</div><div class='ctx'> 			ecmd-&gt;duplex = adapter-&gt;link_duplex;</div><div class='del'>-		} else</div><div class='del'>-			return -EIO;	/* link absent */</div><div class='add'>+			ecmd-&gt;autoneg = adapter-&gt;link_autoneg;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 	} else if (adapter-&gt;ahw.board_type == NETXEN_NIC_XGBE) {</div><div class='del'>-		ecmd-&gt;supported = (SUPPORTED_TP |</div><div class='del'>-				   SUPPORTED_1000baseT_Full |</div><div class='del'>-				   SUPPORTED_10000baseT_Full);</div><div class='del'>-		ecmd-&gt;advertising = (ADVERTISED_TP |</div><div class='del'>-				     ADVERTISED_1000baseT_Full |</div><div class='del'>-				     ADVERTISED_10000baseT_Full);</div><div class='add'>+		u32 val;</div><div class='add'>+</div><div class='add'>+		adapter-&gt;hw_read_wx(adapter, NETXEN_PORT_MODE_ADDR, &amp;val, 4);</div><div class='add'>+		if (val == NETXEN_PORT_MODE_802_3_AP) {</div><div class='add'>+			ecmd-&gt;supported = SUPPORTED_1000baseT_Full;</div><div class='add'>+			ecmd-&gt;advertising = ADVERTISED_1000baseT_Full;</div><div class='add'>+		} else {</div><div class='add'>+			ecmd-&gt;supported = SUPPORTED_10000baseT_Full;</div><div class='add'>+			ecmd-&gt;advertising = ADVERTISED_10000baseT_Full;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		ecmd-&gt;port = PORT_TP;</div><div class='ctx'> </div><div class='del'>-		ecmd-&gt;speed = SPEED_10000;</div><div class='add'>+		if (NX_IS_REVISION_P3(adapter-&gt;ahw.revision_id)) {</div><div class='add'>+			u16 pcifn = adapter-&gt;ahw.pci_func;</div><div class='add'>+</div><div class='add'>+			adapter-&gt;hw_read_wx(adapter,</div><div class='add'>+				P3_LINK_SPEED_REG(pcifn), &amp;val, 4);</div><div class='add'>+			ecmd-&gt;speed = P3_LINK_SPEED_MHZ *</div><div class='add'>+					P3_LINK_SPEED_VAL(pcifn, val);</div><div class='add'>+		} else</div><div class='add'>+			ecmd-&gt;speed = SPEED_10000;</div><div class='add'>+</div><div class='ctx'> 		ecmd-&gt;duplex = DUPLEX_FULL;</div><div class='ctx'> 		ecmd-&gt;autoneg = AUTONEG_DISABLE;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -192,6 +206,8 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NETXEN_BRDTYPE_P2_SB31_10G:</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_10G_SFP_PLUS:</div><div class='add'>+	case NETXEN_BRDTYPE_P3_10G_SFP_CT:</div><div class='add'>+	case NETXEN_BRDTYPE_P3_10G_SFP_QT:</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_10G_XFP:</div><div class='ctx'> 		ecmd-&gt;supported |= SUPPORTED_FIBRE;</div><div class='ctx'> 		ecmd-&gt;advertising |= ADVERTISED_FIBRE;</div><div class='head'>diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h<br/>index 3ce13e451aac..e80f9e3e5973 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_hdr.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/netxen/netxen_nic_hdr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_hdr.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_hdr.h</a></div><div class='hunk'>@@ -32,8 +32,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -724,6 +722,13 @@ enum {</div><div class='ctx'> #define XG_LINK_STATE_P3(pcifn,val) \</div><div class='ctx'> 	(((val) &gt;&gt; ((pcifn) * 4)) &amp; XG_LINK_STATE_P3_MASK)</div><div class='ctx'> </div><div class='add'>+#define P3_LINK_SPEED_MHZ	100</div><div class='add'>+#define P3_LINK_SPEED_MASK	0xff</div><div class='add'>+#define P3_LINK_SPEED_REG(pcifn)	\</div><div class='add'>+	(CRB_PF_LINK_SPEED_1 + (((pcifn) / 4) * 4))</div><div class='add'>+#define P3_LINK_SPEED_VAL(pcifn, reg)	\</div><div class='add'>+	(((reg) &gt;&gt; (8 * ((pcifn) &amp; 0x3))) &amp; P3_LINK_SPEED_MASK)</div><div class='add'>+</div><div class='ctx'> #define NETXEN_CAM_RAM_BASE	(NETXEN_CRB_CAM + 0x02000)</div><div class='ctx'> #define NETXEN_CAM_RAM(reg)	(NETXEN_CAM_RAM_BASE + (reg))</div><div class='ctx'> #define NETXEN_FW_VERSION_MAJOR (NETXEN_CAM_RAM(0x150))</div><div class='hunk'>@@ -836,9 +841,11 @@ enum {</div><div class='ctx'> </div><div class='ctx'> #define PCIE_SETUP_FUNCTION	(0x12040)</div><div class='ctx'> #define PCIE_SETUP_FUNCTION2	(0x12048)</div><div class='add'>+#define PCIE_MISCCFG_RC         (0x1206c)</div><div class='ctx'> #define PCIE_TGT_SPLIT_CHICKEN	(0x12080)</div><div class='ctx'> #define PCIE_CHICKEN3		(0x120c8)</div><div class='ctx'> </div><div class='add'>+#define ISR_INT_STATE_REG       (NETXEN_PCIX_PS_REG(PCIE_MISCCFG_RC))</div><div class='ctx'> #define PCIE_MAX_MASTER_SPLIT	(0x14048)</div><div class='ctx'> </div><div class='ctx'> #define NETXEN_PORT_MODE_NONE		0</div><div class='hunk'>@@ -854,6 +861,7 @@ enum {</div><div class='ctx'> #define NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL		(0x14)</div><div class='ctx'> </div><div class='ctx'> #define	ISR_MSI_INT_TRIGGER(FUNC) (NETXEN_PCIX_PS_REG(PCIX_MSI_F(FUNC)))</div><div class='add'>+#define ISR_LEGACY_INT_TRIGGERED(VAL)	(((VAL) &amp; 0x300) == 0x200)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PCI Interrupt Vector Values.</div><div class='head'>diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c<br/>index 96a3bc6426e2..84978f80f396 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_hw.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/netxen/netxen_nic_hw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_hw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_hw.c</a></div><div class='hunk'>@@ -285,14 +285,7 @@ static unsigned crb_hub_agt[64] =</div><div class='ctx'> #define ADDR_IN_RANGE(addr, low, high)	\</div><div class='ctx'> 	(((addr) &lt;= (high)) &amp;&amp; ((addr) &gt;= (low)))</div><div class='ctx'> </div><div class='del'>-#define NETXEN_MAX_MTU		8000 + NETXEN_ENET_HEADER_SIZE + NETXEN_ETH_FCS_SIZE</div><div class='del'>-#define NETXEN_MIN_MTU		64</div><div class='del'>-#define NETXEN_ETH_FCS_SIZE     4</div><div class='del'>-#define NETXEN_ENET_HEADER_SIZE 14</div><div class='ctx'> #define NETXEN_WINDOW_ONE 	0x2000000 /*CRB Window: bit 25 of CRB address */</div><div class='del'>-#define NETXEN_FIRMWARE_LEN 	((16 * 1024) / 4)</div><div class='del'>-#define NETXEN_NIU_HDRSIZE	(0x1 &lt;&lt; 6)</div><div class='del'>-#define NETXEN_NIU_TLRSIZE	(0x1 &lt;&lt; 5)</div><div class='ctx'> </div><div class='ctx'> #define NETXEN_NIC_ZERO_PAUSE_ADDR     0ULL</div><div class='ctx'> #define NETXEN_NIC_UNIT_PAUSE_ADDR     0x200ULL</div><div class='hunk'>@@ -541,9 +534,6 @@ netxen_send_cmd_descs(struct netxen_adapter *adapter,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define NIC_REQUEST		0x14</div><div class='del'>-#define NETXEN_MAC_EVENT	0x1</div><div class='del'>-</div><div class='ctx'> static int nx_p3_sre_macaddr_change(struct net_device *dev,</div><div class='ctx'> 		u8 *addr, unsigned op)</div><div class='ctx'> {</div><div class='hunk'>@@ -553,8 +543,8 @@ static int nx_p3_sre_macaddr_change(struct net_device *dev,</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;req, 0, sizeof(nx_nic_req_t));</div><div class='del'>-	req.qhdr |= (NIC_REQUEST &lt;&lt; 23);</div><div class='del'>-	req.req_hdr |= NETXEN_MAC_EVENT;</div><div class='add'>+	req.qhdr |= (NX_NIC_REQUEST &lt;&lt; 23);</div><div class='add'>+	req.req_hdr |= NX_MAC_EVENT;</div><div class='ctx'> 	req.req_hdr |= ((u64)adapter-&gt;portnum &lt;&lt; 16);</div><div class='ctx'> 	mac_req.op = op;</div><div class='ctx'> 	memcpy(&amp;mac_req.mac_addr, addr, 6);</div><div class='hunk'>@@ -575,31 +565,35 @@ void netxen_p3_nic_set_multi(struct net_device *netdev)</div><div class='ctx'> 	nx_mac_list_t *cur, *next, *del_list, *add_list = NULL;</div><div class='ctx'> 	struct dev_mc_list *mc_ptr;</div><div class='ctx'> 	u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };</div><div class='del'>-</div><div class='del'>-	adapter-&gt;set_promisc(adapter, NETXEN_NIU_PROMISC_MODE);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Programming mac addresses will automaticly enabling L2 filtering.</div><div class='del'>-	 * HW will replace timestamp with L2 conid when L2 filtering is</div><div class='del'>-	 * enabled. This causes problem for LSA. Do not enabling L2 filtering</div><div class='del'>-	 * until that problem is fixed.</div><div class='del'>-	 */</div><div class='del'>-	if ((netdev-&gt;flags &amp; IFF_PROMISC) ||</div><div class='del'>-			(netdev-&gt;mc_count &gt; adapter-&gt;max_mc_count))</div><div class='del'>-		return;</div><div class='add'>+	u32 mode = VPORT_MISS_MODE_DROP;</div><div class='ctx'> </div><div class='ctx'> 	del_list = adapter-&gt;mac_list;</div><div class='ctx'> 	adapter-&gt;mac_list = NULL;</div><div class='ctx'> </div><div class='ctx'> 	nx_p3_nic_add_mac(adapter, netdev-&gt;dev_addr, &amp;add_list, &amp;del_list);</div><div class='add'>+	nx_p3_nic_add_mac(adapter, bcast_addr, &amp;add_list, &amp;del_list);</div><div class='add'>+</div><div class='add'>+	if (netdev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+		mode = VPORT_MISS_MODE_ACCEPT_ALL;</div><div class='add'>+		goto send_fw_cmd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((netdev-&gt;flags &amp; IFF_ALLMULTI) ||</div><div class='add'>+			(netdev-&gt;mc_count &gt; adapter-&gt;max_mc_count)) {</div><div class='add'>+		mode = VPORT_MISS_MODE_ACCEPT_MULTI;</div><div class='add'>+		goto send_fw_cmd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (netdev-&gt;mc_count &gt; 0) {</div><div class='del'>-		nx_p3_nic_add_mac(adapter, bcast_addr, &amp;add_list, &amp;del_list);</div><div class='ctx'> 		for (mc_ptr = netdev-&gt;mc_list; mc_ptr;</div><div class='ctx'> 		     mc_ptr = mc_ptr-&gt;next) {</div><div class='ctx'> 			nx_p3_nic_add_mac(adapter, mc_ptr-&gt;dmi_addr,</div><div class='ctx'> 					  &amp;add_list, &amp;del_list);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+send_fw_cmd:</div><div class='add'>+	adapter-&gt;set_promisc(adapter, mode);</div><div class='ctx'> 	for (cur = del_list; cur;) {</div><div class='ctx'> 		nx_p3_sre_macaddr_change(netdev, cur-&gt;mac_addr, NETXEN_MAC_DEL);</div><div class='ctx'> 		next = cur-&gt;next;</div><div class='hunk'>@@ -615,6 +609,21 @@ void netxen_p3_nic_set_multi(struct net_device *netdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int netxen_p3_nic_set_promisc(struct netxen_adapter *adapter, u32 mode)</div><div class='add'>+{</div><div class='add'>+	nx_nic_req_t req;</div><div class='add'>+</div><div class='add'>+	memset(&amp;req, 0, sizeof(nx_nic_req_t));</div><div class='add'>+</div><div class='add'>+	req.qhdr |= (NX_HOST_REQUEST &lt;&lt; 23);</div><div class='add'>+	req.req_hdr |= NX_NIC_H2C_OPCODE_PROXY_SET_VPORT_MISS_MODE;</div><div class='add'>+	req.req_hdr |= ((u64)adapter-&gt;portnum &lt;&lt; 16);</div><div class='add'>+	req.words[0] = cpu_to_le64(mode);</div><div class='add'>+</div><div class='add'>+	return netxen_send_cmd_descs(adapter,</div><div class='add'>+				(struct cmd_desc_type0 *)&amp;req, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define	NETXEN_CONFIG_INTR_COALESCE	3</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -627,7 +636,7 @@ int netxen_config_intr_coalesce(struct netxen_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;req, 0, sizeof(nx_nic_req_t));</div><div class='ctx'> </div><div class='del'>-	req.qhdr |= (NIC_REQUEST &lt;&lt; 23);</div><div class='add'>+	req.qhdr |= (NX_NIC_REQUEST &lt;&lt; 23);</div><div class='ctx'> 	req.req_hdr |= NETXEN_CONFIG_INTR_COALESCE;</div><div class='ctx'> 	req.req_hdr |= ((u64)adapter-&gt;portnum &lt;&lt; 16);</div><div class='ctx'> </div><div class='hunk'>@@ -653,6 +662,7 @@ int netxen_nic_change_mtu(struct net_device *netdev, int mtu)</div><div class='ctx'> {</div><div class='ctx'> 	struct netxen_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	int max_mtu;</div><div class='add'>+	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (NX_IS_REVISION_P3(adapter-&gt;ahw.revision_id))</div><div class='ctx'> 		max_mtu = P3_MAX_MTU;</div><div class='hunk'>@@ -666,16 +676,12 @@ int netxen_nic_change_mtu(struct net_device *netdev, int mtu)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;set_mtu)</div><div class='del'>-		adapter-&gt;set_mtu(adapter, mtu);</div><div class='del'>-	netdev-&gt;mtu = mtu;</div><div class='add'>+		rc = adapter-&gt;set_mtu(adapter, mtu);</div><div class='ctx'> </div><div class='del'>-	mtu += MTU_FUDGE_FACTOR;</div><div class='del'>-	if (NX_IS_REVISION_P3(adapter-&gt;ahw.revision_id))</div><div class='del'>-		nx_fw_cmd_set_mtu(adapter, mtu);</div><div class='del'>-	else if (adapter-&gt;set_mtu)</div><div class='del'>-		adapter-&gt;set_mtu(adapter, mtu);</div><div class='add'>+	if (!rc)</div><div class='add'>+		netdev-&gt;mtu = mtu;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int netxen_is_flash_supported(struct netxen_adapter *adapter)</div><div class='hunk'>@@ -727,31 +733,56 @@ static int netxen_get_flash_block(struct netxen_adapter *adapter, int base,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 mac[])</div><div class='add'>+int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 *mac)</div><div class='ctx'> {</div><div class='del'>-	__le32 *pmac = (__le32 *) &amp; mac[0];</div><div class='add'>+	__le32 *pmac = (__le32 *) mac;</div><div class='add'>+	u32 offset;</div><div class='add'>+</div><div class='add'>+	offset = NETXEN_USER_START +</div><div class='add'>+		offsetof(struct netxen_new_user_info, mac_addr) +</div><div class='add'>+		adapter-&gt;portnum * sizeof(u64);</div><div class='ctx'> </div><div class='del'>-	if (netxen_get_flash_block(adapter,</div><div class='del'>-				   NETXEN_USER_START +</div><div class='del'>-				   offsetof(struct netxen_new_user_info,</div><div class='del'>-					    mac_addr),</div><div class='del'>-				   FLASH_NUM_PORTS * sizeof(u64), pmac) == -1) {</div><div class='add'>+	if (netxen_get_flash_block(adapter, offset, sizeof(u64), pmac) == -1)</div><div class='ctx'> 		return -1;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	if (*mac == cpu_to_le64(~0ULL)) {</div><div class='add'>+</div><div class='add'>+		offset = NETXEN_USER_START_OLD +</div><div class='add'>+			offsetof(struct netxen_user_old_info, mac_addr) +</div><div class='add'>+			adapter-&gt;portnum * sizeof(u64);</div><div class='add'>+</div><div class='ctx'> 		if (netxen_get_flash_block(adapter,</div><div class='del'>-					   NETXEN_USER_START_OLD +</div><div class='del'>-					   offsetof(struct netxen_user_old_info,</div><div class='del'>-						    mac_addr),</div><div class='del'>-					   FLASH_NUM_PORTS * sizeof(u64),</div><div class='del'>-					   pmac) == -1)</div><div class='add'>+					offset, sizeof(u64), pmac) == -1)</div><div class='ctx'> 			return -1;</div><div class='add'>+</div><div class='ctx'> 		if (*mac == cpu_to_le64(~0ULL))</div><div class='ctx'> 			return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, __le64 *mac)</div><div class='add'>+{</div><div class='add'>+	uint32_t crbaddr, mac_hi, mac_lo;</div><div class='add'>+	int pci_func = adapter-&gt;ahw.pci_func;</div><div class='add'>+</div><div class='add'>+	crbaddr = CRB_MAC_BLOCK_START +</div><div class='add'>+		(4 * ((pci_func/2) * 3)) + (4 * (pci_func &amp; 1));</div><div class='add'>+</div><div class='add'>+	adapter-&gt;hw_read_wx(adapter, crbaddr, &amp;mac_lo, 4);</div><div class='add'>+	adapter-&gt;hw_read_wx(adapter, crbaddr+4, &amp;mac_hi, 4);</div><div class='add'>+</div><div class='add'>+	mac_hi = cpu_to_le32(mac_hi);</div><div class='add'>+	mac_lo = cpu_to_le32(mac_lo);</div><div class='add'>+</div><div class='add'>+	if (pci_func &amp; 1)</div><div class='add'>+		*mac = ((mac_lo &gt;&gt; 16) | ((u64)mac_hi &lt;&lt; 16));</div><div class='add'>+	else</div><div class='add'>+		*mac = ((mac_lo) | ((u64)mac_hi &lt;&lt; 32));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define CRB_WIN_LOCK_TIMEOUT 100000000</div><div class='ctx'> </div><div class='ctx'> static int crb_win_lock(struct netxen_adapter *adapter)</div><div class='hunk'>@@ -1411,7 +1442,8 @@ static int netxen_nic_pci_mem_read_direct(struct netxen_adapter *adapter,</div><div class='ctx'> 		(netxen_nic_pci_is_same_window(adapter, off+size-1) == 0)) {</div><div class='ctx'> 		write_unlock_irqrestore(&amp;adapter-&gt;adapter_lock, flags);</div><div class='ctx'> 		printk(KERN_ERR "%s out of bound pci memory access. "</div><div class='del'>-			"offset is 0x%llx\n", netxen_nic_driver_name, off);</div><div class='add'>+			"offset is 0x%llx\n", netxen_nic_driver_name,</div><div class='add'>+			(unsigned long long)off);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1484,7 +1516,8 @@ netxen_nic_pci_mem_write_direct(struct netxen_adapter *adapter, u64 off,</div><div class='ctx'> 		(netxen_nic_pci_is_same_window(adapter, off+size-1) == 0)) {</div><div class='ctx'> 		write_unlock_irqrestore(&amp;adapter-&gt;adapter_lock, flags);</div><div class='ctx'> 		printk(KERN_ERR "%s out of bound pci memory access. "</div><div class='del'>-			"offset is 0x%llx\n", netxen_nic_driver_name, off);</div><div class='add'>+			"offset is 0x%llx\n", netxen_nic_driver_name,</div><div class='add'>+			(unsigned long long)off);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2016,6 +2049,8 @@ int netxen_nic_get_board_info(struct netxen_adapter *adapter)</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_10G_CX4_LP:</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_IMEZ:</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_10G_SFP_PLUS:</div><div class='add'>+	case NETXEN_BRDTYPE_P3_10G_SFP_CT:</div><div class='add'>+	case NETXEN_BRDTYPE_P3_10G_SFP_QT:</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_10G_XFP:</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_10000_BASE_T:</div><div class='ctx'> </div><div class='hunk'>@@ -2034,6 +2069,7 @@ int netxen_nic_get_board_info(struct netxen_adapter *adapter)</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk("%s: Unknown(%x)\n", netxen_nic_driver_name,</div><div class='ctx'> 		       boardinfo-&gt;board_type);</div><div class='add'>+		rv = -ENODEV;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2044,6 +2080,7 @@ int netxen_nic_get_board_info(struct netxen_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> int netxen_nic_set_mtu_gb(struct netxen_adapter *adapter, int new_mtu)</div><div class='ctx'> {</div><div class='add'>+	new_mtu += MTU_FUDGE_FACTOR;</div><div class='ctx'> 	netxen_nic_write_w0(adapter,</div><div class='ctx'> 		NETXEN_NIU_GB_MAX_FRAME_SIZE(adapter-&gt;physical_port),</div><div class='ctx'> 		new_mtu);</div><div class='hunk'>@@ -2052,7 +2089,7 @@ int netxen_nic_set_mtu_gb(struct netxen_adapter *adapter, int new_mtu)</div><div class='ctx'> </div><div class='ctx'> int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu)</div><div class='ctx'> {</div><div class='del'>-	new_mtu += NETXEN_NIU_HDRSIZE + NETXEN_NIU_TLRSIZE;</div><div class='add'>+	new_mtu += MTU_FUDGE_FACTOR;</div><div class='ctx'> 	if (adapter-&gt;physical_port == 0)</div><div class='ctx'> 		netxen_nic_write_w0(adapter, NETXEN_NIU_XGE_MAX_FRAME_SIZE,</div><div class='ctx'> 				new_mtu);</div><div class='hunk'>@@ -2074,12 +2111,22 @@ void netxen_nic_set_link_parameters(struct netxen_adapter *adapter)</div><div class='ctx'> 	__u32 status;</div><div class='ctx'> 	__u32 autoneg;</div><div class='ctx'> 	__u32 mode;</div><div class='add'>+	__u32 port_mode;</div><div class='ctx'> </div><div class='ctx'> 	netxen_nic_read_w0(adapter, NETXEN_NIU_MODE, &amp;mode);</div><div class='ctx'> 	if (netxen_get_niu_enable_ge(mode)) {	/* Gb 10/100/1000 Mbps mode */</div><div class='add'>+</div><div class='add'>+		adapter-&gt;hw_read_wx(adapter,</div><div class='add'>+				NETXEN_PORT_MODE_ADDR, &amp;port_mode, 4);</div><div class='add'>+		if (port_mode == NETXEN_PORT_MODE_802_3_AP) {</div><div class='add'>+			adapter-&gt;link_speed   = SPEED_1000;</div><div class='add'>+			adapter-&gt;link_duplex  = DUPLEX_FULL;</div><div class='add'>+			adapter-&gt;link_autoneg = AUTONEG_DISABLE;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (adapter-&gt;phy_read</div><div class='del'>-		    &amp;&amp; adapter-&gt;</div><div class='del'>-		    phy_read(adapter,</div><div class='add'>+		    &amp;&amp; adapter-&gt;phy_read(adapter,</div><div class='ctx'> 			     NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,</div><div class='ctx'> 			     &amp;status) == 0) {</div><div class='ctx'> 			if (netxen_get_phy_link(status)) {</div><div class='hunk'>@@ -2109,8 +2156,7 @@ void netxen_nic_set_link_parameters(struct netxen_adapter *adapter)</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 				if (adapter-&gt;phy_read</div><div class='del'>-				    &amp;&amp; adapter-&gt;</div><div class='del'>-				    phy_read(adapter,</div><div class='add'>+				    &amp;&amp; adapter-&gt;phy_read(adapter,</div><div class='ctx'> 					     NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,</div><div class='ctx'> 					     &amp;autoneg) != 0)</div><div class='ctx'> 					adapter-&gt;link_autoneg = autoneg;</div><div class='hunk'>@@ -2162,10 +2208,10 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter)</div><div class='ctx'> 	if (adapter-&gt;portnum == 0) {</div><div class='ctx'> 		get_brd_name_by_type(board_info-&gt;board_type, brd_name);</div><div class='ctx'> </div><div class='del'>-		printk("NetXen %s Board S/N %s  Chip id 0x%x\n",</div><div class='del'>-				brd_name, serial_num, board_info-&gt;chip_id);</div><div class='del'>-		printk("NetXen Firmware version %d.%d.%d\n", fw_major,</div><div class='del'>-				fw_minor, fw_build);</div><div class='add'>+		printk(KERN_INFO "NetXen %s Board S/N %s  Chip rev 0x%x\n",</div><div class='add'>+				brd_name, serial_num, adapter-&gt;ahw.revision_id);</div><div class='add'>+		printk(KERN_INFO "NetXen Firmware version %d.%d.%d\n",</div><div class='add'>+				fw_major, fw_minor, fw_build);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (NETXEN_VERSION_CODE(fw_major, fw_minor, fw_build) &lt;</div><div class='head'>diff --git a/drivers/net/netxen/netxen_nic_hw.h b/drivers/net/netxen/netxen_nic_hw.h<br/>index b8e0030f03d7..aae737dc77a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_hw.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/netxen/netxen_nic_hw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_hw.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_hw.h</a></div><div class='hunk'>@@ -419,12 +419,9 @@ typedef enum {</div><div class='ctx'> #define netxen_get_niu_enable_ge(config_word)	\</div><div class='ctx'> 		_netxen_crb_get_bit(config_word, 1)</div><div class='ctx'> </div><div class='del'>-/* Promiscous mode options (GbE mode only) */</div><div class='del'>-typedef enum {</div><div class='del'>-	NETXEN_NIU_PROMISC_MODE = 0,</div><div class='del'>-	NETXEN_NIU_NON_PROMISC_MODE,</div><div class='del'>-	NETXEN_NIU_ALLMULTI_MODE</div><div class='del'>-} netxen_niu_prom_mode_t;</div><div class='add'>+#define NETXEN_NIU_NON_PROMISC_MODE	0</div><div class='add'>+#define NETXEN_NIU_PROMISC_MODE		1</div><div class='add'>+#define NETXEN_NIU_ALLMULTI_MODE	2</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * NIU GB Drop CRC Register</div><div class='hunk'>@@ -471,9 +468,9 @@ typedef enum {</div><div class='ctx'> </div><div class='ctx'> /* Set promiscuous mode for a GbE interface */</div><div class='ctx'> int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter,</div><div class='del'>-				    netxen_niu_prom_mode_t mode);</div><div class='add'>+				    u32 mode);</div><div class='ctx'> int netxen_niu_xg_set_promiscuous_mode(struct netxen_adapter *adapter,</div><div class='del'>-				       netxen_niu_prom_mode_t mode);</div><div class='add'>+				       u32 mode);</div><div class='ctx'> </div><div class='ctx'> /* set the MAC address for a given MAC */</div><div class='ctx'> int netxen_niu_macaddr_set(struct netxen_adapter *adapter,</div><div class='head'>diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c<br/>index 01ab31b34a85..5bba675d0504 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_init.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/netxen/netxen_nic_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_init.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_init.c</a></div><div class='hunk'>@@ -364,6 +364,11 @@ void netxen_initialize_adapter_ops(struct netxen_adapter *adapter)</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (NX_IS_REVISION_P3(adapter-&gt;ahw.revision_id)) {</div><div class='add'>+		adapter-&gt;set_mtu = nx_fw_cmd_set_mtu;</div><div class='add'>+		adapter-&gt;set_promisc = netxen_p3_nic_set_promisc;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1074,10 +1079,12 @@ int netxen_initialize_adapter_offload(struct netxen_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> void netxen_free_adapter_offload(struct netxen_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	int i = 100;</div><div class='add'>+</div><div class='add'>+	if (!adapter-&gt;dummy_dma.addr)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;dummy_dma.addr) {</div><div class='del'>-		i = 100;</div><div class='add'>+	if (NX_IS_REVISION_P2(adapter-&gt;ahw.revision_id)) {</div><div class='ctx'> 		do {</div><div class='ctx'> 			if (dma_watchdog_shutdown_request(adapter) == 1)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1085,17 +1092,17 @@ void netxen_free_adapter_offload(struct netxen_adapter *adapter)</div><div class='ctx'> 			if (dma_watchdog_shutdown_poll_result(adapter) == 1)</div><div class='ctx'> 				break;</div><div class='ctx'> 		} while (--i);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (i) {</div><div class='del'>-			pci_free_consistent(adapter-&gt;pdev,</div><div class='del'>-				    NETXEN_HOST_DUMMY_DMA_SIZE,</div><div class='del'>-				    adapter-&gt;dummy_dma.addr,</div><div class='del'>-				    adapter-&gt;dummy_dma.phys_addr);</div><div class='del'>-			adapter-&gt;dummy_dma.addr = NULL;</div><div class='del'>-		} else {</div><div class='del'>-			printk(KERN_ERR "%s: dma_watchdog_shutdown failed\n",</div><div class='del'>-					adapter-&gt;netdev-&gt;name);</div><div class='del'>-		}</div><div class='add'>+	if (i) {</div><div class='add'>+		pci_free_consistent(adapter-&gt;pdev,</div><div class='add'>+			    NETXEN_HOST_DUMMY_DMA_SIZE,</div><div class='add'>+			    adapter-&gt;dummy_dma.addr,</div><div class='add'>+			    adapter-&gt;dummy_dma.phys_addr);</div><div class='add'>+		adapter-&gt;dummy_dma.addr = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR "%s: dma_watchdog_shutdown failed\n",</div><div class='add'>+				adapter-&gt;netdev-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c<br/>index 91d209a8f6cb..008fd6618a5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_main.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/netxen/netxen_nic_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_main.c</a></div><div class='hunk'>@@ -149,80 +149,18 @@ static uint32_t msi_tgt_status[8] = {</div><div class='ctx'> </div><div class='ctx'> static struct netxen_legacy_intr_set legacy_intr[] = NX_LEGACY_INTR_CONFIG;</div><div class='ctx'> </div><div class='del'>-static void netxen_nic_disable_int(struct netxen_adapter *adapter)</div><div class='add'>+static inline void netxen_nic_disable_int(struct netxen_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	u32 mask = 0x7ff;</div><div class='del'>-	int retries = 32;</div><div class='del'>-	int pci_fn = adapter-&gt;ahw.pci_func;</div><div class='del'>-</div><div class='del'>-	if (adapter-&gt;msi_mode != MSI_MODE_MULTIFUNC)</div><div class='del'>-		adapter-&gt;pci_write_normalize(adapter,</div><div class='del'>-				adapter-&gt;crb_intr_mask, 0);</div><div class='del'>-</div><div class='del'>-	if (adapter-&gt;intr_scheme != -1 &amp;&amp;</div><div class='del'>-	    adapter-&gt;intr_scheme != INTR_SCHEME_PERPORT)</div><div class='del'>-		adapter-&gt;pci_write_immediate(adapter, ISR_INT_MASK, mask);</div><div class='del'>-</div><div class='del'>-	if (!NETXEN_IS_MSI_FAMILY(adapter)) {</div><div class='del'>-		do {</div><div class='del'>-			adapter-&gt;pci_write_immediate(adapter,</div><div class='del'>-					ISR_INT_TARGET_STATUS, 0xffffffff);</div><div class='del'>-			mask = adapter-&gt;pci_read_immediate(adapter,</div><div class='del'>-					ISR_INT_VECTOR);</div><div class='del'>-			if (!(mask &amp; 0x80))</div><div class='del'>-				break;</div><div class='del'>-			udelay(10);</div><div class='del'>-		} while (--retries);</div><div class='del'>-</div><div class='del'>-		if (!retries) {</div><div class='del'>-			printk(KERN_NOTICE "%s: Failed to disable interrupt completely\n",</div><div class='del'>-					netxen_nic_driver_name);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (adapter-&gt;msi_mode == MSI_MODE_MULTIFUNC) {</div><div class='del'>-			adapter-&gt;pci_write_immediate(adapter,</div><div class='del'>-					msi_tgt_status[pci_fn], 0xffffffff);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	adapter-&gt;pci_write_normalize(adapter, adapter-&gt;crb_intr_mask, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void netxen_nic_enable_int(struct netxen_adapter *adapter)</div><div class='add'>+static inline void netxen_nic_enable_int(struct netxen_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	u32 mask;</div><div class='del'>-</div><div class='del'>-	DPRINTK(1, INFO, "Entered ISR Enable \n");</div><div class='del'>-</div><div class='del'>-	if (adapter-&gt;intr_scheme != -1 &amp;&amp;</div><div class='del'>-		adapter-&gt;intr_scheme != INTR_SCHEME_PERPORT) {</div><div class='del'>-		switch (adapter-&gt;ahw.board_type) {</div><div class='del'>-		case NETXEN_NIC_GBE:</div><div class='del'>-			mask  =  0x77b;</div><div class='del'>-			break;</div><div class='del'>-		case NETXEN_NIC_XGBE:</div><div class='del'>-			mask  =  0x77f;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			mask  =  0x7ff;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		adapter-&gt;pci_write_immediate(adapter, ISR_INT_MASK, mask);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	adapter-&gt;pci_write_normalize(adapter, adapter-&gt;crb_intr_mask, 0x1);</div><div class='ctx'> </div><div class='del'>-	if (!NETXEN_IS_MSI_FAMILY(adapter)) {</div><div class='del'>-		mask = 0xbff;</div><div class='del'>-		if (adapter-&gt;intr_scheme != -1 &amp;&amp;</div><div class='del'>-			adapter-&gt;intr_scheme != INTR_SCHEME_PERPORT) {</div><div class='del'>-			adapter-&gt;pci_write_normalize(adapter,</div><div class='del'>-					CRB_INT_VECTOR, 0);</div><div class='del'>-		}</div><div class='add'>+	if (!NETXEN_IS_MSI_FAMILY(adapter))</div><div class='ctx'> 		adapter-&gt;pci_write_immediate(adapter,</div><div class='del'>-				ISR_INT_TARGET_MASK, mask);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DPRINTK(1, INFO, "Done with enable Int\n");</div><div class='add'>+				adapter-&gt;legacy_intr.tgt_mask_reg, 0xfbff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nx_set_dma_mask(struct netxen_adapter *adapter, uint8_t revision_id)</div><div class='hunk'>@@ -284,6 +222,8 @@ static void netxen_check_options(struct netxen_adapter *adapter)</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_10G_CX4_LP:</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_IMEZ:</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_10G_SFP_PLUS:</div><div class='add'>+	case NETXEN_BRDTYPE_P3_10G_SFP_QT:</div><div class='add'>+	case NETXEN_BRDTYPE_P3_10G_SFP_CT:</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_10G_XFP:</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_10000_BASE_T:</div><div class='ctx'> 		adapter-&gt;msix_supported = !!use_msi_x;</div><div class='hunk'>@@ -301,6 +241,10 @@ static void netxen_check_options(struct netxen_adapter *adapter)</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_REF_QG:</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_4_GB:</div><div class='ctx'> 	case NETXEN_BRDTYPE_P3_4_GB_MM:</div><div class='add'>+		adapter-&gt;msix_supported = 0;</div><div class='add'>+		adapter-&gt;max_rx_desc_count = MAX_RCV_DESCRIPTORS_10G;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case NETXEN_BRDTYPE_P2_SB35_4G:</div><div class='ctx'> 	case NETXEN_BRDTYPE_P2_SB31_2G:</div><div class='ctx'> 		adapter-&gt;msix_supported = 0;</div><div class='hunk'>@@ -415,16 +359,6 @@ static void netxen_pcie_strap_init(struct netxen_adapter *adapter)</div><div class='ctx'> 	int i, pos;</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='ctx'> </div><div class='del'>-	pdev = pci_get_device(0x1166, 0x0140, NULL);</div><div class='del'>-	if (pdev) {</div><div class='del'>-		pci_dev_put(pdev);</div><div class='del'>-		adapter-&gt;hw_read_wx(adapter,</div><div class='del'>-			NETXEN_PCIE_REG(PCIE_TGT_SPLIT_CHICKEN), &amp;chicken, 4);</div><div class='del'>-		chicken |= 0x4000;</div><div class='del'>-		adapter-&gt;hw_write_wx(adapter,</div><div class='del'>-			NETXEN_PCIE_REG(PCIE_TGT_SPLIT_CHICKEN), &amp;chicken, 4);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	pdev = adapter-&gt;pdev;</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;hw_read_wx(adapter,</div><div class='hunk'>@@ -499,6 +433,44 @@ static void netxen_init_msix_entries(struct netxen_adapter *adapter)</div><div class='ctx'> 		adapter-&gt;msix_entries[i].entry = i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+netxen_read_mac_addr(struct netxen_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned char *p;</div><div class='add'>+	__le64 mac_addr;</div><div class='add'>+	DECLARE_MAC_BUF(mac);</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	if (netxen_is_flash_supported(adapter) != 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (NX_IS_REVISION_P3(adapter-&gt;ahw.revision_id)) {</div><div class='add'>+		if (netxen_p3_get_mac_addr(adapter, &amp;mac_addr) != 0)</div><div class='add'>+			return -EIO;</div><div class='add'>+	} else {</div><div class='add'>+		if (netxen_get_flash_mac_addr(adapter, &amp;mac_addr) != 0)</div><div class='add'>+			return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p = (unsigned char *)&amp;mac_addr;</div><div class='add'>+	for (i = 0; i &lt; 6; i++)</div><div class='add'>+		netdev-&gt;dev_addr[i] = *(p + 5 - i);</div><div class='add'>+</div><div class='add'>+	memcpy(netdev-&gt;perm_addr, netdev-&gt;dev_addr, netdev-&gt;addr_len);</div><div class='add'>+</div><div class='add'>+	/* set station address */</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(netdev-&gt;perm_addr)) {</div><div class='add'>+		dev_warn(&amp;pdev-&gt;dev, "Bad MAC address %s.\n",</div><div class='add'>+				print_mac(mac, netdev-&gt;dev_addr));</div><div class='add'>+	} else</div><div class='add'>+		adapter-&gt;macaddr_set(adapter, netdev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * netxen_nic_probe()</div><div class='ctx'>  *</div><div class='hunk'>@@ -527,10 +499,8 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	unsigned long mem_base, mem_len, db_base, db_len, pci_len0 = 0;</div><div class='ctx'> 	int i = 0, err;</div><div class='ctx'> 	int first_driver, first_boot;</div><div class='del'>-	__le64 mac_addr[FLASH_NUM_PORTS + 1];</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	int pci_func_id = PCI_FUNC(pdev-&gt;devfn);</div><div class='del'>-	DECLARE_MAC_BUF(mac);</div><div class='ctx'> 	struct netxen_legacy_intr_set *legacy_intrp;</div><div class='ctx'> 	uint8_t revision_id;</div><div class='ctx'> </div><div class='hunk'>@@ -543,6 +513,13 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (pdev-&gt;revision &gt;= NX_P3_A0 &amp;&amp; pdev-&gt;revision &lt; NX_P3_B1) {</div><div class='add'>+		printk(KERN_WARNING "NetXen chip revisions between 0x%x-0x%x"</div><div class='add'>+				"will not be enabled.\n",</div><div class='add'>+				NX_P3_A0, NX_P3_B1);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if ((err = pci_enable_device(pdev)))</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -700,13 +677,10 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	adapter-&gt;status   &amp;= ~NETXEN_NETDEV_STATUS;</div><div class='ctx'> 	adapter-&gt;rx_csum = 1;</div><div class='ctx'> 	adapter-&gt;mc_enabled = 0;</div><div class='del'>-	if (NX_IS_REVISION_P3(revision_id)) {</div><div class='add'>+	if (NX_IS_REVISION_P3(revision_id))</div><div class='ctx'> 		adapter-&gt;max_mc_count = 38;</div><div class='del'>-		adapter-&gt;max_rds_rings = 2;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		adapter-&gt;max_mc_count = 16;</div><div class='del'>-		adapter-&gt;max_rds_rings = 3;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;open		   = netxen_nic_open;</div><div class='ctx'> 	netdev-&gt;stop		   = netxen_nic_close;</div><div class='hunk'>@@ -779,10 +753,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		if (adapter-&gt;portnum == 0)</div><div class='ctx'> 			first_driver = 1;</div><div class='ctx'> 	}</div><div class='del'>-	adapter-&gt;crb_addr_cmd_producer = crb_cmd_producer[adapter-&gt;portnum];</div><div class='del'>-	adapter-&gt;crb_addr_cmd_consumer = crb_cmd_consumer[adapter-&gt;portnum];</div><div class='del'>-	netxen_nic_update_cmd_producer(adapter, 0);</div><div class='del'>-	netxen_nic_update_cmd_consumer(adapter, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (first_driver) {</div><div class='ctx'> 		first_boot = adapter-&gt;pci_read_normalize(adapter,</div><div class='hunk'>@@ -903,34 +873,14 @@ request_msi:</div><div class='ctx'> 		goto err_out_disable_msi;</div><div class='ctx'> </div><div class='ctx'> 	init_timer(&amp;adapter-&gt;watchdog_timer);</div><div class='del'>-	adapter-&gt;ahw.linkup = 0;</div><div class='ctx'> 	adapter-&gt;watchdog_timer.function = &amp;netxen_watchdog;</div><div class='ctx'> 	adapter-&gt;watchdog_timer.data = (unsigned long)adapter;</div><div class='ctx'> 	INIT_WORK(&amp;adapter-&gt;watchdog_task, netxen_watchdog_task);</div><div class='ctx'> 	INIT_WORK(&amp;adapter-&gt;tx_timeout_task, netxen_tx_timeout_task);</div><div class='ctx'> </div><div class='del'>-	if (netxen_is_flash_supported(adapter) == 0 &amp;&amp;</div><div class='del'>-			netxen_get_flash_mac_addr(adapter, mac_addr) == 0) {</div><div class='del'>-		unsigned char *p;</div><div class='del'>-</div><div class='del'>-		p = (unsigned char *)&amp;mac_addr[adapter-&gt;portnum];</div><div class='del'>-		netdev-&gt;dev_addr[0] = *(p + 5);</div><div class='del'>-		netdev-&gt;dev_addr[1] = *(p + 4);</div><div class='del'>-		netdev-&gt;dev_addr[2] = *(p + 3);</div><div class='del'>-		netdev-&gt;dev_addr[3] = *(p + 2);</div><div class='del'>-		netdev-&gt;dev_addr[4] = *(p + 1);</div><div class='del'>-		netdev-&gt;dev_addr[5] = *(p + 0);</div><div class='del'>-</div><div class='del'>-		memcpy(netdev-&gt;perm_addr, netdev-&gt;dev_addr,</div><div class='del'>-			netdev-&gt;addr_len);</div><div class='del'>-		if (!is_valid_ether_addr(netdev-&gt;perm_addr)) {</div><div class='del'>-			printk(KERN_ERR "%s: Bad MAC address %s.\n",</div><div class='del'>-					netxen_nic_driver_name,</div><div class='del'>-					print_mac(mac, netdev-&gt;dev_addr));</div><div class='del'>-		} else {</div><div class='del'>-			adapter-&gt;macaddr_set(adapter, netdev-&gt;dev_addr);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	err = netxen_read_mac_addr(adapter);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_warn(&amp;pdev-&gt;dev, "failed to read mac addr\n");</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='ctx'> 	netif_stop_queue(netdev);</div><div class='hunk'>@@ -1005,6 +955,7 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;is_up == NETXEN_ADAPTER_UP_MAGIC) {</div><div class='ctx'> 		netxen_free_hw_resources(adapter);</div><div class='add'>+		netxen_release_rx_buffers(adapter);</div><div class='ctx'> 		netxen_free_sw_resources(adapter);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1053,6 +1004,11 @@ static int netxen_nic_open(struct net_device *netdev)</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (adapter-&gt;fw_major &lt; 4)</div><div class='add'>+			adapter-&gt;max_rds_rings = 3;</div><div class='add'>+		else</div><div class='add'>+			adapter-&gt;max_rds_rings = 2;</div><div class='add'>+</div><div class='ctx'> 		err = netxen_alloc_sw_resources(adapter);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			printk(KERN_ERR "%s: Error in setting sw resources\n",</div><div class='hunk'>@@ -1069,15 +1025,24 @@ static int netxen_nic_open(struct net_device *netdev)</div><div class='ctx'> 			goto err_out_free_sw;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if ((adapter-&gt;msi_mode != MSI_MODE_MULTIFUNC) ||</div><div class='add'>+			(adapter-&gt;intr_scheme != INTR_SCHEME_PERPORT)) {</div><div class='add'>+			printk(KERN_ERR "%s: Firmware interrupt scheme is "</div><div class='add'>+					"incompatible with driver\n",</div><div class='add'>+					netdev-&gt;name);</div><div class='add'>+			adapter-&gt;driver_mismatch = 1;</div><div class='add'>+			goto err_out_free_hw;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (adapter-&gt;fw_major &lt; 4) {</div><div class='ctx'> 			adapter-&gt;crb_addr_cmd_producer =</div><div class='ctx'> 				crb_cmd_producer[adapter-&gt;portnum];</div><div class='ctx'> 			adapter-&gt;crb_addr_cmd_consumer =</div><div class='ctx'> 				crb_cmd_consumer[adapter-&gt;portnum];</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		netxen_nic_update_cmd_producer(adapter, 0);</div><div class='del'>-		netxen_nic_update_cmd_consumer(adapter, 0);</div><div class='add'>+			netxen_nic_update_cmd_producer(adapter, 0);</div><div class='add'>+			netxen_nic_update_cmd_consumer(adapter, 0);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		for (ctx = 0; ctx &lt; MAX_RCV_CTX; ++ctx) {</div><div class='ctx'> 			for (ring = 0; ring &lt; adapter-&gt;max_rds_rings; ring++)</div><div class='hunk'>@@ -1094,7 +1059,7 @@ static int netxen_nic_open(struct net_device *netdev)</div><div class='ctx'> 				  flags, netdev-&gt;name, adapter);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			printk(KERN_ERR "request_irq failed with: %d\n", err);</div><div class='del'>-			goto err_out_free_hw;</div><div class='add'>+			goto err_out_free_rxbuf;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		adapter-&gt;is_up = NETXEN_ADAPTER_UP_MAGIC;</div><div class='hunk'>@@ -1113,11 +1078,10 @@ static int netxen_nic_open(struct net_device *netdev)</div><div class='ctx'> 	netxen_nic_set_link_parameters(adapter);</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;set_multicast_list(netdev);</div><div class='del'>-	if (NX_IS_REVISION_P3(adapter-&gt;ahw.revision_id))</div><div class='del'>-		nx_fw_cmd_set_mtu(adapter, netdev-&gt;mtu);</div><div class='del'>-	else</div><div class='add'>+	if (adapter-&gt;set_mtu)</div><div class='ctx'> 		adapter-&gt;set_mtu(adapter, netdev-&gt;mtu);</div><div class='ctx'> </div><div class='add'>+	adapter-&gt;ahw.linkup = 0;</div><div class='ctx'> 	mod_timer(&amp;adapter-&gt;watchdog_timer, jiffies);</div><div class='ctx'> </div><div class='ctx'> 	napi_enable(&amp;adapter-&gt;napi);</div><div class='hunk'>@@ -1129,6 +1093,8 @@ static int netxen_nic_open(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> err_out_free_irq:</div><div class='ctx'> 	free_irq(adapter-&gt;irq, adapter);</div><div class='add'>+err_out_free_rxbuf:</div><div class='add'>+	netxen_release_rx_buffers(adapter);</div><div class='ctx'> err_out_free_hw:</div><div class='ctx'> 	netxen_free_hw_resources(adapter);</div><div class='ctx'> err_out_free_sw:</div><div class='hunk'>@@ -1154,10 +1120,8 @@ static int netxen_nic_close(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	netxen_release_tx_buffers(adapter);</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;is_up == NETXEN_ADAPTER_UP_MAGIC) {</div><div class='del'>-		FLUSH_SCHEDULED_WORK();</div><div class='del'>-		del_timer_sync(&amp;adapter-&gt;watchdog_timer);</div><div class='del'>-	}</div><div class='add'>+	FLUSH_SCHEDULED_WORK();</div><div class='add'>+	del_timer_sync(&amp;adapter-&gt;watchdog_timer);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1410,20 +1374,17 @@ static void netxen_nic_handle_phy_intr(struct netxen_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	port = adapter-&gt;physical_port;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;ahw.board_type == NETXEN_NIC_GBE) {</div><div class='del'>-		val = adapter-&gt;pci_read_normalize(adapter, CRB_XG_STATE);</div><div class='del'>-		linkup = (val &gt;&gt; port) &amp; 1;</div><div class='add'>+	if (NX_IS_REVISION_P3(adapter-&gt;ahw.revision_id)) {</div><div class='add'>+		val = adapter-&gt;pci_read_normalize(adapter, CRB_XG_STATE_P3);</div><div class='add'>+		val = XG_LINK_STATE_P3(adapter-&gt;ahw.pci_func, val);</div><div class='add'>+		linkup = (val == XG_LINK_UP_P3);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (adapter-&gt;fw_major &lt; 4) {</div><div class='del'>-			val = adapter-&gt;pci_read_normalize(adapter,</div><div class='del'>-					CRB_XG_STATE);</div><div class='add'>+		val = adapter-&gt;pci_read_normalize(adapter, CRB_XG_STATE);</div><div class='add'>+		if (adapter-&gt;ahw.board_type == NETXEN_NIC_GBE)</div><div class='add'>+			linkup = (val &gt;&gt; port) &amp; 1;</div><div class='add'>+		else {</div><div class='ctx'> 			val = (val &gt;&gt; port*8) &amp; 0xff;</div><div class='ctx'> 			linkup = (val == XG_LINK_UP);</div><div class='del'>-		} else {</div><div class='del'>-			val = adapter-&gt;pci_read_normalize(adapter,</div><div class='del'>-				CRB_XG_STATE_P3);</div><div class='del'>-			val = XG_LINK_STATE_P3(adapter-&gt;ahw.pci_func, val);</div><div class='del'>-			linkup = (val == XG_LINK_UP_P3);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1463,7 +1424,8 @@ void netxen_watchdog_task(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	netxen_nic_handle_phy_intr(adapter);</div><div class='ctx'> </div><div class='del'>-	mod_timer(&amp;adapter-&gt;watchdog_timer, jiffies + 2 * HZ);</div><div class='add'>+	if (netif_running(adapter-&gt;netdev))</div><div class='add'>+		mod_timer(&amp;adapter-&gt;watchdog_timer, jiffies + 2 * HZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void netxen_tx_timeout(struct net_device *netdev)</div><div class='hunk'>@@ -1523,30 +1485,49 @@ struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev)</div><div class='ctx'> 	return stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-netxen_handle_int(struct netxen_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	netxen_nic_disable_int(adapter);</div><div class='del'>-	napi_schedule(&amp;adapter-&gt;napi);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static irqreturn_t netxen_intr(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct netxen_adapter *adapter = data;</div><div class='del'>-	u32 our_int = 0;</div><div class='add'>+	u32 status = 0;</div><div class='ctx'> </div><div class='del'>-	our_int = adapter-&gt;pci_read_normalize(adapter, CRB_INT_VECTOR);</div><div class='del'>-	/* not our interrupt */</div><div class='del'>-	if ((our_int &amp; (0x80 &lt;&lt; adapter-&gt;portnum)) == 0)</div><div class='add'>+	status = adapter-&gt;pci_read_immediate(adapter, ISR_INT_VECTOR);</div><div class='add'>+</div><div class='add'>+	if (!(status &amp; adapter-&gt;legacy_intr.int_vec_bit))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;intr_scheme == INTR_SCHEME_PERPORT) {</div><div class='add'>+	if (adapter-&gt;ahw.revision_id &gt;= NX_P3_B1) {</div><div class='add'>+		/* check interrupt state machine, to be sure */</div><div class='add'>+		status = adapter-&gt;pci_read_immediate(adapter,</div><div class='add'>+				ISR_INT_STATE_REG);</div><div class='add'>+		if (!ISR_LEGACY_INT_TRIGGERED(status))</div><div class='add'>+			return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		unsigned long our_int = 0;</div><div class='add'>+</div><div class='add'>+		our_int = adapter-&gt;pci_read_normalize(adapter, CRB_INT_VECTOR);</div><div class='add'>+</div><div class='add'>+		/* not our interrupt */</div><div class='add'>+		if (!test_and_clear_bit((7 + adapter-&gt;portnum), &amp;our_int))</div><div class='add'>+			return IRQ_NONE;</div><div class='add'>+</div><div class='ctx'> 		/* claim interrupt */</div><div class='del'>-		adapter-&gt;pci_write_normalize(adapter, CRB_INT_VECTOR,</div><div class='del'>-				our_int &amp; ~((u32)(0x80 &lt;&lt; adapter-&gt;portnum)));</div><div class='add'>+		adapter-&gt;pci_write_normalize(adapter,</div><div class='add'>+				CRB_INT_VECTOR, (our_int &amp; 0xffffffff));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netxen_handle_int(adapter);</div><div class='add'>+	/* clear interrupt */</div><div class='add'>+	if (adapter-&gt;fw_major &lt; 4)</div><div class='add'>+		netxen_nic_disable_int(adapter);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;pci_write_immediate(adapter,</div><div class='add'>+			adapter-&gt;legacy_intr.tgt_status_reg,</div><div class='add'>+			0xffffffff);</div><div class='add'>+	/* read twice to ensure write is flushed */</div><div class='add'>+	adapter-&gt;pci_read_immediate(adapter, ISR_INT_VECTOR);</div><div class='add'>+	adapter-&gt;pci_read_immediate(adapter, ISR_INT_VECTOR);</div><div class='add'>+</div><div class='add'>+	napi_schedule(&amp;adapter-&gt;napi);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -1555,7 +1536,11 @@ static irqreturn_t netxen_msi_intr(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct netxen_adapter *adapter = data;</div><div class='ctx'> </div><div class='del'>-	netxen_handle_int(adapter);</div><div class='add'>+	/* clear interrupt */</div><div class='add'>+	adapter-&gt;pci_write_immediate(adapter,</div><div class='add'>+			msi_tgt_status[adapter-&gt;ahw.pci_func], 0xffffffff);</div><div class='add'>+</div><div class='add'>+	napi_schedule(&amp;adapter-&gt;napi);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c<br/>index 4cb8f4a1cf4b..27f07f6a45b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_niu.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/netxen/netxen_nic_niu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_niu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_niu.c</a></div><div class='hunk'>@@ -610,6 +610,9 @@ int netxen_niu_macaddr_set(struct netxen_adapter *adapter,</div><div class='ctx'> 	int i;</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='add'>+	if (NX_IS_REVISION_P3(adapter-&gt;ahw.revision_id))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 10; i++) {</div><div class='ctx'> 		temp[0] = temp[1] = 0;</div><div class='ctx'> 		memcpy(temp + 2, addr, 2);</div><div class='hunk'>@@ -727,6 +730,9 @@ int netxen_niu_disable_gbe_port(struct netxen_adapter *adapter)</div><div class='ctx'> 	__u32 mac_cfg0;</div><div class='ctx'> 	u32 port = adapter-&gt;physical_port;</div><div class='ctx'> </div><div class='add'>+	if (NX_IS_REVISION_P3(adapter-&gt;ahw.revision_id))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (port &gt; NETXEN_NIU_MAX_GBE_PORTS)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	mac_cfg0 = 0;</div><div class='hunk'>@@ -743,6 +749,9 @@ int netxen_niu_disable_xg_port(struct netxen_adapter *adapter)</div><div class='ctx'> 	__u32 mac_cfg;</div><div class='ctx'> 	u32 port = adapter-&gt;physical_port;</div><div class='ctx'> </div><div class='add'>+	if (NX_IS_REVISION_P3(adapter-&gt;ahw.revision_id))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (port &gt; NETXEN_NIU_MAX_XG_PORTS)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -755,7 +764,7 @@ int netxen_niu_disable_xg_port(struct netxen_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> /* Set promiscuous mode for a GbE interface */</div><div class='ctx'> int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter,</div><div class='del'>-				    netxen_niu_prom_mode_t mode)</div><div class='add'>+		u32 mode)</div><div class='ctx'> {</div><div class='ctx'> 	__u32 reg;</div><div class='ctx'> 	u32 port = adapter-&gt;physical_port;</div><div class='hunk'>@@ -819,6 +828,9 @@ int netxen_niu_xg_macaddr_set(struct netxen_adapter *adapter,</div><div class='ctx'> 	u8 temp[4];</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='add'>+	if (NX_IS_REVISION_P3(adapter-&gt;ahw.revision_id))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if ((phy &lt; 0) || (phy &gt; NETXEN_NIU_MAX_XG_PORTS))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='hunk'>@@ -894,7 +906,7 @@ int netxen_niu_xg_macaddr_get(struct netxen_adapter *adapter,</div><div class='ctx'> #endif  /*  0  */</div><div class='ctx'> </div><div class='ctx'> int netxen_niu_xg_set_promiscuous_mode(struct netxen_adapter *adapter,</div><div class='del'>-				       netxen_niu_prom_mode_t mode)</div><div class='add'>+		u32 mode)</div><div class='ctx'> {</div><div class='ctx'> 	__u32 reg;</div><div class='ctx'> 	u32 port = adapter-&gt;physical_port;</div><div class='head'>diff --git a/drivers/net/netxen/netxen_nic_phan_reg.h b/drivers/net/netxen/netxen_nic_phan_reg.h<br/>index 3bfa51b62a4f..b293adcc95ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_phan_reg.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/netxen/netxen_nic_phan_reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/netxen/netxen_nic_phan_reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/netxen/netxen_nic_phan_reg.h</a></div><div class='hunk'>@@ -95,8 +95,8 @@</div><div class='ctx'> #define CRB_HOST_STS_PROD           NETXEN_NIC_REG(0xdc)</div><div class='ctx'> #define CRB_HOST_STS_CONS           NETXEN_NIC_REG(0xe0)</div><div class='ctx'> #define CRB_PEG_CMD_PROD            NETXEN_NIC_REG(0xe4)</div><div class='del'>-#define CRB_PEG_CMD_CONS            NETXEN_NIC_REG(0xe8)</div><div class='del'>-#define CRB_HOST_BUFFER_PROD        NETXEN_NIC_REG(0xec)</div><div class='add'>+#define CRB_PF_LINK_SPEED_1         NETXEN_NIC_REG(0xe8)</div><div class='add'>+#define CRB_PF_LINK_SPEED_2         NETXEN_NIC_REG(0xec)</div><div class='ctx'> #define CRB_HOST_BUFFER_CONS        NETXEN_NIC_REG(0xf0)</div><div class='ctx'> #define CRB_JUMBO_BUFFER_PROD       NETXEN_NIC_REG(0xf4)</div><div class='ctx'> #define CRB_JUMBO_BUFFER_CONS       NETXEN_NIC_REG(0xf8)</div><div class='hunk'>@@ -125,6 +125,8 @@</div><div class='ctx'> #define CRB_SW_INT_MASK_2	   NETXEN_NIC_REG(0x1e4)</div><div class='ctx'> #define CRB_SW_INT_MASK_3	   NETXEN_NIC_REG(0x1e8)</div><div class='ctx'> </div><div class='add'>+#define CRB_MAC_BLOCK_START        NETXEN_CAM_RAM(0x1c0)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * capabilities register, can be used to selectively enable/disable features</div><div class='ctx'>  * for backward compability</div><div class='head'>diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c<br/>index a20005c09e07..8e0ca9f4e404 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ni5010.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/ni5010.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ni5010.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ni5010.c</a></div><div class='hunk'>@@ -648,7 +648,6 @@ static void ni5010_set_multicast_list(struct net_device *dev)</div><div class='ctx'> 	PRINTK2((KERN_DEBUG "%s: entering set_multicast_list\n", dev-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;flags&amp;IFF_PROMISC || dev-&gt;flags&amp;IFF_ALLMULTI || dev-&gt;mc_list) {</div><div class='del'>-		dev-&gt;flags |= IFF_PROMISC;</div><div class='ctx'> 		outb(RMD_PROMISC, EDLC_RMODE); /* Enable promiscuous mode */</div><div class='ctx'> 		PRINTK((KERN_DEBUG "%s: Entering promiscuous mode\n", dev-&gt;name));</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c<br/>index a316dcc8a06d..b9a882d362da 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ni52.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/ni52.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ni52.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ni52.c</a></div><div class='hunk'>@@ -621,7 +621,7 @@ static int init586(struct net_device *dev)</div><div class='ctx'> 		if (num_addrs &gt; len) {</div><div class='ctx'> 			printk(KERN_ERR "%s: switching to promisc. mode\n",</div><div class='ctx'> 				dev-&gt;name);</div><div class='del'>-			dev-&gt;flags |= IFF_PROMISC;</div><div class='add'>+			writeb(0x01, &amp;cfg_cmd-&gt;promisc);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_PROMISC)</div><div class='head'>diff --git a/drivers/net/niu.c b/drivers/net/niu.c<br/>index 8ee7d7bb951b..e3be81eba8a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/niu.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/niu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/niu.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/niu.c</a></div><div class='hunk'>@@ -5984,6 +5984,56 @@ static void niu_netif_start(struct niu *np)</div><div class='ctx'> 	niu_enable_interrupts(np, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void niu_reset_buffers(struct niu *np)</div><div class='add'>+{</div><div class='add'>+	int i, j, k, err;</div><div class='add'>+</div><div class='add'>+	if (np-&gt;rx_rings) {</div><div class='add'>+		for (i = 0; i &lt; np-&gt;num_rx_rings; i++) {</div><div class='add'>+			struct rx_ring_info *rp = &amp;np-&gt;rx_rings[i];</div><div class='add'>+</div><div class='add'>+			for (j = 0, k = 0; j &lt; MAX_RBR_RING_SIZE; j++) {</div><div class='add'>+				struct page *page;</div><div class='add'>+</div><div class='add'>+				page = rp-&gt;rxhash[j];</div><div class='add'>+				while (page) {</div><div class='add'>+					struct page *next =</div><div class='add'>+						(struct page *) page-&gt;mapping;</div><div class='add'>+					u64 base = page-&gt;index;</div><div class='add'>+					base = base &gt;&gt; RBR_DESCR_ADDR_SHIFT;</div><div class='add'>+					rp-&gt;rbr[k++] = cpu_to_le32(base);</div><div class='add'>+					page = next;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			for (; k &lt; MAX_RBR_RING_SIZE; k++) {</div><div class='add'>+				err = niu_rbr_add_page(np, rp, GFP_ATOMIC, k);</div><div class='add'>+				if (unlikely(err))</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			rp-&gt;rbr_index = rp-&gt;rbr_table_size - 1;</div><div class='add'>+			rp-&gt;rcr_index = 0;</div><div class='add'>+			rp-&gt;rbr_pending = 0;</div><div class='add'>+			rp-&gt;rbr_refill_pending = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (np-&gt;tx_rings) {</div><div class='add'>+		for (i = 0; i &lt; np-&gt;num_tx_rings; i++) {</div><div class='add'>+			struct tx_ring_info *rp = &amp;np-&gt;tx_rings[i];</div><div class='add'>+</div><div class='add'>+			for (j = 0; j &lt; MAX_TX_RING_SIZE; j++) {</div><div class='add'>+				if (rp-&gt;tx_buffs[j].skb)</div><div class='add'>+					(void) release_tx_packet(np, rp, j);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			rp-&gt;pending = MAX_TX_RING_SIZE;</div><div class='add'>+			rp-&gt;prod = 0;</div><div class='add'>+			rp-&gt;cons = 0;</div><div class='add'>+			rp-&gt;wrap_bit = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void niu_reset_task(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct niu *np = container_of(work, struct niu, reset_task);</div><div class='hunk'>@@ -6006,6 +6056,12 @@ static void niu_reset_task(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	niu_stop_hw(np);</div><div class='ctx'> </div><div class='add'>+	spin_unlock_irqrestore(&amp;np-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	niu_reset_buffers(np);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;np-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	err = niu_init_hw(np);</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		np-&gt;timer.expires = jiffies + HZ;</div><div class='hunk'>@@ -6417,7 +6473,7 @@ static int niu_ethflow_to_class(int flow_type, u64 *class)</div><div class='ctx'> 		*class = CLASS_CODE_SCTP_IPV6;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return -1;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='head'>diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c<br/>index 3f682d49a4e6..52bf11b73c6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/axnet_cs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/pcmcia/axnet_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/axnet_cs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/pcmcia/axnet_cs.c</a></div><div class='hunk'>@@ -784,6 +784,7 @@ static struct pcmcia_device_id axnet_ids[] = {</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FEther PCC-TXD", 0x5261440f, 0x436768c5),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FEtherII PCC-TXD", 0x5261440f, 0x730df72e),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("Dynalink", "L100C16", 0x55632fd5, 0x66bc2a90),</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("IO DATA", "ETXPCM", 0x547e66dc, 0x233adac2),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("Linksys", "EtherFast 10/100 PC Card (PCMPC100 V3)", 0x0733cc81, 0x232019a8),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("MELCO", "LPC3-TX", 0x481e0094, 0xf91af609),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("PCMCIA", "100BASE", 0x281f1c5d, 0x7c2add04),</div><div class='head'>diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c<br/>index 2d4c4ad89b8d..ebc1ae6bcbe5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/pcnet_cs.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/pcmcia/pcnet_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/pcnet_cs.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/pcmcia/pcnet_cs.c</a></div><div class='hunk'>@@ -1626,6 +1626,7 @@ static struct pcmcia_device_id pcnet_ids[] = {</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega EtherII PCC-TD", 0x5261440f, 0xc49bd73d),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("Corega K.K.", "corega EtherII PCC-TD", 0xd4fdcbd8, 0xc49bd73d),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega Ether PCC-T", 0x5261440f, 0x6705fcaa),</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega Ether PCC-TD", 0x5261440f, 0x47d5ca83),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FastEther PCC-TX", 0x5261440f, 0x485e85d9),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("Corega,K.K.", "Ethernet LAN Card", 0x110d26d9, 0x9fd2f0a2),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("corega,K.K.", "Ethernet LAN Card", 0x9791a90e, 0x9fd2f0a2),</div><div class='hunk'>@@ -1737,7 +1738,6 @@ static struct pcmcia_device_id pcnet_ids[] = {</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID1("CyQ've 10 Base-T LAN CARD", 0x94faf360),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID1("EP-210 PCMCIA LAN CARD.", 0x8850b4de),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID1("ETHER-C16", 0x06a8514f),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID1("IC-CARD", 0x60cb09a6),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID1("NE2000 Compatible", 0x75b8ad5a),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID2("EN-6200P2", 0xa996d078),</div><div class='ctx'> 	/* too generic! */</div><div class='head'>diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c<br/>index b35d79449500..88f03c9e9403 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ppp_mppe.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/ppp_mppe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ppp_mppe.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ppp_mppe.c</a></div><div class='hunk'>@@ -46,7 +46,6 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c<br/>index f9298827a76c..ff175e8f36b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/pppol2tp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/pppol2tp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/pppol2tp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/pppol2tp.c</a></div><div class='hunk'>@@ -61,7 +61,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c<br/>index 6b2dee0cf3a9..a834b52a6a2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ps3_gelic_wireless.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/ps3_gelic_wireless.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ps3_gelic_wireless.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/ps3_gelic_wireless.c</a></div><div class='hunk'>@@ -1024,7 +1024,7 @@ static int gelic_wl_set_encode(struct net_device *netdev,</div><div class='ctx'> 	struct gelic_wl_info *wl = port_wl(netdev_priv(netdev));</div><div class='ctx'> 	struct iw_point *enc = &amp;data-&gt;encoding;</div><div class='ctx'> 	__u16 flags;</div><div class='del'>-	unsigned int irqflag;</div><div class='add'>+	unsigned long irqflag;</div><div class='ctx'> 	int key_index, index_specified;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1097,7 +1097,7 @@ static int gelic_wl_get_encode(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct gelic_wl_info *wl = port_wl(netdev_priv(netdev));</div><div class='ctx'> 	struct iw_point *enc = &amp;data-&gt;encoding;</div><div class='del'>-	unsigned int irqflag;</div><div class='add'>+	unsigned long irqflag;</div><div class='ctx'> 	unsigned int key_index, index_specified;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1215,7 +1215,7 @@ static int gelic_wl_set_encodeext(struct net_device *netdev,</div><div class='ctx'> 	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;</div><div class='ctx'> 	__u16 alg;</div><div class='ctx'> 	__u16 flags;</div><div class='del'>-	unsigned int irqflag;</div><div class='add'>+	unsigned long irqflag;</div><div class='ctx'> 	int key_index;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1303,7 +1303,7 @@ static int gelic_wl_get_encodeext(struct net_device *netdev,</div><div class='ctx'> 	struct gelic_wl_info *wl = port_wl(netdev_priv(netdev));</div><div class='ctx'> 	struct iw_point *enc = &amp;data-&gt;encoding;</div><div class='ctx'> 	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;</div><div class='del'>-	unsigned int irqflag;</div><div class='add'>+	unsigned long irqflag;</div><div class='ctx'> 	int key_index;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int max_key_len;</div><div class='hunk'>@@ -1426,7 +1426,7 @@ static int gelic_wl_priv_set_psk(struct net_device *net_dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct gelic_wl_info *wl = port_wl(netdev_priv(net_dev));</div><div class='ctx'> 	unsigned int len;</div><div class='del'>-	unsigned int irqflag;</div><div class='add'>+	unsigned long irqflag;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s:&lt;- len=%d\n", __func__, data-&gt;data.length);</div><div class='hunk'>@@ -1467,7 +1467,7 @@ static int gelic_wl_priv_get_psk(struct net_device *net_dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct gelic_wl_info *wl = port_wl(netdev_priv(net_dev));</div><div class='ctx'> 	char *p;</div><div class='del'>-	unsigned int irqflag;</div><div class='add'>+	unsigned long irqflag;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s:&lt;-\n", __func__);</div><div class='head'>diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c<br/>index e82b37bbd6c3..3cdd07c45b6d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/qla3xxx.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/qla3xxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/qla3xxx.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/qla3xxx.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME  	"qla3xxx"</div><div class='ctx'> #define DRV_STRING 	"QLogic ISP3XXX Network Driver"</div><div class='del'>-#define DRV_VERSION	"v2.03.00-k4"</div><div class='add'>+#define DRV_VERSION	"v2.03.00-k5"</div><div class='ctx'> #define PFX		DRV_NAME " "</div><div class='ctx'> </div><div class='ctx'> static const char ql3xxx_driver_name[] = DRV_NAME;</div><div class='hunk'>@@ -3495,8 +3495,6 @@ static void ql_set_mac_info(struct ql3_adapter *qdev)</div><div class='ctx'> 	case ISP_CONTROL_FN0_NET:</div><div class='ctx'> 		qdev-&gt;mac_index = 0;</div><div class='ctx'> 		qdev-&gt;mac_ob_opcode = OUTBOUND_MAC_IOCB | func_number;</div><div class='del'>-		qdev-&gt;tcp_ob_opcode = OUTBOUND_TCP_IOCB | func_number;</div><div class='del'>-		qdev-&gt;update_ob_opcode = UPDATE_NCB_IOCB | func_number;</div><div class='ctx'> 		qdev-&gt;mb_bit_mask = FN0_MA_BITS_MASK;</div><div class='ctx'> 		qdev-&gt;PHYAddr = PORT0_PHY_ADDRESS;</div><div class='ctx'> 		if (port_status &amp; PORT_STATUS_SM0)</div><div class='hunk'>@@ -3508,8 +3506,6 @@ static void ql_set_mac_info(struct ql3_adapter *qdev)</div><div class='ctx'> 	case ISP_CONTROL_FN1_NET:</div><div class='ctx'> 		qdev-&gt;mac_index = 1;</div><div class='ctx'> 		qdev-&gt;mac_ob_opcode = OUTBOUND_MAC_IOCB | func_number;</div><div class='del'>-		qdev-&gt;tcp_ob_opcode = OUTBOUND_TCP_IOCB | func_number;</div><div class='del'>-		qdev-&gt;update_ob_opcode = UPDATE_NCB_IOCB | func_number;</div><div class='ctx'> 		qdev-&gt;mb_bit_mask = FN1_MA_BITS_MASK;</div><div class='ctx'> 		qdev-&gt;PHYAddr = PORT1_PHY_ADDRESS;</div><div class='ctx'> 		if (port_status &amp; PORT_STATUS_SM1)</div><div class='hunk'>@@ -3730,14 +3726,6 @@ static int ql3xxx_open(struct net_device *ndev)</div><div class='ctx'> 	return (ql_adapter_up(qdev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ql3xxx_set_multicast_list(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * We are manually parsing the list in the net_device structure.</div><div class='del'>-	 */</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ql3xxx_set_mac_address(struct net_device *ndev, void *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev);</div><div class='hunk'>@@ -4007,7 +3995,11 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,</div><div class='ctx'> 	ndev-&gt;open = ql3xxx_open;</div><div class='ctx'> 	ndev-&gt;hard_start_xmit = ql3xxx_send;</div><div class='ctx'> 	ndev-&gt;stop = ql3xxx_close;</div><div class='del'>-	ndev-&gt;set_multicast_list = ql3xxx_set_multicast_list;</div><div class='add'>+	/* ndev-&gt;set_multicast_list</div><div class='add'>+	 * This device is one side of a two-function adapter</div><div class='add'>+	 * (NIC and iSCSI).  Promiscuous mode setting/clearing is</div><div class='add'>+	 * not allowed from the NIC side.</div><div class='add'>+	 */</div><div class='ctx'> 	SET_ETHTOOL_OPS(ndev, &amp;ql3xxx_ethtool_ops);</div><div class='ctx'> 	ndev-&gt;set_mac_address = ql3xxx_set_mac_address;</div><div class='ctx'> 	ndev-&gt;tx_timeout = ql3xxx_tx_timeout;</div><div class='hunk'>@@ -4040,9 +4032,6 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	ndev-&gt;tx_queue_len = NUM_REQ_Q_ENTRIES;</div><div class='ctx'> </div><div class='del'>-	/* Turn off support for multicasting */</div><div class='del'>-	ndev-&gt;flags &amp;= ~IFF_MULTICAST;</div><div class='del'>-</div><div class='ctx'> 	/* Record PCI bus information. */</div><div class='ctx'> 	ql_get_board_info(qdev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/qla3xxx.h b/drivers/net/qla3xxx.h<br/>index 58a086fddec6..7113e71b15a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/qla3xxx.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/qla3xxx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/qla3xxx.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/qla3xxx.h</a></div><div class='hunk'>@@ -14,24 +14,14 @@</div><div class='ctx'> </div><div class='ctx'> #define OPCODE_OB_MAC_IOCB_FN0          0x01</div><div class='ctx'> #define OPCODE_OB_MAC_IOCB_FN2          0x21</div><div class='del'>-#define OPCODE_OB_TCP_IOCB_FN0          0x03</div><div class='del'>-#define OPCODE_OB_TCP_IOCB_FN2          0x23</div><div class='del'>-#define OPCODE_UPDATE_NCB_IOCB_FN0      0x00</div><div class='del'>-#define OPCODE_UPDATE_NCB_IOCB_FN2      0x20</div><div class='ctx'> </div><div class='del'>-#define OPCODE_UPDATE_NCB_IOCB      0xF0</div><div class='ctx'> #define OPCODE_IB_MAC_IOCB          0xF9</div><div class='ctx'> #define OPCODE_IB_3032_MAC_IOCB     0x09</div><div class='ctx'> #define OPCODE_IB_IP_IOCB           0xFA</div><div class='ctx'> #define OPCODE_IB_3032_IP_IOCB      0x0A</div><div class='del'>-#define OPCODE_IB_TCP_IOCB          0xFB</div><div class='del'>-#define OPCODE_DUMP_PROTO_IOCB      0xFE</div><div class='del'>-#define OPCODE_BUFFER_ALERT_IOCB    0xFB</div><div class='ctx'> </div><div class='ctx'> #define OPCODE_FUNC_ID_MASK                 0x30</div><div class='ctx'> #define OUTBOUND_MAC_IOCB                   0x01	/* plus function bits */</div><div class='del'>-#define OUTBOUND_TCP_IOCB                   0x03	/* plus function bits */</div><div class='del'>-#define UPDATE_NCB_IOCB                     0x00	/* plus function bits */</div><div class='ctx'> </div><div class='ctx'> #define FN0_MA_BITS_MASK    0x00</div><div class='ctx'> #define FN1_MA_BITS_MASK    0x80</div><div class='hunk'>@@ -159,75 +149,6 @@ struct ob_ip_iocb_rsp {</div><div class='ctx'> 	__le32 reserved2;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct ob_tcp_iocb_req {</div><div class='del'>-	u8 opcode;</div><div class='del'>-</div><div class='del'>-	u8 flags0;</div><div class='del'>-#define OB_TCP_IOCB_REQ_P       0x80</div><div class='del'>-#define OB_TCP_IOCB_REQ_CI      0x20</div><div class='del'>-#define OB_TCP_IOCB_REQ_H       0x10</div><div class='del'>-#define OB_TCP_IOCB_REQ_LN      0x08</div><div class='del'>-#define OB_TCP_IOCB_REQ_K       0x04</div><div class='del'>-#define OB_TCP_IOCB_REQ_D       0x02</div><div class='del'>-#define OB_TCP_IOCB_REQ_I       0x01</div><div class='del'>-</div><div class='del'>-	u8 flags1;</div><div class='del'>-#define OB_TCP_IOCB_REQ_OSM     0x40</div><div class='del'>-#define OB_TCP_IOCB_REQ_URG     0x20</div><div class='del'>-#define OB_TCP_IOCB_REQ_ACK     0x10</div><div class='del'>-#define OB_TCP_IOCB_REQ_PSH     0x08</div><div class='del'>-#define OB_TCP_IOCB_REQ_RST     0x04</div><div class='del'>-#define OB_TCP_IOCB_REQ_SYN     0x02</div><div class='del'>-#define OB_TCP_IOCB_REQ_FIN     0x01</div><div class='del'>-</div><div class='del'>-	u8 options_len;</div><div class='del'>-#define OB_TCP_IOCB_REQ_OMASK   0xF0</div><div class='del'>-#define OB_TCP_IOCB_REQ_SHIFT   4</div><div class='del'>-</div><div class='del'>-	__le32 transaction_id;</div><div class='del'>-	__le32 data_len;</div><div class='del'>-	__le32 hncb_ptr_low;</div><div class='del'>-	__le32 hncb_ptr_high;</div><div class='del'>-	__le32 buf_addr0_low;</div><div class='del'>-	__le32 buf_addr0_high;</div><div class='del'>-	__le32 buf_0_len;</div><div class='del'>-	__le32 buf_addr1_low;</div><div class='del'>-	__le32 buf_addr1_high;</div><div class='del'>-	__le32 buf_1_len;</div><div class='del'>-	__le32 buf_addr2_low;</div><div class='del'>-	__le32 buf_addr2_high;</div><div class='del'>-	__le32 buf_2_len;</div><div class='del'>-	__le32 time_stamp;</div><div class='del'>-	__le32 reserved1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ob_tcp_iocb_rsp {</div><div class='del'>-	u8 opcode;</div><div class='del'>-</div><div class='del'>-	u8 flags0;</div><div class='del'>-#define OB_TCP_IOCB_RSP_C       0x20</div><div class='del'>-#define OB_TCP_IOCB_RSP_H       0x10</div><div class='del'>-#define OB_TCP_IOCB_RSP_LN      0x08</div><div class='del'>-#define OB_TCP_IOCB_RSP_K       0x04</div><div class='del'>-#define OB_TCP_IOCB_RSP_D       0x02</div><div class='del'>-#define OB_TCP_IOCB_RSP_I       0x01</div><div class='del'>-</div><div class='del'>-	u8 flags1;</div><div class='del'>-#define OB_TCP_IOCB_RSP_E       0x10</div><div class='del'>-#define OB_TCP_IOCB_RSP_W       0x08</div><div class='del'>-#define OB_TCP_IOCB_RSP_P       0x04</div><div class='del'>-#define OB_TCP_IOCB_RSP_T       0x02</div><div class='del'>-#define OB_TCP_IOCB_RSP_F       0x01</div><div class='del'>-</div><div class='del'>-	u8 state;</div><div class='del'>-#define OB_TCP_IOCB_RSP_SMASK   0xF0</div><div class='del'>-#define OB_TCP_IOCB_RSP_SHIFT   4</div><div class='del'>-</div><div class='del'>-	__le32 transaction_id;</div><div class='del'>-	__le32 local_ncb_ptr;</div><div class='del'>-	__le32 reserved0;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct ib_ip_iocb_rsp {</div><div class='ctx'> 	u8 opcode;</div><div class='ctx'> #define IB_IP_IOCB_RSP_3032_V   0x80</div><div class='hunk'>@@ -256,25 +177,6 @@ struct ib_ip_iocb_rsp {</div><div class='ctx'> 	__le32 ial_high;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct ib_tcp_iocb_rsp {</div><div class='del'>-	u8 opcode;</div><div class='del'>-	u8 flags;</div><div class='del'>-#define IB_TCP_IOCB_RSP_P       0x80</div><div class='del'>-#define IB_TCP_IOCB_RSP_T       0x40</div><div class='del'>-#define IB_TCP_IOCB_RSP_D       0x20</div><div class='del'>-#define IB_TCP_IOCB_RSP_N       0x10</div><div class='del'>-#define IB_TCP_IOCB_RSP_IP      0x03</div><div class='del'>-#define IB_TCP_FLAG_MASK        0xf0</div><div class='del'>-#define IB_TCP_FLAG_IOCB_SYN    0x00</div><div class='del'>-</div><div class='del'>-#define TCP_IB_RSP_FLAGS(x) (x-&gt;flags &amp; ~IB_TCP_FLAG_MASK)</div><div class='del'>-</div><div class='del'>-	__le16 length;</div><div class='del'>-	__le32 hncb_ref_num;</div><div class='del'>-	__le32 ial_low;</div><div class='del'>-	__le32 ial_high;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct net_rsp_iocb {</div><div class='ctx'> 	u8 opcode;</div><div class='ctx'> 	u8 flags;</div><div class='hunk'>@@ -1266,20 +1168,13 @@ struct ql3_adapter {</div><div class='ctx'> 	u32 small_buf_release_cnt;</div><div class='ctx'> 	u32 small_buf_total_size;</div><div class='ctx'> </div><div class='del'>-	/* ISR related, saves status for DPC. */</div><div class='del'>-	u32 control_status;</div><div class='del'>-</div><div class='ctx'> 	struct eeprom_data nvram_data;</div><div class='del'>-	struct timer_list ioctl_timer;</div><div class='ctx'> 	u32 port_link_state;</div><div class='del'>-	u32 last_rsp_offset;</div><div class='ctx'> </div><div class='ctx'> 	/* 4022 specific */</div><div class='ctx'> 	u32 mac_index;		/* Driver's MAC number can be 0 or 1 for first and second networking functions respectively */</div><div class='ctx'> 	u32 PHYAddr;		/* Address of PHY 0x1e00 Port 0 and 0x1f00 Port 1 */</div><div class='ctx'> 	u32 mac_ob_opcode;	/* Opcode to use on mac transmission */</div><div class='del'>-	u32 tcp_ob_opcode;	/* Opcode to use on tcp transmission */</div><div class='del'>-	u32 update_ob_opcode;	/* Opcode to use for updating NCB */</div><div class='ctx'> 	u32 mb_bit_mask;	/* MA Bits mask to use on transmission */</div><div class='ctx'> 	u32 numPorts;</div><div class='ctx'> 	struct workqueue_struct *workqueue;</div><div class='head'>diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c<br/>index 6531ff565c54..5d86281d9363 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/r6040.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/r6040.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/r6040.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/r6040.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='head'>diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c<br/>index a3e3895e5032..0f6f9747d255 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/r8169.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/r8169.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/r8169.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/r8169.c</a></div><div class='hunk'>@@ -2792,7 +2792,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev,</div><div class='ctx'> 					pkt_size, PCI_DMA_FROMDEVICE);</div><div class='ctx'> 				rtl8169_mark_to_asic(desc, tp-&gt;rx_buf_sz);</div><div class='ctx'> 			} else {</div><div class='del'>-				pci_unmap_single(pdev, addr, pkt_size,</div><div class='add'>+				pci_unmap_single(pdev, addr, tp-&gt;rx_buf_sz,</div><div class='ctx'> 						 PCI_DMA_FROMDEVICE);</div><div class='ctx'> 				tp-&gt;Rx_skbuff[entry] = NULL;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c<br/>index 86d77d05190a..a2b073097e5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/s2io.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/s2io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/s2io.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/s2io.c</a></div><div class='hunk'>@@ -3143,7 +3143,7 @@ static void tx_intr_handler(struct fifo_info *fifo_data)</div><div class='ctx'> 		pkt_cnt++;</div><div class='ctx'> </div><div class='ctx'> 		/* Updating the statistics block */</div><div class='del'>-		nic-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='add'>+		nic-&gt;dev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='ctx'> 		nic-&gt;mac_control.stats_info-&gt;sw_stat.mem_freed += skb-&gt;truesize;</div><div class='ctx'> 		dev_kfree_skb_irq(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -4896,25 +4896,42 @@ static struct net_device_stats *s2io_get_stats(struct net_device *dev)</div><div class='ctx'> 	/* Configure Stats for immediate updt */</div><div class='ctx'> 	s2io_updt_stats(sp);</div><div class='ctx'> </div><div class='add'>+	/* Using sp-&gt;stats as a staging area, because reset (due to mtu</div><div class='add'>+	   change, for example) will clear some hardware counters */</div><div class='add'>+	dev-&gt;stats.tx_packets +=</div><div class='add'>+		le32_to_cpu(mac_control-&gt;stats_info-&gt;tmac_frms) - </div><div class='add'>+		sp-&gt;stats.tx_packets;</div><div class='ctx'> 	sp-&gt;stats.tx_packets =</div><div class='ctx'> 		le32_to_cpu(mac_control-&gt;stats_info-&gt;tmac_frms);</div><div class='add'>+	dev-&gt;stats.tx_errors +=</div><div class='add'>+		le32_to_cpu(mac_control-&gt;stats_info-&gt;tmac_any_err_frms) -</div><div class='add'>+		sp-&gt;stats.tx_errors;</div><div class='ctx'> 	sp-&gt;stats.tx_errors =</div><div class='ctx'> 		le32_to_cpu(mac_control-&gt;stats_info-&gt;tmac_any_err_frms);</div><div class='add'>+	dev-&gt;stats.rx_errors +=</div><div class='add'>+		le64_to_cpu(mac_control-&gt;stats_info-&gt;rmac_drop_frms) -</div><div class='add'>+		sp-&gt;stats.rx_errors;</div><div class='ctx'> 	sp-&gt;stats.rx_errors =</div><div class='ctx'> 		le64_to_cpu(mac_control-&gt;stats_info-&gt;rmac_drop_frms);</div><div class='add'>+	dev-&gt;stats.multicast =</div><div class='add'>+		le32_to_cpu(mac_control-&gt;stats_info-&gt;rmac_vld_mcst_frms) - </div><div class='add'>+		sp-&gt;stats.multicast;</div><div class='ctx'> 	sp-&gt;stats.multicast =</div><div class='ctx'> 		le32_to_cpu(mac_control-&gt;stats_info-&gt;rmac_vld_mcst_frms);</div><div class='add'>+	dev-&gt;stats.rx_length_errors =</div><div class='add'>+		le64_to_cpu(mac_control-&gt;stats_info-&gt;rmac_long_frms) - </div><div class='add'>+		sp-&gt;stats.rx_length_errors;</div><div class='ctx'> 	sp-&gt;stats.rx_length_errors =</div><div class='ctx'> 		le64_to_cpu(mac_control-&gt;stats_info-&gt;rmac_long_frms);</div><div class='ctx'> </div><div class='ctx'> 	/* collect per-ring rx_packets and rx_bytes */</div><div class='del'>-	sp-&gt;stats.rx_packets = sp-&gt;stats.rx_bytes = 0;</div><div class='add'>+	dev-&gt;stats.rx_packets = dev-&gt;stats.rx_bytes = 0;</div><div class='ctx'> 	for (i = 0; i &lt; config-&gt;rx_ring_num; i++) {</div><div class='del'>-		sp-&gt;stats.rx_packets += mac_control-&gt;rings[i].rx_packets;</div><div class='del'>-		sp-&gt;stats.rx_bytes += mac_control-&gt;rings[i].rx_bytes;</div><div class='add'>+		dev-&gt;stats.rx_packets += mac_control-&gt;rings[i].rx_packets;</div><div class='add'>+		dev-&gt;stats.rx_bytes += mac_control-&gt;rings[i].rx_bytes;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return (&amp;sp-&gt;stats);</div><div class='add'>+	return (&amp;dev-&gt;stats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -7419,7 +7436,7 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)</div><div class='ctx'> 		if (err_mask != 0x5) {</div><div class='ctx'> 			DBG_PRINT(ERR_DBG, "%s: Rx error Value: 0x%x\n",</div><div class='ctx'> 				dev-&gt;name, err_mask);</div><div class='del'>-			sp-&gt;stats.rx_crc_errors++;</div><div class='add'>+			dev-&gt;stats.rx_crc_errors++;</div><div class='ctx'> 			sp-&gt;mac_control.stats_info-&gt;sw_stat.mem_freed</div><div class='ctx'> 				+= skb-&gt;truesize;</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='head'>diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c<br/>index c69ba1395fa9..1c370e6aa641 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sh_eth.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/sh_eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sh_eth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/sh_eth.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  SuperH Ethernet device driver</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2006,2007 Nobuhiro Iwamatsu</div><div class='add'>+ *  Copyright (C) 2006-2008 Nobuhiro Iwamatsu</div><div class='ctx'>  *  Copyright (C) 2008 Renesas Solutions Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify it</div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  *  the file called "COPYING".</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='hunk'>@@ -34,6 +33,29 @@</div><div class='ctx'> </div><div class='ctx'> #include "sh_eth.h"</div><div class='ctx'> </div><div class='add'>+/* CPU &lt;-&gt; EDMAC endian convert */</div><div class='add'>+static inline __u32 cpu_to_edmac(struct sh_eth_private *mdp, u32 x)</div><div class='add'>+{</div><div class='add'>+	switch (mdp-&gt;edmac_endian) {</div><div class='add'>+	case EDMAC_LITTLE_ENDIAN:</div><div class='add'>+		return cpu_to_le32(x);</div><div class='add'>+	case EDMAC_BIG_ENDIAN:</div><div class='add'>+		return cpu_to_be32(x);</div><div class='add'>+	}</div><div class='add'>+	return x;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u32 edmac_to_cpu(struct sh_eth_private *mdp, u32 x)</div><div class='add'>+{</div><div class='add'>+	switch (mdp-&gt;edmac_endian) {</div><div class='add'>+	case EDMAC_LITTLE_ENDIAN:</div><div class='add'>+		return le32_to_cpu(x);</div><div class='add'>+	case EDMAC_BIG_ENDIAN:</div><div class='add'>+		return be32_to_cpu(x);</div><div class='add'>+	}</div><div class='add'>+	return x;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Program the hardware MAC address from dev-&gt;dev_addr.</div><div class='ctx'>  */</div><div class='hunk'>@@ -143,13 +165,39 @@ static struct mdiobb_ops bb_ops = {</div><div class='ctx'> 	.get_mdio_data = sh_get_mdio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Chip Reset */</div><div class='ctx'> static void sh_eth_reset(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ioaddr = ndev-&gt;base_addr;</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='add'>+	int cnt = 100;</div><div class='add'>+</div><div class='add'>+	ctrl_outl(EDSR_ENALL, ioaddr + EDSR);</div><div class='add'>+	ctrl_outl(ctrl_inl(ioaddr + EDMR) | EDMR_SRST, ioaddr + EDMR);</div><div class='add'>+	while (cnt &gt; 0) {</div><div class='add'>+		if (!(ctrl_inl(ioaddr + EDMR) &amp; 0x3))</div><div class='add'>+			break;</div><div class='add'>+		mdelay(1);</div><div class='add'>+		cnt--;</div><div class='add'>+	}</div><div class='add'>+	if (cnt &lt; 0)</div><div class='add'>+		printk(KERN_ERR "Device reset fail\n");</div><div class='add'>+</div><div class='add'>+	/* Table Init */</div><div class='add'>+	ctrl_outl(0x0, ioaddr + TDLAR);</div><div class='add'>+	ctrl_outl(0x0, ioaddr + TDFAR);</div><div class='add'>+	ctrl_outl(0x0, ioaddr + TDFXR);</div><div class='add'>+	ctrl_outl(0x0, ioaddr + TDFFR);</div><div class='add'>+	ctrl_outl(0x0, ioaddr + RDLAR);</div><div class='add'>+	ctrl_outl(0x0, ioaddr + RDFAR);</div><div class='add'>+	ctrl_outl(0x0, ioaddr + RDFXR);</div><div class='add'>+	ctrl_outl(0x0, ioaddr + RDFFR);</div><div class='add'>+#else</div><div class='ctx'> 	ctrl_outl(ctrl_inl(ioaddr + EDMR) | EDMR_SRST, ioaddr + EDMR);</div><div class='ctx'> 	mdelay(3);</div><div class='ctx'> 	ctrl_outl(ctrl_inl(ioaddr + EDMR) &amp; ~EDMR_SRST, ioaddr + EDMR);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* free skb and descriptor buffer */</div><div class='hunk'>@@ -180,6 +228,7 @@ static void sh_eth_ring_free(struct net_device *ndev)</div><div class='ctx'> /* format skb and descriptor buffer */</div><div class='ctx'> static void sh_eth_ring_format(struct net_device *ndev)</div><div class='ctx'> {</div><div class='add'>+	u32 ioaddr = ndev-&gt;base_addr, reserve = 0;</div><div class='ctx'> 	struct sh_eth_private *mdp = netdev_priv(ndev);</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -201,22 +250,41 @@ static void sh_eth_ring_format(struct net_device *ndev)</div><div class='ctx'> 		mdp-&gt;rx_skbuff[i] = skb;</div><div class='ctx'> 		if (skb == NULL)</div><div class='ctx'> 			break;</div><div class='del'>-		skb-&gt;dev = ndev;	/* Mark as being used by this device. */</div><div class='add'>+		skb-&gt;dev = ndev; /* Mark as being used by this device. */</div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='add'>+		reserve = SH7763_SKB_ALIGN</div><div class='add'>+			- ((uint32_t)skb-&gt;data &amp; (SH7763_SKB_ALIGN-1));</div><div class='add'>+		if (reserve)</div><div class='add'>+			skb_reserve(skb, reserve);</div><div class='add'>+#else</div><div class='ctx'> 		skb_reserve(skb, RX_OFFSET);</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> 		/* RX descriptor */</div><div class='ctx'> 		rxdesc = &amp;mdp-&gt;rx_ring[i];</div><div class='ctx'> 		rxdesc-&gt;addr = (u32)skb-&gt;data &amp; ~0x3UL;</div><div class='del'>-		rxdesc-&gt;status = cpu_to_le32(RD_RACT | RD_RFP);</div><div class='add'>+		rxdesc-&gt;status = cpu_to_edmac(mdp, RD_RACT | RD_RFP);</div><div class='ctx'> </div><div class='ctx'> 		/* The size of the buffer is 16 byte boundary. */</div><div class='ctx'> 		rxdesc-&gt;buffer_length = (mdp-&gt;rx_buf_sz + 16) &amp; ~0x0F;</div><div class='add'>+		/* Rx descriptor address set */</div><div class='add'>+		if (i == 0) {</div><div class='add'>+			ctrl_outl((u32)rxdesc, ioaddr + RDLAR);</div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='add'>+			ctrl_outl((u32)rxdesc, ioaddr + RDFAR);</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Rx descriptor address set */</div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='add'>+	ctrl_outl((u32)rxdesc, ioaddr + RDFXR);</div><div class='add'>+	ctrl_outl(0x1, ioaddr + RDFFR);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	mdp-&gt;dirty_rx = (u32) (i - RX_RING_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Mark the last entry as wrapping the ring. */</div><div class='del'>-	rxdesc-&gt;status |= cpu_to_le32(RC_RDEL);</div><div class='add'>+	rxdesc-&gt;status |= cpu_to_edmac(mdp, RD_RDEL);</div><div class='ctx'> </div><div class='ctx'> 	memset(mdp-&gt;tx_ring, 0, tx_ringsize);</div><div class='ctx'> </div><div class='hunk'>@@ -224,11 +292,24 @@ static void sh_eth_ring_format(struct net_device *ndev)</div><div class='ctx'> 	for (i = 0; i &lt; TX_RING_SIZE; i++) {</div><div class='ctx'> 		mdp-&gt;tx_skbuff[i] = NULL;</div><div class='ctx'> 		txdesc = &amp;mdp-&gt;tx_ring[i];</div><div class='del'>-		txdesc-&gt;status = cpu_to_le32(TD_TFP);</div><div class='add'>+		txdesc-&gt;status = cpu_to_edmac(mdp, TD_TFP);</div><div class='ctx'> 		txdesc-&gt;buffer_length = 0;</div><div class='add'>+		if (i == 0) {</div><div class='add'>+			/* Tx descriptor address set */</div><div class='add'>+			ctrl_outl((u32)txdesc, ioaddr + TDLAR);</div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='add'>+			ctrl_outl((u32)txdesc, ioaddr + TDFAR);</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	txdesc-&gt;status |= cpu_to_le32(TD_TDLE);</div><div class='add'>+	/* Tx descriptor address set */</div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='add'>+	ctrl_outl((u32)txdesc, ioaddr + TDFXR);</div><div class='add'>+	ctrl_outl(0x1, ioaddr + TDFFR);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	txdesc-&gt;status |= cpu_to_edmac(mdp, TD_TDLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Get skb and descriptor buffer */</div><div class='hunk'>@@ -311,31 +392,43 @@ static int sh_eth_dev_init(struct net_device *ndev)</div><div class='ctx'> 	/* Soft Reset */</div><div class='ctx'> 	sh_eth_reset(ndev);</div><div class='ctx'> </div><div class='del'>-	ctrl_outl(RPADIR_PADS1, ioaddr + RPADIR);	/* SH7712-DMA-RX-PAD2 */</div><div class='add'>+	/* Descriptor format */</div><div class='add'>+	sh_eth_ring_format(ndev);</div><div class='add'>+	ctrl_outl(RPADIR_INIT, ioaddr + RPADIR);</div><div class='ctx'> </div><div class='ctx'> 	/* all sh_eth int mask */</div><div class='ctx'> 	ctrl_outl(0, ioaddr + EESIPR);</div><div class='ctx'> </div><div class='del'>-	/* FIFO size set */</div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='add'>+	ctrl_outl(EDMR_EL, ioaddr + EDMR);</div><div class='add'>+#else</div><div class='ctx'> 	ctrl_outl(0, ioaddr + EDMR);	/* Endian change */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+	/* FIFO size set */</div><div class='ctx'> 	ctrl_outl((FIFO_SIZE_T | FIFO_SIZE_R), ioaddr + FDR);</div><div class='ctx'> 	ctrl_outl(0, ioaddr + TFTR);</div><div class='ctx'> </div><div class='add'>+	/* Frame recv control */</div><div class='ctx'> 	ctrl_outl(0, ioaddr + RMCR);</div><div class='ctx'> </div><div class='ctx'> 	rx_int_var = mdp-&gt;rx_int_var = DESC_I_RINT8 | DESC_I_RINT5;</div><div class='ctx'> 	tx_int_var = mdp-&gt;tx_int_var = DESC_I_TINT2;</div><div class='ctx'> 	ctrl_outl(rx_int_var | tx_int_var, ioaddr + TRSCER);</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='add'>+	/* Burst sycle set */</div><div class='add'>+	ctrl_outl(0x800, ioaddr + BCULR);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	ctrl_outl((FIFO_F_D_RFF | FIFO_F_D_RFD), ioaddr + FCFTR);</div><div class='del'>-	ctrl_outl(0, ioaddr + TRIMD);</div><div class='ctx'> </div><div class='del'>-	/* Descriptor format */</div><div class='del'>-	sh_eth_ring_format(ndev);</div><div class='add'>+#if !defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='add'>+	ctrl_outl(0, ioaddr + TRIMD);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	ctrl_outl((u32)mdp-&gt;rx_ring, ioaddr + RDLAR);</div><div class='del'>-	ctrl_outl((u32)mdp-&gt;tx_ring, ioaddr + TDLAR);</div><div class='add'>+	/* Recv frame limit set register */</div><div class='add'>+	ctrl_outl(RFLR_VALUE, ioaddr + RFLR);</div><div class='ctx'> </div><div class='ctx'> 	ctrl_outl(ctrl_inl(ioaddr + EESR), ioaddr + EESR);</div><div class='ctx'> 	ctrl_outl((DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff), ioaddr + EESIPR);</div><div class='hunk'>@@ -345,21 +438,26 @@ static int sh_eth_dev_init(struct net_device *ndev)</div><div class='ctx'> 		ECMR_ZPF | (mdp-&gt;duplex ? ECMR_DM : 0) | ECMR_TE | ECMR_RE;</div><div class='ctx'> </div><div class='ctx'> 	ctrl_outl(val, ioaddr + ECMR);</div><div class='del'>-	ctrl_outl(ECSR_BRCRX | ECSR_PSRTO | ECSR_LCHNG | ECSR_ICD |</div><div class='del'>-		  ECSIPR_MPDIP, ioaddr + ECSR);</div><div class='del'>-	ctrl_outl(ECSIPR_BRCRXIP | ECSIPR_PSRTOIP | ECSIPR_LCHNGIP |</div><div class='del'>-		  ECSIPR_ICDIP | ECSIPR_MPDIP, ioaddr + ECSIPR);</div><div class='add'>+</div><div class='add'>+	/* E-MAC Status Register clear */</div><div class='add'>+	ctrl_outl(ECSR_INIT, ioaddr + ECSR);</div><div class='add'>+</div><div class='add'>+	/* E-MAC Interrupt Enable register */</div><div class='add'>+	ctrl_outl(ECSIPR_INIT, ioaddr + ECSIPR);</div><div class='ctx'> </div><div class='ctx'> 	/* Set MAC address */</div><div class='ctx'> 	update_mac_address(ndev);</div><div class='ctx'> </div><div class='ctx'> 	/* mask reset */</div><div class='del'>-#if defined(CONFIG_CPU_SUBTYPE_SH7710)</div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='ctx'> 	ctrl_outl(APR_AP, ioaddr + APR);</div><div class='ctx'> 	ctrl_outl(MPR_MP, ioaddr + MPR);</div><div class='ctx'> 	ctrl_outl(TPAUSER_UNLIMITED, ioaddr + TPAUSER);</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7710)</div><div class='ctx'> 	ctrl_outl(BCFR_UNLIMITED, ioaddr + BCFR);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> 	/* Setting the Rx mode will start the Rx process. */</div><div class='ctx'> 	ctrl_outl(EDRRR_R, ioaddr + EDRRR);</div><div class='ctx'> </div><div class='hunk'>@@ -379,7 +477,7 @@ static int sh_eth_txfree(struct net_device *ndev)</div><div class='ctx'> 	for (; mdp-&gt;cur_tx - mdp-&gt;dirty_tx &gt; 0; mdp-&gt;dirty_tx++) {</div><div class='ctx'> 		entry = mdp-&gt;dirty_tx % TX_RING_SIZE;</div><div class='ctx'> 		txdesc = &amp;mdp-&gt;tx_ring[entry];</div><div class='del'>-		if (txdesc-&gt;status &amp; cpu_to_le32(TD_TACT))</div><div class='add'>+		if (txdesc-&gt;status &amp; cpu_to_edmac(mdp, TD_TACT))</div><div class='ctx'> 			break;</div><div class='ctx'> 		/* Free the original skb. */</div><div class='ctx'> 		if (mdp-&gt;tx_skbuff[entry]) {</div><div class='hunk'>@@ -387,9 +485,9 @@ static int sh_eth_txfree(struct net_device *ndev)</div><div class='ctx'> 			mdp-&gt;tx_skbuff[entry] = NULL;</div><div class='ctx'> 			freeNum++;</div><div class='ctx'> 		}</div><div class='del'>-		txdesc-&gt;status = cpu_to_le32(TD_TFP);</div><div class='add'>+		txdesc-&gt;status = cpu_to_edmac(mdp, TD_TFP);</div><div class='ctx'> 		if (entry &gt;= TX_RING_SIZE - 1)</div><div class='del'>-			txdesc-&gt;status |= cpu_to_le32(TD_TDLE);</div><div class='add'>+			txdesc-&gt;status |= cpu_to_edmac(mdp, TD_TDLE);</div><div class='ctx'> </div><div class='ctx'> 		mdp-&gt;stats.tx_packets++;</div><div class='ctx'> 		mdp-&gt;stats.tx_bytes += txdesc-&gt;buffer_length;</div><div class='hunk'>@@ -407,11 +505,11 @@ static int sh_eth_rx(struct net_device *ndev)</div><div class='ctx'> 	int boguscnt = (mdp-&gt;dirty_rx + RX_RING_SIZE) - mdp-&gt;cur_rx;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	u16 pkt_len = 0;</div><div class='del'>-	u32 desc_status;</div><div class='add'>+	u32 desc_status, reserve = 0;</div><div class='ctx'> </div><div class='ctx'> 	rxdesc = &amp;mdp-&gt;rx_ring[entry];</div><div class='del'>-	while (!(rxdesc-&gt;status &amp; cpu_to_le32(RD_RACT))) {</div><div class='del'>-		desc_status = le32_to_cpu(rxdesc-&gt;status);</div><div class='add'>+	while (!(rxdesc-&gt;status &amp; cpu_to_edmac(mdp, RD_RACT))) {</div><div class='add'>+		desc_status = edmac_to_cpu(mdp, rxdesc-&gt;status);</div><div class='ctx'> 		pkt_len = rxdesc-&gt;frame_length;</div><div class='ctx'> </div><div class='ctx'> 		if (--boguscnt &lt; 0)</div><div class='hunk'>@@ -446,7 +544,7 @@ static int sh_eth_rx(struct net_device *ndev)</div><div class='ctx'> 			mdp-&gt;stats.rx_packets++;</div><div class='ctx'> 			mdp-&gt;stats.rx_bytes += pkt_len;</div><div class='ctx'> 		}</div><div class='del'>-		rxdesc-&gt;status |= cpu_to_le32(RD_RACT);</div><div class='add'>+		rxdesc-&gt;status |= cpu_to_edmac(mdp, RD_RACT);</div><div class='ctx'> 		entry = (++mdp-&gt;cur_rx) % RX_RING_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -454,28 +552,38 @@ static int sh_eth_rx(struct net_device *ndev)</div><div class='ctx'> 	for (; mdp-&gt;cur_rx - mdp-&gt;dirty_rx &gt; 0; mdp-&gt;dirty_rx++) {</div><div class='ctx'> 		entry = mdp-&gt;dirty_rx % RX_RING_SIZE;</div><div class='ctx'> 		rxdesc = &amp;mdp-&gt;rx_ring[entry];</div><div class='add'>+		/* The size of the buffer is 16 byte boundary. */</div><div class='add'>+		rxdesc-&gt;buffer_length = (mdp-&gt;rx_buf_sz + 16) &amp; ~0x0F;</div><div class='add'>+</div><div class='ctx'> 		if (mdp-&gt;rx_skbuff[entry] == NULL) {</div><div class='ctx'> 			skb = dev_alloc_skb(mdp-&gt;rx_buf_sz);</div><div class='ctx'> 			mdp-&gt;rx_skbuff[entry] = skb;</div><div class='ctx'> 			if (skb == NULL)</div><div class='ctx'> 				break;	/* Better luck next round. */</div><div class='ctx'> 			skb-&gt;dev = ndev;</div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='add'>+			reserve = SH7763_SKB_ALIGN</div><div class='add'>+				- ((uint32_t)skb-&gt;data &amp; (SH7763_SKB_ALIGN-1));</div><div class='add'>+			if (reserve)</div><div class='add'>+				skb_reserve(skb, reserve);</div><div class='add'>+#else</div><div class='ctx'> 			skb_reserve(skb, RX_OFFSET);</div><div class='add'>+#endif</div><div class='add'>+			skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> 			rxdesc-&gt;addr = (u32)skb-&gt;data &amp; ~0x3UL;</div><div class='ctx'> 		}</div><div class='del'>-		/* The size of the buffer is 16 byte boundary. */</div><div class='del'>-		rxdesc-&gt;buffer_length = (mdp-&gt;rx_buf_sz + 16) &amp; ~0x0F;</div><div class='ctx'> 		if (entry &gt;= RX_RING_SIZE - 1)</div><div class='ctx'> 			rxdesc-&gt;status |=</div><div class='del'>-			cpu_to_le32(RD_RACT | RD_RFP | RC_RDEL);</div><div class='add'>+				cpu_to_edmac(mdp, RD_RACT | RD_RFP | RD_RDEL);</div><div class='ctx'> 		else</div><div class='ctx'> 			rxdesc-&gt;status |=</div><div class='del'>-			cpu_to_le32(RD_RACT | RD_RFP);</div><div class='add'>+				cpu_to_edmac(mdp, RD_RACT | RD_RFP);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Restart Rx engine if stopped. */</div><div class='ctx'> 	/* If we don't need to check status, don't. -KDU */</div><div class='del'>-	ctrl_outl(EDRRR_R, ndev-&gt;base_addr + EDRRR);</div><div class='add'>+	if (!(ctrl_inl(ndev-&gt;base_addr + EDRRR) &amp; EDRRR_R))</div><div class='add'>+		ctrl_outl(EDRRR_R, ndev-&gt;base_addr + EDRRR);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -529,13 +637,14 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)</div><div class='ctx'> 			printk(KERN_ERR "Receive Frame Overflow\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+#if !defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='ctx'> 	if (intr_status &amp; EESR_ADE) {</div><div class='ctx'> 		if (intr_status &amp; EESR_TDE) {</div><div class='ctx'> 			if (intr_status &amp; EESR_TFE)</div><div class='ctx'> 				mdp-&gt;stats.tx_fifo_errors++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if (intr_status &amp; EESR_RDE) {</div><div class='ctx'> 		/* Receive Descriptor Empty int */</div><div class='hunk'>@@ -550,8 +659,11 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)</div><div class='ctx'> 		mdp-&gt;stats.rx_fifo_errors++;</div><div class='ctx'> 		printk(KERN_ERR "Receive FIFO Overflow\n");</div><div class='ctx'> 	}</div><div class='del'>-	if (intr_status &amp;</div><div class='del'>-	    (EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | EESR_TFE)) {</div><div class='add'>+	if (intr_status &amp; (EESR_TWB | EESR_TABT |</div><div class='add'>+#if !defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='add'>+			EESR_ADE |</div><div class='add'>+#endif</div><div class='add'>+			EESR_TDE | EESR_TFE)) {</div><div class='ctx'> 		/* Tx error */</div><div class='ctx'> 		u32 edtrr = ctrl_inl(ndev-&gt;base_addr + EDTRR);</div><div class='ctx'> 		/* dmesg */</div><div class='hunk'>@@ -582,17 +694,23 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev)</div><div class='ctx'> 	ioaddr = ndev-&gt;base_addr;</div><div class='ctx'> 	spin_lock(&amp;mdp-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	/* Get interrpt stat */</div><div class='ctx'> 	intr_status = ctrl_inl(ioaddr + EESR);</div><div class='ctx'> 	/* Clear interrupt */</div><div class='ctx'> 	ctrl_outl(intr_status, ioaddr + EESR);</div><div class='ctx'> </div><div class='del'>-	if (intr_status &amp; (EESR_FRC | EESR_RINT8 |</div><div class='del'>-			   EESR_RINT5 | EESR_RINT4 | EESR_RINT3 | EESR_RINT2 |</div><div class='del'>-			   EESR_RINT1))</div><div class='add'>+	if (intr_status &amp; (EESR_FRC | /* Frame recv*/</div><div class='add'>+			EESR_RMAF | /* Multi cast address recv*/</div><div class='add'>+			EESR_RRF  | /* Bit frame recv */</div><div class='add'>+			EESR_RTLF | /* Long frame recv*/</div><div class='add'>+			EESR_RTSF | /* short frame recv */</div><div class='add'>+			EESR_PRE  | /* PHY-LSI recv error */</div><div class='add'>+			EESR_CERF)){ /* recv frame CRC error */</div><div class='ctx'> 		sh_eth_rx(ndev);</div><div class='del'>-	if (intr_status &amp; (EESR_FTC |</div><div class='del'>-			   EESR_TINT4 | EESR_TINT3 | EESR_TINT2 | EESR_TINT1)) {</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	/* Tx Check */</div><div class='add'>+	if (intr_status &amp; TX_CHECK) {</div><div class='ctx'> 		sh_eth_txfree(ndev);</div><div class='ctx'> 		netif_wake_queue(ndev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -631,11 +749,32 @@ static void sh_eth_adjust_link(struct net_device *ndev)</div><div class='ctx'> 		if (phydev-&gt;duplex != mdp-&gt;duplex) {</div><div class='ctx'> 			new_state = 1;</div><div class='ctx'> 			mdp-&gt;duplex = phydev-&gt;duplex;</div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='add'>+			if (mdp-&gt;duplex) { /*  FULL */</div><div class='add'>+				ctrl_outl(ctrl_inl(ioaddr + ECMR) | ECMR_DM,</div><div class='add'>+						ioaddr + ECMR);</div><div class='add'>+			} else {	/* Half */</div><div class='add'>+				ctrl_outl(ctrl_inl(ioaddr + ECMR) &amp; ~ECMR_DM,</div><div class='add'>+						ioaddr + ECMR);</div><div class='add'>+			}</div><div class='add'>+#endif</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (phydev-&gt;speed != mdp-&gt;speed) {</div><div class='ctx'> 			new_state = 1;</div><div class='ctx'> 			mdp-&gt;speed = phydev-&gt;speed;</div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='add'>+			switch (mdp-&gt;speed) {</div><div class='add'>+			case 10: /* 10BASE */</div><div class='add'>+				ctrl_outl(GECMR_10, ioaddr + GECMR); break;</div><div class='add'>+			case 100:/* 100BASE */</div><div class='add'>+				ctrl_outl(GECMR_100, ioaddr + GECMR); break;</div><div class='add'>+			case 1000: /* 1000BASE */</div><div class='add'>+				ctrl_outl(GECMR_1000, ioaddr + GECMR); break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+#endif</div><div class='ctx'> 		}</div><div class='ctx'> 		if (mdp-&gt;link == PHY_DOWN) {</div><div class='ctx'> 			ctrl_outl((ctrl_inl(ioaddr + ECMR) &amp; ~ECMR_TXF)</div><div class='hunk'>@@ -730,7 +869,7 @@ static int sh_eth_open(struct net_device *ndev)</div><div class='ctx'> 	/* Set the timer to check for link beat. */</div><div class='ctx'> 	init_timer(&amp;mdp-&gt;timer);</div><div class='ctx'> 	mdp-&gt;timer.expires = (jiffies + (24 * HZ)) / 10;/* 2.4 sec. */</div><div class='del'>-	setup_timer(&amp;mdp-&gt;timer, sh_eth_timer, ndev);</div><div class='add'>+	setup_timer(&amp;mdp-&gt;timer, sh_eth_timer, (unsigned long)ndev);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -814,13 +953,15 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 		txdesc-&gt;buffer_length = skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	if (entry &gt;= TX_RING_SIZE - 1)</div><div class='del'>-		txdesc-&gt;status |= cpu_to_le32(TD_TACT | TD_TDLE);</div><div class='add'>+		txdesc-&gt;status |= cpu_to_edmac(mdp, TD_TACT | TD_TDLE);</div><div class='ctx'> 	else</div><div class='del'>-		txdesc-&gt;status |= cpu_to_le32(TD_TACT);</div><div class='add'>+		txdesc-&gt;status |= cpu_to_edmac(mdp, TD_TACT);</div><div class='ctx'> </div><div class='ctx'> 	mdp-&gt;cur_tx++;</div><div class='ctx'> </div><div class='del'>-	ctrl_outl(EDTRR_TRNS, ndev-&gt;base_addr + EDTRR);</div><div class='add'>+	if (!(ctrl_inl(ndev-&gt;base_addr + EDTRR) &amp; EDTRR_TRNS))</div><div class='add'>+		ctrl_outl(EDTRR_TRNS, ndev-&gt;base_addr + EDTRR);</div><div class='add'>+</div><div class='ctx'> 	ndev-&gt;trans_start = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -877,9 +1018,15 @@ static struct net_device_stats *sh_eth_get_stats(struct net_device *ndev)</div><div class='ctx'> 	ctrl_outl(0, ioaddr + CDCR);	/* (write clear) */</div><div class='ctx'> 	mdp-&gt;stats.tx_carrier_errors += ctrl_inl(ioaddr + LCCR);</div><div class='ctx'> 	ctrl_outl(0, ioaddr + LCCR);	/* (write clear) */</div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='add'>+	mdp-&gt;stats.tx_carrier_errors += ctrl_inl(ioaddr + CERCR);/* CERCR */</div><div class='add'>+	ctrl_outl(0, ioaddr + CERCR);	/* (write clear) */</div><div class='add'>+	mdp-&gt;stats.tx_carrier_errors += ctrl_inl(ioaddr + CEECR);/* CEECR */</div><div class='add'>+	ctrl_outl(0, ioaddr + CEECR);	/* (write clear) */</div><div class='add'>+#else</div><div class='ctx'> 	mdp-&gt;stats.tx_carrier_errors += ctrl_inl(ioaddr + CNDCR);</div><div class='ctx'> 	ctrl_outl(0, ioaddr + CNDCR);	/* (write clear) */</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> 	return &amp;mdp-&gt;stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -929,8 +1076,13 @@ static void sh_eth_tsu_init(u32 ioaddr)</div><div class='ctx'> 	ctrl_outl(0, ioaddr + TSU_FWSL0);</div><div class='ctx'> 	ctrl_outl(0, ioaddr + TSU_FWSL1);</div><div class='ctx'> 	ctrl_outl(TSU_FWSLC_POSTENU | TSU_FWSLC_POSTENL, ioaddr + TSU_FWSLC);</div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='add'>+	ctrl_outl(0, ioaddr + TSU_QTAG0);	/* Disable QTAG(0-&gt;1) */</div><div class='add'>+	ctrl_outl(0, ioaddr + TSU_QTAG1);	/* Disable QTAG(1-&gt;0) */</div><div class='add'>+#else</div><div class='ctx'> 	ctrl_outl(0, ioaddr + TSU_QTAGM0);	/* Disable QTAG(0-&gt;1) */</div><div class='ctx'> 	ctrl_outl(0, ioaddr + TSU_QTAGM1);	/* Disable QTAG(1-&gt;0) */</div><div class='add'>+#endif</div><div class='ctx'> 	ctrl_outl(0, ioaddr + TSU_FWSR);	/* all interrupt status clear */</div><div class='ctx'> 	ctrl_outl(0, ioaddr + TSU_FWINMK);	/* Disable all interrupt */</div><div class='ctx'> 	ctrl_outl(0, ioaddr + TSU_TEN);	/* Disable all CAM entry */</div><div class='hunk'>@@ -1029,6 +1181,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	struct net_device *ndev = NULL;</div><div class='ctx'> 	struct sh_eth_private *mdp;</div><div class='add'>+	struct sh_eth_plat_data *pd;</div><div class='ctx'> </div><div class='ctx'> 	/* get base addr */</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='hunk'>@@ -1066,8 +1219,11 @@ static int sh_eth_drv_probe(struct platform_device *pdev)</div><div class='ctx'> 	mdp = netdev_priv(ndev);</div><div class='ctx'> 	spin_lock_init(&amp;mdp-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	pd = (struct sh_eth_plat_data *)(pdev-&gt;dev.platform_data);</div><div class='ctx'> 	/* get PHY ID */</div><div class='del'>-	mdp-&gt;phy_id = (int)pdev-&gt;dev.platform_data;</div><div class='add'>+	mdp-&gt;phy_id = pd-&gt;phy;</div><div class='add'>+	/* EDMAC endian */</div><div class='add'>+	mdp-&gt;edmac_endian = pd-&gt;edmac_endian;</div><div class='ctx'> </div><div class='ctx'> 	/* set function */</div><div class='ctx'> 	ndev-&gt;open = sh_eth_open;</div><div class='hunk'>@@ -1087,12 +1243,16 @@ static int sh_eth_drv_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* First device only init */</div><div class='ctx'> 	if (!devno) {</div><div class='add'>+#if defined(ARSTR)</div><div class='ctx'> 		/* reset device */</div><div class='del'>-		ctrl_outl(ARSTR_ARSTR, ndev-&gt;base_addr + ARSTR);</div><div class='add'>+		ctrl_outl(ARSTR_ARSTR, ARSTR);</div><div class='ctx'> 		mdelay(1);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+#if defined(SH_TSU_ADDR)</div><div class='ctx'> 		/* TSU init (Init only)*/</div><div class='ctx'> 		sh_eth_tsu_init(SH_TSU_ADDR);</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* network device register */</div><div class='hunk'>@@ -1110,8 +1270,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)</div><div class='ctx'> 	       ndev-&gt;name, CARDNAME, (u32) ndev-&gt;base_addr);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 5; i++)</div><div class='del'>-		printk(KERN_INFO "%2.2x:", ndev-&gt;dev_addr[i]);</div><div class='del'>-	printk(KERN_INFO "%2.2x, IRQ %d.\n", ndev-&gt;dev_addr[i], ndev-&gt;irq);</div><div class='add'>+		printk("%02X:", ndev-&gt;dev_addr[i]);</div><div class='add'>+	printk("%02X, IRQ %d.\n", ndev-&gt;dev_addr[i], ndev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, ndev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h<br/>index e01e1c347715..73bc7181cc18 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sh_eth.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/sh_eth.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sh_eth.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/sh_eth.h</a></div><div class='hunk'>@@ -30,120 +30,254 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/sh_eth.h&gt;</div><div class='add'>+</div><div class='ctx'> #define CARDNAME	"sh-eth"</div><div class='ctx'> #define TX_TIMEOUT	(5*HZ)</div><div class='del'>-</div><div class='del'>-#define TX_RING_SIZE	128	/* Tx ring size */</div><div class='del'>-#define RX_RING_SIZE	128	/* Rx ring size */</div><div class='del'>-#define RX_OFFSET		2	/* skb offset */</div><div class='add'>+#define TX_RING_SIZE	64	/* Tx ring size */</div><div class='add'>+#define RX_RING_SIZE	64	/* Rx ring size */</div><div class='ctx'> #define ETHERSMALL		60</div><div class='ctx'> #define PKT_BUF_SZ		1538</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CPU_SUBTYPE_SH7763</div><div class='add'>+</div><div class='add'>+#define SH7763_SKB_ALIGN 32</div><div class='ctx'> /* Chip Base Address */</div><div class='del'>-#define SH_TSU_ADDR 0xA7000804</div><div class='add'>+# define SH_TSU_ADDR  0xFFE01800</div><div class='add'>+# define ARSTR 		  0xFFE01800</div><div class='ctx'> </div><div class='ctx'> /* Chip Registers */</div><div class='ctx'> /* E-DMAC */</div><div class='del'>-#define EDMR	0x0000</div><div class='del'>-#define EDTRR	0x0004</div><div class='del'>-#define EDRRR	0x0008</div><div class='del'>-#define TDLAR	0x000C</div><div class='del'>-#define RDLAR	0x0010</div><div class='del'>-#define EESR	0x0014</div><div class='del'>-#define EESIPR	0x0018</div><div class='del'>-#define TRSCER	0x001C</div><div class='del'>-#define RMFCR	0x0020</div><div class='del'>-#define TFTR	0x0024</div><div class='del'>-#define FDR		0x0028</div><div class='del'>-#define RMCR	0x002C</div><div class='del'>-#define EDOCR	0x0030</div><div class='del'>-#define FCFTR	0x0034</div><div class='del'>-#define RPADIR	0x0038</div><div class='del'>-#define TRIMD	0x003C</div><div class='del'>-#define RBWAR	0x0040</div><div class='del'>-#define RDFAR	0x0044</div><div class='del'>-#define TBRAR	0x004C</div><div class='del'>-#define TDFAR	0x0050</div><div class='add'>+# define EDSR    0x000</div><div class='add'>+# define EDMR    0x400</div><div class='add'>+# define EDTRR   0x408</div><div class='add'>+# define EDRRR   0x410</div><div class='add'>+# define EESR    0x428</div><div class='add'>+# define EESIPR  0x430</div><div class='add'>+# define TDLAR   0x010</div><div class='add'>+# define TDFAR   0x014</div><div class='add'>+# define TDFXR   0x018</div><div class='add'>+# define TDFFR   0x01C</div><div class='add'>+# define RDLAR   0x030</div><div class='add'>+# define RDFAR   0x034</div><div class='add'>+# define RDFXR   0x038</div><div class='add'>+# define RDFFR   0x03C</div><div class='add'>+# define TRSCER  0x438</div><div class='add'>+# define RMFCR   0x440</div><div class='add'>+# define TFTR    0x448</div><div class='add'>+# define FDR     0x450</div><div class='add'>+# define RMCR    0x458</div><div class='add'>+# define RPADIR  0x460</div><div class='add'>+# define FCFTR   0x468</div><div class='add'>+</div><div class='add'>+/* Ether Register */</div><div class='add'>+# define ECMR    0x500</div><div class='add'>+# define ECSR    0x510</div><div class='add'>+# define ECSIPR  0x518</div><div class='add'>+# define PIR     0x520</div><div class='add'>+# define PSR     0x528</div><div class='add'>+# define PIPR    0x52C</div><div class='add'>+# define RFLR    0x508</div><div class='add'>+# define APR     0x554</div><div class='add'>+# define MPR     0x558</div><div class='add'>+# define PFTCR	 0x55C</div><div class='add'>+# define PFRCR	 0x560</div><div class='add'>+# define TPAUSER 0x564</div><div class='add'>+# define GECMR   0x5B0</div><div class='add'>+# define BCULR   0x5B4</div><div class='add'>+# define MAHR    0x5C0</div><div class='add'>+# define MALR    0x5C8</div><div class='add'>+# define TROCR   0x700</div><div class='add'>+# define CDCR    0x708</div><div class='add'>+# define LCCR    0x710</div><div class='add'>+# define CEFCR   0x740</div><div class='add'>+# define FRECR   0x748</div><div class='add'>+# define TSFRCR  0x750</div><div class='add'>+# define TLFRCR  0x758</div><div class='add'>+# define RFCR    0x760</div><div class='add'>+# define CERCR   0x768</div><div class='add'>+# define CEECR   0x770</div><div class='add'>+# define MAFCR   0x778</div><div class='add'>+</div><div class='add'>+/* TSU Absolute Address */</div><div class='add'>+# define TSU_CTRST       0x004</div><div class='add'>+# define TSU_FWEN0       0x010</div><div class='add'>+# define TSU_FWEN1       0x014</div><div class='add'>+# define TSU_FCM         0x18</div><div class='add'>+# define TSU_BSYSL0      0x20</div><div class='add'>+# define TSU_BSYSL1      0x24</div><div class='add'>+# define TSU_PRISL0      0x28</div><div class='add'>+# define TSU_PRISL1      0x2C</div><div class='add'>+# define TSU_FWSL0       0x30</div><div class='add'>+# define TSU_FWSL1       0x34</div><div class='add'>+# define TSU_FWSLC       0x38</div><div class='add'>+# define TSU_QTAG0       0x40</div><div class='add'>+# define TSU_QTAG1       0x44</div><div class='add'>+# define TSU_FWSR        0x50</div><div class='add'>+# define TSU_FWINMK      0x54</div><div class='add'>+# define TSU_ADQT0       0x48</div><div class='add'>+# define TSU_ADQT1       0x4C</div><div class='add'>+# define TSU_VTAG0       0x58</div><div class='add'>+# define TSU_VTAG1       0x5C</div><div class='add'>+# define TSU_ADSBSY      0x60</div><div class='add'>+# define TSU_TEN         0x64</div><div class='add'>+# define TSU_POST1       0x70</div><div class='add'>+# define TSU_POST2       0x74</div><div class='add'>+# define TSU_POST3       0x78</div><div class='add'>+# define TSU_POST4       0x7C</div><div class='add'>+# define TSU_ADRH0       0x100</div><div class='add'>+# define TSU_ADRL0       0x104</div><div class='add'>+# define TSU_ADRH31      0x1F8</div><div class='add'>+# define TSU_ADRL31      0x1FC</div><div class='add'>+</div><div class='add'>+# define TXNLCR0         0x80</div><div class='add'>+# define TXALCR0         0x84</div><div class='add'>+# define RXNLCR0         0x88</div><div class='add'>+# define RXALCR0         0x8C</div><div class='add'>+# define FWNLCR0         0x90</div><div class='add'>+# define FWALCR0         0x94</div><div class='add'>+# define TXNLCR1         0xA0</div><div class='add'>+# define TXALCR1         0xA4</div><div class='add'>+# define RXNLCR1         0xA8</div><div class='add'>+# define RXALCR1         0xAC</div><div class='add'>+# define FWNLCR1         0xB0</div><div class='add'>+# define FWALCR1         0x40</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_CPU_SUBTYPE_SH7763 */</div><div class='add'>+# define RX_OFFSET 2	/* skb offset */</div><div class='add'>+#ifndef CONFIG_CPU_SUBTYPE_SH7619</div><div class='add'>+/* Chip base address */</div><div class='add'>+# define SH_TSU_ADDR  0xA7000804</div><div class='add'>+# define ARSTR		  0xA7000800</div><div class='add'>+#endif</div><div class='add'>+/* Chip Registers */</div><div class='add'>+/* E-DMAC */</div><div class='add'>+# define EDMR	0x0000</div><div class='add'>+# define EDTRR	0x0004</div><div class='add'>+# define EDRRR	0x0008</div><div class='add'>+# define TDLAR	0x000C</div><div class='add'>+# define RDLAR	0x0010</div><div class='add'>+# define EESR	0x0014</div><div class='add'>+# define EESIPR	0x0018</div><div class='add'>+# define TRSCER	0x001C</div><div class='add'>+# define RMFCR	0x0020</div><div class='add'>+# define TFTR	0x0024</div><div class='add'>+# define FDR	0x0028</div><div class='add'>+# define RMCR	0x002C</div><div class='add'>+# define EDOCR	0x0030</div><div class='add'>+# define FCFTR	0x0034</div><div class='add'>+# define RPADIR	0x0038</div><div class='add'>+# define TRIMD	0x003C</div><div class='add'>+# define RBWAR	0x0040</div><div class='add'>+# define RDFAR	0x0044</div><div class='add'>+# define TBRAR	0x004C</div><div class='add'>+# define TDFAR	0x0050</div><div class='add'>+</div><div class='ctx'> /* Ether Register */</div><div class='del'>-#define ECMR	0x0160</div><div class='del'>-#define ECSR	0x0164</div><div class='del'>-#define ECSIPR	0x0168</div><div class='del'>-#define PIR		0x016C</div><div class='del'>-#define MAHR	0x0170</div><div class='del'>-#define MALR	0x0174</div><div class='del'>-#define RFLR	0x0178</div><div class='del'>-#define PSR		0x017C</div><div class='del'>-#define TROCR	0x0180</div><div class='del'>-#define CDCR	0x0184</div><div class='del'>-#define LCCR	0x0188</div><div class='del'>-#define CNDCR	0x018C</div><div class='del'>-#define CEFCR	0x0194</div><div class='del'>-#define FRECR	0x0198</div><div class='del'>-#define TSFRCR	0x019C</div><div class='del'>-#define TLFRCR	0x01A0</div><div class='del'>-#define RFCR	0x01A4</div><div class='del'>-#define MAFCR	0x01A8</div><div class='del'>-#define IPGR	0x01B4</div><div class='del'>-#if defined(CONFIG_CPU_SUBTYPE_SH7710)</div><div class='del'>-#define APR		0x01B8</div><div class='del'>-#define MPR 	0x01BC</div><div class='del'>-#define TPAUSER 0x1C4</div><div class='del'>-#define BCFR	0x1CC</div><div class='del'>-#endif /* CONFIG_CPU_SH7710 */</div><div class='del'>-</div><div class='del'>-#define ARSTR	0x0800</div><div class='add'>+# define ECMR	0x0160</div><div class='add'>+# define ECSR	0x0164</div><div class='add'>+# define ECSIPR	0x0168</div><div class='add'>+# define PIR	0x016C</div><div class='add'>+# define MAHR	0x0170</div><div class='add'>+# define MALR	0x0174</div><div class='add'>+# define RFLR	0x0178</div><div class='add'>+# define PSR	0x017C</div><div class='add'>+# define TROCR	0x0180</div><div class='add'>+# define CDCR	0x0184</div><div class='add'>+# define LCCR	0x0188</div><div class='add'>+# define CNDCR	0x018C</div><div class='add'>+# define CEFCR	0x0194</div><div class='add'>+# define FRECR	0x0198</div><div class='add'>+# define TSFRCR	0x019C</div><div class='add'>+# define TLFRCR	0x01A0</div><div class='add'>+# define RFCR	0x01A4</div><div class='add'>+# define MAFCR	0x01A8</div><div class='add'>+# define IPGR	0x01B4</div><div class='add'>+# if defined(CONFIG_CPU_SUBTYPE_SH7710)</div><div class='add'>+# define APR	0x01B8</div><div class='add'>+# define MPR 	0x01BC</div><div class='add'>+# define TPAUSER 0x1C4</div><div class='add'>+# define BCFR	0x1CC</div><div class='add'>+# endif /* CONFIG_CPU_SH7710 */</div><div class='ctx'> </div><div class='ctx'> /* TSU */</div><div class='del'>-#define TSU_CTRST	0x004</div><div class='del'>-#define TSU_FWEN0	0x010</div><div class='del'>-#define TSU_FWEN1	0x014</div><div class='del'>-#define TSU_FCM		0x018</div><div class='del'>-#define TSU_BSYSL0	0x020</div><div class='del'>-#define TSU_BSYSL1	0x024</div><div class='del'>-#define TSU_PRISL0	0x028</div><div class='del'>-#define TSU_PRISL1	0x02C</div><div class='del'>-#define TSU_FWSL0	0x030</div><div class='del'>-#define TSU_FWSL1	0x034</div><div class='del'>-#define TSU_FWSLC	0x038</div><div class='del'>-#define TSU_QTAGM0	0x040</div><div class='del'>-#define TSU_QTAGM1	0x044</div><div class='del'>-#define TSU_ADQT0 	0x048</div><div class='del'>-#define TSU_ADQT1	0x04C</div><div class='del'>-#define TSU_FWSR	0x050</div><div class='del'>-#define TSU_FWINMK	0x054</div><div class='del'>-#define TSU_ADSBSY	0x060</div><div class='del'>-#define TSU_TEN		0x064</div><div class='del'>-#define TSU_POST1	0x070</div><div class='del'>-#define TSU_POST2	0x074</div><div class='del'>-#define TSU_POST3	0x078</div><div class='del'>-#define TSU_POST4	0x07C</div><div class='del'>-#define TXNLCR0		0x080</div><div class='del'>-#define TXALCR0		0x084</div><div class='del'>-#define RXNLCR0		0x088</div><div class='del'>-#define RXALCR0		0x08C</div><div class='del'>-#define FWNLCR0		0x090</div><div class='del'>-#define FWALCR0		0x094</div><div class='del'>-#define TXNLCR1		0x0A0</div><div class='del'>-#define TXALCR1		0x0A4</div><div class='del'>-#define RXNLCR1		0x0A8</div><div class='del'>-#define RXALCR1		0x0AC</div><div class='del'>-#define FWNLCR1		0x0B0</div><div class='del'>-#define FWALCR1		0x0B4</div><div class='add'>+# define TSU_CTRST	0x004</div><div class='add'>+# define TSU_FWEN0	0x010</div><div class='add'>+# define TSU_FWEN1	0x014</div><div class='add'>+# define TSU_FCM	0x018</div><div class='add'>+# define TSU_BSYSL0	0x020</div><div class='add'>+# define TSU_BSYSL1	0x024</div><div class='add'>+# define TSU_PRISL0	0x028</div><div class='add'>+# define TSU_PRISL1	0x02C</div><div class='add'>+# define TSU_FWSL0	0x030</div><div class='add'>+# define TSU_FWSL1	0x034</div><div class='add'>+# define TSU_FWSLC	0x038</div><div class='add'>+# define TSU_QTAGM0	0x040</div><div class='add'>+# define TSU_QTAGM1	0x044</div><div class='add'>+# define TSU_ADQT0 	0x048</div><div class='add'>+# define TSU_ADQT1	0x04C</div><div class='add'>+# define TSU_FWSR	0x050</div><div class='add'>+# define TSU_FWINMK	0x054</div><div class='add'>+# define TSU_ADSBSY	0x060</div><div class='add'>+# define TSU_TEN	0x064</div><div class='add'>+# define TSU_POST1	0x070</div><div class='add'>+# define TSU_POST2	0x074</div><div class='add'>+# define TSU_POST3	0x078</div><div class='add'>+# define TSU_POST4	0x07C</div><div class='add'>+# define TXNLCR0	0x080</div><div class='add'>+# define TXALCR0	0x084</div><div class='add'>+# define RXNLCR0	0x088</div><div class='add'>+# define RXALCR0	0x08C</div><div class='add'>+# define FWNLCR0	0x090</div><div class='add'>+# define FWALCR0	0x094</div><div class='add'>+# define TXNLCR1	0x0A0</div><div class='add'>+# define TXALCR1	0x0A4</div><div class='add'>+# define RXNLCR1	0x0A8</div><div class='add'>+# define RXALCR1	0x0AC</div><div class='add'>+# define FWNLCR1	0x0B0</div><div class='add'>+# define FWALCR1	0x0B4</div><div class='ctx'> </div><div class='ctx'> #define TSU_ADRH0	0x0100</div><div class='ctx'> #define TSU_ADRL0	0x0104</div><div class='ctx'> #define TSU_ADRL31	0x01FC</div><div class='ctx'> </div><div class='del'>-/* Register's bits */</div><div class='add'>+#endif /* CONFIG_CPU_SUBTYPE_SH7763 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Register's bits</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_CPU_SUBTYPE_SH7763</div><div class='add'>+/* EDSR */</div><div class='add'>+enum EDSR_BIT {</div><div class='add'>+	EDSR_ENT = 0x01, EDSR_ENR = 0x02,</div><div class='add'>+};</div><div class='add'>+#define EDSR_ENALL (EDSR_ENT|EDSR_ENR)</div><div class='add'>+</div><div class='add'>+/* GECMR */</div><div class='add'>+enum GECMR_BIT {</div><div class='add'>+	GECMR_10 = 0x0, GECMR_100 = 0x04, GECMR_1000 = 0x01,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* EDMR */</div><div class='ctx'> enum DMAC_M_BIT {</div><div class='del'>-	EDMR_DL1 = 0x20, EDMR_DL0 = 0x10, EDMR_SRST = 0x01,</div><div class='add'>+	EDMR_DL1 = 0x20, EDMR_DL0 = 0x10,</div><div class='add'>+#ifdef CONFIG_CPU_SUBTYPE_SH7763</div><div class='add'>+	EDMR_SRST	= 0x03,</div><div class='add'>+	EMDR_DESC_R	= 0x30, /* Descriptor reserve size */</div><div class='add'>+	EDMR_EL		= 0x40, /* Litte endian */</div><div class='add'>+#else /* CONFIG_CPU_SUBTYPE_SH7763 */</div><div class='add'>+	EDMR_SRST = 0x01,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* EDTRR */</div><div class='ctx'> enum DMAC_T_BIT {</div><div class='add'>+#ifdef CONFIG_CPU_SUBTYPE_SH7763</div><div class='add'>+	EDTRR_TRNS = 0x03,</div><div class='add'>+#else</div><div class='ctx'> 	EDTRR_TRNS = 0x01,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* EDRRR*/</div><div class='hunk'>@@ -173,21 +307,47 @@ enum PHY_STATUS_BIT { PHY_ST_LINK = 0x01, };</div><div class='ctx'> </div><div class='ctx'> /* EESR */</div><div class='ctx'> enum EESR_BIT {</div><div class='del'>-	EESR_TWB = 0x40000000, EESR_TABT = 0x04000000,</div><div class='add'>+#ifndef CONFIG_CPU_SUBTYPE_SH7763</div><div class='add'>+	EESR_TWB  = 0x40000000,</div><div class='add'>+#else</div><div class='add'>+	EESR_TWB  = 0xC0000000,</div><div class='add'>+	EESR_TC1  = 0x20000000,</div><div class='add'>+	EESR_TUC  = 0x10000000,</div><div class='add'>+	EESR_ROC  = 0x80000000,</div><div class='add'>+#endif</div><div class='add'>+	EESR_TABT = 0x04000000,</div><div class='ctx'> 	EESR_RABT = 0x02000000, EESR_RFRMER = 0x01000000,</div><div class='del'>-	EESR_ADE = 0x00800000, EESR_ECI = 0x00400000,</div><div class='del'>-	EESR_FTC = 0x00200000, EESR_TDE = 0x00100000,</div><div class='del'>-	EESR_TFE = 0x00080000, EESR_FRC = 0x00040000,</div><div class='del'>-	EESR_RDE = 0x00020000, EESR_RFE = 0x00010000,</div><div class='del'>-	EESR_TINT4 = 0x00000800, EESR_TINT3 = 0x00000400,</div><div class='del'>-	EESR_TINT2 = 0x00000200, EESR_TINT1 = 0x00000100,</div><div class='del'>-	EESR_RINT8 = 0x00000080, EESR_RINT5 = 0x00000010,</div><div class='del'>-	EESR_RINT4 = 0x00000008, EESR_RINT3 = 0x00000004,</div><div class='del'>-	EESR_RINT2 = 0x00000002, EESR_RINT1 = 0x00000001,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define EESR_ERR_CHECK	(EESR_TWB | EESR_TABT | EESR_RABT | EESR_RDE \</div><div class='add'>+#ifndef CONFIG_CPU_SUBTYPE_SH7763</div><div class='add'>+	EESR_ADE  = 0x00800000,</div><div class='add'>+#endif</div><div class='add'>+	EESR_ECI  = 0x00400000,</div><div class='add'>+	EESR_FTC  = 0x00200000, EESR_TDE  = 0x00100000,</div><div class='add'>+	EESR_TFE  = 0x00080000, EESR_FRC  = 0x00040000,</div><div class='add'>+	EESR_RDE  = 0x00020000, EESR_RFE  = 0x00010000,</div><div class='add'>+#ifndef CONFIG_CPU_SUBTYPE_SH7763</div><div class='add'>+	EESR_CND  = 0x00000800,</div><div class='add'>+#endif</div><div class='add'>+	EESR_DLC  = 0x00000400,</div><div class='add'>+	EESR_CD   = 0x00000200, EESR_RTO  = 0x00000100,</div><div class='add'>+	EESR_RMAF = 0x00000080, EESR_CEEF = 0x00000040,</div><div class='add'>+	EESR_CELF = 0x00000020, EESR_RRF  = 0x00000010,</div><div class='add'>+	EESR_RTLF = 0x00000008, EESR_RTSF = 0x00000004,</div><div class='add'>+	EESR_PRE  = 0x00000002, EESR_CERF = 0x00000001,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_SUBTYPE_SH7763</div><div class='add'>+# define TX_CHECK (EESR_TC1 | EESR_FTC)</div><div class='add'>+# define EESR_ERR_CHECK	(EESR_TWB | EESR_TABT | EESR_RABT | EESR_RDE \</div><div class='add'>+		| EESR_RFRMER | EESR_TFE | EESR_TDE | EESR_ECI)</div><div class='add'>+# define TX_ERROR_CEHCK (EESR_TWB | EESR_TABT | EESR_TDE | EESR_TFE)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+# define TX_CHECK (EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_RTO)</div><div class='add'>+# define EESR_ERR_CHECK	(EESR_TWB | EESR_TABT | EESR_RABT | EESR_RDE \</div><div class='ctx'> 		| EESR_RFRMER | EESR_ADE | EESR_TFE | EESR_TDE | EESR_ECI)</div><div class='add'>+# define TX_ERROR_CEHCK (EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | EESR_TFE)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* EESIPR */</div><div class='ctx'> enum DMAC_IM_BIT {</div><div class='hunk'>@@ -207,8 +367,8 @@ enum DMAC_IM_BIT {</div><div class='ctx'> </div><div class='ctx'> /* Receive descriptor bit */</div><div class='ctx'> enum RD_STS_BIT {</div><div class='del'>-	RD_RACT = 0x80000000, RC_RDEL = 0x40000000,</div><div class='del'>-	RC_RFP1 = 0x20000000, RC_RFP0 = 0x10000000,</div><div class='add'>+	RD_RACT = 0x80000000, RD_RDEL = 0x40000000,</div><div class='add'>+	RD_RFP1 = 0x20000000, RD_RFP0 = 0x10000000,</div><div class='ctx'> 	RD_RFE = 0x08000000, RD_RFS10 = 0x00000200,</div><div class='ctx'> 	RD_RFS9 = 0x00000100, RD_RFS8 = 0x00000080,</div><div class='ctx'> 	RD_RFS7 = 0x00000040, RD_RFS6 = 0x00000020,</div><div class='hunk'>@@ -216,9 +376,9 @@ enum RD_STS_BIT {</div><div class='ctx'> 	RD_RFS3 = 0x00000004, RD_RFS2 = 0x00000002,</div><div class='ctx'> 	RD_RFS1 = 0x00000001,</div><div class='ctx'> };</div><div class='del'>-#define RDF1ST	RC_RFP1</div><div class='del'>-#define RDFEND	RC_RFP0</div><div class='del'>-#define RD_RFP	(RC_RFP1|RC_RFP0)</div><div class='add'>+#define RDF1ST	RD_RFP1</div><div class='add'>+#define RDFEND	RD_RFP0</div><div class='add'>+#define RD_RFP	(RD_RFP1|RD_RFP0)</div><div class='ctx'> </div><div class='ctx'> /* FCFTR */</div><div class='ctx'> enum FCFTR_BIT {</div><div class='hunk'>@@ -227,11 +387,16 @@ enum FCFTR_BIT {</div><div class='ctx'> 	FCFTR_RFD1 = 0x00000002, FCFTR_RFD0 = 0x00000001,</div><div class='ctx'> };</div><div class='ctx'> #define FIFO_F_D_RFF	(FCFTR_RFF2|FCFTR_RFF1|FCFTR_RFF0)</div><div class='add'>+#ifndef CONFIG_CPU_SUBTYPE_SH7619</div><div class='ctx'> #define FIFO_F_D_RFD	(FCFTR_RFD2|FCFTR_RFD1|FCFTR_RFD0)</div><div class='add'>+#else</div><div class='add'>+#define FIFO_F_D_RFD	(FCFTR_RFD0)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* Transfer descriptor bit */</div><div class='ctx'> enum TD_STS_BIT {</div><div class='del'>-	TD_TACT = 0x80000000, TD_TDLE = 0x40000000, TD_TFP1 = 0x20000000,</div><div class='add'>+	TD_TACT = 0x80000000,</div><div class='add'>+	TD_TDLE = 0x40000000, TD_TFP1 = 0x20000000,</div><div class='ctx'> 	TD_TFP0 = 0x10000000,</div><div class='ctx'> };</div><div class='ctx'> #define TDF1ST	TD_TFP1</div><div class='hunk'>@@ -242,6 +407,10 @@ enum TD_STS_BIT {</div><div class='ctx'> enum RECV_RST_BIT { RMCR_RST = 0x01, };</div><div class='ctx'> /* ECMR */</div><div class='ctx'> enum FELIC_MODE_BIT {</div><div class='add'>+#ifdef CONFIG_CPU_SUBTYPE_SH7763</div><div class='add'>+	ECMR_TRCCM = 0x04000000, ECMR_RCSC = 0x00800000,</div><div class='add'>+	ECMR_DPAD = 0x00200000, ECMR_RZPF = 0x00100000,</div><div class='add'>+#endif</div><div class='ctx'> 	ECMR_ZPF = 0x00080000, ECMR_PFR = 0x00040000, ECMR_RXF = 0x00020000,</div><div class='ctx'> 	ECMR_TXF = 0x00010000, ECMR_MCT = 0x00002000, ECMR_PRCEF = 0x00001000,</div><div class='ctx'> 	ECMR_PMDE = 0x00000200, ECMR_RE = 0x00000040, ECMR_TE = 0x00000020,</div><div class='hunk'>@@ -249,18 +418,47 @@ enum FELIC_MODE_BIT {</div><div class='ctx'> 	ECMR_PRM = 0x00000001,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CPU_SUBTYPE_SH7763</div><div class='add'>+#define ECMR_CHG_DM	(ECMR_TRCCM | ECMR_RZPF | ECMR_ZPF |\</div><div class='add'>+			ECMR_PFR | ECMR_RXF | ECMR_TXF | ECMR_MCT)</div><div class='add'>+#elif CONFIG_CPU_SUBTYPE_SH7619</div><div class='add'>+#define ECMR_CHG_DM	(ECMR_ZPF | ECMR_PFR | ECMR_RXF | ECMR_TXF)</div><div class='add'>+#else</div><div class='add'>+#define ECMR_CHG_DM	(ECMR_ZPF | ECMR_PFR | ECMR_RXF | ECMR_TXF | ECMR_MCT)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* ECSR */</div><div class='ctx'> enum ECSR_STATUS_BIT {</div><div class='del'>-	ECSR_BRCRX = 0x20, ECSR_PSRTO = 0x10, ECSR_LCHNG = 0x04,</div><div class='add'>+#ifndef CONFIG_CPU_SUBTYPE_SH7763</div><div class='add'>+	ECSR_BRCRX = 0x20, ECSR_PSRTO = 0x10,</div><div class='add'>+#endif</div><div class='add'>+	ECSR_LCHNG = 0x04,</div><div class='ctx'> 	ECSR_MPD = 0x02, ECSR_ICD = 0x01,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CPU_SUBTYPE_SH7763</div><div class='add'>+# define ECSR_INIT (ECSR_ICD | ECSIPR_MPDIP)</div><div class='add'>+#else</div><div class='add'>+# define ECSR_INIT (ECSR_BRCRX | ECSR_PSRTO | \</div><div class='add'>+			ECSR_LCHNG | ECSR_ICD | ECSIPR_MPDIP)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* ECSIPR */</div><div class='ctx'> enum ECSIPR_STATUS_MASK_BIT {</div><div class='del'>-	ECSIPR_BRCRXIP = 0x20, ECSIPR_PSRTOIP = 0x10, ECSIPR_LCHNGIP = 0x04,</div><div class='add'>+#ifndef CONFIG_CPU_SUBTYPE_SH7763</div><div class='add'>+	ECSIPR_BRCRXIP = 0x20, ECSIPR_PSRTOIP = 0x10,</div><div class='add'>+#endif</div><div class='add'>+	ECSIPR_LCHNGIP = 0x04,</div><div class='ctx'> 	ECSIPR_MPDIP = 0x02, ECSIPR_ICDIP = 0x01,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CPU_SUBTYPE_SH7763</div><div class='add'>+# define ECSIPR_INIT (ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP)</div><div class='add'>+#else</div><div class='add'>+# define ECSIPR_INIT (ECSIPR_BRCRXIP | ECSIPR_PSRTOIP | ECSIPR_LCHNGIP | \</div><div class='add'>+				ECSIPR_ICDIP | ECSIPR_MPDIP)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* APR */</div><div class='ctx'> enum APR_BIT {</div><div class='ctx'> 	APR_AP = 0x00000001,</div><div class='hunk'>@@ -285,9 +483,22 @@ enum RPADIR_BIT {</div><div class='ctx'> 	RPADIR_PADR = 0x0003f,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_CPU_SUBTYPE_SH7763)</div><div class='add'>+# define RPADIR_INIT (0x00)</div><div class='add'>+#else</div><div class='add'>+# define RPADIR_INIT (RPADIR_PADS1)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* RFLR */</div><div class='add'>+#define RFLR_VALUE 0x1000</div><div class='add'>+</div><div class='ctx'> /* FDR */</div><div class='ctx'> enum FIFO_SIZE_BIT {</div><div class='add'>+#ifndef CONFIG_CPU_SUBTYPE_SH7619</div><div class='ctx'> 	FIFO_SIZE_T = 0x00000700, FIFO_SIZE_R = 0x00000007,</div><div class='add'>+#else</div><div class='add'>+	FIFO_SIZE_T = 0x00000100, FIFO_SIZE_R = 0x00000001,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> enum phy_offsets {</div><div class='ctx'> 	PHY_CTRL = 0, PHY_STAT = 1, PHY_IDT1 = 2, PHY_IDT2 = 3,</div><div class='hunk'>@@ -316,7 +527,7 @@ enum PHY_ANA_BIT {</div><div class='ctx'> 	PHY_A_NP = 0x8000, PHY_A_ACK = 0x4000, PHY_A_RF = 0x2000,</div><div class='ctx'> 	PHY_A_FCS = 0x0400, PHY_A_T4 = 0x0200, PHY_A_FDX = 0x0100,</div><div class='ctx'> 	PHY_A_HDX = 0x0080, PHY_A_10FDX = 0x0040, PHY_A_10HDX = 0x0020,</div><div class='del'>-	PHY_A_SEL = 0x001f,</div><div class='add'>+	PHY_A_SEL = 0x001e,</div><div class='ctx'> };</div><div class='ctx'> /* PHY_ANL */</div><div class='ctx'> enum PHY_ANL_BIT {</div><div class='hunk'>@@ -403,7 +614,7 @@ struct sh_eth_txdesc {</div><div class='ctx'> #endif</div><div class='ctx'> 	u32 addr;		/* TD2 */</div><div class='ctx'> 	u32 pad1;		/* padding data */</div><div class='del'>-};</div><div class='add'>+} __attribute__((aligned(2), packed));</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The sh ether Rx buffer descriptors.</div><div class='hunk'>@@ -420,7 +631,7 @@ struct sh_eth_rxdesc {</div><div class='ctx'> #endif</div><div class='ctx'> 	u32 addr;		/* RD2 */</div><div class='ctx'> 	u32 pad0;		/* padding data */</div><div class='del'>-};</div><div class='add'>+} __attribute__((aligned(2), packed));</div><div class='ctx'> </div><div class='ctx'> struct sh_eth_private {</div><div class='ctx'> 	dma_addr_t rx_desc_dma;</div><div class='hunk'>@@ -435,6 +646,7 @@ struct sh_eth_private {</div><div class='ctx'> 	u32 cur_rx, dirty_rx;	/* Producer/consumer ring indices */</div><div class='ctx'> 	u32 cur_tx, dirty_tx;</div><div class='ctx'> 	u32 rx_buf_sz;		/* Based on MTU+slack. */</div><div class='add'>+	int edmac_endian;</div><div class='ctx'> 	/* MII transceiver section. */</div><div class='ctx'> 	u32 phy_id;					/* PHY ID */</div><div class='ctx'> 	struct mii_bus *mii_bus;	/* MDIO bus control */</div><div class='hunk'>@@ -449,6 +661,10 @@ struct sh_eth_private {</div><div class='ctx'> 	struct net_device_stats tsu_stats;	/* TSU forward status */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CPU_SUBTYPE_SH7763</div><div class='add'>+/* SH7763 has endian control register */</div><div class='add'>+#define swaps(x, y)</div><div class='add'>+#else</div><div class='ctx'> static void swaps(char *src, int len)</div><div class='ctx'> {</div><div class='ctx'> #ifdef __LITTLE_ENDIAN__</div><div class='hunk'>@@ -460,5 +676,5 @@ static void swaps(char *src, int len)</div><div class='ctx'> 		*p = swab32(*p);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+#endif /* CONFIG_CPU_SUBTYPE_SH7763 */</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/skfp/ess.c b/drivers/net/skfp/ess.c<br/>index 889f98724610..a85efcfd9d0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/skfp/ess.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/skfp/ess.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/skfp/ess.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/skfp/ess.c</a></div><div class='hunk'>@@ -510,7 +510,7 @@ static void ess_send_response(struct s_smc *smc, struct smt_header *sm,</div><div class='ctx'> 	chg-&gt;path.para.p_type = SMT_P320B ;</div><div class='ctx'> 	chg-&gt;path.para.p_len = sizeof(struct smt_p_320b) - PARA_LEN ;</div><div class='ctx'> 	chg-&gt;path.mib_index = SBAPATHINDEX ;</div><div class='del'>-	chg-&gt;path.path_pad = (u_short)NULL ;</div><div class='add'>+	chg-&gt;path.path_pad = 0;</div><div class='ctx'> 	chg-&gt;path.path_index = PRIMARY_RING ;</div><div class='ctx'> </div><div class='ctx'> 	/* set P320F */</div><div class='hunk'>@@ -606,7 +606,7 @@ static void ess_send_alc_req(struct s_smc *smc)</div><div class='ctx'> 	req-&gt;path.para.p_type = SMT_P320B ;</div><div class='ctx'> 	req-&gt;path.para.p_len = sizeof(struct smt_p_320b) - PARA_LEN ;</div><div class='ctx'> 	req-&gt;path.mib_index = SBAPATHINDEX ;</div><div class='del'>-	req-&gt;path.path_pad = (u_short)NULL ;</div><div class='add'>+	req-&gt;path.path_pad = 0;</div><div class='ctx'> 	req-&gt;path.path_index = PRIMARY_RING ;</div><div class='ctx'> </div><div class='ctx'> 	/* set P0017 */</div><div class='hunk'>@@ -636,7 +636,7 @@ static void ess_send_alc_req(struct s_smc *smc)</div><div class='ctx'> 	/* set P19 */</div><div class='ctx'> 	req-&gt;a_addr.para.p_type = SMT_P0019 ;</div><div class='ctx'> 	req-&gt;a_addr.para.p_len = sizeof(struct smt_p_0019) - PARA_LEN ;</div><div class='del'>-	req-&gt;a_addr.sba_pad = (u_short)NULL ;</div><div class='add'>+	req-&gt;a_addr.sba_pad = 0;</div><div class='ctx'> 	req-&gt;a_addr.alloc_addr = null_addr ;</div><div class='ctx'> </div><div class='ctx'> 	/* set P1A */</div><div class='head'>diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c<br/>index ffbfb1b79f97..805383b33d3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/skfp/smt.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/skfp/smt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/skfp/smt.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/skfp/smt.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include "h/smc.h"</div><div class='ctx'> #include "h/smt_p.h"</div><div class='ctx'> #include &lt;linux/bitrev.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define KERNEL</div><div class='ctx'> #include "h/smtstate.h"</div><div class='hunk'>@@ -1730,20 +1731,18 @@ void fddi_send_antc(struct s_smc *smc, struct fddi_addr *dest)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef	DEBUG</div><div class='del'>-#define hextoasc(x)	"0123456789abcdef"[x]</div><div class='del'>-</div><div class='ctx'> char *addr_to_string(struct fddi_addr *addr)</div><div class='ctx'> {</div><div class='ctx'> 	int	i ;</div><div class='ctx'> 	static char	string[6*3] = "****" ;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0 ; i &lt; 6 ; i++) {</div><div class='del'>-		string[i*3] = hextoasc((addr-&gt;a[i]&gt;&gt;4)&amp;0xf) ;</div><div class='del'>-		string[i*3+1] = hextoasc((addr-&gt;a[i])&amp;0xf) ;</div><div class='del'>-		string[i*3+2] = ':' ;</div><div class='add'>+		string[i * 3] = hex_asc_hi(addr-&gt;a[i]);</div><div class='add'>+		string[i * 3 + 1] = hex_asc_lo(addr-&gt;a[i]);</div><div class='add'>+		string[i * 3 + 2] = ':';</div><div class='ctx'> 	}</div><div class='del'>-	string[5*3+2] = 0 ;</div><div class='del'>-	return(string) ;</div><div class='add'>+	string[5 * 3 + 2] = 0;</div><div class='add'>+	return(string);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c<br/>index 5257cf464f1a..e24b25ca1c69 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sky2.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/sky2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sky2.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/sky2.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='hunk'>@@ -275,86 +274,6 @@ static void sky2_power_aux(struct sky2_hw *hw)</div><div class='ctx'> 			     PC_VAUX_ON | PC_VCC_OFF));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sky2_power_state(struct sky2_hw *hw, pci_power_t state)</div><div class='del'>-{</div><div class='del'>-	u16 power_control = sky2_pci_read16(hw, hw-&gt;pm_cap + PCI_PM_CTRL);</div><div class='del'>-	int pex = pci_find_capability(hw-&gt;pdev, PCI_CAP_ID_EXP);</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);</div><div class='del'>-</div><div class='del'>-	switch (state) {</div><div class='del'>-	case PCI_D0:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PCI_D1:</div><div class='del'>-		power_control |= 1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PCI_D2:</div><div class='del'>-		power_control |= 2;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PCI_D3hot:</div><div class='del'>-	case PCI_D3cold:</div><div class='del'>-		power_control |= 3;</div><div class='del'>-		if (hw-&gt;flags &amp; SKY2_HW_ADV_POWER_CTL) {</div><div class='del'>-			/* additional power saving measurements */</div><div class='del'>-			reg = sky2_pci_read32(hw, PCI_DEV_REG4);</div><div class='del'>-</div><div class='del'>-			/* set gating core clock for LTSSM in L1 state */</div><div class='del'>-			reg |= P_PEX_LTSSM_STAT(P_PEX_LTSSM_L1_STAT) |</div><div class='del'>-				/* auto clock gated scheme controlled by CLKREQ */</div><div class='del'>-				P_ASPM_A1_MODE_SELECT |</div><div class='del'>-				/* enable Gate Root Core Clock */</div><div class='del'>-				P_CLK_GATE_ROOT_COR_ENA;</div><div class='del'>-</div><div class='del'>-			if (pex &amp;&amp; (hw-&gt;flags &amp; SKY2_HW_CLK_POWER)) {</div><div class='del'>-				/* enable Clock Power Management (CLKREQ) */</div><div class='del'>-				u16 ctrl = sky2_pci_read16(hw, pex + PCI_EXP_DEVCTL);</div><div class='del'>-</div><div class='del'>-				ctrl |= PCI_EXP_DEVCTL_AUX_PME;</div><div class='del'>-				sky2_pci_write16(hw, pex + PCI_EXP_DEVCTL, ctrl);</div><div class='del'>-			} else</div><div class='del'>-				/* force CLKREQ Enable in Our4 (A1b only) */</div><div class='del'>-				reg |= P_ASPM_FORCE_CLKREQ_ENA;</div><div class='del'>-</div><div class='del'>-			/* set Mask Register for Release/Gate Clock */</div><div class='del'>-			sky2_pci_write32(hw, PCI_DEV_REG5,</div><div class='del'>-					 P_REL_PCIE_EXIT_L1_ST | P_GAT_PCIE_ENTER_L1_ST |</div><div class='del'>-					 P_REL_PCIE_RX_EX_IDLE | P_GAT_PCIE_RX_EL_IDLE |</div><div class='del'>-					 P_REL_GPHY_LINK_UP | P_GAT_GPHY_LINK_DOWN);</div><div class='del'>-		} else</div><div class='del'>-			sky2_write8(hw, B28_Y2_ASF_STAT_CMD, Y2_ASF_CLK_HALT);</div><div class='del'>-</div><div class='del'>-		/* put CPU into reset state */</div><div class='del'>-		sky2_write8(hw,  B28_Y2_ASF_STAT_CMD, HCU_CCSR_ASF_RESET);</div><div class='del'>-		if (hw-&gt;chip_id == CHIP_ID_YUKON_SUPR &amp;&amp; hw-&gt;chip_rev == CHIP_REV_YU_SU_A0)</div><div class='del'>-			/* put CPU into halt state */</div><div class='del'>-			sky2_write8(hw, B28_Y2_ASF_STAT_CMD, HCU_CCSR_ASF_HALTED);</div><div class='del'>-</div><div class='del'>-		if (pex &amp;&amp; !(hw-&gt;flags &amp; SKY2_HW_RAM_BUFFER)) {</div><div class='del'>-			reg = sky2_pci_read32(hw, PCI_DEV_REG1);</div><div class='del'>-			/* force to PCIe L1 */</div><div class='del'>-			reg |= PCI_FORCE_PEX_L1;</div><div class='del'>-			sky2_pci_write32(hw, PCI_DEV_REG1, reg);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		dev_warn(&amp;hw-&gt;pdev-&gt;dev, PFX "Invalid power state (%d) ",</div><div class='del'>-		       state);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	power_control |= PCI_PM_CTRL_PME_ENABLE;</div><div class='del'>-	/* Finally, set the new power state. */</div><div class='del'>-	sky2_pci_write32(hw, hw-&gt;pm_cap + PCI_PM_CTRL, power_control);</div><div class='del'>-</div><div class='del'>-	sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);</div><div class='del'>-	sky2_pci_read32(hw, B0_CTST);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sky2_gmac_reset(struct sky2_hw *hw, unsigned port)</div><div class='ctx'> {</div><div class='ctx'> 	u16 reg;</div><div class='hunk'>@@ -709,6 +628,11 @@ static void sky2_phy_power_up(struct sky2_hw *hw, unsigned port)</div><div class='ctx'> 	sky2_pci_write32(hw, PCI_DEV_REG1, reg1);</div><div class='ctx'> 	sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);</div><div class='ctx'> 	sky2_pci_read32(hw, PCI_DEV_REG1);</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;chip_id == CHIP_ID_YUKON_FE)</div><div class='add'>+		gm_phy_write(hw, port, PHY_MARV_CTRL, PHY_CT_ANE);</div><div class='add'>+	else if (hw-&gt;flags &amp; SKY2_HW_ADV_POWER_CTL)</div><div class='add'>+		sky2_write8(hw, SK_REG(port, GPHY_CTRL), GPC_RST_CLR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sky2_phy_power_down(struct sky2_hw *hw, unsigned port)</div><div class='hunk'>@@ -741,11 +665,16 @@ static void sky2_phy_power_down(struct sky2_hw *hw, unsigned port)</div><div class='ctx'> </div><div class='ctx'> 	if (hw-&gt;chip_id != CHIP_ID_YUKON_EC) {</div><div class='ctx'> 		if (hw-&gt;chip_id == CHIP_ID_YUKON_EC_U) {</div><div class='del'>-			ctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL);</div><div class='add'>+			/* select page 2 to access MAC control register */</div><div class='add'>+			gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 2);</div><div class='ctx'> </div><div class='add'>+			ctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL);</div><div class='ctx'> 			/* enable Power Down */</div><div class='ctx'> 			ctrl |= PHY_M_PC_POW_D_ENA;</div><div class='ctx'> 			gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, ctrl);</div><div class='add'>+</div><div class='add'>+			/* set page register back to 0 */</div><div class='add'>+			gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 0);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* set IEEE compatible Power Down Mode (dev. #4.99) */</div><div class='hunk'>@@ -2855,10 +2784,6 @@ static int __devinit sky2_init(struct sky2_hw *hw)</div><div class='ctx'> 		hw-&gt;flags = SKY2_HW_GIGABIT</div><div class='ctx'> 			| SKY2_HW_NEWER_PHY</div><div class='ctx'> 			| SKY2_HW_ADV_POWER_CTL;</div><div class='del'>-</div><div class='del'>-		/* check for Rev. A1 dev 4200 */</div><div class='del'>-		if (sky2_read16(hw, Q_ADDR(Q_XA1, Q_WM)) == 0)</div><div class='del'>-			hw-&gt;flags |= SKY2_HW_CLK_POWER;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CHIP_ID_YUKON_EX:</div><div class='hunk'>@@ -2914,12 +2839,6 @@ static int __devinit sky2_init(struct sky2_hw *hw)</div><div class='ctx'> 	if (hw-&gt;pmd_type == 'L' || hw-&gt;pmd_type == 'S' || hw-&gt;pmd_type == 'P')</div><div class='ctx'> 		hw-&gt;flags |= SKY2_HW_FIBRE_PHY;</div><div class='ctx'> </div><div class='del'>-	hw-&gt;pm_cap = pci_find_capability(hw-&gt;pdev, PCI_CAP_ID_PM);</div><div class='del'>-	if (hw-&gt;pm_cap == 0) {</div><div class='del'>-		dev_err(&amp;hw-&gt;pdev-&gt;dev, "cannot find PowerManagement capability\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	hw-&gt;ports = 1;</div><div class='ctx'> 	t8 = sky2_read8(hw, B2_Y2_HW_RES);</div><div class='ctx'> 	if ((t8 &amp; CFG_DUAL_MAC_MSK) == CFG_DUAL_MAC_MSK) {</div><div class='hunk'>@@ -4512,7 +4431,7 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 	pci_save_state(pdev);</div><div class='ctx'> 	pci_enable_wake(pdev, pci_choose_state(pdev, state), wol);</div><div class='del'>-	sky2_power_state(hw, pci_choose_state(pdev, state));</div><div class='add'>+	pci_set_power_state(pdev, pci_choose_state(pdev, state));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4525,7 +4444,9 @@ static int sky2_resume(struct pci_dev *pdev)</div><div class='ctx'> 	if (!hw)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	sky2_power_state(hw, PCI_D0);</div><div class='add'>+	err = pci_set_power_state(pdev, PCI_D0);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = pci_restore_state(pdev);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -4595,7 +4516,7 @@ static void sky2_shutdown(struct pci_dev *pdev)</div><div class='ctx'> 	pci_enable_wake(pdev, PCI_D3cold, wol);</div><div class='ctx'> </div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='del'>-	sky2_power_state(hw, PCI_D3hot);</div><div class='add'>+	pci_set_power_state(pdev, PCI_D3hot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver sky2_driver = {</div><div class='head'>diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h<br/>index 4d9c4a19bb85..92fb24b27d45 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sky2.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/sky2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sky2.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/sky2.h</a></div><div class='hunk'>@@ -2072,9 +2072,7 @@ struct sky2_hw {</div><div class='ctx'> #define SKY2_HW_NEW_LE		0x00000020	/* new LSOv2 format */</div><div class='ctx'> #define SKY2_HW_AUTO_TX_SUM	0x00000040	/* new IP decode for Tx */</div><div class='ctx'> #define SKY2_HW_ADV_POWER_CTL	0x00000080	/* additional PHY power regs */</div><div class='del'>-#define SKY2_HW_CLK_POWER	0x00000100	/* clock power management */</div><div class='ctx'> </div><div class='del'>-	int		     pm_cap;</div><div class='ctx'> 	u8	     	     chip_id;</div><div class='ctx'> 	u8		     chip_rev;</div><div class='ctx'> 	u8		     pmd_type;</div><div class='head'>diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h<br/>index 76c17c28fab4..2abfc2845198 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/smc911x.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/smc911x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/smc911x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/smc911x.h</a></div><div class='hunk'>@@ -222,7 +222,7 @@ static inline void SMC_outsl(struct smc911x_local *lp, int reg,</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> static dma_addr_t rx_dmabuf, tx_dmabuf;</div><div class='ctx'> static int rx_dmalen, tx_dmalen;</div><div class='head'>diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c<br/>index 2040965d7724..24768c10cadb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/smc91x.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/smc91x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/smc91x.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/smc91x.c</a></div><div class='hunk'>@@ -2255,7 +2255,7 @@ static int smc_drv_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs");</div><div class='ctx'> 	if (!res)</div><div class='del'>-		platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	release_mem_region(res-&gt;start, SMC_IO_EXTENT);</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(ndev);</div><div class='head'>diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h<br/>index 22209b6f1405..997e7f1d5c6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/smc91x.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/smc91x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/smc91x.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/smc91x.h</a></div><div class='hunk'>@@ -187,7 +187,7 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg)</div><div class='ctx'> </div><div class='ctx'> #elif defined(CONFIG_SA1100_ASSABET)</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/neponset.h&gt;</div><div class='add'>+#include &lt;mach/neponset.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* We can only do 8-bit reads and writes in the static memory space. */</div><div class='ctx'> #define SMC_CAN_USE_8BIT	1</div><div class='hunk'>@@ -339,7 +339,7 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)</div><div class='ctx'>  * IOBARRIER on entry to their ISR.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/constants.h&gt;	/* IOBARRIER_VIRT */</div><div class='add'>+#include &lt;mach/constants.h&gt;	/* IOBARRIER_VIRT */</div><div class='ctx'> </div><div class='ctx'> #define SMC_CAN_USE_8BIT	0</div><div class='ctx'> #define SMC_CAN_USE_16BIT	1</div><div class='hunk'>@@ -525,7 +525,7 @@ struct smc_local {</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;mach/pxa-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef SMC_insl</div><div class='ctx'> #undef SMC_insl</div><div class='head'>diff --git a/drivers/net/stnic.c b/drivers/net/stnic.c<br/>index b65be5d70fec..2ed0bd596815 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/stnic.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/stnic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/stnic.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/stnic.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/se.h&gt;</div><div class='add'>+#include &lt;mach-se/mach/se.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> #ifdef CONFIG_SH_STANDARD_BIOS</div><div class='ctx'> #include &lt;asm/sh_bios.h&gt;</div><div class='head'>diff --git a/drivers/net/sun3_82586.c b/drivers/net/sun3_82586.c<br/>index 9b2a7f7bb258..e531302d95f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sun3_82586.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/sun3_82586.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sun3_82586.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/sun3_82586.c</a></div><div class='hunk'>@@ -425,14 +425,11 @@ static int init586(struct net_device *dev)</div><div class='ctx'> 		int len = ((char *) p-&gt;iscp - (char *) ptr - 8) / 6;</div><div class='ctx'> 		if(num_addrs &gt; len)	{</div><div class='ctx'> 			printk("%s: switching to promisc. mode\n",dev-&gt;name);</div><div class='del'>-			dev-&gt;flags|=IFF_PROMISC;</div><div class='add'>+			cfg_cmd-&gt;promisc = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if(dev-&gt;flags&amp;IFF_PROMISC)</div><div class='del'>-	{</div><div class='del'>-			 cfg_cmd-&gt;promisc=1;</div><div class='del'>-			 dev-&gt;flags|=IFF_PROMISC;</div><div class='del'>-	}</div><div class='add'>+		cfg_cmd-&gt;promisc = 1;</div><div class='ctx'> 	cfg_cmd-&gt;carr_coll	= 0x00;</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;scb-&gt;cbl_offset	= make16(cfg_cmd);</div><div class='head'>diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h<br/>index c66dfc9ec1ec..7db48f1cd949 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tehuti.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/tehuti.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tehuti.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/tehuti.h</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='head'>diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c<br/>index 633c128a6228..71d2c5cfdad9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tg3.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/tg3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tg3.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/tg3.c</a></div><div class='hunk'>@@ -66,8 +66,8 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_MODULE_NAME		"tg3"</div><div class='ctx'> #define PFX DRV_MODULE_NAME	": "</div><div class='del'>-#define DRV_MODULE_VERSION	"3.93"</div><div class='del'>-#define DRV_MODULE_RELDATE	"May 22, 2008"</div><div class='add'>+#define DRV_MODULE_VERSION	"3.94"</div><div class='add'>+#define DRV_MODULE_RELDATE	"August 14, 2008"</div><div class='ctx'> </div><div class='ctx'> #define TG3_DEF_MAC_MODE	0</div><div class='ctx'> #define TG3_DEF_RX_MODE		0</div><div class='hunk'>@@ -536,6 +536,7 @@ static int tg3_ape_lock(struct tg3 *tp, int locknum)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (locknum) {</div><div class='add'>+		case TG3_APE_LOCK_GRC:</div><div class='ctx'> 		case TG3_APE_LOCK_MEM:</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -573,6 +574,7 @@ static void tg3_ape_unlock(struct tg3 *tp, int locknum)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	switch (locknum) {</div><div class='add'>+		case TG3_APE_LOCK_GRC:</div><div class='ctx'> 		case TG3_APE_LOCK_MEM:</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -1018,15 +1020,43 @@ static void tg3_mdio_fini(struct tg3 *tp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* tp-&gt;lock is held. */</div><div class='add'>+static inline void tg3_generate_fw_event(struct tg3 *tp)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = tr32(GRC_RX_CPU_EVENT);</div><div class='add'>+	val |= GRC_RX_CPU_DRIVER_EVENT;</div><div class='add'>+	tw32_f(GRC_RX_CPU_EVENT, val);</div><div class='add'>+</div><div class='add'>+	tp-&gt;last_event_jiffies = jiffies;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define TG3_FW_EVENT_TIMEOUT_USEC 2500</div><div class='add'>+</div><div class='add'>+/* tp-&gt;lock is held. */</div><div class='ctx'> static void tg3_wait_for_event_ack(struct tg3 *tp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='add'>+	unsigned int delay_cnt;</div><div class='add'>+	long time_remain;</div><div class='add'>+</div><div class='add'>+	/* If enough time has passed, no wait is necessary. */</div><div class='add'>+	time_remain = (long)(tp-&gt;last_event_jiffies + 1 +</div><div class='add'>+		      usecs_to_jiffies(TG3_FW_EVENT_TIMEOUT_USEC)) -</div><div class='add'>+		      (long)jiffies;</div><div class='add'>+	if (time_remain &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Check if we can shorten the wait time. */</div><div class='add'>+	delay_cnt = jiffies_to_usecs(time_remain);</div><div class='add'>+	if (delay_cnt &gt; TG3_FW_EVENT_TIMEOUT_USEC)</div><div class='add'>+		delay_cnt = TG3_FW_EVENT_TIMEOUT_USEC;</div><div class='add'>+	delay_cnt = (delay_cnt &gt;&gt; 3) + 1;</div><div class='ctx'> </div><div class='del'>-	/* Wait for up to 2.5 milliseconds */</div><div class='del'>-	for (i = 0; i &lt; 250000; i++) {</div><div class='add'>+	for (i = 0; i &lt; delay_cnt; i++) {</div><div class='ctx'> 		if (!(tr32(GRC_RX_CPU_EVENT) &amp; GRC_RX_CPU_DRIVER_EVENT))</div><div class='ctx'> 			break;</div><div class='del'>-		udelay(10);</div><div class='add'>+		udelay(8);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1075,9 +1105,7 @@ static void tg3_ump_link_report(struct tg3 *tp)</div><div class='ctx'> 		val = 0;</div><div class='ctx'> 	tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX + 12, val);</div><div class='ctx'> </div><div class='del'>-	val = tr32(GRC_RX_CPU_EVENT);</div><div class='del'>-	val |= GRC_RX_CPU_DRIVER_EVENT;</div><div class='del'>-	tw32_f(GRC_RX_CPU_EVENT, val);</div><div class='add'>+	tg3_generate_fw_event(tp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tg3_link_report(struct tg3 *tp)</div><div class='hunk'>@@ -1982,8 +2010,6 @@ static void tg3_power_down_phy(struct tg3 *tp)</div><div class='ctx'> static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)</div><div class='ctx'> {</div><div class='ctx'> 	u32 misc_host_ctrl;</div><div class='del'>-	u16 power_control, power_caps;</div><div class='del'>-	int pm = tp-&gt;pm_cap;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure register accesses (indirect or otherwise)</div><div class='ctx'> 	 * will function correctly.</div><div class='hunk'>@@ -1992,18 +2018,10 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)</div><div class='ctx'> 			       TG3PCI_MISC_HOST_CTRL,</div><div class='ctx'> 			       tp-&gt;misc_host_ctrl);</div><div class='ctx'> </div><div class='del'>-	pci_read_config_word(tp-&gt;pdev,</div><div class='del'>-			     pm + PCI_PM_CTRL,</div><div class='del'>-			     &amp;power_control);</div><div class='del'>-	power_control |= PCI_PM_CTRL_PME_STATUS;</div><div class='del'>-	power_control &amp;= ~(PCI_PM_CTRL_STATE_MASK);</div><div class='ctx'> 	switch (state) {</div><div class='ctx'> 	case PCI_D0:</div><div class='del'>-		power_control |= 0;</div><div class='del'>-		pci_write_config_word(tp-&gt;pdev,</div><div class='del'>-				      pm + PCI_PM_CTRL,</div><div class='del'>-				      power_control);</div><div class='del'>-		udelay(100);	/* Delay after power state change */</div><div class='add'>+		pci_enable_wake(tp-&gt;pdev, state, false);</div><div class='add'>+		pci_set_power_state(tp-&gt;pdev, PCI_D0);</div><div class='ctx'> </div><div class='ctx'> 		/* Switch out of Vaux if it is a NIC */</div><div class='ctx'> 		if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_IS_NIC)</div><div class='hunk'>@@ -2012,26 +2030,15 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case PCI_D1:</div><div class='del'>-		power_control |= 1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case PCI_D2:</div><div class='del'>-		power_control |= 2;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case PCI_D3hot:</div><div class='del'>-		power_control |= 3;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_WARNING PFX "%s: Invalid power state (%d) "</div><div class='del'>-		       "requested.\n",</div><div class='del'>-		       tp-&gt;dev-&gt;name, state);</div><div class='add'>+		printk(KERN_ERR PFX "%s: Invalid power state (D%d) requested\n",</div><div class='add'>+			tp-&gt;dev-&gt;name, state);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	power_control |= PCI_PM_CTRL_PME_ENABLE;</div><div class='del'>-</div><div class='ctx'> 	misc_host_ctrl = tr32(TG3PCI_MISC_HOST_CTRL);</div><div class='ctx'> 	tw32(TG3PCI_MISC_HOST_CTRL,</div><div class='ctx'> 	     misc_host_ctrl | MISC_HOST_CTRL_MASK_PCI_INT);</div><div class='hunk'>@@ -2109,8 +2116,6 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)</div><div class='ctx'> 						     WOL_DRV_WOL |</div><div class='ctx'> 						     WOL_SET_MAGIC_PKT);</div><div class='ctx'> </div><div class='del'>-	pci_read_config_word(tp-&gt;pdev, pm + PCI_PM_PMC, &amp;power_caps);</div><div class='del'>-</div><div class='ctx'> 	if (tp-&gt;tg3_flags &amp; TG3_FLAG_WOL_ENABLE) {</div><div class='ctx'> 		u32 mac_mode;</div><div class='ctx'> </div><div class='hunk'>@@ -2143,10 +2148,17 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)</div><div class='ctx'> 		if (!(tp-&gt;tg3_flags2 &amp; TG3_FLG2_5750_PLUS))</div><div class='ctx'> 			tw32(MAC_LED_CTRL, tp-&gt;led_ctrl);</div><div class='ctx'> </div><div class='del'>-		if (((power_caps &amp; PCI_PM_CAP_PME_D3cold) &amp;&amp;</div><div class='del'>-		     (tp-&gt;tg3_flags &amp; TG3_FLAG_WOL_ENABLE)))</div><div class='add'>+		if (pci_pme_capable(tp-&gt;pdev, state) &amp;&amp;</div><div class='add'>+		     (tp-&gt;tg3_flags &amp; TG3_FLAG_WOL_ENABLE))</div><div class='ctx'> 			mac_mode |= MAC_MODE_MAGIC_PKT_ENABLE;</div><div class='ctx'> </div><div class='add'>+		if (tp-&gt;tg3_flags3 &amp; TG3_FLG3_ENABLE_APE) {</div><div class='add'>+			mac_mode |= tp-&gt;mac_mode &amp;</div><div class='add'>+				    (MAC_MODE_APE_TX_EN | MAC_MODE_APE_RX_EN);</div><div class='add'>+			if (mac_mode &amp; MAC_MODE_APE_TX_EN)</div><div class='add'>+				mac_mode |= MAC_MODE_TDE_ENABLE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		tw32_f(MAC_MODE, mac_mode);</div><div class='ctx'> 		udelay(100);</div><div class='ctx'> </div><div class='hunk'>@@ -2236,9 +2248,11 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)</div><div class='ctx'> </div><div class='ctx'> 	tg3_write_sig_post_reset(tp, RESET_KIND_SHUTDOWN);</div><div class='ctx'> </div><div class='add'>+	if (tp-&gt;tg3_flags &amp; TG3_FLAG_WOL_ENABLE)</div><div class='add'>+		pci_enable_wake(tp-&gt;pdev, state, true);</div><div class='add'>+</div><div class='ctx'> 	/* Finally, set the new power state. */</div><div class='del'>-	pci_write_config_word(tp-&gt;pdev, pm + PCI_PM_CTRL, power_control);</div><div class='del'>-	udelay(100);	/* Delay after power state change */</div><div class='add'>+	pci_set_power_state(tp-&gt;pdev, state);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -5514,7 +5528,7 @@ static void tg3_ape_send_event(struct tg3 *tp, u32 event)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	apedata = tg3_ape_read32(tp, TG3_APE_FW_STATUS);</div><div class='del'>-	if (apedata != APE_FW_STATUS_READY)</div><div class='add'>+	if (!(apedata &amp; APE_FW_STATUS_READY))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for up to 1 millisecond for APE to service previous event. */</div><div class='hunk'>@@ -5781,6 +5795,8 @@ static int tg3_chip_reset(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> 	tg3_mdio_stop(tp);</div><div class='ctx'> </div><div class='add'>+	tg3_ape_lock(tp, TG3_APE_LOCK_GRC);</div><div class='add'>+</div><div class='ctx'> 	/* No matching tg3_nvram_unlock() after this because</div><div class='ctx'> 	 * chip reset below will undo the nvram lock.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -5929,12 +5945,19 @@ static int tg3_chip_reset(struct tg3 *tp)</div><div class='ctx'> 	} else if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_MII_SERDES) {</div><div class='ctx'> 		tp-&gt;mac_mode = MAC_MODE_PORT_MODE_GMII;</div><div class='ctx'> 		tw32_f(MAC_MODE, tp-&gt;mac_mode);</div><div class='add'>+	} else if (tp-&gt;tg3_flags3 &amp; TG3_FLG3_ENABLE_APE) {</div><div class='add'>+		tp-&gt;mac_mode &amp;= (MAC_MODE_APE_TX_EN | MAC_MODE_APE_RX_EN);</div><div class='add'>+		if (tp-&gt;mac_mode &amp; MAC_MODE_APE_TX_EN)</div><div class='add'>+			tp-&gt;mac_mode |= MAC_MODE_TDE_ENABLE;</div><div class='add'>+		tw32_f(MAC_MODE, tp-&gt;mac_mode);</div><div class='ctx'> 	} else</div><div class='ctx'> 		tw32_f(MAC_MODE, 0);</div><div class='ctx'> 	udelay(40);</div><div class='ctx'> </div><div class='ctx'> 	tg3_mdio_start(tp);</div><div class='ctx'> </div><div class='add'>+	tg3_ape_unlock(tp, TG3_APE_LOCK_GRC);</div><div class='add'>+</div><div class='ctx'> 	err = tg3_poll_fw(tp);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -5956,6 +5979,7 @@ static int tg3_chip_reset(struct tg3 *tp)</div><div class='ctx'> 		tg3_read_mem(tp, NIC_SRAM_DATA_CFG, &amp;nic_cfg);</div><div class='ctx'> 		if (nic_cfg &amp; NIC_SRAM_DATA_CFG_ASF_ENABLE) {</div><div class='ctx'> 			tp-&gt;tg3_flags |= TG3_FLAG_ENABLE_ASF;</div><div class='add'>+			tp-&gt;last_event_jiffies = jiffies;</div><div class='ctx'> 			if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_5750_PLUS)</div><div class='ctx'> 				tp-&gt;tg3_flags2 |= TG3_FLG2_ASF_NEW_HANDSHAKE;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -5969,15 +5993,12 @@ static void tg3_stop_fw(struct tg3 *tp)</div><div class='ctx'> {</div><div class='ctx'> 	if ((tp-&gt;tg3_flags &amp; TG3_FLAG_ENABLE_ASF) &amp;&amp;</div><div class='ctx'> 	   !(tp-&gt;tg3_flags3 &amp; TG3_FLG3_ENABLE_APE)) {</div><div class='del'>-		u32 val;</div><div class='del'>-</div><div class='ctx'> 		/* Wait for RX cpu to ACK the previous event. */</div><div class='ctx'> 		tg3_wait_for_event_ack(tp);</div><div class='ctx'> </div><div class='ctx'> 		tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX, FWCMD_NICDRV_PAUSE_FW);</div><div class='del'>-		val = tr32(GRC_RX_CPU_EVENT);</div><div class='del'>-		val |= GRC_RX_CPU_DRIVER_EVENT;</div><div class='del'>-		tw32(GRC_RX_CPU_EVENT, val);</div><div class='add'>+</div><div class='add'>+		tg3_generate_fw_event(tp);</div><div class='ctx'> </div><div class='ctx'> 		/* Wait for RX cpu to ACK this event. */</div><div class='ctx'> 		tg3_wait_for_event_ack(tp);</div><div class='hunk'>@@ -7427,7 +7448,11 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tp-&gt;mac_mode = MAC_MODE_TXSTAT_ENABLE | MAC_MODE_RXSTAT_ENABLE |</div><div class='add'>+	if (tp-&gt;tg3_flags3 &amp; TG3_FLG3_ENABLE_APE)</div><div class='add'>+		tp-&gt;mac_mode &amp;= MAC_MODE_APE_TX_EN | MAC_MODE_APE_RX_EN;</div><div class='add'>+	else</div><div class='add'>+		tp-&gt;mac_mode = 0;</div><div class='add'>+	tp-&gt;mac_mode |= MAC_MODE_TXSTAT_ENABLE | MAC_MODE_RXSTAT_ENABLE |</div><div class='ctx'> 		MAC_MODE_TDE_ENABLE | MAC_MODE_RDE_ENABLE | MAC_MODE_FHDE_ENABLE;</div><div class='ctx'> 	if (!(tp-&gt;tg3_flags2 &amp; TG3_FLG2_5705_PLUS) &amp;&amp;</div><div class='ctx'> 	    !(tp-&gt;tg3_flags2 &amp; TG3_FLG2_PHY_SERDES) &amp;&amp;</div><div class='hunk'>@@ -7708,21 +7733,11 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)</div><div class='ctx'>  */</div><div class='ctx'> static int tg3_init_hw(struct tg3 *tp, int reset_phy)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* Force the chip into D0. */</div><div class='del'>-	err = tg3_set_power_state(tp, PCI_D0);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	tg3_switch_clocks(tp);</div><div class='ctx'> </div><div class='ctx'> 	tw32(TG3PCI_MEM_WIN_BASE_ADDR, 0);</div><div class='ctx'> </div><div class='del'>-	err = tg3_reset_hw(tp, reset_phy);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='add'>+	return tg3_reset_hw(tp, reset_phy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define TG3_STAT_ADD32(PSTAT, REG) \</div><div class='hunk'>@@ -7871,9 +7886,8 @@ static void tg3_timer(unsigned long __opaque)</div><div class='ctx'> 	 * resets.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!--tp-&gt;asf_counter) {</div><div class='del'>-		if (tp-&gt;tg3_flags &amp; TG3_FLAG_ENABLE_ASF) {</div><div class='del'>-			u32 val;</div><div class='del'>-</div><div class='add'>+		if ((tp-&gt;tg3_flags &amp; TG3_FLAG_ENABLE_ASF) &amp;&amp;</div><div class='add'>+		    !(tp-&gt;tg3_flags3 &amp; TG3_FLG3_ENABLE_APE)) {</div><div class='ctx'> 			tg3_wait_for_event_ack(tp);</div><div class='ctx'> </div><div class='ctx'> 			tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX,</div><div class='hunk'>@@ -7881,9 +7895,8 @@ static void tg3_timer(unsigned long __opaque)</div><div class='ctx'> 			tg3_write_mem(tp, NIC_SRAM_FW_CMD_LEN_MBOX, 4);</div><div class='ctx'> 			/* 5 seconds timeout */</div><div class='ctx'> 			tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX, 5);</div><div class='del'>-			val = tr32(GRC_RX_CPU_EVENT);</div><div class='del'>-			val |= GRC_RX_CPU_DRIVER_EVENT;</div><div class='del'>-			tw32_f(GRC_RX_CPU_EVENT, val);</div><div class='add'>+</div><div class='add'>+			tg3_generate_fw_event(tp);</div><div class='ctx'> 		}</div><div class='ctx'> 		tp-&gt;asf_counter = tp-&gt;asf_multiplier;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -8037,13 +8050,11 @@ static int tg3_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(tp-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	tg3_full_lock(tp, 0);</div><div class='del'>-</div><div class='ctx'> 	err = tg3_set_power_state(tp, PCI_D0);</div><div class='del'>-	if (err) {</div><div class='del'>-		tg3_full_unlock(tp);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	tg3_full_lock(tp, 0);</div><div class='ctx'> </div><div class='ctx'> 	tg3_disable_ints(tp);</div><div class='ctx'> 	tp-&gt;tg3_flags &amp;= ~TG3_FLAG_INIT_COMPLETE;</div><div class='hunk'>@@ -8455,6 +8466,11 @@ static inline unsigned long get_stat64(tg3_stat64_t *val)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u64 get_estat64(tg3_stat64_t *val)</div><div class='add'>+{</div><div class='add'>+       return ((u64)val-&gt;high &lt;&lt; 32) | ((u64)val-&gt;low);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static unsigned long calc_crc_errors(struct tg3 *tp)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3_hw_stats *hw_stats = tp-&gt;hw_stats;</div><div class='hunk'>@@ -8483,7 +8499,7 @@ static unsigned long calc_crc_errors(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> #define ESTAT_ADD(member) \</div><div class='ctx'> 	estats-&gt;member =	old_estats-&gt;member + \</div><div class='del'>-				get_stat64(&amp;hw_stats-&gt;member)</div><div class='add'>+				get_estat64(&amp;hw_stats-&gt;member)</div><div class='ctx'> </div><div class='ctx'> static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *tp)</div><div class='ctx'> {</div><div class='hunk'>@@ -9065,7 +9081,8 @@ static void tg3_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;tg3_flags &amp; TG3_FLAG_WOL_CAP)</div><div class='add'>+	if ((tp-&gt;tg3_flags &amp; TG3_FLAG_WOL_CAP) &amp;&amp;</div><div class='add'>+	    device_can_wakeup(&amp;tp-&gt;pdev-&gt;dev))</div><div class='ctx'> 		wol-&gt;supported = WAKE_MAGIC;</div><div class='ctx'> 	else</div><div class='ctx'> 		wol-&gt;supported = 0;</div><div class='hunk'>@@ -9078,18 +9095,22 @@ static void tg3_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> static int tg3_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='add'>+	struct device *dp = &amp;tp-&gt;pdev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	if (wol-&gt;wolopts &amp; ~WAKE_MAGIC)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if ((wol-&gt;wolopts &amp; WAKE_MAGIC) &amp;&amp;</div><div class='del'>-	    !(tp-&gt;tg3_flags &amp; TG3_FLAG_WOL_CAP))</div><div class='add'>+	    !((tp-&gt;tg3_flags &amp; TG3_FLAG_WOL_CAP) &amp;&amp; device_can_wakeup(dp)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;tp-&gt;lock);</div><div class='del'>-	if (wol-&gt;wolopts &amp; WAKE_MAGIC)</div><div class='add'>+	if (wol-&gt;wolopts &amp; WAKE_MAGIC) {</div><div class='ctx'> 		tp-&gt;tg3_flags |= TG3_FLAG_WOL_ENABLE;</div><div class='del'>-	else</div><div class='add'>+		device_set_wakeup_enable(dp, true);</div><div class='add'>+	} else {</div><div class='ctx'> 		tp-&gt;tg3_flags &amp;= ~TG3_FLAG_WOL_ENABLE;</div><div class='add'>+		device_set_wakeup_enable(dp, false);</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock_bh(&amp;tp-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -11296,7 +11317,8 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)</div><div class='ctx'> 		if (val &amp; VCPU_CFGSHDW_ASPM_DBNC)</div><div class='ctx'> 			tp-&gt;tg3_flags |= TG3_FLAG_ASPM_WORKAROUND;</div><div class='ctx'> 		if ((val &amp; VCPU_CFGSHDW_WOL_ENABLE) &amp;&amp;</div><div class='del'>-		    (val &amp; VCPU_CFGSHDW_WOL_MAGPKT))</div><div class='add'>+		    (val &amp; VCPU_CFGSHDW_WOL_MAGPKT) &amp;&amp;</div><div class='add'>+		    device_may_wakeup(&amp;tp-&gt;pdev-&gt;dev))</div><div class='ctx'> 			tp-&gt;tg3_flags |= TG3_FLAG_WOL_ENABLE;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -11426,8 +11448,9 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)</div><div class='ctx'> 		    !(nic_cfg &amp; NIC_SRAM_DATA_CFG_FIBER_WOL))</div><div class='ctx'> 			tp-&gt;tg3_flags &amp;= ~TG3_FLAG_WOL_CAP;</div><div class='ctx'> </div><div class='del'>-		if (tp-&gt;tg3_flags &amp; TG3_FLAG_WOL_CAP &amp;&amp;</div><div class='del'>-		    nic_cfg &amp; NIC_SRAM_DATA_CFG_WOL_ENABLE)</div><div class='add'>+		if ((tp-&gt;tg3_flags &amp; TG3_FLAG_WOL_CAP) &amp;&amp;</div><div class='add'>+		    (nic_cfg &amp; NIC_SRAM_DATA_CFG_WOL_ENABLE) &amp;&amp;</div><div class='add'>+		    device_may_wakeup(&amp;tp-&gt;pdev-&gt;dev))</div><div class='ctx'> 			tp-&gt;tg3_flags |= TG3_FLAG_WOL_ENABLE;</div><div class='ctx'> </div><div class='ctx'> 		if (cfg2 &amp; (1 &lt;&lt; 17))</div><div class='hunk'>@@ -12442,6 +12465,13 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)</div><div class='ctx'> 				       tp-&gt;misc_host_ctrl);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Preserve the APE MAC_MODE bits */</div><div class='add'>+	if (tp-&gt;tg3_flags3 &amp; TG3_FLG3_ENABLE_APE)</div><div class='add'>+		tp-&gt;mac_mode = tr32(MAC_MODE) |</div><div class='add'>+			       MAC_MODE_APE_TX_EN | MAC_MODE_APE_RX_EN;</div><div class='add'>+	else</div><div class='add'>+		tp-&gt;mac_mode = TG3_DEF_MAC_MODE;</div><div class='add'>+</div><div class='ctx'> 	/* these are limited to 10/100 only */</div><div class='ctx'> 	if ((GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5703 &amp;&amp;</div><div class='ctx'> 	     (grc_misc_cfg == 0x8000 || grc_misc_cfg == 0x4000)) ||</div><div class='hunk'>@@ -13301,7 +13331,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	tp-&gt;pdev = pdev;</div><div class='ctx'> 	tp-&gt;dev = dev;</div><div class='ctx'> 	tp-&gt;pm_cap = pm_cap;</div><div class='del'>-	tp-&gt;mac_mode = TG3_DEF_MAC_MODE;</div><div class='ctx'> 	tp-&gt;rx_mode = TG3_DEF_RX_MODE;</div><div class='ctx'> 	tp-&gt;tx_mode = TG3_DEF_TX_MODE;</div><div class='ctx'> </div><div class='hunk'>@@ -13613,6 +13642,7 @@ static int tg3_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='add'>+	pci_power_t target_state;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* PCI register 4 needs to be saved whether netif_running() or not.</div><div class='hunk'>@@ -13641,7 +13671,9 @@ static int tg3_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	tp-&gt;tg3_flags &amp;= ~TG3_FLAG_INIT_COMPLETE;</div><div class='ctx'> 	tg3_full_unlock(tp);</div><div class='ctx'> </div><div class='del'>-	err = tg3_set_power_state(tp, pci_choose_state(pdev, state));</div><div class='add'>+	target_state = pdev-&gt;pm_cap ? pci_target_state(pdev) : PCI_D3hot;</div><div class='add'>+</div><div class='add'>+	err = tg3_set_power_state(tp, target_state);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		int err2;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h<br/>index df07842172b7..f5b8cab8d4b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tg3.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/tg3.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tg3.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/tg3.h</a></div><div class='hunk'>@@ -325,6 +325,8 @@</div><div class='ctx'> #define  MAC_MODE_TDE_ENABLE		 0x00200000</div><div class='ctx'> #define  MAC_MODE_RDE_ENABLE		 0x00400000</div><div class='ctx'> #define  MAC_MODE_FHDE_ENABLE		 0x00800000</div><div class='add'>+#define  MAC_MODE_APE_RX_EN		 0x08000000</div><div class='add'>+#define  MAC_MODE_APE_TX_EN		 0x10000000</div><div class='ctx'> #define MAC_STATUS			0x00000404</div><div class='ctx'> #define  MAC_STATUS_PCS_SYNCED		 0x00000001</div><div class='ctx'> #define  MAC_STATUS_SIGNAL_DET		 0x00000002</div><div class='hunk'>@@ -1889,6 +1891,7 @@</div><div class='ctx'> #define  APE_EVENT_STATUS_EVENT_PENDING	 0x80000000</div><div class='ctx'> </div><div class='ctx'> /* APE convenience enumerations. */</div><div class='add'>+#define TG3_APE_LOCK_GRC                1</div><div class='ctx'> #define TG3_APE_LOCK_MEM                4</div><div class='ctx'> </div><div class='ctx'> #define TG3_EEPROM_SB_F1R2_MBA_OFF	0x10</div><div class='hunk'>@@ -2429,7 +2432,10 @@ struct tg3 {</div><div class='ctx'> 	struct tg3_ethtool_stats	estats;</div><div class='ctx'> 	struct tg3_ethtool_stats	estats_prev;</div><div class='ctx'> </div><div class='add'>+	union {</div><div class='ctx'> 	unsigned long			phy_crc_errors;</div><div class='add'>+	unsigned long			last_event_jiffies;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	u32				rx_offset;</div><div class='ctx'> 	u32				tg3_flags;</div><div class='head'>diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c<br/>index 85246ed7cb9c..ec871f646766 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tlan.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/tlan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tlan.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/tlan.c</a></div><div class='hunk'>@@ -360,8 +360,8 @@ TLan_GetSKB( const struct tlan_list_tag *tag)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr;</div><div class='ctx'> </div><div class='del'>-	addr = tag-&gt;buffer[8].address;</div><div class='del'>-	addr |= (tag-&gt;buffer[9].address &lt;&lt; 16) &lt;&lt; 16;</div><div class='add'>+	addr = tag-&gt;buffer[9].address;</div><div class='add'>+	addr |= (tag-&gt;buffer[8].address &lt;&lt; 16) &lt;&lt; 16;</div><div class='ctx'> 	return (struct sk_buff *) addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1984,7 +1984,6 @@ static void TLan_ResetLists( struct net_device *dev )</div><div class='ctx'> 	TLanList	*list;</div><div class='ctx'> 	dma_addr_t	list_phys;</div><div class='ctx'> 	struct sk_buff	*skb;</div><div class='del'>-	void		*t = NULL;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;txHead = 0;</div><div class='ctx'> 	priv-&gt;txTail = 0;</div><div class='hunk'>@@ -2022,7 +2021,8 @@ static void TLan_ResetLists( struct net_device *dev )</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			skb_reserve( skb, NET_IP_ALIGN );</div><div class='del'>-			list-&gt;buffer[0].address = pci_map_single(priv-&gt;pciDev, t,</div><div class='add'>+			list-&gt;buffer[0].address = pci_map_single(priv-&gt;pciDev,</div><div class='add'>+								 skb-&gt;data,</div><div class='ctx'> 								 TLAN_MAX_FRAME_SIZE,</div><div class='ctx'> 								 PCI_DMA_FROMDEVICE);</div><div class='ctx'> 			TLan_StoreSKB(list, skb);</div><div class='head'>diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c<br/>index 7766cde0d63d..bf621328b601 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tokenring/3c359.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/tokenring/3c359.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tokenring/3c359.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/tokenring/3c359.c</a></div><div class='hunk'>@@ -95,20 +95,20 @@ MODULE_DESCRIPTION("3Com 3C359 Velocity XL Token Ring Adapter Driver \n") ;</div><div class='ctx'> static int ringspeed[XL_MAX_ADAPTERS] = {0,} ;</div><div class='ctx'> </div><div class='ctx'> module_param_array(ringspeed, int, NULL, 0);</div><div class='del'>-MODULE_PARM_DESC(ringspeed,"3c359: Ringspeed selection - 4,16 or 0") ; </div><div class='add'>+MODULE_PARM_DESC(ringspeed,"3c359: Ringspeed selection - 4,16 or 0") ;</div><div class='ctx'> </div><div class='ctx'> /* Packet buffer size */</div><div class='ctx'> </div><div class='ctx'> static int pkt_buf_sz[XL_MAX_ADAPTERS] = {0,} ;</div><div class='ctx'>  </div><div class='ctx'> module_param_array(pkt_buf_sz, int, NULL, 0) ;</div><div class='del'>-MODULE_PARM_DESC(pkt_buf_sz,"3c359: Initial buffer size") ; </div><div class='add'>+MODULE_PARM_DESC(pkt_buf_sz,"3c359: Initial buffer size") ;</div><div class='ctx'> /* Message Level */</div><div class='ctx'> </div><div class='del'>-static int message_level[XL_MAX_ADAPTERS] = {0,} ; </div><div class='add'>+static int message_level[XL_MAX_ADAPTERS] = {0,} ;</div><div class='ctx'> </div><div class='ctx'> module_param_array(message_level, int, NULL, 0) ;</div><div class='del'>-MODULE_PARM_DESC(message_level, "3c359: Level of reported messages \n") ; </div><div class='add'>+MODULE_PARM_DESC(message_level, "3c359: Level of reported messages") ;</div><div class='ctx'> /* </div><div class='ctx'>  *	This is a real nasty way of doing this, but otherwise you</div><div class='ctx'>  *	will be stuck with 1555 lines of hex #'s in the code.</div><div class='head'>diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c<br/>index 47d84cd28097..59d1673f9387 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tokenring/lanstreamer.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/tokenring/lanstreamer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tokenring/lanstreamer.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/tokenring/lanstreamer.c</a></div><div class='hunk'>@@ -119,7 +119,6 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/tokenring/lanstreamer.h b/drivers/net/tokenring/lanstreamer.h<br/>index e7bb3494afc7..13ccee6449c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tokenring/lanstreamer.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/tokenring/lanstreamer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tokenring/lanstreamer.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/tokenring/lanstreamer.h</a></div><div class='hunk'>@@ -60,8 +60,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='del'>-</div><div class='ctx'> /* MAX_INTR - the maximum number of times we can loop</div><div class='ctx'>  * inside the interrupt function before returning</div><div class='ctx'>  * control to the OS (maximum value is 256)</div><div class='head'>diff --git a/drivers/net/tun.c b/drivers/net/tun.c<br/>index e6bbc639c2d0..6daea0c91862 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tun.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/tun.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tun.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/tun.c</a></div><div class='hunk'>@@ -358,6 +358,66 @@ static unsigned int tun_chr_poll(struct file *file, poll_table * wait)</div><div class='ctx'> 	return mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* prepad is the amount to reserve at front.  len is length after that.</div><div class='add'>+ * linear is a hint as to how much to copy (usually headers). */</div><div class='add'>+static struct sk_buff *tun_alloc_skb(size_t prepad, size_t len, size_t linear,</div><div class='add'>+				     gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(prepad + len, gfp|__GFP_NOWARN);</div><div class='add'>+	if (skb) {</div><div class='add'>+		skb_reserve(skb, prepad);</div><div class='add'>+		skb_put(skb, len);</div><div class='add'>+		return skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Under a page?  Don't bother with paged skb. */</div><div class='add'>+	if (prepad + len &lt; PAGE_SIZE)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Start with a normal skb, and add pages. */</div><div class='add'>+	skb = alloc_skb(prepad + linear, gfp);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, prepad);</div><div class='add'>+	skb_put(skb, linear);</div><div class='add'>+</div><div class='add'>+	len -= linear;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_SKB_FRAGS; i++) {</div><div class='add'>+		skb_frag_t *f = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+</div><div class='add'>+		f-&gt;page = alloc_page(gfp|__GFP_ZERO);</div><div class='add'>+		if (!f-&gt;page)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		f-&gt;page_offset = 0;</div><div class='add'>+		f-&gt;size = PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+		skb-&gt;data_len += PAGE_SIZE;</div><div class='add'>+		skb-&gt;len += PAGE_SIZE;</div><div class='add'>+		skb-&gt;truesize += PAGE_SIZE;</div><div class='add'>+		skb_shinfo(skb)-&gt;nr_frags++;</div><div class='add'>+</div><div class='add'>+		if (len &lt; PAGE_SIZE) {</div><div class='add'>+			len = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		len -= PAGE_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Too large, or alloc fail? */</div><div class='add'>+	if (unlikely(len)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		skb = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Get packet from user space buffer */</div><div class='ctx'> static __inline__ ssize_t tun_get_user(struct tun_struct *tun, struct iovec *iv, size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -391,14 +451,12 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun, struct iovec *iv,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(skb = alloc_skb(len + align, GFP_KERNEL))) {</div><div class='add'>+	if (!(skb = tun_alloc_skb(align, len, gso.hdr_len, GFP_KERNEL))) {</div><div class='ctx'> 		tun-&gt;dev-&gt;stats.rx_dropped++;</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (align)</div><div class='del'>-		skb_reserve(skb, align);</div><div class='del'>-	if (memcpy_fromiovec(skb_put(skb, len), iv, len)) {</div><div class='add'>+	if (skb_copy_datagram_from_iovec(skb, 0, iv, len)) {</div><div class='ctx'> 		tun-&gt;dev-&gt;stats.rx_dropped++;</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -748,6 +806,36 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int tun_get_iff(struct net *net, struct file *file, struct ifreq *ifr)</div><div class='add'>+{</div><div class='add'>+	struct tun_struct *tun = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (!tun)</div><div class='add'>+		return -EBADFD;</div><div class='add'>+</div><div class='add'>+	DBG(KERN_INFO "%s: tun_get_iff\n", tun-&gt;dev-&gt;name);</div><div class='add'>+</div><div class='add'>+	strcpy(ifr-&gt;ifr_name, tun-&gt;dev-&gt;name);</div><div class='add'>+</div><div class='add'>+	ifr-&gt;ifr_flags = 0;</div><div class='add'>+</div><div class='add'>+	if (ifr-&gt;ifr_flags &amp; TUN_TUN_DEV)</div><div class='add'>+		ifr-&gt;ifr_flags |= IFF_TUN;</div><div class='add'>+	else</div><div class='add'>+		ifr-&gt;ifr_flags |= IFF_TAP;</div><div class='add'>+</div><div class='add'>+	if (tun-&gt;flags &amp; TUN_NO_PI)</div><div class='add'>+		ifr-&gt;ifr_flags |= IFF_NO_PI;</div><div class='add'>+</div><div class='add'>+	if (tun-&gt;flags &amp; TUN_ONE_QUEUE)</div><div class='add'>+		ifr-&gt;ifr_flags |= IFF_ONE_QUEUE;</div><div class='add'>+</div><div class='add'>+	if (tun-&gt;flags &amp; TUN_VNET_HDR)</div><div class='add'>+		ifr-&gt;ifr_flags |= IFF_VNET_HDR;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This is like a cut-down ethtool ops, except done via tun fd so no</div><div class='ctx'>  * privs required. */</div><div class='ctx'> static int set_offload(struct net_device *dev, unsigned long arg)</div><div class='hunk'>@@ -833,6 +921,15 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	DBG(KERN_INFO "%s: tun_chr_ioctl cmd %d\n", tun-&gt;dev-&gt;name, cmd);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='add'>+	case TUNGETIFF:</div><div class='add'>+		ret = tun_get_iff(current-&gt;nsproxy-&gt;net_ns, file, &amp;ifr);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(argp, &amp;ifr, sizeof(ifr)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case TUNSETNOCSUM:</div><div class='ctx'> 		/* Disable/Enable checksum */</div><div class='ctx'> 		if (arg)</div><div class='head'>diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c<br/>index 8549f1159a30..734ce0977f02 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/typhoon.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/typhoon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/typhoon.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/typhoon.c</a></div><div class='hunk'>@@ -128,7 +128,6 @@ static const int multicast_filter_limit = 32;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "typhoon.h"</div><div class='head'>diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig<br/>index 68e198bd538b..0973b6e37024 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/usb/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/usb/Kconfig</a></div><div class='hunk'>@@ -154,17 +154,6 @@ config USB_NET_AX8817X</div><div class='ctx'> 	  This driver creates an interface named "ethX", where X depends on</div><div class='ctx'> 	  what other networking devices you have in use.</div><div class='ctx'> </div><div class='del'>-config USB_HSO</div><div class='del'>-	tristate "Option USB High Speed Mobile Devices"</div><div class='del'>-	depends on USB &amp;&amp; RFKILL</div><div class='del'>-	default n</div><div class='del'>-	help</div><div class='del'>-	  Choose this option if you have an Option HSDPA/HSUPA card.</div><div class='del'>-	  These cards support downlink speeds of 7.2Mbps or greater.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here: the</div><div class='del'>-	  module will be called hso.</div><div class='del'>-</div><div class='ctx'> config USB_NET_CDCETHER</div><div class='ctx'> 	tristate "CDC Ethernet support (smart devices such as cable modems)"</div><div class='ctx'> 	depends on USB_USBNET</div><div class='hunk'>@@ -337,5 +326,15 @@ config USB_NET_ZAURUS</div><div class='ctx'> 	  really need this non-conformant variant of CDC Ethernet (or in</div><div class='ctx'> 	  some cases CDC MDLM) protocol, not "g_ether".</div><div class='ctx'> </div><div class='add'>+config USB_HSO</div><div class='add'>+	tristate "Option USB High Speed Mobile Devices"</div><div class='add'>+	depends on USB &amp;&amp; RFKILL</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Choose this option if you have an Option HSDPA/HSUPA card.</div><div class='add'>+	  These cards support downlink speeds of 7.2Mbps or greater.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called hso.</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c<br/>index f7319d326912..78df2be8a728 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/dm9601.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/usb/dm9601.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/dm9601.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/usb/dm9601.c</a></div><div class='hunk'>@@ -55,12 +55,28 @@</div><div class='ctx'> </div><div class='ctx'> static int dm_read(struct usbnet *dev, u8 reg, u16 length, void *data)</div><div class='ctx'> {</div><div class='add'>+	void *buf;</div><div class='add'>+	int err = -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	devdbg(dev, "dm_read() reg=0x%02x length=%d", reg, length);</div><div class='del'>-	return usb_control_msg(dev-&gt;udev,</div><div class='del'>-			       usb_rcvctrlpipe(dev-&gt;udev, 0),</div><div class='del'>-			       DM_READ_REGS,</div><div class='del'>-			       USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='del'>-			       0, reg, data, length, USB_CTRL_SET_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(length, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = usb_control_msg(dev-&gt;udev,</div><div class='add'>+			      usb_rcvctrlpipe(dev-&gt;udev, 0),</div><div class='add'>+			      DM_READ_REGS,</div><div class='add'>+			      USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='add'>+			      0, reg, buf, length, USB_CTRL_SET_TIMEOUT);</div><div class='add'>+	if (err == length)</div><div class='add'>+		memcpy(data, buf, length);</div><div class='add'>+	else if (err &gt;= 0)</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dm_read_reg(struct usbnet *dev, u8 reg, u8 *value)</div><div class='hunk'>@@ -70,12 +86,28 @@ static int dm_read_reg(struct usbnet *dev, u8 reg, u8 *value)</div><div class='ctx'> </div><div class='ctx'> static int dm_write(struct usbnet *dev, u8 reg, u16 length, void *data)</div><div class='ctx'> {</div><div class='add'>+	void *buf = NULL;</div><div class='add'>+	int err = -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	devdbg(dev, "dm_write() reg=0x%02x, length=%d", reg, length);</div><div class='del'>-	return usb_control_msg(dev-&gt;udev,</div><div class='del'>-			       usb_sndctrlpipe(dev-&gt;udev, 0),</div><div class='del'>-			       DM_WRITE_REGS,</div><div class='del'>-			       USB_DIR_OUT | USB_TYPE_VENDOR |USB_RECIP_DEVICE,</div><div class='del'>-			       0, reg, data, length, USB_CTRL_SET_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (data) {</div><div class='add'>+		buf = kmalloc(length, GFP_KERNEL);</div><div class='add'>+		if (!buf)</div><div class='add'>+			goto out;</div><div class='add'>+		memcpy(buf, data, length);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = usb_control_msg(dev-&gt;udev,</div><div class='add'>+			      usb_sndctrlpipe(dev-&gt;udev, 0),</div><div class='add'>+			      DM_WRITE_REGS,</div><div class='add'>+			      USB_DIR_OUT | USB_TYPE_VENDOR |USB_RECIP_DEVICE,</div><div class='add'>+			      0, reg, buf, length, USB_CTRL_SET_TIMEOUT);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	if (err &gt;= 0 &amp;&amp; err &lt; length)</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+ out:</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dm_write_reg(struct usbnet *dev, u8 reg, u8 value)</div><div class='head'>diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c<br/>index 031d07b105af..6e42b5a8c22b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/hso.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/usb/hso.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/hso.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/usb/hso.c</a></div><div class='hunk'>@@ -102,8 +102,12 @@</div><div class='ctx'> </div><div class='ctx'> #define MAX_RX_URBS			2</div><div class='ctx'> </div><div class='del'>-#define get_serial_by_tty(x)	\</div><div class='del'>-	(x ? (struct hso_serial *)x-&gt;driver_data : NULL)</div><div class='add'>+static inline struct hso_serial *get_serial_by_tty(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	if (tty)</div><div class='add'>+		return tty-&gt;driver_data;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /* Debugging functions                                                       */</div><div class='hunk'>@@ -294,24 +298,25 @@ static int hso_get_activity(struct hso_device *hso_dev);</div><div class='ctx'> </div><div class='ctx'> /* #define DEBUG */</div><div class='ctx'> </div><div class='del'>-#define dev2net(x) (x-&gt;port_data.dev_net)</div><div class='del'>-#define dev2ser(x) (x-&gt;port_data.dev_serial)</div><div class='add'>+static inline struct hso_net *dev2net(struct hso_device *hso_dev)</div><div class='add'>+{</div><div class='add'>+	return hso_dev-&gt;port_data.dev_net;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct hso_serial *dev2ser(struct hso_device *hso_dev)</div><div class='add'>+{</div><div class='add'>+	return hso_dev-&gt;port_data.dev_serial;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Debugging functions */</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> static void dbg_dump(int line_count, const char *func_name, unsigned char *buf,</div><div class='ctx'> 		     unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	u8 i = 0;</div><div class='add'>+	static char name[255];</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEBUG "[%d:%s]: len %d", line_count, func_name, len);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		if (!(i % 16))</div><div class='del'>-			printk("\n    0x%03x:  ", i);</div><div class='del'>-		printk("%02x ", (unsigned char)buf[i]);</div><div class='del'>-	}</div><div class='del'>-	printk("\n");</div><div class='add'>+	sprintf(name, "hso[%d:%s]", line_count, func_name);</div><div class='add'>+	print_hex_dump_bytes(name, DUMP_PREFIX_NONE, buf, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define DUMP(buf_, len_)	\</div><div class='hunk'>@@ -392,7 +397,7 @@ static const struct usb_device_id hso_ids[] = {</div><div class='ctx'> 	{default_port_device(0x0af0, 0xc031)},	/* Icon-Edge */</div><div class='ctx'> 	{icon321_port_device(0x0af0, 0xd013)},	/* Module HSxPA */</div><div class='ctx'> 	{icon321_port_device(0x0af0, 0xd031)},	/* Icon-321 */</div><div class='del'>-	{default_port_device(0x0af0, 0xd033)},	/* Icon-322 */</div><div class='add'>+	{icon321_port_device(0x0af0, 0xd033)},	/* Icon-322 */</div><div class='ctx'> 	{USB_DEVICE(0x0af0, 0x7301)},		/* GE40x */</div><div class='ctx'> 	{USB_DEVICE(0x0af0, 0x7361)},		/* GE40x */</div><div class='ctx'> 	{USB_DEVICE(0x0af0, 0x7401)},		/* GI 0401 */</div><div class='hunk'>@@ -528,13 +533,12 @@ static struct hso_serial *get_serial_by_shared_int_and_type(</div><div class='ctx'> </div><div class='ctx'> static struct hso_serial *get_serial_by_index(unsigned index)</div><div class='ctx'> {</div><div class='del'>-	struct hso_serial *serial;</div><div class='add'>+	struct hso_serial *serial = NULL;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (!serial_table[index])</div><div class='del'>-		return NULL;</div><div class='ctx'> 	spin_lock_irqsave(&amp;serial_table_lock, flags);</div><div class='del'>-	serial = dev2ser(serial_table[index]);</div><div class='add'>+	if (serial_table[index])</div><div class='add'>+		serial = dev2ser(serial_table[index]);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;serial_table_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return serial;</div><div class='hunk'>@@ -561,6 +565,7 @@ static int get_free_serial_index(void)</div><div class='ctx'> static void set_serial_by_index(unsigned index, struct hso_serial *serial)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;serial_table_lock, flags);</div><div class='ctx'> 	if (serial)</div><div class='ctx'> 		serial_table[index] = serial-&gt;parent;</div><div class='hunk'>@@ -569,7 +574,7 @@ static void set_serial_by_index(unsigned index, struct hso_serial *serial)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;serial_table_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* log a meaningfull explanation of an USB status */</div><div class='add'>+/* log a meaningful explanation of an USB status */</div><div class='ctx'> static void log_usb_status(int status, const char *function)</div><div class='ctx'> {</div><div class='ctx'> 	char *explanation;</div><div class='hunk'>@@ -1103,8 +1108,8 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	/* reset the rts and dtr */</div><div class='ctx'> 	/* do the actual close */</div><div class='ctx'> 	serial-&gt;open_count--;</div><div class='add'>+	kref_put(&amp;serial-&gt;parent-&gt;ref, hso_serial_ref_free);</div><div class='ctx'> 	if (serial-&gt;open_count &lt;= 0) {</div><div class='del'>-		kref_put(&amp;serial-&gt;parent-&gt;ref, hso_serial_ref_free);</div><div class='ctx'> 		serial-&gt;open_count = 0;</div><div class='ctx'> 		if (serial-&gt;tty) {</div><div class='ctx'> 			serial-&gt;tty-&gt;driver_data = NULL;</div><div class='hunk'>@@ -1467,7 +1472,8 @@ static void hso_std_serial_write_bulk_callback(struct urb *urb)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	hso_put_activity(serial-&gt;parent);</div><div class='del'>-	tty_wakeup(serial-&gt;tty);</div><div class='add'>+	if (serial-&gt;tty)</div><div class='add'>+		tty_wakeup(serial-&gt;tty);</div><div class='ctx'> 	hso_kick_transmit(serial);</div><div class='ctx'> </div><div class='ctx'> 	D1(" ");</div><div class='hunk'>@@ -1538,7 +1544,8 @@ static void ctrl_callback(struct urb *urb)</div><div class='ctx'> 			clear_bit(HSO_SERIAL_FLAG_RX_SENT, &amp;serial-&gt;flags);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		hso_put_activity(serial-&gt;parent);</div><div class='del'>-		tty_wakeup(serial-&gt;tty);</div><div class='add'>+		if (serial-&gt;tty)</div><div class='add'>+			tty_wakeup(serial-&gt;tty);</div><div class='ctx'> 		/* response to a write command */</div><div class='ctx'> 		hso_kick_transmit(serial);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2606,6 +2613,7 @@ static int hso_resume(struct usb_interface *iface)</div><div class='ctx'> 					"Transmitting lingering data\n");</div><div class='ctx'> 				hso_net_start_xmit(hso_net-&gt;skb_tx_buf,</div><div class='ctx'> 						   hso_net-&gt;net);</div><div class='add'>+				hso_net-&gt;skb_tx_buf = NULL;</div><div class='ctx'> 			}</div><div class='ctx'> 			result = hso_start_net_device(network_table[i]);</div><div class='ctx'> 			if (result)</div><div class='hunk'>@@ -2652,7 +2660,7 @@ static void hso_free_interface(struct usb_interface *interface)</div><div class='ctx'> 			hso_stop_net_device(network_table[i]);</div><div class='ctx'> 			cancel_work_sync(&amp;network_table[i]-&gt;async_put_intf);</div><div class='ctx'> 			cancel_work_sync(&amp;network_table[i]-&gt;async_get_intf);</div><div class='del'>-			if(rfk)</div><div class='add'>+			if (rfk)</div><div class='ctx'> 				rfkill_unregister(rfk);</div><div class='ctx'> 			hso_free_net_device(network_table[i]);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2723,7 +2731,7 @@ static int hso_mux_submit_intr_urb(struct hso_shared_int *shared_int,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* operations setup of the serial interface */</div><div class='del'>-static struct tty_operations hso_serial_ops = {</div><div class='add'>+static const struct tty_operations hso_serial_ops = {</div><div class='ctx'> 	.open = hso_serial_open,</div><div class='ctx'> 	.close = hso_serial_close,</div><div class='ctx'> 	.write = hso_serial_write,</div><div class='head'>diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c<br/>index c3d119f997f5..ca9d00c1194e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/mcs7830.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/usb/mcs7830.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/mcs7830.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/usb/mcs7830.c</a></div><div class='hunk'>@@ -46,6 +46,10 @@</div><div class='ctx'> </div><div class='ctx'> #define MCS7830_VENDOR_ID	0x9710</div><div class='ctx'> #define MCS7830_PRODUCT_ID	0x7830</div><div class='add'>+#define MCS7730_PRODUCT_ID	0x7730</div><div class='add'>+</div><div class='add'>+#define SITECOM_VENDOR_ID	0x0DF6</div><div class='add'>+#define LN_030_PRODUCT_ID	0x0021</div><div class='ctx'> </div><div class='ctx'> #define MCS7830_MII_ADVERTISE	(ADVERTISE_PAUSE_CAP | ADVERTISE_100FULL | \</div><div class='ctx'> 				 ADVERTISE_100HALF | ADVERTISE_10FULL | \</div><div class='hunk'>@@ -442,6 +446,29 @@ static struct ethtool_ops mcs7830_ethtool_ops = {</div><div class='ctx'> 	.nway_reset		= usbnet_nway_reset,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int mcs7830_set_mac_address(struct net_device *netdev, void *p)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct usbnet *dev = netdev_priv(netdev);</div><div class='add'>+	struct sockaddr *addr = p;</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memcpy(netdev-&gt;dev_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='add'>+</div><div class='add'>+	ret = mcs7830_set_reg(dev, HIF_REG_ETHERNET_ADDR, ETH_ALEN,</div><div class='add'>+			netdev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *net = dev-&gt;net;</div><div class='hunk'>@@ -455,6 +482,7 @@ static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev)</div><div class='ctx'> 	net-&gt;ethtool_ops = &amp;mcs7830_ethtool_ops;</div><div class='ctx'> 	net-&gt;set_multicast_list = mcs7830_set_multicast;</div><div class='ctx'> 	mcs7830_set_multicast(net);</div><div class='add'>+	net-&gt;set_mac_address = mcs7830_set_mac_address;</div><div class='ctx'> </div><div class='ctx'> 	/* reserve space for the status byte on rx */</div><div class='ctx'> 	dev-&gt;rx_urb_size = ETH_FRAME_LEN + 1;</div><div class='hunk'>@@ -491,7 +519,16 @@ static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct driver_info moschip_info = {</div><div class='del'>-	.description	= "MOSCHIP 7830 usb-NET adapter",</div><div class='add'>+	.description	= "MOSCHIP 7830/7730 usb-NET adapter",</div><div class='add'>+	.bind		= mcs7830_bind,</div><div class='add'>+	.rx_fixup	= mcs7830_rx_fixup,</div><div class='add'>+	.flags		= FLAG_ETHER,</div><div class='add'>+	.in		= 1,</div><div class='add'>+	.out		= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct driver_info sitecom_info = {</div><div class='add'>+	.description    = "Sitecom LN-30 usb-NET adapter",</div><div class='ctx'> 	.bind		= mcs7830_bind,</div><div class='ctx'> 	.rx_fixup	= mcs7830_rx_fixup,</div><div class='ctx'> 	.flags		= FLAG_ETHER,</div><div class='hunk'>@@ -504,6 +541,14 @@ static const struct usb_device_id products[] = {</div><div class='ctx'> 		USB_DEVICE(MCS7830_VENDOR_ID, MCS7830_PRODUCT_ID),</div><div class='ctx'> 		.driver_info = (unsigned long) &amp;moschip_info,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		USB_DEVICE(MCS7830_VENDOR_ID, MCS7730_PRODUCT_ID),</div><div class='add'>+		.driver_info = (unsigned long) &amp;moschip_info,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		USB_DEVICE(SITECOM_VENDOR_ID, LN_030_PRODUCT_ID),</div><div class='add'>+		.driver_info = (unsigned long) &amp;sitecom_info,</div><div class='add'>+	},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, products);</div><div class='head'>diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c<br/>index b588c890ea70..8c19307e5040 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/pegasus.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/usb/pegasus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/pegasus.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/usb/pegasus.c</a></div><div class='hunk'>@@ -117,7 +117,7 @@ static void ctrl_callback(struct urb *urb)</div><div class='ctx'> 	case -ENOENT:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		if (netif_msg_drv(pegasus))</div><div class='add'>+		if (netif_msg_drv(pegasus) &amp;&amp; printk_ratelimit())</div><div class='ctx'> 			dev_dbg(&amp;pegasus-&gt;intf-&gt;dev, "%s, status %d\n",</div><div class='ctx'> 				__FUNCTION__, urb-&gt;status);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -166,7 +166,7 @@ static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size,</div><div class='ctx'> 		set_current_state(TASK_RUNNING);</div><div class='ctx'> 		if (ret == -ENODEV)</div><div class='ctx'> 			netif_device_detach(pegasus-&gt;net);</div><div class='del'>-		if (netif_msg_drv(pegasus))</div><div class='add'>+		if (netif_msg_drv(pegasus) &amp;&amp; printk_ratelimit())</div><div class='ctx'> 			dev_err(&amp;pegasus-&gt;intf-&gt;dev, "%s, status %d\n",</div><div class='ctx'> 					__FUNCTION__, ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -275,7 +275,7 @@ static int set_register(pegasus_t * pegasus, __u16 indx, __u8 data)</div><div class='ctx'> 	if ((ret = usb_submit_urb(pegasus-&gt;ctrl_urb, GFP_ATOMIC))) {</div><div class='ctx'> 		if (ret == -ENODEV)</div><div class='ctx'> 			netif_device_detach(pegasus-&gt;net);</div><div class='del'>-		if (netif_msg_drv(pegasus))</div><div class='add'>+		if (netif_msg_drv(pegasus) &amp;&amp; printk_ratelimit())</div><div class='ctx'> 			dev_err(&amp;pegasus-&gt;intf-&gt;dev, "%s, status %d\n",</div><div class='ctx'> 					__FUNCTION__, ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1209,8 +1209,7 @@ static void pegasus_set_multicast(struct net_device *net)</div><div class='ctx'> 		pegasus-&gt;eth_regs[EthCtrl2] |= RX_PROMISCUOUS;</div><div class='ctx'> 		if (netif_msg_link(pegasus))</div><div class='ctx'> 			pr_info("%s: Promiscuous mode enabled.\n", net-&gt;name);</div><div class='del'>-	} else if (net-&gt;mc_count ||</div><div class='del'>-		   (net-&gt;flags &amp; IFF_ALLMULTI)) {</div><div class='add'>+	} else if (net-&gt;mc_count || (net-&gt;flags &amp; IFF_ALLMULTI)) {</div><div class='ctx'> 		pegasus-&gt;eth_regs[EthCtrl0] |= RX_MULTICAST;</div><div class='ctx'> 		pegasus-&gt;eth_regs[EthCtrl2] &amp;= ~RX_PROMISCUOUS;</div><div class='ctx'> 		if (netif_msg_link(pegasus))</div><div class='hunk'>@@ -1220,6 +1219,8 @@ static void pegasus_set_multicast(struct net_device *net)</div><div class='ctx'> 		pegasus-&gt;eth_regs[EthCtrl2] &amp;= ~RX_PROMISCUOUS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	pegasus-&gt;ctrl_urb-&gt;status = 0;</div><div class='add'>+</div><div class='ctx'> 	pegasus-&gt;flags |= ETH_REGS_CHANGE;</div><div class='ctx'> 	ctrl_callback(pegasus-&gt;ctrl_urb);</div><div class='ctx'> }</div><div class='hunk'>@@ -1285,6 +1286,21 @@ static void check_carrier(struct work_struct *work)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pegasus_blacklisted(struct usb_device *udev)</div><div class='add'>+{</div><div class='add'>+	struct usb_device_descriptor *udd = &amp;udev-&gt;descriptor;</div><div class='add'>+</div><div class='add'>+	/* Special quirk to keep the driver from handling the Belkin Bluetooth</div><div class='add'>+	 * dongle which happens to have the same ID.</div><div class='add'>+	 */</div><div class='add'>+	if ((udd-&gt;idVendor == VENDOR_BELKIN &amp;&amp; udd-&gt;idProduct == 0x0121) &amp;&amp;</div><div class='add'>+	    (udd-&gt;bDeviceClass == USB_CLASS_WIRELESS_CONTROLLER) &amp;&amp;</div><div class='add'>+	    (udd-&gt;bDeviceProtocol == 1))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int pegasus_probe(struct usb_interface *intf,</div><div class='ctx'> 			 const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='hunk'>@@ -1296,6 +1312,12 @@ static int pegasus_probe(struct usb_interface *intf,</div><div class='ctx'> 	DECLARE_MAC_BUF(mac);</div><div class='ctx'> </div><div class='ctx'> 	usb_get_dev(dev);</div><div class='add'>+</div><div class='add'>+	if (pegasus_blacklisted(dev)) {</div><div class='add'>+		res = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	net = alloc_etherdev(sizeof(struct pegasus));</div><div class='ctx'> 	if (!net) {</div><div class='ctx'> 		dev_err(&amp;intf-&gt;dev, "can't allocate %s\n", "device");</div><div class='head'>diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c<br/>index 370ce30f2f45..007c12970065 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/via-velocity.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/via-velocity.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/via-velocity.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/via-velocity.c</a></div><div class='hunk'>@@ -662,6 +662,10 @@ static void velocity_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid</div><div class='ctx'>         spin_unlock_irq(&amp;vptr-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void velocity_init_rx_ring_indexes(struct velocity_info *vptr)</div><div class='add'>+{</div><div class='add'>+	vptr-&gt;rx.dirty = vptr-&gt;rx.filled = vptr-&gt;rx.curr = 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	velocity_rx_reset	-	handle a receive reset</div><div class='hunk'>@@ -677,16 +681,16 @@ static void velocity_rx_reset(struct velocity_info *vptr)</div><div class='ctx'> 	struct mac_regs __iomem * regs = vptr-&gt;mac_regs;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	vptr-&gt;rd_dirty = vptr-&gt;rd_filled = vptr-&gt;rd_curr = 0;</div><div class='add'>+	velocity_init_rx_ring_indexes(vptr);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Init state, all RD entries belong to the NIC</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; vptr-&gt;options.numrx; ++i)</div><div class='del'>-		vptr-&gt;rd_ring[i].rdesc0.len |= OWNED_BY_NIC;</div><div class='add'>+		vptr-&gt;rx.ring[i].rdesc0.len |= OWNED_BY_NIC;</div><div class='ctx'> </div><div class='ctx'> 	writew(vptr-&gt;options.numrx, &amp;regs-&gt;RBRDU);</div><div class='del'>-	writel(vptr-&gt;rd_pool_dma, &amp;regs-&gt;RDBaseLo);</div><div class='add'>+	writel(vptr-&gt;rx.pool_dma, &amp;regs-&gt;RDBaseLo);</div><div class='ctx'> 	writew(0, &amp;regs-&gt;RDIdx);</div><div class='ctx'> 	writew(vptr-&gt;options.numrx - 1, &amp;regs-&gt;RDCSize);</div><div class='ctx'> }</div><div class='hunk'>@@ -779,15 +783,15 @@ static void velocity_init_registers(struct velocity_info *vptr,</div><div class='ctx'> </div><div class='ctx'> 		vptr-&gt;int_mask = INT_MASK_DEF;</div><div class='ctx'> </div><div class='del'>-		writel(vptr-&gt;rd_pool_dma, &amp;regs-&gt;RDBaseLo);</div><div class='add'>+		writel(vptr-&gt;rx.pool_dma, &amp;regs-&gt;RDBaseLo);</div><div class='ctx'> 		writew(vptr-&gt;options.numrx - 1, &amp;regs-&gt;RDCSize);</div><div class='ctx'> 		mac_rx_queue_run(regs);</div><div class='ctx'> 		mac_rx_queue_wake(regs);</div><div class='ctx'> </div><div class='ctx'> 		writew(vptr-&gt;options.numtx - 1, &amp;regs-&gt;TDCSize);</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; vptr-&gt;num_txq; i++) {</div><div class='del'>-			writel(vptr-&gt;td_pool_dma[i], &amp;regs-&gt;TDBaseLo[i]);</div><div class='add'>+		for (i = 0; i &lt; vptr-&gt;tx.numq; i++) {</div><div class='add'>+			writel(vptr-&gt;tx.pool_dma[i], &amp;regs-&gt;TDBaseLo[i]);</div><div class='ctx'> 			mac_tx_queue_run(regs, i);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1047,7 +1051,7 @@ static void __devinit velocity_init_info(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	vptr-&gt;pdev = pdev;</div><div class='ctx'> 	vptr-&gt;chip_id = info-&gt;chip_id;</div><div class='del'>-	vptr-&gt;num_txq = info-&gt;txqueue;</div><div class='add'>+	vptr-&gt;tx.numq = info-&gt;txqueue;</div><div class='ctx'> 	vptr-&gt;multicast_limit = MCAM_SIZE;</div><div class='ctx'> 	spin_lock_init(&amp;vptr-&gt;lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;vptr-&gt;list);</div><div class='hunk'>@@ -1093,14 +1097,14 @@ static int __devinit velocity_get_pci_info(struct velocity_info *vptr, struct pc</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	velocity_init_rings	-	set up DMA rings</div><div class='add'>+ *	velocity_init_dma_rings	-	set up DMA rings</div><div class='ctx'>  *	@vptr: Velocity to set up</div><div class='ctx'>  *</div><div class='ctx'>  *	Allocate PCI mapped DMA rings for the receive and transmit layer</div><div class='ctx'>  *	to use.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int velocity_init_rings(struct velocity_info *vptr)</div><div class='add'>+static int velocity_init_dma_rings(struct velocity_info *vptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct velocity_opt *opt = &amp;vptr-&gt;options;</div><div class='ctx'> 	const unsigned int rx_ring_size = opt-&gt;numrx * sizeof(struct rx_desc);</div><div class='hunk'>@@ -1116,7 +1120,7 @@ static int velocity_init_rings(struct velocity_info *vptr)</div><div class='ctx'> 	 * pci_alloc_consistent() fulfills the requirement for 64 bytes</div><div class='ctx'> 	 * alignment</div><div class='ctx'> 	 */</div><div class='del'>-	pool = pci_alloc_consistent(pdev, tx_ring_size * vptr-&gt;num_txq +</div><div class='add'>+	pool = pci_alloc_consistent(pdev, tx_ring_size * vptr-&gt;tx.numq +</div><div class='ctx'> 				    rx_ring_size, &amp;pool_dma);</div><div class='ctx'> 	if (!pool) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "%s : DMA memory allocation failed.\n",</div><div class='hunk'>@@ -1124,15 +1128,15 @@ static int velocity_init_rings(struct velocity_info *vptr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vptr-&gt;rd_ring = pool;</div><div class='del'>-	vptr-&gt;rd_pool_dma = pool_dma;</div><div class='add'>+	vptr-&gt;rx.ring = pool;</div><div class='add'>+	vptr-&gt;rx.pool_dma = pool_dma;</div><div class='ctx'> </div><div class='ctx'> 	pool += rx_ring_size;</div><div class='ctx'> 	pool_dma += rx_ring_size;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; vptr-&gt;num_txq; i++) {</div><div class='del'>-		vptr-&gt;td_rings[i] = pool;</div><div class='del'>-		vptr-&gt;td_pool_dma[i] = pool_dma;</div><div class='add'>+	for (i = 0; i &lt; vptr-&gt;tx.numq; i++) {</div><div class='add'>+		vptr-&gt;tx.rings[i] = pool;</div><div class='add'>+		vptr-&gt;tx.pool_dma[i] = pool_dma;</div><div class='ctx'> 		pool += tx_ring_size;</div><div class='ctx'> 		pool_dma += tx_ring_size;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1141,18 +1145,18 @@ static int velocity_init_rings(struct velocity_info *vptr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	velocity_free_rings	-	free PCI ring pointers</div><div class='add'>+ *	velocity_free_dma_rings	-	free PCI ring pointers</div><div class='ctx'>  *	@vptr: Velocity to free from</div><div class='ctx'>  *</div><div class='ctx'>  *	Clean up the PCI ring buffers allocated to this velocity.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void velocity_free_rings(struct velocity_info *vptr)</div><div class='add'>+static void velocity_free_dma_rings(struct velocity_info *vptr)</div><div class='ctx'> {</div><div class='ctx'> 	const int size = vptr-&gt;options.numrx * sizeof(struct rx_desc) +</div><div class='del'>-		vptr-&gt;options.numtx * sizeof(struct tx_desc) * vptr-&gt;num_txq;</div><div class='add'>+		vptr-&gt;options.numtx * sizeof(struct tx_desc) * vptr-&gt;tx.numq;</div><div class='ctx'> </div><div class='del'>-	pci_free_consistent(vptr-&gt;pdev, size, vptr-&gt;rd_ring, vptr-&gt;rd_pool_dma);</div><div class='add'>+	pci_free_consistent(vptr-&gt;pdev, size, vptr-&gt;rx.ring, vptr-&gt;rx.pool_dma);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void velocity_give_many_rx_descs(struct velocity_info *vptr)</div><div class='hunk'>@@ -1164,44 +1168,44 @@ static void velocity_give_many_rx_descs(struct velocity_info *vptr)</div><div class='ctx'> 	 * RD number must be equal to 4X per hardware spec</div><div class='ctx'> 	 * (programming guide rev 1.20, p.13)</div><div class='ctx'> 	 */</div><div class='del'>-	if (vptr-&gt;rd_filled &lt; 4)</div><div class='add'>+	if (vptr-&gt;rx.filled &lt; 4)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	wmb();</div><div class='ctx'> </div><div class='del'>-	unusable = vptr-&gt;rd_filled &amp; 0x0003;</div><div class='del'>-	dirty = vptr-&gt;rd_dirty - unusable;</div><div class='del'>-	for (avail = vptr-&gt;rd_filled &amp; 0xfffc; avail; avail--) {</div><div class='add'>+	unusable = vptr-&gt;rx.filled &amp; 0x0003;</div><div class='add'>+	dirty = vptr-&gt;rx.dirty - unusable;</div><div class='add'>+	for (avail = vptr-&gt;rx.filled &amp; 0xfffc; avail; avail--) {</div><div class='ctx'> 		dirty = (dirty &gt; 0) ? dirty - 1 : vptr-&gt;options.numrx - 1;</div><div class='del'>-		vptr-&gt;rd_ring[dirty].rdesc0.len |= OWNED_BY_NIC;</div><div class='add'>+		vptr-&gt;rx.ring[dirty].rdesc0.len |= OWNED_BY_NIC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	writew(vptr-&gt;rd_filled &amp; 0xfffc, &amp;regs-&gt;RBRDU);</div><div class='del'>-	vptr-&gt;rd_filled = unusable;</div><div class='add'>+	writew(vptr-&gt;rx.filled &amp; 0xfffc, &amp;regs-&gt;RBRDU);</div><div class='add'>+	vptr-&gt;rx.filled = unusable;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int velocity_rx_refill(struct velocity_info *vptr)</div><div class='ctx'> {</div><div class='del'>-	int dirty = vptr-&gt;rd_dirty, done = 0;</div><div class='add'>+	int dirty = vptr-&gt;rx.dirty, done = 0;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		struct rx_desc *rd = vptr-&gt;rd_ring + dirty;</div><div class='add'>+		struct rx_desc *rd = vptr-&gt;rx.ring + dirty;</div><div class='ctx'> </div><div class='ctx'> 		/* Fine for an all zero Rx desc at init time as well */</div><div class='ctx'> 		if (rd-&gt;rdesc0.len &amp; OWNED_BY_NIC)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (!vptr-&gt;rd_info[dirty].skb) {</div><div class='add'>+		if (!vptr-&gt;rx.info[dirty].skb) {</div><div class='ctx'> 			if (velocity_alloc_rx_buf(vptr, dirty) &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 		done++;</div><div class='ctx'> 		dirty = (dirty &lt; vptr-&gt;options.numrx - 1) ? dirty + 1 : 0;</div><div class='del'>-	} while (dirty != vptr-&gt;rd_curr);</div><div class='add'>+	} while (dirty != vptr-&gt;rx.curr);</div><div class='ctx'> </div><div class='ctx'> 	if (done) {</div><div class='del'>-		vptr-&gt;rd_dirty = dirty;</div><div class='del'>-		vptr-&gt;rd_filled += done;</div><div class='add'>+		vptr-&gt;rx.dirty = dirty;</div><div class='add'>+		vptr-&gt;rx.filled += done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return done;</div><div class='hunk'>@@ -1209,7 +1213,7 @@ static int velocity_rx_refill(struct velocity_info *vptr)</div><div class='ctx'> </div><div class='ctx'> static void velocity_set_rxbufsize(struct velocity_info *vptr, int mtu)</div><div class='ctx'> {</div><div class='del'>-	vptr-&gt;rx_buf_sz = (mtu &lt;= ETH_DATA_LEN) ? PKT_BUF_SZ : mtu + 32;</div><div class='add'>+	vptr-&gt;rx.buf_sz = (mtu &lt;= ETH_DATA_LEN) ? PKT_BUF_SZ : mtu + 32;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1224,12 +1228,12 @@ static int velocity_init_rd_ring(struct velocity_info *vptr)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	vptr-&gt;rd_info = kcalloc(vptr-&gt;options.numrx,</div><div class='add'>+	vptr-&gt;rx.info = kcalloc(vptr-&gt;options.numrx,</div><div class='ctx'> 				sizeof(struct velocity_rd_info), GFP_KERNEL);</div><div class='del'>-	if (!vptr-&gt;rd_info)</div><div class='add'>+	if (!vptr-&gt;rx.info)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	vptr-&gt;rd_filled = vptr-&gt;rd_dirty = vptr-&gt;rd_curr = 0;</div><div class='add'>+	velocity_init_rx_ring_indexes(vptr);</div><div class='ctx'> </div><div class='ctx'> 	if (velocity_rx_refill(vptr) != vptr-&gt;options.numrx) {</div><div class='ctx'> 		VELOCITY_PRT(MSG_LEVEL_ERR, KERN_ERR</div><div class='hunk'>@@ -1255,18 +1259,18 @@ static void velocity_free_rd_ring(struct velocity_info *vptr)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (vptr-&gt;rd_info == NULL)</div><div class='add'>+	if (vptr-&gt;rx.info == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; vptr-&gt;options.numrx; i++) {</div><div class='del'>-		struct velocity_rd_info *rd_info = &amp;(vptr-&gt;rd_info[i]);</div><div class='del'>-		struct rx_desc *rd = vptr-&gt;rd_ring + i;</div><div class='add'>+		struct velocity_rd_info *rd_info = &amp;(vptr-&gt;rx.info[i]);</div><div class='add'>+		struct rx_desc *rd = vptr-&gt;rx.ring + i;</div><div class='ctx'> </div><div class='ctx'> 		memset(rd, 0, sizeof(*rd));</div><div class='ctx'> </div><div class='ctx'> 		if (!rd_info-&gt;skb)</div><div class='ctx'> 			continue;</div><div class='del'>-		pci_unmap_single(vptr-&gt;pdev, rd_info-&gt;skb_dma, vptr-&gt;rx_buf_sz,</div><div class='add'>+		pci_unmap_single(vptr-&gt;pdev, rd_info-&gt;skb_dma, vptr-&gt;rx.buf_sz,</div><div class='ctx'> 				 PCI_DMA_FROMDEVICE);</div><div class='ctx'> 		rd_info-&gt;skb_dma = (dma_addr_t) NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1274,8 +1278,8 @@ static void velocity_free_rd_ring(struct velocity_info *vptr)</div><div class='ctx'> 		rd_info-&gt;skb = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(vptr-&gt;rd_info);</div><div class='del'>-	vptr-&gt;rd_info = NULL;</div><div class='add'>+	kfree(vptr-&gt;rx.info);</div><div class='add'>+	vptr-&gt;rx.info = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1293,19 +1297,19 @@ static int velocity_init_td_ring(struct velocity_info *vptr)</div><div class='ctx'> 	unsigned int j;</div><div class='ctx'> </div><div class='ctx'> 	/* Init the TD ring entries */</div><div class='del'>-	for (j = 0; j &lt; vptr-&gt;num_txq; j++) {</div><div class='del'>-		curr = vptr-&gt;td_pool_dma[j];</div><div class='add'>+	for (j = 0; j &lt; vptr-&gt;tx.numq; j++) {</div><div class='add'>+		curr = vptr-&gt;tx.pool_dma[j];</div><div class='ctx'> </div><div class='del'>-		vptr-&gt;td_infos[j] = kcalloc(vptr-&gt;options.numtx,</div><div class='add'>+		vptr-&gt;tx.infos[j] = kcalloc(vptr-&gt;options.numtx,</div><div class='ctx'> 					    sizeof(struct velocity_td_info),</div><div class='ctx'> 					    GFP_KERNEL);</div><div class='del'>-		if (!vptr-&gt;td_infos[j])	{</div><div class='add'>+		if (!vptr-&gt;tx.infos[j])	{</div><div class='ctx'> 			while(--j &gt;= 0)</div><div class='del'>-				kfree(vptr-&gt;td_infos[j]);</div><div class='add'>+				kfree(vptr-&gt;tx.infos[j]);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		vptr-&gt;td_tail[j] = vptr-&gt;td_curr[j] = vptr-&gt;td_used[j] = 0;</div><div class='add'>+		vptr-&gt;tx.tail[j] = vptr-&gt;tx.curr[j] = vptr-&gt;tx.used[j] = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1317,7 +1321,7 @@ static int velocity_init_td_ring(struct velocity_info *vptr)</div><div class='ctx'> static void velocity_free_td_ring_entry(struct velocity_info *vptr,</div><div class='ctx'> 							 int q, int n)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_td_info * td_info = &amp;(vptr-&gt;td_infos[q][n]);</div><div class='add'>+	struct velocity_td_info * td_info = &amp;(vptr-&gt;tx.infos[q][n]);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (td_info == NULL)</div><div class='hunk'>@@ -1349,15 +1353,15 @@ static void velocity_free_td_ring(struct velocity_info *vptr)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='del'>-	for (j = 0; j &lt; vptr-&gt;num_txq; j++) {</div><div class='del'>-		if (vptr-&gt;td_infos[j] == NULL)</div><div class='add'>+	for (j = 0; j &lt; vptr-&gt;tx.numq; j++) {</div><div class='add'>+		if (vptr-&gt;tx.infos[j] == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		for (i = 0; i &lt; vptr-&gt;options.numtx; i++) {</div><div class='ctx'> 			velocity_free_td_ring_entry(vptr, j, i);</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='del'>-		kfree(vptr-&gt;td_infos[j]);</div><div class='del'>-		vptr-&gt;td_infos[j] = NULL;</div><div class='add'>+		kfree(vptr-&gt;tx.infos[j]);</div><div class='add'>+		vptr-&gt;tx.infos[j] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1374,13 +1378,13 @@ static void velocity_free_td_ring(struct velocity_info *vptr)</div><div class='ctx'> static int velocity_rx_srv(struct velocity_info *vptr, int status)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device_stats *stats = &amp;vptr-&gt;stats;</div><div class='del'>-	int rd_curr = vptr-&gt;rd_curr;</div><div class='add'>+	int rd_curr = vptr-&gt;rx.curr;</div><div class='ctx'> 	int works = 0;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		struct rx_desc *rd = vptr-&gt;rd_ring + rd_curr;</div><div class='add'>+		struct rx_desc *rd = vptr-&gt;rx.ring + rd_curr;</div><div class='ctx'> </div><div class='del'>-		if (!vptr-&gt;rd_info[rd_curr].skb)</div><div class='add'>+		if (!vptr-&gt;rx.info[rd_curr].skb)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (rd-&gt;rdesc0.len &amp; OWNED_BY_NIC)</div><div class='hunk'>@@ -1412,7 +1416,7 @@ static int velocity_rx_srv(struct velocity_info *vptr, int status)</div><div class='ctx'> 			rd_curr = 0;</div><div class='ctx'> 	} while (++works &lt;= 15);</div><div class='ctx'> </div><div class='del'>-	vptr-&gt;rd_curr = rd_curr;</div><div class='add'>+	vptr-&gt;rx.curr = rd_curr;</div><div class='ctx'> </div><div class='ctx'> 	if ((works &gt; 0) &amp;&amp; (velocity_rx_refill(vptr) &gt; 0))</div><div class='ctx'> 		velocity_give_many_rx_descs(vptr);</div><div class='hunk'>@@ -1510,8 +1514,8 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	void (*pci_action)(struct pci_dev *, dma_addr_t, size_t, int);</div><div class='ctx'> 	struct net_device_stats *stats = &amp;vptr-&gt;stats;</div><div class='del'>-	struct velocity_rd_info *rd_info = &amp;(vptr-&gt;rd_info[idx]);</div><div class='del'>-	struct rx_desc *rd = &amp;(vptr-&gt;rd_ring[idx]);</div><div class='add'>+	struct velocity_rd_info *rd_info = &amp;(vptr-&gt;rx.info[idx]);</div><div class='add'>+	struct rx_desc *rd = &amp;(vptr-&gt;rx.ring[idx]);</div><div class='ctx'> 	int pkt_len = le16_to_cpu(rd-&gt;rdesc0.len) &amp; 0x3fff;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='hunk'>@@ -1527,7 +1531,7 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx)</div><div class='ctx'> 	skb = rd_info-&gt;skb;</div><div class='ctx'> </div><div class='ctx'> 	pci_dma_sync_single_for_cpu(vptr-&gt;pdev, rd_info-&gt;skb_dma,</div><div class='del'>-				    vptr-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='add'>+				    vptr-&gt;rx.buf_sz, PCI_DMA_FROMDEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Drop frame not meeting IEEE 802.3</div><div class='hunk'>@@ -1550,7 +1554,7 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx)</div><div class='ctx'> 		rd_info-&gt;skb = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pci_action(vptr-&gt;pdev, rd_info-&gt;skb_dma, vptr-&gt;rx_buf_sz,</div><div class='add'>+	pci_action(vptr-&gt;pdev, rd_info-&gt;skb_dma, vptr-&gt;rx.buf_sz,</div><div class='ctx'> 		   PCI_DMA_FROMDEVICE);</div><div class='ctx'> </div><div class='ctx'> 	skb_put(skb, pkt_len - 4);</div><div class='hunk'>@@ -1580,10 +1584,10 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx)</div><div class='ctx'> </div><div class='ctx'> static int velocity_alloc_rx_buf(struct velocity_info *vptr, int idx)</div><div class='ctx'> {</div><div class='del'>-	struct rx_desc *rd = &amp;(vptr-&gt;rd_ring[idx]);</div><div class='del'>-	struct velocity_rd_info *rd_info = &amp;(vptr-&gt;rd_info[idx]);</div><div class='add'>+	struct rx_desc *rd = &amp;(vptr-&gt;rx.ring[idx]);</div><div class='add'>+	struct velocity_rd_info *rd_info = &amp;(vptr-&gt;rx.info[idx]);</div><div class='ctx'> </div><div class='del'>-	rd_info-&gt;skb = netdev_alloc_skb(vptr-&gt;dev, vptr-&gt;rx_buf_sz + 64);</div><div class='add'>+	rd_info-&gt;skb = dev_alloc_skb(vptr-&gt;rx.buf_sz + 64);</div><div class='ctx'> 	if (rd_info-&gt;skb == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1592,14 +1596,15 @@ static int velocity_alloc_rx_buf(struct velocity_info *vptr, int idx)</div><div class='ctx'> 	 *	64byte alignment.</div><div class='ctx'> 	 */</div><div class='ctx'> 	skb_reserve(rd_info-&gt;skb, (unsigned long) rd_info-&gt;skb-&gt;data &amp; 63);</div><div class='del'>-	rd_info-&gt;skb_dma = pci_map_single(vptr-&gt;pdev, rd_info-&gt;skb-&gt;data, vptr-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='add'>+	rd_info-&gt;skb_dma = pci_map_single(vptr-&gt;pdev, rd_info-&gt;skb-&gt;data,</div><div class='add'>+					vptr-&gt;rx.buf_sz, PCI_DMA_FROMDEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Fill in the descriptor to match</div><div class='del'>- 	 */</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	*((u32 *) &amp; (rd-&gt;rdesc0)) = 0;</div><div class='del'>-	rd-&gt;size = cpu_to_le16(vptr-&gt;rx_buf_sz) | RX_INTEN;</div><div class='add'>+	rd-&gt;size = cpu_to_le16(vptr-&gt;rx.buf_sz) | RX_INTEN;</div><div class='ctx'> 	rd-&gt;pa_low = cpu_to_le32(rd_info-&gt;skb_dma);</div><div class='ctx'> 	rd-&gt;pa_high = 0;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1625,15 +1630,15 @@ static int velocity_tx_srv(struct velocity_info *vptr, u32 status)</div><div class='ctx'> 	struct velocity_td_info *tdinfo;</div><div class='ctx'> 	struct net_device_stats *stats = &amp;vptr-&gt;stats;</div><div class='ctx'> </div><div class='del'>-	for (qnum = 0; qnum &lt; vptr-&gt;num_txq; qnum++) {</div><div class='del'>-		for (idx = vptr-&gt;td_tail[qnum]; vptr-&gt;td_used[qnum] &gt; 0;</div><div class='add'>+	for (qnum = 0; qnum &lt; vptr-&gt;tx.numq; qnum++) {</div><div class='add'>+		for (idx = vptr-&gt;tx.tail[qnum]; vptr-&gt;tx.used[qnum] &gt; 0;</div><div class='ctx'> 			idx = (idx + 1) % vptr-&gt;options.numtx) {</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 *	Get Tx Descriptor</div><div class='ctx'> 			 */</div><div class='del'>-			td = &amp;(vptr-&gt;td_rings[qnum][idx]);</div><div class='del'>-			tdinfo = &amp;(vptr-&gt;td_infos[qnum][idx]);</div><div class='add'>+			td = &amp;(vptr-&gt;tx.rings[qnum][idx]);</div><div class='add'>+			tdinfo = &amp;(vptr-&gt;tx.infos[qnum][idx]);</div><div class='ctx'> </div><div class='ctx'> 			if (td-&gt;tdesc0.len &amp; OWNED_BY_NIC)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1657,9 +1662,9 @@ static int velocity_tx_srv(struct velocity_info *vptr, u32 status)</div><div class='ctx'> 				stats-&gt;tx_bytes += tdinfo-&gt;skb-&gt;len;</div><div class='ctx'> 			}</div><div class='ctx'> 			velocity_free_tx_buf(vptr, tdinfo);</div><div class='del'>-			vptr-&gt;td_used[qnum]--;</div><div class='add'>+			vptr-&gt;tx.used[qnum]--;</div><div class='ctx'> 		}</div><div class='del'>-		vptr-&gt;td_tail[qnum] = idx;</div><div class='add'>+		vptr-&gt;tx.tail[qnum] = idx;</div><div class='ctx'> </div><div class='ctx'> 		if (AVAIL_TD(vptr, qnum) &lt; 1) {</div><div class='ctx'> 			full = 1;</div><div class='hunk'>@@ -1846,6 +1851,40 @@ static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_</div><div class='ctx'> 	tdinfo-&gt;skb = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int velocity_init_rings(struct velocity_info *vptr, int mtu)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	velocity_set_rxbufsize(vptr, mtu);</div><div class='add'>+</div><div class='add'>+	ret = velocity_init_dma_rings(vptr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = velocity_init_rd_ring(vptr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_free_dma_rings_0;</div><div class='add'>+</div><div class='add'>+	ret = velocity_init_td_ring(vptr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_free_rd_ring_1;</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err_free_rd_ring_1:</div><div class='add'>+	velocity_free_rd_ring(vptr);</div><div class='add'>+err_free_dma_rings_0:</div><div class='add'>+	velocity_free_dma_rings(vptr);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void velocity_free_rings(struct velocity_info *vptr)</div><div class='add'>+{</div><div class='add'>+	velocity_free_td_ring(vptr);</div><div class='add'>+	velocity_free_rd_ring(vptr);</div><div class='add'>+	velocity_free_dma_rings(vptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	velocity_open		-	interface activation callback</div><div class='ctx'>  *	@dev: network layer device to open</div><div class='hunk'>@@ -1862,20 +1901,10 @@ static int velocity_open(struct net_device *dev)</div><div class='ctx'> 	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	velocity_set_rxbufsize(vptr, dev-&gt;mtu);</div><div class='del'>-</div><div class='del'>-	ret = velocity_init_rings(vptr);</div><div class='add'>+	ret = velocity_init_rings(vptr, dev-&gt;mtu);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = velocity_init_rd_ring(vptr);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err_free_desc_rings;</div><div class='del'>-</div><div class='del'>-	ret = velocity_init_td_ring(vptr);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err_free_rd_ring;</div><div class='del'>-</div><div class='ctx'> 	/* Ensure chip is running */</div><div class='ctx'> 	pci_set_power_state(vptr-&gt;pdev, PCI_D0);</div><div class='ctx'> </div><div class='hunk'>@@ -1888,7 +1917,8 @@ static int velocity_open(struct net_device *dev)</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		/* Power down the chip */</div><div class='ctx'> 		pci_set_power_state(vptr-&gt;pdev, PCI_D3hot);</div><div class='del'>-		goto err_free_td_ring;</div><div class='add'>+		velocity_free_rings(vptr);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mac_enable_int(vptr-&gt;mac_regs);</div><div class='hunk'>@@ -1896,14 +1926,6 @@ static int velocity_open(struct net_device *dev)</div><div class='ctx'> 	vptr-&gt;flags |= VELOCITY_FLAGS_OPENED;</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='del'>-</div><div class='del'>-err_free_td_ring:</div><div class='del'>-	velocity_free_td_ring(vptr);</div><div class='del'>-err_free_rd_ring:</div><div class='del'>-	velocity_free_rd_ring(vptr);</div><div class='del'>-err_free_desc_rings:</div><div class='del'>-	velocity_free_rings(vptr);</div><div class='del'>-	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1919,50 +1941,72 @@ err_free_desc_rings:</div><div class='ctx'> static int velocity_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> {</div><div class='ctx'> 	struct velocity_info *vptr = netdev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int oldmtu = dev-&gt;mtu;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((new_mtu &lt; VELOCITY_MIN_MTU) || new_mtu &gt; (VELOCITY_MAX_MTU)) {</div><div class='ctx'> 		VELOCITY_PRT(MSG_LEVEL_ERR, KERN_NOTICE "%s: Invalid MTU.\n",</div><div class='ctx'> 				vptr-&gt;dev-&gt;name);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(dev)) {</div><div class='ctx'> 		dev-&gt;mtu = new_mtu;</div><div class='del'>-		return 0;</div><div class='add'>+		goto out_0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (new_mtu != oldmtu) {</div><div class='add'>+	if (dev-&gt;mtu != new_mtu) {</div><div class='add'>+		struct velocity_info *tmp_vptr;</div><div class='add'>+		unsigned long flags;</div><div class='add'>+		struct rx_info rx;</div><div class='add'>+		struct tx_info tx;</div><div class='add'>+</div><div class='add'>+		tmp_vptr = kzalloc(sizeof(*tmp_vptr), GFP_KERNEL);</div><div class='add'>+		if (!tmp_vptr) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out_0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tmp_vptr-&gt;dev = dev;</div><div class='add'>+		tmp_vptr-&gt;pdev = vptr-&gt;pdev;</div><div class='add'>+		tmp_vptr-&gt;options = vptr-&gt;options;</div><div class='add'>+		tmp_vptr-&gt;tx.numq = vptr-&gt;tx.numq;</div><div class='add'>+</div><div class='add'>+		ret = velocity_init_rings(tmp_vptr, new_mtu);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out_free_tmp_vptr_1;</div><div class='add'>+</div><div class='ctx'> 		spin_lock_irqsave(&amp;vptr-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> 		velocity_shutdown(vptr);</div><div class='ctx'> </div><div class='del'>-		velocity_free_td_ring(vptr);</div><div class='del'>-		velocity_free_rd_ring(vptr);</div><div class='add'>+		rx = vptr-&gt;rx;</div><div class='add'>+		tx = vptr-&gt;tx;</div><div class='ctx'> </div><div class='del'>-		dev-&gt;mtu = new_mtu;</div><div class='add'>+		vptr-&gt;rx = tmp_vptr-&gt;rx;</div><div class='add'>+		vptr-&gt;tx = tmp_vptr-&gt;tx;</div><div class='ctx'> </div><div class='del'>-		velocity_set_rxbufsize(vptr, new_mtu);</div><div class='add'>+		tmp_vptr-&gt;rx = rx;</div><div class='add'>+		tmp_vptr-&gt;tx = tx;</div><div class='ctx'> </div><div class='del'>-		ret = velocity_init_rd_ring(vptr);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out_unlock;</div><div class='add'>+		dev-&gt;mtu = new_mtu;</div><div class='ctx'> </div><div class='del'>-		ret = velocity_init_td_ring(vptr);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out_unlock;</div><div class='add'>+		velocity_give_many_rx_descs(vptr);</div><div class='ctx'> </div><div class='ctx'> 		velocity_init_registers(vptr, VELOCITY_INIT_COLD);</div><div class='ctx'> </div><div class='ctx'> 		mac_enable_int(vptr-&gt;mac_regs);</div><div class='ctx'> 		netif_start_queue(dev);</div><div class='del'>-out_unlock:</div><div class='add'>+</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;vptr-&gt;lock, flags);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+		velocity_free_rings(tmp_vptr);</div><div class='add'>+</div><div class='add'>+out_free_tmp_vptr_1:</div><div class='add'>+		kfree(tmp_vptr);</div><div class='add'>+	}</div><div class='add'>+out_0:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2008,9 +2052,6 @@ static int velocity_close(struct net_device *dev)</div><div class='ctx'> 	/* Power down the chip */</div><div class='ctx'> 	pci_set_power_state(vptr-&gt;pdev, PCI_D3hot);</div><div class='ctx'> </div><div class='del'>-	/* Free the resources */</div><div class='del'>-	velocity_free_td_ring(vptr);</div><div class='del'>-	velocity_free_rd_ring(vptr);</div><div class='ctx'> 	velocity_free_rings(vptr);</div><div class='ctx'> </div><div class='ctx'> 	vptr-&gt;flags &amp;= (~VELOCITY_FLAGS_OPENED);</div><div class='hunk'>@@ -2056,9 +2097,9 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;vptr-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	index = vptr-&gt;td_curr[qnum];</div><div class='del'>-	td_ptr = &amp;(vptr-&gt;td_rings[qnum][index]);</div><div class='del'>-	tdinfo = &amp;(vptr-&gt;td_infos[qnum][index]);</div><div class='add'>+	index = vptr-&gt;tx.curr[qnum];</div><div class='add'>+	td_ptr = &amp;(vptr-&gt;tx.rings[qnum][index]);</div><div class='add'>+	tdinfo = &amp;(vptr-&gt;tx.infos[qnum][index]);</div><div class='ctx'> </div><div class='ctx'> 	td_ptr-&gt;tdesc1.TCR = TCR0_TIC;</div><div class='ctx'> 	td_ptr-&gt;td_buf[0].size &amp;= ~TD_QUEUE;</div><div class='hunk'>@@ -2071,9 +2112,9 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			skb_copy_from_linear_data(skb, tdinfo-&gt;buf, skb-&gt;len);</div><div class='ctx'> 			tdinfo-&gt;skb_dma[0] = tdinfo-&gt;buf_dma;</div><div class='ctx'> 			td_ptr-&gt;tdesc0.len = len;</div><div class='del'>-			td_ptr-&gt;td_buf[0].pa_low = cpu_to_le32(tdinfo-&gt;skb_dma[0]);</div><div class='del'>-			td_ptr-&gt;td_buf[0].pa_high = 0;</div><div class='del'>-			td_ptr-&gt;td_buf[0].size = len;	/* queue is 0 anyway */</div><div class='add'>+			td_ptr-&gt;tx.buf[0].pa_low = cpu_to_le32(tdinfo-&gt;skb_dma[0]);</div><div class='add'>+			td_ptr-&gt;tx.buf[0].pa_high = 0;</div><div class='add'>+			td_ptr-&gt;tx.buf[0].size = len;	/* queue is 0 anyway */</div><div class='ctx'> 			tdinfo-&gt;nskb_dma = 1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			int i = 0;</div><div class='hunk'>@@ -2084,9 +2125,9 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			td_ptr-&gt;tdesc0.len = len;</div><div class='ctx'> </div><div class='ctx'> 			/* FIXME: support 48bit DMA later */</div><div class='del'>-			td_ptr-&gt;td_buf[i].pa_low = cpu_to_le32(tdinfo-&gt;skb_dma);</div><div class='del'>-			td_ptr-&gt;td_buf[i].pa_high = 0;</div><div class='del'>-			td_ptr-&gt;td_buf[i].size = cpu_to_le16(skb_headlen(skb));</div><div class='add'>+			td_ptr-&gt;tx.buf[i].pa_low = cpu_to_le32(tdinfo-&gt;skb_dma);</div><div class='add'>+			td_ptr-&gt;tx.buf[i].pa_high = 0;</div><div class='add'>+			td_ptr-&gt;tx.buf[i].size = cpu_to_le16(skb_headlen(skb));</div><div class='ctx'> </div><div class='ctx'> 			for (i = 0; i &lt; nfrags; i++) {</div><div class='ctx'> 				skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='hunk'>@@ -2094,9 +2135,9 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 				tdinfo-&gt;skb_dma[i + 1] = pci_map_single(vptr-&gt;pdev, addr, frag-&gt;size, PCI_DMA_TODEVICE);</div><div class='ctx'> </div><div class='del'>-				td_ptr-&gt;td_buf[i + 1].pa_low = cpu_to_le32(tdinfo-&gt;skb_dma[i + 1]);</div><div class='del'>-				td_ptr-&gt;td_buf[i + 1].pa_high = 0;</div><div class='del'>-				td_ptr-&gt;td_buf[i + 1].size = cpu_to_le16(frag-&gt;size);</div><div class='add'>+				td_ptr-&gt;tx.buf[i + 1].pa_low = cpu_to_le32(tdinfo-&gt;skb_dma[i + 1]);</div><div class='add'>+				td_ptr-&gt;tx.buf[i + 1].pa_high = 0;</div><div class='add'>+				td_ptr-&gt;tx.buf[i + 1].size = cpu_to_le16(frag-&gt;size);</div><div class='ctx'> 			}</div><div class='ctx'> 			tdinfo-&gt;nskb_dma = i - 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2142,13 +2183,13 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		if (prev &lt; 0)</div><div class='ctx'> 			prev = vptr-&gt;options.numtx - 1;</div><div class='ctx'> 		td_ptr-&gt;tdesc0.len |= OWNED_BY_NIC;</div><div class='del'>-		vptr-&gt;td_used[qnum]++;</div><div class='del'>-		vptr-&gt;td_curr[qnum] = (index + 1) % vptr-&gt;options.numtx;</div><div class='add'>+		vptr-&gt;tx.used[qnum]++;</div><div class='add'>+		vptr-&gt;tx.curr[qnum] = (index + 1) % vptr-&gt;options.numtx;</div><div class='ctx'> </div><div class='ctx'> 		if (AVAIL_TD(vptr, qnum) &lt; 1)</div><div class='ctx'> 			netif_stop_queue(dev);</div><div class='ctx'> </div><div class='del'>-		td_ptr = &amp;(vptr-&gt;td_rings[qnum][prev]);</div><div class='add'>+		td_ptr = &amp;(vptr-&gt;tx.rings[qnum][prev]);</div><div class='ctx'> 		td_ptr-&gt;td_buf[0].size |= TD_QUEUE;</div><div class='ctx'> 		mac_tx_queue_wake(vptr-&gt;mac_regs, qnum);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3405,8 +3446,8 @@ static int velocity_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	velocity_tx_srv(vptr, 0);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; vptr-&gt;num_txq; i++) {</div><div class='del'>-		if (vptr-&gt;td_used[i]) {</div><div class='add'>+	for (i = 0; i &lt; vptr-&gt;tx.numq; i++) {</div><div class='add'>+		if (vptr-&gt;tx.used[i]) {</div><div class='ctx'> 			mac_tx_queue_wake(vptr-&gt;mac_regs, i);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h<br/>index 86446147284c..1b95b04c9257 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/via-velocity.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/via-velocity.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/via-velocity.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/via-velocity.h</a></div><div class='hunk'>@@ -1494,6 +1494,10 @@ struct velocity_opt {</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define AVAIL_TD(p,q)   ((p)-&gt;options.numtx-((p)-&gt;tx.used[(q)]))</div><div class='add'>+</div><div class='add'>+#define GET_RD_BY_IDX(vptr, idx)   (vptr-&gt;rd_ring[idx])</div><div class='add'>+</div><div class='ctx'> struct velocity_info {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> </div><div class='hunk'>@@ -1501,9 +1505,6 @@ struct velocity_info {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct net_device_stats stats;</div><div class='ctx'> </div><div class='del'>-	dma_addr_t rd_pool_dma;</div><div class='del'>-	dma_addr_t td_pool_dma[TX_QUEUE_NO];</div><div class='del'>-</div><div class='ctx'> 	struct vlan_group    *vlgrp;</div><div class='ctx'> 	u8 ip_addr[4];</div><div class='ctx'> 	enum chip_type chip_id;</div><div class='hunk'>@@ -1512,25 +1513,29 @@ struct velocity_info {</div><div class='ctx'> 	unsigned long memaddr;</div><div class='ctx'> 	unsigned long ioaddr;</div><div class='ctx'> </div><div class='del'>-	u8 rev_id;</div><div class='del'>-</div><div class='del'>-#define AVAIL_TD(p,q)   ((p)-&gt;options.numtx-((p)-&gt;td_used[(q)]))</div><div class='add'>+	struct tx_info {</div><div class='add'>+		int numq;</div><div class='add'>+</div><div class='add'>+		/* FIXME: the locality of the data seems rather poor. */</div><div class='add'>+		int used[TX_QUEUE_NO];</div><div class='add'>+		int curr[TX_QUEUE_NO];</div><div class='add'>+		int tail[TX_QUEUE_NO];</div><div class='add'>+		struct tx_desc *rings[TX_QUEUE_NO];</div><div class='add'>+		struct velocity_td_info *infos[TX_QUEUE_NO];</div><div class='add'>+		dma_addr_t pool_dma[TX_QUEUE_NO];</div><div class='add'>+	} tx;</div><div class='add'>+</div><div class='add'>+	struct rx_info {</div><div class='add'>+		int buf_sz;</div><div class='add'>+</div><div class='add'>+		int dirty;</div><div class='add'>+		int curr;</div><div class='add'>+		u32 filled;</div><div class='add'>+		struct rx_desc *ring;</div><div class='add'>+		struct velocity_rd_info *info;	/* It's an array */</div><div class='add'>+		dma_addr_t pool_dma;</div><div class='add'>+	} rx;</div><div class='ctx'> </div><div class='del'>-	int num_txq;</div><div class='del'>-</div><div class='del'>-	volatile int td_used[TX_QUEUE_NO];</div><div class='del'>-	int td_curr[TX_QUEUE_NO];</div><div class='del'>-	int td_tail[TX_QUEUE_NO];</div><div class='del'>-	struct tx_desc *td_rings[TX_QUEUE_NO];</div><div class='del'>-	struct velocity_td_info *td_infos[TX_QUEUE_NO];</div><div class='del'>-</div><div class='del'>-	int rd_curr;</div><div class='del'>-	int rd_dirty;</div><div class='del'>-	u32 rd_filled;</div><div class='del'>-	struct rx_desc *rd_ring;</div><div class='del'>-	struct velocity_rd_info *rd_info;	/* It's an array */</div><div class='del'>-</div><div class='del'>-#define GET_RD_BY_IDX(vptr, idx)   (vptr-&gt;rd_ring[idx])</div><div class='ctx'> 	u32 mib_counter[MAX_HW_MIB_COUNTER];</div><div class='ctx'> 	struct velocity_opt options;</div><div class='ctx'> </div><div class='hunk'>@@ -1538,7 +1543,6 @@ struct velocity_info {</div><div class='ctx'> </div><div class='ctx'> 	u32 flags;</div><div class='ctx'> </div><div class='del'>-	int rx_buf_sz;</div><div class='ctx'> 	u32 mii_status;</div><div class='ctx'> 	u32 phy_id;</div><div class='ctx'> 	int multicast_limit;</div><div class='hunk'>@@ -1554,8 +1558,8 @@ struct velocity_info {</div><div class='ctx'> 	struct velocity_context context;</div><div class='ctx'> </div><div class='ctx'> 	u32 ticks;</div><div class='del'>-	u32 rx_bytes;</div><div class='ctx'> </div><div class='add'>+	u8 rev_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig<br/>index 846be60e7821..2ae2ec40015d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/Kconfig</a></div><div class='hunk'>@@ -25,7 +25,7 @@ if WAN</div><div class='ctx'> # There is no way to detect a comtrol sv11 - force it modular for now.</div><div class='ctx'> config HOSTESS_SV11</div><div class='ctx'> 	tristate "Comtrol Hostess SV-11 support"</div><div class='del'>-	depends on ISA &amp;&amp; m &amp;&amp; ISA_DMA_API &amp;&amp; INET</div><div class='add'>+	depends on ISA &amp;&amp; m &amp;&amp; ISA_DMA_API &amp;&amp; INET &amp;&amp; HDLC</div><div class='ctx'> 	help</div><div class='ctx'> 	  Driver for Comtrol Hostess SV-11 network card which</div><div class='ctx'> 	  operates on low speed synchronous serial links at up to</div><div class='hunk'>@@ -37,7 +37,7 @@ config HOSTESS_SV11</div><div class='ctx'> # The COSA/SRP driver has not been tested as non-modular yet.</div><div class='ctx'> config COSA</div><div class='ctx'> 	tristate "COSA/SRP sync serial boards support"</div><div class='del'>-	depends on ISA &amp;&amp; m &amp;&amp; ISA_DMA_API</div><div class='add'>+	depends on ISA &amp;&amp; m &amp;&amp; ISA_DMA_API &amp;&amp; HDLC</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Driver for COSA and SRP synchronous serial boards.</div><div class='ctx'> </div><div class='hunk'>@@ -61,7 +61,7 @@ config COSA</div><div class='ctx'> #</div><div class='ctx'> config LANMEDIA</div><div class='ctx'> 	tristate "LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards"</div><div class='del'>-	depends on PCI &amp;&amp; VIRT_TO_BUS</div><div class='add'>+	depends on PCI &amp;&amp; VIRT_TO_BUS &amp;&amp; HDLC</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Driver for the following Lan Media family of serial boards:</div><div class='ctx'> </div><div class='hunk'>@@ -78,9 +78,8 @@ config LANMEDIA</div><div class='ctx'> 	  - LMC 5245 board connects directly to a T3 circuit saving the</div><div class='ctx'> 	  additional external hardware.</div><div class='ctx'> </div><div class='del'>-	  To change setting such as syncPPP vs Cisco HDLC or clock source you</div><div class='del'>-	  will need lmcctl.  It is available at &lt;ftp://ftp.lanmedia.com/&gt;</div><div class='del'>-	  (broken link).</div><div class='add'>+	  To change setting such as clock source you will need lmcctl.</div><div class='add'>+	  It is available at &lt;ftp://ftp.lanmedia.com/&gt; (broken link).</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called lmc.</div><div class='hunk'>@@ -88,7 +87,7 @@ config LANMEDIA</div><div class='ctx'> # There is no way to detect a Sealevel board. Force it modular</div><div class='ctx'> config SEALEVEL_4021</div><div class='ctx'> 	tristate "Sealevel Systems 4021 support"</div><div class='del'>-	depends on ISA &amp;&amp; m &amp;&amp; ISA_DMA_API &amp;&amp; INET</div><div class='add'>+	depends on ISA &amp;&amp; m &amp;&amp; ISA_DMA_API &amp;&amp; INET &amp;&amp; HDLC</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is a driver for the Sealevel Systems ACB 56 serial I/O adapter.</div><div class='ctx'> </div><div class='hunk'>@@ -154,8 +153,6 @@ config HDLC_PPP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Generic HDLC driver supporting PPP over WAN connections.</div><div class='ctx'> </div><div class='del'>-	  It will be replaced by new PPP implementation in Linux 2.6.26.</div><div class='del'>-</div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config HDLC_X25</div><div class='head'>diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile<br/>index d61fef36afc9..102549605d09 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/Makefile</a></div><div class='hunk'>@@ -21,12 +21,11 @@ pc300-y				:= pc300_drv.o</div><div class='ctx'> pc300-$(CONFIG_PC300_MLPPP)	+= pc300_tty.o</div><div class='ctx'> pc300-objs			:= $(pc300-y)</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_HOSTESS_SV11)	+= z85230.o	syncppp.o	hostess_sv11.o</div><div class='del'>-obj-$(CONFIG_SEALEVEL_4021)	+= z85230.o	syncppp.o	sealevel.o</div><div class='del'>-obj-$(CONFIG_COSA)		+=		syncppp.o	cosa.o</div><div class='del'>-obj-$(CONFIG_FARSYNC)		+=		syncppp.o	farsync.o</div><div class='del'>-obj-$(CONFIG_DSCC4)             +=				dscc4.o</div><div class='del'>-obj-$(CONFIG_LANMEDIA)		+=		syncppp.o</div><div class='add'>+obj-$(CONFIG_HOSTESS_SV11)	+= z85230.o	hostess_sv11.o</div><div class='add'>+obj-$(CONFIG_SEALEVEL_4021)	+= z85230.o	sealevel.o</div><div class='add'>+obj-$(CONFIG_COSA)		+= cosa.o</div><div class='add'>+obj-$(CONFIG_FARSYNC)		+= farsync.o</div><div class='add'>+obj-$(CONFIG_DSCC4)             += dscc4.o</div><div class='ctx'> obj-$(CONFIG_X25_ASY)		+= x25_asy.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_LANMEDIA)		+= lmc/</div><div class='head'>diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c<br/>index f7d3349dc3ec..f14051556c87 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/cosa.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/cosa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/cosa.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/cosa.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (C) 1995-1997  Jan "Yenya" Kasprzak &lt;kas@fi.muni.cz&gt;</div><div class='add'>+ *  Generic HDLC port Copyright (C) 2008 Krzysztof Halasa &lt;khc@pm.waw.pl&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -54,7 +55,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * The Linux driver (unlike the present *BSD drivers :-) can work even</div><div class='ctx'>  * for the COSA and SRP in one computer and allows each channel to work</div><div class='del'>- * in one of the three modes (character device, Cisco HDLC, Sync PPP).</div><div class='add'>+ * in one of the two modes (character or network device).</div><div class='ctx'>  *</div><div class='ctx'>  * AUTHOR</div><div class='ctx'>  *</div><div class='hunk'>@@ -72,12 +73,6 @@</div><div class='ctx'>  * The Comtrol Hostess SV11 driver by Alan Cox</div><div class='ctx'>  * The Sync PPP/Cisco HDLC layer (syncppp.c) ported to Linux by Alan Cox</div><div class='ctx'>  */</div><div class='del'>-/*</div><div class='del'>- *     5/25/1999 : Marcelo Tosatti &lt;marcelo@conectiva.com.br&gt;</div><div class='del'>- *             fixed a deadlock in cosa_sppp_open</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* ---------- Headers, macros, data structures ---------- */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -86,6 +81,7 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/hdlc.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -93,14 +89,12 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='del'>-</div><div class='del'>-#undef COSA_SLOW_IO	/* for testing purposes only */</div><div class='del'>-</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;net/syncppp.h&gt;</div><div class='add'>+#undef COSA_SLOW_IO	/* for testing purposes only */</div><div class='add'>+</div><div class='ctx'> #include "cosa.h"</div><div class='ctx'> </div><div class='ctx'> /* Maximum length of the identification string. */</div><div class='hunk'>@@ -112,7 +106,6 @@</div><div class='ctx'> /* Per-channel data structure */</div><div class='ctx'> </div><div class='ctx'> struct channel_data {</div><div class='del'>-	void *if_ptr;	/* General purpose pointer (used by SPPP) */</div><div class='ctx'> 	int usage;	/* Usage count; &gt;0 for chrdev, -1 for netdev */</div><div class='ctx'> 	int num;	/* Number of the channel */</div><div class='ctx'> 	struct cosa_data *cosa;	/* Pointer to the per-card structure */</div><div class='hunk'>@@ -136,10 +129,9 @@ struct channel_data {</div><div class='ctx'> 	wait_queue_head_t txwaitq, rxwaitq;</div><div class='ctx'> 	int tx_status, rx_status;</div><div class='ctx'> </div><div class='del'>-	/* SPPP/HDLC device parts */</div><div class='del'>-	struct ppp_device pppdev;</div><div class='add'>+	/* generic HDLC device parts */</div><div class='add'>+	struct net_device *netdev;</div><div class='ctx'> 	struct sk_buff *rx_skb, *tx_skb;</div><div class='del'>-	struct net_device_stats stats;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* cosa-&gt;firmware_status bits */</div><div class='hunk'>@@ -281,21 +273,19 @@ static int cosa_start_tx(struct channel_data *channel, char *buf, int size);</div><div class='ctx'> static void cosa_kick(struct cosa_data *cosa);</div><div class='ctx'> static int cosa_dma_able(struct channel_data *chan, char *buf, int data);</div><div class='ctx'> </div><div class='del'>-/* SPPP/HDLC stuff */</div><div class='del'>-static void sppp_channel_init(struct channel_data *chan);</div><div class='del'>-static void sppp_channel_delete(struct channel_data *chan);</div><div class='del'>-static int cosa_sppp_open(struct net_device *d);</div><div class='del'>-static int cosa_sppp_close(struct net_device *d);</div><div class='del'>-static void cosa_sppp_timeout(struct net_device *d);</div><div class='del'>-static int cosa_sppp_tx(struct sk_buff *skb, struct net_device *d);</div><div class='del'>-static char *sppp_setup_rx(struct channel_data *channel, int size);</div><div class='del'>-static int sppp_rx_done(struct channel_data *channel);</div><div class='del'>-static int sppp_tx_done(struct channel_data *channel, int size);</div><div class='del'>-static int cosa_sppp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);</div><div class='del'>-static struct net_device_stats *cosa_net_stats(struct net_device *dev);</div><div class='add'>+/* Network device stuff */</div><div class='add'>+static int cosa_net_attach(struct net_device *dev, unsigned short encoding,</div><div class='add'>+			   unsigned short parity);</div><div class='add'>+static int cosa_net_open(struct net_device *d);</div><div class='add'>+static int cosa_net_close(struct net_device *d);</div><div class='add'>+static void cosa_net_timeout(struct net_device *d);</div><div class='add'>+static int cosa_net_tx(struct sk_buff *skb, struct net_device *d);</div><div class='add'>+static char *cosa_net_setup_rx(struct channel_data *channel, int size);</div><div class='add'>+static int cosa_net_rx_done(struct channel_data *channel);</div><div class='add'>+static int cosa_net_tx_done(struct channel_data *channel, int size);</div><div class='add'>+static int cosa_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);</div><div class='ctx'> </div><div class='ctx'> /* Character device */</div><div class='del'>-static void chardev_channel_init(struct channel_data *chan);</div><div class='ctx'> static char *chrdev_setup_rx(struct channel_data *channel, int size);</div><div class='ctx'> static int chrdev_rx_done(struct channel_data *channel);</div><div class='ctx'> static int chrdev_tx_done(struct channel_data *channel, int size);</div><div class='hunk'>@@ -357,17 +347,17 @@ static void debug_status_in(struct cosa_data *cosa, int status);</div><div class='ctx'> static void debug_status_out(struct cosa_data *cosa, int status);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+static inline struct channel_data* dev_to_chan(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return (struct channel_data *)dev_to_hdlc(dev)-&gt;priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* ---------- Initialization stuff ---------- */</div><div class='ctx'> </div><div class='ctx'> static int __init cosa_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err = 0;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "cosa v1.08 (c) 1997-2000 Jan Kasprzak &lt;kas@fi.muni.cz&gt;\n");</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	printk(KERN_INFO "cosa: SMP found. Please mail any success/failure reports to the author.\n");</div><div class='del'>-#endif</div><div class='ctx'> 	if (cosa_major &gt; 0) {</div><div class='ctx'> 		if (register_chrdev(cosa_major, "cosa", &amp;cosa_fops)) {</div><div class='ctx'> 			printk(KERN_WARNING "cosa: unable to get major %d\n",</div><div class='hunk'>@@ -402,7 +392,7 @@ static int __init cosa_init(void)</div><div class='ctx'> 				      NULL, "cosa%d", i);</div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	goto out;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> out_chrdev:</div><div class='ctx'> 	unregister_chrdev(cosa_major, "cosa");</div><div class='ctx'> out:</div><div class='hunk'>@@ -414,43 +404,29 @@ static void __exit cosa_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct cosa_data *cosa;</div><div class='ctx'> 	int i;</div><div class='del'>-	printk(KERN_INFO "Unloading the cosa module\n");</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;nr_cards; i++)</div><div class='add'>+	for (i = 0; i &lt; nr_cards; i++)</div><div class='ctx'> 		device_destroy(cosa_class, MKDEV(cosa_major, i));</div><div class='ctx'> 	class_destroy(cosa_class);</div><div class='del'>-	for (cosa=cosa_cards; nr_cards--; cosa++) {</div><div class='add'>+</div><div class='add'>+	for (cosa = cosa_cards; nr_cards--; cosa++) {</div><div class='ctx'> 		/* Clean up the per-channel data */</div><div class='del'>-		for (i=0; i&lt;cosa-&gt;nchannels; i++) {</div><div class='add'>+		for (i = 0; i &lt; cosa-&gt;nchannels; i++) {</div><div class='ctx'> 			/* Chardev driver has no alloc'd per-channel data */</div><div class='del'>-			sppp_channel_delete(cosa-&gt;chan+i);</div><div class='add'>+			unregister_hdlc_device(cosa-&gt;chan[i].netdev);</div><div class='add'>+			free_netdev(cosa-&gt;chan[i].netdev);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Clean up the per-card data */</div><div class='ctx'> 		kfree(cosa-&gt;chan);</div><div class='ctx'> 		kfree(cosa-&gt;bouncebuf);</div><div class='ctx'> 		free_irq(cosa-&gt;irq, cosa);</div><div class='ctx'> 		free_dma(cosa-&gt;dma);</div><div class='del'>-		release_region(cosa-&gt;datareg,is_8bit(cosa)?2:4);</div><div class='add'>+		release_region(cosa-&gt;datareg, is_8bit(cosa) ? 2 : 4);</div><div class='ctx'> 	}</div><div class='ctx'> 	unregister_chrdev(cosa_major, "cosa");</div><div class='ctx'> }</div><div class='ctx'> module_exit(cosa_exit);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This function should register all the net devices needed for the</div><div class='del'>- * single channel.</div><div class='del'>- */</div><div class='del'>-static __inline__ void channel_init(struct channel_data *chan)</div><div class='del'>-{</div><div class='del'>-	sprintf(chan-&gt;name, "cosa%dc%d", chan-&gt;cosa-&gt;num, chan-&gt;num);</div><div class='del'>-</div><div class='del'>-	/* Initialize the chardev data structures */</div><div class='del'>-	chardev_channel_init(chan);</div><div class='del'>-</div><div class='del'>-	/* Register the sppp interface */</div><div class='del'>-	sppp_channel_init(chan);</div><div class='del'>-}</div><div class='del'>-	</div><div class='ctx'> static int cosa_probe(int base, int irq, int dma)</div><div class='ctx'> {</div><div class='ctx'> 	struct cosa_data *cosa = cosa_cards+nr_cards;</div><div class='hunk'>@@ -576,13 +552,43 @@ static int cosa_probe(int base, int irq, int dma)</div><div class='ctx'> 	/* Initialize the per-channel data */</div><div class='ctx'> 	cosa-&gt;chan = kcalloc(cosa-&gt;nchannels, sizeof(struct channel_data), GFP_KERNEL);</div><div class='ctx'> 	if (!cosa-&gt;chan) {</div><div class='del'>-	        err = -ENOMEM;</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto err_out3;</div><div class='ctx'> 	}</div><div class='del'>-	for (i=0; i&lt;cosa-&gt;nchannels; i++) {</div><div class='del'>-		cosa-&gt;chan[i].cosa = cosa;</div><div class='del'>-		cosa-&gt;chan[i].num = i;</div><div class='del'>-		channel_init(cosa-&gt;chan+i);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cosa-&gt;nchannels; i++) {</div><div class='add'>+		struct channel_data *chan = &amp;cosa-&gt;chan[i];</div><div class='add'>+</div><div class='add'>+		chan-&gt;cosa = cosa;</div><div class='add'>+		chan-&gt;num = i;</div><div class='add'>+		sprintf(chan-&gt;name, "cosa%dc%d", chan-&gt;cosa-&gt;num, i);</div><div class='add'>+</div><div class='add'>+		/* Initialize the chardev data structures */</div><div class='add'>+		mutex_init(&amp;chan-&gt;rlock);</div><div class='add'>+		init_MUTEX(&amp;chan-&gt;wsem);</div><div class='add'>+</div><div class='add'>+		/* Register the network interface */</div><div class='add'>+		if (!(chan-&gt;netdev = alloc_hdlcdev(chan))) {</div><div class='add'>+			printk(KERN_WARNING "%s: alloc_hdlcdev failed.\n",</div><div class='add'>+			       chan-&gt;name);</div><div class='add'>+			goto err_hdlcdev;</div><div class='add'>+		}</div><div class='add'>+		dev_to_hdlc(chan-&gt;netdev)-&gt;attach = cosa_net_attach;</div><div class='add'>+		dev_to_hdlc(chan-&gt;netdev)-&gt;xmit = cosa_net_tx;</div><div class='add'>+		chan-&gt;netdev-&gt;open = cosa_net_open;</div><div class='add'>+		chan-&gt;netdev-&gt;stop = cosa_net_close;</div><div class='add'>+		chan-&gt;netdev-&gt;do_ioctl = cosa_net_ioctl;</div><div class='add'>+		chan-&gt;netdev-&gt;tx_timeout = cosa_net_timeout;</div><div class='add'>+		chan-&gt;netdev-&gt;watchdog_timeo = TX_TIMEOUT;</div><div class='add'>+		chan-&gt;netdev-&gt;base_addr = chan-&gt;cosa-&gt;datareg;</div><div class='add'>+		chan-&gt;netdev-&gt;irq = chan-&gt;cosa-&gt;irq;</div><div class='add'>+		chan-&gt;netdev-&gt;dma = chan-&gt;cosa-&gt;dma;</div><div class='add'>+		if (register_hdlc_device(chan-&gt;netdev)) {</div><div class='add'>+			printk(KERN_WARNING "%s: register_hdlc_device()"</div><div class='add'>+			       " failed.\n", chan-&gt;netdev-&gt;name);</div><div class='add'>+			free_netdev(chan-&gt;netdev);</div><div class='add'>+			goto err_hdlcdev;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk (KERN_INFO "cosa%d: %s (%s at 0x%x irq %d dma %d), %d channels\n",</div><div class='hunk'>@@ -590,13 +596,20 @@ static int cosa_probe(int base, int irq, int dma)</div><div class='ctx'> 		cosa-&gt;datareg, cosa-&gt;irq, cosa-&gt;dma, cosa-&gt;nchannels);</div><div class='ctx'> </div><div class='ctx'> 	return nr_cards++;</div><div class='add'>+</div><div class='add'>+err_hdlcdev:</div><div class='add'>+	while (i-- &gt; 0) {</div><div class='add'>+		unregister_hdlc_device(cosa-&gt;chan[i].netdev);</div><div class='add'>+		free_netdev(cosa-&gt;chan[i].netdev);</div><div class='add'>+	}</div><div class='add'>+	kfree(cosa-&gt;chan);</div><div class='ctx'> err_out3:</div><div class='ctx'> 	kfree(cosa-&gt;bouncebuf);</div><div class='ctx'> err_out2:</div><div class='ctx'> 	free_dma(cosa-&gt;dma);</div><div class='ctx'> err_out1:</div><div class='ctx'> 	free_irq(cosa-&gt;irq, cosa);</div><div class='del'>-err_out:	</div><div class='add'>+err_out:</div><div class='ctx'> 	release_region(cosa-&gt;datareg,is_8bit(cosa)?2:4);</div><div class='ctx'> 	printk(KERN_NOTICE "cosa%d: allocating resources failed\n",</div><div class='ctx'> 	       cosa-&gt;num);</div><div class='hunk'>@@ -604,54 +617,19 @@ err_out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*---------- SPPP/HDLC netdevice ---------- */</div><div class='add'>+/*---------- network device ---------- */</div><div class='ctx'> </div><div class='del'>-static void cosa_setup(struct net_device *d)</div><div class='add'>+static int cosa_net_attach(struct net_device *dev, unsigned short encoding,</div><div class='add'>+			   unsigned short parity)</div><div class='ctx'> {</div><div class='del'>-	d-&gt;open = cosa_sppp_open;</div><div class='del'>-	d-&gt;stop = cosa_sppp_close;</div><div class='del'>-	d-&gt;hard_start_xmit = cosa_sppp_tx;</div><div class='del'>-	d-&gt;do_ioctl = cosa_sppp_ioctl;</div><div class='del'>-	d-&gt;get_stats = cosa_net_stats;</div><div class='del'>-	d-&gt;tx_timeout = cosa_sppp_timeout;</div><div class='del'>-	d-&gt;watchdog_timeo = TX_TIMEOUT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sppp_channel_init(struct channel_data *chan)</div><div class='del'>-{</div><div class='del'>-	struct net_device *d;</div><div class='del'>-	chan-&gt;if_ptr = &amp;chan-&gt;pppdev;</div><div class='del'>-	d = alloc_netdev(0, chan-&gt;name, cosa_setup);</div><div class='del'>-	if (!d) {</div><div class='del'>-		printk(KERN_WARNING "%s: alloc_netdev failed.\n", chan-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	chan-&gt;pppdev.dev = d;</div><div class='del'>-	d-&gt;base_addr = chan-&gt;cosa-&gt;datareg;</div><div class='del'>-	d-&gt;irq = chan-&gt;cosa-&gt;irq;</div><div class='del'>-	d-&gt;dma = chan-&gt;cosa-&gt;dma;</div><div class='del'>-	d-&gt;ml_priv = chan;</div><div class='del'>-	sppp_attach(&amp;chan-&gt;pppdev);</div><div class='del'>-	if (register_netdev(d)) {</div><div class='del'>-		printk(KERN_WARNING "%s: register_netdev failed.\n", d-&gt;name);</div><div class='del'>-		sppp_detach(d);</div><div class='del'>-		free_netdev(d);</div><div class='del'>-		chan-&gt;pppdev.dev = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sppp_channel_delete(struct channel_data *chan)</div><div class='del'>-{</div><div class='del'>-	unregister_netdev(chan-&gt;pppdev.dev);</div><div class='del'>-	sppp_detach(chan-&gt;pppdev.dev);</div><div class='del'>-	free_netdev(chan-&gt;pppdev.dev);</div><div class='del'>-	chan-&gt;pppdev.dev = NULL;</div><div class='add'>+	if (encoding == ENCODING_NRZ &amp;&amp; parity == PARITY_CRC16_PR1_CCITT)</div><div class='add'>+		return 0;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cosa_sppp_open(struct net_device *d)</div><div class='add'>+static int cosa_net_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct channel_data *chan = d-&gt;ml_priv;</div><div class='add'>+	struct channel_data *chan = dev_to_chan(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -662,36 +640,35 @@ static int cosa_sppp_open(struct net_device *d)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_lock_irqsave(&amp;chan-&gt;cosa-&gt;lock, flags);</div><div class='ctx'> 	if (chan-&gt;usage != 0) {</div><div class='del'>-		printk(KERN_WARNING "%s: sppp_open called with usage count %d\n",</div><div class='del'>-			chan-&gt;name, chan-&gt;usage);</div><div class='add'>+		printk(KERN_WARNING "%s: cosa_net_open called with usage count"</div><div class='add'>+		       " %d\n", chan-&gt;name, chan-&gt;usage);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;chan-&gt;cosa-&gt;lock, flags);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	chan-&gt;setup_rx = sppp_setup_rx;</div><div class='del'>-	chan-&gt;tx_done = sppp_tx_done;</div><div class='del'>-	chan-&gt;rx_done = sppp_rx_done;</div><div class='del'>-	chan-&gt;usage=-1;</div><div class='add'>+	chan-&gt;setup_rx = cosa_net_setup_rx;</div><div class='add'>+	chan-&gt;tx_done = cosa_net_tx_done;</div><div class='add'>+	chan-&gt;rx_done = cosa_net_rx_done;</div><div class='add'>+	chan-&gt;usage = -1;</div><div class='ctx'> 	chan-&gt;cosa-&gt;usage++;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;chan-&gt;cosa-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	err = sppp_open(d);</div><div class='add'>+	err = hdlc_open(dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;chan-&gt;cosa-&gt;lock, flags);</div><div class='del'>-		chan-&gt;usage=0;</div><div class='add'>+		chan-&gt;usage = 0;</div><div class='ctx'> 		chan-&gt;cosa-&gt;usage--;</div><div class='del'>-		</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;chan-&gt;cosa-&gt;lock, flags);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netif_start_queue(d);</div><div class='add'>+	netif_start_queue(dev);</div><div class='ctx'> 	cosa_enable_rx(chan);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cosa_sppp_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+static int cosa_net_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct channel_data *chan = dev-&gt;ml_priv;</div><div class='add'>+	struct channel_data *chan = dev_to_chan(dev);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -700,16 +677,16 @@ static int cosa_sppp_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cosa_sppp_timeout(struct net_device *dev)</div><div class='add'>+static void cosa_net_timeout(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct channel_data *chan = dev-&gt;ml_priv;</div><div class='add'>+	struct channel_data *chan = dev_to_chan(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(RXBIT, &amp;chan-&gt;cosa-&gt;rxtx)) {</div><div class='del'>-		chan-&gt;stats.rx_errors++;</div><div class='del'>-		chan-&gt;stats.rx_missed_errors++;</div><div class='add'>+		chan-&gt;netdev-&gt;stats.rx_errors++;</div><div class='add'>+		chan-&gt;netdev-&gt;stats.rx_missed_errors++;</div><div class='ctx'> 	} else {</div><div class='del'>-		chan-&gt;stats.tx_errors++;</div><div class='del'>-		chan-&gt;stats.tx_aborted_errors++;</div><div class='add'>+		chan-&gt;netdev-&gt;stats.tx_errors++;</div><div class='add'>+		chan-&gt;netdev-&gt;stats.tx_aborted_errors++;</div><div class='ctx'> 	}</div><div class='ctx'> 	cosa_kick(chan-&gt;cosa);</div><div class='ctx'> 	if (chan-&gt;tx_skb) {</div><div class='hunk'>@@ -719,13 +696,13 @@ static void cosa_sppp_timeout(struct net_device *dev)</div><div class='ctx'> 	netif_wake_queue(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cosa_sppp_close(struct net_device *d)</div><div class='add'>+static int cosa_net_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct channel_data *chan = d-&gt;ml_priv;</div><div class='add'>+	struct channel_data *chan = dev_to_chan(dev);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	netif_stop_queue(d);</div><div class='del'>-	sppp_close(d);</div><div class='add'>+	netif_stop_queue(dev);</div><div class='add'>+	hdlc_close(dev);</div><div class='ctx'> 	cosa_disable_rx(chan);</div><div class='ctx'> 	spin_lock_irqsave(&amp;chan-&gt;cosa-&gt;lock, flags);</div><div class='ctx'> 	if (chan-&gt;rx_skb) {</div><div class='hunk'>@@ -736,13 +713,13 @@ static int cosa_sppp_close(struct net_device *d)</div><div class='ctx'> 		kfree_skb(chan-&gt;tx_skb);</div><div class='ctx'> 		chan-&gt;tx_skb = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	chan-&gt;usage=0;</div><div class='add'>+	chan-&gt;usage = 0;</div><div class='ctx'> 	chan-&gt;cosa-&gt;usage--;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;chan-&gt;cosa-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char *sppp_setup_rx(struct channel_data *chan, int size)</div><div class='add'>+static char *cosa_net_setup_rx(struct channel_data *chan, int size)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We can safely fall back to non-dma-able memory, because we have</div><div class='hunk'>@@ -754,66 +731,53 @@ static char *sppp_setup_rx(struct channel_data *chan, int size)</div><div class='ctx'> 	if (chan-&gt;rx_skb == NULL) {</div><div class='ctx'> 		printk(KERN_NOTICE "%s: Memory squeeze, dropping packet\n",</div><div class='ctx'> 			chan-&gt;name);</div><div class='del'>-		chan-&gt;stats.rx_dropped++;</div><div class='add'>+		chan-&gt;netdev-&gt;stats.rx_dropped++;</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	chan-&gt;pppdev.dev-&gt;trans_start = jiffies;</div><div class='add'>+	chan-&gt;netdev-&gt;trans_start = jiffies;</div><div class='ctx'> 	return skb_put(chan-&gt;rx_skb, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sppp_rx_done(struct channel_data *chan)</div><div class='add'>+static int cosa_net_rx_done(struct channel_data *chan)</div><div class='ctx'> {</div><div class='ctx'> 	if (!chan-&gt;rx_skb) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: rx_done with empty skb!\n",</div><div class='ctx'> 			chan-&gt;name);</div><div class='del'>-		chan-&gt;stats.rx_errors++;</div><div class='del'>-		chan-&gt;stats.rx_frame_errors++;</div><div class='add'>+		chan-&gt;netdev-&gt;stats.rx_errors++;</div><div class='add'>+		chan-&gt;netdev-&gt;stats.rx_frame_errors++;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	chan-&gt;rx_skb-&gt;protocol = htons(ETH_P_WAN_PPP);</div><div class='del'>-	chan-&gt;rx_skb-&gt;dev = chan-&gt;pppdev.dev;</div><div class='add'>+	chan-&gt;rx_skb-&gt;protocol = hdlc_type_trans(chan-&gt;rx_skb, chan-&gt;netdev);</div><div class='add'>+	chan-&gt;rx_skb-&gt;dev = chan-&gt;netdev;</div><div class='ctx'> 	skb_reset_mac_header(chan-&gt;rx_skb);</div><div class='del'>-	chan-&gt;stats.rx_packets++;</div><div class='del'>-	chan-&gt;stats.rx_bytes += chan-&gt;cosa-&gt;rxsize;</div><div class='add'>+	chan-&gt;netdev-&gt;stats.rx_packets++;</div><div class='add'>+	chan-&gt;netdev-&gt;stats.rx_bytes += chan-&gt;cosa-&gt;rxsize;</div><div class='ctx'> 	netif_rx(chan-&gt;rx_skb);</div><div class='ctx'> 	chan-&gt;rx_skb = NULL;</div><div class='del'>-	chan-&gt;pppdev.dev-&gt;last_rx = jiffies;</div><div class='add'>+	chan-&gt;netdev-&gt;last_rx = jiffies;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ARGSUSED */</div><div class='del'>-static int sppp_tx_done(struct channel_data *chan, int size)</div><div class='add'>+static int cosa_net_tx_done(struct channel_data *chan, int size)</div><div class='ctx'> {</div><div class='ctx'> 	if (!chan-&gt;tx_skb) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: tx_done with empty skb!\n",</div><div class='ctx'> 			chan-&gt;name);</div><div class='del'>-		chan-&gt;stats.tx_errors++;</div><div class='del'>-		chan-&gt;stats.tx_aborted_errors++;</div><div class='add'>+		chan-&gt;netdev-&gt;stats.tx_errors++;</div><div class='add'>+		chan-&gt;netdev-&gt;stats.tx_aborted_errors++;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_kfree_skb_irq(chan-&gt;tx_skb);</div><div class='ctx'> 	chan-&gt;tx_skb = NULL;</div><div class='del'>-	chan-&gt;stats.tx_packets++;</div><div class='del'>-	chan-&gt;stats.tx_bytes += size;</div><div class='del'>-	netif_wake_queue(chan-&gt;pppdev.dev);</div><div class='add'>+	chan-&gt;netdev-&gt;stats.tx_packets++;</div><div class='add'>+	chan-&gt;netdev-&gt;stats.tx_bytes += size;</div><div class='add'>+	netif_wake_queue(chan-&gt;netdev);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct net_device_stats *cosa_net_stats(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct channel_data *chan = dev-&gt;ml_priv;</div><div class='del'>-	return &amp;chan-&gt;stats;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*---------- Character device ---------- */</div><div class='ctx'> </div><div class='del'>-static void chardev_channel_init(struct channel_data *chan)</div><div class='del'>-{</div><div class='del'>-	mutex_init(&amp;chan-&gt;rlock);</div><div class='del'>-	init_MUTEX(&amp;chan-&gt;wsem);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t cosa_read(struct file *file,</div><div class='ctx'> 	char __user *buf, size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='hunk'>@@ -1223,16 +1187,15 @@ static int cosa_ioctl_common(struct cosa_data *cosa,</div><div class='ctx'> 	return -ENOIOCTLCMD;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cosa_sppp_ioctl(struct net_device *dev, struct ifreq *ifr,</div><div class='del'>-	int cmd)</div><div class='add'>+static int cosa_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int rv;</div><div class='del'>-	struct channel_data *chan = dev-&gt;ml_priv;</div><div class='del'>-	rv = cosa_ioctl_common(chan-&gt;cosa, chan, cmd, (unsigned long)ifr-&gt;ifr_data);</div><div class='del'>-	if (rv == -ENOIOCTLCMD) {</div><div class='del'>-		return sppp_do_ioctl(dev, ifr, cmd);</div><div class='del'>-	}</div><div class='del'>-	return rv;</div><div class='add'>+	struct channel_data *chan = dev_to_chan(dev);</div><div class='add'>+	rv = cosa_ioctl_common(chan-&gt;cosa, chan, cmd,</div><div class='add'>+			       (unsigned long)ifr-&gt;ifr_data);</div><div class='add'>+	if (rv != -ENOIOCTLCMD)</div><div class='add'>+		return rv;</div><div class='add'>+	return hdlc_ioctl(dev, ifr, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cosa_chardev_ioctl(struct inode *inode, struct file *file,</div><div class='head'>diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c<br/>index 50ef5b4efd6d..f5d55ad02267 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/dscc4.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/dscc4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/dscc4.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/dscc4.c</a></div><div class='hunk'>@@ -103,7 +103,6 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;net/syncppp.h&gt;</div><div class='ctx'> #include &lt;linux/hdlc.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c<br/>index 754f00809e3e..9557ad078ab8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/farsync.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/farsync.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/farsync.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/farsync.c</a></div><div class='hunk'>@@ -47,10 +47,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> /*      Default parameters for the link</div><div class='ctx'>  */</div><div class='ctx'> #define FST_TX_QUEUE_LEN        100	/* At 8Mbps a longer queue length is</div><div class='del'>-					 * useful, the syncppp module forces</div><div class='del'>-					 * this down assuming a slower line I</div><div class='del'>-					 * guess.</div><div class='del'>-					 */</div><div class='add'>+					 * useful */</div><div class='ctx'> #define FST_TXQ_DEPTH           16	/* This one is for the buffering</div><div class='ctx'> 					 * of frames on the way down to the card</div><div class='ctx'> 					 * so that we can keep the card busy</div><div class='head'>diff --git a/drivers/net/wan/farsync.h b/drivers/net/wan/farsync.h<br/>index d871dafa87a1..6b27e7c3d449 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/farsync.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/farsync.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/farsync.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/farsync.h</a></div><div class='hunk'>@@ -54,9 +54,6 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*      Ioctl call command values</div><div class='del'>- *</div><div class='del'>- *      The first three private ioctls are used by the sync-PPP module,</div><div class='del'>- *      allowing a little room for expansion we start our numbering at 10.</div><div class='ctx'>  */</div><div class='ctx'> #define FSTWRITE        (SIOCDEVPRIVATE+10)</div><div class='ctx'> #define FSTCPURESET     (SIOCDEVPRIVATE+11)</div><div class='hunk'>@@ -202,9 +199,6 @@ struct fstioc_info {</div><div class='ctx'> #define J1              7</div><div class='ctx'> </div><div class='ctx'> /* "proto" */</div><div class='del'>-#define FST_HDLC        1               /* Cisco compatible HDLC */</div><div class='del'>-#define FST_PPP         2               /* Sync PPP */</div><div class='del'>-#define FST_MONITOR     3               /* Monitor only (raw packet reception) */</div><div class='ctx'> #define FST_RAW         4               /* Two way raw packets */</div><div class='ctx'> #define FST_GEN_HDLC    5               /* Using "Generic HDLC" module */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c<br/>index e3a536477c7e..1f2a140c9f7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/hdlc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/hdlc.c</a></div><div class='hunk'>@@ -22,20 +22,19 @@</div><div class='ctx'>  * - proto-&gt;start() and stop() are called with spin_lock_irq held.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/hdlc.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/pkt_sched.h&gt;</div><div class='del'>-#include &lt;linux/inetdevice.h&gt;</div><div class='del'>-#include &lt;linux/lapb.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/notifier.h&gt;</div><div class='del'>-#include &lt;linux/hdlc.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -109,7 +108,7 @@ static int hdlc_device_event(struct notifier_block *this, unsigned long event,</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;get_stats != hdlc_get_stats)</div><div class='ctx'> 		return NOTIFY_DONE; /* not an HDLC device */</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> 	if (event != NETDEV_CHANGE)</div><div class='ctx'> 		return NOTIFY_DONE; /* Only interrested in carrier changes */</div><div class='ctx'> </div><div class='hunk'>@@ -357,7 +356,7 @@ static struct packet_type hdlc_packet_type = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct notifier_block hdlc_notifier = {</div><div class='del'>-        .notifier_call = hdlc_device_event,</div><div class='add'>+	.notifier_call = hdlc_device_event,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -367,8 +366,8 @@ static int __init hdlc_module_init(void)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "%s\n", version);</div><div class='ctx'> 	if ((result = register_netdevice_notifier(&amp;hdlc_notifier)) != 0)</div><div class='del'>-                return result;</div><div class='del'>-        dev_add_pack(&amp;hdlc_packet_type);</div><div class='add'>+		return result;</div><div class='add'>+	dev_add_pack(&amp;hdlc_packet_type);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c<br/>index 849819c2552d..44e64b15dbd1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_cisco.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/hdlc_cisco.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_cisco.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/hdlc_cisco.c</a></div><div class='hunk'>@@ -9,19 +9,18 @@</div><div class='ctx'>  * as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/hdlc.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pkt_sched.h&gt;</div><div class='del'>-#include &lt;linux/inetdevice.h&gt;</div><div class='del'>-#include &lt;linux/lapb.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/hdlc.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG_HARD_HEADER</div><div class='ctx'> </div><div class='hunk'>@@ -68,9 +67,9 @@ struct cisco_state {</div><div class='ctx'> static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static inline struct cisco_state * state(hdlc_device *hdlc)</div><div class='add'>+static inline struct cisco_state* state(hdlc_device *hdlc)</div><div class='ctx'> {</div><div class='del'>-	return(struct cisco_state *)(hdlc-&gt;state);</div><div class='add'>+	return (struct cisco_state *)hdlc-&gt;state;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -172,7 +171,7 @@ static int cisco_rx(struct sk_buff *skb)</div><div class='ctx'> 	    data-&gt;address != CISCO_UNICAST)</div><div class='ctx'> 		goto rx_error;</div><div class='ctx'> </div><div class='del'>-	switch(ntohs(data-&gt;protocol)) {</div><div class='add'>+	switch (ntohs(data-&gt;protocol)) {</div><div class='ctx'> 	case CISCO_SYS_INFO:</div><div class='ctx'> 		/* Packet is not needed, drop it. */</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='hunk'>@@ -336,7 +335,7 @@ static struct hdlc_proto proto = {</div><div class='ctx'> static const struct header_ops cisco_header_ops = {</div><div class='ctx'> 	.create = cisco_hard_header,</div><div class='ctx'> };</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr)</div><div class='ctx'> {</div><div class='ctx'> 	cisco_proto __user *cisco_s = ifr-&gt;ifr_settings.ifs_ifsu.cisco;</div><div class='hunk'>@@ -359,10 +358,10 @@ static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case IF_PROTO_CISCO:</div><div class='del'>-		if(!capable(CAP_NET_ADMIN))</div><div class='add'>+		if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> </div><div class='del'>-		if(dev-&gt;flags &amp; IFF_UP)</div><div class='add'>+		if (dev-&gt;flags &amp; IFF_UP)</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 		if (copy_from_user(&amp;new_settings, cisco_s, size))</div><div class='hunk'>@@ -372,7 +371,7 @@ static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr)</div><div class='ctx'> 		    new_settings.timeout &lt; 2)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		result=hdlc-&gt;attach(dev, ENCODING_NRZ,PARITY_CRC16_PR1_CCITT);</div><div class='add'>+		result = hdlc-&gt;attach(dev, ENCODING_NRZ,PARITY_CRC16_PR1_CCITT);</div><div class='ctx'> 		if (result)</div><div class='ctx'> 			return result;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c<br/>index 62e93dac6b13..d3d5055741ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_fr.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/hdlc_fr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_fr.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/hdlc_fr.c</a></div><div class='hunk'>@@ -33,20 +33,19 @@</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/hdlc.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pkt_sched.h&gt;</div><div class='del'>-#include &lt;linux/inetdevice.h&gt;</div><div class='del'>-#include &lt;linux/lapb.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/hdlc.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG_PKT</div><div class='ctx'> #undef DEBUG_ECN</div><div class='hunk'>@@ -96,7 +95,7 @@ typedef struct {</div><div class='ctx'> 	unsigned ea1:	1;</div><div class='ctx'> 	unsigned cr:	1;</div><div class='ctx'> 	unsigned dlcih:	6;</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'> 	unsigned ea2:	1;</div><div class='ctx'> 	unsigned de:	1;</div><div class='ctx'> 	unsigned becn:	1;</div><div class='head'>diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c<br/>index 00308337928e..4efe9e6d32d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_ppp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/hdlc_ppp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_ppp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/hdlc_ppp.c</a></div><div class='hunk'>@@ -9,19 +9,18 @@</div><div class='ctx'>  * as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/hdlc.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pkt_sched.h&gt;</div><div class='del'>-#include &lt;linux/inetdevice.h&gt;</div><div class='del'>-#include &lt;linux/lapb.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/hdlc.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;net/syncppp.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct ppp_state {</div><div class='head'>diff --git a/drivers/net/wan/hdlc_raw.c b/drivers/net/wan/hdlc_raw.c<br/>index bbbb819d764c..8612311748f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_raw.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/hdlc_raw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_raw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/hdlc_raw.c</a></div><div class='hunk'>@@ -9,19 +9,18 @@</div><div class='ctx'>  * as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/hdlc.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pkt_sched.h&gt;</div><div class='del'>-#include &lt;linux/inetdevice.h&gt;</div><div class='del'>-#include &lt;linux/lapb.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/hdlc.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int raw_ioctl(struct net_device *dev, struct ifreq *ifr);</div><div class='head'>diff --git a/drivers/net/wan/hdlc_raw_eth.c b/drivers/net/wan/hdlc_raw_eth.c<br/>index 26dee600506f..a13fc3207520 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_raw_eth.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/hdlc_raw_eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_raw_eth.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/hdlc_raw_eth.c</a></div><div class='hunk'>@@ -9,20 +9,19 @@</div><div class='ctx'>  * as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/hdlc.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pkt_sched.h&gt;</div><div class='del'>-#include &lt;linux/inetdevice.h&gt;</div><div class='del'>-#include &lt;linux/lapb.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/hdlc.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c<br/>index e808720030ef..8b7e5d2e2ac9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_x25.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/hdlc_x25.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_x25.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/hdlc_x25.c</a></div><div class='hunk'>@@ -9,20 +9,19 @@</div><div class='ctx'>  * as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/hdlc.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/pkt_sched.h&gt;</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/lapb.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pkt_sched.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/hdlc.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;net/x25device.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int x25_ioctl(struct net_device *dev, struct ifreq *ifr);</div><div class='head'>diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c<br/>index f3065d3473fd..e299313f828a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/hostess_sv11.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/hostess_sv11.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/hostess_sv11.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/hostess_sv11.c</a></div><div class='hunk'>@@ -16,6 +16,8 @@</div><div class='ctx'>  *	touching control registers.</div><div class='ctx'>  *</div><div class='ctx'>  *	Port B isnt wired (why - beats me)</div><div class='add'>+ *</div><div class='add'>+ *	Generic HDLC port Copyright (C) 2008 Krzysztof Halasa &lt;khc@pm.waw.pl&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -26,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/hdlc.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -33,34 +36,31 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;net/syncppp.h&gt;</div><div class='ctx'> #include "z85230.h"</div><div class='ctx'> </div><div class='ctx'> static int dma;</div><div class='ctx'> </div><div class='del'>-struct sv11_device</div><div class='del'>-{</div><div class='del'>-	void *if_ptr;	/* General purpose pointer (used by SPPP) */</div><div class='del'>-	struct z8530_dev sync;</div><div class='del'>-	struct ppp_device netdev;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	Network driver support routines</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static inline struct z8530_dev* dev_to_sv(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return (struct z8530_dev *)dev_to_hdlc(dev)-&gt;priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- *	Frame receive. Simple for our card as we do sync ppp and there</div><div class='add'>+ *	Frame receive. Simple for our card as we do HDLC and there</div><div class='ctx'>  *	is no funny garbage involved</div><div class='ctx'>  */</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static void hostess_input(struct z8530_channel *c, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	/* Drop the CRC - it's not a good idea to try and negotiate it ;) */</div><div class='del'>-	skb_trim(skb, skb-&gt;len-2);</div><div class='del'>-	skb-&gt;protocol=__constant_htons(ETH_P_WAN_PPP);</div><div class='add'>+	skb_trim(skb, skb-&gt;len - 2);</div><div class='add'>+	skb-&gt;protocol = hdlc_type_trans(skb, c-&gt;netdevice);</div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='del'>-	skb-&gt;dev=c-&gt;netdevice;</div><div class='add'>+	skb-&gt;dev = c-&gt;netdevice;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Send it to the PPP layer. We don't have time to process</div><div class='ctx'> 	 *	it right now.</div><div class='hunk'>@@ -68,56 +68,51 @@ static void hostess_input(struct z8530_channel *c, struct sk_buff *skb)</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> 	c-&gt;netdevice-&gt;last_rx = jiffies;</div><div class='ctx'> }</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	We've been placed in the UP state</div><div class='del'>- */ </div><div class='del'>- </div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> static int hostess_open(struct net_device *d)</div><div class='ctx'> {</div><div class='del'>-	struct sv11_device *sv11=d-&gt;ml_priv;</div><div class='add'>+	struct z8530_dev *sv11 = dev_to_sv(d);</div><div class='ctx'> 	int err = -1;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Link layer up</div><div class='ctx'> 	 */</div><div class='del'>-	switch(dma)</div><div class='del'>-	{</div><div class='add'>+	switch (dma) {</div><div class='ctx'> 		case 0:</div><div class='del'>-			err=z8530_sync_open(d, &amp;sv11-&gt;sync.chanA);</div><div class='add'>+			err = z8530_sync_open(d, &amp;sv11-&gt;chanA);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 1:</div><div class='del'>-			err=z8530_sync_dma_open(d, &amp;sv11-&gt;sync.chanA);</div><div class='add'>+			err = z8530_sync_dma_open(d, &amp;sv11-&gt;chanA);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 2:</div><div class='del'>-			err=z8530_sync_txdma_open(d, &amp;sv11-&gt;sync.chanA);</div><div class='add'>+			err = z8530_sync_txdma_open(d, &amp;sv11-&gt;chanA);</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='del'>-	if(err)</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	/*</div><div class='del'>-	 *	Begin PPP</div><div class='del'>-	 */</div><div class='del'>-	err=sppp_open(d);</div><div class='del'>-	if(err)</div><div class='del'>-	{</div><div class='del'>-		switch(dma)</div><div class='del'>-		{</div><div class='add'>+</div><div class='add'>+	err = hdlc_open(d);</div><div class='add'>+	if (err) {</div><div class='add'>+		switch (dma) {</div><div class='ctx'> 			case 0:</div><div class='del'>-				z8530_sync_close(d, &amp;sv11-&gt;sync.chanA);</div><div class='add'>+				z8530_sync_close(d, &amp;sv11-&gt;chanA);</div><div class='ctx'> 				break;</div><div class='ctx'> 			case 1:</div><div class='del'>-				z8530_sync_dma_close(d, &amp;sv11-&gt;sync.chanA);</div><div class='add'>+				z8530_sync_dma_close(d, &amp;sv11-&gt;chanA);</div><div class='ctx'> 				break;</div><div class='ctx'> 			case 2:</div><div class='del'>-				z8530_sync_txdma_close(d, &amp;sv11-&gt;sync.chanA);</div><div class='add'>+				z8530_sync_txdma_close(d, &amp;sv11-&gt;chanA);</div><div class='ctx'> 				break;</div><div class='del'>-		}				</div><div class='add'>+		}</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	sv11-&gt;sync.chanA.rx_function=hostess_input;</div><div class='del'>-	</div><div class='add'>+	sv11-&gt;chanA.rx_function = hostess_input;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Go go go</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -128,30 +123,24 @@ static int hostess_open(struct net_device *d)</div><div class='ctx'> </div><div class='ctx'> static int hostess_close(struct net_device *d)</div><div class='ctx'> {</div><div class='del'>-	struct sv11_device *sv11=d-&gt;ml_priv;</div><div class='add'>+	struct z8530_dev *sv11 = dev_to_sv(d);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Discard new frames</div><div class='ctx'> 	 */</div><div class='del'>-	sv11-&gt;sync.chanA.rx_function=z8530_null_rx;</div><div class='del'>-	/*</div><div class='del'>-	 *	PPP off</div><div class='del'>-	 */</div><div class='del'>-	sppp_close(d);</div><div class='del'>-	/*</div><div class='del'>-	 *	Link layer down</div><div class='del'>-	 */</div><div class='add'>+	sv11-&gt;chanA.rx_function = z8530_null_rx;</div><div class='add'>+</div><div class='add'>+	hdlc_close(d);</div><div class='ctx'> 	netif_stop_queue(d);</div><div class='del'>-		</div><div class='del'>-	switch(dma)</div><div class='del'>-	{</div><div class='add'>+</div><div class='add'>+	switch (dma) {</div><div class='ctx'> 		case 0:</div><div class='del'>-			z8530_sync_close(d, &amp;sv11-&gt;sync.chanA);</div><div class='add'>+			z8530_sync_close(d, &amp;sv11-&gt;chanA);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 1:</div><div class='del'>-			z8530_sync_dma_close(d, &amp;sv11-&gt;sync.chanA);</div><div class='add'>+			z8530_sync_dma_close(d, &amp;sv11-&gt;chanA);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 2:</div><div class='del'>-			z8530_sync_txdma_close(d, &amp;sv11-&gt;sync.chanA);</div><div class='add'>+			z8530_sync_txdma_close(d, &amp;sv11-&gt;chanA);</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -159,232 +148,174 @@ static int hostess_close(struct net_device *d)</div><div class='ctx'> </div><div class='ctx'> static int hostess_ioctl(struct net_device *d, struct ifreq *ifr, int cmd)</div><div class='ctx'> {</div><div class='del'>-	/* struct sv11_device *sv11=d-&gt;ml_priv;</div><div class='del'>-	   z8530_ioctl(d,&amp;sv11-&gt;sync.chanA,ifr,cmd) */</div><div class='del'>-	return sppp_do_ioctl(d, ifr,cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct net_device_stats *hostess_get_stats(struct net_device *d)</div><div class='del'>-{</div><div class='del'>-	struct sv11_device *sv11=d-&gt;ml_priv;</div><div class='del'>-	if(sv11)</div><div class='del'>-		return z8530_get_stats(&amp;sv11-&gt;sync.chanA);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='add'>+	/* struct z8530_dev *sv11=dev_to_sv(d);</div><div class='add'>+	   z8530_ioctl(d,&amp;sv11-&gt;chanA,ifr,cmd) */</div><div class='add'>+	return hdlc_ioctl(d, ifr, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *	Passed PPP frames, fire them downwind.</div><div class='add'>+ *	Passed network frames, fire them downwind.</div><div class='ctx'>  */</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static int hostess_queue_xmit(struct sk_buff *skb, struct net_device *d)</div><div class='ctx'> {</div><div class='del'>-	struct sv11_device *sv11=d-&gt;ml_priv;</div><div class='del'>-	return z8530_queue_xmit(&amp;sv11-&gt;sync.chanA, skb);</div><div class='add'>+	return z8530_queue_xmit(&amp;dev_to_sv(d)-&gt;chanA, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hostess_neigh_setup(struct neighbour *n)</div><div class='add'>+static int hostess_attach(struct net_device *dev, unsigned short encoding,</div><div class='add'>+			  unsigned short parity)</div><div class='ctx'> {</div><div class='del'>-	if (n-&gt;nud_state == NUD_NONE) {</div><div class='del'>-		n-&gt;ops = &amp;arp_broken_ops;</div><div class='del'>-		n-&gt;output = n-&gt;ops-&gt;output;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hostess_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p)</div><div class='del'>-{</div><div class='del'>-	if (p-&gt;tbl-&gt;family == AF_INET) {</div><div class='del'>-		p-&gt;neigh_setup = hostess_neigh_setup;</div><div class='del'>-		p-&gt;ucast_probes = 0;</div><div class='del'>-		p-&gt;mcast_probes = 0;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sv11_setup(struct net_device *dev)</div><div class='del'>-{	</div><div class='del'>-	dev-&gt;open = hostess_open;</div><div class='del'>-	dev-&gt;stop = hostess_close;</div><div class='del'>-	dev-&gt;hard_start_xmit = hostess_queue_xmit;</div><div class='del'>-	dev-&gt;get_stats = hostess_get_stats;</div><div class='del'>-	dev-&gt;do_ioctl = hostess_ioctl;</div><div class='del'>-	dev-&gt;neigh_setup = hostess_neigh_setup_dev;</div><div class='add'>+	if (encoding == ENCODING_NRZ &amp;&amp; parity == PARITY_CRC16_PR1_CCITT)</div><div class='add'>+		return 0;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Description block for a Comtrol Hostess SV11 card</div><div class='ctx'>  */</div><div class='del'>- </div><div class='del'>-static struct sv11_device *sv11_init(int iobase, int irq)</div><div class='add'>+</div><div class='add'>+static struct z8530_dev *sv11_init(int iobase, int irq)</div><div class='ctx'> {</div><div class='del'>-	struct z8530_dev *dev;</div><div class='del'>-	struct sv11_device *sv;</div><div class='del'>-	</div><div class='add'>+	struct z8530_dev *sv;</div><div class='add'>+	struct net_device *netdev;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Get the needed I/O space</div><div class='ctx'> 	 */</div><div class='del'>-	 </div><div class='del'>-	if(!request_region(iobase, 8, "Comtrol SV11"))</div><div class='del'>-	{	</div><div class='del'>-		printk(KERN_WARNING "hostess: I/O 0x%X already in use.\n", iobase);</div><div class='add'>+</div><div class='add'>+	if (!request_region(iobase, 8, "Comtrol SV11")) {</div><div class='add'>+		printk(KERN_WARNING "hostess: I/O 0x%X already in use.\n",</div><div class='add'>+		       iobase);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='del'>-	sv = kzalloc(sizeof(struct sv11_device), GFP_KERNEL);</div><div class='del'>-	if(!sv)</div><div class='del'>-		goto fail3;</div><div class='del'>-			</div><div class='del'>-	sv-&gt;if_ptr=&amp;sv-&gt;netdev;</div><div class='del'>-	</div><div class='del'>-	sv-&gt;netdev.dev = alloc_netdev(0, "hdlc%d", sv11_setup);</div><div class='del'>-	if(!sv-&gt;netdev.dev)</div><div class='del'>-		goto fail2;</div><div class='del'>-</div><div class='del'>-	dev=&amp;sv-&gt;sync;</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+	sv = kzalloc(sizeof(struct z8530_dev), GFP_KERNEL);</div><div class='add'>+	if (!sv)</div><div class='add'>+		goto err_kzalloc;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Stuff in the I/O addressing</div><div class='ctx'> 	 */</div><div class='del'>-	 </div><div class='del'>-	dev-&gt;active = 0;</div><div class='del'>-	</div><div class='del'>-	dev-&gt;chanA.ctrlio=iobase+1;</div><div class='del'>-	dev-&gt;chanA.dataio=iobase+3;</div><div class='del'>-	dev-&gt;chanB.ctrlio=-1;</div><div class='del'>-	dev-&gt;chanB.dataio=-1;</div><div class='del'>-	dev-&gt;chanA.irqs=&amp;z8530_nop;</div><div class='del'>-	dev-&gt;chanB.irqs=&amp;z8530_nop;</div><div class='del'>-	</div><div class='del'>-	outb(0, iobase+4);		/* DMA off */</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+	sv-&gt;active = 0;</div><div class='add'>+</div><div class='add'>+	sv-&gt;chanA.ctrlio = iobase + 1;</div><div class='add'>+	sv-&gt;chanA.dataio = iobase + 3;</div><div class='add'>+	sv-&gt;chanB.ctrlio = -1;</div><div class='add'>+	sv-&gt;chanB.dataio = -1;</div><div class='add'>+	sv-&gt;chanA.irqs = &amp;z8530_nop;</div><div class='add'>+	sv-&gt;chanB.irqs = &amp;z8530_nop;</div><div class='add'>+</div><div class='add'>+	outb(0, iobase + 4);		/* DMA off */</div><div class='add'>+</div><div class='ctx'> 	/* We want a fast IRQ for this device. Actually we'd like an even faster</div><div class='ctx'> 	   IRQ ;) - This is one driver RtLinux is made for */</div><div class='del'>-	   </div><div class='del'>-	if(request_irq(irq, &amp;z8530_interrupt, IRQF_DISABLED, "Hostess SV11", dev)&lt;0)</div><div class='del'>-	{</div><div class='add'>+</div><div class='add'>+	if (request_irq(irq, &amp;z8530_interrupt, IRQF_DISABLED,</div><div class='add'>+			"Hostess SV11", sv) &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq);</div><div class='del'>-		goto fail1;</div><div class='add'>+		goto err_irq;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='del'>-	dev-&gt;irq=irq;</div><div class='del'>-	dev-&gt;chanA.private=sv;</div><div class='del'>-	dev-&gt;chanA.netdevice=sv-&gt;netdev.dev;</div><div class='del'>-	dev-&gt;chanA.dev=dev;</div><div class='del'>-	dev-&gt;chanB.dev=dev;</div><div class='del'>-	</div><div class='del'>-	if(dma)</div><div class='del'>-	{</div><div class='add'>+</div><div class='add'>+	sv-&gt;irq = irq;</div><div class='add'>+	sv-&gt;chanA.private = sv;</div><div class='add'>+	sv-&gt;chanA.dev = sv;</div><div class='add'>+	sv-&gt;chanB.dev = sv;</div><div class='add'>+</div><div class='add'>+	if (dma) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 *	You can have DMA off or 1 and 3 thats the lot</div><div class='ctx'> 		 *	on the Comtrol.</div><div class='ctx'> 		 */</div><div class='del'>-		dev-&gt;chanA.txdma=3;</div><div class='del'>-		dev-&gt;chanA.rxdma=1;</div><div class='del'>-		outb(0x03|0x08, iobase+4);		/* DMA on */</div><div class='del'>-		if(request_dma(dev-&gt;chanA.txdma, "Hostess SV/11 (TX)")!=0)</div><div class='del'>-			goto fail;</div><div class='del'>-			</div><div class='del'>-		if(dma==1)</div><div class='del'>-		{</div><div class='del'>-			if(request_dma(dev-&gt;chanA.rxdma, "Hostess SV/11 (RX)")!=0)</div><div class='del'>-				goto dmafail;</div><div class='del'>-		}</div><div class='add'>+		sv-&gt;chanA.txdma = 3;</div><div class='add'>+		sv-&gt;chanA.rxdma = 1;</div><div class='add'>+		outb(0x03 | 0x08, iobase + 4);		/* DMA on */</div><div class='add'>+		if (request_dma(sv-&gt;chanA.txdma, "Hostess SV/11 (TX)"))</div><div class='add'>+			goto err_txdma;</div><div class='add'>+</div><div class='add'>+		if (dma == 1)</div><div class='add'>+			if (request_dma(sv-&gt;chanA.rxdma, "Hostess SV/11 (RX)"))</div><div class='add'>+				goto err_rxdma;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Kill our private IRQ line the hostess can end up chattering</div><div class='ctx'> 	   until the configuration is set */</div><div class='ctx'> 	disable_irq(irq);</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Begin normal initialise</div><div class='ctx'> 	 */</div><div class='del'>-	 </div><div class='del'>-	if(z8530_init(dev)!=0)</div><div class='del'>-	{</div><div class='add'>+</div><div class='add'>+	if (z8530_init(sv)) {</div><div class='ctx'> 		printk(KERN_ERR "Z8530 series device not found.\n");</div><div class='ctx'> 		enable_irq(irq);</div><div class='del'>-		goto dmafail2;</div><div class='add'>+		goto free_dma;</div><div class='ctx'> 	}</div><div class='del'>-	z8530_channel_load(&amp;dev-&gt;chanB, z8530_dead_port);</div><div class='del'>-	if(dev-&gt;type==Z85C30)</div><div class='del'>-		z8530_channel_load(&amp;dev-&gt;chanA, z8530_hdlc_kilostream);</div><div class='add'>+	z8530_channel_load(&amp;sv-&gt;chanB, z8530_dead_port);</div><div class='add'>+	if (sv-&gt;type == Z85C30)</div><div class='add'>+		z8530_channel_load(&amp;sv-&gt;chanA, z8530_hdlc_kilostream);</div><div class='ctx'> 	else</div><div class='del'>-		z8530_channel_load(&amp;dev-&gt;chanA, z8530_hdlc_kilostream_85230);</div><div class='del'>-	</div><div class='add'>+		z8530_channel_load(&amp;sv-&gt;chanA, z8530_hdlc_kilostream_85230);</div><div class='add'>+</div><div class='ctx'> 	enable_irq(irq);</div><div class='del'>-	</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Now we can take the IRQ</div><div class='ctx'> 	 */</div><div class='del'>-	if(dev_alloc_name(dev-&gt;chanA.netdevice,"hdlc%d")&gt;=0)</div><div class='del'>-	{</div><div class='del'>-		struct net_device *d=dev-&gt;chanA.netdevice;</div><div class='ctx'> </div><div class='del'>-		/* </div><div class='del'>-		 *	Initialise the PPP components</div><div class='del'>-		 */</div><div class='del'>-		d-&gt;ml_priv = sv;</div><div class='del'>-		sppp_attach(&amp;sv-&gt;netdev);</div><div class='del'>-		</div><div class='del'>-		/*</div><div class='del'>-		 *	Local fields</div><div class='del'>-		 */	</div><div class='del'>-		</div><div class='del'>-		d-&gt;base_addr = iobase;</div><div class='del'>-		d-&gt;irq = irq;</div><div class='del'>-		</div><div class='del'>-		if(register_netdev(d))</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_ERR "%s: unable to register device.\n",</div><div class='del'>-				d-&gt;name);</div><div class='del'>-			sppp_detach(d);</div><div class='del'>-			goto dmafail2;</div><div class='del'>-		}</div><div class='add'>+	sv-&gt;chanA.netdevice = netdev = alloc_hdlcdev(sv);</div><div class='add'>+	if (!netdev)</div><div class='add'>+		goto free_dma;</div><div class='ctx'> </div><div class='del'>-		z8530_describe(dev, "I/O", iobase);</div><div class='del'>-		dev-&gt;active=1;</div><div class='del'>-		return sv;	</div><div class='add'>+	dev_to_hdlc(netdev)-&gt;attach = hostess_attach;</div><div class='add'>+	dev_to_hdlc(netdev)-&gt;xmit = hostess_queue_xmit;</div><div class='add'>+	netdev-&gt;open = hostess_open;</div><div class='add'>+	netdev-&gt;stop = hostess_close;</div><div class='add'>+	netdev-&gt;do_ioctl = hostess_ioctl;</div><div class='add'>+	netdev-&gt;base_addr = iobase;</div><div class='add'>+	netdev-&gt;irq = irq;</div><div class='add'>+</div><div class='add'>+	if (register_hdlc_device(netdev)) {</div><div class='add'>+		printk(KERN_ERR "hostess: unable to register HDLC device.\n");</div><div class='add'>+		free_netdev(netdev);</div><div class='add'>+		goto free_dma;</div><div class='ctx'> 	}</div><div class='del'>-dmafail2:</div><div class='del'>-	if(dma==1)</div><div class='del'>-		free_dma(dev-&gt;chanA.rxdma);</div><div class='del'>-dmafail:</div><div class='del'>-	if(dma)</div><div class='del'>-		free_dma(dev-&gt;chanA.txdma);</div><div class='del'>-fail:</div><div class='del'>-	free_irq(irq, dev);</div><div class='del'>-fail1:</div><div class='del'>-	free_netdev(sv-&gt;netdev.dev);</div><div class='del'>-fail2:</div><div class='add'>+</div><div class='add'>+	z8530_describe(sv, "I/O", iobase);</div><div class='add'>+	sv-&gt;active = 1;</div><div class='add'>+	return sv;</div><div class='add'>+</div><div class='add'>+free_dma:</div><div class='add'>+	if (dma == 1)</div><div class='add'>+		free_dma(sv-&gt;chanA.rxdma);</div><div class='add'>+err_rxdma:</div><div class='add'>+	if (dma)</div><div class='add'>+		free_dma(sv-&gt;chanA.txdma);</div><div class='add'>+err_txdma:</div><div class='add'>+	free_irq(irq, sv);</div><div class='add'>+err_irq:</div><div class='ctx'> 	kfree(sv);</div><div class='del'>-fail3:</div><div class='del'>-	release_region(iobase,8);</div><div class='add'>+err_kzalloc:</div><div class='add'>+	release_region(iobase, 8);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sv11_shutdown(struct sv11_device *dev)</div><div class='add'>+static void sv11_shutdown(struct z8530_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	sppp_detach(dev-&gt;netdev.dev);</div><div class='del'>-	unregister_netdev(dev-&gt;netdev.dev);</div><div class='del'>-	z8530_shutdown(&amp;dev-&gt;sync);</div><div class='del'>-	free_irq(dev-&gt;sync.irq, dev);</div><div class='del'>-	if(dma)</div><div class='del'>-	{</div><div class='del'>-		if(dma==1)</div><div class='del'>-			free_dma(dev-&gt;sync.chanA.rxdma);</div><div class='del'>-		free_dma(dev-&gt;sync.chanA.txdma);</div><div class='add'>+	unregister_hdlc_device(dev-&gt;chanA.netdevice);</div><div class='add'>+	z8530_shutdown(dev);</div><div class='add'>+	free_irq(dev-&gt;irq, dev);</div><div class='add'>+	if (dma) {</div><div class='add'>+		if (dma == 1)</div><div class='add'>+			free_dma(dev-&gt;chanA.rxdma);</div><div class='add'>+		free_dma(dev-&gt;chanA.txdma);</div><div class='ctx'> 	}</div><div class='del'>-	release_region(dev-&gt;sync.chanA.ctrlio-1, 8);</div><div class='del'>-	free_netdev(dev-&gt;netdev.dev);</div><div class='add'>+	release_region(dev-&gt;chanA.ctrlio - 1, 8);</div><div class='add'>+	free_netdev(dev-&gt;chanA.netdevice);</div><div class='ctx'> 	kfree(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='del'>-</div><div class='del'>-static int io=0x200;</div><div class='del'>-static int irq=9;</div><div class='add'>+static int io = 0x200;</div><div class='add'>+static int irq = 9;</div><div class='ctx'> </div><div class='ctx'> module_param(io, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(io, "The I/O base of the Comtrol Hostess SV11 card");</div><div class='hunk'>@@ -397,22 +328,17 @@ MODULE_AUTHOR("Alan Cox");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("Modular driver for the Comtrol Hostess SV11");</div><div class='ctx'> </div><div class='del'>-static struct sv11_device *sv11_unit;</div><div class='add'>+static struct z8530_dev *sv11_unit;</div><div class='ctx'> </div><div class='ctx'> int init_module(void)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_INFO "SV-11 Z85230 Synchronous Driver v 0.03.\n");</div><div class='del'>-	printk(KERN_INFO "(c) Copyright 2001, Red Hat Inc.\n");	</div><div class='del'>-	if((sv11_unit=sv11_init(io,irq))==NULL)</div><div class='add'>+	if ((sv11_unit = sv11_init(io, irq)) == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void cleanup_module(void)</div><div class='ctx'> {</div><div class='del'>-	if(sv11_unit)</div><div class='add'>+	if (sv11_unit)</div><div class='ctx'> 		sv11_shutdown(sv11_unit);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/wan/lmc/lmc.h b/drivers/net/wan/lmc/lmc.h<br/>index 882e58c1bfd7..4ced7ac16c2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/lmc/lmc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc.h</a></div><div class='hunk'>@@ -11,12 +11,12 @@ unsigned lmc_mii_readreg(lmc_softc_t * const sc, unsigned</div><div class='ctx'>       			  devaddr, unsigned regno);</div><div class='ctx'> void lmc_mii_writereg(lmc_softc_t * const sc, unsigned devaddr,</div><div class='ctx'> 			       unsigned regno, unsigned data);</div><div class='del'>-void lmc_led_on(lmc_softc_t * const, u_int32_t);</div><div class='del'>-void lmc_led_off(lmc_softc_t * const, u_int32_t);</div><div class='add'>+void lmc_led_on(lmc_softc_t * const, u32);</div><div class='add'>+void lmc_led_off(lmc_softc_t * const, u32);</div><div class='ctx'> unsigned lmc_mii_readreg(lmc_softc_t * const, unsigned, unsigned);</div><div class='ctx'> void lmc_mii_writereg(lmc_softc_t * const, unsigned, unsigned, unsigned);</div><div class='del'>-void lmc_gpio_mkinput(lmc_softc_t * const sc, u_int32_t bits);</div><div class='del'>-void lmc_gpio_mkoutput(lmc_softc_t * const sc, u_int32_t bits);</div><div class='add'>+void lmc_gpio_mkinput(lmc_softc_t * const sc, u32 bits);</div><div class='add'>+void lmc_gpio_mkoutput(lmc_softc_t * const sc, u32 bits);</div><div class='ctx'> </div><div class='ctx'> int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);</div><div class='ctx'> </div><div class='hunk'>@@ -26,8 +26,7 @@ extern lmc_media_t lmc_t1_media;</div><div class='ctx'> extern lmc_media_t lmc_hssi_media;</div><div class='ctx'> </div><div class='ctx'> #ifdef _DBG_EVENTLOG</div><div class='del'>-static void lmcEventLog( u_int32_t EventNum, u_int32_t arg2, u_int32_t arg3 );</div><div class='add'>+static void lmcEventLog(u32 EventNum, u32 arg2, u32 arg3);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/wan/lmc/lmc_debug.c b/drivers/net/wan/lmc/lmc_debug.c<br/>index 3b94352b0d03..15049d711f47 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_debug.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/lmc/lmc_debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_debug.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc_debug.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -48,10 +47,10 @@ void lmcConsoleLog(char *type, unsigned char *ucData, int iLen)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-u_int32_t lmcEventLogIndex = 0;</div><div class='del'>-u_int32_t lmcEventLogBuf[LMC_EVENTLOGSIZE * LMC_EVENTLOGARGS];</div><div class='add'>+u32 lmcEventLogIndex;</div><div class='add'>+u32 lmcEventLogBuf[LMC_EVENTLOGSIZE * LMC_EVENTLOGARGS];</div><div class='ctx'> </div><div class='del'>-void lmcEventLog (u_int32_t EventNum, u_int32_t arg2, u_int32_t arg3)</div><div class='add'>+void lmcEventLog(u32 EventNum, u32 arg2, u32 arg3)</div><div class='ctx'> {</div><div class='ctx'>   lmcEventLogBuf[lmcEventLogIndex++] = EventNum;</div><div class='ctx'>   lmcEventLogBuf[lmcEventLogIndex++] = arg2;</div><div class='head'>diff --git a/drivers/net/wan/lmc/lmc_debug.h b/drivers/net/wan/lmc/lmc_debug.h<br/>index cf3563859bf3..2d46f121549f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_debug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/lmc/lmc_debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_debug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc_debug.h</a></div><div class='hunk'>@@ -38,15 +38,15 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-extern u_int32_t lmcEventLogIndex;</div><div class='del'>-extern u_int32_t lmcEventLogBuf[LMC_EVENTLOGSIZE * LMC_EVENTLOGARGS];</div><div class='add'>+extern u32 lmcEventLogIndex;</div><div class='add'>+extern u32 lmcEventLogBuf[LMC_EVENTLOGSIZE * LMC_EVENTLOGARGS];</div><div class='ctx'> #define LMC_EVENT_LOG(x, y, z) lmcEventLog((x), (y), (z))</div><div class='ctx'> #else</div><div class='ctx'> #define LMC_EVENT_LOG(x,y,z)</div><div class='ctx'> #endif /* end ifdef _DBG_EVENTLOG */</div><div class='ctx'> </div><div class='ctx'> void lmcConsoleLog(char *type, unsigned char *ucData, int iLen);</div><div class='del'>-void lmcEventLog (u_int32_t EventNum, u_int32_t arg2, u_int32_t arg3);</div><div class='add'>+void lmcEventLog(u32 EventNum, u32 arg2, u32 arg3);</div><div class='ctx'> void lmc_trace(struct net_device *dev, char *msg);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wan/lmc/lmc_ioctl.h b/drivers/net/wan/lmc/lmc_ioctl.h<br/>index 57dd861cd3db..72fb113a44ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_ioctl.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/lmc/lmc_ioctl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_ioctl.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc_ioctl.h</a></div><div class='hunk'>@@ -61,7 +61,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * IFTYPE defines</div><div class='ctx'>  */</div><div class='del'>-#define LMC_PPP         1               /* use sppp interface */</div><div class='add'>+#define LMC_PPP         1               /* use generic HDLC interface */</div><div class='ctx'> #define LMC_NET         2               /* use direct net interface */</div><div class='ctx'> #define LMC_RAW         3               /* use direct net interface */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c<br/>index 62133cee446a..f80640f5a744 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_main.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/lmc/lmc_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_main.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc_main.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'>  /*</div><div class='ctx'>   * Copyright (c) 1997-2000 LAN Media Corporation (LMC)</div><div class='ctx'>   * All rights reserved.  www.lanmedia.com</div><div class='add'>+  * Generic HDLC port Copyright (C) 2008 Krzysztof Halasa &lt;khc@pm.waw.pl&gt;</div><div class='ctx'>   *</div><div class='ctx'>   * This code is written by:</div><div class='ctx'>   * Andrew Stanley-Jones (asj@cban.com)</div><div class='hunk'>@@ -36,8 +37,6 @@</div><div class='ctx'>   *</div><div class='ctx'>   */</div><div class='ctx'> </div><div class='del'>-/* $Id: lmc_main.c,v 1.36 2000/04/11 05:25:25 asj Exp $ */</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -49,6 +48,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/hdlc.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='hunk'>@@ -57,9 +57,6 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/syncppp.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;asm/processor.h&gt;             /* Processor type for cache alignment. */</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='hunk'>@@ -78,8 +75,6 @@</div><div class='ctx'> #include "lmc_debug.h"</div><div class='ctx'> #include "lmc_proto.h"</div><div class='ctx'> </div><div class='del'>-static int lmc_first_load = 0;</div><div class='del'>-</div><div class='ctx'> static int LMC_PKT_BUF_SZ = 1542;</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id lmc_pci_tbl[] = {</div><div class='hunk'>@@ -91,11 +86,10 @@ static struct pci_device_id lmc_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, lmc_pci_tbl);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int lmc_start_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='del'>-static int lmc_start_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='ctx'> static int lmc_rx (struct net_device *dev);</div><div class='ctx'> static int lmc_open(struct net_device *dev);</div><div class='ctx'> static int lmc_close(struct net_device *dev);</div><div class='hunk'>@@ -114,20 +108,14 @@ static void lmc_driver_timeout(struct net_device *dev);</div><div class='ctx'>  * linux reserves 16 device specific IOCTLs.  We call them</div><div class='ctx'>  * LMCIOC* to control various bits of our world.</div><div class='ctx'>  */</div><div class='del'>-int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='add'>+int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'> {</div><div class='del'>-    lmc_softc_t *sc;</div><div class='add'>+    lmc_softc_t *sc = dev_to_sc(dev);</div><div class='ctx'>     lmc_ctl_t ctl;</div><div class='del'>-    int ret;</div><div class='del'>-    u_int16_t regVal;</div><div class='add'>+    int ret = -EOPNOTSUPP;</div><div class='add'>+    u16 regVal;</div><div class='ctx'>     unsigned long flags;</div><div class='ctx'> </div><div class='del'>-    struct sppp *sp;</div><div class='del'>-</div><div class='del'>-    ret = -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-    sc = dev-&gt;priv;</div><div class='del'>-</div><div class='ctx'>     lmc_trace(dev, "lmc_ioctl in");</div><div class='ctx'> </div><div class='ctx'>     /*</div><div class='hunk'>@@ -149,7 +137,6 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'>         break;</div><div class='ctx'> </div><div class='ctx'>     case LMCIOCSINFO: /*fold01*/</div><div class='del'>-        sp = &amp;((struct ppp_device *) dev)-&gt;sppp;</div><div class='ctx'>         if (!capable(CAP_NET_ADMIN)) {</div><div class='ctx'>             ret = -EPERM;</div><div class='ctx'>             break;</div><div class='hunk'>@@ -175,25 +162,20 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'> 		sc-&gt;TxDescriptControlInit &amp;= ~LMC_TDES_ADD_CRC_DISABLE;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-        if (ctl.keepalive_onoff == LMC_CTL_OFF)</div><div class='del'>-            sp-&gt;pp_flags &amp;= ~PP_KEEPALIVE;	/* Turn off */</div><div class='del'>-        else</div><div class='del'>-            sp-&gt;pp_flags |= PP_KEEPALIVE;	/* Turn on */</div><div class='del'>-</div><div class='ctx'>         ret = 0;</div><div class='ctx'>         break;</div><div class='ctx'> </div><div class='ctx'>     case LMCIOCIFTYPE: /*fold01*/</div><div class='ctx'>         {</div><div class='del'>-            u_int16_t	old_type = sc-&gt;if_type;</div><div class='del'>-            u_int16_t	new_type;</div><div class='add'>+	    u16 old_type = sc-&gt;if_type;</div><div class='add'>+	    u16	new_type;</div><div class='ctx'> </div><div class='ctx'> 	    if (!capable(CAP_NET_ADMIN)) {</div><div class='ctx'> 		ret = -EPERM;</div><div class='ctx'> 		break;</div><div class='ctx'> 	    }</div><div class='ctx'> </div><div class='del'>-	    if (copy_from_user(&amp;new_type, ifr-&gt;ifr_data, sizeof(u_int16_t))) {</div><div class='add'>+	    if (copy_from_user(&amp;new_type, ifr-&gt;ifr_data, sizeof(u16))) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	    }</div><div class='hunk'>@@ -206,15 +188,11 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'>             }</div><div class='ctx'>             </div><div class='ctx'>             lmc_proto_close(sc);</div><div class='del'>-            lmc_proto_detach(sc);</div><div class='ctx'> </div><div class='ctx'>             sc-&gt;if_type = new_type;</div><div class='del'>-//            lmc_proto_init(sc);</div><div class='ctx'>             lmc_proto_attach(sc);</div><div class='del'>-            lmc_proto_open(sc);</div><div class='del'>-</div><div class='del'>-	    ret = 0 ;</div><div class='del'>-	    break ;</div><div class='add'>+	    ret = lmc_proto_open(sc);</div><div class='add'>+	    break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>     case LMCIOCGETXINFO: /*fold01*/</div><div class='hunk'>@@ -241,51 +219,53 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'> </div><div class='ctx'>         break;</div><div class='ctx'> </div><div class='del'>-    case LMCIOCGETLMCSTATS: /*fold01*/</div><div class='del'>-        if (sc-&gt;lmc_cardtype == LMC_CARDTYPE_T1){</div><div class='del'>-            lmc_mii_writereg (sc, 0, 17, T1FRAMER_FERR_LSB);</div><div class='del'>-            sc-&gt;stats.framingBitErrorCount +=</div><div class='del'>-                lmc_mii_readreg (sc, 0, 18) &amp; 0xff;</div><div class='del'>-            lmc_mii_writereg (sc, 0, 17, T1FRAMER_FERR_MSB);</div><div class='del'>-            sc-&gt;stats.framingBitErrorCount +=</div><div class='del'>-                (lmc_mii_readreg (sc, 0, 18) &amp; 0xff) &lt;&lt; 8;</div><div class='del'>-            lmc_mii_writereg (sc, 0, 17, T1FRAMER_LCV_LSB);</div><div class='del'>-            sc-&gt;stats.lineCodeViolationCount +=</div><div class='del'>-                lmc_mii_readreg (sc, 0, 18) &amp; 0xff;</div><div class='del'>-            lmc_mii_writereg (sc, 0, 17, T1FRAMER_LCV_MSB);</div><div class='del'>-            sc-&gt;stats.lineCodeViolationCount +=</div><div class='del'>-                (lmc_mii_readreg (sc, 0, 18) &amp; 0xff) &lt;&lt; 8;</div><div class='del'>-            lmc_mii_writereg (sc, 0, 17, T1FRAMER_AERR);</div><div class='del'>-            regVal = lmc_mii_readreg (sc, 0, 18) &amp; 0xff;</div><div class='del'>-</div><div class='del'>-            sc-&gt;stats.lossOfFrameCount +=</div><div class='del'>-                (regVal &amp; T1FRAMER_LOF_MASK) &gt;&gt; 4;</div><div class='del'>-            sc-&gt;stats.changeOfFrameAlignmentCount +=</div><div class='del'>-                (regVal &amp; T1FRAMER_COFA_MASK) &gt;&gt; 2;</div><div class='del'>-            sc-&gt;stats.severelyErroredFrameCount +=</div><div class='del'>-                regVal &amp; T1FRAMER_SEF_MASK;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if (copy_to_user(ifr-&gt;ifr_data, &amp;sc-&gt;stats,</div><div class='del'>-                         sizeof (struct lmc_statistics)))</div><div class='del'>-		ret = -EFAULT;</div><div class='del'>-	else</div><div class='del'>-		ret = 0;</div><div class='del'>-        break;</div><div class='add'>+    case LMCIOCGETLMCSTATS:</div><div class='add'>+	    if (sc-&gt;lmc_cardtype == LMC_CARDTYPE_T1) {</div><div class='add'>+		    lmc_mii_writereg(sc, 0, 17, T1FRAMER_FERR_LSB);</div><div class='add'>+		    sc-&gt;extra_stats.framingBitErrorCount +=</div><div class='add'>+			    lmc_mii_readreg(sc, 0, 18) &amp; 0xff;</div><div class='add'>+		    lmc_mii_writereg(sc, 0, 17, T1FRAMER_FERR_MSB);</div><div class='add'>+		    sc-&gt;extra_stats.framingBitErrorCount +=</div><div class='add'>+			    (lmc_mii_readreg(sc, 0, 18) &amp; 0xff) &lt;&lt; 8;</div><div class='add'>+		    lmc_mii_writereg(sc, 0, 17, T1FRAMER_LCV_LSB);</div><div class='add'>+		    sc-&gt;extra_stats.lineCodeViolationCount +=</div><div class='add'>+			    lmc_mii_readreg(sc, 0, 18) &amp; 0xff;</div><div class='add'>+		    lmc_mii_writereg(sc, 0, 17, T1FRAMER_LCV_MSB);</div><div class='add'>+		    sc-&gt;extra_stats.lineCodeViolationCount +=</div><div class='add'>+			    (lmc_mii_readreg(sc, 0, 18) &amp; 0xff) &lt;&lt; 8;</div><div class='add'>+		    lmc_mii_writereg(sc, 0, 17, T1FRAMER_AERR);</div><div class='add'>+		    regVal = lmc_mii_readreg(sc, 0, 18) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+		    sc-&gt;extra_stats.lossOfFrameCount +=</div><div class='add'>+			    (regVal &amp; T1FRAMER_LOF_MASK) &gt;&gt; 4;</div><div class='add'>+		    sc-&gt;extra_stats.changeOfFrameAlignmentCount +=</div><div class='add'>+			    (regVal &amp; T1FRAMER_COFA_MASK) &gt;&gt; 2;</div><div class='add'>+		    sc-&gt;extra_stats.severelyErroredFrameCount +=</div><div class='add'>+			    regVal &amp; T1FRAMER_SEF_MASK;</div><div class='add'>+	    }</div><div class='add'>+	    if (copy_to_user(ifr-&gt;ifr_data, &amp;sc-&gt;lmc_device-&gt;stats,</div><div class='add'>+			     sizeof(sc-&gt;lmc_device-&gt;stats)) ||</div><div class='add'>+		copy_to_user(ifr-&gt;ifr_data + sizeof(sc-&gt;lmc_device-&gt;stats),</div><div class='add'>+			     &amp;sc-&gt;extra_stats, sizeof(sc-&gt;extra_stats)))</div><div class='add'>+		    ret = -EFAULT;</div><div class='add'>+	    else</div><div class='add'>+		    ret = 0;</div><div class='add'>+	    break;</div><div class='ctx'> </div><div class='del'>-    case LMCIOCCLEARLMCSTATS: /*fold01*/</div><div class='del'>-        if (!capable(CAP_NET_ADMIN)){</div><div class='del'>-            ret = -EPERM;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='add'>+    case LMCIOCCLEARLMCSTATS:</div><div class='add'>+	    if (!capable(CAP_NET_ADMIN)) {</div><div class='add'>+		    ret = -EPERM;</div><div class='add'>+		    break;</div><div class='add'>+	    }</div><div class='ctx'> </div><div class='del'>-        memset (&amp;sc-&gt;stats, 0, sizeof (struct lmc_statistics));</div><div class='del'>-        sc-&gt;stats.check = STATCHECK;</div><div class='del'>-        sc-&gt;stats.version_size = (DRIVER_VERSION &lt;&lt; 16) +</div><div class='del'>-            sizeof (struct lmc_statistics);</div><div class='del'>-        sc-&gt;stats.lmc_cardtype = sc-&gt;lmc_cardtype;</div><div class='del'>-        ret = 0;</div><div class='del'>-        break;</div><div class='add'>+	    memset(&amp;sc-&gt;lmc_device-&gt;stats, 0, sizeof(sc-&gt;lmc_device-&gt;stats));</div><div class='add'>+	    memset(&amp;sc-&gt;extra_stats, 0, sizeof(sc-&gt;extra_stats));</div><div class='add'>+	    sc-&gt;extra_stats.check = STATCHECK;</div><div class='add'>+	    sc-&gt;extra_stats.version_size = (DRIVER_VERSION &lt;&lt; 16) +</div><div class='add'>+		    sizeof(sc-&gt;lmc_device-&gt;stats) + sizeof(sc-&gt;extra_stats);</div><div class='add'>+	    sc-&gt;extra_stats.lmc_cardtype = sc-&gt;lmc_cardtype;</div><div class='add'>+	    ret = 0;</div><div class='add'>+	    break;</div><div class='ctx'> </div><div class='ctx'>     case LMCIOCSETCIRCUIT: /*fold01*/</div><div class='ctx'>         if (!capable(CAP_NET_ADMIN)){</div><div class='hunk'>@@ -330,7 +310,8 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-        if (copy_to_user(ifr-&gt;ifr_data + sizeof (u32), lmcEventLogBuf, sizeof (lmcEventLogBuf)))</div><div class='add'>+	if (copy_to_user(ifr-&gt;ifr_data + sizeof(u32), lmcEventLogBuf,</div><div class='add'>+			 sizeof(lmcEventLogBuf)))</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = 0;</div><div class='hunk'>@@ -641,14 +622,12 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/</div><div class='ctx'> /* the watchdog process that cruises around */</div><div class='ctx'> static void lmc_watchdog (unsigned long data) /*fold00*/</div><div class='ctx'> {</div><div class='del'>-    struct net_device *dev = (struct net_device *) data;</div><div class='del'>-    lmc_softc_t *sc;</div><div class='add'>+    struct net_device *dev = (struct net_device *)data;</div><div class='add'>+    lmc_softc_t *sc = dev_to_sc(dev);</div><div class='ctx'>     int link_status;</div><div class='del'>-    u_int32_t ticks;</div><div class='add'>+    u32 ticks;</div><div class='ctx'>     unsigned long flags;</div><div class='ctx'> </div><div class='del'>-    sc = dev-&gt;priv;</div><div class='del'>-</div><div class='ctx'>     lmc_trace(dev, "lmc_watchdog in");</div><div class='ctx'> </div><div class='ctx'>     spin_lock_irqsave(&amp;sc-&gt;lmc_lock, flags);</div><div class='hunk'>@@ -677,22 +656,22 @@ static void lmc_watchdog (unsigned long data) /*fold00*/</div><div class='ctx'>      * check for a transmit interrupt timeout</div><div class='ctx'>      * Has the packet xmt vs xmt serviced threshold been exceeded */</div><div class='ctx'>     if (sc-&gt;lmc_taint_tx == sc-&gt;lastlmc_taint_tx &amp;&amp;</div><div class='del'>-        sc-&gt;stats.tx_packets &gt; sc-&gt;lasttx_packets &amp;&amp;</div><div class='del'>-        sc-&gt;tx_TimeoutInd == 0)</div><div class='add'>+	sc-&gt;lmc_device-&gt;stats.tx_packets &gt; sc-&gt;lasttx_packets &amp;&amp;</div><div class='add'>+	sc-&gt;tx_TimeoutInd == 0)</div><div class='ctx'>     {</div><div class='ctx'> </div><div class='ctx'>         /* wait for the watchdog to come around again */</div><div class='ctx'>         sc-&gt;tx_TimeoutInd = 1;</div><div class='ctx'>     }</div><div class='ctx'>     else if (sc-&gt;lmc_taint_tx == sc-&gt;lastlmc_taint_tx &amp;&amp;</div><div class='del'>-             sc-&gt;stats.tx_packets &gt; sc-&gt;lasttx_packets &amp;&amp;</div><div class='del'>-             sc-&gt;tx_TimeoutInd)</div><div class='add'>+	     sc-&gt;lmc_device-&gt;stats.tx_packets &gt; sc-&gt;lasttx_packets &amp;&amp;</div><div class='add'>+	     sc-&gt;tx_TimeoutInd)</div><div class='ctx'>     {</div><div class='ctx'> </div><div class='ctx'>         LMC_EVENT_LOG(LMC_EVENT_XMTINTTMO, LMC_CSR_READ (sc, csr_status), 0);</div><div class='ctx'> </div><div class='ctx'>         sc-&gt;tx_TimeoutDisplay = 1;</div><div class='del'>-        sc-&gt;stats.tx_TimeoutCnt++;</div><div class='add'>+	sc-&gt;extra_stats.tx_TimeoutCnt++;</div><div class='ctx'> </div><div class='ctx'>         /* DEC chip is stuck, hit it with a RESET!!!! */</div><div class='ctx'>         lmc_running_reset (dev);</div><div class='hunk'>@@ -712,13 +691,11 @@ static void lmc_watchdog (unsigned long data) /*fold00*/</div><div class='ctx'>         /* reset the transmit timeout detection flag */</div><div class='ctx'>         sc-&gt;tx_TimeoutInd = 0;</div><div class='ctx'>         sc-&gt;lastlmc_taint_tx = sc-&gt;lmc_taint_tx;</div><div class='del'>-        sc-&gt;lasttx_packets = sc-&gt;stats.tx_packets;</div><div class='del'>-    }</div><div class='del'>-    else</div><div class='del'>-    {</div><div class='add'>+	sc-&gt;lasttx_packets = sc-&gt;lmc_device-&gt;stats.tx_packets;</div><div class='add'>+    } else {</div><div class='ctx'>         sc-&gt;tx_TimeoutInd = 0;</div><div class='ctx'>         sc-&gt;lastlmc_taint_tx = sc-&gt;lmc_taint_tx;</div><div class='del'>-        sc-&gt;lasttx_packets = sc-&gt;stats.tx_packets;</div><div class='add'>+	sc-&gt;lasttx_packets = sc-&gt;lmc_device-&gt;stats.tx_packets;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     /* --- end time out check ----------------------------------- */</div><div class='hunk'>@@ -748,19 +725,7 @@ static void lmc_watchdog (unsigned long data) /*fold00*/</div><div class='ctx'>          sc-&gt;last_link_status = 1;</div><div class='ctx'>          /* lmc_reset (sc); Again why reset??? */</div><div class='ctx'> </div><div class='del'>-         /* Inform the world that link protocol is back up. */</div><div class='ctx'> 	 netif_carrier_on(dev);</div><div class='del'>-</div><div class='del'>-         /* Now we have to tell the syncppp that we had an outage</div><div class='del'>-          * and that it should deal.  Calling sppp_reopen here</div><div class='del'>-          * should do the trick, but we may have to call sppp_close</div><div class='del'>-          * when the link goes down, and call sppp_open here.</div><div class='del'>-          * Subject to more testing.</div><div class='del'>-          * --bbraun</div><div class='del'>-          */</div><div class='del'>-</div><div class='del'>-         lmc_proto_reopen(sc);</div><div class='del'>-</div><div class='ctx'>      }</div><div class='ctx'> </div><div class='ctx'>     /* Call media specific watchdog functions */</div><div class='hunk'>@@ -816,114 +781,93 @@ kick_timer:</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void lmc_setup(struct net_device * const dev) /*fold00*/</div><div class='add'>+static int lmc_attach(struct net_device *dev, unsigned short encoding,</div><div class='add'>+		      unsigned short parity)</div><div class='ctx'> {</div><div class='del'>-    lmc_trace(dev, "lmc_setup in");</div><div class='del'>-</div><div class='del'>-    dev-&gt;type = ARPHRD_HDLC;</div><div class='del'>-    dev-&gt;hard_start_xmit = lmc_start_xmit;</div><div class='del'>-    dev-&gt;open = lmc_open;</div><div class='del'>-    dev-&gt;stop = lmc_close;</div><div class='del'>-    dev-&gt;get_stats = lmc_get_stats;</div><div class='del'>-    dev-&gt;do_ioctl = lmc_ioctl;</div><div class='del'>-    dev-&gt;tx_timeout = lmc_driver_timeout;</div><div class='del'>-    dev-&gt;watchdog_timeo = (HZ); /* 1 second */</div><div class='del'>-    </div><div class='del'>-    lmc_trace(dev, "lmc_setup out");</div><div class='add'>+	if (encoding == ENCODING_NRZ &amp;&amp; parity == PARITY_CRC16_PR1_CCITT)</div><div class='add'>+		return 0;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int __devinit lmc_init_one(struct pci_dev *pdev,</div><div class='ctx'> 				  const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='del'>-    struct net_device *dev;</div><div class='del'>-    lmc_softc_t *sc;</div><div class='del'>-    u16 subdevice;</div><div class='del'>-    u_int16_t AdapModelNum;</div><div class='del'>-    int err = -ENOMEM;</div><div class='del'>-    static int cards_found;</div><div class='del'>-#ifndef GCOM</div><div class='del'>-    /* We name by type not by vendor */</div><div class='del'>-    static const char lmcname[] = "hdlc%d";</div><div class='del'>-#else</div><div class='del'>-    /* </div><div class='del'>-     * GCOM uses LMC vendor name so that clients can know which card</div><div class='del'>-     * to attach to.</div><div class='del'>-     */</div><div class='del'>-    static const char lmcname[] = "lmc%d";</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    /*</div><div class='del'>-     * Allocate our own device structure</div><div class='del'>-     */</div><div class='del'>-    dev = alloc_netdev(sizeof(lmc_softc_t), lmcname, lmc_setup);</div><div class='del'>-    if (!dev) {</div><div class='del'>-        printk (KERN_ERR "lmc:alloc_netdev for device failed\n");</div><div class='del'>-	goto out1;</div><div class='del'>-    }</div><div class='del'>- </div><div class='del'>-    lmc_trace(dev, "lmc_init_one in");</div><div class='del'>-</div><div class='del'>-    err = pci_enable_device(pdev);</div><div class='del'>-    if (err) {</div><div class='del'>-	    printk(KERN_ERR "lmc: pci enable failed:%d\n", err);</div><div class='del'>-	    goto out2;</div><div class='del'>-    }</div><div class='del'>-    </div><div class='del'>-    if (pci_request_regions(pdev, "lmc")) {</div><div class='del'>-	    printk(KERN_ERR "lmc: pci_request_region failed\n");</div><div class='del'>-	    err = -EIO;</div><div class='del'>-	    goto out3;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    pci_set_drvdata(pdev, dev);</div><div class='del'>-</div><div class='del'>-    if(lmc_first_load == 0){</div><div class='del'>-        printk(KERN_INFO "Lan Media Corporation WAN Driver Version %d.%d.%d\n",</div><div class='del'>-	       DRIVER_MAJOR_VERSION, DRIVER_MINOR_VERSION,DRIVER_SUB_VERSION);</div><div class='del'>-        lmc_first_load = 1;</div><div class='del'>-    }</div><div class='del'>-    </div><div class='del'>-    sc = dev-&gt;priv;</div><div class='del'>-    sc-&gt;lmc_device = dev;</div><div class='del'>-    sc-&gt;name = dev-&gt;name;</div><div class='del'>-</div><div class='del'>-    /* Initialize the sppp layer */</div><div class='del'>-    /* An ioctl can cause a subsequent detach for raw frame interface */</div><div class='del'>-    dev-&gt;ml_priv = sc;</div><div class='del'>-    sc-&gt;if_type = LMC_PPP;</div><div class='del'>-    sc-&gt;check = 0xBEAFCAFE;</div><div class='del'>-    dev-&gt;base_addr = pci_resource_start(pdev, 0);</div><div class='del'>-    dev-&gt;irq = pdev-&gt;irq;</div><div class='del'>-</div><div class='del'>-    SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-    /*</div><div class='del'>-     * This will get the protocol layer ready and do any 1 time init's</div><div class='del'>-     * Must have a valid sc and dev structure</div><div class='del'>-     */</div><div class='del'>-    lmc_proto_init(sc);</div><div class='del'>-</div><div class='del'>-    lmc_proto_attach(sc);</div><div class='add'>+	lmc_softc_t *sc;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	u16 subdevice;</div><div class='add'>+	u16 AdapModelNum;</div><div class='add'>+	int err;</div><div class='add'>+	static int cards_found;</div><div class='add'>+</div><div class='add'>+	/* lmc_trace(dev, "lmc_init_one in"); */</div><div class='add'>+</div><div class='add'>+	err = pci_enable_device(pdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "lmc: pci enable failed: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-    /*</div><div class='del'>-     * Why were we changing this???</div><div class='del'>-     dev-&gt;tx_queue_len = 100;</div><div class='del'>-     */</div><div class='add'>+	err = pci_request_regions(pdev, "lmc");</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "lmc: pci_request_region failed\n");</div><div class='add'>+		goto err_req_io;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-    /* Init the spin lock so can call it latter */</div><div class='add'>+	/*</div><div class='add'>+	 * Allocate our own device structure</div><div class='add'>+	 */</div><div class='add'>+	sc = kzalloc(sizeof(lmc_softc_t), GFP_KERNEL);</div><div class='add'>+	if (!sc) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_kzalloc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-    spin_lock_init(&amp;sc-&gt;lmc_lock);</div><div class='del'>-    pci_set_master(pdev);</div><div class='add'>+	dev = alloc_hdlcdev(sc);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		printk(KERN_ERR "lmc:alloc_netdev for device failed\n");</div><div class='add'>+		goto err_hdlcdev;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-    printk ("%s: detected at %lx, irq %d\n", dev-&gt;name,</div><div class='del'>-	    dev-&gt;base_addr, dev-&gt;irq);</div><div class='ctx'> </div><div class='del'>-    if (register_netdev (dev) != 0) {</div><div class='del'>-        printk (KERN_ERR "%s: register_netdev failed.\n", dev-&gt;name);</div><div class='del'>-	goto out4;</div><div class='del'>-    }</div><div class='add'>+	dev-&gt;type = ARPHRD_HDLC;</div><div class='add'>+	dev_to_hdlc(dev)-&gt;xmit = lmc_start_xmit;</div><div class='add'>+	dev_to_hdlc(dev)-&gt;attach = lmc_attach;</div><div class='add'>+	dev-&gt;open = lmc_open;</div><div class='add'>+	dev-&gt;stop = lmc_close;</div><div class='add'>+	dev-&gt;get_stats = lmc_get_stats;</div><div class='add'>+	dev-&gt;do_ioctl = lmc_ioctl;</div><div class='add'>+	dev-&gt;tx_timeout = lmc_driver_timeout;</div><div class='add'>+	dev-&gt;watchdog_timeo = HZ; /* 1 second */</div><div class='add'>+	dev-&gt;tx_queue_len = 100;</div><div class='add'>+	sc-&gt;lmc_device = dev;</div><div class='add'>+	sc-&gt;name = dev-&gt;name;</div><div class='add'>+	sc-&gt;if_type = LMC_PPP;</div><div class='add'>+	sc-&gt;check = 0xBEAFCAFE;</div><div class='add'>+	dev-&gt;base_addr = pci_resource_start(pdev, 0);</div><div class='add'>+	dev-&gt;irq = pdev-&gt;irq;</div><div class='add'>+	pci_set_drvdata(pdev, dev);</div><div class='add'>+	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This will get the protocol layer ready and do any 1 time init's</div><div class='add'>+	 * Must have a valid sc and dev structure</div><div class='add'>+	 */</div><div class='add'>+	lmc_proto_attach(sc);</div><div class='add'>+</div><div class='add'>+	/* Init the spin lock so can call it latter */</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;sc-&gt;lmc_lock);</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s: detected at %lx, irq %d\n", dev-&gt;name,</div><div class='add'>+	       dev-&gt;base_addr, dev-&gt;irq);</div><div class='add'>+</div><div class='add'>+	err = register_hdlc_device(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "%s: register_netdev failed.\n", dev-&gt;name);</div><div class='add'>+		free_netdev(dev);</div><div class='add'>+		goto err_hdlcdev;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'>     sc-&gt;lmc_cardtype = LMC_CARDTYPE_UNKNOWN;</div><div class='ctx'>     sc-&gt;lmc_timing = LMC_CTL_CLOCK_SOURCE_EXT;</div><div class='hunk'>@@ -939,27 +883,27 @@ static int __devinit lmc_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'>     switch (subdevice) {</div><div class='ctx'>     case PCI_DEVICE_ID_LMC_HSSI:</div><div class='del'>-        printk ("%s: LMC HSSI\n", dev-&gt;name);</div><div class='add'>+	printk(KERN_INFO "%s: LMC HSSI\n", dev-&gt;name);</div><div class='ctx'>         sc-&gt;lmc_cardtype = LMC_CARDTYPE_HSSI;</div><div class='ctx'>         sc-&gt;lmc_media = &amp;lmc_hssi_media;</div><div class='ctx'>         break;</div><div class='ctx'>     case PCI_DEVICE_ID_LMC_DS3:</div><div class='del'>-        printk ("%s: LMC DS3\n", dev-&gt;name);</div><div class='add'>+	printk(KERN_INFO "%s: LMC DS3\n", dev-&gt;name);</div><div class='ctx'>         sc-&gt;lmc_cardtype = LMC_CARDTYPE_DS3;</div><div class='ctx'>         sc-&gt;lmc_media = &amp;lmc_ds3_media;</div><div class='ctx'>         break;</div><div class='ctx'>     case PCI_DEVICE_ID_LMC_SSI:</div><div class='del'>-        printk ("%s: LMC SSI\n", dev-&gt;name);</div><div class='add'>+	printk(KERN_INFO "%s: LMC SSI\n", dev-&gt;name);</div><div class='ctx'>         sc-&gt;lmc_cardtype = LMC_CARDTYPE_SSI;</div><div class='ctx'>         sc-&gt;lmc_media = &amp;lmc_ssi_media;</div><div class='ctx'>         break;</div><div class='ctx'>     case PCI_DEVICE_ID_LMC_T1:</div><div class='del'>-        printk ("%s: LMC T1\n", dev-&gt;name);</div><div class='add'>+	printk(KERN_INFO "%s: LMC T1\n", dev-&gt;name);</div><div class='ctx'>         sc-&gt;lmc_cardtype = LMC_CARDTYPE_T1;</div><div class='ctx'>         sc-&gt;lmc_media = &amp;lmc_t1_media;</div><div class='ctx'>         break;</div><div class='ctx'>     default:</div><div class='del'>-        printk (KERN_WARNING "%s: LMC UNKOWN CARD!\n", dev-&gt;name);</div><div class='add'>+	printk(KERN_WARNING "%s: LMC UNKOWN CARD!\n", dev-&gt;name);</div><div class='ctx'>         break;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='hunk'>@@ -977,32 +921,28 @@ static int __devinit lmc_init_one(struct pci_dev *pdev,</div><div class='ctx'>      */</div><div class='ctx'>     AdapModelNum = (lmc_mii_readreg (sc, 0, 3) &amp; 0x3f0) &gt;&gt; 4;</div><div class='ctx'> </div><div class='del'>-    if ((AdapModelNum == LMC_ADAP_T1</div><div class='del'>-         &amp;&amp; subdevice == PCI_DEVICE_ID_LMC_T1) ||	/* detect LMC1200 */</div><div class='del'>-        (AdapModelNum == LMC_ADAP_SSI</div><div class='del'>-         &amp;&amp; subdevice == PCI_DEVICE_ID_LMC_SSI) ||	/* detect LMC1000 */</div><div class='del'>-        (AdapModelNum == LMC_ADAP_DS3</div><div class='del'>-         &amp;&amp; subdevice == PCI_DEVICE_ID_LMC_DS3) ||	/* detect LMC5245 */</div><div class='del'>-        (AdapModelNum == LMC_ADAP_HSSI</div><div class='del'>-         &amp;&amp; subdevice == PCI_DEVICE_ID_LMC_HSSI))</div><div class='del'>-    {				/* detect LMC5200 */</div><div class='add'>+    if ((AdapModelNum != LMC_ADAP_T1 || /* detect LMC1200 */</div><div class='add'>+	 subdevice != PCI_DEVICE_ID_LMC_T1) &amp;&amp;</div><div class='add'>+	(AdapModelNum != LMC_ADAP_SSI || /* detect LMC1000 */</div><div class='add'>+	 subdevice != PCI_DEVICE_ID_LMC_SSI) &amp;&amp;</div><div class='add'>+	(AdapModelNum != LMC_ADAP_DS3 || /* detect LMC5245 */</div><div class='add'>+	 subdevice != PCI_DEVICE_ID_LMC_DS3) &amp;&amp;</div><div class='add'>+	(AdapModelNum != LMC_ADAP_HSSI || /* detect LMC5200 */</div><div class='add'>+	 subdevice != PCI_DEVICE_ID_LMC_HSSI))</div><div class='add'>+	    printk(KERN_WARNING "%s: Model number (%d) miscompare for PCI"</div><div class='add'>+		   " Subsystem ID = 0x%04x\n",</div><div class='add'>+		   dev-&gt;name, AdapModelNum, subdevice);</div><div class='ctx'> </div><div class='del'>-    }</div><div class='del'>-    else {</div><div class='del'>-        printk ("%s: Model number (%d) miscompare for PCI Subsystem ID = 0x%04x\n",</div><div class='del'>-                dev-&gt;name, AdapModelNum, subdevice);</div><div class='del'>-//        return (NULL);</div><div class='del'>-    }</div><div class='ctx'>     /*</div><div class='ctx'>      * reset clock</div><div class='ctx'>      */</div><div class='ctx'>     LMC_CSR_WRITE (sc, csr_gp_timer, 0xFFFFFFFFUL);</div><div class='ctx'> </div><div class='ctx'>     sc-&gt;board_idx = cards_found++;</div><div class='del'>-    sc-&gt;stats.check = STATCHECK;</div><div class='del'>-    sc-&gt;stats.version_size = (DRIVER_VERSION &lt;&lt; 16) +</div><div class='del'>-        sizeof (struct lmc_statistics);</div><div class='del'>-    sc-&gt;stats.lmc_cardtype = sc-&gt;lmc_cardtype;</div><div class='add'>+    sc-&gt;extra_stats.check = STATCHECK;</div><div class='add'>+    sc-&gt;extra_stats.version_size = (DRIVER_VERSION &lt;&lt; 16) +</div><div class='add'>+	    sizeof(sc-&gt;lmc_device-&gt;stats) + sizeof(sc-&gt;extra_stats);</div><div class='add'>+    sc-&gt;extra_stats.lmc_cardtype = sc-&gt;lmc_cardtype;</div><div class='ctx'> </div><div class='ctx'>     sc-&gt;lmc_ok = 0;</div><div class='ctx'>     sc-&gt;last_link_status = 0;</div><div class='hunk'>@@ -1010,58 +950,51 @@ static int __devinit lmc_init_one(struct pci_dev *pdev,</div><div class='ctx'>     lmc_trace(dev, "lmc_init_one out");</div><div class='ctx'>     return 0;</div><div class='ctx'> </div><div class='del'>- out4:</div><div class='del'>-    lmc_proto_detach(sc);</div><div class='del'>- out3:</div><div class='del'>-    if (pdev) {</div><div class='del'>-	    pci_release_regions(pdev);</div><div class='del'>-	    pci_set_drvdata(pdev, NULL);</div><div class='del'>-    }</div><div class='del'>- out2:</div><div class='del'>-    free_netdev(dev);</div><div class='del'>- out1:</div><div class='del'>-    return err;</div><div class='add'>+err_hdlcdev:</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+	kfree(sc);</div><div class='add'>+err_kzalloc:</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+err_req_io:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called from pci when removing module.</div><div class='ctx'>  */</div><div class='del'>-static void __devexit lmc_remove_one (struct pci_dev *pdev)</div><div class='add'>+static void __devexit lmc_remove_one(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='del'>-    struct net_device *dev = pci_get_drvdata(pdev);</div><div class='del'>-    </div><div class='del'>-    if (dev) {</div><div class='del'>-	    lmc_softc_t *sc = dev-&gt;priv;</div><div class='del'>-	    </div><div class='del'>-	    printk("%s: removing...\n", dev-&gt;name);</div><div class='del'>-	    lmc_proto_detach(sc);</div><div class='del'>-	    unregister_netdev(dev);</div><div class='del'>-	    free_netdev(dev);</div><div class='del'>-	    pci_release_regions(pdev);</div><div class='del'>-	    pci_disable_device(pdev);</div><div class='del'>-	    pci_set_drvdata(pdev, NULL);</div><div class='del'>-    }</div><div class='add'>+	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (dev) {</div><div class='add'>+		printk(KERN_DEBUG "%s: removing...\n", dev-&gt;name);</div><div class='add'>+		unregister_hdlc_device(dev);</div><div class='add'>+		free_netdev(dev);</div><div class='add'>+		pci_release_regions(pdev);</div><div class='add'>+		pci_disable_device(pdev);</div><div class='add'>+		pci_set_drvdata(pdev, NULL);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* After this is called, packets can be sent.</div><div class='ctx'>  * Does not initialize the addresses</div><div class='ctx'>  */</div><div class='del'>-static int lmc_open (struct net_device *dev) /*fold00*/</div><div class='add'>+static int lmc_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-    lmc_softc_t *sc = dev-&gt;priv;</div><div class='add'>+    lmc_softc_t *sc = dev_to_sc(dev);</div><div class='add'>+    int err;</div><div class='ctx'> </div><div class='ctx'>     lmc_trace(dev, "lmc_open in");</div><div class='ctx'> </div><div class='ctx'>     lmc_led_on(sc, LMC_DS3_LED0);</div><div class='ctx'> </div><div class='del'>-    lmc_dec_reset (sc);</div><div class='del'>-    lmc_reset (sc);</div><div class='del'>-</div><div class='del'>-    LMC_EVENT_LOG(LMC_EVENT_RESET1, LMC_CSR_READ (sc, csr_status), 0);</div><div class='del'>-    LMC_EVENT_LOG(LMC_EVENT_RESET2,</div><div class='del'>-                  lmc_mii_readreg (sc, 0, 16),</div><div class='del'>-                  lmc_mii_readreg (sc, 0, 17));</div><div class='add'>+    lmc_dec_reset(sc);</div><div class='add'>+    lmc_reset(sc);</div><div class='ctx'> </div><div class='add'>+    LMC_EVENT_LOG(LMC_EVENT_RESET1, LMC_CSR_READ(sc, csr_status), 0);</div><div class='add'>+    LMC_EVENT_LOG(LMC_EVENT_RESET2, lmc_mii_readreg(sc, 0, 16),</div><div class='add'>+		  lmc_mii_readreg(sc, 0, 17));</div><div class='ctx'> </div><div class='ctx'>     if (sc-&gt;lmc_ok){</div><div class='ctx'>         lmc_trace(dev, "lmc_open lmc_ok out");</div><div class='hunk'>@@ -1106,14 +1039,14 @@ static int lmc_open (struct net_device *dev) /*fold00*/</div><div class='ctx'> </div><div class='ctx'>     /* dev-&gt;flags |= IFF_UP; */</div><div class='ctx'> </div><div class='del'>-    lmc_proto_open(sc);</div><div class='add'>+    if ((err = lmc_proto_open(sc)) != 0)</div><div class='add'>+	    return err;</div><div class='ctx'> </div><div class='ctx'>     dev-&gt;do_ioctl = lmc_ioctl;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>     netif_start_queue(dev);</div><div class='del'>-    </div><div class='del'>-    sc-&gt;stats.tx_tbusy0++ ;</div><div class='add'>+    sc-&gt;extra_stats.tx_tbusy0++;</div><div class='ctx'> </div><div class='ctx'>     /*</div><div class='ctx'>      * select what interrupts we want to get</div><div class='hunk'>@@ -1165,8 +1098,7 @@ static int lmc_open (struct net_device *dev) /*fold00*/</div><div class='ctx'> </div><div class='ctx'> static void lmc_running_reset (struct net_device *dev) /*fold00*/</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-    lmc_softc_t *sc = (lmc_softc_t *) dev-&gt;priv;</div><div class='add'>+    lmc_softc_t *sc = dev_to_sc(dev);</div><div class='ctx'> </div><div class='ctx'>     lmc_trace(dev, "lmc_runnig_reset in");</div><div class='ctx'> </div><div class='hunk'>@@ -1184,7 +1116,7 @@ static void lmc_running_reset (struct net_device *dev) /*fold00*/</div><div class='ctx'>     netif_wake_queue(dev);</div><div class='ctx'> </div><div class='ctx'>     sc-&gt;lmc_txfull = 0;</div><div class='del'>-    sc-&gt;stats.tx_tbusy0++ ;</div><div class='add'>+    sc-&gt;extra_stats.tx_tbusy0++;</div><div class='ctx'> </div><div class='ctx'>     sc-&gt;lmc_intrmask = TULIP_DEFAULT_INTR_MASK;</div><div class='ctx'>     LMC_CSR_WRITE (sc, csr_intr, sc-&gt;lmc_intrmask);</div><div class='hunk'>@@ -1200,14 +1132,13 @@ static void lmc_running_reset (struct net_device *dev) /*fold00*/</div><div class='ctx'>  * This disables the timer for the watchdog and keepalives,</div><div class='ctx'>  * and disables the irq for dev.</div><div class='ctx'>  */</div><div class='del'>-static int lmc_close (struct net_device *dev) /*fold00*/</div><div class='add'>+static int lmc_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>     /* not calling release_region() as we should */</div><div class='del'>-    lmc_softc_t *sc;</div><div class='add'>+    lmc_softc_t *sc = dev_to_sc(dev);</div><div class='ctx'> </div><div class='ctx'>     lmc_trace(dev, "lmc_close in");</div><div class='del'>-    </div><div class='del'>-    sc = dev-&gt;priv;</div><div class='add'>+</div><div class='ctx'>     sc-&gt;lmc_ok = 0;</div><div class='ctx'>     sc-&gt;lmc_media-&gt;set_link_status (sc, 0);</div><div class='ctx'>     del_timer (&amp;sc-&gt;timer);</div><div class='hunk'>@@ -1215,7 +1146,7 @@ static int lmc_close (struct net_device *dev) /*fold00*/</div><div class='ctx'>     lmc_ifdown (dev);</div><div class='ctx'> </div><div class='ctx'>     lmc_trace(dev, "lmc_close out");</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1223,16 +1154,16 @@ static int lmc_close (struct net_device *dev) /*fold00*/</div><div class='ctx'> /* When the interface goes down, this is called */</div><div class='ctx'> static int lmc_ifdown (struct net_device *dev) /*fold00*/</div><div class='ctx'> {</div><div class='del'>-    lmc_softc_t *sc = dev-&gt;priv;</div><div class='add'>+    lmc_softc_t *sc = dev_to_sc(dev);</div><div class='ctx'>     u32 csr6;</div><div class='ctx'>     int i;</div><div class='ctx'> </div><div class='ctx'>     lmc_trace(dev, "lmc_ifdown in");</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     /* Don't let anything else go on right now */</div><div class='ctx'>     //    dev-&gt;start = 0;</div><div class='ctx'>     netif_stop_queue(dev);</div><div class='del'>-    sc-&gt;stats.tx_tbusy1++ ;</div><div class='add'>+    sc-&gt;extra_stats.tx_tbusy1++;</div><div class='ctx'> </div><div class='ctx'>     /* stop interrupts */</div><div class='ctx'>     /* Clear the interrupt mask */</div><div class='hunk'>@@ -1244,8 +1175,8 @@ static int lmc_ifdown (struct net_device *dev) /*fold00*/</div><div class='ctx'>     csr6 &amp;= ~LMC_DEC_SR;		/* Turn off the Receive bit */</div><div class='ctx'>     LMC_CSR_WRITE (sc, csr_command, csr6);</div><div class='ctx'> </div><div class='del'>-    sc-&gt;stats.rx_missed_errors +=</div><div class='del'>-        LMC_CSR_READ (sc, csr_missed_frames) &amp; 0xffff;</div><div class='add'>+    sc-&gt;lmc_device-&gt;stats.rx_missed_errors +=</div><div class='add'>+	    LMC_CSR_READ(sc, csr_missed_frames) &amp; 0xffff;</div><div class='ctx'> </div><div class='ctx'>     /* release the interrupt */</div><div class='ctx'>     if(sc-&gt;got_irq == 1){</div><div class='hunk'>@@ -1276,7 +1207,7 @@ static int lmc_ifdown (struct net_device *dev) /*fold00*/</div><div class='ctx'>     lmc_led_off (sc, LMC_MII16_LED_ALL);</div><div class='ctx'> </div><div class='ctx'>     netif_wake_queue(dev);</div><div class='del'>-    sc-&gt;stats.tx_tbusy0++ ;</div><div class='add'>+    sc-&gt;extra_stats.tx_tbusy0++;</div><div class='ctx'> </div><div class='ctx'>     lmc_trace(dev, "lmc_ifdown out");</div><div class='ctx'> </div><div class='hunk'>@@ -1289,7 +1220,7 @@ static int lmc_ifdown (struct net_device *dev) /*fold00*/</div><div class='ctx'> static irqreturn_t lmc_interrupt (int irq, void *dev_instance) /*fold00*/</div><div class='ctx'> {</div><div class='ctx'>     struct net_device *dev = (struct net_device *) dev_instance;</div><div class='del'>-    lmc_softc_t *sc;</div><div class='add'>+    lmc_softc_t *sc = dev_to_sc(dev);</div><div class='ctx'>     u32 csr;</div><div class='ctx'>     int i;</div><div class='ctx'>     s32 stat;</div><div class='hunk'>@@ -1300,8 +1231,6 @@ static irqreturn_t lmc_interrupt (int irq, void *dev_instance) /*fold00*/</div><div class='ctx'> </div><div class='ctx'>     lmc_trace(dev, "lmc_interrupt in");</div><div class='ctx'> </div><div class='del'>-    sc = dev-&gt;priv;</div><div class='del'>-    </div><div class='ctx'>     spin_lock(&amp;sc-&gt;lmc_lock);</div><div class='ctx'> </div><div class='ctx'>     /*</div><div class='hunk'>@@ -1354,7 +1283,7 @@ static irqreturn_t lmc_interrupt (int irq, void *dev_instance) /*fold00*/</div><div class='ctx'> </div><div class='ctx'> 	    int		n_compl = 0 ;</div><div class='ctx'>             /* reset the transmit timeout detection flag -baz */</div><div class='del'>-            sc-&gt;stats.tx_NoCompleteCnt = 0;</div><div class='add'>+	    sc-&gt;extra_stats.tx_NoCompleteCnt = 0;</div><div class='ctx'> </div><div class='ctx'>             badtx = sc-&gt;lmc_taint_tx;</div><div class='ctx'>             i = badtx % LMC_TXDESCS;</div><div class='hunk'>@@ -1378,27 +1307,25 @@ static irqreturn_t lmc_interrupt (int irq, void *dev_instance) /*fold00*/</div><div class='ctx'>                 if (sc-&gt;lmc_txq[i] == NULL)</div><div class='ctx'>                     continue;</div><div class='ctx'> </div><div class='del'>-                /*</div><div class='del'>-                 * Check the total error summary to look for any errors</div><div class='del'>-                 */</div><div class='del'>-                if (stat &amp; 0x8000) {</div><div class='del'>-                    sc-&gt;stats.tx_errors++;</div><div class='del'>-                    if (stat &amp; 0x4104)</div><div class='del'>-                        sc-&gt;stats.tx_aborted_errors++;</div><div class='del'>-                    if (stat &amp; 0x0C00)</div><div class='del'>-                        sc-&gt;stats.tx_carrier_errors++;</div><div class='del'>-                    if (stat &amp; 0x0200)</div><div class='del'>-                        sc-&gt;stats.tx_window_errors++;</div><div class='del'>-                    if (stat &amp; 0x0002)</div><div class='del'>-                        sc-&gt;stats.tx_fifo_errors++;</div><div class='del'>-                }</div><div class='del'>-                else {</div><div class='del'>-                    </div><div class='del'>-                    sc-&gt;stats.tx_bytes += sc-&gt;lmc_txring[i].length &amp; 0x7ff;</div><div class='del'>-                    </div><div class='del'>-                    sc-&gt;stats.tx_packets++;</div><div class='add'>+		/*</div><div class='add'>+		 * Check the total error summary to look for any errors</div><div class='add'>+		 */</div><div class='add'>+		if (stat &amp; 0x8000) {</div><div class='add'>+			sc-&gt;lmc_device-&gt;stats.tx_errors++;</div><div class='add'>+			if (stat &amp; 0x4104)</div><div class='add'>+				sc-&gt;lmc_device-&gt;stats.tx_aborted_errors++;</div><div class='add'>+			if (stat &amp; 0x0C00)</div><div class='add'>+				sc-&gt;lmc_device-&gt;stats.tx_carrier_errors++;</div><div class='add'>+			if (stat &amp; 0x0200)</div><div class='add'>+				sc-&gt;lmc_device-&gt;stats.tx_window_errors++;</div><div class='add'>+			if (stat &amp; 0x0002)</div><div class='add'>+				sc-&gt;lmc_device-&gt;stats.tx_fifo_errors++;</div><div class='add'>+		} else {</div><div class='add'>+			sc-&gt;lmc_device-&gt;stats.tx_bytes += sc-&gt;lmc_txring[i].length &amp; 0x7ff;</div><div class='add'>+</div><div class='add'>+			sc-&gt;lmc_device-&gt;stats.tx_packets++;</div><div class='ctx'>                 }</div><div class='del'>-                </div><div class='add'>+</div><div class='ctx'>                 //                dev_kfree_skb(sc-&gt;lmc_txq[i]);</div><div class='ctx'>                 dev_kfree_skb_irq(sc-&gt;lmc_txq[i]);</div><div class='ctx'>                 sc-&gt;lmc_txq[i] = NULL;</div><div class='hunk'>@@ -1415,13 +1342,13 @@ static irqreturn_t lmc_interrupt (int irq, void *dev_instance) /*fold00*/</div><div class='ctx'>             LMC_EVENT_LOG(LMC_EVENT_TBUSY0, n_compl, 0);</div><div class='ctx'>             sc-&gt;lmc_txfull = 0;</div><div class='ctx'>             netif_wake_queue(dev);</div><div class='del'>-            sc-&gt;stats.tx_tbusy0++ ;</div><div class='add'>+	    sc-&gt;extra_stats.tx_tbusy0++;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-            sc-&gt;stats.dirtyTx = badtx;</div><div class='del'>-            sc-&gt;stats.lmc_next_tx = sc-&gt;lmc_next_tx;</div><div class='del'>-            sc-&gt;stats.lmc_txfull = sc-&gt;lmc_txfull;</div><div class='add'>+	    sc-&gt;extra_stats.dirtyTx = badtx;</div><div class='add'>+	    sc-&gt;extra_stats.lmc_next_tx = sc-&gt;lmc_next_tx;</div><div class='add'>+	    sc-&gt;extra_stats.lmc_txfull = sc-&gt;lmc_txfull;</div><div class='ctx'> #endif</div><div class='ctx'>             sc-&gt;lmc_taint_tx = badtx;</div><div class='ctx'> </div><div class='hunk'>@@ -1476,9 +1403,9 @@ lmc_int_fail_out:</div><div class='ctx'>     return IRQ_RETVAL(handled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00*/</div><div class='add'>+static int lmc_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-    lmc_softc_t *sc;</div><div class='add'>+    lmc_softc_t *sc = dev_to_sc(dev);</div><div class='ctx'>     u32 flag;</div><div class='ctx'>     int entry;</div><div class='ctx'>     int ret = 0;</div><div class='hunk'>@@ -1486,8 +1413,6 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00</div><div class='ctx'> </div><div class='ctx'>     lmc_trace(dev, "lmc_start_xmit in");</div><div class='ctx'> </div><div class='del'>-    sc = dev-&gt;priv;</div><div class='del'>-</div><div class='ctx'>     spin_lock_irqsave(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'> </div><div class='ctx'>     /* normal path, tbusy known to be zero */</div><div class='hunk'>@@ -1532,8 +1457,8 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00</div><div class='ctx'>     if (sc-&gt;lmc_next_tx - sc-&gt;lmc_taint_tx &gt;= LMC_TXDESCS - 1)</div><div class='ctx'>     {				/* ring full, go busy */</div><div class='ctx'>         sc-&gt;lmc_txfull = 1;</div><div class='del'>-        netif_stop_queue(dev);</div><div class='del'>-        sc-&gt;stats.tx_tbusy1++ ;</div><div class='add'>+	netif_stop_queue(dev);</div><div class='add'>+	sc-&gt;extra_stats.tx_tbusy1++;</div><div class='ctx'>         LMC_EVENT_LOG(LMC_EVENT_TBUSY1, entry, 0);</div><div class='ctx'>     }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1550,7 +1475,7 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00</div><div class='ctx'>      * the watchdog timer handler. -baz</div><div class='ctx'>      */</div><div class='ctx'> </div><div class='del'>-    sc-&gt;stats.tx_NoCompleteCnt++;</div><div class='add'>+    sc-&gt;extra_stats.tx_NoCompleteCnt++;</div><div class='ctx'>     sc-&gt;lmc_next_tx++;</div><div class='ctx'> </div><div class='ctx'>     /* give ownership to the chip */</div><div class='hunk'>@@ -1569,9 +1494,9 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int lmc_rx (struct net_device *dev) /*fold00*/</div><div class='add'>+static int lmc_rx(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-    lmc_softc_t *sc;</div><div class='add'>+    lmc_softc_t *sc = dev_to_sc(dev);</div><div class='ctx'>     int i;</div><div class='ctx'>     int rx_work_limit = LMC_RXDESCS;</div><div class='ctx'>     unsigned int next_rx;</div><div class='hunk'>@@ -1583,8 +1508,6 @@ static int lmc_rx (struct net_device *dev) /*fold00*/</div><div class='ctx'> </div><div class='ctx'>     lmc_trace(dev, "lmc_rx in");</div><div class='ctx'> </div><div class='del'>-    sc = dev-&gt;priv;</div><div class='del'>-</div><div class='ctx'>     lmc_led_on(sc, LMC_DS3_LED3);</div><div class='ctx'> </div><div class='ctx'>     rxIntLoopCnt = 0;		/* debug -baz */</div><div class='hunk'>@@ -1597,39 +1520,38 @@ static int lmc_rx (struct net_device *dev) /*fold00*/</div><div class='ctx'>         rxIntLoopCnt++;		/* debug -baz */</div><div class='ctx'>         len = ((stat &amp; LMC_RDES_FRAME_LENGTH) &gt;&gt; RDES_FRAME_LENGTH_BIT_NUMBER);</div><div class='ctx'>         if ((stat &amp; 0x0300) != 0x0300) {  /* Check first segment and last segment */</div><div class='del'>-            if ((stat &amp; 0x0000ffff) != 0x7fff) {</div><div class='del'>-                /* Oversized frame */</div><div class='del'>-                sc-&gt;stats.rx_length_errors++;</div><div class='del'>-                goto skip_packet;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if(stat &amp; 0x00000008){ /* Catch a dribbling bit error */</div><div class='del'>-            sc-&gt;stats.rx_errors++;</div><div class='del'>-            sc-&gt;stats.rx_frame_errors++;</div><div class='del'>-            goto skip_packet;</div><div class='del'>-        }</div><div class='add'>+		if ((stat &amp; 0x0000ffff) != 0x7fff) {</div><div class='add'>+			/* Oversized frame */</div><div class='add'>+			sc-&gt;lmc_device-&gt;stats.rx_length_errors++;</div><div class='add'>+			goto skip_packet;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	if (stat &amp; 0x00000008) { /* Catch a dribbling bit error */</div><div class='add'>+		sc-&gt;lmc_device-&gt;stats.rx_errors++;</div><div class='add'>+		sc-&gt;lmc_device-&gt;stats.rx_frame_errors++;</div><div class='add'>+		goto skip_packet;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-        if(stat &amp; 0x00000004){ /* Catch a CRC error by the Xilinx */</div><div class='del'>-            sc-&gt;stats.rx_errors++;</div><div class='del'>-            sc-&gt;stats.rx_crc_errors++;</div><div class='del'>-            goto skip_packet;</div><div class='del'>-        }</div><div class='ctx'> </div><div class='add'>+	if (stat &amp; 0x00000004) { /* Catch a CRC error by the Xilinx */</div><div class='add'>+		sc-&gt;lmc_device-&gt;stats.rx_errors++;</div><div class='add'>+		sc-&gt;lmc_device-&gt;stats.rx_crc_errors++;</div><div class='add'>+		goto skip_packet;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-        if (len &gt; LMC_PKT_BUF_SZ){</div><div class='del'>-            sc-&gt;stats.rx_length_errors++;</div><div class='del'>-            localLengthErrCnt++;</div><div class='del'>-            goto skip_packet;</div><div class='del'>-        }</div><div class='add'>+	if (len &gt; LMC_PKT_BUF_SZ) {</div><div class='add'>+		sc-&gt;lmc_device-&gt;stats.rx_length_errors++;</div><div class='add'>+		localLengthErrCnt++;</div><div class='add'>+		goto skip_packet;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-        if (len &lt; sc-&gt;lmc_crcSize + 2) {</div><div class='del'>-            sc-&gt;stats.rx_length_errors++;</div><div class='del'>-            sc-&gt;stats.rx_SmallPktCnt++;</div><div class='del'>-            localLengthErrCnt++;</div><div class='del'>-            goto skip_packet;</div><div class='del'>-        }</div><div class='add'>+	if (len &lt; sc-&gt;lmc_crcSize + 2) {</div><div class='add'>+		sc-&gt;lmc_device-&gt;stats.rx_length_errors++;</div><div class='add'>+		sc-&gt;extra_stats.rx_SmallPktCnt++;</div><div class='add'>+		localLengthErrCnt++;</div><div class='add'>+		goto skip_packet;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'>         if(stat &amp; 0x00004000){</div><div class='ctx'>             printk(KERN_WARNING "%s: Receiver descriptor error, receiver out of sync?\n", dev-&gt;name);</div><div class='hunk'>@@ -1656,8 +1578,8 @@ static int lmc_rx (struct net_device *dev) /*fold00*/</div><div class='ctx'>         }</div><div class='ctx'>         </div><div class='ctx'>         dev-&gt;last_rx = jiffies;</div><div class='del'>-        sc-&gt;stats.rx_packets++;</div><div class='del'>-        sc-&gt;stats.rx_bytes += len;</div><div class='add'>+	sc-&gt;lmc_device-&gt;stats.rx_packets++;</div><div class='add'>+	sc-&gt;lmc_device-&gt;stats.rx_bytes += len;</div><div class='ctx'> </div><div class='ctx'>         LMC_CONSOLE_LOG("recv", skb-&gt;data, len);</div><div class='ctx'> </div><div class='hunk'>@@ -1679,7 +1601,6 @@ static int lmc_rx (struct net_device *dev) /*fold00*/</div><div class='ctx'> </div><div class='ctx'>             skb_put (skb, len);</div><div class='ctx'>             skb-&gt;protocol = lmc_proto_type(sc, skb);</div><div class='del'>-            skb-&gt;protocol = htons(ETH_P_WAN_PPP);</div><div class='ctx'>             skb_reset_mac_header(skb);</div><div class='ctx'>             /* skb_reset_network_header(skb); */</div><div class='ctx'>             skb-&gt;dev = dev;</div><div class='hunk'>@@ -1704,7 +1625,7 @@ static int lmc_rx (struct net_device *dev) /*fold00*/</div><div class='ctx'>                  * in which care we'll try to allocate the buffer</div><div class='ctx'>                  * again.  (once a second)</div><div class='ctx'>                  */</div><div class='del'>-                sc-&gt;stats.rx_BuffAllocErr++;</div><div class='add'>+		sc-&gt;extra_stats.rx_BuffAllocErr++;</div><div class='ctx'>                 LMC_EVENT_LOG(LMC_EVENT_RCVINT, stat, len);</div><div class='ctx'>                 sc-&gt;failed_recv_alloc = 1;</div><div class='ctx'>                 goto skip_out_of_mem;</div><div class='hunk'>@@ -1739,16 +1660,14 @@ static int lmc_rx (struct net_device *dev) /*fold00*/</div><div class='ctx'>      * descriptors with bogus packets</div><div class='ctx'>      *</div><div class='ctx'>     if (localLengthErrCnt &gt; LMC_RXDESCS - 3) {</div><div class='del'>-        sc-&gt;stats.rx_BadPktSurgeCnt++;</div><div class='del'>-        LMC_EVENT_LOG(LMC_EVENT_BADPKTSURGE,</div><div class='del'>-                      localLengthErrCnt,</div><div class='del'>-                      sc-&gt;stats.rx_BadPktSurgeCnt);</div><div class='add'>+	sc-&gt;extra_stats.rx_BadPktSurgeCnt++;</div><div class='add'>+	LMC_EVENT_LOG(LMC_EVENT_BADPKTSURGE, localLengthErrCnt,</div><div class='add'>+		      sc-&gt;extra_stats.rx_BadPktSurgeCnt);</div><div class='ctx'>     } */</div><div class='ctx'> </div><div class='ctx'>     /* save max count of receive descriptors serviced */</div><div class='del'>-    if (rxIntLoopCnt &gt; sc-&gt;stats.rxIntLoopCnt) {</div><div class='del'>-        sc-&gt;stats.rxIntLoopCnt = rxIntLoopCnt;	/* debug -baz */</div><div class='del'>-    }</div><div class='add'>+    if (rxIntLoopCnt &gt; sc-&gt;extra_stats.rxIntLoopCnt)</div><div class='add'>+	    sc-&gt;extra_stats.rxIntLoopCnt = rxIntLoopCnt; /* debug -baz */</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'>     if (rxIntLoopCnt == 0)</div><div class='hunk'>@@ -1775,23 +1694,22 @@ skip_out_of_mem:</div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct net_device_stats *lmc_get_stats (struct net_device *dev) /*fold00*/</div><div class='add'>+static struct net_device_stats *lmc_get_stats(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-    lmc_softc_t *sc = dev-&gt;priv;</div><div class='add'>+    lmc_softc_t *sc = dev_to_sc(dev);</div><div class='ctx'>     unsigned long flags;</div><div class='ctx'> </div><div class='ctx'>     lmc_trace(dev, "lmc_get_stats in");</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'>     spin_lock_irqsave(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'> </div><div class='del'>-    sc-&gt;stats.rx_missed_errors += LMC_CSR_READ (sc, csr_missed_frames) &amp; 0xffff;</div><div class='add'>+    sc-&gt;lmc_device-&gt;stats.rx_missed_errors += LMC_CSR_READ(sc, csr_missed_frames) &amp; 0xffff;</div><div class='ctx'> </div><div class='ctx'>     spin_unlock_irqrestore(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'> </div><div class='ctx'>     lmc_trace(dev, "lmc_get_stats out");</div><div class='ctx'> </div><div class='del'>-    return (struct net_device_stats *) &amp;sc-&gt;stats;</div><div class='add'>+    return &amp;sc-&gt;lmc_device-&gt;stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver lmc_driver = {</div><div class='hunk'>@@ -1970,7 +1888,7 @@ static void lmc_softreset (lmc_softc_t * const sc) /*fold00*/</div><div class='ctx'>     {</div><div class='ctx'>         if (sc-&gt;lmc_txq[i] != NULL){		/* have buffer */</div><div class='ctx'>             dev_kfree_skb(sc-&gt;lmc_txq[i]);	/* free it */</div><div class='del'>-            sc-&gt;stats.tx_dropped++;      /* We just dropped a packet */</div><div class='add'>+	    sc-&gt;lmc_device-&gt;stats.tx_dropped++;	/* We just dropped a packet */</div><div class='ctx'>         }</div><div class='ctx'>         sc-&gt;lmc_txq[i] = NULL;</div><div class='ctx'>         sc-&gt;lmc_txring[i].status = 0x00000000;</div><div class='hunk'>@@ -1982,7 +1900,7 @@ static void lmc_softreset (lmc_softc_t * const sc) /*fold00*/</div><div class='ctx'>     lmc_trace(sc-&gt;lmc_device, "lmc_softreset out");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void lmc_gpio_mkinput(lmc_softc_t * const sc, u_int32_t bits) /*fold00*/</div><div class='add'>+void lmc_gpio_mkinput(lmc_softc_t * const sc, u32 bits) /*fold00*/</div><div class='ctx'> {</div><div class='ctx'>     lmc_trace(sc-&gt;lmc_device, "lmc_gpio_mkinput in");</div><div class='ctx'>     sc-&gt;lmc_gpio_io &amp;= ~bits;</div><div class='hunk'>@@ -1990,7 +1908,7 @@ void lmc_gpio_mkinput(lmc_softc_t * const sc, u_int32_t bits) /*fold00*/</div><div class='ctx'>     lmc_trace(sc-&gt;lmc_device, "lmc_gpio_mkinput out");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void lmc_gpio_mkoutput(lmc_softc_t * const sc, u_int32_t bits) /*fold00*/</div><div class='add'>+void lmc_gpio_mkoutput(lmc_softc_t * const sc, u32 bits) /*fold00*/</div><div class='ctx'> {</div><div class='ctx'>     lmc_trace(sc-&gt;lmc_device, "lmc_gpio_mkoutput in");</div><div class='ctx'>     sc-&gt;lmc_gpio_io |= bits;</div><div class='hunk'>@@ -1998,7 +1916,7 @@ void lmc_gpio_mkoutput(lmc_softc_t * const sc, u_int32_t bits) /*fold00*/</div><div class='ctx'>     lmc_trace(sc-&gt;lmc_device, "lmc_gpio_mkoutput out");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void lmc_led_on(lmc_softc_t * const sc, u_int32_t led) /*fold00*/</div><div class='add'>+void lmc_led_on(lmc_softc_t * const sc, u32 led) /*fold00*/</div><div class='ctx'> {</div><div class='ctx'>     lmc_trace(sc-&gt;lmc_device, "lmc_led_on in");</div><div class='ctx'>     if((~sc-&gt;lmc_miireg16) &amp; led){ /* Already on! */</div><div class='hunk'>@@ -2011,7 +1929,7 @@ void lmc_led_on(lmc_softc_t * const sc, u_int32_t led) /*fold00*/</div><div class='ctx'>     lmc_trace(sc-&gt;lmc_device, "lmc_led_on out");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void lmc_led_off(lmc_softc_t * const sc, u_int32_t led) /*fold00*/</div><div class='add'>+void lmc_led_off(lmc_softc_t * const sc, u32 led) /*fold00*/</div><div class='ctx'> {</div><div class='ctx'>     lmc_trace(sc-&gt;lmc_device, "lmc_led_off in");</div><div class='ctx'>     if(sc-&gt;lmc_miireg16 &amp; led){ /* Already set don't do anything */</div><div class='hunk'>@@ -2061,13 +1979,13 @@ static void lmc_reset(lmc_softc_t * const sc) /*fold00*/</div><div class='ctx'>      */</div><div class='ctx'>     sc-&gt;lmc_media-&gt;init(sc);</div><div class='ctx'> </div><div class='del'>-    sc-&gt;stats.resetCount++;</div><div class='add'>+    sc-&gt;extra_stats.resetCount++;</div><div class='ctx'>     lmc_trace(sc-&gt;lmc_device, "lmc_reset out");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void lmc_dec_reset(lmc_softc_t * const sc) /*fold00*/</div><div class='ctx'> {</div><div class='del'>-    u_int32_t val;</div><div class='add'>+    u32 val;</div><div class='ctx'>     lmc_trace(sc-&gt;lmc_device, "lmc_dec_reset in");</div><div class='ctx'> </div><div class='ctx'>     /*</div><div class='hunk'>@@ -2151,23 +2069,21 @@ static void lmc_initcsrs(lmc_softc_t * const sc, lmc_csrptr_t csr_base, /*fold00</div><div class='ctx'>     lmc_trace(sc-&gt;lmc_device, "lmc_initcsrs out");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void lmc_driver_timeout(struct net_device *dev) { /*fold00*/</div><div class='del'>-    lmc_softc_t *sc;</div><div class='add'>+static void lmc_driver_timeout(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+    lmc_softc_t *sc = dev_to_sc(dev);</div><div class='ctx'>     u32 csr6;</div><div class='ctx'>     unsigned long flags;</div><div class='ctx'> </div><div class='ctx'>     lmc_trace(dev, "lmc_driver_timeout in");</div><div class='ctx'> </div><div class='del'>-    sc = dev-&gt;priv;</div><div class='del'>-</div><div class='ctx'>     spin_lock_irqsave(&amp;sc-&gt;lmc_lock, flags);</div><div class='ctx'> </div><div class='ctx'>     printk("%s: Xmitter busy|\n", dev-&gt;name);</div><div class='ctx'> </div><div class='del'>-    sc-&gt;stats.tx_tbusy_calls++ ;</div><div class='del'>-    if (jiffies - dev-&gt;trans_start &lt; TX_TIMEOUT) {</div><div class='del'>-        goto bug_out;</div><div class='del'>-    }</div><div class='add'>+    sc-&gt;extra_stats.tx_tbusy_calls++;</div><div class='add'>+    if (jiffies - dev-&gt;trans_start &lt; TX_TIMEOUT)</div><div class='add'>+	    goto bug_out;</div><div class='ctx'> </div><div class='ctx'>     /*</div><div class='ctx'>      * Chip seems to have locked up</div><div class='hunk'>@@ -2178,7 +2094,7 @@ static void lmc_driver_timeout(struct net_device *dev) { /*fold00*/</div><div class='ctx'> </div><div class='ctx'>     LMC_EVENT_LOG(LMC_EVENT_XMTPRCTMO,</div><div class='ctx'>                   LMC_CSR_READ (sc, csr_status),</div><div class='del'>-                  sc-&gt;stats.tx_ProcTimeout);</div><div class='add'>+		  sc-&gt;extra_stats.tx_ProcTimeout);</div><div class='ctx'> </div><div class='ctx'>     lmc_running_reset (dev);</div><div class='ctx'> </div><div class='hunk'>@@ -2195,8 +2111,8 @@ static void lmc_driver_timeout(struct net_device *dev) { /*fold00*/</div><div class='ctx'>     /* immediate transmit */</div><div class='ctx'>     LMC_CSR_WRITE (sc, csr_txpoll, 0);</div><div class='ctx'> </div><div class='del'>-    sc-&gt;stats.tx_errors++;</div><div class='del'>-    sc-&gt;stats.tx_ProcTimeout++;	/* -baz */</div><div class='add'>+    sc-&gt;lmc_device-&gt;stats.tx_errors++;</div><div class='add'>+    sc-&gt;extra_stats.tx_ProcTimeout++; /* -baz */</div><div class='ctx'> </div><div class='ctx'>     dev-&gt;trans_start = jiffies;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c<br/>index 8aa461c941ce..f327674fc93a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_media.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/lmc/lmc_media.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_media.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc_media.c</a></div><div class='hunk'>@@ -16,8 +16,6 @@</div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;net/syncppp.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;asm/processor.h&gt;             /* Processor type for cache alignment. */</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='hunk'>@@ -95,8 +93,7 @@ static void lmc_dummy_set_1 (lmc_softc_t * const, int);</div><div class='ctx'> static void lmc_dummy_set2_1 (lmc_softc_t * const, lmc_ctl_t *);</div><div class='ctx'> </div><div class='ctx'> static inline void write_av9110_bit (lmc_softc_t *, int);</div><div class='del'>-static void write_av9110 (lmc_softc_t *, u_int32_t, u_int32_t, u_int32_t,</div><div class='del'>-			  u_int32_t, u_int32_t);</div><div class='add'>+static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);</div><div class='ctx'> </div><div class='ctx'> lmc_media_t lmc_ds3_media = {</div><div class='ctx'>   lmc_ds3_init,			/* special media init stuff */</div><div class='hunk'>@@ -427,7 +424,7 @@ lmc_ds3_set_scram (lmc_softc_t * const sc, int ie)</div><div class='ctx'> static int</div><div class='ctx'> lmc_ds3_get_link_status (lmc_softc_t * const sc)</div><div class='ctx'> {</div><div class='del'>-    u_int16_t link_status, link_status_11;</div><div class='add'>+    u16 link_status, link_status_11;</div><div class='ctx'>     int ret = 1;</div><div class='ctx'> </div><div class='ctx'>     lmc_mii_writereg (sc, 0, 17, 7);</div><div class='hunk'>@@ -449,7 +446,7 @@ lmc_ds3_get_link_status (lmc_softc_t * const sc)</div><div class='ctx'>         (link_status &amp; LMC_FRAMER_REG0_OOFS)){</div><div class='ctx'>         ret = 0;</div><div class='ctx'>         if(sc-&gt;last_led_err[3] != 1){</div><div class='del'>-            u16 r1;</div><div class='add'>+	    u16 r1;</div><div class='ctx'>             lmc_mii_writereg (sc, 0, 17, 01); /* Turn on Xbit error as our cisco does */</div><div class='ctx'>             r1 = lmc_mii_readreg (sc, 0, 18);</div><div class='ctx'>             r1 &amp;= 0xfe;</div><div class='hunk'>@@ -462,7 +459,7 @@ lmc_ds3_get_link_status (lmc_softc_t * const sc)</div><div class='ctx'>     else {</div><div class='ctx'>         lmc_led_off(sc, LMC_DS3_LED3);	/* turn on red LED */</div><div class='ctx'>         if(sc-&gt;last_led_err[3] == 1){</div><div class='del'>-            u16 r1;</div><div class='add'>+	    u16 r1;</div><div class='ctx'>             lmc_mii_writereg (sc, 0, 17, 01); /* Turn off Xbit error */</div><div class='ctx'>             r1 = lmc_mii_readreg (sc, 0, 18);</div><div class='ctx'>             r1 |= 0x01;</div><div class='hunk'>@@ -540,20 +537,19 @@ lmc_ds3_watchdog (lmc_softc_t * const sc)</div><div class='ctx'>  *  SSI methods</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-lmc_ssi_init (lmc_softc_t * const sc)</div><div class='add'>+static void lmc_ssi_init(lmc_softc_t * const sc)</div><div class='ctx'> {</div><div class='del'>-  u_int16_t mii17;</div><div class='del'>-  int cable;</div><div class='add'>+	u16 mii17;</div><div class='add'>+	int cable;</div><div class='ctx'> </div><div class='del'>-  sc-&gt;ictl.cardtype = LMC_CTL_CARDTYPE_LMC1000;</div><div class='add'>+	sc-&gt;ictl.cardtype = LMC_CTL_CARDTYPE_LMC1000;</div><div class='ctx'> </div><div class='del'>-  mii17 = lmc_mii_readreg (sc, 0, 17);</div><div class='add'>+	mii17 = lmc_mii_readreg(sc, 0, 17);</div><div class='ctx'> </div><div class='del'>-  cable = (mii17 &amp; LMC_MII17_SSI_CABLE_MASK) &gt;&gt; LMC_MII17_SSI_CABLE_SHIFT;</div><div class='del'>-  sc-&gt;ictl.cable_type = cable;</div><div class='add'>+	cable = (mii17 &amp; LMC_MII17_SSI_CABLE_MASK) &gt;&gt; LMC_MII17_SSI_CABLE_SHIFT;</div><div class='add'>+	sc-&gt;ictl.cable_type = cable;</div><div class='ctx'> </div><div class='del'>-  lmc_gpio_mkoutput (sc, LMC_GEP_SSI_TXCLOCK);</div><div class='add'>+	lmc_gpio_mkoutput(sc, LMC_GEP_SSI_TXCLOCK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -681,11 +677,11 @@ lmc_ssi_set_speed (lmc_softc_t * const sc, lmc_ctl_t * ctl)</div><div class='ctx'> static int</div><div class='ctx'> lmc_ssi_get_link_status (lmc_softc_t * const sc)</div><div class='ctx'> {</div><div class='del'>-  u_int16_t link_status;</div><div class='del'>-  u_int32_t ticks;</div><div class='add'>+  u16 link_status;</div><div class='add'>+  u32 ticks;</div><div class='ctx'>   int ret = 1;</div><div class='ctx'>   int hw_hdsk = 1;</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>   /*</div><div class='ctx'>    * missing CTS?  Hmm.  If we require CTS on, we may never get the</div><div class='ctx'>    * link to come up, so omit it in this test.</div><div class='hunk'>@@ -720,9 +716,9 @@ lmc_ssi_get_link_status (lmc_softc_t * const sc)</div><div class='ctx'>   }</div><div class='ctx'>   else if (ticks == 0 ) {				/* no clock found ? */</div><div class='ctx'>       ret = 0;</div><div class='del'>-      if(sc-&gt;last_led_err[3] != 1){</div><div class='del'>-          sc-&gt;stats.tx_lossOfClockCnt++;</div><div class='del'>-          printk(KERN_WARNING "%s: Lost Clock, Link Down\n", sc-&gt;name);</div><div class='add'>+      if (sc-&gt;last_led_err[3] != 1) {</div><div class='add'>+	      sc-&gt;extra_stats.tx_lossOfClockCnt++;</div><div class='add'>+	      printk(KERN_WARNING "%s: Lost Clock, Link Down\n", sc-&gt;name);</div><div class='ctx'>       }</div><div class='ctx'>       sc-&gt;last_led_err[3] = 1;</div><div class='ctx'>       lmc_led_on (sc, LMC_MII16_LED3);	/* turn ON red LED */</div><div class='hunk'>@@ -838,9 +834,7 @@ write_av9110_bit (lmc_softc_t * sc, int c)</div><div class='ctx'>   LMC_CSR_WRITE (sc, csr_gp, sc-&gt;lmc_gpio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-write_av9110 (lmc_softc_t * sc, u_int32_t n, u_int32_t m, u_int32_t v,</div><div class='del'>-	      u_int32_t x, u_int32_t r)</div><div class='add'>+static void write_av9110(lmc_softc_t *sc, u32 n, u32 m, u32 v, u32 x, u32 r)</div><div class='ctx'> {</div><div class='ctx'>   int i;</div><div class='ctx'> </div><div class='hunk'>@@ -887,19 +881,13 @@ write_av9110 (lmc_softc_t * sc, u_int32_t n, u_int32_t m, u_int32_t v,</div><div class='ctx'> 		     | LMC_GEP_SSI_GENERATOR));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-lmc_ssi_watchdog (lmc_softc_t * const sc)</div><div class='add'>+static void lmc_ssi_watchdog(lmc_softc_t * const sc)</div><div class='ctx'> {</div><div class='del'>-  u_int16_t mii17 = lmc_mii_readreg (sc, 0, 17);</div><div class='del'>-  if (((mii17 &gt;&gt; 3) &amp; 7) == 7)</div><div class='del'>-    {</div><div class='del'>-      lmc_led_off (sc, LMC_MII16_LED2);</div><div class='del'>-    }</div><div class='del'>-  else</div><div class='del'>-    {</div><div class='del'>-      lmc_led_on (sc, LMC_MII16_LED2);</div><div class='del'>-    }</div><div class='del'>-</div><div class='add'>+	u16 mii17 = lmc_mii_readreg(sc, 0, 17);</div><div class='add'>+	if (((mii17 &gt;&gt; 3) &amp; 7) == 7)</div><div class='add'>+		lmc_led_off(sc, LMC_MII16_LED2);</div><div class='add'>+	else</div><div class='add'>+		lmc_led_on(sc, LMC_MII16_LED2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -929,7 +917,7 @@ lmc_t1_read (lmc_softc_t * const sc, int a)</div><div class='ctx'> static void</div><div class='ctx'> lmc_t1_init (lmc_softc_t * const sc)</div><div class='ctx'> {</div><div class='del'>-  u_int16_t mii16;</div><div class='add'>+  u16 mii16;</div><div class='ctx'>   int i;</div><div class='ctx'> </div><div class='ctx'>   sc-&gt;ictl.cardtype = LMC_CTL_CARDTYPE_LMC1200;</div><div class='hunk'>@@ -1028,7 +1016,7 @@ lmc_t1_set_status (lmc_softc_t * const sc, lmc_ctl_t * ctl)</div><div class='ctx'>  */ static int</div><div class='ctx'> lmc_t1_get_link_status (lmc_softc_t * const sc)</div><div class='ctx'> {</div><div class='del'>-    u_int16_t link_status;</div><div class='add'>+    u16 link_status;</div><div class='ctx'>     int ret = 1;</div><div class='ctx'> </div><div class='ctx'>   /* LMC5245 (DS3) &amp; LMC1200 (DS1) LED definitions</div><div class='head'>diff --git a/drivers/net/wan/lmc/lmc_proto.c b/drivers/net/wan/lmc/lmc_proto.c<br/>index 85315758198d..be9877ff551e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_proto.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/lmc/lmc_proto.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_proto.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc_proto.c</a></div><div class='hunk'>@@ -36,9 +36,6 @@</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/syncppp.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;asm/processor.h&gt;             /* Processor type for cache alignment. */</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='hunk'>@@ -50,48 +47,6 @@</div><div class='ctx'> #include "lmc_ioctl.h"</div><div class='ctx'> #include "lmc_proto.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The compile-time variable SPPPSTUP causes the module to be</div><div class='del'>- * compiled without referencing any of the sync ppp routines.</div><div class='del'>- */</div><div class='del'>-#ifdef SPPPSTUB</div><div class='del'>-#define SPPP_detach(d)	(void)0</div><div class='del'>-#define SPPP_open(d)	0</div><div class='del'>-#define SPPP_reopen(d)	(void)0</div><div class='del'>-#define SPPP_close(d)	(void)0</div><div class='del'>-#define SPPP_attach(d)	(void)0</div><div class='del'>-#define SPPP_do_ioctl(d,i,c)	-EOPNOTSUPP</div><div class='del'>-#else</div><div class='del'>-#define SPPP_attach(x)	sppp_attach((x)-&gt;pd)</div><div class='del'>-#define SPPP_detach(x)	sppp_detach((x)-&gt;pd-&gt;dev)</div><div class='del'>-#define SPPP_open(x)	sppp_open((x)-&gt;pd-&gt;dev)</div><div class='del'>-#define SPPP_reopen(x)	sppp_reopen((x)-&gt;pd-&gt;dev)</div><div class='del'>-#define SPPP_close(x)	sppp_close((x)-&gt;pd-&gt;dev)</div><div class='del'>-#define SPPP_do_ioctl(x, y, z)	sppp_do_ioctl((x)-&gt;pd-&gt;dev, (y), (z))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-// init</div><div class='del'>-void lmc_proto_init(lmc_softc_t *sc) /*FOLD00*/</div><div class='del'>-{</div><div class='del'>-    lmc_trace(sc-&gt;lmc_device, "lmc_proto_init in");</div><div class='del'>-    switch(sc-&gt;if_type){</div><div class='del'>-    case LMC_PPP:</div><div class='del'>-        sc-&gt;pd = kmalloc(sizeof(struct ppp_device), GFP_KERNEL);</div><div class='del'>-	if (!sc-&gt;pd) {</div><div class='del'>-		printk("lmc_proto_init(): kmalloc failure!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-        sc-&gt;pd-&gt;dev = sc-&gt;lmc_device;</div><div class='del'>-        sc-&gt;if_ptr = sc-&gt;pd;</div><div class='del'>-        break;</div><div class='del'>-    case LMC_RAW:</div><div class='del'>-        break;</div><div class='del'>-    default:</div><div class='del'>-        break;</div><div class='del'>-    }</div><div class='del'>-    lmc_trace(sc-&gt;lmc_device, "lmc_proto_init out");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> // attach</div><div class='ctx'> void lmc_proto_attach(lmc_softc_t *sc) /*FOLD00*/</div><div class='ctx'> {</div><div class='hunk'>@@ -100,7 +55,6 @@ void lmc_proto_attach(lmc_softc_t *sc) /*FOLD00*/</div><div class='ctx'>     case LMC_PPP:</div><div class='ctx'>         {</div><div class='ctx'>             struct net_device *dev = sc-&gt;lmc_device;</div><div class='del'>-            SPPP_attach(sc);</div><div class='ctx'>             dev-&gt;do_ioctl = lmc_ioctl;</div><div class='ctx'>         }</div><div class='ctx'>         break;</div><div class='hunk'>@@ -108,7 +62,7 @@ void lmc_proto_attach(lmc_softc_t *sc) /*FOLD00*/</div><div class='ctx'>         {</div><div class='ctx'>             struct net_device *dev = sc-&gt;lmc_device;</div><div class='ctx'>             /*</div><div class='del'>-             * They set a few basics because they don't use sync_ppp</div><div class='add'>+	     * They set a few basics because they don't use HDLC</div><div class='ctx'>              */</div><div class='ctx'>             dev-&gt;flags |= IFF_POINTOPOINT;</div><div class='ctx'> </div><div class='hunk'>@@ -124,88 +78,39 @@ void lmc_proto_attach(lmc_softc_t *sc) /*FOLD00*/</div><div class='ctx'>     lmc_trace(sc-&gt;lmc_device, "lmc_proto_attach out");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// detach</div><div class='del'>-void lmc_proto_detach(lmc_softc_t *sc) /*FOLD00*/</div><div class='add'>+int lmc_proto_ioctl(lmc_softc_t *sc, struct ifreq *ifr, int cmd)</div><div class='ctx'> {</div><div class='del'>-    switch(sc-&gt;if_type){</div><div class='del'>-    case LMC_PPP:</div><div class='del'>-        SPPP_detach(sc);</div><div class='del'>-        break;</div><div class='del'>-    case LMC_RAW: /* Tell someone we're detaching? */</div><div class='del'>-        break;</div><div class='del'>-    default:</div><div class='del'>-        break;</div><div class='del'>-    }</div><div class='del'>-</div><div class='add'>+	lmc_trace(sc-&gt;lmc_device, "lmc_proto_ioctl");</div><div class='add'>+	if (sc-&gt;if_type == LMC_PPP)</div><div class='add'>+		return hdlc_ioctl(sc-&gt;lmc_device, ifr, cmd);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// reopen</div><div class='del'>-void lmc_proto_reopen(lmc_softc_t *sc) /*FOLD00*/</div><div class='add'>+int lmc_proto_open(lmc_softc_t *sc)</div><div class='ctx'> {</div><div class='del'>-    lmc_trace(sc-&gt;lmc_device, "lmc_proto_reopen in");</div><div class='del'>-    switch(sc-&gt;if_type){</div><div class='del'>-    case LMC_PPP:</div><div class='del'>-        SPPP_reopen(sc);</div><div class='del'>-        break;</div><div class='del'>-    case LMC_RAW: /* Reset the interface after being down, prerape to receive packets again */</div><div class='del'>-        break;</div><div class='del'>-    default:</div><div class='del'>-        break;</div><div class='del'>-    }</div><div class='del'>-    lmc_trace(sc-&gt;lmc_device, "lmc_proto_reopen out");</div><div class='del'>-}</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	lmc_trace(sc-&gt;lmc_device, "lmc_proto_open in");</div><div class='ctx'> </div><div class='del'>-// ioctl</div><div class='del'>-int lmc_proto_ioctl(lmc_softc_t *sc, struct ifreq *ifr, int cmd) /*FOLD00*/</div><div class='del'>-{</div><div class='del'>-    lmc_trace(sc-&gt;lmc_device, "lmc_proto_ioctl out");</div><div class='del'>-    switch(sc-&gt;if_type){</div><div class='del'>-    case LMC_PPP:</div><div class='del'>-        return SPPP_do_ioctl (sc, ifr, cmd);</div><div class='del'>-        break;</div><div class='del'>-    default:</div><div class='del'>-        return -EOPNOTSUPP;</div><div class='del'>-        break;</div><div class='del'>-    }</div><div class='del'>-    lmc_trace(sc-&gt;lmc_device, "lmc_proto_ioctl out");</div><div class='add'>+	if (sc-&gt;if_type == LMC_PPP) {</div><div class='add'>+		ret = hdlc_open(sc-&gt;lmc_device);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			printk(KERN_WARNING "%s: HDLC open failed: %d\n",</div><div class='add'>+			       sc-&gt;name, ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lmc_trace(sc-&gt;lmc_device, "lmc_proto_open out");</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// open</div><div class='del'>-void lmc_proto_open(lmc_softc_t *sc) /*FOLD00*/</div><div class='add'>+void lmc_proto_close(lmc_softc_t *sc)</div><div class='ctx'> {</div><div class='del'>-    int ret;</div><div class='add'>+	lmc_trace(sc-&gt;lmc_device, "lmc_proto_close in");</div><div class='ctx'> </div><div class='del'>-    lmc_trace(sc-&gt;lmc_device, "lmc_proto_open in");</div><div class='del'>-    switch(sc-&gt;if_type){</div><div class='del'>-    case LMC_PPP:</div><div class='del'>-        ret = SPPP_open(sc);</div><div class='del'>-        if(ret &lt; 0)</div><div class='del'>-            printk("%s: syncPPP open failed: %d\n", sc-&gt;name, ret);</div><div class='del'>-        break;</div><div class='del'>-    case LMC_RAW: /* We're about to start getting packets! */</div><div class='del'>-        break;</div><div class='del'>-    default:</div><div class='del'>-        break;</div><div class='del'>-    }</div><div class='del'>-    lmc_trace(sc-&gt;lmc_device, "lmc_proto_open out");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// close</div><div class='add'>+	if (sc-&gt;if_type == LMC_PPP)</div><div class='add'>+		hdlc_close(sc-&gt;lmc_device);</div><div class='ctx'> </div><div class='del'>-void lmc_proto_close(lmc_softc_t *sc) /*FOLD00*/</div><div class='del'>-{</div><div class='del'>-    lmc_trace(sc-&gt;lmc_device, "lmc_proto_close in");</div><div class='del'>-    switch(sc-&gt;if_type){</div><div class='del'>-    case LMC_PPP:</div><div class='del'>-        SPPP_close(sc);</div><div class='del'>-        break;</div><div class='del'>-    case LMC_RAW: /* Interface going down */</div><div class='del'>-        break;</div><div class='del'>-    default:</div><div class='del'>-        break;</div><div class='del'>-    }</div><div class='del'>-    lmc_trace(sc-&gt;lmc_device, "lmc_proto_close out");</div><div class='add'>+	lmc_trace(sc-&gt;lmc_device, "lmc_proto_close out");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> __be16 lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/</div><div class='hunk'>@@ -213,8 +118,8 @@ __be16 lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/</div><div class='ctx'>     lmc_trace(sc-&gt;lmc_device, "lmc_proto_type in");</div><div class='ctx'>     switch(sc-&gt;if_type){</div><div class='ctx'>     case LMC_PPP:</div><div class='del'>-        return htons(ETH_P_WAN_PPP);</div><div class='del'>-        break;</div><div class='add'>+	    return hdlc_type_trans(skb, sc-&gt;lmc_device);</div><div class='add'>+	    break;</div><div class='ctx'>     case LMC_NET:</div><div class='ctx'>         return htons(ETH_P_802_2);</div><div class='ctx'>         break;</div><div class='hunk'>@@ -245,4 +150,3 @@ void lmc_proto_netif(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/</div><div class='ctx'>     }</div><div class='ctx'>     lmc_trace(sc-&gt;lmc_device, "lmc_proto_netif out");</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/wan/lmc/lmc_proto.h b/drivers/net/wan/lmc/lmc_proto.h<br/>index ccaa69e8b3c7..662148c54644 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_proto.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/lmc/lmc_proto.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_proto.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc_proto.h</a></div><div class='hunk'>@@ -1,16 +1,18 @@</div><div class='ctx'> #ifndef _LMC_PROTO_H_</div><div class='ctx'> #define _LMC_PROTO_H_</div><div class='ctx'> </div><div class='del'>-void lmc_proto_init(lmc_softc_t *sc);</div><div class='add'>+#include &lt;linux/hdlc.h&gt;</div><div class='add'>+</div><div class='ctx'> void lmc_proto_attach(lmc_softc_t *sc);</div><div class='del'>-void lmc_proto_detach(lmc_softc_t *sc);</div><div class='del'>-void lmc_proto_reopen(lmc_softc_t *sc);</div><div class='ctx'> int lmc_proto_ioctl(lmc_softc_t *sc, struct ifreq *ifr, int cmd);</div><div class='del'>-void lmc_proto_open(lmc_softc_t *sc);</div><div class='add'>+int lmc_proto_open(lmc_softc_t *sc);</div><div class='ctx'> void lmc_proto_close(lmc_softc_t *sc);</div><div class='ctx'> __be16 lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb);</div><div class='ctx'> void lmc_proto_netif(lmc_softc_t *sc, struct sk_buff *skb);</div><div class='del'>-int lmc_skb_rawpackets(char *buf, char **start, off_t offset, int len, int unused);</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+static inline lmc_softc_t* dev_to_sc(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return (lmc_softc_t *)dev_to_hdlc(dev)-&gt;priv;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wan/lmc/lmc_var.h b/drivers/net/wan/lmc/lmc_var.h<br/>index 6d003a39bfad..65d01978e784 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_var.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/lmc/lmc_var.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_var.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/lmc/lmc_var.h</a></div><div class='hunk'>@@ -1,8 +1,6 @@</div><div class='ctx'> #ifndef _LMC_VAR_H_</div><div class='ctx'> #define _LMC_VAR_H_</div><div class='ctx'> </div><div class='del'>-/* $Id: lmc_var.h,v 1.17 2000/04/06 12:16:47 asj Exp $ */</div><div class='del'>-</div><div class='ctx'>  /*</div><div class='ctx'>   * Copyright (c) 1997-2000 LAN Media Corporation (LMC)</div><div class='ctx'>   * All rights reserved.  www.lanmedia.com</div><div class='hunk'>@@ -19,23 +17,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef __KERNEL__</div><div class='del'>-typedef signed char s8;</div><div class='del'>-typedef unsigned char u8;</div><div class='del'>-</div><div class='del'>-typedef signed short s16;</div><div class='del'>-typedef unsigned short u16;</div><div class='del'>-</div><div class='del'>-typedef signed int s32;</div><div class='del'>-typedef unsigned int u32;</div><div class='del'>-</div><div class='del'>-typedef signed long long s64;</div><div class='del'>-typedef unsigned long long u64;</div><div class='del'>-</div><div class='del'>-#define BITS_PER_LONG 32 </div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * basic definitions used in lmc include files</div><div class='ctx'>  */</div><div class='hunk'>@@ -45,9 +26,6 @@ typedef struct lmc___media lmc_media_t;</div><div class='ctx'> typedef struct lmc___ctl lmc_ctl_t;</div><div class='ctx'> </div><div class='ctx'> #define lmc_csrptr_t    unsigned long</div><div class='del'>-#define u_int16_t	u16</div><div class='del'>-#define u_int8_t	u8</div><div class='del'>-#define tulip_uint32_t	u32</div><div class='ctx'> </div><div class='ctx'> #define LMC_REG_RANGE 0x80</div><div class='ctx'> </div><div class='hunk'>@@ -122,45 +100,45 @@ struct lmc_regfile_t {</div><div class='ctx'>  *  used to define bits in the second tulip_desc_t field (length)</div><div class='ctx'>  *  for the transmit descriptor -baz */</div><div class='ctx'> </div><div class='del'>-#define LMC_TDES_FIRST_BUFFER_SIZE       ((u_int32_t)(0x000007FF))</div><div class='del'>-#define LMC_TDES_SECOND_BUFFER_SIZE      ((u_int32_t)(0x003FF800))</div><div class='del'>-#define LMC_TDES_HASH_FILTERING          ((u_int32_t)(0x00400000))</div><div class='del'>-#define LMC_TDES_DISABLE_PADDING         ((u_int32_t)(0x00800000))</div><div class='del'>-#define LMC_TDES_SECOND_ADDR_CHAINED     ((u_int32_t)(0x01000000))</div><div class='del'>-#define LMC_TDES_END_OF_RING             ((u_int32_t)(0x02000000))</div><div class='del'>-#define LMC_TDES_ADD_CRC_DISABLE         ((u_int32_t)(0x04000000))</div><div class='del'>-#define LMC_TDES_SETUP_PACKET            ((u_int32_t)(0x08000000))</div><div class='del'>-#define LMC_TDES_INVERSE_FILTERING       ((u_int32_t)(0x10000000))</div><div class='del'>-#define LMC_TDES_FIRST_SEGMENT           ((u_int32_t)(0x20000000))</div><div class='del'>-#define LMC_TDES_LAST_SEGMENT            ((u_int32_t)(0x40000000))</div><div class='del'>-#define LMC_TDES_INTERRUPT_ON_COMPLETION ((u_int32_t)(0x80000000))</div><div class='add'>+#define LMC_TDES_FIRST_BUFFER_SIZE       ((u32)(0x000007FF))</div><div class='add'>+#define LMC_TDES_SECOND_BUFFER_SIZE      ((u32)(0x003FF800))</div><div class='add'>+#define LMC_TDES_HASH_FILTERING          ((u32)(0x00400000))</div><div class='add'>+#define LMC_TDES_DISABLE_PADDING         ((u32)(0x00800000))</div><div class='add'>+#define LMC_TDES_SECOND_ADDR_CHAINED     ((u32)(0x01000000))</div><div class='add'>+#define LMC_TDES_END_OF_RING             ((u32)(0x02000000))</div><div class='add'>+#define LMC_TDES_ADD_CRC_DISABLE         ((u32)(0x04000000))</div><div class='add'>+#define LMC_TDES_SETUP_PACKET            ((u32)(0x08000000))</div><div class='add'>+#define LMC_TDES_INVERSE_FILTERING       ((u32)(0x10000000))</div><div class='add'>+#define LMC_TDES_FIRST_SEGMENT           ((u32)(0x20000000))</div><div class='add'>+#define LMC_TDES_LAST_SEGMENT            ((u32)(0x40000000))</div><div class='add'>+#define LMC_TDES_INTERRUPT_ON_COMPLETION ((u32)(0x80000000))</div><div class='ctx'> </div><div class='ctx'> #define TDES_SECOND_BUFFER_SIZE_BIT_NUMBER  11</div><div class='ctx'> #define TDES_COLLISION_COUNT_BIT_NUMBER     3</div><div class='ctx'> </div><div class='ctx'> /* Constants for the RCV descriptor RDES */</div><div class='ctx'> </div><div class='del'>-#define LMC_RDES_OVERFLOW             ((u_int32_t)(0x00000001))</div><div class='del'>-#define LMC_RDES_CRC_ERROR            ((u_int32_t)(0x00000002))</div><div class='del'>-#define LMC_RDES_DRIBBLING_BIT            ((u_int32_t)(0x00000004))</div><div class='del'>-#define LMC_RDES_REPORT_ON_MII_ERR    ((u_int32_t)(0x00000008))</div><div class='del'>-#define LMC_RDES_RCV_WATCHDOG_TIMEOUT ((u_int32_t)(0x00000010))</div><div class='del'>-#define LMC_RDES_FRAME_TYPE           ((u_int32_t)(0x00000020))</div><div class='del'>-#define LMC_RDES_COLLISION_SEEN       ((u_int32_t)(0x00000040))</div><div class='del'>-#define LMC_RDES_FRAME_TOO_LONG       ((u_int32_t)(0x00000080))</div><div class='del'>-#define LMC_RDES_LAST_DESCRIPTOR      ((u_int32_t)(0x00000100))</div><div class='del'>-#define LMC_RDES_FIRST_DESCRIPTOR     ((u_int32_t)(0x00000200))</div><div class='del'>-#define LMC_RDES_MULTICAST_FRAME      ((u_int32_t)(0x00000400))</div><div class='del'>-#define LMC_RDES_RUNT_FRAME           ((u_int32_t)(0x00000800))</div><div class='del'>-#define LMC_RDES_DATA_TYPE            ((u_int32_t)(0x00003000))</div><div class='del'>-#define LMC_RDES_LENGTH_ERROR         ((u_int32_t)(0x00004000))</div><div class='del'>-#define LMC_RDES_ERROR_SUMMARY        ((u_int32_t)(0x00008000))</div><div class='del'>-#define LMC_RDES_FRAME_LENGTH         ((u_int32_t)(0x3FFF0000))</div><div class='del'>-#define LMC_RDES_OWN_BIT              ((u_int32_t)(0x80000000))</div><div class='add'>+#define LMC_RDES_OVERFLOW             ((u32)(0x00000001))</div><div class='add'>+#define LMC_RDES_CRC_ERROR            ((u32)(0x00000002))</div><div class='add'>+#define LMC_RDES_DRIBBLING_BIT        ((u32)(0x00000004))</div><div class='add'>+#define LMC_RDES_REPORT_ON_MII_ERR    ((u32)(0x00000008))</div><div class='add'>+#define LMC_RDES_RCV_WATCHDOG_TIMEOUT ((u32)(0x00000010))</div><div class='add'>+#define LMC_RDES_FRAME_TYPE           ((u32)(0x00000020))</div><div class='add'>+#define LMC_RDES_COLLISION_SEEN       ((u32)(0x00000040))</div><div class='add'>+#define LMC_RDES_FRAME_TOO_LONG       ((u32)(0x00000080))</div><div class='add'>+#define LMC_RDES_LAST_DESCRIPTOR      ((u32)(0x00000100))</div><div class='add'>+#define LMC_RDES_FIRST_DESCRIPTOR     ((u32)(0x00000200))</div><div class='add'>+#define LMC_RDES_MULTICAST_FRAME      ((u32)(0x00000400))</div><div class='add'>+#define LMC_RDES_RUNT_FRAME           ((u32)(0x00000800))</div><div class='add'>+#define LMC_RDES_DATA_TYPE            ((u32)(0x00003000))</div><div class='add'>+#define LMC_RDES_LENGTH_ERROR         ((u32)(0x00004000))</div><div class='add'>+#define LMC_RDES_ERROR_SUMMARY        ((u32)(0x00008000))</div><div class='add'>+#define LMC_RDES_FRAME_LENGTH         ((u32)(0x3FFF0000))</div><div class='add'>+#define LMC_RDES_OWN_BIT              ((u32)(0x80000000))</div><div class='ctx'> </div><div class='ctx'> #define RDES_FRAME_LENGTH_BIT_NUMBER       16</div><div class='ctx'> </div><div class='del'>-#define LMC_RDES_ERROR_MASK ( (u_int32_t)( \</div><div class='add'>+#define LMC_RDES_ERROR_MASK ( (u32)( \</div><div class='ctx'> 	  LMC_RDES_OVERFLOW \</div><div class='ctx'> 	| LMC_RDES_DRIBBLING_BIT \</div><div class='ctx'> 	| LMC_RDES_REPORT_ON_MII_ERR \</div><div class='hunk'>@@ -172,32 +150,32 @@ struct lmc_regfile_t {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> typedef struct {</div><div class='del'>-	u_int32_t	n;</div><div class='del'>-	u_int32_t	m;</div><div class='del'>-	u_int32_t	v;</div><div class='del'>-	u_int32_t	x;</div><div class='del'>-	u_int32_t	r;</div><div class='del'>-	u_int32_t	f;</div><div class='del'>-	u_int32_t	exact;</div><div class='add'>+	u32	n;</div><div class='add'>+	u32	m;</div><div class='add'>+	u32	v;</div><div class='add'>+	u32	x;</div><div class='add'>+	u32	r;</div><div class='add'>+	u32	f;</div><div class='add'>+	u32	exact;</div><div class='ctx'> } lmc_av9110_t;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Common structure passed to the ioctl code.</div><div class='ctx'>  */</div><div class='ctx'> struct lmc___ctl {</div><div class='del'>-	u_int32_t	cardtype;</div><div class='del'>-	u_int32_t	clock_source;		/* HSSI, T1 */</div><div class='del'>-	u_int32_t	clock_rate;		/* T1 */</div><div class='del'>-	u_int32_t	crc_length;</div><div class='del'>-	u_int32_t	cable_length;		/* DS3 */</div><div class='del'>-	u_int32_t	scrambler_onoff;	/* DS3 */</div><div class='del'>-	u_int32_t	cable_type;		/* T1 */</div><div class='del'>-	u_int32_t	keepalive_onoff;	/* protocol */</div><div class='del'>-	u_int32_t	ticks;			/* ticks/sec */</div><div class='add'>+	u32	cardtype;</div><div class='add'>+	u32	clock_source;		/* HSSI, T1 */</div><div class='add'>+	u32	clock_rate;		/* T1 */</div><div class='add'>+	u32	crc_length;</div><div class='add'>+	u32	cable_length;		/* DS3 */</div><div class='add'>+	u32	scrambler_onoff;	/* DS3 */</div><div class='add'>+	u32	cable_type;		/* T1 */</div><div class='add'>+	u32	keepalive_onoff;	/* protocol */</div><div class='add'>+	u32	ticks;			/* ticks/sec */</div><div class='ctx'> 	union {</div><div class='ctx'> 		lmc_av9110_t	ssi;</div><div class='ctx'> 	} cardspec;</div><div class='del'>-	u_int32_t       circuit_type;   /* T1 or E1 */</div><div class='add'>+	u32       circuit_type;   /* T1 or E1 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -244,108 +222,69 @@ struct lmc___media {</div><div class='ctx'> </div><div class='ctx'> #define STATCHECK     0xBEEFCAFE</div><div class='ctx'> </div><div class='del'>-/*  Included in this structure are first</div><div class='del'>- *   - standard net_device_stats</div><div class='del'>- *   - some other counters used for debug and driver performance</div><div class='del'>- *  evaluation -baz</div><div class='del'>- */</div><div class='del'>-struct lmc_statistics</div><div class='add'>+struct lmc_extra_statistics</div><div class='ctx'> {</div><div class='del'>-        unsigned long     rx_packets;             /* total packets received       */</div><div class='del'>-        unsigned long     tx_packets;             /* total packets transmitted    */</div><div class='del'>-	unsigned long     rx_bytes;</div><div class='del'>-        unsigned long     tx_bytes;</div><div class='del'>-        </div><div class='del'>-        unsigned long     rx_errors;              /* bad packets received         */</div><div class='del'>-        unsigned long     tx_errors;              /* packet transmit problems     */</div><div class='del'>-        unsigned long     rx_dropped;             /* no space in linux buffers    */</div><div class='del'>-        unsigned long     tx_dropped;             /* no space available in linux  */</div><div class='del'>-        unsigned long     multicast;              /* multicast packets received   */</div><div class='del'>-        unsigned long     collisions;</div><div class='del'>-</div><div class='del'>-        /* detailed rx_errors: */</div><div class='del'>-        unsigned long     rx_length_errors;</div><div class='del'>-        unsigned long     rx_over_errors;         /* receiver ring buff overflow  */</div><div class='del'>-        unsigned long     rx_crc_errors;          /* recved pkt with crc error    */</div><div class='del'>-        unsigned long     rx_frame_errors;        /* recv'd frame alignment error */</div><div class='del'>-        unsigned long     rx_fifo_errors;         /* recv'r fifo overrun          */</div><div class='del'>-        unsigned long     rx_missed_errors;       /* receiver missed packet       */</div><div class='del'>-</div><div class='del'>-        /* detailed tx_errors */</div><div class='del'>-        unsigned long     tx_aborted_errors;</div><div class='del'>-        unsigned long     tx_carrier_errors;</div><div class='del'>-        unsigned long     tx_fifo_errors;</div><div class='del'>-        unsigned long     tx_heartbeat_errors;</div><div class='del'>-        unsigned long     tx_window_errors;</div><div class='del'>-</div><div class='del'>-        /* for cslip etc */</div><div class='del'>-        unsigned long rx_compressed;</div><div class='del'>-        unsigned long tx_compressed;</div><div class='del'>-</div><div class='del'>-        /* -------------------------------------</div><div class='del'>-         * Custom stats &amp; counters follow -baz */</div><div class='del'>-        u_int32_t       version_size;</div><div class='del'>-        u_int32_t       lmc_cardtype;</div><div class='del'>-</div><div class='del'>-        u_int32_t       tx_ProcTimeout;</div><div class='del'>-        u_int32_t       tx_IntTimeout;</div><div class='del'>-        u_int32_t       tx_NoCompleteCnt;</div><div class='del'>-        u_int32_t       tx_MaxXmtsB4Int;</div><div class='del'>-        u_int32_t       tx_TimeoutCnt;</div><div class='del'>-        u_int32_t       tx_OutOfSyncPtr;</div><div class='del'>-        u_int32_t       tx_tbusy0;</div><div class='del'>-        u_int32_t       tx_tbusy1;</div><div class='del'>-        u_int32_t       tx_tbusy_calls;</div><div class='del'>-        u_int32_t       resetCount;</div><div class='del'>-        u_int32_t       lmc_txfull;</div><div class='del'>-        u_int32_t       tbusy;</div><div class='del'>-        u_int32_t       dirtyTx;</div><div class='del'>-        u_int32_t       lmc_next_tx;</div><div class='del'>-        u_int32_t       otherTypeCnt;</div><div class='del'>-        u_int32_t       lastType;</div><div class='del'>-        u_int32_t       lastTypeOK;</div><div class='del'>-        u_int32_t       txLoopCnt;</div><div class='del'>-        u_int32_t       usedXmtDescripCnt;</div><div class='del'>-        u_int32_t       txIndexCnt;</div><div class='del'>-        u_int32_t       rxIntLoopCnt;</div><div class='del'>-</div><div class='del'>-        u_int32_t       rx_SmallPktCnt;</div><div class='del'>-        u_int32_t       rx_BadPktSurgeCnt;</div><div class='del'>-        u_int32_t       rx_BuffAllocErr;</div><div class='del'>-        u_int32_t       tx_lossOfClockCnt;</div><div class='del'>-</div><div class='del'>-        /* T1 error counters */</div><div class='del'>-        u_int32_t       framingBitErrorCount;</div><div class='del'>-        u_int32_t       lineCodeViolationCount;</div><div class='del'>-</div><div class='del'>-        u_int32_t       lossOfFrameCount;</div><div class='del'>-        u_int32_t       changeOfFrameAlignmentCount;</div><div class='del'>-        u_int32_t       severelyErroredFrameCount;</div><div class='del'>-</div><div class='del'>-        u_int32_t       check;</div><div class='add'>+	u32       version_size;</div><div class='add'>+	u32       lmc_cardtype;</div><div class='add'>+</div><div class='add'>+	u32       tx_ProcTimeout;</div><div class='add'>+	u32       tx_IntTimeout;</div><div class='add'>+	u32       tx_NoCompleteCnt;</div><div class='add'>+	u32       tx_MaxXmtsB4Int;</div><div class='add'>+	u32       tx_TimeoutCnt;</div><div class='add'>+	u32       tx_OutOfSyncPtr;</div><div class='add'>+	u32       tx_tbusy0;</div><div class='add'>+	u32       tx_tbusy1;</div><div class='add'>+	u32       tx_tbusy_calls;</div><div class='add'>+	u32       resetCount;</div><div class='add'>+	u32       lmc_txfull;</div><div class='add'>+	u32       tbusy;</div><div class='add'>+	u32       dirtyTx;</div><div class='add'>+	u32       lmc_next_tx;</div><div class='add'>+	u32       otherTypeCnt;</div><div class='add'>+	u32       lastType;</div><div class='add'>+	u32       lastTypeOK;</div><div class='add'>+	u32       txLoopCnt;</div><div class='add'>+	u32       usedXmtDescripCnt;</div><div class='add'>+	u32       txIndexCnt;</div><div class='add'>+	u32       rxIntLoopCnt;</div><div class='add'>+</div><div class='add'>+	u32       rx_SmallPktCnt;</div><div class='add'>+	u32       rx_BadPktSurgeCnt;</div><div class='add'>+	u32       rx_BuffAllocErr;</div><div class='add'>+	u32       tx_lossOfClockCnt;</div><div class='add'>+</div><div class='add'>+	/* T1 error counters */</div><div class='add'>+	u32       framingBitErrorCount;</div><div class='add'>+	u32       lineCodeViolationCount;</div><div class='add'>+</div><div class='add'>+	u32       lossOfFrameCount;</div><div class='add'>+	u32       changeOfFrameAlignmentCount;</div><div class='add'>+	u32       severelyErroredFrameCount;</div><div class='add'>+</div><div class='add'>+	u32       check;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> typedef struct lmc_xinfo {</div><div class='del'>-        u_int32_t       Magic0;                         /* BEEFCAFE */</div><div class='add'>+	u32       Magic0;                         /* BEEFCAFE */</div><div class='ctx'> </div><div class='del'>-        u_int32_t       PciCardType;</div><div class='del'>-        u_int32_t       PciSlotNumber;          /* PCI slot number       */</div><div class='add'>+	u32       PciCardType;</div><div class='add'>+	u32       PciSlotNumber;          /* PCI slot number       */</div><div class='ctx'> </div><div class='del'>-        u_int16_t       DriverMajorVersion;</div><div class='del'>-        u_int16_t       DriverMinorVersion;</div><div class='del'>-        u_int16_t       DriverSubVersion;</div><div class='add'>+	u16	       DriverMajorVersion;</div><div class='add'>+	u16	       DriverMinorVersion;</div><div class='add'>+	u16	       DriverSubVersion;</div><div class='ctx'> </div><div class='del'>-        u_int16_t       XilinxRevisionNumber;</div><div class='del'>-        u_int16_t       MaxFrameSize;</div><div class='add'>+	u16	       XilinxRevisionNumber;</div><div class='add'>+	u16	       MaxFrameSize;</div><div class='ctx'> </div><div class='del'>-        u_int16_t       t1_alarm1_status;</div><div class='del'>-        u_int16_t       t1_alarm2_status;</div><div class='add'>+	u16     	  t1_alarm1_status;</div><div class='add'>+	u16       	t1_alarm2_status;</div><div class='ctx'> </div><div class='del'>-        int                     link_status;</div><div class='del'>-        u_int32_t       mii_reg16;</div><div class='add'>+	int             link_status;</div><div class='add'>+	u32       mii_reg16;</div><div class='ctx'> </div><div class='del'>-        u_int32_t       Magic1;                         /* DEADBEEF */</div><div class='add'>+	u32       Magic1;                         /* DEADBEEF */</div><div class='ctx'> } LMC_XINFO;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -353,23 +292,22 @@ typedef struct lmc_xinfo {</div><div class='ctx'>  * forward decl</div><div class='ctx'>  */</div><div class='ctx'> struct lmc___softc {</div><div class='del'>-        void *if_ptr;   /* General purpose pointer (used by SPPP) */</div><div class='ctx'> 	char                   *name;</div><div class='ctx'> 	u8			board_idx;</div><div class='del'>-	struct lmc_statistics   stats;</div><div class='del'>-	struct net_device          *lmc_device;</div><div class='add'>+	struct lmc_extra_statistics extra_stats;</div><div class='add'>+	struct net_device      *lmc_device;</div><div class='ctx'> </div><div class='ctx'> 	int                     hang, rxdesc, bad_packet, some_counter;</div><div class='del'>-	u_int32_t               txgo;</div><div class='add'>+	u32  	         	txgo;</div><div class='ctx'> 	struct lmc_regfile_t	lmc_csrs;</div><div class='del'>-	volatile u_int32_t	lmc_txtick;</div><div class='del'>-	volatile u_int32_t	lmc_rxtick;</div><div class='del'>-	u_int32_t		lmc_flags;</div><div class='del'>-	u_int32_t		lmc_intrmask;	/* our copy of csr_intr */</div><div class='del'>-	u_int32_t		lmc_cmdmode;	/* our copy of csr_cmdmode */</div><div class='del'>-	u_int32_t		lmc_busmode;	/* our copy of csr_busmode */</div><div class='del'>-	u_int32_t		lmc_gpio_io;	/* state of in/out settings */</div><div class='del'>-	u_int32_t		lmc_gpio;	/* state of outputs */</div><div class='add'>+	volatile u32		lmc_txtick;</div><div class='add'>+	volatile u32		lmc_rxtick;</div><div class='add'>+	u32			lmc_flags;</div><div class='add'>+	u32			lmc_intrmask;	/* our copy of csr_intr */</div><div class='add'>+	u32			lmc_cmdmode;	/* our copy of csr_cmdmode */</div><div class='add'>+	u32			lmc_busmode;	/* our copy of csr_busmode */</div><div class='add'>+	u32			lmc_gpio_io;	/* state of in/out settings */</div><div class='add'>+	u32			lmc_gpio;	/* state of outputs */</div><div class='ctx'> 	struct sk_buff*		lmc_txq[LMC_TXDESCS];</div><div class='ctx'> 	struct sk_buff*		lmc_rxq[LMC_RXDESCS];</div><div class='ctx'> 	volatile</div><div class='hunk'>@@ -381,42 +319,41 @@ struct lmc___softc {</div><div class='ctx'> 	unsigned int		lmc_taint_tx, lmc_taint_rx;</div><div class='ctx'> 	int			lmc_tx_start, lmc_txfull;</div><div class='ctx'> 	int			lmc_txbusy;</div><div class='del'>-	u_int16_t		lmc_miireg16;</div><div class='add'>+	u16			lmc_miireg16;</div><div class='ctx'> 	int			lmc_ok;</div><div class='ctx'> 	int			last_link_status;</div><div class='ctx'> 	int			lmc_cardtype;</div><div class='del'>-	u_int32_t               last_frameerr;</div><div class='add'>+	u32               	last_frameerr;</div><div class='ctx'> 	lmc_media_t	       *lmc_media;</div><div class='ctx'> 	struct timer_list	timer;</div><div class='ctx'> 	lmc_ctl_t		ictl;</div><div class='del'>-	u_int32_t		TxDescriptControlInit;  </div><div class='add'>+	u32			TxDescriptControlInit;</div><div class='ctx'> </div><div class='ctx'> 	int                     tx_TimeoutInd; /* additional driver state */</div><div class='ctx'> 	int                     tx_TimeoutDisplay;</div><div class='ctx'> 	unsigned int		lastlmc_taint_tx;</div><div class='ctx'> 	int                     lasttx_packets;</div><div class='del'>-	u_int32_t		tx_clockState;</div><div class='del'>-	u_int32_t		lmc_crcSize;</div><div class='del'>-	LMC_XINFO		lmc_xinfo; </div><div class='add'>+	u32			tx_clockState;</div><div class='add'>+	u32			lmc_crcSize;</div><div class='add'>+	LMC_XINFO		lmc_xinfo;</div><div class='ctx'> 	char                    lmc_yel, lmc_blue, lmc_red; /* for T1 and DS3 */</div><div class='del'>-        char                    lmc_timing; /* for HSSI and SSI */</div><div class='del'>-        int                     got_irq;</div><div class='add'>+	char                    lmc_timing; /* for HSSI and SSI */</div><div class='add'>+	int                     got_irq;</div><div class='ctx'> </div><div class='del'>-        char                    last_led_err[4];</div><div class='add'>+	char                    last_led_err[4];</div><div class='ctx'> </div><div class='del'>-        u32                     last_int;</div><div class='del'>-        u32                     num_int;</div><div class='add'>+	u32                     last_int;</div><div class='add'>+	u32                     num_int;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t              lmc_lock;</div><div class='del'>-        u_int16_t               if_type;       /* PPP or NET */</div><div class='del'>-        struct ppp_device       *pd;</div><div class='add'>+	u16			if_type;       /* HDLC/PPP or NET */</div><div class='ctx'> </div><div class='del'>-        /* Failure cases */</div><div class='del'>-        u8                       failed_ring;</div><div class='del'>-        u8                       failed_recv_alloc;</div><div class='add'>+	/* Failure cases */</div><div class='add'>+	u8			failed_ring;</div><div class='add'>+	u8			failed_recv_alloc;</div><div class='ctx'> </div><div class='del'>-        /* Structure check */</div><div class='del'>-        u32                     check;</div><div class='add'>+	/* Structure check */</div><div class='add'>+	u32                     check;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define LMC_PCI_TIME 1</div><div class='hunk'>@@ -512,8 +449,8 @@ struct lmc___softc {</div><div class='ctx'>   | TULIP_STS_TXUNDERFLOW\</div><div class='ctx'>   | TULIP_STS_RXSTOPPED )</div><div class='ctx'> </div><div class='del'>-#define DESC_OWNED_BY_SYSTEM   ((u_int32_t)(0x00000000))</div><div class='del'>-#define DESC_OWNED_BY_DC21X4   ((u_int32_t)(0x80000000))</div><div class='add'>+#define DESC_OWNED_BY_SYSTEM   ((u32)(0x00000000))</div><div class='add'>+#define DESC_OWNED_BY_DC21X4   ((u32)(0x80000000))</div><div class='ctx'> </div><div class='ctx'> #ifndef TULIP_CMD_RECEIVEALL</div><div class='ctx'> #define TULIP_CMD_RECEIVEALL 0x40000000L</div><div class='hunk'>@@ -525,46 +462,9 @@ struct lmc___softc {</div><div class='ctx'> #define LMC_ADAP_SSI            4</div><div class='ctx'> #define LMC_ADAP_T1             5</div><div class='ctx'> </div><div class='del'>-#define HDLC_HDR_LEN  4</div><div class='del'>-#define HDLC_ADDR_LEN 1</div><div class='del'>-#define HDLC_SLARP    0x8035</div><div class='ctx'> #define LMC_MTU 1500</div><div class='del'>-#define SLARP_LINECHECK 2</div><div class='ctx'> </div><div class='ctx'> #define LMC_CRC_LEN_16 2  /* 16-bit CRC */</div><div class='ctx'> #define LMC_CRC_LEN_32 4</div><div class='ctx'> </div><div class='del'>-#ifdef LMC_HDLC</div><div class='del'>-/* definition of an hdlc header. */</div><div class='del'>-struct hdlc_hdr</div><div class='del'>-{</div><div class='del'>-	u8  address;</div><div class='del'>-	u8  control;</div><div class='del'>-	u16 type;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* definition of a slarp header. */</div><div class='del'>-struct slarp</div><div class='del'>-{</div><div class='del'>-	long code;</div><div class='del'>-	union sl</div><div class='del'>-	{</div><div class='del'>-		struct</div><div class='del'>-		{</div><div class='del'>-			ulong address;</div><div class='del'>-			ulong mask;</div><div class='del'>-			ushort unused;</div><div class='del'>-		} add;</div><div class='del'>-		struct</div><div class='del'>-		{</div><div class='del'>-			ulong mysequence;</div><div class='del'>-			ulong yoursequence;</div><div class='del'>-			ushort reliability;</div><div class='del'>-			ulong time;</div><div class='del'>-		} chk;</div><div class='del'>-	} t;</div><div class='del'>-};</div><div class='del'>-#endif /* LMC_HDLC */</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #endif /* _LMC_VAR_H_ */</div><div class='head'>diff --git a/drivers/net/wan/pc300.h b/drivers/net/wan/pc300.h<br/>index 63e9fcf31fb8..2e4f84f6cad4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/pc300.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/pc300.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/pc300.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/pc300.h</a></div><div class='hunk'>@@ -100,31 +100,14 @@</div><div class='ctx'> #define	_PC300_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/hdlc.h&gt;</div><div class='del'>-#include &lt;net/syncppp.h&gt;</div><div class='ctx'> #include "hd64572.h"</div><div class='ctx'> #include "pc300-falc-lh.h"</div><div class='ctx'> </div><div class='del'>-#ifndef CY_TYPES</div><div class='del'>-#define CY_TYPES</div><div class='del'>-typedef	__u64	ucdouble;	/* 64 bits, unsigned */</div><div class='del'>-typedef	__u32	uclong;		/* 32 bits, unsigned */</div><div class='del'>-typedef	__u16	ucshort;	/* 16 bits, unsigned */</div><div class='del'>-typedef	__u8	ucchar;		/* 8 bits, unsigned */</div><div class='del'>-#endif /* CY_TYPES */</div><div class='add'>+#define PC300_PROTO_MLPPP 1</div><div class='ctx'> </div><div class='del'>-#define PC300_PROTO_MLPPP 1		</div><div class='del'>-</div><div class='del'>-#define PC300_KERNEL	"2.4.x"	/* Kernel supported by this driver */</div><div class='del'>-</div><div class='del'>-#define	PC300_DEVNAME	"hdlc"	/* Dev. name base (for hdlc0, hdlc1, etc.) */</div><div class='del'>-#define PC300_MAXINDEX	100	/* Max dev. name index (the '0' in hdlc0) */</div><div class='del'>-</div><div class='del'>-#define	PC300_MAXCARDS	4	/* Max number of cards per system */</div><div class='ctx'> #define	PC300_MAXCHAN	2	/* Number of channels per card */</div><div class='ctx'> </div><div class='del'>-#define	PC300_PLX_WIN	0x80    /* PLX control window size (128b) */</div><div class='ctx'> #define	PC300_RAMSIZE	0x40000 /* RAM window size (256Kb) */</div><div class='del'>-#define	PC300_SCASIZE	0x400   /* SCA window size (1Kb) */</div><div class='ctx'> #define	PC300_FALCSIZE	0x400	/* FALC window size (1Kb) */</div><div class='ctx'> </div><div class='ctx'> #define PC300_OSC_CLOCK	24576000</div><div class='hunk'>@@ -160,26 +143,14 @@ typedef	__u8	ucchar;		/* 8 bits, unsigned */</div><div class='ctx'>  * Memory access functions/macros      *</div><div class='ctx'>  * (required to support Alpha systems) *</div><div class='ctx'>  ***************************************/</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-#define cpc_writeb(port,val)	{writeb((ucchar)(val),(port)); mb();}</div><div class='add'>+#define cpc_writeb(port,val)	{writeb((u8)(val),(port)); mb();}</div><div class='ctx'> #define cpc_writew(port,val)	{writew((ushort)(val),(port)); mb();}</div><div class='del'>-#define cpc_writel(port,val)	{writel((uclong)(val),(port)); mb();}</div><div class='add'>+#define cpc_writel(port,val)	{writel((u32)(val),(port)); mb();}</div><div class='ctx'> </div><div class='ctx'> #define cpc_readb(port)		readb(port)</div><div class='ctx'> #define cpc_readw(port)		readw(port)</div><div class='ctx'> #define cpc_readl(port)		readl(port)</div><div class='ctx'> </div><div class='del'>-#else /* __KERNEL__ */</div><div class='del'>-#define cpc_writeb(port,val)	(*(volatile ucchar *)(port) = (ucchar)(val))</div><div class='del'>-#define cpc_writew(port,val)	(*(volatile ucshort *)(port) = (ucshort)(val))</div><div class='del'>-#define cpc_writel(port,val)	(*(volatile uclong *)(port) = (uclong)(val))</div><div class='del'>-</div><div class='del'>-#define cpc_readb(port)		(*(volatile ucchar *)(port))</div><div class='del'>-#define cpc_readw(port)		(*(volatile ucshort *)(port))</div><div class='del'>-#define cpc_readl(port)		(*(volatile uclong *)(port))</div><div class='del'>-</div><div class='del'>-#endif /* __KERNEL__ */</div><div class='del'>-</div><div class='ctx'> /****** Data Structures *****************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -188,15 +159,15 @@ typedef	__u8	ucchar;		/* 8 bits, unsigned */</div><div class='ctx'>  *      (memory mapped).</div><div class='ctx'>  */</div><div class='ctx'> struct RUNTIME_9050 {</div><div class='del'>-	uclong	loc_addr_range[4];	/* 00-0Ch : Local Address Ranges */</div><div class='del'>-	uclong	loc_rom_range;		/* 10h : Local ROM Range */</div><div class='del'>-	uclong	loc_addr_base[4];	/* 14-20h : Local Address Base Addrs */</div><div class='del'>-	uclong	loc_rom_base;		/* 24h : Local ROM Base */</div><div class='del'>-	uclong	loc_bus_descr[4];	/* 28-34h : Local Bus Descriptors */</div><div class='del'>-	uclong	rom_bus_descr;		/* 38h : ROM Bus Descriptor */</div><div class='del'>-	uclong	cs_base[4];		/* 3C-48h : Chip Select Base Addrs */</div><div class='del'>-	uclong	intr_ctrl_stat;		/* 4Ch : Interrupt Control/Status */</div><div class='del'>-	uclong	init_ctrl;		/* 50h : EEPROM ctrl, Init Ctrl, etc */</div><div class='add'>+	u32 loc_addr_range[4];	/* 00-0Ch : Local Address Ranges */</div><div class='add'>+	u32 loc_rom_range;	/* 10h : Local ROM Range */</div><div class='add'>+	u32 loc_addr_base[4];	/* 14-20h : Local Address Base Addrs */</div><div class='add'>+	u32 loc_rom_base;	/* 24h : Local ROM Base */</div><div class='add'>+	u32 loc_bus_descr[4];	/* 28-34h : Local Bus Descriptors */</div><div class='add'>+	u32 rom_bus_descr;	/* 38h : ROM Bus Descriptor */</div><div class='add'>+	u32 cs_base[4];		/* 3C-48h : Chip Select Base Addrs */</div><div class='add'>+	u32 intr_ctrl_stat;	/* 4Ch : Interrupt Control/Status */</div><div class='add'>+	u32 init_ctrl;		/* 50h : EEPROM ctrl, Init Ctrl, etc */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define PLX_9050_LINT1_ENABLE	0x01</div><div class='hunk'>@@ -240,66 +211,66 @@ struct RUNTIME_9050 {</div><div class='ctx'> #define PC300_FALC_MAXLOOP	0x0000ffff	/* for falc_issue_cmd() */</div><div class='ctx'> </div><div class='ctx'> typedef struct falc {</div><div class='del'>-	ucchar sync;		/* If true FALC is synchronized */</div><div class='del'>-	ucchar active;		/* if TRUE then already active */</div><div class='del'>-	ucchar loop_active;	/* if TRUE a line loopback UP was received */</div><div class='del'>-	ucchar loop_gen;	/* if TRUE a line loopback UP was issued */</div><div class='add'>+	u8 sync;	/* If true FALC is synchronized */</div><div class='add'>+	u8 active;	/* if TRUE then already active */</div><div class='add'>+	u8 loop_active;	/* if TRUE a line loopback UP was received */</div><div class='add'>+	u8 loop_gen;	/* if TRUE a line loopback UP was issued */</div><div class='ctx'> </div><div class='del'>-	ucchar num_channels;</div><div class='del'>-	ucchar offset;		/* 1 for T1, 0 for E1 */</div><div class='del'>-	ucchar full_bandwidth;</div><div class='add'>+	u8 num_channels;</div><div class='add'>+	u8 offset;	/* 1 for T1, 0 for E1 */</div><div class='add'>+	u8 full_bandwidth;</div><div class='ctx'> </div><div class='del'>-	ucchar xmb_cause;</div><div class='del'>-	ucchar multiframe_mode;</div><div class='add'>+	u8 xmb_cause;</div><div class='add'>+	u8 multiframe_mode;</div><div class='ctx'> </div><div class='ctx'> 	/* Statistics */</div><div class='del'>-	ucshort pden;	/* Pulse Density violation count */</div><div class='del'>-	ucshort los;	/* Loss of Signal count */</div><div class='del'>-	ucshort losr;	/* Loss of Signal recovery count */</div><div class='del'>-	ucshort lfa;	/* Loss of frame alignment count */</div><div class='del'>-	ucshort farec;	/* Frame Alignment Recovery count */</div><div class='del'>-	ucshort lmfa;	/* Loss of multiframe alignment count */</div><div class='del'>-	ucshort ais;	/* Remote Alarm indication Signal count */</div><div class='del'>-	ucshort sec;	/* One-second timer */</div><div class='del'>-	ucshort es;	/* Errored second */</div><div class='del'>-	ucshort rai;	/* remote alarm received */</div><div class='del'>-	ucshort bec;</div><div class='del'>-	ucshort fec;</div><div class='del'>-	ucshort cvc;</div><div class='del'>-	ucshort cec;</div><div class='del'>-	ucshort ebc;</div><div class='add'>+	u16 pden;	/* Pulse Density violation count */</div><div class='add'>+	u16 los;	/* Loss of Signal count */</div><div class='add'>+	u16 losr;	/* Loss of Signal recovery count */</div><div class='add'>+	u16 lfa;	/* Loss of frame alignment count */</div><div class='add'>+	u16 farec;	/* Frame Alignment Recovery count */</div><div class='add'>+	u16 lmfa;	/* Loss of multiframe alignment count */</div><div class='add'>+	u16 ais;	/* Remote Alarm indication Signal count */</div><div class='add'>+	u16 sec;	/* One-second timer */</div><div class='add'>+	u16 es;		/* Errored second */</div><div class='add'>+	u16 rai;	/* remote alarm received */</div><div class='add'>+	u16 bec;</div><div class='add'>+	u16 fec;</div><div class='add'>+	u16 cvc;</div><div class='add'>+	u16 cec;</div><div class='add'>+	u16 ebc;</div><div class='ctx'> </div><div class='ctx'> 	/* Status */</div><div class='del'>-	ucchar red_alarm;</div><div class='del'>-	ucchar blue_alarm;</div><div class='del'>-	ucchar loss_fa;</div><div class='del'>-	ucchar yellow_alarm;</div><div class='del'>-	ucchar loss_mfa;</div><div class='del'>-	ucchar prbs;</div><div class='add'>+	u8 red_alarm;</div><div class='add'>+	u8 blue_alarm;</div><div class='add'>+	u8 loss_fa;</div><div class='add'>+	u8 yellow_alarm;</div><div class='add'>+	u8 loss_mfa;</div><div class='add'>+	u8 prbs;</div><div class='ctx'> } falc_t;</div><div class='ctx'> </div><div class='ctx'> typedef struct falc_status {</div><div class='del'>-	ucchar sync;  /* If true FALC is synchronized */</div><div class='del'>-	ucchar red_alarm;</div><div class='del'>-	ucchar blue_alarm;</div><div class='del'>-	ucchar loss_fa;</div><div class='del'>-	ucchar yellow_alarm;</div><div class='del'>-	ucchar loss_mfa;</div><div class='del'>-	ucchar prbs;</div><div class='add'>+	u8 sync;	/* If true FALC is synchronized */</div><div class='add'>+	u8 red_alarm;</div><div class='add'>+	u8 blue_alarm;</div><div class='add'>+	u8 loss_fa;</div><div class='add'>+	u8 yellow_alarm;</div><div class='add'>+	u8 loss_mfa;</div><div class='add'>+	u8 prbs;</div><div class='ctx'> } falc_status_t;</div><div class='ctx'> </div><div class='ctx'> typedef struct rsv_x21_status {</div><div class='del'>-	ucchar dcd;</div><div class='del'>-	ucchar dsr;</div><div class='del'>-	ucchar cts;</div><div class='del'>-	ucchar rts;</div><div class='del'>-	ucchar dtr;</div><div class='add'>+	u8 dcd;</div><div class='add'>+	u8 dsr;</div><div class='add'>+	u8 cts;</div><div class='add'>+	u8 rts;</div><div class='add'>+	u8 dtr;</div><div class='ctx'> } rsv_x21_status_t;</div><div class='ctx'> </div><div class='ctx'> typedef struct pc300stats {</div><div class='ctx'> 	int hw_type;</div><div class='del'>-	uclong line_on;</div><div class='del'>-	uclong line_off;</div><div class='add'>+	u32 line_on;</div><div class='add'>+	u32 line_off;</div><div class='ctx'> 	struct net_device_stats gen_stats;</div><div class='ctx'> 	falc_t te_stats;</div><div class='ctx'> } pc300stats_t;</div><div class='hunk'>@@ -317,28 +288,19 @@ typedef struct pc300loopback {</div><div class='ctx'> </div><div class='ctx'> typedef struct pc300patterntst {</div><div class='ctx'> 	char patrntst_on;       /* 0 - off; 1 - on; 2 - read num_errors */</div><div class='del'>-	ucshort num_errors;</div><div class='add'>+	u16 num_errors;</div><div class='ctx'> } pc300patterntst_t;</div><div class='ctx'> </div><div class='ctx'> typedef struct pc300dev {</div><div class='del'>-	void *if_ptr;		/* General purpose pointer */</div><div class='ctx'> 	struct pc300ch *chan;</div><div class='del'>-	ucchar trace_on;</div><div class='del'>-	uclong line_on;		/* DCD(X.21, RSV) / sync(TE) change counters */</div><div class='del'>-	uclong line_off;</div><div class='del'>-#ifdef __KERNEL__</div><div class='add'>+	u8 trace_on;</div><div class='add'>+	u32 line_on;		/* DCD(X.21, RSV) / sync(TE) change counters */</div><div class='add'>+	u32 line_off;</div><div class='ctx'> 	char name[16];</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-</div><div class='del'>-	void *private;</div><div class='del'>-	struct sk_buff *tx_skb;</div><div class='del'>-	union {	/* This union has all the protocol-specific structures */</div><div class='del'>-		struct ppp_device pppdev;</div><div class='del'>-	}ifu;</div><div class='ctx'> #ifdef CONFIG_PC300_MLPPP</div><div class='ctx'> 	void *cpc_tty;	/* information to PC300 TTY driver */</div><div class='ctx'> #endif</div><div class='del'>-#endif /* __KERNEL__ */</div><div class='ctx'> }pc300dev_t;</div><div class='ctx'> </div><div class='ctx'> typedef struct pc300hw {</div><div class='hunk'>@@ -346,43 +308,42 @@ typedef struct pc300hw {</div><div class='ctx'> 	int bus;		/* Bus (PCI, PMC, etc.) */</div><div class='ctx'> 	int nchan;		/* number of channels */</div><div class='ctx'> 	int irq;		/* interrupt request level */</div><div class='del'>-	uclong clock;		/* Board clock */</div><div class='del'>-	ucchar cpld_id;		/* CPLD ID (TE only) */</div><div class='del'>-	ucshort cpld_reg1;	/* CPLD reg 1 (TE only) */</div><div class='del'>-	ucshort cpld_reg2;	/* CPLD reg 2 (TE only) */</div><div class='del'>-	ucshort gpioc_reg;	/* PLX GPIOC reg */</div><div class='del'>-	ucshort intctl_reg;	/* PLX Int Ctrl/Status reg */</div><div class='del'>-	uclong iophys;		/* PLX registers I/O base */</div><div class='del'>-	uclong iosize;		/* PLX registers I/O size */</div><div class='del'>-	uclong plxphys;		/* PLX registers MMIO base (physical) */</div><div class='add'>+	u32 clock;		/* Board clock */</div><div class='add'>+	u8 cpld_id;		/* CPLD ID (TE only) */</div><div class='add'>+	u16 cpld_reg1;		/* CPLD reg 1 (TE only) */</div><div class='add'>+	u16 cpld_reg2;		/* CPLD reg 2 (TE only) */</div><div class='add'>+	u16 gpioc_reg;		/* PLX GPIOC reg */</div><div class='add'>+	u16 intctl_reg;		/* PLX Int Ctrl/Status reg */</div><div class='add'>+	u32 iophys;		/* PLX registers I/O base */</div><div class='add'>+	u32 iosize;		/* PLX registers I/O size */</div><div class='add'>+	u32 plxphys;		/* PLX registers MMIO base (physical) */</div><div class='ctx'> 	void __iomem * plxbase;	/* PLX registers MMIO base (virtual) */</div><div class='del'>-	uclong plxsize;		/* PLX registers MMIO size */</div><div class='del'>-	uclong scaphys;		/* SCA registers MMIO base (physical) */</div><div class='add'>+	u32 plxsize;		/* PLX registers MMIO size */</div><div class='add'>+	u32 scaphys;		/* SCA registers MMIO base (physical) */</div><div class='ctx'> 	void __iomem * scabase;	/* SCA registers MMIO base (virtual) */</div><div class='del'>-	uclong scasize;		/* SCA registers MMIO size */</div><div class='del'>-	uclong ramphys;		/* On-board RAM MMIO base (physical) */</div><div class='add'>+	u32 scasize;		/* SCA registers MMIO size */</div><div class='add'>+	u32 ramphys;		/* On-board RAM MMIO base (physical) */</div><div class='ctx'> 	void __iomem * rambase;	/* On-board RAM MMIO base (virtual) */</div><div class='del'>-	uclong alloc_ramsize;	/* RAM MMIO size allocated by the PCI bridge */</div><div class='del'>-	uclong ramsize;		/* On-board RAM MMIO size */</div><div class='del'>-	uclong falcphys;	/* FALC registers MMIO base (physical) */</div><div class='add'>+	u32 alloc_ramsize;	/* RAM MMIO size allocated by the PCI bridge */</div><div class='add'>+	u32 ramsize;		/* On-board RAM MMIO size */</div><div class='add'>+	u32 falcphys;		/* FALC registers MMIO base (physical) */</div><div class='ctx'> 	void __iomem * falcbase;/* FALC registers MMIO base (virtual) */</div><div class='del'>-	uclong falcsize;	/* FALC registers MMIO size */</div><div class='add'>+	u32 falcsize;		/* FALC registers MMIO size */</div><div class='ctx'> } pc300hw_t;</div><div class='ctx'> </div><div class='ctx'> typedef struct pc300chconf {</div><div class='del'>-	sync_serial_settings	phys_settings;	/* Clock type/rate (in bps), </div><div class='add'>+	sync_serial_settings	phys_settings;	/* Clock type/rate (in bps),</div><div class='ctx'> 						   loopback mode */</div><div class='ctx'> 	raw_hdlc_proto		proto_settings;	/* Encoding, parity (CRC) */</div><div class='del'>-	uclong media;		/* HW media (RS232, V.35, etc.) */</div><div class='del'>-	uclong proto;		/* Protocol (PPP, X.25, etc.) */</div><div class='del'>-	ucchar monitor;		/* Monitor mode (0 = off, !0 = on) */</div><div class='add'>+	u32 media;		/* HW media (RS232, V.35, etc.) */</div><div class='add'>+	u32 proto;		/* Protocol (PPP, X.25, etc.) */</div><div class='ctx'> </div><div class='ctx'> 	/* TE-specific parameters */</div><div class='del'>-	ucchar lcode;		/* Line Code (AMI, B8ZS, etc.) */</div><div class='del'>-	ucchar fr_mode;		/* Frame Mode (ESF, D4, etc.) */</div><div class='del'>-	ucchar lbo;		/* Line Build Out */</div><div class='del'>-	ucchar rx_sens;		/* Rx Sensitivity (long- or short-haul) */</div><div class='del'>-	uclong tslot_bitmap;	/* bit[i]=1  =&gt;  timeslot _i_ is active */</div><div class='add'>+	u8 lcode;		/* Line Code (AMI, B8ZS, etc.) */</div><div class='add'>+	u8 fr_mode;		/* Frame Mode (ESF, D4, etc.) */</div><div class='add'>+	u8 lbo;			/* Line Build Out */</div><div class='add'>+	u8 rx_sens;		/* Rx Sensitivity (long- or short-haul) */</div><div class='add'>+	u32 tslot_bitmap;	/* bit[i]=1  =&gt;  timeslot _i_ is active */</div><div class='ctx'> } pc300chconf_t;</div><div class='ctx'> </div><div class='ctx'> typedef struct pc300ch {</div><div class='hunk'>@@ -390,20 +351,18 @@ typedef struct pc300ch {</div><div class='ctx'> 	int channel;</div><div class='ctx'> 	pc300dev_t d;</div><div class='ctx'> 	pc300chconf_t conf;</div><div class='del'>-	ucchar tx_first_bd;	/* First TX DMA block descr. w/ data */</div><div class='del'>-	ucchar tx_next_bd;	/* Next free TX DMA block descriptor */</div><div class='del'>-	ucchar rx_first_bd;	/* First free RX DMA block descriptor */</div><div class='del'>-	ucchar rx_last_bd;	/* Last free RX DMA block descriptor */</div><div class='del'>-	ucchar nfree_tx_bd;	/* Number of free TX DMA block descriptors */</div><div class='del'>-	falc_t falc;		/* FALC structure (TE only) */</div><div class='add'>+	u8 tx_first_bd;	/* First TX DMA block descr. w/ data */</div><div class='add'>+	u8 tx_next_bd;	/* Next free TX DMA block descriptor */</div><div class='add'>+	u8 rx_first_bd;	/* First free RX DMA block descriptor */</div><div class='add'>+	u8 rx_last_bd;	/* Last free RX DMA block descriptor */</div><div class='add'>+	u8 nfree_tx_bd;	/* Number of free TX DMA block descriptors */</div><div class='add'>+	falc_t falc;	/* FALC structure (TE only) */</div><div class='ctx'> } pc300ch_t;</div><div class='ctx'> </div><div class='ctx'> typedef struct pc300 {</div><div class='ctx'> 	pc300hw_t hw;			/* hardware config. */</div><div class='ctx'> 	pc300ch_t chan[PC300_MAXCHAN];</div><div class='del'>-#ifdef __KERNEL__</div><div class='ctx'> 	spinlock_t card_lock;</div><div class='del'>-#endif /* __KERNEL__ */</div><div class='ctx'> } pc300_t;</div><div class='ctx'> </div><div class='ctx'> typedef struct pc300conf {</div><div class='hunk'>@@ -471,12 +430,7 @@ enum pc300_loopback_cmds {</div><div class='ctx'> #define PC300_TX_QUEUE_LEN	100</div><div class='ctx'> #define	PC300_DEF_MTU		1600</div><div class='ctx'> </div><div class='del'>-#ifdef __KERNEL__</div><div class='ctx'> /* Function Prototypes */</div><div class='del'>-void tx_dma_start(pc300_t *, int);</div><div class='ctx'> int cpc_open(struct net_device *dev);</div><div class='del'>-int cpc_set_media(hdlc_device *, int);</div><div class='del'>-#endif /* __KERNEL__ */</div><div class='ctx'> </div><div class='ctx'> #endif	/* _PC300_H */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c<br/>index 334170527755..d0a8d1e352ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/pc300_drv.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/pc300_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/pc300_drv.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/pc300_drv.c</a></div><div class='hunk'>@@ -227,8 +227,6 @@ static char rcsid[] =</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/if.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/syncppp.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -285,8 +283,8 @@ static void rx_dma_buf_init(pc300_t *, int);</div><div class='ctx'> static void tx_dma_buf_check(pc300_t *, int);</div><div class='ctx'> static void rx_dma_buf_check(pc300_t *, int);</div><div class='ctx'> static irqreturn_t cpc_intr(int, void *);</div><div class='del'>-static int clock_rate_calc(uclong, uclong, int *);</div><div class='del'>-static uclong detect_ram(pc300_t *);</div><div class='add'>+static int clock_rate_calc(u32, u32, int *);</div><div class='add'>+static u32 detect_ram(pc300_t *);</div><div class='ctx'> static void plx_init(pc300_t *);</div><div class='ctx'> static void cpc_trace(struct net_device *, struct sk_buff *, char);</div><div class='ctx'> static int cpc_attach(struct net_device *, unsigned short, unsigned short);</div><div class='hunk'>@@ -311,10 +309,10 @@ static void tx_dma_buf_pt_init(pc300_t * card, int ch)</div><div class='ctx'> 			               + DMA_TX_BD_BASE + ch_factor * sizeof(pcsca_bd_t));</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; N_DMA_TX_BUF; i++, ptdescr++) {</div><div class='del'>-		cpc_writel(&amp;ptdescr-&gt;next, (uclong) (DMA_TX_BD_BASE +</div><div class='add'>+		cpc_writel(&amp;ptdescr-&gt;next, (u32)(DMA_TX_BD_BASE +</div><div class='ctx'> 			(ch_factor + ((i + 1) &amp; (N_DMA_TX_BUF - 1))) * sizeof(pcsca_bd_t)));</div><div class='del'>-		cpc_writel(&amp;ptdescr-&gt;ptbuf, </div><div class='del'>-						(uclong) (DMA_TX_BASE + (ch_factor + i) * BD_DEF_LEN));</div><div class='add'>+		cpc_writel(&amp;ptdescr-&gt;ptbuf,</div><div class='add'>+			   (u32)(DMA_TX_BASE + (ch_factor + i) * BD_DEF_LEN));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -341,10 +339,10 @@ static void rx_dma_buf_pt_init(pc300_t * card, int ch)</div><div class='ctx'> 				       + DMA_RX_BD_BASE + ch_factor * sizeof(pcsca_bd_t));</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; N_DMA_RX_BUF; i++, ptdescr++) {</div><div class='del'>-		cpc_writel(&amp;ptdescr-&gt;next, (uclong) (DMA_RX_BD_BASE +</div><div class='del'>-	     	(ch_factor + ((i + 1) &amp; (N_DMA_RX_BUF - 1))) * sizeof(pcsca_bd_t)));</div><div class='add'>+		cpc_writel(&amp;ptdescr-&gt;next, (u32)(DMA_RX_BD_BASE +</div><div class='add'>+			(ch_factor + ((i + 1) &amp; (N_DMA_RX_BUF - 1))) * sizeof(pcsca_bd_t)));</div><div class='ctx'> 		cpc_writel(&amp;ptdescr-&gt;ptbuf,</div><div class='del'>-			   (uclong) (DMA_RX_BASE + (ch_factor + i) * BD_DEF_LEN));</div><div class='add'>+			   (u32)(DMA_RX_BASE + (ch_factor + i) * BD_DEF_LEN));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -367,8 +365,8 @@ static void tx_dma_buf_check(pc300_t * card, int ch)</div><div class='ctx'> {</div><div class='ctx'> 	volatile pcsca_bd_t __iomem *ptdescr;</div><div class='ctx'> 	int i;</div><div class='del'>-	ucshort first_bd = card-&gt;chan[ch].tx_first_bd;</div><div class='del'>-	ucshort next_bd = card-&gt;chan[ch].tx_next_bd;</div><div class='add'>+	u16 first_bd = card-&gt;chan[ch].tx_first_bd;</div><div class='add'>+	u16 next_bd = card-&gt;chan[ch].tx_next_bd;</div><div class='ctx'> </div><div class='ctx'> 	printk("#CH%d: f_bd = %d(0x%08zx), n_bd = %d(0x%08zx)\n", ch,</div><div class='ctx'> 	       first_bd, TX_BD_ADDR(ch, first_bd),</div><div class='hunk'>@@ -392,9 +390,9 @@ static void tx1_dma_buf_check(pc300_t * card, int ch)</div><div class='ctx'> {</div><div class='ctx'> 	volatile pcsca_bd_t __iomem *ptdescr;</div><div class='ctx'> 	int i;</div><div class='del'>-	ucshort first_bd = card-&gt;chan[ch].tx_first_bd;</div><div class='del'>-	ucshort next_bd = card-&gt;chan[ch].tx_next_bd;</div><div class='del'>-	uclong scabase = card-&gt;hw.scabase;</div><div class='add'>+	u16 first_bd = card-&gt;chan[ch].tx_first_bd;</div><div class='add'>+	u16 next_bd = card-&gt;chan[ch].tx_next_bd;</div><div class='add'>+	u32 scabase = card-&gt;hw.scabase;</div><div class='ctx'> </div><div class='ctx'> 	printk ("\nnfree_tx_bd = %d \n", card-&gt;chan[ch].nfree_tx_bd);</div><div class='ctx'> 	printk("#CH%d: f_bd = %d(0x%08x), n_bd = %d(0x%08x)\n", ch,</div><div class='hunk'>@@ -413,13 +411,13 @@ static void tx1_dma_buf_check(pc300_t * card, int ch)</div><div class='ctx'> 	printk("\n");</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='del'>-			 </div><div class='add'>+</div><div class='ctx'> static void rx_dma_buf_check(pc300_t * card, int ch)</div><div class='ctx'> {</div><div class='ctx'> 	volatile pcsca_bd_t __iomem *ptdescr;</div><div class='ctx'> 	int i;</div><div class='del'>-	ucshort first_bd = card-&gt;chan[ch].rx_first_bd;</div><div class='del'>-	ucshort last_bd = card-&gt;chan[ch].rx_last_bd;</div><div class='add'>+	u16 first_bd = card-&gt;chan[ch].rx_first_bd;</div><div class='add'>+	u16 last_bd = card-&gt;chan[ch].rx_last_bd;</div><div class='ctx'> 	int ch_factor;</div><div class='ctx'> </div><div class='ctx'> 	ch_factor = ch * N_DMA_RX_BUF;</div><div class='hunk'>@@ -440,9 +438,9 @@ static void rx_dma_buf_check(pc300_t * card, int ch)</div><div class='ctx'> static int dma_get_rx_frame_size(pc300_t * card, int ch)</div><div class='ctx'> {</div><div class='ctx'> 	volatile pcsca_bd_t __iomem *ptdescr;</div><div class='del'>-	ucshort first_bd = card-&gt;chan[ch].rx_first_bd;</div><div class='add'>+	u16 first_bd = card-&gt;chan[ch].rx_first_bd;</div><div class='ctx'> 	int rcvd = 0;</div><div class='del'>-	volatile ucchar status;</div><div class='add'>+	volatile u8 status;</div><div class='ctx'> </div><div class='ctx'> 	ptdescr = (card-&gt;hw.rambase + RX_BD_ADDR(ch, first_bd));</div><div class='ctx'> 	while ((status = cpc_readb(&amp;ptdescr-&gt;status)) &amp; DST_OSB) {</div><div class='hunk'>@@ -462,12 +460,12 @@ static int dma_get_rx_frame_size(pc300_t * card, int ch)</div><div class='ctx'>  * dma_buf_write: writes a frame to the Tx DMA buffers</div><div class='ctx'>  * NOTE: this function writes one frame at a time.</div><div class='ctx'>  */</div><div class='del'>-static int dma_buf_write(pc300_t * card, int ch, ucchar * ptdata, int len)</div><div class='add'>+static int dma_buf_write(pc300_t *card, int ch, u8 *ptdata, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int i, nchar;</div><div class='ctx'> 	volatile pcsca_bd_t __iomem *ptdescr;</div><div class='ctx'> 	int tosend = len;</div><div class='del'>-	ucchar nbuf = ((len - 1) / BD_DEF_LEN) + 1;</div><div class='add'>+	u8 nbuf = ((len - 1) / BD_DEF_LEN) + 1;</div><div class='ctx'> </div><div class='ctx'> 	if (nbuf &gt;= card-&gt;chan[ch].nfree_tx_bd) {</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -509,7 +507,7 @@ static int dma_buf_read(pc300_t * card, int ch, struct sk_buff *skb)</div><div class='ctx'> 	pc300ch_t *chan = (pc300ch_t *) &amp; card-&gt;chan[ch];</div><div class='ctx'> 	volatile pcsca_bd_t __iomem *ptdescr;</div><div class='ctx'> 	int rcvd = 0;</div><div class='del'>-	volatile ucchar status;</div><div class='add'>+	volatile u8 status;</div><div class='ctx'> </div><div class='ctx'> 	ptdescr = (card-&gt;hw.rambase +</div><div class='ctx'> 				  RX_BD_ADDR(ch, chan-&gt;rx_first_bd));</div><div class='hunk'>@@ -563,8 +561,8 @@ static int dma_buf_read(pc300_t * card, int ch, struct sk_buff *skb)</div><div class='ctx'> static void tx_dma_stop(pc300_t * card, int ch)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *scabase = card-&gt;hw.scabase;</div><div class='del'>-	ucchar drr_ena_bit = 1 &lt;&lt; (5 + 2 * ch);</div><div class='del'>-	ucchar drr_rst_bit = 1 &lt;&lt; (1 + 2 * ch);</div><div class='add'>+	u8 drr_ena_bit = 1 &lt;&lt; (5 + 2 * ch);</div><div class='add'>+	u8 drr_rst_bit = 1 &lt;&lt; (1 + 2 * ch);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable DMA */</div><div class='ctx'> 	cpc_writeb(scabase + DRR, drr_ena_bit);</div><div class='hunk'>@@ -574,8 +572,8 @@ static void tx_dma_stop(pc300_t * card, int ch)</div><div class='ctx'> static void rx_dma_stop(pc300_t * card, int ch)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *scabase = card-&gt;hw.scabase;</div><div class='del'>-	ucchar drr_ena_bit = 1 &lt;&lt; (4 + 2 * ch);</div><div class='del'>-	ucchar drr_rst_bit = 1 &lt;&lt; (2 * ch);</div><div class='add'>+	u8 drr_ena_bit = 1 &lt;&lt; (4 + 2 * ch);</div><div class='add'>+	u8 drr_rst_bit = 1 &lt;&lt; (2 * ch);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable DMA */</div><div class='ctx'> 	cpc_writeb(scabase + DRR, drr_ena_bit);</div><div class='hunk'>@@ -607,7 +605,7 @@ static void rx_dma_start(pc300_t * card, int ch)</div><div class='ctx'> /*************************/</div><div class='ctx'> /***   FALC Routines   ***/</div><div class='ctx'> /*************************/</div><div class='del'>-static void falc_issue_cmd(pc300_t * card, int ch, ucchar cmd)</div><div class='add'>+static void falc_issue_cmd(pc300_t *card, int ch, u8 cmd)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *falcbase = card-&gt;hw.falcbase;</div><div class='ctx'> 	unsigned long i = 0;</div><div class='hunk'>@@ -675,7 +673,7 @@ static void falc_intr_enable(pc300_t * card, int ch)</div><div class='ctx'> static void falc_open_timeslot(pc300_t * card, int ch, int timeslot)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *falcbase = card-&gt;hw.falcbase;</div><div class='del'>-	ucchar tshf = card-&gt;chan[ch].falc.offset;</div><div class='add'>+	u8 tshf = card-&gt;chan[ch].falc.offset;</div><div class='ctx'> </div><div class='ctx'> 	cpc_writeb(falcbase + F_REG((ICB1 + (timeslot - tshf) / 8), ch),</div><div class='ctx'> 		   cpc_readb(falcbase + F_REG((ICB1 + (timeslot - tshf) / 8), ch)) &amp; </div><div class='hunk'>@@ -691,7 +689,7 @@ static void falc_open_timeslot(pc300_t * card, int ch, int timeslot)</div><div class='ctx'> static void falc_close_timeslot(pc300_t * card, int ch, int timeslot)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *falcbase = card-&gt;hw.falcbase;</div><div class='del'>-	ucchar tshf = card-&gt;chan[ch].falc.offset;</div><div class='add'>+	u8 tshf = card-&gt;chan[ch].falc.offset;</div><div class='ctx'> </div><div class='ctx'> 	cpc_writeb(falcbase + F_REG((ICB1 + (timeslot - tshf) / 8), ch),</div><div class='ctx'> 		   cpc_readb(falcbase + F_REG((ICB1 + (timeslot - tshf) / 8), ch)) | </div><div class='hunk'>@@ -812,7 +810,7 @@ static void falc_init_t1(pc300_t * card, int ch)</div><div class='ctx'> 	pc300chconf_t *conf = (pc300chconf_t *) &amp; chan-&gt;conf;</div><div class='ctx'> 	falc_t *pfalc = (falc_t *) &amp; chan-&gt;falc;</div><div class='ctx'> 	void __iomem *falcbase = card-&gt;hw.falcbase;</div><div class='del'>-	ucchar dja = (ch ? (LIM2_DJA2 | LIM2_DJA1) : 0);</div><div class='add'>+	u8 dja = (ch ? (LIM2_DJA2 | LIM2_DJA1) : 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Switch to T1 mode (PCM 24) */</div><div class='ctx'> 	cpc_writeb(falcbase + F_REG(FMR1, ch), FMR1_PMOD);</div><div class='hunk'>@@ -981,7 +979,7 @@ static void falc_init_e1(pc300_t * card, int ch)</div><div class='ctx'> 	pc300chconf_t *conf = (pc300chconf_t *) &amp; chan-&gt;conf;</div><div class='ctx'> 	falc_t *pfalc = (falc_t *) &amp; chan-&gt;falc;</div><div class='ctx'> 	void __iomem *falcbase = card-&gt;hw.falcbase;</div><div class='del'>-	ucchar dja = (ch ? (LIM2_DJA2 | LIM2_DJA1) : 0);</div><div class='add'>+	u8 dja = (ch ? (LIM2_DJA2 | LIM2_DJA1) : 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Switch to E1 mode (PCM 30) */</div><div class='ctx'> 	cpc_writeb(falcbase + F_REG(FMR1, ch),</div><div class='hunk'>@@ -1187,7 +1185,7 @@ static void te_config(pc300_t * card, int ch)</div><div class='ctx'> 	pc300chconf_t *conf = (pc300chconf_t *) &amp; chan-&gt;conf;</div><div class='ctx'> 	falc_t *pfalc = (falc_t *) &amp; chan-&gt;falc;</div><div class='ctx'> 	void __iomem *falcbase = card-&gt;hw.falcbase;</div><div class='del'>-	ucchar dummy;</div><div class='add'>+	u8 dummy;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	memset(pfalc, 0, sizeof(falc_t));</div><div class='hunk'>@@ -1403,7 +1401,7 @@ static void falc_update_stats(pc300_t * card, int ch)</div><div class='ctx'> 	pc300chconf_t *conf = (pc300chconf_t *) &amp; chan-&gt;conf;</div><div class='ctx'> 	falc_t *pfalc = (falc_t *) &amp; chan-&gt;falc;</div><div class='ctx'> 	void __iomem *falcbase = card-&gt;hw.falcbase;</div><div class='del'>-	ucshort counter;</div><div class='add'>+	u16 counter;</div><div class='ctx'> </div><div class='ctx'> 	counter = cpc_readb(falcbase + F_REG(FECL, ch));</div><div class='ctx'> 	counter |= cpc_readb(falcbase + F_REG(FECH, ch)) &lt;&lt; 8;</div><div class='hunk'>@@ -1729,7 +1727,7 @@ static void falc_pattern_test(pc300_t * card, int ch, unsigned int activate)</div><div class='ctx'>  * Description:	This routine returns the bit error counter value</div><div class='ctx'>  *----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='del'>-static ucshort falc_pattern_test_error(pc300_t * card, int ch)</div><div class='add'>+static u16 falc_pattern_test_error(pc300_t * card, int ch)</div><div class='ctx'> {</div><div class='ctx'> 	pc300ch_t *chan = (pc300ch_t *) &amp; card-&gt;chan[ch];</div><div class='ctx'> 	falc_t *pfalc = (falc_t *) &amp; chan-&gt;falc;</div><div class='hunk'>@@ -1776,7 +1774,7 @@ static void cpc_tx_timeout(struct net_device *dev)</div><div class='ctx'> 	pc300_t *card = (pc300_t *) chan-&gt;card;</div><div class='ctx'> 	int ch = chan-&gt;channel;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	ucchar ilar;</div><div class='add'>+	u8 ilar;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;stats.tx_errors++;</div><div class='ctx'> 	dev-&gt;stats.tx_aborted_errors++;</div><div class='hunk'>@@ -1807,11 +1805,7 @@ static int cpc_queue_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (chan-&gt;conf.monitor) {</div><div class='del'>-		/* In monitor mode no Tx is done: ignore packet */</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		return 0;</div><div class='del'>-	} else if (!netif_carrier_ok(dev)) {</div><div class='add'>+	if (!netif_carrier_ok(dev)) {</div><div class='ctx'> 		/* DCD must be OFF: drop packet */</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		dev-&gt;stats.tx_errors++;</div><div class='hunk'>@@ -1836,7 +1830,7 @@ static int cpc_queue_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Write buffer to DMA buffers */</div><div class='del'>-	if (dma_buf_write(card, ch, (ucchar *) skb-&gt;data, skb-&gt;len) != 0) {</div><div class='add'>+	if (dma_buf_write(card, ch, (u8 *)skb-&gt;data, skb-&gt;len) != 0) {</div><div class='ctx'> //		printk("%s: write error. Dropping TX packet.\n", dev-&gt;name);</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='hunk'>@@ -2001,7 +1995,7 @@ static void sca_tx_intr(pc300dev_t *dev)</div><div class='ctx'> static void sca_intr(pc300_t * card)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *scabase = card-&gt;hw.scabase;</div><div class='del'>-	volatile uclong status;</div><div class='add'>+	volatile u32 status;</div><div class='ctx'> 	int ch;</div><div class='ctx'> 	int intr_count = 0;</div><div class='ctx'> 	unsigned char dsr_rx;</div><div class='hunk'>@@ -2016,7 +2010,7 @@ static void sca_intr(pc300_t * card)</div><div class='ctx'> </div><div class='ctx'> 	    /**** Reception ****/</div><div class='ctx'> 			if (status &amp; IR0_DRX((IR0_DMIA | IR0_DMIB), ch)) {</div><div class='del'>-				ucchar drx_stat = cpc_readb(scabase + DSR_RX(ch));</div><div class='add'>+				u8 drx_stat = cpc_readb(scabase + DSR_RX(ch));</div><div class='ctx'> </div><div class='ctx'> 				/* Clear RX interrupts */</div><div class='ctx'> 				cpc_writeb(scabase + DSR_RX(ch), drx_stat | DSR_DWE);</div><div class='hunk'>@@ -2090,7 +2084,7 @@ static void sca_intr(pc300_t * card)</div><div class='ctx'> </div><div class='ctx'> 	    /**** Transmission ****/</div><div class='ctx'> 			if (status &amp; IR0_DTX((IR0_EFT | IR0_DMIA | IR0_DMIB), ch)) {</div><div class='del'>-				ucchar dtx_stat = cpc_readb(scabase + DSR_TX(ch));</div><div class='add'>+				u8 dtx_stat = cpc_readb(scabase + DSR_TX(ch));</div><div class='ctx'> </div><div class='ctx'> 				/* Clear TX interrupts */</div><div class='ctx'> 				cpc_writeb(scabase + DSR_TX(ch), dtx_stat | DSR_DWE);</div><div class='hunk'>@@ -2134,7 +2128,7 @@ static void sca_intr(pc300_t * card)</div><div class='ctx'> </div><div class='ctx'> 	    /**** MSCI ****/</div><div class='ctx'> 			if (status &amp; IR0_M(IR0_RXINTA, ch)) {</div><div class='del'>-				ucchar st1 = cpc_readb(scabase + M_REG(ST1, ch));</div><div class='add'>+				u8 st1 = cpc_readb(scabase + M_REG(ST1, ch));</div><div class='ctx'> </div><div class='ctx'> 				/* Clear MSCI interrupts */</div><div class='ctx'> 				cpc_writeb(scabase + M_REG(ST1, ch), st1);</div><div class='hunk'>@@ -2176,7 +2170,7 @@ static void sca_intr(pc300_t * card)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void falc_t1_loop_detection(pc300_t * card, int ch, ucchar frs1)</div><div class='add'>+static void falc_t1_loop_detection(pc300_t *card, int ch, u8 frs1)</div><div class='ctx'> {</div><div class='ctx'> 	pc300ch_t *chan = (pc300ch_t *) &amp; card-&gt;chan[ch];</div><div class='ctx'> 	falc_t *pfalc = (falc_t *) &amp; chan-&gt;falc;</div><div class='hunk'>@@ -2201,7 +2195,7 @@ static void falc_t1_loop_detection(pc300_t * card, int ch, ucchar frs1)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void falc_e1_loop_detection(pc300_t * card, int ch, ucchar rsp)</div><div class='add'>+static void falc_e1_loop_detection(pc300_t *card, int ch, u8 rsp)</div><div class='ctx'> {</div><div class='ctx'> 	pc300ch_t *chan = (pc300ch_t *) &amp; card-&gt;chan[ch];</div><div class='ctx'> 	falc_t *pfalc = (falc_t *) &amp; chan-&gt;falc;</div><div class='hunk'>@@ -2231,8 +2225,8 @@ static void falc_t1_intr(pc300_t * card, int ch)</div><div class='ctx'> 	pc300ch_t *chan = (pc300ch_t *) &amp; card-&gt;chan[ch];</div><div class='ctx'> 	falc_t *pfalc = (falc_t *) &amp; chan-&gt;falc;</div><div class='ctx'> 	void __iomem *falcbase = card-&gt;hw.falcbase;</div><div class='del'>-	ucchar isr0, isr3, gis;</div><div class='del'>-	ucchar dummy;</div><div class='add'>+	u8 isr0, isr3, gis;</div><div class='add'>+	u8 dummy;</div><div class='ctx'> </div><div class='ctx'> 	while ((gis = cpc_readb(falcbase + F_REG(GIS, ch))) != 0) {</div><div class='ctx'> 		if (gis &amp; GIS_ISR0) {</div><div class='hunk'>@@ -2278,8 +2272,8 @@ static void falc_e1_intr(pc300_t * card, int ch)</div><div class='ctx'> 	pc300ch_t *chan = (pc300ch_t *) &amp; card-&gt;chan[ch];</div><div class='ctx'> 	falc_t *pfalc = (falc_t *) &amp; chan-&gt;falc;</div><div class='ctx'> 	void __iomem *falcbase = card-&gt;hw.falcbase;</div><div class='del'>-	ucchar isr1, isr2, isr3, gis, rsp;</div><div class='del'>-	ucchar dummy;</div><div class='add'>+	u8 isr1, isr2, isr3, gis, rsp;</div><div class='add'>+	u8 dummy;</div><div class='ctx'> </div><div class='ctx'> 	while ((gis = cpc_readb(falcbase + F_REG(GIS, ch))) != 0) {</div><div class='ctx'> 		rsp = cpc_readb(falcbase + F_REG(RSP, ch));</div><div class='hunk'>@@ -2361,7 +2355,7 @@ static void falc_intr(pc300_t * card)</div><div class='ctx'> static irqreturn_t cpc_intr(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	pc300_t *card = dev_id;</div><div class='del'>-	volatile ucchar plx_status;</div><div class='add'>+	volatile u8 plx_status;</div><div class='ctx'> </div><div class='ctx'> 	if (!card) {</div><div class='ctx'> #ifdef PC300_DEBUG_INTR</div><div class='hunk'>@@ -2400,7 +2394,7 @@ static irqreturn_t cpc_intr(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static void cpc_sca_status(pc300_t * card, int ch)</div><div class='ctx'> {</div><div class='del'>-	ucchar ilar;</div><div class='add'>+	u8 ilar;</div><div class='ctx'> 	void __iomem *scabase = card-&gt;hw.scabase;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -2818,7 +2812,7 @@ static int cpc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int clock_rate_calc(uclong rate, uclong clock, int *br_io)</div><div class='add'>+static int clock_rate_calc(u32 rate, u32 clock, int *br_io)</div><div class='ctx'> {</div><div class='ctx'> 	int br, tc;</div><div class='ctx'> 	int br_pwr, error;</div><div class='hunk'>@@ -2855,12 +2849,12 @@ static int ch_config(pc300dev_t * d)</div><div class='ctx'> 	void __iomem *scabase = card-&gt;hw.scabase;</div><div class='ctx'> 	void __iomem *plxbase = card-&gt;hw.plxbase;</div><div class='ctx'> 	int ch = chan-&gt;channel;</div><div class='del'>-	uclong clkrate = chan-&gt;conf.phys_settings.clock_rate;</div><div class='del'>-	uclong clktype = chan-&gt;conf.phys_settings.clock_type;</div><div class='del'>-	ucshort encoding = chan-&gt;conf.proto_settings.encoding;</div><div class='del'>-	ucshort parity = chan-&gt;conf.proto_settings.parity;   </div><div class='del'>-	ucchar md0, md2;</div><div class='del'>-    </div><div class='add'>+	u32 clkrate = chan-&gt;conf.phys_settings.clock_rate;</div><div class='add'>+	u32 clktype = chan-&gt;conf.phys_settings.clock_type;</div><div class='add'>+	u16 encoding = chan-&gt;conf.proto_settings.encoding;</div><div class='add'>+	u16 parity = chan-&gt;conf.proto_settings.parity;</div><div class='add'>+	u8 md0, md2;</div><div class='add'>+</div><div class='ctx'> 	/* Reset the channel */</div><div class='ctx'> 	cpc_writeb(scabase + M_REG(CMD, ch), CMD_CH_RST);</div><div class='ctx'> </div><div class='hunk'>@@ -3152,19 +3146,10 @@ int cpc_open(struct net_device *dev)</div><div class='ctx'> 	printk("pc300: cpc_open");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef FIXME</div><div class='del'>-	if (hdlc-&gt;proto.id == IF_PROTO_PPP) {</div><div class='del'>-		d-&gt;if_ptr = &amp;hdlc-&gt;state.ppp.pppdev;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	result = hdlc_open(dev);</div><div class='del'>-	if (/* FIXME hdlc-&gt;proto.id == IF_PROTO_PPP*/ 0) {</div><div class='del'>-		dev-&gt;priv = d;</div><div class='del'>-	}</div><div class='del'>-	if (result) {</div><div class='add'>+</div><div class='add'>+	if (result)</div><div class='ctx'> 		return result;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	sprintf(ifr.ifr_name, "%s", dev-&gt;name);</div><div class='ctx'> 	result = cpc_opench(d);</div><div class='hunk'>@@ -3197,9 +3182,7 @@ static int cpc_close(struct net_device *dev)</div><div class='ctx'> 	CPC_UNLOCK(card, flags);</div><div class='ctx'> </div><div class='ctx'> 	hdlc_close(dev);</div><div class='del'>-	if (/* FIXME hdlc-&gt;proto.id == IF_PROTO_PPP*/ 0) {</div><div class='del'>-		d-&gt;if_ptr = NULL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PC300_MLPPP</div><div class='ctx'> 	if (chan-&gt;conf.proto == PC300_PROTO_MLPPP) {</div><div class='ctx'> 		cpc_tty_unregister_service(d);</div><div class='hunk'>@@ -3210,16 +3193,16 @@ static int cpc_close(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static uclong detect_ram(pc300_t * card)</div><div class='add'>+static u32 detect_ram(pc300_t * card)</div><div class='ctx'> {</div><div class='del'>-	uclong i;</div><div class='del'>-	ucchar data;</div><div class='add'>+	u32 i;</div><div class='add'>+	u8 data;</div><div class='ctx'> 	void __iomem *rambase = card-&gt;hw.rambase;</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;hw.ramsize = PC300_RAMSIZE;</div><div class='ctx'> 	/* Let's find out how much RAM is present on this board */</div><div class='ctx'> 	for (i = 0; i &lt; card-&gt;hw.ramsize; i++) {</div><div class='del'>-		data = (ucchar) (i &amp; 0xff);</div><div class='add'>+		data = (u8)(i &amp; 0xff);</div><div class='ctx'> 		cpc_writeb(rambase + i, data);</div><div class='ctx'> 		if (cpc_readb(rambase + i) != data) {</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -3296,7 +3279,7 @@ static void cpc_init_card(pc300_t * card)</div><div class='ctx'> 	cpc_writeb(card-&gt;hw.scabase + DMER, 0x80);</div><div class='ctx'> </div><div class='ctx'> 	if (card-&gt;hw.type == PC300_TE) {</div><div class='del'>-		ucchar reg1;</div><div class='add'>+		u8 reg1;</div><div class='ctx'> </div><div class='ctx'> 		/* Check CPLD version */</div><div class='ctx'> 		reg1 = cpc_readb(card-&gt;hw.falcbase + CPLD_REG1);</div><div class='hunk'>@@ -3360,7 +3343,6 @@ static void cpc_init_card(pc300_t * card)</div><div class='ctx'> 		chan-&gt;nfree_tx_bd = N_DMA_TX_BUF;</div><div class='ctx'> </div><div class='ctx'> 		d-&gt;chan = chan;</div><div class='del'>-		d-&gt;tx_skb = NULL;</div><div class='ctx'> 		d-&gt;trace_on = 0;</div><div class='ctx'> 		d-&gt;line_on = 0;</div><div class='ctx'> 		d-&gt;line_off = 0;</div><div class='hunk'>@@ -3431,7 +3413,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	static int first_time = 1;</div><div class='ctx'> 	int err, eeprom_outdated = 0;</div><div class='del'>-	ucshort device_id;</div><div class='add'>+	u16 device_id;</div><div class='ctx'> 	pc300_t *card;</div><div class='ctx'> </div><div class='ctx'> 	if (first_time) {</div><div class='head'>diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c<br/>index e59255a155a9..6596cd0742b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/sbni.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/sbni.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/sbni.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/sbni.c</a></div><div class='hunk'>@@ -1317,7 +1317,7 @@ sbni_ioctl( struct net_device  *dev,  struct ifreq  *ifr,  int  cmd )</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case  SIOCDEVRESINSTATS :</div><div class='del'>-		if( current-&gt;euid != 0 )	/* root only */</div><div class='add'>+		if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 			return  -EPERM;</div><div class='ctx'> 		memset( &amp;nl-&gt;in_stats, 0, sizeof(struct sbni_in_stats) );</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1334,7 +1334,7 @@ sbni_ioctl( struct net_device  *dev,  struct ifreq  *ifr,  int  cmd )</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case  SIOCDEVSHWSTATE :</div><div class='del'>-		if( current-&gt;euid != 0 )	/* root only */</div><div class='add'>+		if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 			return  -EPERM;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock( &amp;nl-&gt;lock );</div><div class='hunk'>@@ -1355,7 +1355,7 @@ sbni_ioctl( struct net_device  *dev,  struct ifreq  *ifr,  int  cmd )</div><div class='ctx'> #ifdef CONFIG_SBNI_MULTILINE</div><div class='ctx'> </div><div class='ctx'> 	case  SIOCDEVENSLAVE :</div><div class='del'>-		if( current-&gt;euid != 0 )	/* root only */</div><div class='add'>+		if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 			return  -EPERM;</div><div class='ctx'> </div><div class='ctx'> 		if (copy_from_user( slave_name, ifr-&gt;ifr_data, sizeof slave_name ))</div><div class='hunk'>@@ -1370,7 +1370,7 @@ sbni_ioctl( struct net_device  *dev,  struct ifreq  *ifr,  int  cmd )</div><div class='ctx'> 		return  enslave( dev, slave_dev );</div><div class='ctx'> </div><div class='ctx'> 	case  SIOCDEVEMANSIPATE :</div><div class='del'>-		if( current-&gt;euid != 0 )	/* root only */</div><div class='add'>+		if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 			return  -EPERM;</div><div class='ctx'> </div><div class='ctx'> 		return  emancipate( dev );</div><div class='head'>diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c<br/>index 44a89df1b8bf..c0235844a4d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/sealevel.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/sealevel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/sealevel.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/sealevel.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	(c) Copyright 1999, 2001 Alan Cox</div><div class='ctx'>  *	(c) Copyright 2001 Red Hat Inc.</div><div class='add'>+ *	Generic HDLC port Copyright (C) 2008 Krzysztof Halasa &lt;khc@pm.waw.pl&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -19,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/hdlc.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='hunk'>@@ -27,22 +29,19 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;net/syncppp.h&gt;</div><div class='ctx'> #include "z85230.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct slvl_device</div><div class='ctx'> {</div><div class='del'>-	void *if_ptr;	/* General purpose pointer (used by SPPP) */</div><div class='ctx'> 	struct z8530_channel *chan;</div><div class='del'>-	struct ppp_device pppdev;</div><div class='ctx'> 	int channel;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct slvl_board</div><div class='ctx'> {</div><div class='del'>-	struct slvl_device *dev[2];</div><div class='add'>+	struct slvl_device dev[2];</div><div class='ctx'> 	struct z8530_dev board;</div><div class='ctx'> 	int iobase;</div><div class='ctx'> };</div><div class='hunk'>@@ -51,72 +50,69 @@ struct slvl_board</div><div class='ctx'>  *	Network driver support routines</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static inline struct slvl_device* dev_to_chan(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return (struct slvl_device *)dev_to_hdlc(dev)-&gt;priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- *	Frame receive. Simple for our card as we do sync ppp and there</div><div class='add'>+ *	Frame receive. Simple for our card as we do HDLC and there</div><div class='ctx'>  *	is no funny garbage involved</div><div class='ctx'>  */</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static void sealevel_input(struct z8530_channel *c, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	/* Drop the CRC - it's not a good idea to try and negotiate it ;) */</div><div class='del'>-	skb_trim(skb, skb-&gt;len-2);</div><div class='del'>-	skb-&gt;protocol=htons(ETH_P_WAN_PPP);</div><div class='add'>+	skb_trim(skb, skb-&gt;len - 2);</div><div class='add'>+	skb-&gt;protocol = hdlc_type_trans(skb, c-&gt;netdevice);</div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='del'>-	skb-&gt;dev=c-&gt;netdevice;</div><div class='del'>-	/*</div><div class='del'>-	 *	Send it to the PPP layer. We don't have time to process</div><div class='del'>-	 *	it right now.</div><div class='del'>-	 */</div><div class='add'>+	skb-&gt;dev = c-&gt;netdevice;</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> 	c-&gt;netdevice-&gt;last_rx = jiffies;</div><div class='ctx'> }</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	We've been placed in the UP state</div><div class='del'>- */ </div><div class='del'>- </div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> static int sealevel_open(struct net_device *d)</div><div class='ctx'> {</div><div class='del'>-	struct slvl_device *slvl=d-&gt;priv;</div><div class='add'>+	struct slvl_device *slvl = dev_to_chan(d);</div><div class='ctx'> 	int err = -1;</div><div class='ctx'> 	int unit = slvl-&gt;channel;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 *	Link layer up. </div><div class='add'>+	 *	Link layer up.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	switch(unit)</div><div class='add'>+	switch (unit)</div><div class='ctx'> 	{</div><div class='ctx'> 		case 0:</div><div class='del'>-			err=z8530_sync_dma_open(d, slvl-&gt;chan);</div><div class='add'>+			err = z8530_sync_dma_open(d, slvl-&gt;chan);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 1:</div><div class='del'>-			err=z8530_sync_open(d, slvl-&gt;chan);</div><div class='add'>+			err = z8530_sync_open(d, slvl-&gt;chan);</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='del'>-	if(err)</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	/*</div><div class='del'>-	 *	Begin PPP</div><div class='del'>-	 */</div><div class='del'>-	err=sppp_open(d);</div><div class='del'>-	if(err)</div><div class='del'>-	{</div><div class='del'>-		switch(unit)</div><div class='del'>-		{</div><div class='add'>+</div><div class='add'>+	err = hdlc_open(d);</div><div class='add'>+	if (err) {</div><div class='add'>+		switch (unit) {</div><div class='ctx'> 			case 0:</div><div class='ctx'> 				z8530_sync_dma_close(d, slvl-&gt;chan);</div><div class='ctx'> 				break;</div><div class='ctx'> 			case 1:</div><div class='ctx'> 				z8530_sync_close(d, slvl-&gt;chan);</div><div class='ctx'> 				break;</div><div class='del'>-		}				</div><div class='add'>+		}</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='del'>-	slvl-&gt;chan-&gt;rx_function=sealevel_input;</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+	slvl-&gt;chan-&gt;rx_function = sealevel_input;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Go go go</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -126,26 +122,19 @@ static int sealevel_open(struct net_device *d)</div><div class='ctx'> </div><div class='ctx'> static int sealevel_close(struct net_device *d)</div><div class='ctx'> {</div><div class='del'>-	struct slvl_device *slvl=d-&gt;priv;</div><div class='add'>+	struct slvl_device *slvl = dev_to_chan(d);</div><div class='ctx'> 	int unit = slvl-&gt;channel;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Discard new frames</div><div class='ctx'> 	 */</div><div class='del'>-	</div><div class='del'>-	slvl-&gt;chan-&gt;rx_function=z8530_null_rx;</div><div class='del'>-		</div><div class='del'>-	/*</div><div class='del'>-	 *	PPP off</div><div class='del'>-	 */</div><div class='del'>-	sppp_close(d);</div><div class='del'>-	/*</div><div class='del'>-	 *	Link layer down</div><div class='del'>-	 */</div><div class='ctx'> </div><div class='add'>+	slvl-&gt;chan-&gt;rx_function = z8530_null_rx;</div><div class='add'>+</div><div class='add'>+	hdlc_close(d);</div><div class='ctx'> 	netif_stop_queue(d);</div><div class='del'>-		</div><div class='del'>-	switch(unit)</div><div class='add'>+</div><div class='add'>+	switch (unit)</div><div class='ctx'> 	{</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			z8530_sync_dma_close(d, slvl-&gt;chan);</div><div class='hunk'>@@ -159,210 +148,153 @@ static int sealevel_close(struct net_device *d)</div><div class='ctx'> </div><div class='ctx'> static int sealevel_ioctl(struct net_device *d, struct ifreq *ifr, int cmd)</div><div class='ctx'> {</div><div class='del'>-	/* struct slvl_device *slvl=d-&gt;priv;</div><div class='add'>+	/* struct slvl_device *slvl=dev_to_chan(d);</div><div class='ctx'> 	   z8530_ioctl(d,&amp;slvl-&gt;sync.chanA,ifr,cmd) */</div><div class='del'>-	return sppp_do_ioctl(d, ifr,cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct net_device_stats *sealevel_get_stats(struct net_device *d)</div><div class='del'>-{</div><div class='del'>-	struct slvl_device *slvl=d-&gt;priv;</div><div class='del'>-	if(slvl)</div><div class='del'>-		return z8530_get_stats(slvl-&gt;chan);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='add'>+	return hdlc_ioctl(d, ifr, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *	Passed PPP frames, fire them downwind.</div><div class='add'>+ *	Passed network frames, fire them downwind.</div><div class='ctx'>  */</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static int sealevel_queue_xmit(struct sk_buff *skb, struct net_device *d)</div><div class='ctx'> {</div><div class='del'>-	struct slvl_device *slvl=d-&gt;priv;</div><div class='del'>-	return z8530_queue_xmit(slvl-&gt;chan, skb);</div><div class='add'>+	return z8530_queue_xmit(dev_to_chan(d)-&gt;chan, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sealevel_neigh_setup(struct neighbour *n)</div><div class='add'>+static int sealevel_attach(struct net_device *dev, unsigned short encoding,</div><div class='add'>+			   unsigned short parity)</div><div class='ctx'> {</div><div class='del'>-	if (n-&gt;nud_state == NUD_NONE) {</div><div class='del'>-		n-&gt;ops = &amp;arp_broken_ops;</div><div class='del'>-		n-&gt;output = n-&gt;ops-&gt;output;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	if (encoding == ENCODING_NRZ &amp;&amp; parity == PARITY_CRC16_PR1_CCITT)</div><div class='add'>+		return 0;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sealevel_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p)</div><div class='add'>+static int slvl_setup(struct slvl_device *sv, int iobase, int irq)</div><div class='ctx'> {</div><div class='del'>-	if (p-&gt;tbl-&gt;family == AF_INET) {</div><div class='del'>-		p-&gt;neigh_setup = sealevel_neigh_setup;</div><div class='del'>-		p-&gt;ucast_probes = 0;</div><div class='del'>-		p-&gt;mcast_probes = 0;</div><div class='add'>+	struct net_device *dev = alloc_hdlcdev(sv);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	dev_to_hdlc(dev)-&gt;attach = sealevel_attach;</div><div class='add'>+	dev_to_hdlc(dev)-&gt;xmit = sealevel_queue_xmit;</div><div class='add'>+	dev-&gt;open = sealevel_open;</div><div class='add'>+	dev-&gt;stop = sealevel_close;</div><div class='add'>+	dev-&gt;do_ioctl = sealevel_ioctl;</div><div class='add'>+	dev-&gt;base_addr = iobase;</div><div class='add'>+	dev-&gt;irq = irq;</div><div class='add'>+</div><div class='add'>+	if (register_hdlc_device(dev)) {</div><div class='add'>+		printk(KERN_ERR "sealevel: unable to register HDLC device\n");</div><div class='add'>+		free_netdev(dev);</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int sealevel_attach(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct slvl_device *sv = dev-&gt;priv;</div><div class='del'>-	sppp_attach(&amp;sv-&gt;pppdev);</div><div class='add'>+	sv-&gt;chan-&gt;netdevice = dev;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sealevel_detach(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	sppp_detach(dev);</div><div class='del'>-}</div><div class='del'>-		</div><div class='del'>-static void slvl_setup(struct net_device *d)</div><div class='del'>-{</div><div class='del'>-	d-&gt;open = sealevel_open;</div><div class='del'>-	d-&gt;stop = sealevel_close;</div><div class='del'>-	d-&gt;init = sealevel_attach;</div><div class='del'>-	d-&gt;uninit = sealevel_detach;</div><div class='del'>-	d-&gt;hard_start_xmit = sealevel_queue_xmit;</div><div class='del'>-	d-&gt;get_stats = sealevel_get_stats;</div><div class='del'>-	d-&gt;set_multicast_list = NULL;</div><div class='del'>-	d-&gt;do_ioctl = sealevel_ioctl;</div><div class='del'>-	d-&gt;neigh_setup = sealevel_neigh_setup_dev;</div><div class='del'>-	d-&gt;set_mac_address = NULL;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct slvl_device *slvl_alloc(int iobase, int irq)</div><div class='del'>-{</div><div class='del'>-	struct net_device *d;</div><div class='del'>-	struct slvl_device *sv;</div><div class='del'>-</div><div class='del'>-	d = alloc_netdev(sizeof(struct slvl_device), "hdlc%d",</div><div class='del'>-			 slvl_setup);</div><div class='del'>-</div><div class='del'>-	if (!d) </div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	sv = d-&gt;priv;</div><div class='del'>-	d-&gt;ml_priv = sv;</div><div class='del'>-	sv-&gt;if_ptr = &amp;sv-&gt;pppdev;</div><div class='del'>-	sv-&gt;pppdev.dev = d;</div><div class='del'>-	d-&gt;base_addr = iobase;</div><div class='del'>-	d-&gt;irq = irq;</div><div class='del'>-		</div><div class='del'>-	return sv;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Allocate and setup Sealevel board.</div><div class='ctx'>  */</div><div class='del'>- </div><div class='del'>-static __init struct slvl_board *slvl_init(int iobase, int irq, </div><div class='add'>+</div><div class='add'>+static __init struct slvl_board *slvl_init(int iobase, int irq,</div><div class='ctx'> 					   int txdma, int rxdma, int slow)</div><div class='ctx'> {</div><div class='ctx'> 	struct z8530_dev *dev;</div><div class='ctx'> 	struct slvl_board *b;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Get the needed I/O space</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if(!request_region(iobase, 8, "Sealevel 4021")) </div><div class='del'>-	{	</div><div class='del'>-		printk(KERN_WARNING "sealevel: I/O 0x%X already in use.\n", iobase);</div><div class='add'>+	if (!request_region(iobase, 8, "Sealevel 4021")) {</div><div class='add'>+		printk(KERN_WARNING "sealevel: I/O 0x%X already in use.\n",</div><div class='add'>+		       iobase);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='del'>-	b = kzalloc(sizeof(struct slvl_board), GFP_KERNEL);</div><div class='del'>-	if(!b)</div><div class='del'>-		goto fail3;</div><div class='ctx'> </div><div class='del'>-	if (!(b-&gt;dev[0]= slvl_alloc(iobase, irq)))</div><div class='del'>-		goto fail2;</div><div class='add'>+	b = kzalloc(sizeof(struct slvl_board), GFP_KERNEL);</div><div class='add'>+	if (!b)</div><div class='add'>+		goto err_kzalloc;</div><div class='ctx'> </div><div class='del'>-	b-&gt;dev[0]-&gt;chan = &amp;b-&gt;board.chanA;	</div><div class='del'>-	b-&gt;dev[0]-&gt;channel = 0;</div><div class='del'>-	</div><div class='del'>-	if (!(b-&gt;dev[1] = slvl_alloc(iobase, irq)))</div><div class='del'>-		goto fail1_0;</div><div class='add'>+	b-&gt;dev[0].chan = &amp;b-&gt;board.chanA;</div><div class='add'>+	b-&gt;dev[0].channel = 0;</div><div class='ctx'> </div><div class='del'>-	b-&gt;dev[1]-&gt;chan = &amp;b-&gt;board.chanB;</div><div class='del'>-	b-&gt;dev[1]-&gt;channel = 1;</div><div class='add'>+	b-&gt;dev[1].chan = &amp;b-&gt;board.chanB;</div><div class='add'>+	b-&gt;dev[1].channel = 1;</div><div class='ctx'> </div><div class='ctx'> 	dev = &amp;b-&gt;board;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Stuff in the I/O addressing</div><div class='ctx'> 	 */</div><div class='del'>-	 </div><div class='add'>+</div><div class='ctx'> 	dev-&gt;active = 0;</div><div class='ctx'> </div><div class='ctx'> 	b-&gt;iobase = iobase;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Select 8530 delays for the old board</div><div class='ctx'> 	 */</div><div class='del'>-	 </div><div class='del'>-	if(slow)</div><div class='add'>+</div><div class='add'>+	if (slow)</div><div class='ctx'> 		iobase |= Z8530_PORT_SLEEP;</div><div class='del'>-		</div><div class='del'>-	dev-&gt;chanA.ctrlio=iobase+1;</div><div class='del'>-	dev-&gt;chanA.dataio=iobase;</div><div class='del'>-	dev-&gt;chanB.ctrlio=iobase+3;</div><div class='del'>-	dev-&gt;chanB.dataio=iobase+2;</div><div class='del'>-	</div><div class='del'>-	dev-&gt;chanA.irqs=&amp;z8530_nop;</div><div class='del'>-	dev-&gt;chanB.irqs=&amp;z8530_nop;</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+	dev-&gt;chanA.ctrlio = iobase + 1;</div><div class='add'>+	dev-&gt;chanA.dataio = iobase;</div><div class='add'>+	dev-&gt;chanB.ctrlio = iobase + 3;</div><div class='add'>+	dev-&gt;chanB.dataio = iobase + 2;</div><div class='add'>+</div><div class='add'>+	dev-&gt;chanA.irqs = &amp;z8530_nop;</div><div class='add'>+	dev-&gt;chanB.irqs = &amp;z8530_nop;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Assert DTR enable DMA</div><div class='ctx'> 	 */</div><div class='del'>-	 </div><div class='del'>-	outb(3|(1&lt;&lt;7), b-&gt;iobase+4);	</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+	outb(3 | (1 &lt;&lt; 7), b-&gt;iobase + 4);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	/* We want a fast IRQ for this device. Actually we'd like an even faster</div><div class='ctx'> 	   IRQ ;) - This is one driver RtLinux is made for */</div><div class='del'>-   </div><div class='del'>-	if(request_irq(irq, &amp;z8530_interrupt, IRQF_DISABLED, "SeaLevel", dev)&lt;0)</div><div class='del'>-	{</div><div class='add'>+</div><div class='add'>+	if (request_irq(irq, &amp;z8530_interrupt, IRQF_DISABLED,</div><div class='add'>+			"SeaLevel", dev) &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING "sealevel: IRQ %d already in use.\n", irq);</div><div class='del'>-		goto fail1_1;</div><div class='add'>+		goto err_request_irq;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='del'>-	dev-&gt;irq=irq;</div><div class='del'>-	dev-&gt;chanA.private=&amp;b-&gt;dev[0];</div><div class='del'>-	dev-&gt;chanB.private=&amp;b-&gt;dev[1];</div><div class='del'>-	dev-&gt;chanA.netdevice=b-&gt;dev[0]-&gt;pppdev.dev;</div><div class='del'>-	dev-&gt;chanB.netdevice=b-&gt;dev[1]-&gt;pppdev.dev;</div><div class='del'>-	dev-&gt;chanA.dev=dev;</div><div class='del'>-	dev-&gt;chanB.dev=dev;</div><div class='del'>-</div><div class='del'>-	dev-&gt;chanA.txdma=3;</div><div class='del'>-	dev-&gt;chanA.rxdma=1;</div><div class='del'>-	if(request_dma(dev-&gt;chanA.txdma, "SeaLevel (TX)")!=0)</div><div class='del'>-		goto fail;</div><div class='del'>-		</div><div class='del'>-	if(request_dma(dev-&gt;chanA.rxdma, "SeaLevel (RX)")!=0)</div><div class='del'>-		goto dmafail;</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+	dev-&gt;irq = irq;</div><div class='add'>+	dev-&gt;chanA.private = &amp;b-&gt;dev[0];</div><div class='add'>+	dev-&gt;chanB.private = &amp;b-&gt;dev[1];</div><div class='add'>+	dev-&gt;chanA.dev = dev;</div><div class='add'>+	dev-&gt;chanB.dev = dev;</div><div class='add'>+</div><div class='add'>+	dev-&gt;chanA.txdma = 3;</div><div class='add'>+	dev-&gt;chanA.rxdma = 1;</div><div class='add'>+	if (request_dma(dev-&gt;chanA.txdma, "SeaLevel (TX)"))</div><div class='add'>+		goto err_dma_tx;</div><div class='add'>+</div><div class='add'>+	if (request_dma(dev-&gt;chanA.rxdma, "SeaLevel (RX)"))</div><div class='add'>+		goto err_dma_rx;</div><div class='add'>+</div><div class='ctx'> 	disable_irq(irq);</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Begin normal initialise</div><div class='ctx'> 	 */</div><div class='del'>-	 </div><div class='del'>-	if(z8530_init(dev)!=0)</div><div class='del'>-	{</div><div class='add'>+</div><div class='add'>+	if (z8530_init(dev) != 0) {</div><div class='ctx'> 		printk(KERN_ERR "Z8530 series device not found.\n");</div><div class='ctx'> 		enable_irq(irq);</div><div class='del'>-		goto dmafail2;</div><div class='add'>+		goto free_hw;</div><div class='ctx'> 	}</div><div class='del'>-	if(dev-&gt;type==Z85C30)</div><div class='del'>-	{</div><div class='add'>+	if (dev-&gt;type == Z85C30) {</div><div class='ctx'> 		z8530_channel_load(&amp;dev-&gt;chanA, z8530_hdlc_kilostream);</div><div class='ctx'> 		z8530_channel_load(&amp;dev-&gt;chanB, z8530_hdlc_kilostream);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='add'>+	} else {</div><div class='ctx'> 		z8530_channel_load(&amp;dev-&gt;chanA, z8530_hdlc_kilostream_85230);</div><div class='ctx'> 		z8530_channel_load(&amp;dev-&gt;chanB, z8530_hdlc_kilostream_85230);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -370,36 +302,31 @@ static __init struct slvl_board *slvl_init(int iobase, int irq,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Now we can take the IRQ</div><div class='ctx'> 	 */</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	enable_irq(irq);</div><div class='ctx'> </div><div class='del'>-	if (register_netdev(b-&gt;dev[0]-&gt;pppdev.dev)) </div><div class='del'>-		goto dmafail2;</div><div class='del'>-		</div><div class='del'>-	if (register_netdev(b-&gt;dev[1]-&gt;pppdev.dev)) </div><div class='del'>-		goto fail_unit;</div><div class='add'>+	if (slvl_setup(&amp;b-&gt;dev[0], iobase, irq))</div><div class='add'>+		goto free_hw;</div><div class='add'>+	if (slvl_setup(&amp;b-&gt;dev[1], iobase, irq))</div><div class='add'>+		goto free_netdev0;</div><div class='ctx'> </div><div class='ctx'> 	z8530_describe(dev, "I/O", iobase);</div><div class='del'>-	dev-&gt;active=1;</div><div class='add'>+	dev-&gt;active = 1;</div><div class='ctx'> 	return b;</div><div class='ctx'> </div><div class='del'>-fail_unit:</div><div class='del'>-	unregister_netdev(b-&gt;dev[0]-&gt;pppdev.dev);</div><div class='del'>-	</div><div class='del'>-dmafail2:</div><div class='add'>+free_netdev0:</div><div class='add'>+	unregister_hdlc_device(b-&gt;dev[0].chan-&gt;netdevice);</div><div class='add'>+	free_netdev(b-&gt;dev[0].chan-&gt;netdevice);</div><div class='add'>+free_hw:</div><div class='ctx'> 	free_dma(dev-&gt;chanA.rxdma);</div><div class='del'>-dmafail:</div><div class='add'>+err_dma_rx:</div><div class='ctx'> 	free_dma(dev-&gt;chanA.txdma);</div><div class='del'>-fail:</div><div class='add'>+err_dma_tx:</div><div class='ctx'> 	free_irq(irq, dev);</div><div class='del'>-fail1_1:</div><div class='del'>-	free_netdev(b-&gt;dev[1]-&gt;pppdev.dev);</div><div class='del'>-fail1_0:</div><div class='del'>-	free_netdev(b-&gt;dev[0]-&gt;pppdev.dev);</div><div class='del'>-fail2:</div><div class='add'>+err_request_irq:</div><div class='ctx'> 	kfree(b);</div><div class='del'>-fail3:</div><div class='del'>-	release_region(iobase,8);</div><div class='add'>+err_kzalloc:</div><div class='add'>+	release_region(iobase, 8);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -408,14 +335,14 @@ static void __exit slvl_shutdown(struct slvl_board *b)</div><div class='ctx'> 	int u;</div><div class='ctx'> </div><div class='ctx'> 	z8530_shutdown(&amp;b-&gt;board);</div><div class='del'>-	</div><div class='del'>-	for(u=0; u&lt;2; u++)</div><div class='add'>+</div><div class='add'>+	for (u = 0; u &lt; 2; u++)</div><div class='ctx'> 	{</div><div class='del'>-		struct net_device *d = b-&gt;dev[u]-&gt;pppdev.dev;</div><div class='del'>-		unregister_netdev(d);</div><div class='add'>+		struct net_device *d = b-&gt;dev[u].chan-&gt;netdevice;</div><div class='add'>+		unregister_hdlc_device(d);</div><div class='ctx'> 		free_netdev(d);</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	free_irq(b-&gt;board.irq, &amp;b-&gt;board);</div><div class='ctx'> 	free_dma(b-&gt;board.chanA.rxdma);</div><div class='ctx'> 	free_dma(b-&gt;board.chanA.txdma);</div><div class='hunk'>@@ -451,10 +378,6 @@ static struct slvl_board *slvl_unit;</div><div class='ctx'> </div><div class='ctx'> static int __init slvl_init_module(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef MODULE</div><div class='del'>-	printk(KERN_INFO "SeaLevel Z85230 Synchronous Driver v 0.02.\n");</div><div class='del'>-	printk(KERN_INFO "(c) Copyright 1998, Building Number Three Ltd.\n");</div><div class='del'>-#endif</div><div class='ctx'> 	slvl_unit = slvl_init(io, irq, txdma, rxdma, slow);</div><div class='ctx'> </div><div class='ctx'> 	return slvl_unit ? 0 : -ENODEV;</div><div class='head'>diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c<br/>index 29b4b94e4947..327d58589e12 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/syncppp.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/syncppp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/syncppp.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/syncppp.c</a></div><div class='hunk'>@@ -230,13 +230,6 @@ static void sppp_input (struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> 	skb-&gt;dev=dev;</div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;flags &amp; IFF_RUNNING)</div><div class='del'>-	{</div><div class='del'>-		/* Count received bytes, add FCS and one flag */</div><div class='del'>-		sp-&gt;ibytes+= skb-&gt;len + 3;</div><div class='del'>-		sp-&gt;ipkts++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!pskb_may_pull(skb, PPP_HEADER_LEN)) {</div><div class='ctx'> 		/* Too small packet, drop it. */</div><div class='ctx'> 		if (sp-&gt;pp_flags &amp; PP_DEBUG)</div><div class='hunk'>@@ -832,7 +825,6 @@ static void sppp_cp_send (struct sppp *sp, u16 proto, u8 type,</div><div class='ctx'> 			sppp_print_bytes ((u8*) (lh+1), len);</div><div class='ctx'> 		printk ("&gt;\n");</div><div class='ctx'> 	}</div><div class='del'>-	sp-&gt;obytes += skb-&gt;len;</div><div class='ctx'> 	/* Control is high priority so it doesn't get queued behind data */</div><div class='ctx'> 	skb-&gt;priority=TC_PRIO_CONTROL;</div><div class='ctx'> 	skb-&gt;dev = dev;</div><div class='hunk'>@@ -875,7 +867,6 @@ static void sppp_cisco_send (struct sppp *sp, int type, u32 par1, u32 par2)</div><div class='ctx'> 		printk (KERN_WARNING "%s: cisco output: &lt;%xh %xh %xh %xh %xh-%xh&gt;\n",</div><div class='ctx'> 			dev-&gt;name,  ntohl (ch-&gt;type), ch-&gt;par1,</div><div class='ctx'> 			ch-&gt;par2, ch-&gt;rel, ch-&gt;time0, ch-&gt;time1);</div><div class='del'>-	sp-&gt;obytes += skb-&gt;len;</div><div class='ctx'> 	skb-&gt;priority=TC_PRIO_CONTROL;</div><div class='ctx'> 	skb-&gt;dev = dev;</div><div class='ctx'> 	skb_queue_tail(&amp;tx_queue, skb);</div><div class='head'>diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c<br/>index 98ef400908b8..243bd8d918fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/z85230.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/z85230.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/z85230.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/z85230.c</a></div><div class='hunk'>@@ -43,6 +43,7 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/hdlc.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='hunk'>@@ -51,7 +52,6 @@</div><div class='ctx'> #define RT_UNLOCK</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;net/syncppp.h&gt;</div><div class='ctx'> #include "z85230.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -440,51 +440,46 @@ static void z8530_tx(struct z8530_channel *c)</div><div class='ctx'>  *	A status event occurred in PIO synchronous mode. There are several</div><div class='ctx'>  *	reasons the chip will bother us here. A transmit underrun means we</div><div class='ctx'>  *	failed to feed the chip fast enough and just broke a packet. A DCD</div><div class='del'>- *	change is a line up or down. We communicate that back to the protocol</div><div class='del'>- *	layer for synchronous PPP to renegotiate.</div><div class='add'>+ *	change is a line up or down.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void z8530_status(struct z8530_channel *chan)</div><div class='ctx'> {</div><div class='ctx'> 	u8 status, altered;</div><div class='ctx'> </div><div class='del'>-	status=read_zsreg(chan, R0);</div><div class='del'>-	altered=chan-&gt;status^status;</div><div class='del'>-	</div><div class='del'>-	chan-&gt;status=status;</div><div class='del'>-	</div><div class='del'>-	if(status&amp;TxEOM)</div><div class='del'>-	{</div><div class='add'>+	status = read_zsreg(chan, R0);</div><div class='add'>+	altered = chan-&gt;status ^ status;</div><div class='add'>+</div><div class='add'>+	chan-&gt;status = status;</div><div class='add'>+</div><div class='add'>+	if (status &amp; TxEOM) {</div><div class='ctx'> /*		printk("%s: Tx underrun.\n", chan-&gt;dev-&gt;name); */</div><div class='del'>-		chan-&gt;stats.tx_fifo_errors++;</div><div class='add'>+		chan-&gt;netdevice-&gt;stats.tx_fifo_errors++;</div><div class='ctx'> 		write_zsctrl(chan, ERR_RES);</div><div class='ctx'> 		z8530_tx_done(chan);</div><div class='ctx'> 	}</div><div class='del'>-		</div><div class='del'>-	if(altered&amp;chan-&gt;dcdcheck)</div><div class='add'>+</div><div class='add'>+	if (altered &amp; chan-&gt;dcdcheck)</div><div class='ctx'> 	{</div><div class='del'>-		if(status&amp;chan-&gt;dcdcheck)</div><div class='del'>-		{</div><div class='add'>+		if (status &amp; chan-&gt;dcdcheck) {</div><div class='ctx'> 			printk(KERN_INFO "%s: DCD raised\n", chan-&gt;dev-&gt;name);</div><div class='del'>-			write_zsreg(chan, R3, chan-&gt;regs[3]|RxENABLE);</div><div class='del'>-			if(chan-&gt;netdevice &amp;&amp;</div><div class='del'>-			    ((chan-&gt;netdevice-&gt;type == ARPHRD_HDLC) ||</div><div class='del'>-			    (chan-&gt;netdevice-&gt;type == ARPHRD_PPP)))</div><div class='del'>-				sppp_reopen(chan-&gt;netdevice);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='add'>+			write_zsreg(chan, R3, chan-&gt;regs[3] | RxENABLE);</div><div class='add'>+			if (chan-&gt;netdevice)</div><div class='add'>+				netif_carrier_on(chan-&gt;netdevice);</div><div class='add'>+		} else {</div><div class='ctx'> 			printk(KERN_INFO "%s: DCD lost\n", chan-&gt;dev-&gt;name);</div><div class='del'>-			write_zsreg(chan, R3, chan-&gt;regs[3]&amp;~RxENABLE);</div><div class='add'>+			write_zsreg(chan, R3, chan-&gt;regs[3] &amp; ~RxENABLE);</div><div class='ctx'> 			z8530_flush_fifo(chan);</div><div class='add'>+			if (chan-&gt;netdevice)</div><div class='add'>+				netif_carrier_off(chan-&gt;netdevice);</div><div class='ctx'> 		}</div><div class='del'>-		</div><div class='del'>-	}	</div><div class='add'>+</div><div class='add'>+	}</div><div class='ctx'> 	write_zsctrl(chan, RES_EXT_INT);</div><div class='ctx'> 	write_zsctrl(chan, RES_H_IUS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct z8530_irqhandler z8530_sync=</div><div class='add'>+struct z8530_irqhandler z8530_sync =</div><div class='ctx'> {</div><div class='ctx'> 	z8530_rx,</div><div class='ctx'> 	z8530_tx,</div><div class='hunk'>@@ -556,8 +551,7 @@ static void z8530_dma_tx(struct z8530_channel *chan)</div><div class='ctx'>  *	</div><div class='ctx'>  *	A status event occurred on the Z8530. We receive these for two reasons</div><div class='ctx'>  *	when in DMA mode. Firstly if we finished a packet transfer we get one</div><div class='del'>- *	and kick the next packet out. Secondly we may see a DCD change and</div><div class='del'>- *	have to poke the protocol layer.</div><div class='add'>+ *	and kick the next packet out. Secondly we may see a DCD change.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='hunk'>@@ -586,24 +580,21 @@ static void z8530_dma_status(struct z8530_channel *chan)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(altered&amp;chan-&gt;dcdcheck)</div><div class='add'>+	if (altered &amp; chan-&gt;dcdcheck)</div><div class='ctx'> 	{</div><div class='del'>-		if(status&amp;chan-&gt;dcdcheck)</div><div class='del'>-		{</div><div class='add'>+		if (status &amp; chan-&gt;dcdcheck) {</div><div class='ctx'> 			printk(KERN_INFO "%s: DCD raised\n", chan-&gt;dev-&gt;name);</div><div class='del'>-			write_zsreg(chan, R3, chan-&gt;regs[3]|RxENABLE);</div><div class='del'>-			if(chan-&gt;netdevice &amp;&amp;</div><div class='del'>-			    ((chan-&gt;netdevice-&gt;type == ARPHRD_HDLC) ||</div><div class='del'>-			    (chan-&gt;netdevice-&gt;type == ARPHRD_PPP)))</div><div class='del'>-				sppp_reopen(chan-&gt;netdevice);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='add'>+			write_zsreg(chan, R3, chan-&gt;regs[3] | RxENABLE);</div><div class='add'>+			if (chan-&gt;netdevice)</div><div class='add'>+				netif_carrier_on(chan-&gt;netdevice);</div><div class='add'>+		} else {</div><div class='ctx'> 			printk(KERN_INFO "%s:DCD lost\n", chan-&gt;dev-&gt;name);</div><div class='del'>-			write_zsreg(chan, R3, chan-&gt;regs[3]&amp;~RxENABLE);</div><div class='add'>+			write_zsreg(chan, R3, chan-&gt;regs[3] &amp; ~RxENABLE);</div><div class='ctx'> 			z8530_flush_fifo(chan);</div><div class='add'>+			if (chan-&gt;netdevice)</div><div class='add'>+				netif_carrier_off(chan-&gt;netdevice);</div><div class='ctx'> 		}</div><div class='del'>-	}	</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	write_zsctrl(chan, RES_EXT_INT);</div><div class='ctx'> 	write_zsctrl(chan, RES_H_IUS);</div><div class='hunk'>@@ -1459,10 +1450,10 @@ static void z8530_tx_begin(struct z8530_channel *c)</div><div class='ctx'> 			/*</div><div class='ctx'> 			 *	Check if we crapped out.</div><div class='ctx'> 			 */</div><div class='del'>-			if(get_dma_residue(c-&gt;txdma))</div><div class='add'>+			if (get_dma_residue(c-&gt;txdma))</div><div class='ctx'> 			{</div><div class='del'>-				c-&gt;stats.tx_dropped++;</div><div class='del'>-				c-&gt;stats.tx_fifo_errors++;</div><div class='add'>+				c-&gt;netdevice-&gt;stats.tx_dropped++;</div><div class='add'>+				c-&gt;netdevice-&gt;stats.tx_fifo_errors++;</div><div class='ctx'> 			}</div><div class='ctx'> 			release_dma_lock(flags);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1534,21 +1525,21 @@ static void z8530_tx_begin(struct z8530_channel *c)</div><div class='ctx'>  *	packet. This code is fairly timing sensitive.</div><div class='ctx'>  *</div><div class='ctx'>  *	Called with the register lock held.</div><div class='del'>- */ </div><div class='del'>- </div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> static void z8530_tx_done(struct z8530_channel *c)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	/* Actually this can happen.*/</div><div class='del'>-	if(c-&gt;tx_skb==NULL)</div><div class='add'>+	if (c-&gt;tx_skb == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	skb=c-&gt;tx_skb;</div><div class='del'>-	c-&gt;tx_skb=NULL;</div><div class='add'>+	skb = c-&gt;tx_skb;</div><div class='add'>+	c-&gt;tx_skb = NULL;</div><div class='ctx'> 	z8530_tx_begin(c);</div><div class='del'>-	c-&gt;stats.tx_packets++;</div><div class='del'>-	c-&gt;stats.tx_bytes+=skb-&gt;len;</div><div class='add'>+	c-&gt;netdevice-&gt;stats.tx_packets++;</div><div class='add'>+	c-&gt;netdevice-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='ctx'> 	dev_kfree_skb_irq(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1558,7 +1549,7 @@ static void z8530_tx_done(struct z8530_channel *c)</div><div class='ctx'>  *	@skb: The buffer</div><div class='ctx'>  *</div><div class='ctx'>  *	We point the receive handler at this function when idle. Instead</div><div class='del'>- *	of syncppp processing the frames we get to throw them away.</div><div class='add'>+ *	of processing the frames we get to throw them away.</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='ctx'> void z8530_null_rx(struct z8530_channel *c, struct sk_buff *skb)</div><div class='hunk'>@@ -1635,10 +1626,11 @@ static void z8530_rx_done(struct z8530_channel *c)</div><div class='ctx'> 		else</div><div class='ctx'> 			/* Can't occur as we dont reenable the DMA irq until</div><div class='ctx'> 			   after the flip is done */</div><div class='del'>-			printk(KERN_WARNING "%s: DMA flip overrun!\n", c-&gt;netdevice-&gt;name);</div><div class='del'>-			</div><div class='add'>+			printk(KERN_WARNING "%s: DMA flip overrun!\n",</div><div class='add'>+			       c-&gt;netdevice-&gt;name);</div><div class='add'>+</div><div class='ctx'> 		release_dma_lock(flags);</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 *	Shove the old buffer into an sk_buff. We can't DMA</div><div class='ctx'> 		 *	directly into one on a PC - it might be above the 16Mb</div><div class='hunk'>@@ -1646,27 +1638,23 @@ static void z8530_rx_done(struct z8530_channel *c)</div><div class='ctx'> 		 *	can avoid the copy. Optimisation 2 - make the memcpy</div><div class='ctx'> 		 *	a copychecksum.</div><div class='ctx'> 		 */</div><div class='del'>-		 </div><div class='del'>-		skb=dev_alloc_skb(ct);</div><div class='del'>-		if(skb==NULL)</div><div class='del'>-		{</div><div class='del'>-			c-&gt;stats.rx_dropped++;</div><div class='del'>-			printk(KERN_WARNING "%s: Memory squeeze.\n", c-&gt;netdevice-&gt;name);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='add'>+</div><div class='add'>+		skb = dev_alloc_skb(ct);</div><div class='add'>+		if (skb == NULL) {</div><div class='add'>+			c-&gt;netdevice-&gt;stats.rx_dropped++;</div><div class='add'>+			printk(KERN_WARNING "%s: Memory squeeze.\n",</div><div class='add'>+			       c-&gt;netdevice-&gt;name);</div><div class='add'>+		} else {</div><div class='ctx'> 			skb_put(skb, ct);</div><div class='ctx'> 			skb_copy_to_linear_data(skb, rxb, ct);</div><div class='del'>-			c-&gt;stats.rx_packets++;</div><div class='del'>-			c-&gt;stats.rx_bytes+=ct;</div><div class='add'>+			c-&gt;netdevice-&gt;stats.rx_packets++;</div><div class='add'>+			c-&gt;netdevice-&gt;stats.rx_bytes += ct;</div><div class='ctx'> 		}</div><div class='del'>-		c-&gt;dma_ready=1;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		RT_LOCK;	</div><div class='del'>-		skb=c-&gt;skb;</div><div class='del'>-		</div><div class='add'>+		c-&gt;dma_ready = 1;</div><div class='add'>+	} else {</div><div class='add'>+		RT_LOCK;</div><div class='add'>+		skb = c-&gt;skb;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 *	The game we play for non DMA is similar. We want to</div><div class='ctx'> 		 *	get the controller set up for the next packet as fast</div><div class='hunk'>@@ -1677,48 +1665,39 @@ static void z8530_rx_done(struct z8530_channel *c)</div><div class='ctx'> 		 *	if you build a system where the sync irq isnt blocked</div><div class='ctx'> 		 *	by the kernel IRQ disable then you need only block the</div><div class='ctx'> 		 *	sync IRQ for the RT_LOCK area.</div><div class='del'>-		 *	</div><div class='add'>+		 *</div><div class='ctx'> 		 */</div><div class='ctx'> 		ct=c-&gt;count;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		c-&gt;skb = c-&gt;skb2;</div><div class='ctx'> 		c-&gt;count = 0;</div><div class='ctx'> 		c-&gt;max = c-&gt;mtu;</div><div class='del'>-		if(c-&gt;skb)</div><div class='del'>-		{</div><div class='add'>+		if (c-&gt;skb) {</div><div class='ctx'> 			c-&gt;dptr = c-&gt;skb-&gt;data;</div><div class='ctx'> 			c-&gt;max = c-&gt;mtu;</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			c-&gt;count= 0;</div><div class='add'>+		} else {</div><div class='add'>+			c-&gt;count = 0;</div><div class='ctx'> 			c-&gt;max = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		RT_UNLOCK;</div><div class='ctx'> </div><div class='ctx'> 		c-&gt;skb2 = dev_alloc_skb(c-&gt;mtu);</div><div class='del'>-		if(c-&gt;skb2==NULL)</div><div class='add'>+		if (c-&gt;skb2 == NULL)</div><div class='ctx'> 			printk(KERN_WARNING "%s: memory squeeze.\n",</div><div class='del'>-				c-&gt;netdevice-&gt;name);</div><div class='add'>+			       c-&gt;netdevice-&gt;name);</div><div class='ctx'> 		else</div><div class='del'>-		{</div><div class='del'>-			skb_put(c-&gt;skb2,c-&gt;mtu);</div><div class='del'>-		}</div><div class='del'>-		c-&gt;stats.rx_packets++;</div><div class='del'>-		c-&gt;stats.rx_bytes+=ct;</div><div class='del'>-		</div><div class='add'>+			skb_put(c-&gt;skb2, c-&gt;mtu);</div><div class='add'>+		c-&gt;netdevice-&gt;stats.rx_packets++;</div><div class='add'>+		c-&gt;netdevice-&gt;stats.rx_bytes += ct;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	If we received a frame we must now process it.</div><div class='ctx'> 	 */</div><div class='del'>-	if(skb)</div><div class='del'>-	{</div><div class='add'>+	if (skb) {</div><div class='ctx'> 		skb_trim(skb, ct);</div><div class='del'>-		c-&gt;rx_function(c,skb);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		c-&gt;stats.rx_dropped++;</div><div class='add'>+		c-&gt;rx_function(c, skb);</div><div class='add'>+	} else {</div><div class='add'>+		c-&gt;netdevice-&gt;stats.rx_dropped++;</div><div class='ctx'> 		printk(KERN_ERR "%s: Lost a frame\n", c-&gt;netdevice-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1730,7 +1709,7 @@ static void z8530_rx_done(struct z8530_channel *c)</div><div class='ctx'>  *	Returns true if the buffer cross a DMA boundary on a PC. The poor</div><div class='ctx'>  *	thing can only DMA within a 64K block not across the edges of it.</div><div class='ctx'>  */</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static inline int spans_boundary(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long a=(unsigned long)skb-&gt;data;</div><div class='hunk'>@@ -1799,24 +1778,6 @@ int z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(z8530_queue_xmit);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	z8530_get_stats - Get network statistics</div><div class='del'>- *	@c: The channel to use</div><div class='del'>- *</div><div class='del'>- *	Get the statistics block. We keep the statistics in software as</div><div class='del'>- *	the chip doesn't do it for us.</div><div class='del'>- *</div><div class='del'>- *	Locking is ignored here - we could lock for a copy but its</div><div class='del'>- *	not likely to be that big an issue</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-struct net_device_stats *z8530_get_stats(struct z8530_channel *c)</div><div class='del'>-{</div><div class='del'>-	return &amp;c-&gt;stats;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(z8530_get_stats);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	Module support</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wan/z85230.h b/drivers/net/wan/z85230.h<br/>index 158aea7b8eac..4f372396c512 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/z85230.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wan/z85230.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/z85230.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wan/z85230.h</a></div><div class='hunk'>@@ -325,7 +325,6 @@ struct z8530_channel</div><div class='ctx'> </div><div class='ctx'> 	void		*private;	/* For our owner */</div><div class='ctx'> 	struct net_device	*netdevice;	/* Network layer device */</div><div class='del'>-	struct net_device_stats stats;	/* Network layer statistics */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Async features</div><div class='hunk'>@@ -366,13 +365,13 @@ struct z8530_channel</div><div class='ctx'> 	unsigned char		tx_active; /* character is being xmitted */</div><div class='ctx'> 	unsigned char		tx_stopped; /* output is suspended */</div><div class='ctx'> </div><div class='del'>-	spinlock_t		*lock;	  /* Devicr lock */</div><div class='del'>-};	</div><div class='add'>+	spinlock_t		*lock;	  /* Device lock */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Each Z853x0 device.</div><div class='del'>- */	</div><div class='del'>- </div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> struct z8530_dev</div><div class='ctx'> {</div><div class='ctx'> 	char *name;	/* Device instance name */</div><div class='hunk'>@@ -408,7 +407,6 @@ extern int z8530_sync_txdma_open(struct net_device *, struct z8530_channel *);</div><div class='ctx'> extern int z8530_sync_txdma_close(struct net_device *, struct z8530_channel *);</div><div class='ctx'> extern int z8530_channel_load(struct z8530_channel *, u8 *);</div><div class='ctx'> extern int z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb);</div><div class='del'>-extern struct net_device_stats *z8530_get_stats(struct z8530_channel *c);</div><div class='ctx'> extern void z8530_null_rx(struct z8530_channel *c, struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig<br/>index 91fc2c765d90..9931b5ab59cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/Kconfig?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wireless/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/Kconfig</a></div><div class='hunk'>@@ -649,6 +649,7 @@ config RTL8187</div><div class='ctx'> 	  Trendnet TEW-424UB</div><div class='ctx'> 	  ASUS P5B Deluxe</div><div class='ctx'> 	  Toshiba Satellite Pro series of laptops</div><div class='add'>+	  Asus Wireless Link</div><div class='ctx'> </div><div class='ctx'> 	  Thanks to Realtek for their support!</div><div class='ctx'> </div><div class='hunk'>@@ -694,6 +695,7 @@ config MAC80211_HWSIM</div><div class='ctx'> </div><div class='ctx'> source "drivers/net/wireless/p54/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/ath5k/Kconfig"</div><div class='add'>+source "drivers/net/wireless/ath9k/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/iwlwifi/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/hostap/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/b43/Kconfig"</div><div class='head'>diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile<br/>index 54a4f6f1db67..59aa89ec6e81 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/Makefile?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wireless/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/Makefile</a></div><div class='hunk'>@@ -62,5 +62,6 @@ obj-$(CONFIG_RT2X00)	+= rt2x00/</div><div class='ctx'> obj-$(CONFIG_P54_COMMON)	+= p54/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ATH5K)	+= ath5k/</div><div class='add'>+obj-$(CONFIG_ATH9K)	+= ath9k/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/ath5k.h b/drivers/net/wireless/ath5k/ath5k.h<br/>index ba35c30d203c..9102eea3c8bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/ath5k.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wireless/ath5k/ath5k.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/ath5k.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/ath5k.h</a></div><div class='hunk'>@@ -186,11 +186,13 @@ struct ath5k_srev_name {</div><div class='ctx'> #define AR5K_SREV_RAD_2111	0x20</div><div class='ctx'> #define AR5K_SREV_RAD_5112	0x30</div><div class='ctx'> #define AR5K_SREV_RAD_5112A	0x35</div><div class='add'>+#define	AR5K_SREV_RAD_5112B	0x36</div><div class='ctx'> #define AR5K_SREV_RAD_2112	0x40</div><div class='ctx'> #define AR5K_SREV_RAD_2112A	0x45</div><div class='del'>-#define AR5K_SREV_RAD_SC0	0x56	/* Found on 2413/2414 */</div><div class='del'>-#define AR5K_SREV_RAD_SC1	0x63	/* Found on 5413/5414 */</div><div class='del'>-#define AR5K_SREV_RAD_SC2	0xa2	/* Found on 2424-5/5424 */</div><div class='add'>+#define	AR5K_SREV_RAD_2112B	0x46</div><div class='add'>+#define AR5K_SREV_RAD_SC0	0x50	/* Found on 2413/2414 */</div><div class='add'>+#define AR5K_SREV_RAD_SC1	0x60	/* Found on 5413/5414 */</div><div class='add'>+#define AR5K_SREV_RAD_SC2	0xa0	/* Found on 2424-5/5424 */</div><div class='ctx'> #define AR5K_SREV_RAD_5133	0xc0	/* MIMO found on 5418 */</div><div class='ctx'> </div><div class='ctx'> /* IEEE defs */</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c<br/>index d9769c527346..0676c6d84383 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/base.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wireless/ath5k/base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/base.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/base.c</a></div><div class='hunk'>@@ -40,10 +40,11 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/if.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -93,8 +94,6 @@ static struct pci_device_id ath5k_pci_id_table[] __devinitdata = {</div><div class='ctx'> 	{ PCI_VDEVICE(ATHEROS, 0x001a), .driver_data = AR5K_AR5212 }, /* 2413 Griffin-lite */</div><div class='ctx'> 	{ PCI_VDEVICE(ATHEROS, 0x001b), .driver_data = AR5K_AR5212 }, /* 5413 Eagle */</div><div class='ctx'> 	{ PCI_VDEVICE(ATHEROS, 0x001c), .driver_data = AR5K_AR5212 }, /* 5424 Condor (PCI-E)*/</div><div class='del'>-	{ PCI_VDEVICE(ATHEROS, 0x0023), .driver_data = AR5K_AR5212 }, /* 5416 */</div><div class='del'>-	{ PCI_VDEVICE(ATHEROS, 0x0024), .driver_data = AR5K_AR5212 }, /* 5418 */</div><div class='ctx'> 	{ 0 }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, ath5k_pci_id_table);</div><div class='hunk'>@@ -252,7 +251,7 @@ static inline void ath5k_txbuf_free(struct ath5k_softc *sc,</div><div class='ctx'> 		return;</div><div class='ctx'> 	pci_unmap_single(sc-&gt;pdev, bf-&gt;skbaddr, bf-&gt;skb-&gt;len,</div><div class='ctx'> 			PCI_DMA_TODEVICE);</div><div class='del'>-	dev_kfree_skb(bf-&gt;skb);</div><div class='add'>+	dev_kfree_skb_any(bf-&gt;skb);</div><div class='ctx'> 	bf-&gt;skb = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -467,13 +466,11 @@ ath5k_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	mutex_init(&amp;sc-&gt;lock);</div><div class='ctx'> 	spin_lock_init(&amp;sc-&gt;rxbuflock);</div><div class='ctx'> 	spin_lock_init(&amp;sc-&gt;txbuflock);</div><div class='add'>+	spin_lock_init(&amp;sc-&gt;block);</div><div class='ctx'> </div><div class='ctx'> 	/* Set private data */</div><div class='ctx'> 	pci_set_drvdata(pdev, hw);</div><div class='ctx'> </div><div class='del'>-	/* Enable msi for devices that support it */</div><div class='del'>-	pci_enable_msi(pdev);</div><div class='del'>-</div><div class='ctx'> 	/* Setup interrupt handler */</div><div class='ctx'> 	ret = request_irq(pdev-&gt;irq, ath5k_intr, IRQF_SHARED, "ath", sc);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -551,7 +548,6 @@ err_ah:</div><div class='ctx'> err_irq:</div><div class='ctx'> 	free_irq(pdev-&gt;irq, sc);</div><div class='ctx'> err_free:</div><div class='del'>-	pci_disable_msi(pdev);</div><div class='ctx'> 	ieee80211_free_hw(hw);</div><div class='ctx'> err_map:</div><div class='ctx'> 	pci_iounmap(pdev, mem);</div><div class='hunk'>@@ -573,7 +569,6 @@ ath5k_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 	ath5k_detach(pdev, hw);</div><div class='ctx'> 	ath5k_hw_detach(sc-&gt;ah);</div><div class='ctx'> 	free_irq(pdev-&gt;irq, sc);</div><div class='del'>-	pci_disable_msi(pdev);</div><div class='ctx'> 	pci_iounmap(pdev, sc-&gt;iobase);</div><div class='ctx'> 	pci_release_region(pdev, 0);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='hunk'>@@ -590,6 +585,8 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	ath5k_led_off(sc);</div><div class='ctx'> </div><div class='ctx'> 	ath5k_stop_hw(sc);</div><div class='add'>+</div><div class='add'>+	free_irq(pdev-&gt;irq, sc);</div><div class='ctx'> 	pci_save_state(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> 	pci_set_power_state(pdev, PCI_D3hot);</div><div class='hunk'>@@ -605,15 +602,12 @@ ath5k_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> 	struct ath5k_hw *ah = sc-&gt;ah;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='del'>-	err = pci_set_power_state(pdev, PCI_D0);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	pci_restore_state(pdev);</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	pci_restore_state(pdev);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Suspend/Resume resets the PCI configuration space, so we have to</div><div class='ctx'> 	 * re-disable the RETRY_TIMEOUT register (0x41) to keep</div><div class='hunk'>@@ -621,7 +615,15 @@ ath5k_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	pci_write_config_byte(pdev, 0x41, 0);</div><div class='ctx'> </div><div class='del'>-	ath5k_init(sc);</div><div class='add'>+	err = request_irq(pdev-&gt;irq, ath5k_intr, IRQF_SHARED, "ath", sc);</div><div class='add'>+	if (err) {</div><div class='add'>+		ATH5K_ERR(sc, "request_irq failed\n");</div><div class='add'>+		goto err_no_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ath5k_init(sc);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_irq;</div><div class='ctx'> 	ath5k_led_enable(sc);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -635,6 +637,11 @@ ath5k_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> 		ath5k_hw_reset_key(ah, i);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+err_irq:</div><div class='add'>+	free_irq(pdev-&gt;irq, sc);</div><div class='add'>+err_no_irq:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='hunk'>@@ -1224,7 +1231,7 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)</div><div class='ctx'> </div><div class='ctx'> 	pktlen = skb-&gt;len;</div><div class='ctx'> </div><div class='del'>-	if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_DO_NOT_ENCRYPT)) {</div><div class='add'>+	if (info-&gt;control.hw_key) {</div><div class='ctx'> 		keyidx = info-&gt;control.hw_key-&gt;hw_key_idx;</div><div class='ctx'> 		pktlen += info-&gt;control.icv_len;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1249,6 +1256,7 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)</div><div class='ctx'> </div><div class='ctx'> 	txq-&gt;link = &amp;ds-&gt;ds_link;</div><div class='ctx'> 	ath5k_hw_tx_start(ah, txq-&gt;qnum);</div><div class='add'>+	mmiowb();</div><div class='ctx'> 	spin_unlock_bh(&amp;txq-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1583,7 +1591,6 @@ ath5k_rx_stop(struct ath5k_softc *sc)</div><div class='ctx'> 	ath5k_hw_stop_pcu_recv(ah);	/* disable PCU */</div><div class='ctx'> 	ath5k_hw_set_rx_filter(ah, 0);	/* clear recv filter */</div><div class='ctx'> 	ath5k_hw_stop_rx_dma(ah);	/* disable DMA engine */</div><div class='del'>-	mdelay(3);			/* 3ms is long enough for 1 frame */</div><div class='ctx'> </div><div class='ctx'> 	ath5k_debug_printrxbuffs(sc, ah);</div><div class='ctx'> </div><div class='hunk'>@@ -1682,31 +1689,44 @@ ath5k_tasklet_rx(unsigned long data)</div><div class='ctx'> 	struct ath5k_rx_status rs = {};</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct ath5k_softc *sc = (void *)data;</div><div class='del'>-	struct ath5k_buf *bf;</div><div class='add'>+	struct ath5k_buf *bf, *bf_last;</div><div class='ctx'> 	struct ath5k_desc *ds;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int hdrlen;</div><div class='ctx'> 	int pad;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;sc-&gt;rxbuflock);</div><div class='add'>+	if (list_empty(&amp;sc-&gt;rxbuf)) {</div><div class='add'>+		ATH5K_WARN(sc, "empty rx buf pool\n");</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+	bf_last = list_entry(sc-&gt;rxbuf.prev, struct ath5k_buf, list);</div><div class='ctx'> 	do {</div><div class='ctx'> 		rxs.flag = 0;</div><div class='ctx'> </div><div class='del'>-		if (unlikely(list_empty(&amp;sc-&gt;rxbuf))) {</div><div class='del'>-			ATH5K_WARN(sc, "empty rx buf pool\n");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='ctx'> 		bf = list_first_entry(&amp;sc-&gt;rxbuf, struct ath5k_buf, list);</div><div class='ctx'> 		BUG_ON(bf-&gt;skb == NULL);</div><div class='ctx'> 		skb = bf-&gt;skb;</div><div class='ctx'> 		ds = bf-&gt;desc;</div><div class='ctx'> </div><div class='del'>-		/* TODO only one segment */</div><div class='del'>-		pci_dma_sync_single_for_cpu(sc-&gt;pdev, sc-&gt;desc_daddr,</div><div class='del'>-				sc-&gt;desc_len, PCI_DMA_FROMDEVICE);</div><div class='del'>-</div><div class='del'>-		if (unlikely(ds-&gt;ds_link == bf-&gt;daddr)) /* this is the end */</div><div class='del'>-			break;</div><div class='add'>+		/*</div><div class='add'>+		 * last buffer must not be freed to ensure proper hardware</div><div class='add'>+		 * function. When the hardware finishes also a packet next to</div><div class='add'>+		 * it, we are sure, it doesn't use it anymore and we can go on.</div><div class='add'>+		 */</div><div class='add'>+		if (bf_last == bf)</div><div class='add'>+			bf-&gt;flags |= 1;</div><div class='add'>+		if (bf-&gt;flags) {</div><div class='add'>+			struct ath5k_buf *bf_next = list_entry(bf-&gt;list.next,</div><div class='add'>+					struct ath5k_buf, list);</div><div class='add'>+			ret = sc-&gt;ah-&gt;ah_proc_rx_desc(sc-&gt;ah, bf_next-&gt;desc,</div><div class='add'>+					&amp;rs);</div><div class='add'>+			if (ret)</div><div class='add'>+				break;</div><div class='add'>+			bf-&gt;flags &amp;= ~1;</div><div class='add'>+			/* skip the overwritten one (even status is martian) */</div><div class='add'>+			goto next;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		ret = sc-&gt;ah-&gt;ah_proc_rx_desc(sc-&gt;ah, ds, &amp;rs);</div><div class='ctx'> 		if (unlikely(ret == -EINPROGRESS))</div><div class='hunk'>@@ -1752,8 +1772,6 @@ ath5k_tasklet_rx(unsigned long data)</div><div class='ctx'> 				goto next;</div><div class='ctx'> 		}</div><div class='ctx'> accept:</div><div class='del'>-		pci_dma_sync_single_for_cpu(sc-&gt;pdev, bf-&gt;skbaddr,</div><div class='del'>-				rs.rs_datalen, PCI_DMA_FROMDEVICE);</div><div class='ctx'> 		pci_unmap_single(sc-&gt;pdev, bf-&gt;skbaddr, sc-&gt;rxbufsize,</div><div class='ctx'> 				PCI_DMA_FROMDEVICE);</div><div class='ctx'> 		bf-&gt;skb = NULL;</div><div class='hunk'>@@ -1816,6 +1834,7 @@ accept:</div><div class='ctx'> next:</div><div class='ctx'> 		list_move_tail(&amp;bf-&gt;list, &amp;sc-&gt;rxbuf);</div><div class='ctx'> 	} while (ath5k_rxbuf_setup(sc, bf) == 0);</div><div class='add'>+unlock:</div><div class='ctx'> 	spin_unlock(&amp;sc-&gt;rxbuflock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1840,9 +1859,6 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq)</div><div class='ctx'> 	list_for_each_entry_safe(bf, bf0, &amp;txq-&gt;q, list) {</div><div class='ctx'> 		ds = bf-&gt;desc;</div><div class='ctx'> </div><div class='del'>-		/* TODO only one segment */</div><div class='del'>-		pci_dma_sync_single_for_cpu(sc-&gt;pdev, sc-&gt;desc_daddr,</div><div class='del'>-				sc-&gt;desc_len, PCI_DMA_FROMDEVICE);</div><div class='ctx'> 		ret = sc-&gt;ah-&gt;ah_proc_tx_desc(sc-&gt;ah, ds, &amp;ts);</div><div class='ctx'> 		if (unlikely(ret == -EINPROGRESS))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2015,8 +2031,6 @@ ath5k_beacon_send(struct ath5k_softc *sc)</div><div class='ctx'> 		ATH5K_WARN(sc, "beacon queue %u didn't stop?\n", sc-&gt;bhalq);</div><div class='ctx'> 		/* NB: hw still stops DMA, so proceed */</div><div class='ctx'> 	}</div><div class='del'>-	pci_dma_sync_single_for_cpu(sc-&gt;pdev, bf-&gt;skbaddr, bf-&gt;skb-&gt;len,</div><div class='del'>-			PCI_DMA_TODEVICE);</div><div class='ctx'> </div><div class='ctx'> 	ath5k_hw_put_tx_buf(ah, sc-&gt;bhalq, bf-&gt;daddr);</div><div class='ctx'> 	ath5k_hw_tx_start(ah, sc-&gt;bhalq);</div><div class='hunk'>@@ -2150,6 +2164,7 @@ ath5k_beacon_config(struct ath5k_softc *sc)</div><div class='ctx'> </div><div class='ctx'> 	ath5k_hw_set_intr(ah, 0);</div><div class='ctx'> 	sc-&gt;bmisscount = 0;</div><div class='add'>+	sc-&gt;imask &amp;= ~(AR5K_INT_BMISS | AR5K_INT_SWBA);</div><div class='ctx'> </div><div class='ctx'> 	if (sc-&gt;opmode == IEEE80211_IF_TYPE_STA) {</div><div class='ctx'> 		sc-&gt;imask |= AR5K_INT_BMISS;</div><div class='hunk'>@@ -2165,8 +2180,11 @@ ath5k_beacon_config(struct ath5k_softc *sc)</div><div class='ctx'> </div><div class='ctx'> 		sc-&gt;imask |= AR5K_INT_SWBA;</div><div class='ctx'> </div><div class='del'>-		if (ath5k_hw_hasveol(ah))</div><div class='add'>+		if (ath5k_hw_hasveol(ah)) {</div><div class='add'>+			spin_lock(&amp;sc-&gt;block);</div><div class='ctx'> 			ath5k_beacon_send(sc);</div><div class='add'>+			spin_unlock(&amp;sc-&gt;block);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* TODO else AP */</div><div class='ctx'> </div><div class='hunk'>@@ -2240,6 +2258,7 @@ ath5k_init(struct ath5k_softc *sc)</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> done:</div><div class='add'>+	mmiowb();</div><div class='ctx'> 	mutex_unlock(&amp;sc-&gt;lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2272,6 +2291,7 @@ ath5k_stop_locked(struct ath5k_softc *sc)</div><div class='ctx'> 	if (!test_bit(ATH_STAT_INVALID, sc-&gt;status)) {</div><div class='ctx'> 		ath5k_led_off(sc);</div><div class='ctx'> 		ath5k_hw_set_intr(ah, 0);</div><div class='add'>+		synchronize_irq(sc-&gt;pdev-&gt;irq);</div><div class='ctx'> 	}</div><div class='ctx'> 	ath5k_txq_cleanup(sc);</div><div class='ctx'> 	if (!test_bit(ATH_STAT_INVALID, sc-&gt;status)) {</div><div class='hunk'>@@ -2321,9 +2341,13 @@ ath5k_stop_hw(struct ath5k_softc *sc)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	ath5k_txbuf_free(sc, sc-&gt;bbuf);</div><div class='add'>+	mmiowb();</div><div class='ctx'> 	mutex_unlock(&amp;sc-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	del_timer_sync(&amp;sc-&gt;calib_tim);</div><div class='add'>+	tasklet_kill(&amp;sc-&gt;rxtq);</div><div class='add'>+	tasklet_kill(&amp;sc-&gt;txtq);</div><div class='add'>+	tasklet_kill(&amp;sc-&gt;restq);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2383,7 +2407,9 @@ ath5k_intr(int irq, void *dev_id)</div><div class='ctx'> 						  TSF_TO_TU(tsf),</div><div class='ctx'> 						  (unsigned long long) tsf);</div><div class='ctx'> 				} else {</div><div class='add'>+					spin_lock(&amp;sc-&gt;block);</div><div class='ctx'> 					ath5k_beacon_send(sc);</div><div class='add'>+					spin_unlock(&amp;sc-&gt;block);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 			if (status &amp; AR5K_INT_RXEOL) {</div><div class='hunk'>@@ -2550,8 +2576,6 @@ ath5k_init_leds(struct ath5k_softc *sc)</div><div class='ctx'> 	struct pci_dev *pdev = sc-&gt;pdev;</div><div class='ctx'> 	char name[ATH5K_LED_MAX_NAME_LEN + 1];</div><div class='ctx'> </div><div class='del'>-	sc-&gt;led_on = 0;  /* active low */</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Auto-enable soft led processing for IBM cards and for</div><div class='ctx'> 	 * 5211 minipci cards.</div><div class='hunk'>@@ -2560,11 +2584,13 @@ ath5k_init_leds(struct ath5k_softc *sc)</div><div class='ctx'> 	    pdev-&gt;device == PCI_DEVICE_ID_ATHEROS_AR5211) {</div><div class='ctx'> 		__set_bit(ATH_STAT_LEDSOFT, sc-&gt;status);</div><div class='ctx'> 		sc-&gt;led_pin = 0;</div><div class='add'>+		sc-&gt;led_on = 0;  /* active low */</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Enable softled on PIN1 on HP Compaq nc6xx, nc4000 &amp; nx5000 laptops */</div><div class='ctx'> 	if (pdev-&gt;subsystem_vendor == PCI_VENDOR_ID_COMPAQ) {</div><div class='ctx'> 		__set_bit(ATH_STAT_LEDSOFT, sc-&gt;status);</div><div class='ctx'> 		sc-&gt;led_pin = 1;</div><div class='add'>+		sc-&gt;led_on = 1;  /* active high */</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!test_bit(ATH_STAT_LEDSOFT, sc-&gt;status))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -2725,6 +2751,11 @@ static int ath5k_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 		ret = -EOPNOTSUPP;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Set to a reasonable value. Note that this will</div><div class='add'>+	 * be set to mac80211's value at ath5k_config(). */</div><div class='add'>+	sc-&gt;bintval = 1000;</div><div class='add'>+</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> end:</div><div class='ctx'> 	mutex_unlock(&amp;sc-&gt;lock);</div><div class='hunk'>@@ -2769,9 +2800,6 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct ath5k_hw *ah = sc-&gt;ah;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Set to a reasonable value. Note that this will</div><div class='del'>-	 * be set to mac80211's value at ath5k_config(). */</div><div class='del'>-	sc-&gt;bintval = 1000;</div><div class='ctx'> 	mutex_lock(&amp;sc-&gt;lock);</div><div class='ctx'> 	if (sc-&gt;vif != vif) {</div><div class='ctx'> 		ret = -EIO;</div><div class='hunk'>@@ -2783,6 +2811,7 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 		/* XXX: assoc id is set to 0 for now, mac80211 doesn't have</div><div class='ctx'> 		 * a clean way of letting us retrieve this yet. */</div><div class='ctx'> 		ath5k_hw_set_associd(ah, ah-&gt;ah_bssid, 0);</div><div class='add'>+		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (conf-&gt;changed &amp; IEEE80211_IFCC_BEACON &amp;&amp;</div><div class='hunk'>@@ -2971,6 +3000,7 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='add'>+	mmiowb();</div><div class='ctx'> 	mutex_unlock(&amp;sc-&gt;lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -3028,27 +3058,29 @@ static int</div><div class='ctx'> ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_softc *sc = hw-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ath5k_debug_dump_skb(sc, skb, "BC  ", 1);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sc-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	if (sc-&gt;opmode != IEEE80211_IF_TYPE_IBSS) {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;sc-&gt;block, flags);</div><div class='ctx'> 	ath5k_txbuf_free(sc, sc-&gt;bbuf);</div><div class='ctx'> 	sc-&gt;bbuf-&gt;skb = skb;</div><div class='ctx'> 	ret = ath5k_beacon_setup(sc, sc-&gt;bbuf);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		sc-&gt;bbuf-&gt;skb = NULL;</div><div class='del'>-	else</div><div class='add'>+	spin_unlock_irqrestore(&amp;sc-&gt;block, flags);</div><div class='add'>+	if (!ret) {</div><div class='ctx'> 		ath5k_beacon_config(sc);</div><div class='add'>+		mmiowb();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> end:</div><div class='del'>-	mutex_unlock(&amp;sc-&gt;lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath5k/base.h b/drivers/net/wireless/ath5k/base.h<br/>index 47f414b09e67..7ec2f377d5c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/base.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wireless/ath5k/base.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/base.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/base.h</a></div><div class='hunk'>@@ -56,7 +56,7 @@</div><div class='ctx'> </div><div class='ctx'> struct ath5k_buf {</div><div class='ctx'> 	struct list_head	list;</div><div class='del'>-	unsigned int		flags;	/* tx descriptor flags */</div><div class='add'>+	unsigned int		flags;	/* rx descriptor flags */</div><div class='ctx'> 	struct ath5k_desc	*desc;	/* virtual addr of desc */</div><div class='ctx'> 	dma_addr_t		daddr;	/* physical addr of desc */</div><div class='ctx'> 	struct sk_buff		*skb;	/* skbuff for buf */</div><div class='hunk'>@@ -172,6 +172,7 @@ struct ath5k_softc {</div><div class='ctx'> 	struct tasklet_struct	txtq;		/* tx intr tasklet */</div><div class='ctx'> 	struct ath5k_led	tx_led;		/* tx led */</div><div class='ctx'> </div><div class='add'>+	spinlock_t		block;		/* protects beacon */</div><div class='ctx'> 	struct ath5k_buf	*bbuf;		/* beacon buffer */</div><div class='ctx'> 	unsigned int		bhalq,		/* SW q for outgoing beacons */</div><div class='ctx'> 				bmisscount,	/* missed beacon transmits */</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/debug.c b/drivers/net/wireless/ath5k/debug.c<br/>index 41d5fa34b544..6fa6c8e04ff0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/debug.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wireless/ath5k/debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/debug.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/debug.c</a></div><div class='hunk'>@@ -129,7 +129,7 @@ static struct reg regs[] = {</div><div class='ctx'> 	REG_STRUCT_INIT(AR5K_CPC1),</div><div class='ctx'> 	REG_STRUCT_INIT(AR5K_CPC2),</div><div class='ctx'> 	REG_STRUCT_INIT(AR5K_CPC3),</div><div class='del'>-	REG_STRUCT_INIT(AR5K_CPCORN),</div><div class='add'>+	REG_STRUCT_INIT(AR5K_CPCOVF),</div><div class='ctx'> 	REG_STRUCT_INIT(AR5K_RESET_CTL),</div><div class='ctx'> 	REG_STRUCT_INIT(AR5K_SLEEP_CTL),</div><div class='ctx'> 	REG_STRUCT_INIT(AR5K_INTPEND),</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/debug.h b/drivers/net/wireless/ath5k/debug.h<br/>index 2cf8d18b10e3..ffc529393306 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/debug.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wireless/ath5k/debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/debug.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/debug.h</a></div><div class='hunk'>@@ -63,7 +63,6 @@</div><div class='ctx'> </div><div class='ctx'> struct ath5k_softc;</div><div class='ctx'> struct ath5k_hw;</div><div class='del'>-struct ieee80211_hw_mode;</div><div class='ctx'> struct sk_buff;</div><div class='ctx'> struct ath5k_buf;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c<br/>index c6d12c53bda4..ad1a5b422c8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/hw.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wireless/ath5k/hw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/hw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/hw.c</a></div><div class='hunk'>@@ -139,6 +139,8 @@ static int ath5k_hw_post(struct ath5k_hw *ah)</div><div class='ctx'> 	for (c = 0; c &lt; 2; c++) {</div><div class='ctx'> </div><div class='ctx'> 		cur_reg = regs[c];</div><div class='add'>+</div><div class='add'>+		/* Save previous value */</div><div class='ctx'> 		init_val = ath5k_hw_reg_read(ah, cur_reg);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; 256; i++) {</div><div class='hunk'>@@ -170,6 +172,10 @@ static int ath5k_hw_post(struct ath5k_hw *ah)</div><div class='ctx'> 			var_pattern = 0x003b080f;</div><div class='ctx'> 			ath5k_hw_reg_write(ah, var_pattern, cur_reg);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/* Restore previous value */</div><div class='add'>+		ath5k_hw_reg_write(ah, init_val, cur_reg);</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -287,67 +293,42 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)</div><div class='ctx'> 	/* Identify the radio chip*/</div><div class='ctx'> 	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='ctx'> 		ah-&gt;ah_radio = AR5K_RF5110;</div><div class='add'>+	/*</div><div class='add'>+	 * Register returns 0x0/0x04 for radio revision</div><div class='add'>+	 * so ath5k_hw_radio_revision doesn't parse the value</div><div class='add'>+	 * correctly. For now we are based on mac's srev to</div><div class='add'>+	 * identify RF2425 radio.</div><div class='add'>+	 */</div><div class='add'>+	} else if (srev == AR5K_SREV_VER_AR2425) {</div><div class='add'>+		ah-&gt;ah_radio = AR5K_RF2425;</div><div class='add'>+		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF2425;</div><div class='ctx'> 	} else if (ah-&gt;ah_radio_5ghz_revision &lt; AR5K_SREV_RAD_5112) {</div><div class='ctx'> 		ah-&gt;ah_radio = AR5K_RF5111;</div><div class='ctx'> 		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5111;</div><div class='ctx'> 	} else if (ah-&gt;ah_radio_5ghz_revision &lt; AR5K_SREV_RAD_SC0) {</div><div class='del'>-</div><div class='ctx'> 		ah-&gt;ah_radio = AR5K_RF5112;</div><div class='del'>-</div><div class='del'>-		if (ah-&gt;ah_radio_5ghz_revision &lt; AR5K_SREV_RAD_5112A) {</div><div class='del'>-			ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5112;</div><div class='del'>-		} else {</div><div class='del'>-			ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5112A;</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5112;</div><div class='ctx'> 	} else if (ah-&gt;ah_radio_5ghz_revision &lt; AR5K_SREV_RAD_SC1) {</div><div class='ctx'> 		ah-&gt;ah_radio = AR5K_RF2413;</div><div class='del'>-		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5112A;</div><div class='add'>+		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF2413;</div><div class='ctx'> 	} else if (ah-&gt;ah_radio_5ghz_revision &lt; AR5K_SREV_RAD_SC2) {</div><div class='ctx'> 		ah-&gt;ah_radio = AR5K_RF5413;</div><div class='del'>-		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5112A;</div><div class='add'>+		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5413;</div><div class='ctx'> 	} else if (ah-&gt;ah_radio_5ghz_revision &lt; AR5K_SREV_RAD_5133) {</div><div class='del'>-</div><div class='ctx'> 		/* AR5424 */</div><div class='ctx'> 		if (srev &gt;= AR5K_SREV_VER_AR5424) {</div><div class='ctx'> 			ah-&gt;ah_radio = AR5K_RF5413;</div><div class='del'>-			ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5424;</div><div class='add'>+			ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5413;</div><div class='ctx'> 		/* AR2424 */</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ah-&gt;ah_radio = AR5K_RF2413; /* For testing */</div><div class='del'>-			ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5112A;</div><div class='add'>+			ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF2413;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Register returns 0x4 for radio revision</div><div class='del'>-	 * so ath5k_hw_radio_revision doesn't parse the value</div><div class='del'>-	 * correctly. For now we are based on mac's srev to</div><div class='del'>-	 * identify RF2425 radio.</div><div class='del'>-	 */</div><div class='del'>-	} else if (srev == AR5K_SREV_VER_AR2425) {</div><div class='del'>-		ah-&gt;ah_radio = AR5K_RF2425;</div><div class='del'>-		ah-&gt;ah_phy_spending = AR5K_PHY_SPENDING_RF5112;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	ah-&gt;ah_phy = AR5K_PHY(0);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Identify AR5212-based PCI-E cards</div><div class='del'>-	 * And write some initial settings.</div><div class='del'>-	 *</div><div class='del'>-	 * (doing a "strings" on ndis driver</div><div class='del'>-	 * -ar5211.sys- reveals the following</div><div class='del'>-	 * pci-e related functions:</div><div class='del'>-	 *</div><div class='del'>-	 * pcieClockReq</div><div class='del'>-	 * pcieRxErrNotify</div><div class='del'>-	 * pcieL1SKPEnable</div><div class='del'>-	 * pcieAspm</div><div class='del'>-	 * pcieDisableAspmOnRfWake</div><div class='del'>-	 * pciePowerSaveEnable</div><div class='del'>-	 *</div><div class='del'>-	 * I guess these point to ClockReq but</div><div class='del'>-	 * i'm not sure.)</div><div class='add'>+	 * Write PCI-E power save settings</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((ah-&gt;ah_version == AR5K_AR5212) &amp;&amp; (pdev-&gt;is_pcie)) {</div><div class='ctx'> 		ath5k_hw_reg_write(ah, 0x9248fc00, 0x4080);</div><div class='hunk'>@@ -369,10 +350,15 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> </div><div class='add'>+	/* Write AR5K_PCICFG_UNK on 2112B and later chips */</div><div class='add'>+	if (ah-&gt;ah_radio_5ghz_revision &gt; AR5K_SREV_RAD_2112B ||</div><div class='add'>+	srev &gt; AR5K_SREV_VER_AR2413) {</div><div class='add'>+		ath5k_hw_reg_write(ah, AR5K_PCICFG_UNK, AR5K_PCICFG);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Get card capabilities, values, ...</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='ctx'> 	ret = ath5k_eeprom_init(ah);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ATH5K_ERR(sc, "unable to init EEPROM\n");</div><div class='hunk'>@@ -843,27 +829,41 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,</div><div class='ctx'> 		 * Write some more initial register settings</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='del'>-			ath5k_hw_reg_write(ah, 0x0002a002, AR5K_PHY(11));</div><div class='add'>+			ath5k_hw_reg_write(ah, 0x0002a002, 0x982c);</div><div class='ctx'> </div><div class='ctx'> 			if (channel-&gt;hw_value == CHANNEL_G)</div><div class='ctx'> 				if (ah-&gt;ah_mac_srev &lt; AR5K_SREV_VER_AR2413)</div><div class='ctx'> 					ath5k_hw_reg_write(ah, 0x00f80d80,</div><div class='del'>-						AR5K_PHY(83));</div><div class='add'>+								0x994c);</div><div class='ctx'> 				else if (ah-&gt;ah_mac_srev &lt; AR5K_SREV_VER_AR2424)</div><div class='ctx'> 					ath5k_hw_reg_write(ah, 0x00380140,</div><div class='del'>-						AR5K_PHY(83));</div><div class='add'>+								0x994c);</div><div class='ctx'> 				else if (ah-&gt;ah_mac_srev &lt; AR5K_SREV_VER_AR2425)</div><div class='ctx'> 					ath5k_hw_reg_write(ah, 0x00fc0ec0,</div><div class='del'>-						AR5K_PHY(83));</div><div class='add'>+								0x994c);</div><div class='ctx'> 				else /* 2425 */</div><div class='ctx'> 					ath5k_hw_reg_write(ah, 0x00fc0fc0,</div><div class='del'>-						AR5K_PHY(83));</div><div class='add'>+								0x994c);</div><div class='ctx'> 			else</div><div class='del'>-				ath5k_hw_reg_write(ah, 0x00000000,</div><div class='del'>-					AR5K_PHY(83));</div><div class='del'>-</div><div class='del'>-			ath5k_hw_reg_write(ah, 0x000009b5, 0xa228);</div><div class='del'>-			ath5k_hw_reg_write(ah, 0x0000000f, 0x8060);</div><div class='add'>+				ath5k_hw_reg_write(ah, 0x00000000, 0x994c);</div><div class='add'>+</div><div class='add'>+			/* Some bits are disabled here, we know nothing about</div><div class='add'>+			 * register 0xa228 yet, most of the times this ends up</div><div class='add'>+			 * with a value 0x9b5 -haven't seen any dump with</div><div class='add'>+			 * a different value- */</div><div class='add'>+			/* Got this from decompiling binary HAL */</div><div class='add'>+			data = ath5k_hw_reg_read(ah, 0xa228);</div><div class='add'>+			data &amp;= 0xfffffdff;</div><div class='add'>+			ath5k_hw_reg_write(ah, data, 0xa228);</div><div class='add'>+</div><div class='add'>+			data = ath5k_hw_reg_read(ah, 0xa228);</div><div class='add'>+			data &amp;= 0xfffe03ff;</div><div class='add'>+			ath5k_hw_reg_write(ah, data, 0xa228);</div><div class='add'>+			data = 0;</div><div class='add'>+</div><div class='add'>+			/* Just write 0x9b5 ? */</div><div class='add'>+			/* ath5k_hw_reg_write(ah, 0x000009b5, 0xa228); */</div><div class='add'>+			ath5k_hw_reg_write(ah, 0x0000000f, AR5K_SEQ_MASK);</div><div class='ctx'> 			ath5k_hw_reg_write(ah, 0x00000000, 0xa254);</div><div class='ctx'> 			ath5k_hw_reg_write(ah, 0x0000000e, AR5K_PHY_SCAL);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -879,6 +879,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,</div><div class='ctx'> 			else</div><div class='ctx'> 				data = 0xffb80d20;</div><div class='ctx'> 			ath5k_hw_reg_write(ah, data, AR5K_PHY_FRAME_CTL);</div><div class='add'>+			data = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -898,7 +899,6 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Write RF registers</div><div class='del'>-		 * TODO:Does this work on 5211 (5111) ?</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = ath5k_hw_rfregs(ah, channel, mode);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -935,7 +935,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='ctx'> 		/* Set antenna mode */</div><div class='del'>-		AR5K_REG_MASKED_BITS(ah, AR5K_PHY(0x44),</div><div class='add'>+		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_ANT_CTL,</div><div class='ctx'> 			ah-&gt;ah_antenna[ee_mode][0], 0xfffffc06);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -965,15 +965,15 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,</div><div class='ctx'> </div><div class='ctx'> 		ath5k_hw_reg_write(ah,</div><div class='ctx'> 			AR5K_PHY_NF_SVAL(ee-&gt;ee_noise_floor_thr[ee_mode]),</div><div class='del'>-			AR5K_PHY(0x5a));</div><div class='add'>+			AR5K_PHY_NFTHRES);</div><div class='ctx'> </div><div class='del'>-		AR5K_REG_MASKED_BITS(ah, AR5K_PHY(0x11),</div><div class='add'>+		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_SETTLING,</div><div class='ctx'> 			(ee-&gt;ee_switch_settling[ee_mode] &lt;&lt; 7) &amp; 0x3f80,</div><div class='ctx'> 			0xffffc07f);</div><div class='del'>-		AR5K_REG_MASKED_BITS(ah, AR5K_PHY(0x12),</div><div class='add'>+		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_GAIN,</div><div class='ctx'> 			(ee-&gt;ee_ant_tx_rx[ee_mode] &lt;&lt; 12) &amp; 0x3f000,</div><div class='ctx'> 			0xfffc0fff);</div><div class='del'>-		AR5K_REG_MASKED_BITS(ah, AR5K_PHY(0x14),</div><div class='add'>+		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_DESIRED_SIZE,</div><div class='ctx'> 			(ee-&gt;ee_adc_desired_size[ee_mode] &amp; 0x00ff) |</div><div class='ctx'> 			((ee-&gt;ee_pga_desired_size[ee_mode] &lt;&lt; 8) &amp; 0xff00),</div><div class='ctx'> 			0xffff0000);</div><div class='hunk'>@@ -982,13 +982,13 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,</div><div class='ctx'> 			(ee-&gt;ee_tx_end2xpa_disable[ee_mode] &lt;&lt; 24) |</div><div class='ctx'> 			(ee-&gt;ee_tx_end2xpa_disable[ee_mode] &lt;&lt; 16) |</div><div class='ctx'> 			(ee-&gt;ee_tx_frm2xpa_enable[ee_mode] &lt;&lt; 8) |</div><div class='del'>-			(ee-&gt;ee_tx_frm2xpa_enable[ee_mode]), AR5K_PHY(0x0d));</div><div class='add'>+			(ee-&gt;ee_tx_frm2xpa_enable[ee_mode]), AR5K_PHY_RF_CTL4);</div><div class='ctx'> </div><div class='del'>-		AR5K_REG_MASKED_BITS(ah, AR5K_PHY(0x0a),</div><div class='add'>+		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_RF_CTL3,</div><div class='ctx'> 			ee-&gt;ee_tx_end2xlna_enable[ee_mode] &lt;&lt; 8, 0xffff00ff);</div><div class='del'>-		AR5K_REG_MASKED_BITS(ah, AR5K_PHY(0x19),</div><div class='add'>+		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_NF,</div><div class='ctx'> 			(ee-&gt;ee_thr_62[ee_mode] &lt;&lt; 12) &amp; 0x7f000, 0xfff80fff);</div><div class='del'>-		AR5K_REG_MASKED_BITS(ah, AR5K_PHY(0x49), 4, 0xffffff01);</div><div class='add'>+		AR5K_REG_MASKED_BITS(ah, AR5K_PHY_OFDM_SELFCORR, 4, 0xffffff01);</div><div class='ctx'> </div><div class='ctx'> 		AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_IQ,</div><div class='ctx'> 		    AR5K_PHY_IQ_CORR_ENABLE |</div><div class='hunk'>@@ -1063,7 +1063,8 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,</div><div class='ctx'> 	ath5k_hw_reg_write(ah, AR5K_PHY_ACT_ENABLE, AR5K_PHY_ACT);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * 5111/5112 Specific</div><div class='add'>+	 * On 5211+ read activation -&gt; rx delay</div><div class='add'>+	 * and use it.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='ctx'> 		data = ath5k_hw_reg_read(ah, AR5K_PHY_RX_DELAY) &amp;</div><div class='hunk'>@@ -1071,40 +1072,77 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,</div><div class='ctx'> 		data = (channel-&gt;hw_value &amp; CHANNEL_CCK) ?</div><div class='ctx'> 			((data &lt;&lt; 2) / 22) : (data / 10);</div><div class='ctx'> </div><div class='del'>-		udelay(100 + data);</div><div class='add'>+		udelay(100 + (2 * data));</div><div class='add'>+		data = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mdelay(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Enable calibration and wait until completion</div><div class='add'>+	 * Perform ADC test (?)</div><div class='add'>+	 */</div><div class='add'>+	data = ath5k_hw_reg_read(ah, AR5K_PHY_TST1);</div><div class='add'>+	ath5k_hw_reg_write(ah, AR5K_PHY_TST1_TXHOLD, AR5K_PHY_TST1);</div><div class='add'>+	for (i = 0; i &lt;= 20; i++) {</div><div class='add'>+		if (!(ath5k_hw_reg_read(ah, AR5K_PHY_ADC_TEST) &amp; 0x10))</div><div class='add'>+			break;</div><div class='add'>+		udelay(200);</div><div class='add'>+	}</div><div class='add'>+	ath5k_hw_reg_write(ah, data, AR5K_PHY_TST1);</div><div class='add'>+	data = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Start automatic gain calibration</div><div class='add'>+	 *</div><div class='add'>+	 * During AGC calibration RX path is re-routed to</div><div class='add'>+	 * a signal detector so we don't receive anything.</div><div class='add'>+	 *</div><div class='add'>+	 * This method is used to calibrate some static offsets</div><div class='add'>+	 * used together with on-the fly I/Q calibration (the</div><div class='add'>+	 * one performed via ath5k_hw_phy_calibrate), that doesn't</div><div class='add'>+	 * interrupt rx path.</div><div class='add'>+	 *</div><div class='add'>+	 * If we are in a noisy environment AGC calibration may time</div><div class='add'>+	 * out.</div><div class='ctx'> 	 */</div><div class='ctx'> 	AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_AGCCTL,</div><div class='ctx'> 				AR5K_PHY_AGCCTL_CAL);</div><div class='ctx'> </div><div class='add'>+	/* At the same time start I/Q calibration for QAM constellation</div><div class='add'>+	 * -no need for CCK- */</div><div class='add'>+	ah-&gt;ah_calibration = false;</div><div class='add'>+	if (!(mode == AR5K_MODE_11B)) {</div><div class='add'>+		ah-&gt;ah_calibration = true;</div><div class='add'>+		AR5K_REG_WRITE_BITS(ah, AR5K_PHY_IQ,</div><div class='add'>+				AR5K_PHY_IQ_CAL_NUM_LOG_MAX, 15);</div><div class='add'>+		AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_IQ,</div><div class='add'>+				AR5K_PHY_IQ_RUN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for gain calibration to finish (we check for I/Q calibration</div><div class='add'>+	 * during ath5k_phy_calibrate) */</div><div class='ctx'> 	if (ath5k_hw_register_timeout(ah, AR5K_PHY_AGCCTL,</div><div class='ctx'> 			AR5K_PHY_AGCCTL_CAL, 0, false)) {</div><div class='del'>-		ATH5K_ERR(ah-&gt;ah_sc, "calibration timeout (%uMHz)\n",</div><div class='add'>+		ATH5K_ERR(ah-&gt;ah_sc, "gain calibration timeout (%uMHz)\n",</div><div class='ctx'> 			channel-&gt;center_freq);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Start noise floor calibration</div><div class='add'>+	 *</div><div class='add'>+	 * If we run NF calibration before AGC, it always times out.</div><div class='add'>+	 * Binary HAL starts NF and AGC calibration at the same time</div><div class='add'>+	 * and only waits for AGC to finish. I believe that's wrong because</div><div class='add'>+	 * during NF calibration, rx path is also routed to a detector, so if</div><div class='add'>+	 * it doesn't finish we won't have RX.</div><div class='add'>+	 *</div><div class='add'>+	 * XXX: Find an interval that's OK for all cards...</div><div class='add'>+	 */</div><div class='ctx'> 	ret = ath5k_hw_noise_floor_calibration(ah, channel-&gt;center_freq);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ah-&gt;ah_calibration = false;</div><div class='del'>-</div><div class='del'>-	/* A and G modes can use QAM modulation which requires enabling</div><div class='del'>-	 * I and Q calibration. Don't bother in B mode. */</div><div class='del'>-	if (!(mode == AR5K_MODE_11B)) {</div><div class='del'>-		ah-&gt;ah_calibration = true;</div><div class='del'>-		AR5K_REG_WRITE_BITS(ah, AR5K_PHY_IQ,</div><div class='del'>-				AR5K_PHY_IQ_CAL_NUM_LOG_MAX, 15);</div><div class='del'>-		AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_IQ,</div><div class='del'>-				AR5K_PHY_IQ_RUN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Reset queues and start beacon timers at the end of the reset routine</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1154,6 +1192,12 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,</div><div class='ctx'> 		ath5k_hw_reg_write(ah, AR5K_PHY_SCLOCK_32MHZ, AR5K_PHY_SCLOCK);</div><div class='ctx'> 		ath5k_hw_reg_write(ah, AR5K_PHY_SDELAY_32MHZ, AR5K_PHY_SDELAY);</div><div class='ctx'> 		ath5k_hw_reg_write(ah, ah-&gt;ah_phy_spending, AR5K_PHY_SPENDING);</div><div class='add'>+</div><div class='add'>+		data = ath5k_hw_reg_read(ah, AR5K_USEC_5211) &amp; 0xffffc07f ;</div><div class='add'>+		data |= (ah-&gt;ah_phy_spending == AR5K_PHY_SPENDING_18) ?</div><div class='add'>+						0x00000f80 : 0x00001380 ;</div><div class='add'>+		ath5k_hw_reg_write(ah, data, AR5K_USEC_5211);</div><div class='add'>+		data = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='hunk'>@@ -1226,7 +1270,7 @@ int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,</div><div class='ctx'> 		bool set_chip, u16 sleep_duration)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	u32 staid;</div><div class='add'>+	u32 staid, data;</div><div class='ctx'> </div><div class='ctx'> 	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='ctx'> 	staid = ath5k_hw_reg_read(ah, AR5K_STA_ID1);</div><div class='hunk'>@@ -1238,7 +1282,8 @@ int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,</div><div class='ctx'> 	case AR5K_PM_NETWORK_SLEEP:</div><div class='ctx'> 		if (set_chip)</div><div class='ctx'> 			ath5k_hw_reg_write(ah,</div><div class='del'>-				AR5K_SLEEP_CTL_SLE | sleep_duration,</div><div class='add'>+				AR5K_SLEEP_CTL_SLE_ALLOW |</div><div class='add'>+				sleep_duration,</div><div class='ctx'> 				AR5K_SLEEP_CTL);</div><div class='ctx'> </div><div class='ctx'> 		staid |= AR5K_STA_ID1_PWR_SV;</div><div class='hunk'>@@ -1253,13 +1298,24 @@ int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AR5K_PM_AWAKE:</div><div class='add'>+</div><div class='add'>+		staid &amp;= ~AR5K_STA_ID1_PWR_SV;</div><div class='add'>+</div><div class='ctx'> 		if (!set_chip)</div><div class='ctx'> 			goto commit;</div><div class='ctx'> </div><div class='del'>-		ath5k_hw_reg_write(ah, AR5K_SLEEP_CTL_SLE_WAKE,</div><div class='del'>-				AR5K_SLEEP_CTL);</div><div class='add'>+		/* Preserve sleep duration */</div><div class='add'>+		data = ath5k_hw_reg_read(ah, AR5K_SLEEP_CTL);</div><div class='add'>+		if( data &amp; 0xffc00000 ){</div><div class='add'>+			data = 0;</div><div class='add'>+		} else {</div><div class='add'>+			data = data &amp; 0xfffcffff;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		for (i = 5000; i &gt; 0; i--) {</div><div class='add'>+		ath5k_hw_reg_write(ah, data, AR5K_SLEEP_CTL);</div><div class='add'>+		udelay(15);</div><div class='add'>+</div><div class='add'>+		for (i = 50; i &gt; 0; i--) {</div><div class='ctx'> 			/* Check if the chip did wake up */</div><div class='ctx'> 			if ((ath5k_hw_reg_read(ah, AR5K_PCICFG) &amp;</div><div class='ctx'> 					AR5K_PCICFG_SPWR_DN) == 0)</div><div class='hunk'>@@ -1267,15 +1323,13 @@ int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,</div><div class='ctx'> </div><div class='ctx'> 			/* Wait a bit and retry */</div><div class='ctx'> 			udelay(200);</div><div class='del'>-			ath5k_hw_reg_write(ah, AR5K_SLEEP_CTL_SLE_WAKE,</div><div class='del'>-				AR5K_SLEEP_CTL);</div><div class='add'>+			ath5k_hw_reg_write(ah, data, AR5K_SLEEP_CTL);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Fail if the chip didn't wake up */</div><div class='ctx'> 		if (i &lt;= 0)</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> </div><div class='del'>-		staid &amp;= ~AR5K_STA_ID1_PWR_SV;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1304,6 +1358,7 @@ void ath5k_hw_start_rx(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='ctx'> 	ath5k_hw_reg_write(ah, AR5K_CR_RXE, AR5K_CR);</div><div class='add'>+	ath5k_hw_reg_read(ah, AR5K_CR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1390,6 +1445,7 @@ int ath5k_hw_tx_start(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Start queue */</div><div class='ctx'> 		ath5k_hw_reg_write(ah, tx_queue, AR5K_CR);</div><div class='add'>+		ath5k_hw_reg_read(ah, AR5K_CR);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Return if queue is disabled */</div><div class='ctx'> 		if (AR5K_REG_READ_Q(ah, AR5K_QCU_TXD, queue))</div><div class='hunk'>@@ -1440,6 +1496,7 @@ int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> </div><div class='ctx'> 		/* Stop queue */</div><div class='ctx'> 		ath5k_hw_reg_write(ah, tx_queue, AR5K_CR);</div><div class='add'>+		ath5k_hw_reg_read(ah, AR5K_CR);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Schedule TX disable and wait until queue is empty</div><div class='hunk'>@@ -1456,6 +1513,8 @@ int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> </div><div class='ctx'> 		/* Clear register */</div><div class='ctx'> 		ath5k_hw_reg_write(ah, 0, AR5K_QCU_TXD);</div><div class='add'>+		if (pending)</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: Check for success else return error */</div><div class='hunk'>@@ -1684,6 +1743,7 @@ enum ath5k_int ath5k_hw_set_intr(struct ath5k_hw *ah, enum ath5k_int new_mask)</div><div class='ctx'> 	 * (they will be re-enabled afterwards).</div><div class='ctx'> 	 */</div><div class='ctx'> 	ath5k_hw_reg_write(ah, AR5K_IER_DISABLE, AR5K_IER);</div><div class='add'>+	ath5k_hw_reg_read(ah, AR5K_IER);</div><div class='ctx'> </div><div class='ctx'> 	old_mask = ah-&gt;ah_imr;</div><div class='ctx'> </div><div class='hunk'>@@ -1716,6 +1776,7 @@ enum ath5k_int ath5k_hw_set_intr(struct ath5k_hw *ah, enum ath5k_int new_mask)</div><div class='ctx'> </div><div class='ctx'> 	/* ..re-enable interrupts */</div><div class='ctx'> 	ath5k_hw_reg_write(ah, AR5K_IER_ENABLE, AR5K_IER);</div><div class='add'>+	ath5k_hw_reg_read(ah, AR5K_IER);</div><div class='ctx'> </div><div class='ctx'> 	return old_mask;</div><div class='ctx'> }</div><div class='hunk'>@@ -3359,11 +3420,13 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> 		ath5k_hw_reg_write(ah, ah-&gt;ah_turbo ?</div><div class='ctx'> 			AR5K_INIT_PROTO_TIME_CNTRL_TURBO :</div><div class='ctx'> 			AR5K_INIT_PROTO_TIME_CNTRL, AR5K_IFS1);</div><div class='del'>-		/* Set PHY register 0x9844 (??) */</div><div class='add'>+		/* Set AR5K_PHY_SETTLING */</div><div class='ctx'> 		ath5k_hw_reg_write(ah, ah-&gt;ah_turbo ?</div><div class='del'>-			(ath5k_hw_reg_read(ah, AR5K_PHY(17)) &amp; ~0x7F) | 0x38 :</div><div class='del'>-			(ath5k_hw_reg_read(ah, AR5K_PHY(17)) &amp; ~0x7F) | 0x1C,</div><div class='del'>-			AR5K_PHY(17));</div><div class='add'>+			(ath5k_hw_reg_read(ah, AR5K_PHY_SETTLING) &amp; ~0x7F)</div><div class='add'>+			| 0x38 :</div><div class='add'>+			(ath5k_hw_reg_read(ah, AR5K_PHY_SETTLING) &amp; ~0x7F)</div><div class='add'>+			| 0x1C,</div><div class='add'>+			AR5K_PHY_SETTLING);</div><div class='ctx'> 		/* Set Frame Control Register */</div><div class='ctx'> 		ath5k_hw_reg_write(ah, ah-&gt;ah_turbo ?</div><div class='ctx'> 			(AR5K_PHY_FRAME_CTL_INI | AR5K_PHY_TURBO_MODE |</div><div class='hunk'>@@ -3484,7 +3547,7 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> 			if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_RDYTIME_EXP_POLICY_ENABLE)</div><div class='ctx'> 				AR5K_REG_ENABLE_BITS(ah,</div><div class='ctx'> 					AR5K_QUEUE_MISC(queue),</div><div class='del'>-					AR5K_QCU_MISC_TXE);</div><div class='add'>+					AR5K_QCU_MISC_RDY_VEOL_POLICY);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (tq-&gt;tqi_flags &amp; AR5K_TXQ_FLAG_BACKOFF_DISABLE)</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/initvals.c b/drivers/net/wireless/ath5k/initvals.c<br/>index 04c84e9da89d..2806b21bf90b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/initvals.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wireless/ath5k/initvals.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/initvals.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/initvals.c</a></div><div class='hunk'>@@ -489,7 +489,7 @@ static const struct ath5k_ini ar5212_ini[] = {</div><div class='ctx'> 	{ AR5K_QUEUE_TXDP(9),	0x00000000 },</div><div class='ctx'> 	{ AR5K_DCU_FP,		0x00000000 },</div><div class='ctx'> 	{ AR5K_DCU_TXP,		0x00000000 },</div><div class='del'>-	{ AR5K_DCU_TX_FILTER,	0x00000000 },</div><div class='add'>+	{ AR5K_DCU_TX_FILTER_0_BASE,	0x00000000 },</div><div class='ctx'> 	/* Unknown table */</div><div class='ctx'> 	{ 0x1078, 0x00000000 },</div><div class='ctx'> 	{ 0x10b8, 0x00000000 },</div><div class='hunk'>@@ -679,7 +679,7 @@ static const struct ath5k_ini ar5212_ini[] = {</div><div class='ctx'> 	{ AR5K_PHY(645), 0x00106c10 },</div><div class='ctx'> 	{ AR5K_PHY(646), 0x009c4060 },</div><div class='ctx'> 	{ AR5K_PHY(647), 0x1483800a },</div><div class='del'>-	/* { AR5K_PHY(648), 0x018830c6 },*/ /* 2413 */</div><div class='add'>+	/* { AR5K_PHY(648), 0x018830c6 },*/ /* 2413/2425 */</div><div class='ctx'> 	{ AR5K_PHY(648), 0x01831061 },</div><div class='ctx'> 	{ AR5K_PHY(649), 0x00000400 },</div><div class='ctx'> 	/*{ AR5K_PHY(650), 0x000001b5 },*/</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/phy.c b/drivers/net/wireless/ath5k/phy.c<br/>index afd8689e5c03..fa0d47faf574 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/phy.c?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wireless/ath5k/phy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/phy.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/phy.c</a></div><div class='hunk'>@@ -1020,6 +1020,74 @@ static const struct ath5k_ini_rfgain rfgain_2413[] = {</div><div class='ctx'> 	{ AR5K_RF_GAIN(63), { 0x000000f9 } },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Initial RF Gain settings for RF2425 */</div><div class='add'>+static const struct ath5k_ini_rfgain rfgain_2425[] = {</div><div class='add'>+	{ AR5K_RF_GAIN(0), { 0x00000000 } },</div><div class='add'>+	{ AR5K_RF_GAIN(1), { 0x00000040 } },</div><div class='add'>+	{ AR5K_RF_GAIN(2), { 0x00000080 } },</div><div class='add'>+	{ AR5K_RF_GAIN(3), { 0x00000181 } },</div><div class='add'>+	{ AR5K_RF_GAIN(4), { 0x000001c1 } },</div><div class='add'>+	{ AR5K_RF_GAIN(5), { 0x00000001 } },</div><div class='add'>+	{ AR5K_RF_GAIN(6), { 0x00000041 } },</div><div class='add'>+	{ AR5K_RF_GAIN(7), { 0x00000081 } },</div><div class='add'>+	{ AR5K_RF_GAIN(8), { 0x00000188 } },</div><div class='add'>+	{ AR5K_RF_GAIN(9), { 0x000001c8 } },</div><div class='add'>+	{ AR5K_RF_GAIN(10), { 0x00000008 } },</div><div class='add'>+	{ AR5K_RF_GAIN(11), { 0x00000048 } },</div><div class='add'>+	{ AR5K_RF_GAIN(12), { 0x00000088 } },</div><div class='add'>+	{ AR5K_RF_GAIN(13), { 0x00000189 } },</div><div class='add'>+	{ AR5K_RF_GAIN(14), { 0x000001c9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(15), { 0x00000009 } },</div><div class='add'>+	{ AR5K_RF_GAIN(16), { 0x00000049 } },</div><div class='add'>+	{ AR5K_RF_GAIN(17), { 0x00000089 } },</div><div class='add'>+	{ AR5K_RF_GAIN(18), { 0x000001b0 } },</div><div class='add'>+	{ AR5K_RF_GAIN(19), { 0x000001f0 } },</div><div class='add'>+	{ AR5K_RF_GAIN(20), { 0x00000030 } },</div><div class='add'>+	{ AR5K_RF_GAIN(21), { 0x00000070 } },</div><div class='add'>+	{ AR5K_RF_GAIN(22), { 0x00000171 } },</div><div class='add'>+	{ AR5K_RF_GAIN(23), { 0x000001b1 } },</div><div class='add'>+	{ AR5K_RF_GAIN(24), { 0x000001f1 } },</div><div class='add'>+	{ AR5K_RF_GAIN(25), { 0x00000031 } },</div><div class='add'>+	{ AR5K_RF_GAIN(26), { 0x00000071 } },</div><div class='add'>+	{ AR5K_RF_GAIN(27), { 0x000001b8 } },</div><div class='add'>+	{ AR5K_RF_GAIN(28), { 0x000001f8 } },</div><div class='add'>+	{ AR5K_RF_GAIN(29), { 0x00000038 } },</div><div class='add'>+	{ AR5K_RF_GAIN(30), { 0x00000078 } },</div><div class='add'>+	{ AR5K_RF_GAIN(31), { 0x000000b8 } },</div><div class='add'>+	{ AR5K_RF_GAIN(32), { 0x000001b9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(33), { 0x000001f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(34), { 0x00000039 } },</div><div class='add'>+	{ AR5K_RF_GAIN(35), { 0x00000079 } },</div><div class='add'>+	{ AR5K_RF_GAIN(36), { 0x000000b9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(37), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(38), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(39), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(40), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(41), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(42), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(43), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(44), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(45), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(46), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(47), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(48), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(49), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(50), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(51), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(52), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(53), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(54), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(55), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(56), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(57), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(58), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(59), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(60), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(61), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(62), { 0x000000f9 } },</div><div class='add'>+	{ AR5K_RF_GAIN(63), { 0x000000f9 } },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct ath5k_gain_opt rfgain_opt_5112 = {</div><div class='ctx'> 	1,</div><div class='ctx'> 	8,</div><div class='hunk'>@@ -1588,8 +1656,8 @@ int ath5k_hw_rfgain(struct ath5k_hw *ah, unsigned int freq)</div><div class='ctx'> 		freq = 0; /* only 2Ghz */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case AR5K_RF2425:</div><div class='del'>-		ath5k_rfg = rfgain_2413;</div><div class='del'>-		size = ARRAY_SIZE(rfgain_2413);</div><div class='add'>+		ath5k_rfg = rfgain_2425;</div><div class='add'>+		size = ARRAY_SIZE(rfgain_2425);</div><div class='ctx'> 		freq = 0; /* only 2Ghz */</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1830,9 +1898,6 @@ static int ath5k_hw_rf5112_channel(struct ath5k_hw *ah,</div><div class='ctx'> 	data = data0 = data1 = data2 = 0;</div><div class='ctx'> 	c = channel-&gt;center_freq;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Set the channel on the RF5112 or newer</div><div class='del'>-	 */</div><div class='ctx'> 	if (c &lt; 4800) {</div><div class='ctx'> 		if (!((c - 2224) % 5)) {</div><div class='ctx'> 			data0 = ((2 * (c - 704)) - 3040) / 10;</div><div class='hunk'>@@ -1844,7 +1909,7 @@ static int ath5k_hw_rf5112_channel(struct ath5k_hw *ah,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		data0 = ath5k_hw_bitswap((data0 &lt;&lt; 2) &amp; 0xff, 8);</div><div class='del'>-	} else {</div><div class='add'>+	} else if ((c - (c % 5)) != 2 || c &gt; 5435) {</div><div class='ctx'> 		if (!(c % 20) &amp;&amp; c &gt;= 5120) {</div><div class='ctx'> 			data0 = ath5k_hw_bitswap(((c - 4800) / 20 &lt;&lt; 2), 8);</div><div class='ctx'> 			data2 = ath5k_hw_bitswap(3, 2);</div><div class='hunk'>@@ -1856,6 +1921,9 @@ static int ath5k_hw_rf5112_channel(struct ath5k_hw *ah,</div><div class='ctx'> 			data2 = ath5k_hw_bitswap(1, 2);</div><div class='ctx'> 		} else</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		data0 = ath5k_hw_bitswap((10 * (c - 2) - 4800) / 25 + 1, 8);</div><div class='add'>+		data2 = ath5k_hw_bitswap(0, 2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	data = (data0 &lt;&lt; 4) | (data1 &lt;&lt; 1) | (data2 &lt;&lt; 2) | 0x1001;</div><div class='hunk'>@@ -1867,6 +1935,45 @@ static int ath5k_hw_rf5112_channel(struct ath5k_hw *ah,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Set the channel on the RF2425</div><div class='add'>+ */</div><div class='add'>+static int ath5k_hw_rf2425_channel(struct ath5k_hw *ah,</div><div class='add'>+		struct ieee80211_channel *channel)</div><div class='add'>+{</div><div class='add'>+	u32 data, data0, data2;</div><div class='add'>+	u16 c;</div><div class='add'>+</div><div class='add'>+	data = data0 = data2 = 0;</div><div class='add'>+	c = channel-&gt;center_freq;</div><div class='add'>+</div><div class='add'>+	if (c &lt; 4800) {</div><div class='add'>+		data0 = ath5k_hw_bitswap((c - 2272), 8);</div><div class='add'>+		data2 = 0;</div><div class='add'>+	/* ? 5GHz ? */</div><div class='add'>+	} else if ((c - (c % 5)) != 2 || c &gt; 5435) {</div><div class='add'>+		if (!(c % 20) &amp;&amp; c &lt; 5120)</div><div class='add'>+			data0 = ath5k_hw_bitswap(((c - 4800) / 20 &lt;&lt; 2), 8);</div><div class='add'>+		else if (!(c % 10))</div><div class='add'>+			data0 = ath5k_hw_bitswap(((c - 4800) / 10 &lt;&lt; 1), 8);</div><div class='add'>+		else if (!(c % 5))</div><div class='add'>+			data0 = ath5k_hw_bitswap((c - 4800) / 5, 8);</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		data2 = ath5k_hw_bitswap(1, 2);</div><div class='add'>+	} else {</div><div class='add'>+		data0 = ath5k_hw_bitswap((10 * (c - 2) - 4800) / 25 + 1, 8);</div><div class='add'>+		data2 = ath5k_hw_bitswap(0, 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = (data0 &lt;&lt; 4) | data2 &lt;&lt; 2 | 0x1001;</div><div class='add'>+</div><div class='add'>+	ath5k_hw_reg_write(ah, data &amp; 0xff, AR5K_RF_BUFFER);</div><div class='add'>+	ath5k_hw_reg_write(ah, (data &gt;&gt; 8) &amp; 0x7f, AR5K_RF_BUFFER_CONTROL_5);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Set a channel on the radio chip</div><div class='ctx'>  */</div><div class='ctx'> int ath5k_hw_channel(struct ath5k_hw *ah, struct ieee80211_channel *channel)</div><div class='hunk'>@@ -1895,6 +2002,9 @@ int ath5k_hw_channel(struct ath5k_hw *ah, struct ieee80211_channel *channel)</div><div class='ctx'> 	case AR5K_RF5111:</div><div class='ctx'> 		ret = ath5k_hw_rf5111_channel(ah, channel);</div><div class='ctx'> 		break;</div><div class='add'>+	case AR5K_RF2425:</div><div class='add'>+		ret = ath5k_hw_rf2425_channel(ah, channel);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = ath5k_hw_rf5112_channel(ah, channel);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1903,6 +2013,15 @@ int ath5k_hw_channel(struct ath5k_hw *ah, struct ieee80211_channel *channel)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	/* Set JAPAN setting for channel 14 */</div><div class='add'>+	if (channel-&gt;center_freq == 2484) {</div><div class='add'>+		AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_CCKTXCTL,</div><div class='add'>+				AR5K_PHY_CCKTXCTL_JAPAN);</div><div class='add'>+	} else {</div><div class='add'>+		AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_CCKTXCTL,</div><div class='add'>+				AR5K_PHY_CCKTXCTL_WORLD);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ah-&gt;ah_current_channel.center_freq = channel-&gt;center_freq;</div><div class='ctx'> 	ah-&gt;ah_current_channel.hw_value = channel-&gt;hw_value;</div><div class='ctx'> 	ah-&gt;ah_turbo = channel-&gt;hw_value == CHANNEL_T ? true : false;</div><div class='hunk'>@@ -1933,6 +2052,8 @@ int ath5k_hw_channel(struct ath5k_hw *ah, struct ieee80211_channel *channel)</div><div class='ctx'>  * http://patft.uspto.gov/netacgi/nph-Parser?Sect1=PTO1&amp;Sect2=HITOFF&amp;d=PALL \</div><div class='ctx'>  * &amp;p=1&amp;u=%2Fnetahtml%2FPTO%2Fsrchnum.htm&amp;r=1&amp;f=G&amp;l=50&amp;s1=7245893.PN.&amp;OS=PN/7</div><div class='ctx'>  *</div><div class='add'>+ * XXX: Since during noise floor calibration antennas are detached according to</div><div class='add'>+ * the patent, we should stop tx queues here.</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='ctx'> ath5k_hw_noise_floor_calibration(struct ath5k_hw *ah, short freq)</div><div class='hunk'>@@ -1942,7 +2063,7 @@ ath5k_hw_noise_floor_calibration(struct ath5k_hw *ah, short freq)</div><div class='ctx'> 	s32 noise_floor;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Enable noise floor calibration and wait until completion</div><div class='add'>+	 * Enable noise floor calibration</div><div class='ctx'> 	 */</div><div class='ctx'> 	AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_AGCCTL,</div><div class='ctx'> 				AR5K_PHY_AGCCTL_NF);</div><div class='hunk'>@@ -1952,7 +2073,7 @@ ath5k_hw_noise_floor_calibration(struct ath5k_hw *ah, short freq)</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ATH5K_ERR(ah-&gt;ah_sc,</div><div class='ctx'> 			"noise floor calibration timeout (%uMHz)\n", freq);</div><div class='del'>-		return ret;</div><div class='add'>+		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Wait until the noise floor is calibrated and read the value */</div><div class='hunk'>@@ -1974,7 +2095,7 @@ ath5k_hw_noise_floor_calibration(struct ath5k_hw *ah, short freq)</div><div class='ctx'> 	if (noise_floor &gt; AR5K_TUNE_NOISE_FLOOR) {</div><div class='ctx'> 		ATH5K_ERR(ah-&gt;ah_sc,</div><div class='ctx'> 			"noise floor calibration failed (%uMHz)\n", freq);</div><div class='del'>-		return -EIO;</div><div class='add'>+		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ah-&gt;ah_noise_floor = noise_floor;</div><div class='hunk'>@@ -2087,38 +2208,66 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Perform a PHY calibration on RF5111/5112</div><div class='add'>+ * Perform a PHY calibration on RF5111/5112 and newer chips</div><div class='ctx'>  */</div><div class='ctx'> static int ath5k_hw_rf511x_calibrate(struct ath5k_hw *ah,</div><div class='ctx'> 		struct ieee80211_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i_pwr, q_pwr;</div><div class='ctx'> 	s32 iq_corr, i_coff, i_coffd, q_coff, q_coffd;</div><div class='add'>+	int i;</div><div class='ctx'> 	ATH5K_TRACE(ah-&gt;ah_sc);</div><div class='ctx'> </div><div class='ctx'> 	if (!ah-&gt;ah_calibration ||</div><div class='del'>-			ath5k_hw_reg_read(ah, AR5K_PHY_IQ) &amp; AR5K_PHY_IQ_RUN)</div><div class='add'>+		ath5k_hw_reg_read(ah, AR5K_PHY_IQ) &amp; AR5K_PHY_IQ_RUN)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	ah-&gt;ah_calibration = false;</div><div class='add'>+	/* Calibration has finished, get the results and re-run */</div><div class='add'>+	for (i = 0; i &lt;= 10; i++) {</div><div class='add'>+		iq_corr = ath5k_hw_reg_read(ah, AR5K_PHY_IQRES_CAL_CORR);</div><div class='add'>+		i_pwr = ath5k_hw_reg_read(ah, AR5K_PHY_IQRES_CAL_PWR_I);</div><div class='add'>+		q_pwr = ath5k_hw_reg_read(ah, AR5K_PHY_IQRES_CAL_PWR_Q);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	iq_corr = ath5k_hw_reg_read(ah, AR5K_PHY_IQRES_CAL_CORR);</div><div class='del'>-	i_pwr = ath5k_hw_reg_read(ah, AR5K_PHY_IQRES_CAL_PWR_I);</div><div class='del'>-	q_pwr = ath5k_hw_reg_read(ah, AR5K_PHY_IQRES_CAL_PWR_Q);</div><div class='ctx'> 	i_coffd = ((i_pwr &gt;&gt; 1) + (q_pwr &gt;&gt; 1)) &gt;&gt; 7;</div><div class='del'>-	q_coffd = q_pwr &gt;&gt; 6;</div><div class='add'>+	q_coffd = q_pwr &gt;&gt; 7;</div><div class='ctx'> </div><div class='add'>+	/* No correction */</div><div class='ctx'> 	if (i_coffd == 0 || q_coffd == 0)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	i_coff = ((-iq_corr) / i_coffd) &amp; 0x3f;</div><div class='del'>-	q_coff = (((s32)i_pwr / q_coffd) - 64) &amp; 0x1f;</div><div class='ctx'> </div><div class='del'>-	/* Commit new IQ value */</div><div class='add'>+	/* Boundary check */</div><div class='add'>+	if (i_coff &gt; 31)</div><div class='add'>+		i_coff = 31;</div><div class='add'>+	if (i_coff &lt; -32)</div><div class='add'>+		i_coff = -32;</div><div class='add'>+</div><div class='add'>+	q_coff = (((s32)i_pwr / q_coffd) - 128) &amp; 0x1f;</div><div class='add'>+</div><div class='add'>+	/* Boundary check */</div><div class='add'>+	if (q_coff &gt; 15)</div><div class='add'>+		q_coff = 15;</div><div class='add'>+	if (q_coff &lt; -16)</div><div class='add'>+		q_coff = -16;</div><div class='add'>+</div><div class='add'>+	/* Commit new I/Q value */</div><div class='ctx'> 	AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_IQ, AR5K_PHY_IQ_CORR_ENABLE |</div><div class='ctx'> 		((u32)q_coff) | ((u32)i_coff &lt;&lt; AR5K_PHY_IQ_CORR_Q_I_COFF_S));</div><div class='ctx'> </div><div class='add'>+	/* Re-enable calibration -if we don't we'll commit</div><div class='add'>+	 * the same values again and again */</div><div class='add'>+	AR5K_REG_WRITE_BITS(ah, AR5K_PHY_IQ,</div><div class='add'>+			AR5K_PHY_IQ_CAL_NUM_LOG_MAX, 15);</div><div class='add'>+	AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_IQ, AR5K_PHY_IQ_RUN);</div><div class='add'>+</div><div class='ctx'> done:</div><div class='add'>+</div><div class='add'>+	/* TODO: Separate noise floor calibration from I/Q calibration</div><div class='add'>+	 * since noise floor calibration interrupts rx path while I/Q</div><div class='add'>+	 * calibration doesn't. We don't need to run noise floor calibration</div><div class='add'>+	 * as often as I/Q calibration.*/</div><div class='ctx'> 	ath5k_hw_noise_floor_calibration(ah, channel-&gt;center_freq);</div><div class='ctx'> </div><div class='ctx'> 	/* Request RF gain */</div><div class='head'>diff --git a/drivers/net/wireless/ath5k/reg.h b/drivers/net/wireless/ath5k/reg.h<br/>index 30629b3e37c2..7562bf173d3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/reg.h?id=d4738792fb86600b6cb7220459d9c47e819b3580'>drivers/net/wireless/ath5k/reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath5k/reg.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath5k/reg.h</a></div><div class='hunk'>@@ -53,7 +53,7 @@</div><div class='ctx'> #define AR5K_CR_TXD0	0x00000008	/* TX Disable for queue 0 on 5210 */</div><div class='ctx'> #define AR5K_CR_TXD1	0x00000010	/* TX Disable for queue 1 on 5210 */</div><div class='ctx'> #define	AR5K_CR_RXD	0x00000020	/* RX Disable */</div><div class='del'>-#define	AR5K_CR_SWI	0x00000040</div><div class='add'>+#define	AR5K_CR_SWI	0x00000040	/* Software Interrupt */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * RX Descriptor Pointer register</div><div class='hunk'>@@ -65,19 +65,19 @@</div><div class='ctx'>  */</div><div class='ctx'> #define	AR5K_CFG		0x0014			/* Register Address */</div><div class='ctx'> #define	AR5K_CFG_SWTD		0x00000001	/* Byte-swap TX descriptor (for big endian archs) */</div><div class='del'>-#define	AR5K_CFG_SWTB		0x00000002	/* Byte-swap TX buffer (?) */</div><div class='add'>+#define	AR5K_CFG_SWTB		0x00000002	/* Byte-swap TX buffer */</div><div class='ctx'> #define	AR5K_CFG_SWRD		0x00000004	/* Byte-swap RX descriptor */</div><div class='del'>-#define	AR5K_CFG_SWRB		0x00000008	/* Byte-swap RX buffer (?) */</div><div class='del'>-#define	AR5K_CFG_SWRG		0x00000010	/* Byte-swap Register values (?) */</div><div class='del'>-#define AR5K_CFG_ADHOC		0x00000020 	/* [5211+] */</div><div class='add'>+#define	AR5K_CFG_SWRB		0x00000008	/* Byte-swap RX buffer */</div><div class='add'>+#define	AR5K_CFG_SWRG		0x00000010	/* Byte-swap Register access */</div><div class='add'>+#define AR5K_CFG_ADHOC		0x00000020 	/* AP/Adhoc indication [5211+] */</div><div class='ctx'> #define AR5K_CFG_PHY_OK		0x00000100	/* [5211+] */</div><div class='ctx'> #define AR5K_CFG_EEBS		0x00000200	/* EEPROM is busy */</div><div class='del'>-#define	AR5K_CFG_CLKGD		0x00000400	/* Clock gated (?) */</div><div class='add'>+#define	AR5K_CFG_CLKGD		0x00000400	/* Clock gated (Disable dynamic clock) */</div><div class='ctx'> #define AR5K_CFG_TXCNT		0x00007800	/* Tx frame count (?) [5210] */</div><div class='ctx'> #define AR5K_CFG_TXCNT_S	11</div><div class='ctx'> #define AR5K_CFG_TXFSTAT	0x00008000	/* Tx frame status (?) [5210] */</div><div class='ctx'> #define AR5K_CFG_TXFSTRT	0x00010000	/* [5210] */</div><div class='del'>-#define	AR5K_CFG_PCI_THRES	0x00060000	/* [5211+] */</div><div class='add'>+#define	AR5K_CFG_PCI_THRES	0x00060000	/* PCI Master req q threshold [5211+] */</div><div class='ctx'> #define	AR5K_CFG_PCI_THRES_S	17</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -162,35 +162,40 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Transmit configuration register</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_TXCFG		0x0030			/* Register Address */</div><div class='del'>-#define AR5K_TXCFG_SDMAMR	0x00000007	/* DMA size */</div><div class='del'>-#define AR5K_TXCFG_SDMAMR_S	0</div><div class='del'>-#define AR5K_TXCFG_B_MODE	0x00000008	/* Set b mode for 5111 (enable 2111) */</div><div class='del'>-#define AR5K_TXCFG_TXFSTP	0x00000008	/* TX DMA full Stop [5210] */</div><div class='del'>-#define AR5K_TXCFG_TXFULL	0x000003f0	/* TX Triger level mask */</div><div class='del'>-#define AR5K_TXCFG_TXFULL_S	4</div><div class='del'>-#define AR5K_TXCFG_TXFULL_0B	0x00000000</div><div class='del'>-#define AR5K_TXCFG_TXFULL_64B	0x00000010</div><div class='del'>-#define AR5K_TXCFG_TXFULL_128B	0x00000020</div><div class='del'>-#define AR5K_TXCFG_TXFULL_192B	0x00000030</div><div class='del'>-#define AR5K_TXCFG_TXFULL_256B	0x00000040</div><div class='del'>-#define AR5K_TXCFG_TXCONT_EN	0x00000080</div><div class='del'>-#define AR5K_TXCFG_DMASIZE	0x00000100	/* Flag for passing DMA size [5210] */</div><div class='del'>-#define AR5K_TXCFG_JUMBO_TXE	0x00000400	/* Enable jumbo frames transmition (?) [5211+] */</div><div class='del'>-#define AR5K_TXCFG_RTSRND	0x00001000	/* [5211+] */</div><div class='del'>-#define AR5K_TXCFG_FRMPAD_DIS	0x00002000	/* [5211+] */</div><div class='del'>-#define AR5K_TXCFG_RDY_DIS	0x00004000	/* [5211+] */</div><div class='add'>+#define AR5K_TXCFG			0x0030			/* Register Address */</div><div class='add'>+#define AR5K_TXCFG_SDMAMR		0x00000007	/* DMA size (read) */</div><div class='add'>+#define AR5K_TXCFG_SDMAMR_S		0</div><div class='add'>+#define AR5K_TXCFG_B_MODE		0x00000008	/* Set b mode for 5111 (enable 2111) */</div><div class='add'>+#define AR5K_TXCFG_TXFSTP		0x00000008	/* TX DMA full Stop [5210] */</div><div class='add'>+#define AR5K_TXCFG_TXFULL		0x000003f0	/* TX Triger level mask */</div><div class='add'>+#define AR5K_TXCFG_TXFULL_S		4</div><div class='add'>+#define AR5K_TXCFG_TXFULL_0B		0x00000000</div><div class='add'>+#define AR5K_TXCFG_TXFULL_64B		0x00000010</div><div class='add'>+#define AR5K_TXCFG_TXFULL_128B		0x00000020</div><div class='add'>+#define AR5K_TXCFG_TXFULL_192B		0x00000030</div><div class='add'>+#define AR5K_TXCFG_TXFULL_256B		0x00000040</div><div class='add'>+#define AR5K_TXCFG_TXCONT_EN		0x00000080</div><div class='add'>+#define AR5K_TXCFG_DMASIZE		0x00000100	/* Flag for passing DMA size [5210] */</div><div class='add'>+#define AR5K_TXCFG_JUMBO_DESC_EN	0x00000400	/* Enable jumbo tx descriptors [5211+] */</div><div class='add'>+#define AR5K_TXCFG_ADHOC_BCN_ATIM	0x00000800	/* Adhoc Beacon ATIM Policy */</div><div class='add'>+#define AR5K_TXCFG_ATIM_WINDOW_DEF_DIS	0x00001000	/* Disable ATIM window defer [5211+] */</div><div class='add'>+#define AR5K_TXCFG_RTSRND		0x00001000	/* [5211+] */</div><div class='add'>+#define AR5K_TXCFG_FRMPAD_DIS		0x00002000	/* [5211+] */</div><div class='add'>+#define AR5K_TXCFG_RDY_CBR_DIS		0x00004000	/* Ready time CBR disable [5211+] */</div><div class='add'>+#define AR5K_TXCFG_JUMBO_FRM_MODE	0x00008000	/* Jumbo frame mode [5211+] */</div><div class='add'>+#define AR5K_TXCFG_DCU_CACHING_DIS	0x00010000	/* Disable DCU caching */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Receive configuration register</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_RXCFG		0x0034			/* Register Address */</div><div class='del'>-#define AR5K_RXCFG_SDMAMW	0x00000007	/* DMA size */</div><div class='add'>+#define AR5K_RXCFG_SDMAMW	0x00000007	/* DMA size (write) */</div><div class='ctx'> #define AR5K_RXCFG_SDMAMW_S	0</div><div class='del'>-#define	AR5K_RXCFG_DEF_ANTENNA	0x00000008	/* Default antenna */</div><div class='del'>-#define AR5K_RXCFG_ZLFDMA	0x00000010	/* Zero-length DMA */</div><div class='del'>-#define AR5K_RXCFG_JUMBO_RXE	0x00000020	/* Enable jumbo frames reception (?) [5211+] */</div><div class='del'>-#define AR5K_RXCFG_JUMBO_WRAP	0x00000040	/* Wrap jumbo frames (?) [5211+] */</div><div class='add'>+#define AR5K_RXCFG_ZLFDMA	0x00000008	/* Enable Zero-length frame DMA */</div><div class='add'>+#define	AR5K_RXCFG_DEF_ANTENNA	0x00000010	/* Default antenna (?) */</div><div class='add'>+#define AR5K_RXCFG_JUMBO_RXE	0x00000020	/* Enable jumbo rx descriptors [5211+] */</div><div class='add'>+#define AR5K_RXCFG_JUMBO_WRAP	0x00000040	/* Wrap jumbo frames [5211+] */</div><div class='add'>+#define AR5K_RXCFG_SLE_ENTRY	0x00000080	/* Sleep entry policy */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Receive jumbo descriptor last address register</div><div class='hunk'>@@ -202,35 +207,35 @@</div><div class='ctx'>  * MIB control register</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_MIBC		0x0040			/* Register Address */</div><div class='del'>-#define AR5K_MIBC_COW		0x00000001</div><div class='del'>-#define AR5K_MIBC_FMC		0x00000002	/* Freeze Mib Counters (?) */</div><div class='del'>-#define AR5K_MIBC_CMC		0x00000004	/* Clean Mib Counters (?) */</div><div class='del'>-#define AR5K_MIBC_MCS		0x00000008</div><div class='add'>+#define AR5K_MIBC_COW		0x00000001	/* Warn test indicator */</div><div class='add'>+#define AR5K_MIBC_FMC		0x00000002	/* Freeze MIB Counters  */</div><div class='add'>+#define AR5K_MIBC_CMC		0x00000004	/* Clean MIB Counters  */</div><div class='add'>+#define AR5K_MIBC_MCS		0x00000008	/* MIB counter strobe */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Timeout prescale register</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_TOPS		0x0044</div><div class='del'>-#define	AR5K_TOPS_M		0x0000ffff	/* [5211+] (?) */</div><div class='add'>+#define	AR5K_TOPS_M		0x0000ffff</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Receive timeout register (no frame received)</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_RXNOFRM		0x0048</div><div class='del'>-#define	AR5K_RXNOFRM_M		0x000003ff	/* [5211+] (?) */</div><div class='add'>+#define	AR5K_RXNOFRM_M		0x000003ff</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Transmit timeout register (no frame sent)</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_TXNOFRM		0x004c</div><div class='del'>-#define	AR5K_TXNOFRM_M		0x000003ff	/* [5211+] (?) */</div><div class='del'>-#define	AR5K_TXNOFRM_QCU	0x000ffc00	/* [5211+] (?) */</div><div class='add'>+#define	AR5K_TXNOFRM_M		0x000003ff</div><div class='add'>+#define	AR5K_TXNOFRM_QCU	0x000ffc00</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Receive frame gap timeout register</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_RPGTO		0x0050</div><div class='del'>-#define AR5K_RPGTO_M		0x000003ff	/* [5211+] (?) */</div><div class='add'>+#define AR5K_RPGTO_M		0x000003ff</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Receive frame count limit register</div><div class='hunk'>@@ -241,6 +246,7 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Misc settings register</div><div class='add'>+ * (reserved0-3)</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_MISC		0x0058			/* Register Address */</div><div class='ctx'> #define	AR5K_MISC_DMA_OBS_M	0x000001e0</div><div class='hunk'>@@ -256,6 +262,7 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * QCU/DCU clock gating register (5311)</div><div class='add'>+ * (reserved4-5)</div><div class='ctx'>  */</div><div class='ctx'> #define	AR5K_QCUDCU_CLKGT	0x005c			/* Register Address (?) */</div><div class='ctx'> #define	AR5K_QCUDCU_CLKGT_QCU	0x0000ffff	/* Mask for QCU clock */</div><div class='hunk'>@@ -284,18 +291,18 @@</div><div class='ctx'> #define AR5K_ISR_TXEOL		0x00000400	/* Empty TX descriptor */</div><div class='ctx'> #define AR5K_ISR_TXURN		0x00000800	/* Transmit FIFO underrun */</div><div class='ctx'> #define AR5K_ISR_MIB		0x00001000	/* Update MIB counters */</div><div class='del'>-#define AR5K_ISR_SWI		0x00002000	/* Software interrupt (?) */</div><div class='add'>+#define AR5K_ISR_SWI		0x00002000	/* Software interrupt */</div><div class='ctx'> #define AR5K_ISR_RXPHY		0x00004000	/* PHY error */</div><div class='del'>-#define AR5K_ISR_RXKCM		0x00008000</div><div class='add'>+#define AR5K_ISR_RXKCM		0x00008000	/* RX Key cache miss */</div><div class='ctx'> #define AR5K_ISR_SWBA		0x00010000	/* Software beacon alert */</div><div class='ctx'> #define AR5K_ISR_BRSSI		0x00020000</div><div class='ctx'> #define AR5K_ISR_BMISS		0x00040000	/* Beacon missed */</div><div class='ctx'> #define AR5K_ISR_HIUERR		0x00080000	/* Host Interface Unit error [5211+] */</div><div class='ctx'> #define AR5K_ISR_BNR		0x00100000 	/* Beacon not ready [5211+] */</div><div class='del'>-#define AR5K_ISR_MCABT		0x00100000	/* [5210] */</div><div class='del'>-#define AR5K_ISR_RXCHIRP	0x00200000	/* [5212+] */</div><div class='del'>-#define AR5K_ISR_SSERR		0x00200000	/* [5210] */</div><div class='del'>-#define AR5K_ISR_DPERR		0x00400000	/* [5210] */</div><div class='add'>+#define AR5K_ISR_MCABT		0x00100000	/* Master Cycle Abort [5210] */</div><div class='add'>+#define AR5K_ISR_RXCHIRP	0x00200000	/* CHIRP Received [5212+] */</div><div class='add'>+#define AR5K_ISR_SSERR		0x00200000	/* Signaled System Error [5210] */</div><div class='add'>+#define AR5K_ISR_DPERR		0x00400000	/* Det par Error (?) [5210] */</div><div class='ctx'> #define AR5K_ISR_TIM		0x00800000	/* [5210] */</div><div class='ctx'> #define AR5K_ISR_BCNMISC	0x00800000	/* [5212+] */</div><div class='ctx'> #define AR5K_ISR_GPIO		0x01000000	/* GPIO (rf kill)*/</div><div class='hunk'>@@ -320,14 +327,14 @@</div><div class='ctx'> </div><div class='ctx'> #define AR5K_SISR2		0x008c			/* Register Address [5211+] */</div><div class='ctx'> #define AR5K_SISR2_QCU_TXURN	0x000003ff	/* Mask for QCU_TXURN */</div><div class='del'>-#define	AR5K_SISR2_MCABT	0x00100000</div><div class='del'>-#define	AR5K_SISR2_SSERR	0x00200000</div><div class='del'>-#define	AR5K_SISR2_DPERR	0x00400000</div><div class='add'>+#define	AR5K_SISR2_MCABT	0x00100000	/* Master Cycle Abort */</div><div class='add'>+#define	AR5K_SISR2_SSERR	0x00200000	/* Signaled System Error */</div><div class='add'>+#define	AR5K_SISR2_DPERR	0x00400000	/* Det par Error (?) */</div><div class='ctx'> #define	AR5K_SISR2_TIM		0x01000000	/* [5212+] */</div><div class='ctx'> #define	AR5K_SISR2_CAB_END	0x02000000	/* [5212+] */</div><div class='del'>-#define	AR5K_SISR2_DTIM_SYNC	0x04000000	/* [5212+] */</div><div class='del'>-#define	AR5K_SISR2_BCN_TIMEOUT	0x08000000	/* [5212+] */</div><div class='del'>-#define	AR5K_SISR2_CAB_TIMEOUT	0x10000000	/* [5212+] */</div><div class='add'>+#define	AR5K_SISR2_DTIM_SYNC	0x04000000	/* DTIM sync lost [5212+] */</div><div class='add'>+#define	AR5K_SISR2_BCN_TIMEOUT	0x08000000	/* Beacon Timeout [5212+] */</div><div class='add'>+#define	AR5K_SISR2_CAB_TIMEOUT	0x10000000	/* CAB Timeout [5212+] */</div><div class='ctx'> #define	AR5K_SISR2_DTIM		0x20000000	/* [5212+] */</div><div class='ctx'> </div><div class='ctx'> #define AR5K_SISR3		0x0090			/* Register Address [5211+] */</div><div class='hunk'>@@ -368,18 +375,18 @@</div><div class='ctx'> #define AR5K_IMR_TXEOL		0x00000400	/* Empty TX descriptor*/</div><div class='ctx'> #define AR5K_IMR_TXURN		0x00000800	/* Transmit FIFO underrun*/</div><div class='ctx'> #define AR5K_IMR_MIB		0x00001000	/* Update MIB counters*/</div><div class='del'>-#define AR5K_IMR_SWI		0x00002000</div><div class='add'>+#define AR5K_IMR_SWI		0x00002000	/* Software interrupt */</div><div class='ctx'> #define AR5K_IMR_RXPHY		0x00004000	/* PHY error*/</div><div class='del'>-#define AR5K_IMR_RXKCM		0x00008000</div><div class='add'>+#define AR5K_IMR_RXKCM		0x00008000	/* RX Key cache miss */</div><div class='ctx'> #define AR5K_IMR_SWBA		0x00010000	/* Software beacon alert*/</div><div class='ctx'> #define AR5K_IMR_BRSSI		0x00020000</div><div class='ctx'> #define AR5K_IMR_BMISS		0x00040000	/* Beacon missed*/</div><div class='ctx'> #define AR5K_IMR_HIUERR		0x00080000	/* Host Interface Unit error [5211+] */</div><div class='ctx'> #define AR5K_IMR_BNR		0x00100000 	/* Beacon not ready [5211+] */</div><div class='del'>-#define AR5K_IMR_MCABT		0x00100000	/* [5210] */</div><div class='del'>-#define AR5K_IMR_RXCHIRP	0x00200000	/* [5212+]*/</div><div class='del'>-#define AR5K_IMR_SSERR		0x00200000	/* [5210] */</div><div class='del'>-#define AR5K_IMR_DPERR		0x00400000	/* [5210] */</div><div class='add'>+#define AR5K_IMR_MCABT		0x00100000	/* Master Cycle Abort [5210] */</div><div class='add'>+#define AR5K_IMR_RXCHIRP	0x00200000	/* CHIRP Received [5212+]*/</div><div class='add'>+#define AR5K_IMR_SSERR		0x00200000	/* Signaled System Error [5210] */</div><div class='add'>+#define AR5K_IMR_DPERR		0x00400000	/* Det par Error (?) [5210] */</div><div class='ctx'> #define AR5K_IMR_TIM		0x00800000	/* [5211+] */</div><div class='ctx'> #define AR5K_IMR_BCNMISC	0x00800000	/* [5212+] */</div><div class='ctx'> #define AR5K_IMR_GPIO		0x01000000	/* GPIO (rf kill)*/</div><div class='hunk'>@@ -405,14 +412,14 @@</div><div class='ctx'> #define AR5K_SIMR2		0x00ac			/* Register Address [5211+] */</div><div class='ctx'> #define AR5K_SIMR2_QCU_TXURN	0x000003ff	/* Mask for QCU_TXURN */</div><div class='ctx'> #define AR5K_SIMR2_QCU_TXURN_S	0</div><div class='del'>-#define	AR5K_SIMR2_MCABT	0x00100000</div><div class='del'>-#define	AR5K_SIMR2_SSERR	0x00200000</div><div class='del'>-#define	AR5K_SIMR2_DPERR	0x00400000</div><div class='add'>+#define	AR5K_SIMR2_MCABT	0x00100000	/* Master Cycle Abort */</div><div class='add'>+#define	AR5K_SIMR2_SSERR	0x00200000	/* Signaled System Error */</div><div class='add'>+#define	AR5K_SIMR2_DPERR	0x00400000	/* Det par Error (?) */</div><div class='ctx'> #define	AR5K_SIMR2_TIM		0x01000000	/* [5212+] */</div><div class='ctx'> #define	AR5K_SIMR2_CAB_END	0x02000000	/* [5212+] */</div><div class='del'>-#define	AR5K_SIMR2_DTIM_SYNC	0x04000000	/* [5212+] */</div><div class='del'>-#define	AR5K_SIMR2_BCN_TIMEOUT	0x08000000	/* [5212+] */</div><div class='del'>-#define	AR5K_SIMR2_CAB_TIMEOUT	0x10000000	/* [5212+] */</div><div class='add'>+#define	AR5K_SIMR2_DTIM_SYNC	0x04000000	/* DTIM Sync lost [5212+] */</div><div class='add'>+#define	AR5K_SIMR2_BCN_TIMEOUT	0x08000000	/* Beacon Timeout [5212+] */</div><div class='add'>+#define	AR5K_SIMR2_CAB_TIMEOUT	0x10000000	/* CAB Timeout [5212+] */</div><div class='ctx'> #define	AR5K_SIMR2_DTIM		0x20000000	/* [5212+] */</div><div class='ctx'> </div><div class='ctx'> #define AR5K_SIMR3		0x00b0			/* Register Address [5211+] */</div><div class='hunk'>@@ -425,23 +432,69 @@</div><div class='ctx'> #define AR5K_SIMR4_QTRIG	0x000003ff	/* Mask for QTRIG */</div><div class='ctx'> #define AR5K_SIMR4_QTRIG_S	0</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * DMA Debug registers 0-7</div><div class='add'>+ * 0xe0 - 0xfc</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Decompression mask registers [5212+]</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_DCM_ADDR		0x0400		/*Decompression mask address (?)*/</div><div class='del'>-#define AR5K_DCM_DATA		0x0404		/*Decompression mask data (?)*/</div><div class='add'>+#define AR5K_DCM_ADDR		0x0400		/*Decompression mask address (index) */</div><div class='add'>+#define AR5K_DCM_DATA		0x0404		/*Decompression mask data */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wake On Wireless pattern control register [5212+]</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_WOW_PCFG			0x0410			/* Register Address */</div><div class='add'>+#define	AR5K_WOW_PCFG_PAT_MATCH_EN	0x00000001	/* Pattern match enable */</div><div class='add'>+#define	AR5K_WOW_PCFG_LONG_FRAME_POL	0x00000002	/* Long frame policy */</div><div class='add'>+#define	AR5K_WOW_PCFG_WOBMISS		0x00000004	/* Wake on bea(con) miss (?) */</div><div class='add'>+#define	AR5K_WOW_PCFG_PAT_0_EN		0x00000100	/* Enable pattern 0 */</div><div class='add'>+#define	AR5K_WOW_PCFG_PAT_1_EN		0x00000200	/* Enable pattern 1 */</div><div class='add'>+#define	AR5K_WOW_PCFG_PAT_2_EN		0x00000400	/* Enable pattern 2 */</div><div class='add'>+#define	AR5K_WOW_PCFG_PAT_3_EN		0x00000800	/* Enable pattern 3 */</div><div class='add'>+#define	AR5K_WOW_PCFG_PAT_4_EN		0x00001000	/* Enable pattern 4 */</div><div class='add'>+#define	AR5K_WOW_PCFG_PAT_5_EN		0x00002000	/* Enable pattern 5 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wake On Wireless pattern index register (?) [5212+]</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_WOW_PAT_IDX	0x0414</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wake On Wireless pattern data register [5212+]</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_WOW_PAT_DATA	0x0418			/* Register Address */</div><div class='add'>+#define	AR5K_WOW_PAT_DATA_0_3_V	0x00000001	/* Pattern 0, 3 value */</div><div class='add'>+#define	AR5K_WOW_PAT_DATA_1_4_V	0x00000100	/* Pattern 1, 4 value */</div><div class='add'>+#define	AR5K_WOW_PAT_DATA_2_5_V	0x00010000	/* Pattern 2, 5 value */</div><div class='add'>+#define	AR5K_WOW_PAT_DATA_0_3_M	0x01000000	/* Pattern 0, 3 mask */</div><div class='add'>+#define	AR5K_WOW_PAT_DATA_1_4_M	0x04000000	/* Pattern 1, 4 mask */</div><div class='add'>+#define	AR5K_WOW_PAT_DATA_2_5_M	0x10000000	/* Pattern 2, 5 mask */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Decompression configuration registers [5212+]</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_DCCFG		0x0420</div><div class='add'>+#define AR5K_DCCFG		0x0420			/* Register Address */</div><div class='add'>+#define AR5K_DCCFG_GLOBAL_EN	0x00000001	/* Enable decompression on all queues */</div><div class='add'>+#define AR5K_DCCFG_BYPASS_EN	0x00000002	/* Bypass decompression */</div><div class='add'>+#define AR5K_DCCFG_BCAST_EN	0x00000004	/* Enable decompression for bcast frames */</div><div class='add'>+#define AR5K_DCCFG_MCAST_EN	0x00000008	/* Enable decompression for mcast frames */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Compression configuration registers [5212+]</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_CCFG		0x0600</div><div class='del'>-#define AR5K_CCFG_CUP		0x0604</div><div class='add'>+#define AR5K_CCFG		0x0600			/* Register Address */</div><div class='add'>+#define	AR5K_CCFG_WINDOW_SIZE	0x00000007	/* Compression window size */</div><div class='add'>+#define	AR5K_CCFG_CPC_EN	0x00000008	/* Enable performance counters */</div><div class='add'>+</div><div class='add'>+#define AR5K_CCFG_CCU		0x0604			/* Register Address */</div><div class='add'>+#define AR5K_CCFG_CCU_CUP_EN	0x00000001	/* CCU Catchup enable */</div><div class='add'>+#define AR5K_CCFG_CCU_CREDIT	0x00000002	/* CCU Credit (field) */</div><div class='add'>+#define AR5K_CCFG_CCU_CD_THRES	0x00000080	/* CCU Cyc(lic?) debt threshold (field) */</div><div class='add'>+#define AR5K_CCFG_CCU_CUP_LCNT	0x00010000	/* CCU Catchup lit(?) count */</div><div class='add'>+#define	AR5K_CCFG_CCU_INIT	0x00100200	/* Initial value during reset */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Compression performance counter registers [5212+]</div><div class='hunk'>@@ -450,7 +503,7 @@</div><div class='ctx'> #define AR5K_CPC1		0x0614		/* Compression performance counter 1*/</div><div class='ctx'> #define AR5K_CPC2		0x0618		/* Compression performance counter 2 */</div><div class='ctx'> #define AR5K_CPC3		0x061c		/* Compression performance counter 3 */</div><div class='del'>-#define AR5K_CPCORN		0x0620		/* Compression performance overrun (?) */</div><div class='add'>+#define AR5K_CPCOVF		0x0620		/* Compression performance overflow */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -466,8 +519,6 @@</div><div class='ctx'>  * set/clear, which contain status for all queues (we shift by 1 for each</div><div class='ctx'>  * queue). To access these registers easily we define some macros here</div><div class='ctx'>  * that are used inside HAL. For more infos check out *_tx_queue functs.</div><div class='del'>- *</div><div class='del'>- * TODO: Boundary checking on macros (here?)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -513,7 +564,6 @@</div><div class='ctx'> #define	AR5K_QCU_RDYTIMECFG_BASE	0x0900	/* Register Address - Queue0 RDYTIMECFG */</div><div class='ctx'> #define	AR5K_QCU_RDYTIMECFG_INTVAL	0x00ffffff	/* Ready time interval mask */</div><div class='ctx'> #define AR5K_QCU_RDYTIMECFG_INTVAL_S	0</div><div class='del'>-#define	AR5K_QCU_RDYTIMECFG_DURATION	0x00ffffff	/* Ready time duration mask */</div><div class='ctx'> #define	AR5K_QCU_RDYTIMECFG_ENABLE	0x01000000	/* Ready time enable mask */</div><div class='ctx'> #define AR5K_QUEUE_RDYTIMECFG(_q)	AR5K_QUEUE_REG(AR5K_QCU_RDYTIMECFG_BASE, _q)</div><div class='ctx'> </div><div class='hunk'>@@ -534,19 +584,20 @@</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_QCU_MISC_BASE		0x09c0			/* Register Address -Queue0 MISC */</div><div class='ctx'> #define	AR5K_QCU_MISC_FRSHED_M		0x0000000f	/* Frame sheduling mask */</div><div class='del'>-#define	AR5K_QCU_MISC_FRSHED_ASAP	0		/* ASAP */</div><div class='del'>-#define	AR5K_QCU_MISC_FRSHED_CBR	1		/* Constant Bit Rate */</div><div class='del'>-#define	AR5K_QCU_MISC_FRSHED_DBA_GT	2		/* DMA Beacon alert gated (?) */</div><div class='del'>-#define	AR5K_QCU_MISC_FRSHED_TIM_GT	3		/* Time gated (?) */</div><div class='add'>+#define	AR5K_QCU_MISC_FRSHED_ASAP		0	/* ASAP */</div><div class='add'>+#define	AR5K_QCU_MISC_FRSHED_CBR		1	/* Constant Bit Rate */</div><div class='add'>+#define	AR5K_QCU_MISC_FRSHED_DBA_GT		2	/* DMA Beacon alert gated (?) */</div><div class='add'>+#define	AR5K_QCU_MISC_FRSHED_TIM_GT		3	/* Time gated (?) */</div><div class='ctx'> #define	AR5K_QCU_MISC_FRSHED_BCN_SENT_GT	4	/* Beacon sent gated (?) */</div><div class='ctx'> #define	AR5K_QCU_MISC_ONESHOT_ENABLE	0x00000010	/* Oneshot enable */</div><div class='ctx'> #define	AR5K_QCU_MISC_CBREXP		0x00000020	/* CBR expired (normal queue) */</div><div class='ctx'> #define	AR5K_QCU_MISC_CBREXP_BCN	0x00000040	/* CBR expired (beacon queue) */</div><div class='del'>-#define	AR5K_QCU_MISC_BCN_ENABLE	0x00000080	/* Beacons enabled */</div><div class='del'>-#define	AR5K_QCU_MISC_CBR_THRES_ENABLE	0x00000100	/* CBR threshold enabled (?) */</div><div class='del'>-#define	AR5K_QCU_MISC_TXE		0x00000200	/* TXE reset when RDYTIME enalbed (?) */</div><div class='del'>-#define	AR5K_QCU_MISC_CBR		0x00000400	/* CBR threshold reset (?) */</div><div class='del'>-#define	AR5K_QCU_MISC_DCU_EARLY		0x00000800	/* DCU reset (?) */</div><div class='add'>+#define	AR5K_QCU_MISC_BCN_ENABLE	0x00000080	/* Enable Beacon use */</div><div class='add'>+#define	AR5K_QCU_MISC_CBR_THRES_ENABLE	0x00000100	/* CBR threshold enabled */</div><div class='add'>+#define	AR5K_QCU_MISC_RDY_VEOL_POLICY	0x00000200	/* TXE reset when RDYTIME enalbed */</div><div class='add'>+#define	AR5K_QCU_MISC_CBR_RESET_CNT	0x00000400	/* CBR threshold (counter) reset */</div><div class='add'>+#define	AR5K_QCU_MISC_DCU_EARLY		0x00000800	/* DCU early termination */</div><div class='add'>+#define AR5K_QCU_MISC_DCU_CMP_EN	0x00001000	/* Enable frame compression */</div><div class='ctx'> #define AR5K_QUEUE_MISC(_q)		AR5K_QUEUE_REG(AR5K_QCU_MISC_BASE, _q)</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -555,7 +606,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_QCU_STS_BASE	0x0a00			/* Register Address - Queue0 STS */</div><div class='ctx'> #define	AR5K_QCU_STS_FRMPENDCNT	0x00000003	/* Frames pending counter */</div><div class='del'>-#define	AR5K_QCU_STS_CBREXPCNT	0x0000ff00	/* CBR expired counter (?) */</div><div class='add'>+#define	AR5K_QCU_STS_CBREXPCNT	0x0000ff00	/* CBR expired counter */</div><div class='ctx'> #define	AR5K_QUEUE_STATUS(_q)	AR5K_QUEUE_REG(AR5K_QCU_STS_BASE, _q)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -569,9 +620,11 @@</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_QCU_CBB_SELECT	0x0b00</div><div class='ctx'> #define AR5K_QCU_CBB_ADDR	0x0b04</div><div class='add'>+#define AR5K_QCU_CBB_ADDR_S	9</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * QCU compression buffer configuration register [5212+]</div><div class='add'>+ * (buffer size)</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_QCU_CBCFG		0x0b08</div><div class='ctx'> </div><div class='hunk'>@@ -652,80 +705,100 @@</div><div class='ctx'>  * No lockout means there is no special handling.</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_DCU_MISC_BASE		0x1100			/* Register Address -Queue0 DCU_MISC */</div><div class='del'>-#define	AR5K_DCU_MISC_BACKOFF		0x000007ff	/* Mask for backoff setting (?) */</div><div class='add'>+#define	AR5K_DCU_MISC_BACKOFF		0x000007ff	/* Mask for backoff threshold */</div><div class='ctx'> #define AR5K_DCU_MISC_BACKOFF_FRAG	0x00000200	/* Enable backoff while bursting */</div><div class='del'>-#define	AR5K_DCU_MISC_HCFPOLL_ENABLE	0x00000800	/* CF - Poll (?) */</div><div class='del'>-#define	AR5K_DCU_MISC_BACKOFF_PERSIST	0x00001000	/* Persistent backoff (?) */</div><div class='del'>-#define	AR5K_DCU_MISC_FRMPRFTCH_ENABLE	0x00002000	/* Enable frame pre-fetch (?) */</div><div class='add'>+#define	AR5K_DCU_MISC_HCFPOLL_ENABLE	0x00000800	/* CF - Poll enable */</div><div class='add'>+#define	AR5K_DCU_MISC_BACKOFF_PERSIST	0x00001000	/* Persistent backoff */</div><div class='add'>+#define	AR5K_DCU_MISC_FRMPRFTCH_ENABLE	0x00002000	/* Enable frame pre-fetch */</div><div class='ctx'> #define	AR5K_DCU_MISC_VIRTCOL		0x0000c000	/* Mask for Virtual Collision (?) */</div><div class='del'>-#define	AR5K_DCU_MISC_VIRTCOL_NORMAL	0</div><div class='del'>-#define	AR5K_DCU_MISC_VIRTCOL_MODIFIED	1</div><div class='del'>-#define	AR5K_DCU_MISC_VIRTCOL_IGNORE	2</div><div class='del'>-#define	AR5K_DCU_MISC_BCN_ENABLE	0x00010000	/* Beacon enable (?) */</div><div class='add'>+#define	AR5K_DCU_MISC_VIRTCOL_NORMAL		0</div><div class='add'>+#define	AR5K_DCU_MISC_VIRTCOL_MODIFIED		1</div><div class='add'>+#define	AR5K_DCU_MISC_VIRTCOL_IGNORE		2</div><div class='add'>+#define	AR5K_DCU_MISC_BCN_ENABLE	0x00010000	/* Enable Beacon use */</div><div class='ctx'> #define	AR5K_DCU_MISC_ARBLOCK_CTL	0x00060000	/* Arbiter lockout control mask */</div><div class='ctx'> #define	AR5K_DCU_MISC_ARBLOCK_CTL_S	17</div><div class='del'>-#define	AR5K_DCU_MISC_ARBLOCK_CTL_NONE	0		/* No arbiter lockout */</div><div class='add'>+#define	AR5K_DCU_MISC_ARBLOCK_CTL_NONE		0	/* No arbiter lockout */</div><div class='ctx'> #define	AR5K_DCU_MISC_ARBLOCK_CTL_INTFRM	1	/* Intra-frame lockout */</div><div class='ctx'> #define	AR5K_DCU_MISC_ARBLOCK_CTL_GLOBAL	2	/* Global lockout */</div><div class='del'>-#define	AR5K_DCU_MISC_ARBLOCK_IGNORE	0x00080000</div><div class='del'>-#define	AR5K_DCU_MISC_SEQ_NUM_INCR_DIS	0x00100000	/* Disable sequence number increment (?) */</div><div class='del'>-#define	AR5K_DCU_MISC_POST_FR_BKOFF_DIS	0x00200000	/* Disable post-frame backoff (?) */</div><div class='del'>-#define	AR5K_DCU_MISC_VIRT_COLL_POLICY	0x00400000	/* Virtual Collision policy (?) */</div><div class='del'>-#define	AR5K_DCU_MISC_BLOWN_IFS_POLICY	0x00800000</div><div class='add'>+#define	AR5K_DCU_MISC_ARBLOCK_IGNORE	0x00080000	/* Ignore Arbiter lockout */</div><div class='add'>+#define	AR5K_DCU_MISC_SEQ_NUM_INCR_DIS	0x00100000	/* Disable sequence number increment */</div><div class='add'>+#define	AR5K_DCU_MISC_POST_FR_BKOFF_DIS	0x00200000	/* Disable post-frame backoff */</div><div class='add'>+#define	AR5K_DCU_MISC_VIRT_COLL_POLICY	0x00400000	/* Virtual Collision cw policy */</div><div class='add'>+#define	AR5K_DCU_MISC_BLOWN_IFS_POLICY	0x00800000	/* Blown IFS policy (?) */</div><div class='ctx'> #define	AR5K_DCU_MISC_SEQNUM_CTL	0x01000000	/* Sequence number control (?) */</div><div class='ctx'> #define AR5K_QUEUE_DFS_MISC(_q)		AR5K_QUEUE_REG(AR5K_DCU_MISC_BASE, _q)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * DCU frame sequence number registers</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_DCU_SEQNUM_BASE	0x1140</div><div class='del'>-#define	AR5K_DCU_SEQNUM_M	0x00000fff</div><div class='add'>+#define AR5K_DCU_SEQNUM_BASE		0x1140</div><div class='add'>+#define	AR5K_DCU_SEQNUM_M		0x00000fff</div><div class='ctx'> #define	AR5K_QUEUE_DFS_SEQNUM(_q)	AR5K_QUEUE_REG(AR5K_DCU_SEQNUM_BASE, _q)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DCU global IFS SIFS registers</div><div class='add'>+ * DCU global IFS SIFS register</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_DCU_GBL_IFS_SIFS	0x1030</div><div class='ctx'> #define AR5K_DCU_GBL_IFS_SIFS_M	0x0000ffff</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DCU global IFS slot interval registers</div><div class='add'>+ * DCU global IFS slot interval register</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_DCU_GBL_IFS_SLOT	0x1070</div><div class='ctx'> #define AR5K_DCU_GBL_IFS_SLOT_M	0x0000ffff</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DCU global IFS EIFS registers</div><div class='add'>+ * DCU global IFS EIFS register</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_DCU_GBL_IFS_EIFS	0x10b0</div><div class='ctx'> #define AR5K_DCU_GBL_IFS_EIFS_M	0x0000ffff</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DCU global IFS misc registers</div><div class='add'>+ * DCU global IFS misc register</div><div class='add'>+ *</div><div class='add'>+ * LFSR stands for Linear Feedback Shift Register</div><div class='add'>+ * and it's used for generating pseudo-random</div><div class='add'>+ * number sequences.</div><div class='add'>+ *</div><div class='add'>+ * (If i understand corectly, random numbers are</div><div class='add'>+ * used for idle sensing -multiplied with cwmin/max etc-)</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_DCU_GBL_IFS_MISC			0x10f0			/* Register Address */</div><div class='del'>-#define	AR5K_DCU_GBL_IFS_MISC_LFSR_SLICE	0x00000007</div><div class='del'>-#define	AR5K_DCU_GBL_IFS_MISC_TURBO_MODE	0x00000008	/* Turbo mode (?) */</div><div class='del'>-#define	AR5K_DCU_GBL_IFS_MISC_SIFS_DUR_USEC	0x000003f0	/* SIFS Duration mask (?) */</div><div class='del'>-#define	AR5K_DCU_GBL_IFS_MISC_USEC_DUR		0x000ffc00</div><div class='del'>-#define	AR5K_DCU_GBL_IFS_MISC_DCU_ARB_DELAY	0x00300000</div><div class='add'>+#define	AR5K_DCU_GBL_IFS_MISC_LFSR_SLICE	0x00000007	/* LFSR Slice Select */</div><div class='add'>+#define	AR5K_DCU_GBL_IFS_MISC_TURBO_MODE	0x00000008	/* Turbo mode */</div><div class='add'>+#define	AR5K_DCU_GBL_IFS_MISC_SIFS_DUR_USEC	0x000003f0	/* SIFS Duration mask */</div><div class='add'>+#define	AR5K_DCU_GBL_IFS_MISC_USEC_DUR		0x000ffc00	/* USEC Duration mask */</div><div class='add'>+#define	AR5K_DCU_GBL_IFS_MISC_DCU_ARB_DELAY	0x00300000	/* DCU Arbiter delay mask */</div><div class='add'>+#define AR5K_DCU_GBL_IFS_MISC_SIFS_CNT_RST	0x00400000	/* SIFC cnt reset policy (?) */</div><div class='add'>+#define AR5K_DCU_GBL_IFS_MISC_AIFS_CNT_RST	0x00800000	/* AIFS cnt reset policy (?) */</div><div class='add'>+#define AR5K_DCU_GBL_IFS_MISC_RND_LFSR_SL_DIS	0x01000000	/* Disable random LFSR slice */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * DCU frame prefetch control register</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_DCU_FP		0x1230</div><div class='add'>+#define AR5K_DCU_FP			0x1230			/* Register Address */</div><div class='add'>+#define AR5K_DCU_FP_NOBURST_DCU_EN	0x00000001	/* Enable non-burst prefetch on DCU (?) */</div><div class='add'>+#define AR5K_DCU_FP_NOBURST_EN		0x00000010	/* Enable non-burst prefetch (?) */</div><div class='add'>+#define AR5K_DCU_FP_BURST_DCU_EN	0x00000020	/* Enable burst prefetch on DCU (?) */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * DCU transmit pause control/status register</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_DCU_TXP		0x1270			/* Register Address */</div><div class='del'>-#define	AR5K_DCU_TXP_M		0x000003ff	/* Tx pause mask (?) */</div><div class='del'>-#define	AR5K_DCU_TXP_STATUS	0x00010000	/* Tx pause status (?) */</div><div class='add'>+#define	AR5K_DCU_TXP_M		0x000003ff	/* Tx pause mask */</div><div class='add'>+#define	AR5K_DCU_TXP_STATUS	0x00010000	/* Tx pause status */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DCU transmit filter table 0 (32 entries)</div><div class='add'>+ */</div><div class='add'>+#define AR5K_DCU_TX_FILTER_0_BASE	0x1038</div><div class='add'>+#define	AR5K_DCU_TX_FILTER_0(_n)	(AR5K_DCU_TX_FILTER_0_BASE + (_n * 64))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DCU transmit filter register</div><div class='add'>+ * DCU transmit filter table 1 (16 entries)</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_DCU_TX_FILTER	0x1038</div><div class='add'>+#define AR5K_DCU_TX_FILTER_1_BASE	0x103c</div><div class='add'>+#define	AR5K_DCU_TX_FILTER_1(_n)	(AR5K_DCU_TX_FILTER_1_BASE + ((_n - 32) * 64))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * DCU clear transmit filter register</div><div class='hunk'>@@ -739,9 +812,6 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Reset control register</div><div class='del'>- *</div><div class='del'>- * 4 and 8 are not used in 5211/5212 and</div><div class='del'>- * 2 means "baseband reset" on 5211/5212.</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_RESET_CTL		0x4000			/* Register Address */</div><div class='ctx'> #define AR5K_RESET_CTL_PCU	0x00000001	/* Protocol Control Unit reset */</div><div class='hunk'>@@ -765,6 +835,7 @@</div><div class='ctx'> #define AR5K_SLEEP_CTL_SLE_SLP		0x00010000	/* Force chip sleep */</div><div class='ctx'> #define AR5K_SLEEP_CTL_SLE_ALLOW	0x00020000</div><div class='ctx'> #define AR5K_SLEEP_CTL_SLE_UNITS	0x00000008	/* [5211+] */</div><div class='add'>+/* more bits */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Interrupt pending register</div><div class='hunk'>@@ -776,13 +847,14 @@</div><div class='ctx'>  * Sleep force register</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_SFR	0x400c</div><div class='del'>-#define AR5K_SFR_M	0x00000001</div><div class='add'>+#define AR5K_SFR_EN	0x00000001</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PCI configuration register</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_PCICFG			0x4010			/* Register Address */</div><div class='ctx'> #define AR5K_PCICFG_EEAE		0x00000001	/* Eeprom access enable [5210] */</div><div class='add'>+#define	AR5K_PCICFG_SLEEP_CLOCK_EN	0x00000002	/* Enable sleep clock (?) */</div><div class='ctx'> #define AR5K_PCICFG_CLKRUNEN		0x00000004	/* CLKRUN enable [5211+] */</div><div class='ctx'> #define AR5K_PCICFG_EESIZE		0x00000018	/* Mask for EEPROM size [5211+] */</div><div class='ctx'> #define AR5K_PCICFG_EESIZE_S		3</div><div class='hunk'>@@ -798,19 +870,21 @@</div><div class='ctx'> #define	AR5K_PCICFG_CBEFIX_DIS		0x00000400	/* Disable CBE fix (?) */</div><div class='ctx'> #define AR5K_PCICFG_SL_INTEN		0x00000800	/* Enable interrupts when asleep (?) */</div><div class='ctx'> #define AR5K_PCICFG_LED_BCTL		0x00001000	/* Led blink (?) [5210] */</div><div class='del'>-#define AR5K_PCICFG_SL_INPEN		0x00002800	/* Sleep even whith pending interrupts (?) */</div><div class='add'>+#define	AR5K_PCICFG_UNK			0x00001000	/* Passed on some parts durring attach (?) */</div><div class='add'>+#define AR5K_PCICFG_SL_INPEN		0x00002000	/* Sleep even whith pending interrupts (?) */</div><div class='ctx'> #define AR5K_PCICFG_SPWR_DN		0x00010000	/* Mask for power status */</div><div class='ctx'> #define AR5K_PCICFG_LEDMODE		0x000e0000	/* Ledmode [5211+] */</div><div class='ctx'> #define AR5K_PCICFG_LEDMODE_PROP	0x00000000	/* Blink on standard traffic [5211+] */</div><div class='ctx'> #define AR5K_PCICFG_LEDMODE_PROM	0x00020000	/* Default mode (blink on any traffic) [5211+] */</div><div class='ctx'> #define AR5K_PCICFG_LEDMODE_PWR		0x00040000	/* Some other blinking mode  (?) [5211+] */</div><div class='ctx'> #define AR5K_PCICFG_LEDMODE_RAND	0x00060000	/* Random blinking (?) [5211+] */</div><div class='del'>-#define AR5K_PCICFG_LEDBLINK		0x00700000</div><div class='add'>+#define AR5K_PCICFG_LEDBLINK		0x00700000	/* Led blink rate */</div><div class='ctx'> #define AR5K_PCICFG_LEDBLINK_S		20</div><div class='del'>-#define AR5K_PCICFG_LEDSLOW		0x00800000	/* Slow led blink rate (?) [5211+] */</div><div class='add'>+#define AR5K_PCICFG_LEDSLOW		0x00800000	/* Slowest led blink rate [5211+] */</div><div class='ctx'> #define AR5K_PCICFG_LEDSTATE				\</div><div class='ctx'> 	(AR5K_PCICFG_LED | AR5K_PCICFG_LEDMODE |	\</div><div class='ctx'> 	AR5K_PCICFG_LEDBLINK | AR5K_PCICFG_LEDSLOW)</div><div class='add'>+#define	AR5K_PCICFG_SLEEP_CLOCK_RATE	0x03000000	/* Sleep clock rate (field) */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * "General Purpose Input/Output" (GPIO) control register</div><div class='hunk'>@@ -947,7 +1021,7 @@</div><div class='ctx'> #define AR5K_EEPROM_VERSION_4_4		0x4004</div><div class='ctx'> #define AR5K_EEPROM_VERSION_4_5		0x4005</div><div class='ctx'> #define AR5K_EEPROM_VERSION_4_6		0x4006	/* has ee_scaled_cck_delta */</div><div class='del'>-#define AR5K_EEPROM_VERSION_4_7		0x3007</div><div class='add'>+#define AR5K_EEPROM_VERSION_4_7		0x4007</div><div class='ctx'> </div><div class='ctx'> #define AR5K_EEPROM_MODE_11A		0</div><div class='ctx'> #define AR5K_EEPROM_MODE_11B		1</div><div class='hunk'>@@ -1023,10 +1097,14 @@</div><div class='ctx'> #define AR5K_EEPROM_STAT_WRDONE	0x00000008	/* EEPROM write successful */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * EEPROM config register (?)</div><div class='add'>+ * EEPROM config register</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_EEPROM_CFG	0x6010</div><div class='del'>-</div><div class='add'>+#define AR5K_EEPROM_CFG			0x6010			/* Register Addres */</div><div class='add'>+#define AR5K_EEPROM_CFG_SIZE_OVR	0x00000001</div><div class='add'>+#define AR5K_EEPROM_CFG_WR_WAIT_DIS	0x00000004	/* Disable write wait */</div><div class='add'>+#define AR5K_EEPROM_CFG_CLK_RATE	0x00000018	/* Clock rate */</div><div class='add'>+#define AR5K_EEPROM_CFG_PROT_KEY	0x00ffff00	/* Protectio key */</div><div class='add'>+#define AR5K_EEPROM_CFG_LIND_EN		0x01000000	/* Enable length indicator (?) */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1050,7 +1128,7 @@</div><div class='ctx'> #define AR5K_STA_ID1			0x8004			/* Register Address */</div><div class='ctx'> #define AR5K_STA_ID1_AP			0x00010000	/* Set AP mode */</div><div class='ctx'> #define AR5K_STA_ID1_ADHOC		0x00020000	/* Set Ad-Hoc mode */</div><div class='del'>-#define AR5K_STA_ID1_PWR_SV		0x00040000	/* Power save reporting (?) */</div><div class='add'>+#define AR5K_STA_ID1_PWR_SV		0x00040000	/* Power save reporting */</div><div class='ctx'> #define AR5K_STA_ID1_NO_KEYSRCH		0x00080000	/* No key search */</div><div class='ctx'> #define AR5K_STA_ID1_NO_PSPOLL		0x00100000	/* No power save polling [5210] */</div><div class='ctx'> #define AR5K_STA_ID1_PCF_5211		0x00100000	/* Enable PCF on [5211+] */</div><div class='hunk'>@@ -1059,9 +1137,13 @@</div><div class='ctx'> 					AR5K_STA_ID1_PCF_5210 : AR5K_STA_ID1_PCF_5211)</div><div class='ctx'> #define AR5K_STA_ID1_DEFAULT_ANTENNA	0x00200000	/* Use default antenna */</div><div class='ctx'> #define AR5K_STA_ID1_DESC_ANTENNA	0x00400000	/* Update antenna from descriptor */</div><div class='del'>-#define AR5K_STA_ID1_RTS_DEF_ANTENNA	0x00800000	/* Use default antenna for RTS (?) */</div><div class='del'>-#define AR5K_STA_ID1_ACKCTS_6MB		0x01000000	/* Use 6Mbit/s for ACK/CTS (?) */</div><div class='add'>+#define AR5K_STA_ID1_RTS_DEF_ANTENNA	0x00800000	/* Use default antenna for RTS */</div><div class='add'>+#define AR5K_STA_ID1_ACKCTS_6MB		0x01000000	/* Use 6Mbit/s for ACK/CTS */</div><div class='ctx'> #define AR5K_STA_ID1_BASE_RATE_11B	0x02000000	/* Use 11b base rate (for ACK/CTS ?) [5211+] */</div><div class='add'>+#define AR5K_STA_ID1_SELF_GEN_SECTORE	0x04000000	/* Self generate sectore (?) */</div><div class='add'>+#define AR5K_STA_ID1_CRYPT_MIC_EN	0x08000000	/* Enable MIC */</div><div class='add'>+#define AR5K_STA_ID1_KEYSRCH_MODE	0x10000000	/* Keysearch mode (?) */</div><div class='add'>+#define AR5K_STA_ID1_PRESERVE_SEQ_NUM	0x20000000	/* Preserve sequence number */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * First BSSID register (MAC address, lower 32bits)</div><div class='hunk'>@@ -1117,7 +1199,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Retry limit register for 5210 (no QCU/DCU so it's done in PCU)</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_NODCU_RETRY_LMT		0x801c			/*Register Address */</div><div class='add'>+#define AR5K_NODCU_RETRY_LMT		0x801c			/* Register Address */</div><div class='ctx'> #define AR5K_NODCU_RETRY_LMT_SH_RETRY	0x0000000f	/* Short retry limit mask */</div><div class='ctx'> #define AR5K_NODCU_RETRY_LMT_SH_RETRY_S	0</div><div class='ctx'> #define AR5K_NODCU_RETRY_LMT_LG_RETRY	0x000000f0	/* Long retry mask */</div><div class='hunk'>@@ -1136,9 +1218,9 @@</div><div class='ctx'> #define AR5K_USEC_5211			0x801c			/* Register Address [5211+] */</div><div class='ctx'> #define AR5K_USEC			(ah-&gt;ah_version == AR5K_AR5210 ? \</div><div class='ctx'> 					AR5K_USEC_5210 : AR5K_USEC_5211)</div><div class='del'>-#define AR5K_USEC_1			0x0000007f</div><div class='add'>+#define AR5K_USEC_1			0x0000007f	/* clock cycles for 1us */</div><div class='ctx'> #define AR5K_USEC_1_S			0</div><div class='del'>-#define AR5K_USEC_32			0x00003f80</div><div class='add'>+#define AR5K_USEC_32			0x00003f80	/* clock cycles for 1us while on 32Mhz clock */</div><div class='ctx'> #define AR5K_USEC_32_S			7</div><div class='ctx'> #define AR5K_USEC_TX_LATENCY_5211	0x007fc000</div><div class='ctx'> #define AR5K_USEC_TX_LATENCY_5211_S	14</div><div class='hunk'>@@ -1152,16 +1234,16 @@</div><div class='ctx'> /*</div><div class='ctx'>  * PCU beacon control register</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_BEACON_5210	0x8024</div><div class='del'>-#define AR5K_BEACON_5211	0x8020</div><div class='add'>+#define AR5K_BEACON_5210	0x8024			/*Register Address [5210] */</div><div class='add'>+#define AR5K_BEACON_5211	0x8020			/*Register Address [5211+] */</div><div class='ctx'> #define AR5K_BEACON		(ah-&gt;ah_version == AR5K_AR5210 ? \</div><div class='ctx'> 				AR5K_BEACON_5210 : AR5K_BEACON_5211)</div><div class='del'>-#define AR5K_BEACON_PERIOD	0x0000ffff</div><div class='add'>+#define AR5K_BEACON_PERIOD	0x0000ffff	/* Mask for beacon period */</div><div class='ctx'> #define AR5K_BEACON_PERIOD_S	0</div><div class='del'>-#define AR5K_BEACON_TIM		0x007f0000</div><div class='add'>+#define AR5K_BEACON_TIM		0x007f0000	/* Mask for TIM offset */</div><div class='ctx'> #define AR5K_BEACON_TIM_S	16</div><div class='del'>-#define AR5K_BEACON_ENABLE	0x00800000</div><div class='del'>-#define AR5K_BEACON_RESET_TSF	0x01000000</div><div class='add'>+#define AR5K_BEACON_ENABLE	0x00800000	/* Enable beacons */</div><div class='add'>+#define AR5K_BEACON_RESET_TSF	0x01000000	/* Force TSF reset */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * CFP period register</div><div class='hunk'>@@ -1234,7 +1316,6 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Receive filter register</div><div class='del'>- * TODO: Get these out of ar5xxx.h on ath5k</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_RX_FILTER_5210	0x804c			/* Register Address [5210] */</div><div class='ctx'> #define AR5K_RX_FILTER_5211	0x803c			/* Register Address [5211+] */</div><div class='hunk'>@@ -1307,11 +1388,11 @@</div><div class='ctx'> #define AR5K_DIAG_SW_5211		0x8048			/* Register Address [5211+] */</div><div class='ctx'> #define AR5K_DIAG_SW			(ah-&gt;ah_version == AR5K_AR5210 ? \</div><div class='ctx'> 					AR5K_DIAG_SW_5210 : AR5K_DIAG_SW_5211)</div><div class='del'>-#define AR5K_DIAG_SW_DIS_WEP_ACK	0x00000001</div><div class='del'>-#define AR5K_DIAG_SW_DIS_ACK		0x00000002	/* Disable ACKs (?) */</div><div class='del'>-#define AR5K_DIAG_SW_DIS_CTS		0x00000004	/* Disable CTSs (?) */</div><div class='del'>-#define AR5K_DIAG_SW_DIS_ENC		0x00000008	/* Disable encryption (?) */</div><div class='del'>-#define AR5K_DIAG_SW_DIS_DEC		0x00000010	/* Disable decryption (?) */</div><div class='add'>+#define AR5K_DIAG_SW_DIS_WEP_ACK	0x00000001	/* Disable ACKs if WEP key is invalid */</div><div class='add'>+#define AR5K_DIAG_SW_DIS_ACK		0x00000002	/* Disable ACKs */</div><div class='add'>+#define AR5K_DIAG_SW_DIS_CTS		0x00000004	/* Disable CTSs */</div><div class='add'>+#define AR5K_DIAG_SW_DIS_ENC		0x00000008	/* Disable encryption */</div><div class='add'>+#define AR5K_DIAG_SW_DIS_DEC		0x00000010	/* Disable decryption */</div><div class='ctx'> #define AR5K_DIAG_SW_DIS_TX		0x00000020	/* Disable transmit [5210] */</div><div class='ctx'> #define AR5K_DIAG_SW_DIS_RX_5210	0x00000040	/* Disable recieve */</div><div class='ctx'> #define AR5K_DIAG_SW_DIS_RX_5211	0x00000020</div><div class='hunk'>@@ -1329,13 +1410,13 @@</div><div class='ctx'> #define AR5K_DIAG_SW_CHAN_INFO_5211	0x00000100</div><div class='ctx'> #define AR5K_DIAG_SW_CHAN_INFO		(ah-&gt;ah_version == AR5K_AR5210 ? \</div><div class='ctx'> 					AR5K_DIAG_SW_CHAN_INFO_5210 : AR5K_DIAG_SW_CHAN_INFO_5211)</div><div class='del'>-#define AR5K_DIAG_SW_EN_SCRAM_SEED_5211	0x00000200	/* Scrambler seed (?) */</div><div class='add'>+#define AR5K_DIAG_SW_EN_SCRAM_SEED_5211	0x00000200	/* Enable scrambler seed */</div><div class='ctx'> #define AR5K_DIAG_SW_EN_SCRAM_SEED_5210	0x00000400</div><div class='ctx'> #define AR5K_DIAG_SW_EN_SCRAM_SEED	(ah-&gt;ah_version == AR5K_AR5210 ? \</div><div class='ctx'> 					AR5K_DIAG_SW_EN_SCRAM_SEED_5210 : AR5K_DIAG_SW_EN_SCRAM_SEED_5211)</div><div class='ctx'> #define AR5K_DIAG_SW_ECO_ENABLE		0x00000400	/* [5211+] */</div><div class='ctx'> #define AR5K_DIAG_SW_SCVRAM_SEED	0x0003f800	/* [5210] */</div><div class='del'>-#define AR5K_DIAG_SW_SCRAM_SEED_M	0x0001fc00	/* Scrambler seed mask (?) */</div><div class='add'>+#define AR5K_DIAG_SW_SCRAM_SEED_M	0x0001fc00	/* Scrambler seed mask */</div><div class='ctx'> #define AR5K_DIAG_SW_SCRAM_SEED_S	10</div><div class='ctx'> #define AR5K_DIAG_SW_DIS_SEQ_INC	0x00040000	/* Disable seqnum increment (?)[5210] */</div><div class='ctx'> #define AR5K_DIAG_SW_FRAME_NV0_5210	0x00080000</div><div class='hunk'>@@ -1344,6 +1425,7 @@</div><div class='ctx'> 					AR5K_DIAG_SW_FRAME_NV0_5210 : AR5K_DIAG_SW_FRAME_NV0_5211)</div><div class='ctx'> #define AR5K_DIAG_SW_OBSPT_M		0x000c0000</div><div class='ctx'> #define AR5K_DIAG_SW_OBSPT_S		18</div><div class='add'>+/* more bits */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * TSF (clock) register (lower 32 bits)</div><div class='hunk'>@@ -1369,15 +1451,34 @@</div><div class='ctx'> /*</div><div class='ctx'>  * ADDAC test register [5211+]</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_ADDAC_TEST	0x8054</div><div class='del'>-#define AR5K_ADDAC_TEST_TXCONT 0x00000001</div><div class='add'>+#define AR5K_ADDAC_TEST			0x8054			/* Register Address */</div><div class='add'>+#define AR5K_ADDAC_TEST_TXCONT 		0x00000001	/* Test continuous tx */</div><div class='add'>+#define AR5K_ADDAC_TEST_TST_MODE	0x00000002	/* Test mode */</div><div class='add'>+#define AR5K_ADDAC_TEST_LOOP_EN		0x00000004	/* Enable loop */</div><div class='add'>+#define AR5K_ADDAC_TEST_LOOP_LEN	0x00000008	/* Loop length (field) */</div><div class='add'>+#define AR5K_ADDAC_TEST_USE_U8		0x00004000	/* Use upper 8 bits */</div><div class='add'>+#define AR5K_ADDAC_TEST_MSB		0x00008000	/* State of MSB */</div><div class='add'>+#define AR5K_ADDAC_TEST_TRIG_SEL	0x00010000	/* Trigger select */</div><div class='add'>+#define AR5K_ADDAC_TEST_TRIG_PTY	0x00020000	/* Trigger polarity */</div><div class='add'>+#define AR5K_ADDAC_TEST_RXCONT		0x00040000	/* Continuous capture */</div><div class='add'>+#define AR5K_ADDAC_TEST_CAPTURE		0x00080000	/* Begin capture */</div><div class='add'>+#define AR5K_ADDAC_TEST_TST_ARM		0x00100000	/* Test ARM (Adaptive Radio Mode ?) */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Default antenna register [5211+]</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_DEFAULT_ANTENNA	0x8058</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Frame control QoS mask register (?) [5211+]</div><div class='add'>+ * (FC_QOS_MASK)</div><div class='add'>+ */</div><div class='add'>+#define AR5K_FRAME_CTL_QOSM	0x805c</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Seq mask register (?) [5211+]</div><div class='add'>+ */</div><div class='add'>+#define AR5K_SEQ_MASK	0x8060</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Retry count register [5210]</div><div class='hunk'>@@ -1449,124 +1550,242 @@</div><div class='ctx'> /*</div><div class='ctx'>  * XR (eXtended Range) mode register</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_XRMODE			0x80c0</div><div class='del'>-#define	AR5K_XRMODE_POLL_TYPE_M		0x0000003f</div><div class='add'>+#define AR5K_XRMODE			0x80c0			/* Register Address */</div><div class='add'>+#define	AR5K_XRMODE_POLL_TYPE_M		0x0000003f	/* Mask for Poll type (?) */</div><div class='ctx'> #define	AR5K_XRMODE_POLL_TYPE_S		0</div><div class='del'>-#define	AR5K_XRMODE_POLL_SUBTYPE_M	0x0000003c</div><div class='add'>+#define	AR5K_XRMODE_POLL_SUBTYPE_M	0x0000003c	/* Mask for Poll subtype (?) */</div><div class='ctx'> #define	AR5K_XRMODE_POLL_SUBTYPE_S	2</div><div class='del'>-#define	AR5K_XRMODE_POLL_WAIT_ALL	0x00000080</div><div class='del'>-#define	AR5K_XRMODE_SIFS_DELAY		0x000fff00</div><div class='del'>-#define	AR5K_XRMODE_FRAME_HOLD_M	0xfff00000</div><div class='add'>+#define	AR5K_XRMODE_POLL_WAIT_ALL	0x00000080	/* Wait for poll */</div><div class='add'>+#define	AR5K_XRMODE_SIFS_DELAY		0x000fff00	/* Mask for SIFS delay */</div><div class='add'>+#define	AR5K_XRMODE_FRAME_HOLD_M	0xfff00000	/* Mask for frame hold (?) */</div><div class='ctx'> #define	AR5K_XRMODE_FRAME_HOLD_S	20</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * XR delay register</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_XRDELAY			0x80c4</div><div class='del'>-#define AR5K_XRDELAY_SLOT_DELAY_M	0x0000ffff</div><div class='add'>+#define AR5K_XRDELAY			0x80c4			/* Register Address */</div><div class='add'>+#define AR5K_XRDELAY_SLOT_DELAY_M	0x0000ffff	/* Mask for slot delay */</div><div class='ctx'> #define AR5K_XRDELAY_SLOT_DELAY_S	0</div><div class='del'>-#define AR5K_XRDELAY_CHIRP_DELAY_M	0xffff0000</div><div class='add'>+#define AR5K_XRDELAY_CHIRP_DELAY_M	0xffff0000	/* Mask for CHIRP data delay */</div><div class='ctx'> #define AR5K_XRDELAY_CHIRP_DELAY_S	16</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * XR timeout register</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_XRTIMEOUT			0x80c8</div><div class='del'>-#define AR5K_XRTIMEOUT_CHIRP_M		0x0000ffff</div><div class='add'>+#define AR5K_XRTIMEOUT			0x80c8			/* Register Address */</div><div class='add'>+#define AR5K_XRTIMEOUT_CHIRP_M		0x0000ffff	/* Mask for CHIRP timeout */</div><div class='ctx'> #define AR5K_XRTIMEOUT_CHIRP_S		0</div><div class='del'>-#define AR5K_XRTIMEOUT_POLL_M		0xffff0000</div><div class='add'>+#define AR5K_XRTIMEOUT_POLL_M		0xffff0000	/* Mask for Poll timeout */</div><div class='ctx'> #define AR5K_XRTIMEOUT_POLL_S		16</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * XR chirp register</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_XRCHIRP			0x80cc</div><div class='del'>-#define AR5K_XRCHIRP_SEND		0x00000001</div><div class='del'>-#define AR5K_XRCHIRP_GAP		0xffff0000</div><div class='add'>+#define AR5K_XRCHIRP			0x80cc			/* Register Address */</div><div class='add'>+#define AR5K_XRCHIRP_SEND		0x00000001	/* Send CHIRP */</div><div class='add'>+#define AR5K_XRCHIRP_GAP		0xffff0000	/* Mask for CHIRP gap (?) */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * XR stomp register</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_XRSTOMP			0x80d0</div><div class='del'>-#define AR5K_XRSTOMP_TX			0x00000001</div><div class='del'>-#define AR5K_XRSTOMP_RX_ABORT		0x00000002</div><div class='del'>-#define AR5K_XRSTOMP_RSSI_THRES		0x0000ff00</div><div class='add'>+#define AR5K_XRSTOMP			0x80d0			/* Register Address */</div><div class='add'>+#define AR5K_XRSTOMP_TX			0x00000001	/* Stomp Tx (?) */</div><div class='add'>+#define AR5K_XRSTOMP_RX			0x00000002	/* Stomp Rx (?) */</div><div class='add'>+#define AR5K_XRSTOMP_TX_RSSI		0x00000004	/* Stomp Tx RSSI (?) */</div><div class='add'>+#define AR5K_XRSTOMP_TX_BSSID		0x00000008	/* Stomp Tx BSSID (?) */</div><div class='add'>+#define AR5K_XRSTOMP_DATA		0x00000010	/* Stomp data (?)*/</div><div class='add'>+#define AR5K_XRSTOMP_RSSI_THRES		0x0000ff00	/* Mask for XR RSSI threshold */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * First enhanced sleep register</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_SLEEP0			0x80d4</div><div class='del'>-#define AR5K_SLEEP0_NEXT_DTIM		0x0007ffff</div><div class='add'>+#define AR5K_SLEEP0			0x80d4			/* Register Address */</div><div class='add'>+#define AR5K_SLEEP0_NEXT_DTIM		0x0007ffff	/* Mask for next DTIM (?) */</div><div class='ctx'> #define AR5K_SLEEP0_NEXT_DTIM_S		0</div><div class='del'>-#define AR5K_SLEEP0_ASSUME_DTIM		0x00080000</div><div class='del'>-#define AR5K_SLEEP0_ENH_SLEEP_EN	0x00100000</div><div class='del'>-#define AR5K_SLEEP0_CABTO		0xff000000</div><div class='add'>+#define AR5K_SLEEP0_ASSUME_DTIM		0x00080000	/* Assume DTIM */</div><div class='add'>+#define AR5K_SLEEP0_ENH_SLEEP_EN	0x00100000	/* Enable enchanced sleep control */</div><div class='add'>+#define AR5K_SLEEP0_CABTO		0xff000000	/* Mask for CAB Time Out */</div><div class='ctx'> #define AR5K_SLEEP0_CABTO_S		24</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Second enhanced sleep register</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_SLEEP1			0x80d8</div><div class='del'>-#define AR5K_SLEEP1_NEXT_TIM		0x0007ffff</div><div class='add'>+#define AR5K_SLEEP1			0x80d8			/* Register Address */</div><div class='add'>+#define AR5K_SLEEP1_NEXT_TIM		0x0007ffff	/* Mask for next TIM (?) */</div><div class='ctx'> #define AR5K_SLEEP1_NEXT_TIM_S		0</div><div class='del'>-#define AR5K_SLEEP1_BEACON_TO		0xff000000</div><div class='add'>+#define AR5K_SLEEP1_BEACON_TO		0xff000000	/* Mask for Beacon Time Out */</div><div class='ctx'> #define AR5K_SLEEP1_BEACON_TO_S		24</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Third enhanced sleep register</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_SLEEP2			0x80dc</div><div class='del'>-#define AR5K_SLEEP2_TIM_PER		0x0000ffff</div><div class='add'>+#define AR5K_SLEEP2			0x80dc			/* Register Address */</div><div class='add'>+#define AR5K_SLEEP2_TIM_PER		0x0000ffff	/* Mask for TIM period (?) */</div><div class='ctx'> #define AR5K_SLEEP2_TIM_PER_S		0</div><div class='del'>-#define AR5K_SLEEP2_DTIM_PER		0xffff0000</div><div class='add'>+#define AR5K_SLEEP2_DTIM_PER		0xffff0000	/* Mask for DTIM period (?) */</div><div class='ctx'> #define AR5K_SLEEP2_DTIM_PER_S		16</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * BSSID mask registers</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_BSS_IDM0			0x80e0</div><div class='del'>-#define AR5K_BSS_IDM1			0x80e4</div><div class='add'>+#define AR5K_BSS_IDM0			0x80e0	/* Upper bits */</div><div class='add'>+#define AR5K_BSS_IDM1			0x80e4	/* Lower bits */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * TX power control (TPC) register</div><div class='add'>+ *</div><div class='add'>+ * XXX: PCDAC steps (0.5dbm) or DBM ?</div><div class='add'>+ *</div><div class='add'>+ * XXX: Mask changes for newer chips to 7f</div><div class='add'>+ *      like tx power table ?</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_TXPC			0x80e8</div><div class='del'>-#define AR5K_TXPC_ACK_M			0x0000003f</div><div class='add'>+#define AR5K_TXPC			0x80e8			/* Register Address */</div><div class='add'>+#define AR5K_TXPC_ACK_M			0x0000003f	/* Mask for ACK tx power */</div><div class='ctx'> #define AR5K_TXPC_ACK_S			0</div><div class='del'>-#define AR5K_TXPC_CTS_M			0x00003f00</div><div class='add'>+#define AR5K_TXPC_CTS_M			0x00003f00	/* Mask for CTS tx power */</div><div class='ctx'> #define AR5K_TXPC_CTS_S			8</div><div class='del'>-#define AR5K_TXPC_CHIRP_M		0x003f0000</div><div class='add'>+#define AR5K_TXPC_CHIRP_M		0x003f0000	/* Mask for CHIRP tx power */</div><div class='ctx'> #define AR5K_TXPC_CHIRP_S		22</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Profile count registers</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_PROFCNT_TX			0x80ec</div><div class='del'>-#define AR5K_PROFCNT_RX			0x80f0</div><div class='del'>-#define AR5K_PROFCNT_RXCLR		0x80f4</div><div class='del'>-#define AR5K_PROFCNT_CYCLE		0x80f8</div><div class='add'>+#define AR5K_PROFCNT_TX			0x80ec	/* Tx count */</div><div class='add'>+#define AR5K_PROFCNT_RX			0x80f0	/* Rx count */</div><div class='add'>+#define AR5K_PROFCNT_RXCLR		0x80f4	/* Clear Rx count */</div><div class='add'>+#define AR5K_PROFCNT_CYCLE		0x80f8	/* Cycle count (?) */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Quiet (period) control registers (?)</div><div class='add'>+ */</div><div class='add'>+#define AR5K_QUIET_CTL1			0x80fc			/* Register Address */</div><div class='add'>+#define AR5K_QUIET_CTL1_NEXT_QT		0x0000ffff	/* Mask for next quiet (period?) (?) */</div><div class='add'>+#define AR5K_QUIET_CTL1_QT_EN		0x00010000	/* Enable quiet (period?) */</div><div class='add'>+#define AR5K_QUIET_CTL2			0x8100			/* Register Address */</div><div class='add'>+#define AR5K_QUIET_CTL2_QT_PER		0x0000ffff	/* Mask for quiet period (?) */</div><div class='add'>+#define AR5K_QUIET_CTL2_QT_DUR		0xffff0000	/* Mask for quiet duration (?) */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * TSF parameter register</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_TSF_PARM			0x8104</div><div class='del'>-#define AR5K_TSF_PARM_INC_M		0x000000ff</div><div class='add'>+#define AR5K_TSF_PARM			0x8104			/* Register Address */</div><div class='add'>+#define AR5K_TSF_PARM_INC_M		0x000000ff	/* Mask for TSF increment */</div><div class='ctx'> #define AR5K_TSF_PARM_INC_S		0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * QoS register (?)</div><div class='add'>+ */</div><div class='add'>+#define AR5K_QOS			0x8108			/* Register Address */</div><div class='add'>+#define AR5K_QOS_NOACK_2BIT_VALUES	0x00000000	/* (field) */</div><div class='add'>+#define AR5K_QOS_NOACK_BIT_OFFSET	0x00000020	/* (field) */</div><div class='add'>+#define AR5K_QOS_NOACK_BYTE_OFFSET	0x00000080	/* (field) */</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * PHY error filter register</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_PHY_ERR_FIL		0x810c</div><div class='del'>-#define AR5K_PHY_ERR_FIL_RADAR		0x00000020</div><div class='del'>-#define AR5K_PHY_ERR_FIL_OFDM		0x00020000</div><div class='del'>-#define AR5K_PHY_ERR_FIL_CCK		0x02000000</div><div class='add'>+#define AR5K_PHY_ERR_FIL_RADAR		0x00000020	/* Radar signal */</div><div class='add'>+#define AR5K_PHY_ERR_FIL_OFDM		0x00020000	/* OFDM false detect (ANI) */</div><div class='add'>+#define AR5K_PHY_ERR_FIL_CCK		0x02000000	/* CCK false detect (ANI) */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * XR latency register</div><div class='add'>+ */</div><div class='add'>+#define AR5K_XRLAT_TX		0x8110</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Rate duration register</div><div class='add'>+ * ACK SIFS register</div><div class='add'>+ */</div><div class='add'>+#define AR5K_ACKSIFS		0x8114			/* Register Address */</div><div class='add'>+#define AR5K_ACKSIFS_INC	0x00000000	/* ACK SIFS Increment (field) */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MIC QoS control register (?)</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_MIC_QOS_CTL	0x8118			/* Register Address */</div><div class='add'>+#define	AR5K_MIC_QOS_CTL_0	0x00000001	/* MIC QoS control 0 (?) */</div><div class='add'>+#define	AR5K_MIC_QOS_CTL_1	0x00000004	/* MIC QoS control 1 (?) */</div><div class='add'>+#define	AR5K_MIC_QOS_CTL_2	0x00000010	/* MIC QoS control 2 (?) */</div><div class='add'>+#define	AR5K_MIC_QOS_CTL_3	0x00000040	/* MIC QoS control 3 (?) */</div><div class='add'>+#define	AR5K_MIC_QOS_CTL_4	0x00000100	/* MIC QoS control 4 (?) */</div><div class='add'>+#define	AR5K_MIC_QOS_CTL_5	0x00000400	/* MIC QoS control 5 (?) */</div><div class='add'>+#define	AR5K_MIC_QOS_CTL_6	0x00001000	/* MIC QoS control 6 (?) */</div><div class='add'>+#define	AR5K_MIC_QOS_CTL_7	0x00004000	/* MIC QoS control 7 (?) */</div><div class='add'>+#define	AR5K_MIC_QOS_CTL_MQ_EN	0x00010000	/* Enable MIC QoS */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MIC QoS select register (?)</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_MIC_QOS_SEL	0x811c</div><div class='add'>+#define	AR5K_MIC_QOS_SEL_0	0x00000001</div><div class='add'>+#define	AR5K_MIC_QOS_SEL_1	0x00000010</div><div class='add'>+#define	AR5K_MIC_QOS_SEL_2	0x00000100</div><div class='add'>+#define	AR5K_MIC_QOS_SEL_3	0x00001000</div><div class='add'>+#define	AR5K_MIC_QOS_SEL_4	0x00010000</div><div class='add'>+#define	AR5K_MIC_QOS_SEL_5	0x00100000</div><div class='add'>+#define	AR5K_MIC_QOS_SEL_6	0x01000000</div><div class='add'>+#define	AR5K_MIC_QOS_SEL_7	0x10000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Misc mode control register (?)</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_MISC_MODE			0x8120			/* Register Address */</div><div class='add'>+#define	AR5K_MISC_MODE_FBSSID_MATCH	0x00000001	/* Force BSSID match */</div><div class='add'>+#define	AR5K_MISC_MODE_ACKSIFS_MEM	0x00000002	/* ACK SIFS memory (?) */</div><div class='add'>+/* more bits */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * OFDM Filter counter</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_OFDM_FIL_CNT		0x8124</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CCK Filter counter</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_CCK_FIL_CNT		0x8128</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY Error Counters (?)</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHYERR_CNT1		0x812c</div><div class='add'>+#define	AR5K_PHYERR_CNT1_MASK		0x8130</div><div class='add'>+</div><div class='add'>+#define	AR5K_PHYERR_CNT2		0x8134</div><div class='add'>+#define	AR5K_PHYERR_CNT2_MASK		0x8138</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TSF Threshold register (?)</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_TSF_THRES			0x813c</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Rate -&gt; ACK SIFS mapping table (32 entries)</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_RATE_ACKSIFS_BASE		0x8680			/* Register Address */</div><div class='add'>+#define	AR5K_RATE_ACKSIFS(_n)		(AR5K_RATE_ACKSIFS_BSE + ((_n) &lt;&lt; 2))</div><div class='add'>+#define	AR5K_RATE_ACKSIFS_NORMAL	0x00000001	/* Normal SIFS (field) */</div><div class='add'>+#define	AR5K_RATE_ACKSIFS_TURBO		0x00000400	/* Turbo SIFS (field) */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Rate -&gt; duration mapping table (32 entries)</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_RATE_DUR_BASE		0x8700</div><div class='ctx'> #define AR5K_RATE_DUR(_n)		(AR5K_RATE_DUR_BASE + ((_n) &lt;&lt; 2))</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Rate -&gt; db mapping table</div><div class='add'>+ * (8 entries, each one has 4 8bit fields)</div><div class='add'>+ */</div><div class='add'>+#define AR5K_RATE2DB_BASE		0x87c0</div><div class='add'>+#define AR5K_RATE2DB(_n)		(AR5K_RATE2DB_BASE + ((_n) &lt;&lt; 2))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * db -&gt; Rate mapping table</div><div class='add'>+ * (8 entries, each one has 4 8bit fields)</div><div class='add'>+ */</div><div class='add'>+#define AR5K_DB2RATE_BASE		0x87e0</div><div class='add'>+#define AR5K_DB2RATE(_n)		(AR5K_DB2RATE_BASE + ((_n) &lt;&lt; 2))</div><div class='add'>+</div><div class='ctx'> /*===5212 end===*/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1613,12 +1832,34 @@</div><div class='ctx'> /*===PHY REGISTERS===*/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * PHY register</div><div class='add'>+ * PHY registers start</div><div class='ctx'>  */</div><div class='ctx'> #define	AR5K_PHY_BASE			0x9800</div><div class='ctx'> #define	AR5K_PHY(_n)			(AR5K_PHY_BASE + ((_n) &lt;&lt; 2))</div><div class='del'>-#define AR5K_PHY_SHIFT_2GHZ		0x00004007</div><div class='del'>-#define AR5K_PHY_SHIFT_5GHZ		0x00000007</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TST_2 (Misc config parameters)</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHY_TST2			0x9800			/* Register Address */</div><div class='add'>+#define AR5K_PHY_TST2_TRIG_SEL		0x00000001	/* Trigger select (?) (field ?) */</div><div class='add'>+#define AR5K_PHY_TST2_TRIG		0x00000010	/* Trigger (?) (field ?) */</div><div class='add'>+#define AR5K_PHY_TST2_CBUS_MODE		0x00000100	/* Cardbus mode (?) */</div><div class='add'>+/* bit reserved */</div><div class='add'>+#define AR5K_PHY_TST2_CLK32		0x00000400	/* CLK_OUT is CLK32 (32Khz external) */</div><div class='add'>+#define AR5K_PHY_TST2_CHANCOR_DUMP_EN	0x00000800	/* Enable Chancor dump (?) */</div><div class='add'>+#define AR5K_PHY_TST2_EVEN_CHANCOR_DUMP	0x00001000	/* Even Chancor dump (?) */</div><div class='add'>+#define AR5K_PHY_TST2_RFSILENT_EN	0x00002000	/* Enable RFSILENT */</div><div class='add'>+#define AR5K_PHY_TST2_ALT_RFDATA	0x00004000	/* Alternate RFDATA (5-2GHz switch) */</div><div class='add'>+#define AR5K_PHY_TST2_MINI_OBS_EN	0x00008000	/* Enable mini OBS (?) */</div><div class='add'>+#define AR5K_PHY_TST2_RX2_IS_RX5_INV	0x00010000	/* 2GHz rx path is the 5GHz path inverted (?) */</div><div class='add'>+#define AR5K_PHY_TST2_SLOW_CLK160	0x00020000	/* Slow CLK160 (?) */</div><div class='add'>+#define AR5K_PHY_TST2_AGC_OBS_SEL_3	0x00040000	/* AGC OBS Select 3 (?) */</div><div class='add'>+#define AR5K_PHY_TST2_BBB_OBS_SEL	0x00080000	/* BB OBS Select (field ?) */</div><div class='add'>+#define AR5K_PHY_TST2_ADC_OBS_SEL	0x00800000	/* ADC OBS Select (field ?) */</div><div class='add'>+#define AR5K_PHY_TST2_RX_CLR_SEL	0x08000000	/* RX Clear Select (?) */</div><div class='add'>+#define AR5K_PHY_TST2_FORCE_AGC_CLR	0x10000000	/* Force AGC clear (?) */</div><div class='add'>+#define AR5K_PHY_SHIFT_2GHZ		0x00004007	/* Used to access 2GHz radios */</div><div class='add'>+#define AR5K_PHY_SHIFT_5GHZ		0x00000007	/* Used to access 5GHz radios (default) */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY frame control register [5110] /turbo mode register [5111+]</div><div class='hunk'>@@ -1630,18 +1871,21 @@</div><div class='ctx'>  * a "turbo mode register" for 5110. We treat this one as</div><div class='ctx'>  * a frame control register for 5110 below.</div><div class='ctx'>  */</div><div class='del'>-#define	AR5K_PHY_TURBO			0x9804</div><div class='del'>-#define	AR5K_PHY_TURBO_MODE		0x00000001</div><div class='del'>-#define	AR5K_PHY_TURBO_SHORT		0x00000002</div><div class='add'>+#define	AR5K_PHY_TURBO			0x9804			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_TURBO_MODE		0x00000001	/* Enable turbo mode */</div><div class='add'>+#define	AR5K_PHY_TURBO_SHORT		0x00000002	/* Short mode (20Mhz channels) (?) */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY agility command register</div><div class='add'>+ * (aka TST_1)</div><div class='ctx'>  */</div><div class='del'>-#define	AR5K_PHY_AGC			0x9808</div><div class='del'>-#define	AR5K_PHY_AGC_DISABLE		0x08000000</div><div class='add'>+#define	AR5K_PHY_AGC			0x9808			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_TST1			0x9808</div><div class='add'>+#define	AR5K_PHY_AGC_DISABLE		0x08000000	/* Disable AGC to A2 (?)*/</div><div class='add'>+#define	AR5K_PHY_TST1_TXHOLD		0x00003800	/* Set tx hold (?) */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * PHY timing register [5112+]</div><div class='add'>+ * PHY timing register 3 [5112+]</div><div class='ctx'>  */</div><div class='ctx'> #define	AR5K_PHY_TIMING_3		0x9814</div><div class='ctx'> #define	AR5K_PHY_TIMING_3_DSC_MAN	0xfffe0000</div><div class='hunk'>@@ -1657,26 +1901,81 @@</div><div class='ctx'> /*</div><div class='ctx'>  * PHY activation register</div><div class='ctx'>  */</div><div class='del'>-#define	AR5K_PHY_ACT			0x981c</div><div class='del'>-#define	AR5K_PHY_ACT_ENABLE		0x00000001</div><div class='del'>-#define	AR5K_PHY_ACT_DISABLE		0x00000002</div><div class='add'>+#define	AR5K_PHY_ACT			0x981c			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_ACT_ENABLE		0x00000001	/* Activate PHY */</div><div class='add'>+#define	AR5K_PHY_ACT_DISABLE		0x00000002	/* Deactivate PHY */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY RF control registers</div><div class='add'>+ * (i think these are delay times,</div><div class='add'>+ * these calibration values exist</div><div class='add'>+ * in EEPROM)</div><div class='add'>+ */</div><div class='add'>+#define AR5K_PHY_RF_CTL2		0x9824			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_RF_CTL2_TXF2TXD_START	0x0000000f	/* Mask for TX frame to TX d(esc?) start */</div><div class='add'>+</div><div class='add'>+#define AR5K_PHY_RF_CTL3		0x9828			/* Register Address */</div><div class='add'>+#define AR5K_PHY_RF_CTL3_TXE2XLNA_ON	0x0000000f	/* Mask for TX end to XLNA on */</div><div class='add'>+</div><div class='add'>+#define AR5K_PHY_RF_CTL4		0x9834			/* Register Address */</div><div class='add'>+#define AR5K_PHY_RF_CTL4_TXF2XPA_A_ON	0x00000001	/* TX frame to XPA A on (field) */</div><div class='add'>+#define AR5K_PHY_RF_CTL4_TXF2XPA_B_ON	0x00000100	/* TX frame to XPA B on (field) */</div><div class='add'>+#define	AR5K_PHY_RF_CTL4_TXE2XPA_A_OFF	0x00010000	/* TX end to XPA A off (field) */</div><div class='add'>+#define AR5K_PHY_RF_CTL4_TXE2XPA_B_OFF	0x01000000	/* TX end to XPA B off (field) */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Pre-Amplifier control register</div><div class='add'>+ * (XPA -&gt; external pre-amplifier)</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHY_PA_CTL			0x9838			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_PA_CTL_XPA_A_HI	0x00000001	/* XPA A high (?) */</div><div class='add'>+#define	AR5K_PHY_PA_CTL_XPA_B_HI	0x00000002	/* XPA B high (?) */</div><div class='add'>+#define	AR5K_PHY_PA_CTL_XPA_A_EN	0x00000004	/* Enable XPA A */</div><div class='add'>+#define	AR5K_PHY_PA_CTL_XPA_B_EN	0x00000008	/* Enable XPA B */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY settling register</div><div class='add'>+ */</div><div class='add'>+#define AR5K_PHY_SETTLING		0x9844			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_SETTLING_AGC		0x0000007f	/* Mask for AGC settling time */</div><div class='add'>+#define	AR5K_PHY_SETTLING_SWITCH	0x00003f80	/* Mask for Switch settlig time */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY Gain registers</div><div class='add'>+ */</div><div class='add'>+#define AR5K_PHY_GAIN			0x9848			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_GAIN_TXRX_ATTEN	0x0003f000	/* Mask for TX-RX Attenuation */</div><div class='add'>+</div><div class='add'>+#define	AR5K_PHY_GAIN_OFFSET		0x984c			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_GAIN_OFFSET_RXTX_FLAG	0x00020000	/* RX-TX flag (?) */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Desired size register</div><div class='add'>+ * (for more infos read ANI patent)</div><div class='add'>+ */</div><div class='add'>+#define AR5K_PHY_DESIRED_SIZE		0x9850			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_DESIRED_SIZE_ADC	0x000000ff	/* Mask for ADC desired size */</div><div class='add'>+#define	AR5K_PHY_DESIRED_SIZE_PGA	0x0000ff00	/* Mask for PGA desired size */</div><div class='add'>+#define	AR5K_PHY_DESIRED_SIZE_TOT	0x0ff00000	/* Mask for Total desired size (?) */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY signal register</div><div class='add'>+ * (for more infos read ANI patent)</div><div class='ctx'>  */</div><div class='del'>-#define	AR5K_PHY_SIG			0x9858</div><div class='del'>-#define	AR5K_PHY_SIG_FIRSTEP		0x0003f000</div><div class='add'>+#define	AR5K_PHY_SIG			0x9858			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_SIG_FIRSTEP		0x0003f000	/* Mask for FIRSTEP */</div><div class='ctx'> #define	AR5K_PHY_SIG_FIRSTEP_S		12</div><div class='del'>-#define	AR5K_PHY_SIG_FIRPWR		0x03fc0000</div><div class='add'>+#define	AR5K_PHY_SIG_FIRPWR		0x03fc0000	/* Mask for FIPWR */</div><div class='ctx'> #define	AR5K_PHY_SIG_FIRPWR_S		18</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY coarse agility control register</div><div class='add'>+ * (for more infos read ANI patent)</div><div class='ctx'>  */</div><div class='del'>-#define	AR5K_PHY_AGCCOARSE		0x985c</div><div class='del'>-#define	AR5K_PHY_AGCCOARSE_LO		0x00007f80</div><div class='add'>+#define	AR5K_PHY_AGCCOARSE		0x985c			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_AGCCOARSE_LO		0x00007f80	/* Mask for AGC Coarse low */</div><div class='ctx'> #define	AR5K_PHY_AGCCOARSE_LO_S		7</div><div class='del'>-#define	AR5K_PHY_AGCCOARSE_HI		0x003f8000</div><div class='add'>+#define	AR5K_PHY_AGCCOARSE_HI		0x003f8000	/* Mask for AGC Coarse high */</div><div class='ctx'> #define	AR5K_PHY_AGCCOARSE_HI_S		15</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1689,12 +1988,13 @@</div><div class='ctx'> /*</div><div class='ctx'>  * PHY noise floor status register</div><div class='ctx'>  */</div><div class='del'>-#define AR5K_PHY_NF			0x9864</div><div class='del'>-#define AR5K_PHY_NF_M			0x000001ff</div><div class='del'>-#define AR5K_PHY_NF_ACTIVE		0x00000100</div><div class='add'>+#define AR5K_PHY_NF			0x9864			/* Register address */</div><div class='add'>+#define AR5K_PHY_NF_M			0x000001ff	/* Noise floor mask */</div><div class='add'>+#define AR5K_PHY_NF_ACTIVE		0x00000100	/* Noise floor calibration still active */</div><div class='ctx'> #define AR5K_PHY_NF_RVAL(_n)		(((_n) &gt;&gt; 19) &amp; AR5K_PHY_NF_M)</div><div class='ctx'> #define AR5K_PHY_NF_AVAL(_n)		(-((_n) ^ AR5K_PHY_NF_M) + 1)</div><div class='ctx'> #define AR5K_PHY_NF_SVAL(_n)		(((_n) &amp; AR5K_PHY_NF_M) | (1 &lt;&lt; 9))</div><div class='add'>+#define	AR5K_PHY_NF_THRESH62		0x00001000	/* Thresh62 -check ANI patent- (field) */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY ADC saturation register [5110]</div><div class='hunk'>@@ -1706,6 +2006,30 @@</div><div class='ctx'> #define	AR5K_PHY_ADCSAT_THR_S		5</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * PHY Weak ofdm signal detection threshold registers (ANI) [5212+]</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* High thresholds */</div><div class='add'>+#define AR5K_PHY_WEAK_OFDM_HIGH_THR		0x9868</div><div class='add'>+#define AR5K_PHY_WEAK_OFDM_HIGH_THR_M2_COUNT	0x0000001f</div><div class='add'>+#define AR5K_PHY_WEAK_OFDM_HIGH_THR_M2_COUNT_S	0</div><div class='add'>+#define AR5K_PHY_WEAK_OFDM_HIGH_THR_M1		0x00fe0000</div><div class='add'>+#define AR5K_PHY_WEAK_OFDM_HIGH_THR_M1_S	17</div><div class='add'>+#define AR5K_PHY_WEAK_OFDM_HIGH_THR_M2		0x7f000000</div><div class='add'>+#define AR5K_PHY_WEAK_OFDM_HIGH_THR_M2_S	24</div><div class='add'>+</div><div class='add'>+/* Low thresholds */</div><div class='add'>+#define AR5K_PHY_WEAK_OFDM_LOW_THR 		0x986c</div><div class='add'>+#define AR5K_PHY_WEAK_OFDM_LOW_THR_SELFCOR_EN	0x00000001</div><div class='add'>+#define AR5K_PHY_WEAK_OFDM_LOW_THR_M2_COUNT	0x00003f00</div><div class='add'>+#define AR5K_PHY_WEAK_OFDM_LOW_THR_M2_COUNT_S	8</div><div class='add'>+#define AR5K_PHY_WEAK_OFDM_LOW_THR_M1		0x001fc000</div><div class='add'>+#define AR5K_PHY_WEAK_OFDM_LOW_THR_M1_S		14</div><div class='add'>+#define AR5K_PHY_WEAK_OFDM_LOW_THR_M2		0x0fe00000</div><div class='add'>+#define AR5K_PHY_WEAK_OFDM_LOW_THR_M2_S		21</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * PHY sleep registers [5112+]</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_PHY_SCR			0x9870</div><div class='hunk'>@@ -1730,6 +2054,8 @@</div><div class='ctx'> 					AR5K_PHY_PLL_44MHZ_5211 : AR5K_PHY_PLL_44MHZ_5212)</div><div class='ctx'> #define AR5K_PHY_PLL_RF5111		0x00000000</div><div class='ctx'> #define AR5K_PHY_PLL_RF5112		0x00000040</div><div class='add'>+#define	AR5K_PHY_PLL_HALF_RATE		0x00000100</div><div class='add'>+#define	AR5K_PHY_PLL_QUARTER_RATE	0x00000200</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * RF Buffer register</div><div class='hunk'>@@ -1792,23 +2118,74 @@</div><div class='ctx'> #define AR5K_PHY_RFSTG_DISABLE		0x00000021</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * PHY Antenna control register</div><div class='add'>+ */</div><div class='add'>+#define AR5K_PHY_ANT_CTL		0x9910			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_ANT_CTL_TXRX_EN	0x00000001	/* Enable TX/RX (?) */</div><div class='add'>+#define	AR5K_PHY_ANT_CTL_SECTORED_ANT	0x00000004	/* Sectored Antenna */</div><div class='add'>+#define	AR5K_PHY_ANT_CTL_HITUNE5	0x00000008	/* Hitune5 (?) */</div><div class='add'>+#define	AR5K_PHY_ANT_CTL_SWTABLE_IDLE	0x00000010	/* Switch table idle (?) */</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * PHY receiver delay register [5111+]</div><div class='ctx'>  */</div><div class='del'>-#define	AR5K_PHY_RX_DELAY		0x9914</div><div class='del'>-#define	AR5K_PHY_RX_DELAY_M		0x00003fff</div><div class='add'>+#define	AR5K_PHY_RX_DELAY		0x9914			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_RX_DELAY_M		0x00003fff	/* Mask for RX activate to receive delay (/100ns) */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY max rx length register (?) [5111]</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHY_MAX_RX_LEN		0x991c</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * PHY timing I(nphase) Q(adrature) control register [5111+]</div><div class='add'>+ * PHY timing register 4</div><div class='add'>+ * I(nphase)/Q(adrature) calibration register [5111+]</div><div class='ctx'>  */</div><div class='del'>-#define	AR5K_PHY_IQ			0x9920		/* Register address */</div><div class='add'>+#define	AR5K_PHY_IQ			0x9920			/* Register Address */</div><div class='ctx'> #define	AR5K_PHY_IQ_CORR_Q_Q_COFF	0x0000001f	/* Mask for q correction info */</div><div class='ctx'> #define	AR5K_PHY_IQ_CORR_Q_I_COFF	0x000007e0	/* Mask for i correction info */</div><div class='ctx'> #define	AR5K_PHY_IQ_CORR_Q_I_COFF_S	5</div><div class='ctx'> #define	AR5K_PHY_IQ_CORR_ENABLE		0x00000800	/* Enable i/q correction */</div><div class='del'>-#define	AR5K_PHY_IQ_CAL_NUM_LOG_MAX	0x0000f000</div><div class='add'>+#define	AR5K_PHY_IQ_CAL_NUM_LOG_MAX	0x0000f000	/* Mask for max number of samples in log scale */</div><div class='ctx'> #define	AR5K_PHY_IQ_CAL_NUM_LOG_MAX_S	12</div><div class='ctx'> #define	AR5K_PHY_IQ_RUN			0x00010000	/* Run i/q calibration */</div><div class='add'>+#define	AR5K_PHY_IQ_USE_PT_DF		0x00020000	/* Use pilot track df (?) */</div><div class='add'>+#define	AR5K_PHY_IQ_EARLY_TRIG_THR	0x00200000	/* Early trigger threshold (?) (field) */</div><div class='add'>+#define	AR5K_PHY_IQ_PILOT_MASK_EN	0x10000000	/* Enable pilot mask (?) */</div><div class='add'>+#define	AR5K_PHY_IQ_CHAN_MASK_EN	0x20000000	/* Enable channel mask (?) */</div><div class='add'>+#define	AR5K_PHY_IQ_SPUR_FILT_EN	0x40000000	/* Enable spur filter */</div><div class='add'>+#define	AR5K_PHY_IQ_SPUR_RSSI_EN	0x80000000	/* Enable spur rssi */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * PHY timing register 5</div><div class='add'>+ * OFDM Self-correlator Cyclic RSSI threshold params</div><div class='add'>+ * (Check out bb_cycpwr_thr1 on ANI patent)</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHY_OFDM_SELFCORR			0x9924			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_OFDM_SELFCORR_CYPWR_THR1_EN	0x00000001	/* Enable cyclic RSSI thr 1 */</div><div class='add'>+#define	AR5K_PHY_OFDM_SELFCORR_CYPWR_THR1	0x000000fe	/* Mask for Cyclic RSSI threshold 1 */</div><div class='add'>+#define	AR5K_PHY_OFDM_SELFCORR_CYPWR_THR3	0x00000100	/* Cyclic RSSI threshold 3 (field) (?) */</div><div class='add'>+#define	AR5K_PHY_OFDM_SELFCORR_RSSI_1ATHR_EN	0x00008000	/* Enable 1A RSSI threshold (?) */</div><div class='add'>+#define	AR5K_PHY_OFDM_SELFCORR_RSSI_1ATHR	0x00010000	/* 1A RSSI threshold (field) (?) */</div><div class='add'>+#define	AR5K_PHY_OFDM_SELFCORR_LSCTHR_HIRSSI	0x00800000	/* Long sc threshold hi rssi (?) */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY-only warm reset register</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHY_WARM_RESET		0x9928</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY-only control register</div><div class='add'>+ */</div><div class='add'>+#define AR5K_PHY_CTL			0x992c			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_CTL_RX_DRAIN_RATE	0x00000001	/* RX drain rate (?) */</div><div class='add'>+#define	AR5K_PHY_CTL_LATE_TX_SIG_SYM	0x00000002	/* Late tx signal symbol (?) */</div><div class='add'>+#define	AR5K_PHY_CTL_GEN_SCRAMBLER	0x00000004	/* Generate scrambler */</div><div class='add'>+#define	AR5K_PHY_CTL_TX_ANT_SEL		0x00000008	/* TX antenna select */</div><div class='add'>+#define	AR5K_PHY_CTL_TX_ANT_STATIC	0x00000010	/* Static TX antenna */</div><div class='add'>+#define	AR5K_PHY_CTL_RX_ANT_SEL		0x00000020	/* RX antenna select */</div><div class='add'>+#define	AR5K_PHY_CTL_RX_ANT_STATIC	0x00000040	/* Static RX antenna */</div><div class='add'>+#define	AR5K_PHY_CTL_LOW_FREQ_SLE_EN	0x00000080	/* Enable low freq sleep */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY PAPD probe register [5111+ (?)]</div><div class='hunk'>@@ -1816,9 +2193,13 @@</div><div class='ctx'>  * Because it's always 0 in 5211 initialization code</div><div class='ctx'>  */</div><div class='ctx'> #define	AR5K_PHY_PAPD_PROBE		0x9930</div><div class='add'>+#define	AR5K_PHY_PAPD_PROBE_SH_HI_PAR	0x00000001</div><div class='add'>+#define	AR5K_PHY_PAPD_PROBE_PCDAC_BIAS	0x00000002</div><div class='add'>+#define	AR5K_PHY_PAPD_PROBE_COMP_GAIN	0x00000040</div><div class='ctx'> #define	AR5K_PHY_PAPD_PROBE_TXPOWER	0x00007e00</div><div class='ctx'> #define	AR5K_PHY_PAPD_PROBE_TXPOWER_S	9</div><div class='ctx'> #define	AR5K_PHY_PAPD_PROBE_TX_NEXT	0x00008000</div><div class='add'>+#define	AR5K_PHY_PAPD_PROBE_PREDIST_EN	0x00010000</div><div class='ctx'> #define	AR5K_PHY_PAPD_PROBE_TYPE	0x01800000	/* [5112+] */</div><div class='ctx'> #define	AR5K_PHY_PAPD_PROBE_TYPE_S	23</div><div class='ctx'> #define	AR5K_PHY_PAPD_PROBE_TYPE_OFDM	0</div><div class='hunk'>@@ -1848,15 +2229,16 @@</div><div class='ctx'> #define	AR5K_PHY_FRAME_CTL		(ah-&gt;ah_version == AR5K_AR5210 ? \</div><div class='ctx'> 					AR5K_PHY_FRAME_CTL_5210 : AR5K_PHY_FRAME_CTL_5211)</div><div class='ctx'> /*---[5111+]---*/</div><div class='del'>-#define	AR5K_PHY_FRAME_CTL_TX_CLIP	0x00000038</div><div class='add'>+#define	AR5K_PHY_FRAME_CTL_TX_CLIP	0x00000038	/* Mask for tx clip (?) */</div><div class='ctx'> #define	AR5K_PHY_FRAME_CTL_TX_CLIP_S	3</div><div class='add'>+#define	AR5K_PHY_FRAME_CTL_PREP_CHINFO	0x00010000	/* Prepend chan info */</div><div class='ctx'> /*---[5110/5111]---*/</div><div class='del'>-#define	AR5K_PHY_FRAME_CTL_TIMING_ERR	0x01000000</div><div class='del'>-#define	AR5K_PHY_FRAME_CTL_PARITY_ERR	0x02000000</div><div class='del'>-#define	AR5K_PHY_FRAME_CTL_ILLRATE_ERR	0x04000000	/* illegal rate */</div><div class='del'>-#define	AR5K_PHY_FRAME_CTL_ILLLEN_ERR	0x08000000	/* illegal length */</div><div class='add'>+#define	AR5K_PHY_FRAME_CTL_TIMING_ERR	0x01000000	/* PHY timing error */</div><div class='add'>+#define	AR5K_PHY_FRAME_CTL_PARITY_ERR	0x02000000	/* Parity error */</div><div class='add'>+#define	AR5K_PHY_FRAME_CTL_ILLRATE_ERR	0x04000000	/* Illegal rate */</div><div class='add'>+#define	AR5K_PHY_FRAME_CTL_ILLLEN_ERR	0x08000000	/* Illegal length */</div><div class='ctx'> #define	AR5K_PHY_FRAME_CTL_SERVICE_ERR	0x20000000</div><div class='del'>-#define	AR5K_PHY_FRAME_CTL_TXURN_ERR	0x40000000	/* tx underrun */</div><div class='add'>+#define	AR5K_PHY_FRAME_CTL_TXURN_ERR	0x40000000	/* TX underrun */</div><div class='ctx'> #define AR5K_PHY_FRAME_CTL_INI		AR5K_PHY_FRAME_CTL_SERVICE_ERR | \</div><div class='ctx'> 			AR5K_PHY_FRAME_CTL_TXURN_ERR | \</div><div class='ctx'> 			AR5K_PHY_FRAME_CTL_ILLLEN_ERR | \</div><div class='hunk'>@@ -1915,6 +2297,11 @@ after DFS is enabled */</div><div class='ctx'> #define AR5K_PHY_ANT_SWITCH_TABLE_1	0x9964</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * PHY Noise floor threshold</div><div class='add'>+ */</div><div class='add'>+#define AR5K_PHY_NFTHRES		0x9968</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * PHY clock sleep registers [5112+]</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_PHY_SCLOCK			0x99f0</div><div class='hunk'>@@ -1922,56 +2309,116 @@ after DFS is enabled */</div><div class='ctx'> #define AR5K_PHY_SDELAY			0x99f4</div><div class='ctx'> #define AR5K_PHY_SDELAY_32MHZ		0x000000ff</div><div class='ctx'> #define AR5K_PHY_SPENDING		0x99f8</div><div class='add'>+#define	AR5K_PHY_SPENDING_14		0x00000014</div><div class='add'>+#define	AR5K_PHY_SPENDING_18		0x00000018</div><div class='ctx'> #define AR5K_PHY_SPENDING_RF5111	0x00000018</div><div class='del'>-#define AR5K_PHY_SPENDING_RF5112	0x00000014 /* &lt;- i 've only seen this on 2425 dumps ! */</div><div class='del'>-#define AR5K_PHY_SPENDING_RF5112A	0x0000000e /* but since i only have 5112A-based chips */</div><div class='del'>-#define AR5K_PHY_SPENDING_RF5424	0x00000012 /* to test it might be also for old 5112.  */</div><div class='add'>+#define AR5K_PHY_SPENDING_RF5112	0x00000014</div><div class='add'>+/* #define AR5K_PHY_SPENDING_RF5112A	0x0000000e */</div><div class='add'>+/* #define AR5K_PHY_SPENDING_RF5424	0x00000012 */</div><div class='add'>+#define	AR5K_PHY_SPENDING_RF5413	0x00000014</div><div class='add'>+#define	AR5K_PHY_SPENDING_RF2413	0x00000014</div><div class='add'>+#define AR5K_PHY_SPENDING_RF2425	0x00000018</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Misc PHY/radio registers [5110 - 5111]</div><div class='ctx'>  */</div><div class='del'>-#define	AR5K_BB_GAIN_BASE		0x9b00 /* BaseBand Amplifier Gain table base address */</div><div class='add'>+#define	AR5K_BB_GAIN_BASE		0x9b00	/* BaseBand Amplifier Gain table base address */</div><div class='ctx'> #define AR5K_BB_GAIN(_n)		(AR5K_BB_GAIN_BASE + ((_n) &lt;&lt; 2))</div><div class='del'>-#define	AR5K_RF_GAIN_BASE		0x9a00 /* RF Amplrifier Gain table base address */</div><div class='add'>+#define	AR5K_RF_GAIN_BASE		0x9a00	/* RF Amplrifier Gain table base address */</div><div class='ctx'> #define AR5K_RF_GAIN(_n)		(AR5K_RF_GAIN_BASE + ((_n) &lt;&lt; 2))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY timing IQ calibration result register [5111+]</div><div class='ctx'>  */</div><div class='del'>-#define	AR5K_PHY_IQRES_CAL_PWR_I	0x9c10 /* I (Inphase) power value */</div><div class='del'>-#define	AR5K_PHY_IQRES_CAL_PWR_Q	0x9c14 /* Q (Quadrature) power value */</div><div class='add'>+#define	AR5K_PHY_IQRES_CAL_PWR_I	0x9c10	/* I (Inphase) power value */</div><div class='add'>+#define	AR5K_PHY_IQRES_CAL_PWR_Q	0x9c14	/* Q (Quadrature) power value */</div><div class='ctx'> #define	AR5K_PHY_IQRES_CAL_CORR		0x9c18	/* I/Q Correlation */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY current RSSI register [5111+]</div><div class='ctx'>  */</div><div class='del'>-#define	AR5K_PHY_CURRENT_RSSI		0x9c1c</div><div class='add'>+#define	AR5K_PHY_CURRENT_RSSI	0x9c1c</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY RF Bus grant register (?)</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHY_RFBUS_GRANT	0x9c20</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY ADC test register</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHY_ADC_TEST	0x9c24</div><div class='add'>+#define	AR5K_PHY_ADC_TEST_I	0x00000001</div><div class='add'>+#define	AR5K_PHY_ADC_TEST_Q	0x00000200</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY DAC test register</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHY_DAC_TEST	0x9c28</div><div class='add'>+#define	AR5K_PHY_DAC_TEST_I	0x00000001</div><div class='add'>+#define	AR5K_PHY_DAC_TEST_Q	0x00000200</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY PTAT register (?)</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHY_PTAT		0x9c2c</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY Illegal TX rate register [5112+]</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHY_BAD_TX_RATE	0x9c30</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY SPUR Power register [5112+]</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHY_SPUR_PWR	0x9c34			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_SPUR_PWR_I	0x00000001	/* SPUR Power estimate for I (field) */</div><div class='add'>+#define	AR5K_PHY_SPUR_PWR_Q	0x00000100	/* SPUR Power estimate for Q (field) */</div><div class='add'>+#define	AR5K_PHY_SPUR_PWR_FILT	0x00010000	/* Power with SPUR removed (field) */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY Channel status register [5112+] (?)</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHY_CHAN_STATUS		0x9c38</div><div class='add'>+#define	AR5K_PHY_CHAN_STATUS_BT_ACT	0x00000001</div><div class='add'>+#define	AR5K_PHY_CHAN_STATUS_RX_CLR_RAW	0x00000002</div><div class='add'>+#define	AR5K_PHY_CHAN_STATUS_RX_CLR_MAC	0x00000004</div><div class='add'>+#define	AR5K_PHY_CHAN_STATUS_RX_CLR_PAP	0x00000008</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY PAPD I (power?) table (?)</div><div class='add'>+ * (92! entries)</div><div class='add'>+ */</div><div class='add'>+#define	AR5K_PHY_PAPD_I_BASE	0xa000</div><div class='add'>+#define	AR5K_PHY_PAPD_I(_n)	(AR5K_PHY_PAPD_I_BASE + ((_n) &lt;&lt; 2))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY PCDAC TX power table</div><div class='ctx'>  */</div><div class='ctx'> #define	AR5K_PHY_PCDAC_TXPOWER_BASE_5211	0xa180</div><div class='del'>-#define AR5K_PHY_PCDAC_TXPOWER_BASE_5413	0xa280</div><div class='del'>-#define AR5K_PHY_PCDAC_TXPOWER_BASE	(ah-&gt;ah_radio &gt;= AR5K_RF5413 ? \</div><div class='del'>-					AR5K_PHY_PCDAC_TXPOWER_BASE_5413 :\</div><div class='add'>+#define AR5K_PHY_PCDAC_TXPOWER_BASE_2413	0xa280</div><div class='add'>+#define AR5K_PHY_PCDAC_TXPOWER_BASE	(ah-&gt;ah_radio &gt;= AR5K_RF2413 ? \</div><div class='add'>+					AR5K_PHY_PCDAC_TXPOWER_BASE_2413 :\</div><div class='ctx'> 					AR5K_PHY_PCDAC_TXPOWER_BASE_5211)</div><div class='ctx'> #define	AR5K_PHY_PCDAC_TXPOWER(_n)	(AR5K_PHY_PCDAC_TXPOWER_BASE + ((_n) &lt;&lt; 2))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY mode register [5111+]</div><div class='ctx'>  */</div><div class='del'>-#define	AR5K_PHY_MODE			0x0a200		/* Register address */</div><div class='del'>-#define	AR5K_PHY_MODE_MOD		0x00000001	/* PHY Modulation mask*/</div><div class='add'>+#define	AR5K_PHY_MODE			0x0a200			/* Register Address */</div><div class='add'>+#define	AR5K_PHY_MODE_MOD		0x00000001	/* PHY Modulation bit */</div><div class='ctx'> #define AR5K_PHY_MODE_MOD_OFDM		0</div><div class='ctx'> #define AR5K_PHY_MODE_MOD_CCK		1</div><div class='del'>-#define AR5K_PHY_MODE_FREQ		0x00000002	/* Freq mode mask */</div><div class='add'>+#define AR5K_PHY_MODE_FREQ		0x00000002	/* Freq mode bit */</div><div class='ctx'> #define	AR5K_PHY_MODE_FREQ_5GHZ		0</div><div class='ctx'> #define	AR5K_PHY_MODE_FREQ_2GHZ		2</div><div class='del'>-#define AR5K_PHY_MODE_MOD_DYN		0x00000004	/* Dynamic OFDM/CCK mode mask [5112+] */</div><div class='add'>+#define AR5K_PHY_MODE_MOD_DYN		0x00000004	/* Enable Dynamic OFDM/CCK mode [5112+] */</div><div class='ctx'> #define AR5K_PHY_MODE_RAD		0x00000008	/* [5212+] */</div><div class='ctx'> #define AR5K_PHY_MODE_RAD_RF5111	0</div><div class='ctx'> #define AR5K_PHY_MODE_RAD_RF5112	8</div><div class='del'>-#define AR5K_PHY_MODE_XR		0x00000010	/* [5112+] */</div><div class='add'>+#define AR5K_PHY_MODE_XR		0x00000010	/* Enable XR mode [5112+] */</div><div class='add'>+#define	AR5K_PHY_MODE_HALF_RATE		0x00000020	/* Enable Half rate (test) */</div><div class='add'>+#define	AR5K_PHY_MODE_QUARTER_RATE	0x00000040	/* Enable Quarter rat (test) */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY CCK transmit control register [5111+ (?)]</div><div class='hunk'>@@ -1979,6 +2426,15 @@ after DFS is enabled */</div><div class='ctx'> #define AR5K_PHY_CCKTXCTL		0xa204</div><div class='ctx'> #define AR5K_PHY_CCKTXCTL_WORLD		0x00000000</div><div class='ctx'> #define AR5K_PHY_CCKTXCTL_JAPAN		0x00000010</div><div class='add'>+#define	AR5K_PHY_CCKTXCTL_SCRAMBLER_DIS	0x00000001</div><div class='add'>+#define	AR5K_PHY_CCKTXCTK_DAC_SCALE	0x00000004</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PHY CCK Cross-correlator Barker RSSI threshold register [5212+]</div><div class='add'>+ */</div><div class='add'>+#define AR5K_PHY_CCK_CROSSCORR			0xa208</div><div class='add'>+#define AR5K_PHY_CCK_CROSSCORR_WEAK_SIG_THR	0x0000000f</div><div class='add'>+#define AR5K_PHY_CCK_CROSSCORR_WEAK_SIG_THR_S	0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY 2GHz gain register [5111+]</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/Kconfig b/drivers/net/wireless/ath9k/Kconfig<br/>new file mode 100644<br/>index 000000000000..9e19dcceb3a2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath9k/Kconfig?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+config ATH9K</div><div class='add'>+	tristate "Atheros 802.11n wireless cards support"</div><div class='add'>+	depends on PCI &amp;&amp; MAC80211 &amp;&amp; WLAN_80211</div><div class='add'>+	---help---</div><div class='add'>+	  This module adds support for wireless adapters based on</div><div class='add'>+	  Atheros IEEE 802.11n AR5008 and AR9001 family of chipsets.</div><div class='add'>+</div><div class='add'>+	  If you choose to build a module, it'll be called ath9k.</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/Makefile b/drivers/net/wireless/ath9k/Makefile<br/>new file mode 100644<br/>index 000000000000..a6411517e5f8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath9k/Makefile?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/Makefile</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+ath9k-y +=	hw.o \</div><div class='add'>+		phy.o \</div><div class='add'>+		regd.o \</div><div class='add'>+		beacon.o \</div><div class='add'>+		main.o \</div><div class='add'>+		recv.o \</div><div class='add'>+		xmit.o \</div><div class='add'>+		rc.o \</div><div class='add'>+		core.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_ATH9K) += ath9k.o</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/ath9k.h b/drivers/net/wireless/ath9k/ath9k.h<br/>new file mode 100644<br/>index 000000000000..d1b0fbae5a32<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath9k/ath9k.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/ath9k.h</a></div><div class='hunk'>@@ -0,0 +1,1021 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2008 Atheros Communications Inc.</div><div class='add'>+ *</div><div class='add'>+ * Permission to use, copy, modify, and/or distribute this software for any</div><div class='add'>+ * purpose with or without fee is hereby granted, provided that the above</div><div class='add'>+ * copyright notice and this permission notice appear in all copies.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='add'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='add'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='add'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='add'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH9K_H</div><div class='add'>+#define ATH9K_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#define ATHEROS_VENDOR_ID	0x168c</div><div class='add'>+</div><div class='add'>+#define AR5416_DEVID_PCI	0x0023</div><div class='add'>+#define AR5416_DEVID_PCIE	0x0024</div><div class='add'>+#define AR9160_DEVID_PCI	0x0027</div><div class='add'>+#define AR9280_DEVID_PCI	0x0029</div><div class='add'>+#define AR9280_DEVID_PCIE	0x002a</div><div class='add'>+</div><div class='add'>+#define AR5416_AR9100_DEVID	0x000b</div><div class='add'>+</div><div class='add'>+#define	AR_SUBVENDOR_ID_NOG	0x0e11</div><div class='add'>+#define AR_SUBVENDOR_ID_NEW_A	0x7065</div><div class='add'>+</div><div class='add'>+#define ATH9K_TXERR_XRETRY         0x01</div><div class='add'>+#define ATH9K_TXERR_FILT           0x02</div><div class='add'>+#define ATH9K_TXERR_FIFO           0x04</div><div class='add'>+#define ATH9K_TXERR_XTXOP          0x08</div><div class='add'>+#define ATH9K_TXERR_TIMER_EXPIRED  0x10</div><div class='add'>+</div><div class='add'>+#define ATH9K_TX_BA                0x01</div><div class='add'>+#define ATH9K_TX_PWRMGMT           0x02</div><div class='add'>+#define ATH9K_TX_DESC_CFG_ERR      0x04</div><div class='add'>+#define ATH9K_TX_DATA_UNDERRUN     0x08</div><div class='add'>+#define ATH9K_TX_DELIM_UNDERRUN    0x10</div><div class='add'>+#define ATH9K_TX_SW_ABORTED        0x40</div><div class='add'>+#define ATH9K_TX_SW_FILTERED       0x80</div><div class='add'>+</div><div class='add'>+#define NBBY    8</div><div class='add'>+</div><div class='add'>+struct ath_tx_status {</div><div class='add'>+	u32 ts_tstamp;</div><div class='add'>+	u16 ts_seqnum;</div><div class='add'>+	u8 ts_status;</div><div class='add'>+	u8 ts_ratecode;</div><div class='add'>+	u8 ts_rateindex;</div><div class='add'>+	int8_t ts_rssi;</div><div class='add'>+	u8 ts_shortretry;</div><div class='add'>+	u8 ts_longretry;</div><div class='add'>+	u8 ts_virtcol;</div><div class='add'>+	u8 ts_antenna;</div><div class='add'>+	u8 ts_flags;</div><div class='add'>+	int8_t ts_rssi_ctl0;</div><div class='add'>+	int8_t ts_rssi_ctl1;</div><div class='add'>+	int8_t ts_rssi_ctl2;</div><div class='add'>+	int8_t ts_rssi_ext0;</div><div class='add'>+	int8_t ts_rssi_ext1;</div><div class='add'>+	int8_t ts_rssi_ext2;</div><div class='add'>+	u8 pad[3];</div><div class='add'>+	u32 ba_low;</div><div class='add'>+	u32 ba_high;</div><div class='add'>+	u32 evm0;</div><div class='add'>+	u32 evm1;</div><div class='add'>+	u32 evm2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath_rx_status {</div><div class='add'>+	u32 rs_tstamp;</div><div class='add'>+	u16 rs_datalen;</div><div class='add'>+	u8 rs_status;</div><div class='add'>+	u8 rs_phyerr;</div><div class='add'>+	int8_t rs_rssi;</div><div class='add'>+	u8 rs_keyix;</div><div class='add'>+	u8 rs_rate;</div><div class='add'>+	u8 rs_antenna;</div><div class='add'>+	u8 rs_more;</div><div class='add'>+	int8_t rs_rssi_ctl0;</div><div class='add'>+	int8_t rs_rssi_ctl1;</div><div class='add'>+	int8_t rs_rssi_ctl2;</div><div class='add'>+	int8_t rs_rssi_ext0;</div><div class='add'>+	int8_t rs_rssi_ext1;</div><div class='add'>+	int8_t rs_rssi_ext2;</div><div class='add'>+	u8 rs_isaggr;</div><div class='add'>+	u8 rs_moreaggr;</div><div class='add'>+	u8 rs_num_delims;</div><div class='add'>+	u8 rs_flags;</div><div class='add'>+	u32 evm0;</div><div class='add'>+	u32 evm1;</div><div class='add'>+	u32 evm2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH9K_RXERR_CRC           0x01</div><div class='add'>+#define ATH9K_RXERR_PHY           0x02</div><div class='add'>+#define ATH9K_RXERR_FIFO          0x04</div><div class='add'>+#define ATH9K_RXERR_DECRYPT       0x08</div><div class='add'>+#define ATH9K_RXERR_MIC           0x10</div><div class='add'>+</div><div class='add'>+#define ATH9K_RX_MORE             0x01</div><div class='add'>+#define ATH9K_RX_MORE_AGGR        0x02</div><div class='add'>+#define ATH9K_RX_GI               0x04</div><div class='add'>+#define ATH9K_RX_2040             0x08</div><div class='add'>+#define ATH9K_RX_DELIM_CRC_PRE    0x10</div><div class='add'>+#define ATH9K_RX_DELIM_CRC_POST   0x20</div><div class='add'>+#define ATH9K_RX_DECRYPT_BUSY     0x40</div><div class='add'>+</div><div class='add'>+#define ATH9K_RXKEYIX_INVALID	((u8)-1)</div><div class='add'>+#define ATH9K_TXKEYIX_INVALID	((u32)-1)</div><div class='add'>+</div><div class='add'>+struct ath_desc {</div><div class='add'>+	u32 ds_link;</div><div class='add'>+	u32 ds_data;</div><div class='add'>+	u32 ds_ctl0;</div><div class='add'>+	u32 ds_ctl1;</div><div class='add'>+	u32 ds_hw[20];</div><div class='add'>+	union {</div><div class='add'>+		struct ath_tx_status tx;</div><div class='add'>+		struct ath_rx_status rx;</div><div class='add'>+		void *stats;</div><div class='add'>+	} ds_us;</div><div class='add'>+	void *ds_vdata;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define	ds_txstat	ds_us.tx</div><div class='add'>+#define	ds_rxstat	ds_us.rx</div><div class='add'>+#define ds_stat		ds_us.stats</div><div class='add'>+</div><div class='add'>+#define ATH9K_TXDESC_CLRDMASK		0x0001</div><div class='add'>+#define ATH9K_TXDESC_NOACK		0x0002</div><div class='add'>+#define ATH9K_TXDESC_RTSENA		0x0004</div><div class='add'>+#define ATH9K_TXDESC_CTSENA		0x0008</div><div class='add'>+#define ATH9K_TXDESC_INTREQ		0x0010</div><div class='add'>+#define ATH9K_TXDESC_VEOL		0x0020</div><div class='add'>+#define ATH9K_TXDESC_EXT_ONLY		0x0040</div><div class='add'>+#define ATH9K_TXDESC_EXT_AND_CTL	0x0080</div><div class='add'>+#define ATH9K_TXDESC_VMF		0x0100</div><div class='add'>+#define ATH9K_TXDESC_FRAG_IS_ON 	0x0200</div><div class='add'>+</div><div class='add'>+#define ATH9K_RXDESC_INTREQ		0x0020</div><div class='add'>+</div><div class='add'>+enum wireless_mode {</div><div class='add'>+	ATH9K_MODE_11A = 0,</div><div class='add'>+	ATH9K_MODE_11B = 2,</div><div class='add'>+	ATH9K_MODE_11G = 3,</div><div class='add'>+	ATH9K_MODE_11NA_HT20 = 6,</div><div class='add'>+	ATH9K_MODE_11NG_HT20 = 7,</div><div class='add'>+	ATH9K_MODE_11NA_HT40PLUS = 8,</div><div class='add'>+	ATH9K_MODE_11NA_HT40MINUS = 9,</div><div class='add'>+	ATH9K_MODE_11NG_HT40PLUS = 10,</div><div class='add'>+	ATH9K_MODE_11NG_HT40MINUS = 11,</div><div class='add'>+	ATH9K_MODE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath9k_hw_caps {</div><div class='add'>+	ATH9K_HW_CAP_CHAN_SPREAD		= BIT(0),</div><div class='add'>+	ATH9K_HW_CAP_MIC_AESCCM                 = BIT(1),</div><div class='add'>+	ATH9K_HW_CAP_MIC_CKIP                   = BIT(2),</div><div class='add'>+	ATH9K_HW_CAP_MIC_TKIP                   = BIT(3),</div><div class='add'>+	ATH9K_HW_CAP_CIPHER_AESCCM              = BIT(4),</div><div class='add'>+	ATH9K_HW_CAP_CIPHER_CKIP                = BIT(5),</div><div class='add'>+	ATH9K_HW_CAP_CIPHER_TKIP                = BIT(6),</div><div class='add'>+	ATH9K_HW_CAP_VEOL                       = BIT(7),</div><div class='add'>+	ATH9K_HW_CAP_BSSIDMASK                  = BIT(8),</div><div class='add'>+	ATH9K_HW_CAP_MCAST_KEYSEARCH            = BIT(9),</div><div class='add'>+	ATH9K_HW_CAP_CHAN_HALFRATE              = BIT(10),</div><div class='add'>+	ATH9K_HW_CAP_CHAN_QUARTERRATE           = BIT(11),</div><div class='add'>+	ATH9K_HW_CAP_HT                         = BIT(12),</div><div class='add'>+	ATH9K_HW_CAP_GTT                        = BIT(13),</div><div class='add'>+	ATH9K_HW_CAP_FASTCC                     = BIT(14),</div><div class='add'>+	ATH9K_HW_CAP_RFSILENT                   = BIT(15),</div><div class='add'>+	ATH9K_HW_CAP_WOW                        = BIT(16),</div><div class='add'>+	ATH9K_HW_CAP_CST                        = BIT(17),</div><div class='add'>+	ATH9K_HW_CAP_ENHANCEDPM                 = BIT(18),</div><div class='add'>+	ATH9K_HW_CAP_AUTOSLEEP                  = BIT(19),</div><div class='add'>+	ATH9K_HW_CAP_4KB_SPLITTRANS             = BIT(20),</div><div class='add'>+	ATH9K_HW_CAP_WOW_MATCHPATTERN_EXACT     = BIT(21),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath9k_capability_type {</div><div class='add'>+	ATH9K_CAP_CIPHER = 0,</div><div class='add'>+	ATH9K_CAP_TKIP_MIC,</div><div class='add'>+	ATH9K_CAP_TKIP_SPLIT,</div><div class='add'>+	ATH9K_CAP_PHYCOUNTERS,</div><div class='add'>+	ATH9K_CAP_DIVERSITY,</div><div class='add'>+	ATH9K_CAP_TXPOW,</div><div class='add'>+	ATH9K_CAP_PHYDIAG,</div><div class='add'>+	ATH9K_CAP_MCAST_KEYSRCH,</div><div class='add'>+	ATH9K_CAP_TSF_ADJUST,</div><div class='add'>+	ATH9K_CAP_WME_TKIPMIC,</div><div class='add'>+	ATH9K_CAP_RFSILENT,</div><div class='add'>+	ATH9K_CAP_ANT_CFG_2GHZ,</div><div class='add'>+	ATH9K_CAP_ANT_CFG_5GHZ</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath9k_hw_capabilities {</div><div class='add'>+	u32 hw_caps; /* ATH9K_HW_CAP_* from ath9k_hw_caps */</div><div class='add'>+	DECLARE_BITMAP(wireless_modes, ATH9K_MODE_MAX); /* ATH9K_MODE_* */</div><div class='add'>+	u16 total_queues;</div><div class='add'>+	u16 keycache_size;</div><div class='add'>+	u16 low_5ghz_chan, high_5ghz_chan;</div><div class='add'>+	u16 low_2ghz_chan, high_2ghz_chan;</div><div class='add'>+	u16 num_mr_retries;</div><div class='add'>+	u16 rts_aggr_limit;</div><div class='add'>+	u8 tx_chainmask;</div><div class='add'>+	u8 rx_chainmask;</div><div class='add'>+	u16 tx_triglevel_max;</div><div class='add'>+	u16 reg_cap;</div><div class='add'>+	u8 num_gpio_pins;</div><div class='add'>+	u8 num_antcfg_2ghz;</div><div class='add'>+	u8 num_antcfg_5ghz;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath9k_ops_config {</div><div class='add'>+	int dma_beacon_response_time;</div><div class='add'>+	int sw_beacon_response_time;</div><div class='add'>+	int additional_swba_backoff;</div><div class='add'>+	int ack_6mb;</div><div class='add'>+	int cwm_ignore_extcca;</div><div class='add'>+	u8 pcie_powersave_enable;</div><div class='add'>+	u8 pcie_l1skp_enable;</div><div class='add'>+	u8 pcie_clock_req;</div><div class='add'>+	u32 pcie_waen;</div><div class='add'>+	int pcie_power_reset;</div><div class='add'>+	u8 pcie_restore;</div><div class='add'>+	u8 analog_shiftreg;</div><div class='add'>+	u8 ht_enable;</div><div class='add'>+	u32 ofdm_trig_low;</div><div class='add'>+	u32 ofdm_trig_high;</div><div class='add'>+	u32 cck_trig_high;</div><div class='add'>+	u32 cck_trig_low;</div><div class='add'>+	u32 enable_ani;</div><div class='add'>+	u8 noise_immunity_level;</div><div class='add'>+	u32 ofdm_weaksignal_det;</div><div class='add'>+	u32 cck_weaksignal_thr;</div><div class='add'>+	u8 spur_immunity_level;</div><div class='add'>+	u8 firstep_level;</div><div class='add'>+	int8_t rssi_thr_high;</div><div class='add'>+	int8_t rssi_thr_low;</div><div class='add'>+	u16 diversity_control;</div><div class='add'>+	u16 antenna_switch_swap;</div><div class='add'>+	int serialize_regmode;</div><div class='add'>+	int intr_mitigation;</div><div class='add'>+#define SPUR_DISABLE        	0</div><div class='add'>+#define SPUR_ENABLE_IOCTL   	1</div><div class='add'>+#define SPUR_ENABLE_EEPROM  	2</div><div class='add'>+#define AR_EEPROM_MODAL_SPURS   5</div><div class='add'>+#define AR_SPUR_5413_1      	1640</div><div class='add'>+#define AR_SPUR_5413_2      	1200</div><div class='add'>+#define AR_NO_SPUR      	0x8000</div><div class='add'>+#define AR_BASE_FREQ_2GHZ   	2300</div><div class='add'>+#define AR_BASE_FREQ_5GHZ   	4900</div><div class='add'>+#define AR_SPUR_FEEQ_BOUND_HT40 19</div><div class='add'>+#define AR_SPUR_FEEQ_BOUND_HT20 10</div><div class='add'>+	int spurmode;</div><div class='add'>+	u16 spurchans[AR_EEPROM_MODAL_SPURS][2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath9k_tx_queue {</div><div class='add'>+	ATH9K_TX_QUEUE_INACTIVE = 0,</div><div class='add'>+	ATH9K_TX_QUEUE_DATA,</div><div class='add'>+	ATH9K_TX_QUEUE_BEACON,</div><div class='add'>+	ATH9K_TX_QUEUE_CAB,</div><div class='add'>+	ATH9K_TX_QUEUE_UAPSD,</div><div class='add'>+	ATH9K_TX_QUEUE_PSPOLL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define	ATH9K_NUM_TX_QUEUES 10</div><div class='add'>+</div><div class='add'>+enum ath9k_tx_queue_subtype {</div><div class='add'>+	ATH9K_WME_AC_BK = 0,</div><div class='add'>+	ATH9K_WME_AC_BE,</div><div class='add'>+	ATH9K_WME_AC_VI,</div><div class='add'>+	ATH9K_WME_AC_VO,</div><div class='add'>+	ATH9K_WME_UPSD</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath9k_tx_queue_flags {</div><div class='add'>+	TXQ_FLAG_TXOKINT_ENABLE = 0x0001,</div><div class='add'>+	TXQ_FLAG_TXERRINT_ENABLE = 0x0001,</div><div class='add'>+	TXQ_FLAG_TXDESCINT_ENABLE = 0x0002,</div><div class='add'>+	TXQ_FLAG_TXEOLINT_ENABLE = 0x0004,</div><div class='add'>+	TXQ_FLAG_TXURNINT_ENABLE = 0x0008,</div><div class='add'>+	TXQ_FLAG_BACKOFF_DISABLE = 0x0010,</div><div class='add'>+	TXQ_FLAG_COMPRESSION_ENABLE = 0x0020,</div><div class='add'>+	TXQ_FLAG_RDYTIME_EXP_POLICY_ENABLE = 0x0040,</div><div class='add'>+	TXQ_FLAG_FRAG_BURST_BACKOFF_ENABLE = 0x0080,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH9K_TXQ_USEDEFAULT ((u32) -1)</div><div class='add'>+</div><div class='add'>+#define ATH9K_DECOMP_MASK_SIZE     128</div><div class='add'>+#define ATH9K_READY_TIME_LO_BOUND  50</div><div class='add'>+#define ATH9K_READY_TIME_HI_BOUND  96</div><div class='add'>+</div><div class='add'>+enum ath9k_pkt_type {</div><div class='add'>+	ATH9K_PKT_TYPE_NORMAL = 0,</div><div class='add'>+	ATH9K_PKT_TYPE_ATIM,</div><div class='add'>+	ATH9K_PKT_TYPE_PSPOLL,</div><div class='add'>+	ATH9K_PKT_TYPE_BEACON,</div><div class='add'>+	ATH9K_PKT_TYPE_PROBE_RESP,</div><div class='add'>+	ATH9K_PKT_TYPE_CHIRP,</div><div class='add'>+	ATH9K_PKT_TYPE_GRP_POLL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath9k_tx_queue_info {</div><div class='add'>+	u32 tqi_ver;</div><div class='add'>+	enum ath9k_tx_queue tqi_type;</div><div class='add'>+	enum ath9k_tx_queue_subtype tqi_subtype;</div><div class='add'>+	enum ath9k_tx_queue_flags tqi_qflags;</div><div class='add'>+	u32 tqi_priority;</div><div class='add'>+	u32 tqi_aifs;</div><div class='add'>+	u32 tqi_cwmin;</div><div class='add'>+	u32 tqi_cwmax;</div><div class='add'>+	u16 tqi_shretry;</div><div class='add'>+	u16 tqi_lgretry;</div><div class='add'>+	u32 tqi_cbrPeriod;</div><div class='add'>+	u32 tqi_cbrOverflowLimit;</div><div class='add'>+	u32 tqi_burstTime;</div><div class='add'>+	u32 tqi_readyTime;</div><div class='add'>+	u32 tqi_physCompBuf;</div><div class='add'>+	u32 tqi_intFlags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath9k_rx_filter {</div><div class='add'>+	ATH9K_RX_FILTER_UCAST = 0x00000001,</div><div class='add'>+	ATH9K_RX_FILTER_MCAST = 0x00000002,</div><div class='add'>+	ATH9K_RX_FILTER_BCAST = 0x00000004,</div><div class='add'>+	ATH9K_RX_FILTER_CONTROL = 0x00000008,</div><div class='add'>+	ATH9K_RX_FILTER_BEACON = 0x00000010,</div><div class='add'>+	ATH9K_RX_FILTER_PROM = 0x00000020,</div><div class='add'>+	ATH9K_RX_FILTER_PROBEREQ = 0x00000080,</div><div class='add'>+	ATH9K_RX_FILTER_PSPOLL = 0x00004000,</div><div class='add'>+	ATH9K_RX_FILTER_PHYERR = 0x00000100,</div><div class='add'>+	ATH9K_RX_FILTER_PHYRADAR = 0x00002000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath9k_int {</div><div class='add'>+	ATH9K_INT_RX = 0x00000001,</div><div class='add'>+	ATH9K_INT_RXDESC = 0x00000002,</div><div class='add'>+	ATH9K_INT_RXNOFRM = 0x00000008,</div><div class='add'>+	ATH9K_INT_RXEOL = 0x00000010,</div><div class='add'>+	ATH9K_INT_RXORN = 0x00000020,</div><div class='add'>+	ATH9K_INT_TX = 0x00000040,</div><div class='add'>+	ATH9K_INT_TXDESC = 0x00000080,</div><div class='add'>+	ATH9K_INT_TIM_TIMER = 0x00000100,</div><div class='add'>+	ATH9K_INT_TXURN = 0x00000800,</div><div class='add'>+	ATH9K_INT_MIB = 0x00001000,</div><div class='add'>+	ATH9K_INT_RXPHY = 0x00004000,</div><div class='add'>+	ATH9K_INT_RXKCM = 0x00008000,</div><div class='add'>+	ATH9K_INT_SWBA = 0x00010000,</div><div class='add'>+	ATH9K_INT_BMISS = 0x00040000,</div><div class='add'>+	ATH9K_INT_BNR = 0x00100000,</div><div class='add'>+	ATH9K_INT_TIM = 0x00200000,</div><div class='add'>+	ATH9K_INT_DTIM = 0x00400000,</div><div class='add'>+	ATH9K_INT_DTIMSYNC = 0x00800000,</div><div class='add'>+	ATH9K_INT_GPIO = 0x01000000,</div><div class='add'>+	ATH9K_INT_CABEND = 0x02000000,</div><div class='add'>+	ATH9K_INT_CST = 0x10000000,</div><div class='add'>+	ATH9K_INT_GTT = 0x20000000,</div><div class='add'>+	ATH9K_INT_FATAL = 0x40000000,</div><div class='add'>+	ATH9K_INT_GLOBAL = 0x80000000,</div><div class='add'>+	ATH9K_INT_BMISC = ATH9K_INT_TIM |</div><div class='add'>+		ATH9K_INT_DTIM |</div><div class='add'>+		ATH9K_INT_DTIMSYNC |</div><div class='add'>+		ATH9K_INT_CABEND,</div><div class='add'>+	ATH9K_INT_COMMON = ATH9K_INT_RXNOFRM |</div><div class='add'>+		ATH9K_INT_RXDESC |</div><div class='add'>+		ATH9K_INT_RXEOL |</div><div class='add'>+		ATH9K_INT_RXORN |</div><div class='add'>+		ATH9K_INT_TXURN |</div><div class='add'>+		ATH9K_INT_TXDESC |</div><div class='add'>+		ATH9K_INT_MIB |</div><div class='add'>+		ATH9K_INT_RXPHY |</div><div class='add'>+		ATH9K_INT_RXKCM |</div><div class='add'>+		ATH9K_INT_SWBA |</div><div class='add'>+		ATH9K_INT_BMISS |</div><div class='add'>+		ATH9K_INT_GPIO,</div><div class='add'>+	ATH9K_INT_NOCARD = 0xffffffff</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath9k_rate_table {</div><div class='add'>+	int rateCount;</div><div class='add'>+	u8 rateCodeToIndex[256];</div><div class='add'>+	struct {</div><div class='add'>+		u8 valid;</div><div class='add'>+		u8 phy;</div><div class='add'>+		u32 rateKbps;</div><div class='add'>+		u8 rateCode;</div><div class='add'>+		u8 shortPreamble;</div><div class='add'>+		u8 dot11Rate;</div><div class='add'>+		u8 controlRate;</div><div class='add'>+		u16 lpAckDuration;</div><div class='add'>+		u16 spAckDuration;</div><div class='add'>+	} info[32];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH9K_RATESERIES_RTS_CTS  0x0001</div><div class='add'>+#define ATH9K_RATESERIES_2040     0x0002</div><div class='add'>+#define ATH9K_RATESERIES_HALFGI   0x0004</div><div class='add'>+</div><div class='add'>+struct ath9k_11n_rate_series {</div><div class='add'>+	u32 Tries;</div><div class='add'>+	u32 Rate;</div><div class='add'>+	u32 PktDuration;</div><div class='add'>+	u32 ChSel;</div><div class='add'>+	u32 RateFlags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CHANNEL_CW_INT    0x00002</div><div class='add'>+#define CHANNEL_CCK       0x00020</div><div class='add'>+#define CHANNEL_OFDM      0x00040</div><div class='add'>+#define CHANNEL_2GHZ      0x00080</div><div class='add'>+#define CHANNEL_5GHZ      0x00100</div><div class='add'>+#define CHANNEL_PASSIVE   0x00200</div><div class='add'>+#define CHANNEL_DYN       0x00400</div><div class='add'>+#define CHANNEL_HALF      0x04000</div><div class='add'>+#define CHANNEL_QUARTER   0x08000</div><div class='add'>+#define CHANNEL_HT20      0x10000</div><div class='add'>+#define CHANNEL_HT40PLUS  0x20000</div><div class='add'>+#define CHANNEL_HT40MINUS 0x40000</div><div class='add'>+</div><div class='add'>+#define CHANNEL_INTERFERENCE    0x01</div><div class='add'>+#define CHANNEL_DFS             0x02</div><div class='add'>+#define CHANNEL_4MS_LIMIT       0x04</div><div class='add'>+#define CHANNEL_DFS_CLEAR       0x08</div><div class='add'>+#define CHANNEL_DISALLOW_ADHOC  0x10</div><div class='add'>+#define CHANNEL_PER_11D_ADHOC   0x20</div><div class='add'>+</div><div class='add'>+#define CHANNEL_A           (CHANNEL_5GHZ|CHANNEL_OFDM)</div><div class='add'>+#define CHANNEL_B           (CHANNEL_2GHZ|CHANNEL_CCK)</div><div class='add'>+#define CHANNEL_G           (CHANNEL_2GHZ|CHANNEL_OFDM)</div><div class='add'>+#define CHANNEL_G_HT20      (CHANNEL_2GHZ|CHANNEL_HT20)</div><div class='add'>+#define CHANNEL_A_HT20      (CHANNEL_5GHZ|CHANNEL_HT20)</div><div class='add'>+#define CHANNEL_G_HT40PLUS  (CHANNEL_2GHZ|CHANNEL_HT40PLUS)</div><div class='add'>+#define CHANNEL_G_HT40MINUS (CHANNEL_2GHZ|CHANNEL_HT40MINUS)</div><div class='add'>+#define CHANNEL_A_HT40PLUS  (CHANNEL_5GHZ|CHANNEL_HT40PLUS)</div><div class='add'>+#define CHANNEL_A_HT40MINUS (CHANNEL_5GHZ|CHANNEL_HT40MINUS)</div><div class='add'>+#define CHANNEL_ALL				\</div><div class='add'>+	(CHANNEL_OFDM|				\</div><div class='add'>+	 CHANNEL_CCK|				\</div><div class='add'>+	 CHANNEL_2GHZ |				\</div><div class='add'>+	 CHANNEL_5GHZ |				\</div><div class='add'>+	 CHANNEL_HT20 |				\</div><div class='add'>+	 CHANNEL_HT40PLUS |			\</div><div class='add'>+	 CHANNEL_HT40MINUS)</div><div class='add'>+</div><div class='add'>+struct ath9k_channel {</div><div class='add'>+	u16 channel;</div><div class='add'>+	u32 channelFlags;</div><div class='add'>+	u8 privFlags;</div><div class='add'>+	int8_t maxRegTxPower;</div><div class='add'>+	int8_t maxTxPower;</div><div class='add'>+	int8_t minTxPower;</div><div class='add'>+	u32 chanmode;</div><div class='add'>+	int32_t CalValid;</div><div class='add'>+	bool oneTimeCalsDone;</div><div class='add'>+	int8_t iCoff;</div><div class='add'>+	int8_t qCoff;</div><div class='add'>+	int16_t rawNoiseFloor;</div><div class='add'>+	int8_t antennaMax;</div><div class='add'>+	u32 regDmnFlags;</div><div class='add'>+	u32 conformanceTestLimit[3]; /* 0:11a, 1: 11b, 2:11g */</div><div class='add'>+#ifdef ATH_NF_PER_CHAN</div><div class='add'>+	struct ath9k_nfcal_hist nfCalHist[NUM_NF_READINGS];</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IS_CHAN_A(_c) ((((_c)-&gt;channelFlags &amp; CHANNEL_A) == CHANNEL_A) || \</div><div class='add'>+       (((_c)-&gt;channelFlags &amp; CHANNEL_A_HT20) == CHANNEL_A_HT20) || \</div><div class='add'>+       (((_c)-&gt;channelFlags &amp; CHANNEL_A_HT40PLUS) == CHANNEL_A_HT40PLUS) || \</div><div class='add'>+       (((_c)-&gt;channelFlags &amp; CHANNEL_A_HT40MINUS) == CHANNEL_A_HT40MINUS))</div><div class='add'>+#define IS_CHAN_B(_c) (((_c)-&gt;channelFlags &amp; CHANNEL_B) == CHANNEL_B)</div><div class='add'>+#define IS_CHAN_G(_c) ((((_c)-&gt;channelFlags &amp; (CHANNEL_G)) == CHANNEL_G) || \</div><div class='add'>+       (((_c)-&gt;channelFlags &amp; CHANNEL_G_HT20) == CHANNEL_G_HT20) || \</div><div class='add'>+       (((_c)-&gt;channelFlags &amp; CHANNEL_G_HT40PLUS) == CHANNEL_G_HT40PLUS) || \</div><div class='add'>+       (((_c)-&gt;channelFlags &amp; CHANNEL_G_HT40MINUS) == CHANNEL_G_HT40MINUS))</div><div class='add'>+#define IS_CHAN_CCK(_c) (((_c)-&gt;channelFlags &amp; CHANNEL_CCK) != 0)</div><div class='add'>+#define IS_CHAN_OFDM(_c) (((_c)-&gt;channelFlags &amp; CHANNEL_OFDM) != 0)</div><div class='add'>+#define IS_CHAN_5GHZ(_c) (((_c)-&gt;channelFlags &amp; CHANNEL_5GHZ) != 0)</div><div class='add'>+#define IS_CHAN_2GHZ(_c) (((_c)-&gt;channelFlags &amp; CHANNEL_2GHZ) != 0)</div><div class='add'>+#define IS_CHAN_PASSIVE(_c) (((_c)-&gt;channelFlags &amp; CHANNEL_PASSIVE) != 0)</div><div class='add'>+#define IS_CHAN_HALF_RATE(_c) (((_c)-&gt;channelFlags &amp; CHANNEL_HALF) != 0)</div><div class='add'>+#define IS_CHAN_QUARTER_RATE(_c) (((_c)-&gt;channelFlags &amp; CHANNEL_QUARTER) != 0)</div><div class='add'>+</div><div class='add'>+/* These macros check chanmode and not channelFlags */</div><div class='add'>+#define IS_CHAN_HT20(_c) (((_c)-&gt;chanmode == CHANNEL_A_HT20) ||	\</div><div class='add'>+			  ((_c)-&gt;chanmode == CHANNEL_G_HT20))</div><div class='add'>+#define IS_CHAN_HT40(_c) (((_c)-&gt;chanmode == CHANNEL_A_HT40PLUS) ||	\</div><div class='add'>+			  ((_c)-&gt;chanmode == CHANNEL_A_HT40MINUS) ||	\</div><div class='add'>+			  ((_c)-&gt;chanmode == CHANNEL_G_HT40PLUS) ||	\</div><div class='add'>+			  ((_c)-&gt;chanmode == CHANNEL_G_HT40MINUS))</div><div class='add'>+#define IS_CHAN_HT(_c) (IS_CHAN_HT20((_c)) || IS_CHAN_HT40((_c)))</div><div class='add'>+</div><div class='add'>+#define IS_CHAN_IN_PUBLIC_SAFETY_BAND(_c) ((_c) &gt; 4940 &amp;&amp; (_c) &lt; 4990)</div><div class='add'>+#define IS_CHAN_A_5MHZ_SPACED(_c)			\</div><div class='add'>+	((((_c)-&gt;channelFlags &amp; CHANNEL_5GHZ) != 0) &amp;&amp;	\</div><div class='add'>+	 (((_c)-&gt;channel % 20) != 0) &amp;&amp;			\</div><div class='add'>+	 (((_c)-&gt;channel % 10) != 0))</div><div class='add'>+</div><div class='add'>+struct ath9k_keyval {</div><div class='add'>+	u8 kv_type;</div><div class='add'>+	u8 kv_pad;</div><div class='add'>+	u16 kv_len;</div><div class='add'>+	u8 kv_val[16];</div><div class='add'>+	u8 kv_mic[8];</div><div class='add'>+	u8 kv_txmic[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath9k_key_type {</div><div class='add'>+	ATH9K_KEY_TYPE_CLEAR,</div><div class='add'>+	ATH9K_KEY_TYPE_WEP,</div><div class='add'>+	ATH9K_KEY_TYPE_AES,</div><div class='add'>+	ATH9K_KEY_TYPE_TKIP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath9k_cipher {</div><div class='add'>+	ATH9K_CIPHER_WEP = 0,</div><div class='add'>+	ATH9K_CIPHER_AES_OCB = 1,</div><div class='add'>+	ATH9K_CIPHER_AES_CCM = 2,</div><div class='add'>+	ATH9K_CIPHER_CKIP = 3,</div><div class='add'>+	ATH9K_CIPHER_TKIP = 4,</div><div class='add'>+	ATH9K_CIPHER_CLR = 5,</div><div class='add'>+	ATH9K_CIPHER_MIC = 127</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AR_EEPROM_EEPCAP_COMPRESS_DIS   0x0001</div><div class='add'>+#define AR_EEPROM_EEPCAP_AES_DIS        0x0002</div><div class='add'>+#define AR_EEPROM_EEPCAP_FASTFRAME_DIS  0x0004</div><div class='add'>+#define AR_EEPROM_EEPCAP_BURST_DIS      0x0008</div><div class='add'>+#define AR_EEPROM_EEPCAP_MAXQCU         0x01F0</div><div class='add'>+#define AR_EEPROM_EEPCAP_MAXQCU_S       4</div><div class='add'>+#define AR_EEPROM_EEPCAP_HEAVY_CLIP_EN  0x0200</div><div class='add'>+#define AR_EEPROM_EEPCAP_KC_ENTRIES     0xF000</div><div class='add'>+#define AR_EEPROM_EEPCAP_KC_ENTRIES_S   12</div><div class='add'>+</div><div class='add'>+#define AR_EEPROM_EEREGCAP_EN_FCC_MIDBAND   0x0040</div><div class='add'>+#define AR_EEPROM_EEREGCAP_EN_KK_U1_EVEN    0x0080</div><div class='add'>+#define AR_EEPROM_EEREGCAP_EN_KK_U2         0x0100</div><div class='add'>+#define AR_EEPROM_EEREGCAP_EN_KK_MIDBAND    0x0200</div><div class='add'>+#define AR_EEPROM_EEREGCAP_EN_KK_U1_ODD     0x0400</div><div class='add'>+#define AR_EEPROM_EEREGCAP_EN_KK_NEW_11A    0x0800</div><div class='add'>+</div><div class='add'>+#define AR_EEPROM_EEREGCAP_EN_KK_U1_ODD_PRE4_0  0x4000</div><div class='add'>+#define AR_EEPROM_EEREGCAP_EN_KK_NEW_11A_PRE4_0 0x8000</div><div class='add'>+</div><div class='add'>+#define SD_NO_CTL               0xE0</div><div class='add'>+#define NO_CTL                  0xff</div><div class='add'>+#define CTL_MODE_M              7</div><div class='add'>+#define CTL_11A                 0</div><div class='add'>+#define CTL_11B                 1</div><div class='add'>+#define CTL_11G                 2</div><div class='add'>+#define CTL_2GHT20              5</div><div class='add'>+#define CTL_5GHT20              6</div><div class='add'>+#define CTL_2GHT40              7</div><div class='add'>+#define CTL_5GHT40              8</div><div class='add'>+</div><div class='add'>+#define AR_EEPROM_MAC(i)        (0x1d+(i))</div><div class='add'>+#define EEP_SCALE       100</div><div class='add'>+#define EEP_DELTA       10</div><div class='add'>+</div><div class='add'>+#define AR_EEPROM_RFSILENT_GPIO_SEL     0x001c</div><div class='add'>+#define AR_EEPROM_RFSILENT_GPIO_SEL_S   2</div><div class='add'>+#define AR_EEPROM_RFSILENT_POLARITY     0x0002</div><div class='add'>+#define AR_EEPROM_RFSILENT_POLARITY_S   1</div><div class='add'>+</div><div class='add'>+#define CTRY_DEBUG 0x1ff</div><div class='add'>+#define	CTRY_DEFAULT 0</div><div class='add'>+</div><div class='add'>+enum reg_ext_bitmap {</div><div class='add'>+	REG_EXT_JAPAN_MIDBAND = 1,</div><div class='add'>+	REG_EXT_FCC_DFS_HT40 = 2,</div><div class='add'>+	REG_EXT_JAPAN_NONDFS_HT40 = 3,</div><div class='add'>+	REG_EXT_JAPAN_DFS_HT40 = 4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath9k_country_entry {</div><div class='add'>+	u16 countryCode;</div><div class='add'>+	u16 regDmnEnum;</div><div class='add'>+	u16 regDmn5G;</div><div class='add'>+	u16 regDmn2G;</div><div class='add'>+	u8 isMultidomain;</div><div class='add'>+	u8 iso[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define REG_WRITE(_ah, _reg, _val) iowrite32(_val, _ah-&gt;ah_sh + _reg)</div><div class='add'>+#define REG_READ(_ah, _reg) ioread32(_ah-&gt;ah_sh + _reg)</div><div class='add'>+</div><div class='add'>+#define SM(_v, _f)  (((_v) &lt;&lt; _f##_S) &amp; _f)</div><div class='add'>+#define MS(_v, _f)  (((_v) &amp; _f) &gt;&gt; _f##_S)</div><div class='add'>+#define REG_RMW(_a, _r, _set, _clr)    \</div><div class='add'>+	REG_WRITE(_a, _r, (REG_READ(_a, _r) &amp; ~(_clr)) | (_set))</div><div class='add'>+#define REG_RMW_FIELD(_a, _r, _f, _v) \</div><div class='add'>+	REG_WRITE(_a, _r, \</div><div class='add'>+	(REG_READ(_a, _r) &amp; ~_f) | (((_v) &lt;&lt; _f##_S) &amp; _f))</div><div class='add'>+#define REG_SET_BIT(_a, _r, _f) \</div><div class='add'>+	REG_WRITE(_a, _r, REG_READ(_a, _r) | _f)</div><div class='add'>+#define REG_CLR_BIT(_a, _r, _f) \</div><div class='add'>+	REG_WRITE(_a, _r, REG_READ(_a, _r) &amp; ~_f)</div><div class='add'>+</div><div class='add'>+#define ATH9K_COMP_BUF_MAX_SIZE   9216</div><div class='add'>+#define ATH9K_COMP_BUF_ALIGN_SIZE 512</div><div class='add'>+</div><div class='add'>+#define ATH9K_TXQ_USE_LOCKOUT_BKOFF_DIS   0x00000001</div><div class='add'>+</div><div class='add'>+#define INIT_AIFS       2</div><div class='add'>+#define INIT_CWMIN      15</div><div class='add'>+#define INIT_CWMIN_11B  31</div><div class='add'>+#define INIT_CWMAX      1023</div><div class='add'>+#define INIT_SH_RETRY   10</div><div class='add'>+#define INIT_LG_RETRY   10</div><div class='add'>+#define INIT_SSH_RETRY  32</div><div class='add'>+#define INIT_SLG_RETRY  32</div><div class='add'>+</div><div class='add'>+#define WLAN_CTRL_FRAME_SIZE (2+2+6+4)</div><div class='add'>+</div><div class='add'>+#define ATH_AMPDU_LIMIT_MAX      (64 * 1024 - 1)</div><div class='add'>+#define ATH_AMPDU_LIMIT_DEFAULT  ATH_AMPDU_LIMIT_MAX</div><div class='add'>+</div><div class='add'>+#define IEEE80211_WEP_IVLEN      3</div><div class='add'>+#define IEEE80211_WEP_KIDLEN     1</div><div class='add'>+#define IEEE80211_WEP_CRCLEN     4</div><div class='add'>+#define IEEE80211_MAX_MPDU_LEN  (3840 + FCS_LEN +		\</div><div class='add'>+				 (IEEE80211_WEP_IVLEN +		\</div><div class='add'>+				  IEEE80211_WEP_KIDLEN +	\</div><div class='add'>+				  IEEE80211_WEP_CRCLEN))</div><div class='add'>+#define IEEE80211_MAX_LEN       (2300 + FCS_LEN +		\</div><div class='add'>+				 (IEEE80211_WEP_IVLEN +		\</div><div class='add'>+				  IEEE80211_WEP_KIDLEN +	\</div><div class='add'>+				  IEEE80211_WEP_CRCLEN))</div><div class='add'>+</div><div class='add'>+#define MAX_REG_ADD_COUNT   129</div><div class='add'>+#define MAX_RATE_POWER 63</div><div class='add'>+</div><div class='add'>+enum ath9k_power_mode {</div><div class='add'>+	ATH9K_PM_AWAKE = 0,</div><div class='add'>+	ATH9K_PM_FULL_SLEEP,</div><div class='add'>+	ATH9K_PM_NETWORK_SLEEP,</div><div class='add'>+	ATH9K_PM_UNDEFINED</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath9k_mib_stats {</div><div class='add'>+	u32 ackrcv_bad;</div><div class='add'>+	u32 rts_bad;</div><div class='add'>+	u32 rts_good;</div><div class='add'>+	u32 fcs_bad;</div><div class='add'>+	u32 beacons;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath9k_ant_setting {</div><div class='add'>+	ATH9K_ANT_VARIABLE = 0,</div><div class='add'>+	ATH9K_ANT_FIXED_A,</div><div class='add'>+	ATH9K_ANT_FIXED_B</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath9k_opmode {</div><div class='add'>+	ATH9K_M_STA = 1,</div><div class='add'>+	ATH9K_M_IBSS = 0,</div><div class='add'>+	ATH9K_M_HOSTAP = 6,</div><div class='add'>+	ATH9K_M_MONITOR = 8</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH9K_SLOT_TIME_6 6</div><div class='add'>+#define ATH9K_SLOT_TIME_9 9</div><div class='add'>+#define ATH9K_SLOT_TIME_20 20</div><div class='add'>+</div><div class='add'>+enum ath9k_ht_macmode {</div><div class='add'>+	ATH9K_HT_MACMODE_20 = 0,</div><div class='add'>+	ATH9K_HT_MACMODE_2040 = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath9k_ht_extprotspacing {</div><div class='add'>+	ATH9K_HT_EXTPROTSPACING_20 = 0,</div><div class='add'>+	ATH9K_HT_EXTPROTSPACING_25 = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath9k_ht_cwm {</div><div class='add'>+	enum ath9k_ht_macmode ht_macmode;</div><div class='add'>+	enum ath9k_ht_extprotspacing ht_extprotspacing;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath9k_ani_cmd {</div><div class='add'>+	ATH9K_ANI_PRESENT = 0x1,</div><div class='add'>+	ATH9K_ANI_NOISE_IMMUNITY_LEVEL = 0x2,</div><div class='add'>+	ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION = 0x4,</div><div class='add'>+	ATH9K_ANI_CCK_WEAK_SIGNAL_THR = 0x8,</div><div class='add'>+	ATH9K_ANI_FIRSTEP_LEVEL = 0x10,</div><div class='add'>+	ATH9K_ANI_SPUR_IMMUNITY_LEVEL = 0x20,</div><div class='add'>+	ATH9K_ANI_MODE = 0x40,</div><div class='add'>+	ATH9K_ANI_PHYERR_RESET = 0x80,</div><div class='add'>+	ATH9K_ANI_ALL = 0xff</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum phytype {</div><div class='add'>+	PHY_DS,</div><div class='add'>+	PHY_FH,</div><div class='add'>+	PHY_OFDM,</div><div class='add'>+	PHY_HT,</div><div class='add'>+};</div><div class='add'>+#define PHY_CCK PHY_DS</div><div class='add'>+</div><div class='add'>+enum start_adhoc_option {</div><div class='add'>+	START_ADHOC_NO_11A,</div><div class='add'>+	START_ADHOC_PER_11D,</div><div class='add'>+	START_ADHOC_IN_11A,</div><div class='add'>+	START_ADHOC_IN_11B,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath9k_tp_scale {</div><div class='add'>+	ATH9K_TP_SCALE_MAX = 0,</div><div class='add'>+	ATH9K_TP_SCALE_50,</div><div class='add'>+	ATH9K_TP_SCALE_25,</div><div class='add'>+	ATH9K_TP_SCALE_12,</div><div class='add'>+	ATH9K_TP_SCALE_MIN</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ser_reg_mode {</div><div class='add'>+	SER_REG_MODE_OFF = 0,</div><div class='add'>+	SER_REG_MODE_ON = 1,</div><div class='add'>+	SER_REG_MODE_AUTO = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AR_PHY_CCA_MAX_GOOD_VALUE      		-85</div><div class='add'>+#define AR_PHY_CCA_MAX_HIGH_VALUE      		-62</div><div class='add'>+#define AR_PHY_CCA_MIN_BAD_VALUE       		-121</div><div class='add'>+#define AR_PHY_CCA_FILTERWINDOW_LENGTH_INIT     3</div><div class='add'>+#define AR_PHY_CCA_FILTERWINDOW_LENGTH          5</div><div class='add'>+</div><div class='add'>+#define ATH9K_NF_CAL_HIST_MAX           5</div><div class='add'>+#define NUM_NF_READINGS                 6</div><div class='add'>+</div><div class='add'>+struct ath9k_nfcal_hist {</div><div class='add'>+	int16_t nfCalBuffer[ATH9K_NF_CAL_HIST_MAX];</div><div class='add'>+	u8 currIndex;</div><div class='add'>+	int16_t privNF;</div><div class='add'>+	u8 invalidNFcount;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath9k_beacon_state {</div><div class='add'>+	u32 bs_nexttbtt;</div><div class='add'>+	u32 bs_nextdtim;</div><div class='add'>+	u32 bs_intval;</div><div class='add'>+#define ATH9K_BEACON_PERIOD       0x0000ffff</div><div class='add'>+#define ATH9K_BEACON_ENA          0x00800000</div><div class='add'>+#define ATH9K_BEACON_RESET_TSF    0x01000000</div><div class='add'>+	u32 bs_dtimperiod;</div><div class='add'>+	u16 bs_cfpperiod;</div><div class='add'>+	u16 bs_cfpmaxduration;</div><div class='add'>+	u32 bs_cfpnext;</div><div class='add'>+	u16 bs_timoffset;</div><div class='add'>+	u16 bs_bmissthreshold;</div><div class='add'>+	u32 bs_sleepduration;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath9k_node_stats {</div><div class='add'>+	u32 ns_avgbrssi;</div><div class='add'>+	u32 ns_avgrssi;</div><div class='add'>+	u32 ns_avgtxrssi;</div><div class='add'>+	u32 ns_avgtxrate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH9K_RSSI_EP_MULTIPLIER  (1&lt;&lt;7)</div><div class='add'>+</div><div class='add'>+enum ath9k_gpio_output_mux_type {</div><div class='add'>+	ATH9K_GPIO_OUTPUT_MUX_AS_OUTPUT,</div><div class='add'>+	ATH9K_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED,</div><div class='add'>+	ATH9K_GPIO_OUTPUT_MUX_AS_PCIE_POWER_LED,</div><div class='add'>+	ATH9K_GPIO_OUTPUT_MUX_AS_MAC_NETWORK_LED,</div><div class='add'>+	ATH9K_GPIO_OUTPUT_MUX_AS_MAC_POWER_LED,</div><div class='add'>+	ATH9K_GPIO_OUTPUT_MUX_NUM_ENTRIES</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ATH9K_RESET_POWER_ON,</div><div class='add'>+	ATH9K_RESET_WARM,</div><div class='add'>+	ATH9K_RESET_COLD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AH_USE_EEPROM   0x1</div><div class='add'>+</div><div class='add'>+struct ath_hal {</div><div class='add'>+	u32 ah_magic;</div><div class='add'>+	u16 ah_devid;</div><div class='add'>+	u16 ah_subvendorid;</div><div class='add'>+	struct ath_softc *ah_sc;</div><div class='add'>+	void __iomem *ah_sh;</div><div class='add'>+	u16 ah_countryCode;</div><div class='add'>+	u32 ah_macVersion;</div><div class='add'>+	u16 ah_macRev;</div><div class='add'>+	u16 ah_phyRev;</div><div class='add'>+	u16 ah_analog5GhzRev;</div><div class='add'>+	u16 ah_analog2GhzRev;</div><div class='add'>+	u8 ah_decompMask[ATH9K_DECOMP_MASK_SIZE];</div><div class='add'>+	u32 ah_flags;</div><div class='add'>+	enum ath9k_opmode ah_opmode;</div><div class='add'>+	struct ath9k_ops_config ah_config;</div><div class='add'>+	struct ath9k_hw_capabilities ah_caps;</div><div class='add'>+	int16_t ah_powerLimit;</div><div class='add'>+	u16 ah_maxPowerLevel;</div><div class='add'>+	u32 ah_tpScale;</div><div class='add'>+	u16 ah_currentRD;</div><div class='add'>+	u16 ah_currentRDExt;</div><div class='add'>+	u16 ah_currentRDInUse;</div><div class='add'>+	u16 ah_currentRD5G;</div><div class='add'>+	u16 ah_currentRD2G;</div><div class='add'>+	char ah_iso[4];</div><div class='add'>+	enum start_adhoc_option ah_adHocMode;</div><div class='add'>+	bool ah_commonMode;</div><div class='add'>+	struct ath9k_channel ah_channels[150];</div><div class='add'>+	u32 ah_nchan;</div><div class='add'>+	struct ath9k_channel *ah_curchan;</div><div class='add'>+	u16 ah_rfsilent;</div><div class='add'>+	bool ah_rfkillEnabled;</div><div class='add'>+	bool ah_isPciExpress;</div><div class='add'>+	u16 ah_txTrigLevel;</div><div class='add'>+#ifndef ATH_NF_PER_CHAN</div><div class='add'>+	struct ath9k_nfcal_hist nfCalHist[NUM_NF_READINGS];</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct chan_centers {</div><div class='add'>+	u16 synth_center;</div><div class='add'>+	u16 ctl_center;</div><div class='add'>+	u16 ext_center;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ath_hal_getcapability(struct ath_hal *ah,</div><div class='add'>+			  enum ath9k_capability_type type,</div><div class='add'>+			  u32 capability,</div><div class='add'>+			  u32 *result);</div><div class='add'>+const struct ath9k_rate_table *ath9k_hw_getratetable(struct ath_hal *ah,</div><div class='add'>+						     u32 mode);</div><div class='add'>+void ath9k_hw_detach(struct ath_hal *ah);</div><div class='add'>+struct ath_hal *ath9k_hw_attach(u16 devid,</div><div class='add'>+				struct ath_softc *sc,</div><div class='add'>+				void __iomem *mem,</div><div class='add'>+				int *error);</div><div class='add'>+bool ath9k_regd_init_channels(struct ath_hal *ah,</div><div class='add'>+			      u32 maxchans, u32 *nchans,</div><div class='add'>+			      u8 *regclassids,</div><div class='add'>+			      u32 maxregids, u32 *nregids,</div><div class='add'>+			      u16 cc,</div><div class='add'>+			      bool enableOutdoor,</div><div class='add'>+			      bool enableExtendedChannels);</div><div class='add'>+u32 ath9k_hw_mhz2ieee(struct ath_hal *ah, u32 freq, u32 flags);</div><div class='add'>+enum ath9k_int ath9k_hw_set_interrupts(struct ath_hal *ah,</div><div class='add'>+				     enum ath9k_int ints);</div><div class='add'>+bool ath9k_hw_reset(struct ath_hal *ah, enum ath9k_opmode opmode,</div><div class='add'>+		    struct ath9k_channel *chan,</div><div class='add'>+		    enum ath9k_ht_macmode macmode,</div><div class='add'>+		    u8 txchainmask, u8 rxchainmask,</div><div class='add'>+		    enum ath9k_ht_extprotspacing extprotspacing,</div><div class='add'>+		    bool bChannelChange,</div><div class='add'>+		    int *status);</div><div class='add'>+bool ath9k_hw_phy_disable(struct ath_hal *ah);</div><div class='add'>+void ath9k_hw_reset_calvalid(struct ath_hal *ah, struct ath9k_channel *chan,</div><div class='add'>+			     bool *isCalDone);</div><div class='add'>+void ath9k_hw_ani_monitor(struct ath_hal *ah,</div><div class='add'>+			  const struct ath9k_node_stats *stats,</div><div class='add'>+			  struct ath9k_channel *chan);</div><div class='add'>+bool ath9k_hw_calibrate(struct ath_hal *ah,</div><div class='add'>+			struct ath9k_channel *chan,</div><div class='add'>+			u8 rxchainmask,</div><div class='add'>+			bool longcal,</div><div class='add'>+			bool *isCalDone);</div><div class='add'>+int16_t ath9k_hw_getchan_noise(struct ath_hal *ah,</div><div class='add'>+			       struct ath9k_channel *chan);</div><div class='add'>+void ath9k_hw_write_associd(struct ath_hal *ah, const u8 *bssid,</div><div class='add'>+			    u16 assocId);</div><div class='add'>+void ath9k_hw_setrxfilter(struct ath_hal *ah, u32 bits);</div><div class='add'>+void ath9k_hw_write_associd(struct ath_hal *ah, const u8 *bssid,</div><div class='add'>+			    u16 assocId);</div><div class='add'>+bool ath9k_hw_stoptxdma(struct ath_hal *ah, u32 q);</div><div class='add'>+void ath9k_hw_reset_tsf(struct ath_hal *ah);</div><div class='add'>+bool ath9k_hw_keyisvalid(struct ath_hal *ah, u16 entry);</div><div class='add'>+bool ath9k_hw_keysetmac(struct ath_hal *ah, u16 entry,</div><div class='add'>+			const u8 *mac);</div><div class='add'>+bool ath9k_hw_set_keycache_entry(struct ath_hal *ah,</div><div class='add'>+				 u16 entry,</div><div class='add'>+				 const struct ath9k_keyval *k,</div><div class='add'>+				 const u8 *mac,</div><div class='add'>+				 int xorKey);</div><div class='add'>+bool ath9k_hw_set_tsfadjust(struct ath_hal *ah,</div><div class='add'>+			    u32 setting);</div><div class='add'>+void ath9k_hw_configpcipowersave(struct ath_hal *ah, int restore);</div><div class='add'>+bool ath9k_hw_intrpend(struct ath_hal *ah);</div><div class='add'>+bool ath9k_hw_getisr(struct ath_hal *ah, enum ath9k_int *masked);</div><div class='add'>+bool ath9k_hw_updatetxtriglevel(struct ath_hal *ah,</div><div class='add'>+				bool bIncTrigLevel);</div><div class='add'>+void ath9k_hw_procmibevent(struct ath_hal *ah,</div><div class='add'>+			   const struct ath9k_node_stats *stats);</div><div class='add'>+bool ath9k_hw_setrxabort(struct ath_hal *ah, bool set);</div><div class='add'>+void ath9k_hw_set11nmac2040(struct ath_hal *ah, enum ath9k_ht_macmode mode);</div><div class='add'>+bool ath9k_hw_phycounters(struct ath_hal *ah);</div><div class='add'>+bool ath9k_hw_keyreset(struct ath_hal *ah, u16 entry);</div><div class='add'>+bool ath9k_hw_getcapability(struct ath_hal *ah,</div><div class='add'>+			    enum ath9k_capability_type type,</div><div class='add'>+			    u32 capability,</div><div class='add'>+			    u32 *result);</div><div class='add'>+bool ath9k_hw_setcapability(struct ath_hal *ah,</div><div class='add'>+			    enum ath9k_capability_type type,</div><div class='add'>+			    u32 capability,</div><div class='add'>+			    u32 setting,</div><div class='add'>+			    int *status);</div><div class='add'>+u32 ath9k_hw_getdefantenna(struct ath_hal *ah);</div><div class='add'>+void ath9k_hw_getmac(struct ath_hal *ah, u8 *mac);</div><div class='add'>+void ath9k_hw_getbssidmask(struct ath_hal *ah, u8 *mask);</div><div class='add'>+bool ath9k_hw_setbssidmask(struct ath_hal *ah,</div><div class='add'>+			   const u8 *mask);</div><div class='add'>+bool ath9k_hw_setpower(struct ath_hal *ah,</div><div class='add'>+		       enum ath9k_power_mode mode);</div><div class='add'>+enum ath9k_int ath9k_hw_intrget(struct ath_hal *ah);</div><div class='add'>+u64 ath9k_hw_gettsf64(struct ath_hal *ah);</div><div class='add'>+u32 ath9k_hw_getdefantenna(struct ath_hal *ah);</div><div class='add'>+bool ath9k_hw_setslottime(struct ath_hal *ah, u32 us);</div><div class='add'>+bool ath9k_hw_setantennaswitch(struct ath_hal *ah,</div><div class='add'>+			       enum ath9k_ant_setting settings,</div><div class='add'>+			       struct ath9k_channel *chan,</div><div class='add'>+			       u8 *tx_chainmask,</div><div class='add'>+			       u8 *rx_chainmask,</div><div class='add'>+			       u8 *antenna_cfgd);</div><div class='add'>+void ath9k_hw_setantenna(struct ath_hal *ah, u32 antenna);</div><div class='add'>+int ath9k_hw_select_antconfig(struct ath_hal *ah,</div><div class='add'>+			      u32 cfg);</div><div class='add'>+bool ath9k_hw_puttxbuf(struct ath_hal *ah, u32 q,</div><div class='add'>+		       u32 txdp);</div><div class='add'>+bool ath9k_hw_txstart(struct ath_hal *ah, u32 q);</div><div class='add'>+u16 ath9k_hw_computetxtime(struct ath_hal *ah,</div><div class='add'>+				 const struct ath9k_rate_table *rates,</div><div class='add'>+				 u32 frameLen, u16 rateix,</div><div class='add'>+				 bool shortPreamble);</div><div class='add'>+void ath9k_hw_set11n_ratescenario(struct ath_hal *ah, struct ath_desc *ds,</div><div class='add'>+				  struct ath_desc *lastds,</div><div class='add'>+				  u32 durUpdateEn, u32 rtsctsRate,</div><div class='add'>+				  u32 rtsctsDuration,</div><div class='add'>+				  struct ath9k_11n_rate_series series[],</div><div class='add'>+				  u32 nseries, u32 flags);</div><div class='add'>+void ath9k_hw_set11n_burstduration(struct ath_hal *ah,</div><div class='add'>+				   struct ath_desc *ds,</div><div class='add'>+				   u32 burstDuration);</div><div class='add'>+void ath9k_hw_cleartxdesc(struct ath_hal *ah, struct ath_desc *ds);</div><div class='add'>+u32 ath9k_hw_reverse_bits(u32 val, u32 n);</div><div class='add'>+bool ath9k_hw_resettxqueue(struct ath_hal *ah, u32 q);</div><div class='add'>+u32 ath9k_regd_get_ctl(struct ath_hal *ah, struct ath9k_channel *chan);</div><div class='add'>+u32 ath9k_regd_get_antenna_allowed(struct ath_hal *ah,</div><div class='add'>+				     struct ath9k_channel *chan);</div><div class='add'>+u32 ath9k_hw_mhz2ieee(struct ath_hal *ah, u32 freq, u32 flags);</div><div class='add'>+bool ath9k_hw_get_txq_props(struct ath_hal *ah, int q,</div><div class='add'>+			    struct ath9k_tx_queue_info *qinfo);</div><div class='add'>+bool ath9k_hw_set_txq_props(struct ath_hal *ah, int q,</div><div class='add'>+			    const struct ath9k_tx_queue_info *qinfo);</div><div class='add'>+struct ath9k_channel *ath9k_regd_check_channel(struct ath_hal *ah,</div><div class='add'>+					      const struct ath9k_channel *c);</div><div class='add'>+void ath9k_hw_set11n_txdesc(struct ath_hal *ah, struct ath_desc *ds,</div><div class='add'>+			    u32 pktLen, enum ath9k_pkt_type type,</div><div class='add'>+			    u32 txPower, u32 keyIx,</div><div class='add'>+			    enum ath9k_key_type keyType, u32 flags);</div><div class='add'>+bool ath9k_hw_filltxdesc(struct ath_hal *ah, struct ath_desc *ds,</div><div class='add'>+			 u32 segLen, bool firstSeg,</div><div class='add'>+			 bool lastSeg,</div><div class='add'>+			 const struct ath_desc *ds0);</div><div class='add'>+u32 ath9k_hw_GetMibCycleCountsPct(struct ath_hal *ah,</div><div class='add'>+					u32 *rxc_pcnt,</div><div class='add'>+					u32 *rxf_pcnt,</div><div class='add'>+					u32 *txf_pcnt);</div><div class='add'>+void ath9k_hw_dmaRegDump(struct ath_hal *ah);</div><div class='add'>+void ath9k_hw_beaconinit(struct ath_hal *ah,</div><div class='add'>+			 u32 next_beacon, u32 beacon_period);</div><div class='add'>+void ath9k_hw_set_sta_beacon_timers(struct ath_hal *ah,</div><div class='add'>+				    const struct ath9k_beacon_state *bs);</div><div class='add'>+bool ath9k_hw_setuprxdesc(struct ath_hal *ah, struct ath_desc *ds,</div><div class='add'>+			  u32 size, u32 flags);</div><div class='add'>+void ath9k_hw_putrxbuf(struct ath_hal *ah, u32 rxdp);</div><div class='add'>+void ath9k_hw_rxena(struct ath_hal *ah);</div><div class='add'>+void ath9k_hw_setopmode(struct ath_hal *ah);</div><div class='add'>+bool ath9k_hw_setmac(struct ath_hal *ah, const u8 *mac);</div><div class='add'>+void ath9k_hw_setmcastfilter(struct ath_hal *ah, u32 filter0,</div><div class='add'>+			     u32 filter1);</div><div class='add'>+u32 ath9k_hw_getrxfilter(struct ath_hal *ah);</div><div class='add'>+void ath9k_hw_startpcureceive(struct ath_hal *ah);</div><div class='add'>+void ath9k_hw_stoppcurecv(struct ath_hal *ah);</div><div class='add'>+bool ath9k_hw_stopdmarecv(struct ath_hal *ah);</div><div class='add'>+int ath9k_hw_rxprocdesc(struct ath_hal *ah,</div><div class='add'>+			struct ath_desc *ds, u32 pa,</div><div class='add'>+			struct ath_desc *nds, u64 tsf);</div><div class='add'>+u32 ath9k_hw_gettxbuf(struct ath_hal *ah, u32 q);</div><div class='add'>+int ath9k_hw_txprocdesc(struct ath_hal *ah,</div><div class='add'>+			struct ath_desc *ds);</div><div class='add'>+void ath9k_hw_set11n_aggr_middle(struct ath_hal *ah, struct ath_desc *ds,</div><div class='add'>+				 u32 numDelims);</div><div class='add'>+void ath9k_hw_set11n_aggr_first(struct ath_hal *ah, struct ath_desc *ds,</div><div class='add'>+				u32 aggrLen);</div><div class='add'>+void ath9k_hw_set11n_aggr_last(struct ath_hal *ah, struct ath_desc *ds);</div><div class='add'>+bool ath9k_hw_releasetxqueue(struct ath_hal *ah, u32 q);</div><div class='add'>+void ath9k_hw_gettxintrtxqs(struct ath_hal *ah, u32 *txqs);</div><div class='add'>+void ath9k_hw_clr11n_aggr(struct ath_hal *ah, struct ath_desc *ds);</div><div class='add'>+void ath9k_hw_set11n_virtualmorefrag(struct ath_hal *ah,</div><div class='add'>+				     struct ath_desc *ds, u32 vmf);</div><div class='add'>+bool ath9k_hw_set_txpowerlimit(struct ath_hal *ah, u32 limit);</div><div class='add'>+bool ath9k_regd_is_public_safety_sku(struct ath_hal *ah);</div><div class='add'>+int ath9k_hw_setuptxqueue(struct ath_hal *ah, enum ath9k_tx_queue type,</div><div class='add'>+			  const struct ath9k_tx_queue_info *qinfo);</div><div class='add'>+u32 ath9k_hw_numtxpending(struct ath_hal *ah, u32 q);</div><div class='add'>+const char *ath9k_hw_probe(u16 vendorid, u16 devid);</div><div class='add'>+bool ath9k_hw_disable(struct ath_hal *ah);</div><div class='add'>+void ath9k_hw_rfdetach(struct ath_hal *ah);</div><div class='add'>+void ath9k_hw_get_channel_centers(struct ath_hal *ah,</div><div class='add'>+				  struct ath9k_channel *chan,</div><div class='add'>+				  struct chan_centers *centers);</div><div class='add'>+bool ath9k_get_channel_edges(struct ath_hal *ah,</div><div class='add'>+			     u16 flags, u16 *low,</div><div class='add'>+			     u16 *high);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/beacon.c b/drivers/net/wireless/ath9k/beacon.c<br/>new file mode 100644<br/>index 000000000000..00a0eaa08866<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath9k/beacon.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/beacon.c</a></div><div class='hunk'>@@ -0,0 +1,992 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2008 Atheros Communications Inc.</div><div class='add'>+ *</div><div class='add'>+ * Permission to use, copy, modify, and/or distribute this software for any</div><div class='add'>+ * purpose with or without fee is hereby granted, provided that the above</div><div class='add'>+ * copyright notice and this permission notice appear in all copies.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='add'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='add'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='add'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='add'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+ /* Implementation of beacon processing. */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Configure parameters for the beacon queue</div><div class='add'>+ *</div><div class='add'>+ *  This function will modify certain transmit queue properties depending on</div><div class='add'>+ *  the operating mode of the station (AP or AdHoc).  Parameters are AIFS</div><div class='add'>+ *  settings and channel width min/max</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+static int ath_beaconq_config(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	struct ath9k_tx_queue_info qi;</div><div class='add'>+</div><div class='add'>+	ath9k_hw_get_txq_props(ah, sc-&gt;sc_bhalq, &amp;qi);</div><div class='add'>+	if (sc-&gt;sc_opmode == ATH9K_M_HOSTAP) {</div><div class='add'>+		/* Always burst out beacon and CAB traffic. */</div><div class='add'>+		qi.tqi_aifs = 1;</div><div class='add'>+		qi.tqi_cwmin = 0;</div><div class='add'>+		qi.tqi_cwmax = 0;</div><div class='add'>+	} else {</div><div class='add'>+		/* Adhoc mode; important thing is to use 2x cwmin. */</div><div class='add'>+		qi.tqi_aifs = sc-&gt;sc_beacon_qi.tqi_aifs;</div><div class='add'>+		qi.tqi_cwmin = 2*sc-&gt;sc_beacon_qi.tqi_cwmin;</div><div class='add'>+		qi.tqi_cwmax = sc-&gt;sc_beacon_qi.tqi_cwmax;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ath9k_hw_set_txq_props(ah, sc-&gt;sc_bhalq, &amp;qi)) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to update h/w beacon queue parameters\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		ath9k_hw_resettxqueue(ah, sc-&gt;sc_bhalq); /* push to h/w */</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Setup the beacon frame for transmit.</div><div class='add'>+ *</div><div class='add'>+ *  Associates the beacon frame buffer with a transmit descriptor.  Will set</div><div class='add'>+ *  up all required antenna switch parameters, rate codes, and channel flags.</div><div class='add'>+ *  Beacons are always sent out at the lowest rate, and are not retried.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+static void ath_beacon_setup(struct ath_softc *sc,</div><div class='add'>+	struct ath_vap *avp, struct ath_buf *bf)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = (struct sk_buff *)bf-&gt;bf_mpdu;</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	struct ath_desc *ds;</div><div class='add'>+	int flags, antenna;</div><div class='add'>+	const struct ath9k_rate_table *rt;</div><div class='add'>+	u8 rix, rate;</div><div class='add'>+	int ctsrate = 0;</div><div class='add'>+	int ctsduration = 0;</div><div class='add'>+	struct ath9k_11n_rate_series  series[4];</div><div class='add'>+</div><div class='add'>+	DPRINTF(sc, ATH_DBG_BEACON, "%s: m %p len %u\n",</div><div class='add'>+		__func__, skb, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* setup descriptors */</div><div class='add'>+	ds = bf-&gt;bf_desc;</div><div class='add'>+</div><div class='add'>+	flags = ATH9K_TXDESC_NOACK;</div><div class='add'>+</div><div class='add'>+	if (sc-&gt;sc_opmode == ATH9K_M_IBSS &amp;&amp;</div><div class='add'>+	    (ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_VEOL)) {</div><div class='add'>+		ds-&gt;ds_link = bf-&gt;bf_daddr; /* self-linked */</div><div class='add'>+		flags |= ATH9K_TXDESC_VEOL;</div><div class='add'>+		/* Let hardware handle antenna switching. */</div><div class='add'>+		antenna = 0;</div><div class='add'>+	} else {</div><div class='add'>+		ds-&gt;ds_link = 0;</div><div class='add'>+		/*</div><div class='add'>+		 * Switch antenna every beacon.</div><div class='add'>+		 * Should only switch every beacon period, not for every</div><div class='add'>+		 * SWBA's</div><div class='add'>+		 * XXX assumes two antenna</div><div class='add'>+		 */</div><div class='add'>+		antenna = ((sc-&gt;ast_be_xmit / sc-&gt;sc_nbcnvaps) &amp; 1 ? 2 : 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ds-&gt;ds_data = bf-&gt;bf_buf_addr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Calculate rate code.</div><div class='add'>+	 * XXX everything at min xmit rate</div><div class='add'>+	 */</div><div class='add'>+	rix = 0;</div><div class='add'>+	rt = sc-&gt;sc_currates;</div><div class='add'>+	rate = rt-&gt;info[rix].rateCode;</div><div class='add'>+	if (sc-&gt;sc_flags &amp; ATH_PREAMBLE_SHORT)</div><div class='add'>+		rate |= rt-&gt;info[rix].shortPreamble;</div><div class='add'>+</div><div class='add'>+	ath9k_hw_set11n_txdesc(ah, ds</div><div class='add'>+			      , skb-&gt;len + FCS_LEN /* frame length */</div><div class='add'>+			      , ATH9K_PKT_TYPE_BEACON /* Atheros packet type */</div><div class='add'>+			      , avp-&gt;av_btxctl.txpower /* txpower XXX */</div><div class='add'>+			      , ATH9K_TXKEYIX_INVALID /* no encryption */</div><div class='add'>+			      , ATH9K_KEY_TYPE_CLEAR /* no encryption */</div><div class='add'>+			      , flags /* no ack, veol for beacons */</div><div class='add'>+		);</div><div class='add'>+</div><div class='add'>+	/* NB: beacon's BufLen must be a multiple of 4 bytes */</div><div class='add'>+	ath9k_hw_filltxdesc(ah, ds</div><div class='add'>+			   , roundup(skb-&gt;len, 4) /* buffer length */</div><div class='add'>+			   , true /* first segment */</div><div class='add'>+			   , true /* last segment */</div><div class='add'>+			   , ds /* first descriptor */</div><div class='add'>+		);</div><div class='add'>+</div><div class='add'>+	memzero(series, sizeof(struct ath9k_11n_rate_series) * 4);</div><div class='add'>+	series[0].Tries = 1;</div><div class='add'>+	series[0].Rate = rate;</div><div class='add'>+	series[0].ChSel = sc-&gt;sc_tx_chainmask;</div><div class='add'>+	series[0].RateFlags = (ctsrate) ? ATH9K_RATESERIES_RTS_CTS : 0;</div><div class='add'>+	ath9k_hw_set11n_ratescenario(ah, ds, ds, 0,</div><div class='add'>+		ctsrate, ctsduration, series, 4, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Move everything from the vap's mcast queue to the hardware cab queue.</div><div class='add'>+ * Caller must hold mcasq lock and cabq lock</div><div class='add'>+ * XXX MORE_DATA bit?</div><div class='add'>+ */</div><div class='add'>+static void empty_mcastq_into_cabq(struct ath_hal *ah,</div><div class='add'>+	struct ath_txq *mcastq, struct ath_txq *cabq)</div><div class='add'>+{</div><div class='add'>+	struct ath_buf *bfmcast;</div><div class='add'>+</div><div class='add'>+	BUG_ON(list_empty(&amp;mcastq-&gt;axq_q));</div><div class='add'>+</div><div class='add'>+	bfmcast = list_first_entry(&amp;mcastq-&gt;axq_q, struct ath_buf, list);</div><div class='add'>+</div><div class='add'>+	/* link the descriptors */</div><div class='add'>+	if (!cabq-&gt;axq_link)</div><div class='add'>+		ath9k_hw_puttxbuf(ah, cabq-&gt;axq_qnum, bfmcast-&gt;bf_daddr);</div><div class='add'>+	else</div><div class='add'>+		*cabq-&gt;axq_link = bfmcast-&gt;bf_daddr;</div><div class='add'>+</div><div class='add'>+	/* append the private vap mcast list to  the cabq */</div><div class='add'>+</div><div class='add'>+	cabq-&gt;axq_depth	+= mcastq-&gt;axq_depth;</div><div class='add'>+	cabq-&gt;axq_totalqueued += mcastq-&gt;axq_totalqueued;</div><div class='add'>+	cabq-&gt;axq_linkbuf = mcastq-&gt;axq_linkbuf;</div><div class='add'>+	cabq-&gt;axq_link = mcastq-&gt;axq_link;</div><div class='add'>+	list_splice_tail_init(&amp;mcastq-&gt;axq_q, &amp;cabq-&gt;axq_q);</div><div class='add'>+	mcastq-&gt;axq_depth = 0;</div><div class='add'>+	mcastq-&gt;axq_totalqueued = 0;</div><div class='add'>+	mcastq-&gt;axq_linkbuf = NULL;</div><div class='add'>+	mcastq-&gt;axq_link = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This is only run at DTIM. We move everything from the vap's mcast queue</div><div class='add'>+ * to the hardware cab queue. Caller must hold the mcastq lock. */</div><div class='add'>+static void trigger_mcastq(struct ath_hal *ah,</div><div class='add'>+	struct ath_txq *mcastq, struct ath_txq *cabq)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;cabq-&gt;axq_lock);</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;mcastq-&gt;axq_q))</div><div class='add'>+		empty_mcastq_into_cabq(ah, mcastq, cabq);</div><div class='add'>+</div><div class='add'>+	/* cabq is gated by beacon so it is safe to start here */</div><div class='add'>+	if (!list_empty(&amp;cabq-&gt;axq_q))</div><div class='add'>+		ath9k_hw_txstart(ah, cabq-&gt;axq_qnum);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;cabq-&gt;axq_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Generate beacon frame and queue cab data for a vap.</div><div class='add'>+ *</div><div class='add'>+ *  Updates the contents of the beacon frame.  It is assumed that the buffer for</div><div class='add'>+ *  the beacon frame has been allocated in the ATH object, and simply needs to</div><div class='add'>+ *  be filled for this cycle.  Also, any CAB (crap after beacon?) traffic will</div><div class='add'>+ *  be added to the beacon frame at this point.</div><div class='add'>+*/</div><div class='add'>+static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	struct ath_buf *bf;</div><div class='add'>+	struct ath_vap *avp;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int cabq_depth;</div><div class='add'>+	int mcastq_depth;</div><div class='add'>+	int is_beacon_dtim = 0;</div><div class='add'>+	unsigned int curlen;</div><div class='add'>+	struct ath_txq *cabq;</div><div class='add'>+	struct ath_txq *mcastq;</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='add'>+	avp = sc-&gt;sc_vaps[if_id];</div><div class='add'>+</div><div class='add'>+	mcastq = &amp;avp-&gt;av_mcastq;</div><div class='add'>+	cabq = sc-&gt;sc_cabq;</div><div class='add'>+</div><div class='add'>+	ASSERT(avp);</div><div class='add'>+</div><div class='add'>+	if (avp-&gt;av_bcbuf == NULL) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_BEACON, "%s: avp=%p av_bcbuf=%p\n",</div><div class='add'>+			__func__, avp, avp-&gt;av_bcbuf);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	bf = avp-&gt;av_bcbuf;</div><div class='add'>+	skb = (struct sk_buff *) bf-&gt;bf_mpdu;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Update dynamic beacon contents.  If this returns</div><div class='add'>+	 * non-zero then we need to remap the memory because</div><div class='add'>+	 * the beacon frame changed size (probably because</div><div class='add'>+	 * of the TIM bitmap).</div><div class='add'>+	 */</div><div class='add'>+	curlen = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	if (info-&gt;flags &amp; IEEE80211_TX_CTL_ASSIGN_SEQ) {</div><div class='add'>+		/*</div><div class='add'>+		 * TODO: make sure the seq# gets assigned properly (vs. other</div><div class='add'>+		 * TX frames)</div><div class='add'>+		 */</div><div class='add'>+		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='add'>+		sc-&gt;seq_no += 0x10;</div><div class='add'>+		hdr-&gt;seq_ctrl &amp;= cpu_to_le16(IEEE80211_SCTL_FRAG);</div><div class='add'>+		hdr-&gt;seq_ctrl |= cpu_to_le16(sc-&gt;seq_no);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* XXX: spin_lock_bh should not be used here, but sparse bitches</div><div class='add'>+	 * otherwise. We should fix sparse :) */</div><div class='add'>+	spin_lock_bh(&amp;mcastq-&gt;axq_lock);</div><div class='add'>+	mcastq_depth = avp-&gt;av_mcastq.axq_depth;</div><div class='add'>+</div><div class='add'>+	if (ath_update_beacon(sc, if_id, &amp;avp-&gt;av_boff, skb, mcastq_depth) ==</div><div class='add'>+	    1) {</div><div class='add'>+		ath_skb_unmap_single(sc, skb, PCI_DMA_TODEVICE,</div><div class='add'>+				     get_dma_mem_context(bf, bf_dmacontext));</div><div class='add'>+		bf-&gt;bf_buf_addr = ath_skb_map_single(sc, skb, PCI_DMA_TODEVICE,</div><div class='add'>+			get_dma_mem_context(bf, bf_dmacontext));</div><div class='add'>+	} else {</div><div class='add'>+		pci_dma_sync_single_for_cpu(sc-&gt;pdev,</div><div class='add'>+					    bf-&gt;bf_buf_addr,</div><div class='add'>+					    skb_tailroom(skb),</div><div class='add'>+					    PCI_DMA_TODEVICE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if the CABQ traffic from previous DTIM is pending and the current</div><div class='add'>+	 *  beacon is also a DTIM.</div><div class='add'>+	 *  1) if there is only one vap let the cab traffic continue.</div><div class='add'>+	 *  2) if there are more than one vap and we are using staggered</div><div class='add'>+	 *     beacons, then drain the cabq by dropping all the frames in</div><div class='add'>+	 *     the cabq so that the current vaps cab traffic can be scheduled.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_bh(&amp;cabq-&gt;axq_lock);</div><div class='add'>+	cabq_depth = cabq-&gt;axq_depth;</div><div class='add'>+	spin_unlock_bh(&amp;cabq-&gt;axq_lock);</div><div class='add'>+</div><div class='add'>+	is_beacon_dtim = avp-&gt;av_boff.bo_tim[4] &amp; 1;</div><div class='add'>+</div><div class='add'>+	if (mcastq_depth &amp;&amp; is_beacon_dtim &amp;&amp; cabq_depth) {</div><div class='add'>+		/*</div><div class='add'>+		 * Unlock the cabq lock as ath_tx_draintxq acquires</div><div class='add'>+		 * the lock again which is a common function and that</div><div class='add'>+		 * acquires txq lock inside.</div><div class='add'>+		 */</div><div class='add'>+		if (sc-&gt;sc_nvaps &gt; 1) {</div><div class='add'>+			ath_tx_draintxq(sc, cabq, false);</div><div class='add'>+			DPRINTF(sc, ATH_DBG_BEACON,</div><div class='add'>+				"%s: flush previous cabq traffic\n", __func__);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Construct tx descriptor. */</div><div class='add'>+	ath_beacon_setup(sc, avp, bf);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable the CAB queue before the beacon queue to</div><div class='add'>+	 * insure cab frames are triggered by this beacon.</div><div class='add'>+	 */</div><div class='add'>+	if (is_beacon_dtim)</div><div class='add'>+		trigger_mcastq(ah, mcastq, cabq);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;mcastq-&gt;axq_lock);</div><div class='add'>+	return bf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Startup beacon transmission for adhoc mode when they are sent entirely</div><div class='add'>+ * by the hardware using the self-linked descriptor + veol trick.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+static void ath_beacon_start_adhoc(struct ath_softc *sc, int if_id)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	struct ath_buf *bf;</div><div class='add'>+	struct ath_vap *avp;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	avp = sc-&gt;sc_vaps[if_id];</div><div class='add'>+	ASSERT(avp);</div><div class='add'>+</div><div class='add'>+	if (avp-&gt;av_bcbuf == NULL) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_BEACON, "%s: avp=%p av_bcbuf=%p\n",</div><div class='add'>+			__func__, avp, avp != NULL ? avp-&gt;av_bcbuf : NULL);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	bf = avp-&gt;av_bcbuf;</div><div class='add'>+	skb = (struct sk_buff *) bf-&gt;bf_mpdu;</div><div class='add'>+</div><div class='add'>+	/* Construct tx descriptor. */</div><div class='add'>+	ath_beacon_setup(sc, avp, bf);</div><div class='add'>+</div><div class='add'>+	/* NB: caller is known to have already stopped tx dma */</div><div class='add'>+	ath9k_hw_puttxbuf(ah, sc-&gt;sc_bhalq, bf-&gt;bf_daddr);</div><div class='add'>+	ath9k_hw_txstart(ah, sc-&gt;sc_bhalq);</div><div class='add'>+	DPRINTF(sc, ATH_DBG_BEACON, "%s: TXDP%u = %llx (%p)\n", __func__,</div><div class='add'>+		sc-&gt;sc_bhalq, ito64(bf-&gt;bf_daddr), bf-&gt;bf_desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Setup a h/w transmit queue for beacons.</div><div class='add'>+ *</div><div class='add'>+ *  This function allocates an information structure (struct ath9k_txq_info)</div><div class='add'>+ *  on the stack, sets some specific parameters (zero out channel width</div><div class='add'>+ *  min/max, and enable aifs). The info structure does not need to be</div><div class='add'>+ *  persistant.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+int ath_beaconq_setup(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath9k_tx_queue_info qi;</div><div class='add'>+</div><div class='add'>+	memzero(&amp;qi, sizeof(qi));</div><div class='add'>+	qi.tqi_aifs = 1;</div><div class='add'>+	qi.tqi_cwmin = 0;</div><div class='add'>+	qi.tqi_cwmax = 0;</div><div class='add'>+	/* NB: don't enable any interrupts */</div><div class='add'>+	return ath9k_hw_setuptxqueue(ah, ATH9K_TX_QUEUE_BEACON, &amp;qi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Allocate and setup an initial beacon frame.</div><div class='add'>+ *</div><div class='add'>+ *  Allocate a beacon state variable for a specific VAP instance created on</div><div class='add'>+ *  the ATH interface.  This routine also calculates the beacon "slot" for</div><div class='add'>+ *  staggared beacons in the mBSSID case.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+int ath_beacon_alloc(struct ath_softc *sc, int if_id)</div><div class='add'>+{</div><div class='add'>+	struct ath_vap *avp;</div><div class='add'>+	struct ieee80211_hdr *wh;</div><div class='add'>+	struct ath_buf *bf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	avp = sc-&gt;sc_vaps[if_id];</div><div class='add'>+	ASSERT(avp);</div><div class='add'>+</div><div class='add'>+	/* Allocate a beacon descriptor if we haven't done so. */</div><div class='add'>+	if (!avp-&gt;av_bcbuf) {</div><div class='add'>+		/*</div><div class='add'>+		 * Allocate beacon state for hostap/ibss.  We know</div><div class='add'>+		 * a buffer is available.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		avp-&gt;av_bcbuf = list_first_entry(&amp;sc-&gt;sc_bbuf,</div><div class='add'>+				struct ath_buf, list);</div><div class='add'>+		list_del(&amp;avp-&gt;av_bcbuf-&gt;list);</div><div class='add'>+</div><div class='add'>+		if (sc-&gt;sc_opmode == ATH9K_M_HOSTAP ||</div><div class='add'>+		    !(sc-&gt;sc_ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_VEOL)) {</div><div class='add'>+			int slot;</div><div class='add'>+			/*</div><div class='add'>+			 * Assign the vap to a beacon xmit slot. As</div><div class='add'>+			 * above, this cannot fail to find one.</div><div class='add'>+			 */</div><div class='add'>+			avp-&gt;av_bslot = 0;</div><div class='add'>+			for (slot = 0; slot &lt; ATH_BCBUF; slot++)</div><div class='add'>+				if (sc-&gt;sc_bslot[slot] == ATH_IF_ID_ANY) {</div><div class='add'>+					/*</div><div class='add'>+					 * XXX hack, space out slots to better</div><div class='add'>+					 * deal with misses</div><div class='add'>+					 */</div><div class='add'>+					if (slot+1 &lt; ATH_BCBUF &amp;&amp;</div><div class='add'>+					    sc-&gt;sc_bslot[slot+1] ==</div><div class='add'>+						ATH_IF_ID_ANY) {</div><div class='add'>+						avp-&gt;av_bslot = slot+1;</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+					avp-&gt;av_bslot = slot;</div><div class='add'>+					/* NB: keep looking for a double slot */</div><div class='add'>+				}</div><div class='add'>+			BUG_ON(sc-&gt;sc_bslot[avp-&gt;av_bslot] != ATH_IF_ID_ANY);</div><div class='add'>+			sc-&gt;sc_bslot[avp-&gt;av_bslot] = if_id;</div><div class='add'>+			sc-&gt;sc_nbcnvaps++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* release the previous beacon frame , if it already exists. */</div><div class='add'>+	bf = avp-&gt;av_bcbuf;</div><div class='add'>+	if (bf-&gt;bf_mpdu != NULL) {</div><div class='add'>+		skb = (struct sk_buff *)bf-&gt;bf_mpdu;</div><div class='add'>+		ath_skb_unmap_single(sc, skb, PCI_DMA_TODEVICE,</div><div class='add'>+				     get_dma_mem_context(bf, bf_dmacontext));</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		bf-&gt;bf_mpdu = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * NB: the beacon data buffer must be 32-bit aligned;</div><div class='add'>+	 * we assume the wbuf routines will return us something</div><div class='add'>+	 * with this alignment (perhaps should assert).</div><div class='add'>+	 * FIXME: Fill avp-&gt;av_boff.bo_tim,avp-&gt;av_btxctl.txpower and</div><div class='add'>+	 * avp-&gt;av_btxctl.shortPreamble</div><div class='add'>+	 */</div><div class='add'>+	skb = ieee80211_beacon_get(sc-&gt;hw, avp-&gt;av_if_data);</div><div class='add'>+	if (skb == NULL) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_BEACON, "%s: cannot get skb\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Calculate a TSF adjustment factor required for</div><div class='add'>+	 * staggered beacons.  Note that we assume the format</div><div class='add'>+	 * of the beacon frame leaves the tstamp field immediately</div><div class='add'>+	 * following the header.</div><div class='add'>+	 */</div><div class='add'>+	if (avp-&gt;av_bslot &gt; 0) {</div><div class='add'>+		u64 tsfadjust;</div><div class='add'>+		__le64 val;</div><div class='add'>+		int intval;</div><div class='add'>+</div><div class='add'>+		/* FIXME: Use default value for now: Sujith */</div><div class='add'>+</div><div class='add'>+		intval = ATH_DEFAULT_BINTVAL;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The beacon interval is in TU's; the TSF in usecs.</div><div class='add'>+		 * We figure out how many TU's to add to align the</div><div class='add'>+		 * timestamp then convert to TSF units and handle</div><div class='add'>+		 * byte swapping before writing it in the frame.</div><div class='add'>+		 * The hardware will then add this each time a beacon</div><div class='add'>+		 * frame is sent.  Note that we align vap's 1..N</div><div class='add'>+		 * and leave vap 0 untouched.  This means vap 0</div><div class='add'>+		 * has a timestamp in one beacon interval while the</div><div class='add'>+		 * others get a timestamp aligned to the next interval.</div><div class='add'>+		 */</div><div class='add'>+		tsfadjust = (intval * (ATH_BCBUF - avp-&gt;av_bslot)) / ATH_BCBUF;</div><div class='add'>+		val = cpu_to_le64(tsfadjust &lt;&lt; 10);     /* TU-&gt;TSF */</div><div class='add'>+</div><div class='add'>+		DPRINTF(sc, ATH_DBG_BEACON,</div><div class='add'>+			"%s: %s beacons, bslot %d intval %u tsfadjust %llu\n",</div><div class='add'>+			__func__, "stagger",</div><div class='add'>+			avp-&gt;av_bslot, intval, (unsigned long long)tsfadjust);</div><div class='add'>+</div><div class='add'>+		wh = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+		memcpy(&amp;wh[1], &amp;val, sizeof(val));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bf-&gt;bf_buf_addr = ath_skb_map_single(sc, skb, PCI_DMA_TODEVICE,</div><div class='add'>+		get_dma_mem_context(bf, bf_dmacontext));</div><div class='add'>+	bf-&gt;bf_mpdu = skb;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Reclaim beacon resources and return buffer to the pool.</div><div class='add'>+ *</div><div class='add'>+ *  Checks the VAP to put the beacon frame buffer back to the ATH object</div><div class='add'>+ *  queue, and de-allocates any wbuf frames that were sent as CAB traffic.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+void ath_beacon_return(struct ath_softc *sc, struct ath_vap *avp)</div><div class='add'>+{</div><div class='add'>+	if (avp-&gt;av_bcbuf != NULL) {</div><div class='add'>+		struct ath_buf *bf;</div><div class='add'>+</div><div class='add'>+		if (avp-&gt;av_bslot != -1) {</div><div class='add'>+			sc-&gt;sc_bslot[avp-&gt;av_bslot] = ATH_IF_ID_ANY;</div><div class='add'>+			sc-&gt;sc_nbcnvaps--;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bf = avp-&gt;av_bcbuf;</div><div class='add'>+		if (bf-&gt;bf_mpdu != NULL) {</div><div class='add'>+			struct sk_buff *skb = (struct sk_buff *)bf-&gt;bf_mpdu;</div><div class='add'>+			ath_skb_unmap_single(sc, skb, PCI_DMA_TODEVICE,</div><div class='add'>+				get_dma_mem_context(bf, bf_dmacontext));</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			bf-&gt;bf_mpdu = NULL;</div><div class='add'>+		}</div><div class='add'>+		list_add_tail(&amp;bf-&gt;list, &amp;sc-&gt;sc_bbuf);</div><div class='add'>+</div><div class='add'>+		avp-&gt;av_bcbuf = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Reclaim beacon resources and return buffer to the pool.</div><div class='add'>+ *</div><div class='add'>+ *  This function will free any wbuf frames that are still attached to the</div><div class='add'>+ *  beacon buffers in the ATH object.  Note that this does not de-allocate</div><div class='add'>+ *  any wbuf objects that are in the transmit queue and have not yet returned</div><div class='add'>+ *  to the ATH object.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+void ath_beacon_free(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_buf *bf;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(bf, &amp;sc-&gt;sc_bbuf, list) {</div><div class='add'>+		if (bf-&gt;bf_mpdu != NULL) {</div><div class='add'>+			struct sk_buff *skb = (struct sk_buff *) bf-&gt;bf_mpdu;</div><div class='add'>+			ath_skb_unmap_single(sc, skb, PCI_DMA_TODEVICE,</div><div class='add'>+				get_dma_mem_context(bf, bf_dmacontext));</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			bf-&gt;bf_mpdu = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Tasklet for Sending Beacons</div><div class='add'>+ *</div><div class='add'>+ * Transmit one or more beacon frames at SWBA.  Dynamic updates to the frame</div><div class='add'>+ * contents are done as needed and the slot time is also adjusted based on</div><div class='add'>+ * current state.</div><div class='add'>+ *</div><div class='add'>+ * This tasklet is not scheduled, it's called in ISR context.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+void ath9k_beacon_tasklet(unsigned long data)</div><div class='add'>+{</div><div class='add'>+#define TSF_TO_TU(_h,_l)					\</div><div class='add'>+	((((u32)(_h)) &lt;&lt; 22) | (((u32)(_l)) &gt;&gt; 10))</div><div class='add'>+</div><div class='add'>+	struct ath_softc *sc = (struct ath_softc *)data;</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	struct ath_buf *bf = NULL;</div><div class='add'>+	int slot, if_id;</div><div class='add'>+	u32 bfaddr;</div><div class='add'>+	u32 rx_clear = 0, rx_frame = 0, tx_frame = 0;</div><div class='add'>+	u32 show_cycles = 0;</div><div class='add'>+	u32 bc = 0; /* beacon count */</div><div class='add'>+	u64 tsf;</div><div class='add'>+	u32 tsftu;</div><div class='add'>+	u16 intval;</div><div class='add'>+</div><div class='add'>+	if (sc-&gt;sc_noreset) {</div><div class='add'>+		show_cycles = ath9k_hw_GetMibCycleCountsPct(ah,</div><div class='add'>+							    &amp;rx_clear,</div><div class='add'>+							    &amp;rx_frame,</div><div class='add'>+							    &amp;tx_frame);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if the previous beacon has gone out.  If</div><div class='add'>+	 * not don't try to post another, skip this period</div><div class='add'>+	 * and wait for the next.  Missed beacons indicate</div><div class='add'>+	 * a problem and should not occur.  If we miss too</div><div class='add'>+	 * many consecutive beacons reset the device.</div><div class='add'>+	 */</div><div class='add'>+	if (ath9k_hw_numtxpending(ah, sc-&gt;sc_bhalq) != 0) {</div><div class='add'>+		sc-&gt;sc_bmisscount++;</div><div class='add'>+		/* XXX: doth needs the chanchange IE countdown decremented.</div><div class='add'>+		 *      We should consider adding a mac80211 call to indicate</div><div class='add'>+		 *      a beacon miss so appropriate action could be taken</div><div class='add'>+		 *      (in that layer).</div><div class='add'>+		 */</div><div class='add'>+		if (sc-&gt;sc_bmisscount &lt; BSTUCK_THRESH) {</div><div class='add'>+			if (sc-&gt;sc_noreset) {</div><div class='add'>+				DPRINTF(sc, ATH_DBG_BEACON,</div><div class='add'>+					"%s: missed %u consecutive beacons\n",</div><div class='add'>+					__func__, sc-&gt;sc_bmisscount);</div><div class='add'>+				if (show_cycles) {</div><div class='add'>+					/*</div><div class='add'>+					 * Display cycle counter stats</div><div class='add'>+					 * from HW to aide in debug of</div><div class='add'>+					 * stickiness.</div><div class='add'>+					 */</div><div class='add'>+					DPRINTF(sc,</div><div class='add'>+						ATH_DBG_BEACON,</div><div class='add'>+						"%s: busy times: rx_clear=%d, "</div><div class='add'>+						"rx_frame=%d, tx_frame=%d\n",</div><div class='add'>+						__func__, rx_clear, rx_frame,</div><div class='add'>+						tx_frame);</div><div class='add'>+				} else {</div><div class='add'>+					DPRINTF(sc,</div><div class='add'>+						ATH_DBG_BEACON,</div><div class='add'>+						"%s: unable to obtain "</div><div class='add'>+						"busy times\n", __func__);</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				DPRINTF(sc, ATH_DBG_BEACON,</div><div class='add'>+					"%s: missed %u consecutive beacons\n",</div><div class='add'>+					__func__, sc-&gt;sc_bmisscount);</div><div class='add'>+			}</div><div class='add'>+		} else if (sc-&gt;sc_bmisscount &gt;= BSTUCK_THRESH) {</div><div class='add'>+			if (sc-&gt;sc_noreset) {</div><div class='add'>+				if (sc-&gt;sc_bmisscount == BSTUCK_THRESH) {</div><div class='add'>+					DPRINTF(sc,</div><div class='add'>+						ATH_DBG_BEACON,</div><div class='add'>+						"%s: beacon is officially "</div><div class='add'>+						"stuck\n", __func__);</div><div class='add'>+					ath9k_hw_dmaRegDump(ah);</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				DPRINTF(sc, ATH_DBG_BEACON,</div><div class='add'>+					"%s: beacon is officially stuck\n",</div><div class='add'>+					__func__);</div><div class='add'>+				ath_bstuck_process(sc);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (sc-&gt;sc_bmisscount != 0) {</div><div class='add'>+		if (sc-&gt;sc_noreset) {</div><div class='add'>+			DPRINTF(sc,</div><div class='add'>+				ATH_DBG_BEACON,</div><div class='add'>+				"%s: resume beacon xmit after %u misses\n",</div><div class='add'>+				__func__, sc-&gt;sc_bmisscount);</div><div class='add'>+		} else {</div><div class='add'>+			DPRINTF(sc, ATH_DBG_BEACON,</div><div class='add'>+				"%s: resume beacon xmit after %u misses\n",</div><div class='add'>+				__func__, sc-&gt;sc_bmisscount);</div><div class='add'>+		}</div><div class='add'>+		sc-&gt;sc_bmisscount = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Generate beacon frames. we are sending frames</div><div class='add'>+	 * staggered so calculate the slot for this frame based</div><div class='add'>+	 * on the tsf to safeguard against missing an swba.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* FIXME: Use default value for now - Sujith */</div><div class='add'>+	intval = ATH_DEFAULT_BINTVAL;</div><div class='add'>+</div><div class='add'>+	tsf = ath9k_hw_gettsf64(ah);</div><div class='add'>+	tsftu = TSF_TO_TU(tsf&gt;&gt;32, tsf);</div><div class='add'>+	slot = ((tsftu % intval) * ATH_BCBUF) / intval;</div><div class='add'>+	if_id = sc-&gt;sc_bslot[(slot + 1) % ATH_BCBUF];</div><div class='add'>+	DPRINTF(sc, ATH_DBG_BEACON,</div><div class='add'>+			"%s: slot %d [tsf %llu tsftu %u intval %u] if_id %d\n",</div><div class='add'>+			__func__, slot, (unsigned long long) tsf, tsftu,</div><div class='add'>+			intval, if_id);</div><div class='add'>+	bfaddr = 0;</div><div class='add'>+	if (if_id != ATH_IF_ID_ANY) {</div><div class='add'>+		bf = ath_beacon_generate(sc, if_id);</div><div class='add'>+		if (bf != NULL) {</div><div class='add'>+			bfaddr = bf-&gt;bf_daddr;</div><div class='add'>+			bc = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Handle slot time change when a non-ERP station joins/leaves</div><div class='add'>+	 * an 11g network.  The 802.11 layer notifies us via callback,</div><div class='add'>+	 * we mark updateslot, then wait one beacon before effecting</div><div class='add'>+	 * the change.  This gives associated stations at least one</div><div class='add'>+	 * beacon interval to note the state change.</div><div class='add'>+	 *</div><div class='add'>+	 * NB: The slot time change state machine is clocked according</div><div class='add'>+	 *     to whether we are bursting or staggering beacons.  We</div><div class='add'>+	 *     recognize the request to update and record the current</div><div class='add'>+	 *     slot then don't transition until that slot is reached</div><div class='add'>+	 *     again.  If we miss a beacon for that slot then we'll be</div><div class='add'>+	 *     slow to transition but we'll be sure at least one beacon</div><div class='add'>+	 *     interval has passed.  When bursting slot is always left</div><div class='add'>+	 *     set to ATH_BCBUF so this check is a noop.</div><div class='add'>+	 */</div><div class='add'>+	/* XXX locking */</div><div class='add'>+	if (sc-&gt;sc_updateslot == UPDATE) {</div><div class='add'>+		sc-&gt;sc_updateslot = COMMIT; /* commit next beacon */</div><div class='add'>+		sc-&gt;sc_slotupdate = slot;</div><div class='add'>+	} else if (sc-&gt;sc_updateslot == COMMIT &amp;&amp; sc-&gt;sc_slotupdate == slot)</div><div class='add'>+		ath_setslottime(sc);        /* commit change to hardware */</div><div class='add'>+</div><div class='add'>+	if (bfaddr != 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * Stop any current dma and put the new frame(s) on the queue.</div><div class='add'>+		 * This should never fail since we check above that no frames</div><div class='add'>+		 * are still pending on the queue.</div><div class='add'>+		 */</div><div class='add'>+		if (!ath9k_hw_stoptxdma(ah, sc-&gt;sc_bhalq)) {</div><div class='add'>+			DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+				"%s: beacon queue %u did not stop?\n",</div><div class='add'>+				__func__, sc-&gt;sc_bhalq);</div><div class='add'>+			/* NB: the HAL still stops DMA, so proceed */</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* NB: cabq traffic should already be queued and primed */</div><div class='add'>+		ath9k_hw_puttxbuf(ah, sc-&gt;sc_bhalq, bfaddr);</div><div class='add'>+		ath9k_hw_txstart(ah, sc-&gt;sc_bhalq);</div><div class='add'>+</div><div class='add'>+		sc-&gt;ast_be_xmit += bc;     /* XXX per-vap? */</div><div class='add'>+	}</div><div class='add'>+#undef TSF_TO_TU</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Tasklet for Beacon Stuck processing</div><div class='add'>+ *</div><div class='add'>+ *  Processing for Beacon Stuck.</div><div class='add'>+ *  Basically calls the ath_internal_reset function to reset the chip.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+void ath_bstuck_process(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	DPRINTF(sc, ATH_DBG_BEACON,</div><div class='add'>+		"%s: stuck beacon; resetting (bmiss count %u)\n",</div><div class='add'>+		__func__, sc-&gt;sc_bmisscount);</div><div class='add'>+	ath_internal_reset(sc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Configure the beacon and sleep timers.</div><div class='add'>+ *</div><div class='add'>+ * When operating as an AP this resets the TSF and sets</div><div class='add'>+ * up the hardware to notify us when we need to issue beacons.</div><div class='add'>+ *</div><div class='add'>+ * When operating in station mode this sets up the beacon</div><div class='add'>+ * timers according to the timestamp of the last received</div><div class='add'>+ * beacon and the current TSF, configures PCF and DTIM</div><div class='add'>+ * handling, programs the sleep registers so the hardware</div><div class='add'>+ * will wakeup in time to receive beacons, and configures</div><div class='add'>+ * the beacon miss handling so we'll receive a BMISS</div><div class='add'>+ * interrupt when we stop seeing beacons from the AP</div><div class='add'>+ * we've associated with.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void ath_beacon_config(struct ath_softc *sc, int if_id)</div><div class='add'>+{</div><div class='add'>+#define TSF_TO_TU(_h,_l)					\</div><div class='add'>+	((((u32)(_h)) &lt;&lt; 22) | (((u32)(_l)) &gt;&gt; 10))</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	u32 nexttbtt, intval;</div><div class='add'>+	struct ath_beacon_config conf;</div><div class='add'>+	enum ath9k_opmode av_opmode;</div><div class='add'>+</div><div class='add'>+	if (if_id != ATH_IF_ID_ANY)</div><div class='add'>+		av_opmode = sc-&gt;sc_vaps[if_id]-&gt;av_opmode;</div><div class='add'>+	else</div><div class='add'>+		av_opmode = sc-&gt;sc_opmode;</div><div class='add'>+</div><div class='add'>+	memzero(&amp;conf, sizeof(struct ath_beacon_config));</div><div class='add'>+</div><div class='add'>+	/* FIXME: Use default values for now - Sujith */</div><div class='add'>+	/* Query beacon configuration first */</div><div class='add'>+	/*</div><div class='add'>+	 * Protocol stack doesn't support dynamic beacon configuration,</div><div class='add'>+	 * use default configurations.</div><div class='add'>+	 */</div><div class='add'>+	conf.beacon_interval = ATH_DEFAULT_BINTVAL;</div><div class='add'>+	conf.listen_interval = 1;</div><div class='add'>+	conf.dtim_period = conf.beacon_interval;</div><div class='add'>+	conf.dtim_count = 1;</div><div class='add'>+	conf.bmiss_timeout = ATH_DEFAULT_BMISS_LIMIT * conf.beacon_interval;</div><div class='add'>+</div><div class='add'>+	/* extract tstamp from last beacon and convert to TU */</div><div class='add'>+	nexttbtt = TSF_TO_TU(get_unaligned_le32(conf.u.last_tstamp + 4),</div><div class='add'>+			     get_unaligned_le32(conf.u.last_tstamp));</div><div class='add'>+	/* XXX conditionalize multi-bss support? */</div><div class='add'>+	if (sc-&gt;sc_opmode == ATH9K_M_HOSTAP) {</div><div class='add'>+		/*</div><div class='add'>+		 * For multi-bss ap support beacons are either staggered</div><div class='add'>+		 * evenly over N slots or burst together.  For the former</div><div class='add'>+		 * arrange for the SWBA to be delivered for each slot.</div><div class='add'>+		 * Slots that are not occupied will generate nothing.</div><div class='add'>+		 */</div><div class='add'>+		/* NB: the beacon interval is kept internally in TU's */</div><div class='add'>+		intval = conf.beacon_interval &amp; ATH9K_BEACON_PERIOD;</div><div class='add'>+		intval /= ATH_BCBUF;    /* for staggered beacons */</div><div class='add'>+	} else {</div><div class='add'>+		intval = conf.beacon_interval &amp; ATH9K_BEACON_PERIOD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nexttbtt == 0)      /* e.g. for ap mode */</div><div class='add'>+		nexttbtt = intval;</div><div class='add'>+	else if (intval)        /* NB: can be 0 for monitor mode */</div><div class='add'>+		nexttbtt = roundup(nexttbtt, intval);</div><div class='add'>+	DPRINTF(sc, ATH_DBG_BEACON, "%s: nexttbtt %u intval %u (%u)\n",</div><div class='add'>+		__func__, nexttbtt, intval, conf.beacon_interval);</div><div class='add'>+	/* Check for ATH9K_M_HOSTAP and sc_nostabeacons for WDS client */</div><div class='add'>+	if (sc-&gt;sc_opmode == ATH9K_M_STA) {</div><div class='add'>+		struct ath9k_beacon_state bs;</div><div class='add'>+		u64 tsf;</div><div class='add'>+		u32 tsftu;</div><div class='add'>+		int dtimperiod, dtimcount, sleepduration;</div><div class='add'>+		int cfpperiod, cfpcount;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Setup dtim and cfp parameters according to</div><div class='add'>+		 * last beacon we received (which may be none).</div><div class='add'>+		 */</div><div class='add'>+		dtimperiod = conf.dtim_period;</div><div class='add'>+		if (dtimperiod &lt;= 0)        /* NB: 0 if not known */</div><div class='add'>+			dtimperiod = 1;</div><div class='add'>+		dtimcount = conf.dtim_count;</div><div class='add'>+		if (dtimcount &gt;= dtimperiod)    /* NB: sanity check */</div><div class='add'>+			dtimcount = 0;      /* XXX? */</div><div class='add'>+		cfpperiod = 1;          /* NB: no PCF support yet */</div><div class='add'>+		cfpcount = 0;</div><div class='add'>+</div><div class='add'>+		sleepduration = conf.listen_interval * intval;</div><div class='add'>+		if (sleepduration &lt;= 0)</div><div class='add'>+			sleepduration = intval;</div><div class='add'>+</div><div class='add'>+#define FUDGE   2</div><div class='add'>+		/*</div><div class='add'>+		 * Pull nexttbtt forward to reflect the current</div><div class='add'>+		 * TSF and calculate dtim+cfp state for the result.</div><div class='add'>+		 */</div><div class='add'>+		tsf = ath9k_hw_gettsf64(ah);</div><div class='add'>+		tsftu = TSF_TO_TU(tsf&gt;&gt;32, tsf) + FUDGE;</div><div class='add'>+		do {</div><div class='add'>+			nexttbtt += intval;</div><div class='add'>+			if (--dtimcount &lt; 0) {</div><div class='add'>+				dtimcount = dtimperiod - 1;</div><div class='add'>+				if (--cfpcount &lt; 0)</div><div class='add'>+					cfpcount = cfpperiod - 1;</div><div class='add'>+			}</div><div class='add'>+		} while (nexttbtt &lt; tsftu);</div><div class='add'>+#undef FUDGE</div><div class='add'>+		memzero(&amp;bs, sizeof(bs));</div><div class='add'>+		bs.bs_intval = intval;</div><div class='add'>+		bs.bs_nexttbtt = nexttbtt;</div><div class='add'>+		bs.bs_dtimperiod = dtimperiod*intval;</div><div class='add'>+		bs.bs_nextdtim = bs.bs_nexttbtt + dtimcount*intval;</div><div class='add'>+		bs.bs_cfpperiod = cfpperiod*bs.bs_dtimperiod;</div><div class='add'>+		bs.bs_cfpnext = bs.bs_nextdtim + cfpcount*bs.bs_dtimperiod;</div><div class='add'>+		bs.bs_cfpmaxduration = 0;</div><div class='add'>+		/*</div><div class='add'>+		 * Calculate the number of consecutive beacons to miss</div><div class='add'>+		 * before taking a BMISS interrupt.  The configuration</div><div class='add'>+		 * is specified in TU so we only need calculate based</div><div class='add'>+		 * on the beacon interval.  Note that we clamp the</div><div class='add'>+		 * result to at most 15 beacons.</div><div class='add'>+		 */</div><div class='add'>+		if (sleepduration &gt; intval) {</div><div class='add'>+			bs.bs_bmissthreshold =</div><div class='add'>+				conf.listen_interval *</div><div class='add'>+					ATH_DEFAULT_BMISS_LIMIT / 2;</div><div class='add'>+		} else {</div><div class='add'>+			bs.bs_bmissthreshold =</div><div class='add'>+				DIV_ROUND_UP(conf.bmiss_timeout, intval);</div><div class='add'>+			if (bs.bs_bmissthreshold &gt; 15)</div><div class='add'>+				bs.bs_bmissthreshold = 15;</div><div class='add'>+			else if (bs.bs_bmissthreshold &lt;= 0)</div><div class='add'>+				bs.bs_bmissthreshold = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Calculate sleep duration.  The configuration is</div><div class='add'>+		 * given in ms.  We insure a multiple of the beacon</div><div class='add'>+		 * period is used.  Also, if the sleep duration is</div><div class='add'>+		 * greater than the DTIM period then it makes senses</div><div class='add'>+		 * to make it a multiple of that.</div><div class='add'>+		 *</div><div class='add'>+		 * XXX fixed at 100ms</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		bs.bs_sleepduration =</div><div class='add'>+			roundup(IEEE80211_MS_TO_TU(100), sleepduration);</div><div class='add'>+		if (bs.bs_sleepduration &gt; bs.bs_dtimperiod)</div><div class='add'>+			bs.bs_sleepduration = bs.bs_dtimperiod;</div><div class='add'>+</div><div class='add'>+		DPRINTF(sc, ATH_DBG_BEACON,</div><div class='add'>+			"%s: tsf %llu "</div><div class='add'>+			"tsf:tu %u "</div><div class='add'>+			"intval %u "</div><div class='add'>+			"nexttbtt %u "</div><div class='add'>+			"dtim %u "</div><div class='add'>+			"nextdtim %u "</div><div class='add'>+			"bmiss %u "</div><div class='add'>+			"sleep %u "</div><div class='add'>+			"cfp:period %u "</div><div class='add'>+			"maxdur %u "</div><div class='add'>+			"next %u "</div><div class='add'>+			"timoffset %u\n"</div><div class='add'>+			, __func__</div><div class='add'>+			, (unsigned long long)tsf, tsftu</div><div class='add'>+			, bs.bs_intval</div><div class='add'>+			, bs.bs_nexttbtt</div><div class='add'>+			, bs.bs_dtimperiod</div><div class='add'>+			, bs.bs_nextdtim</div><div class='add'>+			, bs.bs_bmissthreshold</div><div class='add'>+			, bs.bs_sleepduration</div><div class='add'>+			, bs.bs_cfpperiod</div><div class='add'>+			, bs.bs_cfpmaxduration</div><div class='add'>+			, bs.bs_cfpnext</div><div class='add'>+			, bs.bs_timoffset</div><div class='add'>+			);</div><div class='add'>+</div><div class='add'>+		ath9k_hw_set_interrupts(ah, 0);</div><div class='add'>+		ath9k_hw_set_sta_beacon_timers(ah, &amp;bs);</div><div class='add'>+		sc-&gt;sc_imask |= ATH9K_INT_BMISS;</div><div class='add'>+		ath9k_hw_set_interrupts(ah, sc-&gt;sc_imask);</div><div class='add'>+	} else {</div><div class='add'>+		u64 tsf;</div><div class='add'>+		u32 tsftu;</div><div class='add'>+		ath9k_hw_set_interrupts(ah, 0);</div><div class='add'>+		if (nexttbtt == intval)</div><div class='add'>+			intval |= ATH9K_BEACON_RESET_TSF;</div><div class='add'>+		if (sc-&gt;sc_opmode == ATH9K_M_IBSS) {</div><div class='add'>+			/*</div><div class='add'>+			 * Pull nexttbtt forward to reflect the current</div><div class='add'>+			 * TSF .</div><div class='add'>+			 */</div><div class='add'>+#define FUDGE   2</div><div class='add'>+			if (!(intval &amp; ATH9K_BEACON_RESET_TSF)) {</div><div class='add'>+				tsf = ath9k_hw_gettsf64(ah);</div><div class='add'>+				tsftu = TSF_TO_TU((u32)(tsf&gt;&gt;32),</div><div class='add'>+					(u32)tsf) + FUDGE;</div><div class='add'>+				do {</div><div class='add'>+					nexttbtt += intval;</div><div class='add'>+				} while (nexttbtt &lt; tsftu);</div><div class='add'>+			}</div><div class='add'>+#undef FUDGE</div><div class='add'>+			DPRINTF(sc, ATH_DBG_BEACON,</div><div class='add'>+				"%s: IBSS nexttbtt %u intval %u (%u)\n",</div><div class='add'>+				__func__, nexttbtt,</div><div class='add'>+				intval &amp; ~ATH9K_BEACON_RESET_TSF,</div><div class='add'>+				conf.beacon_interval);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * In IBSS mode enable the beacon timers but only</div><div class='add'>+			 * enable SWBA interrupts if we need to manually</div><div class='add'>+			 * prepare beacon frames.  Otherwise we use a</div><div class='add'>+			 * self-linked tx descriptor and let the hardware</div><div class='add'>+			 * deal with things.</div><div class='add'>+			 */</div><div class='add'>+			intval |= ATH9K_BEACON_ENA;</div><div class='add'>+			if (!(ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_VEOL))</div><div class='add'>+				sc-&gt;sc_imask |= ATH9K_INT_SWBA;</div><div class='add'>+			ath_beaconq_config(sc);</div><div class='add'>+		} else if (sc-&gt;sc_opmode == ATH9K_M_HOSTAP) {</div><div class='add'>+			/*</div><div class='add'>+			 * In AP mode we enable the beacon timers and</div><div class='add'>+			 * SWBA interrupts to prepare beacon frames.</div><div class='add'>+			 */</div><div class='add'>+			intval |= ATH9K_BEACON_ENA;</div><div class='add'>+			sc-&gt;sc_imask |= ATH9K_INT_SWBA;   /* beacon prepare */</div><div class='add'>+			ath_beaconq_config(sc);</div><div class='add'>+		}</div><div class='add'>+		ath9k_hw_beaconinit(ah, nexttbtt, intval);</div><div class='add'>+		sc-&gt;sc_bmisscount = 0;</div><div class='add'>+		ath9k_hw_set_interrupts(ah, sc-&gt;sc_imask);</div><div class='add'>+		/*</div><div class='add'>+		 * When using a self-linked beacon descriptor in</div><div class='add'>+		 * ibss mode load it once here.</div><div class='add'>+		 */</div><div class='add'>+		if (sc-&gt;sc_opmode == ATH9K_M_IBSS &amp;&amp;</div><div class='add'>+		    (ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_VEOL))</div><div class='add'>+			ath_beacon_start_adhoc(sc, 0);</div><div class='add'>+	}</div><div class='add'>+#undef TSF_TO_TU</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Function to collect beacon rssi data and resync beacon if necessary */</div><div class='add'>+</div><div class='add'>+void ath_beacon_sync(struct ath_softc *sc, int if_id)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Resync beacon timers using the tsf of the</div><div class='add'>+	 * beacon frame we just received.</div><div class='add'>+	 */</div><div class='add'>+	ath_beacon_config(sc, if_id);</div><div class='add'>+	sc-&gt;sc_beacons = 1;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/core.c b/drivers/net/wireless/ath9k/core.c<br/>new file mode 100644<br/>index 000000000000..f6c45288d0e7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath9k/core.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/core.c</a></div><div class='hunk'>@@ -0,0 +1,1923 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2008, Atheros Communications Inc.</div><div class='add'>+ *</div><div class='add'>+ * Permission to use, copy, modify, and/or distribute this software for any</div><div class='add'>+ * purpose with or without fee is hereby granted, provided that the above</div><div class='add'>+ * copyright notice and this permission notice appear in all copies.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='add'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='add'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='add'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='add'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+ /* Implementation of the main "ATH" layer. */</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "regd.h"</div><div class='add'>+</div><div class='add'>+static int ath_outdoor;		/* enable outdoor use */</div><div class='add'>+</div><div class='add'>+static const u8 ath_bcast_mac[ETH_ALEN] =</div><div class='add'>+    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };</div><div class='add'>+</div><div class='add'>+static u32 ath_chainmask_sel_up_rssi_thres =</div><div class='add'>+	ATH_CHAINMASK_SEL_UP_RSSI_THRES;</div><div class='add'>+static u32 ath_chainmask_sel_down_rssi_thres =</div><div class='add'>+	ATH_CHAINMASK_SEL_DOWN_RSSI_THRES;</div><div class='add'>+static u32 ath_chainmask_sel_period =</div><div class='add'>+	ATH_CHAINMASK_SEL_TIMEOUT;</div><div class='add'>+</div><div class='add'>+/* return bus cachesize in 4B word units */</div><div class='add'>+</div><div class='add'>+static void bus_read_cachesize(struct ath_softc *sc, int *csz)</div><div class='add'>+{</div><div class='add'>+	u8 u8tmp;</div><div class='add'>+</div><div class='add'>+	pci_read_config_byte(sc-&gt;pdev, PCI_CACHE_LINE_SIZE, (u8 *)&amp;u8tmp);</div><div class='add'>+	*csz = (int)u8tmp;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This check was put in to avoid "unplesant" consequences if</div><div class='add'>+	 * the bootrom has not fully initialized all PCI devices.</div><div class='add'>+	 * Sometimes the cache line size register is not set</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (*csz == 0)</div><div class='add'>+		*csz = DEFAULT_CACHELINE &gt;&gt; 2;   /* Use the default size */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Set current operating mode</div><div class='add'>+ *</div><div class='add'>+ *  This function initializes and fills the rate table in the ATH object based</div><div class='add'>+ *  on the operating mode.  The blink rates are also set up here, although</div><div class='add'>+ *  they have been superceeded by the ath_led module.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+static void ath_setcurmode(struct ath_softc *sc, enum wireless_mode mode)</div><div class='add'>+{</div><div class='add'>+	const struct ath9k_rate_table *rt;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memset(sc-&gt;sc_rixmap, 0xff, sizeof(sc-&gt;sc_rixmap));</div><div class='add'>+	rt = ath9k_hw_getratetable(sc-&gt;sc_ah, mode);</div><div class='add'>+	BUG_ON(!rt);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rt-&gt;rateCount; i++)</div><div class='add'>+		sc-&gt;sc_rixmap[rt-&gt;info[i].rateCode] = (u8) i;</div><div class='add'>+</div><div class='add'>+	memzero(sc-&gt;sc_hwmap, sizeof(sc-&gt;sc_hwmap));</div><div class='add'>+	for (i = 0; i &lt; 256; i++) {</div><div class='add'>+		u8 ix = rt-&gt;rateCodeToIndex[i];</div><div class='add'>+</div><div class='add'>+		if (ix == 0xff)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sc-&gt;sc_hwmap[i].ieeerate =</div><div class='add'>+		    rt-&gt;info[ix].dot11Rate &amp; IEEE80211_RATE_VAL;</div><div class='add'>+		sc-&gt;sc_hwmap[i].rateKbps = rt-&gt;info[ix].rateKbps;</div><div class='add'>+</div><div class='add'>+		if (rt-&gt;info[ix].shortPreamble ||</div><div class='add'>+		    rt-&gt;info[ix].phy == PHY_OFDM) {</div><div class='add'>+			/* XXX: Handle this */</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* NB: this uses the last entry if the rate isn't found */</div><div class='add'>+		/* XXX beware of overlow */</div><div class='add'>+	}</div><div class='add'>+	sc-&gt;sc_currates = rt;</div><div class='add'>+	sc-&gt;sc_curmode = mode;</div><div class='add'>+	/*</div><div class='add'>+	 * All protection frames are transmited at 2Mb/s for</div><div class='add'>+	 * 11g, otherwise at 1Mb/s.</div><div class='add'>+	 * XXX select protection rate index from rate table.</div><div class='add'>+	 */</div><div class='add'>+	sc-&gt;sc_protrix = (mode == ATH9K_MODE_11G ? 1 : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set up rate table (legacy rates)</div><div class='add'>+ */</div><div class='add'>+static void ath_setup_rates(struct ath_softc *sc, enum ieee80211_band band)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	const struct ath9k_rate_table *rt = NULL;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	struct ieee80211_rate *rate;</div><div class='add'>+	int i, maxrates;</div><div class='add'>+</div><div class='add'>+	switch (band) {</div><div class='add'>+	case IEEE80211_BAND_2GHZ:</div><div class='add'>+		rt = ath9k_hw_getratetable(ah, ATH9K_MODE_11G);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_BAND_5GHZ:</div><div class='add'>+		rt = ath9k_hw_getratetable(ah, ATH9K_MODE_11A);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rt == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sband = &amp;sc-&gt;sbands[band];</div><div class='add'>+	rate = sc-&gt;rates[band];</div><div class='add'>+</div><div class='add'>+	if (rt-&gt;rateCount &gt; ATH_RATE_MAX)</div><div class='add'>+		maxrates = ATH_RATE_MAX;</div><div class='add'>+	else</div><div class='add'>+		maxrates = rt-&gt;rateCount;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; maxrates; i++) {</div><div class='add'>+		rate[i].bitrate = rt-&gt;info[i].rateKbps / 100;</div><div class='add'>+		rate[i].hw_value = rt-&gt;info[i].rateCode;</div><div class='add'>+		sband-&gt;n_bitrates++;</div><div class='add'>+		DPRINTF(sc, ATH_DBG_CONFIG,</div><div class='add'>+			"%s: Rate: %2dMbps, ratecode: %2d\n",</div><div class='add'>+			__func__,</div><div class='add'>+			rate[i].bitrate / 10,</div><div class='add'>+			rate[i].hw_value);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Set up channel list</div><div class='add'>+ */</div><div class='add'>+static int ath_setup_channels(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	int nchan, i, a = 0, b = 0;</div><div class='add'>+	u8 regclassids[ATH_REGCLASSIDS_MAX];</div><div class='add'>+	u32 nregclass = 0;</div><div class='add'>+	struct ieee80211_supported_band *band_2ghz;</div><div class='add'>+	struct ieee80211_supported_band *band_5ghz;</div><div class='add'>+	struct ieee80211_channel *chan_2ghz;</div><div class='add'>+	struct ieee80211_channel *chan_5ghz;</div><div class='add'>+	struct ath9k_channel *c;</div><div class='add'>+</div><div class='add'>+	/* Fill in ah-&gt;ah_channels */</div><div class='add'>+	if (!ath9k_regd_init_channels(ah,</div><div class='add'>+				      ATH_CHAN_MAX,</div><div class='add'>+				      (u32 *)&amp;nchan,</div><div class='add'>+				      regclassids,</div><div class='add'>+				      ATH_REGCLASSIDS_MAX,</div><div class='add'>+				      &amp;nregclass,</div><div class='add'>+				      CTRY_DEFAULT,</div><div class='add'>+				      false,</div><div class='add'>+				      1)) {</div><div class='add'>+		u32 rd = ah-&gt;ah_currentRD;</div><div class='add'>+</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to collect channel list; "</div><div class='add'>+			"regdomain likely %u country code %u\n",</div><div class='add'>+			__func__, rd, CTRY_DEFAULT);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	band_2ghz = &amp;sc-&gt;sbands[IEEE80211_BAND_2GHZ];</div><div class='add'>+	band_5ghz = &amp;sc-&gt;sbands[IEEE80211_BAND_5GHZ];</div><div class='add'>+	chan_2ghz = sc-&gt;channels[IEEE80211_BAND_2GHZ];</div><div class='add'>+	chan_5ghz = sc-&gt;channels[IEEE80211_BAND_5GHZ];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nchan; i++) {</div><div class='add'>+		c = &amp;ah-&gt;ah_channels[i];</div><div class='add'>+		if (IS_CHAN_2GHZ(c)) {</div><div class='add'>+			chan_2ghz[a].band = IEEE80211_BAND_2GHZ;</div><div class='add'>+			chan_2ghz[a].center_freq = c-&gt;channel;</div><div class='add'>+			chan_2ghz[a].max_power = c-&gt;maxTxPower;</div><div class='add'>+</div><div class='add'>+			if (c-&gt;privFlags &amp; CHANNEL_DISALLOW_ADHOC)</div><div class='add'>+				chan_2ghz[a].flags |=</div><div class='add'>+					IEEE80211_CHAN_NO_IBSS;</div><div class='add'>+			if (c-&gt;channelFlags &amp; CHANNEL_PASSIVE)</div><div class='add'>+				chan_2ghz[a].flags |=</div><div class='add'>+					IEEE80211_CHAN_PASSIVE_SCAN;</div><div class='add'>+</div><div class='add'>+			band_2ghz-&gt;n_channels = ++a;</div><div class='add'>+</div><div class='add'>+			DPRINTF(sc, ATH_DBG_CONFIG,</div><div class='add'>+				"%s: 2MHz channel: %d, "</div><div class='add'>+				"channelFlags: 0x%x\n",</div><div class='add'>+				__func__,</div><div class='add'>+				c-&gt;channel,</div><div class='add'>+				c-&gt;channelFlags);</div><div class='add'>+		} else if (IS_CHAN_5GHZ(c)) {</div><div class='add'>+			chan_5ghz[b].band = IEEE80211_BAND_5GHZ;</div><div class='add'>+			chan_5ghz[b].center_freq = c-&gt;channel;</div><div class='add'>+			chan_5ghz[b].max_power = c-&gt;maxTxPower;</div><div class='add'>+</div><div class='add'>+			if (c-&gt;privFlags &amp; CHANNEL_DISALLOW_ADHOC)</div><div class='add'>+				chan_5ghz[b].flags |=</div><div class='add'>+					IEEE80211_CHAN_NO_IBSS;</div><div class='add'>+			if (c-&gt;channelFlags &amp; CHANNEL_PASSIVE)</div><div class='add'>+				chan_5ghz[b].flags |=</div><div class='add'>+					IEEE80211_CHAN_PASSIVE_SCAN;</div><div class='add'>+</div><div class='add'>+			band_5ghz-&gt;n_channels = ++b;</div><div class='add'>+</div><div class='add'>+			DPRINTF(sc, ATH_DBG_CONFIG,</div><div class='add'>+				"%s: 5MHz channel: %d, "</div><div class='add'>+				"channelFlags: 0x%x\n",</div><div class='add'>+				__func__,</div><div class='add'>+				c-&gt;channel,</div><div class='add'>+				c-&gt;channelFlags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Determine mode from channel flags</div><div class='add'>+ *</div><div class='add'>+ *  This routine will provide the enumerated WIRELESSS_MODE value based</div><div class='add'>+ *  on the settings of the channel flags.  If ho valid set of flags</div><div class='add'>+ *  exist, the lowest mode (11b) is selected.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+static enum wireless_mode ath_chan2mode(struct ath9k_channel *chan)</div><div class='add'>+{</div><div class='add'>+	if (chan-&gt;chanmode == CHANNEL_A)</div><div class='add'>+		return ATH9K_MODE_11A;</div><div class='add'>+	else if (chan-&gt;chanmode == CHANNEL_G)</div><div class='add'>+		return ATH9K_MODE_11G;</div><div class='add'>+	else if (chan-&gt;chanmode == CHANNEL_B)</div><div class='add'>+		return ATH9K_MODE_11B;</div><div class='add'>+	else if (chan-&gt;chanmode == CHANNEL_A_HT20)</div><div class='add'>+		return ATH9K_MODE_11NA_HT20;</div><div class='add'>+	else if (chan-&gt;chanmode == CHANNEL_G_HT20)</div><div class='add'>+		return ATH9K_MODE_11NG_HT20;</div><div class='add'>+	else if (chan-&gt;chanmode == CHANNEL_A_HT40PLUS)</div><div class='add'>+		return ATH9K_MODE_11NA_HT40PLUS;</div><div class='add'>+	else if (chan-&gt;chanmode == CHANNEL_A_HT40MINUS)</div><div class='add'>+		return ATH9K_MODE_11NA_HT40MINUS;</div><div class='add'>+	else if (chan-&gt;chanmode == CHANNEL_G_HT40PLUS)</div><div class='add'>+		return ATH9K_MODE_11NG_HT40PLUS;</div><div class='add'>+	else if (chan-&gt;chanmode == CHANNEL_G_HT40MINUS)</div><div class='add'>+		return ATH9K_MODE_11NG_HT40MINUS;</div><div class='add'>+</div><div class='add'>+	/* NB: should not get here */</div><div class='add'>+	return ATH9K_MODE_11B;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Stop the device, grabbing the top-level lock to protect</div><div class='add'>+ * against concurrent entry through ath_init (which can happen</div><div class='add'>+ * if another thread does a system call and the thread doing the</div><div class='add'>+ * stop is preempted).</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int ath_stop(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+</div><div class='add'>+	DPRINTF(sc, ATH_DBG_CONFIG, "%s: invalid %u\n",</div><div class='add'>+		__func__, sc-&gt;sc_invalid);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Shutdown the hardware and driver:</div><div class='add'>+	 *    stop output from above</div><div class='add'>+	 *    reset 802.11 state machine</div><div class='add'>+	 *      (sends station deassoc/deauth frames)</div><div class='add'>+	 *    turn off timers</div><div class='add'>+	 *    disable interrupts</div><div class='add'>+	 *    clear transmit machinery</div><div class='add'>+	 *    clear receive machinery</div><div class='add'>+	 *    turn off the radio</div><div class='add'>+	 *    reclaim beacon resources</div><div class='add'>+	 *</div><div class='add'>+	 * Note that some of this work is not possible if the</div><div class='add'>+	 * hardware is gone (invalid).</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (!sc-&gt;sc_invalid)</div><div class='add'>+		ath9k_hw_set_interrupts(ah, 0);</div><div class='add'>+	ath_draintxq(sc, false);</div><div class='add'>+	if (!sc-&gt;sc_invalid) {</div><div class='add'>+		ath_stoprecv(sc);</div><div class='add'>+		ath9k_hw_phy_disable(ah);</div><div class='add'>+	} else</div><div class='add'>+		sc-&gt;sc_rxlink = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Start Scan</div><div class='add'>+ *</div><div class='add'>+ *  This function is called when starting a channel scan.  It will perform</div><div class='add'>+ *  power save wakeup processing, set the filter for the scan, and get the</div><div class='add'>+ *  chip ready to send broadcast packets out during the scan.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+void ath_scan_start(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	u32 rfilt;</div><div class='add'>+	u32 now = (u32) jiffies_to_msecs(get_timestamp());</div><div class='add'>+</div><div class='add'>+	sc-&gt;sc_scanning = 1;</div><div class='add'>+	rfilt = ath_calcrxfilter(sc);</div><div class='add'>+	ath9k_hw_setrxfilter(ah, rfilt);</div><div class='add'>+	ath9k_hw_write_associd(ah, ath_bcast_mac, 0);</div><div class='add'>+</div><div class='add'>+	/* Restore previous power management state. */</div><div class='add'>+</div><div class='add'>+	DPRINTF(sc, ATH_DBG_CONFIG, "%d.%03d | %s: RX filter 0x%x aid 0\n",</div><div class='add'>+		now / 1000, now % 1000, __func__, rfilt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Scan End</div><div class='add'>+ *</div><div class='add'>+ *  This routine is called by the upper layer when the scan is completed.  This</div><div class='add'>+ *  will set the filters back to normal operating mode, set the BSSID to the</div><div class='add'>+ *  correct value, and restore the power save state.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+void ath_scan_end(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	u32 rfilt;</div><div class='add'>+	u32 now = (u32) jiffies_to_msecs(get_timestamp());</div><div class='add'>+</div><div class='add'>+	sc-&gt;sc_scanning = 0;</div><div class='add'>+	/* Request for a full reset due to rx packet filter changes */</div><div class='add'>+	sc-&gt;sc_full_reset = 1;</div><div class='add'>+	rfilt = ath_calcrxfilter(sc);</div><div class='add'>+	ath9k_hw_setrxfilter(ah, rfilt);</div><div class='add'>+	ath9k_hw_write_associd(ah, sc-&gt;sc_curbssid, sc-&gt;sc_curaid);</div><div class='add'>+</div><div class='add'>+	DPRINTF(sc, ATH_DBG_CONFIG, "%d.%03d | %s: RX filter 0x%x aid 0x%x\n",</div><div class='add'>+		now / 1000, now % 1000, __func__, rfilt, sc-&gt;sc_curaid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set the current channel</div><div class='add'>+ *</div><div class='add'>+ * Set/change channels.  If the channel is really being changed, it's done</div><div class='add'>+ * by reseting the chip.  To accomplish this we must first cleanup any pending</div><div class='add'>+ * DMA, then restart stuff after a la ath_init.</div><div class='add'>+*/</div><div class='add'>+int ath_set_channel(struct ath_softc *sc, struct ath9k_channel *hchan)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	bool fastcc = true, stopped;</div><div class='add'>+	enum ath9k_ht_macmode ht_macmode;</div><div class='add'>+</div><div class='add'>+	if (sc-&gt;sc_invalid)	/* if the device is invalid or removed */</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	DPRINTF(sc, ATH_DBG_CONFIG,</div><div class='add'>+		"%s: %u (%u MHz) -&gt; %u (%u MHz), cflags:%x\n",</div><div class='add'>+		__func__,</div><div class='add'>+		ath9k_hw_mhz2ieee(ah, sc-&gt;sc_curchan.channel,</div><div class='add'>+				  sc-&gt;sc_curchan.channelFlags),</div><div class='add'>+		sc-&gt;sc_curchan.channel,</div><div class='add'>+		ath9k_hw_mhz2ieee(ah, hchan-&gt;channel, hchan-&gt;channelFlags),</div><div class='add'>+		hchan-&gt;channel, hchan-&gt;channelFlags);</div><div class='add'>+</div><div class='add'>+	ht_macmode = ath_cwm_macmode(sc);</div><div class='add'>+</div><div class='add'>+	if (hchan-&gt;channel != sc-&gt;sc_curchan.channel ||</div><div class='add'>+	    hchan-&gt;channelFlags != sc-&gt;sc_curchan.channelFlags ||</div><div class='add'>+	    sc-&gt;sc_update_chainmask || sc-&gt;sc_full_reset) {</div><div class='add'>+		int status;</div><div class='add'>+		/*</div><div class='add'>+		 * This is only performed if the channel settings have</div><div class='add'>+		 * actually changed.</div><div class='add'>+		 *</div><div class='add'>+		 * To switch channels clear any pending DMA operations;</div><div class='add'>+		 * wait long enough for the RX fifo to drain, reset the</div><div class='add'>+		 * hardware at the new frequency, and then re-enable</div><div class='add'>+		 * the relevant bits of the h/w.</div><div class='add'>+		 */</div><div class='add'>+		ath9k_hw_set_interrupts(ah, 0);	/* disable interrupts */</div><div class='add'>+		ath_draintxq(sc, false);	/* clear pending tx frames */</div><div class='add'>+		stopped = ath_stoprecv(sc);	/* turn off frame recv */</div><div class='add'>+</div><div class='add'>+		/* XXX: do not flush receive queue here. We don't want</div><div class='add'>+		 * to flush data frames already in queue because of</div><div class='add'>+		 * changing channel. */</div><div class='add'>+</div><div class='add'>+		if (!stopped || sc-&gt;sc_full_reset)</div><div class='add'>+			fastcc = false;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='add'>+		if (!ath9k_hw_reset(ah, sc-&gt;sc_opmode, hchan,</div><div class='add'>+					ht_macmode, sc-&gt;sc_tx_chainmask,</div><div class='add'>+					sc-&gt;sc_rx_chainmask,</div><div class='add'>+					sc-&gt;sc_ht_extprotspacing,</div><div class='add'>+					fastcc, &amp;status)) {</div><div class='add'>+			DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+				"%s: unable to reset channel %u (%uMhz) "</div><div class='add'>+				"flags 0x%x hal status %u\n", __func__,</div><div class='add'>+				ath9k_hw_mhz2ieee(ah, hchan-&gt;channel,</div><div class='add'>+						  hchan-&gt;channelFlags),</div><div class='add'>+				hchan-&gt;channel, hchan-&gt;channelFlags, status);</div><div class='add'>+			spin_unlock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='add'>+</div><div class='add'>+		sc-&gt;sc_curchan = *hchan;</div><div class='add'>+		sc-&gt;sc_update_chainmask = 0;</div><div class='add'>+		sc-&gt;sc_full_reset = 0;</div><div class='add'>+</div><div class='add'>+		/* Re-enable rx framework */</div><div class='add'>+		if (ath_startrecv(sc) != 0) {</div><div class='add'>+			DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+				"%s: unable to restart recv logic\n", __func__);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * Change channels and update the h/w rate map</div><div class='add'>+		 * if we're switching; e.g. 11a to 11b/g.</div><div class='add'>+		 */</div><div class='add'>+		ath_setcurmode(sc, ath_chan2mode(hchan));</div><div class='add'>+</div><div class='add'>+		ath_update_txpow(sc);	/* update tx power state */</div><div class='add'>+		/*</div><div class='add'>+		 * Re-enable interrupts.</div><div class='add'>+		 */</div><div class='add'>+		ath9k_hw_set_interrupts(ah, sc-&gt;sc_imask);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**********************/</div><div class='add'>+/* Chainmask Handling */</div><div class='add'>+/**********************/</div><div class='add'>+</div><div class='add'>+static void ath_chainmask_sel_timertimeout(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct ath_chainmask_sel *cm = (struct ath_chainmask_sel *)data;</div><div class='add'>+	cm-&gt;switch_allowed = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Start chainmask select timer */</div><div class='add'>+static void ath_chainmask_sel_timerstart(struct ath_chainmask_sel *cm)</div><div class='add'>+{</div><div class='add'>+	cm-&gt;switch_allowed = 0;</div><div class='add'>+	mod_timer(&amp;cm-&gt;timer, ath_chainmask_sel_period);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Stop chainmask select timer */</div><div class='add'>+static void ath_chainmask_sel_timerstop(struct ath_chainmask_sel *cm)</div><div class='add'>+{</div><div class='add'>+	cm-&gt;switch_allowed = 0;</div><div class='add'>+	del_timer_sync(&amp;cm-&gt;timer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath_chainmask_sel_init(struct ath_softc *sc, struct ath_node *an)</div><div class='add'>+{</div><div class='add'>+	struct ath_chainmask_sel *cm = &amp;an-&gt;an_chainmask_sel;</div><div class='add'>+</div><div class='add'>+	memzero(cm, sizeof(struct ath_chainmask_sel));</div><div class='add'>+</div><div class='add'>+	cm-&gt;cur_tx_mask = sc-&gt;sc_tx_chainmask;</div><div class='add'>+	cm-&gt;cur_rx_mask = sc-&gt;sc_rx_chainmask;</div><div class='add'>+	cm-&gt;tx_avgrssi = ATH_RSSI_DUMMY_MARKER;</div><div class='add'>+	setup_timer(&amp;cm-&gt;timer,</div><div class='add'>+		ath_chainmask_sel_timertimeout, (unsigned long) cm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath_chainmask_sel_logic(struct ath_softc *sc, struct ath_node *an)</div><div class='add'>+{</div><div class='add'>+	struct ath_chainmask_sel *cm = &amp;an-&gt;an_chainmask_sel;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable auto-swtiching in one of the following if conditions.</div><div class='add'>+	 * sc_chainmask_auto_sel is used for internal global auto-switching</div><div class='add'>+	 * enabled/disabled setting</div><div class='add'>+	 */</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;ah_caps.tx_chainmask != ATH_CHAINMASK_SEL_3X3) {</div><div class='add'>+		cm-&gt;cur_tx_mask = sc-&gt;sc_tx_chainmask;</div><div class='add'>+		return cm-&gt;cur_tx_mask;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cm-&gt;tx_avgrssi == ATH_RSSI_DUMMY_MARKER)</div><div class='add'>+		return cm-&gt;cur_tx_mask;</div><div class='add'>+</div><div class='add'>+	if (cm-&gt;switch_allowed) {</div><div class='add'>+		/* Switch down from tx 3 to tx 2. */</div><div class='add'>+		if (cm-&gt;cur_tx_mask == ATH_CHAINMASK_SEL_3X3 &amp;&amp;</div><div class='add'>+		    ATH_RSSI_OUT(cm-&gt;tx_avgrssi) &gt;=</div><div class='add'>+		    ath_chainmask_sel_down_rssi_thres) {</div><div class='add'>+			cm-&gt;cur_tx_mask = sc-&gt;sc_tx_chainmask;</div><div class='add'>+</div><div class='add'>+			/* Don't let another switch happen until</div><div class='add'>+			 * this timer expires */</div><div class='add'>+			ath_chainmask_sel_timerstart(cm);</div><div class='add'>+		}</div><div class='add'>+		/* Switch up from tx 2 to 3. */</div><div class='add'>+		else if (cm-&gt;cur_tx_mask == sc-&gt;sc_tx_chainmask &amp;&amp;</div><div class='add'>+			 ATH_RSSI_OUT(cm-&gt;tx_avgrssi) &lt;=</div><div class='add'>+			 ath_chainmask_sel_up_rssi_thres) {</div><div class='add'>+			cm-&gt;cur_tx_mask = ATH_CHAINMASK_SEL_3X3;</div><div class='add'>+</div><div class='add'>+			/* Don't let another switch happen</div><div class='add'>+			 * until this timer expires */</div><div class='add'>+			ath_chainmask_sel_timerstart(cm);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return cm-&gt;cur_tx_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Update tx/rx chainmask. For legacy association,</div><div class='add'>+ * hard code chainmask to 1x1, for 11n association, use</div><div class='add'>+ * the chainmask configuration.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void ath_update_chainmask(struct ath_softc *sc, int is_ht)</div><div class='add'>+{</div><div class='add'>+	sc-&gt;sc_update_chainmask = 1;</div><div class='add'>+	if (is_ht) {</div><div class='add'>+		sc-&gt;sc_tx_chainmask = sc-&gt;sc_ah-&gt;ah_caps.tx_chainmask;</div><div class='add'>+		sc-&gt;sc_rx_chainmask = sc-&gt;sc_ah-&gt;ah_caps.rx_chainmask;</div><div class='add'>+	} else {</div><div class='add'>+		sc-&gt;sc_tx_chainmask = 1;</div><div class='add'>+		sc-&gt;sc_rx_chainmask = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DPRINTF(sc, ATH_DBG_CONFIG, "%s: tx chmask: %d, rx chmask: %d\n",</div><div class='add'>+		__func__, sc-&gt;sc_tx_chainmask, sc-&gt;sc_rx_chainmask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************/</div><div class='add'>+/* VAP management */</div><div class='add'>+/******************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  VAP in Listen mode</div><div class='add'>+ *</div><div class='add'>+ *  This routine brings the VAP out of the down state into a "listen" state</div><div class='add'>+ *  where it waits for association requests.  This is used in AP and AdHoc</div><div class='add'>+ *  modes.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+int ath_vap_listen(struct ath_softc *sc, int if_id)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	struct ath_vap *avp;</div><div class='add'>+	u32 rfilt = 0;</div><div class='add'>+	DECLARE_MAC_BUF(mac);</div><div class='add'>+</div><div class='add'>+	avp = sc-&gt;sc_vaps[if_id];</div><div class='add'>+	if (avp == NULL) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL, "%s: invalid interface id %u\n",</div><div class='add'>+			__func__, if_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SLOW_ANT_DIV</div><div class='add'>+	ath_slow_ant_div_stop(&amp;sc-&gt;sc_antdiv);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* update ratectrl about the new state */</div><div class='add'>+	ath_rate_newstate(sc, avp);</div><div class='add'>+</div><div class='add'>+	rfilt = ath_calcrxfilter(sc);</div><div class='add'>+	ath9k_hw_setrxfilter(ah, rfilt);</div><div class='add'>+</div><div class='add'>+	if (sc-&gt;sc_opmode == ATH9K_M_STA || sc-&gt;sc_opmode == ATH9K_M_IBSS) {</div><div class='add'>+		memcpy(sc-&gt;sc_curbssid, ath_bcast_mac, ETH_ALEN);</div><div class='add'>+		ath9k_hw_write_associd(ah, sc-&gt;sc_curbssid, sc-&gt;sc_curaid);</div><div class='add'>+	} else</div><div class='add'>+		sc-&gt;sc_curaid = 0;</div><div class='add'>+</div><div class='add'>+	DPRINTF(sc, ATH_DBG_CONFIG,</div><div class='add'>+		"%s: RX filter 0x%x bssid %s aid 0x%x\n",</div><div class='add'>+		__func__, rfilt, print_mac(mac,</div><div class='add'>+			sc-&gt;sc_curbssid), sc-&gt;sc_curaid);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * XXXX</div><div class='add'>+	 * Disable BMISS interrupt when we're not associated</div><div class='add'>+	 */</div><div class='add'>+	ath9k_hw_set_interrupts(ah,</div><div class='add'>+		sc-&gt;sc_imask &amp; ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS));</div><div class='add'>+	sc-&gt;sc_imask &amp;= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS);</div><div class='add'>+	/* need to reconfigure the beacons when it moves to RUN */</div><div class='add'>+	sc-&gt;sc_beacons = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath_vap_attach(struct ath_softc *sc,</div><div class='add'>+		   int if_id,</div><div class='add'>+		   struct ieee80211_vif *if_data,</div><div class='add'>+		   enum ath9k_opmode opmode)</div><div class='add'>+{</div><div class='add'>+	struct ath_vap *avp;</div><div class='add'>+</div><div class='add'>+	if (if_id &gt;= ATH_BCBUF || sc-&gt;sc_vaps[if_id] != NULL) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: Invalid interface id = %u\n", __func__, if_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (opmode) {</div><div class='add'>+	case ATH9K_M_STA:</div><div class='add'>+	case ATH9K_M_IBSS:</div><div class='add'>+	case ATH9K_M_MONITOR:</div><div class='add'>+		break;</div><div class='add'>+	case ATH9K_M_HOSTAP:</div><div class='add'>+		/* XXX not right, beacon buffer is allocated on RUN trans */</div><div class='add'>+		if (list_empty(&amp;sc-&gt;sc_bbuf))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* create ath_vap */</div><div class='add'>+	avp = kmalloc(sizeof(struct ath_vap), GFP_KERNEL);</div><div class='add'>+	if (avp == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memzero(avp, sizeof(struct ath_vap));</div><div class='add'>+	avp-&gt;av_if_data = if_data;</div><div class='add'>+	/* Set the VAP opmode */</div><div class='add'>+	avp-&gt;av_opmode = opmode;</div><div class='add'>+	avp-&gt;av_bslot = -1;</div><div class='add'>+	INIT_LIST_HEAD(&amp;avp-&gt;av_mcastq.axq_q);</div><div class='add'>+	INIT_LIST_HEAD(&amp;avp-&gt;av_mcastq.axq_acq);</div><div class='add'>+	spin_lock_init(&amp;avp-&gt;av_mcastq.axq_lock);</div><div class='add'>+</div><div class='add'>+	ath9k_hw_set_tsfadjust(sc-&gt;sc_ah, 1);</div><div class='add'>+</div><div class='add'>+	sc-&gt;sc_vaps[if_id] = avp;</div><div class='add'>+	sc-&gt;sc_nvaps++;</div><div class='add'>+	/* Set the device opmode */</div><div class='add'>+	sc-&gt;sc_opmode = opmode;</div><div class='add'>+</div><div class='add'>+	/* default VAP configuration */</div><div class='add'>+	avp-&gt;av_config.av_fixed_rateset = IEEE80211_FIXED_RATE_NONE;</div><div class='add'>+	avp-&gt;av_config.av_fixed_retryset = 0x03030303;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath_vap_detach(struct ath_softc *sc, int if_id)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	struct ath_vap *avp;</div><div class='add'>+</div><div class='add'>+	avp = sc-&gt;sc_vaps[if_id];</div><div class='add'>+	if (avp == NULL) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL, "%s: invalid interface id %u\n",</div><div class='add'>+			__func__, if_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Quiesce the hardware while we remove the vap.  In</div><div class='add'>+	 * particular we need to reclaim all references to the</div><div class='add'>+	 * vap state by any frames pending on the tx queues.</div><div class='add'>+	 *</div><div class='add'>+	 * XXX can we do this w/o affecting other vap's?</div><div class='add'>+	 */</div><div class='add'>+	ath9k_hw_set_interrupts(ah, 0);	/* disable interrupts */</div><div class='add'>+	ath_draintxq(sc, false);	/* stop xmit side */</div><div class='add'>+	ath_stoprecv(sc);	/* stop recv side */</div><div class='add'>+	ath_flushrecv(sc);	/* flush recv queue */</div><div class='add'>+</div><div class='add'>+	/* Reclaim any pending mcast bufs on the vap. */</div><div class='add'>+	ath_tx_draintxq(sc, &amp;avp-&gt;av_mcastq, false);</div><div class='add'>+</div><div class='add'>+	kfree(avp);</div><div class='add'>+	sc-&gt;sc_vaps[if_id] = NULL;</div><div class='add'>+	sc-&gt;sc_nvaps--;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath_vap_config(struct ath_softc *sc,</div><div class='add'>+	int if_id, struct ath_vap_config *if_config)</div><div class='add'>+{</div><div class='add'>+	struct ath_vap *avp;</div><div class='add'>+</div><div class='add'>+	if (if_id &gt;= ATH_BCBUF) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: Invalid interface id = %u\n", __func__, if_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	avp = sc-&gt;sc_vaps[if_id];</div><div class='add'>+	ASSERT(avp != NULL);</div><div class='add'>+</div><div class='add'>+	if (avp)</div><div class='add'>+		memcpy(&amp;avp-&gt;av_config, if_config, sizeof(avp-&gt;av_config));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/********/</div><div class='add'>+/* Core */</div><div class='add'>+/********/</div><div class='add'>+</div><div class='add'>+int ath_open(struct ath_softc *sc, struct ath9k_channel *initial_chan)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	int status;</div><div class='add'>+	int error = 0;</div><div class='add'>+	enum ath9k_ht_macmode ht_macmode = ath_cwm_macmode(sc);</div><div class='add'>+</div><div class='add'>+	DPRINTF(sc, ATH_DBG_CONFIG, "%s: mode %d\n", __func__, sc-&gt;sc_opmode);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Stop anything previously setup.  This is safe</div><div class='add'>+	 * whether this is the first time through or not.</div><div class='add'>+	 */</div><div class='add'>+	ath_stop(sc);</div><div class='add'>+</div><div class='add'>+	/* Initialize chanmask selection */</div><div class='add'>+	sc-&gt;sc_tx_chainmask = ah-&gt;ah_caps.tx_chainmask;</div><div class='add'>+	sc-&gt;sc_rx_chainmask = ah-&gt;ah_caps.rx_chainmask;</div><div class='add'>+</div><div class='add'>+	/* Reset SERDES registers */</div><div class='add'>+	ath9k_hw_configpcipowersave(ah, 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The basic interface to setting the hardware in a good</div><div class='add'>+	 * state is ``reset''.  On return the hardware is known to</div><div class='add'>+	 * be powered up and with interrupts disabled.  This must</div><div class='add'>+	 * be followed by initialization of the appropriate bits</div><div class='add'>+	 * and then setup of the interrupt mask.</div><div class='add'>+	 */</div><div class='add'>+	sc-&gt;sc_curchan = *initial_chan;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='add'>+	if (!ath9k_hw_reset(ah, sc-&gt;sc_opmode, &amp;sc-&gt;sc_curchan, ht_macmode,</div><div class='add'>+			   sc-&gt;sc_tx_chainmask, sc-&gt;sc_rx_chainmask,</div><div class='add'>+			   sc-&gt;sc_ht_extprotspacing, false, &amp;status)) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to reset hardware; hal status %u "</div><div class='add'>+			"(freq %u flags 0x%x)\n", __func__, status,</div><div class='add'>+			sc-&gt;sc_curchan.channel, sc-&gt;sc_curchan.channelFlags);</div><div class='add'>+		error = -EIO;</div><div class='add'>+		spin_unlock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='add'>+	/*</div><div class='add'>+	 * This is needed only to setup initial state</div><div class='add'>+	 * but it's best done after a reset.</div><div class='add'>+	 */</div><div class='add'>+	ath_update_txpow(sc);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup the hardware after reset:</div><div class='add'>+	 * The receive engine is set going.</div><div class='add'>+	 * Frame transmit is handled entirely</div><div class='add'>+	 * in the frame output path; there's nothing to do</div><div class='add'>+	 * here except setup the interrupt mask.</div><div class='add'>+	 */</div><div class='add'>+	if (ath_startrecv(sc) != 0) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to start recv logic\n", __func__);</div><div class='add'>+		error = -EIO;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	/* Setup our intr mask. */</div><div class='add'>+	sc-&gt;sc_imask = ATH9K_INT_RX | ATH9K_INT_TX</div><div class='add'>+		| ATH9K_INT_RXEOL | ATH9K_INT_RXORN</div><div class='add'>+		| ATH9K_INT_FATAL | ATH9K_INT_GLOBAL;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_GTT)</div><div class='add'>+		sc-&gt;sc_imask |= ATH9K_INT_GTT;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_HT)</div><div class='add'>+		sc-&gt;sc_imask |= ATH9K_INT_CST;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable MIB interrupts when there are hardware phy counters.</div><div class='add'>+	 * Note we only do this (at the moment) for station mode.</div><div class='add'>+	 */</div><div class='add'>+	if (ath9k_hw_phycounters(ah) &amp;&amp;</div><div class='add'>+	    ((sc-&gt;sc_opmode == ATH9K_M_STA) || (sc-&gt;sc_opmode == ATH9K_M_IBSS)))</div><div class='add'>+		sc-&gt;sc_imask |= ATH9K_INT_MIB;</div><div class='add'>+	/*</div><div class='add'>+	 * Some hardware processes the TIM IE and fires an</div><div class='add'>+	 * interrupt when the TIM bit is set.  For hardware</div><div class='add'>+	 * that does, if not overridden by configuration,</div><div class='add'>+	 * enable the TIM interrupt when operating as station.</div><div class='add'>+	 */</div><div class='add'>+	if ((ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_ENHANCEDPM) &amp;&amp;</div><div class='add'>+	    (sc-&gt;sc_opmode == ATH9K_M_STA) &amp;&amp;</div><div class='add'>+	    !sc-&gt;sc_config.swBeaconProcess)</div><div class='add'>+		sc-&gt;sc_imask |= ATH9K_INT_TIM;</div><div class='add'>+	/*</div><div class='add'>+	 *  Don't enable interrupts here as we've not yet built our</div><div class='add'>+	 *  vap and node data structures, which will be needed as soon</div><div class='add'>+	 *  as we start receiving.</div><div class='add'>+	 */</div><div class='add'>+	ath_setcurmode(sc, ath_chan2mode(initial_chan));</div><div class='add'>+</div><div class='add'>+	/* XXX: we must make sure h/w is ready and clear invalid flag</div><div class='add'>+	 * before turning on interrupt. */</div><div class='add'>+	sc-&gt;sc_invalid = 0;</div><div class='add'>+done:</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reset the hardware w/o losing operational state.  This is</div><div class='add'>+ * basically a more efficient way of doing ath_stop, ath_init,</div><div class='add'>+ * followed by state transitions to the current 802.11</div><div class='add'>+ * operational state.  Used to recover from errors rx overrun</div><div class='add'>+ * and to reset the hardware when rf gain settings must be reset.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int ath_reset_start(struct ath_softc *sc, u32 flag)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+</div><div class='add'>+	ath9k_hw_set_interrupts(ah, 0);	/* disable interrupts */</div><div class='add'>+	ath_draintxq(sc, flag &amp; RESET_RETRY_TXQ);	/* stop xmit side */</div><div class='add'>+	ath_stoprecv(sc);	/* stop recv side */</div><div class='add'>+	ath_flushrecv(sc);	/* flush recv queue */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath_reset_end(struct ath_softc *sc, u32 flag)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+</div><div class='add'>+	if (ath_startrecv(sc) != 0)	/* restart recv */</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to start recv logic\n", __func__);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We may be doing a reset in response to a request</div><div class='add'>+	 * that changes the channel so update any state that</div><div class='add'>+	 * might change as a result.</div><div class='add'>+	 */</div><div class='add'>+	ath_setcurmode(sc, ath_chan2mode(&amp;sc-&gt;sc_curchan));</div><div class='add'>+</div><div class='add'>+	ath_update_txpow(sc);	/* update tx power state */</div><div class='add'>+</div><div class='add'>+	if (sc-&gt;sc_beacons)</div><div class='add'>+		ath_beacon_config(sc, ATH_IF_ID_ANY);	/* restart beacons */</div><div class='add'>+	ath9k_hw_set_interrupts(ah, sc-&gt;sc_imask);</div><div class='add'>+</div><div class='add'>+	/* Restart the txq */</div><div class='add'>+	if (flag &amp; RESET_RETRY_TXQ) {</div><div class='add'>+		int i;</div><div class='add'>+		for (i = 0; i &lt; ATH9K_NUM_TX_QUEUES; i++) {</div><div class='add'>+			if (ATH_TXQ_SETUP(sc, i)) {</div><div class='add'>+				spin_lock_bh(&amp;sc-&gt;sc_txq[i].axq_lock);</div><div class='add'>+				ath_txq_schedule(sc, &amp;sc-&gt;sc_txq[i]);</div><div class='add'>+				spin_unlock_bh(&amp;sc-&gt;sc_txq[i].axq_lock);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath_reset(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	int status;</div><div class='add'>+	int error = 0;</div><div class='add'>+	enum ath9k_ht_macmode ht_macmode = ath_cwm_macmode(sc);</div><div class='add'>+</div><div class='add'>+	/* NB: indicate channel change so we do a full reset */</div><div class='add'>+	spin_lock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='add'>+	if (!ath9k_hw_reset(ah, sc-&gt;sc_opmode, &amp;sc-&gt;sc_curchan,</div><div class='add'>+			   ht_macmode,</div><div class='add'>+			   sc-&gt;sc_tx_chainmask, sc-&gt;sc_rx_chainmask,</div><div class='add'>+			   sc-&gt;sc_ht_extprotspacing, false, &amp;status)) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to reset hardware; hal status %u\n",</div><div class='add'>+			__func__, status);</div><div class='add'>+		error = -EIO;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;sc-&gt;sc_resetlock);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath_suspend(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+</div><div class='add'>+	/* No I/O if device has been surprise removed */</div><div class='add'>+	if (sc-&gt;sc_invalid)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* Shut off the interrupt before setting sc-&gt;sc_invalid to '1' */</div><div class='add'>+	ath9k_hw_set_interrupts(ah, 0);</div><div class='add'>+</div><div class='add'>+	/* XXX: we must make sure h/w will not generate any interrupt</div><div class='add'>+	 * before setting the invalid flag. */</div><div class='add'>+	sc-&gt;sc_invalid = 1;</div><div class='add'>+</div><div class='add'>+	/* disable HAL and put h/w to sleep */</div><div class='add'>+	ath9k_hw_disable(sc-&gt;sc_ah);</div><div class='add'>+</div><div class='add'>+	ath9k_hw_configpcipowersave(sc-&gt;sc_ah, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Interrupt handler.  Most of the actual processing is deferred.</div><div class='add'>+ * It's the caller's responsibility to ensure the chip is awake. */</div><div class='add'>+</div><div class='add'>+irqreturn_t ath_isr(int irq, void *dev)</div><div class='add'>+{</div><div class='add'>+	struct ath_softc *sc = dev;</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	enum ath9k_int status;</div><div class='add'>+	bool sched = false;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (sc-&gt;sc_invalid) {</div><div class='add'>+			/*</div><div class='add'>+			 * The hardware is not ready/present, don't</div><div class='add'>+			 * touch anything. Note this can happen early</div><div class='add'>+			 * on if the IRQ is shared.</div><div class='add'>+			 */</div><div class='add'>+			return IRQ_NONE;</div><div class='add'>+		}</div><div class='add'>+		if (!ath9k_hw_intrpend(ah)) {	/* shared irq, not for us */</div><div class='add'>+			return IRQ_NONE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Figure out the reason(s) for the interrupt.  Note</div><div class='add'>+		 * that the hal returns a pseudo-ISR that may include</div><div class='add'>+		 * bits we haven't explicitly enabled so we mask the</div><div class='add'>+		 * value to insure we only process bits we requested.</div><div class='add'>+		 */</div><div class='add'>+		ath9k_hw_getisr(ah, &amp;status);	/* NB: clears ISR too */</div><div class='add'>+</div><div class='add'>+		status &amp;= sc-&gt;sc_imask;	/* discard unasked-for bits */</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If there are no status bits set, then this interrupt was not</div><div class='add'>+		 * for me (should have been caught above).</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		if (!status)</div><div class='add'>+			return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+		sc-&gt;sc_intrstatus = status;</div><div class='add'>+</div><div class='add'>+		if (status &amp; ATH9K_INT_FATAL) {</div><div class='add'>+			/* need a chip reset */</div><div class='add'>+			sched = true;</div><div class='add'>+		} else if (status &amp; ATH9K_INT_RXORN) {</div><div class='add'>+			/* need a chip reset */</div><div class='add'>+			sched = true;</div><div class='add'>+		} else {</div><div class='add'>+			if (status &amp; ATH9K_INT_SWBA) {</div><div class='add'>+				/* schedule a tasklet for beacon handling */</div><div class='add'>+				tasklet_schedule(&amp;sc-&gt;bcon_tasklet);</div><div class='add'>+			}</div><div class='add'>+			if (status &amp; ATH9K_INT_RXEOL) {</div><div class='add'>+				/*</div><div class='add'>+				 * NB: the hardware should re-read the link when</div><div class='add'>+				 *     RXE bit is written, but it doesn't work</div><div class='add'>+				 *     at least on older hardware revs.</div><div class='add'>+				 */</div><div class='add'>+				sched = true;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (status &amp; ATH9K_INT_TXURN)</div><div class='add'>+				/* bump tx trigger level */</div><div class='add'>+				ath9k_hw_updatetxtriglevel(ah, true);</div><div class='add'>+			/* XXX: optimize this */</div><div class='add'>+			if (status &amp; ATH9K_INT_RX)</div><div class='add'>+				sched = true;</div><div class='add'>+			if (status &amp; ATH9K_INT_TX)</div><div class='add'>+				sched = true;</div><div class='add'>+			if (status &amp; ATH9K_INT_BMISS)</div><div class='add'>+				sched = true;</div><div class='add'>+			/* carrier sense timeout */</div><div class='add'>+			if (status &amp; ATH9K_INT_CST)</div><div class='add'>+				sched = true;</div><div class='add'>+			if (status &amp; ATH9K_INT_MIB) {</div><div class='add'>+				/*</div><div class='add'>+				 * Disable interrupts until we service the MIB</div><div class='add'>+				 * interrupt; otherwise it will continue to</div><div class='add'>+				 * fire.</div><div class='add'>+				 */</div><div class='add'>+				ath9k_hw_set_interrupts(ah, 0);</div><div class='add'>+				/*</div><div class='add'>+				 * Let the hal handle the event. We assume</div><div class='add'>+				 * it will clear whatever condition caused</div><div class='add'>+				 * the interrupt.</div><div class='add'>+				 */</div><div class='add'>+				ath9k_hw_procmibevent(ah, &amp;sc-&gt;sc_halstats);</div><div class='add'>+				ath9k_hw_set_interrupts(ah, sc-&gt;sc_imask);</div><div class='add'>+			}</div><div class='add'>+			if (status &amp; ATH9K_INT_TIM_TIMER) {</div><div class='add'>+				if (!(ah-&gt;ah_caps.hw_caps &amp;</div><div class='add'>+				      ATH9K_HW_CAP_AUTOSLEEP)) {</div><div class='add'>+					/* Clear RxAbort bit so that we can</div><div class='add'>+					 * receive frames */</div><div class='add'>+					ath9k_hw_setrxabort(ah, 0);</div><div class='add'>+					sched = true;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} while (0);</div><div class='add'>+</div><div class='add'>+	if (sched) {</div><div class='add'>+		/* turn off every interrupt except SWBA */</div><div class='add'>+		ath9k_hw_set_interrupts(ah, (sc-&gt;sc_imask &amp; ATH9K_INT_SWBA));</div><div class='add'>+		tasklet_schedule(&amp;sc-&gt;intr_tq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Deferred interrupt processing  */</div><div class='add'>+</div><div class='add'>+static void ath9k_tasklet(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct ath_softc *sc = (struct ath_softc *)data;</div><div class='add'>+	u32 status = sc-&gt;sc_intrstatus;</div><div class='add'>+</div><div class='add'>+	if (status &amp; ATH9K_INT_FATAL) {</div><div class='add'>+		/* need a chip reset */</div><div class='add'>+		ath_internal_reset(sc);</div><div class='add'>+		return;</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		if (status &amp;</div><div class='add'>+		    (ATH9K_INT_RX | ATH9K_INT_RXEOL | ATH9K_INT_RXORN)) {</div><div class='add'>+			/* XXX: fill me in */</div><div class='add'>+			/*</div><div class='add'>+			if (status &amp; ATH9K_INT_RXORN) {</div><div class='add'>+			}</div><div class='add'>+			if (status &amp; ATH9K_INT_RXEOL) {</div><div class='add'>+			}</div><div class='add'>+			*/</div><div class='add'>+			spin_lock_bh(&amp;sc-&gt;sc_rxflushlock);</div><div class='add'>+			ath_rx_tasklet(sc, 0);</div><div class='add'>+			spin_unlock_bh(&amp;sc-&gt;sc_rxflushlock);</div><div class='add'>+		}</div><div class='add'>+		/* XXX: optimize this */</div><div class='add'>+		if (status &amp; ATH9K_INT_TX)</div><div class='add'>+			ath_tx_tasklet(sc);</div><div class='add'>+		/* XXX: fill me in */</div><div class='add'>+		/*</div><div class='add'>+		if (status &amp; ATH9K_INT_BMISS) {</div><div class='add'>+		}</div><div class='add'>+		if (status &amp; (ATH9K_INT_TIM | ATH9K_INT_DTIMSYNC)) {</div><div class='add'>+			if (status &amp; ATH9K_INT_TIM) {</div><div class='add'>+			}</div><div class='add'>+			if (status &amp; ATH9K_INT_DTIMSYNC) {</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		*/</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* re-enable hardware interrupt */</div><div class='add'>+	ath9k_hw_set_interrupts(sc-&gt;sc_ah, sc-&gt;sc_imask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath_init(u16 devid, struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = NULL;</div><div class='add'>+	int status;</div><div class='add'>+	int error = 0, i;</div><div class='add'>+	int csz = 0;</div><div class='add'>+	u32 rd;</div><div class='add'>+</div><div class='add'>+	/* XXX: hardware will not be ready until ath_open() being called */</div><div class='add'>+	sc-&gt;sc_invalid = 1;</div><div class='add'>+</div><div class='add'>+	sc-&gt;sc_debug = DBG_DEFAULT;</div><div class='add'>+	DPRINTF(sc, ATH_DBG_CONFIG, "%s: devid 0x%x\n", __func__, devid);</div><div class='add'>+</div><div class='add'>+	/* Initialize tasklet */</div><div class='add'>+	tasklet_init(&amp;sc-&gt;intr_tq, ath9k_tasklet, (unsigned long)sc);</div><div class='add'>+	tasklet_init(&amp;sc-&gt;bcon_tasklet, ath9k_beacon_tasklet,</div><div class='add'>+		     (unsigned long)sc);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Cache line size is used to size and align various</div><div class='add'>+	 * structures used to communicate with the hardware.</div><div class='add'>+	 */</div><div class='add'>+	bus_read_cachesize(sc, &amp;csz);</div><div class='add'>+	/* XXX assert csz is non-zero */</div><div class='add'>+	sc-&gt;sc_cachelsz = csz &lt;&lt; 2;	/* convert to bytes */</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;sc-&gt;sc_resetlock);</div><div class='add'>+</div><div class='add'>+	ah = ath9k_hw_attach(devid, sc, sc-&gt;mem, &amp;status);</div><div class='add'>+	if (ah == NULL) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to attach hardware; HAL status %u\n",</div><div class='add'>+			__func__, status);</div><div class='add'>+		error = -ENXIO;</div><div class='add'>+		goto bad;</div><div class='add'>+	}</div><div class='add'>+	sc-&gt;sc_ah = ah;</div><div class='add'>+</div><div class='add'>+	/* Get the chipset-specific aggr limit. */</div><div class='add'>+	sc-&gt;sc_rtsaggrlimit = ah-&gt;ah_caps.rts_aggr_limit;</div><div class='add'>+</div><div class='add'>+	/* Get the hardware key cache size. */</div><div class='add'>+	sc-&gt;sc_keymax = ah-&gt;ah_caps.keycache_size;</div><div class='add'>+	if (sc-&gt;sc_keymax &gt; ATH_KEYMAX) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_KEYCACHE,</div><div class='add'>+			"%s: Warning, using only %u entries in %u key cache\n",</div><div class='add'>+			__func__, ATH_KEYMAX, sc-&gt;sc_keymax);</div><div class='add'>+		sc-&gt;sc_keymax = ATH_KEYMAX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reset the key cache since some parts do not</div><div class='add'>+	 * reset the contents on initial power up.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; sc-&gt;sc_keymax; i++)</div><div class='add'>+		ath9k_hw_keyreset(ah, (u16) i);</div><div class='add'>+	/*</div><div class='add'>+	 * Mark key cache slots associated with global keys</div><div class='add'>+	 * as in use.  If we knew TKIP was not to be used we</div><div class='add'>+	 * could leave the +32, +64, and +32+64 slots free.</div><div class='add'>+	 * XXX only for splitmic.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; IEEE80211_WEP_NKID; i++) {</div><div class='add'>+		set_bit(i, sc-&gt;sc_keymap);</div><div class='add'>+		set_bit(i + 32, sc-&gt;sc_keymap);</div><div class='add'>+		set_bit(i + 64, sc-&gt;sc_keymap);</div><div class='add'>+		set_bit(i + 32 + 64, sc-&gt;sc_keymap);</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Collect the channel list using the default country</div><div class='add'>+	 * code and including outdoor channels.  The 802.11 layer</div><div class='add'>+	 * is resposible for filtering this list based on settings</div><div class='add'>+	 * like the phy mode.</div><div class='add'>+	 */</div><div class='add'>+	rd = ah-&gt;ah_currentRD;</div><div class='add'>+</div><div class='add'>+	error = ath_setup_channels(sc);</div><div class='add'>+	if (error)</div><div class='add'>+		goto bad;</div><div class='add'>+</div><div class='add'>+	/* default to STA mode */</div><div class='add'>+	sc-&gt;sc_opmode = ATH9K_M_MONITOR;</div><div class='add'>+</div><div class='add'>+	/* Setup rate tables */</div><div class='add'>+</div><div class='add'>+	ath_setup_rates(sc, IEEE80211_BAND_2GHZ);</div><div class='add'>+	ath_setup_rates(sc, IEEE80211_BAND_5GHZ);</div><div class='add'>+</div><div class='add'>+	/* NB: setup here so ath_rate_update is happy */</div><div class='add'>+	ath_setcurmode(sc, ATH9K_MODE_11A);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Allocate hardware transmit queues: one queue for</div><div class='add'>+	 * beacon frames and one data queue for each QoS</div><div class='add'>+	 * priority.  Note that the hal handles reseting</div><div class='add'>+	 * these queues at the needed time.</div><div class='add'>+	 */</div><div class='add'>+	sc-&gt;sc_bhalq = ath_beaconq_setup(ah);</div><div class='add'>+	if (sc-&gt;sc_bhalq == -1) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to setup a beacon xmit queue\n", __func__);</div><div class='add'>+		error = -EIO;</div><div class='add'>+		goto bad2;</div><div class='add'>+	}</div><div class='add'>+	sc-&gt;sc_cabq = ath_txq_setup(sc, ATH9K_TX_QUEUE_CAB, 0);</div><div class='add'>+	if (sc-&gt;sc_cabq == NULL) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to setup CAB xmit queue\n", __func__);</div><div class='add'>+		error = -EIO;</div><div class='add'>+		goto bad2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sc-&gt;sc_config.cabqReadytime = ATH_CABQ_READY_TIME;</div><div class='add'>+	ath_cabq_update(sc);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sc-&gt;sc_haltype2q); i++)</div><div class='add'>+		sc-&gt;sc_haltype2q[i] = -1;</div><div class='add'>+</div><div class='add'>+	/* Setup data queues */</div><div class='add'>+	/* NB: ensure BK queue is the lowest priority h/w queue */</div><div class='add'>+	if (!ath_tx_setup(sc, ATH9K_WME_AC_BK)) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to setup xmit queue for BK traffic\n",</div><div class='add'>+			__func__);</div><div class='add'>+		error = -EIO;</div><div class='add'>+		goto bad2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ath_tx_setup(sc, ATH9K_WME_AC_BE)) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to setup xmit queue for BE traffic\n",</div><div class='add'>+			__func__);</div><div class='add'>+		error = -EIO;</div><div class='add'>+		goto bad2;</div><div class='add'>+	}</div><div class='add'>+	if (!ath_tx_setup(sc, ATH9K_WME_AC_VI)) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to setup xmit queue for VI traffic\n",</div><div class='add'>+			__func__);</div><div class='add'>+		error = -EIO;</div><div class='add'>+		goto bad2;</div><div class='add'>+	}</div><div class='add'>+	if (!ath_tx_setup(sc, ATH9K_WME_AC_VO)) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			"%s: unable to setup xmit queue for VO traffic\n",</div><div class='add'>+			__func__);</div><div class='add'>+		error = -EIO;</div><div class='add'>+		goto bad2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sc-&gt;sc_rc = ath_rate_attach(ah);</div><div class='add'>+	if (sc-&gt;sc_rc == NULL) {</div><div class='add'>+		error = EIO;</div><div class='add'>+		goto bad2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ath9k_hw_getcapability(ah, ATH9K_CAP_CIPHER,</div><div class='add'>+				   ATH9K_CIPHER_TKIP, NULL)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Whether we should enable h/w TKIP MIC.</div><div class='add'>+		 * XXX: if we don't support WME TKIP MIC, then we wouldn't</div><div class='add'>+		 * report WMM capable, so it's always safe to turn on</div><div class='add'>+		 * TKIP MIC in this case.</div><div class='add'>+		 */</div><div class='add'>+		ath9k_hw_setcapability(sc-&gt;sc_ah, ATH9K_CAP_TKIP_MIC,</div><div class='add'>+				       0, 1, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check whether the separate key cache entries</div><div class='add'>+	 * are required to handle both tx+rx MIC keys.</div><div class='add'>+	 * With split mic keys the number of stations is limited</div><div class='add'>+	 * to 27 otherwise 59.</div><div class='add'>+	 */</div><div class='add'>+	if (ath9k_hw_getcapability(ah, ATH9K_CAP_CIPHER,</div><div class='add'>+				   ATH9K_CIPHER_TKIP, NULL)</div><div class='add'>+	    &amp;&amp; ath9k_hw_getcapability(ah, ATH9K_CAP_CIPHER,</div><div class='add'>+				      ATH9K_CIPHER_MIC, NULL)</div><div class='add'>+	    &amp;&amp; ath9k_hw_getcapability(ah, ATH9K_CAP_TKIP_SPLIT,</div><div class='add'>+				      0, NULL))</div><div class='add'>+		sc-&gt;sc_splitmic = 1;</div><div class='add'>+</div><div class='add'>+	/* turn on mcast key search if possible */</div><div class='add'>+	if (!ath9k_hw_getcapability(ah, ATH9K_CAP_MCAST_KEYSRCH, 0, NULL))</div><div class='add'>+		(void)ath9k_hw_setcapability(ah, ATH9K_CAP_MCAST_KEYSRCH, 1,</div><div class='add'>+					     1, NULL);</div><div class='add'>+</div><div class='add'>+	sc-&gt;sc_config.txpowlimit = ATH_TXPOWER_MAX;</div><div class='add'>+	sc-&gt;sc_config.txpowlimit_override = 0;</div><div class='add'>+</div><div class='add'>+	/* 11n Capabilities */</div><div class='add'>+	if (ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_HT) {</div><div class='add'>+		sc-&gt;sc_txaggr = 1;</div><div class='add'>+		sc-&gt;sc_rxaggr = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sc-&gt;sc_tx_chainmask = ah-&gt;ah_caps.tx_chainmask;</div><div class='add'>+	sc-&gt;sc_rx_chainmask = ah-&gt;ah_caps.rx_chainmask;</div><div class='add'>+</div><div class='add'>+	/* Configuration for rx chain detection */</div><div class='add'>+	sc-&gt;sc_rxchaindetect_ref = 0;</div><div class='add'>+	sc-&gt;sc_rxchaindetect_thresh5GHz = 35;</div><div class='add'>+	sc-&gt;sc_rxchaindetect_thresh2GHz = 35;</div><div class='add'>+	sc-&gt;sc_rxchaindetect_delta5GHz = 30;</div><div class='add'>+	sc-&gt;sc_rxchaindetect_delta2GHz = 30;</div><div class='add'>+</div><div class='add'>+	ath9k_hw_setcapability(ah, ATH9K_CAP_DIVERSITY, 1, true, NULL);</div><div class='add'>+	sc-&gt;sc_defant = ath9k_hw_getdefantenna(ah);</div><div class='add'>+</div><div class='add'>+	ath9k_hw_getmac(ah, sc-&gt;sc_myaddr);</div><div class='add'>+	if (ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_BSSIDMASK) {</div><div class='add'>+		ath9k_hw_getbssidmask(ah, sc-&gt;sc_bssidmask);</div><div class='add'>+		ATH_SET_VAP_BSSID_MASK(sc-&gt;sc_bssidmask);</div><div class='add'>+		ath9k_hw_setbssidmask(ah, sc-&gt;sc_bssidmask);</div><div class='add'>+	}</div><div class='add'>+	sc-&gt;sc_slottime = ATH9K_SLOT_TIME_9;	/* default to short slot time */</div><div class='add'>+</div><div class='add'>+	/* initialize beacon slots */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sc-&gt;sc_bslot); i++)</div><div class='add'>+		sc-&gt;sc_bslot[i] = ATH_IF_ID_ANY;</div><div class='add'>+</div><div class='add'>+	/* save MISC configurations */</div><div class='add'>+	sc-&gt;sc_config.swBeaconProcess = 1;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SLOW_ANT_DIV</div><div class='add'>+	/* range is 40 - 255, we use something in the middle */</div><div class='add'>+	ath_slow_ant_div_init(&amp;sc-&gt;sc_antdiv, sc, 0x127);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+bad2:</div><div class='add'>+	/* cleanup tx queues */</div><div class='add'>+	for (i = 0; i &lt; ATH9K_NUM_TX_QUEUES; i++)</div><div class='add'>+		if (ATH_TXQ_SETUP(sc, i))</div><div class='add'>+			ath_tx_cleanupq(sc, &amp;sc-&gt;sc_txq[i]);</div><div class='add'>+bad:</div><div class='add'>+	if (ah)</div><div class='add'>+		ath9k_hw_detach(ah);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath_deinit(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	DPRINTF(sc, ATH_DBG_CONFIG, "%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	ath_stop(sc);</div><div class='add'>+	if (!sc-&gt;sc_invalid)</div><div class='add'>+		ath9k_hw_setpower(sc-&gt;sc_ah, ATH9K_PM_AWAKE);</div><div class='add'>+	ath_rate_detach(sc-&gt;sc_rc);</div><div class='add'>+	/* cleanup tx queues */</div><div class='add'>+	for (i = 0; i &lt; ATH9K_NUM_TX_QUEUES; i++)</div><div class='add'>+		if (ATH_TXQ_SETUP(sc, i))</div><div class='add'>+			ath_tx_cleanupq(sc, &amp;sc-&gt;sc_txq[i]);</div><div class='add'>+	ath9k_hw_detach(ah);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************/</div><div class='add'>+/* Node Management */</div><div class='add'>+/*******************/</div><div class='add'>+</div><div class='add'>+struct ath_node *ath_node_attach(struct ath_softc *sc, u8 *addr, int if_id)</div><div class='add'>+{</div><div class='add'>+	struct ath_vap *avp;</div><div class='add'>+	struct ath_node *an;</div><div class='add'>+	DECLARE_MAC_BUF(mac);</div><div class='add'>+</div><div class='add'>+	avp = sc-&gt;sc_vaps[if_id];</div><div class='add'>+	ASSERT(avp != NULL);</div><div class='add'>+</div><div class='add'>+	/* mac80211 sta_notify callback is from an IRQ context, so no sleep */</div><div class='add'>+	an = kmalloc(sizeof(struct ath_node), GFP_ATOMIC);</div><div class='add'>+	if (an == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+	memzero(an, sizeof(*an));</div><div class='add'>+</div><div class='add'>+	an-&gt;an_sc = sc;</div><div class='add'>+	memcpy(an-&gt;an_addr, addr, ETH_ALEN);</div><div class='add'>+	atomic_set(&amp;an-&gt;an_refcnt, 1);</div><div class='add'>+</div><div class='add'>+	/* set up per-node tx/rx state */</div><div class='add'>+	ath_tx_node_init(sc, an);</div><div class='add'>+	ath_rx_node_init(sc, an);</div><div class='add'>+</div><div class='add'>+	ath_chainmask_sel_init(sc, an);</div><div class='add'>+	ath_chainmask_sel_timerstart(&amp;an-&gt;an_chainmask_sel);</div><div class='add'>+	list_add(&amp;an-&gt;list, &amp;sc-&gt;node_list);</div><div class='add'>+</div><div class='add'>+	return an;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath_node_detach(struct ath_softc *sc, struct ath_node *an, bool bh_flag)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	DECLARE_MAC_BUF(mac);</div><div class='add'>+</div><div class='add'>+	ath_chainmask_sel_timerstop(&amp;an-&gt;an_chainmask_sel);</div><div class='add'>+	an-&gt;an_flags |= ATH_NODE_CLEAN;</div><div class='add'>+	ath_tx_node_cleanup(sc, an, bh_flag);</div><div class='add'>+	ath_rx_node_cleanup(sc, an);</div><div class='add'>+</div><div class='add'>+	ath_tx_node_free(sc, an);</div><div class='add'>+	ath_rx_node_free(sc, an);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;sc-&gt;node_lock, flags);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;an-&gt;list);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;sc-&gt;node_lock, flags);</div><div class='add'>+</div><div class='add'>+	kfree(an);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Finds a node and increases the refcnt if found */</div><div class='add'>+</div><div class='add'>+struct ath_node *ath_node_get(struct ath_softc *sc, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct ath_node *an = NULL, *an_found = NULL;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;sc-&gt;node_list)) /* FIXME */</div><div class='add'>+		goto out;</div><div class='add'>+	list_for_each_entry(an, &amp;sc-&gt;node_list, list) {</div><div class='add'>+		if (!compare_ether_addr(an-&gt;an_addr, addr)) {</div><div class='add'>+			atomic_inc(&amp;an-&gt;an_refcnt);</div><div class='add'>+			an_found = an;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return an_found;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Decrements the refcnt and if it drops to zero, detach the node */</div><div class='add'>+</div><div class='add'>+void ath_node_put(struct ath_softc *sc, struct ath_node *an, bool bh_flag)</div><div class='add'>+{</div><div class='add'>+	if (atomic_dec_and_test(&amp;an-&gt;an_refcnt))</div><div class='add'>+		ath_node_detach(sc, an, bh_flag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Finds a node, doesn't increment refcnt. Caller must hold sc-&gt;node_lock */</div><div class='add'>+struct ath_node *ath_node_find(struct ath_softc *sc, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct ath_node *an = NULL, *an_found = NULL;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;sc-&gt;node_list))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(an, &amp;sc-&gt;node_list, list)</div><div class='add'>+		if (!compare_ether_addr(an-&gt;an_addr, addr)) {</div><div class='add'>+			an_found = an;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	return an_found;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set up New Node</div><div class='add'>+ *</div><div class='add'>+ * Setup driver-specific state for a newly associated node.  This routine</div><div class='add'>+ * really only applies if compression or XR are enabled, there is no code</div><div class='add'>+ * covering any other cases.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+void ath_newassoc(struct ath_softc *sc,</div><div class='add'>+	struct ath_node *an, int isnew, int isuapsd)</div><div class='add'>+{</div><div class='add'>+	int tidno;</div><div class='add'>+</div><div class='add'>+	/* if station reassociates, tear down the aggregation state. */</div><div class='add'>+	if (!isnew) {</div><div class='add'>+		for (tidno = 0; tidno &lt; WME_NUM_TID; tidno++) {</div><div class='add'>+			if (sc-&gt;sc_txaggr)</div><div class='add'>+				ath_tx_aggr_teardown(sc, an, tidno);</div><div class='add'>+			if (sc-&gt;sc_rxaggr)</div><div class='add'>+				ath_rx_aggr_teardown(sc, an, tidno);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	an-&gt;an_flags = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**************/</div><div class='add'>+/* Encryption */</div><div class='add'>+/**************/</div><div class='add'>+</div><div class='add'>+void ath_key_reset(struct ath_softc *sc, u16 keyix, int freeslot)</div><div class='add'>+{</div><div class='add'>+	ath9k_hw_keyreset(sc-&gt;sc_ah, keyix);</div><div class='add'>+	if (freeslot)</div><div class='add'>+		clear_bit(keyix, sc-&gt;sc_keymap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath_keyset(struct ath_softc *sc,</div><div class='add'>+	       u16 keyix,</div><div class='add'>+	       struct ath9k_keyval *hk,</div><div class='add'>+	       const u8 mac[ETH_ALEN])</div><div class='add'>+{</div><div class='add'>+	bool status;</div><div class='add'>+</div><div class='add'>+	status = ath9k_hw_set_keycache_entry(sc-&gt;sc_ah,</div><div class='add'>+		keyix, hk, mac, false);</div><div class='add'>+</div><div class='add'>+	return status != false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***********************/</div><div class='add'>+/* TX Power/Regulatory */</div><div class='add'>+/***********************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Set Transmit power in HAL</div><div class='add'>+ *</div><div class='add'>+ *  This routine makes the actual HAL calls to set the new transmit power</div><div class='add'>+ *  limit.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+void ath_update_txpow(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	u32 txpow;</div><div class='add'>+</div><div class='add'>+	if (sc-&gt;sc_curtxpow != sc-&gt;sc_config.txpowlimit) {</div><div class='add'>+		ath9k_hw_set_txpowerlimit(ah, sc-&gt;sc_config.txpowlimit);</div><div class='add'>+		/* read back in case value is clamped */</div><div class='add'>+		ath9k_hw_getcapability(ah, ATH9K_CAP_TXPOW, 1, &amp;txpow);</div><div class='add'>+		sc-&gt;sc_curtxpow = txpow;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return the current country and domain information */</div><div class='add'>+void ath_get_currentCountry(struct ath_softc *sc,</div><div class='add'>+	struct ath9k_country_entry *ctry)</div><div class='add'>+{</div><div class='add'>+	ath9k_regd_get_current_country(sc-&gt;sc_ah, ctry);</div><div class='add'>+</div><div class='add'>+	/* If HAL not specific yet, since it is band dependent,</div><div class='add'>+	 * use the one we passed in. */</div><div class='add'>+	if (ctry-&gt;countryCode == CTRY_DEFAULT) {</div><div class='add'>+		ctry-&gt;iso[0] = 0;</div><div class='add'>+		ctry-&gt;iso[1] = 0;</div><div class='add'>+	} else if (ctry-&gt;iso[0] &amp;&amp; ctry-&gt;iso[1]) {</div><div class='add'>+		if (!ctry-&gt;iso[2]) {</div><div class='add'>+			if (ath_outdoor)</div><div class='add'>+				ctry-&gt;iso[2] = 'O';</div><div class='add'>+			else</div><div class='add'>+				ctry-&gt;iso[2] = 'I';</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**************************/</div><div class='add'>+/* Slow Antenna Diversity */</div><div class='add'>+/**************************/</div><div class='add'>+</div><div class='add'>+void ath_slow_ant_div_init(struct ath_antdiv *antdiv,</div><div class='add'>+			   struct ath_softc *sc,</div><div class='add'>+			   int32_t rssitrig)</div><div class='add'>+{</div><div class='add'>+	int trig;</div><div class='add'>+</div><div class='add'>+	/* antdivf_rssitrig can range from 40 - 0xff */</div><div class='add'>+	trig = (rssitrig &gt; 0xff) ? 0xff : rssitrig;</div><div class='add'>+	trig = (rssitrig &lt; 40) ? 40 : rssitrig;</div><div class='add'>+</div><div class='add'>+	antdiv-&gt;antdiv_sc = sc;</div><div class='add'>+	antdiv-&gt;antdivf_rssitrig = trig;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath_slow_ant_div_start(struct ath_antdiv *antdiv,</div><div class='add'>+			    u8 num_antcfg,</div><div class='add'>+			    const u8 *bssid)</div><div class='add'>+{</div><div class='add'>+	antdiv-&gt;antdiv_num_antcfg =</div><div class='add'>+		num_antcfg &lt; ATH_ANT_DIV_MAX_CFG ?</div><div class='add'>+		num_antcfg : ATH_ANT_DIV_MAX_CFG;</div><div class='add'>+	antdiv-&gt;antdiv_state = ATH_ANT_DIV_IDLE;</div><div class='add'>+	antdiv-&gt;antdiv_curcfg = 0;</div><div class='add'>+	antdiv-&gt;antdiv_bestcfg = 0;</div><div class='add'>+	antdiv-&gt;antdiv_laststatetsf = 0;</div><div class='add'>+</div><div class='add'>+	memcpy(antdiv-&gt;antdiv_bssid, bssid, sizeof(antdiv-&gt;antdiv_bssid));</div><div class='add'>+</div><div class='add'>+	antdiv-&gt;antdiv_start = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath_slow_ant_div_stop(struct ath_antdiv *antdiv)</div><div class='add'>+{</div><div class='add'>+	antdiv-&gt;antdiv_start = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int32_t ath_find_max_val(int32_t *val,</div><div class='add'>+	u8 num_val, u8 *max_index)</div><div class='add'>+{</div><div class='add'>+	u32 MaxVal = *val++;</div><div class='add'>+	u32 cur_index = 0;</div><div class='add'>+</div><div class='add'>+	*max_index = 0;</div><div class='add'>+	while (++cur_index &lt; num_val) {</div><div class='add'>+		if (*val &gt; MaxVal) {</div><div class='add'>+			MaxVal = *val;</div><div class='add'>+			*max_index = cur_index;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		val++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return MaxVal;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath_slow_ant_div(struct ath_antdiv *antdiv,</div><div class='add'>+		      struct ieee80211_hdr *hdr,</div><div class='add'>+		      struct ath_rx_status *rx_stats)</div><div class='add'>+{</div><div class='add'>+	struct ath_softc *sc = antdiv-&gt;antdiv_sc;</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+	u64 curtsf = 0;</div><div class='add'>+	u8 bestcfg, curcfg = antdiv-&gt;antdiv_curcfg;</div><div class='add'>+	__le16 fc = hdr-&gt;frame_control;</div><div class='add'>+</div><div class='add'>+	if (antdiv-&gt;antdiv_start &amp;&amp; ieee80211_is_beacon(fc)</div><div class='add'>+	    &amp;&amp; !compare_ether_addr(hdr-&gt;addr3, antdiv-&gt;antdiv_bssid)) {</div><div class='add'>+		antdiv-&gt;antdiv_lastbrssi[curcfg] = rx_stats-&gt;rs_rssi;</div><div class='add'>+		antdiv-&gt;antdiv_lastbtsf[curcfg] = ath9k_hw_gettsf64(sc-&gt;sc_ah);</div><div class='add'>+		curtsf = antdiv-&gt;antdiv_lastbtsf[curcfg];</div><div class='add'>+	} else {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (antdiv-&gt;antdiv_state) {</div><div class='add'>+	case ATH_ANT_DIV_IDLE:</div><div class='add'>+		if ((antdiv-&gt;antdiv_lastbrssi[curcfg] &lt;</div><div class='add'>+		     antdiv-&gt;antdivf_rssitrig)</div><div class='add'>+		    &amp;&amp; ((curtsf - antdiv-&gt;antdiv_laststatetsf) &gt;</div><div class='add'>+			ATH_ANT_DIV_MIN_IDLE_US)) {</div><div class='add'>+</div><div class='add'>+			curcfg++;</div><div class='add'>+			if (curcfg == antdiv-&gt;antdiv_num_antcfg)</div><div class='add'>+				curcfg = 0;</div><div class='add'>+</div><div class='add'>+			if (!ath9k_hw_select_antconfig(ah, curcfg)) {</div><div class='add'>+				antdiv-&gt;antdiv_bestcfg = antdiv-&gt;antdiv_curcfg;</div><div class='add'>+				antdiv-&gt;antdiv_curcfg = curcfg;</div><div class='add'>+				antdiv-&gt;antdiv_laststatetsf = curtsf;</div><div class='add'>+				antdiv-&gt;antdiv_state = ATH_ANT_DIV_SCAN;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ATH_ANT_DIV_SCAN:</div><div class='add'>+		if ((curtsf - antdiv-&gt;antdiv_laststatetsf) &lt;</div><div class='add'>+		    ATH_ANT_DIV_MIN_SCAN_US)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		curcfg++;</div><div class='add'>+		if (curcfg == antdiv-&gt;antdiv_num_antcfg)</div><div class='add'>+			curcfg = 0;</div><div class='add'>+</div><div class='add'>+		if (curcfg == antdiv-&gt;antdiv_bestcfg) {</div><div class='add'>+			ath_find_max_val(antdiv-&gt;antdiv_lastbrssi,</div><div class='add'>+				   antdiv-&gt;antdiv_num_antcfg, &amp;bestcfg);</div><div class='add'>+			if (!ath9k_hw_select_antconfig(ah, bestcfg)) {</div><div class='add'>+				antdiv-&gt;antdiv_bestcfg = bestcfg;</div><div class='add'>+				antdiv-&gt;antdiv_curcfg = bestcfg;</div><div class='add'>+				antdiv-&gt;antdiv_laststatetsf = curtsf;</div><div class='add'>+				antdiv-&gt;antdiv_state = ATH_ANT_DIV_IDLE;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (!ath9k_hw_select_antconfig(ah, curcfg)) {</div><div class='add'>+				antdiv-&gt;antdiv_curcfg = curcfg;</div><div class='add'>+				antdiv-&gt;antdiv_laststatetsf = curtsf;</div><div class='add'>+				antdiv-&gt;antdiv_state = ATH_ANT_DIV_SCAN;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***********************/</div><div class='add'>+/* Descriptor Handling */</div><div class='add'>+/***********************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Set up DMA descriptors</div><div class='add'>+ *</div><div class='add'>+ *  This function will allocate both the DMA descriptor structure, and the</div><div class='add'>+ *  buffers it contains.  These are used to contain the descriptors used</div><div class='add'>+ *  by the system.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+int ath_descdma_setup(struct ath_softc *sc,</div><div class='add'>+		      struct ath_descdma *dd,</div><div class='add'>+		      struct list_head *head,</div><div class='add'>+		      const char *name,</div><div class='add'>+		      int nbuf,</div><div class='add'>+		      int ndesc)</div><div class='add'>+{</div><div class='add'>+#define	DS2PHYS(_dd, _ds)						\</div><div class='add'>+	((_dd)-&gt;dd_desc_paddr + ((caddr_t)(_ds) - (caddr_t)(_dd)-&gt;dd_desc))</div><div class='add'>+#define ATH_DESC_4KB_BOUND_CHECK(_daddr) ((((_daddr) &amp; 0xFFF) &gt; 0xF7F) ? 1 : 0)</div><div class='add'>+#define ATH_DESC_4KB_BOUND_NUM_SKIPPED(_len) ((_len) / 4096)</div><div class='add'>+</div><div class='add'>+	struct ath_desc *ds;</div><div class='add'>+	struct ath_buf *bf;</div><div class='add'>+	int i, bsize, error;</div><div class='add'>+</div><div class='add'>+	DPRINTF(sc, ATH_DBG_CONFIG, "%s: %s DMA: %u buffers %u desc/buf\n",</div><div class='add'>+		__func__, name, nbuf, ndesc);</div><div class='add'>+</div><div class='add'>+	/* ath_desc must be a multiple of DWORDs */</div><div class='add'>+	if ((sizeof(struct ath_desc) % 4) != 0) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL, "%s: ath_desc not DWORD aligned\n",</div><div class='add'>+			__func__);</div><div class='add'>+		ASSERT((sizeof(struct ath_desc) % 4) == 0);</div><div class='add'>+		error = -ENOMEM;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dd-&gt;dd_name = name;</div><div class='add'>+	dd-&gt;dd_desc_len = sizeof(struct ath_desc) * nbuf * ndesc;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Need additional DMA memory because we can't use</div><div class='add'>+	 * descriptors that cross the 4K page boundary. Assume</div><div class='add'>+	 * one skipped descriptor per 4K page.</div><div class='add'>+	 */</div><div class='add'>+	if (!(sc-&gt;sc_ah-&gt;ah_caps.hw_caps &amp; ATH9K_HW_CAP_4KB_SPLITTRANS)) {</div><div class='add'>+		u32 ndesc_skipped =</div><div class='add'>+			ATH_DESC_4KB_BOUND_NUM_SKIPPED(dd-&gt;dd_desc_len);</div><div class='add'>+		u32 dma_len;</div><div class='add'>+</div><div class='add'>+		while (ndesc_skipped) {</div><div class='add'>+			dma_len = ndesc_skipped * sizeof(struct ath_desc);</div><div class='add'>+			dd-&gt;dd_desc_len += dma_len;</div><div class='add'>+</div><div class='add'>+			ndesc_skipped = ATH_DESC_4KB_BOUND_NUM_SKIPPED(dma_len);</div><div class='add'>+		};</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* allocate descriptors */</div><div class='add'>+	dd-&gt;dd_desc = pci_alloc_consistent(sc-&gt;pdev,</div><div class='add'>+			      dd-&gt;dd_desc_len,</div><div class='add'>+			      &amp;dd-&gt;dd_desc_paddr);</div><div class='add'>+	if (dd-&gt;dd_desc == NULL) {</div><div class='add'>+		error = -ENOMEM;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	ds = dd-&gt;dd_desc;</div><div class='add'>+	DPRINTF(sc, ATH_DBG_CONFIG, "%s: %s DMA map: %p (%u) -&gt; %llx (%u)\n",</div><div class='add'>+		__func__, dd-&gt;dd_name, ds, (u32) dd-&gt;dd_desc_len,</div><div class='add'>+		ito64(dd-&gt;dd_desc_paddr), /*XXX*/(u32) dd-&gt;dd_desc_len);</div><div class='add'>+</div><div class='add'>+	/* allocate buffers */</div><div class='add'>+	bsize = sizeof(struct ath_buf) * nbuf;</div><div class='add'>+	bf = kmalloc(bsize, GFP_KERNEL);</div><div class='add'>+	if (bf == NULL) {</div><div class='add'>+		error = -ENOMEM;</div><div class='add'>+		goto fail2;</div><div class='add'>+	}</div><div class='add'>+	memzero(bf, bsize);</div><div class='add'>+	dd-&gt;dd_bufptr = bf;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(head);</div><div class='add'>+	for (i = 0; i &lt; nbuf; i++, bf++, ds += ndesc) {</div><div class='add'>+		bf-&gt;bf_desc = ds;</div><div class='add'>+		bf-&gt;bf_daddr = DS2PHYS(dd, ds);</div><div class='add'>+</div><div class='add'>+		if (!(sc-&gt;sc_ah-&gt;ah_caps.hw_caps &amp;</div><div class='add'>+		      ATH9K_HW_CAP_4KB_SPLITTRANS)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Skip descriptor addresses which can cause 4KB</div><div class='add'>+			 * boundary crossing (addr + length) with a 32 dword</div><div class='add'>+			 * descriptor fetch.</div><div class='add'>+			 */</div><div class='add'>+			while (ATH_DESC_4KB_BOUND_CHECK(bf-&gt;bf_daddr)) {</div><div class='add'>+				ASSERT((caddr_t) bf-&gt;bf_desc &lt;</div><div class='add'>+				       ((caddr_t) dd-&gt;dd_desc +</div><div class='add'>+					dd-&gt;dd_desc_len));</div><div class='add'>+</div><div class='add'>+				ds += ndesc;</div><div class='add'>+				bf-&gt;bf_desc = ds;</div><div class='add'>+				bf-&gt;bf_daddr = DS2PHYS(dd, ds);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		list_add_tail(&amp;bf-&gt;list, head);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+fail2:</div><div class='add'>+	pci_free_consistent(sc-&gt;pdev,</div><div class='add'>+		dd-&gt;dd_desc_len, dd-&gt;dd_desc, dd-&gt;dd_desc_paddr);</div><div class='add'>+fail:</div><div class='add'>+	memzero(dd, sizeof(*dd));</div><div class='add'>+	return error;</div><div class='add'>+#undef ATH_DESC_4KB_BOUND_CHECK</div><div class='add'>+#undef ATH_DESC_4KB_BOUND_NUM_SKIPPED</div><div class='add'>+#undef DS2PHYS</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Cleanup DMA descriptors</div><div class='add'>+ *</div><div class='add'>+ *  This function will free the DMA block that was allocated for the descriptor</div><div class='add'>+ *  pool.  Since this was allocated as one "chunk", it is freed in the same</div><div class='add'>+ *  manner.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+void ath_descdma_cleanup(struct ath_softc *sc,</div><div class='add'>+			 struct ath_descdma *dd,</div><div class='add'>+			 struct list_head *head)</div><div class='add'>+{</div><div class='add'>+	/* Free memory associated with descriptors */</div><div class='add'>+	pci_free_consistent(sc-&gt;pdev,</div><div class='add'>+		dd-&gt;dd_desc_len, dd-&gt;dd_desc, dd-&gt;dd_desc_paddr);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(head);</div><div class='add'>+	kfree(dd-&gt;dd_bufptr);</div><div class='add'>+	memzero(dd, sizeof(*dd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*************/</div><div class='add'>+/* Utilities */</div><div class='add'>+/*************/</div><div class='add'>+</div><div class='add'>+void ath_internal_reset(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	ath_reset_start(sc, 0);</div><div class='add'>+	ath_reset(sc);</div><div class='add'>+	ath_reset_end(sc, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath_get_hal_qnum(u16 queue, struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	int qnum;</div><div class='add'>+</div><div class='add'>+	switch (queue) {</div><div class='add'>+	case 0:</div><div class='add'>+		qnum = sc-&gt;sc_haltype2q[ATH9K_WME_AC_VO];</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		qnum = sc-&gt;sc_haltype2q[ATH9K_WME_AC_VI];</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		qnum = sc-&gt;sc_haltype2q[ATH9K_WME_AC_BE];</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		qnum = sc-&gt;sc_haltype2q[ATH9K_WME_AC_BK];</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		qnum = sc-&gt;sc_haltype2q[ATH9K_WME_AC_BE];</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return qnum;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath_get_mac80211_qnum(u32 queue, struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	int qnum;</div><div class='add'>+</div><div class='add'>+	switch (queue) {</div><div class='add'>+	case ATH9K_WME_AC_VO:</div><div class='add'>+		qnum = 0;</div><div class='add'>+		break;</div><div class='add'>+	case ATH9K_WME_AC_VI:</div><div class='add'>+		qnum = 1;</div><div class='add'>+		break;</div><div class='add'>+	case ATH9K_WME_AC_BE:</div><div class='add'>+		qnum = 2;</div><div class='add'>+		break;</div><div class='add'>+	case ATH9K_WME_AC_BK:</div><div class='add'>+		qnum = 3;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		qnum = -1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return qnum;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Expand time stamp to TSF</div><div class='add'>+ *</div><div class='add'>+ *  Extend 15-bit time stamp from rx descriptor to</div><div class='add'>+ *  a full 64-bit TSF using the current h/w TSF.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+u64 ath_extend_tsf(struct ath_softc *sc, u32 rstamp)</div><div class='add'>+{</div><div class='add'>+	u64 tsf;</div><div class='add'>+</div><div class='add'>+	tsf = ath9k_hw_gettsf64(sc-&gt;sc_ah);</div><div class='add'>+	if ((tsf &amp; 0x7fff) &lt; rstamp)</div><div class='add'>+		tsf -= 0x8000;</div><div class='add'>+	return (tsf &amp; ~0x7fff) | rstamp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Set Default Antenna</div><div class='add'>+ *</div><div class='add'>+ *  Call into the HAL to set the default antenna to use.  Not really valid for</div><div class='add'>+ *  MIMO technology.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+void ath_setdefantenna(void *context, u32 antenna)</div><div class='add'>+{</div><div class='add'>+	struct ath_softc *sc = (struct ath_softc *)context;</div><div class='add'>+	struct ath_hal *ah = sc-&gt;sc_ah;</div><div class='add'>+</div><div class='add'>+	/* XXX block beacon interrupts */</div><div class='add'>+	ath9k_hw_setantenna(ah, antenna);</div><div class='add'>+	sc-&gt;sc_defant = antenna;</div><div class='add'>+	sc-&gt;sc_rxotherant = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set Slot Time</div><div class='add'>+ *</div><div class='add'>+ * This will wake up the chip if required, and set the slot time for the</div><div class='add'>+ * frame (maximum transmit time).  Slot time is assumed to be already set</div><div class='add'>+ * in the ATH object member sc_slottime</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+void ath_setslottime(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	ath9k_hw_setslottime(sc-&gt;sc_ah, sc-&gt;sc_slottime);</div><div class='add'>+	sc-&gt;sc_updateslot = OK;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/core.h b/drivers/net/wireless/ath9k/core.h<br/>new file mode 100644<br/>index 000000000000..4ee695b76b88<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath9k/core.h?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/core.h</a></div><div class='hunk'>@@ -0,0 +1,1073 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2008 Atheros Communications Inc.</div><div class='add'>+ *</div><div class='add'>+ * Permission to use, copy, modify, and/or distribute this software for any</div><div class='add'>+ * purpose with or without fee is hereby granted, provided that the above</div><div class='add'>+ * copyright notice and this permission notice appear in all copies.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='add'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='add'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='add'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='add'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef CORE_H</div><div class='add'>+#define CORE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/autoconf.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ath9k.h"</div><div class='add'>+#include "rc.h"</div><div class='add'>+</div><div class='add'>+struct ath_node;</div><div class='add'>+</div><div class='add'>+/******************/</div><div class='add'>+/* Utility macros */</div><div class='add'>+/******************/</div><div class='add'>+</div><div class='add'>+/* Macro to expand scalars to 64-bit objects */</div><div class='add'>+</div><div class='add'>+#define	ito64(x) (sizeof(x) == 8) ?			\</div><div class='add'>+	(((unsigned long long int)(x)) &amp; (0xff)) :	\</div><div class='add'>+	(sizeof(x) == 16) ?				\</div><div class='add'>+	(((unsigned long long int)(x)) &amp; 0xffff) :	\</div><div class='add'>+	((sizeof(x) == 32) ?				\</div><div class='add'>+	 (((unsigned long long int)(x)) &amp; 0xffffffff) : \</div><div class='add'>+	 (unsigned long long int)(x))</div><div class='add'>+</div><div class='add'>+/* increment with wrap-around */</div><div class='add'>+#define INCR(_l, _sz)   do {			\</div><div class='add'>+		(_l)++;				\</div><div class='add'>+		(_l) &amp;= ((_sz) - 1);		\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/* decrement with wrap-around */</div><div class='add'>+#define DECR(_l,  _sz)  do {			\</div><div class='add'>+		(_l)--;				\</div><div class='add'>+		(_l) &amp;= ((_sz) - 1);		\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define A_MAX(a, b) ((a) &gt; (b) ? (a) : (b))</div><div class='add'>+</div><div class='add'>+#define ASSERT(exp) do {			\</div><div class='add'>+		if (unlikely(!(exp))) {		\</div><div class='add'>+			BUG();			\</div><div class='add'>+		}				\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/* XXX: remove */</div><div class='add'>+#define memzero(_buf, _len) memset(_buf, 0, _len)</div><div class='add'>+</div><div class='add'>+#define get_dma_mem_context(var, field) (&amp;((var)-&gt;field))</div><div class='add'>+#define copy_dma_mem_context(dst, src)  (*dst = *src)</div><div class='add'>+</div><div class='add'>+#define ATH9K_BH_STATUS_INTACT		0</div><div class='add'>+#define ATH9K_BH_STATUS_CHANGE		1</div><div class='add'>+</div><div class='add'>+#define	ATH_TXQ_SETUP(sc, i)        ((sc)-&gt;sc_txqsetup &amp; (1&lt;&lt;i))</div><div class='add'>+</div><div class='add'>+static inline unsigned long get_timestamp(void)</div><div class='add'>+{</div><div class='add'>+	return ((jiffies / HZ) * 1000) + (jiffies % HZ) * (1000 / HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*************/</div><div class='add'>+/* Debugging */</div><div class='add'>+/*************/</div><div class='add'>+</div><div class='add'>+enum ATH_DEBUG {</div><div class='add'>+	ATH_DBG_RESET		= 0x00000001,</div><div class='add'>+	ATH_DBG_PHY_IO		= 0x00000002,</div><div class='add'>+	ATH_DBG_REG_IO		= 0x00000004,</div><div class='add'>+	ATH_DBG_QUEUE		= 0x00000008,</div><div class='add'>+	ATH_DBG_EEPROM		= 0x00000010,</div><div class='add'>+	ATH_DBG_NF_CAL		= 0x00000020,</div><div class='add'>+	ATH_DBG_CALIBRATE	= 0x00000040,</div><div class='add'>+	ATH_DBG_CHANNEL		= 0x00000080,</div><div class='add'>+	ATH_DBG_INTERRUPT	= 0x00000100,</div><div class='add'>+	ATH_DBG_REGULATORY	= 0x00000200,</div><div class='add'>+	ATH_DBG_ANI		= 0x00000400,</div><div class='add'>+	ATH_DBG_POWER_MGMT	= 0x00000800,</div><div class='add'>+	ATH_DBG_XMIT		= 0x00001000,</div><div class='add'>+	ATH_DBG_BEACON		= 0x00002000,</div><div class='add'>+	ATH_DBG_RATE		= 0x00004000,</div><div class='add'>+	ATH_DBG_CONFIG		= 0x00008000,</div><div class='add'>+	ATH_DBG_KEYCACHE	= 0x00010000,</div><div class='add'>+	ATH_DBG_AGGR		= 0x00020000,</div><div class='add'>+	ATH_DBG_FATAL		= 0x00040000,</div><div class='add'>+	ATH_DBG_ANY		= 0xffffffff</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DBG_DEFAULT (ATH_DBG_FATAL)</div><div class='add'>+</div><div class='add'>+#define	DPRINTF(sc, _m, _fmt, ...) do {			\</div><div class='add'>+		if (sc-&gt;sc_debug &amp; (_m))                \</div><div class='add'>+			printk(_fmt , ##__VA_ARGS__);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/***************************/</div><div class='add'>+/* Load-time Configuration */</div><div class='add'>+/***************************/</div><div class='add'>+</div><div class='add'>+/* Per-instance load-time (note: NOT run-time) configurations</div><div class='add'>+ * for Atheros Device */</div><div class='add'>+struct ath_config {</div><div class='add'>+	u32 ath_aggr_prot;</div><div class='add'>+	u16 txpowlimit;</div><div class='add'>+	u16 txpowlimit_override;</div><div class='add'>+	u8 cabqReadytime; /* Cabq Readytime % */</div><div class='add'>+	u8 swBeaconProcess; /* Process received beacons in SW (vs HW) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/***********************/</div><div class='add'>+/* Chainmask Selection */</div><div class='add'>+/***********************/</div><div class='add'>+</div><div class='add'>+#define ATH_CHAINMASK_SEL_TIMEOUT	   6000</div><div class='add'>+/* Default - Number of last RSSI values that is used for</div><div class='add'>+ * chainmask selection */</div><div class='add'>+#define ATH_CHAINMASK_SEL_RSSI_CNT	   10</div><div class='add'>+/* Means use 3x3 chainmask instead of configured chainmask */</div><div class='add'>+#define ATH_CHAINMASK_SEL_3X3		   7</div><div class='add'>+/* Default - Rssi threshold below which we have to switch to 3x3 */</div><div class='add'>+#define ATH_CHAINMASK_SEL_UP_RSSI_THRES	   20</div><div class='add'>+/* Default - Rssi threshold above which we have to switch to</div><div class='add'>+ * user configured values */</div><div class='add'>+#define ATH_CHAINMASK_SEL_DOWN_RSSI_THRES  35</div><div class='add'>+/* Struct to store the chainmask select related info */</div><div class='add'>+struct ath_chainmask_sel {</div><div class='add'>+	struct timer_list timer;</div><div class='add'>+	int cur_tx_mask; 	/* user configured or 3x3 */</div><div class='add'>+	int cur_rx_mask; 	/* user configured or 3x3 */</div><div class='add'>+	int tx_avgrssi;</div><div class='add'>+	u8 switch_allowed:1, 	/* timer will set this */</div><div class='add'>+	   cm_sel_enabled : 1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ath_chainmask_sel_logic(struct ath_softc *sc, struct ath_node *an);</div><div class='add'>+void ath_update_chainmask(struct ath_softc *sc, int is_ht);</div><div class='add'>+</div><div class='add'>+/*************************/</div><div class='add'>+/* Descriptor Management */</div><div class='add'>+/*************************/</div><div class='add'>+</div><div class='add'>+/* Number of descriptors per buffer. The only case where we see skbuff</div><div class='add'>+chains is due to FF aggregation in the driver. */</div><div class='add'>+#define	ATH_TXDESC	    1</div><div class='add'>+/* if there's more fragment for this MSDU */</div><div class='add'>+#define ATH_BF_MORE_MPDU    1</div><div class='add'>+#define ATH_TXBUF_RESET(_bf) do {				\</div><div class='add'>+		(_bf)-&gt;bf_status = 0;				\</div><div class='add'>+		(_bf)-&gt;bf_lastbf = NULL;			\</div><div class='add'>+		(_bf)-&gt;bf_lastfrm = NULL;			\</div><div class='add'>+		(_bf)-&gt;bf_next = NULL;				\</div><div class='add'>+		memzero(&amp;((_bf)-&gt;bf_state),			\</div><div class='add'>+			    sizeof(struct ath_buf_state));	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+struct ath_buf_state {</div><div class='add'>+	int bfs_nframes;	/* # frames in aggregate */</div><div class='add'>+	u16 bfs_al;		/* length of aggregate */</div><div class='add'>+	u16 bfs_frmlen;		/* length of frame */</div><div class='add'>+	int bfs_seqno;		/* sequence number */</div><div class='add'>+	int bfs_tidno;		/* tid of this frame */</div><div class='add'>+	int bfs_retries;	/* current retries */</div><div class='add'>+	struct ath_rc_series bfs_rcs[4];	/* rate series */</div><div class='add'>+	u8 bfs_isdata:1;	/* is a data frame/aggregate */</div><div class='add'>+	u8 bfs_isaggr:1;	/* is an aggregate */</div><div class='add'>+	u8 bfs_isampdu:1;	/* is an a-mpdu, aggregate or not */</div><div class='add'>+	u8 bfs_ht:1;		/* is an HT frame */</div><div class='add'>+	u8 bfs_isretried:1;	/* is retried */</div><div class='add'>+	u8 bfs_isxretried:1;	/* is excessive retried */</div><div class='add'>+	u8 bfs_shpreamble:1;	/* is short preamble */</div><div class='add'>+	u8 bfs_isbar:1;		/* is a BAR */</div><div class='add'>+	u8 bfs_ispspoll:1;	/* is a PS-Poll */</div><div class='add'>+	u8 bfs_aggrburst:1;	/* is a aggr burst */</div><div class='add'>+	u8 bfs_calcairtime:1;	/* requests airtime be calculated</div><div class='add'>+				when set for tx frame */</div><div class='add'>+	int bfs_rifsburst_elem;	/* RIFS burst/bar */</div><div class='add'>+	int bfs_nrifsubframes;	/* # of elements in burst */</div><div class='add'>+	/* key type use to encrypt this frame */</div><div class='add'>+	enum ath9k_key_type bfs_keytype;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define bf_nframes      	bf_state.bfs_nframes</div><div class='add'>+#define bf_al           	bf_state.bfs_al</div><div class='add'>+#define bf_frmlen       	bf_state.bfs_frmlen</div><div class='add'>+#define bf_retries      	bf_state.bfs_retries</div><div class='add'>+#define bf_seqno        	bf_state.bfs_seqno</div><div class='add'>+#define bf_tidno        	bf_state.bfs_tidno</div><div class='add'>+#define bf_rcs          	bf_state.bfs_rcs</div><div class='add'>+#define bf_isdata       	bf_state.bfs_isdata</div><div class='add'>+#define bf_isaggr       	bf_state.bfs_isaggr</div><div class='add'>+#define bf_isampdu      	bf_state.bfs_isampdu</div><div class='add'>+#define bf_ht           	bf_state.bfs_ht</div><div class='add'>+#define bf_isretried    	bf_state.bfs_isretried</div><div class='add'>+#define bf_isxretried   	bf_state.bfs_isxretried</div><div class='add'>+#define bf_shpreamble   	bf_state.bfs_shpreamble</div><div class='add'>+#define bf_rifsburst_elem  	bf_state.bfs_rifsburst_elem</div><div class='add'>+#define bf_nrifsubframes  	bf_state.bfs_nrifsubframes</div><div class='add'>+#define bf_keytype      	bf_state.bfs_keytype</div><div class='add'>+#define bf_isbar        	bf_state.bfs_isbar</div><div class='add'>+#define bf_ispspoll     	bf_state.bfs_ispspoll</div><div class='add'>+#define bf_aggrburst    	bf_state.bfs_aggrburst</div><div class='add'>+#define bf_calcairtime  	bf_state.bfs_calcairtime</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Abstraction of a contiguous buffer to transmit/receive.  There is only</div><div class='add'>+ * a single hw descriptor encapsulated here.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct ath_buf {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct list_head *last;</div><div class='add'>+	struct ath_buf *bf_lastbf;	/* last buf of this unit (a frame or</div><div class='add'>+					   an aggregate) */</div><div class='add'>+	struct ath_buf *bf_lastfrm;	/* last buf of this frame */</div><div class='add'>+	struct ath_buf *bf_next;	/* next subframe in the aggregate */</div><div class='add'>+	struct ath_buf *bf_rifslast;	/* last buf for RIFS burst */</div><div class='add'>+	void *bf_mpdu;			/* enclosing frame structure */</div><div class='add'>+	void *bf_node;			/* pointer to the node */</div><div class='add'>+	struct ath_desc *bf_desc;	/* virtual addr of desc */</div><div class='add'>+	dma_addr_t bf_daddr;		/* physical addr of desc */</div><div class='add'>+	dma_addr_t bf_buf_addr;		/* physical addr of data buffer */</div><div class='add'>+	u32 bf_status;</div><div class='add'>+	u16 bf_flags;			/* tx descriptor flags */</div><div class='add'>+	struct ath_buf_state bf_state;	/* buffer state */</div><div class='add'>+	dma_addr_t bf_dmacontext;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * reset the rx buffer.</div><div class='add'>+ * any new fields added to the athbuf and require</div><div class='add'>+ * reset need to be added to this macro.</div><div class='add'>+ * currently bf_status is the only one requires that</div><div class='add'>+ * requires reset.</div><div class='add'>+ */</div><div class='add'>+#define ATH_RXBUF_RESET(_bf)    ((_bf)-&gt;bf_status = 0)</div><div class='add'>+</div><div class='add'>+/* hw processing complete, desc processed by hal */</div><div class='add'>+#define ATH_BUFSTATUS_DONE      0x00000001</div><div class='add'>+/* hw processing complete, desc hold for hw */</div><div class='add'>+#define ATH_BUFSTATUS_STALE     0x00000002</div><div class='add'>+/* Rx-only: OS is done with this packet and it's ok to queued it to hw */</div><div class='add'>+#define ATH_BUFSTATUS_FREE      0x00000004</div><div class='add'>+</div><div class='add'>+/* DMA state for tx/rx descriptors */</div><div class='add'>+</div><div class='add'>+struct ath_descdma {</div><div class='add'>+	const char *dd_name;</div><div class='add'>+	struct ath_desc *dd_desc;	/* descriptors  */</div><div class='add'>+	dma_addr_t dd_desc_paddr;	/* physical addr of dd_desc  */</div><div class='add'>+	u32 dd_desc_len;		/* size of dd_desc  */</div><div class='add'>+	struct ath_buf *dd_bufptr;	/* associated buffers */</div><div class='add'>+	dma_addr_t dd_dmacontext;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Abstraction of a received RX MPDU/MMPDU, or a RX fragment */</div><div class='add'>+</div><div class='add'>+struct ath_rx_context {</div><div class='add'>+	struct ath_buf *ctx_rxbuf;	/* associated ath_buf for rx */</div><div class='add'>+};</div><div class='add'>+#define ATH_RX_CONTEXT(skb) ((struct ath_rx_context *)skb-&gt;cb)</div><div class='add'>+</div><div class='add'>+int ath_descdma_setup(struct ath_softc *sc,</div><div class='add'>+		      struct ath_descdma *dd,</div><div class='add'>+		      struct list_head *head,</div><div class='add'>+		      const char *name,</div><div class='add'>+		      int nbuf,</div><div class='add'>+		      int ndesc);</div><div class='add'>+int ath_desc_alloc(struct ath_softc *sc);</div><div class='add'>+void ath_desc_free(struct ath_softc *sc);</div><div class='add'>+void ath_descdma_cleanup(struct ath_softc *sc,</div><div class='add'>+			 struct ath_descdma *dd,</div><div class='add'>+			 struct list_head *head);</div><div class='add'>+</div><div class='add'>+/******/</div><div class='add'>+/* RX */</div><div class='add'>+/******/</div><div class='add'>+</div><div class='add'>+#define ATH_MAX_ANTENNA          3</div><div class='add'>+#define ATH_RXBUF                512</div><div class='add'>+#define ATH_RX_TIMEOUT           40      /* 40 milliseconds */</div><div class='add'>+#define WME_NUM_TID              16</div><div class='add'>+#define IEEE80211_BAR_CTL_TID_M  0xF000  /* tid mask */</div><div class='add'>+#define IEEE80211_BAR_CTL_TID_S  2       /* tid shift */</div><div class='add'>+</div><div class='add'>+enum ATH_RX_TYPE {</div><div class='add'>+	ATH_RX_NON_CONSUMED = 0,</div><div class='add'>+	ATH_RX_CONSUMED</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* per frame rx status block */</div><div class='add'>+struct ath_recv_status {</div><div class='add'>+	u64 tsf;		/* mac tsf */</div><div class='add'>+	int8_t rssi;		/* RSSI (noise floor ajusted) */</div><div class='add'>+	int8_t rssictl[ATH_MAX_ANTENNA];	/* RSSI (noise floor ajusted) */</div><div class='add'>+	int8_t rssiextn[ATH_MAX_ANTENNA];	/* RSSI (noise floor ajusted) */</div><div class='add'>+	int8_t abs_rssi;	/* absolute RSSI */</div><div class='add'>+	u8 rateieee;		/* data rate received (IEEE rate code) */</div><div class='add'>+	u8 ratecode;		/* phy rate code */</div><div class='add'>+	int rateKbps;		/* data rate received (Kbps) */</div><div class='add'>+	int antenna;		/* rx antenna */</div><div class='add'>+	int flags;		/* status of associated skb */</div><div class='add'>+#define ATH_RX_FCS_ERROR        0x01</div><div class='add'>+#define ATH_RX_MIC_ERROR        0x02</div><div class='add'>+#define ATH_RX_DECRYPT_ERROR    0x04</div><div class='add'>+#define ATH_RX_RSSI_VALID       0x08</div><div class='add'>+/* if any of ctl,extn chainrssis are valid */</div><div class='add'>+#define ATH_RX_CHAIN_RSSI_VALID 0x10</div><div class='add'>+/* if extn chain rssis are valid */</div><div class='add'>+#define ATH_RX_RSSI_EXTN_VALID  0x20</div><div class='add'>+/* set if 40Mhz, clear if 20Mhz */</div><div class='add'>+#define ATH_RX_40MHZ            0x40</div><div class='add'>+/* set if short GI, clear if full GI */</div><div class='add'>+#define ATH_RX_SHORT_GI         0x80</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath_rxbuf {</div><div class='add'>+	struct sk_buff *rx_wbuf;</div><div class='add'>+	unsigned long rx_time;			/* system time when received */</div><div class='add'>+	struct ath_recv_status rx_status;	/* cached rx status */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Per-TID aggregate receiver state for a node */</div><div class='add'>+struct ath_arx_tid {</div><div class='add'>+	struct ath_node *an;</div><div class='add'>+	struct ath_rxbuf *rxbuf;	/* re-ordering buffer */</div><div class='add'>+	struct timer_list timer;</div><div class='add'>+	spinlock_t tidlock;</div><div class='add'>+	int baw_head;			/* seq_next at head */</div><div class='add'>+	int baw_tail;			/* tail of block-ack window */</div><div class='add'>+	int seq_reset;			/* need to reset start sequence */</div><div class='add'>+	int addba_exchangecomplete;</div><div class='add'>+	u16 seq_next;			/* next expected sequence */</div><div class='add'>+	u16 baw_size;			/* block-ack window size */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Per-node receiver aggregate state */</div><div class='add'>+struct ath_arx {</div><div class='add'>+	struct ath_arx_tid tid[WME_NUM_TID];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ath_startrecv(struct ath_softc *sc);</div><div class='add'>+bool ath_stoprecv(struct ath_softc *sc);</div><div class='add'>+void ath_flushrecv(struct ath_softc *sc);</div><div class='add'>+u32 ath_calcrxfilter(struct ath_softc *sc);</div><div class='add'>+void ath_rx_node_init(struct ath_softc *sc, struct ath_node *an);</div><div class='add'>+void ath_rx_node_free(struct ath_softc *sc, struct ath_node *an);</div><div class='add'>+void ath_rx_node_cleanup(struct ath_softc *sc, struct ath_node *an);</div><div class='add'>+void ath_handle_rx_intr(struct ath_softc *sc);</div><div class='add'>+int ath_rx_init(struct ath_softc *sc, int nbufs);</div><div class='add'>+void ath_rx_cleanup(struct ath_softc *sc);</div><div class='add'>+int ath_rx_tasklet(struct ath_softc *sc, int flush);</div><div class='add'>+int ath_rx_input(struct ath_softc *sc,</div><div class='add'>+		 struct ath_node *node,</div><div class='add'>+		 int is_ampdu,</div><div class='add'>+		 struct sk_buff *skb,</div><div class='add'>+		 struct ath_recv_status *rx_status,</div><div class='add'>+		 enum ATH_RX_TYPE *status);</div><div class='add'>+int ath__rx_indicate(struct ath_softc *sc,</div><div class='add'>+		    struct sk_buff *skb,</div><div class='add'>+		    struct ath_recv_status *status,</div><div class='add'>+		    u16 keyix);</div><div class='add'>+int ath_rx_subframe(struct ath_node *an, struct sk_buff *skb,</div><div class='add'>+		    struct ath_recv_status *status);</div><div class='add'>+</div><div class='add'>+/******/</div><div class='add'>+/* TX */</div><div class='add'>+/******/</div><div class='add'>+</div><div class='add'>+#define ATH_FRAG_PER_MSDU       1</div><div class='add'>+#define ATH_TXBUF               (512/ATH_FRAG_PER_MSDU)</div><div class='add'>+/* max number of transmit attempts (tries) */</div><div class='add'>+#define ATH_TXMAXTRY            13</div><div class='add'>+/* max number of 11n transmit attempts (tries) */</div><div class='add'>+#define ATH_11N_TXMAXTRY        10</div><div class='add'>+/* max number of tries for management and control frames */</div><div class='add'>+#define ATH_MGT_TXMAXTRY        4</div><div class='add'>+#define WME_BA_BMP_SIZE         64</div><div class='add'>+#define WME_MAX_BA              WME_BA_BMP_SIZE</div><div class='add'>+#define ATH_TID_MAX_BUFS        (2 * WME_MAX_BA)</div><div class='add'>+#define TID_TO_WME_AC(_tid)				\</div><div class='add'>+	((((_tid) == 0) || ((_tid) == 3)) ? WME_AC_BE :	\</div><div class='add'>+	 (((_tid) == 1) || ((_tid) == 2)) ? WME_AC_BK :	\</div><div class='add'>+	 (((_tid) == 4) || ((_tid) == 5)) ? WME_AC_VI :	\</div><div class='add'>+	 WME_AC_VO)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Wireless Multimedia Extension Defines */</div><div class='add'>+#define WME_AC_BE               0 /* best effort */</div><div class='add'>+#define WME_AC_BK               1 /* background */</div><div class='add'>+#define WME_AC_VI               2 /* video */</div><div class='add'>+#define WME_AC_VO               3 /* voice */</div><div class='add'>+#define WME_NUM_AC              4</div><div class='add'>+</div><div class='add'>+enum ATH_SM_PWRSAV{</div><div class='add'>+	ATH_SM_ENABLE,</div><div class='add'>+	ATH_SM_PWRSAV_STATIC,</div><div class='add'>+	ATH_SM_PWRSAV_DYNAMIC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Data transmit queue state.  One of these exists for each</div><div class='add'>+ * hardware transmit queue.  Packets sent to us from above</div><div class='add'>+ * are assigned to queues based on their priority.  Not all</div><div class='add'>+ * devices support a complete set of hardware transmit queues.</div><div class='add'>+ * For those devices the array sc_ac2q will map multiple</div><div class='add'>+ * priorities to fewer hardware queues (typically all to one</div><div class='add'>+ * hardware queue).</div><div class='add'>+ */</div><div class='add'>+struct ath_txq {</div><div class='add'>+	u32 axq_qnum;			/* hardware q number */</div><div class='add'>+	u32 *axq_link;			/* link ptr in last TX desc */</div><div class='add'>+	struct list_head axq_q;		/* transmit queue */</div><div class='add'>+	spinlock_t axq_lock;</div><div class='add'>+	unsigned long axq_lockflags;	/* intr state when must cli */</div><div class='add'>+	u32 axq_depth;			/* queue depth */</div><div class='add'>+	u8 axq_aggr_depth;		/* aggregates queued */</div><div class='add'>+	u32 axq_totalqueued;		/* total ever queued */</div><div class='add'>+</div><div class='add'>+	/* count to determine if descriptor should generate int on this txq. */</div><div class='add'>+	u32 axq_intrcnt;</div><div class='add'>+</div><div class='add'>+	bool stopped;			/* Is mac80211 queue stopped ? */</div><div class='add'>+	struct ath_buf *axq_linkbuf;	/* virtual addr of last buffer*/</div><div class='add'>+</div><div class='add'>+	/* first desc of the last descriptor that contains CTS */</div><div class='add'>+	struct ath_desc *axq_lastdsWithCTS;</div><div class='add'>+</div><div class='add'>+	/* final desc of the gating desc that determines whether</div><div class='add'>+	   lastdsWithCTS has been DMA'ed or not */</div><div class='add'>+	struct ath_desc *axq_gatingds;</div><div class='add'>+</div><div class='add'>+	struct list_head axq_acq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* per TID aggregate tx state for a destination */</div><div class='add'>+struct ath_atx_tid {</div><div class='add'>+	struct list_head list;		/* round-robin tid entry */</div><div class='add'>+	struct list_head buf_q;		/* pending buffers */</div><div class='add'>+	struct ath_node *an;</div><div class='add'>+	struct ath_atx_ac *ac;</div><div class='add'>+	struct ath_buf *tx_buf[ATH_TID_MAX_BUFS]; /* active tx frames */</div><div class='add'>+	u16 seq_start;</div><div class='add'>+	u16 seq_next;</div><div class='add'>+	u16 baw_size;</div><div class='add'>+	int tidno;</div><div class='add'>+	int baw_head;			/* first un-acked tx buffer */</div><div class='add'>+	int baw_tail;			/* next unused tx buffer slot */</div><div class='add'>+	int sched;</div><div class='add'>+	int paused;</div><div class='add'>+	int cleanup_inprogress;</div><div class='add'>+	u32 addba_exchangecomplete:1;</div><div class='add'>+	int32_t addba_exchangeinprogress;</div><div class='add'>+	int addba_exchangeattempts;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* per access-category aggregate tx state for a destination */</div><div class='add'>+struct ath_atx_ac {</div><div class='add'>+	int sched;			/* dest-ac is scheduled */</div><div class='add'>+	int qnum;			/* H/W queue number associated</div><div class='add'>+					   with this AC */</div><div class='add'>+	struct list_head list;		/* round-robin txq entry */</div><div class='add'>+	struct list_head tid_q;		/* queue of TIDs with buffers */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* per dest tx state */</div><div class='add'>+struct ath_atx {</div><div class='add'>+	struct ath_atx_tid tid[WME_NUM_TID];</div><div class='add'>+	struct ath_atx_ac ac[WME_NUM_AC];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* per-frame tx control block */</div><div class='add'>+struct ath_tx_control {</div><div class='add'>+	struct ath_node *an;</div><div class='add'>+	int if_id;</div><div class='add'>+	int qnum;</div><div class='add'>+	u32 ht:1;</div><div class='add'>+	u32 ps:1;</div><div class='add'>+	u32 use_minrate:1;</div><div class='add'>+	enum ath9k_pkt_type atype;</div><div class='add'>+	enum ath9k_key_type keytype;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u16 seqno;</div><div class='add'>+	u16 tidno;</div><div class='add'>+	u16 txpower;</div><div class='add'>+	u16 frmlen;</div><div class='add'>+	u32 keyix;</div><div class='add'>+	int min_rate;</div><div class='add'>+	int mcast_rate;</div><div class='add'>+	u16 nextfraglen;</div><div class='add'>+	struct ath_softc *dev;</div><div class='add'>+	dma_addr_t dmacontext;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* per frame tx status block */</div><div class='add'>+struct ath_xmit_status {</div><div class='add'>+	int retries;	/* number of retries to successufully</div><div class='add'>+			   transmit this frame */</div><div class='add'>+	int flags;	/* status of transmit */</div><div class='add'>+#define ATH_TX_ERROR        0x01</div><div class='add'>+#define ATH_TX_XRETRY       0x02</div><div class='add'>+#define ATH_TX_BAR          0x04</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath_tx_stat {</div><div class='add'>+	int rssi;		/* RSSI (noise floor ajusted) */</div><div class='add'>+	int rssictl[ATH_MAX_ANTENNA];	/* RSSI (noise floor ajusted) */</div><div class='add'>+	int rssiextn[ATH_MAX_ANTENNA];	/* RSSI (noise floor ajusted) */</div><div class='add'>+	int rateieee;		/* data rate xmitted (IEEE rate code) */</div><div class='add'>+	int rateKbps;		/* data rate xmitted (Kbps) */</div><div class='add'>+	int ratecode;		/* phy rate code */</div><div class='add'>+	int flags;		/* validity flags */</div><div class='add'>+/* if any of ctl,extn chain rssis are valid */</div><div class='add'>+#define ATH_TX_CHAIN_RSSI_VALID 0x01</div><div class='add'>+/* if extn chain rssis are valid */</div><div class='add'>+#define ATH_TX_RSSI_EXTN_VALID  0x02</div><div class='add'>+	u32 airtime;	/* time on air per final tx rate */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype);</div><div class='add'>+void ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq);</div><div class='add'>+int ath_tx_setup(struct ath_softc *sc, int haltype);</div><div class='add'>+void ath_draintxq(struct ath_softc *sc, bool retry_tx);</div><div class='add'>+void ath_tx_draintxq(struct ath_softc *sc,</div><div class='add'>+	struct ath_txq *txq, bool retry_tx);</div><div class='add'>+void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an);</div><div class='add'>+void ath_tx_node_cleanup(struct ath_softc *sc,</div><div class='add'>+	struct ath_node *an, bool bh_flag);</div><div class='add'>+void ath_tx_node_free(struct ath_softc *sc, struct ath_node *an);</div><div class='add'>+void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq);</div><div class='add'>+int ath_tx_init(struct ath_softc *sc, int nbufs);</div><div class='add'>+int ath_tx_cleanup(struct ath_softc *sc);</div><div class='add'>+int ath_tx_get_qnum(struct ath_softc *sc, int qtype, int haltype);</div><div class='add'>+int ath_txq_update(struct ath_softc *sc, int qnum,</div><div class='add'>+		   struct ath9k_tx_queue_info *q);</div><div class='add'>+int ath_tx_start(struct ath_softc *sc, struct sk_buff *skb);</div><div class='add'>+void ath_tx_tasklet(struct ath_softc *sc);</div><div class='add'>+u32 ath_txq_depth(struct ath_softc *sc, int qnum);</div><div class='add'>+u32 ath_txq_aggr_depth(struct ath_softc *sc, int qnum);</div><div class='add'>+void ath_notify_txq_status(struct ath_softc *sc, u16 queue_depth);</div><div class='add'>+void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,</div><div class='add'>+		     struct ath_xmit_status *tx_status, struct ath_node *an);</div><div class='add'>+</div><div class='add'>+/**********************/</div><div class='add'>+/* Node / Aggregation */</div><div class='add'>+/**********************/</div><div class='add'>+</div><div class='add'>+/* indicates the node is clened up */</div><div class='add'>+#define ATH_NODE_CLEAN          0x1</div><div class='add'>+/* indicates the node is 80211 power save */</div><div class='add'>+#define ATH_NODE_PWRSAVE        0x2</div><div class='add'>+</div><div class='add'>+#define ADDBA_TIMEOUT              200 /* 200 milliseconds */</div><div class='add'>+#define ADDBA_EXCHANGE_ATTEMPTS    10</div><div class='add'>+#define ATH_AGGR_DELIM_SZ          4   /* delimiter size   */</div><div class='add'>+#define ATH_AGGR_MINPLEN           256 /* in bytes, minimum packet length */</div><div class='add'>+/* number of delimiters for encryption padding */</div><div class='add'>+#define ATH_AGGR_ENCRYPTDELIM      10</div><div class='add'>+/* minimum h/w qdepth to be sustained to maximize aggregation */</div><div class='add'>+#define ATH_AGGR_MIN_QDEPTH        2</div><div class='add'>+#define ATH_AMPDU_SUBFRAME_DEFAULT 32</div><div class='add'>+#define IEEE80211_SEQ_SEQ_SHIFT    4</div><div class='add'>+#define IEEE80211_SEQ_MAX          4096</div><div class='add'>+#define IEEE80211_MIN_AMPDU_BUF    0x8</div><div class='add'>+</div><div class='add'>+/* return whether a bit at index _n in bitmap _bm is set</div><div class='add'>+ * _sz is the size of the bitmap  */</div><div class='add'>+#define ATH_BA_ISSET(_bm, _n)  (((_n) &lt; (WME_BA_BMP_SIZE)) &amp;&amp;		\</div><div class='add'>+				((_bm)[(_n) &gt;&gt; 5] &amp; (1 &lt;&lt; ((_n) &amp; 31))))</div><div class='add'>+</div><div class='add'>+/* return block-ack bitmap index given sequence and starting sequence */</div><div class='add'>+#define ATH_BA_INDEX(_st, _seq) (((_seq) - (_st)) &amp; (IEEE80211_SEQ_MAX - 1))</div><div class='add'>+</div><div class='add'>+/* returns delimiter padding required given the packet length */</div><div class='add'>+#define ATH_AGGR_GET_NDELIM(_len)					\</div><div class='add'>+	(((((_len) + ATH_AGGR_DELIM_SZ) &lt; ATH_AGGR_MINPLEN) ?           \</div><div class='add'>+	  (ATH_AGGR_MINPLEN - (_len) - ATH_AGGR_DELIM_SZ) : 0) &gt;&gt; 2)</div><div class='add'>+</div><div class='add'>+#define BAW_WITHIN(_start, _bawsz, _seqno) \</div><div class='add'>+	((((_seqno) - (_start)) &amp; 4095) &lt; (_bawsz))</div><div class='add'>+</div><div class='add'>+#define ATH_DS_BA_SEQ(_ds)               ((_ds)-&gt;ds_us.tx.ts_seqnum)</div><div class='add'>+#define ATH_DS_BA_BITMAP(_ds)            (&amp;(_ds)-&gt;ds_us.tx.ba_low)</div><div class='add'>+#define ATH_DS_TX_BA(_ds)	((_ds)-&gt;ds_us.tx.ts_flags &amp; ATH9K_TX_BA)</div><div class='add'>+#define ATH_AN_2_TID(_an, _tidno)        (&amp;(_an)-&gt;an_aggr.tx.tid[(_tidno)])</div><div class='add'>+</div><div class='add'>+enum ATH_AGGR_STATUS {</div><div class='add'>+	ATH_AGGR_DONE,</div><div class='add'>+	ATH_AGGR_BAW_CLOSED,</div><div class='add'>+	ATH_AGGR_LIMITED,</div><div class='add'>+	ATH_AGGR_SHORTPKT,</div><div class='add'>+	ATH_AGGR_8K_LIMITED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ATH_AGGR_CHECK {</div><div class='add'>+	AGGR_NOT_REQUIRED,</div><div class='add'>+	AGGR_REQUIRED,</div><div class='add'>+	AGGR_CLEANUP_PROGRESS,</div><div class='add'>+	AGGR_EXCHANGE_PROGRESS,</div><div class='add'>+	AGGR_EXCHANGE_DONE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct aggr_rifs_param {</div><div class='add'>+	int param_max_frames;</div><div class='add'>+	int param_max_len;</div><div class='add'>+	int param_rl;</div><div class='add'>+	int param_al;</div><div class='add'>+	struct ath_rc_series *param_rcs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Per-node aggregation state */</div><div class='add'>+struct ath_node_aggr {</div><div class='add'>+	struct ath_atx tx;	/* node transmit state */</div><div class='add'>+	struct ath_arx rx;	/* node receive state */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* driver-specific node state */</div><div class='add'>+struct ath_node {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct ath_softc *an_sc;</div><div class='add'>+	atomic_t an_refcnt;</div><div class='add'>+	struct ath_chainmask_sel an_chainmask_sel;</div><div class='add'>+	struct ath_node_aggr an_aggr;</div><div class='add'>+	u8 an_smmode; /* SM Power save mode */</div><div class='add'>+	u8 an_flags;</div><div class='add'>+	u8 an_addr[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath_tx_resume_tid(struct ath_softc *sc,</div><div class='add'>+	struct ath_atx_tid *tid);</div><div class='add'>+enum ATH_AGGR_CHECK ath_tx_aggr_check(struct ath_softc *sc,</div><div class='add'>+	struct ath_node *an, u8 tidno);</div><div class='add'>+void ath_tx_aggr_teardown(struct ath_softc *sc,</div><div class='add'>+	struct ath_node *an, u8 tidno);</div><div class='add'>+void ath_rx_aggr_teardown(struct ath_softc *sc,</div><div class='add'>+	struct ath_node *an, u8 tidno);</div><div class='add'>+int ath_rx_aggr_start(struct ath_softc *sc,</div><div class='add'>+		      const u8 *addr,</div><div class='add'>+		      u16 tid,</div><div class='add'>+		      u16 *ssn);</div><div class='add'>+int ath_rx_aggr_stop(struct ath_softc *sc,</div><div class='add'>+		     const u8 *addr,</div><div class='add'>+		     u16 tid);</div><div class='add'>+int ath_tx_aggr_start(struct ath_softc *sc,</div><div class='add'>+		      const u8 *addr,</div><div class='add'>+		      u16 tid,</div><div class='add'>+		      u16 *ssn);</div><div class='add'>+int ath_tx_aggr_stop(struct ath_softc *sc,</div><div class='add'>+		     const u8 *addr,</div><div class='add'>+		     u16 tid);</div><div class='add'>+void ath_newassoc(struct ath_softc *sc,</div><div class='add'>+	struct ath_node *node, int isnew, int isuapsd);</div><div class='add'>+struct ath_node *ath_node_attach(struct ath_softc *sc,</div><div class='add'>+	u8 addr[ETH_ALEN], int if_id);</div><div class='add'>+void ath_node_detach(struct ath_softc *sc, struct ath_node *an, bool bh_flag);</div><div class='add'>+struct ath_node *ath_node_get(struct ath_softc *sc, u8 addr[ETH_ALEN]);</div><div class='add'>+void ath_node_put(struct ath_softc *sc, struct ath_node *an, bool bh_flag);</div><div class='add'>+struct ath_node *ath_node_find(struct ath_softc *sc, u8 *addr);</div><div class='add'>+</div><div class='add'>+/*******************/</div><div class='add'>+/* Beacon Handling */</div><div class='add'>+/*******************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Regardless of the number of beacons we stagger, (i.e. regardless of the</div><div class='add'>+ * number of BSSIDs) if a given beacon does not go out even after waiting this</div><div class='add'>+ * number of beacon intervals, the game's up.</div><div class='add'>+ */</div><div class='add'>+#define BSTUCK_THRESH           	(9 * ATH_BCBUF)</div><div class='add'>+#define	ATH_BCBUF               	4   /* number of beacon buffers */</div><div class='add'>+#define ATH_DEFAULT_BINTVAL     	100 /* default beacon interval in TU */</div><div class='add'>+#define ATH_DEFAULT_BMISS_LIMIT 	10</div><div class='add'>+#define	ATH_BEACON_AIFS_DEFAULT		0  /* Default aifs for ap beacon q */</div><div class='add'>+#define	ATH_BEACON_CWMIN_DEFAULT	0  /* Default cwmin for ap beacon q */</div><div class='add'>+#define	ATH_BEACON_CWMAX_DEFAULT	0  /* Default cwmax for ap beacon q */</div><div class='add'>+#define IEEE80211_MS_TO_TU(x)           (((x) * 1000) / 1024)</div><div class='add'>+</div><div class='add'>+/* beacon configuration */</div><div class='add'>+struct ath_beacon_config {</div><div class='add'>+	u16 beacon_interval;</div><div class='add'>+	u16 listen_interval;</div><div class='add'>+	u16 dtim_period;</div><div class='add'>+	u16 bmiss_timeout;</div><div class='add'>+	u8 dtim_count;</div><div class='add'>+	u8 tim_offset;</div><div class='add'>+	union {</div><div class='add'>+		u64 last_tsf;</div><div class='add'>+		u8 last_tstamp[8];</div><div class='add'>+	} u; /* last received beacon/probe response timestamp of this BSS. */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* offsets in a beacon frame for</div><div class='add'>+ * quick acess of beacon content by low-level driver */</div><div class='add'>+struct ath_beacon_offset {</div><div class='add'>+	u8 *bo_tim;	/* start of atim/dtim */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath9k_beacon_tasklet(unsigned long data);</div><div class='add'>+void ath_beacon_config(struct ath_softc *sc, int if_id);</div><div class='add'>+int ath_beaconq_setup(struct ath_hal *ah);</div><div class='add'>+int ath_beacon_alloc(struct ath_softc *sc, int if_id);</div><div class='add'>+void ath_bstuck_process(struct ath_softc *sc);</div><div class='add'>+void ath_beacon_tasklet(struct ath_softc *sc, int *needmark);</div><div class='add'>+void ath_beacon_free(struct ath_softc *sc);</div><div class='add'>+void ath_beacon_return(struct ath_softc *sc, struct ath_vap *avp);</div><div class='add'>+void ath_beacon_sync(struct ath_softc *sc, int if_id);</div><div class='add'>+void ath_update_beacon_info(struct ath_softc *sc, int avgbrssi);</div><div class='add'>+void ath_get_beaconconfig(struct ath_softc *sc,</div><div class='add'>+			  int if_id,</div><div class='add'>+			  struct ath_beacon_config *conf);</div><div class='add'>+int ath_update_beacon(struct ath_softc *sc,</div><div class='add'>+		      int if_id,</div><div class='add'>+		      struct ath_beacon_offset *bo,</div><div class='add'>+		      struct sk_buff *skb,</div><div class='add'>+		      int mcast);</div><div class='add'>+/********/</div><div class='add'>+/* VAPs */</div><div class='add'>+/********/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define the scheme that we select MAC address for multiple</div><div class='add'>+ * BSS on the same radio. The very first VAP will just use the MAC</div><div class='add'>+ * address from the EEPROM. For the next 3 VAPs, we set the</div><div class='add'>+ * U/L bit (bit 1) in MAC address, and use the next two bits as the</div><div class='add'>+ * index of the VAP.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define ATH_SET_VAP_BSSID_MASK(bssid_mask) \</div><div class='add'>+	((bssid_mask)[0] &amp;= ~(((ATH_BCBUF-1)&lt;&lt;2)|0x02))</div><div class='add'>+</div><div class='add'>+/* VAP configuration (from protocol layer) */</div><div class='add'>+struct ath_vap_config {</div><div class='add'>+	u32 av_fixed_rateset;</div><div class='add'>+	u32 av_fixed_retryset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* driver-specific vap state */</div><div class='add'>+struct ath_vap {</div><div class='add'>+	struct ieee80211_vif *av_if_data;</div><div class='add'>+	enum ath9k_opmode av_opmode;	/* VAP operational mode */</div><div class='add'>+	struct ath_buf *av_bcbuf;	/* beacon buffer */</div><div class='add'>+	struct ath_beacon_offset av_boff; /* dynamic update state */</div><div class='add'>+	struct ath_tx_control av_btxctl;  /* txctl information for beacon */</div><div class='add'>+	int av_bslot;			/* beacon slot index */</div><div class='add'>+	struct ath_txq av_mcastq;	/* multicast transmit queue */</div><div class='add'>+	struct ath_vap_config av_config;/* vap configuration parameters*/</div><div class='add'>+	struct ath_rate_node *rc_node;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ath_vap_attach(struct ath_softc *sc,</div><div class='add'>+		   int if_id,</div><div class='add'>+		   struct ieee80211_vif *if_data,</div><div class='add'>+		   enum ath9k_opmode opmode);</div><div class='add'>+int ath_vap_detach(struct ath_softc *sc, int if_id);</div><div class='add'>+int ath_vap_config(struct ath_softc *sc,</div><div class='add'>+	int if_id, struct ath_vap_config *if_config);</div><div class='add'>+int ath_vap_listen(struct ath_softc *sc, int if_id);</div><div class='add'>+</div><div class='add'>+/*********************/</div><div class='add'>+/* Antenna diversity */</div><div class='add'>+/*********************/</div><div class='add'>+</div><div class='add'>+#define ATH_ANT_DIV_MAX_CFG      2</div><div class='add'>+#define ATH_ANT_DIV_MIN_IDLE_US  1000000  /* us */</div><div class='add'>+#define ATH_ANT_DIV_MIN_SCAN_US  50000	  /* us */</div><div class='add'>+</div><div class='add'>+enum ATH_ANT_DIV_STATE{</div><div class='add'>+	ATH_ANT_DIV_IDLE,</div><div class='add'>+	ATH_ANT_DIV_SCAN,	/* evaluating antenna */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath_antdiv {</div><div class='add'>+	struct ath_softc *antdiv_sc;</div><div class='add'>+	u8 antdiv_start;</div><div class='add'>+	enum ATH_ANT_DIV_STATE antdiv_state;</div><div class='add'>+	u8 antdiv_num_antcfg;</div><div class='add'>+	u8 antdiv_curcfg;</div><div class='add'>+	u8 antdiv_bestcfg;</div><div class='add'>+	int32_t antdivf_rssitrig;</div><div class='add'>+	int32_t antdiv_lastbrssi[ATH_ANT_DIV_MAX_CFG];</div><div class='add'>+	u64 antdiv_lastbtsf[ATH_ANT_DIV_MAX_CFG];</div><div class='add'>+	u64 antdiv_laststatetsf;</div><div class='add'>+	u8 antdiv_bssid[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath_slow_ant_div_init(struct ath_antdiv *antdiv,</div><div class='add'>+	struct ath_softc *sc, int32_t rssitrig);</div><div class='add'>+void ath_slow_ant_div_start(struct ath_antdiv *antdiv,</div><div class='add'>+			    u8 num_antcfg,</div><div class='add'>+			    const u8 *bssid);</div><div class='add'>+void ath_slow_ant_div_stop(struct ath_antdiv *antdiv);</div><div class='add'>+void ath_slow_ant_div(struct ath_antdiv *antdiv,</div><div class='add'>+		      struct ieee80211_hdr *wh,</div><div class='add'>+		      struct ath_rx_status *rx_stats);</div><div class='add'>+void ath_setdefantenna(void *sc, u32 antenna);</div><div class='add'>+</div><div class='add'>+/********************/</div><div class='add'>+/* Main driver core */</div><div class='add'>+/********************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Default cache line size, in bytes.</div><div class='add'>+ * Used when PCI device not fully initialized by bootrom/BIOS</div><div class='add'>+*/</div><div class='add'>+#define DEFAULT_CACHELINE       32</div><div class='add'>+#define	ATH_DEFAULT_NOISE_FLOOR -95</div><div class='add'>+#define ATH_REGCLASSIDS_MAX     10</div><div class='add'>+#define ATH_CABQ_READY_TIME     80  /* % of beacon interval */</div><div class='add'>+#define ATH_PREAMBLE_SHORT	(1&lt;&lt;0)</div><div class='add'>+#define ATH_PROTECT_ENABLE	(1&lt;&lt;1)</div><div class='add'>+#define ATH_MAX_SW_RETRIES      10</div><div class='add'>+/* Num farmes difference in tx to flip default recv */</div><div class='add'>+#define	ATH_ANTENNA_DIFF	2</div><div class='add'>+#define ATH_CHAN_MAX            255</div><div class='add'>+#define IEEE80211_WEP_NKID      4       /* number of key ids */</div><div class='add'>+#define IEEE80211_RATE_VAL      0x7f</div><div class='add'>+/*</div><div class='add'>+ * The key cache is used for h/w cipher state and also for</div><div class='add'>+ * tracking station state such as the current tx antenna.</div><div class='add'>+ * We also setup a mapping table between key cache slot indices</div><div class='add'>+ * and station state to short-circuit node lookups on rx.</div><div class='add'>+ * Different parts have different size key caches.  We handle</div><div class='add'>+ * up to ATH_KEYMAX entries (could dynamically allocate state).</div><div class='add'>+ */</div><div class='add'>+#define	ATH_KEYMAX	        128        /* max key cache size we handle */</div><div class='add'>+</div><div class='add'>+#define RESET_RETRY_TXQ         0x00000001</div><div class='add'>+#define ATH_IF_ID_ANY   	0xff</div><div class='add'>+</div><div class='add'>+#define ATH_TXPOWER_MAX         100     /* .5 dBm units */</div><div class='add'>+</div><div class='add'>+#define RSSI_LPF_THRESHOLD         -20</div><div class='add'>+#define ATH_RSSI_EP_MULTIPLIER     (1&lt;&lt;7)  /* pow2 to optimize out * and / */</div><div class='add'>+#define ATH_RATE_DUMMY_MARKER      0</div><div class='add'>+#define ATH_RSSI_LPF_LEN           10</div><div class='add'>+#define ATH_RSSI_DUMMY_MARKER      0x127</div><div class='add'>+</div><div class='add'>+#define ATH_EP_MUL(x, mul)         ((x) * (mul))</div><div class='add'>+#define ATH_EP_RND(x, mul)						\</div><div class='add'>+	((((x)%(mul)) &gt;= ((mul)/2)) ? ((x) + ((mul) - 1)) / (mul) : (x)/(mul))</div><div class='add'>+#define ATH_RSSI_OUT(x)							\</div><div class='add'>+	(((x) != ATH_RSSI_DUMMY_MARKER) ?				\</div><div class='add'>+	 (ATH_EP_RND((x), ATH_RSSI_EP_MULTIPLIER)) : ATH_RSSI_DUMMY_MARKER)</div><div class='add'>+#define ATH_RSSI_IN(x)					\</div><div class='add'>+	(ATH_EP_MUL((x), ATH_RSSI_EP_MULTIPLIER))</div><div class='add'>+#define ATH_LPF_RSSI(x, y, len)						\</div><div class='add'>+	((x != ATH_RSSI_DUMMY_MARKER) ? \</div><div class='add'>+		(((x) * ((len) - 1) + (y)) / (len)) : (y))</div><div class='add'>+#define ATH_RSSI_LPF(x, y) do {						\</div><div class='add'>+		if ((y) &gt;= RSSI_LPF_THRESHOLD)				\</div><div class='add'>+			x = ATH_LPF_RSSI((x), \</div><div class='add'>+				ATH_RSSI_IN((y)), ATH_RSSI_LPF_LEN); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+enum PROT_MODE {</div><div class='add'>+	PROT_M_NONE = 0,</div><div class='add'>+	PROT_M_RTSCTS,</div><div class='add'>+	PROT_M_CTSONLY</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum RATE_TYPE {</div><div class='add'>+	NORMAL_RATE = 0,</div><div class='add'>+	HALF_RATE,</div><div class='add'>+	QUARTER_RATE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath_ht_info {</div><div class='add'>+	enum ath9k_ht_macmode tx_chan_width;</div><div class='add'>+	u16 maxampdu;</div><div class='add'>+	u8 mpdudensity;</div><div class='add'>+	u8 ext_chan_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath_softc {</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	void __iomem *mem;</div><div class='add'>+	struct tasklet_struct intr_tq;</div><div class='add'>+	struct tasklet_struct bcon_tasklet;</div><div class='add'>+	struct ath_config sc_config;	/* load-time parameters */</div><div class='add'>+	int sc_debug;</div><div class='add'>+	struct ath_hal *sc_ah;</div><div class='add'>+	struct ath_rate_softc *sc_rc;	/* tx rate control support */</div><div class='add'>+	u32 sc_intrstatus;</div><div class='add'>+	enum ath9k_opmode sc_opmode;	/* current operating mode */</div><div class='add'>+</div><div class='add'>+	u8 sc_invalid;			/* being detached */</div><div class='add'>+	u8 sc_beacons;			/* beacons running */</div><div class='add'>+	u8 sc_scanning;			/* scanning active */</div><div class='add'>+	u8 sc_txaggr;			/* enable 11n tx aggregation */</div><div class='add'>+	u8 sc_rxaggr;			/* enable 11n rx aggregation */</div><div class='add'>+	u8 sc_update_chainmask;		/* change chain mask */</div><div class='add'>+	u8 sc_full_reset;		/* force full reset */</div><div class='add'>+	enum wireless_mode sc_curmode;	/* current phy mode */</div><div class='add'>+	u16 sc_curtxpow;</div><div class='add'>+	u16 sc_curaid;</div><div class='add'>+	u8 sc_curbssid[ETH_ALEN];</div><div class='add'>+	u8 sc_myaddr[ETH_ALEN];</div><div class='add'>+	enum PROT_MODE sc_protmode;</div><div class='add'>+	u8 sc_mcastantenna;</div><div class='add'>+	u8 sc_txantenna;		/* data tx antenna (fixed or auto) */</div><div class='add'>+	u8 sc_nbcnvaps;			/* # of vaps sending beacons */</div><div class='add'>+	u16 sc_nvaps;			/* # of active virtual ap's */</div><div class='add'>+	struct ath_vap *sc_vaps[ATH_BCBUF];</div><div class='add'>+	enum ath9k_int sc_imask;</div><div class='add'>+	u8 sc_bssidmask[ETH_ALEN];</div><div class='add'>+	u8 sc_defant;			/* current default antenna */</div><div class='add'>+	u8 sc_rxotherant;		/* rx's on non-default antenna */</div><div class='add'>+	u16 sc_cachelsz;</div><div class='add'>+	int sc_slotupdate;		/* slot to next advance fsm */</div><div class='add'>+	int sc_slottime;</div><div class='add'>+	u8 sc_noreset;</div><div class='add'>+	int sc_bslot[ATH_BCBUF];</div><div class='add'>+	struct ath9k_node_stats sc_halstats; /* station-mode rssi stats */</div><div class='add'>+	struct list_head node_list;</div><div class='add'>+	struct ath_ht_info sc_ht_info;</div><div class='add'>+	int16_t sc_noise_floor;		/* signal noise floor in dBm */</div><div class='add'>+	enum ath9k_ht_extprotspacing sc_ht_extprotspacing;</div><div class='add'>+	u8 sc_tx_chainmask;</div><div class='add'>+	u8 sc_rx_chainmask;</div><div class='add'>+	u8 sc_rxchaindetect_ref;</div><div class='add'>+	u8 sc_rxchaindetect_thresh5GHz;</div><div class='add'>+	u8 sc_rxchaindetect_thresh2GHz;</div><div class='add'>+	u8 sc_rxchaindetect_delta5GHz;</div><div class='add'>+	u8 sc_rxchaindetect_delta2GHz;</div><div class='add'>+	u32 sc_rtsaggrlimit;		/* Chipset specific aggr limit */</div><div class='add'>+	u32 sc_flags;</div><div class='add'>+#ifdef CONFIG_SLOW_ANT_DIV</div><div class='add'>+	struct ath_antdiv sc_antdiv;</div><div class='add'>+#endif</div><div class='add'>+	enum {</div><div class='add'>+		OK,		/* no change needed */</div><div class='add'>+		UPDATE,		/* update pending */</div><div class='add'>+		COMMIT		/* beacon sent, commit change */</div><div class='add'>+	} sc_updateslot;	/* slot time update fsm */</div><div class='add'>+</div><div class='add'>+	/* Crypto */</div><div class='add'>+	u32 sc_keymax;		/* size of key cache */</div><div class='add'>+	DECLARE_BITMAP(sc_keymap, ATH_KEYMAX);	/* key use bit map */</div><div class='add'>+	u8 sc_splitmic;		/* split TKIP MIC keys */</div><div class='add'>+	int sc_keytype;</div><div class='add'>+</div><div class='add'>+	/* RX */</div><div class='add'>+	struct list_head sc_rxbuf;</div><div class='add'>+	struct ath_descdma sc_rxdma;</div><div class='add'>+	int sc_rxbufsize;	/* rx size based on mtu */</div><div class='add'>+	u32 *sc_rxlink;		/* link ptr in last RX desc */</div><div class='add'>+	u32 sc_rxflush;		/* rx flush in progress */</div><div class='add'>+	u64 sc_lastrx;		/* tsf of last rx'd frame */</div><div class='add'>+</div><div class='add'>+	/* TX */</div><div class='add'>+	struct list_head sc_txbuf;</div><div class='add'>+	struct ath_txq sc_txq[ATH9K_NUM_TX_QUEUES];</div><div class='add'>+	struct ath_descdma sc_txdma;</div><div class='add'>+	u32 sc_txqsetup;</div><div class='add'>+	u32 sc_txintrperiod;	/* tx interrupt batching */</div><div class='add'>+	int sc_haltype2q[ATH9K_WME_AC_VO+1]; /* HAL WME	AC -&gt; h/w qnum */</div><div class='add'>+	u32 sc_ant_tx[8];	/* recent tx frames/antenna */</div><div class='add'>+	u16 seq_no; /* TX sequence number */</div><div class='add'>+</div><div class='add'>+	/* Beacon */</div><div class='add'>+	struct ath9k_tx_queue_info sc_beacon_qi;</div><div class='add'>+	struct ath_descdma sc_bdma;</div><div class='add'>+	struct ath_txq *sc_cabq;</div><div class='add'>+	struct list_head sc_bbuf;</div><div class='add'>+	u32 sc_bhalq;</div><div class='add'>+	u32 sc_bmisscount;</div><div class='add'>+	u32 ast_be_xmit;	/* beacons transmitted */</div><div class='add'>+</div><div class='add'>+	/* Rate */</div><div class='add'>+	struct ieee80211_rate rates[IEEE80211_NUM_BANDS][ATH_RATE_MAX];</div><div class='add'>+	const struct ath9k_rate_table *sc_currates;</div><div class='add'>+	u8 sc_rixmap[256];	/* IEEE to h/w rate table ix */</div><div class='add'>+	u8 sc_protrix;		/* protection rate index */</div><div class='add'>+	struct {</div><div class='add'>+		u32 rateKbps;	/* transfer rate in kbs */</div><div class='add'>+		u8 ieeerate;	/* IEEE rate */</div><div class='add'>+	} sc_hwmap[256];	/* h/w rate ix mappings */</div><div class='add'>+</div><div class='add'>+	/* Channel, Band */</div><div class='add'>+	struct ieee80211_channel channels[IEEE80211_NUM_BANDS][ATH_CHAN_MAX];</div><div class='add'>+	struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];</div><div class='add'>+	struct ath9k_channel sc_curchan;</div><div class='add'>+</div><div class='add'>+	/* Locks */</div><div class='add'>+	spinlock_t sc_rxflushlock;</div><div class='add'>+	spinlock_t sc_rxbuflock;</div><div class='add'>+	spinlock_t sc_txbuflock;</div><div class='add'>+	spinlock_t sc_resetlock;</div><div class='add'>+	spinlock_t node_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ath_init(u16 devid, struct ath_softc *sc);</div><div class='add'>+void ath_deinit(struct ath_softc *sc);</div><div class='add'>+int ath_open(struct ath_softc *sc, struct ath9k_channel *initial_chan);</div><div class='add'>+int ath_suspend(struct ath_softc *sc);</div><div class='add'>+irqreturn_t ath_isr(int irq, void *dev);</div><div class='add'>+int ath_reset(struct ath_softc *sc);</div><div class='add'>+void ath_scan_start(struct ath_softc *sc);</div><div class='add'>+void ath_scan_end(struct ath_softc *sc);</div><div class='add'>+int ath_set_channel(struct ath_softc *sc, struct ath9k_channel *hchan);</div><div class='add'>+void ath_setup_rate(struct ath_softc *sc,</div><div class='add'>+		    enum wireless_mode wMode,</div><div class='add'>+		    enum RATE_TYPE type,</div><div class='add'>+		    const struct ath9k_rate_table *rt);</div><div class='add'>+</div><div class='add'>+/*********************/</div><div class='add'>+/* Utility Functions */</div><div class='add'>+/*********************/</div><div class='add'>+</div><div class='add'>+void ath_key_reset(struct ath_softc *sc, u16 keyix, int freeslot);</div><div class='add'>+int ath_keyset(struct ath_softc *sc,</div><div class='add'>+	       u16 keyix,</div><div class='add'>+	       struct ath9k_keyval *hk,</div><div class='add'>+	       const u8 mac[ETH_ALEN]);</div><div class='add'>+int ath_get_hal_qnum(u16 queue, struct ath_softc *sc);</div><div class='add'>+int ath_get_mac80211_qnum(u32 queue, struct ath_softc *sc);</div><div class='add'>+void ath_setslottime(struct ath_softc *sc);</div><div class='add'>+void ath_update_txpow(struct ath_softc *sc);</div><div class='add'>+int ath_cabq_update(struct ath_softc *);</div><div class='add'>+void ath_get_currentCountry(struct ath_softc *sc,</div><div class='add'>+	struct ath9k_country_entry *ctry);</div><div class='add'>+u64 ath_extend_tsf(struct ath_softc *sc, u32 rstamp);</div><div class='add'>+void ath_internal_reset(struct ath_softc *sc);</div><div class='add'>+u32 ath_chan2flags(struct ieee80211_channel *chan, struct ath_softc *sc);</div><div class='add'>+dma_addr_t ath_skb_map_single(struct ath_softc *sc,</div><div class='add'>+			      struct sk_buff *skb,</div><div class='add'>+			      int direction,</div><div class='add'>+			      dma_addr_t *pa);</div><div class='add'>+void ath_skb_unmap_single(struct ath_softc *sc,</div><div class='add'>+			  struct sk_buff *skb,</div><div class='add'>+			  int direction,</div><div class='add'>+			  dma_addr_t *pa);</div><div class='add'>+void ath_mcast_merge(struct ath_softc *sc, u32 mfilt[2]);</div><div class='add'>+enum ath9k_ht_macmode ath_cwm_macmode(struct ath_softc *sc);</div><div class='add'>+</div><div class='add'>+#endif /* CORE_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c<br/>new file mode 100644<br/>index 000000000000..6dbfed0b4149<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath9k/hw.c?id=e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30'>drivers/net/wireless/ath9k/hw.c</a></div><div class='hunk'>@@ -0,0 +1,8575 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2008 Atheros Communications Inc.</div><div class='add'>+ *</div><div class='add'>+ * Permission to use, copy, modify, and/or distribute this software for any</div><div class='add'>+ * purpose with or without fee is hereby granted, provided that the above</div><div class='add'>+ * copyright notice and this permission notice appear in all copies.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='add'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='add'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='add'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='add'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;asm/unaligned.h&gt;</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "hw.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "initvals.h"</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_iqcal_collect(struct ath_hal *ah);</div><div class='add'>+static void ath9k_hw_iqcalibrate(struct ath_hal *ah, u8 numChains);</div><div class='add'>+static void ath9k_hw_adc_gaincal_collect(struct ath_hal *ah);</div><div class='add'>+static void ath9k_hw_adc_gaincal_calibrate(struct ath_hal *ah,</div><div class='add'>+					   u8 numChains);</div><div class='add'>+static void ath9k_hw_adc_dccal_collect(struct ath_hal *ah);</div><div class='add'>+static void ath9k_hw_adc_dccal_calibrate(struct ath_hal *ah,</div><div class='add'>+					 u8 numChains);</div><div class='add'>+</div><div class='add'>+static const u8 CLOCK_RATE[] = { 40, 80, 22, 44, 88, 40 };</div><div class='add'>+static const int16_t NOISE_FLOOR[] = { -96, -93, -98, -96, -93, -96 };</div><div class='add'>+</div><div class='add'>+static const struct hal_percal_data iq_cal_multi_sample = {</div><div class='add'>+	IQ_MISMATCH_CAL,</div><div class='add'>+	MAX_CAL_SAMPLES,</div><div class='add'>+	PER_MIN_LOG_COUNT,</div><div class='add'>+	ath9k_hw_iqcal_collect,</div><div class='add'>+	ath9k_hw_iqcalibrate</div><div class='add'>+};</div><div class='add'>+static const struct hal_percal_data iq_cal_single_sample = {</div><div class='add'>+	IQ_MISMATCH_CAL,</div><div class='add'>+	MIN_CAL_SAMPLES,</div><div class='add'>+	PER_MAX_LOG_COUNT,</div><div class='add'>+	ath9k_hw_iqcal_collect,</div><div class='add'>+	ath9k_hw_iqcalibrate</div><div class='add'>+};</div><div class='add'>+static const struct hal_percal_data adc_gain_cal_multi_sample = {</div><div class='add'>+	ADC_GAIN_CAL,</div><div class='add'>+	MAX_CAL_SAMPLES,</div><div class='add'>+	PER_MIN_LOG_COUNT,</div><div class='add'>+	ath9k_hw_adc_gaincal_collect,</div><div class='add'>+	ath9k_hw_adc_gaincal_calibrate</div><div class='add'>+};</div><div class='add'>+static const struct hal_percal_data adc_gain_cal_single_sample = {</div><div class='add'>+	ADC_GAIN_CAL,</div><div class='add'>+	MIN_CAL_SAMPLES,</div><div class='add'>+	PER_MAX_LOG_COUNT,</div><div class='add'>+	ath9k_hw_adc_gaincal_collect,</div><div class='add'>+	ath9k_hw_adc_gaincal_calibrate</div><div class='add'>+};</div><div class='add'>+static const struct hal_percal_data adc_dc_cal_multi_sample = {</div><div class='add'>+	ADC_DC_CAL,</div><div class='add'>+	MAX_CAL_SAMPLES,</div><div class='add'>+	PER_MIN_LOG_COUNT,</div><div class='add'>+	ath9k_hw_adc_dccal_collect,</div><div class='add'>+	ath9k_hw_adc_dccal_calibrate</div><div class='add'>+};</div><div class='add'>+static const struct hal_percal_data adc_dc_cal_single_sample = {</div><div class='add'>+	ADC_DC_CAL,</div><div class='add'>+	MIN_CAL_SAMPLES,</div><div class='add'>+	PER_MAX_LOG_COUNT,</div><div class='add'>+	ath9k_hw_adc_dccal_collect,</div><div class='add'>+	ath9k_hw_adc_dccal_calibrate</div><div class='add'>+};</div><div class='add'>+static const struct hal_percal_data adc_init_dc_cal = {</div><div class='add'>+	ADC_DC_INIT_CAL,</div><div class='add'>+	MIN_CAL_SAMPLES,</div><div class='add'>+	INIT_LOG_COUNT,</div><div class='add'>+	ath9k_hw_adc_dccal_collect,</div><div class='add'>+	ath9k_hw_adc_dccal_calibrate</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath_hal ar5416hal = {</div><div class='add'>+	AR5416_MAGIC,</div><div class='add'>+	0,</div><div class='add'>+	0,</div><div class='add'>+	NULL,</div><div class='add'>+	NULL,</div><div class='add'>+	CTRY_DEFAULT,</div><div class='add'>+	0,</div><div class='add'>+	0,</div><div class='add'>+	0,</div><div class='add'>+	0,</div><div class='add'>+	0,</div><div class='add'>+	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ath9k_rate_table ar5416_11a_table = {</div><div class='add'>+	8,</div><div class='add'>+	{0},</div><div class='add'>+	{</div><div class='add'>+		{true, PHY_OFDM, 6000, 0x0b, 0x00, (0x80 | 12), 0},</div><div class='add'>+		{true, PHY_OFDM, 9000, 0x0f, 0x00, 18, 0},</div><div class='add'>+		{true, PHY_OFDM, 12000, 0x0a, 0x00, (0x80 | 24), 2},</div><div class='add'>+		{true, PHY_OFDM, 18000, 0x0e, 0x00, 36, 2},</div><div class='add'>+		{true, PHY_OFDM, 24000, 0x09, 0x00, (0x80 | 48), 4},</div><div class='add'>+		{true, PHY_OFDM, 36000, 0x0d, 0x00, 72, 4},</div><div class='add'>+		{true, PHY_OFDM, 48000, 0x08, 0x00, 96, 4},</div><div class='add'>+		{true, PHY_OFDM, 54000, 0x0c, 0x00, 108, 4}</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ath9k_rate_table ar5416_11b_table = {</div><div class='add'>+	4,</div><div class='add'>+	{0},</div><div class='add'>+	{</div><div class='add'>+		{true, PHY_CCK, 1000, 0x1b, 0x00, (0x80 | 2), 0},</div><div class='add'>+		{true, PHY_CCK, 2000, 0x1a, 0x04, (0x80 | 4), 1},</div><div class='add'>+		{true, PHY_CCK, 5500, 0x19, 0x04, (0x80 | 11), 1},</div><div class='add'>+		{true, PHY_CCK, 11000, 0x18, 0x04, (0x80 | 22), 1}</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ath9k_rate_table ar5416_11g_table = {</div><div class='add'>+	12,</div><div class='add'>+	{0},</div><div class='add'>+	{</div><div class='add'>+		{true, PHY_CCK, 1000, 0x1b, 0x00, (0x80 | 2), 0},</div><div class='add'>+		{true, PHY_CCK, 2000, 0x1a, 0x04, (0x80 | 4), 1},</div><div class='add'>+		{true, PHY_CCK, 5500, 0x19, 0x04, (0x80 | 11), 2},</div><div class='add'>+		{true, PHY_CCK, 11000, 0x18, 0x04, (0x80 | 22), 3},</div><div class='add'>+</div><div class='add'>+		{false, PHY_OFDM, 6000, 0x0b, 0x00, 12, 4},</div><div class='add'>+		{false, PHY_OFDM, 9000, 0x0f, 0x00, 18, 4},</div><div class='add'>+		{true, PHY_OFDM, 12000, 0x0a, 0x00, 24, 6},</div><div class='add'>+		{true, PHY_OFDM, 18000, 0x0e, 0x00, 36, 6},</div><div class='add'>+		{true, PHY_OFDM, 24000, 0x09, 0x00, 48, 8},</div><div class='add'>+		{true, PHY_OFDM, 36000, 0x0d, 0x00, 72, 8},</div><div class='add'>+		{true, PHY_OFDM, 48000, 0x08, 0x00, 96, 8},</div><div class='add'>+		{true, PHY_OFDM, 54000, 0x0c, 0x00, 108, 8}</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ath9k_rate_table ar5416_11ng_table = {</div><div class='add'>+	28,</div><div class='add'>+	{0},</div><div class='add'>+	{</div><div class='add'>+		{true, PHY_CCK, 1000, 0x1b, 0x00, (0x80 | 2), 0},</div><div class='add'>+		{true, PHY_CCK, 2000, 0x1a, 0x04, (0x80 | 4), 1},</div><div class='add'>+		{true, PHY_CCK, 5500, 0x19, 0x04, (0x80 | 11), 2},</div><div class='add'>+		{true, PHY_CCK, 11000, 0x18, 0x04, (0x80 | 22), 3},</div><div class='add'>+</div><div class='add'>+		{false, PHY_OFDM, 6000, 0x0b, 0x00, 12, 4},</div><div class='add'>+		{false, PHY_OFDM, 9000, 0x0f, 0x00, 18, 4},</div><div class='add'>+		{true, PHY_OFDM, 12000, 0x0a, 0x00, 24, 6},</div><div class='add'>+		{true, PHY_OFDM, 18000, 0x0e, 0x00, 36, 6},</div><div class='add'>+		{true, PHY_OFDM, 24000, 0x09, 0x00, 48, 8},</div><div class='add'>+		{true, PHY_OFDM, 36000, 0x0d, 0x00, 72, 8},</div><div class='add'>+		{true, PHY_OFDM, 48000, 0x08, 0x00, 96, 8},</div><div class='add'>+		{true, PHY_OFDM, 54000, 0x0c, 0x00, 108, 8},</div><div class='add'>+		{true, PHY_HT, 6500, 0x80, 0x00, 0, 4},</div><div class='add'>+		{true, PHY_HT, 13000, 0x81, 0x00, 1, 6},</div><div class='add'>+		{true, PHY_HT, 19500, 0x82, 0x00, 2, 6},</div><div class='add'>+		{true, PHY_HT, 26000, 0x83, 0x00, 3, 8},</div><div class='add'>+		{true, PHY_HT, 39000, 0x84, 0x00, 4, 8},</div><div class='add'>+		{true, PHY_HT, 52000, 0x85, 0x00, 5, 8},</div><div class='add'>+		{true, PHY_HT, 58500, 0x86, 0x00, 6, 8},</div><div class='add'>+		{true, PHY_HT, 65000, 0x87, 0x00, 7, 8},</div><div class='add'>+		{true, PHY_HT, 13000, 0x88, 0x00, 8, 4},</div><div class='add'>+		{true, PHY_HT, 26000, 0x89, 0x00, 9, 6},</div><div class='add'>+		{true, PHY_HT, 39000, 0x8a, 0x00, 10, 6},</div><div class='add'>+		{true, PHY_HT, 52000, 0x8b, 0x00, 11, 8},</div><div class='add'>+		{true, PHY_HT, 78000, 0x8c, 0x00, 12, 8},</div><div class='add'>+		{true, PHY_HT, 104000, 0x8d, 0x00, 13, 8},</div><div class='add'>+		{true, PHY_HT, 117000, 0x8e, 0x00, 14, 8},</div><div class='add'>+		{true, PHY_HT, 130000, 0x8f, 0x00, 15, 8},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ath9k_rate_table ar5416_11na_table = {</div><div class='add'>+	24,</div><div class='add'>+	{0},</div><div class='add'>+	{</div><div class='add'>+		{true, PHY_OFDM, 6000, 0x0b, 0x00, (0x80 | 12), 0},</div><div class='add'>+		{true, PHY_OFDM, 9000, 0x0f, 0x00, 18, 0},</div><div class='add'>+		{true, PHY_OFDM, 12000, 0x0a, 0x00, (0x80 | 24), 2},</div><div class='add'>+		{true, PHY_OFDM, 18000, 0x0e, 0x00, 36, 2},</div><div class='add'>+		{true, PHY_OFDM, 24000, 0x09, 0x00, (0x80 | 48), 4},</div><div class='add'>+		{true, PHY_OFDM, 36000, 0x0d, 0x00, 72, 4},</div><div class='add'>+		{true, PHY_OFDM, 48000, 0x08, 0x00, 96, 4},</div><div class='add'>+		{true, PHY_OFDM, 54000, 0x0c, 0x00, 108, 4},</div><div class='add'>+		{true, PHY_HT, 6500, 0x80, 0x00, 0, 0},</div><div class='add'>+		{true, PHY_HT, 13000, 0x81, 0x00, 1, 2},</div><div class='add'>+		{true, PHY_HT, 19500, 0x82, 0x00, 2, 2},</div><div class='add'>+		{true, PHY_HT, 26000, 0x83, 0x00, 3, 4},</div><div class='add'>+		{true, PHY_HT, 39000, 0x84, 0x00, 4, 4},</div><div class='add'>+		{true, PHY_HT, 52000, 0x85, 0x00, 5, 4},</div><div class='add'>+		{true, PHY_HT, 58500, 0x86, 0x00, 6, 4},</div><div class='add'>+		{true, PHY_HT, 65000, 0x87, 0x00, 7, 4},</div><div class='add'>+		{true, PHY_HT, 13000, 0x88, 0x00, 8, 0},</div><div class='add'>+		{true, PHY_HT, 26000, 0x89, 0x00, 9, 2},</div><div class='add'>+		{true, PHY_HT, 39000, 0x8a, 0x00, 10, 2},</div><div class='add'>+		{true, PHY_HT, 52000, 0x8b, 0x00, 11, 4},</div><div class='add'>+		{true, PHY_HT, 78000, 0x8c, 0x00, 12, 4},</div><div class='add'>+		{true, PHY_HT, 104000, 0x8d, 0x00, 13, 4},</div><div class='add'>+		{true, PHY_HT, 117000, 0x8e, 0x00, 14, 4},</div><div class='add'>+		{true, PHY_HT, 130000, 0x8f, 0x00, 15, 4},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum wireless_mode ath9k_hw_chan2wmode(struct ath_hal *ah,</div><div class='add'>+				       const struct ath9k_channel *chan)</div><div class='add'>+{</div><div class='add'>+	if (IS_CHAN_CCK(chan))</div><div class='add'>+		return ATH9K_MODE_11A;</div><div class='add'>+	if (IS_CHAN_G(chan))</div><div class='add'>+		return ATH9K_MODE_11G;</div><div class='add'>+	return ATH9K_MODE_11A;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath9k_hw_wait(struct ath_hal *ah,</div><div class='add'>+			  u32 reg,</div><div class='add'>+			  u32 mask,</div><div class='add'>+			  u32 val)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; (AH_TIMEOUT / AH_TIME_QUANTUM); i++) {</div><div class='add'>+		if ((REG_READ(ah, reg) &amp; mask) == val)</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		udelay(AH_TIME_QUANTUM);</div><div class='add'>+	}</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_PHY_IO,</div><div class='add'>+		 "%s: timeout on reg 0x%x: 0x%08x &amp; 0x%08x != 0x%08x\n",</div><div class='add'>+		 __func__, reg, REG_READ(ah, reg), mask, val);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath9k_hw_eeprom_read(struct ath_hal *ah, u32 off,</div><div class='add'>+				 u16 *data)</div><div class='add'>+{</div><div class='add'>+	(void) REG_READ(ah, AR5416_EEPROM_OFFSET + (off &lt;&lt; AR5416_EEPROM_S));</div><div class='add'>+</div><div class='add'>+	if (!ath9k_hw_wait(ah,</div><div class='add'>+			   AR_EEPROM_STATUS_DATA,</div><div class='add'>+			   AR_EEPROM_STATUS_DATA_BUSY |</div><div class='add'>+			   AR_EEPROM_STATUS_DATA_PROT_ACCESS, 0)) {</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*data = MS(REG_READ(ah, AR_EEPROM_STATUS_DATA),</div><div class='add'>+		   AR_EEPROM_STATUS_DATA_VAL);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath9k_hw_flash_map(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+</div><div class='add'>+	ahp-&gt;ah_cal_mem = ioremap(AR5416_EEPROM_START_ADDR, AR5416_EEPROM_MAX);</div><div class='add'>+</div><div class='add'>+	if (!ahp-&gt;ah_cal_mem) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_EEPROM,</div><div class='add'>+			 "%s: cannot remap eeprom region \n", __func__);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath9k_hw_flash_read(struct ath_hal *ah, u32 off,</div><div class='add'>+				u16 *data)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+</div><div class='add'>+	*data = ioread16(ahp-&gt;ah_cal_mem + off);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_read_revisions(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = REG_READ(ah, AR_SREV) &amp; AR_SREV_ID;</div><div class='add'>+</div><div class='add'>+	if (val == 0xFF) {</div><div class='add'>+		val = REG_READ(ah, AR_SREV);</div><div class='add'>+</div><div class='add'>+		ah-&gt;ah_macVersion =</div><div class='add'>+			(val &amp; AR_SREV_VERSION2) &gt;&gt; AR_SREV_TYPE2_S;</div><div class='add'>+</div><div class='add'>+		ah-&gt;ah_macRev = MS(val, AR_SREV_REVISION2);</div><div class='add'>+		ah-&gt;ah_isPciExpress =</div><div class='add'>+			(val &amp; AR_SREV_TYPE2_HOST_MODE) ? 0 : 1;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		if (!AR_SREV_9100(ah))</div><div class='add'>+			ah-&gt;ah_macVersion = MS(val, AR_SREV_VERSION);</div><div class='add'>+</div><div class='add'>+		ah-&gt;ah_macRev = val &amp; AR_SREV_REVISION;</div><div class='add'>+</div><div class='add'>+		if (ah-&gt;ah_macVersion == AR_SREV_VERSION_5416_PCIE)</div><div class='add'>+			ah-&gt;ah_isPciExpress = true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ath9k_hw_reverse_bits(u32 val, u32 n)</div><div class='add'>+{</div><div class='add'>+	u32 retval;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0, retval = 0; i &lt; n; i++) {</div><div class='add'>+		retval = (retval &lt;&lt; 1) | (val &amp; 1);</div><div class='add'>+		val &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_set_defaults(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ah-&gt;ah_config.dma_beacon_response_time = 2;</div><div class='add'>+	ah-&gt;ah_config.sw_beacon_response_time = 10;</div><div class='add'>+	ah-&gt;ah_config.additional_swba_backoff = 0;</div><div class='add'>+	ah-&gt;ah_config.ack_6mb = 0x0;</div><div class='add'>+	ah-&gt;ah_config.cwm_ignore_extcca = 0;</div><div class='add'>+	ah-&gt;ah_config.pcie_powersave_enable = 0;</div><div class='add'>+	ah-&gt;ah_config.pcie_l1skp_enable = 0;</div><div class='add'>+	ah-&gt;ah_config.pcie_clock_req = 0;</div><div class='add'>+	ah-&gt;ah_config.pcie_power_reset = 0x100;</div><div class='add'>+	ah-&gt;ah_config.pcie_restore = 0;</div><div class='add'>+	ah-&gt;ah_config.pcie_waen = 0;</div><div class='add'>+	ah-&gt;ah_config.analog_shiftreg = 1;</div><div class='add'>+	ah-&gt;ah_config.ht_enable = 1;</div><div class='add'>+	ah-&gt;ah_config.ofdm_trig_low = 200;</div><div class='add'>+	ah-&gt;ah_config.ofdm_trig_high = 500;</div><div class='add'>+	ah-&gt;ah_config.cck_trig_high = 200;</div><div class='add'>+	ah-&gt;ah_config.cck_trig_low = 100;</div><div class='add'>+	ah-&gt;ah_config.enable_ani = 0;</div><div class='add'>+	ah-&gt;ah_config.noise_immunity_level = 4;</div><div class='add'>+	ah-&gt;ah_config.ofdm_weaksignal_det = 1;</div><div class='add'>+	ah-&gt;ah_config.cck_weaksignal_thr = 0;</div><div class='add'>+	ah-&gt;ah_config.spur_immunity_level = 2;</div><div class='add'>+	ah-&gt;ah_config.firstep_level = 0;</div><div class='add'>+	ah-&gt;ah_config.rssi_thr_high = 40;</div><div class='add'>+	ah-&gt;ah_config.rssi_thr_low = 7;</div><div class='add'>+	ah-&gt;ah_config.diversity_control = 0;</div><div class='add'>+	ah-&gt;ah_config.antenna_switch_swap = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AR_EEPROM_MODAL_SPURS; i++) {</div><div class='add'>+		ah-&gt;ah_config.spurchans[i][0] = AR_NO_SPUR;</div><div class='add'>+		ah-&gt;ah_config.spurchans[i][1] = AR_NO_SPUR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ah-&gt;ah_config.intr_mitigation = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath9k_hw_override_ini(struct ath_hal *ah,</div><div class='add'>+					 struct ath9k_channel *chan)</div><div class='add'>+{</div><div class='add'>+	if (!AR_SREV_5416_V20_OR_LATER(ah)</div><div class='add'>+	    || AR_SREV_9280_10_OR_LATER(ah))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, 0x9800 + (651 &lt;&lt; 2), 0x11);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath9k_hw_init_bb(struct ath_hal *ah,</div><div class='add'>+				    struct ath9k_channel *chan)</div><div class='add'>+{</div><div class='add'>+	u32 synthDelay;</div><div class='add'>+</div><div class='add'>+	synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) &amp; AR_PHY_RX_DELAY_DELAY;</div><div class='add'>+	if (IS_CHAN_CCK(chan))</div><div class='add'>+		synthDelay = (4 * synthDelay) / 22;</div><div class='add'>+	else</div><div class='add'>+		synthDelay /= 10;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);</div><div class='add'>+</div><div class='add'>+	udelay(synthDelay + BASE_ACTIVATE_DELAY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath9k_hw_init_interrupt_masks(struct ath_hal *ah,</div><div class='add'>+						 enum ath9k_opmode opmode)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+</div><div class='add'>+	ahp-&gt;ah_maskReg = AR_IMR_TXERR |</div><div class='add'>+		AR_IMR_TXURN |</div><div class='add'>+		AR_IMR_RXERR |</div><div class='add'>+		AR_IMR_RXORN |</div><div class='add'>+		AR_IMR_BCNMISC;</div><div class='add'>+</div><div class='add'>+	if (ahp-&gt;ah_intrMitigation)</div><div class='add'>+		ahp-&gt;ah_maskReg |= AR_IMR_RXINTM | AR_IMR_RXMINTR;</div><div class='add'>+	else</div><div class='add'>+		ahp-&gt;ah_maskReg |= AR_IMR_RXOK;</div><div class='add'>+</div><div class='add'>+	ahp-&gt;ah_maskReg |= AR_IMR_TXOK;</div><div class='add'>+</div><div class='add'>+	if (opmode == ATH9K_M_HOSTAP)</div><div class='add'>+		ahp-&gt;ah_maskReg |= AR_IMR_MIB;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_IMR, ahp-&gt;ah_maskReg);</div><div class='add'>+	REG_WRITE(ah, AR_IMR_S2, REG_READ(ah, AR_IMR_S2) | AR_IMR_S2_GTT);</div><div class='add'>+</div><div class='add'>+	if (!AR_SREV_9100(ah)) {</div><div class='add'>+		REG_WRITE(ah, AR_INTR_SYNC_CAUSE, 0xFFFFFFFF);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_SYNC_ENABLE, AR_INTR_SYNC_DEFAULT);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_SYNC_MASK, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath9k_hw_init_qos(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	REG_WRITE(ah, AR_MIC_QOS_CONTROL, 0x100aa);</div><div class='add'>+	REG_WRITE(ah, AR_MIC_QOS_SELECT, 0x3210);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_QOS_NO_ACK,</div><div class='add'>+		  SM(2, AR_QOS_NO_ACK_TWO_BIT) |</div><div class='add'>+		  SM(5, AR_QOS_NO_ACK_BIT_OFF) |</div><div class='add'>+		  SM(0, AR_QOS_NO_ACK_BYTE_OFF));</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_TXOP_X, AR_TXOP_X_VAL);</div><div class='add'>+	REG_WRITE(ah, AR_TXOP_0_3, 0xFFFFFFFF);</div><div class='add'>+	REG_WRITE(ah, AR_TXOP_4_7, 0xFFFFFFFF);</div><div class='add'>+	REG_WRITE(ah, AR_TXOP_8_11, 0xFFFFFFFF);</div><div class='add'>+	REG_WRITE(ah, AR_TXOP_12_15, 0xFFFFFFFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_analog_shift_rmw(struct ath_hal *ah,</div><div class='add'>+				      u32 reg,</div><div class='add'>+				      u32 mask,</div><div class='add'>+				      u32 shift,</div><div class='add'>+				      u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 regVal;</div><div class='add'>+</div><div class='add'>+	regVal = REG_READ(ah, reg) &amp; ~mask;</div><div class='add'>+	regVal |= (val &lt;&lt; shift) &amp; mask;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, reg, regVal);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_config.analog_shiftreg)</div><div class='add'>+		udelay(100);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath9k_hw_get_num_ant_config(struct ath_hal_5416 *ahp,</div><div class='add'>+				      enum ieee80211_band freq_band)</div><div class='add'>+{</div><div class='add'>+	struct ar5416_eeprom *eep = &amp;ahp-&gt;ah_eeprom;</div><div class='add'>+	struct modal_eep_header *pModal =</div><div class='add'>+		&amp;(eep-&gt;modalHeader[IEEE80211_BAND_5GHZ == freq_band]);</div><div class='add'>+	struct base_eep_header *pBase = &amp;eep-&gt;baseEepHeader;</div><div class='add'>+	u8 num_ant_config;</div><div class='add'>+</div><div class='add'>+	num_ant_config = 1;</div><div class='add'>+</div><div class='add'>+	if (pBase-&gt;version &gt;= 0x0E0D)</div><div class='add'>+		if (pModal-&gt;useAnt1)</div><div class='add'>+			num_ant_config += 1;</div><div class='add'>+</div><div class='add'>+	return num_ant_config;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath9k_hw_get_eeprom_antenna_cfg(struct ath_hal_5416 *ahp,</div><div class='add'>+				struct ath9k_channel *chan,</div><div class='add'>+				u8 index,</div><div class='add'>+				u16 *config)</div><div class='add'>+{</div><div class='add'>+	struct ar5416_eeprom *eep = &amp;ahp-&gt;ah_eeprom;</div><div class='add'>+	struct modal_eep_header *pModal =</div><div class='add'>+		&amp;(eep-&gt;modalHeader[IS_CHAN_2GHZ(chan)]);</div><div class='add'>+	struct base_eep_header *pBase = &amp;eep-&gt;baseEepHeader;</div><div class='add'>+</div><div class='add'>+	switch (index) {</div><div class='add'>+	case 0:</div><div class='add'>+		*config = pModal-&gt;antCtrlCommon &amp; 0xFFFF;</div><div class='add'>+		return 0;</div><div class='add'>+	case 1:</div><div class='add'>+		if (pBase-&gt;version &gt;= 0x0E0D) {</div><div class='add'>+			if (pModal-&gt;useAnt1) {</div><div class='add'>+				*config =</div><div class='add'>+				((pModal-&gt;antCtrlCommon &amp; 0xFFFF0000) &gt;&gt; 16);</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ath9k_hw_nvram_read(struct ath_hal *ah,</div><div class='add'>+				       u32 off,</div><div class='add'>+				       u16 *data)</div><div class='add'>+{</div><div class='add'>+	if (ath9k_hw_use_flash(ah))</div><div class='add'>+		return ath9k_hw_flash_read(ah, off, data);</div><div class='add'>+	else</div><div class='add'>+		return ath9k_hw_eeprom_read(ah, off, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ath9k_hw_fill_eeprom(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	struct ar5416_eeprom *eep = &amp;ahp-&gt;ah_eeprom;</div><div class='add'>+	u16 *eep_data;</div><div class='add'>+	int addr, ar5416_eep_start_loc = 0;</div><div class='add'>+</div><div class='add'>+	if (!ath9k_hw_use_flash(ah)) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_EEPROM,</div><div class='add'>+			 "%s: Reading from EEPROM, not flash\n", __func__);</div><div class='add'>+		ar5416_eep_start_loc = 256;</div><div class='add'>+	}</div><div class='add'>+	if (AR_SREV_9100(ah))</div><div class='add'>+		ar5416_eep_start_loc = 256;</div><div class='add'>+</div><div class='add'>+	eep_data = (u16 *) eep;</div><div class='add'>+	for (addr = 0;</div><div class='add'>+	     addr &lt; sizeof(struct ar5416_eeprom) / sizeof(u16);</div><div class='add'>+	     addr++) {</div><div class='add'>+		if (!ath9k_hw_nvram_read(ah, addr + ar5416_eep_start_loc,</div><div class='add'>+					 eep_data)) {</div><div class='add'>+			DPRINTF(ah-&gt;ah_sc, ATH_DBG_EEPROM,</div><div class='add'>+				 "%s: Unable to read eeprom region \n",</div><div class='add'>+				 __func__);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		eep_data++;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* XXX: Clean me up, make me more legible */</div><div class='add'>+static bool</div><div class='add'>+ath9k_hw_eeprom_set_board_values(struct ath_hal *ah,</div><div class='add'>+				 struct ath9k_channel *chan)</div><div class='add'>+{</div><div class='add'>+	struct modal_eep_header *pModal;</div><div class='add'>+	int i, regChainOffset;</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	struct ar5416_eeprom *eep = &amp;ahp-&gt;ah_eeprom;</div><div class='add'>+	u8 txRxAttenLocal;</div><div class='add'>+	u16 ant_config;</div><div class='add'>+</div><div class='add'>+	pModal = &amp;(eep-&gt;modalHeader[IS_CHAN_2GHZ(chan)]);</div><div class='add'>+</div><div class='add'>+	txRxAttenLocal = IS_CHAN_2GHZ(chan) ? 23 : 44;</div><div class='add'>+</div><div class='add'>+	ath9k_hw_get_eeprom_antenna_cfg(ahp, chan, 1, &amp;ant_config);</div><div class='add'>+	REG_WRITE(ah, AR_PHY_SWITCH_COM, ant_config);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AR5416_MAX_CHAINS; i++) {</div><div class='add'>+		if (AR_SREV_9280(ah)) {</div><div class='add'>+			if (i &gt;= 2)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (AR_SREV_5416_V20_OR_LATER(ah) &amp;&amp;</div><div class='add'>+		    (ahp-&gt;ah_rxchainmask == 5 || ahp-&gt;ah_txchainmask == 5)</div><div class='add'>+		    &amp;&amp; (i != 0))</div><div class='add'>+			regChainOffset = (i == 1) ? 0x2000 : 0x1000;</div><div class='add'>+		else</div><div class='add'>+			regChainOffset = i * 0x1000;</div><div class='add'>+</div><div class='add'>+		REG_WRITE(ah, AR_PHY_SWITCH_CHAIN_0 + regChainOffset,</div><div class='add'>+			  pModal-&gt;antCtrlChain[i]);</div><div class='add'>+</div><div class='add'>+		REG_WRITE(ah, AR_PHY_TIMING_CTRL4(0) + regChainOffset,</div><div class='add'>+			  (REG_READ(ah,</div><div class='add'>+				    AR_PHY_TIMING_CTRL4(0) +</div><div class='add'>+				    regChainOffset) &amp;</div><div class='add'>+			   ~(AR_PHY_TIMING_CTRL4_IQCORR_Q_Q_COFF |</div><div class='add'>+			     AR_PHY_TIMING_CTRL4_IQCORR_Q_I_COFF)) |</div><div class='add'>+			  SM(pModal-&gt;iqCalICh[i],</div><div class='add'>+			     AR_PHY_TIMING_CTRL4_IQCORR_Q_I_COFF) |</div><div class='add'>+			  SM(pModal-&gt;iqCalQCh[i],</div><div class='add'>+			     AR_PHY_TIMING_CTRL4_IQCORR_Q_Q_COFF));</div><div class='add'>+</div><div class='add'>+		if ((i == 0) || AR_SREV_5416_V20_OR_LATER(ah)) {</div><div class='add'>+			if ((eep-&gt;baseEepHeader.version &amp;</div><div class='add'>+			     AR5416_EEP_VER_MINOR_MASK) &gt;=</div><div class='add'>+			    AR5416_EEP_MINOR_VER_3) {</div><div class='add'>+				txRxAttenLocal = pModal-&gt;txRxAttenCh[i];</div><div class='add'>+				if (AR_SREV_9280_10_OR_LATER(ah)) {</div><div class='add'>+					REG_RMW_FIELD(ah,</div><div class='add'>+						AR_PHY_GAIN_2GHZ +</div><div class='add'>+						regChainOffset,</div><div class='add'>+						AR_PHY_GAIN_2GHZ_XATTEN1_MARGIN,</div><div class='add'>+						pModal-&gt;</div><div class='add'>+						bswMargin[i]);</div><div class='add'>+					REG_RMW_FIELD(ah,</div><div class='add'>+						AR_PHY_GAIN_2GHZ +</div><div class='add'>+						regChainOffset,</div><div class='add'>+						AR_PHY_GAIN_2GHZ_XATTEN1_DB,</div><div class='add'>+						pModal-&gt;</div><div class='add'>+						bswAtten[i]);</div><div class='add'>+					REG_RMW_FIELD(ah,</div><div class='add'>+						AR_PHY_GAIN_2GHZ +</div><div class='add'>+						regChainOffset,</div><div class='add'>+						AR_PHY_GAIN_2GHZ_XATTEN2_MARGIN,</div><div class='add'>+						pModal-&gt;</div><div class='add'>+						xatten2Margin[i]);</div><div class='add'>+					REG_RMW_FIELD(ah,</div><div class='add'>+						AR_PHY_GAIN_2GHZ +</div><div class='add'>+						regChainOffset,</div><div class='add'>+						AR_PHY_GAIN_2GHZ_XATTEN2_DB,</div><div class='add'>+						pModal-&gt;</div><div class='add'>+						xatten2Db[i]);</div><div class='add'>+				} else {</div><div class='add'>+					REG_WRITE(ah,</div><div class='add'>+						  AR_PHY_GAIN_2GHZ +</div><div class='add'>+						  regChainOffset,</div><div class='add'>+						  (REG_READ(ah,</div><div class='add'>+							    AR_PHY_GAIN_2GHZ +</div><div class='add'>+							    regChainOffset) &amp;</div><div class='add'>+						   ~AR_PHY_GAIN_2GHZ_BSW_MARGIN)</div><div class='add'>+						  | SM(pModal-&gt;</div><div class='add'>+						  bswMargin[i],</div><div class='add'>+						  AR_PHY_GAIN_2GHZ_BSW_MARGIN));</div><div class='add'>+					REG_WRITE(ah,</div><div class='add'>+						  AR_PHY_GAIN_2GHZ +</div><div class='add'>+						  regChainOffset,</div><div class='add'>+						  (REG_READ(ah,</div><div class='add'>+							    AR_PHY_GAIN_2GHZ +</div><div class='add'>+							    regChainOffset) &amp;</div><div class='add'>+						   ~AR_PHY_GAIN_2GHZ_BSW_ATTEN)</div><div class='add'>+						  | SM(pModal-&gt;bswAtten[i],</div><div class='add'>+						  AR_PHY_GAIN_2GHZ_BSW_ATTEN));</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (AR_SREV_9280_10_OR_LATER(ah)) {</div><div class='add'>+				REG_RMW_FIELD(ah,</div><div class='add'>+					      AR_PHY_RXGAIN +</div><div class='add'>+					      regChainOffset,</div><div class='add'>+					      AR9280_PHY_RXGAIN_TXRX_ATTEN,</div><div class='add'>+					      txRxAttenLocal);</div><div class='add'>+				REG_RMW_FIELD(ah,</div><div class='add'>+					      AR_PHY_RXGAIN +</div><div class='add'>+					      regChainOffset,</div><div class='add'>+					      AR9280_PHY_RXGAIN_TXRX_MARGIN,</div><div class='add'>+					      pModal-&gt;rxTxMarginCh[i]);</div><div class='add'>+			} else {</div><div class='add'>+				REG_WRITE(ah,</div><div class='add'>+					  AR_PHY_RXGAIN + regChainOffset,</div><div class='add'>+					  (REG_READ(ah,</div><div class='add'>+						    AR_PHY_RXGAIN +</div><div class='add'>+						    regChainOffset) &amp;</div><div class='add'>+					   ~AR_PHY_RXGAIN_TXRX_ATTEN) |</div><div class='add'>+					  SM(txRxAttenLocal,</div><div class='add'>+					     AR_PHY_RXGAIN_TXRX_ATTEN));</div><div class='add'>+				REG_WRITE(ah,</div><div class='add'>+					  AR_PHY_GAIN_2GHZ +</div><div class='add'>+					  regChainOffset,</div><div class='add'>+					  (REG_READ(ah,</div><div class='add'>+						    AR_PHY_GAIN_2GHZ +</div><div class='add'>+						    regChainOffset) &amp;</div><div class='add'>+					   ~AR_PHY_GAIN_2GHZ_RXTX_MARGIN) |</div><div class='add'>+					  SM(pModal-&gt;rxTxMarginCh[i],</div><div class='add'>+					     AR_PHY_GAIN_2GHZ_RXTX_MARGIN));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9280_10_OR_LATER(ah)) {</div><div class='add'>+		if (IS_CHAN_2GHZ(chan)) {</div><div class='add'>+			ath9k_hw_analog_shift_rmw(ah, AR_AN_RF2G1_CH0,</div><div class='add'>+						  AR_AN_RF2G1_CH0_OB,</div><div class='add'>+						  AR_AN_RF2G1_CH0_OB_S,</div><div class='add'>+						  pModal-&gt;ob);</div><div class='add'>+			ath9k_hw_analog_shift_rmw(ah, AR_AN_RF2G1_CH0,</div><div class='add'>+						  AR_AN_RF2G1_CH0_DB,</div><div class='add'>+						  AR_AN_RF2G1_CH0_DB_S,</div><div class='add'>+						  pModal-&gt;db);</div><div class='add'>+			ath9k_hw_analog_shift_rmw(ah, AR_AN_RF2G1_CH1,</div><div class='add'>+						  AR_AN_RF2G1_CH1_OB,</div><div class='add'>+						  AR_AN_RF2G1_CH1_OB_S,</div><div class='add'>+						  pModal-&gt;ob_ch1);</div><div class='add'>+			ath9k_hw_analog_shift_rmw(ah, AR_AN_RF2G1_CH1,</div><div class='add'>+						  AR_AN_RF2G1_CH1_DB,</div><div class='add'>+						  AR_AN_RF2G1_CH1_DB_S,</div><div class='add'>+						  pModal-&gt;db_ch1);</div><div class='add'>+		} else {</div><div class='add'>+			ath9k_hw_analog_shift_rmw(ah, AR_AN_RF5G1_CH0,</div><div class='add'>+						  AR_AN_RF5G1_CH0_OB5,</div><div class='add'>+						  AR_AN_RF5G1_CH0_OB5_S,</div><div class='add'>+						  pModal-&gt;ob);</div><div class='add'>+			ath9k_hw_analog_shift_rmw(ah, AR_AN_RF5G1_CH0,</div><div class='add'>+						  AR_AN_RF5G1_CH0_DB5,</div><div class='add'>+						  AR_AN_RF5G1_CH0_DB5_S,</div><div class='add'>+						  pModal-&gt;db);</div><div class='add'>+			ath9k_hw_analog_shift_rmw(ah, AR_AN_RF5G1_CH1,</div><div class='add'>+						  AR_AN_RF5G1_CH1_OB5,</div><div class='add'>+						  AR_AN_RF5G1_CH1_OB5_S,</div><div class='add'>+						  pModal-&gt;ob_ch1);</div><div class='add'>+			ath9k_hw_analog_shift_rmw(ah, AR_AN_RF5G1_CH1,</div><div class='add'>+						  AR_AN_RF5G1_CH1_DB5,</div><div class='add'>+						  AR_AN_RF5G1_CH1_DB5_S,</div><div class='add'>+						  pModal-&gt;db_ch1);</div><div class='add'>+		}</div><div class='add'>+		ath9k_hw_analog_shift_rmw(ah, AR_AN_TOP2,</div><div class='add'>+					  AR_AN_TOP2_XPABIAS_LVL,</div><div class='add'>+					  AR_AN_TOP2_XPABIAS_LVL_S,</div><div class='add'>+					  pModal-&gt;xpaBiasLvl);</div><div class='add'>+		ath9k_hw_analog_shift_rmw(ah, AR_AN_TOP2,</div><div class='add'>+					  AR_AN_TOP2_LOCALBIAS,</div><div class='add'>+					  AR_AN_TOP2_LOCALBIAS_S,</div><div class='add'>+					  pModal-&gt;local_bias);</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANY, "ForceXPAon: %d\n",</div><div class='add'>+			pModal-&gt;force_xpaon);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_XPA_CFG, AR_PHY_FORCE_XPA_CFG,</div><div class='add'>+			      pModal-&gt;force_xpaon);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_SETTLING, AR_PHY_SETTLING_SWITCH,</div><div class='add'>+		      pModal-&gt;switchSettling);</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_DESIRED_SZ, AR_PHY_DESIRED_SZ_ADC,</div><div class='add'>+		      pModal-&gt;adcDesiredSize);</div><div class='add'>+</div><div class='add'>+	if (!AR_SREV_9280_10_OR_LATER(ah))</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_DESIRED_SZ,</div><div class='add'>+			      AR_PHY_DESIRED_SZ_PGA,</div><div class='add'>+			      pModal-&gt;pgaDesiredSize);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_PHY_RF_CTL4,</div><div class='add'>+		  SM(pModal-&gt;txEndToXpaOff, AR_PHY_RF_CTL4_TX_END_XPAA_OFF)</div><div class='add'>+		  | SM(pModal-&gt;txEndToXpaOff,</div><div class='add'>+		       AR_PHY_RF_CTL4_TX_END_XPAB_OFF)</div><div class='add'>+		  | SM(pModal-&gt;txFrameToXpaOn,</div><div class='add'>+		       AR_PHY_RF_CTL4_FRAME_XPAA_ON)</div><div class='add'>+		  | SM(pModal-&gt;txFrameToXpaOn,</div><div class='add'>+		       AR_PHY_RF_CTL4_FRAME_XPAB_ON));</div><div class='add'>+</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_RF_CTL3, AR_PHY_TX_END_TO_A2_RX_ON,</div><div class='add'>+		      pModal-&gt;txEndToRxOn);</div><div class='add'>+	if (AR_SREV_9280_10_OR_LATER(ah)) {</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_CCA, AR9280_PHY_CCA_THRESH62,</div><div class='add'>+			      pModal-&gt;thresh62);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_EXT_CCA0,</div><div class='add'>+			      AR_PHY_EXT_CCA0_THRESH62,</div><div class='add'>+			      pModal-&gt;thresh62);</div><div class='add'>+	} else {</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_CCA, AR_PHY_CCA_THRESH62,</div><div class='add'>+			      pModal-&gt;thresh62);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_EXT_CCA,</div><div class='add'>+			      AR_PHY_EXT_CCA_THRESH62,</div><div class='add'>+			      pModal-&gt;thresh62);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((eep-&gt;baseEepHeader.version &amp; AR5416_EEP_VER_MINOR_MASK) &gt;=</div><div class='add'>+	    AR5416_EEP_MINOR_VER_2) {</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_RF_CTL2,</div><div class='add'>+			      AR_PHY_TX_END_DATA_START,</div><div class='add'>+			      pModal-&gt;txFrameToDataStart);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_RF_CTL2, AR_PHY_TX_END_PA_ON,</div><div class='add'>+			      pModal-&gt;txFrameToPaOn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((eep-&gt;baseEepHeader.version &amp; AR5416_EEP_VER_MINOR_MASK) &gt;=</div><div class='add'>+	    AR5416_EEP_MINOR_VER_3) {</div><div class='add'>+		if (IS_CHAN_HT40(chan))</div><div class='add'>+			REG_RMW_FIELD(ah, AR_PHY_SETTLING,</div><div class='add'>+				      AR_PHY_SETTLING_SWITCH,</div><div class='add'>+				      pModal-&gt;swSettleHt40);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath9k_hw_check_eeprom(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	u32 sum = 0, el;</div><div class='add'>+	u16 *eepdata;</div><div class='add'>+	int i;</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	bool need_swap = false;</div><div class='add'>+	struct ar5416_eeprom *eep =</div><div class='add'>+		(struct ar5416_eeprom *) &amp;ahp-&gt;ah_eeprom;</div><div class='add'>+</div><div class='add'>+	if (!ath9k_hw_use_flash(ah)) {</div><div class='add'>+		u16 magic, magic2;</div><div class='add'>+		int addr;</div><div class='add'>+</div><div class='add'>+		if (!ath9k_hw_nvram_read(ah, AR5416_EEPROM_MAGIC_OFFSET,</div><div class='add'>+					&amp;magic)) {</div><div class='add'>+			DPRINTF(ah-&gt;ah_sc, ATH_DBG_EEPROM,</div><div class='add'>+				 "%s: Reading Magic # failed\n", __func__);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_EEPROM, "%s: Read Magic = 0x%04X\n",</div><div class='add'>+			 __func__, magic);</div><div class='add'>+</div><div class='add'>+		if (magic != AR5416_EEPROM_MAGIC) {</div><div class='add'>+			magic2 = swab16(magic);</div><div class='add'>+</div><div class='add'>+			if (magic2 == AR5416_EEPROM_MAGIC) {</div><div class='add'>+				need_swap = true;</div><div class='add'>+				eepdata = (u16 *) (&amp;ahp-&gt;ah_eeprom);</div><div class='add'>+</div><div class='add'>+				for (addr = 0;</div><div class='add'>+				     addr &lt;</div><div class='add'>+					     sizeof(struct ar5416_eeprom) /</div><div class='add'>+					     sizeof(u16); addr++) {</div><div class='add'>+					u16 temp;</div><div class='add'>+</div><div class='add'>+					temp = swab16(*eepdata);</div><div class='add'>+					*eepdata = temp;</div><div class='add'>+					eepdata++;</div><div class='add'>+</div><div class='add'>+					DPRINTF(ah-&gt;ah_sc, ATH_DBG_EEPROM,</div><div class='add'>+						 "0x%04X  ", *eepdata);</div><div class='add'>+					if (((addr + 1) % 6) == 0)</div><div class='add'>+						DPRINTF(ah-&gt;ah_sc,</div><div class='add'>+							 ATH_DBG_EEPROM,</div><div class='add'>+							 "\n");</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				DPRINTF(ah-&gt;ah_sc, ATH_DBG_EEPROM,</div><div class='add'>+					 "Invalid EEPROM Magic. "</div><div class='add'>+					"endianness missmatch.\n");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_EEPROM, "need_swap = %s.\n",</div><div class='add'>+		 need_swap ? "True" : "False");</div><div class='add'>+</div><div class='add'>+	if (need_swap)</div><div class='add'>+		el = swab16(ahp-&gt;ah_eeprom.baseEepHeader.length);</div><div class='add'>+	else</div><div class='add'>+		el = ahp-&gt;ah_eeprom.baseEepHeader.length;</div><div class='add'>+</div><div class='add'>+	if (el &gt; sizeof(struct ar5416_eeprom))</div><div class='add'>+		el = sizeof(struct ar5416_eeprom) / sizeof(u16);</div><div class='add'>+	else</div><div class='add'>+		el = el / sizeof(u16);</div><div class='add'>+</div><div class='add'>+	eepdata = (u16 *) (&amp;ahp-&gt;ah_eeprom);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; el; i++)</div><div class='add'>+		sum ^= *eepdata++;</div><div class='add'>+</div><div class='add'>+	if (need_swap) {</div><div class='add'>+		u32 integer, j;</div><div class='add'>+		u16 word;</div><div class='add'>+</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_EEPROM,</div><div class='add'>+			 "EEPROM Endianness is not native.. Changing \n");</div><div class='add'>+</div><div class='add'>+		word = swab16(eep-&gt;baseEepHeader.length);</div><div class='add'>+		eep-&gt;baseEepHeader.length = word;</div><div class='add'>+</div><div class='add'>+		word = swab16(eep-&gt;baseEepHeader.checksum);</div><div class='add'>+		eep-&gt;baseEepHeader.checksum = word;</div><div class='add'>+</div><div class='add'>+		word = swab16(eep-&gt;baseEepHeader.version);</div><div class='add'>+		eep-&gt;baseEepHeader.version = word;</div><div class='add'>+</div><div class='add'>+		word = swab16(eep-&gt;baseEepHeader.regDmn[0]);</div><div class='add'>+		eep-&gt;baseEepHeader.regDmn[0] = word;</div><div class='add'>+</div><div class='add'>+		word = swab16(eep-&gt;baseEepHeader.regDmn[1]);</div><div class='add'>+		eep-&gt;baseEepHeader.regDmn[1] = word;</div><div class='add'>+</div><div class='add'>+		word = swab16(eep-&gt;baseEepHeader.rfSilent);</div><div class='add'>+		eep-&gt;baseEepHeader.rfSilent = word;</div><div class='add'>+</div><div class='add'>+		word = swab16(eep-&gt;baseEepHeader.blueToothOptions);</div><div class='add'>+		eep-&gt;baseEepHeader.blueToothOptions = word;</div><div class='add'>+</div><div class='add'>+		word = swab16(eep-&gt;baseEepHeader.deviceCap);</div><div class='add'>+		eep-&gt;baseEepHeader.deviceCap = word;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(eep-&gt;modalHeader); j++) {</div><div class='add'>+			struct modal_eep_header *pModal =</div><div class='add'>+				&amp;eep-&gt;modalHeader[j];</div><div class='add'>+			integer = swab32(pModal-&gt;antCtrlCommon);</div><div class='add'>+			pModal-&gt;antCtrlCommon = integer;</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; AR5416_MAX_CHAINS; i++) {</div><div class='add'>+				integer = swab32(pModal-&gt;antCtrlChain[i]);</div><div class='add'>+				pModal-&gt;antCtrlChain[i] = integer;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; AR5416_EEPROM_MODAL_SPURS; i++) {</div><div class='add'>+				word = swab16(pModal-&gt;spurChans[i].spurChan);</div><div class='add'>+				pModal-&gt;spurChans[i].spurChan = word;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sum != 0xffff || ar5416_get_eep_ver(ahp) != AR5416_EEP_VER ||</div><div class='add'>+	    ar5416_get_eep_rev(ahp) &lt; AR5416_EEP_NO_BACK_VER) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_EEPROM,</div><div class='add'>+			 "Bad EEPROM checksum 0x%x or revision 0x%04x\n",</div><div class='add'>+			 sum, ar5416_get_eep_ver(ahp));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath9k_hw_chip_test(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	u32 regAddr[2] = { AR_STA_ID0, AR_PHY_BASE + (8 &lt;&lt; 2) };</div><div class='add'>+	u32 regHold[2];</div><div class='add'>+	u32 patternData[4] = { 0x55555555,</div><div class='add'>+				     0xaaaaaaaa,</div><div class='add'>+				     0x66666666,</div><div class='add'>+				     0x99999999 };</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		u32 addr = regAddr[i];</div><div class='add'>+		u32 wrData, rdData;</div><div class='add'>+</div><div class='add'>+		regHold[i] = REG_READ(ah, addr);</div><div class='add'>+		for (j = 0; j &lt; 0x100; j++) {</div><div class='add'>+			wrData = (j &lt;&lt; 16) | j;</div><div class='add'>+			REG_WRITE(ah, addr, wrData);</div><div class='add'>+			rdData = REG_READ(ah, addr);</div><div class='add'>+			if (rdData != wrData) {</div><div class='add'>+				DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO,</div><div class='add'>+				 "%s: address test failed "</div><div class='add'>+				"addr: 0x%08x - wr:0x%08x != rd:0x%08x\n",</div><div class='add'>+				 __func__, addr, wrData, rdData);</div><div class='add'>+				return false;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		for (j = 0; j &lt; 4; j++) {</div><div class='add'>+			wrData = patternData[j];</div><div class='add'>+			REG_WRITE(ah, addr, wrData);</div><div class='add'>+			rdData = REG_READ(ah, addr);</div><div class='add'>+			if (wrData != rdData) {</div><div class='add'>+				DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO,</div><div class='add'>+				 "%s: address test failed "</div><div class='add'>+				"addr: 0x%08x - wr:0x%08x != rd:0x%08x\n",</div><div class='add'>+				 __func__, addr, wrData, rdData);</div><div class='add'>+				return false;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		REG_WRITE(ah, regAddr[i], regHold[i]);</div><div class='add'>+	}</div><div class='add'>+	udelay(100);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ath9k_hw_getrxfilter(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	u32 bits = REG_READ(ah, AR_RX_FILTER);</div><div class='add'>+	u32 phybits = REG_READ(ah, AR_PHY_ERR);</div><div class='add'>+</div><div class='add'>+	if (phybits &amp; AR_PHY_ERR_RADAR)</div><div class='add'>+		bits |= ATH9K_RX_FILTER_PHYRADAR;</div><div class='add'>+	if (phybits &amp; (AR_PHY_ERR_OFDM_TIMING | AR_PHY_ERR_CCK_TIMING))</div><div class='add'>+		bits |= ATH9K_RX_FILTER_PHYERR;</div><div class='add'>+	return bits;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath9k_hw_setrxfilter(struct ath_hal *ah, u32 bits)</div><div class='add'>+{</div><div class='add'>+	u32 phybits;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_RX_FILTER, (bits &amp; 0xffff) | AR_RX_COMPR_BAR);</div><div class='add'>+	phybits = 0;</div><div class='add'>+	if (bits &amp; ATH9K_RX_FILTER_PHYRADAR)</div><div class='add'>+		phybits |= AR_PHY_ERR_RADAR;</div><div class='add'>+	if (bits &amp; ATH9K_RX_FILTER_PHYERR)</div><div class='add'>+		phybits |= AR_PHY_ERR_OFDM_TIMING | AR_PHY_ERR_CCK_TIMING;</div><div class='add'>+	REG_WRITE(ah, AR_PHY_ERR, phybits);</div><div class='add'>+</div><div class='add'>+	if (phybits)</div><div class='add'>+		REG_WRITE(ah, AR_RXCFG,</div><div class='add'>+			  REG_READ(ah, AR_RXCFG) | AR_RXCFG_ZLFDMA);</div><div class='add'>+	else</div><div class='add'>+		REG_WRITE(ah, AR_RXCFG,</div><div class='add'>+			  REG_READ(ah, AR_RXCFG) &amp; ~AR_RXCFG_ZLFDMA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ath9k_hw_setcapability(struct ath_hal *ah,</div><div class='add'>+			    enum ath9k_capability_type type,</div><div class='add'>+			    u32 capability,</div><div class='add'>+			    u32 setting,</div><div class='add'>+			    int *status)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	u32 v;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ATH9K_CAP_TKIP_MIC:</div><div class='add'>+		if (setting)</div><div class='add'>+			ahp-&gt;ah_staId1Defaults |=</div><div class='add'>+				AR_STA_ID1_CRPT_MIC_ENABLE;</div><div class='add'>+		else</div><div class='add'>+			ahp-&gt;ah_staId1Defaults &amp;=</div><div class='add'>+				~AR_STA_ID1_CRPT_MIC_ENABLE;</div><div class='add'>+		return true;</div><div class='add'>+	case ATH9K_CAP_DIVERSITY:</div><div class='add'>+		v = REG_READ(ah, AR_PHY_CCK_DETECT);</div><div class='add'>+		if (setting)</div><div class='add'>+			v |= AR_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV;</div><div class='add'>+		else</div><div class='add'>+			v &amp;= ~AR_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV;</div><div class='add'>+		REG_WRITE(ah, AR_PHY_CCK_DETECT, v);</div><div class='add'>+		return true;</div><div class='add'>+	case ATH9K_CAP_MCAST_KEYSRCH:</div><div class='add'>+		if (setting)</div><div class='add'>+			ahp-&gt;ah_staId1Defaults |= AR_STA_ID1_MCAST_KSRCH;</div><div class='add'>+		else</div><div class='add'>+			ahp-&gt;ah_staId1Defaults &amp;= ~AR_STA_ID1_MCAST_KSRCH;</div><div class='add'>+		return true;</div><div class='add'>+	case ATH9K_CAP_TSF_ADJUST:</div><div class='add'>+		if (setting)</div><div class='add'>+			ahp-&gt;ah_miscMode |= AR_PCU_TX_ADD_TSF;</div><div class='add'>+		else</div><div class='add'>+			ahp-&gt;ah_miscMode &amp;= ~AR_PCU_TX_ADD_TSF;</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath9k_hw_dmaRegDump(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	u32 val[ATH9K_NUM_DMA_DEBUG_REGS];</div><div class='add'>+	int qcuOffset = 0, dcuOffset = 0;</div><div class='add'>+	u32 *qcuBase = &amp;val[0], *dcuBase = &amp;val[4];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_MACMISC,</div><div class='add'>+		  ((AR_MACMISC_DMA_OBS_LINE_8 &lt;&lt; AR_MACMISC_DMA_OBS_S) |</div><div class='add'>+		   (AR_MACMISC_MISC_OBS_BUS_1 &lt;&lt;</div><div class='add'>+		    AR_MACMISC_MISC_OBS_BUS_MSB_S)));</div><div class='add'>+</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO, "Raw DMA Debug values:\n");</div><div class='add'>+	for (i = 0; i &lt; ATH9K_NUM_DMA_DEBUG_REGS; i++) {</div><div class='add'>+		if (i % 4 == 0)</div><div class='add'>+			DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO, "\n");</div><div class='add'>+</div><div class='add'>+		val[i] = REG_READ(ah, AR_DMADBG_0 + (i * sizeof(u32)));</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO, "%d: %08x ", i, val[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO, "\n\n");</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO,</div><div class='add'>+		 "Num QCU: chain_st fsp_ok fsp_st DCU: chain_st\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH9K_NUM_QUEUES;</div><div class='add'>+	     i++, qcuOffset += 4, dcuOffset += 5) {</div><div class='add'>+		if (i == 8) {</div><div class='add'>+			qcuOffset = 0;</div><div class='add'>+			qcuBase++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i == 6) {</div><div class='add'>+			dcuOffset = 0;</div><div class='add'>+			dcuBase++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO,</div><div class='add'>+			 "%2d          %2x      %1x     %2x           %2x\n",</div><div class='add'>+			 i, (*qcuBase &amp; (0x7 &lt;&lt; qcuOffset)) &gt;&gt; qcuOffset,</div><div class='add'>+			 (*qcuBase &amp; (0x8 &lt;&lt; qcuOffset)) &gt;&gt; (qcuOffset +</div><div class='add'>+							     3),</div><div class='add'>+			 val[2] &amp; (0x7 &lt;&lt; (i * 3)) &gt;&gt; (i * 3),</div><div class='add'>+			 (*dcuBase &amp; (0x1f &lt;&lt; dcuOffset)) &gt;&gt; dcuOffset);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO, "\n");</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO,</div><div class='add'>+		 "qcu_stitch state:   %2x    qcu_fetch state:        %2x\n",</div><div class='add'>+		 (val[3] &amp; 0x003c0000) &gt;&gt; 18, (val[3] &amp; 0x03c00000) &gt;&gt; 22);</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO,</div><div class='add'>+		 "qcu_complete state: %2x    dcu_complete state:     %2x\n",</div><div class='add'>+		 (val[3] &amp; 0x1c000000) &gt;&gt; 26, (val[6] &amp; 0x3));</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO,</div><div class='add'>+		 "dcu_arb state:      %2x    dcu_fp state:           %2x\n",</div><div class='add'>+		 (val[5] &amp; 0x06000000) &gt;&gt; 25, (val[5] &amp; 0x38000000) &gt;&gt; 27);</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO,</div><div class='add'>+		 "chan_idle_dur:     %3d    chan_idle_dur_valid:     %1d\n",</div><div class='add'>+		 (val[6] &amp; 0x000003fc) &gt;&gt; 2, (val[6] &amp; 0x00000400) &gt;&gt; 10);</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO,</div><div class='add'>+		 "txfifo_valid_0:      %1d    txfifo_valid_1:          %1d\n",</div><div class='add'>+		 (val[6] &amp; 0x00000800) &gt;&gt; 11, (val[6] &amp; 0x00001000) &gt;&gt; 12);</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO,</div><div class='add'>+		 "txfifo_dcu_num_0:   %2d    txfifo_dcu_num_1:       %2d\n",</div><div class='add'>+		 (val[6] &amp; 0x0001e000) &gt;&gt; 13, (val[6] &amp; 0x001e0000) &gt;&gt; 17);</div><div class='add'>+</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO, "pcu observe 0x%x \n",</div><div class='add'>+		REG_READ(ah, AR_OBS_BUS_1));</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO,</div><div class='add'>+		"AR_CR 0x%x \n", REG_READ(ah, AR_CR));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ath9k_hw_GetMibCycleCountsPct(struct ath_hal *ah,</div><div class='add'>+					u32 *rxc_pcnt,</div><div class='add'>+					u32 *rxf_pcnt,</div><div class='add'>+					u32 *txf_pcnt)</div><div class='add'>+{</div><div class='add'>+	static u32 cycles, rx_clear, rx_frame, tx_frame;</div><div class='add'>+	u32 good = 1;</div><div class='add'>+</div><div class='add'>+	u32 rc = REG_READ(ah, AR_RCCNT);</div><div class='add'>+	u32 rf = REG_READ(ah, AR_RFCNT);</div><div class='add'>+	u32 tf = REG_READ(ah, AR_TFCNT);</div><div class='add'>+	u32 cc = REG_READ(ah, AR_CCCNT);</div><div class='add'>+</div><div class='add'>+	if (cycles == 0 || cycles &gt; cc) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_CHANNEL,</div><div class='add'>+			 "%s: cycle counter wrap. ExtBusy = 0\n",</div><div class='add'>+			 __func__);</div><div class='add'>+		good = 0;</div><div class='add'>+	} else {</div><div class='add'>+		u32 cc_d = cc - cycles;</div><div class='add'>+		u32 rc_d = rc - rx_clear;</div><div class='add'>+		u32 rf_d = rf - rx_frame;</div><div class='add'>+		u32 tf_d = tf - tx_frame;</div><div class='add'>+</div><div class='add'>+		if (cc_d != 0) {</div><div class='add'>+			*rxc_pcnt = rc_d * 100 / cc_d;</div><div class='add'>+			*rxf_pcnt = rf_d * 100 / cc_d;</div><div class='add'>+			*txf_pcnt = tf_d * 100 / cc_d;</div><div class='add'>+		} else {</div><div class='add'>+			good = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cycles = cc;</div><div class='add'>+	rx_frame = rf;</div><div class='add'>+	rx_clear = rc;</div><div class='add'>+	tx_frame = tf;</div><div class='add'>+</div><div class='add'>+	return good;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath9k_hw_set11nmac2040(struct ath_hal *ah, enum ath9k_ht_macmode mode)</div><div class='add'>+{</div><div class='add'>+	u32 macmode;</div><div class='add'>+</div><div class='add'>+	if (mode == ATH9K_HT_MACMODE_2040 &amp;&amp;</div><div class='add'>+	    !ah-&gt;ah_config.cwm_ignore_extcca)</div><div class='add'>+		macmode = AR_2040_JOINED_RX_CLEAR;</div><div class='add'>+	else</div><div class='add'>+		macmode = 0;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_2040_MODE, macmode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_mark_phy_inactive(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct ath_hal_5416 *ath9k_hw_newstate(u16 devid,</div><div class='add'>+					      struct ath_softc *sc,</div><div class='add'>+					      void __iomem *mem,</div><div class='add'>+					      int *status)</div><div class='add'>+{</div><div class='add'>+	static const u8 defbssidmask[ETH_ALEN] =</div><div class='add'>+		{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };</div><div class='add'>+	struct ath_hal_5416 *ahp;</div><div class='add'>+	struct ath_hal *ah;</div><div class='add'>+</div><div class='add'>+	ahp = kzalloc(sizeof(struct ath_hal_5416), GFP_KERNEL);</div><div class='add'>+	if (ahp == NULL) {</div><div class='add'>+		DPRINTF(sc, ATH_DBG_FATAL,</div><div class='add'>+			 "%s: cannot allocate memory for state block\n",</div><div class='add'>+			 __func__);</div><div class='add'>+		*status = -ENOMEM;</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ah = &amp;ahp-&gt;ah;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;ahp-&gt;ah, &amp;ar5416hal, sizeof(struct ath_hal));</div><div class='add'>+</div><div class='add'>+	ah-&gt;ah_sc = sc;</div><div class='add'>+	ah-&gt;ah_sh = mem;</div><div class='add'>+</div><div class='add'>+	ah-&gt;ah_devid = devid;</div><div class='add'>+	ah-&gt;ah_subvendorid = 0;</div><div class='add'>+</div><div class='add'>+	ah-&gt;ah_flags = 0;</div><div class='add'>+	if ((devid == AR5416_AR9100_DEVID))</div><div class='add'>+		ah-&gt;ah_macVersion = AR_SREV_VERSION_9100;</div><div class='add'>+	if (!AR_SREV_9100(ah))</div><div class='add'>+		ah-&gt;ah_flags = AH_USE_EEPROM;</div><div class='add'>+</div><div class='add'>+	ah-&gt;ah_powerLimit = MAX_RATE_POWER;</div><div class='add'>+	ah-&gt;ah_tpScale = ATH9K_TP_SCALE_MAX;</div><div class='add'>+</div><div class='add'>+	ahp-&gt;ah_atimWindow = 0;</div><div class='add'>+	ahp-&gt;ah_diversityControl = ah-&gt;ah_config.diversity_control;</div><div class='add'>+	ahp-&gt;ah_antennaSwitchSwap =</div><div class='add'>+		ah-&gt;ah_config.antenna_switch_swap;</div><div class='add'>+</div><div class='add'>+	ahp-&gt;ah_staId1Defaults = AR_STA_ID1_CRPT_MIC_ENABLE;</div><div class='add'>+	ahp-&gt;ah_beaconInterval = 100;</div><div class='add'>+	ahp-&gt;ah_enable32kHzClock = DONT_USE_32KHZ;</div><div class='add'>+	ahp-&gt;ah_slottime = (u32) -1;</div><div class='add'>+	ahp-&gt;ah_acktimeout = (u32) -1;</div><div class='add'>+	ahp-&gt;ah_ctstimeout = (u32) -1;</div><div class='add'>+	ahp-&gt;ah_globaltxtimeout = (u32) -1;</div><div class='add'>+	memcpy(&amp;ahp-&gt;ah_bssidmask, defbssidmask, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	ahp-&gt;ah_gBeaconRate = 0;</div><div class='add'>+</div><div class='add'>+	return ahp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath9k_hw_eeprom_attach(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	if (ath9k_hw_use_flash(ah))</div><div class='add'>+		ath9k_hw_flash_map(ah);</div><div class='add'>+</div><div class='add'>+	if (!ath9k_hw_fill_eeprom(ah))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	status = ath9k_hw_check_eeprom(ah);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ath9k_hw_get_eeprom(struct ath_hal_5416 *ahp,</div><div class='add'>+			      enum eeprom_param param)</div><div class='add'>+{</div><div class='add'>+	struct ar5416_eeprom *eep = &amp;ahp-&gt;ah_eeprom;</div><div class='add'>+	struct modal_eep_header *pModal = eep-&gt;modalHeader;</div><div class='add'>+	struct base_eep_header *pBase = &amp;eep-&gt;baseEepHeader;</div><div class='add'>+</div><div class='add'>+	switch (param) {</div><div class='add'>+	case EEP_NFTHRESH_5:</div><div class='add'>+		return -pModal[0].noiseFloorThreshCh[0];</div><div class='add'>+	case EEP_NFTHRESH_2:</div><div class='add'>+		return -pModal[1].noiseFloorThreshCh[0];</div><div class='add'>+	case AR_EEPROM_MAC(0):</div><div class='add'>+		return pBase-&gt;macAddr[0] &lt;&lt; 8 | pBase-&gt;macAddr[1];</div><div class='add'>+	case AR_EEPROM_MAC(1):</div><div class='add'>+		return pBase-&gt;macAddr[2] &lt;&lt; 8 | pBase-&gt;macAddr[3];</div><div class='add'>+	case AR_EEPROM_MAC(2):</div><div class='add'>+		return pBase-&gt;macAddr[4] &lt;&lt; 8 | pBase-&gt;macAddr[5];</div><div class='add'>+	case EEP_REG_0:</div><div class='add'>+		return pBase-&gt;regDmn[0];</div><div class='add'>+	case EEP_REG_1:</div><div class='add'>+		return pBase-&gt;regDmn[1];</div><div class='add'>+	case EEP_OP_CAP:</div><div class='add'>+		return pBase-&gt;deviceCap;</div><div class='add'>+	case EEP_OP_MODE:</div><div class='add'>+		return pBase-&gt;opCapFlags;</div><div class='add'>+	case EEP_RF_SILENT:</div><div class='add'>+		return pBase-&gt;rfSilent;</div><div class='add'>+	case EEP_OB_5:</div><div class='add'>+		return pModal[0].ob;</div><div class='add'>+	case EEP_DB_5:</div><div class='add'>+		return pModal[0].db;</div><div class='add'>+	case EEP_OB_2:</div><div class='add'>+		return pModal[1].ob;</div><div class='add'>+	case EEP_DB_2:</div><div class='add'>+		return pModal[1].db;</div><div class='add'>+	case EEP_MINOR_REV:</div><div class='add'>+		return pBase-&gt;version &amp; AR5416_EEP_VER_MINOR_MASK;</div><div class='add'>+	case EEP_TX_MASK:</div><div class='add'>+		return pBase-&gt;txMask;</div><div class='add'>+	case EEP_RX_MASK:</div><div class='add'>+		return pBase-&gt;rxMask;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath9k_hw_get_radiorev(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_PHY(0x36), 0x00007058);</div><div class='add'>+	for (i = 0; i &lt; 8; i++)</div><div class='add'>+		REG_WRITE(ah, AR_PHY(0x20), 0x00010000);</div><div class='add'>+	val = (REG_READ(ah, AR_PHY(256)) &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+	val = ((val &amp; 0xf0) &gt;&gt; 4) | ((val &amp; 0x0f) &lt;&lt; 4);</div><div class='add'>+	return ath9k_hw_reverse_bits(val, 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath9k_hw_init_macaddr(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	u32 sum;</div><div class='add'>+	int i;</div><div class='add'>+	u16 eeval;</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	DECLARE_MAC_BUF(mac);</div><div class='add'>+</div><div class='add'>+	sum = 0;</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		eeval = ath9k_hw_get_eeprom(ahp, AR_EEPROM_MAC(i));</div><div class='add'>+		sum += eeval;</div><div class='add'>+		ahp-&gt;ah_macaddr[2 * i] = eeval &gt;&gt; 8;</div><div class='add'>+		ahp-&gt;ah_macaddr[2 * i + 1] = eeval &amp; 0xff;</div><div class='add'>+	}</div><div class='add'>+	if (sum == 0 || sum == 0xffff * 3) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_EEPROM,</div><div class='add'>+			 "%s: mac address read failed: %s\n", __func__,</div><div class='add'>+			 print_mac(mac, ahp-&gt;ah_macaddr));</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int16_t ath9k_hw_interpolate(u16 target,</div><div class='add'>+					   u16 srcLeft,</div><div class='add'>+					   u16 srcRight,</div><div class='add'>+					   int16_t targetLeft,</div><div class='add'>+					   int16_t targetRight)</div><div class='add'>+{</div><div class='add'>+	int16_t rv;</div><div class='add'>+</div><div class='add'>+	if (srcRight == srcLeft) {</div><div class='add'>+		rv = targetLeft;</div><div class='add'>+	} else {</div><div class='add'>+		rv = (int16_t) (((target - srcLeft) * targetRight +</div><div class='add'>+				 (srcRight - target) * targetLeft) /</div><div class='add'>+				(srcRight - srcLeft));</div><div class='add'>+	}</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 ath9k_hw_fbin2freq(u8 fbin,</div><div class='add'>+					   bool is2GHz)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (fbin == AR5416_BCHAN_UNUSED)</div><div class='add'>+		return fbin;</div><div class='add'>+</div><div class='add'>+	return (u16) ((is2GHz) ? (2300 + fbin) : (4800 + 5 * fbin));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath9k_hw_eeprom_get_spur_chan(struct ath_hal *ah,</div><div class='add'>+					       u16 i,</div><div class='add'>+					       bool is2GHz)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	struct ar5416_eeprom *eep =</div><div class='add'>+		(struct ar5416_eeprom *) &amp;ahp-&gt;ah_eeprom;</div><div class='add'>+	u16 spur_val = AR_NO_SPUR;</div><div class='add'>+</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+		 "Getting spur idx %d is2Ghz. %d val %x\n",</div><div class='add'>+		 i, is2GHz, ah-&gt;ah_config.spurchans[i][is2GHz]);</div><div class='add'>+</div><div class='add'>+	switch (ah-&gt;ah_config.spurmode) {</div><div class='add'>+	case SPUR_DISABLE:</div><div class='add'>+		break;</div><div class='add'>+	case SPUR_ENABLE_IOCTL:</div><div class='add'>+		spur_val = ah-&gt;ah_config.spurchans[i][is2GHz];</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+			 "Getting spur val from new loc. %d\n", spur_val);</div><div class='add'>+		break;</div><div class='add'>+	case SPUR_ENABLE_EEPROM:</div><div class='add'>+		spur_val = eep-&gt;modalHeader[is2GHz].spurChans[i].spurChan;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	return spur_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath9k_hw_rfattach(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	bool rfStatus = false;</div><div class='add'>+	int ecode = 0;</div><div class='add'>+</div><div class='add'>+	rfStatus = ath9k_hw_init_rf(ah, &amp;ecode);</div><div class='add'>+	if (!rfStatus) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_RESET,</div><div class='add'>+			 "%s: RF setup failed, status %u\n", __func__,</div><div class='add'>+			 ecode);</div><div class='add'>+		return ecode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath9k_hw_rf_claim(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_PHY(0), 0x00000007);</div><div class='add'>+</div><div class='add'>+	val = ath9k_hw_get_radiorev(ah);</div><div class='add'>+	switch (val &amp; AR_RADIO_SREV_MAJOR) {</div><div class='add'>+	case 0:</div><div class='add'>+		val = AR_RAD5133_SREV_MAJOR;</div><div class='add'>+		break;</div><div class='add'>+	case AR_RAD5133_SREV_MAJOR:</div><div class='add'>+	case AR_RAD5122_SREV_MAJOR:</div><div class='add'>+	case AR_RAD2133_SREV_MAJOR:</div><div class='add'>+	case AR_RAD2122_SREV_MAJOR:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_CHANNEL,</div><div class='add'>+			 "%s: 5G Radio Chip Rev 0x%02X is not "</div><div class='add'>+			"supported by this driver\n",</div><div class='add'>+			 __func__, ah-&gt;ah_analog5GhzRev);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ah-&gt;ah_analog5GhzRev = val;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath9k_hw_init_pll(struct ath_hal *ah,</div><div class='add'>+				     struct ath9k_channel *chan)</div><div class='add'>+{</div><div class='add'>+	u32 pll;</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9100(ah)) {</div><div class='add'>+		if (chan &amp;&amp; IS_CHAN_5GHZ(chan))</div><div class='add'>+			pll = 0x1450;</div><div class='add'>+		else</div><div class='add'>+			pll = 0x1458;</div><div class='add'>+	} else {</div><div class='add'>+		if (AR_SREV_9280_10_OR_LATER(ah)) {</div><div class='add'>+			pll = SM(0x5, AR_RTC_9160_PLL_REFDIV);</div><div class='add'>+</div><div class='add'>+			if (chan &amp;&amp; IS_CHAN_HALF_RATE(chan))</div><div class='add'>+				pll |= SM(0x1, AR_RTC_9160_PLL_CLKSEL);</div><div class='add'>+			else if (chan &amp;&amp; IS_CHAN_QUARTER_RATE(chan))</div><div class='add'>+				pll |= SM(0x2, AR_RTC_9160_PLL_CLKSEL);</div><div class='add'>+</div><div class='add'>+			if (chan &amp;&amp; IS_CHAN_5GHZ(chan)) {</div><div class='add'>+				pll |= SM(0x28, AR_RTC_9160_PLL_DIV);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+				if (AR_SREV_9280_20(ah)) {</div><div class='add'>+					if (((chan-&gt;channel % 20) == 0)</div><div class='add'>+					    || ((chan-&gt;channel % 10) == 0))</div><div class='add'>+						pll = 0x2850;</div><div class='add'>+					else</div><div class='add'>+						pll = 0x142c;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				pll |= SM(0x2c, AR_RTC_9160_PLL_DIV);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		} else if (AR_SREV_9160_10_OR_LATER(ah)) {</div><div class='add'>+</div><div class='add'>+			pll = SM(0x5, AR_RTC_9160_PLL_REFDIV);</div><div class='add'>+</div><div class='add'>+			if (chan &amp;&amp; IS_CHAN_HALF_RATE(chan))</div><div class='add'>+				pll |= SM(0x1, AR_RTC_9160_PLL_CLKSEL);</div><div class='add'>+			else if (chan &amp;&amp; IS_CHAN_QUARTER_RATE(chan))</div><div class='add'>+				pll |= SM(0x2, AR_RTC_9160_PLL_CLKSEL);</div><div class='add'>+</div><div class='add'>+			if (chan &amp;&amp; IS_CHAN_5GHZ(chan))</div><div class='add'>+				pll |= SM(0x50, AR_RTC_9160_PLL_DIV);</div><div class='add'>+			else</div><div class='add'>+				pll |= SM(0x58, AR_RTC_9160_PLL_DIV);</div><div class='add'>+		} else {</div><div class='add'>+			pll = AR_RTC_PLL_REFDIV_5 | AR_RTC_PLL_DIV2;</div><div class='add'>+</div><div class='add'>+			if (chan &amp;&amp; IS_CHAN_HALF_RATE(chan))</div><div class='add'>+				pll |= SM(0x1, AR_RTC_PLL_CLKSEL);</div><div class='add'>+			else if (chan &amp;&amp; IS_CHAN_QUARTER_RATE(chan))</div><div class='add'>+				pll |= SM(0x2, AR_RTC_PLL_CLKSEL);</div><div class='add'>+</div><div class='add'>+			if (chan &amp;&amp; IS_CHAN_5GHZ(chan))</div><div class='add'>+				pll |= SM(0xa, AR_RTC_PLL_DIV);</div><div class='add'>+			else</div><div class='add'>+				pll |= SM(0xb, AR_RTC_PLL_DIV);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	REG_WRITE(ah, (u16) (AR_RTC_PLL_CONTROL), pll);</div><div class='add'>+</div><div class='add'>+	udelay(RTC_PLL_SETTLE_DELAY);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_RTC_SLEEP_CLK, AR_RTC_FORCE_DERIVED_CLK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_set_regs(struct ath_hal *ah, struct ath9k_channel *chan,</div><div class='add'>+			      enum ath9k_ht_macmode macmode)</div><div class='add'>+{</div><div class='add'>+	u32 phymode;</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+</div><div class='add'>+	phymode = AR_PHY_FC_HT_EN | AR_PHY_FC_SHORT_GI_40</div><div class='add'>+		| AR_PHY_FC_SINGLE_HT_LTF1 | AR_PHY_FC_WALSH;</div><div class='add'>+</div><div class='add'>+	if (IS_CHAN_HT40(chan)) {</div><div class='add'>+		phymode |= AR_PHY_FC_DYN2040_EN;</div><div class='add'>+</div><div class='add'>+		if ((chan-&gt;chanmode == CHANNEL_A_HT40PLUS) ||</div><div class='add'>+		    (chan-&gt;chanmode == CHANNEL_G_HT40PLUS))</div><div class='add'>+			phymode |= AR_PHY_FC_DYN2040_PRI_CH;</div><div class='add'>+</div><div class='add'>+		if (ahp-&gt;ah_extprotspacing == ATH9K_HT_EXTPROTSPACING_25)</div><div class='add'>+			phymode |= AR_PHY_FC_DYN2040_EXT_CH;</div><div class='add'>+	}</div><div class='add'>+	REG_WRITE(ah, AR_PHY_TURBO, phymode);</div><div class='add'>+</div><div class='add'>+	ath9k_hw_set11nmac2040(ah, macmode);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_GTXTO, 25 &lt;&lt; AR_GTXTO_TIMEOUT_LIMIT_S);</div><div class='add'>+	REG_WRITE(ah, AR_CST, 0xF &lt;&lt; AR_CST_TIMEOUT_LIMIT_S);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_set_operating_mode(struct ath_hal *ah, int opmode)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = REG_READ(ah, AR_STA_ID1);</div><div class='add'>+	val &amp;= ~(AR_STA_ID1_STA_AP | AR_STA_ID1_ADHOC);</div><div class='add'>+	switch (opmode) {</div><div class='add'>+	case ATH9K_M_HOSTAP:</div><div class='add'>+		REG_WRITE(ah, AR_STA_ID1, val | AR_STA_ID1_STA_AP</div><div class='add'>+			  | AR_STA_ID1_KSRCH_MODE);</div><div class='add'>+		REG_CLR_BIT(ah, AR_CFG, AR_CFG_AP_ADHOC_INDICATION);</div><div class='add'>+		break;</div><div class='add'>+	case ATH9K_M_IBSS:</div><div class='add'>+		REG_WRITE(ah, AR_STA_ID1, val | AR_STA_ID1_ADHOC</div><div class='add'>+			  | AR_STA_ID1_KSRCH_MODE);</div><div class='add'>+		REG_SET_BIT(ah, AR_CFG, AR_CFG_AP_ADHOC_INDICATION);</div><div class='add'>+		break;</div><div class='add'>+	case ATH9K_M_STA:</div><div class='add'>+	case ATH9K_M_MONITOR:</div><div class='add'>+		REG_WRITE(ah, AR_STA_ID1, val | AR_STA_ID1_KSRCH_MODE);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+ath9k_hw_set_rfmode(struct ath_hal *ah, struct ath9k_channel *chan)</div><div class='add'>+{</div><div class='add'>+	u32 rfMode = 0;</div><div class='add'>+</div><div class='add'>+	if (chan == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rfMode |= (IS_CHAN_B(chan) || IS_CHAN_G(chan))</div><div class='add'>+		? AR_PHY_MODE_DYNAMIC : AR_PHY_MODE_OFDM;</div><div class='add'>+</div><div class='add'>+	if (!AR_SREV_9280_10_OR_LATER(ah))</div><div class='add'>+		rfMode |= (IS_CHAN_5GHZ(chan)) ? AR_PHY_MODE_RF5GHZ :</div><div class='add'>+			AR_PHY_MODE_RF2GHZ;</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9280_20(ah) &amp;&amp; IS_CHAN_A_5MHZ_SPACED(chan))</div><div class='add'>+		rfMode |= (AR_PHY_MODE_DYNAMIC | AR_PHY_MODE_DYN_CCK_DISABLE);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_PHY_MODE, rfMode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath9k_hw_set_reset(struct ath_hal *ah, int type)</div><div class='add'>+{</div><div class='add'>+	u32 rst_flags;</div><div class='add'>+	u32 tmpReg;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN |</div><div class='add'>+		  AR_RTC_FORCE_WAKE_ON_INT);</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9100(ah)) {</div><div class='add'>+		rst_flags = AR_RTC_RC_MAC_WARM | AR_RTC_RC_MAC_COLD |</div><div class='add'>+			AR_RTC_RC_COLD_RESET | AR_RTC_RC_WARM_RESET;</div><div class='add'>+	} else {</div><div class='add'>+		tmpReg = REG_READ(ah, AR_INTR_SYNC_CAUSE);</div><div class='add'>+		if (tmpReg &amp;</div><div class='add'>+		    (AR_INTR_SYNC_LOCAL_TIMEOUT |</div><div class='add'>+		     AR_INTR_SYNC_RADM_CPL_TIMEOUT)) {</div><div class='add'>+			REG_WRITE(ah, AR_INTR_SYNC_ENABLE, 0);</div><div class='add'>+			REG_WRITE(ah, AR_RC, AR_RC_AHB | AR_RC_HOSTIF);</div><div class='add'>+		} else {</div><div class='add'>+			REG_WRITE(ah, AR_RC, AR_RC_AHB);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rst_flags = AR_RTC_RC_MAC_WARM;</div><div class='add'>+		if (type == ATH9K_RESET_COLD)</div><div class='add'>+			rst_flags |= AR_RTC_RC_MAC_COLD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, (u16) (AR_RTC_RC), rst_flags);</div><div class='add'>+	udelay(50);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, (u16) (AR_RTC_RC), 0);</div><div class='add'>+	if (!ath9k_hw_wait(ah, (u16) (AR_RTC_RC), AR_RTC_RC_M, 0)) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_RESET,</div><div class='add'>+			"%s: RTC stuck in MAC reset\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!AR_SREV_9100(ah))</div><div class='add'>+		REG_WRITE(ah, AR_RC, 0);</div><div class='add'>+</div><div class='add'>+	ath9k_hw_init_pll(ah, NULL);</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9100(ah))</div><div class='add'>+		udelay(50);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ath9k_hw_set_reset_power_on(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN |</div><div class='add'>+		  AR_RTC_FORCE_WAKE_ON_INT);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, (u16) (AR_RTC_RESET), 0);</div><div class='add'>+	REG_WRITE(ah, (u16) (AR_RTC_RESET), 1);</div><div class='add'>+</div><div class='add'>+	if (!ath9k_hw_wait(ah,</div><div class='add'>+			   AR_RTC_STATUS,</div><div class='add'>+			   AR_RTC_STATUS_M,</div><div class='add'>+			   AR_RTC_STATUS_ON)) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_RESET, "%s: RTC not waking up\n",</div><div class='add'>+			 __func__);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath9k_hw_read_revisions(ah);</div><div class='add'>+</div><div class='add'>+	return ath9k_hw_set_reset(ah, ATH9K_RESET_WARM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath9k_hw_set_reset_reg(struct ath_hal *ah,</div><div class='add'>+				   u32 type)</div><div class='add'>+{</div><div class='add'>+	REG_WRITE(ah, AR_RTC_FORCE_WAKE,</div><div class='add'>+		  AR_RTC_FORCE_WAKE_EN | AR_RTC_FORCE_WAKE_ON_INT);</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ATH9K_RESET_POWER_ON:</div><div class='add'>+		return ath9k_hw_set_reset_power_on(ah);</div><div class='add'>+		break;</div><div class='add'>+	case ATH9K_RESET_WARM:</div><div class='add'>+	case ATH9K_RESET_COLD:</div><div class='add'>+		return ath9k_hw_set_reset(ah, type);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+struct ath9k_channel *ath9k_hw_check_chan(struct ath_hal *ah,</div><div class='add'>+					  struct ath9k_channel *chan)</div><div class='add'>+{</div><div class='add'>+	if (!(IS_CHAN_2GHZ(chan) ^ IS_CHAN_5GHZ(chan))) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_CHANNEL,</div><div class='add'>+			 "%s: invalid channel %u/0x%x; not marked as "</div><div class='add'>+			 "2GHz or 5GHz\n", __func__, chan-&gt;channel,</div><div class='add'>+			 chan-&gt;channelFlags);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!IS_CHAN_OFDM(chan) &amp;&amp;</div><div class='add'>+	      !IS_CHAN_CCK(chan) &amp;&amp;</div><div class='add'>+	      !IS_CHAN_HT20(chan) &amp;&amp;</div><div class='add'>+	      !IS_CHAN_HT40(chan)) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_CHANNEL,</div><div class='add'>+			"%s: invalid channel %u/0x%x; not marked as "</div><div class='add'>+			"OFDM or CCK or HT20 or HT40PLUS or HT40MINUS\n",</div><div class='add'>+			__func__, chan-&gt;channel, chan-&gt;channelFlags);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ath9k_regd_check_channel(ah, chan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+ath9k_hw_get_lower_upper_index(u8 target,</div><div class='add'>+			       u8 *pList,</div><div class='add'>+			       u16 listSize,</div><div class='add'>+			       u16 *indexL,</div><div class='add'>+			       u16 *indexR)</div><div class='add'>+{</div><div class='add'>+	u16 i;</div><div class='add'>+</div><div class='add'>+	if (target &lt;= pList[0]) {</div><div class='add'>+		*indexL = *indexR = 0;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	if (target &gt;= pList[listSize - 1]) {</div><div class='add'>+		*indexL = *indexR = (u16) (listSize - 1);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; listSize - 1; i++) {</div><div class='add'>+		if (pList[i] == target) {</div><div class='add'>+			*indexL = *indexR = i;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+		if (target &lt; pList[i + 1]) {</div><div class='add'>+			*indexL = i;</div><div class='add'>+			*indexR = (u16) (i + 1);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int16_t ath9k_hw_get_nf_hist_mid(int16_t *nfCalBuffer)</div><div class='add'>+{</div><div class='add'>+	int16_t nfval;</div><div class='add'>+	int16_t sort[ATH9K_NF_CAL_HIST_MAX];</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH9K_NF_CAL_HIST_MAX; i++)</div><div class='add'>+		sort[i] = nfCalBuffer[i];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH9K_NF_CAL_HIST_MAX - 1; i++) {</div><div class='add'>+		for (j = 1; j &lt; ATH9K_NF_CAL_HIST_MAX - i; j++) {</div><div class='add'>+			if (sort[j] &gt; sort[j - 1]) {</div><div class='add'>+				nfval = sort[j];</div><div class='add'>+				sort[j] = sort[j - 1];</div><div class='add'>+				sort[j - 1] = nfval;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	nfval = sort[(ATH9K_NF_CAL_HIST_MAX - 1) &gt;&gt; 1];</div><div class='add'>+</div><div class='add'>+	return nfval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_update_nfcal_hist_buffer(struct ath9k_nfcal_hist *h,</div><div class='add'>+					      int16_t *nfarray)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_NF_READINGS; i++) {</div><div class='add'>+		h[i].nfCalBuffer[h[i].currIndex] = nfarray[i];</div><div class='add'>+</div><div class='add'>+		if (++h[i].currIndex &gt;= ATH9K_NF_CAL_HIST_MAX)</div><div class='add'>+			h[i].currIndex = 0;</div><div class='add'>+</div><div class='add'>+		if (h[i].invalidNFcount &gt; 0) {</div><div class='add'>+			if (nfarray[i] &lt; AR_PHY_CCA_MIN_BAD_VALUE</div><div class='add'>+			    || nfarray[i] &gt; AR_PHY_CCA_MAX_HIGH_VALUE) {</div><div class='add'>+				h[i].invalidNFcount = ATH9K_NF_CAL_HIST_MAX;</div><div class='add'>+			} else {</div><div class='add'>+				h[i].invalidNFcount--;</div><div class='add'>+				h[i].privNF = nfarray[i];</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			h[i].privNF =</div><div class='add'>+				ath9k_hw_get_nf_hist_mid(h[i].nfCalBuffer);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar5416GetNoiseFloor(struct ath_hal *ah,</div><div class='add'>+				int16_t nfarray[NUM_NF_READINGS])</div><div class='add'>+{</div><div class='add'>+	int16_t nf;</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9280_10_OR_LATER(ah))</div><div class='add'>+		nf = MS(REG_READ(ah, AR_PHY_CCA), AR9280_PHY_MINCCA_PWR);</div><div class='add'>+	else</div><div class='add'>+		nf = MS(REG_READ(ah, AR_PHY_CCA), AR_PHY_MINCCA_PWR);</div><div class='add'>+</div><div class='add'>+	if (nf &amp; 0x100)</div><div class='add'>+		nf = 0 - ((nf ^ 0x1ff) + 1);</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_CALIBRATE,</div><div class='add'>+		 "NF calibrated [ctl] [chain 0] is %d\n", nf);</div><div class='add'>+	nfarray[0] = nf;</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9280_10_OR_LATER(ah))</div><div class='add'>+		nf = MS(REG_READ(ah, AR_PHY_CH1_CCA),</div><div class='add'>+			AR9280_PHY_CH1_MINCCA_PWR);</div><div class='add'>+	else</div><div class='add'>+		nf = MS(REG_READ(ah, AR_PHY_CH1_CCA),</div><div class='add'>+			AR_PHY_CH1_MINCCA_PWR);</div><div class='add'>+</div><div class='add'>+	if (nf &amp; 0x100)</div><div class='add'>+		nf = 0 - ((nf ^ 0x1ff) + 1);</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_NF_CAL,</div><div class='add'>+		 "NF calibrated [ctl] [chain 1] is %d\n", nf);</div><div class='add'>+	nfarray[1] = nf;</div><div class='add'>+</div><div class='add'>+	if (!AR_SREV_9280(ah)) {</div><div class='add'>+		nf = MS(REG_READ(ah, AR_PHY_CH2_CCA),</div><div class='add'>+			AR_PHY_CH2_MINCCA_PWR);</div><div class='add'>+		if (nf &amp; 0x100)</div><div class='add'>+			nf = 0 - ((nf ^ 0x1ff) + 1);</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_NF_CAL,</div><div class='add'>+			 "NF calibrated [ctl] [chain 2] is %d\n", nf);</div><div class='add'>+		nfarray[2] = nf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9280_10_OR_LATER(ah))</div><div class='add'>+		nf = MS(REG_READ(ah, AR_PHY_EXT_CCA),</div><div class='add'>+			AR9280_PHY_EXT_MINCCA_PWR);</div><div class='add'>+	else</div><div class='add'>+		nf = MS(REG_READ(ah, AR_PHY_EXT_CCA),</div><div class='add'>+			AR_PHY_EXT_MINCCA_PWR);</div><div class='add'>+</div><div class='add'>+	if (nf &amp; 0x100)</div><div class='add'>+		nf = 0 - ((nf ^ 0x1ff) + 1);</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_NF_CAL,</div><div class='add'>+		 "NF calibrated [ext] [chain 0] is %d\n", nf);</div><div class='add'>+	nfarray[3] = nf;</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9280_10_OR_LATER(ah))</div><div class='add'>+		nf = MS(REG_READ(ah, AR_PHY_CH1_EXT_CCA),</div><div class='add'>+			AR9280_PHY_CH1_EXT_MINCCA_PWR);</div><div class='add'>+	else</div><div class='add'>+		nf = MS(REG_READ(ah, AR_PHY_CH1_EXT_CCA),</div><div class='add'>+			AR_PHY_CH1_EXT_MINCCA_PWR);</div><div class='add'>+</div><div class='add'>+	if (nf &amp; 0x100)</div><div class='add'>+		nf = 0 - ((nf ^ 0x1ff) + 1);</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_CALIBRATE,</div><div class='add'>+		 "NF calibrated [ext] [chain 1] is %d\n", nf);</div><div class='add'>+	nfarray[4] = nf;</div><div class='add'>+</div><div class='add'>+	if (!AR_SREV_9280(ah)) {</div><div class='add'>+		nf = MS(REG_READ(ah, AR_PHY_CH2_EXT_CCA),</div><div class='add'>+			AR_PHY_CH2_EXT_MINCCA_PWR);</div><div class='add'>+		if (nf &amp; 0x100)</div><div class='add'>+			nf = 0 - ((nf ^ 0x1ff) + 1);</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_NF_CAL,</div><div class='add'>+			 "NF calibrated [ext] [chain 2] is %d\n", nf);</div><div class='add'>+		nfarray[5] = nf;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+getNoiseFloorThresh(struct ath_hal *ah,</div><div class='add'>+		    const struct ath9k_channel *chan,</div><div class='add'>+		    int16_t *nft)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+</div><div class='add'>+	switch (chan-&gt;chanmode) {</div><div class='add'>+	case CHANNEL_A:</div><div class='add'>+	case CHANNEL_A_HT20:</div><div class='add'>+	case CHANNEL_A_HT40PLUS:</div><div class='add'>+	case CHANNEL_A_HT40MINUS:</div><div class='add'>+		*nft = (int16_t) ath9k_hw_get_eeprom(ahp, EEP_NFTHRESH_5);</div><div class='add'>+		break;</div><div class='add'>+	case CHANNEL_B:</div><div class='add'>+	case CHANNEL_G:</div><div class='add'>+	case CHANNEL_G_HT20:</div><div class='add'>+	case CHANNEL_G_HT40PLUS:</div><div class='add'>+	case CHANNEL_G_HT40MINUS:</div><div class='add'>+		*nft = (int16_t) ath9k_hw_get_eeprom(ahp, EEP_NFTHRESH_2);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_CHANNEL,</div><div class='add'>+			 "%s: invalid channel flags 0x%x\n", __func__,</div><div class='add'>+			 chan-&gt;channelFlags);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_start_nfcal(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+		    AR_PHY_AGC_CONTROL_ENABLE_NF);</div><div class='add'>+	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+		    AR_PHY_AGC_CONTROL_NO_UPDATE_NF);</div><div class='add'>+	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath9k_hw_loadnf(struct ath_hal *ah, struct ath9k_channel *chan)</div><div class='add'>+{</div><div class='add'>+	struct ath9k_nfcal_hist *h;</div><div class='add'>+	int i, j;</div><div class='add'>+	int32_t val;</div><div class='add'>+	const u32 ar5416_cca_regs[6] = {</div><div class='add'>+		AR_PHY_CCA,</div><div class='add'>+		AR_PHY_CH1_CCA,</div><div class='add'>+		AR_PHY_CH2_CCA,</div><div class='add'>+		AR_PHY_EXT_CCA,</div><div class='add'>+		AR_PHY_CH1_EXT_CCA,</div><div class='add'>+		AR_PHY_CH2_EXT_CCA</div><div class='add'>+	};</div><div class='add'>+	u8 chainmask;</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9280(ah))</div><div class='add'>+		chainmask = 0x1B;</div><div class='add'>+	else</div><div class='add'>+		chainmask = 0x3F;</div><div class='add'>+</div><div class='add'>+#ifdef ATH_NF_PER_CHAN</div><div class='add'>+	h = chan-&gt;nfCalHist;</div><div class='add'>+#else</div><div class='add'>+	h = ah-&gt;nfCalHist;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_NF_READINGS; i++) {</div><div class='add'>+		if (chainmask &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			val = REG_READ(ah, ar5416_cca_regs[i]);</div><div class='add'>+			val &amp;= 0xFFFFFE00;</div><div class='add'>+			val |= (((u32) (h[i].privNF) &lt;&lt; 1) &amp; 0x1ff);</div><div class='add'>+			REG_WRITE(ah, ar5416_cca_regs[i], val);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+		    AR_PHY_AGC_CONTROL_ENABLE_NF);</div><div class='add'>+	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+		    AR_PHY_AGC_CONTROL_NO_UPDATE_NF);</div><div class='add'>+	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; 1000; j++) {</div><div class='add'>+		if ((REG_READ(ah, AR_PHY_AGC_CONTROL) &amp;</div><div class='add'>+		     AR_PHY_AGC_CONTROL_NF) == 0)</div><div class='add'>+			break;</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_NF_READINGS; i++) {</div><div class='add'>+		if (chainmask &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			val = REG_READ(ah, ar5416_cca_regs[i]);</div><div class='add'>+			val &amp;= 0xFFFFFE00;</div><div class='add'>+			val |= (((u32) (-50) &lt;&lt; 1) &amp; 0x1ff);</div><div class='add'>+			REG_WRITE(ah, ar5416_cca_regs[i], val);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int16_t ath9k_hw_getnf(struct ath_hal *ah,</div><div class='add'>+			      struct ath9k_channel *chan)</div><div class='add'>+{</div><div class='add'>+	int16_t nf, nfThresh;</div><div class='add'>+	int16_t nfarray[NUM_NF_READINGS] = { 0 };</div><div class='add'>+	struct ath9k_nfcal_hist *h;</div><div class='add'>+	u8 chainmask;</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9280(ah))</div><div class='add'>+		chainmask = 0x1B;</div><div class='add'>+	else</div><div class='add'>+		chainmask = 0x3F;</div><div class='add'>+</div><div class='add'>+	chan-&gt;channelFlags &amp;= (~CHANNEL_CW_INT);</div><div class='add'>+	if (REG_READ(ah, AR_PHY_AGC_CONTROL) &amp; AR_PHY_AGC_CONTROL_NF) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_CALIBRATE,</div><div class='add'>+			 "%s: NF did not complete in calibration window\n",</div><div class='add'>+			 __func__);</div><div class='add'>+		nf = 0;</div><div class='add'>+		chan-&gt;rawNoiseFloor = nf;</div><div class='add'>+		return chan-&gt;rawNoiseFloor;</div><div class='add'>+	} else {</div><div class='add'>+		ar5416GetNoiseFloor(ah, nfarray);</div><div class='add'>+		nf = nfarray[0];</div><div class='add'>+		if (getNoiseFloorThresh(ah, chan, &amp;nfThresh)</div><div class='add'>+		    &amp;&amp; nf &gt; nfThresh) {</div><div class='add'>+			DPRINTF(ah-&gt;ah_sc, ATH_DBG_CALIBRATE,</div><div class='add'>+				 "%s: noise floor failed detected; "</div><div class='add'>+				 "detected %d, threshold %d\n", __func__,</div><div class='add'>+				 nf, nfThresh);</div><div class='add'>+			chan-&gt;channelFlags |= CHANNEL_CW_INT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef ATH_NF_PER_CHAN</div><div class='add'>+	h = chan-&gt;nfCalHist;</div><div class='add'>+#else</div><div class='add'>+	h = ah-&gt;nfCalHist;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	ath9k_hw_update_nfcal_hist_buffer(h, nfarray);</div><div class='add'>+	chan-&gt;rawNoiseFloor = h[0].privNF;</div><div class='add'>+</div><div class='add'>+	return chan-&gt;rawNoiseFloor;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_update_mibstats(struct ath_hal *ah,</div><div class='add'>+			      struct ath9k_mib_stats *stats)</div><div class='add'>+{</div><div class='add'>+	stats-&gt;ackrcv_bad += REG_READ(ah, AR_ACK_FAIL);</div><div class='add'>+	stats-&gt;rts_bad += REG_READ(ah, AR_RTS_FAIL);</div><div class='add'>+	stats-&gt;fcs_bad += REG_READ(ah, AR_FCS_FAIL);</div><div class='add'>+	stats-&gt;rts_good += REG_READ(ah, AR_RTS_OK);</div><div class='add'>+	stats-&gt;beacons += REG_READ(ah, AR_BEACON_CNT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_enable_mib_counters(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI, "Enable mib counters\n");</div><div class='add'>+</div><div class='add'>+	ath9k_hw_update_mibstats(ah, &amp;ahp-&gt;ah_mibStats);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_FILT_OFDM, 0);</div><div class='add'>+	REG_WRITE(ah, AR_FILT_CCK, 0);</div><div class='add'>+	REG_WRITE(ah, AR_MIBC,</div><div class='add'>+		  ~(AR_MIBC_COW | AR_MIBC_FMC | AR_MIBC_CMC | AR_MIBC_MCS)</div><div class='add'>+		  &amp; 0x0f);</div><div class='add'>+	REG_WRITE(ah, AR_PHY_ERR_MASK_1, AR_PHY_ERR_OFDM_TIMING);</div><div class='add'>+	REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_disable_mib_counters(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI, "Disabling MIB counters\n");</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_MIBC, AR_MIBC_FMC | AR_MIBC_CMC);</div><div class='add'>+</div><div class='add'>+	ath9k_hw_update_mibstats(ah, &amp;ahp-&gt;ah_mibStats);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_FILT_OFDM, 0);</div><div class='add'>+	REG_WRITE(ah, AR_FILT_CCK, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath9k_hw_get_ani_channel_idx(struct ath_hal *ah,</div><div class='add'>+					struct ath9k_channel *chan)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ahp-&gt;ah_ani); i++) {</div><div class='add'>+		if (ahp-&gt;ah_ani[i].c.channel == chan-&gt;channel)</div><div class='add'>+			return i;</div><div class='add'>+		if (ahp-&gt;ah_ani[i].c.channel == 0) {</div><div class='add'>+			ahp-&gt;ah_ani[i].c.channel = chan-&gt;channel;</div><div class='add'>+			ahp-&gt;ah_ani[i].c.channelFlags = chan-&gt;channelFlags;</div><div class='add'>+			return i;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+		 "No more channel states left. Using channel 0\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_ani_attach(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ahp-&gt;ah_hasHwPhyCounters = 1;</div><div class='add'>+</div><div class='add'>+	memset(ahp-&gt;ah_ani, 0, sizeof(ahp-&gt;ah_ani));</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ahp-&gt;ah_ani); i++) {</div><div class='add'>+		ahp-&gt;ah_ani[i].ofdmTrigHigh = ATH9K_ANI_OFDM_TRIG_HIGH;</div><div class='add'>+		ahp-&gt;ah_ani[i].ofdmTrigLow = ATH9K_ANI_OFDM_TRIG_LOW;</div><div class='add'>+		ahp-&gt;ah_ani[i].cckTrigHigh = ATH9K_ANI_CCK_TRIG_HIGH;</div><div class='add'>+		ahp-&gt;ah_ani[i].cckTrigLow = ATH9K_ANI_CCK_TRIG_LOW;</div><div class='add'>+		ahp-&gt;ah_ani[i].rssiThrHigh = ATH9K_ANI_RSSI_THR_HIGH;</div><div class='add'>+		ahp-&gt;ah_ani[i].rssiThrLow = ATH9K_ANI_RSSI_THR_LOW;</div><div class='add'>+		ahp-&gt;ah_ani[i].ofdmWeakSigDetectOff =</div><div class='add'>+			!ATH9K_ANI_USE_OFDM_WEAK_SIG;</div><div class='add'>+		ahp-&gt;ah_ani[i].cckWeakSigThreshold =</div><div class='add'>+			ATH9K_ANI_CCK_WEAK_SIG_THR;</div><div class='add'>+		ahp-&gt;ah_ani[i].spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;</div><div class='add'>+		ahp-&gt;ah_ani[i].firstepLevel = ATH9K_ANI_FIRSTEP_LVL;</div><div class='add'>+		if (ahp-&gt;ah_hasHwPhyCounters) {</div><div class='add'>+			ahp-&gt;ah_ani[i].ofdmPhyErrBase =</div><div class='add'>+				AR_PHY_COUNTMAX - ATH9K_ANI_OFDM_TRIG_HIGH;</div><div class='add'>+			ahp-&gt;ah_ani[i].cckPhyErrBase =</div><div class='add'>+				AR_PHY_COUNTMAX - ATH9K_ANI_CCK_TRIG_HIGH;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (ahp-&gt;ah_hasHwPhyCounters) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+			"Setting OfdmErrBase = 0x%08x\n",</div><div class='add'>+			ahp-&gt;ah_ani[0].ofdmPhyErrBase);</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI, "Setting cckErrBase = 0x%08x\n",</div><div class='add'>+			ahp-&gt;ah_ani[0].cckPhyErrBase);</div><div class='add'>+</div><div class='add'>+		REG_WRITE(ah, AR_PHY_ERR_1, ahp-&gt;ah_ani[0].ofdmPhyErrBase);</div><div class='add'>+		REG_WRITE(ah, AR_PHY_ERR_2, ahp-&gt;ah_ani[0].cckPhyErrBase);</div><div class='add'>+		ath9k_enable_mib_counters(ah);</div><div class='add'>+	}</div><div class='add'>+	ahp-&gt;ah_aniPeriod = ATH9K_ANI_PERIOD;</div><div class='add'>+	if (ah-&gt;ah_config.enable_ani)</div><div class='add'>+		ahp-&gt;ah_procPhyErr |= HAL_PROCESS_ANI;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath9k_hw_ani_setup(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	const int totalSizeDesired[] = { -55, -55, -55, -55, -62 };</div><div class='add'>+	const int coarseHigh[] = { -14, -14, -14, -14, -12 };</div><div class='add'>+	const int coarseLow[] = { -64, -64, -64, -64, -70 };</div><div class='add'>+	const int firpwr[] = { -78, -78, -78, -78, -80 };</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 5; i++) {</div><div class='add'>+		ahp-&gt;ah_totalSizeDesired[i] = totalSizeDesired[i];</div><div class='add'>+		ahp-&gt;ah_coarseHigh[i] = coarseHigh[i];</div><div class='add'>+		ahp-&gt;ah_coarseLow[i] = coarseLow[i];</div><div class='add'>+		ahp-&gt;ah_firpwr[i] = firpwr[i];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_ani_detach(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI, "Detaching Ani\n");</div><div class='add'>+	if (ahp-&gt;ah_hasHwPhyCounters) {</div><div class='add'>+		ath9k_hw_disable_mib_counters(ah);</div><div class='add'>+		REG_WRITE(ah, AR_PHY_ERR_1, 0);</div><div class='add'>+		REG_WRITE(ah, AR_PHY_ERR_2, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static bool ath9k_hw_ani_control(struct ath_hal *ah,</div><div class='add'>+				 enum ath9k_ani_cmd cmd, int param)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	struct ar5416AniState *aniState = ahp-&gt;ah_curani;</div><div class='add'>+</div><div class='add'>+	switch (cmd &amp; ahp-&gt;ah_ani_function) {</div><div class='add'>+	case ATH9K_ANI_NOISE_IMMUNITY_LEVEL:{</div><div class='add'>+		u32 level = param;</div><div class='add'>+</div><div class='add'>+		if (level &gt;= ARRAY_SIZE(ahp-&gt;ah_totalSizeDesired)) {</div><div class='add'>+			DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+				 "%s: level out of range (%u &gt; %u)\n",</div><div class='add'>+				 __func__, level,</div><div class='add'>+				 (unsigned) ARRAY_SIZE(ahp-&gt;</div><div class='add'>+						       ah_totalSizeDesired));</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_DESIRED_SZ,</div><div class='add'>+			      AR_PHY_DESIRED_SZ_TOT_DES,</div><div class='add'>+			      ahp-&gt;ah_totalSizeDesired[level]);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_AGC_CTL1,</div><div class='add'>+			      AR_PHY_AGC_CTL1_COARSE_LOW,</div><div class='add'>+			      ahp-&gt;ah_coarseLow[level]);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_AGC_CTL1,</div><div class='add'>+			      AR_PHY_AGC_CTL1_COARSE_HIGH,</div><div class='add'>+			      ahp-&gt;ah_coarseHigh[level]);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,</div><div class='add'>+			      AR_PHY_FIND_SIG_FIRPWR,</div><div class='add'>+			      ahp-&gt;ah_firpwr[level]);</div><div class='add'>+</div><div class='add'>+		if (level &gt; aniState-&gt;noiseImmunityLevel)</div><div class='add'>+			ahp-&gt;ah_stats.ast_ani_niup++;</div><div class='add'>+		else if (level &lt; aniState-&gt;noiseImmunityLevel)</div><div class='add'>+			ahp-&gt;ah_stats.ast_ani_nidown++;</div><div class='add'>+		aniState-&gt;noiseImmunityLevel = level;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION:{</div><div class='add'>+		const int m1ThreshLow[] = { 127, 50 };</div><div class='add'>+		const int m2ThreshLow[] = { 127, 40 };</div><div class='add'>+		const int m1Thresh[] = { 127, 0x4d };</div><div class='add'>+		const int m2Thresh[] = { 127, 0x40 };</div><div class='add'>+		const int m2CountThr[] = { 31, 16 };</div><div class='add'>+		const int m2CountThrLow[] = { 63, 48 };</div><div class='add'>+		u32 on = param ? 1 : 0;</div><div class='add'>+</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,</div><div class='add'>+			      AR_PHY_SFCORR_LOW_M1_THRESH_LOW,</div><div class='add'>+			      m1ThreshLow[on]);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,</div><div class='add'>+			      AR_PHY_SFCORR_LOW_M2_THRESH_LOW,</div><div class='add'>+			      m2ThreshLow[on]);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_SFCORR,</div><div class='add'>+			      AR_PHY_SFCORR_M1_THRESH,</div><div class='add'>+			      m1Thresh[on]);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_SFCORR,</div><div class='add'>+			      AR_PHY_SFCORR_M2_THRESH,</div><div class='add'>+			      m2Thresh[on]);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_SFCORR,</div><div class='add'>+			      AR_PHY_SFCORR_M2COUNT_THR,</div><div class='add'>+			      m2CountThr[on]);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,</div><div class='add'>+			      AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW,</div><div class='add'>+			      m2CountThrLow[on]);</div><div class='add'>+</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,</div><div class='add'>+			      AR_PHY_SFCORR_EXT_M1_THRESH_LOW,</div><div class='add'>+			      m1ThreshLow[on]);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,</div><div class='add'>+			      AR_PHY_SFCORR_EXT_M2_THRESH_LOW,</div><div class='add'>+			      m2ThreshLow[on]);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,</div><div class='add'>+			      AR_PHY_SFCORR_EXT_M1_THRESH,</div><div class='add'>+			      m1Thresh[on]);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,</div><div class='add'>+			      AR_PHY_SFCORR_EXT_M2_THRESH,</div><div class='add'>+			      m2Thresh[on]);</div><div class='add'>+</div><div class='add'>+		if (on)</div><div class='add'>+			REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,</div><div class='add'>+				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);</div><div class='add'>+		else</div><div class='add'>+			REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,</div><div class='add'>+				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);</div><div class='add'>+</div><div class='add'>+		if (!on != aniState-&gt;ofdmWeakSigDetectOff) {</div><div class='add'>+			if (on)</div><div class='add'>+				ahp-&gt;ah_stats.ast_ani_ofdmon++;</div><div class='add'>+			else</div><div class='add'>+				ahp-&gt;ah_stats.ast_ani_ofdmoff++;</div><div class='add'>+			aniState-&gt;ofdmWeakSigDetectOff = !on;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case ATH9K_ANI_CCK_WEAK_SIGNAL_THR:{</div><div class='add'>+		const int weakSigThrCck[] = { 8, 6 };</div><div class='add'>+		u32 high = param ? 1 : 0;</div><div class='add'>+</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_CCK_DETECT,</div><div class='add'>+			      AR_PHY_CCK_DETECT_WEAK_SIG_THR_CCK,</div><div class='add'>+			      weakSigThrCck[high]);</div><div class='add'>+		if (high != aniState-&gt;cckWeakSigThreshold) {</div><div class='add'>+			if (high)</div><div class='add'>+				ahp-&gt;ah_stats.ast_ani_cckhigh++;</div><div class='add'>+			else</div><div class='add'>+				ahp-&gt;ah_stats.ast_ani_ccklow++;</div><div class='add'>+			aniState-&gt;cckWeakSigThreshold = high;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case ATH9K_ANI_FIRSTEP_LEVEL:{</div><div class='add'>+		const int firstep[] = { 0, 4, 8 };</div><div class='add'>+		u32 level = param;</div><div class='add'>+</div><div class='add'>+		if (level &gt;= ARRAY_SIZE(firstep)) {</div><div class='add'>+			DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+				 "%s: level out of range (%u &gt; %u)\n",</div><div class='add'>+				 __func__, level,</div><div class='add'>+				(unsigned) ARRAY_SIZE(firstep));</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,</div><div class='add'>+			      AR_PHY_FIND_SIG_FIRSTEP,</div><div class='add'>+			      firstep[level]);</div><div class='add'>+		if (level &gt; aniState-&gt;firstepLevel)</div><div class='add'>+			ahp-&gt;ah_stats.ast_ani_stepup++;</div><div class='add'>+		else if (level &lt; aniState-&gt;firstepLevel)</div><div class='add'>+			ahp-&gt;ah_stats.ast_ani_stepdown++;</div><div class='add'>+		aniState-&gt;firstepLevel = level;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case ATH9K_ANI_SPUR_IMMUNITY_LEVEL:{</div><div class='add'>+		const int cycpwrThr1[] =</div><div class='add'>+			{ 2, 4, 6, 8, 10, 12, 14, 16 };</div><div class='add'>+		u32 level = param;</div><div class='add'>+</div><div class='add'>+		if (level &gt;= ARRAY_SIZE(cycpwrThr1)) {</div><div class='add'>+			DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+				 "%s: level out of range (%u &gt; %u)\n",</div><div class='add'>+				 __func__, level,</div><div class='add'>+				 (unsigned)</div><div class='add'>+				ARRAY_SIZE(cycpwrThr1));</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_TIMING5,</div><div class='add'>+			      AR_PHY_TIMING5_CYCPWR_THR1,</div><div class='add'>+			      cycpwrThr1[level]);</div><div class='add'>+		if (level &gt; aniState-&gt;spurImmunityLevel)</div><div class='add'>+			ahp-&gt;ah_stats.ast_ani_spurup++;</div><div class='add'>+		else if (level &lt; aniState-&gt;spurImmunityLevel)</div><div class='add'>+			ahp-&gt;ah_stats.ast_ani_spurdown++;</div><div class='add'>+		aniState-&gt;spurImmunityLevel = level;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case ATH9K_ANI_PRESENT:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+			"%s: invalid cmd %u\n", __func__, cmd);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI, "%s: ANI parameters:\n", __func__);</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+		"noiseImmunityLevel=%d, spurImmunityLevel=%d, "</div><div class='add'>+		"ofdmWeakSigDetectOff=%d\n",</div><div class='add'>+		 aniState-&gt;noiseImmunityLevel, aniState-&gt;spurImmunityLevel,</div><div class='add'>+		 !aniState-&gt;ofdmWeakSigDetectOff);</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+		"cckWeakSigThreshold=%d, "</div><div class='add'>+		"firstepLevel=%d, listenTime=%d\n",</div><div class='add'>+		 aniState-&gt;cckWeakSigThreshold, aniState-&gt;firstepLevel,</div><div class='add'>+		 aniState-&gt;listenTime);</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+		 "cycleCount=%d, ofdmPhyErrCount=%d, cckPhyErrCount=%d\n\n",</div><div class='add'>+		 aniState-&gt;cycleCount, aniState-&gt;ofdmPhyErrCount,</div><div class='add'>+		 aniState-&gt;cckPhyErrCount);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_ani_restart(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	struct ar5416AniState *aniState;</div><div class='add'>+</div><div class='add'>+	if (!DO_ANI(ah))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	aniState = ahp-&gt;ah_curani;</div><div class='add'>+</div><div class='add'>+	aniState-&gt;listenTime = 0;</div><div class='add'>+	if (ahp-&gt;ah_hasHwPhyCounters) {</div><div class='add'>+		if (aniState-&gt;ofdmTrigHigh &gt; AR_PHY_COUNTMAX) {</div><div class='add'>+			aniState-&gt;ofdmPhyErrBase = 0;</div><div class='add'>+			DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+				 "OFDM Trigger is too high for hw counters\n");</div><div class='add'>+		} else {</div><div class='add'>+			aniState-&gt;ofdmPhyErrBase =</div><div class='add'>+				AR_PHY_COUNTMAX - aniState-&gt;ofdmTrigHigh;</div><div class='add'>+		}</div><div class='add'>+		if (aniState-&gt;cckTrigHigh &gt; AR_PHY_COUNTMAX) {</div><div class='add'>+			aniState-&gt;cckPhyErrBase = 0;</div><div class='add'>+			DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+				 "CCK Trigger is too high for hw counters\n");</div><div class='add'>+		} else {</div><div class='add'>+			aniState-&gt;cckPhyErrBase =</div><div class='add'>+				AR_PHY_COUNTMAX - aniState-&gt;cckTrigHigh;</div><div class='add'>+		}</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+			 "%s: Writing ofdmbase=%u   cckbase=%u\n",</div><div class='add'>+			 __func__, aniState-&gt;ofdmPhyErrBase,</div><div class='add'>+			 aniState-&gt;cckPhyErrBase);</div><div class='add'>+		REG_WRITE(ah, AR_PHY_ERR_1, aniState-&gt;ofdmPhyErrBase);</div><div class='add'>+		REG_WRITE(ah, AR_PHY_ERR_2, aniState-&gt;cckPhyErrBase);</div><div class='add'>+		REG_WRITE(ah, AR_PHY_ERR_MASK_1, AR_PHY_ERR_OFDM_TIMING);</div><div class='add'>+		REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);</div><div class='add'>+</div><div class='add'>+		ath9k_hw_update_mibstats(ah, &amp;ahp-&gt;ah_mibStats);</div><div class='add'>+	}</div><div class='add'>+	aniState-&gt;ofdmPhyErrCount = 0;</div><div class='add'>+	aniState-&gt;cckPhyErrCount = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	struct ath9k_channel *chan = ah-&gt;ah_curchan;</div><div class='add'>+	struct ar5416AniState *aniState;</div><div class='add'>+	enum wireless_mode mode;</div><div class='add'>+	int32_t rssi;</div><div class='add'>+</div><div class='add'>+	if (!DO_ANI(ah))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	aniState = ahp-&gt;ah_curani;</div><div class='add'>+</div><div class='add'>+	if (aniState-&gt;noiseImmunityLevel &lt; HAL_NOISE_IMMUNE_MAX) {</div><div class='add'>+		if (ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL,</div><div class='add'>+					 aniState-&gt;noiseImmunityLevel + 1)) {</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (aniState-&gt;spurImmunityLevel &lt; HAL_SPUR_IMMUNE_MAX) {</div><div class='add'>+		if (ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL,</div><div class='add'>+					 aniState-&gt;spurImmunityLevel + 1)) {</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_opmode == ATH9K_M_HOSTAP) {</div><div class='add'>+		if (aniState-&gt;firstepLevel &lt; HAL_FIRST_STEP_MAX) {</div><div class='add'>+			ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,</div><div class='add'>+					     aniState-&gt;firstepLevel + 1);</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	rssi = BEACON_RSSI(ahp);</div><div class='add'>+	if (rssi &gt; aniState-&gt;rssiThrHigh) {</div><div class='add'>+		if (!aniState-&gt;ofdmWeakSigDetectOff) {</div><div class='add'>+			if (ath9k_hw_ani_control(ah,</div><div class='add'>+					 ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,</div><div class='add'>+					 false)) {</div><div class='add'>+				ath9k_hw_ani_control(ah,</div><div class='add'>+					ATH9K_ANI_SPUR_IMMUNITY_LEVEL,</div><div class='add'>+					0);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (aniState-&gt;firstepLevel &lt; HAL_FIRST_STEP_MAX) {</div><div class='add'>+			ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,</div><div class='add'>+					     aniState-&gt;firstepLevel + 1);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else if (rssi &gt; aniState-&gt;rssiThrLow) {</div><div class='add'>+		if (aniState-&gt;ofdmWeakSigDetectOff)</div><div class='add'>+			ath9k_hw_ani_control(ah,</div><div class='add'>+				     ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,</div><div class='add'>+				     true);</div><div class='add'>+		if (aniState-&gt;firstepLevel &lt; HAL_FIRST_STEP_MAX)</div><div class='add'>+			ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,</div><div class='add'>+					     aniState-&gt;firstepLevel + 1);</div><div class='add'>+		return;</div><div class='add'>+	} else {</div><div class='add'>+		mode = ath9k_hw_chan2wmode(ah, chan);</div><div class='add'>+		if (mode == ATH9K_MODE_11G || mode == ATH9K_MODE_11B) {</div><div class='add'>+			if (!aniState-&gt;ofdmWeakSigDetectOff)</div><div class='add'>+				ath9k_hw_ani_control(ah,</div><div class='add'>+				     ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,</div><div class='add'>+				     false);</div><div class='add'>+			if (aniState-&gt;firstepLevel &gt; 0)</div><div class='add'>+				ath9k_hw_ani_control(ah,</div><div class='add'>+						     ATH9K_ANI_FIRSTEP_LEVEL,</div><div class='add'>+						     0);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_ani_cck_err_trigger(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	struct ath9k_channel *chan = ah-&gt;ah_curchan;</div><div class='add'>+	struct ar5416AniState *aniState;</div><div class='add'>+	enum wireless_mode mode;</div><div class='add'>+	int32_t rssi;</div><div class='add'>+</div><div class='add'>+	if (!DO_ANI(ah))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	aniState = ahp-&gt;ah_curani;</div><div class='add'>+	if (aniState-&gt;noiseImmunityLevel &lt; HAL_NOISE_IMMUNE_MAX) {</div><div class='add'>+		if (ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL,</div><div class='add'>+					 aniState-&gt;noiseImmunityLevel + 1)) {</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (ah-&gt;ah_opmode == ATH9K_M_HOSTAP) {</div><div class='add'>+		if (aniState-&gt;firstepLevel &lt; HAL_FIRST_STEP_MAX) {</div><div class='add'>+			ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,</div><div class='add'>+					     aniState-&gt;firstepLevel + 1);</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	rssi = BEACON_RSSI(ahp);</div><div class='add'>+	if (rssi &gt; aniState-&gt;rssiThrLow) {</div><div class='add'>+		if (aniState-&gt;firstepLevel &lt; HAL_FIRST_STEP_MAX)</div><div class='add'>+			ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,</div><div class='add'>+					     aniState-&gt;firstepLevel + 1);</div><div class='add'>+	} else {</div><div class='add'>+		mode = ath9k_hw_chan2wmode(ah, chan);</div><div class='add'>+		if (mode == ATH9K_MODE_11G || mode == ATH9K_MODE_11B) {</div><div class='add'>+			if (aniState-&gt;firstepLevel &gt; 0)</div><div class='add'>+				ath9k_hw_ani_control(ah,</div><div class='add'>+						     ATH9K_ANI_FIRSTEP_LEVEL,</div><div class='add'>+						     0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_ani_reset(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	struct ar5416AniState *aniState;</div><div class='add'>+	struct ath9k_channel *chan = ah-&gt;ah_curchan;</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	if (!DO_ANI(ah))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	index = ath9k_hw_get_ani_channel_idx(ah, chan);</div><div class='add'>+	aniState = &amp;ahp-&gt;ah_ani[index];</div><div class='add'>+	ahp-&gt;ah_curani = aniState;</div><div class='add'>+</div><div class='add'>+	if (DO_ANI(ah) &amp;&amp; ah-&gt;ah_opmode != ATH9K_M_STA</div><div class='add'>+	    &amp;&amp; ah-&gt;ah_opmode != ATH9K_M_IBSS) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+			 "%s: Reset ANI state opmode %u\n", __func__,</div><div class='add'>+			 ah-&gt;ah_opmode);</div><div class='add'>+		ahp-&gt;ah_stats.ast_ani_reset++;</div><div class='add'>+		ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL, 0);</div><div class='add'>+		ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL, 0);</div><div class='add'>+		ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL, 0);</div><div class='add'>+		ath9k_hw_ani_control(ah,</div><div class='add'>+				     ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,</div><div class='add'>+				     !ATH9K_ANI_USE_OFDM_WEAK_SIG);</div><div class='add'>+		ath9k_hw_ani_control(ah, ATH9K_ANI_CCK_WEAK_SIGNAL_THR,</div><div class='add'>+				     ATH9K_ANI_CCK_WEAK_SIG_THR);</div><div class='add'>+		ath9k_hw_setrxfilter(ah,</div><div class='add'>+				     ath9k_hw_getrxfilter(ah) |</div><div class='add'>+				     ATH9K_RX_FILTER_PHYERR);</div><div class='add'>+		if (ah-&gt;ah_opmode == ATH9K_M_HOSTAP) {</div><div class='add'>+			ahp-&gt;ah_curani-&gt;ofdmTrigHigh =</div><div class='add'>+				ah-&gt;ah_config.ofdm_trig_high;</div><div class='add'>+			ahp-&gt;ah_curani-&gt;ofdmTrigLow =</div><div class='add'>+				ah-&gt;ah_config.ofdm_trig_low;</div><div class='add'>+			ahp-&gt;ah_curani-&gt;cckTrigHigh =</div><div class='add'>+				ah-&gt;ah_config.cck_trig_high;</div><div class='add'>+			ahp-&gt;ah_curani-&gt;cckTrigLow =</div><div class='add'>+				ah-&gt;ah_config.cck_trig_low;</div><div class='add'>+		}</div><div class='add'>+		ath9k_ani_restart(ah);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (aniState-&gt;noiseImmunityLevel != 0)</div><div class='add'>+		ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL,</div><div class='add'>+				     aniState-&gt;noiseImmunityLevel);</div><div class='add'>+	if (aniState-&gt;spurImmunityLevel != 0)</div><div class='add'>+		ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL,</div><div class='add'>+				     aniState-&gt;spurImmunityLevel);</div><div class='add'>+	if (aniState-&gt;ofdmWeakSigDetectOff)</div><div class='add'>+		ath9k_hw_ani_control(ah,</div><div class='add'>+				     ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,</div><div class='add'>+				     !aniState-&gt;ofdmWeakSigDetectOff);</div><div class='add'>+	if (aniState-&gt;cckWeakSigThreshold)</div><div class='add'>+		ath9k_hw_ani_control(ah, ATH9K_ANI_CCK_WEAK_SIGNAL_THR,</div><div class='add'>+				     aniState-&gt;cckWeakSigThreshold);</div><div class='add'>+	if (aniState-&gt;firstepLevel != 0)</div><div class='add'>+		ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,</div><div class='add'>+				     aniState-&gt;firstepLevel);</div><div class='add'>+	if (ahp-&gt;ah_hasHwPhyCounters) {</div><div class='add'>+		ath9k_hw_setrxfilter(ah,</div><div class='add'>+				     ath9k_hw_getrxfilter(ah) &amp;</div><div class='add'>+				     ~ATH9K_RX_FILTER_PHYERR);</div><div class='add'>+		ath9k_ani_restart(ah);</div><div class='add'>+		REG_WRITE(ah, AR_PHY_ERR_MASK_1, AR_PHY_ERR_OFDM_TIMING);</div><div class='add'>+		REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		ath9k_ani_restart(ah);</div><div class='add'>+		ath9k_hw_setrxfilter(ah,</div><div class='add'>+				     ath9k_hw_getrxfilter(ah) |</div><div class='add'>+				     ATH9K_RX_FILTER_PHYERR);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath9k_hw_procmibevent(struct ath_hal *ah,</div><div class='add'>+			   const struct ath9k_node_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	u32 phyCnt1, phyCnt2;</div><div class='add'>+</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI, "Processing Mib Intr\n");</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_FILT_OFDM, 0);</div><div class='add'>+	REG_WRITE(ah, AR_FILT_CCK, 0);</div><div class='add'>+	if (!(REG_READ(ah, AR_SLP_MIB_CTRL) &amp; AR_SLP_MIB_PENDING))</div><div class='add'>+		REG_WRITE(ah, AR_SLP_MIB_CTRL, AR_SLP_MIB_CLEAR);</div><div class='add'>+</div><div class='add'>+	ath9k_hw_update_mibstats(ah, &amp;ahp-&gt;ah_mibStats);</div><div class='add'>+	ahp-&gt;ah_stats.ast_nodestats = *stats;</div><div class='add'>+</div><div class='add'>+	if (!DO_ANI(ah))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);</div><div class='add'>+	phyCnt2 = REG_READ(ah, AR_PHY_ERR_2);</div><div class='add'>+	if (((phyCnt1 &amp; AR_MIBCNT_INTRMASK) == AR_MIBCNT_INTRMASK) ||</div><div class='add'>+	    ((phyCnt2 &amp; AR_MIBCNT_INTRMASK) == AR_MIBCNT_INTRMASK)) {</div><div class='add'>+		struct ar5416AniState *aniState = ahp-&gt;ah_curani;</div><div class='add'>+		u32 ofdmPhyErrCnt, cckPhyErrCnt;</div><div class='add'>+</div><div class='add'>+		ofdmPhyErrCnt = phyCnt1 - aniState-&gt;ofdmPhyErrBase;</div><div class='add'>+		ahp-&gt;ah_stats.ast_ani_ofdmerrs +=</div><div class='add'>+			ofdmPhyErrCnt - aniState-&gt;ofdmPhyErrCount;</div><div class='add'>+		aniState-&gt;ofdmPhyErrCount = ofdmPhyErrCnt;</div><div class='add'>+</div><div class='add'>+		cckPhyErrCnt = phyCnt2 - aniState-&gt;cckPhyErrBase;</div><div class='add'>+		ahp-&gt;ah_stats.ast_ani_cckerrs +=</div><div class='add'>+			cckPhyErrCnt - aniState-&gt;cckPhyErrCount;</div><div class='add'>+		aniState-&gt;cckPhyErrCount = cckPhyErrCnt;</div><div class='add'>+</div><div class='add'>+		if (aniState-&gt;ofdmPhyErrCount &gt; aniState-&gt;ofdmTrigHigh)</div><div class='add'>+			ath9k_hw_ani_ofdm_err_trigger(ah);</div><div class='add'>+		if (aniState-&gt;cckPhyErrCount &gt; aniState-&gt;cckTrigHigh)</div><div class='add'>+			ath9k_hw_ani_cck_err_trigger(ah);</div><div class='add'>+</div><div class='add'>+		ath9k_ani_restart(ah);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_ani_lower_immunity(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	struct ar5416AniState *aniState;</div><div class='add'>+	int32_t rssi;</div><div class='add'>+</div><div class='add'>+	aniState = ahp-&gt;ah_curani;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_opmode == ATH9K_M_HOSTAP) {</div><div class='add'>+		if (aniState-&gt;firstepLevel &gt; 0) {</div><div class='add'>+			if (ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,</div><div class='add'>+						 aniState-&gt;firstepLevel - 1)) {</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		rssi = BEACON_RSSI(ahp);</div><div class='add'>+		if (rssi &gt; aniState-&gt;rssiThrHigh) {</div><div class='add'>+			/* XXX: Handle me */</div><div class='add'>+		} else if (rssi &gt; aniState-&gt;rssiThrLow) {</div><div class='add'>+			if (aniState-&gt;ofdmWeakSigDetectOff) {</div><div class='add'>+				if (ath9k_hw_ani_control(ah,</div><div class='add'>+					 ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,</div><div class='add'>+					 true) ==</div><div class='add'>+				    true) {</div><div class='add'>+					return;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (aniState-&gt;firstepLevel &gt; 0) {</div><div class='add'>+				if (ath9k_hw_ani_control</div><div class='add'>+				    (ah, ATH9K_ANI_FIRSTEP_LEVEL,</div><div class='add'>+				     aniState-&gt;firstepLevel - 1) ==</div><div class='add'>+				    true) {</div><div class='add'>+					return;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (aniState-&gt;firstepLevel &gt; 0) {</div><div class='add'>+				if (ath9k_hw_ani_control</div><div class='add'>+				    (ah, ATH9K_ANI_FIRSTEP_LEVEL,</div><div class='add'>+				     aniState-&gt;firstepLevel - 1) ==</div><div class='add'>+				    true) {</div><div class='add'>+					return;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (aniState-&gt;spurImmunityLevel &gt; 0) {</div><div class='add'>+		if (ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL,</div><div class='add'>+					 aniState-&gt;spurImmunityLevel - 1)) {</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (aniState-&gt;noiseImmunityLevel &gt; 0) {</div><div class='add'>+		ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL,</div><div class='add'>+				     aniState-&gt;noiseImmunityLevel - 1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int32_t ath9k_hw_ani_get_listen_time(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	struct ar5416AniState *aniState;</div><div class='add'>+	u32 txFrameCount, rxFrameCount, cycleCount;</div><div class='add'>+	int32_t listenTime;</div><div class='add'>+</div><div class='add'>+	txFrameCount = REG_READ(ah, AR_TFCNT);</div><div class='add'>+	rxFrameCount = REG_READ(ah, AR_RFCNT);</div><div class='add'>+	cycleCount = REG_READ(ah, AR_CCCNT);</div><div class='add'>+</div><div class='add'>+	aniState = ahp-&gt;ah_curani;</div><div class='add'>+	if (aniState-&gt;cycleCount == 0 || aniState-&gt;cycleCount &gt; cycleCount) {</div><div class='add'>+</div><div class='add'>+		listenTime = 0;</div><div class='add'>+		ahp-&gt;ah_stats.ast_ani_lzero++;</div><div class='add'>+	} else {</div><div class='add'>+		int32_t ccdelta = cycleCount - aniState-&gt;cycleCount;</div><div class='add'>+		int32_t rfdelta = rxFrameCount - aniState-&gt;rxFrameCount;</div><div class='add'>+		int32_t tfdelta = txFrameCount - aniState-&gt;txFrameCount;</div><div class='add'>+		listenTime = (ccdelta - rfdelta - tfdelta) / 44000;</div><div class='add'>+	}</div><div class='add'>+	aniState-&gt;cycleCount = cycleCount;</div><div class='add'>+	aniState-&gt;txFrameCount = txFrameCount;</div><div class='add'>+	aniState-&gt;rxFrameCount = rxFrameCount;</div><div class='add'>+</div><div class='add'>+	return listenTime;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath9k_hw_ani_monitor(struct ath_hal *ah,</div><div class='add'>+			  const struct ath9k_node_stats *stats,</div><div class='add'>+			  struct ath9k_channel *chan)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	struct ar5416AniState *aniState;</div><div class='add'>+	int32_t listenTime;</div><div class='add'>+</div><div class='add'>+	aniState = ahp-&gt;ah_curani;</div><div class='add'>+	ahp-&gt;ah_stats.ast_nodestats = *stats;</div><div class='add'>+</div><div class='add'>+	listenTime = ath9k_hw_ani_get_listen_time(ah);</div><div class='add'>+	if (listenTime &lt; 0) {</div><div class='add'>+		ahp-&gt;ah_stats.ast_ani_lneg++;</div><div class='add'>+		ath9k_ani_restart(ah);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	aniState-&gt;listenTime += listenTime;</div><div class='add'>+</div><div class='add'>+	if (ahp-&gt;ah_hasHwPhyCounters) {</div><div class='add'>+		u32 phyCnt1, phyCnt2;</div><div class='add'>+		u32 ofdmPhyErrCnt, cckPhyErrCnt;</div><div class='add'>+</div><div class='add'>+		ath9k_hw_update_mibstats(ah, &amp;ahp-&gt;ah_mibStats);</div><div class='add'>+</div><div class='add'>+		phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);</div><div class='add'>+		phyCnt2 = REG_READ(ah, AR_PHY_ERR_2);</div><div class='add'>+</div><div class='add'>+		if (phyCnt1 &lt; aniState-&gt;ofdmPhyErrBase ||</div><div class='add'>+		    phyCnt2 &lt; aniState-&gt;cckPhyErrBase) {</div><div class='add'>+			if (phyCnt1 &lt; aniState-&gt;ofdmPhyErrBase) {</div><div class='add'>+				DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+					 "%s: phyCnt1 0x%x, resetting "</div><div class='add'>+					 "counter value to 0x%x\n",</div><div class='add'>+					 __func__, phyCnt1,</div><div class='add'>+					 aniState-&gt;ofdmPhyErrBase);</div><div class='add'>+				REG_WRITE(ah, AR_PHY_ERR_1,</div><div class='add'>+					  aniState-&gt;ofdmPhyErrBase);</div><div class='add'>+				REG_WRITE(ah, AR_PHY_ERR_MASK_1,</div><div class='add'>+					  AR_PHY_ERR_OFDM_TIMING);</div><div class='add'>+			}</div><div class='add'>+			if (phyCnt2 &lt; aniState-&gt;cckPhyErrBase) {</div><div class='add'>+				DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANI,</div><div class='add'>+					 "%s: phyCnt2 0x%x, resetting "</div><div class='add'>+					 "counter value to 0x%x\n",</div><div class='add'>+					 __func__, phyCnt2,</div><div class='add'>+					 aniState-&gt;cckPhyErrBase);</div><div class='add'>+				REG_WRITE(ah, AR_PHY_ERR_2,</div><div class='add'>+					  aniState-&gt;cckPhyErrBase);</div><div class='add'>+				REG_WRITE(ah, AR_PHY_ERR_MASK_2,</div><div class='add'>+					  AR_PHY_ERR_CCK_TIMING);</div><div class='add'>+			}</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ofdmPhyErrCnt = phyCnt1 - aniState-&gt;ofdmPhyErrBase;</div><div class='add'>+		ahp-&gt;ah_stats.ast_ani_ofdmerrs +=</div><div class='add'>+			ofdmPhyErrCnt - aniState-&gt;ofdmPhyErrCount;</div><div class='add'>+		aniState-&gt;ofdmPhyErrCount = ofdmPhyErrCnt;</div><div class='add'>+</div><div class='add'>+		cckPhyErrCnt = phyCnt2 - aniState-&gt;cckPhyErrBase;</div><div class='add'>+		ahp-&gt;ah_stats.ast_ani_cckerrs +=</div><div class='add'>+			cckPhyErrCnt - aniState-&gt;cckPhyErrCount;</div><div class='add'>+		aniState-&gt;cckPhyErrCount = cckPhyErrCnt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!DO_ANI(ah))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (aniState-&gt;listenTime &gt; 5 * ahp-&gt;ah_aniPeriod) {</div><div class='add'>+		if (aniState-&gt;ofdmPhyErrCount &lt;= aniState-&gt;listenTime *</div><div class='add'>+		    aniState-&gt;ofdmTrigLow / 1000 &amp;&amp;</div><div class='add'>+		    aniState-&gt;cckPhyErrCount &lt;= aniState-&gt;listenTime *</div><div class='add'>+		    aniState-&gt;cckTrigLow / 1000)</div><div class='add'>+			ath9k_hw_ani_lower_immunity(ah);</div><div class='add'>+		ath9k_ani_restart(ah);</div><div class='add'>+	} else if (aniState-&gt;listenTime &gt; ahp-&gt;ah_aniPeriod) {</div><div class='add'>+		if (aniState-&gt;ofdmPhyErrCount &gt; aniState-&gt;listenTime *</div><div class='add'>+		    aniState-&gt;ofdmTrigHigh / 1000) {</div><div class='add'>+			ath9k_hw_ani_ofdm_err_trigger(ah);</div><div class='add'>+			ath9k_ani_restart(ah);</div><div class='add'>+		} else if (aniState-&gt;cckPhyErrCount &gt;</div><div class='add'>+			   aniState-&gt;listenTime * aniState-&gt;cckTrigHigh /</div><div class='add'>+			   1000) {</div><div class='add'>+			ath9k_hw_ani_cck_err_trigger(ah);</div><div class='add'>+			ath9k_ani_restart(ah);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef ATH_NF_PER_CHAN</div><div class='add'>+static void ath9k_init_nfcal_hist_buffer(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_NF_READINGS; i++) {</div><div class='add'>+		ah-&gt;nfCalHist[i].currIndex = 0;</div><div class='add'>+		ah-&gt;nfCalHist[i].privNF = AR_PHY_CCA_MAX_GOOD_VALUE;</div><div class='add'>+		ah-&gt;nfCalHist[i].invalidNFcount =</div><div class='add'>+			AR_PHY_CCA_FILTERWINDOW_LENGTH;</div><div class='add'>+		for (j = 0; j &lt; ATH9K_NF_CAL_HIST_MAX; j++) {</div><div class='add'>+			ah-&gt;nfCalHist[i].nfCalBuffer[j] =</div><div class='add'>+				AR_PHY_CCA_MAX_GOOD_VALUE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void ath9k_hw_gpio_cfg_output_mux(struct ath_hal *ah,</div><div class='add'>+					 u32 gpio, u32 type)</div><div class='add'>+{</div><div class='add'>+	int addr;</div><div class='add'>+	u32 gpio_shift, tmp;</div><div class='add'>+</div><div class='add'>+	if (gpio &gt; 11)</div><div class='add'>+		addr = AR_GPIO_OUTPUT_MUX3;</div><div class='add'>+	else if (gpio &gt; 5)</div><div class='add'>+		addr = AR_GPIO_OUTPUT_MUX2;</div><div class='add'>+	else</div><div class='add'>+		addr = AR_GPIO_OUTPUT_MUX1;</div><div class='add'>+</div><div class='add'>+	gpio_shift = (gpio % 6) * 5;</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9280_20_OR_LATER(ah)</div><div class='add'>+	    || (addr != AR_GPIO_OUTPUT_MUX1)) {</div><div class='add'>+		REG_RMW(ah, addr, (type &lt;&lt; gpio_shift),</div><div class='add'>+			(0x1f &lt;&lt; gpio_shift));</div><div class='add'>+	} else {</div><div class='add'>+		tmp = REG_READ(ah, addr);</div><div class='add'>+		tmp = ((tmp &amp; 0x1F0) &lt;&lt; 1) | (tmp &amp; ~0x1F0);</div><div class='add'>+		tmp &amp;= ~(0x1f &lt;&lt; gpio_shift);</div><div class='add'>+		tmp |= (type &lt;&lt; gpio_shift);</div><div class='add'>+		REG_WRITE(ah, addr, tmp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath9k_hw_cfg_output(struct ath_hal *ah, u32 gpio,</div><div class='add'>+				enum ath9k_gpio_output_mux_type</div><div class='add'>+				halSignalType)</div><div class='add'>+{</div><div class='add'>+	u32 ah_signal_type;</div><div class='add'>+	u32 gpio_shift;</div><div class='add'>+</div><div class='add'>+	static u32 MuxSignalConversionTable[] = {</div><div class='add'>+</div><div class='add'>+		AR_GPIO_OUTPUT_MUX_AS_OUTPUT,</div><div class='add'>+</div><div class='add'>+		AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED,</div><div class='add'>+</div><div class='add'>+		AR_GPIO_OUTPUT_MUX_AS_PCIE_POWER_LED,</div><div class='add'>+</div><div class='add'>+		AR_GPIO_OUTPUT_MUX_AS_MAC_NETWORK_LED,</div><div class='add'>+</div><div class='add'>+		AR_GPIO_OUTPUT_MUX_AS_MAC_POWER_LED,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if ((halSignalType &gt;= 0)</div><div class='add'>+	    &amp;&amp; (halSignalType &lt; ARRAY_SIZE(MuxSignalConversionTable)))</div><div class='add'>+		ah_signal_type = MuxSignalConversionTable[halSignalType];</div><div class='add'>+	else</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ath9k_hw_gpio_cfg_output_mux(ah, gpio, ah_signal_type);</div><div class='add'>+</div><div class='add'>+	gpio_shift = 2 * gpio;</div><div class='add'>+</div><div class='add'>+	REG_RMW(ah,</div><div class='add'>+		AR_GPIO_OE_OUT,</div><div class='add'>+		(AR_GPIO_OE_OUT_DRV_ALL &lt;&lt; gpio_shift),</div><div class='add'>+		(AR_GPIO_OE_OUT_DRV &lt;&lt; gpio_shift));</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath9k_hw_set_gpio(struct ath_hal *ah, u32 gpio,</div><div class='add'>+			      u32 val)</div><div class='add'>+{</div><div class='add'>+	REG_RMW(ah, AR_GPIO_IN_OUT, ((val &amp; 1) &lt;&lt; gpio),</div><div class='add'>+		AR_GPIO_BIT(gpio));</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath9k_hw_gpio_get(struct ath_hal *ah, u32 gpio)</div><div class='add'>+{</div><div class='add'>+	if (gpio &gt;= ah-&gt;ah_caps.num_gpio_pins)</div><div class='add'>+		return 0xffffffff;</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9280_10_OR_LATER(ah)) {</div><div class='add'>+		return (MS</div><div class='add'>+			(REG_READ(ah, AR_GPIO_IN_OUT),</div><div class='add'>+			 AR928X_GPIO_IN_VAL) &amp; AR_GPIO_BIT(gpio)) != 0;</div><div class='add'>+	} else {</div><div class='add'>+		return (MS(REG_READ(ah, AR_GPIO_IN_OUT), AR_GPIO_IN_VAL) &amp;</div><div class='add'>+			AR_GPIO_BIT(gpio)) != 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath9k_hw_post_attach(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	int ecode;</div><div class='add'>+</div><div class='add'>+	if (!ath9k_hw_chip_test(ah)) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_REG_IO,</div><div class='add'>+			 "%s: hardware self-test failed\n", __func__);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ecode = ath9k_hw_rf_claim(ah);</div><div class='add'>+	if (ecode != 0)</div><div class='add'>+		return ecode;</div><div class='add'>+</div><div class='add'>+	ecode = ath9k_hw_eeprom_attach(ah);</div><div class='add'>+	if (ecode != 0)</div><div class='add'>+		return ecode;</div><div class='add'>+	ecode = ath9k_hw_rfattach(ah);</div><div class='add'>+	if (ecode != 0)</div><div class='add'>+		return ecode;</div><div class='add'>+</div><div class='add'>+	if (!AR_SREV_9100(ah)) {</div><div class='add'>+		ath9k_hw_ani_setup(ah);</div><div class='add'>+		ath9k_hw_ani_attach(ah);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath9k_hw_ini_fixup(struct ath_hal *ah,</div><div class='add'>+				    struct ar5416_eeprom *pEepData,</div><div class='add'>+				    u32 reg, u32 value)</div><div class='add'>+{</div><div class='add'>+	struct base_eep_header *pBase = &amp;(pEepData-&gt;baseEepHeader);</div><div class='add'>+</div><div class='add'>+	switch (ah-&gt;ah_devid) {</div><div class='add'>+	case AR9280_DEVID_PCI:</div><div class='add'>+		if (reg == 0x7894) {</div><div class='add'>+			DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANY,</div><div class='add'>+				 "ini VAL: %x  EEPROM: %x\n", value,</div><div class='add'>+				 (pBase-&gt;version &amp; 0xff));</div><div class='add'>+</div><div class='add'>+			if ((pBase-&gt;version &amp; 0xff) &gt; 0x0a) {</div><div class='add'>+				DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANY,</div><div class='add'>+					 "PWDCLKIND: %d\n",</div><div class='add'>+					 pBase-&gt;pwdclkind);</div><div class='add'>+				value &amp;= ~AR_AN_TOP2_PWDCLKIND;</div><div class='add'>+				value |= AR_AN_TOP2_PWDCLKIND &amp; (pBase-&gt;</div><div class='add'>+					 pwdclkind &lt;&lt; AR_AN_TOP2_PWDCLKIND_S);</div><div class='add'>+			} else {</div><div class='add'>+				DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANY,</div><div class='add'>+					 "PWDCLKIND Earlier Rev\n");</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			DPRINTF(ah-&gt;ah_sc, ATH_DBG_ANY,</div><div class='add'>+				 "final ini VAL: %x\n", value);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath9k_hw_fill_cap_info(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	struct ath9k_hw_capabilities *pCap = &amp;ah-&gt;ah_caps;</div><div class='add'>+	u16 capField = 0, eeval;</div><div class='add'>+</div><div class='add'>+	eeval = ath9k_hw_get_eeprom(ahp, EEP_REG_0);</div><div class='add'>+</div><div class='add'>+	ah-&gt;ah_currentRD = eeval;</div><div class='add'>+</div><div class='add'>+	eeval = ath9k_hw_get_eeprom(ahp, EEP_REG_1);</div><div class='add'>+	ah-&gt;ah_currentRDExt = eeval;</div><div class='add'>+</div><div class='add'>+	capField = ath9k_hw_get_eeprom(ahp, EEP_OP_CAP);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_opmode != ATH9K_M_HOSTAP &amp;&amp;</div><div class='add'>+	    ah-&gt;ah_subvendorid == AR_SUBVENDOR_ID_NEW_A) {</div><div class='add'>+		if (ah-&gt;ah_currentRD == 0x64 || ah-&gt;ah_currentRD == 0x65)</div><div class='add'>+			ah-&gt;ah_currentRD += 5;</div><div class='add'>+		else if (ah-&gt;ah_currentRD == 0x41)</div><div class='add'>+			ah-&gt;ah_currentRD = 0x43;</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_REGULATORY,</div><div class='add'>+			 "%s: regdomain mapped to 0x%x\n", __func__,</div><div class='add'>+			 ah-&gt;ah_currentRD);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	eeval = ath9k_hw_get_eeprom(ahp, EEP_OP_MODE);</div><div class='add'>+	bitmap_zero(pCap-&gt;wireless_modes, ATH9K_MODE_MAX);</div><div class='add'>+</div><div class='add'>+	if (eeval &amp; AR5416_OPFLAGS_11A) {</div><div class='add'>+		set_bit(ATH9K_MODE_11A, pCap-&gt;wireless_modes);</div><div class='add'>+		if (ah-&gt;ah_config.ht_enable) {</div><div class='add'>+			if (!(eeval &amp; AR5416_OPFLAGS_N_5G_HT20))</div><div class='add'>+				set_bit(ATH9K_MODE_11NA_HT20,</div><div class='add'>+					pCap-&gt;wireless_modes);</div><div class='add'>+			if (!(eeval &amp; AR5416_OPFLAGS_N_5G_HT40)) {</div><div class='add'>+				set_bit(ATH9K_MODE_11NA_HT40PLUS,</div><div class='add'>+					pCap-&gt;wireless_modes);</div><div class='add'>+				set_bit(ATH9K_MODE_11NA_HT40MINUS,</div><div class='add'>+					pCap-&gt;wireless_modes);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (eeval &amp; AR5416_OPFLAGS_11G) {</div><div class='add'>+		set_bit(ATH9K_MODE_11B, pCap-&gt;wireless_modes);</div><div class='add'>+		set_bit(ATH9K_MODE_11G, pCap-&gt;wireless_modes);</div><div class='add'>+		if (ah-&gt;ah_config.ht_enable) {</div><div class='add'>+			if (!(eeval &amp; AR5416_OPFLAGS_N_2G_HT20))</div><div class='add'>+				set_bit(ATH9K_MODE_11NG_HT20,</div><div class='add'>+					pCap-&gt;wireless_modes);</div><div class='add'>+			if (!(eeval &amp; AR5416_OPFLAGS_N_2G_HT40)) {</div><div class='add'>+				set_bit(ATH9K_MODE_11NG_HT40PLUS,</div><div class='add'>+					pCap-&gt;wireless_modes);</div><div class='add'>+				set_bit(ATH9K_MODE_11NG_HT40MINUS,</div><div class='add'>+					pCap-&gt;wireless_modes);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pCap-&gt;tx_chainmask = ath9k_hw_get_eeprom(ahp, EEP_TX_MASK);</div><div class='add'>+	if ((ah-&gt;ah_isPciExpress)</div><div class='add'>+	    || (eeval &amp; AR5416_OPFLAGS_11A)) {</div><div class='add'>+		pCap-&gt;rx_chainmask =</div><div class='add'>+			ath9k_hw_get_eeprom(ahp, EEP_RX_MASK);</div><div class='add'>+	} else {</div><div class='add'>+		pCap-&gt;rx_chainmask =</div><div class='add'>+			(ath9k_hw_gpio_get(ah, 0)) ? 0x5 : 0x7;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(AR_SREV_9280(ah) &amp;&amp; (ah-&gt;ah_macRev == 0)))</div><div class='add'>+		ahp-&gt;ah_miscMode |= AR_PCU_MIC_NEW_LOC_ENA;</div><div class='add'>+</div><div class='add'>+	pCap-&gt;low_2ghz_chan = 2312;</div><div class='add'>+	pCap-&gt;high_2ghz_chan = 2732;</div><div class='add'>+</div><div class='add'>+	pCap-&gt;low_5ghz_chan = 4920;</div><div class='add'>+	pCap-&gt;high_5ghz_chan = 6100;</div><div class='add'>+</div><div class='add'>+	pCap-&gt;hw_caps &amp;= ~ATH9K_HW_CAP_CIPHER_CKIP;</div><div class='add'>+	pCap-&gt;hw_caps |= ATH9K_HW_CAP_CIPHER_TKIP;</div><div class='add'>+	pCap-&gt;hw_caps |= ATH9K_HW_CAP_CIPHER_AESCCM;</div><div class='add'>+</div><div class='add'>+	pCap-&gt;hw_caps &amp;= ~ATH9K_HW_CAP_MIC_CKIP;</div><div class='add'>+	pCap-&gt;hw_caps |= ATH9K_HW_CAP_MIC_TKIP;</div><div class='add'>+	pCap-&gt;hw_caps |= ATH9K_HW_CAP_MIC_AESCCM;</div><div class='add'>+</div><div class='add'>+	pCap-&gt;hw_caps |= ATH9K_HW_CAP_CHAN_SPREAD;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_config.ht_enable)</div><div class='add'>+		pCap-&gt;hw_caps |= ATH9K_HW_CAP_HT;</div><div class='add'>+	else</div><div class='add'>+		pCap-&gt;hw_caps &amp;= ~ATH9K_HW_CAP_HT;</div><div class='add'>+</div><div class='add'>+	pCap-&gt;hw_caps |= ATH9K_HW_CAP_GTT;</div><div class='add'>+	pCap-&gt;hw_caps |= ATH9K_HW_CAP_VEOL;</div><div class='add'>+	pCap-&gt;hw_caps |= ATH9K_HW_CAP_BSSIDMASK;</div><div class='add'>+	pCap-&gt;hw_caps &amp;= ~ATH9K_HW_CAP_MCAST_KEYSEARCH;</div><div class='add'>+</div><div class='add'>+	if (capField &amp; AR_EEPROM_EEPCAP_MAXQCU)</div><div class='add'>+		pCap-&gt;total_queues =</div><div class='add'>+			MS(capField, AR_EEPROM_EEPCAP_MAXQCU);</div><div class='add'>+	else</div><div class='add'>+		pCap-&gt;total_queues = ATH9K_NUM_TX_QUEUES;</div><div class='add'>+</div><div class='add'>+	if (capField &amp; AR_EEPROM_EEPCAP_KC_ENTRIES)</div><div class='add'>+		pCap-&gt;keycache_size =</div><div class='add'>+			1 &lt;&lt; MS(capField, AR_EEPROM_EEPCAP_KC_ENTRIES);</div><div class='add'>+	else</div><div class='add'>+		pCap-&gt;keycache_size = AR_KEYTABLE_SIZE;</div><div class='add'>+</div><div class='add'>+	pCap-&gt;hw_caps |= ATH9K_HW_CAP_FASTCC;</div><div class='add'>+	pCap-&gt;num_mr_retries = 4;</div><div class='add'>+	pCap-&gt;tx_triglevel_max = MAX_TX_FIFO_THRESHOLD;</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9280_10_OR_LATER(ah))</div><div class='add'>+		pCap-&gt;num_gpio_pins = AR928X_NUM_GPIO;</div><div class='add'>+	else</div><div class='add'>+		pCap-&gt;num_gpio_pins = AR_NUM_GPIO;</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9280_10_OR_LATER(ah)) {</div><div class='add'>+		pCap-&gt;hw_caps |= ATH9K_HW_CAP_WOW;</div><div class='add'>+		pCap-&gt;hw_caps |= ATH9K_HW_CAP_WOW_MATCHPATTERN_EXACT;</div><div class='add'>+	} else {</div><div class='add'>+		pCap-&gt;hw_caps &amp;= ~ATH9K_HW_CAP_WOW;</div><div class='add'>+		pCap-&gt;hw_caps &amp;= ~ATH9K_HW_CAP_WOW_MATCHPATTERN_EXACT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9160_10_OR_LATER(ah) || AR_SREV_9100(ah)) {</div><div class='add'>+		pCap-&gt;hw_caps |= ATH9K_HW_CAP_CST;</div><div class='add'>+		pCap-&gt;rts_aggr_limit = ATH_AMPDU_LIMIT_MAX;</div><div class='add'>+	} else {</div><div class='add'>+		pCap-&gt;rts_aggr_limit = (8 * 1024);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pCap-&gt;hw_caps |= ATH9K_HW_CAP_ENHANCEDPM;</div><div class='add'>+</div><div class='add'>+	ah-&gt;ah_rfsilent = ath9k_hw_get_eeprom(ahp, EEP_RF_SILENT);</div><div class='add'>+	if (ah-&gt;ah_rfsilent &amp; EEP_RFSILENT_ENABLED) {</div><div class='add'>+		ahp-&gt;ah_gpioSelect =</div><div class='add'>+			MS(ah-&gt;ah_rfsilent, EEP_RFSILENT_GPIO_SEL);</div><div class='add'>+		ahp-&gt;ah_polarity =</div><div class='add'>+			MS(ah-&gt;ah_rfsilent, EEP_RFSILENT_POLARITY);</div><div class='add'>+</div><div class='add'>+		ath9k_hw_setcapability(ah, ATH9K_CAP_RFSILENT, 1, true,</div><div class='add'>+				       NULL);</div><div class='add'>+		pCap-&gt;hw_caps |= ATH9K_HW_CAP_RFSILENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((ah-&gt;ah_macVersion == AR_SREV_VERSION_5416_PCI) ||</div><div class='add'>+	    (ah-&gt;ah_macVersion == AR_SREV_VERSION_5416_PCIE) ||</div><div class='add'>+	    (ah-&gt;ah_macVersion == AR_SREV_VERSION_9160) ||</div><div class='add'>+	    (ah-&gt;ah_macVersion == AR_SREV_VERSION_9100) ||</div><div class='add'>+	    (ah-&gt;ah_macVersion == AR_SREV_VERSION_9280))</div><div class='add'>+		pCap-&gt;hw_caps &amp;= ~ATH9K_HW_CAP_AUTOSLEEP;</div><div class='add'>+	else</div><div class='add'>+		pCap-&gt;hw_caps |= ATH9K_HW_CAP_AUTOSLEEP;</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9280(ah))</div><div class='add'>+		pCap-&gt;hw_caps &amp;= ~ATH9K_HW_CAP_4KB_SPLITTRANS;</div><div class='add'>+	else</div><div class='add'>+		pCap-&gt;hw_caps |= ATH9K_HW_CAP_4KB_SPLITTRANS;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_currentRDExt &amp; (1 &lt;&lt; REG_EXT_JAPAN_MIDBAND)) {</div><div class='add'>+		pCap-&gt;reg_cap =</div><div class='add'>+			AR_EEPROM_EEREGCAP_EN_KK_NEW_11A |</div><div class='add'>+			AR_EEPROM_EEREGCAP_EN_KK_U1_EVEN |</div><div class='add'>+			AR_EEPROM_EEREGCAP_EN_KK_U2 |</div><div class='add'>+			AR_EEPROM_EEREGCAP_EN_KK_MIDBAND;</div><div class='add'>+	} else {</div><div class='add'>+		pCap-&gt;reg_cap =</div><div class='add'>+			AR_EEPROM_EEREGCAP_EN_KK_NEW_11A |</div><div class='add'>+			AR_EEPROM_EEREGCAP_EN_KK_U1_EVEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pCap-&gt;reg_cap |= AR_EEPROM_EEREGCAP_EN_FCC_MIDBAND;</div><div class='add'>+</div><div class='add'>+	pCap-&gt;num_antcfg_5ghz =</div><div class='add'>+		ath9k_hw_get_num_ant_config(ahp, IEEE80211_BAND_5GHZ);</div><div class='add'>+	pCap-&gt;num_antcfg_2ghz =</div><div class='add'>+		ath9k_hw_get_num_ant_config(ahp, IEEE80211_BAND_2GHZ);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar5416DisablePciePhy(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	if (!AR_SREV_9100(ah))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_PCIE_SERDES, 0x9248fc00);</div><div class='add'>+	REG_WRITE(ah, AR_PCIE_SERDES, 0x24924924);</div><div class='add'>+	REG_WRITE(ah, AR_PCIE_SERDES, 0x28000029);</div><div class='add'>+	REG_WRITE(ah, AR_PCIE_SERDES, 0x57160824);</div><div class='add'>+	REG_WRITE(ah, AR_PCIE_SERDES, 0x25980579);</div><div class='add'>+	REG_WRITE(ah, AR_PCIE_SERDES, 0x00000000);</div><div class='add'>+	REG_WRITE(ah, AR_PCIE_SERDES, 0x1aaabe40);</div><div class='add'>+	REG_WRITE(ah, AR_PCIE_SERDES, 0xbe105554);</div><div class='add'>+	REG_WRITE(ah, AR_PCIE_SERDES, 0x000e1007);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_PCIE_SERDES2, 0x00000000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_set_power_sleep(struct ath_hal *ah, int setChip)</div><div class='add'>+{</div><div class='add'>+	REG_SET_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV);</div><div class='add'>+	if (setChip) {</div><div class='add'>+		REG_CLR_BIT(ah, AR_RTC_FORCE_WAKE,</div><div class='add'>+			    AR_RTC_FORCE_WAKE_EN);</div><div class='add'>+		if (!AR_SREV_9100(ah))</div><div class='add'>+			REG_WRITE(ah, AR_RC, AR_RC_AHB | AR_RC_HOSTIF);</div><div class='add'>+</div><div class='add'>+		REG_CLR_BIT(ah, (u16) (AR_RTC_RESET),</div><div class='add'>+			    AR_RTC_RESET_EN);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath9k_set_power_network_sleep(struct ath_hal *ah, int setChip)</div><div class='add'>+{</div><div class='add'>+	REG_SET_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV);</div><div class='add'>+	if (setChip) {</div><div class='add'>+		struct ath9k_hw_capabilities *pCap = &amp;ah-&gt;ah_caps;</div><div class='add'>+</div><div class='add'>+		if (!(pCap-&gt;hw_caps &amp; ATH9K_HW_CAP_AUTOSLEEP)) {</div><div class='add'>+			REG_WRITE(ah, AR_RTC_FORCE_WAKE,</div><div class='add'>+				  AR_RTC_FORCE_WAKE_ON_INT);</div><div class='add'>+		} else {</div><div class='add'>+			REG_CLR_BIT(ah, AR_RTC_FORCE_WAKE,</div><div class='add'>+				    AR_RTC_FORCE_WAKE_EN);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath9k_hw_set_power_awake(struct ath_hal *ah,</div><div class='add'>+				     int setChip)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (setChip) {</div><div class='add'>+		if ((REG_READ(ah, AR_RTC_STATUS) &amp; AR_RTC_STATUS_M) ==</div><div class='add'>+		    AR_RTC_STATUS_SHUTDOWN) {</div><div class='add'>+			if (ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)</div><div class='add'>+			    != true) {</div><div class='add'>+				return false;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (AR_SREV_9100(ah))</div><div class='add'>+			REG_SET_BIT(ah, AR_RTC_RESET,</div><div class='add'>+				       AR_RTC_RESET_EN);</div><div class='add'>+</div><div class='add'>+		REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,</div><div class='add'>+			    AR_RTC_FORCE_WAKE_EN);</div><div class='add'>+		udelay(50);</div><div class='add'>+</div><div class='add'>+		for (i = POWER_UP_TIME / 50; i &gt; 0; i--) {</div><div class='add'>+			val = REG_READ(ah, AR_RTC_STATUS) &amp; AR_RTC_STATUS_M;</div><div class='add'>+			if (val == AR_RTC_STATUS_ON)</div><div class='add'>+				break;</div><div class='add'>+			udelay(50);</div><div class='add'>+			REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,</div><div class='add'>+				       AR_RTC_FORCE_WAKE_EN);</div><div class='add'>+		}</div><div class='add'>+		if (i == 0) {</div><div class='add'>+			DPRINTF(ah-&gt;ah_sc, ATH_DBG_POWER_MGMT,</div><div class='add'>+				 "%s: Failed to wakeup in %uus\n",</div><div class='add'>+				 __func__, POWER_UP_TIME / 20);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_CLR_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ath9k_hw_setpower(struct ath_hal *ah,</div><div class='add'>+		       enum ath9k_power_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	static const char *modes[] = {</div><div class='add'>+		"AWAKE",</div><div class='add'>+		"FULL-SLEEP",</div><div class='add'>+		"NETWORK SLEEP",</div><div class='add'>+		"UNDEFINED"</div><div class='add'>+	};</div><div class='add'>+	int status = true, setChip = true;</div><div class='add'>+</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_POWER_MGMT, "%s: %s -&gt; %s (%s)\n", __func__,</div><div class='add'>+		 modes[ahp-&gt;ah_powerMode], modes[mode],</div><div class='add'>+		 setChip ? "set chip " : "");</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case ATH9K_PM_AWAKE:</div><div class='add'>+		status = ath9k_hw_set_power_awake(ah, setChip);</div><div class='add'>+		break;</div><div class='add'>+	case ATH9K_PM_FULL_SLEEP:</div><div class='add'>+		ath9k_set_power_sleep(ah, setChip);</div><div class='add'>+		ahp-&gt;ah_chipFullSleep = true;</div><div class='add'>+		break;</div><div class='add'>+	case ATH9K_PM_NETWORK_SLEEP:</div><div class='add'>+		ath9k_set_power_network_sleep(ah, setChip);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_POWER_MGMT,</div><div class='add'>+			 "%s: unknown power mode %u\n", __func__, mode);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	ahp-&gt;ah_powerMode = mode;</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath_hal *ath9k_hw_do_attach(u16 devid,</div><div class='add'>+					  struct ath_softc *sc,</div><div class='add'>+					  void __iomem *mem,</div><div class='add'>+					  int *status)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp;</div><div class='add'>+	struct ath_hal *ah;</div><div class='add'>+	int ecode;</div><div class='add'>+#ifndef CONFIG_SLOW_ANT_DIV</div><div class='add'>+	u32 i;</div><div class='add'>+	u32 j;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	ahp = ath9k_hw_newstate(devid, sc, mem, status);</div><div class='add'>+	if (ahp == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ah = &amp;ahp-&gt;ah;</div><div class='add'>+</div><div class='add'>+	ath9k_hw_set_defaults(ah);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_config.intr_mitigation != 0)</div><div class='add'>+		ahp-&gt;ah_intrMitigation = true;</div><div class='add'>+</div><div class='add'>+	if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_RESET, "%s: couldn't reset chip\n",</div><div class='add'>+			 __func__);</div><div class='add'>+		ecode = -EIO;</div><div class='add'>+		goto bad;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE)) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_RESET, "%s: couldn't wakeup chip\n",</div><div class='add'>+			 __func__);</div><div class='add'>+		ecode = -EIO;</div><div class='add'>+		goto bad;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_config.serialize_regmode == SER_REG_MODE_AUTO) {</div><div class='add'>+		if (ah-&gt;ah_macVersion == AR_SREV_VERSION_5416_PCI) {</div><div class='add'>+			ah-&gt;ah_config.serialize_regmode =</div><div class='add'>+				SER_REG_MODE_ON;</div><div class='add'>+		} else {</div><div class='add'>+			ah-&gt;ah_config.serialize_regmode =</div><div class='add'>+				SER_REG_MODE_OFF;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_RESET,</div><div class='add'>+		"%s: serialize_regmode is %d\n",</div><div class='add'>+		__func__, ah-&gt;ah_config.serialize_regmode);</div><div class='add'>+</div><div class='add'>+	if ((ah-&gt;ah_macVersion != AR_SREV_VERSION_5416_PCI) &amp;&amp;</div><div class='add'>+	    (ah-&gt;ah_macVersion != AR_SREV_VERSION_5416_PCIE) &amp;&amp;</div><div class='add'>+	    (ah-&gt;ah_macVersion != AR_SREV_VERSION_9160) &amp;&amp;</div><div class='add'>+	    (!AR_SREV_9100(ah)) &amp;&amp; (!AR_SREV_9280(ah))) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_RESET,</div><div class='add'>+			 "%s: Mac Chip Rev 0x%02x.%x is not supported by "</div><div class='add'>+			 "this driver\n", __func__,</div><div class='add'>+			 ah-&gt;ah_macVersion, ah-&gt;ah_macRev);</div><div class='add'>+		ecode = -EOPNOTSUPP;</div><div class='add'>+		goto bad;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9100(ah)) {</div><div class='add'>+		ahp-&gt;ah_iqCalData.calData = &amp;iq_cal_multi_sample;</div><div class='add'>+		ahp-&gt;ah_suppCals = IQ_MISMATCH_CAL;</div><div class='add'>+		ah-&gt;ah_isPciExpress = false;</div><div class='add'>+	}</div><div class='add'>+	ah-&gt;ah_phyRev = REG_READ(ah, AR_PHY_CHIP_ID);</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9160_10_OR_LATER(ah)) {</div><div class='add'>+		if (AR_SREV_9280_10_OR_LATER(ah)) {</div><div class='add'>+			ahp-&gt;ah_iqCalData.calData = &amp;iq_cal_single_sample;</div><div class='add'>+			ahp-&gt;ah_adcGainCalData.calData =</div><div class='add'>+				&amp;adc_gain_cal_single_sample;</div><div class='add'>+			ahp-&gt;ah_adcDcCalData.calData =</div><div class='add'>+				&amp;adc_dc_cal_single_sample;</div><div class='add'>+			ahp-&gt;ah_adcDcCalInitData.calData =</div><div class='add'>+				&amp;adc_init_dc_cal;</div><div class='add'>+		} else {</div><div class='add'>+			ahp-&gt;ah_iqCalData.calData = &amp;iq_cal_multi_sample;</div><div class='add'>+			ahp-&gt;ah_adcGainCalData.calData =</div><div class='add'>+				&amp;adc_gain_cal_multi_sample;</div><div class='add'>+			ahp-&gt;ah_adcDcCalData.calData =</div><div class='add'>+				&amp;adc_dc_cal_multi_sample;</div><div class='add'>+			ahp-&gt;ah_adcDcCalInitData.calData =</div><div class='add'>+				&amp;adc_init_dc_cal;</div><div class='add'>+		}</div><div class='add'>+		ahp-&gt;ah_suppCals =</div><div class='add'>+			ADC_GAIN_CAL | ADC_DC_CAL | IQ_MISMATCH_CAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9160(ah)) {</div><div class='add'>+		ah-&gt;ah_config.enable_ani = 1;</div><div class='add'>+		ahp-&gt;ah_ani_function = (ATH9K_ANI_SPUR_IMMUNITY_LEVEL |</div><div class='add'>+					ATH9K_ANI_FIRSTEP_LEVEL);</div><div class='add'>+	} else {</div><div class='add'>+		ahp-&gt;ah_ani_function = ATH9K_ANI_ALL;</div><div class='add'>+		if (AR_SREV_9280_10_OR_LATER(ah)) {</div><div class='add'>+			ahp-&gt;ah_ani_function &amp;=</div><div class='add'>+				~ATH9K_ANI_NOISE_IMMUNITY_LEVEL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DPRINTF(ah-&gt;ah_sc, ATH_DBG_RESET,</div><div class='add'>+		 "%s: This Mac Chip Rev 0x%02x.%x is \n", __func__,</div><div class='add'>+		 ah-&gt;ah_macVersion, ah-&gt;ah_macRev);</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9280_20_OR_LATER(ah)) {</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniModes, ar9280Modes_9280_2,</div><div class='add'>+			       ARRAY_SIZE(ar9280Modes_9280_2), 6);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniCommon, ar9280Common_9280_2,</div><div class='add'>+			       ARRAY_SIZE(ar9280Common_9280_2), 2);</div><div class='add'>+</div><div class='add'>+		if (ah-&gt;ah_config.pcie_clock_req) {</div><div class='add'>+			INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniPcieSerdes,</div><div class='add'>+				       ar9280PciePhy_clkreq_off_L1_9280,</div><div class='add'>+				       ARRAY_SIZE</div><div class='add'>+				       (ar9280PciePhy_clkreq_off_L1_9280),</div><div class='add'>+				       2);</div><div class='add'>+		} else {</div><div class='add'>+			INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniPcieSerdes,</div><div class='add'>+				       ar9280PciePhy_clkreq_always_on_L1_9280,</div><div class='add'>+				       ARRAY_SIZE</div><div class='add'>+				       (ar9280PciePhy_clkreq_always_on_L1_9280),</div><div class='add'>+				       2);</div><div class='add'>+		}</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniModesAdditional,</div><div class='add'>+			       ar9280Modes_fast_clock_9280_2,</div><div class='add'>+			       ARRAY_SIZE(ar9280Modes_fast_clock_9280_2),</div><div class='add'>+			       3);</div><div class='add'>+	} else if (AR_SREV_9280_10_OR_LATER(ah)) {</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniModes, ar9280Modes_9280,</div><div class='add'>+			       ARRAY_SIZE(ar9280Modes_9280), 6);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniCommon, ar9280Common_9280,</div><div class='add'>+			       ARRAY_SIZE(ar9280Common_9280), 2);</div><div class='add'>+	} else if (AR_SREV_9160_10_OR_LATER(ah)) {</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniModes, ar5416Modes_9160,</div><div class='add'>+			       ARRAY_SIZE(ar5416Modes_9160), 6);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniCommon, ar5416Common_9160,</div><div class='add'>+			       ARRAY_SIZE(ar5416Common_9160), 2);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank0, ar5416Bank0_9160,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank0_9160), 2);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBB_RfGain, ar5416BB_RfGain_9160,</div><div class='add'>+			       ARRAY_SIZE(ar5416BB_RfGain_9160), 3);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank1, ar5416Bank1_9160,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank1_9160), 2);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank2, ar5416Bank2_9160,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank2_9160), 2);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank3, ar5416Bank3_9160,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank3_9160), 3);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank6, ar5416Bank6_9160,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank6_9160), 3);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank6TPC, ar5416Bank6TPC_9160,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank6TPC_9160), 3);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank7, ar5416Bank7_9160,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank7_9160), 2);</div><div class='add'>+		if (AR_SREV_9160_11(ah)) {</div><div class='add'>+			INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniAddac,</div><div class='add'>+				       ar5416Addac_91601_1,</div><div class='add'>+				       ARRAY_SIZE(ar5416Addac_91601_1), 2);</div><div class='add'>+		} else {</div><div class='add'>+			INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniAddac, ar5416Addac_9160,</div><div class='add'>+				       ARRAY_SIZE(ar5416Addac_9160), 2);</div><div class='add'>+		}</div><div class='add'>+	} else if (AR_SREV_9100_OR_LATER(ah)) {</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniModes, ar5416Modes_9100,</div><div class='add'>+			       ARRAY_SIZE(ar5416Modes_9100), 6);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniCommon, ar5416Common_9100,</div><div class='add'>+			       ARRAY_SIZE(ar5416Common_9100), 2);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank0, ar5416Bank0_9100,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank0_9100), 2);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBB_RfGain, ar5416BB_RfGain_9100,</div><div class='add'>+			       ARRAY_SIZE(ar5416BB_RfGain_9100), 3);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank1, ar5416Bank1_9100,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank1_9100), 2);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank2, ar5416Bank2_9100,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank2_9100), 2);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank3, ar5416Bank3_9100,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank3_9100), 3);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank6, ar5416Bank6_9100,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank6_9100), 3);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank6TPC, ar5416Bank6TPC_9100,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank6TPC_9100), 3);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank7, ar5416Bank7_9100,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank7_9100), 2);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniAddac, ar5416Addac_9100,</div><div class='add'>+			       ARRAY_SIZE(ar5416Addac_9100), 2);</div><div class='add'>+	} else {</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniModes, ar5416Modes,</div><div class='add'>+			       ARRAY_SIZE(ar5416Modes), 6);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniCommon, ar5416Common,</div><div class='add'>+			       ARRAY_SIZE(ar5416Common), 2);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank0, ar5416Bank0,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank0), 2);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBB_RfGain, ar5416BB_RfGain,</div><div class='add'>+			       ARRAY_SIZE(ar5416BB_RfGain), 3);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank1, ar5416Bank1,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank1), 2);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank2, ar5416Bank2,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank2), 2);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank3, ar5416Bank3,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank3), 3);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank6, ar5416Bank6,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank6), 3);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank6TPC, ar5416Bank6TPC,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank6TPC), 3);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniBank7, ar5416Bank7,</div><div class='add'>+			       ARRAY_SIZE(ar5416Bank7), 2);</div><div class='add'>+		INIT_INI_ARRAY(&amp;ahp-&gt;ah_iniAddac, ar5416Addac,</div><div class='add'>+			       ARRAY_SIZE(ar5416Addac), 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_isPciExpress)</div><div class='add'>+		ath9k_hw_configpcipowersave(ah, 0);</div><div class='add'>+	else</div><div class='add'>+		ar5416DisablePciePhy(ah);</div><div class='add'>+</div><div class='add'>+	ecode = ath9k_hw_post_attach(ah);</div><div class='add'>+	if (ecode != 0)</div><div class='add'>+		goto bad;</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_SLOW_ANT_DIV</div><div class='add'>+	if (ah-&gt;ah_devid == AR9280_DEVID_PCI) {</div><div class='add'>+		for (i = 0; i &lt; ahp-&gt;ah_iniModes.ia_rows; i++) {</div><div class='add'>+			u32 reg = INI_RA(&amp;ahp-&gt;ah_iniModes, i, 0);</div><div class='add'>+</div><div class='add'>+			for (j = 1; j &lt; ahp-&gt;ah_iniModes.ia_columns; j++) {</div><div class='add'>+				u32 val = INI_RA(&amp;ahp-&gt;ah_iniModes, i, j);</div><div class='add'>+</div><div class='add'>+				INI_RA(&amp;ahp-&gt;ah_iniModes, i, j) =</div><div class='add'>+					ath9k_hw_ini_fixup(ah, &amp;ahp-&gt;ah_eeprom,</div><div class='add'>+							   reg, val);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (!ath9k_hw_fill_cap_info(ah)) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_RESET,</div><div class='add'>+			 "%s:failed ath9k_hw_fill_cap_info\n", __func__);</div><div class='add'>+		ecode = -EINVAL;</div><div class='add'>+		goto bad;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ecode = ath9k_hw_init_macaddr(ah);</div><div class='add'>+	if (ecode != 0) {</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_RESET,</div><div class='add'>+			 "%s: failed initializing mac address\n",</div><div class='add'>+			 __func__);</div><div class='add'>+		goto bad;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9285(ah))</div><div class='add'>+		ah-&gt;ah_txTrigLevel = (AR_FTRIG_256B &gt;&gt; AR_FTRIG_S);</div><div class='add'>+	else</div><div class='add'>+		ah-&gt;ah_txTrigLevel = (AR_FTRIG_512B &gt;&gt; AR_FTRIG_S);</div><div class='add'>+</div><div class='add'>+#ifndef ATH_NF_PER_CHAN</div><div class='add'>+</div><div class='add'>+	ath9k_init_nfcal_hist_buffer(ah);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return ah;</div><div class='add'>+</div><div class='add'>+bad:</div><div class='add'>+	if (ahp)</div><div class='add'>+		ath9k_hw_detach((struct ath_hal *) ahp);</div><div class='add'>+	if (status)</div><div class='add'>+		*status = ecode;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath9k_hw_detach(struct ath_hal *ah)</div><div class='add'>+{</div><div class='add'>+	if (!AR_SREV_9100(ah))</div><div class='add'>+		ath9k_hw_ani_detach(ah);</div><div class='add'>+	ath9k_hw_rfdetach(ah);</div><div class='add'>+</div><div class='add'>+	ath9k_hw_setpower(ah, ATH9K_PM_FULL_SLEEP);</div><div class='add'>+	kfree(ah);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ath9k_get_channel_edges(struct ath_hal *ah,</div><div class='add'>+			     u16 flags, u16 *low,</div><div class='add'>+			     u16 *high)</div><div class='add'>+{</div><div class='add'>+	struct ath9k_hw_capabilities *pCap = &amp;ah-&gt;ah_caps;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; CHANNEL_5GHZ) {</div><div class='add'>+		*low = pCap-&gt;low_5ghz_chan;</div><div class='add'>+		*high = pCap-&gt;high_5ghz_chan;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	if ((flags &amp; CHANNEL_2GHZ)) {</div><div class='add'>+		*low = pCap-&gt;low_2ghz_chan;</div><div class='add'>+		*high = pCap-&gt;high_2ghz_chan;</div><div class='add'>+</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ath9k_hw_fill_vpd_table(u8 pwrMin,</div><div class='add'>+					   u8 pwrMax,</div><div class='add'>+					   u8 *pPwrList,</div><div class='add'>+					   u8 *pVpdList,</div><div class='add'>+					   u16</div><div class='add'>+					   numIntercepts,</div><div class='add'>+					   u8 *pRetVpdList)</div><div class='add'>+{</div><div class='add'>+	u16 i, k;</div><div class='add'>+	u8 currPwr = pwrMin;</div><div class='add'>+	u16 idxL = 0, idxR = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= (pwrMax - pwrMin) / 2; i++) {</div><div class='add'>+		ath9k_hw_get_lower_upper_index(currPwr, pPwrList,</div><div class='add'>+					       numIntercepts, &amp;(idxL),</div><div class='add'>+					       &amp;(idxR));</div><div class='add'>+		if (idxR &lt; 1)</div><div class='add'>+			idxR = 1;</div><div class='add'>+		if (idxL == numIntercepts - 1)</div><div class='add'>+			idxL = (u16) (numIntercepts - 2);</div><div class='add'>+		if (pPwrList[idxL] == pPwrList[idxR])</div><div class='add'>+			k = pVpdList[idxL];</div><div class='add'>+		else</div><div class='add'>+			k = (u16) (((currPwr -</div><div class='add'>+					   pPwrList[idxL]) *</div><div class='add'>+					  pVpdList[idxR] +</div><div class='add'>+					  (pPwrList[idxR] -</div><div class='add'>+					   currPwr) * pVpdList[idxL]) /</div><div class='add'>+					 (pPwrList[idxR] -</div><div class='add'>+					  pPwrList[idxL]));</div><div class='add'>+		pRetVpdList[i] = (u8) k;</div><div class='add'>+		currPwr += 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hal *ah,</div><div class='add'>+				    struct ath9k_channel *chan,</div><div class='add'>+				    struct cal_data_per_freq *pRawDataSet,</div><div class='add'>+				    u8 *bChans,</div><div class='add'>+				    u16 availPiers,</div><div class='add'>+				    u16 tPdGainOverlap,</div><div class='add'>+				    int16_t *pMinCalPower,</div><div class='add'>+				    u16 *pPdGainBoundaries,</div><div class='add'>+				    u8 *pPDADCValues,</div><div class='add'>+				    u16 numXpdGains)</div><div class='add'>+{</div><div class='add'>+	int i, j, k;</div><div class='add'>+	int16_t ss;</div><div class='add'>+	u16 idxL = 0, idxR = 0, numPiers;</div><div class='add'>+	static u8 vpdTableL[AR5416_NUM_PD_GAINS]</div><div class='add'>+		[AR5416_MAX_PWR_RANGE_IN_HALF_DB];</div><div class='add'>+	static u8 vpdTableR[AR5416_NUM_PD_GAINS]</div><div class='add'>+		[AR5416_MAX_PWR_RANGE_IN_HALF_DB];</div><div class='add'>+	static u8 vpdTableI[AR5416_NUM_PD_GAINS]</div><div class='add'>+		[AR5416_MAX_PWR_RANGE_IN_HALF_DB];</div><div class='add'>+</div><div class='add'>+	u8 *pVpdL, *pVpdR, *pPwrL, *pPwrR;</div><div class='add'>+	u8 minPwrT4[AR5416_NUM_PD_GAINS];</div><div class='add'>+	u8 maxPwrT4[AR5416_NUM_PD_GAINS];</div><div class='add'>+	int16_t vpdStep;</div><div class='add'>+	int16_t tmpVal;</div><div class='add'>+	u16 sizeCurrVpdTable, maxIndex, tgtIndex;</div><div class='add'>+	bool match;</div><div class='add'>+	int16_t minDelta = 0;</div><div class='add'>+	struct chan_centers centers;</div><div class='add'>+</div><div class='add'>+	ath9k_hw_get_channel_centers(ah, chan, &amp;centers);</div><div class='add'>+</div><div class='add'>+	for (numPiers = 0; numPiers &lt; availPiers; numPiers++) {</div><div class='add'>+		if (bChans[numPiers] == AR5416_BCHAN_UNUSED)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	match = ath9k_hw_get_lower_upper_index((u8)</div><div class='add'>+					       FREQ2FBIN(centers.</div><div class='add'>+							 synth_center,</div><div class='add'>+							 IS_CHAN_2GHZ</div><div class='add'>+							 (chan)), bChans,</div><div class='add'>+					       numPiers, &amp;idxL, &amp;idxR);</div><div class='add'>+</div><div class='add'>+	if (match) {</div><div class='add'>+		for (i = 0; i &lt; numXpdGains; i++) {</div><div class='add'>+			minPwrT4[i] = pRawDataSet[idxL].pwrPdg[i][0];</div><div class='add'>+			maxPwrT4[i] = pRawDataSet[idxL].pwrPdg[i][4];</div><div class='add'>+			ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],</div><div class='add'>+						pRawDataSet[idxL].</div><div class='add'>+						pwrPdg[i],</div><div class='add'>+						pRawDataSet[idxL].</div><div class='add'>+						vpdPdg[i],</div><div class='add'>+						AR5416_PD_GAIN_ICEPTS,</div><div class='add'>+						vpdTableI[i]);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; numXpdGains; i++) {</div><div class='add'>+			pVpdL = pRawDataSet[idxL].vpdPdg[i];</div><div class='add'>+			pPwrL = pRawDataSet[idxL].pwrPdg[i];</div><div class='add'>+			pVpdR = pRawDataSet[idxR].vpdPdg[i];</div><div class='add'>+			pPwrR = pRawDataSet[idxR].pwrPdg[i];</div><div class='add'>+</div><div class='add'>+			minPwrT4[i] = max(pPwrL[0], pPwrR[0]);</div><div class='add'>+</div><div class='add'>+			maxPwrT4[i] =</div><div class='add'>+				min(pPwrL[AR5416_PD_GAIN_ICEPTS - 1],</div><div class='add'>+				    pPwrR[AR5416_PD_GAIN_ICEPTS - 1]);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+			ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],</div><div class='add'>+						pPwrL, pVpdL,</div><div class='add'>+						AR5416_PD_GAIN_ICEPTS,</div><div class='add'>+						vpdTableL[i]);</div><div class='add'>+			ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],</div><div class='add'>+						pPwrR, pVpdR,</div><div class='add'>+						AR5416_PD_GAIN_ICEPTS,</div><div class='add'>+						vpdTableR[i]);</div><div class='add'>+</div><div class='add'>+			for (j = 0; j &lt;= (maxPwrT4[i] - minPwrT4[i]) / 2; j++) {</div><div class='add'>+				vpdTableI[i][j] =</div><div class='add'>+					(u8) (ath9k_hw_interpolate</div><div class='add'>+						    ((u16)</div><div class='add'>+						     FREQ2FBIN(centers.</div><div class='add'>+							       synth_center,</div><div class='add'>+							       IS_CHAN_2GHZ</div><div class='add'>+							       (chan)),</div><div class='add'>+						     bChans[idxL],</div><div class='add'>+						     bChans[idxR], vpdTableL[i]</div><div class='add'>+						     [j], vpdTableR[i]</div><div class='add'>+						     [j]));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*pMinCalPower = (int16_t) (minPwrT4[0] / 2);</div><div class='add'>+</div><div class='add'>+	k = 0;</div><div class='add'>+	for (i = 0; i &lt; numXpdGains; i++) {</div><div class='add'>+		if (i == (numXpdGains - 1))</div><div class='add'>+			pPdGainBoundaries[i] =</div><div class='add'>+				(u16) (maxPwrT4[i] / 2);</div><div class='add'>+		else</div><div class='add'>+			pPdGainBoundaries[i] =</div><div class='add'>+				(u16) ((maxPwrT4[i] +</div><div class='add'>+					      minPwrT4[i + 1]) / 4);</div><div class='add'>+</div><div class='add'>+		pPdGainBoundaries[i] =</div><div class='add'>+			min((u16) AR5416_MAX_RATE_POWER,</div><div class='add'>+			    pPdGainBoundaries[i]);</div><div class='add'>+</div><div class='add'>+		if ((i == 0) &amp;&amp; !AR_SREV_5416_V20_OR_LATER(ah)) {</div><div class='add'>+			minDelta = pPdGainBoundaries[0] - 23;</div><div class='add'>+			pPdGainBoundaries[0] = 23;</div><div class='add'>+		} else {</div><div class='add'>+			minDelta = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i == 0) {</div><div class='add'>+			if (AR_SREV_9280_10_OR_LATER(ah))</div><div class='add'>+				ss = (int16_t) (0 - (minPwrT4[i] / 2));</div><div class='add'>+			else</div><div class='add'>+				ss = 0;</div><div class='add'>+		} else {</div><div class='add'>+			ss = (int16_t) ((pPdGainBoundaries[i - 1] -</div><div class='add'>+					 (minPwrT4[i] / 2)) -</div><div class='add'>+					tPdGainOverlap + 1 + minDelta);</div><div class='add'>+		}</div><div class='add'>+		vpdStep = (int16_t) (vpdTableI[i][1] - vpdTableI[i][0]);</div><div class='add'>+		vpdStep = (int16_t) ((vpdStep &lt; 1) ? 1 : vpdStep);</div><div class='add'>+</div><div class='add'>+		while ((ss &lt; 0) &amp;&amp; (k &lt; (AR5416_NUM_PDADC_VALUES - 1))) {</div><div class='add'>+			tmpVal = (int16_t) (vpdTableI[i][0] + ss * vpdStep);</div><div class='add'>+			pPDADCValues[k++] =</div><div class='add'>+				(u8) ((tmpVal &lt; 0) ? 0 : tmpVal);</div><div class='add'>+			ss++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sizeCurrVpdTable =</div><div class='add'>+			(u8) ((maxPwrT4[i] - minPwrT4[i]) / 2 + 1);</div><div class='add'>+		tgtIndex = (u8) (pPdGainBoundaries[i] + tPdGainOverlap -</div><div class='add'>+				       (minPwrT4[i] / 2));</div><div class='add'>+		maxIndex = (tgtIndex &lt;</div><div class='add'>+			    sizeCurrVpdTable) ? tgtIndex : sizeCurrVpdTable;</div><div class='add'>+</div><div class='add'>+		while ((ss &lt; maxIndex)</div><div class='add'>+		       &amp;&amp; (k &lt; (AR5416_NUM_PDADC_VALUES - 1))) {</div><div class='add'>+			pPDADCValues[k++] = vpdTableI[i][ss++];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		vpdStep = (int16_t) (vpdTableI[i][sizeCurrVpdTable - 1] -</div><div class='add'>+				     vpdTableI[i][sizeCurrVpdTable - 2]);</div><div class='add'>+		vpdStep = (int16_t) ((vpdStep &lt; 1) ? 1 : vpdStep);</div><div class='add'>+</div><div class='add'>+		if (tgtIndex &gt; maxIndex) {</div><div class='add'>+			while ((ss &lt;= tgtIndex)</div><div class='add'>+			       &amp;&amp; (k &lt; (AR5416_NUM_PDADC_VALUES - 1))) {</div><div class='add'>+				tmpVal = (int16_t) ((vpdTableI[i]</div><div class='add'>+						     [sizeCurrVpdTable -</div><div class='add'>+						      1] + (ss - maxIndex +</div><div class='add'>+							    1) * vpdStep));</div><div class='add'>+				pPDADCValues[k++] = (u8) ((tmpVal &gt;</div><div class='add'>+						 255) ? 255 : tmpVal);</div><div class='add'>+				ss++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (i &lt; AR5416_PD_GAINS_IN_MASK) {</div><div class='add'>+		pPdGainBoundaries[i] = pPdGainBoundaries[i - 1];</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (k &lt; AR5416_NUM_PDADC_VALUES) {</div><div class='add'>+		pPDADCValues[k] = pPDADCValues[k - 1];</div><div class='add'>+		k++;</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+ath9k_hw_set_power_cal_table(struct ath_hal *ah,</div><div class='add'>+			     struct ar5416_eeprom *pEepData,</div><div class='add'>+			     struct ath9k_channel *chan,</div><div class='add'>+			     int16_t *pTxPowerIndexOffset)</div><div class='add'>+{</div><div class='add'>+	struct cal_data_per_freq *pRawDataset;</div><div class='add'>+	u8 *pCalBChans = NULL;</div><div class='add'>+	u16 pdGainOverlap_t2;</div><div class='add'>+	static u8 pdadcValues[AR5416_NUM_PDADC_VALUES];</div><div class='add'>+	u16 gainBoundaries[AR5416_PD_GAINS_IN_MASK];</div><div class='add'>+	u16 numPiers, i, j;</div><div class='add'>+	int16_t tMinCalPower;</div><div class='add'>+	u16 numXpdGain, xpdMask;</div><div class='add'>+	u16 xpdGainValues[AR5416_NUM_PD_GAINS] = { 0, 0, 0, 0 };</div><div class='add'>+	u32 reg32, regOffset, regChainOffset;</div><div class='add'>+	int16_t modalIdx;</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+</div><div class='add'>+	modalIdx = IS_CHAN_2GHZ(chan) ? 1 : 0;</div><div class='add'>+	xpdMask = pEepData-&gt;modalHeader[modalIdx].xpdGain;</div><div class='add'>+</div><div class='add'>+	if ((pEepData-&gt;baseEepHeader.</div><div class='add'>+	     version &amp; AR5416_EEP_VER_MINOR_MASK) &gt;=</div><div class='add'>+	    AR5416_EEP_MINOR_VER_2) {</div><div class='add'>+		pdGainOverlap_t2 =</div><div class='add'>+			pEepData-&gt;modalHeader[modalIdx].pdGainOverlap;</div><div class='add'>+	} else {</div><div class='add'>+		pdGainOverlap_t2 =</div><div class='add'>+			(u16) (MS</div><div class='add'>+				     (REG_READ(ah, AR_PHY_TPCRG5),</div><div class='add'>+				      AR_PHY_TPCRG5_PD_GAIN_OVERLAP));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_CHAN_2GHZ(chan)) {</div><div class='add'>+		pCalBChans = pEepData-&gt;calFreqPier2G;</div><div class='add'>+		numPiers = AR5416_NUM_2G_CAL_PIERS;</div><div class='add'>+	} else {</div><div class='add'>+		pCalBChans = pEepData-&gt;calFreqPier5G;</div><div class='add'>+		numPiers = AR5416_NUM_5G_CAL_PIERS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	numXpdGain = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= AR5416_PD_GAINS_IN_MASK; i++) {</div><div class='add'>+		if ((xpdMask &gt;&gt; (AR5416_PD_GAINS_IN_MASK - i)) &amp; 1) {</div><div class='add'>+			if (numXpdGain &gt;= AR5416_NUM_PD_GAINS)</div><div class='add'>+				break;</div><div class='add'>+			xpdGainValues[numXpdGain] =</div><div class='add'>+				(u16) (AR5416_PD_GAINS_IN_MASK - i);</div><div class='add'>+			numXpdGain++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_TPCRG1, AR_PHY_TPCRG1_NUM_PD_GAIN,</div><div class='add'>+		      (numXpdGain - 1) &amp; 0x3);</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_TPCRG1, AR_PHY_TPCRG1_PD_GAIN_1,</div><div class='add'>+		      xpdGainValues[0]);</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_TPCRG1, AR_PHY_TPCRG1_PD_GAIN_2,</div><div class='add'>+		      xpdGainValues[1]);</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_TPCRG1, AR_PHY_TPCRG1_PD_GAIN_3,</div><div class='add'>+		      xpdGainValues[2]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AR5416_MAX_CHAINS; i++) {</div><div class='add'>+		if (AR_SREV_5416_V20_OR_LATER(ah) &amp;&amp;</div><div class='add'>+		    (ahp-&gt;ah_rxchainmask == 5 || ahp-&gt;ah_txchainmask == 5)</div><div class='add'>+		    &amp;&amp; (i != 0)) {</div><div class='add'>+			regChainOffset = (i == 1) ? 0x2000 : 0x1000;</div><div class='add'>+		} else</div><div class='add'>+			regChainOffset = i * 0x1000;</div><div class='add'>+		if (pEepData-&gt;baseEepHeader.txMask &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			if (IS_CHAN_2GHZ(chan))</div><div class='add'>+				pRawDataset = pEepData-&gt;calPierData2G[i];</div><div class='add'>+			else</div><div class='add'>+				pRawDataset = pEepData-&gt;calPierData5G[i];</div><div class='add'>+</div><div class='add'>+			ath9k_hw_get_gain_boundaries_pdadcs(ah, chan,</div><div class='add'>+							    pRawDataset,</div><div class='add'>+							    pCalBChans,</div><div class='add'>+							    numPiers,</div><div class='add'>+							    pdGainOverlap_t2,</div><div class='add'>+							    &amp;tMinCalPower,</div><div class='add'>+							    gainBoundaries,</div><div class='add'>+							    pdadcValues,</div><div class='add'>+							    numXpdGain);</div><div class='add'>+</div><div class='add'>+			if ((i == 0) || AR_SREV_5416_V20_OR_LATER(ah)) {</div><div class='add'>+</div><div class='add'>+				REG_WRITE(ah,</div><div class='add'>+					  AR_PHY_TPCRG5 + regChainOffset,</div><div class='add'>+					  SM(pdGainOverlap_t2,</div><div class='add'>+					     AR_PHY_TPCRG5_PD_GAIN_OVERLAP)</div><div class='add'>+					  | SM(gainBoundaries[0],</div><div class='add'>+					       AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_1)</div><div class='add'>+					  | SM(gainBoundaries[1],</div><div class='add'>+					       AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_2)</div><div class='add'>+					  | SM(gainBoundaries[2],</div><div class='add'>+					       AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_3)</div><div class='add'>+					  | SM(gainBoundaries[3],</div><div class='add'>+				       AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_4));</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			regOffset =</div><div class='add'>+				AR_PHY_BASE + (672 &lt;&lt; 2) + regChainOffset;</div><div class='add'>+			for (j = 0; j &lt; 32; j++) {</div><div class='add'>+				reg32 =</div><div class='add'>+					((pdadcValues[4 * j + 0] &amp; 0xFF) &lt;&lt; 0)</div><div class='add'>+					| ((pdadcValues[4 * j + 1] &amp; 0xFF) &lt;&lt;</div><div class='add'>+					   8) | ((pdadcValues[4 * j + 2] &amp;</div><div class='add'>+						  0xFF) &lt;&lt; 16) |</div><div class='add'>+					((pdadcValues[4 * j + 3] &amp; 0xFF) &lt;&lt;</div><div class='add'>+					 24);</div><div class='add'>+				REG_WRITE(ah, regOffset, reg32);</div><div class='add'>+</div><div class='add'>+				DPRINTF(ah-&gt;ah_sc, ATH_DBG_PHY_IO,</div><div class='add'>+					 "PDADC (%d,%4x): %4.4x %8.8x\n",</div><div class='add'>+					 i, regChainOffset, regOffset,</div><div class='add'>+					 reg32);</div><div class='add'>+				DPRINTF(ah-&gt;ah_sc, ATH_DBG_PHY_IO,</div><div class='add'>+				"PDADC: Chain %d | PDADC %3d Value %3d | "</div><div class='add'>+				"PDADC %3d Value %3d | PDADC %3d Value %3d | "</div><div class='add'>+				"PDADC %3d Value %3d |\n",</div><div class='add'>+					 i, 4 * j, pdadcValues[4 * j],</div><div class='add'>+					 4 * j + 1, pdadcValues[4 * j + 1],</div><div class='add'>+					 4 * j + 2, pdadcValues[4 * j + 2],</div><div class='add'>+					 4 * j + 3,</div><div class='add'>+					 pdadcValues[4 * j + 3]);</div><div class='add'>+</div><div class='add'>+				regOffset += 4;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	*pTxPowerIndexOffset = 0;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath9k_hw_configpcipowersave(struct ath_hal *ah, int restore)</div><div class='add'>+{</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_isPciExpress != true)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_config.pcie_powersave_enable == 2)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (restore)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9280_20_OR_LATER(ah)) {</div><div class='add'>+		for (i = 0; i &lt; ahp-&gt;ah_iniPcieSerdes.ia_rows; i++) {</div><div class='add'>+			REG_WRITE(ah, INI_RA(&amp;ahp-&gt;ah_iniPcieSerdes, i, 0),</div><div class='add'>+				  INI_RA(&amp;ahp-&gt;ah_iniPcieSerdes, i, 1));</div><div class='add'>+		}</div><div class='add'>+		udelay(1000);</div><div class='add'>+	} else if (AR_SREV_9280(ah)</div><div class='add'>+		   &amp;&amp; (ah-&gt;ah_macRev == AR_SREV_REVISION_9280_10)) {</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0x9248fd00);</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0x24924924);</div><div class='add'>+</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0xa8000019);</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0x13160820);</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0xe5980560);</div><div class='add'>+</div><div class='add'>+		if (ah-&gt;ah_config.pcie_clock_req)</div><div class='add'>+			REG_WRITE(ah, AR_PCIE_SERDES, 0x401deffc);</div><div class='add'>+		else</div><div class='add'>+			REG_WRITE(ah, AR_PCIE_SERDES, 0x401deffd);</div><div class='add'>+</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0x1aaabe40);</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0xbe105554);</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0x00043007);</div><div class='add'>+</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES2, 0x00000000);</div><div class='add'>+</div><div class='add'>+		udelay(1000);</div><div class='add'>+	} else {</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0x9248fc00);</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0x24924924);</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0x28000039);</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0x53160824);</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0xe5980579);</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0x001defff);</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0x1aaabe40);</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0xbe105554);</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES, 0x000e3007);</div><div class='add'>+		REG_WRITE(ah, AR_PCIE_SERDES2, 0x00000000);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_SET_BIT(ah, AR_PCIE_PM_CTRL, AR_PCIE_PM_CTRL_ENA);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_config.pcie_waen) {</div><div class='add'>+		REG_WRITE(ah, AR_WA, ah-&gt;ah_config.pcie_waen);</div><div class='add'>+	} else {</div><div class='add'>+		if (AR_SREV_9280(ah))</div><div class='add'>+			REG_WRITE(ah, AR_WA, 0x0040073f);</div><div class='add'>+		else</div><div class='add'>+			REG_WRITE(ah, AR_WA, 0x0000073f);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+ath9k_hw_get_legacy_target_powers(struct ath_hal *ah,</div><div class='add'>+				  struct ath9k_channel *chan,</div><div class='add'>+				  struct cal_target_power_leg *powInfo,</div><div class='add'>+				  u16 numChannels,</div><div class='add'>+				  struct cal_target_power_leg *pNewPower,</div><div class='add'>+				  u16 numRates,</div><div class='add'>+				  bool isExtTarget)</div><div class='add'>+{</div><div class='add'>+	u16 clo, chi;</div><div class='add'>+	int i;</div><div class='add'>+	int matchIndex = -1, lowIndex = -1;</div><div class='add'>+	u16 freq;</div><div class='add'>+	struct chan_centers centers;</div><div class='add'>+</div><div class='add'>+	ath9k_hw_get_channel_centers(ah, chan, &amp;centers);</div><div class='add'>+	freq = (isExtTarget) ? centers.ext_center : centers.ctl_center;</div><div class='add'>+</div><div class='add'>+	if (freq &lt;= ath9k_hw_fbin2freq(powInfo[0].bChannel,</div><div class='add'>+		IS_CHAN_2GHZ(chan))) {</div><div class='add'>+		matchIndex = 0;</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; (i &lt; numChannels)</div><div class='add'>+		     &amp;&amp; (powInfo[i].bChannel != AR5416_BCHAN_UNUSED); i++) {</div><div class='add'>+			if (freq ==</div><div class='add'>+			    ath9k_hw_fbin2freq(powInfo[i].bChannel,</div><div class='add'>+					       IS_CHAN_2GHZ(chan))) {</div><div class='add'>+				matchIndex = i;</div><div class='add'>+				break;</div><div class='add'>+			} else if ((freq &lt;</div><div class='add'>+				    ath9k_hw_fbin2freq(powInfo[i].bChannel,</div><div class='add'>+						       IS_CHAN_2GHZ(chan)))</div><div class='add'>+				   &amp;&amp; (freq &gt;</div><div class='add'>+				       ath9k_hw_fbin2freq(powInfo[i - 1].</div><div class='add'>+							  bChannel,</div><div class='add'>+							  IS_CHAN_2GHZ</div><div class='add'>+							  (chan)))) {</div><div class='add'>+				lowIndex = i - 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if ((matchIndex == -1) &amp;&amp; (lowIndex == -1))</div><div class='add'>+			matchIndex = i - 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (matchIndex != -1) {</div><div class='add'>+		*pNewPower = powInfo[matchIndex];</div><div class='add'>+	} else {</div><div class='add'>+		clo = ath9k_hw_fbin2freq(powInfo[lowIndex].bChannel,</div><div class='add'>+					 IS_CHAN_2GHZ(chan));</div><div class='add'>+		chi = ath9k_hw_fbin2freq(powInfo[lowIndex + 1].bChannel,</div><div class='add'>+					 IS_CHAN_2GHZ(chan));</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; numRates; i++) {</div><div class='add'>+			pNewPower-&gt;tPow2x[i] =</div><div class='add'>+				(u8) ath9k_hw_interpolate(freq, clo, chi,</div><div class='add'>+								powInfo</div><div class='add'>+								[lowIndex].</div><div class='add'>+								tPow2x[i],</div><div class='add'>+								powInfo</div><div class='add'>+								[lowIndex +</div><div class='add'>+								 1].tPow2x[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+ath9k_hw_get_target_powers(struct ath_hal *ah,</div><div class='add'>+			   struct ath9k_channel *chan,</div><div class='add'>+			   struct cal_target_power_ht *powInfo,</div><div class='add'>+			   u16 numChannels,</div><div class='add'>+			   struct cal_target_power_ht *pNewPower,</div><div class='add'>+			   u16 numRates,</div><div class='add'>+			   bool isHt40Target)</div><div class='add'>+{</div><div class='add'>+	u16 clo, chi;</div><div class='add'>+	int i;</div><div class='add'>+	int matchIndex = -1, lowIndex = -1;</div><div class='add'>+	u16 freq;</div><div class='add'>+	struct chan_centers centers;</div><div class='add'>+</div><div class='add'>+	ath9k_hw_get_channel_centers(ah, chan, &amp;centers);</div><div class='add'>+	freq = isHt40Target ? centers.synth_center : centers.ctl_center;</div><div class='add'>+</div><div class='add'>+	if (freq &lt;=</div><div class='add'>+		ath9k_hw_fbin2freq(powInfo[0].bChannel, IS_CHAN_2GHZ(chan))) {</div><div class='add'>+		matchIndex = 0;</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; (i &lt; numChannels)</div><div class='add'>+		     &amp;&amp; (powInfo[i].bChannel != AR5416_BCHAN_UNUSED); i++) {</div><div class='add'>+			if (freq ==</div><div class='add'>+			    ath9k_hw_fbin2freq(powInfo[i].bChannel,</div><div class='add'>+					       IS_CHAN_2GHZ(chan))) {</div><div class='add'>+				matchIndex = i;</div><div class='add'>+				break;</div><div class='add'>+			} else</div><div class='add'>+				if ((freq &lt;</div><div class='add'>+				     ath9k_hw_fbin2freq(powInfo[i].bChannel,</div><div class='add'>+							IS_CHAN_2GHZ(chan)))</div><div class='add'>+				    &amp;&amp; (freq &gt;</div><div class='add'>+					ath9k_hw_fbin2freq(powInfo[i - 1].</div><div class='add'>+							   bChannel,</div><div class='add'>+							   IS_CHAN_2GHZ</div><div class='add'>+							   (chan)))) {</div><div class='add'>+					lowIndex = i - 1;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+		}</div><div class='add'>+		if ((matchIndex == -1) &amp;&amp; (lowIndex == -1))</div><div class='add'>+			matchIndex = i - 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (matchIndex != -1) {</div><div class='add'>+		*pNewPower = powInfo[matchIndex];</div><div class='add'>+	} else {</div><div class='add'>+		clo = ath9k_hw_fbin2freq(powInfo[lowIndex].bChannel,</div><div class='add'>+					 IS_CHAN_2GHZ(chan));</div><div class='add'>+		chi = ath9k_hw_fbin2freq(powInfo[lowIndex + 1].bChannel,</div><div class='add'>+					 IS_CHAN_2GHZ(chan));</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; numRates; i++) {</div><div class='add'>+			pNewPower-&gt;tPow2x[i] =</div><div class='add'>+				(u8) ath9k_hw_interpolate(freq, clo, chi,</div><div class='add'>+								powInfo</div><div class='add'>+								[lowIndex].</div><div class='add'>+								tPow2x[i],</div><div class='add'>+								powInfo</div><div class='add'>+								[lowIndex +</div><div class='add'>+								 1].tPow2x[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16</div><div class='add'>+ath9k_hw_get_max_edge_power(u16 freq,</div><div class='add'>+			    struct cal_ctl_edges *pRdEdgesPower,</div><div class='add'>+			    bool is2GHz)</div><div class='add'>+{</div><div class='add'>+	u16 twiceMaxEdgePower = AR5416_MAX_RATE_POWER;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; (i &lt; AR5416_NUM_BAND_EDGES)</div><div class='add'>+	     &amp;&amp; (pRdEdgesPower[i].bChannel != AR5416_BCHAN_UNUSED); i++) {</div><div class='add'>+		if (freq == ath9k_hw_fbin2freq(pRdEdgesPower[i].bChannel,</div><div class='add'>+					       is2GHz)) {</div><div class='add'>+			twiceMaxEdgePower = pRdEdgesPower[i].tPower;</div><div class='add'>+			break;</div><div class='add'>+		} else if ((i &gt; 0)</div><div class='add'>+			   &amp;&amp; (freq &lt;</div><div class='add'>+			       ath9k_hw_fbin2freq(pRdEdgesPower[i].</div><div class='add'>+						  bChannel, is2GHz))) {</div><div class='add'>+			if (ath9k_hw_fbin2freq</div><div class='add'>+			    (pRdEdgesPower[i - 1].bChannel, is2GHz) &lt; freq</div><div class='add'>+			    &amp;&amp; pRdEdgesPower[i - 1].flag) {</div><div class='add'>+				twiceMaxEdgePower =</div><div class='add'>+					pRdEdgesPower[i - 1].tPower;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return twiceMaxEdgePower;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+ath9k_hw_set_power_per_rate_table(struct ath_hal *ah,</div><div class='add'>+				  struct ar5416_eeprom *pEepData,</div><div class='add'>+				  struct ath9k_channel *chan,</div><div class='add'>+				  int16_t *ratesArray,</div><div class='add'>+				  u16 cfgCtl,</div><div class='add'>+				  u8 AntennaReduction,</div><div class='add'>+				  u8 twiceMaxRegulatoryPower,</div><div class='add'>+				  u8 powerLimit)</div><div class='add'>+{</div><div class='add'>+	u8 twiceMaxEdgePower = AR5416_MAX_RATE_POWER;</div><div class='add'>+	static const u16 tpScaleReductionTable[5] =</div><div class='add'>+		{ 0, 3, 6, 9, AR5416_MAX_RATE_POWER };</div><div class='add'>+</div><div class='add'>+	int i;</div><div class='add'>+	int8_t twiceLargestAntenna;</div><div class='add'>+	struct cal_ctl_data *rep;</div><div class='add'>+	struct cal_target_power_leg targetPowerOfdm, targetPowerCck = {</div><div class='add'>+		0, { 0, 0, 0, 0}</div><div class='add'>+	};</div><div class='add'>+	struct cal_target_power_leg targetPowerOfdmExt = {</div><div class='add'>+		0, { 0, 0, 0, 0} }, targetPowerCckExt = {</div><div class='add'>+		0, { 0, 0, 0, 0 }</div><div class='add'>+	};</div><div class='add'>+	struct cal_target_power_ht targetPowerHt20, targetPowerHt40 = {</div><div class='add'>+		0, {0, 0, 0, 0}</div><div class='add'>+	};</div><div class='add'>+	u8 scaledPower = 0, minCtlPower, maxRegAllowedPower;</div><div class='add'>+	u16 ctlModesFor11a[] =</div><div class='add'>+		{ CTL_11A, CTL_5GHT20, CTL_11A_EXT, CTL_5GHT40 };</div><div class='add'>+	u16 ctlModesFor11g[] =</div><div class='add'>+		{ CTL_11B, CTL_11G, CTL_2GHT20, CTL_11B_EXT, CTL_11G_EXT,</div><div class='add'>+		  CTL_2GHT40</div><div class='add'>+		};</div><div class='add'>+	u16 numCtlModes, *pCtlMode, ctlMode, freq;</div><div class='add'>+	struct chan_centers centers;</div><div class='add'>+	int tx_chainmask;</div><div class='add'>+	u8 twiceMinEdgePower;</div><div class='add'>+	struct ath_hal_5416 *ahp = AH5416(ah);</div><div class='add'>+</div><div class='add'>+	tx_chainmask = ahp-&gt;ah_txchainmask;</div><div class='add'>+</div><div class='add'>+	ath9k_hw_get_channel_centers(ah, chan, &amp;centers);</div><div class='add'>+</div><div class='add'>+	twiceLargestAntenna = max(</div><div class='add'>+		pEepData-&gt;modalHeader</div><div class='add'>+			[IS_CHAN_2GHZ(chan)].antennaGainCh[0],</div><div class='add'>+		pEepData-&gt;modalHeader</div><div class='add'>+			[IS_CHAN_2GHZ(chan)].antennaGainCh[1]);</div><div class='add'>+</div><div class='add'>+	twiceLargestAntenna = max((u8) twiceLargestAntenna,</div><div class='add'>+		pEepData-&gt;modalHeader</div><div class='add'>+			[IS_CHAN_2GHZ(chan)].antennaGainCh[2]);</div><div class='add'>+</div><div class='add'>+	twiceLargestAntenna =</div><div class='add'>+		(int8_t) min(AntennaReduction - twiceLargestAntenna, 0);</div><div class='add'>+</div><div class='add'>+	maxRegAllowedPower = twiceMaxRegulatoryPower + twiceLargestAntenna;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;ah_tpScale != ATH9K_TP_SCALE_MAX) {</div><div class='add'>+		maxRegAllowedPower -=</div><div class='add'>+			(tpScaleReductionTable[(ah-&gt;ah_tpScale)] * 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scaledPower = min(powerLimit, maxRegAllowedPower);</div><div class='add'>+</div><div class='add'>+	switch (ar5416_get_ntxchains(tx_chainmask)) {</div><div class='add'>+	case 1:</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		scaledPower -=</div><div class='add'>+			pEepData-&gt;modalHeader[IS_CHAN_2GHZ(chan)].</div><div class='add'>+			pwrDecreaseFor2Chain;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		scaledPower -=</div><div class='add'>+			pEepData-&gt;modalHeader[IS_CHAN_2GHZ(chan)].</div><div class='add'>+			pwrDecreaseFor3Chain;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scaledPower = max(0, (int32_t) scaledPower);</div><div class='add'>+</div><div class='add'>+	if (IS_CHAN_2GHZ(chan)) {</div><div class='add'>+		numCtlModes =</div><div class='add'>+			ARRAY_SIZE(ctlModesFor11g) -</div><div class='add'>+			SUB_NUM_CTL_MODES_AT_2G_40;</div><div class='add'>+		pCtlMode = ctlModesFor11g;</div><div class='add'>+</div><div class='add'>+		ath9k_hw_get_legacy_target_powers(ah, chan,</div><div class='add'>+			pEepData-&gt;</div><div class='add'>+			calTargetPowerCck,</div><div class='add'>+			AR5416_NUM_2G_CCK_TARGET_POWERS,</div><div class='add'>+			&amp;targetPowerCck, 4,</div><div class='add'>+			false);</div><div class='add'>+		ath9k_hw_get_legacy_target_powers(ah, chan,</div><div class='add'>+			pEepData-&gt;</div><div class='add'>+			calTargetPower2G,</div><div class='add'>+			AR5416_NUM_2G_20_TARGET_POWERS,</div><div class='add'>+			&amp;targetPowerOfdm, 4,</div><div class='add'>+			false);</div><div class='add'>+		ath9k_hw_get_target_powers(ah, chan,</div><div class='add'>+			pEepData-&gt;calTargetPower2GHT20,</div><div class='add'>+			AR5416_NUM_2G_20_TARGET_POWERS,</div><div class='add'>+			&amp;targetPowerHt20, 8, false);</div><div class='add'>+</div><div class='add'>+		if (IS_CHAN_HT40(chan)) {</div><div class='add'>+			numCtlModes = ARRAY_SIZE(ctlModesFor11g);</div><div class='add'>+			ath9k_hw_get_target_powers(ah, chan,</div><div class='add'>+				pEepData-&gt;</div><div class='add'>+				calTargetPower2GHT40,</div><div class='add'>+				AR5416_NUM_2G_40_TARGET_POWERS,</div><div class='add'>+				&amp;targetPowerHt40, 8,</div><div class='add'>+				true);</div><div class='add'>+			ath9k_hw_get_legacy_target_powers(ah, chan,</div><div class='add'>+				pEepData-&gt;</div><div class='add'>+				calTargetPowerCck,</div><div class='add'>+				AR5416_NUM_2G_CCK_TARGET_POWERS,</div><div class='add'>+				&amp;targetPowerCckExt,</div><div class='add'>+				4, true);</div><div class='add'>+			ath9k_hw_get_legacy_target_powers(ah, chan,</div><div class='add'>+				pEepData-&gt;</div><div class='add'>+				calTargetPower2G,</div><div class='add'>+				AR5416_NUM_2G_20_TARGET_POWERS,</div><div class='add'>+				&amp;targetPowerOfdmExt,</div><div class='add'>+				4, true);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		numCtlModes =</div><div class='add'>+			ARRAY_SIZE(ctlModesFor11a) -</div><div class='add'>+			SUB_NUM_CTL_MODES_AT_5G_40;</div><div class='add'>+		pCtlMode = ctlModesFor11a;</div><div class='add'>+</div><div class='add'>+		ath9k_hw_get_legacy_target_powers(ah, chan,</div><div class='add'>+			pEepData-&gt;</div><div class='add'>+			calTargetPower5G,</div><div class='add'>+			AR5416_NUM_5G_20_TARGET_POWERS,</div><div class='add'>+			&amp;targetPowerOfdm, 4,</div><div class='add'>+			false);</div><div class='add'>+		ath9k_hw_get_target_powers(ah, chan,</div><div class='add'>+			pEepData-&gt;calTargetPower5GHT20,</div><div class='add'>+			AR5416_NUM_5G_20_TARGET_POWERS,</div><div class='add'>+			&amp;targetPowerHt20, 8, false);</div><div class='add'>+</div><div class='add'>+		if (IS_CHAN_HT40(chan)) {</div><div class='add'>+			numCtlModes = ARRAY_SIZE(ctlModesFor11a);</div><div class='add'>+			ath9k_hw_get_target_powers(ah, chan,</div><div class='add'>+				pEepData-&gt;</div><div class='add'>+				calTargetPower5GHT40,</div><div class='add'>+				AR5416_NUM_5G_40_TARGET_POWERS,</div><div class='add'>+				&amp;targetPowerHt40, 8,</div><div class='add'>+				true);</div><div class='add'>+			ath9k_hw_get_legacy_target_powers(ah, chan,</div><div class='add'>+				pEepData-&gt;</div><div class='add'>+				calTargetPower5G,</div><div class='add'>+				AR5416_NUM_5G_20_TARGET_POWERS,</div><div class='add'>+				&amp;targetPowerOfdmExt,</div><div class='add'>+				4, true);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (ctlMode = 0; ctlMode &lt; numCtlModes; ctlMode++) {</div><div class='add'>+		bool isHt40CtlMode =</div><div class='add'>+			(pCtlMode[ctlMode] == CTL_5GHT40)</div><div class='add'>+			|| (pCtlMode[ctlMode] == CTL_2GHT40);</div><div class='add'>+		if (isHt40CtlMode)</div><div class='add'>+			freq = centers.synth_center;</div><div class='add'>+		else if (pCtlMode[ctlMode] &amp; EXT_ADDITIVE)</div><div class='add'>+			freq = centers.ext_center;</div><div class='add'>+		else</div><div class='add'>+			freq = centers.ctl_center;</div><div class='add'>+</div><div class='add'>+		if (ar5416_get_eep_ver(ahp) == 14</div><div class='add'>+		    &amp;&amp; ar5416_get_eep_rev(ahp) &lt;= 2)</div><div class='add'>+			twiceMaxEdgePower = AR5416_MAX_RATE_POWER;</div><div class='add'>+</div><div class='add'>+		DPRINTF(ah-&gt;ah_sc, ATH_DBG_POWER_MGMT,</div><div class='add'>+			"LOOP-Mode ctlMode %d &lt; %d, isHt40CtlMode %d, "</div><div class='add'>+			"EXT_ADDITIVE %d\n",</div><div class='add'>+			 ctlMode, numCtlModes, isHt40CtlMode,</div><div class='add'>+			 (pCtlMode[ctlMode] &amp; EXT_ADDITIVE));</div><div class='add'>+</div><div class='add'>+		for (i = 0; (i &lt; AR5416_NUM_CTLS) &amp;&amp; pEepData-&gt;ctlIndex[i];</div><div class='add'>+		     i++) {</div><div class='add'>+			DPRINTF(ah-&gt;ah_sc, ATH_DBG_POWER_MGMT,</div><div class='add'>+				"  LOOP-Ctlidx %d: cfgCtl 0x%2.2x "</div><div class='add'>+				"pCtlMode 0x%2.2x ctlIndex 0x%2.2x "</div><div class='add'>+				"chan %d\n",</div><div class='add'>+				i, cfgCtl, pCtlMode[ctlMode],</div><div class='add'>+				pEepData-&gt;ctlIndex[i], chan-&gt;channel);</div><div class='add'>+</div><div class='add'>+			if ((((cfgCtl &amp; ~CTL_MODE_M) |</div><div class='add'>+			      (pCtlMode[ctlMode] &amp; CTL_MODE_M)) ==</div><div class='add'>+			     pEepData-&gt;ctlIndex[i])</div><div class='add'>+			    ||</div><div class='add'>+			    (((cfgCtl &amp; ~CTL_MODE_M) |</div><div class='add'>+			      (pCtlMode[ctlMode] &amp; CTL_MODE_M)) ==</div><div class='add'>+			     ((pEepData-&gt;</div><div class='add'>+			       ctlIndex[i] &amp; CTL_MODE_M) | SD_NO_CTL))) {</div><div class='add'>+				rep = &amp;(pEepData-&gt;ctlData[i]);</div><div class='add'>+</div><div class='add'>+				twiceMinEdgePower =</div><div class='add'>+					ath9k_hw_get_max_edge_power(freq,</div><div class='add'>+						rep-&gt;</div><div class='add'>+						ctlEdges</div><div class='add'>+						[ar5416_get_ntxchains</div><div class='add'>+						(tx_chainmask)</div><div class='add'>+						- 1],</div><div class='add'>+						IS_CHAN_2GHZ</div><div class='add'>+						(chan));</div><div class='add'>+</div><div class='add'>+				DPRINTF(ah-&gt;ah_sc, ATH_DBG_POWER_MGMT,</div><div class='add'>+					"    MATCH-EE_IDX %d: ch %d is2 %d "</div><div class='add'>+					"2xMinEdge %d chainmask %d chains %d\n",</div><div class='add'>+					 i, freq, IS_CHAN_2GHZ(chan),</div><div class='add'>+					 twiceMinEdgePower, tx_chainmask,</div><div class='add'>+					 ar5416_get_ntxchains</div><div class='add'>+					 (tx_chainmask));</div>